diff --git a/jonas/.checkstyle b/.checkstyle similarity index 100% rename from jonas/.checkstyle rename to .checkstyle diff --git a/jonas/.checkstyle_eclipse_config b/.checkstyle_eclipse_config similarity index 100% rename from jonas/.checkstyle_eclipse_config rename to .checkstyle_eclipse_config diff --git a/jonas/.classpath b/.classpath similarity index 100% rename from jonas/.classpath rename to .classpath diff --git a/jonas/.gitignore b/.gitignore similarity index 100% rename from jonas/.gitignore rename to .gitignore diff --git a/jonas/.project b/.project similarity index 100% rename from jonas/.project rename to .project diff --git a/jonas/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from jonas/.settings/org.eclipse.jdt.core.prefs rename to .settings/org.eclipse.jdt.core.prefs diff --git a/jonas/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from jonas/.settings/org.eclipse.jdt.ui.prefs rename to .settings/org.eclipse.jdt.ui.prefs diff --git a/jonas/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from jonas/.settings/org.maven.ide.eclipse.prefs rename to .settings/org.maven.ide.eclipse.prefs diff --git a/jonas/LicenceAgreement.txt b/LicenceAgreement.txt similarity index 100% rename from jonas/LicenceAgreement.txt rename to LicenceAgreement.txt diff --git a/jonas/README b/README similarity index 100% rename from jonas/README rename to README diff --git a/jonas/ReleaseNotes.txt b/ReleaseNotes.txt similarity index 100% rename from jonas/ReleaseNotes.txt rename to ReleaseNotes.txt diff --git a/jonas/assemblies/ant-tasks/pom.xml b/assemblies/ant-tasks/pom.xml similarity index 100% rename from jonas/assemblies/ant-tasks/pom.xml rename to assemblies/ant-tasks/pom.xml diff --git a/jonas/assemblies/ant-tasks/src/main/resources/README b/assemblies/ant-tasks/src/main/resources/README similarity index 100% rename from jonas/assemblies/ant-tasks/src/main/resources/README rename to assemblies/ant-tasks/src/main/resources/README diff --git a/jonas/assemblies/client-jar/pom.xml b/assemblies/client-jar/pom.xml similarity index 100% rename from jonas/assemblies/client-jar/pom.xml rename to assemblies/client-jar/pom.xml diff --git a/jonas/assemblies/client-jar/src/main/resources/README b/assemblies/client-jar/src/main/resources/README similarity index 100% rename from jonas/assemblies/client-jar/src/main/resources/README rename to assemblies/client-jar/src/main/resources/README diff --git a/jonas/assemblies/examples/pom.xml b/assemblies/examples/pom.xml similarity index 100% rename from jonas/assemblies/examples/pom.xml rename to assemblies/examples/pom.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/build.properties b/assemblies/examples/src/main/resources/examples/build.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/build.properties rename to assemblies/examples/src/main/resources/examples/build.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/build.xml b/assemblies/examples/src/main/resources/examples/build.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/build.xml rename to assemblies/examples/src/main/resources/examples/build.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/PortConfiguration.txt b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/PortConfiguration.txt similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/PortConfiguration.txt rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/PortConfiguration.txt diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/README b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/README similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/README rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/README diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/carol.properties b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/carol.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/carol.properties rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/carol.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/cmi-config.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/cmi-config.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/cmi-config.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/cmi-config.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/traceclient.properties b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/traceclient.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/traceclient.properties rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientConfig/traceclient.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientException.bat b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientException.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientException.bat rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientException.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientException.sh b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientException.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientException.sh rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientException.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientFOSFSB.bat b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientFOSFSB.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientFOSFSB.bat rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientFOSFSB.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientFOSFSB.sh b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientFOSFSB.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientFOSFSB.sh rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientFOSFSB.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBHome.bat b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBHome.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBHome.bat rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBHome.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBHome.sh b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBHome.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBHome.sh rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBHome.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBLookup.bat b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBLookup.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBLookup.bat rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBLookup.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBLookup.sh b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBLookup.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBLookup.sh rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBLookup.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBRemote.bat b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBRemote.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBRemote.bat rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBRemote.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBRemote.sh b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBRemote.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBRemote.sh rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/bin-client/clientLBRemote.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/build.properties b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/build.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/build.properties rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/build.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/build.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/build.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/build.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/build.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/WEB-INF/jonas-web.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/WEB-INF/jonas-web.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/WEB-INF/jonas-web.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/WEB-INF/web.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/WEB-INF/web.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/WEB-INF/web.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/WEB-INF/web.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/policy/round-robin-policy.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/policy/round-robin-policy.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/policy/round-robin-policy.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/policy/round-robin-policy.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/index.html b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/index.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/index.html rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/index.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/checkRsp.jsp b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/checkRsp.jsp similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/checkRsp.jsp rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/checkRsp.jsp diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/exceptionRsp.jsp b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/exceptionRsp.jsp similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/exceptionRsp.jsp rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/exceptionRsp.jsp diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/releaseRsp.jsp b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/releaseRsp.jsp similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/releaseRsp.jsp rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/releaseRsp.jsp diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/sessionRsp.jsp b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/sessionRsp.jsp similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/sessionRsp.jsp rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/resources/web/jsp/sessionRsp.jsp diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/ejb-jar.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/ejb-jar.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/ejb-jar.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/ejb-jar.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.ha.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.ha.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.ha.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.ha.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.lb.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.lb.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.lb.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.lb.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/jonas-ejb-jar.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/transaction/ejb-jar.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/transaction/ejb-jar.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/transaction/ejb-jar.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/transaction/ejb-jar.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/transaction/jonas-ejb-jar.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/transaction/jonas-ejb-jar.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/transaction/jonas-ejb-jar.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/etc/xml/transaction/jonas-ejb-jar.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/tomcat6-jk.conf b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/tomcat6-jk.conf similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/tomcat6-jk.conf rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/tomcat6-jk.conf diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/tomcat6-mod_jk.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/tomcat6-mod_jk.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/tomcat6-mod_jk.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/tomcat6-mod_jk.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/workers.properties b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/workers.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/workers.properties rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/example-config/workers.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/application.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/application.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/application.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/application.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/applicationHA.xml b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/applicationHA.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/applicationHA.xml rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/applicationHA.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionHome.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionHome.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionHome.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionHome.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionLocal.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionLocal.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionLocal.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionLocal.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionLocalHome.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionLocalHome.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionLocalHome.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionLocalHome.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionRemote.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionRemote.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionRemote.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionRemote.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionSLR.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionSLR.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionSLR.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/hatransactions/HaTransactionSLR.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1Home.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1Home.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1Home.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1Home.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1SLR.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1SLR.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1SLR.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEjb1SLR.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityHome.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityHome.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityHome.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityHome.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityLocal.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityLocal.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityLocal.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityLocal.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityLocalHome.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityLocalHome.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityLocalHome.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityLocalHome.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityRemote.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityRemote.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityRemote.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntityRemote.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntitySLR.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntitySLR.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntitySLR.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyEntitySLR.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyException.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyException.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyException.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyException.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStateful.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStateful.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStateful.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStateful.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulHome.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulHome.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulHome.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulHome.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInner.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInner.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInner.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInner.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInnerLocal.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInnerLocal.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInnerLocal.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInnerLocal.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInnerLocalHome.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInnerLocalHome.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInnerLocalHome.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulInnerLocalHome.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulSFR.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulSFR.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulSFR.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/beans/samplecluster2/MyStatefulSFR.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientBase.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientBase.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientBase.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientBase.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientException.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientException.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientException.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientException.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientFOSFSB.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientFOSFSB.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientFOSFSB.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientFOSFSB.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBHome.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBHome.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBHome.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBHome.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBLookup.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBLookup.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBLookup.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBLookup.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBRemote.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBRemote.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBRemote.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientLBRemote.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientUtility.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientUtility.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientUtility.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/ClientUtility.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/README b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/README similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/README rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/client/README diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/AbstractServlet.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/AbstractServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/AbstractServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/AbstractServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/CheckServlet.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/CheckServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/CheckServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/CheckServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/ExceptionServlet.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/ExceptionServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/ExceptionServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/ExceptionServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/ReleaseServlet.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/ReleaseServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/ReleaseServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/ReleaseServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/SessionServlet.java b/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/SessionServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/SessionServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-j2ee14/src/java/org/ow2/jonas/examples/cluster/j2ee14/servlets/SessionServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/PortConfiguration.txt b/assemblies/examples/src/main/resources/examples/cluster-javaee5/PortConfiguration.txt similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/PortConfiguration.txt rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/PortConfiguration.txt diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/README b/assemblies/examples/src/main/resources/examples/cluster-javaee5/README similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/README rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/README diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/carol.properties b/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/carol.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/carol.properties rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/carol.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/cmi-config.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/cmi-config.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/cmi-config.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/cmi-config.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/traceclient.properties b/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/traceclient.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/traceclient.properties rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientConfig/traceclient.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientException.bat b/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientException.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientException.bat rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientException.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientException.sh b/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientException.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientException.sh rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientException.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientFOSFSB.bat b/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientFOSFSB.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientFOSFSB.bat rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientFOSFSB.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientFOSFSB.sh b/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientFOSFSB.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientFOSFSB.sh rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientFOSFSB.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientLBRemote.bat b/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientLBRemote.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientLBRemote.bat rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientLBRemote.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientLBRemote.sh b/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientLBRemote.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientLBRemote.sh rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/bin-client/clientLBRemote.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/build.properties b/assemblies/examples/src/main/resources/examples/cluster-javaee5/build.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/build.properties rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/build.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/build.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/build.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/build.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/build.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/WEB-INF/web.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/WEB-INF/web.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/WEB-INF/web.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/WEB-INF/web.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/application.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/application.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/application.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/application.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/client.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/client.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/client.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/client.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/jonas-client.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/jonas-client.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/jonas-client.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/jonas-client.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/persistence.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/persistence.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/persistence.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/persistence.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/policy/round-robin-policy.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/policy/round-robin-policy.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/policy/round-robin-policy.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/policy/round-robin-policy.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/index.html b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/index.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/index.html rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/index.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/checkRsp.jsp b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/checkRsp.jsp similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/checkRsp.jsp rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/checkRsp.jsp diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/exceptionRsp.jsp b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/exceptionRsp.jsp similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/exceptionRsp.jsp rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/exceptionRsp.jsp diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/releaseRsp.jsp b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/releaseRsp.jsp similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/releaseRsp.jsp rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/releaseRsp.jsp diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/sessionRsp.jsp b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/sessionRsp.jsp similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/sessionRsp.jsp rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/resources/web/jsp/sessionRsp.jsp diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/xml/easybeans.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/xml/easybeans.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/xml/easybeans.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/xml/easybeans.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/xml/ejb-jar.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/xml/ejb-jar.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/xml/ejb-jar.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/etc/xml/ejb-jar.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/tomcat6-jk.conf b/assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/tomcat6-jk.conf similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/tomcat6-jk.conf rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/tomcat6-jk.conf diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/tomcat6-mod_jk.xml b/assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/tomcat6-mod_jk.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/tomcat6-mod_jk.xml rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/tomcat6-mod_jk.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/workers.properties b/assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/workers.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/workers.properties rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/example-config/workers.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyException.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyException.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyException.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyException.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStateful.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStateful.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStateful.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStateful.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulBean.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulBean.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulBean.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulBean.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulInner.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulInner.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulInner.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulInner.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulInnerBean.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulInnerBean.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulInnerBean.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatefulInnerBean.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStateless.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStateless.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStateless.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStateless.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatelessBean.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatelessBean.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatelessBean.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/MyStatelessBean.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/Node.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/Node.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/Node.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/beans/samplecluster3/Node.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientBase.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientBase.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientBase.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientBase.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientException.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientException.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientException.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientException.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientFOSFSB.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientFOSFSB.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientFOSFSB.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientFOSFSB.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientLBRemote.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientLBRemote.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientLBRemote.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/ClientLBRemote.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/README b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/README similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/README rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/client/README diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/AbstractServlet.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/AbstractServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/AbstractServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/AbstractServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/CheckServlet.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/CheckServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/CheckServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/CheckServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/ExceptionServlet.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/ExceptionServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/ExceptionServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/ExceptionServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/ReleaseServlet.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/ReleaseServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/ReleaseServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/ReleaseServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/SessionServlet.java b/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/SessionServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/SessionServlet.java rename to assemblies/examples/src/main/resources/examples/cluster-javaee5/src/java/org/ow2/jonas/examples/cluster/javaee5/servlets/SessionServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/README b/assemblies/examples/src/main/resources/examples/j2ee1.4/README similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/README rename to assemblies/examples/src/main/resources/examples/j2ee1.4/README diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/build.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/build.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/build.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/build.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/jaas/jaas.config b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/jaas/jaas.config similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/jaas/jaas.config rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/jaas/jaas.config diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/jetty.gif b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/jetty.gif similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/jetty.gif rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/jetty.gif diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/logoOW2.png b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/logoOW2.png similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/logoOW2.png rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/logoOW2.png diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/ow_jonas_logo.gif b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/ow_jonas_logo.gif similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/ow_jonas_logo.gif rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/ow_jonas_logo.gif diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/tomcat.gif b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/tomcat.gif similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/tomcat.gif rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/tomcat.gif diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/valid-xhtml11.png b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/valid-xhtml11.png similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/valid-xhtml11.png rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/valid-xhtml11.png diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/vcss.png b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/vcss.png similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/vcss.png rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/img/vcss.png diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/index.html b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/index.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/index.html rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/index.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/ow2_jonas.css b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/ow2_jonas.css similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/ow2_jonas.css rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/resources/web/ow2_jonas.css diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/application-client.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/application-client.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/application-client.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/application-client.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/application.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/application.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/application.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/application.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-client1.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-client1.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-client1.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-client1.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-client2.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-client2.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-client2.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-client2.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-secusb.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-secusb.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-secusb.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-secusb.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-web.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-web.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-web.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/jonas-web.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/ra.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/ra.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/ra.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/ra.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/secusb.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/secusb.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/secusb.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/secusb.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/web.xml b/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/web.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/web.xml rename to assemblies/examples/src/main/resources/examples/j2ee1.4/etc/xml/web.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/Op.java b/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/Op.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/Op.java rename to assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/Op.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpBean.java b/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpBean.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpBean.java rename to assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpBean.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpHome.java b/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpHome.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpHome.java rename to assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpHome.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpLocal.java b/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpLocal.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpLocal.java rename to assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpLocal.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpLocalHome.java b/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpLocalHome.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpLocalHome.java rename to assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/beans/secusb/OpLocalHome.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/clients/Client.java b/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/clients/Client.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/clients/Client.java rename to assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/clients/Client.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/resourceadapters/ResourceAdapterImpl.java b/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/resourceadapters/ResourceAdapterImpl.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/resourceadapters/ResourceAdapterImpl.java rename to assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/resourceadapters/ResourceAdapterImpl.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/servlets/ServletOp.java b/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/servlets/ServletOp.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/servlets/ServletOp.java rename to assemblies/examples/src/main/resources/examples/j2ee1.4/src/java/org/ow2/jonas/earsample/servlets/ServletOp.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/velocity.log b/assemblies/examples/src/main/resources/examples/j2ee1.4/velocity.log similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/j2ee1.4/velocity.log rename to assemblies/examples/src/main/resources/examples/j2ee1.4/velocity.log diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/README b/assemblies/examples/src/main/resources/examples/javaee5-earsample/README similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/README rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/README diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientConfig/carol.properties b/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientConfig/carol.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientConfig/carol.properties rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientConfig/carol.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientConfig/traceclient.properties b/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientConfig/traceclient.properties similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientConfig/traceclient.properties rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientConfig/traceclient.properties diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJaasSecuredApplication.bat b/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJaasSecuredApplication.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJaasSecuredApplication.bat rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJaasSecuredApplication.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJaasSecuredApplication.sh b/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJaasSecuredApplication.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJaasSecuredApplication.sh rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJaasSecuredApplication.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJmsApplication.bat b/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJmsApplication.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJmsApplication.bat rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJmsApplication.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJmsApplication.sh b/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJmsApplication.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJmsApplication.sh rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientJmsApplication.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientNotSecuredApplication.bat b/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientNotSecuredApplication.bat similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientNotSecuredApplication.bat rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientNotSecuredApplication.bat diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientNotSecuredApplication.sh b/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientNotSecuredApplication.sh similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientNotSecuredApplication.sh rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/bin-client/clientNotSecuredApplication.sh diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/build.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/build.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/build.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/build.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/META-INF/MANIFEST.MF b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/META-INF/MANIFEST.MF similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/META-INF/MANIFEST.MF rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/META-INF/MANIFEST.MF diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/application.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/application.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/application.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/application.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas-secured-application-client.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas-secured-application-client.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas-secured-application-client.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas-secured-application-client.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas-secured-jonas-client.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas-secured-jonas-client.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas-secured-jonas-client.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas-secured-jonas-client.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas.config b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas.config similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas.config rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jaas.config diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jms-application-client.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jms-application-client.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jms-application-client.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jms-application-client.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jms-jonas-client.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jms-jonas-client.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jms-jonas-client.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/jms-jonas-client.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/not-secured-application-client.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/not-secured-application-client.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/not-secured-application-client.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/not-secured-application-client.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/not-secured-jonas-client.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/not-secured-jonas-client.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/not-secured-jonas-client.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/not-secured-jonas-client.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/persistence.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/persistence.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/persistence.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/persistence.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web.xml b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web.xml rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web.xml diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/architecture.png b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/architecture.png similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/architecture.png rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/architecture.png diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/jetty.gif b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/jetty.gif similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/jetty.gif rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/jetty.gif diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/logoOW2.png b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/logoOW2.png similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/logoOW2.png rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/logoOW2.png diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/ow_jonas_logo.gif b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/ow_jonas_logo.gif similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/ow_jonas_logo.gif rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/ow_jonas_logo.gif diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/tomcat.gif b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/tomcat.gif similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/tomcat.gif rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/tomcat.gif diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/valid-xhtml11.png b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/valid-xhtml11.png similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/valid-xhtml11.png rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/valid-xhtml11.png diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/vcss.png b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/vcss.png similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/vcss.png rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/img/vcss.png diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/index.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/index.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/index.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/index.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/ow2_jonas.css b/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/ow2_jonas.css similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/ow2_jonas.css rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/etc/web/ow2_jonas.css diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/JMSApplicationClient.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/JMSApplicationClient.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/JMSApplicationClient.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/JMSApplicationClient.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/NotSecuredApplicationClient.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/NotSecuredApplicationClient.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/NotSecuredApplicationClient.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/NotSecuredApplicationClient.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/SecuredApplicationClient.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/SecuredApplicationClient.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/SecuredApplicationClient.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/SecuredApplicationClient.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/package.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/package.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/package.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/client/package.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/Author.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/Author.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/Author.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/Author.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/Book.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/Book.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/Book.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/Book.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/package.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/package.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/package.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/entity/package.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/Initializer.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/Initializer.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/Initializer.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/Initializer.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/InitializerBean.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/InitializerBean.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/InitializerBean.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/InitializerBean.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/package.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/package.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/package.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/init/package.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/Mailer.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/Mailer.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/Mailer.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/Mailer.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/MailerBean.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/MailerBean.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/MailerBean.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/MailerBean.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/package.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/package.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/package.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mail/package.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mdb/JMSMessageBean.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mdb/JMSMessageBean.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mdb/JMSMessageBean.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mdb/JMSMessageBean.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mdb/package.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mdb/package.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mdb/package.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/mdb/package.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/package.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/package.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/package.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/package.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/LocalReader.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/LocalReader.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/LocalReader.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/LocalReader.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/Reader.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/Reader.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/Reader.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/Reader.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/ReaderBean.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/ReaderBean.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/ReaderBean.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/ReaderBean.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/RemoteReader.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/RemoteReader.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/RemoteReader.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/RemoteReader.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/package.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/package.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/package.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/reader/package.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/AdminServlet.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/AdminServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/AdminServlet.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/AdminServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/ExampleServlet.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/ExampleServlet.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/ExampleServlet.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/ExampleServlet.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/package.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/package.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/package.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/web/package.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/LocalWriter.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/LocalWriter.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/LocalWriter.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/LocalWriter.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/RemoteWriter.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/RemoteWriter.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/RemoteWriter.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/RemoteWriter.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/Writer.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/Writer.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/Writer.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/Writer.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/WriterBean.java b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/WriterBean.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/WriterBean.java rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/WriterBean.java diff --git a/jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/package.html b/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/package.html similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/package.html rename to assemblies/examples/src/main/resources/examples/javaee5-earsample/src/java/org/ow2/jonas/examples/ear/writer/package.html diff --git a/jonas/assemblies/examples/src/main/resources/examples/jonas-common.xml b/assemblies/examples/src/main/resources/examples/jonas-common.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/examples/jonas-common.xml rename to assemblies/examples/src/main/resources/examples/jonas-common.xml diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/README b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/README similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/README rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/README diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/build.xml b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/build.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/build.xml rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/build.xml diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/build.xml b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/build.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/build.xml rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/build.xml diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/etc/application.xml b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/etc/application.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/etc/application.xml rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/etc/application.xml diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/etc/web.xml b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/etc/web.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/etc/web.xml rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/etc/web.xml diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/src/java/org/ow2/jonas/tutorial/jaxws/client/QuoteMain.java b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/src/java/org/ow2/jonas/tutorial/jaxws/client/QuoteMain.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/src/java/org/ow2/jonas/tutorial/jaxws/client/QuoteMain.java rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/client/src/java/org/ow2/jonas/tutorial/jaxws/client/QuoteMain.java diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/build.xml b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/build.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/build.xml rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/build.xml diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/etc/application.xml b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/etc/application.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/etc/application.xml rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/etc/application.xml diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/etc/web.xml b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/etc/web.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/etc/web.xml rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/etc/web.xml diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/Quote.java b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/Quote.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/Quote.java rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/Quote.java diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/QuoteReporter.java b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/QuoteReporter.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/QuoteReporter.java rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/QuoteReporter.java diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/QuoteReporterPOJO.java b/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/QuoteReporterPOJO.java similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/QuoteReporterPOJO.java rename to assemblies/examples/src/main/resources/tutorial/jaxws-sample/service/src/java/org/ow2/jonas/tutorial/jaxws/quote/QuoteReporterPOJO.java diff --git a/jonas/assemblies/examples/src/main/resources/tutorial/jonas-common.xml b/assemblies/examples/src/main/resources/tutorial/jonas-common.xml similarity index 100% rename from jonas/assemblies/examples/src/main/resources/tutorial/jonas-common.xml rename to assemblies/examples/src/main/resources/tutorial/jonas-common.xml diff --git a/jonas/assemblies/pom.xml b/assemblies/pom.xml similarity index 100% rename from jonas/assemblies/pom.xml rename to assemblies/pom.xml diff --git a/jonas/assemblies/profiles/addons/minimal/pom.xml b/assemblies/profiles/addons/minimal/pom.xml similarity index 100% rename from jonas/assemblies/profiles/addons/minimal/pom.xml rename to assemblies/profiles/addons/minimal/pom.xml diff --git a/jonas/assemblies/profiles/addons/minimal/src/main/assembly/assembly.xml b/assemblies/profiles/addons/minimal/src/main/assembly/assembly.xml similarity index 100% rename from jonas/assemblies/profiles/addons/minimal/src/main/assembly/assembly.xml rename to assemblies/profiles/addons/minimal/src/main/assembly/assembly.xml diff --git a/jonas/assemblies/profiles/addons/pom.xml b/assemblies/profiles/addons/pom.xml similarity index 100% rename from jonas/assemblies/profiles/addons/pom.xml rename to assemblies/profiles/addons/pom.xml diff --git a/jonas/assemblies/profiles/addons/src/main/assembly/addons-component.xml b/assemblies/profiles/addons/src/main/assembly/addons-component.xml similarity index 100% rename from jonas/assemblies/profiles/addons/src/main/assembly/addons-component.xml rename to assemblies/profiles/addons/src/main/assembly/addons-component.xml diff --git a/jonas/assemblies/profiles/legacy/full/pom.xml b/assemblies/profiles/legacy/full/pom.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/full/pom.xml rename to assemblies/profiles/legacy/full/pom.xml diff --git a/jonas/assemblies/profiles/legacy/full/src/main/assembly/assembly.xml b/assemblies/profiles/legacy/full/src/main/assembly/assembly.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/full/src/main/assembly/assembly.xml rename to assemblies/profiles/legacy/full/src/main/assembly/assembly.xml diff --git a/jonas/assemblies/profiles/legacy/full/src/main/assembly/jonas-full-component.xml b/assemblies/profiles/legacy/full/src/main/assembly/jonas-full-component.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/full/src/main/assembly/jonas-full-component.xml rename to assemblies/profiles/legacy/full/src/main/assembly/jonas-full-component.xml diff --git a/jonas/assemblies/profiles/legacy/full/src/main/assembly/templates-component.xml b/assemblies/profiles/legacy/full/src/main/assembly/templates-component.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/full/src/main/assembly/templates-component.xml rename to assemblies/profiles/legacy/full/src/main/assembly/templates-component.xml diff --git a/jonas/assemblies/profiles/legacy/jaxrs/pom.xml b/assemblies/profiles/legacy/jaxrs/pom.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/jaxrs/pom.xml rename to assemblies/profiles/legacy/jaxrs/pom.xml diff --git a/jonas/assemblies/profiles/legacy/jaxrs/src/main/assembly/assembly.xml b/assemblies/profiles/legacy/jaxrs/src/main/assembly/assembly.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/jaxrs/src/main/assembly/assembly.xml rename to assemblies/profiles/legacy/jaxrs/src/main/assembly/assembly.xml diff --git a/jonas/assemblies/profiles/legacy/jaxrs/src/main/assembly/jonas-jaxrs-component.xml b/assemblies/profiles/legacy/jaxrs/src/main/assembly/jonas-jaxrs-component.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/jaxrs/src/main/assembly/jonas-jaxrs-component.xml rename to assemblies/profiles/legacy/jaxrs/src/main/assembly/jonas-jaxrs-component.xml diff --git a/jonas/assemblies/profiles/legacy/minimal/pom.xml b/assemblies/profiles/legacy/minimal/pom.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/minimal/pom.xml rename to assemblies/profiles/legacy/minimal/pom.xml diff --git a/jonas/assemblies/profiles/legacy/minimal/src/main/assembly/assembly.xml b/assemblies/profiles/legacy/minimal/src/main/assembly/assembly.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/minimal/src/main/assembly/assembly.xml rename to assemblies/profiles/legacy/minimal/src/main/assembly/assembly.xml diff --git a/jonas/assemblies/profiles/legacy/pom.xml b/assemblies/profiles/legacy/pom.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/pom.xml rename to assemblies/profiles/legacy/pom.xml diff --git a/jonas/assemblies/profiles/legacy/src/main/assembly/legacy-component.xml b/assemblies/profiles/legacy/src/main/assembly/legacy-component.xml similarity index 100% rename from jonas/assemblies/profiles/legacy/src/main/assembly/legacy-component.xml rename to assemblies/profiles/legacy/src/main/assembly/legacy-component.xml diff --git a/jonas/assemblies/profiles/pom.xml b/assemblies/profiles/pom.xml similarity index 100% rename from jonas/assemblies/profiles/pom.xml rename to assemblies/profiles/pom.xml diff --git a/jonas/assemblies/profiles/src/main/assembly/common-component.xml b/assemblies/profiles/src/main/assembly/common-component.xml similarity index 100% rename from jonas/assemblies/profiles/src/main/assembly/common-component.xml rename to assemblies/profiles/src/main/assembly/common-component.xml diff --git a/jonas/assemblies/profiles/src/main/resources/logs/README b/assemblies/profiles/src/main/resources/logs/README similarity index 100% rename from jonas/assemblies/profiles/src/main/resources/logs/README rename to assemblies/profiles/src/main/resources/logs/README diff --git a/jonas/clientbuild.xml b/clientbuild.xml similarity index 100% rename from jonas/clientbuild.xml rename to clientbuild.xml diff --git a/jonas/eclipse-settings/checkstyle-convention.xml b/eclipse-settings/checkstyle-convention.xml similarity index 100% rename from jonas/eclipse-settings/checkstyle-convention.xml rename to eclipse-settings/checkstyle-convention.xml diff --git a/jonas/eclipse-settings/eclipse-java-code-formatter.xml b/eclipse-settings/eclipse-java-code-formatter.xml similarity index 100% rename from jonas/eclipse-settings/eclipse-java-code-formatter.xml rename to eclipse-settings/eclipse-java-code-formatter.xml diff --git a/eclipse-settings/eclipse-java-codestyle-organize-import b/eclipse-settings/eclipse-java-codestyle-organize-import new file mode 100644 index 0000000000000000000000000000000000000000..1b52f7ec0913065f63e8ddb1795ed3cfd65894c2 --- /dev/null +++ b/eclipse-settings/eclipse-java-codestyle-organize-import @@ -0,0 +1,24 @@ +#Organize Import Order +#Mon Apr 19 08:43:05 CEST 2004 +19=org.objectweb.security +18=org.objectweb.medor +17=org.objectweb.jorm +16=org.objectweb.joram +15=org.objectweb.jonas +14=org.objectweb.jonas_ws +13=org.objectweb.jonas_web +12=org.objectweb.jonas_rar +11=org.objectweb.jonas_jms +10=org.objectweb.jonas_lib +9=org.objectweb.jonas_ejb +8=org.objectweb.jonas_ear +7=org.objectweb.jonas_client +6=org.objectweb.common +5=org.objectweb.carol +4=org.objectweb +3=org.apache +2=org +1=javax +21=com +0=java +20=org.objectweb.util diff --git a/jonas/eclipse-settings/jonas-style-convention.xml b/eclipse-settings/jonas-style-convention.xml similarity index 100% rename from jonas/eclipse-settings/jonas-style-convention.xml rename to eclipse-settings/jonas-style-convention.xml diff --git a/jonas/eclipse-settings/plugin-checkstyle-config.xml b/eclipse-settings/plugin-checkstyle-config.xml similarity index 100% rename from jonas/eclipse-settings/plugin-checkstyle-config.xml rename to eclipse-settings/plugin-checkstyle-config.xml diff --git a/jonas/itests/applications/classloader/pom.xml b/itests/applications/classloader/pom.xml similarity index 100% rename from jonas/itests/applications/classloader/pom.xml rename to itests/applications/classloader/pom.xml diff --git a/jonas/itests/applications/classloader/src/main/java/org/ow2/jonas/tests/applications/classloader/ClassLoaderChecker.java b/itests/applications/classloader/src/main/java/org/ow2/jonas/tests/applications/classloader/ClassLoaderChecker.java similarity index 100% rename from jonas/itests/applications/classloader/src/main/java/org/ow2/jonas/tests/applications/classloader/ClassLoaderChecker.java rename to itests/applications/classloader/src/main/java/org/ow2/jonas/tests/applications/classloader/ClassLoaderChecker.java diff --git a/jonas/itests/applications/classloader/src/main/resources/metadata.xml b/itests/applications/classloader/src/main/resources/metadata.xml similarity index 100% rename from jonas/itests/applications/classloader/src/main/resources/metadata.xml rename to itests/applications/classloader/src/main/resources/metadata.xml diff --git a/jonas/itests/applications/connection-leaks/pom.xml b/itests/applications/connection-leaks/pom.xml similarity index 100% rename from jonas/itests/applications/connection-leaks/pom.xml rename to itests/applications/connection-leaks/pom.xml diff --git a/jonas/itests/applications/connection-leaks/src/main/java/org/ow2/jonas/tests/applications/connectionsleaks/ConnectionLeakServlet.java b/itests/applications/connection-leaks/src/main/java/org/ow2/jonas/tests/applications/connectionsleaks/ConnectionLeakServlet.java similarity index 100% rename from jonas/itests/applications/connection-leaks/src/main/java/org/ow2/jonas/tests/applications/connectionsleaks/ConnectionLeakServlet.java rename to itests/applications/connection-leaks/src/main/java/org/ow2/jonas/tests/applications/connectionsleaks/ConnectionLeakServlet.java diff --git a/jonas/itests/applications/connection-leaks/src/main/webapp/WEB-INF/jonas-web.xml b/itests/applications/connection-leaks/src/main/webapp/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/itests/applications/connection-leaks/src/main/webapp/WEB-INF/jonas-web.xml rename to itests/applications/connection-leaks/src/main/webapp/WEB-INF/jonas-web.xml diff --git a/jonas/itests/applications/connection-leaks/src/main/webapp/WEB-INF/web.xml b/itests/applications/connection-leaks/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/connection-leaks/src/main/webapp/WEB-INF/web.xml rename to itests/applications/connection-leaks/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/jaxws-add/assemblies/ear/pom.xml b/itests/applications/jaxws-add/assemblies/ear/pom.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/assemblies/ear/pom.xml rename to itests/applications/jaxws-add/assemblies/ear/pom.xml diff --git a/jonas/itests/applications/jaxws-add/assemblies/pom.xml b/itests/applications/jaxws-add/assemblies/pom.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/assemblies/pom.xml rename to itests/applications/jaxws-add/assemblies/pom.xml diff --git a/jonas/itests/applications/jaxws-add/modules/api/pom.xml b/itests/applications/jaxws-add/modules/api/pom.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/api/pom.xml rename to itests/applications/jaxws-add/modules/api/pom.xml diff --git a/jonas/itests/applications/jaxws-add/modules/api/src/main/java/org/ow2/jonas/tests/applications/wsadd/api/IAddBean.java b/itests/applications/jaxws-add/modules/api/src/main/java/org/ow2/jonas/tests/applications/wsadd/api/IAddBean.java similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/api/src/main/java/org/ow2/jonas/tests/applications/wsadd/api/IAddBean.java rename to itests/applications/jaxws-add/modules/api/src/main/java/org/ow2/jonas/tests/applications/wsadd/api/IAddBean.java diff --git a/jonas/itests/applications/jaxws-add/modules/beans/pom.xml b/itests/applications/jaxws-add/modules/beans/pom.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/beans/pom.xml rename to itests/applications/jaxws-add/modules/beans/pom.xml diff --git a/jonas/itests/applications/jaxws-add/modules/beans/src/main/java/org/ow2/jonas/tests/applications/wsadd/beans/AddBean.java b/itests/applications/jaxws-add/modules/beans/src/main/java/org/ow2/jonas/tests/applications/wsadd/beans/AddBean.java similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/beans/src/main/java/org/ow2/jonas/tests/applications/wsadd/beans/AddBean.java rename to itests/applications/jaxws-add/modules/beans/src/main/java/org/ow2/jonas/tests/applications/wsadd/beans/AddBean.java diff --git a/jonas/itests/applications/jaxws-add/modules/beans/src/main/resources/META-INF/ejb-jar.xml b/itests/applications/jaxws-add/modules/beans/src/main/resources/META-INF/ejb-jar.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/beans/src/main/resources/META-INF/ejb-jar.xml rename to itests/applications/jaxws-add/modules/beans/src/main/resources/META-INF/ejb-jar.xml diff --git a/jonas/itests/applications/jaxws-add/modules/pom.xml b/itests/applications/jaxws-add/modules/pom.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/pom.xml rename to itests/applications/jaxws-add/modules/pom.xml diff --git a/jonas/itests/applications/jaxws-add/modules/webapp/pom.xml b/itests/applications/jaxws-add/modules/webapp/pom.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/webapp/pom.xml rename to itests/applications/jaxws-add/modules/webapp/pom.xml diff --git a/jonas/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/AuditEventServiceServlet.java b/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/AuditEventServiceServlet.java similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/AuditEventServiceServlet.java rename to itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/AuditEventServiceServlet.java diff --git a/jonas/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/AuditPropagationServlet.java b/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/AuditPropagationServlet.java similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/AuditPropagationServlet.java rename to itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/AuditPropagationServlet.java diff --git a/jonas/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/IWSAdd.java b/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/IWSAdd.java similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/IWSAdd.java rename to itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/IWSAdd.java diff --git a/jonas/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/WSAdd.java b/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/WSAdd.java similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/WSAdd.java rename to itests/applications/jaxws-add/modules/webapp/src/main/java/org/ow2/jonas/tests/applications/wsadd/ws/WSAdd.java diff --git a/jonas/itests/applications/jaxws-add/modules/webapp/src/main/resources/soap-request-add.xml b/itests/applications/jaxws-add/modules/webapp/src/main/resources/soap-request-add.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/webapp/src/main/resources/soap-request-add.xml rename to itests/applications/jaxws-add/modules/webapp/src/main/resources/soap-request-add.xml diff --git a/jonas/itests/applications/jaxws-add/modules/webapp/src/main/webapp/WEB-INF/jonas-web.xml b/itests/applications/jaxws-add/modules/webapp/src/main/webapp/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/webapp/src/main/webapp/WEB-INF/jonas-web.xml rename to itests/applications/jaxws-add/modules/webapp/src/main/webapp/WEB-INF/jonas-web.xml diff --git a/jonas/itests/applications/jaxws-add/modules/webapp/src/main/webapp/WEB-INF/web.xml b/itests/applications/jaxws-add/modules/webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/modules/webapp/src/main/webapp/WEB-INF/web.xml rename to itests/applications/jaxws-add/modules/webapp/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/jaxws-add/pom.xml b/itests/applications/jaxws-add/pom.xml similarity index 100% rename from jonas/itests/applications/jaxws-add/pom.xml rename to itests/applications/jaxws-add/pom.xml diff --git a/jonas/itests/applications/jaxws-sample/pom.xml b/itests/applications/jaxws-sample/pom.xml similarity index 100% rename from jonas/itests/applications/jaxws-sample/pom.xml rename to itests/applications/jaxws-sample/pom.xml diff --git a/jonas/itests/applications/jndi/pom.xml b/itests/applications/jndi/pom.xml similarity index 100% rename from jonas/itests/applications/jndi/pom.xml rename to itests/applications/jndi/pom.xml diff --git a/jonas/itests/applications/jndi/src/main/java/org/ow2/jonas/tests/applications/jndi/ejb3/Jndi.java b/itests/applications/jndi/src/main/java/org/ow2/jonas/tests/applications/jndi/ejb3/Jndi.java similarity index 100% rename from jonas/itests/applications/jndi/src/main/java/org/ow2/jonas/tests/applications/jndi/ejb3/Jndi.java rename to itests/applications/jndi/src/main/java/org/ow2/jonas/tests/applications/jndi/ejb3/Jndi.java diff --git a/jonas/itests/applications/jndi/src/main/java/org/ow2/jonas/tests/applications/jndi/ejb3/JndiBean.java b/itests/applications/jndi/src/main/java/org/ow2/jonas/tests/applications/jndi/ejb3/JndiBean.java similarity index 100% rename from jonas/itests/applications/jndi/src/main/java/org/ow2/jonas/tests/applications/jndi/ejb3/JndiBean.java rename to itests/applications/jndi/src/main/java/org/ow2/jonas/tests/applications/jndi/ejb3/JndiBean.java diff --git a/jonas/itests/applications/jndi/src/main/resources/META-INF/ejb-jar.xml b/itests/applications/jndi/src/main/resources/META-INF/ejb-jar.xml similarity index 100% rename from jonas/itests/applications/jndi/src/main/resources/META-INF/ejb-jar.xml rename to itests/applications/jndi/src/main/resources/META-INF/ejb-jar.xml diff --git a/jonas/itests/applications/jsf/jsf-1.x/pom.xml b/itests/applications/jsf/jsf-1.x/pom.xml similarity index 100% rename from jonas/itests/applications/jsf/jsf-1.x/pom.xml rename to itests/applications/jsf/jsf-1.x/pom.xml diff --git a/jonas/itests/applications/jsf/jsf-1.x/src/main/webapp/WEB-INF/faces-config.xml b/itests/applications/jsf/jsf-1.x/src/main/webapp/WEB-INF/faces-config.xml similarity index 100% rename from jonas/itests/applications/jsf/jsf-1.x/src/main/webapp/WEB-INF/faces-config.xml rename to itests/applications/jsf/jsf-1.x/src/main/webapp/WEB-INF/faces-config.xml diff --git a/jonas/itests/applications/jsf/jsf-1.x/src/main/webapp/WEB-INF/web.xml b/itests/applications/jsf/jsf-1.x/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/jsf/jsf-1.x/src/main/webapp/WEB-INF/web.xml rename to itests/applications/jsf/jsf-1.x/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/jsf/jsf-1.x/src/main/webapp/hello.jsp b/itests/applications/jsf/jsf-1.x/src/main/webapp/hello.jsp similarity index 100% rename from jonas/itests/applications/jsf/jsf-1.x/src/main/webapp/hello.jsp rename to itests/applications/jsf/jsf-1.x/src/main/webapp/hello.jsp diff --git a/jonas/itests/applications/jsf/jsf-1.x/src/main/webapp/index.jsp b/itests/applications/jsf/jsf-1.x/src/main/webapp/index.jsp similarity index 100% rename from jonas/itests/applications/jsf/jsf-1.x/src/main/webapp/index.jsp rename to itests/applications/jsf/jsf-1.x/src/main/webapp/index.jsp diff --git a/jonas/itests/applications/jsf/jsf-2.0/pom.xml b/itests/applications/jsf/jsf-2.0/pom.xml similarity index 100% rename from jonas/itests/applications/jsf/jsf-2.0/pom.xml rename to itests/applications/jsf/jsf-2.0/pom.xml diff --git a/jonas/itests/applications/jsf/jsf-2.0/src/main/java/org/ow2/jonas/itests/applications/jsf2/HelloNameBean.java b/itests/applications/jsf/jsf-2.0/src/main/java/org/ow2/jonas/itests/applications/jsf2/HelloNameBean.java similarity index 100% rename from jonas/itests/applications/jsf/jsf-2.0/src/main/java/org/ow2/jonas/itests/applications/jsf2/HelloNameBean.java rename to itests/applications/jsf/jsf-2.0/src/main/java/org/ow2/jonas/itests/applications/jsf2/HelloNameBean.java diff --git a/jonas/itests/applications/jsf/jsf-2.0/src/main/webapp/WEB-INF/web.xml b/itests/applications/jsf/jsf-2.0/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/jsf/jsf-2.0/src/main/webapp/WEB-INF/web.xml rename to itests/applications/jsf/jsf-2.0/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/jsf/jsf-2.0/src/main/webapp/helloworld.xhtml b/itests/applications/jsf/jsf-2.0/src/main/webapp/helloworld.xhtml similarity index 100% rename from jonas/itests/applications/jsf/jsf-2.0/src/main/webapp/helloworld.xhtml rename to itests/applications/jsf/jsf-2.0/src/main/webapp/helloworld.xhtml diff --git a/jonas/itests/applications/jsf/jsf-2.0/src/main/webapp/welcome.xhtml b/itests/applications/jsf/jsf-2.0/src/main/webapp/welcome.xhtml similarity index 100% rename from jonas/itests/applications/jsf/jsf-2.0/src/main/webapp/welcome.xhtml rename to itests/applications/jsf/jsf-2.0/src/main/webapp/welcome.xhtml diff --git a/jonas/itests/applications/jsf/pom.xml b/itests/applications/jsf/pom.xml similarity index 100% rename from jonas/itests/applications/jsf/pom.xml rename to itests/applications/jsf/pom.xml diff --git a/jonas/itests/applications/multitenant/pom.xml b/itests/applications/multitenant/pom.xml similarity index 100% rename from jonas/itests/applications/multitenant/pom.xml rename to itests/applications/multitenant/pom.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/earT1/pom.xml b/itests/applications/multitenant/src/main/resources/tenant-ear/earT1/pom.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/earT1/pom.xml rename to itests/applications/multitenant/src/main/resources/tenant-ear/earT1/pom.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/earT1/src/main/resources/META-INF/jonas-application.xml b/itests/applications/multitenant/src/main/resources/tenant-ear/earT1/src/main/resources/META-INF/jonas-application.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/earT1/src/main/resources/META-INF/jonas-application.xml rename to itests/applications/multitenant/src/main/resources/tenant-ear/earT1/src/main/resources/META-INF/jonas-application.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/earT2/pom.xml b/itests/applications/multitenant/src/main/resources/tenant-ear/earT2/pom.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/earT2/pom.xml rename to itests/applications/multitenant/src/main/resources/tenant-ear/earT2/pom.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/earT2/src/main/resources/META-INF/jonas-application.xml b/itests/applications/multitenant/src/main/resources/tenant-ear/earT2/src/main/resources/META-INF/jonas-application.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/earT2/src/main/resources/META-INF/jonas-application.xml rename to itests/applications/multitenant/src/main/resources/tenant-ear/earT2/src/main/resources/META-INF/jonas-application.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/pom.xml b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/pom.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/pom.xml rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/pom.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/Author.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/Author.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/Author.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/Author.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/Hello.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/Hello.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/Hello.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/Hello.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/HelloMBean.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/HelloMBean.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/HelloMBean.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/HelloMBean.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/init/Initializer.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/init/Initializer.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/init/Initializer.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/init/Initializer.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/init/InitializerBean.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/init/InitializerBean.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/init/InitializerBean.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/init/InitializerBean.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/LocalReader.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/LocalReader.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/LocalReader.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/LocalReader.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/Reader.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/Reader.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/Reader.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/Reader.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/ReaderBean.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/ReaderBean.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/ReaderBean.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/ReaderBean.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/RemoteReader.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/RemoteReader.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/RemoteReader.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/reader/RemoteReader.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/LocalWriter.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/LocalWriter.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/LocalWriter.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/LocalWriter.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/RemoteWriter.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/RemoteWriter.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/RemoteWriter.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/RemoteWriter.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/Writer.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/Writer.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/Writer.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/Writer.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/WriterBean.java b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/WriterBean.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/WriterBean.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/java/org/ow2/jonas/test/multitenant/writer/WriterBean.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/resources/META-INF/persistence.xml b/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/resources/META-INF/persistence.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/resources/META-INF/persistence.xml rename to itests/applications/multitenant/src/main/resources/tenant-ear/ejb/src/main/resources/META-INF/persistence.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/pom.xml b/itests/applications/multitenant/src/main/resources/tenant-ear/pom.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/pom.xml rename to itests/applications/multitenant/src/main/resources/tenant-ear/pom.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/test-multitenant-T1.ear b/itests/applications/multitenant/src/main/resources/tenant-ear/test-multitenant-T1.ear similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/test-multitenant-T1.ear rename to itests/applications/multitenant/src/main/resources/tenant-ear/test-multitenant-T1.ear diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/test-multitenant-T2.ear b/itests/applications/multitenant/src/main/resources/tenant-ear/test-multitenant-T2.ear similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/test-multitenant-T2.ear rename to itests/applications/multitenant/src/main/resources/tenant-ear/test-multitenant-T2.ear diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/war/pom.xml b/itests/applications/multitenant/src/main/resources/tenant-ear/war/pom.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/war/pom.xml rename to itests/applications/multitenant/src/main/resources/tenant-ear/war/pom.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/java/org/ow2/jonas/test/multitenant/TestServlet.java b/itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/java/org/ow2/jonas/test/multitenant/TestServlet.java similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/java/org/ow2/jonas/test/multitenant/TestServlet.java rename to itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/java/org/ow2/jonas/test/multitenant/TestServlet.java diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/webapp/WEB-INF/web.xml b/itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/webapp/WEB-INF/web.xml rename to itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/webapp/index.html b/itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/webapp/index.html similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/webapp/index.html rename to itests/applications/multitenant/src/main/resources/tenant-ear/war/src/main/webapp/index.html diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-war/pom.xml b/itests/applications/multitenant/src/main/resources/tenant-war/pom.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-war/pom.xml rename to itests/applications/multitenant/src/main/resources/tenant-war/pom.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/WEB-INF/jonas-web.xml b/itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/WEB-INF/jonas-web.xml rename to itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/WEB-INF/jonas-web.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/WEB-INF/web.xml b/itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/WEB-INF/web.xml rename to itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/index.html b/itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/index.html similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/index.html rename to itests/applications/multitenant/src/main/resources/tenant-war/src/main/webapp/index.html diff --git a/jonas/itests/applications/multitenant/src/main/resources/tenant-war/test-multitenant-war.war b/itests/applications/multitenant/src/main/resources/tenant-war/test-multitenant-war.war similarity index 100% rename from jonas/itests/applications/multitenant/src/main/resources/tenant-war/test-multitenant-war.war rename to itests/applications/multitenant/src/main/resources/tenant-war/test-multitenant-war.war diff --git a/jonas/itests/applications/osgi/osgi-datasource/pom.xml b/itests/applications/osgi/osgi-datasource/pom.xml similarity index 100% rename from jonas/itests/applications/osgi/osgi-datasource/pom.xml rename to itests/applications/osgi/osgi-datasource/pom.xml diff --git a/jonas/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/DataSourceServiceBean.java b/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/DataSourceServiceBean.java similarity index 100% rename from jonas/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/DataSourceServiceBean.java rename to itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/DataSourceServiceBean.java diff --git a/jonas/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/DatasourceBean.java b/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/DatasourceBean.java similarity index 100% rename from jonas/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/DatasourceBean.java rename to itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/DatasourceBean.java diff --git a/jonas/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/IDataSource.java b/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/IDataSource.java similarity index 100% rename from jonas/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/IDataSource.java rename to itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/IDataSource.java diff --git a/jonas/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/IDataSourceService.java b/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/IDataSourceService.java similarity index 100% rename from jonas/itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/IDataSourceService.java rename to itests/applications/osgi/osgi-datasource/src/main/java/org/ow2/jonas/tests/applications/osgi/datasources/IDataSourceService.java diff --git a/jonas/itests/applications/osgi/pom.xml b/itests/applications/osgi/pom.xml similarity index 100% rename from jonas/itests/applications/osgi/pom.xml rename to itests/applications/osgi/pom.xml diff --git a/jonas/itests/applications/pom.xml b/itests/applications/pom.xml similarity index 100% rename from jonas/itests/applications/pom.xml rename to itests/applications/pom.xml diff --git a/jonas/itests/applications/versioning/pom.xml b/itests/applications/versioning/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/pom.xml rename to itests/applications/versioning/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/non-versioned-war/non-versioned-war.war b/itests/applications/versioning/src/main/resources/non-versioned-war/non-versioned-war.war similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/non-versioned-war/non-versioned-war.war rename to itests/applications/versioning/src/main/resources/non-versioned-war/non-versioned-war.war diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/.classpath b/itests/applications/versioning/src/main/resources/root-war/.classpath similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/.classpath rename to itests/applications/versioning/src/main/resources/root-war/.classpath diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/.project b/itests/applications/versioning/src/main/resources/root-war/.project similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/.project rename to itests/applications/versioning/src/main/resources/root-war/.project diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/.settings/org.eclipse.jdt.core.prefs b/itests/applications/versioning/src/main/resources/root-war/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/.settings/org.eclipse.jdt.core.prefs rename to itests/applications/versioning/src/main/resources/root-war/.settings/org.eclipse.jdt.core.prefs diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/.settings/org.eclipse.jdt.ui.prefs b/itests/applications/versioning/src/main/resources/root-war/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/.settings/org.eclipse.jdt.ui.prefs rename to itests/applications/versioning/src/main/resources/root-war/.settings/org.eclipse.jdt.ui.prefs diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/.settings/org.maven.ide.eclipse.prefs b/itests/applications/versioning/src/main/resources/root-war/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/.settings/org.maven.ide.eclipse.prefs rename to itests/applications/versioning/src/main/resources/root-war/.settings/org.maven.ide.eclipse.prefs diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/pom.xml b/itests/applications/versioning/src/main/resources/root-war/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/pom.xml rename to itests/applications/versioning/src/main/resources/root-war/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/root-war.war b/itests/applications/versioning/src/main/resources/root-war/root-war.war similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/root-war.war rename to itests/applications/versioning/src/main/resources/root-war/root-war.war diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithContext.java b/itests/applications/versioning/src/main/resources/root-war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithContext.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithContext.java rename to itests/applications/versioning/src/main/resources/root-war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithContext.java diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithoutContext.java b/itests/applications/versioning/src/main/resources/root-war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithoutContext.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithoutContext.java rename to itests/applications/versioning/src/main/resources/root-war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithoutContext.java diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/src/main/webapp/WEB-INF/jonas-web.xml b/itests/applications/versioning/src/main/resources/root-war/src/main/webapp/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/src/main/webapp/WEB-INF/jonas-web.xml rename to itests/applications/versioning/src/main/resources/root-war/src/main/webapp/WEB-INF/jonas-web.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/src/main/webapp/WEB-INF/web.xml b/itests/applications/versioning/src/main/resources/root-war/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/src/main/webapp/WEB-INF/web.xml rename to itests/applications/versioning/src/main/resources/root-war/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/root-war/src/main/webapp/test.jsp b/itests/applications/versioning/src/main/resources/root-war/src/main/webapp/test.jsp similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/root-war/src/main/webapp/test.jsp rename to itests/applications/versioning/src/main/resources/root-war/src/main/webapp/test.jsp diff --git a/jonas/itests/applications/versioning/src/main/resources/secured-war/secured-war.war b/itests/applications/versioning/src/main/resources/secured-war/secured-war.war similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/secured-war/secured-war.war rename to itests/applications/versioning/src/main/resources/secured-war/secured-war.war diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/.classpath b/itests/applications/versioning/src/main/resources/version1.0.0/.classpath similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/.classpath rename to itests/applications/versioning/src/main/resources/version1.0.0/.classpath diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/.project b/itests/applications/versioning/src/main/resources/version1.0.0/.project similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/.project rename to itests/applications/versioning/src/main/resources/version1.0.0/.project diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.eclipse.jdt.core.prefs b/itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.eclipse.jdt.core.prefs rename to itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.eclipse.jdt.core.prefs diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.eclipse.jdt.ui.prefs b/itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.eclipse.jdt.ui.prefs rename to itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.eclipse.jdt.ui.prefs diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.maven.ide.eclipse.prefs b/itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.maven.ide.eclipse.prefs rename to itests/applications/versioning/src/main/resources/version1.0.0/.settings/org.maven.ide.eclipse.prefs diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/ear/pom.xml b/itests/applications/versioning/src/main/resources/version1.0.0/ear/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/ear/pom.xml rename to itests/applications/versioning/src/main/resources/version1.0.0/ear/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/ejb/pom.xml b/itests/applications/versioning/src/main/resources/version1.0.0/ejb/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/ejb/pom.xml rename to itests/applications/versioning/src/main/resources/version1.0.0/ejb/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBean.java b/itests/applications/versioning/src/main/resources/version1.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBean.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBean.java rename to itests/applications/versioning/src/main/resources/version1.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBean.java diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBeanImpl.java b/itests/applications/versioning/src/main/resources/version1.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBeanImpl.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBeanImpl.java rename to itests/applications/versioning/src/main/resources/version1.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBeanImpl.java diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/pom.xml b/itests/applications/versioning/src/main/resources/version1.0.0/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/pom.xml rename to itests/applications/versioning/src/main/resources/version1.0.0/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/test-versioning.ear b/itests/applications/versioning/src/main/resources/version1.0.0/test-versioning.ear similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/test-versioning.ear rename to itests/applications/versioning/src/main/resources/version1.0.0/test-versioning.ear diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/pom.xml b/itests/applications/versioning/src/main/resources/version1.0.0/war/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/pom.xml rename to itests/applications/versioning/src/main/resources/version1.0.0/war/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/java/org/ow2/jonas/test/versioning/TestServlet.java b/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/java/org/ow2/jonas/test/versioning/TestServlet.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/java/org/ow2/jonas/test/versioning/TestServlet.java rename to itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/java/org/ow2/jonas/test/versioning/TestServlet.java diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/WEB-INF/web.xml b/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/WEB-INF/web.xml rename to itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/index.html b/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/index.html similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/index.html rename to itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/index.html diff --git a/jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/test.jsp b/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/test.jsp similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/test.jsp rename to itests/applications/versioning/src/main/resources/version1.0.0/war/src/main/webapp/test.jsp diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/.classpath b/itests/applications/versioning/src/main/resources/version2.0.0/.classpath similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/.classpath rename to itests/applications/versioning/src/main/resources/version2.0.0/.classpath diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/.project b/itests/applications/versioning/src/main/resources/version2.0.0/.project similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/.project rename to itests/applications/versioning/src/main/resources/version2.0.0/.project diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.eclipse.jdt.core.prefs b/itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.eclipse.jdt.core.prefs rename to itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.eclipse.jdt.core.prefs diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.eclipse.jdt.ui.prefs b/itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.eclipse.jdt.ui.prefs rename to itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.eclipse.jdt.ui.prefs diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.maven.ide.eclipse.prefs b/itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.maven.ide.eclipse.prefs similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.maven.ide.eclipse.prefs rename to itests/applications/versioning/src/main/resources/version2.0.0/.settings/org.maven.ide.eclipse.prefs diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/ear/pom.xml b/itests/applications/versioning/src/main/resources/version2.0.0/ear/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/ear/pom.xml rename to itests/applications/versioning/src/main/resources/version2.0.0/ear/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/ejb/pom.xml b/itests/applications/versioning/src/main/resources/version2.0.0/ejb/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/ejb/pom.xml rename to itests/applications/versioning/src/main/resources/version2.0.0/ejb/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBean.java b/itests/applications/versioning/src/main/resources/version2.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBean.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBean.java rename to itests/applications/versioning/src/main/resources/version2.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBean.java diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBeanImpl.java b/itests/applications/versioning/src/main/resources/version2.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBeanImpl.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBeanImpl.java rename to itests/applications/versioning/src/main/resources/version2.0.0/ejb/src/main/java/org/ow2/jonas/test/versioning/TestBeanImpl.java diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/pom.xml b/itests/applications/versioning/src/main/resources/version2.0.0/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/pom.xml rename to itests/applications/versioning/src/main/resources/version2.0.0/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/test-versioning.ear b/itests/applications/versioning/src/main/resources/version2.0.0/test-versioning.ear similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/test-versioning.ear rename to itests/applications/versioning/src/main/resources/version2.0.0/test-versioning.ear diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/pom.xml b/itests/applications/versioning/src/main/resources/version2.0.0/war/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/pom.xml rename to itests/applications/versioning/src/main/resources/version2.0.0/war/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithContext.java b/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithContext.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithContext.java rename to itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithContext.java diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithoutContext.java b/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithoutContext.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithoutContext.java rename to itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/RedirectServletWithoutContext.java diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/TestServlet.java b/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/TestServlet.java similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/TestServlet.java rename to itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/java/org/ow2/jonas/test/versioning/TestServlet.java diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/WEB-INF/web.xml b/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/WEB-INF/web.xml rename to itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/index.html b/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/index.html similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/index.html rename to itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/index.html diff --git a/jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/test.jsp b/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/test.jsp similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/test.jsp rename to itests/applications/versioning/src/main/resources/version2.0.0/war/src/main/webapp/test.jsp diff --git a/jonas/itests/applications/versioning/src/main/resources/welcome-file/pom.xml b/itests/applications/versioning/src/main/resources/welcome-file/pom.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/welcome-file/pom.xml rename to itests/applications/versioning/src/main/resources/welcome-file/pom.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/WEB-INF/jonas-web.xml b/itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/WEB-INF/jonas-web.xml rename to itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/WEB-INF/jonas-web.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/WEB-INF/web.xml b/itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/WEB-INF/web.xml rename to itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/index.jspx b/itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/index.jspx similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/index.jspx rename to itests/applications/versioning/src/main/resources/welcome-file/src/main/webapp/index.jspx diff --git a/jonas/itests/applications/versioning/src/main/resources/welcome-file/test-versioning-welcome.war b/itests/applications/versioning/src/main/resources/welcome-file/test-versioning-welcome.war similarity index 100% rename from jonas/itests/applications/versioning/src/main/resources/welcome-file/test-versioning-welcome.war rename to itests/applications/versioning/src/main/resources/welcome-file/test-versioning-welcome.war diff --git a/jonas/itests/cargo/iiop/pom.xml b/itests/cargo/iiop/pom.xml similarity index 100% rename from jonas/itests/cargo/iiop/pom.xml rename to itests/cargo/iiop/pom.xml diff --git a/jonas/itests/cargo/irmi/pom.xml b/itests/cargo/irmi/pom.xml similarity index 100% rename from jonas/itests/cargo/irmi/pom.xml rename to itests/cargo/irmi/pom.xml diff --git a/jonas/itests/cargo/jetty6/pom.xml b/itests/cargo/jetty6/pom.xml similarity index 100% rename from jonas/itests/cargo/jetty6/pom.xml rename to itests/cargo/jetty6/pom.xml diff --git a/jonas/itests/cargo/jetty8/pom.xml b/itests/cargo/jetty8/pom.xml similarity index 100% rename from jonas/itests/cargo/jetty8/pom.xml rename to itests/cargo/jetty8/pom.xml diff --git a/jonas/itests/cargo/jrmp/pom.xml b/itests/cargo/jrmp/pom.xml similarity index 100% rename from jonas/itests/cargo/jrmp/pom.xml rename to itests/cargo/jrmp/pom.xml diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas290Test.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas290Test.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas290Test.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas290Test.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas292Test.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas292Test.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas292Test.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas292Test.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas96Test.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas96Test.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas96Test.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/BugJonas96Test.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/CargoTest.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/CargoTest.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/CargoTest.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/CargoTest.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/ClassLoaderTest.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/ClassLoaderTest.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/ClassLoaderTest.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/ClassLoaderTest.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/CookieManager.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/CookieManager.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/CookieManager.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/CookieManager.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JDBCConnectionLeakTest.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JDBCConnectionLeakTest.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JDBCConnectionLeakTest.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JDBCConnectionLeakTest.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JaxWSAddTest.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JaxWSAddTest.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JaxWSAddTest.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JaxWSAddTest.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JaxWSTest.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JaxWSTest.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JaxWSTest.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JaxWSTest.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JndiTest.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JndiTest.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JndiTest.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/JndiTest.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/MultitenantTest.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/MultitenantTest.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/MultitenantTest.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/MultitenantTest.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/TestCommons.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/TestCommons.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/TestCommons.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/TestCommons.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/VersioningTest.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/VersioningTest.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/VersioningTest.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/VersioningTest.java diff --git a/jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/WebServicesAuditTestCase.java b/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/WebServicesAuditTestCase.java similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/WebServicesAuditTestCase.java rename to itests/cargo/jrmp/src/test/java/org/ow2/jonas/itests/cargo/jrmp/WebServicesAuditTestCase.java diff --git a/jonas/itests/cargo/jrmp/src/test/resources/jonas-290.war b/itests/cargo/jrmp/src/test/resources/jonas-290.war similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/resources/jonas-290.war rename to itests/cargo/jrmp/src/test/resources/jonas-290.war diff --git a/jonas/itests/cargo/jrmp/src/test/resources/jonas-292.jar b/itests/cargo/jrmp/src/test/resources/jonas-292.jar similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/resources/jonas-292.jar rename to itests/cargo/jrmp/src/test/resources/jonas-292.jar diff --git a/jonas/itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/jndi/ca-jndi-empty-value-test.xml b/itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/jndi/ca-jndi-empty-value-test.xml similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/jndi/ca-jndi-empty-value-test.xml rename to itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/jndi/ca-jndi-empty-value-test.xml diff --git a/jonas/itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/jndi/ca-jndi-sample-example.xml b/itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/jndi/ca-jndi-sample-example.xml similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/jndi/ca-jndi-sample-example.xml rename to itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/jndi/ca-jndi-sample-example.xml diff --git a/jonas/itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/soap-request-add.xml b/itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/soap-request-add.xml similarity index 100% rename from jonas/itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/soap-request-add.xml rename to itests/cargo/jrmp/src/test/resources/org/ow2/jonas/itests/cargo/jrmp/soap-request-add.xml diff --git a/jonas/itests/cargo/pom.xml b/itests/cargo/pom.xml similarity index 100% rename from jonas/itests/cargo/pom.xml rename to itests/cargo/pom.xml diff --git a/jonas/itests/cargo/safe-startup/pom.xml b/itests/cargo/safe-startup/pom.xml similarity index 100% rename from jonas/itests/cargo/safe-startup/pom.xml rename to itests/cargo/safe-startup/pom.xml diff --git a/jonas/itests/cargo/safe-startup/src/test/java/org/ow2/jonas/itest/safe/startup/FailStartOnErrorTestCase.java b/itests/cargo/safe-startup/src/test/java/org/ow2/jonas/itest/safe/startup/FailStartOnErrorTestCase.java similarity index 100% rename from jonas/itests/cargo/safe-startup/src/test/java/org/ow2/jonas/itest/safe/startup/FailStartOnErrorTestCase.java rename to itests/cargo/safe-startup/src/test/java/org/ow2/jonas/itest/safe/startup/FailStartOnErrorTestCase.java diff --git a/jonas/itests/cargo/safe-startup/src/test/resources/wrongDeployable.xml b/itests/cargo/safe-startup/src/test/resources/wrongDeployable.xml similarity index 100% rename from jonas/itests/cargo/safe-startup/src/test/resources/wrongDeployable.xml rename to itests/cargo/safe-startup/src/test/resources/wrongDeployable.xml diff --git a/jonas/itests/cargo/security/pom.xml b/itests/cargo/security/pom.xml similarity index 100% rename from jonas/itests/cargo/security/pom.xml rename to itests/cargo/security/pom.xml diff --git a/jonas/itests/cargo/security/src/test/java/org/ow2/jonas/itests/cargo/jmx_security/JmxSecurityTest.java b/itests/cargo/security/src/test/java/org/ow2/jonas/itests/cargo/jmx_security/JmxSecurityTest.java similarity index 100% rename from jonas/itests/cargo/security/src/test/java/org/ow2/jonas/itests/cargo/jmx_security/JmxSecurityTest.java rename to itests/cargo/security/src/test/java/org/ow2/jonas/itests/cargo/jmx_security/JmxSecurityTest.java diff --git a/jonas/itests/cargo/tomcat6/pom.xml b/itests/cargo/tomcat6/pom.xml similarity index 100% rename from jonas/itests/cargo/tomcat6/pom.xml rename to itests/cargo/tomcat6/pom.xml diff --git a/jonas/itests/intravm/pom.xml b/itests/intravm/pom.xml similarity index 100% rename from jonas/itests/intravm/pom.xml rename to itests/intravm/pom.xml diff --git a/jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/JOnASLauncher.java b/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/JOnASLauncher.java similarity index 100% rename from jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/JOnASLauncher.java rename to itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/JOnASLauncher.java diff --git a/jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/OSGiHttpServiceTest.java b/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/OSGiHttpServiceTest.java similarity index 100% rename from jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/OSGiHttpServiceTest.java rename to itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/OSGiHttpServiceTest.java diff --git a/jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/resource/RegisterResourceTestActivator.java b/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/resource/RegisterResourceTestActivator.java similarity index 100% rename from jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/resource/RegisterResourceTestActivator.java rename to itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/resource/RegisterResourceTestActivator.java diff --git a/jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/MyServlet.java b/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/MyServlet.java similarity index 100% rename from jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/MyServlet.java rename to itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/MyServlet.java diff --git a/jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/RegisterServletTestActivator.java b/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/RegisterServletTestActivator.java similarity index 100% rename from jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/RegisterServletTestActivator.java rename to itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/RegisterServletTestActivator.java diff --git a/jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/SimpleTestServlet.java b/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/SimpleTestServlet.java similarity index 100% rename from jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/SimpleTestServlet.java rename to itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/osgi/httpservice/servlet/SimpleTestServlet.java diff --git a/jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/workdir/TestWorkDir.java b/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/workdir/TestWorkDir.java similarity index 100% rename from jonas/itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/workdir/TestWorkDir.java rename to itests/intravm/src/test/java/org/ow2/jonas/itests/intravm/workdir/TestWorkDir.java diff --git a/jonas/itests/intravm/src/test/resources/index.html b/itests/intravm/src/test/resources/index.html similarity index 100% rename from jonas/itests/intravm/src/test/resources/index.html rename to itests/intravm/src/test/resources/index.html diff --git a/jonas/itests/intravm/src/test/resources/test.html b/itests/intravm/src/test/resources/test.html similarity index 100% rename from jonas/itests/intravm/src/test/resources/test.html rename to itests/intravm/src/test/resources/test.html diff --git a/jonas/itests/osgi/base/pom.xml b/itests/osgi/base/pom.xml similarity index 100% rename from jonas/itests/osgi/base/pom.xml rename to itests/osgi/base/pom.xml diff --git a/jonas/itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/OSGiTestCase.java b/itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/OSGiTestCase.java similarity index 100% rename from jonas/itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/OSGiTestCase.java rename to itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/OSGiTestCase.java diff --git a/jonas/itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/TestOSGiDataSourceFactory.java b/itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/TestOSGiDataSourceFactory.java similarity index 100% rename from jonas/itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/TestOSGiDataSourceFactory.java rename to itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/TestOSGiDataSourceFactory.java diff --git a/jonas/itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/TestOSGiDataSourceService.java b/itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/TestOSGiDataSourceService.java similarity index 100% rename from jonas/itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/TestOSGiDataSourceService.java rename to itests/osgi/base/src/test/java/org/ow2/jonas/itests/osgi/TestOSGiDataSourceService.java diff --git a/jonas/itests/osgi/equinox/pom.xml b/itests/osgi/equinox/pom.xml similarity index 100% rename from jonas/itests/osgi/equinox/pom.xml rename to itests/osgi/equinox/pom.xml diff --git a/jonas/itests/osgi/felix/pom.xml b/itests/osgi/felix/pom.xml similarity index 100% rename from jonas/itests/osgi/felix/pom.xml rename to itests/osgi/felix/pom.xml diff --git a/jonas/itests/osgi/knopflerfish/pom.xml b/itests/osgi/knopflerfish/pom.xml similarity index 100% rename from jonas/itests/osgi/knopflerfish/pom.xml rename to itests/osgi/knopflerfish/pom.xml diff --git a/jonas/itests/osgi/pom.xml b/itests/osgi/pom.xml similarity index 100% rename from jonas/itests/osgi/pom.xml rename to itests/osgi/pom.xml diff --git a/jonas/itests/osgi/src/test/configuration/testng-osgi.xml b/itests/osgi/src/test/configuration/testng-osgi.xml similarity index 100% rename from jonas/itests/osgi/src/test/configuration/testng-osgi.xml rename to itests/osgi/src/test/configuration/testng-osgi.xml diff --git a/jonas/itests/osgi/src/test/configuration/testng.xml b/itests/osgi/src/test/configuration/testng.xml similarity index 100% rename from jonas/itests/osgi/src/test/configuration/testng.xml rename to itests/osgi/src/test/configuration/testng.xml diff --git a/jonas/itests/pom.xml b/itests/pom.xml similarity index 100% rename from jonas/itests/pom.xml rename to itests/pom.xml diff --git a/jonas_doc/.gitignore b/jonas_doc/.gitignore deleted file mode 100644 index 41f4ad1cab066fe2f7e6c55285927a0fa035efcf..0000000000000000000000000000000000000000 --- a/jonas_doc/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -output/ -src/docbook/doc-en/cmi/ -src/docbook/doc-en/easybeans/ - diff --git a/jonas_doc/.project b/jonas_doc/.project deleted file mode 100644 index 451f84138c0e6161dba861cf8d3c743f11b2ab6f..0000000000000000000000000000000000000000 --- a/jonas_doc/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - jonas_doc - - - - - - - - diff --git a/jonas_doc/README b/jonas_doc/README deleted file mode 100644 index b794d1073942aa06012f22e0aa59e36a71e71ca2..0000000000000000000000000000000000000000 --- a/jonas_doc/README +++ /dev/null @@ -1,65 +0,0 @@ -Note for Windows user. -================================ - -Please add all the content of \tools\win32 in your WINDOWS\system32 folder. - - - -Release process -================================ - -0. SVN checkout -Checkout the jonas_doc using that kind of URL: ->$ svn co svn+ssh://$USERNAME@svn.forge.objectweb.org/svnrot/.... - -1. Update version numbers in build.properties -JOnAS -> product.version // most important :) -Easybeans -> easybeans.version -CMI -> cmi.version - -Notice that this version should not contains -SNAPSHOT - -=> Commit - -2. Update project's in pom.xml - -2.1 Version -XPath: /project/version - -Notice that the version should ends with -SNAPSHOT (this is the maven release plugin that will update that value) - -2.2 Maven username -Use ${maven.username} in place of the hardcoded username -XPath: /project/scm/developerConnection - -=> Commit - -3. Release using maven - -IMPORTANT: Clean up your Ant generated output directory before preparing the release (avoid >10MB src jar file) - ->$ cd core ->$ ant clean ->$ cd .. - ->$ mvn -Dmaven.username=$USERNAME -DaddSchema=false release:clean release:prepare - - Maven says that there are still some remaining snapshot dependencies annd ask if we want to resolve them now - - Answer yes (default is no and lead to a build failure) and that you want to resolve only Project Dependencies (default choice) - - Set the correct release number = the tag version - - Reset the dependency version for development to ${project.version} - - Continue the release process as usual - ... ->$ mvn release:perform - -4. Deploy the distribution using ant - -Move to the checkouted tag used by release:perform ->$ cd target/checkout/core - -and finally deploy using ant ->$ ant stage - -5. Update version numbers in build.properties (finally) - -Update product.version to the new development version - diff --git a/jonas_doc/core/build.properties b/jonas_doc/core/build.properties deleted file mode 100644 index 26886a26fee789655d3b726ccac106e33b4d5415..0000000000000000000000000000000000000000 --- a/jonas_doc/core/build.properties +++ /dev/null @@ -1,14 +0,0 @@ -docbook.dtd.location=tools/docbook-5.0/dtc/docbook.dtd -docbook.public.id=-//OASIS//DTD DocBook XML V5.0//EN -fop.dir=tools/fop-0.95 -docbook.xsl.dir=tools/docbook-xsl-ns-1.76.1 - -# Product version -product.version = 5.3.0-M8-SNAPSHOT - -# EasyBeans Doc version to use -easybeans.version = 1.2.0-M1 - -# CMI Doc version to use -cmi.version = 2.1.2 - diff --git a/jonas_doc/core/build.xml b/jonas_doc/core/build.xml deleted file mode 100644 index bf3e13e05db85e9b2a377b59a39de06d8abe80d2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/build.xml +++ /dev/null @@ -1,677 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ========================================================== - Generating @{file} - * formats: PDF & HTML & HTML Chunks - * language: @{lang} - ========================================================== - - - - - - - - - - - ========================================================== - Generating @{file} - * formats: PDF & HTML - * language: @{lang} - ========================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - xsltproc - file:@{file} - xsltproc - output:@{output} - xsltproc - style.file:@{style} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/olddoc/Admin.html b/jonas_doc/core/olddoc/Admin.html deleted file mode 100644 index dcb898daaf1a5b6cc8ddd483a14b3d43c43fb625..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/Admin.html +++ /dev/null @@ -1,337 +0,0 @@ - - - - - - - Administration Guide - - - -

Administration Guide

- -

The target audience for this guide is the JOnAS server administrator.

- -

JOnAS provides the following two tools for performing some administration -tasks on a running JOnAS Server:

- -

These tools also allow administration of several JOnAS Servers. Each JOnAS -Server is identified by a name, which is the value of the -n -option used in the jonas start command (the default name is -jonas).

- - - -Begining with JOnAS 4, we also provide the -J2EE Management EJB component (MEJB), as specified by the -J2EE Management Specification which defines the J2EE Management Model. - -

jonas admin

- -

jonas admin is described in the JOnAS -Commands chapter.

- -

JonasAdmin

- -

This chapter provides information about installing, configuring, and using -the JonasAdmin administration console.

- -

JonasAdmin is the new administration tool for JOnAS and replaces the -deprecated Jadmin tool.

- -

JonasAdmin was developed using the Struts framework; it uses -standard technologies such as Java Servlets and JavaServer Pages. JonasAdmin -is more ergonomic than Jadmin and provides integrated administration -facilities for a Tomcat server running embedded in JOnAS.

- -

Installing JonasAdmin

- -

Designed as a web application, JonasAdmin is packed in a WAR and installed -under the JONAS_ROOT/webapps/autoload/ directory. This WAR can -be installed in JONAS_BASE/webapps/autoload if a JONAS_BASE -variable has been defined in the environment. When installed in the -autoload directory, JonasAdmin is deployed when starting the -JOnAS server, thus the administration console is automatically accessible.

- -

As with any web application, JonasAdmin requires a servlet server to be -installed. Additionally, the JOnAS server running JonasAdmin must have the -web container service present in the list of services defined in the -jonas.properties configuration file.

- -

When accessing JonasAdmin, the administrator must provide identification -and authentication.
-The jonas-realm.xml configuration file contains a memory realm -definition named memrlm_1, which is referenced in both -server.xml (for Tomcat) and jetty.xml (for Jetty) configuration files. The -default user name (jonas) and -password (jonas) corresponding to the admin -role can be modified here.
-

- -

Using JonasAdmin

- -

Once started, JonasAdmin can administer the JOnAS server in which it is -running, as well as other JOnAS servers with which it shares the same -registry. Typically, this is used to administer JOnAS servers running without -the WEB container service.
-Note that the administered JOnAS servers can be running on the same host or -on different hosts. Also, if Tomcat is used as the WEB container service -implementation, it can be administered using JonasAdmin.

- -

Running JonasAdmin

- -

Ensure that the web service is listed in the -jonas.services property in the jonas.properties -configuration file. If you are not using a jonas-tomcat or jonas-jetty -package, depending on the Servlet container being used, the -CATALINA_HOME or the JETTY_HOME environment -variable must have been previously set. Note that when running the Servlet -container on top of Unix, the DISPLAY environment variable must -be set in order to use the JOnAS server monitoring feature of JonasAdmin.

- -

Once JOnAS is launched, JonasAdmin must be loaded if it was not installed -in the autoload directory. The administration console is -accessible at the URL: -http://<hostname>:<portnumber>/jonasAdmin/ -using any web browser.

- -

<hostname> is the name of the host where the Servlet -container is running and <portnumber> is the http port number -(default is 9000).

- -

After logging in, the left-hand frame in the Welcome page displays the -management tree associated with the JOnAS server running JonasAdmin. -Starting with JOnAS 4.6, the management tree's root is Domain, which -corresponds to the new domain management facilities. -

-

In the image below, JonasAdmin is running on the master server named jonas -within a domain also named jonas. It is immediately apparent that this is a -master server, as we have a Deployment sub-tree under the Domain -root node. -

- -
-JonasAdmin -
- -

The management tree in this figure allows access to the following main -management facilities:

- - -

Server management

- -

Displays general information about the administered JOnAS server, -including the JMX server and the WEB server, and provides the capability of -listing the content of the Registry.

- -
Server monitoring
- -

Presents memory usage, a count of the threads created by JOnAS, and other -monitoring information concerning managed services and resources.

- -
Logging management
- -

Allows the administrator to configure the JOnAS Logging system. -Additionally, if Tomcat is used as the WEB container service implementation, -it allows creation of new access log valves.

- -
Communication protocols management
- -

This management facility relates to the integration of Tomcat management -in JonasAdmin.
-It currently presents connectors defined in the Tomcat configuration and -allows for the creation of new HTTP, HTTPS, or AJP connectors.
-Note that the Protocols sub-tree is not presented if Jetty is -used as the WEB container service implementation.

- -
Active services presentation and configuration
- -

All the active services have a corresponding sub-tree in the -Services tree.

- -

Managing the various container services consists of presenting information -about the components deployed in these containers. New components can be -deployed using the dynamic deployment facilities presented in the next -section.

-

-Creation of a new context for WEB components to be deployed in the Tomcat server -is deprecated since JOnAS 4.6 (the New web application button is -removed). -

- -

Similarly, the services that allow management of the different types of -resources (DataSources, Resource Adapters, Jms and Mail resources) also -provide information about the resources being deployed. Additionally, -deployed resources (DataSources or MailFactories) can be reconfigured and -their new configuration made persistent by using a Save -button.

- -

The transaction service management allows reconfiguration (possibly -persistent) and presents monitoring information about transactions managed by -JOnAS.

- -
Dynamic deployment with JonasAdmin
- -

A very useful management operation is the capability of loading -stand-alone J2EE components (JAR, WAR, RAR packages) or J2EE applications -(EAR packages) in the administered server using the Deployment -sub-tree. -

-

-The administrator's task is facilitated by the display of the list of -deployable modules, the list of deployed modules, and the capability of -transferring modules from one list to another (which corresponds to -deploy/undeploy operations. -

-

-The deployable modules are files installed in directories specific to their type. For example, the -deployable JARs are un-deployed JARs installed in -JONAS_BASE/ejbjars/ or in a -JONAS_BASE/ejbjars/autoload/ directory. -

-

-The Deployment sub-tree also allows a J2EE package to be uploaded from -the local file system to the corresponding directory of the administered server -(install operation), and the opposite remove operation. -

- -
Resources management
-The Resources sub-tree provides the capability of loading or -creating new resources managed by the active services. For example, if the -JMS service is running, the JMS sub-tree in Resources presents -the existing JMS destinations (Topics and Queues), and allows the removal of -unused destinations and the creation of new JMS destinations.
-Adding or removing resources implies reconfiguration of the corresponding -service. If this new configuration is saved using the Save -button, the JOnAS configuration file is updated. As in the JMS service -example, the removed topics are deleted from the list assigned to the -jonas.service.jms.topics property and the newly created topics -are added to this list. - -
Security management
-The Security sub-tree presents existing security realms and -allows the creation of new realms of different types: memory, datasource, and -ldap realms. - -

Domain management

-

-First recall that domain management functions are accessible only when JonasAdmin -is deployed on a master server. The Domain tree contains only one -Server sub-tree, the currently administered server, which is initially -the server hosting JonasAdmin.

-

-Domain management principal function is to present the domain topology: list all the servers and clusters -belonging to the domain. It also allows modification of the domain topology by adding new servers and clusters -to the domain, removing servers and moving servers to/from clusters.

-

-In JOnAS 4.6 there is no cluster support, and the domain topology cannot be modified. The servers presented as belonging -to the domain are those that have been started with their discovery service enabled.

-

-In JOnAS 4.7, domain management page also presents servers that are not yet started but are specified as -belonging to the domain in the new configuration file named domain.xml. -Also, a server can be added to the domain when it has been started without having the discovery service enabled. -

-

-An essential domain management function is that the administrator can switch from the master to any of the -other servers in the domain. Currently, JonasAdmin allows only one category of global domain level management -operation, the deployment operation. Using any other management operation requires switching -to the server to be administered.

- -

Domain level deployment allows for deploying one or more J2EE packages (JARs, WARs, RARs or EARs), which -are installed in the corresponding master directory (ejbjars, webaps, rars or apps), into any running server in the domain. -A deployment operation target may be a server but also a cluster. In this case, the deployment -operation addresses all the running servers in the cluster, including servers in the embedded clusters, if any. -
-The deploy operation may have three semantics: -

-Note that at domain level deployment the Upload and Remove operations -are only related to the master server itself. -

- -

Cluster and Domain management in JOnAS 4.8

- -

Note regarding persistent reconfiguration facilities

-It is important to note that JOnAS and Tomcat have different approaches to -reconfiguration persistency. In JOnAS, every Save operation is -related to a service or a resource reconfiguration. For example, the -administrator can reconfigure a service and a resource, but choose to save -only the new resource configuration.
-In Tomcat, the Save operation is global to all configuration -changes that have been performed. For example, if a new HTTP connector is -reconfigured and a new context created for a web application, both -configuration changes are saved when using the Save -button. - - -

Management EJB Component

-

-The MEJB component exposes the managed objects within the JOnAS -platform as JMX manageable resources. It is packed in an ejb-jar -file installed in the $JONAS_ROOT/ejbjars/autoload directory, -and therefor it is loaded at server start-up.

-

-The MEJB component is registered under the name -java:comp/env/ejb/MEJB.

-

-The current implementation allows access only to the manageable -resources within the current server (the server containing the -MEJB's container).

-

-The JOnAS distribution was enriched with a new example called -j2eemanagement, which shows how the MEJB can be used. -You can find details about this management application in -$JONAS_ROOT/j2eemanagement/README file.

- - - diff --git a/jonas_doc/core/olddoc/Cmi.html b/jonas_doc/core/olddoc/Cmi.html deleted file mode 100755 index 771460e755c2a0be41d013824a245b4986e5c289..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/Cmi.html +++ /dev/null @@ -1,499 +0,0 @@ - - - - - - - CMI Cluster Method Invocation - - - - -

CMI (Clustered Method Invocation)

- -

Introduction

- -

CMI is the protocol cluster for JOnAS ensuring:

- - -

CMI architecture

- -

Getting started with the CMI Protocol

- -

CMI can be enabled in JOnAS by:

- - -

Clustered objects and CMI Registry

- -

CMI brings its own registry for implementing the jndi replication. Each -CMI registry instance over the cluster contains two areas:

- - -

When an object is registered in the registry, the routing to the local or -global area is done according to:

- - -

The entries of the distributed area are lists providing the ability, for -example, to gather several stubs for the the same jndi-name and thus to -return a stubs list.

- -

JNDI HA

- -

Registry Replication

- -

CMI relies on JGroups group-communication protocol for ensuring the global -registry replication. The parameters are gathered in the:

- - -

CMI registry

- -

All the members of a cluster share the same JGroups configuration.

- -

If several cluster partitions are required over a single LAN, several -JGroups configurations must be configured with different values for the -following parameters:

- - -

When a new node appears in the cluster, its registry content is -synchronized automatically.

- -

When a node disappears, JGroups notifies the other's member of the node -leaving and the registry entries related to this node are removed.

- -

Registry Fail-over

- -

On the client side, the high availability of the registry is provided by -the capability to set several JOnAS instances in the registry url. At the -lookup time, the client chooses (round-robin algorithm) one of the available -servers to get the home stub. If the server fails, the request is sent to -another server. The CMI url registry is specified in the -$JONAS_BASE/conf/carol.properties file using the following syntax:

-
carol.cmi.url=cmi://server1:port1[,server2:port2...] 
- -

CMI Cluster Stub or Cluster-aware Stub

- -

Load-balancing and fail-over on the client side are provided through -cluster-aware stubs. These stubs are generated on the fly through ASM and -rely on:

- - -

CMI cluster stub

- -

Cluster Map on the Client Side

- -

The CMI cluster stub handles a cluster map on the client side. The CMI -cluster stub is created:

- - -

In these two cases, the call gets a stubs list from the global registry -and the CMI cluster stub updates the local cluster map. Afterwards, the local -cluster map can be updated dynamically during the invocation of the business methods calls (through the HA interceptors) when a new view is detected in -the cluster.

- -

If a communication error with a server occurs during a remote call -invocation, the server is removed from the cluster map.

- -

CMI Class

- -

CMI classes are generated by GenIC when compiling with the protocol CMI. -They are built from the velocity templates located in -$JONAS_ROOT/templates/genic directory. By default the templates used are:

- - -

The templates inherit the org.objectweb.carol.cmi.Distributor class and -contain the following methods:

- - -

Customizing the Load-balancing and Fail-over Logic

- -

The user has the ability to customize the load-balancing and fail-over -logic for each EJB by specifying the velocity template to use in the JOnAS- -specific descriptor on deployment of the ejb-jar file. The XML elements -are:

-
<cluster-home-distributor>MyHomeDistributor.vm</cluster-home-distributor>
-
<cluster-remote-distributor>MyRemoteDistributor.vm</cluster-remote-distributor>
- -

If not set, the default velocity templates are used.

- -

If set with the value 'disabled', the CMI classes are not generated and -the EJB will not be distributed.

- -

If set with a file name, this file must be located in the -$JONAS_ROOT/templates/genic directory.

- -

The 'cluster-home-distributor' element is valid for the SSB, SFSB and -EB.

- -

The 'cluster-remote-distributor' element is valid for the SSB.

- -

High Availability with Horizontal Replication

- -

Stateful session beans (SFSBs) can be replicated since JOnAS 4.7 in order -to provide high availability in the case of failures in clustered environments. -A new service called High Availability (HA) has been included in JOnAS to -provide replication mechanishms. JOnAS HA also requires the cluster -method invocation (CMI) protocol.

- -

Compared to JOnAS 4.7, JOnAS 4.8 implements a new replication algorithm -based on a horizontal replication approach. The algorithm improves the -algorithm implemented for JOnAS 4.7 with the following enhancements:

- -
  • Replication of SFSBs with references to EBs: The algorithm can replicate -SFSBs that reference EB by means of both, local or remote interfaces.
  • -
  • Transaction awareness: The algorithm is transaction aware, meaning that -the state is not replicated if the transaction aborts.
  • -
  • Exactly-once semantics: Each transaction is committed exactly once at -the DB if the client does not fail. If the client fails, each transaction -is committed at most once at the DB
  • - -

    EJB replication Description

    - -

    Update-everywhere mode

    - -

    JOnAS implements an update-everywhere replication protocol according to -the database replication terminology (See the J. Gray et al.'s paper ''The -dangers of replication and a solution'' in proceedings of the ACM SIGMOD 96's -conference, Canada). In this protocol, a client can connect to any server. -When the client calls the create() method on the SFSB's Home interface, the -server the client connects to is selected following a round-robin scheme. All -the requests from the client to the SFSB will be processed by this server -until the client calls the remove() method on the remote interface. The rest -of the servers will act as backups for that client. Before sending the -response to the client, the SFSB's state is sent to the backups.

    - -

    If the server fails, another server among the backups will be selected to -serve the client requests, first restoring the current state of the SFSBs -from the state information stored in the HA local service. From this point -on, this server will receive the new client requests.

    - -

    The supported replication scenarios are shown in the following figure:

    - -
    -

    Replication scenarios in JOnAS 4.8

    -
    - -

    Transaction aware fail-over

    - -

    The horizontal approach aims to guarantee that the transactions are kept -consistent when a fail-over occurs. They are either aborted or restored -for ensuring the exactly-once semantics. During a fail-over, the new primary -uses a special table in the database for storing the transaction identifier -and enabling to find out if the transaction was committed or not. -

    -Beyond the SFSB replication, the algorithm enables the building of applications -(stateful or stateless) with a high level of reliability and integrity. -

    - -

    Configuring JOnAS for EJB Replication

    - -

    The High Availability (HA) service is required in JOnAS in order to -replicate SFSBs. The HA service must be included in the list of available -services in JOnAS. This is done in the jonas.properties file placed in -$JONAS_BASE/conf.

    -
    ...
    -jonas.services registry,jmx,jtm,db,dbm,security,resource,ejb,ws,web,ear,ha
    -...
    - -

    The HA service must also be configured in the jonas.properties file:

    -
    ...
    -jonas.service.ha.class org.objectweb.jonas.ha.HaServiceImpl
    -jonas.service.ha.gcl jgroups
    -...
    -
    - -

    The HA service uses JGroups as a group communication layer (GCL). JGroups -behavior is specified by means of a stack of properties configured through an -XML file (See JGroups documentation for more -information: http://www.jgroups.org). The default configuration of the HA -service uses the $JONAS_BASE/conf/jgroups-ha.xml file and the sfsb-rep group name. The HA -service can be told to use a particular stack configuration or a particular group name by modifying the following -lines in jonas.properties:

    -
    ...
    -jonas.service.ha.jgroups.conf jgroups-ha.xml
    -jonas.service.ha.jgroups.groupname jonas-rep
    -...
    -Finally, the CMI protocol must be specified in the carol.properties file in -$JONAS_BASE/conf: -
    ...
    -carol.protocols=cmi...
    -...
    - -

    Transaction Table Configuration

    -

    The new horizontal replication algorithm uses a database table -to keep track of current running transactions. This table is accessed from the new -elected node during fail-over to detect whether or not the current transaction committed at -the former local node, ensuring exactly-once semantics. -The table contains only one column: the transaction identifier (txid).

    -

    In JOnAS 4.8 this table must be created manually with the following SQL command:

    -
    create TABLE ha_transactions (txid varchar(60));
    -

    This table should be located preferably in the database used by the replicated -application, but it is not mandatory. If the table is not created in the database -used by the replicated application, it is necessary to configure a new datasource -for the database that contains this transaction table. This datasource must be -configured to use the serializable transaction isolation level.

    - -

    The database that holds the transaction table is accessed by the replication service with -the JNDI name configured in jonas.properties.

    -
    ...
    -jonas.service.ha.datasource tx_table_ds
    -...
    - -

    Configuring Garbage Collection

    -Due to the fact that the replication algorithm stores information associated with -clients' transactions and that the server is not notified when a client dies, -the HA service might have been storing unnecessary replication information over -time. In order to automatically clean this unnecessary replication information, -the HA service includes a garbage collection mechanism. It is possible -to configure the number of seconds the system waits to execute this mechanism -by changing the following property in the jonas.properties file: -
    ...
    -jonas.service.ha.timeout 600
    -...
    - -

    Configuring an Application for Replication

    - -

    jonas-ejb-jar.xml

    - -

    In order to configure an application for replication, the <cluster-replicated/> element must be added to the bean definition of every -bean requiring high availability in the jonas-ejb-jar.xml deployment -descriptor file. This element can have two possible -values: true or false (default value). In addition, if the programmer wants -to change the behavior of the CMI stubs (e.g., the server selection policy), -it is possible to specify different distributor implementations by means of -<cluster-home-distributor/> and <cluster-remote-distributor/> -elements. In this case, the value corresponds to the .vm file that implements -the distributor in its home and remote parts respectively. If the -<cluster-replicated/> element is present without the -<cluster-*-distributor/> elements, the default values are used -(ClusterHomeSFSBRepDistributor.vm and ClusterRemoteSFSBRepDistributor.vm).

    - -

    The following is an example description for a replicated SFSB in -jonas-ejb-jar.xml file:

    -
    ...
    -<jonas-session>
    -   <ejb-name>DummySFSB</ejb-name>
    -   <jndi-name>DummySFSB</jndi-name>
    -   ...
    -   <cluster-replicated>true</cluster-replicated>
    -   <cluster-home-distributor>Dummy_HomeDistributor.vm</cluster-home-distributor>
    -   <cluster-remote-distributor>Dummy_RemoteDistributor.vm</cluster-remote-distributor>
    -</jonas-session>
    -...
    - -

    The <cluster-replicated/> element can also be set in the SSB or EB for -

    -

    - -

    Note: When set in the SSB, the mechanism inhibits the load-balancing at the remote -interface. After the home create() method call, all the requests are sent to the same -instance.

    - -

    Entity Beans lock policy

    - -

    The lock policy for the Entity Beans in a replicated application must be configured -as database in the jonas-ejb-jar.xml deployment descriptor file.

    -

    The following is an example description for a replicated EB in the jonas-ejb-jar.xml:

    -
    ...
    -<jonas-entity>
    -    <ejb-name>MyEntitySLR</ejb-name>
    -    <jndi-name>MyEntityHome</jndi-name>
    -    <cluster-replicated>true</cluster-replicated>
    -    <shared>true</shared>
    -    <jdbc-mapping>
    -        <jndi-name>example_ds</jndi-name>
    -    </jdbc-mapping>
    -    <lock-policy>database</lock-policy>
    -</jonas-entity>
    -...
    - -

    Datasource used by the application

    - -

    The datasources used by replicated applications must be configured to use the -serializable transaction isolation level.

    -

    The following is an example for a datasource configuration file for the Postgres DBMS:

    -
    ...
    -datasource.name         example_ds
    -datasource.url          jdbc:postgresql://xxx.xxx.xxx.xxx:xxxx/database
    -datasource.classname    org.postgresql.Driver
    -datasource.username     jonas
    -datasource.password
    -datasource.mapper       rdb.postgres
    -datasource.isolationlevel       serializable
    -...
    - -

    Finally, when compiling the application that includes the replicated -beans, the CMI protocol must be specified in order to generate the classes -that include the replication logic.

    - -

    Status and Management Information in Admin. Console for the HA Service's Replication Algorithm

    - -The JOnAS administration console offers several items of information about the HA -service's replication algorithm and allows the configuring of several parameters -related to its behaviour. The related information and parameters include: - - - - - - diff --git a/jonas_doc/core/olddoc/Deployer.html b/jonas_doc/core/olddoc/Deployer.html deleted file mode 100644 index 7d6b8a5c144f35a44820ad84b57dc0b95303d1c0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/Deployer.html +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - Deployment and Installation Guide - - - - -

    Deployment and Installation Guide

    - -

    Target audience

    - -

    The target audience for this guide is the application deployer.

    - -

    The content of this guide is the following:

    -
      -
    1. Deployment and installation - process principles
    2. -
    3. Example of deploying and installing - an EJB using an ejb-jar file
    4. -
    5. Deploying and installing a Web - application
    6. -
    7. Deploying and installing a J2EE - application
    8. -
    - -

    Deployment and installation -process principles

    - -

    - -

    The deployment and installation of Enterprise Beans

    - -

    This guide assumes that the Enterprise Bean provider followed the -Enterprise Beans Programmer's Guide and packaged the beans's classes together -with the deployment descriptors in a ejb-jar file. To deploy un-packed -Enterprise Beans, refer to Configuring EJB -Container service.
    -

    - -

    To deploy the Enterprise Beans in JOnAS, the deployer must add the -interposition classes interfacing the EJB components with the services -provided by the JOnAS application server.
    -The GenIC tool supplied in the JOnAS -distribution provides the capability of generating interposition classes and -updating the ejb-jar file.
    -The application deployer may also need to customize the deployment -descriptors in order to adapt it to a specific operational environment. This -must be done before using GenIC.

    - -

    The deployer may choose to deploy the Enterprise Beans as stand-alone -application components, in which case the ejb-jar must be installed in the -$JONAS_ROOT/ejbjars directory. The deployer may also choose to -include them in war or ear packaging, which is presented in the following -sections.

    - -

    The deployment and installation of Web and J2EE applications

    -Once the packaging of the application components has been completed as -described in the WAR Packaging or EAR Packaging guides, the obtained archive file must be -installed in the: - - -

    Example of deploying and installing -an EJB using an ejb-jar file

    - -

    For this example, it is assumed that a user wants to customize the -deployment of the AccountImpl bean in the JOnAS example -examples/src/eb by
    -changing the name of the database table used for the persistence of the -AccountImpl.

    - -

    The current directory is $JONAS_ROOT/examples/src/eb. The -user will do the following:

    - -The JOnAS application Server can now be launched using the command:
    -  jonas start - -

    The steps just described for building the new ejb-jar.jar -file explain the deployment process. It is generally implemented by an ANT -build script.

    - -

    If Apache ANT is installed on your machine, type ant -install in the $JONAS_ROOT/examples/src directory to build -and install all ejb-jar.jar files for the examples.
    -To write a build.xml file for ANT, use the ejbjar -task, which is one of the optional EJB tasks defined -in ANT. The ejbjar task contains a nested element called -jonas, which implements the deployment process described above -(interposition classes generation and EJB-JAR file update).
    -Generally, the latest version of the EJB task containing an updated -implementation of the jonas nested element is provided with -JOnAS, in $JONAS_ROOT/lib/common/ow_jonas_ant.jar. Click here -for the documentation corresponding -to this new version of the jonas nested element.
    -As an example, this code snippet is taken from the -$JONAS_ROOT/examples/src/alarm/build.xml:
    -

    - <!-- ejbjar task  -->
    - <taskdef name="ejbjar"
    -    classname="org.objectweb.jonas.ant.EjbJar"
    -    classpath="${jonas.root}/lib/common/ow_jonas_ant.jar" />
    -
    -  <!-- Deploying ejbjars via ejbjar task  -->
    -  <target name="jonasejbjar"
    -	  description="Build and deploy the ejb-jar file"
    -	  depends="compile" >
    -    <ejbjar basejarname="alarm"
    -	    srcdir="${classes.dir}"
    -	    descriptordir="${src.dir}/beans/org/objectweb/alarm/beans"
    -            dependency="full">
    -      <include name="**/alarm.xml"/>
    -      <support dir="${classes.dir}">
    -	<include name="**/ViewProxy.class"/>
    -      </support>
    -      <jonas destdir="${dist.ejbjars.dir}"
    -             jonasroot="${jonas.root}"
    -             protocols="${protocols.names}" />
    -    </ejbjar>
    -  </target>
    -
    -

    - -

    Deploying and installing a Web -application

    - -

    Before deploying a web application in the JOnAS application server, first -package its components in a war file as explained in the WAR packaging guide.
    -For Apache ANT, refer to the target war in the -$JONAS_ROOT/examples/earsample/build.xml file.

    - -

    Next, install the war file into the -$JONAS_ROOT/webapps directory.
    -Note: Be aware that the war file must not be installed in the -$CATALINA_HOME/webapps directory.

    - -

    Then, check the configuration: before running the web application; -check that the web service is present in the -jonas.services property. The ejb service may also be -needed if the Web application uses enterprise beans.
    -The name of the war file can be added in the -jonas.service.web.descriptors section.

    - -

    Finally, run the application Server:
    -  jonas start

    - -

    The web components are deployed in a web container created during the -startup. If the war file was not added in the -jonas.service.web.descriptors list, the web components can be -dynamically deployed using the jonas admin command or -JonasAdmin tool.

    - -

    Deploying and installing a J2EE -application

    - -

    Before deploying a J2EE application in the JOnAS application server, first -package its components in an ear file as explained in the EAR packaging -guide.
    -For Apache ANT, refer to the target ear in the -$JONAS_ROOT/examples/earsample/build.xml file.

    - -

    Next, install the ear file into the $JONAS_ROOT/apps -directory.

    - -

    Then, check the configuration: before running the application, -check that the ejb, web and ear services are -present in the jonas.services property.
    -The name of the ear file can be added in the -jonas.service.ear.descriptors section.

    - -

    Finally, run the application Server:
    -  jonas start

    - -

    The application components are deployed in EJB and web containers created -during the startup. If the ear file was not added in the -jonas.service.ear.descriptors list, the application components -can be dynamically deployed using the jonas admin command or -JonasAdmin tool.

    - - diff --git a/jonas_doc/core/olddoc/Domain.html b/jonas_doc/core/olddoc/Domain.html deleted file mode 100644 index 8f94f208cc31a2c90f7f0fbc640457055ea2841a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/Domain.html +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - - Domain Management in JOnAS - - - - -

    Domain and Cluster Management in JOnAS

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Rationale
    2. -
    3. Domain and Cluster Management Functions
    4. -
    5. Mechanisms used by Domain Management
    6. -
    7. J2EEDomain MBean
    8. -
    9. MBeans for domain/cluster monitoring
    10. -
    11. How to start Servers in a Domain
    12. -
    13. How to define domain configuration using domain.xml file
    14. -
    - -

    Target Audience and Rationale

    -

    This guide is intended for JOnAS administrators responsible for the configuration - and administration of JOnAS servers running within a management domain. -

    - -

    Domain and Cluster Management Functions

    -

    A JOnAS management domain is composed of a set of JOnAS servers that are running under the same - management authority. All the servers in the domain must have a distinct server name and - a common domain name. -

    -

    The servers in a domain can be administered by a management application running on a server - playing the role of administrator or master. The managed servers play the role of slaves. - Note that it is possible to have several masters in a domain. Also note that default configuration - corresponds to a slave server running without the discovery service (the role of this service is - described below and its configuration here). -

    -

    - Typically, when deploying the JonasAdmin application on a slave, the administrator can manage only - the server on which the application is running. When deploying JonasAdmin on a master server, - the administrator can manage all the known servers in the domain: -

    -

    -

    - Cluster management facilities was introduced in JOnAS 4.7. - A cluster is a group of servers having common properties within a domain. A cluster may be the target of a - domain level management operation - currently applications and J2EE modules deployment only. -

    -

    - The domain topology (servers and clusters composing the domain) can be defined using a new domain.xml - configuration file. Also, servers and clusters may be dynamically added and removed to the domain via JonasAdmin. -

    -

    - Starting with JOnAS 4.8, domain and cluster management is enhanced with monitoring functions available in - JonasAdmin. As in the previous version, clusters may be created by an administrator in a static (via domain.xml) - or dynamic (via JonasAdmin) way. These clusters are now called logical cluster. A new class of clusters - is supported in the current version, the physical clusters that are detected automatically by the management - infrastructure. Several types of physical clusters are supported: Mod JK clusters, Tomcat clusters, CMI clusters, etc. - All the members of a type of physical cluster share specific properties which depend on the cluster type, e.g., all - the members of a CMI cluster have the same JGroups configuration. Note that a given JOnAS instance may belong to - several physical and logical clusters. -

    -

    - An important domain level administration operation introduced in JOnAS 4.8, is the possiblity to start/stop - the managed servers via a so called cluster daemon. - Cluster daemons can be defined and associated - to servers using the domain.xml configuration file. A cluster daemon has to be collocalized (located on the same - machine) with the servers it controls. -

    - -

    Mechanisms used by Domain Management

    -

    Basically, domain management in JOnAS relies on JSR 160 specification. When a JOnAS server is started, - it creates at least one JSR 160 connector server as explained in - JSR 160 support in JOnAS. -

    -

    - A connector server makes it possible for a JMX remote API client to access and manage the MBeans exposed - through the MBean server running in a remote JVM. In order to establish a connection, the remote client - needs to know the address of the connector server. JSR 160 does not provide any specific API that would - make it possible for a client to find the address of a connector server. The standard suggests using - existing discovery and lookup infrastructures, for instance, JNDI API with an LDAP back end. -

    -

    - A new service added to JOnAS, the Discovery Service, allows JOnAS servers running over - a LAN within the same management domain to communicate to each other the connector-server addresses they create - at start-up. All the servers in the domain having the discovery service in the services list, will - publish their connector-server address at start-up. The goal is to allow master servers to - discover which servers are running in their domain, and to establish connections allowing them to remotely - manage the slave servers by a management application deployed on a master server. -

    -

    - Starting with JOnAS 4.7, a server can be added to a domain via a management operation, thus allowing servers which - cannot use the multicast-based discovery service to join a management domain. -

    -

    - The current discovery service implementation is based on MBeans (called discovery MBeans) which use: -

    -

    -

    J2EEDomain MBean

    - Domain management information can be retrieved from J2EEDomain MBean. -

    - The J2EEDomain MBean has the following JMX ObjectName: -

    -  domainName:j2eeType=J2EEDomain,name=domainName
    -    
    - Where domainName is the name of the domain. -

    -

    - A J2EEDomain MBean contains several management attributes and operations related to servers management - in a domain: -

    -

    -

    -

    -

    - Starting with JOnAS 4.7, the J2EEDomain MBean was enriched in order to support adding/removing a server to/from the domain, - creating a cluster in the domain, listing the clusters in a domain. -

    -

    - The following is a list of some of the new management attributes and operations exposed by a J2EEDomain MBean: -

    -

    -

    - In JOnAS 4.7, clusters are implemented as "sub-domains", they have associated J2EEDomain - type MBeans. For example, if a cluster named clust is created in the domain named - domainName, it has an associated MBean with the following JMX ObjectName: -

    -  domainName:j2eeType=J2EEDomain,name=domainName,clusterName=clust,parentClusterName=domainName
    - 
    - -

    - -

    MBeans for domain/cluster monitoring

    -

    - An important re-engineering of domain management mechanisms was conducted in JOnAS 4.8 to support - cluster and domain monitoring. Clusters aren't implemented as sub-domains anymore; there is only - one J2EEDomain MBean registered in the master's MBean server. Another important point - is that the servers' state is no longer accessible in the J2EEDomain MBean (getServerState(serverName) - operation doesn't exist anymore). On the other hand, new MBeans were created: -

    - - -

    Physical clusters

    -Logical clusters are created by the administrator to facilitate management administration on a group of -servers. Physical clusters are created automatically if servers running in the domain have particular -properties which depend on the cluster type. - - -

    How to start manageable servers in a Domain

    -

    The servers must adhere to these rules:

    - -

    Also note the following:

    - -

    Example

    -

    Consider a scenario in which there are three JOnAS servers named jonas, j1 and j2. - Assume that they have discovery service configured with at least one of the servers playing the role of master. -

    - - -

    How to define domain configuration using domain.xml file

    -

    A default domain configuration is provided in $JONAS_ROOT/conf/domain.xml. -This configuration corresponds to a domain named jonas managed by a master -server also named jonas. The location tag defines a JMX remote -connector server URL for this server. -

    - - - diff --git a/jonas_doc/core/olddoc/JOnASWP.html b/jonas_doc/core/olddoc/JOnASWP.html deleted file mode 100644 index d89455ae281d603c9aa8d46d16c631333d4eb6fb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/JOnASWP.html +++ /dev/null @@ -1,868 +0,0 @@ - - - - - The JOnAS Platform - - - - - -

    Java Open Application Server (JOnAS): a -J2EETM Platform

    - -

    Last modified at 2006-11-30, JOnAS 4.8

    -Logo JOnAS - -

    This document provides an overview of the JOnAS platform. The content of -this document is the following:

    - - -

    Introduction

    - -

    J2EE

    - -

    The SunTM J2EE -specification, together with its related specifications ( EJBTM, JMSTM,...), defines -an architecture and interfaces for developing and deploying distributed -Internet JavaTM server applications based on a multi-tier -architecture. This specification intends to facilitate and standardize the -development, deployment, and assembling of application components; such -components will be deployable on J2EE platforms. The resulting applications -are typically web-based, transactional, database-oriented, multi-user, -secured, scalable, and portable. More precisely, this specification describes -two kinds of information:

    - - -

    Not only will an application component be independent of the platform and -operating system (since it is written in Java), it will also be independent -of the J2EE platform.

    - -

    A typical J2EE application is composed of 1) presentation components, also -called "web components" (Servlets and JSPsTM), which define -the application Web interface, and 2) enterprise components, the "Enterprise -JavaBeans" (EJB), which define the application business logic and application -data. The J2EE server provides containers for hosting web and enterprise -components. The container provides the component life-cycle management and -interfaces the components with the services provided by the J2EE server. -There are two types of containers; the web container handles Servlet and JSP -components, while the EJB container handles the Enterprise JavaBeans -components. A J2EE server can also provide an environment for deploying Java -clients (accessing EJBs); it is called client container.

    -J2EE Architecture - -

    ObjectWeb

    - -

    JOnAS is an open source application server, developed within the ObjectWeb -consortium. ObjectWeb is an open -source initiative which can be compared to Apache or Linux, but in the area -of middleware. The aim of ObjectWeb is to develop and -promote open source middleware software.

    - -

    ObjectWeb is an International Consortium hosted by INRIA, officially -founded in February 2002 by Bull, France Telecom, and INRIA. All software is -available with the LGPL license.

    - -

    The technical objective of this consortium is to develop a distributed -component-based, middleware technology, in line with CORBA, Java, and W3C -standards. The intent is to apply the component model, as already used at the -application level in J2EE and in the CORBA Component Model, at the middleware -level itself. The functional coverage of ObjectWeb projects addresses naming, -trading, communication (events, messages), availability and safety -(transactions, persistence, replication, fault tolerance), load balancing, -and security. Some related topics are also addressed, such as robustness, -optimization, code quality, as well as benchmarks, tests, evaluations, -demonstrators, and development tools. More recently, the middleware -eco-system around JOnAS within ObjectWeb addresses Service Oriented -Architecture (SOA).

    - -

    ObjectWeb already has a significant number of members: corporations, -universities, individual members (individual membership is free). ObjectWeb -members contribute to ObjectWeb orientations and participate in all ObjectWeb -working groups, meetings, workshops, and conferences. The community of -developers and users working with ObjectWeb components and platforms is -constantly growing.

    - -

    JOnAS Features

    - -

    JOnAS is a pure Java, open source, application server. Its high modularity -allows to it to be used as

    - - -

    System Requirements

    - -

    JOnAS is available for JDK 1.4 and JDK 5. It has been used on many -operating systems (Linux, AIX, Windows, Solaris, HP-UX, etc.), and with -different Databases (Oracle, PostgreSQL, MySQL, SQL server, Access, DB2, -Versant, Informix, Interbase, etc.).

    - -

    Java Standard Conformance

    - -

    JOnAS supports the deployment of applications conforming to J2EE 1.4 -specification. Its current integration of Tomcat or Jetty as a Web container -ensures conformity to Servlet 2.4 and JSP 2.0 specifications. The JOnAS -server relies on or implements the following Java APIs: EJBTM 2.1, -JTATM 1.0.1, JDBC 3.0, J2EE CATM 1.5, JMXTM -1.2, JNDITM 1.2.1, JMSTM 1.1, JavaMailTM -1.3, ServletTM 2.4, JSPTM 2.0, JAASTM 1.0, -JACCTM 1.0, Web Services 1.1, JAX-RPCTM 1.1, -SAAJTM 1.2, JAXRTM 1.0, J2EE Management 1.0, -JAFTM 1.0, JAXPTM 1.2 specifications. JOnAS is -architectured in terms of services.

    - -

    Key Features

    - -

    JOnAS provides the following important advanced features:

    - - -

    Three critical J2EE aspects were implemented early on in the JOnAS -server:

    - - -

    JOnAS Packages

    - -

    JOnAS is available for download with three different packagings:

    - - -

    These packages also contain AXIS, thus providing pre-configured "Web -Services" support.

    - -

    JOnAS Architecture

    - -

    JOnAS is designed with services in mind. A service typically provides -system resources to containers. Most of the components of the JOnAS -application server are pre-defined JOnAS services. However, it is possible -and easy for an advanced JOnAS user to define a service and to integrate it -into JOnAS. Because J2EE applications do not necessarily need all services, -it is possible to define, at JOnAS server configuration time, the set of -services that are to be launched at server start.

    - -

    The JOnAS architecture is illustrated in the following figure, showing WEB -and EJB containers relying on JOnAS services (this figure only misses the HA -service). Two thin clients are also shown in this figure, one of which is the -JOnAS administration console (called JonasAdmin).

    -J2EE Architecture - -

    Communication and Naming Service

    - -

    This service (also called "Registry") is used for launching the RMI -registry, the CosNaming, and/or the CMI registry, depending on the JOnAS -configuration (CAROL configuration, which specifies which communication -protocols are to be used). There are different registry launching modes: in -the same JVM or not, automatically if not already running. CAROL enables -multi-protocol runtime support and deployment, which avoids having to -redeploy components when changing the communication protocol.

    - -

    This service provides the JNDI API to application components and to other -services in order to bind and lookup remote objects (e.g. EJB Homes) and -resource references (JDBC DataSource, Mail and JMS connection factories, -etc.).

    - -

    EJB Container Service

    - -

    This service is in charge of loading the EJB 2.1 components and their -containers. EJB containers consist of a set of Java classes that implement -the EJB specification and a set of interposition classes that interface the -EJB components with the services provided by the JOnAS application server. -Interposition classes are specific to each EJB component and are generated by -the deployment tool called GenIC; this tool is automatically called at -deployment time, if necessary.

    - -

    Enterprise JavaBeans (EJB) are software components that implement the -business logic of an application (while the Servlets and JSPs implement the -presentation). There are three types of Enterprise JavaBeans:

    - - -

    JOnAS configuration provides a means for specifying a set of ejb-jar files -to be loaded at server start. Ejb-jar files can also be deployed at server -runtime using the JOnAS administration tools.

    - -

    For implementing Container-Managed Persistence of EJB 2.0 and EJB 2.1 -(CMP2), JOnAS relies on the ObjectWeb JORM (Java Object Repository Mapping) -and MEDOR (Middleware Enabling -Distributed Object Requests) frameworks. JORM supports complex mappings of -EJBs to database tables.

    - -

    The JOnAS EJB 2.1 container provides many optimization mechanisms to -improve data access and scalability: pool of instances, caches, lock -policies...

    - -

    JOnAS also implements the Timer Service features as specified in EJB -2.1.

    - -

    WEB Container Service

    - -

    This service is in charge of running a Servlet/JSP Engine in the JVM of -the JOnAS server and of loading web applications ("war" files) within this -engine. Currently, this service can be configured to use Tomcat or Jetty. Servlet/JSP engines are -integrated within JOnAS as "web containers," i.e. such containers provide the -web components with access to the system resources (of the application -server) and to EJB components, in a J2EE-compliant way.

    - -

    JOnAS configuration provides a means for specifying that this service be -launched during JOnAS initialization. Additionally, JOnAS configuration -provides a means for specifying a set of war files to be loaded. War files -may also be deployed at server runtime using the JOnAS administration tools. -User management for Tomcat/Jetty and JOnAS has been unified. The -class-loading delegation policy (priority to the Webapp classloader or to the -parent classloader) can be configured. Tomcat management has been strongly -integrated within the JOnAS management console.

    - -

    Servlet and JSPTM are technologies -for developing dynamic web pages. The Servlet approach allows the development -of Java classes (HTTP Servlets) that can be invoked through HTTP requests and -that generate HTML pages. Typically, Servlets access the information system -using Java APIs (as JDBC or the APIs of EJB components) in order to build the -content of the HTML page they will generate in response to the HTTP request. -The JSP technology is a complement of the Servlet technology. A JSP is an -HTML page containing Java code within particular XML-like tags; this Java -code is in charge of generating the dynamic content of the HTML page.

    - -

    Servlets and JSPs are considered as J2EE application components, -responsible for the application presentation logic. Such application -components can access resources provided by the J2EE server (such as JDBC -datasources, JMS connection factories, EJBs, mail factories). For J2EE -components, the actual assignment of these resources is performed at -component deployment time and is specified in the deployment descriptor of -each component, since the component code uses logical resource names.

    - -

    Ear Service

    - -

    This service is used for deploying complete J2EE applications, i.e. -applications packaged in EAR files, which themselves contain ejb-jar files -and/or war files. This service handles the EAR files and delegates the -deployment of the war files to the WEB Container service and the ejb-jar -files to the EJB Container service. It handles creating the appropriate class -loaders, in order for the J2EE application to execute properly.

    - -

    For deploying J2EE applications, JOnAS must be configured to launch the -EAR service and to specify the set of EAR files to be loaded. EAR files can -also be deployed at server runtime using the JOnAS administration tools.

    - -

    Transaction Service

    - -

    This service encapsulate a Java Transaction Monitor called JOTM (a project from ObjectWeb). It is a -mandatory service which handles distributed transactions. It provides -transaction management for EJB components as defined in their deployment -descriptors. It handles two-phase commit protocol against any number of -Resource Managers (XA Resources). For J2EE, a transactional resource may be a -JDBC connection, a JMS session, or a J2EE CA Resource Adapter connection. The -transactional context is implicitly propagated with the distributed requests. -The Transaction Monitor can be distributed across one or more JOnAS servers; -thus a transaction may involve several components located on different JOnAS -servers. This service implements the JTA 1.0.1 specification, thus allowing -transactions from application components or from application clients to be -explicitly started and terminated. Starting transactions from application -components is only allowed from Web components, session beans, or -message-driven beans (only these two types of beans, which is called -"Bean-managed transaction demarcation").

    - -

    One of the main advantages of the EJB support for transactions is its -declarative aspect, which means that transaction control is no longer -hard-coded in the server application, but is configured at deployment time. -This is known as "Container-managed transaction demarcation." With -"Container-managed transaction demarcation," the transactional -behaviour of an enterprise bean is defined at configuration time and is part -of the deployment descriptor of the bean. The EJB container is responsible -for providing the transaction demarcation for the enterprise beans according -to the value of transactional attributes associated with EJB methods, which -can be one of the following:

    - - -

    Database Service

    - -

    This service is responsible for handling Datasource objects. A Datasource -is a standard JDBC administrative object for handling connections to a -database. The Database service creates and loads such datasources on the -JOnAS server. Datasources to be created and deployed can be specified at -JOnAS configuration time, or they can be created and deployed at server -runtime using the JOnAS administration tools. The Database service is also -responsible for connection pooling; it manages a pool of database connections -to be used by the application components, thus avoiding many physical -connection creations, which are time-consuming operations. The database -service can now be replaced by the JDBC Resource Adapter, to be deployed by -the J2EE CA Resource Service, which additionally provides JDBC -PreparedStatement pooling.

    - -

    Security Service

    - -

    This service implements the authorization mechanisms for accessing J2EE -components, as specified in the J2EE specification.

    - - -

    In JOnAS, the mapping between roles and user identification is done in the -user identification repository. This user identification repository can be -stored either in files, in a JNDI repository (such as LDAP), or in a -relational database. This is achieved through a JOnAS implementation of the -Realm for each Web container and through the JAAS login modules for Java -clients. These Realms use authentication resources provided by JOnAS, which -rely either on files, LDAP or JDBC. These realms are in charge of propagating -the security context to the EJB container during EJB calls. JAAS login -modules are provided for user authentication of Web Container and Java -clients. Certificate-based authentication is also available, with -CRLLoginModule login module for certificate revocation.

    - -

    JOnAS also implements the Java Authorization Contract for Containers (JACC -1.0) specification, allowing authorizations to be managed as java security -permissions, and providing the ability to plug any security policy -provider.

    - -

    Messaging Service

    - -

    Asynchronous EJB method invocation is possible on Message-driven Beans -components. A Message-driven Bean is an EJB component that can be considered -as a JMS (Java Message -Service) MessageListener, i.e. which processes JMS messages -asynchronously. It is associated with a JMS destination and its -onMessage method is activated on the reception of messages sent by a -client application to this destination. It is also possible for any EJB -component to use the JMS API within the scope of transactions managed by the -application server.

    - -

    For supporting Message-driven Beans and JMS operations coded within -application components, the JOnAS application server relies on a JMS -implementation. JOnAS makes use of a third-party JMS implementation; -currently the JORAM open source -software is integrated and delivered with JOnAS, and other JMS provider -implementations can easily be integrated. JORAM provides several noteworthy -features: in particular, reliability (with a persistent mode), distribution -(transparently to the JMS client, it can run as several servers, thus -allowing load balancing), and the choice of TCP or SOAP as communication -protocol for transmitting messages.

    - -

    The JMS service is in charge of launching (or establishing connection to) -the integrated JMS server, which may or may not run in the same JVM as JOnAS. -It also provides connection pooling and thread pooling (for Message-driven -Beans). Through this service, JOnAS provides facilities to create -JMS-administered objects such as the connection factories and the -destinations, either at server launching time or at runtime using the JOnAS -administration tools.

    - -

    Note that the same function of JMS implementation integration may now be -achieved through a Resource Adapter, to be deployed by the J2EE CA Resource -Service. Such a Resource Adapter (J2EE CA 1.5) is provided for JORAM.

    - -

    J2EE CA Resource Service

    - -

    The J2EE Connector Architecture (J2EE CA) allows the connection of -different Enterprise Information Systems (EIS) to a J2EE application server. -It is based on the Resource Adapter (RA), an architecture component -comparable to a software driver, which connects the EIS, the application -server, and the enterprise application (J2EE components). The RA is generally -provided by an EIS vendor and provides a Java interface (the Common Client -Interface or CCI) to the J2EE components for accessing the EIS (this can also -be a specific Java interface). The RA also provides standard interfaces for -plugging into the application server, allowing them to collaborate to keep -all system-level mechanisms (transactions, security, and connection -management) transparent from the application components.

    -JCA Architecture - -

    The application performs "business logic" operations on the EIS data using -the RA client API (CCI), while transactions, connections (including pooling), -and security on the EIS are managed by the application server through the RA -(system contract).

    - -

    The JOnAS Resource service is in charge of deploying J2EE CA-compliant -Resource Adapters (connectors), packaged as RAR files, on the JOnAS server. -RAR files can also be included in EAR files, in which case the connector will -be loaded by the application classloader. Once Resource Adapters are -deployed, a connection factory instance is available in the JNDI namespace to -be looked up by application components.

    - -

    A J2EE CA 1.0 Resource Adapter for JDBC is available with JOnAS. It can -replace the current JOnAS database service for plugging JDBC drivers and -managing connection pools. It also provides JDBC PreparedStatement -pooling.

    - -

    A J2EE CA 1.5 Resource Adapter for JMS is available with JOnAS. It can -replace the current JOnAS Messaging service for plugging JORAM.

    - -

    Management Service

    - -

    The Management service is needed to administrate a JOnAS server from the -JOnAS administration console. Each server running this service is visible -from the administration console. This service is based on JMX. Standard -MBeans are defined within the JOnAS application server; they expose the -management methods of the instrumented JOnAS server objects such as services, -containers, the server itself. These MBeans implements the management model -as specified in the J2EE Management Specification. The Management service -runs a JMX server (if not available within the JDK, as is the case with JDK -5). The MBeans of the JOnAS server are registered within this JMX server. The -JOnAS administration console is a Struts-based Web application (servlet/JSP) -that accesses the JMX server to present the managed features within the -administration console. Thus, through a simple Web browser, it is possible to -manage one or several JOnAS application servers. The administration console -provides a means for configuring all JOnAS services (and making the -configuration persistent), for deploying any type of application (EJB-JAR, -WAR, EAR) and any type of resource (DataSources, JMS and Mail connection -factories, J2EE CA connectors), all without the need to stop or restart the -server. The administration console displays information for monitoring the -servers and applications, such as used memory, used threads, number of EJB -instances, the state of pools, which component currently uses which -resources, etc.. When Tomcat is used as Web Container, the Tomcat Management -is integrated within the JOnAS console. The concept of domain allows a set of -servers to be managed from a single management console, clusters have been -introduced within the console, allowing, for example, an application to be -deployed on a predefined subset of JOnAS instances. The cluster management -allows remote control and monitoring of cluster nodes; EJB and HTTP clusters -resulting from HA and load balancing configurations are automatically -detected and displayed in the console. A Management EJB (MEJB) is also -delivered, providing access to the management features, as specified in the -J2EE Management Specification. This MEJB is also accessible through Web -Services. JASMINe, a new ObjectWeb -project dedicated to cluster deployment and monitoring has been created.

    - -

    Mail Service

    - -

    A J2EE application component can send e-mail messages using JavaMailTM. The -Mail service of the JOnAS application server provides the necessary resources -to such application components. The Mail service creates mail factories and -registers these resources in the JNDI namespace in the same way that the -database service or the JMS service creates Datasources or -ConnectionFactories and registers these objects in the JNDI namespace. There -are two types of mail factories: javax.mail.Session and -javax.mail.internet.MimePartDataSource.

    - -

    WebServices Service

    - -

    This service is implemented on top of AXIS and is used for the deployment -of Web Services.

    - -

    HA Service

    - -

    This service is used for implementing Stateful Session Beans replication, -when configuring high availibility at the EJB/RMI level within a clustered -environment.

    - -

    JOnAS Development and Deployment -Environment

    - -

    JOnAS Configuration and Deployment -Facilities

    - -

    Once JOnAS has been installed in a directory referenced by the JONAS_ROOT -environment variable, it is possible to configure servers and to deploy -applications into several execution environments. This is achieved using the -JONAS_BASE environment variable. JONAS_ROOT and JONAS_BASE can be compared to -the CATALINA_HOME and CATALINA_BASE variables of Tomcat. While JONAS_ROOT is -dedicated to JOnAS installation, JONAS_BASE is used to specify a particular -JOnAS instance configuration. JONAS_BASE designates a directory containing a -specific JOnAS configuration, and it identifies subdirectories containing the -EJB-JAR, WAR, EAR, and RAR files that can be loaded in this application -environment. There is an ANT target in the JOnAS build.xml file for creating -a new JONAS_BASE directory structure. Thus, from one JOnAS installation, it -is possible to switch from one application environment to another by just -changing the value of the JONAS_BASE variable. There are two ways to -configure a JOnAS application server and load applications: either using the -administration console or by editing the configuration files. There are also -"autoload" directories for each type of application and resource (EJB-JAR, -WAR, EAR, RAR) that allow the JOnAS server to automatically load the -applications located in these directories when starting.

    - -

    A tool named "newjc" is provided to deploy and configure a set of JOnAS -servers within a cluster.

    - -

    JOnAS provides several facilities for deployment:

    - - -

    Fractal Deployment Framework (FDF) is a tool for deploying and configuring -the JOnAS software on a distributed environment.

    - -

    JOnAS Development Environments

    - -

    There are many plugins and tools that facilitate the development of J2EE -applications to be deployed on JOnAS. IDE plugins for Eclipse (JOPE, Lomboz, and, of course, WTP) and JBuilder (Kelly) provide the -means to develop, deploy, and debug J2EE components on JOnAS. The Xdoclet code-generation engine can -generate EJB interfaces and deployment descriptors (standard and JOnAS -specific ones), taking as input the EJB implementation class containing -specific JavaDoc tags. The JOnAS NewBean tool generates templates of -interfaces, implementation class, and deployment descriptors for any kind of -EJB. Many development tools may work with JOnAS; refer to the JOnAS tools page for -more details.

    - -

    In addition, JOnAS is delivered with complete J2EE examples, providing a -build.xml ANT file with all the necessary targets for compiling, deploying, -and installing J2EE applications.

    - -

    Clustering and Performance

    - -

    Clustering for an application server generally makes use of three -features: Load Balancing (LB), High Availability (HA) and Failover. Such -mechanisms can be provided at the Web container level by dispatching requests -to several Servlet/JSP engine instances, at the EJB container level by -dispatching EJB requests to several EJB container instances, and at the -database level by using several databases. A replicated JNDI naming is also -necessary.

    - -

    JOnAS provides Load Balancing, HA, and Failover at the WEB container level -using the Apache Tomcat mod_jk plugin and an HTTP in memory -session-replication mechanism based on JGroups. The plugin dispatches HTTP -requests from the Apache web server to Tomcat instances running as JOnAS web -containers. Server fluctuations are automatically taken into account. This -plugin supports round-robin and weighted round-robin load-balancing -algorithms, with a sticky session option.

    - -

    Load balancing and HA are provided at the EJB container level in JOnAS. -Operations invoked on EJB Home interfaces (EJB creation and retrieval) and -invocations of business methods on stateless session beans are dispatched on -the nodes of the cluster. The mechanism is based on a "clustered-aware" -replicated JNDI registry using a Clustered remote Method Invocation protocol -(CMI). The stubs contain the knowledge of the cluster and implement the -load-balancing policy, which may be round-robin and weighted round-robin; -these stubs are dynamically updated according to cluster topology changes -(dynamic cluster). This load-balancing policy may be easily customized. -Failover at the EJB level is provided by implementing a stateful session bean -state replication mechanism that ensures the transaction and global -consistency.

    - -

    Load balancing and HA may also be provided at the JMS level, thanks to the -JORAM HA capabilities.

    - -

    The JOnAS clustering architecture is illustrated in the following -figure.

    -Clustered Architecture - -

    Apache is used as the front-end HTTP server; Tomcat is used as the JOnAS -web container. The JOnAS servers share the same database. The mod_jk plug-in -provides Load Balancing / High Availability at the Servlet/JSP level. -Failover is provided through the in-memory, session-replication mechanism. -Load Balancing / High Availability is provided at the EJB level through the -CMI protocol associated with the replicated, clustered-aware JNDI registry. -Tomcat may or may not run in the same JVM as the EJB container. JOnAS -provides some documentation for configuring such an architecture.

    - -

    The use of the C-JDBC ObjectWeb -project offers load balancing and high availability at the database level. -The use of C-JDBC is transparent to the application (in our case to JOnAS), -since it is viewed as a standard JDBC driver. However, this "driver" -implements the cluster mechanisms (reads are load-balanced and writes are -broadcasted). The database is distributed and replicated among several nodes, -and C-JDBC load balances the queries between these nodes. An evaluation of -C-JDBC using the TPC-W benchmark on a 6-node cluster has shown performance -scaling linearly up to six nodes.

    - -

    In addition to clustering solutions, JOnAS provides many mechanisms, -intrinsic to the JOnAS server, for being highly scalable and efficient. This -includes the following:

    - - -

    Perspectives

    - -

    As an open source implementation of an application server, JOnAS is -constantly evolving to satisfy user requirements and to follow the related -standards. The main JOnAS evolutions currently planned are the following:

    - - -

    Sun, Java, and all -Java-based trademarks are trademarks or registered trademarks of Sun -Microsystems, Inc. in the U.S. and other countries.

    - - diff --git a/jonas_doc/core/olddoc/JOnASWebServices.html b/jonas_doc/core/olddoc/JOnASWebServices.html deleted file mode 100644 index 7f8707b2e86071133e89c6190444beafedb49047..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/JOnASWebServices.html +++ /dev/null @@ -1,814 +0,0 @@ - - - - - Web Services with JOnAS - - - - - -

    Web Services with JOnAS

    -Starting with JOnAS 3.3, Web Services can be used within EJBs and/or -servlets/JSPs. This integration conforms to the JSR 921(Web Service for J2EE -v1.1) specification.
    -
    - - -

    1. Web Services

    - -

    A. Some Definitions

    -WSDL: -WSDL (Web Service Description Language -v1.1) is an XML-based format for specifying the interface to a web -service. The WSDL details the service's available methods and parameter -types, as well as the actual SOAP endpoint for the service. In essence, WSDL -is the "user's manual" for the web service.
    -SOAP: -SOAP (Simple Object Access Protocol -v1.2) is an XML-based protocol for sending requests and responses to and -from web services. It consists of three parts: an envelope defining message -contents and processing, encoding rules for application-defined data types, -and a convention for representing remote procedure calls and responses.
    -JAX-RPC: -JAX-RPC (Java Api for XML -RPC v1.1)  is the Java API for XML-based RPC. RPC (Remote Procedure -Call) allows a client to execute procedures on other systems. The RPC -mechanism is often used in a distributed client/server model in which the -server defines a service as a collection of procedures that may be called by -remote clients. In the context of Web services, RPCs are represented by the -XML- based protocol SOAP when transmitted across systems.
    -In addition to defining envelope structure and encoding rules, the SOAP -specification defines a convention for representing remote procedure calls -and responses. An XML-based RPC server application can define, describe and -export a web service as an RPC-based service. WSDL (Web Service Description -Language) specifies an XML format for describing a service as a set of -endpoints operating on messages. With the JAX-RPC API, developers can -implement clients and services described by WSDL.
    -
    - - -

    B. Overview of a Web Service

    - -

    Strictly speaking, a Web Service is a well-defined, modular, encapsulated -function used for loosely coupled integration between applications' or -systems' components. It is based on standard technologies, such as XML, SOAP, -and UDDI.

    - -

    Web Services are generally exposed and discovered through a standard -registry service. With these standards, Web Services consumers (whether they -be users or other applications) can access a broad range of information -- -personal financial data, news, weather, and enterprise documents -- through -applications that reside on servers throughout the network.

    - -

    Web Services use a WSDL Definition (refer to www.w3.org/TR/WSDL) as a contract -between client and server (also called endpoint). WSDL defines the types to -serialize through the network (described with XMLSchema), the messages to -send and receive (composition, parameters), the portTypes (abstract view of a -Port), the bindings (concrete description of PortType: SOAP, GET, POST, ...), -the services (set of Ports), and the Port (the port is associated with a -unique endpoint URL that defines the location of the Web Service).

    - -

    A Web Service for J2EE is a component with some methods exposed and -accessible by HTTP (through servlet(s)). Web Services can be implemented as -Stateless Session Beans or as JAXRPC classes (a simple Java class, no -inheritance needed).

    - -
    -WS endpoint
    -Figure 1. Web Services endpoints deployed within JOnAS (an external client -code can access the endpoint via AxisServlet)
    -WS client
    -Figure 2. Web Services client deployed within JOnAS (can access external Web -Services)
    - -

    The servlet is used to respond to a client request and dispatch the call -to the designated instance of servant (the SSB or JAXRPC class exposed as Web -Service). It handles the deserialization of incoming SOAP messages to -transform SOAP XML into a Java Object, perform the call, and serialize the -call result (or the thrown exception) into SOAP XML before sending the -response message to the client.

    -
    - - -

    2. Exposing a J2EE Component as -a Web Service

    -There are two types of J2EE components that can be exposed as Web Services -endpoints: StateLess Session Beans and JAX-RPC classes. Web Services' -Endpoints must not contain state information.
    -
    -A new standard Deployment Descriptor has been created to describe Web -Services endpoints. This Descriptor is named "webservices.xml" and can be -used in a webapp (in WEB-INF/) or in an EjbJar (in META-INF/). This -Descriptor has its JOnAS-specific Deployment Descriptor -(jonas-webservices.xml is optional).
    -
    -Refer to the webServices sample for example files. - -

    A. JAX-RPC Endpoint

    -A JAX-RPC endpoint is a simple class running in the servlet container (Tomcat -or Jetty). SOAP requests are dispatched to an instance of this class and the -response is serialized and sent back to the client.
    -A JAX-RPC endpoint must be in a WebApp (the WAR file must contain a -"WEB-INF/webservices.xml").
    -
    - - -

    B. Stateless Session Bean -Endpoint

    -An SSB is an EJB that will be exposed (all or some of its methods) as a Web -Service endpoint.
    -In the ejb-jar.xml standard descriptor, a session bean, exposed as a web -service, must now use the new service-endpoint tag. Here the developer -defines the fully-qualified interface name of the web service. Notice that no -other interfaces (home, remote, localhome, local) are needed with a session -bean exposed as web service.
    -
    -Typically, an SSB must be in an EjbJar, and a "META-INF/webservices.xml" is -located in the EjbJar file.
    -
    - - -

    C. Usage
    -

    - -

    In this Descriptor, the developer describes the components that will be -exposed as Web Services' endpoints; these are called the port-component(s). A -set of port-components defines a webservice-description, and a -webservice-description uses a WSDL Definition file for a complete description -of the Web Services' endpoints.

    - -

    Each port-component is linked to the J2EE component that will respond to -the request (service-impl-bean with a servlet-link or ejb-link child element) -and to a WSDL port (wsdl-port defining the port's QName). A list of JAX-RPC -Handlers is provided for each port-component. The optional -service-endpoint-interface defines the methods of the J2EE components that -will be exposed (no inheritance needed).

    - -

    A JAX-RPC Handler is a class used to read and/or modify the SOAP Message -before transmission and/or after reception (refer to the JAX-RPC v1.1 spec. -chap#12 "SOAP Message Handlers").The Session Handler is a simple example that -will read/write SOAP session information in the SOAP Headers. Handlers are -identified with a unique name (within the application unit), are initialized -with the init-param(s), and work on processing a list of SOAP Headers defined -with soap-headers child elements. The Handler is run as the SOAP actor(s) -defined in the list of soap-roles.

    - -

    A webservice-description defines a set of port-components, a WSDL -Definition (describing the Web Service) and a mapping file (WSDL-2-Java -bindings). The wsdl-file element and the jaxrpc-mapping-file element must -specify a path to a file contained in the module unit (i.e., the war/jar -file). Note that a URL cannot be set here. The specification also requires -that the WSDLs be placed in a wsdl subdirectory (i.e., WEB-INF/wsdl or -META-INF/wsdl); there is no such requirement for the jaxrpc-mapping-file. All -the ports defined in the WSDL must be linked to a port-component. This is -essential because the WSDL is a contract between the endpoint and a client -(if the client uses a port not implemented/linked with a component, the -client call will systematically fail).
    -

    - -

    As for all other Deployment Descriptors, a standard -XML Schema is used to constrain the XML.
    -

    - -

    D. Simple Example (expose a JAX-RPC Endpoint) of webservices.xml

    - - - - - - - - -
    <?xml version="1.0"?>
    -
    - <webservices xmlns="http://java.sun.com/xml/ns/j2ee"
    -              - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -              - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
    -                                  - http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
    -              - version="1.1">
    -   <display-name>Simple Web Service Endpoint - DeploymentDesc</display-name>
    -
    -   <webservice-description>
    -     <!-- name must be unique in an Application unit - -->
    -     <!-- - Should not contain spaces !!! -->
    -     <webservice-description-name>
    -       SimpleWebServiceEndpoint
    -     </webservice-description-name>
    -
    -     <!-- Link to the WSDL file describing the - endpoint -->
    -     - <wsdl-file>WEB-INF/wsdl/warendpoint.wsdl</wsdl-file>
    -
    -     <!-- Link to the mapping file describing - binding between WSDL and Java -->
    -     - <jaxrpc-mapping-file>WEB-INF/warEndpointMapping.xml</jaxrpc-mapping-file>
    -
    -     <!-- The list of endpoints -->
    -     <port-component>
    -
    -
          <!-- Unique name of - the port-component -->
    -      
    <!-- Should not contain spaces !!! - -->
    -       - <port-component-name>WebappPortComp1</port-component-name>
    -
    -       <!-- The QName of the WSDL Port the - J2EE port-component is linked to -->
    -       <!-- Must Refers to a port in - associated WSDL document -->
    -       <wsdl-port - xmlns:ns="
    http://wsendpoint.servlets.ws.objectweb.org">
    -           - ns:wsendpoint1
    -       </wsdl-port>
    -
    -
          <!-- The endpoint - interface defining methods exposed -->
    -       <!--    for the - endpoint                             - -->

    -       - <service-endpoint-interface>
    -         org.objectweb.ws.servlets.wsendpoint.WSEndpointSei
    -       </service-endpoint-interface>
    -
    -
          <!-- Link to the J2EE - component (servlet/EJB)    -->
    -       <!-- implementing methods of the - SEI          -    -->

    -       - <service-impl-bean>
    -         <!-- name of the - servlet defining the JAX-RPC endpoint    -->
    -
            <!-- can - be ejb-link if SSB is used (only in EjbJar!)    - -->
    -         - <servlet-link>WSEndpoint</servlet-link>
    -       </service-impl-bean>
    -
    -
          <!-- The list of - optional JAX-RPC Handlers -->
    -       <handler>
    -         - <handler-name>MyHandler</handler-name>
    -         - <handler-class>org.objectweb.ws.handlers.SimpleHandler</handler-class>
    -
    -
            <!-- A - list of init-param for Handler configuration -->
    -         - <init-param>
    -            - <param-name>param1</param-name>
    -            - <param-value>value1</param-value>
    -         </init-param>
    -         <init-param>
    -            - <param-name>param2</param-name>
    -            - <param-value>value2</param-value>
    -         </init-param>
    -       </handler>
    -     </port-component>
    -   </webservice-description>
    - </webservices>
    - -

    E. The optional jonas-webservices.xml

    - -The jonas-webservices.xml file is an optional deployment descriptor. This descriptor -is used by WsGen to set some specifics for the generated webapp that is in charge of -the SOAP request dispatching. Its role is to allow for the specifications of the -webapp's name, context root, security settings and endpoint URL customization.
    -
    -Some parameters are only used if the web service is implemented by a Session Bean: - - -
    -War Name: Specifies the name of the generated -WAR. Setting the <war> element is optional; if it is not specified, then the -default naming convention is used to retrieve the WAR name from the ejbjar's name.
    -
    -   Default Naming: -<ejbjar-name>.jar will have an -<ejbjar-name>.war WebApp.
    -
    - -Context Root: Specifies the context root of the -generated WAR. Setting the <context-root> element is optional; if it is not specified, -then the default naming convention is used and the context root will be the same as the WAR's name. -
    -
    -   Default Naming: -<webapp-name>.war will have a -<webapp-name> context root.
    -
    - -Endpoint URL Customization: Specifies the endpoint URL -of a given jonas-port-component. Setting the <endpoint-url> element is optional; if it is not specified, -then the default naming convention is used and the URL will look like /<context-root>/<port-component-name>/<wsdl:port-name>.
    -
    - -Security: The security settings specify which -security settings, if any, the generated webapp should use. Setting up security within this -file is very similar to how security would be set up in a regular web.xml.
    -
    - -
    NOTE: -When using the <endpoint-security-constraint>, -<endpoint-login-config>, or -<endpoint-security-role> elements, the j2ee namespace -must be included in the jonas-webservices element (that is, -xmlsn:j2ee="http://java.sun.com/xml/j2ee"), and the namespace -for all elements within these tags (that is, the 'j2ee' -in the example below) must be specified.
    -
    - -   Security Constraint: -the <endpoint-security-constraint> specifies the <security-constraint> -in the web.xml -of the generated webapp.
    -
    -   Login Config: the -<endpoint-login-config> specifies -the <login-config> in the web.xml of the generated webapp.
    -
    -   Security Role: the -<endpoint-security-role> specifies -the <security-role> in the web.xml -of the generated webapp.
    -
    -   Realm: the -<endpoint-realm> specifies the security -realm for the generated webapp.
    -
    -   Realm Name: the -<endpoint-realm-name> specifies the -name of the security realm for the generated webapp. - -
    -
    -Example:
    - - - - - - - - -
    - -
    -<?xml version="1.0"?>
    -<jonas-webservices xmlns="http://www.objectweb.org/jonas/ns"
    -                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -                   xmlns:j2ee:"http://java.sun.com/xml/ns/j2ee"
    -                   xsi:schemaLocation="http://www.objectweb.org/jonas/ns http://www.objectweb.org/jonas/ns/jonas_j2ee_web_services_4_5.xsd">
    -
    -  <!-- the name of the webapp in the EAR              -->
    -  <!-- (it is the same as the one in application.xml) -->
    -  <war>dispatchingWebApp.war</war>
    -
    -  <!-- the context root the webapp should use -->
    -  <context-root>endpoint</context-root>
    -
    -  <jonas-port-component>
    -    <port-component-name>ssbEndpoint</port-component-name>
    -    <!-- We can specify with endpoint-uri the URL we want to have for the given port.      -->
    -    <!-- Will be something like : http://<host>:<port>/<context-root>/services1/webservice -->
    -    <endpoint-uri>/services1/webservice</endpoint-uri>
    -  </jonas-port-component>
    -
    -  <!-- everthing in this element will appear in the security-constraint -->
    -  <!-- element in the web.xml of the generated webapp                   -->
    -  <endpoint-security-constraint>
    -    <j2ee:web-resouce-collection>
    -      <j2ee:web-resource-name>Stateless Session Bean Endpoint</j2ee:web-resource-name>
    -      <j2ee:url-pattern>/*</j2ee:url-pattern>
    -    </j2ee:web-resource-collection>
    -    <j2ee:auth-constraint>
    -      <j2ee:role-name>admin</j2ee:role-name>
    -    </j2ee:auth-constraint>
    -  </endpoint-security-constraint>
    -
    -  <!-- everything in this element will appear in the login-config -->
    -  <!-- element in the web.xml of the generated webapp             -->
    -  <endpoint-login-config>
    -    <j2ee:auth-method>BASIC</j2ee:auth-method>
    -    <j2ee:realm-name>Endpoint Authentication Area</j2ee:realm-name>
    -  </endpoint-login-config>
    -
    -  <!-- everything in this element will appear in the security-role -->
    -  <!-- element in the web.xml of the generated webapp              -->
    -  <endpoint-security-role>
    -    <j2ee:role-name>admin</j2ee:role-name>
    -  </endpoint-security-role>
    -
    -  <!-- the realm the generated webapp should use -->
    -  <endpoint-realm>memrlm_1</endpoint-realm>
    -
    -  <!-- the name of the realm the generated webapp should use -->
    -  <endpoint-realm-name>Endpoint Authentication Area</endpoint-realm-name>
    -
    -</jonas-webservices>
    -
    - -

    F. Changes to jonas-web.xml

    -JOnAS allows the developer to fully configure an application by setting the -hostname, the context-root, and the port used to access the Web Services. -This is done in the jonas-web.xml of the dispatching WebApp.
    -host: configure the hostname to use -in URL (must be an available web container host).
    -port: configure the port number to -use in URL (must be an available HTTP/HTTPS connector port number).
    -
    -When these values are not set, JOnAS will attempt to determine the default -values for host and port.
    -Limitations:
    -- The host can only be determined when only one host is set for the web -container.
    -- The port can only be determined when only one connector is used by the web -container.
    - - -

    3. The client of a Web -Service

    -An EJB or a servlet that wants to use a Web Service (as client) must declare -a dependency on the Web Service with a service-ref element (same principle as for -all *-ref elements).
    - - -

    A. The service-ref element

    -The service-ref element declares reference to a Web Service used by a J2EE -component in the web, EJB and Client application Deployment Descriptor.
    -The component uses a logical name called a service-ref-name to lookup the -service instance. Thus, any component that performs a lookup on a Web Service -must declare a dependency (the service-ref element) in the standard -deployment descriptor (web.xml, ejb-jar.xml or application-client.xml).
    -
    -Example of service-ref:
    - - - - - - - - -
      <service-ref>
    -     <!-- 
    (Optional) A Web services - description that can be used
    -          in administration - tool.
    -->
    -     <description>Sample WebService - Client</description>
    -
    -     <!--
    (Optional) The WebService - reference name -->
    -     <display-name>WebService Client - 1</display-name>
    -
    -     <!--
    (Optional) An icon for this - WebService. -->
    -     <icon> <!-- ... --> </icon>
    -
    -     <!--
    The logical name for the reference - that is used in the client source
    -          code. It is recommended, but not - required that the name begin with
    -          'services/'
    -->
    -     - <service-ref-name>services/myService</service-ref-name>
    -
    -     <!--
    Defines the class name of the - JAX-RPC Service interface that
    -         the client depends on. In most - cases, the value will be:
    -         javax.xml.rpc.Service but a - generated specific Service Interface
    -         class may be specified (requires - WSDL knowledge and thus
    -         the wsdl-file element). -
    -->
    -     - <service-interface>javax.xml.rpc.Service</service-interface>
    -
    -     <!--
    (Optional) Contains the location - (relative to the root of
    -          the module) of the web service WSDL - description.

    -          - needs to be in the wsdl - directory.
    -          - required if generated interface - and sei are declared. -->
    -     - <wsdl-file>WEB-INF/wsdl/stockQuote.wsdl</wsdl-file>
    -    
    -     <!--
    (Optional) A file specifying the - correlation of the WSDL definition
    -          to the interfaces (Service Endpoint - Interface, Service Interface).

    -          - required if generated - interface and sei (Service Endpoint
    -          Interface) are - declared.
    -->
    -     - <jaxrpc-mapping-file>WEB-INF/myMapping.xml</jaxrpc-mapping-file>
    -
    -     <!--
    (Optional) Declares the specific - WSDL service element that is being
    -          referred to. It is not specified if - no wsdl-file is declared or if
    -          WSDL contains only 1 service - element. A service-qname is composed
    -          of a namespaceURI and a localpart. - It must be defined if more than 1
    -          service is declared in - the WSDL.
    -->
    -       <service-qname - xmlns:ns="
    http://beans.ws.objectweb.org">
    -          ns:MyWSDLService
    -     </service-qname>
    -
    -     <!--
    Declares a client dependency on - the container for resolving a Service
    -          Endpoint Interface to a WSDL port. - It optionally associates the
    -          Service Endpoint Interface with a - particular port-component.
    -->
    -     <port-component-ref>
    -
    -       - <service-endpoint-interface>

    -      org.objectweb.ws.beans.ssbendpoint.MyService
    -          - </service-endpoint-interface>
    -
    -       <!-- Defines a link to a port component - declared in another unit
    -            of the - application -->
    -       - <!-- link is only used when an application module wants to access - a  -->
    -       - <!-- web service colocated in the same application - unit             - -->
    -       - <port-component-link>ejb_module.jar#PortComponentName
    </port-component-link>
    -     </port-component-ref>
    -
    -     <!--A list of Handlers to use for this - service-ref  -->
    -     <handler>
    -        <!-- 
    Must be unique - within the module. -->
    -        - <handler-name>MyHandler</handler-name>
    -
    -        - <handler-class>org.objectweb.ws.handlers.myHandler</handler-class>
    -
    -        <!-- A list of init-params (couple - name/value) for Handler
    -             - initialization -->
    -        <init-param>
    -          - <param-name>param_1</param-name>
    -         -  <param-value>value_1</param-value>
    -        </init-param>
    -
    -        <!-- A list of QNames specifying the - SOAP Headers the handler
    -             will work on. Namespace and - locapart values must be found
    -             inside the WSDL. -->
    -        <soap-header - xmlns:ns="
    http://ws.objectweb.org">
    -             - ns:MyWSDLHeader
    -        </soap-header>
    -
    -        <!-- A list of
    SOAP actor - definitions that the Handler will play
    -             as a role. A soap-role is a - namespace URI.
    -->
    -        - <soap-role>http://actor.soap.objectweb.org</soap-role>
    -
    -        <!-- A list - of 
    port-name elements that defines the WSDL - port-name that
    -             a handler should be - associated with. If no port-name is specified,
    -             the handler is assumed to - be associated with all ports of the
    -             service-ref.
    - -->
    -        - <port-name>myWSDLPort</port-name>
    -     </handler>
    -   </service-ref>
    -
    - - -

    B. The jonas-service-ref element

    -A jonas-service-ref must be specified for each service-ref declared in the -standard Deployment Descriptor. The jonas-service-ref adds JOnAS-specific -(and Web Service engine-specific) information to service-ref elements.
    -
    -Example of jonas-service-ref:
    - - - - - - - - -
        - <jonas-service-ref>
    -
    -
          <!-- Define the service-ref - contained in the component
    -            deployment descriptor - (web.xml, ejb-jar.xml, application-client.xml).
    -            used as a key to associate a - service-ref to its correspondent
    -            jonas-service-ref-->
    -
          - <service-ref-name>services/myService</service-ref-name>
    -
    -
          <!-- Define the physical - name of the resource. -->
    -
          - <jndi-name>webservice_1</jndi-name>
    -      
    -       <!-- A list of init-param used for specific - configuration of
    -            the service -->
    -       <jonas-init-param>
    -         - <param-name>param</param-name>
    -         - <param-value>name</param-value>
    -       </jonas-init-param>
    -     </jonas-service-ref>
    -
    - - -

    4. WsGen

    - -

    WsGen is a new JOnAS tool that works in the same way as GenIC. It takes -archive files (EJB-JAR, WAR, JAR client, EAR) and generates all the necessay -components related to web services:

    - - -

    For example, to provide an EJB-exposing method as a web service, a -developer creates a webservices.xml file packaged in EjbJar's -META-INF directory. WsGen automatically creates a configured webapp (using an -Axis servlet) and wraps it (ejbjar + webapp) in an EAR file.

    - -

    With a JaxRpc class, WsGen adds a servlet (an Axis servlet) inside the -existing web deployment descriptor and generates an Axis-specific -configuration file.

    - -

    When using service-ref (from ejbjars, web applications, or clients), WsGen -automatically generates a Stub from WSDL (if a generated service interface -name is provided).

    - -

    Usage

    - -

    WsGen is used typically from an ant build file. Simply add this taskdef -under the ejbjar taskdef:

    -
    <taskdef name="wsgen" classname="org.objectweb.jonas.ant.WsGenTask"
    -   classpath="${jonas.root}/lib/common/ow_jonas_ant.jar" />
    -<wsgen srcdir="${temp.dir}"
    -   destdir="${dist.dir}"
    -   verbose="false"
    -   debug="false">
    -      <include name="webapps/wswarsample.war"/>
    -</wsgen>
    - -

    See the $JONAS_ROOT/examples/webservices samples for complete -build scripts.

    - -

    Note that the ejbjar/webapp/client archive must include WSDL, -jax-rpc-mappings used in service-ref, or webservices.xml. When these -files are used from a service-ref, they are added into the generic ejb-jar -with the ejbjar ant task of JOnAS; you must ensure that they have been placed -inside the srcdir given to the ejbjar task (otherwise, the ejbjar task cannot -find them and will produce an error).

    - -

    This task is a directory-based -task and, as such, forms an implicit Fileset. This -defines which files, relative to the srcdir, will be processed. The -wsgen task supports all the attributes of Fileset to refine the set of files -to be included in the implicit fileset.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    AttributeDescriptionRequired
    srcdirDirectory where file archive (EjbJar, War, Client, Ear) is - locatedYes
    destdirDirectory where generated files will be placedNo
    verboseVerbose mode (Defaults to false)No
    debugDebug mode (Defaults to false)No
    javacoptsList of options given to the java compilerNo
    jonasrootDirectory where JOnAS is installedNo
    jonasbaseDirectory where JOnAS configuration is storedNo
    - -

    Wsgen is also usable from the command line with WsGen script (available on -*nix and Windows).

    - -
    -
    - - diff --git a/jonas_doc/core/olddoc/MBeans.html b/jonas_doc/core/olddoc/MBeans.html deleted file mode 100644 index d68701dffc06bb6b7d7eb98fb7ba338281e046c4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/MBeans.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - Working with Management Beans - - - - -

    Working with Management Beans

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Rationale
    2. -
    3. About JOnAS MBeans and their use in - JonaSAdmin
    4. -
    5. Using JOnAS MBeans in a Management - Application
    6. -
    7. Registering User MBeans
    8. -
    - -

    Target Audience and Rationale

    - -

    This chapter is intended for advanced JOnAS users who are interested in -understanding management facilities that JOnAS provides, and possibly -extending these facilities for their application needs.

    - -

    JOnAS management facilities are based on Management Beans (MBeans) -compliant to JMX -Specification. Moreover, JOnAS implements JSR 77 specification, which -defines the management model for J2EE platforms.

    - -

    About JOnAS MBeans and their use in -JonaSAdmin

    - -

    MBeans provide access to management functions such as configuration, -deployment/undeployment, monitoring of resources and application modules.

    - -

    MBeans are created not only by the different JOnAS services, but also by the -components integrated in JOnAS (Web server Tomcat or Jetty, JORAM MOM, etc.). -They are registered in the current MBean Server, which is started by each -JOnAS server instance. Remote access to the MBean Server is facilitated by -JMX remote connectors compliant to the JSR 160 specification. See more -information about connectors here.

    - -

    JonasAdmin application implements the management functions listed above -using the different MBeans registered in the MBeanServer of the JOnAS -instance currently being managed. This is usually the server on which -JonasAdmin is deployed, but it may be another server running in the same -management domain.

    - -

    JonasAdmin also presents, in a structured way, all the registered MBeans, -their attributes and operations. In the future, JonasAdmin will probably be -extended to allow setting attributes and invoking operations.

    - -

    Using JOnAS MBeans in a Management -Application

    - -

    In order to invoke a management operation on a MBean, the caller must -access to the MBean server.

    - -

    Local MBean Server

    - -

    When the caller is located in the same JVM as the MBean Server, it can use -javax.management.MBeanServerFactory class to obtain a reference -to the MBean Server:

    -
                    List mbeanServers = MBeanServerFactory.findMBeanServer(null);
    -                if (mbeanServers != null && mbeanServers.size() > 0) {
    -                        return (MBeanServer) mbeanServers.get(0);
    -                }
    -        
    - -

    - -

    Using Remote Connectors

    - -

    When the caller is remote, it can use a JMX remote connector to establish -a connection with the MBean Server and obtain a -javax.management.MBeanServerConnection object.

    - -

    Suppose that the connector server has the following address: -service:jmx:jrmp://host/jndi/jrmp://host:1099/jrmpconnector_jonas, -which is the default for a JOnAS server called jonas.

    -
                    JMXServiceURL connURL = new JMXServiceURL("service:jmx:jrmp://host/jndi/jrmp://host:1099/jrmpconnector_jonas");
    -                JMXConnector connector = JMXConnectorFactory.newJMXConnector(connURL, null);
    -                connector.connect(null);
    -                MBeanServerConnection conn = connector.getMBeanServerConnection();
    -                return conn;
    -        
    - -

    - -

    Using a Management EJB

    - -

    A remote caller can also use the MEJB provided by the JOnAS distribution. -A Management EJB implementation, compliant to the JSR 77, is packed in the -mejb.ear installed in the -JONAS_ROOT/ejbjars/autoload directory. Thus, the MEJB is -automatically deployed at JOnAS start-up. Its Home is registered -in JNDI under the name ejb/mgmt/MEJB. JOnAS distribution also -contains an example using the MEJB in a J2EE application, the -j2eemanagement sample.

    - -

    - -

    Using the Management Web Service Endpoint

    - -

    -A remote caller can use the Management Web Service endpoint packaged -as a part of the mejb.ear installed in the -JONAS_ROOT/ejbjars/autoload directory. Thus, the management -endpoint is automatically deployed at JOnAS start-up. Check - http://<hostname>:<port>/mejb/ManagementEndpoint/ManagementEndpoint?wsdl - for the WSDL file on a running JOnAS instance. The endpoint allows light-weight -clients to query JOnAS MBeans from virtually any platform by leveraging the -platform-independant nature of Web Services. -

    - -

    Registering User MBeans

    - -

    Application MBeans can be created and registered in the MBean server by -calling registerMBean method on the MBeanServer -object or createMBean method on the -MBeanServerConnection object. Also, MBeans can be loaded using -the m-let service, a dynamic loading mechanism provided by the JMX -implementation. This mechanism allows loading MBeans from a remote URL. The -information on the MBeans to load is provided in a m-let text file. Refer to -JMX implementation documentation for details concerning this file. In addition, -the howto document -JOnAS and JMX, registering and manipulating MBeans -illustrates the use of this m-let mechanism. In order -to make an m-let text file accessible to JOnAS applications, it can be installed -in the JONAS_ROOT/conf directory.

    - - diff --git a/jonas_doc/core/olddoc/PG_Client.html b/jonas_doc/core/olddoc/PG_Client.html deleted file mode 100644 index 3630b6597ef4bcab27213b7477d154ab238ca743..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_Client.html +++ /dev/null @@ -1,372 +0,0 @@ - - - - - - - J2EE Client Application Programmer's Guide - - - -

    J2EE Client Application Programmer's Guide

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the Client component provider, i.e. -the person in charge of developing the Client components on the client side. -It describes how the Client component provider should build the deployment -descriptors of its Client components and how the client components should be -packaged.

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Launching J2EE Client Applications - -
    4. -
    5. Defining the Client Deployment - Descriptor - -
    6. -
    7. Client Packaging - -
    8. -
    - -

    - -

    Launching J2EE Client Applications

    - -

    Launching clients

    - -

    The J2EE client application can be

    - - -

    All the files required to launch the client container are in the -JONAS_ROOT/lib/client.jar file. This jar includes a manifest -file with the name of the class to launch. To launch the client container, -simply type:

    - -

    java -jar $JONAS_ROOT/lib/client.jar -?. This will launch the -client container and display usage information about this client -container.

    - -

    To launch the client container on a remote computer, copy the client.jar -and invoke the client container by typing java -jar -path_to_your/client.jar.

    - -

    The client that must be launched by the client container is given as an -argument of the client container.
    -example : java -jar client.jar myApplication.ear
    -or java -jar client.jar myClient.jar.

    - -

    Configuring client container

    - -

    JNDI access

    - -

    Defining the JNDI access and the protocol to use is an important part of -configuration.
    -The JOnAS server, as well as the ClientContainer, uses the values specified -in the carol.properties file.
    -This file can be used at different levels.
    -The carol.properties is searched with the following priority -(high to low):

    - - -

    A convenient way is to update the carol.properties of a -client.jar with a customized carol.properties -file. That is, use the jar -uf client.jar carol.properties -command.

    - -

    Trace configuration

    - -

    The client container client.jar includes a -traceclient.properties file. This is the same file as the one in -JONAS_ROOT/conf directory.
    -A different configuration file can be used for the traces by specifying the -parameter -traceFile when invoking the client container.
    -The file in the client.jar can be replaced with the jar --uf client.jar traceclient.properties command.

    - -

    Classpath configuration

    - -

    Some jars/classes can be added to the client container. For example if a class requires some extra libraries/classes, -the option -cp path/to/classes can be used.

    -

    The classloader of the client container will use the libraries/classes provided by the -cp flag. -

    - -

    Specifying the client to use (EAR case)

    - -

    An ear can contain many java clients, which are described in the -application.xml file inside the -<module><java> elements.
    -To invoke the client container with an ear, such as java -jar -client.jar my.ear, specify the java client to use if there are many -clients. Otherwise, it will take the first client.
    -To specify the jar client to use from an ear, use the argument --jarClient and supply the name of the client to use.
    -The earsample example in the JOnAS examples has two java clients -in its ear.

    - -

    Specifying the directory for unpacking the ear (EAR case)

    - -

    By default, the client container will use the system property -java.io.tmpdir.
    -To use another temporary directory, specify the path by giving the argument --tmpDirto the client -container.

    - -

    Disable Automated WsGen

    - -

    By default, the client container will apply WsGen (generation of web services artifacts) on all given archives.
    -To disable that feature (because WsGen has already been applied on the application, or because -the client contains no web services), add the -nowsgen option to the client container.

    - -

    Examples

    - -

    The earsample and jaasclient examples of the -JOnAS examples are packaged for use by the client container.
    -The first example demonstrates the client inside an ear. The second example -demonstrates the use of a standalone client.

    - -

    - -

    Defining the Client Deployment -Descriptor

    - -

    Principles

    - -

    The Client component programmer is responsible for providing the -deployment descriptor associated with the developed client components.

    - -

    The client component provider's responsibilities and the Application -Assembler's responsibilities are to provide an XML deployment descriptor that -conforms to the deployment descriptor's XML DTD as defined in the Java -TM Application Client Specification Version 1.4.(Refer to -$JONAS_ROOT/xml/application-client_1_4.xsd or  -http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd).

    - -

    To customize the Client components, information not defined in the -standard XML deployment descriptor may be needed. Such information might -include, for example, the mapping of the name of referenced resources to its -JNDI name. This information can be specified during the deployment phase -within another XML deployment descriptor that is specific to JOnAS. The -JOnAS-specific deployment descriptor's XML schema is located in -$JONAS_ROOT/xml/jonas-client_X_Y.xsd. The file name of the -JOnAS-specific XML deployment descriptor must be -'jonas-client.xml'.

    - -

    JOnAS interprets the <!DOCTYPE> tag at the parsing of the deployment -descriptor XML files.
    -The parser first tries to get the specified DTD via the classpath, then it -uses the specified URL (or path).

    - -

    The parser gets the specified schema via the classpath (schemas are packaged -in the $JONAS_ROOT/lib/common/ow_jonas.jar file).

    - -

    The standard deployment descriptor (application-client.xml) should contain -structural information that includes the following:

    - - -

    The JOnAS-specific deployment descriptor (jonas-client.xml) may contain -information that includes the following::

    - - -

    Examples of Client Deployment -Descriptors

    - - -

    Tips

    - -

    Although some characters, such as ">", are legal, it is good practice -to replace them with XML entity references.

    - -

    The following is a list of the predefined entity references for XML:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    &lt;<less than
    &gt;>greater than
    &amp;&ampersand
    &apos;'apostrophe
    &quot;"quotation mark
    - -

    - -

    Client Packaging

    - -

    Principles

    - -

    Client components are packaged for deployment in a standard Java -programming language Archive file called a jar file (Java ARchive). -The document root contains a subdirectory called META-INF, which -contains the following files and directories:

    - - -

    The manifest of this client jar must contain the name of the class to -launch (containing the main method). This is defined by the value of the -Main-Class attribute of the manifest file.
    -For a standalone client (not bundled in an Ear), all the Ejb classes (except -the skeleton) on which lookups will be performed must be included.

    - -

    Example

    - -

    Two examples of building a java client are provided.
    -

    - - - diff --git a/jonas_doc/core/olddoc/PG_Connector.html b/jonas_doc/core/olddoc/PG_Connector.html deleted file mode 100644 index 1fed0171181df09210c13de6e887f058e543c030..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_Connector.html +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - J2EE Connector Programmer's Guide - - - -

    J2EE Connector Programmer's Guide

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Principles
    4. -
    5. Defining the JOnAS Connector - Deployment Descriptor
    6. -
    7. Resource Adapter (RAR) - Packaging
    8. -
    9. Use and Deployment of a Resource - Adapter
    10. -
    11. JDBC Resource Adapters
    12. -
    13. Appendix: Connector Architecture - Principles
    14. -
    - -

    Target Audience and Content

    - -

    This chapter is provided for advanced JOnAS users concerned with EAI -(Enterprise Application Integration) and using the J2EE Connector -Architecture principles (refer to the Appendix for an introduction to the connectors). -The target audience for this guide is the Resource Adapter deployer and -programmer. It describes the JOnAS specific deployment file -(jonas-ra.xml) and the sample code to access deployed RARs.

    - -

    Principles

    - -

    Resource Adapters are packaged for deployment in a standard Java -programming language Archive file called a rar file (Resource -ARchive), which is described in the J2EE Connector Architecture -specification.

    - -

    The standard method for creating the jonas-ra.xml file is to use -the RAConfig tool. For a complete description refer to RAConfig.

    - -

    Defining the JOnAS Connector -Deployment Descriptor

    - -

    The jonas-ra.xml contains JOnAS specific information describing -deployment information, logging, pooling, jdbc connections, and RAR config -property values.

    - - -

    Deployment Descriptor Examples

    - -

    The following portion of a jonas-ra.xml file shows the linking to -a base RAR file named BaseRar. All properties from the base RAR will be -inherited and any values given in this jonas-ra.xml will override -the other values.

    -
      <jonas-resource>
    -    <jndiname>rar1</jndiname>
    -    <rarlink>BaseRar</rarlink>
    -    <native-lib>nativelib</native-lib>
    -    <log-enabled>false</log-enabled>
    -    <log-topic>com.xxx.rar1</log-topic>
    -    <jonas-config-property>
    -      <jonas-config-property-name>ip</jonas-config-property-name>
    -      <jonas-config-property-value>www.xxx.com</jonas-config-property-value>
    -    </jonas-config-property>
    -    .
    -    .
    -  </jonas-resource>
    - -

    The following portion of a jonas-ra.xml file shows the -configuration of a jdbc rar file.

    -
      <jonas-resource>
    -    <jndiname>jdbc1</jndiname>
    -    <rarlink></rarlink>
    -    <native-lib>nativelib</native-lib>
    -    <log-enabled>false</log-enabled>
    -    <log-topic>com.xxx.jdbc1</log-topic>
    -    <pool-params>
    -      <pool-init>0</pool-init>
    -      <pool-min>0</pool-min>
    -      <pool-max>100</pool-max>
    -      <pool-max-age>0</pool-max-age>
    -      <pstmt-max>20</pstmt-max>
    -    </pool-params>
    -    <jdbc-conn-params>
    -      <jdbc_check-level>2</jdbc_check-level>
    -      <jdbc-test-statement>select 1</jdbc-test-statement>
    -    </jdbc-conn-params>
    -    <jonas-config-property>
    -      <jonas-config-property-name>url</jonas-config-property-name>
    -      <jonas-config-property-value>jdbc:oracle:thin:@test:1521:DB1</jonas-config-property-value>
    -    </jonas-config-property>
    -    .
    -    .
    -  </jonas-resource>
    - -

    Resource Adapter (RAR) Packaging

    - -

    Resource Adapters are packaged for deployment in a standard Java -programming language Archive file called an RAR file (Resource -Adapter ARchive). This file can contain the following:

    -
    -
    Resource Adapters' deployment descriptor
    -
    The RAR file must contain the deployment descriptors, which are made - up of: -
      -
    • The standard xml deployment descriptor, in the format defined in - the J2EE 1.4 specification. Refer to - $JONAS_ROOT/xml/connector_1_5.xsd or  - http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd. - This deployment descriptor must be stored with the name META-INF/ra.xml in - the RAR file.
    • -
    • The JOnAS-specific XML deployment descriptor in the format - defined in $JONAS_ROOT/xml/jonas-ra_X_Y.xsd. This JOnAS - deployment descriptor must be stored with the name - META-INF/jonas-ra.xml in the RAR file.
    • -
    -
    -
    -
    -
    Resource adapter components (jar)
    -
    One or more jars which contain the java interfaces, implementation, - and utility classes required by the resource adapter.
    -
    Platform-specific native libraries
    -
    One or more native libraries used by the resource adapter
    -
    Misc
    -
    One or more html, image files, or locale files used by the resource - adapter.
    -
    - -

    Before deploying an RAR file, the JOnAS-specific XML must be configured -and added. Refer to the RAConfig -section for information.

    - -

    Use and Deployment of a Resource -Adapter

    - -

    Accessing Resource Adapter involves the following steps:

    - - -

    JDBC Resource Adapters

    - -

    These generic JDBC resource adapters are supplied by JOnAS and are a -replacement for the DBM service. Refer to Configuring JDBC Resource -Adapters for a complete description and usage guide.

    - -

    Appendix: Connector Architecture -Principles

    - -

    The Java Connector Architecture allows the connection of different -Enterprise Information Systems (EIS) to an application server such as JOnAS. -It defines a way for enterprise applications (based on EJB, servlet, JSP or -J2EE clients) to communicate with existing EIS. This requires the use of a -third party software component called "Resource Adapter" for each type of -EIS, which should be previously deployed on the application server. The -Resource Adapter is an architecture component comparable to a software -driver, which connects the EIS, the application server, and the enterprise -application (J2EE components in the case of JOnAS as application server). The -RA provides an interface (the Common Client Interface or CCI) to the -enterprise application (J2EE components) for accessing the EIS. The RA also -provides standard interfaces for plugging into the application server, so -that they can collaborate to keep all system-level mechanisms (transactions, -security, and connection management) transparent from the application -components.

    - - -

    The resource adapter plugs into JOnAS and provides connectivity between -the EIS, JOnAS, and the application. The application performs "business -logic" operations on the EIS data using the RA client API (CCI), while -transactions, connections (including pooling), and security on the EIS is -managed by JOnAS through the RA (system contract).

    - - diff --git a/jonas_doc/core/olddoc/PG_Deployment.html b/jonas_doc/core/olddoc/PG_Deployment.html deleted file mode 100644 index 5653807ccdc1e6ac0b9ccbeaaa29390c2e2734c1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_Deployment.html +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - Defining the Deployment Descriptor - - - -

    EJB Programmer's Guide: Defining the -Deployment Descriptor

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the Enterprise Bean provider, i.e. -the person in charge of developing the software components on the server -side. It describes how the bean provider should build the deployment -descriptors of its components.

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Principles
    4. -
    5. Example of Session Descriptors
    6. -
    7. Example of Container-managed - Persistence Entity Descriptors (CMP1.1)
    8. -
    9. Tips
    10. -
    - -

    Principles

    - -

    The bean programmer is responsible for providing the deployment descriptor -associated with the developed Enterprise Beans. The Bean Provider's -responsibilities and the Application Assembler's responsibilities is to -provide an XML deployment descriptor that conforms to the deployment -descriptor's XML schema as defined in the EBJ specification version 2.1. (Refer -to $JONAS_ROOT/xml/ejb-jar_2_1.xsd or  -http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd).

    - - -

    To deploy Enterprise JavaBeans on the EJB server, information not defined -in the standard XML deployment descriptor may be needed. For example, this -information may include the mapping of the bean to the underlying database -for an entity bean with container-managed persistence. This information is -specified during the deployment step in another XML deployment descriptor -that is specific to JOnAS. The JOnAS-specific deployment descriptor's XML schema -is located in $JONAS_ROOT/xml/jonas-ejb-jar_X_Y.xsd. The file -name of the JOnAS-specific XML deployment descriptor must be the file name of -the standard XML deployment descriptor prefixed by 'jonas-'.

    - -

    The parser gets the specified schema via the classpath (schemas are packaged -in the $JONAS_ROOT/lib/common/ow_jonas.jar file).

    - -

    The standard deployment descriptor should contain structural information -for each enterprise bean that includes the following:

    - - -

    The JOnAS-specific deployment descriptor contains information for each -enterprise bean including:

    - - -

    - -

    Example of Session Descriptors

    -
    <?xml version="1.0" encoding="ISO-8859-1"?>
    -<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
    -         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
    -         http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
    -         version="2.1">
    -  <description>Here is the description of the test's beans</description>
    -  <enterprise-beans>
    -    <session>
    -      <description>... Bean example one ...</description>
    -      <display-name>Bean example one</display-name>
    -      <ejb-name>ExampleOne</ejb-name>
    -      <home>tests.Ex1Home</home>
    -      <remote>tests.Ex1</remote>
    -      <ejb-class>tests.Ex1Bean</ejb-class>
    -      <session-type>Stateful</session-type>
    -      <transaction-type>Container</transaction-type>
    -      <env-entry>
    -        <env-entry-name>name1</env-entry-name>
    -        <env-entry-type>java.lang.String</env-entry-type>
    -        <env-entry-value>value1</env-entry-value>
    -      </env-entry>
    -      <ejb-ref>
    -        <ejb-ref-name>ejb/ses1</ejb-ref-name>
    -        <ejb-ref-type>session</ejb-ref-type>
    -        <home>tests.SS1Home</home>
    -        <remote>tests.SS1</remote>
    -      </ejb-ref>
    -      <resource-ref>
    -        <res-ref-name>jdbc/mydb</res-ref-name>
    -        <res-type>javax.sql.DataSource</res-type>
    -        <res-auth>Application</res-auth>
    -      </resource-ref>
    -    </session>
    -  </enterprise-beans>
    -  <assembly-descriptor>
    -    <container-transaction>
    -      <method>
    -        <ejb-name>ExampleOne</ejb-name>
    -        <method-name>*</method-name>
    -      </method>
    -      <trans-attribute>Required</trans-attribute>
    -    </container-transaction>
    -    <container-transaction>
    -      <method>
    -        <ejb-name>ExampleOne</ejb-name>
    -        <method-inter>Home</ejb-name>
    -        <method-name>*</method-name>
    -      </method>
    -      <trans-attribute>Supports</trans-attribute>
    -    </container-transaction>
    -    <container-transaction>
    -      <method>
    -        <ejb-name>ExampleOne</ejb-name>
    -        <method-name>methodOne</method-name>
    -      </method>
    -      <trans-attribute>NotSupported</trans-attribute>
    -    </container-transaction>
    -    <container-transaction>
    -      <method>
    -        <ejb-name>ExampleOne</ejb-name>
    -        <method-name>methodTwo</method-name>
    -        <method-params><method-param>int</method-param></method-params>
    -      </method>
    -      <trans-attribute>Mandatory</trans-attribute>
    -    </container-transaction>
    -    <container-transaction>
    -      <method>
    -        <ejb-name>ExampleOne</ejb-name>
    -        <method-name>methodTwo</method-name>
    -        <method-params><method-param>java.lang.String</method-param></method-params>
    -      </method>
    -      <trans-attribute>NotSupported</trans-attribute>
    -    </container-transaction>
    -  </assembly-descriptor>
    -</ejb-jar>
    -
    -
    -<?xml version="1.0" encoding="ISO-8859-1"?>
    -<jonas-ejb-jar xmlns="http://www.objectweb.org/jonas/ns"
    -               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -               xsi:schemaLocation="http://www.objectweb.org/jonas/ns
    -               http://www.objectweb.org/jonas/ns/jonas-ejb-jar_4_0.xsd" >
    -  <jonas-session>
    -    <ejb-name>ExampleOne</ejb-name>
    -    <jndi-name>ExampleOneHome</jndi-name>
    -    <jonas-ejb-ref>
    -      <ejb-ref-name>ejb/ses1</ejb-ref-name>
    -      <jndi-name>SS1Home_one</jndi-name>
    -    </jonas-ejb-ref>
    -    <jonas-resource>
    -      <res-ref-name>jdbc/mydb</res-ref-name>
    -      <jndi-name>jdbc_1</jndi-name>
    -    </jonas-resource>
    -  </jonas-session>
    -</jonas-ejb-jar>
    -    
    - -

    Example of Container-managed -Persistence Entity Descriptors (CMP 1.1)

    -
    <?xml version="1.0" encoding="ISO-8859-1"?>
    -<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
    -         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
    -         http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
    -         version="2.1">
    -         
    -  <description>Here is the description of the test's beans</description>
    -  <enterprise-beans>
    -    <entity>
    -      <description>... Bean example one ...</description>
    -      <display-name>Bean example two</display-name>
    -      <ejb-name>ExampleTwo</ejb-name>
    -      <home>tests.Ex2Home</home>
    -      <remote>tests.Ex2</remote>
    -      <local-home>tests.Ex2LocalHome</local-home>
    -      <local>tests.Ex2Local</local>
    -      <ejb-class>tests.Ex2Bean</ejb-class>
    -      <persistence-type>Container</persistence-type>
    -      <prim-key-class>tests.Ex2PK</prim-key-class>
    -      <reentrant>False</reentrant>
    -      <cmp-version>1.x</cmp-version>
    -      <cmp-field>
    -        <field-name>field1</field-name>
    -      </cmp-field>
    -      <cmp-field>
    -        <field-name>field2</field-name>
    -      </cmp-field>
    -      <cmp-field>
    -        <field-name>field3</field-name>
    -      </cmp-field>
    -      <primkey-field>field3</primkey-field>
    -      <env-entry>
    -        <env-entry-name>name1</env-entry-name>
    -        <env-entry-type>java.lang.String</env-entry-type>
    -        <env-entry-value>value1</env-entry-value>
    -      </env-entry>
    -    </entity>
    -  </enterprise-beans>
    -  <assembly-descriptor>
    -    <container-transaction>
    -      <method>
    -        <ejb-name>ExampleTwo</ejb-name>
    -        <method-name>*</method-name>
    -      </method>
    -      <trans-attribute>Supports</trans-attribute>
    -    </container-transaction>
    -  </assembly-descriptor>
    -</ejb-jar>
    -
    -
    -<?xml version="1.0" encoding="ISO-8859-1"?>
    -<jonas-ejb-jar xmlns="http://www.objectweb.org/jonas/ns"
    -               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -               xsi:schemaLocation="http://www.objectweb.org/jonas/ns
    -               http://www.objectweb.org/jonas/ns/jonas-ejb-jar_4_0.xsd" >
    -  <jonas-entity>
    -    <ejb-name>ExampleTwo</ejb-name>
    -    <jndi-name>ExampleTwoHome</jndi-name>
    -    <jndi-local-name>ExampleTwoLocalHome</jndi-local-name>
    -    <jdbc-mapping>
    -      <jndi-name>jdbc_1</jndi-name>
    -      <jdbc-table-name>YourTable</jdbc-table-name>
    -      <cmp-field-jdbc-mapping>
    -        <field-name>field1</field-name>
    -        <jdbc-field-name>dbf1</jdbc-field-name>
    -      </cmp-field-jdbc-mapping>
    -      <cmp-field-jdbc-mapping>
    -        <field-name>field2</field-name>
    -        <jdbc-field-name>dbf2</jdbc-field-name>
    -      </cmp-field-jdbc-mapping>
    -      <cmp-field-jdbc-mapping>
    -        <field-name>field3</field-name>
    -        <jdbc-field-name>dbf3</jdbc-field-name>
    -      </cmp-field-jdbc-mapping>
    -      <finder-method-jdbc-mapping>
    -        <jonas-method>
    -          <method-name>findByField1</method-name>
    -        </jonas-method>
    -        <jdbc-where-clause>where dbf1 = ?</jdbc-where-clause>
    -      </finder-method-jdbc-mapping>
    -    </jdbc-mapping>
    -  </jonas-entity>
    -</jonas-ejb-jar>
    -    
    - -

    Tips

    - -

    Although some characters, such as ">", are legal, it is good practice -to replace them with XML entity references.

    - -

    The following is a list of the predefined entity references for XML:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    &lt;<less than
    &gt;>greater than
    &amp;&ampersand
    &apos;'apostrophe
    &quot;"quotation mark
    - - diff --git a/jonas_doc/core/olddoc/PG_EarDeployment.html b/jonas_doc/core/olddoc/PG_EarDeployment.html deleted file mode 100644 index 3e8821dbdc5bc08e3de614faa3953723badc55f4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_EarDeployment.html +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - J2EE Application Assembler's Guide - - - -

    J2EE Application Assembler's Guide

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the Application Provider and -Assembler, i.e. the person in charge of combining one or more components -(ejb-jars and/or wars) to create a J2EE application. It describes how the -J2EE components should be packaged to create a J2EE application.

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Defining the Ear Deployment - Descriptor - -
    4. -
    5. EAR Packaging
    6. -
    - -

    Defining the Ear Deployment -Descriptor

    - -

    Principles

    - -

    The application programmer is responsible for providing the deployment -descriptor associated with the developed application (Enterprise ARchive). -The Application Assembler's responsibilities is to provide a XML deployment -descriptor that conforms to the deployment descriptor's XML schema as defined in -the J2EE specification version 1.4. (Refer to -$JONAS_ROOT/xml/application_1_4.xsd or  -http://java.sun.com/xml/ns/j2ee/application_1_4.xsd).

    - -

    To deploy J2EE applications on the application server, all information is -contained in one XML deployment descriptor. The file name for the application -XML deployment descriptor is application.xml and it must be -located in the top level META-INF directory.

    - -

    The parser gets the specified schema via the classpath (schemas are packaged -in the $JONAS_ROOT/lib/common/ow_jonas.jar file).

    - -

    Some J2EE application examples are provided in the JOnAS distribution:

    - - -

    The standard deployment descriptor should contain structural information -that includes the following:

    - - -

    There is no JOnAS-specific deployment descriptor for the Enterprise -ARchive.

    - -

    - -

    Simple example of Application -Deployment Descriptor

    -
    <?xml version="1.0" encoding="UTF-8"?>
    -
    -<application xmlns="http://java.sun.com/xml/ns/j2ee"
    -             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -             xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
    -             http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
    -             version="1.4">
    -
    -  <display-name>Simple example of application</display-name>
    -  <description>Simple example</description>
    -
    -  <module>
    -    <ejb>ejb1.jar</ejb>
    -  </module>
    -  <module>
    -    <ejb>ejb2.jar</ejb>
    -  </module>
    -
    -  <module>
    -    <web>
    -      <web-uri>web.war</web-uri>
    -      <context-root>web</context-root>
    -    </web>
    -  </module>
    -</application>
    -    
    - -

    Advanced example of Application -Deployment Descriptors with alternate DD and security

    -
    <?xml version="1.0" encoding="UTF-8"?>
    -
    -<application xmlns="http://java.sun.com/xml/ns/j2ee"
    -             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -             xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
    -             http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
    -             version="1.4">
    -
    -  <display-name>Ear Security</display-name>
    -  <description>Application with alt-dd and security</description>
    -  <module>
    -    <web>
    -      <web-uri>admin.war</web-uri>
    -      <context-root>admin</context-root>
    -    </web>
    -  </module>
    -  <module>
    -    <ejb>ejb.jar</ejb>
    -    <alt-dd>altdd.xml</alt-dd>
    -  </module>
    -  <security-role>
    -    <role-name>admin</role-name>
    -  </security-role>
    -</application>
    -    
    - -

    Tips

    - -

    Although some characters, such as ">", are legal, it is good practice -to replace them with XML entity references.

    - -

    The following is a list of the predefined entity references for XML:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    &lt;<less than
    &gt;>greater than
    &amp;&ampersand
    &apos;'apostrophe
    &quot;"quotation mark
    - -

    - -

    EAR Packaging

    - -

    J2EE applications are packaged for deployment in a standard Java -programming language Archive file called an ear file (Enterprise -ARchive). This file can contain the following:

    -
    -
    The web components (war)
    -
    One or more wars which contain the web components of the J2EE - application. Due to the class loader hierarchy, when the wars are - packaged in a J2EE application, it is not necessary to package classes - of EJBs accessed by the web components in the WEB-INF/lib - directory.
    - Details about this class loader hierarchy are described in JOnAS class loader - hierarchy.
    -
    The EJB components (ejb-jar)
    -
    One or more ejb-jars, which contain the beans of the J2EE - application.
    -
    The RAR components (resource adapters)
    -
    One or more rars, which contain the resource adapters of the J2EE - application.
    -
    The libraries (jar)
    -
    One or more jars which contain the libraries (tag libraries and any - utility libraries) used for the J2EE application.
    -
    The J2EE deployment descriptor
    -
    The standard xml deployment descriptor in the format defined in the - J2EE 1.4 specification. See - $JONAS_ROOT/xml/application_1_4.xsd. This deployment - descriptor must be stored with the name - META-INF/application.xml in the ear file.
    -
    - -

    Example

    - -

    Before building an ear file for a J2EE application, the ejb-jars and the -wars that will be packaged in the J2EE application must be built and the XML -deployment descriptor (application.xml) must be written.

    - -

    Then, the ear file (<j2ee-application>.ear) can be -built using the jar command:

    -
        cd <your_j2ee_application_directory>
    -    jar cvf <j2ee-application>.ear *
    -    
    - - diff --git a/jonas_doc/core/olddoc/PG_Entity.html b/jonas_doc/core/olddoc/PG_Entity.html deleted file mode 100644 index ea1cc2154a635de68b9d0dcfc33561531a351d6d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_Entity.html +++ /dev/null @@ -1,2999 +0,0 @@ - - - - - - Developing Entity Beans - - - - -

    EJB Programmer's Guide: Developing Entity -Beans

    - -

    Target Audience and Content

    -The target audience for this guide is the Enterprise Bean provider, i.e. the -person in charge of developing the software components on the server side, -and more specifically the Entity Beans. - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and content
    2. -
    3. Introduction
    4. -
    5. The Home Interface
    6. -
    7. The Component Interface
    8. -
    9. The Primary Key Class
    10. -
    11. The Enterprise Bean Class
    12. -
    13. Writing Database Access Operations - (bean-managed persistence)
    14. -
    15. Configuring Database Access for - Container-managed Persistence
    16. -
    17. Tuning Container for Entity Bean - Optimizations
    18. -
    19. Using CMP2.0 Persistence - -
    20. -
    - -

    Introduction

    -An Entity Bean is comprised of the following elements, which are developed by -the Enterprise Bean Provider: - -Note that, according to the EJB 2.0 specification, the couple "Component -Interface and Home Interface" can be either local or remote. Local -Interfaces (Home and Component) are to be used by a client running in the -same JVM as the EJB component. Create and finder methods of a local (or -remote) home interface return local (or remote) component interfaces. An EJB -component may have both remote and local interfaces, even if normally only -one type of interface is provided. If an entity bean is the target of a -container-managed relationship (refer to EJB 2.0 persistence), then it must -have local interfaces. - -

    The description of these elements is provided in the following -sections.

    - -

    Note that in this documentation, the term "Bean" always means "Enterprise -Bean."

    - -

    An entity bean represents persistent data. It is an object view of an -entity stored in a relational database. The persistence of an entity bean can -be handled in two ways:

    - -Currently, the platform handles persistence in relational storage systems -through the JDBC interface. For both container-managed and bean-managed -persistence, JDBC connections are obtained from an object provided at the EJB -server level, the DataSource. The DataSource interface is defined in -the JDBC 2.0 standard -extensions. A DataSource object identifies a database and a means to access -it via JDBC (a JDBC driver). An EJB server may propose access to several -databases and thus provides the corresponding DataSource objects. DataSources -are described in more detail in the section "Configuring JDBC DataSources." - -

    The Home Interface

    -In addition to "home business methods," the Home interface is used by any -client application to create, remove, and retrieve instances of the entity -bean. The bean provider only needs to provide the desired interface; the -container will automatically provide the implementation. The interface must -extend the javax.ejb.EJBHome interface if it is remote, or the -javax.ejb.EJBLocalHome interface if it is local. The methods of a -remote home interface must follow the rules for java RMI. The signatures of -the "create" and "find..." methods should match the signatures of the -"ejbCreate" and "ejbFind..." methods that will be provided later in the -enterprise bean implementation class (same number and types of arguments, but -different return types). - -

    create methods:

    - -remove methods: - -finder methods: - -

    Finder methods are used to search for an EJB object or a collection of EJB -objects. The arguments of the method are used by the entity bean -implementation to locate the requested entity objects. For bean-managed -persistence, the bean provider is responsible for developing the -corresponding ejbFinder methods in the bean implementation. For -container-managed persistence, the bean provider does not write these -methods; they are generated at deployment time by the platform tools; the -description of the method is provided in the deployment descriptor, as -defined in the section "Configuring database -access for container-managed persistence." In the Home interface, the -finder methods must adhere to the following rules:

    - -At least one of these methods is mandatory: findByPrimaryKey, which -takes as argument a primary key value and returns the corresponding EJB -object. - -

    home methods:

    - - -

    Example

    -The Account bean example, provided with the platform examples, is used to -illustrate these concepts. The state of an entity bean instance is stored in -a relational database, where the following table should exist, if CMP 1.1 is -used: - -

    create table ACCOUNT (ACCNO integer primary key, CUSTOMER varchar(30), -BALANCE number(15,4));

    - -

    public interface AccountHome extends EJBHome {

    - -

        public Account create(int accno, String -customer, double balance)
    -        throws RemoteException, -CreateException;

    - -

        public Account findByPrimaryKey(Integer -pk)
    -        throws RemoteException, -FinderException;

    - -

        public Account findByNumber(int accno) -
    -        throws RemoteException, -FinderException;

    - -

        public Enumeration findLargeAccounts(double -val)
    -        throws RemoteException, -FinderException;
    -}

    - -

    The Component Interface

    -Business methods: - -

    The Component Interface is the client's view of an instance of the entity -bean. It is what is returned to the client by the Home interface after -creating or finding an entity bean instance. This interface contains the -business methods of the enterprise bean. The interface must extend the -javax.ejb.EJBObject interface if it is remote, or the -javax.ejb.EJBLocalObject if it is local. The methods of a remote -component interface must follow the rules for java RMI. For each method -defined in this component interface, there must be a matching method of the -bean implementation class (same arguments number and types, same return type, -same exceptions except for RemoteException).

    - -

    Example

    -public interface Account extends EJBObject {
    -    public double getBalance() throws -RemoteException;
    -    public void setBalance(double d) throws -RemoteException;
    -    public String getCustomer() throws -RemoteException;
    -    public void setCustomer(String c) throws -RemoteException;
    -    public int getNumber() throws -RemoteException;
    -} - -

    The Primary Key Class

    -The Primary Key class is necessary for entity beans only. It encapsulates the -fields representing the primary key of an entity bean in a single object. If -the primary key in the database table is composed of a single column with a -basic data type, the simplest way to define the primary key in the bean is to -use a standard java class (for example, java.lang.Integer or -java.lang.String). This must have the same type as a field in the -bean class. It is not possible to define it as a primitive field (for -example, int, float or boolean). Then, it is only necessary to specify the -type of the primary key in the deployment descriptor: -
          <prim-key-class>java.lang.Integer</prim-key-class>
    -And, for container-managed persistence, the field which represents the -primary key: -
          <primkey-field>accno</primkey-field>
    -The alternative way is to define its own Primary Key class, described as -follows: - -

    The class must be serializable and must provide suitable implementation of -the hashcode() and equals(Object) methods.

    - -

    For container-managed persistence, the following rules must be -followed:

    - - -

    Example

    -public class AccountBeanPK implements java.io.Serializable { - -
    - public int accno; - -

    public AccountBeanPK(int accno) { this.accno = accno; }

    - -

    public AccountBeanPK() { }

    -
    - -
    - public int hashcode() { return accno; }
    - -
    - public boolean equals(Object other) { - -
    - ...
    - }
    -} - -

    Special case: Automatic generation of primary keys field

    - -

    There are two ways to manage the automatic primary key with JOnAS. The -first method is closer to what is described in the EJB specification, i.e. an -automatic PK is a hidden field, the type of which is not known even by the -application. The second method is to declare a usual PK CMP field of type -java.lang.Integer as automatic. The two cases are described below.

    - -

    1) Standard automatic primary keys (from JOnAS 4.0.0)

    - -

    In this case, an automatic PK is a hidden field, the type of which is not -known even by the application. All that is necessary is to stipulate in the -standard deployment descriptor that this EJB has an automatic PK, by -specifying java.lang.Object as primkey-class. The primary key will be -completely hidden to the application (no CMP field, no getter/setter method). -This is valid for both CMP 2.x and CMP1 entity beans. The container will -create an internal CMP field and generate its value when the entity bean is -created.

    - -

    Example:

    - -

    Standard deployment descriptor:

    -
      <entity>
    -    ...
    -    <ejb-name>AddressEJB</ejb-name>
    -    <local-home>com.titan.address.AddressHomeLocal</local-home>
    -    <local>com.titan.address.AddressLocal</local>
    -    <ejb-class>com.titan.address.AddressBean</ejb-class>
    -    <persistence-type>Container</persistence-type>
    -    <prim-key-class>java.lang.Object</prim-key-class>
    -    <reentrant>False</reentrant>
    -    <cmp-version>2.x</cmp-version>
    -    <abstract-schema-name>Cmp2_Address</abstract-schema-name>
    -    <cmp-field><field-name>street</field-name></cmp-field>
    -    <cmp-field><field-name>city</field-name></cmp-field>
    -    <cmp-field><field-name>state</field-name></cmp-field>
    -    <cmp-field><field-name>zip</field-name></cmp-field>
    - -

    - -

    Address Bean Class extract:

    -
       // Primary key is not explicitly initialized during ejbCreate method
    -   // No cmp field corresponds to the primary key
    -   public Integer ejbCreateAddress(String street, String city,
    -        String state, String zip ) throws javax.ejb.CreateException {
    -     setStreet(street);
    -     setCity(city);
    -     setState(state);
    -     setZip(zip);
    -     return null;
    -   }
    - -

    If nothing else is specified, and the JOnAS default CMP 2 database mapping -is used, the JOnAS container will generate a database column with name -JPK_ to handle this PK. However, it is possible to specify in -the JOnAS-specific Deployment Descriptor the name of the column that will be -used to store the PK value in the table, using the specific -<automatic-pk-field-name> element, as follows (this is necessary for -CMP2 legacy and for CMP1):

    - -

    JOnAS-specific deployment descriptor:

    -
      <jonas-ejb-jar xmlns="http://www.objectweb.org/jonas/ns"
    -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -    xsi:schemaLocation="http://www.objectweb.org/jonas/ns http://www.objectweb.org/jonas/ns/jonas-ejb-jar_4_0.xsd" >
    -  <jonas-entity>
    -     <ejb-name>AddressEJB</ejb-name>
    -     <jdbc-mapping>
    -        <jndi-name>jdbc_1</jndi-name>
    -        <automatic-pk-field-name>FieldPkAuto</automatic-pk-field-name>
    -     </jdbc-mapping>
    -  </jonas-entity>
    - -

    2) CMP field as automatic primary key (was already in JOnAS -3.3.x)

    - -

    The idea is to declare a usual PK CMP field of type java.lang.Integer as -automatic, then it no longer appears in create methods and its value is -automatically generated by the container at EJB instance creation time. But -it is still a cmp field, with getter/setter methods, accessible from the -application. Example:

    - -

    In the standard DD, there is a usual primary key definition,

    -
      <entity>
    -     ...
    -     <prim-key-class>java.lang.Integer</prim-key-class>
    -     <cmp-field><field-name>id</field-name></cmp-field>
    -     <primkey-field>id</primkey-field>
    - -

    and in the JOnAS-specific Deployment Descriptor, it should be specified -that this PK is automatic,

    -
      <jonas-entity>
    -     ...
    -     <jdbc-mapping>
    -
    -     <automatic-pk>true</automatic-pk>
    -

    -Note: The automatic primary key is given a unique ID -by an algorithm that is based on the system time; -therefore, IDs may be not sequential. -

    -

    -Important restriction: This algorithm will not work if used inside -a cluster with the same entity bean that is being managed in several jonas servers. -

    -

    The Enterprise Bean Class

    -The EJB implementation class implements the bean's business methods of the -component interface and the methods dedicated to the EJB environment, the -interface of which is explicitly defined in the EJB specification. The class -must implement the javax.ejb.EntityBean interface, must be defined -as public, cannot be abstract for CMP 1.1, and must be abstract for -CMP 2.0 (in this case, the abstract methods are the get and set accessor -methods of the bean cmp and cmr fields). Following is a list of the EJB -environment dedicated methods that the EJB provider must develop. - -

    The first set of methods are those corresponding to the create and find -methods of the Home interface:

    - - -

    Example

    - -

    The following examples are for container-managed persistence with EJB 1.1 -and EJB 2.0. For bean-managed persistence, refer to the examples delivered -with your specific platform.

    - -

    CMP 1.1

    -
    package eb;
    -
    -import java.rmi.RemoteException;
    -import javax.ejb.EntityBean;
    -import javax.ejb.EntityContext;
    -import javax.ejb.ObjectNotFoundException;
    -import javax.ejb.RemoveException;
    -import javax.ejb.EJBException;
    -
    -public class AccountImplBean implements EntityBean {
    -
    -    // Keep the reference on the EntityContext
    -    protected EntityContext entityContext;
    -
    -    // Object state
    -    public Integer accno;
    -    public String customer;
    -    public double balance;
    -
    -    public Integer ejbCreate(int val_accno, String val_customer, double val_balance) {
    -
    -        // Init object state
    -        accno = new Integer(val_accno);
    -        customer = val_customer;
    -        balance = val_balance;
    -        return null;
    -    }
    -
    -    public void ejbPostCreate(int val_accno, String val_customer, double val_balance) { 
    -        // Nothing to be done for this simple example.
    -    }
    -
    -    public void ejbActivate() {
    -        // Nothing to be done for this simple example.
    -    }
    -
    -    public void ejbLoad() {
    -        // Nothing to be done for this simple example, in implicit persistence.
    -    }
    -
    -    public void ejbPassivate() {
    -        // Nothing to be done for this simple example.
    -    }
    -
    -
    -    public void ejbRemove() {
    -        // Nothing to be done for this simple example, in implicit persistence.
    -    }
    -
    -    public void ejbStore() {
    -        // Nothing to be done for this simple example, in implicit persistence.
    -    }
    -
    -    public void setEntityContext(EntityContext ctx) {
    -        // Keep the entity context in object
    -        entityContext = ctx;
    -    }
    -
    -    public void unsetEntityContext() {
    -        entityContext = null;
    -    }
    -
    -    public double getBalance() {
    -        return balance;
    -    }
    -
    -    public void setBalance(double d) {
    -        balance = balance + d;
    -    }
    -
    -    public String  getCustomer() {
    -        return customer;
    -    }
    -
    -    public void setCustomer(String c) {
    -        customer = c;
    -    }
    -
    -    public int getNumber()  {
    -        return accno.intValue();
    -    }
    -}
    -CMP 2.0 -
    import java.rmi.RemoteException;
    -import javax.ejb.EntityBean;
    -import javax.ejb.EntityContext;
    -import javax.ejb.ObjectNotFoundException;
    -import javax.ejb.RemoveException;
    -import javax.ejb.CreateException;
    -import javax.ejb.EJBException;
    -
    -public abstract class AccountImpl2Bean implements EntityBean {
    -
    -    // Keep the reference on the EntityContext
    -    protected EntityContext entityContext;
    -
    -
    -    /*========================= Abstract set and get accessors for cmp fields ==============*/
    -
    -    public abstract String getCustomer();
    -    public abstract void setCustomer(String customer);
    -
    -    public abstract double getBalance();
    -    public abstract void setBalance(double balance);
    -
    -    public abstract int getAccno();
    -    public abstract void setAccno(int accno);
    -
    -    /*========================= ejbCreate methods ============================*/
    -
    -
    -    public Integer ejbCreate(int val_accno, String val_customer, double val_balance) 
    -        throws CreateException {
    -
    -        // Init object state
    -        setAccno(val_accno);
    -        setCustomer(val_customer);
    -        setBalance(val_balance);
    -        return null;
    -    }
    -    
    -    public void ejbPostCreate(int val_accno, String val_customer, double val_balance) { 
    -        // Nothing to be done for this simple example.
    -    }
    -
    -
    -    /*====================== javax.ejb.EntityBean implementation =================*/
    -
    -    public void ejbActivate() {
    -        // Nothing to be done for this simple example.
    -    }
    -
    -    public void ejbLoad() {
    -        // Nothing to be done for this simple example, in implicit persistence.
    -    }
    -
    -    public void ejbPassivate() {
    -        // Nothing to be done for this simple example.
    -    }
    -
    -    public void ejbRemove() throws RemoveException {
    -        // Nothing to be done for this simple example, in implicit persistence.
    -    }
    -
    -    public void ejbStore() {
    -        // Nothing to be done for this simple example, in implicit persistence.
    -    }
    -  
    -    public void setEntityContext(EntityContext ctx) { 
    -
    -        // Keep the entity context in object
    -        entityContext = ctx;
    -    }
    -
    -    public void unsetEntityContext()  {
    -        entityContext = null;
    -    }
    -
    -    /**
    -     * Business method to get the Account number
    -     */
    -    public int getNumber()  {
    -        return getAccno();
    -    }
    -
    -}
    - -

    Writing Database Access Operations -(bean-managed persistence)

    -For bean-managed persistence, data access operations are developed by -the bean provider using the JDBC interface. However, getting database -connections must be obtained through the javax.sql.DataSource -interface on a datasource object provided by the EJB platform. This is -mandatory since the EJB platform is responsible for managing the connection -pool and for transaction management. Thus, to get a JDBC connection, in each -method performing database operations, the bean provider must: - -A method that performs database access must always contain the getConnection -and close statements, as follows: -
    public void doSomethingInDB (...) {
    -    conn = dataSource.getConnection();
    -    ... // Database access operations
    -    conn.close();
    -}
    -A DataSource object associates a JDBC driver with a database (as an ODBC -datasource). It is created and registered in JNDI by the EJB server at launch -time (refer also to the section "JDBC DataSources configuration"). - -

    A DataSource object is a resource manager connection factory for -java.sql.Connection objects, which implements connections to a -database management system. The enterprise bean code refers to resource -factories using logical names called "Resource manager connection factory -references." The resource manager connection factory references are special -entries in the enterprise bean environment. The bean provider must use -resource manager connection factory references to obtain the datasource -object as follow:

    - -The deployer binds the resource manager connection factory references to the -actual resource factories that are configured in the server. This binding is -done in the JOnAS-specific deployment descriptor using the jonas-resource -element. - -

    Example

    -The declaration of the resource reference in the standard deployment -descriptor looks like the following: -
    <resource-ref>
    -<res-ref-name>jdbc/AccountExplDs</res-ref-name>
    -<res-type>javax.sql.DataSource</res-type>
    -<res-auth>Container</res-auth>
    -</resource-ref>
    -The <res-auth> element indicates which of the two resource manager -authentication approaches is used: - -The JOnAS-specific deployment descriptor must map the environment JNDI name -of the resource to the actual JNDI name of the resource object managed by the -EJB server. This is done in the <jonas-resource> element. -
      <jonas-entity>
    -    <ejb-name>AccountExpl</ejb-name>
    -    <jndi-name>AccountExplHome</jndi-name>
    -    <jonas-resource>
    -      <res-ref-name>jdbc/AccountExplDs</res-ref-name>
    -      <jndi-name>jdbc_1</jndi-name>
    -    </jonas-resource>
    -  </jonas-entity>
    -The ejbStore method of the same Account example with bean-managed persistence -is shown in the following example. It performs JDBC operations to update the -database record representing the state of the entity bean instance. The JDBC -connection is obtained from the datasource associated with the bean. This -datasource has been instantiated by the EJB server and is available for the -bean through its resource reference name, which is defined in the standard -deployment descriptor. - -

    In the bean, a reference to a datasource object of the EJB server is -initialized:

    - -

    it = new InitialContext();

    - -

    ds = -(DataSource)it.lookup("java:comp/env/jdbc/AccountExplDs");

    - -

    Then, this datasource object is used in the implementation of the methods -performing JDBC operations, such as ejbStore, as illustrated in the -following:

    -
    public void ejbStore
    -    Connection conn = null;
    -    PreparedStatement stmt = null;
    -    try { // get a connection
    -        conn = ds.getConnection();
    -        // store Object state in DB
    -        stmt = conn.prepareStatement("update account set customer=?,balance=? where accno=?");
    -        stmt.setString(1, customer);
    -        stmt.setDouble(2, balance);
    -        Integer pk = (Integer)entityContext.getPrimaryKey();
    -        stmt.setInt(3, pk.accno);
    -        stmt.executeUpdate();
    -     } catch (SQLException e) {
    -        throw new javax.ejb.EJBException("Failed to store bean to database", e);
    -     } finally {
    -        try {
    -            if (stmt != null) stmt.close();    // close statement
    -            if (conn != null) conn.close();    // release connection
    -        } catch (Exception ignore) {}
    -     }
    -}
    -Note that the close statement instruction may be important if the server is -intensively accessed by many clients performing entity bean access. If the -statement is not closed in the finally block, since stmt is in the -scope of the method, it will be deleted at the end of the method (and the -close will be implicitly done). However, it may be some time before the Java -garbage collector deletes the statement object. Therefore, if the number of -clients performing entity bean access is important, the DBMS may raise a "too -many opened cursors" exception (a JDBC statement corresponds to a DBMS -cursor). Since connection pooling is performed by the platform, closing the -connection will not result in a physical connection close, therefore opened -cursors will not be closed. Thus, it is preferable to explicitly close the -statement in the method. - -

    It is a good programming practice to put the JDBC connection and JDBC -statement close operations in a finally bloc of the try statement.

    - -

    Configuring Database Access for -Container-managed Persistence

    -The standard way to indicate to an EJB platform that an entity bean has -container-managed persistence is to fill the -<persistence-type> tag of the deployment descriptor with the -value "container," and to fill the <cmp-field> tag of the -deployment descriptor with the list of container-managed fields (the fields -that the container will have in charge to make persistent). The CMP version -(1.x or 2.x) should also be specified in the <cmp-version> tag. In the -textual format of the deployment descriptor, this is represented by the -following lines: -
        <persistence-type>container</persistence-type>
    -    <cmp-version>1.x</cmp-version>
    -    <cmp-field>
    -      <field-name>fieldOne</field-name>
    -    </cmp-field>
    -    <cmp-field>
    -      <field-name>fieldTwo</field-name>
    -    </cmp-field>
    -With container-managed persistence the programmer need not develop the -code for accessing the data in the relational database; this code is included -in the container itself (generated by the platform tools). However, for the -EJB platform to know how to access the database and which data to read and -write in the database, two types of information must be provided with the -bean: - -The EJB specification does not specify how this information should be -provided to the EJB platform by the bean deployer. Therefore, what is -described in the remainder of this section is specific to JOnAS. - -

    For CMP 1.1, the bean deployer is responsible for defining the mapping of -the bean fields to the database table columns. The name of the DataSource can -be set at deployment time, since it depends on the EJB platform -configuration. This database configuration information is defined in the -JOnAS-specific deployment descriptor via the jdbc-mapping element. -The following example defines the mapping for a CMP 1.1 entity bean:

    -
        <jdbc-mapping>
    -      <jndi-name>jdbc_1</jndi-name>
    -      <jdbc-table-name>accountsample</jdbc-table-name>
    -      <cmp-field-jdbc-mapping>
    -      <field-name>mAccno</field-name>
    -      <jdbc-field-name>accno</jdbc-field-name>
    -      </cmp-field-jdbc-mapping>
    -      <cmp-field-jdbc-mapping>
    -      <field-name>mCustomer</field-name>
    -      <jdbc-field-name>customer</jdbc-field-name>
    -      </cmp-field-jdbc-mapping>
    -      <cmp-field-jdbc-mapping>
    -      <field-name>mBalance</field-name>
    -      <jdbc-field-name>balance</jdbc-field-name>
    -    </jdbc-mapping>
    -jdbc_1 is the JNDI name of the DataSource object identifying the -database. accountsample is the name of the table used to store the -bean instances in the database. mAccno, mCustomer, and -mBalance are the names of the container-managed fields of the bean -to be stored in the accno, customer, and balance -columns of the accountsample table. This example applies to -container-managed persistence. For bean-managed persistence, -the database mapping does not exist. - -

    For a CMP 2.0 entity bean, only the jndi-name element of the -jdbc-mapping is mandatory, since the mapping may be generated -automatically (for an explicit mapping definition, refer to the "JOnAS Database Mapping" section of the Using CMP2.0 persistence chapter):

    -
    -    <jdbc-mapping>
    -      <jndi-name>jdbc_1</jndi-name>
    -    </jdbc-mapping>
    -    <cleanup>create</cleanup>
    -
    -For a CMP 2.0 entity bean, the JOnAS-specific deployment descriptor contains -an additional element, cleanup, at the same level as the -jdbc-mapping element, which can have one of the following values: -
    -
    removedata
    -
    at bean loading time, the content of the tables storing the bean data - is deleted
    -
    removeall
    -
    at bean loading time, the tables storing the bean data are dropped - (if they exist) and created
    -
    none
    -
    do nothing
    -
    create
    -
    default value (if the element is not specified), at bean loading - time, the tables for storing the bean data are created if they do not - exist
    -
    -For CMP 1.1, the jdbc-mapping element can also contain information -defining the behaviour of the implementation of a find<method> -method (i.e. the ejbFind<method> method, that will be generated -by the platform tools). This information is represented by the -finder-method-jdbc-mapping element. - -

    For each finder method, this element provides a way to define an SQL WHERE -clause that will be used in the generated finder method implementation to -query the relational table storing the bean entities. Note that the table -column names should be used, not the bean field names. Example:

    -
          <finder-method-jdbc-mapping>
    -        <jonas-method>
    -          <method-name>findLargeAccounts</method-name>
    -        </jonas-method>
    -        <jdbc-where-clause>where balance &gt; ?</jdbc-where-clause>
    -      </finder-method-jdbc-mapping>
    -The previous finder method description will cause the platform tools to -generate an implementation of ejbFindLargeAccount(double arg) that returns -the primary keys of the entity bean objects corresponding to the tuples -returned by the "select ... from Account where balance > ?", where '?' -will be replaced by the value of the first argument of the findLargeAccount -method. If several '?' characters appear in the provided WHERE clause, this -means that the finder method has several arguments and the '?' characters -will correspond to these arguments, adhering to the order of the method -signature. - -

    In the WHERE clause, the parameters can be followed by a number, which -specifies the method parameter number that will be used by the query in this -position.
    -Example: The WHERE clause of the following finder method can be:

    -
          Enumeration findByTextAndDateCondition(String text, java.sql.Date date)
    -
    -      WHERE (description like ?1 OR summary like ?1) AND (?2 &gt; date)
    -Note that a <finder-method-jdbc-mapping> element for the -findByPrimaryKey method is not necessary, since the meaning of this -method is known. - -

    Additionally, note that for CMP 2.0, the information defining the -behaviour of the implementation of a find<method> method is -located in the standard deployment descriptor, as an EJB-QL query -(i.e. this is not JOnAS-specific information). The same finder method example -in CMP 2.0:

    -
          <query>
    -        <query-method>
    -          <method-name>findLargeAccounts</method-name>
    -          <method-params>
    -              <method-param>double</method-param>
    -          </method-params>
    -        </query-method>
    -        <ejb-ql>SELECT OBJECT(o) FROM accountsample o WHERE o.balance &gt; ?1</ejb-ql>
    -      </query>
    -The datatypes supported for container-managed fields in CMP 1.1 are the -following:
    -  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Java TypeJDBC TypeJDBC driver Access methods
    booleanBITgetBoolean(), setBoolean()
    byteTINYINTgetByte(), setByte()
    short SMALLINTgetShort(), setShort()
    int INTEGERgetInt(), setInt()
    long BIGINTgetLong(), setLong()
    float FLOATgetFloat(), setFloat()
    double DOUBLEgetDouble(), setDouble
    byte[] VARBINARY or LONGVARBINARY (1)getBytes(), setBytes()
    java.lang.StringVARCHAR or LONGVARCHAR (1)getString(), setString()
    java.lang.BooleanBITgetBoolean(), setObject()
    java.lang.IntegerINTEGERgetInt(), setObject()
    java.lang.ShortSMALLINTgetShort(), setObject()
    java.lang.LongBIGINTgetLong(), setObject()
    java.lang.FloatREALgetFloat(), setObject()
    java.lang.DoubleDOUBLEgetDouble(), setObject()
    java.math.BigDecimalNUMERICgetBigDecimal(), setObject()
    java.math.BigIntegerNUMERICgetBigDecimal(), setObject()
    java.sql.DateDATEgetDate(), setDate()
    java.sql.TimeTIMEgetTime(), setTime()
    java.sql.Timestamp TIMESTAMPgetTimestamp(), setTimestamp()
    any serializable classVARBINARY or LONGVARBINARY (1)getBytes(), setBytes()
    - -

    (1) The mapping for String will normally be VARCHAR, but will turn into -LONGVARCHAR if the given value exceeds the driver's limit on VARCHAR values. -The case is similar for byte[] and VARBINARY and LONGVARBINARY values.

    - -

    For CMP 2.0, the supported datatypes depend on the JORM mapper used.

    - - -

    Tuning Container for Entity Bean -Optimizations

    -JOnAS must make a compromise between scalability and performance. For that reason, several tags in the JOnAS-specific deployment -descriptor have been introduced. For most applications, there is no need to change the default -values for all these tags. See -$JONAS_ROOT/xml/jonas-ejb-jar_4_7.xsd for a complete description -of the JOnAS-specific deployment descriptor. - -

    Note that if several of these elements are used, they should appear in the -following order within the <jonas-entity> element:

    -
      -
    1. is-modified-method-name
    2. -
    3. passivation-timeout
    4. -
    5. read-timeout
    6. -
    7. max-wait-time
    8. -
    9. inactivity-timeout
    10. -
    11. deadlock-timeout
    12. -
    13. shared
    14. -
    15. prefetch
    16. -
    17. hard-limit
    18. -
    19. max-cache-size
    20. -
    21. min-pool-size
    22. -
    23. cleanup
    24. -
    25. lock-policy
    26. -
    - -

    lock-policy

    -The JOnAS ejb container is able to manage seven different lock-policies: -
    -
    container-serialized (default)
    -
    The container ensures the - transaction serialization. This policy is suitable for entity beans - having non transacted methods that can modify the bean state. - It works only if the bean is accessed from 1 jonas server (shared = - false).
    -
    container-serialized-transacted
    -
    The container ensures the - transaction serialization. This policy is suitable for most entity beans.
    -
    container-read-committed
    -
    This policy is similar to - container-serialized-transacted, except that accesses outside transaction do not - interfere with transactional accesses. This can help to avoid deadlocks in - certain cases, when accessing a bean concurrently with and without a - transactional context. The only drawback of this policy is that it - consumes more memory (2 instances instead of 1).
    -
    container-read-uncommitted (deprecated)
    -
    All methods share the same - instance (like container-serialized), but there is no synchronization. - For example, this policy is of interest for read-only entity beans, or if - the bean instances are very rarely modified. It will fail if two or more - threads try to modify the same instance concurrently. - This policy is deprecated because it can be replaced by container-read-write.
    -
    database
    -
    Allow the database to handle the transaction isolation. - With this policy, it is possible to choose the transaction isolation in a - database. This may be of interest for applications that heavily use - transactional read-only operations, or when the flag shared is needed. It - does not work with all databases and is not memory efficient.
    -
    read-only
    -
    The bean state is never written to the database. - If the bean is shared, the bean state is read from the database regularly. - Use the read-timeout tag to specify the timeout value.
    -
    container-read-write
    -
    All methods share the same - instance (like container-serialized). A synchronization is done only when - the instance is modified. No lock is taken while the instance is read only. - This policy does not work if the bean is shared, nor does it work for CMP 1.x beans.
    -
    - -

    Important: If CMP1 beans are deployed, only the following policies should be used: -

    -

    - -

    shared

    -This flag will be defined as true if the bean persistent state can -be accessed outside the JOnAS Server. When this flag is false, the -JOnAS Server can do some optimization, such as not re-reading the bean state -before starting a new transaction. -The default value depends on the lock-policy: - -Lock policy database works only if shared=true. - - -

    prefetch

    -This is a CMP2-specific option. The default is false. This can be set to true -if it is desirable to have a cache managed after finder methods execution, in -order to optimize further accesses inside the same transaction. - -

    Important note:

    - - -

    max-cache-size / hard-limit / max-wait-time

    -This optional integer value represents the maximum number of instances in memory. -The purpose of this value is to keep JOnAS scalable. The default value is "no -limit". To save memory, this value should be set very low if it is known that -instances will not be reused. -Depending on whether hard-limit value is true or false, this max-cache-size value will -be overtaken or not: In the case of hard-limit = true, the container will never allocate more -instances than the max-cache-size value. When the limit is reached, the thread will be -set to waiting until instances are released. It is possible to specify the maximum time to -wait for an instance with the tag max-wait-time. The default is 0, which means "no wait". - -

    min-pool-size

    -This optional integer value represents the number of instances that will be -created in the pool when the bean is loaded. This will improve bean instance -create time, at least for the first instances. The default value is 0. -When passivation occurs, for example if there are too many instances in memory, -instances are released and placed in the pool only if min-pool-size is not -reached. The intent is to try to keep at least min-pool-size instances in the pool of -available instances. - -

    is-modified-method-name

    -To improve performance of CMP 1.1 entity beans, JOnAS implements the -isModified extension. Before performing an update, the container calls a -method of the bean whose name is identified in the -is-modified-method-name element of the JOnAS-specific deployment -descriptor. This method is responsible for determining if the state of the -bean has been changed. By doing this, the container determines if it must -store data in the database or not. - -

    Note that this is useless with CMP2 entity beans, since this will be done -automatically by the container.

    - -

    Example

    - -

    The bean implementation manages a boolean isDirty and implements -a method that returns the value of this boolean: isModified

    -
    -    private transient boolean isDirty;
    -    public boolean isModified() {
    -        return isDirty;
    -    }
    -    
    - -

    The JOnAS-specific deployment descriptor directs the bean to implement an -isModified method:

    -
    -    <jonas-entity>
    -      <ejb-name>Item</ejb-name>
    -      <is-modified-method-name>isModified</is-modified-method-name>
    -      .....
    -    </jonas-entity>
    -    
    - -

    Methods that modify the value of the bean must set the flag -isDirty to true.
    -Methods that restore the value of the bean from the database must reset the -flag isDirty to false. Therefore, the flag must be set to -false in the ejbLoad() and ejbStore() methods.

    - -

    passivation-timeout

    -This flag is used only when lock-policy = container-serialized. -When instances are accessed outside of any transaction, their state is kept in memory -to improve performance. However, a passivation will occur in three situations: -
      -
    1. When the bean is unloaded from the server, at least when the server - is stopped.
    2. -
    3. When a transaction is started on this instance.
    4. -
    5. After a configurable timeout: passivation-timeout. If the bean is always accessed with no - transaction, it may be prudent to periodically store the bean state on - disk.
    6. -
    -This passivation timeout can be configured in the JOnAS-specific deployment -descriptor, with the non-mandatory tag <passivation-timeout>. Example: -
        <jonas-entity>
    -      <ejb-name>Item</ejb-name>
    -      <passivation-timeout>5</passivation-timeout>
    -      .....
    -    </jonas-entity>
    -    
    -This entity bean will be passivated every five second, if not accessed within -transactions. - - -

    read-timeout

    -This flag is used only when lock-policy = read-only. -In case shared=true has been set, it is important to synchronize the bean -state by reading it periodically from the storage. -This is configurable with the read-timeout flag. -Value is in seconds. - -

    inactivity-timeout

    -Bean passivation sends the state of the bean to persistent storage and removes from -memory only the bean instance objects that are holding this state. All container objects handling -bean access (remote object, interceptors, ...) are kept in memory so that future access -will work, requiring only a reload -operation (getting the state). It may be advantageous to conserve more memory and completely remove the -bean instance from memory; this can be achieved through the <inactivity-timeout> -element. This element is used to save memory when a bean has not been used for a long period of time. -If the bean has not been used after the specified time (in seconds), all its -container objects are removed -from the server. If a client has kept a reference on a remote object and tries to use it, then the client will receive an -exception. - -

    Using CMP2.0 persistence

    - -

    This section highlights the main differences between CMP as defined in EJB -2.0 specification (called CMP2.0) and CMP as defined in EJB 1.1 specification -(called CMP1.1). Major new features in the standard development and -deployment of CMP2.0 entity beans are listed (comparing them to CMP1.1), -along with JOnAS-specific information. Mapping CMP2.0 entity beans to the -database is described in detail. Note that the database mapping can be -created entirely by JOnAS, in which case the JOnAS-specific deployment -descriptor for an entity bean should contain only the datasource and the -element indicating how the database should be initialized.

    - -

    Standard CMP2.0 Aspects

    - -

    This section briefly describes the new features available in CMP2.0 as -compared to CMP 1.1, and how these features change the development of entity -beans.

    - -

    Entity Bean Implementation Class

    - -

    The EJB implementation class 1) implements the bean's business methods of -the component interface, 2) implements the methods dedicated to the EJB -environment (the interface of which is explicitly defined in the EJB -specification), and 3) defines the abstract methods representing both the -persistent fields (cmp-fields) and the relationship fields (cmr-fields). The -class must implement the javax.ejb.EntityBean interface, be defined -as public, and be abstract (which is not the case for CMP1.1, where it must -not be abstract). The abstract methods are the get and set accessor methods -of the bean cmp and cmr fields. Refer to the examples and details in the -section "Developing Entity Beans" of -the JOnAS documentation.

    - -

    Standard Deployment Descriptor

    - -

    The standard way to indicate to an EJB platform that an entity bean has -container-managed persistence is to fill the -<persistence-type> tag of the deployment descriptor with the -value "container," and to fill the <cmp-field> tags of the -deployment descriptor with the list of container-managed fields (the fields -that the container will have in charge to make persistent) and the -<cmr-field> tags identifying the relationships. The CMP -version (1.x or 2.x) should also be specified in the <cmp-version> tag. -This is represented by the following lines in the deployment descriptor:

    -
        <persistence-type>container</persistence-type>
    -    <cmp-version>1.x</cmp-version>
    -    <cmp-field>
    -      <field-name>fieldOne</field-name>
    -    </cmp-field>
    -    <cmp-field>
    -      <field-name>fieldTwo</field-name>
    -    </cmp-field>
    -    
    - -

    Note that for running CMP1.1-defined entity beans on an EJB2.0 platform, -such as JOnAS 3.x, you must introduce this -<cmp-version> element in your deployment descriptors, since the -default cmp-version value (if not specified) is 2.x.

    - -

    Note that for CMP 2.0, the information defining the behaviour of the -implementation of a find<method> method is located in -the standard deployment descriptor as an EJB-QL query (this -is not JOnAS-specific information). -For CMP 1.1, this information is located in the JOnAS-specific deployment -descriptor as an SQL WHERE clause specified in a -<finder-method-jdbc-mapping> element.

    - -

    Finder method example in CMP 2.0: for a findLargeAccounts(double -val) method defined on the Account entity bean of the JOnAS eb -example.

    -
          <query>
    -        <query-method>
    -          <method-name>findLargeAccounts</method-name>
    -          <method-params>
    -              <method-param>double</method-param>
    -          </method-params>
    -        </query-method>
    -        <ejb-ql>SELECT OBJECT(o) FROM accountsample o WHERE o.balance &gt; ?1</ejb-ql>
    -      </query>
    -    
    - -

    JOnAS EJBQL extension

    - -

    LIMIT clause

    - -

    The LIMIT feature has been added to the standard EJBQL -query language. This feature enables you to retrieve just a portion -of the results generated by the rest of a query.

    - -

    The syntax of the LIMIT clause is:

    -
    -    limit_clause ::= LIMIT limit_expression (, limit_expression )?
    -    limit_expression ::= integer_literal | input_parameter
    -
    -

    The first limit_expression corresponds to the start_at range and the second one to the size range.

    - -

    The limit_clause is the last clause of the query:

    -
    -    ejbql ::= select_clause from_clause [where_clause] [orderby_clause] [limit_clause]
    -
    -

    Example:

    -
    -    SELECT OBJECT(c) FROM jt2_Customer AS c ORDER BY c.id LIMIT ?1, 20
    -
    -

    Note that this feature is currently not implemented on all the database types supported by JORM/MEDOR.

    - -

    JOnAS Database mappers

    - -

    For implementing the EJB 2.0 persistence (CMP2.0), JOnAS relies on the JORM framework. JORM -itself relies on JOnAS DataSources (specified in DataSource properties files) -for connecting to the actual database. JORM must adapt its object-relational -mapping to the underlying database, for which it makes use of adapters called -"mappers." Thus, for each type of database (and more precisely for each JDBC -driver), the corresponding mapper must be specified in the DataSource. This -is the purpose of the datasource.mapper property of the -DataSource properties file. Note that all JOnAS-provided DataSource -properties files (in JOnAS_ROOT/conf) already contain this property with the -correct mapper.

    - - - - - - - - - - - - - - -
    property namedescriptionpossible values
    datasource.mapperJORM database mapper
      -
    • rdb: generic mapper (JDBC standard driver ...)
    • -
    • rdb.cloudscape: Cloudscape
    • -
    • rdb.db2: DB2
    • -
    • rdb.firebird: Firebird
    • -
    • rdb.hsql: HSQL
    • -
    • rdb.mckoi: McKoi Db
    • -
    • rdb.mysql: MySQL
    • -
    • rdb.oracle8: Oracle 8 and lesser versions
    • -
    • rdb.oracle: Oracle 9
    • -
    • rdb.postgres: PostgreSQL (>= 7.2)
    • -
    • rdb.sapdb: Sap DB
    • -
    • rdb.sqlserver: MS Sql Server
    • -
    • rdb.sybase: Sybase
    • -
    -
    - -

    Contact the JOnAS team to obtain a mapper for other databases.

    - -

    The container code generated at deployment is now independent of the JORM mappers. -Until JOnAS 4.1.4, the container code generated at deployment (GenIC or ejbjar ant task) -was dependent on this mapper. It was possible to deploy (generate container code) -a bean for several mappers in order to change the database (i.e. the -DataSource file) without redeploying the bean. These mappers were -specified as the mappernames argument of the GenIC command -or as the mappernames attribute of the JOnAS ANT ejbjar -task. The value was a comma-separated list of mapper names for which the -container classes were generated. These mappernames options are now -deprecated.

    - - -

    JOnAS Database Mapping (Specific Deployment -Descriptor)

    - -

    The mapping to the database of entity beans and their relationships may be -specified in the JOnAS-specific deployment descriptor, in -jonas-entity elements, and in jonas-ejb-relation elements. -Since JOnAS is able to generate the database mapping, all the elements of the -JOnAS-specific deployment descriptor defined in this section (which are -sub-elements of jonas-entity or jonas-ejb-relation) are -optional, except those for specifying the datasource and the initialization -mode (i.e. the jndi-name of jdbc-mapping and -cleanup). The default values of these mapping elements, provided in -this section, define the JOnAS-generated database mapping.

    - -

    Specifying and Initializing the Database

    - -

    For specifying the database within which a CMP 2.0 entity bean is stored, -the jndi-name element of the jdbc-mapping is necessary. -This is the JNDI name of the DataSource representing the database storing the -entity bean.

    -
        <jdbc-mapping>
    -      <jndi-name>jdbc_1</jndi-name>
    -    </jdbc-mapping>
    -    
    - -

    For a CMP 2.0 entity bean, the JOnAS-specific deployment descriptor -contains an additional element, cleanup, to be specified before the -jdbc-mapping element, which can have one of the following values:

    -
    -
    removedata
    -
    at bean loading time, the content of the tables storing the bean data - is deleted
    -
    removeall
    -
    at bean loading time, the tables storing the bean data are dropped - (if they exist) and created
    -
    none
    -
    do nothing
    -
    create
    -
    default value (if the element is not specified), at bean loading - time, the tables for storing the bean data are created if they do not - exist.
    -
    - -

    It may be useful for testing purposes to delete the database data each -time a bean is loaded. For this purpose, the part of the JOnAS-specific -deployment descriptor related to the entity bean may look like the -following:

    -
        <cleanup>removedata</cleanup>
    -    <jdbc-mapping>
    -      <jndi-name>jdbc_1</jndi-name>
    -    </jdbc-mapping>
    -    
    - -

    CMP fields Mapping

    - -

    Mapping CMP fields in CMP2.0 is similar to that of CMP 1.1, but in CMP2.0 -it is also possible to specify the SQL type of a column. Usually this SQL -type is used if JOnAS creates the table (create value of the -cleanup element), and if the JORM default chosen SQL type is not -appropriate.

    - -
    Standard Deployment Descriptor
    -
        .....
    -    <entity>
    -      <ejb-name>A</ejb-name>
    -      .....
    -      <cmp-field>
    -        <field-name>idA</field-name>
    -      </cmp-field>
    -      <cmp-field>
    -        <field-name>f</field-name>
    -      </cmp-field>
    -    .....
    -    </entity>
    -    .....
    -    
    - -
    Database Mapping
    - - - - - - - - - - - - - - - - -
    t_A
    c_idAc_f
    ......
    - -
    JOnAS Deployment Descriptor
    -
        .....
    -    <jonas-entity>
    -      <ejb-name>A</ejb-name>
    -      .....
    -      <jdbc-mapping>
    -        <jndi-name>jdbc_1</jndi-name>
    -        <jdbc-table-name>t_A</jdbc-table-name>
    -        <cmp-field-jdbc-mapping>
    -          <field-name>idA</field-name>
    -          <jdbc-field-name>c_idA</jdbc-field-name>
    -        </cmp-field-jdbc-mapping>
    -        <cmp-field-jdbc-mapping>
    -          <field-name>f</field-name>
    -          <jdbc-field-name>c_f</jdbc-field-name>
    -          <sql-type>varchar(40)</sql-type>
    -        </cmp-field-jdbc-mapping>
    -      </jdbc-mapping>
    -      .....
    -    </jonas-entity>
    -    .....
    -    
    - -

    Defaults values:

    - - - - - - - - - - - - - - - - - - - - - - - - -
    jndi-nameMandatory
    jdbc-table-nameOptional.
    - Default value is the upper-case CMP2 abstract-schema-name, - or the CMP1 ejb-name, suffixed by - _.
    cmp-field-jdbc-mappingOptional.
    jdbc-field-nameOptional.
    - Default value is the field-name suffixed by _.
    - idA_ and f_ in the example.
    sql-typeOptional.
    - Default value defined by JORM.
    -  - -

    CMR fields Mapping to primary-key-fields -(simple pk)

    - -
    1-1 unidirectional relationships
    - -
    Standard Deployment Descriptor
    -
        .....
    -    <entity>
    -      <ejb-name>A</ejb-name>
    -      .....
    -      <cmp-field>
    -        <field-name>idA</field-name>
    -      </cmp-field>
    -      <primkey-field>idA</primkey-field>
    -      .....
    -    </entity>
    -    .....
    -    <entity>
    -      <ejb-name>B</ejb-name>
    -      .....
    -      <cmp-field>
    -        <field-name>idB</field-name>
    -      </cmp-field>
    -      <primkey-field>idB</primkey-field>
    -      .....
    -    </entity>
    -    .....
    -    <relationships>
    -      <ejb-relation>
    -        <ejb-relation-name>a-b</ejb-relation-name>
    -        <ejb-relationship-role>
    -          <!-- A => B -->
    -                <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -          <multiplicity>One</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>A</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>b</cmr-field-name>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -        <ejb-relationship-role>
    -          <!-- B => A -->
    -          <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -          <multiplicity>One</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>B</ejb-name>
    -          </relationship-role-source>
    -        </ejb-relationship-role>
    -      </ejb-relation>
    -    </relationships>
    -    .....
    -    
    - -
    Database Mapping
    - - - - - - - - -
    - - - - - - - - - - - - - - - -
    t_A
    c_idAcfk_idB
    ......
    -
    - - - - - - - - - - - - -
    t_B
    c_idB
    ...
    -
    - -

    There is a foreign key in the table of the bean that owns the CMR -field.

    - -
    JOnAS Deployment Descriptor
    -
        .....
    -    <jonas-entity>
    -      <ejb-name>A</ejb-name>
    -      .....
    -      <jdbc-mapping>
    -        <jndi-name>jdbc_1</jndi-name>
    -        <jdbc-table-name>t_A/jdbc-table-name>
    -        <cmp-field-jdbc-mapping>
    -          <field-name>idA</field-name>
    -          <jdbc-field-name>c_idA</jdbc-field-name>
    -        </cmp-field-jdbc-mapping>
    -      </jdbc-mapping>
    -      .....
    -    </jonas-entity>
    -    .....
    -    <jonas-entity>
    -      <ejb-name>B</ejb-name>
    -      .....
    -      <jdbc-mapping>
    -        <jndi-name>jdbc_1</jndi-name>
    -        <jdbc-table-name>t_B/jdbc-table-name>
    -        <cmp-field-jdbc-mapping>
    -          <field-name>idB</field-name>
    -          <jdbc-field-name>c_idB</jdbc-field-name>
    -        </cmp-field-jdbc-mapping>
    -      </jdbc-mapping>
    -      .....
    -    </jonas-entity>
    -    .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    foreign-key-jdbc-name is the column name of the foreign key in the -table of the source bean of the relationship-role.
    -In this example, where the destination bean has a primary-key-field, it is -possible to deduce that this foreign-key-jdbc-name column is to be associated -with the column of this primary-key-field in the table of the destination -bean.

    - -

    Default values:

    - - - - - - - - - - - - -
    jonas-ejb-relationOptional
    foreign-key-jdbc-nameOptional.
    - Default value is the abstract-schema-name of the destination bean, - suffixed by _, and by its primary-key-field.
    - B_idb in the example.
    -  - -
    1-1 bidirectional relationships
    - -

    Compared to 1-1 unidirectional relationships, there is a CMR field in both -of the beans, thus making two types of mapping possible.

    - -
    Standard Deployment Descriptor
    -
        .....
    -    <relationships>
    -      <ejb-relation>
    -        <ejb-relation-name>a-b</ejb-relation-name>
    -        <ejb-relationship-role>
    -          <!-- A => B -->
    -                <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -          <multiplicity>One</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>A</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>b</cmr-field-name>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -        <ejb-relationship-role>
    -          <!-- B => A -->
    -          <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -          <multiplicity>One</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>B</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>a</cmr-field-name>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -      </ejb-relation>
    -    </relationships>
    -    .....
    -    
    - -
    Database Mapping
    - -

    Two mappings are possible. One of the tables may hold a foreign key.

    - -

    Case 1:

    - - - - - - - - -
    - - - - - - - - - - - - - - - -
    t_A
    c_idAcfk_idB
    ......
    -
    - - - - - - - - - - - - -
    t_B
    c_idB
    ...
    -
    - -

    Case 2:

    - - - - - - - - -
    - - - - - - - - - - - - -
    t_A
    c_idA
    ...
    -
    - - - - - - - - - - - - - - - -
    t_B
    c_idBcfk_idA
    ......
    -
    - -
    JOnAS Deployment Descriptor
    - -

    Case 1:

    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    Case 2:

    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    For the default mapping, the foreign key is in the table of the source -bean of the first ejb-relationship-role of the ejb-relation. In the example, -the default mapping corresponds to case 1, since the ejb-relationship-role -a2b is the first defined in the ejb-relation a-b. Then, the -default values are similar to those of the 1-1 unidirectional -relationship.

    -  - -
    1-N unidirectional relationships
    - -
    Standard Deployment Descriptor
    -
        .....
    -    <relationships>
    -      <ejb-relation>
    -        <ejb-relation-name>a-b</ejb-relation-name>
    -        <ejb-relationship-role>
    -          <!-- A => B -->
    -                <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -          <multiplicity>One</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>A</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>b</cmr-field-name>
    -            <cmr-field-type>java.util.Collection</cmr-field-type>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -        <ejb-relationship-role>
    -          <!-- B => A -->
    -          <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -          <multiplicity>Many</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>B</ejb-name>
    -          </relationship-role-source>
    -        </ejb-relationship-role>
    -      </ejb-relation>
    -    </relationships>
    -    .....
    -    
    - -
    Database Mapping
    - - - - - - - - -
    - - - - - - - - - - - - -
    t_A
    c_idA
    ...
    -
    - - - - - - - - - - - - - - - -
    t_B
    c_idBcfk_idA
    ......
    -
    - -

    In this case, the foreign key must be in the table of the bean which is on -the "many" side of the relationship (i.e. in the table of the source bean of -the relationship role with multiplicity many), t_B.

    - -
    JOnAS Deployment Descriptor
    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    Default values:

    - - - - - - - - - - - - -
    jonas-ejb-relationOptional
    foreign-key-jdbc-nameOptional.
    - Default value is the abstract-schema-name of the destination bean of - the "one" side of the relationship (i.e. the source bean of the - relationship role with multiplicity one), suffixed by _, and - by its primary-key-field.
    - A_ida in the example.
    -  - -
    1-N bidirectional relationships
    - -

    Similar to 1-N unidirectional relationships, but with a CMR field in each -bean.

    - -
    Standard Deployment Descriptor
    -
        .....
    -    <relationships>
    -      <ejb-relation>
    -        <ejb-relation-name>a-b</ejb-relation-name>
    -        <ejb-relationship-role>
    -          <!-- A => B -->
    -                <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -          <multiplicity>One</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>A</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>b</cmr-field-name>
    -            <cmr-field-type>java.util.Collection</cmr-field-type>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -        <ejb-relationship-role>
    -          <!-- B => A -->
    -          <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -          <multiplicity>Many</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>B</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>a</cmr-field-name>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -      </ejb-relation>
    -    </relationships>
    -    .....
    -    
    - -
    Database mapping
    - - - - - - - - -
    - - - - - - - - - - - - -
    t_A
    c_idA
    ...
    -
    - - - - - - - - - - - - - - - -
    t_B
    c_idBcfk_idA
    ......
    -
    - -

    In this case, the foreign key must be in the table of the bean which is on -the "many" side of the relationship (i.e. in the table of the source bean of -the relationship role with multiplicity many), t_B.

    - -
    JOnAS Deployment Descriptor
    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    Default values:

    - - - - - - - - - - - - -
    jonas-ejb-relationOptional
    foreign-key-jdbc-nameOptional.
    - Default value is the abstract-schema-name of the destination bean of - the "one" side of the relationship (i.e. the source bean of the - relationship role with multiplicity one), suffixed by _, and - by its primary-key-field.
    - A_ida in the example.
    -  - -
    N-1 unidirectional relationships
    - -

    Similar to 1-N unidirectional relationships, but the CMR field is defined -on the "many" side of the relationship, i.e. on the (source bean of the) -relationship role with multiplicity "many."

    - -
    Standard Deployment Descriptor
    -
        .....
    -    <relationships>
    -      <ejb-relation>
    -        <ejb-relation-name>a-b</ejb-relation-name>
    -        <ejb-relationship-role>
    -          <!-- A => B -->
    -                <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -          <multiplicity>Many</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>A</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>b</cmr-field-name>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -        <ejb-relationship-role>
    -          <!-- B => A -->
    -          <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -          <multiplicity>One</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>B</ejb-name>
    -          </relationship-role-source>
    -        </ejb-relationship-role>
    -      </ejb-relation>
    -    </relationships>
    -    .....
    -    
    - -
    Database mapping
    - - - - - - - - -
    - - - - - - - - - - - - - - - -
    t_A
    c_idAcfk_idB
    ......
    -
    - - - - - - - - - - - - -
    t_B
    c_idB
    ...
    -
    - -

    In this case, the foreign key must be in the table of the bean which is on -the "many" side of the relationship (i.e. in table of the source bean of the -relationship role with multiplicity many), t_A.

    - -
    JOnAS Deployment Descriptor
    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    Default values:

    - - - - - - - - - - - - -
    jonas-ejb-relationOptional
    foreign-key-jdbc-nameOptional.
    - Default value is the abstract-schema-name of the destination bean of - the "one" side of the relationship (i.e. the source bean of the - relationship role with multiplicity one), suffixed by _, and - by its primary-key-field.
    - B_idb in the example.
    -  - -
    N-M unidirectional relationships
    - -
    Standard Deployment Descriptor
    -
        .....
    -    <relationships>
    -      <ejb-relation>
    -        <ejb-relation-name>a-b</ejb-relation-name>
    -        <ejb-relationship-role>
    -          <!-- A => B -->
    -                <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -          <multiplicity>Many</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>A</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>b</cmr-field-name>
    -            <cmr-field-type>java.util.Collection</cmr-field-type>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -        <ejb-relationship-role>
    -          <!-- B => A -->
    -          <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -          <multiplicity>Many</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>B</ejb-name>
    -          </relationship-role-source>
    -        </ejb-relationship-role>
    -      </ejb-relation>
    -    </relationships>
    -    .....
    -    
    - -
    Database mapping
    - - - - - - - - - -
    - - - - - - - - - - - - -
    t_A
    c_idA
    ...
    -
    - - - - - - - - - - - - -
    t_B
    c_idB
    ...
    -
    - - - - - - - - - - - - - - - -
    tJoin_AB
    cfk_idAcfk_idB
    ......
    -
    - -

    In this case, there is a join table composed of the foreign keys of each -entity bean table.

    - -
    JOnAS Deployment Descriptor
    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jdbc-table-name>tJoin_AB</jdbc-table-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    Default values

    - - - - - - - - - - - - - - - - -
    jonas-ejb-relationOptional
    jdbc-table-nameOptional.
    - Default value is built from the abstract-schema-names of the beans, - separated by _.
    - A_B in the example.
    foreign-key-jdbc-nameOptional.
    - Default value is the abstract-schema-name of the destination bean, - suffixed by _, and by its primary-key-field.
    - B_idb and A_ida in the example.
    -  - -
    N-M bidirectional relationships
    - -

    Similar to N-M unidirectional relationships, but a CMR field is defined -for each bean.

    - -
    Standard deployment Descriptor
    -
        .....
    -    <relationships>
    -      <ejb-relation>
    -        <ejb-relation-name>a-b</ejb-relation-name>
    -        <ejb-relationship-role>
    -          <!-- A => B -->
    -                <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -          <multiplicity>Many</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>A</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>b</cmr-field-name>
    -            <cmr-field-type>java.util.Collection</cmr-field-type>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -        <ejb-relationship-role>
    -          <!-- B => A -->
    -          <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -          <multiplicity>Many</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>B</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>a</cmr-field-name>
    -            <cmr-field-type>java.util.Collection</cmr-field-type>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -      </ejb-relation>
    -    </relationships>
    -    .....
    -    
    - -
    Database mapping
    - - - - - - - - - -
    - - - - - - - - - - - - -
    t_A
    c_idA
    ...
    -
    - - - - - - - - - - - - -
    t_B
    c_idB
    ...
    -
    - - - - - - - - - - - - - - - -
    tJoin_AB
    cfk_idAcfk_idB
    ......
    -
    - -

    In this case, there is a join table composed of the foreign keys of each -entity bean table.

    - -
    JOnAS Deployment Descriptor
    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jdbc-table-name>tJoin_AB</jdbc-table-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    Default values:

    - - - - - - - - - - - - - - - - -
    jonas-ejb-relationOptional
    jdbc-table-nameOptional.
    - Default value is built from the abstract-schema-names of the beans, - separated by _.
    - A_B in the example.
    foreign-key-jdbc-nameOptional.
    - Default value is the abstract-schema-name of the destination bean, - suffixed by _, and by its primary-key-field.
    - B_idb and A_ida in the example.
    -  - -

    CMR fields Mapping to composite -primary-keys

    - -

    In the case of composite primary keys, the database mapping should provide -the capability to specify which column of a foreign key corresponds to which -column of the primary key. This is the only difference between relationships -based on simple primary keys. For this reason, not all types of relationship -are illustrated below.

    - -
    1-1 bidirectional relationships
    - -
    Standard Deployment Descriptor
    -
        .....
    -    <entity>
    -      <ejb-name>A</ejb-name>
    -      .....
    -      <prim-key-class>p.PkA</prim-key-class>
    -      .....
    -      <cmp-field>
    -        <field-name>id1A</field-name>
    -      </cmp-field>
    -      <cmp-field>
    -        <field-name>id2A</field-name>
    -      </cmp-field>
    -      .....
    -    </entity>
    -    .....
    -    <entity>
    -      <ejb-name>B</ejb-name>
    -      .....
    -      <prim-key-class>p.PkB</prim-key-class>
    -      .....
    -      <cmp-field>
    -        <field-name>id1B</field-name>
    -      </cmp-field>
    -      <cmp-field>
    -        <field-name>id2B</field-name>
    -      </cmp-field>
    -      .....
    -    </entity>
    -    .....
    -    <relationships>
    -      <ejb-relation>
    -        <ejb-relation-name>a-b</ejb-relation-name>
    -        <ejb-relationship-role>
    -          <!-- A => B -->
    -                <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -          <multiplicity>One</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>A</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>b</cmr-field-name>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -        <ejb-relationship-role>
    -          <!-- B => A -->
    -          <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -          <multiplicity>One</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>B</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>a</cmr-field-name>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -      </ejb-relation>
    -    </relationships>
    -    .....
    -    
    - -
    Database mapping
    - -

    Two mappings are possible, one or another of the tables may hold the -foreign key.

    - -

    Case 1:

    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    t_A
    c_id1Ac_id2Acfk_id1Bcfk_id2B
    ............
    -
    - - - - - - - - - - - - - - - -
    t_B
    c_id1Bc_id2B
    ......
    -
    - -

    Case 2:

    - - - - - - - - -
    - - - - - - - - - - - - - - - -
    t_A
    c_id1Ac_id2A
    ......
    -
    - - - - - - - - - - - - - - - - - - - - - -
    t_B
    c_id1Bc_id2Bcfk_id1Acfk_id2A
    ............
    -
    - -
    JOnAS Deployment Descriptor
    - -

    Case 1:

    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_id1b</foreign-key-jdbc-name>
    -          <key-jdbc-name>c_id1b</key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_id2b</foreign-key-jdbc-name>
    -          <key-jdbc-name>c_id2b</key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    Case 2:

    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_id1a</foreign-key-jdbc-name>
    -          <key-jdbc-name>c_id1a</key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_id2a</foreign-key-jdbc-name>
    -          <key-jdbc-name>c_id2a</key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - -

    For the default mapping (values), the foreign key is in the table of the -source bean of the first ejb-relationship-role of the ejb-relation. In the -example, the default mapping corresponds to case 1, since the -ejb-relationship-role a2b is the first defined in the ejb-relation a-b.

    -  - -
    N-M unidirectional relationships
    - -
    Standard Deployment Descriptor
    -
        .....
    -    <entity>
    -      <ejb-name>A</ejb-name>
    -      .....
    -      <cmp-field>
    -        <field-name>id1A</field-name>
    -      </cmp-field>
    -      <cmp-field>
    -        <field-name>id2A</field-name>
    -      </cmp-field>
    -      .....
    -    </entity>
    -    .....
    -    <entity>
    -      <ejb-name>B</ejb-name>
    -      .....
    -      <cmp-field>
    -        <field-name>id1B</field-name>
    -      </cmp-field>
    -      <cmp-field>
    -        <field-name>id2B</field-name>
    -      </cmp-field>
    -      .....
    -    </entity>
    -    .....
    -    <relationships>
    -      <ejb-relation>
    -        <ejb-relation-name>a-b</ejb-relation-name>
    -        <ejb-relationship-role>
    -          <!-- A => B -->
    -                <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -          <multiplicity>Many</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>A</ejb-name>
    -          </relationship-role-source>
    -          <cmr-field>
    -            <cmr-field-name>b</cmr-field-name>
    -            <cmr-field-type>java.util.Collection</cmr-field-type>
    -          </cmr-field>
    -        </ejb-relationship-role>
    -        <ejb-relationship-role>
    -          <!-- B => A -->
    -          <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -          <multiplicity>Many</multiplicity>
    -          <relationship-role-source>
    -            <ejb-name>B</ejb-name>
    -          </relationship-role-source>
    -        </ejb-relationship-role>
    -      </ejb-relation>
    -    </relationships>
    -    .....
    -    
    - -
    Database mapping
    - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    t_A
    c_id1Ac_id2A
    ......
    -
    - - - - - - - - - - - - - - - -
    t_B
    c_id1Bc_id2B
    ......
    -
    - - - - - - - - - - - - - - - - - - - - - -
    tJoin_AB
    cfk_id1Acfk_id2Acfk_id1Bcfk_id2B
    ............
    -
    - -

    In this case, there is a join table composed of the foreign keys of each -entity bean table.

    - -
    JOnAS Deployment Descriptor
    -
        .....
    -    <jonas-ejb-relation>
    -      <ejb-relation-name>a-b</ejb-relation-name>
    -      <jdbc-table-name>tJoin_AB</jdbc-table-name>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>a2b</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_id1b</foreign-key-jdbc-name>
    -          <key-jdbc-name>c_id1b</key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_id2b</foreign-key-jdbc-name>
    -          <key-jdbc-name>c_id2b</key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -      <jonas-ejb-relationship-role>
    -        <ejb-relationship-role-name>b2a</ejb-relationship-role-name>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_id1a</foreign-key-jdbc-name>
    -          <key-jdbc-name>c_id1a</key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -        <foreign-key-jdbc-mapping>
    -          <foreign-key-jdbc-name>cfk_id2a</foreign-key-jdbc-name>
    -          <key-jdbc-name>c_id2a</key-jdbc-name>
    -        </foreign-key-jdbc-mapping>
    -      </jonas-ejb-relationship-role>
    -    </jonas-ejb-relation>
    -    .....
    -    
    - - diff --git a/jonas_doc/core/olddoc/PG_Environment.html b/jonas_doc/core/olddoc/PG_Environment.html deleted file mode 100644 index 82090226bd56355a3a262490c3a3fdbe06bfb4ae..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_Environment.html +++ /dev/null @@ -1,300 +0,0 @@ - - - - - - - Enterprise Bean Environment - - - -

    EJB Programmer's Guide: Enterprise Bean -Environment

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the Enterprise Bean provider, i.e. -the person in charge of developing the software components on the server -side. It describes how an enterprise component can refer to values, -resources, or other components in a way that is configurable at deployment -time.

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Introduction
    4. -
    5. Environment Entries
    6. -
    7. Resource References
    8. -
    9. Resource Environment - References
    10. -
    11. EJB References
    12. -
    13. Deprecated EJBContext.getEnvironment() - method
    14. -
    - -

    Introduction

    - -

    The enterprise bean environment is a mechanism that allows customization -of the enterprise bean's business logic during assembly or deployment. The -environment is a way for a bean to refer to a value, to a resource, or to -another component so that the code will be independent of the actual referred -object. The actual value of such environment references (or variables) is set -at deployment time, according to what is contained in the deployment -descriptor. The enterprise bean's environment allows the enterprise bean to -be customized without the need to access or change the enterprise bean's -source code.

    - -

    The enterprise bean environment is provided by the container (i.e. the -JOnAS server) to the bean through the JNDI interface as a JNDI context. The -bean code accesses the environment using JNDI with names starting with -"java:comp/env/".

    - -

    Environment Entries

    - -

    The bean provider declares all the bean environment entries in the -deployment descriptor via the env-entry element. The deployer can -set or modify the values of the environment entries.

    - -

    A bean accesses its environment entries with a code similar to the -following:

    -
        InitialContext ictx = new InitialContext();
    -    Context myenv = ictx.lookup("java:comp/env");
    -    Integer min = (Integer) myenv.lookup("minvalue");
    -    Integer max = (Integer) myenv.lookup("maxvalue");
    -    
    - -

    In the standard deployment descriptor, the declaration of these variables -are as follows:

    -
        <env-entry>
    -      <env-entry-name>minvalue</env-entry-name>
    -      <env-entry-type>java.lang.Integer</env-entry-type>
    -      <env-entry-value>12</env-entry-value>
    -    </env-entry>
    -    <env-entry>
    -      <env-entry-name>maxvalue</env-entry-name>
    -      <env-entry-type>java.lang.Integer</env-entry-type>
    -      <env-entry-value>120</env-entry-value>
    -    </env-entry>
    -    
    - -

    Resource References

    - -

    The resource references are another examples of environment entries. For -such entries, using subcontexts is recommended:

    - - -

    In the standard deployment descriptor, the declaration of a resource -reference to a JDBC connection factory is:

    -
        <resource-ref>
    -      <res-ref-name>jdbc/AccountExplDs</res-ref-name>
    -      <res-type>javax.sql.DataSource</res-type>
    -      <res-auth>Container</res-auth>
    -    </resource-ref>
    -    
    - -

    And the bean accesses the datasource as in the following:

    -
        InitialContext ictx = new InitialContext();
    -    DataSource ds = ictx.lookup("java:comp/env/jdbc/AccountExplDs");
    -    
    - -

    Binding of the resource references to the actual resource manager -connection factories that are configured in the EJB server is done in the -JOnAS-specific deployment descriptor using the jonas-resource -element.

    -
        <jonas-resource>
    -      <res-ref-name>jdbc/AccountExplDs</res-ref-name>
    -      <jndi-name>jdbc_1</jndi-name>
    -    </jonas-resource>
    -    
    - -

    Resource Environment References

    - -

    The resource environment references are another example of environment -entries. They allow the Bean Provider to refer to administered objects that -are associated with resources (for example, JMS Destinations), by using -logical names. Resource environment references are defined in the -standard deployment descriptor.

    -
        <resource-env-ref>
    -      <resource-env-ref-name>jms/stockQueue</resource-env-ref-name>
    -      <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
    -    </resource-env-ref>
    -    
    -Binding of the resource environment references to administered objects in the -target operational environment is done in the JOnAS-specific deployment -descriptor using the jonas-resource-env element. -
        <jonas-resource-env>
    -      <resource-env-ref-name>jms/stockQueue</resource-env-ref-name>
    -      <jndi-name>myQueue<jndi-name>
    -    </jonas-resource-env>
    -    
    - -

    EJB References

    - -

    The EJB reference is another special entry in the enterprise bean's -environment. EJB references allow the Bean Provider to refer to the homes of -other enterprise beans using logical names. For such entries, using -the subcontext java:comp/env/ejb is recommended.

    - -

    The declaration of an EJB reference used for accessing the bean through -its remote home and component interfaces in the standard deployment -descriptor is shown in the following example:

    -
        <ejb-ref>
    -      <ejb-ref-name>ejb/ses1</ejb-ref-name>
    -      <ejb-ref-type>session</ejb-ref-type>
    -      <home>tests.SS1Home</home>
    -      <remote>tests.SS1</remote>
    -    </ejb-ref>
    -    
    - -

    The declaration of an EJB reference used for accessing the bean through -its local home and component interfaces in the standard deployment -descriptor is shown in the following example:

    -
        <ejb-local-ref>
    -      <ejb-ref-name>ejb/locses1</ejb-ref-name>
    -      <ejb-ref-type>session</ejb-ref-type>
    -      <local-home>tests.LocalSS1Home</local-home>
    -      <local>tests.LocalSS1</local>
    -      <ejb-link>LocalBean</ejb-link>
    -    </ejb-local-ref>
    -    
    - -

    -Local interfaces are available in the same JVM as the bean providing this interface. -The use of these interfaces also implies that the classloader of the component performing a lookup - (bean or servlet component) is a child of the EJB classloader providing the local interface.
    - Local interfaces, then, are not available to outside WARs or outside EJB-JARs - even if they run in the same JVM. This is due to the fact that classes of - the local interfaces are not visible on the client side. - Putting them under the WEB-INF/lib folder of a WAR would not change - anything as the two classes would be loaded by different classloaders, - which will throw a "ClassCastException". -

    - To summarize, local interfaces are available only for - - - -

    If the referred bean is defined in the same ejb-jar or EAR file, the -optional ejb-link element of the ejb-ref element can -be used to specify the actual referred bean. The value of the ejb-link -element is the name of the target enterprise bean, i.e. the name defined in -the ejb-name element of the target enterprise bean. If the target enterprise -bean is in the same EAR file, but in a different ejb-jar file, the name of -the ejb-link element may be the name of the target bean, prefixed by the -name of the containing ejb-jar file followed by '#' (e.g. -"My_EJBs.jar#bean1"); prefixing by the name of the ejb-jar file is necessary -only if some ejb-name conflicts occur, otherwise the name of the target bean -is enough. In the following example, the ejb-link element has been -added to the ejb-ref (in the referring bean SSA) and a part of the -description of the target bean (SS1) is shown:

    -
        <session>
    -      <ejb-name>SSA</ejb-name>
    -      ...
    -      <ejb-ref>
    -        <ejb-ref-name>ejb/ses1</ejb-ref-name>
    -        <ejb-ref-type>session</ejb-ref-type>
    -        <home>tests.SS1Home</home>
    -        <remote>tests.SS1</remote>
    -        <ejb-link>SS1</ejb-link>
    -      </ejb-ref>
    -    ...
    -    </session>
    -    ...
    -    <session>
    -      <ejb-name>SS1</ejb-name>
    -      <home>tests.SS1Home</home>
    -      <local-home>tests.LocalSS1Home</local-home>
    -      <remote>tests.SS1</remote>
    -      <local>tests.LocalSS1</local>
    -      <ejb-class>tests.SS1Bean</ejb-class>
    -      ...
    -    </session>
    -     ...
    -    
    - -

    If the bean SS1 was not in the same ejb-jar file as SSA, but in another -file named product_ejbs.jar, the ejb-link element could have been:

    -
            <ejb-link>product_ejbs.jar#SS1</ejb-link>
    -    
    - -

    If the referring component and the referred bean are in separate files and -not in the same EAR, the current JOnAS implementation does not allow use of -the ejb-link element. In this case, to resolve the reference, the -jonas-ejb-ref element in the JOnAS-specific deployment descriptor -would be used to bind the environment JNDI name of the EJB reference to the -actual JNDI name of the associated enterprise bean home. In the following -example, it is assumed that the JNDI name of the SS1 bean home is -SS1Home_one.

    -
        <jonas-session>
    -      <ejb-name>SSA</ejb-name>
    -      <jndi-name>SSAHome</jndi-name>
    -      <jonas-ejb-ref>
    -        <ejb-ref-name>ejb/ses1</ejb-ref-name>
    -        <jndi-name>SS1Home_one</jndi-name>
    -      </jonas-ejb-ref>
    -    </jonas-session>
    -    ...
    -    <jonas-session>
    -      <ejb-name>SS1</ejb-name>
    -      <jndi-name>SS1Home_one</jndi-name>
    -      <jndi-local-name>SS1LocalHome_one</jndi-local-name>
    -    </jonas-session>
    -    ...
    -    
    - -

    The bean locates the home interface of the other enterprise bean using the -EJB reference with the following code:

    -
        InitialContext ictx = new InitialContext();
    -    Context myenv = ictx.lookup("java:comp/env");
    -    SS1Home home = (SS1Home)javax.rmi.PortableRemoteObject.narrow(myEnv.lookup("ejb/ses1"),
    -                    SS1Home.class);
    -    
    - -

    Deprecated -EJBContext.getEnvironment() method

    - -

    JOnAS provides support for EJB 1.0-style definition of environment -properties. EJB1.0 environment must be declared in the -ejb10-properties sub-context. For example:

    -
        <env-entry>
    -      <env-entry-name>ejb10-properties/foo</env-entry-name>
    -      <env-entry-type>java.lang.String</env-entry-type>
    -      <env-entry-value>foo value</env-entry-value>
    -    </env-entry>
    -    
    - -

    The bean can retrieve its environment with the following code:

    -
        SessionContext ctx;
    -    Properties prop;
    -    public void setSessionContext(SessionContext sc) {
    -        ctx = sc;
    -        prop = ctx.getEnvironment();
    -    }
    -    public mymethod() {
    -        String foo = prop.getProperty("foo");
    -        ...
    -    }
    -    
    - - diff --git a/jonas_doc/core/olddoc/PG_J2eeApps.html b/jonas_doc/core/olddoc/PG_J2eeApps.html deleted file mode 100644 index 71ee36f09e94f07c6e0bd01051396f00fc20e5df..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_J2eeApps.html +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - J2EE Application Programmer's Guide - - - -

    J2EE Application Programmer's Guide

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the application component provider, -i.e., the person in charge of developing the software components on the server -side (the business tier).

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Principles - -
    4. -
    5. JOnAS class loader hierarchy - -
    6. -
    - -

    Principles

    - -

    JOnAS supports two types of J2EE application components: Enterprise -Beans and Web components. In addition to providing guides for -construction of application components, guides are supplied for application -assembly, deployment, and administration.

    - -

    Enterprise Bean Creation

    - -

    The individual in charge of developing Enterprise Beans should consult the -Enterprise Beans Programmer's Guide for instructions on how to perform the -following tasks:

    -
      -
    1. Write the source code for the beans.
    2. -
    3. Specify the deployment descriptor.
    4. -
    5. Bundle the compiled classes and the deployment descriptor into an EJB - JAR file.
    6. -
    - -

    This JOnAS documentation provides guides for developing the three types of -enterprise bean:

    - - -

    Deployment descriptor specification is presented in the Defining the Deployment -Descriptor chapter.

    - -

    More specific issues related to transaction behaviour, the Enterprise Bean -environment, or security service, are presented in the corresponding -chapters: Transactional behaviour, Enterprise Bean -Environment, Security Management.

    - -

    Principles and tools for providing EJB JAR files are presented in the -chapters EJB -Packaging and Deployment -and Installation Guide.

    - -

    Web Components Creation

    - -

    Web designers in charge of JSP pages and software developers providing -servlets can consult the Web Application Programmer's Guide.

    - -

    The Developing Web -Components guide explains how to construct Web components, as well as how -to access Enterprise Beans from within the Web Components.

    -Deployment descriptor specification is presented in the Defining the Web -Deployment Descriptor chapter. - -

    Web components can be used as Web application components or as -J2EE application components. In both cases, a WAR file will be -created, but the content of this file is different in the two situations. In -the first case, the WAR contains the Web components and the Enterprise Beans. -In the second case, the WAR does not contain the Enterprise Beans. The EJB -JAR file containing the Enterprise Beans is packed together with the WAR file -containing the Web components, into an EAR file.
    -Principles and tools for providing WAR files are presented in WAR Packaging and -the Deployment and -Installation Guide.

    - -

    J2EE Application Assembler

    - -

    The application assembler in charge of assembling the application -components already bundled in EJB JAR files and WAR files into a J2EE EAR -file, can obtain useful information from the J2EE Application -Assembler's Guide chapter.

    - -

    Application Deployer and -Administrator

    - -

    JOnAS provides tools for the deployment and administration of Enterprise -Beans (EJB JARs), Web applications (WARs), and J2EE applications (EARs).

    - -

    The Deployment and -Installation Guide covers issues related to the deployment of application -components.

    - -

    The Administration Guide -presents information about how to manage the JOnAS server and the JOnAS -services that allow deployment of the different types of application -components: EJB Container service, Web Container service, and EAR service.

    - -

    JOnAS class loader hierarchy

    - -

    This section describes a new and important key feature of the J2EE -integration: the class loader hierarchy in JOnAS.

    - -

    Understanding class loader -hierarchy

    - -

    An application is deployed by its own class loader. This means, for -example, that if a WAR and an EJB JAR are deployed separately, the classes -contained in the two archives are loaded with two separate classloaders with -no hierarchy between them. Thus, the EJBs from within the JAR will not be -visible to the Web components in the WAR.
    -This is not acceptable in cases where the Web components of an application -need to reference and use some of the EJBs (this concerns local references in -the same JVM).

    - -

    For this reason, prior to EAR files, when a Web application had to be -deployed using EJBs, the EJB JAR had to be located in the -WEB-INF/lib directory of the Web application.

    - -

    Currently, with the J2EE integration and the use of the EAR packaging, -class visibility problems no longer exist and the EJB JAR is no longer -required in the WEB-INF/lib directory.

    - -

    The following sections describe the JOnAS class loader hierarchy and -explain the mechanism used to locate the referenced classes.

    - -

    Commons class loader

    - -

    The commons class loader is a JOnAS-specific class loader that will load -all classes required to start the JOnAS server. This class loader has the -system class loader as parent class loader. The commons class loader adds all -the common libraries required to start the JOnAS server (J2EE apps, commons -logging, objectweb components, etc.); it also loads the classes located in -XTRA_CLASSPATH.

    -

    The JARs loaded by the commons class loader are located -under the JONAS_ROOT/lib/commons and JONAS_BASE/lib/commons directories. You can -extend this class loader by adding your own JARs inside these -directories. If you are using a Jetty packaging, -JONAS_ROOT/lib/jetty will be loaded too. -

    -

    Note that the lib/ext extension mechanism is now - deprecated. You should place additional JARs directly in the - classloader directory (commons, apps, - tools) under JONAS_ROOT and/or JONAS_BASE.
    - You should now use the JONAS_BASE/lib/commons if you want to - extend the commons ClassLoader, JONAS_BASE/lib/apps - for apps ClassLoader and JONAS_BASE/lib/tools - for tools ClassLoader.
    - Notice that the JONAS_BASE extension directories are always - loaded after JONAS_ROOT directories, so if the same class is in JONAS_ROOT/lib/commons - and in JONAS_BASE/lib/commons, the one located in JONAS_ROOT/lib/commons will be used. - -

    - -

    To have a library available for each component running inside JOnAS, add -the required JAR files in the JONAS_ROOT/lib/commons directory or in -the JONAS_BASE/lib/commons. All jars in subordinate directories will -also be loaded.
    -If a specific jar is needed only for a web application (i.e., need to use a -version of a jar file which is different than a version loaded by JOnAS), -change the compliance of the web application classloader to the java 2 -delegation model. Refer to the following: WEB class loader.
    -It is also possible to use the extension mechanism, which is described in the -section dependencies of the J2EE specification (section 8.1.1.28).

    - -

    Application class loader

    - -

    The application class loader is a JOnAS-specific class loader that will -load all application classes required by the user applications. This implies -that this loader will load all single RAR files. Thus, all applications -have the visibility of the resource adapters classes. This class loader has the -commons class loader as parent class loader.

    -

    The JARs loaded by the application class loader are - located under the JONAS_ROOT/lib/apps directory, - under JONAS_ROOT/lib/catalina/common/lib directory - (CATALINA_HOME/common/lib if you are not using the - Tomcat package) and under JONAS_BASE/lib/apps directory. - You can extend this class loader by adding your own - JARs inside these directories.
    -

    - -

    Tools class loader

    - -

    The tools class loader is a JOnAS-specific class loader that will load all -classes for which applications do not require visibility. (User applications -will not have the ability to load the classes packaged in the tools class -loader). For example, it includes the jakarta velocity and digester -components. This class loader has the commons class loader as parent class -loader.

    -

    The JARs loaded by the tools class loader are located under the - JONAS_ROOT/lib/tools directory and under the - JONAS_BASE/lib/tools directory. You can extend this class loader - by adding your own JARs inside these directories. -

    - -

    Tomcat class loader

    - -

    The tomcat class loader is a class loader that will load all classes of -the tomcat server (CATALINA_HOME/server/lib directory). The -classes of the common directory of tomcat -(CATALINA_HOME/common/lib directory) are loaded by the -application classloader and not by this tomcat classloader. Applications have -the visibility of the classes and not the server classes. To have -the visibility of the server classes, the context must have -the privileged attribute set to true. This class loader -has the application class loader as parent class loader.

    -

    The JARs loaded by the tomcat class loader are located - under the JONAS_ROOT/lib/catalina/server/lib directory (if - using Tomcat packaging, unless these libs are located under - CATALINA_HOME/server/lib). You can extend this class - loader by adding your own JARs inside this directory. -

    - -

    JOnAS class loaders

    - -

    The JOnAS class loader hierarchy that allows the deployment of EAR -applications without placing the EJB JAR in the WEB-INF/lib -directory consists of the following:

    - -

    EAR class loader

    - -

    The EAR class loader is responsible for loading the EAR application. There -is only one EAR class loader per EAR application. This class loader is the -child of the application class loader, thus making JOnAS classes visible to -it.

    - -

    EJB class loader

    - -

    The EJB class loader is responsible for loading all the EJB JARs of the -EAR application, thus all the EJBs of the same EAR application are loaded -with the same EJB classloader. This class loader is the child of the EAR -class loader.

    - -

    WEB class loader

    - -

    The WEB class loader is responsible for loading the Web components. There -is one WEB class loader per WAR file, and this class loader is the child of -the EJB class loader. Using this class loader hierarchy (the EJB class loader -is the parent of the WEB class loader) eliminates the problem of visibility -between classes when a WEB component tries to reference EJBs; the classes -loaded with the EJB class loader are definitely visible to the classes loaded -by its child class loader (WEB class loader).

    - -

    The compliance of the class loader of the web application to the java 2 -delegation model can be changed by using the jonas-web.xml file. This is -described in the section "Defining the Web Deployment -Descriptor."

    - -

    If the java2-delegation-model element is set to false, the class loader of -the web application looks for the class in its own repository before asking -its parent class loader.

    - -

    Conclusion

    - -

    The resulting JOnAS class loader hierarchy is as follows:

    - -
    -
    - - diff --git a/jonas_doc/core/olddoc/PG_JmsGuide.html b/jonas_doc/core/olddoc/PG_JmsGuide.html deleted file mode 100644 index 18ae7d416c778b7f39d4b5df15885552d5e6213a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_JmsGuide.html +++ /dev/null @@ -1,883 +0,0 @@ - - - - - - JMS User's Guide - - - - -

    JMS User's Guide

    -
      -
    1. JMS installation and configuration - aspects
    2. -
    3. Writing JMS operations within an - application component
    4. -
    5. Some programming rules and restrictions - when using JMS within EJB
    6. -
    7. JMS administration
    8. -
    9. Running an EJB performing JMS - operations
    10. -
    11. A JMS EJB example
    12. -
    - -

    As required by the J2EE v1.4 specification, application components -(servlets, JSP pages and enterprise beans) can use JMS for Java messaging. -Furthermore, applications can use Message-driven Beans for asynchronous EJB -method invocation, as specified by the EJB 2.1 specification.

    - -

    Starting with the JOnAS 3.1 version, JOnAS supports the Java Message -Service Specification 1.1. Previously in JMS 1.0.2, client programming for -Point-to-point and Pub/Sub domains was achieved using similar, but separate, -class hierarchies. Now, JMS 1.1 offers a domain-independent approach to -programming the client application. Thus, the programming model is simpler -and it is now possible to engage queues and topics in the same -transaction.

    - -

    Enterprise Bean providers can use JMS Connection Factory resources via -resource references, and JMS Destination resources (JMS Queues and JMS -Topics) via resource environment references. Thus, they are able to -provide JMS code, inside an EJB method or web component method, for sending -or synchronously receiving messages to/from a JMS Queue or Topic.

    - -

    The EJB container and the Web container can allow for JMS operations -within a global transaction, which may include other resources such as -databases.

    - -

    JOnAS integrates a third party JMS implementation (JORAM) which is the default JMS -service, and for which a J2EE1.4-compliant Resource Adapter archive file is -also provided. Other JMS providers, such as SwiftMQ and WebSphere MQ, -may easily be integrated.

    - -

    Starting with release 4.1, a JMS provider can be integrated within JOnAS -by deploying a corresponding resource adapter. This is the -preferred method as the JMS service will eventually become deprecated in -later JOnAS releases. Also, this method allows deployment of 2.1 MDBs (not -possible with the JMS service).

    - -

    For performing JMS operations, JMS-administered objects will be used by -the application components, such as connection factories and destinations. -Refer to the JMS Administration section for -an explanation of how to create those objects.

    - -

    JMS installation and configuration -aspects

    -To use JMS with JOnAS, no additional installation or configuration operations -are required. JOnAS contains: - - -

    Additionally, the SwiftMQ product -and IBM's WebSphere MQ -have been used with JOnAS.

    - -

    Writing JMS operations within an -application component

    -To send (or synchronously receive) JMS messages, the component requires -access to JMS-administered objects, i.e. Connection Factories for creating -connections to JMS resources and Destination objects (Queue or Topic), which -are the JMS entities used as destinations within JMS sending operations. Both -are made available through JNDI by the JMS provider administration facility. - -

    Refer to the JOnAS example jms as a supplement to this -present reading. This example jms is described here.

    - -

    Accessing the Connection Factory

    -The EJB specification introduces the concept of Resource Manager -Connection Factory References. This concept also appears in the J2EE v1.4 -specification. It is used to create connections to a resource manager. To -date, three types of Resource Manager Connection Factories are -considered: - -The connection factories of interest here are the second type, which should -be used to get JMS Connection Factories. - -

    Note that starting with JMS 1.1, it is recommended that only the -javax.jms.ConnectionFactory be used (rather than -javax.jms.QueueConnectionFactory or -javax.jms.TopicConnectionFactory ). However, the new -implementation is fully backwards compatible and existing applications will -work as is.

    - -

    The standard deployment descriptor should contain the following -resource-ref element:

    -
          <resource-ref>
    -      <res-ref-name>jms/conFact</res-ref-name>
    -      <res-type>javax.jms.ConnectionFactory</res-type>
    -      <res-auth>Container</res-auth>
    -      </resource-ref>
    -This means that the programmer will have access to a -ConnectionFactory object using the JNDI name -java:comp/env/jms/conFact. The source code for obtaining the factory -object is the following: -
          ConnectionFactory qcf = (ConnectionFactory)
    -                 ctx.lookup("java:comp/env/jms/conFact");
    -The mapping to the actual JNDI name of the connection factory (as assigned by -the JMS provider administration tool), CF in the example, is defined -in the JOnAS-specific deployment descriptor with the following element: -
          <jonas-resource>
    -      <res-ref-name>jms/conFact</res-ref-name>
    -      <jndi-name>CF</jndi-name>
    -      </jonas-resource>
    - -

    Accessing the Destination Object

    -Accessing a JMS destination within the code of an application component -requires using a Resource Environment Reference, which is represented -in the standard deployment descriptor as follows: -
          <resource-env-ref>
    -      <resource-env-ref-name>jms/stockQueue</resource-env-ref-name>
    -      <resource-env-ref-type>javax.jms.Queue<resource-env-ref-type>
    -      </resource-env-ref>
    -The application component's source code should contain: -
          Queue q = (Queue) ctx.lookup("java:comp/env/jms/stockQueue");
    -the mapping to the actual JNDI name (e.g. "myQueue") being defined in the -JOnAS-specific deployment descriptor in the following way: -
          <jonas-resource-env>
    -      <resource-env-ref-name>jms/stockQueue</resource-env-ref-name>
    -      <jndi-name>myQueue<jndi-name>
    -      </jonas-resource-env>
    - -

    Writing JMS Operations

    -A typical method performing a message sending JMS operations looks like the -following: -
         void sendMyMessage() {
    -
    -       ConnectionFactory cf = (ConnectionFactory)
    -               ctx.lookup("java:comp/env/jms/conFact");
    -       Queue queue = (Queue) ctx.lookup("java:comp/env/jms/stockQueue");
    -       Connection conn = cf.createConnection();
    -       Session sess = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
    -
    -
    -
    -       MessageProducer  mp = sess.createProducer((Destination)queue);
    -       ObjectMessage msg = sess.createObjectMessage();
    -       msg.setObject("Hello");
    -       sender.send(msg);
    -       sess.close();
    -       conn.close();
    -     }
    -It is also possible for an application component to synchronously -receive a message. An EJB method performing synchronous message reception on -a queue is illustrated in the following: -
        public String recMsg() {
    -        ConnectionFactory cf = (ConnectionFactory)
    -               ctx.lookup("java:comp/env/jms/conFact");
    -        Queue queue = (Queue) ctx.lookup("java:comp/env/jms/stockQueue");
    -        Connection conn = cf.createConnection();
    -        Session sess = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
    -        MessageConsumer mc = sess.createConsumer((Destination)queue);
    -        conn.start();
    -        ObjectMessage msg = (ObjectMessage) mc.receive();
    -        String msgtxt =  (String) msg.getObject();
    -        sess.close();
    -        conn.close();
    -        return msgtxt;
    -    }
    -A method that performs JMS operations should always contain the session -create and close statements, as follows: -
         public void doSomethingWithJMS (...) {
    -       ...
    -       session = connection.createSession(...);
    -       ... // JMS operations
    -       session.close();
    -     }
    -The contained JMS operations will be a part of the transaction, if there is -one, when the JOnAS server executes the method. - -

    Be sure to never send and receive a particular message in the same -transaction, since the JMS sending operations are actually performed at -commit time only.

    - -

    The previous examples illustrate point-to-point messaging. However, -application components can also be developed using the publish/subscribe JMS -API, i.e. using the Topic instead of the Queue -destination type. This offers the capability of broadcasting a message to -several message consumers at the same time. The following example illustrates -a typical method for publishing a message on a JMS topic and demonstrates how -interfaces have been simplified since JMS 1.1.

    -
        public void sendMsg(java.lang.String s) {
    -        ConnectionFactory cf = (ConnectionFactory)
    -                       ictx.lookup("java:comp/env/jms/conFactSender");
    -        Topic topic = (Topic) ictx.lookup("java:comp/env/jms/topiclistener");
    -        Connection conn = cf.createConnection();
    -        Session session = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
    -        MessageConsumer mc = session.createConsumer((Destination)topic);
    -        ObjectMessage message = session.createObjectMessage();
    -        message.setObject(s);
    -        mc.send(message);
    -        session.close();
    -        conn.close();
    -    }
    - -

    Transactions and JMS sessions within an application component

    -JMS session creation within an application component will result in different -behaviors, depending on whether the session is created at execution time -within or outside a transaction. In fact, the parameters of the -createSession(boolean transacted, int acknowledgeMode) method are -never taken into account. - - -

    Authentication

    -If your JMS implementation performs user authentication, the following -methods can be used on Connection Factories: - - -

    Some programming rules and restrictions -when using JMS within EJB

    -This section presents some programming restrictions and rules for using JMS -operations within entity components. - -

    Connection Management

    -Depending on the JMS implementation and the application, it may be desirable -to keep the JMS connections open for the life of the bean instance or for the -duration of the method call. These two programming modes are illustrated in -the following example (this example illustrates a stateful session bean): -
    public class EjbCompBean implements SessionBean {
    -    ...
    -    QueueConnectionFactory qcf = null;
    -    Queue queue = null;
    -
    -    public void ejbCreate() {
    -       ....
    -       ictx = new InitialContext();
    -       qcf = (QueueConnectionFactory)
    -          ictx.lookup("java:comp/env/jms/conFactSender");
    -       queue = (Queue) ictx.lookup("java:comp/env/jms/queue1");
    -    }
    -
    -    public void doSomethingWithJMS (...) {
    -       ...
    -       Connection conn = qcf.createConnection();
    -       Session session = conn.createSession(...);
    -       ... // JMS operations
    -       session.close();
    -       conn.close();
    -     }
    -
    -    ...
    -}
    -To keep the connection open during the life of a bean instance, the -programming style shown in the following example is preferred, since it -avoids many connection opening and closing operations: -
    public class EjbCompBean implements SessionBean {
    -    ...
    -    ConnectionFactory qcf = null;
    -    Queue queue = null;
    -    Connection conn = null;
    -
    -    public void ejbCreate() {
    -       ....
    -       ictx = new InitialContext();
    -       cf = (ConnectionFactory)
    -          ictx.lookup("java:comp/env/jms/conFactSender");
    -       queue = (Queue) ictx.lookup("queue1");
    -       conn = cf.createConnection();
    -    }
    -
    -    public void doSomethingWithJMS (...) {
    -       ...
    -       Session session = conn.createSession(...);
    -       ... // JMS operations
    -       session.close();
    -    }
    -
    -    public void ejbRemove() {
    -       conn.close();
    -    }
    -
    -    ...
    -}
    -Be aware that maintaining JMS objects in the bean state is not always -possible, depending on the type of bean. - - -

    Note that, due to a known problem with the Sun JDK 1.3 on Linux, the close -of the connection can block. The problem is fixed with JDK 1.4.

    - -

    Starting Transactions after JMS Connection or Session creation

    -Currently, it is not possible to start a bean-managed transaction after the -creation of a JMS session and have the JMS operations involved in the -transaction. In the following code example, the JMS operations will not occur -within the ut transaction: -
    public class EjbCompBean implements SessionBean {
    -    ...
    -
    -    public void doSomethingWithJMS (...) {
    -       ...
    -       Connection conn = cf.createConnection();
    -       Session session = conn.createSession(...);
    -       ut = ejbContext.getUserTransaction();
    -       ut.begin();
    -       ... // JMS operations
    -       ut.commit();
    -       session.close();
    -       conn.close();
    -     }
    -
    -    ...
    -}
    -To have the session operations involved in the transaction, the session -creation and close should be inside the transaction boundaries, and the -connection creation and close operations can either be both outside the -transaction boundaries or both inside the transaction boundaries, as follows: -
    public class EjbCompBean implements SessionBean {
    -    ...
    -
    -    public void doSomethingWithJMS (...) {
    -       ...
    -       Connection conn = qcf.createConnection();
    -       ut = ejbContext.getUserTransaction();
    -       ut.begin();
    -       Session session = conn.createSession(...);
    -       ... // JMS operations
    -       session.close();
    -       ut.commit();
    -       conn.close();
    -     }
    -
    -    ...
    -}
    -or -
    public class EjbCompBean implements SessionBean {
    -    ...
    -
    -    public void doSomethingWithJMS (...) {
    -       ...
    -       ut = ejbContext.getUserTransaction();
    -       ut.begin();
    -       Connection conn = cf.createConnection();
    -       Session session = conn.createSession(...);
    -       ... // JMS operations
    -       session.close();
    -       conn.close();
    -       ut.commit();
    -     }
    -
    -    ...
    -}
    -Programming EJB components with bean-managed transactions can result in -complex code. Using container-managed transactions can help avoid problems -such as those previously described. - -

    JMS administration

    -Applications using messaging require some JMS-administered objects: -connection factories and destinations. These objects are -created via the proprietary administration interface (not standardized) of -the JMS provider. For simple cases, it is possible to have either the -jms service or the JMS resource adapter perform administration -operations during startup. - -

    As provided, the default JMS service and JORAM adapter configurations -automatically create six connection factories and two destination objects.

    - -

    The six connection factories automatically created are described in the -following table:

    -  - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    JNDI nameJMS typeUsage
    CFConnectionFactoryTo be used by an application component to create a Connection.
    QCFQueueConnectionFactoryTo be used by an application component to create a - QueueConnection.
    TCFTopicConnectionFactoryTo be used by an application component to create a - TopicConnection.
    JCFConnectionFactoryTo be used by any other Java component (for instance a client) to - create a Connection.
    JQCFQueueConnectionFactoryTo be used by any other Java component (for instance a client) to - create a QueueConnection.
    JTCFTopicConnectionFactoryTo be used by any other Java component (for instance a client) to - create a TopicConnection.
    -
    - -

    The CF, QCF and TCF connection factories are managed connection -factories. The application components should use only managed connection -factories to allow JOnAS to manage the JMS resources created via these -connection factories (the JMS sessions).
    -In contrast, JCF, JQCF and JTCF are non-managed connection factories. -They are used by Java components implementing a JMS client behavior, but -running outside the application server.

    - -

    The two destinations automatically created are described in the following -table:

    - -
    - - - - - - - - - - - - - - - - - - - -
    JNDI nameJMS typeUsage
    sampleQueueQueueCan be equally used by an EJB component or a Java component.
    sampleTopicTopicCan be equally used by an EJB component or a Java component.
    -
    - -

    JMS service administration

    -For using the JMS service in the default configuration, it is only necessary -to require the use of the JMS service in the jonas.properties file: -
        jonas.services           security,jtm,dbm,jms,ejb
    - -

    JOnAS will not create additional connection factories when using the -default configuration. However, JOnAS can create requested destination -objects at server launching time, if specified in the jonas.properties -file. To do this, specify the JNDI names of the Topic and Queue destination -objects to be created in a jonas.service.jms.topics and -jonas.service.jms.queues property respectively, as follows:

    -
        jonas.service.jms.topics    t1,t2    // JOnAS server creates 2 topic destinations (t1,t2)
    -    jonas.service.jms.queues    myQueue  // JOnAS server creates 1 queue destination (myQueue)
    -It is recommended that programmers use resource references and -resource environment references to access the connection factories and -destination objects created by JOnAS, as already presented in the "Writing JMS operations within an application -component" section. - -

    JMS resource adapter configuration

    - -

    Starting with JOnAS release 4.1, it is recommended that a JMS resource -adapter be deployed instead of using the jms service. Refer to the -JMS Resource Adapters configuration -guide for an explanation.

    - -

    Running an EJB performing JMS -operations

    -All that is necessary to have an Enterprise Bean perform JMS operations is: - -

    -
    jonas start
    - -

    The Message-Oriented Middleware (the JMS provider implementation) is -automatically started (or at least accessed) and the JMS-administered objects -that will be used by the Enterprise Beans are automatically created and -registered in JNDI.

    - -

    Then, the EJB can be deployed as usual with:

    -
    jonas admin -a XX.jar
    - -

    Accessing the Message-Oriented -Middleware...

    - -

    as a service...

    -If the JOnAS property jonas.services contains the jms service, -the JOnAS JMS service will be launched and will eventually try to launch a -JMS implementation (e.g. the JORAM MOM or the SwiftMQ MOM). - -

    For launching the MOM, consider the following possibilities:

    -
      -
    1. Launching the MOM automatically in the JOnAS JVM
      - This is done using the default values for the configuration options, i.e. - keeping the JOnAS property jonas.service.jms.collocated value - true in the jonas.properties file (see the - jonas.properties file provided in $JONAS_ROOT/conf - directory). -
          jonas.service.jms.collocated true
      - In this case, the MOM will be launched automatically at server launching - time (command jonas start). - - Note for using the JORAM MOM from a distant host: - To use the JMS resources from a distant host, the hostname - property value in the default a3servers.xml - configuration file must be changed from localhost to the - actual host name. See case 4 (Launching the MOM on another port - number) for details on the JORAM configuration. - -
    2. -
    3. Launching the MOM in a separate JVM on the same host
      - The JORAM MOM can be launched with its default options using the command: -
      -   JmsServer -

      For other MOMs, use the proprietary command.

      -


      - In this case, the JOnAS property jonas.service.jms.collocated must - be set to false in the jonas.properties file.

      -
          jonas.service.jms.collocated false
      -
    4. -
    5. Launching the MOM on another host
      - The MOM can be launched on a separate host. In this case, the JOnAS - server must be notified that the MOM is running on another host via the - JOnAS property jonas.service.jms.url in the - jonas.properties file. For JORAM, its value should be the JORAM - URL joram://host:port where host is the host name, and - port the default JORAM port number, i.e. 16010 (For SwiftMQ, the - value of the URL is similar to smqp://host:4001/timeout=10000). -
          jonas.service.jms.collocated false
      -    jonas.service.jms.url        joram://host2:16010
      -
    6. -
    7. Launching the MOM on another port number (for JORAM)
      - To change the default JORAM port number requires a JORAM-specific - configuration operation (modifying the a3servers.xml - configuration file located in the directory where JORAM is explicitly - launched). A default a3servers.xml file is provided in the - $JONAS_ROOT/conf directory; this a3servers.xml file specifies - that the MOM runs on the localhost using the JORAM default port number. -
      - To launch the MOM on another port number, change the args attribute of - the service class="fr.dyade.aaa.mom.ConnectionFactory" element in the - a3servers.xml file and update the jonas.service.jms.url - property in the jonas.properties file.
      -
      - The default a3servers.xml file is located in $JONAS_ROOT/conf. To change - the location of this file, the system property - -Dfr.dyade.aaa.agent.A3CONF_DIR="your directory for a3.xml" must - be passed.
      -
      -
    8. -
    9. Specifying JORAM's persistence mode
      - When automatically starting JORAM, or when starting JORAM with the - JmsServer command, the default mode is non-persistent. Meaning - that in the event of a crash, the non-delivered and non-acknowledged - messages are lost.
      -
      - In order to start a persistent JORAM server, guaranteeing message - delivery even in case of failures, the Transaction system property - should be set to fr.dyade.aaa.util.NTransaction. -

      Note: the MOM may be directly launched by the proprietary - command. The command for JORAM is:
      -   java -DTransaction=fr.dyade.aaa.util.NullTransaction - fr.dyade.aaa.agent.AgentServer 0 ./s0

      -

      This command corresponds to the default options used by the - JmsServer command.

      -

      The server is not persistent when launched with this command. If - persistence is required, the - -DTransaction=fr.dyade.aaa.util.NullTransaction option should be - replaced with the -DTransaction=fr.dyade.aaa.util.NTransaction - option.

      -

      To change other MOM configurations (distribution, multi-servers, ...), - refer to the JORAM documentation on http://joram.objectweb.org.

      -
    10. -
    - -

    ... or as a J2EE1.4 adapter

    - -

    Starting with JOnAS release 4.1, a JMS server can be accessed through a -resource adapter which may be deployed.

    - -

    For deploying such a resource adapter, place the corresponding archive -file (*.rar) in the JOnAS's rars/autoload -directory, or declare it at the end of the jonas.properties -file, or deploy it manually through the jonasAdmin tool.

    - -

    Configuring and deploying such adapters is explained in the Configuring JMS Resource Adapters -section.

    - -

    A JMS EJB example

    -This example shows an EJB application that combines an Enterprise Bean -sending a JMS message and an Enterprise Bean writing a Database (an Entity -Bean) within the same global transaction. It is composed of the following -elements: - - -

    The Session Bean performing JMS operations

    -The bean should contain code for initializing the references to JMS -administered objects that it will use. To avoid repeating this code in each -method performing JMS operations, it can be introduced in the -ejbCreate method. -
    public class EjbCompBean implements SessionBean {
    -    ...
    -    ConnectionFactory cf = null;
    -    Topic topic = null;
    -
    -    public void ejbCreate() {
    -       ....
    -       ictx = new InitialContext();
    -       cf = (ConnectionFactory)
    -          ictx.lookup("java:comp/env/jms/conFactSender");
    -       topic = (Topic) ictx.lookup("java:comp/env/jms/topiclistener");
    -    }
    -    ...
    -}
    -This code has been intentionally cleared from all the elements in which it is -not necessary for understanding the JMS logic aspects of the example, e.g. -exception management. - -

    The JMS-administered objects ConnectionFactory and Topic -have been made available to the bean by a resource reference in the -first example, and by a resource environment reference in the second -example.
    -The standard deployment descriptor should contain the following element:

    -
          <resource-ref>
    -        <res-ref-name>jms/conFactSender</res-ref-name>
    -        <res-type>javax.jms.ConnectionFactory</res-type>
    -        <res-auth>Container</res-auth>
    -      </resource-ref>
    -
          <resource-env-ref>
    -        <resource-env-ref-name>jms/topiclistener</resource-env-ref-name>
    -        <resource-env-ref-type>javax.jms.Topic</resource-env-ref-type>
    -      </resource-env-ref>
    -The JOnAS-specific deployment descriptor should contain the following element: -
          <jonas-resource>
    -        <res-ref-name>jms/conFactSender</res-ref-name>
    -        <jndi-name>TCF</jndi-name>
    -      </jonas-resource>
    -
          <jonas-resource-env>
    -        <resource-env-ref-name>jms/topiclistener</resource-env-ref-name>
    -        <jndi-name>sampleTopic</jndi-name>
    -      </jonas-resource-env>
    -Note that the EjbComp SessionBean will use the administered objects -automatically created by JOnAS in the default JMS configuration. - -

    Because the administered objects are now accessible, it is possible to -perform JMS operations within a method. The following occurs in the -sendMsg method:

    -
    public class EjbCompBean implements SessionBean {
    -    ...
    -    public void sendMsg(java.lang.String s) {
    -        // create Connection, Session and MessageProducer
    -        Connection conn = null;
    -        Session session = null;
    -        MessageProducer mp = null;
    -        try {
    -            conn = cf.createConnection();   
    -            session = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
    -            mp = session.createProducer((Destination)topic);
    -        }
    -        catch (Exception e) {e.printStackTrace();}
    -
    -        // send the message to the topic
    -        try {
    -            ObjectMessage message;
    -            message = session.createObjectMessage();
    -            message.setObject(s);
    -            mp.send(message);
    -            session.close();
    -            conn.close();
    -        } catch (Exception e) {
    -            e.printStackTrace();
    -        }
    -    }
    -    ...
    -}
    -This method sends a message containing its String argument. - -

    The Entity Bean

    -The example uses the simple entity bean Account for writing data into a -database. Refer to the sample eb. - -

    The Client Application

    -The client application calls the sendMsg method of the EjbComp bean and -creates an AccountImpl entity bean, both within the same transaction. -
    public class EjbCompClient {
    -    ...
    -    public static void main(String[] arg) {
    -    ...
    -    utx = (UserTransaction) initialContext.lookup("javax.transaction.UserTransaction");
    -    ...
    -    home1 = (EjbCompHome) initialContext.lookup("EjbCompHome");
    -    home2 = (AccountHome) initialContext.lookup("AccountImplHome");
    -    ...
    -    EjbComp aJmsBean = home1.create();
    -    Account aDataBean = null;
    -    ...
    -    utx.begin();
    -    aJmsBean.sendMsg("Hello commit"); // sending a JMS message
    -    aDataBean = home2.create(222, "JMS Sample OK", 0);
    -    utx.commit();
    -
    -    utx.begin();
    -    aJmsBean.sendMsg("Hello rollback"); // sending a JMS message
    -    aDataBean = home2.create(223, "JMS Sample KO", 0);
    -    utx.rollback();
    -    ...
    -    }
    -}
    -The result of this client execution will be that: - - -

    A pure JMS client for receiving messages

    -In this example, the messages sent by the EJB component are received by a -simple JMS client that is running outside the JOnAS server, but listening for -messages sent on the JMS topic "sampleTopic." It uses the ConnectionFactory -automatically created by JOnAS named "JCF." -
    public class MsgReceptor {
    -
    -    static Context ictx = null;
    -    static ConnectionFactory cf = null;
    -    static Topic topic = null;
    -
    -    public static void main(String[] arg) {
    -
    -        ictx = new InitialContext();
    -        cf = (ConnectionFactory) ictx.lookup("JCF");
    -        topic = (Topic) ictx.lookup("sampleTopic");
    -        ...
    -        Connection conn = cf.createConnection();       
    -        Session session = 
    -               conn.createSession(false, Session.AUTO_ACKNOWLEDGE);  
    -        MessageConsumer mc = session.createConsumer((Destination)topic);
    -
    -        MyListenerSimple listener = new MyListenerSimple();
    -            mc.setMessageListener(listener);
    -        conn.start();
    -
    -        System.in.read(); // waiting for messages
    -
    -        session.close();
    -        conn.close();
    -        ...
    -    }
    -}
    -
    public MyListenerSimple implements javax.jms.MessageListener {
    -   MyListenerSimple() {}
    -
    -   public void onMessage(javax.jms.Message msg) {
    -      try {
    -      if(msg==null)
    -        System.out.println("Message: message null ");
    -      else {
    -        if(msg instanceof ObjectMessage) {
    -            String m = (String) ((ObjectMessage)msg).getObject();
    -            System.out.println ("JMS client: received message ======> " + m);
    -        } else if(msg instanceof TextMessage) {
    -            String m = ((TextMessage)msg).getText();
    -            System.out.println ("JMS client: received message ======> " + m);
    -        }
    -      }catch(Exception exc) {
    -          System.out.println("Exception caught :" + exc);
    -          exc.printStackTrace();
    -      }
    -   } 
    -}
    - - diff --git a/jonas_doc/core/olddoc/PG_LogModules.html b/jonas_doc/core/olddoc/PG_LogModules.html deleted file mode 100644 index 132d2640a34ea3899a95731d52df5ef04dbc7123..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_LogModules.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - Login Modules Guide - - - - -

    Login Modules in a Java Client Guide

    - -

    - -

    The content of this guide is the following:

    -
      -
    1. Configuring an environment to use login - modules with java clients
    2. -
    3. Example of a client
    4. -
    - - -

    Configuring an environment to use login modules with java clients

    - -

    The login modules for use by clients are defined in the file -$JONAS_ROOT/conf/jaas.config. Example:

    -
    jaasclient {
    -    // Login Module to use for the example jaasclient.
    -
    -    //First, use a LoginModule for the authentication
    -    // Use the resource memrlm_1
    -    org.objectweb.jonas.security.auth.spi.JResourceLoginModule required
    -    resourceName="memrlm_1"
    -        ;
    -
    -    // Use the login module to propagate security to the JOnAS server
    -    // globalCtx is set to true in order to set the security context
    -    // for all the threads of the client container instead of only
    -    // on the current thread.
    -    // Useful with multithread applications (like Swing Clients)
    -    org.objectweb.jonas.security.auth.spi.ClientLoginModule  required
    -    globalCtx="true"
    -        ;
    -};
    -    
    - -

    This file is used when a java client is launched with -jclient, as a result of the following property being set by -jclient: --Djava.security.auth.login.config==$JONAS_ROOT/conf/jaas.config
    -
    -For more information about the JAAS authentication, refer to the -JAAS -authentication tutorial.

    - - -

    Example of a client

    - - - diff --git a/jonas_doc/core/olddoc/PG_MsgDrvBean.html b/jonas_doc/core/olddoc/PG_MsgDrvBean.html deleted file mode 100644 index b5626e2cc891fb89e29c0499eb96cd5cd2ff0bf8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_MsgDrvBean.html +++ /dev/null @@ -1,520 +0,0 @@ - - - - - - Message-driven Beans - - - - -

    EJB Programmer's Guide: Message-driven -Beans

    - -

    The content of this guide is the following:

    -
      -
    1. Description of a Message-driven - Bean
    2. -
    3. Developing a Message-driven - Bean
    4. -
    5. Administration aspects
    6. -
    7. Running a Message-driven Bean
    8. -
    9. Transactional aspects
    10. -
    11. Example
    12. -
    13. Tuning Message-driven Bean Pool
    14. -
    - -

    The EJB 2.1 specification defines a new kind of EJB component for -receiving asynchronous messages. This implements some type of "asynchronous -EJB component method invocation" mechanism. The Message-driven Bean (also -referred to as MDB in the following) is an Enterprise JavaBean, not an Entity -Bean or a Session Bean, which plays the role of a JMS MessageListener.

    - -

    The EJB 2.1 specification contains detailed information about MDB. The Java -Message Service Specification 1.1 contains detailed information about JMS. -This chapter focuses on the use of Message-driven beans within the JOnAS -server.

    - -

    Description of a Message-driven Bean

    -A Message-driven Bean is an EJB component that can be considered as a JMS -MessageListener, i.e., processing JMS messages asynchronously; it implements -the onMessage(javax.jms.Message) method, defined in the -javax.jms.MessageListener interface. It is associated with a JMS -destination, i.e., a Queue for "point-to-point" messaging or a Topic for -"publish/subscribe." The onMessage method is activated on receipt of -messages sent by a client application to the corresponding JMS destination. -It is possible to associate a JMS message selector to filter the messages -that the Message-driven Bean should receive. - -

    JMS messages do not carry any context, thus the onMessage method -will execute without pre-existing transactional context. However, a new -transaction can be initiated at this moment (refer to the "Transactional aspects" section for more -details). The onMessage method can call other methods on the MDB -itself or on other beans, and can involve other resources by accessing -databases or by sending messages. Such resources are accessed the same way as -for other beans (entity or session), i.e., through resource references -declared in the deployment descriptor.

    - -

    The JOnAS container maintains a pool of MDB instances, allowing large -volumes of messages to be processed concurrently. An MDB is similar in some -ways to a stateless session bean: its instances are relatively short-lived, -it retains no state for a specific client, and several instances may be -running at the same time.

    - -

    Developing a Message-driven -Bean

    - -

    The MDB class must implement the javax.jms.MessageListener and the -javax.ejb.MessageDrivenBean interfaces. In addition to the -onMessage method, the following must be implemented:

    - - -

    The following is an example of an MDB class:

    -
    public class MdbBean  implements MessageDrivenBean, MessageListener {
    -
    -    private transient MessageDrivenContext mdbContext;
    -
    -    public MdbBean() {}
    -
    -    public void setMessageDrivenContext(MessageDrivenContext ctx) {
    -        mdbContext = ctx;
    -    }
    -
    -    public void ejbRemove() {}
    -
    -    public void ejbCreate() {}
    -
    -    public void onMessage(Message message) {
    -        try {
    -            TextMessage mess = (TextMessage)message;
    -            System.out.println( "Message received: "+mess.getText());
    -        }catch(JMSException ex){
    -            System.err.println("Exception caught: "+ex);
    -        }
    -    }
    -}
    -    
    - -

    The destination associated to an MDB is specified in the deployment -descriptor of the bean. A destination is a JMS-administered object, -accessible via JNDI. The description of an MDB in the EJB 2.0 deployment -descriptor contains the following elements, which are specific to MDBs:

    - - -

    The following example illustrates such a deployment descriptor:

    -
      <enterprise-beans>
    -    <message-driven>
    -      <description>Describe here the message driven bean Mdb</description>
    -      <display-name>Message Driven Bean Mdb</display-name>
    -      <ejb-name>Mdb</ejb-name>
    -      <ejb-class>samplemdb.MdbBean</ejb-class>
    -      <transaction-type>Container</transaction-type>
    -      <message-selector>Weight >= 60.00 AND LName LIKE 'Sm_th'</message-selector>
    -      <message-driven-destination>
    -        <destination-type>javax.jms.Topic</destination-type>
    -        <subscription-durability>NonDurable</subscription-durability>
    -      </message-driven-destination>
    -      <acknowledge-mode>Auto-acknowledge</acknowledge-mode>
    -    </message-driven>
    -  </enterprise-beans>
    -    
    - -

    If the transaction type is "container," the transactional behavior of the -MDB's methods are defined as for other enterprise beans in the deployment -descriptor, as in the following example:

    -
      <assembly-descriptor>
    -    <container-transaction>
    -      <method>
    -        <ejb-name>Mdb</ejb-name>
    -        <method-name>*</method-name>
    -      </method>
    -      <trans-attribute>Required</trans-attribute>
    -    </container-transaction>
    -  </assembly-descriptor>
    -    
    - -

    For the onMessage method, only the Required or -NotSupported transaction attributes must be used, since there can be -no pre-existing transaction context.

    - -

    For the message selector specified in the previous example, the sent JMS -messages are expected to have two properties, "Weight" and "LName," for -example assigned in the JMS client program sending the messages, as -follows:

    -
            message.setDoubleProperty("Weight",75.5);
    -        message.setStringProperty("LName","Smith");
    -        
    - -

    Such a message will be received by the Message-driven bean. The message -selector syntax is based on a subset of the SQL92. Only messages whose -headers and properties match the selector are delivered. Refer to the JMS -specification for more details.

    - -

    The JNDI name of a destination associated with an MDB is defined in the -JOnAS-specific deployment descriptor, within a jonas-message-driven -element, as illustrated in the following:

    -
      <jonas-message-driven>
    -    <ejb-name>Mdb</ejb-name>
    -    <jonas-message-driven-destination>
    -      <jndi-name>sampleTopic</jndi-name>
    -    </jonas-message-driven-destination>
    -  </jonas-message-driven>
    -    
    - -

    Once the destination is established, a client application can send -messages to the MDB through a destination object obtained via JNDI as -follows:

    - -

    Queue q = context.lookup("sampleTopic");

    - -

    If the client sending messages to the MDB is an EJB component itself, it -is preferable that it use a resource environment reference to obtain the -destination object. The use of resource environment references is described -in the JMS -User's Guide (Writing JMS operations within an application component / -Accessing the destination object section).

    - -

    Administration aspects

    -It is assumed at this point that the JOnAS server will make use of an -existing JMS implementation, e.g., Joram, SwiftMQ. - -

    The default policy is that the MDB developer and deployer are not -concerned with JMS administration. This means that the developer/deployer -will not create or use any JMS Connection factories and will not create a JMS -destination (which is necessary for performing JMS operations within an EJB -component, refer to the JMS User's Guide); they will simply define the type of -destination in the deployment descriptor and identify its JNDI name in the -JOnAS-specific deployment descriptor, as described in the previous section. -This means that JOnAS will implicitly create the necessary administered -objects by using the proprietary administration APIs of the JMS -implementation (since the administration APIs are not standardized). To -perform such administration operations, JOnAS uses wrappers to the JMS -provider administration API. For Joram, the wrapper is -org.objectweb.jonas_jms.JmsAdminForJoram (which is the default wrapper -class defined by the jonas.service.jms.mom property in the -jonas.properties file). For SwiftMQ, a -com.swiftmq.appserver.jonas.JmsAdminForSwiftMQ class can be obtained -from the SwiftMQ site.

    - -

    For the purpose of this implicit administration phase, the deployer must -add the 'jms' service in the list of the JOnAS services. For the example -provided, the jonas.properties file should contain the following:

    -
    -jonas.services                 registry,security,jtm,dbm,jms,ejb // The jms service must be added
    -jonas.service.ejb.descriptors  samplemdb.jar
    -jonas.service.jms.topics       sampleTopic    // not mandatory
    - -

    The destination objects may or may not pre-exist. The EJB server will not -create the corresponding JMS destination object if it already exists. (Refer -also to JMS -administration). The sampleTopic should be explicitly -declared only if the JOnAS Server is going to create it first, even if the -Message-driven bean is not loaded, or if it is used by another client before -the Message-driven bean is loaded. In general, it is not necessary to declare -the sampleTopic.

    - -

    JOnAS uses a pool of threads for executing Message-driven -bean instances on message reception, thus allowing large volumes of messages -to be processed concurrently. As previously explained, MDB instances are -stateless and several instances may execute concurrently on behalf of the -same MDB. The default size of the pool of thread is 10, and it may be -customized via the jonas property -jonas.service.ejb.mdbthreadpoolsize, which is specified in -the jonas.properties file as in the following example:

    -
        jonas.service.ejb.mdbthreadpoolsize   50
    -    
    - -

    Running a Message-driven Bean

    - -

    To deploy and run a Message-driven Bean, perform the following steps:

    - - -

    Launching the Message-Oriented -Middleware

    - -

    If the configuration property jonas.services contains the -jms service, then the JOnAS JMS service will be launched and may try to -launch a JMS implementation (a MOM).

    - -

    For launching the MOM, three possibilities can be considered:

    -
      -
    1. Launching the MOM in the same JVM as JOnAS -

      This is the default situation obtained by assigning the - true value to the configuration property - jonas.service.jms.collocated in the - jonas.properties file.

      -
      -jonas.services                security,jtm,dbm,jms,ejb // The jms service must be in the list
      -jonas.service.jms.collocated  true
      -

      In this case, the MOM is automatically launched by the JOnAS JMS - service at the JOnAS launching time (command jonas - start).

      -
    2. -
    3. Launching the MOM in a separate JVM -

      The Joram MOM can be launched using the command:

      -

      JmsServer

      -

      For other MOMs, the proprietary command should be used.

      -

      The configuration property - jonas.service.jms.collocated must be set to - false in the jonas.properties file. Setting - this property is sufficient if the JORAM's JVM runs on the same host as - JONAS, and if the MOM is launched with its default options (unchanged - a3servers.xml configuration file under JONAS_BASE/conf - or JONAS_ROOT/conf if JONAS_BASE not defined).

      -
      -jonas.services               security,jtm,dbm,jms,ejb // The jms service must be in the list
      -jonas.service.jms.collocated false
      -

      To use a specific configuration for the MOM, such as changing the - default host (which is localhost) or the default connection port number - (which is 16010), requires defining the additional - jonas.service.jms.url configuration property as - presented in the following case.

      -
    4. -
    5. Launching the MOM on another host -

      This requires defining the jonas.service.jms.url - configuration property. When using Joram, its value should be the Joram - URL joram://host:port where host is the host - name, and port is the connection port (by default, 16010). - For SwiftMQ, the value of the URL is similar to the following: - smqp://host:4001/timeout=10000.

      -
      -jonas.services                security,jtm,dbm,jms,ejb // The jms service must be in the list
      -jonas.service.jms.collocated  false
      -jonas.service.jms.url         joram://host2:16010
      - 
      -
    6. -
    - - -

    Transactional aspects

    -Because a transactional context cannot be carried by a message (according to -the EJB 2.0 specification), an MDB will never execute within an existing -transaction. However, a transaction may be started during the onMessage -method execution, either due to a "required" transaction attribute -(container-managed transaction) or because it is explicitly started within -the method (if the MDB is bean-managed transacted). In the second case, the -message receipt will not be part of the transaction. In the first case, -container-managed transaction, the container will start a new transaction -before de-queueing the JMS message (the receipt of which will, thus, be part -of the started transaction), then enlist the resource manager associated with -the arriving message and all the resource managers accessed by the onMessage -method. If the onMessage method invokes other enterprise beans, the container -passes the transaction context with the invocation. Therefore, the -transaction started at the onMessage method execution may involve -several operations, such as accessing a database (via a call to an entity -bean, or by using a "datasource" resource), or sending messages (by using a -"connection factory" resource). - -

    Example

    -JOnAS provides examples that are located in the -examples/src/mdb install directory.
    -samplemdb is a very simple example, the code of which is -used in the previous topics for illustrating how to use Message-driven beans. -
    -sampleappli is a more complex example that shows how the -sending of JMS messages and updates in a database via JDBC may be involved in -the same distributed transaction.
    -The following figure illustrates the architecture of this example -application.
    -
    -eb
    - - -

    There are two Message-driven beans in this example:

    - - -

    The example also includes a CMP entity bean Stock that -handles a stock table.

    - -

    A Stock item is composed of a Stockid (String), which is the primary key, -and a Quantity (int). The method decreaseQuantity(int qty) decreases the -quantity for the corresponding stockid, but can throw a RemoteException -"Negative stock."

    - -

    The client application SampleAppliClient -is a JMS Client that sends several messages on the topic -StockHandlerTopic. It uses Map messages with three fields: -"CustomerId," "ProductId," "Quantity." Before sending messages, this client -calls the EnvBean -for creating the StockTable in the database with known values in order -to check the results of updates at the end of the test. Eleven messages are -sent, the corresponding transactions are committed, and the last message sent -causes the transaction to be rolled back.

    - -

    Compiling this example

    - -

    To compile examples/src/mdb/sampleappli, use Ant -with the $JONAS_ROOT/examples/src/build.xml file.

    - -

    Running this example

    -
    -The default configuration of the JMS service in jonas.properties -is the following: -
    - jonas.services                 jmx,security,jtm,dbm,jms,ejb  // The jms service must be added
    - jonas.service.ejb.descriptors  sampleappli.jar
    - jonas.service.jms.topics       StockHandlerTopic
    - jonas.service.jms.queues       OrdersQueue
    - jonas.service.jms.collocated   true
    - 
    -This indicates that the JMS Server will be launched in the same JVM as the -JOnAS Server, and the JMS-administered objects StockHandlerTopic -(Topic) and OrdersQueue (Queue) will be created and registered -in JNDI, if not already existing. - - -

    Tuning Message-driven Bean Pool

    -A pool is handled by JOnAS for each Message-driven bean. The pool can be -configured in the JOnAS-specific deployment descriptor with the following -tags: - -

    min-pool-size

    -This optional integer value represents the minimum instances that will be -created in the pool when the bean is loaded. This will improve bean instance -creation time, at least for the first beans. The default value is 0. - -

    max-cache-size

    -This optional integer value represents the maximum number of instances of -ServerSession that may be created in memory. The purpose of this value -is to keep JOnAS scalable. The policy is the following:
    -When the ConnectionConsumer ask for a ServerSession instance -(in order to deliver a new message) JOnAS tries to give an instance from the -ServerSessionPool. If the pool is empty, a new instance is created -only if the number of yet created instances is smaller than the max-cache-size -parameter. When the max-cache-size is reached, the ConnectionConsumer -is blocked and it cannot deliver new messages until a ServerSession is -eventually returned in the pool. A ServerSession is pushed into the -pool at the end of the onMessage method.
    -The default value is no limit (this means that a new instance of -ServerSession is always created when the pool is empty). -

    -The values for max-cache-size should be set accordingly to jonas.service.ejb.maxworkthreads value. -See Configuring JMS Service. -

    -

    example

    -
      <jonas-ejb-jar>
    -    <jonas-message-driven>
    -      <ejb-name>Mdb</ejb-name>
    -      <jndi-name>mdbTopic</jndi-name>
    -      <max-cache-size>20</max-cache-size>
    -      <min-pool-size>10</min-pool-size>
    -    </jonas-message-driven>
    -  </jonas-ejb-jar>
    -   
    - - diff --git a/jonas_doc/core/olddoc/PG_Packaging.html b/jonas_doc/core/olddoc/PG_Packaging.html deleted file mode 100644 index 5cb776900f40fb4aefcb70474e542381aaedbe92..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_Packaging.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - EJB Packaging - - - -

    EJB Programmer's Guide: EJB Packaging

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the Enterprise Bean provider, i.e. -the person in charge of developing the software components on the server -side. It describes how the bean components should be packaged.

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Principles
    4. -
    - -

    Principles

    - -

    Enterprise Beans are packaged for deployment in a standard Java -programming language Archive file, called an ejb-jar file. This file -must contain the following:

    -
    -
    The beans' class files
    -
    The class files of the remote and home interfaces, of the beans' - implementations, of the beans' primary key classes (if there are any), - and of all necessary classes.
    -
    The beans' deployment descriptor
    -
    The ejb-jar file must contain the deployment descriptors, which are - made up of: -
      -
    • The standard xml deployment descriptor, in the format defined in - the EJB 2.1 specification. Refer - to $JONAS_ROOT/xml/ejb-jar_2_1.xsd or  - http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd - . This deployment descriptor must be stored with the name - META-INF/ejb-jar.xml in the ejb-jar file.
    • -
    • The JOnAS-specific XML deployment descriptor in the format - defined in $JONAS_ROOT/xml/jonas-ejb-jar_X_Y.xsd. This - JOnAS deployment descriptor must be stored with the name - META-INF/jonas-ejb-jar.xml in the ejb-jar file.
    • -
    -
    -
    - -

    Example

    - -

    Before building the ejb-jar file of the Account entity bean example, the -java source files must be compiled to obtain the class files and the two XML -deployment descriptors must be written.

    - -

    Then, the ejb-jar file (OpEB.jar) can be built using the jar -command:

    -
        cd your_bean_class_directory
    -    mkdir META-INF
    -    cp .../eb/*.xml META-INF
    -    jar cvf OpEB.jar sb/*.class META-INF/*.xml
    -    
    - - diff --git a/jonas_doc/core/olddoc/PG_Security.html b/jonas_doc/core/olddoc/PG_Security.html deleted file mode 100644 index 8e07f9467b6bcacd8a29ff020436af4faa85a333..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_Security.html +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - Security Management - - - -

    EJB Programmer's Guide: Security Management

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the Enterprise Bean provider, i.e. -the person in charge of developing the software components on the server -side. It explains how security behavior should be defined.

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Introduction
    4. -
    5. Declarative Security - Management
    6. -
    7. Programmatic Security - Management
    8. -
    - -

    Introduction

    - -

    The EJB architecture encourages the Bean programmer to implement the -enterprise bean class without hard-coding the security policies and -mechanisms into the business methods.

    - -

    Declarative Security -Management

    - -

    The application assembler can define a security view of the -enterprise beans contained in the ejb-jar file.
    -The security view consists of a set of security roles. A security -role is a semantic grouping of permissions for a given type of application -user that allows that user to successfully use the application.
    -The application assembler can define (declaratively in the deployment -descriptor) method permissions for each security role. A method -permission is a permission to invoke a specified group of methods for the -enterprise beans' home and remote interfaces.
    -The security roles defined by the application assembler present this -simplified security view of the enterprise beans application to the deployer; -the deployer's view of security requirements for the application is the small -set of security roles, rather than a large number of individual methods.

    - -

    Security roles

    - -

    The application assembler can define one or more security roles -in the deployment descriptor. The application assembler then assigns groups -of methods of the enterprise beans' home and remote interfaces to the -security roles in order to define the security view of the application.

    - -

    The scope of the security roles defined in the security-role -elements is the ejb-jar file level, and this includes all the enterprise -beans in the ejb-jar file.

    -
       ...
    -   <assembly-descriptor>
    -      <security-role>
    -         <role-name>tomcat</role-name>
    -      </security-role>
    -      ...
    -   </assembly-descriptor>
    -    
    - -

    Method permissions

    - -

    After defining security roles for the enterprise beans in the ejb-jar -file, the application assembler can also specify the methods of the remote -and home interfaces that each security role is allowed to invoke.

    - -

    Method permissions are defined as a binary relationship in the deployment -descriptor from the set of security roles to the set of methods of the home -and remote interfaces of the enterprise beans, including all their super -interfaces (including the methods of the javax.ejb.EJBHome and -javax.ejb.EJBObject interfaces). The method permissions -relationship includes the pair (R, M) only if the security role -R is allowed to invoke the method M.

    - -

    The application assembler defines the method permissions relationship in -the deployment descriptor using the method-permission element as -follows:

    - - -

    It is possible that some methods are not assigned to any security roles. -This means that these methods can be accessed by anyone.

    - -

    The following example illustrates how security roles are assigned to -methods' permissions in the deployment descriptor:

    -
       ...
    -   <method-permission>
    -      <role-name>tomcat</role-name>
    -      <method>
    -         <ejb-name>Op</ejb-name>
    -         <method-name>*</method-name>
    -      </method>
    -   </method-permission>
    -   ...
    -    
    - -

    Programmatic Security -Management

    - -

    Because not all security policies can be expressed declaratively, the EJB -architecture also provides a simple programmatic interface that the Bean -programmer can use to access the security context from the business -methods.

    - -

    The javax.ejb.EJBContext interface provides two methods that -allow the Bean programmer to access security information about the enterprise -bean's caller.

    -
    public interface javax.ejb.EJBContext {
    -   ...
    -   //
    -   // The following two methods allow the EJB class
    -   // to access security information
    -   //
    -   java.security.Principal getCallerPrincipal() ;
    -   boolean isCallerInRole (String roleName) ;
    -   ...
    -}
    -    
    - -

    Use of getCallerPrincipal()

    - -

    The purpose of the getCallerPrincipal() method is to allow -the enterprise bean methods to obtain the current caller principal's name. -The methods might, for example, use the name as a key to access information -in a database.

    - -

    An enterprise bean can invoke the getCallerPrincipal() method -to obtain a java.security.Principal interface representing the -current caller. The enterprise bean can then obtain the distinguished name of -the caller principal using the getName() method of the -java.security.Principal interface.

    - -

    Use of isCallerInRole(String roleName)

    - -

    The main purpose of the isCallerInRole(String roleName) -method is to allow the Bean programmer to code the security checks that -cannot be easily defined declaratively in the deployment descriptor using -method permissions. Such a check might impose a role-based limit on a -request, or it might depend on information stored in the database.

    - -

    The enterprise bean code uses the isCallerInRole(String -roleName) method to test whether the current caller has been assigned -to a given security role or not. Security roles are defined by the -application assembler in the deployment descriptor and are assigned to -principals by the deployer.

    - -

    Declaration of security roles referenced from the bean's code

    - -

    The Bean programmer must declare in the security-role-ref -elements of the deployment descriptor all the security role names used in the -enterprise bean code. Declaring the security roles' references in the code -allows the application assembler or deployer to link the names of the -security roles used in the code to the actual security roles defined for an -assembled application through the security-role elements.

    -
       ...
    -   <enterprise-beans>
    -      ...
    -      <session>
    -         <ejb-nameOp</ejb-name>
    -         <ejb-class>sb.OpBean</ejb-class>
    -         ...
    -         <security-role-ref>
    -            <role-name>role1</role-name>
    -         </security-role-ref>
    -         ...
    -      </session>
    -      ...
    -   </enterprise-beans>
    -   ...
    -    
    - -

    The deployment descriptor in this example indicates that the enterprise -bean Op makes the security checks using -isCallerInRole("role1") in at least one of its business -methods.

    - -

    Linking security role references and security roles

    - -

    If the security-role elements have been defined in the -deployment descriptor, all the security role references declared in the -security-role-ref elements must be linked to the security roles -defined in the security-role elements.

    - -

    The following deployment descriptor example shows how to link the security -role references named role1 to the security role named -tomcat.

    - -

    -
       ...
    -   <enterprise-beans>
    -      ...
    -      <session>
    -         <ejb-name>Op</ejb-name>
    -         <ejb-class>sb.OpBean</ejb-class>
    -         ...
    -         <security-role-ref>
    -            <role-name>role1</role-name>
    -            <role-link>tomcat</role-link>
    -         </security-role-ref>
    -         ...
    -      </session>
    -      ...
    -   </enterprise-beans>
    -   ...
    -    
    - -

    In summary, the role names used in the EJB code (in the isCallerInRole -method) are, in fact, references to actual security roles, which makes the -EJB code independent of the security configuration described in the -deployment descriptor. The programmer makes these role references available -to the Bean deployer or application assembler via the -security-role-ref elements included in the session -or entity elements of the deployment descriptor. Then, the Bean -deployer or application assembler must map the security roles defined in the -deployment descriptor to the "specific" roles of the target operational -environment (e.g. groups on Unix systems). However, this last mapping step is -not currently available in JOnAS.

    - - diff --git a/jonas_doc/core/olddoc/PG_Session.html b/jonas_doc/core/olddoc/PG_Session.html deleted file mode 100644 index cf7779c5abfeb4fc724c0297d1bdf8d5962d5bc3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_Session.html +++ /dev/null @@ -1,320 +0,0 @@ - - - - - - - Developing Session Beans - - - -

    EJB Programmer's Guide: Developing Session -Beans

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the Enterprise Bean provider, i.e. -the person in charge of developing the software components on the server side -and, more specifically, the Session Beans.

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Introduction
    4. -
    5. The Home Interface
    6. -
    7. The Component Interface
    8. -
    9. The Enterprise Bean Class
    10. -
    11. Tuning Stateless Session Bean Pool
    12. -
    - -

    Introduction

    - -

    A Session Bean is composed of the following parts, which are developed by -the Enterprise Bean Provider:

    - - -

    Note that, according to the EJB 2.0 specification, the couple "Component -Interface and Home Interface" may be either local or remote. Local -Interfaces (Home and Component) are to be used by a client running in the -same JVM as the EJB component. Create and finder methods of a local or remote -home interface return local or remote component interfaces respectively. An -EJB component can have both remote and local interfaces, even if typically -only one type of interface is provided.

    - -

    The description of these elements is provided in the following -sections.

    - -

    Note: in this documentation, the term "Bean" always means "Enterprise -Bean."

    - -

    A session bean object is a short-lived object that executes on behalf of a -single client.There are stateless and stateful session beans. -Stateless beans do not maintain state across method calls. Any instance of -stateless beans can be used by any client at any time. Stateful session beans -maintain state within and between transactions. Each stateful session bean -object is associated with a specific client. A stateful session bean with -container-managed transaction demarcation can optionally implement the -SessionSynchronization interface. In this case, the bean objects will -be informed of transaction boundaries. A rollback could result in a session -bean object's state being inconsistent; in this case, implementing the -SessionSynchronization interface may enable the bean object to update its -state according to the transaction completion status.

    - -

    The Home Interface

    - -

    A Session bean's home interface defines one or more create(...) -methods. Each create method must be named create and must -match one of the ejbCreate methods defined in the enterprise Bean class. The -return type of a create method must be the enterprise Bean's remote interface -type.
    -The home interface of a stateless session bean must have one create -method that takes no arguments.

    - -

    All the exceptions defined in the throws clause of an ejbCreate -method must be defined in the throws clause of the matching create -method of the home interface.

    - -

    A remote home interface extends the javax.ejb.EJBHome -interface, while a local home interface extends the -javax.ejb.EJBLocalHome interface.

    - -

    Example:

    - -

    The following examples use a Session Bean named Op.

    -
        public interface OpHome extends EJBHome {
    -        Op create(String user) throws CreateException, RemoteException;
    -    }
    -    
    - -

    A local home interface could be defined as follows (LocalOp -being the local component interface of the bean):

    -
        public interface LocalOpHome extends EJBLocalHome {
    -        LocalOp create(String user) throws CreateException;
    -    }
    -    
    - -

    The Component Interface

    - -

    The Component Interface is the client's view of an instance of the session -bean. This interface contains the business methods of the enterprise bean. -The interface must extend the javax.ejb.EJBObject interface if it is -remote, or the javax.ejb.EJBLocalObject if it is local. The methods -defined in a remote component interface must follow the rules for Java RMI -(this means that their arguments and return value must be valid types for -java RMI, and their throws clause must include the -java.rmi.RemoteException). For each method defined in the component -interface, there must be a matching method in the enterprise Bean's class -(same name, same arguments number and types, same return type, and same -exception list, except for RemoteException).

    - -

    Example:

    -
        public interface Op extends EJBObject {
    -        public void buy (int Shares)  throws RemoteException;
    -        public int  read ()           throws RemoteException;
    -    }
    -    
    - -

    The same type of component interface could be defined as a local interface -(even if it is not considered good design to define the same interface as -both local and remote):

    -
        public interface LocalOp extends EJBLocalObject {
    -        public void buy (int Shares);
    -        public int  read ();
    -    }
    -    
    - -

    The Enterprise Bean Class

    - -

    This class implements the Bean's business methods of the component -interface and the methods of the SessionBean interface, which are -those dedicated to the EJB environment. The class must be defined as public -and may not be abstract. The Session Bean interface methods that the -EJB provider must develop are the following:

    - - -

    A stateful session Bean with container-managed transaction demarcation can -optionally implement the javax.ejb.SessionSynchronization interface. -This interface can provide the Bean with transaction synchronization -notifications. The Session Synchronization interface methods that the -EJB provider must develop are the following:

    - - -

    Example:

    -
    package sb;
    -
    -import java.rmi.RemoteException;
    -import javax.ejb.EJBException;
    -import javax.ejb.EJBObject;
    -import javax.ejb.SessionBean;
    -import javax.ejb.SessionContext;
    -import javax.ejb.SessionSynchronization;
    -import javax.naming.InitialContext;
    -import javax.naming.NamingException;
    -
    -// This is an example of Session Bean, stateful, and synchronized.
    -
    -public class OpBean implements SessionBean, SessionSynchronization {
    -
    -    protected int total = 0;        // actual state of the bean
    -    protected int newtotal = 0;        // value inside Tx, not yet committed.
    -    protected String clientUser = null;
    -    protected SessionContext sessionContext = null;
    -
    -    public void  ejbCreate(String user) {
    -        total = 0;
    -        newtotal = total;
    -        clientUser = user;
    -    }
    -
    -    public void ejbActivate() {
    -        // Nothing to do for this simple example
    -    }    
    -
    -    public void ejbPassivate() {
    -        // Nothing to do for this simple example
    -    }
    -
    -    public void ejbRemove() {
    -        // Nothing to do for this simple example
    -    }
    -
    -    public void setSessionContext(SessionContext sessionContext) {
    -        this.sessionContext = sessionContext;
    -    }
    -
    -    public void afterBegin() {
    -        newtotal = total;
    -    }
    -
    -    public void beforeCompletion() {
    -        // Nothing to do for this simple example
    -
    -        // We can access the bean environment everywhere in the bean,
    -        // for example here!
    -        try {
    -            InitialContext ictx = new InitialContext();
    -            String value = (String) ictx.lookup("java:comp/env/prop1");
    -            // value should be the one defined in ejb-jar.xml
    -        } catch (NamingException e) {
    -            throw new EJBException(e);
    -        }
    -    }
    -
    -    public void afterCompletion(boolean committed) {
    -        if (committed) {
    -            total = newtotal;
    -        } else {
    -            newtotal = total;
    -        }
    -    }
    -
    -    public void buy(int s) {
    -        newtotal = newtotal + s;
    -        return;
    -    }
    -
    -    public int read() {
    -        return newtotal;
    -    }
    -}
    -    
    - -

    Tuning Stateless Session Bean Pool

    -JOnAS handles a pool for each stateless session bean. The pool can be -configured in the JOnAS-specific deployment descriptor with the following -tags: - -

    min-pool-size

    -This optional integer value represents the minimum instances that will be -created in the pool when the bean is loaded. This will improve bean instance -creation time, at least for the first beans. The default value is 0. - -

    max-cache-size

    -This optional integer value represents the maximum of instances in memory. -The purpose of this value is to keep JOnAS scalable. The policy is the -following:
    -At bean creation time, an instance is taken from the pool of free instances. -If the pool is empty, a new instance is always created. When the instance -must be released (at the end of a business method), it is pushed into the -pool, except if the current number of instances created exceeds the -max-cache-size, in which case this instance is dropped. The default -value is no limit. - -

    example

    -
      <jonas-ejb-jar>
    -    <jonas-session>
    -      <ejb-name>SessSLR</ejb-name>
    -      <jndi-name>EJB/SessHome</jndi-name>
    -      <max-cache-size>20</max-cache-size>
    -      <min-pool-size>10</min-pool-size>
    -    </jonas-session>
    -  </jonas-ejb-jar>
    -   
    - - diff --git a/jonas_doc/core/olddoc/PG_Transaction.html b/jonas_doc/core/olddoc/PG_Transaction.html deleted file mode 100644 index 28603499ad78f395a31112824ed9d7d16fc8c4c2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_Transaction.html +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - - Transactional Behaviour - - - -

    EJB Programmer's Guide: Transactional -Behaviour

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the Enterprise Bean provider, i.e. -the person in charge of developing the software components on the server -side. It describes how to define the transactional behaviour of an EJB -application.

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Declarative Transaction - Management
    4. -
    5. Bean-managed Transaction
    6. -
    7. Distributed Transaction - Management
    8. -
    - -

    Declarative Transaction -Management

    - -

    For container-managed transaction management, the transactional behaviour -of an enterprise bean is defined at configuration time and is part of the -assembly-descriptor element of the standard deployment descriptor. It is -possible to define a common behaviour for all the methods of the bean, or to -define the behaviour at the method level. This is done by specifying a -transactional attribute, which can be one of the following:

    - -This is illustrated in the following table: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Transaction Attribute Client transaction Transaction associated with enterprise Bean's - method 
    NotSupported -  - -

    T1

    -
    -  - -

    -

    -
    Required -  - -

    T1

    -
    T2  - -

    T1

    -
    RequiresNew -  - -

    T1

    -
    T2  - -

    T2

    -
    Mandatory -  - -

    T1

    -
    error  - -

    T1

    -
    Supports-  - -

    T1

    -
    -  - -

    T1

    -
    Never- - -

    T1

    -
    - - -

    error

    -
    - -

    - -

    In the deployment descriptor, the specification of the transactional -attributes appears in the assembly-descriptor as follows:

    -
      <assembly-descriptor>
    -    <container-transaction>
    -      <method>
    -      <ejb-name>AccountImpl</ejb-name>
    -      <method-name>*</method-name>
    -      </method>
    -      <trans-attribute>Supports</trans-attribute>
    -    </container-transaction>
    -    <container-transaction>
    -      <method>
    -      <ejb-name>AccountImpl</ejb-name>
    -      <method-name>getBalance</method-name>
    -      </method>
    -      <trans-attribute>Required</trans-attribute>
    -    </container-transaction>
    -    <container-transaction>
    -      <method>
    -      <ejb-name>AccountImpl</ejb-name>
    -      <method-name>setBalance</method-name>
    -      </method>
    -      <trans-attribute>Mandatory</trans-attribute>
    -    </container-transaction>
    -  </assembly-descriptor>
    -    
    - -

    In this example, for all methods of the AccountImpl bean which are not -explicitly specified in a container-transaction element, the default -transactional attribute is Supports (defined at the bean-level), and the -transactional attributes are Required and Mandatory (defined at the -method-name level) for the methods getBalance and setBalance respectively.

    - -

    Bean-managed Transaction

    - -

    A bean that manages its transactions itself must set the -transaction-type element in its standard deployment descriptor -to:

    -
      <transaction-type>Bean</transaction-type>
    -    
    - -

    To demarcate the transaction boundaries in a bean with bean-managed -transactions, the bean programmer should use the -javax.transaction.UserTransaction interface, which is defined on an -EJB server object that may be obtained using the -EJBContext.getUserTransaction() method (the SessionContext object or -the EntityContext object depending on whether the method is defined on a -session or on an entity bean). The following example shows a session bean -method "doTxJob" demarcating the transaction boundaries; the UserTransaction -object is obtained from the sessionContext object, which should have been -initialized in the setSessionContext method (refer to the example of the session -bean).

    -
    public void doTxJob() throws  RemoteException {
    -     UserTransaction ut = sessionContext.getUserTransaction();
    -     ut.begin();
    -     ... // transactional operations
    -     ut.commit();
    -}
    - -

    Another way to do this is to use JNDI and to retrieve UserTransaction with -the name java:comp/UserTransaction in the initial context.

    - -

    Distributed Transaction -Management

    - -

    As explained in the previous section, the transactional behaviour of an -application can be defined in a declarative way or coded in the bean and/or -the client itself (transaction boundaries demarcation). In any case, the -distribution aspects of the transactions are completely transparent to the -bean provider and to the application assembler. This means that a transaction -may involve beans located on several JOnAS servers and that the platform -itself will handle management of the global transaction. It will perform the -two-phase commit protocol between the different servers, and the bean -programmer need do nothing.

    - -

    Once the beans have been developed and the application has been assembled, -it is possible for the deployer and for the administrator to configure the -distribution of the different beans on one or several machines, and within -one or several JOnAS servers. This can be done without impacting either the -beans code or their deployment descriptors. The distributed configuration is -specified at launch time. In the environment properties of an EJB server, the -following can be specified:

    - - -

    To achieve this goal, two properties must be set in the -jonas.properties file, jonas.service.ejb.descriptors and -jonas.service.jtm.remote. The first one lists the beans that will be -handled on this server (by specifying the name of their ejb-jar files), and -the second one sets the Java Transaction Monitor (JTM) launching mode:

    - - -

    Example:

    -
      jonas.service.ejb.descriptors       Bean1.jar, Bean2.jar
    -  jonas.service.jtm.remote            false
    -    
    - -

    The Java Transaction Monitor can run outside any EJB server, in which case -it can be launched in a stand-alone mode using the following command:

    -
    TMServer
    - -

    - -

    Using these configuration facilities, it is possible to adapt the beans -distribution to the resources (cpu and data) location, for optimizing -performance.

    - -

    The following figure illustrates four cases of distribution configuration -for three beans.

    - -

    Figure illustrating beans distr

    -
      -
    1. Case 1: The three beans B1, B2, and B3 are located on the same JOnAS - server, which embeds a Java Transaction Monitor.
    2. -
    3. Case 2: The three beans are located on different JOnAS servers, one of - them running the Java Transaction Monitor, which manages the global - transaction.
    4. -
    5. Case 3: The three beans are located on different JOnAS servers, the - Java Transaction Monitor is running outside of any JOnAS server.
    6. -
    7. Case 4: The three beans are located on different JOnAS servers. Each - server is running a Java Transaction Monitor. One of the JTM acts as the - master monitor, while the two others are slaves.
    8. -
    - -

    These different configuration cases may be obtained by launching the JOnAS -servers and eventually the JTM (case 3) with the adequate properties. The -rational when choosing one of these configurations is resources location and -load balancing. However, consider the following pointers:

    - - - diff --git a/jonas_doc/core/olddoc/PG_War.html b/jonas_doc/core/olddoc/PG_War.html deleted file mode 100644 index 0bda251516cf9a3b697b3650294e1df4a27e1b0b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/PG_War.html +++ /dev/null @@ -1,646 +0,0 @@ - - - - - - - Web Application Programmer's Guide - - - -

    Web Application Programmer's Guide

    - -

    Target Audience and Content

    - -

    The target audience for this guide is the Web component provider, i.e. the -person in charge of developing the Web components on the server side. It -describes how the Web component provider should build the deployment -descriptors of its Web components and how the web components should be -packaged.

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Content
    2. -
    3. Developing Web Components - -
    4. -
    5. Defining the Web Deployment Descriptor - -
    6. -
    7. WAR Packaging
    8. -
    - -

    Developing Web Components

    - -

    Introduction

    - -

    A Web Component is a generic term which denotes both JSP pages and -Servlets. Web components are packaged in a .war file and can be -deployed in a JOnAS server via the web container service. Web -components can be integrated in a J2EE application by packing the -.war file in an .ear file (refer to the J2EE Application Programmer's -Guide).

    - -

    The JOnAS distribution includes a Web application example: The EarSample example.

    - -

    The directory structure of this application is the following:

    - - - - - - - - - - - - - - - - - - - - -
    etc/xmlcontains the web.xml file describing the web application
    etc/resources/webcontains html pages and images; JSP pages can also be placed - here.
    src/org/objectweb/earsample/servletsservlet sources
    src/org/objectweb/earsample/beansbeans sources
    - -

    The bean directory is not needed if beans coming from another application -will be used.

    - -

    The JSP pages

    - -

    Java Server Pages (JSP) is a technology that allows regular, static HTML, -to be mixed with dynamically-generated HTML written in Java programming -language for encapsulating the logic that generates the content for the page. -Refer to the Java Server -PagesTM and the Quickstart guide for -more details.

    - -

    Example:

    - -

    The following example shows a sample JSP page that lists the content of a -cart.

    -
        <!-- Get the session -->
    -    <%@ page session="true" %>
    -
    -    <!-- The import to use -->
    -    <%@ page import="java.util.Enumeration" %>
    -    <%@ page import="java.util.Vector"      %>
    -
    -    <html>
    -    <body bgcolor="white">
    -      <h1>Content of your cart</h1><br>
    -      <table>
    -        <!-- The header of the table -->
    -        <tr bgcolor="black">
    -          <td><font color="lightgreen">Product Reference</font></td>
    -          <td><font color="lightgreen">Product Name</font></td>
    -          <td><font color="lightgreen">Product Price</font></td>
    -        </tr>
    -
    -        <!-- Each iteration of the loop display a line of the table -->
    -        <%
    -          Cart cart = (Cart) session.getAttribute("cart");
    -          Vector products = cart.getProducts();
    -          Enumeration enum = products.elements();
    -          // loop through the enumeration
    -          while (enum.hasMoreElements()) {
    -              Product prod = (Product) enum.nextElement();
    -        %>
    -        <tr>
    -          <td><%=prod.getReference()%></td>
    -          <td><%=prod.getName()%></td>
    -          <td><%=prod.getPrice()%></td>
    -        </tr>
    -        <%
    -        } // end loop
    -        %>
    -      </table>
    -    </body>
    -    </html>
    -    
    - -

    It is a good idea to hide all the mechanisms for accessing EJBs from JSP -pages by using a proxy java bean, referenced in the JSP page by the -usebean special tag. This technique is shown in the alarm example, where the .jsp files -communicate with the EJB via a proxy java bean ViewProxy.java.

    - -

    The Servlets

    - -

    Servlets are modules of Java code that run in an application server for -answering client requests. Servlets are not tied to a specific client-server -protocol. However, they are most commonly used with HTTP, and the word -"Servlet" is often used as referring to an "HTTP Servlet."

    - -

    Servlets make use of the Java standard extension classes in the packages -javax.servlet (the basic Servlet framework) and -javax.servlet.http (extensions of the Servlet framework for -Servlets that answer HTTP requests).

    - -

    Typical uses for HTTP Servlets include:

    - - -

    For more details refer to the JavaTM Servlet -Technology and the Servlets -tutorial.

    - -

    Example:

    - -

    The following example is a sample of a Servlet that lists the content of a -cart.
    -This example is the servlet version of the previous JSP page example.

    -
        import java.util.Enumeration;
    -    import java.util.Vector;
    -    import java.io.PrintWriter;
    -    import java.io.IOException;
    -    import javax.servlet.ServletException;
    -    import javax.servlet.http.HttpServlet;
    -    import javax.servlet.http.HttpServletRequest;
    -    import javax.servlet.http.HttpServletResponse;
    -    import javax.servlet.http.HttpSession;
    -
    -    public class GetCartServlet extends HttpServlet {
    -
    -        protected void doGet(HttpServletRequest req, HttpServletResponse res)
    -                             throws ServletException, IOException {
    -
    -            res.setContentType("text/html");
    -            PrintWriter out = res.getWriter();
    -
    -            out.println("<html><head><title>Your cart</title></head>");
    -            out.println("<body>");
    -            out.println("<h1>Content of your cart</h1><br>");
    -            out.println("<table>");
    -
    -            // The header of the table
    -            out.println("<tr>");
    -            out.println("<td><font color="lightgreen">Product Reference</font></td>");
    -            out.println("<td><font color="lightgreen">Product Name</font></td>");
    -            out.println("<td><font color="lightgreen">Product Price</font></td>");
    -            out.println("</tr>");
    -
    -            // Each iteration of the loop display a line of the table
    -            HttpSession session = req.getSession(true);
    -            Cart cart = (Cart) session.getAttribute("cart");
    -            Vector products = cart.getProducts();
    -            Enumeration enum = products.elements();
    -            while (enum.hasMoreElements()) {
    -                Product prod = (Product) enum.nextElement();
    -                int prodId = prod.getReference();
    -                String prodName = prod.getName();
    -                float prodPrice = prod.getPrice();
    -                out.println("<tr>");
    -                out.println("<td>" + prodId + </td>);
    -                out.println("<td>" + prodName + </td>);
    -                out.println("<td>" + prodPrice + </td>);
    -                out.println("</tr>");
    -            }
    -
    -            out.println("</table>");
    -            out.println("</body>");
    -            out.println("</html>");
    -            out.close();
    -        }
    -    }
    -    
    - -

    Accessing an EJB from a Servlet or JSP -page

    -Through the JOnAS web container service, it is possible to access an -enterprise java bean and its environment in a J2EE-compliant way. - -

    The following sections describe:

    -
      -
    1. How to access the Remote Home interface of a bean.
    2. -
    3. How to access the Local Home interface of a bean.
    4. -
    5. How to access the environment of a bean.
    6. -
    7. How to start transactions in servlets.
    8. -
    -Note that all the following code examples are taken from the The EarSample example provided in the JOnAS -distribution. - -

    Accessing the Remote Home interface of a bean:

    -In this example the servlet gets the Remote Home interface OpHome -registered in JNDI using an EJB reference, then creates a new instance of the -session bean: -
    import javax.naming.Context;
    -import javax.naming.InitialContext;
    -
    -//remote interface
    -import org.objectweb.earsample.beans.secusb.Op;
    -import org.objectweb.earsample.beans.secusb.OpHome;
    -
    -        Context initialContext = null;
    -        try {
    -            initialContext = new InitialContext();
    -        } catch (Exception e) {
    -            out.print("<li>Cannot get initial context for JNDI: ");
    -            out.println(e + "</li>");
    -            return;
    -        }
    -      // Connecting to OpHome thru JNDI
    -        OpHome opHome = null;
    -        try {
    -            opHome = (OpHome) PortableRemoteObject.narrow(initialContext.lookup
    -                     ("java:comp/env/ejb/Op"),OpHome.class);
    -        } catch (Exception e) {
    -            out.println("<li>Cannot lookup java:comp/env/ejb/Op: " + e + "</li>");
    -            return;
    -        }
    -        // OpBean creation
    -        Op op = null;
    -        try {
    -            op = opHome.create("User1");
    -        } catch (Exception e) {
    -            out.println("<li>Cannot create OpBean: " + e + "</li>");
    -            return;
    -        }
    -Note that the following elements must be set in the web.xml file -tied to this web application: -
      <ejb-ref>
    -    <ejb-ref-name>ejb/Op</ejb-ref-name>
    -    <ejb-ref-type>Session</ejb-ref-type>
    -    <home>org.objectweb.earsample.beans.secusb.OpHome</home>
    -    <remote>org.objectweb.earsample.beans.secusb.Op</remote>
    -    <ejb-link>secusb.jar#Op</ejb-link>
    -  </ejb-ref>
    - -

    Accessing the Local Home of a bean:

    -The following example shows how to obtain a local home interface -OpLocalHome using an EJB local reference: -
    //local interfaces
    -import org.objectweb.earsample.beans.secusb.OpLocal;
    -import org.objectweb.earsample.beans.secusb.OpLocalHome;
    -
    -
    -      // Connecting to OpLocalHome thru JNDI
    -        OpLocalHome opLocalHome = null;
    -        try {
    -            opLocalHome = (OpLocalHome)
    -                initialContext.lookup("java:comp/env/ejb/OpLocal");
    -        } catch (Exception e) {
    -            out.println("<li>Cannot lookup java:comp/env/ejb/OpLocal: " + e + "</li>");
    -            return;
    -        }
    -This is found in the web.xml file: -
      <ejb-local-ref>
    -    <ejb-ref-name>ejb/OpLocal</ejb-ref-name>
    -    <ejb-ref-type>Session</ejb-ref-type>
    -    <local-home>org.objectweb.earsample.beans.secusb.OpLocalHome</local-home>
    -    <local>org.objectweb.earsample.beans.secusb.OpLocal</local>
    -    <ejb-link>secusb.jar#Op</ejb-link>
    -  </ejb-local-ref>
    - -

    Accessing the environment of the component:

    -In this example, the servlet seeks to access the component's environment: -
           String envEntry = null;
    -        try {
    -            envEntry = (String) initialContext.lookup("java:comp/env/envEntryString");
    -        } catch (Exception e) {
    -            out.println("<li>Cannot get env-entry on JNDI " + e + "</li>");
    -            return;
    -        }
    -This is the corresponding part of the web.xml file: -
      <env-entry>
    -    <env-entry-name>envEntryString</env-entry-name>
    -    <env-entry-value>This is a string from the env-entry</env-entry-value>
    -    <env-entry-type>java.lang.String</env-entry-type>
    -  </env-entry>
    - -

    Starting transactions in servlets:

    -The servlet wants to start transactions via the UserTransaction: -
    import javax.transaction.UserTransaction;
    -
    -       // We want to start transactions from client: get UserTransaction
    -        UserTransaction utx = null;
    -        try {
    -            utx = (UserTransaction) initialContext.lookup("java:comp/UserTransaction");
    -        } catch (Exception e) {
    -            out.println("<li>Cannot lookup java:comp/UserTransaction: " + e + "</li>");
    -            return;
    -        }
    -
    -        try {
    -            utx.begin();
    -            opLocal.buy(10);
    -            opLocal.buy(20);
    -            utx.commit();
    -
    -        } catch (Exception e) {
    -            out.println("<li>exception during 1st Tx: " + e + "</li>");
    -            return;
    -        }
    - -

    Defining the Web Deployment -Descriptor

    - -

    Principles

    - -

    The Web component programmer is responsible for providing the deployment -descriptor associated with the developed web components. The Web component -provider's responsibilities and the application assembler's responsibilities -are to provide an XML deployment descriptor that conforms to the deployment -descriptor's XML schema as defined in the Java TM Servlet -Specification Version 2.4. (Refer to -$JONAS_ROOT/xml/web-app_2_4.xsd or  -http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd).

    - - -

    To customize the Web components, information not defined in the standard -XML deployment descriptor may be needed. For example, the information may -include the mapping of the name of referenced resources to its JNDI name. -This information can be specified during the deployment phase, within another -XML deployment descriptor that is specific to JOnAS. The JOnAS-specific -deployment descriptor's XML schema is located in -$JONAS_ROOT/xml/jonas-web-app_X_Y.xsd. The file name of the -JOnAS-specific XML deployment descriptor must be the file name of the -standard XML deployment descriptor prefixed by 'jonas-'.

    - -

    The parser gets the specified schema via the classpath (schemas are packaged -in the $JONAS_ROOT/lib/common/ow_jonas.jar file).

    - -

    The standard deployment descriptor (web.xml) should contain structural -information that includes the following:

    - - -

    The JOnAS-specific deployment descriptor (jonas-web.xml) may contain -information that includes:

    - - -

    <host> element: If the configuration file of the web container -contains virtual hosts, the host on which the WAR file is deployed can be -set.

    - -

    <context-root> element: The name of the context on which the -application will be deployed should be specified. If it is not specified, the -context-root used can be one of the following:

    - -If the context-root is / or empty, the web application is deployed as ROOT -context (i.e., http://localhost:9000/). - -

    <java2-delegation-model> element: Set the compliance to the java 2 -delegation model.

    - - -

    - -

    Examples of Web Deployment Descriptors

    - - -

    Tips

    - -

    Although some characters, such as ">", are legal, it is good practice -to replace them with XML entity references. The following is a list of the -predefined entity references for XML:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    &lt;<less than
    &gt;>greater than
    &amp;&ampersand
    &apos;'apostrophe
    &quot;"quotation mark
    - -

    - -

    WAR Packaging

    - -

    Web components are packaged for deployment in a standard Java programming -language Archive file called a war file (Web ARchive), which is a -jar similar to the package used for Java class libraries. A -war has a specific hierarchical directory structure. The top-level -directory of a war is the document root of the application.

    - -

    The document root is where JSP pages, client-side classes and archives, -and static web resources are stored. The document root contains a -subdirectory called WEB-INF, which contains the following files and -directories:

    - - -

    Example

    - -

    Before building a war file, the java source files must be compiled -to obtain the class files (located in the WEB-INF/classes directory) -and the two XML deployment descriptors must be written.

    - -

    Then, the war file (<web-application>.war) is built using the -jar command:

    -
        cd <your_webapp_directory>
    -    jar cvf <web-application>.war *
    -    
    - -

    During the development process, an 'unpacked version' of the war file can -be used. Refer to Configuring Web -Container Service for information about how to use directories for the -web application.

    - - diff --git a/jonas_doc/core/olddoc/Services.html b/jonas_doc/core/olddoc/Services.html deleted file mode 100644 index afaf15ff649e5ba6d29ae7ffbbb81d751f62212f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/Services.html +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - JOnAS Services - - - - -

    Creating a New JOnAS Service

    - -

    The content of this guide is the following:

    -
      -
    1. Target Audience and Rationale
    2. -
    3. Introducing a new Service
    4. -
    5. Advanced Understanding
    6. -
    - -

    Target Audience and Rationale

    - -

    This chapter is intended for advanced JOnAS users who require that some -"external" services run along with the JOnAS server. A service is something -that may be initialized, started, and stopped. JOnAS itself already defines a -set of services, some of which are cornerstones of the JONAS Server. The -JOnAS pre-defined services are listed in Configuring JOnAS services.

    - -

    J2EE application developers may need to access other services, for example -another Web container or a Versant container, for their components. Thus, it -is important that such services be able to run along with the application -server. To achieve this, it is possible to define them as JOnAS services.

    - -

    This chapter describes how to define a new JOnAS service and how to -specify which service should be started with the JOnAS server.

    - -

    Introducing a new Service

    - -

    The customary way to define a new JOnAS service is to encapsulate it in a -class whose interface is known by JOnAS. More precisely, such a class -provides a way to initialize, start, and stop the service. Then, the -jonas.properties file must be modified to make JOnAS aware of this -service.

    - -

    Defining the Service class

    - -

    A JOnAS service is represented by a class that implements the interface -org.objectweb.jonas.service.Service, and, thus should implement -the following methods:

    - - -

    It should also define a public constructor with no argument.

    - -

    These methods will be called by JOnAS for initializing, starting, and -stopping the service. Configuration parameters are provided to the -initialization method through a naming context. This naming context is built -from properties defined in the jonas.properties file as -explained in the following section.

    - -

    The Service class should look like the following:

    -
    package a.b;
    import javax.naming.Context;
    import javax.naming.NamingException;
    import org.objectweb.jonas.service.Service;
    import org.objectweb.jonas.service.ServiceException;
    .....
    public class MyService implements Service {
    private String name = null;
    private boolean started = false;
    .....
    public void init(Context ctx) throws ServiceException {
    try {
    String p1 = (String) ctx.lookup("jonas.service.serv1.p1");
    .....
    } catch (NamingException e) {
    throw new ServiceException("....", e);
    }
    .....
    }
    public void start() throws ServiceException {
    .....
    this.started = true;
    }
    public void stop() throws ServiceException {
    if (this.started) {
    this.started = false;
    .....
    }
    }
    public boolean isStarted() {
    return this.started;
    }
    public String getName() {
    return this.name;
    }
    public void setName(String name) {
    this.name = name;
    }
    }
    - -

    Modifying the jonas.properties file

    - -

    The service is defined and its initialization parameters specified in the -jonas.properties file. First, choose a name for the service -(e.g. "serv1"), then do the following:

    - - -

    This is illustrated as follows:

    -
      jonas.services                   .......,serv1
    jonas.service.serv1.class a.b.MyService
    jonas.service.serv1.p1 value
    - -

    Using the New Service

    -The new service has been given a name in jonas.properties. With -this name, it is possible to get a reference on the service implementation -class by using the ServiceManager method: getService(name). The -following is an example of accessing a Service: -
    import org.objectweb.jonas.service.ServiceException;
    import org.objectweb.jonas.service.ServiceManager;

    MyService sv = null;

    // Get a reference on MyService.
    try {
    sv = (MyService) ServiceManager.getInstance().getService("serv1");
    } catch (ServiceException e) {
    Trace.errln("Cannot find MyService:"+e);
    }
    - -

    Adding the class of the new service to JOnAS

    - -

    Package the class of the service into a .jar file and add the jar in the -JONAS_ROOT/lib/ext directory.
    -All the libraries required by the service can also be placed in this -directory.

    - -

    Advanced Understanding

    - -

    Refer to the JOnAS sources for more details about the classes mentioned in -this section.

    - -

    JOnAS built-in services

    - -

    The existing JOnAS services are the following:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Service nameService class
    registryRegistryServiceImpl
    ejbEJBServiceImpl
    webCatalinaJWebContainerServiceImpl / - JettyJWebContainerServiceImpl
    earEarServiceImpl
    dbmDataBaseServiceImpl
    jmsJmsServiceImpl
    jmxJmxServiceImpl
    jtmTransactionServiceImpl
    mailMailServiceImpl
    resourceResourceServiceImpl
    securityJonasSecurityServiceImpl
    ws
    -
    AxisWSService
    -
    - -

    If all of these services are required, they will be launched in the -following order: registry, jmx, security, -jtm,dbm,mail,jms,resource,ejb, ws, -web, ear.
    -jmx, security, dbm, mail, resource are -optional when you are using service ejb.

    - -

    registry must be launched first.
    -(Note that for reasons of compatability with previous versions of JOnAS, if -registry is unintentionally not set as the first service to launch, -JOnAS will automatically launch the registry service.)

    -
    -Note that dbm, jms, resource, and ejb depend on -jtm.
    -Note that ear depends on ejb and web (that provide the -ejb and web containers), thus these services must be launched before the -ear service.
    -Note that ear and web depends on ws, thus the ws service must be launched before the -ear and web service.
    -
    -It is possible to launch a stand-alone Transaction Manager with only the -registry and jtm services. - -

    A jonas.properties file looks like the following:

    -
      .....
    .....

    jonas.services registry,jmx,security,jtm,dbm,mail,jms,ejb,resource,serv1

    jonas.service.registry.class org.objectweb.jonas.registry.RegistryServiceImpl
    jonas.service.registry.mode automatic

    jonas.service.dbm.class org.objectweb.jonas.dbm.DataBaseServiceImpl
    jonas.service.dbm.datasources Oracle1

    jonas.service.ejb.class org.objectweb.jonas.container.EJBServiceImpl
    jonas.service.ejb.descriptors ejb-jar.jar
    jonas.service.ejb.parsingwithvalidation true
    jonas.service.ejb.mdbthreadpoolsize 10

    jonas.service.web.class org.objectweb.jonas.web.catalina.CatalinaJWebContainerServiceImpl
    jonas.service.web.descriptors war.war
    jonas.service.web.parsingwithvalidation true

    jonas.service.ear.class org.objectweb.jonas.ear.EarServiceImpl
    jonas.service.ear.descriptors j2ee-application.ear
    jonas.service.ear.parsingwithvalidation true

    jonas.service.jms.class org.objectweb.jonas.jms.JmsServiceImpl
    jonas.service.jms.mom org.objectweb.jonas_jms.JmsAdminForJoram
    jonas.service.jms.collocated true
    jonas.service.jms.url joram://localhost:16010

    jonas.service.jmx.class org.objectweb.jonas.jmx.JmxServiceImpl

    jonas.service.jtm.class org.objectweb.jonas.jtm.TransactionServiceImpl
    jonas.service.jtm.remote false
    jonas.service.jtm.timeout 60

    jonas.service.mail.class org.objectweb.jonas.mail.MailServiceImpl
    jonas.service.mail.factories MailSession1

    jonas.service.security.class org.objectweb.jonas.security.JonasSecurityServiceImpl

    jonas.service.resource.class org.objectweb.jonas.resource.ResourceServiceImpl
    jonas.service.resource.resources MyRA

    jonas.service.serv1.class a.b.MyService
    jonas.service.serv1.p1 John
    - -

    The ServiceException

    - -

    The org.objectweb.jonas.service.ServiceException exception is -defined for Services. Its type is java.lang.RuntimeException. -and it can encapsulate any java.lang.Throwable.

    - -

    The ServiceManager

    - -

    The org.objectweb.jonas.service.ServiceManager class is -responsible for creating, initializing, and launching the services. It can -also return a service from its name and list all the services.

    - - diff --git a/jonas_doc/core/olddoc/ant-ejbjar.html b/jonas_doc/core/olddoc/ant-ejbjar.html deleted file mode 100644 index 854fb237edfff6951c13a10c56d75c93a100f7cb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/ant-ejbjar.html +++ /dev/null @@ -1,477 +0,0 @@ - - - - - - - EJB Tasks - - - -

    Ant EJB Tasks User Manual

    - -

    New JOnAS (Java Open Application -Server) element for the current JOnAS version

    - -

    The <jonas> nested element uses the -GenIC-specific tool to build JOnAS-specific stubs and skeletons -and construct a JAR file which may be deployed to the JOnAS Application -Server. The build process will always determine if the EJB stubs/skeletons -and the EJB-JAR file are up to date, and it will perform the minimum amount -of work required.

    - -

    A naming convention for the EJB descriptors is most commonly used to -specify the name for the completed JAR file. For example, if the EJB -descriptor ejb/Account-ejb-jar.xml is located in the descriptor -directory, the <jonas> element will search for a -JOnAS-specific EJB descriptor file named -ejb/Account-jonas-ejb-jar.xml, and a JAR file named -ejb/Account.jar will be written in the destination directory. -The <jonas> element can also use the JOnAS naming -convention. Using the same example, the EJB descriptor can also be named -ejb/Account.xml (no base name terminator here) in the descriptor -directory. The <jonas> element will then search for a -JOnAS-specific EJB descriptor file called ejb/jonas-Account.xml. -This convention does not strictly follow the ejb-jar naming convention -recommendation, but it is supported for backward compatibility with previous -version of JOnAS.

    - -

    Note that when the EJB descriptors are added to the JAR file, they are -automatically renamed META-INF/ejb-jar.xml and -META-INF/jonas-ejb-jar.xml.

    - -

    Furthermore, this naming behaviour can be modified by specifying -attributes in the ejbjar task (for example, basejarname, basenameterminator, -and flatdestdir) as well as the iplanet element (for example, suffix). Refer -to the appropriate documentation for more details.

    - -

    Parameters:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    AttributeDescriptionRequired
    destdirThe base directory into which the generated JAR files - will be written. Each JAR file is written in directories which - correspond to their location within the "descriptordir" - namespace.Yes
    jonasrootThe root directory for JOnAS.Yes
    jonasbaseThe base directory for JOnAS. If omitted, it defaults - to jonasroot.No
    classpathThe classpath used when generating EJB stubs and - skeletons. If omitted, the classpath specified in the "ejbjar" parent - task will be used. If specified, the classpath elements will be - prefixed to the classpath specified in the parent "ejbjar" task. A - nested "classpath" elements can also be used. Note that the needed - JOnAS JAR files are automatically added to the classpath.No
    keepgeneratedtrue if the intermediate Java source - files generated by GenIC must not be deleted. If omitted, it defaults - to false.No
    nofastrmicif true, the external RMIC compiler is used - by GenIC. The default is false, which means the internal - fast RMIC compiler is used.No
    nocompiltrue if the generated source files must - not be compiled via the java and rmi compilers. If omitted, it - defaults to false.No
    novalidationtrue if the XML deployment descriptors - must be parsed without validation. If omitted, it defaults to - false.No
    javacJava compiler to use. If omitted, it defaults to the - value of build.compiler property.No
    javacoptsOptions to pass to the java compiler.No
    protocolsComma-separated list of protocols (chosen within - jeremie, jrmp, iiop, cmi) for which stubs should be generated. - Default is jrmp,jeremie.No
    rmicoptsOptions to pass to the rmi compiler.No
    verboseIndicates whether or not to use -verbose switch. If - omitted, it defaults to false.No
    additionalargsAdd additional args to GenIC.No
    keepgenerictrue if the generic JAR file used as - input to GenIC must be retained. If omitted, it defaults to - false.No
    suffixString value appended to the JAR filename when creating each JAR. - If omitted, it defaults to ".jar".No
    nogenicIf this attribute is set to true, JOnAS's - GenIC will not be run on the EJB JAR. Use this if you prefer to run - GenIC at deployment time. If omitted, it defaults to - false.No
    jvmoptsAdditional args to pass to the GenIC JVM.No
    invokecmdIf this attribute is set to true, GenIC will - use the Javac sun class to avoid using 'javac' command line. This is - useful for users getting 'java.io.Exception CreateProcess' because of too - long command lines. Defaults to false.No
    - -

    As noted above, the jonas element supports additional <classpath> -nested elements.

    - -

    Examples

    - -

    -Note : To avoid java.lang.OutOfMemoryError, the element -jvmopts can be used to change the default memory usage. -

    - -

    This example shows ejbjar being used to generate deployment jars using a -JOnAS EJB container. This example requires the naming standard to be used for -the deployment descriptors. Using this format creates a EJB JAR file for each -variation of  '*-jar.xml' that is located in the deployment descriptor -directory. 

    -
          <ejbjar srcdir="${build.classes}"
    -              descriptordir="${descriptor.dir}">
    -        <jonas destdir="${deploymentjars.dir}"
    -               jonasroot="${jonas.root}"
    -               protocols="jrmp,iiop"/>
    -        <include name="**/*.xml"/>
    -        <exclude name="**/jonas-*.xml"/>
    -        <support dir="${build.classes}">
    -             <include name="**/*.class"/>
    -        </support>
    -      </ejbjar>
    - -

    This example shows ejbjar being used to generate a single deployment jar -using a JOnAS EJB container. This example does require the deployment -descriptors to use the naming standard. This creates only one ejb jar file - -'TheEJBJar.jar'.

    -
          <ejbjar srcdir="${build.classes}"
    -              descriptordir="${descriptor.dir}"
    -              basejarname="TheEJBJar">
    -        <jonas destdir="${deploymentjars.dir}"
    -               jonasroot="${jonas.root}"
    -               suffix=".jar"
    -               protocols="${genic.protocols}"/>
    -        <include name="**/ejb-jar.xml"/>
    -        <exclude name="**/jonas-ejb-jar.xml"/>
    -      </ejbjar>
    - - -

    GenIC Ant Task

    - -

    Why is there a new task?

    - -

    Previous versions of the JOnAS EjbJar Ant task have some -limitations—especially when you are developing webservices.

    - -

    In previous versions of JOnAS, jonas-ejb-jar constructed the JAR for you, using -information gathered from the ejb-jar.xml and from the classes themselves -(dependencies using BCEL). -But if you have a Session Bean exposed as a webservice, -you want to have more files in your archive (webservices.xml, -JAX-RPC mapping file, WSDL + imported WSDL -definitions + imported XML Schema).

    - -

    The older task did not package these files inside the archive, and -therefore, when GenIC loaded the descriptors, some dependencies were -missing, causing GenIC to throw an exception.

    - -

    The solution is to let the developer create the JAR file, so that -the exact content of the file can be controlled.

    - -

    The file should have at least the following content: -

    - - - -

    Notice that webservices files are optional. -

    - -

    Task Attributes

    - -

    The genic task supports most attributes of the -jonas-ejb-jar task.

    - -

    Differences:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    AttributeDescriptionRequired
    jonasrootThe root directory for JOnAS.Yes (Can be read from ${jonas.root} property if not set)
    jonasbaseThe base directory for JOnAS. If omitted, it defaults - to jonasroot.No
    keepgeneratedtrue if the intermediate Java source - files generated by GenIC must not be deleted. If omitted, it defaults - to false.No
    nofastrmicif true, the external RMIC compiler is used - by GenIC. The default is false, which means the internal - fast RMIC compiler is used.No
    nocompiltrue if the generated source files must - not be compiled via the Java and RMI compilers. If omitted, it - defaults to false.No
    validationtrue if the XML deployment descriptors - must be parsed with validation. If omitted, it defaults to - true.No
    javacJava compiler to use. If omitted, it defaults to the - value of build.compiler property.No
    javacoptsOptions to pass to the Java compiler.No
    protocolsComma-separated list of protocols (chosen from - jeremie, jrmp, iiop, cmi) for which stubs should be generated. - Default is jrmp,jeremie.No
    rmicoptsOptions to pass to the RMI compiler.No
    verboseIndicates whether or not to use -verbose switch. If - omitted, it defaults to false.No
    additionalargsAdd additional arguments to GenIC.No
    jvmoptsAdditional arguments to pass to the GenIC JVM.No
    jvmdebugIndicates whether you want to debug the forked JVM; it - defaults to false. The JVM will be suspended and waiting - a connection on port 12345.No
    invokecmdIf this attribute is set to true, GenIC will - use the Javac sun class to avoid using 'javac' command line. This is - useful for users getting 'java.io.Exception CreateProcess' because of too - long command lines. Defaults to false.No
    - -

    - - - - - - - - - - - - - - - - - - - - -
    Nested ElementDescriptionRequired
    classpathThe additional classpath entries used when generating EJB stubs and - skeletons.No
    filesetPoints out the ejb-jars that will be processed by GenIC. - Note that you can add as many filesets as you want (useful if - your JARs are in different directories).Yes (at least 1)
    - -

    Example:

    - -
      -
    1. First, define this new task: -
      <taskdef name="genic"
      -    classname="org.objectweb.jonas.ant.GenICTask"
      -    classpath="${jonas.root}/lib/common/ow_jonas_ant.jar" />
      -
      -
    2. - -
    3. Then use it: - -
        -
      1. Create the JAR file : -
        -<jar destfile="${temp.ejbjars.dir}/my-ejbjar.jar">
        -    <metainf dir="${etc.dir}/META-INF" />
        -
        -    <fileset dir="${classes.dir}">
        -        <include name="org/objectweb/jonas/myejbjar/*.class" />
        -    </fileset>
        -</jar>
        -
        -
      2. - -
      3. Process this JAR with the GenIC task : -
        -<genic keepgenerated="true"
        -       protocols="${protocols.names}">
        -
        -    <fileset dir="${temp.dir}">
        -        <include name="ejbjars/my-ejbjar.jar" />
        -    </fileset>
        -</genic>
        -
        -
      4. - -
      - -
    4. -
    - - diff --git a/jonas_doc/core/olddoc/clusterd.html b/jonas_doc/core/olddoc/clusterd.html deleted file mode 100644 index 030e0074310760357d10e8303eeffc6f6a0dfedf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/clusterd.html +++ /dev/null @@ -1,319 +0,0 @@ - - - - - - - Cluster daemon - - - - -

    Cluster Daemon

    - -

    Introduction

    - -

    The intent of the cluster daemon is to enable the remote control of the JOnAS clustered -instances through a JMX interface.

    - -

    In a cluster configuration, the cluster daemon is the bootstrap of the JOnAS instances.

    - -

    There is at least one cluster daemon instance per machine.

    - -

    Cluster daemon

    - -

    Configuration

    - -

    In the same manner as a classic JOnAS instance, the cluster daemon reads its configuration -in a directory pointed to by a JONAS_BASE variable (or JONAS_ROOT if JONAS_BASE is not set). -All the default JONAS_BASE subdirectories and files are not required; the mandatory ones are:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    elementdescription
    $JONAS_BASE/confConfiguration directory
    $JONAS_BASE/logsLog directory
    $JONAS_BASE/conf/carol.propertiesCarol configuration file describing the protocol and its parameters (used for the JMX interface)
    $JONAS_BASE/conf/trace.propertiesTrace/Error log configuration file
    $JONAS_BASE/conf/jonas.propertiesThis file must be present for enabling the cluster daemon starting but - its content is not read, the file can be empty -
    $JONAS_BASE/conf/clusterd.xmlCluster daemon configuration file, lists the local JOnAS instances and describes - their environment (see below)
    - -

    clusterd.xml

    - -

    The JOnAS instances controlled by a cluster daemon are configured in the clusterd.xml file.

    - -
    -
    -<?xml version="1.0"?>
    -<cluster-daemon xmlns="http://www.objectweb.org/jonas/ns"
    -	  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    -	  xsi:schemaLocation="http://www.objectweb.org/jonas/ns
    -	  http://www.objectweb.org/jonas/ns/jonas-clusterd_4_8.xsd">
    -
    -   <name>cd1</name>
    -   <domain-name>domainSample</domain-name>
    -   <jonas-interaction-mode>loosely-coupled</jonas-interaction-mode>
    -
    -   <server>
    -      <name>node1</name>
    -      <description>Web instance</description>
    -      <java-home>/usr/java/jdk-ia32/sun/j2sdk1.4.2_10</java-home>
    -      <jonas-root>/home/pelletib/pkg/jonas_root_sb48</jonas-root>
    -      <jonas-base>/home/pelletib/tmp/newjc48/jb1</jonas-base>
    -      <xprm></xprm>
    -      <auto-boot>false</auto-boot>
    -      <jonas-cmd></jonas-cmd>
    -   </server>
    -
    -...
    -
    -</cluster-daemon>
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    elementdescription
    nameCluster daemon instance name. Used for building the connector url.
    domain-nameDomain name to use for launching the JOnAS instance when it is not specified in the start command
    jonas-interaction-modeStarting mode of the JOnAS instances: loosely-coupled corresponds to background and tighly-coupled - corresponds to foreground
    server/nameName of the JOnAS instance
    server/descriptionDescription of the JOnAS instance
    server/java-homeJDK home directory to use for launching the JOnAS instance
    server/jonas-rootJOnAS binaries directory to use for launching the JOnAS instance
    server/jonas-baseJOnAS configuration directory to use for launching the JOnAS instance
    server/xprmsJVM parameters to set when launching the JOnAS instance
    server/auto-bootIf true, start the JOnAS instance when launching the cluster daemon
    server/jonas-cmdOptional parameter. If set, specifies the script to use for starting/stopping the JOnAS instance. This user script can set the required environnement and perform some pre or post processing. By default, the jonas command is used.
    - -

    domain.xml

    - -

    The cluster daemons must be specified and associated to the JOnAS instances in the domain.xml file -for permitting the remote control of the cluster.

    - -
    -...
    -<cluster-daemon>
    -   <name>cd1</name>
    -   <description>cluster daemon 1</description>
    -   <location>
    -      <url>service:jmx:rmi://host/jndi/rmi://host:port/jrmpconnector_cd</url>
    -   </location>
    -</cluster-daemon>
    -...
    -<server>
    -  <name>node1</name>
    -  <cluster-daemon>cd1</cluster-daemon>
    -  ...
    -</server>
    -...
    -
    - -

    The JMX remote url of the cluster daemon adheres to the following syntax:

    -

    service:jmx:rmi://host/jndi/rmi://host:port/protocolconnector_name - with the following meanings:

    - - -

    Running the Cluster Daemon

    - -

    The cluster daemon is started using the command jclusterd. The possible options are:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    optiondescription
    startStart the cluster daemon. -
    stopStop the cluster daemon. -
    -DdomainNameDomain name to use for starting the JOnAS instance. This value is used when it is defined both here and in the clusterd.xml file. -
    -carolFile <my-carol.properties>Path to the carol.properties file to use. If not specified, the file is loaded from $JONAS_BASE/conf. - If the file is not found, the default values (localhost, 1806, irmi) are used.
    -confFile <my-clusterd.xml>Path to the clusterd.xml file to load. If not specified, the file is loaded from $JONAS_BASE/conf.
    - -

    JMX Interface

    - -

    The cluster daemon provides a JMX interface that enables control of the JOnAS instances. The following operations are -available:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    OperationDescription
    String getServersList()Return the list of JOnAS instances
    int pingJOnAS(String name)Ping a JOnAS instance identified by its name
    void startJOnAS(String name)Start a JOnAS instance identified by its name
    String startAllJOnAS(String domainName, String prm)Start all the JOnAS instances known in the cluster daemon configuration. - The parameter domainName (optional) enables the ability to specifiy the domain name. - The parameter prm (optional) enables the ability to set some JVM parameters. -
    void stopJOnAS(String name)Stop a JOnAS instance identified by its name
    String stopAllJOnAS()Stop all the JOnAS instances known in the cluster daemon configuration
    String getJavaHome4Server(String name)Get the JAVA_HOME defined for a JOnAS server
    String getJonasRoot4Server(String name)Get the JONAS_ROOT defined for a JOnAS server
    String getJonasBase4Server(String name)Get the JONAS_BASE defined for a JOnAS server
    void reloadConfiguration()Reload the configuration file of the cluster daemon
    void addServer(String name, String description, String javaHome, String jonasRoot, String jonasBase)Add a definition of a JOnAS instance to the cluster daemon configuration. The change is saved in the - configuration file.
    void removeServer(String name)Remove a definition of a JOnAS instance in the cluster daemon configuration. The change is saved in the - configuration file.
    void modifyServer(String name, String description, String javaHome, String jonasRoot, String jonasBase)Modify the definition of a JOnAS instance in the cluster daemon configuration. The change is saved in the - configuration file.
    - - - - diff --git a/jonas_doc/core/olddoc/clustering.html b/jonas_doc/core/olddoc/clustering.html deleted file mode 100644 index 997e876d50e6bd9609b051ba6cb807878ed4f414..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/clustering.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - Clustering guide - - - - -

    Clustering Guide

    - -

    Introduction

    - -

    JOnAS provides a full solution for clustering that ensures high availability and -scalability of J2EE applications.

    - - -

    The Howto document JOnAS clustering -is a guide for configuring the clustering features of JOnAS.

    - -

    Cluster management is described in Domain and Cluster Management in -JOnAS chapter.

    - -

    Clustering : end to end solution

    - - diff --git a/jonas_doc/core/olddoc/common.css b/jonas_doc/core/olddoc/common.css deleted file mode 100644 index 6cf7e7d67212c268d7a64ef3ddc821883a08c2f4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/common.css +++ /dev/null @@ -1,228 +0,0 @@ -/* - JOnAS css. based on http://jonas.objectweb.org/common.css - Use a local css as it is distributed with JOnAS binary packages. -*/ - -body -{ - background-color: #FFFFFF; - margin: 10px; - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; -} - -/*HTML elements */ - - -select, input { font-size: 10px; } - -form -{ - padding: 0px 0px 0px 0px; - margin: 0px 0px 3px 0px; -} - -.contenu { padding: 0px 30px 0px 0px; } - - -h1 -{ - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 22px; - line-height: 27px; - font-weight: bold; - border-color: #99C; - border-width: 0 0 4px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; -} - -h2 -{ - color: #99C; - font-family: Arial, Helvetica, sans-serif; - font-size: 20px; - line-height: 27px; - font-weight: normal; - border-color: #E06611; - border-width: 0 0 4px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} - -h3 -{ - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 27px; - font-weight: bold; - border-color: #E8EAF0; - border-width: 0 0 2px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} -h4 -{ - color: #99C; - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 24px; - font-weight: normal; - border-color: #E8EAF0; - border-width: 0 0 2px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} -h5 -{ - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 24px; - font-weight: normal; - border-color: #E8EAF0; - border-width: 0 0 2px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} -h6 -{ - color: #99C; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 22px; - font-weight: normal; - border-color: #E8EAF0; - border-width: 0 0 2px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} - -td -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - font-weight: normal; -} - -p -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; - margin: 10px 10px 5px 0px; -} - -p.error -{ - color: red; -} - - -a -{ - color: #3F3975; - background-color: transparent; - text-decoration: underline; -} - -a:visited -{ - color: #9898CB; - background-color: transparent; - text-decoration: underline; -} - -a:hover -{ - color: #E06611; - background-color: transparent; - text-decoration: underline; -} - - -a:active -{ - color: #FFFFFF; - background-color: #E06611; - text-decoration: underline; -} - -blockquote -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 11px; - line-height: 15px; - font-weight: normal; - margin: 20px 0px 5px 0px; -} - - -ul, ol, dl -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; -} -dt -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: bold; -} -dd -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 11px; - line-height: 16px; - font-weight: normal; - margin: 0px 0px 0px 20px -} -address -{ - color: black; - font-family: Arial, Helvetica, sans-serif; - font-style: normal; - font-size: 10px; - line-height: 16px; - border-width: 4px 0 0 0; - border-style: solid none none none; - border-color: #E06611; - margin: 30px 0px 20px 0px; - padding: 10px 0px 0px 0px; - -} -code, pre -{ - color: #433C7B; -} - -th -{ - font-family: Arial,Helvetica, sans-serif; - font-size: 14px; - line-height: 15px; - color: #433C7B; - font-weight: bold; - background-color: #E8EAF0; - padding: 2px; -} diff --git a/jonas_doc/core/olddoc/howto/Clustering.html b/jonas_doc/core/olddoc/howto/Clustering.html deleted file mode 100644 index 94047cc8d1cf6820dd0cf93504147d3f09a12a11..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/Clustering.html +++ /dev/null @@ -1,929 +0,0 @@ - - - - - - -Clustering with JOnAS - - - - -
    -

    Howto: Clustering with JOnAS

    -


    -Authors : Georges Goebel, Marc Calvisi, Rod Schultz, Jerome Pioux, Benoit Pelletier
    -October 16, 2006
    -Version : 3.2
    -

    -

     

    -

    Introduction

    -

    Architecture

    -

            -Used symbols 

    -

            -Load balancing at web level with -mod_jk

    -

            -Session Replication at web level

    -

            -Load Balancing at EJB level

    -

            -Session Replication at EJB level

    -

            -Clustering databases with -C-JDBC

    -

    SampleCluster2 Practical Example

    -

            -Products Installation

    -

                    -Installing Java, Ant and JOnAS / Tomcat

    -

                    -Installing Apache

    -

                   -Installing the JK Module

    -

            -Configuring the network

    -

            -Configuring the Cluster

    -

                    -Configuring the JOnAS nodes

    -

                    -Configure the WebApp

    -

                    -Database Concurrent Access

    -

            -SampleCluster2 Deployment

    -

                    -Directory Structure

    -

                    -Compiling sampleCluster2

    -

            -Running sampleCluster2

    -

                    -Description of the sampleCluster2 Web -Interface

    -

    References

    -

     

    -

     

    -
    -

    Introduction

    -

     

    -

    This guide describes how to configure Apache, Tomcat, and JOnAS -to install a cluster.

    -

    Clustering with JOnAS uses the following:

    - -

    This document describes one architecture with all the clustering -functionalities available in JOnAS, the configuration of -architectures integrating one of those functionalities, and other -possible configurations.

    -

    For hands-on practice, this document uses the sampleCluster2 -JOnAS example.

    -

     

    -
    -

    Architecture

    -

    The architecture shown in the following illustration provides -all the clustering functionality available in JOnAS: 1) Apache as the -front-end HTTP server, 2) JOnAS/Tomcat as the J2EE Container, and 3) a shared database.

    -

    This architecture provides:

    - -

    - At the Servlet / JSP level, the mod_jk plug-in -provides Load Balancing / High Availability and the -Tomcat-Replication module provides Failover.
    - At the EJB level, the CMI protocol and JNDI replication provides Load Balancing / High Availability.  -Replication of Stateful EJBs provides failover.
    - The database is shared by the JOnAS servers.

    -

    The sampleCluster2 application, presented later in this document, can be deployed on such an architecture.

    -

    -"architecture"

    -
    -

    Used - symbols

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    -

    node

    -

    A node (computer) that hosts one or more servers 

    -

     

    -

     

    -

    WebCont

    -

    A web container

    -

    EJBCont

    -

    An ejb container

    -

    JOnASWeb

    -

    A JOnAS instance that hosts a web container

    -

    JOnASEJB

    -

    A JOnAS instance that hosts an ejb container

    -

    FullJOnAS

    -

    A JOnAS instance that hosts a web container and an ejb -container

    -

     

    -

     

    -

    Apache

    -

    An Apache server with the mod_jk module

    -

     

    -

     

    -

     

    -

     

    -

    Load - balancing at web level with mod_jk

    -

    The following illustration describes how Apache, mod_jk, and -JOnAS/Tomcat Containers interact:

    -

    archi1

    -

    This example uses mod_jk, but an alternative configuration -using Enhydra Director -is also possible. (see -config)

    -

    Mod_jk is a plug-in (module) that handles the communication and -load balancing between Apache and Tomcat.

    -

    Mod_jk uses the concept of worker.  A worker is a Tomcat instance -that is running to perform servlet requests coming from the web -server.  Each worker is identified to the web server by the host on -which it is located, the port where it listens, and the -communication protocol that is used to exchange messages.

    -

    AJP13 is the preferred TCP/IP sockets protocol that mod_jk uses -for communicating between the web server and Tomcat workers.

    -

    In this configuration there is one worker for each Tomcat -instance and one worker (this -is a specific worker with no host and no port number) that will handle the load balancing.  -All workers -are defined in a file called worker.properties.

    -

    Note: this module can also be used for site partitioning.

    -

     

    -
    -

    Session - Replication at web level

    -

    The following illustration shows that the HTTP session replication -feature has been added to the architecture:

    -

    archi2

    -

    The term "session replication" is used when the current service -state is being replicated across multiple application instances.  Session replication occurs when the information stored in an -HttpSession is replicated from, in this example, one servlet engine -instance to another.  This could be almost any type of data, such as items contained in -a shopping cart or information being entered on an insurance -application.  Anything being stored in the session must be -replicated for the service to failover without a disruption.

    -

    The solution chosen for achieving Session replication is called -all-to-all replication.  Tomcat uses a proprietary protocol based on -TCP for the all-to-all replication.

    -

     

    -
    -

    Load - Balancing at EJB level

    -

    The following illustration shows that load balancing at EJB -level is now included in the architecture:

    -

    archi3

    -

    CMI is a new ORB used by JOnAS to provide clustering for load -balancing and high availability.  It provides replication of the -JNDI registries among all EJB containers.  Several instances of -JOnAS can be started together in a cluster to share their EJBs.  It -is possible to start the same EJB on each JOnAS, or to distribute -their load.  A URL referencing several JOnAS instances can be -provided to the clients.  At lookup time, a client randomly chooses -one of the available servers to request the required bean.  Each -JOnAS instance has the knowledge (through JGroups) of the -distribution of the Beans in the cluster.  An answer to a lookup is -a special clustered stub, containing stubs to each instance known -in the cluster.  Each method call on the Home (or Remote for the SSB) -of the bean can be issued by the stub to a new instance in order to balance the load on the -cluster.  The default algorithm used for load distribution is -currently a weighted round robin with local preference.

    - -

    Session Replication at EJB level

    -

    The following illustration shows that the EJB session replication -feature has been added to the architecture:

    -

    archi3

    -

    The term "session replication" is used when the current service -state is being replicated across multiple application instances.  -Session replication occurs when the information stored in an SFSB state -is replicated from, in this example, one EJB container -instance to another.  This could be almost any type of data (that is serializable), -such as items contained in -a shopping cart or information being entered on an insurance -application.  Anything being stored in the session must be -replicated for the service to failover without a disruption.

    -

    The solution chosen for achieving Session replication is based on a horizontal -approach implemented both through CMI and the JOnAS's ha service. -See here for more detailed information

    -
    -

    Clustering - databases with C-JDBC

    -

    With C-JDBC it is possible to cluster databases. Refer to - -HowTo setup a C-JDBC Database.

    -

     

    -
    -

    SampleCluster2 Practical Example

    -

    sampleCluster2 is an application that demonstrates the clustering features. -A jsp/servlet follows the requests movements across the cluster. -As shown in the illustration below, it can be deployed over four -JOnAS instances.  Two -have WEB containers and the other two have EJB containers.

    -

    archi5

    -

    The application is composed of three EJBs: a stateful session bean, a stateless -session bean, and an entity bean.  These EJBs are instantiated by the web interface.  -When the user connects to the web interface for the first time, an HTTP session is created.  -During this process a -stateful session bean is created in one of the JOnAS nodes where -the EJB container is started.  The handle of this stateful session -bean is added to the HTTP session (see note).  Next, the web -interface creates a new instance of the stateless session bean.  The -first time, no entity bean is created.  The useful information from -the stateless session bean (JOnAS node name, number of instances) -is set in the stateful session bean.

    -

    The user can see the result in the web interface where all the -necessary information is displayed.  The user should now execute the -same servlet several times in order to see the changes made by the -cluster.  Each time the servlet is executed, it may be -executed on a different node (JOnAS with web container).

    -

    The servlet gets a reference to the stateful session bean -(through the handle). After that, a new stateless session bean is -created and its information is passed to the stateful session bean.  On -every tenth instantiation of the stateless session bean, an entity bean is created.

    -

    However,  the stateless session bean may be instantiated in a -different EJB container than the stateful session bean.  This -sample uses local interfaces between the stateless session bean -and the entity bean.  As a result, the entity bean is created in the -same EJB container as the stateless session bean.

    -

    The entity bean writes the time and the name of the node in the -database.

    -

    Note:   The handle enables getting a reference to the stateful session bean -when the JVM has changed.

    -

    See also description of the -SampleCluster2 Web interface for a description of using sampleCluster2 to -demonstrate cluster features.

    -

     

    -
    -

    Product Installation

    -

    This section provides information about installing JOnAS /Tomcat, Apache, mod_jk.

    -

    The versions assumed here are: JOnAS 4.8.x /Tomcat 5.5.x, Apache -2.2.x, and mod_jk 1.2.15 (or later).

    -
      -
    1. Logon as any user <user> on the host <hostname> -that will run the cluster.
      - Note that you do not need to be ‘root’ to -perform any of these steps or to run the cluster.
      -
      -
    2. -
    3. Enter  mkdir cluster
      - to make a directory in which the -supporting software (apache…) will be installed and the cluster will be - deployed (in the next section also).
      -
      -
    4. -
    5. Enter  cd cluster
      - to change directory to cluster.
    6. -
    -
    -

    Installing Java, Ant, and JOnAS / - Tomcat

    -

    Perform steps one through three in -Installing JOnAS with a web container from scratch.

    -

    Linux Notes:

    - -

    export JAVA_HOME=<location where java was installed>

    -

    export ANT_HOME=<location where ant was installed>

    -

    export JONAS_ROOT=$HOME/cluster/JONAS_4_8_3

    -

    export PATH=$PATH:$JAVA_HOME/bin:$ANT_HOME/bin

    -

    Windows Notes:

    - -

    JAVA_HOME   <location where java was -installed>

    -

    ANT_HOME       <location where ant was -installed>

    -

    -JONAS_ROOT                   -c:\cluster\JONAS_4_8_3

    -

    Add to PATH   ;$JAVA_HOME/bin;$ANT_HOME/bin

    -

     

    -

    Installing Apache

    -
    -

    -Install Apache HTTP server  from -source on linux
    -

    For this sample, Apache will run as <user> (rather than -'root').
    -Below, <prefix> refers to the install folder for Apache.
    -This sample uses prefix = $APACHE_HOME= -$HOME/cluster/apache2.

    -
      -
    1. Download under cluster, the Apache server tarball source code -from the Apache -site.
      -Extract the source code.
      - tar xvfz httpd-2_0_XX.tar.gz
      -
      -
    2. -
    3. Choose an available listen -port above 1024 (since this is not being run as ‘root’).
      - This sample uses 8080. To verify that it is unused, use the following command.
      - -netstat -an | grep 8080
      -
      -
    4. -
    5. Configure, compile, and install.
      - -cd $HOME/cluster/httpd-2.2.0
      -./configure -–-prefix=$HOME/cluster/apache2 --with-port=8080

      - -make
      -make install
      - -
      -
      -
      Note: The $HOME/cluster/apache2/conf/httpd.conf file may need to be edited to change the "User" and "Group" lines to match the desired user and group.

    6. -
      Note: A binary version is also available at the Apache -site. -
    -

    Run and Stop Apache HTTP server to verify the installation.

    -
      -
    1. Run Apache HTTP server.
      - -<prefix>/bin/apachectl start
      -
      -
    2. -
    3. Verify at least one httpd process is running.
      -ps -ef | grep httpd
      -
      -
    4. -
    5. Verify that there is a listener.
      - -netstat -an | grep 8080
      -

      -
    6. -
    7. Use a web browser to connect to -http://<hostname>:8080
      -Check that apache returns the string ‘It -Works!
      -
      -
    8. -
    9. Stop Apache HTTP server for now – it will be restarted -later after the JOnAS instances have been started.
      - -<prefix>/bin/apachectl stop
    10. -
    -

    Notes:

    - -
    -
    Installing the Apache Server on -Windows
    -<prefix> is the install folder for Apache.  By default, it -is C:\Program Files\Apache Group. -
      -
    1. Download the Apache HTTP installer from the Apache site.
      -
      The current version is apache_2.0.55-win32-x86-no_ssl.msi.
      -
      -
    2. -
    3. Choose a Listen port, for example, 8080
      -
      -
    4. -
    5. Enter  netstat -an  to verify it is unused. 
      - If either -port 80 or 8080 is not available, the -<prefix>\Apache2\conf\http.conf file must be edited after -installation. 
      - Edit the line 'Listen 8080'.
      -
      -
    6. -
    7. Install by running the installer.
      - The installer creates an 'Apache HTTP Server' group in the Start -Menu.
    8. -
    -

    Run and Stop Apache HTTP server:

    -
      -
    1. Select  StartMenu -> Programs -> -Apache HTTP Server -> Control Apache Server --- Start Apache Server in Console.
      -
      -
    2. -
    3. Open 'Task Manager', select 'Applications', verify 'Start -Apache in Console' is running.
      -
      -
    4. -
    5. Enter netstat -an  to verify that there is a - listener.
      -
      -
    6. -
    7. Stop Apache HTTP server.
      -
      -
    8. -
    9. - Click on exit button on the windows title bar.
      -
      -
    10. -
    -

    For further information about installing Apache HTTP server -please refer to the Apache -Site.

    -

     

    -
    -

    Installing - the JK Module

    -

    Mod_jk will be installed in the same <user> account as -Apache.

    -
    -
    Install mod_jk connector from source -on linux
    -
      -
    1. Download under cluster, the mod_jk tarball source code from the -Tomcat Site.
      -Extract the source code.
      - -tar xvfz jakarta-tomcat-connectors-1-2-15-src.tar.gz
      -
      -
    2. -
    3. Configure, compile and install.
      - -cd $HOME/cluster/jakarta-tomcat-connectors-1.2.15-src/native
      -./configure –-prefix=$APACHE_HOME --with-apxs=$APACHE_HOME/bin/apxs
      -make - -
      -
      -make install -
    4. -
    -

    A mod_jk.so file should now have been created under $APACHE_HOME/modules.
    -The process for making apache aware of this new file will be performed in the -next chapter.
    -
    -Note: For some distributions, a binary version may be -available at the Tomcat  site.

    -

    For further installation information, refer to the -Tomcat -Site.

    -
    Install mod_jk connector on Windows
    -
      -
    1. Download the mod_jk connector.
      -
      - - Connect to the following url in a browser
      -      -http://tomcat.apache.org/download-connectors.cgi
      - - - Select the browse download area link. This will take you to a -mirror site.
      - - Select jk
      - - Select binaries
      - - Select win32
      - - Select  jk-1.2.15
      - - Select mod_jk-apache-2.0.55.so to start the download.
      -
      -
    2. Copy the downloaded file to <prefix>/apache2/modules.
      -
      -
    3. -
    4. Rename the file mod_jk.so.
    5. -
    -  -

    For further - installation information, refer to the Tomcat - Site.

    -

     

    -
    -

    Configuring the network

    -
    -

    -The localhost must be mapped to a non lookback IP by editing the hosts file: either /etc/hosts in a linux system or c:/Windows/system32/etc/hosts for -the Windows OS. -

    -
    - -

    Configuring the Cluster

    - -

    Configuring the JOnAS nodes

    - -
    The cluster configurations can be built either manually or automatically by the newjc tool provided with JOnAS. Note that this tool -is tailored for quickly generating a cluster configuration collocated to a single machine. If the cluster is spanned over several machines, either -the configuration can be manually created from scratch or it can be generated by newjc. Then it must be modified to take into account -the distributed aspects. Both methods are described below.
    - - - -

    Configure the WebApp

    -

    Note: A WebApp deployed into a Cluster must have a -special distributable element set in its WEB-INF/web.xml.
    -The following is an example of a web.xml deployment descriptor: -

    -

    <web-app . . .>
    -  . . .
    -  <distributable />
    -  . . .
    -</web-app>

    -

    Please carefully read the - -Tomcat Clustering Guide for additional information.

    - -

    Database - Concurrent Access

    -

    Note: For sampleCluster2, in the JOnAS-specific deployment -descriptor, tag shared is set to true for the entity beans involved.  When this flag is set to true, multiple instances of the same -entity bean in different JOnAS servers can access a common database -concurrently.

    -

    The following is an example of a deployment descriptor generated by newjc with the -flag shared set to true. Deployment descriptors are in jonas_ejb_jar.xml in the ejbs.jar file in sampleCluster2.ear.

    -

    <jonas-ejb-jar>
    -  <jonas-entity>
    -           . -. .

    -

        -<shared>true</shared>
    -           . -. .

    -

      </jonas-entity>
    -</jonas-ejb-jar>

    -

     

    -
    -

    SampleCluster2 Deployment

    -
    -

    Directory - Structure:

    -

    sampleCluster2 is located under -$JONAS_ROOT/examples/sampleCluster2.

    -

    /lib     libraries needed by the aplication -to run

    -

    /output  generated ear, jar, war files

    -

    /src         source code

    -
    -

    Compiling sampleCluster2:

    -
      -
    1. Logon as user <user>.
      -Make sure this user has the Java, Ant, and JOnAS environment set -(from the above installation).
      -
      -
    2. -
    3. cd $JONAS_ROOT/examples/sampleCluster2
      -
      -
      -
    4. -
    5. export JONAS_BASE=$HOME/cluster/jb1
      -to set JONAS_BASE for the first instance.
      - -
      -
      -
    6. -
    7. ant install
      -

      -As a result, the application file sampleCluster2.ear is copied to -the $JONAS_BASE/apps/autoload directory for the first instance.
      -Since the ear is copied to the autoload directory, deployment will -be automatic at JOnAS startup.
      -
      -
    8. -
    9. Repeat steps 3 and 4 for the three remaining -instances (steps will be shorter as the compile has been done in step 1).
    10. -
    -

    Note: sampleCluster2 contains both a war file for the web -application and a jar file for the EJB.  JOnAS will only deploy the -war file to instances with a web container.  Similarly, it will only -deploy the jar file on instances with an EJB container.

    -

     

    -
    -

    Running sampleCluster2

    -
      -
    1. Logon as user <user>.
      -
      -
    2. -
    3. cd $JONAS_ROOT/examples/sampleCluster2
      -
      -
    4. -
    5. Start all four JOnAS instances:
      - -./jcl4sc2 (jcl4sc2.bat for a Windows environment)
      -
      - -This script executes
      -jonas start –n nodeX, for X=1,2,3,4.
      - -
      -
    6. -
    7. Restart Apache: <prefix>/bin/apachectl -restart.
      -
      -
    8. -
    9. In a browser go to http://hostname:<apache listening -port>/sampleCluster2
    10. -
    -
    -

    Description of the sampleCluster2 Web - Interface

    - -

    The following graphic shows an example "SessionServlet Output" page.

    -
    -

     

    -

    --"sampleCluster2"

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

     

    - -

    The following is an explanation of the information shown in the "SessionServlet -Output" page above. 

    -

    Home of sampleCluster2

    - -

    After click on open session link

    - -

    After click on check session link

    - -
    -

    References

    - - - \ No newline at end of file diff --git a/jonas_doc/core/olddoc/howto/Firewall.html b/jonas_doc/core/olddoc/howto/Firewall.html deleted file mode 100644 index 4e280d7d2e2b012b7b35bc8d3ef8e4d344a2c487..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/Firewall.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - -Using JOnAS through a Firewall - - - - -

    Configuring RMI for use through a Firewall

    - -

    By default, the RMI protocol in JOnAS uses a random port at each startup, -which implies that there is no way to configure a firewall as the port number -changes each time the system restarts. -

    - -

    However, as of JOnAS version 4.4.1, you can easily configure the RMI port number -by setting only one property per protocol in the -$JONAS_BASE/conf/carol.properties file. -

    - -

    To configure the RMI exported-port number, edit the -$JONAS_BASE/conf/carol.properties file -to change the following protocols from 0 (choose a random port number) to the -port number you want: -

    - - - -

    Note: -The jonas.orb.port property has been moved from the -$JONAS_BASE/conf/jonas.properties file to the -$JONAS_BASE/conf/carol.properties file, as the latter is the file -in which the registry ports and protocols were already being set. -In previous JOnAS versions the jonas.orb.port property -was not useful in multi-protocols mode as it allowed only one port number -to be set for a single protocol. -Also, the jonas.orb.port property was working only for RMI/JRMP -and for objects using the PortableRemoteObject class for their export. -

    - - - diff --git a/jonas_doc/core/olddoc/howto/JMSClustering.html b/jonas_doc/core/olddoc/howto/JMSClustering.html deleted file mode 100644 index f172f07aff68311e263cc6e1c3739eb45fa39206..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/JMSClustering.html +++ /dev/null @@ -1,808 +0,0 @@ - - - - - - Clustering JMS with JOnAS - - - - -

    Howto: Clustering JMS with JOnAS

    -

    -Authors : Yannick Braeuner, Benoit Pelletier
    -February 12, 2008
    -Version : 2.0
    -

    -

    Introduction

    -

    Load balancing

    - -

                    -JORAM distributed configuration

    - -

                    -Why use clustered Topic?

    - -

                    -General scenario for Topic

    - -

                    -Load-balancing for Queue

    - -

                    -First scenario for Queue : distribution of the load at the server side

    - -

                    -Second scenario for Queue : load-balancing at the client side

    - -

    JORAM HA and JOnAS

    -

    MDB Clustering

    - - -

    Introduction

    - -

    Generalities about Clustering JMS

    - -

    The JMS API provides a separate domain for each messaging approach, point-to-point or -publish/subscribe. The point-to-point domain is built around the concept of queues, senders and receivers. -The publish/subscribe domain is built around the concept of topic, publisher and subscriber. -Additionally it provides a unified domain with common interfaces that enable the use of queue and topic. -This domain defines the concept of producers and consumers. -The classic sample uses a very simple configuration (centralized) made of one server hosting a queue and a topic. -The server is administratively configured for accepting connection requests from the anonymous user. -

    -

    JMS clustering aims to offer a solution for both the scalability and the high availability for the JMS accesses. -This document gives an overview of the JORAM capabilities for clustering a JMS application in the J2EE context. -The load-balancing and fail-over mechanisms are described and a user guide describing how to build such a configuration -is provided. Further information is available in the JORAM documentation here.

    - -

    Configuration

    - -

    The following information will be presented:

    - - -

    Getting started :

    - - -

    Load balancing

    - -

    JORAM distributed configuration

    - -

    Two instances of JOnAS are configured ("J1" and "J2"). Each JOnAS instance has a dedicated collocated JORAM server: server - "S1" for JOnAS "J1", "S2" for "J2". Those two servers are aware of each other.

    - -

    Set a JORAM distributed configuration:

    - -
      -
    1. Go to $JONAS_BASE/conf and edit the a3servers.xml file (same for the 2 instances). 2 instances are defined in the same domain network. The persistent mode is enabled. -
      -<?xml version="1.0"?>
      -<config
      -  <domain name="D1"/>
      -  <property name="Transaction" value="fr.dyade.aaa.util.NTransaction"/>
      -  <server id="1" name="S1" hostname="localhost">
      -    <network domain="D1" port="16301"/>
      -    <service class="org.objectweb.joram.mom.proxies.ConnectionManager"
      -             args="root root"/>
      -    <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService"
      -             args="16010"/>
      -  </server>
      -  <server id="2" name="S2" hostname="localhost">
      -    <network domain="D1" port="16302"/>
      -    <service class="org.objectweb.joram.mom.proxies.ConnectionManager"
      -             args="root root"/>
      -    <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService"
      -             args="16020"/>
      -  </server>
      -</config>
      -        
      -
    2. - -
    3. For each instance, edit the ra.xml embedded in the joram_for_jonas_ra.rar (by using unjar command manually or with the jonasAdmin's RA editor) and check the following element according to the a3servers.xml content -
        -
      • server id (1 or 2) -
        -      <config-property>
        -         <config-property-name>ServerId</config-property-name>
        -         <config-property-type>java.lang.Short</config-property-type>
        -         <config-property-value>1</config-property-value>
        -      </config-property>
        -            
        -
      • -
      • server name (S1 or S2) -
        -      <config-property>
        -         <config-property-name>ServerName</config-property-name>
        -         <config-property-type>java.lang.String</config-property-type>
        -         <config-property-value>s1</config-property-value>
        -      </config-property>
        -            
        -
      • -
      • hostname -
        -      <config-property>
        -         <config-property-name>HostName</config-property-name>
        -         <config-property-type>java.lang.String</config-property-type>
        -         <config-property-value>localhost</config-property-value>
        -      </config-property>
        -            
        -
      • -
      • network port (16010 or 16020) -
        -      <config-property>
        -         <config-property-name>ServerPort</config-property-name>
        -         <config-property-type>java.lang.Integer</config-property-type>
        -         <config-property-value>16010</config-property-value>
        -      </config-property>
        -            
        -
      • -
      • persistent mode -
        -      <config-property>
        -         <config-property-name>PersistentPlatform</config-property-name>
        -         <config-property-type>java.lang.Boolean</config-property-type>
        -         <config-property-value>true</config-property-value>
        -      </config-property>
        -             
        -
      • -
      -
    4. -
    5. For each instance, edit the joramAdmin.xml, update the connection factories definition, the user definition -according to the local JORAM server configuration -
        -
      • server id (1 or 2) -
        -    <User name="anonymous"
        -             password="anonymous"
        -             serverId="1"/>
        -            
        -
      • -
      • server port number (16010 or 16020) -
        -    <ConnectionFactory className="org.objectweb.joram.client.jms.tcp.TcpConnectionFactory">
        -       <tcp host="localhost"
        -            port="16010"/>
        -       <jndi name="JCF"/>
        -    </ConnectionFactory>
        -
        -    <ConnectionFactory className="org.objectweb.joram.client.jms.tcp.QueueTcpConnectionFactory">
        -       <tcp host="localhost"
        -            port="16010"/>
        -       <jndi name="JQCF"/>
        -    </ConnectionFactory>
        -
        -    <ConnectionFactory className="org.objectweb.joram.client.jms.tcp.TopicTcpConnectionFactory">
        -       <tcp host="localhost"
        -            port="16010"/>
        -       <jndi name="JTCF"/>
        -    </ConnectionFactory>
        -            
        -
      • -
      -
    6. -
    -

    See here for more information about a JORAM distributed configuration.

    - -

    Why use clustered Topic?

    - -

    A non hierarchical topic might also be distributed among many servers. Such a topic, to be -considered as a single logical topic, is made of topic representatives, one per server. Such an architecture allows a publisher to publish messages on a representative of the topic. In the example, the publisher works with the representative on server 1. If a subscriber subscribed to any other representative (on server 2 in the example), it will get the messages produced by the publisher.

    - -

    Load balancing of topics is very useful because it allows distributed topic subscriptions across the cluster.

    - -

    node

    - - -

    General scenario for Topic

    - -

    The following scenario and general settings are proposed:

    - - -

    node

    - - -

    Topic cluster definition in joramAdmin.xml

    - -

    -The cluster definition with the topics must be added in $JONAS_BASE/conf/joramAdmin.xml file. -The connection factories and the anonymous user must be defined with the local server id and the local server port number -according to the a3servers.xml content. Here only the cluster related elements are shown: -

    - - - -

    The joramAdmin.xml file has to be loaded when all cluster members are started since some remote - cluster elements are defined. An alternative consists in splitting the configuration into two different files - joramAdmin-local.xml and joramAdmin-cluster.xml, the first one containing only the local elements and the - second one, both local and remote elements. At the JOnAS starting, a script could copy the right file - to joramAdmin.xml according to the others members presence (joramAdmin-local.xml if it's the first member - which starts and joramAdmin-cluster.xml if all the cluster members are started).

    - -

    Run the sample

    - -

    Deploy the application, for example, create a deploy.sh file:

    -
    -#!/bin/ksh
    -
    -export JONAS_BASE=$PWD/jb1
    -cp $JONAS_ROOT/examples/output/ejbjars/newsamplemdb.jar $JONAS_BASE/ejbjars/
    -jonas admin -a newsamplemdb.jar -n node1
    -
    -export JONAS_BASE=$PWD/jb2
    -cp $JONAS_ROOT/examples/output/ejbjars/newsamplemdb.jar $JONAS_BASE/ejbjars/
    -jonas admin -a newsamplemdb.jar -n node2
    -
    - -

    Finally launch the client

    - -
    jclient newsamplemdb.MdbClient 
    - -

    Something similar to this should appear in the client console :

    -
    -ClientContainer.info : Starting client...
    -JMS client: tcf = TCF:localhost-16010
    -JMS client: topic = topic#1.1.1026
    -JMS client: tc = Cnx:#0.0.1026:5
    -MDBsample is Ok
    -
    - -

    In addition, the following should appear on each JOnAS instance console:

    - -
    -Message received: Message6
    -MdbBean onMessage
    -Message received: Message7
    -MdbBean onMessage
    -Message received: Message8
    -
    - -

    The fact that each message appears on the two different JOnAS servers consoles shows the messages broadcasting between the -topic elements.

    - -

    Load-balancing for Queue

    - -

    Globally, the load balancing in the context of queues may be meaningless in comparison of load balancing topic. -It would be a bit like load balancing a stateful session bean instance (which just requires failover). -But the JORAM distributed architecture enables :

    - - -

    First scenario for Queue : distribution of the load at the server side

    - -

    Here is a diagram of what is going to happen for the Queue and the message:

    - -

    node

    - -

    A load balancing message queue may be needed for a high rate of messages. -A clustered queue is a cluster of queues exchanging messages depending on their load. The example has a cluster of two queues. -A heavy producer accesses its local queue and sends messages. It quickly becomes loaded and decides to forward messages to the other queue of its cluster which is not under heavy load.

    - -

    For this case some parameters must be set:

    - - -

    For further information, see the JORAM documentation here.

    - -

    The scenario for Queue is similar to the topic one. A client sent messages to a queue in S1. MDB gets messages -from each local cluster queue representative. After having sent a burst of messages to the server S1, -the load distribution should occur and message should be moved to S2.

    - - -

    The Queue definition in $JONAS_BASE/conf/joramAdmin.xml file is as following :

    - - - -

    Run the sample

    - -

    The procedure is similar to the topic example described above, just use the newsamplemdb2 example rather than -newsample one.

    - -

    Second scenario for Queue : load-balancing at the client side

    - -

    Principle

    - -

    The load-balancing is done at the client side. A server is selected randomly among the cluster members -at the first message sending or through the 'location' java property. And then, for a given client, all the messages -are sent to the same server unless the java property resetting.

    - -

    node

    - -

    For setting the load-balancing at the client side, the client application must use a clustered connection factory that -embeds the network connection parameters of the cluster members. This factory must be registered in the JORAM's -distributed JNDI for ensuring that the client gets an up to date object. A complete description of the -JORAM JNDI setting is given here and the main parameters -are given below :

    - -

    Setting of the JORAM's distributed jndi

    - -

    At first, the a3servers.xml file must enhanced with the JORAM's jndi service as following :

    - -
    -<?xml version="1.0"?>
    -<config>
    -  <domain name="D1"/>
    -  <property name="Transaction" value="fr.dyade.aaa.util.NTransaction"/>
    -
    -  <server id="1" name="s1" hostname="localhost">
    -    <network domain="D1" port="16301"/>
    -    <service class="org.objectweb.joram.mom.proxies.ConnectionManager"
    -             args="root root"/>
    -    <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService"
    -             args="16010"/>
    -    <service class="fr.dyade.aaa.jndi2.distributed.DistributedJndiServer"
    -               args="16401 0 1"/>
    -  </server>
    -
    -  <server id="2" name="s2" hostname="localhost">
    -     <network domain="D1" port="16302"/>
    -     <service class="org.objectweb.joram.mom.proxies.ConnectionManager"
    -             args="root root"/>
    -    <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService"
    -             args="16020"/>
    -    <service class="fr.dyade.aaa.jndi2.distributed.DistributedJndiServer"
    -               args="16402 1 0"/>
    -  </server>
    -
    -</config>
    -
    - -

    Only the JMS objects must be registered in the JORAM's jndi. The standard routing mechanism is used through a jndi.properties file -put in each $JONAS_BASE/conf directory :

    - - - -

    The port number must be adapted according to the local server configuration (16401 for S1 and 16402 for S2). The 'scn' prefix -is defined for identifying the objects to bind or to lookup in this registry.

    - -

    Setting of the clustered connection factories

    - -

    The clustered connection factories are defined in the $JONAS_BASE/conf/joramAdmin.xml file as following :

    - -
    -<ConnectionFactory name="JQCF1" className="org.objectweb.joram.client.jms.tcp.QueueTcpConnectionFactory">
    -  <tcp host="localhost"
    -       port="16010"/>
    -  <jndi name="scn:comp/JQCF1"/>
    -</ConnectionFactory>
    -<ConnectionFactory name="JQCF2" className="org.objectweb.joram.client.jms.tcp.QueueTcpConnectionFactory">
    -  <tcp host="localhost"
    -       port="16020"/>
    -  <jndi name="scn:comp/JQCF2"/>
    -</ConnectionFactory>
    -<ClusterCF>
    -    <ClusterElement name="JQCF1" location="s1"/>
    -    <ClusterElement name="JQCF2" location="s2"/>
    -    <jndi name="scn:comp/clusterJQCF"/>
    -</ClusterCF>
    -
    - -

    The 'scn:comp/' prefix in the jndi name indicates that the object must be bound in the JORAM's jndi.

    - -

    Cluster queue definition

    - -

    The cluster queue is defined in the $JONAS_BASE/conf/joramAdmin.xml file :

    - -
    -<Queue name="mdbQueue0" serverId="1"
    -       className="org.objectweb.joram.mom.dest.ClusterQueue">
    -   <freeReader/>
    -   <freeWriter/>
    -   <jndi name="scn:comp/mdbQueue1"/>
    -</Queue>
    -
    -<Queue name="mdbQueue1" serverId="2"
    -       className="org.objectweb.joram.mom.dest.ClusterQueue">
    -   <freeReader/>
    -   <freeWriter/>
    -   <jndi name="scn:comp/mdbQueue2"/>
    -</Queue>
    -
    -<ClusterQueue>
    -   <ClusterElement name="mdbQueue1" location="s1"/>
    -   <ClusterElement name="mdbQueue2" location="s2"/>
    -   <jndi name="scn:comp/mdbQueue"/>
    -</ClusterQueue>
    -
    - -

    Note that the cluster queue definition is symetric accross the cluster members. The well known jndi name is set -on the cluster object (and not in the local representative as for the topic cluster).

    - -

    Note that same for the topic declaration, the joramAdmin.xml file has to be loaded when all cluster members - are started since some remote cluster elements are defined. - An alternative consists in splitting the configuration into two different files - joramAdmin-local.xml and joramAdmin-cluster.xml, the first one containing only the local elements and the - second one, both local and remote elements. At the JOnAS starting, a script could copy the right file - to joramAdmin.xml according to the others members presence (joramAdmin-local.xml if it's the first member - which starts and joramAdmin-cluster.xml if all the cluster members are started).

    - -

    MDB configuration

    - -

    The message driven bean must be configured with the queue registered in the JORAM jndi ('scn:/comp' selector). - Edit the deployment descriptor file (ejb-jar.xml) :

    - -
    -  <message-driven>
    -      <description>Describe here the message driven bean Mdb</description>
    -      <display-name>Message Driven Bean Mdb</display-name>
    -      <ejb-name>Mdb</ejb-name>
    -      <ejb-class>newsamplemdb2.MdbBean</ejb-class>
    -      <messaging-type>javax.jms.MessageListener</messaging-type>
    -      <transaction-type>Container</transaction-type>
    -      <message-destination-type>javax.jms.Queue</message-destination-type>
    -      <activation-config>
    -          <activation-config-property>
    -            <activation-config-property-name>destination</activation-config-property-name>
    -            <activation-config-property-value>scn:comp/mdbQueue</activation-config-property-value>
    -          </activation-config-property>
    -          <activation-config-property>
    -            <activation-config-property-name>destinationType</activation-config-property-name>
    -            <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
    -          </activation-config-property>
    -          <activation-config-property>
    -            <activation-config-property-name>subscriptionDurability</activation-config-property-name>
    -            <activation-config-property-value>NonDurable</activation-config-property-value>
    -          </activation-config-property>
    -      </activation-config>
    -  </message-driven>
    -
    - -

    Client code

    - -

    The client must lookup the clustered objects in the JORAM's jndi by using the 'scn:/comp' selector.

    - -
    -static String queueName = "scn:comp/mdbQueue";
    -static String conFactName = "scn:comp/clusterJQCF";
    -Context ictx = new InitialContext();
    -ConnectionFactory qcf = (ConnectionFactory) ictx.lookup(conFactName );
    -Queue queue = (Queue) ictx.lookup(queueName);
    -
    - -

    The connection creation, session creation and producer are quite classic:

    -
    -Connection qc = qcf.createConnection();
    -Session session = qc.createSession(false, Session.AUTO_ACKNOWLEDGE);
    -MessageProducer qp = session.createProducer(queue);
    -
    - -

    A server is chosen at the first message sending. A switch may be forced through the resetting of the 'location' java -property. Below a new server election is requested for each odd iteration.

    - -
    -TextMessage message;
    -for (int i = 0; i < 10; i++) {
    -  message = session.createTextMessage();
    -  message.setText("Msg "+i);
    -  qp.send(message);
    -  System.out.println("location=" + System.getProperty("location"));
    -  if (i%2 == 0) {
    -    System.setProperty("location", "");
    -  }
    -}
    -
    - -

    Run the sample

    - -

    The procedure is similar to the topic and queue ones described above, just adapt the newsamplemdb2 example with -the configuration and code given previously.

    - - -

    JORAM HA and JOnAS

    - -

    Generality

    - -

    node

    - -

    An HA server is actually a group of servers, one of which is the master server that coordinates the other slave servers. An external server that communicates with the HA server is actually connected to the master server.

    -

    Each replicated JORAM server executes the same code as a standard server except for the communication with the clients.

    -

    In the example, the collocated clients use a client module (newsamplemdb). If the server replica is the master, then the connection is active enabling the client to use the HA JORAM server. If the replica is a slave, then the connection opening is blocked until the replica becomes the master.

    - -

    Configuration

    - -

    Several files must be changed to create a JORAM HA configuration:

    - -

    a3servers.xml

    - -

    A clustered server is defined by the element "cluster". A cluster owns an identifier and a name defined by the attributes "id" and "name" (exactly like a standard server). Two properties must be defined:

    - -

    In the case of one server and one replica, the value must be set to 1.

    -
    -<?xml version="1.0"?/>
    -<config>
    -  <domain name="D1"/>
    -
    -  <property name="Transaction" value="fr.dyade.aaa.util.NullTransaction"/>
    -
    -  <cluster id="0" name="s0">
    -
    -    <property name="Engine" value="fr.dyade.aaa.agent.HAEngine" />
    -    <property name="nbClusterExpected" value="1" />
    -
    - -

    For each replica, an element "server" must be added. The attribute "id" defines the identifier of the replica inside the cluster. The attribute "hostname" gives the address of the host where the replica is running. The network is used by the replica to communicate with external agent servers, i.e., servers located outside of the cluster and not replicas.

    - -

    This is the entire configuration for the a3servers.xml file of the first JOnAS instance jb1:

    - -
    -<?xml version="1.0"?>
    -<config<
    -  <domain name="D1"/>
    -
    -  <property name="Transaction" value="fr.dyade.aaa.util.NullTransaction"/>
    -
    -  <cluster id="0" name="s0">
    -
    -    <property name="Engine" value="fr.dyade.aaa.agent.HAEngine" />
    -    <property name="nbClusterExpected" value="1" />
    -
    -    <server id="1" hostname="localhost">
    -      <network domain="D1" port="16300"/>
    -      <service class="org.objectweb.joram.mom.proxies.ConnectionManager" args="root root"/>
    -      <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" args="16010"/>
    -      <service class="org.objectweb.joram.client.jms.ha.local.HALocalConnection"/>
    -    </server>
    -
    -    <server id="2" hostname="localhost">
    -      <network domain="D1" port="16301"/>
    -      <service class="org.objectweb.joram.mom.proxies.ConnectionManager" args="root root"/>
    -      <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" args="16020"/>
    -      <service class="org.objectweb.joram.client.jms.ha.local.HALocalConnection"/>
    -    </server>
    -
    -  </cluster>
    -
    -</config>
    -
    - -

    The cluster id = 0 and the name S0. It is exactly the same file for the second instance of JOnAS.

    - -

    joramAdmin.xml

    - -

    Here is the joramAdmin.xml file configuration:

    - -
    -<?xml version="1.0"?>
    -
    -<JoramAdmin>
    -
    -<AdminModule>
    -  <collocatedConnect name="root" password="root"/>
    -</AdminModule>
    -
    -<ConnectionFactory className="org.objectweb.joram.client.jms.ha.tcp.HATcpConnectionFactory">
    -  <hatcp url="hajoram://localhost:16010,localhost:16020" reliableClass="org.objectweb.joram.client.jms.tcp.ReliableTcpClient"/>
    -  <jndi name="JCF"/>
    -</ConnectionFactory>
    -
    -<ConnectionFactory className="org.objectweb.joram.client.jms.ha.tcp.QueueHATcpConnectionFactory">
    -  <hatcp url="hajoram://localhost:16010,localhost:16020" reliableClass="org.objectweb.joram.client.jms.tcp.ReliableTcpClient"/>
    -  <jndi name="JQCF"/>
    -</ConnectionFactory>
    -
    -<ConnectionFactory className="org.objectweb.joram.client.jms.ha.tcp.TopicHATcpConnectionFactory">
    -  <hatcp url="hajoram://localhost:16010,localhost:16020" reliableClass="org.objectweb.joram.client.jms.tcp.ReliableTcpClient"/>
    -  <jndi name="JTCF"/>
    -</ConnectionFactory>
    -
    - -

    Each connection factory has its own specification. One is in case of the Queue, one for Topic, and one for no define arguments. Each time the hatcp url must be entered, the url of the two instances. In the example, it is localhost:16010 and localhost:16020. It allows the client to change the instance when the first one is dead.

    -

    After this definition the user, the queue and topic can be created.

    - -

    ra and jonas-ra.xml files

    - -

    First, in order to recognize the cluster, a new parameter must be declared in these files.

    -
    -      <config-property>
    -         <config-property-name>ClusterId</config-property-name>
    -         <config-property-type>java.lang.Short</config-property-type>
    -         <config-property-value>0</config-property-value>
    -      </config-property>
    -
    -

    Here the name is not really appropriate but in order to keep some coherence this name was used. In fact it represents a replica so it would have been better to call it replicaId.

    - -

    Consequently, for the first JOnAS instance, copy the code just above. For the second instance, change the value to 1 (in order to signify this is another replica).

    - -

    Illustration

    -

    First launch the two JOnAS bases. Create a runHa.sh file in which the following code will be added:

    -
    -export JONAS_BASE=$PWD/jb1
    -export CATALINA_BASE=$JONAS_BASE
    -rm -f $JONAS_BASE/logs/*
    -jonas start -win -n node1 -Ddomain.name=HA
    -
    -

    Then do the same for the second JOnAS base. After that launch the script.

    -

    One of the two JOnAS bases (the one which is the slowest) will be in a waiting state when reading the joramAdmin.xml

    -
    -JoramAdapter.start :   - Collocated JORAM server has successfully started.
    -JoramAdapter.start :   - Reading the provided admin file: joramAdmin.xml
    -
    -

    whereas the other one is launched successfully.

    -

    Then launch (through a script or not) the newsamplemdb example:

    -
    -jclient -cp /JONAS_BASE/jb1/ejbjars/newsamplemdb.jar:/JONAS_ROOT/examples/classes  -carolFile clientConfig/carol.properties newsamplemdb.MdbClient
    -
    -

    Messages are sent on the JOnAS base which was launched before. Launch it again and kill the current JOnAS. The second JOnAS will automatically wake up and take care of the other messages.

    - - -

    MDB Clustering

    - -

    Generality

    - -

    This is a proposal for building an MDB clustering based application.

    - -

    This is like contested Queues. i.e., there is more than one receiver on different machines receiving from the queue. This load balances the work done by the queue receiver, not the queue itself.

    - -

    The HA mechanism can be mixed with the load balancing policy based on clustered destinations. The load is balanced between several HA servers. Each element of a clustered destination is deployed on a separate HA server.

    - -

    node

    - -

    Configuration

    -

    Here is the supposed configuration (supposed because it has not been verifed).

    - -

    node

    - - -

    Illustration

    -

    The configuration must now be tested, as follows: -

    -
  • First make JA1 crash and verify that messages are spread between JB1 and JB2.
  • -
  • Then make JB2 crash and verify that messages are spread between JA1 and JA2.
  • -
  • Finally make JA1 and JB2 crash and verify that messages are spread between JA2 and JB1.
  • -
    -

    - - diff --git a/jonas_doc/core/olddoc/howto/JORAMdistributed_JOnAS_4_1.html b/jonas_doc/core/olddoc/howto/JORAMdistributed_JOnAS_4_1.html deleted file mode 100644 index 7512e1d46be2927e9232bc9a95292edfe50734fa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/JORAMdistributed_JOnAS_4_1.html +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - Distributed Message Beans in JOnAS 4.1 - - - - -

    Howto: Distributed Message Beans in JOnAS 4.x

    - -

    JOnAS release 4.1 dramatically simplifies the use of a distributed JORAM -platform from within JOnAS servers. For example, such a configuration allows -a bean hosted by JOnAS instance "A" to send messages on a JORAM queue, to -which a MDB hosted by JOnAS instance "B" listens.

    - -

    This advancement is due to the following:

    - - -

    Before going through this chapter, it is highly recommended that the JORAM Resource Adapter -configuration guide be reviewed.

    - -

    Scenario and general architecture

    - -

    The following scenario and general settings are proposed:

    - - -

    Common configuration

    - -

    The JORAM servers are part of the same JORAM platform described by the -following a3servers.xml configuration file:

    -
    <?xml version="1.0"?>
    -<config>
    -    <domain name="D1"/>
    -    <server id="0" name="S0" hostname="hostA">
    -      <network domain="D1" port="16301"/>
    -      <service class="org.objectweb.joram.mom.proxies.ConnectionManager"
    -               args="root root"/>
    -      <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService"
    -               args="16010"/>
    -      <service class="fr.dyade.aaa.jndi2.distributed.DistributedJndiServer"
    -               args="16400 0"/>
    -    </server>
    -    <server id="1" name="S1" hostname="hostB">
    -      <network domain="D1" port="16301"/>
    -      <service class="org.objectweb.joram.mom.proxies.ConnectionManager"
    -               args="root root"/>
    -      <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService"
    -               args="16010"/>
    -      <service class="fr.dyade.aaa.jndi2.distributed.DistributedJndiServer"
    -               args="16400 0 1"/>
    -
    -    </server>
    -</config>
    - -

    This configuration describes a platform made up of two servers, "s0" and -"s1", hosted by machines "hostA" and "hostB", listening on ports 16010, -providing a distributed JNDI service (more info on JORAM's JNDI may be found -here).

    - -

    Each JOnAS server must hold a copy of this file in its conf/ -directory. In its jonas.properties file, each must declare the -joram_for_jonas_ra.rar as a resource to be deployed (and each -should remove jms from its list of services).

    - -

    Specific configuration

    - -

    JOnAS A embeds JORAM server s0. The -jonas-ra.xml descriptor packaged in the -joram_for_jonas_ra.rar archive file must provide the following -information:

    -
    <jonas-config-property>
    -    <jonas-config-property-name>HostName</jonas-config-property-name>
    -    <jonas-config-property-value>hostA</jonas-config-property-value>
    -</jonas-config-property>  
    - -

    The other default settings do not need to be changed.

    - -

    JOnAS B embedds JORAM server s1. The -jonas-ra.xml descriptor packaged in the -joram_for_jonas_ra.rar archive file must provide the following -properties values:

    -
    <jonas-config-property>
    -    <jonas-config-property-name>ServerId</jonas-config-property-name>
    -    <jonas-config-property-value>1</jonas-config-property-value>
    -</jonas-config-property>
    -<jonas-config-property>
    -    <jonas-config-property-name>ServerName</jonas-config-property-name>
    -    <jonas-config-property-value>s1</jonas-config-property-value>
    -</jonas-config-property>
    -<jonas-config-property>
    -    <jonas-config-property-name>HostName</jonas-config-property-name>
    -    <jonas-config-property-value>hostB</jonas-config-property-value>
    -</jonas-config-property>
    - -

    The other default settings do not need to be changed.

    - -

    The shared queue will be hosted by JORAM server s1. It -must then be declared in the JOnAS B's joramAdmin.xml file as -follows:

    -
    -        <Queue name="sharedQueue">
    -          <freeReader/>
    -          <freeWriter/>
    -          <jndi name="scn:comp/sharedQueue"/>
    -        </Queue>
    -
    - -

    The scn:comp/ prefix is a standard way to specify which JNDI -provider should be used. In this case, the shared queue will be bound to -JORAM's distributed JNDI server, and may be retrieved from both JOnAS A and -JOnAS B. To provide this mechanism, both JOnAS servers must provide access to -a standard jndi.properties file. For JOnAS A, the file looks as -follows, and should be placed in its conf/ directory:

    -
    java.naming.factory.url.pkgs    org.objectweb.jonas.naming:fr.dyade.aaa.jndi2
    -scn.naming.factory.host         hostA
    -scn.naming.factory.port         16400
    - -

    For JOnAS B, the file looks as follows, and should be placed in the right -conf/ directory:

    -
    java.naming.factory.url.pkgs    org.objectweb.jonas.naming:fr.dyade.aaa.jndi2
    -scn.naming.factory.host         hostB
    -scn.naming.factory.port         16400
    - -

    And now, the beans!

    - -

    The simple bean on JOnAS A needs to connect to its local -JORAM server and access the remote queue. The following is an example of -consistent resource definitions in the deployment descriptors:

    - -

    Standard deployment descriptor:

    -
    <resource-ref>
    -  <res-ref-name>jms/factory</res-ref-name>
    -  <res-type>javax.jms.ConnectionFactory</res-type>
    -  <res-auth>Container</res-auth>
    -</resource-ref>
    -<resource-env-ref>
    -  <resource-env-ref-name>jms/sharedQueue</resource-env-ref-name>
    -  <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
    -</resource-env-ref>
    - -

    Specific deployment descriptor:

    -
    <jonas-resource>
    -  <res-ref-name>jms/factory</res-ref-name>
    -  <jndi-name>CF</jndi-name>
    -</jonas-resource>
    -<jonas-resource-env>
    -  <resource-env-ref-name>jms/sharedQueue</resource-env-ref-name>
    -  <jndi-name>scn:comp/sharedQueue</jndi-name>
    -</jonas-resource-env>
    - -

    The ConnectionFactory is retrieved from the local JNDI registry of the -bean. However, the Queue is retrieved from the distributed JORAM JNDI server, -because its name starts with the scn:comp/ prefix. It is the same -queue to which the message-driven bean on JOnAS B listens. -For doing so, its activation properties should be set as follows:

    -
    <activation-config>
    -   <activation-config-property>
    -      <activation-config-property-name>destination</activation-config-property-name>
    -      <activation-config-property-value>scn:comp/sharedQueue</activation-config-property-value>
    -   </activation-config-property>
    -   <activation-config-property>
    -      <activation-config-property-name>destinationType</activation-config-property-name>
    -      <activation-config-property-value>javax.jms.Queue</activation-config-property-value>
    -   </activation-config-property>
    -</activation-config>
    - - diff --git a/jonas_doc/core/olddoc/howto/JSR160_support.html b/jonas_doc/core/olddoc/howto/JSR160_support.html deleted file mode 100644 index d5616cd625c679913a63d51288e26cf03e742888..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/JSR160_support.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - JSR 160 support in JOnAS - - - - -

    Howto: JSR 160 support in JOnAS

    - -

    The content of this document is the following:

    -
      -
    1. Target Audience and Rationale
    2. -
    3. What is JSR 160 ?
    4. -
    5. Connector servers created by JOnAS
    6. -
    - -

    Target Audience and Rationale

    -Starting with version 4.1.4 JOnAS provides support for remote connection to the -MBean server in a standard way. - -

    The target audience for this document is the management application - developer or the administrator, intending to use standard JMX RMI - connectors to access the MBean Server running in a JOnAS server. -

    - -

    What is JSR 160 ?

    -The JSR 160 is a JMX Remoting specification which extends the JSR 3 specification -by providing a standard API to connect to remote JMX-enabled applications. -

    -Currently, JSR 160 has defined a mandatory connector based on RMI (that -supports both RMI/JRMP and RMI/IIOP). -

    -

    Support for JSR 160 connectors in JOnAS is based on the - MX4J JMX - implementation. -

    - -

    Connector servers created by JOnAS

    -Previous and current JOnAS versions implement a proprietary remote object allowing -connection to the MBean server. This object is registered in JNDI under the name -'RMIConnector_jonasServerName'. It can be accessed using any of -the communication protocols support by JOnAS (RMI/JRMP, RMI/IIOP, JEREMIE - -see Choosing the Protocol). -

    -JSR 160 support implies providing standard connector server objects. The JMX service -creates at start-up one or several such objects, depending on the JOnAS configuration -(in this case, depending on the content of carol.properties file). -To create a client connector, the client side needs to know the URL of the connector -server. Below we present the URLs that can be used by the clients depending on the -protocol they choose.

    -

    Currently only 2 protocols can be used by JSR-160 connectors: -RMI/JRMP and RMI/IIOP. -

    -

    Using a RMI/JRMP Connector

    -This connector can be used if the jrmp protocol is set in the - carol.protocols list. -

    -The client has to construct a JMXServiceURL using the following -String, possibly modified according to the JOnAS-specific configuration: -service:jmx:rmi:///jndi/rmi://host:port/jrmpconnector_jonasServerName -where host is the host on which is running the JOnAS server to be managed. -The port number is given in the carol.properties file.

    -

    Then, a JMXConnector has to be created and connected to the connector server - using the JMX Remote API. -

    - -

    Example 1:

    -
     
    -	Hashtable environment = null;   
    -	JMXServiceURL address = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://host:1099/jrmpconnector_jonas");
    -	JMXConnector connector = JMXConnectorFactory.newJMXConnector(address, environment);
    -	connector.connect(environment);
    -
    - -

    Using a RMI/IIOP Connector

    -This connector can be used if the iiop protocol is set in the - carol.protocols list. -

    -The client code is similar to the JRMP case, but the String to be used to construct the JMXServiceURL -must adhere to the following model: -"service:jmx:iiop:///jndi/iiop://host:port/iiopconnector_jonasServerName"

    - -

    Example 2:

    -
     
    -	Hashtable environment = null;   
    -	JMXServiceURL address = new JMXServiceURL("service:jmx:iiop:///jndi/iiop://host:2001/iiopconnector_jonas");
    -	JMXConnector connector = JMXConnectorFactory.newJMXConnector(address, environment);
    -	connector.connect(environment);
    -
    - - \ No newline at end of file diff --git a/jonas_doc/core/olddoc/howto/JonasArchi.html b/jonas_doc/core/olddoc/howto/JonasArchi.html deleted file mode 100644 index 8aab71f598bbcb18447a818aae1b72f983eb9168..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/JonasArchi.html +++ /dev/null @@ -1,1005 +0,0 @@ - - - - - The JOnAS Platform - - - - - -

    Java Open Application Server (JOnAS): Architecture and Design

    - -

    Last modified at 2005-04-22, JOnAS 4.3

    -Logo JOnAS - - -

    - -

    This document provides an overview of the JOnAS platform architecture -design. The content of this document is the following:

    - - -

    Introduction

    - -

    This document presents the internal architectural design of the JOnAS -application server. It contains many links toward the JOnAS documentation, -for detailed descriptions of some aspects.

    - -

    JOnAS Service based Architecture

    - -

    Design Principles

    - -

    JOnAS's service-based architecture provides for high modularity and -configurability of the server. It allows to apply a component-model approach -at the middleware level, and makes the integration of new modules easy (e.g. -for open source contributors). It also provides a way to start only the -services needed by a particular application, thus saving valuable system -resources. JOnAS services are manageable through JMX.

    - -

    JOnAS is designed with services in mind. A service typically provides -system resources to containers. Most of the components of the JOnAS -application server are pre-defined JOnAS services. However, it is possible -and easy for an advanced JOnAS user to define a service and to integrate it -into JOnAS. Because J2EE applications do not necessarily need all services, -it is possible to define, at JOnAS server configuration time, the set of -services that are to be launched at server start.

    - -

    The JOnAS architecture is illustrated in the following figure, showing WEB -and EJB containers relying on JOnAS services. Two thin clients are also shown -in this figure, one of which is the JOnAS administration console (called -JonasAdmin).

    -J2EE Architecture - -

    All these services correspond to JOnAS components. The JOnAS Service -principle is described in detail within the JOnAS documentation, in the Creating -a New JOnAS Service section of the Advanced Topic chapter. Please read -this document to understand the JOnAS components wrapping within services. -Generally, a JOnAS service Serv1 implementation may be found -in the package org.objectweb.jonas.serv1, where an interface -of the service may be found, Serv1Service, with an -implementation, Serv1ServiceImpl, and an MBean for the -service management purpose (as described below in the JOnAS Management -Architecture section), Serv1ServiceImplMBean class.

    - -

    An application server such as JOnAS must provide a complex class loading -scheme, which is described in the JOnAS -classloader hierarchy section of the J2EE Application Programmer's Guide -of the JOnAS documentation.

    - -

    The following of this section describes the existing JOnAS services.

    - -

    Communication and Naming Service

    - -

    This service (also called "Registry") is used for launching the RMI -registry, the CosNaming and/or the CMI registry -depending on the JOnAS configuration (CAROL configuration, which specifies -which communication protocols are to be used). There are different registry -launching modes: in the same JVM or not, automatically if not already -running. CAROL enables multi-protocol runtime support and deployment, which -avoids having to redeploy components when changing the communication -protocol.

    - -

    JOnAS may run several distributed processing environments, thanks to the -integration of the CAROL (Common -Architecture for RMI ObjectWeb Layer) ObjectWeb project, which allows -simultaneous support of several communication protocols:

    - - -

    This service provides the JNDI API to application components and to other -services in order to bind and lookup remote objects (e.g. EJB Homes) and -resource references (JDBC DataSource, Mail and JMS connection factories, -etc.).

    - -

    - -

    EJB Container Service

    - -

    This service is in charge of loading the EJB components and their -containers. EJB containers consist of a set of Java classes that implement -the EJB specification and a set of interposition classes that interface the -EJB components with the services provided by the JOnAS application server. -The role of the interposed classes is to manage transactions, security, ... -Interposition classes are specific to each EJB component and are generated by -the deployment tool called GenIC. -This tool is developed using the Velocity template based generation tool.

    - -

    For each EJB component XXX, GenIC generates the following classes:

    - - -

    These files are generated with Velocity from templates located in org.objectweb.jonas_ejb.genic -(*.vm). Moreover, stubs and skeletons are generated, depending on the -specified protocol (jrmp/iiop), several protocols may be specified, -in this case several stubs/skeletons will be generated. CAROL is used to hide -the differencies between protocols.

    - -

    For implementing Container-Managed Persistence of EJB 2.0 and EJB 2.1 -(CMP2), JOnAS relies on the ObjectWeb JORM (Java Object Repository Mapping) -and MEDOR (Middleware Enabling -Distributed Object Requests) frameworks. JORM supports complex mappings of -EJBs to database tables, as well as several types of persistency support -(relational databases, object databases, LDAP repositories, etc.). JORM is -responsible for bean persistence. MEDOR is used to evaluate ejb-ql -queries.

    - -

    Generic objects used for entity beans are derived to be used by JORM:

    - - -

    Typically, the PBinding uses the PAccessor to set and get field values in -the bean instance.

    - -

    The lock policy is enforced in the JEntitySwitch class. Actually, this -class is specialized depending on the lock policy used:

    - - -

    The detailed picture of the JOnAS CMP architecture is provided below:

    -J2EE Architecture - -

    Each jar file is implemented in a separate Container. Each Container has a -swapper that is used to periodically write bean instances

    - -

    on disk, and release memory instances from the cache when JOnAS needs more -memory.

    - -

    For Message driven beans, the factory implements ServerSessionPool -interface. For each instance, an object (JMessageDrivenBean) is created : It -implements ServerSession, MessageListener, Runnable, and MessageDrivenContext -interfaces.

    - -

    JOnAS configuration provides a means for specifying a set of ejb-jar files -to be loaded at server startup by the EJB container service. Ejb-jar files -can also be deployed at server runtime using the JOnAS administration -tools.

    - -

    JOnAS also implements the Timer Service features as specified in EJB -2.1.

    - -

    WEB Container Service

    - -

    This service is in charge of running a Servlet/JSP Engine in the JVM of -the JOnAS server and of loading web applications ("war" files) within this -engine. Currently, this service can be configured to use Tomcat or Jetty. Servlet/JSP engines are -integrated within JOnAS as "web containers," i.e. such containers provide the -web components with access to the system resources (of the application -server) and to EJB components, in a J2EE-compliant way.

    - -

    JOnAS configuration provides a means for specifying that this service be -launched during JOnAS initialization. Additionally, JOnAS configuration -provides a means for specifying a set of war files to be loaded at JOnAS -startup. War files may also be deployed at server runtime using the JOnAS -administration tools. User management for Tomcat/Jetty and JOnAS has been -unified. The class-loading delegation policy (priority to the Webapp -classloader or to the parent classloader) can be configured.

    - -

    The -web container service is implemented by using an abstract -class (AbsJWebContainerServiceImpl) which needs to be extended to -implement the specific Tomcat -or Jetty -part.
    -The interface -of this service defines common methods like starting, stopping the -embedded server, or deploy/undeploy war files. Also, these public methods are -available through an MBean.
    -The class for Catalina 5.0 is named CatalinaJWebContainerServiceImpl -and for Jetty 5.5 it is JettyJWebContainerServiceImpl. -For Catalina 5.5, the name of the package is -org.objectweb.jonas.web.catalina55 instead of -org.objectweb.jonas.web.catalina50.
    -To integrate a new web container, a new package -org.objectweb.jonas.web.xxx should be added and the service -class should extend AbsJWebContainerServiceImpl class.

    - -

    For Tomcat, there are wrapper -classes to use a specific -classloader (Tomcat Classloader) instead of using the default classloader -of all services running in JOnAS which is commons -classloader.
    -

    - -

    Common tools to unpack wars, used by all implementations are in the -package org.objectweb.jonas.web.lib

    - -

    There is another package for all the stuff concerning the parsing and the -handling of web deployment descriptors. This is the package org.objectweb.jonas_web.deployment -which is composed of api package (used by web container service) and the -other subpackages are only used internally for parsing and managing the XML -files.
    -The only import which should occur within a web container service -implementation should be the api package and not the other subpackages. This -allows to change the implementation of parsing/analyzing XML files without -changing the services code.

    - -

    Ear Service

    - -

    This service is used for deploying complete J2EE applications, i.e. -applications packaged in EAR files, which themselves contain ejb-jar files -and/or war files. This service handles the EAR files and delegates the -deployment of the war files to the WEB Container service and the ejb-jar -files to the EJB Container service. It handles creating the appropriate class -loaders, in order for the J2EE application to execute properly.

    - -

    For deploying J2EE applications, JOnAS must be configured to launch the -EAR service and to specify the set of EAR files to be loaded. EAR files can -also be deployed at server runtime using the JOnAS administration tools.

    - -

    This service is implemented by the EarServiceImpl -class. This class is linked to other services which should be started. The -ear service needs an EJB service and a WebContainer service to allow to send -EJBs of an EAR to the EJB service and to send web components to the web -container service.
    -This service is pretty simple, it unpacks EAR, resolves "Class-Path:" entries -of MANIFEST files and ejb-link elements, and set up JACC security. Once -everything is correctly setup, it send components to each service (ejb or -web) which will deploy them by using information provided by the Ear -service.

    - -

    As explained in web container service, all the parsing/handling of XML -deployment descriptors is done in another package which is for Ear service -the org.objectweb.jonas_ear.deployment -package.

    - -

    Transaction Service

    - -

    This service encapsulate a Java Transaction Monitor called JOTM (a project from ObjectWeb). It is a -mandatory service which handles distributed transactions. It provides -transaction management for EJB components as defined in their deployment -descriptors. It handles two-phase commit protocol against any number of -Resource Managers (XA Resources). For J2EE, a transactional resource may be a -JDBC connection, a JMS session, or a J2EE CA Resource Adapter connection. The -transactional context is implicitly propagated with the distributed requests. -The Transaction Monitor can be distributed across one or more JOnAS servers; -thus a transaction may involve several components located on different JOnAS -servers. This service implements the JTA 1.0.1 specification, thus allowing -transactions from application components or from application clients to be -explicitly started and terminated. Starting transactions from application -components is only allowed from Web components, session beans, or -message-driven beans (only these two types of beans, which is called -"Bean-managed transaction demarcation").

    - -

    The Transaction service may be found in the org.objectweb.jonas.jtm -package.

    - -

    Database Service

    - -

    This service is responsible for handling Datasource objects. A Datasource -is a standard JDBC administrative object for handling connections to a -database. The Database service creates and loads such datasources on the -JOnAS server. Datasources to be created and deployed can be specified at -JOnAS configuration time, or they can be created and deployed at server -runtime using the JOnAS administration tools. The Database service is also -responsible for connection pooling; it manages a pool of database connections -to be used by the application components, thus avoiding many physical -connection creations, which are time-consuming operations.

    -

    The database service should now be replaced by the JDBC Resource Adapter, to be deployed -by the J2EE CA Resource Service (see below), which additionally provides JDBC -PreparedStatement pooling. - -

    The Database Service is implemented in the org.objectweb.jonas.dbm -package.

    - -

    Messaging Service

    - -

    For supporting Message-driven Beans and JMS operations coded within -application components, the JOnAS application server relies on a JMS -implementation. JOnAS makes use of a third-party JMS implementation; -currently the JORAM open source -software is integrated and delivered with JOnAS, the SwiftMQ product has also been used in -previous versions of JOnAS, and other JMS provider implementations can easily -be integrated. JORAM provides several noteworthy features: in particular, -reliability (with a persistent mode), distribution (transparently to the JMS -client, it can run as several servers, thus allowing load balancing), and the -choice of TCP or SOAP as communication protocol for transmitting messages.

    - -

    The JMS service is in charge of launching (or establishing connection to) -the integrated JMS server, which may or may not run in the same JVM as JOnAS. -It also provides connection pooling and thread pooling (for Message-driven -Beans). Through this service, JOnAS provides facilities to create -JMS-administered objects such as the connection factories and the -destinations, either at server launching time or at runtime using the JOnAS -administration tools.

    - -

    This service is implemented in the org.objectweb.jonas.jms -package.

    - -

    Note that the same function of JMS implementation integration should now -be achieved through a Resource Adapter, to be deployed by the J2EE CA -Resource Service (see below). Such a Resource Adapter (J2EE CA 1.5) is provided for -JORAM. The Messaging service will become deprecated.

    - -

    J2EE CA Resource Service

    - -

    The J2EE Connector Architecture (J2EE CA) allows the connection of -different Enterprise Information Systems (EIS) to a J2EE application server. -It is based on the Resource Adapter (RA), an architecture component -comparable to a software driver, which connects the EIS, the application -server, and the enterprise application (J2EE components). The RA is generally -provided by an EIS vendor and provides a Java interface (the Common Client -Interface or CCI) to the J2EE components for accessing the EIS (this can also -be a specific Java interface). The RA also provides standard interfaces for -plugging into the application server, allowing them to collaborate to keep -all system-level mechanisms (transactions, security, and connection -management) transparent from the application components.

    -The application performs "business logic" operations on the EIS data using -the RA client API (CCI), while transactions, connections (including pooling), -and security on the EIS are managed by the application server through the RA -(system contract). - -

    The JOnAS Resource service is in charge of deploying J2EE CA-compliant -Resource Adapters (connectors), packaged as RAR files, on the JOnAS server -(such connectors will be loaded in the Application classloader). RAR files -can also be included in EAR files, in which case the connector will be loaded -by classloader of the EAR. Once Resource Adapters are deployed, a connection -factory instance is available in the JNDI namespace to be looked up by -application components.

    - -

    The Resource Service is implemented in the org.objectweb.jonas.resource -package.

    - -

    A J2EE CA 1.5 Resource Adapter for JDBC is available with JOnAS. It can -replace the current JOnAS database service for plugging JDBC drivers and -managing connection pools. It also provides JDBC PreparedStatement -pooling.

    - -

    A J2EE CA 1.5 Resource Adapter for JMS is available with JOnAS. It can -replace the current JOnAS Messaging service for plugging JORAM.

    - - -

    Security Service

    - -

    This service implements the authorization mechanisms for accessing J2EE -components, as specified in the J2EE specification.

    - -

    In JOnAS, the mapping between roles and user identification is done in the -user identification repository. This user identification repository can be -stored either in files, in a JNDI repository (such as LDAP), or in a -relational database. This is achieved through a JOnAS implementation of the -Realm for each Web container and through the JAAS login modules for Java -clients. These Realms use authentication resources provided by JOnAS, which -rely either on files, LDAP or JDBC. These realms are in charge of propagating -the security context to the EJB container during EJB calls. JAAS login -modules are provided for user authentication of Web Container and Java -clients. Certificate-based authentication is also available, with -CRLLoginModule login module for certificate revocation.

    - -

    JOnAS also implements the Java Authorization Contract for Containers (JACC -1.0) specification, allowing authorizations to be managed as java security -permissions, and providing the ability to plug any security policy -provider.

    - -

    More details about security handling within JOnAS is provided within the -Configuring -Security section of the JOnAS Configuration Guide.

    - -

    There are 3 major packages for implementing the security in JOnAS.

    -
      -
    1. The first package is org.objectweb.security - which is composed of two important classes. A SecurityContext class which - contains Principal names, J2EE roles, etc. and the SecurityCurrent which - manages the current SecurityContext of each J2EE component. - SecurityContext object is associated to a ThreadLocal object. There is an - exception for the client container: In this case, the SecurityContext is - available for all the JVM and not only for one thread. This allows to - have multi-thread applications like swing/awt applications to have always - a SecurityContext object.
      -
    2. -
    3. The second package is org.objectweb.jonas.security.
      - This package contains the implementation of the security service, the - JAAS login modules (and the JAAS callbacks) provided by JOnAS. The - classes used to interact with external authentication like - Datasource/LDAP/Files are present in the realm subpackage. It contains - also RMI interceptors for JOnAS protocols like rmi/jrmp, - rmi/iiop. For IIOP protocol, this package contains CSIv2 interceptors to - allow security propagation over iiop which is required for J2EE 1.4. - (org.objectweb.jonas.security.iiop).
      - To be compliant with J2EE 1.4, JOnAS setup the JACC provider with classes - which are in the package org.objectweb.jonas.security.jacc. - Note that this package doesn't contains the JACC provider, but only the - classes to configure the JACC provider which is set by JOnAS - administrator. The last subpackage and not the least is the subpackage - implementing the specific Realm for Tomcat or Jetty by relying on - existing JOnAS classes. It consists in simple wrapper classes. These - classes are in package - org.objectweb.jonas.security.realm.web.xxx where xxx is - catalina50, catalina55, jetty50, etc.
      -
    4. -
    5. The third package is the org.objectweb.jonas_lib.security - package.
      - This package contains the JACC provider which is used by default. Users - can use their own JACC provider by setting properties at the JVM startup. - The classes in this package implement/extend classes defined by the JSR 115
    6. -
    - - - -

    Management Service

    - -

    The Management service is needed to administrate a JOnAS server from the -JOnAS administration console. Each server running this service is visible -from the administration console. This service is based on JMX. Standard -MBeans are defined within the JOnAS application server; they expose the -management methods of the instrumented JOnAS server objects such as services, -containers, the server itself. These MBeans implements the management model -as specified in the J2EE Management Specification. The Management service -runs a JMX server - , and is implemented in the org.objectweb.jonas.jmx -package. The MBeans of the JOnAS server are registered within this JMX -server. The JOnAS administration console is a Struts-based Web application -(servlet/JSP) that accesses the JMX server to present the managed features -within the administration console. Thus, through a simple Web browser, it is -possible to manage one or several JOnAS application servers. The -administration console provides a means for configuring all JOnAS services -(and making the configuration persistent), for deploying any type of -application (EJB-JAR, WAR, EAR) and any type of resource (DataSources, JMS -and Mail connection factories, J2EE CA connectors), all without the need to -stop or restart the server. The administration console displays information -for monitoring the servers and applications, such as used memory, used -threads, number of EJB instances, which component currently uses which -resources, etc.. When Tomcat is used as Web Container, the Tomcat Management -is integrated within the JOnAS console. A Management EJB (MEJB) is also -delivered, providing access to the management features, as specified in the -J2EE Management Specification.

    - -

    Discovery Service

    - -

    The discovery service is used to support domain management. A JOnAS -management domain is composed of a set of JOnAS servers that are running -under the same management authority and are identified by a domain name. The -servers in a domain may be administred by a management application running on -one server in the domain; this is the master server. The managed servers are -slaves. The discovery service is based on a mutlicast communication -infrastructure allowing message broadcasting in order to publish the -connector-server addresses and state changes of the servers in the domain. -The master servers listen to these discovery messages. Moreover, they are -able to broadcast messages asking the servers in the domain to identify -themselves

    - -

    Mail Service

    - -

    A J2EE application component can send e-mail messages using JavaMailTM. The -Mail service of the JOnAS application server provides the necessary resources -to such application components. The Mail service creates mail factories and -registers these resources in the JNDI namespace in the same way that the -database service or the JMS service creates Datasources or -ConnectionFactories and registers these objects in the JNDI namespace. There -are two types of mail factories: javax.mail.Session and -javax.mail.internet.MimePartDataSource.

    - -

    The Mail service is implemented in the org.objectweb.jonas.mail -package.

    - -

    WebServices Service

    - -

    This service is implemented on top of AXIS and is used for the deployment of -Web Services. Only a very small part of the deployment work is done during -the installation time: most of the work is done offline with a tool like -GenIC, WsGen. -
    -

    - -

    Offline ws processing (WsGen)
    -

    -
    -WsGen -is the offline tool that is responsible of all generation operations for a -given archive. It can process EjbJar, WebApp, AppClient and Ear. It will -unpack the input archive if needed (ear/war case), read the deployment -descriptor of the given component and will generate artifact accordingly. 3 -types of artifacts can be generated:
    - - - -

    - -

    WsGen will build server side artifacts if a webservices.xml descriptor is -found in the archive (can be an EjbJar or a WebApp):
    -

    - - -

    - -

    Client side artifacts are generated only if WsGen find some service-ref -elements in web.xml, ejb-jar.xml or application-client.xml:
    -

    - - -

    Runtime processing

    - -This JOnAS service is used to set some Axis property at JOnAS startup and is -in charge of some webservice specific deployment operations:
    - - - -Each component that want to be client of a webservices has to declare a -dependency on that webservice using service-ref (like ejb-ref, ...). At -deploy time, each container (web, ejb and client) is responsible to create -and fill the Context of each deployed component. Each container has a -createCompponentContext() method (web, ejb, client) that have been updated to -handle service-ref.
    -Each service-ref is bound in the Component Context as a Reference configured -to permit the javax.xml.rpc.Service creation (using an ObjectFactory) when -the client performs the lookup.
    - - -Besides WSDL publication done by the ws service with WSDLHandler, Axis give -us an elegant way to obtain the service WSDL with just a simple URL: you just -have to append to the endpoint URL the String ?WSDL to retrieve the desired -WSDL.
    -In JOnAS, this idea has been reused and enhanced for allowing handling of -import/include of WSDL definition to other XML Document (WSDL or Schema) and -this, recursivly ! Append ?JWSDL (Notice the J !) to your endpoint URL and -you'll see the WSDL packaged inside your webapp (no runtime generation) with -some updates (URL endpoints + imports/includes).
    -
    - - -

    2 main packages:
    -

    -
      -
    1. org.objectweb.jonas_ws: contains all XML descriptors handling code - (deployment/xml deployment/api + deployment/lib) and WsGen code
    2. -
    3. org.objectweb.jonas.ws: contains runtime classes WSService + Axis glue - for JOnAS
    4. -
    - -

    - -

    Webservices related documentation :
    -

    - - -

    - -

    JOnAS Management Architecture

    - -

    As previously explained, JOnAS Management is based on JMX. Standard MBeans -are defined within the JOnAS application server; they expose the management -methods of the instrumented JOnAS server objects such as services, -containers, the server itself. They are registered within the JMX server -embedded within the JOnAS Management Service, and may then be accessed by any -JMX client.

    - -

    - -

    JOnAS JMX Management

    - -

    - -

    Related documentation:

    - -

    Domain -Management in JOnAS (explain the domain management feature of JOnAS, -available from JOnAS 4.4 only)

    - -

    Discovery -Service Configuration (description of the discovery service, used for -domain support, available from JOnAS 4.4 only)

    - -

    JSR160 -Support in JOnAS (explain the principles to remotely access to the JOnAS -MBeans server, e.g. for remote management, used by the domain management -features)

    - -

    Administration -Guide (JonasAdmin console principles, MEJB description)

    - -

    Working with -Management Beans (key and short document to understand JOnAS management -principles)

    - -

    JOnAS -and JMX, registering and manipulating MBeans (contributed document -explaining how to register applicative MBeans within the JOnAS JMX server)

    - -

    - -

    Clustering and Performance

    - -

    Clustering for an application server generally makes use of three -features: Load Balancing (LB), High Availability (HA) and Failover. Such -mechanisms can be provided at the Web container level by dispatching requests -to several Servlet/JSP engine instances, at the EJB container level by -dispatching EJB requests to several EJB container instances, and at the -database level by using several databases. A replicated JNDI naming is also -necessary.

    - -

    JOnAS provides Load Balancing, HA, and Failover at the WEB container level -using the Apache Tomcat mod_jk plugin and an HTTP in memory -session-replication mechanism provided with Tomcat. The plugin dispatches -HTTP requests from the Apache web server to Tomcat instances running as JOnAS -web containers. Server fluctuations are automatically taken into account. -This plugin supports round-robin and weighted round-robin load-balancing -algorithms, with a sticky session option.

    - -

    Load balancing and HA are provided at the EJB container level in JOnAS. -Operations invoked on EJB Home interfaces (EJB creation and retrieval) are -dispatched on the nodes of the cluster. The mechanism is based on a -"clustered-aware" replicated JNDI registry using a Clustered remote Method -Invocation protocol (CMI). The stubs contain the knowledge of the cluster and -implement the load-balancing policy, which may be random, round-robin and -weighted round-robin. Failover at the EJB level will be provided by -implementing a stateful session bean state replication mechanism.

    - -

    The JOnAS clustering architecture is illustrated in the following -figure.

    -Clustered Architecture - -

    JOnAS provides documentation for configuring such an architecture, the JOnAS -Clustering Document.

    - -

    The use of the C-JDBC ObjectWeb -project offers load balancing and high availability at the database level. -The use of C-JDBC is transparent to the application (in our case to JOnAS), -since it is viewed as a standard JDBC driver. However, this "driver" -implements the cluster mechanisms (reads are load-balanced and writes are -broadcasted). The database is distributed and replicated among several nodes, -and C-JDBC load balances the queries between these nodes. An evaluation of -C-JDBC using the TPC-W benchmark on a 6-node cluster has shown performance -scaling linearly up to six nodes.

    - -

    In addition to clustering solutions, JOnAS provides many mechanisms, -intrinsic to the JOnAS server, for being highly scalable and efficient. This -includes the following:

    - - -

    Optimizations related to entity beans are described in the Tuning -Container for Entity Bean Optimizations section of the JOnAS -documentation. More details about available CMP tuning features are provided -below.

    - -

    CMP Tuning Features

    - -

    JOnAS provides many CMP tuning features, which may be specified through -server specific deployment elements, at the entity bean level (so that one -policy per component may be defined).

    - -

    - -

    1) Lock Policy (Concurrent Access)

    - -

    The <lock-policy> elements may have the following value:

    -
      -
    1. Container-serialized (default): The container ensures - the transaction serialization. This policy is suitable for most entity - beans, particularly if the bean is accessed only from this container - (shared = false).
    2. -
    3. Container-read-committed: This policy is similar to - container-serialized, except that accesses outside transaction do not - interfere with transactional accesses. This can avoid deadlocks in - certain cases, when accessing a bean concurrently with and without a - transactional context. The only drawback of this policy is that it - consumes more memory (2 instances instead of 1).
    4. -
    5. Container-read-uncommitted: all methods share the same - instance (like container-serialized), but there is no synchronization. - For example, this policy is of interest for read-only entity beans, or if - the bean instances are very rarely modified. It will fail if 2 or more - threads try to modify the same instance concurrently.
    6. -
    7. Database: Let the database deal with transaction - isolation. With this policy, you can choose the transaction isolation in - your database. This may be of interest for applications that heavily use - transactional read-only operations, or when the flag shared is needed. It - does not work with all databases and is not memory efficient.
    8. -
    9. Read-only: The bean is never written to database. If - the bean is shared, the bean state is read from database regularly.
    10. -
    - -

    Note: If you deploy CMP1 beans, you should use the default policy only -(container-serialized), unless your beans are "read-only". In this latter -case, you can use container-read-uncommitted.

    - -

    2) Database dedicated access

    - -

    JOnAS can do some data access optimization if the persistent state of an -entity bean is accessed only by the JOnAS server. The optimization consists -in not re-reading the bean state before starting a new transaction if the -bean is already in memory. Indeed, as nobody else can modify the state of the -bean on the persistent support, it is not necessary to re-read it. This may -be specified to JOnAS by using the <shared> element -and setting it to false. If the <shared> element is set to true, it -means that the bean persistent state can be accessed outside the JOnAS -Server, and then the optimization cannot be done. The default value is false -if lock-policy is container-serialized, and true in the other cases.

    - -

    3) Data pre-fetching

    - -

    The <prefetch> element is a CMP2-specific option. -The default is false. This can be set to true if it is desirable to have a -cache managed after finder methods execution, in order to optimize further -accesses, inside the same transaction.

    - -

    Important notes:

    - - -

    4) Instances pooling / caching

    - -

    Four elements allow specifying entity beans instances management.

    - -

    - The first one, <max-cache-size>, is an integer -value that represents the maximum number of instances in memory. The purpose -of this value is to keep JOnAS scalable. The default value is "no limit". To -save memory, this value should be set very low if you know that instances -will not be reused.

    - -

    - The second one, <min-pool-size>, is an integer -value representing the number of instances that will be created in the pool -when the bean is loaded. This will improve bean instance creation time, at -least for the first instances. The default value is 0.

    - -

    - The third one, <passivation-timeout>, allows -tuning the entity bean instances passivation activity (saving memory by -sending instances on the persistent support), in accordance with the previous -persistence tuning elements. Entity bean instances are passivated at the end -of each transaction and reactivated at the beginning of the next transaction, -when the shared flag has been set to true. In case shared has been set to -false, a passivation will occur only if max-cache-size has been reached. In -the event that these instances are accessed outside a transaction, their -state is kept in memory to improve performance. However, a passivation will -occur in three situations:

    -
      -
    1. When the bean is unloaded from the server, at least when the server is - stopped.
    2. -
    3. When a transaction is started on this instance.
    4. -
    5. After a configurable timeout. If the bean is always accessed with no - transaction, it may be prudent to periodically store the bean state on - disk.
    6. -
    - -

    - The fourth one is <inactivity-timeout>: Bean -passivation sends to persistent storage the state of the bean and removes -from memory only the bean instance objects holding this state. All container -objects handling bean access (remote object, interceptors ...) are kept in -memory so that future access will work, only requiring a reload operation -(getting the state). You may want to save more memory and completely remove -the bean instance from memory, this may be achieved through the -<inactivity-timeout> element. This element is used to save memory when -a bean has not been used for a long time. After the time specified, in -seconds, and if the bean has not been used meanwhile, all its container -objects are removed from the server. If a client has kept a reference on a -remote object, it will get an exception if it tries to use it.

    - -

    5) Db Connections pooling

    - -

    For database access, JOnAS provides a sophisticated connection pools -management. See the Configuring -JDBC Datasource section of the JOnAS Configuration Guide (available soon -for the JDBC connector). Connection pooling saves the high cost of physical -connection creation by maintaining a pool of such connections. Connection -pools may be tuned using the following properties:

    - - -

    6) PreparedStatement pooling

    - -

    The JOnAS JDBC connector manages pools of JDBC PreparedStatements.

    - -

    - -

    Sun, Java, and all -Java-based trademarks are trademarks or registered trademarks of Sun -Microsystems, Inc. in the U.S. and other countries.

    - - diff --git a/jonas_doc/core/olddoc/howto/JonasMBeansHowTo.html b/jonas_doc/core/olddoc/howto/JonasMBeansHowTo.html deleted file mode 100644 index b2e3f43e5a5d4b004e1ea61573d70548955a369b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/JonasMBeansHowTo.html +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - JOnAS and JMX, registering and manipulating MBeans - - - - -

    Howto: JOnAS and JMX, registering and manipulating MBeans

    -

    By Jonny Way.

    -

    Introduction

    - -

    JMX (Java Management eXtensions) is an API for managing, among other -things, J2EE applications. JOnAS (version 4 and above) integrates the MX4J -open-source JMX server and registers a number of MBeans. The web-based -JonasAdmin application acts as a JMX client, enabling viewing and -manipulation of these MBeans.

    - -

    It maybe desirable for an application to expose its own MBeans via the JMX -server to allow application management (using, for example, MC4J). JOnAS -currently does not provide a prebuilt method for registering MBeans with its -JMX server. The intent of this document is to illustrate one method of registering -application-specific MBeans with the JOnAS JMX server based on the m-let -service.

    - -

    ServletContextListener

    - -

    The basic task of registering an MBean with the JOnAS JMX server is -accomplished by the following implementation of the ServletContextListener -interface. This implementation reads a number of MLet files, which specify the -MBeans to be registered, and attempts to register those beans during the web -application context initialization.

    -
                    
    -import java.net.MalformedURLException;
    -import java.net.URL;
    -import java.util.Iterator;
    -import java.util.ArrayList;
    -import java.util.List;
    -import java.util.Set;
    -import java.util.StringTokenizer;
    -
    -import javax.management.InstanceAlreadyExistsException;
    -import javax.management.InstanceNotFoundException;
    -import javax.management.ReflectionException;
    -import javax.management.MBeanServer;
    -import javax.management.MBeanException;
    -import javax.management.MBeanRegistrationException;
    -import javax.management.MBeanServerFactory;
    -import javax.management.MalformedObjectNameException;
    -import javax.management.NotCompliantMBeanException;
    -import javax.management.ObjectInstance;
    -import javax.management.ObjectName;
    -import javax.management.loading.MLet;
    -import javax.management.loading.MLetMBean;
    -import javax.servlet.ServletContextEvent;
    -import javax.servlet.ServletContext;
    -import javax.servlet.ServletContextListener;
    -
    -import org.apache.log4j.Logger;
    -
    -/**
    - * ServletContextListener designed to register JMX MBeans into 
    - * an existing JMX server when the application starts up. The
    - * MBeans to be loaded are specified in the MLet files whose
    - * names are given in the servlet context parameter with the name mletFiles,
    - * in a semi-colon delminated list (although this is not really
    - * needed as multiple mlets can be specifyed in one file, it might
    - * be useful). Note that the filename are relative to the WEB-INF
    - * directory of the servlet context being listened to.
    - * 
    - * Note, that this listener should precede (in web.xml) any other that depend
    - * on the MBeans being registered. 
    - * 
    - * Note that the MBean registration is sensitive to classloader issues. For
    - * example, when registering the MBeans in the JMX server provided by
    - * the Jonas application server any libraries required by the MBeans need
    - * to be in the central lib directory (lib/ext).
    - * 
    - * 
    - * @author Jonny Wray
    - *
    - */
    -public class MBeanRegistrationListener implements ServletContextListener {
    -        
    -        private static final String MLET_DOMAIN = "MBeanRegistrationListener";
    -        private static final String MLET_BEAN_NAME = MLET_DOMAIN+":Name=MLet";
    -        private static final String MLETFILE_INITPARAM_NAME = "mletFiles";
    -        private static final Logger log = Logger.getLogger(MBeanRegistrationListener.class);
    -        
    -        
    -        private MBeanServer lookForExistingServer(){
    -                List mbeanServers = MBeanServerFactory.findMBeanServer(null);
    -                if(mbeanServers != null && mbeanServers.size() > 0){
    -                        return (MBeanServer)mbeanServers.get(0);
    -                }
    -                return null;
    -        }
    -        
    -        private MBeanServer getMBeanServer(){
    -                MBeanServer server = lookForExistingServer();
    -                if(server == null){
    -                        server = MBeanServerFactory.createMBeanServer(MLET_DOMAIN);
    -                }
    -                return server;
    -        }
    -        
    -        
    -        public void contextDestroyed(ServletContextEvent arg0) {
    -                log.info("Destroy event");
    -                // Anything that needs to be done here on deregistering of the
    -                // web application?
    -        }
    -
    -        
    -        private List getMLetURLs(String filenames){
    -                List urls = new ArrayList();
    -                StringTokenizer tok =
    -                        new StringTokenizer(filenames, ";");
    -                while(tok.hasMoreTokens()){
    -                        String filename = tok.nextToken();
    -                        URL configURL = Thread.currentThread().getContextClassLoader().getResource(filename);
    -                        if(configURL == null){
    -                                log.error("Cound not load MLet file resource from "+filename+" using current thread context classloader");
    -                        }
    -                        else{
    -                                urls.add(configURL);
    -                        }
    -                }
    -                return urls;
    -        }
    -        
    -        private List getMLetURLs(ServletContext context, String filenames){
    -                List urls = new ArrayList();
    -                StringTokenizer tok =
    -                        new StringTokenizer(filenames, ";");
    -                while(tok.hasMoreTokens()){
    -                        String filename = "/WEB-INF/"+tok.nextToken();
    -                        URL configURL = null;
    -                        try {
    -                                configURL = context.getResource(filename);
    -                        } 
    -                        catch (MalformedURLException e) {
    -                                log.error("URL for "+filename+" is malformed", e);
    -                        }
    -                        if(configURL == null){
    -                                log.error("Cound not find MLet file resource from "+filename+" in servlet context");
    -                        }
    -                        else{
    -                                urls.add(configURL);
    -                        }
    -                }
    -                return urls;
    -        }
    -        
    -        /**
    -         * Dynamically register the MBeans specified in the list
    -         * of MLet files (relative to /WEB-INF/) specified in servlet context parameter
    -         * mletFiles as a semi-colon deliminated list of file names.
    -         * 
    -         * The algorithm looks for already running JMX servers and uses
    -         * the first it comes across. If no servers are running, then
    -         * it creates one.
    -         * 
    -         * Note, the interface does not define any exceptions to be
    -         * thrown. Currently, any exceptions thrown during registration
    -         * are logged at error level and then ignored. This seems 
    -         * reasonable, as these may or may not be a fatal event. In 
    -         * this way the registration process reports its failure and
    -         * the application context initialization continues.
    -         */
    -        public void contextInitialized(ServletContextEvent arg0) {
    -                log.info("Initializing event");
    -                String filenames = arg0.getServletContext().getInitParameter(MLETFILE_INITPARAM_NAME);
    -                if(filenames != null && filenames.length() > 0){
    -                        MBeanServer server = getMBeanServer();
    -                        if(server != null){
    -                                try{
    -                                        ObjectName name = new ObjectName(MLET_BEAN_NAME);
    -                                        if(!server.isRegistered(name)){
    -                                                log.info("Creating new MLetMBean for dynamic registration");
    -                                                MLetMBean mletService = new MLet();
    -                                                server.registerMBean(mletService, name);
    -                                        }
    -                                        List urls = getMLetURLs(arg0.getServletContext(), filenames);
    -                                        for(int i=0;i < urls.size();i++){
    -                                                URL url = (URL)urls.get(i);
    -                                                try {
    -                                                        log.info("Registering MBeans from MLet file "+url);
    -                                                        Set loadedMBeans = (Set)server.invoke(name, "getMBeansFromURL", 
    -                                                                        new Object[]{url}, new String[]{URL.class.getName()});
    -        
    -                                                        processRegisteredMBeans(loadedMBeans);
    -                                                } 
    -                                                catch (InstanceNotFoundException e) {
    -                                                        log.error("Unable to register MBeans from MLet file "+url, e);
    -                                                } 
    -                                                catch (MBeanException e) {
    -                                                        log.error("Unable to register MBeans from MLet file "+url, e);
    -                                                } 
    -                                                catch (ReflectionException e) {
    -                                                        log.error("Unable to register MBeans from MLet file "+url, e);
    -                                                }
    -                                        }
    -                                }
    -                                catch(MalformedObjectNameException e){
    -                                        log.error("Unable to register the MLetMBean", e);
    -                                }
    -                                catch(NotCompliantMBeanException e){
    -                                        log.error("Unable to register the MLetMBean", e);
    -                                }
    -                                catch(MBeanRegistrationException e){
    -                                        log.error("Unable to register the MLetMBean", e);
    -                                }
    -                                catch(InstanceAlreadyExistsException e){
    -                                        log.error("Unable to register the MLetMBean", e);
    -                                }
    -                        }
    -                        else{
    -                                log.error("MBeanServer not found and could not be created. Not registering MBeans.");
    -                        }
    -                }
    -                else{
    -                        log.error("No mletFiles servlet context parameter found.");
    -                }
    -        }
    -        
    -        private void processRegisteredMBeans(Set loadedMBeans) {
    -                log.debug("Loaded beans: "+loadedMBeans.size());
    -                Iterator it = loadedMBeans.iterator();
    -                while(it.hasNext()){
    -                        Object o = it.next();
    -                        if(o instanceof ObjectInstance){
    -                                ObjectInstance inst = (ObjectInstance)o;
    -                                log.info("Registered: "+inst.getObjectName());
    -                        }
    -                        else if(o instanceof Throwable){
    -                                Throwable err = (Throwable)o;
    -                                log.error("Error registering MBeans", err);
    -                        }
    -                }
    -        }
    -
    -}
    -                        
    - - -

    Configuration

    - -

    In order to use the above ServletContextListener, it must be configured -in the web.xml of the web application that wants to register the MBeans. For -example, the following lines added to the web.xml will result in the -registeration of the MBeans specified in the application.mlet file under the -WEB-INF directory. Multiple MLet files can be specified in a comma-separated -list.

    -
    
    -        <context-param>
    -                <param-name>mletFiles</param-name>
    -                <param-value>application.mlet</param-value>
    -        </context-param>
    -
    -        <listener>
    -                <listener-class>net.fiveprime.jmx.MBeanRegistrationListener</listener-class>
    -        </listener>
    -                
    - - -

    An example MLet file to load an extension (detailed below) of the -HibernateService MBean is:

    -
    <mlet code="ConfigurableHibernateService"
    -                name="HibernateService:Name=HibernateService"
    -                archive="mbeans.jar">
    -        <arg type="java.lang.String" value="hibernate.cfg.xml">
    -        <arg type="java.lang.String" value="hibernate/HibernateSessionFactory">
    -        <arg type="java.lang.String" value="DefaultDS">
    -</mlet>
    -                        
    - -

    Library Dependences

    - -

    Registration of MBeans results in their construction by the JMX server. As -such, any classes the MBean is dependent on must be available to the JMX -server, in lib/ext.

    - -

    HibernateService Extension

    - -

    The Hibernate distribution provides an implementation of -HibernateServiceMBean in the class HibernateService. In the MLet file above, -an extension of this class is specified that allows the HibernateService to be -configured from an external file, such as the standard hibernate.cfg.xml -file. There are a number of situations where it is desirable to use the Hibernate mapped -classes outside of Jonas running a JMX server. This allows the -Hibernate mapping files and properties to be specified in one place and used in multiple -situations. If this is not needed, then the HibernateService class can be -used directly.

    -
    
    -import java.io.IOException;
    -import java.net.URL;
    -import java.util.ArrayList;
    -import java.util.HashMap;
    -import java.util.Iterator;
    -import java.util.List;
    -import java.util.Map;
    -
    -import net.sf.hibernate.HibernateException;
    -import net.sf.hibernate.jmx.HibernateService;
    -
    -import org.apache.commons.digester.Digester;
    -import org.apache.commons.logging.Log;
    -import org.apache.commons.logging.LogFactory;
    -import org.xml.sax.SAXException;
    -/**
    - * Extension of the HibernateService class to add configuration
    - * ability from a Hibernate XML configuration file.
    - * 
    - * @author Jonny Wray
    - *
    - */
    -public class ConfigurableHibernateService extends HibernateService {
    -
    -        private static Log log = LogFactory.getLog(ConfigurableHibernateService.class);
    -        
    -        /**
    -         * Configure this HibernateService from an XML file
    -         * 
    -         * @param filename The Hibernate XML configuration file, for example hibernate.cfg.xml
    -         * @param jndiName The JNDI name that the session factory will be registered under
    -         * @param datasourceName The name of the datasource used by the session factory
    -         * @throws HibernateException If there's a problem reading the configuration file
    -         */
    -        public ConfigurableHibernateService(String filename, String jndiName, String datasourceName) 
    -                throws HibernateException{
    -                
    -                init(filename, jndiName, datasourceName);
    -                start();
    -        }
    -        
    -        private void init(String filename, String jndiName, String datasourceName) throws HibernateException {
    -                if(log.isDebugEnabled()){
    -                        log.debug("Configuring Hibernate JMX MBean with filename "+filename+
    -                                ", JNDI name "+jndiName+" and datasource "+datasourceName);
    -                }
    -                try{
    -                        URL url = this.getClass().getClassLoader().getResource(filename);
    -                        Digester mappingDigester = configureMappingDigester();
    -                        List results = (List)mappingDigester.parse(url.openStream());
    -                        Iterator it = results.iterator();
    -                        while(it.hasNext()){
    -                                StringBuffer buffer = (StringBuffer)it.next();
    -                                addMapResource(buffer.toString());
    -                                log.debug("Adding mapping resource "+buffer.toString());
    -                        }
    -                        
    -                        Digester propertyDigester = configurePropertyDigester();
    -                        Map resultMap = (Map)propertyDigester.parse(url.openStream());
    -                        it = resultMap.keySet().iterator();
    -                        while(it.hasNext()){
    -                                String key = (String)it.next();
    -                                String value = (String)resultMap.get(key);
    -                                setProperty("hibernate."+key, value);
    -                                log.debug("Adding property ("+key+","+value+")");
    -                        }
    -                        setJndiName(jndiName);
    -                        setDatasource(datasourceName);
    -                }
    -                catch(IOException e){
    -                        throw new HibernateException(e);
    -                }
    -                catch(SAXException e){
    -                        throw new HibernateException(e);
    -                }
    -        }
    -        
    -        private Digester configureMappingDigester(){
    -                Digester digester = new Digester();
    -                digester.setClassLoader(this.getClass().getClassLoader());
    -                digester.setValidating(false);
    -                digester.addObjectCreate("hibernate-configuration/session-factory", ArrayList.class);
    -                
    -                digester.addObjectCreate("hibernate-configuration/session-factory/mapping", StringBuffer.class);
    -                digester.addCallMethod("hibernate-configuration/session-factory/mapping", "append", 1);
    -                digester.addCallParam("hibernate-configuration/session-factory/mapping", 0, "resource");
    -                digester.addSetNext("hibernate-configuration/session-factory/mapping", "add");
    -                
    -                return digester;
    -        }
    -        
    -        private Digester configurePropertyDigester(){
    -                Digester digester = new Digester();
    -                digester.setClassLoader(this.getClass().getClassLoader());
    -                digester.setValidating(false);
    -                digester.addObjectCreate("hibernate-configuration/session-factory", HashMap.class);
    -                
    -                digester.addCallMethod("hibernate-configuration/session-factory/property", "put", 2);
    -                digester.addCallParam("hibernate-configuration/session-factory/property", 0, "name");
    -                digester.addCallParam("hibernate-configuration/session-factory/property", 1);
    -
    -                return digester;
    -        }
    -}
    -
    -            
    - - diff --git a/jonas_doc/core/olddoc/howto/WebSphereMQ.html b/jonas_doc/core/olddoc/howto/WebSphereMQ.html deleted file mode 100644 index 4786a4fc54eb0987698721899a7fbac5e6847da1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/WebSphereMQ.html +++ /dev/null @@ -1,309 +0,0 @@ - - - - - - Using WebSphere MQ JMS guide - - - - -

    Howto: Using WebSphere MQ JMS guide

    - -

    This document explains how WebSphere MQ (formerly MQSeries) can be used as -JMS provider within a JOnAS application server.

    - -

    WebSphere MQ is the messaging platform developed by IBM. It provides Java -and JMS interfaces. Documentation is located at -http://www-3.ibm.com/software/integration/mqfamily/library/manualsa/.

    - -

    This document was written after integration work done with JOnAS 3.3 and -3.3.1 and WebSphere MQ 5.3.

    -

    This document may be used only when working with JOnAS 3.3

    -

    Since JOnAS 4.8 a specific resource adaptor JCA JOnAS-MQ is available for accessing to WebSphere MQ. -The corresponding documentation is currently being written and will be available soon.

    - -

    The content of this guide is the following:

    - - -

    Architectural rules

    - -

    WebSphere MQ, contrary to JORAM or SwiftMQ, cannot run collocated with -JOnAS. WebSphere MQ is an external software which must be independently -administered and configured.

    - -

    Administering WebSphere MQ consists of the following:

    - - -

    The link between JOnAS and WebSphere MQ is established via the registry. -WebSphere MQ JMS objects are bound to the JOnAS registry. JMS lookups will -then return the WebSphere MQ JMS objects, and messaging will take place -through these objects.

    - -

    Given the complex configuration of WebSphere MQ JMS objects, it is not -possible to create these objects from JOnAS. Therefore, during the starting -phase, a JOnAS server expects that WebSphere MQ JMS objects have already been -bound to the registry. Thus it is necessary to start an independent registry -to which WebSphere MQ can bind its JMS objects, and which can also be used by -the starting JOnAS server. The start-up sequence looks like the following:

    -
      -
    1. Starting a registry.
    2. -
    3. Creating and binding WebSphere MQ JMS objects.
    4. -
    5. Launching the JOnAS server.
    6. -
    - -

    The following architecture is proposed:

    - - -

    Setting the JOnAS Environment

    - -

    The proposed architecture requires running two JOnAS server instances. For -this, the following steps are proposed:

    -
      -
    1. Create two base directories: e.g., JONAS_REGISTRY and - JONAS_EJB.
    2. -
    3. Set the JONAS_BASE environment variable so that it points to the - JONAS_REGISTRY directory.
    4. -
    5. In the $JONAS_ROOT directory, type: ant create_jonasbase.
    6. -
    7. Set the JONAS_BASE environment variable so that it points to the - JONAS_EJB directory.
    8. -
    9. In the $JONAS_ROOT directory, type: ant create_jonasbase.
    10. -
    - -

    The JOnAS servers can now be configured independently.

    - -

    Configuring the "Registry" server

    - -

    The "Registry" server is the JOnAS server that will host the registry -service. Its configuration files are in JONAS_REGISTRY/conf.

    - -

    In the jonas.properties files, declare only the registry and jmx -services:

    - -

    jonas.services    registry,jmx

    - -

    In the carol.properties file, declare the jeremie protocol:

    - -

    carol.protocols=jeremie

    - -

    Its port can also be configured:

    - -

    carol.jeremie.url=jrmi://localhost:2000

    - -

    Configuring the "EJB" server

    - -

    The "EJB" server is the JOnAS server that will be used as the application -server. Its configuration files are in JONAS_EJB/conf. Libraries -must be added in JONAS_EJB/lib/ext.

    - -

    In the jonas.properties files, set the registry service as remote:

    - -

    jonas.service.registry.mode    remote

    - -

    ... and the JMS service as WebSphere MQ:

    - -

    jonas.service.jms.mom    org.objectweb.jonas_jms.JmsAdminForWSMQ

    - -

    In the carol.properties file, declare the jeremie protocol and set the -correct port:

    - -

    carol.protocols=jeremie
    -carol.jeremie.url=jrmi://localhost:2000

    - -

    In lib/ext, the following libraries must be added:

    - - -

    Configuring WebSphere -MQ

    - -

    WebSphere MQ JMS administration is documented in chapter 5 of the -"WebSphere MQ Using Java" document.

    - -

    The configuration file of the JMS administration tool must be edited so -that the JOnAS registry is used for binding the JMS objects. This file is the -JMSAdmin.config file located in WebSphereMQ's Java/bin -directory. Set the factory and provider URL as follows:

    - -

    INITIAL_CONTEXT_FACTORY=org.objectweb.jeremie.libs.services.registry.
    -               -         jndi.JRMIInitialContextFactory
    -PROVIDER_URL=jrmi://localhost:2000

    - -

    The JOnAS's client.jar library must also be added to the -classpath for WebSphere MQ.

    - -

    When starting, JOnAS expects JMS objects to have been created and bound to -the registry. Those objects are connection factories, needed for connecting -to WebSphere MQ destinations, and destinations.

    - -

    JOnAS automatically tries to access the following factories:

    - - -

    If one of these objects cannot be found, JOnAS will print a message that -looks like the following:

    - -

        JmsAdminForWSMQ.start : WebSphere MQ -XAConnectionFactory could not be retrieved from JNDI

    - -

    This does not prevent JOnAS from working. However, if there is no -connection factory available, no JMS operations will be possible from -JOnAS.

    - -

    If destinations have been declared in the jonas.properties file, -JOnAS will also expect to find them. For example, if the following -destinations are declared:

    - -

    jonas.service.jms.topics    sampleTopic
    -jonas.service.jms.queues    sampleQueue

    - -

    The server expects to find the following JMS objects in the registry:

    - - -

    If one of the declared destination cannot be retrieved, the following -message appears and the server stops:

    - -

        JOnAS error: -org.objectweb.jonas.service.ServiceException : Cannot init/start service -jms': org.objectweb.jonas.service.ServiceException : JMS Service Cannot -create administered object: java.lang.Exception: WebSphere MQ Queue creation -impossible from JOnAS

    - -

    Contrary to connection factories, the JOnAS administration tool allows -destinations to be created. Since it is not possible to create WebSphere MQ -JMS objects from JOnAS, this will work only if the destinations are -previously created and bound to the registry.

    - -

    For example, if you want to create a queue named "myQueue" through the -JonasAdmin tool, this will only work if:

    - - -

    To launch WebSphere MQ administration tool, type: JMSAdmin

    - -

    The following prompt appears: InitCtx>

    - -

    To create a QueueConnectionFactory and binding it with name -"JQCF", type:

    - -

        InitCtx> DEF QCF(JQCF)

    - -

    More parameters can be entered (for example for specifying the queue -manager).

    - -

    To create a Queue that represents a WebSphere MQ queue named -"myWSMQqueue", and to bind it with name "sampleQueue", type:

    - -

        InitCtx> DEF Q(sampleQueue) -QUEUE(myWSMQqueue)

    - -

    Objects bound in the registry can be viewed by typing:

    - -

        InitCtx> DIS CTX

    - -

    Starting the application

    - -

    To start the registry server:

    -
      -
    1. Clean the local CLASSPATH: set/export CLASSPATH="".
    2. -
    3. Set the JONAS_BASE variable so that it points to - JONAS_REGISTRY.
    4. -
    5. Start the JOnAS server: jonas start -n Registry.
    6. -
    - -

    To administer WebSphere MQ:

    -
      -
    1. In WebSphere MQ's Java/bin directory, launch the JMSAdmin - tool: JMSAdmin.
    2. -
    3. Create the needed JMS objects.
    4. -
    - -

    To start the EJB server:

    -
      -
    1. Clean the local CLASSPATH: set/export CLASSPATH="".
    2. -
    3. Set the JONAS_BASE variable so that it points to - JONAS_EJB.
    4. -
    5. Start the JOnAS server: jonas start -n EJB.
    6. -
    - -

    To start an EJB client:

    -
      -
    1. Add in the jclient classpath the ibm.com.mq.jar and - ibm.com.mqjms.jar libraries.
    2. -
    3. Launch the client: jclient ...
    4. -
    - -

    Limitations

    - -

    Using WebSphere MQ as JMS transport within JOnAS has some limitations, as -compared with using JORAM or SwiftMQ.

    - -

    First of all, WebSphere MQ is compliant with the old 1.0.2b JMS -specifications. Code that is written following the JMS 1.1 latest spec (such -as the jms samples provided with JOnAS) will not work with WebSphere MQ.

    - -

    Depending on the WebSphere MQ distribution, JMS Publish/Subscribe may not -be available. In this case, the message-driven bean samples provided with -JOnAS will not work. For this reason, a specific sample is provided.

    - -

    Finally, for an unknown reason, asynchronous consumption of messages -(through message-driven beans) does not work in transactional mode. Further -inquiry is needed to resolve this issue.

    - - diff --git a/jonas_doc/core/olddoc/howto/Win32Service.html b/jonas_doc/core/olddoc/howto/Win32Service.html deleted file mode 100644 index 8e846bdcbe4a036374a7190b9eb3cf7ac642a54d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/Win32Service.html +++ /dev/null @@ -1,261 +0,0 @@ - - - - - Execute JOnAS as WIN32 Service - - - - -

    Howto: Execute JOnAS as a WIN32 Service

    - -

    This document describes the procedures necessary to run JOnAS as a system -service on Microsoft Windows platforms. This applies starting from JOnAS -3.3.2.

    - -

    Instructions

    - -

    This procedure uses ANT targets that are introduced in JOnAS 3.3.2. The -procedure also uses the Java Service Wrapper open source project which must -be downloaded and installed separately.

    - -

    Download and Install Java Service Wrapper

    -
      -
    1. Download Java - Service Wrapper version 3.0.5 or later, and unzip the package to a - directory in the local filesystem.
    2. -
    3. Set WRAPPER_HOME environment variable to the root - directory for Java Service Wrapper. -

      For example, if the package for Wrapper version 3.0.5 is unzipped into - c:\jsw, then SET WRAPPER_HOME=c:\jsw\wrapper_win32_3.0.5

      -
    4. -
    - -

    create_win32service

    - -

    Before JOnAS can be run as a WIN32 service, it is necessary to create a -Java Service Wrapper configuration file. Prior to executing the steps in this -section, it is necessary to create a JONAS_BASE directory as described in the -JOnAS Configuration Guide.

    -
      -
    1. Verify that JAVA_HOME is set as a system environment variable.
    2. -
    3. Verify that JONAS_BASE and WRAPPER_HOME environment variables are - set.
    4. -
    5. Set %JONAS_ROOT% as the current directory.
    6. -
    7. Set environment variables required for JOnAS execution - (see list below).
    8. -
    9. Execute ant [-Djonas.name=<server_name>] - create_win32service.
    10. -
    - -
    -

    The -Djonas.name=<server_name> parameter is optional. If - not specified, the default server name is 'jonas'.

    -
    - -

    Environment Variables

    -

    -Prior to executing create_win32service it is necessary to -set environment variables as required for JOnAS execution. The values -of the environment variables are saved in the wrapper_ext.conf file -as wrapper properties. -

    - -

    -* The config_env.bat file is used to configure JDBC drivers -in the CLASSPATH. Any changes to config_env.bat will affect the -CLASSPATH environment variable, and therefore requires that -the wrapper configuration be updated by running -create_win32service. -

    -

    The wrapper configuration must be updated whenever any of these -environment variables are modified. -Refer to the Modify JOnAS -Configuration section for more information.

    - - -

    install_win32service

    - -

    After the %JONAS_BASE% directory has been updated for use with Java -Service Wrapper, JOnAS can be installed as a WIN32 service using the -install_win32service ant target. Prior to installing the -configuration as a WIN32 service, the configuration can be tested as a -standard console application. Refer to the -Testing configuration section for more -information. The following steps will install the service.

    -
      -
    1. Verify that JONAS_BASE and WRAPPER_HOME environment variables are - set.
    2. -
    3. Set %JONAS_ROOT% as the current directory.
    4. -
    5. Execute ant install_win32service. As an alternative, - the service may be installed from a DOS command window using the - jonas ntservice install command.
    6. -
    - -

    By default, the service is configured to start automatically each time -Windows starts. If the administrator would prefer to start the service -manually, modify the wrapper.ntservice.starttype parameter in the -%JONAS_BASE%\conf\wrapper.conf file. Set the value as described in the -comments found in the wrapper.conf file.

    - -

    uninstall_win32service

    - -

    When it is no longer desirable to run JOnAS as a Windows service, the -service can be uninstalled using the uninstall_win32service ant -target.

    -
      -
    1. Verify that JONAS_BASE and WRAPPER_HOME environment variables are - set.
    2. -
    3. Set %JONAS_ROOT% as the current directory.
    4. -
    5. Verify that the service has been stopped.
    6. -
    7. Execute ant uninstall_win32service. As an alternative, - the service may be uninstalled from a DOS command window using the - jonas ntservice uninstall command.
    8. -
    - -

    Start JOnAS Service

    - -

    To start the JOnAS service, open the Service Control Manager (Control -Panel Services) window, select the JOnAS service and start the service. -As an alternative, the service may be started from a DOS command window -using the jonas ntservice start command.

    - -

    By default, JOnAS will be started automatically each time Windows is -started. After installing the service, it can be started manually to avoid -the need to reboot Windows.

    - -

    NOTE: -Any environment variables referenced within either of the -wrapper.conf and wrapper_ext.conf files must be defined as system -environment variables. -

    - -

    Stop JOnAS Service

    - -

    To stop the JOnAS service, open the Service Control Manager window, select -the JOnAS service and stop the service. As an alternative, the service may be stopped -from a DOS command window using the -jonas ntservice stop command.

    - -

    Status of JOnAS Service

    - -

    The status of the JOnAS service may be obtained from a DOS command window using the -jonas ntservice status command.

    - -

    Files Managed by -create_win32service

    - -

    The create_win32service ant target copies files from -the Java Service Wrapper installation directory and generates a configuration -file in the %JONAS_BASE% directory. The following files are managed by the -create_win32service ant target.

    - - - -

    *   wrapper.conf contains Java Service Wrapper -configuration properties. This file is copied to the conf directory -by the CREATE_JONASBASE command. Changes made to this file are -not affected by subsequent execution of the create_win32service target.

    -

    ** wrapper_ext.conf contains Java Service Wrapper -configuration properties specific to the JOnAS service. This file is -generated by the create_win32service ant target. Any changes made to -this file will be lost when the create_win32service target is -executed.

    - -

    Modify JOnAS Configuration

    - -

    In addition to the files located in the conf directory, JOnAS -configuration is affected by the contents of -%JONAS_ROOT%\bin\nt\config_env.bat, and by the following environment variables, -CLASSPATH, JAVA_OPTS, JONAS_OPTS, TOMCAT_OPTS, JETTY_OPTS. -If changes are made to config_env.bat, or any of these -environment variables, it is necessary to update the -Java Service Wrapper configuration files.

    -

    -JOnAS memory usage is controlled by the -Xms and -Xms JVM arguments. Prior -to running create_win32service, set the JAVA_OPTS environment variable with -the desired values for -Xms and -Xmx. The create_win32service target will -generate these values as wrapper.java.additional parameters in the -wrapper_ext.conf file. -

    -

    Update Wrapper Configuration

    -
      -
    1. Stop the JOnAS service using the Windows Service Control Manager, - or the jonas ntservice stop command line.
    2. -
    3. Make changes to config_env.bat, and the - CLASSPATH, JAVA_OPTS, JONAS_OPTS, TOMCAT_OPTS, JETTY_OPTS - environment variables as needed.
    4. -
    5. Update the Java Service Wrapper configuration. Refer to the create_win32service section for - details.
    6. -
    7. Test the updated configuration. Refer to the Testing configuration section for more - information.
    8. -
    9. Restart the JOnAS service using the Windows Service Control Manager, - or the jonas ntservice start command line.
    10. -
    - -

    -Note: Changes to the JOnAS configuration files located in the -%JONAS_BASE%\conf directory do not affect the contents of the -wrapper_ext.conf file. When making changes to the files located in the -conf directroy, it is only necessary to stop the service and restart -the service for the changes to take effect. -

    - - -

    Testing Configuration

    - -

    After the Java Service Wrapper configuration files have been generated, it -is possible to test the configuration in a console window before installing -the configuration as a WIN32 service.

    -
      -
    1. Verify that JONAS_BASE environment variable is set.
    2. -
    3. Execute jonas ntservice console.
    4. -
    - -

    The Java Service Wrapper will start as a console application and load -JOnAS using the configuration generated by the create_win32service -ant target.

    - -
    Note that this test procedure is using environment variables that -are set for the current user. Verify that any environment -variables used in the wrapper.conf and/or wrapper_ext.conf files -are also set as system environment variables. -
    - -

    Enter CTRL-C to terminate JOnAS. After pressing Ctrl-C, the -Java Service Wrapper displays the following messages to the execution report, -and/or log file.

    -
    wrapper  | CTRL-C trapped.  Shutting down.
    -jvm 1    | 2003-12-02 15:25:20,578 : AbsJWebContainerServiceImpl.unRegisterWar 
    -                                   : War /G:/w32svc/webapps/autoload/ctxroot.war no longer available
    -jvm 1    | Stopping service Tomcat-JOnAS.
    -wrapper  | JVM exited unexpectedly while stopping the application.
    -wrapper  | <-- Wrapper Stopped.
    - - diff --git a/jonas_doc/core/olddoc/howto/clusterdetails/AutomaticClusterConfiguration.html b/jonas_doc/core/olddoc/howto/clusterdetails/AutomaticClusterConfiguration.html deleted file mode 100644 index d62d88f8b79dfba580e1e44bcb1b3d292db67d93..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/clusterdetails/AutomaticClusterConfiguration.html +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - Generating the JOnAS's cluster configuration with newjc - - - - -

    Running newjc

    -

    Review newjc output

    -

    Tell Apache about mod_jk 

    - - -

    Generating the JOnAS's cluster configuration with newjc

    - -

    Running newjc

    -

    newjc is a tool included in - JOnAS that constructs and configures the JOnAS bases (JOnAS - instances) for the cluster.  It also creates the configuration - files needed for mod_jk.
    -This tool is located under -$JONAS_ROOT/examples/sampleCluster2/newjc.

    -

    newjc can be used to configure cluster configurations other than -sampleCluster2.  These configuration files are basic and can -be edited as needed to fit site requirements.

    -

    newjc can customize some of the characteristics of the cluster through -the build-jc.properties, build-db.properties, build-master.properties and jonas-newjc.properties files.

    -

    The default configuration is located at -$JONAS_ROOT/examples/sampleCluster2/newjc/build-jc.properties.  This -file should not require modifications for sampleCluster2, unless there -are port conflicts.  Port assignments for sampleCluster2 are -also summarized in -$JONAS_ROOT/examples/sampleCluster2/PortConfiguration.txt.  This -file is for documentation only and is not used by newjc.

    -
    -

    Running newjc to configure sampleCluster2

    - -

    Before newjc is run for the first time on Linux, create -the following directory: $HOME/jc.config/lib

    -

        mkdir –p $HOME/jc.config/lib

    -

    Run newjc.

    -

        cd $JONAS_ROOT/examples/sampleCluster2/newjc

    -

        ./newjc.sh

    -

    Here is an example output. Script output is in gray. User inputs are black -and bold.

    -
    -
    -
    -

          Buildfile: ./build-jc.xml

    -

          init:

    -

          create_jonas_cluster:

    -

              [input] Choose your output directory : -[default : ${myenv.JONAS_BASE}] :

    -

          /home/<user>/cluster

    -

              [input] Choose your prefix for the JONAS_BASE -directories : [default : jb] :

    -

          jb

    -

                 [input] Choose your protocol : [default : -cmi] :(jrmp,jeremie,iiop,cmi,)

    -

          cmi

    -

              [input] Choose your database : [default : -hsql] :

    -

          hsql

    -

              [input] Choose your WebContainer : [default : -tomcat] :(tomcat,)

    -

          tomcat

    -

              [input] Choose your cluster architecture -[bothWebEjb/diffWebEjb] : [default : diffWebEjb] :(bothWebEjb,diffWebEjb,)

    -

          diffWebEjb

    -

              [input] Choose the number of web instances : -[default : 2] :

    -

          2

    -

              [input] Choose the number of ejb instances : -[default : 2] :

    -

          2

    -
    -
    -
    -

    /// newjc output deleted for brevity

    -

    Files created by newjc will be discussed in the following -section.

    -

    Note: On Windows the steps are the same, except,

    -

        create the folder C:\Documents and -Settings\<user>\jc.config\lib

    -

        Run the newjc.cmd

    -

    For more information about newjc refer -to the ObjectWeb site.

    -

     

    -
    -

    -Review newjc output

    -

    Newjc created tomcat_jk.conf -and -workers.properties files.  For sampleCluster2 they are located in -/home/<user>/cluster/conf/jk.
    -The #Web section of build-jc.properties defines configuration -parameters set in these files by newjc.

    -

    -Refer to -workers how to documentation on the Tomcat site.

    -


    -tomcat_jk.conf  contains apache directives supported in -httpd.conf or apache2.conf.  They are isolated in a separate file for modularity, -then included in -httpd.conf or apache2.conf.
    -
    -newjc also generated four JOnAS instances -(JONAS_BASE) in directories jb1, jb2, jb3 and jb4 under -/home/<user>/cluster.  Configuration files are all in the conf -directory of each JOnAS instance.  The files pertinent to cluster -are described below.

    -

    jb1 and jb2 are sampleCluster2 JOnAS web container instances.  jb3 and jb4 are sampleCluster2 JOnAS EJB container instances.

    -

    newjc generated a script (jcl4sc2) for controlling the cluster (start/stop/kill). -

    -

    carol.properties and jgroups-cmi.xml

    -

    The #Carol section of build-jc.properties defines configuration -parameters set in the carol.propetries file and jgroups-cmi.xml by -newjc.

    -

    This allows JNDI replication to support load balancing at the -EJB level using the CMI protocol.

    -

    Note: The multicast address and port must be identically -configured for all JOnAS/Tomcat instances.

    -
    -

    jonas.properties

    -

    The #Services section of build-jc.properties defines -configuration parameters set in the jonas.properties file by -newjc.

    -
    -

    server.xml

    -

    The #Web section of build-jc.properties defines some -configuration parameters set in the server.xml file by newjc.
    -In particular, a connector XML element for AJP1.3 protocol is -defined, as well as a jvmRoute to support load balancing at the -web level, via this connector.

    -

    A Cluster XML element was also added.  It defines parameters for -achieving Session replication at the web level with -JOnAS.

    -

    Refer to the AJP -Connector and the -Engine Container documentation.

    -

     Note: The jvmRoute name generated by newjc is the -same as the name of the associated worker defined in -worker.properties.  This will ensure the Session -affinity.

    -
    -

    jcl4sc2 (jcl4sc2.bat)

    -

    These files are scripts to run the sampleCluster2 cluster on Linux and Windows.

    - -

    Tell Apache about mod_jk

    - -To make apache aware of this new file, edit <prefix>/conf/httpd.conf.
    -Copy and paste the following line after the Dynamic Shared Object -(DSO) Support section. -

    -Include -conf/jk/tomcat_jk.conf


    -

    Move the jk directory created by newjc under the APACHE structure:

    -<mv /home/<user>/cluster/conf/jk $APACHE_HOME/conf>


    -Restart apache so that apache can load the jk_module:

    -<apachectl stop && apachectl start>

    -

    Note that some UNIX distributions may locate the module in the -folder libexec instead of the folder modules.

    - - - diff --git a/jonas_doc/core/olddoc/howto/clusterdetails/ManualClusterConfiguration.html b/jonas_doc/core/olddoc/howto/clusterdetails/ManualClusterConfiguration.html deleted file mode 100644 index 1433613ab44bde9b64a990d2e00f39e6fbf6e374..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/clusterdetails/ManualClusterConfiguration.html +++ /dev/null @@ -1,403 +0,0 @@ - - - - - - - Building the JOnAS's cluster configuration - - - - - -

    Web clustering

    -

            -Load-balancing at the web level with mod_jk

    -

            -Configure HTTP session replication with Tomcat

    -

    Ejb clustering

    -

            -CMI Configuration (JNDI & EJB load balancing)

    -

            -EJB high availability

    - - -

    Building the JOnAS's cluster configuration

    - -

    Web clustering

    - -

    Load-balancing at the web level with mod_jk

    - -

    Configure Mod_jk

    -

    This depends on the distribution being used. Create a file tomcat_jk.conf and workers.properties in "$APACHE_HOME/conf/jk/".

    - -

    Configure Apache 2

    - - -

    Configure Tomcat

    -To configure Tomcat, perform the following configuration steps for each -Tomcat server with the right AJP port number. -
      -
    1. Configure Tomcat for the connector AJP13. In the file conf/server.xml - of the JOnAS installation directory, add the AJP connector related to the worker - (if not already there): -

      <!-- Define an AJP 1.3 Connector on port 9010 -->
      - <Connector -
      -     port="9010" minProcessors="5" - maxProcessors="75"
      -     acceptCount="10" debug="20" protocol="AJP/1.3"/>
      - - - - - - - - - - - - - - - - - - - - - - -
      Explanations:
        port: The TCP port number on which this Connector will create a server socket and await incoming connections.
        minProcessor: The minimum number of processors to start at intialization time. If not specified, this attribute is set to 5.
        maxProcessor: The maximum number of processors allowed.
        acceptCount: The maximum queue length for incoming connection requests when all possible requests processing threads are in use. Any requests received when the queue is full will be refused. -
        debug: The debugging detail level of log messages generated by this component, with higher numbers creating more detailed output.
        protocol: This attribute must be AJP/1.3 to use the AJP handler.
      -

      -

      Note: Refer to the AJP Connector documentation. -

      -
    2. -
    3. Define the jvmRoute.
      - In the file conf/server.xml of the JOnAS installation directory, add a - unique route to the Catalina engine with the right worker name.
      - Replace the line:
      - <Engine name="Standalone" defaultHost="localhost" - debug="0">
      - with:
      - <Engine jvmRoute="worker1" name="Standalone" - defaultHost="localhost" debug="0">

      - - - - - - - - - - - - - - -
      Explanations:
        name: Logical name of this Engine, used in log and error messages
        jvmRoute: Uniquely identifies the Tomcat server to the Apache server
      - Name has been specified in workers.properties -
        defaultHost: Identifies the Host that will process requests directed to host names on this server
        debug: The level of debugging detail logged by this Engine
      - -

      Note: The jvmRoute name should be the same as the name of the - associated worker defined in workers.properties. This will ensure the - Session affinity.
      -            - Refer to the Engine Container documentation.

      -
    4. -
    - -

    Configure HTTP session replication with Tomcat

    - - - -

    Running the Web Application

    -The web application is now ready to run in the cluster: -
      -
    1. Start the JOnAS servers: jonas start.
    2. -
    3. Restart Apache: /usr/local/apache2/bin/apachectl restart.
    4. -
    5. Use a browser to access the welcome page, usually index.html.
    6. -
    - -

    Ejb clustering

    - -

    Note: More detailed information is available in the CMI guide .

    - -

    CMI Configuration (JNDI & EJB load balancing)

    - -

    In the case of EJB level clustering (CMI), the client may be either a fat -Java client (e.g., a Swing application), or a Web application (i.e., -Servlets/JSPs running within JOnAS). In the second case, the JOnAS server -running the Web client should be configured in the same way as the other -nodes of the cluster.

    - - -

    Note 1: The multicast address and port defined in the $JONAS_BASE/conf/jgroups-cmi.xml -and the group name defined in the $JONAS_BASE/conf/carol.properties file must be the same for all -JOnAS nodes in the cluster.

    - -

    Note 2: If Tomcat Replication associated to cmi is used, the multicast -addresses of the two configurations must be different. Same requirement for -the EJB high availability configuration.

    - -

    Note 3: If the cluster is defined across several machines, the CMI url has to be set with the real ip -address or ip alias and not the loopback address.Otherwise, the EJBs won't be reachable from the remote machines.

    - -

    EJB high availability

    - -

    This section describes how to enable the EJB replication framework (SFSB).

    - - - - diff --git a/jonas_doc/core/olddoc/howto/clusterdetails/c-jdbc.html b/jonas_doc/core/olddoc/howto/clusterdetails/c-jdbc.html deleted file mode 100644 index 2b3f66fdd1f9807a23b0b7eb4403022b33786020..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/clusterdetails/c-jdbc.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - How To Setup A C-JDBC Database Cluster - - - -

    How To Setup A C-JDBC Database Cluster

    -Note: for further information about configuration of a RAIDB1 C-JDBC cluster, refer to the C-JDBC documentation. This configuration starts three HSQLDB instances that are formed by C-JDBC as RAIDB1. This means that the same data is stored in two different databases and one database is used as a recovery log. -
      -
    1. - Download the C-JDBC binaries from the C-JDBC Forge site. -

      -
    2. -
    3. - Extract the C-JDBC archive in a folder.
      - tar xvfz c-jdbc-xx-bin.tar.gz -

      -
    4. -
    5. - Set the environment variables.
      - export JAVA_HOME=<Path to JDK HOME>
      - export CJDBC_HOME=<Path to the CJDBC HOME> -

      -
    6. -
    7. - Modify the $CJDBC_HOME/demo/demo-raidb1.sh file.
      - The ports for the HSQLDB instances must be modified to - match the sampleCluster2 configuration. Change the ports for the three databases - to 11001, 11002, 11003. -

      -
    8. -
    9. -Edit the C-JDBC virtual database file:
      $CJDBC_HOME/config/virtualdatabase/hsqldb-raidb1.xml
      -Modify the ports according to the values defined in the section above. To avoid problems in the Datasource configuration of JOnAS, you must also set a password for the user to log in (VirtualLogin element). Warning if you choose another username than default value user, modify also the vLogin attribute of ConnectionManager elements.
    10. -
    11. - Start the cluster (HSQLDB instances and then C-JDBC controller).
      - $CJDBC_HOME/demo/demo-raidb1.sh -

      -
    12. -
    13. - Connect to the C-JDBC controller using the JDBC driver ($CJDBC_HOME/drivers/c-jdbc-driver.jar) and the URL:
      - jdbc:cjdbc://localhost:25322/myDB with username: <user> and password: <pass>
      - Use the password you set in $CJDBC_HOME/config/virtualdatabase/hsqldb-raidb1.xml file. - -

      Sample C-JDBC DataSource configuration file to use in JOnAS:

      -
      -###################### C-JDBC DataSource configuration example
      -#
      -#####
      -#DataSource configuration
      -#
      -#datasource.name jdbc_1
      -datasource.url jdbc:cjdbc://localhost:25322/myDB
      -datasource.classname org.objectweb.cjdbc.driver.Driver
      -datasource.username user
      -datasource.password pass
      -# WARNING: you must specify the mapper of the databases used as
      -# backend by C-JDBC. It is not possible to use a heterogenious c-jdbc
      -# configuration here.
      -datasource.mapper rdb.hsql
      -
      -
    14. -
    - - diff --git a/jonas_doc/core/olddoc/howto/clusterdetails/director.html b/jonas_doc/core/olddoc/howto/clusterdetails/director.html deleted file mode 100644 index 586fdfc98d52eaed644066fbc00fa20dc67cc87b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/clusterdetails/director.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - Load Balancing with Enhydra Director - - - -

    Load Balancing with Enhydra Director

    -
      -
    1. - Download the Tomcat (or Jetty) module from the ObjectWeb site. -
      -
      -
    2. -
    3. - Download the binaries or sources for the Apache module.
      - Remark: You can also download an entire distribution of Apache webserver in which the module is already included and configured. -
      -
      -
    4. -
    5. - Configure the apache director module.
      - File: $APACHE_HOME/conf/enhydra_director.conf
      -
      - Example configuration:
      -
      - <?xml version="1.0"?>
      - <!DOCTYPE EnhydraDirectorConfig SYSTEM "EnhydraDirectorConfig.dtd">
      - <EnhydraDirectorConfig>
      -   <Application prefix="/sampleCluster2/">
      -     <AppServer host="localhost" port="9999" weight="1" />
      -     <AppServer host="localhost" port="8888" weight="1" />
      -   </Application>
      -   <Status prefix="/status">
      -     <Restrict server="127.0.0.1" />
      -     <Restrict client="127.0.0.1" />
      -   </Status>
      - </EnhydraDirectorConfig>
      -
      - Remark: In this configuration, the connector is configured to forward the requests for one web application (load balancing and fail over). The second (sampleCluster2 example) is running on one machine, but on different ports. Furthermore, the /status context allows you to enable, disable and change some parameters of the director configuration. The /status context is only available on the machine where director is running in this sample configuration. -

      -
    6. -
    7. Copy the tomcat module (tomcat-director.jar) to $CATALINA_HOME/server/lib or $JONAS_ROOT/lib/catalina/server/lib.
      -  Note: For the JOnAS+Tomcat package use: $JONAS_ROOT/lib/catalina/server/lib
      -             For a standalone Tomcat installation use: $CATALINA_HOME/server/lib -

    8. -
    9. - Configure the connector in the tomcat configuration ($CATALINE_HOME/conf/server.xml).
      - Example configuration:
      -Add these lines to the configuration where the other connectors (AJP, ...) are defined: -
      -Using TomCat 5.0.x as servlet container
      - <!-- Define a Director Connector on port 8888 -->
      - <Connector className="org.enhydra.servlet.connectionMethods.EnhydraDirector.EnhydraDirectorConnectionMethod"
      -       port = "8888"
      -       threadTimeout = "300"
      -       clientTimeout = "30"
      -       sessionAffinity = "false"
      -       queueSize = "400"
      -       numThreads = "200"
      -       bindAddress = "(All Interfaces)"
      -       authKey = "(Unauthenticated)"
      - />
      - -Using TomCat 5.5.x as servlet container
      -<!-- Define a Director Connector on port 8888 -->
      -<Connector className="org.enhydra.servlet.connectionMethods.EnhydraDirector.DirectorProtocol"
      -      port = "8888"
      -      threadTimeout = "300"
      -      clientTimeout = "30"
      -      sessionAffinity = "false"
      -      queueSize = "400"
      -      numThreads = "200"
      -      bindAddress = "(All Interfaces)"
      -      authKey = "(Unauthenticated)"
      -/>
      -
      -Remark: The session affinity attribute is set to false because the session replication is activated in JOnAS. Otherwise, a new session is created when Director switches between the instances. - The Director connector may coexiste with the mod_jk connector.

      -
    10. -Restart Apache. -

    11. -
    12. -Restart JOnAS. -
    13. -
    - - diff --git a/jonas_doc/core/olddoc/howto/clusterdetails/mod_jk2-to-mod_jk.html b/jonas_doc/core/olddoc/howto/clusterdetails/mod_jk2-to-mod_jk.html deleted file mode 100644 index 494db8c0406a704c4313ef39b0f245304591a774..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/clusterdetails/mod_jk2-to-mod_jk.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - Migrating from mod_jk2 to mod_jk with embedded Tomcat - - - -

    Migrating from mod_jk2 to mod_jk with embedded Tomcat
    -

    -
    Note: This document shows one of several -ways to migrate mod_jk2 settings to work
    -with mod_jk instead. The mod_jk2 reference setup can be found here.
    -Also, all references to jonas-server should be replaced by the hostname of -the target machine
    -for which you want to configure mod_jk.
    -Replace ${JONAS_BASE} and ${APACHE_HOME} with appropriate values. -
    -

    1. Edit the file $JONAS_BASE/conf/server.xml; locate and uncomment -the -following line:
    -

    -
    	<!--
    <Connector port="9009"
    enableLookups="false" redirectPort="9043" debug="0"
    protocol="AJP/1.3" />
    -->
    -   Change it to look like the following:
    -
    	<Connector port="9009"
    enableLookups="false" redirectPort="9043" debug="0"
    protocol="AJP/1.3" />


    -  Next, comment out the existing mod_jk2-oriented connector and -engine elements:
    - -

    ...

    <Connector className="org.apache.coyote.tomcat5.CoyoteConnector"
             port="9009" minProcessors="5" maxProcessors="75"            
    enableLookups="true" redirectPort="9043"            
    acceptCount="10" debug="0" connectionTimeout="0"             
    useURIValidationHack="false"
    protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>

    -  Replace the  base Engine tag in which a jvmRoute -with the standard engine is used.
    -  For example, comment out the line that looks similar to the -following:
    -
    	<Engine name="Tomcat-JOnAS-Engine" defaultHost="localhost" debug="0"
    jvmRoute="jonas01">
    -  and uncomment the following line:
    -
    	<Engine name="Tomcat-JOnAS-Engine" defaultHost="localhost" debug="0">
    -
    -    -Note: Always -backup files like server.xml before editing.
    -
    -2.  Now you can -either let tomcat generate the mod_jk.conf file automatically,
    -
         which will setup forwarding for a -limited set of applications, or you can create a
    custom mod_jk.conf file where you can specify -applications to forward and
    -     customize configuration information.
    -
    -
         Note: The -automatically generated file cannot be customized since it is re-written
    -     -every time tomcat is restarted by the user.
    -
    -            a)   -To enable automatic generation, insert the following into the -server.xml
    -            -      file nested under the base <Server> tag: -
    -
    - -
    	<Listener className="org.apache.jk.config.ApacheConfig" 
    modJk="$APACHE_HOME/modules/mod_jk.so" />
    -
    -        and insert the following under -the <Host> element:
    -
    	<Listener className="org.apache.jk.config.ApacheConfig" 
    append="true" forwardAll="false"
    modJk="$APACHE_HOME/modules/mod_jk.so"/>
    -        When jonas/tomcat is restarted, there will be - a file created under
    -        -$JONAS_BASE/lib/catalina/conf/auto called mod_jk.conf.
    -
    -
    -            -b)   If you want to create a custom file, the recommendation is to place -a file
    -                  named -mod_jk.conf under $JONAS_BASE/conf/jk.
    -                -  You can view this file as the equivalent of the -$APACHE_HOME/conf.d/JOnAS.conf in
    -            -      the mod_jk2 directions; however, it is -not a direct replacement.
    -
    -            -      A simple mod_jk.conf file that can be used is:
    -

    # Load the mod_jk module if not loaded.
    <IfModule !mod_jk.c>
    LoadModule jk_module "$APACHE_HOME/modules/mod_jk.so"
    </IfModule>

    # Specify location of worker file and log file. Worker file will follow shortly.
    JkWorkersFile "$JONAS_BASE/conf/jk/workers.properties"
    JkLogFile "$JONAS_BASE/logs/mod_jk.log"

    # When and how much logging.
    JkLogLevel emerg

    # This is a little awkward. It seems mod_jk associates applications it will
    # map to tomcat based on the virtual host. If for instance I wish to visit
    # the jonasAdmin application through http://jonas-server/jonasAdmin from another
    # machine and I have the following setting then the application behaves
    # perfectly normally, i.e, behaves as one would expect if you
    # were using the application directly using the appropriate port (9000).
    # However, if you try using http://localhost/jonasAdmin from jonas-server
    # without the explicit VirtualHost declaration, only the directory contents
    # are mapped. No processing on the tomcat is carried out, so struts based
    # applications will fail to work. That is the reason why we explicitly
    # mention both virtual hosts.
    <VirtualHost jonas-server>
    ServerName jonas-server
    JkMount /cmp2 ajp13
    JkMount /cmp2/* ajp13
    JkMount /alarm ajp13
    JkMount /alarm/* ajp1
    JkMount /earsample ajp13
    JkMount /earsample/* ajp13
    JkMount /jonasAdmin ajp13
    JkMount /jonasAdmin/* ajp13
    </VirtualHost>

    <VirtualHost localhost>
    ServerName localhost
    JkMount /cmp2 ajp13
    JkMount /cmp2/* ajp13
    JkMount /alarm ajp13
    JkMount /alarm/* ajp13
    JkMount /earsample ajp13
    JkMount /earsample/* ajp13
    JkMount /jonasAdmin ajp13
    JkMount /jonasAdmin/* ajp13
    </VirtualHost>
    -

    -3.  Now tell apache to use this file.  Backup the -file: $APACHE_HOME/conf/httpd.conf.
    -     Edit the /etc/httpd/conf/httpd.conf file and -insert:
    -
    	Include ${JONAS_BASE}/conf/jk/mod_jk.conf

    -     Note: replace ${JONAS_BASE} with -appropriate value.
    -
    -   
    Locate -and comment out the following line in the same file:
    -
    -
        LoadModule jk2_module modules/mod_jk2.so
    -
    -4. Now create -a workers.properties file. This can be placed in
    -    $JONAS_BASE/conf/jk/workers.properties.
    -    A sample that has been used successfully is:
    -

    # workers.java_home should point to your Java installation. Normally
    # you should have a bin and lib directories beneath it.
    #
    workers.java_home=/usr/lib/jvm/java

    #
    # You should configure your environment slash... ps=\ on NT and / on UNIX
    # and maybe something different elsewhere.
    #
    ps=/

    #
    #------ ADVANCED MODE ------------------------------------------------
    #---------------------------------------------------------------------
    #

    #
    #------ DEFAULT worket list ------------------------------------------
    #---------------------------------------------------------------------
    #
    #
    # The workers that your plugins should create and work with
    #
    # Add 'inprocess' if you want JNI connector
    worker.list=ajp13
    # , inprocess


    #
    #------ DEFAULT worker1 WORKER DEFINITION ------------------------------
    #---------------------------------------------------------------------
    #

    #
    # Defining a worker named worker1 and of type worker1
    # Note that the name and the type do not have to match.
    #
    worker.ajp13.port=9009
    worker.ajp13.host=jonas-server
    worker.ajp13.type=ajp13


    #----------------------------------------------------------

    -
    Once all this is completed, restart jonas followed by httpd.
    -Follow that up with a quick test by visiting: http://${HOSTNAME}/jonasAdmin. -
    -You should be able to use the application as normal.
    -You can now use cmp2, earsample, alarm and jonasAdmin using mod_jk -instead.
    -
    -

    - - diff --git a/jonas_doc/core/olddoc/howto/clusterdetails/mod_jk2_embeddedtomcat.html b/jonas_doc/core/olddoc/howto/clusterdetails/mod_jk2_embeddedtomcat.html deleted file mode 100644 index 6dc24964316f726e66d88619735d01046c5a7fd1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/clusterdetails/mod_jk2_embeddedtomcat.html +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - Setting up mod_jk2 with embedded Tomcat - - - -

    Setting up mod_jk2 with embedded Tomcat
    -

    -
    -Note: Replace ${JONAS_BASE} and ${APACHE_HOME} with appropriate values. -
    -

    1. Backup /$APACHE_HOME/conf/httpd.conf:
    -
    -
    cp -$APACHE_HOME/conf/httpd.conf $APACHE_HOME/conf/httpd.conf.backup

    -

    2. Edit (~line 208) httpd.conf to add the loading of mod_jk2.so:
    -
    -# Adding jk2_module reference.
    -LoadModule jk2_module modules/mod_jk2.so
    -
    -

    -

    3. Edit $APACHE_HOME/conf.d/JOnAS.conf -with the following content:
    -

    -Alias /docs/jonas "$JONAS_BASE/doc/jonas-4.1.2"
    -<Directory "$JONAS_BASE/doc/jonas-4.1.2">
    -    Options Indexes MultiViews
    -    AllowOverride None
    -    Order allow,deny
    -    Allow from all
    -</Directory>

    -Alias /webapps/jonas "$JONAS_BASE/webapps/jonas"
    -<Directory "$JONAS_BASE/webapps/jonas">
    -    Options Indexes MultiViews
    -    AllowOverride None
    -    Order allow,deny
    -    Allow from all
    -</Directory>

    -<IfModule mod_jk2.c>

    -<Location /earsample>
    -    JkUriSet group jonas
    -</Location>

    -<Location /jonasAdmin>
    -    JkUriSet group jonas
    -</Location>

    -<Location /cmp2>
    -    JkUriSet group jonas
    -</Location>

    -<Location /alarm>
    -    JkUriSet group jonas
    -</Location>

    -</IfModule>
    -
    -

    -

    4. Edit/create $APACHE_HOME/conf/workers2.properties -with the following content:
    -

    -[logger]
    -level=DEBUG
    -                                                                                -
    -# Shared memory handling. Needs to be set.
    -[shm]
    -info=Scoreboard. Required for reconfiguration and status with -multiprocess servers
    -file=$APACHE_HOME/logs/jk2.shm
    -size=1048576
    -debug=0
    -disabled=0
    -                                                                                -
    -# The channel configuration shall be consistent with
    -# the configuration of JOnAS in server.xml
    -# port = port of the AJP (jk2) connector
    -# tomcatId = jvmRoute attribute of the <Engine> element
    -[channel.socket:toJonas01]
    -info=channel to a JOnAS instance - tomcatId shall be identical to -jvmRoute in the server.xml file of the JOnAS instance
    -host=localhost
    -port=9009
    -group=jonas
    -                                                                                -
    -[status:status]
    -info=provides info on the connecteur usage
    -                                                                                -
    -[uri:$/jkstatus*]
    -info=get the connector usage info at /jkstatus
    -group=status:status
    -

    -5. On the JOnAS side, edit $JONAS_BASE/conf/server.xml -with the following content:
    -


    -...

    -     -<Connector className="org.apache.coyote.tomcat5.CoyoteConnector"
    -                -port="9009" minProcessors="5" maxProcessors="75"
    -                -enableLookups="true" redirectPort="9043"
    -                 -acceptCount="10" debug="0" connectionTimeout="0"
    -                 -useURIValidationHack="false"
    -          -       -protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
    -...

    -

        -<Engine name="Tomcat-JOnAS-Engine" defaultHost="localhost" debug="0" -jvmRoute="jonas01">
    -
    -

    -6.  Comment out all lines in $JONAS_BASE/conf/jk2.properties.
    -

    -7. Restart jonas and httpd services:
    -
    -service jonas restart; service httpd restart

    -

    8. Deploy cmp2.ear and alarm.ear.
    -

    -

    9. Those apps are available at:
    -
    -http://<hostname>/cmp2
    -
    http://<hostname>/earsample
    -
    http://<hostname>/alarm
    -
    http://<hostname>/jonasAdmin
    -

    - - - diff --git a/jonas_doc/core/olddoc/howto/clusterdetails/mod_jk_embeddedtomcat.html b/jonas_doc/core/olddoc/howto/clusterdetails/mod_jk_embeddedtomcat.html deleted file mode 100644 index 9410a93fe015a2c06ef4e6f0fa29d98cb9a9df52..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/clusterdetails/mod_jk_embeddedtomcat.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - Setting up mod_jk with embedded Tomcat - - - -

    Setting up mod_jk with embedded Tomcat
    -

    -
    -Note: Replace ${JONAS_BASE} and ${APACHE_HOME} with appropriate values. -
    -

    1. Open the file $JONAS_BASE/conf/server.xml and uncomment the -following line:
    -

    -
     <!-- 
    <Connector port="9009"
    enableLookups="false" redirectPort="9043" debug="0"
    protocol="AJP/1.3" />
    -->
    -

    Edit it to look like the following:
    -

    -
    <Connector port="9009"
    enableLookups="false" redirectPort="9043" debug="0"
    protocol="AJP/1.3" />

    -2. Now you can -either let tomcat generate the mod_jk.conf file automatically,
    -    which will setup forwarding for a limited set of -applications, or you can create a
    -    custom mod_jk.conf file.
    -    The automatically generated file cannot be -customized since it is re-written every time
    -    tomcat is restarted by the user.
    -a) To enable automatic generation insert the following into the -server.xml file nested under the base <Server> -tag:
    -
       <Listener className="org.apache.jk.config.ApacheConfig"
    modJk="$APACHE_HOME/modules/mod_jk.so" />

    -
    -    and insert the following under the <Host> -element:
    -
       <Listener className="org.apache.jk.config.ApacheConfig"
    append="true" forwardAll="false"
    modJk="$APACHE_HOME/modules/mod_jk.so"/>


    -    When jonas/tomcat is restarted, there will be a file -created under $JONAS_BASE/conf/auto called mod_jk.conf.
    -


    -b) If you want to create a custom file, the recommendation is to place -mod_jk.conf under $JONAS_BASE/conf/jk.
    -    A simple mod_jk.conf file that can be used is:
    -
       # Load the mod_jk module if not loaded.
    <IfModule !mod_jk.c>
    LoadModule jk_module "$APACHE_HOME/modules/mod_jk.so"
    </IfModule>

    # Specify location of worker file and log file. Worker file will follow shortly.
    JkWorkersFile "$JONAS_BASE/conf/jk/workers.properties"
    JkLogFile "$JONAS_BASE/logs/mod_jk.log"


    # When and how much logging.
    JkLogLevel emerg

    # This is a little awkward. It seems mod_jk associates applications it will
    # map to tomcat based on the virtual host. If for instance I wish to visit
    # the jonasAdmin application through http://jonas-server/jonasAdmin from another
    # machine and I have the following setting then the application behaves
    # perfectly normally, i.e, struts kicks in as expected, form based
    # authentication and forwarding is done exactly as one would expect if you
    # were using the application directly using the appropriate port (9000).
    # However, if you try using http://localhost/jonasAdmin from jonas-server
    # without the explicit VirtualHost declaration, only the directory contents
    # are mapped. So we need to explicitly mention both virtual hosts.
    <VirtualHost jonas-server>
    ServerName jonas-server
    JkMount /olstore ajp13
    JkMount /olstore/* ajp13
    JkMount /jonasAdmin ajp13
    JkMount /jonasAdmin/* ajp13
    </VirtualHost>
    # ajp13 is infact the worker name used in workers.properties.
    <VirtualHost localhost>
    ServerName localhost
    JkMount /olstore ajp13
    JkMount /olstore/* ajp13
    JkMount /jonasAdmin ajp13
    JkMount /jonasAdmin/* ajp13
    </VirtualHost>
    -

    3. To tell apache to use this file, edit the -$APACHE_HOME/conf/httpd.conf file and insert:
    -

    -
     Include ${JONAS_BASE}/conf/jk/mod_jk.conf
    -Note: Replace ${JONAS_BASE} with appropriate value.
    -

    4. Create -a workers.properties file. This can be placed in
    -

    -
       $JONAS_ROOT/conf/jk/workers.properties

    -A sample that has been used successfully is:
    -
    # workers.java_home should point to your Java installation. Normally
    # you should have a bin and lib directories beneath it.
    #
    workers.java_home=/usr/lib/jvm/java

    #
    # You should configure your environment slash... ps=\ on NT and / on UNIX
    # and possibly something different elsewhere.
    #
    ps=/

    #
    #------ ADVANCED MODE ------------------------------------------------
    #---------------------------------------------------------------------
    #

    #
    #------ DEFAULT worket list ------------------------------------------
    #---------------------------------------------------------------------
    #
    #
    # The workers that your plugins should create and work with
    #
    # Add 'inprocess' if you want JNI connector
    worker.list=ajp13
    # , inprocess


    #
    #------ DEFAULT worker1 WORKER DEFINITION ------------------------------
    #---------------------------------------------------------------------
    #

    #
    # Defining a worker named worker1 and of type worker1
    # Note that the name and the type do not have to match.
    #
    worker.ajp13.port=9009
    worker.ajp13.host=jonas-server
    worker.ajp13.type=ajp13


    #----------------------------------------------------------
    -
    -Once all this is completed, restart httpd and ensure that -jonas/tomcat is up. You can follow that up with a quick test by visiting: http://host_name/jonasAdmin.
    -You should now be able to use the application as normal.
    -
    - - diff --git a/jonas_doc/core/olddoc/howto/clusterdetails/sequoia.html b/jonas_doc/core/olddoc/howto/clusterdetails/sequoia.html deleted file mode 100644 index f52292b6e1a6007c0461945ff463f331cfccc7b0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/clusterdetails/sequoia.html +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - -How To Setup A Sequoia Database Cluster - - - - -

    How To Setup A Sequoia Database Cluster

    - -

    Sequoia is a transparent middleware solution for offering clustering, load balancing and failover services for any database. The purpose of this howto is to explain how to setup a Sequoia database cluster with JOnAS, and more precisely a RAIDB1 cluster composed of three HSQLDB databases and one Sequoia controller. This configuration allows to replicate the data in two different databases. The third database is used as recovery log. For further informaton about Sequoia and its configuration, please refer to the Sequoia documentation.

    - -
      -
    1. -

      Download the Sequoia binaries from the Sequoia site.

      -
    2. - -
    3. -

      Extract the Sequoia archive in a folder. For instance:
      -tar xvfz sequoia-x.y-bin.tar.gz

      -
    4. - -
    5. -

      Set the environment variables.
      -export JAVA_HOME=<Path to JDK home>
      -export SEQUOIA_HOME=<Path to the Sequoia home>

      -
    6. - -
    7. -

      Modify the $SEQUOIA_HOME/demo/demo-raidb1.sh file.
      -The ports for the HSQLDB instances must be modified to match the sampleCluster2 configuration. Change the ports for the three databases to 11001, 11002, 11003.

      -
    8. - -
    9. -

      Modify the Sequoia virtual database file: $SEQUOIA_HOME/config/virtualdatabase/hsqldb-raidb1.xml
      -Change the ports according to the values defined in the section above. To avoid problems in the Datasource configuration of JOnAS, modify also the password for the user to log in (VirtualLogin element). Warning if you choose another username than default value (user), modify also the vLogin attribute of ConnectionManager elements.

      -
    10. - -
    11. -

      Start the cluster (HSQLDB instances and then Sequoia controller).
      -$SEQUOIA_HOME/demo/demo-raidb1.sh -

      -
    12. - -
    13. -

      Connect to the Sequoia controller using the $SEQUOIA_HOME/drivers/sequoia-driver.jar JDBC driver and the URL:
      -jdbc:sequoia://localhost:25322/myDB with username: <user> and password: <pass>
      -Use the password you set in $CJDBC_HOME/config/virtualdatabase/hsqldb-raidb1.xml file.

      - -

      Sample Sequoia DataSource configuration file to use in JOnAS:

      -
      -###################### Sequoia DataSource configuration example
      -#
      -#####
      -DataSource configuration
      -#
      -datasource.name jdbc_1
      -datasource.url jdbc:sequoia://localhost:25322/myDB
      -datasource.classname org.continuent.sequoia.driver.Driver
      -datasource.username user
      -datasource.password pass
      -# WARNING: you must specify the mapper of the databases used as
      -# backend by Sequoia. It is not possible to use a heterogenious
      -# Sequoia configuration here.
      -datasource.mapper rdb.hsql
      -
      -
    14. -
    - - - diff --git a/jonas_doc/core/olddoc/howto/common.css b/jonas_doc/core/olddoc/howto/common.css deleted file mode 100644 index 438cf540ca2ae7e7e141e1ca27264bab129cf51a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/common.css +++ /dev/null @@ -1,246 +0,0 @@ -body { -/* background: white url(../../resources/images/draft.png) repeat right top; */ -font: verdana,sans-serif; - -} - - a:link { - color: #0000CC; - text-decoration: none; - font-style: normal; - } - - a:visited { - color: #0000CC; - text-decoration: none; - } - a:hover { - color: red; - text-decoration: none; - background-color: #ecf5ff; - } - a:active { - color: #0000CC; - text-decoration: none; - } - - -h1 -{ - border-width: 6px ; - border-style: none ; - - line-height: 27px; - border-color: #99C;/*#F8F6E2;*/ - - margin: 5px 5px 5px 5px; - background-color:#eff5fb; - width:85%; - color: #003399; - margin-top: 45px; - padding: 20px 50px; -} - -h2 -{ - - font-size: 20px; - line-height: 27px; - font-weight: normal; - border-color:#99C; - - border-width: 2px 0 0 0; - border-style: solid none none none; - background-color:#eff5fb; - width:45%; -} - - - -h3, h4, h5, h6 { - color: #003399; - font-weight: 500; - margin-top: 10px; - padding-top: 5px; -} - - - h1 { font-size: 150%; } - h2 { font-size: 140%; color: #3e80a2;} - h3 { font-size: 110%; font-weight: bold; } - h4 { font-size: 110%; font-weight: bold;} - h5 { font-size: 100%; font-style: italic; } - h6 { font-size: 100%; font-style: italic; } - - - - tt { - font-size: 90%; - font-style: monospace; - color: #111111; - } - - - pre { - font-size: 100%; - padding: 5px; - border-style: solid; - border-width: 1px; - border-color: #CCCCCC; - background-color: #F4F4F4; - } - - hr { - width: 100%; - height: 1px; - background-colorcolor:black; - background-color:white;: #CCCCCC; - border-width: 0px; - padding: 0px; - color: #CCCCCC; - } - - - - .variablelist { - padding-top: 10; - padding-bottom: 10; - margin: 0; - } - .itemizedlist { - padding-top: 0; - padding-bottom: 0; - margin: 0; - - } - .orderedlist{ - padding-top: 0; - padding-bottom: 0; - margin: 0; - } - .term { - font-weight: red;bold; - } - - - .warning - { - padding-bottom: 5px; - padding-left: 5px; - padding-right: 5px; - background-color: #FBDADA; - } - -.screen { - background-color: #edf8fd; - forground-color: black; - border: 1px solid #9999cc; - padding: 0.5em; - margin: 2em; - width:85%; - - } - -.informaltable table { - padding: 10px; - border: none; - -} - -.informaltable tr:first-child td { - background-color:#C0C9D8; - padding: 10px 8px 10px 8px; - font-weight:bold; - font-size: normal; - -} - - -.informaltable tr{ - - border-bottom: 5px solid #FFFFFF; - border-top: 5px solid #FFFFFF; - -} - -.informaltable td{ - - margin: 0px 0px 0px 0px; - padding: 10px 8px 10px 8px; - - background-color: #EAEDF2; - font-size: small; - -} -.informaltable td p { - background-color:#EAEDF2; -} -.informaltable li p{ - background-color:#EAEDF2; -} - -.calloutlist tr:first-child td { - background-color:FFFFFF; -} - -.calloutlist tr { - background-color:FFFFFF;font-size: small; -} - - .caution tr:first-child td{ - background-color:FFFFFF; -} - -.caution tr { - background-color:FFFFFF; - font-size: small; -} -.caution table { - border: none; - border-color: #C0C9D8; - margin: 5px; -} - -.note tr:first-child td{ - background-color:FFFFFF; -} - -.note tr { - background-color:FFFFFF; - font-size: small; -} - -.note table { - border: none; - border-color: #C0C9D8; - margin: 2px; -} - .note { - padding-bottom: 5px; - padding-left: 5px; - padding-right: 5px; - background-color:FFFFFF; - -} - -.mediaobject { - border-top: 5px solid #FFFFFF; - border-bottom: 5px solid #FFFFFF; - border-color:#EAEDF2; - margin: 10px; - padding:5px; -} - -.glossary dt { - background-color:#eff5fb; - width:5%; -} - -.programlisting { - overflow:auto;width:75%;height:200px; - border-top: 5px solid #FFFFFF; - border-bottom: 5px solid #FFFFFF; - border-color:black; - margin: 10px; - padding:5px; -} diff --git a/jonas_doc/core/olddoc/howto/emb-images/emb-component.png b/jonas_doc/core/olddoc/howto/emb-images/emb-component.png deleted file mode 100644 index 283d4dcdc7ed7831688c338b329cacf93981de3c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/emb-images/emb-component.png and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/emb-images/emb-deps.png b/jonas_doc/core/olddoc/howto/emb-images/emb-deps.png deleted file mode 100644 index e22a9ff77bd2061f1e0413826764ac3a070b9567..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/emb-images/emb-deps.png and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/emb-images/mfb.png b/jonas_doc/core/olddoc/howto/emb-images/mfb.png deleted file mode 100644 index ee21aa9cdd124d99f1df267ad92feff97acf1bb4..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/emb-images/mfb.png and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/emb-images/src/emb-component.svg b/jonas_doc/core/olddoc/howto/emb-images/src/emb-component.svg deleted file mode 100644 index 9e89c6481fcfccd690be17c91af53729e99eb0ec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/emb-images/src/emb-component.svg +++ /dev/null @@ -1,1527 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - «ear» - - - - - - - - - - - «rar» - servlet-publisher - - - - - - - - - - - «ejb» - emb-core-ejb - - - - - - - - - - - - «war» - servlet-publisher - - - - - - - - - - - «war» - user-webApp - - - - - - - - - - - «rar» - ffmpeg-mfb-plugin - - - - - - - - - - - «rar» - apache-publisher-plugin - - - - - - - - - - - «rar» - jai-mfb-plugin - - - - - - - - - - - «rar» - darwin-publisher-plugin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - «rar» - svg-mfb-plugin - - - - - - - ApacheHTTPd - DarwinStreamingServer - JOnAS - user App - - provided by JOnASEMB core application - - additional plugin - request - publish - convert - diff --git a/jonas_doc/core/olddoc/howto/emb-images/src/emb-deps.svg b/jonas_doc/core/olddoc/howto/emb-images/src/emb-deps.svg deleted file mode 100644 index b8774c860bfff4d4be9f0ab252d9a65d802271f8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/emb-images/src/emb-deps.svg +++ /dev/null @@ -1,481 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Enterprise Media Beans - - - - - - - - - - - - - - - - - - - - - - - - - - require - Media FoundationBeans - Media EntityBeans - EJB 2.0Entity Beans - Java 2 baseTechnology - - - require - require - diff --git a/jonas_doc/core/olddoc/howto/emb-images/src/mfb.svg b/jonas_doc/core/olddoc/howto/emb-images/src/mfb.svg deleted file mode 100644 index 0d1f0892ef9fd0c66fb3dceadf63c709f6063008..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/emb-images/src/mfb.svg +++ /dev/null @@ -1,669 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Media Foundation Beans - - - - - - - - - - - - - MediaFormat - MediaConverter - - - plug-in - plug-in - - - - - - - - - - - - - - - - - - - - - - - - - - - 3rd PartyImplementation - - - - - - - - - - - - - - - - - - - - - - - - - - - 3rd PartyImplementation - diff --git a/jonas_doc/core/olddoc/howto/images/JOnASJMX.gif b/jonas_doc/core/olddoc/howto/images/JOnASJMX.gif deleted file mode 100755 index cc3f142df5d612a2f7accd9486b2d26a499d81b5..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/JOnASJMX.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/cluster1.gif b/jonas_doc/core/olddoc/howto/images/cluster1.gif deleted file mode 100755 index f0c34ab54dcf63a5ff4f71dd21df94fc34240018..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/cluster1.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/Apache.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/Apache.jpg deleted file mode 100644 index 655aff768400f28cb4a3e86faa7168c4f0d1f285..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/Apache.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi1.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi1.jpg deleted file mode 100644 index 03feb5aa927c4857f228ec93a8a5218aa5bf4067..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi1.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi2.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi2.jpg deleted file mode 100644 index 1d033eea02f49c77e76f54719666b6788b86df1a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi2.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi3.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi3.jpg deleted file mode 100755 index dd55df07b9b4fb4a87c69d5fc5edd9d7c1d1beed..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi3.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi4.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi4.jpg deleted file mode 100755 index fee3be2dd925b7e88c112a8067afbebe7a01908c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi4.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi5.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi5.jpg deleted file mode 100644 index 1b6db93a6dfc08800eace4778d5f0086976913fd..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/Archi5.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/Architecture.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/Architecture.jpg deleted file mode 100755 index 9909f0933b394ccf9e5af22636877daac211c214..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/Architecture.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/EJBCont.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/EJBCont.jpg deleted file mode 100644 index 189ac4ece612e393b235ae693d5a5da2534be301..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/EJBCont.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/FullJOnAS.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/FullJOnAS.jpg deleted file mode 100644 index 5c0f4c94903b7144fe382a5e0d19ffc54c42ba31..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/FullJOnAS.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/JOnASEJB.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/JOnASEJB.jpg deleted file mode 100644 index 8cecf3fb4fe1bcc6f1949129e33f13ae0e16d3e7..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/JOnASEJB.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/JOnASWeb.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/JOnASWeb.jpg deleted file mode 100644 index 1a40e8d3ae4003049884fde8e2915e3a72c3232b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/JOnASWeb.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/Node.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/Node.jpg deleted file mode 100644 index d753ca8184e4c814d65eca6b5b401358a2fe6e4d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/Node.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/Thumbs.db b/jonas_doc/core/olddoc/howto/images/clusterfiles/Thumbs.db deleted file mode 100644 index 88dbc6f436bc561946ced667b71055b9143f4dfc..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/Thumbs.db and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/WebCont.jpg b/jonas_doc/core/olddoc/howto/images/clusterfiles/WebCont.jpg deleted file mode 100644 index a8e1d13d499b7ed1a542a3eafdbbf1bd34c5bb91..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/WebCont.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/common.css b/jonas_doc/core/olddoc/howto/images/clusterfiles/common.css deleted file mode 100644 index 2ee47fbefb12cfa988dec6f3b88847a2c8461f16..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/images/clusterfiles/common.css +++ /dev/null @@ -1,84 +0,0 @@ -BODY { - FONT-WEIGHT: normal; FONT-SIZE: 12px; MARGIN: 10px; COLOR: black; LINE-HEIGHT: 16px; FONT-FAMILY: Arial,Helvetica, sans-serif; BACKGROUND-COLOR: #ffffff -} -SELECT { - FONT-SIZE: 10px -} -INPUT { - FONT-SIZE: 10px -} -FORM { - PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px 0px 3px; PADDING-TOP: 0px -} -.contenu { - PADDING-RIGHT: 30px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; PADDING-TOP: 0px -} -H1 { - BORDER-RIGHT: #99c 0px; BORDER-TOP: #99c 0px; FONT-WEIGHT: bold; FONT-SIZE: 22px; MARGIN: 10px 0px 5px; BORDER-LEFT: #99c 0px; COLOR: #e06611; LINE-HEIGHT: 27px; BORDER-BOTTOM: #99c 4px solid; FONT-FAMILY: Arial, Helvetica, sans-serif -} -H2 { - BORDER-RIGHT: #e06611 0px; BORDER-TOP: #e06611 0px; FONT-WEIGHT: normal; FONT-SIZE: 20px; MARGIN: 10px 0px 5px; BORDER-LEFT: #e06611 0px; COLOR: #99c; LINE-HEIGHT: 27px; BORDER-BOTTOM: #e06611 4px solid; FONT-FAMILY: Arial, Helvetica, sans-serif -} -H3 { - BORDER-RIGHT: #e8eaf0 0px; BORDER-TOP: #e8eaf0 0px; FONT-WEIGHT: bold; FONT-SIZE: 16px; MARGIN: 10px 0px 5px; BORDER-LEFT: #e8eaf0 0px; COLOR: #e06611; LINE-HEIGHT: 27px; BORDER-BOTTOM: #e8eaf0 2px solid; FONT-FAMILY: Arial, Helvetica, sans-serif -} -H4 { - BORDER-RIGHT: #e8eaf0 0px; BORDER-TOP: #e8eaf0 0px; FONT-WEIGHT: normal; FONT-SIZE: 16px; MARGIN: 10px 0px 5px; BORDER-LEFT: #e8eaf0 0px; COLOR: #99c; LINE-HEIGHT: 24px; BORDER-BOTTOM: #e8eaf0 2px solid; FONT-FAMILY: Arial, Helvetica, sans-serif -} -H5 { - BORDER-RIGHT: #e8eaf0 0px; BORDER-TOP: #e8eaf0 0px; FONT-WEIGHT: normal; FONT-SIZE: 14px; MARGIN: 10px 0px 5px; BORDER-LEFT: #e8eaf0 0px; COLOR: #e06611; LINE-HEIGHT: 24px; BORDER-BOTTOM: #e8eaf0 2px solid; FONT-FAMILY: Arial, Helvetica, sans-serif -} -H6 { - BORDER-RIGHT: #e8eaf0 0px; BORDER-TOP: #e8eaf0 0px; FONT-WEIGHT: normal; FONT-SIZE: 14px; MARGIN: 10px 0px 5px; BORDER-LEFT: #e8eaf0 0px; COLOR: #99c; LINE-HEIGHT: 22px; BORDER-BOTTOM: #e8eaf0 2px solid; FONT-FAMILY: Arial, Helvetica, sans-serif -} -TD { - FONT-WEIGHT: normal; FONT-SIZE: 12px; COLOR: black; FONT-FAMILY: Arial,Helvetica, sans-serif -} -P { - FONT-WEIGHT: normal; FONT-SIZE: 12px; MARGIN: 10px 10px 5px 0px; COLOR: black; LINE-HEIGHT: 16px; FONT-FAMILY: Arial,Helvetica, sans-serif -} -P.error { - COLOR: red -} -A { - COLOR: #3f3975; BACKGROUND-COLOR: transparent; TEXT-DECORATION: underline -} -A:visited { - COLOR: #9898cb; BACKGROUND-COLOR: transparent; TEXT-DECORATION: underline -} -A:hover { - COLOR: #e06611; BACKGROUND-COLOR: transparent; TEXT-DECORATION: underline -} -A:active { - COLOR: #ffffff; BACKGROUND-COLOR: #e06611; TEXT-DECORATION: underline -} -BLOCKQUOTE { - FONT-WEIGHT: normal; FONT-SIZE: 11px; MARGIN: 20px 0px 5px; COLOR: black; LINE-HEIGHT: 15px; FONT-FAMILY: Arial,Helvetica, sans-serif -} -UL { - FONT-WEIGHT: normal; FONT-SIZE: 12px; COLOR: black; LINE-HEIGHT: 16px; FONT-FAMILY: Arial,Helvetica, sans-serif -} -OL { - FONT-WEIGHT: normal; FONT-SIZE: 12px; COLOR: black; LINE-HEIGHT: 16px; FONT-FAMILY: Arial,Helvetica, sans-serif -} -DL { - FONT-WEIGHT: normal; FONT-SIZE: 12px; COLOR: black; LINE-HEIGHT: 16px; FONT-FAMILY: Arial,Helvetica, sans-serif -} -DT { - FONT-WEIGHT: bold; FONT-SIZE: 12px; COLOR: black; LINE-HEIGHT: 16px; FONT-FAMILY: Arial,Helvetica, sans-serif -} -DD { - FONT-WEIGHT: normal; FONT-SIZE: 11px; MARGIN: 0px 0px 0px 20px; COLOR: black; LINE-HEIGHT: 16px; FONT-FAMILY: Arial,Helvetica, sans-serif -} -ADDRESS { - BORDER-RIGHT: #e06611 0px; PADDING-RIGHT: 0px; BORDER-TOP: #e06611 4px solid; PADDING-LEFT: 0px; FONT-SIZE: 10px; PADDING-BOTTOM: 0px; MARGIN: 30px 0px 20px; BORDER-LEFT: #e06611 0px; COLOR: black; LINE-HEIGHT: 16px; PADDING-TOP: 10px; BORDER-BOTTOM: #e06611 0px; FONT-STYLE: normal; FONT-FAMILY: Arial, Helvetica, sans-serif -} -CODE { - COLOR: #433c7b -} -PRE { - COLOR: #433c7b -} -TH { - PADDING-RIGHT: 2px; PADDING-LEFT: 2px; FONT-WEIGHT: bold; FONT-SIZE: 14px; PADDING-BOTTOM: 2px; COLOR: #433c7b; LINE-HEIGHT: 15px; PADDING-TOP: 2px; FONT-FAMILY: Arial,Helvetica, sans-serif; BACKGROUND-COLOR: #e8eaf0 -} diff --git a/jonas_doc/core/olddoc/howto/images/clusterfiles/sampleCluster2Screen.GIF b/jonas_doc/core/olddoc/howto/images/clusterfiles/sampleCluster2Screen.GIF deleted file mode 100644 index 06fa589c44a09fac8d6d6569b6061515d6e4749d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/clusterfiles/sampleCluster2Screen.GIF and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jmsclustering/JmsClustering-queues.jpg b/jonas_doc/core/olddoc/howto/images/jmsclustering/JmsClustering-queues.jpg deleted file mode 100644 index 2679df267329cf37d4a7bbc68b52d8524d49891d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jmsclustering/JmsClustering-queues.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jmsclustering/JmsClustering-topics.jpg b/jonas_doc/core/olddoc/howto/images/jmsclustering/JmsClustering-topics.jpg deleted file mode 100644 index d918f3857f049520d70427ce321de7f4924d6bb5..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jmsclustering/JmsClustering-topics.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jmsclustering/joram.jpg b/jonas_doc/core/olddoc/howto/images/jmsclustering/joram.jpg deleted file mode 100644 index 08ce0e01009229ecdf99ea6b45cc3cbc9f1ab623..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jmsclustering/joram.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jmsclustering/joram_ha.jpg b/jonas_doc/core/olddoc/howto/images/jmsclustering/joram_ha.jpg deleted file mode 100644 index a8e9a5f18e368c522721c28b5ca2d9266da87b25..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jmsclustering/joram_ha.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jmsclustering/mdb.jpg b/jonas_doc/core/olddoc/howto/images/jmsclustering/mdb.jpg deleted file mode 100644 index 0b1558dc0876eb2cc1f8d37b9f2acc3ed809af61..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jmsclustering/mdb.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jmsclustering/mdb_config.jpg b/jonas_doc/core/olddoc/howto/images/jmsclustering/mdb_config.jpg deleted file mode 100644 index 1b474e4a69e3bb84da4d7535b2375f8172144904..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jmsclustering/mdb_config.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jmsclustering/queue.jpg b/jonas_doc/core/olddoc/howto/images/jmsclustering/queue.jpg deleted file mode 100644 index df8ebcf624aec9fe082b02dda51bd5f10cb2d7ed..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jmsclustering/queue.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jmsclustering/topic.jpg b/jonas_doc/core/olddoc/howto/images/jmsclustering/topic.jpg deleted file mode 100644 index db23deff71585b7e7398aec724a06002c2d837e9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jmsclustering/topic.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonas_cmp.gif b/jonas_doc/core/olddoc/howto/images/jonas_cmp.gif deleted file mode 100755 index 37d28d7f30d919f387dea8c7c188dcaca72d2ff5..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonas_cmp.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonasarch.gif b/jonas_doc/core/olddoc/howto/images/jonasarch.gif deleted file mode 100755 index bc5d93e22977edc63dc8de98244cf2835db948c1..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonasarch.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg1.jpg b/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg1.jpg deleted file mode 100644 index 920199823462a3cfb908137298203da9de73a2b1..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg1.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg2.jpg b/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg2.jpg deleted file mode 100644 index f223e1a39e37a293888d09077f818f38314c28ff..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg2.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg3.jpg b/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg3.jpg deleted file mode 100644 index db4c0713288d1dd37df60e86620d99b256628291..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg3.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg4.jpg b/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg4.jpg deleted file mode 100644 index a3f1ac4ff6ee8631b5af1381e11e5e90f9e9770d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg4.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg5.jpg b/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg5.jpg deleted file mode 100644 index c3c31d4d81d2432f2afcbfc7686d067a90ac07f4..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg5.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg6.jpg b/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg6.jpg deleted file mode 100644 index 3bc50a9681eddcb92ab057afabbf658d8b1f05cb..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg6.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg7.jpg b/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg7.jpg deleted file mode 100644 index 027666ac6efd681f4f814083cfd5001f7c49ec6b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg7.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg8.jpg b/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg8.jpg deleted file mode 100644 index a4e481573828a21e43204cb44cda5c473a71d0bc..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/jonastransactionrecoveryhowto/recovimg8.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/images/logo_jonas.jpg b/jonas_doc/core/olddoc/howto/images/logo_jonas.jpg deleted file mode 100755 index 3fe9b43072176d2275d8725eb977b781a9730306..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/howto/images/logo_jonas.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/howto/install_j2ee.html b/jonas_doc/core/olddoc/howto/install_j2ee.html deleted file mode 100644 index 61f06b3883d260728839ebff790c9813cc223e07..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/install_j2ee.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - Installing the packaging JOnAS with a web container Tomcat or Jetty - from scratch - - - - - -

    Howto: Installing the packaging JOnAS with a -web container
    -(JOnAS/Tomcat or JOnAS/Jetty) from scratch

    - -

    This guide provides instructions for installing JOnAS (with a web -container already included) from scratch.

    - -

    The content is organized into the following steps:

    -
      -
    1. J2SE SDK 1.4 installation
    2. -
    3. ANT 1.6 installation
    4. -
    5. JOnAS/ Web Container installation
    6. -
    7. Setup
    8. -
    9. Starting JOnAS and running - examples
    10. -
    - -

    J2SE SDK 1.4 installation

    - -

    Download the binary version of a J2SE SDK 1.4 from the java Sun web site into the appropriate -directory. Launch the executable file:

    - -

    ./j2sdk-1_<version number>-<system>.bin for Unix -
    -./j2sdk-1_<version number>-<system>.sh for Linux
    - j2sdk-1_<version number>-windows-i586.exe for Windows

    - -

    Set the JAVA_HOME environment variable and update the path:

    - -

    export JAVA_HOME=<Installation Directory>
    -PATH=$JAVA_HOME/bin:$PATH (on Windows : -PATH=%JAVA_HOME%/bin;%PATH%)

    - -

    ANT 1.6 installation

    - -

    Download the binary version of Ant 1.6 from the Ant Apache web site. Untar -or Unzip it into the appropriate directory:

    - -

    tar -jxvf apache-ant-1.6.1-bin.tar.bz2
    -(or unzip apache-ant-1.6.1-bin.zip)

    - -

    Set the ANT_HOME environment variable and update the path:

    - -

    export ANT_HOME=<Installation Directory>
    -PATH=$PATH;$ANT_HOME/bin (on Windows : PATH=%ANT_HOME%/bin;%PATH%)

    - -

    Download bcel-5.1.tar.gz from the Jakarta -web site and install bcel-5.1.jar in the directory -$ANT_HOME/lib.

    - -

    JOnAS/Web Container installation

    - -

    Download the binary version of JOnAS with Tomcat or Jetty from the ObjectWeb -forge web site.
    -Choose a location for the JOnAS installation.
    -Be aware that if you have already installed a previous version of JOnAS in -this location, the new installation will overwrite the existing files, thus -customized configuration files may be lost. Therefore, it is prudent to save -these files before starting the installation process.
    -The installation process consists of untaring the downloaded file.
    -Change to the directory in which JOnAS will be installed and untar this file, -using
    -the tar -zxvf jonas.tgz command. Note that this file can be -opened with winzip on Windows.
    -After installing the JOnAS product, set the following environment -variable:

    - -

    export JONAS_ROOT = <Installation Directory>
    -PATH = $JONAS_ROOT/bin/unix:$PATH (on Windows: -PATH=%JONAS_ROOT%/bin/nt;%PATH%)

    - -

    Setup

    - -

    Before using JOnAS, complete the following setup activities:

    - - -

    Starting JOnAS and running some -examples

    - -

    If the Setup step has not been -completed as described, JOnAS may not work. -
    -Use the command jonas check to verify that the -environment is correct.

    - -


    -If the environment is correct, JOnAS is -ready to use.
    -Do a jonas start, then use a browser to go http://localhost:9000/. (Modify this url -with the appropriate hostname.)
    -From the root context in which JOnAS was deployed, you can execute the -earsample, access the JOnAS administration application, as well as perform -other functions.

    - - diff --git a/jonas_doc/core/olddoc/howto/install_jonas.html b/jonas_doc/core/olddoc/howto/install_jonas.html deleted file mode 100644 index a404bada51ec4de483f8cafe853a6fce52ed4f2c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/install_jonas.html +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - Installing JOnAS from scratch - - - - -

    Howto: Installing JOnAS from scratch

    - -

    This guide provides instructions for installing JOnAS from scratch on -Unix-compatible systems.

    - -

    The content is organized into the following steps

    -
      -
    1. J2SE SDK 1.4 installation
    2. -
    3. Ant 1.6 installation
    4. -
    5. Tomcat 5.5.x installation
    6. -
    7. Jetty 5.1.x installation
    8. -
    9. JOnAS installation
    10. -
    11. Setup
    12. -
    - -

    J2SE SDK 1.4 installation

    - -

    Download the binary version of J2SE SDK 1.4 from the java Sun web site into the appropriate -directory. Launch the executable file:

    - -

    ./j2sdk-1_<version number>-<system>.bin for Unix -
    -./j2sdk-1_<version number>-<system>.sh for Linux
    - j2sdk-1_<version number>-windows-i586.exe for Windows

    - -

    Set the JAVA_HOME environment variable and update the path:

    - -

    export JAVA_HOME=<Installation Directory>
    -PATH=$JAVA_HOME/bin:$PATH (on Windows: PATH=%JAVA_HOME%/bin;%PATH%)

    - -

    Ant 1.6 installation

    - -

    Download the binary version of Ant 1.6 from the Ant Apache web site. Untar -or Unzip it into the appropriate directory:

    - -

    tar -jxvf apache-ant-1.6.x-bin.tar.bz2
    -(or unzip apache-ant-1.6.x-bin.zip)

    - -

    Set the ANT_HOME environment variable and update the path:

    - -

    export ANT_HOME=<Installation Directory>
    -PATH=$PATH;$ANT_HOME/bin (on Windows: PATH=%ANT_HOME%/bin;%PATH%)

    - -

    Download bcel-5.x.tar.gz from the Jakarta -web site and install bcel-5.x.jar in the directory -$ANT_HOME/lib.

    - -

    Tomcat 5.5.x installation

    - -

    Download the binary version of Tomcat 5.5.x from the Jakarta -Tomcat web site. Untar it into the appropriate directory:

    - -

    tar -xvf jakarta-tomcat-5.5.x.tar.gz

    - -

    Set the CATALINA_HOME environment variable:

    - -

    export CATALINA_HOME=<Installation Directory>
    -JONAS_BASE directory can be used as CATALINA_BASE: export -CATALINA_BASE=$JONAS_BASE
    -Configuration information for the Realm and users is provided at the Setup process.

    - -

    Jetty 5.1.x installation

    - -

    Download the binary version of Jetty 5.1.x from the -Jetty web site. Untar it into the appropriate directory:

    - -

    tar -xvf jetty-5.1.x-all.tar.gz

    - -

    Set the JETTY_HOME environment variable:

    -

    export JETTY_HOME=<Installation Directory>

    - -

    JOnAS installation

    - -

    Download the binary version of JOnAS from the ObjectWeb web -site.
    -Choose a location for the JOnAS installation.
    -Be aware that if you have already installed a previous version of JOnAS in -this location, the new installation will overwrite existing files, thus -customized configuration files may be lost. Therefore, it is prudent to save -these files before starting the installation process.
    -The installation process consists of untaring the downloaded file.
    -Change to the directory in which JOnAS is to be installed and untar this -file, using
    -the tar -zxvf jonas.tgz command.
    -After installing the JOnAS product, set the following environment -variable:

    - -

    export JONAS_ROOT = <Installation Directory>
    -PATH = $JONAS_ROOT/bin/unix:$PATH

    - -

    Do an ant install in the JONAS_ROOT directory to -unpack the jar files necessary to build jonas.jar and -client.jar.

    - -

    Setup

    - -

    Before using JOnAS, the following setup activities must be completed:

    - - -

    Compile the examples as follows:
    -ant install in the directory -$JONAS_ROOT/examples

    - - diff --git a/jonas_doc/core/olddoc/howto/ws/sample-deploy.wsdd b/jonas_doc/core/olddoc/howto/ws/sample-deploy.wsdd deleted file mode 100644 index 82f47094c43a3e8b070f47f9c655810fef8ed83c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/ws/sample-deploy.wsdd +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - diff --git a/jonas_doc/core/olddoc/howto/ws/sample-server-config.wsdd b/jonas_doc/core/olddoc/howto/ws/sample-server-config.wsdd deleted file mode 100644 index 25aab7651b32a3879cc0168c3c26195d53613783..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/ws/sample-server-config.wsdd +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/olddoc/howto/ws/sample-web.xml b/jonas_doc/core/olddoc/howto/ws/sample-web.xml deleted file mode 100644 index d4110d586492013265e5da82d9f37a42f40aa52e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/howto/ws/sample-web.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - Apache-Axis - - - org.apache.axis.transport.http.AxisHTTPSessionListener - - - - AxisServlet - Apache-Axis Servlet - - org.apache.axis.transport.http.AxisServlet - - - - - - - - - - - AxisServlet - /servlet/AxisServlet - - - - - - - - AxisServlet - /services/* - - - - - - - - - - - 5 - - - - - wsdl - text/xml - - - - - xsd - text/xml - - - - index.html - index.jsp - index.jws - - - diff --git a/jonas_doc/core/olddoc/images/AreaGraph.png b/jonas_doc/core/olddoc/images/AreaGraph.png deleted file mode 100644 index 182c499f5d73e2c3070c47b8d4f94e908176f758..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/AreaGraph.png and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/JonasAdmin.gif b/jonas_doc/core/olddoc/images/JonasAdmin.gif deleted file mode 100644 index 8deabcb50c96895b80e094fb3f6d8a953bdaef2d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/JonasAdmin.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/JonasAreas.png b/jonas_doc/core/olddoc/images/JonasAreas.png deleted file mode 100644 index 5d3ede5abdd8677918b8242d759a828e487e4a75..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/JonasAreas.png and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/WP_distr.gif b/jonas_doc/core/olddoc/images/WP_distr.gif deleted file mode 100644 index 5be962e9d0cf153fb0f78fdaf18d62a48a75fcbb..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/WP_distr.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/classloaders.png b/jonas_doc/core/olddoc/images/classloaders.png deleted file mode 100644 index 885f1283c918c999cdd7ea7b88273e9057bd23ba..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/classloaders.png and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/cluster1.gif b/jonas_doc/core/olddoc/images/cluster1.gif deleted file mode 100644 index f0c34ab54dcf63a5ff4f71dd21df94fc34240018..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/cluster1.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/clusterd.gif b/jonas_doc/core/olddoc/images/clusterd.gif deleted file mode 100644 index b5909b28a8bfd30e09e829c77bb98ad484009f4f..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/clusterd.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/clustering.gif b/jonas_doc/core/olddoc/images/clustering.gif deleted file mode 100644 index 8ddd9313aeb7a22cfe064a8ba2e248cbabf43f3f..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/clustering.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/cmi-cluster-stub.gif b/jonas_doc/core/olddoc/images/cmi-cluster-stub.gif deleted file mode 100755 index 0602d8899e6a67b61ff4b55d42118244cb29005c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/cmi-cluster-stub.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/cmi-jndi.gif b/jonas_doc/core/olddoc/images/cmi-jndi.gif deleted file mode 100755 index 66eef4d05946b64b9fc00b300a3df242631ffb9b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/cmi-jndi.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/cmi.gif b/jonas_doc/core/olddoc/images/cmi.gif deleted file mode 100755 index d7b2b95876043fe8f7ea3d9525f4e58bb26f9a92..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/cmi.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/domain_new.gif b/jonas_doc/core/olddoc/images/domain_new.gif deleted file mode 100644 index 870c3138d1d2d2d6449e016e05d4d4dbf797f30b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/domain_new.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/eb_img_31.gif b/jonas_doc/core/olddoc/images/eb_img_31.gif deleted file mode 100644 index b8f9dea7889aae9a61a4addaa86a410c7a82f0cd..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/eb_img_31.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/favicon.ico b/jonas_doc/core/olddoc/images/favicon.ico deleted file mode 100644 index 77b4626985a2c8c9b9865daf322097cdbe5eec0b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/favicon.ico and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/j2ee.gif b/jonas_doc/core/olddoc/images/j2ee.gif deleted file mode 100644 index c301360457584abcac51caba346834e1069bb712..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/j2ee.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/jcaarch.gif b/jonas_doc/core/olddoc/images/jcaarch.gif deleted file mode 100644 index 004df595b8a7f26b8322c14e1dee9a0fd9723a85..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/jcaarch.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/jconsole.png b/jonas_doc/core/olddoc/images/jconsole.png deleted file mode 100644 index fa7b8a03491116fabc8948158d732cc2f080a276..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/jconsole.png and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/jonas48repscenarios.jpg b/jonas_doc/core/olddoc/images/jonas48repscenarios.jpg deleted file mode 100644 index 499a7bc8c5a3d636e18e5ba046eb4ac071e1264d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/jonas48repscenarios.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/jonasTree.png b/jonas_doc/core/olddoc/images/jonasTree.png deleted file mode 100644 index 75342154d8344a1f293741fd33c3ec2a6073047d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/jonasTree.png and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/jonasarch.gif b/jonas_doc/core/olddoc/images/jonasarch.gif deleted file mode 100644 index bc5d93e22977edc63dc8de98244cf2835db948c1..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/jonasarch.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/logo_jonas.jpg b/jonas_doc/core/olddoc/images/logo_jonas.jpg deleted file mode 100644 index 3fe9b43072176d2275d8725eb977b781a9730306..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/logo_jonas.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/pix.gif b/jonas_doc/core/olddoc/images/pix.gif deleted file mode 100644 index bd070b07699edea95cbafcaa9c94283fd45e9059..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/pix.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/roles1.gif b/jonas_doc/core/olddoc/images/roles1.gif deleted file mode 100644 index 29114abb09d8ad3cff600841d1a56ace612035e8..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/roles1.gif and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/sfsb-rep.jpg b/jonas_doc/core/olddoc/images/sfsb-rep.jpg deleted file mode 100644 index b2ebec67cb72ebe3a9b166251fc554c359e5fb37..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/sfsb-rep.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/ws_client.jpg b/jonas_doc/core/olddoc/images/ws_client.jpg deleted file mode 100644 index 3ebd1cd17fa81fdf23e5cca082ecbf222d931937..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/ws_client.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/images/ws_endpoint.jpg b/jonas_doc/core/olddoc/images/ws_endpoint.jpg deleted file mode 100644 index 110f8951bdfb87c7bf11cab9537f6952fa8080a1..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/olddoc/images/ws_endpoint.jpg and /dev/null differ diff --git a/jonas_doc/core/olddoc/index.html b/jonas_doc/core/olddoc/index.html deleted file mode 100644 index da39e28459cea8e13848a1020f88c34e6f818181..0000000000000000000000000000000000000000 --- a/jonas_doc/core/olddoc/index.html +++ /dev/null @@ -1,140 +0,0 @@ - - - - - JOnAS Platform Documentation - - - - - -

     ../../resources/images/logo_jonas.jpg

    - -

    JOnAS 5 Documentation

    - -

    -
      -
    1. White Paper
    2. -
    3. JOnAS Architecture Design
    4. -
    5. Getting Started
    6. - -
    7. Configuration Guide
    8. -
    9. Migration Guide
    10. -
    11. Continuous Integration with Bamboo Guide
    12. -
    13. J2EE Application Programmer's - Guide - -
    14. -
    15. Enterprise Beans Programmer's Guide - -
    16. -
    17. Web Application Programmer's Guide - -
    18. -
    19. J2EE Connector Programmer's - Guide - -
    20. -
    21. J2EE Client Application Programmer's - Guide - -
    22. -
    23. J2EE Application - Assembler's Guide - -
    24. -
    25. Deployment and Installation - Guide
    26. -
    27. Administration Guide
    28. -
    29. Clustering guide - -
    30. -
    31. JOnAS Commands Reference Guide
    32. -
    33. Howto Documents - -
    34. -
    - -

    Thanks to Bruno Bellamy for the -JOnAS logo.

    - - diff --git a/jonas_doc/core/pom.xml b/jonas_doc/core/pom.xml deleted file mode 100644 index 6b1b0f93004b0432f3c319ae053ada9be519c083..0000000000000000000000000000000000000000 --- a/jonas_doc/core/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - jonas-doc-src - org.ow2.jonas.documentation - 5.3.0-M8-SNAPSHOT - - 4.0.0 - org.ow2.jonas.documentation - jonas-doc-en-deployment-plan - JOnAS Documentation Source :: Core - - - - - org.apache.maven.plugins - maven-jar-plugin - - - src - - - - - - maven-antrun-plugin - 1.4 - - - process-resources - - - - - - - run - - - - - - - \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/Glossary.xml b/jonas_doc/core/src/docbook/doc-en/Glossary.xml deleted file mode 100644 index dc6a98873d066121a32ca9f380cf141ea9b76d44..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/Glossary.xml +++ /dev/null @@ -1,490 +0,0 @@ - - - - Glossary - - - - Axis - - - Java platform for creating and deploying web services - applications - - - - - CAROL - - - Library allowing the use of different RMI implementations. - - - - - CMI - - - (Clustered Method Invocation) is the cluster protocol for high - availability, load-balancing and fail-over - - - - - EasyBeans - - - An Open source and lightweight EJB3 container that can be embedded - in and other - application servers. It is an project. - - - - - EIS - - - Enterprise Information Systems - - - - - EJB - - - Enterprise JavaBeans technology is the server-side component - architecture for the Java Platform, Enterprise Edition (Java EE). EJB - technology enables rapid development of distributed, transactional, - secure and portable applications based on Java technology. - - - - - Hibernate - - - A Java-based object-relational mapping and persistence - framework. - - - - - IIOP - - - Inter-operable Internet Object Protocol. It is the CORBA RPC - standard protocol on TCP/IP. - - - - - JAAS - - - The Java Authentication and Authorization Service is a set of APIs - that enable services to authenticate and enforces access controls upon - users. - - - - - JACC - - - Java Authorization Contract for Containers - - - - - Jakarta Commons - Logging - - - Wrapper around a variety of logging API implementations. - - - - - Java EE - - - Java Platform, Enterprise Edition. A standard for developing - portable, robust, scalable and secure server-side Java - applications. - - - - - JAXP - - - Java API for XML Processing. Provides the validating and parsing - capabilities for XML documents. - - - - - JAXR - - - Java API for XML Registries. Defines a standard API for Java - platform applications to access and programmatically interact with - different kinds of XML-based metadata registries. - - - - - JAX-RPC - - - Java APIs for XML based RPC. - - - - - JAX-WS - - - Java API for XML-based Web Services. A Java programming language - API for creating web services. - - - - - J2CA - - - J2EE Connector Architecture is a standard for facilitating the - integration of application servers with heterogeneous Enterprise - Information Systems (EISs). - - - - - J2EE - - - Java 2 Platform, Enterprise Edition. A standard for developing - portable, robust, scalable and secure server-side Java applications up - to version 1.5 of the Java Platform. - - - - - JDBC - - - Java Database Connectivity. The JDBC API provides a call-level API - for SQL-based database access. - - - - - JDK - - - The Java Development Kit is set of Java tools (compiler, jvm, - library ...) for developing Java programs. - - - - - JDO - - - The Java Data Objects API is a standard interface-based Java model - abstraction for persistence. - - - - - Jetty - - - A pure java open-source, standards-based, web server - implementation. - - - - - JGroups - - - A toolkit for reliable multicast communication. - - - - - JMS - - - Java Message Service is a Java Message Oriented Middleware (MOM) - API. - - - - - JMX - - - Java Management Extensions. A Java technology that supplies tools - for managing and monitoring applications. - - - - - JNDI - - - Java Naming Directory Interface. A standard API/SPI for the - naming - interface. - - - - - JORAM - - - The Java Open Reliable Asynchronous Messaging is an open source - implementation of the JMS API built on top of the ScalAgent distributed - agent technology and hosted by . - - - - - JORM - - - Java Object Repository Mapping is an project that provides an - adaptable persistence service. - - - - - JOTM - - - Java Open reliable Transaction Manager is an open source - implementation of the JTA APIs hosted by . - - - - - JPA - - - Java Persistence API. A Simpler Programming Model for Entity - Persistence. - - - - - JSF - - - JavaServer Faces is a technology that simplifies building user - interfaces for JavaServer applications. - - - - - JSP - - - JavaServer Pages is a technology that provides a simplified, fast - way to create dynamic web content. - - - - - JSTL - - - JavaServer Pages Standard Tag Library. An extension to the JSP - specification that adds a tag library of JSP tags for common tasks, such - as, XML data processing, conditional execution, loops and - internationalization. - - - - - JTA - - - Java Transaction API. Standard Java interfaces between the - transaction manager and the parties involved in a distributed - transaction system: the resource manager, the application server, and - the transactional applications. - - - - - JRE - - - Java Runtime Environment. - - - - - JRMP - - - Java Remote Method Protocol is a Java RMI standard - protocol. - - - - - JVM - - - The Java Virtual Machine. - - - - - JWSDL - - - Java APIs for WSDL. Provides a standard set of Java APIs for - representing, manipulating, reading and writing WSDL (Web Services - Description Language) documents, including an extension mechanism for - WSDL extensibility. - - - - - Log4j - - - A Java-based logging utility from the Apache Software Foundation. - It is used primarily as a debugging tool. - - - - - Monolog - - - The - solution for logging. - - - - - MX4J - - - - An Open Source implementation of the Java Management Extensions - (JMX) and of the JMX Remote API (JSR 160) specifications. - - - - - P6Spy - - - An open source Java tool that intercepts and logs all database - statements that use JDBC. - - - - - RMI - - - Remote Method Invocation. This is the java standard specification - for RPC technology. - - - - - RPC - - - Remote Procedure Call is a technology that allows a subroutine or - procedure to execute in another address space. - - - - - SAAJ - - - SOAP with Attachments API for Java. Provides a standard way to - send XML documents over the Internet from the Java platform. - - - - - Speedo - - - An open source implementation of the JDO 1.0.1 specification - hosted by . - - - - - Struts - - - Apache Struts is an open-source framework for developing Java EE - web applications. It uses and extends the Java Servlet API to encourage - developers to adopt the model-view-controller architectural - pattern. - - - - - Tomcat - - - Apache Tomcat is the servlet container that is used in the - official Reference Implementation for the Java Servlet and JavaServer - Pages. - - - - - Velocity - - - The Apache Velocity Engine is a free open-source templating - engine. - - - \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/admin/JSR160_support.xml b/jonas_doc/core/src/docbook/doc-en/admin/JSR160_support.xml deleted file mode 100644 index 9df122bf65b42d22ad4a019634cf3960f98b224e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/JSR160_support.xml +++ /dev/null @@ -1,127 +0,0 @@ - -
    - - - JSR 160 support in JOnAS - - -
    - - Target Audience and Rationale - - - JOnAS provides support for remote connection to the MBean server in a standard way based on the JMX Remote API. - -
    - -
    - - What is JSR 160 ? - - - The JSR 160 specifies the JMX Remote API which extends the JMX specification by providing a standard way to - connect to remote JMX-enabled applications. - - Currently, JSR 160 has defined a mandatory connector based on RMI - (that supports both RMI/JRMP and RMI/IIOP). - - -
    - -
    - - Connector servers created by JOnAS - - - JSR 160 support implies providing standard connector server objects. - The JMX service creates at start-up one or several such objects, depending - on the protocols configuration (defined in - carol.properties file). To create a client connector, the - client side needs to know the URL of the connector server. Below we - present the URLs that can be used by the clients depending on the protocol - they choose. - - - - Currently only 2 protocols can be used by JSR-160 connectors: - RMI/JRMP and RMI/IIOP. - - - -
    - - Using a RMI/JRMP Connector - - This connector can be used if the jrmp protocol - is set in the carol.protocols list. - - The client has - to construct a JMXServiceURL using the following - String , possibly modified according to the JOnAS-specific - configuration: - service:jmx:rmi:///jndi/rmi://host:port/jrmpconnector_ jonasServerName - where host is the host on which is running the - JOnAS server to be managed. The port number is given in the - carol.properties file. Then, a - JMXConnector has to be created and connected to the connector - server using the JMX Remote API. - -
    - - - -
    - - Example 1: - - - - - Hashtable environment = null; - JMXServiceURL address = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://host:1099/jrmpconnector_jonas"); - JMXConnector connector = JMXConnectorFactory.newJMXConnector(address, environment); - connector.connect(environment); - -
    - -
    - - Using a RMI/IIOP Connector - - This connector can be used if the iiop protocol - is set in the carol.protocols list. - - The client code - is similar to the JRMP case, but the String to be used to - construct the JMXServiceURL must adhere to the following - model: "service:jmx:iiop:///jndi/iiop://host:port/iiopconnector_ - jonasServerName" - -
    - - - -
    - - Example 2: - - - - - Hashtable environment = null; - JMXServiceURL address = new JMXServiceURL("service:jmx:iiop:///jndi/iiop://host:2001/iiopconnector_jonas"); - JMXConnector connector = JMXConnectorFactory.newJMXConnector(address, environment); - connector.connect(environment); - -
    - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/admin/admindefs.xml b/jonas_doc/core/src/docbook/doc-en/admin/admindefs.xml deleted file mode 100644 index 0fec73195188e5e559672d7d6aaa12658ad5ddfa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/admindefs.xml +++ /dev/null @@ -1,56 +0,0 @@ - -
    - - Administration targets - - - This section presents the possible targets of a JOnAS administrator. - An administrator may act on the following targets: - - - - An individual JOnAS server. - - - - A management domain. - - - - A management cluster. - - - - The servers composing a management domain can be grouped into one ore - more clusters. These are clustered servers. A domain may have clustered and - un-clustered servers. - - Each target is identified by a unique name. - - - - A JOnAS server name is given by the value of the -n - option used in the jonas start command (the default name is - jonas). - - - - The domain name is given by the value of the - domain.name environment variable (by default, a server is - started in a domain having the server's name). See How to configure a domain - for more details. - - - - The naming of the clusters depend on configuration parameters - which are different for the different cluster types. - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/admin/adminfunctions.xml b/jonas_doc/core/src/docbook/doc-en/admin/adminfunctions.xml deleted file mode 100644 index e9211915e7633b570b1f5b24ba9581c4bb556f47..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/adminfunctions.xml +++ /dev/null @@ -1,54 +0,0 @@ - -
    - - Administration functions - - - This section presents the operations provided to the JOnAS - administrator. - - These operations depend on the management target. - -
    - Server administration - - JOnAS administration mainly provides monitoring and configuration - functions. Moreover, administrator can dynamically install/deploy/undeploy - applications and/or resources on a running server. - - All the functions are proposed by the JonasAdmin application, wereas - the jonas - admin command supports only a part of these functions. -
    - -
    - Domain administration - - Domain administration is mainly based on JonasAdmin. - - It allows consulting the domain map (shows the servers and - clusters in the domain) and modify this map. - - Moreover, monitoring of the domain is provided: shows state - evolution of servers and clusters, and statistics on resources used by - the different servers in the domain. - - Finally, dynamic install/deploy/undeploy operations are extended at - the domain level: the applications source is the administaror server and - operation's target may be one ore more servers and/or clusters in the - domain. -
    - -
    - Cluster administration - - Administrator may create clusters, add and/or remove servers to/from - clusters. Allowed operations depend on the cluster type. -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/admin/adminmbeans.xml b/jonas_doc/core/src/docbook/doc-en/admin/adminmbeans.xml deleted file mode 100644 index a481b01e4d5550041973b0179a0b547603f9d745..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/adminmbeans.xml +++ /dev/null @@ -1,50 +0,0 @@ - -
    - - The JOnAS MBeans - - - JOnAS administration is based on the standard MBeans defined by the - J2EE Management Specification, and on more MBeans provided by JOnAS itself - and by components integrated integrated in JOnAS: Tomcat/Jetty server, JORAM - platform, JMX Server, etc. - -
    - Standard MBean - - All the MBeans defined by the J2EE Management Specification are - provided by JOnAS. These MBeans respect the naming conventions and are - registered in the JMX server embeded in any JOnAS instance. - -
    - J2EEServer - - The J2EEServer MBean provides attributes and methods for the - server management. For example, it supports resource and application - deployment. It also provides server configuration and monitoring - information. -
    - -
    - J2EEDomain - - The J2EEDomain MBean provides domain management operation support. - Most of the exposed operations are usefull only in the case of a master - instance. -
    -
    - -
    - Other MBeans MBeans - - Proprietary MBeans are registered by JOnAS and by the integrated - components in order to allow management of services or specific - resources. -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/admin/admintools.xml b/jonas_doc/core/src/docbook/doc-en/admin/admintools.xml deleted file mode 100644 index 53559074aa35804b9fc9afae0771b07d3a3d1edc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/admintools.xml +++ /dev/null @@ -1,36 +0,0 @@ - -
    -Administration tools - - - This section presents the means offered to a JOnAS administrator to - act on an administration target: - - - - The JOnAS commands, particulary the - - jonas admin - command. - - - - - Management applications deployed on a JOnAS server. This may by the JonasAdmin web application, or any - custom J2EE management application based on the . - - - Any generic JMX management console connected to a target - server via a JMX Remote Connector . - - - - WebService clients using the WebService end-point exposed by the - Management EJB - - - - Other mechanisms like ant tasks. - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/admin/adminuse.xml b/jonas_doc/core/src/docbook/doc-en/admin/adminuse.xml deleted file mode 100644 index 7953e86e560fe786801284feb45022fe4db7289d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/adminuse.xml +++ /dev/null @@ -1,299 +0,0 @@ - -
    - - Using JonasAdmin - - - Once started, JonasAdmin can administer the JOnAS server in which it - is running. If the host server is a master, JonasAdmin can also administer - the rest of the servers running in the domain. - -
    - - Running JonasAdmin - - - Once the JonasAdmin application deployed on a server, the - administration console is accessible at the URL: - http://<hostname>:<portnumber>/jonasAdmin/ using any web - browser. - - <hostname> is the name of the host where the Servlet container - is running and <portnumber> is the http port number (default is - 9000). - - After logging in, the left-hand frame in the Welcome page displays - the management tree associated with the JOnAS server running JonasAdmin. - The management tree's root is Domain , which allows to the - domain management facilities in case of a master server. - - In the image below, JonasAdmin is running on the master server named - jonas within a domain also named - jonas. It is immediately apparent that - this is a master server, as we have a Monitoring and a Deployment sub-tree - under the Domain root node. - - - - - - - ??? - - JonasAdmin - - - - - - - The management tree in this figure allows access to the following - main management facilities: - - - - Domain administration with domain level deployment - facilities. - - - - Current server administration - - - - Server monitoring - - - - Logging management - - - - Communication protocols management - - - - Active services presentation and configuration - - - - Dynamic deployment at the current server level - - - - Resources management - - - - Security management - - - - - - Joram platform administration - - - - MBeans browsing - - -
    - -
    - - Server management - - - Displays general information about the administered JOnAS server, - including the JMX server and the WEB server, and provides the capability - of listing the content of the Registry. - -
    - - Server monitoring - - - Presents memory usage, a count of the threads created by JOnAS, - and other monitoring information concerning managed services and - resources. -
    - -
    - - Logging management - - - Allows the administrator to configure the JOnAS Logging system. - Additionally, if Tomcat is used as the WEB container service - implementation, it allows creation of new access log valves. -
    - -
    - - Communication protocols management - - - This management facility relates to the integration of Tomcat - management in JonasAdmin. It currently presents connectors defined in - the Tomcat configuration and allows for the creation of new HTTP, HTTPS, - or AJP connectors. Note that the Protocols sub-tree is - not presented if Jetty is used as the WEB container service - implementation. -
    - -
    - - Active services presentation and configuration - - - All the active services have a corresponding sub-tree in the - Services tree. - - Managing the various container services consists of presenting - information about the components deployed in these containers. New - components can be deployed using the dynamic deployment facilities - presented in the next section. - - Similarly, the services that allow management of the different - types of resources (DataSources, Resource Adapters and Mail resources) - also provide information about the resources being deployed. - Additionally, deployed resources (DataSources or MailFactories) can be - reconfigured and their new configuration made persistent by using a - Save button. - - The transaction service management allows reconfiguration - (possibly persistent) and presents monitoring information about - transactions managed by JOnAS. -
    - -
    - - Dynamic deployment with JonasAdmin - - - A very useful management operation is the capability of installing - (upload), deploying, undeploying or removeing stand-alone J2EE - components (JAR, WAR, RAR packages) or J2EE applications (EAR packages) - in the administered server using the Deployment - sub-tree. - - The administrator's task is facilitated by the display of the list - of deployable modules, the list of deployed modules, and the capability - of transferring modules from one list to another (which corresponds to - deploy/undeploy operations. - - The deployable modules can be installed in directories specific to - their type, for example, the deployable JARs are un-deployed JARs - installed in JONAS_BASE/ejbjars/ directory, or in the - JONAS_BASE/deploy directory. - - The Deployment sub-tree also allows a J2EE package - to be uploaded from the local file system to the corresponding directory - of the administered server ( install operation), and the - opposite remove operation. -
    - -
    - - Resources management - - - The Resources sub-tree provides the capability of - loading or creating new resources managed by the active services. -
    - -
    - - Security management - - - The Security sub-tree presents existing security - realms and allows the creation of new realms of different types: memory, - datasource, and ldap realms. -
    -
    - -
    - - Note regarding persistent reconfiguration facilities - - - It is important to note that JOnAS and Tomcat have different - approaches to reconfiguration persistency. In JOnAS, every - Save operation is related to a service or a resource - reconfiguration. For example, the administrator can reconfigure a service - and a resource, but choose to save only the new resource configuration. In - Tomcat, the Save operation is global to all configuration - changes that have been performed. For example, if a new HTTP connector is - reconfigured and a new context created for a web application, both - configuration changes are saved when using the Save - button. -
    - -
    - - Domain management - - - First recall that domain management functions are accessible only - when JonasAdmin is deployed on a master server. The Domain - tree contains only one Server sub-tree, the currently - administered server, which is initially the server hosting - JonasAdmin. - - Domain management principal function is to present the domain - topology: list all the servers and clusters belonging to the domain. It - also allows modification of the domain topology by adding new servers and - clusters to the domain, removing servers and moving servers to/from - clusters. - - The domain management page also presents servers that are not yet - started but are specified as belonging to the domain in the new - configuration file named domain.xml . Also, a server can be - added to the domain when it has been started without having the discovery - service enabled. - - An essential domain management function is that the administrator - can switch from the master to any of the other servers in the domain. - Currently, JonasAdmin allows only one category of global domain level - management operation, the deployment operation. Using any - other management operation requires switching to the server to be - administered. - - Domain level deployment allows for deploying one or - more J2EE packages (JARs, WARs, RARs or EARs), which are installed in the - corresponding master directory (ejbjars, webaps, rars or apps), into any - running server in the domain. A deployment operation target - may be a server but also a cluster. The deploy operation - may have three semantics: - - - - deploy only (create container) - which is useful when the - package is already installed on the target server. - - - - distribute only - which means install the package in the - target's corresponding directory - - - - distribute and (re)deploy the package, with optionally replacing - the current package with the new one. - - - - Note that at domain level deployment the Upload and - Remove operations are only related to the master server - itself. -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/admin/install.xml b/jonas_doc/core/src/docbook/doc-en/admin/install.xml deleted file mode 100644 index 17609c583223522fb971d775af6efcc621234759..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/install.xml +++ /dev/null @@ -1,65 +0,0 @@ - -
    - - Installing JonasAdmin - - - As with any web application, JonasAdmin requires a servlet server to be installed. - Make sure that the web service is listed in the jonas.services property - in the jonas.properties - configuration file. - - - Designed as a web application, JonasAdmin is packed in a WAR and installed under the - - JONAS_BASE/deploy/ - - directory. - - - - Once the server started, JonasAdmin is automatically deployed if the depmonitor - service is activated. Otherwise, JonasAdmin can be deployed manually using the - - jonas admin - command. - - - - When accessing JonasAdmin, the administrator must provide identification and authentication. - The - - jonas-realm.xml - - configuration file contains a memory realm definition named - - memrlm_1 - - , which is referenced in both - - tomcat6-server.xml - - (for Tomcat) and - - jetty.xml - - (for Jetty) configuration files. The default user name ( - jonas - ) and password ( - jonas - ) corresponding to the - - admin - - role can be modified here. - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/admin/mejb.xml b/jonas_doc/core/src/docbook/doc-en/admin/mejb.xml deleted file mode 100644 index 6524dbd754258d37a3d7aafd6be294f8b7ba30ab..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/mejb.xml +++ /dev/null @@ -1,26 +0,0 @@ - -
    - - Management EJB Component - - - The MEJB is specified by the J2EE Management Specification which - defines the J2EE Management Model. - - The MEJB component exposes the managed objects within the JOnAS - platform as JMX manageable resources (MBeans). It is packed in an ejb-jar - file installed in the JONAS_ROOT/deploy directory, and therefore it can be - loaded at server start-up. - - The MEJB component is registered in JNDI under the name - ejb/mgmt/MEJB. - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/admin/mejbaccess.xml b/jonas_doc/core/src/docbook/doc-en/admin/mejbaccess.xml deleted file mode 100644 index cfa7be8bb5d8a3fe08f2c4c452737bf5260bdcdf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/mejbaccess.xml +++ /dev/null @@ -1,71 +0,0 @@ - - -
    - - Access to the Management EJB Component - - Access to the MEJB provided by the distribution is now - role secured. The client application that wants to access it must have - one of the following roles: - - - - mejb-user - - - for accessing to the read-only operation of the MEJB - - - - - mejb-admin - - - role allowing access for all operation of the MEJB - - - - - Unauthorized access is forbidden - - This snippet includes all of the elements needed to specify - security roles in the web.xml file of a web application client of - MEJB - - <security-constraint> - <web-resource-collection> - <web-resource-name>Protected Area</web-resource-name> - <!-- Define the context-relative URL(s) to be protected --> - <url-pattern>/*</url-pattern> - <!-- If you list http methods, only those methods are protected --> - <http-method>DELETE</http-method> - <http-method>GET</http-method> - <http-method>POST</http-method> - <http-method>PUT</http-method> - </web-resource-collection> - <auth-constraint> - <!-- Anyone with one of the listed roles may access this area --> - <role-name>mejb-admin</role-name> - </auth-constraint> - </security-constraint> - - <!-- Default login configuration uses BASIC authentication --> - <login-config> - <auth-method>BASIC</auth-method> - <realm-name>JOnAS Realm</realm-name> - </login-config> - - <!-- Security roles referenced by this web application --> - <security-role> - <role-name>mejb-admin</role-name> - </security-role> - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/admin/threadStackDump.xml b/jonas_doc/core/src/docbook/doc-en/admin/threadStackDump.xml deleted file mode 100644 index 302ffa6207ed43dace1d6a8cfdd31fb3ee348cc6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/admin/threadStackDump.xml +++ /dev/null @@ -1,156 +0,0 @@ - -
    - - JOnAS thread dump feature - - - The aim of JOnAS thread dump feature is to provide an access to a - thread stack dump from the underlying JVM of a running JOnAS server for - monitoring purpose. The thread dump access is done through a JMX connection - to the JOnAS "J2EEServer" MBean (named such as - "$domainname:j2eeType=J2EEServer,name=$jonasname" depending on the JOnAS - domain and server name). This feature gathers few operations directly - available on JOnAS server through a JMX connection to the "J2EEServer" MBean - " or through a Flex visualization module integrated in the web-based - JonasAdmin application. - -
    - - Available operations - - - A set of operations is available on the remote server, it can be - accessed by any JMX client connecting to the JOnAS J2EEServer Mbean. Here - is a list of the available operations with an example using the - JConsole: - - - - getThreadStackDump - - This operation gives the JVM thread stack dump as a string. The - result of this operation is the same as reading the attribute - threadStackDump. - - - - logThreadStackDump - - This operation logs the JVM thread stack dump in JOnAS log file - (level:info). - - - - printThreadStackDump - - This operation prints the JVM thread stack dump in a given file - on the remote server. - - - - getThreadStackDumpList - - This operation gives the JVM thread stack dump as a TabularData - object. The composition of the returned object is a set of - properties-values elements, each element representing a givean thread. - Thus, such a structured object can be easily used in a script. - - - - For instance, the above operations can be easily tried using the - JConsole diplaying the following interface: - - - - - - - ??? - - JonasAdmin - - - - - - - Here is a result of the getThreadStackDumpList operation given by the - JConsole. Navigation between elements is done using right and left arrows, - each thread properties are displayed. - - - - - - - ??? - - JonasAdmin - - - - - - - Please note all the above operations are also available through the - MBeanCmd - Dump Command -
    - -
    - - JonasAdmin visualization module - - - JonasAdmin web application provides a Flex module that lets you view - all threads information. This module is available in the "Monitoring" node - from the "Server JOnAS" section by clicking on the "StackDump" tab. - - - - - - - ??? - - JonasAdmin - - - - - - - If JOnAs is started as a master ("jonas.master" property in the - "jonas.properties" file is set to "true"), the thread stack dump - visualization module is available for the current administrated server. - Thus a master can access the thread stack dump of any server from the same - domain through jonasAdmin stackDump visualization module by switching the - current administrated server. - - The visualization module shows all threads name and id from the JVM. - Threads can be ordered by names or ids by clicking on the header of the - related column. A selection of one or more threads can be done by clicking - on names or ids. Selected threads information such as priority, state or - stacktrace appear in a column to the right. - - The Refresh button refreshes the - threads list from the underlying JVM. - - The Select all button allows to - select all the threads from the JVM to get the complete "stacktrace" - information from the server. - - The Copy to clipboard button allows - to copy all selected threads information in the clipboard so they could be - pasted in a file to be kept. (Please also note that any part from the - right column can be selected using the mouse and copied with a right - click). -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/administration_guide.xml b/jonas_doc/core/src/docbook/doc-en/administration_guide.xml deleted file mode 100644 index 8f1f6ba643c320ebab798b5fe0dd40c141c16129..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/administration_guide.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - Administration Guide - - - - JOnAS Team - - - - - Danes - - Adriana - - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - March 2009 - - - - - Introduction - - - - - - - - - - - - - - JonasAdmin - - - JonasAdmin is an administration tool providing a user friendly - graphical console. - - JonasAdmin was developed using the Struts framework; it uses - standard technologies such as Java Servlets and JavaServer Pages and - JMX. - - - - - - - - - The administration components - - - - - - - - - - - - JMX Remote connectors support - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/ant_tasks.xml b/jonas_doc/core/src/docbook/doc-en/ant_tasks.xml deleted file mode 100644 index 867129bcbe45860ad62141a594462ef807f67da0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/ant_tasks.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - Ant Tasks for JOnAS User Manual - - - - CoqPhilippe - - - - DanesAdriana - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - March 2009 - - - - - Introduction - - - - - - - - JOnAS Ant Tasks - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_ejbjar.xml b/jonas_doc/core/src/docbook/doc-en/anttasks/ant_ejbjar.xml deleted file mode 100644 index 624836084a5707650fc691eb9ec9d46ec1a5bc8e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_ejbjar.xml +++ /dev/null @@ -1,415 +0,0 @@ - -
    ejbjar Ant Task - -
    Description - - The - - <jonas> - - nested element uses the - - GenIC - - -specific tool to build JOnAS-specific stubs and skeletons and construct a JAR file which may be deployed to the JOnAS Application Server. The build process will always determine if the EJB stubs/skeletons and the EJB-JAR file are up to date, and it will perform the minimum amount of work required. - - - A naming convention for the EJB descriptors is most commonly used to specify the name for the completed JAR file. For example, if the EJB descriptor - - ejb/Account-ejb-jar.xml - - is located in the descriptor directory, the - - <jonas> - - element will search for a JOnAS-specific EJB descriptor file named - - ejb/Account-jonas-ejb-jar.xml - - , and a JAR file named - - ejb/Account.jar - - will be written in the destination directory. The - - <jonas> - - element can also use the JOnAS naming convention. Using the same example, the EJB descriptor can also be named - - ejb/Account.xml - - (no base name terminator here) in the descriptor directory. The - - <jonas> - - element will then search for a JOnAS-specific EJB descriptor file called - - ejb/jonas-Account.xml - - . This convention does not strictly follow the ejb-jar naming convention recommendation, but it is supported for backward compatibility with previous version of JOnAS. - - - Note that when the EJB descriptors are added to the JAR file, they are automatically renamed - - META-INF/ejb-jar.xml - - and - - META-INF/jonas-ejb-jar.xml - - . - - - Furthermore, this naming behaviour can be modified by specifying attributes in the ejbjar task (for example, basejarname, basenameterminator, and flatdestdir) as well as the iplanet element (for example, suffix). Refer to the appropriate documentation for more details. - -
    -
    Parameters: - - - - - - - Attribute - - - Description - - - Required - - - - - - - destdir - - - The base directory into which the generated JAR files will be written. Each JAR file is written in directories which correspond to their location within the " - - descriptordir - - " namespace. - - - Yes - - - - - jonasroot - - - The root directory for JOnAS. - - - Yes - - - - - jonasbase - - - The base directory for JOnAS. If omitted, it defaults to - - jonasroot. - - - - No - - - - - classpath - - - The classpath used when generating EJB stubs and skeletons. If omitted, the classpath specified in the "ejbjar" parent task will be used. If specified, the classpath elements will be prefixed to the classpath specified in the parent "ejbjar" task. A nested "classpath" elements can also be used. Note that the needed JOnAS JAR files are automatically added to the classpath. - - - No - - - - - keepgenerated - - - - true - - if the intermediate Java source files generated by GenIC must not be deleted. If omitted, it defaults to - - false - - . - - - No - - - - - nofastrmic - - - if - - true - - , the external RMIC compiler is used by GenIC. The default is - - false - - , which means the internal fast RMIC compiler is used. - - - No - - - - - nocompil - - - - true - - if the generated source files must not be compiled via the java and rmi compilers. If omitted, it defaults to - - false - - . - - - No - - - - - novalidation - - - - true - - if the XML deployment descriptors must be parsed without validation. If omitted, it defaults to - - false - - . - - - No - - - - - javac - - - Java compiler to use. If omitted, it defaults to the value of - - build.compiler - - property. - - - No - - - - - javacopts - - - Options to pass to the java compiler. - - - No - - - - - protocols - - - Comma-separated list of protocols (chosen within jeremie, jrmp, iiop, cmi) for which stubs should be generated. Default is - - jrmp,jeremie - - . - - - No - - - - - rmicopts - - - Options to pass to the rmi compiler. - - - No - - - - - verbose - - - Indicates whether or not to use -verbose switch. If omitted, it defaults to - - false - - . - - - No - - - - - additionalargs - - - Add additional args to GenIC. - - - No - - - - - keepgeneric - - - - true - - if the generic JAR file used as input to GenIC must be retained. If omitted, it defaults to - - false - - . - - - No - - - - - suffix - - - String value appended to the JAR filename when creating each JAR. If omitted, it defaults to ".jar". - - - No - - - - - nogenic - - - If this attribute is set to - - true - - , JOnAS's GenIC will not be run on the EJB JAR. Use this if you prefer to run GenIC at deployment time. If omitted, it defaults to - - false - - . - - - No - - - - - jvmopts - - - Additional args to pass to the GenIC JVM. - - - No - - - - - invokecmd - - - If this attribute is set to - - true - - , GenIC will use the Javac sun class to avoid using 'javac' command line. This is useful for users getting 'java.io.Exception CreateProcess' because of too long command lines. Defaults to - - false - - . - - - No - - - - - - - As noted above, the jonas element supports additional <classpath> nested elements. - -
    -
    Examples - - - Note : - To avoid - - java.lang.OutOfMemoryError - - , the element - - jvmopts - - can be used to change the default memory usage. - - - This example shows ejbjar being used to generate deployment jars using a JOnAS EJB container. This example requires the naming standard to be used for the deployment descriptors. Using this format creates a EJB JAR file for each variation of '*-jar.xml' that is located in the deployment descriptor directory. - - - <ejbjar srcdir="${build.classes}" - descriptordir="${descriptor.dir}"> - <jonas destdir="${deploymentjars.dir}" - jonasroot="${jonas.root}" - protocols="jrmp,iiop"/> - <include name="**/*.xml"/> - <exclude name="**/jonas-*.xml"/> - <support dir="${build.classes}"> - <include name="**/*.class"/> - </support> - </ejbjar> - - This example shows ejbjar being used to generate a single deployment jar using a JOnAS EJB container. This example does require the deployment descriptors to use the naming standard. This creates only one ejb jar file - 'TheEJBJar.jar'. - - - <ejbjar srcdir="${build.classes}" - descriptordir="${descriptor.dir}" - basejarname="TheEJBJar"> - <jonas destdir="${deploymentjars.dir}" - jonasroot="${jonas.root}" - suffix=".jar" - protocols="${genic.protocols}"/> - <include name="**/ejb-jar.xml"/> - <exclude name="**/jonas-ejb-jar.xml"/> - </ejbjar> -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_genic.xml b/jonas_doc/core/src/docbook/doc-en/anttasks/ant_genic.xml deleted file mode 100644 index 128c1dc4ab829b5f458f1296c4ac5c6870cd59e2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_genic.xml +++ /dev/null @@ -1,443 +0,0 @@ - -
    genic Ant Task - -
    Why is there a new task? - - - Previous versions of the JOnAS EjbJar Ant task have some limitations, especially when you are developing webservices. - - - In previous versions of JOnAS, jonas-ejb-jar constructed the JAR for you, using information gathered from the ejb-jar.xml and from the classes themselves (dependencies using BCEL). But if you have a Session Bean exposed as a webservice, you want to have more files in your archive ( - - webservices.xml - - , - - JAX-RPC mapping file - - , - - WSDL - - + imported - - WSDL definitions - - + imported - - XML Schema - - ). - - - The older task did not package these files inside the archive, and therefore, when GenIC loaded the descriptors, some dependencies were missing, causing GenIC to throw an exception. - - - The solution is to let the developer create the JAR file, so that the exact content of the file can be controlled. - - - The file should have at least the following content: - - - - META-INF/ejb-jar.xml - - - META-INF/jonas-ejb-jar.xml - - - **/*.class - - - - Notice that webservices files are optional. - -
    -
    Task Attributes - - - The - - genic - - task supports most attributes of the - - jonas-ejb-jar - - task. - - - Differences: - - - - Removed - - destdir - - : JAR files are directly modified - - - Removed - - classpath - - : classpath is now set as inner element - - - Removed - - novalidation - - : validation attribute is used now - - - Removed - - keepgeneric - - : not meaningful (input JAR is already specific) - - - Removed - - suffix - - : not meaningful (no JAR generated) - - - Removed - - nogenic - - : not meaningful (we want to run GenIC) - - - - - - - - Attribute - - - Description - - - Required - - - - - - - jonasroot - - - The root directory for JOnAS. - - - Yes (Can be read from ${jonas.root} property if not set) - - - - - jonasbase - - - The base directory for JOnAS. If omitted, it defaults to - - jonasroot - - . - - - No - - - - - keepgenerated - - - - true - - if the intermediate Java source files generated by GenIC must not be deleted. If omitted, it defaults to - - false - - . - - - No - - - - - nofastrmic - - - if - - true - - , the external RMIC compiler is used by GenIC. The default is - - false - - , which means the internal fast RMIC compiler is used. - - - No - - - - - nocompil - - - - true - - if the generated source files must not be compiled via the Java and RMI compilers. If omitted, it defaults to - - false - - . - - - No - - - - - validation - - - - true - - if the XML deployment descriptors must be parsed with validation. If omitted, it defaults to - - true - - . - - - No - - - - - javac - - - Java compiler to use. If omitted, it defaults to the value of - - build.compiler - - property. - - - No - - - - - javacopts - - - Options to pass to the Java compiler. - - - No - - - - - protocols - - - Comma-separated list of protocols (chosen from jeremie, jrmp, iiop, cmi) for which stubs should be generated. Default is - - jrmp,jeremie - - . - - - No - - - - - rmicopts - - - Options to pass to the RMI compiler. - - - No - - - - - verbose - - - Indicates whether or not to use -verbose switch. If omitted, it defaults to - - false - - . - - - No - - - - - additionalargs - - - Add additional arguments to GenIC. - - - No - - - - - jvmopts - - - Additional arguments to pass to the GenIC JVM. - - - No - - - - - jvmdebug - - - Indicates whether you want to debug the forked JVM; it defaults to - - false - - . The JVM will be suspended and waiting a connection on port 12345. - - - No - - - - - invokecmd - - - If this attribute is set to - - true - - , GenIC will use the Javac sun class to avoid using 'javac' command line. This is useful for users getting 'java.io.Exception CreateProcess' because of too long command lines. Defaults to - - false - - . - - - No - - - - - - - - - - - Nested Element - - - Description - - - Required - - - - - - - classpath - - - The additional classpath entries used when generating EJB stubs and skeletons. - - - No - - - - - fileset - - - Points out the ejb-jars that will be processed by GenIC. Note that you can add as many filesets as you want (useful if your JARs are in different directories). - - - Yes (at least 1) - - - - - -
    -
    Example: - - - - First, define this new task: - -<taskdef name="genic" - classname="org.objectweb.jonas.ant.GenICTask" - classpath="${jonas.root}/lib/common/ow_jonas_ant.jar" /> - - - - Then use it: - - - Create the JAR file : - - -<jar destfile="${temp.ejbjars.dir}/my-ejbjar.jar"> - <metainf dir="${etc.dir}/META-INF" /> - - <fileset dir="${classes.dir}"> - <include name="org/objectweb/jonas/myejbjar/*.class" /> - </fileset> -</jar> - - - - Process this JAR with the GenIC task : - - -<genic keepgenerated="true" - protocols="${protocols.names}"> - - <fileset dir="${temp.dir}"> - <include name="ejbjars/my-ejbjar.jar" /> - </fileset> -</genic> - - - - - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_jonas.xml b/jonas_doc/core/src/docbook/doc-en/anttasks/ant_jonas.xml deleted file mode 100644 index 3b56ac4a96bf69c368e2b303a841ed9451c15565..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_jonas.xml +++ /dev/null @@ -1,6 +0,0 @@ - -
    jonas Ant Task - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_jonasbase.xml b/jonas_doc/core/src/docbook/doc-en/anttasks/ant_jonasbase.xml deleted file mode 100644 index ae25efcd664afe0a96fc8fdf93bfd2f585cc86d3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_jonasbase.xml +++ /dev/null @@ -1,6 +0,0 @@ - -
    jonasbase Ant Task - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_newjc.xml b/jonas_doc/core/src/docbook/doc-en/anttasks/ant_newjc.xml deleted file mode 100644 index 3a63a08f0b2c9f285431ee3ebd5ed55b4adba606..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_newjc.xml +++ /dev/null @@ -1,6 +0,0 @@ - -
    newjc Ant Task - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_property.xml b/jonas_doc/core/src/docbook/doc-en/anttasks/ant_property.xml deleted file mode 100644 index 8a6020dca9c6a7f65b6d3c91716afd2ac3cd4a99..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_property.xml +++ /dev/null @@ -1,6 +0,0 @@ - -
    property Ant Task - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_serverdeploy.xml b/jonas_doc/core/src/docbook/doc-en/anttasks/ant_serverdeploy.xml deleted file mode 100644 index 19254192e0378fdaa2faee2f9c0380b7dcacf0b1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_serverdeploy.xml +++ /dev/null @@ -1,6 +0,0 @@ - -
    serverdeploy Ant Task - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_wsgen.xml b/jonas_doc/core/src/docbook/doc-en/anttasks/ant_wsgen.xml deleted file mode 100644 index 5aaa6885180f97f7247993c395db2049116c7bf2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/anttasks/ant_wsgen.xml +++ /dev/null @@ -1,6 +0,0 @@ - -
    wsgen Ant Task - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/clustering-variables.xml b/jonas_doc/core/src/docbook/doc-en/clustering/clustering-variables.xml deleted file mode 100644 index 94164be4c682bb27bf8ac94e070979c99e2136df..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/clustering-variables.xml +++ /dev/null @@ -1,33 +0,0 @@ - -
    - Variables used - - This document is an hidden document only used for defining string - variables used elsewhere in the documentation. - - - Remember that a variable MUST - have an xml:id attribute to be referenced - correctly. - - - Logical Cluster - - TomcatCluster - - CmiCluster - - HaCluster - - JoramCluster - - JoramHa - - JkCluster -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/configuration/ejb.xml b/jonas_doc/core/src/docbook/doc-en/clustering/configuration/ejb.xml deleted file mode 100644 index 5a86fbeb092ac7ce0f61ff1bae974c4c4f5d4879..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/configuration/ejb.xml +++ /dev/null @@ -1,1476 +0,0 @@ - -
    - - EJB clustering with CMI and HA service - - -
    Introduction - - - CMI and HA service do provide the following clustering features: - - - - JNDI high availability through the registry replication and the multi-target lookup - - - EJB load-balancing and fail-over through the CMI cluster proxy - - - for the EJB2.1 home interface (SSB, SFSB, EB) - - - for the EJB2.1 remote interface (SSB) - - - for the EJB3 (SSB, SFSB) - - - - - EJB high availability with the HA service - - - for the EJB2.1 SFSB - - - EJB3 support being under development - - - - - - - - - - - - - -
    CMI - - CMI - is an OW2 project providing a framework to define and configure clusters of RMI objects. CMI is embedded both in JOnAS and EasyBeans projects. - - - - The main features are : - - Support of EJB2 and EJB3 - Definition of the cluster logic with simple POJO (policy and strategy) - Delivery of a set of predefined policies (round robin, first available, random, ...) and strategies (weighted, local preference, ...) - Dynamic update of the policy and strategy from the server side - Smooth shutdown of a cluster member - JMX management - Separation of the control flow and the service flow - multi-protocols support: jrmp, irmi, iiop - - - - CMI described in this section is CMI v2 available in JOnAS 5 (not in JOnAS 4). - - - - - - - - -
    - -
    HA service - - HA service provides High Availability for the EJB. A first implementation based on the Horizontal replication is delivered for EJB2.1. - Other solutions are under development: Terracotta based and pair replication. - -
    High Availability with Horizontal Replication - - - - Stateful session beans (EJB2.1) can be replicated since JOnAS 4.7 in order to provide high availability in the case of failures in clustered environments. - A new service called High Availability (HA) has been included in JOnAS to provide replication mechanisms. - JOnAS HA also requires the cluster method invocation (CMI) protocol. - - - From JOnAS 4.8, a new replication algorithm based on a horizontal replication approach is available. The algorithm improves the algorithm implemented for JOnAS 4.7 with the following enhancements: - - - - Replication of SFSBs with references to EBs: The algorithm can replicate SFSBs that reference EB by means of both, local or remote interfaces. - - - Transaction awareness: The algorithm is transaction aware, meaning that the state is not replicated if the transaction aborts. - - - Exactly-once semantics: Each transaction is committed exactly once at the DB if the client does not fail. If the client fails, each transaction is committed at most once at the DB - - - -
    EJB replication Description - -
    Update-everywhere mode - - - JOnAS implements an update-everywhere replication protocol according to the database replication terminology (See the J. Gray et al.'s paper ''The dangers of replication and a solution'' in proceedings of the ACM SIGMOD 96's conference, Canada). In this protocol, a client can connect to any server. When the client calls the create() method on the SFSB's Home interface, the server the client connects to is selected following a round-robin scheme. All the requests from the client to the SFSB will be processed by this server until the client calls the remove() method on the remote interface. The rest of the servers will act as backups for that client. Before sending the response to the client, the SFSB's state is sent to the backups. - - - If the server fails, another server among the backups will be selected to serve the client requests, first restoring the current state of the SFSBs from the state information stored in the HA local service. From this point on, this server will receive the new client requests. - - - The supported replication scenarios are shown in the following figure: - - - - - - - - OW2 - Replication scenarios in JOnAS 4.8 - - - - - - -
    -
    Transaction aware fail-over - - - The horizontal approach aims to guarantee that the transactions are kept consistent when a fail-over occurs. They are either aborted or restored for ensuring the exactly-once semantics. During a fail-over, the new primary uses a special table in the database for storing the transaction identifier and enabling to find out if the transaction was committed or not. - - - If the transaction is aborted due to the primary failure, then the new primary will not find the transaction identifier in the special table. The request will be replayed. - - - If the transaction is committed, then the new primary will find the transaction identifier, which means that the transaction was committed. The request won't be replayed; the replicated result is returned. - - - Beyond the SFSB replication, the algorithm enables the building of applications (stateful or stateless) with a high level of reliability and integrity. - -
    -
    - -
    -
    -
    - -
    Configuring an EJB farm - -
    At the server side - - The setting of an EJB farm is achieved by - - configuring the CMI service - configuring the registry distribution - configuring the EJB application - - - - - -
    Registry distribution (server mode) - - By default, CMI relies on JGroups group-communication protocol for ensuring the global registry distribution. The parameters are gathered in the: - - - - $JONAS_BASE/conf/cmi-config.xml for specifying the JGroups configuration file name and the JGroups group name. - - - $JONAS_BASE/conf/jgroups-cmi.xml file for the settings of the jgroups protocol stack. By default, the JGroups configuration uses the UDP - protocol and the multicast IP for broadcasting the registry updates. A TCP-based stack can be used in a network environment that does not allow - the use of multicast IP or when a cluster is distributed over a WAN. - - - - - - - - - - For example, the jgroups-cmi.xml file may contain the following stack configuration: - - JGroups's configuration stack - -<config> - <UDP mcast_addr="224.0.0.35" - mcast_port="35467" - tos="8" - ucast_recv_buf_size="20000000" - ucast_send_buf_size="640000" - mcast_recv_buf_size="25000000" - mcast_send_buf_size="640000" - loopback="false" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - ip_ttl="2" - enable_bundling="true" - enable_diagnostics="true" - thread_naming_pattern="cl" - - use_concurrent_stack="true" - - thread_pool.enabled="true" - thread_pool.min_threads="1" - thread_pool.max_threads="25" - thread_pool.keep_alive_time="5000" - thread_pool.queue_enabled="false" - thread_pool.queue_max_size="100" - thread_pool.rejection_policy="Run" - - oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="1" - oob_thread_pool.max_threads="8" - oob_thread_pool.keep_alive_time="5000" - oob_thread_pool.queue_enabled="false" - oob_thread_pool.queue_max_size="100" - oob_thread_pool.rejection_policy="Run"/> - - <PING timeout="2000" - num_initial_members="3"/> - <MERGE2 max_interval="30000" - min_interval="10000"/> - <FD_SOCK/> - <FD timeout="2000" max_tries="3" shun="true"/> - <VERIFY_SUSPECT timeout="1500" /> - <BARRIER /> - <pbcast.NAKACK max_xmit_size="60000" - use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <VIEW_SYNC avg_send_interval="60000" /> - <pbcast.GMS print_local_addr="true" join_timeout="3000" - join_retry_timeout="2000" shun="true" /> - <SEQUENCER/> - <FC max_credits="20000000" - min_threshold="0.10"/> - <!--pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/--> - <pbcast.STATE_TRANSFER /> - <!-- pbcast.FLUSH /--> -</config> - - - - You can find more information about JGroups and about the stack configuration - here. - - - All the members of a cluster share the same JGroups configuration. - - - If several cluster partitions are required over a single LAN, - several JGroups configurations must be configured with different values for the following parameters: - - - - JGroups group name - - - JGroups multicast address - - - JGroups multicast port - - - - When a new node appears in the cluster, its registry content is synchronized automatically. - - - When a node disappears, JGroups notifies the other's member of the node leaving and the registry entries related to this node are removed. - -
    - -
    Configuring an EJB application for Load-Balancing - - Informations must be put in the EJB meta-datas for clustering them. - The following section gives a description of the clustering parameters of the EJBs and indicates how to - configure the load-balancing algorithm. - Afterwards, the different settings for EJB2 and EJB3 (specific deployment descriptor and/or annotation) are described. - - - -
    Overview - - EJB meta-data for clustering contains the following parameters: - - - - - - Parameter - - Description - - - - name - specifies the cluster name associated with the EJB. This information is set for administration - purpose. Default name is defaultCluster. - - - pool - describes the stubs pool configuration at the client side (one pool per EJB). - - max : maximum size of the pool. Default is infinite. - max-waiters: maximum number of waiter threads. Default is infinite. - timeout: maximum time that a thread should wait for a resource in the pool (in ms). - Default is infinite. - - - - - policy - specifies the load-balancing algorithm policy (POJO) used for the EJB. - Built-in policies are provided. The user can provide its own implementation. - - - strategy - specifies the load-balancing algorithm strategy (POJO) used for the EJB. - Built-in strategies are provided. The user can provide its own implementation. - - - properties - Set of properties that may be passed to the policy and/or strategy. - The parameter is optional and is reserved for an advanced use. The parameter is not used by the built-in policies - and strategies and may be read by the user policies and/or strategies. - - - replicated - boolean indicating whether the ejb is replicated or not. Not applicable in farming. - - - - - - - -
    - -
    Built-in policies and strategies - - The following policies implementations are provided with JOnAS: - - - - - Policy - - Description - - - - RoundRobin.class - round-robin algorithm, all the node are served sequentially. - - - Random.class - random algorithm, a node is chosen randomly. - - - FirstAvailable.class - first-available algorithm, at first a server is selected randomly and then is bound. - - - HASingleton.class - HA-singleton algorithm, all the clients are bound to the same server. - - - - - - - - The policies can be pointed out with some strategies: - - - - - Strategy - - Description - - Applicable to policy - - - - - NoStrategy.class - no strategy, set by default. - All - - - LocalPreference.class - local preference, if present, a collocated server is selected. - RoundRobin, Random, FirstAvailable - - - LoadFactorWeight.class - add a weighted load factor to the policy, for example for specifying the weighted round-robin algorithm. - RoundRobin - - - LoadFactorSort.class - add a sorted load factor to the policy, for example for specifying the sorted round-robin algorithm. - RoundRobin - - - - - - -
    -
    User policies and strategies - - CMI permits to provide its own policy and strategy. The POJO must implement CMI interfaces and - the classes must be deployed across the cluster. - -
    User policy implementation - - The policy must implement the org.ow2.cmi.lb.policy.IPolicy interface: - -package org.ow2.cmi.lb.policy; - -import java.lang.reflect.Method; -import java.util.Collection; - -import org.ow2.cmi.lb.LoadBalanceable; -import org.ow2.cmi.lb.NoLoadBalanceableException; -import org.ow2.cmi.lb.decision.DecisionManager; -import org.ow2.cmi.lb.strategy.IStrategy; - -/** -* Interface of the policies for load-balancing. -* @param <T> The type of object that was load-balanced -* @author The new CMI team -*/ -public interface IPolicy<T extends LoadBalanceable> { - - /** - * Chooses a load-balanceable among the list of load-balanceables. - * @param loadBalanceables a list of load-balanceables - * @throws NoLoadBalanceableException if no server is available - * @return the chosen load-balanceable - */ - T choose(Collection<T> loadBalanceables) throws NoLoadBalanceableException; - - /** - * Return a strategy to modify the behavior of this policy. - * @return a strategy to modify the behavior of this policy - */ - IStrategy<T> getStrategy(); - - /** - * Sets a strategy to modify the behavior of this policy. - * @param strategy a strategy of load-balancing - */ - void setStrategy(IStrategy<T> strategy); - - /********************** Begin of callback definitions **********************/ - - /** - * Returns a decision when an exception is thrown during an access to a registry - * for a given load-balanceable. - * @param loadBalanceable the load-balanceable that have caused the exception - * @param thr the exception that is thrown - * @return the decision when an exception is thrown during an access to a registry - * for a given load-balanceable - */ - DecisionManager<Void> onLookupException(T loadBalanceable, Throwable thr); - - /** - * Returns a decision when an exception is thrown during an invocation for a given - * load-balanceable. - * @param method the method that was invoked - * @param parameters the parameters of the method - * @param loadBalanceable the load-balanceable that have caused the exception - * @param thr the exception that is thrown - * @return the decision when an exception is thrown during an invocation for a given - * load-balanceable - */ - DecisionManager<Void> onInvokeException(Method method, Object[] parameters, T loadBalanceable, Throwable thr); - - /** - * Return a decision when a server is chosen and its delegate retrieved. - * @param <ReturnType> the type of delegate - * @param method the method that was invoked - * @param parameters the parameters of the method - * @param chosenValue the delegate of chosen server - * @return the decision when the server is chosen and its delegate retrieved - */ - <ReturnType> DecisionManager<ReturnType> onChoose(Method method, Object[] parameters, ReturnType chosenValue); - - /** - * Returns a decision when the invocation of a remote method ends. - * @param <ReturnType> the type of the returned value - * @param method the method that was invoked - * @param parameters the parameters of the method - * @param loadBalanceable the load-balanceable used for the invocation - * @param retVal the returned value - * @return the decision when the invocation of a remote method ends - */ - <ReturnType> DecisionManager<ReturnType> onReturn(Method method, Object[] parameters, T loadBalanceable, ReturnType retVal); - -} - - - - CMI provides the org.ow2.cmi.lb.policy.AbstractPolicy abstract class for simplifying - the policies implementation. The user class can extend it and provides, at least, an implementation of the choose - method. Example for the round-robin implementation: - - Round-robin policy in CMI - - -package org.ow2.cmi.lb.policy; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Random; - -import net.jcip.annotations.ThreadSafe; - -import org.ow2.cmi.lb.LoadBalanceable; -import org.ow2.cmi.lb.NoLoadBalanceableException; -import org.ow2.cmi.lb.strategy.IStrategy; -import org.ow2.cmi.lb.strategy.NoStrategy; -import org.ow2.util.log.Log; -import org.ow2.util.log.LogFactory; -/** - * The default load-balancing policy (Round Robin) that always chooses the next available load-balanceable. - * @param <T> The type of objects that are load-balanced - * @author The new CMI team - */ -@ThreadSafe -public final class RoundRobin<T extends LoadBalanceable> extends AbstractPolicy<T> { - - /** - * Logger. - */ - private static final Log LOGGER = LogFactory.getLog(RoundRobin.class); - - /** - * Initial value of the pointer. - */ - private static final int INITIAL_VALUE = -1; - - /** - * The pointer to store the last ref. - */ - private int pointer; - - /** - * Random numbers. - */ - private final Random rand = new Random(); - - /** - * Build the Round Robin policy. - * Give to the pointer an initial value. - */ - public RoundRobin() { - pointer = INITIAL_VALUE; - } - - /** - * Chooses the next load-balanceable among the list of load-balanceables. - * @param loadBalanceables the list of load-balanceables - * @throws NoLoadBalanceableException if no server available - * @return the chosen load-balanceable - */ - @Override - public synchronized T choose(final Collection<T> loadBalanceables) throws NoLoadBalanceableException{ - - if (loadBalanceables == null || loadBalanceables.isEmpty()) { - LOGGER.error("The given list is null or empty: " + loadBalanceables); - throw new NoLoadBalanceableException("The given list is null or empty: " + loadBalanceables); - } - List<T> cmiRefsWithStrategy; - - IStrategy<T> strategy = getStrategy(); - - if(strategy != null) { - cmiRefsWithStrategy = strategy.choose(loadBalanceables); - // If no server corresponds at this strategy, we don't use it - if(cmiRefsWithStrategy.isEmpty()) { - cmiRefsWithStrategy = new ArrayList<T>(loadBalanceables); - } - } else { - cmiRefsWithStrategy = new ArrayList<T>(loadBalanceables); - } - - int size = cmiRefsWithStrategy.size(); - if(pointer == INITIAL_VALUE){ - // The initial pointer depends on the strategy - if(strategy != null && !(strategy instanceof NoStrategy)) { - // Use the first element chosen by the strategy - pointer = 0; - } else { - // No strategy, choose randomly the first element - pointer = rand.nextInt(size); - } - } else { - // Perhaps some servers are disappeared, in this case the pointer can out of bounds - if(pointer >= size) { - pointer = INITIAL_VALUE; - } - // Choose the next target - pointer = (pointer + 1) % size; - } - return cmiRefsWithStrategy.get(pointer); - } - - @Override - public String toString() { - return "RoundRobin[pointer: " - + pointer + " - strategy: " + getStrategy() + "]"; - } - -} - - -
    -
    User strategy implementation - - The policy must implement the org.ow2.cmi.lb.strategy.IStrategy interface: - -package org.ow2.cmi.lb.strategy; - -import java.util.Collection; -import java.util.List; - -import org.ow2.cmi.lb.LoadBalanceable; - -/** - * Interface of the load-balancing strategies. - * A strategy allows to modify a list of load-balanceables before applying a policy to elect only one load-balanceable. - * @param <T> The type of object that was load-balanced - * @author The new CMI team - */ -public interface IStrategy<T extends LoadBalanceable> { - - /** - * Returns a new list of load-balanceables by modifying the given list. - * @param loadBalanceables a list of load-balanceables - * @return a new list of load-balanceables by modifying the given list - */ - List<T> choose(Collection<T> loadBalanceables); - -} - - - Local preference strategy in CMI - Example for the local preference implementation: - - -package org.ow2.cmi.lb.strategy; - -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import net.jcip.annotations.Immutable; - -import org.ow2.cmi.controller.client.ClientClusterViewManager; -import org.ow2.cmi.controller.common.ClusterViewManager; -import org.ow2.cmi.controller.server.ServerClusterViewManager; -import org.ow2.cmi.lb.LoadBalanceable; -import org.ow2.cmi.reference.ServerRef; -import org.ow2.util.log.Log; -import org.ow2.util.log.LogFactory; - -/** - * Defines a strategy that enable the local preference. - * @param <T> The type of objects that are load-balanced - * @author The new CMI team - */ -@Immutable -public final class LocalPreference<T extends LoadBalanceable> implements IStrategy<T> { - - /** - * Logger. - */ - private static final Log LOGGER = LogFactory.getLog(LocalPreference.class); - - /** - * The manager of the cluster view. - */ - private final ClusterViewManager clusterViewManager; - - /** - * Constructs a strategy for load-factor. - * @param clusterViewManager the manager of the cluster view - */ - public LocalPreference(final ClusterViewManager clusterViewManager) { - this.clusterViewManager = clusterViewManager; - } - - /** - * Returns a list of CMIReference that references the local servers. - * @param cmiRefs a list of CMIReference - * @return a list of CMIReference that references the local servers - */ - public List<T> choose(final Collection<T> cmiRefs) { - - List<T> localServers = new ArrayList<T>(); - - for(T cmiRef : cmiRefs) { - - // Gets the reference of server that have deployed the object - ServerRef serverRef = cmiRef.getServerRef(); - - // Gets its address - InetAddress inetAddress = serverRef.getInetAddress(); - - try { - // Checks if the addresses match - if(isLocal(inetAddress)) { - // Local address: adds reference in the first position - localServers.add(cmiRef); - } - } catch (SocketException e) { - LOGGER.error("Cannot know if is local or not", e); - throw new RuntimeException("Cannot know if is local or not", e); - } - } - return localServers; - } - - /** - * Tests if an address is local. - * @param inetAddress an address - * @return true if the given address is local - * @throws SocketException if an I/O error occurs - */ - private boolean isLocal(final InetAddress inetAddress) throws SocketException { - - if(clusterViewManager instanceof ClientClusterViewManager) { - if(NetworkInterface.getByInetAddress(inetAddress)!=null) { - return true; - } - } else if(clusterViewManager instanceof ServerClusterViewManager) { - if(inetAddress.equals(((ServerClusterViewManager) clusterViewManager).getInetAddress())) { - return true; - } - } - return false; - } - - @Override - public String toString() { - return "LocalPreference"; - } - -} - - - -
    -
    User policy and strategy deployment - - User policy and/or strategy must be deployed across all nodes of the cluster. For example, you can : - - package the POJO in a jar file and put it in the $JONAS_BASE/lib/ext directory - on each cluster member. - - package the POJO in a jar file and put it in a repository and deploy it through - a deployment plan. - - -
    - -
    - -
    Setting for an EJB2 application - - Clustering meta-datas must be added in the deployment descriptor. - - The JOnAS's deployment descriptor of an EJB 2.1 (session stateless, session stateful or entity) may contain the cluster-config element - with the following entries. Refer to for a precise information about the parameters. - - - - - Element - Description - - - - cluster-config/name - cluster name - - - cluster-config/pool - pool configuration with the following sub-elements - - max-size - max-waiters - timeout - - - - - cluster-config/policy - load-balancing policy - - - cluster-config/strategy - load-balancing strategy - - - cluster-config/properties - parameters for a customized user load-balancing algorithm. - Example: - - - -<cluster-config> -... - <properties> - <simple-property name="prop1" value="val1" /> - <simple-property name="prop2" value="38" /> - <array-property name="prop3"> - <value>true</value> - </array-property> - <array-property name="prop4"> - <value>java.util.LinkedList</value> - <value>java.util.ArrayList</value> - </array-property> - <array-property name="prop5"> - <value>http://carol.ow2.org</value> - </array-property> - </properties> -</cluster-config> - - - - - - - - - - Example: - - EJB2.1 deployment descriptor for clustering - -<jonas-ejb-jar xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-ejb-jar_5_1.xsd"> - - <jonas-session> - <ejb-name>MyEjb1SLR</ejb-name> - <jndi-name>MyEjb1Home</jndi-name> - <min-pool-size>3</min-pool-size> - <cluster-config> - <name>jonas-cluster</name> - <policy>org.ow2.cmi.lb.policy.RoundRobin</policy> - <strategy>org.ow2.cmi.lb.strategy.LocalPreference</strategy> - <pool> - <max-size>10</max-size> - <max-waiters>15</max-waiters> - <timeout>2000</timeout> - </pool> - </cluster-config> - </jonas-session> -</jonas-ejb-jar> - - -
    - -
    Setting for an EJB3 application - - Clustering meta-datas can be added either through Java annotations or in the specific deployment descriptor. - -
    Java annotations - - CMI provides the following annotations (Refer to the section for more information). - - - - - - Annotation - Description - - - - @Cluster - Set the cluster name and the pool stubs configuration. - Example: - -@Cluster(name="test_cluster", pool=@Pool(max=2)) - - - - - @Policy - Set the load-balancing algorithm policy. - Example: - -@Policy(RoundRobin.class) - - - - - @Strategy - Set the load-balancing algorithm strategy. - Example: - -@Strategy(LocalPreference.class) - - - - - @Properties - Set properties for user policies and/or strategies. - Example: - -@Properties( - simpleProperties={ - @SimpleProperty( - name="prop1", - value="val1"), - @SimpleProperty( - name="prop2", - value="38")}, - arrayProperties={ - @ArrayProperty( - name="prop3" - values="true"), - @ArrayProperty( - name="prop4", - values={"java.util.LinkedList", - "java.util.ArrayList"}), - @ArrayProperty( - name="prop5", - values={"http://www.ow2.org"})}) - - - - - - - - - - The example below illustrates the use of the annotations for configuring a cluster named test_cluster. - The round-robin algorithm is set by default. - The complete code can be downloaded from the EasyBeans project - - EJB3 SSB with clustering annotations - - -package org.ow2.easybeans.examples.cluster; - -import javax.ejb.Remote; -import javax.ejb.Stateless; - -import org.ow2.cmi.annotation.Cluster; -import org.ow2.cmi.annotation.Policy; -import org.ow2.cmi.lb.policy.RoundRobin; -import org.ow2.easybeans.api.bean.EasyBeansBean; - -@Stateless -@Remote(ClusterRemote.class) -@Cluster(name="test_cluster") -@Policy(RoundRobin.class) -public class ClusterBeanAN implements ClusterRemote { - - private String ezbServerDescription = null; - - public String getEZBServerDescription(final String msg) { - - if(this.ezbServerDescription == null) { - this.ezbServerDescription = - ((EasyBeansBean) this).getEasyBeansFactory().getContainer().getConfiguration().getEZBServer().getDescription(); - } - System.out.println(msg); - return this.ezbServerDescription + "\n"; - } -} - - - -
    -
    Specific Deployment descriptor - The default clustering configuration can be overridden by a specific deployment descriptor. - The file is named easybeans.xml and may contain the cluster:cluster element - with the following entries. Refer to for a precise information about the parameters. - - - - - Element - Description - - - - cluster:cluster/name - cluster name - - - cluster:cluster/pool - pool configuration with the following sub-elements - - max-size - max-waiters - timeout - - - - - cluster:cluster/policy - load-balancing policy - - - cluster:cluster/strategy - load-balancing strategy - - - cluster:cluster/properties - parameters for a customized user load-balancing algorithm - Example: - - -<cluster:cluster> -... - <properties> - <simple-property name="prop1" value="val1" /> - <simple-property name="prop2" value="38" /> - <array-property name="prop3"> - <value>true</value> - </array-property> - <array-property name="prop4"> - <value>java.util.LinkedList</value> - <value>java.util.ArrayList</value> - </array-property> - <array-property name="prop5"> - <value>http://carol.ow2.org</value> - </array-property> - </properties> -</cluster:cluster> - - - - - - - - - Example: - - EJB3 deployment descriptor for clustering - -<easybeans xmlns="http://org.ow2.easybeans.deployment.ejb" - xmlns:cluster="http://org.ow2.cmi.info.mapping"> - <ejb> - <session> - - <ejb-name>clusterXMLBean</ejb-name> - <cluster:cluster name="easybeans-cmi"> - <cluster:policy>org.ow2.cmi.lb.policy.FirstAvailable</cluster:policy> - <cluster:strategy>org.ow2.cmi.lb.strategy.LocalPreference</cluster:strategy> - <pool> - <max-size>10</max-size> - <max-waiters>15</max-waiters> - <timeout>2000</timeout> - </pool> - </cluster:cluster> - </session> - </ejb> -</easybeans> - - - -
    - -
    - -
    - -
    -
    At the client side - - EJB clustering can be transparent for the client so that a client which is connected - to a standalone server can be switched to a clustering mode without any configuration changes. - - - However either for disabling CMI and for ensuring the JNDI availability, a CMI configuration - can be required. - -
    Configuration file location - Depending on the type of the client, the configuration is retrieved from: - - - - - Type of client - Location of the configuration file - - - - Java client - Pointed by the cmi.conf.url java property. - Example: - -java -jar myclient.jar -cp<...> -Dcmi.conf.url=/tmp/cmi-config.xml - - - - - - JOnAS client (jclient) - Pointed by the cmi.conf.url java property. - - - Web tier client - In $JONAS_BASE/conf/cmi-config.xml file. - - - - - - -
    -
    Disabling CMI - If the server side is configured with CMI, by default, the CMI client will - switch to the cluster mode and will perform a load-balancing. For administration - purpose or application requirements as well, one may want to - enforce the client not to use the clustering mode. There are two different settings - for doing that: - - - - - - Setting - Description and example - - - - Java property - The cmi.disabled java property must be set to true. - -jclient -jar myclient.jar -Dcmi.disabled=true - - - - - - CMI configuration file - The client part of the configuration file must contain the noCmi attribute set to true. - -<cmi xmlns="http://org.ow2.cmi.controller.common" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <client noCmi="true" /> -</cmi> - - - - - - - - -
    -
    Cluster view manager fail-over - CAROL is a the JOnAS's protocol abstract layer - and the carol.properties indicates the default protocol and the registry URL. - The client retrieves the cluster view from the server side. By default it gets in - touch with the server identified by the CAROL configuration. - For ensuring high availability of the service, a list of cluster view manager URLs can be provided to the client - through the CMI configuration file. Refer to for a precise information - about the setting. - - Example: - - - CMI configuration at the client side - -<cmi xmlns="http://org.ow2.cmi.controller.common" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <client noCmi="false"> - <jndi> - <protocol name="jrmp"> - <providerUrls> - <providerUrl>rmi://localhost:1099</providerUrl> - <providerUrl>rmi://localhost:2001</providerUrl> - </providerUrls> - </protocol> - </jndi> - </client> -</cmi> - - - A first available policy with local preference is applied for selecting a provider URL. - If the primary gets unavailable, a secondary is selected randomly at fail-over. - - - In the case of a web tier which acts as a CMI client (CMI service with client mode), a list of provider URLs must be - specified in the $JONAS_BASE/conf/cmi-config.xml file. - -
    -
    - -
    Summary -
    CMI configuration for a 2-tiers architecture (server mode) - - - - - - - Use case : fits with the most use and is the default configuration. A CMI view manager is started in each node. -
    -
    CMI configuration for a 2-tiers architecture (client mode) - - - - - - - Use case : when a local view manager is not acceptable regarding the resources consumptions or the network configuration. -
    -
    CMI configuration for java client - - - - - - - Use case : fat EJB client. -
    -
    - -
    - -
    Configuring an EJB distribution - - The setting of an EJB distribution is achieved by - - configuring the CMI service - configuring the registry distribution - - - - The EJB application doesn't need to be modified. - -
    - -
    Configuring an EJB cluster -
    At the server side - -
    Configuring JOnAS for EJB Replication - - - The High Availability (HA) service is required in JOnAS in order to replicate SFSBs. The HA service must be included in the list of available services in JOnAS. - This is done in the jonas.properties file located in $JONAS_BASE/conf. - - -... -jonas.services registry,jmx,jtm,db,dbm,security,wm,wc,resource,cmi,ha,ejb2,ejb3,ws,web,ear,depmonitor -... - - The HA service must also be configured in the jonas.properties file: - - - - - - The HA service uses JGroups as a group communication layer (GCL). JGroups behavior is specified by means of a stack of properties configured through - an XML file (See JGroups documentation for more information: http://www.jgroups.org). - The default configuration of the HA service uses the $JONAS_BASE/conf/jgroups-ha.xml file and the jonas-rep group name. - The HA service can be told to use a particular stack configuration or a particular group name by modifying the following parameters: - - -... -jonas.service.ha.jgroups.conf jgroups-ha.xml -jonas.service.ha.jgroups.groupname jonas-rep -... - -
    -
    Transaction Table Configuration - - - The horizontal replication algorithm uses a database table to keep track of current running transactions. - This table is accessed from the new elected node during fail-over to detect whether or not the current - transaction has committed at the former local node, ensuring - exactly-once - semantics. The table contains only one column: the transaction identifier (txid). - - - In JOnAS 4.8 this table must be created manually with the following SQL command: - - -create TABLE ha_transactions (txid varchar(60)); - - This table should be located preferably in the database used by the replicated application, but it is not mandatory. If the table is not created in the database used by the replicated application, it is necessary to configure a new datasource for the database that contains this transaction table. This datasource must be configured to use the - serializable - transaction isolation level. - - - The database that holds the transaction table is accessed by the replication service with the JNDI name configured in jonas.properties. - - -... -jonas.service.ha.datasource tx_table_ds -... -
    -
    Configuring Garbage Collection - - Due to the fact that the replication algorithm stores information associated with clients' transactions and that the server is not notified when a client dies, the HA service might have been storing unnecessary replication information over time. In order to automatically clean this unnecessary replication information, the HA service includes a garbage collection mechanism. It is possible to configure the number of seconds the system waits to execute this mechanism by changing the following property in the jonas.properties file: - -... -jonas.service.ha.timeout 600 -... -
    -
    Configuring an EJB2 application for Replication - -
    jonas-ejb-jar.xml - - - In order to configure an application for replication, the <cluster-replicated/> element must be added - to the bean definition of every bean requiring high availability in the jonas-ejb-jar.xml deployment descriptor file. - This element can have two possible values: true or false (default value). - In addition, if the programmer wants to change the behavior of the CMI proxy (e.g., the server selection policy), - it is possible to specify different policy implementations by means of <cluster-config/> elements. - - - The following is an example description for a replicated SFSB in jonas-ejb-jar.xml file: - - - EJB2.1 deployment descriptor for session replication - -... -<jonas-session> - <ejb-name>DummySFSB</ejb-name> - <jndi-name>DummySFSB</jndi-name> - ... - <cluster-replicated>true</cluster-replicated> - <cluster-config> - <name>jonas-cluster</name> - <policy>org.ow2.cmi.lb.policy.RoundRobin</policy> - <strategy>org.ow2.cmi.lb.strategy.LocalPreference</strategy> - <pool> - <max-size>10</max-size> - <max-waiters>15</max-waiters> - <timeout>2000</timeout> - </pool> - </cluster-config> - <is-modified-method-name>true</is-modified-method-name> - - </jonas-session> -... - - - The <cluster-replicated/> element can also be set in the SSB or EB for - - - enabling the transaction checking mechanism ensuring the exactly-once semantic at fail-over - - - supporting the EB references replication - - - - - Note: When set in the SSB, the mechanism inhibits the load-balancing at the remote interface. - After the home create() method call, all the requests are sent to the same instance. - -
    -
    Entity Beans lock policy - - - The lock policy for the Entity Beans in a replicated application must be configured as - database - in the jonas-ejb-jar.xml deployment descriptor file. - - - The following is an example description for a replicated EB, i.e. an entity that is accessed from a replicated SFSB, in the jonas-ejb-jar.xml: - - -... -<jonas-entity> - <ejb-name>MyEntitySLR</ejb-name> - <jndi-name>MyEntityHome</jndi-name> - <cluster-replicated>true</cluster-replicated> - <shared>true</shared> - <jdbc-mapping> - <jndi-name>example_ds</jndi-name> - </jdbc-mapping> - <lock-policy>database</lock-policy> -</jonas-entity> -... -
    -
    Datasource used by the application - - - The datasources used by replicated applications must be configured to use the - serializable - transaction isolation level. - - - The following is an example for a datasource configuration file for the Postgres DBMS: - - -... -datasource.name example_ds -datasource.url jdbc:postgresql://xxx.xxx.xxx.xxx:xxxx/database -datasource.classname org.postgresql.Driver -datasource.username jonas -datasource.password -datasource.mapper rdb.postgres -datasource.isolationlevel serializable -... - - Finally, when compiling the application that includes the replicated beans, the CMI protocol must be specified in order to generate the classes that include the replication logic. - -
    -
    - -
    -
    At the client side - As for the farming, the cluster mode can be transparent for the client configuration apart for - the expected high availability of the CMI internals service. In particular the CMI cluster view - manager client part must be configure with a list of provider urls in order to be able to take-over - when a server node failure occurs. - Refer to for a precise information about the setting. - - -
    -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/configuration/jms.xml b/jonas_doc/core/src/docbook/doc-en/clustering/configuration/jms.xml deleted file mode 100644 index 6c25aa222d8f0facfdc19e03e245f511fd3231fa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/configuration/jms.xml +++ /dev/null @@ -1,1256 +0,0 @@ - -
    - - JMS cluster with JORAM - -
    Introduction - -
    Generalities about Clustering JMS - - - The JMS API provides a separate domain for each messaging approach, point-to-point or publish/subscribe. - The point-to-point domain is built around the concept of queues, senders and receivers. - The publish/subscribe domain is built around the concept of topic, publisher and subscriber. - Additionally it provides a unified domain with common interfaces that enable the use of queue and topic. - This domain defines the concept of producers and consumers. - The classic sample provided with JOnAS ($JONAS_ROOT/examples/javaee5-earsample) uses a very simple configuration (centralized) - made of one server hosting a queue and/or a topic. - The server is administratively configured for accepting connection requests from the anonymous user. - - - JMS clustering aims to offer a solution for both the scalability and the high availability for the JMS accesses. - This chapter gives an overview of the JORAM capabilities for clustering a JMS application in - the context. - The load-balancing and fail-over mechanisms are described and a user guide describing how to build such a configuration is provided. - Further information is available in the JORAM documentation - - here - - . - -
    -
    Objectives - - - The following information will be presented: - - - - first, section presents the example that will be used in this section about JMS cluster. - - - then, details load balancing throw cluster topic and cluster queue. - The distributed capabilities of JORAM will be detailed as well. - - - describes how to configure the JORAM HA enabling to ensure the high availability of the JORAM server. - - - introduces how to build an MDB clustering architecture - with both JOnAS and JORAM. - - -
    -
    - -
    Example - - - The documentation provides an example of JMS cluster with 2 members and a MDB application. - - -
    Getting started - - Install and configure two JOnAS instances (see - - here - - ). The newjc tool may be used for generating the initial configuration of the JMS cluster. - The tool may be run with the default inputs except for the architecture (bothWebEjb) and number of nodes (2). - Refer to for further information about the newjc tool. - -
    -
    MDB application - - - The MDB application is based on an example from the EasyBeans project. You can download the full source code of the application in the - - EasyBeans - - project under the example/messagedrivenbean directory. - A user guide for compiling the example is given - - here - - - - - By default, The messagedrivenbean is bound to a JMS Queue and later in the documentation we - will see how to change it for using a Topic instead. The implementation is : - -package org.ow2.easybeans.examples.messagedrivenbean; - -import javax.ejb.ActivationConfigProperty; -import javax.ejb.MessageDriven; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.TextMessage; - -@MessageDriven(activationConfig = { - @ActivationConfigProperty(propertyName = "destination", propertyValue = "SampleQueue"), - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") - } -) -public class MessageDrivenBean implements MessageListener { - - public void onMessage(final Message message) { - String txt = "Receiving a message named '" + message + "'."; - if (message instanceof TextMessage) { - try { - txt += " with the content '" + ((TextMessage) message).getText(); - } catch (JMSException e) { - e.printStackTrace(); - } - } - System.out.println(txt); - } - -} - - -
    -
    Client application for a Queue destination - - Here the client application is extracted from the EasyBeans project as well. - The client code sends a few messages towards the JMS object. The code is: - -package org.ow2.easybeans.examples.messagedrivenbean; - -import java.util.Hashtable; - -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.jms.Session; -import javax.jms.TextMessage; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -public final class ClientMessageDriven { - - private static final String QUEUE_CONNECTION_FACTORY = "JQCF"; - private static final String SAMPLE_QUEUE = "SampleQueue"; - private static final int NUMBER_MESSAGES = 5; - private static final String - DEFAULT_INITIAL_CONTEXT_FACTORY = "org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory"; - - private ClientMessageDriven() { - - } - - public static void main(final String[] args) throws Exception { - - Context initialContext = getInitialContext(); - - QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) initialContext - .lookup(QUEUE_CONNECTION_FACTORY); - - // Lookup the Queue through its JNDI name - Queue queue = (Queue) initialContext.lookup(SAMPLE_QUEUE); - - // Create connection - QueueConnection queueConnection = queueConnectionFactory.createQueueConnection(); - - // Create session - QueueSession queueSession = queueConnection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); - - // Create sender - QueueSender queueSender = queueSession.createSender(queue); - - // Send messages - TextMessage message = null; - for (int i = 0; i < NUMBER_MESSAGES; i++) { - message = queueSession.createTextMessage(); - String text = "Message_" + i; - message.setText(text); - queueSender.send(message); - System.out.println("Message [" + message.getJMSMessageID() + ", text:" + text + "] sent"); - - } - - // Close JMS objects - queueSender.close(); - queueSession.close(); - queueConnection.close(); - - } - - private static Context getInitialContext() throws NamingException { - - Hashtable<String, Object> env = new Hashtable<String, Object>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, DEFAULT_INITIAL_CONTEXT_FACTORY); - return new InitialContext(env); - } -} - - -
    -
    Client application for a topic destination - - In this case, the client application must be adapted for publishing a message to a topic. Only the touched lines are shown: - -... -import javax.jms.Topic; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; - -... - private static final String TOPIC_CONNECTION_FACTORY = "JTCF"; - private static final String SAMPLE_TOPIC = "sampleTopic"; -... - - // Get factory - TopicConnectionFactory topicConnectionFactory = (TopicConnectionFactory) initialContext - .lookup(TOPIC_CONNECTION_FACTORY); - - // Lookup the Topic through its JNDI name - Topic topic = (Topic) initialContext.lookup(SAMPLE_TOPIC); - - // Create connection - TopicConnection topicConnection = topicConnectionFactory.createTopicConnection(); - - // Create session - TopicSession topicSession = topicConnection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); - - // Create publisher - TopicPublisher topicPublisher = topicSession.createPublisher(topic); - - // Send messages - TextMessage message = null; - for (int i = 0; i < NUMBER_MESSAGES; i++) { - message = topicSession.createTextMessage(); - String text = "Message_" + i; - message.setText(text); - topicPublisher.publish(message); - System.out.println("Message [" + message.getJMSMessageID() + ", text:" + text + "] sent"); - - } - - // Close JMS objects - topicPublisher.close(); - topicSession.close(); - topicConnection.close(); - - } -... - - -
    -
    Run the sample - - - - - For deploying the application, you can put the mdb.jar archive in the $JONAS_BASE/deploy directory. - - - And then you can run the client with the jclient command and you get the following output: - -jclient ./clients/client-mdb.jar -ClientContainer.info : Starting client... -Message [ID:0.0.1026c4m0, text:Message_0] sent -Message [ID:0.0.1026c4m1, text:Message_1] sent -Message [ID:0.0.1026c4m2, text:Message_2] sent -Message [ID:0.0.1026c4m3, text:Message_3] sent -Message [ID:0.0.1026c4m4, text:Message_4] sent - - - - At the server side, you get the following messages: - -Receiving a message named '(org.objectweb.joram.client.jms.TextMessage@812517,JMSMessageID=ID:0.0.1026c4m1, - JMSDestination=queue#0.0.1038,JMSCorrelationID=null,JMSDeliveryMode=2,JMSExpiration=0,JMSPriority=4, - JMSRedelivered=false,JMSReplyTo=null,JMSTimestamp=1222962742969,JMSType=null)'. with the content 'Message_1 -Receiving a message named '(org.objectweb.joram.client.jms.TextMessage@f42d53,JMSMessageID=ID:0.0.1026c4m3, - JMSDestination=queue#0.0.1038,JMSCorrelationID=null,JMSDeliveryMode=2,JMSExpiration=0,JMSPriority=4, - JMSRedelivered=false,JMSReplyTo=null,JMSTimestamp=1222962742978,JMSType=null)'. with the content 'Message_3 -Receiving a message named '(org.objectweb.joram.client.jms.TextMessage@cbb612,JMSMessageID=ID:0.0.1026c4m2, - JMSDestination=queue#0.0.1038,JMSCorrelationID=null,JMSDeliveryMode=2,JMSExpiration=0,JMSPriority=4, - JMSRedelivered=false,JMSReplyTo=null,JMSTimestamp=1222962742977,JMSType=null)'. with the content 'Message_2 -Receiving a message named '(org.objectweb.joram.client.jms.TextMessage@1e7f21,JMSMessageID=ID:0.0.1026c4m0, - JMSDestination=queue#0.0.1038,JMSCorrelationID=null,JMSDeliveryMode=2,JMSExpiration=0,JMSPriority=4, - JMSRedelivered=false,JMSReplyTo=null,JMSTimestamp=1222962742965,JMSType=null)'. with the content 'Message_0 -Receiving a message named '(org.objectweb.joram.client.jms.TextMessage@2c79a5,JMSMessageID=ID:0.0.1026c4m4, - JMSDestination=queue#0.0.1038,JMSCorrelationID=null,JMSDeliveryMode=2,JMSExpiration=0,JMSPriority=4, - JMSRedelivered=false,JMSReplyTo=null,JMSTimestamp=1222962742979,JMSType=null)'. with the content 'Message_4 - - - - - - When using jclient container, the client will connect to the server which is pointed by $JONAS_BASE/conf/carol.properties. You can specify another - one with the -carolFile option. - - -jclient ./clients/client-mdb.jar -carolFile ./carol.properties - -
    -
    -
    Load balancing - -
    JORAM distributed configuration - - - Two instances of JOnAS are configured ("J1" and "J2"). Each JOnAS instance has a dedicated collocated JORAM server: - server "S1" for JOnAS "J1", "S2" for "J2". These two servers are aware of each other. - - - Set a JORAM distributed configuration: - - - - Go to $JONAS_BASE/conf and edit the a3servers.xml file (same for the 2 instances). - 2 instances are defined in the same domain network. The persistent mode is enabled through the Transaction - property in the a3servers.xml file and through the PersistentPlatform configuration property - in the JORAM RA. - - JORAM distributed configuration - - - -<?xml version="1.0"?> -<config - <domain name="D1"/> - <property name="Transaction" value="fr.dyade.aaa.util.NTransaction"/> - <server id="1" name="S1" hostname="localhost"> - <network domain="D1" port="16301"/> - <service class="org.objectweb.joram.mom.proxies.ConnectionManager" - args="root root"/> - <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" - args="16010"/> - </server> - <server id="2" name="S2" hostname="localhost"> - <network domain="D1" port="16302"/> - <service class="org.objectweb.joram.mom.proxies.ConnectionManager" - args="root root"/> - <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" - args="16020"/> - </server> -</config> - - - - - For each instance, edit the ra.xml embedded in the joram_for_jonas_ra.rar (by using unjar command manually or with the jonasAdmin's RA editor) and check the following element according to the a3servers.xml content - - - server id (1 or 2) - - - <config-property> - <config-property-name>ServerId</config-property-name> - <config-property-type>java.lang.Short</config-property-type> - <config-property-value>1</config-property-value> - </config-property> - - - - server name (S1 or S2) - - - <config-property> - <config-property-name>ServerName</config-property-name> - <config-property-type>java.lang.String</config-property-type> - <config-property-value>s1</config-property-value> - </config-property> - - - - hostname - - - <config-property> - <config-property-name>HostName</config-property-name> - <config-property-type>java.lang.String</config-property-type> - <config-property-value>localhost</config-property-value> - </config-property> - - - - network port (16010 or 16020) - - - <config-property> - <config-property-name>ServerPort</config-property-name> - <config-property-type>java.lang.Integer</config-property-type> - <config-property-value>16010</config-property-value> - </config-property> - - - - persistent mode - - - <config-property> - <config-property-name>PersistentPlatform</config-property-name> - <config-property-type>java.lang.Boolean</config-property-type> - <config-property-value>true</config-property-value> - </config-property> - - - - - - For each instance, edit the joramAdmin.xml, update the connection factories definition, the user definition according to the local JORAM server configuration - - - server id (1 or 2) - - - <User name="anonymous" - password="anonymous" - serverId="1"/> - - - - server port number (16010 or 16020) - - - <ConnectionFactory className="org.objectweb.joram.client.jms.tcp.TcpConnectionFactory"> - <tcp host="localhost" - port="16010"/> - <jndi name="JCF"/> - </ConnectionFactory> - - <ConnectionFactory className="org.objectweb.joram.client.jms.tcp.QueueTcpConnectionFactory"> - <tcp host="localhost" - port="16010"/> - <jndi name="JQCF"/> - </ConnectionFactory> - - <ConnectionFactory className="org.objectweb.joram.client.jms.tcp.TopicTcpConnectionFactory"> - <tcp host="localhost" - port="16010"/> - <jndi name="JTCF"/> - </ConnectionFactory> - - - - - - - See - - here - - for more information about a JORAM distributed configuration. - -
    -
    Clustered Topic - - - A non hierarchical topic might be distributed among many servers. - Such a topic, to be considered as a single logical topic, is made of topic representatives, one per server. - Such an architecture allows a publisher to publish messages on a representative of the topic. - In the example, the publisher works with the representative on server 1. - If a subscriber subscribed to any other representative (on server 2 in the example), it will get the messages produced by the publisher. - - - Load balancing of topics is very useful because it allows distributed topic subscriptions across the cluster. - - - - - - - - -
    - - - The following scenario and general settings are proposed: - - - - The cluster topic is composed of two elements : mdbTopic1 defined hosted by JORAM server S1 and mdbTopic2 hosted by JORAM server S2. - - - The jndi name 'mdbTopic' is set for the local representative, ie mdbTopic1 for S1 et mdbTopic2 for S2. - - - At the server side, a MDB is listening the local representative 'mdbTopic'. - - - A client connects to the J1 or J2 server and sends 10 messages to the topic 'mdbTopic'. - - - Each message is received twice, one per cluster element. - - - - - - - - - - - -
    Topic cluster definition in joramAdmin.xml - - - The cluster definition with the topics must be added in $JONAS_BASE/conf/joramAdmin.xml file. The connection factories and the anonymous user must be defined with the local server id and the local server port number according to the a3servers.xml content. Here only the cluster related elements are shown: - - - - For the server id 1 : - - Cluster topic with JORAM - - - <Topic name="mdbTopic1" serverId="1"> - <freeReader/> - <freeWriter/> - <jndi name="mdbTopic"/> - </Topic> - - <Topic name="mdbTopic2" serverId="2"> - <freeReader/> - <freeWriter/> - <jndi name="mdbTopic2"/> - </Topic> - - <ClusterTopic> - <ClusterElement name="mdbTopic1" location="s1"/> - <ClusterElement name="mdbTopic2" location="s2"/> - <jndi name="clusterMdbTopic"/> - </ClusterTopic> - - - - For the server id 2 : - - - <Topic name="mdbTopic1" serverId="1"> - <freeReader/> - <freeWriter/> - <jndi name="mdbTopic1"/> - </Topic> - - <Topic name="mdbTopic2" serverId="2"> - <freeReader/> - <freeWriter/> - <jndi name="mdbTopic"/> - </Topic> - - <ClusterTopic> - <ClusterElement name="mdbTopic1" location="s1"/> - <ClusterElement name="mdbTopic2" location="s2"/> - <jndi name="clusterMdbTopic"/> - </ClusterTopic> - - - - - - The mdbTopic jndi name is bound in the local JOnAS registry with the local cluster element, - i.e. mdbTopic1 for server id 1 and mdbTopic2 for server id 2. - - - - - The joramAdmin.xml file has to be loaded when all cluster members are started since some remote cluster elements are defined. - An alternative consists in splitting the configuration into two different files joramAdmin-local.xml and joramAdmin-cluster.xml, - the first one containing only the local elements and the second one, both local and remote elements. - At the JOnAS starting, a script could copy the right file to joramAdmin.xml according to the others members presence (joramAdmin-local.xml - if it's the first member which starts and joramAdmin-cluster.xml if all the cluster members are started). - - - -
    - -
    Changes in the example - The @MessageDriven annotation is updated in the source code for binding the MDB with the clustered topic. That could be done - through the optional deployment descriptor as well. - - -@MessageDriven(activationConfig = { - @ActivationConfigProperty(propertyName ="destination", propertyValue ="mdbTopic"), - @ActivationConfigProperty(propertyName ="destinationType", propertyValue ="javax.jms.Topic") - } -) - - The client code for sending a message to a Topic is used and the topic name is set to: - - - private static final String SAMPLE_TOPIC = "mdbTopic"; - -
    - -
    Run the sample - - - Deploy the MDB application in each JOnAS instance and run the sample. - The messages do appear on the two different JOnAS servers consoles that shows the messages broadcasting between the topic elements. - -
    - - -
    Load-balancing for Queue - - - Globally, the load balancing in the context of queues may be meaningless in comparison of load balancing topic. It would be a bit like load balancing a stateful session bean instance (which just requires failover). But the JORAM distributed architecture enables : - - - - equilibrating the load of the queue access between several JORAM server nodes, it's a queue load-balancing at the server side. - - - load-balancing the load at the client side. - - -
    -
    First scenario for Queue : distribution of the load at the server side - - - Here is a diagram of what is going to happen for the Queue and the message: - - - - - - - - - - - A load balancing message queue may be needed for a high rate of messages. A clustered queue is a cluster of queues exchanging messages depending on their load. The example has a cluster of two queues. A heavy producer accesses its local queue and sends messages. It quickly becomes loaded and decides to forward messages to the other queue of its cluster which is not under heavy load. - - - For this case some parameters must be set: - - - - period: period (in ms) of activation of the load factor evaluation routine for a queue - - - producThreshold: number of messages above which a queue is considered loaded, a load factor evaluation launched, messages forwarded to other queues of the cluster - - - consumThreshold: number of pending "receive" requests above which a queue will request messages from the other queues of the cluster - - - autoEvalThreshold: set to "true" for requesting an automatic revaluation of the queues' thresholds values according to their activity - - - waitAfterClusterReq: time (in ms) during which a queue that requested something from the cluster is not authorized to do it again - - - - For further information, see the JORAM documentation - - here - - . - - - The scenario for Queue is similar to the topic one. A client sent messages to a queue in S1. MDB gets messages from each local cluster queue representative. After having sent a burst of messages to the server S1, the load distribution should occur and message should be moved to S2. - - - The Queue definition in $JONAS_BASE/conf/joramAdmin.xml file is as following : - - - - For server 1 - - - Cluster queue with JORAM - - - -<Queue name="mdbQueue1" - serverId="1" - className="org.objectweb.joram.mom.dest.ClusterQueue"> - <freeReader/> - <freeWriter/> - <property name="period" value="10000"/> - <property name="producThreshold" value="50"/> - <property name="consumThreshold" value="2"/> - <property name="autoEvalThreshold" value="false"/> - <property name="waitAfterClusterReq" value="1000"/> - <jndi name="mdbQueue"/> -</Queue> - -<Queue name="mdbQueue2" - serverId="2" - className="org.objectweb.joram.mom.dest.ClusterQueue"> - <freeReader/> - <freeWriter/> - <property name="period" value="10000"/> - <property name="producThreshold" value="50"/> - <property name="consumThreshold" value="2"/> - <property name="autoEvalThreshold" value="false"/> - <property name="waitAfterClusterReq" value="1000"/> - <jndi name="mdbQueue2"/> -</Queue> - -<ClusterQueue> - <ClusterElement name="mdbQueue1" location="s1"/> - <ClusterElement name="mdbQueue2" location="s2"/> - <jndi name="mdbQueueCluster"/> -</ClusterQueue> - - - - For server 2 - - - -<Queue name="mdbQueue1" - serverId="1" - className="org.objectweb.joram.mom.dest.ClusterQueue"> - <freeReader/> - <freeWriter/> - <property name="period" value="10000"/> - <property name="producThreshold" value="50"/> - <property name="consumThreshold" value="2"/> - <property name="autoEvalThreshold" value="false"/> - <property name="waitAfterClusterReq" value="1000"/> - <jndi name="mdbQueue1"/> -</Queue> - -<Queue name="mdbQueue2" - serverId="2" - className="org.objectweb.joram.mom.dest.ClusterQueue"> - <freeReader/> - <freeWriter/> - <property name="period" value="10000"/> - <property name="producThreshold" value="50"/> - <property name="consumThreshold" value="2"/> - <property name="autoEvalThreshold" value="false"/> - <property name="waitAfterClusterReq" value="1000"/> - <jndi name="mdbQueue"/> -</Queue> - -<ClusterQueue> - <ClusterElement name="mdbQueue1" location="s1"/> - <ClusterElement name="mdbQueue2" location="s2"/> - <jndi name="mdbQueueCluster"/> -</ClusterQueue> - - - - - The joramAdmin.xml file has to be loaded when all cluster members are started since some remote - cluster elements are defined. An alternative consists in splitting the configuration into two different files joramAdmin-local.xml - and joramAdmin-cluster.xml, the first one containing only the local elements and the second one, - both local and remote elements. At the JOnAS starting, a script could copy the right file - to joramAdmin.xml according to the others members presence (joramAdmin-local.xml if it's the first member - which starts and joramAdmin-cluster.xml if all the cluster members are started). - - -
    - -
    Changes in the example - The @MessageDriven annotation is set with the mdbQueue queue. That could be done - through the optional deployment descriptor as well. - - -@MessageDriven(activationConfig = { - @ActivationConfigProperty(propertyName ="destination", propertyValue ="mdbQueue"), - @ActivationConfigProperty(propertyName ="destinationType", propertyValue ="javax.jms.Queue") - } -) - - The client code for the Queue is used and the queue name is set to: - - - private static final String SAMPLE_Queue = "mdbQueue"; - - The loop number can be increased in order to generate some pending messages in the first server: - - - private static final int NUMBER_MESSAGES = 1000; - -
    -
    Run the sample - - Deploy the MDB application in each JOnAS instance and run the sample. - The messages do appear on the two different JOnAS servers consoles that shows the load-balacing at the server side. - -
    - -
    Second scenario for Queue : load-balancing at the client side - -
    Principle - - - The load-balancing is done at the client side. A server is selected randomly among the cluster members at the first message sending or through the 'location' java property. And then, for a given client, all the messages are sent to the same server unless the java property resetting. - - - - - - - - - - - - For setting the load-balancing at the client side, the client application must use a clustered connection factory that embeds the network connection parameters of the cluster members. This factory must be registered in the JORAM's distributed JNDI for ensuring that the client gets an up to date object. The main parameters are given below : - -
    -
    Setting of the JORAM's distributed jndi - - - At first, the a3servers.xml file must enhanced with the JORAM's jndi service as following : - - - -<?xml version="1.0"?> -<config> - <domain name="D1"/> - <property name="Transaction" value="fr.dyade.aaa.util.NTransaction"/> - <server id="1" name="s1" hostname="localhost"> - <property name="location" value="s1" /> - <network domain="D1" port="16301"/> - <service class="org.objectweb.joram.mom.proxies.ConnectionManager" - args="root root"/> - <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" - args="16010"/> - <service class="fr.dyade.aaa.jndi2.distributed.DistributedJndiServer" - args="16401 1 2"/> - </server> - - <server id="2" name="s2" hostname="localhost"> - <property name="location" value="s2" /> - <network domain="D1" port="16302"/> - <service class="org.objectweb.joram.mom.proxies.ConnectionManager" - args="root root"/> - <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" - args="16020"/> - <service class="fr.dyade.aaa.jndi2.distributed.DistributedJndiServer" - args="16402 2 1"/> - </server> - -</config> - - - The location property is set for binding the MDB to the local queue instance. - - - Only the JMS objects must be registered in the JORAM's jndi. The standard routing mechanism is used through a jndi.properties file put in each $JONAS_BASE/conf directory : - - - - port number (16401 or 16402) - - - - java.naming.factory.url.pkgs org.objectweb.jonas.naming:fr.dyade.aaa.jndi2 - scn.naming.factory.host localhost - scn.naming.factory.port 16402 - - - - The port number must be adapted according to the local server configuration (16401 for S1 and 16402 for S2). The 'scn' prefix is defined for identifying the objects to bind or to lookup in this registry. - -
    -
    Setting of the clustered connection factories - - - The clustered connection factories are defined in the $JONAS_BASE/conf/joramAdmin.xml file as following : - - - -<ConnectionFactory name="JQCF1" className="org.objectweb.joram.client.jms.tcp.QueueTcpConnectionFactory"> - <tcp host="localhost" - port="16010"/> - <jndi name="scn:comp/JQCF1"/> -</ConnectionFactory> -<ConnectionFactory name="JQCF2" className="org.objectweb.joram.client.jms.tcp.QueueTcpConnectionFactory"> - <tcp host="localhost" - port="16020"/> - <jndi name="scn:comp/JQCF2"/> -</ConnectionFactory> -<ClusterCF> - <ClusterElement name="JQCF1" location="s1"/> - <ClusterElement name="JQCF2" location="s2"/> - <jndi name="scn:comp/clusterJQCF"/> -</ClusterCF> - - - The 'scn:comp/' prefix in the jndi name indicates that the object must be bound in the JORAM's jndi. - -
    -
    Cluster queue definition - - - The cluster queue is defined in the $JONAS_BASE/conf/joramAdmin.xml file : - - - -<Queue name="mdbQueue1" serverId="1" - className="org.objectweb.joram.mom.dest.ClusterQueue"> - <freeReader/> - <freeWriter/> - <jndi name="scn:comp/mdbQueue1"/> -</Queue> - -<Queue name="mdbQueue2" serverId="2" - className="org.objectweb.joram.mom.dest.ClusterQueue"> - <freeReader/> - <freeWriter/> - <jndi name="scn:comp/mdbQueue2"/> -</Queue> - -<ClusterQueue> - <ClusterElement name="mdbQueue1" location="s1"/> - <ClusterElement name="mdbQueue2" location="s2"/> - <jndi name="scn:comp/mdbQueue"/> -</ClusterQueue> - - - The cluster queue definition is symetric across the cluster members. - The well known jndi name is set on the cluster object (and not in the local representative as for the topic cluster). - - - The joramAdmin.xml file has to be loaded when all cluster members - are started since some remote cluster elements are defined. - An alternative consists in splitting the configuration into two different files - joramAdmin-local.xml and joramAdmin-cluster.xml, the first one containing only the local elements and the - second one, both local and remote elements. At the JOnAS starting, a script could copy the right file - to joramAdmin.xml according to the others members presence (joramAdmin-local.xml if it's the first member - which starts and joramAdmin-cluster.xml if all the cluster members are started). - - -
    -
    Changes in the example - - - The message driven bean must be configured with the queue registered in the JORAM jndi ('scn:/comp' selector). - The @MessageDriven annotation is set with the scn:/comp/mdbQueue queue. - That could be done through the optional deployment descriptor as well. - - -@MessageDriven(activationConfig = { - @ActivationConfigProperty(propertyName ="destination", propertyValue ="scn:comp/mdbQueue"), - @ActivationConfigProperty(propertyName ="destinationType", propertyValue ="javax.jms.Queue") - } -) - - - - The client must lookup the clustered objects in the JORAM's jndi by using the 'scn:/comp' selector. - The client code for sending a message to a client is changed as following: - - - -private static final String QUEUE_CONNECTION_FACTORY = "scn:comp/clusterJQCF"; -private static final String SAMPLE_QUEUE = "scn:comp/mdbQueue"; - - - - The connection creation, session creation and producer are created like this: - - - - Queue queue = (Queue) initialContext.lookup(SAMPLE_QUEUE); - Connection connection = ConnectionFactory.createConnection(); - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer messageProducer = session.createProducer(queue); - - - A server is chosen at the first message sending. - A switch may be forced through the resetting of the 'location' java property. Below a new server election is requested for each odd iteration. - - - for (int i = 0; i < NUMBER_MESSAGES; i++) { - message = session.createTextMessage(); - String text = "Message_" + i; - message.setText(text); - messageProducer.send(message); - System.out.println("Message [" + message.getJMSMessageID() + ", text:" + text + "] sent"); - System.out.println("location=" + System.getProperty("location")); - if (i%2 == 0) { - System.setProperty("location", ""); - } - } - messageProducer.close(); - session.close(); - connection.close(); - - -
    -
    Run the sample - - - Deploy the MDB application in each JOnAS instance and run the sample. - The messages do appear on the two different JOnAS servers consoles that shows the messages load-balancing between the cluster elements. - - -
    -
    -
    -
    JORAM HA and JOnAS - -
    Generality - - - - - - - - - - - - In JORAM terminology, an HA server is actually a group of servers, one of which is the master server that coordinates the other slave servers. An external server that communicates with the HA server is actually connected to the master server. - - - Each replicated JORAM server (element of the JORAM HA cluster, master or slave) executes the same code as a standard server except for the communication with the clients. - - - In the example, the collocated clients use a client module (MDB). If the server replica is the master, then the connection is active enabling the client to use the HA JORAM server. If the replica is a slave, then the connection opening is blocked until the replica becomes the master. - -
    -
    Configuration - - - Several files must be changed to create a JORAM HA configuration: - -
    a3servers.xml - - - A clustered server is defined by the element "cluster". A cluster owns an identifier and a name defined by the attributes "id" and "name" - (exactly like a standard server). Two properties must be defined: - - - - "Engine" must be set to "fr.dyade.aaa.agent.HAEngine" which is the class name of the engine that provides high availability. - - - "nbClusterExpected" defines the number of replicas that must be connected to the group communication channel used before this replica starts. - By default it is set to 2. If there are more than two clusters, this specification must be inserted in the configuration file. - If there are two clusters, this specification is not required. - - - - In the case of one server and one replica, the value must be set to 1. - - - -<?xml version="1.0"?/> -<config> - <domain name="D1"/> - - <property name="Transaction" value="fr.dyade.aaa.util.NullTransaction"/> - - <cluster id="1" name="s1"> - - <property name="Engine" value="fr.dyade.aaa.agent.HAEngine" /> - <property name="nbClusterExpected" value="1" /> - - - For each replica, an element "server" must be added. The attribute "id" defines the identifier of the replica inside the cluster. - The attribute "hostname" gives the address of the host where the replica is running. - The network is used by the replica to communicate with external agent servers, i.e., servers located outside of the cluster and not replicas. - - - This is the entire configuration for the a3servers.xml file of the first JOnAS instance: - - - -<?xml version="1.0"?> -<config< - <domain name="D1"/> - - <property name="Transaction" value="fr.dyade.aaa.util.NullTransaction"/> - - <cluster id="1" name="s1"> - - <property name="Engine" value="fr.dyade.aaa.agent.HAEngine" /> - <property name="nbClusterExpected" value="1" /> - - <server id="1" hostname="localhost"> - <network domain="D1" port="16301"/> - <service class="org.objectweb.joram.mom.proxies.ConnectionManager" args="root root"/> - <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" args="16010"/> - <service class="org.objectweb.joram.client.jms.ha.local.HALocalConnection"/> - </server> - - <server id="2" hostname="localhost"> - <network domain="D1" port="16302"/> - <service class="org.objectweb.joram.mom.proxies.ConnectionManager" args="root root"/> - <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" args="16020"/> - <service class="org.objectweb.joram.client.jms.ha.local.HALocalConnection"/> - </server> - - </cluster> - -</config> - - - The cluster id = 1 and the name S1. It is exactly the same file for the second instance of JOnAS. - -
    -
    joramAdmin.xml - - - Here is the joramAdmin.xml file configuration: - - - -<?xml version="1.0"?> - -<JoramAdmin> - -<AdminModule> - <collocatedConnect name="root" password="root"/> -</AdminModule> - -<ConnectionFactory className="org.objectweb.joram.client.jms.ha.tcp.HATcpConnectionFactory"> - <hatcp url="hajoram://localhost:16010,localhost:16020" - reliableClass="org.objectweb.joram.client.jms.tcp.ReliableTcpClient"/> - <jndi name="JCF"/> -</ConnectionFactory> - -<ConnectionFactory className="org.objectweb.joram.client.jms.ha.tcp.QueueHATcpConnectionFactory"> - <hatcp url="hajoram://localhost:16010,localhost:16020" - reliableClass="org.objectweb.joram.client.jms.tcp.ReliableTcpClient"/> - <jndi name="JQCF"/> -</ConnectionFactory> - -<ConnectionFactory className="org.objectweb.joram.client.jms.ha.tcp.TopicHATcpConnectionFactory"> - <hatcp url="hajoram://localhost:16010,localhost:16020" - reliableClass="org.objectweb.joram.client.jms.tcp.ReliableTcpClient"/> - <jndi name="JTCF"/> -</ConnectionFactory> - - - Each connection factory has its own specification. One is in case of the Queue, one for Topic, and one for no define arguments. - Each time the hatcp url must be entered, the url of the two instances. In the example, it is localhost:16010 and localhost:16020. - It allows the client to change the instance when the first one is dead. - - - After this definition the user, the queue and topic can be created. - -
    -
    ra and jonas-ra.xml files in joram_for_jonas_ra.rar - - - First, in order to recognize the cluster, a new parameter must be declared in these files. - - - - <config-property> - <config-property-name>ClusterId</config-property-name> - <config-property-type>java.lang.Short</config-property-type> - <config-property-value>1</config-property-value> - </config-property> - - - Here the name is not really appropriate but in order to keep some coherence this name was used. In fact it represents a replica so it would have been better to call it replicaId. - - - Consequently, for the first JOnAS instance, copy the code just above. For the second instance, change the value to 2 (in order to signify this is another replica). - -
    -
    -
    Run - - - Deploy the MDB application in each JOnAS instance and start them. - - - One of the two JOnAS bases (the one which is the slowest) will be in a waiting state when reading the joramAdmin.xml - - - -JoramAdapter.start : - Collocated JORAM server has successfully started. -JoramAdapter.start : - Reading the provided admin file: joramAdmin.xml - - - whereas the other one is launched successfully. - - - Then launch the client: - - - Messages are sent on the JOnAS instance which was launched before. - Launch it again and kill the current JOnAS. The second JOnAS will automatically wake up and take care of the other messages. - -
    -
    -
    MDB Clustering - -
    Generality - - - This is a proposal for building an MDB clustering based application. - - - The HA mechanism can be mixed with the load balancing policy based on clustered destinations. The load is balanced between several HA servers. Each element of a clustered destination is deployed on a separate HA server. - - - - - - - - - -
    -
    Configuration - - - Not available yet. - - -
    -
    Illustration - - - The configuration may now be tested, as follows: - - - First make JOnAS_A1 crash and verify that messages are spread between JOnAS_B1 and JOnAS_B2. - - - Then make JOnAS_B2 crash and verify that messages are spread between JOnAS_A1 and JOnAS_A2. - - - Finally make JOnAS_A1 and JOnAS_B2 crash and verify that messages are spread between JOnAS_A2 and JOnAS_B1. - - - -
    -
    - -
    - diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/configuration/web.xml b/jonas_doc/core/src/docbook/doc-en/clustering/configuration/web.xml deleted file mode 100644 index ebf7c357eeb874e39eb64f879ea21505e406a8dc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/configuration/web.xml +++ /dev/null @@ -1,353 +0,0 @@ - -
    - - WEB clustering with Apache/Tomcat - - -
    - - Configuring a WEB farm with mod_jk - - -
    - - mod_jk configuration - - - - As with other Apache modules, mod_jk should be first - installed on the modules directory of the Apache Web - Server and the - httpd.conf - file has to be updated. Moreover, mod_jk requires - workers.properties - file that describes the host(s) and port(s) used by the - workers. - - -
    - - workers.properties file - - - - Here we provide an example of - workers.properties - file to connect the Apache frontal with two - workers. The file defines a - load-balancing - worker named - myloadbalancer - , and the two - balanced - workers, - worker1 - and - worker2 - . Each cluster member will be configured to play the - role of one of the balanced workers. Additionally, a - status worker jkstatus is defined for controlling - and monitoring the load-balancing. - - - Configuring mod_jk workers - -#----------------------- -# List the workers name -#----------------------- -worker.list=myloadbalancer,jkstatus - -#----------------------- -# worker1 -#----------------------- -worker.worker1.port=9010 -worker.worker1.host=localhost -worker.worker1.type=ajp13 # Load balance factor -worker.worker1.lbfactor=1 # Define preferred failover node for worker1 -#worker.worker1.redirect=worker2 # Disable worker1 for all requests except failover -#worker.worker1.disabled=True -#----------------------- -# worker2 -#----------------------- -worker.worker2.port=9011 -worker.worker2.host=localhost -worker.worker2.type=ajp13 # Load balance factor -worker.worker2.lbfactor=1 # Define preferred failover node for worker2 -#worker.worker2.redirect=worker2 # Disable worker2 for all requests except failover -#worker.worker2.disabled=True -#----------------------- -# Load Balancer worker -#----------------------- -worker.myloadbalancer.type=lb -worker.myloadbalancer.balance_workers=worker1,worker2 -worker.myloadbalancer.sticky_session=false -#----------------------- -# jkstatus worker -#----------------------- -worker.jkstatus.type=status - - - - - For a complete documentation about - workers.properties - see the Apache Tomcat Connector - - guide - - . - -
    - -
    - - Apache configuration - - - - The Apache configuration must be enhanced for loading the mod_jk plugin with its setting. The following lines - have to be added to the httpd.conf file directly or included from another file: - - - Configuring mod_jk mount points - -# Load mod_jk module -# Update this path to match your modules location -LoadModule jk_module modules/mod_jk.so -# Location of the workers.properties file -# Update this path to match your conf directory location JkWorkersFile -# (put workers.properties next to httpd.conf) -/etc/httpd/conf/workers.properties -# Location of the log file JkLogFile /var/log/mod_jk.log -# Log level : debug, info, error or emerg -JkLogLevel info -# Select the timestamp log format -JkLogStampFormat "[%a %b %d %H:%M:%S %Y] " -# Shared Memory Filename ( Only for Unix platform ) required by loadbalancer -JkShmFile /var/log/jk.shm -# Assign specific URL to the workers -JkMount /sampleCluster2 myloadbalancer -JkMount /sampleCluster2/* myloadbalancer -JkMount /sampleCluster3 myloadbalancer -JkMount /sampleCluster3/* myloadbalancer -# A mount point to the status worker -JkMount /jkmanager jkstatus -JkMount /jkmanager/* jkstatus - -# Copy mount points into all virtual hosts -JkMountCopy All - -# Enable the Jk manager access only from localhost -<Location /jkmanager/> - JkMount jkstatus - Order deny,allow - Deny from all - Allow from 127.0.0.1 -</Location> - - - - - The location of the workers.properties file has to be adapted to your environment. - The JkMount directives specify the routes that are managed by mod_jk. The examples of - context urls pattern have to be replaced with your application ones. - - For a complete documentation see Apache - - HowTo - - . - -
    -
    - -
    - - Cluster members configuration - - - - Each cluster member needs an AJP/1.3 connector listening on the - port defined in the workers.properties file. Moreover, - the worker name (here in the example, worker1/worker2) must be used as - value for the Engine's - jvmRoute - attribute. - - - - Here is a chunk of tomcat6-server.xml configurations file for - the member worker1: - - - - Configuring an AJP connector in Tomcat - -<Server> - <!-- Define the Tomcat Stand-Alone Service --> - <Service name="Tomcat-JOnAS"> - <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 9000 --> - <Connector port="9000" protocol="HTTP/1.1" connectionTimeout="20000" - redirectPort="9043" /> - <!-- AJP 1.3 Connector on port 9010 for worker.worker1.port in workers.properties file --> - <Connector port="9010" redirectPort="9043" protocol="AJP/1.3"/> - - <!-- An Engine represents the entry point You should set jvmRoute to support load-balancing via AJP ie : --> - <Engine name="jonas" defaultHost="localhost" jvmRoute="worker1"> - </Engine> - </Service> -<Server> - - -
    - -
    - -
    - - Configuring a WEB farm with mod_proxy_balancer - - -
    - - mod_proxy_balancer configuration - - - - - mod_proxy-balancer is available in Apache 2.2 and later. - - - See the Apache documentation - - here - . - - -
    - -
    - - Cluster members configuration - - - - Contrary to mod_jk, mod_proxy_balancer supports HTTP and AJP protocols. Thus the cluster member can - specify either an AJP/1.3 connector or a HTTP connector. In both case, the connector port number must be the same than the port number - defined in the Apache's configuration file. - Moreover, the BalancerMember route parameter must be used as value for the Engine's - jvmRoute - attribute. - -
    -
    - - -
    - - Configuring a WEB cluster - - - The load-balancing is configured as a WEB farm, see and . - -
    - - TomcatCluster configuration - - - - Additionally to HTTP requests load balancing provided by - mod_jk, transparent failover for Web applications can - be reached by using HTTP session replication provided by - the Tomcat clustering solution. - - - - Web cluster - members are JOnAS instances having the web container - service activated, using the Tomcat implementation, and having a - specific configuration which allows them to be members - of a Tomcat cluster. - - - - The concerned configuration file is the - tomcat6-server.xml - file. Every member of the cluster must have a Cluster - element defined in the default virtual host definition. - The cluster name is defined by the clusterName - attribute, which should be the same for all the cluster - members. Another common element for the cluster members - is the Membership definition. - - - - The example below defines a configuration of the Cluster element for an all-to-all session replication with the DeltaManager. - This works great for small cluster. For larger cluster, BackupManager enables to replicate the session data to one backup node, - and only to nodes that have the application deployed. See the - documentation - for more informations. - - - - Configuring the HTTP session replication in Tomcat - - <!-- Define a Cluster element --> - <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster" - channelSendOptions="8" clustername="mycluster" > - <Manager className="org.apache.catalina.ha.session.DeltaManager" - expireSessionsOnShutdown="false" - notifyListenersOnReplication="true"/> - <Channel className="org.apache.catalina.tribes.group.GroupChannel"> - <Membership className="org.apache.catalina.tribes.membership.McastService" - address="228.0.0.4" - port="45564" - frequency="500" - dropTime="3000"/> - <Receiver className="org.apache.catalina.tribes.transport.nio.NioReceiver" - address="auto" - port="4000" - autoBind="100" - selectorTimeout="5000" - maxThreads="6"/> - <Sender className="org.apache.catalina.tribes.transport.ReplicationTransmitter"> - <Transport className="org.apache.catalina.tribes.transport.nio.PooledParallelSender"/> - </Sender> - <Interceptor className="org.apache.catalina.tribes.group.interceptors.TcpFailureDetector"/> - <Interceptor className="org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor"/> - </Channel> - <Valve className="org.apache.catalina.ha.tcp.ReplicationValve" - filter=""/> - <Valve className="org.apache.catalina.ha.session.JvmRouteBinderValve"/> - <ClusterListener className="org.apache.catalina.ha.session.JvmRouteSessionIDBinderListener"/> - <ClusterListener className="org.apache.catalina.ha.session.ClusterSessionListener"/> - </Cluster> - - - - - - - the - clusterName - attribute is mandatory for administration purpose (and not set by default - in - tomcat6-server.xml - file). - - - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/examples/sampleCluster2.xml b/jonas_doc/core/src/docbook/doc-en/clustering/examples/sampleCluster2.xml deleted file mode 100644 index 384e343a1cec4fed0440ae8adc5a1a49c1cdf401..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/examples/sampleCluster2.xml +++ /dev/null @@ -1,192 +0,0 @@ - -
    - - sampleCluster2 - - - This example is delivered with JOnAS in the - JONAS_ROOT/examples/cluster-j2ee14 directory. - -
    - - Description - - - The sampleCluster2 application aims to demonstrate the JOnAS's - clustering features in a pedagogical way for - J2EE1.4. - - These features are: - - - - Load balancing at Apache level using mod_jk - - - - Failover at the web level (HTTP session replication using tomcat). - - - - Load balancing at EJB level using CMI - - - - Failover at EJB level (Stateful EJB replication) - - - - The application is composed of the following EJB 2.1 - components: - - - - 1 SLSB (MyEjb1) - - - - 2 SFSB (MyStateful and MyStatefulInner) - - - - 1 EB - - - - - - - - -
    - -
    - - Structure - - - - - ./bin-client: scripts to launch clients, - - - - ./example-config: configuration example, - - - - ./etc: configuration file, - - - - ./src: source code. - - - - ./output : generated ear, jar, war files. - - -
    - -
    - - Configuring the cluster - - - First of all, configure the cluster using the - newjc command. Please, refer to the newjc documentation - and do not forget to install and configure apache2 as it's described in - the Cluster Configuration Guide. -
    - -
    - - Compiling - - - To build the application, launch ant tool from - JONAS_ROOT/examples/cluster-j2ee14 directory where - (the build.xml file is located). - - - - ant enableLbMode ear for the load-balancing - mode, or - - - - ant enableHaMode ear earHA for the - hight-avability mode. - - - - - By default, the SLSB calls are not integrated in the horizontal - algorithm. This default mode enables the load-balancing at the remote - interface. When the SLSB are marked as replicated in the - jonas-ejb-jar.xml (cluster-replicated element), the - load-balancing is disabled, all the methods calls are sent to the same - node but a tx exact-one is ensured. For switching from one mode to - another, use the target enableHaMode and - enableLbMode. - -
    - -
    - - Running - - -
    - - Launching the cluster - - - To start and halt the cluster, use the jcl4sc - (jcl4sc.bat) command generated by - newjc in the root of the bases. - - jcl4sc -c start allows to start the cluster, - included the cluster daemon, the db node, the master node and the jbx - nodes. - - jcl4sc halt allows to halt the cluster. - - You may type jcl4sc -help to get the usage of - the command. -
    - -
    - - Deploying - - - The sampleCluster2 application is automatically deployed on the - cluster if you have previously build it, before using the - jcl4sc command. -
    - -
    - - Using - - - The application is available at - http://<hostname>:<apache-port>/sampleCluster2. - - - Example: http://localhost:80/sampleCluster2 -
    -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/examples/sampleCluster3.xml b/jonas_doc/core/src/docbook/doc-en/clustering/examples/sampleCluster3.xml deleted file mode 100644 index e4d1b147359a24fbc982661bc042c397bf96901f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/examples/sampleCluster3.xml +++ /dev/null @@ -1,174 +0,0 @@ - -
    - - sampleCluster3 - - - This example is delivered with JOnAS in the - JONAS_ROOT/examples/cluster-javaee5 directory. - -
    - - Description - - - The sampleCluster3 application aims to demonstrate the JOnAS's - clustering features in a pedagogical way for Java EE - 5. - - These features are: - - - - Load balancing at Apache level using mod_jk - - - - Failover at the web level (HTTP session replication using tomcat). - - - - Load balancing at EJB level using CMI - - - - Failover at EJB level (Stateful EJB replication) - - - - The application is composed of the following EJB3 components: - - - - 1 SLSB (MyStateless) - - - - 2 SFSB (MyStateful and MyStatefulInner) - - - - 1 EB (Node) - - - - - - - - -
    - -
    - - Structure - - - - - ./bin-client: scripts to launch clients, - - - - ./etc: configuration file, - - - - ./example-config: configuration example, - - - - ./src: source code, - - - - ./output: generated files. - - -
    - -
    - Configuring the cluster - - First of all, configure the cluster using the - newjc command. Please, refer to the newjc documentation - and do not forget to install and configure apache2 as it's described in - the Cluster Configuration Guide. -
    - -
    - - Compiling - - - To build the application, launch ant tool from - $JONAS_ROOT/examples/cluster-javaee5 root directory - where (the build.xml file is located). - - - - ant ear. The application file - sampleCluster3.ear is generated in - ./output/apps folder. - - -
    - -
    - - Running - - -
    - - Launching the cluster - - - To start and halt the cluster, use the jcl4sc - (jcl4sc.bat) command generated by - newjc in the root of the JOnAS bases. - - jcl4sc -c start allows to start the cluster, - included the cluster daemon, the db node, the master node and the jbx - nodes. - - jcl4sc halt allows to halt the cluster. - - You may type jcl4sc -help to get the usage of - the command. -
    - -
    - - Deploying - - - The sampleCluster3 application is automatically deployed on the - cluster if you have previously build it, before using the - jcl4sc command. -
    - -
    - - Using - - - The application is available at - http://<hostname>:<apache-port>/sampleCluster3. - - - Example: http://localhost:80/sampleCluster3 -
    -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/faq/faq.xml b/jonas_doc/core/src/docbook/doc-en/clustering/faq/faq.xml deleted file mode 100644 index 83bd84ec47e10839cf391efe8d2d91b4e1dd1ac8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/faq/faq.xml +++ /dev/null @@ -1,147 +0,0 @@ - -
    - - FAQ - - -
    - - EJB clustering related questions - - -
    - - Does CMIv2 work with JOnAS 4 ? - - - No, CMIv2 relies on Carol V3.x and is not compliant with JOnAS 4. - By the way CMIv2 requires JDK5 and higher. -
    - -
    - - Does EJB clustering with CMI require a change in the client - application ? - - - No, new CMI (v2) is completely transparent for the client and - doesn't require a pre-compilation step which is different from CMI v1 in - JOnAS 4. -
    - -
    - - Does EJB clustering with CMI require a change in the server - application ? - - - EJB application doesn't require any change provided that the - application design is clustering safe. Typically static field must not - be used. If no clustering annotation are set into the POJO, the specific - deployment descriptor can be added for describing the load-balancing - logic. -
    -
    - -
    - - JGroups related questions - - -
    - - About the network interface - - - To select the right network interface, set your IP with the - attribute bind_addr of the element UDP into the JGroups configuration - files: - - -<config> - <UDP bind_addr="192.168.0.1" - ... - /> -... -</config> - - -
    - -
    - - About JGroups 2.2.9.x & IPv6 - - - JGroups 2.2 doesn't support IPv6. It must be disabled in the JVM - by setting the java.net.preferIPv4Stack to - true. JGroups 2.2 is used both in the - cmi and discovery services in JOnAS 4. - JOnAS 5 embeds JGroups 2.6 that supports quite well IPv6. - - In JOnAS 4, when IPv6 is not disabled, the following exceptions - may appear: -... -TP.down : failed sending message with java.io.IOException: Invalid argument -... -org.jgroups.ChannelException: failed to start protocol stack - - - Parameter setting example with linux/unix system: - - -export JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true" - -
    - -
    - - About JGroups 2.2.9.x & JDK6 - - - JGroups 2.2 doesn't support JDK6. The problem is due to the JDK - and is documented by Sun - here. JGroups is used both in the cmi, ha and - discovery services in JOnAS 4. - - In a configuration JOnAS 4/JDK6, the following exceptions may - appear: -... -org.jgroups.ChannelException: failed loading class -... - - - The workaround consists in setting the - sun.lang.ClassLoader.allowArraySyntax jvm property to - true. Example of such setting in a linux - system: - - -export JAVA_OPTS="$JAVA_OPTS -Dsun.lang.ClassLoader.allowArraySyntax=true" - -
    -
    - -
    - - Management related questions - - -
    - - Does JOnAS provide a way to start remotely an instance. - - - Yes, JOnAS provides a cluster daemon which acts as a JOnAS - instances bootstrap. The cluster daemon exposes a JMX remote interface - enabling the remote control. -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/management/cluster.xml b/jonas_doc/core/src/docbook/doc-en/clustering/management/cluster.xml deleted file mode 100644 index 15a44ee1ba65d4f1d1c88db49d14335d04550da8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/management/cluster.xml +++ /dev/null @@ -1,275 +0,0 @@ - -
    - - Cluster member management - - -
    - - What is a cluster - - - A cluster is a group of JOnAS instances. The servers within a - cluster are called cluster members. A server may be a member of several - clusters in the domain. - - A cluster is an administration target in the domain: from the common - administration point of view, the administrator may monitor the cluster - or apply to it management operations like deploy or undeploy of applications. -
    - -
    - - Cluster types - - - There are two main cluster categories: - - - - Clusters containing instances that are grouped together only to - facilitate management tasks. - - - - Clusters containing instances that are grouped together to achieve - objectives like scalability, high availability or failover. - - - - The clusters in the first category, called , - are created by the domain administrator based on his/her particular needs. The - grouping of servers (the cluster creation) can be done even though the - servers are running. - - In the second case, the servers which compose a cluster must have a - particular configuration that allows them to achieve the expected - objectives. Once servers are started, the administration framework is able to - automatically detect that they are cluster members, based on configuration - criteria. Several cluster types are supported by the JOnAS administration - framework. They correspond to the different roles a cluster can - play: - - - - - allow HTTP request load balancing - and failover based on the mod_jk Apache connector. - - - - - allow high availability at - web level based on the Tomcat 5.5 session replication solution. Tomcat 6 will - be supported soon. - - - - - enable JNDI clustering and - allows load balancing at EJB level, based on the CMI protocol - - - - - allow transaction aware failover - at EJB level and stateful session bean replication. - - - - - allow JMS destinations - scalability based on the JORAM distributed solution. - - - - - allow JMS destinations high availability - based on JORAM HA. - - -
    - -
    - - Logical clusters configuration - - - An administrator can create a cluster if he/she needs to group some - servers into a single administration target. There is no predefined - criteria to explicitly group servers for administration purpose. - - Cluster names and topology can be defined in a static way, using the - domain configuration file domain.xml. Here is an - example allowing to create a cluster named mycluster in - sampleDomain domain, in which servers - node1 and node2 are grouped together - for administration purpose. - - <domain xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-domain_4_9.xsd"> -<name>sampleDomain</name> -<description>A domain example</description> - <cluster> - <name>mycluster</name> - <description>A cluster example</description> - <server> - <name>node1</name> - <location> - <url>service:jmx:rmi://myhost/jndi/jrmp://myhost:2002/jrmpconnector_node1</url> - </location> - </server> - <server> - <name>node2</name> - <location> - <url>service:jmx:rmi://myhost/jndi/jrmp://myhost:2003/jrmpconnector_node2</url> - </location> - </server> - <cluster> -<domain> - - Clusters can also be created dynamically via the - JonasAdmin management console application running on the master. - -
    - -
    - - JkCluster configuration - - - The configuration of is described in the clustering - configuration chapter. - This section explains how to make such a cluster manageable from a domain master node. - - - - To allow cluster member discovery and dynamic cluster creation, - the workers.properties file required by mod_jk - should be copied to the master's JONAS_BASE/conf directory. - - At start-up, the master reads the - workers.properties file content. For each balanced - worker it checks if there is a running server in the domain having the - appropriate configuration allowing the server to play that worker - role. - - Suppose that the master detects a server in the domain - corresponding to worker1. Then, it constructs a named - loadbalancer. This name is given by the load - balancer worker's name. At this time, the cluster is composed of one - member named worker1. The member name is given by the - balanced worker's name. - - After a while, a new JOnAS server is started in the domain having - the configuration corresponding to the worker2. The - master detects the new member named worker2 and updates the cluster's - member list. - - Here is the loadbalancer with - workers started, as it appears in the jonasAdmin console of the master: - - - - - - - - - - - - - - - - - -
    - -
    - - TomcatCluster configuration - - - The configuration of is described in the clustering - configuration chapter. - - - - the clusterName attribute is mandatory (and - not set by default in tomcat6-server.xml file). It must be unique - in the domain and is used for identifying the cluster. - - - For example, lets consider the two JOnAS servers which play the role of - worker1 and worker2 in the - myloadbalancer . Suppose - that these servers, named node1 and - node2 are configured as members of the - myTomcatCluster . The - master detects automatically the Tomcat cluster membership and creates a - named - myTomcatCluster. It adds node1 and - node2 to the cluster's member list. - - Here is myTomcatCluster cluster with node1 and node2 members - running, as it appears in the console - - - - - - - - - -
    - -
    - - CmiCluster configuration - - - The configuration of is described in the clustering - configuration chapter. - - - The CMI cluster is automatically detected from the master node (CMI MBeans discovery). As a result, - the following information is provided: - - - - - - - - - - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/management/clusterd.xml b/jonas_doc/core/src/docbook/doc-en/clustering/management/clusterd.xml deleted file mode 100644 index 0aa5f6d412a14c9092619276cc8e3785c44e8eb2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/management/clusterd.xml +++ /dev/null @@ -1,545 +0,0 @@ - -
    Cluster Daemon - -
    Introduction - - - The goal of the cluster daemon is to enable the remote control of the JOnAS clustered instances through a JMX interface. - - - In a cluster configuration, the cluster daemon is the bootstrap of the JOnAS instances. - - - There is at least one cluster daemon instance per machine. - - - - - - - - - -
    -
    Configuration - - - In the same manner as a classic JOnAS instance, the cluster daemon reads its configuration in a directory pointed to by a JONAS_BASE variable (or JONAS_ROOT if JONAS_BASE is not set). All the default JONAS_BASE subdirectories and files are not required; the mandatory ones are: - - - - - - - element - - - description - - - - - - - $JONAS_BASE/conf - - - Configuration directory - - - - - $JONAS_BASE/logs - - - Log directory - - - - - $JONAS_BASE/conf/carol.properties - - - Carol configuration file describing the protocol and its parameters (used for the JMX interface) - - - - - $JONAS_BASE/conf/trace.properties - - - Trace/Error log configuration file - - - - - $JONAS_BASE/conf/jonas.properties - - - This file must be present for enabling the cluster daemon starting but its content is not read, the file can be empty - - - - - $JONAS_BASE/conf/clusterd.xml - - - Cluster daemon configuration file, lists the local JOnAS instances and describes their environment (see below) - - - - - -
    -
    clusterd.xml - - - The JOnAS instances controlled by a cluster daemon are configured in the - - clusterd.xml - - file. - - -<?xml version="1.0"?> -<cluster-daemon xmlns="http://www.ow2.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.ow2.org/jonas/ns/jonas-clusterd_4_8.xsd"> - - <name>cd1</name> - <domain-name>domainSample</domain-name> - <jonas-interaction-mode>loosely-coupled</jonas-interaction-mode> - - <server> - <name>node1</name> - <description>Web instance</description> - <java-home>/usr/java/jdk-ia32/sun/j2sdk1.4.2_10</java-home> - <jonas-root>/home/pelletib/pkg/jonas_root_sb48</jonas-root> - <jonas-base>/home/pelletib/tmp/newjc48/jb1</jonas-base> - <xprm></xprm> - <auto-boot>false</auto-boot> - <jonas-cmd></jonas-cmd> - </server> - -... - -</cluster-daemon> - - - - - - - - Element - - - Description - - - - - - - name - - - Cluster daemon instance name. Used for building the connector url. - - - - - domain-name - - - Domain name to use for launching the JOnAS instance when it is not specified in the start command - - - - - jonas-interaction-mode - - - Starting mode of the JOnAS instances: - - loosely-coupled - - corresponds to background and - - tighly-coupled - - corresponds to foreground. Typically, when launching in tighly coupled mode a cluster daemon stopping will cause the stopping - of the managed JOnAS instance. - - - - - server/name - - - Name of the JOnAS instance - - - - - server/description - - - Description of the JOnAS instance - - - - - server/java-home - - - JDK home directory to be used for launching the JOnAS instance - - - - - server/jonas-root - - - JOnAS binaries directory to be used for launching the JOnAS instance - - - - - server/jonas-base - - - JOnAS configuration directory to use for launching the JOnAS instance - - - - - server/xprms - - - JVM parameters to set when launching the JOnAS instance - - - - - server/auto-boot - - - If true, start the JOnAS instance when launching the cluster daemon - - - - - server/jonas-cmd - - - Optional parameter. If set, specifies the script to use for starting/stopping the JOnAS instance. - This user script can set the required environment and perform some pre or post processing. By default, the - jonas - command is used. - - - - - -
    -
    domain.xml - - - The cluster daemons must be specified and associated to the JOnAS instances in the - - domain.xml - - file for permitting the remote control of the cluster. - - - -... -<cluster-daemon> - <name>cd1</name> - <description>cluster daemon 1</description> - <location> - <url>service:jmx:rmi://host/jndi/rmi://host:port/jrmpconnector_cd</url> - </location> -</cluster-daemon> -... -<server> - <name>node1</name> - <cluster-daemon>cd1</cluster-daemon> - ... -</server> -... - - - The JMX remote url of the cluster daemon respects the following syntax: - - - service:jmx:rmi:// - -host - -/jndi/rmi:// - -host - -: - -port - -/ - -protocol - -connector_ - -name - - with the following meanings: - - - - - host - - - ip alias or ip address of the machine that hosts the cluster daemon (by default localhost, can be overridden through the carol.properties file) - - - - - port - - - tcp listen port of the registry embedded in the cluster daemon (by default 1806, can be overridden through the carol.properties file) - - - - - protocol - - - protocol used for accessing the JMX interface (by default irmi, can be overridden through the carol.properties file) - - - - - name - - - cluster daemon instance name (defined in the clusterd.xml file) - - - -
    -
    Running the Cluster Daemon - - - The cluster daemon is started using the command - - jclusterd - - . The possible options are: - - - - - - - option - - - description - - - - - - - start - - - Start the cluster daemon. - - - - - stop - - - Stop the cluster daemon. - - - - - -DdomainName - - - Domain name to be used for starting the JOnAS instance. This value is used when it is defined both here and in the clusterd.xml file. - - - - - -carolFile <my-carol.properties> - - - Path to the carol.properties file to be used. If not specified, the file is loaded from $JONAS_BASE/conf. If the file is not found, the default values (localhost, 1806, irmi) are used. - - - - - -confFile <my-clusterd.xml> - - - Path to the clusterd.xml file to load. If not specified, the file is loaded from $JONAS_BASE/conf. - - - - - -
    -
    JMX Interface - - - The cluster daemon provides a JMX interface that enables control of the JOnAS instances. The following operations are available: - - - - - - - Operation - - - Description - - - - - - - String getServersList() - - - Return the list of JOnAS instances - - - - - int pingJOnAS(String name) - - - Ping a JOnAS instance identified by its name - - - - - void startJOnAS(String name, String domainName, String prm) - - - Start a JOnAS instance identified by its name. The parameter - - domainName - - (optional) provides the capability to specify the domain name. The parameter - - prm - - (optional) provides the capability to set some JVM parameters. - - - - - String startAllJOnAS(String domainName, String prm) - - - Start all the JOnAS instances known in the cluster daemon configuration. The parameter - - domainName - - (optional) provides the capability to specify the domain name. The parameter - - prm - - (optional) provides the capability to set some JVM parameters. - - - - - void stopJOnAS(String name) - - - Stop a JOnAS instance identified by its name - - - - - String stopAllJOnAS() - - - Stop all the JOnAS instances known in the cluster daemon configuration - - - - - String getJavaHome4Server(String name) - - - Get the JAVA_HOME defined for a JOnAS server - - - - - String getJonasRoot4Server(String name) - - - Get the JONAS_ROOT defined for a JOnAS server - - - - - String getJonasBase4Server(String name) - - - Get the JONAS_BASE defined for a JOnAS server - - - - - void reloadConfiguration() - - - Reload the configuration file of the cluster daemon - - - - - void addServer(String name, String description, String javaHome, String jonasRoot, String jonasBase) - - - Add a definition of a JOnAS instance to the cluster daemon configuration. The change is saved in the configuration file. - - - - - void removeServer(String name) - - - Remove a definition of a JOnAS instance in the cluster daemon configuration. The change is saved in the configuration file. - - - - - void modifyServer(String name, String description, String javaHome, String jonasRoot, String jonasBase) - - - Modify the definition of a JOnAS instance in the cluster daemon configuration. The change is saved in the configuration file. - - - - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/management/cmi.xml b/jonas_doc/core/src/docbook/doc-en/clustering/management/cmi.xml deleted file mode 100644 index 4ea16e047aa2595503387085f71848a4213b4d11..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/management/cmi.xml +++ /dev/null @@ -1,196 +0,0 @@ - -
    - - CMI service management - -
    Introduction
    - - CMI relies on JMX for its management. It provides a set of MBeans for retrieving - management informations and performing some operations such as modifying the load-balancing logic. - - All the CMI management is done at the server side and changes are propagated to the clients in a - transparent way for the operator. - - The CMI parameters are dynamic, the changes are taken into account in a near real-time (at the next - refresh configuration period). - -
    jonasAdmin console - - jonasAdmin provides a CMI management page which is accessible from any member in the CMI cluster by clicking - on the server node in the navigation tree and by selecting the CMI tab. - - - - - - - - - The page contains the following elements: - - - - Global/Refresh time: specifies the client configuration refresh time period. When a policy changes or a parameter such as - the load factor, the parameter indicates the maximum propagation delay to the client side. - - - - - Servers for each protocol: lists the servers in the cluster and the enabled protocols. More detailed information is - delivered on the links. - - - - - Providers/Blacklist: disables smoothly a server in the cluster, i.e. new connections are refused - whereas existing one are still served. - - - - - Clusters: lists the different cluster names. 'System' is a reserved cluster name gathering internal objects and is - reserver for maintenance or advanced uses. - - - - - When selecting a cluster name in the bottom list, a new tab shows the clustered EJBs associated with this logical name: - - - - - - - - - And then you can access to an object information page by clicking on a clustered EJB in the list: - - - - - - - - - The page contains the following elements: - - - - Global/Name: JNDI name of the clustered object. - - - - - Global/Cluster name: Cluster name associated with the clustered object. - - - - - Global/Interface: Interface class name of the clustered object. - - - - - Deployed server: List of servers where the clustered object is deployed. - - - - - Load-balancing infos: Policy and strategy of the clustered object. - - - - - Pool infos: Parameters of the stub pool associated with the clustered object. - - - - -
    -
    Dynamic update of the load-balancing parameters - -
    Policy and strategy - - Policies and strategies can be updated dynamically from jonasAdmin console. - - From the clustered object information page, you can select another policy : - - - - - - - - - or strategy : - - - - - - - - - Refer to the section for more information. - - -
    -
    Load-factor - - Load-factor can be updated dynamically by clicking on a server in the CMI tab page : - - - - - - - - - The server information page contains a load-factor which can be modified dynamically: - - - - - - - -
    - -
    - -
    MBeans - - CMI provides a MBean for management whose name is: - <domain name>:type=cmi,name=CMIServer,J2EEServer=<JOnaS instance name> - - - - - - - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/management/domain.xml b/jonas_doc/core/src/docbook/doc-en/clustering/management/domain.xml deleted file mode 100644 index 2b79b7531f57d0b70812ae182edb319a2f32d1f8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/management/domain.xml +++ /dev/null @@ -1,218 +0,0 @@ - -
    - domain configuration -
    What is a domain - - - A domain represents an administration perimeter which is under the - control of an administration authority. It provides at least one common - administration point for the elements in the domain. - - A JOnAS domain may contain: - - - - JOnAS instances or servers - - - - groups of instances called clusters - - - - cluster daemons, elements used for the remote control of - instances and clusters - - - - A common administration point is represented by a JOnAS instance - having a particular configuration and playing the role of master. A master has the knowledge of the domain - topology and allows executing administration operations on the rest of the - servers and on the clusters. It also allows the monitoring of the domain - elements. - - The administered elements are identified by their names, that have - to be unique within the domain, and the domain name. - -
    Naming policy - - - Names can be defined in a static way, through the - domain.xml configuration file, or dynamically, by - starting new elements in the domain. For example, when starting a JOnAS - instance, the administrator can specify the server - name using the -n option and the domain - name by setting the domain.name environment - property. The uniqueness of the starting server's name is enforced by - the discovery service. -
    -
    - -
    What is a domain configuration - - - A domain configuration consists in the domain topology - the - description of the elements composing the domain (servers, clusters, cluster daemons), and the state of the - elements in the domain, as viewed from the common administration - point. - - The domain configuration dynamically evolves by starting or stopping - servers and by creating or removing clusters in the domain. -
    - -
    How to configure a domain - - -
    Choose the domain name and configure the master - - - The first step is to choose a name for the domain and to choose a server to represent the - common administration point. This server must be configured as a master by setting to true the - jonas.master property. Also, to allow dynamic domain management, add the discovery - service in the JOnAS services list (jonas.services - property) in jonas.properties file. - - The domain name is not a configuration property for the master - (neither for any server in the domain), but it has to be specified when - starting the master. - - Before starting the master, the administrator can define the - domain's initial topology by editing the domain.xml configuration file. -
    - -
    Define the domain initial topology - - - This step is optional. It consists in defining the domain elements - using the domain.xml configuration file located in - the master's configuration directory. If the administrator has no specific - configuration needs, it should at least check the name element, - and set its value to the chosen name. That file - can also be used to define a default user name and password (that may be encoded) to use when - connecting to servers and cluster daemons. Moreover, the administrator - can choose to remove the domain.xml file. - - The elements that can be defined in domain.xml are: - - - - server elements: allow to define a server in the domain, or a - server in a cluster. A server has a name, a description, a location - and optionally a user name and password as well as an associated - cluster daemon. The location can be represented by a list of JMX - remote connector server URLs. - - - - cluster elements: allows to group servers in a logical - cluster. - - - - cluster daemon elements: allows to define a cluster daemon in - the domain. A cluster daemon element has a name, a description, a - location and optionally a user name and password. The location can be - represented by a list of JMX remote connector server URLs. - - - - domain.xml - - -<?xml version="1.0" encoding="UTF-8"?> -<domain xmlns="http://www.objectweb.org/jonas/ns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.objectweb.org/jonas/ns http://www.objectweb.org/jonas/ns/jonas-domain_4_9.xsd"> - <name>sampleCluster2Domain</name> - <description>A domain for sampleCluster2 servers management</description> - - <cluster-daemon> - <name>cd</name> - <description></description> - <location> - <url>service:jmx:rmi://localhost/jndi/rmi://localhost:1806/jrmpconnector_cd</url> - </location> - </cluster-daemon> - <cluster> - <name>mycluster</name> - <description>A cluster for sampleCluster2</description> - <server> - <name>node1</name> - <location> - <url>service:jmx:rmi://localhost/jndi/rmi://localhost:2002/jrmpconnector_node1</url> - </location> - <cluster-daemon>cd</cluster-daemon> - </server> - <server> - <name>node2</name> - <location> - <url>service:jmx:rmi://localhost/jndi/rmi://localhost:2022/jrmpconnector_node2</url> - </location> - <cluster-daemon>cd</cluster-daemon> - </server> - <server> - <name>node3</name> - <location> - <url>service:jmx:rmi://localhost/jndi/rmi://localhost:2032/jrmpconnector_node3</url> - </location> - <cluster-daemon>cd</cluster-daemon> - </server> - <server> - <name>node4</name> - <location> - <url>service:jmx:rmi://localhost/jndi/rmi://localhost:2043/jrmpconnector_node4</url> - </location> - <cluster-daemon>cd</cluster-daemon> - </server> - </cluster> - -</domain> - - -
    - -
    Domain configuration at master start-up - - - Start the master in the domain: - - jonas start -n masterName -Ddomain.name=domainName - - Note that the domain name is specified by setting a - domain.name environment property. - - Once started, the administrator can manage and monitor the - following elements in the domain through JonasAdmin, or another JMX - based administration application (such as jconsole), running on the master: - - - - servers declared in the domain.xml file. - - - - other servers already started in the domain having the - discovery service enabled. - - - - clusters declared in the domain.xml file. - - - - clusters detected by the administration framework - - - - cluster daemons declared in the domain.xml file. - - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/management/ha.xml b/jonas_doc/core/src/docbook/doc-en/clustering/management/ha.xml deleted file mode 100644 index 29d290d4279f9a7bb5c2e5ace9ec64305cd7281d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/management/ha.xml +++ /dev/null @@ -1,48 +0,0 @@ - -
    - - HA service management - - The JOnAS administration console offers to access - several items of information about the HA service's replication algorithm and allows the configuring of several parameters related - to its behavior. - The related information and parameters include: - - - The name of the service. - - - The binded name for the MBean. The name can be changed. - - - The number of replicated messages sent by the algorithm to the cluster's replicas. - - - The average size of the replicated messages sent. - - - The total size of the replicated messages sent. - - - The current JGroups configuration file name used. - - - The current timeout established to clean memory information related - to SFSBs required by the algorithm. When this timeout expires, the information is garbage-collected. - This avoids increasing the memory used by the algorithm. The administrator can set a different timeout if required. - - - The datasource name required by the algorithm to keep track of current running transactions (See Transaction Table Configuration section above). - The default datasource is set through the "jonas.service.ha.datasource" parameter in the "jonas.properties" configuration file, but the administrator can configure different datasources and can set here, the name of the one that will be used by the algorithm, once JOnAS has started. - - It is recommended not to change the Datasource once the HA service is running. - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/principles/clustering.xml b/jonas_doc/core/src/docbook/doc-en/clustering/principles/clustering.xml deleted file mode 100644 index 7f3e6bfc4ee91085c61a90406cdd987adbb8c6a8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/principles/clustering.xml +++ /dev/null @@ -1,516 +0,0 @@ - -
    - - Load-balancing and high availability - - -
    - - Farming for scalability - - - The scalability of a system lies in its capacity to evolve in power by adding or removing software and - hardware elements without impact on its architecture. - - The scalability aims at adjusting the system bandwidth to fit with the performance needs of the service. - It is achieved by replicating the resources within a farm according to the input requests load. - -
    - -
    - - Farming for availability - - - Farming provides a first level of availability: when a resource failure occurs, the request will be - submitted again (fail-over mechanism) and will be routed towards another resource. In this case, the failure is not transparent to - the user whose request is processed by the failed resource. But the service is not interrupted as - the user can restart its operation. For the users whose requests are processed by other resources within the farm, - the failure will be transparent and the only impact will be the response time due to load distributing - among a smaller number of resources. - -
    - -
    - - Clustering for high availability - - - The high availability of a system lies in its capacity to serve requests under heavy load and despite - any component failure. - - A highly available architecture contains some replicated elements. The number of replicas determines - the number of simultaneous failures the system is able to tolerate without interruption of service. According - to the fail over implementation, the service may be damaged during a short period. This service malfunction - may impact users at different levels. - - Replication mechanisms contribute to the continuity of service and enable to mask the resources failures to the users - (or at least to minimize their visibility). Such mechanisms do impact the system sizing as they consume more resources - or for a same sizing do impact the global performance. - -
    - -
    - - HTTP/WEB farm - - -
    - - Rationale - - - - Ensuring the scalability of a web application - Improving the availability of a web application (without session replication) - - - HTTP farming consists in distributing the processing load across N JOnAS instances. - The same application is deployed all over the cluster and a request may be processed by any instance. - -
    -
    - - Principle - - A load-balancer is setup in front of the JOnAS instances. The intermediate device - handles the site url in order to mask the JOnAS instances multiplicity to the users. The load-balancer - supports the HTTP session affinity in order to route a client towards the server hosting its session. - - A load-balancer may be a software or a hardware device or a mix of two. The application server instances - may be collocated on a same machine or may be distributed across several machines. - - The intermediate device may be duplicated for avoiding a SPOF. - - Hereinafter the figure illustrates a HTTP farm composed of a L4 switch, 2 Apache servers and N JOnAS instances. - - - - - - - - - The Apache server is configured with the mod_jk plugin for ensuring the load-balancing between the JOnAS instances - and the session affinity through the AJP protocol. Furthermore mod_jk supports the failover when a server crashes. The Apache server may be - used for caching the static pages, performing compression or encryption and, thus, can reduce the application servers - load. - - - From Apache 2.2, mod_proxy_balancer is alternative to the mod_jk plugin. It supports AJP protocol but also HTTP and FTP. - - - The number of JOnAS instances must be determined according to the expected performance. - The Apache server being a SPOF, it should be duplicated and a network device distributes the load at the TCP level - between them. Of course the network device should be replicated as well (primary/backup mode). - - -
    -
    - - Use case - - HTTP farming is very common and widespread. It fits well with the more frequent requirements in terms - of scalability and availability. Furthermore, this architecture pattern can be used for implementing a - cluster of web service providing that the web service is standard and is stateless. - - When the application server tier gets a bottleneck, this architecture enables to improve the performance - by adding some JOnAS instances. - - The application server may be unstable, in particular under heavy load. This architecture enables to - improve the availability by reducing the impact of failures. However the failures are not transparent - to the users who are connected to the in-fault server since they lose theirs sessions. To be note that - after a crash, the load is distributed between the survivors servers what may impact the performance. - -
    - -
    - -
    - - HTTP/WEB cluster - - -
    - - Rationale - - - HTTP clustering is used when service continuity of web application is expected and when failures must be - transparent for the users. It consists in replicating the HTTP sessions on P JOnAS instances - among N. - -
    -
    - - Principle - - The session context is replicated across a replication domain. Domain members are met through a multicast based protocol. - The session replication takes place through point to point protocol (TCP based) and the replication mode can be synchronous - (the user response is sent after the replication) or asynchronous (the user response is immediate and the replication is delayed). - - Hereinafter the figure illustrates cluster with 4 JOnAS instances behind an Apache server. Requests are load-balanced across the 4 - instances . The jk connector handles the session affinity and ensures that all the requests related to one session are routed towards the same - instance. 2 replication domain are defined and each session is replicated on 2 JOnAS instances hosting by 2 different nodes for ensuring - not to lose a session when a crash node occurs. - - - - - - - - - The Apache server can be duplicated for avoiding a SPOF. - - - Such a configuration lies both in the Apache/jk elements (related to the load-balancing) and in the JOnAS instances (related to - the session replication). - - At the jk level, a load-balancer worker is defined with 4 AJP workers. Session affinity is set and two domains are configured. - At the JOnAS level, the tomcat6-server.xml file defines an AJP connector, a jvmRoute attribute set to a hosting domain and - a cluster element for the replication. To be noted that the web application meta-data must be defined as distributable through the distributable - element. - - - - From Apache 2.2, mod_proxy_balancer is alternative to the mod_jk plugin. It supports AJP protocol but also HTTP and FTP. - - -
    -
    - - Use case - - HTTP clustering must be used only when the HTTP session loss is not acceptable. A server failure is visible only for the connected users who have an on-going request processed by the failed instance. - The fault will be transient, the request will be sent towards another server which hosts a backup of the session. - - The HTTP session replication impacts the performance and causes an overhead on the system resources consumption (memory. network, cpu). Moreover, the replication - in a synchronous mode induces an extra latency. - - For reducing the performance impact, it is recommended to use a dedicated network interface for the HTTP session replication (separated from the AJP requests) and to limitate - the replication across 2 JOnAS instances (replication domain). - -
    -
    - -
    - - EJB farm - - -
    - - Rationale - - - EJB farming aims at providing: - - - scalability of the EJB tier - availability of the EJB tier (without session replication) - - - EJB2 and EJB3 farming are supported by JOnAS. - - The EJB tier duplication is not visible for the client. - -
    -
    - - Principle - - EJB farming relies on the CMI component which enables clustering on top of different RMI protocols such as - jrmp, iiop or irmi. - - When a client program intends to access an EJB, it invokes a JNDI registry lookup for getting an EJB home or EJB remote proxy. - In an EJB farm, the CMI registry is replicated in order to provide a cluster view to the client. The cluster view represents a - a list of JOnAS nodes hosting the EJB with additional clustering meta-datas. The replication and the - group membership rely on the JGroups's group communication protocol. The cluster view is updated dynamically - through a control channel and a dedicated control thread in the client JVM. The CMI client proxy ensures the load-balancing and the - fail-over of the EJB invocations. - - In the clustering meta-datas, the cluster logic defines both the load-balancing and fail-over algorithms. - The cluster logic can be customized. A set of default policies - are provided with CMI: round-robin, first available, random, etc... For each one, a strategy can be added, for example, - local preference (for dealing with the collocated mode) - or weighted round-robin (for adding a weighting). - - Hereinafter the figure illustrates a EJB farm in a 2 tier architecture with both web client and java client. - - - - - - - - - The Apache server is configured with the mod_jk plugin for ensuring the load-balancing between the JOnAS instances - and the session affinity. Two JOnAS instances (1-2) host the presentation layer and are configured with a servlet - container. Two JOnAS instances (3-4) host the business layer and are configured with an ejb container. The CMI registry - is replicated across the cluster members in order to share informations about EJBs deployment and topology. Both servlet - and java clients do access to EJB and do benefit from load-balancing and availability. In the case of a SFSB (stateful session bean), - the EJB is created only in one instance and the state is lost if the JOnAS instance crashes, state replication is addressed in - . - - - The JOnAS instances number must be determined according to the expected performance. - - -
    -
    - - Use case - - - This architecture pattern is used either when the ejb tier is separated from the web tier and/or when ejb client are fat java programs. - -
    -
    - -
    - EJB distribution - -
    - Rationale - - EJB distribution aims at deploy a JavaEE application which is distributed on many JOnAS instances. -
    - -
    - - Principle - - - EJB distribution also relies on the CMI component. - - Without CMI, EJB needs to be modified to allow invocations on the remote EJBs, for example by setting the Context.PROVIDER_URL - of the remote registries or by using the specific features of the IIOP protocol. With CMI, EJB can continue to access to the remote EJBs - as if they were locally deployed. - -
    - -
    - - Use case - - - - This architecture pattern is used on the EJB tier. - - -
    -
    - -
    - - EJB cluster - - -
    - - Rationale - - - EJB clustering is used when service continuity of ejb application is required and when any failure must be - transparent for the users. It relies on the stateful EJB replication and manages the transaction in order to: - - - ensure that the replicated system do have a similar behavior of the not replicated one, - in case the client doesn't abort, the transaction is executed exactly once, and no more than once otherwise. - - -
    -
    - - Principle - - The EJB replication relies on - - a mechanism for replicating the state of the EJBs and the business methods invocation return values. This mechanism - is provided by the HA service and different implementations do exist (JGroups) or are under development (Terracotta, Pair replication); - - a mechanism for marking the transaction in a persistent database. The information is used at the fail-over time to determine - whether the transaction was aborted and whether the request must be replayed. - a smart proxy in charge of redirecting the client calls towards another replica when a failure occurs. - - - An EJB is replicated only if it is specified as replicated in the component meta-datas (annotation and/or deployment descriptor). - - A stateful ejb is created on a JOnAS instance selected according to a load-balancing algorithm (default is round-robin). After the creation - all the business methods invocations are routed to this JOnAS instance unless a failure occurs. - - Hereinafter the figure illustrates a EJB cluster. - - - - - - - - - Each JOnAS instance of the EJB tier is configured with the HA service in charge of the session replication. CMI client API supports - fail-over for both EJB2 and EJB3. - -
    -
    - - Use case - - This architecture pattern is recommended when the application contains some stateful EJB and doesn't tolerate - any session loss and any interruption of service. However the user must be aware that this kind of setting does impact - highly the performance as the session is replicated between the JOnAS server at each method call. - -
    - -
    - -
    - - JMS farm - - -
    - - Rationale - - - - JMS Farming aims at: - - - ensuring the scalability of asynchonous applications, - improving the availability of asynchonous applications. - - - JMS farming consists in distributing the messages load across N JOnAS instances. - The same application is deployed all over the cluster and a message may be processed by any instances. - -
    -
    - - Principle - - JMS farming relies on the distribution capabilities of the JORAM product. Load-balancing can take place both - at the server side or at the client side. When a server crashes, pending messages are lost unless a specific mechanism - is set up at the disk level (such mechanisms are addressed in ). - - At the server side, messages can be redirected towards other JOnAS instances when the load reaches a threshold. - - Hereinafter the figure illustrates a JMS farming with a distribution control at the server side. - - - - - - - - - At the client side, messages can be distributed across a set of JOnAS instances according to a load-balancing algorithm (default is random). - - - Hereinafter the figure illustrates a JMS farming with a distribution control at the client side. - - - - - - - - -
    -
    - - Use case - - JMS farming fits well with the need of scalability and availability of the EDA (Event Driven Architecture) applications. When - the application provides a JMS based asynchronous interface, the JORAM's clustering capabilities do enable to equilibrate the load - either from the client side or from the server side. JMS farming is recommended when the message loss is acceptable and constitutes - a good compromise in terms of performance and flexibility. - -
    -
    - -
    - - JMS cluster - - -
    - - Rationale - - - JMS cluster is used when the messages loss is not acceptable and when the interruption of service is not permitted. - -
    -
    - - Principle - - Two solutions are available for ensuring the messaging high availability with JOnAS: - - - through the persistent mode of JORAM combined with some cluster features at the operating system level (NFS, HA/CMP product, Veritas product, ...). - The HA OS must provide a HA network address (virtual ip address) which can be reallocated dynamically when a node failure occurs. JMS objects, topics - and queues, must be stored on a shared disk space (external disk array or shared disk space as NFS). JORAM supports 2 storage types : file and database. - When a JOnAS instance fails, the on-going messages are retrieved by a backup instance in the persistent storage, the virtual IP address - is bound to the backup node and the messages are processed. - - - - - - - - - - through JORAM HA concept delivered with the JORAM project. The mechanism relies on a Master/Slaves approach. At one point, only the master instance - is active and all the JMS requests are replicated towards the slaves instances. The JMS replication is synchronous and implemented with JGroups. - - - - - - - - - - -
    -
    - - Use case - - This architecture pattern is recommended when the application doesn't tolerate any message loss and any interruption of service. - Two mechanisms are available: the first one relies on operating system HA features and the JORAM's persistent mode whereas the second one - relies on the native JORAM capabilities and a replication of the JMS requests. - In case of the underlying OS provides HA features, the first solution is simpler in term of configuration and provides better performance. - Otherwise JORAM HA solution can be considered and the user must pay attention to the performance impact. -
    - -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/principles/management.xml b/jonas_doc/core/src/docbook/doc-en/clustering/principles/management.xml deleted file mode 100644 index c61ba1672cda16e46ef4943ecd5c15c611b5faa2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/principles/management.xml +++ /dev/null @@ -1,246 +0,0 @@ - -
    - - Management - - -
    - - Domain management - - - Each JOnAS instance can be managed through a local jonasAdmin console. The domain management - enables to manage a set of JOnAS instances from a centralized jonasAdmin console. - - A domain is a set of JOnAS instances that are running under the same management authority. The instances within - a domain can be standalone, distributed or gathered in a cluster as well. The instances are managed from an unique console - deployed in a dedicated JOnAS instance named master, configured with the domain management enabled. - - Domain management is composed of the following features: - - discovery service for detecting automatically the instances and the clusters. - JOnAS instance and cluster monitoring for maintaining a JOnAS instance state view and a cluster view as well as - for tracking some indicators. - JOnAS instance control for remote starting or remote stopping of the JOnAS instances. - domain-wide deployment for deploying Java EE modules across a set of JOnAS instances or clusters. - instance configuration for setting or retrieving a configuration attribute from a JOnAS instance as available through - a local jonasAdmin console. - - Several interfaces are provided: - - console with the centralized jonasAdmin console. - command with the jonas admin command which has been extended to deal with domain. - JMX through some domain management MBeans. - - - The domain management is optional. When enabled, JOnAS instance within a domain must have an uniq name instance. - -
    - -
    - - Domain management architecture - - - The domain management relies on: - - MBeans objects deployed in each JOnAS instance and accessible through the JMX remote interface. - One or several management JOnAS instances masters hosting the domain management features. - Optionaly some cluster daemons enabling to control remotely the JOnAS instances. - - - - - - - - -
    - - Master instance - - - A dedicated JOnAS is assigned with the master role which enables the domain management feature. The jonasAdmin console is deployed - in this instance and is no more necessary in the others ones. - - The domain management functions are exposed through a set of MBeans that are used by the jonasAdmin console. - - The master instance interacts with the managed JOnAS instances and the cluster daemons through JMX. The master node periodically polls - the managed instances for providing states and statistics. - - Several master instances can be defined for high availability, only one must be enabled at one point. - -
    - -
    - - Cluster daemon - - - The cluster daemon is in charge of controlling the JOnAS instances (start/stop) that are collocated on the same machine. It is an optional component - in the domain management infrastructure and can be added on an existing configuration. - - It is accessible through a JMX Remote interface and provides the start/stop operations. By default, it relies on the native JOnAS command for - driving the JOnAS instances. The user may put its own commands for setting a particular environment before starting/stopping a JOnAS node. - -
    - -
    - - Managed instance - - - The managed JOnAS instances must respect some conventions for domain management: - - - the managed instance must be aware of the domain. - the managed instance must have an unique name in the domain. - - - Both domain name and instance name are specified in the starting command: - jonas start -n instance_name -Ddomain.name=domain_name. - -
    - -
    - - Discovery service - - - The discovery service aims at detecting when a new JOnAS instance appears or when a JOnAS instance leaves the domain. It enables - the master instance to retrieve the managed instances without any prior informations about them. - - Two implementations of the discovery service are available (the choice is done by configuration): - - a IP multicast based implementation. - a JGroups based implementation. The group communication protocol stack can be configured on top of UDP - or TCP. - - The first one relies on IP multicast whereas the second one uses point to point communication. - If the managed instances cannot be discovered automatically due to the network configuration or the administration policies, the domain - topology can be described statically in the domain.xml file. - -
    - -
    - - Administration interfaces - - - JOnAS provides different administration interfaces: - - a graphical console with jonasAdmin console that can be centralized if deployed in the master instance. - a jonas admin command has been extended for supporting the domain management feature (remote control, cluster-wide - deployment and so on. - a JMX interface through the JOnAS MBeans. - a EJB interface through the mejb. - a Web Service interface through the mejb. - - - -
    - -
    - -
    - - Cluster management - - - For the management point of view, a cluster is a group of JOnAS instances. The JOnAS instances within a - cluster are called cluster members. A JOnAS instance may be a member of several clusters in the domain. - - A cluster is an administration target in the domain: from the common - administration point of view, the administrator may monitor the cluster or apply to it management operations like - deploy or undeploy of applications. - - There are two main cluster categories: - - - - Clusters containing instances that are grouped together only to - facilitate management tasks. - - - - Clusters containing instances that are grouped together to achieve - objectives like scalability, high availability or failover. - - - - The clusters in the first category, called , - are created by the domain administrator based on his/her particular needs. The - grouping of servers (the cluster creation) can be done even though the - servers are running. - - In the second case, the servers which compose a cluster must have a - particular configuration that allows them to achieve the expected - objectives. Once servers are started, the management domain feature is able to - automatically detect that they are cluster instances, based on configuration - criteria and MBeans discovery. Several cluster types are supported by the domain - management function. They correspond to the different roles a cluster can - play: - - - - - allow HTTP request load balancing - and failover based on the mod_jk Apache connector. - - - - - allow high availability at - web level based on the Tomcat HTTP session replication solution. - - - - - enable JNDI clustering and - allows load balancing at EJB level, based on the CMI protocol - - - - - allow stateful session bean high availability. - - - - - allow JMS destinations - scalability based on the JORAM distributed solution. - - - - - allow JMS destinations high - availability based on JORAM HA. - - -
    - -
    - - JASMINe project - - - Advanced administration features are provided through the JASMINe project: - - JASMINe Design for building a cluster configuration through a graphical interface. - JASMINe Deploy both for deploying the middleware and the applications across a distributed infrastructure. - JASMINe Monitoring for helping the operator to detect errors and for tracking the performance. - JASMINe SelfManagement for improving the system reliability and performance automatically. - - -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/principles/terminology.xml b/jonas_doc/core/src/docbook/doc-en/clustering/principles/terminology.xml deleted file mode 100644 index 4e0ce9ae98c7f3b9e41a602fa0e086b5fa1dabdd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/principles/terminology.xml +++ /dev/null @@ -1,85 +0,0 @@ - -
    - - Terminology - - -
    - - Farm - - - A farm is a set of similar JOnAS nodes gathered for ensuring scalability and a first level of availability. - -
    - -
    - - Cluster - - - A cluster is a set of similar JOnAS nodes gathered for ensuring high availablity. - - note: the cluster term can be used in a more general sense which covers both the scalability - and high availability aspects - - -
    - -
    - - Replication domain - - - A replication domain is a subset of a JOnAS cluster which determines the replication boundaries. - The concept ensures the scalability of the replication when dealing with a large number of nodes. - -
    - -
    - - JOnAS node - - - A JOnAS node or JOnAS instance is an autonomous server with its - own configuration and running in a dedicated JVM. Several JOnAS nodes may lie in the same - virtual or real system. - -
    - -
    - - JOnAS domain - - - A JOnAS domain gathers a set of JOnAS nodes under the same administration authority. - A domain is defined by a name and the JOnAS nodes belonging to a domain must have an unique name within this domain. - -
    - -
    - - Master node - - - A master node is a JOnAS node of a domain dedicated to the administration. It enables to - manage the JOnAS instances of a domain from a centralized point. Several master nodes can be defined within a domain. - -
    - -
    - - SPOF - - - SPOF stands for Single Point Of Failure. - -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/tooling/jasmine.xml b/jonas_doc/core/src/docbook/doc-en/clustering/tooling/jasmine.xml deleted file mode 100644 index 4a9a03e34a9661035838d4975e2334e7a9a8c4fd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/tooling/jasmine.xml +++ /dev/null @@ -1,154 +0,0 @@ - -
    - - JASMINe - - -
    - - Introduction - - - JASMINe is an OW2 project (http://jasmine.ow2.org) aiming at - developing an advanced administration tool for SOA platform and Java EE - cluster. JASMINe supports both JOnAS 4 and JOnAS 5. JASMINe provides the - following features : - - JASMINe Design: a GUI tool for building a - distributed configuration such as JOnAS cluster and storing it into - an EMF format. - - - - JASMINe Deploy: framework for ensuring - - - the middleware deployment from a model built with - JASMINe Design. The solution relies on Jade for the push mode. - Jade is an open source framework for building autonomic system - and provides a deploy functionality. Push mode means that the - middleware is deployed from a centralized point (jade boot) - towards a distributed infrastructure (set of jade nodes). In - the push mode, the deployment is triggered by the centralized - point whereas the deployment is controlled from the - distributed infrastructure in the pull mode. Pull mode is - supported through a script getting the configuration - description through an URL. - - - - the client migration between either different - application versions hosted within a same JOnAS instance or - different middleware instances distributed against different - machines (virtual or not). - - - - - - JASMINe Monitoring: set of tools for - - - monitoring the performance. A event processing - infrastructure is provided for collecting and storing - monitoring datas and for visualizing some indicators into a - Web 2.0 console. - - - - detecting errors. A rules engine is connected to the - event infrastructure and enables to implement some error - detections rules which may generates some alerts for notifying - the operator when a fault is encountered. - - - - - - JASMINe Self-Management: some autonomic - managers which implement some self-healing and self-optimization - operations. Examples of such rules are load-balancer optimizer - according to the current node load or the memory leak recovery by a - JVM reboot. - - -
    - -
    - - JASMINe Design - - - JASMINe Design enables to describe a distributed middleware - configuration through a Eclipse EMF/GMF graphical interface. Typically you - may define your JOnAS cluster configuration with an Apache frontal, some - web level instances, some ejb level instances and a database. The tools - provides some wizards for managing some resources such as the port - numbers, the instance names and so on. - - - - - - - - Once the configuration is built, JASMINe deploy is used for - deploying it against a physical or virtual infrastructure. - - See the JASMINe project - web site for more detailed information and for getting the - tool. -
    - -
    - - JASMINe Monitoring - - - JASMINe Monitoring provides an infrastructure for supervizing a - JOnAS distributed configuration with: - - A JMX probe, named MBeanCmd, for - collecting monitoring data through a JMX interface. Some built-in - options are provided for getting some well-known application server - indicators such as the transaction throughput or the current HTTP - session number. - - - - A events mediation infrastructure enabling to gather, - aggregate, filter and store the monitoring events. - - - - A Web 2.0 console (Eos console) enabling to track the - performance into graphics. - - - - A rules engine providing to the user the capacity to implement - its own policy administration rules for detecting errors. - - - - - - - - - - See the JASMINe project - web site for more detailed information and for getting the - tool. -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/clustering/tooling/jkmanager.xml b/jonas_doc/core/src/docbook/doc-en/clustering/tooling/jkmanager.xml deleted file mode 100644 index 552c2219945ddb65aabd5609a206181108798410..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering/tooling/jkmanager.xml +++ /dev/null @@ -1,52 +0,0 @@ - -
    - - Jk Manager - - -
    - - Introduction - - - Jk Manager is an administration tool (graphical interface and API) - for the Apache mod_jk plugin providing : - - some monitoring informations such as statistics and status - about the workers. - - - - some operations such as the smooth worker disabling. - - -
    - -
    - - Download and configuration - - - See the - Apache Tomcat Connector web site for getting and installing - mod_jk. - - Refer to for information about the - configuration. - - - - - - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/clustering_guide.xml b/jonas_doc/core/src/docbook/doc-en/clustering_guide.xml deleted file mode 100644 index a602abbcceab9fc3a18cb8d9bc0cb73d49f95138..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/clustering_guide.xml +++ /dev/null @@ -1,254 +0,0 @@ - - - - JOnAS Clustering guide - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - March 2009 - - - - Preface - At first, this guide gives an overview of the Java EE clustering - principles. Afterwards it describes how to set up clustering in the JOnAS - application server and how to manage it. Finally some tools and examples - are presented. - - - - - Introduction - - - JOnAS provides an end to end solution for clustering that ensures - transparent distribution, high availability and scalability of Java EE applications. - - - At the web level through - - Apache/mod_jk or Apache/mod_proxy_balancer for - load-balancing the HTTP flow between multiple JOnAS/Tomcat - instances. - - Tomcat for providing a TCP-based solution of HTTP session - replication, ensuring their high availability - - - At the JNDI level through CMI and its replicated - registry - - At the EJB level (EJB2 and EJB3 support) through CMI and its - cluster proxy - - At the JMS level through JORAM server and JORAM HA - - At the management level through the domain management feature - and the JASMINe - project. - - - - - - - - - - - - - - Principles - - - - - - - - - - - - Cluster configuration - - - - - - - - - - - - Cluster and domain management - - - - - - - - - - - - - - - - Tooling - - - - - - - - - - - - Examples - - - - - - - - - - Troubleshootings - - - - - - - - Appendix - - -
    - - CMI project documentation - - - This section describes the CMI use in a standalone mode (outside - the application server). - -
    - - CMI configuration - - - -
    - -
    - - CMI use - - - -
    - -
    - - CMI administration - - - -
    - - -
    - -
    - - References - - - - - Tomcat - Connectors howto - - - - Tomcat - workers Howto - - - - Apache - JServ Protocol version 1.3 (ajp13) - - - - Apache - - Tomcat HOWTO - - - - Apache - + Tomcat + Load Balancing - - - - Tomcat - 6.0 Clustering - - - - Apache - 2.2/mod_proxy_balancer - - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/META-INF/MANIFEST.MF b/jonas_doc/core/src/docbook/doc-en/cmi/META-INF/MANIFEST.MF deleted file mode 100644 index 8636f14630ad7d571d0d7b916363518361165638..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/cmi/META-INF/MANIFEST.MF +++ /dev/null @@ -1,6 +0,0 @@ -Manifest-Version: 1.0 -Archiver-Version: Plexus Archiver -Created-By: Apache Maven -Built-By: benoitf -Build-Jdk: 1.5.0_15 - diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/META-INF/maven/org.ow2.cmi.doc/cmi-doc/pom.properties b/jonas_doc/core/src/docbook/doc-en/cmi/META-INF/maven/org.ow2.cmi.doc/cmi-doc/pom.properties deleted file mode 100644 index 939961c0049b43aa3d3dbf0be66d55e48021445c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/cmi/META-INF/maven/org.ow2.cmi.doc/cmi-doc/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Mon Feb 09 16:36:26 CET 2009 -version=2.1.2 -groupId=org.ow2.cmi.doc -artifactId=cmi-doc diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/META-INF/maven/org.ow2.cmi.doc/cmi-doc/pom.xml b/jonas_doc/core/src/docbook/doc-en/cmi/META-INF/maven/org.ow2.cmi.doc/cmi-doc/pom.xml deleted file mode 100644 index 4e3a80256193fa2c94befa8c61c4eb3f087dbf6f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/cmi/META-INF/maven/org.ow2.cmi.doc/cmi-doc/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - cmi - org.ow2.cmi - 2.1.2 - - 4.0.0 - org.ow2.cmi.doc - cmi-doc - jar - CMI Documentation - 2.1.2 - - - scm:svn:svn://svn.forge.objectweb.org/svnroot/cmi/tags/CMI_DOC_2_1_2 - scm:svn:svn+ssh://benoitf@svn.forge.objectweb.org/svnroot/cmi/tags/CMI_DOC_2_1_2 - scm:svn:svn+ssh://benoitf@svn.forge.objectweb.org/svnroot/cmi/tags/CMI_DOC_2_1_2 - - - - - doc-en - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/developerguide.xml b/jonas_doc/core/src/docbook/doc-en/cmi/developerguide.xml deleted file mode 100644 index 9cef1e276b2f16e624db9338125c5363dbf24aca..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/cmi/developerguide.xml +++ /dev/null @@ -1,375 +0,0 @@ - - - - - CMI Developer Guide - - - - Bouzonnet - - Loris - - - JOnAS Team - - - - 2007 - - OW2 Consortium - - - - The CMI developer guide is intended for developers wanting to work - with the source distribution of CMI. People wanted to contribute to CMI - should read this documentation. - - - August 2007 - - CMI - - 2.0.0 - - - - - - - - $Id: developerguide.xml 1254 2007-08-31 18:43:02Z loris - $ - - - - Design - - This section describes the design of CMI.. - -
    - The interceptions in CMI - - Interceptions allow to modify transparently an action performed by - an user. In CMI, she occurs at two moments: - - - - Reading/writing into a registry ; - - The JNDI context defined by the class - org.ow2.carol.cmi.jndi.context.CMIContext - intercepts the accesses to the registries. - - An instance of - org.ow2.carol.cmi.jndi.context.CMIContext is - for a given protocol (e.g. jrmp, - iiop or irmi). - - Instances of - org.ow2.carol.cmi.jndi.context.CMIContext can - wrap an object having as interface - javax.naming.Context when writings - (on a local registry) are needed. - - - - Invocation of methods on a clustered object. - - The proxy defined by the interface - org.ow2.carol.cmi.rpc.CMIProxy - intercepts the invocations of methods on a clustered object. - - - - Each interceptor references the single instance of manager that - belongs to the JVM. -
    - -
    - The managers of the cluster view - - They implement the interface - org.ow2.carol.cmi.controller.common.ClusterViewManager. - An object implementing this interface must be a singleton. So several - contexts, in one or several threads, share the same manager, and avoids - network traffic. - - The following schema displays this: - - - - - - - - Content of one JVM - - - While a manager of the cluster view is a singleton, - several instances of CMIContext can be instanced in a same - JVM. - - If a context is for a given protocol, the managers (located on - the server-side) handle equally all protocols. - It exits two kinds of manager: - - - - Client-side manager (that implements - org.ow2.carol.cmi.controller.client.ClientClusterViewManager) - ; - - They are specific at a protocol, and pull periodically the - cluster view from a manager located on the server-side. They cannot - modify the cluster view. - - - - Server-side manager (that implements - org.ow2.carol.cmi.controller.server.ServerClusterViewManager). - - They are not specific for a protocol, and can either pull or - push the cluster view from an another manager located on the - server-side. They can modify the cluster view. The default - implementation uses JGroups but a SPI allows to modify it (see the last chapter). - - - -
    - Load-balancing - - Unlike the previous version of CMI, the choice of a server is - done among a list of references, and no more a list of stubs. The next - section describes the introduced types of reference. - -
    - Modeling of the objects eligible at load-balancing - - The interface - org.ow2.carol.cmi.lb.LoadBalanceable - is the common interface for references. There are two kinds of - reference: - - - - The class - org.ow2.carol.cmi.reference.ServerRef - models a reference on a server or a regstry ; - - - - The class - org.ow2.carol.cmi.reference.CMIReference - models a reference on an instance (in the cluster) of a - clustered object. - - An instance of this class is the aggregation of a name of - object with an instance of the class - org.ow2.carol.cmi.reference.ServerRef. - - - - The following schema shows the mentioned dependencies: - - - - - - - The interface - org.ow2.carol.cmi.lb.LoadBalanceable - and its implementations - -
    - -
    - The policies - - Policies provide a method to choose one reference among a - list. They also provide methods to ensure failover when the chosen - reference is not valid. -
    - -
    - The strategies - - Strategies are a common property of all policies, so as any - properties, they are optional. Because strategies are applied before - policies, they allow to modify policies. Strategies provide a method - to choose a list of references among an other list of - references. -
    - -
    - The properties - - Unlike strategies that are a common property, each policy can - have specific properties. -
    - -
    - Setting and updating these data - - These data are set initially at the deployment of a clustered - object. Next thy can be updated dynamically by using the MBean - having as interface - org.ow2.carol.cmi.admin.CMIAdminMBean. -
    -
    - -
    - Reading a registry - - When the operation lookup(Name) is - performed, the interceptor-context checks if the given name - corresponds to a clustered object. - - - - If it does, an other interceptor (that implements the - interface - org.ow2.carol.cmi.rpc.CMIProxy) is - returned to the client. - - At this time, no access to the remote registry is - done. - - - - If it doesn't, the interceptor-context selects, either a - remote registry for a client, or the local registry for a server, - and throws the call. - - - - When the operations list(Name) and - listBindings(Name) are performed, the - interceptor-context selects, either a remote registry for a client, or - the local registry for a server, and throws the call. - - - A context is also a clustered object (only for clients) in - order to provide a load-balancing of the readings into the - registry. - - This feature is not available on a server, because the - objects that are not clustered are always accessed from the local - registry. - -
    - -
    - Adding a clustered object - - When the operations bind(Name, - Object)or rebind(Name, Object) - are performed, the interceptor-context checks if the given object - corresponds to a clustered object. Three cases are possibles: - - - - The object implements the interface - org.ow2.carol.cmi.jndi.ClusteredObject - ; - - - - The object doesn't implement the interface - org.ow2.carol.cmi.jndi.ClusteredObject - but is registered in the repository defined by the class - org.ow2.carol.cmi.info.CMIInfoRepository - ; - - - - None of these two cases. - - - - In the two first cases, the object is clustered, but in the last - it is not. -
    - -
    - Invoking a method on a clustered object - - An instance of - org.ow2.carol.cmi.rpc.CMIProxy intercepts - invocations of method on a clustered object. The handler for these - invocations is defined by the class - org.ow2.carol.cmi.rpc.CMIInvocationHandler. In - a first time, a server is chosen thanks to the policy and strategy of - load-balancing that were defined by the administrator. We see the - chapter 3 how to define these. Once the server is chosen, a surrogate - (a stub or a proxy) is needed to allow the invocation. Each manager of - the cluster view maintains a pool of such surrogates. - - The following figure illustrates the step of an invocation, when - the surrogate is missing from the pool: - - - - - - - - Lazy-lookup - - - Firstly, the proxy tries to get the surrogate for a - given clustered object and a given server.Next, - because the pool doesn't contain the surrogate, it downloads this - by performing a lookup onto a registry.Finally, he - surrogate is kept in the pool and the proxy can invoke the method - of the clustered object. - -
    - -
    - About Carol - - Carol provides a full support of multiprotocols, while CMI uses - one protocol by JVM. Carol has also a service provider interface to - define interceptors with jrmp. These are some good - reasons to uses CMI embedded in Carol. - - - It is possible to force CMI to use many protocols in a same - JVM. The following example shows the manner: - - - Forcing CMI to use many protocols in a same JVM - - JNDIConfig.setProtocol("jrmp"); -MyPRO myPROjrmp = new MyPRO(); -JNDIConfig.setProtocol("iiop"); -MyPRO myPROiiop = new MyPRO(); - - MyPRO extends the class - javax.rmi.PortableRemoteObject. The - call at the method - setProtocol(String) changes the - protocol to uses when exporting an instance of - MyPRO. - - -
    -
    -
    - - - Providing an other implementation of the - managers - - CMI provides a service provider interface to allow the use of an - other implementation of the managers of the cluster view. At this time, - only the implementation of the interface - org.ow2.carol.cmi.controller.server.ServerClusterViewManager - can be changed by specifying a new name of class for the property - cmi.server.impl.class. - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/images/algoexample.png b/jonas_doc/core/src/docbook/doc-en/cmi/images/algoexample.png deleted file mode 100644 index 27d2c127cf47bd0508e4de4ec67ec397f8c26139..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/cmi/images/algoexample.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/images/algomodel.png b/jonas_doc/core/src/docbook/doc-en/cmi/images/algomodel.png deleted file mode 100644 index 33ec5af042232ac8163e4956e2ca4347f8e0fa0a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/cmi/images/algomodel.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/images/contents_of_jvm.png b/jonas_doc/core/src/docbook/doc-en/cmi/images/contents_of_jvm.png deleted file mode 100644 index 93417d21a5714776e5279a928e8817dd5fb9bdb2..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/cmi/images/contents_of_jvm.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/images/interfaces.png b/jonas_doc/core/src/docbook/doc-en/cmi/images/interfaces.png deleted file mode 100644 index 0c0f92055acb62320dca6e9682a2757cd04b2da8..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/cmi/images/interfaces.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/images/lazy_lookup.png b/jonas_doc/core/src/docbook/doc-en/cmi/images/lazy_lookup.png deleted file mode 100644 index 15020e602222000457422d94e8c2065ac5f7fcdb..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/cmi/images/lazy_lookup.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/images/load_balanceables.png b/jonas_doc/core/src/docbook/doc-en/cmi/images/load_balanceables.png deleted file mode 100644 index b53df71205ba4e6e04546692eeb0ea405e2c16f0..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/cmi/images/load_balanceables.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/images/logo-cmi.png b/jonas_doc/core/src/docbook/doc-en/cmi/images/logo-cmi.png deleted file mode 100644 index be21e96921eeded166a04b4ebd3ae21fbf97f313..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/cmi/images/logo-cmi.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/images/managers.png b/jonas_doc/core/src/docbook/doc-en/cmi/images/managers.png deleted file mode 100644 index f281f1d0dcb2331040205b3a08840aca90381d37..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/cmi/images/managers.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/images/sep_control_service.png b/jonas_doc/core/src/docbook/doc-en/cmi/images/sep_control_service.png deleted file mode 100644 index 962a6110699f27ec2333531d07d1818bd4178a45..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/cmi/images/sep_control_service.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/integratorguide.xml b/jonas_doc/core/src/docbook/doc-en/cmi/integratorguide.xml deleted file mode 100644 index 46f7516038c4b629162450cbbc55c1c083e674b7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/cmi/integratorguide.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - CMI Integrator Guide - - - - Bouzonnet - - Loris - - - JOnAS Team - - - - 2007 - - OW2 Consortium - - - - The CMI integration guide is intended for developers wanting to - integrate CMI into their product. - - - August 2007 - - CMI - - 2.0.0 - - - - - - - - $Id: integratorguide.xml 1254 2007-08-31 18:43:02Z loris - $ - - - - Targeted people - - This guide describes the manner of integrating CMI in an other - product. So the targeted people are the developers of this product. - - In a first time, the API for them will be introduced and next, some - examples of real integration will be given. - - - - The API for integrators - - The API can be divided in two independent parts: - - - - an API to aggregate the CMI metadata of a clustered - object; - - - - an API to add data for replication between server-side - managers. - - - - - CMI metadata are added for replication while a bind to the - context (by interception), so the second API is not in purpose of - this. - - -
    - API to aggregate the CMI metadata - - The context provided by CMI is independent of the manner of - declaring this informations. So, we need to convert the informations - contained in annotations (or in a single descriptor of deployment) to - the internal format, before performing a bind in the context. - - The class org.ow2.carol.cmi.info.CMIInfoExtractor provides - convenient methods to extract these informations and encapsulate them - into an instance of the class - org.ow2.carol.cmi.info.ClusteredObjectInfo. The - method extractClusteringInfoFromAnnotatedPOJO(String, - Class<?>) is intended for annotations, and the method - extractClusteringInfoFromDD(String, URL) is - intended for descriptors of deployment. - - Before binding, the information needs to be associated with the - object. There are two ways: - - - - By adding the interface - org.ow2.carol.cmi.jndi.ClusteredObject - at the bound object; - - This provides the method - getClusteredObjectInfo() to retrieve the - informations. - - - - By registering the instance of - org.ow2.carol.cmi.info.ClusteredObjectInfo - into the repository defined by the class - org.ow2.carol.cmi.info.CMIInfoRepository. - - -
    - -
    - API to add data for replication on server-side - - TODO: Adding session for load-balancing of sfsb. -
    -
    - - - Examples of integration - - This chapter describes two concrete uses of these API. - -
    - EasyBeans - - -
    - -
    - JOnAS - - -
    -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/cmi/userguide.xml b/jonas_doc/core/src/docbook/doc-en/cmi/userguide.xml deleted file mode 100644 index 4a8bb2a7be398177b8d6ba1bf6cfec922527218c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/cmi/userguide.xml +++ /dev/null @@ -1,1115 +0,0 @@ - - - - - CMI User Guide - - - - Bouzonnet - - Loris - - - JOnAS Team - - - - 2007,2008 - - OW2 Consortium - - - - The CMI user guide is intended for developers wanting to develop - clustered applications. - - - March 2008 - - CMI - - 2.0.0 - - - - - - - - $Id: userguide.xml 2131 2008-10-06 14:35:30Z pelletib $ - - - - - Vocabulary - - This glossary defines the vocabulary used by this user guide. A - definition of common terms can be found on the glossary provided by - Sun. - - - Clustered object - - - Remote object that has clustering informations. - - - - - Remote object (or RMI - object) - - - Object having methods that can be invoked remotely with a RMI - connection. - - - - - Clustering - information - - - Information that allows to perform invocations on an object - while keeping a distributed load. The policy and the strategy are - some clustering informations. Clustering informations are a part of - the cluster view. - - - - - Manager of the cluster view - - - A manager handles replicated data to model the cluster view. - There are two kinds of manager: one for clients and one for servers. - The one for clients can only read the cluster view, while the one - for servers can modify it. The cluster view manager is a singleton - in a JVM. - - - - - Replicated data - - - Raw data copied on each JVM belonging to the cluster. - - - - - JVM - - - An instance of the Java Virtual Machine that contains one and - only one manager of the cluster view. - - - - - Cluster view - - - View on a cluster state shared by the managers. Two kinds of - view exist: client view and server view. - - - - - Policy of load-balancing - - - Algorithm for choosing one server among a list. Policy and - strategy form the algorithm of load-balancing. - - - - - Strategy of load-balancing - - - Algorithm for choosing a list of server among an other one. A - strategy is applied before a policy in order to modify its - behaviour. - - - - - Service flow - - - It corresponds to the requests initiated by the clients (e.g. - accesses to registry, EJB requests). - - - - - Control flow - - - It corresponds to the cluster logic requests (e.g. update - servers list, get servers load,...). - - - - - - - Introduction - - This chapter gives the rationale of CMI and provides a few - information about its internals. - -
    - Motivations for clustering objects - - When too many clients perform method invocations on a single - remote object, we can expect a fall of quality of service. In addition, - if this object is no more accessible, none of the clients will be - satisfied. - - So clustering objects can contribute to obtain two good - properties: - - - - scalability, i.e. increase the - application capacity in terms of number of clients and response - time. - - Load-balancing is a mechanism avoiding overload of - server. - - - - - fault tolerance and continuity of - service, i.e. provide high-availability of - service. - - Failover is a mechanism avoiding interruption of - service. - - - - No specification (no standard) describes how to get them: it is - the purpose of CMI. -
    - -
    - Provided solution - - CMI is a framework that provides a generic system to define and - configure clusters of RMI objects. CMI allows to dissociate objects from - registries and servers by defining global registries and clusters of - objects. By this way, it can ensure a scalability and high-availability - of accesses to clustered (or not, see - below) objects. - - Its main features are: - - - - Support of all types of remote objects - - CMI doesn't expect any specific types of object, but because - it uses JNDI to access them, the type is fixed by the application on - the server-side that binds objects into the registry. - - - - Definition of load-balancing algorithms with POJOs - - The load-balancing algorithm is split in two distinct parts to - achieve reusability: policies and strategies. - - - - Dynamic policies and strategies of load-balancing - - The load-balancing algorithm is defined before the deployment - and can evolve afterwards. New definitions of policies and - strategies are downloaded by clients. More, it is possible to add - properties to a policy in order to enhance still the - dynamicity. - - - - Capability to customize dynamically the algorithm of - load-balancing for the JNDI accesses - - Non clustered objects can be also referenced by the global - registries to enjoy the smooth shutdown. - - - - Smooth shutdown - - Allow to disable creation of new connections on a server - waiting for shutdown. - - - - Support of the load factor of servers in the algorithm of - load-balancing - - Clients have up-to-date load factors. - - - - Smart management of surrogates (stub or proxy) - - To optimize the traffic network, surrogates are downloaded - lazily by clients and kept in a pool. - - - - Separation of the service flow and the control flow - - In each JVM, a single dedicated thread is in charge of the - control flow. - - - - Multi-protocols support - - CMI is fully independent of the communication protocol. - - - - CMI is transparent for clients - - CMI doesn't compel them to have many dependencies, by using - the smart factory. - - -
    - -
    - Load-balancing algorithm - -
    - An example of execution - - The following figure shows how to define a weighted round-robin - in term of policy and strategy. - - - - - - - An use of the weighted round-robin - -
    - -
    - General case - - - - - - - The chain strategy -> policy - -
    -
    - -
    - Architecture - - This section is dedicated to make easier the use of CMI, by - providing informations on its conception. In a first time we will - distinguishes the interfaces of CMI, next we will give an overview of - the internal mechanisms of CMI. - -
    - Interfaces - - CMI exposes three interfaces: - - - - the API for users - - It describes how to create and use clustered objects. - - - - the API for integrators - - It describes how to use CMI in an other project. - - - - the SPI - - It describes how to define its own implementations for - CMI. - - - - - - - - - - The three interfaces exposed by - CMI - - - This document will only focus on the API for users. - - This is composed of the following elements: - - - - An implementation of context to intercept accesses to the - registries; - - - - Annotations to define clustered objects; - - - - Interfaces and utilities to define policies and - strategies; - - - - A set of standard policies and strategies; - - - - A MBean; - - - - A smart-factory. - - -
    - -
    - Internal mechanisms - - Before describing the API for users in detail, this section - draws an overview of the internal mechanisms of CMI. - - Its core can be divided in two parts: - - - - A set of managers sharing the cluster view (no more one - manager by JVM); - - - - A context and proxy intercepting calls on the wrapped - context and stub. They are associated with the manager of their - JVM. - - - -
    - Separation of the control and service flows - - The interceptors separate the control and service flows, while - the managers handle the control flow. - - - - - - - Separation of the control and service flows at - lookup, bind and invoke times - - - - If the server application looks up (or invokes a method - of) a clustered object, it acts exactly as a client. - -
    - -
    - The interceptions - - CMI provides interceptions of the calls performed by users. - They can occur at two moments: - - - - Reading/writing into a registry with a context; - - The context checks if the concerned object is clustered. - If it is, here is how the context proceeds: - - - - At a lookup: - - Instead downloading a surrogate from the registry, the - context notifies its manager, generates a new proxy and - returns it. - - - - At a bind (only for a server): - - After binding the object in its local registry, the - context notifies its manager. - - - - - - Invocation of methods on a clustered object with a proxy - returned by the context. - - - - This proxy chooses a server using the policy and strategy of - the clustered object. For the chosen server, the proxy needs to get - the associated surrogate in order to perform the invocation. The - manager handles a pool of surrogates for each clustered - object. - - The following figure illustrates the steps of an invocation, - when the surrogate is missing from the pool: - - - - - - - Firstly, the proxy tries to get the surrogate for - a given clustered object and a given server.Next, - because the pool doesn't contain the surrogate, it downloads - this by performing a lookup onto a - registry.Finally, the surrogate is kept in the pool - and the proxy can invoke the method of the clustered - object. - The lookup is performed just before the invocation - by the pool: this is a kind of lazy lookup. -
    - -
    - The managers of the cluster view - - The managers of the cluster view handle the control - flow. - - There are two kinds of manager: - - - - Server-side manager; - - They share the whole cluster view and can modify - it. - - - - Client-side manager; - - They know only a part of the cluster view and cannot - modify it. - - - - The following figures illustrates the communication between - the managers: - - - - - - - Communication between the - managers - -
    -
    -
    -
    - - - Configuring CMI - - The configuration occurs at two independent levels in CMI: - - - - The configuration of the manager of the cluster view, needed - only for servers ; - - - - The configuration of the context, mandatory for all. - - - -
    - Configuring the manager of the cluster view - - The manager of the cluster view can only be configured on the - server-side. The properties will be read from the file - cmi.properties when Carol is not used (see the - section dedicated to Carol for informations about it). The manager on - the client-side downloads dynamically its configuration. As a result, - all the managers on the client-side use the same configuration. - -
    - Common configuration of servers - - Here is the configuration relative at a server, common at all - implementations: - - # Class name of the implementation of the ServerClusterViewManager -cmi.server.impl.class=org.ow2.cmi.controller.server.impl.jgroups.JGroupsClusterViewManager - -# Domain name for the CMI MBean -cmi.server.admin.domain=CMI - -# Attribute name for the CMI MBean -cmi.server.admin.mbean=CMIAdmin - -# Enumeration of supported connector protocols -cmi.server.admin.connector.protocol=jrmp - -# Enable or disable bind of a provider -cmi.server.provider.bind=true - -# Enable or disable bind of a registry -cmi.server.registry.bind=true - -# Load factor xml:id="cmi.ug.conf" -cmi.server.load=100 - - - - Indicate a name for a concrete implementation of the - interface - org.ow2.cmi.controller.server.ServerClusterViewManager. - - - - Indicate a name of domain to register MBeans when CMI is - in stand-alone. When CMI is used with Carol, the name of domain - is provided by the latter. - - - - Indicate a name to register the MBean - org.ow2.cmi.admin.CMIAdminMBean. - - - - Indicate for each protocol in the list, which JMX - connectors will be bound into the registries. - - - - True indicates that a provider of the cluster view (for - clients) will be bound for each protocol into the - registries. - - - - True indicates that clients could use the registries of - this server (for each protocol) to lookup objects that are not - clustered. - - - - Indicate the load-factor of the associated server. - - -
    - -
    - Configuration of servers using the implementation with - JGroups - - Here is the configuration relative at a server, specific at the - implementation with JGroups: - - # Filename of the jgroups conf file -cmi.server.impl.jgroups.conf=jgroups-cmi.xml - -# Groupname for JGroups -cmi.server.impl.jgroups.groupname=G1 - -# Timeout to wait a reconnection -cmi.server.impl.jgroups.reconnection.timeout=5000 - - - - Indicate a filename that contains a stack to define a - channel. - - - - Indicate a name of group to define a channel. - - - - Timeout to wait a reconnection. - - -
    - xml:id="cmi.ug.conf" -
    - Configuration of clients - - Here is the configuration relative at a client: - - # Time to refresh the client view -cmi.client.refresh.time=50000 - - - - Indicate a delay between each update of the cluster view - by clients. - - - - - This property must be set on the server-side, and the value - will be downloaded by clients. - -
    xml:id="cmi.ug.conf" -
    - -
    - Configuring the context - - Configuring the context needs only several additional properties - (in comparison with the settings required to create a new instance of - javax.naming.InitialContext). - -
    - In stand-alone - - Here is the properties needed to generate the - environment: - - # Indicate a list of provider URLs -cmi.context.provider.urls=rmi://129.183.101.165:1092,localhost:1099 - -# Indicate a class to use to create a context -cmi.context.wrapped.factory=com.sun.jndi.rmi.registry.RegistryContextFactory - -# Indicate a protocol associated with the context -cmi.context.wrapped.protocol=jrmp - -# Indicate if the application is a server, default=false -cmi.mode.server=true - -# Server only: Enable or disable replication, default=true -cmi.server.start.replication=true - - - - Either a list of provider URLs (on servers) for a client - (i.e. the property - cmi.server.mode=false), or only one - provider URL (on a local registry) for a server - (i.e. the property - cmi.server.mode=true). - - - - The class must implement the interface - javax.naming.spi.InitialContextFactory - to construct new contexts to read (only) the registries. - - - - Only one name of protocol is expected (while several can - be set with Carol). - - - - If this property is set at true, a local registry to - perform writes (bindings for example) is expected. If this - property is set at false, a call at a writing operation will - throw an exception of type - org.ow2.cmi.jndi.context.CMINamingException. - - - - True indicates that no instance of type - org.ow2.cmi.controller.server.ServerClusterViewManager - will be created. - - -
    - -
    - With Carol - - With its version 2.0.0, CMI is no more treated as a protocol. - The result is that its configuration in Carol has changed. - - Here is the properties relative to CMI, found in the file - carol.properties: - - # jonas rmi activation (iiop, irmi, jrmp) -carol.protocols=jrmp - -# Global property for enabling the use of cmi in carol -carol.start.cmi=true - -# RMI IRMI URL -carol.irmi.url=rmi://localhost:1098 -# For each protocol, set if CMI is enabled (only for server) -carol.irmi.cmi=false - -# RMI JRMP URL -carol.jrmp.url=rmi://129.183.101.165:1092,129.183.101.165:1099 -carol.jrmp.cmi=true - -# RMI IIOP URL -carol.iiop.url=iiop://localhost:2001 -carol.iiop.cmi=false - -# Server only: Enable or disable replication, default=true -cmi.server.start.replication=true - - - - Indicate a list of protocols to use. - - - - True indicates that CMI can be used (if enabled individually - for each protocol). - - - - As in stand-alone mode, either a list of provider URLs (on - servers) for a client, or only one provider URL (on a local - registry) for a server. - - - - True indicates that CMI will be used for this protocol. If - the property carol.start.cmi is set with the - value false, this property is ignored. - - -
    -
    -
    - - - Using CMI - - This chapter describes the use of CMI by users and - administrators. - -
    - Creating a context - - The first step in the use of CMI is the creation of the context. - During this step the manager of the cluster view will be also - constructed (if it doesn't already exist). - -
    - In stand-alone - - When CMI is used in stand-alone, the methods - getCMIEnv(), - getCMIEnv(URL) or - getCMIEnv(Properties) of the class - org.ow2.cmi.config.JNDIConfig must be used to - construct the environment that will be specified at the constructor - InitialContext(Hashtable<?, ?>) of - class javax.naming.InitialContext. - - Here is an example of a construction of an instance of - org.ow2.cmi.jndi.context.CMIContext in - stand-alone: - - - Initializing the environment (from the file - <filename>cmi.properties</filename>) to construct a new - <classname>org.ow2.cmi.jndi.context.CMIContext</classname> - - Hashtable<String, ?> cmiEnv = JNDIConfig.getCMIEnv(); -InitialContext ic = new InitialContext(cmiEnv); - -
    - -
    - By delegating it to Carol - - When CMI is associated with Carol, the configuration of the - context is delegated to Carol, so no additional instruction is needed. - The configuration of Carol will be explained in a next chapter. - - Here is an example of a construction of an instance of - org.ow2.cmi.jndi.context.CMIContext with - Carol: - - - Initializing Carol with the file - <filename>carol.properties</filename> - - ConfigurationRepository.init(); -InitialContext ic = new InitialContext(); - -
    - -
    - By delegating it to the smart factory - - Likewise, the creation of an instance of - org.ow2.cmi.jndi.context.CMIContext can be - delegated to the smart factory. - - The smart factory downloads transparently the missing classes - and properties to use CMI. So, a client that uses it, doesn't need to - have in its classpath the full library of CMI. Also, because - properties (as the list of provider URLs) are downloaded before the - creation of context, they are up-to-date. - - The smart factory is enabled by an other implementation of the - interface - javax.naming.spi.InitialContextFactory. - So to use the smart factory, clients must specify the class - org.ow2.cmi.smart.spi.SmartContextFactory as - factory. - - Here is an example of a construction of an instance of - org.ow2.cmi.jndi.context.CMIContext with the - smart factory: - - - Initializing the smart factory - - Hashtable<String, Object> env = new Hashtable<String, Object>(); -env.put(Context.INITIAL_CONTEXT_FACTORY, "org.ow2.cmi.smart.spi.SmartContextFactory"); -env.put(Context.PROVIDER_URL, "smart://localhost:2505"); -InitialContext ic = new InitialContext(env); - -
    -
    - -
    - Defining clustered objects - - This section describes the steps in order to define new clustered - objects. - -
    - The concepts - - A clustered object is characterized by its informations about - clustering. They are of two kinds: - - - - Declaration of a clustered object and its initial - configuration; - - The name of cluster containing this object is a part of the - declaration. - - The minimal and maximal sizes of the pool are a part of its - initial configuration. - - - - Description of the manner to access to it (the - algorithm). - - The policy and strategy of load-balancing are a part of the - algorithm. While policy is mandatory to define the algorithm, - strategy is optional. - - -
    - -
    - Choosing an algorithm of load-balancing - - CMI provides some standard policies and strategies. When an - object is declared belonging to a cluster, the algorithm to access to - it must be provided. - -
    - Using an existing algorithm - - Standard policies: - - - - Round robin - - - - First available - - - - Random - - - - HA Singleton - - - - Standard strategies: - - - - Local preference - - - - Load factor sort - - - - Load factor weight - - -
    - -
    - Designing a new algorithm - - Designing a new algorithm consists in implementing - interfaces. - -
    - Writing a policy - - To define its own policy, the following interface must be - implemented: -
    - -
    - Writing a strategy - - To define its own strategy, the following interface must be - implemented: -
    -
    -
    - -
    - Configuring the algorithm - - Adding properties to a policy allows to add dynamicity at an - algorithm, because properties are also downloaded by clients. The - following section will describe how to declare these - properties. -
    - -
    - Adding the informations for clustered object - - It exists two ways to add the informations about - clustering: - - - - Java annotations; - - Annotations simplify the use of CMI by avoiding adding a new - XML file. For the moment, only the class must be annotated and not - its interface. - - - A JDK 1.5 or higher is required to use - annotations. - - - - - Deployment descriptors. - - The source code is not modified, but a XML file is - required. - - - -
    - With annotations - - Firstly the class of the clustered objects must be annotated - with @Cluster. - - Here is the definition of this annotation: - - Next, adding the annotation - @Policy permits to declare the way to - access to the instances of this class. - - Here is the definition of this annotation: - - Next, a strategy can be eventually used by annotating the - class with @Strategy. - - Here is the definition of this annotation: - - Finally, properties can be initialized by annotating the class - with @Properties. - - Here is the definition of this annotation: -
    - -
    - With a descriptor of deployment - - Here is the schema to define a descriptor of - deployment: -
    -
    - -
    - Binding - - When the object is bound, the context detects that it must be - clustered. So their informations are given to the manager of the - cluster view, and this last replicates them. -
    -
    -
    - - - Administrating CMI - - The registered MBean allows to monitor and administrate the cluster - by delegating its tasks to the manager of its JVM. - - To connect it, the service URL is:
    service:jmx:<protocol>:///jndi/<providerURL>/server
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/command_guide.xml b/jonas_doc/core/src/docbook/doc-en/command_guide.xml deleted file mode 100644 index eec81b6730aaf7d1287e0c09a9eab08c1e2856ad..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/command_guide.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - JOnAS 5 Commands Reference Guide - - - - JOnAS Team - - - - FORNACIARIFrançois - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - - This document describes all the commands that can be used with - - - - March 2009 - - - - - - - - - - - - - Configuration commands - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/commands/configuration_newjb.xml b/jonas_doc/core/src/docbook/doc-en/commands/configuration_newjb.xml deleted file mode 100644 index 4ae7a0373a28330e08477ace78a3840db52cb372..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/commands/configuration_newjb.xml +++ /dev/null @@ -1,84 +0,0 @@ - -
    - newjb command - - Build a new JONAS_BASE directory. - -
    - Synopsis - - - newjb - -
    - -
    - Description - - The newjb utility builds a new JONAS_BASE directory - that allows the conformance tests to be launched. At the start, the user - must choose: - - - - the protocol among jrmp, iiop, irmi - - - - the database - - - - the web container among tomcat, jetty - - - - The tool generates the configuration automatically. - - The $JONAS_BASE variable must be set before launching - the tool; it specifies the path to the new directory that will be - built. - - The $HOME/jb.config/lib directory must be - created before launching the tool. It can contain some specific user - configuration (see below). - - The tool relies on 's ant tasks - ($JONAS_ROOT/templates/newjb/build-jb.xml) and thus builds a - configuration compatible with the version. First, a JONAS_BASE with - default values is built, and then the configuration files are modified - with the values defined in the centralized configuration file of newjb - (see below). - - A default configuration file is provided in - $JONAS_ROOT/templates/newjb/build-jb.properties. It contains the - variable parameters used by the tool, such as port number and database - properties. - - A user configuration can be set in the - $HOME/jb.config/conf/jonas-newjb.properties file. If - this file is present, the parameters it contains will override the default - parameters. - - By default, only the HSQL database can be configured with this tool. - For other databases, the specific drivers must be stored in the - $HOME/jb.config/lib directory before the run and the - properties must be set in the - $HOME/jb.config/conf/jonas-newjb.properties - file. - - The default script ($JONAS_ROOT/build-jb.xml) - and its configuration - ($JONAS_ROOT/templates/newjb/build-jb.properties) can be used as an - example for creating a configuration tool corresponding to user's specific - requirements. -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/commands/configuration_newjc.xml b/jonas_doc/core/src/docbook/doc-en/commands/configuration_newjc.xml deleted file mode 100644 index d7bee2f716c79c5e874914d522c03625f5886666..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/commands/configuration_newjc.xml +++ /dev/null @@ -1,257 +0,0 @@ - -
    - newjc command - - Command that builds all the configurations (ie JONAS_BASE) of the - instances for - the cluster (including also a master to manage the domain, a DB with an embedded HSQLDB - server, and a cluster daemon). It also creates the configuration files - needed for mod_jk. - -
    - Options - - - newjc - - -auto - - - - - -auto - - - Use the default configuration (silent mode) - - - -
    - -
    - Description - - The newjc utility builds all the configurations (ie JONAS_BASE) of - the instances - for the cluster (including also a master to manage the domain, a db with an embedded HSQLDB - server, and a cluster daemon). It also creates the configuration files - needed for mod_jk. - - At command start, the user must choose: - - - - the cluster directory where the configuration - directories (ie JONAS_BASE) will be created, - - - - the prefix for the new configuration directories - (ex: prefix jb generates jb1, jb2, ...), - - - - the protocol among jrmp, iiop, irmi, - - - - the database to configure for the db node, - - - - the cluster architecture among bothWebEjb, diffWebEjb. The first - means that all the nodes are configured with both web and ejb services - whereas the second one will separate the two tiers, - - - - the number of web instances, - - - - the number of ejb instances. - - - - The tool generates the configuration automatically but you can - customize some of the characteristics of the cluster by modifying the - following files, in JONAS_ROOT/conf/newjc, before - executing the command: - - - - build-jc.properties: global configuration - for the cluster, - - - - build-master.properties: specific - configuration for the master node, - - - - build-db.properties: specific - configuration for the db node. - - - - If the -auto option is used, the - $JONAS_BASE variable must be set before launching the tool; - it specifies the prefix of the paths to the new directories that will be - built and that will contain the JONAS_BASE of the cluster members. - - You can add some specific user configuration in the - $HOME/jc.config/lib. If the directory doesn't exits, - it will be created during the execution of the command. - - A user configuration can be set in the - $HOME/jc.config/conf/jonas-newjc.properties file. If - this file is present, the parameters it contains will override the default - parameters defined in - JONAS_ROOT/conf/newjc/build-jc.properties. -
    - -
    - Review newjc output - - newjc creates - tomcat_jk.conf and - workers.properties files under - <cluster-directory>/conf/jk. The #Web section - of build-jc.properties defines configuration - parameters set by newjc in these files. The file - tomcat_jk.conf contains apache directives supported - in httpd.conf or apache2.conf. - They are isolated in a separate file for modularity, then they must be - included manually in httpd.conf or - apache2.conf. Refer to workers HowTo - documentation on the Tomcat site. - - newjc generates by default four instances (four - bases) in - directories jb1, jb2, jb3 and jb4 under the cluster directory. Each - instance has - its own configuration files into the conf directory - (as any other - base). It also generates configurations for cluster daemon - (cd directory), for master node - (master directory), and for db node - (db directory). - - By default, jb1 and jb2 are web container instances and jb3 and jb4 are - EJB container - instances. - - newjc generates a script called jcl4sc (jcl4sc.bat) for controlling the cluster examples - provided with JOnAS named, sampleCluster2 and sampleCluster3. The command - takes in argument the parameter status, start, stop, halt or kill. - - The pertinent files for the configuration of the cluster are - described below: - - - - carol.properties - jgroups-cmi.xml - - - The #Carol section of build-jc.properties - defines configuration parameters set by newjc - in the carol.properties and - jgroups-cmi.xml files . This allows JNDI - replication to support load balancing at the EJB level using the CMI - protocol. - - - The multicast address and port must be identically - configured for all / Tomcat instances. - - - - - - jonas.properties - - - The #Services section of - build-jc.properties defines configuration - parameters set by newjc in the - jonas.properties file. - - - - - tomcat6-server.xml - - - The #Web section of build-jc.properties - defines some configuration parameters set by - newjc in the tomcat6-server.xml - file . In particular, a connector XML element for AJP1.3 protocol is - defined, as well as a jvmRoute to support load balancing at the web - level, via this connector. - - A Cluster XML element was also added. It defines parameters - for achieving Session replication at the web level with . - - Refer to the AJP - Connector and the Engine - Container documentation. - - - The jvmRoute name generated by newjc is the same as the name - of the associated worker defined in worker.properties. This will - ensure the Session affinity. - - - - -
    - -
    - Tell Apache about mod_jk - - To make apache aware of this new file, edit - <prefix>/conf/httpd.conf. - - Copy and paste the following line after the Dynamic Shared Object - (DSO) Support section. - - Include conf/jk/tomcat_jk.conf - - Move the jk directory created by newjc under the APACHE - structure: - - bash> mv <cluster-directory>/conf/jk $APACHE_HOME/conf - - Restart apache so that apache can load the jk_module: - - bash> apachectl stop && apachectl start - - - Some UNIX distributions may locate the module in the folder - libexec instead of the folder modules. - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/commands/configuration_raconfig.xml b/jonas_doc/core/src/docbook/doc-en/commands/configuration_raconfig.xml deleted file mode 100644 index a16a8ed2ca36a245b57ae5b5b0702c36c1cb3053..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/commands/configuration_raconfig.xml +++ /dev/null @@ -1,240 +0,0 @@ - -
    - RAConfig command - - Generate a specific resource adapter configuration file or a - resource adapter file - -
    - Synopsis - - - RAConfig - - options - - InputFileName - - OutputFileName - -
    - -
    - Description - - The RAConfig utility provides the capability to - create a specific resource adapter configuration file (jonas-ra.xml) - from a ra.xml file, or update a resource adapter file. - - With this command it is possible to : - - - - extract a specific resource adapter configuration file - (jonas-ra.xml) from an ra.xml - file (see option -path) - - - - create a new specific resource adapter configuration file - (jonas-ra.xml) from an ra.xml - file (see option -new) - - - - create a resource adapater file (.rar file) - from a dataSource.properties file (see option -p) - - - - update a resource adapter file with a jonas-ra.xml - (see option -u) - - - - The InputFileName is the file name of a the - resource adapter. - - The OutputFileName is the file name of an - output resource adapter. This parameter is used with the -p (required) or -u - (optional) options. -
    - -
    - Options - - - - -? or -help - - - Give a summary of the options. - - - - - -p or -property database_properties_file_name - - - Specifie the name of the <database>.properties file to - process. The result of this processing will be a jonas-ra.xml file - that will update the /META-INF/jonas-ra.xml file in the output - rar. - - - - - -dm, -ds, -cp, -xa - - - These options are related to the option -p above. - - They specify the rarlink value to configure respectively - DriverManager, DataSource, ConnectionPoolDataSource and - XAConnection. If -dm is used, then - the conversion will be a direct reflection of the values specified - in the -p - <database>.properties file. If any of the other - values are specified, then the jonas-ra.xml created will reflect - options from the -p - <database>.properties file and the user must edit - the file based on information from the database provider for the - specified type of datasource. Each database provider may have - different config properties that need to be set and will be included - in the database provider's documentation. - - - - - -path output_directory - - - Specify the directory name to place the extracted jonas-ra.xml - file. - - - - - -new - - - Don't extract jonas-ra.xml but create a new one. The default - value is the system property for - java.io.tmpdir. - - - - - -update or -u inputname - - - Specify the name of the XML file to process. This file will - update the /META-INF/jonas-ra.xml file in the - rar. If this argument is used, it is the only argument - executed. - - - - - -rarlink rarlink - - - Specify the jndi name of an rar file with which to link. This - option can be used when this rar file will inherit all attributes - associated with the specified jndi name. If this option is specified - in the jonas-ra.xml file, it is the only file needed in the rar, and - the ra.xml file will be processed from the rarlink file. - - - - - -securityfile security_file_to_process - - - Specify the security property file to process and add security - information to jonas-ra.xml. This will map the specified principal - name to the user on the EIS system. The specified file must be in - the following form: principal = user::password - . When used in conjunction with the -encrypt option, then the resulting - information will be encrypted in jonas-ra.xml. - - - - - -encrypt - - - Used with -securityfile to - encrypt the specified passwords. - - - - - -jndiname jndiname - - - This option is deprecated with 1.5 Resource Adapter. - - For 1.0 Resource Adapter, this specifies the JNDI name of the - connection factory. This name corresponds to the name of the - <jndi-name> element of the <jonas-resource> element in - the specific deployment descriptor. This name is used by the - resource service for registering in JNDI the connection factory - corresponding to this resource adapter. - - - - - -novalidation - - - Turn off the xml dtd/schema validation. - - - -
    - -
    - Examples - - - - RAConfig -dm -p MySQL1 $JONAS_ROOT/repositories/maven2-internal/org/ow2/jonas/jonas-jca-jdbc-dm/<jonas-version>/jonas-jca-jdbc-dm-<jonas-version> - MySQL_dm - - - Generate a MySQL_dm.rar file linked to jonas-jca-jdbc-dm-<jonas-version>.rar. - The jonas-ra.xml file inserted is created with values coming from the - ra.xml file of the jonas-jca-jdbc-dm-<jonas-version>.rar - and values from the MySQL1.properties file - This rar file can then be deployed and will replace the - configured MySQL1 datasource. - - - - - RAConfig -path . XX.rar - - - Extract the jonas-ra.xml of XX.rar in the working - directory - - - - - RAConfig -u jonas-ra.xml MyRA.rar - - - Update/insert the jonas-ra.xml file into the MyRA.rar - file - - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/commands/genic.xml b/jonas_doc/core/src/docbook/doc-en/commands/genic.xml deleted file mode 100644 index 9897c105164b6289e4666c6f7b365f2688dd1ce5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/commands/genic.xml +++ /dev/null @@ -1,221 +0,0 @@ - - - GenIC command - - Generates the container classes for EJBs. - -
    - Options - - - GenIC - - options - - <InputFileName> - - - - - -d directory - - - Specifies the root directory of the class hierarchy. - - This option can be used to specify a destination directory for - the generated files. - - If the -d option is not used, - the package hierarchy of the target class is ignored and the - generated files are placed in the current directory. - - If the InputFile is an ejb-jar file, the - generated classes are added to the ejb-jar file, unless the - -noaddinjar option is set. - - - - - -invokecmd - - - Invokes directly the java class corresponding to the java - compiler. - - This is useful on Windows in the event of a - CreateProcess Exception (this occurs when the - command line is too long). - - In this case tools.jar must be visible in the CLASSPATH - - - - - -javac options - - - Specifies the java compiler name to use (javac by - default). - - - - - -javacopts options - - - Specifies the options to pass to the java compiler. - - - - - -keepgenerated - - - Do not immediately delete generated files. - - - - - -noaddinjar - - - If the InputFile is an ejb-jar file, do - not add the generated classes to the ejb-jar file. - - - - - -nocompil - - - Do not compile the generated source files via the java and rmi - compilers. - - - - - -novalidation - - - Remove xml validation during parsing. - - - - - -protocols - - - Comma-separated list of protocols (jrmp, iiop, irmi) for which - stubs should be generated. Default is jrmp - - - - - -rmiopts options - - - Specifies the options to pass to the rmi compiler. - - - - - -verbose - - - Displays additional information about command - execution. - - - - - -nofastrmic - - - Disable the use of fastrmic for stubs/ties generation. - - - -
    - -
    - Example - - - - GenIC -d ../../classes sb.xml - - - Generates container classes of all the Enterprise JavaBeans - defined in the sb.xml file. Classes are generated in the - ../../classes directory adhering to the classes hierarchy. - - - - - - - GenIC sb.jar - - - Generates container classes for all the Enterprise JavaBeans - defined in the sb.jar file and adds the generated classes to this - ejb-jar file. - - - -
    - -
    - Description - - The GenIC utility generates the container classes for from the - given Enterprise Java Beans. - - The InputFileName is either the file name of an - ejb-jar file or the file name of an XML deployment descriptor of - beans. - - The GenIC utility does the following : - - - - generates the sources of the container classes for all the beans - defined in the deployment descriptor, - - - - compiles these classes via the java compiler, - - - - generates stubs and skeletons for those remote objects via the - rmi compiler, and - - - - if the InputFile is an ejb-jar file, adds the generated classes - in this ejb-jar file. - - -
    - -
    - Environment - - If InputFile is an XML deployment descriptor, - the classpath must include the paths of the directories in which the - Enterprise Bean's classes can be found, as well as the path of the - directory specified by the -d option. - - If InputFile is an ejb-jar file, the classpath - must include the path of the directory specified by the -d option. -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/commands/jclient.xml b/jonas_doc/core/src/docbook/doc-en/commands/jclient.xml deleted file mode 100644 index e47f73ff0c2e5d0e474a9f72215c712f37898e46..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/commands/jclient.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - jclient command - - Start a client container. - -
    - Options - - - jclient - - -cp classpath - - -security - - -jarClient - - -traceFile - - -carolFile - - -tmpDir - - -nowsgen - - java-class - - args - - - - - -jarClient - - - Specify the client jar to use of the ear if many. - - - - - -traceFile - - - Specify the configuration file to use for the traces of this - client instead of the default file - - - - - -carolFile - - - Specify the carol.properties file to use instead of the - default carol.properties file of the client.jar - - - - - -tmpDir - - - Specify the temp directory where unpack the ear. - - - - - -cp classpath - - - Add an additional classpath before running the java - program. - - - - - -nowsgen - - - Specify if the Container shouldn't use Automated WsGen. - - - - - -security - - - Set a security manager using the policy file in - $JONAS_BASE/conf/java.policy. (Used for - automatic stubs downloading) - - - -
    - -
    - Description - - The jclient command allows the user to easily start a "heavy" java - client that will be able to reach beans in remote servers and start - distributed transactions. - - It is not the J2EE compliant way to run a java client which is to - package the java client into a J2EE container client (refer to Client - Packaging). -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/commands/jms.xml b/jonas_doc/core/src/docbook/doc-en/commands/jms.xml deleted file mode 100644 index 9a976b59837b0dc5d012ae5e7f4ea3f63a5d2f2c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/commands/jms.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - JMS commands - -
    - JmsServer - - Launch the JORAM server with the existent configuration. - -
    - Synopsis - - - JmsServer - -
    - -
    - Description - - Launch the JORAM server with the existent configuration. - - The JORAM server configuration files are listed below: - - - - $JONAS_BASE/conf/a3servers.xml - - - - $JONAS_BASE/conf/joramAdmin.xml - - - - META-INF/ra.xml in the - joram_ra_for_jonas.rar archive (may be in the - internal repositories or in the deploy/ directory). - - -
    - -
    - Example - - The JmsServer command is typically run in the - background: - - - - JmsServer & - - - on Unix - - - - - - - start JmsServer - - - on Windows - - - -
    -
    - -
    - joram_raconfig - - Change the host and port parameters of a given JORAM server in the - configuration files. - -
    - Options - - - joram_raconfig - - -p port - - -h host - - -s serverId - - - - - -p port - - - Set the listening port of the JORAM server (defaults to - 16010). - - - - - -h host - - - Set the IP address of the JORAM server (defaults to - localhost). - - - - - -s serverId - - - Set the server id of the JORAM server (defaults to - 0). - - - -
    - -
    - Description - - The joram_raconfig tool aims to facilitate consistent updates - (accross multiple files) for the host and port parameters of a given - JORAM server ID. - - JORAM relies on several configuration files: - a3servers.xml, joramAdmin.xml - and ra.xml. With joram_raconfig, these - configuration files are updated all together and thus the consistency is - ensured. - - Modified files: - - - - $JONAS_BASE/conf/a3servers.xml - - - - $JONAS_BASE/conf/joramAdmin.xml - - - - META-INF/ra.xml (in the JORAM resource - adapter) is updated. - - - - Resource adapters files are looked up in the following - places: - - - - $JONAS_BASE/repositories/maven2-internal/org/objectweb/joram/joram_ra_for_jonas/{joram.version}/joram_ra_for_jonas-{joram.version}.rar - - - - $JONAS_BASE/deploy/joram_ra_for_jonas.rar - - -
    - -
    - Example - - >$ joram_raconfig -h localhost -p 16012 -s 0 -Target JORAM Resource Adapter: /home/ ... /joram/joram_ra_for_jonas/5.2.1a/joram_ra_for_jonas-5.2.1a.rar - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/commands/jonas.xml b/jonas_doc/core/src/docbook/doc-en/commands/jonas.xml deleted file mode 100644 index ea7e89cb52d5323021a3d3e2812f315a7ba7b115..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/commands/jonas.xml +++ /dev/null @@ -1,776 +0,0 @@ - - - jonas command - - This command provides the capability to start, stop, or administrate - servers. - - The following two scripts can be reviewed and possibly modified for - assistance with problems or for obtaining additional information: - - - - jonas for UNIX systems - - - - jonas.bat for WINDOWS - systems - - - - There are five different sub-commands, that depend on the first - mandatory argument: start, stop, admin, version, check - -
    - jonas start - - Command allowing to start a server. - -
    - Options - - - jonas start - - -standby - - -failStartOnError - - -fg - - -bg - - -win - - -tui - - -gui - - -dev - - -clean - - -n name - - -target server - - -Ddomain.name=domain - - - - - -standby - - - Start a minimal server with only mandatory services : - registry, jmx. If the - discovery service is configured in the JOnAS - service list, it will bo started too. - - When the server startup is done, should be in the - STANDBY state. In this state, the server can either be stopped - (see jonas stop command) or be fully started - by executing the jonas start command to reach - the RUNNING state. - - - - - -failStartOnError - - - Start the server in safe startup mode. If at least one deployable has a failed deployment, the server - will shutdown. - - - - - -bg - - - Start the server in background mode - - - - - -win - - - Start the server in a new window - - - - - -tui - - - Start the Apache Felix TUI (force foreground mode) - - - - - -gui - - - Start the Apache Felix GUI - - - - - -dev - - - This option allows to start a server by using - bundles present in the default maven repository instead of bundles - under $JONAS_ROOT/lib/bundles. A specific - maven repository location can be given by setting the - m2.repository property - - - - - -clean - - - Clean the Apache Felix cache before starting a server - - - - - -n name - - - Set the server name. It must be unique in the domain. By - default, the server name is jonas - - - - - -target server - - - This option allows to start another server or cluster (group - of servers) in the domain. - - This action is to be executed in the environment of a - running master server who's name is given by the -n option. In - order to start a target server or cluster, the following - conditions have to be met: - - - - the target must belong to the domain (has to be defined - in the domain's map) - - - - a cluster daemon has to be running on the target's host - and it has to be aware of the target (see cluster daemon - configuration) - - - - - - - -Ddomain.name=domain - - - Set the name of the management domain to which the server - belongs - - - -
    - -
    - Description - - Start a server. - - The process can be run in the foreground, in the background, or in - a new window. If the background option is chosen (default option), - control is given back to the caller only when the server is - ready. - - The gui and tui options allow to interact with the OSGi - framework. - - The name of the management domain to which the server belongs is - given by the domain.name propery, or by the server - name if this property is not defined. -
    -
    - -
    - jonas stop - - Command allowing to stop a server. - -
    - Options - - - jonas stop - - -standby - - -n name - - -target server - - -Ddomain.name=domain - - - - - -standby - - - Allows to stop all services except the mandatory ones - (registry and jmx). When - the server stop is done, should be in the STANDBY state and the JVM - is still running. In this state, the server can either be started - (see jonas start command) or be fully stopped - by executing the jonas stop command to stop - all services and the JVM. - - - - - -n name - - - Set the name of the server to stop. By default, the server - name is jonas - - - - - -target server - - - This option allows to stop another server or cluster (group - of servers) in the domain. - - This action is to be executed in the environment of a - running master server who's name is given by the -n option. In - order to start a target server or cluster, the following - conditions have to be met: - - - - the target must belong to the domain (has to be defined - in the domain's map) - - - - a cluster daemon has to be running on the target's host - and it has to be aware of the target (see cluster daemon - configuration) - - - - - - - -Ddomain.name=domain - - - Set the name of the management domain to which the server - belongs - - - -
    - -
    - Description - - Stop a running or a standby server by stopping in a first time all services - and then the JVM. - - The name of the management domain to which the server belongs is - given by the domain.name propery, or by the server - name if this property is not defined. -
    -
    - -
    - jonas admin - - Command allowing to administer a server. - -
    - Synopsis - - - jonas admin - - -win - - -n name - - -registry - - -protocol - - -username - - -password - - admin options - -
    - -
    - Description - - Administer a server. - - The connection to the server is established through JMX. The - default JMX service URL is build from the information contained in the - local $JONAS_BASE/conf/carol.properties file. You - can customize the JMX service URL by specifying the server name, the - registry URL and the protocol name. - - Set the username and the password if the connection to the remote - server - requires an authentication. - - Used without any administration option, this command will prompt - the user for an administration command (interactive mode). Each - administration command exists in a non-interactive mode, to be used in - shell or bat scripts for example. -
    - -
    - Options - - Options can be divided in two categories, the connection options - and the administration options. - -
    - Connection options - - - - -win - - - Administer the server in a new window - - - - - -n name - - - Set the name of the server to administer. By default, the - server name is jonas - - - - - -username - - - Set the username when authentication is required - - - - - -password - - - Set the password when authentication is required - - - - - -registry - - - Set the registry URL - - - - - -protocol - - - Set the protocol name (jrmp, iiop or irmi) - - - -
    - -
    - Administration options - - - - -? - - - Prints the help message - - - - - -a filepath - - - Deploy an application from a given filepath on the current - server, or on another target in the domain if the current server - is a master. Note that the filepath must be an absolute - path - - The application can be one of the following : - - - - a standard .jar - file. This will lead to the creation of a new EJB - container. - - - - a standard .war - file containing a WEB module. - - - - a standard .ear - file containing a complete J2EE application. - - - - a standard .rar - file containing a RAR module. - - - - - - - -r filepath - - - Undeploy a previously deployed application from the - current server or from the specified target if the current - server is a master - - - - - -gc - - - Run the garbage collector on the current server - - - - - -passivate - - - Passivate all entity bean instances. This affects only - instances outside transaction - - - - - -e - - - List the properties of the current server - - - - - -j - - - List the registered JNDI names, as seen by the current - - server - - - - - -l - - - List the beans currently loaded by the current server - - - - - -synch - - - Synchronize the entity bean instances on the current - - server. Note that this affects only the instances that are not - involved in a transaction - - - - - -debug topic - - - Set the logging level for the given topic to DEBUG - - - - - -tt timeout - - - Change the default timeout for transactions. Timeout is in - seconds - - - - - -ping [-timeout seconds] - - - Wait until the server is available - - - - - Each jonas admin option has its equivalent in the interactive - mode. To enter interactive mode and access the following list of - subcommands, type jonas admin with only connection options (without - administration options). To exit from interactive mode, use the exit - command. - - - - - - interactive command - - options - - - - - - addbeans - - -a filepath - - - - env - - -e - - - - gc - - -gc - - - - help - - -? - - - - jndinames - - -j - - - - listbeans - - -l - - - - removebeans - - -r filepath - - - - sync - - -sync - - - - trace - - -debug topic - - - - ttimeout - - -tt timeout - - - - quit - - exit interactive mode - - - - -
    -
    -
    - -
    - jonas version - - Command allowing to know the version of the server. - -
    - Synopsis - - - jonas version - -
    - -
    - Description - - Print the current version of the server. -
    -
    - -
    - jonas check - - Command allowing to check that the environment is correctly - set . - -
    - Synopsis - - - jonas check - - -help - -
    - -
    - Description - - Check that the server is well installed. Below the result of - the jonas check command : - - Checking jonas.properties file... -- jonas.services : registry,jmx,jtm,db,security,resource,ejb2,ejb3,jaxws,web,ear,depmonitor - -Checking JORAM configuration... - -Checking port availability... - -The JOnAS environment seems correct. -
    -
    - - -
    - jcl - - Command allowing to start or stop a cluster of instances on the local machine. - -
    - Synopsis - - - jcl - - status|start|stop|kill - - -
    - -
    - Description - - The command is a wrapper of the jonas command enabling to control a local cluster previously - built with the newjc command. - - The names and paths of the cluster instances are built from a set of variables (JCL_NUMBER_OF_NODES, JCL_BASE_PREFIX, JCL_NODE_NAME_PREFIX, ...). - The list of variable in an example is given below. - - JCL_NUMBER_OF_NODES=2 - -JCL_CLUSTER_DAEMON_DIR=/home/jonas/njc51/cd -JCL_BASE_PREFIX=/home/jonas/njc51/jb - -JCL_NODE_NAME_PREFIX=node -JCL_DOMAIN_NAME=sampleCluster2Domain - -JCL_DB_DIR=/home/jonas/njc51/db -JCL_DB_NAME=db - -JCL_MASTER_DIR=/home/jonas/njc51/master -JCL_MASTER_NAME=master - -export JCL_MASTER_NAME JCL_MASTER_DIR JCL_DB_NAME JCL_DB_DIR JCL_DOMAIN_NAME JCL_NODE_NAME_PREFIX -export JCL_NUMBER_OF_NODES JCL_CLUSTER_DAEMON_DIR JCL_BASE_PREFIX - - - - The control commands (status/start/stop/...) are applied for all the instances by default. A particular instance or a subset of instances - can be specified with the -n argument. - - Example for starting node1 and node2: - - $JONAS_ROOT/bin/jcl.sh -n 1,2 start - - Example for getting the status for node1, node2, node3 and node4: - - $JONAS_ROOT/bin/jcl.sh -n 1-4 status - -
    -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/config/jonas_properties.xml b/jonas_doc/core/src/docbook/doc-en/config/jonas_properties.xml deleted file mode 100644 index 9039944e725eb213995a93e082676d0b51d0f8ba..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/config/jonas_properties.xml +++ /dev/null @@ -1,559 +0,0 @@ - -
    - - Server and services configuration - - - $JONAS_BASE/conf/jonas.properties is the key file - for configuring . - - This file is used for: - - - - setting some global properties for the instance - - - - choosing the list of services to be launched at startup - - - - customizing each services - - - -
    - - Global properties - - - # Name of the JOnAS server -# default value is "jonas" -jonas.name jonas - -# Name of the JOnAS domain -# default value is "jonas" -domain.name jonas - -# Enable the Security context propagation (for jrmp) -jonas.security.propagation true - -# Enable the Security manager -# default value is true (if not set) -# Setting this to false implies a collocated registry and setting in carol.properties: -# carol.jvm.rmi.local.registry=true -jonas.security.manager false - -# Enable csiv2 -jonas.csiv2.propagation true - -# Enable the Transaction context propagation -jonas.transaction.propagation true - -# Set the name of log configuration file -jonas.log.configfile trace - -# Set the work directory used by JOnAS (relative or absolute) -# A relative directory name will be prefixed by JONAS_BASE/ -# An absolute path will be used directly -jonas.workdirectory work - -# Set to true if the server is a master -jonas.master false - -# Set to true in order to execute the JOnAS Server in development mode. -# -# WAR archive deployment case in development mode (for single or EAR packaged WARs): -# Each modified WAR archive will be unpacked in the working directory of the JOnAS Server -# in a different folder to avoid file locks. This is especially useful in a Windows environment. -jonas.development true - - - setting jonas.security.manager to - false implies a colocated registry and implies to set - in carol.properties: - - carol.jvm.rmi.local.registry=true - -
    - -
    - - Admin Client properties - - - # -###################### JOnAS Admin Client configuration -# -# If JMX security is enabled, the JOnAS Admin Client requires its parameters -# To be passed using -username and -password arguments. These two parameters -# pass these arguments to the JOnAS Admin Client internally. -jonas.adminClient.username jonas -jonas.adminClient.password jonas - -
    - -
    - - List of <xi:include href="../variables.xml" - xpointer="appserver" /> services - - - Here is the list of default services activated at starting - time: - - jonas.services jtm, db, security, resource, ejb3, jaxws, web, ear, depmonitor - - The possible services are: - - registry, jmx, security, jtm, db, mail, wc, dbm, wm, resource, cmi, ha, versioning, ejb2, ejb3, jaxrpc, jaxws, web, ear, depmonitor, discovery, resourcemonitor, smartclient, wsdl-publisher - - - - cmi - - - this service provides support for the clustering of RMI - objects. - - - - - db - - - this service is used for launching a Java database - implementation. By default, HSQLDB java database is used. - - - - - dbm - - - this service is needed by application components that require - access to one or several relational databases. It may be an - alternative to the usage of a JDBC resource - adapter via the resource service. - - - - - depmonitor - - - this service is used to control the application's deployment - process in JOnAS. - - - - - discovery - - - this service allows dynamic administration of management - domains. - - - - - ear - - - this service provides support for applications (.ear files). - - - - - ejb2 - - - this service provides support for EJB 2.x components - (EjbJars). - - - - - ejb3 - - - this service provides supports for EJB 3.0 components - (EjbJars). - - - - - ha - - - this service provides high-availability replication mechanims - for stateful session beans (EJB 2.x only). - - - - - jaxrpc - - - this service provides support for JAX-RPC 1.1 webservices - (J2EE 1.4 style, based on webservices.xml - deployment descriptors). - - - - - jaxws - - - this service provides support for JAX-WS 2.0 webservices (Java - EE 5.0 style based on JWS annotations). - - - - - jmx - - - this service is needed in order to administrate the JOnAS - servers and the JOnAS services via a JMX-based administration - console. It is automatically launched before all the other services - when starting . - - - - - jtm - - - this service provides support of distributed transactions - management. - - - - - mail - - - this service is required by applications that need to send - e-mail messages. - - - - - registry - - - this service is used for binding remote objects and resources - that will later be accessed via JNDI. It is automatically launched - before all the other services when starting . - - - - - resource - - - this service provides support for resource adapters conformant - to the - Connector Architecture Specification. - - - - - resourcemonitor - - - this service is related to the deployment plans. It allows to - reload resources deployed through deployment plans by checking - periodically repositories where are located original - resources. - - - - - smartclient - - - this service lets remote clients download classes and other - resources necessary for connecting to JOnAS services (JNDI context - factories, EJB3 interceptors, ...) directly from the JOnAS server - they're dealing with. - - - - - security - - - this service is needed for enforcing security at - runtime. - - - - - versioning - - - this service has been designed for dynamic redeployment of - applications,without any application downtime and without users' - sessions being lost. - - - - - wc - - - this service cleans up periodically the work directory of the - JOnAS server. - - - - - web - - - this service provides support for web components (as Servlets - and JSP). JOnAS provides two implementations of this service, one - based on Tomcat and another on Jetty. - - - - - wm - - - this service provides a JCA WorkManager implementation - (offering a manageable Thread Pool for resource adapters - components). - - - - - wsdl-publisher - - - this service provides an alternate WSDL publishing mechanism - (compared to the usual URL based publishing). - - - -
    - -
    - - Service startup policies - - - will try - to start declared services in the order in which they appear in the list - except for the depmonitor service which is always - started at the end. If some services require other ones (even non declared - in the list), service requirements will be started first. - - To simplify the declaration of services and to ensure that all service - requirements are fulfilled, some services declare explicitly their - dependencies in order to start them automatically. - - The picture below describes mandatory dependencies beetwen - services. A - link between two services means that a service requires another one. Note - on the right side services without dependency links. - - - - - Optional service dependencies are not described in this picture. - They have to be declared in the list of JOnAS services when - required. - - - - - registry and jmx services can be omitted from the list because - they are automatically launched. - - - - As an example, starting the web service - involves the startup of the security service. - Declaring the web service in the list of - services - without declaring the security service may be a - solution. - - - - As an example, starting the resource - service involves the startup of the wm and the - jtm services. Declaring the - resource service in the list of services without - declaring the wm and the jtm - service may be a solution. - - -
    - -
    - - Customizing services - - - Configuration parameters for services follow a strict naming - convention: a service XX will be - configured via a set of properties: - - - jonas.service.XX.foo something - - jonas.service.XX.bar else - - each service XX must contain the - property jonas.service.XX.class indicating the name - of the java class that implements the service: - - jonas.service.XX.class aa.bb.XXImpl - - This allow experimented user to replace built-in service by an - alternative implementation. - - - - For example here is the part of - jonas.properties file related to the customization - of the jtm service: - - -###################### JOnAS JTM Transaction service configuration -# Set the name of the implementation class of the jtm service -jonas.service.jtm.class org.ow2.jonas.tm.jotm.JOTMTransactionService - -# Set the Transaction Manager launching mode. -# If set to 'true', TM is remote: TM must be already launched in an other JVM. -# If set to 'false', TM is local: TM is going to run into the same JVM -# than the jonas Server. -jonas.service.jtm.remote false - -# Set the default transaction timeout, in seconds. -jonas.service.jtm.timeout 60 - - - - see for a complete description of - the services configuration. -
    - -
    - - Development vs Production mode - - - may be - configured to be in development mode and in production mode. This can be - defined by setting the jonas.development - global property. Activating one of this mode changes some server - behaviours as described in the following section. - -
    - - Development mode - - - This is the default mode. - - Starts automatically the workcleaner - (wc) service. - - - - Allows to start automatically services which are required to - initiate the deployment of the Java EE archives. Ex: deploying the - sample.war will trigger the startup of the - web service. - - List of services that may be started dynamically depending - on the deployed Java EE archives: - - web (WARs), ejb2 (EJB2s), ejb3 (EJB3s), resource (RARs), ear (EARs) - - - Known limitations: if an application needs some additional - services to work like for example Web Services support - (jarxrpc or jaxws - services), the administrator have to add those kind of services - manually in the static description of services. - - - - - In case of the development property of the - depmonitor service is set to inherit, the - period scan of directories managed by the - depmonitor (by default the deploy/ - directory) service will be enabled. - - - - WAR archive deployment case (for single or EAR packaged - WARs). Each WAR archive is unpacked in the working directory of - the - server in a different folder to avoid file locks. This is - especially useful in a Windows environment. - - - - Necessary to enable the onDemand feature of the - web service. - - -
    - -
    - - Production mode - - - This mode is recommended in industrial production context. - - - - In case of the development property of the depmonitor - service is set to inherit, the period scan of directories managed - by the depmonitor (by default the deploy/ - directory) service will be disabled. - - - - WAR archive deployment case (for single or EAR packaged - WARs). Each WAR archive is unpacked in the working directory of - the - server in the same folder. - - - - Force the disabling of the onDemand feature of the - web service. - - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/config/jonasbase_conf.xml b/jonas_doc/core/src/docbook/doc-en/config/jonasbase_conf.xml deleted file mode 100644 index 113f174193e2f31e8df1066cbbd9c229540b1323..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/config/jonasbase_conf.xml +++ /dev/null @@ -1,146 +0,0 @@ - -
    - - JONAS_BASE/conf description - - - This directory contains configuration files in various format - (properties files, xml files). - - The main configuration file is jonas.properties - but there are also: - - - - Templates for configuring access to databases for the - dbm service, (Oracle, PostgreSQL, Sybase, DB2, - MySQL, HSQLDB, InterBase, FirebirdSQL, Mckoi SQL, InstantDB ) - respectively in Oracle1.properties, - PostgreSQL1.properties,etc... All these databases - have been tested with . - - - - Mail resources templates : - MailMimePartDS1.properties, - MailSession1.properties - - - - JORAM configuration files : a3debug.cfg, - a3servers.xml, - joramAdmin.xml - - - - EasyBeans ejb3 container configuration file is named - easybeans-jonas.xml. - - - - carol.properties, - jacorb.properties for configuring the RMI - implementation used through CAROL. - - - - Configuration files for clustering : cmi-config.xml, - clusterd.xml, - domain.xml, jgroups-discovery.xml, - jgroups-ha.xml, - jgroups-cmi.xml. - - - - Configuration files related to security: - jaas.config, java.policy, - jonas-realm.xml - - - - Web container configuration files: - - - - tomcat6-server.xml, - tomcat6-context.xml, tomcat6-web.xml - for Tomcat, - - - - jetty6.xml jetty6-web.xml - for Jetty. - - - - - - Web services configuration - files:uddi.properties, - file1.properties. - - - - Client container configuration file: - jonas-client.properties - - - - JOnAS traces configurations files: - trace.properties, - traceclient.properties - - - - Transaction recovery configuration file : - jotm.properties - - - - P6Spy options file: spy.properties - - - - Java Service Wrapper configuration file: - wrapper.conf - - - - Deployment plan initial repositories are stored in - initial-repositories.xml file. - - - - jmx.access, - jmx.passwords and - jmx.rolbased.access are configuration files used to - secure the JMX connector access. - - - - jndi-interceptors.xml is used by the JNDI - Interceptors allowing for example to automatically close the JDBC - connections if they're not closed by the application. - - - - classloader-default-filtering.xml allows to - hide to applications some classes exported by the Application - Server. - - - - banner.txt allows to change the banner of the - JOnAS scripts. - - - - Most of these files are described in following sections. -
    diff --git a/jonas_doc/core/src/docbook/doc-en/config/jonasbase_creation.xml b/jonas_doc/core/src/docbook/doc-en/config/jonasbase_creation.xml deleted file mode 100644 index 09c84770938eae7d93fab0f2899b7335fd06c397..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/config/jonasbase_creation.xml +++ /dev/null @@ -1,60 +0,0 @@ - -
    - - JONAS_BASE creation - - - - - To create a JONAS_BASE template from scratch : - - Unix - - export JONAS_BASE=~/my_jonas_base -cd $JONAS_ROOT/templates/newjb -ant -f build-jb.xml create_jonas_base - - Windows set JONAS_BASE=my_jonas_base -cd %JONAS_ROOT%/templates/newjb -ant -f build-jb.xml create_jonas_baseThis will copy all the required - files and create all the needed directories. - - - - - - Another way to create a JONAS_BASE template from scratch : - - $JONAS_ROOT/bin must be set in the system - path: - - Unix export JONAS_BASE=~/my_jonas_base -newjb - - Windows set JONAS_BASE=my_jonas_base -newjbThe JONAS_BASE content created with the newjb - command is well suited to run the JEE conformance test suite and the - example applications without any additional configuration. - - In order to customize a JONAS_BASE with specific property values - (port numbers, services, protocols etc...), you must edit the - $JONAS_ROOT/templates/newjb/build-jb.properties - file or $HOME/jb.config/conf/jonas-newjb.properties - file before running newjb. - - For further customization that cannot be performed by - newjb you should modify the generated files in - $JONAS_BASE/conf. For more information see the - description of the newjb command in Commands Reference - Guide. - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/config/jonasbase_structure.xml b/jonas_doc/core/src/docbook/doc-en/config/jonasbase_structure.xml deleted file mode 100644 index e333ead1eae1ead18976693aa1627a0f48ee1fb6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/config/jonasbase_structure.xml +++ /dev/null @@ -1,159 +0,0 @@ - -
    - - JONAS_BASE structure - - - JONAS_BASE has the following structure: - - - - the conf/ - directory - - contains configuration files. - - - - the deploy/ - directory - - is the main location used for deployment. - - At JOnAS startup time all the deployment plans, archives and OSGi bundles - are deployed in the following order: - - - - Deployment plan repositories - - - - OSGi bundles - - - - RAR archives - - - - Deployment plan resources - - - - EJB archives - - - - WAR archives - - - - EAR archives - - - For each category, file names are chosen in - alphabetical order - - - Then this directory is periodically polled in order to - deploy new archives. For more information have a look at the depmonitor - service configuration - - - - the lib/ directory - - see Understanding - class loader hierarchy for a complete description of the - classloader mechanism. - - - Used for extending class loaders. It contains one sub - directory: - - - - - - directory - - description - - - - - - ext - - For non-bundle extensions - - - - - - - - the logs/ - directory - - where the log files are created at run-time - - - - the work/ - directory - - a working directory for - - - This is the default name for the working directory. The - working directory can be configured by editing the - JONAS_BASE/conf/jonas.properties and by - modifying the jonas.workdirectory - property. - - - - - the repositories/ - directory - - this sub tree contains the following repositories used to store - OSGi bundles and applications. Archives located in these - repositories are priority in case they are also located in - JONAS_ROOT/repositories - - - - maven2-internal/ this - directory is created during the building process of a JONAS_BASE - environment. It may contain the JORAM resource adapter for JOnAS. - It is used for internal purpose and should not be modified. This - directory is structured as a Maven2 repository. - - - - <repository-id>/ contains - archives downloaded through deployment plans from this - repository. - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/config/jonasroot_structure.xml b/jonas_doc/core/src/docbook/doc-en/config/jonasroot_structure.xml deleted file mode 100644 index 9b3c5deef7c1759fbeb231a5a59bd6db2c98f2df..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/config/jonasroot_structure.xml +++ /dev/null @@ -1,221 +0,0 @@ - -
    - - JONAS_ROOT structure - - - The installation directory (JONAS_ROOT) has the following - structure: - - - - the deploy/ - directory - - The main location used for deployment. - - At JOnAS startup, all deployment plans, archives and OSGi bundles - are deployed in the following order: - - - - Deployment plan repositories - - - - OSGi bundles - - - - RAR archives - - - - Deployment plan resources - - - - EJB archives - - - - WAR archives - - - - EAR archives - - - For each category, file names are chosen in - alphabetical order - - - This directory is periodically polled in order to - deploy new archives. For more information have a look at the depmonitor - service configuration - - - - the bin/ directory - - contains the scripts used to launch JOnAS (Unix and Windows - scripts). - - - - the conf/ - directory - - contains the configuration files. - - - - the examples/ - directory - - this sub tree containing all the JOnAS examples that are - described in - - - - the lib/ directory - - see Understanding - class loader hierarchy for a complete description of the - classloader mechanism. - - - Used for extending class loaders. It contains five sub - directories: - - - - - - Directory - - Description - - - - - - bootstrap/ - - Jars loaded by the JOnAS - bootstrap - - - - common/ - - Legacy directory where Ant tasks are - stored - - - - endorsed/ - - Jars overridding JVM libraries - - - - ext/ - - For non-bundle extensions - - - - internal-ee-tld/ - - Internal use only ! - - - - - - - - the logs/ - directory - - where the log files are created at run-time (when the JONAS_ROOT - is used as a JONAS_BASE) - - - - the templates/ - directory - - this sub tree contains the following subdirectories used by - during the - generation process (eg, JONAS_BASE generation). - - - - conf/ is an empty - template of the JONAS_BASE structure used by tools able to create - a JONAS_BASE environment. - - - - newjb/ contains the - configuration files for creating a JONAS_BASE environment. - - - - newjc/ contains the - configuration files for creating a cluster environment. - - - - - - the repositories/ - directory - - this sub tree contains the following repositories used to store - OSGi bundles, - applications and deployment plans. - - - - maven2-internal/ - contains both OSGi bundles and applications (jonasAdmin, - documentation, ...) for JOnAS. It is used for internal purpose and - should not be modified. This directory is structured as a Maven2 - repository. - - - - url-internal/ - contains the deployment plans of each JOnAS services. It is used - for internal purpose and should not be modified. - - - - <repository-id>/ contains - archives downloaded through deployment plans from this - repository. - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/configuration_guide.xml b/jonas_doc/core/src/docbook/doc-en/configuration_guide.xml deleted file mode 100644 index 9d454cac75c6f635ebead05cfd3969813b043cff..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/configuration_guide.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - JOnAS 5 Configuration guide - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2007-2011 - - OW2 Consortium - - - April 2011 - - - - - Introduction - - -
    - - Configuring JOnAS - - - Configuration is a task that may be more or less complex. - Configuring a unique instance is obviously easier than configuring a - cluster of servers. - - Configuration task consists mainly in customizing a set of - configuration - files that compose the environment see . - - First of all, some terms used is this document must be - defined: -
    - - -
    - - - - Configuring a JOnAS instance - - - is - pre-configured and ready to be used directly. The Getting Started - book has shown that a very sample example may be run after JOnAS - installation without any configuration task. But as soon as your - application needs to use resources specific to the execution environment, - configuration is mandatory. - - In this chapter we will see in a first part where are the - configuration files and then what that can be configured - -
    - - Configuring JOnAS Environment - - - JOnAS distribution contains a number of configuration files in - $JONAS_ROOT/conf directory. These - files can be edited to change the default configuration. However, it is - recommended that the configuration files needed by a specific - application running on be placed in a separate location. This is done - by using an additional environment variable called JONAS_BASE. - - JOnAS configuration files are read from the $JONAS_BASE/conf - directory. If JONAS_BASE is not defined, it is automatically initialized - to $JONAS_ROOT. - - - - - - - - - - -
    - - - - - -
    - - Configuring JOnAS Services - - - Here is the list of possible services - - registry,jmx,security,jtm,db,mail,wc,dbm,wm,resource,cmi,ha,versioning,ejb2,ejb3,jaxrpc,jaxws,web,ear,depmonitor,discovery,resourcemonitor,smartclient,wsdl-publisher - - In this chapter we will describe how to configure each service in - the jonas.properties file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    - - - - - - Glossary - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/connector_pg.xml b/jonas_doc/core/src/docbook/doc-en/connector_pg.xml deleted file mode 100644 index 1c38b89219c83172d49d9e8f15411da3eac9f606..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/connector_pg.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - J2EE Connector Programmer's Guide - - - - JOnAS Team - - - - HARDESTYEric - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - March 2009 - - - - This guide is provided for advanced JOnAS users concerned with EAI - (Enterprise Application Integration) and using the J2EE Connector - Architecture principles (refer to for an introduction to the - connectors). The target audience for this guide is the Resource Adapter - deployer and programmer. It describes the JOnAS specific deployment file ( - jonas-ra.xml ) and the sample code to access deployed RARs. - - - - - Using a J2EE Connector - - -
    - - Principles - - - Resource Adapters are packaged for deployment in a standard Java - programming language Archive file called a rar file (Resource ARchive), - which is described in the J2EE Connector Architecture - specification. - - The standard method for creating the jonas-ra.xml file is to use - the RAConfig command -
    - - - - - - -
    - - - - Exemples of Resource Adapters - - - - - - - - - - Appendix - - - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/continuous_integration_guide.xml b/jonas_doc/core/src/docbook/doc-en/continuous_integration_guide.xml deleted file mode 100644 index 9cb43166f47224ada3acc23dc795f0ac85ebea3d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/continuous_integration_guide.xml +++ /dev/null @@ -1,1196 +0,0 @@ - - - - Guide to how to do the JOnAS Continuous Integration work - - - - CVICSE - - - - LiuZongFu - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2007-2009 - - OW2 Consortium - - - July 2007 - - - - - Preface - - - Welcome to the new users of JOnAS 5.0! This guide is intended to - introduce to do the JOnAS 5.0 Continuous Integration Using Bamboo. - - Chapter1, Introduction of how to do the JOnAS5 Integration work - manually wants to help you know how to setup the JOnAS - integration work environment and do the work manually. - - Chapter2, Using Bamboo to define the JOnAS - integration work wants to help you to use bamboo to setup the - integration environment and define JOnAS integration activities. - - Chapter3, Using Bamboo - to manage the JOnAS integration work wants to help - you to use bamboo to define JOnAS integration activities and setup the - integration environment. - - Note that this guide want to stay simple and has not the ambition to - resolve all the problems that can be encountered in the real - life that can be really complex. - - For more experimented users that need to perform more complex tasks - it is recommended to look the JOnAS 5 Configuration Guide and Bamboo - documentation. - - - - - Introduction of how to do the JOnAS5 Integration work - manually - - -
    - - How to build the JOnAS manually - - - Checkout the JOnAS source code from the subversion repository to - the directory <jonas_src>. To do so, simply configure the SVN - repository URL (if you are using a GUI subversion client, configure it - appropriatly): - - svn://svn.forge.objectweb.org/svnroot/jonas/jonas/trunk/jonas - - - Before building JOnAS, you have to set up the environment - variables including JONAS_ROOT, CATALINA_HOME. You will also have to - update your PATH variable as well. - - - - Unix platforms - - Open a new terminal and proceed as follows: - - bash>export JONAS_ROOT=<jonas_install_dir> -bash>export CATALINA_HOME=<tomcat_install_dir> -bash>export PATH=${PATH}:${JONAS_ROOT}/bin/unix - - or - - tcsh>setenv JONAS_ROOT=<jonas_install_dir> -tcsh>setenv TOMCAT_HOME=<tomcat_install_dir> -tcsh>setenv PATH ${PATH}:${JONAS_ROOT}/bin/unix - - - - - - Windows platforms - - Open a new DOS window and proceed as follows: - - C:>set JONAS_ROOT=<jonas_install_dir> -C:>set CATALINA_HOME=<tomcat_install_dir> -C:>set PATH=%PATH%;%JONAS_ROOT%\bin\nt - - - - The prerequisite of building JOnAS are to use the JDK 1.5, Maven - 2.0.6 and Ant 1.6.5. Please to assure that you've installed the JDK1.5, - Maven 2.0.6 and Ant 1.6.5. - - To build the jonas,simply use the following commands: - - cd <jonas_src> -mvn clean install -ant clean install -
    - -
    - - How to build and run the JOnAS testsuite manually - - -
    - - To checkout the JOnAS Testsuite - - - Checkout the JOnAS testsuite source code from the subversion - repository to the directory <jonas_tests>.To do so, simply - configure the SVN repository URL (if you are using a GUI subversion - client, configure it appropriatly): - - svn://svn.forge.objectweb.org/svnroot/jonas/jonas/trunk/jonas_tests - - Before building JOnAS Testsuite, you have to set up the - environment. -
    - -
    - - How to setup the environment in the user's home - directory - - - Please check the user environment . Change the directory to the - user's home directory, and check the jb.config directory and - proxy.properties. - - The 'jb.config' will be used by newjb tool for creating a new - JONAS_BASE environment. - - We need to provide a proxy properties file only when using the - proxy to access the internet. So if you use a proxy, you need to - define the properties of the proxy in the configuration file of - 'proxy.properties' and then put it in the user's home directory. If - your machine can access the internet directly, you don't need provide - it . - - - Please assure there is not a property file named - 'proxy.properties' in the user's home directory when you don't need - a proxy. - - - - - Under the directory of '${user.home}/jb.config', there are two - sub-directories: conf and lib. - - Screenshot - 1.'the directory of - ${user.home}/jb.config ': - the directory of ${user.home}/jb.config - - - - - - - - - - - Open the file - '${user.home}/jb.config/conf/jonas-newjb.properties' please assure the - configurations as blow: - - #Services -jonas.services=registry,jmx,jtm,db,security,mail,wm,resource,ejb,ws,web,ear,discovery - -#Jms -jms.port=16010 -jms.topics=sampleTopic,InvoiceTopic -jms.queues=sampleQueue,OrderApprovalQueue,OrdersQueue,MailCompletedOrderQueue,SupPurchaseOrderQueue,MailOrderApprovalQueue,MailQueue - -#Carol -carol.allport=1099 -carol.defaultprotocol=jrmp -carol.jrmpopt=false - -#Web -webcontainer.port=9000 -# Tomcat/Jetty -webcontainer.service.defaultname=tomcat - -#Db -db.port=9001 - -#Discovery -discovery.sourceport=9888 -discovery.greetingport=9899 -discovery.mcastaddr=224.224.224.224 -discovery.mcastport=9080 - -#Database -rajdbc.defaultname=hsql - -#DB connections -rajdbc.hsql.user=jonas -rajdbc.hsql.password=jonas -rajdbc.hsql.url=jdbc:hsqldb:hsql://localhost:9001/db_jonas -rajdbc.hsql.drivername=org.hsqldb.jdbcDriver -rajdbc.hsql.jndiname=jdbc_1 -rajdbc.hsql.jdbcdriverjarfile=none -rajdbc.hsql.mappername=rdb.hsql - -#Mail -mail.session.name=mailSession_1 -mail.mimepartds.name=mailMimePartDS_1 -mail.to=jean.dupont@objectweb.org -mail.subject=test mail - - - - - Open the file '${user.home}/proxy.properties' please - assure the configurations as blow: proxyHost=... -proxyPort=... -nonProxyHosts=..... -proxySet=true -
    - -
    - - How to setup the environment variable - - - Before building and running JOnAS testsuite, you have to set up - the environment variables including JONAS_ROOT, - JONAS_BASE, CATALINA_HOME, XMLUNIT_HOME, HTTPUNIT_HOME, - HTTP_PORT . You will also have to update your PATH variable - as well. - - - - Open a new terminal and proceed as follows: - - bash>export JONAS_ROOT=<jonas_install_dir> -bash>export JONAS_BASE=<jonasbase_dir> -bash>export CATALINA_HOME=<tomcat_install_dir> -bash>export XMLUNIT_HOME=<xmlunit_install_dir> -bash>export HTTPUNIT_HOME=<httpunit_install_dir> -bash>export HTTP_PORT=9000 -bash>export PATH=${PATH}:${JONAS_ROOT}/bin/unix - - or - - tcsh>setenv JONAS_ROOT=<jonas_install_dir> -tcsh>setenv JONAS_BASE=<jonasbase_dir> -tcsh>setenv CATALINA_HOME=<tomcat_install_dir> -tcsh>setenv XMLUNIT_HOME=<xmlunit_install_dir> -tcsh>setenv HTTPUNIT_HOME=<httpunit_install_dir> -tcsh>setenv HTTP_PORT=9000 -tcsh>setenv PATH=${PATH}:${JONAS_ROOT}/bin/unix - - - - - - Windows platforms - - Open a new DOS window and proceed as follows: - - C:>set JONAS_ROOT=<jonas_install_dir> -C:>set JJONAS_BASE=<jonasbase_dir> -C:>set CATALINA_HOME=<tomcat_install_dir> -C:>set XMLUNIT_HOME=<xmlunit_install_dir> -C:>set HTTPUNIT_HOME=<httpunit_install_dir> -C:>set PATH=%PATH%;%JONAS_ROOT%\bin\nt - - -
    - -
    - - How to build and run the JOnAS Testsuite - - - - - To build the JOnAS Testsuite only: - - cd <jonas_tests> -ant install - - - - - - - To build and run the JOnAS Testsuite: - - cd <jonas_tests> -ant run_nightly - - -
    -
    - -
    - - Conclusion - - - From the above as you know, the JOnAS integration work consists - three main building activities : - - cd <jonas_src>; mvn clean install -cd <jonas_src>; ant clean install -cd <jonas_tests>; ant run_nightly - - In the next chapter , it will introduce how to use the Bamboo to - define the JOnAS integration building work which consists of three main - JOnAS integration activities. - - Using Bamboo, you can define the the Integration work and then run - and monitor the activities. - - Bamboo also provide many kinds of reports for the results of - integration activities. -
    -
    - - - - Using Bamboo to define the JOnAS integration work - - - First , you need to login into the Bamboo system as - administrator. - please assure that the user home environment has been setup, - refer to 'How to setup the environment in the user's home directory in - the chapter1. - - -
    - - Setup the Builds environment in Bamboo - - - Using Bamboo to do the JOnAS integration work, you need to - configure the JDK, builds(Maven, Ant) and environment variables. - - JDKs: J2SDK 1.5 -Builders: Maven 2.0.6, Ant 1.6.5 -Global variables: define the environment property to pass the environment variables values - (JONAS_ROOT, JONAS_BASE, CATALINA_HOME, XMLUNIT_HOME, HTTPUNIT_HOME) - - Click the 'Administration' link in the top navigation bar, to - enter into the administrator page: - Builds overview - - - - - - - - -
    - - How to configure the JDK - - - Click the 'JDKs' link in left navigation column. This will - display a list of Available JDKs. To configure a JDK in Bamboo is same - with the Builders. Bamboo will automatically add the JDK which default - JAVA_HOME entry points at. In the Label field, the name is that will - appear in the 'Builder JDK' drop down list when a plan is - configured. - - - Builds- JDKs List - - - - - - - -
    - -
    - - How to configure the Builders - - - Click the 'Builders' link in left navigation column. The - Builders in Bamboo are the build tools , such as Ant, Maven, Make, - etc. This will display a list of Available Builders that have been - configured in Bamboo, with an empty field at the bottom of each column - for adding a new Builder. In the Label field, type the name that will - appear in the 'Builders' drop down list when a plan is - configured. - Builds- Builders List - - - - - - - - - -
    - -
    - - How to configure the Global Variables - - - Click the 'Global Variables' link in the left navigator column - and this will display a list of variables that have been configured in - Bamboo, with an empty field at the bottom of each column for adding a - new variable. In the 'Key' field, type the key of the variable that - you want to identify the variable. In the 'Value' field, type the - value of the variable. Then click the 'Save' button. - - - Builds-Global Variables List - - - - - - - -
    -
    - -
    - - Create the plans in Bamboo for JOnAS Integration - Activities - - - Now you will define the build plan in Bamboo for every integration - activities of the JOnAS. - - - - - - Build Plan in Bamboo - - Activity - - - - Maven Build - - cd <jonas_src>; mvn clean install - - - - Ant Build - - cd <jonas_src>; ant clean install - - - - Tests Build - - cd <jonas_tests>; ant run_nightly - - - - - - - -
    - - How to create a project and a 'Maven Build' plan - - - To create a new plan for ' Maven - Build': - - - - Click the 'Create Plan'link in the top - navigation bar. - - - - Enter the required information in the 6 screens as described - below.When you return to the Dashboard, your new plan (and new - project, if applicable) will be displayed in the 'All Projects' list. - - - - Screenshot 1. 'Plan Details' - : - - - - - - 1. 'Plan Details': - - - - - Project — When you create a new plan, you can either add it - to an existing project or create a new project. Either: - - - - Select the appropriate project from the drop-down - list; - - or - - - - - - Select 'New Project' and complete the following two - fields: - - - - Project Name— Type a descriptive name ('Maven Build') that will identify - your project on the Dashboard and in reports. - - - - Project Key — Type a logical contraction of the - Project Name ('J5'). The - Project Key will be included in the plan's Build Results - keys ('J5-MVN-XXX'), so - you may want to make it no longer than 3 or 4 characters. - The Project Key must be unique within your Bamboo system. - The Build Results keys'suffix 'XXX' identifies the XXX - test results. - - - - - - - - - - Build Plan Name — Type a name that will identify the plan - within its project ('Maven - Build'). Note that the Build Plan Name, which is - displayed throughout Bamboo, is always accompanied by its Project - Name. - - - - - - Build Plan Key — Type a logical contraction of the Build - Plan Name. The Build Plan Key ('MVN') will be included in the plan's Build - Results keys ('J5-MVN-XXX''), so - you may want to make it no longer than 3 or 4 characters. Note - that the Build Plan Key only has to be unique within the - project. - - - - - - Screenshot - 2. 'Source - Repository': - - - - - - - - - - 2. 'Source Repository': - - - - 'Repository' — Select the type of repository from which - Bamboo will check-out and build this plan's source-code. The - following fields will vary depending on what type of repository - you select: - - - - Subversion: - - - - 'Repository URL' — The location of subversion - repository - (svn://svn.forge.objectweb.org/svnroot/jonas/jonas/trunk/jonas). - - - - - - 'Username' — (Optional) - - - - - - 'Authentication Type' — Select 'Password' - - - - - - 'Password — (Optional) , use the anonymous name - access - - - - - - - - - - 'Include/Exclude Files' — select 'None' - - - - - - 'Web Repository URL' — (Optional) The plan's repository web - URL. - - - - - - 'Web Repository Module' — (Optional) The plan's repository - name, if the above Web Repository URL points to multiple - repositories. - - - - - - 'Build Strategy' —select 'Poll the repository for changes', - is a convenient option that requires no additional configuration. - A number of other options are available; for details, please see - 03. Triggering a Build. You can change the Build Strategy over - time as required. The rest of the fields on this tab will vary - depending on which Build Strategy you select. - - - - - - 'Polling Frequency—'180', in seconds - - - - Screenshot 3. 'Builder Configuration' - : - - - - - - - - 3. 'Builder Configuration': - - - 'Builder' — Select 'Maven 2.0.6'. From the list of - available Builders, select the one which Bamboo will use to - build this plan.The following fields are maven builder: - - - - Maven: - - - - 'Goal' — 'clean install'. Specify the Maven goal - you want Bamboo to execute each time the source code - changes. - - - - - - 'Build JDK' —1.5.0_10. - - - - - - 'System Environment Variables' — (Optional) - - - - - - 'Working Sub Directory'— (Optional) - - - - - - - - 'Build JDK' —1.5.0_10. - - - - 'System Environment Variables' — (Optional) - - - - 'Web Repository Module' — (Optional) The plan's repository - name, if the above Web Repository URL points to multiple - repositories. - - - - 'Working Sub Directory'— (Optional) - - - - 'Where should Bamboo look for the test result files'— - (Optional) .Select this check-box if you want Bamboo to gather - test results data for each build result. - - - - - - 'Where should Bamboo look for the Clover code-coverage - output'— (Optional) . Select this check-box if you are running - Cenqua Clover and want to view its code-coverage data from within - Bamboo. - - - - Screenshot 4. 'Build Artifacts' - : - - - - - - - - - - 4. 'Build Artifacts': - - - - Here you can specify the plan's artifacts. These can be any - reports, websites, or JAR files that were created by the build - process. Build artifacts are copied to a subdirectory - (/PROJECT_NAME/download_data) under your 'Projects Data' folder, - which you specified when installing Bamboo. - - - - - - Screenshot 5. 'Build Notification' - : - - - - - - - - - - - - 5. 'Build Notification': - - - Here you can specify who will receive notifications and - how there are sent (mail or instant messaging). - - - - Screenshot 6. 'Post Action' - : - - - - - - - - 6. 'Post Action': - - 'Regex Pattern' — The regular expression for which to - match the log files on. Labels will be applied to the build if - the regular expression finds a match. You can leave this blank - to label every build. - - - - - - 'Labels' — Type the labels (if any) which you want to - automatically apply to the plan's build results. - - - - - - Click 'Save' button, Bamboo will begin to build according to - 'Maven Build' plan: - - - - - - - - -
    - -
    - - How to create a 'Ant Build' Plan - - - To create a new plan for ' Ant Build' - in a existing project 'JOnAS5' - - - - Click the 'Create Plan' - link in the top navigation bar. - - - - On the 'Plan Details' - screen, select the check-box 'Clone an - existing build plan?' - - - - A list called 'Plan to - clone' will be displayed. Select the 'JOnAS5-Maven Build' plan you wish to - copy. - - - - Enter the required information in the 6 screens as described - below. On screens 2-6, appropriate information will be copied from - the plan you selected; but you will need to complete all fields on - screen 1. - - - - Screenshot - 1. 'Plan Details': - - - - - - - - - - Screenshot - 2.'Source - Repository': Refer to the screenshot of 'Maven Build' - plan. - - Screenshot 3. 'Builder Configuration' - : - - - - - - - - - : The target of build should be 'clean install - -Djonas.root=${bamboo.jonas.root.50} - -Dcatalina.home=${bamboo.catalina.home}'. - - - - - Screenshot 4. 'Build Artifacts' : Refer to the screenshot of - 'Maven Build' plan. - - Screenshot 5. 'Build Notification': Refer to the screenshot of - 'Maven Build' plan. - - Screenshot 6. 'Post Action' : Refer to the screenshot of 'Maven - Build' plan. -
    - -
    - - How to create a 'Tests Build' Plan - - - To create a new plan for ' Tests - Build': - - - - Click the 'Create Plan'link in the top - navigation bar. - - - - Enter the required information in the 6 screens as described - below. When you return to the Dashboad, your new plan (and new - project, if applicable) will be displayed in the 'All Projects' list. - - - - Screenshot 1. 'Plan Details' - : - - - - - - - - - - - - Screenshot - 2.'Source - Repository' - - - - - - - - - - - - Screenshot 3. 'Builder Configuration' - : - - - - - - - - 3. 'Builder Configuration' - : - - Builder' — Select 'Ant 1.6.5'. From the list of available - Builders, select the one which Bamboo will use to build this plan.The - following fields are ant builder: - - - - Ant: - - - - 'Build file' — 'build.xml'. Type the relevant - filename. - - - - - - 'Build JDK' —'1.5.0_10. - - - - - - 'Target'—Specify the Ant target you want Bamboo to - execute each time the source code change. For JOnAS, Type the - target as below: - - - - - - run_nightly -Djonas.root=${bamboo.jonas.root.50} -Dhttpunit.home=${bamboo.http.unit} -Dhttp.port=9000 -Dxmlunit.home=${bamboo.xml.unit} -Dcatalina.home==${bamboo.catalina.home} --Duser.home=<your_user_home> - - - - Screenshot 4. 'Build Artifacts' - : - - - - - - - - - - - - Screenshot 5. 'Build Notification': Refer - to the screenshot of 'Maven Build' plan. - - Screenshot 6. 'Post Action' : Refer to the - screenshot of 'Maven Build' plan. -
    - -
    - - How to define the relation of the three JOnAS Integration - Activities - - - - - - - - - -
    -
    -
    - - - - Using Bamboo to manage the JOnAS integration work - - -
    - - Overview of the directory of Bamboo - - - - - - - - - -
    - -
    - - Using the Dashboard - - - The Dashboard contains three tabs: - - - - 'All Plans' — a list of build plans and each plan's latest - build result. - - - - - - 'Current Activity' — Bamboo's build queues, showing which - plans Bamboo is currently building and which plans are waiting to be - built. - - - - - - 'My Bamboo' ¹ — a convenient summary of information that is - relevant to you, It contains the information of your favorite - build. - - - - Screenshot - 1. 'All Plans': - - - - - - - - - - To view - Bamboo's current activity, - - - - Click the 'Home' link in the top navigation bar. This will - display the Dashboard. - - - - Click the 'Current Activity' tab. This will display Bamboo's - Build Queues, as well as a list of RecentlyCompleted Builds. - - - - Screenshot2: Bamboo Dashboard-'Current - Activity' tab: - - - - - - - - -
    - -
    - - Viewing the Build result - - - Click the 'Home' link in the top navigation bar. This will display - the Dashboard. - - Click the 'Test Build' link in the 'All Plans' tab. This will - display the 'Test Plan' page. Click the 'Activity' tab. This will - display the activity of 'Tests Build'. - - Screenshot1: Build result-'Activity' - tab: - - - - - - - - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deploy/ear.xml b/jonas_doc/core/src/docbook/doc-en/deploy/ear.xml deleted file mode 100644 index e7f97923c30982b48bdee3c50d79c765b6483d14..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deploy/ear.xml +++ /dev/null @@ -1,35 +0,0 @@ - -
    - - Deploying and installing a J2EE application - - - Before deploying a J2EE application in the JOnAS application server, - first package its components in an ear file as explained in the EAR - packaging guide . - - Next, install the ear file into the $JONAS_BASE/deploy - directory. - - Then, check the configuration : before running the application, check - that the ejb2, ejb3 , web and ear services are present in the - jonas.services property. - - Finally, run the application Server: jonas start - - The application components are deployed in EJB and web containers - created during the startup. - - It is also possible to dynamically deploy the application components - using the jonas admin command or JonasAdmin - tool. -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/deploy/ejb2.xml b/jonas_doc/core/src/docbook/doc-en/deploy/ejb2.xml deleted file mode 100644 index b259a362869129425dcf813893acf98a5506943f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deploy/ejb2.xml +++ /dev/null @@ -1,194 +0,0 @@ - -
    - Example of deploying and installing an EJB using an ejb-jar file - - For this example, it is assumed that a user wants to customize the deployment of the - AccountImpl - bean in the JOnAS example - - examples/src/eb - - by - changing the name of the database table used for the persistence of the - AccountImpl - . - - - The current directory is - - $JONAS_ROOT/examples/src/eb - - . The user will do the following: - - - - Edit - - jonas-ejb-jar.xml - - and modify the value of the - - <jdbc-table-name> - - element included in the - - <jdbc-mapping> - - element corresponding to - - AccountImpl - - entity. - - - Compile - all the - - .java - - files present in this directory: - javac -d ../../classes Account.java AccountImplBean.java AccountExplBean.java AccountHome.java ClientAccount.java - - - Perform deployment - - - Build an ejbjar file named - - ejb-jar.jar - - with all the corresponding classes and the two deployment descriptors: - - -mkdir -p ../../classes/META-INF -cp ejb-jar.xml ../../classes/META-INF/ejb-jar.xml -cp jonas-ejb-jar.xml ../../classes/META-INF/jonas-ejb-jar.xml -cd ../../classes -jar cvf eb/ejb-jar.jar META-INF/ejb-jar.xml META-INF/jonas-ejb-jar.xml - eb/Account.class eb/AccountExplBean.class eb/AccountHome.class eb/AccountImplBean.class - - - - From the source directory, run the - GenIC - generation tool that will generate the final - - ejb-jar.jar - - file with the interposition classes: - -GenIC -d ../../classes ejb-jar.jar - - - - - Install - the ejb-jar in the - - $JONAS_ROOT/ejbjars - - directory: - -cp ../../classes/eb/ejb-jar.jar $JONAS_ROOT/ejbjars/ejb-jar.jar - - - - The JOnAS application Server can now be launched using the command: - - jonas start - - The steps just described for building the new - - ejb-jar.jar - - file explain the deployment process. It is generally implemented by an ANT build script. - - - If - Apache ANT - is installed on your machine, type - ant install - in the - - $JONAS_ROOT/examples/src - - directory to build and install all - - ejb-jar.jar - - files for the examples. - To write a - - build.xml - - file for ANT, use the - - ejbjar - - task, which is one of the optional - - EJB task - - s defined in ANT. The - - ejbjar - - task contains a nested element called - - jonas - - , which implements the deployment process described above (interposition classes generation and EJB-JAR file update). - Generally, the latest version of the EJB task containing an updated implementation of the - - jonas - - nested element is provided with JOnAS, in - - $JONAS_ROOT/lib/common/ow_jonas_ant.jar - - . Click here for the - - documentation - - corresponding to this new version of the jonas nested element. - As an example, this code snippet is taken from the - - $JONAS_ROOT/examples/src/alarm/build.xml - - : - - - <!-- ejbjar task --> - <taskdef name="ejbjar" - classname="org.objectweb.jonas.ant.EjbJar" - classpath="${jonas.root}/lib/common/ow_jonas_ant.jar" /> - - <!-- Deploying ejbjars via ejbjar task --> - <target name="jonasejbjar" - description="Build and deploy the ejb-jar file" - depends="compile" > - <ejbjar basejarname="alarm" - srcdir="${classes.dir}" - descriptordir="${src.dir}/beans/org/objectweb/alarm/beans" - dependency="full"> - <include name="**/alarm.xml"/> - <support dir="${classes.dir}"> - <include name="**/ViewProxy.class"/> - </support> - <jonas destdir="${dist.ejbjars.dir}" - jonasroot="${jonas.root}" - protocols="${protocols.names}" /> - </ejbjar> - </target> - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/deploy/principes.xml b/jonas_doc/core/src/docbook/doc-en/deploy/principes.xml deleted file mode 100644 index bf273329a77739a35e15cf1118cfecec7de482ec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deploy/principes.xml +++ /dev/null @@ -1,38 +0,0 @@ - -
    - - The deployment and installation of Enterprise Beans - - - This guide assumes that the Enterprise Bean provider followed the Enterprise Beans Programmer's Guide and packaged the beans's classes together with the deployment descriptors in a ejb-jar file. To deploy un-packed Enterprise Beans, refer to - - Configuring EJB Container service - - . - - - To deploy the Enterprise Beans in JOnAS, the deployer must add the interposition classes interfacing the EJB components with the services provided by the JOnAS application server. - The - - GenIC - - tool supplied in the JOnAS distribution provides the capability of generating interposition classes and updating the ejb-jar file. - The application deployer may also need to customize the deployment descriptors in order to adapt it to a specific operational environment. This must be done before using GenIC. - - - The deployer may choose to deploy the Enterprise Beans as stand-alone application components, in which case the ejb-jar must be installed in the - - $JONAS_ROOT/ejbjars - - directory. The deployer may also choose to include them in war or ear packaging, which is presented in the following sections. - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/deploy/war.xml b/jonas_doc/core/src/docbook/doc-en/deploy/war.xml deleted file mode 100644 index 6078a58f6f1ac32d1169814d8391301dbc69b20f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deploy/war.xml +++ /dev/null @@ -1,92 +0,0 @@ - -
    - - Deploying and installing a Web application - - - Before deploying a web application in the JOnAS application server, first - package - its components in a war file as explained in the - - WAR packaging guide - - . - For - Apache ANT - , refer to the target - - war - - in the - - $JONAS_ROOT/examples/earsample/build.xml - - file. - - - Next, - install - the war file into the - - $JONAS_ROOT/webapps - - directory. - Note: - Be aware that the war file must not be installed in the - - $CATALINA_HOME/webapps - - directory. - - - Then, check the - configuration - : before running the web application; check that the - web - service is present in the - - jonas.services - - property. The - ejb - service may also be needed if the Web application uses enterprise beans. - The name of the war file can be added in the - - jonas.service.web.descriptors - - section. - - - Finally, - run - the application Server: - - - jonas start - - - - The web components are deployed in a web container created during the startup. If the war file was not added in the - - jonas.service.web.descriptors - - list, the web components can be dynamically deployed using the - - jonas admin - - command or - - JonasAdmin - - tool. - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/deploy/webapps.xml b/jonas_doc/core/src/docbook/doc-en/deploy/webapps.xml deleted file mode 100644 index 08d640bdb04b1e51ec6df76504de408c84fecd84..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deploy/webapps.xml +++ /dev/null @@ -1,38 +0,0 @@ - -
    - - The deployment and installation of Web and J2EE applications - - Once the packaging of the application components has been completed as described in the - - WAR Packaging - - or - - EAR Packaging - - guides, the obtained archive file must be installed in the: - - - - $JONAS_ROOT/webapps - - directory, for war files - - - - $JONAS_ROOT/apps - - directory, for ear files - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/deployer_guide.xml b/jonas_doc/core/src/docbook/doc-en/deployer_guide.xml deleted file mode 100644 index 0b6789bb7902f73cbe4bbb5685ff947aac35eee9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployer_guide.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - Deployment and Installation Guide - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - Fev 2008 - - - - The target audience for this guide is the application - deployer. - - - - - Installing JOnAS - - - - - - - - - - - - Deployment and installation of applications - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-common.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-common.xml deleted file mode 100644 index 8a968d41184c62f86591efe846edb48fe00d7b66..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-common.xml +++ /dev/null @@ -1,79 +0,0 @@ - -
    - Deployment common parts - - The common part of the deployment syntax is described in the - XML Schema Definition. - - Those are the information pieces that are common to all deployment - types: - - id: this information is - mandatory and gives a identifier to the deployment plan. - - - - repository-ref: - this information is optional. The value is the id of a repository - known by the server. When given, the server will only search the - resource on this repository. - - - - reloadable: this - information is a boolean (true or false), is optional and its default - value is true. When set to true, after the resource is correctly - deployed, the server will check the resource on the repository - periodically. If the resources changes, the server will redeploy - it. - - - - start: this information is a - boolean (true or false), is optional and its default value is true. - When set to true, if the resource to deploy is an OSGi bundle, the - server will install and start the bundle on the framework. When set to - false, the server will only install the bundle on the - framework. - - - - reference: this information is a boolean - (true or false), is optional and its default value is false. When set - to true, if the resource to deploy is an OSGi bundle, the server will - install the OSGi bundle as a referenced JAR file, i.e. the JAR of the - bundle (and its embedded JARs) will not be copied in the cache of the - OSGi framework. When set to false, the server will install the bundle - on the framework in the standard way. - - - - startlevel: this information is a number - greater than or equal to 1, is optional and its default value is 1. - When set to true, if the resource to deploy is an OSGi bundle, the - server will install the OSGi bundle with the given start level. When - the OSGi framework is launched, the framework will enter start level - one and all bundles which are assigned to start level one are started. - The framework will continue to increase the start level, starting - bundles at each start level, until the framework has reached a - beginning start level. - - - - starttransient: this information is a boolean - (true or false), is optional and its default value is true. When set - to true, if the resource to deploy is an OSGi bundle, the bundle start - operation is transient, which means that the persistent autostart - setting of the bundle is not modified. - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-element-attribute.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-element-attribute.xml deleted file mode 100644 index 9697418fcdd04e3a7190a2214a126e13d474bd23..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-element-attribute.xml +++ /dev/null @@ -1,57 +0,0 @@ - -
    - Information that can be provided as element or attribute - - Some information can be specified either as XML element or XML - attribute. For example: - id as attribute - - <deployment id="deployment-1"> - ... - </deployment> - is the same as - id as element - - <deployment> - <id>deployment-1</id> - ... - </deployment> - - - It is the case for : - - id - - - - repository-ref - - - - reloadable - - - - start - - - - reference - - - - startlevel - - - - starttransient - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-mixed.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-mixed.xml deleted file mode 100644 index a08b5360c49cc6c5f0e0f8f614aa6568f3d10da2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-mixed.xml +++ /dev/null @@ -1,43 +0,0 @@ - -
    - Mixing deployments types - - It is possible to use deployments of different types in the same - deployment plan. To achieve that, one just has to declare all the required - namespaces. - - The following example mixes URL and Maven2 deployments in the same - deployment plan - - - Deployment plan with different deployment types - - <?xml version="1.0" encoding="UTF-8"?> - <deployment-plan xmlns="http://jonas.ow2.org/ns/deployment-plan/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:url="http://jonas.ow2.org/ns/deployment-plan/url/1.0" - xmlns:m2="http://jonas.ow2.org/ns/deployment-plan/maven2/1.0"> - - <deployment xsi:type="url:url-deploymentType" id="dep1"> - <url:resource>easybeans-example-statefulbean-1.0.1-SNAPSHOT.jar</url:resource> - <repository-ref>home-repository</repository-ref> - </deployment> - - <deployment xsi:type="m2:maven2-deploymentType" id="dep3"> - <m2:groupId>org.ow2.easybeans</m2:groupId> - <m2:artifactId>example-server</m2:artifactId> - <m2:version>1.1.0-SNAPSHOT</m2:version> - <m2:type>ear</m2:type> - <reloadable>true</reloadable> - </deployment> - - </deployment-plan> - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-sample-example.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-sample-example.xml deleted file mode 100644 index e48a2bf16bea7e3c9756d53138b250f2c9d03e6f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-sample-example.xml +++ /dev/null @@ -1,77 +0,0 @@ - -
    - Deployment plan sample example - - This example shows how to control the deployment of two archives which - are located on the file system - - Myear1.ear and Myear2.ear are located in local directory /home/elsewhere. - - - - Add a new repository element in - $JONAS_BASE/conf/initial-repositories.xml: - - <?xml version="1.0" encoding="UTF-8"?> - -<repositories - xmlns="http://jonas.ow2.org/ns/deployment-plan/repositories/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="repositories-1.0.xsd"> - - <!-- Add new repositories here --> - <repository id="MyLocalRepository"> - <type>url</type> - <url>file:/home/elsewhere</url> - </repository> - <!-- Default repositories --> - <repository id="maven2-central"> - <type>maven2</type> - <url>http://repo1.maven.org/maven2/</url> - </repository> - <repository id="maven2-ow2-release"> - <type>maven2</type> - <url>http://maven.ow2.org/maven2/</url> - </repository> - <repository id="maven2-ow2-snapshot"> - <type>maven2</type> - <url>http://maven.ow2.org/maven2-snapshot/</url> - </repository> - -</repositories> - - - - - - create a new deployment plan - $JONAS_BASE/deploy/MyDeploymentplan.xml - - <?xml version="1.0" encoding="UTF-8"?> - <deployment-plan xmlns="http://jonas.ow2.org/ns/deployment-plan/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:url="http://jonas.ow2.org/ns/deployment-plan/url/1.0"> - - <deployment id="foo1" xsi:type="url:url-deploymentType"> - <url:resource>Myear1.ear</url:resource> - </deployment> - - <deployment id="foo2" xsi:type="url:url-deploymentType"> - <url:resource>Myear2.ear</url:resource> - </deployment> - - </deployment-plan> - - As the deployment plan is under $JONAS_BASE/deploy/ it will be - taken into account at server starting time. - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-type.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-type.xml deleted file mode 100644 index 66f07f2e3a3270aea04935ae1d4fb506ced967d5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan-type.xml +++ /dev/null @@ -1,52 +0,0 @@ - -
    - Deployment type - - deployment is an abstract XML type, and concrete - type must be declared. Concrete types are for example URL, Maven2 or - OBR. Each deployment type is defined in its own XML Schema Description file - (XSD file). In order to use one type, it is necessary to declare a namespace for it. - Here is an example of namespace declaration : - - - example: namespace declaration - - <deployment-plan xmlns="http://jonas.ow2.org/ns/deployment-plan/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:m2="http://jonas.ow2.org/ns/deployment-plan/maven2/1.0"> - - - This a deployment plan contains a namespace for the Maven2 - deployment type using the m2: prefix. We can then add a Maven2 deployment : - - example: Maven2 deployment type - - <deployment-plan xmlns="http://jonas.ow2.org/ns/deployment-plan/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:m2="http://jonas.ow2.org/ns/deployment-plan/maven2/1.0"> - <deployment xsi:type="m2:maven2-deploymentType ... - - - - The information provided in each deployment element is divided in two parts: - - - data that is specific to a deployment type (URL, Maven2, - OBR) - - - - data that can be used in any deployment. - - See the deployment type specific pages for the currently supported - types : URL, Maven2 and OBR -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan.xml deleted file mode 100644 index 5856080505df763721168c38f436e148ca1d6cea..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/deployment-plan.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - Deployment plans - - A deployment plan is a XML file where the children of the root node are - deployment elements representing resources that will be deployed in the order in - which they appear. - - The exact syntax of the deployment node in the - deployment plan depends on the type of the resource - (maven2, obr, url...), but there are some parts that are common to all the - deployment elements. - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/introduction.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/introduction.xml deleted file mode 100644 index 4f0b2d01a6956df77e26bdb8943f7d533df686a0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/introduction.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - Deployment plans - Introduction - - A deployment plan is an XML file that describes a succession of resources to be deployed in the given order. - The deployment plan only contains references to the deployable resources like for example, Java EE archives or an OSGi bundles. - In order to deploy the resources on a server, the deployment plan has to be deployed on that server. - The server will retrieve each resource from a repository before deploying it. - The resources in a deployment plan may be stored in one or more repositories. - - To deploy a deployment plan, one has to set up the repositories on the target - server. The deployment plans will then be able to refer to these - repositories. - - The deployment plan functionnality supports currently three kinds of - resources (both local or remote): - - - - URL resources which point to valid URL locations. - - - - Maven 2 resources which enable to deploy versioned - resources. - - - - OBR (OSGi Bundles Repository) resources which allow to benefit of - the OBR resolver to deploy a requested OSGi bundle and its - dependencies. - - - The OBR deployment feature is currently partially supported as - it only deploys specified OSGi bundle resources without their - dependencies. The complete feature implementation is on-going. - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/jonas/jonas-deployment-plan.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/jonas/jonas-deployment-plan.xml deleted file mode 100644 index ac2efd738d9398f2766a5d9bb3e192bb70e794ce..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/jonas/jonas-deployment-plan.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - Deployment plans in JOnAS 5 - -
    - Initial repositories - - The conf/initial-repositories.xml file allows - to add repositories to the list of availaible repositories at server startup. - - This file follows the same syntax as the repository list XML - files. -
    - -
    - The resourcemonitor service - - There is one service that is related to deployment plans in JOnAS 5. - - - the resource monitoring service, named - resourcemonitor in the - conf/jonas.properties file. - - - - You can activate this service by adding it to the - jonas.services list in - conf/jonas.properties. For example: - - <property>jonas.service</property> with resourcemonitor service - active - - jonas.services registry,jmx,jtm,db,security,wm,wc,resource,ejb2,ejb3,ws,web,ear,depmonitor,resourcemonitor - will activate the resource monitoring service. - - This service is only useful if deployment plans with - reloadable deployments are deployed. - - The conf/jonas.properties file permits to - configure the following options: - - jonas.service.resourcemonitor.monitorInterval: - the time in milliseconds between two resource checks. If the option - is not provided, this has a default value of 30 000 (30 - seconds) - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/repositories.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/repositories.xml deleted file mode 100644 index 946e94e9d0bf6745cebec3de02bc362bfd7c84dc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/repositories.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - Repositories - - The server maintains a list of repositories that can store the resources to be deployed using - deployment plans. - -
    - Creating the repository list - - The repositories list is an XML document with syntax described - in - the XML Schema Definition. - - An example of a repository list file can be seen here. - - The root node is repositories and must specify - the following namespace: - http://jonas.ow2.org/ns/deployment-plan/repositories/1.0. - - - Each child of the repositories node is a - repository node and describes one repository. The - repository nodes have a mandatory id - attribute that identifies globally (i.e. at the server level) the repository. - - The repository node then has two children nodes : - - - type that specifies how the server can - communicate with the repository (for example maven2, obr, - url); - - - - url that gives the repository location. - - - - - Example of a repository file with three repositories. - - <?xml version="1.0" encoding="UTF-8"?> - <repositories - xmlns="http://jonas.ow2.org/ns/deployment-plan/repositories/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="repositories-1.0.xsd"> - - <repository id="maven-repository"> - <type>maven2</type> - <url>http://repo1.maven.org/maven2/</url> - </repository> - - <repository id="http-repo"> - <type>url</type> - <url>http://localhost/</url> - </repository> - - <repository id="obr-repo"> - <type>obr</type> - <url>file:///C:/obr/</url> - </repository> - - </repositories> - -
    - -
    - Using the repository lists - - The repository lists can be deployed on a server in the same way as - usual deployable resources (EAR, EJB-JAR, WAR...). This has to be done before deploying the deployment plan. - - - - In Easybeans, repositories lists can be deployed by copying the - file into the easybeans-deploy directory like any other resource. - - - In JOnAS, there are two ways to manage the repository lists. - - - You can deploy a repository list like any other - resource, either by copying it into the deploy directory - (if the development mode is active), or using Admin tools - (JonasAdmin web interface or jonas admin -a - filename command). - - - - You can use it as a configuration file, named - conf/initial-repositories.xml. - - -
    - -
    - Accessing repositories through a proxy - - Proxy can be specified by setting the Java properties http.proxyHost and http.proxyPort. - These properties are described in the Java SE documentation. - - These properties have to be set even if only some Maven repositories are used: the global Maven configuration is ignored. -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/deployment-type-specific-data.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/deployment-type-specific-data.xml deleted file mode 100644 index 7069d224f09104aaa393ddbf71e031928b26dba3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/deployment-type-specific-data.xml +++ /dev/null @@ -1,14 +0,0 @@ - -
    - Deployment type specific documentation - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/maven2-deployment-data.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/maven2-deployment-data.xml deleted file mode 100644 index a1ee5d246adbf9b0085283dda568151279470f01..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/maven2-deployment-data.xml +++ /dev/null @@ -1,77 +0,0 @@ - -
    - Maven 2 deployments - -
    - Maven2 specific data - - The Maven 2 deployments specific data can only be specified as - XML elements. Here are those elements : - - - m2:groupId (required) : the maven group - id of the artifact. - - - - m2:artifactId (required) : the maven - artifact id of the artifact. - - - - m2:version (required) : the version of - the artifact. - - - - m2:type (optional with default value: - jar) : the maven type of the artifact (jar, war, ear, ...). - - - - m2:classifier (optional with empty - default value) : the maven classifier. - - -
    - -
    - Full Maven2 deployment plan example - - The following deployment plan contains two Maven2 deployments. The - first one doesn't specify the resource type, so it is assumed to be - jar. The second one has a ear - type. - - - Deployment plan with Maven2 deployments - - <?xml version="1.0" encoding="UTF-8"?> - <deployment-plan xmlns="http://jonas.ow2.org/ns/deployment-plan/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:m2="http://jonas.ow2.org/ns/deployment-plan/maven2/1.0"> - - <deployment xsi:type="m2:maven2-deploymentType" id="dep2"> - <m2:groupId>org.ow2.easybeans</m2:groupId> - <m2:artifactId>easybeans-example-statefulbean</m2:artifactId> - <m2:version>1.1.0-SNAPSHOT</m2:version> - </deployment> - - <deployment xsi:type="m2:maven2-deploymentType" id="dep3"> - <m2:groupId>org.ow2.easybeans</m2:groupId> - <m2:artifactId>example-server</m2:artifactId> - <m2:version>1.1.0-SNAPSHOT</m2:version> - <m2:type>ear</m2:type> - </deployment> - - </deployment-plan> - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/obr-deployment-data.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/obr-deployment-data.xml deleted file mode 100644 index 62e193a2390baf93f6f6f53935e6833c6a6fc8e7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/obr-deployment-data.xml +++ /dev/null @@ -1,73 +0,0 @@ - -
    - OBR deployments - -
    - OBR specific data - - Many notions used here are defined or described in the - OSGi RFC 112 Bundle Repository . The OBR deployment gives many ways - to define a resource. You can use as many descriptions as you want, only - one search will be issued, built as the conjunction of these descriptions. - The result will be considered valid only if there is one and - only one matching resource. The OBR specific data can only be - specified as XML elements. - - Here are the possible descriptions: - - obr:bundle-symbolic-name (optional) : the - OBR symbolic name of the resource. - - - - obr:bundle-version (optional) : the OBR - version of the resource. - - - - obr:filter (optional) : a OSGi/LDAP - filter (see the RFC) that describes the resource. - - - - obr:require-service (optional) : the - resource must provide the required service. - - -
    - -
    - Full OBR deployment example - - The following deployment plan contains two OBR deployments. Both - require a resource by symbolic-name + - version, but the first uses the dedicated XML elements - while the second uses a filter. - - - Deployment plan with OBR deployments - - <?xml version="1.0" encoding="UTF-8"?> - <deployment-plan xmlns="http://jonas.ow2.org/ns/deployment-plan/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:obr="http://jonas.ow2.org/ns/deployment-plan/obr/1.0"> - <deployment xsi:type="obr:obr-deploymentType" id="dep-obr-1"> - <obr:bundle-symbolic-name>org.ow2.easybeans.examples.entitybean</obr:bundle-symbolic-name> - <obr:bundle-version>=1.1.0-SNAPSHOT<obr:bundle-version> - </deployment> - - <deployment xsi:type="obr:obr-deploymentType" id="dep-obr-2"> - <obr:filter>(&(symbolicname=org.ow2.easybeans.examples.statefullbean)(version=1.1.0-SNAPSHOT))</obr:filter> - </deployment> - </deployment-plan> - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/url-deployment-data.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/url-deployment-data.xml deleted file mode 100644 index d4764366db12667dcefec270f4dfaa68aafc4fc5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans/typespecific/url-deployment-data.xml +++ /dev/null @@ -1,46 +0,0 @@ - -
    - URL deployments - -
    - Specific data - - The only URL deployment specific data is the - resource that can only be specified as a XML - element. - - url:resource (required) : the file name - of the resource. - - -
    - -
    - Full URL deployment plan - - There are few possible variations in the URL deployment. Here is a complete - deployment plan with a URL deployment. - - - Deployment plan with URL deployments - - <?xml version="1.0" encoding="UTF-8"?> - <deployment-plan xmlns="http://jonas.ow2.org/ns/deployment-plan/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:url="http://jonas.ow2.org/ns/deployment-plan/url/1.0"> - - <deployment xsi:type="url:url-deploymentType" id="dep1" reloadable="true"> - <url:resource>easybeans-example-statelessbean-1.0.1-SNAPSHOT.jar</url:resource> - </deployment> - - </deployment-plan> - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/deployment-plans_guide.xml b/jonas_doc/core/src/docbook/doc-en/deployment-plans_guide.xml deleted file mode 100644 index 889ce937dc6b49dd2133136841f22cc456fe07b7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/deployment-plans_guide.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - Deployment plans - - - - - JOnAS Team - - - - - Mickaël - - Leduque - - - - - SERLI SAS - - - - - - - François - - Fornaciari - - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - October 2008 - - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/developerguide.xml b/jonas_doc/core/src/docbook/doc-en/developerguide.xml deleted file mode 100644 index 3fd7433237341f709f300911d9565ecede3e471c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/developerguide.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - JOnAS 5 Developer guide - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - March 2009 - - - - This guide explains how to modify the JONAS source code in order - to contribute to the jonas development or to modify some modules. - - - - - - Developing JOnAS - - - - - - - - - - Testing JOnAS - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/developerguide/building.xml b/jonas_doc/core/src/docbook/doc-en/developerguide/building.xml deleted file mode 100644 index 6aae1358613a77e11d04047fc9196837eb8faab7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/developerguide/building.xml +++ /dev/null @@ -1,174 +0,0 @@ - -
    - - Building JOnAS From Source. - - -
    - - Requirements - - -
    - - JDK - - - A Java SE - 5 is required to build JOnAS. Make sure that the JDK used to - build JOnAS is compliant with the new Java 5 features. -
    - -
    - - Maven - - - The maven tool is used with pom.xml files to - build JOnAS. This tool is available at http://maven.apache.org. The - 2.0.7 or later version is recommanded -
    -
    - -
    - - Optional Requirements - - -
    - - Eclipse - - - The JOnAS project provides .project and .classpath for Eclipse 3.1 - or greater. A project is ready to use once the source has been imported - using the Eclipse tool. Eclipse tool is available at http://www.eclipse.org. -
    - -
    - - Eclipse Plugins - - -
    - - Checkstyle Plugin - - - The eclipse-checkstyle plugin is used to check the javadoc of - JOnAS project. A warning will print if the JOnAS coding convention is - not used. This plugin is available at http://eclipse-cs.sourceforge.net. -
    - -
    - - AnyEdit Plugin - - - As part of the JOnAS coding convention, the use of tabulation - characters is disallowed. Files should contain only spaces. The - AnyEdit plugin allows tabs to be converted to spaces when saving the - file. Also, trailing spaces can be removed automatically. - - This plugin is available at http://andrei.gmxhome.de/anyedit/. -
    - -
    - - Maven 2 plugin - - - To compile JOnAS under eclipse, use m2eclipse plugin available - at http://m2eclipse.codehaus.org/. -
    - -
    - - Subversion plugin - - - JOnAS uses subversion as revision control system. The use of - stable version of Subversive is advised. This plugin is available at - http://www.polarion.org/index.php?page=overview&project=subversive. -
    -
    -
    - -
    - - Compiling JOnAS - - - To compile JOnAS, launch the command mvn in the - root directory of the project (named JOnAS by default) being - launched. - The default maven goal is install if not specified. - - - Once the command has been run successfully, the maven artifacts - generated by maven are available in the maven local repository. The - target directories contain the - generated jars or assemblies. - Bundles that are used in jonas command, must - be updated manually from local repository to $JONAS_ROOT/lib - directory if they have been modified. Please refer to - $JONAS_ROOT/bin for available commands. - - - mvn clean install is used to clean and regenerate - classes. -
    - -
    - - Maven assembly - - - JOnAS build generates several assemblies. Assemblies are located in - the assemblies folder. - -
    - - End-User assembly - - - The assembly contains examples and is available with the zip or - tgz format in the assemblies/jonas-osgi/target folder. The - unzipped assembly folder should directly be used as - $JONAS_ROOT. Moreover, the - /lib directory of this $JONAS_ROOT - contains all the bundles of the assembly. - - - Lauchning JOnAS in developper mode (see ) will set the use of bundles - stored in maven local repository. - - - A common way to set JONAS_ROOT is to make a symbolic link (linux - only) on the directory : - ln -s - .../assemblies/jonas-osgi/target/jonas-osgi-...-bin.dir/jonas-osgi-... - your_jonas_root_path - - - You can alternatively copy all this tree under your target - JONAS_ROOT directory. -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/developerguide/code_convention.xml b/jonas_doc/core/src/docbook/doc-en/developerguide/code_convention.xml deleted file mode 100644 index 1682a409ec86b92485a3a5b0204adc1cf9fd89cf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/developerguide/code_convention.xml +++ /dev/null @@ -1,343 +0,0 @@ - -
    - - Code Conventions in JOnAS - - - Contributions should follow the JOnAS code convention. A good document - to begin with is - Java - code convention. Other conventions are also listed in this - document. - - In addition, JOnAS uses tools to check the compliance: the - checkstyle plugin and - the eclipse checkstyle - plugin. The configuration settings are available on - JOnAS - SVN. - -
    - - File Organization - - -
    - - Header - - - All files should have a header that contains the LGPL and the - date. - - If a file is modified, the modification year should be appended to - the existing year, which is the year it was initially created. For - example, if the create date is '1999' or '2004' it should be edited to - '1999-2006' or '2004-2006', respectively. - - Also, the tag $Id: code_convention.xml 314 2006-04-04 09:39:43Z - pinheirg $ should be added. The following is a header example: - - -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id:code_convention.xml 13113 2008-03-11 10:58:50Z eyindanga $ - * -------------------------------------------------------------------------- - */ - -
    - -
    - - Imports - - - Imports should reference a valid class name, instead of using - wildcard imports. Wildcard imports are not authorized. - - For example, if the interface and class List and ArrayList are - used, the imports should not be as follows: - - -import java.util.*; - - - The imports should have each class as follow: - - -import java.util.List; -import java.util.ArrayList; - - - The classes should not have an unused import. - - - The Eclipse IDE provides facilities to do this job. There is the - option Organize Imports (Shift+Ctrl+O) in the menu - Source that correctly inserts the imports and removes the unused - imports. However, this option does not work well with 'import - static'. - -
    - -
    - - Class and Interface Declarations - - - The class and interface names should begin with an uppercase - letter. Also, each class and interface has an @author tag in the - comment. For example: - - -/** - * This is an example that shows a class/interface declaration. - * @author Loris Bouzonnet - * @author Stephane Zeng - */ -public class ClassExample implements InterfaceExample { -} - -
    -
    - -
    - - Indentation / whitespace - - -
    - - Indentation - - - The space character is used instead of the tab character. The - number of spaces for an indent is 4 spaces. - - Wrapping a single source line into multiple lines should follow - the Java - code convention. -
    - -
    - - whitespace - - - Any trailing spaces should be removed. Eclipse provides a plugin - that removes the trailing spaces and converts the tab into spaces. The - plugin is AnyEdit. - - Use whitespaces in for() loop, while(), when concatenating - strings. One space should be added before the operator and another after - the operator. For example, the correct syntax is: - - -for (int i = 0; i < arTest.length; i++) { - String strResult = "The element " + i + " has the value " + arTest[i]; -} - - - The following code does not adhere to the convention: - - -for (int i = 0; i< arTest.length; i++) { - String strResult = "The element "+ i+" has the value "+arTest[i]; -} - -
    -
    - -
    - - JavaDoc Comments - - - All methods and attributes (including protected and private) must - have a comment. The parameters, the exceptions thrown, and the method - return should have a comment in the method comment. For example: - - -/** - * This is an example that is used in the JOnAS Code Convention. - */ -private int intValue; - -/** - * This is an example method to show a class comment. - * @param a an example of parameter. - * @param b other example of parameter. - * @return the method result. - * @throws Exception the exception thrown by the method. - */ -public int add(final int a, final int b) throws Exception { - return a + b; -} - -
    - -
    - - Statements - - -
    - - If/else - - - Braces must be used in the if/else blocks, even if there is a - single statement. To illustrate: - - -if (true) { - doThis(); -} - - - The following is not allowed: - - -if (true) - doThis(); - - - The position of the braces should be the same as in the first - example. The following format is incorrect: - - -if (true) -{ - test1(); - test2(); -} - -
    - -
    - - Try/catch - - - All exceptions require a statement; no silent catching is allowed. - For example: - - -try { - doThis(); -} catch (Exception e) { - // should not occur -} - - - A logger can be used: - - -try { - doThis(); -} catch (Exception e) { - logger.logDebug("Exception while doing .....", e); -} - -
    - -
    - - Naming Conventions - - -
    - - Static Final Attributes - - - Declarations are static final, not final static. This is a JLS - recommendation. -
    - -
    - - Constants - - - Constants should be static and final, and should adhere to the - following: - - -'^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$' - -
    - -
    - - No Magic Numbers, Use Constants - - - Constants must be used in the code and magic number must be - avoided. For example, the following is not allowed: - - -private int myAttribute = 5; - - - The correct format is: -/** - * Default value - */ -private static final int DEFAULT_VALUE = 5; - -/** - * This attribute is initialized with the default value - */ -private int myAttribute = DEFAULT_VALUE; - -
    - -
    - - Attribute Name - - - The attribute name should not have an underscore ( _ ). The _ is - valid for constants that are in uppercase. - - Use pValue and mValue instead of p_Value and m_Value. - - The pattern for attribute name is: - - -'^[a-z][a-zA-Z0-9]*$' - -
    -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/developerguide/contributing.xml b/jonas_doc/core/src/docbook/doc-en/developerguide/contributing.xml deleted file mode 100644 index fa8eb15f5c37fd8a5791c2397ca96bf8ab78f350..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/developerguide/contributing.xml +++ /dev/null @@ -1,61 +0,0 @@ - -
    - - - Contributing to JOnAS - - -
    - - Mailing Lists - - - Developers wanting to contribute information about JOnAS can share - their thoughts via the JOnAS mailing list. - - The steps necessary for subscribing to the list are described at - the following url : - http://jonas.objectweb.org/wws/info/jonas - - Mailing lists for JOnAS are available at : - - - http://forge.objectweb.org/mail/?group_id=5 - -
    - -
    - - Ideas for Contributing - - - There are many ways to contribute to JOnAS. New ideas are also - welcome. - - The following is a list of some of the ways to make - contributions: - - - - Documentation: Improve or add to the existing documentation, - create new chapters, translate, etc. - - - - Code: Some glue could be added so that JOnAS could be - integrated in other servers. - - - - Tests: Add new tests to the current test suite. - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/developerguide/getting_from_svn.xml b/jonas_doc/core/src/docbook/doc-en/developerguide/getting_from_svn.xml deleted file mode 100644 index a002ad6cf2ce089fc890e02520e43929768295e0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/developerguide/getting_from_svn.xml +++ /dev/null @@ -1,56 +0,0 @@ - -
    - - Getting JOnAS From the SVN Repository - - - Anyone can check out source code from the SVN server using the - following command (for GUI SVN client use, configuration values are the - same as for command line use): - - -svn checkout svn://svn.forge.objectweb.org/svnroot/jonas/jonas/trunk/ - - - It is also possible to retrieve a particular branch or a particular tag. - For example: - -svn checkout svn://svn.forge.objectweb.org/svnroot/jonas/jonas/branches/jonas_4_10 - - -svn checkout svn://svn.forge.objectweb.org/svnroot/jonas/jonas/tag/JONAS_5_1_0_M3 - - - This will get the 3 modules : - - - jonas - source of JOnAS server - - - jonas_doc - documentation of JOnAS (in docbook format) - - - jonas_tests - Miscelaneous JOnAS tests - - - - - - Access for developpers is available using : - - - -svn checkout svn+ssh://developername@svn.forge.objectweb.org/svnroot/jonas/jonas/trunk/ - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/developerguide/running.xml b/jonas_doc/core/src/docbook/doc-en/developerguide/running.xml deleted file mode 100644 index 6e1cba1f01e0b374e5097b1ee7c16fe303cd1026..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/developerguide/running.xml +++ /dev/null @@ -1,57 +0,0 @@ - -
    - - Running the JOnAS server. - - -
    - - Requirements - - - Review the requirements discussed in - -
    - -
    - - Running - - -
    - - Exporting environment variables - - - Environment variables to export are, - $JAVA_HOME, - $JONAS_ROOT, $JONAS_BASE. If - $JONAS_BASE is not set, then it will point to - $JONAS_ROOT. - - - - Please ensure that $JONAS_ROOT\bin is - added to the system PATH. - - -
    - -
    - - Start/Stop JOnAS - - - For more information see - jonas command - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/developerguide/usingexamples.xml b/jonas_doc/core/src/docbook/doc-en/developerguide/usingexamples.xml deleted file mode 100644 index b66012a0f6ec1ab1f4a1895627ae3d32e366ca11..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/developerguide/usingexamples.xml +++ /dev/null @@ -1,96 +0,0 @@ - -
    - - Using JOnAS Examples. - - - -
    - - Getting from SVN - - - The examples are available in jonas_tests module of - jonas trunk. Please Refer to the section - . -
    - -
    - - Compiling the Examples - - -
    - - Requirements - - - Before running the examples, be sure to follow the requirements - for compiling and running these JOnAS examples. -
    - -
    - - Compile - - - The ant tool is used to build the - examples. Each example is associated a - build.xmlfor individual compilation. All the - examples can be compiled by launching the ant task - in jonas_tests root folder. - - After having compiled an example, putting the generated - archive(war, ear) in the $JONAS_ROOT/deploy folder will - allow JOnAS to deploy it. If JOnAS is running the archive will be - deployed automatically, if not, it will be deployed on startup. - - Here is an example of log messages for a deployment on - startup. - - -2008-03-11 10:14:41,734 : DeployableMonitorService.doStart : Use the deploy directories '[]', development mode is 'true' -2008-03-11 10:14:41,796 : DeployableMonitor.detectNewArchives : Deployables to deploy at startup: [[c:\cluster\JONAS5-OSGI-BIS\deploy\jonas-ctxroot.war, c:\cluster\JONAS5-OSGI-BIS\deploy\jonasAdmin.war]] - - An example of log messages for hot deployment(when JOnAS is - already running) - - - -2008-03-11 10:14:41,812 : J2EEServer.info : JOnAS server 'jonas' RUNNING -2008-03-11 10:20:54,437 : Rar.processRar : Starting deployment of /c:/cluster/JONAS5-OSGI-BIS/work/apps/jonas/earsample_2008.03.11-10.20.52.ear/ra-sample.rar -2008-03-11 10:20:54,687 : Rar.processRar : /c:/cluster/JONAS5-OSGI-BIS/work/apps/jonas/earsample_2008.03.11-10.20.52.ear/ra-sample.rar available -2008-03-11 10:20:54,734 : JOnASEJBService.checkGenIC : JOnAS version was not found in the '/c:/cluster/JONAS5-OSGI-BIS/work/apps/jonas/earsample_2008.03.11-10.20.52.ear/secusb.jar' manifest file. Auto-generating container cla -sses... -2008-03-11 10:20:56,750 : GenIC.<init> : GenIC for JOnAS 5.0.2-SNAPSHOT: 'EarOp' generation ... -2008-03-11 10:20:56,921 : GenIC.<init> : Sources classes successfully generated for 'EarOp' -2008-03-11 10:20:56,937 : GenIC.compilClasses : Compiling Interposition classes ... -2008-03-11 10:20:59,734 : GenIC.compilClasses : Sources classes successfully compiled with Eclipse compiler. -2008-03-11 10:20:59,765 : GenIC.compilClasses : Running fastrmic -2008-03-11 10:21:00,109 : GenIC.compilClasses : Stubs and Skels successfully generated with fastrmic for rmi/jrmp -2008-03-11 10:21:00,343 : GenIC.clean : Deleting [D:\DOCUME~1\zengeyls\LOCALS~1\Temp\genic20567.tmp\org\ow2\jonas_gen\org\objectweb\earsample\beans\secusb\JOnASEarOp_1317676915Home.java, D:\DOCUME~1\zengeyls\LOCALS~1\Temp\gen -ic20567.tmp\org\ow2\jonas_gen\org\objectweb\earsample\beans\secusb\JOnASEarOp_1317676915Remote.java, D:\DOCUME~1\zengeyls\LOCALS~1\Temp\genic20567.tmp\org\ow2\jonas_gen\org\objectweb\earsample\beans\secusb\JOnASEarOp_13176769 -15LocalHome.java, D:\DOCUME~1\zengeyls\LOCALS~1\Temp\genic20567.tmp\org\ow2\jonas_gen\org\objectweb\earsample\beans\secusb\JOnASEarOp_1317676915Local.java, D:\DOCUME~1\zengeyls\LOCALS~1\Temp\genic20567.tmp] -2008-03-11 10:21:01,359 : JContainer.addBean : EarOp available -2008-03-11 10:21:01,390 : EarDeployer.deployWARs : There are WAR files in the EAR 'EARDeployableImpl[archive=c:\cluster\JONAS5-OSGI-BIS\work\apps\jonas\earsample_2008.03.11-10.20.52.ear]' but the web service is not available -2008-03-11 10:21:01,421 : EarDeployer.deployEAR : 'EARDeployableImpl[archive=c:\cluster\JONAS5-OSGI-BIS\deploy\earsample.ear]' EAR Deployable is now deployed - -
    -
    - -
    - - Running Examples - - - For running an example, please refer to the README file in root - folder of each example. -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/eardeploy.xml b/jonas_doc/core/src/docbook/doc-en/eardeploy.xml deleted file mode 100644 index 03c0ecd237ad0ae61725f0cee4f7087725135cdf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/eardeploy.xml +++ /dev/null @@ -1,386 +0,0 @@ - - - - Java EE Application Assembler's Guide - - - - JOnAS Team - - - - SAUTHIERGuillaume - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - Fev 2008 - - - - The target audience for this guide is the Application Provider and - Assembler, i.e. the person in charge of combining one or more components - (ejb-jars and/or wars) to create a Java EE application. It describes how - the Java EE components should be packaged to create a Java EE - application. - - - - - Defining the Ear Deployment Descriptor - - -
    - - Principles - - - The application programmer is responsible for providing the - deployment descriptor associated with the developed application - (Enterprise ARchive). The Application Assembler's responsibilities is to - provide a XML deployment descriptor that conforms to the deployment - descriptor's XML schema as defined in the Java EE specification version - 5. (Refer to http://java.sun.com/xml/ns/javaee/application_5.xsd - ). - - To deploy Java EE applications on the application server, all - information is contained in one XML deployment descriptor. The file name - for the application XML deployment descriptor is - application.xml and it must be located in the top level - META-INF directory. - - Some Java EE application examples are provided in the JOnAS - distribution: - - - - $JONAS_ROOT/examples/cluster-javaee5 for the Java EE 5 cluster demo - - - - $JONAS_ROOT/examples/javaee5-earsample for the Java EE 5 library example - - - - The standard deployment descriptor should contain structural - information that includes the following: - - - - EJB components, - - - - Web components, - - - - Client components, - - - - Alternate Deployment Descriptor for theses components, - - - - Security role. - - - - There is no JOnAS-specific deployment descriptor for the - Enterprise ARchive. -
    - -
    - - Sample Application Deployment Descriptor - - - <?xml version="1.0" encoding="UTF-8"?> - -<application - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/application_5.xsd" - version="5"> - - - <description>Java EE 5.0 EAR Sample</description> - <display-name>Java EE 5.0 EAR Sample</display-name> - - <!-- EJB Modules --> - <module> - <ejb>ejb3.jar</ejb> - </module> - - <!-- Web Modules --> - <module> - <web> - <web-uri>javaee5-earsample.war</web-uri> - <context-root>javaee5-earsample</context-root> - </web> - </module> - - <!-- Application Client Modules --> - <module> - <!-- Application Client using JMS to interact with the application --> - <java>jms-application-client.jar</java> - </module> - <module> - <!-- Not secured Application Client (only access read-only beans) --> - <java>not-secured-application-client.jar</java> - </module> - <module> - <!-- Secured Application Client (can access all bean under a SecurityContext) --> - <java>jaas-secured-application-client.jar</java> - </module> - -</application> -
    -
    - - - - EAR Packaging - - -
    - - Ear Components - - - Java EE applications are packaged for deployment in a standard - Java programming language Archive file called an ear file (Enterprise - ARchive). This file can contain the following: - - - - The web components (war) - - - One or more wars which contain the web components of the Java EE application. Due to the class loader hierarchy, when the wars are packaged in a Java EE application, it is not necessary to package classes of EJBs accessed by the web components in the WEB-INF/lib directory. Details about this class loader hierarchy are described in - - JOnAS - class loader hierarchy - - . - - - - - The EJB components (ejb-jar) - - - One or more ejb-jars, which contain the beans of the Java EE application. - - - - - The RAR components (resource adapters) - - - One or more rars, which contain the resource adapters of the Java EE application. - - - - - The libraries (jar) - - - One or more jars which contain the libraries (tag libraries and any utility libraries) used for the Java EE application. - - - - - The Java EE deployment descriptor - - - The standard xml deployment descriptor in the format defined in the Java EE 5 specification: - - http://java.sun.com/xml/ns/javaee/application_5.xsd - - . This deployment descriptor must be stored with the name - - META-INF/application.xml - - in the ear file. - - - -
    - -
    - - Ear MANIFEST.MF - - - An EAR being a standard Java archive, it also has a MANIFEST - file. - - An interesting attribute to add to this file is the EAR's - implementation version: indeed, if this information is present and the - versioning - service is active, you can do smooth application version - migration: - - - Manifest-Version: 1.0 - Implementation-Version: 2.1.0 - -
    - -
    - - Example - - - Before building an ear file for a Java EE application, the - ejb-jars and the wars that will be packaged in the Java EE application - must be built and the XML deployment descriptor (application.xml) must - be written. - - Then, the ear file (<java-ee-application>.ear) - can be built using the jar command: - - - cd <java-ee_application_directory> - jar cvfm <java-ee-application>.ear META-INF/MANIFEST.MF * - - - Note that in order to include your custom MANIFEST file, you need - to specify its path to the jar command: - - - cd <java-ee_application_directory> - jar cvfm <java-ee-application>.ear META-INF/MANIFEST.MF * - -
    -
    - - - - EAR Packaging using Maven - - - If the Java EE application's components are available as Apache Maven dependencies, - you can also use the maven-ear-plugin - for the EAR generation. In this case, the generation and inclusion of all - files is done automatically by Maven. - - Here's an example pom.xml file generating a EAR with the - Implementation Version: - - <?xml version="1.0" encoding="UTF-8"?> - -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.ow2.jonas.samples</groupId> - <artifactId>ear-sample</artifactId> - <version>1.0.0</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>${parent.artifactId}-ear</artifactId> - <packaging>ear</packaging> - <name>JOnAS Java EE 5 sample</name> - <description>This is a sample Java EE 5 application.</description> - - <dependencies> - <!-- WARs and EJB-JARs --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>${parent.artifactId}-ejb</artifactId> - <version>${project.version}</version> - <type>ejb</type> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>${parent.artifactId}-war</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <!-- Make sure it is a Java EE 5 EAR --> - <version>5</version> - - <!-- Here, we can rename the included files' names --> - <modules> - <webModule> - <groupId>${project.groupId}</groupId> - <artifactId> - ${parent.artifactId}-war - </artifactId> - <contextRoot> - /${parent.artifactId} - </contextRoot> - <bundleFileName> - ${parent.artifactId}.war - </bundleFileName> - </webModule> - <ejbModule> - <groupId>${project.groupId}</groupId> - <artifactId> - ${parent.artifactId}-ejb - </artifactId> - <bundleFileName> - ${parent.artifactId}.jar - </bundleFileName> - </ejbModule> - </modules> - - <archive> - <!-- Don't forget the Implementation Version --> - <manifestEntries> - <Implementation-Version>${project.version}</Implementation-Version> - </manifestEntries> - </archive> - </configuration> - </plugin> - </plugins> - </build> -</project> - - - - - Appendix - - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/META-INF/MANIFEST.MF b/jonas_doc/core/src/docbook/doc-en/easybeans/META-INF/MANIFEST.MF deleted file mode 100644 index 2ae2c2e359892a47649d4ca871029f7aa1a837cd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/META-INF/MANIFEST.MF +++ /dev/null @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Archiver-Version: Plexus Archiver -Created-By: Apache Maven -Built-By: benoitf -Build-Jdk: 1.5.0_15 -Specification-Title: EasyBeans Documentation -Specification-Version: 1.2.0-M1 -Specification-Vendor: OW2 Consortium -Implementation-Title: EasyBeans Documentation -Implementation-Vendor-Id: org.ow2.easybeans.doc -Implementation-Vendor: OW2 Consortium -Implementation-Version: 1.2.0-M1.5458 - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/META-INF/maven/org.ow2.easybeans.doc/easybeans-doc/pom.properties b/jonas_doc/core/src/docbook/doc-en/easybeans/META-INF/maven/org.ow2.easybeans.doc/easybeans-doc/pom.properties deleted file mode 100644 index 28ac90df1bf3512c25272574bc62fa4f038cd99e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/META-INF/maven/org.ow2.easybeans.doc/easybeans-doc/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Thu Mar 25 17:22:26 GMT+01:00 2010 -version=1.2.0-M1 -groupId=org.ow2.easybeans.doc -artifactId=easybeans-doc diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/META-INF/maven/org.ow2.easybeans.doc/easybeans-doc/pom.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/META-INF/maven/org.ow2.easybeans.doc/easybeans-doc/pom.xml deleted file mode 100644 index c555be4ff72b5cc3020a8859a207733f4568b78c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/META-INF/maven/org.ow2.easybeans.doc/easybeans-doc/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - easybeans - org.ow2.easybeans - 1.2.0-M1 - - 4.0.0 - org.ow2.easybeans.doc - easybeans-doc - jar - EasyBeans Documentation - 1.2.0-M1 - - - - scm:svn:svn:://svn.forge.objectweb.org/svnroot/easybeans/tags/EASYBEANS_DOC_1_2_0_M1 - scm:svn:svn+ssh://benoitf@svn.forge.objectweb.org/svnroot/easybeans/tags/EASYBEANS_DOC_1_2_0_M1 - http://fisheye.easybeans.org/browse/EasyBeans/tags/EASYBEANS_DOC_1_2_0_M1 - - - - - doc-en - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/advanced_topics.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/advanced_topics.xml deleted file mode 100644 index 71df449a2849e9d61ec3640d0373169fdb8df205..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/advanced_topics.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - Advanced topics - -
    - Helping debug of enhanced classes - - EasyBeans is modifying/enhancing EJB classes at runtime. For - debugging purpose, EasyBeans can dump the modified class in order to - check/debug generated bytecode by using some decompilers. - - In order to enable the dump of the class, the logger - org.ow2.easybeans.loader needs to be set at DEBUG/FINEST - level. The classes will be dumped in the Java System java.io.tmpdir directory. -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/building.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/building.xml deleted file mode 100644 index 9963e5e6fb63473e0ae8acee2f0315d61c3468d5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/building.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - Building EasyBeans From Source. - -
    - Requirements - -
    - JDK - - A Java SE - 5 is required to build EasyBeans. Make sure that the JDK used to - build EasyBeans is compliant with the new Java 5 features. -
    - -
    - Maven - - The maven tool is used with pom.xml files to - build EasyBeans. This tool is available at http://maven.apache.org. The 2.0.7 - or later version is recommanded -
    - -
    - Ant - - Some tests are not yet available as maven tests, then the ant tool - is needed to run the tests. The ant tool is available at http://ant.apache.org -
    - -
    - TestNG - - The test suite of EasyBeans uses the TestNG tool. This tool is - available at http://www.testng.org. -
    - -
    - Clover - - The test suite of EasyBeans uses Clover, which is a code-coverage, - analysis tool. Atlassian has granted licenses to open source projects. - Refer to http://www.atlassian.com/software/clover/ - for more about Clover. -
    -
    - -
    - Optional Requirements - -
    - Eclipse - - The EasyBeans project provides .project and .classpath for Eclipse - 3.1 or greater. A project is ready to use once the source has been - imported using the Eclipse tool. Eclipse tool is available at http://www.eclipse.org. -
    - -
    - Eclipse Plugins - -
    - Maven Plugin - - EasyBeans code is using maven tool. In order to download Maven2 - dependencies in Eclipse, the M2 Eclipse plugin can be used. This - plugin is available at http://m2eclipse.sonatype.org/ -
    - -
    - Checkstyle Plugin - - The eclipse-checkstyle plugin is used to check the javadoc of - Easybeans project. A warning will print if the EasyBeans coding - convention is not used. This plugin is available at http://eclipse-cs.sourceforge.net. -
    - -
    - AnyEdit Plugin - - As part of the EasyBeans coding convention, the use of - tabulation characters is disallowed. Files should contain only spaces. - The AnyEdit plugin allows tabs to be converted to spaces when saving - the file. Also, trailing spaces can be removed automatically. - - This plugin is available at http://andrei.gmxhome.de/anyedit/. -
    - -
    - Asm Plugin - - EasyBeans uses bytecode enhancement. This is done using the - OW2 ASM project. ASM - provides a plugin that allows the ASM code of a given class to be - obtained. The plugin is available at http://asm.objectweb.org/eclipse/index.html. -
    - -
    - TestNG Plugin - - The EasyBeans test suite uses TestNG. A plugin is available for - Eclipse: http://testng.org/doc/eclipse.html. -
    -
    -
    - -
    - Compiling EasyBeans - - To compile EasyBeans, launch the command mvn in - the root directory of the project (named easybeans by default) being - launched. - The default maven goal is install if not specified. - - - Once the command has been run successfully, the maven artifacts - generated by maven are available in the maven local repository. The - target directories contain the - generated jars or assemblies. - - mvn clean is used to clean the generated - classes. -
    - -
    - Maven assemblies - - EasyBeans build generates several assemblies. Assemblies are located - in the assemblies folder. - -
    - End-User assemblies - - The packages are available with Apache OpenJPA or Hibernate Entity Manager as - persistence provider. Packages contain examples and are available with - the zip or tgz format. - -
    - Jetty - - EasyBeans can be launched within Jetty web container. The - assemblies for Jetty are available in the assemblies/distrib/jetty/target - folder. -
    - -
    - JOnAS - - EasyBeans can be launched within JOnAS 4 J2EE application - server. The assemblies for JOnAS are available in the assemblies/distrib/jonas/target - folder. - EasyBeans is already included by default in JOnAS 5.0 - -
    - -
    - Tomcat - - EasyBeans can be launched within Apache Tomcat web container. - The assemblies for Jetty are available in the assemblies/distrib/tomcat/target - folder. -
    - -
    - UberJar - - EasyBeans can be launched without any container. This is done by - using the uberjar file. EasyBeans is launched by using java - -jar easybeans-uberjar-xxx.jar command. -
    -
    - -
    - Java EE modules assemblies - - These assemblies are simple Java EE modules, without example or - documentation. These assemblies are then packaged into End-User - assemblies. - -
    - War module - - The war module is then used for Apache Tomcat or Jetty web - container. -
    - -
    - Rar module - - This module is used for JOnAS 4 J2EE Application server. -
    -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/code_convention.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/code_convention.xml deleted file mode 100644 index a74187dffa69abb38be6370d1d5b9c933b6a9250..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/code_convention.xml +++ /dev/null @@ -1,294 +0,0 @@ - - - EasyBeans Code Convention - - Contributions should follow the EasyBeans code convention. A good - document to begin with is Java code - convention. Other conventions are also listed in this - document. - - In addition, EasyBeans uses tools to check the compliance: the checkstyle plugin and the - eclipse checkstyle - plugin. The configuration settings are available in the Eclipse settings of the project. - -
    - File Organization - -
    - Header - - All files should have a header that contains the LGPL and the - date. - - If a file is modified, the modification year should be appended to - the existing year, which is the year it was initially created. For - example, if the create date is '1999' or '2004' it should be edited to - '1999-2006' or '2004-2006', respectively. - - Also, the tag $Id: code_convention.xml 314 2006-04-04 09:39:43Z - pinheirg $ should be added. The following is a header example: - - /** - * EasyBeans - * Copyright (C) 2008 Bull S.A.S. - * Contact: easybeans@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - * USA - * - * -------------------------------------------------------------------------- - * $Id: code_convention.xml 3272 2008-05-21 09:53:35Z benoitf $ - * -------------------------------------------------------------------------- - */ - -
    - -
    - Imports - - Imports should reference a valid class name, instead of using - wildcard imports. Wildcard imports are not authorized. - - For example, if the interface and class List and ArrayList are - used, the imports should not be as follows: - - import java.util.*; - - The imports should have each class as follow: - - - import java.util.List; - import java.util.ArrayList; - - The classes should not have an unused import. - - - The Eclipse IDE provides facilities to do this job. There is the - option Organize Imports (Shift+Ctrl+O) in the menu - Source that correctly inserts the imports and removes the unused - imports. However, this option does not work well with 'import - static'. - -
    - -
    - Class and Interface Declarations - - The class and interface names should begin with an uppercase - letter. Also, each class and interface has an @author tag in the - comment. For example: - - /** - * This is an example that shows a class/interface declaration. - * @author Gisele Pinheiro Souza - * @author Eduardo Studzinski Estima de Castro - */ - public class ClassExample implements InterfaceExample{ - } -
    -
    - -
    - Indentation / WhiteSpace - -
    - Indentation - - The space character is used instead of the tab character. The - number of spaces for an indent is 4 spaces. - - Wrapping a single source line into multiple lines should follow - the Java - code convention. -
    - -
    - WhiteSpace - - Any trailing spaces should be removed. Eclipse provides a plugin - that removes the trailing spaces and converts the tab into spaces. The - plugin is AnyEdit. - - Use whitespaces in for() loop, while(), when concatenating - strings. One space should be added before the operator and another after - the operator. For example, the correct syntax is: - - for (int i = 0; i < arTest.length; i++) { - String strResult = "The element " + i + " has the value " + arTest[i]; - } - - The following code does not adhere to the convention: - - for (int i = 0; i< arTest.length; i++) { - String strResult = "The element "+ i+" has the value "+arTest[i]; - } -
    -
    - -
    - JavaDoc Comments - - All methods and attributes (including protected and private) must - have a comment. The parameters, the exceptions thrown, and the method - return should have a comment in the method comment. For example: - - /** - * This is an example that is used in the EasyBeans Code Convention. - */ -private int intValue; - -/** - * This is an example method to show a class comment. - * @param a an example of parameter. - * @param b other example of parameter. - * @return the method result. - * @throws Exception the exception thrown by the method. - */ -public int add(final int a, final int b) throws Exception { - return a + b; -} -
    - -
    - Statements - -
    - If/else - - Braces must be used in the if/else blocks, even if there is a - single statement. To illustrate: - - if (true) { - doThis(); -} - - The following is not allowed: - - if (true) - doThis(); - - The position of the braces should be the same as in the first - example. The following format is incorrect: - - if (true) -{ - test1(); - test2(); -} -
    - -
    - Try/catch - - All exceptions require a statement; no silent catching is allowed. - For example: - - try { - doThis(); -} catch (Exception e) { - // should not occur -} - - A logger can be used: - - try { - doThis(); -} catch (Exception e) { - logger.logDebug("Exception while doing .....", e); -} -
    - -
    - Inline Conditionals - - Inline conditionals are not allowed. The following code is - incorrect: - - b = isOk() ? true : false; - - The correct way to write this is as follows: - - if (isOk()) { - b = true; -} else { - b = false; -} -
    - -
    - Naming Conventions - -
    - Static Final Attributes - - Declarations are static final, not final static. This is a JLS - recommendation. -
    - -
    - Constants - - Constants should be static and final, and should adhere to the - following: - - '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$' -
    - -
    - No Magic Numbers, Use Constants - - Constants must be used in the code and magic number must be - avoided. For example, the following is not allowed: - - private int myAttribute = 5; - - The correct format is:/** - * Default value - */ -private static final int DEFAULT_VALUE = 5; - -/** - * This attribute is initialized with the default value - */ -private int myAttribute = DEFAULT_VALUE; -
    - -
    - Attribute Name - - The attribute name should not have an underscore ( _ ). The _ is - valid for constants that are in uppercase. - - Use pValue and mValue instead of p_Value and m_Value. - - The pattern for attribute name is: - - '^[a-z][a-zA-Z0-9]*$' -
    -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/configuration_file.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/configuration_file.xml deleted file mode 100644 index c24052bc27357fcc6de5dba9288ab1cfc5066900..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/configuration_file.xml +++ /dev/null @@ -1,391 +0,0 @@ - - - EasyBeans Server Configuration File - -
    - Introduction - - EasyBeans is configured with the help of an easy-to-understand XML - configuration file. - - The following is an example of an EasyBeans XML configuration - file: - - <?xml version="1.0" encoding="UTF-8"?> -<easybeans xmlns="http://org.ow2.easybeans.server"> - - <!-- No infinite loop (daemon managed by WebContainer): wait="false" - Enable MBeans: mbeans="true" - No EasyBeans naming, use WebContainer naming: naming="false" - Use EasyBeans JACC provider: jacc="true" - Use EasyBeans file monitoring to detect archives: scanning="true" - Use EasyBeans JMX Connector: connector="true" - Enable Deployer and J2EEServer MBeans: deployer="true" & j2eeserver="true" - --> - <config - wait="false" - mbeans="true" - naming="false" - jacc="true" - scanning="true" - connector="true" - deployer="true" - j2eeserver="true" /> - - <!-- Define components that will be started at runtime --> - <components> - <!-- RMI/JRMP will be used as protocol layer --> - <rmi> - <protocol name="jrmp" port="1099" hostname="localhost" /> - </rmi> - - <!-- Start a transaction service --> - <tm /> - - <!-- Start a JMS provider --> - <jms port="16030" hostname="localhost" /> - - <!-- Creates an embedded HSQLDB database --> - <hsqldb port="9001" dbName="jdbc_1"> - <user name="easybeans" password="easybeans" /> - </hsqldb> - - <!-- Add mail factories --> - <mail> - <!-- Authentication ? - <auth name="test" password="test" /> - --> - <session name="javax.mail.Session factory example" jndiName="mailSession_1"> - <!-- Example of properties --> - <property name="mail.debug" value="false" /> - </session> - - <mimepart name="javax.mail.internet.MimePartDataSource factory example" jndiName="mailMimePartDS_1"> - <subject>How are you ?</subject> - <email type="to">john.doe@example.org</email> - <email type="cc">jane.doe@example.org</email> - <!-- Example of properties --> - <property name="mail.debug" value="false" /> - </mimepart> - - </mail> - - <!-- Creates a JDBC pool with jdbc_1 JNDI name --> - <jdbcpool jndiName="jdbc_1" username="easybeans" - password="easybeans" url="jdbc:hsqldb:hsql://localhost:9001/jdbc_1" - driver="org.hsqldb.jdbcDriver" /> - - <!-- Start smartclient server with a link to the rmi component--> - <smart-server port="2503" rmi="#rmi" /> - - - <!-- JNDI Resolver --> - <jndi-resolver /> - - <!-- JMX component --> - <jmx /> - - <!-- Statistic component --> - <statistic event="#event" jmx="#jmx" /> - </components> -</easybeans> - - By default, an easybeans-default.xml file is - used. To change the default configuration, the user must provide a file - named easybeans.xml, which is located at - classloader/CLASSPATH. - - - The namespace used is http://org.ow2.easybeans.server. - -
    - -
    - Configuration - - Each element defined inside the - <components> element is a component. - - Note that some elements are required only for the standalone mode. - JMS, RMI, HSQL, and JDBC pools are configured through JOnAS server when - EasyBeans runs inside JOnAS. - -
    - RMI Component - - The RMI configuration is done using the - <rmi> element. - - To run EasyBeans with multiple protocols, the - <protocol> element can be added more than - once. - - The hostname and port attributes are configurable. - - Protocols could be "jrmp, jeremie, iiop, cmi". The default is - jrmp. - - - Some protocols may require libraries that are not packaged by - default in EasyBeans. - -
    - -
    - Transaction Component - - The Transaction Component is defined by the - <tm> element. - - A timeout attribute, which is the transaction - timeout (in seconds), can be defined on this element. The default is 60 - seconds. - - The implementation provided by the JOTM objectweb project is - the default implementation. -
    - -
    - JMS Component - - The JMS component is used for JMS Message Driven Beans. Attributes - are the port number and the hostname. - - Also, the workmanager settings can be defined: minThreads, - maxThreads and threadTimeout. The values are printed at the EasyBeans - startup. - - The default implementation is the implementation provided by the - JORAM objectweb - project. -
    - -
    - HSQL Database - - EasyBeans can run an embedded database. Available attributes are - the port number and the database name. The - <hsqldb> may be duplicated in order to run - several HSQLDB instances. - - Users are defined through the <user> - element. -
    - -
    - JDBC Pool - - This component allows the JDBC datasource to be bound into JNDI. - The jndi name used is provided by the jndiName - attribute. - - Required attributes are username, - password, url and - driver. - - Optional attributes are poolMin, - poolMax and pstmtMax. This - component provides the option to set the minimum size of the pool, the - maximum size, and the size of the prepared statement cache. -
    - -
    - Mail component - - Mails can be sent by using the mail component that provides either - Session or MimePartDataSource factories. -
    - -
    - SmartServer Component - - This component is used by the Smart JNDI factory on the client - side. This allows the client to download missing classes. The client can - be run without a big jar file that provides all the classes. Classes are - loaded on demand. - - - Refer to the Chapter titled, Smart JNDI Factory, for more - information about this feature. - -
    -
    - -
    - Advanced Configuration - - This configuration file can be extended to create and set properties - on other classes. - -
    - Mapping File - - A mapping file named easybeans-mapping.xml - provides the information that rmi is the CarolComponent, tm is the JOTM - component, and jms is the Joram component. This file is located in the - org.objectweb.easybeans.server package. - - The following is an extract of the - easybeans-mapping.xml file. - - - The mapping file is using a schema available at http://easybeans.ow2.org/xml/ns/xmlconfig/xmlconfig-mapping_10.xsd - - - <?xml version="1.0" encoding="UTF-8"?> - <xmlconfig-mapping xmlns="http://easybeans.ow2.org/xml/ns/xmlconfig" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://easybeans.ow2.org/xml/ns/xmlconfig - http://easybeans.ow2.org/xml/ns/xmlconfig/xmlconfig-mapping_1_0.xsd"> - - <class name="org.ow2.easybeans.server.ServerConfig" alias="config"> - <attribute name="shouldWait" alias="wait" /> - <attribute name="useMBeans" alias="mbeans" /> - <attribute name="useNaming" alias="naming" /> - <attribute name="initJACC" alias="jacc" /> - <attribute name="directoryScanningEnabled" alias="scanning" /> - <attribute name="startJMXConnector" alias="connector" /> - <attribute name="registerDeployerMBean" alias="deployer" /> - <attribute name="registerJ2EEServerMBean" alias="j2eeserver" /> - <attribute name="description" /> - </class> - - <class name="org.ow2.easybeans.component.Components" - alias="components" /> - - <class name="org.ow2.easybeans.component.util.Property" - alias="property" /> - - <package name="org.ow2.easybeans.component.carol"> - <class name="CarolComponent" alias="rmi" /> - <class name="Protocol" alias="protocol"> - <attribute name="portNumber" alias="port" /> - </class> - </package> - - <class name="org.ow2.easybeans.component.cmi.CmiComponent" alias="cmi"> - <attribute name="serverConfig" alias="config" /> - <attribute name="eventComponent" alias="event" /> - </class> - - <class - name="org.ow2.easybeans.component.smartclient.server.SmartClientEndPointComponent" - alias="smart-server"> - <attribute name="portNumber" alias="port" /> - <attribute name="registryComponent" alias="rmi" /> - </class> - - <class name="org.ow2.easybeans.component.jotm.JOTMComponent" - alias="tm" /> - - <class name="org.ow2.easybeans.component.joram.JoramComponent" alias="jms"> - <attribute name="topic" isList="true" getter="getTopics" setter="setTopics" element="true"/> - </class> - - <class - name="org.ow2.easybeans.component.jdbcpool.JDBCPoolComponent" - alias="jdbcpool" /> - - <class - name="org.ow2.easybeans.component.remotejndiresolver.RemoteJNDIResolverComponent" - alias="jndi-resolver"> - </class> - - <package name="org.ow2.easybeans.component.hsqldb"> - <class name="HSQLDBComponent" alias="hsqldb"> - <attribute name="databaseName" alias="dbName" /> - <attribute name="portNumber" alias="port" /> - </class> - <class name="User" alias="user"> - <attribute name="userName" alias="name" /> - </class> - </package> - - <package name="org.ow2.easybeans.component.quartz"> - <class name="QuartzComponent" alias="timer" /> - </package> - - <package name="org.ow2.easybeans.component.mail"> - <class name="MailComponent" alias="mail" /> - <class name="Session" alias="session"> - <attribute name="JNDIName" alias="jndiName" /> - </class> - <class name="MimePart" alias="mimepart"> - <attribute name="subject" element="true" /> - <attribute name="JNDIName" alias="jndiName" /> - </class> - <class name="MailAddress" alias="email" element-attribute="name" /> - <class name="Auth" alias="auth"> - <attribute name="username" alias="name" /> - </class> - </package> - - <class name="org.ow2.easybeans.component.event.EventComponent" alias="event"> - <attribute name="eventService" alias="event-service" optional="true" /> - </class> - - <class name="org.ow2.easybeans.component.jmx.JmxComponent" alias="jmx"> - <attribute name="commonsModelerExtService" alias="modeler-service" optional="true" /> - </class> - - <class name="org.ow2.easybeans.component.statistic.StatisticComponent" alias="statistic"> - <attribute name="eventComponent" alias="event" /> - <attribute name="jmxComponent" alias="jmx" /> - </class> - - <package name="org.ow2.easybeans.component.depmonitor"> - <class name="DepMonitorComponent" alias="depmonitor"> - </class> - <class name="ScanningMonitor" alias="scanning"> - <attribute name="waitTime" alias="period" /> - </class> - <class name="LoadOnStartupMonitor" alias="loadOnStartup"> - </class> - </package> - - -</xmlconfig-mapping> - - - This mapping file is referenced by the easybeans configuration - file using the XML namespace : - xmlns="http://org.ow2.easybeans.server". - - Each element configured within this namespace will use the - mapping done in the org.ow2.easybeans.server - package. - - - Users can define their own mapping by providing a file in a - package. The name of the the file must be - easybeans-mapping.xml or - element-mapping.xml. - - Example: For the element <easybeans - xmlns="http://org.ow2.easybeans.server">, the resource - searched in the classloader is - org/ow2/easybeans/server/easybeans-mapping.xml. And - for an element <pool:max>2</pool:max> with - xmlns:pool="http://org.ow2.util.pool.impl", the resource searched will - be org/ow2/util/pool/impl/easybeans-mapping.xml or - org/ow2/util/pool/impl/pool-mapping.xml. -
    - -
    - Other Configuration Files - - EasyBeans can be configured through other configuration files as - it uses a POJO configuration. If done this way, it can be configured - using the Spring Framework component or other frameworks/tools. -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/contributing.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/contributing.xml deleted file mode 100644 index babffe24a31ae2f0f52581cd44e365a5215f4ac9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/contributing.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - Contributing to EasyBeans - -
    - Mailing Lists - - Developers wanting to contribute information about EasyBeans can - share their thoughts via the easybeans mailing list. - - The steps necessary for subscribing to the list are described at the - following url :http://www.objectweb.org/wws/info/easybeans -
    - -
    - Ideas for Contributing - - There are many ways to contribute to easybeans. New ideas are also - welcome. - - The following is a list of some of the ways to make - contributions: - - - - Documentation: Improve or add to the existing documentation, - create new chapters, translate, etc. - - - - Code: Some glue could be added so that EasyBeans could be - integrated in other servers. - - - - Tests: Add new tests to the current test suite. - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/creating_ejbs.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/creating_ejbs.xml deleted file mode 100644 index e22e949d0186eeb08fe41e822a52225fa81c4c9c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/creating_ejbs.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - Creating EJBs - -
    - Requirements - - Before trying to build a bean, developers should look at the - existing examples. - -
    - Creating a First Bean - - Scripts for building examples are available in the folder of each - example. These can be duplicated to use as a base for starting the first - bean. Additionally, if the bean will use entities, the entity bean - example should be used as a template. -
    - -
    - Writing Code for the Bean - - The business code should be written first. Then annotations can be - added to declare the bean as stateless, stateful or message-driven - beans. The client should be written last. -
    - -
    - Compiling and Running the Bean - - Two tasks are involved in using the example templates: - - - - ant install is used to build and copy the - bean to a deployable state. - - - - ant run.client is used to start a client - running in another JVM. - - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/developerguide.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/developerguide.xml deleted file mode 100644 index 94a4d727ba5da6e9598715a5be2f1eeedda51dc0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/developerguide.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - EasyBeans Developer's guide - - - - - - - - - - FlorentBENOIT - - - EasyBeans - - OW2 consortium - - - - - $Id: developerguide.xml 216 2006-03-16 19:01:07Z benoitf - $ - - - 2006-2008 - - OW2 Consortium - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - The EasyBeans developer guide is intended for developers wanting - to work with the source distribution of EasyBeans. People wanted to - contribute to EasyBeans should read this documentation. - - - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/ejb3_introduction.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/ejb3_introduction.xml deleted file mode 100644 index 3caab7b97d6d081da7465ae28089e1a3b9033fbd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/ejb3_introduction.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - Introduction to EJB3 - -
    - Overview - - EJB3 is included in the next J2EE specification, JAVA EE 5. ( - http://java.sun.com/javaee/5/ ) - - The EJB3 specification is defined in JSR 220, which can be found at - the following location: http://www.jcp.org/en/jsr/detail?id=220 - - The publication is published as three separate files: - - The core - - - - The persistence provider - - - - The simplified specification, which contains new - features - - The EJB3 persistence provider is plugged into the EJB3 - container. Available persistence providers are: Hibernate EntityManager, - Apache OpenJPA, TopLink - Essentials, and Eclipse Link - etc. -
    - -
    - The Advantage of EJB3 - - EJB 2.x was too complex. Developers were using additional tools to - make it easier. - - - - XDoclet (Attribute oriented programming): http://xdoclet.sourceforge.net - - - - Hibernate for persistence: http://www.hibernate.org - - The main focus for this specification is on Ease Of - Development (EoD). One major way this has been simplified is by using - metadata attribute annotations suppported by JDK 5.0. - - Simplifying EJB development should produce a wider range of Java EE - developers. -
    - -
    - EJB2 vs EJB3: EoD - - The deployment descriptors are no longer required; everything can be - accomplished using metadata annotations. - - The CMP (Container Managed Persistence) has been simplified; it is - now more like Hibernate or JDO. - - Programmatic defaults have been incorporated. For example, the - transaction model is set to REQUIRED by default. The value needs to be set - only if a specific value other than the default value is desired. - - The use of checked exceptions is reduced; the RemoteException is no - longer mandatory on each remote business method. - - Inheritance is now allowed; therefore, beans can extend some of the - base code. - - The native SQL queries are supported as an EJB-QL (Query Language) - enhancement. -
    - -
    - New Features - -
    - Metadata Annotations - - Metadata annotations is new. For example, to define a stateless - session bean, the @Stateless annotation is declared - on the bean class. -
    - -
    - Business Interceptors - - The new business interceptors allow the developer to intercept - each business method of the bean. The parameters and the returned values - can be changed. For example, an interceptor can be used to determine the - time that a method takes to execute. -
    - -
    - Lifecycle Interceptors - - In addition to business interceptors, the EJB2 callbacks ( such as - the ejbActivate() method) are now defined using - annotation. For the ejbActivate() method, this - is done with the help of @PostActivate annotation. - This annotation is set on a method that will be called by the - container. -
    - -
    - Dependency Injection - - Dependency injection makes it possible to request that the - container inject resources, instead of trying to get them. For example, - with the EJB2 specification, in order to get an EJB, the following code - was used: - - try { - Object o = new InitialContext().lookup("java:comp/env/ejb/MyEJB"); - myBean = PortableRemoteObject.narrow(o, MyInterface.clas); -} catch (NamingException e) { - .... -} - - With EJB3 this is done using only the following code: - - @EJB private MyInterface myBean; - - If the @EJB annotation is found in the class, - the container will look up and inject an instance of the bean in the - myBean variable. -
    - -
    - Persistence - - New features are linked to the persistence layer. For example, - EJB3 entities are POJO (Plain Old Java Object). This means that they can - be created by using the new() constructor: - new MyEntity(); - - Also entities are managed by an - EntityManager: entitymanager.persist(entity); - - In addition, entities have callbacks available. -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/getting_from_svn.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/getting_from_svn.xml deleted file mode 100644 index 1c209bd3053b17faa13bfefb395175d8d3915c5a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/getting_from_svn.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Getting EasyBeans From the SVN Repository - - Anyone can check out source code from the SVN server using the - following command (for GUI SVN client use, configuration values are the same - as for command line use): - - svn checkout - svn://svn.forge.objectweb.org/svnroot/easybeans/trunk/easybeans - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/helloworldbean.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/helloworldbean.xml deleted file mode 100644 index 3944e1d5053193f22964072ded2e0964bb63ef01..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/helloworldbean.xml +++ /dev/null @@ -1,250 +0,0 @@ - - - Writing a HelloWorld Bean - -
    - Requirements - - This example illustrates the basics of an EJB3 application, showing - all the steps used to build and run the EJB. - - The only addtional information required is to know how to run the - server. -
    - -
    - Writing Code for the Bean - - The HelloWorld bean is divided into two parts: the business - interface, and the class implementing this interface. - -
    - Writing the Interface - - The interface declares only one method: - helloWorld() - - package org.objectweb.easybeans.tutorial.helloworld; - -/** - * Interface of the HelloWorld example. - * @author Florent Benoit - */ -public interface HelloWorldInterface { - - /** - * Hello world. - */ - void helloWorld(); - -} - - - Even if this interface is used as a remote interface, it does - not need to extend java.rmi.Remote - interface. - -
    - -
    - Writing the Business Code - - The following code implements the existing interface: - - package org.objectweb.easybeans.tutorial.helloworld; - -/** - * Business code for the HelloWorld interface. - * @author Florent Benoit - */ -public class HelloWorldBean implements HelloWorldInterface { - - /** - * Hello world implementation. - */ - public void helloWorld() { - System.out.println("Hello world !"); - } - -} - - - At this moment, the bean is not an EJB; this is only a class - implementing an interface. - -
    - -
    - Defining the EJB Code as a Stateless Session Bean - - Now that the EJB code has been written, it is time to define the - EJB application. - - This bean will be a stateless session bean, thus the class will be - annotated with @Stateless annotation. - - In addition, the interface must be a remote interface to be - available for remote clients. This is done by using the - @Remote annotation. - - package org.objectweb.easybeans.tutorial.helloworld; - - -import javax.ejb.Remote; -import javax.ejb.Stateless; - -/** - * Business code for the HelloWorld interface. - * @author Florent Benoit - */ -@Stateless -@Remote(HelloWorldInterface.class) -public class HelloWorldBean implements HelloWorldInterface { - - /** - * Hello world implementation. - */ - public void helloWorld() { - System.out.println("Hello world !"); - } - -} - - - If a class implements a single interface, this interface is - defined as a local interface by default. - -
    - -
    - Packaging the Bean - - The two classes ( - HelloWorldInterface and - HelloWorldBean) must be compiled. - - Then, a folder named ejb3s/helloworld.jar/ must be created and - classes placed in this folder. They will be deployed and loaded - automatically. -
    -
    - -
    - Writing the Client Code - - The client can access the business interface directly and can call - the methods of the bean directly. - - package org.objectweb.easybeans.tutorial.helloworld; - -import javax.naming.Context; -import javax.naming.InitialContext; - -/** - * Client of the helloworld bean. - * @author Florent Benoit - */ -public final class Client { - - /** - * JNDI name of the bean. - */ - private static final String JNDI_NAME = - "org.objectweb.easybeans.tutorial.helloworld.HelloWorldBean" - + "_" + HelloWorldInterface.class.getName() + "@Remote" - - /** - * Utility class. No public constructor - */ - private Client() { - } - - /** - * Main method. - * @param args the arguments (not required) - * @throws Exception if exception is found. - */ - public static void main(final String[] args) throws Exception { - Context initialContext = new InitialContext(); - - HelloWorldInterface businessItf = - (HelloWorldInterface) initialContext.lookup(JNDI_NAME); - - System.out.println("Calling helloWorld method..."); - businessItf.helloWorld(); - } - -} - - - The client does not call the PortableRemoteObject.narrow() method. - Also, no create() method is required. - -
    - -
    - Writing a First Business Method Interceptor - - An interceptor can be defined in the bean class or in another class. - In this example, it will be defined in the bean's class. A business - interceptor is defined by using the @AroundInvoke - annotation. - - The following interceptor will print the name of the method that is - invoked. Of course, this could be extended to perform more - functions. - - /** - * Dummy interceptor. - * @param invocationContext contains attributes of invocation - * @return method's invocation result - * @throws Exception if invocation fails - */ - @AroundInvoke - public Object intercept(final InvocationContext invocationContext) throws Exception { - System.out.println("Intercepting method '" + invocationContext.getMethod().getName() - + "'."); - try { - return invocationContext.proceed(); - } finally { - System.out.println("End of intercepting."); - } - } - - - Be sure to call the proceed() method on - the invocationContext object; otherwise, the invocation is - broken. - -
    - -
    - Writing a First Lifecycle Interceptor - - The bean can be notified of certain lifecycle events: for example, - when a bean is created or destroyed. - - In the following example, a method of the bean will receive an event - when an instance of the bean is built. This is done by using the - @PostConstruct annotation. - - Llifecycle interceptors of a bean may be defined in another - class. - - /** - * Notified of postconstruct event. - */ - @PostConstruct - public void notified() { - System.out.println("New instance of this bean"); - } -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/howto/gwt-ejb3-sudoku.png b/jonas_doc/core/src/docbook/doc-en/easybeans/howto/gwt-ejb3-sudoku.png deleted file mode 100644 index ae5e33e80fbeb998f9b2e9ad4013d05d246ddd18..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/docbook/doc-en/easybeans/howto/gwt-ejb3-sudoku.png and /dev/null differ diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/howto/gwt-ejb3.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/howto/gwt-ejb3.xml deleted file mode 100644 index 81b5f61f9e040426d67495a86c4104fbf26badd5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/howto/gwt-ejb3.xml +++ /dev/null @@ -1,800 +0,0 @@ - - - GWT and EJB3 with EasyBeans - - - The GWT (Google Web Toolkit) - will be used as the framework for producing clients using the AJAX technique, - while EJB3 will be on the server side providing some services (such as - persistence). - - EJB3 can help developers with the persistence aspects (with the Java - Persistence API) or with the business aspects. - - The source of an application, a Sudoku Game, that uses EasyBeans and - GWT can be viewed on the Fisheye - Sudoku EasyBeans site using a browser. This howto uses some of the - code from this application. - - A tgz package is also provided on the - EasyBeans forge. - - -
    - Sudoku Game demo using GWT and EasyBeans - - - - - </info> - - <mediaobject> - <imageobject> - <imagedata align="center" depth="359px" fileref="gwt-ejb3-sudoku.png" - format="png" scalefit="1" width="267px" /> - </imageobject> - </mediaobject> - </screenshot> - </figure> - - <section> - <title>Requirements - -
    - JDK - - A JDK 5.0 is required to use EasyBeans. - - - GWT only supports JDK 1.4 functions. Therefore, classes that - will be transformed by GWT into JavaScript should not use JDK 5 - features (such as annotations). Other classes can use the new features - (like the EJB3). - -
    - -
    - Eclipse - - GWT can be used without Eclipse. However, Eclipse is used in - this HowTo. -
    - -
    - EasyBeans - - This HowTo uses the EasyBeans Tomcat package. Note that it also - works with the JOnAS package or any other EasyBeans package. - - EasyBeans can be downloaded from the EasyBeans Web Site. -
    - -
    - Tomcat - - Tomcat 5.5.20 was used. It should work with other versions as - well. Download this software from Tomcat - site. -
    - -
    - Google Web Toolkit - - The Toolkit can be downloaded from the Google Web - Toolkit download page. The version used in this HowTo is the 1.3 - RC1 version running on Linux. This is the first open source version of - GWT released with an Apache 2.0 license. -
    - - -
    - Starting with GWT - -
    - Creating an Eclipse Project - - GWT comes with an eclipse project creator tool. The project will - have the name Sudoku and will be created in the $HOME/workspace - directory. - - $ cd gwt-linux-1.3.1/ -$ ./projectCreator -eclipse Sudoku -out $HOME/workspace/sudoku -Created directory $HOME/workspace/sudoku/src -Created file $HOME/workspace/sudoku/.project -Created file $HOME/workspace/sudoku/.classpath -
    - -
    - Adding a GWT Application to the Eclipse Project - - A GWT application must be added to the eclipse project. The - application creator tool is given the name of the class to - generate. - - The following files will be generated: - - The Sudoku.gwt.xml file, which - describes the module with entry point. Additionally, this file - will be used to add the mapping for the remote service using - EasyBeans. - - - - The Sudoku.html file, which is a - skeleton page that calls the widget's examples. - - - - The Sudoku.java file, which is the - class responsible to load widgets (which implements the - EntryPoint interface). - - - - Additionally, there are three scripts that allow files to be - launched or compiled. Note that the compile script will be - replaced by an ant task in this HowTo. - - - - $ ./applicationCreator -out $HOME/workspace/sudoku -eclipse -out org.objectweb.easybeans.demo.sudoku.web.client.Sudoku -Created directory $HOME/workspace/sudoku/src/org/objectweb/easybeans/demo/sudoku/web -Created directory $HOME/workspace/sudoku/src/org/objectweb/easybeans/demo/sudoku/web/client -Created directory $HOME/workspace/sudoku/src/org/objectweb/easybeans/demo/sudoku/web/public -Created file $HOME/workspace/sudoku/src/org/objectweb/easybeans/demo/sudoku/web/Sudoku.gwt.xml -Created file $HOME//workspace/sudoku/src/org/objectweb/easybeans/demo/sudoku/web/public/Sudoku.html -Created file $HOME//workspace/sudoku/src/org/objectweb/easybeans/demo/sudoku/web/client/Sudoku.java -Created file $HOME/workspace/sudoku/Sudoku.launch -Created file $HOME/workspace/sudoku/Sudoku-shell -Created file $HOME/workspace/sudoku/Sudoku-compile -
    -
    - -
    - Calling EJB3 Beans with an RPC Service - -
    - Defining the Interface of the Service - - The two interfaces of the service must be present in the client - package. In this howto, the package name is - org.objectweb.easybeans.demo.sudoku.web.client.service. - - The following two interfaces must be defined: - - - - - The interface that will be implemented by the remote - service - - - - The asynchronous interface, which is always a void method. A - new parameter must be added on the method and the name of the - interface must have a suffix of - Async. - - - - -
    - Service Interface - - The following is an example of a service that takes an argument - and returns an object (A solver). - - package org.objectweb.easybeans.demo.sudoku.web.client.service; - -import org.objectweb.easybeans.demo.sudoku.web.client.api.GridData; -import org.objectweb.easybeans.demo.sudoku.web.client.api.ServiceException; - - -import com.google.gwt.user.client.rpc.RemoteService; - -/** - * Interface used to call the servlet facade and then EJB3. - * @author Florent Benoit - */ -public interface ServletFacadeService extends RemoteService { - - /** - * Solve a sudoku grid and send in return the solved grid. - * @param gridData the grid to solve - * @return the solved grid. - * @throws ServiceException if solving fails. - */ - GridData solve(GridData gridData) throws ServiceException; - - /** - * Checks if a sudoku grid is valid. - * @param gridData the grid to check - * @throws ServiceException if checking fails. - */ - void check(GridData gridData) throws ServiceException; - - - /** - * Generate a sudoku grid and send it in return. - * @return the generated grid. - * @throws ServiceException if solving fails. - */ - GridData generate() throws ServiceException; - -} - - - - GridData must be a serializable object. However, this - serialization is not JDK serialization. This class must implement - the - com.google.gwt.user.client.rpc.IsSerializable - interface. - - The Exception (ServiceException) also implements the - IsSerializable interface. - -
    - -
    - Asynchronous Interface - - The signature is almost the same, except for the - following: - - - - - The return type is void. - - - - An extra argument is added in the method signature: the - AsyncCallback object. - - - - The name of the class ends with the - Async keyword. - - - - - package org.objectweb.easybeans.demo.sudoku.web.client.service; - -import org.objectweb.easybeans.demo.sudoku.web.client.api.GridData; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -/** - * Asynchronous interface. Same parameters of interface but all methods have an AsyncCallback parameter and are void !. - * @author Florent Benoit - */ -public interface ServletFacadeServiceAsync { - - /** - * Asynchronous call to the solve method. - * @param gridData the grid to solve - * @param callback the callback to use for this method - */ - void solve(GridData gridData, AsyncCallback callback); - - /** - * Checks if a sudoku grid is valid. - * @param gridData the grid to check - * @param callback the callback to use for this method - */ - void check(GridData gridData, AsyncCallback callback); - - - /** - * Generates a sudoku grid and send it in return. - * @param callback the callback to use for this method - */ - void generate(AsyncCallback callback); -} - - - - The ServiceException is not thrown by the solve() method of - the Async interface. The exceptions will be reported in the - onFailure(Throwable t) method of the - callback. - -
    -
    - -
    - Classes Used by the Interfaces - -
    - The GridData Class - - This class implements the - IsSerializable interface. - - package org.objectweb.easybeans.demo.sudoku.web.client.api; - -import com.google.gwt.user.client.rpc.IsSerializable; - -/** - * Represents the data of a sudoku grid. - * It is a serializable object (gwt) used by remote service. - * @author Florent Benoit - */ -public class GridData implements IsSerializable { - ... -} -
    - -
    - The ServiceException Exception - - This class implements the - IsSerializable interface and stores the - message. - - Additionally, an empty constructor is required for the - serialization. - - package org.objectweb.easybeans.demo.sudoku.web.client.api; - -import com.google.gwt.user.client.rpc.IsSerializable; - -/** - * Exception thrown by the remote service. <br /> - * Exception needs to be serializable (gwt) - * @author Florent Benoit - */ -public class ServiceException extends Exception implements IsSerializable { - - /** - * The message of the exception. - */ - private String msg; - - - /** - * Empty message. - */ - public ServiceException() { - super(); - } - - /** - * Builds an exception with a given message. - * @param msg the message of the exception. - */ - public ServiceException(final String msg) { - super(msg); - this.msg = msg; - } - - - /** - * Gets the message of the exception. - * @return the message of the exception. - */ - public String getMessage() { - return this.msg; - } - -} -
    -
    - -
    - Implementing the Service - -
    - Implementation Service Class - - The implementation of the service will run on the server side. - Therefore, it need not be present in the client package (no JavaScript - transformation). The class will be in the server package. - - The service is provided as a servlet. Then, the class must - extend the - com.google.gwt.user.server.rpc.RemoteServiceServlet - class. - - The Class will look like the following: - - package org.objectweb.easybeans.demo.sudoku.web.server.service; - -import org.objectweb.easybeans.demo.sudoku.web.client.api.GridData; -import org.objectweb.easybeans.demo.sudoku.web.client.api.ServiceException; - -import com.google.gwt.user.server.rpc.RemoteServiceServlet; - -/** - * Implementation of the service that runs on the server side. <br /> - * All is delegate to the EJB3 session facade. - * @author Florent Benoit - */ -public class ServletFacadeServiceImpl extends RemoteServiceServlet implements ServletFacadeService { - - /** - * Checks if a sudoku grid is valid. - * @param gridData the grid to check - * @throws ServiceException if checking fails. - */ - public void check(final GridData gridData) throws ServiceException { - try { - getFacade().check(gridData.getData()); - } catch (Exception e) { - throw new ServiceException(e.getMessage()); - } - } - - /** - * Solve a sudoku grid and send in return the solved grid. - * @param gridData the grid to solve - * @return the solved grid. - * @throws ServiceException if solving fails. - */ - public GridData solve(final GridData gridData) throws ServiceException { - int[][] solvedData = null; - try { - solvedData = getFacade().solve(gridData.getData()); - } catch (Exception e) { - throw new ServiceException(e.getMessage()); - } - GridData solvedGridData = new GridData(); - solvedGridData.setData(solvedData); - return solvedGridData; - } - -... - -} -
    - -
    - Accessing an EJB3 from this Remote Service - - A sessionBean facade will be used for delegating all the - requests. - - The service will use a getFacade() method. InitialContext is - built, then the facade is searched and the session bean is returned. - The bean can be cached to avoid getting a new bean each time. - - The following is the code for this method: - - /** - * Gets the session facade bean. - * @return the session bean. - * @throws Exception if facade is not retrieved - */ - private SudokuFacade getFacade() throws Exception { - SudokuFacade sudokuFacade = null; - - Context initialContext = null; - Hashtable<String, String> env = new Hashtable<String, String>(); - // Use the smart factory - env.put(Context.INITIAL_CONTEXT_FACTORY, SmartContextFactory.class.getName()); - // Use the default Provider URL port - env.put(Context.PROVIDER_URL, "smart://localhost:2503"); - initialContext = new InitialContext(env); - sudokuFacade = (SudokuFacade) initialContext.lookup("SudokuFacade"); - return sudokuFacade; - } - - - The JNDI name is very simple as the attribute mappedName was - used on the @Stateless annotation of the EJB3. The InitialContext - factory is the smart factory. This factory allow to download the - classes when they are required. The PROVIDER_URL is the default URL - of the Smart component. - -
    - -
    - Calling the Facade Bean from the Remote Service - - When an operation must be performed on the facade session bean, - it is done in the following way: - - try { - ... = getFacade().methodName(); - } catch (Exception e) { - throw new ServiceException(e.getMessage()); - } - - - The exception thrown is wrapped in the ServiceException. Only - the message is kept and thrown to the client. The error can be printed - to the error log to have a full trace on the server side. -
    -
    - -
    - Calling the Remote Service from the Client Side - -
    - The gwt.xml File - - The service must be added to an xml file in order to declare it. - In this howto, the file is named - Sudoku.gwt.xml. - - The servet element is added to this file along with the class - implementing the service and the endpoint of the service (/facade is - the following example). - - - <module> - <!-- Inherit the core Web Toolkit stuff. --> - <inherits name='com.google.gwt.user.User'/> - - <!-- Specify the app entry point class. --> - <entry-point class='org.objectweb.easybeans.demo.sudoku.web.client.Sudoku'/> - - <servlet path='/facade' class='org.objectweb.easybeans.demo.sudoku.web.server.service.ServletFacadeServiceImpl'/> - -</module> - - -
    - -
    - Callingathe Service from the Client Side - -
    - Getting the Service on the Client Side - - An endpoint must be created. The path of the endpoint will use - the name of the module and then /facade (the same entry as in the - gwt.xml file). - - The endpoint will be something similar to - "http://localhost:8080/org.objectweb.easybeans.demo/facade". - - By using GWT.getModuleBaseURL(), the port and the host need - not be known. - - ServletFacadeServiceAsync servletFacadeServiceAsync = (ServletFacadeServiceAsync) GWT - .create(ServletFacadeService.class); -ServiceDefTarget endpoint = (ServiceDefTarget) servletFacadeServiceAsync; -endpoint.setServiceEntryPoint(GWT.getModuleBaseURL() + "/facade"); -
    - -
    - Creating the Callback - - Before invoking the service, a callback must be built. The - asynchronous interface of the service is used. As this interface - requires a callback, it must be constructed beforehand. - - A callback provides two methods: - - - - - An onSuccess(final Object - result) method if the call completes - successfully. - - - - An onFailure(final Throwable - caught) method if the call fails. - - - - - For the onSuccess method, the result parameter can be cast to - GridData, which is the return type of the original method's - interface. - - final AsyncCallback solvedCallback = new AsyncCallback() { - /** - * Called when an asynchronous call completes successfully. It is - * always safe to downcast the parameter (of type - * <code>Object</code>) to the return type of the original method - * for which this is a callback. - */ - public void onSuccess(final Object result) { - GridData solvedGridData = (GridData) result; - ... - } - - /** - * Called when an asynchronous call fails to complete normally. - * @param caught the failure. - */ - public void onFailure(final Throwable caught) { - ... - } -}; -
    - -
    - Invoking the Service - - The service can be invoked by providing the arguments of the - original method, one of which is the callback on the asynchronous - interface. - - serviceAsycn.solve(gridData, solvedCallback); -
    -
    -
    -
    - -
    - Packaging of the Application for Running on a Web Container - -
    - Creating the web.xml File - - A web.xml file must be created to define a - servlet for the remote service that was defined and the mapping must be - done. The mapping must be the same as that used in the client when it - was searching for the endpoint to use. - - The following is an example of the xml file: - - <?xml version="1.0" encoding="ISO-8859-1"> -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>ServletFacadeService</servlet-name> - <servlet-class>org.objectweb.easybeans.demo.sudoku.web.server.service.ServletFacadeServiceImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ServletFacadeService</servlet-name> - <url-pattern>/facade</url-pattern> - </servlet-mapping> - -</web-app> - -
    - -
    - Generating the AJAX Client that Will Be Embedded in the War - File - - GWT provides some shell scripts to generate the client side. - However, it is recommended that an ant task be used. - - First, define a classpath. This classpath should include GWT - libraries and the path to the source code of the Entry point: - - <path id="gwt.classpath"> - <pathelement location="${project.dir}/src" /> - <pathelement location="${gwt.sdk.location}/gwt-user.jar" /> - <pathelement location="${gwt.sdk.location}/gwt-dev-windows.jar" /> - </path> - - Then, compile the code: - - <target name="compile" description="Compile demo" depends="init"> - <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="on"> - <classpath refid="base.classpath" /> - </javac> - </target> - - Finally, generate the GWT: - - <target name="generate-gwt" depends="compile"> - <java classname="com.google.gwt.dev.GWTCompiler" fork="true"> - <arg value="-out" /> - <arg value="${dist.www.dir}" /> - <arg value="org.objectweb.easybeans.demo.sudoku.web.Sudoku" /> - <classpath refid="base.classpath" /> - </java> - </target> -
    - -
    - Packaging of the .war File - - The AJAX client will be bundled in a war file and will contain the - GWT runtime library. - - The war task of ant can be used to create the package. - - The output generated by the GWT compiler is added at the root of - the WAR file; the libraries go in the WEB-INF/lib folder, and all classes go in - the WEB-INF/classes - folder. - - <target name="build.war" - description="Build war file" - depends="compile, generate-gwt"> - <war jarfile="${dist.webapps.dir}/sudoku.war" - webxml="${resources.dir}/web.xml"> - <fileset dir="${dist.www.dir}/org.objectweb.easybeans.demo.sudoku.web.Sudoku" /> - <lib dir="${lib.dir}"> - <include name="gwt-servlet.jar" /> - <include name="ow_easybeans_component_smartclient.jar" /> - </lib> - <classes dir="${classes.dir}"> - <include name="**/**" /> - </classes> - </war> - </target> - - - The gwt-servlet.jar is used and not the gwt-user.jar file. This - is because gwt-user.jar provided by Google contains javax.servlet.* - classes, and thus it cannot be deployed on a Tomcat container. - -
    -
    - -
    - Deploying Applications for GWT/EasyBeans - - The war file generated by Ant should be copied to the CATALINA_HOME/webapps folder, and the EJB3 - implementation should be copied to the CATALINA_HOME/ejb3s folder. - - Documentation about how to start Tomcat/EasyBeans is located in the - documentation - section of the EasyBeans web site. -
    - -
    - Launching the Google Web Toolkit Tools - - The GWT toolkit creates a .launch script that allows launching of an - embedded browser and an embedded web container for debugging applications - within Eclipse. This script must be modified for EasyBeans access. - - The following lines have been added: - - <listAttribute key="org.eclipse.jdt.launching.CLASSPATH"> -<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;SudokuWeb&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/> -<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/easybeans-sudoku/src/java&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/> -<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/easybeans-sudoku/output-eclipse&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/> -<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/easybeans-sudoku/lib/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/> -<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/easybeans-sudoku/lib/gwt-dev-linux.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/> -<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/easybeans-sudoku/lib/ow_ejb3_core_api.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/> -<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/easybeans-sudoku/lib/ow_ejb3_persistence_api.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/> -<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;/easybeans-sudoku/lib/ow_easybeans_component_smartclient.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/> -</listAttribute> - - These libraries are used to access the EasyBeans services. It - includes the gwt-user.jar, gwt-dev-linux.jar, EJB3 API - (ow_ejb3_core_api.jar and ow_ejb3_persistence_api.jar) and the Smart - factory ow_easybeans_component_smartclient.jar. -
    - -
    - Comments - - Although this guide may not answer all questions, it should still be - possible to complete the HowTo. The intent of this HowTo is to illustrate - how to call remote EJB3s running on EasyBeans using the Google Web - Toolkit. - - The EasyBeans user - guide provides help for developing EJB3 components. -
    - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/howto/howtos.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/howto/howtos.xml deleted file mode 100644 index 2400bb0f47a1035232a0b38189446d7ad3fbcce5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/howto/howtos.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - EasyBeans HowTo - - - - - - - - - FlorentBENOIT - - - EasyBeans - - OW2 consortium - - - - - $Id: howtos.xml 3272 2008-05-21 09:53:35Z benoitf $ - - - 2006-2008 - - OW2 Consortium - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - The HowTos provided in this guide allow the developer to discover - and do some tasks with EasyBeans and some other components. - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/running.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/running.xml deleted file mode 100644 index bc722efd6edbc9d40a8c961dd39dc27285cf33c2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/running.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - Running EasyBeans server. - -
    - Requirements - - Review the requirements discussed in Chapter 1, "Building EasyBeans - from Source." -
    - -
    - Running - - The build.xml file located in the project root - will be used to launch the EasyBeans server. This file is contained in the - source distribution. - - Use the following command: ant run.server - - The EasyBeans server will be launched and the following output will - be printed: - - $ ant run.server -Buildfile: build.xml - -init-maven-task: - -run.server: - [java] 9/29/07 3:45:20 PM (I) PolicyProvider.init : Using EasyBeans policy provider 'org.ow2.easybeans.security.jacc.provider.JPolicy'. - [java] 9/29/07 3:45:20 PM (I) PolicyProvider.init : Using EasyBeans PolicyConfigurationFactory provider and EasyBeans Policy provider - [java] 9/29/07 3:45:20 PM (W) Embedded.configure : Directory /home/benoitf/workspace/easybeans/easybeans-deploy created. - [java] 9/29/07 3:45:20 PM (I) Embedded.configure : Using directories '[easybeans-deploy]' as deploy directories - [java] 9/29/07 3:45:20 PM (I) TraceCarol.infoCarol : Name service for jrmp is started on port 1099 - [java] 9/29/07 3:45:21 PM (I) Current.<init> : JOTM 2.0.10 - [java] 9/29/07 3:45:21 PM (I) JOTMComponent.start : Register javax.transaction.UserTransaction as transaction manager object - [java] 9/29/07 3:45:21 PM (I) JoramComponent.start : Joram version '5.0.6' started on localhost:16030. - [java] 9/29/07 3:45:21 PM (I) HSQLDBComponent.start : Starting 'HSQLDB server' '1.8.0' on port '9001' - [java] 9/29/07 3:45:21 PM (I) HSQLDBComponent.start : HSQLDB server started with URL jdbc:hsqldb:hsql://localhost:9001/jdbc_1 - [java] 9/29/07 3:45:21 PM (I) HSQLDBComponent.start : Starting 'HSQLDB server' '1.8.0' on port '9002' - [java] 9/29/07 3:45:22 PM (I) HSQLDBComponent.start : HSQLDB server started with URL jdbc:hsqldb:hsql://localhost:9002/jdbc_2 - [java] 9/29/07 3:45:22 PM (I) MailComponent.start : Binding javax.mail.Session Mail factory with JNDI name mailSession_1 - [java] 9/29/07 3:45:22 PM (I) MailComponent.start : Binding javax.mail.internet.MimePartDataSource Mail factory with JNDI name mailMimePartDS_1 - [java] 9/29/07 3:45:22 PM (I) JDBCPoolComponent.start : DS 'jdbc_1', URL 'jdbc:hsqldb:hsql://localhost:9001/jdbc_1', Driver = 'org.hsqldb.jdbcDriver'. - [java] 9/29/07 3:45:22 PM (I) JDBCPoolComponent.start : DS 'jdbc_2', URL 'jdbc:hsqldb:hsql://localhost:9002/jdbc_2', Driver = 'org.hsqldb.jdbcDriver'. - [java] 9/29/07 3:45:22 PM (I) SmartClientEndPointComponent.start : SmartClient Endpoint listening on port '2503'. - [java] 9/29/07 3:45:22 PM (I) QuartzScheduler.<init> : Quartz Scheduler v.1.6.0 created. - [java] 9/29/07 3:45:22 PM (I) RAMJobStore.initialize : RAMJobStore initialized. - [java] 9/29/07 3:45:22 PM (I) StdSchedulerFactory.instantiate : Quartz scheduler 'EasyBeans' initialized from an externally provided properties instance. - [java] 9/29/07 3:45:22 PM (I) StdSchedulerFactory.instantiate : Quartz scheduler version: 1.6.0 - [java] 9/29/07 3:45:22 PM (I) QuartzScheduler.start : Scheduler EasyBeans_$_NON_CLUSTERED started. - [java] 9/29/07 3:45:22 PM (I) ComponentManager.startComponents : [ Component(s) started : Carol JOTM Joram HSQLDB HSQLDB Mail JDBCPool JDBCPool SmartClientEndPoint Quartz ] - [java] 9/29/07 3:45:22 PM (I) JMXRemoteHelper.init : Creating JMXRemote connector with URL 'service:jmx:rmi:///jndi//EasyBeansConnector' - [java] 9/29/07 3:45:22 PM (I) Embedded.start : Startup of EasyBeans '1.0.0-SNAPSHOT' was done in '1,954' ms. - [java] 9/29/07 3:45:22 PM (I) Embedded.start : Waiting requests... - - - EasyBeans is now launched and it is ready to handle EJBs. -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/smart_factory.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/smart_factory.xml deleted file mode 100644 index a7639ee76616fcb25eb1575929eafd26b379750f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/smart_factory.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - Smart JNDI Factory - -
    - Introduction - - The smart factory provided by EasyBeans is a factory that allows - downloading of some classes from the server. - - It is useful when developing heavy clients. - - In order to run the clients, the developer must provide all the - classes used to compile the client code and include a small jar file (less - than 50kB) to add to the CLASSPATH. - - Required libraries for running a client are: - - - - The client's code (used at compile time) - - - - The Interface of the Beans that are accessed (used at compile - time) - - - - The Java EE API used by the client (used at compile time) - - - - The smart factory provided by the - ow_easybeans_component_smartclient.jar jar - file - - -
    - -
    - Running the Client - - The smart factory is configured through two properties. - -
    - Initial Context Factory - - The first property is the InitialContextFactory name. The smart - factory is named - org.ow2.easybeans.component.smartclient.spi.SmartContextFactory. - - This property can be set as a System property in one of the - following ways: - - by using - -Djava.naming.factory.initial=org.ow2.easybeans.component.smartclient.spi.SmartContextFactory - - - - by using System.setProperty(Context.INITIAL_CONTEXT_FACTORY, - org.ow2.easybeans.component.smartclient.spi.SmartContextFactory) - - - - It can also be used as a parameter when creating an - InitialContext: - - Hashtable<String, Object> env = new Hashtable<String, Object>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, org.ow2.easybeans.component.smartclient.spi.SmartContextFactory); - return new InitialContext(env); -
    - -
    - Provider URL - - This property is used to provide the remote address and the remote - port. - - By default, this property is set (if not defined) to - smart://localhost:2503 - - The port number must match the port defined in the EasyBeans - configuration file. - - This property can be set using: - - Hashtable<String, Object> env = new Hashtable<String, Object>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, org.ow2.easybeans.component.smartclient.spi.SmartContextFactory); - env.put(Context.PROVIDER_URL, "smart://localhost:2503"); - return new InitialContext(env); -
    -
    - -
    - Example - - The following is the output on the client side when this factory is - enabled: - - [java] Oct 17, 2006 5:38:13 PM org.ow2.easybeans.component.smartclient.spi.SmartContextFactory getInitialContext - [java] INFO: Initializing Smart Factory with remote URL 'smart://localhost:2503'. - [java] Oct 17, 2006 5:38:13 PM org.ow2.easybeans.component.smartclient.spi.SmartContextFactory getInitialContext - [java] INFO: Got remote PROVIDER_URL 'rmi://localhost:1099'. - - ... - [java] Downloaded 'xxx' classes, 'xxx' resources for a total of 'xxx' bytes and it took 'xxx' ms. - - - - The following is the output on the server side: - - [java] 10/17/06 5:38:13 PM (I) SmartClientEndPointComponent.handleReadProviderURLRequest : Provider URL asked by client : 'rmi://localhost:1099'. - -
    - -
    - Smart Bootstrap - - Sometimes, it's easier to launch the client with a bootstrap class - instead of setting a factory. Then, the smart component is providing also - a bootstrap class. - -
    - Smart Library - - The smart bootstrap jar library is provided in the releases of - EasyBeans. It can also be downloaded from the maven repository: http://repo2.maven.org/maven2/org/ow2/easybeans/easybeans-component-smartclient/ - - Select the version corresponding to the EasyBeans version. -
    - -
    - Smart Bootstrap class - - In order to launch the bootstrap, the - ow_easybeans_component_smartclient.jar file needs to be - present and then it is invoked by using: - - java -jar - ow_easybeans_component_smartclient.jar - - Usage is printed when no parameteres are specified. - - The jars containing the client provided by the developer are given - using the -cp flag - - java -jar - ow_easybeans_component_smartclient.jar - -cp myClient.jar:mylib.jar - - The name of the client's class is provided on this command - - java -jar - ow_easybeans_component_smartclient.jar - -cp myClient.jar:mylib.jar org.MyClient - - In order to download classes, the bootstrap is connecting to the - EasyBeans server by using default port/hostname. To specify a different - host or port number, the following arguments can be used: - - -port for the port number or -hostname for specifying the host - name. -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/building.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/tests/building.xml deleted file mode 100644 index 92a8cab3f900cf2c73244388bafa9e5c114832d8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/building.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - Building the suite from source - -
    - Requirements - - First, all the requirements used in Developer's - Guide building chapter need to be checked. -
    - -
    - Building the suite - - The build.xml file which is at the root of the - tests folder will be used. - - In the tests folder of the project (named - EasyBeans by default), the command ant install needs to - be launched. - - - The command ant -p could be used to list the - targets that are available. - - - Once the command has been run successfully, - output and tests/output folders - are created and each one contains a subfolder - classes. The output/classes - contains the EasyBeans Server classes and the - tests/output/classes contains the classes used by the - test suite. Furthermore, the binaries(.jar) used with EasyBeans Server are - installed in the ejb3s folder. - - ant clean.classes is used to clean the generated - classes. -
    - -
    - Test suite main ant targets - -
    - JavaDoc - - Javadoc of Test Suite can be generated by using ant - javadoc - - The resulting documentation will be available in the - tests/output/javadoc folder. -
    - -
    - Compile - - In the tests folder of the project (named - EasyBeans by default), the command ant compile needs - to be launched. - - Once the command has been run successfully, - output and tests/output - folders are created and each one contains a subfolder - classes. The output/classes - contains the EasyBeans Server classes and the - tests/output/classes contains the classes used by - the test suite. -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/contribute.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/tests/contribute.xml deleted file mode 100644 index 193f6a45eda7e7d0230ef92dcaeea4614a3549a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/contribute.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - How to contribute? - - Anyone can contribute to the tests according with the follow - guideline. Contributions are welcome. - -
    - JavaDoc comment convention - - The test classes respect a comment convention that has some custom - tags. The custom tags are: - - - - @reference - used in class comment. It is - used to specify the document that the tests cover. - - - - @requirement - used in class comment. It is - used to specify the classes and files needed to run the tests. - - - - @setup - used in class comment. It is used to - specify the items that must be set up before the test - execution. - - - - @input - used in method comment. It is used - to specify the test inputs. - - - - @output - used in method comment. It is used - to specify the test expected outputs. - - -
    - -
    - Code convention - - The Test Suite and the EasyBeans has the same code convention. You - can see the convention details in EasyBeans - code convention. -
    - -
    - Methodology for writing tests - - - - It is highly recommended the use of inheritance and generics - types to avoid code duplication. - - The tests must be independents, so after a test execution - everything must be clear. It makes possible to run the same test many - times without problems. - - - - In the test methods, the try/catch is used - only when the exception is expected. - - -
    - -
    - Adding a test suite - - The first thing needed is defining where the test classes should be - in. After that, the TestNG XML file must be created to run the tests. Each - package has a XML file to run all package tests. In addition, an entry for - each test package is needed in the file - src/main/java/testng_conformance.xml. - - In the tests/examples folder of the project - (named EasyBeans by default), there is a TestNG XML file example called - testng_xml: - - <!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd"> -<suite name="Test Suite Example" verbose="1"> - <test name="Test Example"> - <packages> - <package name="org.ow2.easybeans.tests.examples"/> - </packages> - </test> -</suite> -
    - -
    - Submmiting a contribution - - The submmition has the same rule that the EasyBeans contributions. - You can see details in EasyBeans - contribution. -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/howto_00.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/tests/howto_00.xml deleted file mode 100644 index c7b3c509955323e9f8bbe3f54641bdf0662415fa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/howto_00.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - How to write a test - - The example shows the basis of a test with all steps used to build a - EasyBeans test. - -
    - Requirements - - This example only requires Java 5 knowledges. -
    - -
    - Writing the test class code - - This example tests if a business method can be invoked from a bean, - and if the bean can return an Integer value without modifications. - - The source code(TestExample.java) can be found - in the tests/examples folder of the project (named - EasyBeans by default): - - package org.objectweb.easybeans.tests.examples; - -import static org.objectweb.easybeans.tests.common.helper.EJBHelper.getBeanRemoteInstance; -import static org.testng.Assert.assertEquals; - -import org.objectweb.easybeans.tests.common.ejbs.base.ItfExample; -import org.objectweb.easybeans.tests.common.ejbs.stateless.containermanaged.SLSBExample; -import org.testng.annotations.Configuration; -import org.testng.annotations.Test; - -/** - * This is an example of a EasyBeans Test Suite Class. - * @reference It is used to specify the document that the tests cover. Example: - * JSR220-PROPOSED FINAL - * @requirement It is used to specify the classes and files needed to run the - * tests. Exampe: EasyBeans must be running and the bean - * org.objectweb.easybeans.tests.common.ejbs.stateless.containermanaged.SFSBExample - * must be deployed. - * @setup It is used to specify the classes and files needed to run the test. - * @author Eduardo Studzinski Estima de Castro - * @author Gisele Pinheiro Souza - */ -public class TestExample { - - /** - * Constant. - */ - private static final Integer INPUT = new Integer(1); - - /** - * Bean used in tests. - */ - private ItfExample<Integer> bean; - - /** - * Gets a new bean instance used during the tests. - * @throws Exception if an error occurs during the setup. - */ - @Configuration(beforeTestMethod = true) - public void setup() throws Exception { - // Gets a bean instance. - bean = getBeanRemoteInstance(SLSBExample.class, ItfExample.class); - } - - /** - * Indicates the test description. Example: Tests if the bean can return a - * value without modifications. - * @input It is used to specify the classes and files needed to run the - * test. Example: Integer value. - * @output It is used to specify the classes and files needed to run the - * test. Example: The same input integer. - * @throws Exception if an error occurs during the test. - */ - @Test - public void test00() throws Exception { - // Output value, it must be the same as the input. - Integer output = bean.getValue(INPUT); - - // Test if input and output are equal. - assertEquals(INPUT, output, "The input and output values should be equal."); - } -} -
    - -
    - TestNG Annotations - - There are two mainly annotations in TestNG: - @Configuration and @Test. - -
    - @Configuration - - This annotation is used to make any method a setup or a teardown - method. In addition, the @Configuration makes unnecessary to follow any - naming convention in method names. The mainly properties that could be - used are: - - - - afterTest - if true, the method will be run after - each test. - - - - afterTestClass- if true, the method will be run - after all the tests in the test class. - - - - beforeTestClass- if true, the method will be run - after the test class instantiation and before tests methods. - - - - beforeTestMethod- if true, the method will be run - before any test method. - - - - In the example, the method setup() will request a new - bean instance before any test method. - - /** - * Gets a new bean instance used during the tests. - * @throws Exception if an error occurs during the setup. - */ - @Configuration(beforeTestMethod = true) - public void setup() throws Exception { - // Gets a bean instance. - bean = getBeanRemoteInstance(SLSBExample.class, ItfExample.class); - } -
    - -
    - @Test - - This annotation is used to define a method that will be run as a - test and it is not necessary follow any naming convention. In the - example, the method test00() has the annotation and it will - be a test case: - - @Test - public void test00() throws Exception { - ... - } - - If it is necessary to disable this test, the enabled - property could be used: @Test(enabled = false) - public void test00() throws Exception { - ... - } -
    -
    - -
    - Helper Classes - - To make easier the test development, some helper classes are - available in the package - org.objectweb.easybeans.tests.common.helper - - In the example, the EJBHelper class is used to get a bean - instance: - - bean = getBeanRemoteInstance(SLSBExample.class, ItfExample.class); - - The method getBeanRemoteInstance() is used to a remote - access of a bean and the method getBeanLocalInstance() is - used to a local access of a bean. They need two parameters: - - The bean class; - - - - The bean interface; - - -
    - -
    - Writing the XML configuration file: - - Once the test class is defined, it is necessary to write the XML - configuration file for TestNG. The following example indicates that the - tests inside the package - org.objectweb.easybeans.tests.examples must be - run: - - <!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd"> -<suite name="Test Suite Example" verbose="1"> - <test name="Test Example"> - <packages> - <package name="org.objectweb.easybeans.tests.examples"/> - </packages> - </test> -</suite> - - The TestNG XML configuration file also supports the - classes/class tags that define which classes must be run. - This following example indicates that only the tests in the TestExample - class must be run: - - <!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd"> -<suite name="Test Suite Example" verbose="1"> - <test name="Test Example"> - <classes> - <class name="org.objectweb.easybeans.tests.examples.TestExample"/> - </classes> - </test> -</suite> -
    - -
    - Additional Information - - Additional information about TestNG could be found in www.testng.org. -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/introduction.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/tests/introduction.xml deleted file mode 100644 index 8f61292ec378c670a34ff8e7ba3cc7b9f190d4be..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/introduction.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - Goal - - The test suite objective is to verify that the EasyBeans conforms with - the EJB3 specification. The suite is under construction and everyone that - wants to contribute is welcome. Anyone can write or add tests cases - according to the guidelines below. - - This test suite is designed for EasyBeans; however, with a few - adaptations, it could work with others application servers. - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/packages.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/tests/packages.xml deleted file mode 100644 index efcd82bd21ccba5bf0c882bcce8bbd4fa04ee2f2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/packages.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - Description of the source tree - - The test suite contains: - - - - build.xml - ant file to build, install and - run the tests. - - - - tests-common.xml - ant file with the common - definitions for all ant files. - - - - tests-functions.xml - ant file with common - functions for all ant files. - - - - src directory - contains the source - files. - - - - lib directory - contains the libraries used - in the tests. - - - - conf directory - contains the files used to - configure the tests. - - - - examples directory - contains the examples - files. - - - - The source directory contains all test cases as well as the auxiliary - classes used to make the tests. These sources are divided in packages by - functionality. The src/java folder has the package - org.objectweb.easybeans.tests which contains the follows - packages: - - - - annotations - tests cases for verifying the - annotations. - - - - common - contains all support classes to do the - tests. - - - - asserts - contains alternative assert - classes that are used during the tests. - - - - core - contains the classes that extends - the server features. - - - - db - contains the classes that manipulates - the database. - - - - ejbs - contains the beans that are used in - the tests. - - - - enhancer - contains the classes that are - used to test the enhancer. - - - - exception - contains exceptions used during - the test. - - - - helper - contains the helper - classes. - - - - inheritance - contains the classes that are - used in the inheritance tests. - - - - interceptors - contains the classes that - are used in the interceptor tests. - - - - interfaces - contains the common interfaces - that are used by different classes ( beans, test class and - others). - - - - resources - contains the classes that are - used in the resource tests. - - - - - - deploymentdesc - tests cases for verifying the - deployment descriptor. - - - - enhancer - tests cases for verifying the - enhancer. - - - - inheritance - tests cases for verifying the inheritance. - - - - interceptors - tests cases for verifying the - interceptors. - - - - transaction - tests cases for verifying the - transaction. - - - - taglets - contains javadoc tags used to format - correctly the documentation. - - - - The file src/java/testng_conformance.xml makes - possible to run all tests in the same time. However, it is possible to - execute a group of tests individually by using the XML file available in - each test case package. - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/results.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/tests/results.xml deleted file mode 100644 index 4255dbb422fd80140024db3a41829355d4e25f97..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/results.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - Current conformance test results - - The EasyBeans tests results will be available as soon as - possible. - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/running.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/tests/running.xml deleted file mode 100644 index db6f944f534595660c83291596ac21db3deba710..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/running.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - Running the suite - -
    - Requirements - - First, all the requirements used in building chapter need to be - checked. -
    - -
    - Using Ant - - In the tests folder of the project (named - EasyBeans by default), the following three commands need to be - used: - - - - ant install - - It will install the binaries required by the test suite in the - folder ejb3s. - - - - ant run.server or - run.server.debug (Server debug mode) - - Then, EasyBeans server will be launched. When the following - message is received, next step needs to be done: - - [java] INFO: Waiting requests... - - - - ant tests.conformance - - All tests will be run and a report will be produced. The report - will be available in - tests/output/reports/conformance folder. - After using ant tests.conformance, the - JUnit Report format could be generated using the command - ant report.junit.format. The output file - junit-noframes.html will be available in - tests/output/reports/conformance - folder. - - - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/testguide.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/tests/testguide.xml deleted file mode 100644 index 981cf92e225f45a26a03d17f94b0906554f39b7d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/tests/testguide.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - EasyBeans Test Suite's Guide - - - - - - - - - - EduardoSTUDZINSKI ESTIMA DE CASTRO - - EasyBeans - OW2 consortium - - - - - GiselePINHEIRO SOUZA - - EasyBeans - OW2 consortium - - - - - $Id: testguide.xml 3272 2008-05-21 09:53:35Z benoitf $ - - - 2006-2008 - - OW2 Consortium - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - The EasyBeans Test Suite guide is intended for developers wanting - to develop tests to EJB3 Containers. - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/userguide.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/userguide.xml deleted file mode 100644 index bfab8aa0950b63655f4aae68e91bf9fbb1295060..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/userguide.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - EasyBeans User's guide - - - - - - - - - - FlorentBENOIT - - - EasyBeans - - OW2 consortium - - - - - $Id: userguide.xml 4784 2009-03-11 10:34:46Z benoitf $ - - - 2006-2008 - - OW2 Consortium - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - The EasyBeans user guide is intended for developers wanting to - develop EJB3 applications. - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/easybeans/usingexamples.xml b/jonas_doc/core/src/docbook/doc-en/easybeans/usingexamples.xml deleted file mode 100644 index 7f206dce95d2a0bc060a38d15b5be3931b690c40..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/easybeans/usingexamples.xml +++ /dev/null @@ -1,1102 +0,0 @@ - - - Using the Examples - -
    - Compiling the Examples - -
    - Requirements - - Before running the examples, be sure to follow the requirements - for compiling and running these EasyBeans examples. -
    - -
    - Compile - - The ant tool is used to build the - examples. To compile the examples, use the - build.xml file that is located in the examples directory. - - The command ant install_all_examples must be - launched in the examples - directory:$ ant install_all_examples -Buildfile: build.xml - -install_all_examples: - -init-maven-task: - -init: - [mkdir] Created dir: /home/benoitf/workspace/easybeans/output/example-classes - [mkdir] Created dir: /home/benoitf/workspace/easybeans/clients - [mkdir] Created dir: /home/benoitf/workspace/easybeans/webapps - -compile: - [javac] Compiling 4 source files to /home/benoitf/workspace/easybeans/output/example-classes - -ejb: - -ejb-standalone: -[easybeans:ejb] Building Ejb in '/home/benoitf/workspace/easybeans/easybeans-deploy/entitybean.jar'. -[easybeans:ejb] Building jar: /home/benoitf/workspace/easybeans/easybeans-deploy/entitybean.jar - -war: - -ear: - -client: - -client-standalone: -[easybeans:client] Building Client in '/home/benoitf/workspace/easybeans/clients/client-entitybean.jar'. -[easybeans:client] Building jar: /home/benoitf/workspace/easybeans/clients/client-entitybean.jar - -install: - -init-maven-task: - -init: - -compile: - [javac] Compiling 3 source files to /home/benoitf/workspace/easybeans/output/example-classes - -ejb: - -ejb-standalone: -[easybeans:ejb] Building Ejb in '/home/benoitf/workspace/easybeans/easybeans-deploy/mdb.jar'. -[easybeans:ejb] Building jar: /home/benoitf/workspace/easybeans/easybeans-deploy/mdb.jar - -war: - -ear: - -client: - -client-standalone: -[easybeans:client] Building Client in '/home/benoitf/workspace/easybeans/clients/client-mdb.jar'. -[easybeans:client] Building jar: /home/benoitf/workspace/easybeans/clients/client-mdb.jar - -install: - -init-maven-task: - -init: - -compile: - [javac] Compiling 7 source files to /home/benoitf/workspace/easybeans/output/example-classes - -ejb: - -ejb-standalone: -[easybeans:ejb] Building Ejb in '/home/benoitf/workspace/easybeans/easybeans-deploy/migration21.jar'. -[easybeans:ejb] Building jar: /home/benoitf/workspace/easybeans/easybeans-deploy/migration21.jar - -war: - -ear: - -client: - -client-standalone: -[easybeans:client] Building Client in '/home/benoitf/workspace/easybeans/clients/client-migration21.jar'. -[easybeans:client] Building jar: /home/benoitf/workspace/easybeans/clients/client-migration21.jar - -install: - -init-maven-task: - -init: - -compile: - [javac] Compiling 5 source files to /home/benoitf/workspace/easybeans/output/example-classes - -ejb: - -ejb-standalone: -[easybeans:ejb] Building Ejb in '/home/benoitf/workspace/easybeans/easybeans-deploy/security.jar'. -[easybeans:ejb] Building jar: /home/benoitf/workspace/easybeans/easybeans-deploy/security.jar - -war: - -ear: - -client: - -client-standalone: -[easybeans:client] Building Client in '/home/benoitf/workspace/easybeans/clients/client-security.jar'. -[easybeans:client] Building jar: /home/benoitf/workspace/easybeans/clients/client-security.jar - -install: - -init-maven-task: - -init: - -compile: - [javac] Compiling 7 source files to /home/benoitf/workspace/easybeans/output/example-classes - -ejb: - -ejb-standalone: -[easybeans:ejb] Building Ejb in '/home/benoitf/workspace/easybeans/easybeans-deploy/stateless.jar'. -[easybeans:ejb] Copying 5 files to /home/benoitf/workspace/easybeans/easybeans-deploy/stateless.jar - -war: - -war-standalone: -[easybeans:war] Building War in '/home/benoitf/workspace/easybeans/webapps/web.war'. -[easybeans:war] Copying 6 files to /home/benoitf/workspace/easybeans/webapps/web.war/WEB-INF/classes -[easybeans:war] Copying 1 file to /home/benoitf/workspace/easybeans/webapps/web.war/WEB-INF - -ear: - -client: - -client-standalone: -[easybeans:client] Building Client in '/home/benoitf/workspace/easybeans/clients/client-stateless.jar'. -[easybeans:client] Building jar: /home/benoitf/workspace/easybeans/clients/client-stateless.jar - -install: - -init-maven-task: - -init: - -compile: - [javac] Compiling 3 source files to /home/benoitf/workspace/easybeans/output/example-classes - -ejb: - -ejb-standalone: -[easybeans:ejb] Building Ejb in '/home/benoitf/workspace/easybeans/easybeans-deploy/stateful.jar'. -[easybeans:ejb] Building jar: /home/benoitf/workspace/easybeans/easybeans-deploy/stateful.jar - -war: - -ear: - -client: - -client-standalone: -[easybeans:client] Building Client in '/home/benoitf/workspace/easybeans/clients/client-stateful.jar'. -[easybeans:client] Building jar: /home/benoitf/workspace/easybeans/clients/client-stateful.jar - -install: - -init-maven-task: - -init: - -compile: - [javac] Compiling 6 source files to /home/benoitf/workspace/easybeans/output/example-classes - -ejb: - -ejb-standalone: -[easybeans:ejb] Building Ejb in '/home/benoitf/workspace/easybeans/easybeans-deploy/timer.jar'. -[easybeans:ejb] Building jar: /home/benoitf/workspace/easybeans/easybeans-deploy/timer.jar - -war: - -ear: - -client: - -client-standalone: -[easybeans:client] Building Client in '/home/benoitf/workspace/easybeans/clients/client-timer.jar'. -[easybeans:client] Building jar: /home/benoitf/workspace/easybeans/clients/client-timer.jar - -install: - -init-maven-task: - -init: - -compile: - [javac] Compiling 5 source files to /home/benoitf/workspace/easybeans/output/example-classes - -ejb: - -ejb-standalone: - -war: - -war-standalone: - -ear: -[easybeans:ear] Building Ear in '/home/benoitf/workspace/easybeans/easybeans-deploy/ear3.ear'. - [ejb] Building Ejb in '/tmp/easybeans-ant33717.tmp'. - [ejb] Building jar: /tmp/easybeans-ant33717.tmp - [war] Building War in '/tmp/easybeans-ant33718.tmp'. - [war] Building war: /tmp/easybeans-ant33718.tmp -[easybeans:ear] Building jar: /home/benoitf/workspace/easybeans/easybeans-deploy/ear3.ear - -client: - -install: - -BUILD SUCCESSFUL -Total time: 22 seconds -The examples are copied under the easybeans-deploy/ folder of the project and - are available for the deployment. - - - If the EasyBeans server is running, it will detect these new - applications and deploy them automatically. - -
    -
    - -
    - Running Examples - - Each example has its own build.xml file; this - allows each example to be run independently. - -
    - Stateless Session Bean - - The build.xml file for this example is - located in the examples/statelessbean folder. - -
    - Description - - This example is a stateless session bean. It contains a - helloWorld() method that displays text on the - server side. Additionally, it demonstrates the use of EJB3 annotation, - such as @Stateless. - - The trace() method is annotated with - @AroundInvoke EJB3 annotation. This method will be - called at each call on a business method. The business methods are - defined in the interface implemented by the SessionBean class. - - The signature of the method annotated by - @AroundInvoke when it is defined in the bean class, - must follow this signature: - - - (private|protected|public) - - Object - - methodName - - - InvocationContext - - invocationContext - - - Exception - - - - As a new feature of EJB3, the bean's interface does not need - to extend the Remote interface. - -
    - -
    - Running the Server - - If the server is not available, it must be run by following the - steps described in Chapter 3, "Running the EasyBeans Server" of the developer's guide. -
    - -
    - Deploying the Bean - - The stateless session bean must be deployed. If the bean has - been installed in the easybeans-deploy folder, this is done - automatically. - - On the server side, the following output should display: - - [java] 5/16/07 10:59:32 AM (I) AbsDeployer.deployEJB : Deploying EJB3DeployableImpl[archive=easybeans-deploy/stateless.jar] - [java] 5/16/07 10:59:32 AM (I) JContainer3.start : Container started in : 408 ms - - Once this information is displayed on the screen, the container - is ready to receive client calls. -
    - -
    - Running the Client - - Once the container has been started, the client can be - launched. - - Run the client with the following ant command: ant - run.client - - If the client runs successfully, the following output is - displayed: - - [java] Calling helloWorld method... - [java] Add 1 + 2... - [java] Sum = '3'. - - - In the client's code, the use of the - PortableRemoteObject.narrow() call is no longer required. - -
    -
    - -
    - Stateful Session Bean - - The build.xml file for this example is - located in the examples/statefulbean folder. - -
    - Description - - This is an example of a stateful session bean using the - SessionSynchronization - interface. - - It uses the @Stateful annotation and uses the - default transaction model, which is REQUIRED. -
    - -
    - Running the Server - - If the server is not available, it must be run by following the - steps described in Chapter 3, "Running the EasyBeans Server" of the developer's guide. -
    - -
    - Deploying the Bean - - The stateful session bean must be deployed. It is done - automatically if the bean has been installed in the easybeans-deploy folder. - - On the server side, the following output should be seen: - - [java] 5/16/07 10:59:37 AM (I) AbsDeployer.deployEJB : Deploying EJB3DeployableImpl[archive=easybeans-deploy/stateful.jar] - [java] 5/16/07 10:59:37 AM (I) JContainer3.start : Container started in : 94 ms - - Once this information is displayed on the screen, the container - is ready to receive client calls. -
    - -
    - Running the Client - - Once the container has been started, the client can be - launched. - - Run the client with the following ant command: ant - run.client - - If the client runs successfully, the following output is - displayed: - - [java] Start a first transaction - [java] First request on the new bean - [java] Second request on the bean - [java] Commit the transaction - [java] Start a second transaction - [java] Buy 50 amount. - [java] Rollback the transaction - [java] after rollback, value = 30 - [java] Request outside any transaction - [java] Check that value = 30 - [java] ClientStateful OK. Exiting. -
    -
    - -
    - Entity Bean - - The build.xml file for this example is - located in the examples/entitybean folder. - -
    - Description - - This is an example of an entity bean. It describes how to use - the new Java Persistence Model of an EJB3 persistence provider. To - access EJB3 entities that are POJO, a stateless session bean is used. - It is a facade bean. - - The Entity class is a POJO class annotated with - @Entity. The entities class is managed by the - persistence provider. - - Currently, the persistence provider is supplied by the Hibernate - product, but the ObjectWeb Speedo product should be available soon. - Users will have the choice between providers. - - This example uses the @Stateful annotation - and uses the default transaction model, which is REQUIRED. - - The example shows an entity bean using EJB3 Hibernate-prototype - persistence provider. -
    - -
    - Running the Server - - If the server is not available, it must be run following the - steps described in Chapter 3, "Running the EasyBeans Server" of the developer's guide. -
    - -
    - Deploying the Bean - - The entity bean must be deployed. It is done automatically if - the bean has been installed in the easybeans-deploy folder. - - On the server side, the following output should be seen: - - [java] 5/16/07 10:59:36 AM (I) AbsDeployer.deployEJB : Deploying EJB3DeployableImpl[archive=easybeans-deploy/entitybean.jar] - [java] 5/16/07 10:59:36 AM (I) JPersistenceUnitInfoHelper.getPersistenceUnitInfo : No persistence provider was set, set to value org.hibernate.ejb.HibernatePersistence. - [java] 5/16/07 10:59:36 AM (I) JPersistenceUnitInfoHelper.getPersistenceUnitInfo : Found a default configuration for the persistence provider org.hibernate.ejb.HibernatePersistence - [java] 5/16/07 10:59:36 AM (I) JPersistenceUnitInfoHelper.getPersistenceUnitInfo : Setting the property hibernate.transaction.manager_lookup_class with value org.hibernate.transaction.JOTMTransactionManagerLookup - [java] 5/16/07 10:59:36 AM (I) JPersistenceUnitInfoHelper.getPersistenceUnitInfo : Setting the property hibernate.cache.provider_class with value org.hibernate.cache.HashtableCacheProvider - [java] 5/16/07 10:59:36 AM (I) Ejb3Configuration.configure : Processing PersistenceUnitInfo [ - [java] name: entity - [java] ...] - [java] 5/16/07 10:59:36 AM (I) Ejb3Configuration.scanForClasses : found EJB3 Entity bean: org.objectweb.easybeans.examples.entitybean.Employee - [java] 5/16/07 10:59:36 AM (I) Ejb3Configuration.scanForClasses : found EJB3 Entity bean: org.objectweb.easybeans.examples.entitybean.Employee - ... - [java] 5/16/07 10:59:36 AM (I) JContainer3.start : Container started in : 412 ms - - Once this information is displayed on the screen, the container - is ready to receive client calls. -
    - -
    - Running the Client - - Once the container has been started, the client can be - launched. - - The client is run with the following ant command: ant - run.client - - If the client runs successfully, the following output is - displayed: - - [java] Employee with id 1 = Florent - [java] Employee with id 2 = Whale -
    - -
    - Properties for the persistence - - These properties are defined in the - META-INF/persistence.xml file. - -
    - JDBC Dialect - - By default, the dialect used to communicate with the database - is set to HSQL, as it is embedded in EasyBeans. - - This dialect configuration is done with the following - properties: - - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> - <property name="toplink.target-database" value="HSQL"/> - <property name="openjpa.jdbc.DBDictionary" value="hsql"/> - - - These properties are for Hibernate, Apache OpenJPA and Oracle - TopLink Essentials. -
    - -
    - Database (tables) - - By default, the tables are created and the database is empty - after loading the entity beans. - - This configuration is done with the following - properties: - - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="toplink.ddl-generation" value="drop-and-create-tables"/> - <property name="toplink.ddl-generation.output-mode" value="database"/> - <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/> - - In order to keep data in the database, this property should be - changed. -
    -
    -
    - -
    - Message Driven Bean - - The build.xml file for this example is - located in the examples/messagedrivenbean folder. - -
    - Description - - This is an example of a message driven bean. It describes how to - use a JMS message driven bean. - - The class is a class annotated with - @MessageDriven. Then, it is mapped to a JMS queue - through the properties of this annotation. - - @MessageDriven(activationConfig = { - @ActivationConfigProperty(propertyName = "destination", propertyValue = "SampleQueue"), - @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") - } -) - - The Message Driven Bean will receive message from the - SampleQueue queue. -
    - -
    - Running the Server - - If the server is not available, it must be run following the - steps described in Chapter 3, "Running the EasyBeans Server" of the developer's guide. -
    - -
    - Deploying the Bean - - The entity bean must be deployed. It is done automatically if - the bean has been installed in the easybeans-deploy folder. - - On the server side, the following output should be seen: - - 5/16/07 2:42:24 PM (I) AbsDeployer.deployEJB : Deploying EJB3DeployableImpl[archive=easybeans-deploy/mdb.jar] -5/16/07 2:42:24 PM (I) JContainer3.start : Container started in : 267 ms - - Once this information is displayed on the screen, the container - is ready to receive client calls. -
    - -
    - Running the Client - - Once the container has been started, the client can be - launched. - - The client is run with the following ant command: ant - run.client - - If the client runs successfully, the following output is - displayed: - - run.client: - [java] May 16, 2007 3:39:08 PM org.objectweb.carol.util.configuration.ConfigurationRepository init - [java] INFO: No protocols were defined for property 'carol.protocols', trying with default protocol = 'jrmp'. - [java] May 16, 2007 3:39:08 PM org.objectweb.util.monolog.wrapper.javaLog.Logger log - [java] INFO: Debug.initialize() - a3debug.cfg - [java] May 16, 2007 3:39:09 PM org.objectweb.util.monolog.wrapper.javaLog.Logger log - [java] INFO: ReliableTcpConnection.windowSize=100 - [java] Message [ID:0.0.1026c2m1, text:Message_0] sent - [java] Message [ID:0.0.1026c2m2, text:Message_1] sent - [java] Message [ID:0.0.1026c2m3, text:Message_2] sent - [java] Message [ID:0.0.1026c2m4, text:Message_3] sent - [java] Message [ID:0.0.1026c2m5, text:Message_4] sent - - - And on the server side, the messages have been received: - - Receiving a message named '((org.objectweb.joram.client.jms.TextMessage@4391f0,messageID=ID:0.0.1026c2m1,destination=queue#0.0.1027,correlationId=null,deliveryMode=2,expiration=0,priority=4,redelivered=false,replyTo=null,timestamp=1179322749177,type=null),text=Message_0,RObody=true)'. with the content 'Message_0 -Receiving a message named '((org.objectweb.joram.client.jms.TextMessage@13e9934,messageID=ID:0.0.1026c2m4,destination=queue#0.0.1027,correlationId=null,deliveryMode=2,expiration=0,priority=4,redelivered=false,replyTo=null,timestamp=1179322749216,type=null),text=Message_3,RObody=true)'. with the content 'Message_3 -Receiving a message named '((org.objectweb.joram.client.jms.TextMessage@1e064c,messageID=ID:0.0.1026c2m5,destination=queue#0.0.1027,correlationId=null,deliveryMode=2,expiration=0,priority=4,redelivered=false,replyTo=null,timestamp=1179322749261,type=null),text=Message_4,RObody=true)'. with the content 'Message_4 -Receiving a message named '((org.objectweb.joram.client.jms.TextMessage@95ef17,messageID=ID:0.0.1026c2m2,destination=queue#0.0.1027,correlationId=null,deliveryMode=2,expiration=0,priority=4,redelivered=false,replyTo=null,timestamp=1179322749209,type=null),text=Message_1,RObody=true)'. with the content 'Message_1 -Receiving a message named '((org.objectweb.joram.client.jms.TextMessage@17c4779,messageID=ID:0.0.1026c2m3,destination=queue#0.0.1027,correlationId=null,deliveryMode=2,expiration=0,priority=4,redelivered=false,replyTo=null,timestamp=1179322749212,type=null),text=Message_2,RObody=true)'. with the content 'Message_2 - -
    -
    - -
    - Timer example - - The build.xml file for this example is - located in the examples/timerservice folder. - -
    - Description - - This example shows the use of the @Timeout annotation on a - method. The client invokes the TimerBean that will launch a timer. - This timer will send a message to an MDB and then calls another bean - which implements javax.ejb.TimedObject - interface. -
    - -
    - Running the server - - If the server is not available, it must be run following the - steps described in Chapter 3, "Running the EasyBeans Server" of the developer's guide. -
    - -
    - Deploying the Bean - - The timer bean example must be deployed. It is done - automatically if the bean has been installed in the easybeans-deploy folder. - - On the server side, the following output should display: - - [java] 9/29/07 3:52:50 PM (I) AbsDeployer.deployEJB : Deploying EJB3DeployableImpl[archive=easybeans-deploy/timer.jar] - [java] 9/29/07 3:52:50 PM (I) JContainer3.start : Container started in : 104 ms - - Once this information is displayed on the screen, the container - is ready to receive client calls. -
    - -
    - Running the Client - - Once the container has been started, the client can be - launched. - - The client is run with the following ant command: ant - run.client - - If the client runs successfully, the following output is - displayed on the client side: - - run.client: - [java] Sep 29, 2007 4:16:45 PM org.objectweb.carol.util.configuration.ConfigurationRepository init - [java] INFO: No protocols were defined for property 'carol.protocols', trying with default protocol = 'jrmp'. - [java] Calling init method that will fire a new timer... - - - The following output is displayed on the server side: - - [java] SLSB -> Timer method called by the Timer Service. - [java] SLSB -> Timer received = 'org.ow2.easybeans.component.quartz.EasyBeansTimer@6e7d3050'. - [java] SLSB -> Info object inside the timer object is 'Simple Serializable object'. - [java] SLSB -> Sending a message to a MDB which will start a timer. - [java] SLSB -> Message sent - [java] SLSB -> Call a local bean in order to start a new timer. - [java] MDB -> Timer method called by the Timer Service. - [java] MDB -> Timer received = 'org.ow2.easybeans.component.quartz.EasyBeansTimer@59d794d'. - [java] MDB -> Info object inside the timer object is 'Timer started by the onMessage() method'. - [java] TimedBean -> Got a timer with value 'org.ow2.easybeans.component.quartz.EasyBeansTimer@2dd5b883'. - -
    -
    - -
    - Security example - - The build.xml file for this example is - located in the examples/security - folder. - -
    - Description - - This example illustrates the use of different Java EE 5 - annotations which are linked to the security part. - - The annotations used by the example are: - - - - @DeclareRoles, which is used to declare - the roles used by an EJB component - - - - @RolesAllowed, which lists the authorized - roles in order to call a method - - - - @DenyAll, which denies the call to the - method (for every role) - - - - @RunAs, which sets a new identity when - calling other EJBs - - -
    - -
    - Running the Server - - If the server is not available, it must be run following the - steps described in Chapter 3, "Running the EasyBeans Server" of the developer's guide. -
    - -
    - Deploying the Bean - - The security bean example must be deployed. It is done - automatically if the bean has been installed in the easybeans-deploy folder. - - On the server side, the following output should display: - - [java] 5/16/07 10:59:37 AM (I) AbsDeployer.deployEJB : Deploying EJB3DeployableImpl[archive=easybeans-deploy/security.jar] - [java] 5/16/07 10:59:37 AM (I) JContainer3.start : Container started in : 115 ms - - Once this information is displayed on the screen, the container - is ready to receive client calls. -
    - -
    - Running the Client - - Once the container has been started, the client can be - launched. - - The client is run with the following ant command: ant - run.client - - If the client runs successfully, the following output is - displayed on the client side: - - run.client: - [java] Oct 16, 2006 5:27:03 PM org.objectweb.carol.util.configuration.ConfigurationRepository init - [java] INFO: No protocols were defined for property 'carol.protocols', trying with default protocol = 'jrmp'. - [java] Calling methods that everybody can call... - [java] Call a bean with run-as in order to have 'admin' role... - [java] Access denied as expected (method is denied) - - The following output is displayed on the server side: - - [java] someRolesAllowed() called - [java] -> Caller is 'Principal[EasyBeans/Anonymous]'. - [java] for run-as bean, caller is Caller is 'Principal[EasyBeans/Anonymous] - [java] onlyAdminAllowed() called - [java] -> Caller is 'Principal[admin]'. - [java] someRolesAllowed() called - [java] -> Caller is 'Principal[admin]'. - -
    -
    - -
    - Pool example - - The build.xml file for this example is - located in the examples/pool - folder. - -
    - Description - - This example illustrates the definition of some values to limit - the size of a pool. In the example, the pool size can be configured - through the specific XML deployment descriptor or with - annotations. - - The example contains two kind of beans, Stateless beans and - Message Driven beans. - - The annotation used in the example is: - - - - @Pool, for configuring the pool. - - - - By using annotation to configure the pool, the @Pool annotation - needs to be put on the class of the bean. For example : @Pool(max = - MyInterface.MAX_INSTANCE) - - By using XML configuration, the settings are located in the - META-INF/easybeans.xml entry of the EJB-JAR file. - - ... - <!-- Configure pool element with pool namespace --> - <pool:pool> - <!-- Sets the max value to 2 --> - <pool:max>2</pool:max> - </pool:pool> - ... -
    - -
    - Running the Server - - If the server is not available, it must be run following the - steps described in Chapter 3, "Running the EasyBeans Server" of the developer's guide. -
    - -
    - Deploying the Bean - - The pool bean example must be deployed. It is done automatically - if the bean has been installed in the easybeans-deploy folder. - - On the server side, the following output should display: - - 3/7/08 5:26:26 PM (I) AbsDeployer.deployEJB : Deploying EJB3DeployableImpl[archive=easybeans-deploy/pool.jar] -3/7/08 5:26:28 PM (I) JContainer3.start : Container 'easybeans-deploy/pool.jar' [2 SLSB, 0 SFSB, 2 MDB] started in 1,388 ms - - Once this information is displayed on the screen, the container - is ready to receive client calls. -
    - -
    - Running the Client - - Once the container has been started, the client can be - launched. - - The client is run with the following ant command: ant - run.client - - If the client runs successfully, the following output is - displayed on the client side: - - run.client: - [java] Mar 7, 2008 5:31:35 PM org.objectweb.carol.util.configuration.ConfigurationRepository init - [java] Calling bean's methods... - [java] Waiting some time before checking the number of instances... - [java] Number of instances Annotation Bean = 5 - [java] --> This value is OK, pool is limited to 5 - [java] Number of instances XML Bean = 2 - [java] --> This value is OK, pool is limited to 2 - [java] 3/7/08 5:31:41 PM (I) Logger.log : Debug.initialize() - a3debug.cfg - [java] 3/7/08 5:31:42 PM (I) Logger.log : ReliableTcpConnection.windowSize=100 - [java] Sending messages with multiple threads... - [java] Waiting some time to ensure that all messages have been sent... - [java] Look at the server side console to check pool values of MDB ... - - The following output is displayed on the server side: - - [java] MDBAnnotationBean: Number of instances = '5', max = '5'. - [java] MDBAnnotationBean: Number of instances = '5', max = '5'. - [java] MDBAnnotationBean: Number of instances = '5', max = '5'. - [java] MDBXMLBean:Number of instances = '2', max = '2'. - [java] MDBAnnotationBean: Number of instances = '5', max = '5'. - [java] MDBAnnotationBean: Number of instances = '5', max = '5'. - [java] MDBXMLBean:Number of instances = '2', max = '2'. - [java] MDBAnnotationBean: Number of instances = '5', max = '5'. - -... - - The instances are not exceeding the limits fixed in the example - then everything is working fine. -
    -
    - -
    - Migration EJB 2.1/3.0 example - - The build.xml file for this example is - located in the examples/migrationejb21 folder. - -
    - Description - - This example illustrates the use of annotations that provide - Home and Remote interface for clients written for the EJB 2.1 - specification. - - The annotations used by the example are: - - - - @Remote, for the definition of the - business interface. - - - - @RemoteHome, for defining the EJB 2.1 - Remote Home interface. - - - - @LocalHome, for defining the EJB 2.1 - Local Home interface. - - - - An EJB that is using these annotations can be used by an EJB3 - client and a EJB 2.1 client. These annotations can be used to do a - migration of your beans on the server side while the clients are the - same. -
    - -
    - Running the Server - - If the server is not available, it must be run following the - steps described in Chapter 3, "Running the EasyBeans Server" of the developer's guide. -
    - -
    - Deploying the Bean - - The migration bean example must be deployed. It is done - automatically if the bean has been installed in the easybeans-deploy folder. - - On the server side, the following output should display: - - 5/16/07 2:42:24 PM (I) AbsDeployer.deployEJB : Deploying EJB3DeployableImpl[archive=easybeans-deploy/migration21.jar] -5/16/07 2:42:25 PM (I) JContainer3.start : Container started in : 166 ms - - Once this information is displayed on the screen, the container - is ready to receive client calls. -
    - -
    - Running the Client - - Once the container has been started, the client can be - launched. - - The client is run with the following ant command: ant - run.client - - If the client runs successfully, the following output is - displayed on the client side: - - run.client: - [java] May 16, 2007 2:43:18 PM org.objectweb.carol.util.configuration.ConfigurationRepository init - [java] INFO: No protocols were defined for property 'carol.protocols', trying with default protocol = 'jrmp'. - [java] Calling hello() method on EJB 3.0 view of the Bean... - [java] Calling hello() method on Remote EJB 2.1 view of the Bean... - - The following output is displayed on the server side: - - Hello world EJB 3.0 ! -Hello world EJB 2.1 Remote View ! -Link to itself remote = org.objectweb.easybeans.examples.migrationejb21.EJB2And3Bean_org.objectweb.easybeans.examples.migrationejb21.EJB2RemoteHome/8414877 -Link to itself local view = org.objectweb.easybeans.examples.migrationejb21.EJB2And3Bean_org.objectweb.easybeans.examples.migrationejb21.EJB2LocalHome/8414877 -Calling itself on the local view... -Hello world EJB 2.1 Local View ! -
    -
    - -
    - EAR example - - The build.xml file for this example is - located in the examples/ear - folder. - - - This example required the use of a web container, then it can - work in EasyBeans/JOnAS, EasyBeans/Tomcat or EasyBeans/Jetty but not - in standalone mode as the war file can't be deployed. - - -
    - Description - - This example will deploy the EJB3 included in the EAR file in - EasyBeans EJB3 container while the .war file will be deployed in the - web container This EAR example includes an EJB3 and a WAR file. This - allows to use local interface between the WEB layer and the EJB layer. - The EAR file has no entry named - META-INF/application.xml, EasyBeans will detect - the type of the given archives and use default values for the name of - the web context. Due to the use of local interface, the Entities don't - need to implement the Serializable interface. The interface is not - annotated with @Local annotation as it is the - default value. Each entity class provides a - @NamedQuery query that allows to get all the - objects There is a relationship between Author - and Book entities. It is very simple: One - Author can write several books, but a - Book is written only by one - Author. @OneToMany and - @ManyToOne annotations are used to define the - relationship -
    - -
    - Running the Server - - If the server is not available, it must be run following the - steps described in Chapter 3, "Running the EasyBeans Server" of the developer's guide. -
    - -
    - Deploying the EAR - - The EAR application example must be deployed. It is done - automatically if the EAR has been installed in the easybeans-deploy folder. - - When the EAR is detected by EasyBeans, the following traces will - be displayed : JOnASDeployer.deployEAR : Deploying EARDeployableImpl[archive=/tmp/EasyBeans-Deployer-benoitf/EAR/ear3.ear] -ENCManager.getInterceptorClass : Detecting JOnAS: using JOnAS ENC for the naming. -JPersistenceUnitInfoHelper.loadDefaultValues : Default persistence provider set to value org.hibernate.ejb.HibernatePersistence. -... -Version.&lt;clinit&gt; : Hibernate Annotations 3.3.0.GA -Environment.&lt;clinit&gt; : Hibernate 3.2.4 -... -JContainer3.start : Container started in : 5619 ms -AbsJWebContainerServiceImpl.registerWar : War /tmp/EasyBeans-Deployer-benoitf/EAR/ear3.ear/ear-web.war available at the context /ear-web. -JOnASDeployer.deployEAR : 'EARDeployableImpl[archive=/tmp/EasyBeans-Deployer-benoitf/EAR/ear3.ear]' EAR Deployable is now deployed - - - Once this information is displayed on the screen, the - application can be used by using an HTTP browser. -
    - -
    - Using the Client - - Once the container has been started, the client can be - accessed. - - The URL used to connect to the client is the following: http://localhost:9000/ear-web - for JOnAS. - - The following text should be displayed on the browser: - - Initialize authors and their books... - -Get authors - -List of books with author 'Honore de Balzac' : - - * Title 'Le Pere Goriot'. - * Title 'Les Chouans'. - -List of books with author 'Victor Hugo' : - - * Title 'Les Miserables'. - * Title 'Notre-Dame de Paris'. - - - There is no output on the server side. -
    -
    -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/ejb2_programmer_guide.xml b/jonas_doc/core/src/docbook/doc-en/ejb2_programmer_guide.xml deleted file mode 100644 index cc8616fd2ff88b8a1caa01a3d30d6d0342fc6549..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/ejb2_programmer_guide.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - EJB 2.1 Programmer's Guide - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - Feb 2008 - - - - This guide explains how to program with EJB 2.1. To use the new EJB - 3.0 beans, you should refer to EJB 3.0 Programmer's - Guide - - - - - Developing EJB 2.1 Session Beans - - - - - - - - - - Developing Entity Beans - - - - - - - - - - - - - - - - - - Developing Message Driven Beans - - - - - - - - - - General Issues Around EJB 2.1 - - - - - - - - - - - - - - - - - - Appendix - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/ejb3_programmer_guide.xml b/jonas_doc/core/src/docbook/doc-en/ejb3_programmer_guide.xml deleted file mode 100644 index daa04c98723081a697296aac712728f6913b2ccc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/ejb3_programmer_guide.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - EJB 3.0 Programmer's Guide - - - - FlorentBENOIT - - - EasyBeans - - OW2 consortium - - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - March 2009 - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/essai.xml b/jonas_doc/core/src/docbook/doc-en/essai.xml deleted file mode 100644 index 3f72edd3c613a2bf22b8c9bdb11ee4478c92da2a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/essai.xml +++ /dev/null @@ -1,732 +0,0 @@ - - - Essai 1 - - - -
    - Essai 1 avec <xi:include href="variables.xml" - xpointer="appserver" /> - - voici un lien sur le configuration_guide. - - carol.protocols=jrmp -carol.jrmp.url=rmi://localhost:1099 -carol.jvm.rmi.local.call=false -carol.jvm.rmi.local.registry=false -carol.jrmp.server.port=0 -carol.jrmp.interfaces.bind.single=false - - - choice of the protocol or list of protocols - - - - connexion url to the RMI registry the hostname (localhost) and - port number must be changed if needed. In a distributed - configuration changing the hostname is mandatory. - - - - if true local calls are optimized: calls to methods of the - remote interface are treated as call to local methods (it is not - always possible depending on the packaging of the - application). - - - - if true a local Naming context is used. This must be used only - with a collocated registry and it is mandatory when the - jonas.security.manager property of jonas.properties is set to - true. - - - - exported objects will listen on this port for remote method - invocations. 0 means random port. Specify a port may be useful when - the server run behind a firewall. - - - - if true use only a single interface when creating the - registry. False means use all interfaces available. - - -
    - -
    - Essai2 avec <xi:include href="variables.xml" - xpointer="appserver" /> - - - - - - -
    - -
    - Essai3 avec JOnAS - - The jonas-ra.xml contains JOnAS specific information describing - deployment information, logging, pooling, jdbc connections, and RAR config - property values: - - - - - - property name - - description - - possible values - - - - - - jndiname - - name the RAR will be registered as. This property is - requiredThis value will be used in the - resource-refsection of an J2EE - AZEAEZAEAEAEAEZ - composant. - - - - Anyname (for example jdbc_1) - - - - - - rarlink - - jndiname of a base RAR file. Useful for deploying - multiple connection factories without having to deploy the - complete RAR file again. When this is used, the only entry in - RAR is a META-INF/jonas-ra.xml - - - - JONASJDBC_DM - - - - JONASJDBC_DS - - - - JONASJDBC_CP - - - - JONASJDBC_XA - - - - - - native-lib - - defines the path where native libraries can be - found. - - - - Any string for a path - - - - - - - - - - - - - - property name - - description - - possible values - - - - - - pool-init - - Initial size of the managed connection pool - - - - 0 (default value) - - - - n - - - - - - pool-min - - Minimum size of the managed connection pool. - - - - 0 (default value) - - - - n - - - - - - pool-max - - Maximum size of the managed connection pool. - - - - n - - - - -1 = unlimited (default value) - - - - - - pool-max-age-minutes - - Maximum number of minutes to keep the managed connection - in the pool. - - - - 0 = an unlimited amount of time. - - - - n in minutes - - - - - - pstmt-max - - Maximum number of PreparedStatements per managed - connection in the pool. Only needed with the JDBC RA of JOnAS or - another database vendor's RAR. Value of 0 is unlimited and -1 - disables the cache. - - - - 0 = unlimited - - - - n (default value = 10) - - - - -1 = cache disabled - - - - - - pool-max-opentime - - Identifies the maximum number of minutes that a managed - connection can be left busy. - - - - 0 = an unlimited amount of time (default - value). - - - - n in minutes - - - - - - pool-max-waiters: - - identifies the maximum number of waiters for a managed - connection. Default value is 0. - - - - 0 (default value) - - - - n - - - - - - pool-max-waittime - - identifies the maximum number of seconds that a waiter - will wait for a managed connection. Default value is 0. - - - - 0 (default value) - - - - n in seconds - - - - - - pool-sampling-period: - - identifies the number of seconds that will occur between - statistics samplings of the pool. Default is 30 seconds. - - - - n in seconds (default value = 30s) - - - - - - -
    - -
    - Essai de screen avec scrollbar - - log.config.classname org.objectweb.util.monolog.wrapper.javaLog.LoggerFactory - -handler.tty.type Console -handler.tty.output Switch -handler.tty.pattern %d : %O{1}.%M : %m%n - -handler.logf.type File -handler.logf.output automatic -handler.logf.pattern %d : %l : %h : %O{1}.%M : %m%n - -logger.root.handler.0 tty -logger.root.handler.1 logf - -logger.root.level INFO -logger.org.objectweb.level INFO - -#logger.org.objectweb.jonas_ejb.level DEBUG - -handler.mesonly.type Console -handler.mesonly.output Switch -handler.mesonly.pattern %m%n - -logger.org.objectweb.jonas.genic.handler.0 mesonly -logger.org.objectweb.jonas.genic.additivity false - -[...] -
    - -
    - Essai de screen sans scrollbar - - se reporter au - Chapitre 4, Conventions et règles diverses dfdgdgdfdgdgfgdgdgdg - yyyy ... - ant -f build-jb.xml create_jonas_base - - -
    - -
    - Essai de literallayout - - se reporter au <xref linkend="conventions" /> ... - <chapter xml:id="conventions"/> <title>Conventions - et règles diverses</title> - -
    - -
    - Essai de rendus pour Strings - - - - - - - - string - - elements/attributs - - rendu - - - - - - logger.root.level - - aucun - - logger.root.level - - - - logger.root.level - - emphasis - - logger.root.level - - - - logger.root.level - - emphasis[bold] - - logger.root.level - - - - logger.root.level - - filename - - logger.root.level - - - - logger.root.level - - filename + class=directory - - logger.root.level - - - - logger.root.level - - filename + class=extension - - logger.root.level - - - - logger.root.level - - literal - - logger.root.level - - - - logger.root.level - - classname - - logger.root.level - - - - logger.root.level - - command - - logger.root.level - - - - logger.root.level - - envar - - logger.root.level - - - - logger.root.level - - interfacename - - logger.root.level - - - - logger.root.level - - package - - logger.root.level - - - - logger.root.level - - property - - logger.root.level - - - - logger.root.level - - function - - logger.root.level - - - - logger.root.level - - ulink - - logger.root.level - - - - -
    - -
    - Essai Q and A - - - - - - - - How can I use a java client inside the client - container? - - - - see earsample and jaasclient for the use of client container. - All examples under src show - heavy clients without client container. - - - - - - I would like to use cluster of JOnAS - - - - see sampleCluster2 and the associated - demo. - - - - - - Is it possible to use EJB3? - - - - it is possible to deploy and use EJB3 with JOnAS 4.8 EE + EJB3 EasyBeans - container. EasyBeans is available for JOnAS 4.x with a resource - adapter, you only have to use a JDK 5.0.The guide Getting - started with the embedded EasyBeans for JOnAS J2EE server - explains how to do this. - - - - - - Where can I find transaction management examples? - - - - nearly all examples use container managed transactions but - some use explicit transaction demarcation in the client (light or - heavy) like earsample, src/eb, src/sb - - - - - - Where can I find servlets and JSP examples? - - - - see earsample, alarm, cmp2, olstore, petstore1.3, j2eemanagement, etc... - - - - - - My application needs to access database - - - - see src/eb, cmp2, alarm, olstore, petstore1.3,hibernate, jdo examples. - - - - - - How to use JMS or message driven beans? - - - - see src/jms, src/mdb/sampleappli, src/mdb/*, alarm examples. - - - - - - Are there webservices examples? - - - - Yes, of course see webservices/beans/ws, webservices/beans/wsclient, webservices/webs/webclient, webservices/webs/webendpoint, olstore - - - - - - how to use security? - - - - earsample uses EJB - security, jaasclient uses JAAS - login module, JACC authentication is used by all servlet examples - that use authentication like olstore, petsore1.3,alarm. - webservices/beans/ws - shows how to add security to a stateless session bean using - WsGen - - - - - - I would like to use mail API - - - - see src/mailsb. - - - - - - Is it possible to access to Management beans (MBeans) of - JOnAS? - - - - yes !j2eemanagement example shows how to use the Management - EJB (MEJB) that allows to perform some management operations - accordingly to the J2EE Management Specification (JSR77). - - - - - - How to build and package Java EE application? - - - - All examples are built and packaged via Ant. you can be - inspired by the build.xml files. - - For example - $JONAS_ROOT/examples/earsample/build.xml file - is a very good example that can be followed. It shows ant targets - for: - - - - compiling all the java sources - - - - building ejbjar file for JOnAS via the standard - ejb ant target - - - - building war file - - - - building client jar file - - - - building rar file - - - - building ear file - - - - - - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/essai2.xml b/jonas_doc/core/src/docbook/doc-en/essai2.xml deleted file mode 100644 index 2ce2ef78b9a5f38f46fdf0d0b3b0ecabbc5ecf13..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/essai2.xml +++ /dev/null @@ -1,10 +0,0 @@ - -
    - Essai 2 pour inclusion de <xi:include href="variables.xml" xpointer="appserver"/> - - Nous allons inclure essai.xml ici: - - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/essaibook.xml b/jonas_doc/core/src/docbook/doc-en/essaibook.xml deleted file mode 100644 index cd415df486df0948ff3754a7f3175db1c4be6ee4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/essaibook.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - JOnAS Document - - - - CoqPhilippe - - DanesAdriana - - JOnAS Team - - - - 2007-2008 - - OW2 consortium - - - - - April 2007 - - - Developing Entity Beans - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/getting_started_guide.xml b/jonas_doc/core/src/docbook/doc-en/getting_started_guide.xml deleted file mode 100644 index cda97be3f32334860da3935ef8374b8aaa8e2358..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/getting_started_guide.xml +++ /dev/null @@ -1,3439 +0,0 @@ - - - - - Getting started with JOnAS 5 - - - - JOnAS Team - - - - CoqPhilippe - - - - SauthierGuillaume - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2007-2009 - - OW2 Consortium - - - - - March 2009 - - - - - Preface - - - Welcome new users of ! This guide is intended to help you. - - shows that a - downloaded is usable - as is. - - The environment to set is truly minimal. It's child's play to run a - application. - - This chapter shows not only how to perform some actions but also - explains why everything runs so easily. - - is - distributed with examples ready to use. Users can learn a lot by studying - these examples - - - - Theses examples may be used as a tutorial for Java EE 5 technology. - They are using the simplified programming model, dependency injection, - Java Persistence API, security and other functionalities available in Java - EE 5. - - Note that this guide wants to be simple and is not intended to - resolve all problems that can be encountered in real - life situtations, which can be very complex. - - For more experimented users that need to perform more complex tasks, - we recommend taking a look at the JOnAS 5 Configuration - guide - - - summarizes downloading and installing . - - - describes what you get when you download and install . - - - - - First contact with JOnAS 5 - - - It is assumed, in this guide, that the first time user has already - downloaded and installed . If this is not the case, please refer to . - - In this chapter an unexperienced user will learn how to run an - existing - application with . He will understand why it is so easy to - achieve such results with nearly zero configuration. - -
    - - How do I set up a JOnAS environment? - - - Once you have installed your distribution, you have to set up the - JONAS_ROOT environment variable prior to using - or any of its - tools. You will also have to update your PATH variable. - - - - Unix platforms - - Open a new terminal and proceed as follows: - - bash> export JONAS_ROOT=<your_install_dir> -bash> export PATH=${PATH}:${JONAS_ROOT}/bin - - or - - - - - - Windows platforms - - Open a new DOS window and proceed as follows: - - C:> set JONAS_ROOT=<your_install_dir> -C:> set PATH=%PATH%;%JONAS_ROOT%\bin - - To update the path permanently, do the following depending - upon your Windows version: - - - - Windows XP - - - Go to the Start Menu, then double click on System. In - the System Control Panel select the Advanced tab and push the - Environment Variables button. Now, you can look for the - PATH to edit. Append the value - ;C:\jonas-5.x\bin (assuming that you - installed JOnAS in the C:\jonas-5.x directory). - - - - - - - - distribution contains a number of configuration files in $JONAS_ROOT/conf directory. These files can - be edited to change the default configuration. However, it is - recommended to put the configuration files needed by a specific - application running on in a separate location. This is done by using an - additional environment variable called JONAS_BASE. - - -
    - -
    - - How can I check if everything is correct? - - - JOnAS provides the command jonas - check that checks if your environment is set correctly. - - -
    - -
    - - How can I run a JOnAS server? - - - Now that your environment seems correct, it is possible to launch - the server - simply by typing the following command: - - bash> jonas start - -OW2 JOnAS 5.1.0 [ http://jonas.ow2.org / jonas@ow2.org ] - -JONAS_BASE is set to xxxxx - -Welcome to OW2 JOnAS (Running on Felix). ------------------------------------------------ - - - - As soon as your server is ready, i.e when you can see on your - terminal something that looks like: - - J2EEServer.__info : JOnAS AS v5.1 named 'jonas' RUNNING - - you can use your favorite browser and type in the following - URL: - - http://localhost:9000/Here is the web page you - should see: - - - - - - - - - - - - You just have run JOnAS for the first time. - - You are now able to do some interesting things like run a sample - application packaged - in a .ear file (the earsample example), run the web administration - tool for , or - you can do some other things that we will explain later on. -
    - -
    - - How can I run my first Java EE application? - - - If you have followed the previous steps you are now ready to run - your first - application in . - - First, we need an application to run. We have chosen the $JONAS_ROOT/examples/javaee5-earsample - example.It is a fairly good example that shows some interesting - functionnalities of the java EE 5 technology. See for more details. - - You must first compile and generate the Java EE application. This - is done by using Ant - - bash> cd $JONAS_ROOT/examples/javaee5-earsample - -bash> ant - - When you get : - - Build SuccessfullYou have compiled all the java - classes, packaged them in an ear archive and copied it under - $JONAS_BASE/deploy. - - At JOnAS startup time this Java EE application will be - automatically deployed. - - Now as soon as your JOnAS server is started you can run the - application by typing the following URL in a browser: - - http://localhost:9000/javaee5-earsample -
    - -
    - - Understanding how all of this runs out of the box - - - There are several reasons why the previous earsample application - is directly runnable on a freshly installed JOnAS: - - - - Tomcat servlet server is embedded in the distribution - - - - A deployment plan (ctxroot.xml) - triggering the deployment of the web application - jonas-ctxroot is pre-installed in $JONAS_ROOT/deploy directory. This - explains why a web page is displayed when you type: - http://localhost:9000/ - - - - The javaee5-earsample.ear file has been - copied in $JONAS_BASE/deploy - directory. This way, the application has automaticaly - been deployed when starts. - - - - By using newjb tool JOnAS has - been correctly configured and default values has been set in - configuration files located under $JONAS_BASE/conf - - These files are accordingly set in order to: - - - - force to use all the services needed for - correct execution: - - - - jtm: provides the - TransactionManager used in the back - stage (for EJB methods and SQL execution) - - - - db: provides an HSQL - Database for JPA entities - - - - security: provides - security functionalities - - - - resource: service for - using JMS and JDBC resource adaptors - - - - ejb3: there is a - session bean to be deployed in an ejb3 container - - - - web: there is a - servlet to be deployed in a servlet container - - - - ear: for deploying - the javaee5-earsample.ear - application - - - - jaxws: for deploying - JAX-WS 2.0 web services - - - - depmonitor that - deploys Java EE modules located in $JONAS_BASE/deploy - directory - - - - jonas.properties is the configuration - file - - - - set a default port (9000) for the connector HTTP (in - $JONAS_BASE/conf/tomcat6-server.xml - file) - - - - set a default port (1099) and a default protocol - (jrmp) to be used by the registry (in - $JONAS_BASE/conf/carol.properties - file) - - - - a JMS resource adaptor correctly configured has been built - and installed under $JONAS_BASE/deploy - - - - a JDBC resource adaptor for accessing HSQL Database has - been built and installed under $JONAS_BASE/deploy - - - - -
    - -
    - - First step in JOnAS administration - - - Back on the web page displayed previously, you can see the second - line that says: - - Go to the JOnAS administration web application. Use the login/password jonas/jonas - - This link allows you to run the administration tool jonasAdmin. - - After the authentication process is done - (login=jonas,password=jonas) you have - access to a page in which the left part shows the Management - tree. - - - - - - - - - - - - - - - - From this tree it is possible - to: - - get information on the management domain - - - - get information about the JOnAS server (protocol, - JMX, registry, web container, JVM) - - - - get monitoring information (threads, - memory) - - - - get or set logging information - - - - get information on existing web connectors or - create new ones - - - - get information about JOnAS services - - - - make deployment operations (deploy/undeploy/upload/remove) for ear, war, ejbjar and rar files - - - - get configuration information, statistics, or - perform operations on resources (data sources) - - - - get securtity configuration information or perform - security operations - - - - get configuration information or perform - operations on JORAM, our JMS provider. - - - - browse all the deployed MBeans in the - server - - - - - - Here - is a demonstration of cluster management features in jonasAdmin - console. -
    -
    - - - - Learning JOnAS by examples - - - provides a - complete example javaee5-earsample that - shows the multitiered application model for enterprise applications that a - Java EE platform must support. - - In this example you will find all the java EE components - possibles: - - - - Application clients - - - - Web components (servlets) - - - - Enterprise JavaBeans - - - - It may be interesting for a user that wants to start developing a - application and run it - in to look at the - sample in order to see the new Java EE 5 features. - -
    - - javaee5-earsample example from a 10.000 foot view - - - The javaee5-earsample example is a quick-start Java EE application - that shows usage of new Java EE 5 features, like JPA, EJB3 (Session and - Message Driven Bean), annotations, JAAS security. - - provides - a little database, embedded in the server, namely HSQLDB. This database - is helpful for running some examples that use JPA entity beans. - - - The HSQL database is not appropriate for real life - applications. - - -
    - - Java EE Technologies in Use - - - This sections offers an overview of the different Java EE - technologies involved in the javaee5-earsample EAR. - -
    - - JPA 1.0 - - - JPA stands for Java Persistence API, that's a specification - extracted from the EJB 3.0 core that addresses persistency problem. - Basically, it allows POJOs to be persisted and queried to and from a - JDBC database. - - Some JPA EntityManager Providers: - - - - , - - - - , - - - - etc ... - - -
    - -
    - - EJB 3.0 - - - EJB 3.0 is the new Enterprise Java Beans - specification targeting ease of development - (EoD), a feature that was lacking in the previous - version (EJB 2.x). This specification makes heavy use of Java 5 - annotations (@Stateless, - @Stateful, - @MessageDriven, ...). One of the main - advantages is the introduction of the concept of business method - Interceptors. - - EJBs are packaged in an EjbJar (.jar). - - OW2 - EasyBeans is the EJB 3.0 Container used in JOnAS 5. -
    - -
    - - JAAS - - - JAAS is the authentication and - authorization mechanism of Java EE that manages Principals and - Roles.It is used in this sample to authenticate one of the - application's client users. -
    - -
    - - JMS 1.1 - - - JMS is the standard for Messaging system - (MOM) in Java. It is used to asynchronously (using JMS Destinations - like Queues or Topics) perform calls to the application (usually - using MessageDriven Beans). - - OW2 - JORAM is the JMS provider used in JOnAS 5. -
    - -
    - - Servlet 2.5 - - - Servlets and JSPs compose the web front-end - of a classical Java EE application. This is what is accessed when an - HTTP URL (http://localhost:9000/javaee5-earsample for example) is - called. - - Servlets/JSPs are packaged in a web application (.war). -
    - -
    - - Application Client - - - Application Clients are described in the Java EE specification - as a way to package code for "heavy-weight" clients (not like web - applications, usually known as "light-weight") of the application's - business objects (EJBs, JMS Destinations, ...). Application Clients - are top level Java EE modules so they benefit from uniform naming - (java:comp/env). - - Application Clients are packaged in .jar files. -
    - -
    - - Enterprise Application - - - EARs do not contain any code but are used - to package together all the modules composing the application - (EjbJar + Web Applications + Resource Adapters + Application - Clients). -
    -
    - -
    - - javaee5-earsample EAR Sample Architecture - - - In this section, the sample's architecture will be described, - execution flow and interactions will be explained. - -
    - - javaee5-earsample Sample Architecture - - - - - - - - - - - -
    This application provides the following features:
    - - - - 2 separated business interfaces, one allowing write access - and the other one read only access. - - - - It can receive Book creation orders asynchronously from a - JMS Queue. - - - - A Web interface allowing to see the Books and Authors, with - a special section authorized to add new Authors. - - - - The database (DB) is provided by a JOnAS - service called db that launches an Hypersonic SQL - server instance. A JDBC Resource Adapter is provided by JOnAS to allow - applications to connect to this DB. - - Upon the data tier are located the business data objects. They - are implemented using the JPA Entity model (with - annotations). - - The model represented in this application is super easy: - - - - Author: This is the author of a(some) - Book(s). - - - - Book: This Entity represents a book - written by an Author - - - - An Author can write many Books - - - - A Book is written by only 1 Author - - - - Two EJB3 @Stateless beans are constructed - on top of the business data objects (entities): Reader and - Writer. - - The Reader bean provides read only methods - (findAuthor, - findBook, ...) that never change the backed - data. On the contrary, the Writer bean provides - write methods (addAuthor, ...) and thus has - to be secured. - - On top of theses 2 "low level" EJBs, other, more business - oriented, EJBs are provided: Mailer, - Initializer, an MDB. - - The Initializer bean is a "hidden" - EJB, whose role is to initialize, if needed, a - first set of JPA Entitites (some well known - Authors, and some of their Books). This bean is used from almost all - the clients to ensure that there is something to show to the - user. - - The Mailer bean can be used by anyone (it's - does not use security features) and will only access the - Reader bean to fill up a mail message that will - be sent to a given mail address. - - The MDB (MessageDriven Bean) simply creates a - new Book for each new JMS message received from - the JMS Queue. - - The following business oriented functions are, in turn, used by - the end-user clients: - - - - Web Application offering a web interface (HTTP/HTML) - - - - Java EE 5 Application Clients (runs from the command - line) - - - - Concerning the web application, it offers 3 pages: - - - - An index page showing basic instructions on how to use the - web application - - - - An open page (meaning not secured) displaying Books and - Authors - - - - A secured page (needs user authentication) for new Authors - addition - - - - There are also multiple standard application clients - (AC for short) showing different ways to use the - application: - - - - Not Secured AC: this client uses the Mailer and Reader bean. - Using the Reader it displays the Authors and Books, and using the - Mailer bean, it sends a mail with an equivalent content. - - - - JMS AC: this client mainly interacts with a dedicated JMS - Queue to sends Book creation orders, then it waits some time and - uses the Reader bean to see if the new Books were - persisted. - - - - Secured AC: this clients shows usage of JAAS authentication. - It uses the Writer bean, which requires a user with the - "earsample" role in order to insert new Authors and Books. - - -
    -
    - -
    - - javaee5-earsample example detailed - - - This section will focus on multiple aspects of the EAR sample: - some basic server configuration (strictly limited to the elements in use - for the sample, a more complete description is available in the - configuration guide), simple programming guide showing JPA, EJB, JNDI - usage... - -
    - - JOnAS Server Configuration - - - Here we focus on JOnAS configuration needed by javaee5-earsample - examples and obtained after having run the newjb command . - -
    - - Required Services - - - The javaee5-earsample needs the following JOnAS services to be - activated for a flawless execution: - - - - jtm - - - Provides the transactions support - - - - - db - - - Provides the HSQL Database - - - - - mail - - - Provides the mail sending support - - - - - security - - - Provides the security provider - - - - - resource - - - Provides the connectivity to the database or the JMS - provider via resource adapters - - - - - ejb3 - - - Provides the EJB 3.0 Container runtime - - - - - web - - - Provides the Web container runtime for web applications - (Servlets/JSP) - - - - - ear - - - Provides the Enterprise ARchive (EAR) container - - - -
    - -
    - - DataSource - - - Access to the dataSource is provided by the resource service - . - - A resource adapter has been created at the JONAS_BASE creation - time via newjb tool from the properties found in - $JONAS_ROOT/build-jb.properties file: - - -rajdbc.hsql.user=jonas -rajdbc.hsql.password=jonas -rajdbc.hsql.url=jdbc:hsqldb:hsql://localhost:9001/db_jonas -rajdbc.hsql.drivername=org.hsqldb.jdbcDriver -rajdbc.hsql.jndiname=jdbc_1 -rajdbc.hsql.jdbcdriverjarfile=none -rajdbc.hsql.mappername=rdb.hsql - - - JDBC URL of the connection. This is - one is specific to HSQL and corresponds to the HSQL port and - DB name provided in the default db - service configuration. - - - - JDBC driver fully qualified class - name (including package name) - - - - JNDI name of the - DataSource - (DataSource will be available under - that name in the JNDI registry) - - -
    -
    - -
    - - Data Tier: JPA Entity Beans - - -
    - - Author and Book JPA Model - - - - - - - - - - - -
    - - This figure represents the model of the application. it is - composed of 2 JPA Entities: - Author and Book. Each - one has an id attribute and are qualified by a - name and a title respectively. - Theses entities have a relationship between them: an Author instance - knows all the Books he wrote (Author.getBooks()) and a Book knows who - wrote it (Book.getAuthor()). - -
    - Author Bean - - A JPA Entity bean is a simple class - considered as a POJO (Plain Old Java Object). - That means that the class has a public default constructor (no - arguments). Moreover, for each attribute/field of the class, a - getter and a setter method (getXYZ() and - setXYZ(...)) has to be provided. - - A JPA Entity bean will be annotated with - the @Entity annotation. - - The primary key is defined through an - @Id annotation. In the earsample use case, - this key has to be auto-generated. Finally, the - getId() method should look like - this: - - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - public long getId() { - return this.id; - } -The Author bean is in relation with the bean Book, because an Author - can have many Books (a OneToMany relationship). - - The relation is also defined through an annotation: - - @OneToMany(mappedBy="author", fetch=FetchType.EAGER, cascade=CascadeType.ALL) - public Collection<Book> getBooks() { - return books; - } -This relation is of One-To-Many type. The link will be done with the - entity bean Book on the author attribute (owner - of the relation). - - The fetching type is EAGER (it means that - when the Author instance is constructed, all the linked books are - fetched). Another choice could have been to use - LAZY fetching (meaning that the Books will only - be fetched when the getBooks() method will be called). In the - earsample use case, the entity beans will be accessed from a client - in another Java VM (detached mode), so, to reduce latencies caused - by network exchanges, it was decided to not use - LAZY fetching. Because the Author and Books - classes are usable from the remote JVM, they must implements the - Serializable interface. - - Finally, the cascading mode is set to ALL: - when the Author bean is be persisted, all the Books related to the - Author bean will be persisted too.package org.ow2.jonas.examples.ear.entity; - -import static org.ow2.jonas.examples.ear.entity.Author.QN.ALL_AUTHORS; -import static org.ow2.jonas.examples.ear.entity.Author.QN.FIND_AUTHOR; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; - -/** - * Author of a book. - * @author Florent Benoit - */ -@Entity -@NamedQueries({@NamedQuery(name=ALL_AUTHORS, query="select o FROM Author o"), - @NamedQuery(name=FIND_AUTHOR, query="select o FROM Author o WHERE name = :name")}) -public class Author implements Serializable { - /** - * Store Query names. - */ - public static interface QN { - /** - * Search all authors. - */ - String ALL_AUTHORS = "Author.allAuthors"; - - /** - * Search a named author. - */ - String FIND_AUTHOR = "Author.findAuthor"; - } - - /** - * Serial Version UID. - */ - private static final long serialVersionUID = 0L; - - /** - * Primary key (will be auto generated). - */ - private long id; - - /** - * Name of the author. - */ - private String name = null; - - /** - * List of books written by the author. - */ - private Collection<Book> books; - - /** - * Default constructor. - */ - public Author() { - books = new ArrayList<Book>(); - } - - /** - * Constructor with a given author name. - * @param name - the name of the author - */ - public Author(final String name) { - this(); - setName(name); - } - - /** - * Relation ship (do not using lazy mode). - * @return books written by this author - */ - @OneToMany(mappedBy="author", fetch=FetchType.EAGER, cascade=CascadeType.ALL) - public Collection<Book> getBooks() { - return books; - } - - /** - * Add a book with a given title. - * @param title - the title of the book - */ - public void addBook(final String title) { - Book livre = new Book(); - livre.setTitle(title); - livre.setAuthor(this); - getBooks().add(livre); - } - - /** - * Sets the collection of books written by this author. - * @param books the list of the books - */ - public void setBooks(final Collection<Book> books) { - this.books = books; - } - - /** - * @return name of the author - */ - public String getName() { - return name; - } - - /** - * Sets the name of the author. - * @param name - the name of this author - */ - public void setName(final String name) { - this.name = name; - } - - /** - * @return an id for this object (incremented automatically) - */ - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - public long getId() { - return this.id; - } - - /** - * Sets the id of this author object. - * @param id the given id of this author - */ - public void setId(final long id) { - this.id = id; - } - - - /** - * @return String representation of this entity object. - */ - @Override - public String toString() { - StringBuilder sb = new StringBuilder(this.getClass().getName()); - sb.append("[id="); - sb.append(getId()); - sb.append(", name="); - sb.append(getName()); - sb.append("]"); - return sb.toString(); - } -} - - - - Two EJB-QL queries have been defined in - the bean's class.They will be used to retrieve all the authors - and an author with a given name respectively. - -
    - -
    - Book Bean - - The Book bean is also a JPA entity bean. - There is a relationship with the Author bean, one book being related - to only one Author: Many-To-One relationship. - - The @JoinColumn annotation defines the column of the primary - key to be used for the association between 2 entity beans: - - @ManyToOne - @JoinColumn(name="Author_id") - public Author getAuthor() { - return author; - } -Here is the complete Book class:package org.ow2.jonas.examples.ear.entity; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; - -/** - * Define a book. - * @author Florent Benoit - */ -@Entity -@NamedQueries({@NamedQuery(name=Book.QN.ALL_BOOKS, query="select o FROM Book o"), - @NamedQuery(name=Book.QN.FIND_BOOK, query="select o FROM Book o WHERE name = :name") -}) -public class Book implements Serializable { - - /** - * Defines Query names. - */ - public static interface QN { - /** - * Search all books. - */ - String ALL_BOOKS = "Book.allBooks"; - - /** - * Search a book. - */ - String FIND_BOOK = "Book.findBook"; - } - - /** - * Serial Version UID. - */ - private static final long serialVersionUID = 0L; - - /** - * Primary key. - */ - private long id; - - /** - * Author's book. - */ - private Author author; - - /** - * title of the book. - */ - private String title; - - /** - * Default constructor. - */ - public Book() { - - } - - /** - * Constructor. Build a new Book with the given title and written by the - * given author. - * @param title the given title - * @param author the given author. - */ - public Book(final String title, final Author author) { - setTitle(title); - setAuthor(author); - } - - /** - * @return the Author of this Book. - */ - @ManyToOne - @JoinColumn(name="Author_id") - public Author getAuthor() { - return author; - } - - /** - * Sets the author of this book. - * @param author the given author. - */ - public void setAuthor(final Author author) { - this.author = author; - } - - /** - * @return the title of this book. - */ - public String getTitle() { - return title; - } - - /** - * Set the title of the book. - * @param title - the title of the book - */ - public void setTitle(final String title) { - this.title = title; - } - - /** - * @return an id for this object (incremented automatically) - */ - @Id - @GeneratedValue(strategy=GenerationType.AUTO) - public long getId() { - return this.id; - } - - /** - * Sets the id of this author object. - * @param id the given id of this author - */ - public void setId(final long id) { - this.id = id; - } - - /** - * @return String representation of this entity object. - */ - @Override - public String toString() { - StringBuilder sb = new StringBuilder(this.getClass().getName()); - sb.append("[id="); - sb.append(getId()); - sb.append(", title="); - sb.append(getTitle()); - sb.append("]"); - return sb.toString(); - } -} - -
    - -
    - Persistence File - - It is required to have a persistency file - META-INF/persistence.xml to describe useful - information. For example, the JNDI name of the - DataSource to be used for database - persistency. - - - JPA Entity: META-INF/persistence.xml - - <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0"> -<persistence-unit name="entity" transaction-type="JTA"> - <provider></provider> - <jta-data-source>jdbc_1</jta-data-source> - <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - - <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/> - <property name="eclipselink.ddl-generation.output-mode" value="database"/> - <property name="eclipselink.target-database" value="HSQL"/> - - <property name="toplink.target-database" value="HSQL"/> - <property name="toplink.ddl-generation" value="drop-and-create-tables"/> - <property name="toplink.ddl-generation.output-mode" value="database"/> - - <property name="openjpa.jdbc.DBDictionary" value="hsql"/> - <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/> - </properties> -</persistence-unit> -</persistence> - - -
    -
    - -
    - - Business Tier: EJB3 Beans - - - This section will decribe the business parts of the application. - Session beans provide synchronous RPC interfaces and the MessageDriven - bean provides the asynchronous interface. - -
    - Session Beans - - The Session beans have been separated into two logical parts: - Writer and Reader beans provide the basic operations (read/write) on - the entities, while Mailer and Initializer are using the previous - ones to perform more advanced operations. - -
    - Reader Bean - - The Reader Bean is a Stateless Session Bean that provides - both a Remote and a Local business interface. It is responsible - for all the read-like operations the application can do on the JPA - entities. The listAllXYZ and - findXYZ methods return the JPA entity - beans. - - - Stateless Session Bean: Reader Business Interface - - package org.ow2.jonas.examples.ear.reader; - -import java.util.List; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; - -/** - * The {@link Reader} business interface is an un-restricted - * read only view of the entities. - * @author Guillaume Sauthier - */ -public interface Reader { - - /** - * @return the list of all the persisted {@link Author}s. - */ - List<Author> listAllAuthors(); - - /** - * @return the list of all the persisted {@link Book}s. - */ - List<Book> listAllBooks(); - - /** - * Find a given {@link Author} using it's name as a key. - * @param name {@link Author}'s name. - * @return the first {@link Author} that matches the given name. - */ - Author findAuthor(final String name); - - /** - * Find a given {@link Book} using it's name as a key. - * @param name {@link Book}'s name. - * @return the first {@link Book} that matches the given name. - */ - Book findBook(final String name); -} - - - - This bean uses an - EntityManager (injected through the - @PersistenceContext annotation). - - /** - * Entity manager used by this bean. - */ - @PersistenceContext - private EntityManager entityManager = null; -The EntityManager is also used to perform EJB-QL queries (they have - been defined with the @NamedQuery annotation on top of the JPA - classes). /** - * @returns the list of all the persisted {@link Author}s. - */ - public List<Author> listAllAuthors() { - return entityManager.createNamedQuery(ALL_AUTHORS).getResultList(); - } - - - Here is the code of the Reader EJB:package org.ow2.jonas.examples.ear.reader; - -import static org.ow2.jonas.examples.ear.entity.Author.QN.ALL_AUTHORS; -import static org.ow2.jonas.examples.ear.entity.Author.QN.FIND_AUTHOR; -import static org.ow2.jonas.examples.ear.entity.Book.QN.ALL_BOOKS; -import static org.ow2.jonas.examples.ear.entity.Book.QN.FIND_BOOK; - -import java.util.List; - -import javax.ejb.Local; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; - -/** - *The {@link ReaderBean} EJB is an unrestricted, read-only, Stateless Bean. - * @author Guillaume Sauthier - */ -@Stateless -@Local(LocalReader.class) -@Remote(RemoteReader.class) -public class ReaderBean implements LocalReader, RemoteReader { - - /** - * Entity manager used by this bean. - */ - @PersistenceContext - private EntityManager entityManager = null; - - /** - * Find a given {@link Author} using it's name as a key. - * @param name {@link Author}'s name. - * @return the first {@link Author} that matches the given name. - */ - @SuppressWarnings("unchecked") - public Author findAuthor(final String name) { - Query query = entityManager.createNamedQuery(FIND_AUTHOR); - query.setParameter("name", name); - List<Author> authors = query.getResultList(); - if (authors != null && authors.size() > 0) { - return authors.get(0); - } - return null; - } - - /** - * Find a given {@link Book} using it's name as a key. - * @param name {@link Book}'s name. - * @return the first {@link Book} that matches the given name. - */ - @SuppressWarnings("unchecked") - public Book findBook(final String name) { - Query query = entityManager.createNamedQuery(FIND_BOOK); - query.setParameter("name", name); - List<Book> books = query.getResultList(); - if (books != null && books.size() > 0) { - return books.get(0); - } - return null; - } - - /** - * @return the list of all the persisted {@link Author}s. - */ - @SuppressWarnings("unchecked") - public List<Author> listAllAuthors() { - return entityManager.createNamedQuery(ALL_AUTHORS).getResultList(); - } - - /** - * @return the list of all the persisted {@link Book}s. - */ - @SuppressWarnings("unchecked") - public List<Book> listAllBooks() { - return entityManager.createNamedQuery(ALL_BOOKS).getResultList(); - } - -} - -
    - -
    - Writer Bean - - The Writer Bean is also a Stateless Session Bean, with a - Remote and a Local business interface. This bean provides - write-like operations (that modify the database content). It is - also secured to allow access only to a specific role. - - - Stateless Session Bean: Writer business - Interface - - package org.ow2.jonas.examples.ear.writer; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; - -/** - * Remote interface for the bean Writer. - * @author JOnAS team - */ -public interface Writer { - - /** - * Persists a new {@link Author}. - * @param author {@link Author} to add. - */ - void addAuthor(final Author author); - - /** - * Persists a new {@link Book}. - * @param book {@link Book} to add. - */ - void addBook(final Book book); - - /** - * Cascade remove an {@link Author}. - * @param author {@link Author} to be removed. - */ - void removeAuthor(final Author author); - - /** - * Cascade remove a {@link Book}. - * @param book {@link Book} to be removed. - */ - void removeBook(final Book book); -} - - Through that interface, clients will be able to add - new Authors and Books, but will also be able to remove - them. - - This bean uses (like the Reader) an - EntityManager (injected through the - @PersistenceContext annotation). - - /** - * Entity manager used by this bean. - */ - @PersistenceContext - private EntityManager entityManager = null; -The EntityManager will be used to persists and destroy JPA entity - instances. /** - * Persists a new {@link Book}. - * @param book {@link Book} to add. - */ - public void addBook(final Book book) { - entityManager.persist(book); - } - - /** - * Cascade remove a {@link Book}. - * @param book {@link Book} to be removed. - */ - public void removeBook(final Book book) { - entityManager.remove(book); - } - - - Security for the Writer bean is provided in a declarative - way: the class is annotated with @DeclareRoles and - @RolesAllowed. - - - - @DeclareRoles declares an array of role names that - will be used later in the bean - - - - @RolesAllowed, when placed on the class (instead of a - method) specifies the default set of roles that are allowed - to call this bean's methods - - In this sample, only the - earsample role is authorized to actually use - the Writer bean. - - Here is the code of the Writer EJB:package org.ow2.jonas.examples.ear.writer; - -import javax.annotation.security.DeclareRoles; -import javax.annotation.security.RolesAllowed; -import javax.ejb.Local; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; - -/** - * This is an example of Session Bean, stateless, secured, available - * with a Local and a Remote interface (with the same methods). - * @author JOnAS team - */ -@Stateless -@Remote(RemoteWriter.class) -@Local(LocalWriter.class) -@DeclareRoles("earsample") -@RolesAllowed("earsample") -public class WriterBean implements LocalWriter, RemoteWriter { - - /** - * Entity manager used by this bean. - */ - @PersistenceContext - private EntityManager entityManager = null; - - /** - * Persists a new {@link Author}. - * @param author {@link Author} to add. - */ - public void addAuthor(final Author author) { - entityManager.persist(author); - } - - /** - * Persists a new {@link Book}. - * @param book {@link Book} to add. - */ - public void addBook(final Book book) { - entityManager.persist(book); - } - - /** - * Cascade remove an {@link Author}. - * @param author {@link Author} to be removed. - */ - public void removeAuthor(final Author author) { - entityManager.remove(author); - } - - /** - * Cascade remove a {@link Book}. - * @param book {@link Book} to be removed. - */ - public void removeBook(final Book book) { - entityManager.remove(book); - } - -} - -
    - -
    - Mailer Bean - - The Mailer bean provides a business interface supporting - status e-mail sending. - - - Stateless Session Bean: Mailer Business - Interface - - package org.ow2.jonas.examples.ear.mail; - -/** - * The {@link Mailer} business interface is used to send a status - * mail, with all the {@link org.ow2.jonas.examples.ear.entity.Author}s - * and {@link org.ow2.jonas.examples.ear.entity.Book}s in the library. - * @author Guillaume Sauthier - */ -public interface Mailer { - - /** - * Send a mail to the given mail address. - * @param address target mail address (must be of the form: xyz@abc.z) - */ - void sendStatusMail(final String address); -} - - This bean only provides a Remote interface. It is - binded in the JNDI under the name specified in the mappedName - attribute of the @Stateless annotation. - - @Stateless(mappedName="myMailerBean") -@Remote(Mailer.class) -public class MailerBean implements Mailer { - - - The Mailer needs some other components to help it to execute - it's job: - - - - A mail Session and a MimePartDataSource that will be - used to create and send the e-mail - - - - A reference to the Reader bean - - The mail Session and the MimePartDataSource are - acquired though injection, using the @Resource annotation. - - /** - * Mail Session used to send the Mail. - */ - @Resource(mappedName="mailSession_1") - private Session mailSession; - - /** - * Template for the message's content. - */ - @Resource(mappedName="mailMimePartDS_1") - private MimePartDataSource mimePartDatasource; -The mappedName attribute of the @Resource specifies the JNDI name to - be used when looking up theses components in the JNDI - registry. - - The reference to the Reader bean is injected with the help - of the @EJB annotation. Notice that the annotation did not provide - any JNDI or mapped name value. - - /** - * {@link LocalReader} EJB (Local interface). - */ - @EJB - private LocalReader reader; -Here is the complete code of the Mailer bean:package org.ow2.jonas.examples.ear.mail; - -import java.util.Collection; -import java.util.Date; -import java.util.List; - -import javax.annotation.Resource; -import javax.ejb.EJB; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessageContext; -import javax.mail.MessagingException; -import javax.mail.NoSuchProviderException; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimePartDataSource; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; -import org.ow2.jonas.examples.ear.reader.LocalReader; - -/** - * @author Guillaume Sauthier - */ -@Stateless(mappedName="myMailerBean") -@Remote(Mailer.class) -public class MailerBean implements Mailer { - - /** - * Mail Session used to send the Mail. - */ - @Resource(mappedName="mailSession_1") - private Session mailSession; - - /** - * Template for the message's content. - */ - @Resource(mappedName="mailMimePartDS_1") - private MimePartDataSource mimePartDatasource; - - /** - * {@link LocalReader} EJB (Local interface). - */ - @EJB - private LocalReader reader; - - /** - * Send a mail to the given mail address. - * @param address target mail address (must be of the form: xyz@abc.z) - * @see org.ow2.jonas.examples.ear.mail.Mailer#sendStatusMail(java.lang.String) - */ - public void sendStatusMail(final String address) { - - Address mailAddress = null; - try { - mailAddress = new InternetAddress(address); - } catch (AddressException e) { - System.err.println("Invalid mail address: " + e.getMessage()); - e.printStackTrace(); - return; - } - - MessageContext context = mimePartDatasource.getMessageContext(); - Message message = context.getMessage(); - try { - message.setContent(getContent(), "text/plain"); - } catch (MessagingException e) { - System.err.println("Cannot set message content:" + e.getMessage()); - e.printStackTrace(System.err); - return; - } - - Transport transport = null; - try { - transport = mailSession.getTransport(mailAddress); - } catch (NoSuchProviderException e) { - System.err.println("No provider found for @:" + address); - e.printStackTrace(System.err); - return; - } - try { - transport.connect(); - transport.sendMessage(message, new Address[] {mailAddress}); - transport.close(); - } catch (MessagingException e) { - System.err.println("Cannot send message:" + e.getMessage()); - e.printStackTrace(System.err); - return; - } - - System.out.println("Mail successfully sent to: " + address); - } - - /** - * Generate the mail's content. - * @return the mail message content. - */ - private String getContent() { - - StringBuilder sb = new StringBuilder(); - - // Print Header - sb.append("---------------------------------------------------\n"); - sb.append(" OW2 JOnAS EAR Sample Mailer Bean.\n"); - sb.append("---------------------------------------------------\n"); - sb.append("Generated the " + new Date() + "\n"); - sb.append("\n"); - - // Print the Authors - List<Author> authors = reader.listAllAuthors(); - sb.append("List of all registered Authors (" + authors.size() + ") and their Books:\n"); - for (Author author : authors) { - sb.append(" * " + author.getName() + " [" + author.getId() + "]\n"); - Collection<Book> books = author.getBooks(); - for (Book book : books) { - sb.append(" - " + book.getTitle() + "[" + book.getId() + "]\n"); - } - } - - // Print the Books - sb.append("\n"); - sb.append("List of all registered Books:\n"); - List<Book> books = reader.listAllBooks(); - for (Book book : books) { - sb.append(" * " + book.getTitle() + "[" + book.getAuthor().getName() + "]\n"); - } - - // Print the footer - sb.append("\n"); - sb.append("Enjoy your new JOnAS !\n"); - sb.append("\n"); - sb.append(" -- JOnAS Team\n"); - - return sb.toString(); - } - -} - -
    - -
    - Initializer Bean - - The Initializer bean is a kind of hidden bean: it does not - provide operations that should be usable from the clients. - - The purpose of this bean is to ensure that the JPA model is - initialized with some default values. Subsequent calls to the JPA - model will then always show JPA entities. - - Since this session bean uses the Writer bean (required, - because it writes values to the database), it needs to declare - security. - - Because this bean can be used by any client (secured or - not), and it uses a secured bean, it will need to have to be - executed under a given role. This role name is specified with the - @RunAs annotation: - - @RunAs("earsample") -public class InitializerBean implements Initializer { -Here is the complete code of the bean: - - package org.ow2.jonas.examples.ear.init; - -import javax.annotation.security.RunAs; -import javax.ejb.EJB; -import javax.ejb.Remote; -import javax.ejb.Stateless; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; -import org.ow2.jonas.examples.ear.reader.LocalReader; -import org.ow2.jonas.examples.ear.writer.LocalWriter; - -/** - * The {@link InitializerBean} EJB is here to initialize only once - * the Database/Entities. It simply checks if there is some {@link Author}s - * already persisted; if none are found, we will inject defaults values. - * @author Guillaume Sauthier - */ -@Stateless(mappedName="myInitializerBean") -@Remote(Initializer.class) -@RunAs("earsample") -public class InitializerBean implements Initializer { - - /** - * Injected reference to the {@link org.ow2.jonas.examples.ear.writer.Writer} EJB. - */ - @EJB - private LocalWriter writer; - - /** - * Injected reference to the {@link org.ow2.jonas.examples.ear.reader.Reader} EJB. - */ - @EJB - private LocalReader reader; - - /** - * Initialize the minimal set of entities needed by the sample. - * @see org.ow2.jonas.examples.ear.init.Initializer#initializeEntities() - */ - public void initializeEntities() { - - if (reader.findAuthor("Honore de Balzac") == null) { - // Balzac was not persited, add it now. - Author balzac = new Author("Honore de Balzac"); - Book pereGloriot = new Book("Le Pere Goriot", balzac); - balzac.getBooks().add(pereGloriot); - Book lesChouans = new Book("Les Chouans", balzac); - balzac.getBooks().add(lesChouans); - - // Persists the Author and all of his books - writer.addAuthor(balzac); - } - - if (reader.findAuthor("Victor Hugo") == null) { - // Hugo was not persited, add it now. - Author hugo = new Author("Victor Hugo"); - hugo.addBook("Les Miserables"); - hugo.addBook("Notre-Dame de Paris"); - - // Store - writer.addAuthor(hugo); - } - } - -} - -
    -
    - -
    - MessageDriven Bean - - The javaee5-earsample application provides a MessageDriven - bean, aka an EJB that receives - JMS messages. A MDB does not - have a business interface, therefore, it is not exposed (through - JNDI) to application clients or other - EJBs. The only way to interact with them is to - send messages to the JMS destination they're - listening on. - - A MDB is defined using the @MessageDriven - annotation. The bean is also configured with the help of the - @ActivationConfigProperty annotations. In this case, they define the - JNDI name of the JMS - destination ("SampleQueue") and the destination - type (can be javax.jms.Queue or - javax.jms.Topic for - JMS destinations). MDBs - listening to JMS destinations need to implement - the javax.jms.MessageListener - interface. - - @MessageDriven(activationConfig={ - @ActivationConfigProperty(propertyName="destination", - propertyValue="SampleQueue"), - @ActivationConfigProperty(propertyName="destinationType", - propertyValue="javax.jms.Queue") - }) -@RunAs("earsample") -public class JMSMessageBean implements MessageListener { -This bean is also executed with the @RunAs annotation. This is needed - because (like the Initializer) it uses the Writer bean, which is a - secured bean. - - Here is the code of the MDB: - - package org.ow2.jonas.examples.ear.mdb; - -import javax.annotation.security.RunAs; -import javax.ejb.ActivationConfigProperty; -import javax.ejb.EJB; -import javax.ejb.MessageDriven; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.TextMessage; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; -import org.ow2.jonas.examples.ear.reader.LocalReader; -import org.ow2.jonas.examples.ear.writer.LocalWriter; - -/** - * The {@link JMSMessageBean} is a message driven bean activated when a JMS - * {@link Message} comes to a given Destination. - * For each new {@link Message}, this bean will create and persists a new - * {@link Book} instance. - * This MDB is annotated with {@link RunAs} because it uses a secured - * business interface. - * @author Guillaume Sauthier - */ -@MessageDriven(activationConfig={ - @ActivationConfigProperty(propertyName="destination", - propertyValue="SampleQueue"), - @ActivationConfigProperty(propertyName="destinationType", - propertyValue="javax.jms.Queue") - }) -@RunAs("earsample") -public class JMSMessageBean implements MessageListener { - - /** - * Secured business interface. - */ - @EJB - private LocalWriter writer; - - /** - * Unsecured {@link LocalReader} business interface. - */ - @EJB - private LocalReader reader; - - /** - * Called when a new JMS {@link Message} is received on the destination. - * This method will use the {@link LocalWriter} Bean interface to add - * Books to a given Author. - * @param message {@link Message} containing {@link Book} title. - * @see javax.jms.MessageListener#onMessage(javax.jms.Message) - */ - public void onMessage(final Message message) { - - // TODO to be removed - System.out.println("Received JMS Message: " + message); - - // Extract Message's text value - String text = null; - if (message instanceof TextMessage) { - TextMessage textMessage = (TextMessage) message; - try { - text = textMessage.getText(); - } catch (JMSException e) { - System.err.println("Unexpected Exception: " + e.getMessage()); - e.printStackTrace(System.err); - return; - } - } else { - // not a TextMessage, I don't know what to do with it - return; - } - - Author edition = reader.findAuthor("Editions XY"); - if (edition == null) { - edition = new Author("Editions XY"); - writer.addAuthor(edition); - } - - // Persists a new Book - Book book = new Book(text, edition); - writer.addBook(book); - - } - -} - -
    -
    - -
    - - Web Tier: Servlets - - - Servlets are the web front end of the application, that's the - presentation layer. Servlets are in charge of displaying business - objects to the user and giving them handles to act on theses data - objects. - - Following is a screenshot obtained when pressing the "View - Library Content" button on the home page: - - - - - - - - - - The servlet ExampleServlet is - used to generate the above web page. - - As it is only a presentation front end, it does not manage the - data itself. The servlet uses the Reader EJB to retrieve the content - of the model. - - The reference to the EJB is injected into the servlet in the - Java EE 5 way: using annotations. - - /** - * Link to the Local Reader bean. The bean will be injected by JOnAS. - */ - @EJB - private LocalReader readerBean; -Thousands of times easier than the old J2EE 1.4 way (InitialContext, - lookup and narrow) ! - - Here is the code of the read-only servlet:package org.ow2.jonas.examples.ear.web; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Collection; -import java.util.List; - -import javax.ejb.EJB; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; -import org.ow2.jonas.examples.ear.init.Initializer; -import org.ow2.jonas.examples.ear.reader.LocalReader; - -/** - * Defines a servlet that is accessing the two entities through a local session - * bean. - * @author Florent Benoit - */ -public class ExampleServlet extends HttpServlet { - - /** - * Serializable class uid. - */ - private static final long serialVersionUID = -3172627111841538912L; - - /** - * Link to the Local Reader bean. Bean will be injected by JOnAS. - */ - @EJB - private LocalReader readerBean; - - /** - * Link to the initializer bean. - */ - @EJB - private Initializer initializerBean; - - /** - * Called by the server (via the service method) to allow a servlet to - * handle a GET request. - * @param request an HttpServletRequest object that contains the request the - * client has made of the servlet - * @param response an HttpServletResponse object that contains the response - * the servlet sends to the client - * @throws IOException if an input or output error is detected when the - * servlet handles the GET request - * @throws ServletException if the request for the GET could not be handled - */ - @Override - public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException { - - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - out.println("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">"); - out.println("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">"); - out.println(" <head>"); - out.println(" <link type=\"text/css\" href=\"ow2_jonas.css\" rel=\"stylesheet\" id=\"stylesheet\" />"); - out.println(" <title>Ear Sample of Servlet accessing an EJB</title>"); - out.println(" </head>"); - out.println("<body style=\"background : white; color : black;\">"); - - out.println(" <div><a href=\"http://www.ow2.org\"><img src=\"img/logoOW2.png\" alt=\"logo\"/></a></div>"); - out.println(" <div class=\"logos\">"); - out.println(" <img src=\"img/tomcat.gif\" alt=\"Tomcat Logo\"/>"); - out.println(" <img src=\"img/jetty.gif\" alt=\"Jetty Logo\"/>"); - out.println(" <img src=\"img/ow_jonas_logo.gif\" alt=\"JOnAS Logo\"/>"); - out.println(" </div>"); - - out.println(" <div class=\"titlepage\">Ear sample of Servlet accessing an EJB</div>"); - - - out.println(" <div class=\"links\">"); - initAuthorBooks(out); - out.println(" <br />"); - out.println(" </div>"); - - out.println(" <div class=\"links\">"); - displayAuthors(out); - out.println(" </div>"); - - out.println(" <div class=\"links\">"); - out.println(" <form action=\"secured/Admin\" method=\"get\">"); - out.println(" <div><input type=\"submit\" value=\"Modify Library Content\"/></div>"); - out.println(" </form>"); - out.println(" </div>"); - - out.println(" <div class=\"footer\">"); - out.println(" <p>"); - out.println(" <a href=\"http://validator.w3.org/check/referer\">"); - out.println(" <img src=\"img/valid-xhtml11.png\" alt=\"Valid XHTML 1.1!\""); - out.println(" title=\"Valid XHTML 1.1!\" height=\"31\" width=\"88\" />"); - out.println(" </a>"); - out.println(" <a href=\"http://jigsaw.w3.org/css-validator/\">"); - out.println(" <img style=\"border:0;width:88px;height:31px\" src=\"img/vcss.png\""); - out.println(" title=\"Valid CSS!\" alt=\"Valid CSS!\" />"); - out.println(" </a>"); - out.println(" </p>"); - out.println(" </div>"); - - out.println("</body>"); - out.println("</html>"); - out.close(); - } - - /** - * Init list of authors/books. - * @param out the given writer - */ - private void initAuthorBooks(final PrintWriter out) { - out.println("Initialize authors and their books...<br/>"); - - try { - initializerBean.initializeEntities(); - } catch (Exception e) { - displayException(out, "Cannot init list of authors with their books", e); - return; - } - } - - /** - * Display authors. - * @param out the given writer - */ - private void displayAuthors(final PrintWriter out) { - out.println("Get authors"); - out.println("<br /><br />"); - - // Get list of Authors - List<Author> authors = null; - try { - authors = readerBean.listAllAuthors(); - } catch (Exception e) { - displayException(out, "Cannot call listAllAuthors on the bean", e); - return; - } - - // List for each author, the name of books - if (authors != null) { - for (Author author : authors) { - out.println("List of books with author '" + author.getName() + "' :"); - out.println("<ul>"); - Collection<Book> books = author.getBooks(); - if (books == null) { - out.println("<li>No book !</li>"); - } else { - for (Book book : books) { - out.println("<li>Title '" + book.getTitle() + "'.</li>"); - } - } - out.println("</ul>"); - - } - } else { - out.println("No author found !"); - } - - } - - /** - * If there is an exception, print the exception. - * @param out the given writer - * @param errMsg the error message - * @param e the content of the exception - */ - private void displayException(final PrintWriter out, final String errMsg, final Exception e) { - out.println("<p>Exception : " + errMsg); - out.println("<pre>"); - e.printStackTrace(out); - out.println("</pre></p>"); - } - -} - - - The web application allows the user to change the model's - content (ie add new Authors to the list of managed authors). This - time, this is a write-like operation, so security is required to - restrict unauthorized users from changing the model. - - - - - - - - - - - - This behaviour is achieved through some additions into the - WEB-INF/web.xml: - - <servlet> - <servlet-name>AdminServlet</servlet-name> - <servlet-class>org.ow2.jonas.examples.ear.web.AdminServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>AdminServlet</servlet-name> - <url-pattern>/secured/*</url-pattern> - </servlet-mapping> - - <security-constraint> - <web-resource-collection> - <web-resource-name>Protected Area</web-resource-name> - <!-- Define the context-relative URL(s) to be protected --> - <url-pattern>/secured/*</url-pattern> - <!-- If you list http methods, only those methods are protected --> - <http-method>DELETE</http-method> - <http-method>GET</http-method> - <http-method>POST</http-method> - <http-method>PUT</http-method> - </web-resource-collection> - <auth-constraint> - <!-- Anyone with one of the listed roles may access this area --> - <role-name>earsample</role-name> - </auth-constraint> - </security-constraint> - - <!-- Default login configuration uses BASIC authentication --> - <login-config> - <auth-method>BASIC</auth-method> - <realm-name>JOnAS Realm</realm-name> - </login-config> - - <!-- Security roles referenced by this web application --> - <security-role> - <role-name>earsample</role-name> - </security-role> -By defining a <security-constraint> element, - the web developer has decided to protect a given - <url-pattern> (matching the servlet's - mapping). Protection means that only authenticated users with the - earsample <role-name> may - access that page. - - Then, once the user has authenticated himself (assuming he has - the earsample role), he will be able to access the - web page, allowing changes to the model: - - - - - - - - - - -
    - -
    - - Application Clients - - - The Java EE 5 EAR Sample provides multiple application clients - (AC) showing how to interact with the application - in different ways, and under different security levels: - - - - Not Secured AC: this client uses the - Mailer and Reader bean, using the Reader, it displays the - Authors and Books, and using the Mailer bean, it sends a mail - with an equivalent content. - - - - JAAS Secured AC: this clients shows - usage of JAAS authentication. It uses the - Writer bean, which required a user with the - "earsample" role, to insert new Authors and - Books. - - - - JMS AC: this client mainly interacts - with a dedicated JMS Queue to sends Book - creation orders, then it waits some times and uses the Reader - bean to see if the new Books were persisted. - - - -
    - Not Secured Application Client - - This AC uses 3 beans that are freely available for anonymous - usage: Initializer, Reader and Mailer. - - The Client can be launched using the following command - line: - - >$ jclient -nowsgen $JONAS_BASE/deploy/javaee5-earsample.ear -jarClient not-secured-application-client.jar -ClientContainer.info : Use the application client -'/tmp/client-deployer-coqp/EARDeployableImpl/javaee5-earsample.ear/not-secured-application-client.jar' -of the Ear 'file:/tmp/client-deployer-coqp/EARDeployableImpl/javaee5-earsample.ear/'. - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -OW2 JOnAS :: EAR Sample :: Not Secured Application Client -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Initialization ... Done. -Get the RemoteReader Bean reference: org.ow2.jonas.examples.ear.reader.ReaderBean_org.ow2.jonas.examples.ear.reader.RemoteReader/7735352 -List of authors, and their books: - * Honore de Balzac - -> Le Pere Goriot [id: 1] - -> Les Chouans [id: 2] - * Victor Hugo - -> Les Miserables [id: 3] - -> Notre-Dame de Paris [id: 4] -List of books: - * Le Pere Goriot [Honore de Balzac] - * Les Chouans [Honore de Balzac] - * Les Miserables [Victor Hugo] - * Notre-Dame de Paris [Victor Hugo] -Get the Mailer Bean reference: org.ow2.jonas.examples.ear.mail.MailerBean_org.ow2.jonas.examples.ear.mail.Mailer/7735352 -Success. - - - The Initializer, Mailer and Reader beans are get via - annotation based injection (no JNDI lookup is necessary). - - @EJB -RemoteReader reader; - - - - - By default, a mail displaying the library content is sent to - the ${user.name}@localhost address. This value - can be changed by adding another mail address into the command - line: - - >$ jclient -nowsgen $JONAS_BASE/deploy/javaee5-earsample.ear \ - -jarClient not-secured-application-client.jar someone@somewhere.org - - An example of e-mail - - --------------------------------------------------- - OW2 JOnAS EAR Sample Mailer Bean. ---------------------------------------------------- -Generated the Wed May 21 16:58:57 CEST 2008 - -List of all registered Authors (3) and their Books: - * Honore de Balzac [1] - - Le Pere Goriot[1] - - Les Chouans[2] - * Victor Hugo [2] - - Les Miserables[3] - - Notre-Dame de Paris[4] - -List of all registered Books: - * Le Pere Goriot[Honore de Balzac] - * Les Chouans[Honore de Balzac] - * Les Miserables[Victor Hugo] - * Notre-Dame de Paris[Victor Hugo] - -Enjoy your new JOnAS ! - - -- JOnAS Team - - - - Here is the not secured application client - code:package org.ow2.jonas.examples.ear.client; - -import java.io.PrintStream; -import java.util.Collection; -import java.util.List; - -import javax.ejb.EJB; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; -import org.ow2.jonas.examples.ear.init.Initializer; -import org.ow2.jonas.examples.ear.mail.Mailer; -import org.ow2.jonas.examples.ear.reader.RemoteReader; - -/** - * Simple Application Client. - * @author Guillaume Sauthier - */ -public final class NotSecuredApplicationClient { - - /** - * Empty default constructor for utility class. - */ - private NotSecuredApplicationClient() { - - } - - /** - * Link to the initializer bean. - */ - @EJB - static private Initializer initializerBean; - - /** - * Link to the Remote Reader bean. Bean will be injected by JOnAS. - */ - @EJB - static private RemoteReader readerBean; - - /** - * Link to the Mailer bean. Bean will be injected by JOnAS. - */ - @EJB - static private Mailer mailerBean; - - - /** - * @param args Command line arguments - * - */ - public static void main(final String[] args) { - - PrintStream out = System.out; - - // Print Header - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("OW2 JOnAS :: EAR Sample :: Not Secured Application Client "); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - - // Init datas if needed - out.print("Initialization ... "); - initializerBean.initializeEntities(); - out.println("Done."); - - - out.println("The RemoteReader Bean reference is : " + readerBean); - - // List registered authors and their books - out.println("List of authors, and their books:"); - // retrieve again the authors list (now it has been initialized) - List<Author> authors = readerBean.listAllAuthors(); - for (Author author : authors) { - out.println(" * " + author.getName()); - Collection<Book> books = author.getBooks(); - for (Book book : books) { - out.println(" -> " + book.getTitle() + " [id: " + book.getId() + "]"); - } - } - - // Only list registered books - List<Book> books = readerBean.listAllBooks(); - out.println("List of books:"); - for(Book book : books) { - out.println(" * " + book.getTitle() + " [" + book.getAuthor().getName() + "]"); - } - - // Use the Mailer bean to send - // Use the first command line argument as a mail address. - // Fall back to a reasonable default ${user.name}@localhost - String address = System.getProperty("user.name") + "@localhost"; - if (args.length > 0) { - // Got an argument, use it ... - address = args[0]; - } - - out.println("The Mailer Bean reference is : " + mailerBean); - - // Call the Mailer bean to send the expected e-mail. - mailerBean.sendStatusMail(address); - - // OK, we're done - out.println("Success."); - - } -} - -
    - -
    - JAAS Secured Application Client - - This AC is secured using JAAS. It means that the client will - be authenticated at startup. - - The Client can be launched using the following command - line: - - >$ jclient -nowsgen $JONAS_BASE/deploy/javaee5-earsample.ear -jarClient jaas-secured-application-client.jar -ClientContainer.info : Use the application client -'/tmp/client-deployer-sauthieg/EARDeployableImpl/javaee5-earsample.ear/jaas-secured-application-client.jar' -of the Ear 'file:/tmp/client-deployer-sauthieg/EARDeployableImpl/javaee5-earsample.ear/'. -ClientContainer.info : Using the login/password specified in the jonas-client.xml file with a specific CallbackHandler -ClientContainer.info : Using JAAS loginContext 'javaee5-earsample' -from the file 'jar:file:/tmp/client-deployer-sauthieg/EARDeployableImpl/javaee5-earsample.ear/jaas-secured-application-client.jar!/jaas.config'. -ClientContainer.info : Starting client... -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -OW2 JOnAS :: EAR Sample :: Secured Application Client -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Initialization ... Done. -Get the RemoteReader Bean reference: org.ow2.jonas.examples.ear.reader.ReaderBean_org.ow2.jonas.examples.ear.reader.RemoteReader/7735352 -List of authors, and their books: - * Honore de Balzac - -> Le Pere Goriot [id: 1] - -> Les Chouans [id: 2] - * Victor Hugo - -> Les Miserables [id: 3] - -> Notre-Dame de Paris [id: 4] -Get the RemoteWriter Bean reference: org.ow2.jonas.examples.ear.writer.WriterBean_org.ow2.jonas.examples.ear.writer.RemoteWriter/7735352 -Created a new Author: -org.ow2.jonas.examples.ear.entity.Author[id=0, name=Emile Zola] -Updated authors' list: - * Honore de Balzac - -> Le Pere Goriot [id: 1] - -> Les Chouans [id: 2] - * Victor Hugo - -> Les Miserables [id: 3] - -> Notre-Dame de Paris [id: 4] - * Emile Zola - -> Germinal [id: 45] - -> La Bete Humaine [id: 46] -Cleaned added Author. -Success. - - - This AC has been configured to use the LoginCallbackHandler. - The CallbackHandler will be configured by JOnAS to use the - jonas/jonas username and password pair. So, nothing has to be done - to provide a password interactively. - - - META-INF/application-client.xml - - <application-client - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/application-client_5.xsd" - version="5"> - <display-name>OW2 JOnAS :: EAR Sample :: Secured Application Client</display-name> - <callback-handler>org.ow2.jonas.security.auth.callback.LoginCallbackHandler</callback-handler> -</application-client> - - META-INF/jonas-client.xml - - <jonas-client xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://jonas.ow2.org/ns/jonas-client_5_0.xsd" > - - <jonas-security> - <jaasfile>jaas.config</jaasfile> - <jaasentry>javaee5-earsample</jaasentry> - <username>jonas</username> - <password>jonas</password> - </jonas-security> - -</jonas-client> - - - jaas.config - - javaee5-earsample { - // Login Module to use for the example javaee5-earsample. - - // First, use a LoginModule for the authentication - // Use the resource memrlm_1 - org.ow2.jonas.security.auth.spi.JResourceLoginModule required - resourceName="memrlm_1" - ; - - // Use the login module to propagate security to the JOnAS server - org.ow2.jonas.security.auth.spi.ClientLoginModule required - ; -}; - The CallbackHandler is - configured using the jonas-security element: it - will load the specified JAAS configuration file - (jaas.config), then load the entry named - javaee5-earsample and will create a dedicated - LoginModule chain. The - ClientContainer will then configure the - CallbackHandler to provide a - specified username and password when requested by the - LoginModules. - - As the authentication is done by the ClientContainer at - startup, there are no security concerns in the code. The - ClientContainer guarantees that if this code is executed, it is run - by an authenticated user. If the user could not authenticate, the - ClientContainer will exit before running the real client's - code. - - -package org.ow2.jonas.examples.ear.client; - -import java.io.PrintStream; -import java.util.Collection; -import java.util.List; -import java.text.MessageFormat; - -import javax.ejb.EJB; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; -import org.ow2.jonas.examples.ear.init.Initializer; -import org.ow2.jonas.examples.ear.reader.RemoteReader; -import org.ow2.jonas.examples.ear.writer.RemoteWriter; - -/** - * Simple Application Client. - * @author Guillaume Sauthier - */ -public final class SecuredApplicationClient { - - /** - * Empty default constructor for utility class. - */ - private SecuredApplicationClient() { - - } - - /** - * Link to the initializer bean. - */ - @EJB - static private Initializer initializerBean; - - /** - * Link to the Remote Reader bean. Bean will be injected by JOnAS. - */ - @EJB - static private RemoteReader readerBean; - - /** - * Link to the Remote Writer bean. Bean will be injected by JOnAS. - */ - @EJB - static private RemoteWriter writerBean; - - /** - * @param args Command line arguments - * - */ - public static void main(final String[] args) { - - PrintStream out = System.out; - - // Print Header - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("OW2 JOnAS :: EAR Sample :: Secured Application Client "); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - // Init. data if needed - out.print("Initialization ... "); - initializerBean.initializeEntities(); - out.println("Done."); - - out.println("The RemoteReader Bean reference is: " + readerBean); - - // List registered authors and their books - out.println("List of authors, and their books:"); - // retrieve again the authors list (now it has been initialized) - List<Author> authors = readerBean.listAllAuthors(); - for (Author author : authors) { - out.println(" * " + author.getName()); - Collection<Book> books = author.getBooks(); - for (Book book : books) { - out.println(MessageFormat.format(" -> {0} [id: {1}]", book.getTitle(), book.getId())); - } - } - - // Use the secured Bean (RemoteWriter) - // ====================================== - out.println("Get the RemoteWriter Bean reference: " + writerBean); - - // Add another author, and some books - Author zola = new Author("Emile Zola"); - Book germinal = new Book("Germinal", zola); - Book beteHumaine = new Book("La Bete Humaine", zola); - zola.getBooks().add(germinal); - zola.getBooks().add(beteHumaine); - - // Display Author before storage - out.println("Created a new Author: "); - out.println(zola.toString()); - - // Persists - writerBean.addAuthor(zola); - - // See the new content - out.println("Updated authors' list:"); - authors = readerBean.listAllAuthors(); - for (Author author : authors) { - out.println(" * " + author.getName()); - Collection<Book> books = author.getBooks(); - for (Book book : books) { - out.println(MessageFormat.format(" -> {0} [id: {1}]", book.getTitle(), book.getId())); - } - } - - // Remove Zola (and its books), so that next time the client - // is executed, we can add them again. - writerBean.removeAuthor(zola); - out.println("Cleaned added Author."); - out.println("Success."); - - } -} - -
    - -
    - JMS Application Client - - This AC demonstrates how to connect a client to the - application using JMS instead of using - RMI EJB objects. - - The Client can be launched using the following command - line: - - >$ jclient -nowsgen $JONAS_BASE/deploy/javaee5-earsample.ear -ClientContainer.warn : There are 3 clients in this ear, choosing the first one : jms-application-client.jar -ClientContainer.info : Use the application client '/tmp/client-deployer-sauthieg/EARDeployableImpl/javaee5-earsample.ear/jms-application-client.jar' -of the Ear 'file:/tmp/client-deployer-sauthieg/EARDeployableImpl/javaee5-earsample.ear/'. -ClientContainer.info : Starting client... -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -OW2 JOnAS :: EAR Sample :: Messager Application Client -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Initialization ... Done. -Sended creation order for 'Encyclopedia Universalis Vol.0' -Sended creation order for 'Encyclopedia Universalis Vol.1' -Sended creation order for 'Encyclopedia Universalis Vol.2' -Sended creation order for 'Encyclopedia Universalis Vol.3' -Sended creation order for 'Encyclopedia Universalis Vol.4' -Sended creation order for 'Encyclopedia Universalis Vol.5' -Sended creation order for 'Encyclopedia Universalis Vol.6' -Sended creation order for 'Encyclopedia Universalis Vol.7' -Sended creation order for 'Encyclopedia Universalis Vol.8' -Sended creation order for 'Encyclopedia Universalis Vol.9' -Wait for 2500 ms... -Get Reader Bean ... - * Honore de Balzac - -> Le Pere Goriot [id: 1] - -> Les Chouans [id: 2] - * Victor Hugo - -> Les Miserables [id: 3] - -> Notre-Dame de Paris [id: 4] - * Editions XY - -> Encyclopedia Universalis Vol.0 [id: 5] - -> Encyclopedia Universalis Vol.1 [id: 6] - -> Encyclopedia Universalis Vol.2 [id: 7] - -> Encyclopedia Universalis Vol.3 [id: 8] - -> Encyclopedia Universalis Vol.4 [id: 9] - -> Encyclopedia Universalis Vol.5 [id: 10] - -> Encyclopedia Universalis Vol.6 [id: 11] - -> Encyclopedia Universalis Vol.7 [id: 12] - -> Encyclopedia Universalis Vol.8 [id: 13] - -> Encyclopedia Universalis Vol.9 [id: 14] -Success. - - - The client acts as a message producer: it retrieves a - JMS Queue object - (named SampleQueue) and a JMS - QueueConnectionFactory. Then, it uses - both to send asynchronous messages to the server. - - Each message represents a book registration order and contains - the name of the Book to create. - - On the application's side (in other words, on the server), - there is a dedicated MessageDrivenBean (see the ), that will be invoked for all the - JMS messages received by the - Queue. - - Usage of JMS objects have to be declared in - standard and specific deployment descriptors (using - resource-ref and/or - resource-env-ref, respectively - jonas-resource and/or - jonas-resource-env) - - This JMS example shows how to use resource injection via - @Resource annotation (see JMS client code below). - - - META-INF/application-client.xml - - <application-client - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/application-client_5.xsd" - version="5"> - - <display-name>OW2 JOnAS :: EAR Sample :: JMS Application Client</display-name> - - <!-- The JMS ConnectionFactory to use --> - <resource-ref> - <res-ref-name>jms/QueueConnectionFactory</res-ref-name> - <res-type>javax.jms.QueueConnectionFactory</res-type> - <res-auth>Container</res-auth> - </resource-ref> - - <!-- The JMS Queue where Messages will be send --> - <resource-env-ref> - <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name> - <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type> - </resource-env-ref> - -</application-client> - - META-INF/jonas-client.xml - - <jonas-client xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://jonas.ow2.org/ns/jonas-client_5_0.xsd" > - <jonas-resource> - <res-ref-name>jms/QueueConnectionFactory</res-ref-name> - <jndi-name>JQCF</jndi-name> - </jonas-resource> - - <jonas-resource-env> - <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name> - <jndi-name>SampleQueue</jndi-name> - </jonas-resource-env> -</jonas-client> - - Here is the code of the JMS client:package org.ow2.jonas.examples.ear.client; - -import java.io.PrintStream; -import java.util.Collection; -import java.util.List; -import java.text.MessageFormat; - -import javax.jms.*; -import javax.ejb.EJB; -import javax.annotation.Resource; - -import org.ow2.jonas.examples.ear.entity.Author; -import org.ow2.jonas.examples.ear.entity.Book; -import org.ow2.jonas.examples.ear.init.Initializer; -import org.ow2.jonas.examples.ear.reader.RemoteReader; - -/** - * This application-client shows usage of JMS destinations to - * interact with the server-side application. - * @author Guillaume Sauthier - */ -public final class JMSApplicationClient { - - /** - * Number of Books to be created. - */ - private static final int ITERATION_NUMBER = 10; - - /** - * Link to the initializer bean. - */ - @EJB - private static Initializer initializerBean; - - /** - * JMS conectionFactoery - */ - // Resource injection - @Resource(mappedName="JQCF") - private static ConnectionFactory factory; - - /** - * JMS Queue SampleQueue - */ - // Resource injection - @Resource(mappedName="SampleQueue") - private static Queue queue; - - - /** - * Link to the Remote Reader bean. Bean will be injected by JOnAS. - */ - @EJB - static private RemoteReader readerBean; - - /** - * Empty default constructor for utility class. - */ - private JMSApplicationClient() { - - } - - /** - * @param args Command line arguments - * @throws Exception JMS - */ - public static void main(final String[] args) throws Exception { - - PrintStream out = System.out; - - // Print Header - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("OW2 JOnAS :: EAR Sample :: Messager Application Client "); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - - - - - // Init. data if needed - out.print("Initialization ... "); - - initializerBean.initializeEntities(); - out.println("Done."); - - // Send Book creation Messages - Connection connection = factory.createConnection(); - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageProducer messageProducer= session.createProducer(queue); - - for (int i = 0; i < ITERATION_NUMBER; i++) { - String title = "Encyclopedia Universalis Vol." + i; - Message message = session.createTextMessage(title); - messageProducer.send(message); - out.println("Sended creation order for '" + title + "'"); - } - - // Close JMS objects - messageProducer.close(); - session.close(); - connection.close(); - - // Wait for some time ... - // Remember JMS is for asynchronous messages :) - final long period = 2500; - out.println(MessageFormat.format("Wait for {0} ms...", period)); - Thread.sleep(period); - - out.println(MessageFormat.format("The RemoteReader Bean reference is: {0}", readerBean)); - // List Authors and Books - List<Author> authors = readerBean.listAllAuthors(); - for (Author author : authors) { - out.println(MessageFormat.format(" * {0}", author.getName())); - Collection<Book> books = author.getBooks(); - for (Book book : books) { - out.println(MessageFormat.format(" -> {0} [id: {1}]", book.getTitle(), book.getId())); - } - } - - out.println("Success."); - - } -} - -
    -
    - -
    - - EAR - - - The javaee5-earsample.ear file is the - enterprise archive wrapping all the Java EE modules into only one - deployment unit. - - The EAR is all about packaging: there is no code and no - resources (eg, classes, ...) directly inside of the .ear. - - Here is an overview of the ear structure: - - javaee5-earsample.ear: - META-INF/application.xml - ejb3.jar - javaee5-earsample.war - jms-application-client.jar - not-secured-application-client.jar - jaas-secured-application-client.jar - - - Optional, inner jars can be discovered with .ear - introspection - - - - The jar file containing the EJB3 - - - - The Web Application archive - - - - The Application Client using JMS to interact with the - application - - - - The Application Client using the Reader EJB without - security - - - - The Application Client using the Reader and Writer EJBs - after being authenticated with JAAS - - -
    -
    -
    - - - - Download and installation instructions - - -
    - - Where can I find JOnAS? - - - The latest stable binary version can be found on the JOnAS site. - - The binary versions and sources are available at this site. - - The - project is developped using SVN. All information for - getting or browsing the source code can be found here. -
    - -
    - - How can I download JOnAS? - - - The JOnAS - download page offers links to easily download . -
    - -
    - - How can I install JOnAS? - - - The JOnAS distribution can be downloaded as a .tar.gz or .zip - file. - - The installation process simply consists of unzipping the - downloaded .tar.gz file. - - To install using the .tar.gz file, select a location for JOnAS - installation, for example your_install_dir, and point to it. - - - - Unix platforms - - bash> tar -zxvf <jonas-file-name>.tar.gz - jonas-full-5.x.y/ - jonas-full-5.x.y/conf/ - jonas-full-5.x.y/examples/ - jonas-full-5.x.y/examples/javaee5-earsample/ - jonas-full-5.x.y/examples/javaee5-earsample/etc/ -... - - - - Be aware that if the same version of JOnAS has already been - unpacked in the same directory, the new installation will - overwrite previous files, and configuration files that have been - customized may be lost. In this case, it is recommended that these - files be saved before re-starting the installation process. - - - - - Windows platforms - - If the .zip file format - was downloaded, you must use a utility program such as WinZip or - IZArc to extract the - files from the archive. - - -
    - -
    - - Pre-requisites - - - To be sure can be used, the following products - must be installed: - - - - a J2SE SDK 1.5 Java virtual machine - - Any J2SE certified java platform may be used to run - . - - The most commonly used is SUN's (Java - 2 Platform, Standard Edition), but there are others, such as - BEA - JRockit, IBM - developper kits or other free/open source certified - implementations. - - - - Ant 1.7 and BCEL - - The binary version of Ant 1.7 must be downloaded from the - Apache Ant - web site and installed - - bash> tar -jxvf apache-ant-1.7.0-bin.tar.bz2 -or -bash> unzip apache-ant-1.7.0-bin.zip - - Set the ANT_HOME environment variable and update the - path: - - on Unix platforms: -bash> export ANT_HOME=<Ant Installation Directory> -bash> PATH=$PATH;$ANT_HOME/bin - -on Windows: -C:> set PATH=%ANT_HOME%/bin;%PATH% - - bcel-5.1.tar.gz must be dowloaded from - the Apache - Jakarta web site. The bcel-5.1.jar must be installed in the - $ANT_HOME/lib/ - directory. - - -
    -
    - - - - JOnAS 5 distribution description - - - Here we describe the directory tree you get under your installation - directory (JONAS_ROOT environment). - - - - - - - Glossary - - - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto.xml b/jonas_doc/core/src/docbook/doc-en/howto.xml deleted file mode 100644 index 49ae090cb0f0b9133579de650615f0ee434d844e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - JOnAS "Howto" Documents - - - - JOnAS Team - - - - - Durieux - - Philippe - - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 consortium - - - March 2009 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/howto_addons.xml b/jonas_doc/core/src/docbook/doc-en/howto_addons.xml deleted file mode 100644 index 1b1932b8a5ec8df521f063fd0bdb7c9018fe890b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_addons.xml +++ /dev/null @@ -1,269 +0,0 @@ - - - - JOnAS Add-ons - -
    - What is an Add-on? - - - An Add-on is a package which can embeded every deployables (OSGi bundles, configurations, configadmin files, JavaEE - applications, deployment plans, datasources, drivers, etc..). For example an add-on could assemble into one package all - resources of a service. -
    - -
    - How to create a new Add-on? - - - An Add-on is a ZIP archive (without the parent directory) or a directory with the following structure: - - conf/ - deploy/ - META-INF/jonas-addon.xml - - - - - conf directory - optional. It should contain all configurations file of the add-on. - - - deploy directory - optional. It should contain all deployables (OSGi bundles, configadmin files, JavaEE - applications, deployment plans, datasources, drivers) of the add-on. - - - the metadata file - mandatory. Specifies the - metadata of the addon. - - - - - - - JOnAS Add-on metadata file - <jonas-addon xmlns="http://jonas.ow2.org/ns/jonas-addon/1.0"> - - <name>tomcat6</name> - - <description>Tomcat6 Addon</description> - - <author>The JOnAS Team</author> - - <licence>LGPL</licence> - - <jonas-version>[5.3.0-M6-SNAPSHOT]</jonas-version> - - <autostart>true</autostart> - - <jvm-version>[1.0,2.0]</jvm-version> - - <repositories> - <repository>http://my.repositories.com</repository> - </repositories> - - <provides>jonas.service.tomcat6</provides> - - <requirements/> - - <properties> - <jonas.service.web.class>org.ow2.jonas.web.tomcat6.Tomcat6Service</jonas.service.web.class> - <jonas.service.web.parsingwithvalidation>true</jonas.service.web.parsingwithvalidation> - <jonas.service.web.ondemand.enabled>true</jonas.service.web.ondemand.enabled> - <jonas.service.web.ondemand.redirectPort>0</jonas.service.web.ondemand.redirectPort> - </properties> - - - - - - name element - mandatory. Specifies the name of the add-on. It should be unique. - Configuration files of - an add-on will be unpacked in the JONAS_BASE/conf/${addon.name} directory. - - - - description element - optional. Specifies the description of the add-on. - - - - author element - mandatory. Specifies the author of the addon. - - - - licence element - mandatory. Specifies the licence of the addon. - - - - jonas-version element - mandatory. Defines required JOnAS version range. - - - - autostart element - mandatory. Specifies the autostart property. If set to false, the - addon'll be just installed. - - - - jvm-version element - mandatory. Defines required JVM version range. - - - - repositories element - optional. Specifies the list of repositories that can be used - to resolve dependencies between add-ons. - - - - repository element - optional. Should contains a URL to a repository which can be - used by the resolver. - - - - provides element - mandatory. Provides properties for the resolver. - - - - requirements element - mandatory. Requirements properties for the resolver. - - - - properties element - optional. Properties of an OSGi service. - - - - - See the XML Schema for the full - structure of this XML file. - -
    - -
    - How to install / uninstall an Add-on? - - - Two ways to install / uninstall a new add-on: - - - 1) Put/Remove the add-on under the deployment directory (JONAS_BASE/deploy). - - - 2) Using the add-on manager. - To complete - - - - - - The installation of the add-on will be successful - - - if the addon metadata file is correct. - - - if the name of the add-on is unique. - - - if the deployment of all deployables of the add-ons is a success. - - - if the JVM version of the JOnAS server is consistent with the required JVM version range specified in the - metadata file. - - - if the version of the JOnAS server is consistent with the required JOnAS version range specified in the - metadata file. - - - if requirements properties have been resolved. - - - -
    - -
    - The Add-on resolver - - - To do - -
    - -
    - How to build a JOnAS 'a la carte' ? - - - To do - -
    - -
    - How to convert a JOnAS service into an Add-on? - -
    - IAddonConfig API - - The Addon service provide a simple API which allow your specific service to access to its configuration files - and to access to the directory where they have been installed. - -/** - * Allow to retrieve configuration files of an Addon - * @author Jeremy Cazaux - */ -public interface IAddonConfig { - - /** - * @param fileName The name of the resource to retrieve - * @return the resource to retrieve - */ - File getConfigurationFile(String fileName); - - /* - * @return the configuration directory of an Addon - */ - File getConfigurationDirectory(); -} - - -
    - -
    - iPOJO component descriptor - - In order to use this API, you just need to update your iPOJO component descriptor. It must required the associated - IAddonConfig component. To achieve this, you should use an LDAP filter in the service requirement description with - the name 'addon' and the value equals to the value of your metadata name element. - - - -<?xml version="1.0" encoding="UTF-8"?> - <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="org.apache.felix.ipojo" - xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/1.6.0/core.xsd" > - - <component classname="org.ow2.jonas.myService" - immediate="false"> - - ... - - <requires optional="false" - specification="org.ow2.jonas.addon.deploy.api.config.IAddonConfig" - aggregate="false" - filter="(addon=myService)"> - <callback type="bind" method="registerAddonConfig" /> - <callback type="unbind" method="unregisterAddonConfig" /> - </requires> - </component> - - </ipojo> - - -
    - -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_auditListening.xml b/jonas_doc/core/src/docbook/doc-en/howto_auditListening.xml deleted file mode 100644 index d988e7dcc699e5515869def992d6fc7b44ea5480..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_auditListening.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - Add dispatcher for a new type of Event to audit - -
    - Introduction - - Currently, there are 4 event types on JOnAS : WEB, EJB, JAXWS, JNDI. - To add a new event type on JOnAS Audit, follow these instructions : -
    - -
    - Create a new audit report - - JOnAS audit works with a special type of event. To create a new - event report, create a new class which implements - org.ow2.util.auditreport.impl. GenericAuditReport . Put on it informations that - you want to send. You can draw one's inspiration from - org.ow2.util.auditreport.impl. WebInvocationAuditReport . -
    - -
    - Catch the EventService - - The org.ow2.util.event.impl. EventService is the heart of JOnAS - Audit. You will send on it your report and every listener which are - registered will receive your report. - - To catch the event Service there are several possilbilities - according to environment : - - - - By annotations - - - - OSGi : @OSGiResource - - - - EJB : @EJB - - - - - - By the BundleContext (on a web application for example) - - - - Use the following code - - EventService eventService; - - try { - InitialContext ic = new InitialContext(); - BundleContext bc = (BundleContext) ic.lookup("java:comp/env/BundleContext"); - ServiceReference servRefPersist = bc.getServiceReference(IPersistenceNoSQL.class.getName()); - eventService = (IEventService) bc.getService(servRefEvent); - } catch (Exception e) { - throw new IllegalStateException("Error at constructor, impossible to catch BundleContext", e); - } - - - - - -
    - -
    - Send the report - - It is very easy now to send the report. Try to catch EventDispatcher - with the name of you choice. If you can't, create it then send on it the - event. See below : - - YouClassImplementsGenericAuditReport report; -org.ow2.util.auditreport.impl.event.Event e = new Event(report); - -if(eventService.getDispatcher("nameThatYouWant") == null) { - EventDispatcher d = new EventDispatcher(); - d.setNbWorkers(2); - d.start(); - eventService.registerDispatcher("nameThatYouWant", d); -} -eventService.getDispatcher("nameThatYouWant").dispatch(e) - - Your report is send ! -
    - -
    - Register a Listener to catch the precedent report sent - - Now, you are going to want to catch this event somewhere and it is - easy too. - - - - - - Create a class which implements org.ow2.util.event.api.IEventListener - - - - Complete methods added as below. You can adapt its as you - want - - public boolean accept(IEvent event) - return true; -} - -public EventPriority getPriority() { - return EventPriority.SYNC_NORM; -} - -public void handle(IEvent event) { - YouClassImplementsGenericAuditReport report = ((Event) event).getReport(); -} - - - - Register you class as Listener of you dispatcherpublic registerListener() { - eventService.registerListener(this, "nameThatYouWant"); - //You can register this listener for different dispatcher, just concatenate dispatcher name with a pipe ( | ) without space between name. -} -public unregisterListener() { - eventService.unregisterListener(this); -} - - - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_auditPersistence.xml b/jonas_doc/core/src/docbook/doc-en/howto_auditPersistence.xml deleted file mode 100644 index f842e6a5695b7f9a766d16dab20ca3f8b2709ac6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_auditPersistence.xml +++ /dev/null @@ -1,644 +0,0 @@ - - - Create a audit persistence on JOnAS with HBase (NoSQL) - -
    - Introduction - - Currently, there are 4 event types on JOnAS : WEB, EJB, JAXWS, JNDI - that you can persiste on HBase. In this HOWTO, you will create a Hadoop - and HBase cluster, there isn't any HOWTO to create this on a standalone - mode. - - Create a cluster is a very good thing to separate informations and - to obtain a low time wait to research with a very large base. - Nevertheless, a cluster is costly (several machines) and not really - interesting below 10 machines on the cluster. - - This HOWTO works with the following versions : - - JAVA JDK 6 - - Hadoop 1.0.3 - - HBase 0.92.1 - - Zookeeper 3.3.5 -
    - -
    - Create a Hadoop Cluster to obtain an HDFS (Hadoop Distributed File - System) - - - - Download Java - - - - Extract file - - - - Place environment variable JAVA_HOME - - export JAVA_HOME=~/yourPathToJavaJDK-6 - - - - Download Hadoop - - - - Extract file - - - - Put it on each machine of the cluster. - - - - Place environment variable HADOOP_HOME on each machine - - export HADOOP_HOME=~/yourPathToHadoop - - - - Choice which machine will be the master (NameNode), all others - will be slaves (DataNode) - - A NameNode can be a DataNode too but not really - recommanded - - - - On NameNode and DataNodes - - - - Open conf/hadoop-env.sh - - - - Delete # in front of "JAVA_HOME" and set exactly same as - previously - - - - - - On NameNode - - - - Open conf/masters - - - - Write localhost if it's not already done - - - - - - Open conf/slaves - - - - Write all ip (or name if these ip are defined on - /etc/hosts) of DataNodes (one per line) - - - - - - Open conf/core-site.xml - - - - Complete file as below replacing HERE by ip (or host) of - the NameNode. Localhost could work but it's not tested. - - <configuration> - <property> - <name>fs.default.name</name> - <value>hdfs://HERE:54310</value> - <final>true</final> - </property> -</configuration> - - - - - - Open conf/mapred-site.xml - (configuration of Map/Reduce) - - - - Complete file as below replacing HERE by ip (or host) of - the NameNode. - - A JobTracker can be an other machine than NameNode but - to simplify here it's merge. - - You can also change port 54311 as you want, it's just - for example. - - - - <configuration> - <property> - <name>mapred.job.tracker</name> - <value>HERE:54311</value> - <final>true</final> - </property> - - <property> - <name>mapred.local.dir</name> - <value>Select Your Directory</value> - </property> - - <property> - <name>mapred.system.dir</name> - <value>Select Your Directory</value> - <final>true</final> - </property> -</configuration> - - - - Open conf/hdfs-site.xml - - - - - Complete file as below. Suppress dfs permission to - simplify acces fr JOnAS - - <configuration> - <property> - <name>dfs.permissions</name> - <value>false</value> - </property> -</configuration> - - - - - - - - On DataNodes - - - - Open conf/masters - - - - Write ip (or host) of NameNode - - - - - - Open conf/slaves - - - - Write ip (or host) of all DataNodes including - localhostC - - - - - - Open conf/core-site.xml - - - - Complete file as below replacing HERE by ip (or host) of - the NameNode. - - To pay attention to put the same port that before in - the same part. - - <configuration> - <property> - <name>fs.default.name</name> - <value>hdfs://HERE:54310</value> - <final>true</final> - </property> -</configuration> - - - - - - - Open conf/mapred-site.xml - (configuration of Map/Reduce) - - - - Complete file as below replacing HERE by ip (or host) of - the NameNode. - - To pay attention to put the same port that before in - the same part. - - <configuration> - <property> - <name>mapred.job.tracker</name> - <value>HERE:54311</value> - </property> -</configuration> - - - - - - Open conf/hdfs-site.xml - - - - Complete file as below. Suppress dfs permission to - simplify acces fr JOnAS<configuration> - <property> - <name>dfs.permissions</name> - <value>false</value> - </property> -</configuration> - - - - - - - - To start Hadoop Cluster. - - Don't forget to create a ssh connexion between machines if - it's not already done. - - - - Open a terminal, go to HADOOP_HOME file and write - this - - bin/start-all.sh - - - - You will flash past all ip (or host) with their work - (NameNode,JobTracker,DataNode,TaskTracker) - - - - - - To stop Hadoop Cluster - - - - Open a terminal, go to HADOOP_HOME file an write this - - bin/stop-all.sh - - - - You will flash past all ip (or host) stoping one by - one - - - - - - To restart Hadoop Cluster - - - - Open a terminal, go to HADOOP_HOME file an write this - - bin/hadoop dfsadmin -safemode get - - - - If the response is not Safe mode is - OFF write this - - Hadoop Cluster works ONLY if the response is : Safe mode - is OFF - - bin/hadoop dfsadmin -safemode leave - - - - - - Watch NameNode interface - - http://ip:port/dfshealth.jsp - - ip : The namenode’s HTTP server address - - port : The namenode’s HTTP server port (default 50070) - - -
    - -
    - Create Zookeeper cluster - - - - Download Zookeeper - - - - Extract file - - - - Put this file on at least 2 machines - - - - Open conf/zoo.cfg - - - - Select your data directory - - dataDir=/yourSelectedDirectory - - - - List the whole Zookeeper cluster with this scheme : - server.numberOfServer=ip - - server.1=123.456.789.01:2888:5888 -server.2=456.789.123.02:2888:5888 -server.3=789.123.456.03:2888:5888 -[...] - - - - On each machine respect the same numberOfServer with the same - ip. - - - - Start Zookeeper - - bin/zkServer.sh start - - - - Check if Zookeeper is runing - - bin/zkServer.sh status - - - - It is running if we can see - - JMX enabled by default -Using config: ZOOKEEPER_HOME/bin/../conf/zoo.cfg -Mode: follower - - Or - - JMX enabled by default -Using config: ZOOKEEPER_HOME/bin/../conf/zoo.cfg -Mode: leader - - - - Verify that numberOfServer matches the selected ip. Go to - /yourSelectedDirectory and open myid on each machine. - - One the first machine (server.1=123.456.789.01:2888:5888 on the - example), we have to see on myid : 1 - - One the second machine (server.2=456.789.123.02:2888:5888 on the - example), we have to see on myid : 2 - - Etc. - - - - Leader and Followers - - On the Zookeeper cluster, we must have only one Leader and many - Followers. - - -
    - -
    - Create HBase cluster - - - - Download HBase - - - - Extract file - - - - Put this file on each DataNode and NameNode machines - - Each machine have to be the same login and the same url - directory for HBase - - - - On HMaster and HRegionServers (same idea that NameNode and - DataNode for Hadoop) - - - - Edit conf/hbase-env.sh - - export JAVA_HOME=~/yourPathToJavaJDK-6 -export HBASE_MANAGES_ZK=false - - HBASE_MANAGES_ZK=true to run a local HBase and skip - section 3 because HBase will create his own Zookeeper - server - - - - Edit conf/hbase-site.xml replacing HERE by ip(or host) of - the NameNode - - List onhbase.zookeeper.quorum all zookeeper ip - listed before on 3.6 - - <configuration> - <property> - <name>hbase.rootdir</name> - <value>hdfs://HERE:54310/user/yourAccount/hbase</value> - </property> - <property> - <name>hbase.defaults.for.version.skip</name> - <value>true</value> - </property> - <property> - <name>hbase.cluster.distributed</name> - <value>true</value> - </property> - <property> - <name>hbase.zookeeper.quorum</name> - <value>123.456.789.01,456.789.123.02,789.123.456.03,...</value> - </property> - <property> - <name>hbase.zookeeper.property.dataDir</name> - <value>/SelectYourSaveDirectory</value> - </property> -</configuration> - - - - - - On HMaster (Same machine that the NameNode), edit conf/regionservers and list all the HRegionServers - (on per line) - - - - On HRegionServers (Same machine that the NameNode), edit - conf/regionservers and list all the - HRegionServers (on per line) including localhost for the own ip adress - of HRegionServer - - - - Start HBase - - bin/start-hbase.sh - - - - Check if HBase is running - - bin/hbase shell - - hbase(main):001:0> status - -1 servers, 0 dead, 2.0000 average load - - - - Create the EventPath table where will be save persistence - calculations - - hbase(main):002:0> create 'EventPath','primary','secondary' - - Attention : To be very strict with the case - sensitivity - - hbase(main):003:0> list - -TABLE -EventPath -1 row(s) in 0.0470 seconds - - hbase(main):004:0> status - -1 servers, 0 dead, 3.0000 average load - - -
    - -
    - Start persistence - - - - Start JOnAS (use -Deasybeans.useSimplePool=true if there is a - possibility to undeploy "audit-jpa-nosql"-"jpa" bundle) - - - - check out - git@gitorious.ow2.org:ow2-jonas/audit-jpa-nosql.git - - - - compile project (using Maven) - - mvn clean install - - - - Go on audit-jpa-nosql/deployment/goToZip/target/distrib - - - - There is a Zookeeper Server started on the same machine that - JOnAS will be start - - ant -DzkServer=on - - - - There is not any Zookeeper Server started on the same - machine that JOnAS will be start - - - - To open persistence.xml and modify the following - property - - <property name="datanucleus.ConnectionURL" value="hbase:ip:port" /> - - ip : The namenode’s server address - - port : The namenode’s server port - - (write on $HADOOP_HOME/conf/core-site.xml) - - - - Start - - ant - - - - - - To restore the persistence.xml used by JOnAS (works with - Zookeeper) - - ant -Drestore=on - - - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_configadmin.xml b/jonas_doc/core/src/docbook/doc-en/howto_configadmin.xml deleted file mode 100644 index b394fb822d057bcadeaf618975676d3759c41c15..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_configadmin.xml +++ /dev/null @@ -1,459 +0,0 @@ - - - Deploying OSGi<superscript>TM</superscript> Configurations - -
    - OSGi Configuration Admin - - Configuration - Admin is a specification produced by the OSGiTM - Alliance that defines how to configure OSGi services in a standard - way. - - A Configuration is basically a - Map storing key/value. Typically, a - management application query the ConfigurationAdmin service for - Configuration(s), set the appropriate key/value pairs and update the - Configuration. It is them take in charge by the ConfigurationAdmin service - that will push the configurations to the interested components. - - What is important to understand is that the - ConfigurationAdmin service is an - intermediate tier between the management application (pushing - Configurations) and the managed system (receiving Configurations). A - Configuration targets an OSGi service using - the persitent identifier of that service (PID). If the - target service is not available when the - Configuration is pushed to the - ConfigurationAdmin service, the - Configuration is put on hold and persisted - somehow until the service become available. At this moment in time, the - Configuration is restored and applied to - the managed element (the target service), it is said to be "bound to the - service". - -
    - Managed components - - Two kinds of components are recognised by ConfigurationAdmin: - ManagedService and - ManagedServiceFactory. They have to be - registered in the OSGiTM service registry - under one of theses 2 interfaces. - -
    - ManagedService - - A ManagedService is an already - existing service instance that can be configured (and updated) through - ConfigurationAdmin. - - It just have to implements the following interface (and be - exposed under it when registered as a service): - - public interface ManagedService { - /** - * Update the configuration for a Managed Service. - * @param properties A copy of the Configuration properties, or null. - */ - void updated(Dictionary properties) throws ConfigurationException; -} - - The Dictionary parameter contains - the updated configuration properties. The implementation have to look - for specific (application defined) properties and uses the queried - values for configuring its internal state. The implementation may - throw a ConfigurationException if - something goes wrong. -
    - -
    - ManagedServiceFactory - - The other kind of component is a - ManagedServiceFactory. A - ManagedServiceFactory instance will - receive Configurations not for itself, but in the goal of creating - instances (may or may not be OSGiTM - services themselves). A factory has to implement the following - interface: - - public interface ManagedServiceFactory { - /** - * Return a descriptive name of this factory. - */ - String getName(); - - /** - * Create a new instance, or update the configuration of an existing instance. - * @param pid The PID for this configuration. - * @param properties A copy of the configuration properties. - */ - void updated(String pid, Dictionary properties) throws ConfigurationException; - - /** - * Remove the factory instance associated with the PID. - * @param pid the PID of the service to be removed. - */ - void deleted(String pid); -} - - The updated() method will be called by - the ConfigurationAdmin service when it - will receive a new Configuration (or if - an existing matching Configuration has - been updated). -
    -
    - -
    - Identification - - A Configuration contains both the - configuration properties that have to be pushed to a consumer and an - identifier that the ConfigurationAdmin - service will use to find a matching component (the Configuration's - consumer). - - The identifier to use is the service PID (See Constants.SERVICE_PID) - of the component that will receive the - Configuration. -
    - -
    - Asynchronous - - Once the Configuration is updated - by the management application, everything happen asynchronously. That - means that another Thread will be used to push the - Configuration to its consumer (when a - matching factory/service will be available). -
    -
    - -
    - Usage - - JOnAS supports deploying ConfigurationAdmin Configurations through - its ConfigAdminDeployer that is an extension of the - deployment system. - - Every XML file with its root element declared within the configadmin - namespace (http://jonas.ow2.org/ns/configadmin/1.0) - will be handled by this deployer. - - - ConfigurationAdmin XML file example - - <configadmin xmlns="http://jonas.ow2.org/ns/configadmin/1.0"> - - <configuration pid="service.pid.of.a.ManagedService"> - <property name="name">Guillaume</property> - <property name="role">Developer</property> - </configuration> - - <factory-configuration pid="service.pid.of.a.ManagedServiceFactory"> - <property name="name">OW2 JOnAS</property> - <property name="category">Java EE</property> - </factory-configuration> - -</configadmin> - - - This generic format allows to produce both simple and factory - Configurations without interacting with the - ConfigurationAdmin API programmatically. The deployer handles mapping - between the XML format and the ConfigurationAdmin API model. - - - Only java.lang.String properties are - supported right now. - - Some component model convert from - java.lang.String to the desired type - automatically (acting as a type adapter between ConfigurationAdmin and - the real component), but it is not mandatory. - - -
    - Configuration - - A <configuration> element represents the - configuration to be applied to a ManagedService - instance. - - The pid attribute is the service PID of the - targeted ManagedService (match the - service.pid service property of a registered - OSGiTM service). - - Every key/value pair is expressed using a - <property> element. The name attribute denotes - (indeed) the property name used as a key in the - Configuration's - Dictionary. The text node's value is used as the - key's value. - - When the configuration XML file is undeployed, all the - Configurations are deleted, ant the - ManagedService.updated() method is called with - a null argument. The - ManagedService instance is then - responsible to take the appropriate actions. - - - Example of a <markup><configuration></markup> - - <configuration pid="service.pid.of.a.ManagedService"> - <property name="name">Guillaume</property> - <property name="role">Developer</property> -</configuration> - -
    - -
    - Factory Configuration - - A <factory-configuration> element - represents the configuration to be applied to a - ManagedServiceFactory instance. - - The pid attribute is the service PID of the - targeted ManagedServiceFactory (match the - service.pid service property of a registered - OSGiTM service). - - Every key/value pair is expressed using a - <property> element. The name - attribute denotes (indeed) the property name used as a key in the - Configuration's Dictionary. The text node's value is used as the key's - value. - - Every <factory-configuration> will trigger - the creation of a new instance by the targeted - service factory. - - When the configuration XML file is undeployed, all the created - instances are stopped and destroyed. - - - Example of a - <markup><factory-configuration></markup> - - <factory-configuration pid="org.ow2.jonas.web.tomcat7.internal.Tomcat7AjpConnector"> - <property name="address">localhost</property> - <property name="port">9011</property> -</factory-configuration> - -
    -
    - -
    - Extensibility - - JOnAS has, out of the box, a generic ConfigurationAdmin support (ie - <configuration> and - <factory-configuration>). Whilst this support can - handle everything that can be described through ConfigurationAdmin, it may - be a bit verbose and non user-friendly. - - Here are some of the drawbacks of this approach: - - - - The user have to know before hand the exact service PID to - use. - - - - Impossible to know in advance what is the set of required - properties. It's possible to push an invalid configuration for - example. - - - - Property typing: a property could be typed (Integer / String / - ...) and with a generic schema it's possible to select the wrong type - for a given property, leading to later Exceptions when the - Configuration is actually applied to the service.. - - - -
    - Expressiveness - - The extensibility layer supported by the ConfigurationAdmin - deployer allows to use different schema element inside the XML - configuration file. Theses schema will provides a dedicated - format/syntax for a specific domain, something like an XML DSL (Domain - Specific Language). - - - Mail Configuration Example - - <configadmin xmlns="http://jonas.ow2.org/ns/configadmin/1.0" - xmlns:mail="http://jonas.ow2.org/ns/configadmin/mail/1.0"> - - <!-- This syntax is provided as an example only... --> - <mail:session jndi-name="MailSession" - from="no-reply@ow2.org"> - <transport name="smtp" /> - <store name="pop3" - host="localhost" /> - </mail:session> - -</configadmin> - -
    - -
    - APIs - - The ConfigurationAdminDeployer provides a simple API for - developers to extends the initial set of supported syntaxes. - -
    - XmlConfigurationAdapter - - Most of the work is done in an - XmlConfigurationAdapter. A - XmlConfigurationAdapter is responsible - to convert a DOM Element into one or - multiple ConfigurationInfo (equivalent to the - ConfigurationAdmin Configuration - object). - - This object will be given a DOM - Element (child of the - <configadmin> root element). The adapter will - then read the XML format and produces one (or more) - ConfigurationInfo objects, each of them - representing one ConfigurationAdmin - Configuration. - - package org.ow2.jonas.configadmin; - -public interface XmlConfigurationAdapter { - - /** - * Convert the given Node into one or more ConfigurationInfo instance(s). - * @param node DOM Element to be converted - * @return Adapted ConfigurationInfo(s) - * @throws AdapterException if the Element cannot be converted into ConfigurationInfo(s) - */ - Set<ConfigurationInfo> convert(Element node) throws AdapterException; -} - -
    - -
    - XmlConfigurationAdapterRegistry - - The - XmlConfigurationAdapterRegistry - contains the adapters related to a namespace URI. - When an element from a namespace is found, the deployer select the - dedicated registry and then ask it for the adapter supporting the - current element's name. - - Each implementation of this interface has to be exposed as an - OSGi service with the 'namespace' service - property. - - package org.ow2.jonas.configadmin; - -public interface XmlConfigurationAdapterRegistry { - - /** - * Returns the adapter handling the given Xml Element local-name. - * @param name Xml Element local-name (not prefixed) - * @return the associated adapter or null if none found - */ - XmlConfigurationAdapter getAdapter(String name); -} - -
    -
    - -
    - Example - - This example will show how to add support of the - <mail:session> extension element. - - Apache - Felix iPOJO will be used to ease the implementation. - - First, start with the adapter. Its code will take care of creating - the internal ConfigurationInfo object. The - adapter knows before hand the target Service PID that will accept the - resulting configuration properties. The adapter then parse (or navigate - through) the given DOM Element and - extract the needed information from it, manipulating it if required - (type convertion for example). - - public class MailSessionAdapter implements XmlConfigurationAdapter { - - public static final String MAIL_SESSION_PID = "org.ow2...mail.Session"; - - public Set<ConfigurationInfo> convert(Element node) throws AdapterException { - - // Create an empty configuration that will store the info from Xml - // Hard-code the target PID - ConfigurationInfo info = new ConfigurationInfo(MAIL_SESSION_PID, true); - - // Transfer from Xml format into internal format - Map<String, Object> props = info.getProperties(); - props.put("jndi.name", node.getAttribute("jndi-name")); - props.put("mail.from", node.getAttribute("from")); - - Element transport = getChildElement(node, "transport"); - props.put("mail.transport.protocol", transport.getAttribute("name")); - - // Remaining parsing omitted for brevity ... - - return Collections.singleton(info); - } -} - A simple implementation choice is to perform the Xml parsing - by hand (navigating directly through the DOM structure), but it is - also possible to use other parsing technics: XPath or JAXB (useful when schema is - pre-compiled before hand). - Once the adapter is finished, it is needed to create an - XmlConfigurationAdapterRegistry. This one - is the component that will be registered as an - OSGiTM service with a - 'namespace' service property. - - @Component -@Provides -@Instantiate -public class MailAdapterRegistry implements XmlConfigurationAdapterRegistry { - - @ServiceProperty(value = "http://jonas.ow2.org/ns/example/mail") - private String namespace; - - private XmlConfigurationAdapter sessionAdapter = new MailSessionAdapter(); - - public XmlConfigurationAdapter getAdapter(String name) { - if ("session".equals(name)) { - return sessionAdapter; - } - return null; - } -} -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_deployme.xml b/jonas_doc/core/src/docbook/doc-en/howto_deployme.xml deleted file mode 100644 index 25ef3b9d3b223db73f8e2bec01d87a7264e4eb98..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_deployme.xml +++ /dev/null @@ -1,269 +0,0 @@ - - - - DeployME - -
    - What is an Add-on? - - - An Add-on is a package which can embeded every deployables (OSGi bundles, configurations, configadmin files, JavaEE - applications, deployment plans, datasources, drivers, etc..). For example an add-on could assemble into one package all - resources of a service. -
    - -
    - How to create a new Add-on? - - - An Add-on is a ZIP archive (without the parent directory) or a directory with the following structure: - - conf/ - deploy/ - META-INF/jonas-addon.xml - - - - - conf directory - optional. It should contain all configurations file of the add-on. - - - deploy directory - optional. It should contain all deployables (OSGi bundles, configadmin files, JavaEE - applications, deployment plans, datasources, drivers) of the add-on. - - - the metadata file - mandatory. Specifies the - metadata of the addon. - - - - - - - JOnAS Add-on metadata file - <jonas-addon xmlns="http://jonas.ow2.org/ns/jonas-addon/1.0"> - - <name>tomcat6</name> - - <description>Tomcat6 Addon</description> - - <author>The JOnAS Team</author> - - <licence>LGPL</licence> - - <jonas-version>[5.3.0-M6-SNAPSHOT]</jonas-version> - - <autostart>true</autostart> - - <jvm-version>[1.0,2.0]</jvm-version> - - <repositories> - <repository>http://my.repositories.com</repository> - </repositories> - - <provides>jonas.service.tomcat6</provides> - - <requirements/> - - <properties> - <jonas.service.web.class>org.ow2.jonas.web.tomcat6.Tomcat6Service</jonas.service.web.class> - <jonas.service.web.parsingwithvalidation>true</jonas.service.web.parsingwithvalidation> - <jonas.service.web.ondemand.enabled>true</jonas.service.web.ondemand.enabled> - <jonas.service.web.ondemand.redirectPort>0</jonas.service.web.ondemand.redirectPort> - </properties> - - - - - - name element - mandatory. Specifies the name of the add-on. It should be unique. - Configuration files of - an add-on will be unpacked in the JONAS_BASE/conf/${addon.name} directory. - - - - description element - optional. Specifies the description of the add-on. - - - - author element - mandatory. Specifies the author of the addon. - - - - licence element - mandatory. Specifies the licence of the addon. - - - - jonas-version element - mandatory. Defines required JOnAS version range. - - - - autostart element - mandatory. Specifies the autostart property. If set to false, the - addon'll be just installed. - - - - jvm-version element - mandatory. Defines required JVM version range. - - - - repositories element - optional. Specifies the list of repositories that can be used - to resolve dependencies between add-ons. - - - - repository element - optional. Should contains a URL to a repository which can be - used by the resolver. - - - - provides element - mandatory. Provides properties for the resolver. - - - - requirements element - mandatory. Requirements properties for the resolver. - - - - properties element - optional. Properties of an OSGi service. - - - - - See the XML Schema for the full - structure of this XML file. - -
    - -
    - How to install / uninstall an Add-on? - - - Two ways to install / uninstall a new add-on: - - - 1) Put/Remove the add-on under the deployment directory (JONAS_BASE/deploy). - - - 2) Using the add-on manager. - To complete - - - - - - The installation of the add-on will be successful - - - if the addon metadata file is correct. - - - if the name of the add-on is unique. - - - if the deployment of all deployables of the add-ons is a success. - - - if the JVM version of the JOnAS server is consistent with the required JVM version range specified in the - metadata file. - - - if the version of the JOnAS server is consistent with the required JOnAS version range specified in the - metadata file. - - - if requirements properties have been resolved. - - - -
    - -
    - The Add-on resolver - - - To do - -
    - -
    - How to build a JOnAS 'a la carte' ? - - - To do - -
    - -
    - How to convert a JOnAS service into an Add-on? - -
    - IAddonConfig API - - The Addon service provide a simple API which allow your specific service to access to its configuration files - and to access to the directory where they have been installed. - - /** - * Allow to retrieve configuration files of an Addon - * @author Jeremy Cazaux - */ - public interface IAddonConfig { - - /** - * @param fileName The name of the resource to retrieve - * @return the resource to retrieve - */ - File getConfigurationFile(String fileName); - - /* - * @return the configuration directory of an Addon - */ - File getConfigurationDirectory(); - } - - -
    - -
    - iPOJO component descriptor - - In order to use this API, you just need to update your iPOJO component descriptor. It must required the associated - IAddonConfig component. To achieve this, you should use an LDAP filter in the service requirement description with - the name 'addon' and the value equals to the value of your metadata name element. - - - - <?xml version="1.0" encoding="UTF-8"?> - <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="org.apache.felix.ipojo" - xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/1.6.0/core.xsd" > - - <component classname="org.ow2.jonas.myService" - immediate="false"> - - ... - - <requires optional="false" - specification="org.ow2.jonas.addon.deploy.api.config.IAddonConfig" - aggregate="false" - filter="(addon=myService)"> - <callback type="bind" method="registerAddonConfig" /> - <callback type="unbind" method="unregisterAddonConfig" /> - </requires> - </component> - - </ipojo> - - -
    - -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_distributed_joram.xml b/jonas_doc/core/src/docbook/doc-en/howto_distributed_joram.xml deleted file mode 100644 index 7ebe3859b854f9268c345eaf402f606a593ba259..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_distributed_joram.xml +++ /dev/null @@ -1,256 +0,0 @@ - -
    Distributed Message Beans - - - JOnAS release 4.1 dramatically simplifies the use of a distributed JORAM platform from within JOnAS servers. For example, such a configuration allows a bean hosted by JOnAS instance "A" to send messages on a JORAM queue, to which a MDB hosted by JOnAS instance "B" listens. - - - This advancement is due to the following: - - - - JORAM Resource Adapter allows a much more refined configuration than the JMS service did. - - - JORAM provides a distributed JNDI server which allows JOnAS instances to share information. - - - - Before going through this chapter, it is highly recommended that the - - JORAM Resource Adapter - - configuration guide be reviewed. - -
    Scenario and general architecture - - - The following scenario and general settings are proposed: - - - - Two instances of JOnAS are run (JOnAS "A" and JOnAS "B"). JOnAS A hosts a simple bean providing a method for sending a message on a JORAM queue. JOnAS B hosts a message-driven bean listening on the same JORAM queue. - - - Each JOnAS instance has a dedicated collocated JORAM server: server "s0" for JOnAS A, "s1" for JOnAS B. Those two servers are aware of each other. - - - The queue is hosted by JORAM server s1. - - - An additional JNDI service is provided by the JORAM servers that will be used for storing the shared information (basically, the queue's naming reference). - - -
    -
    Common configuration - - - The JORAM servers are part of the same JORAM platform described by the following - - a3servers.xml - - configuration file: - - -<?xml version="1.0"?> -<config> - <domain name="D1"/> - <server id="0" name="S0" hostname="hostA"> - <network domain="D1" port="16301"/> - <service class="org.objectweb.joram.mom.proxies.ConnectionManager" - args="root root"/> - <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" - args="16010"/> - <service class="fr.dyade.aaa.jndi2.distributed.DistributedJndiServer" - args="16400 0"/> - </server> - <server id="1" name="S1" hostname="hostB"> - <network domain="D1" port="16301"/> - <service class="org.objectweb.joram.mom.proxies.ConnectionManager" - args="root root"/> - <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" - args="16010"/> - <service class="fr.dyade.aaa.jndi2.distributed.DistributedJndiServer" - args="16400 0 1"/> - - </server> -</config> - - This configuration describes a platform made up of two servers, "s0" and "s1", hosted by machines "hostA" and "hostB", listening on ports 16010, providing a distributed JNDI service (more info on JORAM's JNDI may be found - - here - - ). - - - Each JOnAS server must hold a copy of this file in its - - conf/ - - directory. In its - - jonas.properties - - file, each must declare the - - joram_for_jonas_ra.rar - - as a resource to be deployed (and each should remove - jms - from its list of services). - -
    -
    Specific configuration - - - JOnAS A - embeds JORAM server - s0 - . The - - jonas-ra.xml - - descriptor packaged in the - - joram_for_jonas_ra.rar - - archive file must provide the following information: - - -<jonas-config-property> - <jonas-config-property-name>HostName</jonas-config-property-name> - <jonas-config-property-value>hostA</jonas-config-property-value> -</jonas-config-property> - - The other default settings do not need to be changed. - - - JOnAS B - embedds JORAM server - s1 - . The - - jonas-ra.xml - - descriptor packaged in the - - joram_for_jonas_ra.rar - - archive file must provide the following properties values: - - -<jonas-config-property> - <jonas-config-property-name>ServerId</jonas-config-property-name> - <jonas-config-property-value>1</jonas-config-property-value> -</jonas-config-property> -<jonas-config-property> - <jonas-config-property-name>ServerName</jonas-config-property-name> - <jonas-config-property-value>s1</jonas-config-property-value> -</jonas-config-property> -<jonas-config-property> - <jonas-config-property-name>HostName</jonas-config-property-name> - <jonas-config-property-value>hostB</jonas-config-property-value> -</jonas-config-property> - - The other default settings do not need to be changed. - - - The - shared queue - will be hosted by JORAM server s1. It must then be declared in the JOnAS B's - - joramAdmin.xml - - file as follows: - - - - <Queue name="sharedQueue"> - <freeReader/> - <freeWriter/> - <jndi name="scn:comp/sharedQueue"/> - </Queue> - - - The - - scn:comp/ - - prefix is a standard way to specify which JNDI provider should be used. In this case, the shared queue will be bound to JORAM's distributed JNDI server, and may be retrieved from both JOnAS A and JOnAS B. To provide this mechanism, both JOnAS servers must provide access to a standard - - jndi.properties - - file. For JOnAS A, the file looks as follows, and should be placed in its - - conf/ - - directory: - - -java.naming.factory.url.pkgs org.objectweb.jonas.naming:fr.dyade.aaa.jndi2 -scn.naming.factory.host hostA -scn.naming.factory.port 16400 - - For JOnAS B, the file looks as follows, and should be placed in the right - - conf/ - - directory: - - -java.naming.factory.url.pkgs org.objectweb.jonas.naming:fr.dyade.aaa.jndi2 -scn.naming.factory.host hostB -scn.naming.factory.port 16400 -
    -
    And now, the beans! - - - The - simple bean - on JOnAS A needs to connect to its local JORAM server and access the remote queue. The following is an example of consistent resource definitions in the deployment descriptors: - - - Standard deployment descriptor: - - -<resource-ref> - <res-ref-name>jms/factory</res-ref-name> - <res-type>javax.jms.ConnectionFactory</res-type> - <res-auth>Container</res-auth> -</resource-ref> -<resource-env-ref> - <resource-env-ref-name>jms/sharedQueue</resource-env-ref-name> - <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type> -</resource-env-ref> - - Specific deployment descriptor: - - -<jonas-resource> - <res-ref-name>jms/factory</res-ref-name> - <jndi-name>CF</jndi-name> -</jonas-resource> -<jonas-resource-env> - <resource-env-ref-name>jms/sharedQueue</resource-env-ref-name> - <jndi-name>scn:comp/sharedQueue</jndi-name> -</jonas-resource-env> - - The ConnectionFactory is retrieved from the local JNDI registry of the bean. However, the Queue is retrieved from the distributed JORAM JNDI server, because its name starts with the - scn:comp/ - prefix. It is the same queue to which the - message-driven bean - on JOnAS B listens. For doing so, its activation properties should be set as follows: - - -<activation-config> - <activation-config-property> - <activation-config-property-name>destination</activation-config-property-name> - <activation-config-property-value>scn:comp/sharedQueue</activation-config-property-value> - </activation-config-property> - <activation-config-property> - <activation-config-property-name>destinationType</activation-config-property-name> - <activation-config-property-value>javax.jms.Queue</activation-config-property-value> - </activation-config-property> -</activation-config> -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/howto_firewall.xml b/jonas_doc/core/src/docbook/doc-en/howto_firewall.xml deleted file mode 100644 index 1b956f419bb92a6ebb097e76e39d7e2961f6b2d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_firewall.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - Configuring RMI for use through a Firewall - - - By default, the RMI protocol in JOnAS uses a random port at each - startup, which implies that there is no way to configure a firewall as the - port number changes each time the system restarts. - - However you can easily configure the RMI port number by setting only - one property per protocol in the - $JONAS_BASE/conf/carol.properties file. - - To configure the RMI exported-port number, edit the - $JONAS_BASE/conf/carol.properties file to change the following - protocols from 0 (choose a random port number) to the port number you - want: - - - - For the RMI/JRMP protocol, change: carol.jrmp.server.port=0 - - - - For the RMI/IRMI protocol, change: carol.irmi.server.port=0 - - - - For the RMI/IIOP protocol, change: carol.iiop.server.port=0 - - - diff --git a/jonas_doc/core/src/docbook/doc-en/howto_install_jdbc_driver.xml b/jonas_doc/core/src/docbook/doc-en/howto_install_jdbc_driver.xml deleted file mode 100644 index 6b2226d45df56e046403f2333b62f39ff4b6d533..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_install_jdbc_driver.xml +++ /dev/null @@ -1,320 +0,0 @@ - - - - Install a JDBC driver - - - This document describes the process to transform a - JDBC driver jar file into an OSGi - bundle suitable for usage in JOnAS. - - It targets a developer audience. Some OSGi - vocabulary is used in this document. - - - This howto has been tested using - DataSource provided using a Resource - Adapter. - - -
    - Why creating an OSGi bundle ? - - JOnAS is performing an automatic bundle generation during startup - for jars found in $JONAS_ROOT/lib/ext/ and $JONAS_BASE/lib/ext/. That means that the jar - file dropped into the lib/ext/ directory will be - analyzed and appropriate entries will be added in the MANIFEST of the jar. - - - Theses new entries are OSGi related - attributes (Bundle-SymbolicName, - Bundle-ClassPath, Import-Package, - Export-Package, ...). They describe what the bundle is - (symbolic name, ...), what it requires from the system - (Import-Package) and what it gives to the system - (Export-Package). Concretely the Import-Package entry - contains a list of package that are necessary in order to have a working - bundle and the Export-Package is also a list of packages "offered" to the - system. - - By default, JOnAS use very simple directives to generate a bundle - that should mostly work: - - - - Every package required by the code in the jar file is placed in - the Import-Package list, with a resolution:=optional - attribute. That means that, during startup (when the bundle - is installed then started), the OSGi framework - will try to resolve as much required packages as possible, but if some - are missing, there will be no failures. At the end, the bundle is - ready to be used, but it's possible that it won't work as a really - needed package could not be found during the resolution. - - - - Every package provided by the original jar file is placed in the - Export-Package list. That means that all the - classes that are in the jar file are potentially visible from other - part of the server. This is bad for modularity. - - - - Bundle-SymbolicName is simply the jar file - short name. - - - - Creating a handmade bundle with controled content will also avoid - seeing that kind of traces during JOnAS start-up sequence: - - 07/09/09 12:26:22 (I) ExtensionLoaderComponent.__start : Some jars have been found in [<JONAS_ROOT>\lib\ext, <JONAS_BASE>\lib\ext]. - They have been transformed into bundles (see <JONAS_BASE>\work\ext-bundles directory). - This is NOT the prefered way to extends JOnAS libraries, prefer to use carefully - created and tested bundles, and place them in your deploy/ directory. -07/09/09 12:26:22 (I) ExtensionLoaderComponent.__start : file:/<JONAS_BASE>/work/ext-bundles/ojdbc14.jar installed as a bundle. -07/09/09 12:26:22 (I) ExtensionLoaderComponent.__start : file:/<JONAS_BASE>/work/ext-bundles/mysql-connector-java-3.1.10-bin.jar installed as a bundle. -
    - -
    - Using Bnd to generate an OSGi bundle - - Bnd is a bundle generation tool. It helps a lot the developer of - OSGi bundles by automating MANIFEST generation and - bundle content creation. - - The references section - contains links to some Bnd documentations and examples that a user should - read to better understand the Bnd philisophy. - - This howto focus on practical operations to be done to transform a - jar file containing a JDBC driver into a suitable - OSGi bundle. - -
    - Installing Bnd - - Bnd can be downloaded here: http://www.aqute.biz/Code/Download. - - This is an all-in-one executable jar file (sources can be seen in - /OSGI-OPT/src/ ). - - It can be executed using the following command line: - - >$ java -jar bnd.jar - - - - Bnd requires a 1.5 JVM (at minimum, also works with 1.6). - - - - Later in this article, a command named bnd is - used. It refers to a shell script that could looks like the - following: - - #!/bin/sh -java -jar /path/to/your/bnd.jar $* - - -
    - -
    - Default jar wrapping - - Bnd provides a utility wrapping mode. Here is a quote from the Bnd - documentation: - - The wrap command takes an existing JAR file and guesses the - manifest headers that will make this JAR useful for an OSGi Service - Platform. - - Looks promising :) In fact, this mode the one used by JOnAS when a - library is placed in lib/ext/. If - the jar in lib/ext/ had already been transformed and tested as a bundle, - it's probably safe to use it as is (transformed bundle are in <JONAS_BASE>/work/bundle-ext/). - - The following command show how to use it using a MySQL driver - jar: - - >$ bnd wrap mysql-connector-java-5.1.8-bin.jar -mysql-connector-java-5.1.8-bin 239 0 -One warning -1 : Superfluous export-package instructions: [org, com, com.mysql.jdbc.jdbc2, org.gjt, org.gjt.mm, com.mysql.jdbc.integration, com.mysql] -This command has created a - mysql-connector-java-5.1.8-bin.bar file that is an - OSGi bundle. It can be placed in <JONAS_BASE>/deploy/ and renamed with - a .jar extension and then JOnAS - will automatically deploy it. - - As a side note, here is what is imported and exported from the - MySQL bundle after wrapping (this output can be useful for advanced - users): - - >$ bnd print -impexp mysql-connector-java-5.1.8-bin.bar -[IMPEXP] -Import-Package - com.mchange.v2.c3p0 {resolution:=optional} - javax.naming {resolution:=optional} - javax.naming.spi {resolution:=optional} - javax.net {resolution:=optional} - javax.net.ssl {resolution:=optional} - javax.sql {resolution:=optional} - javax.transaction.xa {resolution:=optional} - javax.xml.parsers {resolution:=optional} - javax.xml.stream {resolution:=optional} - javax.xml.transform {resolution:=optional} - javax.xml.transform.dom {resolution:=optional} - javax.xml.transform.sax {resolution:=optional} - javax.xml.transform.stax {resolution:=optional} - javax.xml.transform.stream {resolution:=optional} - org.apache.commons.logging {resolution:=optional} - org.apache.log4j {resolution:=optional} - org.jboss.resource.adapter.jdbc {resolution:=optional} - org.jboss.resource.adapter.jdbc.vendor{resolution:=optional} - org.w3c.dom {resolution:=optional} - org.xml.sax {resolution:=optional} - org.xml.sax.helpers {resolution:=optional} -Export-Package - com.mysql.jdbc - com.mysql.jdbc.configs - com.mysql.jdbc.exceptions - com.mysql.jdbc.exceptions.jdbc4 - com.mysql.jdbc.integration.c3p0 - com.mysql.jdbc.integration.jboss - com.mysql.jdbc.interceptors - com.mysql.jdbc.jdbc2.optional - com.mysql.jdbc.log - com.mysql.jdbc.profiler - com.mysql.jdbc.util - org.gjt.mm.mysql -
    - -
    - Advanced wrapping - - This section is for lib/ext/ bundles that cannot be installed with - the default process or address developers wanting to control exactky - their bundle's content. - - The wrap command's default values can be changed using a property - file: - - Import-Package: !com.mchange.v2.c3p0,\ - !org.jboss.*,\ - javax.transaction.*;version=1.1,\ - *;resolution:=optional - -Export-Package: !com.mysql.jdbc.integration.*,\ - *;version=5.1.8 - -Bundle-Version 5.1.8 - -Bundle-SymbolicName MySQL Connector/J - - - Inside JOnAS, the c3p0 and jboss related packages don't have - to be imported (they are not even exported, so the dependencies - can never be resolved). Using the '!' prefix exclude them. - - - - Specify a version for this required package (not optional). - The bundle will be installed only if a package with the correct - version is exported. - - - - The trainling '*' is required. If omitted, Bnd will not - discover the imported packages of the jar. - - - - Similar to Import-Package exclusions, Bnd can avoid - exporting some packages that are part of the original jar by - prefixing their package name with '!' - - - - That line indicates to Bnd that all exported packages will - be "tagged" with a particular version. It's a good practice to - always have a version on exported packages. - - - - By default, the value will be '0'. For consistency, it - should be set accordingly to the version of the driver. - - - - By default, the value will be the jar file name. - - This file can then be used on the command line: - - >$ bnd wrap -properties mysql-connector-java-5.1.8-bin.bnd mysql-connector-java-5.1.8-bin.jar -mysql-connector-java-5.1.8-bin 239 728542 - - That section was only an example of an advanced bundle - generation. the import/export directives shown above may not be - suitable for your own bundle. It is advised to read the links - provided in the references - section to better understand and see other capabilities of - Bnd. - -
    -
    - -
    - References - - - - Bnd: Bundle - Tool - - - - Example: Using Bnd To Do a - Quick Wrap of Hibernate - - - - SpringSource: Creating - OSGi bundles - - - - Documentation: Maven - bundle Plugin (FAQ) - - - - Download - Bnd - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_jndi.xml b/jonas_doc/core/src/docbook/doc-en/howto_jndi.xml deleted file mode 100644 index 7cf353269393d12186d970b27785d10bf2f4e1af..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_jndi.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - Dynamic injection of applications parameters into the JNDI context - -
    - Introduction - - - You can dynamically inject applications parameters into the JNDI context using a specific XML file call - ConfigAdminJndiEntryDeployable. This specific file is an extensibility layer of the standard ConfigAdmin XML - file. - -
    - -
    - Usage - - Firstly, you need to activate depmonitor and JNDI services which allow you to dynamically inject applications - parameters into the JNDI context. To do that, edit the jonas.services property contained in the jonas.properties - file. - jonas.services ...,depmonitor,jndi - - You can edit the global policy of the JNDI injection. The global policy describe the JNDI injection policy of all - entries of each XML file (if the local policy is not set in theses files). Possible values are 'strict-consistency' - (default value) and 'last-update'. - - - - strict-consistency: requires an exact match between entries of the XML file and the - directory content. If an entry of the XML file isn't already bound in the JNDI - context, it'll be injected. Otherwise, the deployment of the whole file will fail. - When the deployable is undeployed, each entries will be removed from the JNDI context. - - - last-update: the directory contains the latest value injected. If an entry of the XML - file isn't already bound in the JNDI context, it'll be injected. Otherwise the entry - will be updated with the new value. - - - - -#Possible values of JNDI policy are: strict-consistency and last-update -jonas.service.jndi.defaultPolicy strict-consistency - - - Then you have to put into the JONAS_BASE/deploy directory your ConfigAdminJndiEntryDeployable file. - See the XML Schema for the full - structure of this XML file. -
    - -
    - ConfigAdminJndiEntryDeployable - - - Sample example injecting two entries into the JNDI context. - -<configadmin xmlns="http://jonas.ow2.org/ns/configadmin/1.0"> - <jndi-entries xmlns="http://jonas.ow2.org/ns/jndientries/1.0"> - <policy>strict-consistency</policy> - <entry> - <name>java:global/jndi/developper</name> - <description>The description of my first entry</description> - <type>java.lang.String</type> - <value>The JOnAS Team</value> - </entry> - <entry> - <name>java:global/jndi/arch</name> - <description>The description of my second entry</description> - <type>java.lang.Float</type> - <value>64.0</value> - </entry> - </jndi-entries> -</configadmin> - - - - An entry is composed of : - - - The <jndiEntries> tag. It describes an optional policy and a list of entries - to inject in the JNDI context. - - - - The <entry> tag. It describes an entry to inject in the JNDI context. - - - - The <policy> tag. It describes the JNDI injection policy of each entries of the XML file. - Possible values are 'strict-consistency' (default value) and 'last-update'. This policy parameter is local to the XML - deployable file. It applies to all entries and overload the global policy set in the jonas.properties file. - - - - The <name> tag. It's the name of an entry to inject in the JNDI context. - - - - The <description> tag. It's the description of an entry to inject in the JNDI context. - - - - The <type> tag. It's the type of the value of an entry to inject in - the JNDI context. The type should be available in the Java - plateform (java.lang.String, java.lang.Integer,java.lang.Float, - ...). - - - - The <value> tag. It's the value of an entry to inject in - the JNDI context. - - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_mbeans.xml b/jonas_doc/core/src/docbook/doc-en/howto_mbeans.xml deleted file mode 100644 index 58090e1b5e991160e9674e08c5bba6f78e7f4485..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_mbeans.xml +++ /dev/null @@ -1,409 +0,0 @@ - - - JOnAS and JMX, registering and manipulating MBeans - - - By Jonny Way. - -
    Introduction - - - JMX (Java Management eXtensions) is an API for managing, among other things, J2EE applications. JOnAS (version 4 and above) integrates the MX4J open-source JMX server and registers a number of MBeans. The web-based JonasAdmin application acts as a JMX client, enabling viewing and manipulation of these MBeans. - - - It maybe desirable for an application to expose its own MBeans via the JMX server to allow application management (using, for example, MC4J). JOnAS currently does not provide a prebuilt method for registering MBeans with its JMX server. The intent of this document is to illustrate one method of registering application-specific MBeans with the JOnAS JMX server based on the m-let service. - -
    -
    ServletContextListener - - - The basic task of registering an MBean with the JOnAS JMX server is accomplished by the following implementation of the - - ServletContextListener - - interface. This implementation reads a number of MLet files, which specify the MBeans to be registered, and attempts to register those beans during the web application context initialization. - - - - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Iterator; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.StringTokenizer; - -import javax.management.InstanceAlreadyExistsException; -import javax.management.InstanceNotFoundException; -import javax.management.ReflectionException; -import javax.management.MBeanServer; -import javax.management.MBeanException; -import javax.management.MBeanRegistrationException; -import javax.management.MBeanServerFactory; -import javax.management.MalformedObjectNameException; -import javax.management.NotCompliantMBeanException; -import javax.management.ObjectInstance; -import javax.management.ObjectName; -import javax.management.loading.MLet; -import javax.management.loading.MLetMBean; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextListener; - -import org.apache.log4j.Logger; - -/** - * ServletContextListener designed to register JMX MBeans into - * an existing JMX server when the application starts up. The - * MBeans to be loaded are specified in the MLet files whose - * names are given in the servlet context parameter with the name mletFiles, - * in a semi-colon delminated list (although this is not really - * needed as multiple mlets can be specifyed in one file, it might - * be useful). Note that the filename are relative to the WEB-INF - * directory of the servlet context being listened to. - * - * Note, that this listener should precede (in web.xml) any other that depend - * on the MBeans being registered. - * - * Note that the MBean registration is sensitive to classloader issues. For - * example, when registering the MBeans in the JMX server provided by - * the Jonas application server any libraries required by the MBeans need - * to be in the central lib directory (lib/ext). - * - * - * @author Jonny Wray - * - */ -public class MBeanRegistrationListener implements ServletContextListener { - - private static final String MLET_DOMAIN = "MBeanRegistrationListener"; - private static final String MLET_BEAN_NAME = MLET_DOMAIN+":Name=MLet"; - private static final String MLETFILE_INITPARAM_NAME = "mletFiles"; - private static final Logger log = Logger.getLogger(MBeanRegistrationListener.class); - - - private MBeanServer lookForExistingServer(){ - List mbeanServers = MBeanServerFactory.findMBeanServer(null); - if(mbeanServers != null && mbeanServers.size() > 0){ - return (MBeanServer)mbeanServers.get(0); - } - return null; - } - - private MBeanServer getMBeanServer(){ - MBeanServer server = lookForExistingServer(); - if(server == null){ - server = MBeanServerFactory.createMBeanServer(MLET_DOMAIN); - } - return server; - } - - - public void contextDestroyed(ServletContextEvent arg0) { - log.info("Destroy event"); - // Anything that needs to be done here on deregistering of the - // web application? - } - - - private List getMLetURLs(String filenames){ - List urls = new ArrayList(); - StringTokenizer tok = - new StringTokenizer(filenames, ";"); - while(tok.hasMoreTokens()){ - String filename = tok.nextToken(); - URL configURL = Thread.currentThread().getContextClassLoader().getResource(filename); - if(configURL == null){ - log.error("Cound not load MLet file resource from "+filename+" using current thread context classloader"); - } - else{ - urls.add(configURL); - } - } - return urls; - } - - private List getMLetURLs(ServletContext context, String filenames){ - List urls = new ArrayList(); - StringTokenizer tok = - new StringTokenizer(filenames, ";"); - while(tok.hasMoreTokens()){ - String filename = "/WEB-INF/"+tok.nextToken(); - URL configURL = null; - try { - configURL = context.getResource(filename); - } - catch (MalformedURLException e) { - log.error("URL for "+filename+" is malformed", e); - } - if(configURL == null){ - log.error("Cound not find MLet file resource from "+filename+" in servlet context"); - } - else{ - urls.add(configURL); - } - } - return urls; - } - - /** - * Dynamically register the MBeans specified in the list - * of MLet files (relative to /WEB-INF/) specified in servlet context parameter - * mletFiles as a semi-colon deliminated list of file names. - * - * The algorithm looks for already running JMX servers and uses - * the first it comes across. If no servers are running, then - * it creates one. - * - * Note, the interface does not define any exceptions to be - * thrown. Currently, any exceptions thrown during registration - * are logged at error level and then ignored. This seems - * reasonable, as these may or may not be a fatal event. In - * this way the registration process reports its failure and - * the application context initialization continues. - */ - public void contextInitialized(ServletContextEvent arg0) { - log.info("Initializing event"); - String filenames = arg0.getServletContext().getInitParameter(MLETFILE_INITPARAM_NAME); - if(filenames != null && filenames.length() > 0){ - MBeanServer server = getMBeanServer(); - if(server != null){ - try{ - ObjectName name = new ObjectName(MLET_BEAN_NAME); - if(!server.isRegistered(name)){ - log.info("Creating new MLetMBean for dynamic registration"); - MLetMBean mletService = new MLet(); - server.registerMBean(mletService, name); - } - List urls = getMLetURLs(arg0.getServletContext(), filenames); - for(int i=0;i < urls.size();i++){ - URL url = (URL)urls.get(i); - try { - log.info("Registering MBeans from MLet file "+url); - Set loadedMBeans = (Set)server.invoke(name, "getMBeansFromURL", - new Object[]{url}, new String[]{URL.class.getName()}); - - processRegisteredMBeans(loadedMBeans); - } - catch (InstanceNotFoundException e) { - log.error("Unable to register MBeans from MLet file "+url, e); - } - catch (MBeanException e) { - log.error("Unable to register MBeans from MLet file "+url, e); - } - catch (ReflectionException e) { - log.error("Unable to register MBeans from MLet file "+url, e); - } - } - } - catch(MalformedObjectNameException e){ - log.error("Unable to register the MLetMBean", e); - } - catch(NotCompliantMBeanException e){ - log.error("Unable to register the MLetMBean", e); - } - catch(MBeanRegistrationException e){ - log.error("Unable to register the MLetMBean", e); - } - catch(InstanceAlreadyExistsException e){ - log.error("Unable to register the MLetMBean", e); - } - } - else{ - log.error("MBeanServer not found and could not be created. Not registering MBeans."); - } - } - else{ - log.error("No mletFiles servlet context parameter found."); - } - } - - private void processRegisteredMBeans(Set loadedMBeans) { - log.debug("Loaded beans: "+loadedMBeans.size()); - Iterator it = loadedMBeans.iterator(); - while(it.hasNext()){ - Object o = it.next(); - if(o instanceof ObjectInstance){ - ObjectInstance inst = (ObjectInstance)o; - log.info("Registered: "+inst.getObjectName()); - } - else if(o instanceof Throwable){ - Throwable err = (Throwable)o; - log.error("Error registering MBeans", err); - } - } - } - -} - - - -
    -
    Configuration - - - In order to use the above ServletContextListener, it must be configured in the web.xml of the web application that wants to register the MBeans. For example, the following lines added to the web.xml will result in the registeration of the MBeans specified in the application.mlet file under the WEB-INF directory. Multiple MLet files can be specified in a comma-separated list. - - - - - <context-param> - <param-name>mletFiles</param-name> - <param-value>application.mlet</param-value> - </context-param> - - <listener> - <listener-class>net.fiveprime.jmx.MBeanRegistrationListener</listener-class> - </listener> - - - - - An example MLet file to load an extension (detailed below) of the HibernateService MBean is: - - - - -<mlet code="ConfigurableHibernateService" - name="HibernateService:Name=HibernateService" - archive="mbeans.jar"> - <arg type="java.lang.String" value="hibernate.cfg.xml"> - <arg type="java.lang.String" value="hibernate/HibernateSessionFactory"> - <arg type="java.lang.String" value="DefaultDS"> -</mlet> - -
    -
    Library Dependences - - - Registration of MBeans results in their construction by the JMX server. As such, any classes the MBean is dependent on must be available to the JMX server, in lib/ext. - -
    -
    HibernateService Extension - - - The Hibernate distribution provides an implementation of HibernateServiceMBean in the class HibernateService. In the MLet file above, an extension of this class is specified that allows the HibernateService to be configured from an external file, such as the standard hibernate.cfg.xml file. There are a number of situations where it is desirable to use the Hibernate mapped classes outside of Jonas running a JMX server. This allows the Hibernate mapping files and properties to be specified in one place and used in multiple situations. If this is not needed, then the HibernateService class can be used directly. - - - - -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import net.sf.hibernate.HibernateException; -import net.sf.hibernate.jmx.HibernateService; - -import org.apache.commons.digester.Digester; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.xml.sax.SAXException; -/** - * Extension of the HibernateService class to add configuration - * ability from a Hibernate XML configuration file. - * - * @author Jonny Wray - * - */ -public class ConfigurableHibernateService extends HibernateService { - - private static Log log = LogFactory.getLog(ConfigurableHibernateService.class); - - /** - * Configure this HibernateService from an XML file - * - * @param filename The Hibernate XML configuration file, for example hibernate.cfg.xml - * @param jndiName The JNDI name that the session factory will be registered under - * @param datasourceName The name of the datasource used by the session factory - * @throws HibernateException If there's a problem reading the configuration file - */ - public ConfigurableHibernateService(String filename, String jndiName, String datasourceName) - throws HibernateException{ - - init(filename, jndiName, datasourceName); - start(); - } - - private void init(String filename, String jndiName, String datasourceName) throws HibernateException { - if(log.isDebugEnabled()){ - log.debug("Configuring Hibernate JMX MBean with filename "+filename+ - ", JNDI name "+jndiName+" and datasource "+datasourceName); - } - try{ - URL url = this.getClass().getClassLoader().getResource(filename); - Digester mappingDigester = configureMappingDigester(); - List results = (List)mappingDigester.parse(url.openStream()); - Iterator it = results.iterator(); - while(it.hasNext()){ - StringBuffer buffer = (StringBuffer)it.next(); - addMapResource(buffer.toString()); - log.debug("Adding mapping resource "+buffer.toString()); - } - - Digester propertyDigester = configurePropertyDigester(); - Map resultMap = (Map)propertyDigester.parse(url.openStream()); - it = resultMap.keySet().iterator(); - while(it.hasNext()){ - String key = (String)it.next(); - String value = (String)resultMap.get(key); - setProperty("hibernate."+key, value); - log.debug("Adding property ("+key+","+value+")"); - } - setJndiName(jndiName); - setDatasource(datasourceName); - } - catch(IOException e){ - throw new HibernateException(e); - } - catch(SAXException e){ - throw new HibernateException(e); - } - } - - private Digester configureMappingDigester(){ - Digester digester = new Digester(); - digester.setClassLoader(this.getClass().getClassLoader()); - digester.setValidating(false); - digester.addObjectCreate("hibernate-configuration/session-factory", ArrayList.class); - - digester.addObjectCreate("hibernate-configuration/session-factory/mapping", StringBuffer.class); - digester.addCallMethod("hibernate-configuration/session-factory/mapping", "append", 1); - digester.addCallParam("hibernate-configuration/session-factory/mapping", 0, "resource"); - digester.addSetNext("hibernate-configuration/session-factory/mapping", "add"); - - return digester; - } - - private Digester configurePropertyDigester(){ - Digester digester = new Digester(); - digester.setClassLoader(this.getClass().getClassLoader()); - digester.setValidating(false); - digester.addObjectCreate("hibernate-configuration/session-factory", HashMap.class); - - digester.addCallMethod("hibernate-configuration/session-factory/property", "put", 2); - digester.addCallParam("hibernate-configuration/session-factory/property", 0, "name"); - digester.addCallParam("hibernate-configuration/session-factory/property", 1); - - return digester; - } -} - - - - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/howto_packaging.xml b/jonas_doc/core/src/docbook/doc-en/howto_packaging.xml deleted file mode 100644 index bb55066c1dde3ddbf831629503c33c2fe99c5f75..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_packaging.xml +++ /dev/null @@ -1,348 +0,0 @@ - - - - Packaging service - - - This service is used essentially in the context of PaaS. To deploy an application in the platform, this service - take a descriptor of the application as parameter and generate an addon. - - -
    - - Cloud descriptors - - - - These are xml files which describe : - - - Environment (environment-template.xml): describes the components of the platform - such as instances of JOnAS application servers, data sources, etc.. - - - Application (cloud-application.xml): Each application is described in a file of that - type. An application can be composed of several modules, their locations are specified in this file. - - - Mapping topology (deployment.xml): describes the relationship between applications - and application servers - - - - - To parse these xml files, some APIs were developed in - JPaaS-Util project using JAXB. - - - - Example of use for <literal>cloud-application.xml</literal> - - - First, create an instance of Cloud application descriptor. The constructor has three signatures : - - - Empty constructor - -/** -* Default constructor -*/ -public CloudApplicationDesc() throws Exception; - - - - With the URL of the xml file - -/** -* Constructor with xml url -* @param urlCloudApplication -* @throws Exception -*/ -public CloudApplicationDesc(URL urlCloudApplication) throws Exception; - - - - With the content of the xml file - -/** -* Constructor with xml content -* @param cloudApplication -* @throws Exception -*/ -public CloudApplicationDesc(String cloudApplication) throws Exception; - - - - - - - - Parse an xml file - - - - To parse an xml file, use the constructor with the URL of xml content. - -URL urlCloudApplication = new URL(CLOUD_APPLICATION_URL); -CloudApplicationDesc desc = new CloudApplicationDesc(urlCloudApplication); - - Then, retrieve the root element of xml schema : - -CloudApplicationType cloudApplication = desc.getCloudApplication(); - - After, for getting any element content in the xml file, just call the corresponding method on the root - element. To get application name for example, do : - -String applicationName = cloudApplication.getName(); - - - The cloud-application.xml contains a list of deployables that form the application. These - deployables are defined in two separated namespaces embedded-xml and artefact. - To get the list of deployables from cloud-application.xml do: - - -// Gets deployables -DeployablesType deployables = cloudApplication.getDeployables(); -List<Object> listDeployables = deployables.getDeployables(); - - Then, for each element in listDeployables test if it is an instance of - org.ow2.jonas.jpaas.util.clouddescriptors.cloudapplication.artefact.v1.generated.ArtefactDeployableType - or org.ow2.jonas.jpaas.util.clouddescriptors.cloudapplication.xml.v1.generated.XmlDeployableType. - - - - - - Construct an xml file - - - - To generate a cloud-application.xml file, start by creating a new element corresponding - to the root element of the xml: - -CloudApplicationType cloudApplicationType = new CloudApplicationType(); - - Then, set the content of each xml element. For example, to set application name do : - -cloudApplicationType.setName("my application"); - - To construct the list of deployables, retrieve the empty list of deployables created when - cloudApplicationType was instantiated : - -DeployablesType deployablesType = new DeployablesType(); -List<Object> listDeployables = deployablesType.getDeployables(); - - And then, create deployables. Suppose that the application has one artefact deployable, do: - -ArtefactDeployableType deployable = new ArtefactDeployableType(); -deployable.setName("my deployable"); -deployable.setId("my id"); -deployable.setLocation(MY_DEPLOYABLE_URL); -... - - Add this deployable to the list of deployables : - -listDeployables.add(deployable); - - Now, all xml elements were set. So, generate the xml. For that, create an empty cloud application - descriptor : - -CloudApplicationDesc desc = new CloudApplicationDesc(); - - Construct the JAXB element corresponding to the root element cloudApplicationType: - -ObjectFactory objectFactory = new ObjectFactory(); -JAXBElement<CloudApplicationType> cloudApplication = objectFactory.createCloudApplication(cloudApplicationType); - - And call the method generateCloudApplication() : - -String xml = desc.generateCloudApplication(cloudApplication); - - This one returns the xml content. - - - -
    - -
    - - Packaging - - - - The Packaging service is responsible of package of applications in the platform. It takes a - cloud-application.xml (required) and a tenant identifier (optional) as parameters. By default, - the addon is placed in $JONAS_BASE/work/addons, set the outputDir parameter - otherwise. - - - - Computing generated addons number - - - - Each application deployable can include these requirements : - -<artefact:requirements> - <artefact:requirement>(collocated-to=id1)</artefact:requirement> - <artefact:requirement>(not-collocated-to=id2)</artefact:requirement> -</artefact:requirements> - - collocated-to means "must be hosted in the same container". Similarly, - not-collocated-to means "must be not hosted in the same container". - - - Therefore, it is possible that as a result of packaging of one application, more than one addon will be - generated (the effect of not-collocated-to property). In order to optimize the number - of addons generated, an algorithm was implemented. - - - This problem is resolved by using a non-oriented graph. Each deployable is represented by a vertex. There is - an edge between two vertices if these represented deployables are collocated. - - - Consider this cloud-application.xml: - -<cloud-application> - ... - <deployables> - <artefact:deployable name="ear" id="artefact1"> - <artefact:location></artefact:location> - <artefact:requirements> - <artefact:requirement>(collocated-to=artefact2)</artefact:requirement> - <artefact:requirement>(not-collocated-to=xml2)</artefact:requirement> - </artefact:requirements> - </artefact:deployable> - - <artefact:deployable name="war" id="artefact1"> - <artefact:location></artefact:location> - <artefact:requirements> - <artefact:requirement>(not-collocated-to=xml1)</artefact:requirement> - </artefact:requirements> - </artefact:deployable> - - <embedded-xml:deployable name="xml1" id="xml1"> - <embedded-xml:requirements> - <embedded-xml:requirement>(collocated-to=xml2)</embedded-xml:requirement> - </embedded-xml:requirements> - </embedded-xml:deployable> - - <embedded-xml:deployable name="xml2" id="xml2"> - <embedded-xml:requirements> - <embedded-xml:requirement>(collocated-to=xml1)</embedded-xml:requirement> - <embedded-xml:requirement>(not-collocated-to=artefact1)</embedded-xml:requirement> - </embedded-xml:requirements> - </embedded-xml:deployable> - </deployables> -</cloud-application> - - - We deduce the following graph : - - - - - - - Then, we take each connected components, in this case {artefact1, artefact2} and - {xml1, xml2}, and we try to merge them one by one. Two connected components are merged if - any element in the first has a not-collocated-to requirement with an element in the second. - This is not the case in the example above because artefact1 which is in the first connected - component is not-collocate-to xml2 which is in the second component. - - - After merging, the final connected components represent the content of generated addons. In the example, the - first addon will contain artefact1 and artefact2 and the second addon - will contain xml1 and xml2. - - - - - - Addon's repository provisioning - - - After computing the content of each addon to generate, a deployment plan is generated and deployables will be - stored in the maven repository/ directory inside the addon : - - - The groupid of all deployables is org.ow2.jonas.jpaas - - - The version of deployables is the application version set in cloud-application.com. - - - The artifact of each deployable is its name. - - - The type for artefact deployables is the extension of the file. For xml - deployable, the type is xml. - - - - - When the addon is being deployed, the repository inside the addon is added to repositoryManager. - - -
    - -
    - - Usage - - - - Packaging service can be used by two way: - - - - As a JOnAS service - - - - Start a addon profile JOnAS and deploy the addon of packaging service. - See org.ow2.jonas.packaging.IPackagingManager. - - - - - - Command line - - - It is possible to generate application addon using a maven plugin. - -<groupId>org.ow2.jonas.tools.maven</groupId> -<artifactId>maven-packaging-plugin</artifactId> -<phase>generate-resources</phase> -<goal>generate-application-addon</goal> - - This plugin require the URL of cloud-application.xml and the URL of outputDirectory. - In fact, this plugin is executed without a running JOnAS. TenantId is an optional parameter. Basic maven plugin usage: - -mvn org.ow2.jonas.tools.maven:maven-packaging-plugin:5.3.0-M7-SNAPSHOT:generate-application-addon --DurlCloudApplication=cloud-application.xml -DoutPutDirectory=. -Dtenant-id=T1 - - To use easily this plugin, a shell script is written and simplify the command line : - -Usage: gen-addon -app urlCloudApplication -out urlOutputDir -Options: - -tid tenant identifier value - -env url of environment-template.xml - -map url of deployment.xml (mapping topology) - - - - -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_services.xml b/jonas_doc/core/src/docbook/doc-en/howto_services.xml deleted file mode 100644 index 3f9bfa246f5c4af995d065d9a23d84ad393d8c8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_services.xml +++ /dev/null @@ -1,893 +0,0 @@ - - - - Creating a New JOnAS Service - - -
    - - Target audience and rationale - - - This chapter is intended for advanced JOnAS users who require that - some "external" services run along with the JOnAS server. A service is - something that may be initialized, started, and stopped. JOnAS itself - already defines a set of services, some of which are cornerstones of the - JONAS Server. The JOnAS pre-defined services are listed in Configuring JOnAS - services . - - Java EE application developers may need to access other services, - for example another Web container or a Versant container, for their - components. Thus, it is important that such services be able to run along - with the application server. To achieve this, it is possible to define - them as JOnAS services. - - This chapter describes how to define a new JOnAS service and how to - specify which service should be started with the JOnAS server. -
    - -
    - - Introducing a new service - - - The customary way to define a new JOnAS service is to encapsulate it - in a class whose interface is known by JOnAS. More precisely, such a class - provides a way to start and stop the service. Then, the - jonas.properties file must be modified to make JOnAS - aware of this service. - -
    - - Defining the service interface and implementation - - - A JOnAS service is represented by a class that implements its - service interface and extends the class - org.ow2.jonas.lib.service.AbsServiceImpl, and - thus must implement at least the following methods: - - - - public void doStart() throws - ServiceException; - - - - public void doStop() throws - ServiceException; - - - - These methods will be called by JOnAS for starting and stopping - the service. - - The service interface should look like the following:package com.company.jonas.myservice; - -/** - * Defines the "business" interface of the service (no life-cycle methods). - */ -public interface IMyService { - void doSomething(); -} - - - The service class should look like the following: - - package com.company.jonas.myservice.internal; - -import com.company.jonas.myservice.IMyService; - -import org.ow2.jonas.lib.service.AbsServiceImpl; -import org.ow2.jonas.service.ServiceException; - -..... - -public class DefaultMyService extends AbsServiceImpl implements IMyService { - - /** A configurable property. */ - private String property; - - @Override - protected void doStart() throws ServiceException { - // Do something on start-up - // All the configuration and service dependencies has been injected at this time - } - - @Override - protected void doStop() throws ServiceException { - // Do something on shutdown - // Service dependencies are still available - } - - public void doSomething() { - // Business code ... - } - - public void setProperty(String property) { - this.property = property; - } -} - -
    - -
    - - Building the OSGi bundle - - - A JOnAS service must be packaged in an OSGi bundle in order to be - deployed on the JOnAS OSGi platform. It implies to create a standard - packaging structure. An OSGi bundle is like a classic JAR file plus a - specific MANIFEST file. To ease the service creation, configuration and - management of dynamic dependencies to other JOnAS services, it is - recommanded to use iPOJO - to build your services. This guide will present the iPOJO - solution. - - The JAR structure of the bundle must contain the following - parts: - - - - com/company/jonas/myservice - - contains the service interface(s) - - - - com/company/jonas/myservice/internal - - contains the service implementation classe(s) - - - - META-INF/MANIFEST.MF - - OSGi manifest file - - - - metadata.xml - - iPOJO metadata file - - - - - - The OSGi MANIFEST should contain the following attributes: - - Import-Package: org.ow2.jonas.lib.service, org.ow2.jonas.service, ... -Export-Package: com.company.jonas.myservice -Private-Package: com.company.jonas.myservice.internal -Bundle-Version: 5.1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: MyService -Bundle-SymbolicName: com.company.jonas.myservice - - If the project is built with Maven, it is possible to - generate this file during the project compilation thanks to the maven-bundle-plugin. - This plugin is based on the BND tool which can - also be used separately. - -
    - Building with maven - - Even if it's not mandatory to use maven to build OSGi bundles, - the JOnAS team use it extensively because of the large number of - integrated OSGi build tools. - -
    - Maven project structure - - The maven project that will contains the new service's code is - structured just like any well known maven project: - - <myservice>/ - src/ - main/ - java/ - a/b/<myservice>/ - ... - resources/ - META-INF/ - <myservice>.bnd (optional) - metadata.xml - test/ - ... - pom.xml - - - src/main/java/ - contains all the Java source code that have been written for - the new service (interface + implementation + any other new - classes) - - - - src/main/resources/ contains the - iPOJO component description file named metadata.xml, plus an - optional Bnd descriptor that will be used to describe the - bundle's content (for advanced usages) - - - - src/test/ - contains all the unit tests that may have been written to unit - test the service implementation (optional altough - recommanded) - - - - pom.xml is the maven project's - module descriptor - - -
    - -
    - Maven project descriptor (pom.xml) - - <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>com.company.jonas</groupId> - <artifactId>myservice</artifactId> - <version>1.0.0</version> - <packaging>bundle</packaging> - - <name>JOnAS Service</name> - - <properties> - <jonas.version>5.1.2</jonas.version> - <ipojo.version>1.4.0</ipojo.version> - </properties> - - <dependencies> - <!-- Imports the AbsService and required interfaces in our module --> - <dependency> - <groupId>org.ow2.jonas</groupId> - <artifactId>jonas-commons</artifactId> - <version>${jonas.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <!-- Creates the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <_include>-target/classes/META-INF/${project.artifactId}.bnd</_include> - </instructions> - </configuration> - </plugin> - - <!-- Manipulate the bundle (iPOJO) --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-ipojo-plugin</artifactId> - <version>${ipojo.version}</version> - <executions> - <execution> - <goals> - <goal>ipojo-bundle</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> -Here we go into more details about the different sections of - this file. - - <groupId>com.company.jonas</groupId> - <artifactId>myservice</artifactId> - <version>1.0.0</version> - <packaging>bundle</packaging> - - - groupId, - artifactId and version - elements are identifying uniquely the bundle in the maven - repository - - - - packaging defines the type of the - artifact produces by this module. In this case, an - OSGi bundle. - - <properties> - <jonas.version>5.1.2</jonas.version> - <ipojo.version>1.4.0</ipojo.version> - </properties> -The properties section defines re-usables - key/value pairs. Here, it is used to store the JOnAS version that - will be used to compile the module against. It also defines the - ipojo version to be used. - - - Notice that there is a relationship between JOnAS and iPOJO - version: - - - - JOnAS 5.1.x uses iPOJO 1.4.0 - - - - JOnAS 5.2.x uses iPOJO 1.6.x - - - - - <dependencies> - <!-- Imports the AbsService and required interfaces in our module --> - <dependency> - <groupId>org.ow2.jonas</groupId> - <artifactId>jonas-commons</artifactId> - <version>${jonas.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - - The dependencies section of the POM - declares library dependencies of the module. In this case, the new - service requires jonas-commons because it extends - the AbsServiceImpl class (that is in the - jonas-commons module). The - scope element is used to limit the transitive - maven dependency resolution mechanism. - - <!-- Creates the bundle --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> <!-- Do not forget the extensions element ! --> - <configuration> - <instructions> - <_include>-target/classes/META-INF/${project.artifactId}.bnd</_include> - </instructions> - </configuration> - </plugin> - - - The build/plugins section contains the - definition (and configuration) of all the plugin(s) that will be - invoked during the build. - - This snippet show the configuration to be used for the - maven-bundle-plugin (in charge of the manifest and bundle - generation): it simply states that it must read a .bnd file (located in - src/main/resources/META-INF/***.bnd) named - after the project's artifactId value. If this file is not present, - default - values will be used. - - <!-- Manipulate the bundle (iPOJO) --> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-ipojo-plugin</artifactId> - <version>${ipojo.version}</version> - <executions> - <execution> - <goals> - <goal>ipojo-bundle</goal> - </goals> - </execution> - </executions> - </plugin> - - - This important section hooks iPOJO in the build process. It - will reads the src/main/resources/metadata.xml - file as input. Then, it manipulate the bundle (modify the classes, - update the manifest) and save it on disk. -
    - -
    - iPOJO component descriptor (metadata.xml) - - iPOJO is a Service Component Runtime aiming to simplify OSGi - application development. You have to create the iPOJO component - which will define your JOnAS service. This component must declare - the provided and required services, the start/stop callback methods - and the service properties. - - The iPOJO metadata file should look like the following: - - <?xml version="1.0" encoding="UTF-8"?> -<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="org.apache.felix.ipojo" - xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/1.4.0/core.xsd" > - - <component classname="com.company.jonas.myservice.internal.DefaultMyService" - immediate="false"> - <provides specifications="com.company.jonas.myservice.IMyService" /> - - <!-- Required dependencies --> - <requires optional="false" - specification="org.ow2.jonas.properties.ServerProperties"> - <callback type="bind" method="setServerProperties" /> - </requires> - - <!-- LifeCycle Callbacks --> - <callback transition="validate" method="start" /> - <callback transition="invalidate" method="stop" /> - - <!-- Configuration properties --> - <properties propagation="true"> - <property name="property" method="setProperty" /> - </properties> - </component> - -</ipojo> - - iPOJO component - description - - The component - classname represents - the service implementation class - - - - The provides - element list all OSGi services provided by the component, here - only the service interface - - - - In this example, the component requires the - ServerProperties - service which will be injected to the component instance - during activation - - - - Two callbacks are defined, one for the component - validation during service startup and one for the component - invalidation for the service shutdown - - - - Property names must match service properties defined in - the jonas.properties file. The property - value will be injected to the component instance via - setters - - -
    - -
    - Build execution - - Simply type mvn clean install to launch the - build, that will delete the target/ directory (that contains only - generated/compiled stuff) and then compile and package everything, - including generating the bundle with its manifest and manipulating - it with iPOJO. - - >$ mvn clean install -[INFO] Scanning for projects... -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building JOnAS Service 1.0.0 -[INFO] ------------------------------------------------------------------------ -[INFO] -[INFO] --- maven-resources-plugin:2.4.2:resources (default-resources) @ myservice --- -[INFO] Copying 1 resource -[INFO] -[INFO] --- maven-compiler-plugin:2.3:compile (default-compile) @ myservice --- -[INFO] Compiling 1 source file to /home/sauthieg/sandboxes/playground/myservice/target/classes -[INFO] -[INFO] --- maven-resources-plugin:2.4.2:testResources (default-testResources) @ myservice --- -[INFO] skip non existing resourceDirectory /home/sauthieg/sandboxes/playground/myservice/src/test/resources -[INFO] -[INFO] --- maven-compiler-plugin:2.3:testCompile (default-testCompile) @ myservice --- -[INFO] No sources to compile -[INFO] -[INFO] --- maven-surefire-plugin:2.5:test (default-test) @ myservice --- -[INFO] No tests to run. -[INFO] -[INFO] --- maven-bundle-plugin:2.1.0:bundle (default-bundle) @ myservice --- -[INFO] -[INFO] --- maven-ipojo-plugin:1.4.0:ipojo-bundle (default) @ myservice --- -[INFO] Start bundle manipulation -[INFO] Metadata file : /home/sauthieg/sandboxes/playground/myservice/target/classes/metadata.xml -[INFO] Input Bundle File : /home/sauthieg/sandboxes/playground/myservice/target/myservice-1.0.0.jar -[INFO] Bundle manipulation - SUCCESS -[INFO] -[INFO] --- maven-install-plugin:2.3:install (default-install) @ myservice --- -[INFO] Installing /home/sauthieg/sandboxes/playground/myservice/target/myservice-1.0.0.jar to /home/sauthieg/.m2/repository/com/company/jonas/myservice/1.0.0/myservice-1.0.0.jar -[INFO] -[INFO] --- maven-bundle-plugin:2.1.0:install (default-install) @ myservice --- -[INFO] Installing com/company/jonas/myservice/1.0.0/myservice-1.0.0.jar -[INFO] Writing OBR metadata -[INFO] ------------------------------------------------------------------------ -[INFO] BUILD SUCCESS -[INFO] ------------------------------------------------------------------------ -[INFO] Total time: 8.088s -[INFO] Finished at: Tue Jul 06 10:37:43 GMT+01:00 2010 -[INFO] Final Memory: 9M/315M -[INFO] ------------------------------------------------------------------------ - -
    -
    -
    - -
    - - Preparing Service Installation - - -
    - Bundle Repository - - The generated bundle has to be placed in a maven repository that - is available to the JOnAS instance that will host the service. - - 2 simples solutions: - - Bundle was locally produced using maven, so it's already - available in the local developer's repository (usually in - ~/.m2/repository/). This - repository has to be declared to the JOnAS instance. - - The easiest way to declare a repository is to edit the - $JONAS_BASE/conf/initial-repositories.xml - and make sure that a similar entry is present: - - <repository id="maven2-local-repository"> - <type>maven2</type> - <url>file:///home/john/.m2/repository</url> - </repository> - - - - - Bundle is not already present in a maven repository. It's - necessary to place it in the appropriate location (according to - its maven coordinates: groupId, artifactId, version, - ...):$JONAS_ROOT/repositories/maven2-internal/<groupId>/<artifactId>/<version>/<artifactId>-<version>.jar - groupId is expressed with '.' as separator in POMs, - but '.' are to be replaced with '/' in the location - The path follows the Maven repository structure. By - default, each JOnAS service is located in the - $JONAS_ROOT/repositories/maven2-internal - directory. This directory can be seen as a Maven local - repository where JOnAS looks for OSGi - bundles - - -
    - -
    - Service Deployment Plan - - After the setup of the maven repository hosting the new service - bundle, a deployment plan (XML file) referencing this resource has to - be created. This deployment plan must be placed in the - $JONAS_ROOT/repositories/url-internal directory . - The file name must be the same than the service name: - myservice.xml in the example. - - - Deployment plan filename HAS TO BE equals to the service name - used in the jonas.properties. - - - Here is an example of deployment plan that will trigger the - installation of a bundle available as a maven artifact. - - <?xml version="1.0" encoding="UTF-8"?> -<deployment-plan xmlns="http://jonas.ow2.org/ns/deployment-plan/1.0" - xmlns:m2="http://jonas.ow2.org/ns/deployment-plan/maven2/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="deployment-plan-1.0.xsd" - atomic="false"> - - <deployment id="com.company.jonas:myservice:jar" - xsi:type="m2:maven2-deploymentType" - reloadable="false" - start="true" - reference="true" - startlevel="1" - starttransient="true"> - <m2:groupId>com.company.jonas</m2:groupId> - <m2:artifactId>myservice</m2:artifactId> - <m2:version>1.0.0</m2:version> - </deployment> - -</deployment-plan> - - - As the service name and the deployment plan name are equal, - JOnAS will automatically try to deploy this deployment plan during the - service startup. This will trigger the deployment of the - OSGi bundle. - - More information about deployment plans here. -
    -
    - -
    - - Modifying the jonas.properties file - - - The service is defined and its initialization parameters specified - in the jonas.properties file. First, choose a name - for the service (e.g. "myservice"), then do the - following: - - - - add this name to the jonas.services - property; this property defines the set of services - (comma-separated) that will be started with JOnAS. - - - - add a jonas.service.myservice.class - property specifying the service implementation class. - - - - add jonas.service.myservice.XXX - properties which specify the service configuration. These properties - will be set to the implementation class before the service - startup. - - - - This is illustrated as follows: - - jonas.services .......,myservice -jonas.service.myservice.class com.company.jonas.myservice.internal.DefaultMyService -jonas.service.myservice.property value -
    -
    - -
    - - Using the new service - - - When started, the new JOnAS service will espose an OSGi service as - defined in the iPOJO component declaration which will be accessible - through the OSGi registry. The specification of this service is defined by - the Java interface and could be concretely looked up by specifying the - com.company.jonas.myservice.IMyService interface. - There are many ways to get the OSGi service reference: - - - - Getting the OSGi service using the BundleContext:BundleContext bundleContext = … -ServiceReference serviceReference = bundleContext.getServiceReference(IMyService.class.getName()); -IMyService myService = (IMyService) bundleContext.getService(serviceReference); - - - - Getting the OSGi service using iPOJO. iPOJO components can - declare service requirements which will be dynamically injected to - the component instance. - - - - Using another Service Component Runtime (Declarative Service, - Dependency Manager, ...) - - -
    - -
    - - Advanced understanding - - - Refer to the JOnAS sources for more details about the classes - mentioned in this section. - -
    - - JOnAS built-in services - - - The existing JOnAS services are the following: - - - - - - Service name - - Service class - - - - - - registry - - CarolRegistryService - - - - jmx - - JOnASJMXService - - - - wc - - JOnASWorkCleanerService - - - - wm - - JOnASWorkManagerService - - - - ejb2 - - JOnASEJBService - - - - ejb3 - - EasyBeansService - - - - versioning - - VersioningServiceImpl - - - - web - - Tomcat6Service / Jetty6Service - - - - jaxrpc - - AxisService - - - - wsdl-publisher - - DefaultWSDLPublisherManager - - - - jaxws - - CXFService / Axis2Service - - - - ear - - JOnASEARService - - - - dbm - - JOnASDataBaseManagerService - - - - jtm - - JOTMTransactionService - - - - mail - - JOnASMailService - - - - resource - - JOnASResourceService - - - - security - - JonasSecurityServiceImpl - - - - discovery - - JgroupsDiscoveryServiceImpl / - MulticastDiscoveryServiceImpl - - - - cmi - - CmiServiceImpl - - - - ha - - HaServiceImpl - - - - depmonitor - - DeployableMonitorService - - - - resourcemonitor - - JOnASResourceMonitorService - - - - smartclient - - SmartclientServiceImpl - - - - -
    - -
    - - The ServiceException - - - The org.ow2.jonas.service.ServiceException - exception is defined for Services. Its type is - java.lang.RuntimeException and it can encapsulate - any java.lang.Throwable . -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_services_on_demand.xml b/jonas_doc/core/src/docbook/doc-en/howto_services_on_demand.xml deleted file mode 100644 index 89bb455f76ebbd701433e3a0ba886a8c426f61cc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_services_on_demand.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - Requiring <xi:include href="variables.xml" xpointer="appserver" /> - services in Java EE applications - - - In some case, Java EE applications you want to execute need specifics - services to run - correctly. If the required services are already started, that means you have - defined in the jonas.services property of the configuration file the list of - the services you want to start, there is no special things to do. But it may - be not the case for many reasons. One of them is that you didn't need thoses - services before deploying your applications. - - - <xi:include href="variables.xml" xpointer="appserver" /> service - dependency - - An application that sends emails needs the mail service to retrieve the - Session and MimePartDataSource objects. - - -
    - Declaring JOnAS service dependencies - - To ensure that a set of services will be started before deploying a Java - EE application, you have to set the - Require-JOnAS-Services attribute in the root - manifest file of the archive. The value of this property is a - comma-separed list of service names. Service names must match with the - ones defined in the jonas.properties configuration - file. In case of an EAR archive, there is no need to modify the manifest - files of the embedded JARs, WARs, RARs or CARs archives. - - - MANIFEST.MF file content - - Manifest-Version: 1.0 -... -Require-JOnAS-Services: mail,web - - -
    - Startup of required services - - During the deployment phase of an Java EE archive, the manifest - file is analysed to check if the - Require-JOnAS-Services property exists. For each - declared service, the server verifies wheither the service is already - started. If not, two operations should be performed: - - - - Install/start bundles for the required service if - needed - - - - Create configuration for the required service - - - - After that, the service should be started and the application can - also be started. - - - If the application is undeployed, there is at the moment no ways - to specify if these service dependencies should also be stopped or - uninstalled. - -
    - -
    - Addition of the manifest attribute during maven build - - The addition of the manifest attribute during a maven build can be - automated by configurating the maven plugin like below. - - ... - <configuration> - <archive> - <manifestEntries> - <Require-JOnAS-Services>service1,service12,..,servicen</Require-JOnAS-Services> - </manifestEntries> - </archive> - </configuration> - ... - - More info may be found here. -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_track_jdbc_connectionleaks.xml b/jonas_doc/core/src/docbook/doc-en/howto_track_jdbc_connectionleaks.xml deleted file mode 100644 index c8b12dd980e58e53a6e6c9d5e8b76b85dcb2583a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_track_jdbc_connectionleaks.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - Tracking JDBC Connection Leaks in Java EE Applications - - - When an application is managing itself the access to the database - through JDBC Datasources, the release of JDBC resources needs to be done. In - some cases, the close of the connection is not done. As the JOnAS - application server is using a pool to manage these accesses to the database, - it means that the pool may reach its maximum size as the connections are not - closed (and then put back into the pool). And if the pool reach its maximum - size, new requests will go in the wait state or wll be aborted. Thus, this - kind of problems is a huge problem in a production system. - - Fortunately, there are some features provided by JOnAS to handle this - case. - - - - For example there are JDBC Pooling mechanisms that will kill - connections if they've not be used since a long time (that can be - configured) so the pool can lowered its size. - - - - There is also a new feature that will close automatically - connections if they are not closed after their access. This feature is - provided through the JDBC JNDI Interceptor which may be configured with - JONAS_BASE/conf/jndi-interceptors.xml file. By - default, all connections that are not closed will be closed - automatically. This can be changed with the - forceClose option. Also, by default this mechanism - is applied on all datasources. This can be changed by updating the - jndiRegexp element. - - Here is an example disabling the automatic close of the connection - leaks and enabling the check on all the JDBC datasources by using - pattern. - - <jndi-interceptors xmlns="http://org.ow2.jonas.jndi.interceptors.impl.mapping"> - - <!-- Define interceptors --> - <interceptors> - - <!-- Detect leaks of JDBC connections --> - <ds-leak-detector resourceCheckerManager="#RCManager" forceClose="true" jndiRegExp=".*" /> - - - </interceptors> -</jndi-interceptors> - - - - JOnAS is providing informations that allows to track the root of - the problem in the source code of the application. For example, when - there is a connection leak, JOnAS is able to print in the log or to show - in the JOnAS Admin console (With the JDBC Connection Leaks module) the - line of code where the connection was opened. Thus, a quick review of - the code needs to be done in order to know why the close() instruction - has not be done. - - - diff --git a/jonas_doc/core/src/docbook/doc-en/howto_use_cdi.xml b/jonas_doc/core/src/docbook/doc-en/howto_use_cdi.xml deleted file mode 100644 index 2b5c1b11d8793d259fd026f669eae4eb2914ec52..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_use_cdi.xml +++ /dev/null @@ -1,414 +0,0 @@ - - - Use CDI in JOnAS - -
    - Java Context and Dependency Injection (CDI) - - - -
    - What is this all about ? - - In a nutshell, the Java Context and Dependency - Injection (CDI for short) is a - Java EE 6 specification that defines a powerful set - of complementary services that help improve the structure of application - code. - - - - A well-defined lifecycle for stateful objects bound to - lifecycle contexts, where the set of contexts is extensible - - - - A sophisticated, typesafe dependency injection mechanism, - including the ability to select dependencies at either development - or deployment time, without verbose configuration - - - - Support for Java EE modularity and the Java EE component - architecture - the modular structure of a Java EE application is - taken into account when resolving dependencies between Java EE - components - - - - Integration with the Unified Expression Language - (EL), allowing any contextual object to be used - directly within a JSF or JSP - page - - - - The ability to decorate injected objects - - - - The ability to associate interceptors to objects via - typesafe interceptor bindings - - - - An event notification model - - - - A web conversation context in addition to the three standard - web contexts defined by the Java Servlets specification - - - - An SPI allowing portable extensions to - integrate cleanly with the container - - - - CDI can be seen as a standard alternative to - proprietary containers (Spring framework, Guice, ...). - - -
    -
    - -
    - CDI Services - - Here is a quick description of the major features of the - CDI programming model. - -
    - Injection - - CDI injection is based on the Dependency - Injection specification (JSR 330) that - defines basic injection capabilities. CDI extends - this specification by adding the Qualifier annotation concept that helps - to disambiguate between 2 possible injection targets. - - It provides means to assemble your application components very - easily, using only annotations, in a type-safe way. - - Definition of a qualifier @Synchronous - annotation: - - @Qualifier -@Retention(RUNTIME) -@Target({METHOD, FIELD, PARAMETER, TYPE}) -public @interface Synchronous {} -Placed on top of a bean class, it qualifies the bean. - - /** - * Declaration of a PaymentProcessor bean qualified with @Synchronous. - */ -@Synchronous -class SynchronousPaymentProcessor - implements PaymentProcessor { - ... -} -It's used at the injection point to help the container choose - the right PaymentProcessor bean to inject. - - /** - * Declared a dependency on a PaymentProcessor bean qualified with @Synchronous - */ -@Inject @Synchronous PaymentProcessor paymentProcessor; - -
    - -
    - Interception - - Interception in the CDI model is also - annotation based. Any CDI bean can be intercepted - using the Java EE 5 interception mechanism - (@AroundInvoke). - - Interceptors allow common, cross-cutting concerns to be applied to - beans via custom annotations. Interceptor types may be individually - enabled or disabled at deployment time. - - The AuthorizationInterceptor class defines - a custom authorization check: - - @Secure @Interceptor -public class AuthorizationInterceptor { - @Inject @LoggedIn User user; - @Inject Logger log; - @AroundInvoke - public Object authorize(InvocationContext ic) throws Exception { - try { - if ( !user.isBanned() ) { - log.fine("Authorized"); - return ic.proceed(); - } - else { - log.fine("Not authorized"); - throw new NotAuthorizedException(); - } - } - catch (NotAuthenticatedException nae) { - log.fine("Not authenticated"); - throw nae; - } - } -} -The @Interceptor annotation, - identifies the AuthorizationInterceptor class as - an interceptor. The @Secure annotation is a - custom interceptor binding type. - - @Inherited -@InterceptorBinding -@Target({TYPE, METHOD}) -@Retention(RUNTIME) -public @interface Secure {} -The @Secure annotation is used to - apply the interceptor to a bean: - - @Model -public class DocumentEditor { - @Inject Document document; - @Inject @LoggedIn User user; - @Inject @Documents EntityManager em; - @Secure - public void save() { - document.setCreatedBy(currentUser); - em.persist(document); - } -} - - - - By default interceptors are not activated. They have to be - explicitely declared in the beans.xml - file. - - <beans xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> - <interceptors> - <!-- Interceptors are only activated if listed in the beans.xml file --> - <class>org.ow2.jonas.examples.cdi.interceptor.AroundMethodLogInterceptor</class> - </interceptors> -</beans> - -
    - -
    - Decoration - - The CDI programming model eases the usage of - the decorator - pattern. - - An abstract bean type (implementing an interface) can be annoted - with @Decorator, it has a - @Delegate annotated member and overrides one (or - more) methods of the interface. - - public interface User { - String getName(); - String getCompanyName(); -} - - - The LongNameUserDecorator will be applied - on all User beans. - - @Decorator -public abstract class LongNameUserDecorator implements User { - - @Inject - @Delegate - private User delegate; - - public String getName() { - return delegate.getName() + " (Last name added with @Decorator)"; - } - - - - - Like interceptors, decorators may be easily enabled or - disabled at deployment time with the beans.xml - file. - - <beans xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> - <decorators> - <!-- Decorators are only activated if listed in the beans.xml file --> - <class>org.ow2.jonas.examples.cdi.user.decorator.LongNameUserDecorator</class> - </decorators> -</beans> - -
    - -
    - Eventing - - CDI comes with a full featured eventing - support. It nicely decouple the observed object from the observers: the - container links each of them together. - - - -
    - Observed Element - - @SessionScoped @Model -public class Login implements Serializable { - @Inject Credentials credentials; - @Inject @Users EntityManager userDatabase; - @Inject @LoggedIn Event<User> userLoggedInEvent; - ... - private User user; - - @Inject - void initQuery(@Users EntityManagerFactory emf) { - ... - } - - public void login() { - List<User> results = ... ; - if ( !results.isEmpty() ) { - user = results.get(0); - userLoggedInEvent.fire(user); - } - } - @Produces @LoggedIn User getCurrentUser() { - ... - } -} -The Login class is injected with an - Event<User> instance (notice the - @LoggedIn qualifier annotation). - - When the User gets logged in, - userLoggedInEvent.fire(user) is executed and - all observer methods will be synchronously invoked. -
    - -
    - Observer Method - - @SessionScoped -public class Permissions implements Serializable { - @Produces - private Set<Permission> permissions = new HashSet<Permission>(); - @Inject @Users EntityManager userDatabase; - Parameter<String> usernameParam; - - ... - - void onLogin(@Observes @LoggedIn User user) { - permissions = new HashSet<Permission>( - userDatabase.createQuery(query) - .setParameter(usernameParam, user.getUsername()) - .getResultList() ); - } -} -Notice the onLogin() method, it's an - observer method because of the @Observes - parameter annotation. This method will be invoked when a - User event will be fired by a - @LoggedIn annotated - Event<User> field. -
    -
    - -
    - Scoping/Context - - Instance's life-cycle is bound to a scope (request, session, - application). - - Beans can de declared to be bound in one scope - - @SessionScoped -public class Order { ... } - - - Injection/Producers points can also be annotated with scope - requirements: - - public class Shop { - @Produces @ApplicationScoped @All - public List<Product> getAllProducts() { ... } - @Produces @SessionScoped @WishList - public List<Product> getWishList() { ..... } -} - -
    -
    - -
    - Activation - - In order to activate CDI on JOnAS, the 'cdi' - service must be declared in the - $JONAS_BASE/conf/jonas.properties in the - jonas.services property. - - jonas.services registry,jmx,... ,cdi -JOnAS is using Weld (the CDI reference implementation) under - the hood. - Current CDI support in JOnAS is limited to web applications. - Future versions will enable EJB and EAR support. - -
    - -
    - Resources - - - - Dependency Injection Specification (JSR - 330) - - - - @Inject Google - project - - - - Java Context and Dependency Injection Specification (JSR - 299) - - - - RedHat JBoss - Weld (Reference Implementation) + Documentation - - - - Apache - WebBeans (ASL2 Licensed Implementation) + Documentation - - - - JOnAS CDI Sample (in examples/ or online) - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_use_jaxrs.xml b/jonas_doc/core/src/docbook/doc-en/howto_use_jaxrs.xml deleted file mode 100644 index b8930f1a125f84f9bc5e0221ce0a6e75cf1c8529..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_use_jaxrs.xml +++ /dev/null @@ -1,254 +0,0 @@ - - - Use JAX-RS 1.1 in JOnAS - -
    - Introduction - - JAX-RS stands for Java API - for XML RESTful - Services (JAX-RS). It's a Java EE 6 specification - that introduces the REST - support in the Java EE platform. - - Its goal is to provide an easy to use REST development model based - on annotations for the Java platform. It's a server-side - only specification (no client API is described). - - The developer is responsible to declare REST - resources that will act as entry point to its - application: - - // The Java class will be hosted at the URI path "/helloworld" -@Path("/helloworld") -public class HelloWorldResource { - - // The Java method will process HTTP GET requests - @GET - // The Java method will produce content identified by the MIME Media type "text/plain" - @Produces("text/plain") - public String helloWorld() { - // Return some cliched textual content - return "Hello World"; - } -} -
    - -
    - JAX-RS Applications - - A JAX-RS application is an application model abstraction that allows - the developer to specify the list of resources and singleton classes that - will be exposed by the REST container. - - // Identifies the application path that serves as the base URI for all resource URIs provided by Path -@ApplicationPath("/application") -public class MyApplicaton extends Application { - - // Returns the list of resources that will be managed by the container - public Set<Class<?>> getClasses() { - Set<Class<?>> s = new HashSet<Class<?>>(); - s.add(HelloWorldResource.class); - return s; - } -} -
    - -
    - JAX-RS Resources - - Resources are the main concept manipulated all along JAX-RS. - -
    - Using Resources - - Root resource classes are POJOs (Plain Old Java Objects) that are - annotated with @Path, have at least one method - annotated with @Path or a resource method - designator annotation such as @GET, - @PUT, @POST, or - @DELETE. Resource methods are methods of a - resource class annotated with a resource method designator. - - HelloWorldResource is a root - resource: - - @Path("/helloworld") -public class HelloWorldResource { - - // Resource method - @GET - public String getClichedMessage() { - return "Hello World"; - } -} - -
    - Sub Resources - - Root resource methods can return types that are also resources - (annotated with @Path), that allows application - decomposition. - - HelloResource: - - @Path("/hello") -public class HelloResource { - - // Resource method - @GET - public WorldResource getClichedMessage() { - return new WorldResource(); - } -}And it's sub-resource - WorldResource: - - @Path("/world") -public class WorldResource { - - @GET - public String getClichedMessage() { - return "Hello World"; - } -} -
    -
    - -
    - Using Parameters - - - -
    - @PathParam - - @Path declares an URI path - template: it can contains variable definition. This - variable can then be accessed as a resource method parameter: - - @GET -@Path("/hello/{username}") -public String hello(@PathParam("username") String username) { - return "Hello " + username; -}A callable URI: - - /hello/Guillaume -
    - -
    - @QueryParam - - The HTTP query parameters (ex: ?param=value) - are also accessible as mapped method parameter: - - @GET -public String hello(@QueryParam("username") String username) { - return "Hello " + username; -}A callable URI: - - /hello?username=Guillaume -
    -
    - -
    - Using Mime-Types - - Resources can be configured to accept and produces specific input - (respectively output) types. - - -
    - -
    - @Consumes - - The @Consumes annotation declares the - expected MIME type that will be accepted by a resource. - - Only HTTP requests with the right Accept header - will be dispatched to the resource method: - - @POST -@Consumes("text/plain") -public void postClichedMessage(String message) { - // ... -} -
    - -
    - @Produces - - The @Produces annotation declares the MIME - type that will be returned by this resource method:@GET -@Produces({"application/xml", "application/json"}) -public String doGetAsXmlOrJson() { - ... -} -
    -
    - -
    - Activation in JOnAS - - In order to activate JAX-RS on JOnAS, the 'jaxrs' - service must be declared in the - $JONAS_BASE/conf/jonas.properties in the - jonas.services property. - - jonas.services registry,jmx,... ,jaxrs -JOnAS is using Jersey (the reference implementation) as - default JAX-RS provider. - - - The JAX-RS support in JOnAS is currently limited to Web - Applications - - JAX-RS Supports needs a Servlet 3.0 container: JOnAS - 'web' service in use must be Tomcat7 (at time of - writing): - - # -###################### JOnAS Web container service configuration -# -# Set the name of the implementation class of the web container service. -jonas.service.web.class org.ow2.jonas.web.tomcat7.Tomcat7Service - - -
    - -
    - Resources - - - - JAX-RS - Specification - - - - Representational State Transfer (REST) - - - - Oracle Jersey - (Reference Implementation) + Documentation - - - - Apache CXF - (ASL2 Licensed Implementation) + Documentation - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/howto_webspheremq.xml b/jonas_doc/core/src/docbook/doc-en/howto_webspheremq.xml deleted file mode 100644 index 7b3ecfd961faccf3f68afdc004b25930124c54b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_webspheremq.xml +++ /dev/null @@ -1,523 +0,0 @@ - -Using WebSphere MQ JMS guide - - - This document explains how WebSphere MQ (formerly MQSeries) can be used as JMS provider within a JOnAS application server. - - - WebSphere MQ is the messaging platform developed by IBM. It provides Java and JMS interfaces. Documentation is located at - - http://www-3.ibm.com/software/integration/mqfamily/library/manualsa/ - - . - - - This document was written after integration work done with JOnAS 3.3 and 3.3.1 and WebSphere MQ 5.3. - - - This document may be used only when working with JOnAS 3.3 - - - Since JOnAS 4.8 a specific resource adaptor JCA JOnAS-MQ is available for accessing to WebSphere MQ. The corresponding documentation is currently being written and will be available soon. - -
    Architectural rules - - - WebSphere MQ, contrary to JORAM or SwiftMQ, cannot run collocated with JOnAS. WebSphere MQ is an external software which must be independently administered and configured. - - - Administering WebSphere MQ consists of the following: - - - - Creating and configuring resources (such as queues) through the WebSphere MQ Explorer tool. - - - Creating the corresponding JMS objects ( - - javax.jms.Queue - - , - - javax.jms.Topic - - , - - javax.jms.QueueConnectionFactory - - , etc.), and binding them to a registry. - - - - The link between JOnAS and WebSphere MQ is established via the registry. WebSphere MQ JMS objects are bound to the JOnAS registry. JMS lookups will then return the WebSphere MQ JMS objects, and messaging will take place through these objects. - - - Given the complex configuration of WebSphere MQ JMS objects, it is not possible to create these objects from JOnAS. Therefore, during the starting phase, a JOnAS server expects that WebSphere MQ JMS objects have already been bound to the registry. Thus it is necessary to start an independent registry to which WebSphere MQ can bind its JMS objects, and which can also be used by the starting JOnAS server. The start-up sequence looks like the following: - - - - Starting a registry. - - - Creating and binding WebSphere MQ JMS objects. - - - Launching the JOnAS server. - - - - The following architecture is proposed: - - - - A JOnAS server (e.g., called "Registry") providing only a registry. - - - A JOnAS server (e.g., called "EJB") using the registry service of server "Registry." - - - A WebSphere MQ server running locally. - - -
    -
    Setting the JOnAS Environment - - - The proposed architecture requires running two JOnAS server instances. For this, the following steps are proposed: - - - - Create two base directories: e.g., - - JONAS_REGISTRY - - and - - JONAS_EJB - - . - - - Set the JONAS_BASE environment variable so that it points to the - - JONAS_REGISTRY - - directory. - - - In the $JONAS_ROOT directory, type: - ant create_jonasbase. - - - Set the JONAS_BASE environment variable so that it points to the - - JONAS_EJB - - directory. - - - In the $JONAS_ROOT directory, type: - ant create_jonasbase. - - - - The JOnAS servers can now be configured independently. - -
    Configuring the "Registry" server - - - The "Registry" server is the JOnAS server that will host the registry service. Its configuration files are in - - JONAS_REGISTRY/conf - - . - - - In the - - jonas.properties - - files, declare only the registry and jmx services: - - - - jonas.services registry,jmx - - - - In the carol.properties file, declare the jeremie protocol: - - - - carol.protocols=jeremie - - - - Its port can also be configured: - - - - carol.jeremie.url=jrmi://localhost:2000 - - -
    -
    Configuring the "EJB" server - - - The "EJB" server is the JOnAS server that will be used as the application server. Its configuration files are in - - JONAS_EJB/conf - - . Libraries must be added in - - JONAS_EJB/lib/ext - - . - - - In the jonas.properties files, set the registry service as remote: - - - - jonas.service.registry.mode remote - - - - ... and the JMS service as WebSphere MQ: - - - - jonas.service.jms.mom org.objectweb.jonas_jms.JmsAdminForWSMQ - - - - In the carol.properties file, declare the jeremie protocol and set the correct port: - - - - carol.protocols=jeremie - - - carol.jeremie.url=jrmi://localhost:2000 - - - - In - - lib/ext - - , the following libraries must be added: - - - - - com.ibm.mqjms.jar - - , including WebSphere MQ JMS classes. - - - - com.ibm.mq.jar - - , also a WebSphere MQ library. - - -
    -
    -
    Configuring WebSphere MQ - - - WebSphere MQ JMS administration is documented in chapter 5 of the - - "WebSphere MQ Using Java" - - document. - - - The configuration file of the JMS administration tool must be edited so that the JOnAS registry is used for binding the JMS objects. This file is the - - JMSAdmin.config - - file located in WebSphereMQ's - - Java/bin - - directory. Set the factory and provider URL as follows: - - - - INITIAL_CONTEXT_FACTORY=org.objectweb.jeremie.libs.services.registry. - - - jndi.JRMIInitialContextFactory - - - PROVIDER_URL=jrmi://localhost:2000 - - - - The JOnAS's - - client.jar - - library must also be added to the classpath for WebSphere MQ. - - - When starting, JOnAS expects JMS objects to have been created and bound to the registry. Those objects are connection factories, needed for connecting to WebSphere MQ destinations, and destinations. - - - JOnAS automatically tries to access the following factories: - - - - An - - XAConnectionFactory - - , bound with name "wsmqXACF". - - - An - - XAQueueConnectionFactory - - , bound with name "wsmqXAQCF". - - - An - - XATopicConnectionFactory - - , bound with name "wsmqXATCF". - - - A - - ConnectionFactory - - , bound with name "JCF". - - - A - - QueueConnectionFactory - - , bound with name "JQCF". - - - A - - TopicConnectionFactory - - , bound with name "JTCF". - - - - If one of these objects cannot be found, JOnAS will print a message that looks like the following: - - - - JmsAdminForWSMQ.start : WebSphere MQ XAConnectionFactory could not be retrieved from JNDI - - - This does not prevent JOnAS from working. However, if there is no connection factory available, no JMS operations will be possible from JOnAS. - - - If destinations have been declared in the - - jonas.properties - - file, JOnAS will also expect to find them. For example, if the following destinations are declared: - - - - jonas.service.jms.topics sampleTopic - - - jonas.service.jms.queues sampleQueue - - - - The server expects to find the following JMS objects in the registry: - - - - A - - Queue - - , bound with name "sampleQueue". - - - A - - Topic - - , bound with name "sampleTopic". - - - - If one of the declared destination cannot be retrieved, the following message appears and the server stops: - - - - JOnAS error: org.objectweb.jonas.service.ServiceException : Cannot init/start service jms': org.objectweb.jonas.service.ServiceException : JMS Service Cannot create administered object: java.lang.Exception: WebSphere MQ Queue creation impossible from JOnAS - - - Contrary to connection factories, the JOnAS administration tool allows destinations to be created. Since it is not possible to create WebSphere MQ JMS objects from JOnAS, this will work only if the destinations are previously created and bound to the registry. - - - For example, if you want to create a queue named "myQueue" through the JonasAdmin tool, this will only work if: - - - - A queue has been created through the WebSphere MQ Explorer tool. - - - The corresponding JMS - - Queue - - has been created and bound to the registry with the name "myQueue". - - - - To launch WebSphere MQ administration tool, type: - JMSAdmin - - - The following prompt appears: - InitCtx> - - - To create a - - QueueConnectionFactory - - and binding it with name "JQCF", type: - - - - InitCtx> DEF QCF(JQCF) - - - More parameters can be entered (for example for specifying the queue manager). - - - To create a - - Queue - - that represents a WebSphere MQ queue named "myWSMQqueue", and to bind it with name "sampleQueue", type: - - - - InitCtx> DEF Q(sampleQueue) QUEUE(myWSMQqueue) - - - Objects bound in the registry can be viewed by typing: - - - - InitCtx> DIS CTX - -
    -
    Starting the application - - - To start the registry server: - - - - Clean the local CLASSPATH: - set/export CLASSPATH="". - - - Set the JONAS_BASE variable so that it points to - - JONAS_REGISTRY - - . - - - Start the JOnAS server: - jonas start -n Registry. - - - - To administer WebSphere MQ: - - - - In WebSphere MQ's - - Java/bin - - directory, launch the JMSAdmin tool: - JMSAdmin. - - - Create the needed JMS objects. - - - - To start the EJB server: - - - - Clean the local CLASSPATH: - set/export CLASSPATH="". - - - Set the JONAS_BASE variable so that it points to - - JONAS_EJB - - . - - - Start the JOnAS server: - jonas start -n EJB. - - - - To start an EJB client: - - - - Add in the jclient classpath the - - ibm.com.mq.jar - - and - - ibm.com.mqjms.jar - - libraries. - - - Launch the client: - jclient ... - - -
    -
    Limitations - - - Using WebSphere MQ as JMS transport within JOnAS has some limitations, as compared with using JORAM or SwiftMQ. - - - First of all, WebSphere MQ is compliant with the old 1.0.2b JMS specifications. Code that is written following the JMS 1.1 latest spec (such as the jms samples provided with JOnAS) will not work with WebSphere MQ. - - - Depending on the WebSphere MQ distribution, JMS Publish/Subscribe may not be available. In this case, the message-driven bean samples provided with JOnAS will not work. For this reason, a - - specific sample - - is provided. - - - Finally, for an unknown reason, asynchronous consumption of messages (through message-driven beans) does not work in transactional mode. Further inquiry is needed to resolve this issue. - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/howto_win32_service.xml b/jonas_doc/core/src/docbook/doc-en/howto_win32_service.xml deleted file mode 100644 index 356d4abbd14f9874cd5b26d577c1e6892833cf10..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_win32_service.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - Execute JOnAS as a Windows Service - - - This document describes the procedures necessary to run JOnAS as a - system service on Microsoft Windows platforms. - -
    - - Instructions - - - The procedure uses the Tanuki Java Service Wrapper open source - project which must be downloaded and installed separately. - -
    - - Download and Install Apache ANT - - - - - Download Apache ANT - version 1.7.1 or later. - - - - Unzip the package to a directory in the local - filesystem. - - - - Set ANT_HOME environment variable to the root - directory for Apache ANT. - - For example, if the package for ANT version 1.7.1 is unzipped - into C:\Program Files , then set ANT_HOME = - C:\Program Files\apache-ant-1.7.1 - - - - Add %ANT_HOME%\bin to your PATH - environment variable. - - -
    - -
    - - Download and Install Java Service Wrapper - - - - - Download - Tanuki Java Service Wrapper version 3.3.9 or later (the - "Community Edition" is sufficient for executing JOnAS as a Windows - Service). - - - - Unzip the package to a directory in the local - filesystem. - - - - Set WRAPPER_HOME environment variable to the - root directory for Java Service Wrapper. - - For example, if the package for Wrapper version 3.3.9 is - unzipped into C:\Program Files , then set - WRAPPER_HOME = C:\Program - Files\wrapper-windows-x86-32-3.3.9 - - -
    - -
    - - Create the JOnAS Windows service - - - Before JOnAS can be run as a Windows service, it is necessary to - create a Java Service Wrapper configuration file. Prior to executing the - steps in this section, it is necessary to create a JONAS_BASE directory - as described in the JOnAS Configuration Guide - . - - - - Verify that JAVA_HOME is set as a system environment - variable. - - - - Verify that JONAS_ROOT, JONAS_BASE and WRAPPER_HOME - environment variables are set. - - - - Set %JONAS_ROOT%\templates\windows_service as the current - directory. - - - - Set environment variables required for JOnAS execution (see - list below). - - - - Execute ant - [-Djonas.name=<server_name>] - - - The -Djonas.name=<server_name> - parameter is optional. If not specified, the default server name - is 'jonas'. - - - - - Once this is done, the wrapper.conf file inside your - JONAS_BASE will be filled with all launch options required by - JOnAS. - - - Do not change the wrapper.conf file as it will be - regenared everytime you run the Apache ANT task. To put your own, - personalized options, use the wrapper_extra.conf file in - JONAS_BASE instead. - -
    - -
    - - Personalise JOnAS options - - - To add options to your JOnAS server running as a Windows service, - modify the wrapper_extra.conf file in JONAS_BASE. - - - Once this file is changed, you'll need to restart the JOnAS - service to see the effects. You do not need to reinstall the service, - thought. - -
    - -
    - - Test the JOnAS Windows service - - - After the %JONAS_BASE% directory has been updated for use with - Java Service Wrapper, the Windows service configuration can be tested by - executing the command: - jonas ntservice console - - - Once you see that JOnAS is running, simply press CTRL + C to stop - it. -
    - -
    - - Install the JOnAS Windows service - - - Once you're assured the Windows service is operational, install in - onto Windows using the following command: - jonas ntservice install - -
    - -
    - - Start the JOnAS Windows service - - - To start the JOnAS Windows service, you can use the Windows - Services control panel item or launch the following - command: - jonas ntservice start - - - - By default, JOnAS will be started automatically each time - Windows is started. After installing the service, it can be started - manually to avoid the need to reboot Windows. - -
    - -
    - - Stop the JOnAS Windows service - - - To stop the JOnAS Windows service, you can use the Windows - Services control panel item or launch the following - command: - jonas ntservice stop - -
    - -
    - - Restart the JOnAS Windows service - - - To restart the JOnAS Windows service, you can use the Windows - Services control panel item or launch the following - command: - jonas ntservice restart - -
    - -
    - - Uninstall the JOnAS Windows service - - - To uninstall the JOnAS Windows service, use the following - command: - jonas ntservice uninstall - - - - Do not re-create the JOnAS Windows service before uninstalling - it; else JOnAS might lose the reference to the Windows service entry - and therefore never manage to uninstall the service. - -
    -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/howto_wrapper.xml b/jonas_doc/core/src/docbook/doc-en/howto_wrapper.xml deleted file mode 100644 index 324d4ddf6c838f9ef95c3b0c2ac3e2eafb44839b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/howto_wrapper.xml +++ /dev/null @@ -1,223 +0,0 @@ - - - - Use JOnAS as an OS service - -
    - Introduction - - - This chapter is intended for users who want to use JOnAS as an operating system service. It's dedicated to - YAJSW integration. - -
    - -
    - Installation - - - Firstly download the JOnAS wrapper zip archive here. - Unzip it in the location where you want to install the wrapper root configuration. The default installation directory - is in JONAS_ROOT directory. Then you need to build the wrapper configuration dedicated to your - JONAS_BASE instance. - -
    - Using DeployME tools - - - Please, see DeployME documentation. - -
    - -
    - Using Wrapper ANT task - - The JOnAS wrapper archive provides ANT task in order to build the specific wrapper configuration dedicated to - your JONAS_BASE instance. - - The ANT script is located in ${JONAS_WRAPPER_ROOT}/templates/ant/ directory. - - - Example of a wrapper ANT task. - - <project name="JOnAS_BASE tools" - default="apply_configuration" - basedir="" - xmlns:jant="http://jonas.objectweb.org/ant"> - - <target name="init"> - - <property environment="myenv" /> - <property name="jonas.root" value="${myenv.JONAS_ROOT}" /> - <property name="jonas.base" value="${myenv.JONAS_BASE}" /> - - <taskdef name="wrapper" - classname="org.ow2.jonas.antmodular.jonasbase.wrapper.Wrapper" - classpath="../../lib/ant/ow2_jonas_wrapper_ant.jar"/> - </target> - - <target name="apply_configuration" depends="init"> - <wrapper serviceName="jonas" - serviceDescription="JOnAS OS service" - verbosity="false" - logfile="path/to/logfile" - logfileRollmode="JVM" - wrapperHome="path/to/wrapperHome" - javaHome="path/to/javaHome" /> - </target> - </project> - - - - - - serviceName property - optional. Specifies the name of the OS service. - - - serviceDescription property - optional. Specifies the description of the OS service. - - - verbosity property - optional. Specifies the verbosity mode. Default value is false. - - - logfile property - optional. Specifies the wrapper log file. Default value is set - to '${JONAS_BASE}/logs/wrapper.log' - - - logfileRollmode property - optional. Specifies the log file rollmode. Possible values - are 'JVM' (only one logfile per service) or 'DATE' (a log file per day). Default value is 'DATE'. - - - wrapperHome property - optional. Specifies the home of the wrapper root. Default - value is '${JONAS_ROOT}/wrapper'. - - - javaHome property - optional. Specifies the JAVA_HOME. If not set, the wrapper'll - use your JAVA_HOME system environment variable. - - - - Don't forget to set your JONAS_ROOT and JONAS_BASE environment variable. - To create a wrapper configuration for your JONAS_BASE instance: - - bash$ ant -file $JONAS_WRAPPER_ROOT/templates/ant/build-wrapper.xml - - -
    - -
    - Manual installation - - - - - Create a 'wrapper' directory in the JONAS_BASE directory. - - - Copy wrapper templates conf and binaries files (locate in ${JONAS_WRAPPER_ROOT}/templates/conf/conf/ and - ${JONAS_WRAPPER_ROOT}/templates/bat/bat) to your wrapper base directory (${JONAS_BASE}/wrapper/'). - - - Set your own configuration (see Advanced configuration section) - - - -
    -
    -
    - -
    - Usage - - - The JOnAS wrapper provides a jonas command in order to manage JOnAS as an Operating Service. The jonas command - - called jonas - can be found in 'JONAS_BASE/wrapper/bat/' directory. - - If the wrapper root installation directory is different than 'JONAS_ROOT/wrapper' directory, please set the - JONAS_WRAPPER_ROOT environment variable. - - - - Unix platforms - - Open a new terminal and proceed as follows: - - - bash> export JONAS_WRAPPER_ROOT=<your_install_dir> - - - - - Windows platforms - - Open a new DOS window and proceed as follows - - C:> set JONAS_WRAPPER_ROOT=<your_install_dir> - - - - -
    - jonas console - - Test the startup of the wrapped server in a console. - -
    - -
    - jonas install - - Install JOnAS as an operating system service. You need root privileges to install JOnAS as an operating system - service. - -
    - -
    - jonas start - - Start JOnAS OS service. You need root privileges to start JOnAS OS service. - -
    - -
    - jonas stop - - Stop JOnAS OS service. You need root privileges to stop JOnAS OS service. - -
    - -
    - jonas query - - Check the state of the JOnAS OS service (installed, running, ...). - -
    - -
    - jonas uninstall - - Uninstall JOnAS OS service. You need root privileges to install JOnAS as an operating system - service. - -
    -
    -
    - -
    - Advanced configuration - - - For advanced users, you can set you own configuration by editing ${JONAS_WRAPPER_BASE}/conf/jonas_wrapper_base.conf - configuration file. For more information, please see YAJSW - documentation. - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/index.html b/jonas_doc/core/src/docbook/doc-en/index.html deleted file mode 100644 index 6ee2239bfcb41c8aa767682b042e1a5fd0b32cb5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/index.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - JOnAS Platform Documentation - - - - - -

    - -

    JOnAS 5 Documentation

    -

    For a first approach of JOnAS, read the -Getting Started document. -[pdf version] -

    -

    In case you want to upgrade the JOnAS version, you should read the -Migration Guide -[pdf version]

    -

    The JOnAS documentation is divided in several guides, and some "howto" documents.

    - - -

    Thanks to Bruno Bellamy for the -JOnAS logo.

    - - diff --git a/jonas_doc/core/src/docbook/doc-en/install/install_j2ee.xml b/jonas_doc/core/src/docbook/doc-en/install/install_j2ee.xml deleted file mode 100644 index 0a9fa1e157eccf0c5249db34b44d3184915681cc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/install/install_j2ee.xml +++ /dev/null @@ -1,236 +0,0 @@ - -
    Installing JOnAS/Tomcat or JOnAS/Jetty from scratch - - - This guide provides instructions for installing JOnAS (with a web container already included) from scratch. - -
    J2SE SDK 1.4 installation - - - Download the binary version of a - - J2SE SDK 1.4 - - from the - - java Sun web site - - into the appropriate directory. Launch the executable file: - - - - ./j2sdk-1_<version number>-<system>.bin - - for Unix - - ./j2sdk-1_<version number>-<system>.sh - - for Linux - - j2sdk-1_<version number>-windows-i586.exe - - for Windows - - - Set the JAVA_HOME environment variable and update the path: - - - - export JAVA_HOME=<Installation Directory> - PATH=$JAVA_HOME/bin:$PATH (on Windows : PATH=%JAVA_HOME%/bin;%PATH%) - - -
    -
    ANT 1.6 installation - - - Download the binary version of Ant 1.6 from the - - Ant Apache web site - - . Untar or Unzip it into the appropriate directory: - - - - tar -jxvf apache-ant-1.6.1-bin.tar.bz2 - - ( - or - - unzip apache-ant-1.6.1-bin.zip - - ) - - - Set the ANT_HOME environment variable and update the path: - - - - export ANT_HOME=<Installation Directory> - PATH=$PATH;$ANT_HOME/bin (on Windows : PATH=%ANT_HOME%/bin;%PATH%) - - - - Download - - bcel-5.1.tar.gz - - from the - - Jakarta web site - - and install bcel-5.1.jar in the directory - - $ANT_HOME/lib. - - -
    -
    JOnAS/Web Container installation - - - Download the binary version of JOnAS with Tomcat or Jetty from the - - ObjectWeb forge web site - - . - Choose a location for the JOnAS installation. - Be aware that if you have already installed a previous version of JOnAS in this location, the new installation will overwrite the existing files, thus customized configuration files may be lost. Therefore, it is prudent to save these files before starting the installation process. - The installation process consists of untaring the downloaded file. - Change to the directory in which JOnAS will be installed and untar this file, using - the - - tar -zxvf jonas.tgz - - command. Note that this file can be opened with winzip on Windows. - After installing the JOnAS product, set the following environment variable: - - - - export JONAS_ROOT = <Installation Directory> - PATH = $JONAS_ROOT/bin/unix:$PATH (on Windows: PATH=%JONAS_ROOT%/bin/nt;%PATH%) - - -
    -
    Setup - - - Before using JOnAS, complete the following setup activities: - - - - If a - - CATALINA_HOME - - or - - CATALINA_BASE - - or - - JETTY_HOME - - environment variable has already been set, it should be unset. JOnAS will set these variables, without requiring any modifications. - - - Based on the data source being used, create a file - - <data source>.properties - - (templates are located in the directory - - $JONAS_ROOT/conf - - ). Then add the data source file name (without the extension - - .properties - - ) to the - - jonas.properties - - file: - - jonas.service.dbm.datasource <data source> - - Add the JDBC driver in - - $JONAS_ROOT/lib/ext - - or in - - $JONAS_BASE/lib/ext - - directory. - - - If required, configure the Mail service (for PetStore or the example mailsb, for example). JOnAS provides two types of mail factories: - - javax.mail.Session - - and - - javax.mail.internet.MimePartDataSource - - . Two types of files that can be adapted to fit your installation are located in the directory - - $JONAS_ROOT/conf - - : - - MailSession1.properties - - and - - MailMimePartDS1.properties - - . Then, in the - - jonas.properties - - file, define the - - jonas.service.mail.factories - - property: - - jonas.service.mail.factories MailSession1,MailMimePartDS1 - - - -
    -
    Starting JOnAS and running some examples - - - If the - - has not been completed as described, JOnAS may not - work - . - Use the command - - jonas check - - to verify that the environment is correct. - - - If the environment is - correct - , JOnAS is - ready - to use. - Do a - - jonas start - - , then use a browser to go - - http://localhost:9000/ - - . ( - Modify this url with the appropriate hostname - .) - From the root context in which JOnAS was deployed, you can execute the earsample, access the JOnAS administration application, as well as perform other functions. - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/install/install_jonas.xml b/jonas_doc/core/src/docbook/doc-en/install/install_jonas.xml deleted file mode 100644 index 10950b670b636d481db6db914a810304a68ed5d3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/install/install_jonas.xml +++ /dev/null @@ -1,57 +0,0 @@ - -
    - Installing JOnAS from scratch - - The JOnAS distribution can be downloaded as a .tar.gz or .zip - file. - - The installation process simply consists of unzipping the - downloaded .tar.gz file. - - To install using the .tar.gz file, select a location for JOnAS - installation, for example your_install_dir, and point to it. - - - - Unix platforms - - bash> tar -zxvf <jonas-file-name>.tar.gz - jonas-osgi-5.x.y/ - jonas-osgi-5.x.y/conf/ - jonas-osgi-5.x.y/examples/ - jonas-osgi-5.x.y/examples/javaee5-earsample/ - jonas-osgi-5.x.y/examples/javaee5-earsample/etc/ -... - - - - Be aware that if the same version of JOnAS has already been - unpacked in the same directory, the new installation will - overwrite previous files, and configuration files that have been - customized may be lost. In this case, it is recommended that these - files be saved before re-starting the installation process. - - - - - Windows platforms - - Open a new DOS window and proceed as follows: - - If the .zip file format - was downloaded, you must use a utility program such as WinZip or - IZArc to extract the - files from the archive. - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/j2ee/classloader.xml b/jonas_doc/core/src/docbook/doc-en/j2ee/classloader.xml deleted file mode 100644 index 0fd8506247911fe2bc4f3cf8df0c1eeca3dc7e9c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/j2ee/classloader.xml +++ /dev/null @@ -1,616 +0,0 @@ - -
    - - JOnAS classloading architecture - - - This section introduces the classloading architecture of JOnAS. - -
    - - Understanding class loaders hierarchies - - - Obviously, a ClassLoader is used to load - classes (and resources) that will then be usable from the application. - Most of the ClassLoaders are URLClassLoaders, that - means that they are based on a set of URLs. Theses URLs will be the place - where the ClassLoader, when asked for a resource (using its fully - qualified name, ie including full package name), will try to find the - resource. - - An URLClassLoader always have a parent - ClassLoader. When loading a class, the first thing a ClassLoader do is to - ask its parent to load the class (this is recursive). If the parent return - the Class, it's returned to the caller. Otherwise, the URLs will be search - for the given class. this is the default Java delegation model (parent - first). - - Let's roll with an example: you have a ClassLoader (let's call it A) - that can load the class Test, A is the parent of B, - but B do not contains the Test class, and B is the - parent of C, with C that contains also the Test - class. Clearly, there is a ClassLoader hierarchy here (C->B->A, with - "->" meaning "is child of"). If you ask C to load - Test, the following steps will be performed: - - - - C have B as parent, so asks B to try to load - Test - - - - B have A as parent, so asks A to try to load - Test - - - - A is the top level ClassLoader, no parent, it will try to load - test by itself - - - - As A contains the Test class, it can be - loaded and returned - - - - B see that A (its parent) have loaded the class, so it return it - as is - - - - C see that B (its parent) have loaded the class, so it return it - as is - - - - - Using the Java delegation model, the loaded class is always - coming from the parent ClassLoader that is closer to the System class - loader (the well known CLASSPATH), even if the class - exists in a lower level ClassLoader (aka child ClassLoaders). - Java EE makes an heavy use of ClassLoaders: the application - server in itself may be composed of multiple ClassLoaders and the Java EE - applications (EAR, Rar, War, EjbJar) themselves are using - ClassLoaders. - - An application is deployed by its own class loader. This means, for - example, that if a Web Application and an EjbJar are deployed separately, - the classes contained in the two archives are loaded with two separate - classloaders with no hierarchy between them. Thus, the EJBs from within - the JAR will not be visible to the Web components in the WAR. This is not - acceptable in cases where the Web components of an application need to - reference and use some of the EJBs (this concerns local references in the - same JVM). - - - Class loaders are used to ensure class space - isolation. - - - For this reason, prior to EAR files, when a Web application had to - be deployed using EJBs, the EjbJar had to be located in the WEB-INF/lib directory of the Web - application. - - Currently, with the Java EE integration and the use of the EAR - packaging, that kind of class visibility problems no longer exist and the - EjbJar is no longer required in the WEB-INF/lib directory. - - The following sections describe the JOnAS class loaders and explain - the mechanism used to locate the referenced classes. -
    - -
    - - Application Server's class loaders - - - JOnAS is basically an assembly of modules providing the features - that makes JOnAS an application server. Each of the modules have an - associated class loader. All theses loaders have visibility constraints, - meaning that some of the internal classes or libraries used by JOnAS are - hidden from the application class space. In clear, even if JOnAS may use a - library also used by a deployed application, there will be no - conflicts. - Having visibility constraints on class loaders reduce the risks - of conflicting libraries. - - - The loaders of JOnAS are not in a tree hierarchy. They all share the - same parent class loader (the System classloader), so it's a flat - hierarchy. Nevertheless, there are links (aka wires) between theses class - loaders. A module can export some of its packages (and thus, all the - classes from that package) to the system. Theses exported packages can - then be imported by other modules. That creates a wire. As a module can be - wired to multiple others modules, the class loaders of the application - server forms an oriented graph of loaders. - The class loading rules are described in much more details in - the OSGi specification. - - Only exported packages are available to the applications - - - - - - - - - - -
    - Extending JOnAS class loaders - - As JOnAS is build on a modular system - (OSGi), it's very natural to "extends" the - application server's class space. - - There are 2 way that can be used to augment the class - space: - - - - Place an OSGi bundle containing your - classes in the ${jonas.base}/deploy/ - directory - - It will be deployed as any normal bundle, and if it's - resolved (ie all imported packages are found), all the packages - exported by this bundle will be made available to the server (and - applications). - This is the preferred way to augment the class - space. - - - - - Place a classic jar file in the ${jonas.base}/lib/ext/ (or ${jonas.root}/lib/ext/). During JOnAS - startup, theses jar files will automatically be transformed into - bundle (using default creation rules) and installed like all other - bundles. - - - The default rule is: every required packages that is not - in the jar file will be imported, and every packages of the - jar will be exported. - - This option, even if it is seducing, should be used with - caution: it can break application server modularity (if they - export a package required by some of the JOnAS modules, maybe - that can cause weird classes exceptions), and, because of the - default transformation rule (all is exported), it's highly - possible that a jar file will export some internal packages - that should not have been exposed to the world. - - So the right method to augment the class space is to - provide a well constructed bundle (with imports and exports - constrained with versions). - - - -
    - -
    - Using JDBC driver jars - - In order to connect the applications to an external database (not - HSQL which is embedded in JOnAS), the user must - provide the jar file that contains the JDBC Driver's - classes. - - Providing theses jar files are just like extending JOnAS class - loaders: - - - - The driver's jar file is already an - OSGi bundle, so it can be placed in - ${jonas.base}/deploy and it - will be deployed automatically - - - - The jar file is not a bundle, it could be placed in - ${jonas.base}/lib/ext and - will be (at startup only) transformed into a - bundle (see previous section for detailed information), or the - user takes the responsability of transformation (more fine control - on the bundle). - - -
    -
    - -
    - - Java EE module's class loaders - - - Java EE modules are following the classic, hierarchical, parent - oriented graph of class loaders. - - The class loader hierarchy for Java EE modules that allows the - deployment of EAR applications without placing the EJB JAR in the - WEB-INF/lib directory consists of - the following: - Work in progress - - -
    - Standalone resource - adapters loader - - This class loader, child of the OSGi class - loader, contains only the libraries provided by the system level - resource adapters (i.e. resource adapters not part of an EAR - application). - - This class loader is the parent of all the deployed Java EE - modules: - - - - Standalone Web Applications (.war files) - - - - Standalone EjbJars (.jar files) - - - - Java EE Applications (.ear files) - - - - This means that all the classes available from this loader are - also made available for the child loaders. -
    - -
    - Standalone EjbJar loader - - A standalone EjbJar classloader contains the classes packaged - inside of the ejbjar. The parent of this classloader is the . It can therefore see - all the classes available from the system level resource adapters and - its ancestors. - - The classloading policy of this loader is to ask its parent first, - and then (if the class was not found) try to search in itself. - There is no way to invert the classloading policy of an EjbJar - classloader. -
    - -
    - Standalone WebApp loader - - The classloader for standalone web applications modules contains - the classes and libraries packaged inside of the war. - - It contains the WEB-INF/classes/ directory (that usually - matches the classes of the application) and all the jar files located - under the WEB-INF/lib/ directory. - Notice that only jars directly under the lib/ directory are available, jars in - WEB-INF/lib/subdirectory/ will - not be accessible from the classloader. - - The parent of the standalone webapp classloader is the , meaning that all - standalone web applications will be able to use system level resource - adapters classes/libraries and the classes available from its - ancestors. - - A webapp loader also have a direct link with the system - classloader (classes of the JVM + what's available from the - CLASSPATH environment variable). All class - loading actions are first directed to the system classloader - to avoid JVM class overloading from the web application (in short, - guards the developer from overloading primordial classes). - - Then, if the system classlaoder did not find the required class, - the loader will ask either the parent, or itself. Asking the parent or - itself is configured by the delegation model choosed by the - developer. - - - By default, java2 delegation model is turned on. - - -
    - Java 2 delegation model - - The default classloading policy of a web application in an - application server (in opposition of a webapp hosted in a standalone - servlet container) is to ask the parent loader first, and then look - inside itself (if the parent did not find the required class), this is - the default java2 delegation model. - - Nevertheless, a web application developer can configure the web - classloader to use first itself, then ask the parent loader. That - means that the web application classes will have more priority than - classes from the parent loader, in other words it can be used to - overload some classes provided by the application server. - - The delegation model can be configured using the - WEB-INF/jonas-web.xml specific deployment - descriptor, as shown below. - - <?xml version="1.0" encoding="ISO-8859-1"?> -<jonas-web-app xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://jonas.ow2.org/ns/jonas-web-app_4_0.xsd"> - <!-- - true : the context uses a classloader using the Java 2 delegation model (default) - false : the class loader looks inside the web application first, before asking parent class loader - --> - <java2-delegation-model>false</java2-delegation-model> -</jonas-web-app> -
    -
    - -
    - - EAR class loader - - - The EAR class loader is the common parent (directly or indirectly) - of all the class loaders of the inner modules (ejbjars, rar, webapps). - There is only one EAR class loader per EAR application. This class - loader is the child class loader, thus making JOnAS classes visible to - it. The parent of all the EAR class loaders is a JOnAS special class - loader that is able to seek for classes/resources exported by all the - other module's class loaders of JOnAS. - -
    - Class-Path: entries and lib/folder - - In Java EE 5, if libraries are required to any module packaged - into the EAR file, these libraries could be added in the lib/ folder - of the EAR. - - By using this mechanism, the use of "Class-Path" entries in the - MANIFEST file of each application (WAR / EJB-JAR) is no longer - required. -
    -
    - -
    - - EJB class loader - - - The EJB class loader is responsible for loading all the EJB JARs - of the EAR application, thus all the EJBs of the same EAR application - are loaded with the same EJB classloader. This class loader is the child - of the EAR class loader. -
    - -
    - - WEB class loader - - - The WEB class loader is responsible for loading the Web - components. There is one WEB class loader per WAR file, and this class - loader is the child of the EJB class loader. Using this class loader - hierarchy (the EJB class loader is the parent of the WEB class loader) - eliminates the problem of visibility between classes when a WEB - component tries to reference EJBs; the classes loaded with the EJB class - loader are definitely visible to the classes loaded by its child class - loader (WEB class loader). - - The compliance of the class loader of the web application to the - java 2 delegation model can be changed by using the - WEB-INF/jonas-web.xml file. This is described in - the section Defining the - Web Deployment Descriptor. - - If the java2-delegation-model element is set to - false, the class loader of the web application looks for the class in - its own repository before asking its parent class loader. See for more detailed - explanations. -
    -
    - -
    - Filtering class loaders - -
    - The problem - - By default, all classes exported by the application server can be - accessed within an application. Sometimes this may cause problems if - there are different versions of the library (in the AS and in the - application). - - For example, JOnAS is using Apache Commons Digester. If an - application wants to use an older version of this library, there is a - problem as the default loading mechanism of classes is searching first - in the parent classloaders. Then the library provided by JOnAS and not - by the application will be used. - - For web applications, this mechanism could be changed by using - java2-delegation-model but this may raise problems - for EAR case, etc. -
    - -
    - The solution - - JOnAS is providing the concept of filtering classloader. A - filtered classloader will hide to applications some packages/resources - exported by the Application Server. - - A FilteringClassLoader is simply placed - between a child ClassLoader and its parent and - filter any requests coming from the child to the parent. - -
    - Filtering ClassLoader Principle - - - - - - -
    - - This approach allows a fine grain control over what is visible or - not from a given ClassLoader. - - Any loading request for a resource will trigger a matching against - a list of excluded patterns. If any of the pattern match, the resource - will not be loaded and the flow will return to the caller. - - Loading of a filtered resource (image, static content, ...) will - result in null (the usual return for a resource not - found) being returned. If the loading request a filtered class, a - ClassNotFoundException will be thrown back to the - caller (the usual return when a class is not found). -
    - -
    - Filtering system resources - - Some filters are configured by default in JOnAS. They will be - applied to the "standalone rars" ClassLoader, effectively filtering - resource/class request from all the deployed applications (among just - the standalone resource adapters). This is a system - wide configuration. - - These default filters are located in the - JONAS_BASE/conf/classloader-default-filtering.xml - file. - - <class-loader-filtering xmlns="http://org.ow2.jonas.lib.loader.mapping"> - - <!-- List of filters used to exclude packages/resources that are used internally by - the Application Server but that will not be available to applications. - An empty list will not hide any packages to the applications - This list is used both to hide resources and classes to applications. --> - <default-filters> - <filter-name>org.apache.commons.digester.*</filter-name> - </default-filters> -</class-loader-filtering> - - By modifying the set of filters, some packages will be hidden to - the applications. Note that resources name can be specified. For - example, when putting a resource in JONAS_BASE/conf folder, this resource can - be obtained by using ClassLoader.getResource() - method. By adding a filter on this resource, the resource won't be - available to applications (This includes EAR, WAR and EJB-JAR - modules). -
    - -
    - Filtering deployed modules - - In addition of the system wide filters configuration, JOnAS allows - Java EE modules to provide themselves the filters they requires. - - It can be done by providing a - classloader-filtering.xml file in the info - directory of the deployed module (META-INF/ or WEB-INF/). - -
    - Supported module types - - Not all modules supports the classloader filtering - feature. - - Supported modules includes: - - - - EAR applications (.ear) - - - - Web Applications (.war), inside or outside an - application - - - - EjbJars (.jar), only - the ones outside of an application - - - - - Web Applications filtering rules also apply when they are in - an application (EAR). - -
    - -
    - Declaring the filters - - A Java EE module declares the filters it requires with an XML - file named META-INF/classloader-filtering.xml - (WEB-INF/classloader-filtering.xml for a web - application). its format is very similar to the system wide - configuration file (<default-filters> simply - become <filters>): - - <class-loader-filtering xmlns="http://org.ow2.jonas.lib.loader.mapping"> - - <filters> - <!-- Excludes all CXF resources as another version is embed in the web application --> - <filter-name>org.apache.cxf.*</filter-name> - <!-- plus some other dependencies of CXF ... --> - <filter-name>org.springframework.*</filter-name> - <filter-name>net.sf.cglib.*</filter-name> - <filter-name>org.objectweb.asm.*</filter-name> - </filters> - -</class-loader-filtering> -
    - -
    - What about Rars and Ejbjars ? - - Standalone Resource Adapters are all sharing the same - ClassLoader. This loader is the parent of all - the applications and is the one that is filtered by the system wide - configuration file. That means that standalone Rars cannot have their - own filtering configuration. They have to use (or modify) the - classloader-default-filtering.xml file to fit - their needs. - - EjbJars in Ear do not have support for the filtering. First, an - EjbJar should not contains any library, so what could you filter ? - Then EjbJars are all placed (along with Ear libraries) inside a unique - ClassLoader, direct child of the application - loader (containing Rars embed in the Ear), so they can indirectly - benefit from the filters declared inside the application. -
    -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/j2ee/j2ee-app.xml b/jonas_doc/core/src/docbook/doc-en/j2ee/j2ee-app.xml deleted file mode 100644 index b4b29563ceafe2e6aac4ab0f77709943701f68b8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/j2ee/j2ee-app.xml +++ /dev/null @@ -1,28 +0,0 @@ - -
    - - Application Deployer and Administrator - - - JOnAS provides tools for the deployment and administration of - Enterprise Beans (EJB JARs), Web applications (WARs), and Java EE - applications (EARs). - - The Deployment - and Installation Guide covers issues related to the deployment of - application components. - - The Administration - Guide presents information about how to manage the JOnAS server and - the JOnAS services that allow deployment of the different types of - application components: EJB Container service, Web Container service, and - EAR service. -
    diff --git a/jonas_doc/core/src/docbook/doc-en/j2ee/j2ee-ejb.xml b/jonas_doc/core/src/docbook/doc-en/j2ee/j2ee-ejb.xml deleted file mode 100644 index 9e2ff40234f16d649ff5c449d9e7fbe604cc943e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/j2ee/j2ee-ejb.xml +++ /dev/null @@ -1,50 +0,0 @@ - -
    - - Enterprise Bean Creation - - - The individual in charge of developing Enterprise Beans should consult - the for instructions on how to perform the following tasks: - - - - Write the source code for the beans. - - - - Specify the deployment descriptor. - - - - Bundle the compiled classes and the deployment descriptor into an - EJB JAR file. - - - - JOnAS 5 supports both versions 2 and 3 of the Enterprise Java Beans - (EJB) specifications. Programming and configuration methods between these - two versions have changed drastically, we therefore provide you with two - different programmer's guides: - - - - Enterprise Beans - Programmer's Guide, for EJB version 3 (recommended) - - - - - - Enterprise Beans - Programmer's Guide, for EJB version 2 - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/j2ee/j2ee-web.xml b/jonas_doc/core/src/docbook/doc-en/j2ee/j2ee-web.xml deleted file mode 100644 index c26af95c68779d37ef372c318251eaaaac4bf483..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/j2ee/j2ee-web.xml +++ /dev/null @@ -1,36 +0,0 @@ - -
    - - Web Components Creation - - - Web designers in charge of JSP pages and software developers providing - servlets can consult the Web Application Programmer's Guide. - - The Developing Web - Components guide explains how to construct Web components, as well as - how to access Enterprise Beans from within the Web Components. - - Deployment descriptor specification is presented in the Defining the Web Deployment - Descriptor chapter. - - Web components can be used as Web application components or as Java EE - application components. In both cases, a WAR file will be created, but the - content of this file is different in the two situations. In the first case, - the WAR contains the Web components and the Enterprise Beans. In the second - case, the WAR does not contain the Enterprise Beans. The EJB JAR file - containing the Enterprise Beans is packed together with the WAR file - containing the Web components, into an EAR file. Principles and tools for - providing WAR files are presented in WAR Packaging and the Deployment and Installation - Guide. -
    diff --git a/jonas_doc/core/src/docbook/doc-en/j2eeclient_pg.xml b/jonas_doc/core/src/docbook/doc-en/j2eeclient_pg.xml deleted file mode 100644 index f276242d211a704966afb382a3bc8fb4347d9765..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/j2eeclient_pg.xml +++ /dev/null @@ -1,420 +0,0 @@ - - - - Java EE Client Programmer's Guide - - - - JOnAS Team - - - - COQPhilippe - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - Feb 2008 - - - - The target audience for this guide is the Client component provider, - i.e. the person in charge of developing the Client components on the - client side. It describes how the Client component provider should build - the deployment descriptors of its Client components and how the client - components should be packaged. - - - - - Launching Java EE Client Applications - - -
    - - Launching clients - - - The Java EE client application can be - - - - a standalone client in a .jar file, - - - - a client bundled in an .ear file. An ear can contain many java clients. - - - - a class name which must be found in the CLASSPATH. - - - - All the files required to launch the client container are in the - JONAS_ROOT/lib/client.jar file. This jar includes a - manifest file with the name of the class to launch. To launch the client - container on a computer where a JONAS_TROOT is present , simply - type: - - jclient -? . This will launch the client container - and display usage information about this client container. - - To launch the client container on a remote computer, copy the - client.jar and invoke the client container by typing java -jar - path_to_your/client.jar - - The client that must be launched by the client container is given - as an argument of the client container. example : java -jar - client.jar myApplication.ear or java -jar client.jar - myClient.jar . -
    - -
    - - Configuring client container - - -
    - - JNDI access - - - Defining the JNDI access and the protocol to use is an important - part of configuration. The JOnAS server, as well as the - ClientContainer, uses the values specified in the - carol.properties file. This file can be used at different - levels. The carol.properties is searched with the - following priority (high to low): - - - - the - - carol.properties - - specified by the - - -carolFile - - argument to the client container - - - - the - - carol.properties - - packaged into the client application (the jar client) - - - - if not located previously, it will use the - - carol.properties - - contained in the - - JONAS_ROOT/lib/client.jar - - . - - - - A convenient way is to update the carol.properties - of a client.jar with a customized - carol.properties file. That is, use the jar -uf - client.jar carol.properties command. -
    - -
    - - Trace configuration - - - The client container client.jar includes a - traceclient.properties file. This is the same file as the one - in JONAS_ROOT/conf directory. A different configuration - file can be used for the traces by specifying the parameter - -traceFile when invoking the client container. The file in the - client.jar can be replaced with the jar -uf - client.jar traceclient.properties command. -
    - -
    - - Classpath configuration - - - Some jars/classes can be added to the client container. For - example if a class requires some extra libraries/classes, the option - -cp path/to/classes can be used. - - The classloader of the client container will use the - libraries/classes provided by the -cp flag. -
    - -
    - - Specifying the client to use (EAR case) - - - An ear can contain many java clients, which are described in the - application.xml file inside the - <module><java> elements. To invoke the client - container with an ear, such as java -jar client.jar my.ear - , specify the java client to use if there are many clients. - Otherwise, it will take the first client. To specify the jar client to - use from an ear, use the argument -jarClient and supply - the name of the client to use. The earsample example in - the JOnAS examples has two java clients in its ear. -
    - -
    - - Specifying the directory for unpacking the ear (EAR - case) - - - By default, the client container will use the system property - java.io.tmpdir To use another temporary directory, - specify the path by giving the argument -tmpDir to the - client container. -
    - -
    - - Disable Automated WsGen - - - By default, the client container will apply WsGen (generation of - web services artifacts) on all given archives. To disable that feature - (because WsGen has already been applied on the application, or because - the client contains no web services), add the -nowsgen - option to the client container. -
    -
    - -
    - - Examples - - - The Java EE 5 EAR Sample located under - $JONAS_ROOT/examples/javaee5-earsample provides three application - clients showing how to interact with the application in different ways, - and under different security levels. - - These application clients are described in details in Getting - started with JOnAS 5 -
    -
    - - - - Defining the Client Deployment Descriptor - - -
    - - Principles - - - The Client component programmer is responsible for providing the - java class of the Client annotated accordingly to the Java EE 5 - Specification. - - If the Client component programmer wants to provide a XML - deployment descriptor, this one mus be compliant to the XML Schema for - the application client 5 deployment descriptor http://java.sun.com/xml/ns/javaee/application-client_5.xsd - - To customize the Client components, information not defined in the - standard XML deployment descriptor may be needed. - - The JOnAS-specific deployment descriptor's XML schema is located - in http://jonas.ow2.org/ns/jonas-client_5_0.xsd - -
    - -
    - - - - Examples of Client Deployment Descriptors - - - - - - - - Example of a standard Client Deployment Descriptor - (application-client.xml): -<?xml version="1.0" encoding="UTF-8"?> - -<application-client - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/application-client_5.xsd" - version="5"> - - <display-name>OW2 JOnAS :: EAR Sample :: JMS Application Client</display-name> - - <!-- The JMS ConnectionFactory to use --> - <resource-ref> - <res-ref-name>jms/QueueConnectionFactory</res-ref-name> - <res-type>javax.jms.QueueConnectionFactory</res-type> - <res-auth>Container</res-auth> - </resource-ref> - - <!-- The JMS Queue where Messages will be send --> - <resource-env-ref> - <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name> - <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type> - </resource-env-ref> - -</application-client> - - - - - - - Example of a specific Client Deployment Descriptor - (jonas-client.xml): <jonas-client xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://jonas.ow2.org/ns/jonas-client_5_0.xsd" > - <jonas-resource> - <res-ref-name>jms/QueueConnectionFactory</res-ref-name> - <jndi-name>JQCF</jndi-name> - </jonas-resource> - - <jonas-resource-env> - <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name> - <jndi-name>SampleQueue</jndi-name> - </jonas-resource-env> -</jonas-client> - - - - For advices about xml file writing, refer to - - - - . -
    -
    - - - - Client Packaging - - -
    - - Principles - - - Client components are packaged for deployment in a standard Java - programming language Archive file called a jar file (Java ARchive). The - document root contains a subdirectory called META-INF , which contains - the following files and directories: - - - - application-client.xml : The standard xml deployment descriptor in the format defined in the Java EE 5 Specification. Refer to - - http://java.sun.com/xml/ns/javaee/application-client_5.xsd - - . - - - - jonas-client.xml : The optional JOnAS specific xml deployment descriptor in the format defined in - - http://jonas.ow2.org/ns/jonas-client_5_0.xsd - - . - - - - The manifest of this client jar must contain the name of the class - to launch (containing the main method). This is defined by the value of - the Main-Class attribute of the manifest file. For a standalone client - (not bundled in an Ear), all the Ejb classes (except the skeleton) on - which lookups will be performed must be included. -
    - -
    - - Example - - - Two examples of building a java client are provided. - - - - The first is the - - build.xml - - of the - - earsample - - example with a java client inside the ear. Refer to the client1jar and client2jar targets. - - - - The second is the - - build.xml - - of the - - jaasclient - - example with a java standalone client which performs a lookup on an EJB. Refer to the clientjars target. - - -
    -
    - - - - Appendix - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/j2eeprogrammerguide.xml b/jonas_doc/core/src/docbook/doc-en/j2eeprogrammerguide.xml deleted file mode 100644 index 2510f6b35cbe09be166146c723a07acf45dc64b0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/j2eeprogrammerguide.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - Java EE Programmer's Guide - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - Feb 2008 - - - - The target audience for this guide is the application component - provider, i.e., the person in charge of developing the software components - on the server side (the business tier). - - - - - Principles - - - JOnAS supports two types of Java EE application components: - Enterprise Beans and Web components. In addition to providing guides for - construction of application components, guides are supplied for - application assembly, deployment, and administration. - - - - - - - -
    - - Java EE Application Assembler - - - The application assembler in charge of assembling the application - components already bundled in EJB JAR files and WAR files into a Java EE - EAR file, can obtain useful information from the Java EE Application Assembler's Guide - . -
    -
    - - - - JOnAS Class Loader - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/jaxws_developer_guide.xml b/jonas_doc/core/src/docbook/doc-en/jaxws_developer_guide.xml deleted file mode 100644 index 9267458928918f67d427c12db21de3e205c7e4cb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/jaxws_developer_guide.xml +++ /dev/null @@ -1,1599 +0,0 @@ - - - - JAX-WS Developer's Guide - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2009 - - OW2 Consortium - - - March 2009 - - - - Preface - - JAX-WS stands for Java API - for XML - WebServices. It's a technology - used to implement webservices endpoints and webservices clients - communicating using XML. - - SOAP and XML messaging is a complex domain, but JAX-WS aims to hide - the complexity of that domain. Endpoint development is an easy task: the - developer writes a Java interface that will defines the available - webservices operations, writes a concrete class (can be multiple class in - case of inheritance) that will implement the Java interface. A minimal set - of annotations is required to declares the class and interface as - webservices. Writing webservices client is also an easy task: using - generated classes from a given WSDL, the client can access the webservice - without knowing any technical details. This is the role of the JAX-WS - engine to do all the XML marshalling/unmarshalling, SOAP processing, - ... - - With JAX-WS, developers takes both advantages of a standard Java - webservices specification (portability) and of the Java platform - independence (OS/hardware neutral). Moreover, with JAX-WS (and webservices - in general), a client can access a webservice not implemented with Java - and vice versa. This is possible because JAX-WS respects the W3C - recommendations (World Wide - Web Consortium) for HTTP, SOAP - and WSDL (WebServices Description Language). - - - - Developing a Webservice Endpoint - - A Webservice endpoint is the implementation of a webservice. It's a - server side artifact that can answer to webservices requests. - - An endpoint can be implemented using a POJO or using a Stateless - EJB3. - - Two approaches can be used to develop an endpoint: - - - - Starting from Java - - - - Starting from WSDL - - - - Taking one of theses 2 approaches is the developer's choice. - -
    - Starting from Java - - Choosing a Java-first approach is typical of a webservices - development from scratch. - -
    - Defining the Service Endpoint Interface - - The service endpoint interface (SEI) is a Java interface that - specified the methods that will be exposed as webservices operations. - This interface is required to be annotated with the @WebService - annotation. - - @WebService(name="QuoteReporter", - targetNamespace="http://jonas.ow2.org/examples/jaxws/quote") -public interface QuoteReporter { - public Quote getQuote(@WebParam(name="ticker") String ticker); -}The @WebService - annotation, placed on a SEI, provides the information required to - generate a valid WSDL: - - - - name: this value will be used as the - wsdl:portType name in the generated WSDL - - - - targetNamespace: this value will be used as the XML - namespace containing the WSDL. - - It's required that this value is a URI, it's NOT required to - use an URL or that this URL is accessible. - - - - - Annotating the SEI will provides all the necessary information - to build an abstract WSDL (types + messages + portType). - - - The @WebParam - annotation is placed on the method parameter because Java compilation - do not store the parameter name ('ticker' here) in the byte code. - Having a @WebParam ensure that the generated WSDL will always have the - correct operation parameter names. -
    - -
    - Implementing the Service Endpoint Interface - - Once the SEI has been created, the developer has to implement - the SEI. - - @WebService(portName="QuoteReporterPort", - serviceName="QuoteReporterService", - targetNamespace="http://jonas.ow2.org/examples/jaxws/quote", - endpointInterface="org.ow2.jonas.examples.jaxws.quote.QuoteReporter") -public class QuoteReporterBean implements QuoteReporter { - public Quote getQuote(final String ticker) { - return new Quote(ticker, Math.random() * 100); - } -}Once again, the developer has to annotate its class with the - @WebService annotation. - - - - portName: this value specifies the wsdl:port to - be used - - - - serviceName: this value specifies the - wsdl:service to be used - - - - targetNamespace: this value specifies the targetNamespace of - the wsdl:service - - - - endpointInterface: this value specifies the service endpoint - interface classname (SEI) - - - - That's it, a first simple webservice endpoint code ! The next - section will focus on the most important webservices - annotations. -
    - -
    - Annotating the code - - -
    - -
    - Generate WSDL - - Once you have a codebase fully annotated, you may choose to - generate a WSDL contract. - - - With JOnAS 5.1 M4, there is no simple way to perform a - wsdl2java operation, although the Apache CXF ant tasks are - available. - - Next releases will provide more examples and documentation - about the generation process. - -
    -
    - -
    - Starting from WSDL - - In the WSDL first approach, the developer is required to implement - a webservice that is constrained by a WSDL contract. - - In that case, 2 options are available: - - - - Generates, from the WSDL, the SEI interface and an - implementation skeleton. - - - - Implements a Provider that will allow the developer to work at - the XML level. - - - -
    - Generates skeleton - - JAX-WS tools are provided to help the developers to quickly - start to implement business code by generating most of the plumbing. - wsdl2java for a webservice endpoint will generate the following - artifacts: - - - - {portType}.java: this is the fully annotated SEI interface. - By default, its name is based on the wsdl:portType name. - - - - {portType}Impl.java: this is an implementation skeleton, - annotated with @WebService. The developer just have to fill the - blanks in this class. - - - - {types}.java + ObjectFactory.java: theses JAXB generated - classes represents the operations parameters and documents. - - - - - Insert here a picture of generated classes. - - -
    - Generates the Service Endpoint Interface - - A SEI generated by a JAX-WS 2.1 compatible tool look like - this: - - -
    - -
    - Implements the Service Endpoint Interface - - Implementing the SEI simply means that the developer has to - fill in the blanks of the generated skeleton. This part focus on - business code. -
    -
    -
    - -
    - Writing a Provider - - JAX-WS allows developers to write endpoints dealing directly with - XML messages using the Provider interface. This can be done by - implementing Provider<Source> or Provider<SOAPMessage> or - Provider<DataSource>. - - T invoke(T request) throws WebServiceException; - - Supported parameter's types are: Source, - SOAPMessage, - DataSource. - They define the format of the data that will be manipulated inside the - invoke method. What will be available in theses data structures depends - on the ServiceMode specified. ServiceMode can be either MESSAGE or - PAYLOAD (PAYLOAD being the default when no mode is specified): - - - - ServiceMode.MESSAGE: The structure will represent the whole - request message (allowing access to the SOAP envelop and SOAP - headers for example) - - - - ServiceMode.PAYLOAD: The structure will represent only the - body of the request (restricting access to business data located - inside the SOAP Body element) - - - - When writing a Provider, the webservice developer MUST starts with - a WSDL, because the Provider implementation do not provide any - exploitable information about the XML data structures expected (such as - bean class parameters and such). - - - Providers cannot be implemented using Stateless EJB. - - - Providers implementation supports the one way MEP (Message - Exchange Pattern) simply by returning null. - -
    - Supported modes - - Although many modes and types combinations are possibles, there - are some logical restrictions given the Binding type (HTTP, SOAP) in - use. - - Supported combinations are described below. - -
    - Using SOAP Binding (1.1 or 1.2) - - In the absence of any customization (like applying a - @BindingType annotation on the Provider), the binding is assumed to - be SOAP 1.1. - - - Provider<SOAPMessage> used in conjunction with a - ServiceMode set to PAYLOAD is invalid. - - Indeed the SOAPMessage type represents the whole message, - not just the SOAP Body element. - - - - Provider<DataSource> is always - invalid when used with a SOAP Binding. - - -
    - Provider<Source> and MESSAGE mode - - Using a Provider<Source> with the MESSAGE mode is used - to change the message's content (provided as a - javax.xml.transform.Source object) using XSLT Transformers. - - @WebServiceProvider -@ServiceMode(Service.Mode.MESSAGE) -public class ProviderImpl implements Provider<Source> { - public Source invoke(Source message) { - // Process the request - ... - // Prepare the response Source - Source response = ...; - return response; - } -} -
    - -
    - Provider<Source> and PAYLOAD mode - - Using a Provider<Source> with the PAYLOAD mode is used - to change the message's payload (provided as a - javax.xml.transform.Source object) using XSLT Transformers. - - @WebServiceProvider -public class ProviderImpl implements Provider<Source> { - public Source invoke(Source source) { - // Process the request - ... - // Prepare the response Source - Source response = ...; - return response; - } -} -
    - -
    - Provider<SOAPMessage> and MESSAGE mode - - Using a Provider<SOAPMessage> with the MESSAGE mode is - used to change the message's content (provided as a - javax.xml.soap.SOAPMessage object) with a DOM-like API. - - @WebServiceProvider -@ServiceMode(Service.Mode.MESSAGE) -public class ProviderImpl implements Provider<SOAPMessage> { - public SOAPMessage invoke(SOAPMessage message) { - // Process the request - ... - // Prepare the response SOAPMessage - SOAPMessage response = ...; - return response; - } -} - - - Provider<SOAPMessage> used in conjunction with a - ServiceMode set to PAYLOAD is - invalid. - - Indeed the SOAPMessage type - represents the whole message, not just the SOAP Body - element. - -
    -
    - -
    - Using HTTP Binding - - Providers can also be implemented using the HTTP binding. That - means that no SOAP messages are involved and that the interaction - will only be based on XML/HTTP. - - - Provider<DataSource> used in conjunction with a - ServiceMode set to PAYLOAD is invalid. - - - - Provider<SOAPMessage> is always - invalid when used with an HTTP Binding. - - Indeed, using the HTTP binding assume that the messages are - not SOAP messages. - - -
    - Provider<Source> and MESSAGE mode - - Using a Provider<Source> with the MESSAGE mode and the - HTTP binding is used to change the message's content (provided as - a javax.xml.transform.Source object) using XSLT - Transformers. - - @WebServiceProvider -@ServiceMode(Service.Mode.MESSAGE) -@BindingType(HTTPBinding.HTTP_BINDING) -public class ProviderImpl implements Provider<Source> { - public Source invoke(Source message) { - // Process the request - ... - // Prepare the response Source - Source response = ...; - return response; - } -} -
    - -
    - Provider<Source> and PAYLOAD mode - - Using a Provider<Source> with the PAYLOAD mode and the - HTTP binding is used to change the message's body (provided as a - javax.xml.transform.Source object) using XSLT Transformers. - - @WebServiceProvider -@BindingType(HTTPBinding.HTTP_BINDING) -public class ProviderImpl implements Provider<Source> { - public Source invoke(Source message) { - // Process the request - ... - // Prepare the response Source - Source response = ...; - return response; - } -} -
    - -
    - Provider<DataSource> and MESSAGE mode - - Using a Provider<DataSource> with the MESSAGE mode and - the HTTP binding is used to process the message attachment - (provided as a javax.xml.transform.Source object). This style of - provider is useful when dealing only with - message's attachments (no XML changes). - - @WebServiceProvider -@ServiceMode(Service.Mode.MESSAGE) -@BindingType(HTTPBinding.HTTP_BINDING) -public class ProviderImpl implements Provider<DataSource> { - public DataSource invoke(DataSource message) { - // Process the request - ... - // Prepare the response DataSource - DataSource response = ...; - return response; - } -} -
    -
    -
    - -
    - Wrap up - - The table below summarizes the requirement with all the possible - combinations (). - - - - - - XML/HTTP Binding - - SOAP/HTTP Binding - - - - Provider<Source> - - - - Payload - - Primary part or content as Source - - SOAP Body from the primary part or SOAP Body as Source - - - - Message - - Primary part or content as Source - - SOAP Envelope from the primary part or SOAP Envelope as - Source - - - - Provider<DataSource> - - - - Payload - - Not Valid [1] - - Not Valid [1] - - - - Message - - DataSource as an object - - Not Valid [2] - - - - Provider<SOAPMessage> - - - - Payload - - Not Valid [3] - - Not Valid [3] - - - - Message - - Not Valid [4] - - SOAPMessage as an object - - - - - Source Arun Gupta (http://weblogs.java.net/blog/arungupta/archive/2006/03/jaxws_20_provid_1.html) - - Provider<DataSource> is used for sending attachments - and thus payload mode is not valid. - - Provider<DataSource> in SOAP/HTTP is not valid since - attachments in SOAP are sent using Provider<SOAPMessage>. - - - Provider<SOAPMessage> in payload mode is not valid - because the entire SOAPMessage is received, not just the payload - which corresponds to the body of the SOAPMessage. - - Provider<SOAPMessage> in message mode using XML/HTTP - binding is not valid since the client may have sent an XML message - that may not be SOAP. - -
    - -
    - Implementing RESTful services using Providers - - - - - Using HTTP Binding + provider can be used to implement simple - RESTful services (in the absence of JAX-RS support). - - This topic will be covered in future versions in this - documentation. - -
    -
    - -
    - Overriding annotations - - Some annotations values can be overridden in a Java EE application - server using the webservices.xml (located in WEB-INF/ or META-INF/ given - the implementor is respectively a POJO or an EJB). - - The link between @WebService (or @WebServiceProvider) and the XML - <port-component> description is done through the - <service-impl-bean> element: - - - - <ejb-link> with an ejb-name pointing to a Stateless EJB3 - annotated with @WebService / @WebServiceProvider. - - - - <servlet-link> with a servlet-name pointing to a Servlet - declaration in the web.xml. - - - - - Overriding @WebService - - - - -  Annotation - - Deployment descriptor element  - - Comment - - - - - - @WebService - - <webservices>/<webservice-description>/<port-component> - - One @WebService per <port-component> - - - - @WebService.wsdlLocation - - <webservices>/<webservice-description>/<wsdl-file> - - Overrides the WSDL location value for all the - <port-component> declared in the - <webservice-description> - - - - @WebService.name - - <webservices>/<webservice-description>/<port-component>/<port-component-name> - - - - - - @WebService.serviceName - - <webservices>/<webservice-description>/<port-component>/<wsdl-service> - - - - - - @WebService.portName - - <webservices>/<webservice-description>/<port-component>/<wsdl-port> - - - - - - @WebService.endpointInterface - - <webservices>/<webservice-description>/<port-component>/<service-endpoint-interface> - - - - - -
    - - - - - Overriding @WebServiceProvider - - - - - Annotation  - - Deployment descriptor element  - - Comment - - - - - - @WebServiceProvider - - <webservices>/<webservice-description>/<port-component> - - One @WebServiceProvider per - <port-component> - - - - @WebServiceProvider.wsdlLocation - - <webservices>/<webservice-description>/<wsdl-file> - - Overrides the WSDL location value for all the - <port-component> declared in the - <webservice-description> - - - - @WebService.serviceName - - <webservices>/<webservice-description>/<port-component>/<wsdl-service> - - - - - - @WebService.portName - - <webservices>/<webservice-description>/<port-component>/<wsdl-port> - - - - - - @WebService.endpointInterface - - N/A - - It is not required for a Provider to specify a - SEI - - - -
    - - - - - Overriding @BindingType - - - - - Deployment descriptor - - Possible values  - - - - - - <port-component>/<protocol-binding> - - Specify the protocol binding used by this - port-component. The following alias are - supported: - - ##SOAP11_HTTP: SOAP 1.1 - Binding - - - - ##SOAP11_HTTP_MTOM: SOAP 1.1 - Binding with MTOM enabled - - - - ##SOAP12_HTTP: SOAP 1.2 - Binding - - - - ##SOAP12_HTTP_MTOM: SOAP 1.2 - Binding with MTOM enabled - - - - ##XML_HTTP: XML Binding - - - - - - <port-component>/<enable-mtom> - - This element permits to enable/disable the SOAP MTOM/XOP - mechanism for the endpoint. This element has higher priority - than <protocol-binding>, meaning that if - ##SOAP11_HTTP_MTOM is specified as protocol - binding and <enable-mtom> is false, it will be equivalent - to a protocol binding set to - ##SOAP11_HTTP - - - -
    -
    - -
    - Endpoint packaging - - When the webservices implementation has been finished, code - compiled, it's time to take care of the application packaging. There are - some simple packaging rules to follow. - -
    - Web Application - - When the endpoint is implemented as a POJO, the implementation - class may be referenced as a servlet in the WEB-INF/web.xml. If it is - not declared in the web.xml, it will be auto discovered at deployment - time. If it is declared in the web.xml, it must be specified as a new - servlet element and the servlet must have an associated - servlet-mapping.<web-app xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - version="2.5"> - - <servlet> - <servlet-name>{servlet-name}</servlet-name> - <servlet-class>{implementor-fully-qualified-classname}</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>{servlet-name}</servlet-name> - <url-pattern>{webservice-endpoint-url-pattern}</url-pattern> - </servlet-mapping> - -</web-app> - - A usual servlet name: unique among other servlets. - - - - The implementor fully qualified classname (It's not a - Servlet, but that's OK, it will be changed during - deployment). - - - - The same servlet name specified first in the servlet - element. - - - - The URL pattern that will point to the webservice - endpoint. - - - - - If the endpoint is declared in the - WEB-INF/web.xml but no - servlet-mapping is provided, the endpoint will not be - accessible (No URLs will point to the servlet). - If the WSDL is referenced from the endpoint (using - @WebService.wsdlLocation(), @WebServiceProvider.wsdlLocation() or - webservices.xml), it has to be provided in the WEB-INF/wsdl/ directory of the - webapp. - -
    - Default Web URL Mapping - - The webservice endpoint contained in the webapp will be - available through an URL. - - If no servlet-mapping was specified in the web.xml a default - mapping will be automatically introduced. - - - Automatic Web Endpoints Servlet Mappings Patterns - - - - -  Condition - - Servlet Mapping Pattern  - - - - - - serviceName has been - provided in the @WebService(s) - - /{service-qname-local-part} - - - - no serviceName - provided - - /{simple-implementor-classname}Simple - - - -
    -
    -
    - -
    - EjbJar - - When the webservice endpoint is implemented as a Stateless - EJB - -
    - Endpoint URL Mapping - - As an ejbjar is not a webapp, there is no available web - context, or url-pattern that can be used to access the endpoint - through HTTP. - - A Web context is created and named after the ejbjar's filename - (stopping at the first '_' character). - - - Automatic EJB Endpoints Servlet Mappings Patterns - - - - -  Condition - - Servlet Mapping Pattern  - - - - - - <endpoint-address> provided - for the bean in the easybeans.xml - - provided value - - - - serviceName has been - provided in the @WebService(s) - - /{service-qname-local-part} - - - - no serviceName - provided - - /{simple-implementor-classname}Simple - - - -
    -
    - -
    - EasyBeans deployment descriptor customizations - - The EasyBeans deployment descriptor provides a mean for - customizing some webservices endpoint properties. - - - To be completed with XML references. - (easybeans/webservices/endpoint and - easybeans/ejb/session/endpoint-address). - -
    -
    -
    -
    - - - Developing a Webservice Consumer - - A Webservice consumer is a client of a webservice endpoint. It's a - client side artifact that perform webservices requests. - - With JAX-WS, clients can benefits of asynchronous invocations (more - on this later). - - A webservice consumer can be any of the following Java EE - components: EJB (Session/MessageDriven), Servlet (or any web components - such as JSP, JSF, ...) or Application Client. For any of theses - components, the creation process is the same. - - A consumer typically starts with a WSDL (describing the endpoint's - contract), but dynamic invocation (working at the XML level) can also be - performed. - -
    - Port - - A webservice consummer can be implemented using a Port. A Port is - a Java interface that hides to the client all the WS low level - mechanisms (masrshalling, unmarshalling, handler chains, ...). - - A Port is usually generated from a WSDL. - -
    - Generates portable client artifacts - - When the client's developer starts with a WSDL, it usually - generates the client artifacts (Java classes) using a wsdl2java - tool. - - - With JOnAS 5.1 M4, there is no simple way to perform a - wsdl2java operation, although the Apache CXF ant tasks are - available. - - Next releases will provide more examples and documentation - about the generation process. - - - - - - -
    - Example of generated Service - - -
    - -
    - Example of generated Port - - -
    -
    - -
    - Synchronous consumer - - Using synchronous consumer is the easiest way of consuming a - webservice: by default, wsdl2java tools generate classes supporting - only synchronous operations. - - The following code snippet shows the Port source code that a - wsdl2java tool generate using an input WSDL file. - - @WebService(targetNamespace = "http://jonas.ow2.org/samples/jaxws/calculator", - name = "Calculator") -public interface Calculator { - - @ResponseWrapper(localName = "addResponse", - targetNamespace = "http://jonas.ow2.org/samples/jaxws/calculator", - className = "org.ow2.jonas.samples.jaxws.calculator.AddResponse") - @RequestWrapper(localName = "add", - targetNamespace = "http://jonas.ow2.org/samples/jaxws/calculator", - className = "org.ow2.jonas.samples.jaxws.calculator.Add") - @WebResult(name = "return", targetNamespace = "") - @WebMethod - public int add(@WebParam(name = "arg0", targetNamespace = "") - int arg0, - @WebParam(name = "arg1", targetNamespace = "") - int arg1); -} -
    - -
    - Asynchronous consumer - - By default, WSDL2Java generation do not generate asynchronous - methods for each operation of the wsdl:portType. - - To enable the async method generation, a binding customization - has to be provided during the WSDL2Java execution. - - It can be provided as part of the WSDL file: - - <portType name="CalculatorPort"> - <operation name="add"> - <input message="tns:addRequest"/> - <output message="tns:addResponse"/> - </operation> -</portType> -<binding name="CalculatorBinding" type="tns:CalculatorPort"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <operation name="add"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/></input> - <output> - <soap:body use="literal"/> - </output> - </operation> -</binding> - - - Or as a separate bindings declaration file: - - <bindings xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns="http://java.sun.com/xml/ns/jaxws" - wsdlLocation="..."> - - <bindings node="wsdl:definitions"> - <package name="org.ow2.jonas.ws.async.client"/> - <enableAsyncMapping>true</enableAsyncMapping> - </bindings> -</bindings> - - - // Synchronous method -public int add(int a, int b); - -// Asynchronous polling method -public Response<AddResponse> add(int a, int b); - -// Asynchronous callback method -public Future<?> add(int a, int b, AsyncHandler<AddResponse>); - - -
    - Asynchronous polling - - -
    - -
    - Asynchronous callback - - -
    -
    -
    - -
    - Dispatch - - A Dispatch<T> is an object that allows the client to perform - XML level operations. It is the client side equivalent to the - Provider<T> interface. - -
    - Configure dynamic Service - - -
    - -
    - Create a Dispatch - - -
    - -
    - Invoke the Dispatch - - The Dispatch interface provides support for 4 MEP: - request-response, asynchronous polling, asynchronous callback - -
    - Synchronous request response - - -
    - -
    - Asynchronous request response - - -
    - -
    - One way - - -
    -
    -
    - -
    - Packaging - - -
    -
    - - - Developing Handlers - - - -
    - Types - - - -
    - SOAP handlers - - -
    - -
    - Logical handlers - - -
    -
    - -
    - Defining the handler-chains - - - -
    - Handler chains description file - - - -
    - HandlerChain annotation - - -
    -
    - -
    - Defining handlers on the endpoint - - - -
    - Using the @HandlerChain annotation - - -
    - -
    - Using the webservices.xml - - -
    -
    - -
    - Defining handlers for the consumer - - - -
    - Using the @HandlerChain annotation - - -
    - -
    - Using the javaee:service-ref element - - -
    - -
    - Using the HandlerResolver - - -
    -
    -
    -
    - - - Annotations references - - - -
    - JWS Annotations (javax.jws) - - - -
    - javax.jws.WebService - - -
    - -
    - javax.jws.WebMethod - - -
    - -
    - javax.jws.WebParam - - -
    - -
    - javax.jws.WebResult - - -
    - -
    - javax.jws.OneWay - - -
    - -
    - javax.jws.HandlerChain - - -
    - -
    - javax.jws.soap.SOAPBinding - - -
    -
    - -
    - JAX-WS Annotations (javax.xml.ws) - - - -
    - javax.xml.ws.WebServiceProvider - - -
    - -
    - javax.xml.ws.WebServiceRef - - -
    - -
    - javax.xml.ws.WebServiceRefs - - -
    - -
    - javax.xml.ws.WebServiceClient - - -
    - -
    - javax.xml.ws.BindingType - - -
    - -
    - javax.xml.ws.RequestWrapper - - -
    - -
    - javax.xml.ws.ResponseWrapper - - -
    - -
    - javax.xml.ws.RespectBinding - - -
    - -
    - javax.xml.ws.ServiceMode - - -
    - -
    - javax.xml.ws.WebEndpoint - - -
    - -
    - javax.xml.ws.WebFault - - -
    - -
    - javax.xml.ws.Feature - - -
    - -
    - javax.xml.ws.FeatureParameter - - -
    - -
    - javax.xml.ws.Action - - -
    - -
    - javax.xml.ws.FaultAction - - -
    - -
    - javax.xml.ws.soap.Addressing - - -
    - -
    - javax.xml.ws.soap.MTOM - - -
    -
    -
    - - - - JAX-WS Terminology - - - Endpoint - - - A Webservice endpoint is the web service implementation. It's - a server side artifact. It can be implemented as a POJO or as a - Stateless EJB. - - - - - Consumer - - - Also known as a webservice client. It is a client side - artifact. - - - - - Portable Artifacts - - - JAX-WS generated artifacts (classes / WSDL / XSD) that are - portable across JAX-WS implementation. It means that artifacts - generated using Sun RI tools will be usable without any - changes on any Java EE 5 compliant application - server. - - - - - Provider - - - Endpoint can be implemented as Providers if they require low - level XML access. - - - - - Handler - - - A Handler can be seen like a webservice interceptor. It can be - used on client and/or server side. Two kinds of handlers exists: - Logical and SOAP handlers. - - - - - Dispatch - - - A Dispatch is a webservice client working at the XML level. A - Dispatch is the client side equivalent to a Provider. - - - - - POJO - - - Plain Old Java Object. Commonly used word meaning that the - beans do not have to implement an interface to be usable by the - container. - - - - - QName - - - XML Qualified Name. Disambiguate XML names by prefixing the - names (local-part) with a namespace (URI). - - - - - MEP - - - Message Exchange Pattern. This is the pattern of the exchange - (one-way, request-response, ...). - - - - - SEI - - - Service Endpoint Interface. This is an annotated Java - interface that represents the business object. - - - - - MTOM - - - Message Transmission Optimization Mechanism. This is a W3C - recommendation defining a method to efficiently sending binary data - to and from webservices. - - - - - WSDL - - - Web Service Description Language. This is the cornerstone of - the webservices system. It is an XML file that can basically be - compared to a Java interface: it's the contract defining the wire - exchange (possible operations, expected types and parameters, ...) - between a consumer and an endpoint. - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/jonas-transactions.xml b/jonas_doc/core/src/docbook/doc-en/jonas-transactions.xml deleted file mode 100644 index b871f96ac1386a411b8cfc847f4b16d38895919c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/jonas-transactions.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - JOnAS and the transactions - - - - JOnAS Team - - - - FlorentBENOIT - - - OW2 Consortium - - - - - - 2011-2012 - - OW2 Consortium - - - - Creative Commons - - - 2011/10/01 - - - - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/loaders/basics-of-classloading.xml b/jonas_doc/core/src/docbook/doc-en/loaders/basics-of-classloading.xml deleted file mode 100644 index 925340c31b813aa8169f7d4d7bfceca1b6a4c3d3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/loaders/basics-of-classloading.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - Basics of ClassLoading - -
    - ClassLoader - -
    - Usage - - A ClassLoader knows how to load resources - (class, images, ...). - - Where the ClassLoader locates the resources - is an implementation detail: it could search on a network drive, a local - file, in a jar or in a directory, ... - - Additionaly, for Java classes, a - ClassLoader supports the class definition - process: turning a byte[] into a - Class<T> instance. - - - Beware of ClassLoaders, behind the interface, how they works - can differ a lot from an implementation to another. - - Ex: an OSGi Classloader has no - automatic delegation to parent loader, unlike an - URLClassLoader. - - Understanding the execution chain requires a knowledge of the - ClassLoader's internals - -
    - -
    - Delegation - - ClassLoaders delegate loading of resources to other ClassLoaders, - under certains circumstances and conditions. - - - a Class using java.lang.String must use - the same Class<String> definition to be - interoperable with other Class (potentially loaded by different - loaders ). - - Delegation is essential ! - - - In order to delegate resource loading to other loaders, a - ClassLoader defines some relationships. At least, a ClassLoader have a - parent loader (Only system loader do not have a parent : it is the root - loader). It may (or may not) also have other links to other loaders. - Theses links may (or may not) be used to delegate loading of a resource - (or a class) to another loader. - - - The way the ClassLoader uses theses links to other loaders, - including link to the parent loader are depending on the ClassLoader - implementation. - -
    -
    - -
    - Class - - Class is a Java object (Class<T>), it - is uniquely identified with a String, - ClassLoader couple. The - String being the Class' name, and the - ClassLoader being the loader which has effectively - loaded the Class (Not necessarily the one used primarily to load the class - !). - - - ClassLoader.loadClass(String) may - return a Class<T> definition that was not - loaded by the ClassLoader itself but that comes - from an "ancestor". - That means that ClassCastException - may happen between classes having the same name ! - - - Two classes with the same name but loaded by 2 different loaders - are incompatibles : they don't have the same definition. - -
    - -
    - CLASSPATH - - - - - - - - When a Java VM starts 3 loaders are created: - <bootstrap>, - <extensions> and - <system>. - - System delegates to Extension, itself delegating to Boostrap, all - using a parent first delegation model. - -
    - Bootstrap loader - - The <bootstrap> loader is the primordial - VM ClassLoader. It is responsible to load the core Java libraries - (rt.jar, ...) located in - JAVA_HOME/lib/*.jar. - - The loader has no parent and is implemented with native - code. -
    - -
    - Extensions loader - - The <extensions> loader is the only child - of <bootstrap>, it is responsible to load Java - extensions (security, ...) from - JAVA_HOME/lib/ext/*.jar. The content of this loader - can be adapted using the java.ext.dirs system - property. This property accepts a comma separated list of paths, all - .jar files in theses directories - will be added in the <extension> loader. - - This loader is implemented (at least when using Hotspot VM) with - sun.misc.Launcher$ExtClassLoader. -
    - -
    - System loader - - The <system> loader is the only child of - the <extensions> loader, it contains the - content of the CLASSPATH environment variable. It is - implemented using - sun.misc.Launcher$AppClassLoader (at least when - using Hotsport VM). -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/loaders/classloading-in-jonas.xml b/jonas_doc/core/src/docbook/doc-en/loaders/classloading-in-jonas.xml deleted file mode 100644 index 40df22742e8215afb9937eda94c48f9bff1b30f2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/loaders/classloading-in-jonas.xml +++ /dev/null @@ -1,577 +0,0 @@ - - - ClassLoading in JOnAS - -
    - JOnAS Internals (OSGi) - -
    - Modular Application Server - - JOnAS is a modular application server, it relies on - OSGi to provide the module layer. - - As a consequence, JOnAS is simply an aggregation of Bundles (more - or less): a right sized (no more, no less) JOnAS assembly is possible by - just choosing the right set of bundles needed by the application. - -
    - JOnAS modular architecture - - - - - - -
    -
    - -
    - <trademark>OSGi</trademark> ClassLoading - -
    - Bundle - - An OSGi Bundle is - the module unit, it contains classes and resources.It may also contain - other jar files (useful for privatizing resources). - - Bundle's metadata are defined in - META-INF/MANIFEST.MF. Theses metadata are - providing information that helps to: - - - - Identify uniquely the Bundle - (Bundle-SymbolicName + - Bundle-Version) - - - - Defines what is published to the outside of the - module - - - - Define module's boundaries - - - -
    - Bundle ClassPath - - A Bundle may also have access to - resources provided by inner jar files. Theses jar files will form - the Bundle's ClassPath. -
    - -
    - Exporting Packages - - Bundle's metadata may declare exported packages. That means - that theses packages (and all contained resources/classes) will be - available for other Bundles to use - (imported). - - Theses packages have to be contained in the - Bundle. -
    - -
    - Importing Packages - - Bundle's metadata may also declares imported packages. A wire - is created for each imported package that matches a corresponding - exported package. -
    -
    - -
    - Class Space - - A class space is a notion associated to a - Bundle: it represent all the resources - accessibles from the bundle. A Bundle cannot - access a resource outside of its class space. - - The figure below show the Class space of Bundle A. This Bundle - can access all resources from its own classpath (the Bundle's content) - plus all imported packages' resources. - -
    - Bundle Class Space - - - - - - -
    -
    - -
    - Delegation - - The OSGi specification defines strict - classloading rules. Theses rules are applied when a - Bundle is asked to load a class (or find a - resource). - - - Parent classloader is usually the system Classloader (true - for JOnAS), but that may change depending on the underlying - OSGi framework and its - configuration. - - This workflow may look complex, but it is well documented - and have to be compared with custom loader with unclear behavior - (and unspecified delegation rules) ... - - This is the price to pay to avoid the well known - Classpath Hell ! - - -
    - OSGi Classloading Algorithm - - - - - - -
    -
    - -
    - System Bundle - - The System Bundle is a "Wrapper" around the - System loaders to make it looks like a Bundle: - it has a Bundle symbolic name (value: - system.bundle), is always the first "installed" - Bundle (and so it's ID is 0) and have export - packages. - - Wrapping the system ClassLoaders as a Bundle is important - because other Bundles may imports some packages that are only - available in rt.jar (and other libraries provided - in the System Classloaders - <bootstrap>, - <extensions> and - <system>). So for the standard package - resolution mechanism to work, a Bundle - representing the system was necessary. - - The System Bundle exports some of the system packages: not all, - only a selected subset (can be configured). This is some kind of mask - or filter allowing to hide some packages. - - Hiding a package is then as simple as not exporting it from - System Bundle (Ex : javax.transaction because the - JVM provides an incomplete package). -
    - -
    - JOnAS - - JOnAS being built on top of OSGi, it's - building blocks are OSGi bundles. Each of them - having their own Bundle ClassLoader, exporting - more or less of their content and importing packages from other - bundles. - -
    - JOnAS <trademark>OSGi</trademark> Modules - - - - - - -
    - - The figure above shows a simplified view of JOnAS Classloading - architecture. Each Bundle correspond to a JOnAS' module, green parts - represents the subset of module's packages that are exported to the - environment. Each Bundle have wire to other Bundles for each resolved - imported package (not shown on the picture). All of theses loaders - have the System ClassLoader as parent (not to be confound with System - Bundle: the all-green module on the left). The usage of this parent - loader is very controlled: only java.* packages - (java.lang, java.nio, ...) and - package's patterns configured in boot delegation are delegated to the - parent loader (the two first steps in bundle delegation section). -
    -
    -
    - -
    - Endorsed - - Endorsed is a system level (JVM) mechanism allowing to override the - classes provided by the System - ClassLoaders of the JVM (rt.jar, ...). - - It is traditionally used in Java EE server to force usage of newer - version of some packages/libraries. - - - In JOnAS, Apache Xerces, Apache Xalan, JAXP APIs plus RMI/IIOP - APIs (CORBA) are provided in ${jonas.root}/lib/endorsed/. - - - The endorsed mechanism is configurable through a system property: - java.endorsed.dirs. the value provides a list of - directories (separator : ':' or ';' - depending on the host Operating System). All jars in theses directories - will be inserted before rt.jar (thus gaining priority - at load-time). - - - Jars in endorsed directories are inserted in the - <bootstrap> loader (the very first loader - created by the JVM). - - They are not auto-magicaly visible to applications. - - This is because their visibility is constrained to the list of - system exported packages (System Bundle). - -
    - -
    - Code Sharing - - Sharing additional resources is done by adding bundles to JOnAS. - That's it! - -
    - Sharing Code with OSGi Bundles - - - - - - -
    - -
    - Existing Bundles - - Existing Bundles have to be deployed using the usual JOnAS - deployment mechanisms: - - - - Deployment directory: Dropping the Bundle in the - ${jonas.base}/deploy/ directory is - enough - - - - Command line: jonas admin add - ${path-to}/users-bundle.jar - - - - Web console - - -
    - -
    - Jar Files - - Jar files (do not have OSGi metadata in - their manifest) cannot be deployed by Just dropping a jar in - ${jonas.base}/deploy/. They have to be turned into - bundle first. - - JOnAS offers a fast, easy and efficient mechanism to perform that - operation: Extension Loader. - - This mechanism look for jar files in the lib/ext/ directories of ${jonas.root} and ${jonas.base}. Every jar file (extension: - *.jar) in these directorier will - be transformed into a Bundle (using aQute Bnd). - - - Default set of bnd instructions - - # Symbolic Name is computed from source jar filename -# A maven-like artifact name is expected <artifactId>-<version>.jar (-version is optional) -# <artifactId> maps to Symbolic Name -# <version> maps to bundle version (if missing 0.0.0 is used) -Bundle-SymbolicName <artifactId> -Bundle-Version <version> - -# Imports all discovered required packages -# Have them marked as optional to avoid startup resolution errors -Import-Package *;resolution:=optional - -# Export all the packages contained in the original jar -Export-Package * - -# Can load any non-imported package at runtime -DynamicImport-Package * - - - - - The lib/ext/ - directories are only traversed once: when JOnAS starts. Any update - or jar file removal will be ignored until next restart. - - Generated Bundles can be found in ${jonas.base}/work/ext-bundles/ - - Once they have been generated they could be used as standard - Bundles (placed in deploy/). - -
    -
    - -
    - Java EE Modules - - Java EE modules are not Bundles, so they not obey the same - classloading rules. This section will explain how works Java EE - classloading in JOnAS. - -
    - Overview - - Java EE modules can be represented in two groups: standalone - modules and embed modules. The classloading hierarchies are different - from one case to another. - -
    - Java EE Modules Classloading Hierarchy - - - - - - - - - Visibility is from bottom to the top in this schema. - -
    - - By default, a classloader follows the Java 2 delegation model: - asking it's parent first. So any embed WebApp can see the content of the - embeds EjbJars, embeds libraries, embed Resource Adapters of its - containing Ear. And transitively, it can also access resources provided - by standalone Resource adapters. But it will not be able to see - resources coming from sibling WebApps and ApplicationClient, neither - from standalone EjbJars and WebApps. - -
    - Standalone modules - - Standalone modules means modules primarily deployed on JOnAS - (artefact in deploy/ for - example). - - - - Ears (Java EE Applications) are de facto standalone modules - because they cannot be embed in another Java EE module. - - - - EjbJars and Web Applications are standalone module if - deployed outside of an Ear. - - - - Rars (Resource Adapters) are standalone module if deployed - outside of an Ear. - - - - Standalone Rars are specials because they don't have an isolated - ClassLoader for each, this unique loader is also the parent of all - other standalone modules. - - It is necessary for them to share the same loader because Rars - contains jars/resources that have to be available to all Java EE - deployed modules (thus be accessible in an ancestor of the Java EE - loaders). - - - As Standalone Resource Adapters (not in .ear) are sharing the - same ClassLoader, if 2 resources overlaps, the one coming from the - earliest deployed Rar is preferred. - - - Standalone Ears, EjbJars and WebApps are direct childs of this - common ancestor: they can load resources/classes from the standalone - Rars. -
    - -
    - Embed modules - - Embed modules are all Java EE modules types that are available - in Ears: - - - - EjbJars - - - - WebApps - - - - Resource Adapters - - -
    -
    - -
    - Java 2 Delegation Model - - The Java2 delegation model is a delegation strategy where the - parent loader is asked first, then local sources are probed if resource - was not found by parent. This ensure a maximum class space consistence, - ensuring a preference for shared sources over local sources. - - This model is the default delegation model applied on all JVM - provided ClassLoaders (System, URLClassLoader, - ...). - - The Servlet specification states that web applications must run - within an inverted delegation model. In other words : - local resources (WEB-INF/classes/ - + WEB-INF/lib/) are preferred - over server's resources. Standalone Jetty/Tomcat runs apps with this - model by default. - - On the contrary, the Java EE specification states that the default - model must be the normal delegation model. -
    - -
    - Web Applications - - A WebApp loader can access resource from 3 main locations: - - - - The System ClassLoader - - - - WEB-INF/classes/ and - WEB-INF/lib/*.jar. - - - All resources relative to WEB-INF/classes/ will be - available - - Only jar files (*.jar) directly under WEB-INF/lib/ are loaded, - subdirectories (if any) are not traversed. - - For example, a .properties file in WEB-INF/lib/ will not be visible - from the ClassLoader. - - - - - Its parent Classloader: if WebApp is standalone, its parent is - the standalone Rars loader, otherwise it is the EjbJars + - Libraries. - - - -
    - Delegation Strategy - - A WebApp ClassLoader uses the following strategy to load - resources/class: - - - - Ask to System ClassLoader. - - - Prior to JOnAS 5.1, this step is always executed. - - For JOnAs 5.1, this access is disabled if the execution - JVM is superior to Java 6, enabled otherwise (Java 5). - - Post JOnAS 5.2, this access is always disabled - (disregarding the Java version) - - - - - If the delegation model property is true (default): - - - - Ask to the parent. - - - - Ask to local sources. - - - - - - Else (java2 delegation model = false): - - - - Ask to local sources. - - - - Ask to parent. - - - - -
    -
    - -
    - Ears, EjbJars and Rars - - The ClassLoaders for non Web Applications are behaving like - traditional ClassLoaders: they use the standard Java2 delegation - strategy (parent first). -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/loaders/configuration.xml b/jonas_doc/core/src/docbook/doc-en/loaders/configuration.xml deleted file mode 100644 index 9ae80c68176fd6ceba8c99053560febb2c2bf4d7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/loaders/configuration.xml +++ /dev/null @@ -1,336 +0,0 @@ - - - Configuration - -
    - Isolating Java EE modules with filters - -
    - ClassLoader Filtering - - ClassLoaders of Java EE modules can be filtered with JOnAS. - Filtering acts as a runtime package mask hiding a specified set of - patterns. - - When a resource/class is trying to be loaded by a - ClassLoader, this one first checks if the fully - qualified resource name (ie: includes the package name) matches a - provided pattern. If so, it cut the execution flow and throw a - ClassnotFoundException or return - null when a class (respectively a resource) matches - one of the patterns. - - ClassLoader Filtering is a fine grained approach to filtering, - based on pattern matching (ex: org.springframework.* - excludes all resources from the org.springframework - packages). It is implemented as an intermediate (pass through) - ClassLoader seating between 2 other ClassLoaders - (ex: Web -> (filtering) -> EjbJars). - - Two levels of filters are available: system-wide (shared by all - Java EE modules in the system) and per-module (only impacts a given - module). - - - Before version 5.1.6, JOnAS only offered system wide filtering - configuration - - - It is globally deactivatable using the System property - jonas-disable-filtering-class-loader=true - - - Acts as a barrier between Java EE modules and the application - server: isolate modules from resources also available in JOnAS. - - -
    - Filter's position - - - - - - -
    - -
    - XML Configuration - - System wide configuration is applied to the parent loader of - applications (the loader of standalone Rars). It is configurable in - the - ${jonas.base}/conf/classloader-default-filtering.xml - file. - - - Default system-wide filtering configuration - - <?xml version="1.0" encoding="UTF-8"?> -<class-loader-filtering xmlns="http://org.ow2.jonas.lib.loader.mapping"> - - <!-- - List of filters used to exclude packages/resources that are used - internally by the Application Server but that will not be available - to applications. - An empty list will not hide any packages to the applications - This list is used both to hide resources and classes to applications. - --> - <default-filters> - <!-- - Filters are using regexp as specified at - http://java.sun.com/j2se/1.5.0/docs/api/java/lang/String.html#matches(java.lang.String) - --> - <filter-name>org.apache.commons.digester.*</filter-name> - <filter-name>org.springframework.*</filter-name> - </default-filters> -</class-loader-filtering> - - - The per-module configuration is available for: - - - - Webapp (either standalone or embed) with - WEB-INF/classloader-filtering.xml - - - - Ear with - META-INF/classloader-filtering.xml - - - - The configuration style is not applicable for RARs or EjbJars - Standalone since they directly uses the system filters. When embed in - Ear, they uses filters defined in the application. - - - Per-module configuration sample - - <?xml version="1.0" encoding="UTF-8"?> -<class-loader-filtering xmlns="http://org.ow2.jonas.lib.loader.mapping"> - <filters> - <filter-name>org.apache.xml.*</filter-name> - </filters> -</class-loader-filtering> - -
    -
    - -
    - Filtering Usage - - ClassLoader filtering should be used when JOnAS provides libraries - are conflicting with application's embed libraries. That will make sure - that application libraries are used instead of application server's - ones. - - - Make sure that all needed packages are filtered: some libraries - aggregates multiple packages. - - Ex : Apache Xalan includes org.apache.xalan + - org.apache.xml + - org.apache.xpath in - Xalan.jar - -
    -
    - -
    - Inverting Java2 delegation model for webapp - - As stated in the section related to Java2 delegation model, Java EE - and Servlet specifications dictates different default delegation strategy. - In order to limit behavioral changes when migrating from a standalone web - container to JOnAS, a switch is available through the - WEB-INF/jonas-web.xml: - - - - It only applies to web application (included or not in - Ear) - - - - Search ordering is inverted if delegation is disabled - - - - - Invertion of Java2 Delegation Strategy (jonas-web.xml) - - <?xml version="1.0" encoding="ISO-8859-1"?> -<jonas-web-app xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://jonas.ow2.org/ns/jonas-web-app_4_0.xsd"> - <!-- true : the context uses a classloader using the Java 2 delegation model (default) - false : the class loader looks inside the web application first, before asking parent class loader --> - <java2-delegation-model>false</java2-delegation-model> -</jonas-web-app> - - - - - Avoid using java2-delegation-model: use - filtering instead. - - Filtering permits to touch only the required bits while - invertion apply for the whole web application. - - What happen when a lib needs inversion and another do not - ? - - Invertion is more lenient than filtering, - preference over exclusion : can still use server's classes where - filtering defines a real barrier. - -
    - -
    - Publishing system packages - - JOnAS comes with a predefined list of system packages adapted to the - runtime JVM version. By default, the System Bundle will exports all of the - listed packages. - - For some uses cases (endorsed addition, ...), it may be useful to - add some packages to this list. This is indeed configurable in - JOnAS. - - JOnAS 5.1 configuration is provided as a full felix configuration - file. This file is located in the - lib/bootstrap/felix-launcher.jar file (See org/ow2/jonas/launcher/felix/default-config.properties). - - Configuration customizers have to get a full copy of that file and - perform manual changes in it. - - When satisfied, JOnAS must be started with a system property named - felix.configuration.file pointing to the modified - file's path. - - For JOnAS 5.2 (and superior), most of the Felix/OSGi configuration - is accessible in conf/osgi/ folder. - It is commented, readable and comprehensive. Most useful properties are - easily accessible. - -
    - System Packages - - The list of System Bundle exported package is expressed using 2 - properties : org.osgi.framework.system.packages and - org.osgi.framework.system.packages.extra. - - The format of theses properties is a comma separated list of - package names (ex : - org.osgi.framework;version=1.5.0), just like a - standard Export-Package OSGi - header. - - - Wildcards are not accepted in this list, all packages (even - sub-packages) have to be declared individually. - - - Theses packages will then be importable from - other Bundles installed on the OSGi - gateway. - - Tweaking the list of system packages may be used to hide or change - some attributes of packages, that let a possibility for other bundles to - provide a different version of the exported packages, and leave the - choice to the bundle consummer. - - That configuration freedom has to be used with care: - org.osgi.framework.system.packages property has to - be used only when it's needed to remove/modify a package in the system - default exported list. - - - javax.transaction + - javax.transaction.xa are not exported by the - System Bundle in JOnAS because the JVM misses some of the classes in - theses packages - - - The System extra packages list has to be used when - bundles/applications need an additional package from a library placed in - endorsed directories (or in any of the place seached for System - ClassLoader: extensions + CLASSPATH). - - - Resolve package constraint resolution error with the addition - of a new exported packages declaration to the system. - -
    - -
    - Boot Delegation - - Boot delegation packages is one of the OSGi joker for known - non-modular JVM packages. They have priority over all other way of - classloading. - - It is configurable through the - org.osgi.framework.bootdelegation property. The - value is a comma separated list of packages patterns: wildcard - ('*') is only accepted at the end of the - pattern. - - - com.sun.image* : accept classes from - com.sun.image and sub-packages - - - - Theses packages do NOT appear in system's exported packages (may - lead to unexpected resolution error) - - - Touching this property should be avoided as much as possible, - because it breaks modularity. As per the osgi delegation strategy, - bootdelegation have the top most priority in loading, so no overridde is - possible: a Bundle cannot use a different version (even if it import it - and the import was resolved) ! - - In clear, it should be used as last resort: - when adding packages to System Bundle did not worked or when a class in - a bundle performs some dynamic class loading and makes the assumption - that its own ClassLoader can load the wanted Class. There are multiple - condition for this to happen: - - - - The wanted class is unknown at build time (otherwise a proper - import would have been generated) - - - - The wanted class is in the system ClassLoader (otherwise - servicing this class from the System ClassLoader does not make - sense) - - - - The bundle do not import the resource's package - - - - You cannot change this Bundle :-( - - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/loaders/glossary.xml b/jonas_doc/core/src/docbook/doc-en/loaders/glossary.xml deleted file mode 100644 index 7307ebe5c2687635958d7af3c9cbdf579f1b7e96..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/loaders/glossary.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - Glossary - - - ClassLoader - - - - - - - - Loader - - - - - - - - OSGiTM - - - - - - - - Bundle - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/loaders/tips.xml b/jonas_doc/core/src/docbook/doc-en/loaders/tips.xml deleted file mode 100644 index 9af442bd1677453372cbef2155b5e0807d27acdf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/loaders/tips.xml +++ /dev/null @@ -1,248 +0,0 @@ - - - Tips - -
    - Abstract Factory Pattern - -
    - Error pattern - - In an eye blink, suspect all static - Factory.newInstance() methods. - - The AbstractFactory pattern is a well known and quite used - pattern. There is an abstract Factory class with an implemented static - method (newInstance()). This method is in - charge of finding a suitable implementation that will be returned to the - consumer. JAXP API are using this pattern. - - Usually this method performs the following operations: - - - - Try to find the name of a class (the concrete Factory) to - load. - - Usually, the search is done in some dedicated property files, - system properties, default hardcoded value, ... - - - - Try to load the discovered class using a guessed - loader. - - Used loaders depends on the code but usually involves (ordre - is not significant here): - - - - Thread Context ClassLoader - - - - ClassLoader of the Factory - - - - System ClassLoader - - - - A given ClassLoader (could be passed as parameter with - some luck) - - - - - - Creates an instance of the loaded Class (if one could be - loaded) - - - - - This kind of code make the assumption that they can load any - class. - - This is not true (even completely wrong) in a modular - world - -
    - -
    - Solutions - - The environment has to be adapted to what is expected by the - code: - - - - Give an appropriate ClassLoader (if possible) - - - - Set a Thread Context ClassLoader to a ClassLoader that will be - able to load the Class. - Do not forget to reset to old ClassLoader after the call - (try/finally) ! - - - ClassLoader expected = ... -ClassLoader old = Thread.currentThread().getContextClassLoader(); -Thread.currentThread.setContextClassLoader(expected); -try { - // Do whatever you want in this block - Factory factory = Factory.newInstance(); -} finally { - // Reset the TCCL - Thread.currentThread.setContextClassLoader(old); -} - - -
    -
    - -
    - ClassCastException - -
    - Error pattern - - Conflicting libraries are found in JOnAS and in an - application. - - Delegation mechanism, and the logic used to find an - implementation, produces an instance from a Class incompatible - with expected type. - - For example, the loaded type comes from the System ClassLoader but - the expected type comes from the webapp ClassLoader. -
    - -
    - Solutions - - Use the stacktrace to extract faulty classnames: that's the main - suspects. - - Use the console to find from where theses classes/packages are - loaded. - - Display Right/Left ClassLoader of the assignation to discover the - ClassLoader sources. - - - - - Interesting values: Expected type/loader, Returned - type/loader, TCCL - - - - Similar to the info the console provides - - - - Filter the package(s) to force resolution in your application - codebase. - - Usually go back to first bullet until no more Exceptions . -
    -
    - -
    - Code rules ! - - To understand what happen, knowing the ClassLoader hierarchies helps - a lot but is not always sufficent. - - Reading the source code gives the final clues explaining the - observed behavior. - - - People do a lot of things in Java with class loading (some even - weird) - -
    - -
    - Boot Delegation - - Format of boot delegation pattern is somehow sensible. Here are - examples and explanations. - - - - No wildcard (ex: com.sun.xml): Only matches - classes directly in the given package - - - - Dot and wildcard (ex: com.sun.xml.*): Only - matches classes in sub packages (direct content does not match) - - - - Only wildcard (ex: com.sun.xml*): Matches - both direct package and sub packages. But also matches for packages - sharing the same chars at the beginning of their names. - - - - - Boot Delegation Patterns Examples - - - - - Pattern / Match ? - - com.sun.xml.Parser ? - - com.sun.xml.mine.MineParser ? - - com.sun.xmlaa.AaParser ? - - - - - - com.sun.xml - - YES - - NO - - NO - - - - com.sun.xml.* - - NO - - YES - - NO - - - - com.sun.xml* - - YES - - YES - - YES - - - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/loaders/tooling.xml b/jonas_doc/core/src/docbook/doc-en/loaders/tooling.xml deleted file mode 100644 index c8456e8fbe38559900987685b7d6a12d244bb3f9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/loaders/tooling.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - Tooling - -
    - Web Console: Classloader monitoring - - The "Classloader monitoring" module in the jonasAdmin web console - aims to help diagnosis of classloading issues. - - It provides a graphical view of Java EE classloading hierarchies and - gives a direct way to interact with ClassLoaders and see their - behaviors. - -
    - OSGi Diagnosis - - The web console offers a search feature that helps to know from - which Bundle a class/package/resource comes from.It displays the wired - consumer Bundle(s). - - It helps to see if a Bundle is wired to the right package - provider. - -
    - OSGi Diagnosis - - - - Search for a given class in all the OSGi bundles - - - - - - - - -
    -
    - -
    - Java EE Hierarchies - - The web console also offers a Java EE ClassLoading hierarchy view. - It is dedicated to a selected Java EE module and show the ancestry of - Classloader. - - Filtering patterns associated to ClassLoaders are also - displayed. - - This view permits to test resource loading from the selected - ClassLoader. That helps to see if the class comes from the expected - source. -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/log/config.xml b/jonas_doc/core/src/docbook/doc-en/log/config.xml deleted file mode 100644 index 09bac5bfbf71d5dad09fb3b1d92fa5b68d9af638..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/log/config.xml +++ /dev/null @@ -1,511 +0,0 @@ - -
    - - Configuring the logging System - - - Monolog is - the Objectweb solution for logging. It is not only a new logging - implementation but can be seen as a bridge between different logging - implementations. A library that uses the Monolog API can be used with any - logging implementation at runtime. - - Furthermore some components of JOnAS like CAROL, JOTM, Tomcat etc... - doesn't use the Monolog API but Jakarta commons loggins or log4j or other - implementation. However all these components will be configured via the - JOnAS Monolog configuration file. - -
    - - Monolog - - - JOnAS Monolog configuration files are: - - - - $JONAS_BASE/conf/trace.properties - the name can be changed via - jonas.log.configfile property in - jonas.properties - - - which is the server side Monolog configuration file - - - - $JONAS_BASE/conf/traceclient.properties - - which is used for a client in a client container. - - - - Configuring trace messages inside can be done in - two ways: - - - - Changing the trace.properties file to - configure the traces statically, before the Server is - run - - - - Using the jonas admin command or the JonasAdmin administration - tool to configure the traces dynamically while the Server is - running. In this case the modification are not persistent - (trace.properties file is not modified). - - -
    - -
    - - trace.properties syntax - - - Applications make logging calls on logger - objects.Loggers are organized in a hierarchical namespace and - child loggers may inherit some logging properties - from their parents in the namespace. Loggers - allocates messages and passes them to handler for - output; they uses logging levels in order to decide - if they are interested in by a particular message. - - In trace.properties it is possible to define - handlers, loggers, - levels: - - - - handlers - - A handler represents an output, is identified by its name, has a - type, and has some additional properties. By default three handlers - are used: - - - - tty is basic standard - output on a console - - - - logf is a handler for - printing messages on a file - - - - mesonly handler used by - generation tools for traces without header - - - - Each handler can define the header it will use, the type of - logging (console, file, rolling file), and the file name. - - The handler properties are the following: - - - - type: is the type of the handler that may be: - - - - Console : Log stream ends inside - System.out or - System.err - - - - File : Log stream is directed into a file - - - - Rollingfile : A file set is used to roll the logs - - - - JMX : Logging actions are send to the JMX notification - system - - - - - - pattern:is the message format. A pattern can be composed of - elements. An element is prefixed by the % character.The possible - items: - - - - %h: the thread - name - - - - %O{1} : the Class name - (basename only) - - - - %M the method - name - - - - %L the line - number - - - - %d the date - - - - %l the level - - - - %m the message - itself - - - - %n a new line - - - - - - output: is the output filename. - - If automatic - By default automatic is set for the handler logf - is used, JOnAS will replace this tag with a file - pointing to - $JONAS_BASE/logs/<jonas_name_server>-<timestamp>.log - - Switch is used for logging either on - System.out or System.err - depending on the level of the log - - - - fileNumber: is the number of file to use (for - RollingFile) - - - - maxSize:is the maximal size of the file (for Rolling - file) - - - - Note that another handler, named jmxHandler, - can be used to allow to view the recent logs in the - administration console. - By default the definition of this handler is commented, for performance reason. - - - - - - loggers - - Loggers are identified by names that are structured as a tree. - The root of the tree is named root. Each logger - is associated with a topic. Topic names are usually based on the - package name. Each logger can define the handler it will use and the - trace level (see below). By default loggers inherit their level from - their parents. - - By default handlers assigned to the parent logger are - automatically assign to child loggers. Setting 'additivity' to false - inform the system that the logger will use only its own set of - handlers. - this property is optional and its default value is - 'yes' - - - - - levels - - the trace levels are the following: - - - - ERROR errors. Should always be printed. - - - - WARN warning. Should be printed. - - - - INFO informative messages. - - - - DEBUG debug messages. Should be printed only for - debugging. - - - - -
    - -
    - - default trace.properties file - - - log.config.classname org.objectweb.util.monolog.wrapper.javaLog.LoggerFactory - -handler.tty.type Console -handler.tty.output Switch -handler.tty.pattern %d : %O{1}.%M : %m%n - -handler.logf.type File -handler.logf.output automatic -handler.logf.pattern %d : %l : %h : %O{1}.%M : %m%n - -logger.root.handler.0 tty -logger.root.handler.1 logf - -logger.root.level INFO -logger.org.objectweb.level INFO -logger.org.ow2.level INFO - -#logger.org.ow2.jonas.lib.ejb21.level DEBUG - -handler.mesonly.type Console -handler.mesonly.output Switch -handler.mesonly.pattern %m%n - -logger.org.ow2.jonas.generators.genic.handler.0 mesonly -logger.org.ow2.jonas.generators.genic.additivity false - -[...] - - Definition of the wrapper to use: here the java logging API - wrapper. - - - - Definition of the console handler tty - - - - Switch means that the logs will be on System.out or System.err - depending of the level of the log. - - - - Definition of the message format. here it contains the date - followed by ':' the basename of the class followed by '.' the method - name followed by ':' the message itself terminated by - newline. - - - - Definition of the file handler logf - - - - Logs are in a file whose name is - $JONAS_BASE/logs/<jonas_name_server>-<timestamp>.log - - - - Definition of the root logger. It uses handler tty - - - - Definition of the root logger: It uses also handler - logf - - - - Definition of the root logger: level INFO is used for all - child loggers if there is no overriden definition - - - - This line must be uncommented for setting DEBUG level for the - logger used in the jonas ejb21 module - - - - Definition of the console handler mesonly used by generator tool, such as GenIC, - which want to log messages without headers - - - - Definition of the handler used by the logger - org.ow2.jonas.generators - - - - This logger wants to use its own handler. - - -
    - -
    - - Tips for setting loggers for JOnAS - - - When a problem occurs it may be worth to set some debugging traces - in the server. - It is not easy to know which logger to set to obtain the pertinent traces - that may help the debbugging process. - - The trace.properties file contains several - commented lines prepared to set loggers in DEBUG level. - - Usually the name of loggers are related to the java package name in - which it is used. - - - - To set debug traces of the EJB2 container uncomment one or more - lines related to logger org.ow2.jonas.lib.ejb2 for example: - - logger.org.ow2.jonas.lib.ejb21.interp.level DEBUG -logger.org.ow2.jonas.lib.ejb21.synchro.level DEBUG -logger.org.ow2.jonas.lib.ejb21.tx.level DEBUG - - - - To set traces related to resource adapters: - - logger.org.ow2.jonas.jca.level DEBUG -logger.org.ow2.jonas.jca.pool.level DEBUG - - - - To set traces into the CAROL library:: - - logger.org.ow2.carol.level DEBUG - - - - To set traces in JORAM: - - logger.fr.dyade.aaa.level DEBUG (for the MOM) - -# for the JORAM resource adapter: -logger.org.objectweb.joram.client.jms.Client.level DEBUG -logger.org.objectweb.joram.client.connector.Adapter.level DEBUG - - - - To set traces in Tomcat: - - - - for all web application : - - logger.org.apache.catalina.core.ContainerBase.[jonas].[localhost].level DEBUG - - jonas is the attribute name of the - element Engine in $JONAS_BASE/conf/tomcat6-server.xml - - localhost is the attribute name of the element Host in - $JONAS_BASE/conf/tomcat6-server.xml - - - - for a particular web application : - - logger.org.apache.catalina.core.containerBase.[jonas].[localhost].[jonasAdmin].level DEBUG - - jonas is the attribute name of the - element Engine in $JONAS_BASE/conf/tomcat6-server.xml - - localhost is the attribute name of the - element host in $JONAS_BASE/conf/tomcat6-server.xml - - jonasAdmin is the name of the web - application - - - - - the attributes debug in elements of - $JONAS_BASE/conf/tomcat6-server.xml are not used anymore in Tomcat. - - - - - There are a lot of traces possible for - management, discovery, jtm, clustering, mail, ear,... - - -
    - -
    - - Logging with particular log systems - - -
    - - java logging API - - - If Monolog is configured to use the JDK logger it will replace the - JDK logger implementation with its own implementation and so all JDK - logs are intercepted by Monolog. By default Monolog is configured to use - the JDK logger. -
    - -
    - - Jakarta commons logging - - - There is no special configuration file for Jakarta commons - login.If it is used on top of the java logging API it is the same case - than the previous section. - - -
    - -
    - - log4j - - - don't provide the corresponding - jar file so, log4j must be - packaged (.jar file and - log4j.properties) in any application that want to - use it. The log4j.properties file must be - configured correctly. - - If log4j is used by several applications it is possible to - centralize the log4j configuration by putting log4j.properties in - $JONAS_BASE/conf and log4j jar - file in $JONAS_BASE/lib/commons. -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/mastering-jonas-classloaders.xml b/jonas_doc/core/src/docbook/doc-en/mastering-jonas-classloaders.xml deleted file mode 100644 index aa9b8cf82a44d4c7fa741e2e8608c2f9161085c0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/mastering-jonas-classloaders.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - Mastering JOnAS ClassLoaders - - - - JOnAS Team - - - - GuillaumeSauthier - - - OW2 Consortium - - - - - - 2011 - - OW2 Consortium - - - - Creative Commons - - - 2011/06/20 - - - - - - - - - - - - diff --git a/jonas_doc/core/src/docbook/doc-en/migration/jonas_4_7.xml b/jonas_doc/core/src/docbook/doc-en/migration/jonas_4_7.xml deleted file mode 100644 index efae235a790039133b3eb05b167941588ece0eac..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/migration/jonas_4_7.xml +++ /dev/null @@ -1,94 +0,0 @@ - -Migrating from JOnAS 4.6 to JOnAS 4.7 - - Applications developed for JOnAS 4.6.x do not require changes; The - main changes occur within the JOnAS configuration files. Therefore, it - is recommended that customizations be reported in the new JOnAS 4.7.x - configuration files, especially for those mentioned below. - -
    Configuration changes - - - The most visible configuration changes are the following: - - - - A new JORAM configuration file for defining the JMS objects. - This file, named joramAdmin.xml, replaces - joram-admin.cfg. The new format allows - clustered JMS destinations, DMQ, and other information to be - defined. See in Configuring JMS Resource Adapters - for a full description. - - - - A new configuration file for the domain management. This - file, named domain.xml, enables definition of - the domain without need of the discovery service. Additionally, - the JOnAS instances are visible from jonasAdmin console even when - they are stopped. See here - for a full description. - - - - A new CMI configuration file for specifying the JGroups's - configuration stack. This file, named - jgroups-cmi.xml, can be customized to fit - with the network environnement being used. See here for a full description. - - - - -
    - -
    Updating $JONAS_BASE - - - If starting from an existing JONAS_BASE, it must be updated in - order to upgrade to the latest ear/war/jar/rar files provided (e.g. - new versions of the JORAM or JDBC rars). - - cd $JONAS_ROOT -ant update_jonasbase -
    - -
    JORAM 4.3.0 - - - JOnAS 4.4.1 integrates the new JORAM 4.3.0 which - contains: - - - - performance optimizations - - - - new feature: SSL for client-server communications - - - - new feature of SoftReference Messages allowing swap out: - ability to send large messages, destinations can store more and - more messages, the messages are not held in memory. - - - - The last implementation required changes to the message - persistance module. Therefore, JORAM's stored messages from previous - versions are not compliant with this new version; the JORAM - persistance directory (s0 by default) must be deleted before the - migration. -
    - -
    Domain management restrictions - - - Due to evolutions in the discovery protocol, mixing 4.6 and 4.7 - JOnAS servers within a management domain is not allowed. To take - advantage of the new domain and cluster management features, all the - servers that were started in a same domain with the discovery service - activated and using the same multicast address for discovery, must be - JOnAS 4.7 version servers. -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/migration/jonas_4_8.xml b/jonas_doc/core/src/docbook/doc-en/migration/jonas_4_8.xml deleted file mode 100644 index ce4ed11b283527795dcdf5d82d13538a5ee3c2c0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/migration/jonas_4_8.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - Migrating from JOnAS 4.7.x EE to JOnAS 4.8 EE - - Applications developed for JOnAS 4.7.x do not require changes. - -
    Configuration changes - - No configuration changes -
    -
    New JORAM version(JORAM_4_3_25) - - - This implementation required changes to the message persistance - module. Therefore, JORAM's stored messages from previous versions are - not compliant with this new version; the JORAM persistance directory - (s0 by default) must be deleted before the migration. - - remember that this directory is created in the JOnAS's working - directory at run time - -
    -
    Updating $JONAS_BASE - - - if starting from an existing JONAS_BASE, it must be updated in - order to upgrade to the latest ear/war/jar/rar files provided (e.g. - new versions of the JORAM or JDBC rars). - - cd $JONAS_ROOT -ant update_jonasbase -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/migration/jonas_4_9.xml b/jonas_doc/core/src/docbook/doc-en/migration/jonas_4_9.xml deleted file mode 100644 index e18b1351dc5bf9945f88d279847e7de02ab11c42..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/migration/jonas_4_9.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Migrating from JOnAS 4.8 EE to JOnAS 4.9 - - Applications developed for JOnAS 4.8 EE do not require changes. - - \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/migration/jonas_5_0.xml b/jonas_doc/core/src/docbook/doc-en/migration/jonas_5_0.xml deleted file mode 100644 index b60c3fe138a2b7211b0040e72e72cedba9f501b6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/migration/jonas_5_0.xml +++ /dev/null @@ -1,653 +0,0 @@ - - - - Migrating from JOnAS 4.x to JOnAS 5 - - - - has been completely rewritten in order to leverage the - technology. - - People who were familiar with the JOnAS world will not be amazed. - However, they should be aware of some important changes that must be taken - into account. - -
    - - Before migration - - - Before begining the migration process, you must be aware of the - versions of the API supported by . - - JOnAS 4 is v1.4 compliant whereas. is 5 compliant. This - means that the supported versions of most APIs have changed. - - Here is a small table describing the differences: - - - -
    - - Prerequisites - - - A JDK 5 is required to build JOnAS 5 but JDK 6 - for those using SUN JDK6 the parameter - -Dsun.lang.ClassLoader.allowArraySyntax=true may be required - may be used for running JOnAS 5. -
    -
    - -
    - - Upgrading An Application Environment from 4.x to 5.x - - -
    - - Application environment definition - - - Usually, an application environment is composed of one JONAS_ROOT - (JOnAS distribution) and one or more JONAS_BASE depending on the number - of JOnAS instances needed for the application. - - In JOnAS 4.x JONAS_BASE contains : - - - - - applications to be deployed in the new environment: - - An application consists of several deployable archives: ear, - ejbjar, war + some associated connectors packaged in rar - archives. - - - - Configuration files: - - All configuration files are located under $JONAS_BASE/conf - - - - External libraries: - - Some libraries may be installed under: - - - - $JONAS_BASE/lib/apps - - (applicative - libraries) - - - - $JONAS_BASE/lib/ext - - - - $JONAS_BASE/lib/commons - - - - $JONAS_BASE/lib/tools - - (libraries whoses classes are made available to all JOnAS - services) - - - - - - For a successful upgrade you must be aware of the JOnAS changes in - : - - - - the class loader hierarchy see Understanding - class loader hierarchy for a complete description of the - classloader mechanism. - - - - deployment process, due to a new deployment - architecture - - - - configuration files - - - - third party libraries processing - - - - To upgrade an application environment you must first create a new - application environment and then customize it according to the old - environment. - -
    - - Creating a new Application environment - - - To create a new application environnement you must create a new - JOnAS_BASE. - - - - When running newjb based on information located in your home - directory ($HOME/jb.config/conf/jonas-newjb.properties), you will - probably have to review this file and upgrade it to conform to - $JONAS_ROOT/build-jb.properties syntax. For example, jonas services - names have changed between JOnAS version 4 and version 5. -
    -
    - -
    - - New deployment architecture - - - With JOnAS 5.x, the following deployment directories have been - removed : - - - - - apps - - - - - - apps/autoload - - - - - - clients - - - - - - ejbjars - - - - - - ejbjars/autoload - - - - - - rars - - - - - - rars/autoload - - - - - - webapps - - - - - - webapps/autoload - - - - - The above directories no longer exist in JONAS_BASE and have been - replaced by a single directory: - - - - - deploy - - - - - To deploy a - archive in JOnAS 5.x, the only thing required is to put it in the - $JONAS_BASE/deploy directory. This directory is - periodically scanned in order to deploy new archives. - The periodic scan can be disabled by setting the - jonas.development property to false in - JONAS_BASE/conf/jonas.properties - - - The deployment policy has changed in JOnAS - 5 since at server starting time the deployment order of the archives - found in $JONAS_BASE/deploy is the following: - - - - Deployment plan repositories - - - - OSGi bundles - - - - RAR archives - - - - Deployment plan resources - - - - EJB archives - - - - WAR archives - - - - EAR archives - - - - For each category, file names are chosen in alphabetical - order - - - - - - Here a basic how to that explains how to - create a very simple deployment plan. - - - - For more information see the depmonitor service configuration in - the JOnAS - Configuration Guide. -
    - -
    - - Script files - - - The path of the script command files has been changed, and is - $JONAS_ROOT/bin instead of - $JONAS_ROOT/bin/unix and - $JONAS_ROOT/bin/nt. -
    - -
    - - Configuration files - - - JOnAS configuration files have changed. Here we will focus on the - changes that may impact the upgrade process. - -
    - - carol.properties file - - - jeremie protocol is no longer supported. - - New properties have been added to configure cmi clusters. Note - that cmi is not anymore a protocol - but a JOnAS service used for clustering. - - For applications that uses a carol.properties file on the client - side the best practice is to start from - $JONAS_ROOT/template/conf/conf/carol.properties and to customize it - (see the JOnAS - Configuration Guide). . -
    - -
    - - clusterd.properties file - - - With JOnAS 5 the cluster deamon can start the discovery - service. -
    - -
    - - context.xml, server.xml, web.xml - - - JOnAS 5 now embeds Tomcat 6 instead of Tomcat 5. - - context.xml, server.xml and web.xml - configuration files are replaced by - tomcat6-context.xml, - tomcat6-server.xml and - tomcat6-web.xml. - - See Apache - Tomcat 6.0 Documentation for more information. -
    - -
    - - jaas.config - - - No new properties in this file. The only difference is the name - of the package for the LoginModule classes. - - For applications that uses a jaas.config on the client side the - best practice is to start from - $JONAS_ROOT/template/conf/conf/jaas.config and to customize it. -
    - -
    - - jetty5-webdefault.xml & jetty5.xml - - - These configuration files are now named jetty6-web.xml - and jetty6.xml. - - For more information see Jetty - Documentation -
    - -
    - - jgroups-cmi.xml & jgroups-ha.xml - - - JOnAS 5 now uses a newer version of JGroups. The JGroups - Protocol Stack configuration files format is different. Therefore - customizations made in the old jgroups-cmi.xml - and jgroups-ha.xml files must be updated to the - new formats. -
    - -
    - - jonas.properties - - - The jonas.properties file has changed - significantly . Some changes do not impact the upgrade process at all - (package name changes), while others must be studied carefully. - - In the following, we focus on the parts of the - jonas.properties file that may be impacted during - the upgrade process. - -
    - - jonas.services property - - - thread and jms services have been suppressed (see below). - - ejb service has been renamed - to ejb2 service. - - ws service has been renamed - to jaxrpc service. - - wm, wc, ha, - ejb3, versioning, depmonitor, cmi,resourcemonitor,jaxws and smartclient are new services in JOnAS - 5 - - With JOnAS 5, the default jonas.services properties are set - to: - - jonas.services jtm,db,dbm,security,resource,ejb3,jaxws,web,ear,depmonitor - - (in order to learn more about these services see the JOnAS - configuration_guide) -
    - -
    - - ejb2 service configuration - - - ejb2 service replaces the - previous ejb service. - - Configuration of worker threads has been moved from the - ejb service configuration to the - Work Manager (wm) service - configuration. - - See the Work Manager configuration part in -
    - -
    - - jms service configuration - - - The JORAM resource adapter must be used in replacement of the - jms service. - - In order to use JMS via the JORAM resource adapter - - - - The resource service must - be set in the jonas.services property - - - - joram.xml must be deployed (it must - be located under $JONAS_BASE/deploy) - - - - JORAM port must be configured in the - $JONAS_BASE/conf/joramAdmin.xml file - - - - JMS destinations must be defined in the - $JONAS_BASE/conf/joramAdmin.xml file - - - - If for tuning purposes, the size and/or the max size of the - worker thread pool used for the message driven beans has been set - (jonas.service.ejb.minworkthreads, - jonas.service.ejb.maxworkthreads properties) - you must update the equivalent settings in the Work Manager - configuration (see below). -
    - -
    - - resource service configuration - - - Configuration of worker threads has been moved from resource service configuration to Work - Manager (wm) service - configuration. - - Work Manager configuration: - - -
    - -
    - - discovery service configuration - - - The property indicating that the current instance is (or is - not) a master server is no longer a discovery - service property, but instead, a - jonas.properties global property - - jonas.master falseThe discovery service supports two - implementations. One of them uses JGroups, the other one uses - multicast. Multicast is the default.. - - For more information about configuring discovery service see - discovery - service configuration. -
    -
    - -
    - - trace.properties & traceclient.properties - - - Logger names have changed because of changes in internal JOnAS - packages name. -
    -
    - -
    - - libraries - - - There are several ways to use libraries in portable Java EE - applications : - - - - placing the library JAR file into the WEB-INF/lib directory of - the WAR file, - - - - using the Class-Path attribute in the manifest file to - reference one or more library JAR files included in the EAR - file. - - - - using the Extension-List attribute in the manifest file to - reference one or more library JAR files that are not bundled in the - EAR file, but are installed in the lib/ext directory of the Java - Runtime Environment (JRE) - - - - If the application to migrate follows one of these policies it can - be used with without changes. - - There is no guarantee that a library installed in - JOnAS_BASE/lib/ext and referenced via the Extension-List attribute in - the manifest file will be accessible to your application. - - It is worth knowing that tomcat 6, embedded in , tries to resolve - extension dependencies for web applications before deploying them, and - that it uses the system property catalina.ext.dirs - to try and locate libraries. - - The JDBC driver can be installed under $JONAS_BASE/lib/ext or - packaged into an bundle, we recommend the latest - way. -
    - -
    - Using the Management bean MEJB - - -
    -
    - -
    - Changes that can affect application code - - If the application to port was pointing to JOnAS java internal - classes with org.objectweb.jonas.xxx - packages, all references to these packages must be replaced by - references to org.ow2.jonas.xxx - package. - - For example if the application is using the authentication mechanism - implemented by the class org.objectweb.jonas.security.realm.web.catalina55.JACC - in JOnAS 4 this mechanism is now implemented in JOnAS5 by org.ow2.jonas.web.tomcat6.security.Realm. - - org.objectweb.jonas.security.realm.web.jetty50.Standard - must be changed by org.ow2.jonas.web.jetty6.security.Realm - - org.objectweb.jonas.security.auth.callback.LoginCallbackHandler - must be changed by org.ow2.jonas.security.auth.callback.LoginCallbackHandler - - org.objectweb.jonas.security.auth.spi.JResourceLoginModule - by org.ow2.jonas.security.auth.spi.JResourceLoginModule - - org.objectweb.jonas.security.auth.spi.ClientLoginModule - by org.ow2.jonas.security.auth.spi.ClientLoginModule -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/migration/versionAPI.xml b/jonas_doc/core/src/docbook/doc-en/migration/versionAPI.xml deleted file mode 100644 index 56408dee4836dbaf098f6ac714910e164284d14a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/migration/versionAPI.xml +++ /dev/null @@ -1,239 +0,0 @@ - -
    - - API versions of the Java EE components - - - - - - - - - API   - - JOnAS 4.x  - - JOnAS 5.x - - - - - - JDK - - 1.4 - - 1.5 - - - - JNDI - - 1.2 - - 1.2 - - - - EJB - - 2.1 - - 3.0 - - - - Servlet - - 2.4 - - 2.5 - - - - JSP - - 2.0 - - 2.1 - - - - JMS - - 1.1 - - 1.1 - - - - Connector Architecture - - 1.5 - - 1.5 - - - - JDBC - - 3.0 - - 3.0 - - - - JavaMail - - 1.3.1 - - 1.4 - - - - JavaBeans Activation Framework - - 1.0 - - 1.1.1 - - - - JTA - - 1.0.1B - - 1.1 - - - - JTS - - 1.0 - - 1.0 - - - - JAX-RPC - - 1.1 - - 1.1 - - - - SAAJ - - 1.2 - - 1.3 - - - - JAXR - - 1.0 - - 1.0 - - - - JWSDL - - 1.0 - - 1.0 - - - - JAXP - - 1.2 - - 1.3 - - - - J2EE_Deployment - - 1.1 - - 1.1 - - - - J2EE_Mgmt - - 1.0 - - 1.0 - - - - JACC - - 1.0 - - 1.1 - - - - JAAS - - 1.0 - - 1.0 - - - - JAX-WS - - n/a - - 2.1 - - - - JAXB - - n/a - - 2.1 - - - JSF - - n/a - - 1.2 - - - - JSTL - - n/a - - 1.2 - - - - JPA - - n/a - - 1.0 - - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/migration/versionModules.xml b/jonas_doc/core/src/docbook/doc-en/migration/versionModules.xml deleted file mode 100644 index bd2eb851a34fd44fca03974983d056ed45bac354..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/migration/versionModules.xml +++ /dev/null @@ -1,17 +0,0 @@ - -
    - - Versions of embedded modules in JOnAS - - - Versions of components embedded in each JOnAS version are available in - $JONAS_ROOT/VERSIONS file for JOnAS 4.x and - $JONAS_ROOT/versions.properties for JOnAS 5. -
    diff --git a/jonas_doc/core/src/docbook/doc-en/migration_guide.xml b/jonas_doc/core/src/docbook/doc-en/migration_guide.xml deleted file mode 100644 index dbb4a775282e8cb15c206e9715a9b450ed89148f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/migration_guide.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - JOnAS Versions Migration Guide - - - - CoqPhilippe - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 Consortium - - - March 2009 - - - - \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/multitenant_guide.xml b/jonas_doc/core/src/docbook/doc-en/multitenant_guide.xml deleted file mode 100644 index 835a671dfffc7162ecbcaaa4bf121bfce7d85ed2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/multitenant_guide.xml +++ /dev/null @@ -1,644 +0,0 @@ - - - - Multitenancy Guide - - - - JOnAS Team - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2012 - - OW2 Consortium - - - Jun 2012 - - - - - Introduction - - -
    - - Multitenancy - - - JOnAS hosts and deploys applications written in Java. However, an application can not be natively - deployed more than once in an instance of JOnAS. If necessary, the application will be deployed on - another server instance because there is a risk of collision. One solution of this problem is multitenancy. - This new feature provides the ability to deploy the same application multiple times on a single instance - of JOnAS without prior configuration. -
    - -
    - - Shared application server - - - - Tenants will run on the same application server (JOnAS) each with an instance of the application. - Thus, in one instance of JOnAS, there will be many instances of an application than tenants using it. - This multitenancy level is not without impact on the JOnAS application server because it will make changes in - order to deploy the same application multiple times for multiple tenants in ensuring customization - of resources and security among tenants. - - - - - - According to JavaEE7 specifications, for each tenant, an instance of the application is deployed. - -
    -
    - - - - Tenant context - - - Each tenant is identified by a tenant identifier following the pattern T<id> when - id is numeric. This identifier is defined in web descriptor, application descriptor or even - addon descriptor with the hierarchy : Addon > EAR > WAR - It was necessary to define a default identifier (defaultTenantId = T0) for applications - that do not give a specific tenant-id. it is simply used to enforce the policy where each instance of an - application is linked to an identifier of tenant, and will not be used for customizing data (no changes will - be made). - - - - The identifier of the tenant must be present when deploying the application but also during its execution. In fact, - during deployment, several services operate to save the settings and application data in the JOnAS environment. - These services have a dependence on the multitenant service and will use it for customizing data. Therefore, it - is necessary that the information "tenant-id" is constantly present throughout the duration of the deployment. - - - - The tenant context is composed of : - - - TenantId : tenant identifier - - - InstanceName - - - To access the context of the current tenant, use : - TenantCurrent.getCurrent().getTenantContext(); - - - - Tenant-id is stored in a variable associated to the ThreadLocal. When running the application, an HTTP filter is - set up, it sets all contexts associated with the thread, including the context of tenant, before the - server responds to the client request. - - - - - - - -// Save the current context -old = TenantCurrent.getCurrent().getTenantContext(); -TenantCurrent.getCurrent().setTenantContext(this.ctx); - - Next, execute the request. And finally, restore the old context : - -// Restore the old context -TenantCurrent.getCurrent().setTenantContext(old); - - - - This filter is created by calling the multitenant service. The valve is set in Tomcat7Service as follows : - - -// For the tenantId -Filter tenantIdHttpFilter = null; -String tenantId = null; -if (getMultitenantService() != null){ - // get an instance of the filtre - tenantId = super.getTenantId(war.getWarDeployable()); - tenantIdHttpFilter = getMultitenantService().getTenantIdFilter(tenantId); - // needs to add this filter on the context - jStdCtx.addValve(new FilterValveWrapper(tenantIdHttpFilter)); -} - - - - - - - - - - - Customization - - -
    - - Context root customization - - - - Context root is defined in the web descriptor of the application. This context must be unique for each tenant. - However, because tenants are instances of the same application, context root is the same for all. During - deployment, context root of each instance is prefixed by the instance name and the tenant-id. - - - - - - - - This customization is done during the deployment of the webapp. - - -protected String updateContextRoot(String contextRoot, IDeployable deployable) { - String tenantId = getTenantId(deployable); - String instanceName = multitenantService.getInstanceNameFromContext(); - - if (instanceName != null) { - contextRoot = instanceName + "/" + contextRoot; - } - - if (tenantId != null) { - contextRoot = tenantId + "/" + contextRoot; - } - return contextRoot; -} - - -
    -
    - - Data isolation in database - - - - Shared database and shared schema - - - - - - - - - - - - - Propagation of the tenantId to eclipselink - - - To persist the tenantId in database, we have to set the eclipselink.tenant-id property in - persistence.xml file. To automatize the propagation of the tenantId to eclipselink we need to add this - property automatically when the application is added. Then, we will use the method : - - -// This property will propagate the tenantId to eclipselink -// This value will be added to entities tables -String tenantIdProperty = "eclipselink.tenant-id"; -String tenantIdValue = tenantId; -persistenceUnitManager.setProperty(tenantIdProperty, tenantIdValue); - - - - - - - EJB Entities configured as multitenant - - - Entities must be configured as multitenant to enable adding tenant-id in the database. For that, we have to - add @Multitenant annotation in each class but we need to do that automatically (when - multitenant service is activated). A solution is to use a Session Customizer - (cf - http://wiki.eclipse.org/Customizing_the_EclipseLink_Application_(ELUG)). It is a simple class - with only one method (customize) and take one parameter (Session session). In this method, we will set all - entity classes as multitenant as follows : - - -public void customize(Session session) throws Exception { - Map<Class, ClassDescriptor> descs = session.getDescriptors(); - // For each entity class ... - for(Map.Entry<Class, ClassDescriptor> desc : descs.entrySet()){ - // Create a multitenant policy (Single table) - SingleTableMultitenantPolicy policy = new SingleTableMultitenantPolicy(desc.getValue()); - // Tell that column descriminator is TENANT_ID (it will be added in the database) - policy.addTenantDiscriminatorField("eclipselink.tenant-id", new DatabaseField("TENANT_ID")); - // Add this policy in class derscriptor - desc.getValue().setMultitenantPolicy(policy); - } -} - - - - - Then, during the deployment of the application, an eclipselink property is set to use this session customizer : - -// This property will configure entities as multitenant -// It is the equivalent of @Multitenant -String sessionCustomizerProperty = "eclipselink.session.customizer"; -String sessionCustomizerClass = "org.ow2.easybeans.persistence.eclipselink.MultitenantEntitiesSessionCustomizer"; -persistenceUnitManager.setProperty(sessionCustomizerProperty, sessionCustomizerClass); - - - - - Because tenants share the same database and the same tables, it is important to ensure that a tenant does not - drop an create tables. For that, verify if the drop-and-create-tables eclipselink property - is not set. Otherwise, change this property to create-tables only : - -// If eclipselink was enabled to drop and create tables -// change this property to only create tables -String createTablesProperty = "eclipselink.ddl-generation"; -String dropAndCreateTablesValue = "drop-and-create-tables"; -String createTablesValue = "create-tables"; -Map<String, String> properties = persistenceUnitManager.getProperty(createTablesProperty); -for (Map.Entry<String, String> property : properties.entrySet()){ - if (property.getValue().equals(dropAndCreateTablesValue)) { - logger.warn("This tenant was enabled to drop and create tables. Eclipselink property is changed to only create tables"); - persistenceUnitManager.setProperty(createTablesProperty, createTablesValue, property.getKey()); - } -} - - - -
    - -
    - - JNDI names customization - - - When an application is deployed in multitenant mode, we take the risk of having a conflict between bound names - of each tenant. A solution is to add a prefix before each name. This prefix is the tenantId of the tenant which - names are related. - - - - Naming strategy - - - During the deployment, a name is prefixed the syntax : T<id>/name when - T<id> is the application's tenant-id. The naming strategy is set by: - -newNamingStrategies.add(ejb3Service.getNamingStrategy(prefix, oldNamingStrategy)); - - - Example: MyInitializerBean will be T1/MyInitializerBean. - In addition, as for versioning service, a virtual JNDI binding is made. It will remove the prefix and rebind - the old name to the same object. Then, we will have 2 names (MyInitializeBean and T1/MyInitializerBean) - linked to the same object. - - - - - - - JNDI interceptor - - - - To customize JNDI names bound by the application by adding the tenant-id as prefix, an interceptor is set. - - - - - - - - This interceptor (org.ow2.jonas.lib.tenant.interceptor.jndi.JNDITenantIdInterceptor) is an - implementation of org.ow2.carol.jndi.intercept.ContextInterceptor and is registered in - Carol Interceptor Manager when Multitenant service is activated. Then, all JNDI calls are intercepted. - -// Add tenantId JNDI interceptor -jndiTenantIdInterceptor = new JNDITenantIdInterceptor(JNDI_SEPARATOR); -SingletonInterceptorManager.getInterceptorManager().registerContextInterceptor(jndiTenantIdInterceptor); - - - Two operations are made by this interceptor : - - - Distinguish calls from multitenant application to JNDI - - - Prefix these names by adding the tenant-id - - - - -
    -
    - - MBeans customization - - - - When we deploy a same application two times for two different tenants, the problem is that application's MBeans - will have the same identifier which will create a case of conflict. To avoid it, a solution is to add an attribute - in the MBean's ObjectName named tenantId : - - Domaine:name=MBeanName;tenantId=T1 - - To do that, we need to intercept all MBeanServer methods call since majority of these methods use the ObjectName. - A solution is to set a proxy of the principal MBeanServer (which is returned by - ManagementFactory.getPlatformMBeanServer()) - - - - - JMX interceptor - - - To customize MBeans, a JMX interceptor is set to add a tenant-id property to the MBean ObjectName. - - - - - - This interceptor (org.ow2.jonas.lib.tenant.interceptor.jmx.JMXTenantIdInterceptor) implements - org.ow2.jonas.jmx.Interceptor and is added to the InvocationHandler ( - org.ow2.jonas.jmx.internal.interceptor.InvocationHandlerImpl) by multitenant service : - -// Add tenantId JMX interceptor -jmxTenantIdInterceptor = new JMXTenantIdInterceptor(tenantIdAttributeName, allowToAccessPlatformMBeans); -jmxService.addInterceptor(jmxTenantIdInterceptor); - - and will be called before querying the MBeanServer. - - - - - - Customized MBeanServerBuilder - - - - In order to create a "proxified" MBeanServer, a new class - org.ow2.jonas.services.bootstrap.mbeanbuilder.JOnASMBeanServerBuilder which extends - javax.management.MBeanServerBuilder is used and set as a system property : - -// MBeanServerBuilder -System.setProperty("javax.management.builder.initial", "org.ow2.jonas.services.bootstrap.mbeanbuilder.JOnASMBeanServerBuilder"); - - Then, the first MBeanServer created in the platform is a proxy with a default interceptor. This default interceptor - is always the last called and will call the MBeanServer method originally invoked (before interception). - -// Create real MBeanServer with outerProxy -MBeanServer origin = super.newMBeanServer(defaultDomain, outerProxy, delegate); - -// Create handler for MBeanServer proxy and add -// the default interceptor -InvocationHandlerImpl invocationHandler = new InvocationHandlerImpl(); -invocationHandler.addInterceptor(new MBeanServerDelegateInterceptor(origin)); - -// Create the MBeanServer proxy -MBeanServer proxy = (MBeanServer) Proxy.newProxyInstance(origin.getClass().getClassLoader(), - new Class<?>[]{MBeanServer.class}, - invocationHandler); - - It is possible to add as many interceptors that it is desired and they will be called one by one. - - - - - - Using a customized MBeanServerBuilder can be problematic. In fact, as described in - JONAS-867, if the system property - com.sun.management.jmxremote is set before JOnAS startup, this has the effect of - creating some MBeans and then initialize the MBeanServer. However, the system property - javax.management.builder.initial which is set when JOnAS starts and define the class - which is used to build the platform MBeanServer, this one is present in - org.ow2.jonas.services.bootstrap.mbeanbuilder.JOnASMBeanServerBuilder - and is not known by the classloader at this step. - If the system property com.sun.management.jmxremote is not set, this error should not appear. - - -
    -
    - - Tenants administration isolation - - - - All administrators are defined in a special realm. Tenants administration isolation is done by defining two profiles : - - - - - Tenant administrator profile - - - This profile is define by the super-admin role : - <role name="super-admin" description="Role allowing access to all tenants" /> - and will be assigned to a unique user in the platform : - <user name="superAdmin" password="admin" roles="superAdmin"/> - - - This user will have a full access to all MBeans when connecting on a administration tool such as JConsole. - - - - - - Super administrator profile - - - - - For each tenant, a specific role is defined according to the pattern TenantId[T<id>] : - <role name="TenantId[T1]" description="Role allowing access to tenant T1 information" /> - and will be assigned to a unique user in the group of user belonging to the tenant. - <user name="admin@client" password="admin" roles="TenantId[T1]"/> - - - This user will have access to MBeans which contain the property tenant-id=T1. - - - - - - - - - - - - - This isolation is made when JMX Security is activated. For that, set JMX Security to true in jonas.properties : - jonas.service.jmx.secured true - Then, change authentication method and parameter to : - -jonas.service.jmx.authentication.method jmx.remote.x.login.config -jonas.service.jmx.authentication.parameter jaas-jmx - - Next, activate TenantIdLoginModule for jaas-jmx in jaas.config : - -jaas-jmx { - // Use LoginModule for JMX authentication - org.ow2.jonas.security.auth.spi.JResourceLoginModule required - resourceName="memrlm_1" - ; - - // Use the login module to add tenantId in TenantContext - org.ow2.jonas.lib.tenant.loginmodule.TenantIdLoginModule required; -}; - - During tenant administrator login, TenantIdLoginModule will propagate tenantContext in order to filter MBeans - by the tenant-id property presents in the ObjectName. Only MBeans which their objectName - contains the same tenant-id than the connected user will appear. - -
    - -
    - - Logs customization - - - - JOnAS use Monolog for logging. Monolog is a very static - project and it was necessary to make it extensible for logging other information than those predefined (as - date, classname, etc). One solution is to write an interface in monolog - org.objectweb.util.monolog.api.LogInfo: - -package org.objectweb.util.monolog.api; - -/** -* This interface allows to add an extension to Monolog -* @author Mohammed Boukada -*/ -public interface LogInfo { - - /** - * Gets the info value - * @return info value - */ - String getValue (); -} - - that will be implemented by JOnAS services. - - - In this case, this interface is implemented by multitenant service and provides the tenant-id of the - current tenant. - - - - - - - - An ipojo component is defined in modules/libraries/externals/monolog and is responsible of - registration of monolog's extensions. When an implementation of this interface is registered in OSGi platform : - -<provides specifications="org.objectweb.util.monolog.api.LogInfo"> - <property field="pattern" name="pattern" type="java.lang.Character"/> -</provides> - - This component will add the extension to monolog : - -<component classname="org.ow2.jonas.monolog.MonologExtension" - immediate="false" - name="MonologExtension"> - - <requires optional="true" - specification="org.objectweb.util.monolog.api.LogInfo" - aggregate="true" - proxy="false" - nullable="false"> - <callback type="bind" method="addExtension" /> - <callback type="unbind" method="removeExtension" /> - </requires> - - <!-- LifeCycle Callbacks --> - <callback method="start" transition="validate" /> - <callback method="stop" transition="invalidate" /> - -</component> - - MonologExtension class contains method which are called as callback when a service implementing LogInfo interface - is registered: - -/** -* Add an extension to Monolog -* @param logInfoProvider -*/ -public void addExtension(final LogInfo logInfoProvider, ServiceReference ref) { - Character pattern = (Character) ref.getProperty("pattern"); - Monolog.monologFactory.addLogInfo(pattern, logInfoProvider); - logger.info("Extension ''{0}'' was added by ''{1}'' to Monolog", pattern, logInfoProvider.getClass().getName()); -} - -/** -* Remove an extension from Monolog -*/ -public void removeExtension(ServiceReference ref) { - Character pattern = (Character) ref.getProperty("pattern"); - Monolog.monologFactory.removeLogInfo(pattern); - logger.info("Extension ''{0}'' was removerd from Monolog.", pattern); -} - - - To use monolog extension, you need to make a dependency on : - - <dependency> - <groupId>org.ow2.monolog</groupId> - <artifactId>monolog</artifactId> - <version>2.2.1-SNAPSHOT</version> - </dependency> - - or any later version. - - - - For seeing tenant-id in log messages, add %T to the wanted handler (tty, logf, ...) in - trace.properties. Example : - - handler.tty.pattern %T %d : %O{1}.%M : %m%n - In this example, tenant-id will be added at the beginning of the log message. If tenant-id is not set in - tenantContext or its value is T0 (which is default tenant-id) then nothing will be printed. - -
    -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/protocols/config.xml b/jonas_doc/core/src/docbook/doc-en/protocols/config.xml deleted file mode 100644 index 49f9c055efa811b4c569aefbe89c3403fe96e56d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/protocols/config.xml +++ /dev/null @@ -1,239 +0,0 @@ - -
    - - Configuring the communication protocol and JNDI - - - provides a - multi-protocol support through the integration of the CAROL - component. - - Supported communication protocols are the following: - - - - RMI/JRMP is the JRE implementation of RMI on the JRMP protocol. - This is the default communication protocol. - - - - RMI/IIOP is the JacORB implementation of RMI - over the IIOP protocol. - - - - IRMI is an RMI implementation that can be used with Open Source - JDK that doesn't provide com.sun.* - classes. - - - - For each of these protocols, the clustering of RMI objects can be - enabled with the component CMI. - -
    - - Choosing the Protocol - - - The choice of the protocol is made in the - carol.protocols property of - carol.properties file in JONAS_BASE/conf directory. - - carol.protocols=jrmp - -
    - - configuring jrmp protocol - - - carol.protocols=jrmp -carol.jrmp.url=rmi://localhost:1099 -carol.jvm.rmi.local.call=false -carol.jvm.rmi.local.registry=false -carol.jrmp.server.port=0 -carol.jrmp.interfaces.bind.single=false - - - choice of the protocol or list of protocols - - - - connexion url to the RMI registry the hostname (localhost) - and port number must be changed if needed. In a distributed - configuration changing the hostname is mandatory. - - - - if true local calls are optimized: calls to methods of the - remote interface are treated as call to local methods (it is not - always possible depending on the packaging of the - application). - - - - if true a local Naming context is used. This must be used - only with a collocated registry and it is mandatory when the - jonas.security.manager property of jonas.properties is set to - true. - - - - exported objects will listen on this port for remote method - invocations. 0 means random port. Specify a port may be useful - when the server run behind a firewall. - - - - if true use only a single interface (choosen from the url) - when creating the registry. False means use all interfaces - available. - - -
    - -
    - - configuring RMI/IIOP protocol - - - The JacORB implementation of RMI over the IIOP is used. The - configuration file of JacORB is the $JONAS_BASE/conf/jacorb.properties - file. - - As for the other protocols RMI over IIOP is ready to used in the - default distribution. It is only for tuning purpose that the $JONAS_BASE/conf/jacorb.properties file - must be customized. - - By default the CORBA Naming service is run using the port 2001 (as - it is set in the carol.properties file) - - So the only thing to do for working in RMI over IIOP is to set the - property protocols in carol.properties: - - carol.protocols=iiop -# RMI IIOP URL -carol.iiop.url=iiop://localhost:2001 -carol.iiop.server.port=0 -carol.iiop.server.sslport=2003 -carol.iiop.PortableRemoteObjectClass=org.ow2.jonas.registry.carol.delegate.JacORBPRODelegate - - - - 0 means random port - - - - this port is used only if SSL mode is enabled (default - configuration = not used).Is used to set the SSL port of the objects - listener - - - - delegate used by JOnAS for rmi-iiop protocol. - - -
    - -
    - - configuring irmi protocol - - - carol.protocols=irmi -carol.irmi.url=rmi://localhost:1098 -carol.irmi.server.port=0 -carol.irmi.interfaces.bind.single=false - - - for irmi the default port is 1098 - - - - exported objects will listen on this port for remote method - invocations:0 means random port. - if the port is set to n the port 'n + 1' will be used by - the JMX server.So, for the firewall configuration, you have to - open the port numbers 'n' and 'n+1' - - - - - if true use only a single interface when creating the - registry (specified in carol.irmi.url property). Default - configuration = false(use all interfaces available) - - -
    - -
    - - enabling clustering of RMI objects - - - CMI is the component to use for clustering purpose. It is embedded - in the component CAROL. - - CMI is just composed of wrappers and interceptors and is fully - independant of the implementation of protocol. CMI relies on JGroups - group-communication protocol for ensuring the replication of the cluster - view. CMI provides jndi high availability, the load-balancing and - fail-over at the EJB level. - - For using CMI with a protocol (in addition to the activation of - service cmi), a property must be added in - carol.properties: - - carol.jrmp.cmi=true -carol.iiop.cmi=true -carol.irmi.cmi=false - - - - Enable clustering with jrmp - - - - Disable clustering with imi - - - - - By default, the property is set at true. - -
    - -
    - - multi protocol configuration - - - JOnAS can be configured to use several protocols simultaneously. - To do this, just specify a comma-separated list of protocols in the - carol.protocols property of the carol.properties - file. For example: - - carol.protocols=iiop,jrmp -carol.jrmp.url=rmi://localhost:1099 -carol.iiop.url=iiop://localhost:2001 - - - When iiop is used in a multiprotocol configuration, it must - appear at the first position in the protocol list. - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/ra/JDBCRA.xml b/jonas_doc/core/src/docbook/doc-en/ra/JDBCRA.xml deleted file mode 100644 index 2de72884b9fc11e66f780518104c419fd25f3a4f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/ra/JDBCRA.xml +++ /dev/null @@ -1,1234 +0,0 @@ - -
    - - Configuring JDBC Resource Adapters - - - Connection of an J2EE application to databases is done through JDBC - Resource Adapters (JDBC RA). - - Such Resource Adapters are deployed via the resource service as seen in . - - For both container-managed or bean-managed persistence, the JDBC - Resource Adapter makes use of relational storage systems through the JDBC - interface. - - JDBC connections are obtained from a JDBC RA. - - The JDBC RA implements the J2EE Connector Specification using the - DataSource interface as defined in the JDBC - standard extensions. - - An JDBC RA is configured to identify a database and a means to access - it via a JDBC driver. Multiple JDBC RAs can be deployed either via the - jonas.properties file or included in the autoload directory of the resource service. - - The following section explains how JDBC RARs can be defined and - configured in the JOnAS server. - - To support distributed transactions, the JDBC RA requires the use of - at least a JDBC2-XA-compliant driver. Such drivers implementing the - XADataSource interface are not always available for all relational - databases. The JDBC RA provides a generic driver-wrapper that emulates the - XADataSource interface on a regular JDBC driver. It is important to note - that this driver-wrapper does not ensure a real two-phase commit for - distributed database transactions. - - - -
    - - Generic JDBC Resource Adapters - - - The generic JDBC RAs of JOnAS provide implementations of the - java.sql.Driver, - javax.sql.DataSource, - javax.sql.ConnectionPoolDataSource, - and javax.sql.XADataSource interfaces. They are - located in the $JONAS_ROOT/rars/autoload directory and thus - are deployed automatically.They consist of base (or generic) RAs - facilitating the build of the user JDBC RAs. - - Depending on the relational database management server and the - available interface in the used JDBC-compliant driver, the user JDBC RA is - linked (through the RAR link feature) to a generic RA (for example, the - Driver's one). In this case, the user RA contains only a jonas-ra.xml file - with some specific parameters, such as the connection url, the - user/password, or the JDBC-Driver class. - - - - - - Resource adapter provided with - JOnAS - - description - - jndi name - - - - rars/autoload/JOnAS_jdbcDS.rar - - Generic JDBC RA that implements the - DataSource interface - - JOnASJDBC_DS - - - - rars/autoload/JOnAS_jdbcDM.rar - - Generic JDBC RA that implements the - Driver interface - - JOnASJDBC_DM - - - - rars/autoload/JOnAS_jdbcCP.rar - - Generic JDBC RA that implements the - ConnectionPoolDataSource - interface - - JOnASJDBC_CP - - - - rars/autoload/JOnAS_jdbcXA.rar - - Generic resource adapter that implements the - XADataSource interface - - JOnASJDBC_XA - - - - -
    - -
    - - Specific JDBC Resource Adapter - - - The remainder of this section, which describes how to define and - configure JDBC RAs, is specific to JOnAS. However, the way to use these - JDBC RAs in the Application Component methods is standard, i.e., via the - resource manager connection factory references (refer to the example in - the section Writing - Database Access Operations. - - An RAR file must be deployed as explained in . - - Usually a resource Adapter contains in its rar file all the classes needed to access to - the external resource. In the case of a specific JDBC RA it contains only - a JOnAS specific deployment descriptor jonas-ra.xml - that tell what sort of generic resource adapter to use and information - related to the specific database used. The jar file of the actual JDBC driver mut be - copied in the right place to be seen by the JOnAS classloader : $JONAS_BASE/lib/ext. - - Changing the configuration of the RA requires extracting and editing - the deployment descriptor and updating the archive file. There are several - possible ways to do this: - - - - With the RAConfig command (refer to the JOnAS Commands Reference Guide - for a complete description of the command). - - - - Through the jonasAdmin console (refer to Administration guide - for a complete description). In the jonasAdmin's tree, the Resource - Adapter Module node (under the deployment node) contains a configure - tab that allows editing of both the ra.xml file and the jonas-ra.xml - file of the undeployed RA. - - - -
    - - Defining the JOnAS Connector Deployment Descriptor: - jonas-ra.xml - - - The jonas-ra.xml contains JOnAS specific - information describing deployment information, logging, pooling, jdbc - connections, and RAR config property values: - - - - Deployment Tags: - - - - - - property name - - description - - possible values - - - - jndiname - - name the RAR will be registered as. This property is - required. This value will be used in the - resource-ref section of an - composant. - - - - Anyname (for example jdbc_1) - - - - - - rarlink - - jndiname of a base RAR file. Useful for deploying - multiple connection factories without having to deploy the - complete RAR file again. When this is used, the only entry - in RAR is a - META-INF/jonas-ra.xml - - - - JONASJDBC_DM - - - - JONASJDBC_DS - - - - JONASJDBC_CP - - - - JONASJDBC_XA - - - - - - native-lib - - defines the path where native libraries can be - found. - - - - Any string for a path - - - - - - - - - - Logging Tags: - - - - - - property name - - description - - possible values - - - - log-enabled - - determines if logging should be enabled for the - RAR. - - - - False (default value) - - - - True - - - - - - log-topic: - - defines the log topic that will be used to write log - messages for this rar file. - - - - Any topic name - - - - Default value is - org.objectweb.jonas.jca - - - - - - - - - - Pooling Tags - - - - - - property name - - description - - possible values - - - - pool-init - - Initial size of the managed connection pool - - - - 0 (default value) - - - - n - - - - - - pool-min - - Minimum size of the managed connection pool. - - - - 0 (default value) - - - - n - - - - - - pool-max - - Maximum size of the managed connection pool. - - - - n - - - - -1 = unlimited (default value) - - - - - - pool-max-age-minutes - - Maximum number of minutes to keep the managed - connection in the pool. - - - - 0 = an unlimited amount of time. - - - - n in minutes - - - - - - pstmt-max - - Maximum number of PreparedStatements per managed - connection in the pool. Only needed with the JDBC RA of - JOnAS or another database vendor's RAR. Value of 0 is - unlimited and -1 disables the cache. - - - - 0 = unlimited - - - - n (default value = 10) - - - - -1 = cache disabled - - - - - - pstmt-cache-policy - - Prepared statement cache policy. - - - - List (default value) : array based implementation of the cache - - - - Map : map based implementation of the cache - - - - - - - pool-max-opentime - - Identifies the maximum number of minutes that a - managed connection can be left busy. - - - - 0 = an unlimited amount of time (default - value). - - - - n in minutes - - - - - - pool-max-waiters: - - identifies the maximum number of waiters for a - managed connection. Default value is 0. - - - - 0 (default value) - - - - n - - - - - - pool-max-waittime - - identifies the maximum number of seconds that a - waiter will wait for a managed connection. Default value is - 0. - - - - 0 (default value) - - - - n in seconds - - - - - - pool-sampling-period: - - identifies the number of seconds that will occur - between statistics samplings of the pool. Default is 30 - seconds. - - - - n in seconds (default value = 30s) - - - - - - - - - - JDBC Connection Tags: - Only valid for Connection implementation of - java.sql.Connection. - - - - - - - property name - - description - - possible values - - - - jdbc-check-level - - Level of checking that will be done for the jdbc - connection. - - - - 0 : no check (default value) - - - - 1: check connection still open - - - - 2 : send the test statement before reusing a - connection from the pool - - - - 3: (keep-alive feature) send the test statement - on each connection every pool-sampling-period - - - - - - jdbc-test-statement - - Test SQL statement sent on the connection if the - jdbc-check-level is greater than 1. - - - - A SQL statement - - - - - - - - - - Config Property Value Tags: - - Each entry must correspond to the config-property specified in - the ra.xml of the RAR file. The default values specified in the - ra.xml will be loaded first and any values set in the jonas-ra.xml - will override the specified defaults. These tags differs dependiing - on the generic JDBC RA used - - - - - - property name - - description - - possible values - - - - dsClass - - Name of the class implementing - java.sql.Driver, - javax.sql.DataSource, - javax.sql.ConnectionPoolDataSource, - or javax.sql.XADataSource interfaces - in the JDBC driver. - - - - any classname representing a JDBC driver - (example:org.postgresql.Driver) - - - - - - URL - - Database url of the form - jdbc:<database_vendor_subprotocol>. This property may - be used only for JDBC RA that implements the Driver - (JDBC_DM) - - - - Any url valid for a database provider - (example:jdbc:postgresql://localhost:5432/mydb) - - - - - - user - - Database user name - - - - any name - - - - - - password: - - Database password - - - - any string - - - - - - loginTimeout - - Maximum time in seconds that the driver will wait - while attempting to connect to a database. - - - - no value = 0 (default value) - - - - n in seconds - - - - - - isolationLevel - - Level of transaction isolation - - - - none - - - - serializable - - - - read_committed - - - - read_uncommitted - - - - repeatable_read - - - - - - mapperName - - Name of the JORM mapper - - The possible values can be found in the List - of available mappers in JORM documentation. - - - - databaseName - - Name of the database - - - - any name - - - - - - description: - - Informal description - - - - any String - - - - - - portNumber - - Port Number of the database server - - - - a number - - - - - - serverName - - Name of the database server. - - - - any name - - - - - - dbSpecificMethods - - allow flexibility to call setter methods on the - dsClass as required by the database - provider - - see below the particular syntax - - - - - - - - dbSpecificMethods a specific property: - - The JDBC Resource Adapter is built as a - generic connector to any database provider. The limitation of this - is that each database provider may have different requirements about - the methods needed to configure the dataSource - class. This dbSpecificMethods - property was added to allow flexibility to call setter methods on - the dsClass as required by the database - provider. The specific information about what additional methods - should be used is documented by the database provider. The format of - the value specified is: - - [:<del_char>]<method>=<value>::<value_type>:<method>=<value>::<value_type>....with: - - - - - - : - - optional starting value that denotes using the next - character as the delimiter instead of the default - ':' - - - - <del_char> - - delimiter character to use - - - - <method> - - method to call followed by an = sign - - - - <value> - - the parameter value to pass to the method being - called, followed by 2 delimiter characters.If a Properties - object is being passed, then the format of this value must - be (name=val, name=val, ...); - - - - <value_type> - - the parameter type used to construct the - reflection call, followed by the delimiter character if - additional methods are being called - - Boolean or bool - - - - Byte or byte - - - - Character or char - - - - Double or double - - - - Float or float - - - - Integer or int - - - - Long or long - - - - Properties or java.util.Properties - - - - Short or short - - - - String - - - - - - - - - - - - - If this JDBC resource is used as a - persistence unit, the persistence configuration defined in the - persistence.xml file must be coherent to this - jonas-ra.xml description, such as the datasource - name and the dialect. - -
    - -
    - - Understanding pooling tags: - - - At JDBC RA deployment time, if pool-init is not null pool-init JDBC connection are created. - - When a user requests a jdbc connection, the JDBC RA first checks - to see if a connection is already open for its transaction. If not, it - tries to get a free connection from the free list. If there are no more - connections available, it creates a new jdbc connection (if pool-max is not reached). - - If it cannot create new connections, the user must wait (if - pool-max-waiters is not reached) until - a connection is released. After a limited time (pool-max-waittime), the getConnection - returns an exception. - - When the user calls close() on its - connection, it is put back in the free list. - - Many statistics are computed (every pool-sampling-period seconds) and can be viewed - by JonasAdmin. This is useful for tuning these parameters and for seeing - the server load at any time - - When a connection has been open for a time too long (pool-max-age), the pool will try to release it - from the freelist. However, the JDBC RA always tries to keep open at - least the number of connections specified in pool-min. - - When the user has forgotten to close a jdbc connection, the system - can automatically close it, after pool-max-opentime minutes. Note that if the user - tries to use this connection later, thinking it is still open, it will - return an exception (socket closed). - - When a connection is reused from the freelist, it is possible to - verify that it is still valid. This is configured in jdbc-check-level . For levels >1 it tries a - dummy statement on the connection before returning it to the caller. - This statement is configured in jdbc-test-statement. - - - this previous description is not only true for JDBC RAs but also - for all types of resource adapters, except jdbc-check-level and jdbc-test-statement which are specifics for - JDBC. - -
    -
    - -
    - - Examples of Specific JDBC Resource Adapter - - - - -
    - - Oracle JDBC resource adapter (Driver) - - - An RAR for Oracle named as jdbc_1 in JNDI and - using the Oracle thin Driver JDBC driver, should be described in a file - (called for example Oracle1_DM.rar), with the - following properties configured in the jonas-ra.xml file: - - - - <?xml version = "1.0" encoding = "UTF-8"?> -<jonas-connector xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-connector_4_2.xsd" > - <jndi-name>jdbc_1</jndi-name> - <rarlink>JOnASJDBC_DM</rarlink> - <jonas-config-property> - <jonas-config-property-name>user</jonas-config-property-name> - <jonas-config-property-value>scott</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>password</jonas-config-property-name> - <jonas-config-property-value>tiger</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>loginTimeout</jonas-config-property-name> - <jonas-config-property-value></jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>URL</jonas-config-property-name> - <jonas-config-property-value>jdbc:oracle:thin:@malte:1521:ORA1</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>dsClass</jonas-config-property-name> - <jonas-config-property-value>oracle.jdbc.driver.OracleDriver</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>mapperName</jonas-config-property-name> - <jonas-config-property-value>rdb.oracle</jonas-config-property-value> - </jonas-config-property> -</jonas-connector> - - - In this example, "malte" is the hostname of the server running the - database Oracle, 1521 is the SQL*Net V2 port number on this server, and - ORA1 is the ORACLE_SID. This example makes use of the Oracle "Thin" JDBC - driver. For an application server running on the same host as the Oracle - DBMS, you can use the Oracle OCI JDBC driver. -
    - -
    - - PostgreSQL JDBC resource adapter (Driver) - - - To create a PostgreSQL RAR configured as jdbc_3 in JNDI, it should - be described in a file (called for examplePostgreSQL3_DM.rar), with the - following properties configured in the jonas-ra.xml file: - - <?xml version = "1.0" encoding = "UTF-8"?> -<jonas-connector xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-connector_4_2.xsd" > - <jndi-name>jdbc_3</jndi-name> - <rarlink>JOnASJDBC_DM</rarlink> -<jonas-config-property> - <jonas-config-property-name>user</jonas-config-property-name> - <jonas-config-property-value>jonas</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>password</jonas-config-property-name> - <jonas-config-property-value>jonas</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>loginTimeout</jonas-config-property-name> - <jonas-config-property-value></jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>URL</jonas-config-property-name> - <jonas-config-property-value>jdbc:postgresql:/malte:5432/db_jonas</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>dsClass</jonas-config-property-name> - <jonas-config-property-value>org.postgresql.Driver</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>mapperName</jonas-config-property-name> - <jonas-config-property-value>rdb.postgres</jonas-config-property-value> - </jonas-config-property> -</jonas-connector> - - - - -
    - -
    - - Oracle JDBC resource adapter (XADataSource) - - - An RAR for Oracle configured as jdbc_4 in JNDI and using the - Oracle XADataSource interface of the JDBC driver - thin in order to use a JDBC2-XA-compliant driver.It may be described in - a file (called for example Oracle1_XA.rar), with the following - properties configured in the jonas-ra.xml file: - - <?xml version = "1.0" encoding = "UTF-8"?> -<jonas-connector xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-connector_4_2.xsd" > - <jndi-name>jdbc_4</jndi-name> - <rarlink>JOnASJDBC_XA</rarlink> - <jonas-config-property> - <jonas-config-property-name>user</jonas-config-property-name> - <jonas-config-property-value>jonas</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>password</jonas-config-property-name> - <jonas-config-property-value>jonas</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>databaseName</jonas-config-property-name> - <jonas-config-property-value>dbjonas</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>portNumber</jonas-config-property-name> - <jonas-config-property-value>1521</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>serverName</jonas-config-property-name> - <jonas-config-property-value>wallis</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>dbSpecificMethods</jonas-config-property-name> - <jonas-config-property-value>:#setDriverType=thin##String</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>dsClass</jonas-config-property-name> - <jonas-config-property-value>oracle.jdbc.xa.client.OracleXADataSource</jonas-config-property-value> - </jonas-config-property> -</jonas-connector> -
    -
    - -
    - - Tracing SQL Requests through P6Spy - - - The P6Spy tool - provides an easy way to trace the SQL requests sent to the - database. - - To enable this tracing feature, perform the following configuration - steps: - - - - Install the p6spy.jar - The P6Spy - tool was integrated into previous versions of but now it must be - explicitly downloaded from - here - into $JONAS_BASE/lib/ext. - - - - Update the appropriate RAR file's - jonas-ra.xml file by setting the - dsClass property to - com.p6spy.engine.spy.P6SpyDriver - - - - Set the realdriver property in the - spy.properties file (located in $JONAS_BASE/conf) to the jdbc driver of - your actual database. - - - - Verify that logger.org.objectweb.jonas.jdbc.sql.level is set to - DEBUG in $JONAS_BASE/conf/trace.properties. - - - Example jonas-ra.xml content: - - <?xml version = "1.0" encoding = "UTF-8"?> -<jonas-connector xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-connector_4_2.xsd" > - <jndi-name>jdbc_3</jndi-name> - <rarlink>JOnASJDBC_DM</rarlink> - <native-lib></native-lib> - <log-enabled>true</log-enabled> - <log-topic>org.objectweb.jonas.jdbc.DMPostgres</log-topic> - <pool-params> - <pool-init>0</pool-init> - <pool-min>0</pool-min> - <pool-max>100</pool-max> - <pool-max-age>0</pool-max-age> - <pstmt-max>10</pstmt-max> - </pool-params> - - <jdbc-conn-params> - <jdbc-check-level>0</jdbc-check-level> - <jdbc-test-statement></jdbc-test-statement> - </jdbc-conn-params> - <jonas-config-property> - <jonas-config-property-name>user</jonas-config-property-name> - <jonas-config-property-value>jonas</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>password</jonas-config-property-name> - <jonas-config-property-value>jonas</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>loginTimeout</jonas-config-property-name> - <jonas-config-property-value></jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>URL</jonas-config-property-name> - <jonas-config-property-value>jdbc:postgresql://your_host:port/your_db</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>dsClass</jonas-config-property-name> - <jonas-config-property-value>com.p6spy.engine.spy.P6SpyDriver</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>mapperName</jonas-config-property-name> - <jonas-config-property-value>rdb.postgres</jonas-config-property-value> - </jonas-config-property> - <jonas-config-property> - <jonas-config-property-name>logTopic</jonas-config-property-name> - <jonas-config-property-value>org.objectweb.jonas.jdbc.DMPostgres</jonas-config-property-value> - </jonas-config-property> -</jonas-connector> - - In $JONAS_BASE/conf/spy.properties - file: - - realdriver=org.postgresql.Driver - - In - $JONAS_BASE/conf/trace.properties: - - logger.org.objectweb.jonas.jdbc.sql.level DEBUG - - - -
    - -
    - - Migration from dbm service to the JDBC RA - - - The migration of a Database.properties file to - a similar Resource Adapter can be accomplished through the execution of - the following RAConfig tool command. Refer to the JOnAS Commands Reference - Guide for a complete description of RAConfig command. - - RAConfig -dm -p MySQL1 $JONAS_ROOT/rars/autoload/JOnAS_jdbcDM MySQL_dm - - Generates a MySQL_dm.rar file linked to - JOnAS_jdbcDM.rar, the jonas-ra.xml - file inserted is created with values coming from the - ra.xml file of the - JOnAS_jdbcDM.rar and values from the - MySQL1.properties file - - The jonas-ra.xml created by the previous - command can be updated further, if desired. Once the additional properties - have been configured, update the MySQL_dm.rar file - using the following command: - - RAConfig -path . MySQL_dm.rar - -RAConfig -u jonas-ra.xml MySQL_dm.rar - - Extraction of jonas-ra.xml of - MySQL_dm.rar in the working directory - - - - update MySQL_dm.rar with - jonas-ra.xml - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/ra/JDBCXML.xml b/jonas_doc/core/src/docbook/doc-en/ra/JDBCXML.xml deleted file mode 100644 index f943e42fdcd1f8ea752a08be01661c9ad987db8e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/ra/JDBCXML.xml +++ /dev/null @@ -1,446 +0,0 @@ - -
    - - Configuring JDBC XML datasources - - - This section describes how to configure quickly JDBC datasources - in a XML file. - - - The database connections are obtained from a JDBC RA which is - generated automatically from a - XML definition. The temporary RAR file is generated under the - work - directory. - Only the - Driver - interface is supported with the JDBC xml deployable. For more advanced uses, - an explicit JDBC RA - must be configured. - - - - The datasources are deployed by dropping the XML file into the - deploy - directory and are undeployed - by removing it. - - - - The root element of the XML file is named - datasources - . It contains a list of - datasource - element, structured in two elements - datasource-configuration - and - connectionManager-configuration - . The namespace has to be set to - xmlns="http://jonas.ow2.org/ns/datasource/1.1" - - . An example is given below with - a datasource configuration for connecting the embedded HSQL database. - - - - <datasources xmlns="http://jonas.ow2.org/ns/datasource/1.1"> - <datasource> - <datasource-configuration> - <name>jdbc_1</name> - <url>jdbc:hsqldb:hsql://localhost:9001/db_jonas</url> - <classname>org.hsqldb.jdbcDriver</classname> - <username>jonas</username> - <password>jonas</password> - <mapper>rdb.hsql</mapper> - </datasource-configuration> - <connectionManager-configuration> - <connchecklevel>2</connchecklevel> - <connteststmt>select count(1) from information_schema.system_tables</connteststmt> - <connmaxage>1448</connmaxage> - <maxopentime>60</maxopentime> - <initconpool>1</initconpool> - <minconpool>5</minconpool> - <maxconpool>10</maxconpool> - <pstmtmax>100</pstmtmax> - <pstmtcachepolicy>Map</pstmtcachepolicy> - <maxwaittime>30</maxwaittime> - <maxwaiters>100</maxwaiters> - <samplingperiod>20</samplingperiod> - </connectionManager-configuration> - </datasource> - </datasources> - - - - - - The datasource-configuration element - defines the required parameters to connect the database: - - - - - - - property name - - description - - possible values - - - - name - - JNDI name the datasource will be registered as. This - property is - required. - - - - - Anyname (for example jdbc_1) - - - - - - - url - - Database url of the form - jdbc:<database_vendor_subprotocol>. - - - - - Any url valid for a database provider - (example:jdbc:postgresql://localhost:5432/mydb) - - - - - - - classname - - - Name of the class implementing - java.sql.Driver - interface in the JDBC driver. - - - - - - any classname representing a JDBC driver - (example:org.postgresql.Driver) - - - - - - - username - - Database user name - - - - - any name - - - - - - - password - - Database password - - - - - any string - - - - - - - mapperName - - Name of the JORM mapper - - - The possible values can be found in the - List - of available mappers in JORM documentation - . - - - - - - - - - - - The connectionManager-configuration element - defines the - required parameters to manage the connection (pool configuration, JDBC - connection checker, ...): - - - - - - - connchecklevel - - Level of checking that will be done for the jdbc - connection. - - - - - 0 : no check (default value) - - - - 1: check connection still open - - - - 2 : send the test statement before reusing a - connection from the pool - - - - 3: (keep-alive feature) send the test statement - on each connection every pool-sampling-period - - - - - - - connteststmt - - Test SQL statement sent on the connection if the - jdbc-check-level is greater than 1. - - - - - A SQL statement - - - - - - - initconpool - - Initial size of the managed connection pool - - - - - 0 (default value) - - - - n - - - - - - - minconpool - - Minimum size of the managed connection pool. - - - - - 0 (default value) - - - - n - - - - - - - maxconpool - - Maximum size of the managed connection pool. - - - - - n - - - - -1 = unlimited (default value) - - - - - - - connmaxage - - Maximum number of minutes to keep the managed - connection in the pool. - - - - - 0 = an unlimited amount of time. - - - - n in minutes - - - - - - - pstmtmax - - Maximum number of PreparedStatements per managed - connection in the pool. Value of 0 is - unlimited and -1 disables the cache. - - - - - 0 = unlimited - - - - n (default value = 10) - - - - -1 = cache disabled - - - - - - - pstmtcachepolicy - - Prepared statement cache policy to use. - - - - - List (default value) = Array based implementation of the cache - - - - Map = Hashmap based implementation of the cache - - - - - - - - maxopentime - - Identifies the maximum number of minutes that a - managed connection can be left busy. - - - - - 0 = an unlimited amount of time (default - value). - - - - n in minutes - - - - - - - maxwaiters - - identifies the maximum number of waiters for a - managed connection. Default value is 0. - - - - - 0 (default value) - - - - n - - - - - - - maxwaittime - - identifies the maximum number of seconds that a - waiter will wait for a managed connection. Default value is - 0. - - - - - 0 (default value) - - - - n in seconds - - - - - - - samplingperiod - - identifies the number of seconds that will occur - between statistics samplings of the pool. Default is 30 - seconds. - - - - - n in seconds (default value = 30s) - - - - - - - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/ra/JMSRA.xml b/jonas_doc/core/src/docbook/doc-en/ra/JMSRA.xml deleted file mode 100644 index 312865a02640631ee1251e9458fb9ddfa1407f8b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/ra/JMSRA.xml +++ /dev/null @@ -1,1118 +0,0 @@ - -
    - - Configuring JMS Resource Adapters - - - JMS Resource adapters can be deployed, either via the JOnAS administration console, - or via the jonas admin -a command, - or by dropping the file in the $JONAS_BASE/deploy directory. - - JMS connections are obtained from a JMS RA, which is configured to - identify and access a JMS server. - - The JORAM resource adapter archive - (joram_ra_for_jonas-{joram.version}.rar) is provided with the JOnAS - distribution. It is located in the $JONAS_BASE/repositories/maven2-internal/org/objectweb/joram/joram_ra_for_jonas/{joram.version}/joram_ra_for_jonas-{joram.version}.rar - directory. This file has to be changed if a particular configuration is - needed for JORAM. - - By default, the joram.xml file, a deployment plan related to JORAM, is - present in the $JONAS_BASE/deploy directory. This - deployment plan is used to deploy JORAM. It declares among others the JORAM - resource adapter archive to deploy. - -
    - - JORAM Resource Adapter configuration files - - - The JORAM RA may be seen as the central authority to go through for - connecting and using a JORAM platform. The RA is provided with a default - deployment configuration which: - - - - Starts a collocated JORAM server in non-persistent mode, with id - 0 and name s0, on host localhost and using port 16010; for doing so it - relies on both an a3server.xml file located in - the $JONAS_BASE/conf directory - and the jonas-ra.xml file located within the RA. - - - - Creates managed JMS ConnectionFactory instances and binds them - with the names CF, QCF, and TCF. - - - - Creates administered objects for this server (JMS destinations - and non-managed factories) as described by the - joramAdmin.xml, located in the $JONAS_BASE/conf directory; those objects - are bound with the names sampleQueue, - sampleTopic, JCF, JQCF, and - JTCF. - - - - The default configuration may, of course, be modified. - - The JORAM integration into is composed of 3 different parts: server, RA, and - administration. Each part contains its own configuration files: - - - - a3servers.xml is the JORAM - platform configuration file, i.e. the server part. The file is located - in the $JONAS_BASE/conf - directory. - - - - ra.xml and jonas-ra.xml - are the resource adapter configuration files. They are - embedded in the resource adapter (META-INF directory). - - - - joramAdmin.xml contains the administration - tasks to be performed by the JORAM server such as the JMS objects - creation. It is located in the $JONAS_BASE/conf directory. - - - -
    - - JORAM server configuration : a3servers.xml - - - The a3server.xml - ($JONAS_BASE/conf/a3server.xml) file describes the - JORAM platform, i.e., the network domain, the used transport protocol, - and the reachable JORAM servers. It is used by a JORAM server at start - time. By default, only one collocated JORAM server is defined (s0) based - on the tcp/ip protocol. A distributed configuration example is provided - in the how-to document and other examples are available in JORAM's user - guide. - - <config> - <property name="Transaction" value="fr.dyade.aaa.util.NullTransaction"/> - <server id="0" name="S0" hostname="localhost"> - <service class="org.objectweb.joram.mom.proxies.ConnectionManager" - args="root root"/> - <service class="org.objectweb.joram.mom.proxies.tcp.TcpProxyService" - args="16010"/> - - </server> -</config> - - This property means that the non persistent mode for JMS is - choosen. In order to use persistent mode, the value must be - changed to "fr.dyade.aaa.util.NTransaction" - - - - Here can be set the server id and the host where the server - run - - - - args specifies the port number the JORAM server is listening - on - - - - The above configuration describes a JORAM platform made up of one - unique JORAM server (id 0, name s0), running on localhost, listening on - port 16010. Those values are taken into account by the JORAM server when - starting. However, they should match the values - set in the deployment descriptor of the RA, otherwise the - adapter either will not connect to the JORAM server, or it will build - improper connection factories. - - The joram_raconfig command allows to modify these parameters in - all the configuration files. - - If used in non-collocated mode, joram can be started with the - JmsServer command which loads the - $JONAS_BASE/conf/a3server.xml configuration file. -
    - -
    - - Resource Adapter configuration: ra.xml, jonas-ra.xml - - - The ra.xml file is the standard deployment - descriptor for the JORAM adapter and the jonas-ra.xml - file is the JOnAS-specific deployment descriptor for the - JORAM adapter. These files set the central configuration of the adapter, - define and set managed connection factories for outbound communication, - and define a listener for inbound communication. jonas-ra.xml - contains specific parameters such as pool parameters or jndi - names, but also may redefine the parameters of some ra.xml - files and override their values. Globally, a good way to - proceed is to keep the original ra.xml file with - the default values and to customize the configuration only in the - jonas-ra.xml file. - - Changing the configuration of the RA requires extracting and - editing the deployment descriptor and updating the archive file. There - are several possible ways to do this: - - - - With the RAConfig command to extract jonas-ra.xml, do the - following: - - RAConfig -path . joram_for_jonas_ra.rar - - Then, to update the archive, do the following: - - RAConfig -u jonas-ra.xml joram_for_jonas_ra.rar - - - - Through the jonasAdmin console (refer to Administration guide - for a complete description). - - In the jonasAdmin's tree, the Resource Adapter Module node - (under the deployment node) contains a configure tab that allows - editing of both the ra.xml file and the jonas-ra.xml file of the - undeployed RA. - - - - Through the joram_raconfig utility (refer to joram_raconfig - description for a complete description). - - This tool allows easy modification to the network parameters - of the JORAM server in all the configuration files. - - - - The following properties are related to the central configuration - of the adapter; they are set via some <jonas-config-property> - elements: - - - - - - property name - - description - - possible values - - - - CollocatedServer - - Running mode of the JORAM server to which the adapter - gives access. - - - - True: when deploying, the adapter starts a - collocated JORAM server. - - - - False: when deploying, the adapter connects to a - remote JORAM server. - - - - Nothing (default True value is then set). - - - - - - PlatformConfigDir - - Directory where the a3servers.xml - and joramAdmin.xml files are - located. - - - - Any String describing an absolute path (ex: - /myHome/myJonasRoot/conf). - - - - Empty String, files will be searched in - $JONAS_BASE/conf - - - - Nothing (default empty string is then set). - - - - - - PersistentPlatform - - Persistence mode of the collocated JORAM server. - not - taken into account if the JORAM server is set as non-collocated. - - If true, set the property 'Transaction' to - 'fr.dyade.aaa.util.NTransaction' before launching the JORAM - server. - If false, set the property 'Transaction' to - 'fr.dyade.aaa.util.NullTransaction' before launching the JORAM - server. - Warning, if the 'Transaction' property is set in the - a3server.xml file, this value is ignored. - - - - True: starts a persistent JORAM server. - - - - False: starts a non-persistent JORAM server. - - - - Nothing (default False value is then set). - - - - - - ServerId - - Identifier of the JORAM server to start (not taken into - account if the JORAM server is set as non-collocated). - - - - Identifier corresponding to the server to start - described in the a3servers.xml file (ex: 1). - - - - Nothing (default 0 value is then set). - - - - - - ServerName - - Logical name of the JORAM server to start.In the - collocated case, this parameter specifies the storage path of - the persistent mode (absolute or relative path). If the JORAM - server is non-collocated, it must be set to the name of the - already started JORAM server (this is necessary for management - purpose). - - - - Storage path of the persistent mode for the - collocated case (ex: /tmp/s0). - - - - Name of the started server as described in the - a3servers.xml in the non collocated case (ex: s1) - - - - Nothing (default s0 name is then set and the current - directory is used for storing the persistent data). - - - - - - AdminFileXML - - Name of the file describing the administration tasks to - be performed by the JORAM server, i.e., JMS destinations to - create, users to create, ... If the file does not exist, or is - not found, no administration task is performed. - - - - Name of the file (ex: myAdminFile.xml). - - - - Nothing (default joramAdmin.xml name is then - set). - - - - - - HostName - - Name of the host where the JORAM server runs, used for - accessing a remote JORAM server (non-collocated mode), and for - building appropriate connection factories. - - - - Any host name (ex: myHost). - - - - Nothing (default localhost name is then set). - - - - - - ServerPort - - Port the JORAM server is listening on, used for accessing - a remote JORAM server (non-collocated mode), and for building - appropriate connection factories. - - - - Any port value (ex: 16030). - - - - Nothing (default 16010 value is then set). - - - - - - ConnectingTimer - - Duration in seconds during which connecting is attempted - (connecting might take time if the server is temporarily not - reachable) - - - - 0 : set for connecting only once and aborting if - connecting failed (default value) - - - - n : duration in seconds - - - - - - CnxPendingTimer - - Period in milliseconds between two ping requests sent by - the client connection to the server; - - - - 0 means "notimer" (default value) - - - - n: duration in milliseconds - - - - - - TxPendingTimer - - Duration in seconds during which a JMS transacted (non - XA) session might be pending; above that duration the session is - rolled back and closed. - - - - 0 value means "no timer". - - - - n: duration in seconds - - - - - - DeleteDurableSubscription - - Indicates the durable Subscriptions must be deleted when - the consumer is closed - - - - True (previous behaviour) - - - - False (default value) - - - - - - - - The <jonas-connection-definition> - elements wrap properties related to the managed connection - factories: - - There are three managed connection factories: - - - - A Queue managed connection factory registered in JNDI with the - name QCF - - - - A Topic managed connection factory registered in JNDI with the - name TCF - - - - A managed connection factory registered in JNDI with the name - CF - - - - Here are the properties that can be configured for each managed - connection factory: - - - - - - property name - - description - - possible values - - - - jndi-name - - Name used for binding the constructed connection - factory. - - Any name (ex: myQueueConnectionFactory). Default - values are - - QCF for the Queue - managed connection factory - - - - TCF for the Topic - managed connection factory - - - - CF for the managed - connection factory - - - - - - UserName - - Default user name that will be used for opening JMS - connections. - - - - Any name (ex: myName). - - - - Nothing (default anonymous name - will be set). - - - - - - Password - - Default user password that will be used for opening JMS - connections. - - - - Any name (ex: myPass). - - - - Nothing (default anonymous - password will be set). - - - - - - Collocated - - Specifies if the connections that will be created from - the factory should be TCP or local-optimized connections - - - - True (for building local-optimized - connections). - - - - False (for building TCP connections). - - - - Nothing (default TCP mode will be set). - - - - - - - - - - The <jonas-activationspec> element wraps a property related - to inbound messaging: - - - - - - property name - - description - - possible values - - - - jndi-name - - Binding name of a JORAM object to be used by 2.1 - MDBs. - - - - Any name (by default:joramActivationSpec). - - - - - - - - - - The Pooling Tags are the same than those - for other RAs: - - - - - - property name - - description - - possible values - - - - pool-init - - Initial size of the managed connection pool - - - - 0 (default value) - - - - n - - - - - - pool-min - - Minimum size of the managed connection pool. - - - - 0 (default value) - - - - n - - - - - - pool-max - - Maximum size of the managed connection pool. - - - - n - - - - -1 = unlimited (default value) - - - - - - pool-max-age-minutes - - Maximum number of minutes to keep the managed - connection in the pool. - - - - 0 = an unlimited amount of time. - - - - n in minutes - - - - - - pstmt-max - - Maximum number of PreparedStatements per managed - connection in the pool. Only needed with the JDBC RA of JOnAS - or another database vendor's RAR. Value of 0 is unlimited and - -1 disables the cache. - - - - 0 = unlimited - - - - n (default value = 10) - - - - -1 = cache disabled - - - - - - pool-max-opentime - - Identifies the maximum number of minutes that a managed - connection can be left busy. - - - - 0 = an unlimited amount of time (default - value). - - - - n in minutes - - - - - - pool-max-waiters: - - identifies the maximum number of waiters for a managed - connection. Default value is 0. - - - - 0 (default value) - - - - n - - - - - - pool-max-waittime - - identifies the maximum number of seconds that a waiter - will wait for a managed connection. Default value is - 0. - - - - 0 (default value) - - - - n in seconds - - - - - - pool-sampling-period: - - identifies the number of seconds that will occur - between statistics samplings of the pool. Default is 30 - seconds. - - - - n in seconds (default value = 30s) - - - - - - - - -
    - -
    - - JMS Applications Configuration - - - joramAdmin.xml file describes the - configuration related to the application. It describes the - administration objects in the JORAM server such as the JMS objects, the - users, or the non-managed factories. In other words, it defines the - JORAM objects to be (optionally) created when deploying the - adapter. - - In earlier version the joram-admin.cfg was - used for this same purpose but it is now deprecated. - - The default file provided with creates a queue bound with the name - sampleQueue, a topic bound with the name - sampleTopic, sets the - anonymous user, and creates and binds non-managed - connection factories named JCF, - JQCF and JTCF - - - - - All administration tasks are performed by the server - connected but may affect remote JORAM servers to which the - adapter is connected through the ServerId - attribute. - - - - If a queue, a topic or a user already exists on the - JORAM server (for example, because the server is in persistent - mode and has re-started after a crash, or because the adapter - has been deployed, undeployed and is re-deployed giving access - to a remote JORAM server), it will be retrieved instead of - being re-created. - - - - - The format of this file is XML. Here are some examples: - - - - simple example: - - - <?xml version="1.0"?> - <JoramAdmin> - <AdminModule> - <collocatedConnect name="root" password="root"/> - </AdminModule> - <ConnectionFactory className="org.objectweb.joram.client.jms.tcp.TcpConnectionFactory"> - <tcp host="localhost" - port="16010"/> - <jndi name="JCF"/> - </ConnectionFactory> - <ConnectionFactory className="org.objectweb.joram.client.jms.tcp.QueueTcpConnectionFactory"> - <tcp host="localhost" - port="16010"/> - <jndi name="JQCF"/> - </ConnectionFactory> - <ConnectionFactory className="org.objectweb.joram.client.jms.tcp.TopicTcpConnectionFactory"> - <tcp host="localhost" - port="16010"/> - <jndi name="JTCF"/> - </ConnectionFactory> - <User name="anonymous" - password="anonymous" - serverId="0"/> - <Queue name="sampleQueue"> - <freeReader/> - <freeWriter/> - <jndi name="sampleQueue"/> - </Queue> - <Topic name="sampleTopic"> - <freeReader/> - <freeWriter/> - <jndi name="sampleTopic"/> - </Topic> - </JoramAdmin> - - - - - For requesting the creation of a new object, simply add the - element in the file. For example, to add a queue 'MyQueue', add the - following XML element: - - <Queue name="myQueue"> - <freeReader/> - <freeWriter/> - <jndi name="myQueue"/> - </Queue> - - - - When the JORAM is not collocated, the AdminModule must be - defined as follows: - - <AdminModule> - <connect host="localhost" - port="16020" - name="root" - password="root"/> - </AdminModule> - - The port number must be set with the server port number - (defined in the a3servers.xml and in the - JORAM's RAR configuration ra.xml and - jonas-ra.xml files). - - - - Possible parameters for a queue definition: - - <Queue name="" - serverId="" - className="" - dmq="" - nbMaxMsg="" - threshold=""> - <property name="" value=""/> - <property name="" value=""/> - <reader user=""/> - <writer user=""/> - <freeReader/> - <freeWriter/> - <jndi name=""/> - </Queue> - - - - Possible parameters for a topic definition: - - <Topic name="" - parent="" - serverId="" - className="" - dmq=""> - <property name="" value=""/> - <property name="" value=""/> - <reader user=""/> - <writer user=""/> - <freeReader/> - <freeWriter/> - <jndi name=""/> - </Topic> - - - - Example of a dead message queue definition: - - <DMQueue name="DMQ" - serverId="0"> - <reader user="anonymous"/> - <writer user="anonymous"/> - <freeReader/> - <freeWriter/> - <jndi name="DMQ"/> - </DMQueue> - - - - Example of a scheduler queue definition: - - <Destination type="queue" - serverId="0" - name="schedulerQueue" - className="com.scalagent.joram.mom.dest.scheduler.SchedulerQueue"> - <freeReader/> - <freeWriter/> - <jndi name="schedulerQueue"/> - </Destination> - - - - Example of a clustered queues destination: - - <Cluster> - <Queue name="queue0" - serverId="0" - className="org.objectweb.joram.mom.dest.ClusterQueue"> - <freeReader/> - <freeWriter/> - <property name="period" value="10000"/> - <property name="producThreshold" value="50"/> - <property name="consumThreshold" value="2"/> - <property name="autoEvalThreshold" value="false"/> - <property name="waitAfterClusterReq" value="1000"/> - <jndi name="queue0"/> - </Queue> - <Queue name="queue1" - serverId="1" - className="org.objectweb.joram.mom.dest.ClusterQueue"> - <freeReader/> - <freeWriter/> - <property name="period" value="10000"/> - <property name="producThreshold" value="50"/> - <property name="consumThreshold" value="2"/> - <property name="autoEvalThreshold" value="false"/> - <property name="waitAfterClusterReq" value="1000"/> - <jndi name="queue1"/> - </Queue> - <Queue name="queue2" - serverId="2" - className="org.objectweb.joram.mom.dest.ClusterQueue"> - <freeReader/> - <freeWriter/> - <property name="period" value="10000"/> - <property name="producThreshold" value="50"/> - <property name="consumThreshold" value="2"/> - <property name="autoEvalThreshold" value="false"/> - <property name="waitAfterClusterReq" value="1000"/> - <jndi name="queue2"/> - </Queue> - <freeReader/> - <freeWriter/> - <reader user="user0"/> - <writer user="user0"/> - <reader user="user1"/> - <writer user="user1"/> - <reader user="user2"/> - <writer user="user2"/> - </Cluster> - - -
    - -
    - - joram_raconfig command - - - - - -
    -
    - -
    - - JORAM's Resource Adapter tuning - - - - -
    - - ManagedConnection Pool - - - A pool of ManagedConnection is defined for each factory - (connection definition) specified in the jonas-ra.xml file. See the pool - parameters in the . -
    - -
    - - Session/Thread pool in the JORAM RA - - - The JORAM RA manages a pool of session/thread for each connection - and, by default, the maximum number of parallel sessions is set to - 10. - - When linked with an message-driven bean, this maximum number of - entries in the pool corresponds to the maximum number of messages that - can be processed in parallel per message-driven bean. A session is - released to the pool just after the message processing (onMessage()). - When the maximum is reached, the inquiries for a session creation are - blocked until a session becomes available in the pool. - - The maxNumberOfWorks property can be set in - the message-driven bean standard deployment descriptor. For example, the - code below can be added to limit the number of parallel sessions to 100 - (default value is 10). - - <activation-config-property> - <activation-config-property-name>maxNumberOfWorks</activation-config-property-name> - <activation-config-property-value>100</activation-config-property-value> - </activation-config-property> - - As this parameter set the max number of messages that can be - treated simultaneously, the max-cache-size must be - set accordingly in the specific deployment descriptor. -
    -
    - -
    - - Undeploying and Redeploying a JORAM Adapter - - - Undeploying a JORAM adapter either stops the collocated JORAM server - or disconnects from a remote JORAM server. It is then possible to deploy - the same adapter again. If set for running a collocated server, it will - re-start it. If the running mode is persistent, then the server will be - retrieved in its pre-undeployment state (with the existing destinations, - users, and possibly messages). If set for connecting to a remote server, - the adapter will reconnect and access the destinations it previously - created. - - In the collocated persistent case, if the intent is to start a brand - new JORAM server, its persistence directory should be removed. This - directory is located in JOnAS' running directory and has the same name as - the JORAM server (for example, s0/ for server "s0"). -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/security/configsecurity.xml b/jonas_doc/core/src/docbook/doc-en/security/configsecurity.xml deleted file mode 100644 index 39cd11c55881b7cb11638a003ecd8962431813f9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/security/configsecurity.xml +++ /dev/null @@ -1,974 +0,0 @@ - -
    - - Configuring Security - - - The security service is used by the - ejb, - web, ws services to provide - security for - components. The ejb service provides - security in two forms: declarative security and programmatic security that - is described in the EJB Programmer's - Guide: Security Management . - - The security service exploits - security roles and method permissions located in the deployment descriptors. - - A main concept in security is Authentication - which is the mechanism telling the container the identity of the user making - the current request. - - A caller is a client that may be a servlet client or a container - client. Usually a client proves its identity by a couple user/password or a - certificate (credential). Once the identification is - correct - must build a security context that will be propagated with requests and be - used by the container to verify that the user exists and has permissions - sufficient to make the request. - - JAAS is a standard framework for authenticating users. It defines - configuration files (jaas.config) and interfaces like - the LoginModule interface that may be used in - to - perform authentication tasks. - - Lightweight authentication mechanism using JACC may be used to - authenticate servlet client. - - In the Tomcat documentation we can find this definition: A - Realm is a "database" of usernames and passwords that identify valid users - of a web application (or set of web applications), plus an enum eration of - the list of roles associated with each valid user. - - In both authentication mechanisms the container use a realm - to verify validity of users. In JOnAS the - realm may be a database accessed via JDBC (Database - realm), a LDAP directory (LDAP realm) or a flat file (Memory realm). The - type of realm to use is specified in - $JONAS_BASE/conf/jonas-realm.xml. - -
    - - jonas-realm.xml - - - The file $JONAS_BASE/conf/jonas-realm.xml file - describes: - - - - the content of flat file memory realm - - - - how to access a database realm - - - - how to access a LDAP realm - - - -
    - - Memory realm - - - The memoryrealm must be named and defines - users, groups and roles in the section <jonas-memoryrealm> - - <jonas-memoryrealm> - <memoryrealm name="memrlm_1"> - <roles> - <role name="jonas-admin" description="JonasAdmin role" /> - <role name="tomcat" description="Used in examples" /> - </roles> - <groups> - <group name="jonas" - roles="jonas-admin,tomcat,jaas,ws-security" description="All authorization" /> - </groups> - <users> - <user name="tomcat" password="tomcat" roles="tomcat,jonas-admin,manager" /> - <user name="jetty" password="jetty" roles="jetty" /> - <!-- Example of a crypt password : password for jadmin is : jonas --> - <user name="jadmin" password="{MD5}nF3dVBB3NPfRgzWlJFwoaw==" roles="jonas-admin" /> - <user name="jps_admin" password="admin" roles="administrator" /> - <user name="supplier" password="supplier" roles="administrator" /> - <!-- Another crypt example in another format : password is jonas --> - <!-- JonasAdmin uses name="jonas" password="jonas" --> - <user name="jonas" password="SHA:NaLG+uYfgHeqth+qQBlyKr8FCTw=" groups="jonas" /> - <user name="principal1" password="password1" roles="role1" /> - <user name="principal2" password="password2" roles="role2" /> - </users> - </memoryrealm> -</jonas-memoryrealm> - - memoryrealm must be named. This name will be used in the web - container configuration file - - - - definition of a security role - - - - definition of a group of roles - - - - definition of a user with non encrypted password and a list - of roles - - - - definition of a user with encrypted password (format - MD5) - - - - definition of a user with encrypted password (format - SHA) - - To get the correct encoded password, the MD5/SHA digest - must be base64 encoded: - - $ echo -n jonas | openssl md5 -binary | base64 -$ nF3dVBB3NPfRgzWlJFwoaw== - - This command is available on Linux or Cygwin - - An alternate way to obtain a correct encoded password would be to - to write a java class that uses sun.misc.BASE64Encoder -
    - -
    - - database realm - - - Users, groups, and roles information are stored in a database; the - configuration for accessing the corresponding database is described in - the section <jonas-dsrealm> - - The configuration requires the name of a datasource, the tables - used, and the names of the columns. - - <jonas-dsrealm> - <dsrealm name="dsrlm_1" - dsName="jdbc_1" - userTable="realm_users" userTableUsernameCol="user_name" userTablePasswordCol="user_pass" - roleTable="realm_roles" roleTableUsernameCol="user_name" roleTableRolenameCol="role_name"> - </dsrealm> -</jonas-dsrealm> - - dsrealm must be named - - - - JNDI name of the dataSource for - accessing the database via JDBC - - - - defines the name of the user table and the name of the - columns for username/password - - - - defines the name of the role table and the name of the - columns for username/rolename - - - - to use this database a Datasource - configuration with the right JNDI name for the dbm - service must be set in the jonas.properties - file. -
    - -
    - - LDAP realm - - - Users, groups, and roles information are stored in an LDAP - directory. This is described in the section - <jonas-ldaprealm> - - There are some optional parameters. If they are not specified, - some of the parameters are set to a default value. For example if the - providerUrl element is not set, the default value is - ldap://localhost:389. The jonas-realm_1_0.dtd - DTD file show the default values. - - - - minimal example: - - <jonas-ldaprealm> -<ldaprealm name="ldaprlm_1" - baseDN="dc=jonas,dc=ow2,dc=org" /> -</jonas-ldaprealm> - - ldaprealm must be named - - - - to access to LDAP server - - For this sample, it is assumed that the LDAP server is - on the same computer and is on the default port - (389). - - - - -
    -
    - -
    - - Servlet Authentication - - - Depending on the servlet container used, configuration - differs. - -
    - - Authentication with User/password and Tomcat 6 - - - - - Tomcat configuration: - - Tomcat embedded in the distribution is configured in - $JONAS_BASE/conf/tomcat6-server.xml to use the - memory realm named memrlm_1 - - <Server> -[...] -<Realm className="org.ow2.jonas.web.tomcat6.security.Realm" resourceName="memrlm_1" /> -[...] -</Server> - - The authentication mechanism implemented by the class - org.ow2.jonas.web.tomcat6.security.Realm is - able to work with database or LDAP realm configured in - jonas-realm.xml. The value of resourceName - attribute identifies the realm to be used in - jonas-realm.xml. - - - - webapp configuration: - - In the web.xml of the web application a - basic authentication or a Form based - authentication may be used - - <web-app> -<login-config> - <auth-method>BASIC</auth-method> - <realm-name>Example Basic Authentication Area</realm-name> - </login-config> -</web-app> - - or - - <web-app> - <login-config> - <auth-method>FORM</auth-method> - <form-login-config> - <form-login-page>login.jsp</form-login-page> - <form-error-page>error.jsp</form-error-page> - </form-login-config> - </login-config> -</web-app> - - Like basic authentication, form-based authentication is not - secure, since the content of the user dialog is sent as plain text, - and the target server is not authenticated. - - To overcome this vulnerability the authentication protocol may - be run over a SSL session that ensures that all message contents are - protected for confidentiality. - - -
    - -
    - - Authentication with certificate and Tomcat 6 - - - - In this case, users will not have to enter a login/password. - They will just present their certificates and authentication is - performed transparently by the browser (after the user has imported - his certificate into it). Therefore, the identity presented to the - server is not a login, but a Distinguished Name(DN). - - - jonas-realm - configuration: - - The name identifying the person to whom the certificate - belongs looks like the following: CN=Someone Unknown, - OU=ObjectWeb, O=JOnAS, C=ORG with: - - CN : Common Name - - OU : Organizational Unit - - O : Organization - - C : Country Name - - E : Email Address - - L : Locality - - ST :State or Province Name - - The Subject in a certificate contains the main attributes - and may include additional ones, such as Title, Street Address, - Postal Code, Phone Number. - - In the jonas-realm.xml a user with password looks - like:<user name="jps_admin" password="admin" roles="administrator"/>A - certificate-based user must have its DN preceded by the String: - ##DN## example:<user name="##DN##CN=whale, OU=ObjectWeb, O=JOnAS, L=JOnAS, ST=JOnAS, C=ORG" - password="" roles="jadmin" /> - - - - Tomcat Realm configuration: - - The current Realm in $JONAS_BASE/conf/tomcat6-server.xml - must be replaced by: - - <Server> -[...] -<Realm className="org.ow2.jonas.web.tomcat6.security.Realm" /> -[...] -</Server> - - The class specified uses the JAAS model to authenticate the - users. Thus, to choose the correct realm to be used for - authentication, JAAS must be configured see in . - - - - Tomcat SSL configuration: - - The following example of <connector> element must be - uncommented in $JONAS_BASE/conf/tomcat6-server.xml and customized - (if necessary): - - <Server> -[...] -<!-- Define a SSL Coyote HTTP/1.1 Connector on port 9043 --> - <!-- - <Connector port="9043" maxHttpHeaderSize="8192" - maxThreads="150" minSpareThreads="25" maxSpareThreads="75" - enableLookups="false" disableUploadTimeout="true" - acceptCount="100" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" /> - --> -[...] -</Server> - - A complete description of SSL configuration can be found in - SSL - Configuration HOW-TO - - - - Webapp configuration: - - In the web.xmlof the web application a - Client Certificate Authentication Configuration - must be set, a security-constraint may be used if - needed; example: - - <web-app> - <login-config> - <auth-method>CLIENT-CERT</auth-method> - <realm-name>Example Authentication Area</realm-name> - </login-config> - - <security-constraint> - .. - <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - </security-constraint> -</web-app> - - -
    - -
    - - Servlet Authentication with User/password and Jetty 6.x - - - - - Jetty configuration - - A web-jetty.xml file must be provided in the WEB-INF directory in the .war file in which a security - interceptor - org.ow2.jonas.web.jetty6.security.Realm form - is specified instead of the default one: - - <Configure class="org.mortbay.jetty.webapp.WebAppContext"> - <Call name="setRealmName"> - <Arg>Example Basic Authentication Area</Arg> - </Call> - <Call name="setRealm"> - <Arg> - <New class="org.ow2.jonas.web.jetty6.security.Realm"> - <Arg>Example Basic Authentication Area</Arg> - <Arg>memrlm_1</Arg> - </New> - </Arg> - </Call> -</Configure> - - - - webapp configuration: - - is similar to the webapp configuration with Tomcat see . - - -
    - -
    - - Authentication with certificate and Jetty 6.x - - - - - - - Jetty Realm configuration: - - Edit the web-jetty.xml file under WEB-INF directory in the - .war file to declare a Realm name and a Realm: - - <Configure class="org.mortbay.jetty.webapp.WebAppContext"> -... -!-- Set the same realm name as the one specified in <realm-name> in <login-config> - in the web.xml file of your web application --> -<Call name="setRealmName"> - <Arg>Example Authentication Area</Arg> -</Call> -<!-- Set the class Jetty has to use to authenticate the user and a title name for - the pop-up window --> -<Call name="setRealm"> - <Arg> - <New class="org.ow2.jonas.web.jetty6.security.Realm"> - <Arg>JAAS on Jetty</Arg> - </New> - </Arg> -</Call> -... -</Configure> - - The class specified uses the JAAS model to authenticate the - users. Thus, to choose the correct realm to be - used for authentication, JAAS must be configured, see in . - - - - Jetty SSL configuration: - - In the global deployment descriptor of Jetty (the jetty6.xml - file), located in the $JONAS_BASE/conf directory, uncomment this - part: - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- Add a HTTPS SSL listener on port 9043 --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- UNCOMMENT TO ACTIVATE - <Call name="addListener"> - <Arg> - <New class="org.mortbay.http.SunJsseListener"> - <Set name="Port">9043</Set> - <Set name="MinThreads">5</Set> - <Set name="MaxThreads">100</Set> - <Set name="MaxIdleTimeMs">30000</Set> - <Set name="LowResourcePersistTimeMs">2000</Set> - <Set name="Keystore"><SystemProperty name="jetty.home" default="."/>/etc/demokeystore</Set> - <Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set> - <Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set> - </New> - </Arg> - </Call> - --> - A complete description of howto configure SSL for Jetty may be founf - here - - - - webapp configuration - - is similar to the webapp - configuration with Tomcat - - - - jonas-realm configuration - - is similar to the jonas-realm configuration with - Tomcat - - -
    -
    - -
    - - Client container Authentication - - - To enable authentication mechanism in a client container it is - necessary to - - - - choose a callback handler - - Callback handlers are responsible to get the user identity and - to store it. - - The choice of the callback handler is done - in the application-xml file, for example: - - <application-client> - <callback-handler>org.ow2.jonas.security.auth.callback.LoginCallbackHandler</callback-handler> -</application-client> - - JOnAS provides several callback handlers - all these handlers are defined in the package - org.ow2.jonas.security.auth.callback - : - - - - LoginCallbackHandler : it is a text - based handler that gets the user and password via stdin - - - - DialogCallbackHandler: handler using - a Swing dialog window to query user and password - - - - NoInputCallbackHandler: is - responsible to store a user/password - - - - CertificateCallback: is responsible - to store a certificate - - - - - - configure JASS for setting the LoginModules to be used to - perform authentication see - - - - In the $JONAS_ROOT/examples/javaee5-earsample - directory can be found examples of clients using JAAS authentication as - well as one java client without container client that uses also - JAAS. -
    - -
    - - JAAS configuration - - - The JAAS configuration is made via the JAAS Login - Configuration File - - A login configuration file consists of one or more entries, each - specifying which underlying authentication technology should be used for a - particular application or applications. - - The contents of the JAAS configuration file has the structure - below: - - Application_1 { - LoginModuleClassA Flag Options; - LoginModuleClassB Flag Options; - LoginModuleClassC Flag Options; -}; - -Application_2 { - LoginModuleClassB Flag Options; - LoginModuleClassC Flag Options; -}; - -Other { - LoginModuleClassC Flag Options; - LoginModuleClassA Flag Options; -}; - - - There is a flag associated with all the LoginModules to configure - their behaviour in case of success or failure: - - - - required - The LoginModule is - required to succeed. If it succeeds or fails, authentication still - proceeds through the LoginModule list. - - - - requisite - The LoginModule is - required to succeed. If it succeeds, authentication continues through - the LoginModule list. If it fails, control immediately returns to the - application (authentication does not proceed through the LoginModule - list). - - - - sufficient - The LoginModule is - not required to succeed. If it does succeed, control immediately - returns to the application (authentication does not proceed through - the LoginModule list). If it fails, authentication continues through - the LoginModule list. - - - - optional - The LoginModule is - not required to succeed. If it succeeds or fails, authentication still - proceeds through the LoginModule list. - - - -
    - - Default JAAS configuration - - - JOnAS provides in - $JONAS_BASE/conf/jaas.config a JAAS Login - Configuration File already configured with some login - configuration. - - There are two requirements: the entry dedicated to Tomcat must be - named tomcat, and the entry for Jetty, - jetty. Note that everything in this - file is case-sensitive. - - The predifined entries are: - - - - tomcat used for - authentication with the web container Tomcat - - - - jetty used for authentication - with the web container Jetty - - - - jaasclient may be used for - autentication in a fat client - - - - The default configuration for the web container Tomcat is the - following: - - tomcat { - org.ow2.jonas.security.auth.spi.JResourceLoginModule required - resourceName="memrlm_1" - ; -}; - - this indicates that the - JResourceLoginModule Login Module must be used on - the memory realm named memrlm_1. - - The default configuration for the web container Jetty is the same - than the previous: - - jetty { - org.ow2.jonas.security.auth.spi.JResourceLoginModule required - resourceName="memrlm_1" - ; -}; - - the configuration for the container clients examples : - - jaasclient { - // Login Module to use for the example jaasclient. - - org.ow2.jonas.security.auth.spi.JResourceLoginModule required - resourceName="memrlm_1" - - org.ow2.jonas.security.auth.spi.ClientLoginModule required - globalCtx="true" - ; -}; - - Here two Login Modules are used, one for checking the identity in - the memoty realm, the second for propagating a security context with the - client request. - - To change the location and name of the - jaas.config file, edit the - $JONAS_BASE/bin/jonas script and modify the - following line:-Djava.security.auth.login.config=$JONAS_BASE/conf/jaas.config -
    - -
    - - JOnAS LoginModules - - - JOnAS provides some predefined LoginModules: - - - - JResourceLoginModule - - - This is the main LoginModule. It is highly recommended that - this one be used in every authentication, as it checks the user - authentication information in the specified realm database, LDAP - or memory. - - This LoginModule delegates the authentication to the server - . Here are the possible attributes to set: - - - - - - attribute name - - description - - - - resourceName - - name of the realm - - - - serverName - - name of JOnAS instance (default value= - jonas) - - - - useUpperCaseUsername - - if true Convert the username into uppercase for the - authentication (default value=false) - - - - certCallback - - if true use certificate callback - - - - - - - - - - - CRLLoginModule - - - This LoginModule contains authentication based on - certificates. However, when enabled, it will also permit - non-certificate based accesses. It verifies that the certificate - presented by the user has not been revoked by the Certification - Authority that signed it. To use it, the directory in which to - store the revocation lists (CRLs) files or an - LDAP repository must exist. - - - - - - attribute name - - description - - - - CRLsResourceName - - specifies how the CRLs are - stored:Two possible values "Directory" or "LDAP" - - - - CRLsDirectoryName - - The directory containing the - CRL files (the extension for these - files must be - .crl). - - - - address - - address of the server that hosts the LDAP - repository - - - - port - - port used by the LDAP repository; CRLs - are retrieved from an LDAP directory using the - LDAP schema defined in RFC - 2587 - - - - - - - - - SignLoginModule - - - login module that signs the current Subject ,. Here are the - possible attributes to set: - - - - - - attribute name - - description - - - - keystoreFile - - Name of the key store - - - - keystorePass - - password for the keystore - - - - keyPass - - password for the private key - - - - alias - - alias - - - - - - - - - ClientLoginModule - - - login module used for propagating the Principal and roles to - the server, it doesn't make any authentication. This login module - must be used when authentication for a client container. Here is - the possible attribute to set: - - - - - - attribute name - - description - - - - globalCtx - - if true set the security context for all the - threads of the client container instead of only on the - current thread. Useful for swing client. (default value= - false) - - - - - - - - - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/cmi/config.xml b/jonas_doc/core/src/docbook/doc-en/services/cmi/config.xml deleted file mode 100644 index 60becc814c265255e85f3b4af647f48dcbf70895..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/cmi/config.xml +++ /dev/null @@ -1,212 +0,0 @@ - -
    - - cmi service configuration - - - The configuration of the cmi service - is available through the file - $JONAS_BASE/conf/cmi-config.xml. - - The CMI service can be configured in two modes: - - server mode with a cluster view manager - created locally, i.e. with a local instance of a replicated CMI - registry. - - - - client mode without a local cluster view - manager, in this case a list of providers urls (i.e. a list of cluster - view manager urls) is given for accessing to the remote CMI - registries. - - The server mode is simpler to - configure, the client mode requires to define - statically a list of providers urls. The server mode - starts a Group Communication Protocol instance (e.g. JGroups) and thus - increases the resources consumption compare to the client - mode. - - - The CMI configuration file may contain two parts: a - server element which corresponds to the server mode - configuration and a client element for the client mode - configuration. If the two are present, only the server - element is loaded which means that the server mode is configured. - - -
    - - Server mode configuration - - - The server element contains the following elements: - - - - Configuring the cmi service in the server mode - - - -<cmi xmlns="http://org.ow2.cmi.controller.common" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:jgroups="http://org.ow2.cmi.controller.server.impl.jgroups"> - <server> - <jndi> - <protocol name="jrmp" noCmi="false" /> - </jndi> - <viewManager - class="org.ow2.cmi.controller.server.impl.jgroups.JGroupsClusterViewManager"> - <jgroups:config - delayToRefresh="60000" - loadFactor="100" - confFileName="jgroups-cmi.xml" - recoTimeout="30000" - groupName="G1"> - <components> - <event /> - </components> - </jgroups:config> - </viewManager> - </server> -</cmi> - - - - - - - jndi element - optional. Enable to specify - that a protocol must not be clustered with CMI (administration uses, - ...). Here, the clustering of jrmp protocol can - be disabled by setting true to the - noCmi attribute. - - - - viewManager element - mandatory. Defines - the view manager configuration (registry replication, refresh time, - ...). - - - - class attribute - mandatory. Specifies the - protocol implementation to use for replicating the view (CMI - registry). Here the JGroups implementation is set. - - - - jgroups:config element - mandatory. Define - the JGroups related parameters. - - - - delayToRefresh attribute - optional. - Refresh period of the client view (in ms). For example, it expresses - the maximum delay for taking into account a load-balancing parameter - update. - - - - loadFactor attribute - optional. Specifies - the initial load-factor of the current node used in the weigthed - round robin policy. - - - - confFileName attribute - mandatory. - Specifies the JGroups's stack configuration filename (found in the - $JONAS_BASE/conf directory). - - - - recoTimeout attribute - optional. Specifies - the reconnection timeout after a shunning or an error in the group - communication protocol (in ms). If the timer expires, an exception - is thrown. - - - - groupName attribute - mandatory. Specifies - the JGroups channel name used by the CMI cluster view replication - mechanism. - - - - components element - mandatory. Enable the - events component into CMI. This element must not be modified. - - - - - - Refer to the - clustering guide for issues related to JGroups. - -
    - -
    - - Client mode configuration - - - The client element contains the following elements: - - - - Configuring the cmi service in the client mode - - - -<cmi xmlns="http://org.ow2.cmi.controller.common" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <client noCmi="false"> - <jndi> - <protocol name="jrmp"> - <providerUrls> - <providerUrl>rmi://localhost:1099</providerUrl> - <providerUrl>rmi://localhost:2001</providerUrl> - </providerUrls> - </protocol> - </jndi> - </client> -</cmi> - - - - - - - noCmi attribute - optional. Enable to - specify that CMI must be disabled. - - - - jndi element - mandatory. Specify a list of - providers URLs for a given protocol. It is not necessary to set the - whole list of cluster members, a subset is enough. However for - ensuring high availability, at least two providers URLs must be - mentionned. - - - -
    - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/db/config.xml b/jonas_doc/core/src/docbook/doc-en/services/db/config.xml deleted file mode 100644 index 983def7f2d5ac1f9a90118d449d70d0677d491e6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/db/config.xml +++ /dev/null @@ -1,70 +0,0 @@ - -
    db service configuration - - - The db service is an optional service - that can be used to start a java database server in the same JVM as - . - - By default the database used is HSQLDB. - - Here is the part of jonas.properties related to - db service: - - ###################### JOnAS DB service configuration -# -# Sets the name of the implementation class of the db service (hsql for example) -jonas.service.db.class org.ow2.jonas.db.hsqldb.HsqlDBServiceImpl -jonas.service.db.port 9001 -jonas.service.db.dbname db_jonas -jonas.service.db.users jonas:jonas - -# Multiple users -#jonas.service.db.users jonas:jonas,login:password - - - Here it is possible to customize : - - - - the listening port - - - - the database name - - - - By default, the user is named jonas with the password jonas. In - order to add new users, the property jonas.service.db.users needs to be - updated by using a comma separated list as follow: - - jonas.service.db.users login:password,anotherlogin:password - - - - The database may be used by component via - JDBC resource adapters or via the dbm - service. For the former case the same information (listening - port, database name, login,password) must appear in the connector deployment descriptor, in the latter they - appear in the $JONAS_BASE/conf/HSQLDB1.properties. So, if - these previous properties must be changed in jonas.properties, they must be - also changed in these files. - - The db service has been provided in - the jonas distribution mainly to run easily the exemple, without having to set a database - first. For most usages, the - users should remove it from the list of services and remove also HSQL1 from - jonas.service.dbm.datasources property in - $JONAS_BASE/conf/jonas.properties file. - - For users that choose HSQLDB as database it is highly recommended to - refer to the Hsqldb - User Guide. It is worth to note that the default configuration file - used by HSQLDB server can be found in $JONAS_BASE/work/hsqldb/jonas/db_jonas.properties - directory. - - In order to launch several HSQLDB instances, the configuration needs - to be duplicated and the new configuration will be prefixed by - jonas.service.<mynewdbservice>. -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/dbm/config.xml b/jonas_doc/core/src/docbook/doc-en/services/dbm/config.xml deleted file mode 100644 index 69c18098a6a35ae31a5e769c11be7d719e820c91..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/dbm/config.xml +++ /dev/null @@ -1,90 +0,0 @@ - -
    - - dbm service configuration - - - The dbm service (database manager - service) allow access to one or more relational databases. It will create - and use DataSource objects. Such a DataSource object - must be configured according to the database that will be used for the - persistence of a bean. - - - the recommended way to access to databases is to use the resource service deploying JDBC resource - adapter - - - The dbm service provides a generic - driver-wrapper that emulates the XADataSource - interface on a regular JDBC driver.It is important to note that this - driver-wrapper does not ensure a real two-phase commit for distributed - database transactions. When it is necessary to use a JDBC2-XA-compliant - driver access to the databases must be done via a JDBC resource adapter XA - compliant (more information can be found in - - Here is the part of jonas.properties related to - dbm service: - - ###################### JOnAS DBM Database service configuration -# -# Set the name of the implementation class of the dbm service -jonas.service.dbm.class org.ow2.jonas.dbm.internal.JOnASDataBaseManagerService - -# Set the jonas DataSources. This enables the JOnAS server to load -# the data dources, to load related jdbc drivers, and to register the data -# sources into JNDI. -# This property is set with a coma-separated list of Datasource properties -# file names (without the '.properties' suffix). -# Ex: Oracle1,InstantDB1 (while the Datasources properties file names are -# Oracle1.properties and InstantDB1.properties) -jonas.service.dbm.datasources HSQL1 - - For the dbm service it is possible - to: - - - - set a list of datasource names via property - jonas.service.dbm.datasources. - - for each name XX appearing in this list a - XX.properties file must exist in $JONAS_BASE/conf - - - - Access to a particular database via dbm service is configured in datasource.properties - files that must be located in $JONAS_BASE/conf. - -
    - - Datasource.properties files - - - In the distribution several templates of - datasource.properties files are provided one for - Oracle, PostgreSQL, - Sybase, DB2, - MySQL, HSQLDB, - InterBase, FirebirdSQL, - Mckoi SQL, InstantDB ) - respectively in Oracle1.properties, - PostgreSQL1.properties etc... - - A complete description of the datasource.properies file can be found - in -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/dbm/jdbcdatasource.xml b/jonas_doc/core/src/docbook/doc-en/services/dbm/jdbcdatasource.xml deleted file mode 100644 index 5279307a4fa2f6ccc57bd704aa01365b8de3707f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/dbm/jdbcdatasource.xml +++ /dev/null @@ -1,424 +0,0 @@ - -
    - - Configuring JDBC DataSources with 'dbm' service - - - This section describes how to configure the Datasources for connecting - application to databases when the dbm - service is used. - -
    - - Configuring DataSources - - - For both container-managed or bean-managed persistence, makes use of relational - storage systems through the JDBC interface. JDBC connections are obtained - from an object, the DataSource, provided at the - application server level. The DataSource interface - is defined in the JDBC standard extensions. - - A DataSource object identifies a database and - a means to access it via JDBC (a JDBC driver). An application server may - request access to several databases and thus provide the corresponding - DataSource objects that will be registered in JNDI - registry. - - This section explains how DataSource objects - can be defined and configured in the server. - - - provides a generic driver-wrapper that emulates the - XADataSource interface on a regular JDBC driver. It - is important to note that this driver-wrapper does not ensure a real - two-phase commit for distributed database transactions. - - Neither the EJB specification nor the specification describe how - to define DataSource objects so that they are - available to a - platform. Therefore, this document, which describes how to define and - configure DataSource objects, is specific to . However, the way to - use these DataSource objects in the Application - Component methods is standard, that is, by using the resource manager - connection factory references (refer to the example in the section Writing database access - operations of the Developing Entity Bean - Guide). - - A DataSource object should be defined in a - file called <DataSource name>.properties (for example - Oracle1.properties for an Oracle DataSource or Postgres.properties for an - PostgreSQL DataSource.These files must be located in $JONAS_BASE/conf directory. - - In the jonas.properties file, to define a - DataSource "Oracle1.properties" add the name "Oracle1" to the line - onas.service.dbm.datasources, as follows: - - jonas.service.dbm.datasources Oracle1, Sybase, PostgreSQL - - The property file defining a DataSource may - contain two types of information: - - - - connection properties - - - - JDBC Connection Pool properties - - - -
    - - connection properties - - - - - - - property name - - Description - - - - datasource.name - - JNDI name of the DataSource - - - - datasource.url - - The JDBC database URL : - jdbc:<database_vendor_subprotocol>:... - - - - datasource.classname - - Name of the class implementing the JDBC driver - - - - datasource.username - - Database user name - - - - datasource.password - - Database user password - - - - datasource.isolationLevel - - Database isolation level for transactions. - Possible values are: - - none, - - - - serializable, - - - - read_committed, - - - - read_uncommitted, - - - - repeatable_read - - The default depends on the database - used. - - - - datasource.mapper - - JORM database mapper (for possible values see here) - - - - - - - If this datasource is used as a persistence unit, the - persistence configuration defined in the - persistence.xml file must be coherent to those - properties, such as the datasource name and the dialect. - -
    - -
    - - Connection Pool properties - - - Each Datasource is implemented as a - connection manager and manages a pool of JDBC connections. - - The pool can be configured via some additional properties - described in the following table. - - All these settings have default values and are not required. All - these attributes can be reconfigured when is running, with the - console JonasAdmin. - - - - - - property - - Description - - Default value - - - - jdbc.connchecklevel - - JDBC connection checking level: - - - 0 : no check - - - - 1: check connection still open - - - - 2: call the test statement before reusing a - connection from the pool - - - - 1 - - - - jdbc.connteststmt - - test statement in case jdbc.connchecklevel = 2. - - select 1 - - - - jdbc.connmaxage - - nb of minutes a connection can be kept in the pool. After - this time, the connection will be closed, if minconpool limit - has not been reached. - - 1440 mn (= 1 day) - - - - jdbc.maxopentime - - Maximum time (in mn) a connection can be left busy. If - the caller has not issued a close() during this time, the - connection will be closed automatically. - - 1440 mn (= 1 day) - - - - jdbc.minconpool - - Minimum number of connections in the pool. Setting a - positive value here ensures that the pool size will not go below - this limit during the datasource lifetime. - - 0 - - - - jdbc.maxconpool - - Maximum number of connections in the pool. Limiting the - max pool size avoids errors from the database. - - no limit - - - - jdbc.samplingperiod - - Sampling period for JDBC monitoring. nb of seconds - between 2 measures. - - 60 sec - - - - jdbc.maxwaittime - - Maximum time (in seconds) to wait for a connection in - case of shortage. This is valid only if maxconpool has been - set. - - 10 sec - - - - jdbc.maxwaiters - - Maximum of concurrent waiters for a JDBC Connection. This - is valid only if maxconpool has been set. - - 1000 - - - - jdbc.pstmtmax - - Maximum number of prepared statements cached in a - Connection. Setting this to a bigger value (120 for example) - will lead to better performance, but will use more memory. The - recommendation is to set this value to the number of different - queries that are used the most often. This is to be tuned by - administrators. - - 12 - - - - - - When a user requests a jdbc connection, the dbm connection manager first checks to see if a - connection is already open for its transaction. If not, it tries to get - a free connection from the free list. If there are no more connections - available, the dbm connection manager - creates a new jdbc connection (if jdbc.maxconpool - is not reached). - - If it cannot create new connections, the user must wait (if - jdbc.maxwaiters is not reached) until a connection - is released. After a limited time - (jdbc.maxwaittime), the getConnection - returns an exception. - - When the user calls close() on its - connection, it is put back in the free list. - - Many statistics are computed (every - jdbc.samplingperiod seconds) and can be viewed by - JonasAdmin. This is useful for tuning these parameters and for seeing - the server load at any time. - - When a connection has been open for too long a time - (jdbc.connmaxage), the pool will try to release it - from the freelist. However, the dbm - connection manager always tries to keep open at least the number of - connections specified in jdbc.minconpool. - - When the user has forgotten to close a jdbc connection, the system - can automatically close it, after jdbc.maxopentime - minutes. Note that if the user tries to use this connection later, - thinking it is still open, it will return an exception (socket - closed). - - When a connection is reused from the freelist, it is possible to - verify that it is still valid. This is configured in - jdbc.connchecklevel. The maximum level is to try a - dummy statement on the connection before returning it to the caller. - This statement is configured in - jdbc.connteststmt -
    - -
    - - DataSource example: - - - Here is the template for an Oracle dataSource.properties file that - can be found in $JONAS_ROOT/conf: - - -###################### Oracle DataSource configuration example -# - - -##### -# DataSource configuration -# -datasource.name jdbc_1 -datasource.url jdbc:oracle:thin:@<your-hostname>:1521:<your-db> -datasource.classname oracle.jdbc.driver.OracleDriver -datasource.username <your-username> -datasource.password <user-password> -datasource.mapper rdb.oracle - - -##### -# ConnectionManager configuration -# - -# JDBC connection checking level. -# 0 = no special checking -# 1 = check physical connection is still open before reusing it -# 2 = try every connection before reusing it -jdbc.connchecklevel 0 - -# Max age for jdbc connections -# nb of minutes a connection can be kept in the pool -jdbc.connmaxage 1440 - -# Maximum time (in mn) a connection can be left busy. -# If the caller has not issued a close() during this time, the connection -# will be closed automatically. -jdbc.maxopentime 60 - -# Test statement -jdbc.connteststmt select * from dual - -# JDBC Connection Pool size. -# Limiting the max pool size avoids errors from database. -jdbc.minconpool 10 -jdbc.maxconpool 30 - -# Sampling period for JDBC monitoring : -# nb of seconds between 2 measures. -jdbc.samplingperiod 30 - -# Maximum time (in seconds) to wait for a connection in case of shortage. -# This may occur only when maxconpool is reached. -jdbc.maxwaittime 5 - -# Maximum of concurrent waiters for a JDBC Connection -# This may occur only when maxconpool is reached. -jdbc.maxwaiters 100 - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/depmonitor/config.xml b/jonas_doc/core/src/docbook/doc-en/services/depmonitor/config.xml deleted file mode 100644 index 65bba10a7972150c6596f52dfc696bf683af6ba9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/depmonitor/config.xml +++ /dev/null @@ -1,91 +0,0 @@ - -
    - - depmonitor service configuration - - - The depmonitor service scans - periodically some directories in the aim of deploying J2EE applications or - OSGi bundles on a server. By default, you have to put the application - files into the $JONAS_BASE/deploy directory in order to - deploy them. It is possible to parse anothers directories by setting the - directories property in the service configuration. - - The development attribute in the configuration allows to choose if the - depmonitor service is in development mode - or not : - - - - The deployment monitor can be configured to detect at runtime if - an application is added, removed or changed to respectively deploy it, - undeploy it or redeploy it. This functionnality can be useful during the - development phase. - - - - For a prodution usage of the server, this - functionnality can be disabled so that the application files will be - deployed only at startup. In this configuration, the jonas admin - command or the jonasAdmin user interface will be used to perform - deployment actions. - - - - As the parsed directories may contain files that must not be deployed, - a list of file exclusions can be defined. - - ###################### JOnAS Deployment Monitor -# -# Set the name of the implementation class of the depmonitor service -# -jonas.service.depmonitor.class org.ow2.jonas.deployablemonitor.DeployableMonitorService - -# Set the execution mode (three possible values): -# - inherit: inherit of the value of the "jonas.development" property -# - true : development mode -# - false : production mode -jonas.service.depmonitor.development inherit - -jonas.service.depmonitor.directories -# List (comma separated) of exclusion patterns (based on names, not directories) -jonas.service.depmonitor.exclusions README - -# Monitor interval in milliseconds -jonas.service.depmonitor.monitorInterval 5000 - - - - If the property value is true, the directories are parsed - periodically to detect file addition, modification or deletion. Else, - the directories are parsed only at startup - - - - A comma-separated list of directories which contain files to - deploy - - - - A comma-separated list of file names to exclude - - - - Monitor interval in milliseconds between two scans - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/discovery/config.xml b/jonas_doc/core/src/docbook/doc-en/services/discovery/config.xml deleted file mode 100644 index e6ae10285508d2c400cb40823bdbe27676167bfe..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/discovery/config.xml +++ /dev/null @@ -1,229 +0,0 @@ - -
    - - discovery service configuration - - - The role of the discovery service is - to enable dynamic domain management. Recall - that domain management means management of all the servers running in the - domain, from the common administration point represented by a master - server. - - The discovery service allows a master to detect servers starting and - stopping in the domain. Moreover, a master can discover servers there were - already running in the domain when it started. - - The discovery service implements a greeting - mechanism to enforce servers' name unicity in the domain. This mechanism - prevents starting a new server in the domain, if a server having the same - name is already running in the domain. - - There are two available implementations for the discovery service: one - based on IP multicast, the other based on JGroups. The former, introduced in - JOnAS 4, is deprecated. The latter, has the advantage to allow for cluster - daemons detection. - - All servers and in the domain must choose the same implementation. The - choice is made upon the implementation class name: - - ###################### JOnAS Discovery service -# -# Set the name of the implementation class and initialization parameters -# JGropus implementation -jonas.service.discovery.class=org.ow2.jonas.discovery.jgroups.JgroupsDiscoveryServiceImpl -# Uncomment this to set Multicast implementation -#jonas.service.discovery.class=org.ow2.jonas.discovery.internal.MulticastDiscoveryServiceImpl - -
    - - Configuration for IP multicast based implementation - - - You have to provide initialization parameters in jonas.properties - file for: - - - - Multicast address and port. These must be identical for all - servers in the domain. Use properties: - - - - jonas.service.discovery.multicast.address - - - - jonas.service.discovery.multicast.port - - - - beware that multicast adresses must be consequently allocated - through the network. - - - - The time-to-live for packets: use property: - - - - jonas.service.discovery.ttl - - - - this parameter indicates the number of gateway hops for - packets. - - - - if ttl = 0 the discovery scope is the host (multicast packet - aren't routed to network interfaces). - - - - if ttl =1 the discovery scope is limited to the subnetworks - the host is attached to (multicast packets cross the network - interfaces but will be discarded by the next gateway). - - - - if ttl =N>1 the discovery packets may cross N-1 gateways - (provided that these gateways are configured to propagate - multicast packets). - - - - - - In the case of a master server, the - jonas.service.discovery.source.port property must - be set with an available port number. - - - - The greeting mechanism. Use properties: - - - - jonas.service.discovery.greeting.port - - - - jonas.service.discovery.greeting.timeout - - - - Note that two servers on the same host must have different - values in greeting.port property. - - - - Example: - - jonas.service.discovery.multicast.address=224.224.224.224 -jonas.service.discovery.multicast.port=9080 -jonas.service.discovery.ttl=1 -# For a master server, configure the client source port with this property -jonas.service.discovery.source.port=9888 - -# A multicast greeting message is sent out when discovery service is started. -# The starting server listens at the port jonas.service.discovery.greeting.port -# (default 9899) for a response for jonas.service.discovery.greeting.timeout miliseconds -# (default 1000 ms). If a pre-existing server has the same server name as this one, -# this server's discovery service will be terminated. -jonas.service.discovery.greeting.port=9899 -jonas.service.discovery.greeting.timeout=1000 -
    - -
    - - Configuration for JGroups based implementation - - - JGropups configuration being more complex, a specific configuration - file have to be used. The name of this file is given by the - jonas.service.discovery.jgroups.conf property. Two - other properties have to be initialized: - - - - The name of the JGroups group used by the the discovery service - to exchange messages. - - - - jonas.service.discovery.group.name - - - - - - The reconnection timeout for the JGroups channel. - - - - jonas.service.discovery.group.reconnection.timeout - - - - - - Example: - - jonas.service.discovery.jgroups.conf=jgroups-discovery.xml -jonas.service.discovery.group.name=JGroupsDiscovery -jonas.service.discovery.group.reconnection.timeout=5000 - - You can find in JOnAS distribution, under - JONAS_ROOT/conf, a jgroups-discovery.xml - file. This file containes a JGroups stack configuration for the UDP - protocol. - - - Refer to the clustering - guide for issues related to JGroups. - -
    - -
    - - Cluster deamon configuration for discovery - - - In order to be detected by a master server, a cluster daemon has to - be properly configured. This is achieved by using a - discovery entry in the clusterd.xml - configuration file. The configuration properies are: - - - - The JGroups group name - - - - The JGroups stack configuration file name - - - - A boolean allowing to activate (if - true) the discovery. - - - - Example: - - <discovery> - <group-name>JGroupsDiscovery</group-name> - <stack-file>jgroups-discovery.xml</stack-file> - <start-up>true</start-up> - </discovery> -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/ear/config.xml b/jonas_doc/core/src/docbook/doc-en/services/ear/config.xml deleted file mode 100644 index 2244606d05a5f7905367228085c3f3ff544c5f3a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ear/config.xml +++ /dev/null @@ -1,60 +0,0 @@ - -
    - - ear service configuration - - - The ear service allows deployment of - complete - applications (including ejb-jar, - war and rar files packed in an - ear file). This service is based on - the web service for deploying the included - wars, the ejb2 or ejb3 service - for deploying the EJB containers for the included ejb-jars and the resource service for deploying the included rars. - - In development mode, as all other archives ear archives can be - deployed automatically as soon as they are copied under - $JONAS_BASE/deploy (or under another - configuration-defined directory) and undeployed as soon as they has been - removed from this location. - - Here is the part of jonas.properties concerning - the ear service: - - ###################### JOnAS EAR service configuration -# -# Set the name of the implementation class of the ear service. -jonas.service.ear.class org.ow2.jonas.ear.internal.JOnASEARService - -# Set the XML deployment descriptors parsing mode for the EAR service -# (with or without validation). -jonas.service.ear.parsingwithvalidation true - -# Generate stubs for all EJBs that may be accessed from the application -# In almost all cases, this is not required to be enabled as stubs can be found. -jonas.service.ear.genstub true - -# Create a child classloader when deploying EJB3 of the EAR -jonas.service.ear.useEJB3ChildClassloader true - - - - Set or not the XML validation at the deployment descriptor parsing - time - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/cmp2_usage.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/cmp2_usage.xml deleted file mode 100644 index fcf51c178f7171e8ab77e308eec47f2035e9210b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/cmp2_usage.xml +++ /dev/null @@ -1,2513 +0,0 @@ - - -
    - Using the CMP 2 Persistence in Entity Beans - - - This section highlights the main differences between CMP as defined in EJB 2.0 specification (called CMP2.0) and CMP as defined in EJB 1.1 specification (called CMP1.1). Major new features in the standard development and deployment of CMP2.0 entity beans are listed (comparing them to CMP1.1), along with JOnAS-specific information. Mapping CMP2.0 entity beans to the database is described in detail. Note that the database mapping can be created entirely by JOnAS, in which case the JOnAS-specific deployment descriptor for an entity bean should contain only the datasource and the element indicating how the database should be initialized. - -
    - Standard CMP2.0 Aspects - - - This section briefly describes the new features available in CMP2.0 as compared to CMP 1.1, and how these features change the development of entity beans. - -
    - Entity Bean Implementation Class - - - The EJB implementation class 1) implements the bean's business methods of the component interface, 2) implements the methods dedicated to the EJB environment (the interface of which is explicitly defined in the EJB specification), and 3) defines the abstract methods representing both the persistent fields (cmp-fields) and the relationship fields (cmr-fields). The class must implement the - - javax.ejb.EntityBean - - interface, be defined as public, and be abstract (which is not the case for CMP1.1, where it must not be abstract). The abstract methods are the get and set accessor methods of the bean cmp and cmr fields. Refer to the examples and details in the section " - - Developing Entity Beans - - " of the JOnAS documentation. - -
    -
    - Standard Deployment Descriptor - - - The standard way to indicate to an EJB platform that an entity bean has container-managed persistence is to fill the - - <persistence-type> - - tag of the deployment descriptor with the value "container," and to fill the - - <cmp-field> - - tags of the deployment descriptor with the list of container-managed fields (the fields that the container will have in charge to make persistent) and the - - <cmr-field> - - tags identifying the relationships. The CMP version (1.x or 2.x) should also be specified in the <cmp-version> tag. This is represented by the following lines in the deployment descriptor: - - - <persistence-type>container</persistence-type> - <cmp-version>1.x</cmp-version> - <cmp-field> - <field-name>fieldOne</field-name> - </cmp-field> - <cmp-field> - <field-name>fieldTwo</field-name> - </cmp-field> - - Note that for running CMP1.1-defined entity beans on an EJB2.0 platform, such as JOnAS 3.x, - you must introduce this - <cmp-version> - element in your deployment descriptors, since the default cmp-version value (if not specified) is 2.x - . - - - Note that for CMP 2.0, the information defining the behaviour of the implementation of a - find<method> - method is located in - the standard deployment descriptor - as an EJB-QL query (this is not a JOnAS-specific information). For CMP 1.1, this information is located in the JOnAS-specific deployment descriptor as an SQL WHERE clause specified in a <finder-method-jdbc-mapping> element. - - - Finder method example in CMP 2.0: for a - - findLargeAccounts(double val) - - method defined on the Account entity bean of the JOnAS eb example. - - - <query> - <query-method> - <method-name>findLargeAccounts</method-name> - <method-params> - <method-param>double</method-param> - </method-params> - </query-method> - <ejb-ql>SELECT OBJECT(o) FROM accountsample o WHERE o.balance &gt; ?1</ejb-ql> - </query> -
    -
    -
    - JOnAS EJBQL extension - -
    - LIMIT clause - - - The - LIMIT - feature has been added to the standard EJBQL query language. This feature enables you to retrieve just a portion of the results generated by the rest of a query. - - - The syntax of the - LIMIT - clause is: - - - - limit_clause ::= LIMIT limit_expression (, limit_expression )? - limit_expression ::= integer_literal | input_parameter - - - The first - limit_expression - corresponds to the - start_at - range and the second one to the - size - range. - - - The - limit_clause - is the last clause of the query: - - - - ejbql ::= select_clause from_clause [where_clause] [orderby_clause] [limit_clause] - - - Example: - - - - SELECT OBJECT(c) FROM jt2_Customer AS c ORDER BY c.id LIMIT ?1, 20 - - - Note that this feature is currently not implemented on all the database types supported by JORM/MEDOR. - -
    -
    -
    - JOnAS Database mappers - - - For implementing the EJB 2.0 persistence (CMP2.0), JOnAS relies on the - - JORM - - framework. JORM itself relies on JOnAS DataSources (specified in DataSource properties files) for connecting to the actual database. JORM must adapt its object-relational mapping to the underlying database, for which it makes use of adapters called "mappers." Thus, for each type of database (and more precisely for each JDBC driver), the corresponding mapper must be specified in the DataSource. This is the purpose of the - datasource.mapper - property of the DataSource properties file. Note that all JOnAS-provided DataSource properties files (in JOnAS_ROOT/conf) already contain this property with the correct mapper. - - - - - - - property name - - - description - - - possible values - - - - - - - datasource.mapper - - - JORM database mapper - - - - - - rdb - - - generic mapper (JDBC standard driver ...) - - - - - rdb.cloudscape - - - Cloudscape - - - - - rdb.db2 - - - DB2 - - - - - rdb.firebird - - - Firebird - - - - - rdb.hsql - - - HSQL - - - - - rdb.mckoi - - - McKoi Db - - - - - rdb.mysql - - - MySQL - - - - - rdb.oracle8 - - - Oracle 8 and lesser versions - - - - - rdb.oracle - - - Oracle 9 - - - - - rdb.postgres - - - PostgreSQL (>= 7.2) - - - - - rdb.sapdb - - - Sap DB - - - - - rdb.sqlserver - - - MS Sql Server - - - - - rdb.sybase - - - Sybase - - - - - - - - - - Contact the JOnAS team to obtain a mapper for other databases. - - - The container code generated at deployment is now independent of the JORM mappers. Until JOnAS 4.1.4, the container code generated at deployment (GenIC or ejbjar ant task) was dependent on this mapper. It was possible to deploy (generate container code) a bean for several mappers in order to change the database (i.e. the DataSource file) without redeploying the bean. These mappers were specified as the - mappernames - argument of the GenIC command or as the - mappernames - attribute of the JOnAS ANT ejbjar task. The value was a comma-separated list of mapper names for which the container classes were generated. These mappernames options are now deprecated. - -
    -
    - JOnAS Database Mapping (Specific Deployment Descriptor) - - - The mapping to the database of entity beans and their relationships may be specified in the JOnAS-specific deployment descriptor, in - - jonas-entity - - elements, and in - - jonas-ejb-relation - - elements. Since JOnAS is able to generate the database mapping, all the elements of the JOnAS-specific deployment descriptor defined in this section (which are sub-elements of - - jonas-entity - - or - - jonas-ejb-relation - - ) are optional, except those for specifying the datasource and the initialization mode (i.e. the - - jndi-name - - of - - jdbc-mapping - - and - - cleanup - - ). The default values of these mapping elements, provided in this section, define the JOnAS-generated database mapping. - -
    - Specifying and Initializing the Database - - - For specifying the database within which a CMP 2.0 entity bean is stored, the - - jndi-name - - element of the - - jdbc-mapping - - is necessary. This is the JNDI name of the DataSource representing the database storing the entity bean. - - - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - </jdbc-mapping> - - - For a CMP 2.0 entity bean, the JOnAS-specific deployment descriptor contains an additional element, - - cleanup - - , to be specified before the - - jdbc-mapping - - element, which can have one of the following values: - - - - - - removedata - - - - at bean loading time, the content of the tables storing the bean data is deleted - - - - - - removeall - - - - at bean loading time, the tables storing the bean data are dropped (if they exist) and created - - - - - - none - - - - do nothing - - - - - - create - - - - default value (if the element is not specified), at bean loading time, the tables for storing the bean data are created if they do not exist. - - - - - It may be useful for testing purposes to delete the database data each time a bean is loaded. For this purpose, the part of the JOnAS-specific deployment descriptor related to the entity bean may look like the following: - - - <cleanup>removedata</cleanup> - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - </jdbc-mapping> - -
    -
    - CMP2 fields Mapping - - - Mapping CMP fields in CMP2.0 is similar to that of CMP 1.1, but in CMP2.0 it is also possible to specify the SQL type of a column. Usually this SQL type is used if JOnAS creates the table ( - - create - - value of the - - cleanup - - element), and if the JORM default chosen SQL type is not appropriate. - - Standard Deployment Descriptor - - ..... - <entity> - <ejb-name>A</ejb-name> - ..... - <cmp-field> - <field-name>idA</field-name> - </cmp-field> - <cmp-field> - <field-name>f</field-name> - </cmp-field> - ..... - </entity> - ..... - - Database Mapping for CMP2 Fields - - - - - - t_A - - - - - - - c_idA - - - c_f - - - - - ... - - - ... - - - - -
    - JOnAS Deployment Descriptor - - ..... - <jonas-entity> - <ejb-name>A</ejb-name> - ..... - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - <jdbc-table-name>t_A</jdbc-table-name> - <cmp-field-jdbc-mapping> - <field-name>idA</field-name> - <jdbc-field-name>c_idA</jdbc-field-name> - </cmp-field-jdbc-mapping> - <cmp-field-jdbc-mapping> - <field-name>f</field-name> - <jdbc-field-name>c_f</jdbc-field-name> - <sql-type>varchar(40)</sql-type> - </cmp-field-jdbc-mapping> - </jdbc-mapping> - ..... - </jonas-entity> - ..... - - Defaults values for JOnAS deployment descriptor - - - - - - jndi-name - - - Mandatory - - - - - jdbc-table-name - - - Optional. - Default value is the - upper-case - CMP2 abstract-schema-name, or - the CMP1 ejb-name, - suffixed by - _ - . - - - - - cmp-field-jdbc-mapping - - - Optional. - - - - - jdbc-field-name - - - Optional. - Default value is the field-name suffixed by - _ - . - idA_ - and - f_ - in the example. - - - - - sql-type - - - Optional. - Default value defined by JORM. - - - - -
    -
    -
    - CMR fields Mapping to primary-key-fields (simple pk) - -
    - 1-1 unidirectional relationships - -
    - Standard Deployment Descriptor - - - ..... - <entity> - <ejb-name>A</ejb-name> - ..... - <cmp-field> - <field-name>idA</field-name> - </cmp-field> - <primkey-field>idA</primkey-field> - ..... - </entity> - ..... - <entity> - <ejb-name>B</ejb-name> - ..... - <cmp-field> - <field-name>idB</field-name> - </cmp-field> - <primkey-field>idB</primkey-field> - ..... - </entity> - ..... - <relationships> - <ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <ejb-relationship-role> - <!-- A => B --> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>A</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>b</cmr-field-name> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <!-- B => A --> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>B</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - </ejb-relation> - </relationships> - ..... - -
    -
    Database Mapping for 1-1 relationship - - - - - - - - - - - - t_A - - - - - - - - - c_idA - - - - - cfk_idB - - - - - - ... - - - ... - - - - - - - - - - - - - - t_B - - - - - - - c_idB - - - - - - ... - - - - - - - - - - - - There is a foreign key in the table of the bean that owns the CMR field. - -
    -
    JOnAS Deployment Descriptor - - - ..... - <jonas-entity> - <ejb-name>A</ejb-name> - ..... - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - <jdbc-table-name>t_A/jdbc-table-name> - <cmp-field-jdbc-mapping> - <field-name>idA</field-name> - <jdbc-field-name>c_idA</jdbc-field-name> - </cmp-field-jdbc-mapping> - </jdbc-mapping> - ..... - </jonas-entity> - ..... - <jonas-entity> - <ejb-name>B</ejb-name> - ..... - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - <jdbc-table-name>t_B/jdbc-table-name> - <cmp-field-jdbc-mapping> - <field-name>idB</field-name> - <jdbc-field-name>c_idB</jdbc-field-name> - </cmp-field-jdbc-mapping> - </jdbc-mapping> - ..... - </jonas-entity> - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - foreign-key-jdbc-name - is the column name of the foreign key in the table of the source bean of the relationship-role. - In this example, where the destination bean has a primary-key-field, it is possible to deduce that this foreign-key-jdbc-name column is to be associated with the column of this primary-key-field in the table of the destination bean. - - - Default values: - - - - - - - jonas-ejb-relation - - - Optional - - - - - foreign-key-jdbc-name - - - Optional. - Default value is the abstract-schema-name of the destination bean, suffixed by - _ - , and by its primary-key-field. - B_idb - in the example. - - - - - - -
    -
    -
    1-1 bidirectional relationships - - - Compared to 1-1 unidirectional relationships, there is a CMR field in both of the beans, thus making two types of mapping possible. - -
    Standard Deployment Descriptor - - - ..... - <relationships> - <ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <ejb-relationship-role> - <!-- A => B --> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>A</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>b</cmr-field-name> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <!-- B => A --> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>B</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>a</cmr-field-name> - </cmr-field> - </ejb-relationship-role> - </ejb-relation> - </relationships> - ..... - -
    -
    Database Mapping - - - Two mappings are possible. One of the tables may hold a foreign key. - - - Case 1: - - - - - - - - - - - - - t_A - - - - - - - - - c_idA - - - - - cfk_idB - - - - - - ... - - - ... - - - - - - - - - - - - - - t_B - - - - - - - c_idB - - - - - - ... - - - - - - - - - - - - Case 2: - - - - - - - - - - - - - t_A - - - - - - - c_idA - - - - - - ... - - - - - - - - - - - - - - t_B - - - - - - - - - c_idB - - - - - cfk_idA - - - - - - ... - - - ... - - - - - - - - - - -
    -
    JOnAS Deployment Descriptor - - - Case 1: - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - Case 2: - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - For the default mapping, the foreign key is in the table of the source bean of the first ejb-relationship-role of the ejb-relation. In the example, the default mapping corresponds to case 1, since the ejb-relationship-role - a2b - is the first defined in the ejb-relation - a-b - . Then, the default values are similar to those of the 1-1 unidirectional relationship. - - -
    -
    -
    1-N unidirectional relationships - -
    Standard Deployment Descriptor - - - ..... - <relationships> - <ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <ejb-relationship-role> - <!-- A => B --> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>A</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>b</cmr-field-name> - <cmr-field-type>java.util.Collection</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <!-- B => A --> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>B</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - </ejb-relation> - </relationships> - ..... - -
    -
    Database Mapping - - - - - - - - - - - - - t_A - - - - - - - c_idA - - - - - - ... - - - - - - - - - - - - - - t_B - - - - - - - - - c_idB - - - - - cfk_idA - - - - - - ... - - - ... - - - - - - - - - - - - In this case, the foreign key must be in the table of the bean which is on the "many" side of the relationship (i.e. in the table of the source bean of the relationship role with multiplicity many), t_B. - -
    -
    JOnAS Deployment Descriptor - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - Default values: - - - - - - - jonas-ejb-relation - - - Optional - - - - - foreign-key-jdbc-name - - - Optional. - Default value is the abstract-schema-name of the destination bean of the "one" side of the relationship (i.e. the source bean of the relationship role with multiplicity one), suffixed by - _ - , and by its primary-key-field. - A_ida - in the example. - - - - - - -
    -
    -
    1-N bidirectional relationships - - - Similar to 1-N unidirectional relationships, but with a CMR field in each bean. - -
    Standard Deployment Descriptor - - - ..... - <relationships> - <ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <ejb-relationship-role> - <!-- A => B --> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>A</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>b</cmr-field-name> - <cmr-field-type>java.util.Collection</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <!-- B => A --> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>B</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>a</cmr-field-name> - </cmr-field> - </ejb-relationship-role> - </ejb-relation> - </relationships> - ..... - -
    -
    Database mapping - - - - - - - - - - - - - t_A - - - - - - - c_idA - - - - - - ... - - - - - - - - - - - - - - t_B - - - - - - - - - c_idB - - - - - cfk_idA - - - - - - ... - - - ... - - - - - - - - - - - - In this case, the foreign key must be in the table of the bean which is on the "many" side of the relationship (i.e. in the table of the source bean of the relationship role with multiplicity many), t_B. - -
    -
    JOnAS Deployment Descriptor - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - Default values: - - - - - - - jonas-ejb-relation - - - Optional - - - - - foreign-key-jdbc-name - - - Optional. - Default value is the abstract-schema-name of the destination bean of the "one" side of the relationship (i.e. the source bean of the relationship role with multiplicity one), suffixed by - _ - , and by its primary-key-field. - A_ida - in the example. - - - - - - -
    -
    -
    N-1 unidirectional relationships - - - Similar to 1-N unidirectional relationships, but the CMR field is defined on the "many" side of the relationship, i.e. on the (source bean of the) relationship role with multiplicity "many." - -
    Standard Deployment Descriptor - - - ..... - <relationships> - <ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <ejb-relationship-role> - <!-- A => B --> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>A</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>b</cmr-field-name> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <!-- B => A --> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>B</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - </ejb-relation> - </relationships> - ..... - -
    -
    Database mapping - - - - - - - - - - - - - t_A - - - - - - - - - c_idA - - - - - cfk_idB - - - - - - ... - - - ... - - - - - - - - - - - - - - t_B - - - - - - - c_idB - - - - - - ... - - - - - - - - - - - - In this case, the foreign key must be in the table of the bean which is on the "many" side of the relationship (i.e. in table of the source bean of the relationship role with multiplicity many), t_A. - -
    -
    JOnAS Deployment Descriptor - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - Default values: - - - - - - - jonas-ejb-relation - - - Optional - - - - - foreign-key-jdbc-name - - - Optional. - Default value is the abstract-schema-name of the destination bean of the "one" side of the relationship (i.e. the source bean of the relationship role with multiplicity one), suffixed by - _ - , and by its primary-key-field. - B_idb - in the example. - - - - - - -
    -
    -
    N-M unidirectional relationships - -
    Standard Deployment Descriptor - - - ..... - <relationships> - <ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <ejb-relationship-role> - <!-- A => B --> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>A</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>b</cmr-field-name> - <cmr-field-type>java.util.Collection</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <!-- B => A --> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>B</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - </ejb-relation> - </relationships> - ..... - -
    -
    Database mapping - - - - - - - - - - - - - t_A - - - - - - - c_idA - - - - - - ... - - - - - - - - - - - - - - t_B - - - - - - - c_idB - - - - - - ... - - - - - - - - - - - - - - tJoin_AB - - - - - - - - - cfk_idA - - - - - cfk_idB - - - - - - ... - - - ... - - - - - - - - - - - - In this case, there is a join table composed of the foreign keys of each entity bean table. - -
    -
    JOnAS Deployment Descriptor - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jdbc-table-name>tJoin_AB</jdbc-table-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - Default values - - - - - - - jonas-ejb-relation - - - Optional - - - - - jdbc-table-name - - - Optional. - Default value is built from the abstract-schema-names of the beans, separated by - _ - . - A_B - in the example. - - - - - foreign-key-jdbc-name - - - Optional. - Default value is the abstract-schema-name of the destination bean, suffixed by - _ - , and by its primary-key-field. - B_idb - and - A_ida - in the example. - - - - - - -
    -
    -
    N-M bidirectional relationships - - - Similar to N-M unidirectional relationships, but a CMR field is defined for each bean. - -
    Standard deployment Descriptor - - - ..... - <relationships> - <ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <ejb-relationship-role> - <!-- A => B --> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>A</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>b</cmr-field-name> - <cmr-field-type>java.util.Collection</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <!-- B => A --> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>B</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>a</cmr-field-name> - <cmr-field-type>java.util.Collection</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - </ejb-relation> - </relationships> - ..... - -
    -
    Database mapping - - - - - - - - - - - - - t_A - - - - - - - c_idA - - - - - - ... - - - - - - - - - - - - - - t_B - - - - - - - c_idB - - - - - - ... - - - - - - - - - - - - - - tJoin_AB - - - - - - - - - cfk_idA - - - - - cfk_idB - - - - - - ... - - - ... - - - - - - - - - - - - In this case, there is a join table composed of the foreign keys of each entity bean table. - -
    -
    JOnAS Deployment Descriptor - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jdbc-table-name>tJoin_AB</jdbc-table-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_idb</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_ida</foreign-key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - Default values: - - - - - - - jonas-ejb-relation - - - Optional - - - - - jdbc-table-name - - - Optional. - Default value is built from the abstract-schema-names of the beans, separated by - _ - . - A_B - in the example. - - - - - foreign-key-jdbc-name - - - Optional. - Default value is the abstract-schema-name of the destination bean, suffixed by - _ - , and by its primary-key-field. - B_idb - and - A_ida - in the example. - - - - - - -
    -
    -
    -
    CMR fields Mapping to composite primary-keys - - - In the case of composite primary keys, the database mapping should provide the capability to specify which column of a foreign key corresponds to which column of the primary key. This is the only difference between relationships based on simple primary keys. For this reason, not all types of relationship are illustrated below. - -
    1-1 bidirectional relationships - -
    Standard Deployment Descriptor - - - ..... - <entity> - <ejb-name>A</ejb-name> - ..... - <prim-key-class>p.PkA</prim-key-class> - ..... - <cmp-field> - <field-name>id1A</field-name> - </cmp-field> - <cmp-field> - <field-name>id2A</field-name> - </cmp-field> - ..... - </entity> - ..... - <entity> - <ejb-name>B</ejb-name> - ..... - <prim-key-class>p.PkB</prim-key-class> - ..... - <cmp-field> - <field-name>id1B</field-name> - </cmp-field> - <cmp-field> - <field-name>id2B</field-name> - </cmp-field> - ..... - </entity> - ..... - <relationships> - <ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <ejb-relationship-role> - <!-- A => B --> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>A</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>b</cmr-field-name> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <!-- B => A --> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>B</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>a</cmr-field-name> - </cmr-field> - </ejb-relationship-role> - </ejb-relation> - </relationships> - ..... - -
    -
    Database mapping - - - Two mappings are possible, one or another of the tables may hold the foreign key. - - - Case 1: - - - - - - - - - - - - - t_A - - - - - - - - - - - - - c_id1A - - - - - c_id2A - - - - - cfk_id1B - - - - - cfk_id2B - - - - - - ... - - - ... - - - ... - - - ... - - - - - - - - - - - - - - t_B - - - - - - - - - c_id1B - - - - - c_id2B - - - - - - ... - - - ... - - - - - - - - - - - - Case 2: - - - - - - - - - - - - - t_A - - - - - - - - - c_id1A - - - - - c_id2A - - - - - - ... - - - ... - - - - - - - - - - - - - - t_B - - - - - - - - - - - - - c_id1B - - - - - c_id2B - - - - - cfk_id1A - - - - - cfk_id2A - - - - - - ... - - - ... - - - ... - - - ... - - - - - - - - - - -
    -
    JOnAS Deployment Descriptor - - - Case 1: - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_id1b</foreign-key-jdbc-name> - <key-jdbc-name>c_id1b</key-jdbc-name> - </foreign-key-jdbc-mapping> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_id2b</foreign-key-jdbc-name> - <key-jdbc-name>c_id2b</key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - Case 2: - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_id1a</foreign-key-jdbc-name> - <key-jdbc-name>c_id1a</key-jdbc-name> - </foreign-key-jdbc-mapping> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_id2a</foreign-key-jdbc-name> - <key-jdbc-name>c_id2a</key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - - - For the default mapping (values), the foreign key is in the table of the source bean of the first ejb-relationship-role of the ejb-relation. In the example, the default mapping corresponds to case 1, since the ejb-relationship-role a2b is the first defined in the ejb-relation a-b. - - -
    -
    -
    N-M unidirectional relationships - -
    Standard Deployment Descriptor - - - ..... - <entity> - <ejb-name>A</ejb-name> - ..... - <cmp-field> - <field-name>id1A</field-name> - </cmp-field> - <cmp-field> - <field-name>id2A</field-name> - </cmp-field> - ..... - </entity> - ..... - <entity> - <ejb-name>B</ejb-name> - ..... - <cmp-field> - <field-name>id1B</field-name> - </cmp-field> - <cmp-field> - <field-name>id2B</field-name> - </cmp-field> - ..... - </entity> - ..... - <relationships> - <ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <ejb-relationship-role> - <!-- A => B --> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>A</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>b</cmr-field-name> - <cmr-field-type>java.util.Collection</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <!-- B => A --> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>B</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - </ejb-relation> - </relationships> - ..... - -
    -
    Database mapping - - - - - - - - - - - - - t_A - - - - - - - - - c_id1A - - - - - c_id2A - - - - - - ... - - - ... - - - - - - - - - - - - - - t_B - - - - - - - - - c_id1B - - - - - c_id2B - - - - - - ... - - - ... - - - - - - - - - - - - - - tJoin_AB - - - - - - - - - - - - - cfk_id1A - - - - - cfk_id2A - - - - - cfk_id1B - - - - - cfk_id2B - - - - - - ... - - - ... - - - ... - - - ... - - - - - - - - - - - - In this case, there is a join table composed of the foreign keys of each entity bean table. - -
    -
    JOnAS Deployment Descriptor - - - ..... - <jonas-ejb-relation> - <ejb-relation-name>a-b</ejb-relation-name> - <jdbc-table-name>tJoin_AB</jdbc-table-name> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>a2b</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_id1b</foreign-key-jdbc-name> - <key-jdbc-name>c_id1b</key-jdbc-name> - </foreign-key-jdbc-mapping> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_id2b</foreign-key-jdbc-name> - <key-jdbc-name>c_id2b</key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - <jonas-ejb-relationship-role> - <ejb-relationship-role-name>b2a</ejb-relationship-role-name> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_id1a</foreign-key-jdbc-name> - <key-jdbc-name>c_id1a</key-jdbc-name> - </foreign-key-jdbc-mapping> - <foreign-key-jdbc-mapping> - <foreign-key-jdbc-name>cfk_id2a</foreign-key-jdbc-name> - <key-jdbc-name>c_id2a</key-jdbc-name> - </foreign-key-jdbc-mapping> - </jonas-ejb-relationship-role> - </jonas-ejb-relation> - ..... - -
    -
    -
    -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/config.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/config.xml deleted file mode 100644 index 97a567eb3d6d3bcc3a3e623532679e10b6e7fecb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/config.xml +++ /dev/null @@ -1,123 +0,0 @@ - -
    - - ejb2 Service configuration - - - This service provides containers for EJB2.1 components. - - An EJB container can be created from an ejb-jar file using one of the following - possibilities: - - - - The ejb-jar file has been - copied under $JONAS_BASE/deploy - - - - The ejb-jar file is - packaged inside an ear file as a component of a application. The container - will be created when the application will be deployed via the - ear service. - - - - EJB containers may be dynamically created from ejb-jar files using - the JonasAdmin tool. - - - - EJB containers may be dynamically created from ejb-jar files using - the command jonas admin: - - jonas admin -a <some-dir>/sb.jar - - - - The ejb service can (and by default - does) provide monitoring options. Monitoring provides the following values - at a per-EJB basis for stateful and stateless beans: - - - - Number of calls done on all - methods. - - - - Total business time, i.e. the - time spent executing business (applicative) code. - - - - Total time, i.e. the total time - spent executing code (business code + container code). - - - - The warningThreshold option can be - used to generate a warning each time a method takes more than warningThreshold milliseconds to execute. By default, - warningThreshold is set to 20 - seconds. - - Here is the part of jonas.properties concerning - the ejb2 service: - - ###################### JOnAS EJB 2 Container service configuration -# -# Set the name of the implementation class of the ejb2 service -jonas.service.ejb2.class org.ow2.jonas.ejb2.internal.JOnASEJBService - -# Set the XML deployment descriptors parsing mode (with or without validation) -jonas.service.ejb2.parsingwithvalidation true - -# If enabled, the GenIC tool will be called if : -# - JOnAS version of the ejb-jar is not the same version than the running JOnAS instance -# - Stubs/Skels stored in the ejb-jar are not the same than the JOnAS current protocols. -# By default, this is enabled -jonas.service.ejb2.auto-genic true - -# Arguments for the auto GenIC (-invokecmd, -verbose, etc.) -jonas.service.ejb2.auto-genic.args -invokecmd - -# Note: these two settings can be overriden by the EJB descriptor. -# -# If EJB monitoring is enabled, statistics about method call times will be -# collected. This is a very lightweight measurement and should not have much -# impact on performance. -jonas.service.ejb2.monitoringEnabled true -# If EJB monitoring is enabled, this value indicates after how many -# milliseconds spent executing an EJB method a warning message should be -# displayed. If 0, no warning will ever be displayed. -jonas.service.ejb2.warningThreshold 20000 - - For customizing the ejb2 service it - is possible to: - - - - Set or not the XML validation at the deployment descriptor parsing - time - - - - Set or not the automatic generation via the GenIC tool - - - - Specify the arguments to pass to the GenIC tool - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/db_access_bmp.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/db_access_bmp.xml deleted file mode 100644 index 6f9b24b70ccaedf08dbefeb491771ed78f9ae44c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/db_access_bmp.xml +++ /dev/null @@ -1,161 +0,0 @@ - - -
    - Writing Database Access Methods for Bean Managed Persistence - - For - bean-managed persistence - , data access operations are developed by the bean provider using the JDBC interface. However, getting database connections must be obtained through the - javax.sql.DataSource - interface on a datasource object provided by the EJB platform. This is mandatory since the EJB platform is responsible for managing the connection pool and for transaction management. Thus, to get a JDBC connection, in each method performing database operations, the bean provider must: - - - - call the - getConnection(...) - method of the DataSource object, to obtain a connection to perform the JDBC operations in the current transactional context (if there are JDBC operations), - - - call the - close() - method on this connection after the database access operations, so that the connection can be returned to the connection pool (and be dissociated from the potential current transaction). - - - - A method that performs database access must always contain the getConnection and close statements, as follows: - - -public void doSomethingInDB (...) { - conn = dataSource.getConnection(); - ... // Database access operations - conn.close(); -} - - A DataSource object associates a JDBC driver with a database (as an ODBC datasource). It is created and registered in JNDI by the EJB server at launch time (refer also to the section " - - JDBC DataSources configuration - - "). - - - A DataSource object is a resource manager connection factory for - - java.sql.Connection - - objects, which implements connections to a database management system. The enterprise bean code refers to resource factories using logical names called "Resource manager connection factory references." The resource manager connection factory references are special entries in the enterprise bean environment. The bean provider must use resource manager connection factory references to obtain the datasource object as follow: - - - - Declare the resource reference in the standard deployment descriptor using a - - resource-ref - - element. - - - Lookup the datasource in the enterprise bean environment using the JNDI interface (refer to the section - - Enterprise Bean's Environment - - ). - - - - The deployer binds the resource manager connection factory references to the actual resource factories that are configured in the server. This binding is done in the JOnAS-specific deployment descriptor using the jonas-resource element. - -
    - Example - - The declaration of the resource reference in the standard deployment descriptor looks like the following: - - -<resource-ref> -<res-ref-name>jdbc/AccountExplDs</res-ref-name> -<res-type>javax.sql.DataSource</res-type> -<res-auth>Container</res-auth> -</resource-ref> - - The <res-auth> element indicates which of the two resource manager authentication approaches is used: - - - - Container - : the deployer sets up the sign-on information. - - - Bean - : the bean programmer should use the getConnection method with user and password parameters. - - - - The JOnAS-specific deployment descriptor must map the environment JNDI name of the resource to the actual JNDI name of the resource object managed by the EJB server. This is done in the <jonas-resource> element. - - - <jonas-entity> - <ejb-name>AccountExpl</ejb-name> - <jndi-name>AccountExplHome</jndi-name> - <jonas-resource> - <res-ref-name>jdbc/AccountExplDs</res-ref-name> - <jndi-name>jdbc_1</jndi-name> - </jonas-resource> - </jonas-entity> - - The ejbStore method of the same Account example with bean-managed persistence is shown in the following example. It performs JDBC operations to update the database record representing the state of the entity bean instance. The JDBC connection is obtained from the datasource associated with the bean. This datasource has been instantiated by the EJB server and is available for the bean through its resource reference name, which is defined in the standard deployment descriptor. - - - In the bean, a reference to a datasource object of the EJB server is initialized: - - - - it = new InitialContext(); - - - - - ds = (DataSource)it.lookup("java:comp/env/jdbc/AccountExplDs"); - - - - Then, this datasource object is used in the implementation of the methods performing JDBC operations, such as ejbStore, as illustrated in the following: - - -public void ejbStore - Connection conn = null; - PreparedStatement stmt = null; - try { // get a connection - conn = ds.getConnection(); - // store Object state in DB - stmt = conn.prepareStatement("update account set customer=?,balance=? where accno=?"); - stmt.setString(1, customer); - stmt.setDouble(2, balance); - Integer pk = (Integer)entityContext.getPrimaryKey(); - stmt.setInt(3, pk.accno); - stmt.executeUpdate(); - } catch (SQLException e) { - throw new javax.ejb.EJBException("Failed to store bean to database", e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) {} - } -} - - Note that the close statement instruction may be important if the server is intensively accessed by many clients performing entity bean access. If the statement is not closed in the finally block, since - stmt - is in the scope of the method, it will be deleted at the end of the method (and the close will be implicitly done). However, it may be some time before the Java garbage collector deletes the statement object. Therefore, if the number of clients performing entity bean access is important, the DBMS may raise a "too many opened cursors" exception (a JDBC statement corresponds to a DBMS cursor). Since connection pooling is performed by the platform, closing the connection will not result in a physical connection close, therefore opened cursors will not be closed. Thus, it is preferable to explicitly close the statement in the method. - - - It is a good programming practice to put the JDBC connection and JDBC statement close operations in a finally bloc of the try statement. - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/db_access_cmp.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/db_access_cmp.xml deleted file mode 100644 index 5168dc6959740d26d6b4f5f8f5da0e14d7c0e0bd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/db_access_cmp.xml +++ /dev/null @@ -1,391 +0,0 @@ - -
    - -Configuring Database Access for Container Managed Persistence - - - - The standard way to indicate to an EJB platform that an entity bean - has container-managed persistence is to fill the <persistence-type> - tag of the deployment descriptor with the value "container," and to fill the - <cmp-field> tag of the deployment descriptor with the list of - container-managed fields (the fields that the container will have in charge - to make persistent). The CMP version (1.x or 2.x) should also be specified - in the <cmp-version> tag. In the textual format of the deployment - descriptor, this is represented by the following lines: - - <persistence-type>container</persistence-type> - <cmp-version>2.x</cmp-version> - <cmp-field> - <field-name>fieldOne</field-name> - </cmp-field> - <cmp-field> - <field-name>fieldTwo</field-name> - </cmp-field> - - With container-managed persistence the programmer need not develop the - code for accessing the data in the relational database; this code is - included in the container itself (generated by the platform tools). However, - for the EJB platform to know how to access the database and which data to - read and write in the database, two types of information must be provided - with the bean: - - - - First, the container must know which database to access and how to - access it. To do this, the only required information is the name of the - DataSource that will be used to get the JDBC connection. For - container-managed persistence, only one DataSource per bean should be - used. - - - - Then, it is necessary to know the mapping of the bean fields to - the underlying database (which table, which column). For CMP 1.1 or CMP - 2.0, this mapping is specified by the deployer in the JOnAS-specific - deployment descriptor. Note that for CMP 2.0, this mapping may be - entirely generated by JOnAS. - - - - The EJB specification does not specify how this information should be - provided to the EJB platform by the bean deployer. Therefore, what is - described in the remainder of this section is specific to JOnAS. - -
    CMP 1.x specifics - - - For CMP 1.1, the bean deployer is responsible for defining the - mapping of the bean fields to the database table columns. The name of the - DataSource can be set at deployment time, since it depends on the EJB - platform configuration. This database configuration information is defined - in the JOnAS-specific deployment descriptor via the jdbc-mapping element. - The following example defines the mapping for a CMP 1.1 entity - bean: - - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - <jdbc-table-name>accountsample</jdbc-table-name> - <cmp-field-jdbc-mapping> - <field-name>mAccno</field-name> - <jdbc-field-name>accno</jdbc-field-name> - </cmp-field-jdbc-mapping> - <cmp-field-jdbc-mapping> - <field-name>mCustomer</field-name> - <jdbc-field-name>customer</jdbc-field-name> - </cmp-field-jdbc-mapping> - <cmp-field-jdbc-mapping> - <field-name>mBalance</field-name> - <jdbc-field-name>balance</jdbc-field-name> - </jdbc-mapping> - - jdbc_1 is the JNDI name of the DataSource object identifying the - database. accountsample is the name of the table used to store the bean - instances in the database. mAccno, mCustomer, and mBalance are the names - of the container-managed fields of the bean to be stored in the accno, - customer, and balance columns of the accountsample table. This example - applies to container-managed persistence. For bean-managed persistence, - the database mapping does not exist. - - For CMP 1.1, the jdbc-mapping element can also contain information - defining the behaviour of the implementation of a find<method> - method (i.e. the ejbFind<method> method, that will be generated by - the platform tools). This information is represented by the - finder-method-jdbc-mapping element. - - For each finder method, this element provides a way to define an SQL - WHERE clause that will be used in the generated finder method - implementation to query the relational table storing the bean entities. - Note that the table column names should be used, not the bean field names. - Example: - - <finder-method-jdbc-mapping> - <jonas-method> - <method-name>findLargeAccounts</method-name> - </jonas-method> - <jdbc-where-clause>where balance &gt; ?</jdbc-where-clause> - </finder-method-jdbc-mapping> - - The previous finder method description will cause the platform tools - to generate an implementation of ejbFindLargeAccount(double arg) that - returns the primary keys of the entity bean objects corresponding to the - tuples returned by the "select ... from Account where balance > ?", - where '?' will be replaced by the value of the first argument of the - findLargeAccount method. If several '?' characters appear in the provided - WHERE clause, this means that the finder method has several arguments and - the '?' characters will correspond to these arguments, adhering to the - order of the method signature. - - In the WHERE clause, the parameters can be followed by a number, - which specifies the method parameter number that will be used by the query - in this position. Example: The WHERE clause of the following finder method - can be: - - Enumeration findByTextAndDateCondition(String text, java.sql.Date date) - - WHERE (description like ?1 OR summary like ?1) AND (?2 &gt; date) - - Note that a <finder-method-jdbc-mapping> element for the - findByPrimaryKey method is not necessary, since the meaning of this method - is known. - - The datatypes supported for container-managed fields in CMP 1.1 are - the following: - - Supported datatypes in CMP 1.1 - - - - - - boolean - - BIT - - getBoolean(), setBoolean() - - - - byte - - TINYINT - - getByte(), setByte() - - - - int - - INTEGER - - getInt(), setInt() - - - - long - - BIGINT - - getLong(), setLong() - - - - float - - FLOAT - - getFloat(), setFloat() - - - - double - - DOUBLE - - getDouble(), setDouble - - - - byte[] - - VARBINARY or LONGVARBINARY (1) - - getBytes(), setBytes() - - - - java.lang.String - - VARCHAR or LONGVARCHAR (1) - - getString(), setString() - - - - java.lang.Boolean - - BIT - - getBoolean(), setObject() - - - - java.lang.Integer - - INTEGER - - getInt(), setObject() - - - - java.lang.Short - - SMALLINT - - getShort(), setObject() - - - - java.lang.Long - - BIGINT - - getLong(), setObject() - - - - java.lang.Float - - REAL - - getFloat(), setObject() - - - - java.lang.Double - - DOUBLE - - getDouble(), setObject() - - - - java.math.BigDecimal - - NUMERIC - - getBigDecimal(), setObject() - - - - java.math.BigInteger - - NUMERIC - - getBigDecimal(), setObject() - - - - java.sql.Date - - DATE - - getDate(), setDate() - - - - java.sql.Time - - TIME - - getTime(), setTime() - - - - java.sql.Timestamp - - TIMESTAMP - - getTimestamp(), setTimestamp() - - - - any serializable class - - VARBINARY or LONGVARBINARY (1) - - getBytes(), setBytes() - - - -
    - - (1) The mapping for String will normally be VARCHAR, but will turn - into LONGVARCHAR if the given value exceeds the driver's limit on VARCHAR - values. The case is similar for byte[] and VARBINARY and LONGVARBINARY - values. -
    - -
    CMP 2.x specifics - - - For a CMP 2.0 entity bean, only the jndi-name element of the - jdbc-mapping is mandatory, since the mapping may be generated - automatically (for an explicit mapping definition, refer to the "JOnAS - Database Mapping" section of the Using CMP2.0 persistence chapter): - - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - </jdbc-mapping> - <cleanup>create</cleanup> - - For a CMP 2.0 entity bean, the JOnAS-specific deployment descriptor - contains an additional element, cleanup, at the same level as the - jdbc-mapping element, which can have one of the following values: - - - - removedata - - - at bean loading time, the content of the tables storing the - bean data is deleted - - - - - removeall - - - at bean loading time, the tables storing the bean data are - dropped (if they exist) and created - - - - - none - - - do nothing - - - - - create - - - default value (if the element is not specified), at bean - loading time, the tables for storing the bean data are created if - they do not exist - - - - - the information defining the behaviour of the implementation of a - find<method> method is located in the standard deployment - descriptor, as an EJB-QL query (i.e. this is not JOnAS-specific - information). The same finder method example in CMP 2.0: - - <query> - <query-method> - <method-name>findLargeAccounts</method-name> - <method-params> - <method-param>double</method-param> - </method-params> - </query-method> - <ejb-ql>SELECT OBJECT(o) FROM accountsample o WHERE o.balance &gt; ?1</ejb-ql> - </query> - - For CMP 2.0, the supported datatypes depend on the JORM mapper - used. -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/deploy.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/deploy.xml deleted file mode 100644 index 8b9404700ada0e6d6db30997b5b97580d0124b86..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/deploy.xml +++ /dev/null @@ -1,966 +0,0 @@ - -
    - - Defining the EJB2 Deployment Descriptor - - - The target audience for this section is the Enterprise Bean provider, i.e. the person in charge of developing the software components on the server side. It describes how the bean provider should build the deployment descriptors of its components. - Refer to for advices about writing xml files. - -
    Principles - - - The bean programmer is responsible for providing the deployment descriptor associated with the developed Enterprise Beans. The Bean Provider's responsibilities and the Application Assembler's responsibilities is to provide an XML deployment descriptor that conforms to the deployment descriptor's XML schema as defined in the EBJ specification version 2.1. (Refer to - - $JONAS_ROOT/xml/ejb-jar_2_1.xsd - - or - - http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd - - ). - - - To deploy Enterprise JavaBeans on the EJB server, information not defined in the standard XML deployment descriptor may be needed. For example, this information may include the mapping of the bean to the underlying database for an entity bean with container-managed persistence. This information is specified during the deployment step in another XML deployment descriptor that is specific to JOnAS. The JOnAS-specific deployment descriptor's XML schema is located in - - $JONAS_ROOT/xml/jonas-ejb-jar_X_Y.xsd - - . The file name of the JOnAS-specific XML deployment descriptor must be the file name of the standard XML deployment descriptor prefixed by ' - - jonas- - - '. - - - The parser gets the specified schema via the classpath (schemas are packaged in the $JONAS_ROOT/lib/common/ow_jonas.jar file). - - - The standard deployment descriptor should contain structural information for each enterprise bean that includes the following: - - - - the Enterprise bean's name, - - - the Enterprise bean's class, - - - the Enterprise bean's home interface, - - - the Enterprise bean's remote interface, - - - the Enterprise bean's type, - - - a re-entrancy indication for the entity bean, - - - the session bean's state management type, - - - the session bean's transaction demarcation type, - - - the entity bean's persistence management, - - - the entity bean's primary key class, - - - container-managed fields, - - - environment entries, - - - the bean's EJB references, - - - resource manager connection factory references, - - - transaction attributes. - - - - The JOnAS-specific deployment descriptor contains information for each enterprise bean including: - - - - the JNDI name of the Home object that implement the Home interface of the enterprise bean, - - - the JNDI name of the DataSource object corresponding to the resource manager connection factory referenced in the enterprise bean's class, - - - the JNDI name of each EJB references, - - - the JNDI name of JMS administered objects, - - - information for the mapping of the bean to the underlying database, if it is an entity with container-managed persistence. - - - - -
    -
    - Example of Session Descriptors - - <?xml version="1.0" encoding="ISO-8859-1"?> - -<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee - http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" - version="2.1"> - - <description>secured session bean JOnAS example</description> - - <display-name>secusb (earsample)</display-name> - - <enterprise-beans> - <session> - <ejb-name>EarOp</ejb-name> - <home>org.ow2.jonas.earsample.beans.secusb.OpHome</home> - <remote>org.ow2.jonas.earsample.beans.secusb.Op</remote> - <local-home>org.ow2.jonas.earsample.beans.secusb.OpLocalHome</local-home> - <local>org.ow2.jonas.earsample.beans.secusb.OpLocal</local> - <ejb-class>org.ow2.jonas.earsample.beans.secusb.OpBean</ejb-class> - <session-type>Stateful</session-type> - <transaction-type>Container</transaction-type> - </session> - </enterprise-beans> - - <assembly-descriptor> - <security-role> - <role-name>tomcat</role-name> - </security-role> - <security-role> - <role-name>jetty</role-name> - </security-role> - - <method-permission> - <role-name>tomcat</role-name> - <method> - <ejb-name>EarOp</ejb-name> - <method-name>*</method-name> - </method> - </method-permission> - - <method-permission> - <role-name>jetty</role-name> - <method> - <ejb-name>EarOp</ejb-name> - <method-name>*</method-name> - </method> - </method-permission> - - <container-transaction> - <method> - <ejb-name>EarOp</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>Supports</trans-attribute> - </container-transaction> - - </assembly-descriptor> - -</ejb-jar> - <?xml version="1.0" encoding="ISO-8859-1"?> - - -<jonas-ejb-jar xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-ejb-jar_4_0.xsd" > - <jonas-session> - <ejb-name>EarOp</ejb-name> - <jndi-name>EarOpHome</jndi-name> - </jonas-session> -</jonas-ejb-jar> -
    -
    - Example of Container-managed Persistence Entity Descriptors (CMP 2.x) - <?xml version="1.0"?> - -<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee - http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" - version="2.1"> - - <description>Deployment descriptor for the cmp2 JOnAS example</description> - <display-name>cmp2 example</display-name> - <enterprise-beans> - - <entity> - <ejb-name>CustomerEJB</ejb-name> - <home>com.titan.customer.CustomerHomeRemote</home> - <remote>com.titan.customer.CustomerRemote</remote> - <local-home>com.titan.customer.CustomerHomeLocal</local-home> - <local>com.titan.customer.CustomerLocal</local> - <ejb-class>com.titan.customer.CustomerBean</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Integer</prim-key-class> - <reentrant>false</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>JE2_Customer</abstract-schema-name> - <cmp-field><field-name>id</field-name></cmp-field> - <cmp-field><field-name>lastName</field-name></cmp-field> - <cmp-field><field-name>firstName</field-name></cmp-field> - <cmp-field><field-name>hasGoodCredit</field-name></cmp-field> - <primkey-field>id</primkey-field> - <ejb-local-ref> - <ejb-ref-name>ejb/AddressHomeLocal</ejb-ref-name> - <ejb-ref-type>Entity</ejb-ref-type> - <local-home>com.titan.address.AddressHomeLocal</local-home> - <local>com.titan.address.AddressLocal</local> - <ejb-link>AddressEJB</ejb-link> - </ejb-local-ref> - <ejb-local-ref> - <ejb-ref-name>ejb/CreditCardHome</ejb-ref-name> - <ejb-ref-type>Entity</ejb-ref-type> - <local-home>com.titan.customer.CreditCardHomeLocal</local-home> - <local>com.titan.customer.CreditCardLocal</local> - <ejb-link>CreditCardEJB</ejb-link> - </ejb-local-ref> - <ejb-local-ref> - <ejb-ref-name>ejb/PhoneHomeLocal</ejb-ref-name> - <ejb-ref-type>Entity</ejb-ref-type> - <local-home>com.titan.phone.PhoneHomeLocal</local-home> - <local>com.titan.phone.PhoneLocal</local> - <ejb-link>PhoneEJB</ejb-link> - </ejb-local-ref> - <security-identity><use-caller-identity/></security-identity> - <query> - <query-method> - <method-name>findAllCustomers</method-name> - <method-params></method-params> - </query-method> - <ejb-ql>SELECT OBJECT(c) FROM JE2_Customer AS c</ejb-ql> - </query> - <query> - <query-method> - <method-name>findByName</method-name> - <method-params> - <method-param>java.lang.String</method-param> - <method-param>java.lang.String</method-param> - </method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2 - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findSmith90</method-name> - <method-params></method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.lastName = 'Smith90' - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findByExactName</method-name> - <method-params> - <method-param>java.lang.String</method-param> - <method-param>java.lang.String</method-param> - </method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.lastName = ?1 AND c.firstName = ?2 - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findByNameAndState</method-name> - <method-params> - <method-param>java.lang.String</method-param> - <method-param>java.lang.String</method-param> - <method-param>java.lang.String</method-param> - </method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2 AND c.homeAddress.state = ?3 - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findByGoodCredit</method-name> - <method-params></method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.hasGoodCredit = TRUE - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findByCity</method-name> - <method-params> - <method-param>java.lang.String</method-param> - <method-param>java.lang.String</method-param> - </method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.homeAddress.city = ?1 AND c.homeAddress.state = ?2 - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findInHotStates</method-name> - <method-params></method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.homeAddress.state IN ('FL','TX','AZ','CA') - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findWithNoReservations</method-name> - <method-params></method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.reservations IS EMPTY - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findOnCruise</method-name> - <method-params> - <method-param>com.titan.cruise.CruiseLocal</method-param> - </method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(cust) FROM JE2_Customer cust, JE2_Cruise cr, IN (cr.reservations) AS res - WHERE cr = ?1 AND cust MEMBER OF res.customers - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findByState</method-name> - <method-params> - <method-param>java.lang.String</method-param> - </method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.homeAddress.state = ?1 - ORDER BY c.lastName,c.firstName - </ejb-ql> - </query> - </entity> - - <entity> - <ejb-name>AddressEJB</ejb-name> - <local-home>com.titan.address.AddressHomeLocal</local-home> - <local>com.titan.address.AddressLocal</local> - <ejb-class>com.titan.address.AddressBean</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Object</prim-key-class> - <reentrant>false</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>JE2_Address</abstract-schema-name> - <cmp-field><field-name>street</field-name></cmp-field> - <cmp-field><field-name>city</field-name></cmp-field> - <cmp-field><field-name>state</field-name></cmp-field> - <cmp-field><field-name>zip</field-name></cmp-field> - <security-identity><use-caller-identity/></security-identity> - <query> - <query-method> - <method-name>findAllAddress</method-name> - <method-params></method-params> - </query-method> - <ejb-ql>SELECT OBJECT(c) FROM JE2_Address c</ejb-ql> - </query> - <query> - <query-method> - <method-name>ejbSelectZipCodes</method-name> - <method-params> - <method-param>java.lang.String</method-param> - </method-params> - </query-method> - <ejb-ql>SELECT a.zip FROM JE2_Address AS a WHERE a.state = ?1</ejb-ql> - </query> - <query> - <query-method> - <method-name>ejbSelectAll</method-name> - <method-params></method-params> - </query-method> - <ejb-ql>SELECT OBJECT(a) FROM JE2_Address AS a</ejb-ql> - </query> - <query> - <query-method> - <method-name>ejbSelectCustomer</method-name> - <method-params> - <method-param>com.titan.address.AddressLocal</method-param> - </method-params> - </query-method> - <ejb-ql>SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.homeAddress = ?1</ejb-ql> - </query> - </entity> - - <entity> - <ejb-name>PhoneEJB</ejb-name> - <local-home>com.titan.phone.PhoneHomeLocal</local-home> - <local>com.titan.phone.PhoneLocal</local> - <ejb-class>com.titan.phone.PhoneBean</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Object</prim-key-class> - <reentrant>false</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>JE2_Phone</abstract-schema-name> - <cmp-field><field-name>number</field-name></cmp-field> - <cmp-field><field-name>type</field-name></cmp-field> - <security-identity><use-caller-identity/></security-identity> - <query> - <query-method> - <method-name>findAllPhones</method-name> - <method-params></method-params> - </query-method> - <ejb-ql>SELECT OBJECT(c) FROM JE2_Phone c</ejb-ql> - </query> - </entity> - - <entity> - <ejb-name>CreditCardEJB</ejb-name> - <local-home>com.titan.customer.CreditCardHomeLocal</local-home> - <local>com.titan.customer.CreditCardLocal</local> - <ejb-class>com.titan.customer.CreditCardBean</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Object</prim-key-class> - <reentrant>false</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>JE2_CreditCard</abstract-schema-name> - <cmp-field><field-name>expirationDate</field-name></cmp-field> - <cmp-field><field-name>number</field-name></cmp-field> - <cmp-field><field-name>nameOnCard</field-name></cmp-field> - <cmp-field><field-name>creditOrganization</field-name></cmp-field> - <security-identity><use-caller-identity/></security-identity> - <query> - <query-method> - <method-name>findAllCreditCards</method-name> - <method-params></method-params> - </query-method> - <ejb-ql>SELECT OBJECT(cc) FROM JE2_CreditCard cc</ejb-ql> - </query> - </entity> - - <entity> - <ejb-name>CruiseEJB</ejb-name> - <local-home>com.titan.cruise.CruiseHomeLocal</local-home> - <local>com.titan.cruise.CruiseLocal</local> - <ejb-class>com.titan.cruise.CruiseBean</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Object</prim-key-class> - <reentrant>false</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>JE2_Cruise</abstract-schema-name> - <cmp-field><field-name>name</field-name></cmp-field> - <security-identity><use-caller-identity/></security-identity> - <query> - <query-method> - <method-name>findAllCruises</method-name> - <method-params></method-params> - </query-method> - <ejb-ql>SELECT OBJECT(cc) FROM JE2_Cruise cc</ejb-ql> - </query> - <query> - <query-method> - <method-name>findByName</method-name> - <method-params> - <method-param>java.lang.String</method-param> - </method-params> - </query-method> - <ejb-ql>SELECT OBJECT(c) FROM JE2_Cruise c WHERE c.name = ?1</ejb-ql> - </query> - </entity> - - <entity> - <ejb-name>ShipEJB</ejb-name> - <local-home>com.titan.ship.ShipHomeLocal</local-home> - <local>com.titan.ship.ShipLocal</local> - <ejb-class>com.titan.ship.ShipBean</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Integer</prim-key-class> - <reentrant>false</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>JE2_Ship</abstract-schema-name> - <cmp-field><field-name>id</field-name></cmp-field> - <cmp-field><field-name>name</field-name></cmp-field> - <cmp-field><field-name>tonnage</field-name></cmp-field> - <primkey-field>id</primkey-field> - <security-identity><use-caller-identity/></security-identity> - <query> - <query-method> - <method-name>findAllShips</method-name> - <method-params></method-params> - </query-method> - <ejb-ql>SELECT OBJECT(cc) FROM JE2_Ship cc</ejb-ql> - </query> - <query> - <query-method> - <method-name>findByTonnage</method-name> - <method-params> - <method-param>java.lang.Double</method-param> - </method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(s) FROM JE2_Ship s - WHERE s.tonnage = ?1 - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findByTonnage</method-name> - <method-params> - <method-param>java.lang.Double</method-param> - <method-param>java.lang.Double</method-param> - </method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(s) FROM JE2_Ship s - WHERE s.tonnage BETWEEN ?1 AND ?2 - </ejb-ql> - </query> - </entity> - - <entity> - <ejb-name>ReservationEJB</ejb-name> - <local-home>com.titan.reservation.ReservationHomeLocal</local-home> - <local>com.titan.reservation.ReservationLocal</local> - <ejb-class>com.titan.reservation.ReservationBean</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Object</prim-key-class> - <reentrant>false</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>JE2_Reservation</abstract-schema-name> - <cmp-field><field-name>amountPaid</field-name></cmp-field> - <cmp-field><field-name>date</field-name></cmp-field> - <security-identity><use-caller-identity/></security-identity> - <query> - <query-method> - <method-name>findAllReservations</method-name> - <method-params></method-params> - </query-method> - <ejb-ql>SELECT OBJECT(cc) FROM JE2_Reservation cc</ejb-ql> - </query> - </entity> - - <entity> - <ejb-name>CabinEJB</ejb-name> - <home>com.titan.cabin.CabinHomeRemote</home> - <remote>com.titan.cabin.CabinRemote</remote> - <local-home>com.titan.cabin.CabinHomeLocal</local-home> - <local>com.titan.cabin.CabinLocal</local> - <ejb-class>com.titan.cabin.CabinBean</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Integer</prim-key-class> - <reentrant>false</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>JE2_Cabin</abstract-schema-name> - <cmp-field><field-name>id</field-name></cmp-field> - <cmp-field><field-name>name</field-name></cmp-field> - <cmp-field><field-name>deckLevel</field-name></cmp-field> - <cmp-field><field-name>bedCount</field-name></cmp-field> - <primkey-field>id</primkey-field> - <security-identity><use-caller-identity/></security-identity> - <query> - <query-method> - <method-name>findAllOnDeckLevel</method-name> - <method-params> - <method-param>java.lang.Integer</method-param> - </method-params> - </query-method> - <ejb-ql> - SELECT OBJECT(c) FROM JE2_Cabin as c WHERE c.deckLevel = ?1 - </ejb-ql> - </query> - <query> - <query-method> - <method-name>findAllCabins</method-name> - <method-params></method-params> - </query-method> - <ejb-ql>SELECT OBJECT(cc) FROM JE2_Cabin cc</ejb-ql> - </query> - <query> - <query-method> - <method-name>ejbSelectAllForCustomer</method-name> - <method-params> - <method-param>com.titan.customer.CustomerLocal</method-param> - </method-params> - </query-method> - <ejb-ql>SELECT OBJECT(cab) FROM JE2_Customer AS cust, - IN (cust.reservations) AS res, IN (res.cabins) AS cab - WHERE cust = ?1 - </ejb-ql> - </query> - </entity> - - <session> - <ejb-name>TravelAgentEJB</ejb-name> - <home>com.titan.travelagent.TravelAgentHomeRemote</home> - <remote>com.titan.travelagent.TravelAgentRemote</remote> - <ejb-class>com.titan.travelagent.TravelAgentBean</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - <ejb-local-ref> - <ejb-ref-name>ejb/CabinHomeLocal</ejb-ref-name> - <ejb-ref-type>Entity</ejb-ref-type> - <local-home>com.titan.cabin.CabinHomeLocal</local-home> - <local>com.titan.cabin.CabinLocal</local> - <ejb-link>CabinEJB</ejb-link> - </ejb-local-ref> - <security-identity><use-caller-identity/></security-identity> - </session> - - <session> - <ejb-name>RTravelAgentEJB</ejb-name> - <home>com.titan.travelagent.RTravelAgentHomeRemote</home> - <remote>com.titan.travelagent.RTravelAgentRemote</remote> - <ejb-class>com.titan.travelagent.RTravelAgentBean</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - <ejb-ref> - <ejb-ref-name>ejb/CabinHomeRemote</ejb-ref-name> - <ejb-ref-type>Entity</ejb-ref-type> - <home>com.titan.cabin.CabinHomeRemote</home> - <remote>com.titan.cabin.CabinRemote</remote> - </ejb-ref> - <security-identity><use-caller-identity/></security-identity> - </session> - - </enterprise-beans> - - <relationships> - <ejb-relation> - <ejb-relation-name>Customer-Address</ejb-relation-name> - <ejb-relationship-role> - <ejb-relationship-role-name>Customer-has-a-Address</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>CustomerEJB</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>homeAddress</cmr-field-name> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <ejb-relationship-role-name>Address-belongs-to-Customer</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <cascade-delete/> - <relationship-role-source> - <ejb-name>AddressEJB</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - </ejb-relation> - - <ejb-relation> - <ejb-relation-name>Customer-CreditCard</ejb-relation-name> - <ejb-relationship-role> - <ejb-relationship-role-name>Customer-has-a-CreditCard</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>CustomerEJB</ejb-name> - </relationship-role-source> - <cmr-field><cmr-field-name>creditCard</cmr-field-name></cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <ejb-relationship-role-name>CreditCard-belongs-to-Customer</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <cascade-delete/> - <relationship-role-source> - <ejb-name>CreditCardEJB</ejb-name> - </relationship-role-source> - <cmr-field><cmr-field-name>customer</cmr-field-name></cmr-field> - </ejb-relationship-role> - </ejb-relation> - - <ejb-relation> - <ejb-relation-name>Customer-Phones</ejb-relation-name> - <ejb-relationship-role> - <ejb-relationship-role-name>Customer-has-many-Phone-numbers</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>CustomerEJB</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>phoneNumbers</cmr-field-name> - <cmr-field-type>java.util.Collection</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <ejb-relationship-role-name>Phone-belongs-to-Customer</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <cascade-delete/> - <relationship-role-source> - <ejb-name>PhoneEJB</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - </ejb-relation> - - <ejb-relation> - <ejb-relation-name>Customer-Reservation</ejb-relation-name> - <ejb-relationship-role> - <ejb-relationship-role-name>Customer-has-many-Reservations</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>CustomerEJB</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>reservations</cmr-field-name> - <cmr-field-type>java.util.Collection</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <ejb-relationship-role-name>Reservation-has-many-Customers</ejb-relationship-role-name> - <multiplicity>Many</multiplicity><relationship-role-source> - <ejb-name>ReservationEJB</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>customers</cmr-field-name> - <cmr-field-type>java.util.Set</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - </ejb-relation> - - <ejb-relation> - <ejb-relation-name>Cruise-Ship</ejb-relation-name> - <ejb-relationship-role> - <ejb-relationship-role-name>Cruise-has-a-Ship</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>CruiseEJB</ejb-name> - </relationship-role-source> - <cmr-field><cmr-field-name>ship</cmr-field-name></cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <ejb-relationship-role-name>Ship-has-many-Cruises</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>ShipEJB</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - </ejb-relation> - - <ejb-relation> - <ejb-relation-name>Cruise-Reservation</ejb-relation-name> - <ejb-relationship-role> - <ejb-relationship-role-name>Cruise-has-many-Reservations</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>CruiseEJB</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>reservations</cmr-field-name> - <cmr-field-type>java.util.Collection</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <ejb-relationship-role-name>Reservation-has-a-Cruise</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>ReservationEJB</ejb-name> - </relationship-role-source> - <cmr-field><cmr-field-name>cruise</cmr-field-name></cmr-field> - </ejb-relationship-role> - </ejb-relation> - - <ejb-relation> - <ejb-relation-name>Cabin-Ship</ejb-relation-name> - <ejb-relationship-role> - <ejb-relationship-role-name>Cabin-has-a-Ship</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>CabinEJB</ejb-name> - </relationship-role-source> - <cmr-field><cmr-field-name>ship</cmr-field-name></cmr-field> - </ejb-relationship-role> - <ejb-relationship-role> - <ejb-relationship-role-name>Ship-has-many-Cabins</ejb-relationship-role-name> - <multiplicity>One</multiplicity> - <relationship-role-source> - <ejb-name>ShipEJB</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - </ejb-relation> - - <ejb-relation> - <ejb-relation-name>Cabin-Reservation</ejb-relation-name> - <ejb-relationship-role> - <ejb-relationship-role-name>Cabin-has-many-Reservations</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>CabinEJB</ejb-name> - </relationship-role-source> - </ejb-relationship-role> - <ejb-relationship-role> - <ejb-relationship-role-name>Reservation-has-many-Cabins</ejb-relationship-role-name> - <multiplicity>Many</multiplicity> - <relationship-role-source> - <ejb-name>ReservationEJB</ejb-name> - </relationship-role-source> - <cmr-field> - <cmr-field-name>cabins</cmr-field-name> - <cmr-field-type>java.util.Set</cmr-field-type> - </cmr-field> - </ejb-relationship-role> - </ejb-relation> - - </relationships> - - - <assembly-descriptor> - <container-transaction> - <method> - <ejb-name>CabinEJB</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>RTravelAgentEJB</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>TravelAgentEJB</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>CustomerEJB</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>AddressEJB</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>CreditCardEJB</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>PhoneEJB</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>CruiseEJB</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>ShipEJB</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>ReservationEJB</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>Required</trans-attribute> - </container-transaction> - - <container-transaction> - <method> - <ejb-name>SequenceSession</ejb-name> - <method-name>*</method-name> - </method> - <method> - <ejb-name>Sequence</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>Required</trans-attribute> - </container-transaction> - - </assembly-descriptor> - -</ejb-jar> - - <?xml version = "1.0" encoding = "UTF-8"?> - -<jonas-ejb-jar xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-ejb-jar_4_0.xsd" > - - <jonas-entity> - <ejb-name>CustomerEJB</ejb-name> - <jndi-name>CustomerHomeRemote</jndi-name> - <jdbc-mapping><jndi-name>jdbc_1</jndi-name></jdbc-mapping> - </jonas-entity> - - <jonas-entity> - <ejb-name>AddressEJB</ejb-name> - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - </jdbc-mapping> - </jonas-entity> - - <jonas-entity> - <ejb-name>CabinEJB</ejb-name> - <jdbc-mapping><jndi-name>jdbc_1</jndi-name></jdbc-mapping> - </jonas-entity> - - <jonas-entity> - <ejb-name>PhoneEJB</ejb-name> - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - </jdbc-mapping> - </jonas-entity> - - <jonas-entity> - <ejb-name>CreditCardEJB</ejb-name> - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - </jdbc-mapping> - </jonas-entity> - - <jonas-entity> - <ejb-name>CruiseEJB</ejb-name> - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - </jdbc-mapping> - </jonas-entity> - - <jonas-entity> - <ejb-name>ShipEJB</ejb-name> - <jdbc-mapping><jndi-name>jdbc_1</jndi-name></jdbc-mapping> - </jonas-entity> - - <jonas-entity> - <ejb-name>ReservationEJB</ejb-name> - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - </jdbc-mapping> - </jonas-entity> - - <jonas-session> - <ejb-name>RTravelAgentEJB</ejb-name> - <jndi-name>RTravelAgentHomeRemote</jndi-name> - <jonas-ejb-ref> - <ejb-ref-name>ejb/CabinHomeRemote</ejb-ref-name> - <jndi-name>CabinHomeRemote</jndi-name> - </jonas-ejb-ref> - </jonas-session> - -</jonas-ejb-jar> - -
    - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/entity.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/entity.xml deleted file mode 100644 index 038267a960b2370e2354b3340db8f1f90a8a8112..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/entity.xml +++ /dev/null @@ -1,763 +0,0 @@ - -
    - - EJB 2.1 Entity Beans Description - - -
    Introduction - - - An Entity Bean is composed of the following parts, which are - developed by the Enterprise Bean Provider: - - - - The Component Interface is the client view - of the bean. It contains all the "business methods" of the - bean. - - - - The Home Interface contains all the methods - for the bean life cycle (creation, suppression) and for instance - retrieval (finding one or several bean objects) used by the client - application. It can also contain methods called "home methods," - supplied by the bean provider, for business logic which are not - specific to a bean instance. - - - - The Primary Key class (for entity beans - only) contains a subset of the bean's fields that identifies a - particular instance of an entity bean. This class is optional since - the bean programmer can alternatively choose a standard class (for - example, java.lang.String) - - - - The bean implementation class implements - the business methods and all the methods (described in the EJB - specification) allowing the bean to be managed in the - container. - - - - The deployment descriptor, containing the - bean properties that can be edited at assembly or deployment - time. - - - - Note that, according to the EJB 2.1 specification, the couple - Component Interface and Home - Interface may be either local or remote. Local - Interfaces (Home and Component) are to be used by a client - running in the same JVM as the EJB component. Create and finder methods of - a local or remote home interface return local or remote component - interfaces respectively. An EJB component can have both remote and local - interfaces, even if typically only one type of interface is - provided. - - The description of these elements is provided in the following - sections. - - - in this documentation, the term "Bean" always means "Enterprise - Bean." - - - An entity bean represents persistent data. It is an object view of - an entity stored in a relational database. The persistence of an entity - bean can be handled in two ways: - - - - Container-Managed Persistence: the - persistence is implicitly managed by the container, no code for data - access is supplied by the bean provider. The bean's state will be - stored in a relational database according to a mapping description - delivered within the deployment descriptor (CMP 1) or according to an - implicit mapping (CMP 2). - - - - Bean-Managed Persistence: the bean provider - writes the database access operations (JDBC code) in the methods of - the enterprise bean that are specified for data creation, load, store, - retrieval, and remove operations (ejbCreate, ejbLoad, ejbStore, - ejbFind..., ejbRemove). - - - - Currently, the platform handles persistence in relational storage - systems through the JDBC interface. For both container-managed and - bean-managed persistence, JDBC connections are obtained from an object - provided at the EJB server level, the DataSource. The DataSource interface - is defined in the JDBC 2.0 standard extensions. A DataSource object - identifies a database and a means to access it via JDBC (a JDBC driver). - An EJB server may propose access to several databases and thus provides - the corresponding DataSource objects. DataSources are described in more - detail in the section -
    - -
    The Home Interface - - - In addition to home business methods, the Home - interface is used by any client application to create, remove, - and retrieve instances of the entity bean. The bean provider only needs to - provide the desired interface; the container will automatically provide - the implementation. The interface must extend the - javax.ejb.EJBHome interface if it is - remote, or the javax.ejb.EJBLocalHome - interface if it is local. The methods of a remote home interface must - follow the rules for java RMI. The signatures of the - create and finder - methods should match the signatures of the - ejbCreate and ejbFinder - methods that will be provided later in the enterprise bean implementation - class (same number and types of arguments, but different return - types). - -
    create methods - - - - - The return type is the enterprise bean's component - interface. - - - - The exceptions defined in the throws clause must include the - exceptions defined for the ejbCreate and ejbPostCreate methods, and - must include javax.ejb.CreateException and java.rmi.RemoteException - (the latter, only for a remote interface). - - -
    - -
    remove methods - - - - - The interfaces for these methods must not be defined, they are - inherited from EJBHome or EJBLocalHome. - - - - - - The method is void remove taking as argument the primary key - object or the handle (for a remote interface). - - - - - - The exceptions defined in the throws clause should be - javax.ejb.RemoveException and java.ejb.EJBException for a local - interface. - - - - - - The exceptions defined in the throws clause should be - javax.ejb.RemoveException and java.rmi.RemoteException for a remote - interface. - - -
    - -
    finder methods - - - Finder methods are used to search for an EJB object or a - collection of EJB objects. The arguments of the method are used by the - entity bean implementation to locate the requested entity objects. For - bean-managed persistence, the bean provider is responsible for - developing the corresponding ejbFinder methods in the bean - implementation. For container-managed persistence, the bean provider - does not write these methods; they are generated at deployment time by - the platform tools; the description of the method is provided in the - deployment descriptor, as defined in the section - - In the Home interface, the - finder methods must adhere to the following rules: - - - They must be named " - find<method> - " (e.g. - - findLargeAccounts - - ). - - - The return type must be the enterprise bean's component interface, or a collection thereof. - - - The exceptions defined in the throws clause must include the exceptions defined for the matching ejbFind method, and must include - - javax.ejb.FinderException - - and - - java.rmi.RemoteException - - (the latter, only for a remote interface). - - - At least one of these methods is mandatory: - findByPrimaryKey - , which takes as argument a primary key value and returns the corresponding EJB object. - - home methods: - - - - Home methods are methods that the bean provider supplies for business logic that is not specific to an entity bean instance. - - - The throws clause of every home method on the remote home interface includes the java.rmi.RemoteException. - - - Home methods implementation is provided by the bean developer in the bean implementation class as public static methods named - - ejbHome<METHOD_NAME>(...) - - , where <METHOD_NAME> is the name of the method in the home interface. - - -
    -
    Example - - The Account bean example, provided with the platform examples, is used to illustrate these concepts. The state of an entity bean instance is stored in a relational database, where the following table should exist, if CMP 1.1 is used: - create table ACCOUNT (ACCNO integer primary key, CUSTOMER varchar(30), BALANCE number(15,4)); - - -public interface AccountHome extends EJBHome { - public Account create(int accno, String customer, double balance) throws RemoteException, CreateException; - public Account findByPrimaryKey(Integer pk) throws RemoteException, FinderException; - public Account findByNumber(int accno) throws RemoteException, FinderException; - public Enumeration findLargeAccounts(double val) throws RemoteException, FinderException; -} -
    -
    -
    The Component Interface - - Business methods: - - The Component Interface is the client's view of an instance of the entity bean. It is what is returned to the client by the Home interface after creating or finding an entity bean instance. This interface contains the business methods of the enterprise bean. The interface must extend the - - javax.ejb.EJBObject - - interface if it is remote, or the - - javax.ejb.EJBLocalObject - - if it is local. The methods of a remote component interface must follow the rules for java RMI. For each method defined in this component interface, there must be a matching method of the bean implementation class (same arguments number and types, same return type, same exceptions except for RemoteException). - -
    - Example - - -public interface Account extends EJBObject { - public double getBalance() throws RemoteException; - public void setBalance(double d) throws RemoteException; - public String getCustomer() throws RemoteException; - public void setCustomer(String c) throws RemoteException; - public int getNumber() throws RemoteException; -} -
    -
    -
    The Primary Key Class - - The Primary Key class is necessary for entity beans only. It encapsulates the fields representing the primary key of an entity bean in a single object. If the primary key in the database table is composed of a single column with a basic data type, the simplest way to define the primary key in the bean is to use a standard java class (for example, - - java.lang.Integer - - or - - java.lang.String - - ). This must have the same type as a field in the bean class. It is not possible to define it as a primitive field (for example, int, float or boolean). Then, it is only necessary to specify the type of the primary key in the deployment descriptor: - - <prim-key-class>java.lang.Integer</prim-key-class> - - And, for container-managed persistence, the field which represents the primary key: - - <primkey-field>accno</primkey-field> - - The alternative way is to define its own Primary Key class, described as follows: - - The class must be serializable and must provide suitable implementation of the - - hashcode() - - and - - equals(Object) - - methods. - - - For - container-managed persistence - , the following rules must be followed: - - - - The fields of the primary key class must be declared as public. - - - The primary key class must have a public default constructor. - - - The names of the fields in the primary key class must be a subset of the names of the container-managed fields of the enterprise bean. - - -
    - Example - - -public class AccountBeanPK implements java.io.Serializable { - public int accno; - public AccountBeanPK(int accno) { this.accno = accno; } - public AccountBeanPK() { } - public int hashcode() { return accno; } - public boolean equals(Object other) { - ... - } -} - -
    -
    - Special case: Automatic generation of primary key fields - - - There are two ways to manage the automatic primary key with JOnAS. The first method is closer to what is described in the EJB specification, i.e. an automatic PK is a hidden field, the type of which is not known even by the application. The second method is to declare a usual PK CMP field of type java.lang.Integer as automatic. The two cases are described below. - - - Standard automatic primary keys - - - In this case, an automatic PK is a hidden field, the type of which is not known even by the application. All that is necessary is to stipulate in the standard deployment descriptor that this EJB has an automatic PK, by specifying java.lang.Object as primkey-class. The primary key will be completely hidden to the application (no CMP field, no getter/setter method). This is valid for both CMP 2.x and CMP1 entity beans. The container will create an internal CMP field and generate its value when the entity bean is created. - - - Example: - - - Standard deployment descriptor: - - - <entity> - ... - <ejb-name>AddressEJB</ejb-name> - <local-home>com.titan.address.AddressHomeLocal</local-home> - <local>com.titan.address.AddressLocal</local> - <ejb-class>com.titan.address.AddressBean</ejb-class> - <persistence-type>Container</persistence-type> - <prim-key-class>java.lang.Object</prim-key-class> - <reentrant>False</reentrant> - <cmp-version>2.x</cmp-version> - <abstract-schema-name>Cmp2_Address</abstract-schema-name> - <cmp-field><field-name>street</field-name></cmp-field> - <cmp-field><field-name>city</field-name></cmp-field> - <cmp-field><field-name>state</field-name></cmp-field> - <cmp-field><field-name>zip</field-name></cmp-field> - - Address Bean Class extract: - - - // Primary key is not explicitly initialized during ejbCreate method - // No cmp field corresponds to the primary key - public Integer ejbCreateAddress(String street, String city, - String state, String zip ) throws javax.ejb.CreateException { - setStreet(street); - setCity(city); - setState(state); - setZip(zip); - return null; - } - - If nothing else is specified, and the JOnAS default CMP 2 database mapping is used, the JOnAS container will generate a database column with name JPK_ to handle this PK. However, it is possible to specify in the JOnAS-specific Deployment Descriptor the name of the column that will be used to store the PK value in the table, using the specific <automatic-pk-field-name> element, as follows (this is necessary for CMP2 legacy and for CMP1): - - - JOnAS-specific deployment descriptor: - - - <jonas-ejb-jar xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns http://www.objectweb.org/jonas/ns/jonas-ejb-jar_4_0.xsd" > - <jonas-entity> - <ejb-name>AddressEJB</ejb-name> - <jdbc-mapping> - <jndi-name>jdbc_1</jndi-name> - <automatic-pk-field-name>FieldPkAuto</automatic-pk-field-name> - </jdbc-mapping> - </jonas-entity> - - CMP field as automatic primary key - - - The idea is to declare a usual PK CMP field of type java.lang.Integer as automatic, then it no longer appears in create methods and its value is automatically generated by the container at EJB instance creation time. But it is still a cmp field, with getter/setter methods, accessible from the application. Example: - - - In the standard DD, there is a usual primary key definition, - - - <entity> - ... - <prim-key-class>java.lang.Integer</prim-key-class> - <cmp-field><field-name>id</field-name></cmp-field> - <primkey-field>id</primkey-field> - - and in the JOnAS-specific Deployment Descriptor, it should be specified that this PK is automatic, - - - <jonas-entity> - ... - <jdbc-mapping> - - <automatic-pk>true</automatic-pk> - - Note: The automatic primary key is given a unique ID by an algorithm that is based on the system time; therefore, IDs may be not sequential. - - - Important restriction: This algorithm will not work if used inside a cluster with the same entity bean that is being managed in several jonas servers. - - - -
    -
    - -
    The Enterprise Bean Class - - The EJB implementation class implements the bean's business methods of the component interface and the methods dedicated to the EJB environment, the interface of which is explicitly defined in the EJB specification. The class must implement the - - javax.ejb.EntityBean - - interface, must be defined as public, cannot be - abstract - for CMP 1.1, and must be abstract for CMP 2.0 (in this case, the abstract methods are the get and set accessor methods of the bean cmp and cmr fields). Following is a list of the EJB environment dedicated methods that the EJB provider must develop. - - The first set of methods are those corresponding to the create and find methods of the Home interface: - - - - public PrimaryKeyClass ejbCreate(...); - - This method is invoked by the container when a client invokes the corresponding create operation on the enterprise Bean's home interface. The method should initialize instance's variables from the input arguments. The returned object should be the primary key of the created instance. For bean-managed persistence, the bean provider should develop here the JDBC code to create the corresponding data in the database. For container-managed persistence, the container will perform the database insert - after - the ejbCreate method completes and the return value should be - null - . - - - public void ejbPostCreate(...); - - There is a matching ejbPostCreate method (same input parameters) for each ejbCreate method. The container invokes this method after the execution of the matching ejbCreate(...) method. During the ejbPostCreate method, the object identity is available. - - - - public - <PrimaryKeyClass or Collection> - ejbFind<method> - (...); // bean-managed persistence only - - The container invokes this method on a bean instance that is not associated with any particular object identity (some kind of class method ...) when the client invokes the corresponding method on the Home interface. The implementation uses the arguments to locate the requested object(s) in the database and returns a primary key (or a collection thereof). Currently, collections will be represented as - - java.util.Enumeration - - or - - java.util.Collection - - . The mandatory - FindByPrimaryKey - method takes as argument a primary key type value and returns a primary key object (it verifies that the corresponding entity exists in the database). - For container-managed persistence - , the bean provider does not have to write these finder methods; they are generated at deployment time by the EJB platform tools. The information needed by the EJB platform for automatically generating these finder methods should be provided by the bean programmer. -The EJB 1.1 specification does not specify the format of this finder method description; for - JOnAS - , the CMP 1.1 finder methods description should be provided in the JOnAS-specific deployment descriptor of the Entity Bean (as an SQL query). Refer to the section - . -The EJB 2.0 specification defines a standard way to describe these finder methods, i.e. in the standard deployment descriptor, as an EJB-QL query. Also refer to the section - . -Then, the methods of the - - javax.ejb.EntityBean - - interface must be implemented: - - - - public void - setEntityContext - (EntityContext ic); - - Used by the container to pass a reference to the EntityContext to the bean instance. The container invokes this method on an instance after the instance has been created. Generally, this method is used to store this reference in an instance variable. - - - - public void - unSetEntityContext - (); - - Unset the associated entity context. The container calls this method before removing the instance. This is the last method the container invokes on the instance. - - - - public void - ejbActivate - (); - - The container invokes this method when the instance is taken out of the pool of available instances to become associated with a specific EJB object. This method transitions the instance to the ready state. - - - - public void - ejbPassivate - (); - - The container invokes this method on an instance before the instance becomes dissociated with a specific EJB object. After this method completes, the container will place the instance into the pool of available instances. - - - - public void - ejbRemove - (); - - This method is invoked by the container when a client invokes a remove operation on the enterprise bean. For entity beans with - bean-managed persistence - , this method should contain the JDBC code to remove the corresponding data in the database. For - container-managed persistence - , this method is called - before - the container removes the entity representation in the database. - - - - public void - ejbLoad - (); - - The container invokes this method to instruct the instance to synchronize its state by loading it from the underlying database. For - bean-managed persistence - , the EJB provider should code at this location the JDBC statements for reading the data in the database. For - container-managed persistence - , loading the data from the database will be done automatically by the container just - before - ejbLoad is called, and the ejbLoad method should only contain some "after loading calculation statements." - - - - public void - ejbStore - (); - - The container invokes this method to instruct the instance to synchronize its state by storing it to the underlying database. For - bean-managed persistence - , the EJB provider should code at this location the JDBC statements for writing the data in the database. For entity beans with - container-managed persistence - , this method should only contain some "pre-store statements," since the container will extract the container-managed fields and write them to the database just - after - the ejbStore method call. - - - - - -
    Example - - - The following examples are for container-managed persistence with EJB 1.1 and EJB 2.0. For bean-managed persistence, refer to the examples delivered with your specific platform. - -
    CMP 1.1 - -package eb; - -import java.rmi.RemoteException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.ObjectNotFoundException; -import javax.ejb.RemoveException; -import javax.ejb.EJBException; - -public class AccountImplBean implements EntityBean { - - // Keep the reference on the EntityContext - protected EntityContext entityContext; - - // Object state - public Integer accno; - public String customer; - public double balance; - - public Integer ejbCreate(int val_accno, String val_customer, double val_balance) { - - // Init object state - accno = new Integer(val_accno); - customer = val_customer; - balance = val_balance; - return null; - } - - public void ejbPostCreate(int val_accno, String val_customer, double val_balance) { - // Nothing to be done for this simple example. - } - - public void ejbActivate() { - // Nothing to be done for this simple example. - } - - public void ejbLoad() { - // Nothing to be done for this simple example, in implicit persistence. - } - - public void ejbPassivate() { - // Nothing to be done for this simple example. - } - - - public void ejbRemove() { - // Nothing to be done for this simple example, in implicit persistence. - } - - public void ejbStore() { - // Nothing to be done for this simple example, in implicit persistence. - } - - public void setEntityContext(EntityContext ctx) { - // Keep the entity context in object - entityContext = ctx; - } - - public void unsetEntityContext() { - entityContext = null; - } - - public double getBalance() { - return balance; - } - - public void setBalance(double d) { - balance = balance + d; - } - - public String getCustomer() { - return customer; - } - - public void setCustomer(String c) { - customer = c; - } - - public int getNumber() { - return accno.intValue(); - } -} -
    -
    CMP 2.0 - -import java.rmi.RemoteException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.ObjectNotFoundException; -import javax.ejb.RemoveException; -import javax.ejb.CreateException; -import javax.ejb.EJBException; - -public abstract class AccountImpl2Bean implements EntityBean { - - // Keep the reference on the EntityContext - protected EntityContext entityContext; - - - /*========================= Abstract set and get accessors for cmp fields ==============*/ - - public abstract String getCustomer(); - public abstract void setCustomer(String customer); - - public abstract double getBalance(); - public abstract void setBalance(double balance); - - public abstract int getAccno(); - public abstract void setAccno(int accno); - - /*========================= ejbCreate methods ============================*/ - - - public Integer ejbCreate(int val_accno, String val_customer, double val_balance) - throws CreateException { - - // Init object state - setAccno(val_accno); - setCustomer(val_customer); - setBalance(val_balance); - return null; - } - - public void ejbPostCreate(int val_accno, String val_customer, double val_balance) { - // Nothing to be done for this simple example. - } - - - /*====================== javax.ejb.EntityBean implementation =================*/ - - public void ejbActivate() { - // Nothing to be done for this simple example. - } - - public void ejbLoad() { - // Nothing to be done for this simple example, in implicit persistence. - } - - public void ejbPassivate() { - // Nothing to be done for this simple example. - } - - public void ejbRemove() throws RemoveException { - // Nothing to be done for this simple example, in implicit persistence. - } - - public void ejbStore() { - // Nothing to be done for this simple example, in implicit persistence. - } - - public void setEntityContext(EntityContext ctx) { - - // Keep the entity context in object - entityContext = ctx; - } - - public void unsetEntityContext() { - entityContext = null; - } - - /** - * Business method to get the Account number - */ - public int getNumber() { - return getAccno(); - } -} - -
    -
    -
    - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/entity_tuning.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/entity_tuning.xml deleted file mode 100644 index 8c16e0f2a5754d50a857f36f63a6f3c93491febd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/entity_tuning.xml +++ /dev/null @@ -1,352 +0,0 @@ - -
    Tuning EJB 2.1 entity beans - - - - JOnAS must make a compromise between scalability and performance. For that reason, several tags in the JOnAS-specific deployment descriptor have been introduced. For most applications, there is no need to change the default values for all these tags. See - - $JONAS_ROOT/xml/jonas-ejb-jar_4_7.xsd - - for a complete description of the JOnAS-specific deployment descriptor. - - - Note that if several of these elements are used, they should appear in the following order within the <jonas-entity> element: - - - is-modified-method-name - - - passivation-timeout - - - read-timeout - - - max-wait-time - - - inactivity-timeout - - - deadlock-timeout - - - shared - - - prefetch - - - hard-limit - - - max-cache-size - - - min-pool-size - - - cleanup - - - lock-policy - - - -
    lock-policy - - The JOnAS ejb container is able to manage seven different lock-policies: - - - container-serialized (default) - - - The container ensures the transaction serialization. This policy is suitable for entity beans having non transacted methods that can modify the bean state. It works only if the bean is accessed from 1 jonas server (shared = false). - - - container-serialized-transacted - - - The container ensures the transaction serialization. This policy is suitable for most entity beans. - - - container-read-committed - - - This policy is similar to container-serialized-transacted, except that accesses outside transaction do not interfere with transactional accesses. This can help to avoid deadlocks in certain cases, when accessing a bean concurrently with and without a transactional context. The only drawback of this policy is that it consumes more memory (2 instances instead of 1). - - - container-read-uncommitted (deprecated) - - - All methods share the same instance (like container-serialized), but there is no synchronization. For example, this policy is of interest for read-only entity beans, or if the bean instances are very rarely modified. It will fail if two or more threads try to modify the same instance concurrently. This policy is deprecated because it can be replaced by - - container-read-write - - . - - - database - - - Allow the database to handle the transaction isolation. With this policy, it is possible to choose the transaction isolation in a database. This may be of interest for applications that heavily use transactional read-only operations, or when the flag shared is needed. It does not work with all databases and is not memory efficient. - - - read-only - - - The bean state is never written to the database. If the bean is - - shared - - , the bean state is read from the database regularly. Use the - - read-timeout - - tag to specify the timeout value. - - - container-read-write - - - All methods share the same instance (like container-serialized). A synchronization is done only when the instance is modified. No lock is taken while the instance is read only. This policy does not work if the bean is - - shared - - , nor does it work for CMP 1.x beans. - - - - Important: If CMP1 beans are deployed, only the following policies should be used: - - - container-serialized - - - container-serialized-transacted - - - read-only - - - container-read-committed - - - database, but only with shared=true. - - - -
    -
    shared - - This flag will be defined as - - true - - if the bean persistent state can be accessed outside the JOnAS Server. When this flag is - - false - - , the JOnAS Server can do some optimization, such as not re-reading the bean state before starting a new transaction. The default value depends on the lock-policy: - - - - false - - for - - container-serialized - - , - - container-read-uncommitted - - or - - container-read-write - - . For these 3 policies, shared=false is mandatory. - - - - true - - in the other cases. - - - - Lock policy - - database - - works only if shared=true. -
    -
    prefetch - - This is a CMP2-specific option. The default is false. This can be set to true if it is desirable to have a cache managed after finder methods execution, in order to optimize further accesses inside the same transaction. - - Important note: - - - - The prefetch will not be used for methods that have no transactional context. - - - It is impossible to set the prefetch option if the lock policy is container-read-uncommitted. - - -
    -
    max-cache-size / hard-limit / max-wait-time - - This optional integer value represents the maximum number of instances in memory. The purpose of this value is to keep JOnAS scalable. The default value is "no limit". To save memory, this value should be set very low if it is known that instances will not be reused. Depending on whether - - hard-limit - - value is - - true - - or - - false - - , this - - max-cache-size - - value will be overtaken or not: In the case of - - hard-limit - - = - - true - - , the container will never allocate more instances than the - - max-cache-size - - value. When the limit is reached, the thread will be set to waiting until instances are released. It is possible to specify the maximum time to wait for an instance with the tag - - max-wait-time - - . The default is 0, which means "no wait". -
    -
    min-pool-size - - This optional integer value represents the number of instances that will be created in the pool when the bean is loaded. This will improve bean instance create time, at least for the first instances. The default value is 0. When passivation occurs, for example if there are too many instances in memory, instances are released and placed in the pool only if min-pool-size is not reached. The intent is to try to keep at least min-pool-size instances in the pool of available instances. -
    -
    is-modified-method-name - - To improve performance of CMP 1.1 entity beans, JOnAS implements the isModified extension. Before performing an update, the container calls a method of the bean whose name is identified in the - - is-modified-method-name - - element of the JOnAS-specific deployment descriptor. This method is responsible for determining if the state of the bean has been changed. By doing this, the container determines if it must store data in the database or not. - - This is useless with CMP2 entity beans, since this will be done automatically by the container. - -
    Example - - - The bean implementation manages a boolean - - isDirty - - and implements a method that returns the value of this boolean: - - isModified - - - - private transient boolean isDirty; - public boolean isModified() { - return isDirty; - } - - - The JOnAS-specific deployment descriptor directs the bean to implement an - - isModified - - method: - - - - <jonas-entity> - <ejb-name>Item</ejb-name> - <is-modified-method-name>isModified</is-modified-method-name> - ..... - </jonas-entity> - - - Methods that modify the value of the bean must set the flag - - isDirty - - to - - true - - . - Methods that restore the value of the bean from the database must reset the flag - - isDirty - - to - - false - - . Therefore, the flag must be set to - - false - - in the - - ejbLoad() - - and - - ejbStore() - - methods. - -
    -
    -
    passivation-timeout - - This flag is used only when lock-policy = container-serialized. When instances are accessed outside of any transaction, their state is kept in memory to improve performance. However, a passivation will occur in three situations: - - - When the bean is unloaded from the server, at least when the server is stopped. - - - When a transaction is started on this instance. - - - After a configurable timeout: passivation-timeout. If the bean is always accessed with no transaction, it may be prudent to periodically store the bean state on disk. - - - - This passivation timeout can be configured in the JOnAS-specific deployment descriptor, with the non-mandatory tag <passivation-timeout>. - Example: - - <jonas-entity> - <ejb-name>Item</ejb-name> - <passivation-timeout>5</passivation-timeout> - ..... - </jonas-entity> - - - This entity bean will be passivated every five second, if not accessed within transactions. - -
    -
    read-timeout - - This flag is used only when lock-policy = read-only. In case shared=true has been set, it is important to synchronize the bean state by reading it periodically from the storage. This is configurable with the read-timeout flag. Value is in seconds. -
    -
    inactivity-timeout - - Bean passivation sends the state of the bean to persistent storage and removes from memory only the bean instance objects that are holding this state. All container objects handling bean access (remote object, interceptors, ...) are kept in memory so that future access will work, requiring only a reload operation (getting the state). It may be advantageous to conserve more memory and completely remove the bean instance from memory; this can be achieved through the <inactivity-timeout> element. This element is used to save memory when a bean has not been used for a long period of time. If the bean has not been used after the specified time (in seconds), all its container objects are removed from the server. If a client has kept a reference on a remote object and tries to use it, then the client will receive an exception. -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/environment.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/environment.xml deleted file mode 100644 index 295ffd99c7db2b36ea92df0b58eb6ccfba79d6a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/environment.xml +++ /dev/null @@ -1,243 +0,0 @@ - -
    - - EJB2 Environment - -
    Introduction - - - The enterprise bean environment is a mechanism that allows customization of the enterprise bean's business logic during assembly or deployment. The environment is a way for a bean to refer to a value, to a resource, or to another component so that the code will be independent of the actual referred object. The actual value of such environment references (or variables) is set at deployment time, according to what is contained in the deployment descriptor. The enterprise bean's environment allows the enterprise bean to be customized without the need to access or change the enterprise bean's source code. - - - The enterprise bean environment is provided by the container (i.e. the JOnAS server) to the bean through the JNDI interface as a JNDI context. The bean code accesses the environment using JNDI with names starting with "java:comp/env/". - -
    -
    Environment Entries - - - The bean provider declares all the bean environment entries in the deployment descriptor via the - env-entry - element. The deployer can set or modify the values of the environment entries. - - - A bean accesses its environment entries with a code similar to the following: - - - InitialContext ictx = new InitialContext(); - Context myenv = ictx.lookup("java:comp/env"); - Integer min = (Integer) myenv.lookup("minvalue"); - Integer max = (Integer) myenv.lookup("maxvalue"); - - - In the standard deployment descriptor, the declaration of these variables are as follows: - - - <env-entry> - <env-entry-name>minvalue</env-entry-name> - <env-entry-type>java.lang.Integer</env-entry-type> - <env-entry-value>12</env-entry-value> - </env-entry> - <env-entry> - <env-entry-name>maxvalue</env-entry-name> - <env-entry-type>java.lang.Integer</env-entry-type> - <env-entry-value>120</env-entry-value> - </env-entry> - -
    -
    Resource References - - - The resource references are another examples of environment entries. For such entries, using subcontexts is recommended: - - - - java:comp/env/jdbc - for references to DataSources objects. - - - java:comp/env/jms - for references to JMS connection factories. - - - - In the standard deployment descriptor, the declaration of a resource reference to a JDBC connection factory is: - - - <resource-ref> - <res-ref-name>jdbc/AccountExplDs</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - </resource-ref> - - - And the bean accesses the datasource as in the following: - - - InitialContext ictx = new InitialContext(); - DataSource ds = ictx.lookup("java:comp/env/jdbc/AccountExplDs"); - - - Binding of the resource references to the actual resource manager connection factories that are configured in the EJB server is done in the JOnAS-specific deployment descriptor using the - jonas-resource - element. - - - <jonas-resource> - <res-ref-name>jdbc/AccountExplDs</res-ref-name> - <jndi-name>jdbc_1</jndi-name> - </jonas-resource> - -
    -
    Resource Environment References - - - The resource environment references are another example of environment entries. They allow the Bean Provider to refer to administered objects that are associated with resources (for example, JMS Destinations), by using - logical - names. Resource environment references are defined in the standard deployment descriptor. - - - <resource-env-ref> - <resource-env-ref-name>jms/stockQueue</resource-env-ref-name> - <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type> - </resource-env-ref> - - - Binding of the resource environment references to administered objects in the target operational environment is done in the JOnAS-specific deployment descriptor using the - jonas-resource-env - element. - - <jonas-resource-env> - <resource-env-ref-name>jms/stockQueue</resource-env-ref-name> - <jndi-name>myQueue<jndi-name> - </jonas-resource-env> - -
    -
    EJB References - - - The EJB reference is another special entry in the enterprise bean's environment. EJB references allow the Bean Provider to refer to the homes of other enterprise beans using - logical - names. For such entries, using the subcontext - java:comp/env/ejb - is recommended. - - - The declaration of an EJB reference used for accessing the bean through its - remote - home and component interfaces in the standard deployment descriptor is shown in the following example: - - - <ejb-ref> - <ejb-ref-name>ejb/ses1</ejb-ref-name> - <ejb-ref-type>session</ejb-ref-type> - <home>tests.SS1Home</home> - <remote>tests.SS1</remote> - </ejb-ref> - - - The declaration of an EJB reference used for accessing the bean through its - local - home and component interfaces in the standard deployment descriptor is shown in the following example: - - - <ejb-local-ref> - <ejb-ref-name>ejb/locses1</ejb-ref-name> - <ejb-ref-type>session</ejb-ref-type> - <local-home>tests.LocalSS1Home</local-home> - <local>tests.LocalSS1</local> - <ejb-link>LocalBean</ejb-link> - </ejb-local-ref> - - - Local interfaces are available in the same JVM as the bean providing this interface. The use of these interfaces also implies that the classloader of the component performing a lookup (bean or servlet component) is a child of the EJB classloader providing the local interface. - Local interfaces, then, are not available to outside WARs or outside EJB-JARs even if they run in the same JVM. This is due to the fact that classes of the local interfaces are not visible on the client side. Putting them under the WEB-INF/lib folder of a WAR would not change anything as the two classes would be loaded by different classloaders, which will throw a "ClassCastException". - - - To summarize, local interfaces are available only for - - - beans in a same ejb jar file. - - - from servlets to beans or ejbs to ejbs but in the same ear file. - - - - - If the referred bean is defined in the same ejb-jar or EAR file, the optional - ejb-link - element of the ejb-ref element can be used to specify the actual referred bean. The value of the ejb-link element is the name of the target enterprise bean, i.e. the name defined in the ejb-name element of the target enterprise bean. If the target enterprise bean is in the same EAR file, but in a different ejb-jar file, the name of the ejb-link element may be the name of the target bean, prefixed by the name of the containing ejb-jar file followed by '#' (e.g. "My_EJBs.jar#bean1"); prefixing by the name of the ejb-jar file is necessary only if some ejb-name conflicts occur, otherwise the name of the target bean is enough. In the following example, the ejb-link element has been added to the ejb-ref (in the referring bean SSA) and a part of the description of the target bean (SS1) is shown: - - - <session> - <ejb-name>SSA</ejb-name> - ... - <ejb-ref> - <ejb-ref-name>ejb/ses1</ejb-ref-name> - <ejb-ref-type>session</ejb-ref-type> - <home>tests.SS1Home</home> - <remote>tests.SS1</remote> - <ejb-link>SS1</ejb-link> - </ejb-ref> - ... - </session> - ... - <session> - <ejb-name>SS1</ejb-name> - <home>tests.SS1Home</home> - <local-home>tests.LocalSS1Home</local-home> - <remote>tests.SS1</remote> - <local>tests.LocalSS1</local> - <ejb-class>tests.SS1Bean</ejb-class> - ... - </session> - ... - - - If the bean SS1 was not in the same ejb-jar file as SSA, but in another file named product_ejbs.jar, the ejb-link element could have been: - - - <ejb-link>product_ejbs.jar#SS1</ejb-link> - - - If the referring component and the referred bean are in separate files and not in the same EAR, the current JOnAS implementation does not allow use of the ejb-link element. In this case, to resolve the reference, the - jonas-ejb-ref - element in the JOnAS-specific deployment descriptor would be used to bind the environment JNDI name of the EJB reference to the actual JNDI name of the associated enterprise bean home. In the following example, it is assumed that the JNDI name of the SS1 bean home is SS1Home_one. - - - <jonas-session> - <ejb-name>SSA</ejb-name> - <jndi-name>SSAHome</jndi-name> - <jonas-ejb-ref> - <ejb-ref-name>ejb/ses1</ejb-ref-name> - <jndi-name>SS1Home_one</jndi-name> - </jonas-ejb-ref> - </jonas-session> - ... - <jonas-session> - <ejb-name>SS1</ejb-name> - <jndi-name>SS1Home_one</jndi-name> - <jndi-local-name>SS1LocalHome_one</jndi-local-name> - </jonas-session> - ... - - - The bean locates the home interface of the other enterprise bean using the EJB reference with the following code: - - - InitialContext ictx = new InitialContext(); - Context myenv = ictx.lookup("java:comp/env"); - SS1Home home = (SS1Home)javax.rmi.PortableRemoteObject.narrow(myEnv.lookup("ejb/ses1"), SS1Home.class); - -
    - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/mdb.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/mdb.xml deleted file mode 100644 index dcc0d101330bfb9527983554af9bc0188e74aab8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/mdb.xml +++ /dev/null @@ -1,695 +0,0 @@ - -
    - - EJB Programmer's Guide: Message-drivenBeans - - - The EJB 2.1 specification defines a new kind of EJB component for - receiving asynchronous messages. This implements some type of "asynchronous - EJB component method invocation" mechanism. The Message-driven Bean (also - referred to as MDB in the following) is an Enterprise JavaBean, not an Entity - Bean or a Session Bean, which plays the role of a JMS MessageListener. - - - The EJB 2.1 specification contains detailed information about MDB. The Java - Message Service Specification 1.1 contains detailed information about JMS. - This chapter focuses on the use of Message-driven beans within the JOnAS - server. - -
    Description of a Message-driven Bean - - A Message-driven Bean is an EJB component that can be considered as a JMS MessageListener, i.e., processing JMS messages asynchronously; it implements the - onMessage(javax.jms.Message) - method, defined in the - javax.jms.MessageListener - interface. It is associated with a JMS destination, i.e., a Queue for "point-to-point" messaging or a Topic for "publish/subscribe." The - onMessage - method is activated on receipt of messages sent by a client application to the corresponding JMS destination. It is possible to associate a JMS message selector to filter the messages that the Message-driven Bean should receive. - - JMS messages do not carry any context, thus the - onMessage - method will execute without pre-existing transactional context. However, a new transaction can be initiated at this moment (refer to the - section for more details). The - onMessage - method can call other methods on the MDB itself or on other beans, and can involve other resources by accessing databases or by sending messages. Such resources are accessed the same way as for other beans (entity or session), i.e., through resource references declared in the deployment descriptor. - - - The JOnAS container maintains a pool of MDB instances, allowing large - volumes of messages to be processed concurrently. An MDB is similar in some - ways to a stateless session bean: its instances are relatively short-lived, - it retains no state for a specific client, and several instances may be - running at the same time. - -
    - -
    Developing a Message-drivenBean - - - The MDB class must implement the - javax.jms.MessageListener - and the - javax.ejb.MessageDrivenBean - interfaces. In addition to the - onMessage - method, the following must be implemented: - - - - A public constructor with no argument. - - - public void ejbCreate() - : with no arguments, called at the bean instantiation time. It may be used to allocate some resources, such as connection factories, for example if the bean sends messages, or datasources or if the bean accesses databases. - - - public void ejbRemove() - : usually used to free the resources allocated in the ejbCreate method. - - - public void setMessageDrivenContext(MessageDrivenContext mdc) - : called by the container after the instance creation, with no transaction context. The JOnAS container provides the bean with a container context that can be used for transaction management, e.g., for calling - setRollbackOnly(), getRollbackOnly(), getUserTransaction() - . - - - - The following is an example of an MDB class: - - - - public class MdbBean implements MessageDrivenBean, MessageListener { - - private transient MessageDrivenContext mdbContext; - - public MdbBean() {} - - public void setMessageDrivenContext(MessageDrivenContext ctx) { - mdbContext = ctx; - } - - public void ejbRemove() {} - - public void ejbCreate() {} - - public void onMessage(Message message) { - try { - TextMessage mess = (TextMessage)message; - System.out.println( "Message received: "+mess.getText()); - }catch(JMSException ex){ - System.err.println("Exception caught: "+ex); - } - } - } - - - - The destination associated to an MDB is specified in the deployment - descriptor of the bean. A destination is a JMS-administered object, - accessible via JNDI. The description of an MDB in the EJB 2.0 deployment - descriptor contains the following elements, which are specific to MDBs: - - - - the JMS acknowledgment mode: auto-acknowledge or dups-ok-acknowledge - (refer to the JMS specification for the definition of these modes) - - - an eventual JMS message selector: this is a JMS concept which allows - the filtering of the messages sent to the destination - - - a message-driven-destination, which contains the destination type - (Queue or Topic) and the subscription durability (in case of Topic) - - - - The following example illustrates such a deployment descriptor: - - - <enterprise-beans> - <message-driven> - <description>Describe here the message driven bean Mdb</description> - <display-name>Message Driven Bean Mdb</display-name> - <ejb-name>Mdb</ejb-name> - <ejb-class>samplemdb.MdbBean</ejb-class> - <transaction-type>Container</transaction-type> - <message-selector>Weight >= 60.00 AND LName LIKE 'Sm_th'</message-selector> - <message-driven-destination> - <destination-type>javax.jms.Topic</destination-type> - <subscription-durability>NonDurable</subscription-durability> - </message-driven-destination> - <acknowledge-mode>Auto-acknowledge</acknowledge-mode> - </message-driven> - </enterprise-beans> - - - - If the transaction type is "container," the transactional behavior of the - MDB's methods are defined as for other enterprise beans in the deployment - descriptor, as in the following example: - - - <assembly-descriptor> - <container-transaction> - <method> - <ejb-name>Mdb</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>Required</trans-attribute> - </container-transaction> - </assembly-descriptor> - - - - For the onMessage method, only the Required or NotSupported - transaction attributes must be used, since there can be no pre-existing transaction context. - - - For the message selector specified in the previous example, the sent JMS - messages are expected to have two properties, "Weight" and "LName," for - example assigned in the JMS client program sending the messages, as - follows: - - - message.setDoubleProperty("Weight",75.5); - message.setStringProperty("LName","Smith"); - - - Such a message will be received by the Message-driven bean. The message - selector syntax is based on a subset of the SQL92. Only messages whose - headers and properties match the selector are delivered. Refer to the JMS - specification for more details. - - - The JNDI name of a destination associated with an MDB is defined in the - JOnAS-specific deployment descriptor, within a - jonas-message-driven - element, as illustrated in the following: - - - <jonas-message-driven> - <ejb-name>Mdb</ejb-name> - <jonas-message-driven-destination> - <jndi-name>sampleTopic</jndi-name> - </jonas-message-driven-destination> - </jonas-message-driven> - - - - Once the destination is established, a client application can send - messages to the MDB through a destination object obtained via JNDI as - follows: - - - - Queue q = context.lookup("sampleTopic"); - - - - If the client sending messages to the MDB is an EJB component itself, it - is preferable that it use a resource environment reference to obtain the - destination object. The use of resource environment references is described - in the JMS User's Guide - (Writing JMS operations within an application component / - Accessing the destination object section). - -
    - -
    Administration aspects - - - It is assumed at this point that the JOnAS server will make use of an - existing JMS implementation, e.g., Joram, SwiftMQ. - - - - The default policy is that the MDB developer and deployer are not - concerned with JMS administration. This means that the developer/deployer - will not create or use any JMS Connection factories and will not create a JMS - destination (which is necessary for performing JMS operations within an EJB - component, refer to the JMS User's Guide); they will simply define the type of - destination in the deployment descriptor and identify its JNDI name in the - JOnAS-specific deployment descriptor, as described in the previous section. - This means that JOnAS will implicitly create the necessary administered - objects by using the proprietary administration APIs of the JMS - implementation (since the administration APIs are not standardized). To - perform such administration operations, JOnAS uses wrappers to the JMS - provider administration API. For Joram, the wrapper is - - org.objectweb.jonas_jms.JmsAdminForJoram - (which is the default wrapper - class defined by the - jonas.service.jms.mom - property in the - - jonas.properties - file). For SwiftMQ, a - - com.swiftmq.appserver.jonas.JmsAdminForSwiftMQ - class can be obtained - from the - - SwiftMQ - - site. - - - For the purpose of this implicit administration phase, the deployer must - add the 'jms' service in the list of the JOnAS services. For the example - provided, the jonas.properties file should contain the following: - - -// The jms service must be added -jonas.services registry,security,jtm,dbm,jms,ejb -jonas.service.ejb.descriptors samplemdb.jar -jonas.service.jms.topics sampleTopic // not mandatory - - - The destination objects may or may not pre-exist. The EJB server will not - create the corresponding JMS destination object if it already exists. (Refer - also to the JMS administration guide). The - - sampleTopic - - should be explicitly - declared only if the JOnAS Server is going to create it first, even if the - Message-driven bean is not loaded, or if it is used by another client before - the Message-driven bean is loaded. In general, it is not necessary to declare - the - - sampleTopic - - . - - - JOnAS uses a - pool of threads - for executing Message-driven - bean instances on message reception, thus allowing large volumes of messages - to be processed concurrently. As previously explained, MDB instances are - stateless and several instances may execute concurrently on behalf of the - same MDB. The default size of the pool of thread is 10, and it may be - customized via the jonas property - - jonas.service.ejb.mdbthreadpoolsize - , which is specified in - the - jonas.properties - file as in the following example: - - - jonas.service.ejb.mdbthreadpoolsize 50 - - -
    - -
    Running a Message-driven Bean - - - To deploy and run a Message-driven Bean, perform the following steps: - - - - Verify that a registry is running. - - - - Start the Message-Oriented Middleware (the JMS provider - implementation). Refer to the section " - ." - - - - - Create and register in JNDI the JMS destination object that will be - used by the MDB. - - - This can be done automatically by the JMS service or explicitly by the - proprietary administration facilities of the JMS provider (See JMS administration). - The JMS service creates the destination object if - this destination is declared in the - jonas.properties - file (as specified in the previous section). - - - - - Deploy the MDB component in JOnAS. - - - Note that, if the destination object is not already created when - deploying an MDB, the container asks the JMS service to create it based - on the deployment descriptor content. - - - - Run the EJB client application. - - - Stop the application. - - - When using JMS, it is very important to stop JOnAS using the - - jonas stop - command; it should not be stopped directly by - killing it. - - - - -
    Launching the Message-OrientedMiddleware - - - If the configuration property - jonas.services - contains the jms service, then the JOnAS JMS service will be launched and may try to launch a JMS implementation (a MOM). - - - For launching the MOM, three possibilities can be considered: - - - - - Launching the MOM in the same JVM as JOnAS - - - This is the default situation obtained by assigning the - - true - - value to the configuration property - jonas.service.jms.collocated - in the - jonas.properties - file. - - - // The jms service must be in the list - jonas.services security,jtm,dbm,jms,ejb - jonas.service.jms.collocated true - - - In this case, the MOM is automatically launched by the JOnAS JMS service at the JOnAS launching time (command - - jonas start - - ). - - - - - Launching the MOM in a separate JVM - - - The Joram MOM can be launched using the command: - - - - JmsServer - - - - For other MOMs, the proprietary command should be used. - - - The configuration property - jonas.service.jms.collocated - must be set to - - false - - in the - jonas.properties - file. Setting this property is sufficient if the JORAM's JVM runs on the same host as JONAS, and if the MOM is launched with its default options (unchanged - a3servers.xml - configuration file under JONAS_BASE/conf or JONAS_ROOT/conf if JONAS_BASE not defined). - - -// The jms service must be in the list -jonas.services security,jtm,dbm,jms,ejb -jonas.service.jms.collocated false - - - To use a specific configuration for the MOM, such as changing the default host (which is localhost) or the default connection port number (which is 16010), requires defining the additional - jonas.service.jms.url - configuration property as presented in the following case. - - - - - Launching the MOM on another host - - - This requires defining the - jonas.service.jms.url - configuration property. When using Joram, its value should be the Joram URL - - joram://host:port - - where - - host - - is the host name, and - - port - - is the connection port (by default, 16010). For SwiftMQ, the value of the URL is similar to the following: - - smqp://host:4001/timeout=10000 - - . - - -// The jms service must be in the list -jonas.services security,jtm,dbm,jms,ejb -jonas.service.jms.collocated false -jonas.service.jms.url joram://host2:16010 - - - - - - - - Change Joram default configuration - - - As mentioned previously, the default host or default connection port number may need to be changed. This requires modifying the - a3servers.xml - configuration file provided by the JOnAS delivery in JONAS_ROOT/conf directory. For this, JOnAS must be configured with the property - jonas.service.jms.collocated - set to - - false - - , and the property - jonas.service.jms.url - set to - - joram://host:port - - . Additionally, the MOM must have been previously launched with the JmsServer command. This command defines a - - Transaction - - property set to - - fr.dyade.aaa.util.NullTransaction - - . If the messages need to be persistent, replace the - - -DTransaction=fr.dyade.aaa.util.NullTransaction - - option with the - - -DTransaction=fr.dyade.aaa.util.NTransaction - - option. Refer to the Joram documentation for more details about this command. To define a more complex configuration (e.g., distribution, multi-servers), refer to the Joram documentation on - - http://joram.objectweb.org - - . - - - -
    -
    - -
    Transactional aspects - - - - Because a transactional context cannot be carried by a message (according to - the EJB 2.0 specification), an MDB will never execute within an existing - transaction. However, a transaction may be started during the onMessage - method execution, either due to a "required" transaction attribute - (container-managed transaction) or because it is explicitly started within - the method (if the MDB is bean-managed transacted). In the second case, the - message receipt will not be part of the transaction. In the first case, - container-managed transaction, the container will start a new transaction - before de-queueing the JMS message (the receipt of which will, thus, be part - of the started transaction), then enlist the resource manager associated with - the arriving message and all the resource managers accessed by the onMessage - method. If the onMessage method invokes other enterprise beans, the container - passes the transaction context with the invocation. Therefore, the - transaction started at the - onMessage - method execution may involve - several operations, such as accessing a database (via a call to an entity - bean, or by using a "datasource" resource), or sending messages (by using a - "connection factory" resource). - - - -
    - -
    Example - - - JOnAS provides examples that are located in the - examples/src/mdb - install directory. - samplemdb - is a very simple example, the code of which is used in the previous topics for illustrating how to use Message-driven beans. - sampleappli - is a more complex example that shows how the sending of JMS messages and updates in a database via JDBC may be involved in the same distributed transaction. - The following figure illustrates the architecture of this example application. - - - - - - - - There are two Message-driven beans in this example: - - - - - StockHandlerBean - - is a Message-driven bean listening to a topic and receiving Map messages. The - - onMessage - - method runs in the scope of a transaction started by the container. It sends a Text message on a Queue (OrdersQueue) and updates a Stock element by decreasing the stock quantity. If the stock quantity becomes negative, an exception is received and the current transaction is marked for rollback. - - - - - OrderBean - - is another Message-driven bean listening on the OrdersQueue Queue. On receipt of a Text message on this queue, it writes the corresponding String as a new line in a file ("Order.txt"). - - - - - The example also includes a CMP entity bean - - Stock - - that handles a stock table. - - - A Stock item is composed of a Stockid (String), which is the primary key, and a Quantity (int). The method decreaseQuantity(int qty) decreases the quantity for the corresponding stockid, but can throw a RemoteException "Negative stock." - - - The client application - - SampleAppliClient - - is a JMS Client that sends several messages on the topic - StockHandlerTopic - . It uses Map messages with three fields: "CustomerId," "ProductId," "Quantity." Before sending messages, this client calls the - - EnvBean - - for creating the - StockTable - in the database with known values in order to check the results of updates at the end of the test. Eleven messages are sent, the corresponding transactions are committed, and the last message sent causes the transaction to be rolled back. - -
    Compiling this example - - - To compile - - examples/src/mdb/sampleappli - - , use - Ant - with the - - $JONAS_ROOT/examples/src/build.xml - - file. - -
    -
    Running this example - - - The default configuration of the JMS service in - - jonas.properties - - is the following: - - -// The jms service must be added -jonas.services jmx,security,jtm,dbm,jms,ejb -jonas.service.ejb.descriptors sampleappli.jar -jonas.service.jms.topics StockHandlerTopic -jonas.service.jms.queues OrdersQueue -jonas.service.jms.collocated true - - - This indicates that the JMS Server will be launched in the same JVM as the JOnAS Server, and the JMS-administered objects - - StockHandlerTopic - - (Topic) and - - OrdersQueue - - (Queue) will be created and registered in JNDI, if not already existing. - - - - Run the JOnAS Server. - -jonas start - - - - Deploy the sampleappli container. - -jonas admin -a sampleappli.jar - - - - Run the EJB client. - -jclient sampleappli.SampleAppliClient - - - - Stop the server. - -jonas stop - - - -
    -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/mdb_tuning.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/mdb_tuning.xml deleted file mode 100644 index cda9a399a4cbeb09f42fb5b77192e63c8378b179..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/mdb_tuning.xml +++ /dev/null @@ -1,73 +0,0 @@ - -
    - - Tuning Message-driven Bean Pool - - A pool is handled by JOnAS for each Message-driven bean. The pool can be configured in the JOnAS-specific deployment descriptor with the following tags: -
    min-pool-size - - This optional integer value represents the minimum instances that will be created in the pool when the bean is loaded. This will improve bean instance creation time, at least for the first beans. The default value is 0. -
    -
    max-cache-size - - This optional integer value represents the maximum number of instances of - ServerSession - that may be created in memory. The purpose of this value is to keep JOnAS scalable. The policy is the following: - When the - ConnectionConsumer - ask for a - ServerSession - instance (in order to deliver a new message) JOnAS tries to give an instance from the - ServerSessionPool - . If the pool is empty, a new instance is created only if the number of yet created instances is smaller than the max-cache-size parameter. When the max-cache-size is reached, the - ConnectionConsumer - is blocked and it cannot deliver new messages until a - ServerSession - is eventually returned in the pool. A - ServerSession - is pushed into the pool at the end of the - onMessage - method. - The default value is no limit (this means that a new instance of - ServerSession - is always created when the pool is empty). - - The values for - - max-cache-size - - should be set accordingly to - - jonas.service.ejb.maxworkthreads - - value. See - - Configuring JMS Service - - . - -
    -
    example - - - <jonas-ejb-jar> - <jonas-message-driven> - <ejb-name>Mdb</ejb-name> - <jndi-name>mdbTopic</jndi-name> - <max-cache-size>20</max-cache-size> - <min-pool-size>10</min-pool-size> - </jonas-message-driven> - </jonas-ejb-jar> - - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/packaging.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/packaging.xml deleted file mode 100644 index 8c8ce675701e9d88d73b22371a9364ffca44cce5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/packaging.xml +++ /dev/null @@ -1,80 +0,0 @@ - -
    - - EJB2 Packaging - -
    Principles - - - Enterprise Beans are packaged for deployment in a standard Java programming language Archive file, called an - ejb-jar - file. This file must contain the following: - - - - - The beans' class files - - - The class files of the remote and home interfaces, of the beans' implementations, of the beans' primary key classes (if there are any), and of all necessary classes. - - - - - The beans' deployment descriptor - - - The ejb-jar file must contain the deployment descriptors, which are made up of: - - - The standard xml deployment descriptor, in the format defined in the EJB 2.1 specification. Refer to - - $JONAS_ROOT/xml/ejb-jar_2_1.xsd - - or - - http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd - - . This deployment descriptor must be stored with the name - META-INF/ejb-jar.xml - in the ejb-jar file. - - - The JOnAS-specific XML deployment descriptor in the format defined in - $JONAS_ROOT/xml/jonas-ejb-jar_X_Y.xsd - . This JOnAS deployment descriptor must be stored with the name - META-INF/jonas-ejb-jar.xml - in the ejb-jar file. - - - - - -
    -
    Example - - - Before building the ejb-jar file of the Account entity bean example, the java source files must be compiled to obtain the class files and the two XML deployment descriptors must be written. - - - Then, the ejb-jar file (OpEB.jar) can be built using the - jar - command: - - - cd your_bean_class_directory - mkdir META-INF - cp .../eb/*.xml META-INF - jar cvf OpEB.jar sb/*.class META-INF/*.xml - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/security.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/security.xml deleted file mode 100644 index 6642e9544d189e70c01706597f1f589192908a43..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/security.xml +++ /dev/null @@ -1,302 +0,0 @@ - -
    Security Management - -
    Introduction - - - The EJB architecture encourages the Bean programmer to implement the enterprise bean class without hard-coding the security policies and mechanisms into the business methods. - -
    -
    Declarative Security Management - - - The application assembler can define a - security view - of the enterprise beans contained in the ejb-jar file. - The security view consists of a set of - security roles - . A security role is a semantic grouping of permissions for a given type of application user that allows that user to successfully use the application. - The application assembler can define (declaratively in the deployment descriptor) - method permissions - for each security role. A method permission is a permission to invoke a specified group of methods for the enterprise beans' home and remote interfaces. - The security roles defined by the application assembler present this simplified security view of the enterprise beans application to the deployer; the deployer's view of security requirements for the application is the small set of security roles, rather than a large number of individual methods. - -
    Security roles - - - The application assembler can define one or more - security roles - in the deployment descriptor. The application assembler then assigns groups of methods of the enterprise beans' home and remote interfaces to the security roles in order to define the security view of the application. - - - The scope of the security roles defined in the - - security-role - - elements is the ejb-jar file level, and this includes all the enterprise beans in the ejb-jar file. - - - ... - <assembly-descriptor> - <security-role> - <role-name>tomcat</role-name> - </security-role> - ... - </assembly-descriptor> - -
    -
    Method permissions - - - After defining security roles for the enterprise beans in the ejb-jar file, the application assembler can also specify the methods of the remote and home interfaces that each security role is allowed to invoke. - - - Method permissions are defined as a binary relationship in the deployment descriptor from the set of security roles to the set of methods of the home and remote interfaces of the enterprise beans, including all their super interfaces (including the methods of the - - javax.ejb.EJBHome - - and - - javax.ejb.EJBObject - - interfaces). The method permissions relationship includes the pair - (R, M) - only if the security role - R - is allowed to invoke the method - M - . - - - The application assembler defines the method permissions relationship in the deployment descriptor using the - - method-permission - - element as follows: - - - - Each - - method-permission - - element includes a list of one or more security roles and a list of one or more methods. All the listed security roles are allowed to invoke all the listed methods. Each security role in the list is identified by the - - role-name - - element, and each method is identified by the - - method - - element. - - - The method permissions relationship is defined as the union of all the method permissions defined in the individual - - method-permission - - elements. - - - A security role or a method can appear in multiple - - method-permission - - elements. - - - - It is possible that some methods are not assigned to any security roles. This means that these methods can be accessed by anyone. - - - The following example illustrates how security roles are assigned to methods' permissions in the deployment descriptor: - - - ... - <method-permission> - <role-name>tomcat</role-name> - <method> - <ejb-name>Op</ejb-name> - <method-name>*</method-name> - </method> - </method-permission> - ... - -
    -
    -
    Programmatic Security Management - - - Because not all security policies can be expressed declaratively, the EJB architecture also provides a simple programmatic interface that the Bean programmer can use to access the security context from the business methods. - - - The - - javax.ejb.EJBContext - - interface provides two methods that allow the Bean programmer to access security information about the enterprise bean's caller. - - -public interface javax.ejb.EJBContext { - ... - // - // The following two methods allow the EJB class - // to access security information - // - java.security.Principal getCallerPrincipal() ; - boolean isCallerInRole (String roleName) ; - ... -} - -
    Use of getCallerPrincipal() - - - The purpose of the - - getCallerPrincipal() - - method is to allow the enterprise bean methods to obtain the current caller principal's name. The methods might, for example, use the name as a key to access information in a database. - - - An enterprise bean can invoke the - - getCallerPrincipal() - - method to obtain a - - java.security.Principal - - interface representing the current caller. The enterprise bean can then obtain the distinguished name of the caller principal using the - - getName() - - method of the - - java.security.Principal - - interface. - -
    -
    Use of isCallerInRole(String roleName) - - - The main purpose of the - - isCallerInRole(String roleName) - - method is to allow the Bean programmer to code the security checks that cannot be easily defined declaratively in the deployment descriptor using method permissions. Such a check might impose a role-based limit on a request, or it might depend on information stored in the database. - - - The enterprise bean code uses the - - isCallerInRole(String roleName) - - method to test whether the current caller has been assigned to a given security role or not. Security roles are defined by the application assembler in the deployment descriptor and are assigned to principals by the deployer. - -
    -
    Declaration of security roles referenced from the bean's code - - - The Bean programmer must declare in the - - security-role-ref - - elements of the deployment descriptor all the security role names used in the enterprise bean code. Declaring the security roles' references in the code allows the application assembler or deployer to link the names of the security roles used in the code to the actual security roles defined for an assembled application through the - - security-role - - elements. - - - ... - <enterprise-beans> - ... - <session> - <ejb-nameOp</ejb-name> - <ejb-class>sb.OpBean</ejb-class> - ... - <security-role-ref> - <role-name>role1</role-name> - </security-role-ref> - ... - </session> - ... - </enterprise-beans> - ... - - - The deployment descriptor in this example indicates that the enterprise bean - - Op - - makes the security checks using - - isCallerInRole("role1") - - in at least one of its business methods. - -
    -
    Linking security role references and security roles - - - If the - - security-role - - elements have been defined in the deployment descriptor, all the security role references declared in the - - security-role-ref - - elements must be linked to the security roles defined in the - - security-role - - elements. - - - The following deployment descriptor example shows how to link the security role references named - - role1 - - to the security role named - - tomcat - - . - - - ... - <enterprise-beans> - ... - <session> - <ejb-name>Op</ejb-name> - <ejb-class>sb.OpBean</ejb-class> - ... - <security-role-ref> - <role-name>role1</role-name> - <role-link>tomcat</role-link> - </security-role-ref> - ... - </session> - ... - </enterprise-beans> - ... - - - In summary, the role names used in the EJB code (in the isCallerInRole method) are, in fact, references to actual security roles, which makes the EJB code independent of the security configuration described in the deployment descriptor. The programmer makes these role references available to the Bean deployer or application assembler via the - - security-role-ref - - elements included in the - - session - - or - - entity - - elements of the deployment descriptor. Then, the Bean deployer or application assembler must map the security roles defined in the deployment descriptor to the "specific" roles of the target operational environment (e.g. groups on Unix systems). However, this last mapping step is not currently available in JOnAS. - -
    -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/session.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/session.xml deleted file mode 100644 index 3ea9b69304b95862bc90b07e4de3dba734c2c279..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/session.xml +++ /dev/null @@ -1,312 +0,0 @@ - -
    EJB 2.1 Session Beans Description - - -
    Introduction - - - A Session Bean is composed of the following parts, which are - developed by the Enterprise Bean Provider: - - - - The - - Component Interface - - is the client view of the bean. It contains all the "business methods" of the bean. - - - - The - - Home Interface - - contains all the methods for the bean life cycle (creation, suppression) used by the client application. - - - - The - - bean implementation class - - implements the business methods and all the methods (described in the EJB specification), allowing the bean to be managed in the container. - - - - The - - deployment descriptor - - contains the bean properties that can be edited at assembly or deployment time. - - - - Note that, according to the EJB 2.1 specification, the couple - "Component Interface and Home Interface" may be either local or remote. - Local Interfaces (Home and Component) are - to be used by a client running in the same JVM as the EJB component. - Create and finder methods of a local or remote home interface return local - or remote component interfaces respectively. An EJB component can have - both remote and local interfaces, even if typically only one type of - interface is provided. - - The description of these elements is provided in the following - sections. - - - in this documentation, the term "Bean" always means "Enterprise - Bean." - - - A session bean object is a short-lived object that executes on - behalf of a single client.There are stateless and stateful - session beans. Stateless beans do not maintain state across - method calls. Any instance of stateless beans can be used by any client at - any time. Stateful session beans maintain state within and between - transactions. Each stateful session bean object is associated with a - specific client. A stateful session bean with container-managed - transaction demarcation can optionally implement the SessionSynchronization interface. In this case, the - bean objects will be informed of transaction boundaries. A rollback could - result in a session bean object's state being inconsistent; in this case, - implementing the SessionSynchronization interface may enable the bean - object to update its state according to the transaction completion - status. -
    - -
    The Home Interface - - - A Session bean's home interface defines one or more - create(...) methods. Each - create method must be named create and must match - one of the ejbCreate methods defined in the - enterprise Bean class. The return type of a - create method must be the enterprise Bean's - remote interface type. The home interface of a stateless session bean must - have one create method that takes no arguments. - All the exceptions defined in the throws clause of an - ejbCreate method must be defined in the throws - clause of the matching create method of the home - interface. A remote home interface extends the - javax.ejb.EJBHome - interface, while a local home interface extends the - javax.ejb.EJBLocalHome - interface. - -
    Example - - - The following examples use a Session Bean named Op. - - public interface OpHome extends EJBHome { - Op create(String user) throws CreateException, RemoteException; - } A local home interface could be defined as follows (LocalOp - being the local component interface of the bean): - public interface LocalOpHome extends EJBLocalHome { - LocalOp create(String user) throws CreateException; - } -
    -
    - -
    The Component Interface - - - The Component Interface is the client's view of an instance of the - session bean. This interface contains the business methods of the - enterprise bean. The interface must extend the - javax.ejb.EJBObject - interface if it is remote, or the - javax.ejb.EJBLocalObject - if it is local. The methods defined in a remote component interface must - follow the rules for Java RMI (this means that their arguments and return - value must be valid types for java RMI, and their throws clause must - include the java.rmi.RemoteException). For each - method defined in the component interface, there must be a matching method - in the enterprise Bean's class (same name, same arguments number and - types, same return type, and same exception list, except for - RemoteException). - -
    Example - - - public interface Op extends EJBObject { - public void buy (int Shares) throws RemoteException; - public int read () throws RemoteException; - } - The same type of component interface could be defined as a local - interface (even if it is not considered good design to define the same - interface as both local and remote): public interface LocalOp extends EJBLocalObject { - public void buy (int Shares); - public int read (); - } -
    -
    - -
    The Enterprise Bean Class - - - This class implements the Bean's business methods of the component - interface and the methods of the - SessionBean - interface, which are those dedicated to the EJB environment. The class - must be defined as public and may not be abstract. The Session Bean - interface methods that the EJB provider must develop are the - following: - - - - public void - setSessionContext(SessionContext ic); - - This method is used by the container to pass a reference to the - SessionContext to the bean instance. The container invokes this method - on an instance after the instance has been created. Generally, this - method stores this reference in an instance variable. - - - - public void ejbRemove(); - - This method is invoked by the container when the instance is in - the process of being removed by the container. Since most session - Beans do not have any resource state to clean up, the implementation - of this method is typically left empty. - - - - public void ejbPassivate(); - - This method is invoked by the container when it wants to - passivate the instance. After this method completes, the instance must - be in a state that allows the container to use the Java Serialization - protocol to externalize and store the instance's state. - - - - public void ejbActivate(); - - This method is invoked by the container when the instance has - just been reactivated. The instance should acquire any resource that - it has released earlier in the ejbPassivate() method. - - - - A stateful session Bean with container-managed transaction - demarcation can optionally implement the - javax.ejb.SessionSynchronization - interface. This interface can provide the Bean with transaction - synchronization notifications. The Session Synchronization interface - methods that the EJB provider must develop are the following: - - - - public void afterBegin(); - - This method notifies a session Bean instance that a new - transaction has started. At this point the instance is already in the - transaction and can do any work it requires within the scope of the - transaction. - - - - public void afterCompletion(boolean committed); - - This method notifies a session Bean instance that a transaction - commit protocol has completed and tells the instance whether the - transaction has been committed or rolled back. - - - - public void beforeCompletion(); - - This method notifies a session Bean instance that a transaction - is about to be committed. - - - -
    Example - - - package sb; - -import java.rmi.RemoteException; -import javax.ejb.EJBException; -import javax.ejb.EJBObject; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.ejb.SessionSynchronization; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -// This is an example of Session Bean, stateful, and synchronized. - -public class OpBean implements SessionBean, SessionSynchronization { - - protected int total = 0; // actual state of the bean - protected int newtotal = 0; // value inside Tx, not yet committed. - protected String clientUser = null; - protected SessionContext sessionContext = null; - - public void ejbCreate(String user) { - total = 0; - newtotal = total; - clientUser = user; - } - - public void ejbActivate() { - // Nothing to do for this simple example - } - - public void ejbPassivate() { - // Nothing to do for this simple example - } - - public void ejbRemove() { - // Nothing to do for this simple example - } - - public void setSessionContext(SessionContext sessionContext) { - this.sessionContext = sessionContext; - } - - public void afterBegin() { - newtotal = total; - } - - public void beforeCompletion() { - // Nothing to do for this simple example - - // We can access the bean environment everywhere in the bean, - // for example here! - try { - InitialContext ictx = new InitialContext(); - String value = (String) ictx.lookup("java:comp/env/prop1"); - // value should be the one defined in ejb-jar.xml - } catch (NamingException e) { - throw new EJBException(e); - } - } - - public void afterCompletion(boolean committed) { - if (committed) { - total = newtotal; - } else { - newtotal = total; - } - } - - public void buy(int s) { - newtotal = newtotal + s; - return; - } - - public int read() { - return newtotal; - } -} - -
    -
    - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/session_tuning.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/session_tuning.xml deleted file mode 100644 index 5368de0ecb01cd8a41871f25eeede630220598fc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/session_tuning.xml +++ /dev/null @@ -1,46 +0,0 @@ - -
    Tuning EJB 2.1 session beans - - - JOnAS handles a pool for each stateless session bean. The pool can be - configured in the JOnAS-specific deployment descriptor with the following - tags: - - - - min-pool-size - - This optional integer value represents the minimum instances that - will be created in the pool when the bean is loaded. This will improve - bean instance creation time, at least for the first beans. The default - value is 0. - - - - max-cache-size - - This optional integer value represents the maximum of instances in - memory. The purpose of this value is to keep JOnAS scalable. The policy - is the following: At bean creation time, an instance is taken from the - pool of free instances. If the pool is empty, a new instance is always - created. When the instance must be released (at the end of a business - method), it is pushed into the pool, except if the current number of - instances created exceeds the max-cache-size, in which case this - instance is dropped. The default value is no limit. - - - - Example - - - <jonas-ejb-jar> - <jonas-session> - <ejb-name>SessSLR</ejb-name> - <jndi-name>EJB/SessHome</jndi-name> - <max-cache-size>20</max-cache-size> - <min-pool-size>10</min-pool-size> - </jonas-session> - </jonas-ejb-jar> - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb2/transaction.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb2/transaction.xml deleted file mode 100644 index e5e6230489a0d1377cc791ae56a004e6286e0e54..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb2/transaction.xml +++ /dev/null @@ -1,286 +0,0 @@ - -
    - - EJB2 Transactional Behaviour - -
    Declarative Transaction Management - - - For container-managed transaction management, the transactional behaviour of an enterprise bean is defined at configuration time and is part of the assembly-descriptor element of the standard deployment descriptor. It is possible to define a common behaviour for all the methods of the bean, or to define the behaviour at the method level. This is done by specifying a transactional attribute, which can be one of the following: - - - - NotSupported: - if the method is called within a transaction, this transaction is suspended during the time of the method execution. - - - Required - : if the method is called within a transaction, the method is executed in the scope of this transaction, else, a new transaction is started for the execution of the method, and committed before the method result is sent to the caller. - - - RequiresNew - : the method will always be executed within the scope of a new transaction. The new transaction is started for the execution of the method, and committed before the method result is sent to the caller. If the method is called within a transaction, this transaction is suspended before the new one is started and resumed when the new transaction has completed. - - - Mandatory - : the method should always be called within the scope of a transaction, else the container will throw the - TransactionRequired - exception. - - - Supports - : the method is invoked within the caller transaction scope; if the caller does not have an associated transaction, the method is invoked without a transaction scope. - - - Never - : The client is required to call the bean without any transaction context; if it is not the case, a java.rmi.RemoteException is thrown by the container. - - - This is illustrated in the following table: - - - - - - Transaction Attribute - - - Client transaction - - - Transaction associated with enterprise Bean method - - - - - - NotSupported - - - - - - - T1 - - - - - Required - - - T2 - - - T1 - T1 - - - RequiresNew - - - T2 - - - T1 - T2 - - - Mandatory - - - ERROR - - - T1 - T1 - - - Supports - - - - - - - T1 - T1 - - - Never - - - - - - - T1 - ERROR - - - - - - In the deployment descriptor, the specification of the transactional attributes appears in the assembly-descriptor as follows: - - - <assembly-descriptor> - <container-transaction> - <method> - <ejb-name>AccountImpl</ejb-name> - <method-name>*</method-name> - </method> - <trans-attribute>Supports</trans-attribute> - </container-transaction> - <container-transaction> - <method> - <ejb-name>AccountImpl</ejb-name> - <method-name>getBalance</method-name> - </method> - <trans-attribute>Required</trans-attribute> - </container-transaction> - <container-transaction> - <method> - <ejb-name>AccountImpl</ejb-name> - <method-name>setBalance</method-name> - </method> - <trans-attribute>Mandatory</trans-attribute> - </container-transaction> - </assembly-descriptor> - - - - In this example, for all methods of the AccountImpl bean which are not explicitly specified in a container-transaction element, the default transactional attribute is Supports (defined at the bean-level), and the transactional attributes are Required and Mandatory (defined at the method-name level) for the methods getBalance and setBalance respectively. - -
    -
    Bean-managed Transaction - - - A bean that manages its transactions itself must set the - - transaction-type - - element in its standard deployment descriptor to: - - - <transaction-type>Bean</transaction-type> - - - - To demarcate the transaction boundaries in a bean with bean-managed transactions, the bean programmer should use the - javax.transaction.UserTransaction - interface, which is defined on an EJB server object that may be obtained using the - EJBContext.getUserTransaction() - method (the SessionContext object or the EntityContext object depending on whether the method is defined on a session or on an entity bean). The following example shows a session bean method "doTxJob" demarcating the transaction boundaries; the UserTransaction object is obtained from the sessionContext object, which should have been initialized in the setSessionContext method (refer to the - - example of the session bean - - ). - - -public void doTxJob() throws RemoteException { - UserTransaction ut = sessionContext.getUserTransaction(); - ut.begin(); - ... // transactional operations - ut.commit(); -} - - - Another way to do this is to use JNDI and to retrieve UserTransaction with the name - - java:comp/UserTransaction - - in the initial context. - -
    -
    Distributed Transaction Management - - - As explained in the previous section, the transactional behaviour of an application can be defined in a declarative way or coded in the bean and/or the client itself (transaction boundaries demarcation). In any case, the distribution aspects of the transactions are completely transparent to the bean provider and to the application assembler. This means that a transaction may involve beans located on several JOnAS servers and that the platform itself will handle management of the global transaction. It will perform the two-phase commit protocol between the different servers, and the bean programmer need do nothing. - - - Once the beans have been developed and the application has been assembled, it is possible for the deployer and for the administrator to configure the distribution of the different beans on one or several machines, and within one or several JOnAS servers. This can be done without impacting either the beans code or their deployment descriptors. The distributed configuration is specified at launch time. In the environment properties of an EJB server, the following can be specified: - - - - which enterprise beans the JOnAS server will handle, - - - if a Java Transaction Monitor will be located in the same Java Virtual Machine (JVM) or not. - - - - To achieve this goal, two properties must be set in the - jonas.properties - file, - jonas.service.ejb.descriptors - and - jonas.service.jtm.remote - . The first one lists the beans that will be handled on this server (by specifying the name of their ejb-jar files), and the second one sets the Java Transaction Monitor (JTM) launching mode: - - - - if set to - - true - - , the JTM is remote, i.e. the JTM must be launched previously in another JVM, - - - if set to - - false - - , the JTM is local, i.e. it will run in the same JVM as the EJB Server. - - - - Example: - - - jonas.service.ejb.descriptors Bean1.jar, Bean2.jar - jonas.service.jtm.remote false - - - - Using these configuration facilities, it is possible to adapt the beans distribution to the resources (cpu and data) location, for optimizing performance. - - - The following figure illustrates four cases of distribution configuration for three beans. - - - - - ???Figure illustrating beans distr - - - - - - Case 1: The three beans B1, B2, and B3 are located on the same JOnAS server, which embeds a Java Transaction Monitor. - - - Case 2: The three beans are located on different JOnAS servers, one of them running the Java Transaction Monitor, which manages the global transaction. - - - Case 3: The three beans are located on different JOnAS servers, the Java Transaction Monitor is running outside of any JOnAS server. - - - Case 4: The three beans are located on different JOnAS servers. Each server is running a Java Transaction Monitor. One of the JTM acts as the master monitor, while the two others are slaves. - - - - These different configuration cases may be obtained by launching the JOnAS servers and eventually the JTM (case 3) with the adequate properties. The rational when choosing one of these configurations is resources location and load balancing. However, consider the following pointers: - - - - if the beans should run on the same machine, with the same server configuration, case 1 is the more appropriate; - - - if the beans should run on different machines, case 4 is the more appropriate, since it favours local transaction management; - - - if the beans should run on the same machine, but require different server configurations, case 2 is a good approach. - - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/ejb3/config.xml b/jonas_doc/core/src/docbook/doc-en/services/ejb3/config.xml deleted file mode 100644 index 57da4616365a2a090afdf6875bddcf816831d689..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ejb3/config.xml +++ /dev/null @@ -1,104 +0,0 @@ - -
    - - ejb3 service configuration - - - The ejb3 service provides EJB 3 - container support. This service is provided by the container. - - The declaration of the ejb3 service is done in the - jonas.properties file. - - ###################### JOnAS EJB 3 container service configuration -# -# Set the name of the implementation class of the EJB 3 service. -jonas.service.ejb3.class org.ow2.jonas.ejb.easybeans.EasyBeansService - -# List (comma separated) of JPA providers: hibernate,eclipselink -jonas.service.ejb3.jpa.providers hibernate - - - - The jonas.service.ejb3.jpa.providers property - allows to define a list of JPA providers that could be used by . For the moment, - and - JPA - providers are available. - - has its - own configuration file that is located in JONAS_BASE/conf folder. The name of the - configuration file is easybeans-jonas.xml. - - By default, is using only services provided by . Thus, no additional - components are required for starting . - - <?xml version="1.0" encoding="UTF-8"?> -<easybeans xmlns="http://org.ow2.easybeans.server"> - - <!-- No infinite loop (managed by JOnAS): wait="false" - Enable MBeans: mbeans="true" - Disable the naming: naming="false" - Use JOnAS JACC provider: jacc="false" - Using JOnAS monitoring: scanning="false" - Using JOnAS JMX Connector: connector="false" - Disable Deployer and J2EEServer MBeans: deployer="false" & j2eeserver="false" - --> - <config - wait="false" - mbeans="true" - naming="false" - jacc="false" - scanning="false" - connector="false" - deployer="false" - j2eeserver="false" /> - - <!-- Define components that will be started at runtime --> - <components> - <!-- All components are launched by JOnAS --> - - <!-- RMI component will be used to access some of JNDI properties --> - <!-- But as there are no protocols, no registry is launched. --> - <rmi /> - - <!-- Start smartclient server with a link to the rmi component--> - <!--smart-server port="2503" rmi="#rmi" /--> - </components> -</easybeans> - - - The <config> element describes configuration properties - that may be different for each application server. The settings provided in - this file are the settings and they shouldn't be modified in almost - any cases. - - The <component> element defines the - components - that will be started at the startup. Here is integrated in - , it will thus - use JOnAS services like transaction, security, naming, registry. - - The smart client component provides a mechanism for downloading - classes missing on the client side, from the server side. This allows to - have a very small library on the client side and it downloads classes on - demand. When this component is enabled, the listening port can be - configured. More documentation on the Smart component can be found in - EasyBeans documentation. -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/ha/config.xml b/jonas_doc/core/src/docbook/doc-en/services/ha/config.xml deleted file mode 100644 index 91393c589b095362fa9441fa7d1012fc03fa6626..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/ha/config.xml +++ /dev/null @@ -1,72 +0,0 @@ - -
    - - ha service configuration - - - The ha (High Availability) service is - required in order to replicate stateful session beans (SFSBs). - - The ha service uses JGroups as a - group communication protocol (GCP). - - Here is the part of jonas.properties related to - ha service: - - ###################### JOnAS HA service configuration -# -# Set the name of the implementation class of the HA service. -jonas.service.ha.class org.ow2.jonas.ha.internal.HaServiceImpl - -# Set the JGroups configuration file name -jonas.service.ha.jgroups.conf jgroups-ha.xml - -# Set the JGroups group name -jonas.service.ha.jgroups.groupname jonas-rep - -# Set the SFSB backup info timeout. The info stored in the backup node is removed when the timer expires. -jonas.service.ha.gc.period 600 - -# Set the datasource for the tx table -jonas.service.ha.datasource jdbc_1 - -# Reconnection timeout for JGroups Channel, if it's closed on request. -jonas.service.ha.reconnection.timeout 5000 - - - - Set the name of the JGroups configuration file. - - - - Set the name of the JGroups group. - - - - Set the period of time (in seconds) the system waits before - cleaning useless replication information. - - - - Set the JNDI name of the datasource corresponding to the - database where is located the transaction table used by the - replication mechanism. - - - - Set the delay to wait for a reconnection. - - - - - Refer to the - clustering guide for issues related to JGroups. - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/jaxrpc/config.xml b/jonas_doc/core/src/docbook/doc-en/services/jaxrpc/config.xml deleted file mode 100644 index e8f0581b09b1bda66fb38a11803d0f0ee09c6323..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/jaxrpc/config.xml +++ /dev/null @@ -1,71 +0,0 @@ - -
    - - jaxrpc service configuration - - - The jaxrpc service provides a JAX-RPC - 1.1 support for applications using J2EE 1.4 style webservices. J2EE 1.4 - style webservices are POJO or Stateless EJB 2.x exposed as webservices using - old school deployment descriptors (WEB-INF/webservices.xml or - META-INF/webservices.xml) - - It is based on the Axis 1.x implementation. - - Here is the part of jonas.properties concerning - the jaxrpc service: - - ###################### JOnAS JAX-RPC service configuration -# -# Set the name of the implementation class of the jaxrpc service. -jonas.service.jaxrpc.class org.ow2.jonas.ws.axis.AxisService - -# Set the XML deployment descriptors parsing mode for the jaxrpc service (with or without validation). -jonas.service.jaxrpc.parsingwithvalidation true - -# Set the Generator to use with wsgen -jonas.service.jaxrpc.wsgen.generator.factory org.ow2.jonas.generators.wsgen.generator.ews.EWSGeneratorFactory - -# Set the prefix that will be used to compute URL endpoints for web services -# Example of prefix: http://www.mydomain.com:8888 -jonas.service.jaxrpc.url-prefix - -# Set automatic WsGen mode on/off -# If set to 'true', WsGen will automatically be applied to all deployed archives (EjbJars, Webapps, Applications) -jonas.service.jaxrpc.auto-wsgen.engaged true - - - It is possible to : - - - - Set or not the XML validation at the deployment descriptor parsing - time: property - jonas.service.jaxrpc.parsingwithvalidation - - - - Enforce the URL to be used for the deployed endpoints: - property:jonas.service.jaxrpc.url-prefix - - This is interesting when there is a cluster of JOnAS instances and - a unique HTTP frontend for load balancing. For example the administrator - wants all your web services endpoint to use the - http://www.mydomain.com:8888 URL instead of the usual - http://localhost:9000 (that has a meaning only at local - level). - - - - Enable or not to run the WSGen tool on ejb-jar, war, ear and - application client at deployment time. - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/jaxws/config.xml b/jonas_doc/core/src/docbook/doc-en/services/jaxws/config.xml deleted file mode 100644 index 2774d84bea49457676434388ab3c483d5ba7d076..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/jaxws/config.xml +++ /dev/null @@ -1,41 +0,0 @@ - -
    - - jaxws service configuration - - - The jaxws service provides a JAX-WS - 2.0 support for applications using Java EE 5 style webservices. - - It is required to declare it if the configured JOnAS instance have to - deploy Java EE application or modules that contains - @WebService annotated classes (for the service - endpoints) or if they contains @WebServiceRef / - @WebServiceRefs (for client side usage of a - webservice). - - - If this service is not activated and deployed applications are - using JAX-WS 2.0 APIs, @WebService annotated POJO - or EJB 3.0 will not be exposed as webservices and - @WebServiceRef fields/methods will not be - injected (may conduct to - NullPointerExceptions). - - - Here is the part of jonas.properties concerning - the jaxws service: - - ###################### JOnAS JAX-WS 2.x service configuration -# -# Set the name of the implementation class of the jaxws service -jonas.service.jaxws.class org.ow2.jonas.ws.cxf.CXFService - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/jmx/config.xml b/jonas_doc/core/src/docbook/doc-en/services/jmx/config.xml deleted file mode 100644 index c0a81b9774d130c617edb25ae0ea42c026d3b193..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/jmx/config.xml +++ /dev/null @@ -1,135 +0,0 @@ - -
    - - jmx service configuration - - - The jmx service is a mandatory - service, so its automatically started in order to administrate or instrument - the server. - It uses the JMX extensions provided by the current Java EE platform. - - The jmx service creates at stratup, - one or more JMX Remote connectors (one for each protocol configured in - CAROL, see). This allows remote management - for JMX-based administration applications. A connector's address is based on - the corresponding protocol's URL, the protocol name and the server - name. - - Let's consider the default CAROL configuration, where the RMI/JRMP - protocol is used with the following URL: - - carol.protocols=jrmp -carol.jrmp.url=rmi://localhost:1099The address of the JMX Remote - connector for a server named myJonas is:service:jmx:rmi:///jndi/rmi://localhost:1099/jrmpconnector_myJonas - - The jmx service can be started in - secured or non-secured mode: - - - - In non-secured mode, the JOnAS server accepts JMX connections - directly, without requiring the client to provide any credentials (no - user names or passwords). This implies that any person that has access - to the JOnAS server's JMX port (by default, its RMI/JRMP port) can also - take any action on the server (including remote code execution). - - - - In secured mode, any client that connects to the JOnAS server via - JMX must provide a valid user name and password. - - - - When connecting, the client provides a user name and password - by setting the JMXConnector.CREDENTIALS key of the - properties passed to the connection (env variable of the JMXConnector.connect method). - - This user name and password is always directly transmitted to - the JOnAS server the client is connecting to, and it's that server's - decision whether: - - - - The user name and password is considered as being valid, - therefore the connection will be accepted. This phase is called - Authentication . - - - - That user has the right of accessing a certain method of a - certain instance. This phase is called Authorization. - - - - - - For authentication, you can use any JAAS LoginModule of the - JMX extensions provided by your platform. - - For authorization, you can use any Security Manager provided - by your platform. - - - - - - Here is the part of jonas.properties concerning - the jmx service: - - -###################### JOnAS JMX service configuration -# -# Set the name of the implementation class of the JMX service -jonas.service.jmx.class org.ow2.jonas.jmx.internal.JOnASJMXService - -# Set to true if the JMXRemote interface should require the client to provide -# authentication information. That information is provided when establishing -# the JMX connection, using the JMXConnector.CREDENTIALS key. -# -# Note that if you enable JMX security for a server, all clients (including -# any administration tool such as the domain master) connecting to this -# instance via JMX must provide a valid user name and password. -jonas.service.jmx.secured false - -# If jonas.service.jmx.secured is set to true, defines the authentication -# method and the method's parameter. For example, to use file-based -# authentication using the conf/jmx.passwords file, define: -# jonas.service.jmx.authentication.method jmx.remote.x.password.file -# jonas.service.jmx.authentication.parameter conf/jmx.passwords -# You are free to use the authentication provider you wish. -jonas.service.jmx.authentication.method jmx.remote.x.password.file -jonas.service.jmx.authentication.parameter conf/jmx.passwords -# You may for example choose to use JAAS LoginModule for authentication. -# In this case define the used configuration in the JAAS configuration file -# using the jonas.service.jmx.authentication.parameter: -# jonas.service.jmx.authentication.method jmx.remote.x.login.config -# jonas.service.jmx.authentication.parameter jaas-jmx - -# If jonas.service.jmx.secured is set to true, defines the authorization -# method and the method's parameter. For example, to use file-based -# authorization using the conf/jmx.access file, define: -# jonas.service.jmx.authorization.method jmx.remote.x.access.file -# jonas.service.jmx.authorization.parameter conf/jmx.access -# You are free to use the authorization provider you wish. -jonas.service.jmx.authorization.method jmx.remote.x.access.file -jonas.service.jmx.authorization.parameter conf/jmx.access -# You may for example choose to use role-based authorization manager -# configured using conf/jmx.rolebased.access file. In this case, define: -# jonas.service.jmx.authorization.method jmx.remote.x.access.rolebased.file -# jonas.service.jmx.authorization.parameter conf/jmx.rolebased.access - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/jtm/config.xml b/jonas_doc/core/src/docbook/doc-en/services/jtm/config.xml deleted file mode 100644 index d25567679f870022b0316b6865247685eb12306d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/jtm/config.xml +++ /dev/null @@ -1,51 +0,0 @@ - -
    jtm service configuration - - - The jtm service is used by ejb2 service in order to provide transaction - management for EJB components as defined in the deployment descriptor. The - jtm service uses a Transaction manager that - may be local or may be launched in another JVM (a remote Transaction - manager). Typically, when there are several JOnAS servers working together, - one jtm service must be considered as the master and the others as slaves. - The slaves must be configured as if they were working with a remote - Transaction manager. - - By default JOTM is the - Transaction manager used. - - Here is the part of jonas.properties concerning - the jtm service: - - ###################### JOnAS JTM Transaction service configuration -# -# Set the name of the implementation class of the jtm service -jonas.service.jtm.class org.ow2.jonas.tm.jotm.JOTMTransactionService - -# Set the Transaction Manager launching mode. -# If set to 'true', TM is remote: TM must be already launched in an other JVM. -# If set to 'false', TM is local: TM is going to run into the same JVM -# than the jonas Server. -jonas.service.jtm.remote false - -# Set the default transaction timeout, in seconds. -jonas.service.jtm.timeout 60 - - - - For customizing the jtm service It is - possible to - - - - Indicate if the Transaction Manager used in this instance is - collocated or remote: jonas.service.jtm.remote - property - - - - Setting the value of the transaction time-out, in seconds: - jonas.service.jtm.timeout property - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/mail/config.xml b/jonas_doc/core/src/docbook/doc-en/services/mail/config.xml deleted file mode 100644 index eb94a2ddd4afb77f9b57bc4a72478322796c4109..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/mail/config.xml +++ /dev/null @@ -1,308 +0,0 @@ - -
    mail service configuration - - - The mail service is an optional - service that may be used to send emails. - - It is based on JavaMail and on JavaBeans Activation Framework (JAF) - API.The default implementation of the mail - service rely on the GNUMail implementation of these API. - - A mail factory is required in order to send or receive mails. JOnAS - provides two types of mail factories: - javax.mail.Session and - javax.mail.internet.MimePartDataSource. - MimePartDataSource factories allow mail to be sent - with a subject and the recipients already set. - - Mail factory objects must be configured according to their type. The - subsections that follow briefly describe how to configure - Session and MimePartDataSource - mail factory objects, in order to run the SessionMailer SessionBean and the - MimePartDSMailer SessionBean delivered with the platform. - - Here is the part of jonas.properties concerning - the mail service: - - ###################### JOnAS Mail service configuration -# -# Set the name of the implementation class of the mail service -jonas.service.mail.class org.ow2.jonas.mail.internal.JOnASMailService - -# Set the jonas mail factories. -# This property is set with a coma-separated list of MailFactory properties -# file names (without the '.properties' suffix). -# Ex: MailSession1,MailMimePartDS1 (while the properties file names are -# MailSession1.properties and MailMimePartDS1.properties) -jonas.service.mail.factories - - Mail factory objects created by must be - given a name. For example, consider two factories called - MailSession1 and MailMimePartDS1. Each - factory must have a configuration file whose name is the name of the factory - with the .properties extension - (MailSession1.properties for the MailSession1 - factory). - - For this example jonas.service.mail.factories property must be set - to: - - jonas.service.mail.factories MailSession1,MailMimePartDS1 - -
    Configuring Session mail factory - - - A template MailSession1.properties file is - supplied in $JONAS_BASE/conf. It - contains two mandatory properties : - - #Factory Name/Type -mail.factory.name mailSession_1 -mail.factory.type javax.mail.Session - - The JNDI name of the mail factory object is mailSession_1. This - template must be updated with values appropriate to your installation. See - the section "Configuring a mail factory" below for the list of available - properties. -
    - -
    Configuring MimePartDataSource mail factory - - - A template MimePartDS1.properties is supplied - in $JONAS_BASE/conf. It contains - two mandatory properties : - - #Factory Name/Type -mail.factory.name mailMimePartDS_1 -mail.factory.type javax.mail.internet.MimePartDataSource - - - The JNDI name of the mail factory object is mailMimePartDS_1. This - template must be updated with values appropriate to your installation. See - the section "Configuring a mail factory" below for the list of available - properties. -
    - -
    Configuring a mail factory - - - Here are the possible properties - - - - Required properties: - - - - - - - - Property name - - Description - - - - mail.factory.name - - JNDI name of the mail factory - - - - mail.factory.type - - The type of the factory. This property can be - javax.mail.Session or - javax.mail.internet.MimePartDataSource. - - - - - - - - Optional properties: Authentication properties - - - - - - - - Property name - - Description - - - - mail.authentication.username - - Set the username for the authentication. - - - - mail.authentication.password - - Set the password for the authentication. - - - - - - - - Optional properties: javax.mail.Session.properties (refer to - JavaMail documentation for more information) - - - - - - - - Property name - - Description - - - - mail.debug - - The initial debug mode. Default is false. - - - - mail.from - - The return email address of the current user, used by the - InternetAddress method getLocalAddress. - - - - mail.mime.address.strict - - The MimeMessage class uses the InternetAddress method - parseHeader to parse headers in messages. This property controls - the strict flag passed to the parseHeader method. The default is - true. - - - - mail.host - - The default host name of the mail server for both Stores - and Transports. Used if the mail.protocol.host property is not - set. - - - - mail.store.protocol - - Specifies the default message access protocol. The Session - method getStore() returns a Store object that implements this - protocol. By default the first Store provider in the configuration - files is returned. - - - - mail.transport.protocol - - Specifies the default message access protocol. The Session - method getTransport() returns a Transport object that implements - this protocol. By default, the first Transport provider in the - configuration files is returned. - - - - mail.user - - The default user name to use when connecting to the mail - server. Used if the mail.protocol.user property is not - set. - - - - mail.<protocol>.class - - Specifies the fully- qualified class name of the provider - for the specified protocol. Used in cases where more than one - provider for a given protocol exists; this property can be used to - specify which provider to use by default. The provider must still - be listed in a configuration file. - - - - mail.<protocol>.host - - The host name of the mail server for the specified - protocol. Overrides the mail.host property. - - - - mail.<protocol>.port - - The port number of the mail server for the specified - protocol. If not specified, the protocol's default port number is - used. - - - - mail.<protocol>.user - - The user name to use when connecting to mail servers using - the specified protocol. Overrides the mail.user property. - - - - - - - - Optional properties:MimePartDataSource properties (Only used if - mail.factory.type is javax.mail.internet.MimePartDataSource) - - - - - - - - Property name - - Description - - - - mail.to - - Set the list of primary recipients ("to") of the - message. - - - - mail.cc - - Set the list of Carbon Copy recipients ("cc") of the - message. mail.bcc - - - - mail.bcc - - Set the list of Blind Carbon Copy recipients ("bcc") of the - message. - - - - mail.subject - - Set the subject of the message. - - - - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/registry/config.xml b/jonas_doc/core/src/docbook/doc-en/services/registry/config.xml deleted file mode 100644 index 512cb76c73e1955bd3ff1a8d52f3380be45e1403..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/registry/config.xml +++ /dev/null @@ -1,23 +0,0 @@ - -
    registry service configuration - - - This service is used for accessing the RMI registry, CMI registry, or - the CosNaming (RMI/IIOP), depending on the configuration of communication - protocols specified in carol.properties, refer to . - - Here is the part of jonas.properties file - concerning the registry service. - - ###################### JOnAS Registry service configuration -# -# Set the name of the implementation class of the Registry service -jonas.service.registry.class org.ow2.jonas.registry.carol.CarolRegistryService - -# Set the Registry launching mode -# If set to 'automatic', the registry is launched in the same JVM as Application Server, -# if it's not already started. -# If set to 'collocated', the registry is launched in the same JVM as Application Server -# If set to 'remote', the registry has to be launched before in a separate JVM -jonas.service.registry.mode collocated -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/resource/config.xml b/jonas_doc/core/src/docbook/doc-en/services/resource/config.xml deleted file mode 100644 index 85df68cfaaa2d00eb323847d355a6f5987231ab4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/resource/config.xml +++ /dev/null @@ -1,73 +0,0 @@ - -
    resource service configuration - - - The resource service must be started - when components - require access to an external Enterprise Information Systems. The standard - way to do this is to use a third party software component called Resource Adapter. - - The role of the Resource service is to deploy the Resource Adapters in - the - server, i.e., configure it in the operational environment and register in - JNDI name space a connection factory instance that can be looked up by the - application components. The resource - service implements the - Connector Architecture 1.5 - There is no real acronym for this specification JCA was the - acronym for Java Cryptography Architecture . In the rest of this - document we will use J2CA - . - - Resource Adapter are packaged in - Java EE rar archives. - - In development mode, as all other - archives rar archives can be deployed automatically as soon as they are - copied under $JONAS_BASE/deploy and undeployed as soon as they has been - removed from this location. - - For more information see . - - The other ways to deploy rar archives is - - - - to use the jonasAdmin console. - - - - to use the command jonas admin: - - jonas admin -a <mydir>/myrar.rar - - - - A JOnAS specific resource adapter configuration xml file must be - included in each resource adapter. This file replicates the values of all - configuration properties declared in the deployment descriptor for the - resource adapter. Refer to Defining the JOnAS Connector Deployment - Descriptor in J2EE - Connector Programmer's Guide for additional information. - - Here is the part of jonas.properties related to - resource service: - - ###################### JOnAS J2CA resource service configuration -# -# Set the name of the implementation class of the J2CA resource service -jonas.service.resource.class org.ow2.jonas.resource.internal.JOnASResourceService - - The worker thread pool used for all J2CA 1.5 Resource Adapters - deployed can be configured in the - service. - - resource service is mainly used in - JOnAS for accessing databases via a JDBC resource adapter (in this case it - replace dbm service) and for providing JMS - facilities. - - JOnAS provides several JDBC resource adapters and a JMS resource - adapter on top of JORAM - More information about configuring resource adapters can be found in -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/resource/connector_packaging.xml b/jonas_doc/core/src/docbook/doc-en/services/resource/connector_packaging.xml deleted file mode 100644 index 67f3db42a3f3c5e8dca4437f61e817a77425bd23..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/resource/connector_packaging.xml +++ /dev/null @@ -1,82 +0,0 @@ - -
    - - Resource Adapter (RAR) Packaging - - - Resource Adapters are packaged for deployment in a standard - Java programming language Archive file called an RAR - file (Resource Adapter ARchive). - This file can contain the following: - - - - - Resource Adapters' deployment descriptor - - - The RAR file must contain the deployment descriptors, which are made up of: - - - The standard xml deployment descriptor, in the format defined in the J2EE 1.4 specification. - Refer to - - http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd - - . This deployment descriptor must be stored with the name - META-INF/ra.xml - in the RAR file. - - - The JOnAS-specific XML deployment descriptor in the format defined in - - http://jonas.objectweb.org/ns/jonas-connector_5_0.xsd - - This JOnAS deployment descriptor must be stored with the name - META-INF/jonas-ra.xml - in the RAR file. - - - - - - - - - Resource adapter components (jar) - - - One or more jars which contain the java interfaces, implementation, - and utility classes required by the resource adapter. - - - - - Platform-specific native libraries - - - One or more native libraries used by the resource adapter - - - - - Misc - - - One or more html, image files, or locale files used by the resource adapter. - - - - - Before deploying an RAR file, the JOnAS-specific XML must be configured and added. Refer to the - RAConfig command - for information. - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/resource/connector_principles.xml b/jonas_doc/core/src/docbook/doc-en/services/resource/connector_principles.xml deleted file mode 100644 index 7b69af439c10c927ce023aab8c2625680b83ff9a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/resource/connector_principles.xml +++ /dev/null @@ -1,15 +0,0 @@ - -
    Connector Architecture Principles - - - The Java Connector Architecture allows the connection of different Enterprise Information Systems (EIS) to an application server such as JOnAS. It defines a way for enterprise applications (based on EJB, servlet, JSP or J2EE clients) to communicate with existing EIS. This requires the use of a third party software component called "Resource Adapter" for each type of EIS, which should be previously deployed on the application server. The Resource Adapter is an architecture component comparable to a software driver, which connects the EIS, the application server, and the enterprise application (J2EE components in the case of JOnAS as application server). The RA provides an interface (the Common Client Interface or CCI) to the enterprise application (J2EE components) for accessing the EIS. The RA also provides standard interfaces for plugging into the application server, so that they can collaborate to keep all system-level mechanisms (transactions, security, and connection management) transparent from the application components. - - - - ???JCA Architecture - - - - The resource adapter plugs into JOnAS and provides connectivity between the EIS, JOnAS, and the application. The application performs "business logic" operations on the EIS data using the RA client API (CCI), while transactions, connections (including pooling), and security on the EIS is managed by JOnAS through the RA (system contract). - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/resource/connector_using.xml b/jonas_doc/core/src/docbook/doc-en/services/resource/connector_using.xml deleted file mode 100644 index 0af2ae9bb215bca238480794a1db94e1a370c833..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/resource/connector_using.xml +++ /dev/null @@ -1,154 +0,0 @@ - -
    Use and Deployment of a Resource Adapter - - - Accessing Resource Adapter involves the following steps: - - - - The bean provider must specify the connection factory requirements by declaring a - resource manager connection factory reference - in its EJB deployment descriptor. For example: - - <resource-ref> - <res-ref-name>eis/MyEIS</res-ref-name> - <res-type>javax.resource.cci.ConnectionFactory</res-type> - <res-auth>Container</res-auth> - </resource-ref> - - The mapping to the actual JNDI name of the - connection factory - (here - - adapt_1 - - ) is done in the JOnAS-specific deployment descriptor with the following element: - - <jonas-resource> - <res-ref-name>eis/MyEIS</res-ref-name> - <jndi-name>adapt_1</jndi-name> - </jonas-resource> - This means that the bean programmer will have access to a - connection factory - instance using the JNDI interface via the - java:comp/env/eis/MyEIS - name: - - // obtain the initial JNDI naming context - Context inictx = new InitialContext(); - - // perform JNDI lookup to obtain the connection factory - javax.resource.cci.ConnectionFactory cxf = - (javax.resource.cci.ConnectionFactory) - inictx .lookup("java:comp/env/eis/MyEIS"); - The bean programmer can then get a connection by calling the method - - getConnection - - on the - connection factory - . - - javax.resource.cci.Connection cx = cxf.getConnection(); - - The returned connection instance represents an application-level handle to a physical connection for accessing the underlying EIS. - After finishing with the connection, it must be closed using the - - close - - method on the - - Connection - - interface: - - cx.close(); - - - - The resource adapter must be deployed before being used by the application. Deploying the resource adapter requires the following: - - Build a - JOnAS-specific resource adapter configuration - file that will be included in the resource adapter. - This jonas-ra XML file is used to configure the resource adapter in the operational environment and reflects the values of all properties declared in the deployment descriptor for the resource adapter, plus additional JOnAS-specific configuration properties. JOnAS provides a deployment tool - - RAConfig - - that is capable of building this XML file from an RA deployment descriptor inside an RAR file. Example: - - - RAConfig -path . -j adap_1 ra - - These properties may be specific for each resource adapter and its underlying EIS. They are used to configure the resource adapter via its - - managedConnectionFactory - - class. It is mandatory that this class provide getter and setter method for each of its supported properties (as it is required in the Connector Architecture specification). - - After configuring the jonas-ra.xml file created above, it can be added to the resource adapter by executing the following: - - - RAConfig -u jonas-ra.xml ra - - This will add the xml file to the ra.rar file, which is now ready for deployment. - - - The JOnAS - resource service - must be configured and started at JOnAS launching time: - In the - - jonas.properties - - file: - - - Verify that the name - - resource - - is included in the - - jonas.services - - property. - - - Use one of the following methods to deploy an RAR file: - - - The names of the - resource adapter - files (the '.rar' suffix is optional) must be added in the list of Resource Adapters to be used in the - - jonas.service.resource.resources - - property. If the '.rar' suffix is not used on the property, it will be used when trying to allocate the specified Resource Adapter. - - jonas.service.resource.resources MyEIS.rar, MyEIS1 - - - - Place the RAR file in the connectors autoload directory of $JONAS_BASE, default value is $JONAS_BASE/rars/autoload. Note that it may be different if - - jonas.service.resource.autoload - - in jonas.properties is configured differently. - - - Add the RAR via the - - jonas admin -a xxx.rar - - command. - - - Add the RAR via the JonasAdmin console. - - - - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/resource/jonas-ra.xml b/jonas_doc/core/src/docbook/doc-en/services/resource/jonas-ra.xml deleted file mode 100644 index ebe4aeb8194ad6084fa5c8c06191aeaa7ef1c3e7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/resource/jonas-ra.xml +++ /dev/null @@ -1,176 +0,0 @@ - -
    Defining the JOnAS Connector Deployment Descriptor - - - The - jonas-ra.xml - contains JOnAS specific information describing deployment information, logging, pooling, jdbc connections, and RAR config property values. - -
    Deployment Tags - - - - jndiname (Required) - Name the RAR will be registered as. This value will be used in the resource-ref section of an EJB. - - - - rarlink - - Jndiname of a base RAR file. - Useful for deploying multiple connection factories without having to deploy the complete RAR file again. - When this is used, the only entry in RAR is a META-INF/jonas-ra.xml. - - - - native-lib - - Directory where additional files in the RAR should be deployed. - - - -
    -
    Logging Tags - - - - log-enabled - - Determines if logging should be enabled for the RAR. - - - - log-topic - - Log topic to use for the PrintWriter logger, which allows a separate handler for each deployed RAR. - - - -
    -
    Pooling Tags - - - - pool-init - - Initial size of the managed connection pool. - - - - pool-min - - Minimum size of the managed connection pool. - - - - pool-max - - Maximum size of the managed connection pool. Value of -1 is unlimited. - - - - pool-max-age - - Maximum number of milliseconds to keep the managed connection in the pool. Value of 0 is an unlimited amount of time. - - - - pstmt-max - - Maximum number of PreparedStatements per managed connection in the pool. Only needed with the JDBC RA of JOnAS or another database vendor's RAR. Value of 0 is unlimited and -1 disables the cache. - - - - pstmt-cache-policy - - Prepared statement cache policy. Possible values are List or Map. - - - -
    -
    JDBC Connection Tags - - Only valid with a Connection implementation of java.sql.Connection. - - - jdbc-check-level - - Level of checking that will be done for the jdbc connection. Values are 0 for no checking, 1 to validate that the connection is not closed before returning it, and greater than 1 to send the jdbc-test-statement. - - - - jdbc-test-statement - - Test SQL statement sent on the connection if the jdbc-check-level is set accordingly. - - - -
    -
    Config Property Value Tags - - - Each entry must correspond to the config-property specified in the - ra.xml - of the RAR file. The default values specified in the - ra.xml - will be loaded first and any values set in the - jonas-ra.xml - will override the specified defaults. - -
    -
    Deployment Descriptor Examples - - - The following portion of a - jonas-ra.xml - file shows the linking to a base RAR file named BaseRar. All properties from the base RAR will be inherited and any values given in this - jonas-ra.xml - will override the other values. - - - <jonas-resource> - <jndiname>rar1</jndiname> - <rarlink>BaseRar</rarlink> - <native-lib>nativelib</native-lib> - <log-enabled>false</log-enabled> - <log-topic>com.xxx.rar1</log-topic> - <jonas-config-property> - <jonas-config-property-name>ip</jonas-config-property-name> - <jonas-config-property-value>www.xxx.com</jonas-config-property-value> - </jonas-config-property> - . - . - </jonas-resource> - - The following portion of a - jonas-ra.xml - file shows the configuration of a jdbc rar file. - - - <jonas-resource> - <jndiname>jdbc1</jndiname> - <rarlink></rarlink> - <native-lib>nativelib</native-lib> - <log-enabled>false</log-enabled> - <log-topic>com.xxx.jdbc1</log-topic> - <pool-params> - <pool-init>0</pool-init> - <pool-min>0</pool-min> - <pool-max>100</pool-max> - <pool-max-age>0</pool-max-age> - <pstmt-max>20</pstmt-max> - <pstmt-cache-policy>Map</pstmt-cache-policy> - </pool-params> - <jdbc-conn-params> - <jdbc_check-level>2</jdbc_check-level> - <jdbc-test-statement>select 1</jdbc-test-statement> - </jdbc-conn-params> - <jonas-config-property> - <jonas-config-property-name>url</jonas-config-property-name> - <jonas-config-property-value>jdbc:oracle:thin:@test:1521:DB1</jonas-config-property-value> - </jonas-config-property> - . - . - </jonas-resource> -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/security/config.xml b/jonas_doc/core/src/docbook/doc-en/services/security/config.xml deleted file mode 100644 index 02db8b5781e1ceb6eeba6c98baff557f0307b1d2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/security/config.xml +++ /dev/null @@ -1,55 +0,0 @@ - -
    security service configuration - - - Here is the part of jonas.properties related to - security service: - - # -###################### JOnAS SECURITY service configuration -# -# Set the name of the implementation class of the security service -jonas.service.security.class org.ow2.jonas.security.internal.JonasSecurityServiceImpl - -# Realm used for CsiV2 authentication -jonas.service.security.csiv2.realm memrlm_1 - -# Realm used for Web Service authentication -jonas.service.security.ws.realm memrlm_1 - -# Registration of realm resources into JNDI -# Disable by default so configuration is not available with clients -jonas.service.security.realm.jndi.registration false - -# Enable security context check on Remote Login Module -jonas.security.context.check false - -# Path to the keystore file -jonas.security.context.check.keystoreFile /tmp/keystore - -# Pass used for the keystore file -jonas.security.context.check.keystorePass keystorepass - -# Alias (stored in the keystore) -jonas.security.context.check.alias FB - - - In fact properties - jonas.service.security.csiv2.realm and - jonas.service.security.ws.realm are only useful for - users that use security on top of rmi/iiop or on top of web services . in - these case with memrlm_1 it is possible to make a link to - the memomyrealm named memrlm_1 in the - $JONAS_BASE/conf/jonas-realm.xml file and retrieve - users name and roles. - - Don't forget that for using security the global property - jonas.security.propagation to true and that an important property related to - security is jonas.security.manager see - - All other security configuration related to is done in the file jonas-realm.xml - and security configuration related to web containers, - certificate, etc., is done in the appropriate files. Refer to the subsection - for a complete description of security - configuration. -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/smartclient/config.xml b/jonas_doc/core/src/docbook/doc-en/services/smartclient/config.xml deleted file mode 100644 index 384ec35a8007a2dc6e5f6e22b9e8aec0c27782cb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/smartclient/config.xml +++ /dev/null @@ -1,35 +0,0 @@ - -
    - - smartclient service configuration - - - The smartclient lets remote clients - download classes and other resources necessary for connecting to - services - (JNDI context factories, EJB3 interceptors, ...) directly from the - server - they're dealing with. - - This way, the heavy clients only need to include a lightweight JAR file - for the Smartclient client and are always guaranteed to have the good - versions of all components. - - Here is the part of jonas.properties concerning - the smartclient service: - - ###################### JOnAS/EasyBeans Smartclient service configuration -# -# Set the name of the implementation class of the smartclient service. -jonas.service.smartclient.class org.ow2.jonas.smartclient.internal.SmartclientServiceImpl -# port number the Smartclient service listens on -jonas.service.smartclient.port 2503 - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/versioning/about.xml b/jonas_doc/core/src/docbook/doc-en/services/versioning/about.xml deleted file mode 100644 index 7b543790aa4b5d1846ff66467298d554f4e20e8e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/versioning/about.xml +++ /dev/null @@ -1,190 +0,0 @@ - -
    - - About the versioning service - - - This service has been designed for dynamic redeployment of - applications, without any application downtime and without users' sessions - being lost: - - - - Deployment of a new version of an application does not require the - undeployment of any previous version. - - - - Users that were on a previous version keep on using that version - as long as their session on that version is active (for example, as long - as they have not finished buying items on the previous version of the - online trade web site). This guarantees that no user data will be lost, - and that if there is any problem with the new version the old version is - still available instantly. - - - - New versions of the application can be deployed using various - strategies, for instance allow testing of the new version by a small - community to ensure its readiness for production. - - - - The versioning service achieves this by adding virtual contexts to all - services that provide support for versioning. To use the versioning - service: - - - - Enable the versioning service in - jonas.properties - - - - Define the Implementation-Version - attribute in your deployable file's (whether war, - jar or ear) - MANIFEST. Note that: - - - - ANT, Maven as well as most IDEs can set any - MANIFEST attribute automatically. - - - - If the archive that will be deployed is an - ear, the Implementation-Version defined in the - MANIFEST of the ear will be used for all - archives the ear contains. - - - - - - When the versioning service is enabled, application resources (web - pages, EJBs, etc.) are accessed the following way: - - - - Each versioned application has a user (virtual) address. Each - version of an application is renamed and bound to that virtual address. - Each bound version has a policy (that can be changed in time in order to - manage the deployment strategy): - - - - Private: Can only be accessed - by clients that satisfy some prerequisites; for example belong to a - certain IP address group or provide a certain credential. - - - - Reserved: Not accessible - using the virtual address, therefore can only be accessed directly - (using the versioned address). - - - - Disabled: Only accessible by - clients that have been using this version in the past (until their - session expires). This guarantees that users will not lose their - session data during a redeployment. - - - - Default: Version accessed by - all clients that don't fit in any other policy. - - - - - - A user can access the application resource indirectly (using the - virtual address) or directly (using the versioned address). - - - - If the user tries to access the application resource indirectly - (using the virtual address), the versioning system: - - - - First checks if that user is defined as a user that can access - a version of the application with the Private access policy. If that is the case, - the user is routed to that private version of the - application. - - - - Then checks if that user already has a session in a version of - the application with the Disabled - access policy. If that is the case, the user is routed to that - disabled version of the application. - - - - If neither of these cases are true, routes the user to the - version of the application with the Default access policy. If the application - does not define any default version, the user will see - "resource not found" message. - - - - - - This can be schematized as follows: - - - - - - - - The current limitations of the versioning service are: - - - - Only the Tomcat Web Container supports the versioning service. - That support is fully functional, recognition of users is based on the - session ID (via cookie or GET). - - - - Both EJB2 and EJB3s support the versioning service. That support - is fully functional, EJB lookups in the same EAR always redirect to the - same version. - - - - Web Service support for the versioning service is in design - phase. - - - - The Private context policy has not been implemented. - - - - As this service allows seamless and interruptionless upgrade and test - of all applications, it is strongly recommended for all applications to - refer version identifiers in their manifest files. Remember that ANT, Maven - as well as most IDEs can set any MANIFEST attribute - automatically. - - We will now detail the way versioning works by creating two versions - of the Java EE 5 Sample Application in the - JOnAS examples - folder: version 1.0.0 and version 1.0.1. Since the application is an EAR, we - only need to refer the version identifier in the EAR file. -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/versioning/config.xml b/jonas_doc/core/src/docbook/doc-en/services/versioning/config.xml deleted file mode 100644 index 61909b600827356107df291c5cce319a75b5d2be..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/versioning/config.xml +++ /dev/null @@ -1,19 +0,0 @@ - -
    - - versioning service configuration - - - - - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/versioning/versioning-ejb.xml b/jonas_doc/core/src/docbook/doc-en/services/versioning/versioning-ejb.xml deleted file mode 100644 index f6c36260bddd3bc31b2ed2f8b4576a6e58a78f74..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/versioning/versioning-ejb.xml +++ /dev/null @@ -1,105 +0,0 @@ - -
    - - Focus: versioned EJBs - - - When the first version of the EAR is deployed: - - - - All EJBs that register on the JNDI directory register with a - prefixed name, which is their original name prefixed by javaee5_earsample_version1.0.0/. For example, the - myStateless bean gets registered as - javaee5_earsample_version1.0.0/myStateless. - - - - For each EJB, the original JNDI name is also registered and points - exactly to the same JNDI link. - - - - Therefore, when a user looks up for the myStateless bean, the reference received is the same - as the one received when javaee5_earsample_version1.0.0/myStateless is looked - up. - - The behaviours of the Web and EJB services when the version 1.0.1 is deployed are similar, except for one very - important point: when multiple applications are packaged together, the only - versions of the applications they've been tested against are the versions - inside the same EAR. Therefore, blindly accessing the Default version of the EJBs could have unexpected - results. This is why the concept of versioned EJB clients has been - created: - - - - All EJB clients in a versioned EAR automatically become versioned - EJB clients. Their target version is the version of the host EAR, which - implies that intra-EAR accesses are always done to the same - version. - - - - External EJB clients can also specify the versions for the EJB - they need to access. - - - - Non-versioned external EJB clients will access the Private, Reserved, Disabled or Default versions as usual. - - - - This can be schematized as follows: - - - - - - - - As with the versioned Web Applications, to change the access policies - of each version of the virtual JNDI container (which knows the JNDI names - end users are expected to access), go to the list of EJB Containers in the JOnAS Web Admin panel. If you - set the version 1.0.0 as Disabled and the version 1.0.1 as Default: - - - - All clients that know about the versioned JNDI names (remember - that this will always be the case in a versioned EAR application) will - always access the version they specify. - - - - References to myStateless - obtained before this operation will stay on version 1.0.0. - - - - Any user that looks up - myStateless for the first time will get a reference to - version 1.0.1. - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/versioning/versioning-web.xml b/jonas_doc/core/src/docbook/doc-en/services/versioning/versioning-web.xml deleted file mode 100644 index 060d3f8504582d5affc301b36f5a9473c4abe08a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/versioning/versioning-web.xml +++ /dev/null @@ -1,109 +0,0 @@ - -
    - - Focus: versioned Web Applications - - - When the first version of the EAR is deployed: - - - - The application gets deployed on the URI /javaee5-earsample-1.0.0. - - - - The virtual URI /javaee5-earsample - is created. - - - - The real URI /javaee5-earsample-1.0.0 gets bound to the virtual - URI /javaee5-earsample. - - - - Therefore, when a user accesses the /javaee5-earsample URI, the content seen is the same - as the one on /javaee5-earsample-1.0.0. - - We now deploy the second version of the application, version 1.0.1, via the JOnAS Web Admin panel. When the second - version is deployed, it is bound to the virtual URI as Reserved (this is the default policy and can be - modified via JMX at any time). This means that the only way of accessing the - 1.0.1 version of the application is to type - as URI /javaee5-earsample-1.0.1. All - visitors of /javaee5-earsample will still - access the version 1.0.0. - - - - - - - - To change the access policies of each version of the virtual URI (the - only URI end users are expected to access), go to the list of Web Containers in the JOnAS Web Admin panel. If you - set the version 1.0.0 as Disabled and the version 1.0.1 as Default: - - - - The user that was on /javaee5-earsample when the default version was - 1.0.0 will stay on version 1.0.0 until her/his session expires (i.e. the - browser window is closed). - - - - Any user that connects to /javaee5-earsample for the first time will visit - version 1.0.1. - - - - Since each version of the application is on a different Web context, - it will be generating headers (Cookie, - Location) and Web content with the versioned context - path (it will for example try to load an image from - /javaee5-earsample-1.0.0/images/jonas.gif instead of - /javaee5-earsample/images/jonas.gif). To avoid this, - the versioning service will: - - - - Rewrite all returned cookies and replace the versioned path with - the user path. Similarly, cookie paths will be changed when passing the - HTTPRequest object to the Web application. - - - - If it exists, replace the versioned path with the user path in any - Location (HTTP redirection) header in a - response. - - - - Replace all versioned paths with the user path for all Web - responses with the Content-Types listed in the - jonas.service.versioning.filteredContentTypes - parameter of the versioning service. By default, that parameter is set - to HTML, CSS, JavaScript and XML files. - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/wc/config.xml b/jonas_doc/core/src/docbook/doc-en/services/wc/config.xml deleted file mode 100644 index 148060034cdf7e6c76387d6bf2278bdd73d45bc8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/wc/config.xml +++ /dev/null @@ -1,44 +0,0 @@ - -
    - - wc service configuration - - - The wc service allows to clean up - periodically the work directory of the server. This service - don't need to be defined in the list of JOnAS services as it is - automatically started when JOnAS is in development mode. - - During the deployment process of an application, a specific working - directory is created and associated to the application. After a defined - time, the clean task tries to delete working directories of applications - which have been undeployed. Note that the clean task is already executed at - startup of the server. - - Here is the part of jonas.properties concerning - the wc service: - - ###################### JOnAS WorkCleaner service configuration -# -# Set the name of the implementation class of the wc service -jonas.service.wc.class org.ow2.jonas.workcleaner.internal.JOnASWorkCleanerService - -# Set the clean period in seconds -jonas.service.wc.period 300 - - - Define the period between two executions of the clean task (in - seconds) - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/web/config.xml b/jonas_doc/core/src/docbook/doc-en/services/web/config.xml deleted file mode 100644 index aef495faf3e29ae4d2b3621ecec03a0a2aba0758..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/web/config.xml +++ /dev/null @@ -1,90 +0,0 @@ - -
    - - web service configuration - - - This service provides containers for the web components used by the - - applications. - - - provides two implementations of this service: one for Jetty 6.x, one for - Tomcat 6.x. It is necessary to run this service in order to use the - JonasAdmin tool. A web container is created from a war file. - - In development mode, as all other archives war archives can be - deployed automatically as soon as they are copied under $JONAS_BASE/deploy - and undeployed as soon as they has been removed from this location. - - Here is the part of jonas.properties concerning - the web service:# -###################### JOnAS Web container service configuration -# -# Set the name of the implementation class of the web container service. -jonas.service.web.class org.ow2.jonas.web.tomcat6.Tomcat6Service -#jonas.service.web.class org.ow2.jonas.web.jetty6.Jetty6Service - -# Set the XML deployment descriptors parsing mode for the WEB container -# service (with or without validation). -jonas.service.web.parsingwithvalidation true - -# If true, the onDemand feature is enabled. A proxy is listening on the http port and will make actions like starting or deploying applications. -# The web container instance is started on another port number (that can be specified) but all access are proxified. -# It means that the web container will be started only when a connection is done on the http port. -# The .war file is also loaded upon request. -# This feature cannot be enabled in production mode. -jonas.service.web.ondemand.enabled true - -# The redirect port number is used to specify the port number of the http web container. -# The proxy will listen on the http web container port and redirect all requests on this redirect port -# 0 means that a random port is used. -jonas.service.web.ondemand.redirectPort 0 -For customizing the web service, it - is possible to: - - - - Set or not the XML validation at the deployment descriptor parsing - time. - - - - Enable or not the onDemand feature. In addition of activating this - global feature, each web application that has to be loaded on demand - must declare the on-demand element in the JOnAS - deployment descriptor (WEB-INF/jonas-web.xml) as - below: - - <?xml version="1.0" encoding="ISO-8859-1"?> -<jonas-web-app xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-web-app_5_1.xsd"> - - ... - - <!-- Load this application on demand (if enabled in the webcontainer service) --> - <on-demand>true</on-demand> -</jonas-web-app> - - - - This property is specific to the onDemand feature. Useful to set - the port number of the http web container in case of the port number - defined in the web server configuration is used by the proxy. - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/web/webcomponent.xml b/jonas_doc/core/src/docbook/doc-en/services/web/webcomponent.xml deleted file mode 100644 index 6229a9fb361d5dfa7be2efd54f75b5f97f35e7b4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/web/webcomponent.xml +++ /dev/null @@ -1,426 +0,0 @@ - -
    - - Developing Web Components - - -
    - - Introduction - - - A Web Component is a generic term which denotes both JSP pages and - Servlets. Web components are packaged in a .war file and - can be deployed in a JOnAS server via the web container service. Web - components can be integrated in a J2EE application by packing the - .war file in an .ear file (refer to the J2EE Application - Programmer's Guide ). - - The JOnAS distribution includes a Web application example: - The EarSample example. - - The directory structure of this application is the following: - - - - - - etc/xml - - contains the web.xml file describing the web - application - - - - etc/resources/web - - contains html pages and images; JSP pages can also be - placed here. - - - - src/java/org/ow2/jonas/examples/ear/web - - servlet sources - - - - src/java/org/ow2/jonas/examples/ear/(!web) - - beans sources (Session, Message Driven, JPA Entity) - - - - - - The bean directory is not needed if beans coming from another - application will be used. -
    - -
    - - The JSP pages - - - Java Server Pages (JSP) is a technology that allows regular, static - HTML, to be mixed with dynamically-generated HTML written in Java - programming language for encapsulating the logic that generates the - content for the page. Refer to the Java Server - Pages and the Quickstart guide - for more details. - -
    - - Example: - - - The following example shows a sample JSP page that lists the - content of a cart. - - - <!-- Get the session --> - <%@ page session="true" %> - - <!-- The import to use --> - <%@ page import="java.util.Enumeration" %> - <%@ page import="java.util.Vector" %> - - <html> - <body bgcolor="white"> - <h1>Content of your cart</h1><br> - <table> - <!-- The header of the table --> - <tr bgcolor="black"> - <td><font color="lightgreen">Product Reference</font></td> - <td><font color="lightgreen">Product Name</font></td> - <td><font color="lightgreen">Product Price</font></td> - </tr> - - <!-- Each iteration of the loop display a line of the table --> - <% - Cart cart = (Cart) session.getAttribute("cart"); - Vector products = cart.getProducts(); - Enumeration enum = products.elements(); - // loop through the enumeration - while (enum.hasMoreElements()) { - Product prod = (Product) enum.nextElement(); - %> - <tr> - <td><%=prod.getReference()%></td> - <td><%=prod.getName()%></td> - <td><%=prod.getPrice()%></td> - </tr> - <% - } // end loop - %> - </table> - </body> - </html> - - It is a good idea to hide all the mechanisms for accessing EJBs - from JSP pages by using a proxy java bean, referenced in the JSP page by - the usebean special tag. This technique is shown in the - alarm example , where the .jsp files communicate with the - EJB via a proxy java bean ViewProxy.java . -
    -
    - -
    - - The Servlets - - - Servlets are modules of Java code that run in an application server - for answering client requests. Servlets are not tied to a specific - client-server protocol. However, they are most commonly used with HTTP, - and the word "Servlet" is often used as referring to an "HTTP - Servlet." - - Servlets make use of the Java standard extension classes in the - packages javax.servlet (the basic Servlet framework) and - javax.servlet.http (extensions of the Servlet framework for - Servlets that answer HTTP requests). - - Typical uses for HTTP Servlets include: - - - - processing and/or storing data submitted by an HTML form, - - - - providing dynamic content generated by processing a database - query, - - - - managing information of the HTTP request. - - - - For more details refer to the - Java Servlet Technology and the - Servlets tutorial . - -
    - - Example: - - - The following example is a sample of a Servlet that lists the - content of a cart. This example is the servlet version of the previous - JSP page example. - - - import java.util.Enumeration; - import java.util.Vector; - import java.io.PrintWriter; - import java.io.IOException; - import javax.servlet.ServletException; - import javax.servlet.http.HttpServlet; - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletResponse; - import javax.servlet.http.HttpSession; - - public class GetCartServlet extends HttpServlet { - - protected void doGet(HttpServletRequest req, HttpServletResponse res) - throws ServletException, IOException { - - res.setContentType("text/html"); - PrintWriter out = res.getWriter(); - - out.println("<html><head><title>Your cart</title></head>"); - out.println("<body>"); - out.println("<h1>Content of your cart</h1><br>"); - out.println("<table>"); - - // The header of the table - out.println("<tr>"); - out.println("<td><font color="lightgreen">Product Reference</font></td>"); - out.println("<td><font color="lightgreen">Product Name</font></td>"); - out.println("<td><font color="lightgreen">Product Price</font></td>"); - out.println("</tr>"); - - // Each iteration of the loop display a line of the table - HttpSession session = req.getSession(true); - Cart cart = (Cart) session.getAttribute("cart"); - Vector products = cart.getProducts(); - Enumeration enum = products.elements(); - while (enum.hasMoreElements()) { - Product prod = (Product) enum.nextElement(); - int prodId = prod.getReference(); - String prodName = prod.getName(); - float prodPrice = prod.getPrice(); - out.println("<tr>"); - out.println("<td>" + prodId + </td>); - out.println("<td>" + prodName + </td>); - out.println("<td>" + prodPrice + </td>); - out.println("</tr>"); - } - - out.println("</table>"); - out.println("</body>"); - out.println("</html>"); - out.close(); - } - } -
    -
    - -
    - - Accessing an EJB from a Servlet or JSP page - - - Through the JOnAS web container service, it is possible to access an - enterprise java bean and its environment in a J2EE-compliant way. - - The following sections describe: - - - - How to access the Remote Home interface of a bean. - - - - How to access the Local Home interface of a bean. - - - - How to access the environment of a bean. - - - - How to start transactions in servlets. - - - - Note that all the following code examples are taken from the - The EarSample example provided in the JOnAS distribution. - -
    - - Accessing the Remote Home interface of a bean: - - - In this example the servlet gets the Remote Home interface OpHome - registered in JNDI using an EJB reference, then creates a new instance - of the session bean: - - -import javax.naming.Context; -import javax.naming.InitialContext; - -//remote interface -import org.objectweb.earsample.beans.secusb.Op; -import org.objectweb.earsample.beans.secusb.OpHome; - - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - out.print("<li>Cannot get initial context for JNDI: "); - out.println(e + "</li>"); - return; - } - // Connecting to OpHome thru JNDI - OpHome opHome = null; - try { - opHome = (OpHome) PortableRemoteObject.narrow(initialContext.lookup - ("java:comp/env/ejb/Op"),OpHome.class); - } catch (Exception e) { - out.println("<li>Cannot lookup java:comp/env/ejb/Op: " + e + "</li>"); - return; - } - // OpBean creation - Op op = null; - try { - op = opHome.create("User1"); - } catch (Exception e) { - out.println("<li>Cannot create OpBean: " + e + "</li>"); - return; - } - - Note that the following elements must be set in the web.xml - file tied to this web application: - - - <ejb-ref> - <ejb-ref-name>ejb/Op</ejb-ref-name> - <ejb-ref-type>Session</ejb-ref-type> - <home>org.objectweb.earsample.beans.secusb.OpHome</home> - <remote>org.objectweb.earsample.beans.secusb.Op</remote> - <ejb-link>secusb.jar#Op</ejb-link> - </ejb-ref> -
    - -
    - - Accessing the Local Home of a bean: - - - The following example shows how to obtain a local home interface - OpLocalHome using an EJB local reference: - - -//local interfaces -import org.objectweb.earsample.beans.secusb.OpLocal; -import org.objectweb.earsample.beans.secusb.OpLocalHome; - - - // Connecting to OpLocalHome thru JNDI - OpLocalHome opLocalHome = null; - try { - opLocalHome = (OpLocalHome) - initialContext.lookup("java:comp/env/ejb/OpLocal"); - } catch (Exception e) { - out.println("<li>Cannot lookup java:comp/env/ejb/OpLocal: " + e + "</li>"); - return; - } - - This is found in the web.xml file: - - - <ejb-local-ref> - <ejb-ref-name>ejb/OpLocal</ejb-ref-name> - <ejb-ref-type>Session</ejb-ref-type> - <local-home>org.objectweb.earsample.beans.secusb.OpLocalHome</local-home> - <local>org.objectweb.earsample.beans.secusb.OpLocal</local> - <ejb-link>secusb.jar#Op</ejb-link> - </ejb-local-ref> -
    - -
    - - Accessing the environment of the component: - - - In this example, the servlet seeks to access the component's - environment: - - - String envEntry = null; - try { - envEntry = (String) initialContext.lookup("java:comp/env/envEntryString"); - } catch (Exception e) { - out.println("<li>Cannot get env-entry on JNDI " + e + "</li>"); - return; - } - - This is the corresponding part of the web.xml - file: - - - <env-entry> - <env-entry-name>envEntryString</env-entry-name> - <env-entry-value>This is a string from the env-entry</env-entry-value> - <env-entry-type>java.lang.String</env-entry-type> - </env-entry> -
    - -
    - - Starting transactions in servlets: - - - The servlet wants to start transactions via the UserTransaction - : - - -import javax.transaction.UserTransaction; - - // We want to start transactions from client: get UserTransaction - UserTransaction utx = null; - try { - utx = (UserTransaction) initialContext.lookup("java:comp/UserTransaction"); - } catch (Exception e) { - out.println("<li>Cannot lookup java:comp/UserTransaction: " + e + "</li>"); - return; - } - - try { - utx.begin(); - opLocal.buy(10); - opLocal.buy(20); - utx.commit(); - - } catch (Exception e) { - out.println("<li>exception during 1st Tx: " + e + "</li>"); - return; - } -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/web/webdeploy.xml b/jonas_doc/core/src/docbook/doc-en/services/web/webdeploy.xml deleted file mode 100644 index 96f02cb85c781bcd6da1797fd71047c25ead8292..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/web/webdeploy.xml +++ /dev/null @@ -1,218 +0,0 @@ - -
    Defining the Web Deployment Descriptor - -
    Principles - - - The Web component programmer is responsible for providing the deployment descriptor associated with the developed web components. The Web component provider's responsibilities and the application assembler's responsibilities are to provide an XML deployment descriptor that conforms to the deployment descriptor's XML schema as defined in the -Java Servlet Specification Version 2.4. (Refer to - - $JONAS_ROOT/xml/web-app_2_4.xsd - - or - - http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd - - ). - - - To customize the Web components, information not defined in the standard XML deployment descriptor may be needed. For example, the information may include the mapping of the name of referenced resources to its JNDI name. This information can be specified during the deployment phase, within another XML deployment descriptor that is specific to JOnAS. The JOnAS-specific deployment descriptor's XML schema is located in - - $JONAS_ROOT/xml/jonas-web-app_X_Y.xsd - - . The file name of the JOnAS-specific XML deployment descriptor must be the file name of the standard XML deployment descriptor prefixed by ' - - jonas- - - '. - - - The parser gets the specified schema via the classpath (schemas are packaged in the $JONAS_ROOT/lib/common/ow_jonas.jar file). - - - The standard deployment descriptor (web.xml) should contain structural information that includes the following: - - - - The Servlet's description (including Servlet's name, Servlet's class or jsp-file, Servlet's initialization parameters), - - - Environment entries, - - - EJB references, - - - EJB local references, - - - Resource references, - - - Resource env references. - - - - The JOnAS-specific deployment descriptor (jonas-web.xml) may contain information that includes: - - - - The JNDI name of the external resources referenced by a Web component, - - - The JNDI name of the external resources environment referenced by a Web component, - - - The JNDI name of the referenced bean's by a Web component, - - - The name of the virtual host on which to deploy the servlets, - - - The name of the context root on which to deploy the servlets, - - - The compliance of the web application classloader to the java 2 delegation model or not. - - - - <host> element: If the configuration file of the web container contains virtual hosts, the host on which the WAR file is deployed can be set. - - - <context-root> element: The name of the context on which the application will be deployed should be specified. If it is not specified, the context-root used can be one of the following: - - - - If the war is packaged into an EAR file, the context-root used is the context specified in the application.xml file. - - - If the war is standalone, the context-root is the name of the war file (i.e, the context-root is jonasAdmin for jonasAdmin.war). - - - - If the context-root is / or empty, the web application is deployed as ROOT context (i.e., http://localhost:9000/). - - - <java2-delegation-model> element: Set the compliance to the java 2 delegation model. - - - - If true: the web application context uses a classloader, using the Java 2 delegation model (ask parent classloader first). - - - If false: the class loader searches inside the web application first, before asking parent class loaders. - - - - -
    -
    Examples of Web Deployment Descriptors - - - - Example of a standard Web Deployment Descriptor (web.xml): - -<?xml version="1.0" encoding="ISO-8859-1"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>Op</servlet-name> - <servlet-class>org.objectweb.earsample.servlets.ServletOp</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Op</servlet-name> - <url-pattern>/secured/Op</url-pattern> - </servlet-mapping> - - <security-constraint> - <web-resource-collection> - <web-resource-name>Protected Area</web-resource-name> - <!-- Define the context-relative URL(s) to be protected --> - <url-pattern>/secured/*</url-pattern> - <!-- If you list http methods, only those methods are protected --> - <http-method>DELETE</http-method> - <http-method>GET</http-method> - <http-method>POST</http-method> - <http-method>PUT</http-method> - </web-resource-collection> - <auth-constraint> - <!-- Anyone with one of the listed roles may access this area --> - <role-name>tomcat</role-name> - <role-name>role1</role-name> - </auth-constraint> - </security-constraint> - - <!-- Default login configuration uses BASIC authentication --> - <login-config> - <auth-method>BASIC</auth-method> - <realm-name>Example Basic Authentication Area</realm-name> - </login-config> - - <env-entry> - <env-entry-name>envEntryString</env-entry-name> - <env-entry-value>This is a string from the env-entry</env-entry-value> - <env-entry-type>java.lang.String</env-entry-type> - </env-entry> - - <!-- reference on a remote bean without ejb-link--> - <ejb-ref> - <ejb-ref-name>ejb/Op</ejb-ref-name> - <ejb-ref-type>Session</ejb-ref-type> - <home>org.objectweb.earsample.beans.secusb.OpHome</home> - <remote>org.objectweb.earsample.beans.secusb.Op</remote> - </ejb-ref> - - <!-- reference on a remote bean using ejb-link--> - <ejb-ref> - <ejb-ref-name>ejb/EjbLinkOp</ejb-ref-name> - <ejb-ref-type>Session</ejb-ref-type> - <home>org.objectweb.earsample.beans.secusb.OpHome</home> - <remote>org.objectweb.earsample.beans.secusb.Op</remote> - <ejb-link>secusb.jar#Op</ejb-link> - </ejb-ref> - - <!-- reference on a local bean --> - <ejb-local-ref> - <ejb-ref-name>ejb/OpLocal</ejb-ref-name> - <ejb-ref-type>Session</ejb-ref-type> - <local-home>org.objectweb.earsample.beans.secusb.OpLocalHome</local-home> - <local>org.objectweb.earsample.beans.secusb.OpLocal</local> - <ejb-link>secusb.jar#Op</ejb-link> - </ejb-local-ref> -</web-app> - - - Example of a specific Web Deployment Descriptor (jonas-web.xml): - -<?xml version="1.0" encoding="ISO-8859-1"?> - -<jonas-web-app xmlns="http://www.objectweb.org/jonas/ns" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.objectweb.org/jonas/ns - http://www.objectweb.org/jonas/ns/jonas-web-app_4_0.xsd" > - - <!-- Mapping between the referenced bean and its JNDI name, override the ejb-link if - there is one in the associated ejb-ref in the standard Web Deployment Descriptor --> - <jonas-ejb-ref> - <ejb-ref-name>ejb/Op</ejb-ref-name> - <jndi-name>OpHome</jndi-name> - </jonas-ejb-ref> - - <!-- the virtual host on which deploy the web application --> - <host>localhost</host> - - <!-- the context root on which deploy the web application --> - <context-root>web-application</context-root> -</jonas-web-app> - - - - For advices about xml file writing, refer to . - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/web/webpackaging.xml b/jonas_doc/core/src/docbook/doc-en/services/web/webpackaging.xml deleted file mode 100644 index 5340b75dce6e6c154635b0ed71b61967bebc97a8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/web/webpackaging.xml +++ /dev/null @@ -1,96 +0,0 @@ - -
    - - WAR Packaging - - - Web components are packaged for deployment in a standard Java programming language Archive file called a - war - file (Web ARchive), which is a - jar - similar to the package used for Java class libraries. A - war - has a specific hierarchical directory structure. The top-level directory of a - war - is the document root of the application. - - - The document root is where JSP pages, client-side classes and archives, and static web resources are stored. The document root contains a subdirectory called - WEB-INF - , which contains the following files and directories: - - - - web.xml - : The standard xml deployment descriptor in the format defined in the Java Servlet 2.4 Specification. Refer to - $JONAS_ROOT/xml/web-app_2_4.xsd - . - - - jonas-web.xml - : The optional JOnAS-specific XML deployment descriptor in the format defined in - $JONAS_ROOT/xml/jonas-web_X_Y.xsd - . - - - classes - : a directory that contains the servlet classes and utility classes. - - - lib - : a directory that contains jar archives of libraries (tag libraries and any utility libraries called by server-side classes). If the Web application uses Enterprise Beans, it can also contain - ejb-jars - . This is necessary to give to the Web components the visibility of the EJB classes. - However, if the - war - is intended to be packed in a - ear - , the - ejb-jars - must not be placed here. In this case, they are directly included in the - ear - . Due to the use of the class loader hierarchy, Web components have the visibility of the EJB classes. - Details about the class loader hierarchy are described in - - JOnAS class loader hierarchy - - . - - -
    Example - - - Before building a - war - file, the java source files must be compiled to obtain the class files (located in the - WEB-INF/classes - directory) and the two XML deployment descriptors must be written. - - - Then, the - war - file (<web-application>.war) is built using the - jar - command: - - - cd <your_webapp_directory> - jar cvf <web-application>.war * - - During the development process, an 'unpacked version' of the war file can be used. Refer to - - Configuring Web Container Service - - for information about how to use directories for the web application. - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/services/wm/config.xml b/jonas_doc/core/src/docbook/doc-en/services/wm/config.xml deleted file mode 100644 index 7242092f91b90427a536a6f87885d2d406f44d4d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/wm/config.xml +++ /dev/null @@ -1,60 +0,0 @@ - -
    - - wm service configuration - - - The wm service provides a J2CA - WorkManager implementation. This service don't need to be defined in - the list of JOnAS services as it is automatically started when - required. - - Here is the part of jonas.properties concerning - the wm service: - - ###################### JOnAS WorkManager service configuration -# -# Set the name of the implementation class of the wm service -jonas.service.wm.class org.ow2.jonas.workmanager.internal.JOnASWorkManagerService - -# Set the size of the worker thread pool -jonas.service.wm.minworkthreads 3 - -# Set the maximun size of the worker thread pool -jonas.service.wm.maxworkthreads 80 - -# Set the max # of seconds that a thread will wait for work -# This is used to shrink the worker thread pool back to minimum -jonas.service.wm.threadwaittimeout 60 - - - Defines the minimum size of the Thread pool - - - - Defines the maximum size of the Thread pool - - - - Defines the maximum time (in seconds) that a worker Thread - should wait before execution - - - - The wm service is used, for example, - in the resource service (J2CA 1.5 - implementation) in order to provide a - javax.resource.spi.work.WorkManager instance for - deployed resource adapters (like JMS, ...). -
    diff --git a/jonas_doc/core/src/docbook/doc-en/services/wsdl-publisher/config.xml b/jonas_doc/core/src/docbook/doc-en/services/wsdl-publisher/config.xml deleted file mode 100644 index a618e51d0f82277bf6ac7c0b88ea802cfc0b0632..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/services/wsdl-publisher/config.xml +++ /dev/null @@ -1,152 +0,0 @@ - -
    - - wsdl-publisher service configuration - - - The wsdl-publisher service provides a - pluggable component dedicated to alternate WSDL publishing - mechanisms. - - By default, all the web services deployed by JOnAS have their WSDL - available at a given URL location. For J2EE 1.4 webservices, the URL ends - with ?JWSDL, for Java EE 5.0 webservices, the URL ends - with ?WSDL. - - When this default publishing mechansim is not sufficent, it is - possible to add one or more custom WSDL publishers. Within JOnAS, 2 custom - publishers are availables (file - based and JAXR - based). - - Here is the part of jonas.properties concerning - the wsdl-publisher service: - - ###################### JOnAS WSDL Publisher service configuration -# -# Set the name of the implementation class of the WSDL Publisher service. -jonas.service.wsdl-publisher.class org.ow2.jonas.ws.publish.internal.manager.DefaultWSDLPublisherManager - -# Set the WSDL Publishers list for WSDL publication -# A minimum of 1 WSDLPublisher is required ! -# This property is set with a coma-separated list of WSDLPublisher properties -# file names (without the '.properties' suffix). -# Ex: file1,uddi (while the properties file names are -# file1.properties and uddi.properties) -jonas.service.wsdl-publisher.publishers file1 - - -
    - - File WSDLPublisher - - - The File WSDLPublisher type is used in simple - WebServices usage scenario, when the application doesn't requires a full - blown web services registry (like UDDI - or ebXML). It will simply - save the WSDL documents (and their dependencies) in a configurable - directory. - - # FileWSDLPublisher class -jonas.service.wsdl.class org.ow2.jonas.ws.publish.internal.file.FileWSDLPublisher - -# Directory where WSDLs will be copied -# If not set JONAS_BASE/wsdls will be used -# jonas.service.publish.file.directory /tmp - -# Encoding of the file (In respect with the platform JOnAS is running on) -# If not set default to UTF-8 -jonas.service.publish.file.encoding UTF-8 - - - - - Base directory where WSDL documents will be published - - - - File encoding to be used (must be supported by the - platform) - - -
    - -
    - - JAXR WSDLPublisher - - - The JAXR WSDLPublisher type is responsible of - publishing a given WSDL in an enterprise level registry or repository, - allowing external clients to get the technical and administrative - information about the deployed service. - JOnAS has been tested with Apache jUDDI, an ASL2 UDDI v2 - implementation. - - - # RegistryWSDLPublisher class -jonas.service.wsdl.class org.ow2.jonas.ws.publish.internal.registry.RegistryWSDLPublisher - -# User name and Password to access Registry -jonas.service.publish.uddi.username jonas -jonas.service.publish.uddi.password jonas - -# Organization name, small desc (optionnal) and primary contact name. -jonas.service.publish.uddi.organization.name OW2 -jonas.service.publish.uddi.organization.desc OW2 Consortium (http://www.ow2.org) -jonas.service.publish.uddi.organization.person_name JOnAS - -# URLs where Registry can be contacted (Publish an Query APIs) -javax.xml.registry.lifeCycleManagerURL http://localhost:9000/juddi/publish -javax.xml.registry.queryManagerURL http://localhost:9000/juddi/inquiry - - - - - Username - - - - Credential to be used for registry authentication - - - - Organization name - - - - Organization details/description - - - - Contact for the organization - - - - JAXR LifeCycleManager URL (Administration URL where WSDL can be - published) - - - - JAXR QueryManager URL (Read only URL acting as a - registry) - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/terminology.xml b/jonas_doc/core/src/docbook/doc-en/terminology.xml deleted file mode 100644 index 98dbc4faef9fdae5f2bc7b20857dc8dcd975b863..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/terminology.xml +++ /dev/null @@ -1,157 +0,0 @@ - -
    - - Terminology - - - - -
    - - Server or JOnAS instance - - - A server, or JOnAS instance, is a java process started via the - jonas start command, or via the administration tool . - - Several servers may run on the same physical host. -
    - -
    - - Service - - - When a server starts, services are started. - - A service typically provides system resources to containers. Most of - the components of the application server are pre-defined - services. However, it is possible and easy for an advanced user to define - a new service and to integrate it into . - - - services are manageable through JMX. -
    - -
    - - Container - - - A container consists of a set of Java classes that implement the - - specification. The role of the container is to provide the facilities for - executing - components. - - There are three types of containers: - - - - EJB container in which Enterprise JavaBeans are deployed and - run - - - - Web container for JSPs and servlets - - - - Client container - - -
    - -
    - - Domain - - - A domain represents an administration perimeter which is under the - control of an administration authority. - - This perimeter contains management targets like servers and - clusters. - - If a domain contains several elements, it provides at least one - common administration point represented by a master server. -
    - -
    - - Master server - - - A master is a instance having particular management capabilities - within the domain: - - - - it is aware of the domain's topology - - - - it allows management and monitoring of all the elements - belonging to the domain - - -
    - -
    - - Cluster - - - A cluster is a group of JOnAS servers having common properties within a domain. It usually allows to run a - J2EE application, or a J2EE module, on the cluster members as if they were - a single server. The objective is to achieve applications scalability and - high availability. - - JOnAS supports several cluster types: - - - - Clusters for Web level load-balancing - - - - Clusters for high availability of Web components - - - - Clusters for EJB level load-balancing - - - - Clusters for high availability of EJB components - - - - Clusters for JMS destination scalability and high - availability - - - - Clusters for administration purpose which facilitate management - operations like deployment /undeployment. - - - - From the administrator point of view, a cluster represents a single - administration target. - - Note that a particular server may belong to zero, one or more - clusters. -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/transactions/introduction.xml b/jonas_doc/core/src/docbook/doc-en/transactions/introduction.xml deleted file mode 100644 index 144008bebd31646c073bf086dfae3cdd22fab523..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/transactions/introduction.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - Transactions and Java EE - -
    - BMT : Bean Managed Transaction - - For this mode, this is the developer that should manage the calls - to the transaction manager - - - - Pros : Fine tuning - - - - Cons : Potential errors - - -
    - -
    - Container Managed Transaction - - Container is managing transactions by relying on metadata - specified by the developer - - - - Pros : well-used and tested management by the container - - - - Cons : Transaction only specified at method level, can not - handle different transactions in the same method - - - - Container is handling the transactions by using the metadata - specified on business methods: - -
    - Required - - Default mode used in Java EE specification when no metadata - about transaction is specified - - When a business method is called: - - If there is no transaction yet: Container starts a new - transaction - - If a transaction exists : Container will use this - transaction - - - For a call using several methods with Required metadata, the - transaction will be the same on all the called methods - -
    - -
    - RequiresNew - - Mode used to ensure that a new transaction is already - started - - - - Suspends the existing transaction (if there is one) - - - - Starts a new transaction - - - - Executes the business method - - - - Restores the previous transaction (if there was one) after - committing the current one - - -
    - -
    - Mandatory - - Ensures that the client calling this method has started a - transaction - - A TransactionRequiredException is thrown if no transaction - exists when invoking the method -
    - -
    - NotSupported - - If a transaction is not required then this mode has to be - used - - - - Suspends the existing transaction (if there is one) - - - - Executes the business method without transaction - - - - Restores the previous transaction (if there was one) - - -
    - -
    - Supports - - Mode used if a method can be called in both mode (with and - without a transaction) - - Existing transaction : Container uses this transaction - - No current transaction : Container calls the method without - transaction -
    - -
    - Never - - This mode should be used when a method can not be run in - transactional context - - A RemoteException is thrown if there is an existing transaction - when invoking the business method -
    - -
    - Summary - - The transactional mode is defined at method level - - Only one choice is available per method and it can defined - through - - - - XML file - - - - Annotations by using @TransactionAttribute - - - - - Access to the transaction manager in CMT mode is - denied. - -
    -
    - -
    - How to find the right mode for the transactions - - The choice of the transactions is based on the business code. For - example, in the case of reading values from a database and if these - values can be cached, Never of Supports transaction attribute are good - candidates. By avoiding the usage of transaction code can be faster but - the choice of disabling transaction for some methods needs to know how - the application and the method are working. -
    - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/transactions/jdbc-resources-in-jonas.xml b/jonas_doc/core/src/docbook/doc-en/transactions/jdbc-resources-in-jonas.xml deleted file mode 100644 index 92ddbae23eef9df64c59d0c96fce1739427c73ad..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/transactions/jdbc-resources-in-jonas.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - JDBC Resources inside JOnAS - -
    - Introduction - - A difference exists between managed and non-managed mode for JDBC - connections. - - Managed mode is corresponding to the Java EE mode while - non-managed mode is used in Java SE mode. - - In Java EE, the JDBC resources are provided by using a connection - pool. The JDBC connections are reused once the instance is not anymore - used. In Java SE, a new instance is built each time that there is a call - to get a new connection. -
    - -
    - JDBC resources and transactions - - JDBC connections provided by the two implementations available in - JOnAS : "dbm" service or "resource" service are transactionals. It means - that the auto-commit flag is disabled and the data will be changed only - when the global transaction is committed. "dbm" is emulating the 2 phase - commit mode while "resource" service is compliant with the 2phase commit - mode. So users should use the resource service. - - A rollback() call will forget all the changes done during the - transaction. - - - In Bean Managed Mode, the commit() shouldn' t be forget, else - the changes won't occur. - -
    - -
    - Datasource configuration and parameters - -
    - connchecklevel - - This parameter is used to check the JDBC connections before - returning them to the client. If there is a failure, a new connection - is retrieved and the current one is discarded. - - Values are : - - - - 0 : No check. - - - - 1 : Check if the connection is open - - - - 2 : Performs an operation on the database. connteststmt - parameter is used as a test statement. This ensures that the - connection is working - - - - 3 : Performs an operation on the database at a periodic time - and not at each request as it's done for check level 2. - - -
    - -
    - connteststmt - - if connechecklevel parameter is equals to 2 or 3, this statement - will be used to perform checks on the database. -
    - -
    - connmaxage - - This time is used to keep a physical connection in the JDBC - connection pool. Once this timeout is reached, the connection will be - dropped and a new physical connection will be established if the pool - needs more connections. - - - The connection will be closed only when it is no more - used. - -
    - -
    - maxopentime - - DEPRECATED - - Time after which a logical connection will be closed if it is - not used anymore and if it is not anymore in a transaction. - - - There is a new way for detecting and closing connections that - is replacing this parameter. The JDBC connection leak is closing - connections sooner (at the end of the methods) and is not relying on - a timeout. For example, if a JDBC pool has 10 connections and if all - these connections have not been closed, users have to wait - maxOpenTime seconds before the connections will be closed while it - should have been done quickly with the new tool. - -
    - -
    - initconpool - - Size of the JDBC connection pool at startup -
    - -
    - minconpool - - Minimum number of JDBC connections that needs to be kept into - the pool -
    - -
    - maxconpool - - Maximum number of JDBC connections that a pool can reach. If - there are more requests than free connections, the requests are paused - (see maxwaitime and maxwaiters) -
    - -
    - maxwaitime - - Maximum wait time for connection requests when the JDBC pool has - no more free JDBC connections -
    - -
    - maxwaiters - - Maximum requests that can wait a free JDBC connection from the - JDBC pool when the full is full (no more free connections). Other - requests will receive an exception -
    - -
    - pstmtmax - - Number of "preparedStatement" objects that can be stored in a - cache. If this number is high, this can speedup the creation of - prepared statement as it is already cached but it can consume a lot of - memory - - - - 0 : Infinite cache - - - - -1 : cache is disabled - - -
    - -
    - pstmtcachepolicy - - Policy for handling the prepared statement. - - Bu using the map policy instead of the list policy, the same - statement can be cached multiple times while with the list policy only - one prepared statement is cached for given statement -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/transactions/transactional-resources.xml b/jonas_doc/core/src/docbook/doc-en/transactions/transactional-resources.xml deleted file mode 100644 index 345e7de340d74351229d68cbb09dd186a1335076..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/transactions/transactional-resources.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - Transactional resources - -
    - Introduction - - A transactional resource is listening to transactions and is - receiving notifications from different steps of the lifecycle of the - transaction - -
    - How to register a resource - - This is done by using transaction.enlistResource(XAResource - xaResource) method -
    - -
    - Available callbacks - - commit(), end(), forget(), prepare(), rollback(), start() are - the callbacks of a XAResource -
    -
    - -
    - Synchronization objects - - These objects are notified during the lifecycle of a - transaction. - -
    - How to register a synchronization object - - This is done by using registerSyncrhonization(Synchronization - sync) method -
    - -
    - Available callbacks - - javax.transaction.Synchronization interface provides the - following callbacks - - - - beforeCompletion() : Called before committing a - transaction - - - - afterCompletion(int) : Called once the transaction has been - committed or rollbacked - - -
    -
    - -
    - Java EE components that can be attached to a transaction - - A stateful session bean can be attached to the current transaction - if the bean implements the javax.ejb.SessionSynchronization interface. - Then there is the following callbacks: - - - - afterBegin() : Called when a transaction is starting - - - - beforeCompletion() : Called before committing a - transaction - - - - afterCompletion(boolean) : Called once the transaction has - been committed or rollbacked - - -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/transactions/transactions-and-exceptions.xml b/jonas_doc/core/src/docbook/doc-en/transactions/transactions-and-exceptions.xml deleted file mode 100644 index 1f289b41b28d3468686f2813995ff4e48c2e4377..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/transactions/transactions-and-exceptions.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - Transactions and Exceptions - -
    - Exceptions on EJB business methods - -
    - Transaction started by the caller - - More details are available in the management of the transactions - of the EJB specification available at http://jcp.org/en/jsr/detail?id=318 - -
    - Applicative exception - - The exception is thrown to the client and the setRollbackOnly() - method will be called only if a flag is applied on the exception - through ApplicationException annotation or by using XML - - For example, - @ApplicationException(rollback=true) - found on an exception class means that the transaction needs to be - rollbacked when this exception is thrown. - - @ApplicationException or - @ApplicationException will only throws - the exception without asking to rollback the transaction. -
    - -
    - Other exceptions - - EJBTransactionRolledBackException is thrown and setRollbackOnly - method is called -
    -
    - -
    - Transaction started by the container - -
    - Applicative exception - - The exception is thrown to the client and there is a rollback of - the current transaction -
    - -
    - Other exceptions - - EJBException is thrown and there is a rollback of the - transaction started by the container -
    -
    -
    - -
    - Difference between local and global transactions - - There is a difference in the handling of the transactions if the - transaction is propagated or not. - - A global transaction implies that all the resources are attached to - a global transactional monitor while for a local transaction, only one - resource is attached to a single transactional monitor. - - By using the Container Managed Transaction mode in JOnAS, all the - error cases are well managed and are JTA and Java EE compliant. -
    - -
    - Transactions with "MARKED FOR ROLLBACK" state - -
    - What means a transaction with this status - - A transaction with the "MARKED FOR ROLLBACK" status is a - transaction that will ends with a rollback. This flag could have been - set automatically (with transaction timeout set in - JONAS_BASE/conf/jonas.properties) or programatically by a call to the - setRollbackOnly() method) - - These transactions can not be killed. Container needs to wait the - end of the business method in order to perform a rollback on the - transaction. - - - If business methods have a processing time longer than the - transaction timeout, then all the actions performed will be rollbacked - automatically as the transaction manager will have applied the - MARKED_FOR_ROLLBACK flag. So the timeout may be adjusted based on the - average processing time of the methods - -
    -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/transactions/transactions-in-jonas.xml b/jonas_doc/core/src/docbook/doc-en/transactions/transactions-in-jonas.xml deleted file mode 100644 index 3272cbcdbcbebef99ea8a0d03da7c5fc0d99c41a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/transactions/transactions-in-jonas.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - Transactions and their usage in JOnAS Application server - - Transaction in JOnAS are managed by the JOnAS Transaction Service with - a default implementation provided by the OW2 JOTM Project implementing JTA - interface - -
    - JOnAS and Transactions - - There are several ways to interact with JTA objects in JOnAS. The - JNDI access is the older way to get these resources. By using dependency - injection, a way introduced in Java EE 5, there is no extra lookup step to - do but the resulting object is the same in all the ways to get - resources. - -
    - Access through JNDI - - JTA objects can be retrieved in JNDI by using lookup methods on - the InitialContext: - - UserTransaction : UserTransaction object allows to - start/commit/rollback a transaction for example. - - new InitialContext().lookup("java:comp/UserTransaction") - - - http://docs.oracle.com/javaee/5/api/javax/transaction/UserTransaction.html - - - TransactionSynchronizationRegistry : It allows to register - synchronization objects - - new InitialContext().lookup("java:comp/TransactionSynchronizationRegistry") - - - - http://docs.oracle.com/javaee/5/api/javax/transaction/TransactionSynchronizationRegistry.html - -
    - -
    - Access through annotations - - @Resource annotation on JTA objects allows to inject JTA resources - in Java EE components. - - For example : - - @Resource -private UserTransaction userTransaction -
    - -
    - Access through OSGi Enterprise services - - javax.transaction.UserTransaction and - javax.transaction.TransactionManager interfaces are also available as - OSGi services. as specified in the OSGi Enterprise specification. -
    -
    - -
    - Transactional Context - - Transactions can be distributed. JOnAS will manage the propagation - of the transactional context from one server to another one. JOnAS relies - on RMI interceptors for this. - - The transaction context is associated to a thread. It means that - during the execution of a method, the transaction can be retrieved by - using this transactional context. -
    - -
    - Parameters of the transactional monitor - -
    - setRollbackOnly() - - This allows to set a flag on the current transaction in order to - tell that this transaction can not be committed and the only resulting - operation is the rollback() - - This can be called programatically or by an automatic way, which - is done in JOnAS by the transaction timeout. By default JOnAS comes with - a 60 seconds timeout. See JONAS_BASE/conf/jonas.properties (parameter is - jonas.service.jtm.timeout) - - # Set the default transaction timeout, in seconds. -jonas.service.jtm.timeout 60 - - - a setRollbackOnly() call don't stop the current thread. It waits - the end of the execution of the current method and only when it falls - back to the container, transaction will be rollbacked. - -
    -
    - -
    - Use JOnAS transaction manager with Spring Framework - - The following txManager can be used - - <bean id="txManager" class="org.springframework.transaction.jta.JtaTransactionManager" /> - - This manager will delegate all the transactional aspects to the - application server. The JOnAS transaction manager is retrieved by using - java:comp/UserTransaction object. - -
    - Implementation of transactions with Spring - - Unlike for EJB, the transactions are defined by using - advices. - - <!-- this is the service object that we want to make transactional --> -<bean id="fooService" class="x.y.service.DefaultFooService"/> - -<!-- the transactional advice (i.e. what 'happens'; see the <aop:advisor/> bean below) --> -<tx:advice id="txAdvice" transaction-manager="txManager"> - <!-- the transactional semantics... --> - <tx:attributes> - <!-- all methods starting with 'get' are read-only --> - <tx:method name="get*" read-only="true"/> - <!-- other methods use the default transaction settings --> - <tx:method name="*"/> - </tx:attributes> -</tx:advice> - -<!-- ensure that the above transactional advice runs for any execution of an operation - defined by the FooService interface --> -<aop:config> - <aop:pointcut id="fooServiceOperation" expression="execution(* x.y.service.FooService.*(..))"/> - <aop:advisor advice-ref="txAdvice" pointcut-ref="fooServiceOperation"/> -</aop:config> -
    -
    - -
    - Use JOnAS transaction manager with Hibernate - - Hibernate can delegate all the transactional part to the transaction - manager of the server. This is done by configuration - - <property name="hibernate.transaction.manager_lookup_class" - value="org.hibernate.transaction.JOTMTransactionManagerLookup"/> - - The JTA mode needs also to be set - - hibernate.transaction.factory_class = org.hibernate.transaction.JTATransactionFactory -
    -
    diff --git a/jonas_doc/core/src/docbook/doc-en/variables.xml b/jonas_doc/core/src/docbook/doc-en/variables.xml deleted file mode 100644 index 2f2f68b018a431ad1430ae15579069f0febf3e93..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/variables.xml +++ /dev/null @@ -1,43 +0,0 @@ - -
    - Variables used - - This document is an hidden document only used for defining string - variables used elsewhere in the documentation. - - - Remember that a variable MUST - have an xml:id attribute to be referenced - correctly. - - - JOnAS - - 5 - - OW2 - - Java EE - - JOnAS 5 - - Tomcat 6.0.13 - - EasyBeans - - OSGi - - Hibernate - - EclipseLink -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-en/web_pg.xml b/jonas_doc/core/src/docbook/doc-en/web_pg.xml deleted file mode 100644 index 3a374cde457053b5a562c353d2a33a8822b66805..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/web_pg.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - Web Application Programmer's Guide - - - - JOnAS Team - - - - BENOITFlorent - - - - - This work is licensed under the Creative Commons - Attribution-ShareAlike License. To view a copy of this license,visit - http://creativecommons.org/licenses/by-sa/2.0/deed.en - or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, - California 94305, USA. - - - - 2008-2009 - - OW2 consortium - - - March 2009 - - - - - Web Application Programmer's Guide - - -
    - - Target Audience and Content - - - The target audience for this guide is the Enterprise Bean - provider, i.e. the person in charge of developing the software - components on the server side and, more specifically, the web - components. -
    - - - - - - - - -
    - - - - Appendix - - - - -
    diff --git a/jonas_doc/core/src/docbook/doc-en/xmltips.xml b/jonas_doc/core/src/docbook/doc-en/xmltips.xml deleted file mode 100644 index 018db9f4a7ff9d61c077297d9a2a21ceae30956c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-en/xmltips.xml +++ /dev/null @@ -1,71 +0,0 @@ - -
    xml Tips - - - Although some characters, such as ">", are legal, it is good practice to replace them with XML entity references. - - - The following is a list of the predefined entity references for XML: - - - - - - - &lt; - - - < - - - less than - - - - - &gt; - - - > - - - greater than - - - - - &amp; - - - & - - - ampersand - - - - - &apos; - - - ' - - - apostrophe - - - - - &quot; - - - " - - - quotation mark - - - - - -
    \ No newline at end of file diff --git a/jonas_doc/core/src/docbook/doc-fr/howtoJOnASDocBook.xml b/jonas_doc/core/src/docbook/doc-fr/howtoJOnASDocBook.xml deleted file mode 100644 index a0bbdb7067b6aff8316140236846f6ee23771de3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/docbook/doc-fr/howtoJOnASDocBook.xml +++ /dev/null @@ -1,2267 +0,0 @@ - - - - La Documentation JOnAS - - - - JOnAS Team - - - - Coq - Philippe - - - - Durieux - Philippe - - - - - 2007-2008 - - OW2 consortium - - - juin 2008 - - - - - Preface - - - Ce document s'adresse aux contributeurs (nombreux, espérons le..) - qui auront à participer à l'amélioration de la documentation JOnAS. - - Il est fortement conseillé de le lire avant de contribuer car - l'infrastructure de fabrication de la documentation a complètement changé - par rapport à l'ancienne documentation JOnAS. Avant il fallait écrire - directement la documentation en HTML. Maintenant, la technologie utilisée - est XML DocBook qui a l'avantage de bien séparer la partie contenu de la - présentation et de permettre de générer cette documentation sous - différents formats. Ce document est censé décrire comment écrire, - fabriquer, publier la documentation JOnAS. Nous avons profité de ce - changement pour intégrer la documentation dans SVN. - - Le document est organisé de la manière suivante: - - - - décrit la structure du projet - SVN aussi bien du point de vue des fichiers initiaux (DocBook, - feuilles de style) que des fichiers générés (HTML,pdf,war) - - - - décrit brièvement l'utilisation d'un - outil possible et conseillé pour écrire la doc en DocBook - (XMLmind) - - - - n'est pas un manuel de référence mais - c'est un chapitre qui donne des liens sur des documents intéressants - sur DocBook, et des solutions à quelques problèmes. Ce chapitre - devrait être en constante évolution pour constituer une base de - connaissance. - - - - se veut une collection de bonnes - pratiques dont le but pricipal est d'obtenir une documentation - homogène quelque soit le nombre de rédacteurs. - - - - - - - L'infrastructure de la documentation JOnAS - - -
    - - Description - - - La documentation JOnAS compose le module SVN jonas_doc du repository jonas . - - Dans ce projet va être mis en oeuvre le DocBook Xslt Publishing - Model qui est décrit dans ce - diagramme - -
    - - Structure du module SVN jonas_doc - - - Le module SVN jonas_doc a la structure suivante: - - - - - - - - Avec: - - - - olddoc - - - contient les fichiers html correspondant à l'ancienne doc - JOnAS. Devrait etre detruit tres prochainement - - - - - src/docbook/doc-en - - - contient les fichiers xml correspondants aux documents - anglais écrits en docBook - - - - - src/docbook/doc-fr - - - contient les fichiers xml correspondants aux documents - français écrits en docBook - - - - - resources - - - contients les images, les stylesheets xls ou css - - - - - tools - - - contient le processeur Apache FOP utilisé pour fabriquer - les documents pdf. - - - -
    - -
    - - Structure des sources de la documentation livrée (guides en - anglais) - - - L'ensemble des fichiers xml permettant de générer les guides - JOnAS se trouve sous le directory - jonas_doc/src/docbook/doc-en . Le directory est - structuré en sous-répertoires de façon a retrouver facilement les - documents sources. Cette structure est aujourd'hui la suivante: - - - - - admin - - administration de JOnAS - - - - anttasks - - toutes les taches ant - - - - clustering - - clustering dans JOnAS - - - - commands - - toutes les commandes de JOnAS - - - - deploy - - deploiement - - - - howto - - Les "howto" - - - - install - - Installation de JOnAS - - - - log - - Logging - - - - migration - - Ensemble des documents pour la migration d'une - version de JOnAS a une autre - - - - protocols - - les protocoles - - - - ra - - les "resource adaptor" - - - - security - - la securite - - - - services - - cmi - - service cmi - - - - db - - service db - - - - dbm - - service dbm - - - - discovery - - service discovery - - - - ear - - service ear - - - - ejb2 - - service ejb2 - - - - ejb3 - - service ejb3 - - - - ha - - service ha - - - - jmx - - service jmx - - - - jtm - - service jtm - - - - mail - - service mail - - - - registry - - service registry - - - - resource - - service resource - - - - security - - service security - - - - web - - service web - - - - wm - - service wm - - - - ws - - service ws - - - - - - Tous les documents finaux (les guides) sont à la racine - (doc-en). Ils utilisent de maniere quasi systématiques des xi:include - pour intégrer des morceaux de documents situés n'importe ou dans cet - arbre. -
    -
    - -
    - - Générer la doc JOnAS via ant - - - La génération de la doc se fait via ant. Il existe une target par - document, ainsi que des target pour enchainer un ensemble de documents - : - - - - - - target - - description - - - - - - clean - - delete all generated files - - - - all - - rebuild toute la doc - - - - war - - fabrique le jonas-doc-en.war - qui sera integré dans la distribution JOnAS - - - - local - - fabrique les documents non distribues (ce guide, - par exemple) - - - - dist - - fabrique tous les documents livres - - - - guides - - enchaine la fabrication de tous les guides - - - - essai - - fabrique le document essai.xml, utilise pour divers - essais - - - - ear - - J2EE Application Deployer's Guide - - - - client - - J2EE Client programmer's guide - - - - clustering - - JOnAS Clustering Guide - - - - connector - - J2EE Connector programmer's guide - - - - webpg - - Web Application programmer's guide - - - - ejb2pg - - ejb2 programmer's guide - - - - j2eepg - - j2ee programmer's guide - - - - config - - configuration guide - - - - anttasks - - anttasks manual - - - - howto - - fabrique les howto - - - - bamboo - - fabrique le continuous_integration_guide (bamboo) - - - - migration - - migration guide - - - - started - - getting started guide - - - - deployer - - deployer guide - - - - admin - - administration guide - - - - command - - command guide - - - - copydist - - copy toutes les images et l'index.html livrés - - - - copylocal - - copy toutes les images pour les docs locales - - - - - - Les documents livrés sont genérés sous 3 formes : - - - - un document html unique via la target html - - - - un document partitonné en chunk via la - target chunk - - - - un document pdf à partir du document XSL-FO via la target - pdf - - - - un document en format XSL-FO - des renseignements sur ce format peuvent être trouvés - - ici - (formatting object) via la target fo - - - - Ces target ne sont pas appelables directement. On doit donc - générer les 3 formats à chaque fois pour chaque document. - - Les targets html , fo et chunk - dépendent de la target xslt qui utilise - xsltproc. - - Dans le cas d'un environnement Windows, le chemin vers - l'exécutable xsltproc devra être - présent dans le PATH du système. L'exécutable et ces dll associées sont - présents dans le répertoire tools/win32. - - Les transformations XML docBook -> HTML se fait via les - feuilles de styles html.xsl et - chunk.xsl - - la transformation XML-> XSL-FO se fait via la feuille de style - fo.xls - - Ces feuilles de style se trouvent dans la directory resources - - - Ces feuilles de styles en incluent d'autres qui se trouvent sous - tools/docbook-xsl-1.73.2/html/docbook.xsl - -
    - -
    - - Structure de la doc générée via ant - - - Toute la doc genérée va sous un directory output, qui est - structuré ainsi: - - - - dist Tous les documents - livrés - - - - local Tous les documents - locaux - - - - tmp fichiers temporaires - - - - war le fichier war à integrer dans - la distribution JOnAS - - - - Les 2 repertoires dist et local ont la même - structure: - - - - doc-en (documents en - anglais) - - chunk - - - - html - - - - pdf - - - - doc-fr (documents en - français) - - chunk - - - - html - - - - pdf - - - - resources images, feuilles de - style, ... - - images - - - - -
    - -
    - - Publier la doc sur le site JOnAS - - - Deux machines rentrent en ligne de compte jonas.forge.objectweb.org et jonas.objectweb.org - - La machine jonas.forge.objectweb.org - est la machine de développement, jonas.objectweb.org est la machine de - publication. - - Sur la machine jonas.forge.objectweb.org il y a une zone - accessible via webdavs qui contient : - - - - Une directory current contenant la documentation de JOnAS 4.8 - EE - - - - Une directory doc contenant un ensemble de doc et tutoriels - plus ou moins vieux - - - - Une directory JOnAS_4_7 contenant la documentation de JOnAS - 4.7 - - - - Une directory pour la doc JOnAS5 (ayant le nom du tag - correspondant) contenant: - - - - une directory doc qui contient l'equivalent du output/dist - de la doc jonas 5 - - - - une directory jdoc qui contient la javadoc - correspondante - Rappel: pour JOnAS 5 la javadoc se génère en faisant - mvn javadoc:javadoc - - - - - - - Une directory pour la doc JOnAS4 (ayant le nom du tag - correspondant) contenant: - - - - une directory doc qui contient l'equivalent du output/dist - de la doc jonas 4 - - - - une directory jdoc qui contient la javadoc - correspondante - Rappel: pour JOnAS 4 la javadoc se génère en faisant - ant javadoc - - - - - - - La publication de la doc se fait en deux phases: - - - - Mise à jour de jonas.forge.objectweb.org - - On utilise Konqueror avec l'URL: - webdavs://jonas.forge.objectweb.org:8002/ - - Il suffit de copier les repertoires avec la souris (doc-en et - resources) depuis le directory output/dist de la doc. - - - - Mise à jour de jonas.objectweb.org - - Se mettre sous l'onglet admin de - la forge JOnAS: - - - - - - - - - - Cliquer sur le bouton de publication " Push Project - Web Site from Development to Production Now !" - - - - - - - - Cette opération consiste à copier le contenu de la zone - webdavs de jonas.forge.objectweb.org sur jonas.objectweb.org et de faire un merge avec - le contenu du sous projet web (ancien site web) du projet - JOnAS. - - - ll est à noter que le contenu de web/html sera copié - directement sous jonas.objectweb.org. C'est ainsi que sont - publiés les démos sous http://jonas.ow2.org/demos/, les dtd sous - http://jonas.ow2.org/dtds/ et les schémas sous - http://jonas.ow2.org/ns/. - - - - - -
    - -
    - - Personnalisation de la doc JOnAS - - - Il y a trois niveaux de personnalisation possibles - - - - personnalisation des transformations Docbook->autres - formats (HTML ou XSL-FO) - - L'idée est de fournir une couche de personnalisation ( - Customization layer ) via une feuille de style - .xls qui permet de modifier certains paramétres comme la profondeur - de la table des matières, la manière de numéroter les chapitres, - sections etc... - - pour une transformation DocBook->HTML les paramètres - que l'on peut positionner sont décrits - ici. - - - - pour une transformation DocBook-> XSL-FO les - paramètres positionnables sont décrits - ici . - - - - les feuilles de styles utilisées pour la doc JOnAS se - trouve dans la directory resources et sont: - - - - html.xls - - - utilisée dans la génération d'un document - monolitique - - - - - chunk.xls - - - utilisée dans la génération d'un document - segmenté. (elle aurait besoin d'amélioration). - - - - - fo.xls - - - utilisée dans la génération d'un document - pdf - - - - - - - pour trouver des renseignements sur les - Customization layer se reporter au - Chapter 8. Customization methods du livre DocBook XSL: The - Complete Guide - 3rd Edition - - - - - - personnalisation de la présentation des documents HTML - - On ne positionne pas de caractéristiques de présentation dans - le document DocBook lui même, mais plutôt dans des Cascading Style - Sheets ( .css). - - On peut se reporter au chapitre Using - CSS to style HTML pour plus de renseignements - - La feuille de style utilisée est - resources/common.css - - - - personnalisation de la présentation des documents pdf. Pour - cette personnalisation il faut apprendre à connaitre le langage - XSL-FO! - - on peut se reporter: - - au tutoriel W3C - Introduction to XSL-FO - - - - au - FO Parameter Reference document - - - - La feuille de style utilisee est - resources/fo.xls Elle permet d'élaborer une - page de garde appropriée en fonction des bookinfo. Elle pourrait - permettre d'améliorer la présentation des document pdf actuel mais - il y a encore du travail à faire. - - -
    - -
    - - Problèmes connus - - - La génération des chaines variables via la directive xi:include - pose un problème quand cette chaine apparait dans un lien - - exemple : - - <a href="#id2">abcde <span ><a - name="appserver"></a>fghijk</span></a> - - Le html généré par les feuilles de styles xls n'est pas valide - voici le compte rendu du validateur html du W3C: - - - Essai2 avec <span> - - <a name="appserver"></a> - - JOnAS</span></a></span> The element named - above was found in a context where it is not allowed. This - could mean that you have incorrectly nested elements -- such - as a "style" element in the "body" section instead of inside - "head" -- or two elements that overlap (which is not allowed). - One common cause for this error is the use of XHTML syntax in - HTML documents. Due to HTML's rules of implicitly closed - elements, this error can create cascading effects. For - instance, using XHTML's "self-closing" tags for "meta" and - "link" in the "head" section of a HTML document may cause the - parser to infer the end of the "head" section and the - beginning of the "body" section (where "link" and "meta" are - not allowed; hence the reported error). - - - Le workaround utilisé est de processer les fichier html générés et - remplacer <a name="appserver"></a> par rien (car par chance - seule la string variable JOnAS apparait dans des href) -
    -
    - - - - L'outillage de développement: XMLmind - - -
    - - Utiliser l'outil XMLmind (xxe) - - - L'outil XMLmind (xxe) permet de travailler en wysiwyg. C'est une - alternative intéressante à un editeur basic de style emacs. Il permet en - outre de ne pas avoir à connaitre tous les tags docbook puisqu'il les - propose dans ses menus. - - Pour l'utiliser, il suffit de lancer la commande: - xxe - - On peut trouver de la documentation en français dans le Guide de - l'utilisateur de l'éditeur XML de XMLmind V3.4 -
    - -
    - - Personnaliser son environement XMLmind - - - Pour créer un nouveau document, le plus simple est de copier un - document existant et de modifier ensuite son contenu, récupérant ainsi - facilement toute sa structure - - Pour personnaliser son environement xmlmind il faut: - - - - positionner dans les options d'edit - (Options>Options>Edit) le toggle XInclude. - - - - positionner l'option UTF-8 dans le menu Options - Preferences - - Save - - -
    - -
    - - Naviguer d'un document à l'autre - - - - - pour modifier le document inclu : - - cliquer sur une partie de celui-ci puis Edit > Document - Reference> Edit Referenced Document - - ou cliquer sur l'icone de droite que l'on voit - ci-dessous - -
    - - - - - - - - - -
    -
    - - - pour revenir au document référençant : - - cliquer sur l'icone de gauche de la figure ci-dessus (en - haut à gauche de l'ecran) - - ou faire Edit > Document Reference> Edit Referencing - Document. - -
    -
    -
    - - - - Apprendre à maitriser DocBook - - - On enumere ici quelques recettes pour resoudre des pbs courants. - Cette liste n'est absolument pas exhaustive. On peut trouver de la - documentation utile dans plusieurs documents listes en . On peut aussi s'inspirer de ce document lui-meme, - ecrit bien sur en docbook. Il suffit de comparer le source .xml et le - rendu en html. La feuille de style utilisee est la meme que pour les docs - JOnAS. - -
    - - Faire une documentation en Français - - -
    - - Declaration d'un book en français - - - Comment faire pour qu'aprés transformation on obtienne dans une - documentation française chapitre au lieu de chapter, table des - matières au lieu de table of contents etc...? - - Il suffit de rajouter l'attribut xml:lang="fr" dans l'élément - book ainsi: - - <book xml:lang="fr"> -
    - -
    - - Saisie des caractères accentués - - - Il a été décidé d'utiliser le format UTF-8 pour écrire - l'ensemble de la doc, y compris les documents en français. Ceci - implique de bien faire attention à positionner dans l'en-tête du - fichier xml: - - <?xml version="1.0" encoding="UTF-8"?> - - De même, lorsqu'on utilisera un éditeur, il faudra être certain - qu'il travaille dans le bon format. Il faut aussi s'assurer que le - format du fichier est bien UTF-8. On peut pour cela utiliser gedit et - sauver le fichier dans le bon format. Avec xxe, il faut positionner - l'option save en UTF-8 (menu Options - Preferences - Save) sinon on va - se retrouver avec un document converti dans le mauvais format! - - Avant de lancer un éditeur (emacs ou xxe par exemple): Il faut - positionner - - export LC_CTYPE=fr_FR.UTF-8 - - On pourra alors lire et écrire des accents sans problème: - àùûéôâîèêç § ÀÙÛÉÇÔÂÎÈÊ→ -
    -
    - -
    - Représenter un fragment de code - - On a souvent besoin de présenter des parties de codes, des - fichiers de conf, des parties d'affichage d'écran alphanumérique pour - lesquels on a besoin de faire du telquel (les - coupures de lignes doivent être respectées). - - En DocBook nous pouvons utiliser les éléments <screen>,<programlisting>, <literallayout> qui ont à peu prés les - mêmes caractéristiques. - - Ces éléments seront différentiés à la présentation par la feuille - de style .css (pour le html). - - Nous reservons : - - - - <programlisting> - - - pour la présentation d'une portion de code assez long, et - qui sera affiché avec un scrollbar en html. - - - - - <literallayout> - - - pour la présentation d'une portion de code plus court, et - qui sera affiché sans scrollbar en html. - - - - - <screen> - - - pour la présentation d'une copie d'écran, sans - scrollbar. - - - - - Par exemple, dans le document présent nous réservons <literallayout> pour montrer du code - docBook et <screen> pour le - résultat du code précédent cf . -
    - -
    - - Faire des tableaux - - - On utilise en général la balise <informaltable> sous - laquelle on trouve une balise tgroup qui précise le nb de colonnes du - tableau. Sous <tgroup> on trouve 2 parties: <thead> pour la - partie en-tête, et <tbody> pour le corps du tableau. Les - <thead> et <tbody> ont la même structure, mais n'auront pas - le même rendu html, défini dans la feuille de style. - - Avec xxe, on pourra utiliser le menu approprié, dans la barre - d'outils : informaltable(head_row) - - Exemple de tableau très simple, avec le code xml correspondant - : - - - - - - header 1 - - header 2 - - - - - - elt 1 - - description 1 - - - - elt 2 - - description 2 - - - - - - -<informaltable> - <tgroup cols="2"> - <thead> - <row> - <entry>header 1</entry> - <entry>header 2</entry> - </row> - </thead> - <tbody> - <row> - <entry>elt 1</entry> - <entry>description 1</entry> - </row> - <row> - <entry>elt 2</entry> - <entry>description 2</entry> - </row> - </tbody> - </tgroup> -</informaltable> - -
    - -
    - - Faire des liens - - -
    - - lien vers une partie du document (xref) - - - il faut positionnner l'attribut linkend - avec l' xml:id de la section, chapitre,... ou on - veut aller la chaine sensible sera le titre de la - section,chapitre,... - - exemple d'un lien xref vers une section : - - -se reporter au -<xref linkend="conventions" /> -... -<chapter xml:id="conventions"/> - <title>Conventions et règles diverses</title> - - - donnera: - - se reporter au -
    - -
    - - autres types de lien (link) - - - Cet élément contient une chaine de caracteres qui deviendra - sensible et un attribut linkend contenant l' - xml:id de l'endoit ou on veut aller - - Exemple de lien vers une partie du document : - - -se reporter à <link linkend="partiesection"> une partie de la section suivante</link> -... -<para xml:id="partiesection"> - - - donnera : - - se reporter à une partie de la section suivante - - On peut l'utiliser pour faire un lien sur une url ou pour faire - un lien sur une autre partie de la doc dont on connait la position - relative par rapport au document courant. - - Exemple de lien vers un document externe à la doc JOnAS : - - -exemple de lien vers <link xlink:href="http://www.objectweb.org/">objectweb</link> - - - donnera : - - exemple de lien vers objectweb - - On peut aussi faire un lien vers un autre document en relatif - par rapport à celui-ci. Il suffira de mettre comme valeur de xlink:ref - une chaine du style: ../doc_en/toto.html. - - Pour faire un lien vers un autre document de la doc JOnAS dont - on connait la localisation de l'html généré: - - -the <link xlink:href="command_guide.html#commands.jonas.jonasadmin">jonas admin command</link> - - - donnera: - - the jonas admin command -
    -
    - -
    - - Faire un exemple commenté d'un fichier de conf - - - Pour obtenir ceci: - - carol.protocols=jrmp -carol.jrmp.url=rmi://localhost:1099 - - - choice of the protocol or list of protocols - - - connexion url to the RMI registry - - - - Il faut un <screen> (ou <programlisting>) avec des - éléments <co> à l'endroit que l'on veut annoter avec un - identifiant comme attribut xml:id - - suivi d'un <calloutlist> ayant le meme nombre d'éléments - <callout> que d'annotations, chacun des callout ayant un attribut arearefs contenant l' xml:id de l'annotation correspondante. - - Voici le code xml correspondant: - - -carol.protocols=jrmp <co xml:id="id1" /> -carol.jrmp.url=rmi://localhost:1099 <co xml:id="id2" /> -<calloutlist> - <callout arearefs="id1"> - <para>choice of the protocol or list of protocols</para> - </callout> - <callout arearefs="id2"> - <para>connexion url to the RMI registry</para> - </callout> -</calloutlist> - - - A noter que l'insertion des annotations dans la ligne se fait très - simplement avec xxe. -
    - -
    - - Insérer des notes de bas de page - - - - - inserer une nouvelle note : - - - - insérer un élément footnote - - - - Voici un exemple de note - première note de bas de page - - - code correspondant: - - -Voici un exemple de note <footnote xml:id="firstnote"> - <para>première note de bas de page</para> - </footnote> - - - - - insérer une note pointant sur une note existante: - - - - positionner l'attribut xml:id de la note existante - - - - insérer un élément footnoteref l'attribut linkend a pour valeur l'attribut xml:id - de la note existante - - - - Voici une note référençant la précédente - - code correspondant: - - -Voici une note<footnoteref linkend="firstnote" /> référençant la précédente - - - -
    - -
    - Insérer des images - - Nous préconisons d'utiliser un élément <mediaobject> - incluant un élément <imagedata> - - pour positionner correctement les tailles aussi bien pour le - format HTML que PDF voir le chapitre - Image sizing - - - - - - Exemple d'image avec l'attribut width positionné à - 85%: - - Voici le code xml correspondant: - - <para><mediaobject> - <imageobject> - <imagedata width="85%" scalefit="1" fileref="../../resources/images/versioning-general-schema.png"></imagedata> - </imageobject> - </mediaobject></para>la même avec width = - 50%: - - - - - - -
    - -
    - - Utiliser des chaines de caracteres variables - - - le fichier variables.xml est un fichier - utilisé uniquement pour définir le contenu de chaines de caractères qui - risquent de changer (nom de projet, numéro de version, etc...): - - Ce fichier est consitué d'une section et - d'un ensemble de lignes contenant des déclarations du style : - <phrase xml:id="objectweb">ObjectwebV2</phrase> - objectweb étant l'identifiant utilisé dans les - documents sources, et ObjectwebV2 la valeur qui - sera finalement remplacée dans le fichier html (ou pdf) généré. - - Dans la document xml, il faudra insérer, à la place de - ObjectwebV2, un texte qui ressemble à : - - <xi:include href="../variables.xml" xpointer="objectweb"/> - - Avec xxe, on fera simplement : - - - - cliquer sur la chaine voulue dans variable.xml - - - - faire Edit>Document Reference>Copy as reference - - - - faire paste a l'endroit voulu dans le document - referencant - - -
    - -
    - - Inclure un document xml dans un autre - - - On peut utiliser la mécanique des xi:include décrite ci-dessus - pour inclure tout ou partie d'un document xml dans un autre. Il faudra - juste supprimer la partie xpointer si tout le document doit etre - inclus. - - Cette mécanique est largement utilisée dans la documentation - JOnAS, la plupart des books étant une liste de chapitres (ou annexes) - qui incluent des fichiers xml situés ailleurs - - Un exemple : - - <xi:include href="ra/JMSRA.xml"/> - - Sous xxe, on fera comme précédemment, mais il faudra ensuite - manuellement supprimer la partie xpointer. -
    - -
    - - Zone apparaissant avec barre de défilement - - - Pour obtenir ceci une barre de défilement permettant de scroller - une zone d'information importante, on utilisera une balise - programlisting : - - la (ou les) barre de défilement n'apparaitront pas dans le - document pdf bien sur. - - Exemple de présentation du fichier jonas.properties: - - -# Enable the Security context propagation (for jrmp) -jonas.security.propagation true - -# Enable the Security manager -# default value is true (if not set) -# Setting this to false implies a colocated registry and setting in carol.properties: -# carol.jvm.rmi.local.registry=true -jonas.security.manager false - -# Enable csiv2 -jonas.csiv2.propagation true - -# Enable the Transaction context propagation -jonas.transaction.propagation true - -# Set the name of log configuration file -jonas.log.configfile trace - -# Set to true if the server is a master -jonas.master false - - -# Set the list of the services launched in the JOnAS Server. -# Possible services are: registry,jmx,security,jtm,db,mail,wm,wc,dbm,resource,cmi,ha,versioning,ejb2,ejb3,ws,web,ear,depmonitor,discovery -# (registry and jmx are automatically started even if not present in the list) -# Order in the list is important (see 'Configuring JOnAS services' in JOnAS documentation) -# -jonas.services registry,jmx,jtm,db,dbm,security,wm,wc,resource,ejb2,ejb3,ws,web,ear,depmonitor - -# -###################### JOnAS Registry service configuration -# -# Set the name of the implementation class of the Registry service -jonas.service.registry.class org.ow2.jonas.registry.carol.CarolRegistryService - -# Set the Registry launching mode -# If set to 'automatic', the registry is launched in the same JVM as Application Server, -# if it's not already started. -# If set to 'collocated', the registry is launched in the same JVM as Application Server -# If set to 'remote', the registry has to be launched before in a separate JVM -jonas.service.registry.mode collocated - -# -###################### JOnAS JMX service configuration -# -# Set the name of the implementation class of the JMX service -jonas.service.jmx.class org.ow2.jonas.jmx.internal.JOnASJMXService - -# Set to true if the JMXRemote interface should require the client to provide -# authentication information. That information is provided when establishing -# the JMX connection, using the JMXConnector.CREDENTIALS key. -# -# Note that if you enable JMX security for a server, all clients (including -# any administration tool such as the domain master) connecting to this -# instance via JMX must provide a valid user name and password. -jonas.service.jmx.secured false - -# If jonas.service.jmx.secured is set to true, defines the authentication -# method and the method's parameter. For example, to use file-based -# authentication using the conf/jmx.passwords file, define: -# jonas.service.jmx.authentication.method jmx.remote.x.password.file -# jonas.service.jmx.authentication.parameter conf/jmx.passwords -# You are free to use the authentication provider you wish. -jonas.service.jmx.authentication.method jmx.remote.x.password.file -jonas.service.jmx.authentication.parameter conf/jmx.passwords -# You may for example choose to use JAAS LoginModule for authentication. -# In this case define the used configuration in the JAAS configuration file -# using the jonas.service.jmx.authentication.parameter: -# jonas.service.jmx.authentication.method jmx.remote.x.login.config -# jonas.service.jmx.authentication.parameter jaas-jmx - -# If jonas.service.jmx.secured is set to true, defines the authorization -# method and the method's parameter. For example, to use file-based -# authorization using the conf/jmx.access file, define: -# jonas.service.jmx.authorization.method jmx.remote.x.access.file -# jonas.service.jmx.authorization.parameter conf/jmx.access -# You are free to use the authorization provider you wish. -jonas.service.jmx.authorization.method jmx.remote.x.access.file -jonas.service.jmx.authorization.parameter conf/jmx.access -# You may for example choose to use role-based authorization manager -# configured using conf/jmx.rolebased.access file. In this case, define: -# jonas.service.jmx.authorization.method jmx.remote.x.access.rolebased.file -# jonas.service.jmx.authorization.parameter conf/jmx.rolebased.access - - -# -###################### JOnAS WorkCleaner service configuration -# -# Set the name of the implementation class of the wc service -jonas.service.wc.class org.ow2.jonas.workcleaner.internal.JOnASWorkCleanerService - -# Set the clean period in seconds -jonas.service.wc.period 300 - - -# -###################### JOnAS WorkManager service configuration -# -# Set the name of the implementation class of the wm service -jonas.service.wm.class org.ow2.jonas.workmanager.internal.JOnASWorkManagerService - -# Set the size of the worker thread pool -jonas.service.wm.minworkthreads 3 - -# Set the maximun size of the worker thread pool -jonas.service.wm.maxworkthreads 80 - -# Set the max # of seconds that a thread will wait for work -# This is used to shrink the worker thread pool back to minimum -jonas.service.wm.threadwaittimeout 60 - - -# -###################### JOnAS EJB 2 Container service configuration -# -# Set the name of the implementation class of the ejb2 service -jonas.service.ejb2.class org.ow2.jonas.ejb2.internal.JOnASEJBService - -# Set the XML deployment descriptors parsing mode (with or without validation) -jonas.service.ejb2.parsingwithvalidation true - -# If enabled, the GenIC tool will be called if : -# - JOnAS version of the ejb-jar is not the same version than the running JOnAS instance -# - Stubs/Skels stored in the ejb-jar are not the same than the JOnAS current protocols. -# By default, this is enabled -jonas.service.ejb2.auto-genic true - -# Arguments for the auto GenIC (-invokecmd, -verbose, etc.) -jonas.service.ejb2.auto-genic.args -invokecmd - -###################### JOnAS EJB 3 container service configuration -# -# Set the name of the implementation class of the EJB 3 service. -jonas.service.ejb3.class org.ow2.jonas.ejb.easybeans.EasyBeansService - -###################### JOnAS Versioning service configuration -# -# Set the name of the implementation class of the versioning service. -jonas.service.versioning.class org.ow2.jonas.versioning.internal.VersioningServiceImpl - -###################### JOnAS Web container service configuration -# -# Set the name of the implementation class of the web container service. -jonas.service.web.class org.ow2.jonas.web.tomcat6.Tomcat6Service -#jonas.service.web.class org.ow2.jonas.web.jetty6.Jetty6Service - -# Set the XML deployment descriptors parsing mode for the WEB container -# service (with or without validation). -jonas.service.web.parsingwithvalidation true - -###################### JOnAS WebServices service configuration -# -# Set the name of the implementation class of the WebServices service. -jonas.service.ws.class org.ow2.jonas.ws.axis.AxisService - -# Set the JServiceFactory to use -jonas.service.ws.factory.class org.ow2.jonas.ws.axis.JAxisServiceFactory - -# Set the XML deployment descriptors parsing mode for the WebServices -# service (with or without validation). -jonas.service.ws.parsingwithvalidation true - -# Set the WSDL Handler list for WSDL publication -# A minimum of 1 WSDLHandler is required ! -# This property is set with a coma-separated list of WSDLHandler properties -# file names (without the '.properties' suffix). -# Ex: file1,uddi (while the properties file names are -# file1.properties and uddi.properties) -jonas.service.ws.wsdlhandlers file1 - -# Set the Generator to use with wsgen -jonas.service.ws.wsgen.generator.factory org.ow2.jonas.generators.wsgen.generator.ews.EWSGeneratorFactory - -# Set the prefix that will be used to compute URL endpoints for web services -# Example of prefix: http://www.mydomain.com:8888 -jonas.service.ws.url-prefix - -# Set automatic WsGen mode on/off -# If set to 'true', WsGen will automatically be applied to all deployed archives (EjbJars, Webapps, Applications) -jonas.service.ws.auto-wsgen.engaged true - -# -###################### JOnAS EAR service configuration -# -# Set the name of the implementation class of the ear service. -jonas.service.ear.class org.ow2.jonas.ear.internal.JOnASEARService - -# Set the XML deployment descriptors parsing mode for the EAR service -# (with or without validation). -jonas.service.ear.parsingwithvalidation true - -# -###################### JOnAS DBM Database service configuration -# -# Set the name of the implementation class of the dbm service -jonas.service.dbm.class org.ow2.jonas.dbm.internal.JOnASDataBaseManagerService - -# Set the jonas DataSources. This enables the JOnAS server to load -# the data dources, to load related jdbc drivers, and to register the data -# sources into JNDI. -# This property is set with a coma-separated list of Datasource properties -# file names (without the '.properties' suffix). -# Ex: Oracle1,InstantDB1 (while the Datasources properties file names are -# Oracle1.properties and InstantDB1.properties) -jonas.service.dbm.datasources HSQL1 - -# -###################### JOnAS Mail service configuration -# -# Set the name of the implementation class of the mail service -jonas.service.mail.class org.ow2.jonas.mail.internal.JOnASMailService - -# Set the jonas mail factories. -# This property is set with a coma-separated list of MailFactory properties -# file names (without the '.properties' suffix). -# Ex: MailSession1,MailMimePartDS1 (while the properties file names are -# MailSession1.properties and MailMimePartDS1.properties) -jonas.service.mail.factories - -# -###################### JOnAS JTM Transaction service configuration -# - -# Set the name of the implementation class of the jtm service -jonas.service.jtm.class org.ow2.jonas.tm.jotm.JOTMTransactionService - -# Set the Transaction Manager launching mode. -# If set to 'true', TM is remote: TM must be already launched in an other JVM. -# If set to 'false', TM is local: TM is going to run into the same JVM -# than the jonas Server. -jonas.service.jtm.remote false - -# Set the default transaction timeout, in seconds. -jonas.service.jtm.timeout 60 - - -# -###################### JOnAS SECURITY service configuration -# -# Set the name of the implementation class of the security service -jonas.service.security.class org.ow2.jonas.security.internal.JonasSecurityServiceImpl - -# Realm used for CsiV2 authentication -jonas.service.security.csiv2.realm memrlm_1 - -# Realm used for Web Service authentication -jonas.service.security.ws.realm memrlm_1 - -# Registration of realm resources into JNDI -# Disable by default so configuration is not available with clients -jonas.service.security.realm.jndi.registration false - -# Enable security context check on Remote Login Module -jonas.security.context.check false - -# Path to the keystore file -jonas.security.context.check.keystoreFile /tmp/keystore - -# Pass used for the keystore file -jonas.security.context.check.keystorePass keystorepass - -# Alias (stored in the keystore) -jonas.security.context.check.alias FB - -# -###################### JOnAS J2CA resource service configuration -# -# Set the name of the implementation class of the J2CA resource service -jonas.service.resource.class org.ow2.jonas.resource.internal.JOnASResourceService - -###################### JOnAS DB service configuration -# -# Set the name of the implementation class of the db service (hsql for example) -jonas.service.db.class org.ow2.jonas.db.hsqldb.HsqlDBServiceImpl -jonas.service.db.port 9001 -jonas.service.db.dbname db_jonas -jonas.service.db.users jonas:jonas -# Multiple users -#jonas.service.db.users jonas:jonas,login:password - -###################### JOnAS Discovery service -# -# Set the name of the implementation class and initialization parameters -jonas.service.discovery.class=org.ow2.jonas.discovery.jgroups.JgroupsDiscoveryServiceImpl -# Uncomment this to set Multicast implementation -#jonas.service.discovery.class=org.ow2.jonas.discovery.internal.MulticastDiscoveryServiceImpl - - -##################### Properties for multicast impl. - -# For a master server, configure the client source port with this property -jonas.service.discovery.source.port=9888 -jonas.service.discovery.ttl=1 -jonas.service.discovery.multicast.address=224.224.224.224 -jonas.service.discovery.multicast.port=9080 - -# A multicast greeting message is sent out when discovery service is started. -# The starting server listens at the port jonas.service.discovery.greeting.port -# (default 9899) for a response for jonas.service.discovery.greeting.timeout miliseconds -# (default 1000 ms). If a pre-existing server has the same server name as this one, -# this server's discovery service will be terminated. -# Uncomment these two lines for multicast discovery -jonas.service.discovery.greeting.port=9899 -jonas.service.discovery.greeting.timeout=1000 - -##################### properties for JGroups impl. -jonas.service.discovery.jgroups.conf= jgroups-discovery.xml -jonas.service.discovery.group.name = JGroupsDiscovery -#Reconnection timeout for JGroups Channel, if it's closed on request. -jonas.service.discovery.reconnection.timeout = 5000 - -###################### JOnAS CMI service configuration -# -# Set the name of the implementation class of the CMI service. -jonas.service.cmi.class org.ow2.jonas.cmi.internal.CmiServiceImpl - -###################### JOnAS HA service configuration -# -# Set the name of the implementation class of the HA service. -jonas.service.ha.class org.ow2.jonas.ha.internal.HaServiceImpl - -# Set the JGroups configuration file name -jonas.service.ha.jgroups.conf jgroups-ha.xml - -# Set the JGroups group name -jonas.service.ha.jgroups.groupname jonas-rep - -# Set the SFSB backup info timeout. The info stored in the backup node is removed when the timer expires. -jonas.service.ha.gc.period 600 - -# Set the datasource for the tx table -jonas.service.ha.datasource jdbc_1 - -# Reconnection timeout for JGroups Channel, if it's closed on request. -jonas.service.ha.reconnection.timeout 5000 - -###################### JOnAS Deployment Monitor -# -# Set the name of the implementation class of the depmonitor service -# -jonas.service.depmonitor.class org.ow2.jonas.deployablemonitor.DeployableMonitorService -jonas.service.depmonitor.development true -jonas.service.depmonitor.directories -# List (comma separated) of exclusion patterns (based on names, not directories) -jonas.service.depmonitor.exclusions README - - - Voici le résultat attendu (dans un document HTML): - - - - - - -
    - -
    - - Générer un document pdf avec des bookmarks - - - Il suffit de rajouter dans la feuille de style fo.xsl: - - - <xsl:param name="fop1.extensions" select="1"/> - -
    -
    - - - - Conventions et règles diverses - - -
    - - Bonnes pratiques - - - dans ce § un certain nombre de règles sont énumérées afin - d'obtenir une documentation homogène: - - - - Eviter le style direct du genre - - First of all, we need to - define or you have to type the - following command. - - (sauf dans un tutorial) - - - - limiter les liens, utiliser l'inclusion - - - - Conventions typographiques pour les differents éléments - textuels: - - d'une manière générale la politique est de caracteriser - l'élément textuel via un element DocBook ce qui permettra de - s'occupper de la présentation de cet élément de manière fine dans la - feuille de style .css - . - - Donc, éviter emphasis et utiliser les - éléments possibles de DocBook comme filename, classname , property ,etc... - - dans xmlmind pour connaitre les éléments possibles surligner - la chaine de caractères puis faire ctrl-T (ou - convert) le nom des éléments apparaissent dans la - fenêtre à droite. A noter que certains élément peuvent être encore - précisé via l'éditeur d'attributs: à l'élément filename on peut préciser l'attribut - class avec les valeurs suivantes: - directory, devicefile, extension,etc... - - - - nom de directory: - - $JONAS_ROOT/conf - - utiliser filename + - attribut class= directory - - - - nom de fichier - - jonas.properties - - utiliser filename - - - - nom de propriete de configuration - - jonas.services - - - utiliser property - - - - nom de variable d'environnement - - JONAS_ROOT - - utiliser envar - - - - valeur de variable d'environnement - - /home/jr48 - - dépend du type de la valeur , si c'est un path - filename+directory si c'est une valeur prendre literal - - - - nom de classe java ou package : - - javax.mail.internet.MimePartDataSource - . - - utiliser classname - - - - nom d'interface java: - - javax.ejb.SessionSynchronization - . - - utiliser interfacename - - - - Voici un tableau permettant de controler le rendu pour les - différents éléments textuels(compte tenu de notre feuille de style - utilisée) : - - - - - - elements/attributs - - rendu du texte - - - - - - texte - - texte - - - - <emphasis>texte</emphasis> - - texte - - - - <emphasis - role="bold">texte</emphasis> - - texte - - - - <filename>texte</filename> - - texte - - - - <filename - class="directory">texte</filename> - - texte - - - - <filename - class="extension">texte</filename> - - texte - - - - <literal>texte</literal> - - texte - - - - <classname>texte</classname> - - texte - - - - <interfacename>texte</interfacename> - - texte - - - - <command>texte</command> - - texte - - - - <envar>texte</envar> - - texte - - - - <interfacename>texte</interfacename> - - texte - - - - <package>texte</package> - - texte - - - - <property>texte</property> - - texte - - - - <function>texte</function> - - texte - - - - <link - xlink:href="http://wiki.jonas.objectweb.org">texte</link> - - - texte - - - - - - voici la liste - des éléments possibles - - - - Identifier les éléments qui risquent d'etre référencés ou - inclu (chapitre, section, autres) en positionant l'attribut id de - l'élément XML DocBook correspondant : - - <section xml:id="config.cmi"> L'id - choisi doit être unique dans le document entier. - - On prend la convention de nommage suivante: prendre un nom qui - reflète la structure arborescente des sources (comme les package - java). - - -
    -
    - - - - References documentation externe - - - - - DocBook - XSL: The Complete Guide - - - C'est la bible! un peu mastoc mais il faut y revenir - régulièrement il est incontournable... - - - - - DocBook: - The Definitive Guide - - - pas mal non plus on y trouve parfois des choses différentes - que dans le précédent - - - - - - Manuel DocBook (en français) - - - a le mérite d'être en français... - - - - - DocBook - 5.0 The Transition Guide - - - Pour le passage à docBook 5 - - - - - - DocBook-XML et éditeur XMLmind (en français) - - - excellente introduction rapide à DocBook (une sorte de - DocBook pour les nuls...) - - - - - - HTML Parameter Reference - - - documentation de réference pour parametrisation des DocBook - XSL HTML stylesheets (pour generer des documents HTML - - - - - - FO Parameter Reference - - - documentation de réference pour paramétrisation des DocBook - XSL FO stylesheets (pour generer des documents XSL-FO utilisé pour - des documents finaux au format PDF. - - - - - Using - CSS to style HTML - - - comment utiliser css pour personnaliser un document - HTML - - - - -
    diff --git a/jonas_doc/core/src/pom/jonas-doc-en.pom b/jonas_doc/core/src/pom/jonas-doc-en.pom deleted file mode 100644 index 5ad251d743c00b1f4469ec78e97fb5d16391a6ae..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/pom/jonas-doc-en.pom +++ /dev/null @@ -1,55 +0,0 @@ - - - - - org.ow2 - ow2 - 1.3 - - 4.0.0 - org.ow2.jonas.documentation - jonas-doc-en - @VERSION@ - JOnAS :: Documentation - JOnAS documentation - English version - war - - http://jonas.ow2.org - 2002 - - - - Creative Commons Attribution-ShareAlike License - http://creativecommons.org/licenses/by/2.0/deed.en - - - - - diff --git a/jonas_doc/core/src/resources/WEB-INF/jonas-web.xml b/jonas_doc/core/src/resources/WEB-INF/jonas-web.xml deleted file mode 100644 index c506c09245fab223aa7c344a395ab03270261e85..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/WEB-INF/jonas-web.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - jonas-doc-en - - - true - - diff --git a/jonas_doc/core/src/resources/WEB-INF/web.xml b/jonas_doc/core/src/resources/WEB-INF/web.xml deleted file mode 100644 index c3970aba177fe887d51304189c735ae64f6807f6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/WEB-INF/web.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - JOnAS Documentation - - JOnAS Documentation. Online documentation can be found at : http://jonas.objectweb.org/doc/index.html - - - diff --git a/jonas_doc/core/src/resources/chunk.xsl b/jonas_doc/core/src/resources/chunk.xsl deleted file mode 100644 index 0bfeee9f0e96c38ade7ccb758862d0a8eb9aacaf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/chunk.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - common.css - - 2 - - 2 - - 1 - .png - - - en - - ../ - - diff --git a/jonas_doc/core/src/resources/common.css b/jonas_doc/core/src/resources/common.css deleted file mode 100644 index f3deab1d48e09ebec98fa6a9fa19820ea6bc24e7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/common.css +++ /dev/null @@ -1,218 +0,0 @@ -body { - # background: white url("../../resources/images/draft.png") repeat right top; - font-family: Arial, Helvetica, sans-serif; - font-size: 0.9em; -} - -table { - font-family: Arial, Helvetica, sans-serif; - font-size: 0.9em; - border: none; -} - -code { - font-family: Monospace; - font-size: 1em; -} - -p { - text-align: justify; - margin: 8px; -} - -ul { - margin: 2px; -} - -a:link { - color: #0000CC; - text-decoration: none; - font-style: normal; -} - -a:visited { - color: #0000CC; - text-decoration: none; -} - -a:hover { - color: red; - text-decoration: none; -} - -a:active { - color: #0000CC; - text-decoration: none; -} - -h1 { - line-height: 27px; - border-width: 1px; - border-style: solid; - border-color: #336699; - background-color: #E0ECF8; - color: #003399; - margin-top: 20px; - padding: 20px 0px 20px 50px; - font-size: 1.6em; -} - -h2 { - line-height: 27px; - font-weight: normal; - font-size: 1.2em; - border-color: #336699; - border-width: 1px 0px 1px 0; - border-style: solid none solid none; - background-color: #E0ECF8; - padding-left: 5px; - color: #3e80a2; -} - -h3, h4{ - color: #003399; - font-weight: bold; - font-size: 1.2em; -} - -h5, h6 { - color: #003399; - font-weight: italic; - font-size: 1.2em; -} - -tt { - font-size: 90%; - font-style: monospace; - color: #111111; -} - -pre { - padding: 5px; - background-color: #F4F4F4; - width: 65em; -} - -hr { - width: 100%; - height: 1px; - background-color: white; - border-width: 0px; - padding: 0px; - color: #CCCCCC; -} - -table p, dd p, li p { - margin: 0; -} - -.itemizedlist { - padding-top: 0; - padding-bottom: 0; - margin: 0; -} - -.orderedlist{ - padding-top: 0; - padding-bottom: 0; - margin: 0; -} - -.term { - font-weight: bold; -} - -.warning { - padding-bottom: 5px; - padding-left: 5px; - padding-right: 5px; - background-color: #FBDADA; -} - -.programlisting { - overflow: auto; - border: 1px dashed #9999cc; - max-height: 20em; -} - -.screen { - overflow: auto; - border: 1px dashed #9999cc; - width: 75em; -} - -.literallayout { - border: 1px solid #9999cc; - width: 65em; - background-color: #F4F4F4; - font-family: Monospace; - padding: 5px; -} - -.literallayout p { - margin: 0; -} - -.table-contents th { - background-color: #C0C9D8; - padding: 2px; - font-weight: bold; -} - -.table-contents td { - padding: 2px; - background-color: #EAEDF2; -} - -.informaltable th { - background-color: #C0C9D8; - padding: 2px; - font-weight: bold; -} - -.informaltable td { - padding: 2px; - background-color: #EAEDF2; -} - -.caution table, .note table { - border-color: #C0C9D8; - margin: 2px; -} - -.mediaobject { - border-top: 2px solid #FFFFFF; - border-bottom: 2px solid #FFFFFF; - border-color: #EAEDF2; - margin: 2px; - padding: 2px; -} - -.glossary dt { - border-bottom: 1px solid #9999cc; - background-color: ; - width: 6%; - margin-top: 5px; - padding: 1px; -} - -.property { - font-family: Monospace; - font-weight: italic; - font-size: 1em; -} - -.package { - font-family: Monospace; - font-weight: bold; - font-size: 1em; -} - -.calloutlist p { - padding: 0; - margin: 0; -} - -.author h3 { - font-size: 0.75em; -} diff --git a/jonas_doc/core/src/resources/common.xml b/jonas_doc/core/src/resources/common.xml deleted file mode 100644 index 75547552a74a19348817366fe555d08541975bad..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/common.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/fo.xsl b/jonas_doc/core/src/resources/fo.xsl deleted file mode 100644 index 0ca59797f29b61f9f21bfeb41eedc3f246e62d49..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/fo.xsl +++ /dev/null @@ -1,252 +0,0 @@ - - - - ]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - - - , - - - - - - ) - - - - - - - - - - - - - - - Copyright © - - - - - - - - - - - - - - - - - - - - - - - - - - - - -5em - -5em - - - - - - - - - - - - - - - JOnAS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 24pt - - - - - solid - 1pt - grey - 2pt - #E6E6E6 - - - - - - - - justify - false - - - - - - - - 2 - - - - - - - - - - 1 - - #edf8fd - - - - 1em - 1em - 1em - 7pt - 1px - dashed - #9999cc - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - - - - - wrap - \ - - - - - - - - diff --git a/jonas_doc/core/src/resources/footer.xml b/jonas_doc/core/src/resources/footer.xml deleted file mode 100644 index 5f6d48a6af6951ce3c0318900e7543a8c212ecf3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/footer.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - -
    -Log-in -Register -
    -Copyright © ObjectWeb 2006 - -
    Java, -and all Java-based trademarks, JMX and all JMX based trademarks, are -trademarks or registered trademarks of Sun Microsystems, Inc. in the -U.S. and other countries. Bull is independent of Sun Microsystems, -Inc.. -
    - - \ No newline at end of file diff --git a/jonas_doc/core/src/resources/html.xsl b/jonas_doc/core/src/resources/html.xsl deleted file mode 100644 index 3f0c5a1006b76806db92afe126a863e748dad991..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/html.xsl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - common.css - - - - 2 - - - en - - - - - - book toc - chapter toc - - - - - diff --git a/jonas_doc/core/src/resources/images/JonasSmall.png b/jonas_doc/core/src/resources/images/JonasSmall.png deleted file mode 100644 index ae4b1776b01dd83298ec4ab8d4efef55ad450196..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/JonasSmall.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/WP_distr.gif b/jonas_doc/core/src/resources/images/WP_distr.gif deleted file mode 100644 index 5be962e9d0cf153fb0f78fdaf18d62a48a75fcbb..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/WP_distr.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/admin-webmodule-virtual.png b/jonas_doc/core/src/resources/images/admin-webmodule-virtual.png deleted file mode 100644 index 93d57852b9884c69097f51e88b55504969ac4fc2..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/admin-webmodule-virtual.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/admintree.gif b/jonas_doc/core/src/resources/images/admintree.gif deleted file mode 100644 index 9a36a94cca03d09eaaa98ba6918ca8146c08c1db..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/admintree.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/Bamboo_WorkDirectory.gif b/jonas_doc/core/src/resources/images/bamboo/Bamboo_WorkDirectory.gif deleted file mode 100644 index b929687e4eeb1df816dac24e0941452dfeb61ede..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/Bamboo_WorkDirectory.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/BuildPlan_AntBuildDependency.gif b/jonas_doc/core/src/resources/images/bamboo/BuildPlan_AntBuildDependency.gif deleted file mode 100644 index 30b3df43c55ca30cd4fc400dc423c5d8ddc9d68a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/BuildPlan_AntBuildDependency.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/Builders.gif b/jonas_doc/core/src/resources/images/bamboo/Builders.gif deleted file mode 100644 index 39fce88fddeae31e5cd3f4e3b65b59e16bc39be7..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/Builders.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/Dashboard_CurrentActivty.gif b/jonas_doc/core/src/resources/images/bamboo/Dashboard_CurrentActivty.gif deleted file mode 100644 index 6002e87c038f2d249b824fda28b2708acedb268e..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/Dashboard_CurrentActivty.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/JDK_tailor.gif b/jonas_doc/core/src/resources/images/bamboo/JDK_tailor.gif deleted file mode 100644 index 4b5e47df438f06a246f16ffd629bc6c4514a9526..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/JDK_tailor.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/TestBuildPlan_ActivityLog.gif b/jonas_doc/core/src/resources/images/bamboo/TestBuildPlan_ActivityLog.gif deleted file mode 100644 index 9f7efd5facd13809182af6c944aacb1622dd15f6..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/TestBuildPlan_ActivityLog.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/TestBuildPlan_Dashboard_Run.gif b/jonas_doc/core/src/resources/images/bamboo/TestBuildPlan_Dashboard_Run.gif deleted file mode 100644 index e2edec8f8148618e461e8fb73f334e926407cd72..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/TestBuildPlan_Dashboard_Run.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/TestsBuild_Artifacts.gif b/jonas_doc/core/src/resources/images/bamboo/TestsBuild_Artifacts.gif deleted file mode 100644 index afb38c6240406aee86701b893a1a904db6b4ad02..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/TestsBuild_Artifacts.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/TestsBuild_BuilderConfig.gif b/jonas_doc/core/src/resources/images/bamboo/TestsBuild_BuilderConfig.gif deleted file mode 100644 index 1b9f4c896994b3ac633baece5035dcff7daa3ef9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/TestsBuild_BuilderConfig.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/TestsBuild_PlanDetail.gif b/jonas_doc/core/src/resources/images/bamboo/TestsBuild_PlanDetail.gif deleted file mode 100644 index 550baec57d64ce9963c8d071be59af800c175cf0..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/TestsBuild_PlanDetail.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/TestsBuild_sourcerepos.gif b/jonas_doc/core/src/resources/images/bamboo/TestsBuild_sourcerepos.gif deleted file mode 100644 index 41e0b0248e334bc46a93dd392e4a0bf7767dd513..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/TestsBuild_sourcerepos.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/ant_BuilderConfig.gif b/jonas_doc/core/src/resources/images/bamboo/ant_BuilderConfig.gif deleted file mode 100644 index 8a11fdbca2640c2c8d47d560831a73cfc41045ba..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/ant_BuilderConfig.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/ant_createplan.gif b/jonas_doc/core/src/resources/images/bamboo/ant_createplan.gif deleted file mode 100644 index b79f6346e05f09401a1c708c9fc0e4e297e09faa..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/ant_createplan.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/jb.config.gif b/jonas_doc/core/src/resources/images/bamboo/jb.config.gif deleted file mode 100644 index 1d40a29007bf172d8fc13cfefb6e4e1813d732bf..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/jb.config.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/main_tailor.gif b/jonas_doc/core/src/resources/images/bamboo/main_tailor.gif deleted file mode 100644 index d1f2eb7fc0be39227675481ee496d802ec5be953..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/main_tailor.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/maven_BuildArtifacts.gif b/jonas_doc/core/src/resources/images/bamboo/maven_BuildArtifacts.gif deleted file mode 100644 index 2b407911f53c528e296a1efc28d3e1b86c764410..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/maven_BuildArtifacts.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/maven_BuildNotification.gif b/jonas_doc/core/src/resources/images/bamboo/maven_BuildNotification.gif deleted file mode 100644 index b739ba64e76cdfb60c87e79b843179428b003d5d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/maven_BuildNotification.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/maven_BuilderConfig.gif b/jonas_doc/core/src/resources/images/bamboo/maven_BuilderConfig.gif deleted file mode 100644 index b120176f47742659c2af638efb77e07a875655da..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/maven_BuilderConfig.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/maven_CheckoutAndBuilding.gif b/jonas_doc/core/src/resources/images/bamboo/maven_CheckoutAndBuilding.gif deleted file mode 100644 index b67b720f41b1a39917d71d5de36c2aad3fe6d3e4..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/maven_CheckoutAndBuilding.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/maven_PlanDetail.gif b/jonas_doc/core/src/resources/images/bamboo/maven_PlanDetail.gif deleted file mode 100644 index 8e7589fad70a65dd6193be61b804f559760f6f3e..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/maven_PlanDetail.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/maven_PostAction.gif b/jonas_doc/core/src/resources/images/bamboo/maven_PostAction.gif deleted file mode 100644 index b5550d0b5dad54435dcb9921915ebb929203a468..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/maven_PostAction.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/maven_sourcerepos_step2.gif b/jonas_doc/core/src/resources/images/bamboo/maven_sourcerepos_step2.gif deleted file mode 100644 index 0780a2fdef0c7f5cd08a40080e33c2aed780a98a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/maven_sourcerepos_step2.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/bamboo/variables.gif b/jonas_doc/core/src/resources/images/bamboo/variables.gif deleted file mode 100644 index 4d7e37e03dff6d271709eb8322fc655e9256f651..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/bamboo/variables.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/1.png b/jonas_doc/core/src/resources/images/callouts/1.png deleted file mode 100644 index 7d473430b7bec514f7de12f5769fe7c5859e8c5d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/1.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/10.png b/jonas_doc/core/src/resources/images/callouts/10.png deleted file mode 100644 index 997bbc8246a316e040e0804174ba260e219d7d33..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/10.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/11.png b/jonas_doc/core/src/resources/images/callouts/11.png deleted file mode 100644 index 46121f1a822db4e7d10d9122cfda7a10b3f6b272..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/11.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/12.png b/jonas_doc/core/src/resources/images/callouts/12.png deleted file mode 100644 index 637d85d1ea242bf0c5d51faba013502316fd5333..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/12.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/13.png b/jonas_doc/core/src/resources/images/callouts/13.png deleted file mode 100644 index a40b663cc309a8227782fbde6eb6b0ec0b1fb0c9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/13.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/14.png b/jonas_doc/core/src/resources/images/callouts/14.png deleted file mode 100644 index 9eefdfa50ed78ccf0f13585c4bd96152a6ca1649..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/14.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/15.png b/jonas_doc/core/src/resources/images/callouts/15.png deleted file mode 100644 index 76f43a5e9c4d92910ca1c753fba3135d8f58ba2b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/15.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/2.png b/jonas_doc/core/src/resources/images/callouts/2.png deleted file mode 100644 index 5d09341b2f6d2ea2d1d5dad5d980f14b4b05dfd2..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/2.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/3.png b/jonas_doc/core/src/resources/images/callouts/3.png deleted file mode 100644 index ef7b70047158970cf4e09f1bab2954d39c2d596b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/3.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/4.png b/jonas_doc/core/src/resources/images/callouts/4.png deleted file mode 100644 index adb8364eb5d21ecdd4086e16110b62ddcb42aa4a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/4.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/5.png b/jonas_doc/core/src/resources/images/callouts/5.png deleted file mode 100644 index 4d7eb460021e845981861d77614539314f553993..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/5.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/6.png b/jonas_doc/core/src/resources/images/callouts/6.png deleted file mode 100644 index 0ba694af6c07d947d219b45a629bd32c60a0f5fe..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/6.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/7.png b/jonas_doc/core/src/resources/images/callouts/7.png deleted file mode 100644 index 472e96f8ac36862c5645732f2fff19d06ee11a8e..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/7.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/8.png b/jonas_doc/core/src/resources/images/callouts/8.png deleted file mode 100644 index 5e60973c213b37df93666c5a00724f34493974ae..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/8.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/callouts/9.png b/jonas_doc/core/src/resources/images/callouts/9.png deleted file mode 100644 index a0676d26cc2ff1de12c4ecdeefb44a0d71bc6bde..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/callouts/9.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/caution.png b/jonas_doc/core/src/resources/images/caution.png deleted file mode 100644 index a202411e72a69114fd0c3f576417e6d326fe05b8..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/caution.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/Apache.jpg b/jonas_doc/core/src/resources/images/clusterfiles/Apache.jpg deleted file mode 100644 index 655aff768400f28cb4a3e86faa7168c4f0d1f285..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/Apache.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/Archi1.jpg b/jonas_doc/core/src/resources/images/clusterfiles/Archi1.jpg deleted file mode 100644 index 03feb5aa927c4857f228ec93a8a5218aa5bf4067..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/Archi1.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/Archi2.jpg b/jonas_doc/core/src/resources/images/clusterfiles/Archi2.jpg deleted file mode 100644 index 1d033eea02f49c77e76f54719666b6788b86df1a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/Archi2.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/Archi3.jpg b/jonas_doc/core/src/resources/images/clusterfiles/Archi3.jpg deleted file mode 100755 index dd55df07b9b4fb4a87c69d5fc5edd9d7c1d1beed..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/Archi3.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/Archi4.jpg b/jonas_doc/core/src/resources/images/clusterfiles/Archi4.jpg deleted file mode 100755 index fee3be2dd925b7e88c112a8067afbebe7a01908c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/Archi4.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/Archi5.jpg b/jonas_doc/core/src/resources/images/clusterfiles/Archi5.jpg deleted file mode 100644 index 1b6db93a6dfc08800eace4778d5f0086976913fd..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/Archi5.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/Architecture.jpg b/jonas_doc/core/src/resources/images/clusterfiles/Architecture.jpg deleted file mode 100755 index 9909f0933b394ccf9e5af22636877daac211c214..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/Architecture.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/EJBCont.jpg b/jonas_doc/core/src/resources/images/clusterfiles/EJBCont.jpg deleted file mode 100644 index 189ac4ece612e393b235ae693d5a5da2534be301..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/EJBCont.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/FullJOnAS.jpg b/jonas_doc/core/src/resources/images/clusterfiles/FullJOnAS.jpg deleted file mode 100644 index 5c0f4c94903b7144fe382a5e0d19ffc54c42ba31..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/FullJOnAS.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/JOnASEJB.jpg b/jonas_doc/core/src/resources/images/clusterfiles/JOnASEJB.jpg deleted file mode 100644 index 8cecf3fb4fe1bcc6f1949129e33f13ae0e16d3e7..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/JOnASEJB.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/JOnASWeb.jpg b/jonas_doc/core/src/resources/images/clusterfiles/JOnASWeb.jpg deleted file mode 100644 index 1a40e8d3ae4003049884fde8e2915e3a72c3232b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/JOnASWeb.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/Node.jpg b/jonas_doc/core/src/resources/images/clusterfiles/Node.jpg deleted file mode 100644 index d753ca8184e4c814d65eca6b5b401358a2fe6e4d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/Node.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/WebCont.jpg b/jonas_doc/core/src/resources/images/clusterfiles/WebCont.jpg deleted file mode 100644 index a8e1d13d499b7ed1a542a3eafdbbf1bd34c5bb91..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/WebCont.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clusterfiles/sampleCluster2Screen.GIF b/jonas_doc/core/src/resources/images/clusterfiles/sampleCluster2Screen.GIF deleted file mode 100644 index 06fa589c44a09fac8d6d6569b6061515d6e4749d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clusterfiles/sampleCluster2Screen.GIF and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/clusterd.png b/jonas_doc/core/src/resources/images/clustering/clusterd.png deleted file mode 100644 index ef7aa5319767b341903e5531f688dc4cadf56a6d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/clusterd.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/clusterd.svg b/jonas_doc/core/src/resources/images/clustering/clusterd.svg deleted file mode 100644 index 4e9c51d99602ea1ebfb42c9ebd7af66a3738c6ba..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/clusterd.svg +++ /dev/null @@ -1,969 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - Management host - Host A - Host B - - - - master node - - JMX getServersList()startAllJOnAS()startJOnAS(node1)stopAllJOnAS()stopJOnAS(nodeN)pingJOnAS(node1) - - - - - JOnASnode 1 - JOnASnode N - ClusterDaemon - - - - - - - local startstopping - - local startstopping - - - - JOnASnode N+1 - JOnASnode N+M - ClusterDaemon - - - - - - - - - - - domain.xml - - - - - clusterd.xml - - - - - clusterd.xml - diff --git a/jonas_doc/core/src/resources/images/clustering/clustersolution.png b/jonas_doc/core/src/resources/images/clustering/clustersolution.png deleted file mode 100644 index 442fea9863b1e298ee7273739e5dae289ab3a934..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/clustersolution.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/clustersolution.svg b/jonas_doc/core/src/resources/images/clustering/clustersolution.svg deleted file mode 100644 index 0f9f1319060bfd8b6c2d541efe7eb9e4eff744b1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/clustersolution.svg +++ /dev/null @@ -1,1098 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - HTTP - - - JOnASweb 1 - - - JOnASweb 2 - - - - - JOnASEJB 3 - - - JOnASEJB 4 - - - - java client - - - - database - - - Web clustering - HTTP load-balancing [mod_jk] - HTTP session HA [tomcat] - - - - EJB clustering - EJB load-balancing [CMI] - EJB session HA [HA service] - - - JMS clustering - JMS load-balancing [Distributed JORAM] - JMS HA [JORAM HA] - - - - Cluster management - Centralized console [domain management] - Advanced administration [JASMINe] - - - - - - - - Apache/jk - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/cmi_cluster.png b/jonas_doc/core/src/resources/images/clustering/cmi_cluster.png deleted file mode 100644 index d2553267f600e1b5add19e65d1524b4baa73a4c5..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/cmi_cluster.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/cmi_cluster.svg b/jonas_doc/core/src/resources/images/clustering/cmi_cluster.svg deleted file mode 100644 index 77ced4e7f2190c5dfc00bfe883adb08eb4e6f633..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/cmi_cluster.svg +++ /dev/null @@ -1,1477 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - node 1 Load-balancingFail-over - EJB clustering with CMI/HA service - - - EJB client - CMI proxy - EJB container - - - - CMI registry - node 2 - - - EJB container - - - - CMI registry - Registry replication SFSB replication - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config.svg b/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config.svg deleted file mode 100644 index 6d0c19b64201cc0f97a139ae594b4296bbd52c6d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config.svg +++ /dev/null @@ -1,1571 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - Apache/jk - - - - - - JOnAS1 - - CMI service server mode - - - - - - JOnAS2 - - java client Web tier - - - - JOnAS4 - Ejb tier - JOnAS3 - - - JOnAS4 - Ejb tier CMI service - JOnAS3 CMI service -Dcmi.conf.url="..../cmi-config.xml" - - - - JOnAS1 - - - - - - JOnAS2 - Web tier - - - JOnAS4 - Ejb tier - JOnAS3 - CMI service server mode - - CMI service server mode - - CMI service server mode - - CMI service client mode - - CMI service server mode - - CMI service server mode - - CMI service client mode - - - - - - - - - - - - - - - - - - - Apache/jk - - - - - - - - - - - - - <cmi xmlns="http://org.ow2.cmi.controller.common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jgroups="http://org.ow2.cmi.controller.server.impl.jgroups"> <server> <jndi> <protocol name="jrmp" noCmi="false" /> </jndi> <viewManager class="org.ow2.cmi.controller.server.impl.jgroups.JGroupsClusterViewManager"> <jgroups:config delayToRefresh="60000" loadFactor="100" confFileName="jgroups-cmi.xml" recoTimeout="30000" groupName="G1"> <components> <event /> </components> </jgroups:config> </viewManager> </server> <client noCmi="false" /></cmi> cmi-config.xml - <cmi xmlns="http://org.ow2.cmi.controller.common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jgroups="http://org.ow2.cmi.controller.server.impl.jgroups"> <server> <jndi> <protocol name="jrmp" noCmi="false" /> </jndi> <viewManager class="org.ow2.cmi.controller.server.impl.jgroups.JGroupsClusterViewManager"> <jgroups:config delayToRefresh="60000" loadFactor="100" confFileName="jgroups-cmi.xml" recoTimeout="30000" groupName="G1"> <components> <event /> </components> </jgroups:config> </viewManager> </server> <client noCmi="false" /></cmi> cmi-config.xml - <cmi xmlns="http://org.ow2.cmi.controller.common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jgroups="http://org.ow2.cmi.controller.server.impl.jgroups"> <client noCmi="false"> <jndi> <protocol> <providerUrls> <providerUrl>rmi://localhost:1099</providerUrl> <providerUrl>rmi://localhost:2001</providerUrl> </providerUrls> </protocol> </jndi> </client></cmi> cmi-config.xml - <cmi xmlns="http://org.ow2.cmi.controller.common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jgroups="http://org.ow2.cmi.controller.server.impl.jgroups"> <server> <jndi> <protocol name="jrmp" noCmi="false" /> </jndi> <viewManager class="org.ow2.cmi.controller.server.impl.jgroups.JGroupsClusterViewManager"> <jgroups:config delayToRefresh="60000" loadFactor="100" confFileName="jgroups-cmi.xml" recoTimeout="30000" groupName="G1"> <components> <event /> </components> </jgroups:config> </viewManager> </server> <client noCmi="false" /></cmi> cmi-config.xml - <cmi xmlns="http://org.ow2.cmi.controller.common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jgroups="http://org.ow2.cmi.controller.server.impl.jgroups"> <client noCmi="false"> <jndi> <protocol> <providerUrls> <providerUrl>rmi://localhost:1099</providerUrl> <providerUrl>rmi://localhost:2001</providerUrl> </providerUrls> </protocol> </jndi> </client></cmi> cmi-config.xml - diff --git a/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config_2tiers_client.png b/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config_2tiers_client.png deleted file mode 100644 index 1af5b25e9377de87954a785eef45fcc54e42fd2c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config_2tiers_client.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config_2tiers_server.png b/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config_2tiers_server.png deleted file mode 100644 index a45ab59a6b27100f4875cd96731cc5743e5b28a0..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config_2tiers_server.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config_javaclient.png b/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config_javaclient.png deleted file mode 100644 index fc880a1062a5202e7b8a3d2fe467d8c287553f36..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/cmi_cluster_config_javaclient.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/cmiv2.png b/jonas_doc/core/src/resources/images/clustering/cmiv2.png deleted file mode 100644 index f34aa874e8b872d948913ac658eaba145c463696..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/cmiv2.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/domain.cmi.cluster.png b/jonas_doc/core/src/resources/images/clustering/domain.cmi.cluster.png deleted file mode 100644 index 0160ebed580dde725051cde8cdc9d8835bb819ca..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/domain.cmi.cluster.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/domain.jk.cluster.member.png b/jonas_doc/core/src/resources/images/clustering/domain.jk.cluster.member.png deleted file mode 100644 index ade25a01a9afba988db9d86bbd14cf340a2bdcdd..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/domain.jk.cluster.member.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/domain.jk.cluster.png b/jonas_doc/core/src/resources/images/clustering/domain.jk.cluster.png deleted file mode 100644 index 52d70e59a2cd2ba3d54afddfc7db563a64741d47..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/domain.jk.cluster.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/domainmngt.png b/jonas_doc/core/src/resources/images/clustering/domainmngt.png deleted file mode 100644 index b2813e50dc60762ca767582933b7f9de2017c8dd..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/domainmngt.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/domainmngt.svg b/jonas_doc/core/src/resources/images/clustering/domainmngt.svg deleted file mode 100644 index 39ea510978059edd2ae75b5230cc6992f52b8086..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/domainmngt.svg +++ /dev/null @@ -1,948 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - Master - - - - J1 - - Node 1 - - J2 - - - J3 - J5 - - Node 2 - - J4 - - Node 3 - - J6 - Node 3 JMX start/stop start/stop - - - - domain management - - - mbean - - - mbean - - - mbean - - - - jonasAdmin console - - - - clusterdaemon - clusterdaemon - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/easybeans-logo.png b/jonas_doc/core/src/resources/images/clustering/easybeans-logo.png deleted file mode 100644 index 5719c21279e89fbd6161d8326066f718e14f9c9c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/easybeans-logo.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/ejbcluster.png b/jonas_doc/core/src/resources/images/clustering/ejbcluster.png deleted file mode 100644 index f9ee38e0c1c0eb5fa008b7969276c111b1c5ddea..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/ejbcluster.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/ejbcluster.svg b/jonas_doc/core/src/resources/images/clustering/ejbcluster.svg deleted file mode 100644 index 7839a352d61ce8120cfad470faf40837225631fa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/ejbcluster.svg +++ /dev/null @@ -1,1106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - Apache/jk - - - - - - - - EJB - - HTTP - - JOnAS1 - - - - - CMI registry - - - servlet - - - EJB - EJB - EJB CMI cluster HA service - - JOnAS3 - - - - - CMI registry - - - JOnAS2 - - servlet - - - - - - CMI registry - - JOnAS4 - - - - - CMI registry - - java client Web tier ejb tier - - - - Tx id - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/ejbfarm.png b/jonas_doc/core/src/resources/images/clustering/ejbfarm.png deleted file mode 100644 index 0c551c0974d046dd149bd8ae35f3297498117039..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/ejbfarm.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/ejbfarm.svg b/jonas_doc/core/src/resources/images/clustering/ejbfarm.svg deleted file mode 100644 index d62e9b762d29840b67152a15ed7e9aa5db3cf45b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/ejbfarm.svg +++ /dev/null @@ -1,962 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - Apache/jk - - - - - - - - EJB - - - - EJB - HTTP - - JOnAS1 - - servlet EJB EJB CMI cluster - - - - - - CMI registry - - JOnAS3 - - - - - CMI registry - - - JOnAS2 - - servlet - - - - - - CMI registry - - JOnAS4 - - - - - CMI registry - - java client Web tier ejb tier - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/httpcluster.png b/jonas_doc/core/src/resources/images/clustering/httpcluster.png deleted file mode 100644 index 222724ae4651d5c8aa9857bfd45caf90b7b6bcdb..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/httpcluster.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/httpcluster.svg b/jonas_doc/core/src/resources/images/clustering/httpcluster.svg deleted file mode 100644 index be6b43777ecc949078038c8cde18fde50f362a52..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/httpcluster.svg +++ /dev/null @@ -1,634 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - Apache/jk - - - - JOnAS1 - Node 1 - JOnAS2 - Node 2 - Session replication: dom1 - JOnAS3 - Node 3 - JOnAS4 - Node 4 - Session replication: dom2 AJP AJP - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/httpfarm.png b/jonas_doc/core/src/resources/images/clustering/httpfarm.png deleted file mode 100644 index dab85b402c4110178ea15fe29192ba79e36a31d9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/httpfarm.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/httpfarm.svg b/jonas_doc/core/src/resources/images/clustering/httpfarm.svg deleted file mode 100644 index e11c733ab7cf3b790fae2a6e0378c622bc41a797..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/httpfarm.svg +++ /dev/null @@ -1,500 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - Apache/jk - Apache/jk - JOnAS1 - JOnASN - TCPload-balancer - Node 1 - Node 2 - site url - - - - - - - ajp port ajp port - - diff --git a/jonas_doc/core/src/resources/images/clustering/jmscluster_a.png b/jonas_doc/core/src/resources/images/clustering/jmscluster_a.png deleted file mode 100644 index d2f6b9aa175e70bdbcf064a4205a44045bbd4875..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/jmscluster_a.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/jmscluster_a.svg b/jonas_doc/core/src/resources/images/clustering/jmscluster_a.svg deleted file mode 100644 index eec71fec42d12ae635f8f6880b95a98b9a5ecee6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/jmscluster_a.svg +++ /dev/null @@ -1,682 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - EJB - MDB - - EJB - MDB JOnAS - java client JMS JOnAS - - - - - Persistent storage (shared disks) - - - - - - - - - Node 1 IP address - Node 2 - diff --git a/jonas_doc/core/src/resources/images/clustering/jmscluster_b.png b/jonas_doc/core/src/resources/images/clustering/jmscluster_b.png deleted file mode 100644 index 9deaee5fcadc9b31add341ff8c9b86f4304e1445..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/jmscluster_b.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/jmscluster_b.svg b/jonas_doc/core/src/resources/images/clustering/jmscluster_b.svg deleted file mode 100644 index 8d78ef76cc08a9908bffd2cd8d41fe553f18710f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/jmscluster_b.svg +++ /dev/null @@ -1,691 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - EJB - MDB - - EJB - MDB JOnAS master - java client JMS JOnAS slave - - - - - - - - - Node 1 - Node 2 - - - - - - - - JORAM HA - diff --git a/jonas_doc/core/src/resources/images/clustering/jmsfarm_a.png b/jonas_doc/core/src/resources/images/clustering/jmsfarm_a.png deleted file mode 100644 index 08217b2b7597156df2077fad0d40ca05b970b1ef..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/jmsfarm_a.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/jmsfarm_a.svg b/jonas_doc/core/src/resources/images/clustering/jmsfarm_a.svg deleted file mode 100644 index 527968ce26e593bc33cf8ba19074e7be0d3f19da..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/jmsfarm_a.svg +++ /dev/null @@ -1,764 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - EJB - MDB Load distribution (JORAM) - - EJB - MDB JOnAS - - JOnAS - - servlet - - - - java client JMS JMS - ejb tier - JOnAS - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/jmsfarm_b.png b/jonas_doc/core/src/resources/images/clustering/jmsfarm_b.png deleted file mode 100644 index 315d64ab284dd7bebcf59846bf798965c4995ec5..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/jmsfarm_b.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/jmsfarm_b.svg b/jonas_doc/core/src/resources/images/clustering/jmsfarm_b.svg deleted file mode 100644 index cbc2af503dcd1a70b4b5fcac913f1ced5a3a1a39..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/jmsfarm_b.svg +++ /dev/null @@ -1,626 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - EJB - MDB - - EJB - MDB JOnAS - java client JMS JMS ejb tier JOnAS - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/jonas48repscenarios.jpg b/jonas_doc/core/src/resources/images/clustering/jonas48repscenarios.jpg deleted file mode 100644 index 499a7bc8c5a3d636e18e5ba046eb4ac071e1264d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/jonas48repscenarios.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/logo_jonas2.png b/jonas_doc/core/src/resources/images/clustering/logo_jonas2.png deleted file mode 100644 index 9b1fe6015f5707209d5e4a8ae49d0821e73dc6ca..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/logo_jonas2.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/myTomcatCluster.gif b/jonas_doc/core/src/resources/images/clustering/myTomcatCluster.gif deleted file mode 100644 index 48a78db9b34af224577077aa2ac8e22702cd6d2d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/myTomcatCluster.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/registry_replication.png b/jonas_doc/core/src/resources/images/clustering/registry_replication.png deleted file mode 100644 index a93af5d8edff33a3a39ca042e8a35bb6b9a6ad5d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/registry_replication.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/registry_replication.svg b/jonas_doc/core/src/resources/images/clustering/registry_replication.svg deleted file mode 100644 index 6ddd4f739d2b08fd549c11cadb3f41be8f2403b1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/registry_replication.svg +++ /dev/null @@ -1,1752 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - CMI registry replication - - - node 1 - - - - - CMI registry - - - - - RMIregistry - - - - node 3 - - - - - RMI registry - - - - - CMIregistry - - - - - - node 2 - - - - - - CMI registry - - - - RMIregistry - - - node 4 - - - - - - RMI registry - - - - CMIregistry - - JGroups GCPUDP or TCP based - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/sampleCluster2.png b/jonas_doc/core/src/resources/images/clustering/sampleCluster2.png deleted file mode 100644 index d7172a9322f4c1dc6624310aa5875034c9c1abdd..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sampleCluster2.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sampleCluster2.svg b/jonas_doc/core/src/resources/images/clustering/sampleCluster2.svg deleted file mode 100644 index 4e3894d985af70ee8184f01d86228a996e639598..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/sampleCluster2.svg +++ /dev/null @@ -1,1747 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - WEB - - - - - - sampleCluster2.ear - - java client - - myStateFulInner SFSB EJB - - - myEjb1 getInfoProps() SSB - myStateFul log() SFSB - myEntity jonasNamenumber CMP2 - sessionServlet servlet - sessionRsp.jsp JSP - - - releaseSessionServlet servlet - releaseSessionRsp.jsp JSP - - - checkSessionServlet servlet - checkSessionRsp.jsp JSP - - - - myEjb1 - session myStateFul - - - clientSFSBFO - clientLBRemote - - - index.html - - - - - jdbc_1 - - diff --git a/jonas_doc/core/src/resources/images/clustering/sampleCluster3.png b/jonas_doc/core/src/resources/images/clustering/sampleCluster3.png deleted file mode 100644 index 61183a547246cf31650c821a48a61bf172147461..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sampleCluster3.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sampleCluster3.svg b/jonas_doc/core/src/resources/images/clustering/sampleCluster3.svg deleted file mode 100644 index d2589d294311073466cb226514f034f06735b89f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/sampleCluster3.svg +++ /dev/null @@ -1,1684 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - sampleCluster3.ear - - java client - - - EJB - WEB - - - myStateless getInfoProps() SSB - myStateFul log() SFSB - Node jonasNamenumber POJO - sessionServlet servlet - sessionRsp.jsp JSP - - - releaseSessionServlet servlet - releaseSessionRsp.jsp JSP - - - checkSessionServlet servlet - checkSessionRsp.jsp JSP - - - - - session myStateFul - - - clientSFSBFO - clientLBRemote - - - index.html - - - - - jdbc_1 - - myStateFulInner SFSB - - diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jasmine_design.png b/jonas_doc/core/src/resources/images/clustering/sc/jasmine_design.png deleted file mode 100644 index cf265b01c651f0387cb40b6a295d882071dd1c09..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jasmine_design.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jasmine_eos.png b/jonas_doc/core/src/resources/images/clustering/sc/jasmine_eos.png deleted file mode 100644 index f985f0ef390f97ec61c6d9a01988265a7a99816d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jasmine_eos.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jkmanager.png b/jonas_doc/core/src/resources/images/clustering/sc/jkmanager.png deleted file mode 100644 index 173415d637d4e1e12255eb9ab58c5d560bd01cdd..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jkmanager.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_cluster_tab.png b/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_cluster_tab.png deleted file mode 100644 index c62f74bffb8f734a43c567edf9f69fb390dd4f88..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_cluster_tab.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_mbeans_attr.png b/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_mbeans_attr.png deleted file mode 100644 index fae9b12fa6fa1c6e06a5c74f1a77494c0025f6b6..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_mbeans_attr.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_object_info.png b/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_object_info.png deleted file mode 100644 index 7ec4280fef17e69d2f8fa26a95a95c7d00b27073..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_object_info.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_policies.png b/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_policies.png deleted file mode 100644 index 13eaa6f8926524ab17d521510a017f3215832627..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_policies.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_server_info.png b/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_server_info.png deleted file mode 100644 index ff2db4f19675bec01012f18e370f045f975a5e56..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_server_info.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_servers.png b/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_servers.png deleted file mode 100644 index 676b875cdcb9701b01716b7d1ec71886205175d3..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_servers.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_strategies.png b/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_strategies.png deleted file mode 100644 index 74ef344f16434e11f2ffd7a13b831a592a14053b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_strategies.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_tab.png b/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_tab.png deleted file mode 100644 index 7b1f7a6d55b835b08f44d2e902b461418cec3b31..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/sc/jonasadmin_cmi_tab.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_cluster_tab.png b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_cluster_tab.png deleted file mode 100644 index 1ac51ab9c43b935f2f9ccb56f2a354d9c72e2964..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_cluster_tab.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_cluster_tab.svg b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_cluster_tab.svg deleted file mode 100644 index af63df1b5bb26fb43b0857eb04fbdad1514067aa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_cluster_tab.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_mbeans_attr.png b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_mbeans_attr.png deleted file mode 100644 index cc0233e34120557e5bfa2f42e55c3b64c9390c32..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_mbeans_attr.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_mbeans_attr.svg b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_mbeans_attr.svg deleted file mode 100644 index d00c45d9f0e6db624e7a7a435ed219e515ca3fab..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_mbeans_attr.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_object_info.png b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_object_info.png deleted file mode 100644 index 3ad8c5698d21b8aeb1e786c94a357f01401e1a4e..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_object_info.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_object_info.svg b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_object_info.svg deleted file mode 100644 index 65799661526eed04ce2d2c202c98a76809c4db4b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_object_info.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_policies.png b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_policies.png deleted file mode 100644 index 7e2f781a43456893f8a5aebc53aa496eba859c32..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_policies.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_policies.svg b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_policies.svg deleted file mode 100644 index cb1949f793a7b265d2cd311018ea22e4bf2a8c76..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_policies.svg +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_server_info.png b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_server_info.png deleted file mode 100644 index d414f7daeea5c41a4cc726dd8765cd4e7f17c0b9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_server_info.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_server_info.svg b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_server_info.svg deleted file mode 100644 index 04a32cfa2db9008c75ac569b4310e67624970b57..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_server_info.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_servers.png b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_servers.png deleted file mode 100644 index 9183916095df87afd1ac017c47b89864e3d594db..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_servers.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_servers.svg b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_servers.svg deleted file mode 100644 index 8899125509cd3a09c5d0fe7c4ac625bac2a18398..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_servers.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_strategies.png b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_strategies.png deleted file mode 100644 index d441b2ce8f8aa6bab943e3cf15aa1ef3e104cd13..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_strategies.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_strategies.svg b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_strategies.svg deleted file mode 100644 index 4fe21efd17ddcd07afa8c2f9cc360b6c359bbbdf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_strategies.svg +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_tab.png b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_tab.png deleted file mode 100644 index 906ebadc61a32915945dec845230fec20f5936c0..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_tab.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_tab.svg b/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_tab.svg deleted file mode 100644 index 7de7a250d0c2c547f32fb548e6de8486532a9215..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/clustering/screenshot_jonasadmin_cmi_tab.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/src/resources/images/cmi.gif b/jonas_doc/core/src/resources/images/cmi.gif deleted file mode 100755 index d7b2b95876043fe8f7ea3d9525f4e58bb26f9a92..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/cmi.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/connect.gif b/jonas_doc/core/src/resources/images/connect.gif deleted file mode 100644 index eca4723fbcf67b9be29d94ef0d034891a9a687c2..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/connect.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/contextRootCustomization.png b/jonas_doc/core/src/resources/images/contextRootCustomization.png deleted file mode 100644 index 1686c29e242eabbb33b961e649fe26c06ff7d45d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/contextRootCustomization.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/customizedMBeanServer.png b/jonas_doc/core/src/resources/images/customizedMBeanServer.png deleted file mode 100644 index 94ea0430476415af365400dfdaf8b6710aa7bea4..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/customizedMBeanServer.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/defilement.gif b/jonas_doc/core/src/resources/images/defilement.gif deleted file mode 100644 index 40a2857742e9ee870839a0c1f939b2a1770375a2..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/defilement.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/deployment.gif b/jonas_doc/core/src/resources/images/deployment.gif deleted file mode 100644 index a56615186da873358780b5679ee07e11209f005a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/deployment.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/draft.png b/jonas_doc/core/src/resources/images/draft.png deleted file mode 100644 index 59673fe1cc03356ff609f90fc9939349890f996a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/draft.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/earsample-add-author.png b/jonas_doc/core/src/resources/images/earsample-add-author.png deleted file mode 100644 index 63219b5c963a05e4750c98946b5a0215fc37faea..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/earsample-add-author.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/earsample-architecture.png b/jonas_doc/core/src/resources/images/earsample-architecture.png deleted file mode 100644 index 677540d697923559efa4c2095defb5917134492f..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/earsample-architecture.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/earsample-authentication.png b/jonas_doc/core/src/resources/images/earsample-authentication.png deleted file mode 100644 index ba9d6aa3dc1e854979b11fe3aff61f42f9e40ce6..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/earsample-authentication.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/earsample-jpa-model.png b/jonas_doc/core/src/resources/images/earsample-jpa-model.png deleted file mode 100644 index 66f5170a6a376eadf5d3e93ad7a858ef3802c900..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/earsample-jpa-model.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/earsample-list-content.png b/jonas_doc/core/src/resources/images/earsample-list-content.png deleted file mode 100644 index 2ecad9f14c938ffdbf4d982515f4ed19189ca4ad..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/earsample-list-content.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/eb_img_31.gif b/jonas_doc/core/src/resources/images/eb_img_31.gif deleted file mode 100644 index b8f9dea7889aae9a61a4addaa86a410c7a82f0cd..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/eb_img_31.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/editbuttons.gif b/jonas_doc/core/src/resources/images/editbuttons.gif deleted file mode 100644 index 3f4f4ba2af5aeafb13726f5f79be811007eca130..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/editbuttons.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/filtering-loader.png b/jonas_doc/core/src/resources/images/filtering-loader.png deleted file mode 100644 index 205eac27070aec6028f74d2837813947636686aa..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/filtering-loader.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/firstpage.gif b/jonas_doc/core/src/resources/images/firstpage.gif deleted file mode 100644 index 5074d49867aa193ba36d760f84eb07147ee91c57..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/firstpage.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/forgeadmin.gif b/jonas_doc/core/src/resources/images/forgeadmin.gif deleted file mode 100644 index 90967e9fae92d1ea7960b54a6c017d2d3a4b294a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/forgeadmin.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/graphTest.png b/jonas_doc/core/src/resources/images/graphTest.png deleted file mode 100644 index 18a23910cbf46d6124ab24fd189db9599e60f333..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/graphTest.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/home.png b/jonas_doc/core/src/resources/images/home.png deleted file mode 100644 index 41a142c5d369e957c173455abd7d124351754b05..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/home.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/important.png b/jonas_doc/core/src/resources/images/important.png deleted file mode 100644 index 9c6be7f94cc4f2b1c4410c65385680f2748e11e3..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/important.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/info.png b/jonas_doc/core/src/resources/images/info.png deleted file mode 100644 index cf8e1deddf6980dd06c0472756fc60909c05b372..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/info.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jcaarch.gif b/jonas_doc/core/src/resources/images/jcaarch.gif deleted file mode 100644 index 004df595b8a7f26b8322c14e1dee9a0fd9723a85..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jcaarch.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jconsoleStackDumpList.png b/jonas_doc/core/src/resources/images/jconsoleStackDumpList.png deleted file mode 100644 index c4ee0aaadfbe6622b6d2281b24f071d770ad14b8..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jconsoleStackDumpList.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jconsoleStackDumpOperations.png b/jonas_doc/core/src/resources/images/jconsoleStackDumpOperations.png deleted file mode 100644 index 30303e7ec296612f5f458fe1783686a4f92de823..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jconsoleStackDumpOperations.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/Cluster JMS-JORAM-JOnAS.ppt b/jonas_doc/core/src/resources/images/jmsclustering/Cluster JMS-JORAM-JOnAS.ppt deleted file mode 100644 index 089dc372b50f84b7250afd3c993184a82ab8ca0b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/Cluster JMS-JORAM-JOnAS.ppt and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-queues.jpg b/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-queues.jpg deleted file mode 100644 index 2679df267329cf37d4a7bbc68b52d8524d49891d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-queues.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-queues.ppt b/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-queues.ppt deleted file mode 100644 index b0e7f636eb15992efb608f2bb4650abbc3a4e87f..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-queues.ppt and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-topics.jpg b/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-topics.jpg deleted file mode 100644 index d918f3857f049520d70427ce321de7f4924d6bb5..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-topics.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-topics.ppt b/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-topics.ppt deleted file mode 100644 index 95f8124df7e5c94ffc72995b2d9fbce26d5c4cd3..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/JmsClustering-topics.ppt and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/joram.jpg b/jonas_doc/core/src/resources/images/jmsclustering/joram.jpg deleted file mode 100644 index 08ce0e01009229ecdf99ea6b45cc3cbc9f1ab623..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/joram.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/joram_ha.jpg b/jonas_doc/core/src/resources/images/jmsclustering/joram_ha.jpg deleted file mode 100644 index a8e9a5f18e368c522721c28b5ca2d9266da87b25..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/joram_ha.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/mdbHa.ppt b/jonas_doc/core/src/resources/images/jmsclustering/mdbHa.ppt deleted file mode 100644 index 017d2ef9171e202f93f6fa2b53a4918fd5238ed4..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/mdbHa.ppt and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/mdbclustering.png b/jonas_doc/core/src/resources/images/jmsclustering/mdbclustering.png deleted file mode 100644 index f79a613776361338a08f47918a730f0a65df52ce..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/mdbclustering.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/mdbclustering.svg b/jonas_doc/core/src/resources/images/jmsclustering/mdbclustering.svg deleted file mode 100644 index 18eedc785f81b419ad6a9399cc5914481ce2705b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/jmsclustering/mdbclustering.svg +++ /dev/null @@ -1,1025 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - Host A - Host B Load-balancing - - - - - - JOnAS_A1 - - - JORAM_A1 - - - - - - - - - MDBlight consumer - - - JOnAS_A2 - - JORAM_A2 - - - - - - - - - MDBlight consumer - - - - JOnAS_B1 - - JORAM_B1 - - - - - - - - - MDBlight consumer - - JOnAS_B2 - - JORAM_B2 - - - - - - - - - MDBlight consumer - - - - - - JMS client - - - - - - - - - - - JORAM_HA2 JORAM_HA1 diff --git a/jonas_doc/core/src/resources/images/jmsclustering/queuelb.png b/jonas_doc/core/src/resources/images/jmsclustering/queuelb.png deleted file mode 100644 index e7c1359ba395965fb85254d468c4a98928dc1faa..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/queuelb.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmsclustering/queuelb.svg b/jonas_doc/core/src/resources/images/jmsclustering/queuelb.svg deleted file mode 100644 index 9e1d29ea79624bf60b3f22f3e9a028012b3aa69e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/images/jmsclustering/queuelb.svg +++ /dev/null @@ -1,611 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - JOnAS1 - JOnAS2 - - java client heavy producer - - - - - - Q - - - - - - - - - - Q - - - - - - - - - MDBlight consumer - - - MDBlight consumer - - - diff --git a/jonas_doc/core/src/resources/images/jmsclustering/topic.jpg b/jonas_doc/core/src/resources/images/jmsclustering/topic.jpg deleted file mode 100644 index db23deff71585b7e7398aec724a06002c2d837e9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmsclustering/topic.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jmxInterceptor.png b/jonas_doc/core/src/resources/images/jmxInterceptor.png deleted file mode 100644 index 17cd566ecf9512b961f19db11fcc3faa4de8ff1d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jmxInterceptor.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jndiInterceptor.png b/jonas_doc/core/src/resources/images/jndiInterceptor.png deleted file mode 100644 index 0338d7d1dc756459b5c1204f7bd6e3f922e8a2e9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jndiInterceptor.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jonas-classloaders.png b/jonas_doc/core/src/resources/images/jonas-classloaders.png deleted file mode 100644 index fc365033041047466605e4e34fc50fc6b82c5b43..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jonas-classloaders.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jonas-header.jpg b/jonas_doc/core/src/resources/images/jonas-header.jpg deleted file mode 100644 index f90843ad4e0ba5354cc36231518e8fff60efb0d1..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jonas-header.jpg and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jonasAdminDomain.gif b/jonas_doc/core/src/resources/images/jonasAdminDomain.gif deleted file mode 100644 index 3efe3573d3105bc458fbc7bb09355e54ef0a62a8..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jonasAdminDomain.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jonasAdminStackDump.png b/jonas_doc/core/src/resources/images/jonasAdminStackDump.png deleted file mode 100644 index f40f560b69442ad79a040b1a05c15a7cd32c0300..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jonasAdminStackDump.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/jonas_doc.gif b/jonas_doc/core/src/resources/images/jonas_doc.gif deleted file mode 100644 index 68a6250d7154c0b0bf9c83554f3b87e82558f83e..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/jonas_doc.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/loaders/bundle-class-space.png b/jonas_doc/core/src/resources/images/loaders/bundle-class-space.png deleted file mode 100644 index 8ecb1beba120c951a482428920b74303b7bba1c8..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/loaders/bundle-class-space.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/loaders/console-osgi.png b/jonas_doc/core/src/resources/images/loaders/console-osgi.png deleted file mode 100644 index 56d4d63dc7b360deb6a2dd608498963f21b29ad2..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/loaders/console-osgi.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/loaders/filtering-classloaders.png b/jonas_doc/core/src/resources/images/loaders/filtering-classloaders.png deleted file mode 100644 index 4a742659ed6fd997eed8b7c701f3ba287a7dc2de..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/loaders/filtering-classloaders.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/loaders/jonas-osgi-modules-libext.png b/jonas_doc/core/src/resources/images/loaders/jonas-osgi-modules-libext.png deleted file mode 100644 index 8040957bd86ee98b50b4ed77ee1770537bf08e61..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/loaders/jonas-osgi-modules-libext.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/loaders/jonas-osgi-modules-ultra-zoom.png b/jonas_doc/core/src/resources/images/loaders/jonas-osgi-modules-ultra-zoom.png deleted file mode 100644 index 5b2f48225263e0da4ed1c0ff0aedb969204850ef..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/loaders/jonas-osgi-modules-ultra-zoom.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/loaders/jonas-osgi-modules.png b/jonas_doc/core/src/resources/images/loaders/jonas-osgi-modules.png deleted file mode 100644 index 6dab2678863aa499e4a9b45daf5fab7169f26279..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/loaders/jonas-osgi-modules.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/loaders/jonas-round.png b/jonas_doc/core/src/resources/images/loaders/jonas-round.png deleted file mode 100644 index e3ff2e24f5348d18e353b387783ef54ebbfa7910..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/loaders/jonas-round.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/loaders/osgi-classloading.gif b/jonas_doc/core/src/resources/images/loaders/osgi-classloading.gif deleted file mode 100644 index c29fd8503ec80132a42a3218e353c021c7772797..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/loaders/osgi-classloading.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/loaders/system-loaders.png b/jonas_doc/core/src/resources/images/loaders/system-loaders.png deleted file mode 100644 index 03bccca395e9ba337619e099e99259cc50ca5651..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/loaders/system-loaders.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/logoow.gif b/jonas_doc/core/src/resources/images/logoow.gif deleted file mode 100644 index 65155d939124008e0084bf99be9696485194b94b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/logoow.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/monologExtension.png b/jonas_doc/core/src/resources/images/monologExtension.png deleted file mode 100644 index bf8c3650f01f7721c8041a1d315b932c90eee984..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/monologExtension.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/next.png b/jonas_doc/core/src/resources/images/next.png deleted file mode 100644 index 3903b5826e969e5d4cfd3c8d9e3380c4655b7f15..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/next.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/note.png b/jonas_doc/core/src/resources/images/note.png deleted file mode 100644 index 89d81dde2b574b03443c315e014bc4db1ab09b0c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/note.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/output.gif b/jonas_doc/core/src/resources/images/output.gif deleted file mode 100644 index 337baa605381fc182cb6dadfc7e76b61b9281f30..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/output.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/prev.png b/jonas_doc/core/src/resources/images/prev.png deleted file mode 100644 index 997acd06778e58212f6611093f676128e63a49c1..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/prev.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/publish.gif b/jonas_doc/core/src/resources/images/publish.gif deleted file mode 100644 index 3d819ef00bcd8493c42b16bf652215d237128cb4..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/publish.gif and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/service-dependencies.png b/jonas_doc/core/src/resources/images/service-dependencies.png deleted file mode 100644 index eabadea7165d4bc8c9b660d30f434c92aa5d6da2..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/service-dependencies.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/sharedASMultitenantLevel.png b/jonas_doc/core/src/resources/images/sharedASMultitenantLevel.png deleted file mode 100644 index 14b5f51110d8485d696fde7bb76edf1ae13bde35..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/sharedASMultitenantLevel.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/sharedDatabaseAndSchema.png b/jonas_doc/core/src/resources/images/sharedDatabaseAndSchema.png deleted file mode 100644 index 4d1a3f4fd6f865d09cf10be51d2343ee232cfd66..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/sharedDatabaseAndSchema.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/tenantAdminIsolation.png b/jonas_doc/core/src/resources/images/tenantAdminIsolation.png deleted file mode 100644 index 77fe08363aa34c7294aab78cbab679456a9e04fe..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/tenantAdminIsolation.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/tenantContext.png b/jonas_doc/core/src/resources/images/tenantContext.png deleted file mode 100644 index 9aa60a1bd4e58ab9c396e45015e33a50d56c828a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/tenantContext.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/tip.png b/jonas_doc/core/src/resources/images/tip.png deleted file mode 100644 index 02cfd13755972c446b961ea744c8eb8f7e03a025..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/tip.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/up.png b/jonas_doc/core/src/resources/images/up.png deleted file mode 100644 index cca063f3d4125e547b0e2d6b5982d045913f874d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/up.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/versioning-ejb-schema.png b/jonas_doc/core/src/resources/images/versioning-ejb-schema.png deleted file mode 100644 index 3d714308cb5d04d22286651419250c2cce47817b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/versioning-ejb-schema.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/versioning-general-schema.png b/jonas_doc/core/src/resources/images/versioning-general-schema.png deleted file mode 100644 index c3207914061b01b6612f76c59b6a956d5ed56481..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/versioning-general-schema.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/images/warning.png b/jonas_doc/core/src/resources/images/warning.png deleted file mode 100644 index 820a8f5c47be205c862362b89721976810d6593c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/src/resources/images/warning.png and /dev/null differ diff --git a/jonas_doc/core/src/resources/index.html b/jonas_doc/core/src/resources/index.html deleted file mode 100644 index f4e33e929238651e39adb517f3eee690c5c9a1cb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/src/resources/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - JOnAS Platform Documentation - - - - - - - diff --git a/jonas_doc/core/tools/docbook-5.0/ChangeLog b/jonas_doc/core/tools/docbook-5.0/ChangeLog deleted file mode 100644 index 13e557b938e0b960831e0e523effc5e23c829c7e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/ChangeLog +++ /dev/null @@ -1,1699 +0,0 @@ -2008-02-06 14:01 nwalsh - - * spec/docbook.xml: Fix document draft status - -2008-02-06 13:57 nwalsh - - * howto/howto.xml: Fixed pubdate - -2008-02-06 13:53 nwalsh - - * spec/docbook.xml: Fixed pubdate - -2008-02-06 13:52 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, spec/docbook.xml, src/admonitions.rnc, - src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/core.rnc, src/docbook.rnc, src/ebnf.rnc, - src/error.rnc, src/glossary.rnc, src/gui.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/keyboard.rnc, src/markup.rnc, - src/math.rnc, src/mathml.rnc, src/msgset.rnc, src/os.rnc, - src/pool.rnc, src/product.rnc, src/programming.rnc, - src/qandaset.rnc, src/refentry.rnc, src/refsect1.rnc, - src/sect1.rnc, src/svg.rnc, src/tasks.rnc, src/technical.rnc, - src/toc.rnc, src/xlink.rnc: DocBook V5.0 released - -2008-01-23 00:55 rlhamilton - - * howto/howto.xml: Copy edit for spelling, typos and minor - grammatical - glitches. Updated the link to the xsl2 stylesheet - snapshot. - -2007-12-16 17:03 nwalsh - - * tests/local/dtd.xml: Tweaked to test refsect2 bugs - -2007-12-14 19:17 mzjn - - * src/pool.rnc: Removed "other than a corporation" from refpurpose - for orgname. - -2007-12-07 17:55 kosek - - * howto/howto.xml: Added link to a new superentity file. - -2007-11-24 17:24 mzjn - - * howto/howto.xml: Fixed typo. - -2007-11-24 16:46 mzjn - - * howto/howto.xml: Some punctuation, spelling, and wording fixes. - -2007-11-17 14:33 mzjn - - * howto/howto.xml: Removed obsolete paragraph saying that profiling - stylesheets are needed for HTML Help, - JavaHelp, or Eclipse. - Added info about the warning message that is output if the - stylesheets are unable to - add @xml:base. - Changed Saxon 8 to Saxon 9. - -2007-11-10 16:50 kosek - - * howto/howto.xml: Add instructions for using JNVDL - -2007-11-10 09:31 kosek - - * howto/howto.xml: Prepare for 5.0 release - -2007-10-28 22:14 kosek - - * howto/howto.xml: Validation with XIncludes, new links - -2007-10-28 14:19 kosek - - * howto/howto.xml: Fixed typo - -2007-10-28 10:38 kosek - - * howto/TODO, howto/howto.css, howto/howto.xml: Small improvements, - updated to CR7 - -2007-10-28 10:20 kosek - - * howto/howto.xml: Information about referencing DocBook schema - -2007-10-27 21:48 kosek - - * howto/TODO, howto/howto.xml: Some additions for a new release - -2007-10-02 02:20 nwalsh - - * src/callouts.rnc: Fix typo in documentation for the units - enumeration - -2007-09-28 19:06 nwalsh - - * spec/docbook.xml: Updated for 5.0CR7 - -2007-09-28 18:50 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, src/admonitions.rnc, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/core.rnc, src/docbook.rnc, src/ebnf.rnc, src/error.rnc, - src/glossary.rnc, src/gui.rnc, src/hier.rnc, src/htmltbl.rnc, - src/index.rnc, src/keyboard.rnc, src/markup.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/os.rnc, src/pool.rnc, - src/product.rnc, src/programming.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/technical.rnc, src/toc.rnc, src/xlink.rnc: - DocBook V5.0CR7 released - -2007-09-28 18:34 nwalsh - - * src/admonitions.rnc, src/core.rnc, src/docbook.rnc, - src/error.rnc, src/gui.rnc, src/keyboard.rnc, src/markup.rnc, - src/os.rnc, src/pool.rnc, src/product.rnc, src/programming.rnc, - src/technical.rnc: Refactor to make the work of the Publishing - Subcommitee easier - -2007-09-27 18:09 nwalsh - - * spec/docbook.xml: Updated revision history - -2007-09-27 14:03 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, spec/docbook.xml, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: Version 5.0CR6 released - -2007-09-27 13:11 nwalsh - - * src/pool.rnc: Fix RFE 1759782: Allow uri anywhere email occurs - -2007-09-27 12:55 nwalsh - - * src/hier.rnc, src/pool.rnc: Fix (part of) RFE 1784312: Allow book - to be completely empty - -2007-09-27 12:52 nwalsh - - * src/pool.rnc: Fix (part of) RFE 1784312: Allow personblurb and - titleabbrev in biblioentry (and other bibliographic contexts) - -2007-09-27 12:45 nwalsh - - * src/mathml.rnc: Fix RFE 1795884: Allow MathML in inlineequation - -2007-09-27 12:43 nwalsh - - * src/pool.rnc: Fix RFE 1800916: Allow keycap etc. in userinput - -2007-08-30 01:45 xmldoc - - * howto/stylesheets/fo-ns.xsl, howto/stylesheets/fo.xsl, - howto/stylesheets/html-ns.xsl, howto/stylesheets/html.xsl: - Updated stylesheets to display data on titlepage from othercredit - content (not just in author content). If there is an otherclass - attribute, the value of the is displayed. It really should also - look for the value of the class attribute, and use that unless it - is "other" (in which case it uses the otherclass value instead), - but that change will have to wait til later... - -2007-08-30 01:41 xmldoc - - * howto/howto.xml: Created dbxsl-ns section and added myself to - list of contributors. - -2007-08-29 05:25 xmldoc - - * howto/Makefile, howto/stylesheets/fo-ns.xsl, - howto/stylesheets/html-ns.xsl: Added customization layers for - XSL-NS stylesheets, and set up - added targets to makefile for generating output using those. - -2007-08-02 20:07 kosek - - * dbits/dbits.rnc: Refactored to use new pattern introduced in CR5 - -2007-07-18 20:43 nwalsh - - * src/pool.rnc: Move Bob's olink text up to the schema source - location - -2007-07-12 13:38 nwalsh - - * src/pool.rnc: Fix stupid pattern typo - -2007-07-12 12:58 nwalsh - - * spec/Makefile, spec/rfc.xml: Update media type RFC - -2007-07-12 12:46 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: Updated version number to 5.0CR5 - -2007-07-12 12:41 nwalsh - - * spec/docbook.xml: Added 5.0CR5 release notes - -2007-07-12 12:37 nwalsh - - * src/pool.rnc: Refactored the 'common attributes extension - pattern' a bit - -2007-07-08 16:41 mzjn - - * howto/howto.xml: Updated link to cloak script (now points to SVN - repository). - -2007-06-06 12:10 kosek - - * dbits/dbits.rnc: Added ITS conformance information - -2007-05-22 11:20 nwalsh - - * src/pool.rnc: Added db.common.extension.attributes pattern for - easier extensibility of common attributes - -2007-05-21 14:59 nwalsh - - * Makefile: Add docbook.nvdl to distrib - -2007-05-18 19:29 nwalsh - - * spec/docbook.xml: DocBook V5.0CR4 published - -2007-05-18 18:03 nwalsh - - * .cvsignore: Removed: we're using subversion now - -2007-05-18 17:58 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: Updated version numbers - -2007-05-18 17:47 nwalsh - - * Makefile: Change pattern of specname - -2007-05-18 17:26 nwalsh - - * src/callouts.rnc, src/pool.rnc: RFE #1708032: Fix pattern naming - inconsistency with db.href.attribute*s* - -2007-05-18 17:19 nwalsh - - * src/glossary.rnc: RFE #1700154: added sortas to termdef - -2007-05-18 17:14 nwalsh - - * docbook.nvdl: Added NVDL rules file contributed by George Bina - -2007-05-18 17:08 nwalsh - - * src/pool.rnc: RFE #1705596: add programming inlines to code - -2007-05-07 20:34 kosek - - * howto/howto.xml: Updated list of renamed/removed elements - -2007-05-01 20:00 kosek - - * dbits/dbits.rnc: Fixed typo - -2007-04-30 14:54 kosek - - * dbits/dbits.rnc: Id property again - -2007-04-30 14:46 kosek - - * dbits/dbits.rnc: Trying to set CVS Id tag - -2007-04-30 14:45 kosek - - * Makefile, dbits, dbits/Makefile, dbits/dbits.rnc, dbits/its.rnc: - Added module for DocBook + ITS markup to improve DocBook - suitability for localization industry - -2007-04-11 13:16 kosek - - * howto/howto.xml: Versioning was approved almost year ago, so this - section is no more draft. - -2007-03-27 20:25 nwalsh - - * src/glossary.rnc: Fix RFE #1689228: typo in Schematron assertion - for termdef; thanks George Bina - -2007-03-22 17:20 nwalsh - - * spec: Ignore *.txt files too - -2007-03-22 17:18 nwalsh - - * spec/docbook.xml: DocBook V5.0CR3 published - -2007-03-22 17:08 nwalsh - - * defguide/defguide.rnc: Changed version number from 5.0CR2 to - 5.0CR3 - -2007-03-22 17:08 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc: Changed version number - from 5.0CR2 to 5.0CR3 - -2007-03-22 17:08 nwalsh - - * docbookxi/docbookxi.rnc, docbookxi/xinclude.rnc: Changed version - number from 5.0CR2 to 5.0CR3 - -2007-03-22 17:07 nwalsh - - * docbook/docbook.rnc: Changed version number from 5.0CR2 to 5.0CR3 - -2007-03-22 17:07 nwalsh - - * src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, - src/hier.rnc, src/htmltbl.rnc, src/index.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/toc.rnc, src/xlink.rnc: Changed version number - from 5.0CR2 to 5.0CR3 - -2007-03-22 14:21 nwalsh - - * src/pool.rnc: Added note about XLink role value - http://docbook.org/xlink/role/olink to the description of - xlink:role - -2007-03-22 13:02 nwalsh - - * tests/unit-tests/htmlinfo.xml, tests/unit-tests/rfe1682917.xml: - New unit tests - -2007-03-22 13:01 nwalsh - - * src/htmltbl.rnc: Allow info inside html tables - -2007-03-22 12:46 nwalsh - - * src/pool.rnc: RFE #1682917: Add pgwide to example - -2007-03-22 12:35 nwalsh - - * src/hier.rnc: Fix syntax error - -2007-03-22 12:31 nwalsh - - * src/pool.rnc: Whitespace - -2007-03-22 12:25 nwalsh - - * src/calstbl.rnc, src/htmltbl.rnc: RFE 1644553#: Added label - attribute to CALS and HTML tables - -2007-03-22 12:24 nwalsh - - * src/math.rnc: Rearranged patterns for a little greater - consistency - -2007-03-22 12:13 nwalsh - - * src/hier.rnc: RFE #1588693: Add an acknowledgements element, peer - to dedication, replacing ackno which had only been available at - the end of article - -2007-03-22 11:52 nwalsh - - * src/glossary.rnc, src/pool.rnc: Change semantics of termdef so - that a firstterm is required; move the addition of termdef to the - technical inlines into the glossary module where it belongs - -2007-03-17 20:12 nwalsh - - * src/pool.rnc: Attribute documentation improvements - -2007-03-17 01:58 nwalsh - - * src/callouts.rnc: Removed duplicate line, thanks to Jirka - -2007-03-15 14:27 nwalsh - - * spec/Makefile, spec/rfc.xml: Make an RFC - -2007-03-13 13:13 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: Updated version numbers to CR2 - -2007-03-13 13:11 nwalsh - - * spec/docbook.xml: DocBook V5.0CR2 - -2007-03-13 12:58 nwalsh - - * src/glossary.rnc, src/pool.rnc: Fix RFE #1669465: Schematron - rules refer to @id where @xml:id is required - -2007-03-13 12:35 nwalsh - - * tests/skip/calloutlist.003.xml, tests/unit-tests, - tests/unit-tests/rfe1589139.xml, tests/unit-tests/rfe1627845.xml, - tests/unit-tests/rfe1630203.xml: Added tests/unit-tests; added - calloutlist.003.xml to the skip list (it intentionally uses a - broken IDREF) - -2007-03-13 12:34 nwalsh - - * Makefile, docbook/Makefile, spec/Makefile: Use saxon from - buildtools - -2007-03-12 21:39 nwalsh - - * src/glossary.rnc: Fix RFE #1630203: allow empty glossary - -2007-03-12 21:37 nwalsh - - * src/calstbl.rnc: Fix RFE #1627845: allow optional caption on CALS - table and informaltable - -2007-03-12 21:36 nwalsh - - * src/htmltbl.rnc: Allow inlines in HTML table caption - -2007-03-12 21:34 nwalsh - - * src/qandaset.rnc: FIX RFE #1589139 and #1621178: allow title and - titleabbrev on qandaentry - -2007-03-12 14:47 nwalsh - - * src/pool.rnc: Fix RFE #1675932 add localname, prefix, and - namespace to tag - -2007-03-01 10:59 xmldoc - - * Makefile, howto/Makefile, spec/Makefile: Renamed cvstools dir to - buildtools, and replaced all - references to "cvstools" in makefiles and elsewhere - with "buildtools". - -2007-02-22 14:13 nwalsh - - * spec/docbook.xml: Fixed Dick's association - -2007-02-21 16:58 xmldoc - - * docbookxi/docbookxi.rnc: Ported changes from docs-in-db5 branch. - -2006-12-21 17:23 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: Updated version numbers to CR1 - -2006-12-21 17:21 nwalsh - - * Makefile: Improve the clean target - -2006-12-21 17:21 nwalsh - - * spec/docbook.xml: DocBook V5.0CR1 - -2006-12-05 18:59 nwalsh - - * src/pool.rnc: Make content model of blockquote broader - -2006-12-05 18:44 nwalsh - - * src/pool.rnc: Fix RFE #1575537: allow markup from other - namespaces in info - -2006-11-15 23:15 nwalsh - - * src/hier.rnc: Fix content model of ackno so it's the same as in - DocBook 4.x - -2006-11-15 23:14 nwalsh - - * src/calstbl.rnc: Fix bug where caption was accidentally allowed - in CALS tables - -2006-10-26 13:10 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, spec/docbook.xml, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: DocBook V5.0b9 released - -2006-10-24 12:54 nwalsh - - * src/glossary.rnc: Fixed bug #1568419: inverted schematron - assertion for termdef - -2006-10-24 12:52 nwalsh - - * docbook/Makefile: Fixed bug #1568417: duplicate schematron rules - -2006-10-24 09:16 nwalsh - - * src/pool.rnc: Allow jobtitle inline; removed a few extraneous - comments - -2006-10-22 19:06 kosek - - * howto/howto.xml: Fixed broken link - -2006-10-22 18:48 kosek - - * howto/howto.xml: Preparing new release - -2006-10-22 18:47 kosek - - * howto/howto.xml: Updated XXE instructions, link to Bob's XSLT 1.0 - based experimental stylesheets - -2006-10-18 22:04 nwalsh - - * src/tasks.rnc: Fix typo: titles are required on tasks - -2006-10-11 21:08 nwalsh - - * src/pool.rnc: Make targetdoc optional on olink - -2006-09-27 10:32 nwalsh - - * spec/docbook.xml: Fixed pubdate - -2006-09-26 22:57 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, spec/docbook.xml, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: DocBook V5.0b8 released - -2006-09-26 16:36 nwalsh - - * src/mathml.rnc, src/svg.rnc: Added refpurpose to format - attributes - -2006-09-26 13:57 nwalsh - - * src/calstbl.rnc: Oops: typos - -2006-09-26 13:51 nwalsh - - * src/calstbl.rnc: Fix documentation for enumerated values - -2006-09-26 12:37 nwalsh - - * src/htmltbl.rnc: Improved refpurposes - -2006-09-26 12:25 nwalsh - - * src/math.rnc: Fix bug #1549632: inlineequation should use - inlinemediaobject - -2006-09-26 12:23 nwalsh - - * docbook/Makefile: docbook.dtd depends on ../tools/xml2dtd.xsl - -2006-09-26 11:33 nwalsh - - * src/calstbl.rnc, src/ebnf.rnc, src/htmltbl.rnc, src/pool.rnc: Fix - RFE #1535166: Improve datatypes for attributes - -2006-08-16 20:06 nwalsh - - * src/pool.rnc: Remove bogus 'empty' from imagedata - -2006-07-21 17:28 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, spec/docbook.xml, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: DocBook V5.0b7 released - -2006-07-21 17:16 nwalsh - - * src/mathml.rnc, src/svg.rnc: Use correct info patterns - -2006-07-21 13:02 nwalsh - - * .: Ignore ChangeLog - -2006-07-20 13:37 nwalsh - - * _footer.mak: Make the targets depend on the stylesheets that - create them - -2006-07-20 11:32 nwalsh - - * src/msgset.rnc: Make msgaud, msgorig, and msglevel optional on - simplemsgentry (this should remain true irrespective of their - names) - -2006-07-20 11:27 nwalsh - - * src/pool.rnc: Added startingnumber attribute to orderedlist - -2006-07-20 11:27 nwalsh - - * src/msgset.rnc: Rename audience, origin, and level on - simplemsgentry to make room for the newly added audience - effectivity attribute (this is an optimistic change that may get - reversed by the TC) - -2006-07-20 10:53 nwalsh - - * src/pool.rnc: Added audience effectivity attribute - -2006-07-19 20:47 nwalsh - - * src/pool.rnc: Fix RFE #1520074: define separate patterns for all - the effectivity attributes - -2006-06-07 12:53 nwalsh - - * src/mathml.rnc, src/svg.rnc: Fix attributes on - db.imagedata.mathml and db.imagedata.svg - -2006-06-07 11:54 nwalsh - - * src/mathml.rnc: Added annotations for db.imagedata.mathml and - db.imagedata.svg - -2006-06-07 11:53 nwalsh - - * src/svg.rnc: Added annotations for db.imagedata.mathml and - db.imagedata.svg - -2006-06-07 09:57 kosek - - * src/mathml.rnc, src/svg.rnc: Fixed bug where fileref|entityref - was required on imagedata when content was inline MathML/SVG. - -2006-06-05 21:06 rlhamilton - - * howto/.cvsignore: Back out accidental commit. Now same as - revision 6022. - -2006-06-05 20:52 rlhamilton - - * howto/.cvsignore, howto/howto.xml: No change to text. - -2006-06-05 20:33 rlhamilton - - * howto/howto.xml: Fix minor typo (Toolchain --> Tool chain) and - test commit - -2006-06-02 19:14 nwalsh - - * Makefile: Publish ChangeLog - -2006-06-02 19:12 nwalsh - - * howto/Makefile, howto/howto.xml: Fix validation; update to 5.0b6 - (version) - -2006-06-02 15:09 nwalsh - - * docbookxi/xinclude.rnc: Allow XInclude in reference - -2006-06-02 15:08 nwalsh - - * src/refentry.rnc: Add a pattern for the contents of reference - -2006-06-02 14:22 nwalsh - - * spec/docbook.xml: Updated for V5.0b6 - -2006-06-02 13:58 nwalsh - - * src/mathml.rnc, src/pool.rnc, src/svg.rnc: Allow svg:* and mml:* - in imagedata. Removed svg:* as an /alternative/ to imagedata; - that seems wrong: the alignment, scaling, etc. attributes are on - imagedata. - -2006-06-02 13:55 nwalsh - - * tests/local/dtd.xml: A DTD test - -2006-06-02 12:58 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: Changed version numbers - -2006-06-02 12:52 nwalsh - - * tests, tests/passed: Updated - -2006-05-24 19:44 nwalsh - - * src/pool.rnc: Remove 'default' as an option for xml:space on - 'modifier' because of brokenness in the XML Schema build if its - allowed. Not specifying it is the same as 'default' so that seems - acceptable, at least for beta 6 - -2006-05-18 20:55 nwalsh - - * src/pool.rnc: Support aspect-oriented programming by allow - modifier before parameter in methodparam and allow modifier to - specify xml:space - -2006-05-18 13:37 nwalsh - - * src/pool.rnc: Added person and org per the Apr 2006 minutes - -2006-05-18 12:40 nwalsh - - * src/pool.rnc: Allow all db.publishing.inlines in bibliographic - elements - -2006-05-17 21:34 kosek - - * howto/howto.xml: Incorporated link to the list of various - versions of DocBook schemas. - -2006-05-16 20:23 kosek - - * howto/howto.css, howto/stylesheets/fo.xsl, - howto/stylesheets/html.xsl: Improved display of programlistings - (language attribute is shown as a label) - -2006-05-16 20:18 kosek - - * howto/howto.xml: Fixed programlisting types - -2006-05-16 20:10 kosek - - * howto/howto.xml: Preparing new release - -2006-05-15 21:47 rlhamilton - - * howto/howto.xml: Copy edit pass over the version numbering - description. - -2006-04-20 06:29 kosek - - * howto/howto.xml: Align free text with the syntax diagram of - versioning schema - -2006-04-19 21:38 kosek - - * howto/howto.xml: Added description of a new versioning scheme - -2006-04-12 17:44 nwalsh - - * Makefile, dbforms/dbforms.rnc, dbforms/htmlform.rnc, - defguide/defguide.rnc, docbook/docbook.rnc, - docbookxi/docbookxi.rnc, docbookxi/xinclude.rnc, - src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, - src/hier.rnc, src/htmltbl.rnc, src/index.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/toc.rnc, src/xlink.rnc: Changed version - numbers - -2006-04-12 16:02 nwalsh - - * spec/docbook.xml: V5.0b5 - -2006-04-12 16:00 nwalsh - - * dbforms/htmlform.rnc: Fixed typo in refpurpose - -2006-04-12 12:42 nwalsh - - * src/refentry.rnc: Made class on refmiscinfo a class/otherclass - enumerated value attribute - -2006-04-06 21:00 kosek - - * howto/howto.xml: Style improvement - -2006-04-06 20:32 kosek - - * howto/howto.xml: Added proposal of versioning section - -2006-04-05 21:19 nwalsh - - * docbookxi/xinclude.rnc: Allow XInclude inside info elements - -2006-04-05 21:17 nwalsh - - * src/pool.rnc: Added parameter to the db.technical.inlines - -2006-04-05 16:07 rlhamilton - - * howto/howto.xml: Removed RNG and RNC tags and unneeded pubdate - -2006-04-05 15:26 nwalsh - - * ., .cvsignore: Oh bother, just ignore all the random bits at this - level - -2006-04-05 14:56 nwalsh - - * spec/docbook.xml: Updated pubdate and date - -2006-04-04 22:27 rlhamilton - - * howto/howto.xml: Add Customization section. - -2006-03-03 13:31 nwalsh - - * Makefile: Version 5.0b4 - -2006-03-03 13:01 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xlink.rnc: Version 5.0b4 - -2006-03-03 11:05 nwalsh - - * spec/Makefile, spec/docbook.xml, spec/fo.xsl, spec/html.xsl: - Updated for b4 and formatting tweaks - -2006-03-03 08:19 nwalsh - - * src/pool.rnc: Fix typo that made limit required on symbol - -2006-03-03 08:04 nwalsh - - * src/pool.rnc: Make @width text instead of integer - -2006-03-03 08:03 nwalsh - - * src/pool.rnc: Added class/otherclass semantics to othercredit - -2006-03-02 17:26 nwalsh - - * dbforms/htmlform.rnc: Added documentation for attributes and - attribute values; rearranged some patterns - -2006-03-02 16:33 nwalsh - - * src/pool.rnc: Fixed RFE 1416903 (added cover); corrected - "pubnumber" typo; allow - title/titleabbrev/subtitle anywhere in info, not just at the - beginning; renamed "sgmlcomment" to just "comment"; renamed the - class attribute of refmiscinfo to type; added descriptions for - many more attribute values. - -2006-03-02 13:43 nwalsh - - * src/xlink.rnc: Added documentation for attributes and attribute - values; rearranged some patterns - -2006-03-02 13:38 nwalsh - - * src/refentry.rnc: Added documentation for attributes and - attribute values - -2006-03-02 13:33 nwalsh - - * src/math.rnc: Make use of db.label.attribute pattern - -2006-03-02 13:30 nwalsh - - * src/hier.rnc: Added documentation for attributes and attribute - values - -2006-03-02 13:08 nwalsh - - * src/bibliography.rnc: Added documentation for attributes and - attribute values; rearranged some patterns - -2006-03-02 13:06 nwalsh - - * src/annotations.rnc: Added documentation for attributes and - attribute values - -2006-03-02 12:58 nwalsh - - * src/glossary.rnc: Added documentation for attributes and - attribute values - -2006-03-02 10:56 nwalsh - - * src/index.rnc: Added documentation for attributes and attribute - values - -2006-03-02 10:38 nwalsh - - * src/callouts.rnc: Make use of db.label.attribute and - db.linkends.attribute patterns - -2006-03-02 09:33 nwalsh - - * src/ebnf.rnc: Added documentation for attributes and attribute - values - -2006-03-02 09:09 nwalsh - - * src/msgset.rnc, src/qandaset.rnc: Added documentation for - attributes and attribute values - -2006-03-02 08:27 nwalsh - - * src/toc.rnc: Added a toc.pagenum.attribute pattern. Added a - refpurpose for the pagenum attribute. - -2006-02-28 21:44 kosek - - * howto/howto.xml: More copy edit changes from Dick, new release - -2006-02-28 21:33 kosek - - * howto/howto.css, howto/howto.xml, howto/images/oxygen1.png, - howto/images/oxygen2.png, howto/stylesheets/html.xsl: Additions - from Dick, schema version is parametrized, oXygen supports - embedded Schematron - -2006-02-24 21:56 nwalsh - - * Makefile: Add docbook.xsd as a dependency for distrib - -2006-02-24 21:20 nwalsh - - * docbook/Makefile: Added rule to create the .xsd files - -2006-02-24 21:18 nwalsh - - * src/pool.rnc: Addec cover element - -2006-02-01 15:04 nwalsh - - * Makefile, dbforms/dbforms.rnc, dbforms/htmlform.rnc, - defguide/defguide.rnc, docbook/docbook.rnc, - docbookxi/docbookxi.rnc, docbookxi/xinclude.rnc, - spec/docbook.xml, src/annotations.rnc, src/bibliography.rnc, - src/callouts.rnc, src/calstbl.rnc, src/docbook.rnc, src/ebnf.rnc, - src/glossary.rnc, src/hier.rnc, src/htmltbl.rnc, src/index.rnc, - src/math.rnc, src/mathml.rnc, src/msgset.rnc, src/pool.rnc, - src/qandaset.rnc, src/refentry.rnc, src/refsect1.rnc, - src/sect1.rnc, src/svg.rnc, src/tasks.rnc, src/toc.rnc, - src/xlink.rnc: Version 5.0b3 released - -2006-02-01 13:30 nwalsh - - * src/pool.rnc: Fix typo in pattern name - -2006-01-29 21:22 nwalsh - - * src/pool.rnc: Added attribute default values per Jan 2006 telcon - -2006-01-29 15:33 nwalsh - - * src/callouts.rnc: Fix bug #1358844: allow multiple imageobjects - inside an imageobjectco - -2006-01-27 21:37 nwalsh - - * src/pool.rnc: Reduce content model of blockquote to something - reasonable - -2006-01-16 21:16 nwalsh - - * dbforms/htmlform.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/glossary.rnc, src/htmltbl.rnc, - src/mathml.rnc, src/pool.rnc, src/svg.rnc: Improved documentation - -2006-01-12 23:06 nwalsh - - * Makefile, dbforms/dbforms.rnc, dbforms/htmlform.rnc, - defguide/defguide.rnc, docbook/docbook.rnc, - docbookxi/docbookxi.rnc, docbookxi/xinclude.rnc, - src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, - src/hier.rnc, src/htmltbl.rnc, src/index.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/toc.rnc, src/xlink.rnc: Updated version - numbers - -2006-01-12 23:00 nwalsh - - * spec/Makefile, spec/docbook.xml: Updated for 5.0b2 - -2006-01-12 21:49 nwalsh - - * src/callouts.rnc: Fix bug #1380477: allow area to inherit from - areaset - -2006-01-12 21:48 nwalsh - - * dbforms/Makefile: Make dbforms actually different from docbook - -2005-12-28 13:13 kosek - - * howto/stylesheets/fo.xsl: Minor formatting tweaks. - -2005-12-28 13:04 kosek - - * howto/howto.xml: Preparing for new release, added xml:ids to all - FAQs - -2005-12-20 21:08 kosek - - * howto/howto.xml: Added info about combining DocBook schema with - MathML and SVG - -2005-12-14 12:25 nwalsh - - * src/mathml.rnc, src/svg.rnc: Where svg:* or mml:* are allowed, - allow svg:*+ or mml:*+ respectively - -2005-12-14 11:38 nwalsh - - * src/callouts.rnc: Allow alt in area as per Nov 2005 TC minutes - -2005-12-14 11:35 nwalsh - - * src/math.rnc: Fix content model of equation and informalequation - wrt alt - -2005-12-14 11:35 nwalsh - - * src/refentry.rnc: docfix: Fix refname of refmiscinfo - -2005-12-14 11:27 nwalsh - - * src/pool.rnc: Fix RFE #1356238: olink xrefstyle attribute type - -2005-11-18 21:49 kosek - - * howto/howto.xml: Corrected XMLSpy related FAQ entry. Hardwiring - xml.xsd inside a program code? What they smoke in Vienna? >:-( - -2005-11-17 10:57 kosek - - * _footer.mak: Once we move (rename) file there should not be - reason for removing it. - -2005-11-14 03:45 xmldoc - - * Makefile: As far as I can tell, $(MV) is not an implicit variable - in make or - GNU make (as $(RM) is). But it was used, without being defined, - in - the _footer.mak file. So I added a "MV ?= mv" definiton for it in - the master Makefile, which should cause it to be defined as "mv" - only if it's not already defined in the user's environment. - -2005-10-28 12:41 nwalsh - - * Makefile: Remove (unnecessary) xs:imports from generated - xlink.xsd and xml.xsd files - -2005-10-28 12:39 nwalsh - - * howto/howto.xml: Added some more xml:ids - -2005-10-28 12:37 nwalsh - - * spec/docbook.xml: Added some xml:ids - -2005-10-27 22:17 nwalsh - - * howto/howto.xml: Added xml:ids to the sections that didn't have - them - -2005-10-27 15:52 kosek - - * howto/howto.xml: Added pointers to on-line validator and cloak - script. - Added FAQ that can save users of f&@#!d XMLSpy. - -2005-10-27 15:46 nwalsh - - * howto/stylesheets/fo.xsl, howto/stylesheets/html.xsl: Fix ref to - info; in V1 stylesheets, it's articleinfo - -2005-10-27 15:45 nwalsh - - * README: Fix ref to spec in docs directory - -2005-10-27 15:44 nwalsh - - * Makefile: Rename spec in distrib - -2005-10-27 14:16 nwalsh - - * ., .cvsignore: Ignore the .sch file too - -2005-10-27 14:14 nwalsh - - * dbforms/dbforms.rnc, dbforms/htmlform.rnc, defguide/defguide.rnc, - docbook/docbook.rnc, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc: Fix file headers - -2005-10-27 14:14 nwalsh - - * README: Added README - -2005-10-27 14:09 nwalsh - - * src/htmltbl.rnc, src/pool.rnc: Make dir a common attribute - -2005-10-27 14:06 nwalsh - - * howto/howto.xml: Fix version and pubdate - -2005-10-27 14:05 nwalsh - - * spec, spec/.cvsignore, spec/Makefile, spec/fo.xsl, spec/html.xsl: - Stylesheet tweaks - -2005-10-27 13:59 nwalsh - - * spec/docbook.xml: Change pubdate, version, and reference to TDG - -2005-10-27 13:59 nwalsh - - * Makefile: Make distrib directory under build - -2005-10-26 13:30 nwalsh - - * howto/howto.xml, howto/stylesheets/fo.xsl, - howto/stylesheets/html.xsl: Use pubdate instead of bibliocoverage - (what was I thinking?). Fixed pubdate. - -2005-10-26 12:45 nwalsh - - * src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, - src/hier.rnc, src/htmltbl.rnc, src/index.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/toc.rnc, src/xlink.rnc: Change file headers: - this (will be) DocBook V5.0b1 - -2005-10-26 12:29 nwalsh - - * src/pool.rnc: Refactor the content model of step to avoid UPA - issues - -2005-10-26 11:43 nwalsh - - * src/index.rnc: Add type attribute to indexterm elements - -2005-10-25 23:33 nwalsh - - * spec/docbook.xml: Converted to DocBook V5 - -2005-10-25 23:32 nwalsh - - * spec/Makefile: Make pdf; validate with jing - -2005-10-25 23:30 nwalsh - - * howto/Makefile: Make the PDF too - -2005-10-25 23:30 nwalsh - - * docbook/Makefile: Keep the Schematron - -2005-10-25 23:29 nwalsh - - * Makefile: Add a distrib target - -2005-10-25 09:37 kosek - - * howto/stylesheets/fo.xsl: Authorgroup is labeled as Authors, the - same way as in HTML - -2005-10-25 09:35 kosek - - * howto/Makefile: Use $(XJPARSE) instead of xjparse to improve - portability of makefile - -2005-10-24 12:22 nwalsh - - * howto/howto.xml: Updated pubdate; we'll fix this again before we - really publish - -2005-10-24 12:20 nwalsh - - * howto/howto.xml: Fixed bogus namespace prefix - -2005-10-24 12:17 nwalsh - - * howto/howto.css, howto/howto.xml, howto/stylesheets/html.xsl: - Updates - -2005-10-21 16:49 nwalsh - - * howto, howto/.cvsignore, howto/Makefile, howto/howto.css, - howto/howto.xml, howto/images, howto/images/emacs.png, - howto/images/oxygen1.png, howto/images/oxygen2.png, - howto/images/oxygen3.png, howto/images/xxe.png, - howto/stylesheets, howto/stylesheets/fo.xsl, - howto/stylesheets/html.xsl: Checked in HOWTO sources - -2005-10-20 18:33 nwalsh - - * src/glossary.rnc, src/pool.rnc: Add s:pattern elements to - Schematron rules - -2005-10-20 18:28 nwalsh - - * docbook/Makefile: Add docbook.sch as a target - -2005-10-20 18:27 nwalsh - - * _footer.mak: Handle reworked cleanup.pl script properly - -2005-10-20 12:52 nwalsh - - * src/hier.rnc: Make a pattern for set components - -2005-10-16 22:15 nwalsh - - * spec/docbook.xml: Updates from Dick Hamilton - -2005-10-16 22:10 nwalsh - - * _footer.mak: Remove redundant build step that was causing - duplicate Schematron rules - -2005-07-23 20:51 nwalsh - - * _footer.mak, dbforms/dbforms.rnc, dbforms/htmlform.rnc, - defguide/defguide.rnc, docbook/docbook.rnc, - docbookxi/docbookxi.rnc, docbookxi/xinclude.rnc, - src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, - src/hier.rnc, src/htmltbl.rnc, src/index.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/toc.rnc, src/xlink.rnc: DocBook NG: The PTO - Release - -2005-07-22 11:22 nwalsh - - * src/sect1.rnc: Allow simplesect after sect1 - -2005-07-21 21:35 nwalsh - - * docbookxi/Makefile: We're not rebuilding docbookxi.rnc so don't - delete it. - -2005-07-21 21:34 nwalsh - - * defguide/.cvsignore, defguide/Makefile, defguide/defguide.rnc: - Don't rebuild defguide.rnc - -2005-07-21 21:20 nwalsh - - * docbookxi/Makefile, docbookxi/docbookxi.rnc: Don't rebuild - docbookxi.rnc automatically - -2005-07-21 20:52 nwalsh - - * src/hier.rnc: Documentation improvements. - -2005-07-21 20:45 nwalsh - - * ., .cvsignore: Updated - -2005-07-21 20:45 nwalsh - - * src/hier.rnc, src/sect1.rnc: Allow simplesect to occur after - section elements - -2005-07-21 20:43 nwalsh - - * Makefile, dbforms/Makefile, defguide/Makefile, docbook/Makefile, - docbookxi, docbookxi/Makefile, docbookxi/docbookxi.rnc, - docbookxi/xinclude.rnc, src/docbook.rnc, src/xinclude.rnc: - Refactor XInclude support - -2005-07-14 11:13 nwalsh - - * src/annotations.rnc: Allow annotation to appear in info - -2005-07-14 00:12 nwalsh - - * src/pool.rnc: More documentation improvements - -2005-07-13 23:11 nwalsh - - * src/pool.rnc: Documentation improvements; first stab at - documenting attribute values - -2005-07-08 10:16 nwalsh - - * src/dbforms.rnc: Moved to ../dbforms - -2005-07-08 10:13 nwalsh - - * src/pool.rnc: Added refname/refpurpose for db._emphasis and - db._phrase - -2005-07-08 10:12 nwalsh - - * src/toc.rnc: Added refpurpose for tocdiv - -2005-07-08 10:11 nwalsh - - * src/refentry.rnc: Added refpurpose for refmiscinfo - -2005-07-08 10:09 nwalsh - - * src/callouts.rnc: Fixed refpurpose for callout - -2005-07-08 10:08 nwalsh - - * src/bibliography.rnc: Added refpurpose for biblioref - -2005-07-08 10:08 nwalsh - - * src/htmlform.rnc: Moved to ../dbforms - -2005-07-07 14:28 nwalsh - - * Makefile, dbforms/Makefile, dbforms/dbforms.rnc, - dbforms/htmlform.rnc, docbook/Makefile, docbook/docbook.rnc, - src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/dbforms.rnc, src/docbook.rnc, src/ebnf.rnc, - src/glossary.rnc, src/hier.rnc, src/htmlform.rnc, - src/htmltbl.rnc, src/index.rnc, src/math.rnc, src/mathml.rnc, - src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, src/refentry.rnc, - src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, src/tasks.rnc, - src/toc.rnc, src/xinclude.rnc, src/xlink.rnc: DocBook NG: The - Mezcal Release - -2005-07-07 12:02 nwalsh - - * src/hier.rnc, src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, - src/xinclude.rnc: Restore section/simplesect - -2005-07-07 11:54 nwalsh - - * docbook/Makefile: Added tests: target - -2005-07-07 11:49 nwalsh - - * Makefile, defguide, defguide/.cvsignore, defguide/Makefile: Added - defguide module - -2005-07-07 11:37 nwalsh - - * tests/local, tests/local/xinc.xml: Added local tests - -2005-07-06 20:18 nwalsh - - * ., .cvsignore, Makefile, _footer.mak, _header.mak, dbforms, - dbforms/Makefile, dbforms/dbforms.rnc, dbforms/htmlform.rnc, - docbook, docbook/Makefile, docbook/docbook.rnc: Checkin new build - system - -2005-07-06 20:15 nwalsh - - * src/xinclude.rnc: Support XInclude in more places - -2005-07-06 20:12 nwalsh - - * src/hier.rnc, src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc: - Fix totally bogus patterns for optional/required section elements - at various levels - -2005-07-06 19:10 nwalsh - - * src/sect1.rnc: Fix content model for toplevel sections and - article components - -2005-07-06 19:06 nwalsh - - * src/hier.rnc: Fix content model for toplevel and recursive - sections - -2005-07-02 16:42 nwalsh - - * src/xinclude.rnc: Fix regex for href to prevent fragids, not - require a hash! - -2005-07-01 19:28 nwalsh - - * spec/docbook.xml: Added Schematron to the bibliography; fixed - typo - -2005-07-01 19:20 nwalsh - - * build: Removed - -2005-07-01 19:04 nwalsh - - * src/docbook.rnc, src/xinclude.rnc: Added XInclude - -2005-06-29 10:47 nwalsh - - * spec/docbook.xml: Updated for 5.0a1 - -2005-06-25 12:38 nwalsh - - * src/pool.rnc: Documentation changes - -2005-06-25 12:16 nwalsh - - * src/calstbl.rnc: Documentation improvements - -2005-06-25 11:47 nwalsh - - * src/xlink.rnc: Changed prefix for annotations namespace - -2005-05-28 02:55 xmldoc - - * Makefile: Portability tweaks for the build. - - - pull in cvstools/Makefile.incl, mainly so that we can use - cvstools/runtrang - - - "trang" -> $(RUNTRANG) so that cvstools/runtrang is used; if - users don't have trang binary installed, that will find - trang.jar and run it. Also allows users to manually specify - what trang they want (e.g., "make RUNTRANG=trang") - - - "clean" target now also removes dbforms* files - - - "clean" target now also does "make -C build clean" - - - "xsltproc" -> $(XSLTPROC) - -2005-05-27 08:41 xmldoc - - * build/Makefile: Make build more portable. - - Added include for $DOCBOOK_CVS/cvstools dir and: - - - replaced hard-coded "saxon" with $(XSLT) - - replaced hard-coded "trang" with $(RUNTRANG) - - added PERL=perl variable and replaced hard-coded "perl" with - $(PERL) - - replaced hard-coded rm with $(RM) - -2005-04-24 17:09 nwalsh - - * src/docbook.rnc: DocBook NG: The Lillet Release - -2005-04-24 16:58 nwalsh - - * src/dbforms.rnc: Changed version number - -2005-04-24 16:58 nwalsh - - * ., .cvsignore, Makefile: Updated - -2005-04-24 16:12 nwalsh - - * src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmlform.rnc, src/htmltbl.rnc, src/index.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/toc.rnc, src/xlink.rnc: Changed version number - -2005-04-24 16:08 nwalsh - - * src/dbforms.rnc: DocBook with HTML Forms extension - -2005-04-23 21:42 nwalsh - - * spec/docbook.xml: Checkpoint; more editing - -2005-04-23 21:39 nwalsh - - * spec/Makefile: Support reorganized directory structure - -2005-04-23 21:38 nwalsh - - * src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmlform.rnc, src/htmltbl.rnc, src/index.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/toc.rnc, src/xlink.rnc: Use the official - namespace - -2005-04-23 21:34 nwalsh - - * src/docbook.rnc: Skip the htmlforms module and use the official - namespace - -2005-04-23 21:31 nwalsh - - * tests/skip/bibliography.001.xml, tests/skip/bibliography.002.xml, - tests/skip/cmdsynopsis.002.xml, tests/skip/legalnotice.001.xml, - tests/skip/toc.001.xml, tests/skip/variablelist.002.xml, - tests/skip/xref.002.xml: Still broken - -2005-04-23 21:31 nwalsh - - * tests/skip/glossary.002.xml, tests/skip/olink.001.xml, - tests/skip/refentry.006.xml: These pass now - -2005-04-22 15:43 nwalsh - - * Makefile, build/Makefile: Much simpler build mechanics - -2005-04-22 13:57 nwalsh - - * src/pool.rnc: Fixed typo - -2005-04-21 21:42 nwalsh - - * src/htmltbl.rnc, src/math.rnc, src/pool.rnc: Remove @float; make - sure caption appears in informal objects - -2005-04-21 15:31 nwalsh - - * src/callouts.rnc: Allow area to have either linkends or - xlink:href - -2005-04-21 13:13 nwalsh - - * src/pool.rnc: Restore OLink; it's only a matter of time before - someone asks and there's no way to justify its removal - -2005-04-21 12:33 nwalsh - - * src/annotations.rnc: Support annotations as per the 20 Apr 2005 - DocBook TC meeting - -2005-04-21 12:31 nwalsh - - * src/calstbl.rnc: Fix typo - -2005-04-21 12:23 nwalsh - - * src/annotations.rnc, src/calstbl.rnc, src/math.rnc, src/pool.rnc: - Allow alt in more places - -2005-04-21 12:12 nwalsh - - * src/math.rnc: Allow title to be optional on equation - -2005-04-21 12:10 nwalsh - - * src/htmlform.rnc: Fix action attribute; add enctype and accept - attributes; support fieldset - -2005-04-21 11:44 nwalsh - - * src/mathml.rnc, src/pool.rnc, src/svg.rnc: Improve definition of - db._any - -2005-04-21 11:41 nwalsh - - * src/htmltbl.rnc: Allow common attributes on HTML table elements; - allow orient, pgwide, tabstyle, and floatstyle on HTML table - element - -2005-04-21 11:40 nwalsh - - * src/htmlform.rnc: Method attribute values in lowercase; action is - an xsd:anyURI - -2005-04-21 11:01 nwalsh - - * src/calstbl.rnc: Allow floatstyle on table and informaltable - -2005-04-21 10:56 nwalsh - - * src/calstbl.rnc, src/pool.rnc: Allow caption in mediaobject, - figure, example, and table - -2005-04-21 10:47 nwalsh - - * src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, src/index.rnc, - src/math.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/toc.rnc: Make separate patterns for - attributes and enumerations - -2005-04-21 09:32 nwalsh - - * src/pool.rnc: Renamed pattern - -2005-04-12 13:30 nwalsh - - * src/docbook.rnc: DocBook NG: The Kahlua Release - -2005-04-12 13:29 nwalsh - - * src/annotations.rnc, src/bibliography.rnc, src/callouts.rnc, - src/calstbl.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmlform.rnc, src/htmltbl.rnc, src/index.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/toc.rnc, src/xlink.rnc: Updated version name - -2005-04-12 13:18 nwalsh - - * src/pool.rnc: Fix stupid search-and-replace bug in systemitem - class values - -2005-04-12 13:02 nwalsh - - * ., .cvsignore, Makefile, build/Makefile: Updated for new build - environment - -2005-04-12 12:52 nwalsh - - * tests, tests/skip, tests/skip/README, - tests/skip/bibliography.001.xml, tests/skip/bibliography.002.xml, - tests/skip/cmdsynopsis.002.xml, tests/skip/glossary.002.xml, - tests/skip/indexterm.004.xml, tests/skip/indexterm.005.xml, - tests/skip/legalnotice.001.xml, tests/skip/olink.001.xml, - tests/skip/refentry.006.xml, tests/skip/template.xml, - tests/skip/toc.001.xml, tests/skip/variablelist.002.xml, - tests/skip/xref.002.xml: Reorganize CVS directory structure - -2005-04-12 12:45 nwalsh - - * ., .cvsignore, Makefile, build, build/.cvsignore, build/Makefile, - spec, spec/Makefile, spec/docbook.xml, src, src/annotations.rnc, - src/bibliography.rnc, src/callouts.rnc, src/calstbl.rnc, - src/docbook.rnc, src/ebnf.rnc, src/glossary.rnc, src/hier.rnc, - src/htmlform.rnc, src/htmltbl.rnc, src/index.rnc, src/math.rnc, - src/mathml.rnc, src/msgset.rnc, src/pool.rnc, src/qandaset.rnc, - src/refentry.rnc, src/refsect1.rnc, src/sect1.rnc, src/svg.rnc, - src/tasks.rnc, src/toc.rnc, src/xlink.rnc: Reorganize CVS - directory structure - diff --git a/jonas_doc/core/tools/docbook-5.0/README b/jonas_doc/core/tools/docbook-5.0/README deleted file mode 100644 index abd1c7fbad297ee74a0a2e87ee6b65d03e08d7ec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/README +++ /dev/null @@ -1,25 +0,0 @@ -README for the DocBook Schema - -For more information about DocBook, please see - - http://www.oasis-open.org/docbook/ - -Please send all questions, comments, concerns, and bug reports to the -DocBook mailing list: docbook@lists.oasis-open.org - -This distribution contains: - - README This file - VERSION The version of DocBook in this distribution - docs/ Documentation (see also http://docbook.org/tdg5/en/) - docs/howto.* A "HOWTO" describing how to upgrade from DocBook V4.x - docs/*docbook.* The DocBook specification - tools/ Tools for working with DocBook - tools/db4-upgrade.xsl An XSLT (1.0) stylesheet for upgrading DocBook V4.x - documents to DocBook V5.x - tools/db4-entities.pl A Perl script to aid in the transition from external - parsed entities to XInclude - rng/ DocBook schemas implemented in RELAX NG - dtd/ DocBook schemas implemented in XML DTDs - xsd/ DocBook schemas implemented in W3C XML Schema - sch/ Additional normative constraints expressed in Schematron diff --git a/jonas_doc/core/tools/docbook-5.0/VERSION b/jonas_doc/core/tools/docbook-5.0/VERSION deleted file mode 100644 index 819e07a22435f1e8efcbdd1d1c062deef0e501b1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/VERSION +++ /dev/null @@ -1 +0,0 @@ -5.0 diff --git a/jonas_doc/core/tools/docbook-5.0/catalog.xml b/jonas_doc/core/tools/docbook-5.0/catalog.xml deleted file mode 100644 index 4c2461468d5d992820396faff72c41fb3263d6d4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/catalog.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-5.0/docbook.nvdl b/jonas_doc/core/tools/docbook-5.0/docbook.nvdl deleted file mode 100644 index a3d8730998f80e19b0624a5518aea205c1792bfa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/docbook.nvdl +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-5.0/dtd/docbook.dtd b/jonas_doc/core/tools/docbook-5.0/dtd/docbook.dtd deleted file mode 100644 index 4b408cfe9f3658e1a3a68310d85f9a603df38496..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/dtd/docbook.dtd +++ /dev/null @@ -1,4199 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-5.0/rng/docbook.rnc b/jonas_doc/core/tools/docbook-5.0/rng/docbook.rnc deleted file mode 100644 index 104d46bbd768b950bf44dd467effb6593351f512..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/rng/docbook.rnc +++ /dev/null @@ -1,10643 +0,0 @@ -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace ctrl = "http://nwalsh.com/xmlns/schema-control/" -default namespace db = "http://docbook.org/ns/docbook" -namespace html = "http://www.w3.org/1999/xhtml" -namespace mml = "http://www.w3.org/1998/Math/MathML" -namespace rng = "http://relaxng.org/ns/structure/1.0" -namespace s = "http://www.ascc.net/xml/schematron" -namespace svg = "http://www.w3.org/2000/svg" -namespace xlink = "http://www.w3.org/1999/xlink" - -s:ns [ - prefix = "a" - uri = "http://relaxng.org/ns/compatibility/annotations/1.0" -] -s:ns [ prefix = "ctrl" uri = "http://nwalsh.com/xmlns/schema-control/" ] -s:ns [ prefix = "db" uri = "http://docbook.org/ns/docbook" ] -s:ns [ - prefix = "dbx" - uri = - "http://sourceforge.net/projects/docbook/defguide/schema/extra-markup" -] -s:ns [ prefix = "html" uri = "http://www.w3.org/1999/xhtml" ] -s:ns [ prefix = "mml" uri = "http://www.w3.org/1998/Math/MathML" ] -s:ns [ prefix = "rng" uri = "http://relaxng.org/ns/structure/1.0" ] -s:ns [ prefix = "s" uri = "http://www.ascc.net/xml/schematron" ] -s:ns [ prefix = "svg" uri = "http://www.w3.org/2000/svg" ] -s:ns [ prefix = "xlink" uri = "http://www.w3.org/1999/xlink" ] -# DocBook V5.0CR5 - -# See http://docbook.org/ns/docbook - -# This file is part of DocBook V5.0 -# -# Copyright 1992-2008 HaL Computer Systems, Inc., -# O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software -# Corporation, Norman Walsh, Sun Microsystems, Inc., and the -# Organization for the Advancement of Structured Information -# Standards (OASIS). -# -# Release: $Id: docbook.rnc 7661 2008-02-06 13:52:59Z nwalsh $ -# -# Permission to use, copy, modify and distribute the DocBook schema -# and its accompanying documentation for any purpose and without fee -# is hereby granted in perpetuity, provided that the above copyright -# notice and this paragraph appear in all copies. The copyright -# holders make no representation about the suitability of the schema -# for any purpose. It is provided "as is" without expressed or implied -# warranty. -# -# If you modify the DocBook schema in any way, label your schema as a -# variant of DocBook. See the reference documentation -# (http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) -# for more information. -# -# Please direct all questions, bug reports, or suggestions for changes -# to the docbook@lists.oasis-open.org mailing list. For more -# information, see http://www.oasis-open.org/docbook/. -# -# ====================================================================== -start = - (db.set - | db.book - | db.divisions - | db.components - | db.navigation.components - | db.section - | db.para) - | (db.sect1 | db.sect2 | db.sect3 | db.sect4 | db.sect5) - | (db.refentry | db.refsection) - | (db.refsect1 | db.refsect2 | db.refsect3) - | db.setindex -div { - db._any.attribute = - - ## Any attribute including in any attribute in any namespace. - attribute * { text } - db._any = - - ## Any element from almost any namespace - element * - (db:* | html:*) { - (db._any.attribute | text | db._any)* - } -} -db.arch.attribute = - - ## Designates the computer or chip architecture to which the element applies - attribute arch { text } -db.audience.attribute = - - ## Designates the intended audience to which the element applies, for example, system administrators, programmers, or new users. - attribute audience { text } -db.condition.attribute = - - ## provides a standard place for application-specific effectivity - attribute condition { text } -db.conformance.attribute = - - ## Indicates standards conformance characteristics of the element - attribute conformance { text } -db.os.attribute = - - ## Indicates the operating system to which the element is applicable - attribute os { text } -db.revision.attribute = - - ## Indicates the editorial revision to which the element belongs - attribute revision { text } -db.security.attribute = - - ## Indicates something about the security level associated with the element to which it applies - attribute security { text } -db.userlevel.attribute = - - ## Indicates the level of user experience for which the element applies - attribute userlevel { text } -db.vendor.attribute = - - ## Indicates the computer vendor to which the element applies. - attribute vendor { text } -db.wordsize.attribute = - - ## Indicates the word size (width in bits) of the computer architecture to which the element applies - attribute wordsize { text } -db.effectivity.attributes = - db.arch.attribute? - & db.audience.attribute? - & db.condition.attribute? - & db.conformance.attribute? - & db.os.attribute? - & db.revision.attribute? - & db.security.attribute? - & db.userlevel.attribute? - & db.vendor.attribute? - & db.wordsize.attribute? -db.endterm.attribute = - - ## Points to the element whose content is to be used as the text of the link - attribute endterm { xsd:IDREF } -db.linkend.attribute = - - ## Points to an internal link target by identifying the value of its xml:id attribute - attribute linkend { xsd:IDREF } -db.linkends.attribute = - - ## Points to one or more internal link targets by identifying the value of their xml:id attributes - attribute linkends { xsd:IDREFS } -db.xlink.href.attribute = - - ## Identifies a link target with a URI - attribute xlink:href { xsd:anyURI } -db.xlink.type.attribute = - - ## Identifies the XLink link type - attribute xlink:type { - - ## An XLink simple link - "simple" - } -db.xlink.role.attribute = - - ## Identifies the XLink role of the link - attribute xlink:role { xsd:anyURI } -db.xlink.arcrole.attribute = - - ## Identifies the XLink arcrole of the link - attribute xlink:arcrole { xsd:anyURI } -db.xlink.title.attribute = - - ## Identifies the XLink title of the link - attribute xlink:title { text }? -db.xlink.show.enumeration = - - ## An application traversing to the ending resource should load it in a new window, frame, pane, or other relevant presentation context. - "new" - | - ## An application traversing to the ending resource should load the resource in the same window, frame, pane, or other relevant presentation context in which the starting resource was loaded. - "replace" - | - ## An application traversing to the ending resource should load its presentation in place of the presentation of the starting resource. - "embed" - | - ## The behavior of an application traversing to the ending resource is unconstrained by XLink. The application should look for other markup present in the link to determine the appropriate behavior. - "other" - | - ## The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior. - "none" -db.xlink.show.attribute = - - ## Identifies the XLink show behavior of the link - attribute xlink:show { db.xlink.show.enumeration } -db.xlink.actuate.enumeration = - - ## An application should traverse to the ending resource immediately on loading the starting resource. - "onLoad" - | - ## An application should traverse from the starting resource to the ending resource only on a post-loading event triggered for the purpose of traversal. - "onRequest" - | - ## The behavior of an application traversing to the ending resource is unconstrained by this specification. The application should look for other markup present in the link to determine the appropriate behavior. - "other" - | - ## The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior. - "none" -db.xlink.actuate.attribute = - - ## Identifies the XLink actuate behavior of the link - attribute xlink:actuate { db.xlink.actuate.enumeration } -db.href.attributes = - db.xlink.href.attribute - & db.xlink.type.attribute? - & db.xlink.role.attribute? - & db.xlink.arcrole.attribute? - & db.xlink.title.attribute? - & db.xlink.show.attribute? - & db.xlink.actuate.attribute? -db.xml.id.attribute = - - ## Identifies the unique ID value of the element - attribute xml:id { xsd:ID } -db.version.attribute = - - ## Specifies the DocBook version of the element and its descendants - attribute version { text } -db.xml.lang.attribute = - - ## Specifies the natural language of the element and its descendants - attribute xml:lang { text } -db.xml.base.attribute = - - ## Specifies the base URI of the element and its descendants - attribute xml:base { xsd:anyURI } -db.remap.attribute = - - ## Provides the name or similar semantic identifier assigned to the content in some previous markup scheme - attribute remap { text } -db.xreflabel.attribute = - - ## Provides the text that is to be generated for a cross reference to the element - attribute xreflabel { text } -db.xrefstyle.attribute = - - ## Specifies a keyword or keywords identifying additional style information - attribute xrefstyle { text } -db.revisionflag.enumeration = - - ## The element has been changed. - "changed" - | - ## The element is new (has been added to the document). - "added" - | - ## The element has been deleted. - "deleted" - | - ## Explicitly turns off revision markup for this element. - "off" -db.revisionflag.attribute = - - ## Identifies the revision status of the element - attribute revisionflag { db.revisionflag.enumeration } -db.dir.enumeration = - - ## Left-to-right text - "ltr" - | - ## Right-to-left text - "rtl" - | - ## Left-to-right override - "lro" - | - ## Right-to-left override - "rlo" -db.dir.attribute = - - ## Identifies the direction of text in an element - attribute dir { db.dir.enumeration } -db.common.base.attributes = - db.version.attribute? - & db.xml.lang.attribute? - & db.xml.base.attribute? - & db.remap.attribute? - & db.xreflabel.attribute? - & db.revisionflag.attribute? - & db.dir.attribute? - & db.effectivity.attributes -db.common.attributes = - db.xml.id.attribute? - & db.common.base.attributes - & db.annotations.attribute? -db.common.idreq.attributes = - db.xml.id.attribute - & db.common.base.attributes - & db.annotations.attribute? -db.common.linking.attributes = - (db.linkend.attribute | db.href.attributes)? -db.common.req.linking.attributes = - db.linkend.attribute | db.href.attributes -db.common.data.attributes = - - ## Specifies the format of the data - attribute format { text }?, - ( - ## Indentifies the location of the data by URI - attribute fileref { xsd:anyURI } - | - ## Identifies the location of the data by external identifier (entity name) - attribute entityref { xsd:ENTITY }) -db.verbatim.continuation.enumeration = - - ## Line numbering continues from the immediately preceding element with the same name. - "continues" - | - ## Line numbering restarts (begins at 1, usually). - "restarts" -db.verbatim.continuation.attribute = - - ## Determines whether line numbering continues from the previous element or restarts. - attribute continuation { db.verbatim.continuation.enumeration } -db.verbatim.linenumbering.enumeration = - - ## Lines are numbered. - "numbered" - | - ## Lines are not numbered. - "unnumbered" -db.verbatim.linenumbering.attribute = - - ## Determines whether lines are numbered. - attribute linenumbering { db.verbatim.linenumbering.enumeration } -db.verbatim.startinglinenumber.attribute = - - ## Specifies the initial line number. - attribute startinglinenumber { xsd:integer } -db.verbatim.language.attribute = - - ## Identifies the language (i.e. programming language) of the verbatim content. - attribute language { text } -db.verbatim.xml.space.attribute = - - ## Can be used to indicate explicitly that whitespace in the verbatim environment is preserved. Whitespace must always be preserved in verbatim environments whether this attribute is specified or not. - attribute xml:space { - - ## Whitespace must be preserved. - "preserve" - } -db.verbatim.attributes = - db.verbatim.continuation.attribute? - & db.verbatim.linenumbering.attribute? - & db.verbatim.startinglinenumber.attribute? - & db.verbatim.language.attribute? - & db.verbatim.xml.space.attribute? -db.label.attribute = - - ## Specifies an identifying string for presentation purposes - attribute label { text } -db.width.characters.attribute = - - ## Specifies the width (in characters) of the element - attribute width { xsd:nonNegativeInteger } -db.spacing.enumeration = - - ## The spacing should be "compact". - "compact" - | - ## The spacing should be "normal". - "normal" -db.spacing.attribute = - - ## Specifies (a hint about) the spacing of the content - attribute spacing { db.spacing.enumeration } -db.pgwide.enumeration = - - ## The element should be rendered in the current text flow (with the flow column width). - "0" - | - ## The element should be rendered across the full text page. - "1" -db.pgwide.attribute = - - ## Indicates if the element is rendered across the column or the page - attribute pgwide { db.pgwide.enumeration } -db.language.attribute = - - ## Identifies the language (i.e. programming language) of the content. - attribute language { text } -db.performance.enumeration = - - ## The content describes an optional step or steps. - "optional" - | - ## The content describes a required step or steps. - "required" -db.performance.attribute = - - ## Specifies if the content is required or optional. - attribute performance { db.performance.enumeration } -db.floatstyle.attribute = - - ## Specifies style information to be used when rendering the float - attribute floatstyle { text } -db.width.attribute = - - ## Specifies the width of the element - attribute width { text } -db.depth.attribute = - - ## Specifies the depth of the element - attribute depth { text } -db.contentwidth.attribute = - - ## Specifies the width of the content rectangle - attribute contentwidth { text } -db.contentdepth.attribute = - - ## Specifies the depth of the content rectangle - attribute contentdepth { text } -db.scalefit.enumeration = - - ## False (do not scale-to-fit; anamorphic scaling may occur) - "0" - | - ## True (scale-to-fit; anamorphic scaling is forbidden) - "1" -db.scale.attribute = - - ## Specifies the scaling factor - attribute scale { xsd:positiveInteger } -db.halign.enumeration = - - ## Centered horizontally - "center" - | - ## Aligned horizontally on the specified character - "char" - | - ## Fully justified (left and right margins or edges) - "justify" - | - ## Left aligned - "left" - | - ## Right aligned - "right" -db.valign.enumeration = - - ## Aligned on the bottom of the region - "bottom" - | - ## Centered vertically - "middle" - | - ## Aligned on the top of the region - "top" -db.biblio.class.enumeration = - - ## A document object identifier. - "doi" - | - ## An international standard book number. - "isbn" - | - ## An international standard technical report number (ISO 10444). - "isrn" - | - ## An international standard serial number. - "issn" - | - ## A Library of Congress reference number. - "libraryofcongress" - | - ## A publication number (an internal number or possibly organizational standard). - "pubsnumber" - | - ## A Uniform Resource Identifier - "uri" -db.biblio.class-enum.attribute = - - ## Identifies the kind of bibliographic identifier - attribute class { db.biblio.class.enumeration }? -db.biblio.class-other.attribute = - - ## Identifies the nature of the non-standard bibliographic identifier - attribute otherclass { xsd:NMTOKEN } -db.biblio.class-other.attributes = - - ## Identifies the kind of bibliographic identifier - attribute class { - - ## Indicates that the identifier is some 'other' kind. - "other" - } - & db.biblio.class-other.attribute -db.biblio.class.attribute = - db.biblio.class-enum.attribute | db.biblio.class-other.attributes -db.ubiq.inlines = - (db.inlinemediaobject - | db.remark - | db.superscript - | db.subscript - | db.link.inlines - | db.alt) - | db.annotation - | db.indexterm -db._text = (text | db.ubiq.inlines | db._phrase | db.replaceable)* -db._title = db.title? & db.titleabbrev? & db.subtitle? -db._title.req = db.title & db.titleabbrev? & db.subtitle? -db._title.only = db.title? & db.titleabbrev? -db._title.onlyreq = db.title & db.titleabbrev? -db._info = (db._title, db.titleforbidden.info?) | db.info? -db._info.title.req = - (db._title.req, db.titleforbidden.info?) | db.titlereq.info -db._info.title.only = - (db._title.only, db.titleforbidden.info?) | db.titleonly.info -db._info.title.onlyreq = - (db._title.onlyreq, db.titleforbidden.info?) | db.titleonlyreq.info -db._info.title.forbidden = db.titleforbidden.info? -db.all.inlines = - text - | db.ubiq.inlines - | db.general.inlines - | db.domain.inlines - | db.extension.inlines -db.general.inlines = - db.publishing.inlines - | db.product.inlines - | db.bibliography.inlines - | db.graphic.inlines - | db.indexing.inlines - | db.link.inlines -db.domain.inlines = - db.technical.inlines - | db.math.inlines - | db.markup.inlines - | db.gui.inlines - | db.keyboard.inlines - | db.os.inlines - | db.programming.inlines - | db.error.inlines -db.technical.inlines = - (db.replaceable | db.package | db.parameter) - | db.termdef - | db.nonterminal - | (db.systemitem | db.option | db.optional | db.property) -db.product.inlines = - db.trademark - | (db.productnumber - | db.productname - | db.database - | db.application - | db.hardware) -db.bibliography.inlines = - db.citation - | db.citerefentry - | db.citetitle - | db.citebiblioid - | db.author - | db.person - | db.personname - | db.org - | db.orgname - | db.editor - | db.jobtitle -db.publishing.inlines = - (db.abbrev - | db.acronym - | db.date - | db.emphasis - | db.footnote - | db.footnoteref - | db.foreignphrase - | db.phrase - | db.quote - | db.subscript - | db.superscript - | db.wordasword) - | db.glossary.inlines - | db.coref -db.graphic.inlines = db.inlinemediaobject -db.indexing.inlines = notAllowed | db.indexterm -db.link.inlines = - (db.xref | db.link | db.olink | db.anchor) | db.biblioref -db.extension.inlines = notAllowed -db.nopara.blocks = - (db.list.blocks - | db.formal.blocks - | db.informal.blocks - | db.publishing.blocks - | db.graphic.blocks - | db.technical.blocks - | db.verbatim.blocks - | db.bridgehead - | db.remark - | db.revhistory) - | db.indexterm - | db.synopsis.blocks - | db.admonition.blocks -db.para.blocks = db.anchor | db.para | db.formalpara | db.simpara -db.all.blocks = - (db.nopara.blocks | db.para.blocks | db.extension.blocks) - | db.annotation -db.formal.blocks = (db.example | db.figure | db.table) | db.equation -db.informal.blocks = - (db.informalexample | db.informalfigure | db.informaltable) - | db.informalequation -db.publishing.blocks = - db.sidebar | db.blockquote | db.address | db.epigraph -db.graphic.blocks = db.mediaobject | db.screenshot -db.technical.blocks = - db.procedure - | db.task - | (db.productionset | db.constraintdef) - | db.msgset -db.list.blocks = - (db.itemizedlist - | db.orderedlist - | db.procedure - | db.simplelist - | db.variablelist - | db.segmentedlist) - | db.glosslist - | db.bibliolist - | db.calloutlist - | db.qandaset -db.verbatim.blocks = - (db.screen | db.literallayout) - | (db.programlistingco | db.screenco) - | (db.programlisting | db.synopsis) -db.extension.blocks = notAllowed -db.info.extension = db._any -db.info.elements = - (db.abstract - | db.address - | db.artpagenums - | db.author - | db.authorgroup - | db.authorinitials - | db.bibliocoverage - | db.biblioid - | db.bibliosource - | db.collab - | db.confgroup - | db.contractsponsor - | db.contractnum - | db.copyright - | db.cover - | db.date - | db.edition - | db.editor - | db.issuenum - | db.keywordset - | db.legalnotice - | db.mediaobject - | db.org - | db.orgname - | db.othercredit - | db.pagenums - | db.printhistory - | db.pubdate - | db.publisher - | db.publishername - | db.releaseinfo - | db.revhistory - | db.seriesvolnums - | db.subjectset - | db.volumenum - | db.info.extension) - | db.annotation - | db.extendedlink - | (db.bibliomisc | db.bibliomset | db.bibliorelation | db.biblioset) - | db.itermset - | (db.productname | db.productnumber) -db.bibliographic.elements = - db.info.elements - | db.publishing.inlines - | db.citerefentry - | db.citetitle - | db.citebiblioid - | db.person - | db.personblurb - | db.personname - | db.subtitle - | db.title - | db.titleabbrev -div { - db.title.role.attribute = attribute role { text } - db.title.attlist = - db.title.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.title = - - ## The text of the title of a section of a document or of a formal block-level element - element title { db.title.attlist, db.all.inlines* } -} -div { - db.titleabbrev.role.attribute = attribute role { text } - db.titleabbrev.attlist = - db.titleabbrev.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.titleabbrev = - - ## The abbreviation of a title - element titleabbrev { db.titleabbrev.attlist, db.all.inlines* } -} -div { - db.subtitle.role.attribute = attribute role { text } - db.subtitle.attlist = - db.subtitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.subtitle = - - ## The subtitle of a document - element subtitle { db.subtitle.attlist, db.all.inlines* } -} -div { - db.info.role.attribute = attribute role { text } - db.info.attlist = db.info.role.attribute? & db.common.attributes - db.info = - - ## A wrapper for information about a component or other block - element info { db.info.attlist, (db._title & db.info.elements*) } -} -div { - db.titlereq.info.role.attribute = attribute role { text } - db.titlereq.info.attlist = - db.titlereq.info.role.attribute? & db.common.attributes - db.titlereq.info = - - ## A wrapper for information about a component or other block with a required title - element info { - db.titlereq.info.attlist, (db._title.req & db.info.elements*) - } -} -div { - db.titleonly.info.role.attribute = attribute role { text } - db.titleonly.info.attlist = - db.titleonly.info.role.attribute? & db.common.attributes - db.titleonly.info = - - ## A wrapper for information about a component or other block with only a title - element info { - db.titleonly.info.attlist, (db._title.only & db.info.elements*) - } -} -div { - db.titleonlyreq.info.role.attribute = attribute role { text } - db.titleonlyreq.info.attlist = - db.titleonlyreq.info.role.attribute? & db.common.attributes - db.titleonlyreq.info = - - ## A wrapper for information about a component or other block with only a required title - element info { - db.titleonlyreq.info.attlist, - (db._title.onlyreq & db.info.elements*) - } -} -div { - db.titleforbidden.info.role.attribute = attribute role { text } - db.titleforbidden.info.attlist = - db.titleforbidden.info.role.attribute? & db.common.attributes - db.titleforbidden.info = - - ## A wrapper for information about a component or other block without a title - element info { db.titleforbidden.info.attlist, db.info.elements* } -} -div { - db.subjectset.role.attribute = attribute role { text } - db.subjectset.scheme.attribute = - - ## Identifies the controlled vocabulary used by this set's terms - attribute scheme { xsd:NMTOKEN } - db.subjectset.attlist = - db.subjectset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.subjectset.scheme.attribute? - db.subjectset = - - ## A set of terms describing the subject matter of a document - element subjectset { db.subjectset.attlist, db.subject+ } -} -div { - db.subject.role.attribute = attribute role { text } - db.subject.weight.attribute = - - ## Specifies a ranking for this subject relative to other subjects in the same set - attribute weight { text } - db.subject.attlist = - db.subject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.subject.weight.attribute? - db.subject = - - ## One of a group of terms describing the subject matter of a document - element subject { db.subject.attlist, db.subjectterm+ } -} -div { - db.subjectterm.role.attribute = attribute role { text } - db.subjectterm.attlist = - db.subjectterm.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.subjectterm = - - ## A term in a group of terms describing the subject matter of a document - element subjectterm { db.subjectterm.attlist, text } -} -div { - db.keywordset.role.attribute = attribute role { text } - db.keywordset.attlist = - db.keywordset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.keywordset = - - ## A set of keywords describing the content of a document - element keywordset { db.keywordset.attlist, db.keyword+ } -} -div { - db.keyword.role.attribute = attribute role { text } - db.keyword.attlist = - db.keyword.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.keyword = - - ## One of a set of keywords describing the content of a document - element keyword { db.keyword.attlist, text } -} -db.table.choice = notAllowed | db.cals.table | db.html.table -db.informaltable.choice = - notAllowed | db.cals.informaltable | db.html.informaltable -db.table = db.table.choice -db.informaltable = db.informaltable.choice -div { - db.procedure.role.attribute = attribute role { text } - db.procedure.attlist = - db.procedure.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.procedure.info = db._info.title.only - db.procedure = - - ## A list of operations to be performed in a well-defined sequence - element procedure { - db.procedure.attlist, db.procedure.info, db.all.blocks*, db.step+ - } -} -div { - db.step.role.attribute = attribute role { text } - db.step.attlist = - db.step.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.performance.attribute? - db.step.info = db._info.title.only - # - # This content model is blocks*, step|stepalternatives, blocks* but - # expressed this way it avoids UPA issues in XSD and DTD versions - db.step = - - ## A unit of action in a procedure - element step { - db.step.attlist, - db.step.info, - ((db.all.blocks+, - ((db.substeps | db.stepalternatives), db.all.blocks*)?) - | ((db.substeps | db.stepalternatives), db.all.blocks*)) - } -} -div { - db.stepalternatives.role.attribute = attribute role { text } - db.stepalternatives.attlist = - db.stepalternatives.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.performance.attribute? - db.stepalternatives.info = db._info.title.forbidden - db.stepalternatives = - - ## Alternative steps in a procedure - element stepalternatives { - db.stepalternatives.attlist, db.stepalternatives.info, db.step+ - } -} -div { - db.substeps.role.attribute = attribute role { text } - db.substeps.attlist = - db.substeps.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.performance.attribute? - db.substeps = - - ## A wrapper for steps that occur within steps in a procedure - element substeps { db.substeps.attlist, db.step+ } -} -div { - db.sidebar.role.attribute = attribute role { text } - db.sidebar.attlist = - db.sidebar.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.sidebar.info = db._info.title.only - db.sidebar = - - ## A portion of a document that is isolated from the main narrative flow - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:sidebar" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:sidebar)" - "sidebar must not occur in the descendants of sidebar" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sidebar { - db.sidebar.attlist, db.sidebar.info, db.all.blocks+ - } -} -div { - db.abstract.role.attribute = attribute role { text } - db.abstract.attlist = - db.abstract.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.abstract.info = db._info.title.only - db.abstract = - - ## A summary - element abstract { - db.abstract.attlist, db.abstract.info, db.para.blocks+ - } -} -div { - db.personblurb.role.attribute = attribute role { text } - db.personblurb.attlist = - db.personblurb.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.personblurb.info = db._info.title.only - db.personblurb = - - ## A short description or note about a person - element personblurb { - db.personblurb.attlist, db.personblurb.info, db.para.blocks+ - } -} -div { - db.blockquote.role.attribute = attribute role { text } - db.blockquote.attlist = - db.blockquote.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.blockquote.info = db._info.title.only - db.blockquote = - - ## A quotation set off from the main text - element blockquote { - db.blockquote.attlist, - db.blockquote.info, - db.attribution?, - db.all.blocks+ - } -} -div { - db.attribution.role.attribute = attribute role { text } - db.attribution.attlist = - db.attribution.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.attribution = - - ## The source of a block quote or epigraph - element attribution { - db.attribution.attlist, - (db._text - | db.person - | db.personname - | db.citetitle - | db.citation)* - } -} -div { - db.bridgehead.renderas.enumeration = - - ## Render as a first-level section - "sect1" - | - ## Render as a second-level section - "sect2" - | - ## Render as a third-level section - "sect3" - | - ## Render as a fourth-level section - "sect4" - | - ## Render as a fifth-level section - "sect5" - db.bridgehead.renderas-enum.attribute = - - ## Indicates how the bridge head should be rendered - attribute renderas { db.bridgehead.renderas.enumeration }? - db.bridgehead.renderas-other.attribute = - - ## Identifies the nature of the non-standard rendering - attribute otherrenderas { xsd:NMTOKEN } - db.bridgehead.renderas-other.attributes = - - ## Indicates how the bridge head should be rendered - attribute renderas { - - ## Identifies a non-standard rendering - "other" - } - & db.bridgehead.renderas-other.attribute - db.bridgehead.renderas.attribute = - db.bridgehead.renderas-enum.attribute - | db.bridgehead.renderas-other.attributes - db.bridgehead.role.attribute = attribute role { text } - db.bridgehead.attlist = - db.bridgehead.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.bridgehead.renderas.attribute? - db.bridgehead = - - ## A free-floating heading - element bridgehead { db.bridgehead.attlist, db.all.inlines* } -} -div { - db.remark.role.attribute = attribute role { text } - db.remark.attlist = - db.remark.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.remark = - - ## A remark (or comment) intended for presentation in a draft manuscript - element remark { db.remark.attlist, db._text } -} -div { - db.epigraph.role.attribute = attribute role { text } - db.epigraph.attlist = - db.epigraph.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.epigraph.info = db._info.title.forbidden - db.epigraph = - - ## A short inscription at the beginning of a document or component - element epigraph { - db.epigraph.attlist, - db.epigraph.info, - db.attribution?, - (db.para.blocks | db.literallayout)+ - } -} -div { - db.footnote.role.attribute = attribute role { text } - db.footnote.label.attribute = - - ## Identifies the desired footnote mark - attribute label { xsd:NMTOKEN } - db.footnote.attlist = - db.footnote.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.footnote.label.attribute? - db.footnote = - - ## A footnote - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:footnote)" - "footnote must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:indexterm)" - "indexterm must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:sidebar)" - "sidebar must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:task)" - "task must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:epigraph)" - "epigraph must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element footnote { db.footnote.attlist, db.all.blocks+ } -} -div { - db.formalpara.role.attribute = attribute role { text } - db.formalpara.attlist = - db.formalpara.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.formalpara.info = db._info.title.onlyreq - db.formalpara = - - ## A paragraph with a title - element formalpara { - db.formalpara.attlist, - db.formalpara.info, - db.indexing.inlines*, - db.para - } -} -div { - db.para.role.attribute = attribute role { text } - db.para.attlist = - db.para.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.para.info = db._info.title.forbidden - db.para = - - ## A paragraph - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:para" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element para { - db.para.attlist, - db.para.info, - (db.all.inlines | db.nopara.blocks)* - } -} -div { - db.simpara.role.attribute = attribute role { text } - db.simpara.attlist = - db.simpara.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.simpara.info = db._info.title.forbidden - db.simpara = - - ## A paragraph that contains only text and inline markup, no block elements - element simpara { - db.simpara.attlist, db.simpara.info, db.all.inlines* - } -} -div { - db.itemizedlist.role.attribute = attribute role { text } - db.itemizedlist.mark.attribute = - - ## Identifies the type of mark to be used on items in this list - attribute mark { xsd:NMTOKEN } - db.itemizedlist.attlist = - db.itemizedlist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.spacing.attribute? - & db.itemizedlist.mark.attribute? - db.itemizedlist.info = db._info.title.only - db.itemizedlist = - - ## A list in which each entry is marked with a bullet or other dingbat - element itemizedlist { - db.itemizedlist.attlist, - db.itemizedlist.info, - db.all.blocks*, - db.listitem+ - } -} -div { - db.orderedlist.role.attribute = attribute role { text } - db.orderedlist.continuation.enumeration = - - ## Specifies that numbering should begin where the preceding list left off - "continues" - | - ## Specifies that numbering should begin again at 1 - "restarts" - db.orderedlist.continuation.attribute = - - ## Indicates how list numbering should begin relative to the immediately preceding list - attribute continuation { db.orderedlist.continuation.enumeration } - db.orderedlist.startingnumber.attribute = - - ## Specifies the initial line number. - attribute startingnumber { xsd:integer } - db.orderedlist.inheritnum.enumeration = - - ## Specifies that numbering should ignore list nesting - "ignore" - | - ## Specifies that numbering should inherit from outer-level lists - "inherit" - db.orderedlist.inheritnum.attribute = - - ## Indicates whether or not item numbering should be influenced by list nesting - attribute inheritnum { db.orderedlist.inheritnum.enumeration } - db.orderedlist.numeration.enumeration = - - ## Specifies Arabic numeration (1, 2, 3, …) - "arabic" - | - ## Specifies upper-case alphabetic numeration (A, B, C, …) - "upperalpha" - | - ## Specifies lower-case alphabetic numeration (a, b, c, …) - "loweralpha" - | - ## Specifies upper-case Roman numeration (I, II, III, …) - "upperroman" - | - ## Specifies lower-case Roman numeration (i, ii, iii …) - "lowerroman" - db.orderedlist.numeration.attribute = - - ## Indicates the desired numeration - attribute numeration { db.orderedlist.numeration.enumeration } - db.orderedlist.attlist = - db.orderedlist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.spacing.attribute? - & (db.orderedlist.continuation.attribute - | db.orderedlist.startingnumber.attribute)? - & db.orderedlist.inheritnum.attribute? - & db.orderedlist.numeration.attribute? - db.orderedlist.info = db._info.title.only - db.orderedlist = - - ## A list in which each entry is marked with a sequentially incremented label - element orderedlist { - db.orderedlist.attlist, - db.orderedlist.info, - db.all.blocks*, - db.listitem+ - } -} -div { - db.listitem.role.attribute = attribute role { text } - db.listitem.override.attribute = - - ## Specifies the keyword for the type of mark that should be used on this - ## item, instead of the mark that would be used by default - attribute override { xsd:NMTOKEN } - db.listitem.attlist = - db.listitem.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.listitem.override.attribute? - db.listitem = - - ## A wrapper for the elements of a list item - element listitem { db.listitem.attlist, db.all.blocks+ } -} -div { - db.segmentedlist.role.attribute = attribute role { text } - db.segmentedlist.attlist = - db.segmentedlist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.segmentedlist.info = db._info.title.only - db.segmentedlist = - - ## A segmented list, a list of sets of elements - element segmentedlist { - db.segmentedlist.attlist, - db.segmentedlist.info, - db.segtitle+, - db.seglistitem+ - } -} -div { - db.segtitle.role.attribute = attribute role { text } - db.segtitle.attlist = - db.segtitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.segtitle = - - ## The title of an element of a list item in a segmented list - element segtitle { db.segtitle.attlist, db.all.inlines* } -} -div { - db.seglistitem.role.attribute = attribute role { text } - db.seglistitem.attlist = - db.seglistitem.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.seglistitem = - - ## A list item in a segmented list - [ - s:pattern [ - name = "Cardinality of segments and titles" - "\x{a}" ~ - " " - s:rule [ - context = "db:seglistitem" - "\x{a}" ~ - " " - s:assert [ - test = "count(db:seg) = count(../db:segtitle)" - "The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element seglistitem { db.seglistitem.attlist, db.seg+ } -} -div { - db.seg.role.attribute = attribute role { text } - db.seg.attlist = - db.seg.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.seg = - - ## An element of a list item in a segmented list - element seg { db.seg.attlist, db.all.inlines* } -} -div { - db.simplelist.role.attribute = attribute role { text } - db.simplelist.type.enumeration = - - ## A tabular presentation in row-major order. - "horiz" - | - ## A tabular presentation in column-major order. - "vert" - | - ## An inline presentation, usually a comma-delimited list. - "inline" - db.simplelist.type.attribute = - - ## Specifies the type of list presentation. - [ a:defaultValue = "vert" ] - attribute type { db.simplelist.type.enumeration } - db.simplelist.columns.attribute = - - ## Specifies the number of columns for horizontal or vertical presentation - attribute columns { xsd:integer } - db.simplelist.attlist = - db.simplelist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.simplelist.type.attribute? - & db.simplelist.columns.attribute? - db.simplelist = - - ## An undecorated list of single words or short phrases - element simplelist { db.simplelist.attlist, db.member+ } -} -div { - db.member.role.attribute = attribute role { text } - db.member.attlist = - db.member.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.member = - - ## An element of a simple list - element member { db.member.attlist, db.all.inlines* } -} -div { - db.variablelist.role.attribute = attribute role { text } - db.variablelist.termlength.attribute = - - ## Indicates a length beyond which the presentation system may consider a term too long and select an alternate presentation for that term, item, or list - attribute termlength { text } - db.variablelist.attlist = - db.variablelist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.spacing.attribute? - & db.variablelist.termlength.attribute? - db.variablelist.info = db._info.title.only - db.variablelist = - - ## A list in which each entry is composed of a set of one or more terms and an associated description - element variablelist { - db.variablelist.attlist, - db.variablelist.info, - db.all.blocks*, - db.varlistentry+ - } -} -div { - db.varlistentry.role.attribute = attribute role { text } - db.varlistentry.attlist = - db.varlistentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.varlistentry = - - ## A wrapper for a set of terms and the associated description in a variable list - element varlistentry { - db.varlistentry.attlist, db.term+, db.listitem - } -} -div { - db.term.role.attribute = attribute role { text } - db.term.attlist = - db.term.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.term = - - ## The word or phrase being defined or described in a variable list - element term { db.term.attlist, db.all.inlines* } -} -div { - db.example.role.attribute = attribute role { text } - db.example.label.attribute = db.label.attribute - db.example.width.attribute = db.width.characters.attribute - db.example.pgwide.attribute = db.pgwide.attribute - db.example.floatstyle.attribute = db.floatstyle.attribute - db.example.attlist = - db.example.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.example.label.attribute? - & db.example.floatstyle.attribute? - & (db.example.width.attribute | db.example.pgwide.attribute)? - db.example.info = db._info.title.onlyreq - db.example = - - ## A formal example, with a title - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element example { - db.example.attlist, db.example.info, db.all.blocks+, db.caption? - } -} -div { - db.informalexample.role.attribute = attribute role { text } - db.informalexample.width.attribute = db.width.characters.attribute - db.informalexample.floatstyle.attribute = db.floatstyle.attribute - db.informalexample.attlist = - db.informalexample.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.informalexample.floatstyle.attribute? - & db.informalexample.width.attribute? - db.informalexample.info = db._info.title.forbidden - db.informalexample = - - ## A displayed example without a title - element informalexample { - db.informalexample.attlist, - db.informalexample.info, - db.all.blocks+, - db.caption? - } -} -db.verbatim.inlines = (db.all.inlines | db.lineannotation) | db.co -db.verbatim.contentmodel = - db._info.title.forbidden, (db.textobject | db.verbatim.inlines*) -div { - db.literallayout.role.attribute = attribute role { text } - db.literallayout.class.enumeration = - - ## The literal layout should be formatted with a monospaced font - "monospaced" - | - ## The literal layout should be formatted with the current font - "normal" - db.literallayout.class.attribute = - - ## Specifies the class of literal layout - attribute class { db.literallayout.class.enumeration } - db.literallayout.attlist = - db.literallayout.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.literallayout.class.attribute? - db.literallayout = - - ## A block of text in which line breaks and white space are to be reproduced faithfully - element literallayout { - db.literallayout.attlist, db.verbatim.contentmodel - } -} -div { - db.screen.role.attribute = attribute role { text } - db.screen.width.attribute = db.width.characters.attribute - db.screen.attlist = - db.screen.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.screen.width.attribute? - db.screen = - - ## Text that a user sees or might see on a computer screen - element screen { db.screen.attlist, db.verbatim.contentmodel } -} -div { - db.screenshot.role.attribute = attribute role { text } - db.screenshot.attlist = - db.screenshot.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.screenshot.info = db._info - db.screenshot = - - ## A representation of what the user sees or might see on a computer screen - element screenshot { - db.screenshot.attlist, db.screenshot.info, db.mediaobject - } -} -div { - db.figure.role.attribute = attribute role { text } - db.figure.label.attribute = db.label.attribute - db.figure.pgwide.attribute = db.pgwide.attribute - db.figure.floatstyle.attribute = db.floatstyle.attribute - db.figure.attlist = - db.figure.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.figure.label.attribute? - & db.figure.pgwide.attribute? - & db.figure.floatstyle.attribute? - db.figure.info = db._info.title.onlyreq - db.figure = - - ## A formal figure, generally an illustration, with a title - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element figure { - db.figure.attlist, db.figure.info, db.all.blocks+, db.caption? - } -} -div { - db.informalfigure.role.attribute = attribute role { text } - db.informalfigure.label.attribute = db.label.attribute - db.informalfigure.pgwide.attribute = db.pgwide.attribute - db.informalfigure.floatstyle.attribute = db.floatstyle.attribute - db.informalfigure.attlist = - db.informalfigure.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.informalfigure.label.attribute? - & db.informalfigure.pgwide.attribute? - & db.informalfigure.floatstyle.attribute? - db.informalfigure.info = db._info.title.forbidden - db.informalfigure = - - ## A untitled figure - element informalfigure { - db.informalfigure.attlist, - db.informalfigure.info, - db.all.blocks+, - db.caption? - } -} -db.mediaobject.content = - (db.videoobject | db.audioobject | db.imageobject | db.textobject) - | db.imageobjectco -div { - db.mediaobject.role.attribute = attribute role { text } - db.mediaobject.attlist = - db.mediaobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.mediaobject.info = db._info.title.forbidden - db.mediaobject = - - ## A displayed media object (video, audio, image, etc.) - element mediaobject { - db.mediaobject.attlist, - db.mediaobject.info, - db.alt?, - db.mediaobject.content+, - db.caption? - } -} -div { - db.inlinemediaobject.role.attribute = attribute role { text } - db.inlinemediaobject.attlist = - db.inlinemediaobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.inlinemediaobject.info = db._info.title.forbidden - db.inlinemediaobject = - - ## An inline media object (video, audio, image, and so on) - element inlinemediaobject { - db.inlinemediaobject.attlist, - db.inlinemediaobject.info, - db.alt?, - db.mediaobject.content+ - } -} -div { - db.videoobject.role.attribute = attribute role { text } - db.videoobject.attlist = - db.videoobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.videoobject.info = db._info.title.forbidden - db.videoobject = - - ## A wrapper for video data and its associated meta-information - element videoobject { - db.videoobject.attlist, db.videoobject.info, db.videodata - } -} -div { - db.audioobject.role.attribute = attribute role { text } - db.audioobject.attlist = - db.audioobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.audioobject.info = db._info.title.forbidden - db.audioobject = - - ## A wrapper for audio data and its associated meta-information - element audioobject { - db.audioobject.attlist, db.audioobject.info, db.audiodata - } -} -db.imageobject.content = - db.imagedata | db.imagedata.mathml | db.imagedata.svg -div { - db.imageobject.role.attribute = attribute role { text } - db.imageobject.attlist = - db.imageobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.imageobject.info = db._info.title.forbidden - db.imageobject = - - ## A wrapper for image data and its associated meta-information - element imageobject { - db.imageobject.attlist, - db.imageobject.info, - db.imageobject.content - } -} -div { - db.textobject.role.attribute = attribute role { text } - db.textobject.attlist = - db.textobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.textobject.info = db._info.title.forbidden - db.textobject = - - ## A wrapper for a text description of an object and its associated meta-information - element textobject { - db.textobject.attlist, - db.textobject.info, - (db.phrase | db.textdata | db.all.blocks+) - } -} -div { - db.videodata.role.attribute = attribute role { text } - db.videodata.align.enumeration = db.halign.enumeration - db.videodata.align.attribute = - - ## Specifies the (horizontal) alignment of the video data - attribute align { db.videodata.align.enumeration } - db.videodata.valign.enumeration = db.valign.enumeration - db.videodata.valign.attribute = - - ## Specifies the vertical alignment of the video data - attribute valign { db.videodata.valign.enumeration } - db.videodata.width.attribute = db.width.attribute - db.videodata.depth.attribute = db.depth.attribute - db.videodata.contentwidth.attribute = db.contentwidth.attribute - db.videodata.contentdepth.attribute = db.contentdepth.attribute - db.videodata.scalefit.enumeration = db.scalefit.enumeration - db.videodata.scalefit.attribute = - - ## Determines if anamorphic scaling is forbidden - attribute scalefit { db.videodata.scalefit.enumeration } - db.videodata.scale.attribute = db.scale.attribute - db.videodata.attlist = - db.videodata.role.attribute? - & db.common.attributes - & db.common.data.attributes - & db.videodata.align.attribute? - & db.videodata.valign.attribute? - & db.videodata.width.attribute? - & db.videodata.contentwidth.attribute? - & db.videodata.scalefit.attribute? - & db.videodata.scale.attribute? - & db.videodata.depth.attribute? - & db.videodata.contentdepth.attribute? - db.videodata.info = db._info.title.forbidden - db.videodata = - - ## Pointer to external video data - element videodata { db.videodata.attlist, db.videodata.info } -} -div { - db.audiodata.role.attribute = attribute role { text } - db.audiodata.attlist = - db.audiodata.role.attribute? - & db.common.attributes - & db.common.data.attributes - db.audiodata.info = db._info.title.forbidden - db.audiodata = - - ## Pointer to external audio data - element audiodata { db.audiodata.attlist, db.audiodata.info } -} -div { - db.imagedata.role.attribute = attribute role { text } - db.imagedata.align.enumeration = db.halign.enumeration - db.imagedata.align.attribute = - - ## Specifies the (horizontal) alignment of the image data - attribute align { db.imagedata.align.enumeration } - db.imagedata.valign.enumeration = db.valign.enumeration - db.imagedata.valign.attribute = - - ## Specifies the vertical alignment of the image data - attribute valign { db.imagedata.valign.enumeration } - db.imagedata.width.attribute = db.width.attribute - db.imagedata.depth.attribute = db.depth.attribute - db.imagedata.contentwidth.attribute = db.contentwidth.attribute - db.imagedata.contentdepth.attribute = db.contentdepth.attribute - db.imagedata.scalefit.enumeration = db.scalefit.enumeration - db.imagedata.scalefit.attribute = - - ## Determines if anamorphic scaling is forbidden - attribute scalefit { db.imagedata.scalefit.enumeration } - db.imagedata.scale.attribute = db.scale.attribute - db.imagedata.attlist = - db.imagedata.role.attribute? - & db.common.attributes - & db.common.data.attributes - & db.imagedata.align.attribute? - & db.imagedata.valign.attribute? - & db.imagedata.width.attribute? - & db.imagedata.contentwidth.attribute? - & db.imagedata.scalefit.attribute? - & db.imagedata.scale.attribute? - & db.imagedata.depth.attribute? - & db.imagedata.contentdepth.attribute? - db.imagedata.info = db._info.title.forbidden - db.imagedata = - - ## Pointer to external image data - element imagedata { db.imagedata.attlist, db.imagedata.info } -} -div { - db.textdata.role.attribute = attribute role { text } - db.textdata.encoding.attribute = - - ## Identifies the encoding of the text in the external file - attribute encoding { text } - db.textdata.attlist = - db.textdata.role.attribute? - & db.common.attributes - & db.common.data.attributes - & db.textdata.encoding.attribute? - db.textdata.info = db._info.title.forbidden - db.textdata = - - ## Pointer to external text data - element textdata { db.textdata.attlist, db.textdata.info } -} -div { - db.caption.role.attribute = attribute role { text } - db.caption.attlist = - db.caption.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.caption.info = db._info.title.forbidden - db.caption = - - ## A caption - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:sidebar)" - "sidebar must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:task)" - "task must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element caption { - db.caption.attlist, db.caption.info, db.all.blocks+ - } -} -div { - db.address.role.attribute = attribute role { text } - db.address.attlist = - db.address.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - db.address = - - ## A real-world address, generally a postal address - element address { - db.address.attlist, - (db._text - | db.personname - | db.pob - | db.street - | db.city - | db.state - | db.postcode - | db.country - | db.phone - | db.fax - | db.email - | db.uri - | db.otheraddr)* - } -} -div { - db.street.role.attribute = attribute role { text } - db.street.attlist = - db.street.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.street = - - ## A street address in an address - element street { db.street.attlist, db._text } -} -div { - db.pob.role.attribute = attribute role { text } - db.pob.attlist = - db.pob.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.pob = - - ## A post office box in an address - element pob { db.pob.attlist, db._text } -} -div { - db.postcode.role.attribute = attribute role { text } - db.postcode.attlist = - db.postcode.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.postcode = - - ## A postal code in an address - element postcode { db.postcode.attlist, db._text } -} -div { - db.city.role.attribute = attribute role { text } - db.city.attlist = - db.city.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.city = - - ## The name of a city in an address - element city { db.city.attlist, db._text } -} -div { - db.state.role.attribute = attribute role { text } - db.state.attlist = - db.state.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.state = - - ## A state or province in an address - element state { db.state.attlist, db._text } -} -div { - db.country.role.attribute = attribute role { text } - db.country.attlist = - db.country.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.country = - - ## The name of a country - element country { db.country.attlist, db._text } -} -div { - db.phone.role.attribute = attribute role { text } - db.phone.attlist = - db.phone.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.phone = - - ## A telephone number - element phone { db.phone.attlist, db._text } -} -div { - db.fax.role.attribute = attribute role { text } - db.fax.attlist = - db.fax.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.fax = - - ## A fax number - element fax { db.fax.attlist, db._text } -} -div { - db.otheraddr.role.attribute = attribute role { text } - db.otheraddr.attlist = - db.otheraddr.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.otheraddr = - - ## Uncategorized information in address - element otheraddr { db.otheraddr.attlist, db._text } -} -div { - db.affiliation.role.attribute = attribute role { text } - db.affiliation.attlist = - db.affiliation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.affiliation = - - ## The institutional affiliation of an individual - element affiliation { - db.affiliation.attlist, - db.shortaffil?, - db.jobtitle*, - (db.org? | (db.orgname?, db.orgdiv*, db.address*)) - } -} -div { - db.shortaffil.role.attribute = attribute role { text } - db.shortaffil.attlist = - db.shortaffil.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.shortaffil = - - ## A brief description of an affiliation - element shortaffil { db.shortaffil.attlist, db._text } -} -div { - db.jobtitle.role.attribute = attribute role { text } - db.jobtitle.attlist = - db.jobtitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.jobtitle = - - ## The title of an individual in an organization - element jobtitle { db.jobtitle.attlist, db._text } -} -div { - db.orgname.class.enumeration = - - ## A consortium - "consortium" - | - ## A corporation - "corporation" - | - ## An informal organization - "informal" - | - ## A non-profit organization - "nonprofit" - db.orgname.class-enum.attribute = - - ## Specifies the nature of the organization - attribute class { db.orgname.class.enumeration } - db.orgname.class-other.attributes = - - ## Specifies the nature of the organization - attribute class { - - ## Indicates a non-standard organization class - "other" - }, - - ## Identifies the non-standard nature of the organization - attribute otherclass { text } - db.orgname.class.attribute = - db.orgname.class-enum.attribute | db.orgname.class-other.attributes - db.orgname.role.attribute = attribute role { text } - db.orgname.attlist = - db.orgname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.orgname.class.attribute? - db.orgname = - - ## The name of an organization - element orgname { db.orgname.attlist, db._text } -} -div { - db.orgdiv.role.attribute = attribute role { text } - db.orgdiv.attlist = - db.orgdiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.orgdiv = - - ## A division of an organization - element orgdiv { db.orgdiv.attlist, db.all.inlines* } -} -div { - db.artpagenums.role.attribute = attribute role { text } - db.artpagenums.attlist = - db.artpagenums.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.artpagenums = - - ## The page numbers of an article as published - element artpagenums { db.artpagenums.attlist, db._text } -} -div { - db.personname.role.attribute = attribute role { text } - db.personname.attlist = - db.personname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.personname = - - ## The personal name of an individual - element personname { - db.personname.attlist, - (db._text - | (db.honorific - | db.firstname - | db.surname - | db.lineage - | db.othername)+) - } -} -db.person.author.contentmodel = - db.personname, - (db.personblurb - | db.affiliation - | db.email - | db.uri - | db.address - | db.contrib)* -db.org.author.contentmodel = - db.orgname, - (db.orgdiv - | db.affiliation - | db.email - | db.uri - | db.address - | db.contrib)* -db.credit.contentmodel = - db.person.author.contentmodel | db.org.author.contentmodel -div { - db.author.role.attribute = attribute role { text } - db.author.attlist = - db.author.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.author = - - ## The name of an individual author - element author { db.author.attlist, db.credit.contentmodel } -} -div { - db.authorgroup.role.attribute = attribute role { text } - db.authorgroup.attlist = - db.authorgroup.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.authorgroup = - - ## Wrapper for author information when a document has multiple authors or collabarators - element authorgroup { - db.authorgroup.attlist, (db.author | db.editor | db.othercredit)+ - } -} -div { - db.collab.role.attribute = attribute role { text } - db.collab.attlist = - db.collab.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.collab = - - ## Identifies a collaborator - element collab { - db.collab.attlist, - (db.person | db.personname | db.org | db.orgname)+, - db.affiliation* - } -} -div { - db.authorinitials.role.attribute = attribute role { text } - db.authorinitials.attlist = - db.authorinitials.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.authorinitials = - - ## The initials or other short identifier for an author - element authorinitials { db.authorinitials.attlist, db._text } -} -div { - db.person.role.attribute = attribute role { text } - db.person.attlist = - db.person.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.person = - - ## A person and associated metadata - element person { - db.person.attlist, - db.personname, - (db.address - | db.affiliation - | db.email - | db.uri - | db.personblurb)* - } -} -div { - db.org.role.attribute = attribute role { text } - db.org.attlist = - db.org.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.org = - - ## An organization and associated metadata - element org { - db.org.attlist, - db.orgname, - (db.address | db.affiliation | db.email | db.uri | db.orgdiv)* - } -} -div { - db.confgroup.role.attribute = attribute role { text } - db.confgroup.attlist = - db.confgroup.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.confgroup = - - ## A wrapper for document meta-information about a conference - element confgroup { - db.confgroup.attlist, - (db.confdates - | db.conftitle - | db.confnum - | db.confsponsor - | db.address)* - } -} -div { - db.confdates.role.attribute = attribute role { text } - db.confdates.attlist = - db.confdates.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.confdates = - - ## The dates of a conference for which a document was written - element confdates { db.confdates.attlist, db._text } -} -div { - db.conftitle.role.attribute = attribute role { text } - db.conftitle.attlist = - db.conftitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.conftitle = - - ## The title of a conference for which a document was written - element conftitle { db.conftitle.attlist, db._text } -} -div { - db.confnum.role.attribute = attribute role { text } - db.confnum.attlist = - db.confnum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.confnum = - - ## An identifier, frequently numerical, associated with a conference for which a document was written - element confnum { db.confnum.attlist, db._text } -} -div { - db.confsponsor.role.attribute = attribute role { text } - db.confsponsor.attlist = - db.confsponsor.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.confsponsor = - - ## The sponsor of a conference for which a document was written - element confsponsor { db.confsponsor.attlist, db._text } -} -div { - db.contractnum.role.attribute = attribute role { text } - db.contractnum.attlist = - db.contractnum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.contractnum = - - ## The contract number of a document - element contractnum { db.contractnum.attlist, db._text } -} -div { - db.contractsponsor.role.attribute = attribute role { text } - db.contractsponsor.attlist = - db.contractsponsor.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.contractsponsor = - - ## The sponsor of a contract - element contractsponsor { db.contractsponsor.attlist, db._text } -} -div { - db.copyright.role.attribute = attribute role { text } - db.copyright.attlist = - db.copyright.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.copyright = - - ## Copyright information about a document - element copyright { db.copyright.attlist, db.year+, db.holder* } -} -div { - db.year.role.attribute = attribute role { text } - db.year.attlist = - db.year.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.year = - - ## The year of publication of a document - element year { db.year.attlist, db._text } -} -div { - db.holder.role.attribute = attribute role { text } - db.holder.attlist = - db.holder.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.holder = - - ## The name of the individual or organization that holds a copyright - element holder { db.holder.attlist, db._text } -} -db.cover.contentmodel = - (db.para.blocks - | db.extension.blocks - | db.list.blocks - | db.informal.blocks - | db.publishing.blocks - | db.graphic.blocks - | db.technical.blocks - | db.verbatim.blocks - | db.bridgehead - | db.remark - | db.revhistory) - | db.synopsis.blocks -div { - db.cover.role.attribute = attribute role { text } - db.cover.attlist = - db.cover.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.cover = - - ## Additional content for the cover of a publication - element cover { db.cover.attlist, db.cover.contentmodel+ } -} -db.date.contentmodel = - xsd:date | xsd:dateTime | xsd:gYearMonth | xsd:gYear | text -div { - db.date.role.attribute = attribute role { text } - db.date.attlist = - db.date.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.date = - - ## The date of publication or revision of a document - element date { db.date.attlist, db.date.contentmodel } -} -div { - db.edition.role.attribute = attribute role { text } - db.edition.attlist = - db.edition.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.edition = - - ## The name or number of an edition of a document - element edition { db.edition.attlist, db._text } -} -div { - db.editor.role.attribute = attribute role { text } - db.editor.attlist = - db.editor.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.editor = - - ## The name of the editor of a document - element editor { db.editor.attlist, db.credit.contentmodel } -} -div { - db.biblioid.role.attribute = attribute role { text } - db.biblioid.attlist = - db.biblioid.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblio.class.attribute - db.biblioid = - - ## An identifier for a document - element biblioid { db.biblioid.attlist, db._text } -} -div { - db.citebiblioid.role.attribute = attribute role { text } - db.citebiblioid.attlist = - db.citebiblioid.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblio.class.attribute - db.citebiblioid = - - ## A citation of a bibliographic identifier - element citebiblioid { db.citebiblioid.attlist, db._text } -} -div { - db.bibliosource.role.attribute = attribute role { text } - db.bibliosource.attlist = - db.bibliosource.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblio.class.attribute - db.bibliosource = - - ## The source of a document - element bibliosource { db.bibliosource.attlist, db._text } -} -div { - db.bibliorelation.type.enumeration = - - ## The described resource pre-existed the referenced resource, which is essentially the same intellectual content presented in another format - "hasformat" - | - ## The described resource includes the referenced resource either physically or logically - "haspart" - | - ## The described resource has a version, edition, or adaptation, namely, the referenced resource - "hasversion" - | - ## The described resource is the same intellectual content of the referenced resource, but presented in another format - "isformatof" - | - ## The described resource is a physical or logical part of the referenced resource - "ispartof" - | - ## The described resource is referenced, cited, or otherwise pointed to by the referenced resource - "isreferencedby" - | - ## The described resource is supplanted, displaced, or superceded by the referenced resource - "isreplacedby" - | - ## The described resource is required by the referenced resource, either physically or logically - "isrequiredby" - | - ## The described resource is a version, edition, or adaptation of the referenced resource; changes in version imply substantive changes in content rather than differences in format - "isversionof" - | - ## The described resource references, cites, or otherwise points to the referenced resource - "references" - | - ## The described resource supplants, displaces, or supersedes the referenced resource - "replaces" - | - ## The described resource requires the referenced resource to support its function, delivery, or coherence of content - "requires" - db.bibliorelation.type-enum.attribute = - - ## Identifies the type of relationship - attribute type { db.bibliorelation.type.enumeration }? - db.bibliorelation.type-other.attributes = - - ## Identifies the type of relationship - attribute type { - - ## The described resource has a non-standard relationship with the referenced resource - "othertype" - }?, - - ## A keyword that identififes the type of the non-standard relationship - attribute othertype { xsd:NMTOKEN } - db.bibliorelation.type.attribute = - db.bibliorelation.type-enum.attribute - | db.bibliorelation.type-other.attributes - db.bibliorelation.role.attribute = attribute role { text } - db.bibliorelation.attlist = - db.bibliorelation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblio.class.attribute - & db.bibliorelation.type.attribute - db.bibliorelation = - - ## The relationship of a document to another - element bibliorelation { db.bibliorelation.attlist, db._text } -} -div { - db.bibliocoverage.spacial.enumeration = - - ## The DCMI Point identifies a point in space using its geographic coordinates - "dcmipoint" - | - ## ISO 3166 Codes for the representation of names of countries - "iso3166" - | - ## The DCMI Box identifies a region of space using its geographic limits - "dcmibox" - | - ## The Getty Thesaurus of Geographic Names - "tgn" - db.bibliocoverage.spatial-enum.attribute = - - ## Specifies the type of spatial coverage - attribute spatial { db.bibliocoverage.spacial.enumeration }? - db.bibliocoverage.spatial-other.attributes = - - ## Specifies the type of spatial coverage - attribute spatial { - - ## Identifies a non-standard type of coverage - "otherspatial" - }?, - - ## A keyword that identifies the type of non-standard coverage - attribute otherspatial { xsd:NMTOKEN } - db.bibliocoverage.spatial.attribute = - db.bibliocoverage.spatial-enum.attribute - | db.bibliocoverage.spatial-other.attributes - db.bibliocoverage.temporal.enumeration = - - ## A specification of the limits of a time interval - "dcmiperiod" - | - ## W3C Encoding rules for dates and times—a profile based on ISO 8601 - "w3c-dtf" - db.bibliocoverage.temporal-enum.attribute = - - ## Specifies the type of temporal coverage - attribute temporal { db.bibliocoverage.temporal.enumeration }? - db.bibliocoverage.temporal-other.attributes = - - ## Specifies the type of temporal coverage - attribute temporal { - - ## Specifies a non-standard type of coverage - "othertemporal" - }?, - - ## A keyword that identifies the type of non-standard coverage - attribute othertemporal { xsd:NMTOKEN } - db.bibliocoverage.temporal.attribute = - db.bibliocoverage.temporal-enum.attribute - | db.bibliocoverage.temporal-other.attributes - db.bibliocoverage.coverage.attrib = - db.bibliocoverage.spatial.attribute - & db.bibliocoverage.temporal.attribute - db.bibliocoverage.role.attribute = attribute role { text } - db.bibliocoverage.attlist = - db.bibliocoverage.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.bibliocoverage.coverage.attrib - db.bibliocoverage = - - ## The spatial or temporal coverage of a document - element bibliocoverage { db.bibliocoverage.attlist, db._text } -} -div { - db.legalnotice.role.attribute = attribute role { text } - db.legalnotice.attlist = - db.legalnotice.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.legalnotice.info = db._info.title.only - db.legalnotice = - - ## A statement of legal obligations or requirements - element legalnotice { - db.legalnotice.attlist, db.legalnotice.info, db.all.blocks+ - } -} -div { - db.othercredit.class.enumeration = - - ## A copy editor - "copyeditor" - | - ## A graphic designer - "graphicdesigner" - | - ## Some other contributor - "other" - | - ## A production editor - "productioneditor" - | - ## A technical editor - "technicaleditor" - | - ## A translator - "translator" - db.othercredit.class-enum.attribute = - - ## Identifies the nature of the contributor - attribute class { db.othercredit.class.enumeration }? - db.othercredit.class-other.attribute = - - ## Identifies the nature of the non-standard contribution - attribute otherclass { xsd:NMTOKEN } - db.othercredit.class-other.attributes = - - ## Identifies the nature of the contributor - attribute class { - - ## Identifies a non-standard contribution - "other" - } - & db.othercredit.class-other.attribute - db.othercredit.class.attribute = - db.othercredit.class-enum.attribute - | db.othercredit.class-other.attributes - db.othercredit.role.attribute = attribute role { text } - db.othercredit.attlist = - db.othercredit.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.othercredit.class.attribute - db.othercredit = - - ## A person or entity, other than an author or editor, credited in a document - element othercredit { - db.othercredit.attlist, db.credit.contentmodel - } -} -div { - db.pagenums.role.attribute = attribute role { text } - db.pagenums.attlist = - db.pagenums.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.pagenums = - - ## The numbers of the pages in a book, for use in a bibliographic entry - element pagenums { db.pagenums.attlist, db._text } -} -div { - db.contrib.role.attribute = attribute role { text } - db.contrib.attlist = - db.contrib.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.contrib = - - ## A summary of the contributions made to a document by a credited source - element contrib { db.contrib.attlist, db._text } -} -div { - db.honorific.role.attribute = attribute role { text } - db.honorific.attlist = - db.honorific.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.honorific = - - ## The title of a person - element honorific { db.honorific.attlist, db._text } -} -div { - db.firstname.role.attribute = attribute role { text } - db.firstname.attlist = - db.firstname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.firstname = - - ## The first name of a person - element firstname { db.firstname.attlist, db._text } -} -div { - db.surname.role.attribute = attribute role { text } - db.surname.attlist = - db.surname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.surname = - - ## A family name; in western cultures the last name - element surname { db.surname.attlist, db._text } -} -div { - db.lineage.role.attribute = attribute role { text } - db.lineage.attlist = - db.lineage.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.lineage = - - ## The portion of a person's name indicating a relationship to ancestors - element lineage { db.lineage.attlist, db._text } -} -div { - db.othername.role.attribute = attribute role { text } - db.othername.attlist = - db.othername.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.othername = - - ## A component of a persons name that is not a first name, surname, or lineage - element othername { db.othername.attlist, db._text } -} -div { - db.printhistory.role.attribute = attribute role { text } - db.printhistory.attlist = - db.printhistory.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.printhistory = - - ## The printing history of a document - element printhistory { db.printhistory.attlist, db.para.blocks+ } -} -div { - db.pubdate.role.attribute = attribute role { text } - db.pubdate.attlist = - db.pubdate.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.pubdate = - - ## The date of publication of a document - element pubdate { db.pubdate.attlist, db.date.contentmodel } -} -div { - db.publisher.role.attribute = attribute role { text } - db.publisher.attlist = - db.publisher.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.publisher = - - ## The publisher of a document - element publisher { - db.publisher.attlist, db.publishername, db.address* - } -} -div { - db.publishername.role.attribute = attribute role { text } - db.publishername.attlist = - db.publishername.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.publishername = - - ## The name of the publisher of a document - element publishername { db.publishername.attlist, db._text } -} -div { - db.releaseinfo.role.attribute = attribute role { text } - db.releaseinfo.attlist = - db.releaseinfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.releaseinfo = - - ## Information about a particular release of a document - element releaseinfo { db.releaseinfo.attlist, db._text } -} -div { - db.revhistory.role.attribute = attribute role { text } - db.revhistory.attlist = - db.revhistory.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revhistory.info = db._info.title.only - db.revhistory = - - ## A history of the revisions to a document - element revhistory { - db.revhistory.attlist, db.revhistory.info, db.revision+ - } -} -div { - db.revision.role.attribute = attribute role { text } - db.revision.attlist = - db.revision.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revision = - - ## An entry describing a single revision in the history of the revisions to a document - element revision { - db.revision.attlist, - db.revnumber?, - db.date, - (db.authorinitials | db.author)*, - (db.revremark | db.revdescription)? - } -} -div { - db.revnumber.role.attribute = attribute role { text } - db.revnumber.attlist = - db.revnumber.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revnumber = - - ## A document revision number - element revnumber { db.revnumber.attlist, db._text } -} -div { - db.revremark.role.attribute = attribute role { text } - db.revremark.attlist = - db.revremark.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revremark = - - ## A description of a revision to a document - element revremark { db.revremark.attlist, db._text } -} -div { - db.revdescription.role.attribute = attribute role { text } - db.revdescription.attlist = - db.revdescription.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revdescription = - - ## A extended description of a revision to a document - element revdescription { db.revdescription.attlist, db.all.blocks* } -} -div { - db.seriesvolnums.role.attribute = attribute role { text } - db.seriesvolnums.attlist = - db.seriesvolnums.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.seriesvolnums = - - ## Numbers of the volumes in a series of books - element seriesvolnums { db.seriesvolnums.attlist, db._text } -} -div { - db.volumenum.role.attribute = attribute role { text } - db.volumenum.attlist = - db.volumenum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.volumenum = - - ## The volume number of a document in a set (as of books in a set or articles in a journal) - element volumenum { db.volumenum.attlist, db._text } -} -div { - db.issuenum.role.attribute = attribute role { text } - db.issuenum.attlist = - db.issuenum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.issuenum = - - ## The number of an issue of a journal - element issuenum { db.issuenum.attlist, db._text } -} -div { - db.package.role.attribute = attribute role { text } - db.package.attlist = - db.package.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.package = - - ## A software or application package - element package { db.package.attlist, db._text } -} -div { - db.email.role.attribute = attribute role { text } - db.email.attlist = - db.email.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.email = - - ## An email address - element email { db.email.attlist, db._text } -} -div { - db.lineannotation.role.attribute = attribute role { text } - db.lineannotation.attlist = - db.lineannotation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.lineannotation = - - ## A comment on a line in a verbatim listing - element lineannotation { db.lineannotation.attlist, db._text } -} -div { - db.parameter.class.enumeration = - - ## A command - "command" - | - ## A function - "function" - | - ## An option - "option" - db.parameter.class.attribute = - - ## Identifies the class of parameter - attribute class { db.parameter.class.enumeration } - db.parameter.role.attribute = attribute role { text } - db.parameter.attlist = - db.parameter.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.parameter.class.attribute? - db.parameter = - - ## A value or a symbolic reference to a value - element parameter { db.parameter.attlist, db._text } -} -db.replaceable.inlines = db._text | db.co -div { - db.replaceable.class.enumeration = - - ## A command - "command" - | - ## A function - "function" - | - ## An option - "option" - | - ## A parameter - "parameter" - db.replaceable.class.attribute = - - ## Identifies the nature of the replaceable text - attribute class { db.replaceable.class.enumeration } - db.replaceable.role.attribute = attribute role { text } - db.replaceable.attlist = - db.replaceable.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.replaceable.class.attribute? - db.replaceable = - - ## Content that may or must be replaced by the user - element replaceable { - db.replaceable.attlist, db.replaceable.inlines* - } -} -div { - db.uri.type.attribute = - - ## Identifies the type of URI specified - attribute type { text }? - db.uri.role.attribute = attribute role { text } - db.uri.attlist = - db.uri.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.uri.type.attribute - db.uri = - - ## A Uniform Resource Identifier - element uri { db.uri.attlist, db._text } -} -div { - db.abbrev.role.attribute = attribute role { text } - db.abbrev.attlist = - db.abbrev.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.abbrev = - - ## An abbreviation, especially one followed by a period - element abbrev { - db.abbrev.attlist, - (db._text | db.superscript | db.subscript | db.trademark)* - } -} -div { - db.acronym.role.attribute = attribute role { text } - db.acronym.attlist = - db.acronym.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.acronym = - - ## An often pronounceable word made from the initial (or selected) letters of a name or phrase - element acronym { - db.acronym.attlist, - (db._text | db.superscript | db.subscript | db.trademark)* - } -} -div { - db.citation.role.attribute = attribute role { text } - db.citation.attlist = - db.citation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.citation = - - ## An inline bibliographic reference to another published work - element citation { db.citation.attlist, db.all.inlines* } -} -div { - db.citerefentry.role.attribute = attribute role { text } - db.citerefentry.attlist = - db.citerefentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.citerefentry = - - ## A citation to a reference page - element citerefentry { - db.citerefentry.attlist, db.refentrytitle, db.manvolnum? - } -} -div { - db.refentrytitle.role.attribute = attribute role { text } - db.refentrytitle.attlist = - db.refentrytitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refentrytitle = - - ## The title of a reference page - element refentrytitle { db.refentrytitle.attlist, db.all.inlines* } -} -div { - db.manvolnum.role.attribute = attribute role { text } - db.manvolnum.attlist = - db.manvolnum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.manvolnum = - - ## A reference volume number - element manvolnum { db.manvolnum.attlist, db._text } -} -div { - db.citetitle.pubwork.enumeration = - - ## An article - "article" - | - ## A bulletin board system - "bbs" - | - ## A book - "book" - | - ## A CD-ROM - "cdrom" - | - ## A chapter (as of a book) - "chapter" - | - ## A DVD - "dvd" - | - ## An email message - "emailmessage" - | - ## A gopher page - "gopher" - | - ## A journal - "journal" - | - ## A manuscript - "manuscript" - | - ## A posting to a newsgroup - "newsposting" - | - ## A part (as of a book) - "part" - | - ## A reference entry - "refentry" - | - ## A section (as of a book or article) - "section" - | - ## A series - "series" - | - ## A set (as of books) - "set" - | - ## A web page - "webpage" - | - ## A wiki page - "wiki" - db.citetitle.pubwork.attribute = - - ## Identifies the nature of the publication being cited - attribute pubwork { db.citetitle.pubwork.enumeration } - db.citetitle.role.attribute = attribute role { text } - db.citetitle.attlist = - db.citetitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.citetitle.pubwork.attribute? - db.citetitle = - - ## The title of a cited work - element citetitle { db.citetitle.attlist, db.all.inlines* } -} -div { - db.emphasis.role.attribute = attribute role { text } - db.emphasis.attlist = - db.emphasis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.emphasis = - - ## Emphasized text - element emphasis { db.emphasis.attlist, db.all.inlines* } -} -div { - db._emphasis = - - ## A limited span of emphasized text - element emphasis { db.emphasis.attlist, (db._text | db._emphasis)* } -} -div { - db.foreignphrase.role.attribute = attribute role { text } - db.foreignphrase.attlist = - db.foreignphrase.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.foreignphrase = - - ## A word or phrase in a language other than the primary language of the document - element foreignphrase { - db.foreignphrase.attlist, (text | db.general.inlines)* - } -} -div { - db.phrase.role.attribute = attribute role { text } - db.phrase.attlist = - db.phrase.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.phrase = - - ## A span of text - element phrase { db.phrase.attlist, db.all.inlines* } -} -div { - db._phrase = - - ## A limited span of text - element phrase { db.phrase.attlist, db._text } -} -div { - db.quote.role.attribute = attribute role { text } - db.quote.attlist = - db.quote.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.quote = - - ## An inline quotation - element quote { db.quote.attlist, db.all.inlines* } -} -div { - db.subscript.role.attribute = attribute role { text } - db.subscript.attlist = - db.subscript.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.subscript = - - ## A subscript (as in H2 - ## O, the molecular formula for water) - element subscript { db.subscript.attlist, db._text } -} -div { - db.superscript.role.attribute = attribute role { text } - db.superscript.attlist = - db.superscript.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.superscript = - - ## A superscript (as in x^2, the mathematical notation for x multiplied by itself) - element superscript { db.superscript.attlist, db._text } -} -div { - db.trademark.class.enumeration = - - ## A copyright - "copyright" - | - ## A registered copyright - "registered" - | - ## A service - "service" - | - ## A trademark - "trade" - db.trademark.class.attribute = - - ## Identifies the class of trade mark - attribute class { db.trademark.class.enumeration } - db.trademark.role.attribute = attribute role { text } - db.trademark.attlist = - db.trademark.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.trademark.class.attribute? - db.trademark = - - ## A trademark - element trademark { db.trademark.attlist, db._text } -} -div { - db.wordasword.role.attribute = attribute role { text } - db.wordasword.attlist = - db.wordasword.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.wordasword = - - ## A word meant specifically as a word and not representing anything else - element wordasword { db.wordasword.attlist, db._text } -} -div { - db.footnoteref.role.attribute = attribute role { text } - db.footnoteref.label.attribute = db.label.attribute - db.footnoteref.attlist = - db.footnoteref.role.attribute? - & db.common.attributes - & db.linkend.attribute - & db.footnoteref.label.attribute? - db.footnoteref = - - ## A cross reference to a footnote (a footnote mark) - [ - s:pattern [ - name = "Footnote reference type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnoteref" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@linkend]) = 'footnote' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" - "@linkend on footnoteref must point to a footnote." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element footnoteref { db.footnoteref.attlist, empty } -} -div { - db.xref.role.attribute = attribute role { text } - db.xref.xrefstyle.attribute = db.xrefstyle.attribute - db.xref.endterm.attribute = db.endterm.attribute - db.xref.attlist = - db.xref.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - & db.xref.xrefstyle.attribute? - & db.xref.endterm.attribute? - db.xref = - - ## A cross reference to another part of the document - element xref { db.xref.attlist, empty } -} -div { - db.link.role.attribute = attribute role { text } - db.link.xrefstyle.attribute = db.xrefstyle.attribute - db.link.endterm.attribute = db.endterm.attribute - db.link.attlist = - db.link.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - & db.link.xrefstyle.attribute? - & db.link.endterm.attribute? - db.link = - - ## A hypertext link - element link { db.link.attlist, db.all.inlines* } -} -div { - db.olink.role.attribute = attribute role { text } - db.olink.xrefstyle.attribute = db.xrefstyle.attribute - db.olink.localinfo.attribute = - - ## Holds additional information that may be used by the applicatoin when resolving the link - attribute localinfo { text } - db.olink.targetdoc.attribute = - - ## Specifies the URI of the document in which the link target appears - attribute targetdoc { xsd:anyURI } - db.olink.targetptr.attribute = - - ## Specifies the location of the link target in the document - attribute targetptr { text } - db.olink.type.attribute = - - ## Identifies application-specific customization of the link behavior - attribute type { text } - db.olink.attlist = - db.common.attributes - & db.olink.targetdoc.attribute? - & db.olink.role.attribute? - & db.olink.xrefstyle.attribute? - & db.olink.localinfo.attribute? - & db.olink.targetptr.attribute? - & db.olink.type.attribute? - db.olink = - - ## A link that addresses its target indirectly - element olink { db.olink.attlist, db.all.inlines* } -} -div { - db.anchor.role.attribute = attribute role { text } - db.anchor.attlist = - db.anchor.role.attribute? & db.common.idreq.attributes - db.anchor = - - ## A spot in the document - element anchor { db.anchor.attlist, empty } -} -div { - db.alt.role.attribute = attribute role { text } - db.alt.attlist = db.alt.role.attribute? & db.common.attributes - db.alt = - - ## A text-only annotation, often used for accessibility - element alt { db.alt.attlist, (text | db.inlinemediaobject)* } -} -db.status.attribute = - - ## Identifies the editorial or publication status of the element on which it occurs - attribute status { text } -db.toplevel.sections = - ((db.section+, db.simplesect*) | db.simplesect+) - | (db.sect1+, db.simplesect*) - | db.refentry+ -db.toplevel.blocks.or.sections = - (db.all.blocks+, db.toplevel.sections?) | db.toplevel.sections -db.recursive.sections = - ((db.section+, db.simplesect*) | db.simplesect+) - | db.refentry+ -db.recursive.blocks.or.sections = - (db.all.blocks+, db.recursive.sections?) | db.recursive.sections -db.divisions = db.part | db.reference -db.components = - db.dedication - | db.acknowledgements - | db.preface - | db.chapter - | db.appendix - | db.article - | db.colophon -db.navigation.components = - notAllowed | db.glossary | db.bibliography | db.index | db.toc -db.component.contentmodel = - db.navigation.components*, - db.toplevel.blocks.or.sections, - db.navigation.components* -db.setindex.components = notAllowed | db.setindex -db.toc.components = notAllowed | db.toc -db.set.components = db.set | db.book -div { - db.set.status.attribute = db.status.attribute - db.set.role.attribute = attribute role { text } - db.set.attlist = - db.set.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.set.status.attribute? - db.set.info = db._info.title.req - db.set = - - ## A collection of books - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:set" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element set { - db.set.attlist, - db.set.info, - db.toc.components?, - db.set.components+, - db.setindex.components? - } -} -div { - db.book.status.attribute = db.status.attribute - db.book.role.attribute = attribute role { text } - db.book.attlist = - db.book.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.book.status.attribute? - db.book.info = db._info - db.book = - - ## A book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:book" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element book { - db.book.attlist, - db.book.info, - (db.navigation.components | db.components | db.divisions)* - } -} -div { - db.dedication.status.attribute = db.status.attribute - db.dedication.role.attribute = attribute role { text } - db.dedication.attlist = - db.dedication.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.dedication.status.attribute? - db.dedication.info = db._info - db.dedication = - - ## The dedication of a book or other component - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:dedication" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element dedication { - db.dedication.attlist, db.dedication.info, db.all.blocks+ - } -} -div { - db.acknowledgements.status.attribute = db.status.attribute - db.acknowledgements.role.attribute = attribute role { text } - db.acknowledgements.attlist = - db.acknowledgements.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.acknowledgements.status.attribute? - db.acknowledgements.info = db._info - db.acknowledgements = - - ## Acknowledgements of a book or other component - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:acknowledgements" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element acknowledgements { - db.acknowledgements.attlist, - db.acknowledgements.info, - db.all.blocks+ - } -} -div { - db.colophon.status.attribute = db.status.attribute - db.colophon.role.attribute = attribute role { text } - db.colophon.attlist = - db.colophon.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.colophon.status.attribute? - db.colophon.info = db._info - db.colophon = - - ## Text at the back of a book describing facts about its production - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:colophon" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element colophon { - db.colophon.attlist, db.colophon.info, db.all.blocks+ - } -} -div { - db.appendix.status.attribute = db.status.attribute - db.appendix.role.attribute = attribute role { text } - db.appendix.attlist = - db.appendix.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.appendix.status.attribute? - db.appendix.info = db._info.title.req - db.appendix = - - ## An appendix in a Book or Article - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:appendix" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element appendix { - db.appendix.attlist, db.appendix.info, db.component.contentmodel - } -} -div { - db.chapter.status.attribute = db.status.attribute - db.chapter.role.attribute = attribute role { text } - db.chapter.attlist = - db.chapter.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.chapter.status.attribute? - db.chapter.info = db._info.title.req - db.chapter = - - ## A chapter, as of a book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:chapter" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element chapter { - db.chapter.attlist, db.chapter.info, db.component.contentmodel - } -} -db.part.components = - (db.navigation.components | db.components) - | (db.refentry | db.reference) -div { - db.part.status.attribute = db.status.attribute - db.part.role.attribute = attribute role { text } - db.part.attlist = - db.part.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.part.status.attribute? - db.part.info = db._info.title.req - db.part = - - ## A division in a book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:part" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element part { - db.part.attlist, db.part.info, db.partintro?, db.part.components+ - } -} -div { - db.preface.status.attribute = db.status.attribute - db.preface.role.attribute = attribute role { text } - db.preface.attlist = - db.preface.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.preface.status.attribute? - db.preface.info = db._info.title.req - db.preface = - - ## Introductory matter preceding the first chapter of a book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:preface" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element preface { - db.preface.attlist, db.preface.info, db.component.contentmodel - } -} -div { - db.partintro.status.attribute = db.status.attribute - db.partintro.role.attribute = attribute role { text } - db.partintro.attlist = - db.partintro.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.partintro.status.attribute? - db.partintro.info = db._info - db.partintro = - - ## An introduction to the contents of a part - element partintro { - db.partintro.attlist, - db.partintro.info, - db.toplevel.blocks.or.sections - } -} -div { - db.section.status.attribute = db.status.attribute - db.section.role.attribute = attribute role { text } - db.section.attlist = - db.section.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.section.status.attribute? - db.section.info = db._info.title.req - db.section = - - ## A recursive section - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:section" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element section { - db.section.attlist, - db.section.info, - db.recursive.blocks.or.sections, - db.navigation.components* - } -} -div { - db.simplesect.status.attribute = db.status.attribute - db.simplesect.role.attribute = attribute role { text } - db.simplesect.attlist = - db.simplesect.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.simplesect.status.attribute? - db.simplesect.info = db._info.title.req - db.simplesect = - - ## A section of a document with no subdivisions - element simplesect { - db.simplesect.attlist, db.simplesect.info, db.all.blocks+ - } -} -db.article.components = db.toplevel.sections -div { - db.article.status.attribute = db.status.attribute - db.article.class.enumeration = - - ## A collection of frequently asked questions. - "faq" - | - ## An article in a journal or other periodical. - "journalarticle" - | - ## A description of a product. - "productsheet" - | - ## A specification. - "specification" - | - ## A technical report. - "techreport" - | - ## A white paper. - "whitepaper" - db.article.class.attribute = - - ## Identifies the nature of the article - attribute class { db.article.class.enumeration } - db.article.role.attribute = attribute role { text } - db.article.attlist = - db.article.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.article.status.attribute? - & db.article.class.attribute? - db.article.info = db._info.title.req - db.article = - - ## An article - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:article" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element article { - db.article.attlist, - db.article.info, - (db.navigation.components - | db.appendix - | db.acknowledgements - | db.colophon)*, - ((db.all.blocks+, db.article.components?) - | db.article.components), - (db.navigation.components - | db.appendix - | db.acknowledgements - | db.colophon)* - } -} -db.annotations.attribute = - - ## Identifies one or more annotations that apply to this element - attribute annotations { text } -div { - db.annotation.role.attribute = attribute role { text } - db.annotation.annotates.attribute = - - ## Identifies one ore more elements to which this annotation applies - attribute annotates { text } - db.annotation.attlist = - db.annotation.role.attribute? - & db.annotation.annotates.attribute? - & db.common.attributes - db.annotation.info = db._info.title.only - db.annotation = - - ## An annotation - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:annotation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:annotation)" - "annotation must not occur in the descendants of annotation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element annotation { - db.annotation.attlist, db.annotation.info, db.all.blocks+ - } -} -db.xlink.from.attribute = - - ## Specifies the XLink traversal-from - attribute xlink:from { xsd:NMTOKEN }? -db.xlink.label.attribute = - - ## Specifies the XLink label - attribute xlink:label { xsd:NMTOKEN }? -db.xlink.to.attribute = - - ## Specifies the XLink traversal-to - attribute xlink:to { xsd:NMTOKEN }? -div { - db.extendedlink.role.attribute = attribute role { text } - db.extendedlink.attlist = - db.extendedlink.role.attribute? - & db.common.attributes - & - ## Identifies the XLink link type - [ a:defaultValue = "extended" ] - attribute xlink:type { - - ## An XLink extended link - "extended" - }? - & db.xlink.role.attribute? - & db.xlink.title.attribute? - db.extendedlink = - - ## An XLink extended link - element extendedlink { - db.extendedlink.attlist, (db.locator | db.arc)+ - } -} -div { - db.locator.role.attribute = attribute role { text } - db.locator.attlist = - db.locator.role.attribute? - & db.common.attributes - & - ## Identifies the XLink link type - [ a:defaultValue = "locator" ] - attribute xlink:type { - - ## An XLink locator link - "locator" - }? - & db.xlink.href.attribute - & db.xlink.role.attribute? - & db.xlink.title.attribute? - & db.xlink.label.attribute? - db.locator = - - ## An XLink locator in an extendedlink - element locator { db.locator.attlist, empty } -} -div { - db.arc.role.attribute = attribute role { text } - db.arc.attlist = - db.arc.role.attribute? - & db.common.attributes - & - ## Identifies the XLink link type - [ a:defaultValue = "arc" ] - attribute xlink:type { - - ## An XLink arc link - "arc" - }? - & db.xlink.arcrole.attribute? - & db.xlink.title.attribute? - & db.xlink.show.attribute? - & db.xlink.actuate.attribute? - & db.xlink.from.attribute? - & db.xlink.to.attribute? - db.arc = - - ## An XLink arc in an extendedlink - element arc { db.arc.attlist, empty } -} -db.sect1.sections = (db.sect2+, db.simplesect*) | db.simplesect+ -div { - db.sect1.status.attribute = db.status.attribute - db.sect1.role.attribute = attribute role { text } - db.sect1.attlist = - db.sect1.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect1.status.attribute? - db.sect1.info = db._info.title.req - db.sect1 = - - ## A top-level section of document - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect1" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect1 { - db.sect1.attlist, - db.sect1.info, - ((db.all.blocks+, db.sect1.sections?) | db.sect1.sections), - db.navigation.components* - } -} -db.sect2.sections = (db.sect3+, db.simplesect*) | db.simplesect+ -div { - db.sect2.status.attribute = db.status.attribute - db.sect2.role.attribute = attribute role { text } - db.sect2.attlist = - db.sect2.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect2.status.attribute? - db.sect2.info = db._info.title.req - db.sect2 = - - ## A subsection within a Sect1 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect2" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect2 { - db.sect2.attlist, - db.sect2.info, - ((db.all.blocks+, db.sect2.sections?) | db.sect2.sections), - db.navigation.components* - } -} -db.sect3.sections = (db.sect4+, db.simplesect*) | db.simplesect+ -div { - db.sect3.status.attribute = db.status.attribute - db.sect3.role.attribute = attribute role { text } - db.sect3.attlist = - db.sect3.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect3.status.attribute? - db.sect3.info = db._info.title.req - db.sect3 = - - ## A subsection within a Sect2 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect3" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect3 { - db.sect3.attlist, - db.sect3.info, - ((db.all.blocks+, db.sect3.sections?) | db.sect3.sections), - db.navigation.components* - } -} -db.sect4.sections = (db.sect5+, db.simplesect*) | db.simplesect+ -div { - db.sect4.status.attribute = db.status.attribute - db.sect4.role.attribute = attribute role { text } - db.sect4.attlist = - db.sect4.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect4.status.attribute? - db.sect4.info = db._info.title.req - db.sect4 = - - ## A subsection within a Sect3 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect4" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect4 { - db.sect4.attlist, - db.sect4.info, - ((db.all.blocks+, db.sect4.sections?) | db.sect4.sections), - db.navigation.components* - } -} -db.sect5.sections = db.simplesect+ -div { - db.sect5.status.attribute = db.status.attribute - db.sect5.role.attribute = attribute role { text } - db.sect5.attlist = - db.sect5.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect5.status.attribute? - db.sect5.info = db._info.title.req - db.sect5 = - - ## A subsection within a Sect4 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect5" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect5 { - db.sect5.attlist, - db.sect5.info, - ((db.all.blocks+, db.sect5.sections?) | db.sect5.sections), - db.navigation.components* - } -} -db.toplevel.refsection = db.refsection+ | db.refsect1+ -db.secondlevel.refsection = db.refsection+ | db.refsect2+ -db.reference.components = db.refentry -div { - db.reference.role.attribute = attribute role { text } - db.reference.attlist = - db.reference.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.status.attribute? - & db.label.attribute? - db.reference.info = db._info.title.req - db.reference = - - ## A collection of reference entries - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:reference" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element reference { - db.reference.attlist, - db.reference.info, - db.partintro?, - db.reference.components+ - } -} -div { - db.refentry.role.attribute = attribute role { text } - db.refentry.attlist = - db.refentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.status.attribute? - & db.label.attribute? - db.refentry.info = db._info.title.forbidden - db.refentry = - - ## A reference page (originally a UNIX man-style reference page) - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refentry" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refentry { - db.refentry.attlist, - db.indexterm*, - db.refentry.info, - db.refmeta?, - db.refnamediv+, - db.refsynopsisdiv?, - db.toplevel.refsection - } -} -div { - db.refmeta.role.attribute = attribute role { text } - db.refmeta.attlist = - db.refmeta.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refmeta = - - ## Meta-information for a reference entry - element refmeta { - db.refmeta.attlist, - db.indexterm*, - db.refentrytitle, - db.manvolnum?, - db.refmiscinfo*, - db.indexterm* - } -} -db.refmiscinfo.class.enumeration = - - ## The name of the software product or component to which this topic applies - "source" - | - ## The version of the software product or component to which this topic applies - "version" - | - ## The section title of the reference page (e.g., User Commands) - "manual" - | - ## The section title of the reference page (believed synonymous with "manual" but in wide use) - "sectdesc" - | - ## The name of the software product or component to which this topic applies (e.g., SunOS x.y; believed synonymous with "source" but in wide use) - "software" -db.refmiscinfo.class-enum.attribute = - - ## Identifies the kind of miscellaneous information - attribute class { db.refmiscinfo.class.enumeration }? -db.refmiscinfo.class-other.attribute = - - ## Identifies the nature of non-standard miscellaneous information - attribute otherclass { text } -db.refmiscinfo.class-other.attributes = - - ## Identifies the kind of miscellaneious information - attribute class { - - ## Indicates that the information is some 'other' kind. - "other" - } - & db.refmiscinfo.class-other.attribute -db.refmiscinfo.class.attribute = - db.refmiscinfo.class-enum.attribute - | db.refmiscinfo.class-other.attributes -div { - db.refmiscinfo.role.attribute = attribute role { text } - db.refmiscinfo.attlist = - db.refmiscinfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.refmiscinfo.class.attribute? - db.refmiscinfo = - - ## Meta-information for a reference entry other than the title and volume number - element refmiscinfo { db.refmiscinfo.attlist, db._text } -} -div { - db.refnamediv.role.attribute = attribute role { text } - db.refnamediv.attlist = - db.refnamediv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refnamediv = - - ## The name, purpose, and classification of a reference page - element refnamediv { - db.refnamediv.attlist, - db.refdescriptor?, - db.refname+, - db.refpurpose, - db.refclass* - } -} -div { - db.refdescriptor.role.attribute = attribute role { text } - db.refdescriptor.attlist = - db.refdescriptor.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refdescriptor = - - ## A description of the topic of a reference page - element refdescriptor { db.refdescriptor.attlist, db.all.inlines* } -} -div { - db.refname.role.attribute = attribute role { text } - db.refname.attlist = - db.refname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refname = - - ## The name of (one of) the subject(s) of a reference page - element refname { db.refname.attlist, db.all.inlines* } -} -div { - db.refpurpose.role.attribute = attribute role { text } - db.refpurpose.attlist = - db.refpurpose.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refpurpose = - - ## A short (one sentence) synopsis of the topic of a reference page - element refpurpose { db.refpurpose.attlist, db.all.inlines* } -} -div { - db.refclass.role.attribute = attribute role { text } - db.refclass.attlist = - db.refclass.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refclass = - - ## The scope or other indication of applicability of a reference entry - element refclass { db.refclass.attlist, (text | db.application)* } -} -div { - db.refsynopsisdiv.role.attribute = attribute role { text } - db.refsynopsisdiv.attlist = - db.refsynopsisdiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refsynopsisdiv.info = db._info - db.refsynopsisdiv = - - ## A syntactic synopsis of the subject of the reference page - element refsynopsisdiv { - db.refsynopsisdiv.attlist, - db.refsynopsisdiv.info, - ((db.all.blocks+, db.secondlevel.refsection?) - | db.secondlevel.refsection) - } -} -div { - db.refsection.role.attribute = attribute role { text } - db.refsection.attlist = - db.refsection.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.status.attribute? - & db.label.attribute? - db.refsection.info = db._info.title.req - db.refsection = - - ## A recursive section in a refentry - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refsection" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refsection { - db.refsection.attlist, - db.refsection.info, - ((db.all.blocks+, db.refsection*) | db.refsection+) - } -} -db.refsect1.sections = db.refsect2+ -div { - db.refsect1.status.attribute = db.status.attribute - db.refsect1.role.attribute = attribute role { text } - db.refsect1.attlist = - db.refsect1.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.refsect1.status.attribute? - db.refsect1.info = db._info.title.req - db.refsect1 = - - ## A major subsection of a reference entry - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refsect1" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refsect1 { - db.refsect1.attlist, - db.refsect1.info, - ((db.all.blocks+, db.refsect1.sections?) | db.refsect1.sections) - } -} -db.refsect2.sections = db.refsect3+ -div { - db.refsect2.status.attribute = db.status.attribute - db.refsect2.role.attribute = attribute role { text } - db.refsect2.attlist = - db.refsect2.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.refsect2.status.attribute? - db.refsect2.info = db._info.title.req - db.refsect2 = - - ## A subsection of a refsect1 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refsect2" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refsect2 { - db.refsect2.attlist, - db.refsect2.info, - ((db.all.blocks+, db.refsect2.sections?) | db.refsect2.sections) - } -} -div { - db.refsect3.status.attribute = db.status.attribute - db.refsect3.role.attribute = attribute role { text } - db.refsect3.attlist = - db.refsect3.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.refsect3.status.attribute? - db.refsect3.info = db._info.title.req - db.refsect3 = - - ## A subsection of a refsect2 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refsect3" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refsect3 { - db.refsect3.attlist, db.refsect3.info, db.all.blocks+ - } -} -db.glossary.inlines = db.firstterm | db.glossterm -db.baseform.attribute = - - ## Specifies the base form of the term, the one that appears in the glossary. This allows adjectival, plural, and other variations of the term to appear in the element. The element content is the default base form. - attribute baseform { text }? -div { - db.glosslist.role.attribute = attribute role { text } - db.glosslist.attlist = - db.glosslist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.glosslist.info = db._info.title.only - db.glosslist = - - ## A wrapper for a list of glossary entries - element glosslist { - db.glosslist.attlist, - db.glosslist.info?, - db.all.blocks*, - db.glossentry+ - } -} -div { - db.glossentry.role.attribute = attribute role { text } - db.glossentry.sortas.attribute = - - ## Specifies the string by which the element's content is to be sorted; if unspecified, the content is used - attribute sortas { text } - db.glossentry.attlist = - db.glossentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.glossentry.sortas.attribute? - db.glossentry = - - ## An entry in a Glossary or GlossList - element glossentry { - db.glossentry.attlist, - db.glossterm, - db.acronym?, - db.abbrev?, - db.indexterm*, - (db.glosssee | db.glossdef+) - } -} -div { - db.glossdef.role.attribute = attribute role { text } - db.glossdef.subject.attribute = - - ## Specifies a list of keywords for the definition - attribute subject { text } - db.glossdef.attlist = - db.glossdef.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.glossdef.subject.attribute? - db.glossdef = - - ## A definition in a GlossEntry - element glossdef { - db.glossdef.attlist, db.all.blocks+, db.glossseealso* - } -} -div { - db.glosssee.role.attribute = attribute role { text } - db.glosssee.otherterm.attribute = - - ## Identifies the other term - attribute otherterm { xsd:IDREF } - db.glosssee.attlist = - db.glosssee.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.glosssee.otherterm.attribute? - db.glosssee = - - ## A cross-reference from one glossentry - ## to another - [ - s:pattern [ - name = "Glosssary 'see' type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:glosssee[@otherterm]" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'" - "@otherterm on glosssee must point to a glossentry." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element glosssee { db.glosssee.attlist, db.all.inlines* } -} -div { - db.glossseealso.role.attribute = attribute role { text } - db.glossseealso.otherterm.attribute = - - ## Identifies the other term - attribute otherterm { xsd:IDREF } - db.glossseealso.attlist = - db.glossseealso.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.glossseealso.otherterm.attribute? - db.glossseealso = - - ## A cross-reference from one GlossEntry to another - [ - s:pattern [ - name = "Glossary 'seealso' type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:glossseealso[@otherterm]" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'" - "@otherterm on glossseealso must point to a glossentry." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element glossseealso { db.glossseealso.attlist, db.all.inlines* } -} -div { - db.firstterm.role.attribute = attribute role { text } - db.firstterm.attlist = - db.firstterm.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.baseform.attribute - db.firstterm = - - ## The first occurrence of a term - [ - s:pattern [ - name = "Glossary 'firstterm' type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:firstterm[@linkend]" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" - "@linkend on firstterm must point to a glossentry." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element firstterm { db.firstterm.attlist, db.all.inlines* } -} -div { - db.glossterm.role.attribute = attribute role { text } - db.glossterm.attlist = - db.glossterm.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.baseform.attribute - db.glossterm = - - ## A glossary term - [ - s:pattern [ - name = "Glossary 'glossterm' type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:glossterm[@linkend]" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" - "@linkend on glossterm must point to a glossentry." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element glossterm { db.glossterm.attlist, db.all.inlines* } -} -div { - db.glossary.status.attribute = db.status.attribute - db.glossary.role.attribute = attribute role { text } - db.glossary.attlist = - db.glossary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.glossary.status.attribute? - db.glossary.info = db._info - db.glossary = - - ## A glossary - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:glossary" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element glossary { - db.glossary.attlist, - db.glossary.info, - db.all.blocks*, - (db.glossdiv* | db.glossentry*), - db.bibliography? - } -} -div { - db.glossdiv.status.attribute = db.status.attribute - db.glossdiv.role.attribute = attribute role { text } - db.glossdiv.attlist = - db.glossdiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.glossdiv.status.attribute? - db.glossdiv.info = db._info.title.req - db.glossdiv = - - ## A division in a Glossary - element glossdiv { - db.glossdiv.attlist, - db.glossdiv.info, - db.all.blocks*, - db.glossentry+ - } -} -div { - db.termdef.role.attribute = attribute role { text } - db.termdef.attlist = - db.termdef.role.attribute? - & db.glossentry.sortas.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.baseform.attribute - db.termdef = - - ## An inline definition of a term - [ - s:pattern [ - name = "Glossary term definition constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:termdef" - "\x{a}" ~ - " " - s:assert [ - test = "count(db:firstterm) = 1" - "A termdef must contain exactly one firstterm" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element termdef { db.termdef.attlist, db.all.inlines* } -} -db.relation.attribute = - - ## Identifies the relationship between the bibliographic elemnts - attribute relation { text } -div { - db.biblioentry.role.attribute = attribute role { text } - db.biblioentry.attlist = - db.biblioentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.biblioentry = - - ## An entry in a Bibliography - element biblioentry { - db.biblioentry.attlist, db.bibliographic.elements+ - } -} -div { - db.bibliomixed.role.attribute = attribute role { text } - db.bibliomixed.attlist = - db.bibliomixed.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.bibliomixed = - - ## An entry in a Bibliography - element bibliomixed { - db.bibliomixed.attlist, (text | db.bibliographic.elements)* - } -} -div { - db.biblioset.relation.attribute = db.relation.attribute - db.biblioset.role.attribute = attribute role { text } - db.biblioset.attlist = - db.biblioset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblioset.relation.attribute? - db.biblioset = - - ## A raw container for related bibliographic information - element biblioset { - db.biblioset.attlist, db.bibliographic.elements+ - } -} -div { - db.bibliomset.relation.attribute = db.relation.attribute - db.bibliomset.role.attribute = attribute role { text } - db.bibliomset.attlist = - db.bibliomset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.bibliomset.relation.attribute? - db.bibliomset = - - ## A cooked container for related bibliographic information - element bibliomset { - db.bibliomset.attlist, (db._text | db.bibliographic.elements)* - } -} -div { - db.bibliomisc.role.attribute = attribute role { text } - db.bibliomisc.attlist = - db.bibliomisc.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.bibliomisc = - - ## Untyped bibliographic information - element bibliomisc { db.bibliomisc.attlist, db._text } -} -div { - db.bibliography.status.attrib = db.status.attribute - db.bibliography.role.attribute = attribute role { text } - db.bibliography.attlist = - db.bibliography.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.bibliography.status.attrib? - db.bibliography.info = db._info - db.bibliography = - - ## A bibliography - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:bibliography" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element bibliography { - db.bibliography.attlist, - db.bibliography.info, - db.all.blocks*, - (db.bibliodiv+ | (db.biblioentry | db.bibliomixed)+) - } -} -div { - db.bibliodiv.status.attrib = db.status.attribute - db.bibliodiv.role.attribute = attribute role { text } - db.bibliodiv.attlist = - db.bibliodiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.bibliodiv.status.attrib? - db.bibliodiv.info = db._info.title.req - db.bibliodiv = - - ## A section of a Bibliography - element bibliodiv { - db.bibliodiv.attlist, - db.bibliodiv.info, - db.all.blocks*, - (db.biblioentry | db.bibliomixed)+ - } -} -div { - db.bibliolist.role.attribute = attribute role { text } - db.bibliolist.attlist = - db.bibliolist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.bibliolist.info = db._info.title.only - db.bibliolist = - - ## A wrapper for a list of bibliography entries - element bibliolist { - db.bibliolist.attlist, - db.bibliolist.info?, - db.all.blocks*, - (db.biblioentry | db.bibliomixed)+ - } -} -div { - db.biblioref.role.attribute = attribute role { text } - db.biblioref.xrefstyle.attribute = db.xrefstyle.attribute - db.biblioref.endterm.attribute = db.endterm.attribute - db.biblioref.units.attribute = - - ## The units (for example, pages) used to identify the beginning and ending of a reference. - attribute units { xsd:token } - db.biblioref.begin.attribute = - - ## Identifies the beginning of a reference; the location within the work that is being referenced. - attribute begin { xsd:token } - db.biblioref.end.attribute = - - ## Identifies the end of a reference. - attribute end { xsd:token } - db.biblioref.attlist = - db.biblioref.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - & db.biblioref.xrefstyle.attribute? - & db.biblioref.endterm.attribute? - & db.biblioref.units.attribute? - & db.biblioref.begin.attribute? - & db.biblioref.end.attribute? - db.biblioref = - - ## A cross-reference to a bibliographic entry - element biblioref { db.biblioref.attlist, empty } -} -db.significance.enumeration = - - ## Normal - "normal" - | - ## Preferred - "preferred" -db.significance.attribute = - - ## Specifies the significance of the term - attribute significance { db.significance.enumeration } -db.zone.attribute = - - ## Specifies the IDs of the elements to which this term applies - attribute zone { xsd:IDREFS } -db.indexterm.pagenum.attribute = - - ## Indicates the page on which this index term occurs in some version of the printed document - attribute pagenum { text } -db.scope.enumeration = - - ## All indexes - "all" - | - ## The global index (as for a combined index of a set of box) - "global" - | - ## The local index (the index for this document only) - "local" -db.scope.attribute = - - ## Specifies the scope of the index term - attribute scope { db.scope.enumeration } -db.sortas.attribute = - - ## Specifies the string by which the term is to be sorted; if unspecified, the term content is used - attribute sortas { text } -db.index.type.attribute = - - ## Specifies the target index for this term - attribute type { text } -div { - db.itermset.role.attribute = attribute role { text } - db.itermset.attlist = - db.itermset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.itermset = - - ## A set of index terms in the meta-information of a document - element itermset { db.itermset.attlist, db.indexterm.singular+ } -} -db.indexterm.contentmodel = - db.primary?, - ((db.secondary, - ((db.tertiary, (db.see | db.seealso+)?) - | db.see - | db.seealso+)?) - | db.see - | db.seealso+)? -div { - db.indexterm.singular.role.attribute = attribute role { text } - db.indexterm.singular.class.attribute = - - ## Identifies the class of index term - attribute class { - - ## A singular index term - "singular" - } - db.indexterm.singular.attlist = - db.indexterm.singular.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.significance.attribute? - & db.zone.attribute? - & db.indexterm.pagenum.attribute? - & db.scope.attribute? - & db.index.type.attribute? - & db.indexterm.singular.class.attribute? - db.indexterm.singular = - - ## A wrapper for an indexed term - element indexterm { - db.indexterm.singular.attlist, db.indexterm.contentmodel - } -} -div { - db.indexterm.startofrange.role.attribute = attribute role { text } - db.indexterm.startofrange.class.attribute = - - ## Identifies the class of index term - attribute class { - - ## The start of a range - "startofrange" - } - db.indexterm.startofrange.attlist = - db.indexterm.startofrange.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.significance.attribute? - & db.zone.attribute? - & db.indexterm.pagenum.attribute? - & db.scope.attribute? - & db.index.type.attribute? - & db.indexterm.startofrange.class.attribute - db.indexterm.startofrange = - - ## A wrapper for an indexed term that covers a range - element indexterm { - db.indexterm.startofrange.attlist, db.indexterm.contentmodel - } -} -div { - db.indexterm.endofrange.role.attribute = attribute role { text } - db.indexterm.endofrange.class.attribute = - - ## Identifies the class of index term - attribute class { - - ## The end of a range - "endofrange" - } - db.indexterm.endofrange.startref.attribute = - - ## Points to the start of the range - attribute startref { xsd:IDREF } - db.indexterm.endofrange.attlist = - db.indexterm.endofrange.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.indexterm.endofrange.class.attribute - & db.indexterm.endofrange.startref.attribute - db.indexterm.endofrange = - - ## Identifies the end of a range associated with an indexed term - element indexterm { db.indexterm.endofrange.attlist, empty } -} -div { - db.indexterm = - db.indexterm.singular - | db.indexterm.startofrange - | db.indexterm.endofrange -} -div { - db.primary.role.attribute = attribute role { text } - db.primary.attlist = - db.primary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.sortas.attribute? - db.primary = - - ## The primary word or phrase under which an index term should be sorted - element primary { db.primary.attlist, db.all.inlines* } -} -div { - db.secondary.role.attribute = attribute role { text } - db.secondary.attlist = - db.secondary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.sortas.attribute? - db.secondary = - - ## A secondary word or phrase in an index term - element secondary { db.secondary.attlist, db.all.inlines* } -} -div { - db.tertiary.role.attribute = attribute role { text } - db.tertiary.attlist = - db.tertiary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.sortas.attribute? - db.tertiary = - - ## A tertiary word or phrase in an index term - element tertiary { db.tertiary.attlist, db.all.inlines* } -} -div { - db.see.role.attribute = attribute role { text } - db.see.attlist = - db.see.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.see = - - ## Part of an index term directing the reader instead to another entry in the index - element see { db.see.attlist, db.all.inlines* } -} -div { - db.seealso.role.attribute = attribute role { text } - db.seealso.attlist = - db.seealso.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.seealso = - - ## Part of an index term directing the reader also to another entry in the index - element seealso { db.seealso.attlist, db.all.inlines* } -} -div { - db.index.status.attribute = db.status.attribute - db.index.role.attribute = attribute role { text } - db.index.attlist = - db.index.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.index.status.attribute? - & db.index.type.attribute? - db.index.info = db._info - # - # Yes, db.indexdiv* and db.indexentry*; that way an is valid. - # Authors can use an empty index to indicate where a generated index should - # appear. - db.index = - - ## An index to a book or part of a book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:index" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element index { - db.index.attlist, - db.index.info, - db.all.blocks*, - (db.indexdiv* | db.indexentry* | db.segmentedlist) - } -} -div { - db.setindex.status.attribute = db.status.attribute - db.setindex.role.attribute = attribute role { text } - db.setindex.attlist = - db.setindex.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.setindex.status.attribute? - & db.index.type.attribute? - db.setindex.info = db._info - db.setindex = - - ## An index to a set of books - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:setindex" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element setindex { - db.setindex.attlist, - db.setindex.info, - db.all.blocks*, - (db.indexdiv* | db.indexentry*) - } -} -div { - db.indexdiv.status.attribute = db.status.attribute - db.indexdiv.role.attribute = attribute role { text } - db.indexdiv.attlist = - db.indexdiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.indexdiv.status.attribute? - db.indexdiv.info = db._info.title.req - db.indexdiv = - - ## A division in an index - element indexdiv { - db.indexdiv.attlist, - db.indexdiv.info, - db.all.blocks*, - (db.indexentry+ | db.segmentedlist) - } -} -div { - db.indexentry.role.attribute = attribute role { text } - db.indexentry.attlist = - db.indexentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.indexentry = - - ## An entry in an index - element indexentry { - db.indexentry.attlist, - db.primaryie, - (db.seeie | db.seealsoie)*, - (db.secondaryie, (db.seeie | db.seealsoie | db.tertiaryie)*)* - } -} -div { - db.primaryie.role.attribute = attribute role { text } - db.primaryie.attlist = - db.primaryie.role.attribute? - & db.common.attributes - & db.linkends.attribute? - db.primaryie = - - ## A primary term in an index entry, not in the text - element primaryie { db.primaryie.attlist, db.all.inlines* } -} -div { - db.secondaryie.role.attribute = attribute role { text } - db.secondaryie.attlist = - db.secondaryie.role.attribute? - & db.common.attributes - & db.linkends.attribute? - db.secondaryie = - - ## A secondary term in an index entry, rather than in the text - element secondaryie { db.secondaryie.attlist, db.all.inlines* } -} -div { - db.tertiaryie.role.attribute = attribute role { text } - db.tertiaryie.attlist = - db.tertiaryie.role.attribute? - & db.common.attributes - & db.linkends.attribute? - db.tertiaryie = - - ## A tertiary term in an index entry, rather than in the text - element tertiaryie { db.tertiaryie.attlist, db.all.inlines* } -} -div { - db.seeie.role.attribute = attribute role { text } - db.seeie.attlist = - db.seeie.role.attribute? - & db.common.attributes - & db.linkend.attribute? - db.seeie = - - ## A See - ## entry in an index, rather than in the text - element seeie { db.seeie.attlist, db.all.inlines* } -} -div { - db.seealsoie.role.attribute = attribute role { text } - db.seealsoie.attlist = - db.seealsoie.role.attribute? - & db.common.attributes - & db.linkends.attribute? - db.seealsoie = - - ## A See also - ## entry in an index, rather than in the text - element seealsoie { db.seealsoie.attlist, db.all.inlines* } -} -db.toc.pagenum.attribute = - - ## Indicates the page on which this element occurs in some version of the printed document - attribute pagenum { text } -div { - db.toc.role.attribute = attribute role { text } - db.toc.attlist = - db.toc.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.toc.info = db._info.title.only - db.toc = - - ## A table of contents - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:toc" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element toc { - db.toc.attlist, - db.toc.info, - db.all.blocks*, - (db.tocdiv | db.tocentry)* - } -} -div { - db.tocdiv.role.attribute = attribute role { text } - db.tocdiv.pagenum.attribute = db.toc.pagenum.attribute - db.tocdiv.attlist = - db.tocdiv.role.attribute? - & db.common.attributes - & db.tocdiv.pagenum.attribute? - & db.linkend.attribute? - db.tocdiv.info = db._info - db.tocdiv = - - ## A division in a table of contents - element tocdiv { - db.tocdiv.attlist, - db.tocdiv.info, - db.all.blocks*, - (db.tocdiv | db.tocentry)+ - } -} -div { - db.tocentry.role.attribute = attribute role { text } - db.tocentry.pagenum.attribute = db.toc.pagenum.attribute - db.tocentry.attlist = - db.tocentry.role.attribute? - & db.common.attributes - & db.tocentry.pagenum.attribute? - & db.linkend.attribute? - db.tocentry = - - ## A component title in a table of contents - element tocentry { db.tocentry.attlist, db.all.inlines* } -} -db.task.info = db._info.title.req -div { - db.task.role.attribute = attribute role { text } - db.task.attlist = - db.task.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.task = - - ## A task to be completed - element task { - db.task.attlist, - db.task.info, - db.tasksummary?, - db.taskprerequisites?, - db.procedure, - db.example*, - db.taskrelated? - } -} -div { - db.tasksummary.role.attribute = attribute role { text } - db.tasksummary.attlist = - db.tasksummary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.tasksummary.info = db._info.title.only - db.tasksummary = - - ## A summary of a task - element tasksummary { - db.tasksummary.attlist, db.tasksummary.info, db.all.blocks+ - } -} -div { - db.taskprerequisites.role.attribute = attribute role { text } - db.taskprerequisites.attlist = - db.taskprerequisites.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.taskprerequisites.info = db._info.title.only - db.taskprerequisites = - - ## The prerequisites for a task - element taskprerequisites { - db.taskprerequisites.attlist, - db.taskprerequisites.info, - db.all.blocks+ - } -} -div { - db.taskrelated.role.attribute = attribute role { text } - db.taskrelated.attlist = - db.taskrelated.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.taskrelated.info = db._info.title.only - db.taskrelated = - - ## Information related to a task - element taskrelated { - db.taskrelated.attlist, db.taskrelated.info, db.all.blocks+ - } -} -db.area.units.enumeration = - - ## Coordinates expressed as a pair of CALS graphic coordinates. - "calspair" - | - ## Coordinates expressed as a line and column. - "linecolumn" - | - ## Coordinates expressed as a pair of lines and columns. - "linecolumnpair" - | - ## Coordinates expressed as a line range. - "linerange" -db.area.units-enum.attribute = - - ## Identifies the units used in the coords attribute The default units vary according to the type of callout specified: calspair - ## for graphics and linecolumn - ## for line-oriented elements. - attribute units { db.area.units.enumeration }? -db.area.units-other.attributes = - - ## Indicates that non-standard units are used for this area - ## . In this case otherunits - ## must be specified. - attribute units { - - ## Coordinates expressed in some non-standard units. - "other" - }?, - - ## Identifies the units used in the coords - ## attribute when the units - ## attribute is other - ## . This attribute is forbidden otherwise. - attribute otherunits { xsd:NMTOKEN } -db.area.units.attribute = - db.area.units-enum.attribute | db.area.units-other.attributes -div { - db.calloutlist.role.attribute = attribute role { text } - db.calloutlist.attlist = - db.calloutlist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.calloutlist.info = db._info.title.only - db.calloutlist = - - ## A list of callout - ## s - element calloutlist { - db.calloutlist.attlist, - db.calloutlist.info, - db.all.blocks*, - db.callout+ - } -} -div { - db.callout.role.attribute = attribute role { text } - db.callout.arearefs.attribute = - - ## Identifies the areas described by this callout. - attribute arearefs { xsd:IDREFS } - db.callout.attlist = - db.callout.role.attribute? - & db.common.attributes - & db.callout.arearefs.attribute - db.callout = - - ## A called out - ## description of a marked Area - element callout { db.callout.attlist, db.all.blocks+ } -} -div { - db.programlistingco.role.attribute = attribute role { text } - db.programlistingco.attlist = - db.programlistingco.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.programlistingco.info = db._info.title.forbidden - db.programlistingco = - - ## A program listing with associated areas used in callouts - element programlistingco { - db.programlistingco.attlist, - db.programlistingco.info, - db.areaspec, - db.programlisting, - db.calloutlist* - } -} -div { - db.areaspec.role.attribute = attribute role { text } - db.areaspec.attlist = - db.areaspec.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.area.units.attribute - db.areaspec = - - ## A collection of regions in a graphic or code example - element areaspec { db.areaspec.attlist, (db.area | db.areaset)+ } -} -div { - db.area.role.attribute = attribute role { text } - db.area.linkends.attribute = - - ## Point to the callout - ## s which refer to this area. (This provides bidirectional linking which may be useful in online presentation.) - attribute linkends { xsd:IDREFS } - db.area.label.attribute = - - ## Specifies an identifying number or string that may be used in presentation. The area label might be drawn on top of the figure, for example, at the position indicated by the coords attribute. - attribute label { text } - db.area.coords.attribute = - - ## Provides the coordinates of the area. The coordinates must be interpreted using the units - ## specified. - attribute coords { text } - db.area.attlist = - db.area.role.attribute? - & db.common.idreq.attributes - & db.area.units.attribute - & (db.area.linkends.attribute | db.href.attributes)? - & db.area.label.attribute? - & db.area.coords.attribute - db.area = - - ## A region defined for a Callout in a graphic or code example - element area { db.area.attlist, db.alt? } -} -div { - # The only difference is that xml:id is optional - db.area.inareaset.attlist = - db.area.role.attribute? - & db.common.attributes - & db.area.units.attribute - & (db.area.linkends.attribute | db.href.attributes)? - & db.area.label.attribute? - & db.area.coords.attribute - db.area.inareaset = - - ## A region defined for a Callout in a graphic or code example - element area { db.area.inareaset.attlist, db.alt? } -} -div { - db.areaset.role.attribute = attribute role { text } - db.areaset.linkends.attribute = db.linkends.attribute - db.areaset.label.attribute = db.label.attribute - db.areaset.attlist = - db.areaset.role.attribute? - & db.common.idreq.attributes - & db.area.units.attribute - & (db.areaset.linkends.attribute | db.href.attributes)? - & db.areaset.label.attribute? - db.areaset = - - ## A set of related areas in a graphic or code example - element areaset { db.areaset.attlist, db.area.inareaset+ } -} -div { - db.screenco.role.attribute = attribute role { text } - db.screenco.attlist = - db.screenco.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.screenco.info = db._info.title.forbidden - db.screenco = - - ## A screen with associated areas used in callouts - element screenco { - db.screenco.attlist, - db.screenco.info, - db.areaspec, - db.screen, - db.calloutlist* - } -} -div { - db.imageobjectco.role.attribute = attribute role { text } - db.imageobjectco.attlist = - db.imageobjectco.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.imageobjectco.info = db._info.title.forbidden - db.imageobjectco = - - ## A wrapper for an image object with callouts - element imageobjectco { - db.imageobjectco.attlist, - db.imageobjectco.info, - db.areaspec, - db.imageobject+, - db.calloutlist* - } -} -div { - db.co.role.attribute = attribute role { text } - db.co.linkends.attribute = db.linkends.attribute - db.co.label.attribute = db.label.attribute - db.co.attlist = - db.co.role.attribute? - & db.common.idreq.attributes - & db.co.linkends.attribute? - & db.co.label.attribute? - db.co = - - ## The location of a callout embedded in text - element co { db.co.attlist, empty } -} -div { - db.coref.role.attribute = attribute role { text } - db.coref.label.attribute = db.label.attribute - db.coref.attlist = - db.coref.role.attribute? - & db.common.attributes - & db.linkend.attribute - & db.coref.label.attribute? - db.coref = - - ## A cross reference to a co - element coref { db.coref.attlist, empty } -} -div { - db.productionset.role.attribute = attribute role { text } - db.productionset.attlist = - db.productionset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.productionset.info = db._info.title.only - db.productionset = - - ## A set of EBNF productions - element productionset { - db.productionset.attlist, - db.productionset.info, - (db.production | db.productionrecap)+ - } -} -div { - db.production.role.attribute = attribute role { text } - db.production.attlist = - db.production.role.attribute? - & db.common.idreq.attributes - & db.common.linking.attributes - db.production = - - ## A production in a set of EBNF productions - element production { - db.production.attlist, db.lhs, db.rhs, db.constraint* - } -} -div { - db.lhs.role.attribute = attribute role { text } - db.lhs.attlist = - db.lhs.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.lhs = - - ## The left-hand side of an EBNF production - element lhs { db.lhs.attlist, text } -} -div { - db.rhs.role.attribute = attribute role { text } - db.rhs.attlist = - db.rhs.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.rhs = - - ## The right-hand side of an EBNF production - element rhs { - db.rhs.attlist, - (text | db.nonterminal | db.lineannotation | db.sbr)* - } -} -div { - db.nonterminal.role.attribute = attribute role { text } - db.nonterminal.def.attribute = - - ## Specifies a URI that points to a production - ## where the nonterminal - ## is defined - attribute def { xsd:anyURI } - db.nonterminal.attlist = - db.nonterminal.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.nonterminal.def.attribute - db.nonterminal = - - ## A non-terminal in an EBNF production - element nonterminal { db.nonterminal.attlist, text } -} -div { - db.constraint.role.attribute = attribute role { text } - db.constraint.attlist = - db.constraint.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - db.constraint = - - ## A constraint in an EBNF production - element constraint { db.constraint.attlist, empty } -} -div { - db.productionrecap.role.attribute = attribute role { text } - db.productionrecap.attlist = - db.productionrecap.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - db.productionrecap = - - ## A cross-reference to an EBNF production - element productionrecap { db.productionrecap.attlist, empty } -} -div { - db.constraintdef.role.attribute = attribute role { text } - db.constraintdef.attlist = - db.constraintdef.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.constraintdef.info = db._info.title.only - db.constraintdef = - - ## The definition of a constraint in an EBNF production - element constraintdef { - db.constraintdef.attlist, db.constraintdef.info, db.all.blocks+ - } -} -db.char.attribute = - - ## Specifies the alignment character when align - ## is set to char - ## . - attribute char { text } -db.charoff.attribute = - - ## Specifies the percentage of the column's total width that should appear to the left of the first occurance of the character identified in char - ## when align - ## is set to char - ## . - attribute charoff { - xsd:decimal { minExclusive = "0" maxExclusive = "100" } - } -db.frame.attribute = - - ## Specifies how the table is to be framed. Note that there is no way to obtain a border on only the starting edge (left, in left-to-right writing systems) of the table. - attribute frame { - - ## Frame all four sides of the table. In some environments with limited control over table border formatting, such as HTML, this may imply additional borders. - "all" - | - ## Frame only the bottom of the table. - "bottom" - | - ## Place no border on the table. In some environments with limited control over table border formatting, such as HTML, this may disable other borders as well. - "none" - | - ## Frame the left and right sides of the table. - "sides" - | - ## Frame the top of the table. - "top" - | - ## Frame the top and bottom of the table. - "topbot" - } -db.colsep.attribute = - - ## Specifies the presence or absence of the column separator - attribute colsep { - - ## No column separator rule. - "0" - | - ## Provide a column separator rule on the right - "1" - } -db.rowsep.attribute = - - ## Specifies the presence or absence of the row separator - attribute rowsep { - - ## No row separator rule. - "0" - | - ## Provide a row separator rule below - "1" - } -db.orient.attribute = - - ## Specifies the orientation of the table - attribute orient { - - ## 90 degrees counter-clockwise from the rest of the text flow. - "land" - | - ## The same orientation as the rest of the text flow. - "port" - } -db.tabstyle.attribute = - - ## Specifies the table style - attribute tabstyle { text } -db.rowheader.attribute = - - ## Indicates whether or not the entries in the first column should be considered row headers - attribute rowheader { - - ## Indicates that entries in the first column of the table are functionally row headers (analogous to the way that a thead provides column headers). - "firstcol" - | - ## Indicates that entries in the first column have no special significance with respect to column headers. - "norowheader" - } -db.align.attribute = - - ## Specifies the horizontal alignment of text in an entry. - attribute align { - - ## Centered. - "center" - | - ## Aligned on a particular character. - "char" - | - ## Left and right justified. - "justify" - | - ## Left justified. - "left" - | - ## Right justified. - "right" - } -db.valign.attribute = - - ## Specifies the vertical alignment of text in an entry. - attribute valign { - - ## Aligned on the bottom of the entry. - "bottom" - | - ## Aligned in the middle. - "middle" - | - ## Aligned at the top of the entry. - "top" - } -db.specify-col-by-colname.attributes = - - ## Specifies a column specification by name. - attribute colname { text } -db.specify-col-by-namest.attributes = - - ## Specifies a starting column by name. - attribute namest { text } -db.specify-span-by-spanspec.attributes = - - ## Specifies a span by name. - attribute spanname { text } -db.specify-span-directly.attributes = - - ## Specifies a starting column by name. - attribute namest { text } - & - ## Specifies an ending column by name. - attribute nameend { text } -db.column-spec.attributes = - db.specify-col-by-colname.attributes - | db.specify-col-by-namest.attributes - | db.specify-span-by-spanspec.attributes - | db.specify-span-directly.attributes -db.colname.attribute = - - ## Provides a name for a column specification. - attribute colname { text } -db.spanname.attribute = - - ## Provides a name for a span specification. - attribute spanname { text } -div { - db.tgroup.role.attribute = attribute role { text } - db.tgroup.tgroupstyle.attribute = - - ## Additional style information for downstream processing; typically the name of a style. - attribute tgroupstyle { text } - db.tgroup.cols.attribute = - - ## The number of columns in the table. Must be an integer greater than zero. - attribute cols { xsd:positiveInteger } - db.tgroup.attlist = - db.tgroup.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.char.attribute? - & db.charoff.attribute? - & db.tgroup.tgroupstyle.attribute? - & db.tgroup.cols.attribute - & db.colsep.attribute? - & db.rowsep.attribute? - & db.align.attribute? - db.tgroup = - - ## A wrapper for the main content of a table, or part of a table - element tgroup { - db.tgroup.attlist, - db.colspec*, - db.spanspec*, - db.cals.thead?, - db.cals.tfoot?, - db.cals.tbody - } -} -div { - db.colspec.role.attribute = attribute role { text } - db.colspec.colnum.attribute = - - ## The number of the column to which this specification applies. Must be greater than any preceding column number. Defaults to one more than the number of the preceding column, if there is one, or one. - attribute colnum { xsd:positiveInteger } - db.colspec.colwidth.attribute = - - ## Specifies the width of the column. - attribute colwidth { text } - db.colspec.attlist = - db.colspec.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.colspec.colnum.attribute? - & db.char.attribute? - & db.colsep.attribute? - & db.colspec.colwidth.attribute? - & db.charoff.attribute? - & db.colname.attribute? - & db.rowsep.attribute? - & db.align.attribute? - db.colspec = - - ## Specifications for a column in a table - element colspec { db.colspec.attlist, empty } -} -div { - db.spanspec.role.attribute = attribute role { text } - db.spanspec.namest.attribute = - - ## Specifies a starting column by name. - attribute namest { text } - db.spanspec.nameend.attribute = - - ## Specifies an ending column by name. - attribute nameend { text } - db.spanspec.attlist = - db.spanspec.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.spanname.attribute - & db.spanspec.namest.attribute - & db.spanspec.nameend.attribute - & db.char.attribute? - & db.colsep.attribute? - & db.charoff.attribute? - & db.rowsep.attribute? - & db.align.attribute? - db.spanspec = - - ## Formatting information for a spanned column in a table - element spanspec { db.spanspec.attlist, empty } -} -div { - db.cals.thead.role.attribute = attribute role { text } - db.cals.thead.attlist = - db.cals.thead.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.thead = - - ## A table header consisting of one or more rows - element thead { db.cals.thead.attlist, db.colspec*, db.row+ } -} -div { - db.cals.tfoot.role.attribute = attribute role { text } - db.cals.tfoot.attlist = - db.cals.tfoot.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.tfoot = - - ## A table footer consisting of one or more rows - element tfoot { db.cals.tfoot.attlist, db.colspec*, db.row+ } -} -div { - db.cals.tbody.role.attribute = attribute role { text } - db.cals.tbody.attlist = - db.cals.tbody.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.tbody = - - ## A wrapper for the rows of a table or informal table - element tbody { db.cals.tbody.attlist, db.row+ } -} -div { - db.row.role.attribute = attribute role { text } - db.row.attlist = - db.row.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.rowsep.attribute? - & db.valign.attribute? - db.row = - - ## A row in a table - element row { db.row.attlist, (db.entry | db.entrytbl)+ } -} -div { - db.entry.role.attribute = attribute role { text } - db.entry.morerows.attribute = - - ## Specifies the number of additional rows which this entry occupies. Defaults to zero. - attribute morerows { xsd:integer } - db.entry.rotate.attribute = - - ## Specifies the rotation of this entry. A value of 1 (true) rotates the cell 90 degrees counter-clockwise. A value of 0 (false) leaves the cell unrotated. - attribute rotate { - - ## Do not rotate the cell. - "0" - | - ## Rotate the cell 90 degrees counter-clockwise. - "1" - } - db.entry.attlist = - db.entry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - & db.char.attribute? - & db.colsep.attribute? - & db.charoff.attribute? - & db.entry.morerows.attribute? - & db.column-spec.attributes? - & db.rowsep.attribute? - & db.entry.rotate.attribute? - & db.align.attribute? - db.entry = - - ## A cell in a table - element entry { - db.entry.attlist, (db.all.inlines* | db.all.blocks*) - } -} -div { - db.entrytbl.role.attribute = attribute role { text } - db.entrytbl.tgroupstyle.attribute = - - ## Additional style information for downstream processing; typically the name of a style. - attribute tgroupstyle { text } - db.entrytbl.cols.attribute = - - ## The number of columns in the entry table. Must be an integer greater than zero. - attribute cols { xsd:positiveInteger } - db.entrytbl.attlist = - db.entrytbl.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.char.attribute? - & db.charoff.attribute? - & db.column-spec.attributes? - & db.entrytbl.tgroupstyle.attribute? - & db.entrytbl.cols.attribute? - & db.colsep.attribute? - & db.rowsep.attribute? - & db.align.attribute? - db.entrytbl = - - ## A subtable appearing in place of an Entry in a table - element entrytbl { - db.entrytbl.attlist, - db.colspec*, - db.spanspec*, - db.cals.entrytbl.thead?, - db.cals.entrytbl.tbody - } -} -div { - db.cals.entrytbl.thead.role.attribute = attribute role { text } - db.cals.entrytbl.thead.attlist = - db.cals.entrytbl.thead.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.entrytbl.thead = - - ## A table header consisting of one or more rows - element thead { - db.cals.entrytbl.thead.attlist, db.colspec*, db.entrytbl.row+ - } -} -div { - db.cals.entrytbl.tbody.role.attribute = attribute role { text } - db.cals.entrytbl.tbody.attlist = - db.cals.entrytbl.tbody.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.entrytbl.tbody = - - ## A wrapper for the rows of a table or informal table - element tbody { db.cals.entrytbl.tbody.attlist, db.entrytbl.row+ } -} -div { - db.entrytbl.row.role.attribute = attribute role { text } - db.entrytbl.row.attlist = - db.entrytbl.row.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.rowsep.attribute? - & db.valign.attribute? - db.entrytbl.row = - - ## A row in a table - element row { db.entrytbl.row.attlist, db.entry+ } -} -div { - db.cals.table.role.attribute = attribute role { text } - db.cals.table.label.attribute = db.label.attribute - db.cals.table.attlist = - db.cals.table.role.attribute? - & db.cals.table.label.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.tabstyle.attribute? - & db.floatstyle.attribute? - & db.orient.attribute? - & db.colsep.attribute? - & db.rowsep.attribute? - & db.frame.attribute? - & db.pgwide.attribute? - & - ## Indicates if the short or long title should be used in a List of Tables - attribute shortentry { - - ## Indicates that the full title should be used. - "0" - | - ## Indicates that the short short title (titleabbrev) should be used. - "1" - }? - & - ## Indicates if the table should appear in a List of Tables - attribute tocentry { - - ## Indicates that the table should not occur in the List of Tables. - "0" - | - ## Indicates that the table should appear in the List of Tables. - "1" - }? - & db.rowheader.attribute? - db.cals.table.info = db._info.title.onlyreq - db.cals.table = - - ## A formal table in a document - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:informaltable)" - "informaltable must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element table { - db.cals.table.attlist, - db.cals.table.info, - (db.alt? & db.indexing.inlines* & db.textobject*), - (db.mediaobject+ | db.tgroup+), - db.caption? - } -} -div { - db.cals.informaltable.role.attribute = attribute role { text } - db.cals.informaltable.attlist = - db.cals.informaltable.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.tabstyle.attribute? - & db.floatstyle.attribute? - & db.orient.attribute? - & db.colsep.attribute? - & db.rowsep.attribute? - & db.frame.attribute? - & db.pgwide.attribute? - & db.rowheader.attribute? - db.cals.informaltable.info = db._info.title.forbidden - db.cals.informaltable = - - ## A table without a title - element informaltable { - db.cals.informaltable.attlist, - db.cals.informaltable.info, - (db.alt? & db.indexing.inlines* & db.textobject*), - (db.mediaobject+ | db.tgroup+), - db.caption? - } -} -db.html.coreattrs = - - ## This attribute assigns a class name or set of class names to an element. Any number of elements may be assigned the same class name or names. Multiple class names must be separated by white space characters. - attribute class { text }? - & - ## This attribute specifies style information for the current element. - attribute style { text }? - & - ## This attribute offers advisory information about the element for which it is set. - attribute title { text }? -db.html.i18n = - - ## This attribute specifies the base language of an element's attribute values and text content. The default value of this attribute is unknown. - attribute lang { text }? -db.html.events = - - ## Occurs when the pointing device button is clicked over an element. - attribute onclick { text }? - & - ## Occurs when the pointing device button is double clicked over an element. - attribute ondblclick { text }? - & - ## Occurs when the pointing device button is pressed over an element. - attribute onmousedown { text }? - & - ## Occurs when the pointing device button is released over an element. - attribute onmouseup { text }? - & - ## Occurs when the pointing device is moved onto an element. - attribute onmouseover { text }? - & - ## Occurs when the pointing device is moved while it is over an element. - attribute onmousemove { text }? - & - ## Occurs when the pointing device is moved away from an element. - attribute onmouseout { text }? - & - ## Occurs when a key is pressed and released over an element. - attribute onkeypress { text }? - & - ## Occurs when a key is pressed down over an element. - attribute onkeydown { text }? - & - ## Occurs when a key is released over an element. - attribute onkeyup { text }? -db.html.attrs = - db.common.attributes - & db.html.coreattrs - & db.html.i18n - & db.html.events -db.html.cellhalign = - - ## Specifies the alignment of data and the justification of text in a cell. - attribute align { - - ## Left-flush data/Left-justify text. This is the default value for table data. - "left" - | - ## Center data/Center-justify text. This is the default value for table headers. - "center" - | - ## Right-flush data/Right-justify text. - "right" - | - ## Double-justify text. - "justify" - | - ## Align text around a specific character. If a user agent doesn't support character alignment, behavior in the presence of this value is unspecified. - "char" - }? - & - ## This attribute specifies a single character within a text fragment to act as an axis for alignment. The default value for this attribute is the decimal point character for the current language as set by the lang attribute (e.g., the period in English and the comma in French). User agents are not required to support this attribute. - attribute char { text }? - & - ## When present, this attribute specifies the offset to the first occurrence of the alignment character on each line. If a line doesn't include the alignment character, it should be horizontally shifted to end at the alignment position. When charoff is used to set the offset of an alignment character, the direction of offset is determined by the current text direction (set by the dir attribute). In left-to-right texts (the default), offset is from the left margin. In right-to-left texts, offset is from the right margin. User agents are not required to support this attribute. - attribute charoff { - xsd:integer - | xsd:string { pattern = "[0-9]+%" } - }? -db.html.cellvalign = - - ## Specifies the vertical position of data within a cell. - attribute valign { - - ## Cell data is flush with the top of the cell. - "top" - | - ## Cell data is centered vertically within the cell. This is the default value. - "middle" - | - ## Cell data is flush with the bottom of the cell. - "bottom" - | - ## All cells in the same row as a cell whose valign attribute has this value should have their textual data positioned so that the first text line occurs on a baseline common to all cells in the row. This constraint does not apply to subsequent text lines in these cells. - "baseline" - }? -db.html.table.attributes = - - ## Provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille. - attribute summary { text }? - & - ## Specifies the desired width of the entire table and is intended for visual user agents. When the value is a percentage value, the value is relative to the user agent's available horizontal space. In the absence of any width specification, table width is determined by the user agent. - attribute width { - xsd:integer - | xsd:string { pattern = "[0-9]+%" } - }? - & - ## Specifies the width (in pixels only) of the frame around a table. - attribute border { xsd:nonNegativeInteger }? - & - ## Specifies which sides of the frame surrounding a table will be visible. - attribute frame { - - ## No sides. This is the default value. - "void" - | - ## The top side only. - "above" - | - ## The bottom side only. - "below" - | - ## The top and bottom sides only. - "hsides" - | - ## The left-hand side only. - "lhs" - | - ## The right-hand side only. - "rhs" - | - ## The right and left sides only. - "vsides" - | - ## All four sides. - "box" - | - ## All four sides. - "border" - }? - & - ## Specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. - attribute rules { - - ## No rules. This is the default value. - "none" - | - ## Rules will appear between row groups (see thead, tfoot, and tbody) and column groups (see colgroup and col) only. - "groups" - | - ## Rules will appear between rows only. - "rows" - | - ## Rules will appear between columns only. - "cols" - | - ## Rules will appear between all rows and columns. - "all" - }? - & - ## Specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells. - attribute cellspacing { - xsd:integer - | xsd:string { pattern = "[0-9]+%" } - }? - & - ## Specifies the amount of space between the border of the cell and its contents. If the value of this attribute is a pixel length, all four margins should be this distance from the contents. If the value of the attribute is a percentage length, the top and bottom margins should be equally separated from the content based on a percentage of the available vertical space, and the left and right margins should be equally separated from the content based on a percentage of the available horizontal space. - attribute cellpadding { - xsd:integer - | xsd:string { pattern = "[0-9]+%" } - }? -db.html.tablecell.attributes = - - ## Provides an abbreviated form of the cell's content and may be rendered by user agents when appropriate in place of the cell's content. Abbreviated names should be short since user agents may render them repeatedly. For instance, speech synthesizers may render the abbreviated headers relating to a particular cell before rendering that cell's content. - attribute abbr { text }? - & - ## This attribute may be used to place a cell into conceptual categories that can be considered to form axes in an n-dimensional space. User agents may give users access to these categories (e.g., the user may query the user agent for all cells that belong to certain categories, the user agent may present a table in the form of a table of contents, etc.). Please consult an HTML reference for more details. - attribute axis { text }? - & - ## Specifies the list of header cells that provide header information for the current data cell. The value of this attribute is a space-separated list of cell names; those cells must be named by setting their id attribute. Authors generally use the headers attribute to help non-visual user agents render header information about data cells (e.g., header information is spoken prior to the cell data), but the attribute may also be used in conjunction with style sheets. - attribute headers { text }? - & - ## Specifies the set of data cells for which the current header cell provides header information. This attribute may be used in place of the headers attribute, particularly for simple tables. - attribute scope { - - ## The current cell provides header information for the rest of the row that contains it - "row" - | - ## The current cell provides header information for the rest of the column that contains it. - "col" - | - ## The header cell provides header information for the rest of the row group that contains it. - "rowgroup" - | - ## The header cell provides header information for the rest of the column group that contains it. - "colgroup" - }? - & - ## Specifies the number of rows spanned by the current cell. The default value of this attribute is one (1 - ## ). The value zero (0 - ## ) means that the cell spans all rows from the current row to the last row of the table section (thead - ## , tbody - ## , or tfoot - ## ) in which the cell is defined. - attribute rowspan { xsd:nonNegativeInteger }? - & - ## Specifies the number of columns spanned by the current cell. The default value of this attribute is one (1 - ## ). The value zero (0 - ## ) means that the cell spans all columns from the current column to the last column of the column group (colgroup - ## ) in which the cell is defined. - attribute colspan { xsd:nonNegativeInteger }? -db.html.table.info = db._info.title.forbidden -db.html.table.model = - db.html.table.info?, - db.html.caption, - (db.html.col* | db.html.colgroup*), - db.html.thead?, - db.html.tfoot?, - (db.html.tbody+ | db.html.tr+) -db.html.informaltable.info = db._info.title.forbidden -db.html.informaltable.model = - db.html.informaltable.info?, - (db.html.col* | db.html.colgroup*), - db.html.thead?, - db.html.tfoot?, - (db.html.tbody+ | db.html.tr+) -div { - db.html.table.role.attribute = attribute role { text } - db.html.table.label.attribute = db.label.attribute - db.html.table.attlist = - db.html.attrs - & db.html.table.attributes - & db.html.table.role.attribute? - & db.html.table.label.attribute? - & db.orient.attribute? - & db.pgwide.attribute? - & db.tabstyle.attribute? - & db.floatstyle.attribute? - db.html.table = - - ## A formal (captioned) HTML table in a document - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:informaltable)" - "informaltable must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element table { db.html.table.attlist, db.html.table.model } -} -div { - db.html.informaltable.attlist = - db.html.attrs & db.html.table.attributes - db.html.informaltable = - - ## An HTML table without a title - element informaltable { - db.html.informaltable.attlist, db.html.informaltable.model - } -} -div { - db.html.caption.attlist = db.html.attrs - db.html.caption = - - ## An HTML table caption - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:sidebar)" - "sidebar must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:task)" - "task must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element caption { db.html.caption.attlist, db.all.inlines* } -} -div { - db.html.col.attlist = - db.html.attrs - & - ## This attribute, whose value must be an integer > 0, specifies the number of columns spanned - ## by the col - ## element; the col - ## element shares its attributes with all the columns it spans. The default value for this attribute is 1 (i.e., a single column). If the span attribute is set to N > 1, the current col - ## element shares its attributes with the next N-1 columns. - attribute span { xsd:nonNegativeInteger }? - & - ## Specifies a default width for each column spanned by the current col - ## element. It has the same meaning as the width - ## attribute for the colgroup - ## element and overrides it. - attribute width { text }? - & db.html.cellhalign - & db.html.cellvalign - db.html.col = - - ## Specifications for a column in an HTML table - element col { db.html.col.attlist, empty } -} -div { - db.html.colgroup.attlist = - db.html.attrs - & - ## This attribute, which must be an integer > 0, specifies the number of columns in a column group. In the absence of a span attribute, each colgroup - ## defines a column group containing one column. If the span attribute is set to N > 0, the current colgroup - ## element defines a column group containing N columns. User agents must ignore this attribute if the colgroup - ## element contains one or more col - ## elements. - attribute span { xsd:nonNegativeInteger }? - & - ## This attribute specifies a default width for each column in the current column group. In addition to the standard pixel, percentage, and relative values, this attribute allows the special form 0* - ## (zero asterisk) which means that the width of the each column in the group should be the minimum width necessary to hold the column's contents. This implies that a column's entire contents must be known before its width may be correctly computed. Authors should be aware that specifying 0* - ## will prevent visual user agents from rendering a table incrementally. This attribute is overridden for any column in the column group whose width is specified via a col - ## element. - attribute width { text }? - & db.html.cellhalign - & db.html.cellvalign - db.html.colgroup = - - ## A group of columns in an HTML table - element colgroup { db.html.colgroup.attlist, db.html.col* } -} -div { - db.html.thead.attlist = - db.html.attrs & db.html.cellhalign & db.html.cellvalign - db.html.thead = - - ## A table header consisting of one or more rows in an HTML table - element thead { db.html.thead.attlist, db.html.tr+ } -} -div { - db.html.tfoot.attlist = - db.html.attrs & db.html.cellhalign & db.html.cellvalign - db.html.tfoot = - - ## A table footer consisting of one or more rows in an HTML table - element tfoot { db.html.tfoot.attlist, db.html.tr+ } -} -div { - db.html.tbody.attlist = - db.html.attrs & db.html.cellhalign & db.html.cellvalign - db.html.tbody = - - ## A wrapper for the rows of an HTML table or informal HTML table - element tbody { db.html.tbody.attlist, db.html.tr+ } -} -div { - db.html.tr.attlist = - db.html.attrs & db.html.cellhalign & db.html.cellvalign - db.html.tr = - - ## A row in an HTML table - element tr { db.html.tr.attlist, (db.html.th | db.html.td)+ } -} -div { - db.html.th.attlist = - db.html.attrs - & db.html.tablecell.attributes - & db.html.cellhalign - & db.html.cellvalign - db.html.th = - - ## A table header entry in an HTML table - element th { - db.html.th.attlist, (db.all.inlines* | db.all.blocks*) - } -} -div { - db.html.td.attlist = - db.html.attrs - & db.html.tablecell.attributes - & db.html.cellhalign - & db.html.cellvalign - db.html.td = - - ## A table entry in an HTML table - element td { - db.html.td.attlist, (db.all.inlines* | db.all.blocks*) - } -} -div { - db.msgset.role.attribute = attribute role { text } - db.msgset.attlist = - db.msgset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgset.info = db._info.title.only - db.msgset = - - ## A detailed set of messages, usually error messages - element msgset { - db.msgset.attlist, - db.msgset.info, - (db.msgentry+ | db.simplemsgentry+) - } -} -div { - db.msgentry.role.attribute = attribute role { text } - db.msgentry.attlist = - db.msgentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgentry = - - ## A wrapper for an entry in a message set - element msgentry { - db.msgentry.attlist, db.msg+, db.msginfo?, db.msgexplan* - } -} -div { - db.simplemsgentry.role.attribute = attribute role { text } - db.simplemsgentry.msgaud.attribute = - - ## The audience to which the message relevant - attribute msgaud { text } - db.simplemsgentry.msgorig.attribute = - - ## The origin of the message - attribute msgorig { text } - db.simplemsgentry.msglevel.attribute = - - ## The level of importance or severity of a message - attribute msglevel { text } - db.simplemsgentry.attlist = - db.simplemsgentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.simplemsgentry.msgaud.attribute? - & db.simplemsgentry.msgorig.attribute? - & db.simplemsgentry.msglevel.attribute? - db.simplemsgentry = - - ## A wrapper for a simpler entry in a message set - element simplemsgentry { - db.simplemsgentry.attlist, db.msgtext, db.msgexplan+ - } -} -div { - db.msg.role.attribute = attribute role { text } - db.msg.attlist = - db.msg.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msg.info = db._info.title.only - db.msg = - - ## A message in a message set - element msg { - db.msg.attlist, db.msg.info, db.msgmain, (db.msgsub | db.msgrel)* - } -} -div { - db.msgmain.role.attribute = attribute role { text } - db.msgmain.attlist = - db.msgmain.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgmain.info = db._info.title.only - db.msgmain = - - ## The primary component of a message in a message set - element msgmain { db.msgmain.attlist, db.msgmain.info, db.msgtext } -} -div { - db.msgsub.role.attribute = attribute role { text } - db.msgsub.attlist = - db.msgsub.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgsub.info = db._info.title.only - db.msgsub = - - ## A subcomponent of a message in a message set - element msgsub { db.msgsub.attlist, db.msgsub.info, db.msgtext } -} -div { - db.msgrel.role.attribute = attribute role { text } - db.msgrel.attlist = - db.msgrel.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgrel.info = db._info.title.only - db.msgrel = - - ## A related component of a message in a message set - element msgrel { db.msgrel.attlist, db.msgrel.info, db.msgtext } -} -div { - db.msgtext.role.attribute = attribute role { text } - db.msgtext.attlist = - db.msgtext.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgtext = - - ## The actual text of a message component in a message set - element msgtext { db.msgtext.attlist, db.all.blocks+ } -} -div { - db.msginfo.role.attribute = attribute role { text } - db.msginfo.attlist = - db.msginfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msginfo = - - ## Information about a message in a message set - element msginfo { - db.msginfo.attlist, (db.msglevel | db.msgorig | db.msgaud)* - } -} -div { - db.msglevel.role.attribute = attribute role { text } - db.msglevel.attlist = - db.msglevel.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msglevel = - - ## The level of importance or severity of a message in a message set - element msglevel { db.msglevel.attlist, db._text } -} -div { - db.msgorig.role.attribute = attribute role { text } - db.msgorig.attlist = - db.msgorig.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgorig = - - ## The origin of a message in a message set - element msgorig { db.msgorig.attlist, db._text } -} -div { - db.msgaud.role.attribute = attribute role { text } - db.msgaud.attlist = - db.msgaud.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgaud = - - ## The audience to which a message in a message set is relevant - element msgaud { db.msgaud.attlist, db._text } -} -div { - db.msgexplan.role.attribute = attribute role { text } - db.msgexplan.attlist = - db.msgexplan.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgexplan.info = db._info.title.only - db.msgexplan = - - ## Explanatory material relating to a message in a message set - element msgexplan { - db.msgexplan.attlist, db.msgexplan.info, db.all.blocks+ - } -} -div { - db.qandaset.role.attribute = attribute role { text } - db.qandaset.defaultlabel.enumeration = - - ## No labels - "none" - | - ## Numeric labels - "number" - | - ## "Q:" and "A:" labels - "qanda" - db.qandaset.defaultlabel.attribute = - - ## Specifies the default labelling - attribute defaultlabel { db.qandaset.defaultlabel.enumeration } - db.qandaset.attlist = - db.qandaset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.qandaset.defaultlabel.attribute? - db.qandaset.info = db._info.title.only - db.qandaset = - - ## A question-and-answer set - element qandaset { - db.qandaset.attlist, - db.qandaset.info, - db.all.blocks*, - (db.qandadiv+ | db.qandaentry+) - } -} -div { - db.qandadiv.role.attribute = attribute role { text } - db.qandadiv.attlist = - db.qandadiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.qandadiv.info = db._info.title.only - db.qandadiv = - - ## A titled division in a QandASet - element qandadiv { - db.qandadiv.attlist, - db.qandadiv.info, - db.all.blocks*, - (db.qandadiv+ | db.qandaentry+) - } -} -div { - db.qandaentry.role.attribute = attribute role { text } - db.qandaentry.attlist = - db.qandaentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.qandaentry.info = db._info.title.only - db.qandaentry = - - ## A question/answer set within a QandASet - element qandaentry { - db.qandaentry.attlist, db.qandaentry.info, db.question, db.answer* - } -} -div { - db.question.role.attribute = attribute role { text } - db.question.attlist = - db.question.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.question = - - ## A question in a QandASet - element question { db.question.attlist, db.label?, db.all.blocks+ } -} -div { - db.answer.role.attribute = attribute role { text } - db.answer.attlist = - db.answer.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.answer = - - ## An answer to a question posed in a QandASet - element answer { db.answer.attlist, db.label?, db.all.blocks+ } -} -div { - db.label.role.attribute = attribute role { text } - db.label.attlist = - db.label.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.label = - - ## A label on a Question or Answer - element label { db.label.attlist, db._text } -} -db.math.inlines = db.inlineequation -db.equation.content = (db.mediaobject+ | db.mathphrase+) | db._any.mml+ -db.inlineequation.content = - (db.inlinemediaobject+ | db.mathphrase+) | db._any.mml+ -div { - db.equation.role.attribute = attribute role { text } - db.equation.label.attribute = db.label.attribute - db.equation.attlist = - db.equation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.equation.label.attribute? - & db.pgwide.attribute? - & db.floatstyle.attribute? - db.equation.info = db._info.title.only - db.equation = - - ## A displayed mathematical equation - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element equation { - db.equation.attlist, - db.equation.info, - db.alt?, - db.equation.content, - db.caption? - } -} -div { - db.informalequation.role.attribute = attribute role { text } - db.informalequation.attlist = - db.informalequation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.informalequation.info = db._info.title.forbidden - db.informalequation = - - ## A displayed mathematical equation without a title - element informalequation { - db.informalequation.attlist, - db.informalequation.info, - db.alt?, - db.equation.content, - db.caption? - } -} -div { - db.inlineequation.role.attribute = attribute role { text } - db.inlineequation.attlist = - db.inlineequation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.inlineequation = - - ## A mathematical equation or expression occurring inline - element inlineequation { - db.inlineequation.attlist, db.alt?, db.inlineequation.content - } -} -div { - db.mathphrase.role.attribute = attribute role { text } - db.mathphrase.attlist = - db.mathphrase.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.mathphrase = - - ## A mathematical phrase, an expression that can be represented with ordinary text and a small amount of markup - element mathphrase { - db.mathphrase.attlist, - (db._text | db.ubiq.inlines | db._emphasis)* - } -} -div { - db.imagedata.mathml.role.attribute = attribute role { text } - db.imagedata.mathml.attlist = - db.imagedata.mathml.role.attribute? - & db.common.attributes - & - ## Specifies that the format of the data is MathML - attribute format { - - ## Specifies MathML. - "mathml" - }? - & db.imagedata.align.attribute? - & db.imagedata.valign.attribute? - & db.imagedata.width.attribute? - & db.imagedata.contentwidth.attribute? - & db.imagedata.scalefit.attribute? - & db.imagedata.scale.attribute? - & db.imagedata.depth.attribute? - & db.imagedata.contentdepth.attribute? - db.imagedata.mathml.info = db._info.title.forbidden - db.imagedata.mathml = - - ## A MathML expression in a media object - element imagedata { - db.imagedata.mathml.attlist, - db.imagedata.mathml.info, - db._any.mml+ - } -} -div { - db._any.mml = - - ## Any element from the MathML namespace - element mml:* { (db._any.attribute | text | db._any)* } -} -div { - db.imagedata.svg.role.attribute = attribute role { text } - db.imagedata.svg.attlist = - db.imagedata.svg.role.attribute? - & db.common.attributes - & - ## Specifies that the format of the data is SVG - attribute format { - - ## Specifies SVG. - "svg" - }? - & db.imagedata.align.attribute? - & db.imagedata.valign.attribute? - & db.imagedata.width.attribute? - & db.imagedata.contentwidth.attribute? - & db.imagedata.scalefit.attribute? - & db.imagedata.scale.attribute? - & db.imagedata.depth.attribute? - & db.imagedata.contentdepth.attribute? - db.imagedata.svg.info = db._info.title.forbidden - db.imagedata.svg = - - ## An SVG drawing in a media object - element imagedata { - db.imagedata.svg.attlist, db.imagedata.svg.info, db._any.svg+ - } -} -div { - db._any.svg = - - ## Any element from the SVG namespace - element svg:* { (db._any.attribute | text | db._any)* } -} -db.markup.inlines = - db.tag - | db.markup - | db.token - | db.symbol - | db.literal - | db.code - | db.constant - | db.email - | db.uri -div { - db.markup.role.attribute = attribute role { text } - db.markup.attlist = - db.markup.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.markup = - - ## A string of formatting markup in text that is to be represented literally - element markup { db.markup.attlist, db._text } -} -div { - db.tag.role.attribute = attribute role { text } - db.tag.class.enumeration = - - ## An attribute - "attribute" - | - ## An attribute value - "attvalue" - | - ## An element - "element" - | - ## An empty element tag - "emptytag" - | - ## An end tag - "endtag" - | - ## A general entity - "genentity" - | - ## The local name part of a qualified name - "localname" - | - ## A namespace - "namespace" - | - ## A numeric character reference - "numcharref" - | - ## A parameter entity - "paramentity" - | - ## A processing instruction - "pi" - | - ## The prefix part of a qualified name - "prefix" - | - ## An SGML comment - "comment" - | - ## A start tag - "starttag" - | - ## An XML processing instruction - "xmlpi" - db.tag.class.attribute = - - ## Identifies the nature of the tag content - attribute class { db.tag.class.enumeration } - db.tag.namespace.attribute = - - ## Identifies the namespace of the tag content - attribute namespace { xsd:anyURI } - db.tag.attlist = - db.tag.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.tag.class.attribute? - & db.tag.namespace.attribute? - db.tag = - - ## A component of XML (or SGML) markup - element tag { db.tag.attlist, db._text } -} -div { - db.symbol.class.attribute = - - ## Identifies the class of symbol - attribute class { - - ## The value is a limit of some kind - "limit" - } - db.symbol.role.attribute = attribute role { text } - db.symbol.attlist = - db.symbol.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.symbol.class.attribute? - db.symbol = - - ## A name that is replaced by a value before processing - element symbol { db.symbol.attlist, db._text } -} -div { - db.token.role.attribute = attribute role { text } - db.token.attlist = - db.token.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.token = - - ## A unit of information - element token { db.token.attlist, db._text } -} -div { - db.literal.role.attribute = attribute role { text } - db.literal.attlist = - db.literal.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.literal = - - ## Inline text that is some literal value - element literal { db.literal.attlist, db._text } -} -div { - code.language.attribute = - - ## Identifies the (computer) language of the code fragment - attribute language { text } - db.code.role.attribute = attribute role { text } - db.code.attlist = - db.code.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & code.language.attribute? - db.code = - - ## An inline code fragment - element code { - db.code.attlist, (db.programming.inlines | db._text)* - } -} -div { - db.constant.class.attribute = - - ## Identifies the class of constant - attribute class { - - ## The value is a limit of some kind - "limit" - } - db.constant.role.attribute = attribute role { text } - db.constant.attlist = - db.constant.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.constant.class.attribute? - db.constant = - - ## A programming or system constant - element constant { db.constant.attlist, db._text } -} -div { - db.productname.role.attribute = attribute role { text } - db.productname.class.enumeration = - - ## A name with a copyright - "copyright" - | - ## A name with a registered copyright - "registered" - | - ## A name of a service - "service" - | - ## A name which is trademarked - "trade" - db.productname.class.attribute = - - ## Specifies the class of product name - attribute class { db.productname.class.enumeration } - db.productname.attlist = - db.productname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.productname.class.attribute? - db.productname = - - ## The formal name of a product - element productname { db.productname.attlist, db._text } -} -div { - db.productnumber.role.attribute = attribute role { text } - db.productnumber.attlist = - db.productnumber.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.productnumber = - - ## A number assigned to a product - element productnumber { db.productnumber.attlist, db._text } -} -div { - db.database.class.enumeration = - - ## An alternate or secondary key - "altkey" - | - ## A constraint - "constraint" - | - ## A data type - "datatype" - | - ## A field - "field" - | - ## A foreign key - "foreignkey" - | - ## A group - "group" - | - ## An index - "index" - | - ## The first or primary key - "key1" - | - ## An alternate or secondary key - "key2" - | - ## A name - "name" - | - ## The primary key - "primarykey" - | - ## A (stored) procedure - "procedure" - | - ## A record - "record" - | - ## A rule - "rule" - | - ## The secondary key - "secondarykey" - | - ## A table - "table" - | - ## A user - "user" - | - ## A view - "view" - db.database.class.attribute = - - ## Identifies the class of database artifact - attribute class { db.database.class.enumeration } - db.database.role.attribute = attribute role { text } - db.database.attlist = - db.database.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.database.class.attribute? - db.database = - - ## The name of a database, or part of a database - element database { db.database.attlist, db._text } -} -div { - db.application.class.enumeration = - - ## A hardware application - "hardware" - | - ## A software application - "software" - db.application.class.attribute = - - ## Identifies the class of application - attribute class { db.application.class.enumeration } - db.application.role.attribute = attribute role { text } - db.application.attlist = - db.application.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.application.class.attribute? - db.application = - - ## The name of a software program - element application { db.application.attlist, db._text } -} -div { - db.hardware.role.attribute = attribute role { text } - db.hardware.attlist = - db.hardware.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.hardware = - - ## A physical part of a computer system - element hardware { db.hardware.attlist, db._text } -} -db.gui.inlines = - db.guiicon - | db.guibutton - | db.guimenuitem - | db.guimenu - | db.guisubmenu - | db.guilabel - | db.menuchoice - | db.mousebutton -div { - db.guibutton.role.attribute = attribute role { text } - db.guibutton.attlist = - db.guibutton.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guibutton = - - ## The text on a button in a GUI - element guibutton { - db.guibutton.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guiicon.role.attribute = attribute role { text } - db.guiicon.attlist = - db.guiicon.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guiicon = - - ## Graphic and/or text appearing as a icon in a GUI - element guiicon { - db.guiicon.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guilabel.role.attribute = attribute role { text } - db.guilabel.attlist = - db.guilabel.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guilabel = - - ## The text of a label in a GUI - element guilabel { - db.guilabel.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guimenu.role.attribute = attribute role { text } - db.guimenu.attlist = - db.guimenu.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guimenu = - - ## The name of a menu in a GUI - element guimenu { - db.guimenu.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guimenuitem.role.attribute = attribute role { text } - db.guimenuitem.attlist = - db.guimenuitem.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guimenuitem = - - ## The name of a terminal menu item in a GUI - element guimenuitem { - db.guimenuitem.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guisubmenu.role.attribute = attribute role { text } - db.guisubmenu.attlist = - db.guisubmenu.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guisubmenu = - - ## The name of a submenu in a GUI - element guisubmenu { - db.guisubmenu.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.menuchoice.role.attribute = attribute role { text } - db.menuchoice.attlist = - db.menuchoice.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.menuchoice = - - ## A selection or series of selections from a menu - element menuchoice { - db.menuchoice.attlist, - db.shortcut?, - (db.guibutton - | db.guiicon - | db.guilabel - | db.guimenu - | db.guimenuitem - | db.guisubmenu)+ - } -} -div { - db.mousebutton.role.attribute = attribute role { text } - db.mousebutton.attlist = - db.mousebutton.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.mousebutton = - - ## The conventional name of a mouse button - element mousebutton { db.mousebutton.attlist, db._text } -} -db.keyboard.inlines = - db.keycombo - | db.keycap - | db.keycode - | db.keysym - | db.shortcut - | db.accel -div { - db.keycap.function.enumeration = - - ## The "Alt" key - "alt" - | - ## The "Backspace" key - "backspace" - | - ## The "Command" key - "command" - | - ## The "Control" key - "control" - | - ## The "Delete" key - "delete" - | - ## The down arrow - "down" - | - ## The "End" key - "end" - | - ## The "Enter" or "Return" key - "enter" - | - ## The "Escape" key - "escape" - | - ## The "Home" key - "home" - | - ## The "Insert" key - "insert" - | - ## The left arrow - "left" - | - ## The "Meta" key - "meta" - | - ## The "Option" key - "option" - | - ## The page down key - "pagedown" - | - ## The page up key - "pageup" - | - ## The right arrow - "right" - | - ## The "Shift" key - "shift" - | - ## The spacebar - "space" - | - ## The "Tab" key - "tab" - | - ## The up arrow - "up" - db.keycap.function-enum.attribute = - - ## Identifies the function key - attribute function { db.keycap.function.enumeration }? - db.keycap.function-other.attributes = - - ## Identifies the function key - attribute function { - - ## Indicates a non-standard function key - "other" - }?, - - ## Specifies a keyword that identifies the non-standard key - attribute otherfunction { text } - db.keycap.function.attrib = - db.keycap.function-enum.attribute - | db.keycap.function-other.attributes - db.keycap.role.attribute = attribute role { text } - db.keycap.attlist = - db.keycap.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.keycap.function.attrib - db.keycap = - - ## The text printed on a key on a keyboard - element keycap { db.keycap.attlist, db._text } -} -div { - db.keycode.role.attribute = attribute role { text } - db.keycode.attlist = - db.keycode.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.keycode = - - ## The internal, frequently numeric, identifier for a key on a keyboard - element keycode { db.keycode.attlist, db._text } -} -db.keycombination.contentmodel = - (db.keycap | db.keycombo | db.keysym) | db.mousebutton -div { - db.keycombo.action.enumeration = - - ## A (single) mouse click. - "click" - | - ## A double mouse click. - "double-click" - | - ## A mouse or key press. - "press" - | - ## Sequential clicks or presses. - "seq" - | - ## Simultaneous clicks or presses. - "simul" - db.keycombo.action-enum.attribute = - - ## Identifies the nature of the action taken. If keycombo - ## contains more than one element, simul - ## is the default, otherwise there is no default. - attribute action { db.keycombo.action.enumeration }? - db.keycombo.action-other.attributes = - - ## Identifies the nature of the action taken - attribute action { - - ## Indicates a non-standard action - "other" - }?, - - ## Identifies the non-standard action in some unspecified way. - attribute otheraction { text } - db.keycombo.action.attrib = - db.keycombo.action-enum.attribute - | db.keycombo.action-other.attributes - db.keycombo.role.attribute = attribute role { text } - db.keycombo.attlist = - db.keycombo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.keycombo.action.attrib - db.keycombo = - - ## A combination of input actions - element keycombo { - db.keycombo.attlist, db.keycombination.contentmodel+ - } -} -div { - db.keysym.role.attribute = attribute role { text } - db.keysym.attlist = - db.keysym.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.keysym = - - ## The symbolic name of a key on a keyboard - element keysym { db.keysym.attlist, db._text } -} -div { - db.accel.role.attribute = attribute role { text } - db.accel.attlist = - db.accel.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.accel = - - ## A graphical user interface (GUI) keyboard shortcut - element accel { db.accel.attlist, db._text } -} -div { - db.shortcut.action.attrib = db.keycombo.action.attrib - db.shortcut.role.attribute = attribute role { text } - db.shortcut.attlist = - db.shortcut.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.shortcut.action.attrib - db.shortcut = - - ## A key combination for an action that is also accessible through a menu - element shortcut { - db.shortcut.attlist, db.keycombination.contentmodel+ - } -} -db.os.inlines = - db.prompt - | db.envar - | db.filename - | db.command - | db.computeroutput - | db.userinput -db.computeroutput.inlines = - (text | db.ubiq.inlines | db.os.inlines | db.technical.inlines) - | db.co - | db.markup.inlines -db.userinput.inlines = - (text | db.ubiq.inlines | db.os.inlines | db.technical.inlines) - | db.co - | db.markup.inlines - | db.gui.inlines - | db.keyboard.inlines -db.prompt.inlines = db._text | db.co -div { - db.prompt.role.attribute = attribute role { text } - db.prompt.attlist = - db.prompt.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.prompt = - - ## A character or string indicating the start of an input field in a computer display - element prompt { db.prompt.attlist, db.prompt.inlines* } -} -div { - db.envar.role.attribute = attribute role { text } - db.envar.attlist = - db.envar.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.envar = - - ## A software environment variable - element envar { db.envar.attlist, db._text } -} -div { - db.filename.class.enumeration = - - ## A device - "devicefile" - | - ## A directory - "directory" - | - ## A filename extension - "extension" - | - ## A header file (as for a programming language) - "headerfile" - | - ## A library file - "libraryfile" - | - ## A partition (as of a hard disk) - "partition" - | - ## A symbolic link - "symlink" - db.filename.class.attribute = - - ## Identifies the class of filename - attribute class { db.filename.class.enumeration } - db.filename.path.attribute = - - ## Specifies the path of the filename - attribute path { text } - db.filename.role.attribute = attribute role { text } - db.filename.attlist = - db.filename.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.filename.path.attribute? - & db.filename.class.attribute? - db.filename = - - ## The name of a file - element filename { db.filename.attlist, db._text } -} -div { - db.command.role.attribute = attribute role { text } - db.command.attlist = - db.command.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.command = - - ## The name of an executable program or other software command - element command { db.command.attlist, db._text } -} -div { - db.computeroutput.role.attribute = attribute role { text } - db.computeroutput.attlist = - db.computeroutput.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.computeroutput = - - ## Data, generally text, displayed or presented by a computer - element computeroutput { - db.computeroutput.attlist, db.computeroutput.inlines* - } -} -div { - db.userinput.role.attribute = attribute role { text } - db.userinput.attlist = - db.userinput.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.userinput = - - ## Data entered by the user - element userinput { db.userinput.attlist, db.userinput.inlines* } -} -div { - db.cmdsynopsis.role.attribute = attribute role { text } - db.cmdsynopsis.sepchar.attribute = - - ## Specifies the character that should separate the command and its top-level arguments - attribute sepchar { text } - db.cmdsynopsis.cmdlength.attribute = - - ## Indicates the displayed length of the command; this information may be used to intelligently indent command synopses which extend beyond one line - attribute cmdlength { text } - db.cmdsynopsis.label.attribute = db.label.attribute - db.cmdsynopsis.attlist = - db.cmdsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.cmdsynopsis.sepchar.attribute? - & db.cmdsynopsis.cmdlength.attribute? - & db.cmdsynopsis.label.attribute? - db.cmdsynopsis.info = db._info.title.forbidden - db.cmdsynopsis = - - ## A syntax summary for a software command - element cmdsynopsis { - db.cmdsynopsis.attlist, - db.cmdsynopsis.info, - (db.command | db.arg | db.group | db.sbr)+, - db.synopfragment* - } -} -db.rep.enumeration = - - ## Can not be repeated. - "norepeat" - | - ## Can be repeated. - "repeat" -db.rep.attribute = - - ## Indicates whether or not repetition is possible. - [ a:defaultValue = "norepeat" ] attribute rep { db.rep.enumeration } -db.choice.enumeration = - - ## Formatted to indicate that it is optional. - "opt" - | - ## Formatted without indication. - "plain" - | - ## Formatted to indicate that it is required. - "req" -db.choice.opt.attribute = - - ## Indicates optionality. - [ a:defaultValue = "opt" ] attribute choice { db.choice.enumeration } -db.choice.req.attribute = - - ## Indicates optionality. - [ a:defaultValue = "req" ] attribute choice { db.choice.enumeration } -div { - db.arg.role.attribute = attribute role { text } - db.arg.rep.attribute = db.rep.attribute - db.arg.choice.attribute = db.choice.opt.attribute - db.arg.attlist = - db.arg.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.arg.rep.attribute? - & db.arg.choice.attribute? - db.arg = - - ## An argument in a CmdSynopsis - element arg { - db.arg.attlist, - (db._text - | db.arg - | db.group - | db.option - | db.synopfragmentref - | db.sbr)* - } -} -div { - db.group.role.attribute = attribute role { text } - db.group.rep.attribute = db.rep.attribute - db.group.choice.attribute = db.choice.opt.attribute - db.group.attlist = - db.group.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.group.rep.attribute? - & db.group.choice.attribute? - db.group = - - ## A group of elements in a CmdSynopsis - element group { - db.group.attlist, - (db.arg - | db.group - | db.option - | db.synopfragmentref - | db.replaceable - | db.sbr)+ - } -} -div { - db.sbr.role.attribute = attribute role { text } - db.sbr.attlist = db.sbr.role.attribute? & db.common.attributes - db.sbr = - - ## An explicit line break in a command synopsis - element sbr { db.sbr.attlist, empty } -} -div { - db.synopfragment.role.attribute = attribute role { text } - db.synopfragment.attlist = - db.synopfragment.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.synopfragment = - - ## A portion of a CmdSynopsis broken out from the main body of the synopsis - element synopfragment { - db.synopfragment.attlist, (db.arg | db.group)+ - } -} -div { - db.synopfragmentref.role.attribute = attribute role { text } - db.synopfragmentref.attlist = - db.synopfragmentref.role.attribute? - & db.common.attributes - & db.linkend.attribute - db.synopfragmentref = - - ## A reference to a fragment of a command synopsis - [ - s:pattern [ - name = "Synopsis fragment type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:synopfragmentref" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@linkend]) = 'synopfragment' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" - "@linkend on synopfragmentref must point to a synopfragment." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element synopfragmentref { db.synopfragmentref.attlist, text } -} -db.programming.inlines = - db.function - | db.parameter - | db.varname - | db.returnvalue - | db.type - | db.classname - | db.exceptionname - | db.interfacename - | db.methodname - | db.modifier - | db.initializer - | db.oo.inlines -db.oo.inlines = db.ooclass | db.ooexception | db.oointerface -db.synopsis.blocks = - (db.funcsynopsis - | db.classsynopsis - | db.methodsynopsis - | db.constructorsynopsis - | db.destructorsynopsis - | db.fieldsynopsis) - | db.cmdsynopsis -div { - db.synopsis.role.attribute = attribute role { text } - db.synopsis.label.attribute = db.label.attribute - db.synopsis.attlist = - db.synopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.synopsis.label.attribute? - db.synopsis = - - ## A general-purpose element for representing the syntax of commands or functions - element synopsis { db.synopsis.attlist, db.verbatim.contentmodel } -} -div { - db.funcsynopsis.role.attribute = attribute role { text } - db.funcsynopsis.attlist = - db.funcsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.funcsynopsis.info = db._info.title.forbidden - db.funcsynopsis = - - ## The syntax summary for a function definition - element funcsynopsis { - db.funcsynopsis.attlist, - db.funcsynopsis.info, - (db.funcsynopsisinfo | db.funcprototype)+ - } -} -div { - db.funcsynopsisinfo.role.attribute = attribute role { text } - db.funcsynopsisinfo.attlist = - db.funcsynopsisinfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - db.funcsynopsisinfo = - - ## Information supplementing the FuncDefs of a FuncSynopsis - element funcsynopsisinfo { - db.funcsynopsisinfo.attlist, db.verbatim.contentmodel - } -} -div { - db.funcprototype.role.attribute = attribute role { text } - db.funcprototype.attlist = - db.funcprototype.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.funcprototype = - - ## The prototype of a function - element funcprototype { - db.funcprototype.attlist, - db.modifier*, - db.funcdef, - (db.void | db.varargs | (db.paramdef+, db.varargs?)), - db.modifier* - } -} -div { - db.funcdef.role.attribute = attribute role { text } - db.funcdef.attlist = - db.funcdef.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.funcdef = - - ## A function (subroutine) name and its return type - element funcdef { - db.funcdef.attlist, (db._text | db.type | db.function)* - } -} -div { - db.function.role.attribute = attribute role { text } - db.function.attlist = - db.function.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.function = - - ## The name of a function or subroutine, as in a programming language - element function { db.function.attlist, db._text } -} -div { - db.void.role.attribute = attribute role { text } - db.void.attlist = - db.void.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.void = - - ## An empty element in a function synopsis indicating that the function in question takes no arguments - element void { db.void.attlist, empty } -} -div { - db.varargs.role.attribute = attribute role { text } - db.varargs.attlist = - db.varargs.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.varargs = - - ## An empty element in a function synopsis indicating a variable number of arguments - element varargs { db.varargs.attlist, empty } -} -div { - db.paramdef.role.attribute = attribute role { text } - db.paramdef.choice.enumeration = - - ## Formatted to indicate that it is optional. - "opt" - | - ## Formatted to indicate that it is required. - "req" - db.paramdef.choice.attribute = - - ## Indicates optionality. - [ a:defaultValue = "opt" ] - attribute choice { db.paramdef.choice.enumeration } - db.paramdef.attlist = - db.paramdef.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.paramdef.choice.attribute? - db.paramdef = - - ## Information about a function parameter in a programming language - element paramdef { - db.paramdef.attlist, - (db._text - | db.initializer - | db.type - | db.parameter - | db.funcparams)* - } -} -div { - db.funcparams.role.attribute = attribute role { text } - db.funcparams.attlist = - db.funcparams.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.funcparams = - - ## Parameters for a function referenced through a function pointer in a synopsis - element funcparams { db.funcparams.attlist, db._text } -} -div { - db.classsynopsis.role.attribute = attribute role { text } - db.classsynopsis.class.enumeration = - - ## This is the synopsis of a class - "class" - | - ## This is the synopsis of an interface - "interface" - db.classsynopsis.class.attribute = - - ## Specifies the nature of the synopsis - attribute class { db.classsynopsis.class.enumeration } - db.classsynopsis.attlist = - db.classsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - & db.classsynopsis.class.attribute? - db.classsynopsis = - - ## The syntax summary for a class definition - element classsynopsis { - db.classsynopsis.attlist, - db.oo.inlines+, - (db.classsynopsisinfo - | db.methodsynopsis - | db.constructorsynopsis - | db.destructorsynopsis - | db.fieldsynopsis)* - } -} -div { - db.classsynopsisinfo.role.attribute = attribute role { text } - db.classsynopsisinfo.attlist = - db.classsynopsisinfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - db.classsynopsisinfo = - - ## Information supplementing the contents of a ClassSynopsis - element classsynopsisinfo { - db.classsynopsisinfo.attlist, db.verbatim.contentmodel - } -} -div { - db.ooclass.role.attribute = attribute role { text } - db.ooclass.attlist = - db.ooclass.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.ooclass = - - ## A class in an object-oriented programming language - element ooclass { - db.ooclass.attlist, (db.package | db.modifier)*, db.classname - } -} -div { - db.oointerface.role.attribute = attribute role { text } - db.oointerface.attlist = - db.oointerface.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.oointerface = - - ## An interface in an object-oriented programming language - element oointerface { - db.oointerface.attlist, - (db.package | db.modifier)*, - db.interfacename - } -} -div { - db.ooexception.role.attribute = attribute role { text } - db.ooexception.attlist = - db.ooexception.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.ooexception = - - ## An exception in an object-oriented programming language - element ooexception { - db.ooexception.attlist, - (db.package | db.modifier)*, - db.exceptionname - } -} -db.modifier.xml.space.attribute = - - ## Can be used to indicate that whitespace in the modifier should be preserved (for multi-line annotations, for example). - attribute xml:space { - - ## Extra whitespace and line breaks must be preserved. - [ - # Ideally the definition of xml:space used on modifier would be - # different from the definition used on the verbatim elements. The - # verbatim elements forbid the use of xml:space="default" which - # wouldn't be a problem on modifier. But doing that causes the - # generated XSD schemas to be broken so I'm just reusing the existing - # definition for now. It won't be backwards incompatible to fix this - # problem in the future. - # | ## Extra whitespace and line breaks are not preserved. - # "default" - - ] - "preserve" - } -div { - db.modifier.role.attribute = attribute role { text } - db.modifier.attlist = - db.modifier.xml.space.attribute? - & db.modifier.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.modifier = - - ## Modifiers in a synopsis - element modifier { db.modifier.attlist, db._text } -} -div { - db.interfacename.role.attribute = attribute role { text } - db.interfacename.attlist = - db.interfacename.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.interfacename = - - ## The name of an interface - element interfacename { db.interfacename.attlist, db._text } -} -div { - db.exceptionname.role.attribute = attribute role { text } - db.exceptionname.attlist = - db.exceptionname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.exceptionname = - - ## The name of an exception - element exceptionname { db.exceptionname.attlist, db._text } -} -div { - db.fieldsynopsis.role.attribute = attribute role { text } - db.fieldsynopsis.attlist = - db.fieldsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.fieldsynopsis = - - ## The name of a field in a class definition - element fieldsynopsis { - db.fieldsynopsis.attlist, - db.modifier*, - db.type?, - db.varname, - db.initializer? - } -} -div { - db.initializer.role.attribute = attribute role { text } - db.initializer.attlist = - db.initializer.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.initializer = - - ## The initializer for a FieldSynopsis - element initializer { db.initializer.attlist, db._text } -} -div { - db.constructorsynopsis.role.attribute = attribute role { text } - db.constructorsynopsis.attlist = - db.constructorsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.constructorsynopsis = - - ## A syntax summary for a constructor - element constructorsynopsis { - db.constructorsynopsis.attlist, - db.modifier*, - db.methodname?, - (db.methodparam+ | db.void?), - db.exceptionname* - } -} -div { - db.destructorsynopsis.role.attribute = attribute role { text } - db.destructorsynopsis.attlist = - db.destructorsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.destructorsynopsis = - - ## A syntax summary for a destructor - element destructorsynopsis { - db.destructorsynopsis.attlist, - db.modifier*, - db.methodname?, - (db.methodparam+ | db.void?), - db.exceptionname* - } -} -div { - db.methodsynopsis.role.attribute = attribute role { text } - db.methodsynopsis.attlist = - db.methodsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.methodsynopsis = - - ## A syntax summary for a method - element methodsynopsis { - db.methodsynopsis.attlist, - db.modifier*, - (db.type | db.void)?, - db.methodname, - (db.methodparam+ | db.void), - db.exceptionname*, - db.modifier* - } -} -div { - db.methodname.role.attribute = attribute role { text } - db.methodname.attlist = - db.methodname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.methodname = - - ## The name of a method - element methodname { db.methodname.attlist, db._text } -} -div { - db.methodparam.role.attribute = attribute role { text } - db.methodparam.rep.attribute = db.rep.attribute - db.methodparam.choice.attribute = db.choice.req.attribute - db.methodparam.attlist = - db.methodparam.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.methodparam.rep.attribute? - & db.methodparam.choice.attribute? - db.methodparam = - - ## Parameters to a method - element methodparam { - db.methodparam.attlist, - db.modifier*, - db.type?, - ((db.modifier*, db.parameter, db.initializer?) | db.funcparams), - db.modifier* - } -} -div { - db.varname.role.attribute = attribute role { text } - db.varname.attlist = - db.varname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.varname = - - ## The name of a variable - element varname { db.varname.attlist, db._text } -} -div { - db.returnvalue.role.attribute = attribute role { text } - db.returnvalue.attlist = - db.returnvalue.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.returnvalue = - - ## The value returned by a function - element returnvalue { db.returnvalue.attlist, db._text } -} -div { - db.type.role.attribute = attribute role { text } - db.type.attlist = - db.type.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.type = - - ## The classification of a value - element type { db.type.attlist, db._text } -} -div { - db.classname.role.attribute = attribute role { text } - db.classname.attlist = - db.classname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.classname = - - ## The name of a class, in the object-oriented programming sense - element classname { db.classname.attlist, db._text } -} -div { - db.programlisting.role.attribute = attribute role { text } - db.programlisting.width.attribute = db.width.characters.attribute - db.programlisting.attlist = - db.programlisting.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.programlisting.width.attribute? - db.programlisting = - - ## A literal listing of all or part of a program - element programlisting { - db.programlisting.attlist, db.verbatim.contentmodel - } -} -db.admonition.blocks = - db.caution | db.important | db.note | db.tip | db.warning -db.admonition.contentmodel = db._info.title.only, db.all.blocks+ -div { - db.caution.role.attribute = attribute role { text } - db.caution.attlist = - db.caution.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.caution = - - ## A note of caution - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element caution { db.caution.attlist, db.admonition.contentmodel } -} -div { - db.important.role.attribute = attribute role { text } - db.important.attlist = - db.important.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.important = - - ## An admonition set off from the text - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element important { - db.important.attlist, db.admonition.contentmodel - } -} -div { - db.note.role.attribute = attribute role { text } - db.note.attlist = - db.note.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.note = - - ## A message set off from the text - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element note { db.note.attlist, db.admonition.contentmodel } -} -div { - db.tip.role.attribute = attribute role { text } - db.tip.attlist = - db.tip.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.tip = - - ## A suggestion to the user, set off from the text - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element tip { db.tip.attlist, db.admonition.contentmodel } -} -div { - db.warning.role.attribute = attribute role { text } - db.warning.attlist = - db.warning.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.warning = - - ## An admonition set off from the text - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element warning { db.warning.attlist, db.admonition.contentmodel } -} -db.error.inlines = - db.errorcode | db.errortext | db.errorname | db.errortype -div { - db.errorcode.role.attribute = attribute role { text } - db.errorcode.attlist = - db.errorcode.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.errorcode = - - ## An error code - element errorcode { db.errorcode.attlist, db._text } -} -div { - db.errorname.role.attribute = attribute role { text } - db.errorname.attlist = - db.errorname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.errorname = - - ## An error name - element errorname { db.errorname.attlist, db._text } -} -div { - db.errortext.role.attribute = attribute role { text } - db.errortext.attlist = - db.errortext.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.errortext = - - ## An error message. - element errortext { db.errortext.attlist, db._text } -} -div { - db.errortype.role.attribute = attribute role { text } - db.errortype.attlist = - db.errortype.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.errortype = - - ## The classification of an error message - element errortype { db.errortype.attlist, db._text } -} -db.systemitem.inlines = db._text | db.co -div { - db.systemitem.class.enumeration = - - ## A daemon or other system process (syslogd) - "daemon" - | - ## A domain name (example.com) - "domainname" - | - ## An ethernet address (00:05:4E:49:FD:8E) - "etheraddress" - | - ## An event of some sort (SIGHUP) - "event" - | - ## An event handler of some sort (hangup) - "eventhandler" - | - ## A filesystem (ext3) - "filesystem" - | - ## A fully qualified domain name (my.example.com) - "fqdomainname" - | - ## A group name (wheel) - "groupname" - | - ## An IP address (127.0.0.1) - "ipaddress" - | - ## A library (libncurses) - "library" - | - ## A macro - "macro" - | - ## A netmask (255.255.255.192) - "netmask" - | - ## A newsgroup (comp.text.xml) - "newsgroup" - | - ## An operating system name (Hurd) - "osname" - | - ## A process (gnome-cups-icon) - "process" - | - ## A protocol (ftp) - "protocol" - | - ## A resource - "resource" - | - ## A server (mail.example.com) - "server" - | - ## A service (ppp) - "service" - | - ## A system name (hephaistos) - "systemname" - | - ## A user name (ndw) - "username" - db.systemitem.class.attribute = - - ## Identifies the nature of the system item - attribute class { db.systemitem.class.enumeration } - db.systemitem.role.attribute = attribute role { text } - db.systemitem.attlist = - db.systemitem.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.systemitem.class.attribute? - db.systemitem = - - ## A system-related item or term - element systemitem { db.systemitem.attlist, db.systemitem.inlines* } -} -div { - db.option.role.attribute = attribute role { text } - db.option.attlist = - db.option.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.option = - - ## An option for a software command - element option { db.option.attlist, db._text } -} -div { - db.optional.role.attribute = attribute role { text } - db.optional.attlist = - db.optional.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.optional = - - ## Optional information - element optional { db.optional.attlist, db._text } -} -div { - db.property.role.attribute = attribute role { text } - db.property.attlist = - db.property.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.property = - - ## A unit of data associated with some part of a computer system - element property { db.property.attlist, db._text } -} diff --git a/jonas_doc/core/tools/docbook-5.0/rng/docbook.rng b/jonas_doc/core/tools/docbook-5.0/rng/docbook.rng deleted file mode 100644 index 019c84b847aab91494f79abca4b8370f5012b97e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/rng/docbook.rng +++ /dev/null @@ -1,15292 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - Any attribute including in any attribute in any namespace. - - - - - - Any element from almost any namespace - - - - - - - - - - - - - - - -
    - - - Designates the computer or chip architecture to which the element applies - - - - - Designates the intended audience to which the element applies, for example, system administrators, programmers, or new users. - - - - - provides a standard place for application-specific effectivity - - - - - Indicates standards conformance characteristics of the element - - - - - Indicates the operating system to which the element is applicable - - - - - Indicates the editorial revision to which the element belongs - - - - - Indicates something about the security level associated with the element to which it applies - - - - - Indicates the level of user experience for which the element applies - - - - - Indicates the computer vendor to which the element applies. - - - - - Indicates the word size (width in bits) of the computer architecture to which the element applies - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Points to the element whose content is to be used as the text of the link - - - - - - Points to an internal link target by identifying the value of its xml:id attribute - - - - - - Points to one or more internal link targets by identifying the value of their xml:id attributes - - - - - - Identifies a link target with a URI - - - - - - Identifies the XLink link type - simple - An XLink simple link - - - - - Identifies the XLink role of the link - - - - - - Identifies the XLink arcrole of the link - - - - - - - Identifies the XLink title of the link - - - - - - new - An application traversing to the ending resource should load it in a new window, frame, pane, or other relevant presentation context. - replace - An application traversing to the ending resource should load the resource in the same window, frame, pane, or other relevant presentation context in which the starting resource was loaded. - embed - An application traversing to the ending resource should load its presentation in place of the presentation of the starting resource. - other - The behavior of an application traversing to the ending resource is unconstrained by XLink. The application should look for other markup present in the link to determine the appropriate behavior. - none - The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior. - - - - - Identifies the XLink show behavior of the link - - - - - - onLoad - An application should traverse to the ending resource immediately on loading the starting resource. - onRequest - An application should traverse from the starting resource to the ending resource only on a post-loading event triggered for the purpose of traversal. - other - The behavior of an application traversing to the ending resource is unconstrained by this specification. The application should look for other markup present in the link to determine the appropriate behavior. - none - The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior. - - - - - Identifies the XLink actuate behavior of the link - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Identifies the unique ID value of the element - - - - - - Specifies the DocBook version of the element and its descendants - - - - - Specifies the natural language of the element and its descendants - - - - - Specifies the base URI of the element and its descendants - - - - - - Provides the name or similar semantic identifier assigned to the content in some previous markup scheme - - - - - Provides the text that is to be generated for a cross reference to the element - - - - - Specifies a keyword or keywords identifying additional style information - - - - - changed - The element has been changed. - added - The element is new (has been added to the document). - deleted - The element has been deleted. - off - Explicitly turns off revision markup for this element. - - - - - Identifies the revision status of the element - - - - - - ltr - Left-to-right text - rtl - Right-to-left text - lro - Left-to-right override - rlo - Right-to-left override - - - - - Identifies the direction of text in an element - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specifies the format of the data - - - - - Indentifies the location of the data by URI - - - - Identifies the location of the data by external identifier (entity name) - - - - - - - continues - Line numbering continues from the immediately preceding element with the same name. - restarts - Line numbering restarts (begins at 1, usually). - - - - - Determines whether line numbering continues from the previous element or restarts. - - - - - - numbered - Lines are numbered. - unnumbered - Lines are not numbered. - - - - - Determines whether lines are numbered. - - - - - - Specifies the initial line number. - - - - - - Identifies the language (i.e. programming language) of the verbatim content. - - - - - Can be used to indicate explicitly that whitespace in the verbatim environment is preserved. Whitespace must always be preserved in verbatim environments whether this attribute is specified or not. - preserve - Whitespace must be preserved. - - - - - - - - - - - - - - - - - - - - - - - - Specifies an identifying string for presentation purposes - - - - - Specifies the width (in characters) of the element - - - - - - compact - The spacing should be "compact". - normal - The spacing should be "normal". - - - - - Specifies (a hint about) the spacing of the content - - - - - - 0 - The element should be rendered in the current text flow (with the flow column width). - 1 - The element should be rendered across the full text page. - - - - - Indicates if the element is rendered across the column or the page - - - - - - Identifies the language (i.e. programming language) of the content. - - - - - optional - The content describes an optional step or steps. - required - The content describes a required step or steps. - - - - - Specifies if the content is required or optional. - - - - - - Specifies style information to be used when rendering the float - - - - - Specifies the width of the element - - - - - Specifies the depth of the element - - - - - Specifies the width of the content rectangle - - - - - Specifies the depth of the content rectangle - - - - - 0 - False (do not scale-to-fit; anamorphic scaling may occur) - 1 - True (scale-to-fit; anamorphic scaling is forbidden) - - - - - Specifies the scaling factor - - - - - - center - Centered horizontally - char - Aligned horizontally on the specified character - justify - Fully justified (left and right margins or edges) - left - Left aligned - right - Right aligned - - - - - bottom - Aligned on the bottom of the region - middle - Centered vertically - top - Aligned on the top of the region - - - - - doi - A document object identifier. - isbn - An international standard book number. - isrn - An international standard technical report number (ISO 10444). - issn - An international standard serial number. - libraryofcongress - A Library of Congress reference number. - pubsnumber - A publication number (an internal number or possibly organizational standard). - uri - A Uniform Resource Identifier - - - - - - Identifies the kind of bibliographic identifier - - - - - - - Identifies the nature of the non-standard bibliographic identifier - - - - - - - Identifies the kind of bibliographic identifier - other - Indicates that the identifier is some 'other' kind. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - The text of the title of a section of a document or of a formal block-level element - - - - - - -
    -
    - - - - - - - - - - - - - - - The abbreviation of a title - - - - - - -
    -
    - - - - - - - - - - - - - - - The subtitle of a document - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block - - - - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block with a required title - - - - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block with only a title - - - - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block with only a required title - - - - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block without a title - - - - - - -
    -
    - - - - - - Identifies the controlled vocabulary used by this set's terms - - - - - - - - - - - - - - - - - - A set of terms describing the subject matter of a document - - - - - - -
    -
    - - - - - - Specifies a ranking for this subject relative to other subjects in the same set - - - - - - - - - - - - - - - - - One of a group of terms describing the subject matter of a document - - - - - - -
    -
    - - - - - - - - - - - - - - - A term in a group of terms describing the subject matter of a document - - - - -
    -
    - - - - - - - - - - - - - - - A set of keywords describing the content of a document - - - - - - -
    -
    - - - - - - - - - - - - - - - One of a set of keywords describing the content of a document - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - A list of operations to be performed in a well-defined sequence - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - A unit of action in a procedure - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - Alternative steps in a procedure - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for steps that occur within steps in a procedure - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A portion of a document that is isolated from the main narrative flow - - - sidebar must not occur in the descendants of sidebar - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A summary - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A short description or note about a person - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A quotation set off from the main text - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The source of a block quote or epigraph - - - - - - - - - - - - -
    -
    - - - sect1 - Render as a first-level section - sect2 - Render as a second-level section - sect3 - Render as a third-level section - sect4 - Render as a fourth-level section - sect5 - Render as a fifth-level section - - - - - - Indicates how the bridge head should be rendered - - - - - - - Identifies the nature of the non-standard rendering - - - - - - - Indicates how the bridge head should be rendered - other - Identifies a non-standard rendering - - - - - - - - - - - - - - - - - - - - - - - - - - - - A free-floating heading - - - - - - -
    -
    - - - - - - - - - - - - - - - A remark (or comment) intended for presentation in a draft manuscript - - - - -
    -
    - - - - - - - - - - - - - - - - - - A short inscription at the beginning of a document or component - - - - - - - - - - - - - -
    -
    - - - - - - Identifies the desired footnote mark - - - - - - - - - - - - - - - - - - A footnote - - - footnote must not occur in the descendants of footnote - - - - - example must not occur in the descendants of footnote - - - - - figure must not occur in the descendants of footnote - - - - - table must not occur in the descendants of footnote - - - - - equation must not occur in the descendants of footnote - - - - - indexterm must not occur in the descendants of footnote - - - - - sidebar must not occur in the descendants of footnote - - - - - task must not occur in the descendants of footnote - - - - - epigraph must not occur in the descendants of footnote - - - - - caution must not occur in the descendants of footnote - - - - - important must not occur in the descendants of footnote - - - - - note must not occur in the descendants of footnote - - - - - tip must not occur in the descendants of footnote - - - - - warning must not occur in the descendants of footnote - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A paragraph with a title - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A paragraph - - - The root element must have a version attribute. - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A paragraph that contains only text and inline markup, no block elements - - - - - - - -
    -
    - - - - - - Identifies the type of mark to be used on items in this list - - - - - - - - - - - - - - - - - - - - - - - - A list in which each entry is marked with a bullet or other dingbat - - - - - - - - - - -
    -
    - - - - - - continues - Specifies that numbering should begin where the preceding list left off - restarts - Specifies that numbering should begin again at 1 - - - - - Indicates how list numbering should begin relative to the immediately preceding list - - - - - - Specifies the initial line number. - - - - - - ignore - Specifies that numbering should ignore list nesting - inherit - Specifies that numbering should inherit from outer-level lists - - - - - Indicates whether or not item numbering should be influenced by list nesting - - - - - - arabic - Specifies Arabic numeration (1, 2, 3, …) - upperalpha - Specifies upper-case alphabetic numeration (A, B, C, …) - loweralpha - Specifies lower-case alphabetic numeration (a, b, c, …) - upperroman - Specifies upper-case Roman numeration (I, II, III, …) - lowerroman - Specifies lower-case Roman numeration (i, ii, iii …) - - - - - Indicates the desired numeration - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A list in which each entry is marked with a sequentially incremented label - - - - - - - - - - -
    -
    - - - - - - Specifies the keyword for the type of mark that should be used on this - item, instead of the mark that would be used by default - - - - - - - - - - - - - - - - - - A wrapper for the elements of a list item - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A segmented list, a list of sets of elements - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The title of an element of a list item in a segmented list - - - - - - -
    -
    - - - - - - - - - - - - - - - A list item in a segmented list - - - The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An element of a list item in a segmented list - - - - - - -
    -
    - - - - - - horiz - A tabular presentation in row-major order. - vert - A tabular presentation in column-major order. - inline - An inline presentation, usually a comma-delimited list. - - - - - Specifies the type of list presentation. - - - - - - Specifies the number of columns for horizontal or vertical presentation - - - - - - - - - - - - - - - - - - - - - An undecorated list of single words or short phrases - - - - - - -
    -
    - - - - - - - - - - - - - - - An element of a simple list - - - - - - -
    -
    - - - - - - Indicates a length beyond which the presentation system may consider a term too long and select an alternate presentation for that term, item, or list - - - - - - - - - - - - - - - - - - - - - - - A list in which each entry is composed of a set of one or more terms and an associated description - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A wrapper for a set of terms and the associated description in a variable list - - - - - - - -
    -
    - - - - - - - - - - - - - - - The word or phrase being defined or described in a variable list - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A formal example, with a title - - - example must not occur in the descendants of example - - - - - figure must not occur in the descendants of example - - - - - table must not occur in the descendants of example - - - - - equation must not occur in the descendants of example - - - - - caution must not occur in the descendants of example - - - - - important must not occur in the descendants of example - - - - - note must not occur in the descendants of example - - - - - tip must not occur in the descendants of example - - - - - warning must not occur in the descendants of example - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A displayed example without a title - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - monospaced - The literal layout should be formatted with a monospaced font - normal - The literal layout should be formatted with the current font - - - - - Specifies the class of literal layout - - - - - - - - - - - - - - - - - - - A block of text in which line breaks and white space are to be reproduced faithfully - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - Text that a user sees or might see on a computer screen - - - - -
    -
    - - - - - - - - - - - - - - - - - - A representation of what the user sees or might see on a computer screen - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A formal figure, generally an illustration, with a title - - - example must not occur in the descendants of figure - - - - - figure must not occur in the descendants of figure - - - - - table must not occur in the descendants of figure - - - - - equation must not occur in the descendants of figure - - - - - caution must not occur in the descendants of figure - - - - - important must not occur in the descendants of figure - - - - - note must not occur in the descendants of figure - - - - - tip must not occur in the descendants of figure - - - - - warning must not occur in the descendants of figure - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A untitled figure - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - A displayed media object (video, audio, image, etc.) - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - An inline media object (video, audio, image, and so on) - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for video data and its associated meta-information - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for audio data and its associated meta-information - - - - - -
    - - - - - - - -
    - - - - - - - - - - - - - - - - - - A wrapper for image data and its associated meta-information - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for a text description of an object and its associated meta-information - - - - - - - - - - - -
    -
    - - - - - - - - - Specifies the (horizontal) alignment of the video data - - - - - - - - - Specifies the vertical alignment of the video data - - - - - - - - - - - - - - - - - - - - - Determines if anamorphic scaling is forbidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pointer to external video data - - - - -
    -
    - - - - - - - - - - - - - - - - - - Pointer to external audio data - - - - -
    -
    - - - - - - - - - Specifies the (horizontal) alignment of the image data - - - - - - - - - Specifies the vertical alignment of the image data - - - - - - - - - - - - - - - - - - - - - Determines if anamorphic scaling is forbidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pointer to external image data - - - - -
    -
    - - - - - - Identifies the encoding of the text in the external file - - - - - - - - - - - - - - - - - - - - Pointer to external text data - - - - -
    -
    - - - - - - - - - - - - - - - - - - A caption - - - example must not occur in the descendants of caption - - - - - figure must not occur in the descendants of caption - - - - - table must not occur in the descendants of caption - - - - - equation must not occur in the descendants of caption - - - - - sidebar must not occur in the descendants of caption - - - - - task must not occur in the descendants of caption - - - - - caution must not occur in the descendants of caption - - - - - important must not occur in the descendants of caption - - - - - note must not occur in the descendants of caption - - - - - tip must not occur in the descendants of caption - - - - - warning must not occur in the descendants of caption - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - A real-world address, generally a postal address - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A street address in an address - - - - -
    -
    - - - - - - - - - - - - - - - A post office box in an address - - - - -
    -
    - - - - - - - - - - - - - - - A postal code in an address - - - - -
    -
    - - - - - - - - - - - - - - - The name of a city in an address - - - - -
    -
    - - - - - - - - - - - - - - - A state or province in an address - - - - -
    -
    - - - - - - - - - - - - - - - The name of a country - - - - -
    -
    - - - - - - - - - - - - - - - A telephone number - - - - -
    -
    - - - - - - - - - - - - - - - A fax number - - - - -
    -
    - - - - - - - - - - - - - - - Uncategorized information in address - - - - -
    -
    - - - - - - - - - - - - - - - The institutional affiliation of an individual - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A brief description of an affiliation - - - - -
    -
    - - - - - - - - - - - - - - - The title of an individual in an organization - - - - -
    -
    - - - consortium - A consortium - corporation - A corporation - informal - An informal organization - nonprofit - A non-profit organization - - - - - Specifies the nature of the organization - - - - - - Specifies the nature of the organization - other - Indicates a non-standard organization class - - - Identifies the non-standard nature of the organization - - - - - - - - - - - - - - - - - - - - - - - - - - The name of an organization - - - - -
    -
    - - - - - - - - - - - - - - - A division of an organization - - - - - - -
    -
    - - - - - - - - - - - - - - - The page numbers of an article as published - - - - -
    -
    - - - - - - - - - - - - - - - The personal name of an individual - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - The name of an individual author - - - - -
    -
    - - - - - - - - - - - - - - - Wrapper for author information when a document has multiple authors or collabarators - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Identifies a collaborator - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The initials or other short identifier for an author - - - - -
    -
    - - - - - - - - - - - - - - - A person and associated metadata - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An organization and associated metadata - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A wrapper for document meta-information about a conference - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The dates of a conference for which a document was written - - - - -
    -
    - - - - - - - - - - - - - - - The title of a conference for which a document was written - - - - -
    -
    - - - - - - - - - - - - - - - An identifier, frequently numerical, associated with a conference for which a document was written - - - - -
    -
    - - - - - - - - - - - - - - - The sponsor of a conference for which a document was written - - - - -
    -
    - - - - - - - - - - - - - - - The contract number of a document - - - - -
    -
    - - - - - - - - - - - - - - - The sponsor of a contract - - - - -
    -
    - - - - - - - - - - - - - - - Copyright information about a document - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The year of publication of a document - - - - -
    -
    - - - - - - - - - - - - - - - The name of the individual or organization that holds a copyright - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - Additional content for the cover of a publication - - - - - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - The date of publication or revision of a document - - - - -
    -
    - - - - - - - - - - - - - - - The name or number of an edition of a document - - - - -
    -
    - - - - - - - - - - - - - - - The name of the editor of a document - - - - -
    -
    - - - - - - - - - - - - - - - - An identifier for a document - - - - -
    -
    - - - - - - - - - - - - - - - - A citation of a bibliographic identifier - - - - -
    -
    - - - - - - - - - - - - - - - - The source of a document - - - - -
    -
    - - - hasformat - The described resource pre-existed the referenced resource, which is essentially the same intellectual content presented in another format - haspart - The described resource includes the referenced resource either physically or logically - hasversion - The described resource has a version, edition, or adaptation, namely, the referenced resource - isformatof - The described resource is the same intellectual content of the referenced resource, but presented in another format - ispartof - The described resource is a physical or logical part of the referenced resource - isreferencedby - The described resource is referenced, cited, or otherwise pointed to by the referenced resource - isreplacedby - The described resource is supplanted, displaced, or superceded by the referenced resource - isrequiredby - The described resource is required by the referenced resource, either physically or logically - isversionof - The described resource is a version, edition, or adaptation of the referenced resource; changes in version imply substantive changes in content rather than differences in format - references - The described resource references, cites, or otherwise points to the referenced resource - replaces - The described resource supplants, displaces, or supersedes the referenced resource - requires - The described resource requires the referenced resource to support its function, delivery, or coherence of content - - - - - - Identifies the type of relationship - - - - - - - - Identifies the type of relationship - othertype - The described resource has a non-standard relationship with the referenced resource - - - - A keyword that identififes the type of the non-standard relationship - - - - - - - - - - - - - - - - - - - - - - - - - - The relationship of a document to another - - - - -
    -
    - - - dcmipoint - The DCMI Point identifies a point in space using its geographic coordinates - iso3166 - ISO 3166 Codes for the representation of names of countries - dcmibox - The DCMI Box identifies a region of space using its geographic limits - tgn - The Getty Thesaurus of Geographic Names - - - - - - Specifies the type of spatial coverage - - - - - - - - Specifies the type of spatial coverage - otherspatial - Identifies a non-standard type of coverage - - - - A keyword that identifies the type of non-standard coverage - - - - - - - - - - - - dcmiperiod - A specification of the limits of a time interval - w3c-dtf - W3C Encoding rules for dates and times—a profile based on ISO 8601 - - - - - - Specifies the type of temporal coverage - - - - - - - - Specifies the type of temporal coverage - othertemporal - Specifies a non-standard type of coverage - - - - A keyword that identifies the type of non-standard coverage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The spatial or temporal coverage of a document - - - - -
    -
    - - - - - - - - - - - - - - - - - - A statement of legal obligations or requirements - - - - - - - -
    -
    - - - copyeditor - A copy editor - graphicdesigner - A graphic designer - other - Some other contributor - productioneditor - A production editor - technicaleditor - A technical editor - translator - A translator - - - - - - Identifies the nature of the contributor - - - - - - - Identifies the nature of the non-standard contribution - - - - - - - Identifies the nature of the contributor - other - Identifies a non-standard contribution - - - - - - - - - - - - - - - - - - - - - - - - - - A person or entity, other than an author or editor, credited in a document - - - - -
    -
    - - - - - - - - - - - - - - - The numbers of the pages in a book, for use in a bibliographic entry - - - - -
    -
    - - - - - - - - - - - - - - - A summary of the contributions made to a document by a credited source - - - - -
    -
    - - - - - - - - - - - - - - - The title of a person - - - - -
    -
    - - - - - - - - - - - - - - - The first name of a person - - - - -
    -
    - - - - - - - - - - - - - - - A family name; in western cultures the last name - - - - -
    -
    - - - - - - - - - - - - - - - The portion of a person's name indicating a relationship to ancestors - - - - -
    -
    - - - - - - - - - - - - - - - A component of a persons name that is not a first name, surname, or lineage - - - - -
    -
    - - - - - - - - - - - - - - - The printing history of a document - - - - - - -
    -
    - - - - - - - - - - - - - - - The date of publication of a document - - - - -
    -
    - - - - - - - - - - - - - - - The publisher of a document - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of the publisher of a document - - - - -
    -
    - - - - - - - - - - - - - - - Information about a particular release of a document - - - - -
    -
    - - - - - - - - - - - - - - - - - - A history of the revisions to a document - - - - - - - -
    -
    - - - - - - - - - - - - - - - An entry describing a single revision in the history of the revisions to a document - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A document revision number - - - - -
    -
    - - - - - - - - - - - - - - - A description of a revision to a document - - - - -
    -
    - - - - - - - - - - - - - - - A extended description of a revision to a document - - - - - - -
    -
    - - - - - - - - - - - - - - - Numbers of the volumes in a series of books - - - - -
    -
    - - - - - - - - - - - - - - - The volume number of a document in a set (as of books in a set or articles in a journal) - - - - -
    -
    - - - - - - - - - - - - - - - The number of an issue of a journal - - - - -
    -
    - - - - - - - - - - - - - - - A software or application package - - - - -
    -
    - - - - - - - - - - - - - - - An email address - - - - -
    -
    - - - - - - - - - - - - - - - A comment on a line in a verbatim listing - - - - -
    -
    - - - command - A command - function - A function - option - An option - - - - - Identifies the class of parameter - - - - - - - - - - - - - - - - - - - - - A value or a symbolic reference to a value - - - - -
    - - - - - - -
    - - - command - A command - function - A function - option - An option - parameter - A parameter - - - - - Identifies the nature of the replaceable text - - - - - - - - - - - - - - - - - - - - - Content that may or must be replaced by the user - - - - - - -
    -
    - - - - Identifies the type of URI specified - - - - - - - - - - - - - - - - - - - A Uniform Resource Identifier - - - - -
    -
    - - - - - - - - - - - - - - - An abbreviation, especially one followed by a period - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An often pronounceable word made from the initial (or selected) letters of a name or phrase - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An inline bibliographic reference to another published work - - - - - - -
    -
    - - - - - - - - - - - - - - - A citation to a reference page - - - - - - - -
    -
    - - - - - - - - - - - - - - - The title of a reference page - - - - - - -
    -
    - - - - - - - - - - - - - - - A reference volume number - - - - -
    -
    - - - article - An article - bbs - A bulletin board system - book - A book - cdrom - A CD-ROM - chapter - A chapter (as of a book) - dvd - A DVD - emailmessage - An email message - gopher - A gopher page - journal - A journal - manuscript - A manuscript - newsposting - A posting to a newsgroup - part - A part (as of a book) - refentry - A reference entry - section - A section (as of a book or article) - series - A series - set - A set (as of books) - webpage - A web page - wiki - A wiki page - - - - - Identifies the nature of the publication being cited - - - - - - - - - - - - - - - - - - - - - The title of a cited work - - - - - - -
    -
    - - - - - - - - - - - - - - - Emphasized text - - - - - - -
    -
    - - - A limited span of emphasized text - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A word or phrase in a language other than the primary language of the document - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A span of text - - - - - - -
    -
    - - - A limited span of text - - - - -
    -
    - - - - - - - - - - - - - - - An inline quotation - - - - - - -
    -
    - - - - - - - - - - - - - - - A subscript (as in H2 -O, the molecular formula for water) - - - - -
    -
    - - - - - - - - - - - - - - - A superscript (as in x^2, the mathematical notation for x multiplied by itself) - - - - -
    -
    - - - copyright - A copyright - registered - A registered copyright - service - A service - trade - A trademark - - - - - Identifies the class of trade mark - - - - - - - - - - - - - - - - - - - - - A trademark - - - - -
    -
    - - - - - - - - - - - - - - - A word meant specifically as a word and not representing anything else - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A cross reference to a footnote (a footnote mark) - - - @linkend on footnoteref must point to a footnote. - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A cross reference to another part of the document - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A hypertext link - - - - - - -
    -
    - - - - - - - - - Holds additional information that may be used by the applicatoin when resolving the link - - - - - Specifies the URI of the document in which the link target appears - - - - - - Specifies the location of the link target in the document - - - - - Identifies application-specific customization of the link behavior - - - - - - - - - - - - - - - - - - - - - - - - - - - - A link that addresses its target indirectly - - - - - - -
    -
    - - - - - - - - - - - - - - A spot in the document - - - - -
    -
    - - - - - - - - - - - - - - A text-only annotation, often used for accessibility - - - - - - - - - -
    - - - Identifies the editorial or publication status of the element on which it occurs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A collection of books - - - The root element must have a version attribute. - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A book - - - The root element must have a version attribute. - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - The dedication of a book or other component - - - The root element must have a version attribute. - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - Acknowledgements of a book or other component - - - The root element must have a version attribute. - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - Text at the back of a book describing facts about its production - - - The root element must have a version attribute. - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - An appendix in a Book or Article - - - The root element must have a version attribute. - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A chapter, as of a book - - - The root element must have a version attribute. - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A division in a book - - - The root element must have a version attribute. - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - Introductory matter preceding the first chapter of a book - - - The root element must have a version attribute. - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - An introduction to the contents of a part - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A recursive section - - - The root element must have a version attribute. - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A section of a document with no subdivisions - - - - - - - -
    - - - -
    - - - - - - faq - A collection of frequently asked questions. - journalarticle - An article in a journal or other periodical. - productsheet - A description of a product. - specification - A specification. - techreport - A technical report. - whitepaper - A white paper. - - - - - Identifies the nature of the article - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An article - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - Identifies one or more annotations that apply to this element - - -
    - - - - - - Identifies one ore more elements to which this annotation applies - - - - - - - - - - - - - - - - - - - An annotation - - - annotation must not occur in the descendants of annotation - - - - - - - - - -
    - - - - Specifies the XLink traversal-from - - - - - - - - Specifies the XLink label - - - - - - - - Specifies the XLink traversal-to - - - - -
    - - - - - - - - - - - - Identifies the XLink link type - extended - An XLink extended link - - - - - - - - - - - - - An XLink extended link - - - - - - - - - -
    -
    - - - - - - - - - - - - Identifies the XLink link type - locator - An XLink locator link - - - - - - - - - - - - - - - - - An XLink locator in an extendedlink - - - - -
    -
    - - - - - - - - - - - - Identifies the XLink link type - arc - An XLink arc link - - - - - - - - - - - - - - - - - - - - - - - - - An XLink arc in an extendedlink - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A top-level section of document - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection within a Sect1 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection within a Sect2 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection within a Sect3 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection within a Sect4 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - A collection of reference entries - - - The root element must have a version attribute. - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - A reference page (originally a UNIX man-style reference page) - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Meta-information for a reference entry - - - - - - - - - - - - - - - - -
    - - - source - The name of the software product or component to which this topic applies - version - The version of the software product or component to which this topic applies - manual - The section title of the reference page (e.g., User Commands) - sectdesc - The section title of the reference page (believed synonymous with "manual" but in wide use) - software - The name of the software product or component to which this topic applies (e.g., SunOS x.y; believed synonymous with "source" but in wide use) - - - - - - Identifies the kind of miscellaneous information - - - - - - - Identifies the nature of non-standard miscellaneous information - - - - - - Identifies the kind of miscellaneious information - other - Indicates that the information is some 'other' kind. - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - Meta-information for a reference entry other than the title and volume number - - - - -
    -
    - - - - - - - - - - - - - - - The name, purpose, and classification of a reference page - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A description of the topic of a reference page - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of (one of) the subject(s) of a reference page - - - - - - -
    -
    - - - - - - - - - - - - - - - A short (one sentence) synopsis of the topic of a reference page - - - - - - -
    -
    - - - - - - - - - - - - - - - The scope or other indication of applicability of a reference entry - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A syntactic synopsis of the subject of the reference page - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - A recursive section in a refentry - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A major subsection of a reference entry - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection of a refsect1 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection of a refsect2 - - - The root element must have a version attribute. - - - - - - - - - -
    - - - - - - - - - - Specifies the base form of the term, the one that appears in the glossary. This allows adjectival, plural, and other variations of the term to appear in the element. The element content is the default base form. - - - -
    - - - - - - - - - - - - - - - - - - A wrapper for a list of glossary entries - - - - - - - - - - - - -
    -
    - - - - - - Specifies the string by which the element's content is to be sorted; if unspecified, the content is used - - - - - - - - - - - - - - - - - An entry in a Glossary or GlossList - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - Specifies a list of keywords for the definition - - - - - - - - - - - - - - - - - A definition in a GlossEntry - - - - - - - - - -
    -
    - - - - - - Identifies the other term - - - - - - - - - - - - - - - - - - A cross-reference from one glossentry - to another - - - @otherterm on glosssee must point to a glossentry. - - - - - - - - -
    -
    - - - - - - Identifies the other term - - - - - - - - - - - - - - - - - - A cross-reference from one GlossEntry to another - - - @otherterm on glossseealso must point to a glossentry. - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - The first occurrence of a term - - - @linkend on firstterm must point to a glossentry. - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - A glossary term - - - @linkend on glossterm must point to a glossentry. - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A glossary - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A division in a Glossary - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - An inline definition of a term - - - A termdef must contain exactly one firstterm - - - - - - - - -
    - - - Identifies the relationship between the bibliographic elemnts - - -
    - - - - - - - - - - - - - - - An entry in a Bibliography - - - - - - -
    -
    - - - - - - - - - - - - - - - An entry in a Bibliography - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A raw container for related bibliographic information - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A cooked container for related bibliographic information - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Untyped bibliographic information - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A bibliography - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A section of a Bibliography - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for a list of bibliography entries - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - The units (for example, pages) used to identify the beginning and ending of a reference. - - - - - - Identifies the beginning of a reference; the location within the work that is being referenced. - - - - - - Identifies the end of a reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A cross-reference to a bibliographic entry - - - - -
    - - - normal - Normal - preferred - Preferred - - - - - Specifies the significance of the term - - - - - - Specifies the IDs of the elements to which this term applies - - - - - - Indicates the page on which this index term occurs in some version of the printed document - - - - - all - All indexes - global - The global index (as for a combined index of a set of box) - local - The local index (the index for this document only) - - - - - Specifies the scope of the index term - - - - - - Specifies the string by which the term is to be sorted; if unspecified, the term content is used - - - - - Specifies the target index for this term - - -
    - - - - - - - - - - - - - - - A set of index terms in the meta-information of a document - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - Identifies the class of index term - singular - A singular index term - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A wrapper for an indexed term - - - - -
    -
    - - - - - - Identifies the class of index term - startofrange - The start of a range - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A wrapper for an indexed term that covers a range - - - - -
    -
    - - - - - - Identifies the class of index term - endofrange - The end of a range - - - - - Points to the start of the range - - - - - - - - - - - - - - - - - Identifies the end of a range associated with an indexed term - - - - -
    -
    - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - The primary word or phrase under which an index term should be sorted - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A secondary word or phrase in an index term - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A tertiary word or phrase in an index term - - - - - - -
    -
    - - - - - - - - - - - - - - - Part of an index term directing the reader instead to another entry in the index - - - - - - -
    -
    - - - - - - - - - - - - - - - Part of an index term directing the reader also to another entry in the index - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An index to a book or part of a book - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An index to a set of books - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A division in an index - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An entry in an index - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A primary term in an index entry, not in the text - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A secondary term in an index entry, rather than in the text - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A tertiary term in an index entry, rather than in the text - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A See -entry in an index, rather than in the text - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A See also - entry in an index, rather than in the text - - - - - - -
    - - - Indicates the page on which this element occurs in some version of the printed document - - -
    - - - - - - - - - - - - - - - - - - A table of contents - - - The root element must have a version attribute. - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - A division in a table of contents - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - A component title in a table of contents - - - - - - -
    - - - -
    - - - - - - - - - - - - - - - A task to be completed - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A summary of a task - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - The prerequisites for a task - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - Information related to a task - - - - - - - -
    - - - calspair - Coordinates expressed as a pair of CALS graphic coordinates. - linecolumn - Coordinates expressed as a line and column. - linecolumnpair - Coordinates expressed as a pair of lines and columns. - linerange - Coordinates expressed as a line range. - - - - - - Identifies the units used in the coords attribute The default units vary according to the type of callout specified: calspair - for graphics and linecolumn - for line-oriented elements. - - - - - - - - Indicates that non-standard units are used for this area -. In this case otherunits - must be specified. - other - Coordinates expressed in some non-standard units. - - - - Identifies the units used in the coords - attribute when the units - attribute is other -. This attribute is forbidden otherwise. - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - A list of callout -s - - - - - - - - - - -
    -
    - - - - - - Identifies the areas described by this callout. - - - - - - - - - - - - - - - A called out - description of a marked Area - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A program listing with associated areas used in callouts - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - A collection of regions in a graphic or code example - - - - - - - - - -
    -
    - - - - - - Point to the callout -s which refer to this area. (This provides bidirectional linking which may be useful in online presentation.) - - - - - - Specifies an identifying number or string that may be used in presentation. The area label might be drawn on top of the figure, for example, at the position indicated by the coords attribute. - - - - - Provides the coordinates of the area. The coordinates must be interpreted using the units - specified. - - - - - - - - - - - - - - - - - - - - - - - - A region defined for a Callout in a graphic or code example - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - A region defined for a Callout in a graphic or code example - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A set of related areas in a graphic or code example - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A screen with associated areas used in callouts - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for an image object with callouts - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - The location of a callout embedded in text - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A cross reference to a co - - - - -
    -
    - - - - - - - - - - - - - - - - - - A set of EBNF productions - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A production in a set of EBNF productions - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The left-hand side of an EBNF production - - - - -
    -
    - - - - - - - - - - - - - - - The right-hand side of an EBNF production - - - - - - - - - - - -
    -
    - - - - - - Specifies a URI that points to a production -where the nonterminal - is defined - - - - - - - - - - - - - - - - A non-terminal in an EBNF production - - - - -
    -
    - - - - - - - - - - - - - - - A constraint in an EBNF production - - - - -
    -
    - - - - - - - - - - - - - - - A cross-reference to an EBNF production - - - - -
    -
    - - - - - - - - - - - - - - - - - - The definition of a constraint in an EBNF production - - - - - - - -
    - - - Specifies the alignment character when align - is set to char -. - - - - - Specifies the percentage of the column's total width that should appear to the left of the first occurance of the character identified in char - when align - is set to char -. - - 0 - 100 - - - - - - Specifies how the table is to be framed. Note that there is no way to obtain a border on only the starting edge (left, in left-to-right writing systems) of the table. - - all - Frame all four sides of the table. In some environments with limited control over table border formatting, such as HTML, this may imply additional borders. - bottom - Frame only the bottom of the table. - none - Place no border on the table. In some environments with limited control over table border formatting, such as HTML, this may disable other borders as well. - sides - Frame the left and right sides of the table. - top - Frame the top of the table. - topbot - Frame the top and bottom of the table. - - - - - - Specifies the presence or absence of the column separator - - 0 - No column separator rule. - 1 - Provide a column separator rule on the right - - - - - - Specifies the presence or absence of the row separator - - 0 - No row separator rule. - 1 - Provide a row separator rule below - - - - - - Specifies the orientation of the table - - land - 90 degrees counter-clockwise from the rest of the text flow. - port - The same orientation as the rest of the text flow. - - - - - - Specifies the table style - - - - - Indicates whether or not the entries in the first column should be considered row headers - - firstcol - Indicates that entries in the first column of the table are functionally row headers (analogous to the way that a thead provides column headers). - norowheader - Indicates that entries in the first column have no special significance with respect to column headers. - - - - - - Specifies the horizontal alignment of text in an entry. - - center - Centered. - char - Aligned on a particular character. - justify - Left and right justified. - left - Left justified. - right - Right justified. - - - - - - Specifies the vertical alignment of text in an entry. - - bottom - Aligned on the bottom of the entry. - middle - Aligned in the middle. - top - Aligned at the top of the entry. - - - - - - Specifies a column specification by name. - - - - - Specifies a starting column by name. - - - - - Specifies a span by name. - - - - - - Specifies a starting column by name. - - - Specifies an ending column by name. - - - - - - - - - - - - - - Provides a name for a column specification. - - - - - Provides a name for a span specification. - - -
    - - - - - - Additional style information for downstream processing; typically the name of a style. - - - - - The number of columns in the table. Must be an integer greater than zero. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A wrapper for the main content of a table, or part of a table - - - - - - - - - - - - - - - - -
    -
    - - - - - - The number of the column to which this specification applies. Must be greater than any preceding column number. Defaults to one more than the number of the preceding column, if there is one, or one. - - - - - - Specifies the width of the column. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specifications for a column in a table - - - - -
    -
    - - - - - - Specifies a starting column by name. - - - - - Specifies an ending column by name. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Formatting information for a spanned column in a table - - - - -
    -
    - - - - - - - - - - - - - - - - - - A table header consisting of one or more rows - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A table footer consisting of one or more rows - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for the rows of a table or informal table - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A row in a table - - - - - - - - - -
    -
    - - - - - - Specifies the number of additional rows which this entry occupies. Defaults to zero. - - - - - - Specifies the rotation of this entry. A value of 1 (true) rotates the cell 90 degrees counter-clockwise. A value of 0 (false) leaves the cell unrotated. - - 0 - Do not rotate the cell. - 1 - Rotate the cell 90 degrees counter-clockwise. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A cell in a table - - - - - - - - - - - -
    -
    - - - - - - Additional style information for downstream processing; typically the name of a style. - - - - - The number of columns in the entry table. Must be an integer greater than zero. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A subtable appearing in place of an Entry in a table - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A table header consisting of one or more rows - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for the rows of a table or informal table - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A row in a table - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Indicates if the short or long title should be used in a List of Tables - - 0 - Indicates that the full title should be used. - 1 - Indicates that the short short title (titleabbrev) should be used. - - - - - - Indicates if the table should appear in a List of Tables - - 0 - Indicates that the table should not occur in the List of Tables. - 1 - Indicates that the table should appear in the List of Tables. - - - - - - - - - - - - - - A formal table in a document - - - example must not occur in the descendants of table - - - - - figure must not occur in the descendants of table - - - - - equation must not occur in the descendants of table - - - - - informaltable must not occur in the descendants of table - - - - - caution must not occur in the descendants of table - - - - - important must not occur in the descendants of table - - - - - note must not occur in the descendants of table - - - - - tip must not occur in the descendants of table - - - - - warning must not occur in the descendants of table - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A table without a title - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - This attribute assigns a class name or set of class names to an element. Any number of elements may be assigned the same class name or names. Multiple class names must be separated by white space characters. - - - - - This attribute specifies style information for the current element. - - - - - This attribute offers advisory information about the element for which it is set. - - - - - - - - This attribute specifies the base language of an element's attribute values and text content. The default value of this attribute is unknown. - - - - - - - - Occurs when the pointing device button is clicked over an element. - - - - - Occurs when the pointing device button is double clicked over an element. - - - - - Occurs when the pointing device button is pressed over an element. - - - - - Occurs when the pointing device button is released over an element. - - - - - Occurs when the pointing device is moved onto an element. - - - - - Occurs when the pointing device is moved while it is over an element. - - - - - Occurs when the pointing device is moved away from an element. - - - - - Occurs when a key is pressed and released over an element. - - - - - Occurs when a key is pressed down over an element. - - - - - Occurs when a key is released over an element. - - - - - - - - - - - - - - - - - Specifies the alignment of data and the justification of text in a cell. - - left - Left-flush data/Left-justify text. This is the default value for table data. - center - Center data/Center-justify text. This is the default value for table headers. - right - Right-flush data/Right-justify text. - justify - Double-justify text. - char - Align text around a specific character. If a user agent doesn't support character alignment, behavior in the presence of this value is unspecified. - - - - - - This attribute specifies a single character within a text fragment to act as an axis for alignment. The default value for this attribute is the decimal point character for the current language as set by the lang attribute (e.g., the period in English and the comma in French). User agents are not required to support this attribute. - - - - - When present, this attribute specifies the offset to the first occurrence of the alignment character on each line. If a line doesn't include the alignment character, it should be horizontally shifted to end at the alignment position. When charoff is used to set the offset of an alignment character, the direction of offset is determined by the current text direction (set by the dir attribute). In left-to-right texts (the default), offset is from the left margin. In right-to-left texts, offset is from the right margin. User agents are not required to support this attribute. - - - - [0-9]+% - - - - - - - - - - Specifies the vertical position of data within a cell. - - top - Cell data is flush with the top of the cell. - middle - Cell data is centered vertically within the cell. This is the default value. - bottom - Cell data is flush with the bottom of the cell. - baseline - All cells in the same row as a cell whose valign attribute has this value should have their textual data positioned so that the first text line occurs on a baseline common to all cells in the row. This constraint does not apply to subsequent text lines in these cells. - - - - - - - - - Provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille. - - - - - Specifies the desired width of the entire table and is intended for visual user agents. When the value is a percentage value, the value is relative to the user agent's available horizontal space. In the absence of any width specification, table width is determined by the user agent. - - - - [0-9]+% - - - - - - - Specifies the width (in pixels only) of the frame around a table. - - - - - - Specifies which sides of the frame surrounding a table will be visible. - - void - No sides. This is the default value. - above - The top side only. - below - The bottom side only. - hsides - The top and bottom sides only. - lhs - The left-hand side only. - rhs - The right-hand side only. - vsides - The right and left sides only. - box - All four sides. - border - All four sides. - - - - - - Specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. - - none - No rules. This is the default value. - groups - Rules will appear between row groups (see thead, tfoot, and tbody) and column groups (see colgroup and col) only. - rows - Rules will appear between rows only. - cols - Rules will appear between columns only. - all - Rules will appear between all rows and columns. - - - - - - Specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells. - - - - [0-9]+% - - - - - - - Specifies the amount of space between the border of the cell and its contents. If the value of this attribute is a pixel length, all four margins should be this distance from the contents. If the value of the attribute is a percentage length, the top and bottom margins should be equally separated from the content based on a percentage of the available vertical space, and the left and right margins should be equally separated from the content based on a percentage of the available horizontal space. - - - - [0-9]+% - - - - - - - - - - - Provides an abbreviated form of the cell's content and may be rendered by user agents when appropriate in place of the cell's content. Abbreviated names should be short since user agents may render them repeatedly. For instance, speech synthesizers may render the abbreviated headers relating to a particular cell before rendering that cell's content. - - - - - This attribute may be used to place a cell into conceptual categories that can be considered to form axes in an n-dimensional space. User agents may give users access to these categories (e.g., the user may query the user agent for all cells that belong to certain categories, the user agent may present a table in the form of a table of contents, etc.). Please consult an HTML reference for more details. - - - - - Specifies the list of header cells that provide header information for the current data cell. The value of this attribute is a space-separated list of cell names; those cells must be named by setting their id attribute. Authors generally use the headers attribute to help non-visual user agents render header information about data cells (e.g., header information is spoken prior to the cell data), but the attribute may also be used in conjunction with style sheets. - - - - - Specifies the set of data cells for which the current header cell provides header information. This attribute may be used in place of the headers attribute, particularly for simple tables. - - row - The current cell provides header information for the rest of the row that contains it - col - The current cell provides header information for the rest of the column that contains it. - rowgroup - The header cell provides header information for the rest of the row group that contains it. - colgroup - The header cell provides header information for the rest of the column group that contains it. - - - - - - Specifies the number of rows spanned by the current cell. The default value of this attribute is one (1 -). The value zero (0 -) means that the cell spans all rows from the current row to the last row of the table section (thead -, tbody -, or tfoot -) in which the cell is defined. - - - - - - Specifies the number of columns spanned by the current cell. The default value of this attribute is one (1 -). The value zero (0 -) means that the cell spans all columns from the current column to the last column of the column group (colgroup -) in which the cell is defined. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A formal (captioned) HTML table in a document - - - example must not occur in the descendants of table - - - - - figure must not occur in the descendants of table - - - - - equation must not occur in the descendants of table - - - - - informaltable must not occur in the descendants of table - - - - - caution must not occur in the descendants of table - - - - - important must not occur in the descendants of table - - - - - note must not occur in the descendants of table - - - - - tip must not occur in the descendants of table - - - - - warning must not occur in the descendants of table - - - - - - -
    -
    - - - - - - - - - An HTML table without a title - - - - -
    -
    - - - - - - An HTML table caption - - - example must not occur in the descendants of caption - - - - - figure must not occur in the descendants of caption - - - - - table must not occur in the descendants of caption - - - - - equation must not occur in the descendants of caption - - - - - sidebar must not occur in the descendants of caption - - - - - task must not occur in the descendants of caption - - - - - caution must not occur in the descendants of caption - - - - - important must not occur in the descendants of caption - - - - - note must not occur in the descendants of caption - - - - - tip must not occur in the descendants of caption - - - - - warning must not occur in the descendants of caption - - - - - - - - -
    -
    - - - - - - This attribute, whose value must be an integer > 0, specifies the number of columns spanned - by the col - element; the col - element shares its attributes with all the columns it spans. The default value for this attribute is 1 (i.e., a single column). If the span attribute is set to N > 1, the current col - element shares its attributes with the next N-1 columns. - - - - - - Specifies a default width for each column spanned by the current col - element. It has the same meaning as the width - attribute for the colgroup - element and overrides it. - - - - - - - - - Specifications for a column in an HTML table - - - - -
    -
    - - - - - - This attribute, which must be an integer > 0, specifies the number of columns in a column group. In the absence of a span attribute, each colgroup - defines a column group containing one column. If the span attribute is set to N > 0, the current colgroup - element defines a column group containing N columns. User agents must ignore this attribute if the colgroup - element contains one or more col - elements. - - - - - - This attribute specifies a default width for each column in the current column group. In addition to the standard pixel, percentage, and relative values, this attribute allows the special form 0* - (zero asterisk) which means that the width of the each column in the group should be the minimum width necessary to hold the column's contents. This implies that a column's entire contents must be known before its width may be correctly computed. Authors should be aware that specifying 0* - will prevent visual user agents from rendering a table incrementally. This attribute is overridden for any column in the column group whose width is specified via a col - element. - - - - - - - - - A group of columns in an HTML table - - - - - - -
    -
    - - - - - - - - - - A table header consisting of one or more rows in an HTML table - - - - - - -
    -
    - - - - - - - - - - A table footer consisting of one or more rows in an HTML table - - - - - - -
    -
    - - - - - - - - - - A wrapper for the rows of an HTML table or informal HTML table - - - - - - -
    -
    - - - - - - - - - - A row in an HTML table - - - - - - - - - -
    -
    - - - - - - - - - - - A table header entry in an HTML table - - - - - - - - - - - -
    -
    - - - - - - - - - - - A table entry in an HTML table - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A detailed set of messages, usually error messages - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A wrapper for an entry in a message set - - - - - - - - - - - - -
    -
    - - - - - - The audience to which the message relevant - - - - - The origin of the message - - - - - The level of importance or severity of a message - - - - - - - - - - - - - - - - - - - - - - - A wrapper for a simpler entry in a message set - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A message in a message set - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - The primary component of a message in a message set - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A subcomponent of a message in a message set - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A related component of a message in a message set - - - - - -
    -
    - - - - - - - - - - - - - - - The actual text of a message component in a message set - - - - - - -
    -
    - - - - - - - - - - - - - - - Information about a message in a message set - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The level of importance or severity of a message in a message set - - - - -
    -
    - - - - - - - - - - - - - - - The origin of a message in a message set - - - - -
    -
    - - - - - - - - - - - - - - - The audience to which a message in a message set is relevant - - - - -
    -
    - - - - - - - - - - - - - - - - - - Explanatory material relating to a message in a message set - - - - - - - -
    -
    - - - - - - none - No labels - number - Numeric labels - qanda - "Q:" and "A:" labels - - - - - Specifies the default labelling - - - - - - - - - - - - - - - - - - - - - A question-and-answer set - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A titled division in a QandASet - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A question/answer set within a QandASet - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A question in a QandASet - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An answer to a question posed in a QandASet - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A label on a Question or Answer - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A displayed mathematical equation - - - example must not occur in the descendants of equation - - - - - figure must not occur in the descendants of equation - - - - - table must not occur in the descendants of equation - - - - - equation must not occur in the descendants of equation - - - - - caution must not occur in the descendants of equation - - - - - important must not occur in the descendants of equation - - - - - note must not occur in the descendants of equation - - - - - tip must not occur in the descendants of equation - - - - - warning must not occur in the descendants of equation - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A displayed mathematical equation without a title - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A mathematical equation or expression occurring inline - - - - - - - -
    -
    - - - - - - - - - - - - - - - A mathematical phrase, an expression that can be represented with ordinary text and a small amount of markup - - - - - - - - - - -
    -
    - - - - - - - - - - - - Specifies that the format of the data is MathML - mathml - Specifies MathML. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A MathML expression in a media object - - - - - - - -
    -
    - - - Any element from the MathML namespace - - - - - - - - - - -
    -
    - - - - - - - - - - - - Specifies that the format of the data is SVG - svg - Specifies SVG. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An SVG drawing in a media object - - - - - - - -
    -
    - - - Any element from the SVG namespace - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - A string of formatting markup in text that is to be represented literally - - - - -
    -
    - - - - - - attribute - An attribute - attvalue - An attribute value - element - An element - emptytag - An empty element tag - endtag - An end tag - genentity - A general entity - localname - The local name part of a qualified name - namespace - A namespace - numcharref - A numeric character reference - paramentity - A parameter entity - pi - A processing instruction - prefix - The prefix part of a qualified name - comment - An SGML comment - starttag - A start tag - xmlpi - An XML processing instruction - - - - - Identifies the nature of the tag content - - - - - - Identifies the namespace of the tag content - - - - - - - - - - - - - - - - - - - - - A component of XML (or SGML) markup - - - - -
    -
    - - - Identifies the class of symbol - limit - The value is a limit of some kind - - - - - - - - - - - - - - - - - - - - A name that is replaced by a value before processing - - - - -
    -
    - - - - - - - - - - - - - - - A unit of information - - - - -
    -
    - - - - - - - - - - - - - - - Inline text that is some literal value - - - - -
    -
    - - - Identifies the (computer) language of the code fragment - - - - - - - - - - - - - - - - - - - - An inline code fragment - - - - - - - - - -
    -
    - - - Identifies the class of constant - limit - The value is a limit of some kind - - - - - - - - - - - - - - - - - - - - A programming or system constant - - - - -
    -
    - - - - - - copyright - A name with a copyright - registered - A name with a registered copyright - service - A name of a service - trade - A name which is trademarked - - - - - Specifies the class of product name - - - - - - - - - - - - - - - - - - The formal name of a product - - - - -
    -
    - - - - - - - - - - - - - - - A number assigned to a product - - - - -
    -
    - - - altkey - An alternate or secondary key - constraint - A constraint - datatype - A data type - field - A field - foreignkey - A foreign key - group - A group - index - An index - key1 - The first or primary key - key2 - An alternate or secondary key - name - A name - primarykey - The primary key - procedure - A (stored) procedure - record - A record - rule - A rule - secondarykey - The secondary key - table - A table - user - A user - view - A view - - - - - Identifies the class of database artifact - - - - - - - - - - - - - - - - - - - - - The name of a database, or part of a database - - - - -
    -
    - - - hardware - A hardware application - software - A software application - - - - - Identifies the class of application - - - - - - - - - - - - - - - - - - - - - The name of a software program - - - - -
    -
    - - - - - - - - - - - - - - - A physical part of a computer system - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - The text on a button in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Graphic and/or text appearing as a icon in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The text of a label in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a menu in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a terminal menu item in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a submenu in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A selection or series of selections from a menu - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The conventional name of a mouse button - - - - -
    - - - - - - - - - - -
    - - - alt - The "Alt" key - backspace - The "Backspace" key - command - The "Command" key - control - The "Control" key - delete - The "Delete" key - down - The down arrow - end - The "End" key - enter - The "Enter" or "Return" key - escape - The "Escape" key - home - The "Home" key - insert - The "Insert" key - left - The left arrow - meta - The "Meta" key - option - The "Option" key - pagedown - The page down key - pageup - The page up key - right - The right arrow - shift - The "Shift" key - space - The spacebar - tab - The "Tab" key - up - The up arrow - - - - - - Identifies the function key - - - - - - - - Identifies the function key - other - Indicates a non-standard function key - - - - Specifies a keyword that identifies the non-standard key - - - - - - - - - - - - - - - - - - - - - - - - The text printed on a key on a keyboard - - - - -
    -
    - - - - - - - - - - - - - - - The internal, frequently numeric, identifier for a key on a keyboard - - - - -
    - - - - - - - - - - -
    - - - click - A (single) mouse click. - double-click - A double mouse click. - press - A mouse or key press. - seq - Sequential clicks or presses. - simul - Simultaneous clicks or presses. - - - - - - Identifies the nature of the action taken. If keycombo - contains more than one element, simul - is the default, otherwise there is no default. - - - - - - - - Identifies the nature of the action taken - other - Indicates a non-standard action - - - - Identifies the non-standard action in some unspecified way. - - - - - - - - - - - - - - - - - - - - - - - - A combination of input actions - - - - - - -
    -
    - - - - - - - - - - - - - - - The symbolic name of a key on a keyboard - - - - -
    -
    - - - - - - - - - - - - - - - A graphical user interface (GUI) keyboard shortcut - - - - -
    -
    - - - - - - - - - - - - - - - - - - - A key combination for an action that is also accessible through a menu - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - A character or string indicating the start of an input field in a computer display - - - - - - -
    -
    - - - - - - - - - - - - - - - A software environment variable - - - - -
    -
    - - - devicefile - A device - directory - A directory - extension - A filename extension - headerfile - A header file (as for a programming language) - libraryfile - A library file - partition - A partition (as of a hard disk) - symlink - A symbolic link - - - - - Identifies the class of filename - - - - - - Specifies the path of the filename - - - - - - - - - - - - - - - - - - - - - - - The name of a file - - - - -
    -
    - - - - - - - - - - - - - - - The name of an executable program or other software command - - - - -
    -
    - - - - - - - - - - - - - - - Data, generally text, displayed or presented by a computer - - - - - - -
    -
    - - - - - - - - - - - - - - - Data entered by the user - - - - - - -
    -
    - - - - - - Specifies the character that should separate the command and its top-level arguments - - - - - Indicates the displayed length of the command; this information may be used to intelligently indent command synopses which extend beyond one line - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A syntax summary for a software command - - - - - - - - - - - - - - - -
    - - - norepeat - Can not be repeated. - repeat - Can be repeated. - - - - - Indicates whether or not repetition is possible. - - - - - - opt - Formatted to indicate that it is optional. - plain - Formatted without indication. - req - Formatted to indicate that it is required. - - - - - Indicates optionality. - - - - - - Indicates optionality. - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - An argument in a CmdSynopsis - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A group of elements in a CmdSynopsis - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - An explicit line break in a command synopsis - - - - -
    -
    - - - - - - - - - - - - - - - A portion of a CmdSynopsis broken out from the main body of the synopsis - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A reference to a fragment of a command synopsis - - - @linkend on synopfragmentref must point to a synopfragment. - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - A general-purpose element for representing the syntax of commands or functions - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - The syntax summary for a function definition - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - Information supplementing the FuncDefs of a FuncSynopsis - - - - -
    -
    - - - - - - - - - - - - - - - The prototype of a function - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A function (subroutine) name and its return type - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a function or subroutine, as in a programming language - - - - -
    -
    - - - - - - - - - - - - - - - An empty element in a function synopsis indicating that the function in question takes no arguments - - - - -
    -
    - - - - - - - - - - - - - - - An empty element in a function synopsis indicating a variable number of arguments - - - - -
    -
    - - - - - - opt - Formatted to indicate that it is optional. - req - Formatted to indicate that it is required. - - - - - Indicates optionality. - - - - - - - - - - - - - - - - - - Information about a function parameter in a programming language - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Parameters for a function referenced through a function pointer in a synopsis - - - - -
    -
    - - - - - - class - This is the synopsis of a class - interface - This is the synopsis of an interface - - - - - Specifies the nature of the synopsis - - - - - - - - - - - - - - - - - - - - - The syntax summary for a class definition - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - Information supplementing the contents of a ClassSynopsis - - - - -
    -
    - - - - - - - - - - - - - - - A class in an object-oriented programming language - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An interface in an object-oriented programming language - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An exception in an object-oriented programming language - - - - - - - - - - -
    - - - Can be used to indicate that whitespace in the modifier should be preserved (for multi-line annotations, for example). - preserve - Extra whitespace and line breaks must be preserved. - - - -
    - - - - - - - - - - - - - - - - - - Modifiers in a synopsis - - - - -
    -
    - - - - - - - - - - - - - - - The name of an interface - - - - -
    -
    - - - - - - - - - - - - - - - The name of an exception - - - - -
    -
    - - - - - - - - - - - - - - - - - - The name of a field in a class definition - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The initializer for a FieldSynopsis - - - - -
    -
    - - - - - - - - - - - - - - - - - - A syntax summary for a constructor - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A syntax summary for a destructor - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A syntax summary for a method - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a method - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - Parameters to a method - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a variable - - - - -
    -
    - - - - - - - - - - - - - - - The value returned by a function - - - - -
    -
    - - - - - - - - - - - - - - - The classification of a value - - - - -
    -
    - - - - - - - - - - - - - - - The name of a class, in the object-oriented programming sense - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - A literal listing of all or part of a program - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - A note of caution - - - caution must not occur in the descendants of caution - - - - - important must not occur in the descendants of caution - - - - - note must not occur in the descendants of caution - - - - - tip must not occur in the descendants of caution - - - - - warning must not occur in the descendants of caution - - - - - - -
    -
    - - - - - - - - - - - - - - - An admonition set off from the text - - - caution must not occur in the descendants of important - - - - - important must not occur in the descendants of important - - - - - note must not occur in the descendants of important - - - - - tip must not occur in the descendants of important - - - - - warning must not occur in the descendants of important - - - - - - -
    -
    - - - - - - - - - - - - - - - A message set off from the text - - - caution must not occur in the descendants of note - - - - - important must not occur in the descendants of note - - - - - note must not occur in the descendants of note - - - - - tip must not occur in the descendants of note - - - - - warning must not occur in the descendants of note - - - - - - -
    -
    - - - - - - - - - - - - - - - A suggestion to the user, set off from the text - - - caution must not occur in the descendants of tip - - - - - important must not occur in the descendants of tip - - - - - note must not occur in the descendants of tip - - - - - tip must not occur in the descendants of tip - - - - - warning must not occur in the descendants of tip - - - - - - -
    -
    - - - - - - - - - - - - - - - An admonition set off from the text - - - caution must not occur in the descendants of warning - - - - - important must not occur in the descendants of warning - - - - - note must not occur in the descendants of warning - - - - - tip must not occur in the descendants of warning - - - - - warning must not occur in the descendants of warning - - - - - - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - An error code - - - - -
    -
    - - - - - - - - - - - - - - - An error name - - - - -
    -
    - - - - - - - - - - - - - - - An error message. - - - - -
    -
    - - - - - - - - - - - - - - - The classification of an error message - - - - -
    - - - - - - -
    - - - daemon - A daemon or other system process (syslogd) - domainname - A domain name (example.com) - etheraddress - An ethernet address (00:05:4E:49:FD:8E) - event - An event of some sort (SIGHUP) - eventhandler - An event handler of some sort (hangup) - filesystem - A filesystem (ext3) - fqdomainname - A fully qualified domain name (my.example.com) - groupname - A group name (wheel) - ipaddress - An IP address (127.0.0.1) - library - A library (libncurses) - macro - A macro - netmask - A netmask (255.255.255.192) - newsgroup - A newsgroup (comp.text.xml) - osname - An operating system name (Hurd) - process - A process (gnome-cups-icon) - protocol - A protocol (ftp) - resource - A resource - server - A server (mail.example.com) - service - A service (ppp) - systemname - A system name (hephaistos) - username - A user name (ndw) - - - - - Identifies the nature of the system item - - - - - - - - - - - - - - - - - - - - - A system-related item or term - - - - - - -
    -
    - - - - - - - - - - - - - - - An option for a software command - - - - -
    -
    - - - - - - - - - - - - - - - Optional information - - - - -
    -
    - - - - - - - - - - - - - - - A unit of data associated with some part of a computer system - - - - -
    -
    diff --git a/jonas_doc/core/tools/docbook-5.0/rng/docbookxi.rnc b/jonas_doc/core/tools/docbook-5.0/rng/docbookxi.rnc deleted file mode 100644 index 02c5fd947a494f2f99a20a182574f1a0f1461360..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/rng/docbookxi.rnc +++ /dev/null @@ -1,10666 +0,0 @@ -namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace ctrl = "http://nwalsh.com/xmlns/schema-control/" -default namespace db = "http://docbook.org/ns/docbook" -namespace html = "http://www.w3.org/1999/xhtml" -namespace mml = "http://www.w3.org/1998/Math/MathML" -namespace rng = "http://relaxng.org/ns/structure/1.0" -namespace s = "http://www.ascc.net/xml/schematron" -namespace svg = "http://www.w3.org/2000/svg" -namespace xi = "http://www.w3.org/2001/XInclude" -namespace xlink = "http://www.w3.org/1999/xlink" - -s:ns [ - prefix = "a" - uri = "http://relaxng.org/ns/compatibility/annotations/1.0" -] -s:ns [ prefix = "ctrl" uri = "http://nwalsh.com/xmlns/schema-control/" ] -s:ns [ prefix = "db" uri = "http://docbook.org/ns/docbook" ] -s:ns [ - prefix = "dbx" - uri = - "http://sourceforge.net/projects/docbook/defguide/schema/extra-markup" -] -s:ns [ prefix = "html" uri = "http://www.w3.org/1999/xhtml" ] -s:ns [ prefix = "mml" uri = "http://www.w3.org/1998/Math/MathML" ] -s:ns [ prefix = "rng" uri = "http://relaxng.org/ns/structure/1.0" ] -s:ns [ prefix = "s" uri = "http://www.ascc.net/xml/schematron" ] -s:ns [ prefix = "svg" uri = "http://www.w3.org/2000/svg" ] -s:ns [ prefix = "xi" uri = "http://www.w3.org/2001/XInclude" ] -s:ns [ prefix = "xlink" uri = "http://www.w3.org/1999/xlink" ] -# DocBook V5.0CR5 - -# See http://docbook.org/ns/docbook -start = - (db.set - | db.book - | db.divisions - | db.components - | db.navigation.components - | db.section - | db.para) - | (db.sect1 | db.sect2 | db.sect3 | db.sect4 | db.sect5) - | (db.refentry | db.refsection) - | (db.refsect1 | db.refsect2 | db.refsect3) - | db.setindex -div { - db._any.attribute = - - ## Any attribute including in any attribute in any namespace. - attribute * { text } - db._any = - - ## Any element from almost any namespace - element * - (db:* | html:*) { - (db._any.attribute | text | db._any)* - } -} -db.arch.attribute = - - ## Designates the computer or chip architecture to which the element applies - attribute arch { text } -db.audience.attribute = - - ## Designates the intended audience to which the element applies, for example, system administrators, programmers, or new users. - attribute audience { text } -db.condition.attribute = - - ## provides a standard place for application-specific effectivity - attribute condition { text } -db.conformance.attribute = - - ## Indicates standards conformance characteristics of the element - attribute conformance { text } -db.os.attribute = - - ## Indicates the operating system to which the element is applicable - attribute os { text } -db.revision.attribute = - - ## Indicates the editorial revision to which the element belongs - attribute revision { text } -db.security.attribute = - - ## Indicates something about the security level associated with the element to which it applies - attribute security { text } -db.userlevel.attribute = - - ## Indicates the level of user experience for which the element applies - attribute userlevel { text } -db.vendor.attribute = - - ## Indicates the computer vendor to which the element applies. - attribute vendor { text } -db.wordsize.attribute = - - ## Indicates the word size (width in bits) of the computer architecture to which the element applies - attribute wordsize { text } -db.effectivity.attributes = - db.arch.attribute? - & db.audience.attribute? - & db.condition.attribute? - & db.conformance.attribute? - & db.os.attribute? - & db.revision.attribute? - & db.security.attribute? - & db.userlevel.attribute? - & db.vendor.attribute? - & db.wordsize.attribute? -db.endterm.attribute = - - ## Points to the element whose content is to be used as the text of the link - attribute endterm { xsd:IDREF } -db.linkend.attribute = - - ## Points to an internal link target by identifying the value of its xml:id attribute - attribute linkend { xsd:IDREF } -db.linkends.attribute = - - ## Points to one or more internal link targets by identifying the value of their xml:id attributes - attribute linkends { xsd:IDREFS } -db.xlink.href.attribute = - - ## Identifies a link target with a URI - attribute xlink:href { xsd:anyURI } -db.xlink.type.attribute = - - ## Identifies the XLink link type - attribute xlink:type { - - ## An XLink simple link - "simple" - } -db.xlink.role.attribute = - - ## Identifies the XLink role of the link - attribute xlink:role { xsd:anyURI } -db.xlink.arcrole.attribute = - - ## Identifies the XLink arcrole of the link - attribute xlink:arcrole { xsd:anyURI } -db.xlink.title.attribute = - - ## Identifies the XLink title of the link - attribute xlink:title { text }? -db.xlink.show.enumeration = - - ## An application traversing to the ending resource should load it in a new window, frame, pane, or other relevant presentation context. - "new" - | - ## An application traversing to the ending resource should load the resource in the same window, frame, pane, or other relevant presentation context in which the starting resource was loaded. - "replace" - | - ## An application traversing to the ending resource should load its presentation in place of the presentation of the starting resource. - "embed" - | - ## The behavior of an application traversing to the ending resource is unconstrained by XLink. The application should look for other markup present in the link to determine the appropriate behavior. - "other" - | - ## The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior. - "none" -db.xlink.show.attribute = - - ## Identifies the XLink show behavior of the link - attribute xlink:show { db.xlink.show.enumeration } -db.xlink.actuate.enumeration = - - ## An application should traverse to the ending resource immediately on loading the starting resource. - "onLoad" - | - ## An application should traverse from the starting resource to the ending resource only on a post-loading event triggered for the purpose of traversal. - "onRequest" - | - ## The behavior of an application traversing to the ending resource is unconstrained by this specification. The application should look for other markup present in the link to determine the appropriate behavior. - "other" - | - ## The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior. - "none" -db.xlink.actuate.attribute = - - ## Identifies the XLink actuate behavior of the link - attribute xlink:actuate { db.xlink.actuate.enumeration } -db.href.attributes = - db.xlink.href.attribute - & db.xlink.type.attribute? - & db.xlink.role.attribute? - & db.xlink.arcrole.attribute? - & db.xlink.title.attribute? - & db.xlink.show.attribute? - & db.xlink.actuate.attribute? -db.xml.id.attribute = - - ## Identifies the unique ID value of the element - attribute xml:id { xsd:ID } -db.version.attribute = - - ## Specifies the DocBook version of the element and its descendants - attribute version { text } -db.xml.lang.attribute = - - ## Specifies the natural language of the element and its descendants - attribute xml:lang { text } -db.xml.base.attribute = - - ## Specifies the base URI of the element and its descendants - attribute xml:base { xsd:anyURI } -db.remap.attribute = - - ## Provides the name or similar semantic identifier assigned to the content in some previous markup scheme - attribute remap { text } -db.xreflabel.attribute = - - ## Provides the text that is to be generated for a cross reference to the element - attribute xreflabel { text } -db.xrefstyle.attribute = - - ## Specifies a keyword or keywords identifying additional style information - attribute xrefstyle { text } -db.revisionflag.enumeration = - - ## The element has been changed. - "changed" - | - ## The element is new (has been added to the document). - "added" - | - ## The element has been deleted. - "deleted" - | - ## Explicitly turns off revision markup for this element. - "off" -db.revisionflag.attribute = - - ## Identifies the revision status of the element - attribute revisionflag { db.revisionflag.enumeration } -db.dir.enumeration = - - ## Left-to-right text - "ltr" - | - ## Right-to-left text - "rtl" - | - ## Left-to-right override - "lro" - | - ## Right-to-left override - "rlo" -db.dir.attribute = - - ## Identifies the direction of text in an element - attribute dir { db.dir.enumeration } -db.common.base.attributes = - db.version.attribute? - & db.xml.lang.attribute? - & db.xml.base.attribute? - & db.remap.attribute? - & db.xreflabel.attribute? - & db.revisionflag.attribute? - & db.dir.attribute? - & db.effectivity.attributes -db.common.attributes = - db.xml.id.attribute? - & db.common.base.attributes - & db.annotations.attribute? -db.common.idreq.attributes = - db.xml.id.attribute - & db.common.base.attributes - & db.annotations.attribute? -db.common.linking.attributes = - (db.linkend.attribute | db.href.attributes)? -db.common.req.linking.attributes = - db.linkend.attribute | db.href.attributes -db.common.data.attributes = - - ## Specifies the format of the data - attribute format { text }?, - ( - ## Indentifies the location of the data by URI - attribute fileref { xsd:anyURI } - | - ## Identifies the location of the data by external identifier (entity name) - attribute entityref { xsd:ENTITY }) -db.verbatim.continuation.enumeration = - - ## Line numbering continues from the immediately preceding element with the same name. - "continues" - | - ## Line numbering restarts (begins at 1, usually). - "restarts" -db.verbatim.continuation.attribute = - - ## Determines whether line numbering continues from the previous element or restarts. - attribute continuation { db.verbatim.continuation.enumeration } -db.verbatim.linenumbering.enumeration = - - ## Lines are numbered. - "numbered" - | - ## Lines are not numbered. - "unnumbered" -db.verbatim.linenumbering.attribute = - - ## Determines whether lines are numbered. - attribute linenumbering { db.verbatim.linenumbering.enumeration } -db.verbatim.startinglinenumber.attribute = - - ## Specifies the initial line number. - attribute startinglinenumber { xsd:integer } -db.verbatim.language.attribute = - - ## Identifies the language (i.e. programming language) of the verbatim content. - attribute language { text } -db.verbatim.xml.space.attribute = - - ## Can be used to indicate explicitly that whitespace in the verbatim environment is preserved. Whitespace must always be preserved in verbatim environments whether this attribute is specified or not. - attribute xml:space { - - ## Whitespace must be preserved. - "preserve" - } -db.verbatim.attributes = - db.verbatim.continuation.attribute? - & db.verbatim.linenumbering.attribute? - & db.verbatim.startinglinenumber.attribute? - & db.verbatim.language.attribute? - & db.verbatim.xml.space.attribute? -db.label.attribute = - - ## Specifies an identifying string for presentation purposes - attribute label { text } -db.width.characters.attribute = - - ## Specifies the width (in characters) of the element - attribute width { xsd:nonNegativeInteger } -db.spacing.enumeration = - - ## The spacing should be "compact". - "compact" - | - ## The spacing should be "normal". - "normal" -db.spacing.attribute = - - ## Specifies (a hint about) the spacing of the content - attribute spacing { db.spacing.enumeration } -db.pgwide.enumeration = - - ## The element should be rendered in the current text flow (with the flow column width). - "0" - | - ## The element should be rendered across the full text page. - "1" -db.pgwide.attribute = - - ## Indicates if the element is rendered across the column or the page - attribute pgwide { db.pgwide.enumeration } -db.language.attribute = - - ## Identifies the language (i.e. programming language) of the content. - attribute language { text } -db.performance.enumeration = - - ## The content describes an optional step or steps. - "optional" - | - ## The content describes a required step or steps. - "required" -db.performance.attribute = - - ## Specifies if the content is required or optional. - attribute performance { db.performance.enumeration } -db.floatstyle.attribute = - - ## Specifies style information to be used when rendering the float - attribute floatstyle { text } -db.width.attribute = - - ## Specifies the width of the element - attribute width { text } -db.depth.attribute = - - ## Specifies the depth of the element - attribute depth { text } -db.contentwidth.attribute = - - ## Specifies the width of the content rectangle - attribute contentwidth { text } -db.contentdepth.attribute = - - ## Specifies the depth of the content rectangle - attribute contentdepth { text } -db.scalefit.enumeration = - - ## False (do not scale-to-fit; anamorphic scaling may occur) - "0" - | - ## True (scale-to-fit; anamorphic scaling is forbidden) - "1" -db.scale.attribute = - - ## Specifies the scaling factor - attribute scale { xsd:positiveInteger } -db.halign.enumeration = - - ## Centered horizontally - "center" - | - ## Aligned horizontally on the specified character - "char" - | - ## Fully justified (left and right margins or edges) - "justify" - | - ## Left aligned - "left" - | - ## Right aligned - "right" -db.valign.enumeration = - - ## Aligned on the bottom of the region - "bottom" - | - ## Centered vertically - "middle" - | - ## Aligned on the top of the region - "top" -db.biblio.class.enumeration = - - ## A document object identifier. - "doi" - | - ## An international standard book number. - "isbn" - | - ## An international standard technical report number (ISO 10444). - "isrn" - | - ## An international standard serial number. - "issn" - | - ## A Library of Congress reference number. - "libraryofcongress" - | - ## A publication number (an internal number or possibly organizational standard). - "pubsnumber" - | - ## A Uniform Resource Identifier - "uri" -db.biblio.class-enum.attribute = - - ## Identifies the kind of bibliographic identifier - attribute class { db.biblio.class.enumeration }? -db.biblio.class-other.attribute = - - ## Identifies the nature of the non-standard bibliographic identifier - attribute otherclass { xsd:NMTOKEN } -db.biblio.class-other.attributes = - - ## Identifies the kind of bibliographic identifier - attribute class { - - ## Indicates that the identifier is some 'other' kind. - "other" - } - & db.biblio.class-other.attribute -db.biblio.class.attribute = - db.biblio.class-enum.attribute | db.biblio.class-other.attributes -db.ubiq.inlines = - (db.inlinemediaobject - | db.remark - | db.superscript - | db.subscript - | db.link.inlines - | db.alt) - | db.annotation - | db.indexterm -db._text = (text | db.ubiq.inlines | db._phrase | db.replaceable)* -db._title = db.title? & db.titleabbrev? & db.subtitle? -db._title.req = db.title & db.titleabbrev? & db.subtitle? -db._title.only = db.title? & db.titleabbrev? -db._title.onlyreq = db.title & db.titleabbrev? -db._info = (db._title, db.titleforbidden.info?) | db.info? -db._info.title.req = - (db._title.req, db.titleforbidden.info?) | db.titlereq.info -db._info.title.only = - (db._title.only, db.titleforbidden.info?) | db.titleonly.info -db._info.title.onlyreq = - (db._title.onlyreq, db.titleforbidden.info?) | db.titleonlyreq.info -db._info.title.forbidden = db.titleforbidden.info? -db.all.inlines = - (text - | db.ubiq.inlines - | db.general.inlines - | db.domain.inlines - | db.extension.inlines) - | db.xi.include -db.general.inlines = - db.publishing.inlines - | db.product.inlines - | db.bibliography.inlines - | db.graphic.inlines - | db.indexing.inlines - | db.link.inlines -db.domain.inlines = - db.technical.inlines - | db.math.inlines - | db.markup.inlines - | db.gui.inlines - | db.keyboard.inlines - | db.os.inlines - | db.programming.inlines - | db.error.inlines -db.technical.inlines = - (db.replaceable | db.package | db.parameter) - | db.termdef - | db.nonterminal - | (db.systemitem | db.option | db.optional | db.property) -db.product.inlines = - db.trademark - | (db.productnumber - | db.productname - | db.database - | db.application - | db.hardware) -db.bibliography.inlines = - db.citation - | db.citerefentry - | db.citetitle - | db.citebiblioid - | db.author - | db.person - | db.personname - | db.org - | db.orgname - | db.editor - | db.jobtitle -db.publishing.inlines = - (db.abbrev - | db.acronym - | db.date - | db.emphasis - | db.footnote - | db.footnoteref - | db.foreignphrase - | db.phrase - | db.quote - | db.subscript - | db.superscript - | db.wordasword) - | db.glossary.inlines - | db.coref -db.graphic.inlines = db.inlinemediaobject -db.indexing.inlines = notAllowed | db.indexterm -db.link.inlines = - (db.xref | db.link | db.olink | db.anchor) | db.biblioref -db.extension.inlines = notAllowed -db.nopara.blocks = - (db.list.blocks - | db.formal.blocks - | db.informal.blocks - | db.publishing.blocks - | db.graphic.blocks - | db.technical.blocks - | db.verbatim.blocks - | db.bridgehead - | db.remark - | db.revhistory) - | db.indexterm - | db.synopsis.blocks - | db.admonition.blocks -db.para.blocks = db.anchor | db.para | db.formalpara | db.simpara -db.all.blocks = - (db.nopara.blocks | db.para.blocks | db.extension.blocks) - | db.annotation - | db.xi.include -db.formal.blocks = (db.example | db.figure | db.table) | db.equation -db.informal.blocks = - (db.informalexample | db.informalfigure | db.informaltable) - | db.informalequation -db.publishing.blocks = - db.sidebar | db.blockquote | db.address | db.epigraph -db.graphic.blocks = db.mediaobject | db.screenshot -db.technical.blocks = - db.procedure - | db.task - | (db.productionset | db.constraintdef) - | db.msgset -db.list.blocks = - (db.itemizedlist - | db.orderedlist - | db.procedure - | db.simplelist - | db.variablelist - | db.segmentedlist) - | db.glosslist - | db.bibliolist - | db.calloutlist - | db.qandaset -db.verbatim.blocks = - (db.screen | db.literallayout) - | (db.programlistingco | db.screenco) - | (db.programlisting | db.synopsis) -db.extension.blocks = notAllowed -db.info.extension = db._any -db.info.elements = - (db.abstract - | db.address - | db.artpagenums - | db.author - | db.authorgroup - | db.authorinitials - | db.bibliocoverage - | db.biblioid - | db.bibliosource - | db.collab - | db.confgroup - | db.contractsponsor - | db.contractnum - | db.copyright - | db.cover - | db.date - | db.edition - | db.editor - | db.issuenum - | db.keywordset - | db.legalnotice - | db.mediaobject - | db.org - | db.orgname - | db.othercredit - | db.pagenums - | db.printhistory - | db.pubdate - | db.publisher - | db.publishername - | db.releaseinfo - | db.revhistory - | db.seriesvolnums - | db.subjectset - | db.volumenum - | db.info.extension) - | db.annotation - | db.extendedlink - | (db.bibliomisc | db.bibliomset | db.bibliorelation | db.biblioset) - | db.itermset - | (db.productname | db.productnumber) - | db.xi.include -db.bibliographic.elements = - db.info.elements - | db.publishing.inlines - | db.citerefentry - | db.citetitle - | db.citebiblioid - | db.person - | db.personblurb - | db.personname - | db.subtitle - | db.title - | db.titleabbrev -div { - db.title.role.attribute = attribute role { text } - db.title.attlist = - db.title.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.title = - - ## The text of the title of a section of a document or of a formal block-level element - element title { db.title.attlist, db.all.inlines* } -} -div { - db.titleabbrev.role.attribute = attribute role { text } - db.titleabbrev.attlist = - db.titleabbrev.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.titleabbrev = - - ## The abbreviation of a title - element titleabbrev { db.titleabbrev.attlist, db.all.inlines* } -} -div { - db.subtitle.role.attribute = attribute role { text } - db.subtitle.attlist = - db.subtitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.subtitle = - - ## The subtitle of a document - element subtitle { db.subtitle.attlist, db.all.inlines* } -} -div { - db.info.role.attribute = attribute role { text } - db.info.attlist = db.info.role.attribute? & db.common.attributes - db.info = - - ## A wrapper for information about a component or other block - element info { db.info.attlist, (db._title & db.info.elements*) } -} -div { - db.titlereq.info.role.attribute = attribute role { text } - db.titlereq.info.attlist = - db.titlereq.info.role.attribute? & db.common.attributes - db.titlereq.info = - - ## A wrapper for information about a component or other block with a required title - element info { - db.titlereq.info.attlist, (db._title.req & db.info.elements*) - } -} -div { - db.titleonly.info.role.attribute = attribute role { text } - db.titleonly.info.attlist = - db.titleonly.info.role.attribute? & db.common.attributes - db.titleonly.info = - - ## A wrapper for information about a component or other block with only a title - element info { - db.titleonly.info.attlist, (db._title.only & db.info.elements*) - } -} -div { - db.titleonlyreq.info.role.attribute = attribute role { text } - db.titleonlyreq.info.attlist = - db.titleonlyreq.info.role.attribute? & db.common.attributes - db.titleonlyreq.info = - - ## A wrapper for information about a component or other block with only a required title - element info { - db.titleonlyreq.info.attlist, - (db._title.onlyreq & db.info.elements*) - } -} -div { - db.titleforbidden.info.role.attribute = attribute role { text } - db.titleforbidden.info.attlist = - db.titleforbidden.info.role.attribute? & db.common.attributes - db.titleforbidden.info = - - ## A wrapper for information about a component or other block without a title - element info { db.titleforbidden.info.attlist, db.info.elements* } -} -div { - db.subjectset.role.attribute = attribute role { text } - db.subjectset.scheme.attribute = - - ## Identifies the controlled vocabulary used by this set's terms - attribute scheme { xsd:NMTOKEN } - db.subjectset.attlist = - db.subjectset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.subjectset.scheme.attribute? - db.subjectset = - - ## A set of terms describing the subject matter of a document - element subjectset { db.subjectset.attlist, db.subject+ } -} -div { - db.subject.role.attribute = attribute role { text } - db.subject.weight.attribute = - - ## Specifies a ranking for this subject relative to other subjects in the same set - attribute weight { text } - db.subject.attlist = - db.subject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.subject.weight.attribute? - db.subject = - - ## One of a group of terms describing the subject matter of a document - element subject { db.subject.attlist, db.subjectterm+ } -} -div { - db.subjectterm.role.attribute = attribute role { text } - db.subjectterm.attlist = - db.subjectterm.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.subjectterm = - - ## A term in a group of terms describing the subject matter of a document - element subjectterm { db.subjectterm.attlist, text } -} -div { - db.keywordset.role.attribute = attribute role { text } - db.keywordset.attlist = - db.keywordset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.keywordset = - - ## A set of keywords describing the content of a document - element keywordset { db.keywordset.attlist, db.keyword+ } -} -div { - db.keyword.role.attribute = attribute role { text } - db.keyword.attlist = - db.keyword.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.keyword = - - ## One of a set of keywords describing the content of a document - element keyword { db.keyword.attlist, text } -} -db.table.choice = notAllowed | db.cals.table | db.html.table -db.informaltable.choice = - notAllowed | db.cals.informaltable | db.html.informaltable -db.table = db.table.choice -db.informaltable = db.informaltable.choice -div { - db.procedure.role.attribute = attribute role { text } - db.procedure.attlist = - db.procedure.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.procedure.info = db._info.title.only - db.procedure = - - ## A list of operations to be performed in a well-defined sequence - element procedure { - db.procedure.attlist, db.procedure.info, db.all.blocks*, db.step+ - } -} -div { - db.step.role.attribute = attribute role { text } - db.step.attlist = - db.step.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.performance.attribute? - db.step.info = db._info.title.only - # - # This content model is blocks*, step|stepalternatives, blocks* but - # expressed this way it avoids UPA issues in XSD and DTD versions - db.step = - - ## A unit of action in a procedure - element step { - db.step.attlist, - db.step.info, - ((db.all.blocks+, - ((db.substeps | db.stepalternatives), db.all.blocks*)?) - | ((db.substeps | db.stepalternatives), db.all.blocks*)) - } -} -div { - db.stepalternatives.role.attribute = attribute role { text } - db.stepalternatives.attlist = - db.stepalternatives.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.performance.attribute? - db.stepalternatives.info = db._info.title.forbidden - db.stepalternatives = - - ## Alternative steps in a procedure - element stepalternatives { - db.stepalternatives.attlist, db.stepalternatives.info, db.step+ - } -} -div { - db.substeps.role.attribute = attribute role { text } - db.substeps.attlist = - db.substeps.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.performance.attribute? - db.substeps = - - ## A wrapper for steps that occur within steps in a procedure - element substeps { db.substeps.attlist, db.step+ } -} -div { - db.sidebar.role.attribute = attribute role { text } - db.sidebar.attlist = - db.sidebar.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.sidebar.info = db._info.title.only - db.sidebar = - - ## A portion of a document that is isolated from the main narrative flow - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:sidebar" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:sidebar)" - "sidebar must not occur in the descendants of sidebar" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sidebar { - db.sidebar.attlist, db.sidebar.info, db.all.blocks+ - } -} -div { - db.abstract.role.attribute = attribute role { text } - db.abstract.attlist = - db.abstract.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.abstract.info = db._info.title.only - db.abstract = - - ## A summary - element abstract { - db.abstract.attlist, db.abstract.info, db.para.blocks+ - } -} -div { - db.personblurb.role.attribute = attribute role { text } - db.personblurb.attlist = - db.personblurb.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.personblurb.info = db._info.title.only - db.personblurb = - - ## A short description or note about a person - element personblurb { - db.personblurb.attlist, db.personblurb.info, db.para.blocks+ - } -} -div { - db.blockquote.role.attribute = attribute role { text } - db.blockquote.attlist = - db.blockquote.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.blockquote.info = db._info.title.only - db.blockquote = - - ## A quotation set off from the main text - element blockquote { - db.blockquote.attlist, - db.blockquote.info, - db.attribution?, - db.all.blocks+ - } -} -div { - db.attribution.role.attribute = attribute role { text } - db.attribution.attlist = - db.attribution.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.attribution = - - ## The source of a block quote or epigraph - element attribution { - db.attribution.attlist, - (db._text - | db.person - | db.personname - | db.citetitle - | db.citation)* - } -} -div { - db.bridgehead.renderas.enumeration = - - ## Render as a first-level section - "sect1" - | - ## Render as a second-level section - "sect2" - | - ## Render as a third-level section - "sect3" - | - ## Render as a fourth-level section - "sect4" - | - ## Render as a fifth-level section - "sect5" - db.bridgehead.renderas-enum.attribute = - - ## Indicates how the bridge head should be rendered - attribute renderas { db.bridgehead.renderas.enumeration }? - db.bridgehead.renderas-other.attribute = - - ## Identifies the nature of the non-standard rendering - attribute otherrenderas { xsd:NMTOKEN } - db.bridgehead.renderas-other.attributes = - - ## Indicates how the bridge head should be rendered - attribute renderas { - - ## Identifies a non-standard rendering - "other" - } - & db.bridgehead.renderas-other.attribute - db.bridgehead.renderas.attribute = - db.bridgehead.renderas-enum.attribute - | db.bridgehead.renderas-other.attributes - db.bridgehead.role.attribute = attribute role { text } - db.bridgehead.attlist = - db.bridgehead.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.bridgehead.renderas.attribute? - db.bridgehead = - - ## A free-floating heading - element bridgehead { db.bridgehead.attlist, db.all.inlines* } -} -div { - db.remark.role.attribute = attribute role { text } - db.remark.attlist = - db.remark.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.remark = - - ## A remark (or comment) intended for presentation in a draft manuscript - element remark { db.remark.attlist, db._text } -} -div { - db.epigraph.role.attribute = attribute role { text } - db.epigraph.attlist = - db.epigraph.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.epigraph.info = db._info.title.forbidden - db.epigraph = - - ## A short inscription at the beginning of a document or component - element epigraph { - db.epigraph.attlist, - db.epigraph.info, - db.attribution?, - (db.para.blocks | db.literallayout)+ - } -} -div { - db.footnote.role.attribute = attribute role { text } - db.footnote.label.attribute = - - ## Identifies the desired footnote mark - attribute label { xsd:NMTOKEN } - db.footnote.attlist = - db.footnote.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.footnote.label.attribute? - db.footnote = - - ## A footnote - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:footnote)" - "footnote must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:indexterm)" - "indexterm must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:sidebar)" - "sidebar must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:task)" - "task must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:epigraph)" - "epigraph must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnote" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of footnote" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element footnote { db.footnote.attlist, db.all.blocks+ } -} -div { - db.formalpara.role.attribute = attribute role { text } - db.formalpara.attlist = - db.formalpara.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.formalpara.info = db._info.title.onlyreq - db.formalpara = - - ## A paragraph with a title - element formalpara { - db.formalpara.attlist, - db.formalpara.info, - db.indexing.inlines*, - db.para - } -} -div { - db.para.role.attribute = attribute role { text } - db.para.attlist = - db.para.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.para.info = db._info.title.forbidden - db.para = - - ## A paragraph - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:para" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element para { - db.para.attlist, - db.para.info, - (db.all.inlines | db.nopara.blocks)* - } -} -div { - db.simpara.role.attribute = attribute role { text } - db.simpara.attlist = - db.simpara.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.simpara.info = db._info.title.forbidden - db.simpara = - - ## A paragraph that contains only text and inline markup, no block elements - element simpara { - db.simpara.attlist, db.simpara.info, db.all.inlines* - } -} -div { - db.itemizedlist.role.attribute = attribute role { text } - db.itemizedlist.mark.attribute = - - ## Identifies the type of mark to be used on items in this list - attribute mark { xsd:NMTOKEN } - db.itemizedlist.attlist = - db.itemizedlist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.spacing.attribute? - & db.itemizedlist.mark.attribute? - db.itemizedlist.info = db._info.title.only - db.itemizedlist = - - ## A list in which each entry is marked with a bullet or other dingbat - element itemizedlist { - db.itemizedlist.attlist, - db.itemizedlist.info, - db.all.blocks*, - db.listitem+ - } -} -div { - db.orderedlist.role.attribute = attribute role { text } - db.orderedlist.continuation.enumeration = - - ## Specifies that numbering should begin where the preceding list left off - "continues" - | - ## Specifies that numbering should begin again at 1 - "restarts" - db.orderedlist.continuation.attribute = - - ## Indicates how list numbering should begin relative to the immediately preceding list - attribute continuation { db.orderedlist.continuation.enumeration } - db.orderedlist.startingnumber.attribute = - - ## Specifies the initial line number. - attribute startingnumber { xsd:integer } - db.orderedlist.inheritnum.enumeration = - - ## Specifies that numbering should ignore list nesting - "ignore" - | - ## Specifies that numbering should inherit from outer-level lists - "inherit" - db.orderedlist.inheritnum.attribute = - - ## Indicates whether or not item numbering should be influenced by list nesting - attribute inheritnum { db.orderedlist.inheritnum.enumeration } - db.orderedlist.numeration.enumeration = - - ## Specifies Arabic numeration (1, 2, 3, …) - "arabic" - | - ## Specifies upper-case alphabetic numeration (A, B, C, …) - "upperalpha" - | - ## Specifies lower-case alphabetic numeration (a, b, c, …) - "loweralpha" - | - ## Specifies upper-case Roman numeration (I, II, III, …) - "upperroman" - | - ## Specifies lower-case Roman numeration (i, ii, iii …) - "lowerroman" - db.orderedlist.numeration.attribute = - - ## Indicates the desired numeration - attribute numeration { db.orderedlist.numeration.enumeration } - db.orderedlist.attlist = - db.orderedlist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.spacing.attribute? - & (db.orderedlist.continuation.attribute - | db.orderedlist.startingnumber.attribute)? - & db.orderedlist.inheritnum.attribute? - & db.orderedlist.numeration.attribute? - db.orderedlist.info = db._info.title.only - db.orderedlist = - - ## A list in which each entry is marked with a sequentially incremented label - element orderedlist { - db.orderedlist.attlist, - db.orderedlist.info, - db.all.blocks*, - db.listitem+ - } -} -div { - db.listitem.role.attribute = attribute role { text } - db.listitem.override.attribute = - - ## Specifies the keyword for the type of mark that should be used on this - ## item, instead of the mark that would be used by default - attribute override { xsd:NMTOKEN } - db.listitem.attlist = - db.listitem.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.listitem.override.attribute? - db.listitem = - - ## A wrapper for the elements of a list item - element listitem { db.listitem.attlist, db.all.blocks+ } -} -div { - db.segmentedlist.role.attribute = attribute role { text } - db.segmentedlist.attlist = - db.segmentedlist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.segmentedlist.info = db._info.title.only - db.segmentedlist = - - ## A segmented list, a list of sets of elements - element segmentedlist { - db.segmentedlist.attlist, - db.segmentedlist.info, - db.segtitle+, - db.seglistitem+ - } -} -div { - db.segtitle.role.attribute = attribute role { text } - db.segtitle.attlist = - db.segtitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.segtitle = - - ## The title of an element of a list item in a segmented list - element segtitle { db.segtitle.attlist, db.all.inlines* } -} -div { - db.seglistitem.role.attribute = attribute role { text } - db.seglistitem.attlist = - db.seglistitem.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.seglistitem = - - ## A list item in a segmented list - [ - s:pattern [ - name = "Cardinality of segments and titles" - "\x{a}" ~ - " " - s:rule [ - context = "db:seglistitem" - "\x{a}" ~ - " " - s:assert [ - test = "count(db:seg) = count(../db:segtitle)" - "The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element seglistitem { db.seglistitem.attlist, db.seg+ } -} -div { - db.seg.role.attribute = attribute role { text } - db.seg.attlist = - db.seg.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.seg = - - ## An element of a list item in a segmented list - element seg { db.seg.attlist, db.all.inlines* } -} -div { - db.simplelist.role.attribute = attribute role { text } - db.simplelist.type.enumeration = - - ## A tabular presentation in row-major order. - "horiz" - | - ## A tabular presentation in column-major order. - "vert" - | - ## An inline presentation, usually a comma-delimited list. - "inline" - db.simplelist.type.attribute = - - ## Specifies the type of list presentation. - [ a:defaultValue = "vert" ] - attribute type { db.simplelist.type.enumeration } - db.simplelist.columns.attribute = - - ## Specifies the number of columns for horizontal or vertical presentation - attribute columns { xsd:integer } - db.simplelist.attlist = - db.simplelist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.simplelist.type.attribute? - & db.simplelist.columns.attribute? - db.simplelist = - - ## An undecorated list of single words or short phrases - element simplelist { db.simplelist.attlist, db.member+ } -} -div { - db.member.role.attribute = attribute role { text } - db.member.attlist = - db.member.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.member = - - ## An element of a simple list - element member { db.member.attlist, db.all.inlines* } -} -div { - db.variablelist.role.attribute = attribute role { text } - db.variablelist.termlength.attribute = - - ## Indicates a length beyond which the presentation system may consider a term too long and select an alternate presentation for that term, item, or list - attribute termlength { text } - db.variablelist.attlist = - db.variablelist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.spacing.attribute? - & db.variablelist.termlength.attribute? - db.variablelist.info = db._info.title.only - db.variablelist = - - ## A list in which each entry is composed of a set of one or more terms and an associated description - element variablelist { - db.variablelist.attlist, - db.variablelist.info, - db.all.blocks*, - db.varlistentry+ - } -} -div { - db.varlistentry.role.attribute = attribute role { text } - db.varlistentry.attlist = - db.varlistentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.varlistentry = - - ## A wrapper for a set of terms and the associated description in a variable list - element varlistentry { - db.varlistentry.attlist, db.term+, db.listitem - } -} -div { - db.term.role.attribute = attribute role { text } - db.term.attlist = - db.term.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.term = - - ## The word or phrase being defined or described in a variable list - element term { db.term.attlist, db.all.inlines* } -} -div { - db.example.role.attribute = attribute role { text } - db.example.label.attribute = db.label.attribute - db.example.width.attribute = db.width.characters.attribute - db.example.pgwide.attribute = db.pgwide.attribute - db.example.floatstyle.attribute = db.floatstyle.attribute - db.example.attlist = - db.example.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.example.label.attribute? - & db.example.floatstyle.attribute? - & (db.example.width.attribute | db.example.pgwide.attribute)? - db.example.info = db._info.title.onlyreq - db.example = - - ## A formal example, with a title - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:example" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of example" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element example { - db.example.attlist, db.example.info, db.all.blocks+, db.caption? - } -} -div { - db.informalexample.role.attribute = attribute role { text } - db.informalexample.width.attribute = db.width.characters.attribute - db.informalexample.floatstyle.attribute = db.floatstyle.attribute - db.informalexample.attlist = - db.informalexample.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.informalexample.floatstyle.attribute? - & db.informalexample.width.attribute? - db.informalexample.info = db._info.title.forbidden - db.informalexample = - - ## A displayed example without a title - element informalexample { - db.informalexample.attlist, - db.informalexample.info, - db.all.blocks+, - db.caption? - } -} -db.verbatim.inlines = (db.all.inlines | db.lineannotation) | db.co -db.verbatim.contentmodel = - db._info.title.forbidden, (db.textobject | db.verbatim.inlines*) -div { - db.literallayout.role.attribute = attribute role { text } - db.literallayout.class.enumeration = - - ## The literal layout should be formatted with a monospaced font - "monospaced" - | - ## The literal layout should be formatted with the current font - "normal" - db.literallayout.class.attribute = - - ## Specifies the class of literal layout - attribute class { db.literallayout.class.enumeration } - db.literallayout.attlist = - db.literallayout.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.literallayout.class.attribute? - db.literallayout = - - ## A block of text in which line breaks and white space are to be reproduced faithfully - element literallayout { - db.literallayout.attlist, db.verbatim.contentmodel - } -} -div { - db.screen.role.attribute = attribute role { text } - db.screen.width.attribute = db.width.characters.attribute - db.screen.attlist = - db.screen.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.screen.width.attribute? - db.screen = - - ## Text that a user sees or might see on a computer screen - element screen { db.screen.attlist, db.verbatim.contentmodel } -} -div { - db.screenshot.role.attribute = attribute role { text } - db.screenshot.attlist = - db.screenshot.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.screenshot.info = db._info - db.screenshot = - - ## A representation of what the user sees or might see on a computer screen - element screenshot { - db.screenshot.attlist, db.screenshot.info, db.mediaobject - } -} -div { - db.figure.role.attribute = attribute role { text } - db.figure.label.attribute = db.label.attribute - db.figure.pgwide.attribute = db.pgwide.attribute - db.figure.floatstyle.attribute = db.floatstyle.attribute - db.figure.attlist = - db.figure.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.figure.label.attribute? - & db.figure.pgwide.attribute? - & db.figure.floatstyle.attribute? - db.figure.info = db._info.title.onlyreq - db.figure = - - ## A formal figure, generally an illustration, with a title - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:figure" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of figure" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element figure { - db.figure.attlist, db.figure.info, db.all.blocks+, db.caption? - } -} -div { - db.informalfigure.role.attribute = attribute role { text } - db.informalfigure.label.attribute = db.label.attribute - db.informalfigure.pgwide.attribute = db.pgwide.attribute - db.informalfigure.floatstyle.attribute = db.floatstyle.attribute - db.informalfigure.attlist = - db.informalfigure.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.informalfigure.label.attribute? - & db.informalfigure.pgwide.attribute? - & db.informalfigure.floatstyle.attribute? - db.informalfigure.info = db._info.title.forbidden - db.informalfigure = - - ## A untitled figure - element informalfigure { - db.informalfigure.attlist, - db.informalfigure.info, - db.all.blocks+, - db.caption? - } -} -db.mediaobject.content = - (db.videoobject | db.audioobject | db.imageobject | db.textobject) - | db.imageobjectco -div { - db.mediaobject.role.attribute = attribute role { text } - db.mediaobject.attlist = - db.mediaobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.mediaobject.info = db._info.title.forbidden - db.mediaobject = - - ## A displayed media object (video, audio, image, etc.) - element mediaobject { - db.mediaobject.attlist, - db.mediaobject.info, - db.alt?, - db.mediaobject.content+, - db.caption? - } -} -div { - db.inlinemediaobject.role.attribute = attribute role { text } - db.inlinemediaobject.attlist = - db.inlinemediaobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.inlinemediaobject.info = db._info.title.forbidden - db.inlinemediaobject = - - ## An inline media object (video, audio, image, and so on) - element inlinemediaobject { - db.inlinemediaobject.attlist, - db.inlinemediaobject.info, - db.alt?, - db.mediaobject.content+ - } -} -div { - db.videoobject.role.attribute = attribute role { text } - db.videoobject.attlist = - db.videoobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.videoobject.info = db._info.title.forbidden - db.videoobject = - - ## A wrapper for video data and its associated meta-information - element videoobject { - db.videoobject.attlist, db.videoobject.info, db.videodata - } -} -div { - db.audioobject.role.attribute = attribute role { text } - db.audioobject.attlist = - db.audioobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.audioobject.info = db._info.title.forbidden - db.audioobject = - - ## A wrapper for audio data and its associated meta-information - element audioobject { - db.audioobject.attlist, db.audioobject.info, db.audiodata - } -} -db.imageobject.content = - db.imagedata | db.imagedata.mathml | db.imagedata.svg -div { - db.imageobject.role.attribute = attribute role { text } - db.imageobject.attlist = - db.imageobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.imageobject.info = db._info.title.forbidden - db.imageobject = - - ## A wrapper for image data and its associated meta-information - element imageobject { - db.imageobject.attlist, - db.imageobject.info, - db.imageobject.content - } -} -div { - db.textobject.role.attribute = attribute role { text } - db.textobject.attlist = - db.textobject.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.textobject.info = db._info.title.forbidden - db.textobject = - - ## A wrapper for a text description of an object and its associated meta-information - element textobject { - db.textobject.attlist, - db.textobject.info, - (db.phrase | db.textdata | db.all.blocks+) - } -} -div { - db.videodata.role.attribute = attribute role { text } - db.videodata.align.enumeration = db.halign.enumeration - db.videodata.align.attribute = - - ## Specifies the (horizontal) alignment of the video data - attribute align { db.videodata.align.enumeration } - db.videodata.valign.enumeration = db.valign.enumeration - db.videodata.valign.attribute = - - ## Specifies the vertical alignment of the video data - attribute valign { db.videodata.valign.enumeration } - db.videodata.width.attribute = db.width.attribute - db.videodata.depth.attribute = db.depth.attribute - db.videodata.contentwidth.attribute = db.contentwidth.attribute - db.videodata.contentdepth.attribute = db.contentdepth.attribute - db.videodata.scalefit.enumeration = db.scalefit.enumeration - db.videodata.scalefit.attribute = - - ## Determines if anamorphic scaling is forbidden - attribute scalefit { db.videodata.scalefit.enumeration } - db.videodata.scale.attribute = db.scale.attribute - db.videodata.attlist = - db.videodata.role.attribute? - & db.common.attributes - & db.common.data.attributes - & db.videodata.align.attribute? - & db.videodata.valign.attribute? - & db.videodata.width.attribute? - & db.videodata.contentwidth.attribute? - & db.videodata.scalefit.attribute? - & db.videodata.scale.attribute? - & db.videodata.depth.attribute? - & db.videodata.contentdepth.attribute? - db.videodata.info = db._info.title.forbidden - db.videodata = - - ## Pointer to external video data - element videodata { db.videodata.attlist, db.videodata.info } -} -div { - db.audiodata.role.attribute = attribute role { text } - db.audiodata.attlist = - db.audiodata.role.attribute? - & db.common.attributes - & db.common.data.attributes - db.audiodata.info = db._info.title.forbidden - db.audiodata = - - ## Pointer to external audio data - element audiodata { db.audiodata.attlist, db.audiodata.info } -} -div { - db.imagedata.role.attribute = attribute role { text } - db.imagedata.align.enumeration = db.halign.enumeration - db.imagedata.align.attribute = - - ## Specifies the (horizontal) alignment of the image data - attribute align { db.imagedata.align.enumeration } - db.imagedata.valign.enumeration = db.valign.enumeration - db.imagedata.valign.attribute = - - ## Specifies the vertical alignment of the image data - attribute valign { db.imagedata.valign.enumeration } - db.imagedata.width.attribute = db.width.attribute - db.imagedata.depth.attribute = db.depth.attribute - db.imagedata.contentwidth.attribute = db.contentwidth.attribute - db.imagedata.contentdepth.attribute = db.contentdepth.attribute - db.imagedata.scalefit.enumeration = db.scalefit.enumeration - db.imagedata.scalefit.attribute = - - ## Determines if anamorphic scaling is forbidden - attribute scalefit { db.imagedata.scalefit.enumeration } - db.imagedata.scale.attribute = db.scale.attribute - db.imagedata.attlist = - db.imagedata.role.attribute? - & db.common.attributes - & db.common.data.attributes - & db.imagedata.align.attribute? - & db.imagedata.valign.attribute? - & db.imagedata.width.attribute? - & db.imagedata.contentwidth.attribute? - & db.imagedata.scalefit.attribute? - & db.imagedata.scale.attribute? - & db.imagedata.depth.attribute? - & db.imagedata.contentdepth.attribute? - db.imagedata.info = db._info.title.forbidden - db.imagedata = - - ## Pointer to external image data - element imagedata { db.imagedata.attlist, db.imagedata.info } -} -div { - db.textdata.role.attribute = attribute role { text } - db.textdata.encoding.attribute = - - ## Identifies the encoding of the text in the external file - attribute encoding { text } - db.textdata.attlist = - db.textdata.role.attribute? - & db.common.attributes - & db.common.data.attributes - & db.textdata.encoding.attribute? - db.textdata.info = db._info.title.forbidden - db.textdata = - - ## Pointer to external text data - element textdata { db.textdata.attlist, db.textdata.info } -} -div { - db.caption.role.attribute = attribute role { text } - db.caption.attlist = - db.caption.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.caption.info = db._info.title.forbidden - db.caption = - - ## A caption - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:sidebar)" - "sidebar must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:task)" - "task must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element caption { - db.caption.attlist, db.caption.info, db.all.blocks+ - } -} -div { - db.address.role.attribute = attribute role { text } - db.address.attlist = - db.address.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - db.address = - - ## A real-world address, generally a postal address - element address { - db.address.attlist, - (db._text - | db.personname - | db.pob - | db.street - | db.city - | db.state - | db.postcode - | db.country - | db.phone - | db.fax - | db.email - | db.uri - | db.otheraddr)* - } -} -div { - db.street.role.attribute = attribute role { text } - db.street.attlist = - db.street.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.street = - - ## A street address in an address - element street { db.street.attlist, db._text } -} -div { - db.pob.role.attribute = attribute role { text } - db.pob.attlist = - db.pob.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.pob = - - ## A post office box in an address - element pob { db.pob.attlist, db._text } -} -div { - db.postcode.role.attribute = attribute role { text } - db.postcode.attlist = - db.postcode.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.postcode = - - ## A postal code in an address - element postcode { db.postcode.attlist, db._text } -} -div { - db.city.role.attribute = attribute role { text } - db.city.attlist = - db.city.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.city = - - ## The name of a city in an address - element city { db.city.attlist, db._text } -} -div { - db.state.role.attribute = attribute role { text } - db.state.attlist = - db.state.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.state = - - ## A state or province in an address - element state { db.state.attlist, db._text } -} -div { - db.country.role.attribute = attribute role { text } - db.country.attlist = - db.country.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.country = - - ## The name of a country - element country { db.country.attlist, db._text } -} -div { - db.phone.role.attribute = attribute role { text } - db.phone.attlist = - db.phone.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.phone = - - ## A telephone number - element phone { db.phone.attlist, db._text } -} -div { - db.fax.role.attribute = attribute role { text } - db.fax.attlist = - db.fax.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.fax = - - ## A fax number - element fax { db.fax.attlist, db._text } -} -div { - db.otheraddr.role.attribute = attribute role { text } - db.otheraddr.attlist = - db.otheraddr.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.otheraddr = - - ## Uncategorized information in address - element otheraddr { db.otheraddr.attlist, db._text } -} -div { - db.affiliation.role.attribute = attribute role { text } - db.affiliation.attlist = - db.affiliation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.affiliation = - - ## The institutional affiliation of an individual - element affiliation { - db.affiliation.attlist, - db.shortaffil?, - db.jobtitle*, - (db.org? | (db.orgname?, db.orgdiv*, db.address*)) - } -} -div { - db.shortaffil.role.attribute = attribute role { text } - db.shortaffil.attlist = - db.shortaffil.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.shortaffil = - - ## A brief description of an affiliation - element shortaffil { db.shortaffil.attlist, db._text } -} -div { - db.jobtitle.role.attribute = attribute role { text } - db.jobtitle.attlist = - db.jobtitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.jobtitle = - - ## The title of an individual in an organization - element jobtitle { db.jobtitle.attlist, db._text } -} -div { - db.orgname.class.enumeration = - - ## A consortium - "consortium" - | - ## A corporation - "corporation" - | - ## An informal organization - "informal" - | - ## A non-profit organization - "nonprofit" - db.orgname.class-enum.attribute = - - ## Specifies the nature of the organization - attribute class { db.orgname.class.enumeration } - db.orgname.class-other.attributes = - - ## Specifies the nature of the organization - attribute class { - - ## Indicates a non-standard organization class - "other" - }, - - ## Identifies the non-standard nature of the organization - attribute otherclass { text } - db.orgname.class.attribute = - db.orgname.class-enum.attribute | db.orgname.class-other.attributes - db.orgname.role.attribute = attribute role { text } - db.orgname.attlist = - db.orgname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.orgname.class.attribute? - db.orgname = - - ## The name of an organization - element orgname { db.orgname.attlist, db._text } -} -div { - db.orgdiv.role.attribute = attribute role { text } - db.orgdiv.attlist = - db.orgdiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.orgdiv = - - ## A division of an organization - element orgdiv { db.orgdiv.attlist, db.all.inlines* } -} -div { - db.artpagenums.role.attribute = attribute role { text } - db.artpagenums.attlist = - db.artpagenums.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.artpagenums = - - ## The page numbers of an article as published - element artpagenums { db.artpagenums.attlist, db._text } -} -div { - db.personname.role.attribute = attribute role { text } - db.personname.attlist = - db.personname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.personname = - - ## The personal name of an individual - element personname { - db.personname.attlist, - (db._text - | (db.honorific - | db.firstname - | db.surname - | db.lineage - | db.othername)+) - } -} -db.person.author.contentmodel = - db.personname, - (db.personblurb - | db.affiliation - | db.email - | db.uri - | db.address - | db.contrib)* -db.org.author.contentmodel = - db.orgname, - (db.orgdiv - | db.affiliation - | db.email - | db.uri - | db.address - | db.contrib)* -db.credit.contentmodel = - db.person.author.contentmodel | db.org.author.contentmodel -div { - db.author.role.attribute = attribute role { text } - db.author.attlist = - db.author.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.author = - - ## The name of an individual author - element author { db.author.attlist, db.credit.contentmodel } -} -div { - db.authorgroup.role.attribute = attribute role { text } - db.authorgroup.attlist = - db.authorgroup.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.authorgroup = - - ## Wrapper for author information when a document has multiple authors or collabarators - element authorgroup { - db.authorgroup.attlist, (db.author | db.editor | db.othercredit)+ - } -} -div { - db.collab.role.attribute = attribute role { text } - db.collab.attlist = - db.collab.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.collab = - - ## Identifies a collaborator - element collab { - db.collab.attlist, - (db.person | db.personname | db.org | db.orgname)+, - db.affiliation* - } -} -div { - db.authorinitials.role.attribute = attribute role { text } - db.authorinitials.attlist = - db.authorinitials.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.authorinitials = - - ## The initials or other short identifier for an author - element authorinitials { db.authorinitials.attlist, db._text } -} -div { - db.person.role.attribute = attribute role { text } - db.person.attlist = - db.person.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.person = - - ## A person and associated metadata - element person { - db.person.attlist, - db.personname, - (db.address - | db.affiliation - | db.email - | db.uri - | db.personblurb)* - } -} -div { - db.org.role.attribute = attribute role { text } - db.org.attlist = - db.org.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.org = - - ## An organization and associated metadata - element org { - db.org.attlist, - db.orgname, - (db.address | db.affiliation | db.email | db.uri | db.orgdiv)* - } -} -div { - db.confgroup.role.attribute = attribute role { text } - db.confgroup.attlist = - db.confgroup.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.confgroup = - - ## A wrapper for document meta-information about a conference - element confgroup { - db.confgroup.attlist, - (db.confdates - | db.conftitle - | db.confnum - | db.confsponsor - | db.address)* - } -} -div { - db.confdates.role.attribute = attribute role { text } - db.confdates.attlist = - db.confdates.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.confdates = - - ## The dates of a conference for which a document was written - element confdates { db.confdates.attlist, db._text } -} -div { - db.conftitle.role.attribute = attribute role { text } - db.conftitle.attlist = - db.conftitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.conftitle = - - ## The title of a conference for which a document was written - element conftitle { db.conftitle.attlist, db._text } -} -div { - db.confnum.role.attribute = attribute role { text } - db.confnum.attlist = - db.confnum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.confnum = - - ## An identifier, frequently numerical, associated with a conference for which a document was written - element confnum { db.confnum.attlist, db._text } -} -div { - db.confsponsor.role.attribute = attribute role { text } - db.confsponsor.attlist = - db.confsponsor.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.confsponsor = - - ## The sponsor of a conference for which a document was written - element confsponsor { db.confsponsor.attlist, db._text } -} -div { - db.contractnum.role.attribute = attribute role { text } - db.contractnum.attlist = - db.contractnum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.contractnum = - - ## The contract number of a document - element contractnum { db.contractnum.attlist, db._text } -} -div { - db.contractsponsor.role.attribute = attribute role { text } - db.contractsponsor.attlist = - db.contractsponsor.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.contractsponsor = - - ## The sponsor of a contract - element contractsponsor { db.contractsponsor.attlist, db._text } -} -div { - db.copyright.role.attribute = attribute role { text } - db.copyright.attlist = - db.copyright.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.copyright = - - ## Copyright information about a document - element copyright { db.copyright.attlist, db.year+, db.holder* } -} -div { - db.year.role.attribute = attribute role { text } - db.year.attlist = - db.year.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.year = - - ## The year of publication of a document - element year { db.year.attlist, db._text } -} -div { - db.holder.role.attribute = attribute role { text } - db.holder.attlist = - db.holder.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.holder = - - ## The name of the individual or organization that holds a copyright - element holder { db.holder.attlist, db._text } -} -db.cover.contentmodel = - (db.para.blocks - | db.extension.blocks - | db.list.blocks - | db.informal.blocks - | db.publishing.blocks - | db.graphic.blocks - | db.technical.blocks - | db.verbatim.blocks - | db.bridgehead - | db.remark - | db.revhistory) - | db.synopsis.blocks -div { - db.cover.role.attribute = attribute role { text } - db.cover.attlist = - db.cover.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.cover = - - ## Additional content for the cover of a publication - element cover { db.cover.attlist, db.cover.contentmodel+ } -} -db.date.contentmodel = - xsd:date | xsd:dateTime | xsd:gYearMonth | xsd:gYear | text -div { - db.date.role.attribute = attribute role { text } - db.date.attlist = - db.date.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.date = - - ## The date of publication or revision of a document - element date { db.date.attlist, db.date.contentmodel } -} -div { - db.edition.role.attribute = attribute role { text } - db.edition.attlist = - db.edition.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.edition = - - ## The name or number of an edition of a document - element edition { db.edition.attlist, db._text } -} -div { - db.editor.role.attribute = attribute role { text } - db.editor.attlist = - db.editor.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.editor = - - ## The name of the editor of a document - element editor { db.editor.attlist, db.credit.contentmodel } -} -div { - db.biblioid.role.attribute = attribute role { text } - db.biblioid.attlist = - db.biblioid.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblio.class.attribute - db.biblioid = - - ## An identifier for a document - element biblioid { db.biblioid.attlist, db._text } -} -div { - db.citebiblioid.role.attribute = attribute role { text } - db.citebiblioid.attlist = - db.citebiblioid.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblio.class.attribute - db.citebiblioid = - - ## A citation of a bibliographic identifier - element citebiblioid { db.citebiblioid.attlist, db._text } -} -div { - db.bibliosource.role.attribute = attribute role { text } - db.bibliosource.attlist = - db.bibliosource.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblio.class.attribute - db.bibliosource = - - ## The source of a document - element bibliosource { db.bibliosource.attlist, db._text } -} -div { - db.bibliorelation.type.enumeration = - - ## The described resource pre-existed the referenced resource, which is essentially the same intellectual content presented in another format - "hasformat" - | - ## The described resource includes the referenced resource either physically or logically - "haspart" - | - ## The described resource has a version, edition, or adaptation, namely, the referenced resource - "hasversion" - | - ## The described resource is the same intellectual content of the referenced resource, but presented in another format - "isformatof" - | - ## The described resource is a physical or logical part of the referenced resource - "ispartof" - | - ## The described resource is referenced, cited, or otherwise pointed to by the referenced resource - "isreferencedby" - | - ## The described resource is supplanted, displaced, or superceded by the referenced resource - "isreplacedby" - | - ## The described resource is required by the referenced resource, either physically or logically - "isrequiredby" - | - ## The described resource is a version, edition, or adaptation of the referenced resource; changes in version imply substantive changes in content rather than differences in format - "isversionof" - | - ## The described resource references, cites, or otherwise points to the referenced resource - "references" - | - ## The described resource supplants, displaces, or supersedes the referenced resource - "replaces" - | - ## The described resource requires the referenced resource to support its function, delivery, or coherence of content - "requires" - db.bibliorelation.type-enum.attribute = - - ## Identifies the type of relationship - attribute type { db.bibliorelation.type.enumeration }? - db.bibliorelation.type-other.attributes = - - ## Identifies the type of relationship - attribute type { - - ## The described resource has a non-standard relationship with the referenced resource - "othertype" - }?, - - ## A keyword that identififes the type of the non-standard relationship - attribute othertype { xsd:NMTOKEN } - db.bibliorelation.type.attribute = - db.bibliorelation.type-enum.attribute - | db.bibliorelation.type-other.attributes - db.bibliorelation.role.attribute = attribute role { text } - db.bibliorelation.attlist = - db.bibliorelation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblio.class.attribute - & db.bibliorelation.type.attribute - db.bibliorelation = - - ## The relationship of a document to another - element bibliorelation { db.bibliorelation.attlist, db._text } -} -div { - db.bibliocoverage.spacial.enumeration = - - ## The DCMI Point identifies a point in space using its geographic coordinates - "dcmipoint" - | - ## ISO 3166 Codes for the representation of names of countries - "iso3166" - | - ## The DCMI Box identifies a region of space using its geographic limits - "dcmibox" - | - ## The Getty Thesaurus of Geographic Names - "tgn" - db.bibliocoverage.spatial-enum.attribute = - - ## Specifies the type of spatial coverage - attribute spatial { db.bibliocoverage.spacial.enumeration }? - db.bibliocoverage.spatial-other.attributes = - - ## Specifies the type of spatial coverage - attribute spatial { - - ## Identifies a non-standard type of coverage - "otherspatial" - }?, - - ## A keyword that identifies the type of non-standard coverage - attribute otherspatial { xsd:NMTOKEN } - db.bibliocoverage.spatial.attribute = - db.bibliocoverage.spatial-enum.attribute - | db.bibliocoverage.spatial-other.attributes - db.bibliocoverage.temporal.enumeration = - - ## A specification of the limits of a time interval - "dcmiperiod" - | - ## W3C Encoding rules for dates and times—a profile based on ISO 8601 - "w3c-dtf" - db.bibliocoverage.temporal-enum.attribute = - - ## Specifies the type of temporal coverage - attribute temporal { db.bibliocoverage.temporal.enumeration }? - db.bibliocoverage.temporal-other.attributes = - - ## Specifies the type of temporal coverage - attribute temporal { - - ## Specifies a non-standard type of coverage - "othertemporal" - }?, - - ## A keyword that identifies the type of non-standard coverage - attribute othertemporal { xsd:NMTOKEN } - db.bibliocoverage.temporal.attribute = - db.bibliocoverage.temporal-enum.attribute - | db.bibliocoverage.temporal-other.attributes - db.bibliocoverage.coverage.attrib = - db.bibliocoverage.spatial.attribute - & db.bibliocoverage.temporal.attribute - db.bibliocoverage.role.attribute = attribute role { text } - db.bibliocoverage.attlist = - db.bibliocoverage.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.bibliocoverage.coverage.attrib - db.bibliocoverage = - - ## The spatial or temporal coverage of a document - element bibliocoverage { db.bibliocoverage.attlist, db._text } -} -div { - db.legalnotice.role.attribute = attribute role { text } - db.legalnotice.attlist = - db.legalnotice.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.legalnotice.info = db._info.title.only - db.legalnotice = - - ## A statement of legal obligations or requirements - element legalnotice { - db.legalnotice.attlist, db.legalnotice.info, db.all.blocks+ - } -} -div { - db.othercredit.class.enumeration = - - ## A copy editor - "copyeditor" - | - ## A graphic designer - "graphicdesigner" - | - ## Some other contributor - "other" - | - ## A production editor - "productioneditor" - | - ## A technical editor - "technicaleditor" - | - ## A translator - "translator" - db.othercredit.class-enum.attribute = - - ## Identifies the nature of the contributor - attribute class { db.othercredit.class.enumeration }? - db.othercredit.class-other.attribute = - - ## Identifies the nature of the non-standard contribution - attribute otherclass { xsd:NMTOKEN } - db.othercredit.class-other.attributes = - - ## Identifies the nature of the contributor - attribute class { - - ## Identifies a non-standard contribution - "other" - } - & db.othercredit.class-other.attribute - db.othercredit.class.attribute = - db.othercredit.class-enum.attribute - | db.othercredit.class-other.attributes - db.othercredit.role.attribute = attribute role { text } - db.othercredit.attlist = - db.othercredit.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.othercredit.class.attribute - db.othercredit = - - ## A person or entity, other than an author or editor, credited in a document - element othercredit { - db.othercredit.attlist, db.credit.contentmodel - } -} -div { - db.pagenums.role.attribute = attribute role { text } - db.pagenums.attlist = - db.pagenums.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.pagenums = - - ## The numbers of the pages in a book, for use in a bibliographic entry - element pagenums { db.pagenums.attlist, db._text } -} -div { - db.contrib.role.attribute = attribute role { text } - db.contrib.attlist = - db.contrib.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.contrib = - - ## A summary of the contributions made to a document by a credited source - element contrib { db.contrib.attlist, db._text } -} -div { - db.honorific.role.attribute = attribute role { text } - db.honorific.attlist = - db.honorific.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.honorific = - - ## The title of a person - element honorific { db.honorific.attlist, db._text } -} -div { - db.firstname.role.attribute = attribute role { text } - db.firstname.attlist = - db.firstname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.firstname = - - ## The first name of a person - element firstname { db.firstname.attlist, db._text } -} -div { - db.surname.role.attribute = attribute role { text } - db.surname.attlist = - db.surname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.surname = - - ## A family name; in western cultures the last name - element surname { db.surname.attlist, db._text } -} -div { - db.lineage.role.attribute = attribute role { text } - db.lineage.attlist = - db.lineage.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.lineage = - - ## The portion of a person's name indicating a relationship to ancestors - element lineage { db.lineage.attlist, db._text } -} -div { - db.othername.role.attribute = attribute role { text } - db.othername.attlist = - db.othername.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.othername = - - ## A component of a persons name that is not a first name, surname, or lineage - element othername { db.othername.attlist, db._text } -} -div { - db.printhistory.role.attribute = attribute role { text } - db.printhistory.attlist = - db.printhistory.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.printhistory = - - ## The printing history of a document - element printhistory { db.printhistory.attlist, db.para.blocks+ } -} -div { - db.pubdate.role.attribute = attribute role { text } - db.pubdate.attlist = - db.pubdate.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.pubdate = - - ## The date of publication of a document - element pubdate { db.pubdate.attlist, db.date.contentmodel } -} -div { - db.publisher.role.attribute = attribute role { text } - db.publisher.attlist = - db.publisher.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.publisher = - - ## The publisher of a document - element publisher { - db.publisher.attlist, db.publishername, db.address* - } -} -div { - db.publishername.role.attribute = attribute role { text } - db.publishername.attlist = - db.publishername.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.publishername = - - ## The name of the publisher of a document - element publishername { db.publishername.attlist, db._text } -} -div { - db.releaseinfo.role.attribute = attribute role { text } - db.releaseinfo.attlist = - db.releaseinfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.releaseinfo = - - ## Information about a particular release of a document - element releaseinfo { db.releaseinfo.attlist, db._text } -} -div { - db.revhistory.role.attribute = attribute role { text } - db.revhistory.attlist = - db.revhistory.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revhistory.info = db._info.title.only - db.revhistory = - - ## A history of the revisions to a document - element revhistory { - db.revhistory.attlist, db.revhistory.info, db.revision+ - } -} -div { - db.revision.role.attribute = attribute role { text } - db.revision.attlist = - db.revision.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revision = - - ## An entry describing a single revision in the history of the revisions to a document - element revision { - db.revision.attlist, - db.revnumber?, - db.date, - (db.authorinitials | db.author)*, - (db.revremark | db.revdescription)? - } -} -div { - db.revnumber.role.attribute = attribute role { text } - db.revnumber.attlist = - db.revnumber.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revnumber = - - ## A document revision number - element revnumber { db.revnumber.attlist, db._text } -} -div { - db.revremark.role.attribute = attribute role { text } - db.revremark.attlist = - db.revremark.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revremark = - - ## A description of a revision to a document - element revremark { db.revremark.attlist, db._text } -} -div { - db.revdescription.role.attribute = attribute role { text } - db.revdescription.attlist = - db.revdescription.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.revdescription = - - ## A extended description of a revision to a document - element revdescription { db.revdescription.attlist, db.all.blocks* } -} -div { - db.seriesvolnums.role.attribute = attribute role { text } - db.seriesvolnums.attlist = - db.seriesvolnums.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.seriesvolnums = - - ## Numbers of the volumes in a series of books - element seriesvolnums { db.seriesvolnums.attlist, db._text } -} -div { - db.volumenum.role.attribute = attribute role { text } - db.volumenum.attlist = - db.volumenum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.volumenum = - - ## The volume number of a document in a set (as of books in a set or articles in a journal) - element volumenum { db.volumenum.attlist, db._text } -} -div { - db.issuenum.role.attribute = attribute role { text } - db.issuenum.attlist = - db.issuenum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.issuenum = - - ## The number of an issue of a journal - element issuenum { db.issuenum.attlist, db._text } -} -div { - db.package.role.attribute = attribute role { text } - db.package.attlist = - db.package.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.package = - - ## A software or application package - element package { db.package.attlist, db._text } -} -div { - db.email.role.attribute = attribute role { text } - db.email.attlist = - db.email.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.email = - - ## An email address - element email { db.email.attlist, db._text } -} -div { - db.lineannotation.role.attribute = attribute role { text } - db.lineannotation.attlist = - db.lineannotation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.lineannotation = - - ## A comment on a line in a verbatim listing - element lineannotation { db.lineannotation.attlist, db._text } -} -div { - db.parameter.class.enumeration = - - ## A command - "command" - | - ## A function - "function" - | - ## An option - "option" - db.parameter.class.attribute = - - ## Identifies the class of parameter - attribute class { db.parameter.class.enumeration } - db.parameter.role.attribute = attribute role { text } - db.parameter.attlist = - db.parameter.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.parameter.class.attribute? - db.parameter = - - ## A value or a symbolic reference to a value - element parameter { db.parameter.attlist, db._text } -} -db.replaceable.inlines = db._text | db.co -div { - db.replaceable.class.enumeration = - - ## A command - "command" - | - ## A function - "function" - | - ## An option - "option" - | - ## A parameter - "parameter" - db.replaceable.class.attribute = - - ## Identifies the nature of the replaceable text - attribute class { db.replaceable.class.enumeration } - db.replaceable.role.attribute = attribute role { text } - db.replaceable.attlist = - db.replaceable.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.replaceable.class.attribute? - db.replaceable = - - ## Content that may or must be replaced by the user - element replaceable { - db.replaceable.attlist, db.replaceable.inlines* - } -} -div { - db.uri.type.attribute = - - ## Identifies the type of URI specified - attribute type { text }? - db.uri.role.attribute = attribute role { text } - db.uri.attlist = - db.uri.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.uri.type.attribute - db.uri = - - ## A Uniform Resource Identifier - element uri { db.uri.attlist, db._text } -} -div { - db.abbrev.role.attribute = attribute role { text } - db.abbrev.attlist = - db.abbrev.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.abbrev = - - ## An abbreviation, especially one followed by a period - element abbrev { - db.abbrev.attlist, - (db._text | db.superscript | db.subscript | db.trademark)* - } -} -div { - db.acronym.role.attribute = attribute role { text } - db.acronym.attlist = - db.acronym.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.acronym = - - ## An often pronounceable word made from the initial (or selected) letters of a name or phrase - element acronym { - db.acronym.attlist, - (db._text | db.superscript | db.subscript | db.trademark)* - } -} -div { - db.citation.role.attribute = attribute role { text } - db.citation.attlist = - db.citation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.citation = - - ## An inline bibliographic reference to another published work - element citation { db.citation.attlist, db.all.inlines* } -} -div { - db.citerefentry.role.attribute = attribute role { text } - db.citerefentry.attlist = - db.citerefentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.citerefentry = - - ## A citation to a reference page - element citerefentry { - db.citerefentry.attlist, db.refentrytitle, db.manvolnum? - } -} -div { - db.refentrytitle.role.attribute = attribute role { text } - db.refentrytitle.attlist = - db.refentrytitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refentrytitle = - - ## The title of a reference page - element refentrytitle { db.refentrytitle.attlist, db.all.inlines* } -} -div { - db.manvolnum.role.attribute = attribute role { text } - db.manvolnum.attlist = - db.manvolnum.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.manvolnum = - - ## A reference volume number - element manvolnum { db.manvolnum.attlist, db._text } -} -div { - db.citetitle.pubwork.enumeration = - - ## An article - "article" - | - ## A bulletin board system - "bbs" - | - ## A book - "book" - | - ## A CD-ROM - "cdrom" - | - ## A chapter (as of a book) - "chapter" - | - ## A DVD - "dvd" - | - ## An email message - "emailmessage" - | - ## A gopher page - "gopher" - | - ## A journal - "journal" - | - ## A manuscript - "manuscript" - | - ## A posting to a newsgroup - "newsposting" - | - ## A part (as of a book) - "part" - | - ## A reference entry - "refentry" - | - ## A section (as of a book or article) - "section" - | - ## A series - "series" - | - ## A set (as of books) - "set" - | - ## A web page - "webpage" - | - ## A wiki page - "wiki" - db.citetitle.pubwork.attribute = - - ## Identifies the nature of the publication being cited - attribute pubwork { db.citetitle.pubwork.enumeration } - db.citetitle.role.attribute = attribute role { text } - db.citetitle.attlist = - db.citetitle.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.citetitle.pubwork.attribute? - db.citetitle = - - ## The title of a cited work - element citetitle { db.citetitle.attlist, db.all.inlines* } -} -div { - db.emphasis.role.attribute = attribute role { text } - db.emphasis.attlist = - db.emphasis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.emphasis = - - ## Emphasized text - element emphasis { db.emphasis.attlist, db.all.inlines* } -} -div { - db._emphasis = - - ## A limited span of emphasized text - element emphasis { db.emphasis.attlist, (db._text | db._emphasis)* } -} -div { - db.foreignphrase.role.attribute = attribute role { text } - db.foreignphrase.attlist = - db.foreignphrase.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.foreignphrase = - - ## A word or phrase in a language other than the primary language of the document - element foreignphrase { - db.foreignphrase.attlist, (text | db.general.inlines)* - } -} -div { - db.phrase.role.attribute = attribute role { text } - db.phrase.attlist = - db.phrase.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.phrase = - - ## A span of text - element phrase { db.phrase.attlist, db.all.inlines* } -} -div { - db._phrase = - - ## A limited span of text - element phrase { db.phrase.attlist, db._text } -} -div { - db.quote.role.attribute = attribute role { text } - db.quote.attlist = - db.quote.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.quote = - - ## An inline quotation - element quote { db.quote.attlist, db.all.inlines* } -} -div { - db.subscript.role.attribute = attribute role { text } - db.subscript.attlist = - db.subscript.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.subscript = - - ## A subscript (as in H2 - ## O, the molecular formula for water) - element subscript { db.subscript.attlist, db._text } -} -div { - db.superscript.role.attribute = attribute role { text } - db.superscript.attlist = - db.superscript.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.superscript = - - ## A superscript (as in x^2, the mathematical notation for x multiplied by itself) - element superscript { db.superscript.attlist, db._text } -} -div { - db.trademark.class.enumeration = - - ## A copyright - "copyright" - | - ## A registered copyright - "registered" - | - ## A service - "service" - | - ## A trademark - "trade" - db.trademark.class.attribute = - - ## Identifies the class of trade mark - attribute class { db.trademark.class.enumeration } - db.trademark.role.attribute = attribute role { text } - db.trademark.attlist = - db.trademark.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.trademark.class.attribute? - db.trademark = - - ## A trademark - element trademark { db.trademark.attlist, db._text } -} -div { - db.wordasword.role.attribute = attribute role { text } - db.wordasword.attlist = - db.wordasword.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.wordasword = - - ## A word meant specifically as a word and not representing anything else - element wordasword { db.wordasword.attlist, db._text } -} -div { - db.footnoteref.role.attribute = attribute role { text } - db.footnoteref.label.attribute = db.label.attribute - db.footnoteref.attlist = - db.footnoteref.role.attribute? - & db.common.attributes - & db.linkend.attribute - & db.footnoteref.label.attribute? - db.footnoteref = - - ## A cross reference to a footnote (a footnote mark) - [ - s:pattern [ - name = "Footnote reference type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:footnoteref" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@linkend]) = 'footnote' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" - "@linkend on footnoteref must point to a footnote." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element footnoteref { db.footnoteref.attlist, empty } -} -div { - db.xref.role.attribute = attribute role { text } - db.xref.xrefstyle.attribute = db.xrefstyle.attribute - db.xref.endterm.attribute = db.endterm.attribute - db.xref.attlist = - db.xref.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - & db.xref.xrefstyle.attribute? - & db.xref.endterm.attribute? - db.xref = - - ## A cross reference to another part of the document - element xref { db.xref.attlist, empty } -} -div { - db.link.role.attribute = attribute role { text } - db.link.xrefstyle.attribute = db.xrefstyle.attribute - db.link.endterm.attribute = db.endterm.attribute - db.link.attlist = - db.link.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - & db.link.xrefstyle.attribute? - & db.link.endterm.attribute? - db.link = - - ## A hypertext link - element link { db.link.attlist, db.all.inlines* } -} -div { - db.olink.role.attribute = attribute role { text } - db.olink.xrefstyle.attribute = db.xrefstyle.attribute - db.olink.localinfo.attribute = - - ## Holds additional information that may be used by the applicatoin when resolving the link - attribute localinfo { text } - db.olink.targetdoc.attribute = - - ## Specifies the URI of the document in which the link target appears - attribute targetdoc { xsd:anyURI } - db.olink.targetptr.attribute = - - ## Specifies the location of the link target in the document - attribute targetptr { text } - db.olink.type.attribute = - - ## Identifies application-specific customization of the link behavior - attribute type { text } - db.olink.attlist = - db.common.attributes - & db.olink.targetdoc.attribute? - & db.olink.role.attribute? - & db.olink.xrefstyle.attribute? - & db.olink.localinfo.attribute? - & db.olink.targetptr.attribute? - & db.olink.type.attribute? - db.olink = - - ## A link that addresses its target indirectly - element olink { db.olink.attlist, db.all.inlines* } -} -div { - db.anchor.role.attribute = attribute role { text } - db.anchor.attlist = - db.anchor.role.attribute? & db.common.idreq.attributes - db.anchor = - - ## A spot in the document - element anchor { db.anchor.attlist, empty } -} -div { - db.alt.role.attribute = attribute role { text } - db.alt.attlist = db.alt.role.attribute? & db.common.attributes - db.alt = - - ## A text-only annotation, often used for accessibility - element alt { db.alt.attlist, (text | db.inlinemediaobject)* } -} -db.status.attribute = - - ## Identifies the editorial or publication status of the element on which it occurs - attribute status { text } -db.toplevel.sections = - ((db.section+, db.simplesect*) | db.simplesect+) - | (db.sect1+, db.simplesect*) - | db.refentry+ - | ((db.section | db.xi.include)+ | (db.simplesect | db.xi.include)+) - | (db.refentry | db.xi.include)+ - | (db.refsect1 | db.xi.include)+ - | (db.sect1 | db.xi.include)+ -db.toplevel.blocks.or.sections = - (db.all.blocks+, db.toplevel.sections?) | db.toplevel.sections -db.recursive.sections = - ((db.section+, db.simplesect*) | db.simplesect+) - | db.refentry+ - | ((db.section | db.xi.include)+ | (db.simplesect | db.xi.include)+) - | (db.refentry | db.xi.include)+ - | (db.refsect1 | db.xi.include)+ -db.recursive.blocks.or.sections = - (db.all.blocks+, db.recursive.sections?) | db.recursive.sections -db.divisions = db.part | db.reference | db.xi.include -db.components = - (db.dedication - | db.acknowledgements - | db.preface - | db.chapter - | db.appendix - | db.article - | db.colophon) - | db.xi.include -db.navigation.components = - notAllowed | db.glossary | db.bibliography | db.index | db.toc -db.component.contentmodel = - db.navigation.components*, - db.toplevel.blocks.or.sections, - db.navigation.components* -db.setindex.components = notAllowed | db.setindex -db.toc.components = notAllowed | db.toc -db.set.components = db.set | db.book -div { - db.set.status.attribute = db.status.attribute - db.set.role.attribute = attribute role { text } - db.set.attlist = - db.set.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.set.status.attribute? - db.set.info = db._info.title.req - db.set = - - ## A collection of books - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:set" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element set { - db.set.attlist, - db.set.info, - db.toc.components?, - db.set.components+, - db.setindex.components? - } -} -div { - db.book.status.attribute = db.status.attribute - db.book.role.attribute = attribute role { text } - db.book.attlist = - db.book.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.book.status.attribute? - db.book.info = db._info - db.book = - - ## A book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:book" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element book { - db.book.attlist, - db.book.info, - (db.navigation.components | db.components | db.divisions)* - } -} -div { - db.dedication.status.attribute = db.status.attribute - db.dedication.role.attribute = attribute role { text } - db.dedication.attlist = - db.dedication.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.dedication.status.attribute? - db.dedication.info = db._info - db.dedication = - - ## The dedication of a book or other component - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:dedication" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element dedication { - db.dedication.attlist, db.dedication.info, db.all.blocks+ - } -} -div { - db.acknowledgements.status.attribute = db.status.attribute - db.acknowledgements.role.attribute = attribute role { text } - db.acknowledgements.attlist = - db.acknowledgements.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.acknowledgements.status.attribute? - db.acknowledgements.info = db._info - db.acknowledgements = - - ## Acknowledgements of a book or other component - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:acknowledgements" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element acknowledgements { - db.acknowledgements.attlist, - db.acknowledgements.info, - db.all.blocks+ - } -} -div { - db.colophon.status.attribute = db.status.attribute - db.colophon.role.attribute = attribute role { text } - db.colophon.attlist = - db.colophon.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.colophon.status.attribute? - db.colophon.info = db._info - db.colophon = - - ## Text at the back of a book describing facts about its production - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:colophon" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element colophon { - db.colophon.attlist, db.colophon.info, db.all.blocks+ - } -} -div { - db.appendix.status.attribute = db.status.attribute - db.appendix.role.attribute = attribute role { text } - db.appendix.attlist = - db.appendix.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.appendix.status.attribute? - db.appendix.info = db._info.title.req - db.appendix = - - ## An appendix in a Book or Article - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:appendix" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element appendix { - db.appendix.attlist, db.appendix.info, db.component.contentmodel - } -} -div { - db.chapter.status.attribute = db.status.attribute - db.chapter.role.attribute = attribute role { text } - db.chapter.attlist = - db.chapter.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.chapter.status.attribute? - db.chapter.info = db._info.title.req - db.chapter = - - ## A chapter, as of a book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:chapter" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element chapter { - db.chapter.attlist, db.chapter.info, db.component.contentmodel - } -} -db.part.components = - (db.navigation.components | db.components) - | (db.refentry | db.reference) - | db.xi.include -div { - db.part.status.attribute = db.status.attribute - db.part.role.attribute = attribute role { text } - db.part.attlist = - db.part.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.part.status.attribute? - db.part.info = db._info.title.req - db.part = - - ## A division in a book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:part" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element part { - db.part.attlist, db.part.info, db.partintro?, db.part.components+ - } -} -div { - db.preface.status.attribute = db.status.attribute - db.preface.role.attribute = attribute role { text } - db.preface.attlist = - db.preface.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.preface.status.attribute? - db.preface.info = db._info.title.req - db.preface = - - ## Introductory matter preceding the first chapter of a book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:preface" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element preface { - db.preface.attlist, db.preface.info, db.component.contentmodel - } -} -div { - db.partintro.status.attribute = db.status.attribute - db.partintro.role.attribute = attribute role { text } - db.partintro.attlist = - db.partintro.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.partintro.status.attribute? - db.partintro.info = db._info - db.partintro = - - ## An introduction to the contents of a part - element partintro { - db.partintro.attlist, - db.partintro.info, - db.toplevel.blocks.or.sections - } -} -div { - db.section.status.attribute = db.status.attribute - db.section.role.attribute = attribute role { text } - db.section.attlist = - db.section.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.section.status.attribute? - db.section.info = db._info.title.req - db.section = - - ## A recursive section - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:section" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element section { - db.section.attlist, - db.section.info, - db.recursive.blocks.or.sections, - db.navigation.components* - } -} -div { - db.simplesect.status.attribute = db.status.attribute - db.simplesect.role.attribute = attribute role { text } - db.simplesect.attlist = - db.simplesect.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.simplesect.status.attribute? - db.simplesect.info = db._info.title.req - db.simplesect = - - ## A section of a document with no subdivisions - element simplesect { - db.simplesect.attlist, db.simplesect.info, db.all.blocks+ - } -} -db.article.components = db.toplevel.sections -div { - db.article.status.attribute = db.status.attribute - db.article.class.enumeration = - - ## A collection of frequently asked questions. - "faq" - | - ## An article in a journal or other periodical. - "journalarticle" - | - ## A description of a product. - "productsheet" - | - ## A specification. - "specification" - | - ## A technical report. - "techreport" - | - ## A white paper. - "whitepaper" - db.article.class.attribute = - - ## Identifies the nature of the article - attribute class { db.article.class.enumeration } - db.article.role.attribute = attribute role { text } - db.article.attlist = - db.article.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.article.status.attribute? - & db.article.class.attribute? - db.article.info = db._info.title.req - db.article = - - ## An article - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:article" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element article { - db.article.attlist, - db.article.info, - (db.navigation.components - | db.appendix - | db.acknowledgements - | db.colophon)*, - ((db.all.blocks+, db.article.components?) - | db.article.components), - (db.navigation.components - | db.appendix - | db.acknowledgements - | db.colophon)* - } -} -db.annotations.attribute = - - ## Identifies one or more annotations that apply to this element - attribute annotations { text } -div { - db.annotation.role.attribute = attribute role { text } - db.annotation.annotates.attribute = - - ## Identifies one ore more elements to which this annotation applies - attribute annotates { text } - db.annotation.attlist = - db.annotation.role.attribute? - & db.annotation.annotates.attribute? - & db.common.attributes - db.annotation.info = db._info.title.only - db.annotation = - - ## An annotation - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:annotation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:annotation)" - "annotation must not occur in the descendants of annotation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element annotation { - db.annotation.attlist, db.annotation.info, db.all.blocks+ - } -} -db.xlink.from.attribute = - - ## Specifies the XLink traversal-from - attribute xlink:from { xsd:NMTOKEN }? -db.xlink.label.attribute = - - ## Specifies the XLink label - attribute xlink:label { xsd:NMTOKEN }? -db.xlink.to.attribute = - - ## Specifies the XLink traversal-to - attribute xlink:to { xsd:NMTOKEN }? -div { - db.extendedlink.role.attribute = attribute role { text } - db.extendedlink.attlist = - db.extendedlink.role.attribute? - & db.common.attributes - & - ## Identifies the XLink link type - [ a:defaultValue = "extended" ] - attribute xlink:type { - - ## An XLink extended link - "extended" - }? - & db.xlink.role.attribute? - & db.xlink.title.attribute? - db.extendedlink = - - ## An XLink extended link - element extendedlink { - db.extendedlink.attlist, (db.locator | db.arc)+ - } -} -div { - db.locator.role.attribute = attribute role { text } - db.locator.attlist = - db.locator.role.attribute? - & db.common.attributes - & - ## Identifies the XLink link type - [ a:defaultValue = "locator" ] - attribute xlink:type { - - ## An XLink locator link - "locator" - }? - & db.xlink.href.attribute - & db.xlink.role.attribute? - & db.xlink.title.attribute? - & db.xlink.label.attribute? - db.locator = - - ## An XLink locator in an extendedlink - element locator { db.locator.attlist, empty } -} -div { - db.arc.role.attribute = attribute role { text } - db.arc.attlist = - db.arc.role.attribute? - & db.common.attributes - & - ## Identifies the XLink link type - [ a:defaultValue = "arc" ] - attribute xlink:type { - - ## An XLink arc link - "arc" - }? - & db.xlink.arcrole.attribute? - & db.xlink.title.attribute? - & db.xlink.show.attribute? - & db.xlink.actuate.attribute? - & db.xlink.from.attribute? - & db.xlink.to.attribute? - db.arc = - - ## An XLink arc in an extendedlink - element arc { db.arc.attlist, empty } -} -db.sect1.sections = - ((db.sect2+, db.simplesect*) | db.simplesect+) - | (db.sect2 | db.xi.include)+ -div { - db.sect1.status.attribute = db.status.attribute - db.sect1.role.attribute = attribute role { text } - db.sect1.attlist = - db.sect1.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect1.status.attribute? - db.sect1.info = db._info.title.req - db.sect1 = - - ## A top-level section of document - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect1" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect1 { - db.sect1.attlist, - db.sect1.info, - ((db.all.blocks+, db.sect1.sections?) | db.sect1.sections), - db.navigation.components* - } -} -db.sect2.sections = - ((db.sect3+, db.simplesect*) | db.simplesect+) - | (db.sect3 | db.xi.include)+ -div { - db.sect2.status.attribute = db.status.attribute - db.sect2.role.attribute = attribute role { text } - db.sect2.attlist = - db.sect2.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect2.status.attribute? - db.sect2.info = db._info.title.req - db.sect2 = - - ## A subsection within a Sect1 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect2" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect2 { - db.sect2.attlist, - db.sect2.info, - ((db.all.blocks+, db.sect2.sections?) | db.sect2.sections), - db.navigation.components* - } -} -db.sect3.sections = - ((db.sect4+, db.simplesect*) | db.simplesect+) - | (db.sect4 | db.xi.include)+ -div { - db.sect3.status.attribute = db.status.attribute - db.sect3.role.attribute = attribute role { text } - db.sect3.attlist = - db.sect3.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect3.status.attribute? - db.sect3.info = db._info.title.req - db.sect3 = - - ## A subsection within a Sect2 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect3" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect3 { - db.sect3.attlist, - db.sect3.info, - ((db.all.blocks+, db.sect3.sections?) | db.sect3.sections), - db.navigation.components* - } -} -db.sect4.sections = - ((db.sect5+, db.simplesect*) | db.simplesect+) - | (db.sect5 | db.xi.include)+ -div { - db.sect4.status.attribute = db.status.attribute - db.sect4.role.attribute = attribute role { text } - db.sect4.attlist = - db.sect4.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect4.status.attribute? - db.sect4.info = db._info.title.req - db.sect4 = - - ## A subsection within a Sect3 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect4" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect4 { - db.sect4.attlist, - db.sect4.info, - ((db.all.blocks+, db.sect4.sections?) | db.sect4.sections), - db.navigation.components* - } -} -db.sect5.sections = db.simplesect+ | (db.simplesect | db.xi.include)+ -div { - db.sect5.status.attribute = db.status.attribute - db.sect5.role.attribute = attribute role { text } - db.sect5.attlist = - db.sect5.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.sect5.status.attribute? - db.sect5.info = db._info.title.req - db.sect5 = - - ## A subsection within a Sect4 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:sect5" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element sect5 { - db.sect5.attlist, - db.sect5.info, - ((db.all.blocks+, db.sect5.sections?) | db.sect5.sections), - db.navigation.components* - } -} -db.toplevel.refsection = - db.refsection+ - | db.refsect1+ - | (db.refentry | db.xi.include)+ - | (db.refsect1 | db.xi.include)+ -db.secondlevel.refsection = - db.refsection+ - | db.refsect2+ - | (db.refentry | db.xi.include)+ - | (db.refsect2 | db.xi.include)+ -db.reference.components = db.refentry | db.xi.include -div { - db.reference.role.attribute = attribute role { text } - db.reference.attlist = - db.reference.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.status.attribute? - & db.label.attribute? - db.reference.info = db._info.title.req - db.reference = - - ## A collection of reference entries - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:reference" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element reference { - db.reference.attlist, - db.reference.info, - db.partintro?, - db.reference.components+ - } -} -div { - db.refentry.role.attribute = attribute role { text } - db.refentry.attlist = - db.refentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.status.attribute? - & db.label.attribute? - db.refentry.info = db._info.title.forbidden - db.refentry = - - ## A reference page (originally a UNIX man-style reference page) - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refentry" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refentry { - db.refentry.attlist, - db.indexterm*, - db.refentry.info, - db.refmeta?, - db.refnamediv+, - db.refsynopsisdiv?, - db.toplevel.refsection - } -} -div { - db.refmeta.role.attribute = attribute role { text } - db.refmeta.attlist = - db.refmeta.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refmeta = - - ## Meta-information for a reference entry - element refmeta { - db.refmeta.attlist, - db.indexterm*, - db.refentrytitle, - db.manvolnum?, - db.refmiscinfo*, - db.indexterm* - } -} -db.refmiscinfo.class.enumeration = - - ## The name of the software product or component to which this topic applies - "source" - | - ## The version of the software product or component to which this topic applies - "version" - | - ## The section title of the reference page (e.g., User Commands) - "manual" - | - ## The section title of the reference page (believed synonymous with "manual" but in wide use) - "sectdesc" - | - ## The name of the software product or component to which this topic applies (e.g., SunOS x.y; believed synonymous with "source" but in wide use) - "software" -db.refmiscinfo.class-enum.attribute = - - ## Identifies the kind of miscellaneous information - attribute class { db.refmiscinfo.class.enumeration }? -db.refmiscinfo.class-other.attribute = - - ## Identifies the nature of non-standard miscellaneous information - attribute otherclass { text } -db.refmiscinfo.class-other.attributes = - - ## Identifies the kind of miscellaneious information - attribute class { - - ## Indicates that the information is some 'other' kind. - "other" - } - & db.refmiscinfo.class-other.attribute -db.refmiscinfo.class.attribute = - db.refmiscinfo.class-enum.attribute - | db.refmiscinfo.class-other.attributes -div { - db.refmiscinfo.role.attribute = attribute role { text } - db.refmiscinfo.attlist = - db.refmiscinfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.refmiscinfo.class.attribute? - db.refmiscinfo = - - ## Meta-information for a reference entry other than the title and volume number - element refmiscinfo { db.refmiscinfo.attlist, db._text } -} -div { - db.refnamediv.role.attribute = attribute role { text } - db.refnamediv.attlist = - db.refnamediv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refnamediv = - - ## The name, purpose, and classification of a reference page - element refnamediv { - db.refnamediv.attlist, - db.refdescriptor?, - db.refname+, - db.refpurpose, - db.refclass* - } -} -div { - db.refdescriptor.role.attribute = attribute role { text } - db.refdescriptor.attlist = - db.refdescriptor.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refdescriptor = - - ## A description of the topic of a reference page - element refdescriptor { db.refdescriptor.attlist, db.all.inlines* } -} -div { - db.refname.role.attribute = attribute role { text } - db.refname.attlist = - db.refname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refname = - - ## The name of (one of) the subject(s) of a reference page - element refname { db.refname.attlist, db.all.inlines* } -} -div { - db.refpurpose.role.attribute = attribute role { text } - db.refpurpose.attlist = - db.refpurpose.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refpurpose = - - ## A short (one sentence) synopsis of the topic of a reference page - element refpurpose { db.refpurpose.attlist, db.all.inlines* } -} -div { - db.refclass.role.attribute = attribute role { text } - db.refclass.attlist = - db.refclass.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refclass = - - ## The scope or other indication of applicability of a reference entry - element refclass { db.refclass.attlist, (text | db.application)* } -} -div { - db.refsynopsisdiv.role.attribute = attribute role { text } - db.refsynopsisdiv.attlist = - db.refsynopsisdiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.refsynopsisdiv.info = db._info - db.refsynopsisdiv = - - ## A syntactic synopsis of the subject of the reference page - element refsynopsisdiv { - db.refsynopsisdiv.attlist, - db.refsynopsisdiv.info, - ((db.all.blocks+, db.secondlevel.refsection?) - | db.secondlevel.refsection) - } -} -div { - db.refsection.role.attribute = attribute role { text } - db.refsection.attlist = - db.refsection.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.status.attribute? - & db.label.attribute? - db.refsection.info = db._info.title.req - db.refsection = - - ## A recursive section in a refentry - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refsection" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refsection { - db.refsection.attlist, - db.refsection.info, - ((db.all.blocks+, db.refsection*) | db.refsection+) - } -} -db.refsect1.sections = db.refsect2+ -div { - db.refsect1.status.attribute = db.status.attribute - db.refsect1.role.attribute = attribute role { text } - db.refsect1.attlist = - db.refsect1.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.refsect1.status.attribute? - db.refsect1.info = db._info.title.req - db.refsect1 = - - ## A major subsection of a reference entry - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refsect1" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refsect1 { - db.refsect1.attlist, - db.refsect1.info, - ((db.all.blocks+, db.refsect1.sections?) | db.refsect1.sections) - } -} -db.refsect2.sections = db.refsect3+ -div { - db.refsect2.status.attribute = db.status.attribute - db.refsect2.role.attribute = attribute role { text } - db.refsect2.attlist = - db.refsect2.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.refsect2.status.attribute? - db.refsect2.info = db._info.title.req - db.refsect2 = - - ## A subsection of a refsect1 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refsect2" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refsect2 { - db.refsect2.attlist, - db.refsect2.info, - ((db.all.blocks+, db.refsect2.sections?) | db.refsect2.sections) - } -} -div { - db.refsect3.status.attribute = db.status.attribute - db.refsect3.role.attribute = attribute role { text } - db.refsect3.attlist = - db.refsect3.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.refsect3.status.attribute? - db.refsect3.info = db._info.title.req - db.refsect3 = - - ## A subsection of a refsect2 - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:refsect3" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element refsect3 { - db.refsect3.attlist, db.refsect3.info, db.all.blocks+ - } -} -db.glossary.inlines = db.firstterm | db.glossterm -db.baseform.attribute = - - ## Specifies the base form of the term, the one that appears in the glossary. This allows adjectival, plural, and other variations of the term to appear in the element. The element content is the default base form. - attribute baseform { text }? -div { - db.glosslist.role.attribute = attribute role { text } - db.glosslist.attlist = - db.glosslist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.glosslist.info = db._info.title.only - db.glosslist = - - ## A wrapper for a list of glossary entries - element glosslist { - db.glosslist.attlist, - db.glosslist.info?, - db.all.blocks*, - db.glossentry+ - } -} -div { - db.glossentry.role.attribute = attribute role { text } - db.glossentry.sortas.attribute = - - ## Specifies the string by which the element's content is to be sorted; if unspecified, the content is used - attribute sortas { text } - db.glossentry.attlist = - db.glossentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.glossentry.sortas.attribute? - db.glossentry = - - ## An entry in a Glossary or GlossList - element glossentry { - db.glossentry.attlist, - db.glossterm, - db.acronym?, - db.abbrev?, - db.indexterm*, - (db.glosssee | db.glossdef+) - } -} -div { - db.glossdef.role.attribute = attribute role { text } - db.glossdef.subject.attribute = - - ## Specifies a list of keywords for the definition - attribute subject { text } - db.glossdef.attlist = - db.glossdef.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.glossdef.subject.attribute? - db.glossdef = - - ## A definition in a GlossEntry - element glossdef { - db.glossdef.attlist, db.all.blocks+, db.glossseealso* - } -} -div { - db.glosssee.role.attribute = attribute role { text } - db.glosssee.otherterm.attribute = - - ## Identifies the other term - attribute otherterm { xsd:IDREF } - db.glosssee.attlist = - db.glosssee.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.glosssee.otherterm.attribute? - db.glosssee = - - ## A cross-reference from one glossentry - ## to another - [ - s:pattern [ - name = "Glosssary 'see' type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:glosssee[@otherterm]" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'" - "@otherterm on glosssee must point to a glossentry." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element glosssee { db.glosssee.attlist, db.all.inlines* } -} -div { - db.glossseealso.role.attribute = attribute role { text } - db.glossseealso.otherterm.attribute = - - ## Identifies the other term - attribute otherterm { xsd:IDREF } - db.glossseealso.attlist = - db.glossseealso.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.glossseealso.otherterm.attribute? - db.glossseealso = - - ## A cross-reference from one GlossEntry to another - [ - s:pattern [ - name = "Glossary 'seealso' type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:glossseealso[@otherterm]" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@otherterm]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@otherterm]) = 'http://docbook.org/ns/docbook'" - "@otherterm on glossseealso must point to a glossentry." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element glossseealso { db.glossseealso.attlist, db.all.inlines* } -} -div { - db.firstterm.role.attribute = attribute role { text } - db.firstterm.attlist = - db.firstterm.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.baseform.attribute - db.firstterm = - - ## The first occurrence of a term - [ - s:pattern [ - name = "Glossary 'firstterm' type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:firstterm[@linkend]" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" - "@linkend on firstterm must point to a glossentry." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element firstterm { db.firstterm.attlist, db.all.inlines* } -} -div { - db.glossterm.role.attribute = attribute role { text } - db.glossterm.attlist = - db.glossterm.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.baseform.attribute - db.glossterm = - - ## A glossary term - [ - s:pattern [ - name = "Glossary 'glossterm' type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:glossterm[@linkend]" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@linkend]) = 'glossentry' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" - "@linkend on glossterm must point to a glossentry." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element glossterm { db.glossterm.attlist, db.all.inlines* } -} -div { - db.glossary.status.attribute = db.status.attribute - db.glossary.role.attribute = attribute role { text } - db.glossary.attlist = - db.glossary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.glossary.status.attribute? - db.glossary.info = db._info - db.glossary = - - ## A glossary - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:glossary" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element glossary { - db.glossary.attlist, - db.glossary.info, - db.all.blocks*, - (db.glossdiv* | db.glossentry*), - db.bibliography? - } -} -div { - db.glossdiv.status.attribute = db.status.attribute - db.glossdiv.role.attribute = attribute role { text } - db.glossdiv.attlist = - db.glossdiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.glossdiv.status.attribute? - db.glossdiv.info = db._info.title.req - db.glossdiv = - - ## A division in a Glossary - element glossdiv { - db.glossdiv.attlist, - db.glossdiv.info, - db.all.blocks*, - db.glossentry+ - } -} -div { - db.termdef.role.attribute = attribute role { text } - db.termdef.attlist = - db.termdef.role.attribute? - & db.glossentry.sortas.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.baseform.attribute - db.termdef = - - ## An inline definition of a term - [ - s:pattern [ - name = "Glossary term definition constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:termdef" - "\x{a}" ~ - " " - s:assert [ - test = "count(db:firstterm) = 1" - "A termdef must contain exactly one firstterm" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element termdef { db.termdef.attlist, db.all.inlines* } -} -db.relation.attribute = - - ## Identifies the relationship between the bibliographic elemnts - attribute relation { text } -div { - db.biblioentry.role.attribute = attribute role { text } - db.biblioentry.attlist = - db.biblioentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.biblioentry = - - ## An entry in a Bibliography - element biblioentry { - db.biblioentry.attlist, db.bibliographic.elements+ - } -} -div { - db.bibliomixed.role.attribute = attribute role { text } - db.bibliomixed.attlist = - db.bibliomixed.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.bibliomixed = - - ## An entry in a Bibliography - element bibliomixed { - db.bibliomixed.attlist, (text | db.bibliographic.elements)* - } -} -div { - db.biblioset.relation.attribute = db.relation.attribute - db.biblioset.role.attribute = attribute role { text } - db.biblioset.attlist = - db.biblioset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.biblioset.relation.attribute? - db.biblioset = - - ## A raw container for related bibliographic information - element biblioset { - db.biblioset.attlist, db.bibliographic.elements+ - } -} -div { - db.bibliomset.relation.attribute = db.relation.attribute - db.bibliomset.role.attribute = attribute role { text } - db.bibliomset.attlist = - db.bibliomset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.bibliomset.relation.attribute? - db.bibliomset = - - ## A cooked container for related bibliographic information - element bibliomset { - db.bibliomset.attlist, (db._text | db.bibliographic.elements)* - } -} -div { - db.bibliomisc.role.attribute = attribute role { text } - db.bibliomisc.attlist = - db.bibliomisc.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.bibliomisc = - - ## Untyped bibliographic information - element bibliomisc { db.bibliomisc.attlist, db._text } -} -div { - db.bibliography.status.attrib = db.status.attribute - db.bibliography.role.attribute = attribute role { text } - db.bibliography.attlist = - db.bibliography.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.bibliography.status.attrib? - db.bibliography.info = db._info - db.bibliography = - - ## A bibliography - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:bibliography" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element bibliography { - db.bibliography.attlist, - db.bibliography.info, - db.all.blocks*, - (db.bibliodiv+ | (db.biblioentry | db.bibliomixed)+) - } -} -div { - db.bibliodiv.status.attrib = db.status.attribute - db.bibliodiv.role.attribute = attribute role { text } - db.bibliodiv.attlist = - db.bibliodiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.bibliodiv.status.attrib? - db.bibliodiv.info = db._info.title.req - db.bibliodiv = - - ## A section of a Bibliography - element bibliodiv { - db.bibliodiv.attlist, - db.bibliodiv.info, - db.all.blocks*, - (db.biblioentry | db.bibliomixed)+ - } -} -div { - db.bibliolist.role.attribute = attribute role { text } - db.bibliolist.attlist = - db.bibliolist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.bibliolist.info = db._info.title.only - db.bibliolist = - - ## A wrapper for a list of bibliography entries - element bibliolist { - db.bibliolist.attlist, - db.bibliolist.info?, - db.all.blocks*, - (db.biblioentry | db.bibliomixed)+ - } -} -div { - db.biblioref.role.attribute = attribute role { text } - db.biblioref.xrefstyle.attribute = db.xrefstyle.attribute - db.biblioref.endterm.attribute = db.endterm.attribute - db.biblioref.units.attribute = - - ## The units (for example, pages) used to identify the beginning and ending of a reference. - attribute units { xsd:token } - db.biblioref.begin.attribute = - - ## Identifies the beginning of a reference; the location within the work that is being referenced. - attribute begin { xsd:token } - db.biblioref.end.attribute = - - ## Identifies the end of a reference. - attribute end { xsd:token } - db.biblioref.attlist = - db.biblioref.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - & db.biblioref.xrefstyle.attribute? - & db.biblioref.endterm.attribute? - & db.biblioref.units.attribute? - & db.biblioref.begin.attribute? - & db.biblioref.end.attribute? - db.biblioref = - - ## A cross-reference to a bibliographic entry - element biblioref { db.biblioref.attlist, empty } -} -db.significance.enumeration = - - ## Normal - "normal" - | - ## Preferred - "preferred" -db.significance.attribute = - - ## Specifies the significance of the term - attribute significance { db.significance.enumeration } -db.zone.attribute = - - ## Specifies the IDs of the elements to which this term applies - attribute zone { xsd:IDREFS } -db.indexterm.pagenum.attribute = - - ## Indicates the page on which this index term occurs in some version of the printed document - attribute pagenum { text } -db.scope.enumeration = - - ## All indexes - "all" - | - ## The global index (as for a combined index of a set of box) - "global" - | - ## The local index (the index for this document only) - "local" -db.scope.attribute = - - ## Specifies the scope of the index term - attribute scope { db.scope.enumeration } -db.sortas.attribute = - - ## Specifies the string by which the term is to be sorted; if unspecified, the term content is used - attribute sortas { text } -db.index.type.attribute = - - ## Specifies the target index for this term - attribute type { text } -div { - db.itermset.role.attribute = attribute role { text } - db.itermset.attlist = - db.itermset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.itermset = - - ## A set of index terms in the meta-information of a document - element itermset { db.itermset.attlist, db.indexterm.singular+ } -} -db.indexterm.contentmodel = - db.primary?, - ((db.secondary, - ((db.tertiary, (db.see | db.seealso+)?) - | db.see - | db.seealso+)?) - | db.see - | db.seealso+)? -div { - db.indexterm.singular.role.attribute = attribute role { text } - db.indexterm.singular.class.attribute = - - ## Identifies the class of index term - attribute class { - - ## A singular index term - "singular" - } - db.indexterm.singular.attlist = - db.indexterm.singular.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.significance.attribute? - & db.zone.attribute? - & db.indexterm.pagenum.attribute? - & db.scope.attribute? - & db.index.type.attribute? - & db.indexterm.singular.class.attribute? - db.indexterm.singular = - - ## A wrapper for an indexed term - element indexterm { - db.indexterm.singular.attlist, db.indexterm.contentmodel - } -} -div { - db.indexterm.startofrange.role.attribute = attribute role { text } - db.indexterm.startofrange.class.attribute = - - ## Identifies the class of index term - attribute class { - - ## The start of a range - "startofrange" - } - db.indexterm.startofrange.attlist = - db.indexterm.startofrange.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.significance.attribute? - & db.zone.attribute? - & db.indexterm.pagenum.attribute? - & db.scope.attribute? - & db.index.type.attribute? - & db.indexterm.startofrange.class.attribute - db.indexterm.startofrange = - - ## A wrapper for an indexed term that covers a range - element indexterm { - db.indexterm.startofrange.attlist, db.indexterm.contentmodel - } -} -div { - db.indexterm.endofrange.role.attribute = attribute role { text } - db.indexterm.endofrange.class.attribute = - - ## Identifies the class of index term - attribute class { - - ## The end of a range - "endofrange" - } - db.indexterm.endofrange.startref.attribute = - - ## Points to the start of the range - attribute startref { xsd:IDREF } - db.indexterm.endofrange.attlist = - db.indexterm.endofrange.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.indexterm.endofrange.class.attribute - & db.indexterm.endofrange.startref.attribute - db.indexterm.endofrange = - - ## Identifies the end of a range associated with an indexed term - element indexterm { db.indexterm.endofrange.attlist, empty } -} -div { - db.indexterm = - db.indexterm.singular - | db.indexterm.startofrange - | db.indexterm.endofrange -} -div { - db.primary.role.attribute = attribute role { text } - db.primary.attlist = - db.primary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.sortas.attribute? - db.primary = - - ## The primary word or phrase under which an index term should be sorted - element primary { db.primary.attlist, db.all.inlines* } -} -div { - db.secondary.role.attribute = attribute role { text } - db.secondary.attlist = - db.secondary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.sortas.attribute? - db.secondary = - - ## A secondary word or phrase in an index term - element secondary { db.secondary.attlist, db.all.inlines* } -} -div { - db.tertiary.role.attribute = attribute role { text } - db.tertiary.attlist = - db.tertiary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.sortas.attribute? - db.tertiary = - - ## A tertiary word or phrase in an index term - element tertiary { db.tertiary.attlist, db.all.inlines* } -} -div { - db.see.role.attribute = attribute role { text } - db.see.attlist = - db.see.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.see = - - ## Part of an index term directing the reader instead to another entry in the index - element see { db.see.attlist, db.all.inlines* } -} -div { - db.seealso.role.attribute = attribute role { text } - db.seealso.attlist = - db.seealso.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.seealso = - - ## Part of an index term directing the reader also to another entry in the index - element seealso { db.seealso.attlist, db.all.inlines* } -} -div { - db.index.status.attribute = db.status.attribute - db.index.role.attribute = attribute role { text } - db.index.attlist = - db.index.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.index.status.attribute? - & db.index.type.attribute? - db.index.info = db._info - # - # Yes, db.indexdiv* and db.indexentry*; that way an is valid. - # Authors can use an empty index to indicate where a generated index should - # appear. - db.index = - - ## An index to a book or part of a book - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:index" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element index { - db.index.attlist, - db.index.info, - db.all.blocks*, - (db.indexdiv* | db.indexentry* | db.segmentedlist) - } -} -div { - db.setindex.status.attribute = db.status.attribute - db.setindex.role.attribute = attribute role { text } - db.setindex.attlist = - db.setindex.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.setindex.status.attribute? - & db.index.type.attribute? - db.setindex.info = db._info - db.setindex = - - ## An index to a set of books - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:setindex" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element setindex { - db.setindex.attlist, - db.setindex.info, - db.all.blocks*, - (db.indexdiv* | db.indexentry*) - } -} -div { - db.indexdiv.status.attribute = db.status.attribute - db.indexdiv.role.attribute = attribute role { text } - db.indexdiv.attlist = - db.indexdiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.label.attribute? - & db.indexdiv.status.attribute? - db.indexdiv.info = db._info.title.req - db.indexdiv = - - ## A division in an index - element indexdiv { - db.indexdiv.attlist, - db.indexdiv.info, - db.all.blocks*, - (db.indexentry+ | db.segmentedlist) - } -} -div { - db.indexentry.role.attribute = attribute role { text } - db.indexentry.attlist = - db.indexentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.indexentry = - - ## An entry in an index - element indexentry { - db.indexentry.attlist, - db.primaryie, - (db.seeie | db.seealsoie)*, - (db.secondaryie, (db.seeie | db.seealsoie | db.tertiaryie)*)* - } -} -div { - db.primaryie.role.attribute = attribute role { text } - db.primaryie.attlist = - db.primaryie.role.attribute? - & db.common.attributes - & db.linkends.attribute? - db.primaryie = - - ## A primary term in an index entry, not in the text - element primaryie { db.primaryie.attlist, db.all.inlines* } -} -div { - db.secondaryie.role.attribute = attribute role { text } - db.secondaryie.attlist = - db.secondaryie.role.attribute? - & db.common.attributes - & db.linkends.attribute? - db.secondaryie = - - ## A secondary term in an index entry, rather than in the text - element secondaryie { db.secondaryie.attlist, db.all.inlines* } -} -div { - db.tertiaryie.role.attribute = attribute role { text } - db.tertiaryie.attlist = - db.tertiaryie.role.attribute? - & db.common.attributes - & db.linkends.attribute? - db.tertiaryie = - - ## A tertiary term in an index entry, rather than in the text - element tertiaryie { db.tertiaryie.attlist, db.all.inlines* } -} -div { - db.seeie.role.attribute = attribute role { text } - db.seeie.attlist = - db.seeie.role.attribute? - & db.common.attributes - & db.linkend.attribute? - db.seeie = - - ## A See - ## entry in an index, rather than in the text - element seeie { db.seeie.attlist, db.all.inlines* } -} -div { - db.seealsoie.role.attribute = attribute role { text } - db.seealsoie.attlist = - db.seealsoie.role.attribute? - & db.common.attributes - & db.linkends.attribute? - db.seealsoie = - - ## A See also - ## entry in an index, rather than in the text - element seealsoie { db.seealsoie.attlist, db.all.inlines* } -} -db.toc.pagenum.attribute = - - ## Indicates the page on which this element occurs in some version of the printed document - attribute pagenum { text } -div { - db.toc.role.attribute = attribute role { text } - db.toc.attlist = - db.toc.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.toc.info = db._info.title.only - db.toc = - - ## A table of contents - [ - s:pattern [ - name = "Root must have version" - "\x{a}" ~ - " " - s:rule [ - context = "/db:toc" - "\x{a}" ~ - " " - s:assert [ - test = "@version" - "The root element must have a version attribute." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element toc { - db.toc.attlist, - db.toc.info, - db.all.blocks*, - (db.tocdiv | db.tocentry)* - } -} -div { - db.tocdiv.role.attribute = attribute role { text } - db.tocdiv.pagenum.attribute = db.toc.pagenum.attribute - db.tocdiv.attlist = - db.tocdiv.role.attribute? - & db.common.attributes - & db.tocdiv.pagenum.attribute? - & db.linkend.attribute? - db.tocdiv.info = db._info - db.tocdiv = - - ## A division in a table of contents - element tocdiv { - db.tocdiv.attlist, - db.tocdiv.info, - db.all.blocks*, - (db.tocdiv | db.tocentry)+ - } -} -div { - db.tocentry.role.attribute = attribute role { text } - db.tocentry.pagenum.attribute = db.toc.pagenum.attribute - db.tocentry.attlist = - db.tocentry.role.attribute? - & db.common.attributes - & db.tocentry.pagenum.attribute? - & db.linkend.attribute? - db.tocentry = - - ## A component title in a table of contents - element tocentry { db.tocentry.attlist, db.all.inlines* } -} -db.task.info = db._info.title.req -div { - db.task.role.attribute = attribute role { text } - db.task.attlist = - db.task.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.task = - - ## A task to be completed - element task { - db.task.attlist, - db.task.info, - db.tasksummary?, - db.taskprerequisites?, - db.procedure, - db.example*, - db.taskrelated? - } -} -div { - db.tasksummary.role.attribute = attribute role { text } - db.tasksummary.attlist = - db.tasksummary.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.tasksummary.info = db._info.title.only - db.tasksummary = - - ## A summary of a task - element tasksummary { - db.tasksummary.attlist, db.tasksummary.info, db.all.blocks+ - } -} -div { - db.taskprerequisites.role.attribute = attribute role { text } - db.taskprerequisites.attlist = - db.taskprerequisites.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.taskprerequisites.info = db._info.title.only - db.taskprerequisites = - - ## The prerequisites for a task - element taskprerequisites { - db.taskprerequisites.attlist, - db.taskprerequisites.info, - db.all.blocks+ - } -} -div { - db.taskrelated.role.attribute = attribute role { text } - db.taskrelated.attlist = - db.taskrelated.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.taskrelated.info = db._info.title.only - db.taskrelated = - - ## Information related to a task - element taskrelated { - db.taskrelated.attlist, db.taskrelated.info, db.all.blocks+ - } -} -db.area.units.enumeration = - - ## Coordinates expressed as a pair of CALS graphic coordinates. - "calspair" - | - ## Coordinates expressed as a line and column. - "linecolumn" - | - ## Coordinates expressed as a pair of lines and columns. - "linecolumnpair" - | - ## Coordinates expressed as a line range. - "linerange" -db.area.units-enum.attribute = - - ## Identifies the units used in the coords attribute The default units vary according to the type of callout specified: calspair - ## for graphics and linecolumn - ## for line-oriented elements. - attribute units { db.area.units.enumeration }? -db.area.units-other.attributes = - - ## Indicates that non-standard units are used for this area - ## . In this case otherunits - ## must be specified. - attribute units { - - ## Coordinates expressed in some non-standard units. - "other" - }?, - - ## Identifies the units used in the coords - ## attribute when the units - ## attribute is other - ## . This attribute is forbidden otherwise. - attribute otherunits { xsd:NMTOKEN } -db.area.units.attribute = - db.area.units-enum.attribute | db.area.units-other.attributes -div { - db.calloutlist.role.attribute = attribute role { text } - db.calloutlist.attlist = - db.calloutlist.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.calloutlist.info = db._info.title.only - db.calloutlist = - - ## A list of callout - ## s - element calloutlist { - db.calloutlist.attlist, - db.calloutlist.info, - db.all.blocks*, - db.callout+ - } -} -div { - db.callout.role.attribute = attribute role { text } - db.callout.arearefs.attribute = - - ## Identifies the areas described by this callout. - attribute arearefs { xsd:IDREFS } - db.callout.attlist = - db.callout.role.attribute? - & db.common.attributes - & db.callout.arearefs.attribute - db.callout = - - ## A called out - ## description of a marked Area - element callout { db.callout.attlist, db.all.blocks+ } -} -div { - db.programlistingco.role.attribute = attribute role { text } - db.programlistingco.attlist = - db.programlistingco.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.programlistingco.info = db._info.title.forbidden - db.programlistingco = - - ## A program listing with associated areas used in callouts - element programlistingco { - db.programlistingco.attlist, - db.programlistingco.info, - db.areaspec, - db.programlisting, - db.calloutlist* - } -} -div { - db.areaspec.role.attribute = attribute role { text } - db.areaspec.attlist = - db.areaspec.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.area.units.attribute - db.areaspec = - - ## A collection of regions in a graphic or code example - element areaspec { db.areaspec.attlist, (db.area | db.areaset)+ } -} -div { - db.area.role.attribute = attribute role { text } - db.area.linkends.attribute = - - ## Point to the callout - ## s which refer to this area. (This provides bidirectional linking which may be useful in online presentation.) - attribute linkends { xsd:IDREFS } - db.area.label.attribute = - - ## Specifies an identifying number or string that may be used in presentation. The area label might be drawn on top of the figure, for example, at the position indicated by the coords attribute. - attribute label { text } - db.area.coords.attribute = - - ## Provides the coordinates of the area. The coordinates must be interpreted using the units - ## specified. - attribute coords { text } - db.area.attlist = - db.area.role.attribute? - & db.common.idreq.attributes - & db.area.units.attribute - & (db.area.linkends.attribute | db.href.attributes)? - & db.area.label.attribute? - & db.area.coords.attribute - db.area = - - ## A region defined for a Callout in a graphic or code example - element area { db.area.attlist, db.alt? } -} -div { - # The only difference is that xml:id is optional - db.area.inareaset.attlist = - db.area.role.attribute? - & db.common.attributes - & db.area.units.attribute - & (db.area.linkends.attribute | db.href.attributes)? - & db.area.label.attribute? - & db.area.coords.attribute - db.area.inareaset = - - ## A region defined for a Callout in a graphic or code example - element area { db.area.inareaset.attlist, db.alt? } -} -div { - db.areaset.role.attribute = attribute role { text } - db.areaset.linkends.attribute = db.linkends.attribute - db.areaset.label.attribute = db.label.attribute - db.areaset.attlist = - db.areaset.role.attribute? - & db.common.idreq.attributes - & db.area.units.attribute - & (db.areaset.linkends.attribute | db.href.attributes)? - & db.areaset.label.attribute? - db.areaset = - - ## A set of related areas in a graphic or code example - element areaset { db.areaset.attlist, db.area.inareaset+ } -} -div { - db.screenco.role.attribute = attribute role { text } - db.screenco.attlist = - db.screenco.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.screenco.info = db._info.title.forbidden - db.screenco = - - ## A screen with associated areas used in callouts - element screenco { - db.screenco.attlist, - db.screenco.info, - db.areaspec, - db.screen, - db.calloutlist* - } -} -div { - db.imageobjectco.role.attribute = attribute role { text } - db.imageobjectco.attlist = - db.imageobjectco.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.imageobjectco.info = db._info.title.forbidden - db.imageobjectco = - - ## A wrapper for an image object with callouts - element imageobjectco { - db.imageobjectco.attlist, - db.imageobjectco.info, - db.areaspec, - db.imageobject+, - db.calloutlist* - } -} -div { - db.co.role.attribute = attribute role { text } - db.co.linkends.attribute = db.linkends.attribute - db.co.label.attribute = db.label.attribute - db.co.attlist = - db.co.role.attribute? - & db.common.idreq.attributes - & db.co.linkends.attribute? - & db.co.label.attribute? - db.co = - - ## The location of a callout embedded in text - element co { db.co.attlist, empty } -} -div { - db.coref.role.attribute = attribute role { text } - db.coref.label.attribute = db.label.attribute - db.coref.attlist = - db.coref.role.attribute? - & db.common.attributes - & db.linkend.attribute - & db.coref.label.attribute? - db.coref = - - ## A cross reference to a co - element coref { db.coref.attlist, empty } -} -div { - db.productionset.role.attribute = attribute role { text } - db.productionset.attlist = - db.productionset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.productionset.info = db._info.title.only - db.productionset = - - ## A set of EBNF productions - element productionset { - db.productionset.attlist, - db.productionset.info, - (db.production | db.productionrecap)+ - } -} -div { - db.production.role.attribute = attribute role { text } - db.production.attlist = - db.production.role.attribute? - & db.common.idreq.attributes - & db.common.linking.attributes - db.production = - - ## A production in a set of EBNF productions - element production { - db.production.attlist, db.lhs, db.rhs, db.constraint* - } -} -div { - db.lhs.role.attribute = attribute role { text } - db.lhs.attlist = - db.lhs.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.lhs = - - ## The left-hand side of an EBNF production - element lhs { db.lhs.attlist, text } -} -div { - db.rhs.role.attribute = attribute role { text } - db.rhs.attlist = - db.rhs.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.rhs = - - ## The right-hand side of an EBNF production - element rhs { - db.rhs.attlist, - (text | db.nonterminal | db.lineannotation | db.sbr)* - } -} -div { - db.nonterminal.role.attribute = attribute role { text } - db.nonterminal.def.attribute = - - ## Specifies a URI that points to a production - ## where the nonterminal - ## is defined - attribute def { xsd:anyURI } - db.nonterminal.attlist = - db.nonterminal.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.nonterminal.def.attribute - db.nonterminal = - - ## A non-terminal in an EBNF production - element nonterminal { db.nonterminal.attlist, text } -} -div { - db.constraint.role.attribute = attribute role { text } - db.constraint.attlist = - db.constraint.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - db.constraint = - - ## A constraint in an EBNF production - element constraint { db.constraint.attlist, empty } -} -div { - db.productionrecap.role.attribute = attribute role { text } - db.productionrecap.attlist = - db.productionrecap.role.attribute? - & db.common.attributes - & db.common.req.linking.attributes - db.productionrecap = - - ## A cross-reference to an EBNF production - element productionrecap { db.productionrecap.attlist, empty } -} -div { - db.constraintdef.role.attribute = attribute role { text } - db.constraintdef.attlist = - db.constraintdef.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.constraintdef.info = db._info.title.only - db.constraintdef = - - ## The definition of a constraint in an EBNF production - element constraintdef { - db.constraintdef.attlist, db.constraintdef.info, db.all.blocks+ - } -} -db.char.attribute = - - ## Specifies the alignment character when align - ## is set to char - ## . - attribute char { text } -db.charoff.attribute = - - ## Specifies the percentage of the column's total width that should appear to the left of the first occurance of the character identified in char - ## when align - ## is set to char - ## . - attribute charoff { - xsd:decimal { minExclusive = "0" maxExclusive = "100" } - } -db.frame.attribute = - - ## Specifies how the table is to be framed. Note that there is no way to obtain a border on only the starting edge (left, in left-to-right writing systems) of the table. - attribute frame { - - ## Frame all four sides of the table. In some environments with limited control over table border formatting, such as HTML, this may imply additional borders. - "all" - | - ## Frame only the bottom of the table. - "bottom" - | - ## Place no border on the table. In some environments with limited control over table border formatting, such as HTML, this may disable other borders as well. - "none" - | - ## Frame the left and right sides of the table. - "sides" - | - ## Frame the top of the table. - "top" - | - ## Frame the top and bottom of the table. - "topbot" - } -db.colsep.attribute = - - ## Specifies the presence or absence of the column separator - attribute colsep { - - ## No column separator rule. - "0" - | - ## Provide a column separator rule on the right - "1" - } -db.rowsep.attribute = - - ## Specifies the presence or absence of the row separator - attribute rowsep { - - ## No row separator rule. - "0" - | - ## Provide a row separator rule below - "1" - } -db.orient.attribute = - - ## Specifies the orientation of the table - attribute orient { - - ## 90 degrees counter-clockwise from the rest of the text flow. - "land" - | - ## The same orientation as the rest of the text flow. - "port" - } -db.tabstyle.attribute = - - ## Specifies the table style - attribute tabstyle { text } -db.rowheader.attribute = - - ## Indicates whether or not the entries in the first column should be considered row headers - attribute rowheader { - - ## Indicates that entries in the first column of the table are functionally row headers (analogous to the way that a thead provides column headers). - "firstcol" - | - ## Indicates that entries in the first column have no special significance with respect to column headers. - "norowheader" - } -db.align.attribute = - - ## Specifies the horizontal alignment of text in an entry. - attribute align { - - ## Centered. - "center" - | - ## Aligned on a particular character. - "char" - | - ## Left and right justified. - "justify" - | - ## Left justified. - "left" - | - ## Right justified. - "right" - } -db.valign.attribute = - - ## Specifies the vertical alignment of text in an entry. - attribute valign { - - ## Aligned on the bottom of the entry. - "bottom" - | - ## Aligned in the middle. - "middle" - | - ## Aligned at the top of the entry. - "top" - } -db.specify-col-by-colname.attributes = - - ## Specifies a column specification by name. - attribute colname { text } -db.specify-col-by-namest.attributes = - - ## Specifies a starting column by name. - attribute namest { text } -db.specify-span-by-spanspec.attributes = - - ## Specifies a span by name. - attribute spanname { text } -db.specify-span-directly.attributes = - - ## Specifies a starting column by name. - attribute namest { text } - & - ## Specifies an ending column by name. - attribute nameend { text } -db.column-spec.attributes = - db.specify-col-by-colname.attributes - | db.specify-col-by-namest.attributes - | db.specify-span-by-spanspec.attributes - | db.specify-span-directly.attributes -db.colname.attribute = - - ## Provides a name for a column specification. - attribute colname { text } -db.spanname.attribute = - - ## Provides a name for a span specification. - attribute spanname { text } -div { - db.tgroup.role.attribute = attribute role { text } - db.tgroup.tgroupstyle.attribute = - - ## Additional style information for downstream processing; typically the name of a style. - attribute tgroupstyle { text } - db.tgroup.cols.attribute = - - ## The number of columns in the table. Must be an integer greater than zero. - attribute cols { xsd:positiveInteger } - db.tgroup.attlist = - db.tgroup.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.char.attribute? - & db.charoff.attribute? - & db.tgroup.tgroupstyle.attribute? - & db.tgroup.cols.attribute - & db.colsep.attribute? - & db.rowsep.attribute? - & db.align.attribute? - db.tgroup = - - ## A wrapper for the main content of a table, or part of a table - element tgroup { - db.tgroup.attlist, - db.colspec*, - db.spanspec*, - db.cals.thead?, - db.cals.tfoot?, - db.cals.tbody - } -} -div { - db.colspec.role.attribute = attribute role { text } - db.colspec.colnum.attribute = - - ## The number of the column to which this specification applies. Must be greater than any preceding column number. Defaults to one more than the number of the preceding column, if there is one, or one. - attribute colnum { xsd:positiveInteger } - db.colspec.colwidth.attribute = - - ## Specifies the width of the column. - attribute colwidth { text } - db.colspec.attlist = - db.colspec.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.colspec.colnum.attribute? - & db.char.attribute? - & db.colsep.attribute? - & db.colspec.colwidth.attribute? - & db.charoff.attribute? - & db.colname.attribute? - & db.rowsep.attribute? - & db.align.attribute? - db.colspec = - - ## Specifications for a column in a table - element colspec { db.colspec.attlist, empty } -} -div { - db.spanspec.role.attribute = attribute role { text } - db.spanspec.namest.attribute = - - ## Specifies a starting column by name. - attribute namest { text } - db.spanspec.nameend.attribute = - - ## Specifies an ending column by name. - attribute nameend { text } - db.spanspec.attlist = - db.spanspec.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.spanname.attribute - & db.spanspec.namest.attribute - & db.spanspec.nameend.attribute - & db.char.attribute? - & db.colsep.attribute? - & db.charoff.attribute? - & db.rowsep.attribute? - & db.align.attribute? - db.spanspec = - - ## Formatting information for a spanned column in a table - element spanspec { db.spanspec.attlist, empty } -} -div { - db.cals.thead.role.attribute = attribute role { text } - db.cals.thead.attlist = - db.cals.thead.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.thead = - - ## A table header consisting of one or more rows - element thead { db.cals.thead.attlist, db.colspec*, db.row+ } -} -div { - db.cals.tfoot.role.attribute = attribute role { text } - db.cals.tfoot.attlist = - db.cals.tfoot.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.tfoot = - - ## A table footer consisting of one or more rows - element tfoot { db.cals.tfoot.attlist, db.colspec*, db.row+ } -} -div { - db.cals.tbody.role.attribute = attribute role { text } - db.cals.tbody.attlist = - db.cals.tbody.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.tbody = - - ## A wrapper for the rows of a table or informal table - element tbody { db.cals.tbody.attlist, db.row+ } -} -div { - db.row.role.attribute = attribute role { text } - db.row.attlist = - db.row.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.rowsep.attribute? - & db.valign.attribute? - db.row = - - ## A row in a table - element row { db.row.attlist, (db.entry | db.entrytbl)+ } -} -div { - db.entry.role.attribute = attribute role { text } - db.entry.morerows.attribute = - - ## Specifies the number of additional rows which this entry occupies. Defaults to zero. - attribute morerows { xsd:integer } - db.entry.rotate.attribute = - - ## Specifies the rotation of this entry. A value of 1 (true) rotates the cell 90 degrees counter-clockwise. A value of 0 (false) leaves the cell unrotated. - attribute rotate { - - ## Do not rotate the cell. - "0" - | - ## Rotate the cell 90 degrees counter-clockwise. - "1" - } - db.entry.attlist = - db.entry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - & db.char.attribute? - & db.colsep.attribute? - & db.charoff.attribute? - & db.entry.morerows.attribute? - & db.column-spec.attributes? - & db.rowsep.attribute? - & db.entry.rotate.attribute? - & db.align.attribute? - db.entry = - - ## A cell in a table - element entry { - db.entry.attlist, (db.all.inlines* | db.all.blocks*) - } -} -div { - db.entrytbl.role.attribute = attribute role { text } - db.entrytbl.tgroupstyle.attribute = - - ## Additional style information for downstream processing; typically the name of a style. - attribute tgroupstyle { text } - db.entrytbl.cols.attribute = - - ## The number of columns in the entry table. Must be an integer greater than zero. - attribute cols { xsd:positiveInteger } - db.entrytbl.attlist = - db.entrytbl.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.char.attribute? - & db.charoff.attribute? - & db.column-spec.attributes? - & db.entrytbl.tgroupstyle.attribute? - & db.entrytbl.cols.attribute? - & db.colsep.attribute? - & db.rowsep.attribute? - & db.align.attribute? - db.entrytbl = - - ## A subtable appearing in place of an Entry in a table - element entrytbl { - db.entrytbl.attlist, - db.colspec*, - db.spanspec*, - db.cals.entrytbl.thead?, - db.cals.entrytbl.tbody - } -} -div { - db.cals.entrytbl.thead.role.attribute = attribute role { text } - db.cals.entrytbl.thead.attlist = - db.cals.entrytbl.thead.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.entrytbl.thead = - - ## A table header consisting of one or more rows - element thead { - db.cals.entrytbl.thead.attlist, db.colspec*, db.entrytbl.row+ - } -} -div { - db.cals.entrytbl.tbody.role.attribute = attribute role { text } - db.cals.entrytbl.tbody.attlist = - db.cals.entrytbl.tbody.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - db.cals.entrytbl.tbody = - - ## A wrapper for the rows of a table or informal table - element tbody { db.cals.entrytbl.tbody.attlist, db.entrytbl.row+ } -} -div { - db.entrytbl.row.role.attribute = attribute role { text } - db.entrytbl.row.attlist = - db.entrytbl.row.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.rowsep.attribute? - & db.valign.attribute? - db.entrytbl.row = - - ## A row in a table - element row { db.entrytbl.row.attlist, db.entry+ } -} -div { - db.cals.table.role.attribute = attribute role { text } - db.cals.table.label.attribute = db.label.attribute - db.cals.table.attlist = - db.cals.table.role.attribute? - & db.cals.table.label.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.tabstyle.attribute? - & db.floatstyle.attribute? - & db.orient.attribute? - & db.colsep.attribute? - & db.rowsep.attribute? - & db.frame.attribute? - & db.pgwide.attribute? - & - ## Indicates if the short or long title should be used in a List of Tables - attribute shortentry { - - ## Indicates that the full title should be used. - "0" - | - ## Indicates that the short short title (titleabbrev) should be used. - "1" - }? - & - ## Indicates if the table should appear in a List of Tables - attribute tocentry { - - ## Indicates that the table should not occur in the List of Tables. - "0" - | - ## Indicates that the table should appear in the List of Tables. - "1" - }? - & db.rowheader.attribute? - db.cals.table.info = db._info.title.onlyreq - db.cals.table = - - ## A formal table in a document - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:informaltable)" - "informaltable must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element table { - db.cals.table.attlist, - db.cals.table.info, - (db.alt? & db.indexing.inlines* & db.textobject*), - (db.mediaobject+ | db.tgroup+), - db.caption? - } -} -div { - db.cals.informaltable.role.attribute = attribute role { text } - db.cals.informaltable.attlist = - db.cals.informaltable.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.tabstyle.attribute? - & db.floatstyle.attribute? - & db.orient.attribute? - & db.colsep.attribute? - & db.rowsep.attribute? - & db.frame.attribute? - & db.pgwide.attribute? - & db.rowheader.attribute? - db.cals.informaltable.info = db._info.title.forbidden - db.cals.informaltable = - - ## A table without a title - element informaltable { - db.cals.informaltable.attlist, - db.cals.informaltable.info, - (db.alt? & db.indexing.inlines* & db.textobject*), - (db.mediaobject+ | db.tgroup+), - db.caption? - } -} -db.html.coreattrs = - - ## This attribute assigns a class name or set of class names to an element. Any number of elements may be assigned the same class name or names. Multiple class names must be separated by white space characters. - attribute class { text }? - & - ## This attribute specifies style information for the current element. - attribute style { text }? - & - ## This attribute offers advisory information about the element for which it is set. - attribute title { text }? -db.html.i18n = - - ## This attribute specifies the base language of an element's attribute values and text content. The default value of this attribute is unknown. - attribute lang { text }? -db.html.events = - - ## Occurs when the pointing device button is clicked over an element. - attribute onclick { text }? - & - ## Occurs when the pointing device button is double clicked over an element. - attribute ondblclick { text }? - & - ## Occurs when the pointing device button is pressed over an element. - attribute onmousedown { text }? - & - ## Occurs when the pointing device button is released over an element. - attribute onmouseup { text }? - & - ## Occurs when the pointing device is moved onto an element. - attribute onmouseover { text }? - & - ## Occurs when the pointing device is moved while it is over an element. - attribute onmousemove { text }? - & - ## Occurs when the pointing device is moved away from an element. - attribute onmouseout { text }? - & - ## Occurs when a key is pressed and released over an element. - attribute onkeypress { text }? - & - ## Occurs when a key is pressed down over an element. - attribute onkeydown { text }? - & - ## Occurs when a key is released over an element. - attribute onkeyup { text }? -db.html.attrs = - db.common.attributes - & db.html.coreattrs - & db.html.i18n - & db.html.events -db.html.cellhalign = - - ## Specifies the alignment of data and the justification of text in a cell. - attribute align { - - ## Left-flush data/Left-justify text. This is the default value for table data. - "left" - | - ## Center data/Center-justify text. This is the default value for table headers. - "center" - | - ## Right-flush data/Right-justify text. - "right" - | - ## Double-justify text. - "justify" - | - ## Align text around a specific character. If a user agent doesn't support character alignment, behavior in the presence of this value is unspecified. - "char" - }? - & - ## This attribute specifies a single character within a text fragment to act as an axis for alignment. The default value for this attribute is the decimal point character for the current language as set by the lang attribute (e.g., the period in English and the comma in French). User agents are not required to support this attribute. - attribute char { text }? - & - ## When present, this attribute specifies the offset to the first occurrence of the alignment character on each line. If a line doesn't include the alignment character, it should be horizontally shifted to end at the alignment position. When charoff is used to set the offset of an alignment character, the direction of offset is determined by the current text direction (set by the dir attribute). In left-to-right texts (the default), offset is from the left margin. In right-to-left texts, offset is from the right margin. User agents are not required to support this attribute. - attribute charoff { - xsd:integer - | xsd:string { pattern = "[0-9]+%" } - }? -db.html.cellvalign = - - ## Specifies the vertical position of data within a cell. - attribute valign { - - ## Cell data is flush with the top of the cell. - "top" - | - ## Cell data is centered vertically within the cell. This is the default value. - "middle" - | - ## Cell data is flush with the bottom of the cell. - "bottom" - | - ## All cells in the same row as a cell whose valign attribute has this value should have their textual data positioned so that the first text line occurs on a baseline common to all cells in the row. This constraint does not apply to subsequent text lines in these cells. - "baseline" - }? -db.html.table.attributes = - - ## Provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille. - attribute summary { text }? - & - ## Specifies the desired width of the entire table and is intended for visual user agents. When the value is a percentage value, the value is relative to the user agent's available horizontal space. In the absence of any width specification, table width is determined by the user agent. - attribute width { - xsd:integer - | xsd:string { pattern = "[0-9]+%" } - }? - & - ## Specifies the width (in pixels only) of the frame around a table. - attribute border { xsd:nonNegativeInteger }? - & - ## Specifies which sides of the frame surrounding a table will be visible. - attribute frame { - - ## No sides. This is the default value. - "void" - | - ## The top side only. - "above" - | - ## The bottom side only. - "below" - | - ## The top and bottom sides only. - "hsides" - | - ## The left-hand side only. - "lhs" - | - ## The right-hand side only. - "rhs" - | - ## The right and left sides only. - "vsides" - | - ## All four sides. - "box" - | - ## All four sides. - "border" - }? - & - ## Specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. - attribute rules { - - ## No rules. This is the default value. - "none" - | - ## Rules will appear between row groups (see thead, tfoot, and tbody) and column groups (see colgroup and col) only. - "groups" - | - ## Rules will appear between rows only. - "rows" - | - ## Rules will appear between columns only. - "cols" - | - ## Rules will appear between all rows and columns. - "all" - }? - & - ## Specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells. - attribute cellspacing { - xsd:integer - | xsd:string { pattern = "[0-9]+%" } - }? - & - ## Specifies the amount of space between the border of the cell and its contents. If the value of this attribute is a pixel length, all four margins should be this distance from the contents. If the value of the attribute is a percentage length, the top and bottom margins should be equally separated from the content based on a percentage of the available vertical space, and the left and right margins should be equally separated from the content based on a percentage of the available horizontal space. - attribute cellpadding { - xsd:integer - | xsd:string { pattern = "[0-9]+%" } - }? -db.html.tablecell.attributes = - - ## Provides an abbreviated form of the cell's content and may be rendered by user agents when appropriate in place of the cell's content. Abbreviated names should be short since user agents may render them repeatedly. For instance, speech synthesizers may render the abbreviated headers relating to a particular cell before rendering that cell's content. - attribute abbr { text }? - & - ## This attribute may be used to place a cell into conceptual categories that can be considered to form axes in an n-dimensional space. User agents may give users access to these categories (e.g., the user may query the user agent for all cells that belong to certain categories, the user agent may present a table in the form of a table of contents, etc.). Please consult an HTML reference for more details. - attribute axis { text }? - & - ## Specifies the list of header cells that provide header information for the current data cell. The value of this attribute is a space-separated list of cell names; those cells must be named by setting their id attribute. Authors generally use the headers attribute to help non-visual user agents render header information about data cells (e.g., header information is spoken prior to the cell data), but the attribute may also be used in conjunction with style sheets. - attribute headers { text }? - & - ## Specifies the set of data cells for which the current header cell provides header information. This attribute may be used in place of the headers attribute, particularly for simple tables. - attribute scope { - - ## The current cell provides header information for the rest of the row that contains it - "row" - | - ## The current cell provides header information for the rest of the column that contains it. - "col" - | - ## The header cell provides header information for the rest of the row group that contains it. - "rowgroup" - | - ## The header cell provides header information for the rest of the column group that contains it. - "colgroup" - }? - & - ## Specifies the number of rows spanned by the current cell. The default value of this attribute is one (1 - ## ). The value zero (0 - ## ) means that the cell spans all rows from the current row to the last row of the table section (thead - ## , tbody - ## , or tfoot - ## ) in which the cell is defined. - attribute rowspan { xsd:nonNegativeInteger }? - & - ## Specifies the number of columns spanned by the current cell. The default value of this attribute is one (1 - ## ). The value zero (0 - ## ) means that the cell spans all columns from the current column to the last column of the column group (colgroup - ## ) in which the cell is defined. - attribute colspan { xsd:nonNegativeInteger }? -db.html.table.info = db._info.title.forbidden -db.html.table.model = - db.html.table.info?, - db.html.caption, - (db.html.col* | db.html.colgroup*), - db.html.thead?, - db.html.tfoot?, - (db.html.tbody+ | db.html.tr+) -db.html.informaltable.info = db._info.title.forbidden -db.html.informaltable.model = - db.html.informaltable.info?, - (db.html.col* | db.html.colgroup*), - db.html.thead?, - db.html.tfoot?, - (db.html.tbody+ | db.html.tr+) -div { - db.html.table.role.attribute = attribute role { text } - db.html.table.label.attribute = db.label.attribute - db.html.table.attlist = - db.html.attrs - & db.html.table.attributes - & db.html.table.role.attribute? - & db.html.table.label.attribute? - & db.orient.attribute? - & db.pgwide.attribute? - & db.tabstyle.attribute? - & db.floatstyle.attribute? - db.html.table = - - ## A formal (captioned) HTML table in a document - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:informaltable)" - "informaltable must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:table" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of table" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element table { db.html.table.attlist, db.html.table.model } -} -div { - db.html.informaltable.attlist = - db.html.attrs & db.html.table.attributes - db.html.informaltable = - - ## An HTML table without a title - element informaltable { - db.html.informaltable.attlist, db.html.informaltable.model - } -} -div { - db.html.caption.attlist = db.html.attrs - db.html.caption = - - ## An HTML table caption - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:sidebar)" - "sidebar must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:task)" - "task must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caption" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of caption" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element caption { db.html.caption.attlist, db.all.inlines* } -} -div { - db.html.col.attlist = - db.html.attrs - & - ## This attribute, whose value must be an integer > 0, specifies the number of columns spanned - ## by the col - ## element; the col - ## element shares its attributes with all the columns it spans. The default value for this attribute is 1 (i.e., a single column). If the span attribute is set to N > 1, the current col - ## element shares its attributes with the next N-1 columns. - attribute span { xsd:nonNegativeInteger }? - & - ## Specifies a default width for each column spanned by the current col - ## element. It has the same meaning as the width - ## attribute for the colgroup - ## element and overrides it. - attribute width { text }? - & db.html.cellhalign - & db.html.cellvalign - db.html.col = - - ## Specifications for a column in an HTML table - element col { db.html.col.attlist, empty } -} -div { - db.html.colgroup.attlist = - db.html.attrs - & - ## This attribute, which must be an integer > 0, specifies the number of columns in a column group. In the absence of a span attribute, each colgroup - ## defines a column group containing one column. If the span attribute is set to N > 0, the current colgroup - ## element defines a column group containing N columns. User agents must ignore this attribute if the colgroup - ## element contains one or more col - ## elements. - attribute span { xsd:nonNegativeInteger }? - & - ## This attribute specifies a default width for each column in the current column group. In addition to the standard pixel, percentage, and relative values, this attribute allows the special form 0* - ## (zero asterisk) which means that the width of the each column in the group should be the minimum width necessary to hold the column's contents. This implies that a column's entire contents must be known before its width may be correctly computed. Authors should be aware that specifying 0* - ## will prevent visual user agents from rendering a table incrementally. This attribute is overridden for any column in the column group whose width is specified via a col - ## element. - attribute width { text }? - & db.html.cellhalign - & db.html.cellvalign - db.html.colgroup = - - ## A group of columns in an HTML table - element colgroup { db.html.colgroup.attlist, db.html.col* } -} -div { - db.html.thead.attlist = - db.html.attrs & db.html.cellhalign & db.html.cellvalign - db.html.thead = - - ## A table header consisting of one or more rows in an HTML table - element thead { db.html.thead.attlist, db.html.tr+ } -} -div { - db.html.tfoot.attlist = - db.html.attrs & db.html.cellhalign & db.html.cellvalign - db.html.tfoot = - - ## A table footer consisting of one or more rows in an HTML table - element tfoot { db.html.tfoot.attlist, db.html.tr+ } -} -div { - db.html.tbody.attlist = - db.html.attrs & db.html.cellhalign & db.html.cellvalign - db.html.tbody = - - ## A wrapper for the rows of an HTML table or informal HTML table - element tbody { db.html.tbody.attlist, db.html.tr+ } -} -div { - db.html.tr.attlist = - db.html.attrs & db.html.cellhalign & db.html.cellvalign - db.html.tr = - - ## A row in an HTML table - element tr { db.html.tr.attlist, (db.html.th | db.html.td)+ } -} -div { - db.html.th.attlist = - db.html.attrs - & db.html.tablecell.attributes - & db.html.cellhalign - & db.html.cellvalign - db.html.th = - - ## A table header entry in an HTML table - element th { - db.html.th.attlist, (db.all.inlines* | db.all.blocks*) - } -} -div { - db.html.td.attlist = - db.html.attrs - & db.html.tablecell.attributes - & db.html.cellhalign - & db.html.cellvalign - db.html.td = - - ## A table entry in an HTML table - element td { - db.html.td.attlist, (db.all.inlines* | db.all.blocks*) - } -} -div { - db.msgset.role.attribute = attribute role { text } - db.msgset.attlist = - db.msgset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgset.info = db._info.title.only - db.msgset = - - ## A detailed set of messages, usually error messages - element msgset { - db.msgset.attlist, - db.msgset.info, - (db.msgentry+ | db.simplemsgentry+) - } -} -div { - db.msgentry.role.attribute = attribute role { text } - db.msgentry.attlist = - db.msgentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgentry = - - ## A wrapper for an entry in a message set - element msgentry { - db.msgentry.attlist, db.msg+, db.msginfo?, db.msgexplan* - } -} -div { - db.simplemsgentry.role.attribute = attribute role { text } - db.simplemsgentry.msgaud.attribute = - - ## The audience to which the message relevant - attribute msgaud { text } - db.simplemsgentry.msgorig.attribute = - - ## The origin of the message - attribute msgorig { text } - db.simplemsgentry.msglevel.attribute = - - ## The level of importance or severity of a message - attribute msglevel { text } - db.simplemsgentry.attlist = - db.simplemsgentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.simplemsgentry.msgaud.attribute? - & db.simplemsgentry.msgorig.attribute? - & db.simplemsgentry.msglevel.attribute? - db.simplemsgentry = - - ## A wrapper for a simpler entry in a message set - element simplemsgentry { - db.simplemsgentry.attlist, db.msgtext, db.msgexplan+ - } -} -div { - db.msg.role.attribute = attribute role { text } - db.msg.attlist = - db.msg.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msg.info = db._info.title.only - db.msg = - - ## A message in a message set - element msg { - db.msg.attlist, db.msg.info, db.msgmain, (db.msgsub | db.msgrel)* - } -} -div { - db.msgmain.role.attribute = attribute role { text } - db.msgmain.attlist = - db.msgmain.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgmain.info = db._info.title.only - db.msgmain = - - ## The primary component of a message in a message set - element msgmain { db.msgmain.attlist, db.msgmain.info, db.msgtext } -} -div { - db.msgsub.role.attribute = attribute role { text } - db.msgsub.attlist = - db.msgsub.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgsub.info = db._info.title.only - db.msgsub = - - ## A subcomponent of a message in a message set - element msgsub { db.msgsub.attlist, db.msgsub.info, db.msgtext } -} -div { - db.msgrel.role.attribute = attribute role { text } - db.msgrel.attlist = - db.msgrel.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgrel.info = db._info.title.only - db.msgrel = - - ## A related component of a message in a message set - element msgrel { db.msgrel.attlist, db.msgrel.info, db.msgtext } -} -div { - db.msgtext.role.attribute = attribute role { text } - db.msgtext.attlist = - db.msgtext.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgtext = - - ## The actual text of a message component in a message set - element msgtext { db.msgtext.attlist, db.all.blocks+ } -} -div { - db.msginfo.role.attribute = attribute role { text } - db.msginfo.attlist = - db.msginfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msginfo = - - ## Information about a message in a message set - element msginfo { - db.msginfo.attlist, (db.msglevel | db.msgorig | db.msgaud)* - } -} -div { - db.msglevel.role.attribute = attribute role { text } - db.msglevel.attlist = - db.msglevel.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msglevel = - - ## The level of importance or severity of a message in a message set - element msglevel { db.msglevel.attlist, db._text } -} -div { - db.msgorig.role.attribute = attribute role { text } - db.msgorig.attlist = - db.msgorig.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgorig = - - ## The origin of a message in a message set - element msgorig { db.msgorig.attlist, db._text } -} -div { - db.msgaud.role.attribute = attribute role { text } - db.msgaud.attlist = - db.msgaud.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgaud = - - ## The audience to which a message in a message set is relevant - element msgaud { db.msgaud.attlist, db._text } -} -div { - db.msgexplan.role.attribute = attribute role { text } - db.msgexplan.attlist = - db.msgexplan.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.msgexplan.info = db._info.title.only - db.msgexplan = - - ## Explanatory material relating to a message in a message set - element msgexplan { - db.msgexplan.attlist, db.msgexplan.info, db.all.blocks+ - } -} -div { - db.qandaset.role.attribute = attribute role { text } - db.qandaset.defaultlabel.enumeration = - - ## No labels - "none" - | - ## Numeric labels - "number" - | - ## "Q:" and "A:" labels - "qanda" - db.qandaset.defaultlabel.attribute = - - ## Specifies the default labelling - attribute defaultlabel { db.qandaset.defaultlabel.enumeration } - db.qandaset.attlist = - db.qandaset.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.qandaset.defaultlabel.attribute? - db.qandaset.info = db._info.title.only - db.qandaset = - - ## A question-and-answer set - element qandaset { - db.qandaset.attlist, - db.qandaset.info, - db.all.blocks*, - (db.qandadiv+ | db.qandaentry+) - } -} -div { - db.qandadiv.role.attribute = attribute role { text } - db.qandadiv.attlist = - db.qandadiv.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.qandadiv.info = db._info.title.only - db.qandadiv = - - ## A titled division in a QandASet - element qandadiv { - db.qandadiv.attlist, - db.qandadiv.info, - db.all.blocks*, - (db.qandadiv+ | db.qandaentry+) - } -} -div { - db.qandaentry.role.attribute = attribute role { text } - db.qandaentry.attlist = - db.qandaentry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.qandaentry.info = db._info.title.only - db.qandaentry = - - ## A question/answer set within a QandASet - element qandaentry { - db.qandaentry.attlist, db.qandaentry.info, db.question, db.answer* - } -} -div { - db.question.role.attribute = attribute role { text } - db.question.attlist = - db.question.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.question = - - ## A question in a QandASet - element question { db.question.attlist, db.label?, db.all.blocks+ } -} -div { - db.answer.role.attribute = attribute role { text } - db.answer.attlist = - db.answer.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.answer = - - ## An answer to a question posed in a QandASet - element answer { db.answer.attlist, db.label?, db.all.blocks+ } -} -div { - db.label.role.attribute = attribute role { text } - db.label.attlist = - db.label.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.label = - - ## A label on a Question or Answer - element label { db.label.attlist, db._text } -} -db.math.inlines = db.inlineequation -db.equation.content = (db.mediaobject+ | db.mathphrase+) | db._any.mml+ -db.inlineequation.content = - (db.inlinemediaobject+ | db.mathphrase+) | db._any.mml+ -div { - db.equation.role.attribute = attribute role { text } - db.equation.label.attribute = db.label.attribute - db.equation.attlist = - db.equation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.equation.label.attribute? - & db.pgwide.attribute? - & db.floatstyle.attribute? - db.equation.info = db._info.title.only - db.equation = - - ## A displayed mathematical equation - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:example)" - "example must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:figure)" - "figure must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:table)" - "table must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:equation)" - "equation must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:equation" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of equation" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element equation { - db.equation.attlist, - db.equation.info, - db.alt?, - db.equation.content, - db.caption? - } -} -div { - db.informalequation.role.attribute = attribute role { text } - db.informalequation.attlist = - db.informalequation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.informalequation.info = db._info.title.forbidden - db.informalequation = - - ## A displayed mathematical equation without a title - element informalequation { - db.informalequation.attlist, - db.informalequation.info, - db.alt?, - db.equation.content, - db.caption? - } -} -div { - db.inlineequation.role.attribute = attribute role { text } - db.inlineequation.attlist = - db.inlineequation.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.inlineequation = - - ## A mathematical equation or expression occurring inline - element inlineequation { - db.inlineequation.attlist, db.alt?, db.inlineequation.content - } -} -div { - db.mathphrase.role.attribute = attribute role { text } - db.mathphrase.attlist = - db.mathphrase.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.mathphrase = - - ## A mathematical phrase, an expression that can be represented with ordinary text and a small amount of markup - element mathphrase { - db.mathphrase.attlist, - (db._text | db.ubiq.inlines | db._emphasis)* - } -} -div { - db.imagedata.mathml.role.attribute = attribute role { text } - db.imagedata.mathml.attlist = - db.imagedata.mathml.role.attribute? - & db.common.attributes - & - ## Specifies that the format of the data is MathML - attribute format { - - ## Specifies MathML. - "mathml" - }? - & db.imagedata.align.attribute? - & db.imagedata.valign.attribute? - & db.imagedata.width.attribute? - & db.imagedata.contentwidth.attribute? - & db.imagedata.scalefit.attribute? - & db.imagedata.scale.attribute? - & db.imagedata.depth.attribute? - & db.imagedata.contentdepth.attribute? - db.imagedata.mathml.info = db._info.title.forbidden - db.imagedata.mathml = - - ## A MathML expression in a media object - element imagedata { - db.imagedata.mathml.attlist, - db.imagedata.mathml.info, - db._any.mml+ - } -} -div { - db._any.mml = - - ## Any element from the MathML namespace - element mml:* { (db._any.attribute | text | db._any)* } -} -div { - db.imagedata.svg.role.attribute = attribute role { text } - db.imagedata.svg.attlist = - db.imagedata.svg.role.attribute? - & db.common.attributes - & - ## Specifies that the format of the data is SVG - attribute format { - - ## Specifies SVG. - "svg" - }? - & db.imagedata.align.attribute? - & db.imagedata.valign.attribute? - & db.imagedata.width.attribute? - & db.imagedata.contentwidth.attribute? - & db.imagedata.scalefit.attribute? - & db.imagedata.scale.attribute? - & db.imagedata.depth.attribute? - & db.imagedata.contentdepth.attribute? - db.imagedata.svg.info = db._info.title.forbidden - db.imagedata.svg = - - ## An SVG drawing in a media object - element imagedata { - db.imagedata.svg.attlist, db.imagedata.svg.info, db._any.svg+ - } -} -div { - db._any.svg = - - ## Any element from the SVG namespace - element svg:* { (db._any.attribute | text | db._any)* } -} -db.markup.inlines = - db.tag - | db.markup - | db.token - | db.symbol - | db.literal - | db.code - | db.constant - | db.email - | db.uri -div { - db.markup.role.attribute = attribute role { text } - db.markup.attlist = - db.markup.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.markup = - - ## A string of formatting markup in text that is to be represented literally - element markup { db.markup.attlist, db._text } -} -div { - db.tag.role.attribute = attribute role { text } - db.tag.class.enumeration = - - ## An attribute - "attribute" - | - ## An attribute value - "attvalue" - | - ## An element - "element" - | - ## An empty element tag - "emptytag" - | - ## An end tag - "endtag" - | - ## A general entity - "genentity" - | - ## The local name part of a qualified name - "localname" - | - ## A namespace - "namespace" - | - ## A numeric character reference - "numcharref" - | - ## A parameter entity - "paramentity" - | - ## A processing instruction - "pi" - | - ## The prefix part of a qualified name - "prefix" - | - ## An SGML comment - "comment" - | - ## A start tag - "starttag" - | - ## An XML processing instruction - "xmlpi" - db.tag.class.attribute = - - ## Identifies the nature of the tag content - attribute class { db.tag.class.enumeration } - db.tag.namespace.attribute = - - ## Identifies the namespace of the tag content - attribute namespace { xsd:anyURI } - db.tag.attlist = - db.tag.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.tag.class.attribute? - & db.tag.namespace.attribute? - db.tag = - - ## A component of XML (or SGML) markup - element tag { db.tag.attlist, db._text } -} -div { - db.symbol.class.attribute = - - ## Identifies the class of symbol - attribute class { - - ## The value is a limit of some kind - "limit" - } - db.symbol.role.attribute = attribute role { text } - db.symbol.attlist = - db.symbol.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.symbol.class.attribute? - db.symbol = - - ## A name that is replaced by a value before processing - element symbol { db.symbol.attlist, db._text } -} -div { - db.token.role.attribute = attribute role { text } - db.token.attlist = - db.token.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.token = - - ## A unit of information - element token { db.token.attlist, db._text } -} -div { - db.literal.role.attribute = attribute role { text } - db.literal.attlist = - db.literal.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.literal = - - ## Inline text that is some literal value - element literal { db.literal.attlist, db._text } -} -div { - code.language.attribute = - - ## Identifies the (computer) language of the code fragment - attribute language { text } - db.code.role.attribute = attribute role { text } - db.code.attlist = - db.code.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & code.language.attribute? - db.code = - - ## An inline code fragment - element code { - db.code.attlist, (db.programming.inlines | db._text)* - } -} -div { - db.constant.class.attribute = - - ## Identifies the class of constant - attribute class { - - ## The value is a limit of some kind - "limit" - } - db.constant.role.attribute = attribute role { text } - db.constant.attlist = - db.constant.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.constant.class.attribute? - db.constant = - - ## A programming or system constant - element constant { db.constant.attlist, db._text } -} -div { - db.productname.role.attribute = attribute role { text } - db.productname.class.enumeration = - - ## A name with a copyright - "copyright" - | - ## A name with a registered copyright - "registered" - | - ## A name of a service - "service" - | - ## A name which is trademarked - "trade" - db.productname.class.attribute = - - ## Specifies the class of product name - attribute class { db.productname.class.enumeration } - db.productname.attlist = - db.productname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.productname.class.attribute? - db.productname = - - ## The formal name of a product - element productname { db.productname.attlist, db._text } -} -div { - db.productnumber.role.attribute = attribute role { text } - db.productnumber.attlist = - db.productnumber.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.productnumber = - - ## A number assigned to a product - element productnumber { db.productnumber.attlist, db._text } -} -div { - db.database.class.enumeration = - - ## An alternate or secondary key - "altkey" - | - ## A constraint - "constraint" - | - ## A data type - "datatype" - | - ## A field - "field" - | - ## A foreign key - "foreignkey" - | - ## A group - "group" - | - ## An index - "index" - | - ## The first or primary key - "key1" - | - ## An alternate or secondary key - "key2" - | - ## A name - "name" - | - ## The primary key - "primarykey" - | - ## A (stored) procedure - "procedure" - | - ## A record - "record" - | - ## A rule - "rule" - | - ## The secondary key - "secondarykey" - | - ## A table - "table" - | - ## A user - "user" - | - ## A view - "view" - db.database.class.attribute = - - ## Identifies the class of database artifact - attribute class { db.database.class.enumeration } - db.database.role.attribute = attribute role { text } - db.database.attlist = - db.database.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.database.class.attribute? - db.database = - - ## The name of a database, or part of a database - element database { db.database.attlist, db._text } -} -div { - db.application.class.enumeration = - - ## A hardware application - "hardware" - | - ## A software application - "software" - db.application.class.attribute = - - ## Identifies the class of application - attribute class { db.application.class.enumeration } - db.application.role.attribute = attribute role { text } - db.application.attlist = - db.application.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.application.class.attribute? - db.application = - - ## The name of a software program - element application { db.application.attlist, db._text } -} -div { - db.hardware.role.attribute = attribute role { text } - db.hardware.attlist = - db.hardware.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.hardware = - - ## A physical part of a computer system - element hardware { db.hardware.attlist, db._text } -} -db.gui.inlines = - db.guiicon - | db.guibutton - | db.guimenuitem - | db.guimenu - | db.guisubmenu - | db.guilabel - | db.menuchoice - | db.mousebutton -div { - db.guibutton.role.attribute = attribute role { text } - db.guibutton.attlist = - db.guibutton.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guibutton = - - ## The text on a button in a GUI - element guibutton { - db.guibutton.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guiicon.role.attribute = attribute role { text } - db.guiicon.attlist = - db.guiicon.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guiicon = - - ## Graphic and/or text appearing as a icon in a GUI - element guiicon { - db.guiicon.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guilabel.role.attribute = attribute role { text } - db.guilabel.attlist = - db.guilabel.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guilabel = - - ## The text of a label in a GUI - element guilabel { - db.guilabel.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guimenu.role.attribute = attribute role { text } - db.guimenu.attlist = - db.guimenu.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guimenu = - - ## The name of a menu in a GUI - element guimenu { - db.guimenu.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guimenuitem.role.attribute = attribute role { text } - db.guimenuitem.attlist = - db.guimenuitem.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guimenuitem = - - ## The name of a terminal menu item in a GUI - element guimenuitem { - db.guimenuitem.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.guisubmenu.role.attribute = attribute role { text } - db.guisubmenu.attlist = - db.guisubmenu.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.guisubmenu = - - ## The name of a submenu in a GUI - element guisubmenu { - db.guisubmenu.attlist, - (db._text | db.accel | db.superscript | db.subscript)* - } -} -div { - db.menuchoice.role.attribute = attribute role { text } - db.menuchoice.attlist = - db.menuchoice.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.menuchoice = - - ## A selection or series of selections from a menu - element menuchoice { - db.menuchoice.attlist, - db.shortcut?, - (db.guibutton - | db.guiicon - | db.guilabel - | db.guimenu - | db.guimenuitem - | db.guisubmenu)+ - } -} -div { - db.mousebutton.role.attribute = attribute role { text } - db.mousebutton.attlist = - db.mousebutton.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.mousebutton = - - ## The conventional name of a mouse button - element mousebutton { db.mousebutton.attlist, db._text } -} -db.keyboard.inlines = - db.keycombo - | db.keycap - | db.keycode - | db.keysym - | db.shortcut - | db.accel -div { - db.keycap.function.enumeration = - - ## The "Alt" key - "alt" - | - ## The "Backspace" key - "backspace" - | - ## The "Command" key - "command" - | - ## The "Control" key - "control" - | - ## The "Delete" key - "delete" - | - ## The down arrow - "down" - | - ## The "End" key - "end" - | - ## The "Enter" or "Return" key - "enter" - | - ## The "Escape" key - "escape" - | - ## The "Home" key - "home" - | - ## The "Insert" key - "insert" - | - ## The left arrow - "left" - | - ## The "Meta" key - "meta" - | - ## The "Option" key - "option" - | - ## The page down key - "pagedown" - | - ## The page up key - "pageup" - | - ## The right arrow - "right" - | - ## The "Shift" key - "shift" - | - ## The spacebar - "space" - | - ## The "Tab" key - "tab" - | - ## The up arrow - "up" - db.keycap.function-enum.attribute = - - ## Identifies the function key - attribute function { db.keycap.function.enumeration }? - db.keycap.function-other.attributes = - - ## Identifies the function key - attribute function { - - ## Indicates a non-standard function key - "other" - }?, - - ## Specifies a keyword that identifies the non-standard key - attribute otherfunction { text } - db.keycap.function.attrib = - db.keycap.function-enum.attribute - | db.keycap.function-other.attributes - db.keycap.role.attribute = attribute role { text } - db.keycap.attlist = - db.keycap.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.keycap.function.attrib - db.keycap = - - ## The text printed on a key on a keyboard - element keycap { db.keycap.attlist, db._text } -} -div { - db.keycode.role.attribute = attribute role { text } - db.keycode.attlist = - db.keycode.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.keycode = - - ## The internal, frequently numeric, identifier for a key on a keyboard - element keycode { db.keycode.attlist, db._text } -} -db.keycombination.contentmodel = - (db.keycap | db.keycombo | db.keysym) | db.mousebutton -div { - db.keycombo.action.enumeration = - - ## A (single) mouse click. - "click" - | - ## A double mouse click. - "double-click" - | - ## A mouse or key press. - "press" - | - ## Sequential clicks or presses. - "seq" - | - ## Simultaneous clicks or presses. - "simul" - db.keycombo.action-enum.attribute = - - ## Identifies the nature of the action taken. If keycombo - ## contains more than one element, simul - ## is the default, otherwise there is no default. - attribute action { db.keycombo.action.enumeration }? - db.keycombo.action-other.attributes = - - ## Identifies the nature of the action taken - attribute action { - - ## Indicates a non-standard action - "other" - }?, - - ## Identifies the non-standard action in some unspecified way. - attribute otheraction { text } - db.keycombo.action.attrib = - db.keycombo.action-enum.attribute - | db.keycombo.action-other.attributes - db.keycombo.role.attribute = attribute role { text } - db.keycombo.attlist = - db.keycombo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.keycombo.action.attrib - db.keycombo = - - ## A combination of input actions - element keycombo { - db.keycombo.attlist, db.keycombination.contentmodel+ - } -} -div { - db.keysym.role.attribute = attribute role { text } - db.keysym.attlist = - db.keysym.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.keysym = - - ## The symbolic name of a key on a keyboard - element keysym { db.keysym.attlist, db._text } -} -div { - db.accel.role.attribute = attribute role { text } - db.accel.attlist = - db.accel.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.accel = - - ## A graphical user interface (GUI) keyboard shortcut - element accel { db.accel.attlist, db._text } -} -div { - db.shortcut.action.attrib = db.keycombo.action.attrib - db.shortcut.role.attribute = attribute role { text } - db.shortcut.attlist = - db.shortcut.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.shortcut.action.attrib - db.shortcut = - - ## A key combination for an action that is also accessible through a menu - element shortcut { - db.shortcut.attlist, db.keycombination.contentmodel+ - } -} -db.os.inlines = - db.prompt - | db.envar - | db.filename - | db.command - | db.computeroutput - | db.userinput -db.computeroutput.inlines = - (text | db.ubiq.inlines | db.os.inlines | db.technical.inlines) - | db.co - | db.markup.inlines -db.userinput.inlines = - (text | db.ubiq.inlines | db.os.inlines | db.technical.inlines) - | db.co - | db.markup.inlines - | db.gui.inlines - | db.keyboard.inlines -db.prompt.inlines = db._text | db.co -div { - db.prompt.role.attribute = attribute role { text } - db.prompt.attlist = - db.prompt.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.prompt = - - ## A character or string indicating the start of an input field in a computer display - element prompt { db.prompt.attlist, db.prompt.inlines* } -} -div { - db.envar.role.attribute = attribute role { text } - db.envar.attlist = - db.envar.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.envar = - - ## A software environment variable - element envar { db.envar.attlist, db._text } -} -div { - db.filename.class.enumeration = - - ## A device - "devicefile" - | - ## A directory - "directory" - | - ## A filename extension - "extension" - | - ## A header file (as for a programming language) - "headerfile" - | - ## A library file - "libraryfile" - | - ## A partition (as of a hard disk) - "partition" - | - ## A symbolic link - "symlink" - db.filename.class.attribute = - - ## Identifies the class of filename - attribute class { db.filename.class.enumeration } - db.filename.path.attribute = - - ## Specifies the path of the filename - attribute path { text } - db.filename.role.attribute = attribute role { text } - db.filename.attlist = - db.filename.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.filename.path.attribute? - & db.filename.class.attribute? - db.filename = - - ## The name of a file - element filename { db.filename.attlist, db._text } -} -div { - db.command.role.attribute = attribute role { text } - db.command.attlist = - db.command.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.command = - - ## The name of an executable program or other software command - element command { db.command.attlist, db._text } -} -div { - db.computeroutput.role.attribute = attribute role { text } - db.computeroutput.attlist = - db.computeroutput.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.computeroutput = - - ## Data, generally text, displayed or presented by a computer - element computeroutput { - db.computeroutput.attlist, db.computeroutput.inlines* - } -} -div { - db.userinput.role.attribute = attribute role { text } - db.userinput.attlist = - db.userinput.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.userinput = - - ## Data entered by the user - element userinput { db.userinput.attlist, db.userinput.inlines* } -} -div { - db.cmdsynopsis.role.attribute = attribute role { text } - db.cmdsynopsis.sepchar.attribute = - - ## Specifies the character that should separate the command and its top-level arguments - attribute sepchar { text } - db.cmdsynopsis.cmdlength.attribute = - - ## Indicates the displayed length of the command; this information may be used to intelligently indent command synopses which extend beyond one line - attribute cmdlength { text } - db.cmdsynopsis.label.attribute = db.label.attribute - db.cmdsynopsis.attlist = - db.cmdsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.cmdsynopsis.sepchar.attribute? - & db.cmdsynopsis.cmdlength.attribute? - & db.cmdsynopsis.label.attribute? - db.cmdsynopsis.info = db._info.title.forbidden - db.cmdsynopsis = - - ## A syntax summary for a software command - element cmdsynopsis { - db.cmdsynopsis.attlist, - db.cmdsynopsis.info, - (db.command | db.arg | db.group | db.sbr)+, - db.synopfragment* - } -} -db.rep.enumeration = - - ## Can not be repeated. - "norepeat" - | - ## Can be repeated. - "repeat" -db.rep.attribute = - - ## Indicates whether or not repetition is possible. - [ a:defaultValue = "norepeat" ] attribute rep { db.rep.enumeration } -db.choice.enumeration = - - ## Formatted to indicate that it is optional. - "opt" - | - ## Formatted without indication. - "plain" - | - ## Formatted to indicate that it is required. - "req" -db.choice.opt.attribute = - - ## Indicates optionality. - [ a:defaultValue = "opt" ] attribute choice { db.choice.enumeration } -db.choice.req.attribute = - - ## Indicates optionality. - [ a:defaultValue = "req" ] attribute choice { db.choice.enumeration } -div { - db.arg.role.attribute = attribute role { text } - db.arg.rep.attribute = db.rep.attribute - db.arg.choice.attribute = db.choice.opt.attribute - db.arg.attlist = - db.arg.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.arg.rep.attribute? - & db.arg.choice.attribute? - db.arg = - - ## An argument in a CmdSynopsis - element arg { - db.arg.attlist, - (db._text - | db.arg - | db.group - | db.option - | db.synopfragmentref - | db.sbr)* - } -} -div { - db.group.role.attribute = attribute role { text } - db.group.rep.attribute = db.rep.attribute - db.group.choice.attribute = db.choice.opt.attribute - db.group.attlist = - db.group.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.group.rep.attribute? - & db.group.choice.attribute? - db.group = - - ## A group of elements in a CmdSynopsis - element group { - db.group.attlist, - (db.arg - | db.group - | db.option - | db.synopfragmentref - | db.replaceable - | db.sbr)+ - } -} -div { - db.sbr.role.attribute = attribute role { text } - db.sbr.attlist = db.sbr.role.attribute? & db.common.attributes - db.sbr = - - ## An explicit line break in a command synopsis - element sbr { db.sbr.attlist, empty } -} -div { - db.synopfragment.role.attribute = attribute role { text } - db.synopfragment.attlist = - db.synopfragment.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.synopfragment = - - ## A portion of a CmdSynopsis broken out from the main body of the synopsis - element synopfragment { - db.synopfragment.attlist, (db.arg | db.group)+ - } -} -div { - db.synopfragmentref.role.attribute = attribute role { text } - db.synopfragmentref.attlist = - db.synopfragmentref.role.attribute? - & db.common.attributes - & db.linkend.attribute - db.synopfragmentref = - - ## A reference to a fragment of a command synopsis - [ - s:pattern [ - name = "Synopsis fragment type constraint" - "\x{a}" ~ - " " - s:rule [ - context = "db:synopfragmentref" - "\x{a}" ~ - " " - s:assert [ - test = - "local-name(//*[@xml:id=current()/@linkend]) = 'synopfragment' and namespace-uri(//*[@xml:id=current()/@linkend]) = 'http://docbook.org/ns/docbook'" - "@linkend on synopfragmentref must point to a synopfragment." - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element synopfragmentref { db.synopfragmentref.attlist, text } -} -db.programming.inlines = - db.function - | db.parameter - | db.varname - | db.returnvalue - | db.type - | db.classname - | db.exceptionname - | db.interfacename - | db.methodname - | db.modifier - | db.initializer - | db.oo.inlines -db.oo.inlines = db.ooclass | db.ooexception | db.oointerface -db.synopsis.blocks = - (db.funcsynopsis - | db.classsynopsis - | db.methodsynopsis - | db.constructorsynopsis - | db.destructorsynopsis - | db.fieldsynopsis) - | db.cmdsynopsis -div { - db.synopsis.role.attribute = attribute role { text } - db.synopsis.label.attribute = db.label.attribute - db.synopsis.attlist = - db.synopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.synopsis.label.attribute? - db.synopsis = - - ## A general-purpose element for representing the syntax of commands or functions - element synopsis { db.synopsis.attlist, db.verbatim.contentmodel } -} -div { - db.funcsynopsis.role.attribute = attribute role { text } - db.funcsynopsis.attlist = - db.funcsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.funcsynopsis.info = db._info.title.forbidden - db.funcsynopsis = - - ## The syntax summary for a function definition - element funcsynopsis { - db.funcsynopsis.attlist, - db.funcsynopsis.info, - (db.funcsynopsisinfo | db.funcprototype)+ - } -} -div { - db.funcsynopsisinfo.role.attribute = attribute role { text } - db.funcsynopsisinfo.attlist = - db.funcsynopsisinfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - db.funcsynopsisinfo = - - ## Information supplementing the FuncDefs of a FuncSynopsis - element funcsynopsisinfo { - db.funcsynopsisinfo.attlist, db.verbatim.contentmodel - } -} -div { - db.funcprototype.role.attribute = attribute role { text } - db.funcprototype.attlist = - db.funcprototype.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.funcprototype = - - ## The prototype of a function - element funcprototype { - db.funcprototype.attlist, - db.modifier*, - db.funcdef, - (db.void | db.varargs | (db.paramdef+, db.varargs?)), - db.modifier* - } -} -div { - db.funcdef.role.attribute = attribute role { text } - db.funcdef.attlist = - db.funcdef.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.funcdef = - - ## A function (subroutine) name and its return type - element funcdef { - db.funcdef.attlist, (db._text | db.type | db.function)* - } -} -div { - db.function.role.attribute = attribute role { text } - db.function.attlist = - db.function.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.function = - - ## The name of a function or subroutine, as in a programming language - element function { db.function.attlist, db._text } -} -div { - db.void.role.attribute = attribute role { text } - db.void.attlist = - db.void.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.void = - - ## An empty element in a function synopsis indicating that the function in question takes no arguments - element void { db.void.attlist, empty } -} -div { - db.varargs.role.attribute = attribute role { text } - db.varargs.attlist = - db.varargs.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.varargs = - - ## An empty element in a function synopsis indicating a variable number of arguments - element varargs { db.varargs.attlist, empty } -} -div { - db.paramdef.role.attribute = attribute role { text } - db.paramdef.choice.enumeration = - - ## Formatted to indicate that it is optional. - "opt" - | - ## Formatted to indicate that it is required. - "req" - db.paramdef.choice.attribute = - - ## Indicates optionality. - [ a:defaultValue = "opt" ] - attribute choice { db.paramdef.choice.enumeration } - db.paramdef.attlist = - db.paramdef.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.paramdef.choice.attribute? - db.paramdef = - - ## Information about a function parameter in a programming language - element paramdef { - db.paramdef.attlist, - (db._text - | db.initializer - | db.type - | db.parameter - | db.funcparams)* - } -} -div { - db.funcparams.role.attribute = attribute role { text } - db.funcparams.attlist = - db.funcparams.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.funcparams = - - ## Parameters for a function referenced through a function pointer in a synopsis - element funcparams { db.funcparams.attlist, db._text } -} -div { - db.classsynopsis.role.attribute = attribute role { text } - db.classsynopsis.class.enumeration = - - ## This is the synopsis of a class - "class" - | - ## This is the synopsis of an interface - "interface" - db.classsynopsis.class.attribute = - - ## Specifies the nature of the synopsis - attribute class { db.classsynopsis.class.enumeration } - db.classsynopsis.attlist = - db.classsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - & db.classsynopsis.class.attribute? - db.classsynopsis = - - ## The syntax summary for a class definition - element classsynopsis { - db.classsynopsis.attlist, - db.oo.inlines+, - (db.classsynopsisinfo - | db.methodsynopsis - | db.constructorsynopsis - | db.destructorsynopsis - | db.fieldsynopsis)* - } -} -div { - db.classsynopsisinfo.role.attribute = attribute role { text } - db.classsynopsisinfo.attlist = - db.classsynopsisinfo.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - db.classsynopsisinfo = - - ## Information supplementing the contents of a ClassSynopsis - element classsynopsisinfo { - db.classsynopsisinfo.attlist, db.verbatim.contentmodel - } -} -div { - db.ooclass.role.attribute = attribute role { text } - db.ooclass.attlist = - db.ooclass.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.ooclass = - - ## A class in an object-oriented programming language - element ooclass { - db.ooclass.attlist, (db.package | db.modifier)*, db.classname - } -} -div { - db.oointerface.role.attribute = attribute role { text } - db.oointerface.attlist = - db.oointerface.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.oointerface = - - ## An interface in an object-oriented programming language - element oointerface { - db.oointerface.attlist, - (db.package | db.modifier)*, - db.interfacename - } -} -div { - db.ooexception.role.attribute = attribute role { text } - db.ooexception.attlist = - db.ooexception.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.ooexception = - - ## An exception in an object-oriented programming language - element ooexception { - db.ooexception.attlist, - (db.package | db.modifier)*, - db.exceptionname - } -} -db.modifier.xml.space.attribute = - - ## Can be used to indicate that whitespace in the modifier should be preserved (for multi-line annotations, for example). - attribute xml:space { - - ## Extra whitespace and line breaks must be preserved. - [ - # Ideally the definition of xml:space used on modifier would be - # different from the definition used on the verbatim elements. The - # verbatim elements forbid the use of xml:space="default" which - # wouldn't be a problem on modifier. But doing that causes the - # generated XSD schemas to be broken so I'm just reusing the existing - # definition for now. It won't be backwards incompatible to fix this - # problem in the future. - # | ## Extra whitespace and line breaks are not preserved. - # "default" - - ] - "preserve" - } -div { - db.modifier.role.attribute = attribute role { text } - db.modifier.attlist = - db.modifier.xml.space.attribute? - & db.modifier.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.modifier = - - ## Modifiers in a synopsis - element modifier { db.modifier.attlist, db._text } -} -div { - db.interfacename.role.attribute = attribute role { text } - db.interfacename.attlist = - db.interfacename.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.interfacename = - - ## The name of an interface - element interfacename { db.interfacename.attlist, db._text } -} -div { - db.exceptionname.role.attribute = attribute role { text } - db.exceptionname.attlist = - db.exceptionname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.exceptionname = - - ## The name of an exception - element exceptionname { db.exceptionname.attlist, db._text } -} -div { - db.fieldsynopsis.role.attribute = attribute role { text } - db.fieldsynopsis.attlist = - db.fieldsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.fieldsynopsis = - - ## The name of a field in a class definition - element fieldsynopsis { - db.fieldsynopsis.attlist, - db.modifier*, - db.type?, - db.varname, - db.initializer? - } -} -div { - db.initializer.role.attribute = attribute role { text } - db.initializer.attlist = - db.initializer.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.initializer = - - ## The initializer for a FieldSynopsis - element initializer { db.initializer.attlist, db._text } -} -div { - db.constructorsynopsis.role.attribute = attribute role { text } - db.constructorsynopsis.attlist = - db.constructorsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.constructorsynopsis = - - ## A syntax summary for a constructor - element constructorsynopsis { - db.constructorsynopsis.attlist, - db.modifier*, - db.methodname?, - (db.methodparam+ | db.void?), - db.exceptionname* - } -} -div { - db.destructorsynopsis.role.attribute = attribute role { text } - db.destructorsynopsis.attlist = - db.destructorsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.destructorsynopsis = - - ## A syntax summary for a destructor - element destructorsynopsis { - db.destructorsynopsis.attlist, - db.modifier*, - db.methodname?, - (db.methodparam+ | db.void?), - db.exceptionname* - } -} -div { - db.methodsynopsis.role.attribute = attribute role { text } - db.methodsynopsis.attlist = - db.methodsynopsis.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.language.attribute? - db.methodsynopsis = - - ## A syntax summary for a method - element methodsynopsis { - db.methodsynopsis.attlist, - db.modifier*, - (db.type | db.void)?, - db.methodname, - (db.methodparam+ | db.void), - db.exceptionname*, - db.modifier* - } -} -div { - db.methodname.role.attribute = attribute role { text } - db.methodname.attlist = - db.methodname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.methodname = - - ## The name of a method - element methodname { db.methodname.attlist, db._text } -} -div { - db.methodparam.role.attribute = attribute role { text } - db.methodparam.rep.attribute = db.rep.attribute - db.methodparam.choice.attribute = db.choice.req.attribute - db.methodparam.attlist = - db.methodparam.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.methodparam.rep.attribute? - & db.methodparam.choice.attribute? - db.methodparam = - - ## Parameters to a method - element methodparam { - db.methodparam.attlist, - db.modifier*, - db.type?, - ((db.modifier*, db.parameter, db.initializer?) | db.funcparams), - db.modifier* - } -} -div { - db.varname.role.attribute = attribute role { text } - db.varname.attlist = - db.varname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.varname = - - ## The name of a variable - element varname { db.varname.attlist, db._text } -} -div { - db.returnvalue.role.attribute = attribute role { text } - db.returnvalue.attlist = - db.returnvalue.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.returnvalue = - - ## The value returned by a function - element returnvalue { db.returnvalue.attlist, db._text } -} -div { - db.type.role.attribute = attribute role { text } - db.type.attlist = - db.type.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.type = - - ## The classification of a value - element type { db.type.attlist, db._text } -} -div { - db.classname.role.attribute = attribute role { text } - db.classname.attlist = - db.classname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.classname = - - ## The name of a class, in the object-oriented programming sense - element classname { db.classname.attlist, db._text } -} -div { - db.programlisting.role.attribute = attribute role { text } - db.programlisting.width.attribute = db.width.characters.attribute - db.programlisting.attlist = - db.programlisting.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.verbatim.attributes - & db.programlisting.width.attribute? - db.programlisting = - - ## A literal listing of all or part of a program - element programlisting { - db.programlisting.attlist, db.verbatim.contentmodel - } -} -db.admonition.blocks = - db.caution | db.important | db.note | db.tip | db.warning -db.admonition.contentmodel = db._info.title.only, db.all.blocks+ -div { - db.caution.role.attribute = attribute role { text } - db.caution.attlist = - db.caution.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.caution = - - ## A note of caution - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:caution" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of caution" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element caution { db.caution.attlist, db.admonition.contentmodel } -} -div { - db.important.role.attribute = attribute role { text } - db.important.attlist = - db.important.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.important = - - ## An admonition set off from the text - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:important" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of important" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element important { - db.important.attlist, db.admonition.contentmodel - } -} -div { - db.note.role.attribute = attribute role { text } - db.note.attlist = - db.note.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.note = - - ## A message set off from the text - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:note" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of note" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element note { db.note.attlist, db.admonition.contentmodel } -} -div { - db.tip.role.attribute = attribute role { text } - db.tip.attlist = - db.tip.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.tip = - - ## A suggestion to the user, set off from the text - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:tip" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of tip" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element tip { db.tip.attlist, db.admonition.contentmodel } -} -div { - db.warning.role.attribute = attribute role { text } - db.warning.attlist = - db.warning.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.warning = - - ## An admonition set off from the text - [ - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:caution)" - "caution must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:important)" - "important must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:note)" - "note must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:tip)" - "tip must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - s:pattern [ - name = "Element exclusion" - "\x{a}" ~ - " " - s:rule [ - context = "db:warning" - "\x{a}" ~ - " " - s:assert [ - test = "not(.//db:warning)" - "warning must not occur in the descendants of warning" - ] - "\x{a}" ~ - " " - ] - "\x{a}" ~ - " " - ] - ] - element warning { db.warning.attlist, db.admonition.contentmodel } -} -db.error.inlines = - db.errorcode | db.errortext | db.errorname | db.errortype -div { - db.errorcode.role.attribute = attribute role { text } - db.errorcode.attlist = - db.errorcode.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.errorcode = - - ## An error code - element errorcode { db.errorcode.attlist, db._text } -} -div { - db.errorname.role.attribute = attribute role { text } - db.errorname.attlist = - db.errorname.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.errorname = - - ## An error name - element errorname { db.errorname.attlist, db._text } -} -div { - db.errortext.role.attribute = attribute role { text } - db.errortext.attlist = - db.errortext.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.errortext = - - ## An error message. - element errortext { db.errortext.attlist, db._text } -} -div { - db.errortype.role.attribute = attribute role { text } - db.errortype.attlist = - db.errortype.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.errortype = - - ## The classification of an error message - element errortype { db.errortype.attlist, db._text } -} -db.systemitem.inlines = db._text | db.co -div { - db.systemitem.class.enumeration = - - ## A daemon or other system process (syslogd) - "daemon" - | - ## A domain name (example.com) - "domainname" - | - ## An ethernet address (00:05:4E:49:FD:8E) - "etheraddress" - | - ## An event of some sort (SIGHUP) - "event" - | - ## An event handler of some sort (hangup) - "eventhandler" - | - ## A filesystem (ext3) - "filesystem" - | - ## A fully qualified domain name (my.example.com) - "fqdomainname" - | - ## A group name (wheel) - "groupname" - | - ## An IP address (127.0.0.1) - "ipaddress" - | - ## A library (libncurses) - "library" - | - ## A macro - "macro" - | - ## A netmask (255.255.255.192) - "netmask" - | - ## A newsgroup (comp.text.xml) - "newsgroup" - | - ## An operating system name (Hurd) - "osname" - | - ## A process (gnome-cups-icon) - "process" - | - ## A protocol (ftp) - "protocol" - | - ## A resource - "resource" - | - ## A server (mail.example.com) - "server" - | - ## A service (ppp) - "service" - | - ## A system name (hephaistos) - "systemname" - | - ## A user name (ndw) - "username" - db.systemitem.class.attribute = - - ## Identifies the nature of the system item - attribute class { db.systemitem.class.enumeration } - db.systemitem.role.attribute = attribute role { text } - db.systemitem.attlist = - db.systemitem.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.systemitem.class.attribute? - db.systemitem = - - ## A system-related item or term - element systemitem { db.systemitem.attlist, db.systemitem.inlines* } -} -div { - db.option.role.attribute = attribute role { text } - db.option.attlist = - db.option.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.option = - - ## An option for a software command - element option { db.option.attlist, db._text } -} -div { - db.optional.role.attribute = attribute role { text } - db.optional.attlist = - db.optional.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.optional = - - ## Optional information - element optional { db.optional.attlist, db._text } -} -div { - db.property.role.attribute = attribute role { text } - db.property.attlist = - db.property.role.attribute? - & db.common.attributes - & db.common.linking.attributes - db.property = - - ## A unit of data associated with some part of a computer system - element property { db.property.attlist, db._text } -} -div { - db.xi.include.attlist = - attribute href { - xsd:anyURI { pattern = "[^#]+" } - }?, - [ a:defaultValue = "xml" ] attribute parse { "xml" | "text" }?, - attribute xpointer { text }?, - attribute encoding { text }?, - attribute accept { text }?, - attribute accept-language { text }? - db.xi.include = - - ## An XInclude - element xi:include { db.xi.include.attlist, db.xi.fallback? } -} -div { - # The fallback element has no attributes - db.xi.fallback = - - ## An XInclude fallback - element xi:fallback { db.all.blocks+ | db.all.inlines+ | db._any* } -} diff --git a/jonas_doc/core/tools/docbook-5.0/rng/docbookxi.rng b/jonas_doc/core/tools/docbook-5.0/rng/docbookxi.rng deleted file mode 100644 index 4450a3c07b8f98074121399308cd30124eefaa20..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/rng/docbookxi.rng +++ /dev/null @@ -1,15457 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - Any attribute including in any attribute in any namespace. - - - - - - Any element from almost any namespace - - - - - - - - - - - - - - - -
    - - - Designates the computer or chip architecture to which the element applies - - - - - Designates the intended audience to which the element applies, for example, system administrators, programmers, or new users. - - - - - provides a standard place for application-specific effectivity - - - - - Indicates standards conformance characteristics of the element - - - - - Indicates the operating system to which the element is applicable - - - - - Indicates the editorial revision to which the element belongs - - - - - Indicates something about the security level associated with the element to which it applies - - - - - Indicates the level of user experience for which the element applies - - - - - Indicates the computer vendor to which the element applies. - - - - - Indicates the word size (width in bits) of the computer architecture to which the element applies - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Points to the element whose content is to be used as the text of the link - - - - - - Points to an internal link target by identifying the value of its xml:id attribute - - - - - - Points to one or more internal link targets by identifying the value of their xml:id attributes - - - - - - Identifies a link target with a URI - - - - - - Identifies the XLink link type - simple - An XLink simple link - - - - - Identifies the XLink role of the link - - - - - - Identifies the XLink arcrole of the link - - - - - - - Identifies the XLink title of the link - - - - - - new - An application traversing to the ending resource should load it in a new window, frame, pane, or other relevant presentation context. - replace - An application traversing to the ending resource should load the resource in the same window, frame, pane, or other relevant presentation context in which the starting resource was loaded. - embed - An application traversing to the ending resource should load its presentation in place of the presentation of the starting resource. - other - The behavior of an application traversing to the ending resource is unconstrained by XLink. The application should look for other markup present in the link to determine the appropriate behavior. - none - The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior. - - - - - Identifies the XLink show behavior of the link - - - - - - onLoad - An application should traverse to the ending resource immediately on loading the starting resource. - onRequest - An application should traverse from the starting resource to the ending resource only on a post-loading event triggered for the purpose of traversal. - other - The behavior of an application traversing to the ending resource is unconstrained by this specification. The application should look for other markup present in the link to determine the appropriate behavior. - none - The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior. - - - - - Identifies the XLink actuate behavior of the link - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Identifies the unique ID value of the element - - - - - - Specifies the DocBook version of the element and its descendants - - - - - Specifies the natural language of the element and its descendants - - - - - Specifies the base URI of the element and its descendants - - - - - - Provides the name or similar semantic identifier assigned to the content in some previous markup scheme - - - - - Provides the text that is to be generated for a cross reference to the element - - - - - Specifies a keyword or keywords identifying additional style information - - - - - changed - The element has been changed. - added - The element is new (has been added to the document). - deleted - The element has been deleted. - off - Explicitly turns off revision markup for this element. - - - - - Identifies the revision status of the element - - - - - - ltr - Left-to-right text - rtl - Right-to-left text - lro - Left-to-right override - rlo - Right-to-left override - - - - - Identifies the direction of text in an element - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specifies the format of the data - - - - - Indentifies the location of the data by URI - - - - Identifies the location of the data by external identifier (entity name) - - - - - - - continues - Line numbering continues from the immediately preceding element with the same name. - restarts - Line numbering restarts (begins at 1, usually). - - - - - Determines whether line numbering continues from the previous element or restarts. - - - - - - numbered - Lines are numbered. - unnumbered - Lines are not numbered. - - - - - Determines whether lines are numbered. - - - - - - Specifies the initial line number. - - - - - - Identifies the language (i.e. programming language) of the verbatim content. - - - - - Can be used to indicate explicitly that whitespace in the verbatim environment is preserved. Whitespace must always be preserved in verbatim environments whether this attribute is specified or not. - preserve - Whitespace must be preserved. - - - - - - - - - - - - - - - - - - - - - - - - Specifies an identifying string for presentation purposes - - - - - Specifies the width (in characters) of the element - - - - - - compact - The spacing should be "compact". - normal - The spacing should be "normal". - - - - - Specifies (a hint about) the spacing of the content - - - - - - 0 - The element should be rendered in the current text flow (with the flow column width). - 1 - The element should be rendered across the full text page. - - - - - Indicates if the element is rendered across the column or the page - - - - - - Identifies the language (i.e. programming language) of the content. - - - - - optional - The content describes an optional step or steps. - required - The content describes a required step or steps. - - - - - Specifies if the content is required or optional. - - - - - - Specifies style information to be used when rendering the float - - - - - Specifies the width of the element - - - - - Specifies the depth of the element - - - - - Specifies the width of the content rectangle - - - - - Specifies the depth of the content rectangle - - - - - 0 - False (do not scale-to-fit; anamorphic scaling may occur) - 1 - True (scale-to-fit; anamorphic scaling is forbidden) - - - - - Specifies the scaling factor - - - - - - center - Centered horizontally - char - Aligned horizontally on the specified character - justify - Fully justified (left and right margins or edges) - left - Left aligned - right - Right aligned - - - - - bottom - Aligned on the bottom of the region - middle - Centered vertically - top - Aligned on the top of the region - - - - - doi - A document object identifier. - isbn - An international standard book number. - isrn - An international standard technical report number (ISO 10444). - issn - An international standard serial number. - libraryofcongress - A Library of Congress reference number. - pubsnumber - A publication number (an internal number or possibly organizational standard). - uri - A Uniform Resource Identifier - - - - - - Identifies the kind of bibliographic identifier - - - - - - - Identifies the nature of the non-standard bibliographic identifier - - - - - - - Identifies the kind of bibliographic identifier - other - Indicates that the identifier is some 'other' kind. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - The text of the title of a section of a document or of a formal block-level element - - - - - - -
    -
    - - - - - - - - - - - - - - - The abbreviation of a title - - - - - - -
    -
    - - - - - - - - - - - - - - - The subtitle of a document - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block - - - - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block with a required title - - - - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block with only a title - - - - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block with only a required title - - - - - - - - - -
    -
    - - - - - - - - - - - - - - A wrapper for information about a component or other block without a title - - - - - - -
    -
    - - - - - - Identifies the controlled vocabulary used by this set's terms - - - - - - - - - - - - - - - - - - A set of terms describing the subject matter of a document - - - - - - -
    -
    - - - - - - Specifies a ranking for this subject relative to other subjects in the same set - - - - - - - - - - - - - - - - - One of a group of terms describing the subject matter of a document - - - - - - -
    -
    - - - - - - - - - - - - - - - A term in a group of terms describing the subject matter of a document - - - - -
    -
    - - - - - - - - - - - - - - - A set of keywords describing the content of a document - - - - - - -
    -
    - - - - - - - - - - - - - - - One of a set of keywords describing the content of a document - - - - -
    - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - A list of operations to be performed in a well-defined sequence - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - A unit of action in a procedure - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - Alternative steps in a procedure - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for steps that occur within steps in a procedure - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A portion of a document that is isolated from the main narrative flow - - - sidebar must not occur in the descendants of sidebar - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A summary - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A short description or note about a person - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A quotation set off from the main text - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The source of a block quote or epigraph - - - - - - - - - - - - -
    -
    - - - sect1 - Render as a first-level section - sect2 - Render as a second-level section - sect3 - Render as a third-level section - sect4 - Render as a fourth-level section - sect5 - Render as a fifth-level section - - - - - - Indicates how the bridge head should be rendered - - - - - - - Identifies the nature of the non-standard rendering - - - - - - - Indicates how the bridge head should be rendered - other - Identifies a non-standard rendering - - - - - - - - - - - - - - - - - - - - - - - - - - - - A free-floating heading - - - - - - -
    -
    - - - - - - - - - - - - - - - A remark (or comment) intended for presentation in a draft manuscript - - - - -
    -
    - - - - - - - - - - - - - - - - - - A short inscription at the beginning of a document or component - - - - - - - - - - - - - -
    -
    - - - - - - Identifies the desired footnote mark - - - - - - - - - - - - - - - - - - A footnote - - - footnote must not occur in the descendants of footnote - - - - - example must not occur in the descendants of footnote - - - - - figure must not occur in the descendants of footnote - - - - - table must not occur in the descendants of footnote - - - - - equation must not occur in the descendants of footnote - - - - - indexterm must not occur in the descendants of footnote - - - - - sidebar must not occur in the descendants of footnote - - - - - task must not occur in the descendants of footnote - - - - - epigraph must not occur in the descendants of footnote - - - - - caution must not occur in the descendants of footnote - - - - - important must not occur in the descendants of footnote - - - - - note must not occur in the descendants of footnote - - - - - tip must not occur in the descendants of footnote - - - - - warning must not occur in the descendants of footnote - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A paragraph with a title - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A paragraph - - - The root element must have a version attribute. - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A paragraph that contains only text and inline markup, no block elements - - - - - - - -
    -
    - - - - - - Identifies the type of mark to be used on items in this list - - - - - - - - - - - - - - - - - - - - - - - - A list in which each entry is marked with a bullet or other dingbat - - - - - - - - - - -
    -
    - - - - - - continues - Specifies that numbering should begin where the preceding list left off - restarts - Specifies that numbering should begin again at 1 - - - - - Indicates how list numbering should begin relative to the immediately preceding list - - - - - - Specifies the initial line number. - - - - - - ignore - Specifies that numbering should ignore list nesting - inherit - Specifies that numbering should inherit from outer-level lists - - - - - Indicates whether or not item numbering should be influenced by list nesting - - - - - - arabic - Specifies Arabic numeration (1, 2, 3, …) - upperalpha - Specifies upper-case alphabetic numeration (A, B, C, …) - loweralpha - Specifies lower-case alphabetic numeration (a, b, c, …) - upperroman - Specifies upper-case Roman numeration (I, II, III, …) - lowerroman - Specifies lower-case Roman numeration (i, ii, iii …) - - - - - Indicates the desired numeration - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A list in which each entry is marked with a sequentially incremented label - - - - - - - - - - -
    -
    - - - - - - Specifies the keyword for the type of mark that should be used on this - item, instead of the mark that would be used by default - - - - - - - - - - - - - - - - - - A wrapper for the elements of a list item - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A segmented list, a list of sets of elements - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The title of an element of a list item in a segmented list - - - - - - -
    -
    - - - - - - - - - - - - - - - A list item in a segmented list - - - The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An element of a list item in a segmented list - - - - - - -
    -
    - - - - - - horiz - A tabular presentation in row-major order. - vert - A tabular presentation in column-major order. - inline - An inline presentation, usually a comma-delimited list. - - - - - Specifies the type of list presentation. - - - - - - Specifies the number of columns for horizontal or vertical presentation - - - - - - - - - - - - - - - - - - - - - An undecorated list of single words or short phrases - - - - - - -
    -
    - - - - - - - - - - - - - - - An element of a simple list - - - - - - -
    -
    - - - - - - Indicates a length beyond which the presentation system may consider a term too long and select an alternate presentation for that term, item, or list - - - - - - - - - - - - - - - - - - - - - - - A list in which each entry is composed of a set of one or more terms and an associated description - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A wrapper for a set of terms and the associated description in a variable list - - - - - - - -
    -
    - - - - - - - - - - - - - - - The word or phrase being defined or described in a variable list - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A formal example, with a title - - - example must not occur in the descendants of example - - - - - figure must not occur in the descendants of example - - - - - table must not occur in the descendants of example - - - - - equation must not occur in the descendants of example - - - - - caution must not occur in the descendants of example - - - - - important must not occur in the descendants of example - - - - - note must not occur in the descendants of example - - - - - tip must not occur in the descendants of example - - - - - warning must not occur in the descendants of example - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A displayed example without a title - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - monospaced - The literal layout should be formatted with a monospaced font - normal - The literal layout should be formatted with the current font - - - - - Specifies the class of literal layout - - - - - - - - - - - - - - - - - - - A block of text in which line breaks and white space are to be reproduced faithfully - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - Text that a user sees or might see on a computer screen - - - - -
    -
    - - - - - - - - - - - - - - - - - - A representation of what the user sees or might see on a computer screen - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A formal figure, generally an illustration, with a title - - - example must not occur in the descendants of figure - - - - - figure must not occur in the descendants of figure - - - - - table must not occur in the descendants of figure - - - - - equation must not occur in the descendants of figure - - - - - caution must not occur in the descendants of figure - - - - - important must not occur in the descendants of figure - - - - - note must not occur in the descendants of figure - - - - - tip must not occur in the descendants of figure - - - - - warning must not occur in the descendants of figure - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A untitled figure - - - - - - - - - - -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - A displayed media object (video, audio, image, etc.) - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - An inline media object (video, audio, image, and so on) - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for video data and its associated meta-information - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for audio data and its associated meta-information - - - - - -
    - - - - - - - -
    - - - - - - - - - - - - - - - - - - A wrapper for image data and its associated meta-information - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for a text description of an object and its associated meta-information - - - - - - - - - - - -
    -
    - - - - - - - - - Specifies the (horizontal) alignment of the video data - - - - - - - - - Specifies the vertical alignment of the video data - - - - - - - - - - - - - - - - - - - - - Determines if anamorphic scaling is forbidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pointer to external video data - - - - -
    -
    - - - - - - - - - - - - - - - - - - Pointer to external audio data - - - - -
    -
    - - - - - - - - - Specifies the (horizontal) alignment of the image data - - - - - - - - - Specifies the vertical alignment of the image data - - - - - - - - - - - - - - - - - - - - - Determines if anamorphic scaling is forbidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pointer to external image data - - - - -
    -
    - - - - - - Identifies the encoding of the text in the external file - - - - - - - - - - - - - - - - - - - - Pointer to external text data - - - - -
    -
    - - - - - - - - - - - - - - - - - - A caption - - - example must not occur in the descendants of caption - - - - - figure must not occur in the descendants of caption - - - - - table must not occur in the descendants of caption - - - - - equation must not occur in the descendants of caption - - - - - sidebar must not occur in the descendants of caption - - - - - task must not occur in the descendants of caption - - - - - caution must not occur in the descendants of caption - - - - - important must not occur in the descendants of caption - - - - - note must not occur in the descendants of caption - - - - - tip must not occur in the descendants of caption - - - - - warning must not occur in the descendants of caption - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - A real-world address, generally a postal address - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A street address in an address - - - - -
    -
    - - - - - - - - - - - - - - - A post office box in an address - - - - -
    -
    - - - - - - - - - - - - - - - A postal code in an address - - - - -
    -
    - - - - - - - - - - - - - - - The name of a city in an address - - - - -
    -
    - - - - - - - - - - - - - - - A state or province in an address - - - - -
    -
    - - - - - - - - - - - - - - - The name of a country - - - - -
    -
    - - - - - - - - - - - - - - - A telephone number - - - - -
    -
    - - - - - - - - - - - - - - - A fax number - - - - -
    -
    - - - - - - - - - - - - - - - Uncategorized information in address - - - - -
    -
    - - - - - - - - - - - - - - - The institutional affiliation of an individual - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A brief description of an affiliation - - - - -
    -
    - - - - - - - - - - - - - - - The title of an individual in an organization - - - - -
    -
    - - - consortium - A consortium - corporation - A corporation - informal - An informal organization - nonprofit - A non-profit organization - - - - - Specifies the nature of the organization - - - - - - Specifies the nature of the organization - other - Indicates a non-standard organization class - - - Identifies the non-standard nature of the organization - - - - - - - - - - - - - - - - - - - - - - - - - - The name of an organization - - - - -
    -
    - - - - - - - - - - - - - - - A division of an organization - - - - - - -
    -
    - - - - - - - - - - - - - - - The page numbers of an article as published - - - - -
    -
    - - - - - - - - - - - - - - - The personal name of an individual - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - The name of an individual author - - - - -
    -
    - - - - - - - - - - - - - - - Wrapper for author information when a document has multiple authors or collabarators - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Identifies a collaborator - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The initials or other short identifier for an author - - - - -
    -
    - - - - - - - - - - - - - - - A person and associated metadata - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An organization and associated metadata - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A wrapper for document meta-information about a conference - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The dates of a conference for which a document was written - - - - -
    -
    - - - - - - - - - - - - - - - The title of a conference for which a document was written - - - - -
    -
    - - - - - - - - - - - - - - - An identifier, frequently numerical, associated with a conference for which a document was written - - - - -
    -
    - - - - - - - - - - - - - - - The sponsor of a conference for which a document was written - - - - -
    -
    - - - - - - - - - - - - - - - The contract number of a document - - - - -
    -
    - - - - - - - - - - - - - - - The sponsor of a contract - - - - -
    -
    - - - - - - - - - - - - - - - Copyright information about a document - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The year of publication of a document - - - - -
    -
    - - - - - - - - - - - - - - - The name of the individual or organization that holds a copyright - - - - -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - Additional content for the cover of a publication - - - - - - -
    - - - - - - - - - -
    - - - - - - - - - - - - - - - The date of publication or revision of a document - - - - -
    -
    - - - - - - - - - - - - - - - The name or number of an edition of a document - - - - -
    -
    - - - - - - - - - - - - - - - The name of the editor of a document - - - - -
    -
    - - - - - - - - - - - - - - - - An identifier for a document - - - - -
    -
    - - - - - - - - - - - - - - - - A citation of a bibliographic identifier - - - - -
    -
    - - - - - - - - - - - - - - - - The source of a document - - - - -
    -
    - - - hasformat - The described resource pre-existed the referenced resource, which is essentially the same intellectual content presented in another format - haspart - The described resource includes the referenced resource either physically or logically - hasversion - The described resource has a version, edition, or adaptation, namely, the referenced resource - isformatof - The described resource is the same intellectual content of the referenced resource, but presented in another format - ispartof - The described resource is a physical or logical part of the referenced resource - isreferencedby - The described resource is referenced, cited, or otherwise pointed to by the referenced resource - isreplacedby - The described resource is supplanted, displaced, or superceded by the referenced resource - isrequiredby - The described resource is required by the referenced resource, either physically or logically - isversionof - The described resource is a version, edition, or adaptation of the referenced resource; changes in version imply substantive changes in content rather than differences in format - references - The described resource references, cites, or otherwise points to the referenced resource - replaces - The described resource supplants, displaces, or supersedes the referenced resource - requires - The described resource requires the referenced resource to support its function, delivery, or coherence of content - - - - - - Identifies the type of relationship - - - - - - - - Identifies the type of relationship - othertype - The described resource has a non-standard relationship with the referenced resource - - - - A keyword that identififes the type of the non-standard relationship - - - - - - - - - - - - - - - - - - - - - - - - - - The relationship of a document to another - - - - -
    -
    - - - dcmipoint - The DCMI Point identifies a point in space using its geographic coordinates - iso3166 - ISO 3166 Codes for the representation of names of countries - dcmibox - The DCMI Box identifies a region of space using its geographic limits - tgn - The Getty Thesaurus of Geographic Names - - - - - - Specifies the type of spatial coverage - - - - - - - - Specifies the type of spatial coverage - otherspatial - Identifies a non-standard type of coverage - - - - A keyword that identifies the type of non-standard coverage - - - - - - - - - - - - dcmiperiod - A specification of the limits of a time interval - w3c-dtf - W3C Encoding rules for dates and times—a profile based on ISO 8601 - - - - - - Specifies the type of temporal coverage - - - - - - - - Specifies the type of temporal coverage - othertemporal - Specifies a non-standard type of coverage - - - - A keyword that identifies the type of non-standard coverage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The spatial or temporal coverage of a document - - - - -
    -
    - - - - - - - - - - - - - - - - - - A statement of legal obligations or requirements - - - - - - - -
    -
    - - - copyeditor - A copy editor - graphicdesigner - A graphic designer - other - Some other contributor - productioneditor - A production editor - technicaleditor - A technical editor - translator - A translator - - - - - - Identifies the nature of the contributor - - - - - - - Identifies the nature of the non-standard contribution - - - - - - - Identifies the nature of the contributor - other - Identifies a non-standard contribution - - - - - - - - - - - - - - - - - - - - - - - - - - A person or entity, other than an author or editor, credited in a document - - - - -
    -
    - - - - - - - - - - - - - - - The numbers of the pages in a book, for use in a bibliographic entry - - - - -
    -
    - - - - - - - - - - - - - - - A summary of the contributions made to a document by a credited source - - - - -
    -
    - - - - - - - - - - - - - - - The title of a person - - - - -
    -
    - - - - - - - - - - - - - - - The first name of a person - - - - -
    -
    - - - - - - - - - - - - - - - A family name; in western cultures the last name - - - - -
    -
    - - - - - - - - - - - - - - - The portion of a person's name indicating a relationship to ancestors - - - - -
    -
    - - - - - - - - - - - - - - - A component of a persons name that is not a first name, surname, or lineage - - - - -
    -
    - - - - - - - - - - - - - - - The printing history of a document - - - - - - -
    -
    - - - - - - - - - - - - - - - The date of publication of a document - - - - -
    -
    - - - - - - - - - - - - - - - The publisher of a document - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of the publisher of a document - - - - -
    -
    - - - - - - - - - - - - - - - Information about a particular release of a document - - - - -
    -
    - - - - - - - - - - - - - - - - - - A history of the revisions to a document - - - - - - - -
    -
    - - - - - - - - - - - - - - - An entry describing a single revision in the history of the revisions to a document - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A document revision number - - - - -
    -
    - - - - - - - - - - - - - - - A description of a revision to a document - - - - -
    -
    - - - - - - - - - - - - - - - A extended description of a revision to a document - - - - - - -
    -
    - - - - - - - - - - - - - - - Numbers of the volumes in a series of books - - - - -
    -
    - - - - - - - - - - - - - - - The volume number of a document in a set (as of books in a set or articles in a journal) - - - - -
    -
    - - - - - - - - - - - - - - - The number of an issue of a journal - - - - -
    -
    - - - - - - - - - - - - - - - A software or application package - - - - -
    -
    - - - - - - - - - - - - - - - An email address - - - - -
    -
    - - - - - - - - - - - - - - - A comment on a line in a verbatim listing - - - - -
    -
    - - - command - A command - function - A function - option - An option - - - - - Identifies the class of parameter - - - - - - - - - - - - - - - - - - - - - A value or a symbolic reference to a value - - - - -
    - - - - - - -
    - - - command - A command - function - A function - option - An option - parameter - A parameter - - - - - Identifies the nature of the replaceable text - - - - - - - - - - - - - - - - - - - - - Content that may or must be replaced by the user - - - - - - -
    -
    - - - - Identifies the type of URI specified - - - - - - - - - - - - - - - - - - - A Uniform Resource Identifier - - - - -
    -
    - - - - - - - - - - - - - - - An abbreviation, especially one followed by a period - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An often pronounceable word made from the initial (or selected) letters of a name or phrase - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An inline bibliographic reference to another published work - - - - - - -
    -
    - - - - - - - - - - - - - - - A citation to a reference page - - - - - - - -
    -
    - - - - - - - - - - - - - - - The title of a reference page - - - - - - -
    -
    - - - - - - - - - - - - - - - A reference volume number - - - - -
    -
    - - - article - An article - bbs - A bulletin board system - book - A book - cdrom - A CD-ROM - chapter - A chapter (as of a book) - dvd - A DVD - emailmessage - An email message - gopher - A gopher page - journal - A journal - manuscript - A manuscript - newsposting - A posting to a newsgroup - part - A part (as of a book) - refentry - A reference entry - section - A section (as of a book or article) - series - A series - set - A set (as of books) - webpage - A web page - wiki - A wiki page - - - - - Identifies the nature of the publication being cited - - - - - - - - - - - - - - - - - - - - - The title of a cited work - - - - - - -
    -
    - - - - - - - - - - - - - - - Emphasized text - - - - - - -
    -
    - - - A limited span of emphasized text - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A word or phrase in a language other than the primary language of the document - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A span of text - - - - - - -
    -
    - - - A limited span of text - - - - -
    -
    - - - - - - - - - - - - - - - An inline quotation - - - - - - -
    -
    - - - - - - - - - - - - - - - A subscript (as in H2 -O, the molecular formula for water) - - - - -
    -
    - - - - - - - - - - - - - - - A superscript (as in x^2, the mathematical notation for x multiplied by itself) - - - - -
    -
    - - - copyright - A copyright - registered - A registered copyright - service - A service - trade - A trademark - - - - - Identifies the class of trade mark - - - - - - - - - - - - - - - - - - - - - A trademark - - - - -
    -
    - - - - - - - - - - - - - - - A word meant specifically as a word and not representing anything else - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A cross reference to a footnote (a footnote mark) - - - @linkend on footnoteref must point to a footnote. - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A cross reference to another part of the document - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A hypertext link - - - - - - -
    -
    - - - - - - - - - Holds additional information that may be used by the applicatoin when resolving the link - - - - - Specifies the URI of the document in which the link target appears - - - - - - Specifies the location of the link target in the document - - - - - Identifies application-specific customization of the link behavior - - - - - - - - - - - - - - - - - - - - - - - - - - - - A link that addresses its target indirectly - - - - - - -
    -
    - - - - - - - - - - - - - - A spot in the document - - - - -
    -
    - - - - - - - - - - - - - - A text-only annotation, often used for accessibility - - - - - - - - - -
    - - - Identifies the editorial or publication status of the element on which it occurs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A collection of books - - - The root element must have a version attribute. - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A book - - - The root element must have a version attribute. - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - The dedication of a book or other component - - - The root element must have a version attribute. - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - Acknowledgements of a book or other component - - - The root element must have a version attribute. - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - Text at the back of a book describing facts about its production - - - The root element must have a version attribute. - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - An appendix in a Book or Article - - - The root element must have a version attribute. - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A chapter, as of a book - - - The root element must have a version attribute. - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A division in a book - - - The root element must have a version attribute. - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - Introductory matter preceding the first chapter of a book - - - The root element must have a version attribute. - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - An introduction to the contents of a part - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A recursive section - - - The root element must have a version attribute. - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A section of a document with no subdivisions - - - - - - - -
    - - - -
    - - - - - - faq - A collection of frequently asked questions. - journalarticle - An article in a journal or other periodical. - productsheet - A description of a product. - specification - A specification. - techreport - A technical report. - whitepaper - A white paper. - - - - - Identifies the nature of the article - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An article - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - Identifies one or more annotations that apply to this element - - -
    - - - - - - Identifies one ore more elements to which this annotation applies - - - - - - - - - - - - - - - - - - - An annotation - - - annotation must not occur in the descendants of annotation - - - - - - - - - -
    - - - - Specifies the XLink traversal-from - - - - - - - - Specifies the XLink label - - - - - - - - Specifies the XLink traversal-to - - - - -
    - - - - - - - - - - - - Identifies the XLink link type - extended - An XLink extended link - - - - - - - - - - - - - An XLink extended link - - - - - - - - - -
    -
    - - - - - - - - - - - - Identifies the XLink link type - locator - An XLink locator link - - - - - - - - - - - - - - - - - An XLink locator in an extendedlink - - - - -
    -
    - - - - - - - - - - - - Identifies the XLink link type - arc - An XLink arc link - - - - - - - - - - - - - - - - - - - - - - - - - An XLink arc in an extendedlink - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A top-level section of document - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection within a Sect1 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection within a Sect2 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection within a Sect3 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection within a Sect4 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - A collection of reference entries - - - The root element must have a version attribute. - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - A reference page (originally a UNIX man-style reference page) - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Meta-information for a reference entry - - - - - - - - - - - - - - - - -
    - - - source - The name of the software product or component to which this topic applies - version - The version of the software product or component to which this topic applies - manual - The section title of the reference page (e.g., User Commands) - sectdesc - The section title of the reference page (believed synonymous with "manual" but in wide use) - software - The name of the software product or component to which this topic applies (e.g., SunOS x.y; believed synonymous with "source" but in wide use) - - - - - - Identifies the kind of miscellaneous information - - - - - - - Identifies the nature of non-standard miscellaneous information - - - - - - Identifies the kind of miscellaneious information - other - Indicates that the information is some 'other' kind. - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - Meta-information for a reference entry other than the title and volume number - - - - -
    -
    - - - - - - - - - - - - - - - The name, purpose, and classification of a reference page - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A description of the topic of a reference page - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of (one of) the subject(s) of a reference page - - - - - - -
    -
    - - - - - - - - - - - - - - - A short (one sentence) synopsis of the topic of a reference page - - - - - - -
    -
    - - - - - - - - - - - - - - - The scope or other indication of applicability of a reference entry - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A syntactic synopsis of the subject of the reference page - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - A recursive section in a refentry - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A major subsection of a reference entry - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection of a refsect1 - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A subsection of a refsect2 - - - The root element must have a version attribute. - - - - - - - - - -
    - - - - - - - - - - Specifies the base form of the term, the one that appears in the glossary. This allows adjectival, plural, and other variations of the term to appear in the element. The element content is the default base form. - - - -
    - - - - - - - - - - - - - - - - - - A wrapper for a list of glossary entries - - - - - - - - - - - - -
    -
    - - - - - - Specifies the string by which the element's content is to be sorted; if unspecified, the content is used - - - - - - - - - - - - - - - - - An entry in a Glossary or GlossList - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - Specifies a list of keywords for the definition - - - - - - - - - - - - - - - - - A definition in a GlossEntry - - - - - - - - - -
    -
    - - - - - - Identifies the other term - - - - - - - - - - - - - - - - - - A cross-reference from one glossentry - to another - - - @otherterm on glosssee must point to a glossentry. - - - - - - - - -
    -
    - - - - - - Identifies the other term - - - - - - - - - - - - - - - - - - A cross-reference from one GlossEntry to another - - - @otherterm on glossseealso must point to a glossentry. - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - The first occurrence of a term - - - @linkend on firstterm must point to a glossentry. - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - A glossary term - - - @linkend on glossterm must point to a glossentry. - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A glossary - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A division in a Glossary - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - An inline definition of a term - - - A termdef must contain exactly one firstterm - - - - - - - - -
    - - - Identifies the relationship between the bibliographic elemnts - - -
    - - - - - - - - - - - - - - - An entry in a Bibliography - - - - - - -
    -
    - - - - - - - - - - - - - - - An entry in a Bibliography - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A raw container for related bibliographic information - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A cooked container for related bibliographic information - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Untyped bibliographic information - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A bibliography - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A section of a Bibliography - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for a list of bibliography entries - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - The units (for example, pages) used to identify the beginning and ending of a reference. - - - - - - Identifies the beginning of a reference; the location within the work that is being referenced. - - - - - - Identifies the end of a reference. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A cross-reference to a bibliographic entry - - - - -
    - - - normal - Normal - preferred - Preferred - - - - - Specifies the significance of the term - - - - - - Specifies the IDs of the elements to which this term applies - - - - - - Indicates the page on which this index term occurs in some version of the printed document - - - - - all - All indexes - global - The global index (as for a combined index of a set of box) - local - The local index (the index for this document only) - - - - - Specifies the scope of the index term - - - - - - Specifies the string by which the term is to be sorted; if unspecified, the term content is used - - - - - Specifies the target index for this term - - -
    - - - - - - - - - - - - - - - A set of index terms in the meta-information of a document - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - Identifies the class of index term - singular - A singular index term - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A wrapper for an indexed term - - - - -
    -
    - - - - - - Identifies the class of index term - startofrange - The start of a range - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A wrapper for an indexed term that covers a range - - - - -
    -
    - - - - - - Identifies the class of index term - endofrange - The end of a range - - - - - Points to the start of the range - - - - - - - - - - - - - - - - - Identifies the end of a range associated with an indexed term - - - - -
    -
    - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - The primary word or phrase under which an index term should be sorted - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A secondary word or phrase in an index term - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A tertiary word or phrase in an index term - - - - - - -
    -
    - - - - - - - - - - - - - - - Part of an index term directing the reader instead to another entry in the index - - - - - - -
    -
    - - - - - - - - - - - - - - - Part of an index term directing the reader also to another entry in the index - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An index to a book or part of a book - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An index to a set of books - - - The root element must have a version attribute. - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A division in an index - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An entry in an index - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A primary term in an index entry, not in the text - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A secondary term in an index entry, rather than in the text - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A tertiary term in an index entry, rather than in the text - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A See -entry in an index, rather than in the text - - - - - - -
    -
    - - - - - - - - - - - - - - - - - A See also - entry in an index, rather than in the text - - - - - - -
    - - - Indicates the page on which this element occurs in some version of the printed document - - -
    - - - - - - - - - - - - - - - - - - A table of contents - - - The root element must have a version attribute. - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - A division in a table of contents - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - A component title in a table of contents - - - - - - -
    - - - -
    - - - - - - - - - - - - - - - A task to be completed - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A summary of a task - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - The prerequisites for a task - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - Information related to a task - - - - - - - -
    - - - calspair - Coordinates expressed as a pair of CALS graphic coordinates. - linecolumn - Coordinates expressed as a line and column. - linecolumnpair - Coordinates expressed as a pair of lines and columns. - linerange - Coordinates expressed as a line range. - - - - - - Identifies the units used in the coords attribute The default units vary according to the type of callout specified: calspair - for graphics and linecolumn - for line-oriented elements. - - - - - - - - Indicates that non-standard units are used for this area -. In this case otherunits - must be specified. - other - Coordinates expressed in some non-standard units. - - - - Identifies the units used in the coords - attribute when the units - attribute is other -. This attribute is forbidden otherwise. - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - A list of callout -s - - - - - - - - - - -
    -
    - - - - - - Identifies the areas described by this callout. - - - - - - - - - - - - - - - A called out - description of a marked Area - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A program listing with associated areas used in callouts - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - A collection of regions in a graphic or code example - - - - - - - - - -
    -
    - - - - - - Point to the callout -s which refer to this area. (This provides bidirectional linking which may be useful in online presentation.) - - - - - - Specifies an identifying number or string that may be used in presentation. The area label might be drawn on top of the figure, for example, at the position indicated by the coords attribute. - - - - - Provides the coordinates of the area. The coordinates must be interpreted using the units - specified. - - - - - - - - - - - - - - - - - - - - - - - - A region defined for a Callout in a graphic or code example - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - A region defined for a Callout in a graphic or code example - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A set of related areas in a graphic or code example - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A screen with associated areas used in callouts - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for an image object with callouts - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - The location of a callout embedded in text - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A cross reference to a co - - - - -
    -
    - - - - - - - - - - - - - - - - - - A set of EBNF productions - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A production in a set of EBNF productions - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The left-hand side of an EBNF production - - - - -
    -
    - - - - - - - - - - - - - - - The right-hand side of an EBNF production - - - - - - - - - - - -
    -
    - - - - - - Specifies a URI that points to a production -where the nonterminal - is defined - - - - - - - - - - - - - - - - A non-terminal in an EBNF production - - - - -
    -
    - - - - - - - - - - - - - - - A constraint in an EBNF production - - - - -
    -
    - - - - - - - - - - - - - - - A cross-reference to an EBNF production - - - - -
    -
    - - - - - - - - - - - - - - - - - - The definition of a constraint in an EBNF production - - - - - - - -
    - - - Specifies the alignment character when align - is set to char -. - - - - - Specifies the percentage of the column's total width that should appear to the left of the first occurance of the character identified in char - when align - is set to char -. - - 0 - 100 - - - - - - Specifies how the table is to be framed. Note that there is no way to obtain a border on only the starting edge (left, in left-to-right writing systems) of the table. - - all - Frame all four sides of the table. In some environments with limited control over table border formatting, such as HTML, this may imply additional borders. - bottom - Frame only the bottom of the table. - none - Place no border on the table. In some environments with limited control over table border formatting, such as HTML, this may disable other borders as well. - sides - Frame the left and right sides of the table. - top - Frame the top of the table. - topbot - Frame the top and bottom of the table. - - - - - - Specifies the presence or absence of the column separator - - 0 - No column separator rule. - 1 - Provide a column separator rule on the right - - - - - - Specifies the presence or absence of the row separator - - 0 - No row separator rule. - 1 - Provide a row separator rule below - - - - - - Specifies the orientation of the table - - land - 90 degrees counter-clockwise from the rest of the text flow. - port - The same orientation as the rest of the text flow. - - - - - - Specifies the table style - - - - - Indicates whether or not the entries in the first column should be considered row headers - - firstcol - Indicates that entries in the first column of the table are functionally row headers (analogous to the way that a thead provides column headers). - norowheader - Indicates that entries in the first column have no special significance with respect to column headers. - - - - - - Specifies the horizontal alignment of text in an entry. - - center - Centered. - char - Aligned on a particular character. - justify - Left and right justified. - left - Left justified. - right - Right justified. - - - - - - Specifies the vertical alignment of text in an entry. - - bottom - Aligned on the bottom of the entry. - middle - Aligned in the middle. - top - Aligned at the top of the entry. - - - - - - Specifies a column specification by name. - - - - - Specifies a starting column by name. - - - - - Specifies a span by name. - - - - - - Specifies a starting column by name. - - - Specifies an ending column by name. - - - - - - - - - - - - - - Provides a name for a column specification. - - - - - Provides a name for a span specification. - - -
    - - - - - - Additional style information for downstream processing; typically the name of a style. - - - - - The number of columns in the table. Must be an integer greater than zero. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A wrapper for the main content of a table, or part of a table - - - - - - - - - - - - - - - - -
    -
    - - - - - - The number of the column to which this specification applies. Must be greater than any preceding column number. Defaults to one more than the number of the preceding column, if there is one, or one. - - - - - - Specifies the width of the column. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Specifications for a column in a table - - - - -
    -
    - - - - - - Specifies a starting column by name. - - - - - Specifies an ending column by name. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Formatting information for a spanned column in a table - - - - -
    -
    - - - - - - - - - - - - - - - - - - A table header consisting of one or more rows - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A table footer consisting of one or more rows - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for the rows of a table or informal table - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A row in a table - - - - - - - - - -
    -
    - - - - - - Specifies the number of additional rows which this entry occupies. Defaults to zero. - - - - - - Specifies the rotation of this entry. A value of 1 (true) rotates the cell 90 degrees counter-clockwise. A value of 0 (false) leaves the cell unrotated. - - 0 - Do not rotate the cell. - 1 - Rotate the cell 90 degrees counter-clockwise. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A cell in a table - - - - - - - - - - - -
    -
    - - - - - - Additional style information for downstream processing; typically the name of a style. - - - - - The number of columns in the entry table. Must be an integer greater than zero. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A subtable appearing in place of an Entry in a table - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A table header consisting of one or more rows - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A wrapper for the rows of a table or informal table - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - A row in a table - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Indicates if the short or long title should be used in a List of Tables - - 0 - Indicates that the full title should be used. - 1 - Indicates that the short short title (titleabbrev) should be used. - - - - - - Indicates if the table should appear in a List of Tables - - 0 - Indicates that the table should not occur in the List of Tables. - 1 - Indicates that the table should appear in the List of Tables. - - - - - - - - - - - - - - A formal table in a document - - - example must not occur in the descendants of table - - - - - figure must not occur in the descendants of table - - - - - equation must not occur in the descendants of table - - - - - informaltable must not occur in the descendants of table - - - - - caution must not occur in the descendants of table - - - - - important must not occur in the descendants of table - - - - - note must not occur in the descendants of table - - - - - tip must not occur in the descendants of table - - - - - warning must not occur in the descendants of table - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A table without a title - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - This attribute assigns a class name or set of class names to an element. Any number of elements may be assigned the same class name or names. Multiple class names must be separated by white space characters. - - - - - This attribute specifies style information for the current element. - - - - - This attribute offers advisory information about the element for which it is set. - - - - - - - - This attribute specifies the base language of an element's attribute values and text content. The default value of this attribute is unknown. - - - - - - - - Occurs when the pointing device button is clicked over an element. - - - - - Occurs when the pointing device button is double clicked over an element. - - - - - Occurs when the pointing device button is pressed over an element. - - - - - Occurs when the pointing device button is released over an element. - - - - - Occurs when the pointing device is moved onto an element. - - - - - Occurs when the pointing device is moved while it is over an element. - - - - - Occurs when the pointing device is moved away from an element. - - - - - Occurs when a key is pressed and released over an element. - - - - - Occurs when a key is pressed down over an element. - - - - - Occurs when a key is released over an element. - - - - - - - - - - - - - - - - - Specifies the alignment of data and the justification of text in a cell. - - left - Left-flush data/Left-justify text. This is the default value for table data. - center - Center data/Center-justify text. This is the default value for table headers. - right - Right-flush data/Right-justify text. - justify - Double-justify text. - char - Align text around a specific character. If a user agent doesn't support character alignment, behavior in the presence of this value is unspecified. - - - - - - This attribute specifies a single character within a text fragment to act as an axis for alignment. The default value for this attribute is the decimal point character for the current language as set by the lang attribute (e.g., the period in English and the comma in French). User agents are not required to support this attribute. - - - - - When present, this attribute specifies the offset to the first occurrence of the alignment character on each line. If a line doesn't include the alignment character, it should be horizontally shifted to end at the alignment position. When charoff is used to set the offset of an alignment character, the direction of offset is determined by the current text direction (set by the dir attribute). In left-to-right texts (the default), offset is from the left margin. In right-to-left texts, offset is from the right margin. User agents are not required to support this attribute. - - - - [0-9]+% - - - - - - - - - - Specifies the vertical position of data within a cell. - - top - Cell data is flush with the top of the cell. - middle - Cell data is centered vertically within the cell. This is the default value. - bottom - Cell data is flush with the bottom of the cell. - baseline - All cells in the same row as a cell whose valign attribute has this value should have their textual data positioned so that the first text line occurs on a baseline common to all cells in the row. This constraint does not apply to subsequent text lines in these cells. - - - - - - - - - Provides a summary of the table's purpose and structure for user agents rendering to non-visual media such as speech and Braille. - - - - - Specifies the desired width of the entire table and is intended for visual user agents. When the value is a percentage value, the value is relative to the user agent's available horizontal space. In the absence of any width specification, table width is determined by the user agent. - - - - [0-9]+% - - - - - - - Specifies the width (in pixels only) of the frame around a table. - - - - - - Specifies which sides of the frame surrounding a table will be visible. - - void - No sides. This is the default value. - above - The top side only. - below - The bottom side only. - hsides - The top and bottom sides only. - lhs - The left-hand side only. - rhs - The right-hand side only. - vsides - The right and left sides only. - box - All four sides. - border - All four sides. - - - - - - Specifies which rules will appear between cells within a table. The rendering of rules is user agent dependent. - - none - No rules. This is the default value. - groups - Rules will appear between row groups (see thead, tfoot, and tbody) and column groups (see colgroup and col) only. - rows - Rules will appear between rows only. - cols - Rules will appear between columns only. - all - Rules will appear between all rows and columns. - - - - - - Specifies how much space the user agent should leave between the left side of the table and the left-hand side of the leftmost column, the top of the table and the top side of the topmost row, and so on for the right and bottom of the table. The attribute also specifies the amount of space to leave between cells. - - - - [0-9]+% - - - - - - - Specifies the amount of space between the border of the cell and its contents. If the value of this attribute is a pixel length, all four margins should be this distance from the contents. If the value of the attribute is a percentage length, the top and bottom margins should be equally separated from the content based on a percentage of the available vertical space, and the left and right margins should be equally separated from the content based on a percentage of the available horizontal space. - - - - [0-9]+% - - - - - - - - - - - Provides an abbreviated form of the cell's content and may be rendered by user agents when appropriate in place of the cell's content. Abbreviated names should be short since user agents may render them repeatedly. For instance, speech synthesizers may render the abbreviated headers relating to a particular cell before rendering that cell's content. - - - - - This attribute may be used to place a cell into conceptual categories that can be considered to form axes in an n-dimensional space. User agents may give users access to these categories (e.g., the user may query the user agent for all cells that belong to certain categories, the user agent may present a table in the form of a table of contents, etc.). Please consult an HTML reference for more details. - - - - - Specifies the list of header cells that provide header information for the current data cell. The value of this attribute is a space-separated list of cell names; those cells must be named by setting their id attribute. Authors generally use the headers attribute to help non-visual user agents render header information about data cells (e.g., header information is spoken prior to the cell data), but the attribute may also be used in conjunction with style sheets. - - - - - Specifies the set of data cells for which the current header cell provides header information. This attribute may be used in place of the headers attribute, particularly for simple tables. - - row - The current cell provides header information for the rest of the row that contains it - col - The current cell provides header information for the rest of the column that contains it. - rowgroup - The header cell provides header information for the rest of the row group that contains it. - colgroup - The header cell provides header information for the rest of the column group that contains it. - - - - - - Specifies the number of rows spanned by the current cell. The default value of this attribute is one (1 -). The value zero (0 -) means that the cell spans all rows from the current row to the last row of the table section (thead -, tbody -, or tfoot -) in which the cell is defined. - - - - - - Specifies the number of columns spanned by the current cell. The default value of this attribute is one (1 -). The value zero (0 -) means that the cell spans all columns from the current column to the last column of the column group (colgroup -) in which the cell is defined. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A formal (captioned) HTML table in a document - - - example must not occur in the descendants of table - - - - - figure must not occur in the descendants of table - - - - - equation must not occur in the descendants of table - - - - - informaltable must not occur in the descendants of table - - - - - caution must not occur in the descendants of table - - - - - important must not occur in the descendants of table - - - - - note must not occur in the descendants of table - - - - - tip must not occur in the descendants of table - - - - - warning must not occur in the descendants of table - - - - - - -
    -
    - - - - - - - - - An HTML table without a title - - - - -
    -
    - - - - - - An HTML table caption - - - example must not occur in the descendants of caption - - - - - figure must not occur in the descendants of caption - - - - - table must not occur in the descendants of caption - - - - - equation must not occur in the descendants of caption - - - - - sidebar must not occur in the descendants of caption - - - - - task must not occur in the descendants of caption - - - - - caution must not occur in the descendants of caption - - - - - important must not occur in the descendants of caption - - - - - note must not occur in the descendants of caption - - - - - tip must not occur in the descendants of caption - - - - - warning must not occur in the descendants of caption - - - - - - - - -
    -
    - - - - - - This attribute, whose value must be an integer > 0, specifies the number of columns spanned - by the col - element; the col - element shares its attributes with all the columns it spans. The default value for this attribute is 1 (i.e., a single column). If the span attribute is set to N > 1, the current col - element shares its attributes with the next N-1 columns. - - - - - - Specifies a default width for each column spanned by the current col - element. It has the same meaning as the width - attribute for the colgroup - element and overrides it. - - - - - - - - - Specifications for a column in an HTML table - - - - -
    -
    - - - - - - This attribute, which must be an integer > 0, specifies the number of columns in a column group. In the absence of a span attribute, each colgroup - defines a column group containing one column. If the span attribute is set to N > 0, the current colgroup - element defines a column group containing N columns. User agents must ignore this attribute if the colgroup - element contains one or more col - elements. - - - - - - This attribute specifies a default width for each column in the current column group. In addition to the standard pixel, percentage, and relative values, this attribute allows the special form 0* - (zero asterisk) which means that the width of the each column in the group should be the minimum width necessary to hold the column's contents. This implies that a column's entire contents must be known before its width may be correctly computed. Authors should be aware that specifying 0* - will prevent visual user agents from rendering a table incrementally. This attribute is overridden for any column in the column group whose width is specified via a col - element. - - - - - - - - - A group of columns in an HTML table - - - - - - -
    -
    - - - - - - - - - - A table header consisting of one or more rows in an HTML table - - - - - - -
    -
    - - - - - - - - - - A table footer consisting of one or more rows in an HTML table - - - - - - -
    -
    - - - - - - - - - - A wrapper for the rows of an HTML table or informal HTML table - - - - - - -
    -
    - - - - - - - - - - A row in an HTML table - - - - - - - - - -
    -
    - - - - - - - - - - - A table header entry in an HTML table - - - - - - - - - - - -
    -
    - - - - - - - - - - - A table entry in an HTML table - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A detailed set of messages, usually error messages - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A wrapper for an entry in a message set - - - - - - - - - - - - -
    -
    - - - - - - The audience to which the message relevant - - - - - The origin of the message - - - - - The level of importance or severity of a message - - - - - - - - - - - - - - - - - - - - - - - A wrapper for a simpler entry in a message set - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A message in a message set - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - The primary component of a message in a message set - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A subcomponent of a message in a message set - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A related component of a message in a message set - - - - - -
    -
    - - - - - - - - - - - - - - - The actual text of a message component in a message set - - - - - - -
    -
    - - - - - - - - - - - - - - - Information about a message in a message set - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The level of importance or severity of a message in a message set - - - - -
    -
    - - - - - - - - - - - - - - - The origin of a message in a message set - - - - -
    -
    - - - - - - - - - - - - - - - The audience to which a message in a message set is relevant - - - - -
    -
    - - - - - - - - - - - - - - - - - - Explanatory material relating to a message in a message set - - - - - - - -
    -
    - - - - - - none - No labels - number - Numeric labels - qanda - "Q:" and "A:" labels - - - - - Specifies the default labelling - - - - - - - - - - - - - - - - - - - - - A question-and-answer set - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A titled division in a QandASet - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A question/answer set within a QandASet - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A question in a QandASet - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An answer to a question posed in a QandASet - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A label on a Question or Answer - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A displayed mathematical equation - - - example must not occur in the descendants of equation - - - - - figure must not occur in the descendants of equation - - - - - table must not occur in the descendants of equation - - - - - equation must not occur in the descendants of equation - - - - - caution must not occur in the descendants of equation - - - - - important must not occur in the descendants of equation - - - - - note must not occur in the descendants of equation - - - - - tip must not occur in the descendants of equation - - - - - warning must not occur in the descendants of equation - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A displayed mathematical equation without a title - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A mathematical equation or expression occurring inline - - - - - - - -
    -
    - - - - - - - - - - - - - - - A mathematical phrase, an expression that can be represented with ordinary text and a small amount of markup - - - - - - - - - - -
    -
    - - - - - - - - - - - - Specifies that the format of the data is MathML - mathml - Specifies MathML. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A MathML expression in a media object - - - - - - - -
    -
    - - - Any element from the MathML namespace - - - - - - - - - - -
    -
    - - - - - - - - - - - - Specifies that the format of the data is SVG - svg - Specifies SVG. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - An SVG drawing in a media object - - - - - - - -
    -
    - - - Any element from the SVG namespace - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - A string of formatting markup in text that is to be represented literally - - - - -
    -
    - - - - - - attribute - An attribute - attvalue - An attribute value - element - An element - emptytag - An empty element tag - endtag - An end tag - genentity - A general entity - localname - The local name part of a qualified name - namespace - A namespace - numcharref - A numeric character reference - paramentity - A parameter entity - pi - A processing instruction - prefix - The prefix part of a qualified name - comment - An SGML comment - starttag - A start tag - xmlpi - An XML processing instruction - - - - - Identifies the nature of the tag content - - - - - - Identifies the namespace of the tag content - - - - - - - - - - - - - - - - - - - - - A component of XML (or SGML) markup - - - - -
    -
    - - - Identifies the class of symbol - limit - The value is a limit of some kind - - - - - - - - - - - - - - - - - - - - A name that is replaced by a value before processing - - - - -
    -
    - - - - - - - - - - - - - - - A unit of information - - - - -
    -
    - - - - - - - - - - - - - - - Inline text that is some literal value - - - - -
    -
    - - - Identifies the (computer) language of the code fragment - - - - - - - - - - - - - - - - - - - - An inline code fragment - - - - - - - - - -
    -
    - - - Identifies the class of constant - limit - The value is a limit of some kind - - - - - - - - - - - - - - - - - - - - A programming or system constant - - - - -
    -
    - - - - - - copyright - A name with a copyright - registered - A name with a registered copyright - service - A name of a service - trade - A name which is trademarked - - - - - Specifies the class of product name - - - - - - - - - - - - - - - - - - The formal name of a product - - - - -
    -
    - - - - - - - - - - - - - - - A number assigned to a product - - - - -
    -
    - - - altkey - An alternate or secondary key - constraint - A constraint - datatype - A data type - field - A field - foreignkey - A foreign key - group - A group - index - An index - key1 - The first or primary key - key2 - An alternate or secondary key - name - A name - primarykey - The primary key - procedure - A (stored) procedure - record - A record - rule - A rule - secondarykey - The secondary key - table - A table - user - A user - view - A view - - - - - Identifies the class of database artifact - - - - - - - - - - - - - - - - - - - - - The name of a database, or part of a database - - - - -
    -
    - - - hardware - A hardware application - software - A software application - - - - - Identifies the class of application - - - - - - - - - - - - - - - - - - - - - The name of a software program - - - - -
    -
    - - - - - - - - - - - - - - - A physical part of a computer system - - - - -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - The text on a button in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Graphic and/or text appearing as a icon in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The text of a label in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a menu in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a terminal menu item in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a submenu in a GUI - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A selection or series of selections from a menu - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The conventional name of a mouse button - - - - -
    - - - - - - - - - - -
    - - - alt - The "Alt" key - backspace - The "Backspace" key - command - The "Command" key - control - The "Control" key - delete - The "Delete" key - down - The down arrow - end - The "End" key - enter - The "Enter" or "Return" key - escape - The "Escape" key - home - The "Home" key - insert - The "Insert" key - left - The left arrow - meta - The "Meta" key - option - The "Option" key - pagedown - The page down key - pageup - The page up key - right - The right arrow - shift - The "Shift" key - space - The spacebar - tab - The "Tab" key - up - The up arrow - - - - - - Identifies the function key - - - - - - - - Identifies the function key - other - Indicates a non-standard function key - - - - Specifies a keyword that identifies the non-standard key - - - - - - - - - - - - - - - - - - - - - - - - The text printed on a key on a keyboard - - - - -
    -
    - - - - - - - - - - - - - - - The internal, frequently numeric, identifier for a key on a keyboard - - - - -
    - - - - - - - - - - -
    - - - click - A (single) mouse click. - double-click - A double mouse click. - press - A mouse or key press. - seq - Sequential clicks or presses. - simul - Simultaneous clicks or presses. - - - - - - Identifies the nature of the action taken. If keycombo - contains more than one element, simul - is the default, otherwise there is no default. - - - - - - - - Identifies the nature of the action taken - other - Indicates a non-standard action - - - - Identifies the non-standard action in some unspecified way. - - - - - - - - - - - - - - - - - - - - - - - - A combination of input actions - - - - - - -
    -
    - - - - - - - - - - - - - - - The symbolic name of a key on a keyboard - - - - -
    -
    - - - - - - - - - - - - - - - A graphical user interface (GUI) keyboard shortcut - - - - -
    -
    - - - - - - - - - - - - - - - - - - - A key combination for an action that is also accessible through a menu - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - A character or string indicating the start of an input field in a computer display - - - - - - -
    -
    - - - - - - - - - - - - - - - A software environment variable - - - - -
    -
    - - - devicefile - A device - directory - A directory - extension - A filename extension - headerfile - A header file (as for a programming language) - libraryfile - A library file - partition - A partition (as of a hard disk) - symlink - A symbolic link - - - - - Identifies the class of filename - - - - - - Specifies the path of the filename - - - - - - - - - - - - - - - - - - - - - - - The name of a file - - - - -
    -
    - - - - - - - - - - - - - - - The name of an executable program or other software command - - - - -
    -
    - - - - - - - - - - - - - - - Data, generally text, displayed or presented by a computer - - - - - - -
    -
    - - - - - - - - - - - - - - - Data entered by the user - - - - - - -
    -
    - - - - - - Specifies the character that should separate the command and its top-level arguments - - - - - Indicates the displayed length of the command; this information may be used to intelligently indent command synopses which extend beyond one line - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A syntax summary for a software command - - - - - - - - - - - - - - - -
    - - - norepeat - Can not be repeated. - repeat - Can be repeated. - - - - - Indicates whether or not repetition is possible. - - - - - - opt - Formatted to indicate that it is optional. - plain - Formatted without indication. - req - Formatted to indicate that it is required. - - - - - Indicates optionality. - - - - - - Indicates optionality. - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - An argument in a CmdSynopsis - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - A group of elements in a CmdSynopsis - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - An explicit line break in a command synopsis - - - - -
    -
    - - - - - - - - - - - - - - - A portion of a CmdSynopsis broken out from the main body of the synopsis - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A reference to a fragment of a command synopsis - - - @linkend on synopfragmentref must point to a synopfragment. - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - A general-purpose element for representing the syntax of commands or functions - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - The syntax summary for a function definition - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - Information supplementing the FuncDefs of a FuncSynopsis - - - - -
    -
    - - - - - - - - - - - - - - - The prototype of a function - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - A function (subroutine) name and its return type - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a function or subroutine, as in a programming language - - - - -
    -
    - - - - - - - - - - - - - - - An empty element in a function synopsis indicating that the function in question takes no arguments - - - - -
    -
    - - - - - - - - - - - - - - - An empty element in a function synopsis indicating a variable number of arguments - - - - -
    -
    - - - - - - opt - Formatted to indicate that it is optional. - req - Formatted to indicate that it is required. - - - - - Indicates optionality. - - - - - - - - - - - - - - - - - - Information about a function parameter in a programming language - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - Parameters for a function referenced through a function pointer in a synopsis - - - - -
    -
    - - - - - - class - This is the synopsis of a class - interface - This is the synopsis of an interface - - - - - Specifies the nature of the synopsis - - - - - - - - - - - - - - - - - - - - - The syntax summary for a class definition - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - Information supplementing the contents of a ClassSynopsis - - - - -
    -
    - - - - - - - - - - - - - - - A class in an object-oriented programming language - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An interface in an object-oriented programming language - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - An exception in an object-oriented programming language - - - - - - - - - - -
    - - - Can be used to indicate that whitespace in the modifier should be preserved (for multi-line annotations, for example). - preserve - Extra whitespace and line breaks must be preserved. - - - -
    - - - - - - - - - - - - - - - - - - Modifiers in a synopsis - - - - -
    -
    - - - - - - - - - - - - - - - The name of an interface - - - - -
    -
    - - - - - - - - - - - - - - - The name of an exception - - - - -
    -
    - - - - - - - - - - - - - - - - - - The name of a field in a class definition - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The initializer for a FieldSynopsis - - - - -
    -
    - - - - - - - - - - - - - - - - - - A syntax summary for a constructor - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A syntax summary for a destructor - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - A syntax summary for a method - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a method - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - Parameters to a method - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - The name of a variable - - - - -
    -
    - - - - - - - - - - - - - - - The value returned by a function - - - - -
    -
    - - - - - - - - - - - - - - - The classification of a value - - - - -
    -
    - - - - - - - - - - - - - - - The name of a class, in the object-oriented programming sense - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - A literal listing of all or part of a program - - - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - A note of caution - - - caution must not occur in the descendants of caution - - - - - important must not occur in the descendants of caution - - - - - note must not occur in the descendants of caution - - - - - tip must not occur in the descendants of caution - - - - - warning must not occur in the descendants of caution - - - - - - -
    -
    - - - - - - - - - - - - - - - An admonition set off from the text - - - caution must not occur in the descendants of important - - - - - important must not occur in the descendants of important - - - - - note must not occur in the descendants of important - - - - - tip must not occur in the descendants of important - - - - - warning must not occur in the descendants of important - - - - - - -
    -
    - - - - - - - - - - - - - - - A message set off from the text - - - caution must not occur in the descendants of note - - - - - important must not occur in the descendants of note - - - - - note must not occur in the descendants of note - - - - - tip must not occur in the descendants of note - - - - - warning must not occur in the descendants of note - - - - - - -
    -
    - - - - - - - - - - - - - - - A suggestion to the user, set off from the text - - - caution must not occur in the descendants of tip - - - - - important must not occur in the descendants of tip - - - - - note must not occur in the descendants of tip - - - - - tip must not occur in the descendants of tip - - - - - warning must not occur in the descendants of tip - - - - - - -
    -
    - - - - - - - - - - - - - - - An admonition set off from the text - - - caution must not occur in the descendants of warning - - - - - important must not occur in the descendants of warning - - - - - note must not occur in the descendants of warning - - - - - tip must not occur in the descendants of warning - - - - - warning must not occur in the descendants of warning - - - - - - -
    - - - - - - - - -
    - - - - - - - - - - - - - - - An error code - - - - -
    -
    - - - - - - - - - - - - - - - An error name - - - - -
    -
    - - - - - - - - - - - - - - - An error message. - - - - -
    -
    - - - - - - - - - - - - - - - The classification of an error message - - - - -
    - - - - - - -
    - - - daemon - A daemon or other system process (syslogd) - domainname - A domain name (example.com) - etheraddress - An ethernet address (00:05:4E:49:FD:8E) - event - An event of some sort (SIGHUP) - eventhandler - An event handler of some sort (hangup) - filesystem - A filesystem (ext3) - fqdomainname - A fully qualified domain name (my.example.com) - groupname - A group name (wheel) - ipaddress - An IP address (127.0.0.1) - library - A library (libncurses) - macro - A macro - netmask - A netmask (255.255.255.192) - newsgroup - A newsgroup (comp.text.xml) - osname - An operating system name (Hurd) - process - A process (gnome-cups-icon) - protocol - A protocol (ftp) - resource - A resource - server - A server (mail.example.com) - service - A service (ppp) - systemname - A system name (hephaistos) - username - A user name (ndw) - - - - - Identifies the nature of the system item - - - - - - - - - - - - - - - - - - - - - A system-related item or term - - - - - - -
    -
    - - - - - - - - - - - - - - - An option for a software command - - - - -
    -
    - - - - - - - - - - - - - - - Optional information - - - - -
    -
    - - - - - - - - - - - - - - - A unit of data associated with some part of a computer system - - - - -
    -
    - - - - - [^#]+ - - - - - - - xml - text - - - - - - - - - - - - - - - - - - - An XInclude - - - - - - -
    -
    - - - - An XInclude fallback - - - - - - - - - - - - - -
    -
    diff --git a/jonas_doc/core/tools/docbook-5.0/sch/docbook.sch b/jonas_doc/core/tools/docbook-5.0/sch/docbook.sch deleted file mode 100644 index f6d3d50e671fdf2a8c800013b19897caf15de49c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/sch/docbook.sch +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - @linkend on firstterm must point to a glossentry. - - - - - @linkend on footnoteref must point to a footnote. - - - - - @linkend on glossterm must point to a glossentry. - - - - - @linkend on synopfragmentref must point to a synopfragment. - - - - - @otherterm on glosssee must point to a glossentry. - - - - - @otherterm on glossseealso must point to a glossentry. - - - - - A termdef must contain exactly one firstterm - - - - - The number of seg elements must be the same as the number of segtitle elements in the parent segmentedlist - - - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - The root element must have a version attribute. - - - - - annotation must not occur in the descendants of annotation - - - caution must not occur in the descendants of caution - important must not occur in the descendants of caution - note must not occur in the descendants of caution - tip must not occur in the descendants of caution - warning must not occur in the descendants of caution - - - caution must not occur in the descendants of important - important must not occur in the descendants of important - note must not occur in the descendants of important - tip must not occur in the descendants of important - warning must not occur in the descendants of important - - - caution must not occur in the descendants of note - important must not occur in the descendants of note - note must not occur in the descendants of note - tip must not occur in the descendants of note - warning must not occur in the descendants of note - - - caution must not occur in the descendants of tip - important must not occur in the descendants of tip - note must not occur in the descendants of tip - tip must not occur in the descendants of tip - warning must not occur in the descendants of tip - - - caution must not occur in the descendants of warning - important must not occur in the descendants of warning - note must not occur in the descendants of warning - tip must not occur in the descendants of warning - warning must not occur in the descendants of warning - - - caution must not occur in the descendants of caption - equation must not occur in the descendants of caption - example must not occur in the descendants of caption - figure must not occur in the descendants of caption - important must not occur in the descendants of caption - note must not occur in the descendants of caption - sidebar must not occur in the descendants of caption - table must not occur in the descendants of caption - task must not occur in the descendants of caption - tip must not occur in the descendants of caption - warning must not occur in the descendants of caption - - - caution must not occur in the descendants of equation - equation must not occur in the descendants of equation - example must not occur in the descendants of equation - figure must not occur in the descendants of equation - important must not occur in the descendants of equation - note must not occur in the descendants of equation - table must not occur in the descendants of equation - tip must not occur in the descendants of equation - warning must not occur in the descendants of equation - - - caution must not occur in the descendants of example - equation must not occur in the descendants of example - example must not occur in the descendants of example - figure must not occur in the descendants of example - important must not occur in the descendants of example - note must not occur in the descendants of example - table must not occur in the descendants of example - tip must not occur in the descendants of example - warning must not occur in the descendants of example - - - caution must not occur in the descendants of figure - equation must not occur in the descendants of figure - example must not occur in the descendants of figure - figure must not occur in the descendants of figure - important must not occur in the descendants of figure - note must not occur in the descendants of figure - table must not occur in the descendants of figure - tip must not occur in the descendants of figure - warning must not occur in the descendants of figure - - - caution must not occur in the descendants of table - equation must not occur in the descendants of table - example must not occur in the descendants of table - figure must not occur in the descendants of table - important must not occur in the descendants of table - informaltable must not occur in the descendants of table - note must not occur in the descendants of table - tip must not occur in the descendants of table - warning must not occur in the descendants of table - - - caution must not occur in the descendants of footnote - epigraph must not occur in the descendants of footnote - equation must not occur in the descendants of footnote - example must not occur in the descendants of footnote - figure must not occur in the descendants of footnote - footnote must not occur in the descendants of footnote - important must not occur in the descendants of footnote - indexterm must not occur in the descendants of footnote - note must not occur in the descendants of footnote - sidebar must not occur in the descendants of footnote - table must not occur in the descendants of footnote - task must not occur in the descendants of footnote - tip must not occur in the descendants of footnote - warning must not occur in the descendants of footnote - - - sidebar must not occur in the descendants of sidebar - - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-5.0/tools/db4-entities.pl b/jonas_doc/core/tools/docbook-5.0/tools/db4-entities.pl deleted file mode 100644 index 8fb4a393ad7a89efd2b3f632498bb4cec51ece1b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/tools/db4-entities.pl +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/perl -- # -*- Perl -*- - -# This script attempts to replace external parsed entities with -# XInclude elements. - -use strict; -use English; - -my $usage = "$0 input.xml\n"; - -my $file = shift @ARGV || die $usage; -die $usage unless -f $file; - -my %epe = (); - -open (F, $file); -read (F, $_, -s $file); -close (F); - -if (/^<\?xml\s.*?\?>\s*/) { - print $MATCH; - $_ = $POSTMATCH; -} - -my $body = ""; - -if (/^]+\[/s) { - print $MATCH; - $_ = $POSTMATCH; - if (/^(.*?)\]/s) { - print $MATCH; - $body = $POSTMATCH; - $_ = $1; - - while (/^\s*(<.*?>)/s) { - my $decl = $1; - $_ = $POSTMATCH; - - if ($decl =~ /"; - } else { - print "&$2;"; - } - - $body = $POSTMATCH; -} - -print $body; diff --git a/jonas_doc/core/tools/docbook-5.0/tools/db4-upgrade.xsl b/jonas_doc/core/tools/docbook-5.0/tools/db4-upgrade.xsl deleted file mode 100644 index ab92c3868e1c5ffd07f9c5d9e292ce1f2cc077dd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/tools/db4-upgrade.xsl +++ /dev/null @@ -1,1400 +0,0 @@ - - - - - - - - - - - - - - - - - UNKNOWN - - - - - - - - - - - - - - - - - - - - - - - - - - Check - - title. - - - - - - - - - - - - - - - Check - - : no title. - - - - - - - - - - - Check - - titleabbrev. - - - - - - - - - - - - - - - - - - - Check - - subtitle. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Check - - title. - - - - - - - - - - - - - - - - - - - - - - Check - - titleabbrev. - - - - - - - - - - - - - - - - - - - Check - - subtitle. - - - - - - - - - - - - - - - - - - - - - - - - - - Discarding title from refentryinfo! - - - - - - - - Discarding titleabbrev from refentryinfo! - - - - - - - - Discarding subtitle from refentryinfo! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dropping class attribute from productname - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Convert equation without title to informal equation. - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Check conversion of srccredit - (othercredit="srccredit"). - - - - - ??? - - - - - - - - - - - - - - comment - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Converting invpartnumber to biblioid otherclass="invpartnumber". - - - - - - - - - - - - - - Converting contractsponsor to othercredit="contractsponsor". - - - - - - - - - - - - - - - - - - - - - Converting contractnum to othercredit="contractnum". - - - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Check conversion of collabname - (orgname role="collabname"). - - - - - - - - - - - - Discarding modespec ( - - ). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Check conversion of contrib - (othercontrib="contrib"). - - - - ??? - - - - - - - - - - - - - - - - - - - - Converting ulink to link. - - - - - - - - - - - - - - Converting ulink to uri. - - - - - - - - - - - - - - - - - - Discarding linkmode on olink. - - - - - - - - - Converting olink targetdocent to targetdoc. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -01- - - - - - -02- - - - - - -03- - - - - - -04- - - - - - -05- - - - - - -06- - - - - - -07- - - - - - -08- - - - - - -09- - - - - - -10- - - - - - -11- - - - - - -12- - - - - - - - - - - - - -01- - - - - - -02- - - - - - -03- - - - - - -04- - - - - - -05- - - - - - -06- - - - - - -07- - - - - - -08- - - - - - -09- - - - - - -10- - - - - - -11- - - - - - -12- - - - - - - - - - - - - - - - - - - Converted - - into - - for - - - - - - - - - - - - - - Unparseable date: - - in - - (Using default: - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Check abstract; moved into info correctly? - - - - - - - - - - - significance - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - beginpage pagenum= - - - Replacing beginpage with comment - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Discarding moreinfo on - - - - - - - - - - - - - - - - - - - - - Discarding float on - - - - - - - Adding floatstyle='normal' on - - - - - normal - - - - - - - Discarding float on - - - - - - - - Discarding float on - - - - - - - Adding floatstyle=' - - ' on - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Converting refmiscinfo@role=type to - @class=other,otherclass=type - - - other - type - - - - - - - - - - - - - - - - - 5.0 - - - - - - - - - 5.0 - - - - - - - - - - - - - - - - - - - ( - - ) - - - -
    diff --git a/jonas_doc/core/tools/docbook-5.0/xsd/docbook.xsd b/jonas_doc/core/tools/docbook-5.0/xsd/docbook.xsd deleted file mode 100644 index 42b9b0e879558b1e89d8428c5a259f1b8ffd7882..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/xsd/docbook.xsd +++ /dev/null @@ -1,17458 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-5.0/xsd/xlink.xsd b/jonas_doc/core/tools/docbook-5.0/xsd/xlink.xsd deleted file mode 100644 index ff9a7c1debab133406441ca7f8daff0a02e62dec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/xsd/xlink.xsd +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-5.0/xsd/xml.xsd b/jonas_doc/core/tools/docbook-5.0/xsd/xml.xsd deleted file mode 100644 index c6e9c462125d7963488e312a0d3d556f2abd0938..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-5.0/xsd/xml.xsd +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/AUTHORS b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/AUTHORS deleted file mode 100644 index 9c3dcdc4b01d53a4dd7cdc4d320752e1027c91cb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -The DocBook XSL stylesheets are maintained by Norman Walsh, -, and members of the DocBook Project, - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/BUGS b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/BUGS deleted file mode 100644 index b3c78679d0a00cc2839e90aab1fa0cd823b30e63..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/BUGS +++ /dev/null @@ -1,21 +0,0 @@ -To view a list of all open DocBook Project XSL stylesheet bugs: - - http://docbook.sf.net/tracker/xsl/bugs - -To submit a bug report against the stylesheets: - - http://docbook.sf.net/tracker/submit/bug - -To do a full-text search of all DocBook Project issues: - - http://docbook.sf.net/tracker/search - -Discussion about the DocBook Project XSL stylesheets takes place -on the docbook-apps mailing list: - - http://wiki.docbook.org/topic/DocBookAppsMailingList - -Real-time discussion takes place on IRC: - - http://wiki.docbook.org/topic/DocBookIrcChannel - irc://irc.freenode.net/docbook diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/COPYING b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/COPYING deleted file mode 100644 index 46bc1209c20755b223cd7019d89b5d1407de386e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/COPYING +++ /dev/null @@ -1,47 +0,0 @@ -Copyright ---------- -Copyright (C) 1999-2007 Norman Walsh -Copyright (C) 2003 Jiří Kosek -Copyright (C) 2004-2007 Steve Ball -Copyright (C) 2005-2008 The DocBook Project - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the ``Software''), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -Except as contained in this notice, the names of individuals -credited with contribution to this software shall not be used in -advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization -from the individuals in question. - -Any stylesheet derived from this Software that is publically -distributed will be identified with a different name and the -version strings in any derived Software will be changed so that -no possibility of confusion between the derived package and this -Software will exist. - -Warranty --------- -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER -CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Contacting the Author ---------------------- -The DocBook XSL stylesheets are maintained by Norman Walsh, -, and members of the DocBook Project, - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/INSTALL b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/INSTALL deleted file mode 100644 index 72cb82b64bdcf41c0c84c918e2b077db53197e27..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/INSTALL +++ /dev/null @@ -1,88 +0,0 @@ -$Id: INSTALL 6145 2006-08-06 13:13:03Z xmldoc $ - -INSTALL file for the DocBook XSL stylesheets distribution - ----------------------------------------------------------------------- -Case #1: Installation using a package management system ----------------------------------------------------------------------- -If you have installed the DocBook XSL distribution using "apt-get", -"yum", "urpmi", or some similar package-management front-end, -then, as part of the package installation, the stylesheets have -already been automatically installed in the appropriate location -for your system, and your XML catalog environment has probably -been updated to use that location. - ----------------------------------------------------------------------- -Case #2: Installing manually ----------------------------------------------------------------------- -If you have downloaded a docbook-xsl zip, tar.gz, or tar.bz2 -file, use the following steps to install it. - - 1. Move the zip, tar.gz, or tar.bz2 file to the directory where - you'd like to install it (not to a temporary directory). - - 2. unzip or untar/uncompress the file - - That will create a docbook-xsl-$VERSION directory (where - $VERSION is the version number for the release). - -The remaining steps are all OPTIONAL. They are intended to -automatically update your user environment with XML Catalog -information about the DocBook XSL distribution. You are NOT -REQUIRED to complete these remaining steps. However, if you do -not, and you want to use XML catalogs with the DocBook XSL -stylesheets, you will need to manually update your XML catalog -environment - - 3. Change to the docbook-xsl-$VERSION directory and execute the - install.sh script: - - ./install.sh - - That will launch an interactive installer, which will emit a - series of prompts for you to respond to. - - To instead run it non-interactively without being prompted - for confirmation of the changes it makes, invoke it with the - "--batch" switch, like this: - - ./install.sh --batch - - After the process is complete, the installer will emit a - message with a command you need to run in order to source - your environment for use with the stylesheets. - - 4. To test that he installation has updated your environment - correctly, execute the test.sh script: - - ./test.sh - - That will test your XML catalog environment, using both the - xmlcatalog application and the Apache XML Commons Resolver. - - NOTE: The test.sh file is not created until the install.sh - file is run for the first time. - - 5. (UNINSTALLING) If/when you want to uninstall the release, - execute the uninstall.sh script. - - ./uninstall.sh - - To instead run it non-interactively without being prompted - for confirmation of the changes it makes, invoke it with the - "--batch" switch, like this: - - ./uninstall.sh --batch - - NOTE: The uninstall.sh file is not created until the install.sh - file is run for the first time. - - ----------------------------------------------------------------------- -Note to packagers ----------------------------------------------------------------------- -The install.sh, .CatalogManager.properties.example, and .urilist -files should not be packaged. They are useful only to users who -are installing the stylesheets manually. - -The catalog.xml file should be packaged. diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/Makefile b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/Makefile deleted file mode 100644 index a87d60b657447aa7a4bf840c2cd64182331431d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: Makefile.tests 8481 2009-07-13 20:18:41Z abdelazer $ -# -# This makefile does a "smoketest" of stylesheets for various -# output formats in the DocBook XSL Stylesheets release package. -# It doesn't actually check the output -- it's just useful for -# confirming whether each XSLT transformation actually executes -# successfully without any errors. -# -# To use it, run "make check" or just "make" - -XSLTPROC=xsltproc -XSLTPROC_FLAGS= - -TESTFILE=tests/refentry.007.xml -TESTFILE_NS=tests/refentry.007.ns.xml - -NORMAL_STYLES=fo/docbook.xsl html/docbook.xsl xhtml/docbook.xsl -NORMAL_PROFILE_STYLES=fo/profile-docbook.xsl html/profile-docbook.xsl xhtml/profile-docbook.xsl -CHUNK_STYLES=html/chunk.xsl html/onechunk.xsl xhtml/chunk.xsl xhtml/onechunk.xsl -HELP_STYLES=htmlhelp/htmlhelp.xsl javahelp/javahelp.xsl eclipse/eclipse.xsl -MULTIFILE_STYLES=$(CHUNK_STYLES) $(HELP_STYLES) -CHUNK_PROFILE_STYLES=html/profile-chunk.xsl html/profile-onechunk.xsl xhtml/profile-chunk.xsl xhtml/profile-onechunk.xsl -HELP_PROFILE_STYLES=htmlhelp/profile-htmlhelp.xsl eclipse/profile-eclipse.xsl javahelp/profile-javahelp.xsl -MULTIFILE_PROFILE_STYLES=$(CHUNK_PROFILE_STYLES) $(HELP_PROFILE_STYLES) - -MAN_STYLE=manpages/docbook.xsl -MAN_PROFILE_STYLE=manpages/profile-docbook.xsl - -TWO_PROFILE_STYLE=profiling/profile.xsl - -ROUNDTRIP_STYLES=roundtrip/dbk2ooo.xsl roundtrip/dbk2pages.xsl roundtrip/dbk2wordml.xsl -SLIDES_STYLES=slides/html/default.xsl slides/xhtml/default.xsl slides/fo/plain.xsl -WEBSITE_STYLES=website/website.xsl -WEBSITE_CHUNK_STYLES=website/chunk-website.xsl - -# chunked output gets written to TMP_OUTPUT_DIR -TMP_OUTPUT_DIR=/tmp/smoketest-output/ -# if you don't want TMP_OUTPUT_DIR and its contents deleted, unset -# SMOKETEST_CLEAN_TARGET; e.g. "make check SMOKETEST_CLEAN_TARGET=''" -SMOKETEST_CLEAN_TARGET=smoketest-clean - -check: smoketest-make-tmp-dir smoketest-normal smoketest-normal-profile smoketest-chunk smoketest-chunk-profile smoketest-man smoketest-man-profile smoketest-two-profile $(SMOKETEST_CLEAN_TARGET) - -smoketest-make-tmp-dir: - $(RM) -r $(TMP_OUTPUT_DIR) - mkdir '$(TMP_OUTPUT_DIR)' - -smoketest-normal: - for stylesheet in $(NORMAL_STYLES); do \ - echo "$(XSLT) $(TESTFILE) $$stylesheet > /dev/null"; \ - $(XSLT) $(TESTFILE) $$stylesheet > /dev/null; \ - echo "$(XSLT) $(TESTFILE_NS) $$stylesheet > /dev/null"; \ - $(XSLT) $(TESTFILE_NS) $$stylesheet > /dev/null; \ - done - -smoketest-normal-profile: - for stylesheet in $(NORMAL_PROFILE_STYLES); do \ - echo "$(XSLT) $(TESTFILE) $$stylesheet > /dev/null"; \ - $(XSLT) $(TESTFILE) $$stylesheet > /dev/null; \ - echo "$(XSLT) $(TESTFILE_NS) $$stylesheet > /dev/null"; \ - $(XSLT) $(TESTFILE_NS) $$stylesheet > /dev/null; \ - done - -smoketest-chunk: - for stylesheet in $(MULTIFILE_STYLES) ; do \ - $(XSLT) $(TESTFILE) $$stylesheet manifest.in.base.dir=1 base.dir=$(TMP_OUTPUT_DIR) ; \ - $(XSLT) $(TESTFILE_NS) $$stylesheet manifest.in.base.dir=1 base.dir=$(TMP_OUTPUT_DIR) ; \ - done; - -smoketest-chunk-profile: - for stylesheet in $(MULTIFILE_PROFILE_STYLES) ; do \ - $(XSLT) $(TESTFILE) $$stylesheet manifest.in.base.dir=1 base.dir=$(TMP_OUTPUT_DIR) ; \ - $(XSLT) $(TESTFILE_NS) $$stylesheet manifest.in.base.dir=1 base.dir=$(TMP_OUTPUT_DIR) ; \ - done; - -smoketest-man: - $(XSLT) $(TESTFILE) $(MAN_STYLE) man.output.in.separate.dir=1 man.output.base.dir=$(TMP_OUTPUT_DIR) ; \ - $(XSLT) $(TESTFILE_NS) $(MAN_STYLE) man.output.in.separate.dir=1 man.output.base.dir=$(TMP_OUTPUT_DIR) ; - -smoketest-man-profile: - $(XSLT) $(TESTFILE) $(MAN_PROFILE_STYLE) man.output.in.separate.dir=1 man.output.base.dir=$(TMP_OUTPUT_DIR) ; \ - $(XSLT) $(TESTFILE_NS) $(MAN_PROFILE_STYLE) man.output.in.separate.dir=1 man.output.base.dir=$(TMP_OUTPUT_DIR) ; - -smoketest-two-profile: - $(XSLT) $(TESTFILE_NS) $(TWO_PROFILE_STYLE) > /dev/null ; - -smoketest-clean: - $(RM) -r $(TMP_OUTPUT_DIR) - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/NEWS b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/NEWS deleted file mode 100644 index ed3dc5462bc9b83a1e34ff7e32876aa22ccbd6fb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/NEWS +++ /dev/null @@ -1,139 +0,0 @@ -Changes since the 1.76.0 release - -Note: This document lists changes only since the 1.76.0 release. If you instead -want a record of the complete list of changes for the codebase over its entire -history, you can obtain one by running the following commands: - - svn checkout https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl - svn log --xml --verbose xsl > ChangeHistory.xml - -â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â” - -Table of Contents - -Release Notes: 1.76.1 - - Common - FO - HTML - Epub - Webhelp - Params - Extensions - -Release Notes: 1.76.1 - -The following is a list of changes that have been made since the 1.76.0 -release. - -Common - -The following changes have been made to the common code since the 1.76.0 -release. - - â— Mauritz Jeanson: Makefile - - Added eu.xml and gl.xml to SOURCES. - - â— Jirka Kosek: l10n.xsl - - Fixed bug when context was lost due to usage of xsl:key - -FO - -The following changes have been made to the fo code since the 1.76.0 release. - - â— Robert Stayton: docbook.xsl; xref.xsl; fop1.xsl - - Apply patch to support named destination in fop1.xsl, per Sourceforge - bug report #3029845. - - â— dleidert: pagesetup.xsl - - Remove the namespace mistakingly added with the last upload. - -HTML - -The following changes have been made to the html code since the 1.76.0 release. - - â— Keith Fahlgren: highlight.xsl - - Implementing handling for and : transform to and for XHTML outputs and do not use in the highliting output (per Mauritz Jeanson) - -Epub - -The following changes have been made to the epub code since the 1.76.0 release. - - â— Keith Fahlgren: docbook.xsl - - Bugfix for [#3071521] to ensure that NCX navPoints are generated for d:book root nodes with the -NS version of the stylesheets - - â— Keith Fahlgren: docbook.xsl - - Remove unused NCX metadata elements - - â— Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl; bin/spec/ - files/test_cust.x⋯ - - Normalizing identifier lookup between NCX and OPF - - â— Keith Fahlgren: bin/dbtoepub - - Reduce logging verbosity - - â— Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb - - Only copy images once for the DocBook to EPUB tool to correct Windows bug reported in [#3065489] - -Webhelp - -The following changes have been made to the webhelp code since the 1.76.0 -release. - - â— David Cramer: indexer - - More webhelp indexer refactoring - - â— David Cramer: build.xml - - Removed cruft from before webhelp indexer refactoring - - â— David Cramer: indexer/src - - Refactoring webhelp to separate more cleanly the xsl and java code. - - â— David Cramer: indexer/lib - - Refactoring webhelp to separate more cleanly the xsl and java code. - - â— David Cramer: Makefile; build.xml - - Refactoring webhelp to separate more cleanly the xsl and java code. - - â— David Cramer: indexer/src/com/nexwave/nquindexer/IndexerTask.java; - build.xml; indexer/src/⋯ - - Merged in changes from webhelp branch to address issue #3058244 regarding the xx.html temp file that was being created - -Params - -The following changes have been made to the params code since the 1.76.0 -release. - - â— Robert Stayton: draft.mode.xml - - Change default for draft.mode to 'no'. - -Extensions - -The following changes have been made to the extensions code since the 1.76.0 -release. - - â— David Cramer: Makefile - - More webhelp refactoring - - â— David Cramer: Makefile - - Refactoring webhelp to separate more cleanly the xsl and java code. - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/NEWS.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/NEWS.html deleted file mode 100644 index 979e2a2e6a115ae5c6666c9d7cfad6a198fc93e7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/NEWS.html +++ /dev/null @@ -1,25 +0,0 @@ -Changes since the 1.76.0 release

    Changes since the 1.76.0 release

    Note: This - document lists changes only since the 1.76.0 release. - If you instead want a record of the complete list of - changes for the codebase over its entire history, you - can obtain one by running the following commands: - -

      svn checkout https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl
    -  svn log --xml --verbose xsl > ChangeHistory.xml

    Release Notes: 1.76.1

    The following is a list of changes that have been made - since the 1.76.0 release.

    Common

    The following changes have been made to the - common code - since the 1.76.0 release.

    • Mauritz Jeanson: Makefile

      Added eu.xml and gl.xml to SOURCES.
    • Jirka Kosek: l10n.xsl

      Fixed bug when context was lost due to usage of xsl:key

    FO

    The following changes have been made to the - fo code - since the 1.76.0 release.

    • Robert Stayton: docbook.xsl; xref.xsl; fop1.xsl

      Apply patch to support named destination in fop1.xsl, per Sourceforge
      -bug report #3029845.
    • dleidert: pagesetup.xsl

      Remove the namespace mistakingly added with the last upload.

    HTML

    The following changes have been made to the - html code - since the 1.76.0 release.

    • Keith Fahlgren: highlight.xsl

      Implementing handling for <b> and <i>: transform to <strong> and <em> for XHTML outputs and do not use in the highliting output (per Mauritz Jeanson)

    Epub

    The following changes have been made to the - epub code - since the 1.76.0 release.

    • Keith Fahlgren: docbook.xsl

      Bugfix for [#3071521] to ensure that NCX navPoints are generated for d:book root nodes with the -NS version of the stylesheets
    • Keith Fahlgren: docbook.xsl

      Remove unused NCX metadata elements
    • Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl; bin/spec/files/test_cust.x⋯

      Normalizing identifier lookup between NCX and OPF
    • Keith Fahlgren: bin/dbtoepub

      Reduce logging verbosity
    • Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb

      Only copy images once for the DocBook to EPUB tool to correct Windows bug reported in [#3065489]

    Webhelp

    The following changes have been made to the - webhelp code - since the 1.76.0 release.

    • David Cramer: indexer

      More webhelp indexer refactoring
    • David Cramer: build.xml

      Removed cruft from before webhelp indexer refactoring
    • David Cramer: indexer/src

      Refactoring webhelp to separate more cleanly the xsl and java code.
    • David Cramer: indexer/lib

      Refactoring webhelp to separate more cleanly the xsl and java code.
    • David Cramer: Makefile; build.xml

      Refactoring webhelp to separate more cleanly the xsl and java code.
    • David Cramer: indexer/src/com/nexwave/nquindexer/IndexerTask.java; build.xml; indexer/src/⋯

      Merged in changes from webhelp branch to address issue #3058244 regarding the xx.html temp file that was being created

    Params

    The following changes have been made to the - params code - since the 1.76.0 release.

    • Robert Stayton: draft.mode.xml

      Change default for draft.mode to 'no'.

    Extensions

    The following changes have been made to the - extensions code - since the 1.76.0 release.

    • David Cramer: Makefile

      More webhelp refactoring
    • David Cramer: Makefile

      Refactoring webhelp to separate more cleanly the xsl and java code.
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/NEWS.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/NEWS.xml deleted file mode 100644 index 8cc04e6da30d76421ad9147b189874256caf36d6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/NEWS.xml +++ /dev/null @@ -1,145 +0,0 @@ - - -
    - - -Note: This - document lists changes only since the 1.76.0 release. - If you instead want a record of the complete list of - changes for the codebase over its entire history, you - can obtain one by running the following commands: - - svn checkout https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl - svn log --xml --verbose xsl > ChangeHistory.xml - -Changes since the 1.76.0 release - - -Release Notes: 1.76.1 -The following is a list of changes that have been made - since the 1.76.0 release. - - -Common -The following changes have been made to the - common code - since the 1.76.0 release. - - -Mauritz Jeanson: MakefileAdded eu.xml and gl.xml to SOURCES. - - -Jirka Kosek: l10n.xslFixed bug when context was lost due to usage of xsl:key - - - - - -FO -The following changes have been made to the - fo code - since the 1.76.0 release. - - -Robert Stayton: docbook.xsl; xref.xsl; fop1.xslApply patch to support named destination in fop1.xsl, per Sourceforge -bug report #3029845. - - -dleidert: pagesetup.xslRemove the namespace mistakingly added with the last upload. - - - - - -HTML -The following changes have been made to the - html code - since the 1.76.0 release. - - -Keith Fahlgren: highlight.xslImplementing handling for <b> and <i>: transform to <strong> and <em> for XHTML outputs and do not use in the highliting output (per Mauritz Jeanson) - - - - - -Epub -The following changes have been made to the - epub code - since the 1.76.0 release. - - -Keith Fahlgren: docbook.xslBugfix for [#3071521] to ensure that NCX navPoints are generated for d:book root nodes with the -NS version of the stylesheets - - -Keith Fahlgren: docbook.xslRemove unused NCX metadata elements - - -Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl; bin/spec/files/test_cust.x⋯Normalizing identifier lookup between NCX and OPF - - -Keith Fahlgren: bin/dbtoepubReduce logging verbosity - - -Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rbOnly copy images once for the DocBook to EPUB tool to correct Windows bug reported in [#3065489] - - - - - -Webhelp -The following changes have been made to the - webhelp code - since the 1.76.0 release. - - -David Cramer: indexerMore webhelp indexer refactoring - - -David Cramer: build.xmlRemoved cruft from before webhelp indexer refactoring - - -David Cramer: indexer/srcRefactoring webhelp to separate more cleanly the xsl and java code. - - -David Cramer: indexer/libRefactoring webhelp to separate more cleanly the xsl and java code. - - -David Cramer: Makefile; build.xmlRefactoring webhelp to separate more cleanly the xsl and java code. - - -David Cramer: indexer/src/com/nexwave/nquindexer/IndexerTask.java; build.xml; indexer/src/⋯Merged in changes from webhelp branch to address issue #3058244 regarding the xx.html temp file that was being created - - - - - -Params -The following changes have been made to the - params code - since the 1.76.0 release. - - -Robert Stayton: draft.mode.xmlChange default for draft.mode to 'no'. - - - - - -Extensions -The following changes have been made to the - extensions code - since the 1.76.0 release. - - -David Cramer: MakefileMore webhelp refactoring - - -David Cramer: MakefileRefactoring webhelp to separate more cleanly the xsl and java code. - - - - - -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.html deleted file mode 100644 index 556bd67a724efea2a26f2692d4161e1368689011..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.html +++ /dev/null @@ -1,8353 +0,0 @@ -Release Notes for the DocBook XSL Stylesheets

    Release Notes for the DocBook XSL Stylesheets

    $Revision: 8934 $ $Date: 2010-11-01 13:03:14 -0700 (Mon, 01 Nov 2010) $

    2010-11-01

    -

    This release-notes - document is available in the following formats: - HTML, - PDF, - plain text; it provides a per-release list -of enhancements and changes to the stylesheets’ public APIs -(user-configurable parameters) and excludes descriptions of most -bug fixes. For a complete list of all changes (including all bug -fixes) that have been made since the previous release, see the -separate NEWS (plain text) or NEWS.html files. Also available: -An online hyperlinked change history (warning: big file) of all -changes made over the entire history of the codebase.

    - -

    As with all DocBook Project “dot - one plus” releases, this release aspires to be stable (in - contrast to dot-zero releases, which - are experimental).

    - - -

    - - - - -

    Release Notes: 1.76.1

    - -

    The following is a list of changes that have been made - since the 1.76.0 release.

    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.76.0 release.

    -
    • -

      Robert Stayton: docbook.xsl; xref.xsl; fop1.xsl

      Apply patch to support named destination in fop1.xsl, per Sourceforge
      -bug report #3029845.
      -
    -
    - -

    HTML

    - -

    The following changes have been made to the html code since the 1.76.0 release.

    -
    • -

      Keith Fahlgren: highlight.xsl

      Implementing handling for <b> and <i>: transform to <strong> and <em> for XHTML outputs and do not use in the highliting output (per Mauritz Jeanson)
      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.76.0 release.

    -
    • -

      Robert Stayton: draft.mode.xml

      Change default for draft.mode to 'no'.
      -
    -
    - - -
    -

    Release Notes: 1.76.0

    - -

    This release includes important bug fixes and adds the following -significant feature changes:

    -
    Webhelp

    A new browser-based, cross-platform help format with full-text search and other features typically found in help systems. See webhelp/docs/content/ch01.html for more information and a demo.

    Gentext

    Many updates and additions to translation/locales thanks to Red Hat, the Fedora Project, and other contributors.

    Common

    Faster localization support, as language files are loaded on demand.

    FO

    Support for SVG content in imagedata added.

    HTML

    Output improved when using 'make.clean.html' and a stock CSS file is now provided.

    EPUB

    A number of improvements to NCX, cover and image selection, and XHTML 1.1 element choices

    - -

    The following is a list of changes that have been made since the 1.75.2 release.

    -

    Gentext

    - -

    The following changes have been made to the gentext code since the 1.75.2 release.

    -
    • -

      - rlandmann: locale/fa.xml -

      -
      -            Update to Persian translation from the Fedora Project
      -          
      -
    • -

      - rlandmann: locale/nds.xml -

      -
      -            Locale for Low German
      -          
      -
    • -

      - Mauritz Jeanson: locale/ka.xml; Makefile -

      -
      -            Added support for Georgian based on patch #2917147.
      -          
      -
    • -

      - rlandmann: locale/nl.xml; locale/ja.xml -

      -
      -            Updated translations from Red Hat and the Fedora Project
      -          
      -
    • -

      - rlandmann: locale/bs.xml; locale/ru.xml; locale/hr.xml -

      -
      -            Updated locales from Red Hat and the Fedora Project
      -          
      -
    • -

      - rlandmann: locale/pt.xml; locale/cs.xml; locale/es.xml; locale/bg.xml; locale/nl.xml; loca⋯ -

      -
      -            Updated translations from Red Hat and the Fedora Project
      -          
      -
    • -

      - rlandmann: locale/as.xml; locale/bn_IN.xml; locale/ast.xml; locale/ml.xml; locale/te.xml; ⋯ -

      -
      -            New translations from Red Hat and the Fedora Project
      -          
      -
    • -

      - rlandmann: locale/pt.xml; locale/ca.xml; locale/da.xml; locale/sr.xml; locale/ru.xml; loca⋯ -

      -
      -            Updated translations from Red Hat and the Fedora Project
      -          
      -
    -
    - -

    Common

    - -

    The following changes have been made to the common code since the 1.75.2 release.

    -
    • -

      - Mauritz Jeanson: common.xsl -

      -
      -            Fixed bug in output-orderedlist-starting-number template (@startingnumber did not work for FO).
      -          
      -
    • -

      - Mauritz Jeanson: gentext.xsl -

      -
      -            Added fix to catch ID also of descendants of listitem. Closes bug #2955077.
      -          
      -
    • -

      - Jirka Kosek: l10n.xsl -

      -
      -            Stripped down, faster version of gentext.template is used when there is no localization customization.
      -          
      -
    • -

      - Mauritz Jeanson: stripns.xsl -

      -
      -            Added fix that preserves link/@role (makes links in the reference documentation
      -with @role="tcg" work).
      -          
      -
    • -

      - Mauritz Jeanson: l10n.xsl -

      -
      -            Fixed bugs related to manpages and L10n.
      -          
      -
    • -

      - Jirka Kosek: entities.ent; autoidx-kosek.xsl -

      -
      -            Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms.
      -          
      -
    • -

      - Jirka Kosek: l10n.xsl; l10n.dtd; l10n.xml; autoidx-kosek.xsl -

      -
      -            Refactored localization support. Language files are loaded on demand. Speedup is about 30%.
      -          
      -
    • -

      - Jirka Kosek: l10n.xsl -

      -
      -            Added xsl:keys for improved performance of localization texts look up. Performance gain around 15%.
      -          
      -
    • -

      - Mauritz Jeanson: titles.xsl -

      -
      -            Fixed bug #2912677 (error with xref in title).
      -          
      -
    • -

      - Robert Stayton: olink.xsl -

      -
      -            Fix bug in xrefstyle "title" handling introduced with 
      -the 'insert.targetdb.data' template.
      -          
      -
    • -

      - Robert Stayton: gentext.xsl -

      -
      -            Fix bug in xref to equation without title to use context="xref-number" instead
      -of "xref-number-and-title".
      -          
      -
    • -

      - Robert Stayton: labels.xsl -

      -
      -            Number all equations in one sequence, with or without title.
      -          
      -
    • -

      - Robert Stayton: entities.ent -

      -
      -            Fix bug #2896909 where duplicate @sortas on indexterms caused 
      -some indexterms to drop out of index.
      -          
      -
    • -

      - Robert Stayton: stripns.xsl -

      -
      -            Expand the "Stripping namespace ..." message to advise users to
      -use the namespaced stylesheets.
      -          
      -
    • -

      - Robert Stayton: stripns.xsl -

      -
      -            need a local version of $exsl.node.set.available variable because
      -this module imported many places.
      -          
      -
    • -

      - Mauritz Jeanson: olink.xsl -

      -
      -            Added /node() to the select expression that is used to compute the title text
      -so that no <ttl> elements end up in the output. Closes bug #2830119.
      -          
      -
    -
    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.75.2 release.

    -
    • -

      - Robert Stayton: table.xsl -

      -
      -            Fix bug 2979166 able - Attribute @rowheader not working
      -          
      -
    • -

      - Mauritz Jeanson: inline.xsl -

      -
      -            Improved glossterm auto-linking by using keys. The old code was inefficient when processing documents
      -with many inline glossterms.
      -          
      -
    • -

      - Robert Stayton: titlepage.xsl -

      -
      -            Fix bug 2805530 author/orgname not appearing on title page.
      -          
      -
    • -

      - Mauritz Jeanson: graphics.xsl -

      -
      -            Added support for SVG content in imagedata (inspired by patch #2909154).
      -          
      -
    • -

      - Mauritz Jeanson: table.xsl -

      -
      -            Removed superfluous test used when computing column-width. Closes bug #3000898.
      -          
      -
    • -

      - Mauritz Jeanson: inline.xsl -

      -
      -            Added missing <xsl:call-template name="anchor"/>. Closes bug #2998567.
      -          
      -
    • -

      - Mauritz Jeanson: lists.xsl -

      -
      -            Added table-layout="fixed" on segmentedlist table (required by XSL spec when  proportional-column-width() is used).
      -          
      -
    • -

      - Jirka Kosek: autoidx-kosek.xsl -

      -
      -            Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms.
      -          
      -
    • -

      - Jirka Kosek: index.xsl -

      -
      -            Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms.
      -          
      -
    • -

      - Robert Stayton: xref.xsl -

      -
      -            Fix bug in olink template when an olink has an id.
      -Add warning message with id value when trying to link
      -to an element that has no generated text.
      -          
      -
    • -

      - Mauritz Jeanson: refentry.xsl -

      -
      -            Fixed bug #2930968 (indexterm in refmeta not handled correctly).
      -          
      -
    • -

      - Robert Stayton: block.xsl -

      -
      -            fix bug 2949567 title in revhistory breaks FO transform.
      -          
      -
    • -

      - Robert Stayton: glossary.xsl -

      -
      -            Output id attributes on glossdiv blocks so they can be added to
      -xrefs or TOC.
      -          
      -
    • -

      - Jirka Kosek: xref.xsl -

      -
      -            Enabled hyphenation of URLs when ulink content is the same as link target
      -          
      -
    • -

      - Robert Stayton: table.xsl -

      -
      -            Apply patch to turn off row recursion if no @morerows attributes present.
      -This will enable very large tables without row spanning to 
      -process without running into recursion limits.
      -          
      -
    • -

      - Robert Stayton: formal.xsl -

      -
      -            Format equation without title using table layout with equation number
      -next to the equation.
      -          
      -
    • -

      - Robert Stayton: param.xweb; param.ent -

      -
      -            Add equation.number.properties.
      -          
      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.75.2 release.

    -
    • -

      - Mauritz Jeanson: block.xsl -

      -
      -            Modified acknowledgements template to avoid invalid output (<p> in <p>).
      -          
      -
    • -

      - Mauritz Jeanson: titlepage.xsl -

      -
      -            Added default sidebar attribute-sets.
      -          
      -
    • -

      - Robert Stayton: table.xsl -

      -
      -            Fix bug 2979166 able - Attribute @rowheader not working
      -          
      -
    • -

      - Robert Stayton: footnote.xsl -

      -
      -            Fix bug 3033191 footnotes in html tables.
      -          
      -
    • -

      - Mauritz Jeanson: inline.xsl -

      -
      -            Improved glossterm auto-linking by using keys. The old code was inefficient when processing documents
      -with many inline glossterms.
      -          
      -
    • -

      - Robert Stayton: docbook.css.xml; verbatim.xsl -

      -
      -            Fix bug 2844927 Validity error for callout bugs.
      -          
      -
    • -

      - Robert Stayton: formal.xsl -

      -
      -            Convert formal.object.heading to respect make.clean.html param.
      -          
      -
    • -

      - Robert Stayton: titlepage.templates.xml; block.xsl -

      -
      -            Fix bug 2840768 sidebar without title inserts empty b tag.
      -          
      -
    • -

      - Mauritz Jeanson: docbook.xsl -

      -
      -            Moved the template that outputs <base> so that the base URI also applies to relative CSS paths that come later.
      -See patch #2896121.
      -          
      -
    • -

      - Jirka Kosek: autoidx-kosek.xsl -

      -
      -            Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms.
      -          
      -
    • -

      - Robert Stayton: chunk-code.xsl -

      -
      -            fix bug 2948363 generated filename for refentry not unique, when
      -used in a set.
      -          
      -
    • -

      - Robert Stayton: component.xsl -

      -
      -            Fix missing "Chapter n" label when use chapter/info/title.
      -          
      -
    • -

      - Robert Stayton: table.xsl -

      -
      -            Row recursion turned off if no @morerows attributes in the table.
      -This will prevent failure on long table (with no @morerows) due
      -to excessive depth of recursion.
      -          
      -
    • -

      - Robert Stayton: autotoc.xsl; docbook.css.xml -

      -
      -            Support make.clean.html in autotoc.xsl.
      -          
      -
    • -

      - Robert Stayton: docbook.css.xml; block.xsl -

      -
      -            Add support for make.clean.html setting in block elements.
      -          
      -
    • -

      - Robert Stayton: docbook.css.xml -

      -
      -            Stock CSS styles for DocBook HTML output when 'make.clean.html' is non-zero.
      -          
      -
    • -

      - Robert Stayton: html.xsl -

      -
      -            Add templates for generating CSS files and links to them.
      -          
      -
    • -

      - Robert Stayton: param.xweb -

      -
      -            Fix bugs in new entity references.
      -          
      -
    • -

      - Robert Stayton: chunk-common.xsl -

      -
      -            List of Equations now includes on equations with titles.
      -          
      -
    • -

      - Robert Stayton: table.xsl -

      -
      -            If a colspec has a colname attribute, add it to the HTML col
      -element as a class attribute so it can be styled.
      -          
      -
    • -

      - Robert Stayton: formal.xsl -

      -
      -            Fix bug 2825842 where table footnotes not appearing in HTML-coded table.
      -          
      -
    • -

      - Robert Stayton: chunktoc.xsl -

      -
      -            Fix bug #2834826 where appendix inside part was not chunked as it should be.
      -          
      -
    • -

      - Mauritz Jeanson: chunktoc.xsl -

      -
      -            Added missing namespace declarations. Closes bug #2890069.
      -          
      -
    • -

      - Mauritz Jeanson: footnote.xsl -

      -
      -            Updated the template for footnote paras to use the 'paragraph' template. Closes bug #2803739.
      -          
      -
    • -

      - Keith Fahlgren: inline.xsl; lists.xsl -

      -
      -            Remove <b> and <i> elements "discouraged in favor of style sheets" from
      -XHTML, XHTML 1.1 (and therefore EPUB) outputs by changing html2xhtml.xsl.
      -
      -Fixes bug #2873153: No <b> and <i> tags in XHTML/EPUB
      -
      -Added regression to EPUB specs:
      -          
      -
    • -

      - Mauritz Jeanson: inline.xsl -

      -
      -            Fixed bug #2844916 (don't output @target if ulink.target is empty).
      -          
      -
    • -

      - Keith Fahlgren: autoidx.xsl -

      -
      -            Fix a bug when using index.on.type: an 'index symbols' section was created 
      -even if that typed index didn't include any symbols (they were in the other types).
      -          
      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.75.2 release.

    -
    • -

      - Mauritz Jeanson: other.xsl -

      -
      -            Modified the write.stubs template so that the section directory name is not output twice. Should fix bug #2831602.
      -Also ensured that $lang is added to the .so path (when man.output.lang.in.name.enabled=1).
      -          
      -
    • -

      - Mauritz Jeanson: docbook.xsl; other.xsl -

      -
      -            Fixed bug #2412738 (apostrophe escaping) by applying the submitted patch.
      -          
      -
    • -

      - Norman Walsh: block.xsl; endnotes.xsl -

      -
      -            Fix bug where simpara in footnote didn't work. Patch by Jonathan Nieder, jrnieder@gmail.com
      -          
      -
    • -

      - dleidert: lists.xsl -

      -
      -            Fix two indentation issues: In the first case there is no corresponding .RS
      -macro (Debian #519438, sf.net 2793873). In the second case an .RS instead of
      -the probably intended .sp leads to an indentation bug (Debian #527309,
      -sf.net #2642139).
      -          
      -
    -
    - -

    Epub

    - -

    The following changes have been made to the - epub code - since the 1.75.2 release.

    -
    • -

      - Keith Fahlgren: bin/spec/examples/AMasqueOfDays.epub; docbook.xsl; bin/spec/epub_spec.rb -

      -
      -            Resolve some actual regressions in date output spotted by more recent versions of epubcheck
      -          
      -
    • -

      - Keith Fahlgren: docbook.xsl -

      -
      -            Updated mediaobject selection code that better uses roles (when available); based on contributons by  Glenn McDonald
      -          
      -
    • -

      - Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl -

      -
      -            Ensure that NCX documents are always outputted with a default namespace
      -to prevent problems with the kindlegen machinery
      -          
      -
    • -

      - Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/partintro.xml; docbook.x⋯ -

      -
      -            Adding support for partintros with sect2s, 3s, etc
      -          
      -
    • -

      - Keith Fahlgren: docbook.xsl -

      -
      -            Adding param to workaround horrific ADE bug with the inability to process <br>
      -          
      -
    • -

      - Keith Fahlgren: docbook.xsl -

      -
      -            Add support for authorgroup/author in OPF metadata (via Michael Wiedmann)
      -          
      -
    • -

      - Keith Fahlgren: bin/spec/epub_regressions_spec.rb -

      -
      -            Remove <b> and <i> elements "discouraged in favor of style sheets" from
      -XHTML, XHTML 1.1 (and therefore EPUB) outputs by changing html2xhtml.xsl.
      -
      -Fixes bug #2873153: No <b> and <i> tags in XHTML/EPUB
      -
      -Added regression to EPUB specs:
      -          
      -
    • -

      - Keith Fahlgren: bin/lib/docbook.rb; bin/spec/files/DejaVuSerif-Italic.otf; docbook.xsl; bi⋯ -

      -
      -            This resolves bug #2873142, Please add support for multiple embedded fonts
      -
      -
      -If you navigate to a checkout of DocBook-XSL and go to:
      -xsl/epub/bin/spec/files
      -You can now run the following command:
      -
      -../../dbtoepub -f DejaVuSerif.otf -f DejaVuSerif-Italic.otf -c test.css
      --s test_cust.xsl orm.book.001.xml
      -
      -In dbtoepub, the following option can be used more than once:
      --f, --font [OTF FILE] Embed OTF FILE in .epub.
      -
      -The underlying stylesheet now accepts a comma-separated list of font file
      -names rather than just one as the RENAMED epub.embedded.fonts ('s' added).
      -
      -The runnable EPUB spec now includes:
      -- should be valid .epub after including more than one embedded font
      -          
      -
    • -

      - Keith Fahlgren: docbook.xsl -

      -
      -            Improve the selection of cover images when working in DocBook 4.x land (work in progress)
      -          
      -
    • -

      - Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl -

      -
      -            Improve the quality of the OPF spine regression by ensuring that the spine
      -elements for deeply nested refentries are in order and adjacent to their
      -opening wrapper XHTML chunk.
      -          
      -
    • -

      - Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl; bin/spec/files/orm.book.00⋯ -

      -
      -            Add more careful handling of refentries to ensure that they always appear in the opf:spine.
      -This was only a problem when refentries were pushed deep into the hierarchy (like inside
      -a sect2), but presented navigational problems for many reading systems (despite the
      -correct NCX references). This may *not* be the best solution, but attacking a better
      -chunking strategy for refentries was too big a nut to crack at this time.
      -          
      -
    -
    - -

    Eclipse

    - -

    The following changes have been made to the - eclipse code - since the 1.75.2 release.

    -
    • -

      - Mauritz Jeanson: eclipse3.xsl -

      -
      -            Added a stylesheet module that generates plug-ins conforming to the standard (OSGi-based) Eclipse 3.x 
      -architecture. The main difference to the older format is that metadata is stored in a separate 
      -manifest file. The module imports and extends the existing eclipse.xsl module. Based on code 
      -contributed in patch #2624668.
      -          
      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.75.2 release.

    -
    • -

      - Robert Stayton: draft.watermark.image.xml -

      -
      -            Fix bug 2922488 draft.watermark.image pointing to web resource.
      -Now the value is images/draft.png, and may require customization
      -for local resolution.
      -          
      -
    • -

      - Mauritz Jeanson: equation.number.properties.xml -

      -
      -            Corrected refpurpose.
      -          
      -
    • -

      - Norman Walsh: paper.type.xml -

      -
      -            Added USlegal and USlegallandscape paper types.
      -          
      -
    • -

      - Jirka Kosek: highlight.xslthl.config.xml -

      -
      -            Added note about specifying location as URL
      -          
      -
    • -

      - Robert Stayton: docbook.css.source.xml; generate.css.header.xml; custom.css.source.xml; ma⋯ -

      -
      -            Params to support generated CSS files.
      -          
      -
    • -

      - Robert Stayton: equation.number.properties.xml -

      -
      -            New attribute set for numbers appearing next to equations.
      -          
      -
    -
    - -

    XSL-Xalan

    - -

    The following changes have been made to the - xsl-xalan code - since the 1.75.2 release.

    -
    • -

      - dleidert: nbproject/genfiles.properties; nbproject/build-impl.xml -

      -
      -            Rebuild netbeans build files after adding missing Netbeans configuration to allow easier packaging for Debian.
      -          
      -
    -
    - -
    -

    Release Notes: 1.75.2

    - -

    The following is a list of changes that have been made - since the 1.75.1 release.

    - -

    Gentext

    - -

    The following changes have been made to the - gentext code - since the 1.75.1 release.

    -
    • -

      dleidert: locale/ja.xml

      Improved Japanese translation for Note(s). Closes bug #2823965.
      -
    • -

      dleidert: locale/pl.xml

      Polish alphabet contains O with acute accent, not with grave accent. Closes bug #2823964.
      -
    • -

      Robert Stayton: locale/ja.xml

      Fix translation of "index", per bug report 2796064.
      -
    • -

      Robert Stayton: locale/is.xml

      New Icelandic locale file.
      -
    -
    - -

    Common

    - -

    The following changes have been made to the - common code - since the 1.75.1 release.

    -
    • -

      Norman Walsh: stripns.xsl

      Support more downconvert cases
      -
    • -

      Robert Stayton: titles.xsl

      Make sure title inside info is used if no other title.
      -
    -
    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.75.1 release.

    -
    • -

      Robert Stayton: pi.xsl

      Turn off dbfo-need for fop1.extensions also, per bug #2816141.
      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.75.1 release.

    -
    • -

      Mauritz Jeanson: titlepage.xsl

      Output "Copyright" heading in XHTML too.
      -
    • -

      Mauritz Jeanson: titlepage.xsl

      Added stylesheet.result.type test for copyright. Closes bug #2813289.
      -
    • -

      Norman Walsh: htmltbl.xsl

      Remove ambiguity wrt @span, @rowspan, and @colspan
      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.75.1 release.

    -
    • -

      Mauritz Jeanson: endnotes.xsl

      Added normalize-space() for ulink content. Closes bug #2793877.
      -
    • -

      Mauritz Jeanson: docbook.xsl

      Added stylesheet.result.type test for copyright. Closes bug #2813289.
      -
    -
    - -

    Epub

    - -

    The following changes have been made to the - epub code - since the 1.75.1 release.

    -
    • -

      Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb

      Corrected bugs caused by path and file assumptions were not met
      -
    • -

      Keith Fahlgren: bin/lib/docbook.rb; docbook.xsl

      Cleaning up hardcoded values into parameters and fixing Ruby library to pass them properly; all thanks to patch from Liza Daly
      -
    -
    - -

    Profiling

    - -

    The following changes have been made to the - profiling code - since the 1.75.1 release.

    -
    -
    - -

    XSL-Saxon

    - -

    The following changes have been made to the - xsl-saxon code - since the 1.75.1 release.

    -
    • -

      Mauritz Jeanson: src/com/nwalsh/saxon/ColumnUpdateEmitter.java; src/com/nwalsh/saxon/Colum⋯

      Added fixes so that colgroups in the XHTML namespace are processed properly.
      -
    -
    - -

    XSL-Xalan

    - -

    The following changes have been made to the - xsl-xalan code - since the 1.75.1 release.

    -
    • -

      Mauritz Jeanson: nbproject/project.xml

      Added missing NetBeans configuration.
      -
    -
    - -
    - - -

    Release Notes: 1.75.1

    - -

    This release includes bug fixes.

    - -

    The following is a list of changes that have been made since the 1.75.0 release.

    - - -

    FO

    - -

    The following changes have been made to the fo code since the 1.75.0 release.

    -
    • -

      Keith Fahlgren: block.xsl

      Switching to em dash for character before attribution in epigraph; resolves Bug #2793878
      -
    • -

      Robert Stayton: lists.xsl

      Fixed bug 2789947, id attribute missing on simplelist fo output.
      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.75.0 release.

    -
    • -

      Keith Fahlgren: block.xsl

      Switching to em dash for character before attribution in epigraph; resolves Bug #2793878
      -
    • -

      Robert Stayton: lists.xsl

      Fixed bug 2789678: apply-templates line accidentally deleted.
      -
    -
    - -

    Epub

    - -

    The following changes have been made to the - epub code - since the 1.75.0 release.

    -
    • -

      Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl

      Added regression and fix to correct "bug" with namespace-prefixed container elements in META-INF/container.xml ; resolves Issue #2790017
      -
    • -

      Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/onegraphic.xinclude.xml;⋯

      Another attempt at flexible named entity and XInclude processing
      -
    • -

      Keith Fahlgren: bin/lib/docbook.rb

      Tweaking solution to Bug #2750442 following regression reported by Michael Wiedmann.
      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.75.0 release.

    -
    • -

      Mauritz Jeanson: highlight.source.xml

      Updated documentation to reflect changes made in r8419.
      -
    -
    - -
    - - -

    Release Notes: 1.75.0

    - -

    This release includes important bug fixes and adds the following -significant feature changes: -

    Gentext

    Modifications to translations have been made.

    Common
    -

    Added support for some format properties on tables using -HTML table markup.

    -

    Added two new qanda.defaultlabel values so that numbered sections -and numbered questions can be distinguished. Satisfies -Feature Request #1539045.

    -

    Added code to handle acknowledgements in book and part. The element is processed -similarly to dedication. All acknowledgements will appear as front matter, after -any dedications.

    -
    FO
    -

    The inclusion of highlighting code has been simplified.

    -

    Add support for pgwide on informal objects.

    -

    Added a new parameter, bookmarks.collapse, that controls the initial state of the bookmark tree. Closes FR #1792326.

    -

    Add support for more dbfo processing instructions.

    -

    Add new variablelist.term.properties to format terms, per request # 1968513.

    -

    Add support for @width on screen and programlisting, fixes bug #2012736.

    -

    Add support for writing-mode="rl-tb" (right-to-left) in FO outputs.

    -

    Add writing.mode param for FO output.

    -
    HTML
    -

    Convert all calls to class.attribute to calls to common.html.attributes to support dir, lang, and title attributes in html output for all elements. Fulfills feature request #1993833.

    -

    Inclusion of highlighting code was simplified. Only one import is now necessary.

    -

    Add new param index.links.to.section.

    -

    Add support for the new index.links.to.section param which permits precise links to indexterms in HTML output rather than to the section title.

    -
    ePub
    -

    Slightly more nuanced handling of imageobject alternatives and better support in dbtoepub for XIncludes and ENTITYs to resolve Issue #2750442 reported by Raphael Hertzog.

    -

    Added a colon after an abstract/title when mapping into the dc:description for OPF metadata in ePub output to help the flat text have more pseudo-semantics (sugestions from Michael Wiedmann)

    -

    Added DocBook subjectset -> OPF dc:subject mapping and tests

    -

    Added DocBook date -> OPF dc:date mapping and tests

    -

    Added DocBook abstract -> OPF dc:description mapping and tests

    -

    Added --output option to dbtoepub based on user request

    -
    HTMLHelp
    -

    Add support for generating olink target database for htmlhelp files.

    Params
    -

    Add default setting for @rules attribute on HTML markup tables.

    -

    Added a new parameter, bookmarks.collapse, that controls the initial state of the bookmark tree. When the parameter has a non-zero value (the default), only the top-level bookmarks are displayed initially. Otherwise, the whole tree of bookmarks is displayed. This is implemented for FOP 0.9X. Closes FR #1792326.

    -

    Add new variablelist.term.properties to format terms, per request # 1968513.

    -

    Add two new qanda.defaultlabel values so that numbered sections and numbered questions can be distinguished. Satisfies Feature Request #1539045.

    -

    Add param to control whether an index entry links to a section title or to the precise location of the indexterm.

    -

    New attribute list for glossentry in glossary.

    -

    New parameter to support @width on programlisting and screen.

    -

    Add attribute-sets for formatting glossary terms and defs.

    -
    Highlighting
    -

    Inclusion of highlighting code was simplified. Only one import is now necessary.

    -

    - - -

    -

    The following is a list of changes that have been made - since the 1.74.3 release.

    - -

    Gentext

    - -

    The following changes have been made to the - gentext code - since the 1.74.3 release.

    -
    • -

      Robert Stayton: locale/sv.xml; locale/ja.xml; locale/pl.xml

      Check in translations of Legalnotice submitted on mailing list.
      -
    • -

      Robert Stayton: locale/es.xml

      Fix spelling errors in Acknowledgements entries.
      -
    • -

      Robert Stayton: locale/es.xml

      Check in translations for 4 elements submitted through docbook-apps
      -message of 14 April 2009.
      -
    • -

      David Cramer: locale/zh.xml; locale/ca.xml; locale/ru.xml; locale/ga.xml; locale/gl.xml; l⋯

      Internationalized punctuation in glosssee and glossseealso
      -
    • -

      Robert Stayton: Makefile

      Check in fixes for DSSSL gentext targets from submitted patch #1689633.
      -
    • -

      Robert Stayton: locale/uk.xml

      Check in major update submitted with bug report #2008524.
      -
    • -

      Robert Stayton: locale/zh_tw.xml

      Check in fix to Note string submitted in bug #2441051.
      -
    • -

      Robert Stayton: locale/ru.xml

      Checkin typo fix submitted in bug #2453406.
      -
    -
    - -

    Common

    - -

    The following changes have been made to the - common code - since the 1.74.3 release.

    -
    • -

      Robert Stayton: gentext.xsl

      Fix extra generated space when xrefstyle includes 'nopage'.
      -
    • -

      Robert Stayton: table.xsl

      Add support for some format properties on tables using
      -HTML table markup.  These include:
      -  - frame attribute on table (or uses $default.table.frame parameter).
      -  - rules attribute on table (or uses $default.table.rules parameter).
      -  - align attribute on td and th
      -  - valign attribute on td and th
      -  - colspan on td and th
      -  - rowspan on td and th
      -  - bgcolor on td and th
      -
    • -

      Robert Stayton: olink.xsl

      Add placeholder template to massage olink hot text to make
      -customization easier, per Feature Request 1828608.
      -
    • -

      Robert Stayton: targets.xsl

      Add support for collecting olink targets from a glossary
      -generated from a glossary.collection.
      -
    • -

      Robert Stayton: titles.xsl

      Handle firstterm like glossterm in mode="title.markup".
      -
    • -

      Robert Stayton: titles.xsl

      Add match on info/title in title.markup templates where missing.
      -
    • -

      Mauritz Jeanson: titles.xsl

      Changed "ancestor::title" to "(ancestor::title and (@id or @xml:id))".
      -This enables proper formatting of inline elements in titles in TOCs, 
      -as long as these inlines don't have id or xml:id attributes.
      -
    • -

      Robert Stayton: labels.xsl

      Add two new qanda.defaultlabel values so that numbered sections
      -and numbered questions can be distinguished.  Satisfies
      -Feature Request #1539045.
      -
    • -

      Robert Stayton: stripns.xsl; pi.xsl

      Convert function-available(exsl:node-set) to use the new param
      -so Xalan bug is isolated.
      -
    • -

      Mauritz Jeanson: titles.xsl

      Added fixes for bugs #2112656 and #1759205:
      -1. Reverted mistaken commits r7485 and r7523. 
      -2. Updated the template with match="link" and mode="no.anchor.mode" so that 
      -@endterm is used if it exists and if the link has no content.
      -
    • -

      Mauritz Jeanson: titles.xsl

      Added code to handle acknowledgements in book and part. The element is processed
      -similarly to dedication. All acknowledgements will appear as front matter, after
      -any dedications.
      -
    • -

      Robert Stayton: olink.xsl

      Fix bug #2018717 use.local.olink.style uses wrong gentext context.
      -
    • -

      Robert Stayton: olink.xsl

      Fix bug #1787167 incorrect hot text for some olinks.
      -
    • -

      Robert Stayton: common.xsl

      Fix bug #1669654 Broken output if copyright <year> contains a range.
      -
    • -

      Robert Stayton: labels.xsl

      Fix bug in labelling figure inside appendix inside article inside book.
      -
    -
    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.74.3 release.

    -
    • -

      Jirka Kosek: highlight.xsl

      Inclusion of highlighting code was simplified. Only one import is now necessary.
      -
    • -

      Robert Stayton: fop1.xsl

      Add the new fop extensions namespace declaration, in case FOP
      -extension functions are used.
      -
    • -

      Robert Stayton: formal.xsl

      Add support for pgwide on informal objects.
      -
    • -

      Robert Stayton: docbook.xsl

      Fixed spurious closing quote on line 134.
      -
    • -

      Robert Stayton: docbook.xsl; autoidx-kosek.xsl; autoidx.xsl

      Convert function-available for node-set() to use
      -new $exsl.node.set.available param in test.
      -
    • -

      David Cramer: xref.xsl

      Suppress extra space after xref when xrefstyle='select: label nopage' (#2740472)
      -
    • -

      Mauritz Jeanson: pi.xsl

      Fixed doc bug for row-height.
      -
    • -

      David Cramer: glossary.xsl

      Internationalized punctuation in glosssee and glossseealso
      -
    • -

      Robert Stayton: param.xweb; param.ent; htmltbl.xsl; table.xsl

      Add support for some format properties on tables using
      -HTML table markup.  These include:
      -  - frame attribute on table (or uses $default.table.frame parameter).
      -  - rules attribute on table (or uses $default.table.rules parameter).
      -  - align attribute on td and th
      -  - valign attribute on td and th
      -  - colspan on td and th
      -  - rowspan on td and th
      -  - bgcolor on td and th
      -
    • -

      Robert Stayton: table.xsl

      Add support bgcolor in td and th
      -elements in HTML table markup.
      -
    • -

      Robert Stayton: htmltbl.xsl

      Add support for colspan and rowspan and bgcolor in td and th
      -elements in HTML table markup.
      -
    • -

      Robert Stayton: param.xweb

      Fix working of page-master left and right margins.
      -
    • -

      Mauritz Jeanson: param.xweb; param.ent; fop1.xsl

      Added a new parameter, bookmarks.collapse, that controls the initial state of the bookmark tree. When the parameter has a non-zero value (the default), only the top-level bookmarks are displayed initially. Otherwise, the whole tree of bookmarks is displayed.  This is implemented for FOP 0.9X. Closes FR #1792326.
      -
    • -

      Robert Stayton: table.xsl; pi.xsl

      Add support for dbfo row-height processing instruction, like that in dbhtml.
      -
    • -

      Robert Stayton: lists.xsl

      Add support for dbfo keep-together processing instruction for
      -entire list instances.
      -
    • -

      Robert Stayton: lists.xsl; block.xsl

      Add support fo dbfo keep-together processing instruction to
      -more blocks like list items and paras.
      -
    • -

      Robert Stayton: lists.xsl; param.xweb; param.ent

      Add new variablelist.term.properties to format terms, per request # 1968513.
      -
    • -

      Robert Stayton: inline.xsl

      In simple.xlink, rearrange order of processing.
      -
    • -

      Robert Stayton: xref.xsl

      Handle firstterm like glossterm in mode="xref-to".
      -
    • -

      Robert Stayton: glossary.xsl; xref.xsl; pi.xsl; footnote.xsl

      Implement simple.xlink for glosssee and glossseealso so they can use
      -other types of linking besides otherterm.
      -
    • -

      Robert Stayton: qandaset.xsl

      Add two new qanda.defaultlabel values so that numbered sections and numbered questions can be distinguished.  Satisfies Feature Request #1539045.
      -
    • -

      Robert Stayton: titlepage.xsl

      For the book title templates, I changed info/title to book/info/title
      -so other element's titles will not be affected.
      -
    • -

      Robert Stayton: xref.xsl; verbatim.xsl

      Use param exsl.node.set.available to test for function.
      -
    • -

      Robert Stayton: param.xweb; param.ent; footnote.xsl

      Start using new param exsl.node.set.available to work around Xalan bug.
      -
    • -

      Robert Stayton: titlepage.templates.xml

      Add comment on use of t:predicate for editor to prevent
      -extra processing of multiple editors. Fixes bug 2687842.
      -
    • -

      Robert Stayton: xref.xsl; autoidx.xsl

      An indexterm primary, secondary, or tertiary element with an id or xml:id
      -now outputs that ID, so that index entries can be cross referenced to.
      -
    • -

      Mauritz Jeanson: synop.xsl

      Added modeless template for ooclass|oointerface|ooexception.
      -Closes bug #1623468.
      -
    • -

      Robert Stayton: xref.xsl

      Add template with match on indexterm in mode="xref-to" to fix bug 2102592.
      -
    • -

      Robert Stayton: xref.xsl

      Now xref to qandaentry will use the label element in a question for
      -the link text if it has one.
      -
    • -

      Robert Stayton: inline.xsl

      Add id if specified from @id to output for quote and phrase so
      -they can be xref'ed to.
      -
    • -

      Robert Stayton: xref.xsl

      Add support for xref to phrase, simpara, anchor, and quote.
      -This assumes the author specifies something using xrefstyle since
      -the elements don't have ordinary link text.
      -
    • -

      Robert Stayton: toc.xsl

      Fix bug in new toc templates.
      -
    • -

      Mauritz Jeanson: titlepage.xsl; component.xsl; division.xsl; xref.xsl; titlepage.templates⋯

      Added code to handle acknowledgements in book and part. The element is processed
      -similarly to dedication. All acknowledgements will appear as front matter, after
      -any dedications.
      -
    • -

      Robert Stayton: toc.xsl

      Rewrite toc templates to support an empty toc or populated toc
      -in all permitted contexts.  Same for lot elements.
      -This fixes bug #1595969 for FO outputs.
      -
    • -

      Robert Stayton: index.xsl

      Fix indents for seealsoie so they are consistent.
      -
    • -

      Mauritz Jeanson: param.xweb

      Removed duplicate (monospace.font.family).
      -
    • -

      Robert Stayton: param.xweb; param.ent

      Add glossentry.list.item.properties.
      -
    • -

      Robert Stayton: param.xweb; param.ent

      Add monospace.verbatim.font.width param to support @width on programlisting.
      -
    • -

      Robert Stayton: verbatim.xsl

      Put programlisting in fo:block-container with writing-mode="lr-tb"
      -when text direction is right to left because all program languages
      -are left-to-right.
      -
    • -

      Robert Stayton: verbatim.xsl

      Add support for @width on screen and programlisting, fixes bug #2012736.
      -
    • -

      Robert Stayton: xref.xsl

      Fix bug #1973585 xref to para with xrefstyle not handled correctly.
      -
    • -

      Mauritz Jeanson: block.xsl

      Added support for acknowledgements in article.
      -Support in book/part remains to be added.
      -
    • -

      Robert Stayton: xref.xsl

      Fix bug #1787167 incorrect hot text for some olinks.
      -
    • -

      Robert Stayton: fo.xsl

      Add writing-mode="tb-rl" as well since some XSL-FO processors support it.
      -
    • -

      Robert Stayton: autotoc.xsl; lists.xsl; glossary.xsl; fo.xsl; table.xsl; pagesetup.xsl

      Add support for writing-mode="rl-tb" (right-to-left) in FO outputs.
      -Changed instances of margin-left to margin-{$direction.align.start}
      -and margin-right to margin-{$direction.align.end}. Those direction.align
      -params are computed from the writing mode value in each locale's
      -gentext key named 'writing-mode', introduced in 1.74.3 to add
      -right-to-left support to HTML outputs.
      -
    • -

      Robert Stayton: param.xweb; param.ent

      Add attribute-sets for formatting glossary terms and defs.
      -
    • -

      Robert Stayton: param.xweb; param.ent

      Add writing.mode param for FO output.
      -
    • -

      Robert Stayton: autotoc.xsl

      Fix bug 1546008: in qandaentry in a TOC, use its blockinfo/titleabbrev or blockinfo/title
      -instead of question, if available. For DocBook 5, use the info versions.
      -
    • -

      Keith Fahlgren: verbatim.xsl

      Add better pointer to README for XSLTHL
      -
    • -

      Keith Fahlgren: verbatim.xsl

      More tweaking the way that XSLTHL does or does not get called
      -
    • -

      Keith Fahlgren: verbatim.xsl

      Alternate attempt at sanely including/excluding XSLTHT code
      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.74.3 release.

    -
    • -

      Robert Stayton: lists.xsl

      Removed redundant lang and title attributes on list element inside
      -div element for lists.
      -
    • -

      Robert Stayton: inline.xsl; titlepage.xsl; division.xsl; toc.xsl; sections.xsl; table.xsl;⋯

      Convert all calls to class.attribute to calls to common.html.attributes
      -to support dir, lang, and title attributes in html output for all elements.
      -Fulfills feature request #1993833.
      -
    • -

      Robert Stayton: chunk-common.xsl

      Fix bug #2750253 wrong links in list of figures in chunk.html
      -when target html is in a subdirectory and dbhtml filename used.
      -
    • -

      Jirka Kosek: highlight.xsl

      Inclusion of highlighting code was simplified. Only one import is now necessary.
      -
    • -

      Robert Stayton: chunk-common.xsl; chunktoc.xsl; docbook.xsl; chunk-changebars.xsl; autoidx⋯

      Convert function-available for node-set() to use
      -new $exsl.node.set.available param in test.
      -
    • -

      Mauritz Jeanson: pi.xsl

      Fixed doc bug for row-height.
      -
    • -

      David Cramer: glossary.xsl

      Internationalized punctuation in glosssee and glossseealso
      -
    • -

      Robert Stayton: lists.xsl; html.xsl; block.xsl

      More elements get common.html.attributes.
      -Added locale.html.attributes template which does the lang,
      -dir, and title attributes, but not the class attribute
      -(used on para, for example).
      -
    • -

      Robert Stayton: lists.xsl

      Replace more literal class atts with mode="class.attribute" to support
      -easier customization.
      -
    • -

      Robert Stayton: glossary.xsl

      Support olinking in glosssee and glossseealso.
      -
    • -

      Robert Stayton: inline.xsl

      In simple.xlink, rearrange order of processing.
      -
    • -

      Robert Stayton: xref.xsl

      Handle firstterm like glossterm in mode="xref-to".
      -
    • -

      Robert Stayton: lists.xsl; html.xsl; block.xsl

      Added template named common.html.attributes to output
      -class, title, lang, and dir for most elements.
      -Started adding it to some list and block elements.
      -
    • -

      Robert Stayton: qandaset.xsl

      Add two new qanda.defaultlabel values so that numbered sections
      -and numbered questions can be distinguished.  Satisfies
      -Feature Request #1539045.
      -
    • -

      Robert Stayton: param.xweb; chunk-code.xsl; param.ent; xref.xsl; chunkfast.xsl; verbatim.x⋯

      Use new param exsl.node.set.available to test, handles Xalan bug.
      -
    • -

      Robert Stayton: autoidx.xsl

      Use named anchors for primary, secondary, and tertiary ids so
      -duplicate entries with different ids can still have an id output.
      -
    • -

      Robert Stayton: param.xweb; param.ent

      Add new param index.links.to.section.
      -
    • -

      Robert Stayton: xref.xsl; autoidx.xsl

      Pass through an id on primary, secondary, or tertiary to 
      -the index entry, so that one could link to an index entry.
      -You can't link to the id on an indexterm because that is
      -used to place the main anchor in the text flow.
      -
    • -

      Robert Stayton: autoidx.xsl

      Add support for the new index.links.to.section param which permits
      -precise links to indexterms in HTML output rather than to
      -the section title.
      -
    • -

      Mauritz Jeanson: synop.xsl

      Added modeless template for ooclass|oointerface|ooexception.
      -Closes bug #1623468.
      -
    • -

      Robert Stayton: qandaset.xsl

      Make sure a qandaset has an anchor, even when it has no title, 
      -because it may be referenced in a TOC or xref.
      -Before, the anchor was output by the title, but there was no
      -anchor if there was no title.
      -
    • -

      Robert Stayton: xref.xsl

      Add a template for indexterm with mode="xref-to" to fix bug 2102592.
      -
    • -

      Robert Stayton: xref.xsl

      Now xref to qandaentry will use the label element in a question for
      -the link text if it has one.
      -
    • -

      Robert Stayton: qandaset.xsl; html.xsl

      Create separate templates for computing label of question and answer
      -in a qandaentry, so such can be used for the alt text of an xref
      -to a qandaentry.
      -
    • -

      Robert Stayton: inline.xsl; xref.xsl

      Now support xref to phrase, simpara, anchor, and quote,
      -most useful when an xrefstyle is used.
      -
    • -

      Robert Stayton: toc.xsl

      Rewrite toc templates to support an empty toc or populated toc
      -in all permitted contexts.  Same for lot elements.
      -This fixes bug #1595969 for HTML outputs.
      -
    • -

      Mauritz Jeanson: titlepage.xsl; component.xsl; division.xsl; xref.xsl; titlepage.templates⋯

      Added code to handle acknowledgements in book and part. The element is processed
      -similarly to dedication. All acknowledgements will appear as front matter, after
      -any dedications.
      -
    • -

      Robert Stayton: index.xsl

      Rewrote primaryie, secondaryie and tertiaryie templates to handle
      -nesting of elements and seeie and seealsoie, as reported in
      -bug # 1168912.
      -
    • -

      Robert Stayton: autotoc.xsl

      Fix simplesect in toc problem.
      -
    • -

      Robert Stayton: verbatim.xsl

      Add support for @width per bug report #2012736.
      -
    • -

      Robert Stayton: formal.xsl; htmltbl.xsl

      Fix bug #1787140 HTML tables not handling attributes correctly.
      -
    • -

      Robert Stayton: param.xweb

      Move writing-mode param.
      -
    • -

      Keith Fahlgren: refentry.xsl

      Remove a nesting of <p> inside <p> for refclass (made XHTML* invalid, made HTML silly)
      -
    • -

      Robert Stayton: table.xsl

      Fix bug #1945872 to allow passthrough of colwidth values to
      -HTML table when no tablecolumns.extension is available and
      -when no instance of * appears in the table's colspecs.
      -
    • -

      Mauritz Jeanson: block.xsl

      Added support for acknowledgements in article.
      -Support in book/part remains to be added.
      -
    • -

      Robert Stayton: chunk-common.xsl

      Fix bug #1787167 incorrect hot text for some olinks.
      -
    • -

      Robert Stayton: qandaset.xsl

      Fix bug 1546008: in qandaentry in a TOC, use its blockinfo/titleabbrev or blockinfo/title
      -instead of question, if available. For DocBook 5, use the info versions.
      -
    • -

      Robert Stayton: chunktoc.xsl

      Add support for generating olink database when using chunktoc.xsl.
      -
    • -

      Keith Fahlgren: verbatim.xsl

      Add better pointer to README for XSLTHL
      -
    • -

      Keith Fahlgren: verbatim.xsl

      Another stab at fixing the stupid XSLTHT includes across processors (Saxon regression reported by Sorin Ristache)
      -
    • -

      Keith Fahlgren: verbatim.xsl

      More tweaking the way that XSLTHL does or does not get called
      -
    • -

      Keith Fahlgren: verbatim.xsl

      Alternate attempt at sanely including/excluding XSLTHT code
      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.74.3 release.

    -
    • -

      Robert Stayton: table.xsl

      Convert function-available test for node-set() function to
      -test of $exsl.node.set.available param.
      -
    • -

      Mauritz Jeanson: lists.xsl

      Added a template for bibliolist. Closes bug #1815916.
      -
    -
    - -

    ePub

    - -

    The following changes have been made to the - epub code - since the 1.74.3 release.

    -
    • -

      Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/onegraphic.xinclude.xml;⋯

      Slightly more nuanced handling of imageobject alternatives and better support in dbtoepub for XIncludes and ENTITYs to resolve Issue #2750442 reported by Raphael Hertzog.
      -
    • -

      Keith Fahlgren: docbook.xsl

      Add a colon after an abstract/title when mapping into the dc:description for OPF metadata in ePub output to help the flat text have more pseudo-semantics (sugestions from Michael Wiedmann)
      -
    • -

      Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl; bin/spec/files/de.xml

      Correctly set dc:language in OPF metadata when i18nizing. Closes Bug #2755150
      -
    • -

      Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl

      Corrected namespace declarations for literal XHTML elements to make them serialize "normally"
      -
    • -

      Keith Fahlgren: docbook.xsl

      Be a little bit more nuanced about dates
      -
    • -

      Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files/orm.book.001.x⋯

      Add DocBook subjectset -> OPF dc:subject mapping and tests
      -
    • -

      Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files/orm.book.001.x⋯

      Add DocBook date -> OPF dc:date mapping and tests
      -
    • -

      Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files/orm.book.001.x⋯

      Add DocBook abstract -> OPF dc:description mapping and tests
      -
    • -

      Robert Stayton: docbook.xsl

      Check in patch submitted by user to add opf:file-as attribute
      -to dc:creator element.
      -
    • -

      Keith Fahlgren: bin/dbtoepub

      Adding --output option to dbtoepub based on user request
      -
    • -

      Keith Fahlgren: docbook.xsl; bin/spec/epub_spec.rb

      Cleaning and regularizing the generation of namespaced nodes for OPF, NCX, XHTML and other outputted filetypes (hat tip to bobstayton for pointing out the silly, incorrect code)
      -
    • -

      Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/refclass.xml

      Remove a nesting of <p> inside <p> for refclass (made XHTML* invalid, made HTML silly)
      -
    • -

      Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/blockquotepre.xml

      Added regression test and fix for XHTML validation problem with <a>s added inside <blockquote>; This potentially causes another problem (where something is referenced by has no anchor, but someone reporting that should cause the whole <a id='thing'/> thing to be reconsidered with modern browsers in mind.
      -
    -
    - -

    HTMLHelp

    - -

    The following changes have been made to the - htmlhelp code - since the 1.74.3 release.

    -
    • -

      Robert Stayton: htmlhelp-common.xsl

      Add support for generating olink target database for htmlhelp files.
      -
    -
    - - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.74.3 release.

    -
    • -

      Robert Stayton: default.table.rules.xml

      Add default setting for @rules attribute on HTML markup tables.
      -
    • -

      Mauritz Jeanson: bookmarks.collapse.xml

      Added a new parameter, bookmarks.collapse, that controls the initial state 
      -of the bookmark tree. When the parameter has a non-zero value (the default), 
      -only the top-level bookmarks are displayed initially. Otherwise, the whole 
      -tree of bookmarks is displayed. 
      -
      -This is implemented for FOP 0.9X. Closes FR #1792326.
      -
    • -

      Robert Stayton: variablelist.term.properties.xml

      Add new variablelist.term.properties to format terms, per 
      -request # 1968513.
      -
    • -

      Robert Stayton: qanda.defaultlabel.xml

      Add two new qanda.defaultlabel values so that numbered sections
      -and numbered questions can be distinguished.  Satisfies
      -Feature Request #1539045.
      -
    • -

      Robert Stayton: index.links.to.section.xml

      Change default to 1 to match past behavior.
      -
    • -

      Robert Stayton: exsl.node.set.available.xml

      Isolate this text for Xalan bug regarding exsl:node-set available.
      -If it is ever fixed in Xalan, just fix it here.
      -
    • -

      Robert Stayton: index.links.to.section.xml

      Add param to control whether an index entry links to
      -a section title or to the precise location of the
      -indexterm.
      -
    • -

      Robert Stayton: glossentry.list.item.properties.xml

      New attribute list for glossentry in glossary.
      -
    • -

      Robert Stayton: monospace.verbatim.font.width.xml

      New parameter to support @width on programlisting and screen.
      -
    • -

      Mauritz Jeanson: highlight.source.xml

      Updated and reorganized the description.
      -
    • -

      Robert Stayton: page.margin.outer.xml; page.margin.inner.xml

      Add caveat about XEP bug when writing-mode is right-to-left.
      -
    • -

      Robert Stayton: article.appendix.title.properties.xml; writing.mode.xml; body.start.indent⋯

      Change 'left' to 'start' and 'right' to 'end' to support right-to-left
      -writing mode.
      -
    • -

      Robert Stayton: glossdef.block.properties.xml; glossdef.list.properties.xml; glossterm.blo⋯

      Add attribute-sets for formatting glossary terms and defs.
      -
    • -

      Robert Stayton: glossterm.separation.xml

      Clarify the description.
      -
    • -

      Robert Stayton: make.year.ranges.xml

      Now handles year element containing a comma or dash without error.
      -
    -
    - -

    Highlighting

    - -

    The following changes have been made to the - highlighting code - since the 1.74.3 release.

    -
    • -

      Jirka Kosek: README

      Inclusion of highlighting code was simplified. Only one import is now necessary.
      -
    • -

      Keith Fahlgren: README

      Adding XSLTHL readme
      -
    • -

      Keith Fahlgren: common.xsl

      Alternate attempt at sanely including/excluding XSLTHT code
      -
    -
    - -

    XSL-Saxon

    - -

    The following changes have been made to the - xsl-saxon code - since the 1.74.3 release.

    -
    • -

      Mauritz Jeanson: src/com/nwalsh/saxon/Text.java

      Added a fix that prevents output of extra blank line.
      -Hopefully this closes bug #894805.
      -
    -
    - -

    XSL-Xalan

    - -

    The following changes have been made to the - xsl-xalan code - since the 1.74.3 release.

    -
    • -

      Mauritz Jeanson: src/com/nwalsh/xalan/Text.java

      Added a fix that prevents output of extra blank line.
      -Hopefully this closes bug #894805.
      -
    -
    - - -
    - -

    Release Notes: 1.74.3

    - -

    This release fixes some bugs in the 1.74.2 release.

    -

    See highlighting/README for XSLTHL usage instructions.

    -
    -

    Release Notes: 1.74.2

    - -

    This release fixes some bugs in the 1.74.1 release.

    -
    - -

    Release Notes: 1.74.1

    - -

    This release includes important bug fixes and adds the following -significant feature changes: -

    Gentext

    Kirghiz locale added and Chinese translations have been simplified.

    Somme support for gentext and right-to-left languages has been added.

    FO

    Various bugs have been resolved.

    Support for a new processing instruction: dbfo funcsynopsis-style has been added.

    Added new param email.mailto.enabled for FO output. Patch from Paolo Borelli.

    -

    Support for documented metadata in fop1 mode has been added.

    -
    Highlighting

    Support for the latest version of XSLTHL 2.0 and some new language syntaxes have been added to a variety of outputs.

    Manpages

    Added man.output.better.ps.enabled param (zero default). It non-zero, no such -markup is embedded in generated man pages, and no enhancements are -included in the PostScript output generated from those man pages -by the man -Tps command.

    HTML

    Support for writing.mode to set text direction and alignment based on document locale has been added.

    -

    Added a new top-level stylesheet module, chunk-changebars.xsl, to be -used for generating chunked output with highlighting based on change -(@revisionflag) markup. The module imports/includes the standard chunking -and changebars templates and contains additional logic for chunked output. -See FRs #1015180 and #1819915.

    -
    ePub
    -

    Covers now look better in Adobe Digital Editions thanks to a patch from Paul Norton of Adobe

    -

    Cover handling now more generic (including limited DocBook 5.0 cover support thanks to patch contributed by Liza Daly.

    Cover markup now carries more reliably into files destined for .mobi and the Kindle.

    dc:identifiers are now generated from more types of numbering schemes.

    Both SEO and semantic structure of chunked ePub output by ensuring that we always send out one and only one h1 in each XHTML chunk.

    -

    Primitive support for embedding a single font added.

    - -

    Support for embedding a CSS customizations added.

    -
    Roundtrip
    -

    Support for imagedata-metadata and table as images added.

    - -

    Support for imagedata-metadata and legalnotice as images added.

    -
    Params

    man.output.better.ps.enabled added for Manpages output

    -

    writing.mode.xml added to set text direction.

    - -

    Added new param email.mailto.enabled for FO output. -Patch from Paolo Borelli. Closes #2086321.

    - -

    highlight.source upgraded to support the latest version of XSLTHL 2.0.

    -

    -

    -

    The following is a list of changes that have been made since the 1.74.0 release.

    - - -

    Gentext

    - -

    The following changes have been made to the gentext code since the 1.74.0 release.

    -
    • -

      Michael(tm) Smith: locale/ky.xml; Makefile

      new Kirghiz locale from Ilyas Bakirov
      -
    • -

      Mauritz Jeanson: locale/en.xml

      Added "Acknowledgements".
      -
    • -

      Dongsheng Song: locale/zh_cn.xml

      Simplified Chinese translation.
      -
    • -

      Robert Stayton: locale/lv.xml; locale/ca.xml; locale/pt.xml; locale/tr.xml; locale/af.xml;⋯

      Add writing-mode gentext string to support right-to-left languages.
      -
    -
    - -

    FO

    - -

    The following changes have been made to the fo code since the 1.74.0 release.

    -
    • -

      David Cramer: footnote.xsl

      Added a check to confirm that a footnoteref's linkend points to a footnote. Stylesheets stop processing if not and provide a useful error message.
      -
    • -

      Mauritz Jeanson: spaces.xsl

      Convert spaces to fo:leader also in elements in the DB 5 namespace.
      -
    • -

      Mauritz Jeanson: pi.xsl; synop.xsl

      Added support for a new processing instruction: dbfo funcsynopsis-style. 
      -Closes bug #1838213.
      -
    • -

      Michael(tm) Smith: inline.xsl; param.xweb; param.ent

      Added new param email.mailto.enabled for FO output.
      -Patch from Paolo Borelli. Closes #2086321.
      -
    • -

      Mauritz Jeanson: docbook.xsl

      Added support for document metadata for fop1 (patch #2067318).
      -
    • -

      Jirka Kosek: param.ent; param.xweb; highlight.xsl

      Upgraded to support the latest version of XSLTHL 2.0
      - -- nested markup in highlited code is now processed
      - -- it is no longer needed to specify path XSLTHL configuration file using Java property
      - -- support for new languages, including Perl, Python and Ruby was added
      -
    -
    - -

    HTML

    - -

    The following changes have been made to the html code since the 1.74.0 release.

    -
    • -

      Robert Stayton: param.xweb; docbook.xsl; param.ent; html.xsl

      Add support for writing.mode to set text direction and alignment based on document locale.
      -
    • -

      Mauritz Jeanson: chunk-changebars.xsl

      Added a new top-level stylesheet module, chunk-changebars.xsl, to be 
      -used for generating chunked output with highlighting based on change 
      -(@revisionflag) markup. The module imports/includes the standard chunking 
      -and changebars templates and contains additional logic for chunked output.
      -See FRs #1015180 and #1819915.
      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the manpages code since the 1.74.0 release.

    -
    • -

      Michael(tm) Smith: docbook.xsl

      Put the following at the top of generated roff for each page:
      -  \" t
      -purpose is to explicitly tell AT&T troff that the page needs to be
      -pre-processed through tbl(1); groff can figure it out
      -automatically, but apparently AT&T troff needs to be explicitly told
      -
    -
    - -

    ePub

    - -

    The following changes have been made to the epub code since the 1.74.0 release.

    -
    • -

      Keith Fahlgren: docbook.xsl

      Patch from Paul Norton of Adobe to get covers to look better in Adobe Digital Editions
      -
    • -

      Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/v5cover.xml; bin/spec/sp⋯

      Patch contributed by Liza Daly to make ePub cover handling more generic. Additionally
      -DocBook 5.0's <cover> now has some limited support:
      -
      -- should reference a cover in the OPF guide for a DocBook 5.0 test document
      -
    • -

      Keith Fahlgren: bin/spec/files/isbn.xml; bin/spec/files/issn.xml; bin/spec/files/biblioid.⋯

      Liza Daly reported that the dc:identifer-generation code was garbage (she was right).
      -
      -Added new tests:
      -- should include at least one dc:identifier
      -- should include an ISBN as URN for dc:identifier if an ISBN was in the metadata
      -- should include an ISSN as URN for dc:identifier if an ISSN was in the metadata
      -- should include an biblioid as a dc:identifier if an biblioid was in the metadata
      -- should include a URN for a biblioid with @class attribute as a dc:identifier if an biblioid was in the metadata
      -
    • -

      Keith Fahlgren: docbook.xsl; bin/spec/epub_spec.rb

      Improve both SEO and  semantic structure of chunked ePub output by ensuring that
      -we always send out one and only one h1 in each XHTML chunk.
      -
      -DocBook::Epub
      -- should include one and only one <h1> in each HTML file in rendered ePub files
      -for <book>s
      -- should include one and only one <h1> in each HTML file in rendered ePub files
      -for <book>s even if they do not have section markup
      -
    • -

      Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files/orm.book.001.x⋯

      Adding better support for covers in epub files destined for .mobi and the Kindle
      -
    • -

      Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb; bin/spec/files/DejaVuSerif.otf; docbook.⋯

      Adding primitive support for embedding a single font
      -
    • -

      Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb; bin/spec/files/test_cust.xsl; bin/spec/e⋯

      Adding support for user-specified customization layers in dbtoepub
      -
    • -

      Keith Fahlgren: bin/dbtoepub; bin/spec/epub_regressions_spec.rb; bin/lib/docbook.rb; bin/s⋯

      Adding CSS support to .epub target & dbtoepub:
      -    -c, --css [FILE]                 Use FILE for CSS on generated XHTML.
      -
      -
      -DocBook::Epub
      -...
      -- should include a CSS link in HTML files when a CSS file has been provided
      -- should include CSS file in .epub when a CSS file has been provided
      -- should include a CSS link in OPF file when a CSS file has been provided
      -
    -
    - -

    Roundtrip

    - -

    The following changes have been made to the - roundtrip code - since the 1.74.0 release.

    -
    • -

      Steve Ball: blocks2dbk.xsl; template.xml; template.dot

      added support for imagedata-metadata
      -added support for table as images
      -
    • -

      Steve Ball: blocks2dbk.xsl; normalise2sections.xsl; sections2blocks.xsl

      Improved support for personname inlines.
      -
    • -

      Steve Ball: blocks2dbk.xsl; blocks2dbk.dtd; template.xml

      Added support for legalnotice.
      -
    • -

      Steve Ball: blocks2dbk.xsl; wordml2normalise.xsl

      added support for orgname in author
      -
    • -

      Steve Ball: specifications.xml; supported.xml; blocks2dbk.xsl; wordml2normalise.xsl; dbk2w⋯

      Updated specification.
      -to-DocBook: add cols attribute to tgroup
      -from-DocBook: fix for blockquote title
      -
    -
    - -

    Params

    - -

    The following changes have been made to the params since the 1.74.0 release.

    -
    • -

      The change was to add man.output.better.ps.enabled parameter, with -its default value set to zero. - -If the value of the man.output.better.ps.enabled parameter is -non-zero, certain markup is embedded in each generated man page -such that PostScript output from the man -Tps command for that -page will include a number of enhancements designed to improve the -quality of that output. - -If man.output.better.ps.enabled is zero (the default), no such -markup is embedded in generated man pages, and no enhancements are -included in the PostScript output generated from those man pages -by the man -Tps command. - -WARNING: The enhancements provided by this parameter rely on -features that are specific to groff (GNU troff) and that are not -part of "classic" AT&T troff or any of its derivatives. Therefore, -any man pages you generate with this parameter enabled will be -readable only on systems on which the groff (GNU troff) program is -installed, such as GNU/Linux systems. The pages will not not be -readable on systems on with the classic troff (AT&T troff) command -is installed. - -NOTE: The value of this parameter only affects PostScript output -generated from the man command. It has no effect on output -generated using the FO backend. - -TIP: You can generate PostScript output for any man page by -running the following command: - -man FOO -Tps > FOO.ps - -You can then generate PDF output by running the following command: - -ps2pdf FOO.ps

      -
    • -

      Robert Stayton: writing.mode.xml

      writing mode param used to set text direction.
      -
    • -

      Michael(tm) Smith: email.mailto.enabled.xml

      Added new param email.mailto.enabled for FO output.
      -Patch from Paolo Borelli. Closes #2086321.
      -
    • -

      Jirka Kosek: highlight.source.xml; highlight.xslthl.config.xml

      Upgraded to support the latest version of XSLTHL 2.0
      - -- nested markup in highlited code is now processed
      - -- it is no longer needed to specify path XSLTHL configuration file using Java property
      - -- support for new languages, including Perl, Python and Ruby was added
      -
    -
    - -

    Highlighting

    - -

    The following changes have been made to the - highlighting code - since the 1.74.0 release.

    -
    • -

      Jirka Kosek: cpp-hl.xml; c-hl.xml; tcl-hl.xml; php-hl.xml; common.xsl; perl-hl.xml; delphi⋯

      Upgraded to support the latest version of XSLTHL 2.0
      - -- nested markup in highlited code is now processed
      - -- it is no longer needed to specify path XSLTHL configuration file using Java property
      - -- support for new languages, including Perl, Python and Ruby was added
      -
    -
    - -
    - - -

    Release Notes: 1.74.0

    - -

    This release includes important bug fixes and adds the following -significant feature changes: -

    .epub target

    Paul Norton (Adobe) and Keith Fahlgren(O'Reilly Media) have donated code that generates .epub documents from -DocBook input. An alpha-reference implementation in Ruby has also been provided.

    -

    .epub is an open standard of the The International Digital Publishing Forum (IDPF), -a the trade and standards association for the digital publishing industry.

    -

    Read more about this target in epub/README -

    XHTML 1.1 target

    To support .epub output, a strict XHTML 1.1 target has been added. The stylesheets for this output are -generated and are quite similar to the XHTML target.

    Gentext updates

    A number of locales have been updated.

    Roundtrip improvements

    Table, figure, template syncronization, and character style improvements have been made for WordML & Pages. Support added for OpenOffice.org.

    First implementation of a libxslt extension
    -

    A stylesheet extension for libxslt, written in Python, has been added. - The extension is a function for adjusting column widths in CALS tables. See - extensions/README.LIBXSLT for more information.

    -

    -

    -

    The following is a list of changes that have been made - since the 1.73.2 release.

    - -

    Gentext

    - -

    The following changes have been made to the - gentext code - since the 1.73.2 release.

    -
    • -

      Michael(tm) Smith: locale/id.xml

      Checked in changes to Indonesion locale submitted by Euis Luhuanam a long time ago.
      -
    • -

      Michael(tm) Smith: locale/lt.xml

      Added changes to Lithuanian locate submitted a long time back by Nikolajus Krauklis.
      -
    • -

      Michael(tm) Smith: locale/hu.xml

      fixed error in lowercase.alpha definition in Hungarian locale
      -
    • -

      Michael(tm) Smith: locale/nb.xml

      Corrected language code for nb locale, and restored missing "startquote" key.
      -
    • -

      Michael(tm) Smith: locale/ja.xml

      Committed changes to ja locale file, from Akagi Kobayashi. Adds bracket quotes around many xref instances that did not have them
      -before.
      -
    • -

      Michael(tm) Smith: Makefile

      "no" locale is now "nb"
      -
    • -

      Michael(tm) Smith: locale/nb.xml

      Update Norwegian Bokmål translation. Thanks to Hans F. Nordhaug.
      -
    • -

      Michael(tm) Smith: locale/no.xml; locale/nb.xml

      per message from Hans F. Nordhaug, correct identifier for
      -Norwegian Bokmål is "nb" (not "no") and has been for quite some
      -time now...
      -
    • -

      Michael(tm) Smith: locale/ja.xml

      Converted ja.xml source file to use real unicode characters so
      -that the actual glyphs so up when you edit it in a text editor
      -(instead of the character references).
      -
    • -

      Michael(tm) Smith: locale/ja.xml

      Checked in changes to ja.xml locale file. Thanks to Akagi Kobayashi.
      -
    • -

      Michael(tm) Smith: locale/it.xml

      Changes from Federico Zenith
      -
    • -

      Dongsheng Song: locale/zh_cn.xml

      Added missing translations.
      -
    -
    - -

    Common

    - -

    The following changes have been made to the - common code - since the 1.73.2 release.

    -
    • -

      Michael(tm) Smith: l10n.xsl

      Added new template "l10.language.name" for retrieving the
      -English-language name of the lang setting of the current document.
      -Closes #1916837. Thanks to Simon Kennedy.
      -
    • -

      Michael(tm) Smith: refentry.xsl

      fixed syntax error
      -
    • -

      Michael(tm) Smith: refentry.xsl

      fixed a couple of typos
      -
    • -

      Michael(tm) Smith: refentry.xsl

      refined handling of cases where refentry "source" or "manual"
      -metadata is missing or when we use fallback content instead. We
      -now report a Warning if we use fallback content.
      -
    • -

      Michael(tm) Smith: refentry.xsl

      don't use refmiscinfo@class=date value as fallback for refentry
      -"source" or "manual" metadata fields
      -
    • -

      Michael(tm) Smith: refentry.xsl

      Made reporting of missing refentry metadata more quiet:
      -
      -  - we no longer report anything if usable-but-not-preferred
      -    metadata is found; we just quietly use whatever we manage to
      -    find
      -
      -  - we now only report missing "source" metadata if the refentry
      -    is missing BOTH "source name" and "version" metadata; if it
      -    has one but not the other, we use whichever one it has and
      -    don't report anything as missing
      -
      -The above changes were made because testing with some "real world"
      -source reveals that some authors are intentionally choosing to use
      -"non preferred" markup for some metadata, and also choosing to
      -omit "source name" or "version" metadata in there DocBook XML. So
      -it does no good to give them pedantic reminders about what they
      -already know...
      -
      -Also, changed code to cause "fixme" text to be inserted in output
      -in particular cases:
      -
      -  - if we can't manage to find any "source" metadata at all, we
      -    now put fixme text into the output
      -
      -  - if we can't manage to find any "manual" metadata a all, we 
      -    now put fixme text into the output
      -
      -The "source" and "manual" metadata is necessary information, so
      -buy putting the fixme stuff in the output, we alert users to the
      -need problem of it being missing.
      -
    • -

      Michael(tm) Smith: refentry.xsl

      When generating manpages output, we no longer report anything if
      -the refentry source is missing date or pubdate content. In
      -practice, many users intentionally omit the date from the source
      -because they explicitly want it to be generated.
      -
    • -

      Michael(tm) Smith: l10n.xml

      further change needed for switch from no locale to nb.
      -
    • -

      Michael(tm) Smith: common.xsl

      Added support for orgname in authorgroup. Thanks to Camille
      -Bégnis.
      -
    • -

      Michael(tm) Smith: Makefile

      "no" locale is now "nb"
      -
    • -

      Mauritz Jeanson: stripns.xsl

      Removed the template matching "ng:link|db:link" (in order to make @xlink:show 
      -work with <link> elements). As far as I can tell, this template is no longer needed.
      -
    • -

      Mauritz Jeanson: entities.ent

      Moved declaration of comment.block.parents entity to common/entities.ent.
      -
    • -

      Mauritz Jeanson: titles.xsl

      Added an update the fix made in revision 7528 (handling of xref/link in no.anchor.mode mode).
      -Having xref in title is not a problem as long as the target is not an ancestor element. 
      -Closes bug #1838136.
      -
      -Note that an xref that is in a title and whose target is an ancestor element is still not 
      -rendered in the TOC. This could be considered a bug, but on the other hand I cannot really
      -see the point in having such an xref in a document.
      -
    • -

      Mauritz Jeanson: titles.xsl

      Added a "not(ancestor::title)" test to work around "too many nested 
      -apply-templates" problems when processing xrefs or links in no.anchor.mode mode.
      -Hopefully, this closes bug #1811721.
      -
    • -

      Mauritz Jeanson: titles.xsl

      Removed old template matching "link" in no.anchor.mode mode.
      -
    • -

      Mauritz Jeanson: titles.xsl

      Process <link> in no.anchor.mode mode with the same template as <xref>. 
      -Closes bug #1759205 (Empty link in no.anchor.mode mode).
      -
    • -

      Mauritz Jeanson: titles.xsl

      In no.anchor.mode mode, do not output anchors for elements that are descendants 
      -of <title>. Previously, having inline elements with @id/@xml:id in <title>s 
      -resulted in anchors both in the TOC and in the main flow. Closes bug #1797492.
      -
    -
    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.73.2 release.

    -
    • Mauritz Jeanson: pi.xsl

      Updated documentation for keep-together.
    • Mauritz Jeanson: task.xsl

      Enabled use of the keep-together PI on task elements.
    • -

      Robert Stayton: index.xsl

      FOP1 requires fo:wrapper for inline index entries, not fo:inline.
      -
    • -

      Robert Stayton: index.xsl

      Fixed non-working inline.or.block template for indexterm wrappers.
      -Add fop1 to list of processors using inline.or.block.
      -
    • -

      Mauritz Jeanson: table.xsl

      Fixed bug #1891965 (colsep in entytbl not working).
      -
    • -

      Mauritz Jeanson: titlepage.xsl

      Added support for title in revhistory. Closes bug #1842847.
      -
    • -

      Mauritz Jeanson: pi.xsl

      Small doc cleanup (dbfo float-type).
      -
    • -

      Mauritz Jeanson: titlepage.xsl

      Insert commas between multiple copyright holders.
      -
    • -

      Mauritz Jeanson: autotoc.xsl; division.xsl

      Added modifications to support nested set elements. See bug #1853172.
      -
    • -

      David Cramer: glossary.xsl

      Added normalize-space to xsl:sorts to avoid missorting of glossterms due to stray leading spaces.
      -
    • -

      David Cramer: glossary.xsl

      Fixed bug #1854199: glossary.xsl should use the sortas attribute on glossentry
      -
    • -

      Mauritz Jeanson: inline.xsl

      Added a template for citebiblioid. The hyperlink target is the parent of the referenced biblioid,
      -and the "hot text" is the biblioid itself enclosed in brackets.
      -
    • -

      Mauritz Jeanson: inline.xsl

      Moved declaration of comment.block.parents entity to common/entities.ent.
      -
    • -

      Mauritz Jeanson: docbook.xsl

      Updated message about unmatched element.
      -
    • -

      Mauritz Jeanson: param.xweb

      Added link to profiling chapter of TCG.
      -
    • -

      Mauritz Jeanson: refentry.xsl

      Fixed typo (refsynopsysdiv -> refsynopsisdiv).
      -
    • -

      David Cramer: fop.xsl; fop1.xsl; ptc.xsl; xep.xsl

      Added test to check generate.index param when generating pdf bookmarks
      -
    • -

      Mauritz Jeanson: graphics.xsl

      Added support for MathML in imagedata.
      -
    • -

      Michael(tm) Smith: math.xsl

      Removed unnecessary extra test condition in test express that
      -checks for passivetex.
      -
    • -

      Michael(tm) Smith: math.xsl

      Don't use fo:instream-foreign-object if we are processing with
      -passivetex. Closes #1806899. Thanks to Justus Piater.
      -
    • -

      Mauritz Jeanson: component.xsl

      Added code to output a TOC for an appendix in an article when 
      -generate.toc='article/appendix toc'. Closes bug #1669658.
      -
    • -

      Dongsheng Song: biblio-iso690.xsl

      Change encoding from "windows-1250" to "UTF-8".
      -
    • -

      Mauritz Jeanson: pi.xsl

      Updated documentation for dbfo_label-width.
      -
    • -

      Mauritz Jeanson: lists.xsl

      Added support for the dbfo_label-width PI in calloutlists.
      -
    • -

      Robert Stayton: biblio.xsl

      Support finding glossary database entries inside bibliodivs.
      -
    • -

      Robert Stayton: formal.xsl

      Complete support for <?dbfo pgwide="1"?> for informal
      -elements too.
      -
    • -

      Mauritz Jeanson: table.xsl

      In the table.block template, added a check for the dbfo_keep-together PI, so that 
      -a table may break (depending on the PI value) at a page break. This was needed 
      -since the outer fo:block that surrounds fo:table has keep-together.within-column="always" 
      -by default, which prevents the table from breaking. Closes bug #1740964 (Titled 
      -table does not respect dbfo PI).
      -
    • -

      Mauritz Jeanson: pi.xsl

      Added a few missing @role="tcg".
      -
    • -

      Mauritz Jeanson: inline.xsl

      Use normalize-space() in glossterm comparisons (as in html/inline.xsl).
      -
    • -

      Mauritz Jeanson: autoidx.xsl

      Removed the [&scope;] predicate from the target variable in the template with name="reference".
      -This filter was the cause of missing index backlinks when @zone and @type were used on indexterms,
      -with index.on.type=1. Closes bug #1680836.
      -
    • -

      Michael(tm) Smith: inline.xsl; xref.xsl; footnote.xsl

      Added capability in FO output for displaying URLs for all
      -hyperlinks (elements marked up with xlink:href attributes) in the
      -same way as URLs for ulinks are already handled (which is to say,
      -either inline or as numbered footnotes).
      -
      -Background on this change:
      -DocBook 5 allows "ubiquitous" linking, which means you can make
      -any element a hyperlink just by adding an xlink:href attribute to
      -it, with the value set to an external URL. That's in contrast to
      -DocBook 4, which only allows you to use specific elements (e.g.,
      -the link and ulink elements) to mark up hyperlinks.
      -
      -The existing FO stylesheets have a mechanism for handling display
      -of URLs for hyperlinks that are marked up with ulink, but they did
      -not handle display of URLs for elements that were marked up with
      -xlink:href attributes. This change adds handling for those other
      -elements, enabling the URLs they link to be displayed either
      -inline or as numbered footnotes (depending on what values the user
      -has the ulink.show and ulink.footnotes params set to).
      -
      -Note that this change only adds URL display support for elements
      -that call the simple.xlink template -- which currently is most
      -(but not all) inline elements.
      -
      -This change also moves the URL display handling out of the ulink
      -template and into a new "hyperlink.url.display" named template;
      -the ulink template and the simple.xlink named template now both
      -call the hyperlink.url.display template.
      -
      -Warning: In the stylesheet code that determines what footnote
      -number to assign to each footnote or external hyperlink, there is
      -an XPath expression for determining whether a particular
      -xlink:href instance is an external hyperlink; that expression is
      -necessarily a bit complicated and further testing may reveal that
      -it doesn't handle all cases as expected -- so some refinements to
      -it may need to be done later.
      -
      -Closes #1785519. Thanks to Ken Morse for reporting and
      -troubleshooting the problem.
      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.73.2 release.

    -
    • Keith Fahlgren: inline.xsl; synop.xsl

      Work to make HTML and XHTML targets more valid
    • Keith Fahlgren: table.xsl

      Add better handling for tables that have footnotes in the titles
    • Keith Fahlgren: biblio.xsl

      Add anchors to bibliodivs
    • -

      Keith Fahlgren: formal.xsl; Makefile; htmltbl.xsl

      Initial checkin/merge of epub target from work provided by Paul Norton of Adobe
      -and Keith Fahlgren of O'Reilly.
      -

      This change includes new code for generating the XHTML 1.1 target sanely.

      -
    • -

      Mauritz Jeanson: biblio.xsl

      Added code for creating URLs from biblioids with @class="doi" (representing Digital 
      -Object Identifiers). See FR #1934434 and http://doi.org.
      -
      -To do: 1) Add support for FO output. 2) Figure out how @class="doi" should be handled 
      -for bibliorelation, bibliosource and citebiblioid.
      -
    • -

      Norman Walsh: formal.xsl

      Don't use xsl:copy because it forces the resulting element to be in the same namespace as the source element; in the XHTML stylesheets, that's wrong. But the HTML-to-XHTML converter does the right thing with literal result elements, so use one of them.
      -
    • -

      Michael(tm) Smith: Makefile

      Added checks and hacks to various makefiles to enable building
      -under Cygwin. This stuff is ugly and maybe not worth the mess and
      -trouble, but does seem to work as expected and not break anything
      -else.
      -
    • -

      Michael(tm) Smith: docbook.xsl

      added "exslt" namespace binding to html/docbook.xsl file (in
      -addition to existing "exsl" binding. reason is because lack of it
      -seems to cause processing problems when using the profiled
      -version of the stylsheet
      -
    • -

      Norman Walsh: chunk-common.xsl

      Rename link
      -
    • -

      Mauritz Jeanson: table.xsl

      Added a fix to make rowsep apply to the last row of thead in entrytbl.
      -
    • -

      Michael(tm) Smith: synop.xsl

      Simplified and streamlined handling of output for ANSI-style
      -funcprototype output, to correct a problem that was causing type
      -data to be lost in the output parameter definitions. For example,
      -for an instance like this:
      -  <paramdef>void *<parameter>dataptr</parameter>[]</paramdef>
      -... the brackets (indicating an array type) were being dropped.
      -
    • -

      Michael(tm) Smith: synop.xsl

      Changed HTML handling of K&R-style paramdef output. The parameter
      -definitions are no longer output in a table (though the prototype
      -still is). The reason for the change is that the
      -kr-tabular-funcsynopsis-mode template was causing type data to be
      -lost in the output parameter definitions. For example, for an
      -instance like this:
      -  <paramdef>void *<parameter>dataptr</parameter>[]</paramdef>
      -... the brackets (indicating an array type) were being dropped.
      -The easiest way to deal with the problem is to not try to chop up
      -the parameter definitions and display them in table format, but to
      -instead just output them as-is. May not look quite as pretty, but
      -at least we can be sure no information is being lost...
      -
    • -

      Michael(tm) Smith: pi.xsl

      updated wording of doc for funcsynopsis-style PI
      -
    • -

      Michael(tm) Smith: param.xweb; param.ent; synop.xsl

      Removed the funcsynopsis.tabular.threshold param. It's no longer
      -being used in the code and hasn't been since mid 2006.
      -
    • -

      Mauritz Jeanson: graphics.xsl

      Added support for the img.src.path parameter for SVG graphics. Closes bug #1888169.
      -
    • -

      Mauritz Jeanson: chunk-common.xsl

      Added missing space.
      -
    • -

      Norman Walsh: component.xsl

      Fix bug where component titles inside info elements were not handled properly
      -
    • -

      Michael(tm) Smith: pi.xsl

      Moved dbhtml_stop-chunking embedded doc into alphabetical order,
      -fixed text of TCG section it see-also'ed.
      -
    • -

      David Cramer: pi.xsl

      Added support for <?dbhtml stop-chunking?> processing instruction
      -
    • -

      David Cramer: chunk-common.xsl; pi.xsl

      Added support for <?dbhtml stop-chunking?> processing instruction
      -
    • -

      David Cramer: glossary.xsl

      Fixed bug #1854199: glossary.xsl should use the sortas attribute on glossentry. Also added normalize-space to avoid missorting due to stray leading spaces.
      -
    • -

      Mauritz Jeanson: inline.xsl

      Added a template for citebiblioid. The hyperlink target is the parent of the referenced biblioid,
      -and the "hot text" is the biblioid itself enclosed in brackets.
      -
    • -

      Mauritz Jeanson: inline.xsl

      Added support for @xlink:show in the simple.xlink template. The "new" and "replace" 
      -values are supported (corresponding to values of "_blank" and "_top" for the 
      -ulink.target parameter). I have assumed that @xlink:show should override ulink.target
      -for external URI links. This closes bugs #1762023 and #1727498.
      -
    • -

      Mauritz Jeanson: inline.xsl

      Moved declaration of comment.block.parents entity to common/entities.ent.
      -
    • -

      Mauritz Jeanson: param.xweb

      Added link to profiling chapter of TCG.
      -
    • -

      Dongsheng Song: biblio-iso690.xsl

      Change encoding from "windows-1250" to "UTF-8".
      -
    • -

      Robert Stayton: biblio.xsl

      Add support in biblio collection to entries in bibliodivs.
      -
    • -

      Mauritz Jeanson: pi.xsl

      Added missing @role="tcg".
      -
    • -

      Mauritz Jeanson: chunk-common.xsl; titlepage.xsl

      Refactored legalnotice/revhistory chunking, so that the use.id.as.filename 
      -parameter as well as the dbhtml_filename PI are taken into account. A new named
      -template in titlepage.xsl is used to compute the filename.
      -
    • -

      Mauritz Jeanson: chunk-common.xsl; titlepage.xsl

      An update to the fix for bug #1790495 (r7433):
      -The "ln-" prefix is output only when the legalnotice doesn't have an
      -@id/@xml:id, in which case the stylesheets generate an ID value, 
      -resulting in a filename like "ln-7e0fwgj.html". This is useful because 
      -without the prefix, you wouldn't know that the file contained a legalnotice. 
      -The same logic is also applied to revhistory, using an "rh-" prefix.
      -
    • -

      Mauritz Jeanson: autoidx.xsl

      Removed the [&scope;] predicate from the target variable in the template with name="reference".
      -This filter was the cause of missing index backlinks when @zone and @type were used on indexterms,
      -with index.on.type=1. Closes bug #1680836.
      -
    • -

      Mauritz Jeanson: titlepage.xsl

      Added 'ln-' prefix to the name of the legalnotice chunk, in order to match the 
      -<link href"..."> that is output by make.legalnotice.head.links (chunk-common.xsl).
      -Modified the href attribute on the legalnotice link.
      -Closes bug #1790495.
      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.73.2 release.

    -
    • -

      Michael(tm) Smith: other.xsl

      slightly adjusted spacing around admonition markers
      -
    • -

      Michael(tm) Smith: refentry.xsl; utility.xsl

      make sure refsect3 titles are preceded by a line of space, and
      -make the indenting of their child content less severe
      -
    • -

      Michael(tm) Smith: block.xsl

      only indent verbatim environments in TTY output, not in non-TTY/PS
      -
    • -

      Michael(tm) Smith: block.xsl

      made another adjustment to correct vertical alignment of admonition marker
      -
    • -

      Michael(tm) Smith: block.xsl; other.xsl

      Adjusted/corrected alignment of adominition marker in PS/non-TTY output.
      -
    • -

      Michael(tm) Smith: endnotes.xsl

      For PS/non-TTY output, display footnote/endnote numbers in
      -superscript.
      -
    • -

      Michael(tm) Smith: table.xsl; synop.xsl; utility.xsl

      Changed handling of hanging indents for cmdsynopsis, funcsynopsis,
      -and synopfragment such that they now look correct in non-TTY/PS
      -output. We now use the groff \w escape to hang by the actual width
      --- in the current font -- of the command, funcdef, or
      -synopfragment references number (as opposed to hanging by the
      -number of characters). This rendering in TTY output remains the
      -same, since the width in monospaced TTY output is the same as the
      -number of characters.
      -
      -Also, created new synopsis-block-start and synopsis-block-end
      -templates to use for cmdsynopsis and funcsynopsis instead of the
      -corresponding verbatim-* templates.
      -
      -Along with those changes, also corrected a problem that caused the
      -content of synopfragment to be dropped, and made a
      -vertical-spacing change to adjust spacing around table titles and
      -among sibling synopfragment instances.
      -
    • -

      Michael(tm) Smith: other.xsl

      use common l10.language.name template to retrieve English-language name
      -
    • -

      Michael(tm) Smith: synop.xsl; inline.xsl

      added comment in code explaining why we don't put filename output
      -in italic (despite the fact that man guidelines say we should)
      -
    • -

      Michael(tm) Smith: inline.xsl

      put filename output in monospace instead of italic
      -
    • -

      Michael(tm) Smith: synop.xsl

      put cmdsynopsis in monospace
      -
    • -

      Michael(tm) Smith: inline.xsl

      removed template match for literal. template matches for monospace
      -inlines are all imported from the HTML stylesheet
      -
    • -

      Michael(tm) Smith: block.xsl

      don't indent verbatim environments that are descendants of
      -refsynopsisdiv, not put backgrounds behind them
      -
    • -

      Michael(tm) Smith: inline.xsl

      set output of the literal element in monospace. this causes all
      -inline monospace instances in the git man pages to be set in
      -monospace (since DocBook XML source for git docs is generated with
      -asciidoc and asciidoc consistently outputs only <literal> for
      -inline monospace (not <command> or <code> or anything else).
      -Of course this only affects non-TTY output...
      -
    • -

      Michael(tm) Smith: utility.xsl

      Added inline.monoseq named template.
      -
    • -

      Michael(tm) Smith: utility.xsl

      don't bother using a custom register to store the previous
      -font-family value when setting blocks of text in code font; just
      -use \F[] .fam with no arg to switch back
      -
    • -

      Michael(tm) Smith: endnotes.xsl

      put links in blue in PS output (note that this matches how groff
      -renders content marked up with the .URL macro)
      -
    • -

      Michael(tm) Smith: endnotes.xsl; param.xweb; param.ent

      removed man.links.are.underlined and added man.font.links. Also,
      -changed the default font formatting for links to bold.
      -
    • -

      Michael(tm) Smith: endnotes.xsl; param.xweb; param.ent

      Added new param man.base.url.for.relative.links .. specifies a
      -base URL for relative links (for ulink, @xlink:href, imagedata,
      -audiodata, videodata) shown in the generated NOTES section of
      -man-page output. The value of man.base.url.for.relative.links is
      -prepended to any relative URI that is a value of ulink url,
      -xlink:href, or fileref attribute.
      -
      -If you use relative URIs in link sources in your DocBook refentry
      -source, and you leave man.base.url.for.relative.links unset, the
      -relative links will appear "as is" in the NOTES section of any
      -man-page output generated from your source. That's probably not
      -what you want, because such relative links are only usable in the
      -context of HTML output. So, to make the links meaningful and
      -usable in the context of man-page output, set a value for
      -man.base.url.for.relative.links that points
      -to the online version of HTML output generated from your DocBook
      -refentry source. For example:
      -
      -  <xsl:param name="man.base.url.for.relative.links"
      -  >http://www.kernel.org/pub/software/scm/git/docs/</xsl:param>
      -
    • -

      Michael(tm) Smith: info.xsl

      If a source refentry contains a Documentation or DOCUMENTATION
      -section, don't report it as having missing AUTHOR information.
      -Also, if missing a contrib/personblurb for a person or org, report
      -pointers to http://docbook.sf.net/el/personblurb and to
      -http://docbook.sf.net/el/contrib
      -
    • -

      Michael(tm) Smith: info.xsl

      If we encounter an author|editor|othercredit instance that lacks a
      -personblurb or contrib, report it to the user (because that means
      -we have no information about that author|editor|othercredit to
      -display in the generated AUTHOR|AUTHORS section...)
      -
    • -

      Michael(tm) Smith: info.xsl; docbook.xsl; other.xsl

      if we can't find any usable author data, emit a warning and insert
      -a fixme in the output
      -
    • -

      Michael(tm) Smith: info.xsl

      fixed bug in indenting of output for contrib instances in AUTHORS
      -section. Thanks to Daniel Leidert and the fglrx docs for exposing
      -the bug.
      -
    • -

      Michael(tm) Smith: block.xsl

      for a para or simpara that is the first child of a callout,
      -suppress the .sp or .PP that would normally be output (because in
      -those cases, the output goes into a table cell, and the .sp or .PP
      -markup causes a spurious linebreak before it when displayed
      -
    • -

      Michael(tm) Smith: lists.xsl

      Added support for rendering co callouts and calloutlist instances.
      -So you can now use simple callouts -- marking up programlisting
      -and such with co instances -- and have the callouts displayed in
      -man-page output. ("simple callouts" means using co@id and
      -callout@arearefs pointing to co@id instances; in man/roff output,
      -we can't/don't support markup that uses areaset and area)
      -
    • -

      Michael(tm) Smith: block.xsl

      only put a line of space after a verbatim if it's followed by a
      -text node or a paragraph
      -
    • -

      Michael(tm) Smith: utility.xsl

      put verbatim environments in slightly smaller font in non-TTY
      -output
      -
    • -

      Michael(tm) Smith: lists.xsl

      minor whitespace-only reformatting of lists.xsl source
      -
    • -

      Michael(tm) Smith: lists.xsl

      Made refinements/fixes to output of orderedlist and itemizedlist
      --- in part, to get mysql man pages to display correctly. This
      -change causes a "\c" continuation marker to be added between
      -listitem markers and contents (to ensure that the content remains
      -on the same line as the marker when displayed)
      -
    • -

      Michael(tm) Smith: block.xsl

      put a line of vertical space after all verbatim output that has
      -sibling content following it (not just if that sibling content is
      -a text node)
      -
    • -

      Michael(tm) Smith: block.xsl

      refined spacing around titles for admonitions
      -
    • -

      Michael(tm) Smith: block.xsl; other.xsl

      Deal with case of verbatim environments that have a linebreak
      -after the opening tag. Assumption is that users generally don't
      -want that linebreak to appear in output, so we do some groff
      -hackery to mess with vertical spacing and close the space.
      -
    • -

      Michael(tm) Smith: inline.xsl

      indexterm instances now produce groff comments like this:
      -
      -  .\" primary: secondary: tertiary
      -
      -remark instances, if non-empty, now produce groff comments
      -
    • -

      Michael(tm) Smith: charmap.groff.xsl; other.xsl

      convert no-break space character to groff "\ \&" (instead of just
      -"\ "). the reason is that if a space occurs at the end of a line,
      -our processing causes it to be eaten. a real-world case of this is
      -the mysql(1) man page. appending the "\&" prevents that
      -
    • -

      Michael(tm) Smith: block.xsl

      output "sp" before simpara output, not after it (outputting it
      -after results in undesirable whitespace in particular cases; for
      -example, in the hg/mercurial docs
      -
    • -

      Michael(tm) Smith: table.xsl; synop.xsl; utility.xsl

      renamed from title-preamble to pinch.together and replaced "sp -1"
      -between synopsis fragments with call to pinch.together instead
      -
    • -

      Michael(tm) Smith: table.xsl

      use title-preamble template for table titles (instead of "sp -1"
      -hack), and "sp 1" after all tables (instead of just "sp"
      -
    • -

      Michael(tm) Smith: utility.xsl

      created title-preamble template for suppressing line spacing after
      -headings
      -
    • -

      Michael(tm) Smith: info.xsl

      further refinement of indenting in AUTHORS section
      -
    • -

      Michael(tm) Smith: block.xsl; other.xsl

      refined handling of admonitions
      -
    • -

      Michael(tm) Smith: lists.xsl

      Use RS/RE in another place where we had IP ""
      -
    • -

      Michael(tm) Smith: info.xsl

      Replace (ab)use of IP with "sp -1" in AUTHORS section with RS/RE
      -instead.
      -
    • -

      Michael(tm) Smith: table.xsl; synop.xsl; info.xsl

      changed all instances of ".sp -1n" to ".sp -1"
      -
    • -

      Michael(tm) Smith: other.xsl

      add extra line before SH heads only in non-TTY output
      -
    • -

      Michael(tm) Smith: block.xsl

      Reworked output for admonitions (caution, important, note, tip,
      -warning). In TTY output, admonitions now get indented. In non-TTY
      -output, a colored marker (yellow) is displayed next to them.
      -
    • -

      Michael(tm) Smith: other.xsl

      Added BM/EM macros for putting a colored marker in margin next to
      -a block of text.
      -
    • -

      Michael(tm) Smith: utility.xsl

      created make.bold.title template by moving title-bolding part out
      -from nested-section-title template. This allows the bolding to
      -also be used by the template for formatting admonitions
      -
    • -

      Michael(tm) Smith: info.xsl

      put .br before copyright contents to prevent them from getting run in
      -
    • -

      Michael(tm) Smith: refentry.xsl; other.xsl; utility.xsl

      made point size of output for Refsect2 and Refsect3 heads bigger
      -
    • -

      Michael(tm) Smith: other.xsl

      put slightly more space between SH head and underline in non-TTY
      -output
      -
    • -

      Michael(tm) Smith: param.xweb; param.ent; other.xsl

      Added the man.charmap.subset.profile.english parameter and refined
      -the handling of charmap subsets to differentiate between English
      -and non-English source.
      -
      -This way charmap subsets are now handled is this:
      -
      -If the value of the man.charmap.use.subset parameter is non-zero,
      -and your DocBook source is not written in English (that is, if its
      -lang or xml:lang attribute has a value other than en), then the
      -character-map subset specified by the man.charmap.subset.profile
      -parameter is used instead of the full roff character map.
      -
      -Otherwise, if the lang or xml:lang attribute on the root element
      -in your DocBook source or on the first refentry element in your
      -source has the value en or if it has no lang or xml:lang
      -attribute, then the character-map subset specified by the
      -man.charmap.subset.profile.english parameter is used instead of
      -man.charmap.subset.profile.
      -
      -The difference between the two subsets is that
      -man.charmap.subset.profile provides mappings for characters in
      -Western European languages that are not part of the Roman
      -(English) alphabet (ASCII character set).
      -
    • -

      Michael(tm) Smith: other.xsl

      Various updates, mainly related to uppercasing SH titles:
      -
      -  - added a "Language: " metadata line to the top comment area of
      -    output man pages, to indicate the language the page is in
      -
      -  - added a "toupper" macro of doing locale-aware uppercasing of
      -    SH titles and cross-references to SH titles; the mechanism
      -    relies on the uppercase.alpha and lowercase.alpha DocBook
      -    gentext keys to do locale-aware uppercasing based on the
      -    language the page is written in
      -
      -  - added a "string.shuffle" template, which provides a library
      -    function for "shuffling" two strings together into a single
      -    string; it takes the first character for the first string, the
      -    first character from second string, etc. The only current use
      -    for it is to generate the argument for the groff tr request
      -    that does string uppercasing.
      -
      -  - added make.tr.uppercase.arg and make.tr.normalcase.arg named
      -    templates for use in generating groff code for uppercasing and
      -    "normal"-casing SH titles
      -
      -  - made the BB/BE "background drawing" macros have effect only in
      -    non-TTY output
      -
      -  - output a few comments in the top part of source
      -
    • -

      Michael(tm) Smith: utility.xsl

      removed some leftover kruft
      -
    • -

      Michael(tm) Smith: refentry.xsl

      To create the name(s) for each man page, we now replace any spaces
      -in the refname(s) with underscores. This ensures that tools like
      -lexgrog(1) will be able to parse the name (lexgrog won't parse
      -names that contain spaces).
      -
    • -

      Michael(tm) Smith: docbook.xsl

      Put a comment into source of man page to indicate where the main
      -content starts. (We now have a few of macro definitions at the
      -start of the source, so putting this comment in helps those that
      -might be viewing the source.)
      -
    • -

      Michael(tm) Smith: refentry.xsl

      refined mechanism for generating SH titles
      -
    • -

      Michael(tm) Smith: charmap.groff.xsl

      Added zcaron, Zcaron, scaron, and Scaron to the groff character map.
      -This means that generated Finnish man pages will no longer contain
      -any raw accented characters -- they'll instead by marked up with
      -groff escapes.
      -
    • -

      Michael(tm) Smith: other.xsl; utility.xsl

      corrected a regression I introduced about a year ago that caused
      -dots to be output just as "\." -- instead needs to be "\&." (which
      -is what it will be now, after this change)
      -
    • -

      Michael(tm) Smith: refentry.xsl

      Changed backend handling for generating titles for SH sections and
      -for cross-references to those sections. This should have no effect
      -on TTY output (behavior should remain the same hopefully) but
      -results in titles in normal case (instead of uppercase) in PS
      -output.
      -
    • -

      Michael(tm) Smith: info.xsl

      use make.subheading template to make subheadings for AUTHORS and
      -COPYRIGHT sections (instead of harcoding roff markup)
      -
    • -

      Michael(tm) Smith: block.xsl

      put code font around programlisting etc.
      -
    • -

      Michael(tm) Smith: synop.xsl; docbook.xsl

      embed custom macro definitions in man pages, plus wrap synopsis in
      -code font
      -
    • -

      Michael(tm) Smith: endnotes.xsl

      use the make.subheading template to generated SH subheading for
      -endnotes section.
      -
    • -

      Michael(tm) Smith: lists.xsl

      Added some templates for generating if-then-else conditional
      -markup in groff, so let's use those instead of hard-coding it in
      -multiple places...
      -
    • -

      Michael(tm) Smith: other.xsl; utility.xsl

      Initial checkin of some changes related to making PS/PDF output
      -from "man -l -Tps" look better. The current changes:
      -
      -  - render synopsis and verbatim sections in a monospace/code font
      -
      -  - put a light-grey background behind all programlisting, screen,
      -    and literallayout instances
      -
      -  - prevent SH heads in PS output from being rendered in uppercase
      -    (as they are in console output)
      -
      -  - also display xrefs to SH heads in PS output in normal case
      -    (instead of uppercase)
      -
      -  - draw a line under SH heads in PS output
      -
      -The changes made to the code to support the above features were:
      -
      -  - added some embedded/custom macros: one for conditionally
      -    upper-casing SH x-refs, one for redefining the SH macro
      -    itself, with some conditional handling for PS output, and
      -    finally a macro for putting a background/screen (filled box)
      -    around a block of text (e.g., a program listing) in PS output
      -
      -  - added utility templates for wrapping blocks of text in code
      -    font; also templates for inline code font
      -
    • -

      Robert Stayton: refentry.xsl

      refpurpose nodes now get apply-templates instead of just normalize-space().
      -
    • -

      Michael(tm) Smith: lists.xsl

      Fixed alignment of first lined of text for each listitem in
      -orderedlist output for TTY. Existing code seemed to have been
      -causing an extra undesirable space to appear.
      -
    • -

      Michael(tm) Smith: lists.xsl

      Wrapped some roff conditionals around roff markup for orderedlist
      -and itemizedlist output, so that the lists look acceptable in PS
      -output as well as TTY.
      -
    • -

      Michael(tm) Smith: pi.xsl; synop.xsl; param.xweb; param.ent

      Added the man.funcsynopsis.style parameter. Has the same effect in
      -manpages output as the funcsynopsis.style parameter has in HTML
      -output -- except that its default value is 'ansi' instead of 'kr'.
      -
    • -

      Michael(tm) Smith: synop.xsl

      Reworked handling of K&R funcprototype output. It no longer relies
      -on the HTML kr-tabular templates, but instead just does direct
      -transformation to roff. For K&R output, it displays the paramdef
      -output in an indented list following the prototype.
      -
    • -

      Michael(tm) Smith: synop.xsl

      Properly integrated handling for K&R output into manpages
      -stylesheet. The choice between K&R output and ANSI output is
      -currently controlled through use of the (HTML) funcsynopsis.style
      -parameter. Note that because the mechanism does currently rely on
      -funcsynopsis.style, the default in manpages output is now K&R
      -(because that's the default of that param). But I suppose I ought
      -to create a man.funcsynopsis.style and make the default for that
      -ANSI (to preserve the existing default behavior).
      -
    • -

      Michael(tm) Smith: docbook.xsl

      added manpages/pi.xsl file
      -
    • -

      Michael(tm) Smith: .cvsignore; pi.xsl

      Added "dbman funcsynopsis-style" PI and incorporated it into the
      -doc build.
      -
    • -

      Michael(tm) Smith: refentry.xsl

      Fixed regression that caused an unescaped dash to be output
      -between refname and refpurpose content. Closes bug #1894244.
      -Thanks to Daniel Leidert.
      -
    • -

      Michael(tm) Smith: other.xsl

      Fixed problem with dots being escaped in filenames of generated
      -man files. Closes #1827195. Thanks to Daniel Leidert.
      -
    • -

      Michael(tm) Smith: inline.xsl

      Added support for processing structfield (was appearing in roff
      -output surrounded by HTML <em> tags; fixed so that it gets roff
      -ital markup). Closes bug #1858329.  Thanks to Sam Varshavchik.
      -
    -
    - -

    Epub

    - -

    The following changes have been made to the - epub code - since the 1.73.2 release.

    -
    • Keith Fahlgren: bin/spec/README; bin/spec/epub_realbook_spec.rb

      'Realbook' spec now passes
    • Keith Fahlgren: bin/dbtoepub; README; bin/spec/README; bin/lib/docbook.rb; bin/spec/epub_r⋯

      Very primitive Windows support for dbtoepub reference implementation; README for running tests and for the .epub target in general; shorter realbook test document (still fails for now)
    • Keith Fahlgren: bin/dbtoepub; bin/spec/epub_regressions_spec.rb; bin/lib/docbook.rb; bin/s⋯

      Changes to OPF spine to not duplicate idrefs for documents with parts not at the root; regression specs for same
    • Keith Fahlgren: docbook.xsl

      Fixing linking to cover @id, distinct from other needs of cover-image-id (again, thanks to Martin Goerner)
    • Keith Fahlgren: docbook.xsl

      Updating the title of the toc element in the guide to be more explicit (thanks to Martin Goerner)
    • -

      Keith Fahlgren: bin/spec/examples/amasque_exploded/content.opf; bin/spec/examples/amasque_⋯

      Initial checkin/merge of epub target from work provided by Paul Norton of Adobe
      -and Keith Fahlgren of O'Reilly.
      -
    • -

      Keith Fahlgren: docbook.xsl

      == General epub test support
      -
      -$ spec -O ~/.spec.opts spec/epub_spec.rb 
      -
      -DocBook::Epub
      -- should be able to be created
      -- should fail on a nonexistent file
      -- should be able to render to a file
      -- should create a file after rendering
      -- should have the correct mimetype after rendering
      -- should be valid .epub after rendering an article
      -- should be valid .epub after rendering an article without sections
      -- should be valid .epub after rendering a book
      -- should be valid .epub after rendering a book even if it has one graphic
      -- should be valid .epub after rendering a book even if it has many graphics
      -- should be valid .epub after rendering a book even if it has many duplicated graphics
      -- should report an empty file as invalid
      -- should confirm that a valid .epub file is valid
      -- should not include PDFs in rendered epub files as valid image inclusions
      -- should include a TOC link in rendered epub files for <book>s
      -
      -Finished in 20.608395 seconds
      -
      -15 examples, 0 failures
      -
      -
      -== Verbose epub test coverage against _all_ of the testdocs 
      -
      -Fails on only (errors truncated):
      -1)
      -'DocBook::Epub should be able to render a valid .epub for the test document /Users/keith/work/docbook-dev/trunk/xsl/epub/bin/spec/testdocs/calloutlist.003.xml [30]' FAILED
      -'DocBook::Epub should be able to render a valid .epub for the test document /Users/keith/work/docbook-dev/trunk/xsl/epub/bin/spec/testdocs/cmdsynopsis.001.xml [35]' FAILED
      -....
      -
      -Finished in 629.89194 seconds
      -
      -224 examples, 15 failures
      -
      -224 examples, 15 failures yields 6% failure rate
      -
    -
    - -

    HTMLHelp

    - -

    The following changes have been made to the - htmlhelp code - since the 1.73.2 release.

    -
    • -

      Mauritz Jeanson: htmlhelp-common.xsl

      Added <xsl:with-param name="quiet" select="$chunk.quietly"/> to calls to
      -the write.chunk, write.chunk.with.doctype, and write.text.chunk templates.
      -This makes chunk.quietly=1 suppress chunk filename messages also for help 
      -support files (which seems to be what one would expect). See bug #1648360.
      -
    -
    - -

    Eclipse

    - -

    The following changes have been made to the - eclipse code - since the 1.73.2 release.

    -
    • -

      David Cramer: eclipse.xsl

      Use sortas attributes (if they exist) when sorting indexterms
      -
    • -

      David Cramer: eclipse.xsl

      Added support for indexterm/see in eclipse index.xml
      -
    • -

      Mauritz Jeanson: eclipse.xsl

      Added <xsl:with-param name="quiet" select="$chunk.quietly"/>
      -to helpidx template.
      -
    • -

      David Cramer: eclipse.xsl

      Generate index.xml file and add related goo to plugin.xml file. Does not yet support see and seealso.
      -
    • -

      Mauritz Jeanson: eclipse.xsl

      Added <xsl:with-param name="quiet" select="$chunk.quietly"/> to calls to
      -the write.chunk, write.chunk.with.doctype, and write.text.chunk templates.
      -This makes chunk.quietly=1 suppress chunk filename messages also for help 
      -support files (which seems to be what one would expect). See bug #1648360.
      -
    -
    - -

    JavaHelp

    - -

    The following changes have been made to the - javahelp code - since the 1.73.2 release.

    -
    • -

      Mauritz Jeanson: javahelp.xsl

      Added <xsl:with-param name="quiet" select="$chunk.quietly"/> to calls to
      -the write.chunk, write.chunk.with.doctype, and write.text.chunk templates.
      -This makes chunk.quietly=1 suppress chunk filename messages also for help 
      -support files (which seems to be what one would expect). See bug #1648360.
      -
    -
    - -

    Roundtrip

    - -

    The following changes have been made to the - roundtrip code - since the 1.73.2 release.

    -
    • -

      Steve Ball: blocks2dbk.xsl; wordml2normalise.xsl

      fix table/cell borders for wordml, fix formal figure, add emphasis-strong
      -
    • -

      Mauritz Jeanson: supported.xml

      Changed @cols to 5.
      -
    • -

      Steve Ball: blocks2dbk.xsl; blocks2dbk.dtd; template.xml

      added pubdate, fixed metadata handling in biblioentry
      -
    • -

      Steve Ball: supported.xml

      Added support for edition.
      -
    • -

      Steve Ball: docbook-pages.xsl; wordml-blocks.xsl; docbook.xsl; wordml.xsl; pages-normalise⋯

      Removed stylesheets for old, deprecated conversion method.
      -
    • -

      Steve Ball: specifications.xml; dbk2ooo.xsl; blocks2dbk.xsl; dbk2pages.xsl; blocks2dbk.dtd⋯

      Added support for Open Office, added edition element, improved list and table support in Word and Pages
      -
    • -

      Steve Ball: normalise-common.xsl; blocks2dbk.xsl; dbk2pages.xsl; template-pages.xml; templ⋯

      Fixed bug in WordML table handling, improved table handling for Pages 08, synchronised WordML and Pages templates.
      -
    • -

      Steve Ball: normalise-common.xsl; blocks2dbk.xsl; wordml2normalise.xsl; dbk2wp.xsl

      fix caption, attributes
      -
    • -

      Steve Ball: specifications.xml; blocks2dbk.xsl; wordml2normalise.xsl; blocks2dbk.dtd; temp⋯

      Fixes to table and list handling
      -
    • -

      Steve Ball: blocks2dbk.xsl

      added support for explicit emphasis character styles
      -
    • -

      Steve Ball: wordml2normalise.xsl

      added support for customisation in image handling
      -
    • -

      Steve Ball: blocks2dbk.xsl

      Added inlinemediaobject support for metadata.
      -
    • -

      Steve Ball: normalise-common.xsl; blocks2dbk.xsl; template.xml; dbk2wordml.xsl; dbk2wp.xsl

      Added support file. Added style locking. Conversion bug fixes.
      -
    -
    - -

    Slides

    - -

    The following changes have been made to the - slides code - since the 1.73.2 release.

    -
    • -

      Michael(tm) Smith: fo/Makefile; html/Makefile

      Added checks and hacks to various makefiles to enable building
      -under Cygwin. This stuff is ugly and maybe not worth the mess and
      -trouble, but does seem to work as expected and not break anything
      -else.
      -
    • -

      Jirka Kosek: html/plain.xsl

      Added support for showing foil number
      -
    -
    - -

    Website

    - -

    The following changes have been made to the - website code - since the 1.73.2 release.

    -
    • -

      Michael(tm) Smith: extensions/saxon64/.classes/.gitignore; extensions/xalan2/.classes/com/⋯

      renamed a bunch more .cvsignore files to .gitignore (to facilitate use of git-svn)
      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.73.2 release.

    -
    • Keith Fahlgren: epub.autolabel.xml

      New parameter for epub, epub.autolabel
    • -

      Mauritz Jeanson: table.frame.border.color.xml; table.cell.padding.xml; table.cell.border.t⋯

      Added missing refpurposes and descriptions.
      -
    • -

      Keith Fahlgren: ade.extensions.xml

      Extensions to support Adobe Digital Editions extensions in .epub output.
      -
    • -

      Mauritz Jeanson: fop.extensions.xml; fop1.extensions.xml

      Clarified that fop1.extensions is for FOP 0.90 and later. Version 1 is not here yet...
      -
    • -

      Michael(tm) Smith: man.links.are.underlined.xml; man.endnotes.list.enabled.xml; man.font.l⋯

      removed man.links.are.underlined and added man.font.links. Also,
      -changed the default font formatting for links to bold.
      -
    • -

      Michael(tm) Smith: man.base.url.for.relative.links.xml

      Added new param man.base.url.for.relative.links .. specifies a
      -base URL for relative links (for ulink, @xlink:href, imagedata,
      -audiodata, videodata) shown in the generated NOTES section of
      -man-page output. The value of man.base.url.for.relative.links is
      -prepended to any relative URI that is a value of ulink url,
      -xlink:href, or fileref attribute.
      -
      -If you use relative URIs in link sources in your DocBook refentry
      -source, and you leave man.base.url.for.relative.links unset, the
      -relative links will appear "as is" in the NOTES section of any
      -man-page output generated from your source. That's probably not
      -what you want, because such relative links are only usable in the
      -context of HTML output. So, to make the links meaningful and
      -usable in the context of man-page output, set a value for
      -man.base.url.for.relative.links that points
      -to the online version of HTML output generated from your DocBook
      -refentry source. For example:
      -
      -  <xsl:param name="man.base.url.for.relative.links"
      -  >http://www.kernel.org/pub/software/scm/git/docs/</xsl:param>
      -
    • -

      Michael(tm) Smith: man.string.subst.map.xml

      squeeze .sp\n.sp into a single .sp (to prevent a extra, spurious
      -line of whitespace from being inserted after programlisting etc.
      -in certain cases)
      -
    • -

      Michael(tm) Smith: refentry.manual.fallback.profile.xml; refentry.source.fallback.profile.⋯

      don't use refmiscinfo@class=date value as fallback for refentry
      -"source" or "manual" metadata fields
      -
    • -

      Michael(tm) Smith: man.charmap.subset.profile.xml; man.charmap.enabled.xml; man.charmap.su⋯

      made some further doc tweaks related to the
      -man.charmap.subset.profile.english param
      -
    • -

      Michael(tm) Smith: man.charmap.subset.profile.xml; man.charmap.enabled.xml; man.charmap.su⋯

      Added the man.charmap.subset.profile.english parameter and refined
      -the handling of charmap subsets to differentiate between English
      -and non-English source.
      -
      -This way charmap subsets are now handled is this:
      -
      -If the value of the man.charmap.use.subset parameter is non-zero,
      -and your DocBook source is not written in English (that is, if its
      -lang or xml:lang attribute has a value other than en), then the
      -character-map subset specified by the man.charmap.subset.profile
      -parameter is used instead of the full roff character map.
      -
      -Otherwise, if the lang or xml:lang attribute on the root element
      -in your DocBook source or on the first refentry element in your
      -source has the value en or if it has no lang or xml:lang
      -attribute, then the character-map subset specified by the
      -man.charmap.subset.profile.english parameter is used instead of
      -man.charmap.subset.profile.
      -
      -The difference between the two subsets is that
      -man.charmap.subset.profile provides mappings for characters in
      -Western European languages that are not part of the Roman
      -(English) alphabet (ASCII character set).
      -
    • -

      Michael(tm) Smith: man.charmap.subset.profile.xml

      Added to default charmap used by manpages:
      -
      -  - the "letters" part of the 'C1 Controls And Latin-1 Supplement
      -    (Latin-1 Supplement)' Unicode block
      -  - Latin Extended-A block (but not all of the characters from
      -    that block have mappings in groff, so some of them are still
      -    passed through as-is)
      -
      -The effects of this change are that in man pages generated for
      -most Western European languages and for Finnish, all characters
      -not part of the Roman alphabet are (e.g., "accented" characters)
      -are converted to groff escapes.
      -
      -Previously, by default we passed through those characters as is
      -(and users needed to use the full charmap if they wanted to have
      -those characters converted).
      -
      -As a result of this change, man pages generated for Western
      -European languages will be viewable in some environments in which
      -they are not viewable if the "raw" non-Roman characters are in them.
      -
    • -

      Mauritz Jeanson: generate.legalnotice.link.xml; generate.revhistory.link.xml

      Added information on how the filename is computed.
      -
    • -

      Mauritz Jeanson: default.table.width.xml

      Clarified PI usage.
      -
    • -

      Michael(tm) Smith: man.funcsynopsis.style.xml

      Added the man.funcsynopsis.style parameter. Has the same effect in
      -manpages output as the funcsynopsis.style parameter has in HTML
      -output -- except that its default value is 'ansi' instead of 'kr'.
      -
    • -

      Michael(tm) Smith: funcsynopsis.tabular.threshold.xml

      Removed the funcsynopsis.tabular.threshold param. It's no longer
      -being used in the code and hasn't been since mid 2006.
      -
    • -

      Mauritz Jeanson: table.properties.xml

      Set keep-together.within-column to "auto". This seems to be the most sensible
      -default value for tables.
      -
    • -

      Mauritz Jeanson: informal.object.properties.xml; admon.graphics.extension.xml; informalequ⋯

      Several small documentation fixes.
      -
    • -

      Mauritz Jeanson: manifest.in.base.dir.xml

      Wording fixes.
      -
    • -

      Mauritz Jeanson: header.content.properties.xml; footer.content.properties.xml

      Added refpurpose.
      -
    • -

      Mauritz Jeanson: ulink.footnotes.xml; ulink.show.xml

      Updated for DocBook 5.
      -
    • -

      Mauritz Jeanson: index.method.xml; glossterm.auto.link.xml

      Spelling and wording fixes.
      -
    • -

      Mauritz Jeanson: callout.graphics.extension.xml

      Clarifed available graphics formats and extensions.
      -
    • -

      Mauritz Jeanson: footnote.sep.leader.properties.xml

      Corrected refpurpose.
      -
    • -

      Jirka Kosek: footnote.properties.xml

      Added more properties which make it possible to render correctly footnotes placed inside verbatim elements.
      -
    • -

      Mauritz Jeanson: img.src.path.xml

      img.src.path works with inlinegraphic too.
      -
    • -

      Mauritz Jeanson: saxon.character.representation.xml

      Added TCG link.
      -
    • -

      Mauritz Jeanson: img.src.path.xml

      Updated description of img.src.path. Bug #1785224 revealed that 
      -there was a risk of misunderstanding how it works.
      -
    -
    - -

    Profiling

    - -

    The following changes have been made to the - profiling code - since the 1.73.2 release.

    -
    • -

      Jirka Kosek: xsl2profile.xsl

      Added new rules to profile all content generated by HTML Help (including alias files)
      -
    • -

      Robert Stayton: profile-mode.xsl

      use mode="profile" instead of xsl:copy-of for attributes so
      -they can be more easily customized.
      -
    -
    - - -

    Tools

    - -

    The following changes have been made to the - tools code - since the 1.73.2 release.

    -
    • -

      Michael(tm) Smith: make/Makefile.DocBook

      various changes and additions to support making with asciidoc as
      -an input format
      -
    • -

      Michael(tm) Smith: make/Makefile.DocBook

      make dblatex the default PDF maker for the example makefile
      -
    • -

      Michael(tm) Smith: xsl/build/html2roff.xsl

      Reworked handling of K&R funcprototype output. It no longer relies
      -on the HTML kr-tabular templates, but instead just does direct
      -transformation to roff. For K&R output, it displays the paramdef
      -output in an indented list following the prototype.
      -
    • -

      Mauritz Jeanson: xsl/build/make-xsl-params.xsl

      Made attribute-sets members of the param list. This enables links to attribute-sets in the
      -reference documentation.
      -
    • -

      Michael(tm) Smith: xsl/build/html2roff.xsl

      use .BI handling in K&R funsynopsis output for manpages, just as
      -we do already of ANSI output
      -
    • -

      Michael(tm) Smith: xsl/build/html2roff.xsl

      Implemented initial support for handling tabular K&R output of
      -funcprototype in manpages output. Accomplished by adding more
      -templates to the intermediate HTML-to-roff stylesheet that the
      -build uses to create the manpages/html-synop.xsl stylesheet.
      -
    • -

      Michael(tm) Smith: xsl/build/doc-link-docbook.xsl

      Made the xsl/tools/xsl/build/doc-link-docbook.xsl stylesheet
      -import profile-docbook.xsl, so that we can do profiling of release
      -notes. Corrected some problems in the target for the release-notes
      -HTML build.
      -
    -
    - -

    Extensions

    - -

    The following changes have been made to the - extensions code - since the 1.73.2 release.

    -
    • Keith Fahlgren: Makefile

      Use DOCBOOK_SVN variable everywhere, please; build with PDF_MAKER
    • -

      Michael(tm) Smith: Makefile

      moved extensions build targets from master xsl/Makefile to
      -xsl/extensions/Makefile
      -
    • -

      Michael(tm) Smith: .cvsignore

      re-adding empty extensions subdir
      -
    -
    - -

    XSL-Saxon

    - -

    The following changes have been made to the - xsl-saxon code - since the 1.73.2 release.

    -
    • -

      Michael(tm) Smith: VERSION

      bring xsl2, xsl-saxon, and xsl-xalan VERSION files up-to-date with
      -recent change to snapshot build infrastructure
      -
    • -

      Michael(tm) Smith: nbproject/build-impl.xml; nbproject/project.properties

      Changed hard-coded file references in "clean" target to variable
      -references. Closes #1792043. Thanks to Daniel Leidert.
      -
    • -

      Michael(tm) Smith: VERSION; Makefile

      Did post-release wrap-up of xsl-saxon and xsl-xalan dirs
      -
    • -

      Michael(tm) Smith: nbproject/build-impl.xml; VERSION; Makefile; test

      More tweaks to get release-ready
      -
    -
    - -

    XSL-Xalan

    - -

    The following changes have been made to the - xsl-xalan code - since the 1.73.2 release.

    -
    • -

      Michael(tm) Smith: VERSION

      bring xsl2, xsl-saxon, and xsl-xalan VERSION files up-to-date with
      -recent change to snapshot build infrastructure
      -
    • -

      Michael(tm) Smith: nbproject/build-impl.xml

      Changed hard-coded file references in "clean" target to variable
      -references. Closes #1792043. Thanks to Daniel Leidert.
      -
    • -

      Michael(tm) Smith: Makefile; VERSION

      Did post-release wrap-up of xsl-saxon and xsl-xalan dirs
      -
    • -

      Michael(tm) Smith: Makefile; nbproject/build-impl.xml; VERSION

      More tweaks to get release-ready
      -
    -
    - -

    XSL-libxslt

    - -

    The following changes have been made to the - xsl-libxslt code - since the 1.73.2 release.

    -
    • -

      Mauritz Jeanson: python/xslt.py

      Print the result to stdout if no outfile has been given.
      -Some unnecessary semicolons removed.
      -
    • -

      Mauritz Jeanson: python/xslt.py

      Added a function that quotes parameter values (to ensure that they are interpreted as strings).
      -Replaced deprecated functions from the string module with string methods.
      -
    • -

      Michael(tm) Smith: python/README; python/README.LIBXSLT

      renamed xsl-libxslt/python/README to xsl-libxslt/python/README.LIBXSLT
      -
    • -

      Mauritz Jeanson: python/README

      Tweaked the text a little.
      -
    -
    - -
    - -

    Release Notes: 1.73.2

    - -

    This is solely a minor bug-fix update to the 1.73.1 release. - It fixes a packaging error in the 1.73.1 package, as well as a - bug in footnote handling in FO output.

    -
    - -

    Release: 1.73.1

    - -

    This is mostly a bug-fix update to the 1.73.0 release.

    - -

    Gentext

    - -

    The following changes have been made to the - gentext code - since the 1.73.0 release.

    -
    • -

      Mauritz Jeanson: locale/de.xml

      Applied patch #1766009.
      -
    • -

      Michael(tm) Smith: locale/lv.xml

      Added localization for ProductionSet.
      -
    -
    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.73.0 release.

    -
    • -

      Mauritz Jeanson: table.xsl

      Modified the tgroup template so that, for tables with multiple tgroups, 
      -a width attribute is output on all corresponding fo:tables. Previously, 
      -there was a test prohibiting this (and a comment saying that outputting more
      -than one width attribute will cause an error). But this seems to be no longer 
      -relevant; it is not a problem with FOP 0.93 or XEP 4.10. Closes bug #1760559.
      -
    • -

      Mauritz Jeanson: graphics.xsl

      Replaced useless <a> elements with warning messages (textinsert extension).
      -
    • -

      Mauritz Jeanson: admon.xsl

      Enabled generation of ids (on fo:wrapper) for indexterms in admonition titles, so that page
      -references in the index can be created. Closes bug #1775086.
      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.73.0 release.

    -
    • -

      Mauritz Jeanson: titlepage.xsl

      Added <xsl:call-template name="process.footnotes"/> to abstract template
      -so that footnotes in info/abstract are processed. Closes bug #1760907.
      -
    • -

      Michael(tm) Smith: pi.xsl; synop.xsl

      Changed handling of HTML output for the cmdsynopsis and
      -funcsynopsis elements, such that a@id instances are generated for
      -them if they are descendants of any element containing a dbcmdlist
      -or dbfunclist PI. Also, update the embedded reference docs for the
      -dbcmdlist and dbfunclist PIs to make it clear that they can be
      -used within any element for which cmdsynopsis or funcsynopsis are
      -valid children.
      -
    • -

      Michael(tm) Smith: formal.xsl

      Reverted the part of revision 6952 that caused a@id anchors to be
      -generated for output of informal objects. Thanks to Sam Steingold
      -for reporting.
      -
    • -

      Robert Stayton: glossary.xsl

      Account for a glossary with no glossdiv or glossentry children.
      -
    • -

      Mauritz Jeanson: titlepage.xsl

      Modified legalnotice template so that the base.name parameter is calculated 
      -in the same way as for revhistory chunks. Using <xsl:apply-templates 
      -mode="chunk-filename" select="."/> did not work for single-page output since
      -the template with that mode is in chunk-code.xsl.
      -
    • -

      Mauritz Jeanson: graphics.xsl

      Updated support for SVG (must be a child of imagedata in DB 5).
      -Added support for MathML in imagedata.
      -
    • -

      Mauritz Jeanson: pi.xsl

      Added documentation for the dbhh PI (used for context-sensitive HTML Help).
      -(The two templates matching 'dbhh' are still in htmlhelp-common.xsl).
      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.73.0 release.

    -
    • -

      Michael(tm) Smith: endnotes.xsl

      In manpages output, generate warnings about notesources with
      -non-para children only if the notesource is a footnote or
      -annotation. Thanks to Sam Steingold for reporting problems with
      -the existing handling.
      -
    -
    - -

    HTMLHelp

    - -

    The following changes have been made to the - htmlhelp code - since the 1.73.0 release.

    -
    • -

      Michael(tm) Smith: htmlhelp-common.xsl

      Added single-pass namespace-stripping support to the htmlhelp,
      -eclipse, and javahelp stylesheets.
      -
    -
    - -

    Eclipse

    - -

    The following changes have been made to the - eclipse code - since the 1.73.0 release.

    -
    • -

      Michael(tm) Smith: eclipse.xsl

      Added single-pass namespace-stripping support to the htmlhelp,
      -eclipse, and javahelp stylesheets.
      -
    -
    - -

    JavaHelp

    - -

    The following changes have been made to the - javahelp code - since the 1.73.0 release.

    -
    • -

      Michael(tm) Smith: javahelp.xsl

      Added single-pass namespace-stripping support to the htmlhelp,
      -eclipse, and javahelp stylesheets.
      -
    -
    - -

    Roundtrip

    - -

    The following changes have been made to the - roundtrip code - since the 1.73.0 release.

    -
    • -

      Steve Ball: blocks2dbk.xsl; blocks2dbk.dtd; pages2normalise.xsl

      Modularised blocks2dbk to allow customisation,
      -Added support for tables to pages2normalise
      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.73.0 release.

    -
    • -

      Robert Stayton: procedure.properties.xml

      procedure was inheriting keep-together from formal.object.properties, but
      -a procedure does not need to be kept together by default.
      -
    • -

      Dave Pawson: title.font.family.xml; component.label.includes.part.label.xml; table.frame.b⋯

      Regular formatting re-org.
      -
    -
    -
    - -

    Release: 1.73.0

    - -

    This release includes important bug fixes and adds the following -significant feature changes: -

    New localizations and localization updates
    -

    We added two new localizations: Latvian and - Esperanto, and made updates to the Czech, Chinese - Simplified, Mongolian, Serbian, Italian, and Ukrainian - localizations.

    -
    ISO690 citation style for bibliography output.
    -

    Set the - bibliography.style parameter to - iso690 to use ISO690 style.

    -
    New documentation for processing instructions (PI)
    -

    The reference documentation that ships with the - release now includes documentation on all PIs that you can use to - control output from the stylesheets.

    -
    New profiling parameters for audience and wordsize
    -

    You can now do profiling based on the values of the - audience and - wordsize attributes.

    -
    Changes to man-page output
    -

    The manpages stylesheet now supports single-pass - profiling and single-pass DocBook 5 namespace stripping - (just as the HTML and FO stylesheets also do). Also, added - handling for mediaobject & - inlinemediaobject. (Each imagedata, - audiodata, or videodata element - within a mediaobject or inline - mediaobject is now treated as a "notesource" - and so handled in much the same way as links and - annotation/alt/footnote - are in manpages output.) And added the - man.authors.section.enabled and - man.copyright.section.enabled - parameters to enable control over whether output includes - auto-generated AUTHORS and - COPYRIGHT sections.

    -
    Highlighting support for C
    -

    The highlighting mechanism for generating - syntax-highlighted code snippets in output now supports C - code listings (along with Java, PHP, XSLT, and others).

    -
    Experimental docbook-xsl-update script
    -

    We added an experimental docbook-xsl-update - script, the purpose of which is to facilitate - easy sync-up to the latest docbook-xsl snapshot (by means - of rsync).

    -

    -

    - -

    Gentext

    - -

    The following changes have been made to the -gentext code -since the 1.72.0 release.

    -
    • -

      Michael(tm) Smith: locale/lv.xml; Makefile

      Added Latvian localization file, from Girts Ziemelis.
      -
    • -

      Dongsheng Song: locale/zh_cn.xml

      Brought up to date with en.xml in terms of items. A few strings marked for translation.
      -
    • -

      Jirka Kosek: locale/cs.xml

      Added missing translations
      -
    • -

      Robert Stayton: locale/eo.xml

      New locale for Esperanto.
      -
    • -

      Robert Stayton: locale/mn.xml

      Update from Ganbold Tsagaankhuu.
      -
    • -

      Jirka Kosek: locale/en.xml; locale/cs.xml

      Rules for normalizing glossary entries before they are sorted can be now different for each language.
      -
    • -

      Michael(tm) Smith: locale/sr_Latn.xml; locale/sr.xml

      Committed changes from Miloš Komarčević to Serbian files.
      -
    • -

      Robert Stayton: locale/ja.xml

      Fix chapter in context xref-number-and-title
      -
    • -

      Robert Stayton: locale/it.xml

      Improved version from contributor.
      -
    • -

      Mauritz Jeanson: locale/uk.xml

      Applied patch 1592083.
      -
    -
    -

    Common

    - -

    The following changes have been made to the -common code -since the 1.72.0 release.

    -
    • -

      Michael(tm) Smith: labels.xsl

      Changed handling of reference auto-labeling such that reference
      -(when it appears at the component level) is now affected by the
      -label.from.part param, just as preface, chapter, and appendix.
      -
    • -

      Michael(tm) Smith: common.xsl

      Added support to the HTML stylesheets for proper processing of
      -orgname as a child of author.
      -
    • -

      Michael(tm) Smith: refentry.xsl

      Refined logging output of refentry metadata-gathering template;
      -for some cases of "missing" elements (refmiscinfo stuff, etc.),
      -the log messages now include URL to corresponding page in the
      -Definitive Guide (TDG).
      -
    • -

      Robert Stayton: titles.xsl

      Add refsection/info/title support.
      -
    • -

      Michael(tm) Smith: titles.xsl

      Added support for correct handling of xref to elements that
      -contain info/title descendants but no title children.
      -
      -This should be further refined so that it handles any *info
      -elements. And there are probably some other places where similar
      -handling for *info/title should be added.
      -
    • -

      Mauritz Jeanson: pi.xsl

      Modified <xsl:when> in datetime.format template to work
      -around Xalan bug.
      -
    -
    -

    FO

    - -

    The following changes have been made to the -fo code -since the 1.72.0 release.

    -
    • -

      Robert Stayton: component.xsl

      Add parameters to the page.sequence utility template.
      -
    • -

      Mauritz Jeanson: xref.xsl

      Added template for xref to area/areaset.
      -Part of fix for bug #1675513 (xref to area broken).
      -
    • -

      Michael(tm) Smith: inline.xsl

      Added template match for person element to fo stylesheet.
      -
    • -

      Robert Stayton: lists.xsl

      Added support for spacing="compact" in variablelist, per bug report #1722540.
      -
    • -

      Robert Stayton: table.xsl

      table pgwide="1" should also use pgwide.properties attribute-set.
      -
    • -

      Mauritz Jeanson: inline.xsl

      Make citations numbered if bibliography.numbered != 0.
      -
    • -

      Robert Stayton: param.xweb; param.ent

      Add new profiling parameters for audience and wordsize.
      -
    • -

      Robert Stayton: param.xweb; param.ent

      Added callout.icon.size parameter.
      -
    • -

      Robert Stayton: inline.xsl; xref.xsl

      Add support for xlink as olink.
      -
    • -

      Robert Stayton: autotoc.xsl; param.xweb; param.ent

      Add support for qanda.in.toc to fo TOC.
      -
    • -

      Robert Stayton: component.xsl

      Improved the page.sequence utility template for use with book.
      -
    • -

      Robert Stayton: division.xsl

      Refactored the big book template into smaller pieces.
      -Used the "page.sequence" utility template in
      -component.xsl to shorten the toc piece.
      -Added placeholder templates for front.cover and back.cover.
      -
    • -

      Robert Stayton: param.xweb; param.ent; sections.xsl

      Add section.container.element parameter to enable
      -pgwide spans inside sections.
      -
    • -

      Robert Stayton: param.xweb; param.ent; component.xsl

      Add component.titlepage.properties attribute-set to
      -support span="all" and other properties.
      -
    • -

      Robert Stayton: htmltbl.xsl; table.xsl

      Apply table.row.properties template to html tr rows too.
      -Add keep-with-next to table.row.properties when row is in thead.
      -
    • -

      Robert Stayton: table.xsl

      Add support for default.table.frame parameter.
      -Fix bug 1575446 rowsep last check for @morerows.
      -
    • -

      Robert Stayton: refentry.xsl

      Add support for info/title in refsections.
      -
    • -

      David Cramer: qandaset.xsl

      Make fo questions and answers behave the same way as html
      -
    • -

      Jirka Kosek: lists.xsl

      Added missing attribute set for procedure
      -
    • -

      Jirka Kosek: param.xweb; biblio.xsl; docbook.xsl; param.ent; biblio-iso690.xsl

      Added support for formatting biblioentries according to ISO690 citation style.
      -New bibliography style can be turned on by setting parameter bibliography.style to "iso690"
      -The code was provided by Jana Dvorakova
      -
    • -

      Robert Stayton: param.xweb; param.ent; pagesetup.xsl

      Add header.table.properties and footer.table.properties attribute-sets.
      -
    • -

      Robert Stayton: inline.xsl

      Add fop1.extensions for menuchoice arrow handling exception.
      -
    -
    -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.72.0 release.

    -
    • -

      Mauritz Jeanson: param.xweb; param.ent

      Moved declaration and documentation of javahelp.encoding from javahelp.xsl to the
      -regular "parameter machinery".
      -
    • -

      Michael(tm) Smith: admon.xsl

      Changed handling of titles for note, warning, caution, important,
      -tip admonitions: We now output and HTML h3 head only if
      -admon.textlabel is non-zero or if the admonition actually contains
      -a title; otherwise, we don't output an h3 head at all.
      -(Previously, we were outputting an empty h3 if the admon.textlabel
      -was zero and if the admonition had no title.)
      -
    • -

      Mauritz Jeanson: xref.xsl

      Added template for xref to area/areaset.
      -Part of fix for bug #1675513 (xref to area broken).
      -
    • -

      Mauritz Jeanson: titlepage.xsl; component.xsl; division.xsl; sections.xsl

      Added fixes to avoid duplicate ids when generate.id.attributes = 1.
      -This (hopefully) closes bug #1671052.
      -
    • -

      Michael(tm) Smith: formal.xsl; pi.xsl

      Made the dbfunclist PI work as intended. Also added doc for
      -dbfunclist and dbcmdlist PIs.
      -
    • -

      Michael(tm) Smith: pi.xsl; synop.xsl

      Made the dbcmdlist work the way it appears to have been intended
      -to work. Restored dbhtml-dir template back to pi.xsl.
      -
    • -

      Michael(tm) Smith: titlepage.xsl; param.xweb; param.ent

      Added new param abstract.notitle.enabled.
      -If non-zero, in output of the abstract element on titlepages,
      -display of the abstract title is suppressed.
      -Because sometimes you really don't want or need that title
      -there...
      -
    • -

      Michael(tm) Smith: chunk-code.xsl; graphics.xsl

      When we are chunking long descriptions for mediaobject instances
      -into separate HTML output files, and use.id.as.filename is
      -non-zero, if a mediaobject has an ID, use that ID as the basename
      -for the long-description file (otherwise, we generate an ID for it
      -and use that ID as the basename for the file).
      -The parallels the recent change made to cause IDs for legalnotice
      -instances to be used as basenames for legalnotice chunks.
      -Also, made some minor refinements to the recent changes for
      -legalnotice chunk handling.
      -
    • -

      Michael(tm) Smith: titlepage.xsl

      Added support to the HTML stylesheets for proper processing of
      -orgname as a child of author.
      -
    • -

      Michael(tm) Smith: chunk-code.xsl

      When $generate.legalnotice.link is non-zero and
      -$use.id.as.filename is also non-zero, if a legalnotice has an ID,
      -then instead of assigning the "ln-<generatedID>" basename to the
      -output file for that legalnotice, just use its real ID as the
      -basename for the file -- as we do when chunking other elements
      -that have IDs.
      -
    • -

      David Cramer: xref.xsl

      Handle alt text on xrefs to steps when the step doesn't have a title.
      -
    • -

      David Cramer: lists.xsl

      Added <p> element around term in variablelist when formatted as table to avoid misalignment of term and listitem in xhtml (non-quirks mode) output
      -
    • -

      David Cramer: qandaset.xsl

      Added <p> element around question and answer labels to avoid misalignment of label and listitem in xhtml (non-quirks mode) output
      -
    • -

      David Cramer: lists.xsl

      Added <p> element around callouts to avoid misalignment of callout and listitem in xhtml (non-quirks mode) output
      -
    • -

      Mauritz Jeanson: inline.xsl

      Make citations numbered if bibliography.numbered != 0.
      -
    • -

      Robert Stayton: param.xweb; param.ent

      Add support for new profiling attributes audience and wordsize.
      -
    • -

      Robert Stayton: inline.xsl; xref.xsl

      Add support for xlink olinks.
      -
    • -

      Jirka Kosek: glossary.xsl

      Rules for normalizing glossary entries before they are sorted can be now different for each language.
      -
    • -

      Robert Stayton: chunk-common.xsl; chunk-code.xsl; manifest.xsl; chunk.xsl

      Refactored the chunking modules to move all named templates to
      -chunk-common.xsl and all match templates to chunk-code.xsl, in
      -order to enable better chunk customization.
      -See the comments in chunk.xsl for more details.
      -
    • -

      Robert Stayton: lists.xsl

      Add anchor for xml:id for listitem in varlistentry.
      -
    • -

      Robert Stayton: refentry.xsl

      Add support for info/title in refsections for db5.
      -
    • -

      Jirka Kosek: param.xweb; biblio.xsl; docbook.xsl; param.ent; biblio-iso690.xsl

      Added support for formatting biblioentries according to ISO690 citation style.
      -New bibliography style can be turned on by setting parameter bibliography.style to "iso690"
      -The code was provided by Jana Dvorakova
      -
    • -

      Robert Stayton: inline.xsl; xref.xsl

      Add call to class.attribute to <a> output elements so they can
      -have a class value too.
      -
    • -

      Mauritz Jeanson: glossary.xsl

      Fixed bug #1644881:
      -* Added curly braces around all $language attribute values. 
      -* Moved declaration of language variable to top level of stylesheet.
      -Tested with Xalan, Saxon, and xsltproc.
      -
    -
    -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.72.0 release.

    -
    • -

      Michael(tm) Smith: param.xweb; docbook.xsl; param.ent

      Added the man.authors.section.enabled and
      -man.copyright.section.enabled parameters. Set those to zero when
      -you want to suppress display of the auto-generated AUTHORS and
      -COPYRIGHT sections. Closes request #1467806. Thanks to Daniel
      -Leidert.
      -
    • -

      Michael(tm) Smith: docbook.xsl

      Took the test that the manpages stylesheet does to see if there
      -are any Refentry chilren in current doc, and made it
      -namespace-agnostic. Reason for that is because the test otherwise
      -won't work when it is copied over into the generated
      -profile-docbook.xsl stylesheet.
      -
    • -

      Michael(tm) Smith: Makefile

      Added a manpages/profile-docbook.xsl file to enable single-pass
      -profiling for manpages output.
      -
    • -

      Michael(tm) Smith: info.xsl

      Output copyright and legalnotice in man-page output in whatever
      -place they are in in document order. Closes #1690539. Thanks to
      -Daniel Leidert for reporting.
      -
    • -

      Michael(tm) Smith: docbook.xsl

      Restored support for single-pass namespace stripping to manpages
      -stylesheet.
      -
    • -

      Michael(tm) Smith: synop.xsl; block.xsl; info.xsl; inline.xsl; lists.xsl; endnotes.xsl; ut⋯

      Changed handling of bold and italic/underline output in manpages
      -output. Should be transparent to users, but...
      -
      -This touches handling of all bold and italic/underline output. The
      -exact change is that the mode="bold" and mode="italic" utility
      -templates were changed to named templates. (I think maybe I've
      -changed it back and forth from mode to named before, so this is
      -maybe re-reverting it yet again).
      -
      -Anyway, the reason for the change is that the templates are
      -sometimes call on dynamically node-sets, and using modes to format
      -those doesn't allow passing info about the current/real context
      -node from the source (not the node-set created by the stylesheet)
      -to that formatting stage.
      -
      -The named templates allow the context to be passed in as a
      -parameter, so that the bold/ital formatting template can use
      -context-aware condition checking.
      -
      -This was basically necessary in order to suppress bold formatting
      -in titles, which otherwise gets screwed up because of the numbnut
      -way that roff handles nested bold/ital.
      -
      -Closes #1674534). Much thanks to Daniel Leidert, whose in his
      -docbook-xsl bug-finding kung-fu has achieved Grand Master status.
      -
    • -

      Michael(tm) Smith: block.xsl

      Fixed handling of example instances by adding the example element
      -to the same template we use for processing figure. Closes
      -#1674538. Thanks to Daniel Leidert.
      -
    • -

      Michael(tm) Smith: utility.xsl

      Don't include lang in manpages filename/pathname if lang=en (that
      -is, only generate lang-qualified file-/pathnames for non-English).
      -
    • -

      Michael(tm) Smith: endnotes.xsl

      In manpages output, emit warnings for notesources (footnote, etc.)
      -that have something other than para as a child.
      -
      -The numbered-with-hanging-indent formatting that's used for
      -rendering endnotes in the NOTES section of man pages places some
      -limits/assumptions on how the DocBook source is marked up; namely,
      -for notesources (footnote, annotation, etc.) that can contain
      -block-level children, if the they have a block-level child such as
      -a table or itemizedlist or orderedlist that is the first child of
      -a footnote, we have no way of rendering/indenting its content
      -properly in the endnotes list.
      -
      -Thus, the manpages stylesheet not emits a warning message for that
      -case, and suggests the "fix" (which is to wrap the table or
      -itemizedlist or whatever in a para that has some preferatory text.
      -
    • -

      Michael(tm) Smith: utility.xsl

      Added support to mixed-block template for handling tables in
      -mixed-blocks (e.g., as child of para) correctly.
      -
    • -

      Michael(tm) Smith: table.xsl; synop.xsl; block.xsl; info.xsl; lists.xsl; refentry.xsl; end⋯

      Reverted necessary escaping of backslash, dot, and dash
      -out of the well-intentioned (but it now appears,
      -misguided) "marker" mechanism (introduced in the 1.72.0
      -release) -- which made use of alternative "marker"
      -characters as internal representations of those
      -characters, and then replaced them just prior to
      -serialization -- and back into what's basically the
      -system that was used prior to the 1.69.0 release; that
      -is, into a part of stylesheet code that gets executed
      -at the beginning of processing -- before any other roff
      -markup up is. This change obviates the need for the
      -marker system. It also requires a lot less RAM during
      -processing (for large files, the marker mechanism
      -ending up requiring gigabytes of memory).
      -
      -Closes bug #1661177. Thanks to Scott Smedley for
      -providing a test case (the fvwm man page) that exposed
      -the problem with the marker mechanism.
      -
      -Also moved the mechanism for converting non-breaking
      -spaces back into the same area of the stylesheet code.
      -
    • -

      Michael(tm) Smith: lists.xsl

      Fixed problem with incorrect formatting of nested variablelist.
      -Closes bug #1650931. Thanks to Daniel "Eagle Eye" Leidert.
      -
    • -

      Michael(tm) Smith: lists.xsl

      Make sure that all listitems in itemizedlist and orderedlist are
      -preceded by a blank line. This fixes a regression that occurred
      -when instances of the TP macro that were use in a previous
      -versions of the list-handling code were switched to RS/RE (because
      -TP doesn't support nesting). TP automatically generates a blank
      -line, but RS doesn't. So I added a .sp before each .RS
      -
    • -

      Michael(tm) Smith: block.xsl; inline.xsl; param.xweb; docbook.xsl; links.xsl; param.ent

      Made a number of changes related to elements with
      -out-of-line content:
      -
      -- Added handling for mediaobject & inlinemediaobject.
      -  Each imagedata, audiodata, or videodata element
      -  within a mediaobject or inline mediaobject is now
      -  treated as a "notesource" and so handled in much the
      -  same way as links and annotation/alt/footnotes.
      -
      -  That means a numbered marker is generated inline to
      -  mark the place in the main flow where the imagedata,
      -  audiodata, or videodata element occurs, and a
      -  corresponding numbered endnote for it is generated in
      -  the endnotes list at the end of the man page; the
      -  endnote contains the URL from the fileref attribute
      -  of the imagedata, audiodata, or videodata element.
      -
      -  For mediobject and inlinemediaobject instances that
      -  have a textobject child, the textobject is displayed
      -  within the main text flow.
      -
      -- Renamed several man.link.* params to man.endnotes.*,
      -  to reflect that fact that the endnotes list now
      -  contains more than just links. Also did similar
      -  renaming for a number of stylesheet-internal vars.
      -
      -- Added support for xlink:href (along with existing
      -  support for the legacy ulink element).
      -
      -- Cleaned up and streamlined the endnotes-handling
      -  code. It's still messy and klunky and the basic
      -  mechanism it uses is very inefficent for documents
      -  that contain a lot of notesources, but at least it's
      -  a bit better than it was.
      -
    -
    -

    Eclipse

    - -

    The following changes have been made to the - eclipse code - since the 1.72.0 release.

    -
    • -

      Mauritz Jeanson: Makefile

      Fixed bug #1715093: Makefile for creating profiled version of eclipse.xsl added.
      -
    • -

      David Cramer: eclipse.xsl

      Added normalize-space around  to avoid leading whitespace from appearing in the output if there's extra leading whitespace (e.g. <title> Foo</title>) in the source
      -
    -
    -

    JavaHelp

    - -

    The following changes have been made to the - javahelp code - since the 1.72.0 release.

    -
    • -

      Mauritz Jeanson: javahelp.xsl

      Implemented FR #1230233 (sorted index in javahelp).
      -
    • -

      Mauritz Jeanson: javahelp.xsl

      Added normalize-space() around titles and index entries to work around whitespace problems.
      -Added support for glossary and bibliography in toc and map files.
      -
    -
    -

    Roundtrip

    - -

    The following changes have been made to the - roundtrip code - since the 1.72.0 release.

    -
    • -

      Steve Ball: blocks2dbk.xsl; wordml2normalise.xsl; normalise2sections.xsl; sections2blocks.⋯

      new stylesheets for better word processor support and easier maintenance
      -
    • -

      Steve Ball: template-pages.xml; dbk2wp.xsl; sections-spec.xml

      fixed bugs
      -
    -
    -

    Params

    - -

    The following changes have been made to the - params code - since the 1.72.0 release.

    -
    • -

      Mauritz Jeanson: htmlhelp.button.back.xml; htmlhelp.button.forward.xml; htmlhelp.button.zo⋯

      Modified refpurpose text.
      -
    • -

      Mauritz Jeanson: htmlhelp.map.file.xml; htmlhelp.force.map.and.alias.xml; htmlhelp.alias.f⋯

      Fixed typos, made some small changes.
      -
    • -

      Mauritz Jeanson: javahelp.encoding.xml

      Moved declaration and documentation of javahelp.encoding from javahelp.xsl to the
      -regular "parameter machinery".
      -
    • -

      Mauritz Jeanson: generate.id.attributes.xml

      Added refpurpose text.
      -
    • -

      Mauritz Jeanson: annotation.js.xml; annotation.graphic.open.xml; annotation.graphic.close.⋯

      Added better refpurpose texts.
      -
    • -

      Michael(tm) Smith: chunker.output.cdata-section-elements.xml; chunker.output.standalone.xm⋯

      Fixed some broken formatting in source files for chunker.* params,
      -as pointed out by Dave Pawson.
      -
    • -

      Michael(tm) Smith: label.from.part.xml

      Changed handling of reference auto-labeling such that reference
      -(when it appears at the component level) is now affected by the
      -label.from.part param, just as preface, chapter, and appendix.
      -
    • -

      Mauritz Jeanson: callout.graphics.extension.xml

      Clarified that 'extension' refers to file names.
      -
    • -

      Michael(tm) Smith: abstract.notitle.enabled.xml

      Added new param abstract.notitle.enabled.
      -If non-zero, in output of the abstract element on titlepages,
      -display of the abstract title is suppressed.
      -Because sometimes you really don't want or need that title
      -there...
      -
    • -

      Michael(tm) Smith: man.string.subst.map.xml

      Updated manpages string-substitute map to reflect fact that
      -because of another recent change to suppress bold markup in .SH
      -output, we no longer need to add a workaround for the accidental
      -uppercasing of roff escapes that occurred previously.
      -
    • -

      Jirka Kosek: margin.note.float.type.xml; title.font.family.xml; table.frame.border.color.x⋯

      Improved parameter metadata
      -
    • -

      Robert Stayton: profile.wordsize.xml; profile.audience.xml

      Add support for profiling on new attributes audience and wordsize.
      -
    • -

      Robert Stayton: callout.graphics.number.limit.xml; callout.graphics.extension.xml

      Added SVG graphics for fo output.
      -
    • -

      Robert Stayton: callout.icon.size.xml

      Set size of callout graphics.
      -
    • -

      Jirka Kosek: default.units.xml; chunker.output.method.xml; toc.list.type.xml; output.inden⋯

      Updated parameter metadata to the new format.
      -
    • -

      Jirka Kosek: man.output.quietly.xml; title.font.family.xml; footnote.sep.leader.properties⋯

      Added type annotations into parameter definition files.
      -
    • -

      Robert Stayton: section.container.element.xml

      Support spans in sections for certain processors.
      -
    • -

      Robert Stayton: component.titlepage.properties.xml

      Empty attribute set for top level component titlepage block.
      -Allows setting a span on title info.
      -
    • -

      Jirka Kosek: bibliography.style.xml

      Added link to WiKi page with description of special markup needed for ISO690 biblioentries
      -
    • -

      Robert Stayton: make.year.ranges.xml

      Clarify that multiple year elements are required.
      -
    • -

      Robert Stayton: id.warnings.xml

      Turn off id.warnings by default.
      -
    • -

      Jirka Kosek: bibliography.style.xml

      Added support for formatting biblioentries according to ISO690 citation style.
      -New bibliography style can be turned on by setting parameter bibliography.style to "iso690"
      -The code was provided by Jana Dvorakova
      -
    • -

      Robert Stayton: header.table.properties.xml; footer.table.properties.xml

      Support adding table properties to header and footer tables.
      -
    -
    -

    Highlighting

    - -

    The following changes have been made to the - highlighting code - since the 1.72.0 release.

    -
    • -

      Jirka Kosek: c-hl.xml; xslthl-config.xml

      Added support for C language. Provided by Bruno Guegan.
      -
    -
    -

    Profiling

    - -

    The following changes have been made to the - profiling code - since the 1.72.0 release.

    -
    • -

      Robert Stayton: profile-mode.xsl

      Add support for new profiling attributes audience and wordsize.
      -
    -
    -

    Lib

    - -

    The following changes have been made to the - lib code - since the 1.72.0 release.

    -
    • -

      Michael(tm) Smith: lib.xweb

      Changed name of prepend-pad template to pad-string and twheeked so
      -it can do both right/left padding.
      -
    -
    -

    Tools

    - -

    The following changes have been made to the - tools code - since the 1.72.0 release.

    -
    • -

      Michael(tm) Smith: bin; bin/docbook-xsl-update

      Did some cleanup to the install.sh source and added a
      -docbook-xsl-update script to the docbook-xsl distro, the purpose
      -of which is to facilitate easy sync-up to the latest docbook-xsl
      -snapshot (by means of rsync).
      -
    -
    -

    XSL-Saxon

    - -

    The following changes have been made to the - xsl-saxon code - since the 1.72.0 release.

    -
    • -

      Mauritz Jeanson: xalan27/src/com/nwalsh/xalan/Verbatim.java; xalan27/src/com/nwalsh/xalan/⋯

      Added modifications so that the new callout.icon.size parameter is taken into account. This 
      -parameter is used for FO output (where SVG now is the default graphics format for callouts).
      -
    • -

      Mauritz Jeanson: saxon65/src/com/nwalsh/saxon/FormatCallout.java; xalan27/src/com/nwalsh/x⋯

      Added code for generating id attributes on callouts in HTML and FO output.
      -These patches enable cross-references to callouts placed by area coordinates.
      -It works for graphic, unicode and text callouts. 
      -Part of fix for bug #1675513 (xref to area broken).
      -
    • -

      Michael(tm) Smith: saxon65/src/com/nwalsh/saxon/Website.java; xalan27/src/com/nwalsh/xalan⋯

      Copied over Website XSL Java extensions.
      -
    -
    -

    XSL-Xalan

    - -

    The following changes have been made to the - xsl-xalan code - since the 1.72.0 release.

    -
    • -

      Michael(tm) Smith: Makefile; xalan2

      Turned off xalan2.jar build. This removes DocBook XSL
      -Java extensions support for versions of Xalan prior to
      -Xalan 2.7. If you are currently using the extensions
      -with an earlier version of Xalan, you need to upgrade
      -to Xalan 2.7.
      -
    • -

      Mauritz Jeanson: xalan27/src/com/nwalsh/xalan/Verbatim.java; xalan27/src/com/nwalsh/xalan/⋯

      Added modifications so that the new callout.icon.size parameter is taken into account. This 
      -parameter is used for FO output (where SVG now is the default graphics format for callouts).
      -
    • -

      Mauritz Jeanson: saxon65/src/com/nwalsh/saxon/FormatCallout.java; xalan27/src/com/nwalsh/x⋯

      Added code for generating id attributes on callouts in HTML and FO output.
      -These patches enable cross-references to callouts placed by area coordinates.
      -It works for graphic, unicode and text callouts. 
      -Part of fix for bug #1675513 (xref to area broken).
      -
    • -

      Michael(tm) Smith: saxon65/src/com/nwalsh/saxon/Website.java; xalan27/src/com/nwalsh/xalan⋯

      Copied over Website XSL Java extensions.
      -
    -
    -
    - -

    Release: 1.72.0

    - -

    This release includes important bug fixes and adds the following -significant feature changes: -

    Automatic sorting of glossary entries
    -

    The HTML and FO stylesheets now support automatic sorting - of glossary entries. To enable glossary sorting, set - the value of the glossary.sort parameter - to 1 (by default, it’s value is - 0). When you enable glossary sorting, - glossentry elements within a glossary, - glossdiv, or glosslist are sorted on the - glossterm, using the current language setting. If you - don’t enable glossary sorting, then the order of - glossentry elements is left “as is” — that is, they - are not sorted but are instead just displayed in document - order.

    -
    WordML renamed to Roundtrip, OpenOffice support added
    -

    Stylesheets for “roundtrip” conversion between documents in - OpenOffice format (ODF) and DocBook XML have been added to the set - of stylesheets that formerly had the collective title - WordML, and that set of stylesheets has - been renamed to Roundtrip to better - reflect the actual scope and purpose of its contents.

    -

    So the DocBook XSL Stylesheets now support roundtrip - conversion (with certain limitations) of WordML, OpenOffice, and - Apple Pages documents to and from DocBook XML.

    -
    Including QandASet questions in TOCs
    -

    The HTML stylesheet now provides support for including - QandASet questions in the document TOC. To - enable display of questions in the document TOC, set - the value of the qanda.in.toc to - 1 (by default, it’s 0). When you - enable qanda.in.toc, then the generated - table of contents for a document will include - qandaset titles, qandadiv titles, and - question elements. The default value of zero - excludes them from the TOC. -

    Note

    -

    The qanda.in.toc parameter does - not affect any tables of contents that may be generated - within a qandaset or - qandadiv (only in the document TOC).

    -

    -

    -
    Language identifier in man-page filenames and pathnames
    -

    Added new parameter man.output.lang.in.name.enabled, which controls whether - a language identifier is included in man-page filenames and - pathnames. It works like this:

    - -

    If the value of man.output.lang.in.name.enabled is non-zero, - man-page files are output with a language identifier included in - their filenames or pathnames as follows:

    - -
    - -
    index.page.number.properties property set
    -

    For FO output, use the - index.page.number.properties to control - formatting of page numbers in index output — to (for - example) to display page numbers in index output in a - different color (to indicate that they are links).

    -
    Crop marks in output from Antenna House XSL Formatter
    -

    Support has been added for generating crop marks in - print/PDF output generated using Antenna House XSL Formatter

    -
    More string-substitution hooks in manpages output
    -

    The man.string.subst.map.local.pre - and man.string.subst.map.local.post - parameters have been added to enable easier control over - custom string substitutions.

    -
    Moved verbatim properties to attribute-set
    -

    The hardcoded properties used in verbatim elements (literallayout, - programlisting, screen) were moved to the verbatim.properties - attribute-set so they can be more easily customized.

    -
    enhanced simple.xlink template
    -

    Now the simple.xlink template in inline.xsl works with - cross reference elements xref and link as well. Also, more elements - call simple.xlink, which enables DB5 xlink functionality. -

    -
    DocBook 5 compatibility
    -

    Stylesheets now consistently support DocBook 5 attributes - (such as xml:id). Also, DocBook 5 info elements are now checked - along with other *info elements, and the use of name() function - was replaced by local-name() so it also matches on DocBook 5 elements. - These changes enable reusing the stylesheets with DocBook 5 - documents with minimal fixup. -

    -
    HTML class attributes now handled in class.attribute mode
    -

    The HTML class attributes were formerly hardcoded to the - element name. Now the class attribute is generated by applying - templates in class.attribute mode so class attribute names - can be customized. The default is still the element name.

    -
    arabic-indic numbering enabled in autolabels
    -

    Numbering of chapter, sections, and pages can now use - arabic-indic numbering when number format is set to 'arabicindic' or - to ١.

    -

    -The following is a detailed list of changes (not -including bug fixes) that have been made since the 1.71.1 -release.

    - -

    Common

    - -

    The following changes have been made to the - common code - since the 1.71.1 release.

    -
    • -

      Add support for arabicindic numbering to autolabel.format template.

      -
    • -

      Finish support for @xml:id everywhere @id is used.

      -
    • -

      replace name() with local-name() in most cases.

      -
    • -

      Add support for info.

      -
    • -

      Add utility template tabstyle to return the tabstyle from
      -any table element.

      -
    -
    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.71.1 release.

    -
    • -

      Add support for sorting glossary entries

      -
    • -

      Add table.row.properties template to customize table rows.

      -
    • -

      Moved all properties to attribute-sets so can be customized more easily.

      -
    • -

      Add index.page.number.properties attribute-set to format page numbers.

      -
    • -

      xref now supports xlink:href, using simple.xlink template.

      -
    • -

      Rewrote simple.xlink, and call it with all charseq templates.

      -
    • -

      Add simple.xlink processing to term and member elements.

      -
    • -

      Add support for crop marks in Antenna House.

      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.71.1 release.

    -
    • -

      Add support for sorting glossary entries

      -
    • -

      Add support for qanda.in.toc to add qandaentry questions to document TOC.

      -
    • -

      add simple.xlink support to variablelist term and simplelist member.

      -
    • -

      *.propagates.style now handled in class.attribute mode.

      -
    • -

      add class parameter to class.attribute mode to set default class.

      -
    • -

      Convert all class attributes to use the class.attribute mode
      -so class names can be customized more easily.

      -
    • -

      Add class.attribute mode to generate class attributes.

      -
    • -

      Added simple.xlink to most remaining inlines.
      -Changed class attributes to applying class.attributes mode.

      -
    • -

      Changed xref template to use simple.xlink tempalte.

      -
    • -

      Improve generate.html.title to work with link targets too.

      -
    • -

      Improved simple.xlink to support link and xref.

      -
    • -

      Use new link.title.attribute now.

      -
    • -

      Rewrote simple.xlink to handle linkend also.
      -Better computation of title attribute on link too.

      -
    • -

      Handle Xalan quirk as special case.

      -
    • -

      Add support for info.

      -
    • -

      Fixed imagemaps so they work properly going from calspair coords
      -to HTML area coords.

      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.71.1 release.

    -
    • -

      Added doc for man.output.lang.in.name.enabled parameter. This
      -checkin completes support for writing file/pathnames for man-pages
      -with $lang include in the names. Closes #1585967. knightly
      -accolades to Daniel Leidert for providing the feature request.

      -
    • -

      Added new param man.output.lang.in.name.enabled, which
      -controls whether $LANG value is included in manpages
      -filenames and pathnames. It works like this:
      -
      -If the value of man.output.lang.in.name.enabled is non-zero,
      -man-page files are output with the $lang value included in
      -their filenames or pathnames as follows;
      -
      -- if man.output.subdirs.enabled is non-zero, each file is
      -  output to, e.g., a /$lang/man8/foo.8 pathname
      -
      -- if man.output.subdirs.enabled is zero, each file is output
      -  with a foo.$lang.8 filename

      -
    • -

      Use "\e" instead of "\\" for backslash output, because the
      -groff docs say that's the correct thing to do; also because
      -testing (thanks, Paul Dubois) shows that "\\" doesn't always
      -work as expected; for example, "\\" within a table seems to
      -mess things up.

      -
    • -

      Added the man.string.subst.map.local.pre and
      -man.string.subst.map.local.post parameters. Those parameters
      -enable local additions and changes to string-substitution mappings
      -without the need to change the value of man.string.subst.map
      -parameter (which is for standard system mappings). Closes
      -#1456738. Thanks to Sam Steingold for constructing a true
      -stylesheet torture test (the clisp docs) that exposed the need for
      -these params.

      -
    • -

      Added the Markup element to the list of elements that get output
      -in bold. Thanks to Eric S. Raymond.

      -
    • -

      Replaced all dots in roff requests with U+2302 ("house"
      -character), and added escaping in output for all instances of dot
      -that are not in roff requests. This fixes the problem case where a
      -string beginning with a dot (for example, the string ".bashrc")
      -might occur at the beginning of a line in output, in which case 
      -would mistakenly get interpreted as a roff request. Thanks to Eric
      -S. Raymond for pushing to fix this.

      -
    • -

      Made change to ensure that list content nested in
      -itemizedlist and orderedlist instances is properly indented. This
      -is a switch from using .TP to format those lists to using .RS/.RE
      -to format them instead (because .TP does not allow nesting). Closes bug #1602616.
      -Thanks to Daniel Leidert.

      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.71.1 release.

    -
    • -

      Added doc for man.output.lang.in.name.enabled parameter. This
      -checkin completes support for writing file/pathnames for man-pages
      -with $lang include in the names. Closes #1585967. knightly
      -accolades to Daniel Leidert for providing the feature request.

      -
    • -

      Added new param man.output.lang.in.name.enabled, which
      -controls whether $LANG value is included in manpages
      -filenames and pathnames. It works like this:
      -
      -If the value of man.output.lang.in.name.enabled is non-zero,
      -man-page files are output with the $lang value included in
      -their filenames or pathnames as follows;
      -
      -- if man.output.subdirs.enabled is non-zero, each file is
      -  output to, e.g., a /$lang/man8/foo.8 pathname
      -
      -- if man.output.subdirs.enabled is zero, each file is output
      -  with a foo.$lang.8 filename

      -
    • -

      Added the man.string.subst.map.local.pre and
      -man.string.subst.map.local.post parameters. Those parameters
      -enable local additions and changes to string-substitution mappings
      -without the need to change the value of man.string.subst.map
      -parameter (which is for standard system mappings). Closes
      -#1456738. Thanks to Sam Steingold for constructing a true
      -stylesheet torture test (the clisp docs) that exposed the need for
      -these params.

      -
    • -

      Add index.page.number.properties by default.

      -
    • -

      Added index.page.number.properties to allow customizations of page numbers in indexes.

      -
    • -

      Move show-destination="replace" property from template to attribute-set
      -so it can be customized.

      -
    • -

      Add support for sorting glossary entries

      -
    • -

      Add option to include qanda in tables of contents.

      -
    • -

      Moved all properties to attribute-sets so can be customized more easily.

      -
    -
    - -

    Template

    - -

    The following changes have been made to the - template code - since the 1.71.1 release.

    -
    • -

      Added workaround for Xalan bug: use for-each and copy instead of copy-of (#1604770).

      -
    -
    - -

    Roundtrip

    - -

    The following changes have been made to the - roundtrip code - since the 1.71.1 release.

    -
    • -

      rename to roundtrip, add OpenOffice support

      -
    -
    -
    - -

    Release: 1.71.1

    - -

    This is a minor update to the 1.71.0 release. Along with a -number of bug fixes, it includes two feature changes: - -

    • -

      Added support for profiling based on xml:lang and status attributes.

      -
    • -

      Added initial support in manpages output for - footnote, annotation, and alt - instances. Basically, they all now get handled the same way - ulink instances are. They are treated as a class as - "note sources": A numbered marker is generated at the place in the - main text flow where they occur, then their contents are displayed - in an endnotes section at the end of the man page.

      -

    -

    - -

    Common

    - -

    The following changes have been made to the - common code - since the 1.71.1 release.

    -
    • -

      For backward compatability autoidx-ng.xsl is invoking "kosek" indexing method again.

      -
    • -

      Add support for Xalan generating a root xml:base like saxon.

      -
    -
    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.71.1 release.

    -
    • -

      For backward compatability autoidx-ng.xsl is invoking "kosek" indexing method again.

      -
    • -

      Add support for Xalan to add root node xml:base for db5 docs.

      -
    • -

      Added support for profiling based on xml:lang and status attributes.

      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.71.1 release.

    -
    • -

      For backward compatability autoidx-ng.xsl is invoking "kosek" indexing method again.

      -
    • -

      Add support for Xalan to add root node xml:base for db5 docs.

      -
    • -

      Added support for profiling based on xml:lang and status attributes.

      -
    • -

      Made changes in namespace declarations to prevent xmllint's
      -canonicalizer from treating them as relative namespace URIs.
      -
      -  - Changed xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService"
      -    to xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService";
      -    Saxon accepts either form
      -    (see http://www.saxonica.com/documentation/extensibility/functions.html);
      -    to Saxon, "the part of the URI before the final '/' is immaterial".
      -
      -  - Changed, e.g. xmlns:xverb="com.nwalsh.xalan.Verbatim" to
      -    xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"; Xalan accepts
      -    either form
      -    (see http://xml.apache.org/xalan-j/extensions.html#java-namespace-declare);
      -    just as Saxon does, it will "simply use the string to the
      -    right of the rightmost forward slash as the Java class name".
      -
      -  - Changed xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect"
      -    to xmlns:redirect="http://xml.apache.org/xalan/redirect", and
      -    adjusted associated code to make the current Xalan redirect spec.
      -    (see http://xml.apache.org/xalan-j/apidocs/org/apache/xalan/lib/Redirect.html)

      -
    • -

      Added the html.append and chunk.append parameters. By default, the
      -value of both is empty; but the internal DocBook XSL stylesheets
      -build sets their value to "<xsl:text>&#x0a;</xsl:text>", in order
      -to ensure that all files in the docbook-xsl-doc package end in a
      -newline character. (Because diff and some other tools may emit
      -error messages and/or not behave as expected when processing
      -files that are not newline-terminated.)

      -
    -
    - -

    Highlighting

    - -

    The following changes have been made to the - highlighting code - since the 1.71.1 release.

    -
    • -

      Added license information

      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.71.1 release.

    -
    • -

      Added initial support in manpages output for footnoteannotation,
      -and alt instances. Basically, they all now get handled the same
      -way ulink instances are. They are treated as a class as "note
      -sources": A numbered marker is generated at the place in the main
      -text flow where they occur, then their contents are displayed in
      -an endnotes section at the end of the man page (currently titled
      -REFERENCES, for English output, but will be changed to NOTES).
      -
      -This support is not yet complete. It works for most "normal"
      -cases, but probably mishandles a good number of cases. More
      -testing will be needed to expose the problems. It may well also
      -introduce some bugs and regressions in other areas, including
      -basic paragraph handling, handling of "mixed block" content,
      -handling of other indented content, and handling of authorblurb
      -and personblurb in the AUTHORS section.

      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.71.1 release.

    -
    • -

      Added support for profiling based on xml:lang and status attributes.

      -
    • -

      Added the html.append and chunk.append parameters. By default, the
      -value of both is empty; but the internal DocBook XSL stylesheets
      -build sets their value to "<xsl:text>&#x0a;</xsl:text>", in order
      -to ensure that all files in the docbook-xsl-doc package end in a
      -newline character. (Because diff and some other tools may emit
      -error messages and/or not behave as expected when processing
      -files that are not newline-terminated.)

      -
    -
    - -

    Profiling

    - -

    The following changes have been made to the - profiling code - since the 1.71.1 release.

    -
    • -

      Added support for profiling based on xml:lang and status attributes.

      -
    -
    - -
    - -

    Release: 1.71.0

    - -

    This is mainly a bug fix release, but it also includes two -significant feature changes: -

    Highlighting support added
    -

    The stylesheets now include support for source-code - highlighting in output of programlisting instances (controlled - through the highlight.source - parameter). The Java-based implementation requires Saxon and - makes use of Michal Molhanec’s XSLTHL. More details are available at Jirka Kosek’s - website:

    The support is currently limited to highlighting - of XML, Java, PHP, Delphi, Modula-2 sources, and INI - files.

    -
    Changes to autoindexing
    -

    The templates that handle alternative indexing methods - were reworked to avoid errors produced by certain processors not - being able to tolerate the presence of unused functions. With - this release, none of the code for the 'kimber' or 'kosek' - methods is included in the default stylesheets. In order to use - one of those methods, your customization layer must import one - of the optional stylesheet modules:

    -

    -

    • - html/autoidx-kosek.xsl -
    • - html/autoidx-kimber.xsl -
    • - fo/autoidx-kosek.xsl -
    • - fo/autoidx-kimber.xsl -

    - See the index.method parameter - reference page for more information. -

    -

    Two other changes to note: -

    • - The default indexing method now can handle accented - characters in latin-based alphabets, not just English. This - means accented latin letters will group and sort with their - unaccented counterpart. -
    • - The default value for the - index.method parameter was changed - from 'english' to 'basic' because now the default method can - handle latin-based alphabets, not just English. -

    -

    -

    -The following is a list of changes that have -been made since the 1.70.1 release.

    - -

    Common

    - -

    The following changes have been made to the - common code - since the 1.70.1 release.

    -
    • -

      Added reference.autolabel parameter for controlling labels on
      -reference output.

      -
    • -

      Support rows that are *completely* overlapped by the preceding row

      -
    • -

      New modules for supporting indexing extensions.

      -
    • -

      Support startinglinenumber on orderedlist

      -
    -
    - -

    Extensions

    - -

    The following changes have been made to the - extensions code - since the 1.70.1 release.

    -
    • -

      Completely reworked extensions build system; now uses NetBeans and ant

      -
    -
    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.70.1 release.

    -
    • -

      xsl:sort lang attribute now uses two-char substring of lang attribute.

      -
    • -

      Support titlecase "Java", "Perl", and "IDL" as values for the
      -language attribute on classsynopsis, etc. (instead of just
      -lowercase "java", "perl", and "idl"). Also support "c++" and "C++"
      -(instead of just "cpp").
      -
      -Affects HTML, FO, and manpages output. Closes bug 1552332. Thanks
      -to "Brian A. Vanderburg II".

      -
    • -

      Added support for the reference.autolabel param in (X)HTML and FO
      -output.

      -
    • -

      Support rows that are *completely* overlapped by the preceding row

      -
    • -

      Rearranged templates for the 3 indexing methods
      -and changed method named 'english' to 'basic'.

      -
    • -

      New modules for supporting indexing extensions.

      -
    • -

      Turn off blank-body for fop1.extensions too since fop 0.92
      -does not support it either.

      -
    • -

      Add Xalan variant to test for exslt:node-set function.
      -Xalan can use function named node-set(), but doesn't
      -recognize it using function-available().

      -
    • -

      Added support to FO stylesheets for handling instances of Org
      -where it occurs outside of *info content. In HTML stylesheets,
      -moved handling of Org out of info.xsl and into inline.xsl. In both
      -FO and HTML stylesheets, added support for correctly processing
      -Affiliation and Jobtitle.

      -
    • -

      Don't output punctuation between Refname and Refpurpose if
      -Refpurpose is empty. Also corrected handling of Refsect2/title
      -instances, and removed some debugging stuff that was generated in
      -manpages output to mark the ends of sections.

      -
    • -

      Added new email.delimiters.enabled param. If non-zero (the
      -default), delimiters are generated around e-mail addresses (output
      -of the email element). If zero, the delimiters are suppressed.

      -
    • -

      Initial support of syntax highlighting of programlistings.

      -
    • -

      Chapter after preface should restart numbering of pages.

      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.70.1 release.

    -
    • -

      xsl:sort lang attribute now uses two-char substring of lang attribute.

      -
    • -

      Support titlecase "Java", "Perl", and "IDL" as values for the
      -language attribute on classsynopsis, etc. (instead of just
      -lowercase "java", "perl", and "idl"). Also support "c++" and "C++"
      -(instead of just "cpp").
      -
      -Affects HTML, FO, and manpages output. Closes bug 1552332. Thanks
      -to "Brian A. Vanderburg II".

      -
    • -

      Added support for the reference.autolabel param in (X)HTML and FO
      -output.

      -
    • -

      Support rows that are *completely* overlapped by the preceding row

      -
    • -

      Rearranged templates for the 3 indexing methods
      -and changed method named 'english' to 'basic'.

      -
    • -

      New modules for supporting indexing extensions.

      -
    • -

      Added several new HTML parameters for controlling appearance of
      -content on HTML title pages:
      -
      -contrib.inline.enabled:
      -  If non-zero (the default), output of the contrib element is
      -  displayed as inline content rather than as block content.
      -
      -othercredit.like.author.enabled:
      -  If non-zero, output of the othercredit element on titlepages is
      -  displayed in the same style as author and editor output. If zero
      -  (the default), othercredit output is displayed using a style
      -  different than that of author and editor.
      -
      -blurb.on.titlepage.enabled:
      -  If non-zero, output from authorblurb and personblurb elements is
      -  displayed on title pages. If zero (the default), output from
      -  those elements is suppressed on title pages (unless you are
      -  using a titlepage customization that causes them to be included).
      -
      -editedby.enabled
      -  If non-zero (the default), a localized Edited by heading is
      -  displayed above editor names in output of the editor element.

      -
    • -

      Add Xalan variant to test for exslt:node-set function.
      -Xalan can use function named node-set(), but doesn't
      -recognize it using function-available().

      -
    • -

      Added support to FO stylesheets for handling instances of Org
      -where it occurs outside of *info content. In HTML stylesheets,
      -moved handling of Org out of info.xsl and into inline.xsl. In both
      -FO and HTML stylesheets, added support for correctly processing
      -Affiliation and Jobtitle.

      -
    • -

      Don't output punctuation between Refname and Refpurpose if
      -Refpurpose is empty. Also corrected handling of Refsect2/title
      -instances, and removed some debugging stuff that was generated in
      -manpages output to mark the ends of sections.

      -
    • -

      Added new email.delimiters.enabled param. If non-zero (the
      -default), delimiters are generated around e-mail addresses (output
      -of the email element). If zero, the delimiters are suppressed.

      -
    • -

      Added qanda.nested.in.toc param. Default value is zero. If
      -non-zero, instances of "nested" Qandaentry (ones that are children
      -of Answer elements) are displayed in the TOC. Closes patch 1509018
      -(from Daniel Leidert). Currently on affects HTML output (no patch
      -for FO output provided).

      -
    • -

      Improved handling of relative locations generated files

      -
    • -

      Initial support of syntax highlighting of programlistings.

      -
    • -

      Support org

      -
    • -

      Support person

      -
    • -

      Support $keep.relative.image.uris also when chunking

      -
    -
    - -

    Highlighting

    - -

    The following changes have been made to the - highlighting code - since the 1.70.1 release.

    -
    • -

      Initial support of syntax highlighting of programlistings.

      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.70.1 release.

    -
    • -

      Suppress footnote markers and output warning that footnotes are
      -not yet supported.

      -
    • -

      Handle instances of address/otheraddr/ulink in author et al in the
      -same way as email instances; that is, display them on the same
      -linke as the authoreditor, etc., name.

      -
    • -

      Don't number or link-list any Ulink instance whose string value is
      -identical to the value of its url attribute. Just display it inline.

      -
    • -

      Don't output punctuation between Refname and Refpurpose if
      -Refpurpose is empty. Also corrected handling of Refsect2/title
      -instances, and removed some debugging stuff that was generated in
      -manpages output to mark the ends of sections.

      -
    • -

      Added new email.delimiters.enabled param. If non-zero (the
      -default), delimiters are generated around e-mail addresses (output
      -of the email element). If zero, the delimiters are suppressed.

      -
    • -

      In manpages output, if the last/nearest *info element for
      -particular Refentry has multiple Copyright and/or Legalnotice
      -children, process them all (not just the first ones). Closes bug
      -1524576. Thanks to Sam Steingold for the report and to Daniel
      -Leidert for providing a patch.

      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.70.1 release.

    -
    • -

      Added reference.autolabel parameter for controlling labels on
      -reference output.

      -
    • -

      Added namespace declarations to document elements for all param files.

      -
    • -

      Updated index.method doc to describe revised setup for importing index extensions.

      -
    • -

      Added several new HTML parameters for controlling appearance of
      -content on HTML title pages:
      -
      -contrib.inline.enabled:
      -  If non-zero (the default), output of the contrib element is
      -  displayed as inline content rather than as block content.
      -
      -othercredit.like.author.enabled:
      -  If non-zero, output of the othercredit element on titlepages is
      -  displayed in the same style as author and editor output. If zero
      -  (the default), othercredit output is displayed using a style
      -  different than that of author and editor.
      -
      -blurb.on.titlepage.enabled:
      -  If non-zero, output from authorblurb and personblurb elements is
      -  displayed on title pages. If zero (the default), output from
      -  those elements is suppressed on title pages (unless you are
      -  using a titlepage customization that causes them to be included).
      -
      -editedby.enabled
      -  If non-zero (the default), a localized Edited by heading is
      -  displayed above editor names in output of the editor element.

      -
    • -

      Added new email.delimiters.enabled param. If non-zero (the
      -default), delimiters are generated around e-mail addresses (output
      -of the email element). If zero, the delimiters are suppressed.

      -
    • -

      Added qanda.nested.in.toc param. Default value is zero. If
      -non-zero, instances of "nested" Qandaentry (ones that are children
      -of Answer elements) are displayed in the TOC. Closes patch 1509018
      -(from Daniel Leidert). Currently on affects HTML output (no patch
      -for FO output provided).

      -
    • -

      Initial support of syntax highlighting of programlistings.

      -
    -
    - -

    Tools

    - -

    The following changes have been made to the - tools code - since the 1.70.1 release.

    -
    • -

      Racheted down font sizes of headings in example makefile FO output.

      -
    • -

      Added param and attribute set to example makefile, for getting
      -wrapping in verbatims in FO output.

      -
    • -

      Renamed Makefile.paramDoc to Makefile.docParam.

      -
    • -

      Added Makefile.paramDoc file, for creating versions of param.xsl
      -files with doc embedded.

      -
    • -

      Added variable to example makefile for controlling whether HTML or
      -XHTML is generated.

      -
    -
    -
    - -

    Release: 1.70.1

    - - -

    This is a stable release of the 1.70 stylesheets. It includes only a -few small changes from 1.70.0.

    - -

    The following is a list of changes that have been made - since the 1.70.0 release.

    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.70.0 release.

    -
    • -

      Added three new attribute sets (revhistory.title.properties, revhistory.table.properties and revhistory.table.cell.properties) for controlling appearance of revhistory in FO output.

      -

      Modified: fo/block.xsl,1.34; fo/param.ent,1.101; fo/param.xweb,1.114; fo/titlepage.xsl,1.41; params/revhistory.table.cell.properties.xml,1.1; params/revhistory.table.properties.xml,1.1; params/revhistory.title.properties.xml,1.1 - Jirka Kosek

      -
    • -

      Support DBv5 revisions with full author name (not only authorinitials)

      -

      Modified: fo/block.xsl,1.33; fo/titlepage.xsl,1.40 - Jirka Kosek

      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.70.0 release.

    -
    • -

      Support DBv5 revisions with full author name (not only authorinitials)

      -

      Modified: html/block.xsl,1.23; html/titlepage.xsl,1.34 - Jirka Kosek

      -
    -
    - -

    HTMLHelp

    - -

    The following changes have been made to the - htmlhelp code - since the 1.70.0 release.

    -
    • -

      htmlhelp.generate.index is now param, not variable. This means that you can override its setting from outside. This is useful when you generate indexterms on the fly (see http://www.xml.com/pub/a/2004/07/14/dbndx.html?page=3).

      -

      Modified: htmlhelp/htmlhelp-common.xsl,1.38 - Jirka Kosek

      -
    • -

      Support chunk.tocs.and.lots in HTML Help

      -

      Modified: htmlhelp/htmlhelp-common.xsl,1.37 - Jirka Kosek

      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.70.0 release.

    -
    • -

      Added three new attribute sets (revhistory.title.properties, revhistory.table.properties and revhistory.table.cell.properties) for controlling appearance of revhistory in FO output.

      -

      Modified: fo/block.xsl,1.34; fo/param.ent,1.101; fo/param.xweb,1.114; fo/titlepage.xsl,1.41; params/revhistory.table.cell.properties.xml,1.1; params/revhistory.table.properties.xml,1.1; params/revhistory.title.properties.xml,1.1 - Jirka Kosek

      -
    -
    - -
    - -

    Release: 1.70.0

    - -

    As with all DocBook Project dot-zero -releases, this is an experimental release. It will be followed shortly -by a stable release.

    - -

    This release adds a number of new features, -including:

    - -
    • -

      support for selecting alternative index-collation methods - (in particular, support for using a collation library developed by - Eliot Kimber)

      -
    • -

      improved handling of DocBook 5 document instances (through a - namespace-stripping mechanism)

      -
    • -

      full support for CALS and HTML tables in manpages - output

      -
    • -

      a mechanism for preserving relative URIs in documents that - make use of XInclude

      -
    • -

      support for the "new" .90 version of - FOP

      -
    • -

      enhanced capabilities for controlling formatting of lists in HTML - and FO output

      -
    • -

      autogeneration of AUTHOR and COPYRIGHT sections in manpages - output

      -
    • -

      support for generating crop marks in FO/PDF output

      -
    • -

      support for qandaset as a root element in FO output

      -
    • -

      support for floatstyle and orient on all table types

      -
    • -

      support for floatstyle in figure, and example

      -
    • -

      pgwide.properties attribute-set supports extending figure, - example and table into the left indent area instead of spanning - multiple columns.

      -
    -

    The following is a detailed list of enhancements and API - changes that have been made since the 1.69.1 release.

    - -

    Common

    - -

    The following changes have been made to the - common code - since the 1.69.1 release.

    -
    • -

      Add the xsl:key for the kimber -indexing method.

      -

      Modified: common/autoidx-ng.xsl,1.2 - Robert -Stayton

      -
    • -

      Add support for -qandaset.

      -

      Modified: common/labels.xsl,1.37; -common/subtitles.xsl,1.7; common/titles.xsl,1.35 - Robert -Stayton

      -
    • -

      Support dbhtml/dbfo start PI for -orderedlist numbering in both HTML and -FO

      -

      Modified: common/common.xsl,1.61; html/lists.xsl,1.50 - Norman -Walsh

      -
    • -

      Added CVS -header.

      -

      Modified: common/stripns.xsl,1.12 - Robert -Stayton

      -
    • -

      Changed content model of text -element to ANY rather than #PCDATA because they could contain -markup.

      -

      Modified: common/targetdatabase.dtd,1.7 - Robert -Stayton

      -
    • -

      Added -refentry.meta.get.quietly param.

      -

      If zero (the -default), notes and warnings about "missing" markup are generated -during gathering of refentry metadata. If -non-zero, the metadata is gathered "quietly" -- that is, the -notes and warnings are suppressed.

      -

      NOTE: If you are -processing a large amount of refentry content, you -may be able to speed up processing significantly by setting a -non-zero value for -refentry.meta.get.quietly.

      -

      Modified: common/refentry.xsl,1.17; -manpages/param.ent,1.15; manpages/param.xweb,1.17; -params/refentry.meta.get.quietly.xml,1.1 - Michael(tm) -Smith

      -
    • -

      After namespace stripping, the -source document is the temporary tree created by the stripping -process and it has the wrong base URI for relative -references. Earlier versions of this code used to try to fix that -by patching the elements with relative @fileref attributes. That -was inadequate because it calculated an absolute base URI -without considering that there might be xml:base attributes -already in effect. It seems obvious now that the right thing to -do is simply to put the xml:base on the root of the document. And -that seems to work.

      -

      Modified: common/stripns.xsl,1.7 - Norman -Walsh

      -
    • -

      Added support for "software" and -"sectdesc" class values on refmiscinfo; "software" is -treated identically to "source", and "setdesc" is treated -identically to "manual".

      -

      Modified: common/refentry.xsl,1.10; -params/man.th.extra2.max.length.xml,1.3; -params/refentry.source.name.profile.xml,1.4 - Michael(tm) -Smith

      -
    • -

      Added support for DocBook 5 -namespace-stripping in manpages stylesheet. Closes request -#1210692.

      -

      Modified: common/common.xsl,1.56; manpages/docbook.xsl,1.57 - -Michael(tm) Smith

      -
    • -

      Added <xsl:template -match="/"> to make stripns.xsl usable as a standalone -stylesheet for stripping out DocBook 5/NG to DocBook 4. Note that -DocBook XSLT drivers that include this stylesheet all override -the match="/" template.

      -

      Modified: common/stripns.xsl,1.4 - Michael(tm) -Smith

      -
    • -

      Number figures, examples, and -tables from book if there is no prefix (i.e. if -chapter.autolabel is set to 0). This avoids -having the list of figures where the figures mysteriously restart -their numeration periodically when -chapter.autolabel is set to -0.

      -

      Modified: common/labels.xsl,1.36 - David Cramer

      -
    • -

      Add task template in -title.markup mode.

      -

      Modified: common/titles.xsl,1.34 - Robert -Stayton

      -
    • -

      Add children (with ids) of formal -objects to target data.

      -

      Modified: common/targets.xsl,1.10 - Robert -Stayton

      -
    • -

      Added support for case when -personname doesn't contain specific name markup (as allowed -in DocBook 5.0)

      -

      Modified: common/common.xsl,1.54 - Jirka -Kosek

      -
    -
    - -

    Extensions

    - -

    The following changes have been made to the - extensions code - since the 1.69.1 release.

    -
    • -

      Support Xalan -2.7

      -

      Modified: extensions/xalan27/.cvsignore,1.1; -extensions/xalan27/build.xml,1.1; -extensions/xalan27/nbproject/.cvsignore,1.1; -extensions/xalan27/nbproject/build-impl.xml,1.1; -extensions/xalan27/nbproject/genfiles.properties,1.1; -extensions/xalan27/nbproject/project.properties,1.1; -extensions/xalan27/nbproject/project.xml,1.1; -extensions/xalan27/src/com/nwalsh/xalan/CVS.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Callout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatDingbatCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatGraphicCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatTextCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatUnicodeCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Func.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/ImageIntrinsics.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Params.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Table.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Text.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Verbatim.java,1.1 - Norman -Walsh

      -
    • -

      Handle the case where the imageFn -is actually a URI. This still needs -work.

      -

      Modified: extensions/saxon643/com/nwalsh/saxon/ImageIntrinsics.java,1.4 -- Norman Walsh

      -
    -
    - -

    FO

    - -

    The following changes have been made to the - fo code - since the 1.69.1 release.

    -
    • -

      Adapted to the new indexing -code. Now works just like a wrapper that calls kosek indexing method, -originally implemented here.

      -

      Modified: fo/autoidx-ng.xsl,1.5 - Jirka -Kosek

      -
    • -

      Added parameters for header/footer -table minimum height.

      -

      Modified: fo/pagesetup.xsl,1.60; -fo/param.ent,1.100; fo/param.xweb,1.113 - Robert -Stayton

      -
    • -

      Add the index.method -parameter.

      -

      Modified: fo/param.ent,1.99; fo/param.xweb,1.112 - Robert -Stayton

      -
    • -

      Integrate support for three -indexing methods: - the original English-only method. - -Jirka Kosek's method using EXSLT extensions. - Eliot Kimber's -method using Saxon extensions. Use the 'index.method' -parameter to select.

      -

      Modified: fo/autoidx.xsl,1.38 - Robert -Stayton

      -
    • -

      Add support for TOC for -qandaset in fo output.

      -

      Modified: fo/autotoc.xsl,1.30; -fo/qandaset.xsl,1.20 - Robert Stayton

      -
    • -

      Added parameter -ulink.hyphenate.chars. Added parameter -insert.link.page.number.

      -

      Modified: fo/param.ent,1.98; -fo/param.xweb,1.111 - Robert Stayton

      -
    • -

      Implemented feature request -#942524 to add insert.link.page.number to allow link -element cross references to have a page number.

      -

      Modified: fo/xref.xsl,1.67 - -Robert Stayton

      -
    • -

      Add support for -ulink.hyphenate.chars so more characters -can be break points in urls.

      -

      Modified: fo/xref.xsl,1.66 - Robert -Stayton

      -
    • -

      Implemented patch #1075144 to make -the url text in a ulink in FO output an active link as -well.

      -

      Modified: fo/xref.xsl,1.65 - Robert Stayton

      -
    • -

      table footnotes now -have their own table.footnote.properties -attribute set.

      -

      Modified: fo/footnote.xsl,1.23 - Robert -Stayton

      -
    • -

      Add qandaset to -root.elements.

      -

      Modified: fo/docbook.xsl,1.41 - Robert -Stayton

      -
    • -

      Added mode="page.sequence" to make -it easier to put content into a page sequence. First used for -qandaset.

      -

      Modified: fo/component.xsl,1.37 - Robert -Stayton

      -
    • -

      Implemented feature request -#1434408 to support formatting -of biblioentry.

      -

      Modified: fo/biblio.xsl,1.35 - Robert -Stayton

      -
    • -

      Added -biblioentry.properties.

      -

      Modified: fo/param.ent,1.97; -fo/param.xweb,1.110 - Robert Stayton

      -
    • -

      Support PTC/Arbortext -bookmarks

      -

      Modified: fo/docbook.xsl,1.40; fo/ptc.xsl,1.1 - Norman -Walsh

      -
    • -

      Added -table.footnote.properties to permit -table footnotes to format differently from regular -footnotes.

      -

      Modified: fo/param.ent,1.96; fo/param.xweb,1.109 - Robert -Stayton

      -
    • -

      Refactored table -templates to unify their processing and support all options in -all types. Now table and informaltable, in -both Cals and Html markup, use the same templates where possible, -and all support pgwide, rotation, and floats. There is also a -placeholder table.container template to -support wrapping a table in a layout table, -so the XEP table title "continued" -extension can be more easily implemented.

      -

      Modified: fo/formal.xsl,1.52; -fo/htmltbl.xsl,1.9; fo/table.xsl,1.48 - Robert -Stayton

      -
    • -

      Added new attribute set -toc.line.properties for controlling appearance of lines in -ToC/LoT

      -

      Modified: fo/autotoc.xsl,1.29; fo/param.ent,1.95; -fo/param.xweb,1.108 - Jirka Kosek

      -
    • -

      Added support for float to example -and equation. Added support for pgwide to -figure, example, and equation (the latter -two via a dbfo pgwide="1" processing -instruction).

      -

      Modified: fo/formal.xsl,1.51 - Robert -Stayton

      -
    • -

      Add pgwide.properties -attribute-set.

      -

      Modified: fo/param.ent,1.94; fo/param.xweb,1.107 - Robert -Stayton

      -
    • -

      Added refclass.suppress -param.

      -

      If the value of refclass.suppress is -non-zero, then display refclass contents is suppressed -in output. Affects HTML and FO output -only.

      -

      Modified: fo/param.ent,1.93; fo/param.xweb,1.106; html/param.ent,1.90; -html/param.xweb,1.99; params/refclass.suppress.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Improved support for -task subelements

      -

      Modified: fo/task.xsl,1.3; html/task.xsl,1.3 - -Jirka Kosek

      -
    • -

      Adjusted spacing around -K&R-formatted Funcdef and Paramdef -output such that it can more easily be discerned where one ends -and the other begins. Closes #1213264.

      -

      Modified: fo/synop.xsl,1.18 - -Michael(tm) Smith

      -
    • -

      Made handling of -paramdef/parameter in FO output consistent with that in HTML and -manpages output. Closes #1213259.

      -

      Modified: fo/synop.xsl,1.17 - Michael(tm) -Smith

      -
    • -

      Made handling of -Refnamediv consistent with formatting in HTML -and manpages output; specifically, changed so that -Refname (comma-separated list of multiple instances -found) is used (instead of Refentrytitle as -previously), then em-dash, then the Refpurpose. Closes -#1212562.

      -

      Modified: fo/refentry.xsl,1.30 - Michael(tm) -Smith

      -
    • -

      Added output of -Releaseinfo to recto titlepage ("copyright" -page) for Book in FO output. This makes it consistent -with HTML output. Closes #1327034. Thanks to Paul DuBois for -reporting.

      -

      Modified: fo/titlepage.templates.xml,1.28 - Michael(tm) -Smith

      -
    • -

      Added condition for setting -block-progression-dimension.minimum on table-row, instead of -height, when fop1.extensions is -non-zero. For an explanation of the reason for the change, -see: http://wiki.apache.org/xmlgraphics-fop/Troubleshooting/CommonLogMessages

      -

      Modified: fo/pagesetup.xsl,1.59 -- Michael(tm) Smith

      -
    • -

      Added new -refclass.suppress param for suppressing display -of Refclass in HTML and FO output. Did not add it to -manpages because manpages stylesheet is currently just silently -ignoring Refclass anyway. Closes request -#1461065. Thanks to Davor Ocelic (docelic) for -reporting.

      -

      Modified: fo/refentry.xsl,1.29; html/refentry.xsl,1.23 - -Michael(tm) Smith

      -
    • -

      Add support for keep-together PI -to informal objects.

      -

      Modified: fo/formal.xsl,1.50 - Robert -Stayton

      -
    • -

      Add support for -fop1.extensions.

      -

      Modified: fo/formal.xsl,1.49; -fo/graphics.xsl,1.44; fo/table.xsl,1.47 - Robert -Stayton

      -
    • -

      Add support for fop1 -bookmarks.

      -

      Modified: fo/docbook.xsl,1.39 - Robert -Stayton

      -
    • -

      Add fop1.extentions parameter to -add support for fop development version.

      -

      Modified: fo/param.ent,1.92; -fo/param.xweb,1.105 - Robert Stayton

      -
    • -

      Start supporting fop development -version, which will become fop version 1.

      -

      Modified: fo/fop1.xsl,1.1 - -Robert Stayton

      -
    • -

      Add template for task -in mode="xref-to".

      -

      Modified: fo/xref.xsl,1.63; html/xref.xsl,1.57 - Robert -Stayton

      -
    • -

      table footnotes now -also get footnote.properties -attribute-set.

      -

      Modified: fo/footnote.xsl,1.22 - Robert -Stayton

      -
    • -

      Added index.separator -named template to compute the separator punctuation based on -locale.

      -

      Modified: fo/autoidx.xsl,1.36 - Robert Stayton

      -
    • -

      Added support for link, -olink, and xref within OO -Classsynopsis and children. (Because DocBook NG/5 -allows it).

      -

      Modified: fo/synop.xsl,1.15; html/synop.xsl,1.19 - Michael(tm) -Smith

      -
    • -

      Support date as an -inline

      -

      Modified: fo/inline.xsl,1.43; html/inline.xsl,1.46 - Norman -Walsh

      -
    • -

      Added new parameter -keep.relative.image.uris

      -

      Modified: fo/param.ent,1.91; -fo/param.xweb,1.104; html/param.ent,1.87; html/param.xweb,1.96; -params/keep.relative.image.uris.xml,1.1 - Norman -Walsh

      -
    • -

      Map Unicode space characters -U+2000-U+200A to fo:leaders.

      -

      Modified: fo/docbook.xsl,1.38; -fo/passivetex.xsl,1.4; fo/spaces.xsl,1.1 - Jirka -Kosek

      -
    • -

      Output a real em dash for em-dash -dingbat (instead of two hypens).

      -

      Modified: fo/fo.xsl,1.7 - Michael(tm) -Smith

      -
    • -

      Support default label -width parameters for itemized and ordered lists

      -

      Modified: fo/lists.xsl,1.64; -fo/param.ent,1.90; fo/param.xweb,1.103; -params/itemizedlist.label.width.xml,1.1; -params/orderedlist.label.width.xml,1.1 - Norman -Walsh

      -
    • -

      Generate localized -title for Refsynopsisdiv if no -appropriate Title descendant found in source. Closes -#1212398. This change makes behavior for the Synopsis -title consistent with the behavior of HTML and -manpages output.

      -

      Also, added -xsl:use-attribute-sets="normal.para.spacing" to -block generated for Cmdsynopsis output. Previously, -that block had no spacing at all specified, which resulted it -being crammed up to closely to the Synopsis -head.

      -

      Modified: fo/refentry.xsl,1.28; fo/synop.xsl,1.13 - Michael(tm) -Smith

      -
    • -

      Added parameters to support -localization of index -item punctuation.

      -

      Modified: fo/autoidx.xsl,1.35 - Robert -Stayton

      -
    • -

      Added -index.number.separator, -index.range.separator, -and index.term.separator parameters to -support localization of punctuation in index -entries.

      -

      Modified: fo/param.ent,1.89; fo/param.xweb,1.102 - Robert -Stayton

      -
    • -

      Added "Cross References" -section in HTML doc (for consistency with the FO -doc). Also, moved the existing FO "Cross -References" section to follow the "Linking" -section.

      -

      Modified: fo/param.xweb,1.101; html/param.xweb,1.95 - -Michael(tm) Smith

      -
    • -

      Added ID attribues to all -Reference elements (e.g., id="tables" for the doc for -section on Table params). So pages for -all subsections of ref docs now have stable filenames instead -of arbitrary generated filenames.

      -

      Modified: fo/param.xweb,1.100; -html/param.xweb,1.94 - Michael(tm) Smith

      -
    • -

      Added two new parameters for -handling of multi-term -varlistentry elements:

      -

      variablelist.term.break.after: -When the variablelist.term.break.after is -non-zero, it will generate a line break after each -term multi-term -varlistentry.

      -

      variablelist.term.separator: -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is -placed after each term except the last. The default -is ", " (a comma followed by a space). To suppress rendering of -the separator, set the value of -variablelist.term.separator to the empty -string ("").

      -

      These parameters are primarily intended to be -useful if you have multi-term varlistentries that have long -terms.

      -

      Closes #1306676. Thanks to Sam Steingold for -providing an example "lots of long terms" doc that demonstrated -the value of having these options.

      -

      Also, added -normalize-space() call to processing of each -term.

      -

      This change affects all output formats -(HTML, PDF, manpages). The default behavior should pretty much -remain the same as before, but it is possible (as always) that -the change may introduce some -new bugginess.

      -

      Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; -fo/param.xweb,1.99; html/lists.xsl,1.48; html/param.ent,1.86; -html/param.xweb,1.93; manpages/lists.xsl,1.22; -manpages/param.ent,1.14; manpages/param.xweb,1.16; -params/variablelist.term.break.after.xml,1.1; -params/variablelist.term.separator.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Add sidebar titlepage -placeholder attset for styles.

      -

      Modified: fo/titlepage.xsl,1.37 - Robert -Stayton

      -
    • -

      Add titlepage for -sidebar.

      -

      Modified: fo/titlepage.templates.xml,1.27 - Robert -Stayton

      -
    • -

      Implemented RFE -#1292615.

      -

      Added bunch of new parameters (attribute sets) -that affect list presentation: list.block.properties, -itemizedlist.properties, orderedlist.properties, -itemizedlist.label.properties and -orderedlist.label.properties. Default behaviour -of stylesheets has not been changed but further customizations will be -much more easier.

      -

      Modified: fo/lists.xsl,1.61; fo/param.ent,1.87; -fo/param.xweb,1.98; params/itemizedlist.label.properties.xml,1.1; -params/itemizedlist.properties.xml,1.1; -params/list.block.properties.xml,1.1; -params/orderedlist.label.properties.xml,1.1; -params/orderedlist.properties.xml,1.1 - Jirka -Kosek

      -
    • -

      Implemented RFE -#1242092.

      -

      You can enable crop marks in your document by -setting crop.marks=1 and xep.extensions=1. Appearance of crop -marks can be controlled by parameters -crop.mark.bleed (6pt), -crop.mark.offset (24pt) and -crop.mark.width (0.5pt).

      -

      Also there -is new named template called user-xep-pis. You can overwrite it in -order to produce some PIs that can control XEP as described in -http://www.renderx.com/reference.html#Output_Formats

      -

      Modified: fo/docbook.xsl,1.36; -fo/param.ent,1.86; fo/param.xweb,1.97; fo/xep.xsl,1.23; -params/crop.mark.bleed.xml,1.1; params/crop.mark.offset.xml,1.1; -params/crop.mark.width.xml,1.1; params/crop.marks.xml,1.1 - Jirka -Kosek

      -
    -
    - -

    HTML

    - -

    The following changes have been made to the - html code - since the 1.69.1 release.

    -
    • -

      implemented -index.method parameter and three -methods.

      -

      Modified: html/autoidx.xsl,1.28 - Robert -Stayton

      -
    • -

      added index.method -parameter to support 3 indexing methods.

      -

      Modified: html/param.ent,1.94; -html/param.xweb,1.103 - Robert Stayton

      -
    • -

      Implemented feature request -#1072510 as a processing instruction to permit including external -HTML content into HTML output.

      -

      Modified: html/pi.xsl,1.9 - Robert -Stayton

      -
    • -

      Added new parameter -chunk.tocs.and.lots.has.title which -controls presence of title in a separate chunk with -ToC/LoT. Disabling title can be very useful if you are -generating frameset output (well, yes those frames, but some customers -really want them ;-).

      -

      Modified: html/chunk-code.xsl,1.15; -html/param.ent,1.93; html/param.xweb,1.102; -params/chunk.tocs.and.lots.has.title.xml,1.1 - Jirka -Kosek

      -
    • -

      Support dbhtml/dbfo start PI for -orderedlist numbering in both HTML and -FO

      -

      Modified: common/common.xsl,1.61; html/lists.xsl,1.50 - Norman -Walsh

      -
    • -

      Allow ToC without -title also for set and -book.

      -

      Modified: html/autotoc.xsl,1.37; html/division.xsl,1.12 - -Jirka Kosek

      -
    • -

      Implemented floats uniformly for -figure, example, equation -and informalfigure, informalexample, and -informalequation.

      -

      Modified: html/formal.xsl,1.22 - Robert -Stayton

      -
    • -

      Added the -autotoc.label.in.hyperlink param.

      -

      If the value -of autotoc.label.in.hyperlink is non-zero, labels -are included in hyperlinked titles in the TOC. If it -is instead zero, labels are still displayed prior to the -hyperlinked titles, but are not hyperlinked along with the -titles.

      -

      Closes patch #1065868. Thanks to anatoly techtonik -for the patch.

      -

      Modified: html/autotoc.xsl,1.36; html/param.ent,1.92; -html/param.xweb,1.101; params/autotoc.label.in.hyperlink.xml,1.1 - -Michael(tm) Smith

      -
    • -

      Added two new params: -html.head.legalnotice.link.types -and html.head.legalnotice.link.multiple.

      -

      If -the value of the generate.legalnotice.link is -non-zero, then the stylesheet generates (in the head -section of the HTML source) either a single HTML -link element or, if the value of -the html.head.legalnotice.link.multiple is -non-zero, one link element for each link -type specified. Each link has the -following attributes:

      -

      - a rel attribute whose value -is derived from the value of -html.head.legalnotice.link.types

      -

      - -an href attribute whose value is set to the URL of the file -containing the legalnotice

      -

      - a title -attribute whose value is set to the title of the -corresponding legalnotice (or a title -programatically determined by the stylesheet)

      -

      For -example:

      -

      <link rel="copyright" -href="ln-id2524073.html" title="Legal Notice">

      -

      Closes -#1476450. Thanks to Sam Steingold.

      -

      Modified: html/chunk-common.xsl,1.45; -html/param.ent,1.91; html/param.xweb,1.100; -params/generate.legalnotice.link.xml,1.4; -params/html.head.legalnotice.link.multiple.xml,1.1; -params/html.head.legalnotice.link.types.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added refclass.suppress -param.

      -

      If the value of refclass.suppress is -non-zero, then display refclass contents is suppressed -in output. Affects HTML and FO output -only.

      -

      Modified: fo/param.ent,1.93; fo/param.xweb,1.106; html/param.ent,1.90; -html/param.xweb,1.99; params/refclass.suppress.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Improved support for -task subelements

      -

      Modified: fo/task.xsl,1.3; html/task.xsl,1.3 - -Jirka Kosek

      -
    • -

      Added new -refclass.suppress param for suppressing display -of Refclass in HTML and FO output. Did not add it to -manpages because manpages stylesheet is currently just silently -ignoring Refclass anyway. Closes request -#1461065. Thanks to Davor Ocelic (docelic) for -reporting.

      -

      Modified: fo/refentry.xsl,1.29; html/refentry.xsl,1.23 - -Michael(tm) Smith

      -
    • -

      Process alt text with -normalize-space(). Replace tab indents with -spaces.

      -

      Modified: html/graphics.xsl,1.57 - Robert -Stayton

      -
    • -

      Content of citation -element is automatically linked to the bibliographic entry -with the corresponding abbrev.

      -

      Modified: html/biblio.xsl,1.26; -html/inline.xsl,1.47; html/xref.xsl,1.58 - Jirka -Kosek

      -
    • -

      Add template for task -in mode="xref-to".

      -

      Modified: fo/xref.xsl,1.63; html/xref.xsl,1.57 - Robert -Stayton

      -
    • -

      Suppress ID warnings if the -.warnings parameter is 0

      -

      Modified: html/html.xsl,1.17 - Norman -Walsh

      -
    • -

      Add support for floatstyle to -figure.

      -

      Modified: html/formal.xsl,1.21 - Robert -Stayton

      -
    • -

      Handling of xref to -area/areaset need support in extensions code also. I currently have no -time to touch extensions code, so code is here to be enabled when -extension is fixed also.

      -

      Modified: html/xref.xsl,1.56 - Jirka -Kosek

      -
    • -

      Added 3 parameters for overriding -gentext for index -punctuation.

      -

      Modified: html/param.ent,1.89; html/param.xweb,1.98 - Robert -Stayton

      -
    • -

      Added parameters to support -localization of index item punctuation. Added -index.separator named template to compute -the separator punctuation based on -locale.

      -

      Modified: html/autoidx.xsl,1.27 - Robert -Stayton

      -
    • -

      Added a <div -class="{$class}-contents"> wrapper around output of contents -of all formal objects. Also, added an optional <br -class="{class}-break"/> linebreak after all formal -objects.

      -

      WARNING: Because this change places an additional -DIV between the DIV wrapper for the equation and the -equation contents, it may break some existing CSS -stylesheets that have been created with the assumption that there -would never be an intervening DIV there.

      -

      The following is -an example of what Equation output looks like as a -result of the changes described above.

      -

      <div -class="equation"> <a name="three" -id="three"></a>

      -

      <p -class="title"><b>(1.3)</b></p>

      -

      -<div class="equation-contents"> <span -class="mathphrase">1+1=3</span> -</div> </div><br -class="equation-break">

      -

      Rationale: These changes allow -CSS control of the placement of the formal-object -title relative to the formal-object -contents. For example, using the CSS "float" property -enables the title and contents to be rendered on the -same line. Example stylesheet:

      -

      .equation -{ margin-top: 20px; margin-bottom: 20px; } -.equation-contents { float: left; }

      -

      -.equation .title { margin-top: 0; -float: right; margin-right: 200px; }

      -

      -.equation .title b { font-weight: -normal; }

      -

      .equation-break { clear: both; -}

      -

      Note that the purpose of the ".equation-break" class is -to provide a way to clear off the floats.

      -

      If you want -to instead have the equation title rendered to -the left of the equation contents, you can do -something like this:

      -

      .equation { -margin-top: 20px; width: 300px; margin-bottom: 20px; -} .equation-contents { float: right; }

      -

      -.equation .title { margin-top: 0; -float: left; margin-right: 200px; }

      -

      -.equation .title b { font-weight: -normal; }

      -

      .equation-break { clear: both; -}

      -

      Modified: html/formal.xsl,1.20 - Michael(tm) Smith

      -
    • -

      Added a chunker.output.quiet -top-level parameter so that the chunker can be made quiet by -default

      -

      Modified: html/chunker.xsl,1.26 - Norman Walsh

      -
    • -

      Added support for link, -olink, and xref within OO -Classsynopsis and children. (Because DocBook NG/5 -allows it).

      -

      Modified: fo/synop.xsl,1.15; html/synop.xsl,1.19 - Michael(tm) -Smith

      -
    • -

      New parameter: -id.warnings. If non-zero, warnings are -generated for titled objects that don't have titles. True by default; -I wonder if this will be too aggressive?

      -

      Modified: html/biblio.xsl,1.25; -html/component.xsl,1.27; html/division.xsl,1.11; html/formal.xsl,1.19; -html/glossary.xsl,1.20; html/html.xsl,1.13; html/index.xsl,1.16; -html/param.ent,1.88; html/param.xweb,1.97; html/refentry.xsl,1.22; -html/sections.xsl,1.30; params/id.warnings.xml,1.1 - Norman -Walsh

      -
    • -

      If the -keep.relative.image.uris parameter is true, -don't use the absolute URI (as calculated from xml:base) in -the img src attribute, us the value the author -specified. Note that we still have to calculate the absolute -filename for use in the image intrinsics -extension.

      -

      Modified: html/graphics.xsl,1.56 - Norman -Walsh

      -
    • -

      Support date as an -inline

      -

      Modified: fo/inline.xsl,1.43; html/inline.xsl,1.46 - Norman -Walsh

      -
    • -

      Added new parameter -keep.relative.image.uris

      -

      Modified: fo/param.ent,1.91; -fo/param.xweb,1.104; html/param.ent,1.87; html/param.xweb,1.96; -params/keep.relative.image.uris.xml,1.1 - Norman -Walsh

      -
    • -

      Added two new parameters for -handling of multi-term -varlistentry elements:

      -

      variablelist.term.break.after: -When the variablelist.term.break.after is -non-zero, it will generate a line break after each -term multi-term -varlistentry.

      -

      variablelist.term.separator: -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is -placed after each term except the last. The default -is ", " (a comma followed by a space). To suppress rendering of -the separator, set the value of -variablelist.term.separator to the empty -string ("").

      -

      These parameters are primarily intended to be -useful if you have multi-term varlistentries that have long -terms.

      -

      Closes #1306676. Thanks to Sam Steingold for -providing an example "lots of long terms" doc that demonstrated -the value of having these options.

      -

      Also, added -normalize-space() call to processing of each -term.

      -

      This change affects all output formats -(HTML, PDF, manpages). The default behavior should pretty much -remain the same as before, but it is possible (as always) that -the change may introduce some -new bugginess.

      -

      Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; -fo/param.xweb,1.99; html/lists.xsl,1.48; html/param.ent,1.86; -html/param.xweb,1.93; manpages/lists.xsl,1.22; -manpages/param.ent,1.14; manpages/param.xweb,1.16; -params/variablelist.term.break.after.xml,1.1; -params/variablelist.term.separator.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added "wrapper-name" param to -inline.charseq named template, enabling it to output inlines -other than just "span". Acronym and Abbrev -templates now use inline.charseq to output HTML -"acronym" and "abbr" elements (instead of -"span"). Closes #1305468. Thanks to Sam Steingold for suggesting -the change.

      -

      Modified: html/inline.xsl,1.45 - Michael(tm) -Smith

      -
    -
    - -

    Manpages

    - -

    The following changes have been made to the - manpages code - since the 1.69.1 release.

    -
    • -

      Added the following -params:

      -

      - man.indent.width (string-valued) - -man.indent.refsect (boolean) - man.indent.blurbs (boolean) -- man.indent.lists (boolean) - man.indent.verbatims -(boolean)

      -

      Note that in earlier snapshots, man.indent.width -was named man.indentation.default.value and the boolean params -had names like man.indentation.*.adjust. Also the -man.indent.blurbs param was called man.indentation.authors.adjust -(or something).

      -

      The behavior now is: If the value of a -particular man.indent.* boolean param is non-zero, the -corresponding contents (refsect*, list items, -authorblurb/personblurb, vervatims) are displayed with a left -margin indented by a width equal to the value -of man.indent.width.

      -

      Modified: params/man.indent.blurbs.xml,1.1; -manpages/docbook.xsl,1.74; manpages/info.xsl,1.20; -manpages/lists.xsl,1.30; manpages/other.xsl,1.20; -manpages/param.ent,1.22; manpages/param.xweb,1.24; -manpages/refentry.xsl,1.14; params/man.indent.lists.xml,1.1; -params/man.indent.refsect.xml,1.1; -params/man.indent.verbatims.xml,1.1; params/man.indent.width.xml,1.1 - -Michael(tm) Smith

      -
    • -

      Added -man.table.footnotes.divider param.

      -

      In each -table that contains footenotes, the string specified -by the man.table.footnotes.divider parameter is output -before the list of footnotes for the -table.

      -

      Modified: manpages/docbook.xsl,1.73; -manpages/links.xsl,1.6; manpages/param.ent,1.21; -manpages/param.xweb,1.23; params/man.table.footnotes.divider.xml,1.1 - -Michael(tm) Smith

      -
    • -

      Added the -man.output.in.separate.dir, -man.output.base.dir, -and man.output.subdirs.enabled parameters.

      -

      The -man.output.base.dir parameter specifies the -base directory into which man-page files are -output. The man.output.subdirs.enabled parameter controls whether -the files are output in subdirectories within the base -directory.

      -

      The values of the -man.output.base.dir -and man.output.subdirs.enabled parameters are used only if the -value of man.output.in.separate.dir parameter is non-zero. If the -value of man.output.in.separate.dir is zero, man-page files are -not output in a separate -directory.

      -

      Modified: manpages/docbook.xsl,1.72; manpages/param.ent,1.20; -manpages/param.xweb,1.22; params/man.output.base.dir.xml,1.1; -params/man.output.in.separate.dir.xml,1.1; -params/man.output.subdirs.enabled.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added -man.font.table.headings and -man.font.table.title params, for -controlling font in table headings and -titles.

      -

      Modified: manpages/docbook.xsl,1.71; manpages/param.ent,1.19; -manpages/param.xweb,1.21; params/man.font.table.headings.xml,1.1; -params/man.font.table.title.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added -man.font.funcsynopsisinfo and -man.font.funcprototype params, for specifying the roff -font (for example, BI, B, I) for funcsynopsisinfo and -funcprototype output.

      -

      Modified: manpages/block.xsl,1.19; -manpages/docbook.xsl,1.69; manpages/param.ent,1.18; -manpages/param.xweb,1.20; manpages/synop.xsl,1.29; -manpages/table.xsl,1.21; params/man.font.funcprototype.xml,1.1; -params/man.font.funcsynopsisinfo.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added -man.segtitle.suppress param.

      -

      If the value of -man.segtitle.suppress is non-zero, then display -of segtitle contents is suppressed in -output.

      -

      Modified: manpages/docbook.xsl,1.68; manpages/param.ent,1.17; -manpages/param.xweb,1.19; params/man.segtitle.suppress.xml,1.1 - -Michael(tm) Smith

      -
    • -

      Added -man.output.manifest.enabled and -man.output.manifest.filename params.

      -

      If -man.output.manifest.enabled is non-zero, a list -of filenames for man pages generated by the stylesheet -transformation is written to the file named by -man.output.manifest.filename

      -

      Modified: manpages/docbook.xsl,1.67; -manpages/other.xsl,1.19; manpages/param.ent,1.16; -manpages/param.xweb,1.18; params/man.output.manifest.enabled.xml,1.1; -params/man.output.manifest.filename.xml,1.1; -tools/make/Makefile.DocBook,1.4 - Michael(tm) -Smith

      -
    • -

      Added -refentry.meta.get.quietly param.

      -

      If zero (the -default), notes and warnings about "missing" markup are generated -during gathering of refentry metadata. If -non-zero, the metadata is gathered "quietly" -- that is, the -notes and warnings are suppressed.

      -

      NOTE: If you are -processing a large amount of refentry content, you -may be able to speed up processing significantly by setting a -non-zero value for -refentry.meta.get.quietly.

      -

      Modified: common/refentry.xsl,1.17; -manpages/param.ent,1.15; manpages/param.xweb,1.17; -params/refentry.meta.get.quietly.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Changed names of all boolean -indentation params to man.indent.* Also discarded individual -man.indent.*.value params and switched to just using a common -man.indent.width param (3n by default).

      -

      Modified: manpages/docbook.xsl,1.66; -manpages/info.xsl,1.19; manpages/lists.xsl,1.29; -manpages/other.xsl,1.18; manpages/refentry.xsl,1.13 - Michael(tm) -Smith

      -
    • -

      Added boolean -man.output.in.separate.dir param, to control whether or not man -files are output in separate directory.

      -

      Modified: manpages/docbook.xsl,1.65; -manpages/utility.xsl,1.14 - Michael(tm) Smith

      -
    • -

      Added options for controlling -indentation of verbatim output. Controlled through the -man.indentation.verbatims.adjust -and man.indentation.verbatims.value params. Closes -#1242997

      -

      Modified: manpages/block.xsl,1.15; manpages/docbook.xsl,1.64 - -Michael(tm) Smith

      -
    • -

      Added options for controlling -indentation in lists and in *blurb output in the AUTHORS -section. Controlled through -the man.indentation.lists.adjust, -man.indentation.lists.value, man.indentation.authors.adjust, and -man.indentation.authors.value parameters. Default is 3 characters -(instead of the roff default of 8 characters). Closes -#1449369.

      -

      Also, removed the indent that was being set on -informalexample outuput. I will instead add an option -for indenting verbatims, which I think is what the -informalexample indent was intended -for originally.

      -

      Modified: manpages/block.xsl,1.14; -manpages/docbook.xsl,1.63; manpages/info.xsl,1.18; -manpages/lists.xsl,1.28 - Michael(tm) Smith

      -
    • -

      Changed line-spacing call before -synopfragment to use ".sp -1n" ("n" units specified) -instead of plain ".sp -1"

      -

      Modified: manpages/synop.xsl,1.28 - Michael(tm) -Smith

      -
    • -

      Added support for writing man -files into a specific output directory and into appropriate -subdirectories within that output directory. Controlled through -the man.base.dir parameter (similar to the -base.dir support in the HTML stylesheet) and -the man.subdirs.enabled parameter, which automatically determines -the name of an appropriate subdir (for example, man/man7, -man/man1, etc.) based on the section number/manvolnum -of the source Refentry.

      -

      Closes #1255036 and -#1170317. Thanks to Denis Bradford for the original feature -request, and to Costin Stroie for submitting a patch that was -very helpful in implementing the -support.

      -

      Modified: manpages/docbook.xsl,1.62; manpages/utility.xsl,1.13 - -Michael(tm) Smith

      -
    • -

      Refined XPath statements and -notification messages for refentry metadata -handling.

      -

      Modified: common/common.xsl,1.59; common/refentry.xsl,1.14; -manpages/docbook.xsl,1.61; manpages/other.xsl,1.17 - Michael(tm) -Smith

      -
    • -

      Added support for -copyright and legalnotice. The manpages -stylesheets now output a COPYRIGHT section, -after the AUTHORS section, if a copyright -or legalnotice is found in the source. The -section contains the copyright contents followed -by the legalnotice contents. Closes -#1450209.

      -

      Modified: manpages/docbook.xsl,1.59; manpages/info.xsl,1.17 - -Michael(tm) Smith

      -
    • -

      Drastically reworked all of the -XPath expressions used in refentry metadata gathering --- completely removed $parentinfo and turned $info into a set of -nodes that includes the *info contents of the Refentry -plus the *info contents all all of its ancestor elements. The -basic XPath expression now used throughout is (using the example -of checking for a date):

      -

      -(($info[//date])[last()]/date)[1].

      -

      That selects the "last" -*info/date date in document order -- that is, the one -eitther on the Refentry itself or on the -closest ancestor to the Refentry.

      -

      It's -likely this change may break some things; may need to pick up -some pieces later.

      -

      Also, changed the default value for the -man.th.extra2.max.length from 40 to -30.

      -

      Modified: common/common.xsl,1.58; common/refentry.xsl,1.7; -params/man.th.extra2.max.length.xml,1.2; -params/refentry.date.profile.xml,1.2; -params/refentry.manual.profile.xml,1.2; -params/refentry.source.name.profile.xml,1.2; -params/refentry.version.profile.xml,1.2; manpages/docbook.xsl,1.58; -manpages/other.xsl,1.15 - Michael(tm) Smith

      -
    • -

      Added support for DocBook 5 -namespace-stripping in manpages stylesheet. Closes request -#1210692.

      -

      Modified: common/common.xsl,1.56; manpages/docbook.xsl,1.57 - -Michael(tm) Smith

      -
    • -

      Fixed handling of table -footnotes. With this checkin, the table support in the -manpages stylesheet is now basically feature complete. So this -change closes request #619532, "No support for tables" -- the -oldest currently open manpages feature request, submitted by Ben -Secrest (blsecres) on 2002-10-07. Congratulations to me [patting -myself on the back].

      -

      Modified: manpages/block.xsl,1.11; -manpages/docbook.xsl,1.55; manpages/table.xsl,1.15 - Michael(tm) -Smith

      -
    • -

      Added handling for -table titles. Also fixed handling of nested tables; -nest tables are now "extracted" and displayed just after their -parent tables.

      -

      Modified: manpages/docbook.xsl,1.54; manpages/table.xsl,1.14 -- Michael(tm) Smith

      -
    • -

      Added option for turning off bold -formatting in Funcsynopsis. Boldface formatting in -function synopsis is mandated in the -man(7) man page and is used almost universally in existing man -pages. Despite that, it really does look like crap to have an -entire Funcsynopsis output in bold, so I added params -for turning off the bold formatting and/or replacing it with a -different roff special font (e.g., "RI" for alternating -roman/italic instead of the default "BI" for alternating -bold/italic). The new params -are "man.funcprototype.font" and -"man.funcsynopsisinfo.font". To be documented -later.

      -

      Closes #1452247. Thanks to Joe Orton for the feature -request.

      -

      Modified: params/man.string.subst.map.xml,1.16; -manpages/block.xsl,1.10; manpages/docbook.xsl,1.51; -manpages/inline.xsl,1.16; manpages/synop.xsl,1.27 - Michael(tm) -Smith

      -
    • -

      Use AUTHORS instead of -AUTHOR if we have multiple people to attribute. Also, -fixed checking such that we generate -author section even if we don't have an -author (as long as there is at least one other -person/entity we can put in the -section). Also adjusted assembly of content for -Author metainfo field such that we now not only use -author, but try to find a "best match" if we can't -find an author name to put there.

      -

      Closes -#1233592. Thanks to Sam Steingold for the -request.

      -

      Modified: manpages/info.xsl,1.12 - Michael(tm) -Smith

      -
    • -

      Changes for request #1243027, -"Impove handling of AUTHOR section." This -adds support for Collab, Corpauthor, Corpcredt, -Orgname, Publishername, and -Publisher. Also adds support for output -of Affiliation and its children, and support for using -gentext strings for auto-attributing roles (Author, -Editor, Publisher, Translator, etc.). Also -did a lot of code cleanup and modularization of all the -AUTHOR handling code. And fixed a bug that was causing -Author info to not be picked up correctly -for metainfo comment we embed in man-page -source.

      -

      Modified: manpages/info.xsl,1.11 - Michael(tm) -Smith

      -
    • -

      Support bold output for -"emphasis remap='B'". (because Eric Raymond's -doclifter(1) tool converts groff source marked up with ".B" -request or "\fB" escapes to DocBook "emphasis -remap='B'".)

      -

      Modified: manpages/inline.xsl,1.14 - Michael(tm) -Smith

      -
    • -

      Added support for -Segmentedlist. Details: Output is tabular, with no -option for "list" type output. Output for Segtitle -elements can be supressed by -setting man.segtitle.suppress. If Segtitle -content is output, it is rendered in italic type (not bold -because not all terminals support bold and so italic ensures the -stand out on those terminals). Extra space (.sp line) at end of -table code ensures that it gets handled correctly in -the case where its source is the child of a Para. -Closes feature-request #1400097. Thanks to Daniel Leidert for the -patch and push, and to Alastair Rankine for filing the original -feature request.

      -

      Modified: manpages/lists.xsl,1.23; -manpages/utility.xsl,1.10 - Michael(tm) Smith

      -
    • -

      Improved handling or -Author/Editor/Othercredit.

      -

      Reworked content of -(non-visible) comment added at top of each page (metadata -stuff).

      -

      Added support for generating a -manifest file (useful for cleaning up -after builds, etc.)

      -

      Modified: manpages/docbook.xsl,1.46; -manpages/info.xsl,1.9; manpages/other.xsl,1.12; -manpages/utility.xsl,1.6 - Michael(tm) Smith

      -
    • -

      Added two new parameters for -handling of multi-term -varlistentry elements:

      -

      variablelist.term.break.after: -When the variablelist.term.break.after is -non-zero, it will generate a line break after each -term multi-term -varlistentry.

      -

      variablelist.term.separator: -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is -placed after each term except the last. The default -is ", " (a comma followed by a space). To suppress rendering of -the separator, set the value of -variablelist.term.separator to the empty -string ("").

      -

      These parameters are primarily intended to be -useful if you have multi-term varlistentries that have long -terms.

      -

      Closes #1306676. Thanks to Sam Steingold for -providing an example "lots of long terms" doc that demonstrated -the value of having these options.

      -

      Also, added -normalize-space() call to processing of each -term.

      -

      This change affects all output formats -(HTML, PDF, manpages). The default behavior should pretty much -remain the same as before, but it is possible (as always) that -the change may introduce some -new bugginess.

      -

      Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; -fo/param.xweb,1.99; html/lists.xsl,1.48; html/param.ent,1.86; -html/param.xweb,1.93; manpages/lists.xsl,1.22; -manpages/param.ent,1.14; manpages/param.xweb,1.16; -params/variablelist.term.break.after.xml,1.1; -params/variablelist.term.separator.xml,1.1 - Michael(tm) -Smith

      -
    -
    - -

    Params

    - -

    The following changes have been made to the - params code - since the 1.69.1 release.

    -
    • -

      New parameters to set -header/footer table minimum -height.

      -

      Modified: params/footer.table.height.xml,1.1; -params/header.table.height.xml,1.1 - Robert -Stayton

      -
    • -

      Support multiple indexing methods -for different languages.

      -

      Modified: params/index.method.xml,1.1 - Robert -Stayton

      -
    • -

      Remove qandaset and -qandadiv from generate.toc for fo -output because formerly it wasn't working, but now it is and -the default behavior should stay the -same.

      -

      Modified: params/generate.toc.xml,1.8 - Robert -Stayton

      -
    • -

      add support for page number -references to link element -too.

      -

      Modified: params/insert.link.page.number.xml,1.1 - Robert -Stayton

      -
    • -

      Add support for more characters to -hyphen on when ulink.hyphenate is turned -on.

      -

      Modified: params/ulink.hyphenate.chars.xml,1.1; -params/ulink.hyphenate.xml,1.3 - Robert Stayton

      -
    • -

      New attribute-set to format -biblioentry and -bibliomixed.

      -

      Modified: params/biblioentry.properties.xml,1.1 - -Robert Stayton

      -
    • -

      Added new parameter -chunk.tocs.and.lots.has.title which -controls presence of title in a separate chunk with -ToC/LoT. Disabling title can be very useful if you are -generating frameset output (well, yes those frames, but some customers -really want them ;-).

      -

      Modified: html/chunk-code.xsl,1.15; -html/param.ent,1.93; html/param.xweb,1.102; -params/chunk.tocs.and.lots.has.title.xml,1.1 - Jirka -Kosek

      -
    • -

      Added new attribute set -toc.line.properties for controlling appearance of lines in -ToC/LoT

      -

      Modified: params/toc.line.properties.xml,1.1 - Jirka -Kosek

      -
    • -

      Allow table footnotes -to have different properties from regular -footnotes.

      -

      Modified: params/table.footnote.properties.xml,1.1 - Robert -Stayton

      -
    • -

      Set properties for pgwide="1" -objects.

      -

      Modified: params/pgwide.properties.xml,1.1 - Robert -Stayton

      -
    • -

      Added the -autotoc.label.in.hyperlink param.

      -

      If the value -of autotoc.label.in.hyperlink is non-zero, labels -are included in hyperlinked titles in the TOC. If it -is instead zero, labels are still displayed prior to the -hyperlinked titles, but are not hyperlinked along with the -titles.

      -

      Closes patch #1065868. Thanks to anatoly techtonik -for the patch.

      -

      Modified: html/autotoc.xsl,1.36; html/param.ent,1.92; -html/param.xweb,1.101; params/autotoc.label.in.hyperlink.xml,1.1 - -Michael(tm) Smith

      -
    • -

      Added two new params: -html.head.legalnotice.link.types -and html.head.legalnotice.link.multiple.

      -

      If -the value of the generate.legalnotice.link is -non-zero, then the stylesheet generates (in the head -section of the HTML source) either a single HTML -link element or, if the value of -the html.head.legalnotice.link.multiple is -non-zero, one link element for each link -type specified. Each link has the -following attributes:

      -

      - a rel attribute whose value -is derived from the value of -html.head.legalnotice.link.types

      -

      - -an href attribute whose value is set to the URL of the file -containing the legalnotice

      -

      - a title -attribute whose value is set to the title of the -corresponding legalnotice (or a title -programatically determined by the stylesheet)

      -

      For -example:

      -

      <link rel="copyright" -href="ln-id2524073.html" title="Legal Notice">

      -

      Closes -#1476450. Thanks to Sam Steingold.

      -

      Modified: html/chunk-common.xsl,1.45; -html/param.ent,1.91; html/param.xweb,1.100; -params/generate.legalnotice.link.xml,1.4; -params/html.head.legalnotice.link.multiple.xml,1.1; -params/html.head.legalnotice.link.types.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added the following -params:

      -

      - man.indent.width (string-valued) - -man.indent.refsect (boolean) - man.indent.blurbs (boolean) -- man.indent.lists (boolean) - man.indent.verbatims -(boolean)

      -

      Note that in earlier snapshots, man.indent.width -was named man.indentation.default.value and the boolean params -had names like man.indentation.*.adjust. Also the -man.indent.blurbs param was called man.indentation.authors.adjust -(or something).

      -

      The behavior now is: If the value of a -particular man.indent.* boolean param is non-zero, the -corresponding contents (refsect*, list items, -authorblurb/personblurb, vervatims) are displayed with a left -margin indented by a width equal to the value -of man.indent.width.

      -

      Modified: params/man.indent.blurbs.xml,1.1; -manpages/docbook.xsl,1.74; manpages/info.xsl,1.20; -manpages/lists.xsl,1.30; manpages/other.xsl,1.20; -manpages/param.ent,1.22; manpages/param.xweb,1.24; -manpages/refentry.xsl,1.14; params/man.indent.lists.xml,1.1; -params/man.indent.refsect.xml,1.1; -params/man.indent.verbatims.xml,1.1; params/man.indent.width.xml,1.1 - -Michael(tm) Smith

      -
    • -

      Added -man.table.footnotes.divider param.

      -

      In each -table that contains footenotes, the string specified -by the man.table.footnotes.divider parameter is output -before the list of footnotes for the -table.

      -

      Modified: manpages/docbook.xsl,1.73; -manpages/links.xsl,1.6; manpages/param.ent,1.21; -manpages/param.xweb,1.23; params/man.table.footnotes.divider.xml,1.1 - -Michael(tm) Smith

      -
    • -

      Added the -man.output.in.separate.dir, -man.output.base.dir, -and man.output.subdirs.enabled parameters.

      -

      The -man.output.base.dir parameter specifies the -base directory into which man-page files are -output. The man.output.subdirs.enabled parameter controls whether -the files are output in subdirectories within the base -directory.

      -

      The values of the -man.output.base.dir -and man.output.subdirs.enabled parameters are used only if the -value of man.output.in.separate.dir parameter is non-zero. If the -value of man.output.in.separate.dir is zero, man-page files are -not output in a separate -directory.

      -

      Modified: manpages/docbook.xsl,1.72; manpages/param.ent,1.20; -manpages/param.xweb,1.22; params/man.output.base.dir.xml,1.1; -params/man.output.in.separate.dir.xml,1.1; -params/man.output.subdirs.enabled.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added -man.font.table.headings and -man.font.table.title params, for -controlling font in table headings and -titles.

      -

      Modified: manpages/docbook.xsl,1.71; manpages/param.ent,1.19; -manpages/param.xweb,1.21; params/man.font.table.headings.xml,1.1; -params/man.font.table.title.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added -man.font.funcsynopsisinfo and -man.font.funcprototype params, for specifying the roff -font (for example, BI, B, I) for funcsynopsisinfo and -funcprototype output.

      -

      Modified: manpages/block.xsl,1.19; -manpages/docbook.xsl,1.69; manpages/param.ent,1.18; -manpages/param.xweb,1.20; manpages/synop.xsl,1.29; -manpages/table.xsl,1.21; params/man.font.funcprototype.xml,1.1; -params/man.font.funcsynopsisinfo.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Changed to select="0" in -refclass.suppress (instead of -..>0</..)

      -

      Modified: params/refclass.suppress.xml,1.3 - Michael(tm) -Smith

      -
    • -

      Added -man.segtitle.suppress param.

      -

      If the value of -man.segtitle.suppress is non-zero, then display -of segtitle contents is suppressed in -output.

      -

      Modified: manpages/docbook.xsl,1.68; manpages/param.ent,1.17; -manpages/param.xweb,1.19; params/man.segtitle.suppress.xml,1.1 - -Michael(tm) Smith

      -
    • -

      Added -man.output.manifest.enabled and -man.output.manifest.filename params.

      -

      If -man.output.manifest.enabled is non-zero, a list -of filenames for man pages generated by the stylesheet -transformation is written to the file named by -man.output.manifest.filename

      -

      Modified: manpages/docbook.xsl,1.67; -manpages/other.xsl,1.19; manpages/param.ent,1.16; -manpages/param.xweb,1.18; params/man.output.manifest.enabled.xml,1.1; -params/man.output.manifest.filename.xml,1.1; -tools/make/Makefile.DocBook,1.4 - Michael(tm) -Smith

      -
    • -

      Added refclass.suppress -param.

      -

      If the value of refclass.suppress is -non-zero, then display refclass contents is suppressed -in output. Affects HTML and FO output -only.

      -

      Modified: fo/param.ent,1.93; fo/param.xweb,1.106; html/param.ent,1.90; -html/param.xweb,1.99; params/refclass.suppress.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added -refentry.meta.get.quietly param.

      -

      If zero (the -default), notes and warnings about "missing" markup are generated -during gathering of refentry metadata. If -non-zero, the metadata is gathered "quietly" -- that is, the -notes and warnings are suppressed.

      -

      NOTE: If you are -processing a large amount of refentry content, you -may be able to speed up processing significantly by setting a -non-zero value for -refentry.meta.get.quietly.

      -

      Modified: common/refentry.xsl,1.17; -manpages/param.ent,1.15; manpages/param.xweb,1.17; -params/refentry.meta.get.quietly.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Added support for "software" and -"sectdesc" class values on refmiscinfo; "software" is -treated identically to "source", and "setdesc" is treated -identically to "manual".

      -

      Modified: common/refentry.xsl,1.10; -params/man.th.extra2.max.length.xml,1.3; -params/refentry.source.name.profile.xml,1.4 - Michael(tm) -Smith

      -
    • -

      Drastically reworked all of the -XPath expressions used in refentry metadata gathering --- completely removed $parentinfo and turned $info into a set of -nodes that includes the *info contents of the Refentry -plus the *info contents all all of its ancestor elements. The -basic XPath expression now used throughout is (using the example -of checking for a date):

      -

      -(($info[//date])[last()]/date)[1].

      -

      That selects the "last" -*info/date date in document order -- that is, the one -eitther on the Refentry itself or on the -closest ancestor to the Refentry.

      -

      It's -likely this change may break some things; may need to pick up -some pieces later.

      -

      Also, changed the default value for the -man.th.extra2.max.length from 40 to -30.

      -

      Modified: common/common.xsl,1.58; common/refentry.xsl,1.7; -params/man.th.extra2.max.length.xml,1.2; -params/refentry.date.profile.xml,1.2; -params/refentry.manual.profile.xml,1.2; -params/refentry.source.name.profile.xml,1.2; -params/refentry.version.profile.xml,1.2; manpages/docbook.xsl,1.58; -manpages/other.xsl,1.15 - Michael(tm) Smith

      -
    • -

      Added option for turning off bold -formatting in Funcsynopsis. Boldface formatting in -function synopsis is mandated in the -man(7) man page and is used almost universally in existing man -pages. Despite that, it really does look like crap to have an -entire Funcsynopsis output in bold, so I added params -for turning off the bold formatting and/or replacing it with a -different roff special font (e.g., "RI" for alternating -roman/italic instead of the default "BI" for alternating -bold/italic). The new params -are "man.funcprototype.font" and -"man.funcsynopsisinfo.font". To be documented -later.

      -

      Closes #1452247. Thanks to Joe Orton for the feature -request.

      -

      Modified: params/man.string.subst.map.xml,1.16; -manpages/block.xsl,1.10; manpages/docbook.xsl,1.51; -manpages/inline.xsl,1.16; manpages/synop.xsl,1.27 - Michael(tm) -Smith

      -
    • -

      fop.extensions now only -for FOP version 0.20.5 and earlier.

      -

      Modified: params/fop.extensions.xml,1.4 -- Robert Stayton

      -
    • -

      Support for fop1 different from -fop 0.20.5 and earlier.

      -

      Modified: params/fop1.extensions.xml,1.1 - Robert -Stayton

      -
    • -

      Reset default value to empty -string so template uses gentext first, then the parameter value -if not empty.

      -

      Modified: params/index.number.separator.xml,1.2; -params/index.range.separator.xml,1.2; -params/index.term.separator.xml,1.2 - Robert -Stayton

      -
    • -

      New parameter: -id.warnings. If non-zero, warnings are -generated for titled objects that don't have titles. True by default; -I wonder if this will be too aggressive?

      -

      Modified: html/biblio.xsl,1.25; -html/component.xsl,1.27; html/division.xsl,1.11; html/formal.xsl,1.19; -html/glossary.xsl,1.20; html/html.xsl,1.13; html/index.xsl,1.16; -html/param.ent,1.88; html/param.xweb,1.97; html/refentry.xsl,1.22; -html/sections.xsl,1.30; params/id.warnings.xml,1.1 - Norman -Walsh

      -
    • -

      Added new parameter -keep.relative.image.uris

      -

      Modified: fo/param.ent,1.91; -fo/param.xweb,1.104; html/param.ent,1.87; html/param.xweb,1.96; -params/keep.relative.image.uris.xml,1.1 - Norman -Walsh

      -
    • -

      Support default label -width parameters for itemized and ordered lists

      -

      Modified: fo/lists.xsl,1.64; -fo/param.ent,1.90; fo/param.xweb,1.103; -params/itemizedlist.label.width.xml,1.1; -params/orderedlist.label.width.xml,1.1 - Norman -Walsh

      -
    • -

      Added parameters to localize -punctuation in indexes.

      -

      Modified: params/index.number.separator.xml,1.1; -params/index.range.separator.xml,1.1; -params/index.term.separator.xml,1.1 - Robert -Stayton

      -
    • -

      Added two new parameters for -handling of multi-term -varlistentry elements:

      -

      variablelist.term.break.after: -When the variablelist.term.break.after is -non-zero, it will generate a line break after each -term multi-term -varlistentry.

      -

      variablelist.term.separator: -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is -placed after each term except the last. The default -is ", " (a comma followed by a space). To suppress rendering of -the separator, set the value of -variablelist.term.separator to the empty -string ("").

      -

      These parameters are primarily intended to be -useful if you have multi-term varlistentries that have long -terms.

      -

      Closes #1306676. Thanks to Sam Steingold for -providing an example "lots of long terms" doc that demonstrated -the value of having these options.

      -

      Also, added -normalize-space() call to processing of each -term.

      -

      This change affects all output formats -(HTML, PDF, manpages). The default behavior should pretty much -remain the same as before, but it is possible (as always) that -the change may introduce some -new bugginess.

      -

      Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; -fo/param.xweb,1.99; html/lists.xsl,1.48; html/param.ent,1.86; -html/param.xweb,1.93; manpages/lists.xsl,1.22; -manpages/param.ent,1.14; manpages/param.xweb,1.16; -params/variablelist.term.break.after.xml,1.1; -params/variablelist.term.separator.xml,1.1 - Michael(tm) -Smith

      -
    • -

      Convert 'no' to string in default -value.

      -

      Modified: params/olink.doctitle.xml,1.4 - Robert -Stayton

      -
    • -

      Implemented RFE -#1292615.

      -

      Added bunch of new parameters (attribute sets) -that affect list presentation: list.block.properties, -itemizedlist.properties, orderedlist.properties, -itemizedlist.label.properties and -orderedlist.label.properties. Default behaviour -of stylesheets has not been changed but further customizations will be -much more easier.

      -

      Modified: fo/lists.xsl,1.61; fo/param.ent,1.87; -fo/param.xweb,1.98; params/itemizedlist.label.properties.xml,1.1; -params/itemizedlist.properties.xml,1.1; -params/list.block.properties.xml,1.1; -params/orderedlist.label.properties.xml,1.1; -params/orderedlist.properties.xml,1.1 - Jirka -Kosek

      -
    • -

      Implemented RFE -#1242092.

      -

      You can enable crop marks in your document by -setting crop.marks=1 and xep.extensions=1. Appearance of crop -marks can be controlled by parameters -crop.mark.bleed (6pt), -crop.mark.offset (24pt) and -crop.mark.width (0.5pt).

      -

      Also there -is new named template called user-xep-pis. You can overwrite it in -order to produce some PIs that can control XEP as described in -http://www.renderx.com/reference.html#Output_Formats

      -

      Modified: fo/docbook.xsl,1.36; -fo/param.ent,1.86; fo/param.xweb,1.97; fo/xep.xsl,1.23; -params/crop.mark.bleed.xml,1.1; params/crop.mark.offset.xml,1.1; -params/crop.mark.width.xml,1.1; params/crop.marks.xml,1.1 - Jirka -Kosek

      -
    • -

      Changed short descriptions in doc -for *autolabel* params to match new autolabel -behavior.

      -

      Modified: params/appendix.autolabel.xml,1.5; -params/chapter.autolabel.xml,1.4; params/part.autolabel.xml,1.5; -params/preface.autolabel.xml,1.4 - Michael(tm) -Smith

      -
    -
    - -

    Profiling

    - -

    The following changes have been made to the - profiling code - since the 1.69.1 release.

    -
    • -

      Profiling now works together with -namespace stripping (V5 documents). Namespace striping should work -with all stylesheets named profile-, even if they are not supporting -namespace stripping in a non-profiling -variant.

      -

      Modified: profiling/profile-mode.xsl,1.4; -profiling/xsl2profile.xsl,1.7 - Jirka Kosek

      -
    • -

      Moved profiling stage out of -templates. This make possible to reuse profiled content by several -templates and still maintaing node indentity (needed for example for -HTML Help where content is processed multiple times).

      -

      I -don't know why this was not on the top level before. Maybe some XSLT -processors choked on it. I hope this will be OK -now.

      -

      Modified: profiling/xsl2profile.xsl,1.5 - Jirka -Kosek

      -
    -
    - -

    Tools

    - -

    The following changes have been made to the - tools code - since the 1.69.1 release.

    -
    • -

      Moved Makefile.DocBook from -contrib module to xsl -module.

      -

      Modified: tools/make/Makefile.DocBook,1.1 - Michael(tm) -Smith

      -
    -
    - -

    WordML

    - -

    The following changes have been made to the - wordml code - since the 1.69.1 release.

    -
    • -

      added contrib element, -better handling of default paragraph -style

      -

      Modified: wordml/pages-normalise.xsl,1.6; wordml/supported.xml,1.2; -wordml/wordml-final.xsl,1.14 - Steve Ball

      -
    • -

      added -bridgehead

      -

      Modified: wordml/docbook-pages.xsl,1.6; -wordml/docbook.xsl,1.17; wordml/pages-normalise.xsl,1.5; -wordml/template-pages.xml,1.7; wordml/template.dot,1.4; -wordml/template.xml,1.14; wordml/wordml-final.xsl,1.13 - Steve -Ball

      -
    • -

      added blocks stylesheet to support -bibliographies, glossaries and qandasets

      -

      Modified: wordml/Makefile,1.4; -wordml/README,1.3; wordml/blocks-spec.xml,1.1; -wordml/docbook-pages.xsl,1.5; wordml/docbook.xsl,1.16; -wordml/pages-normalise.xsl,1.4; wordml/sections-spec.xml,1.3; -wordml/specifications.xml,1.13; wordml/template-pages.xml,1.6; -wordml/template.dot,1.3; wordml/template.xml,1.13; -wordml/wordml-blocks.xsl,1.1; wordml/wordml-final.xsl,1.12; -wordml/wordml-sections.xsl,1.3 - Steve Ball

      -
    • -

      added mediaobject -caption

      -

      Modified: wordml/docbook-pages.xsl,1.4; -wordml/docbook.xsl,1.15; wordml/specifications.xml,1.12; -wordml/template-pages.xml,1.5; wordml/template.dot,1.2; -wordml/template.xml,1.12; wordml/wordml-final.xsl,1.11 - Steve -Ball

      -
    • -

      added -callouts

      -

      Modified: wordml/docbook-pages.xsl,1.3; wordml/docbook.xsl,1.14; -wordml/pages-normalise.xsl,1.3; wordml/specifications.xml,1.11; -wordml/template-pages.xml,1.4; wordml/wordml-final.xsl,1.10 - Steve -Ball

      -
    • -

      added Word template -file

      -

      Modified: wordml/template.dot,1.1 - Steve Ball

      -
    • -

      added abstract, fixed -itemizedlist, ulink

      -

      Modified: wordml/specifications.xml,1.10; -wordml/wordml-final.xsl,1.9 - Steve Ball

      -
    • -

      fixed Makefile added many -features to Pages support added revhistory, inlines, -highlights, abstract

      -

      Modified: wordml/Makefile,1.2; -wordml/docbook-pages.xsl,1.2; wordml/pages-normalise.xsl,1.2; -wordml/sections-spec.xml,1.2; wordml/specifications.xml,1.9; -wordml/template-pages.xml,1.3; wordml/template.xml,1.11; -wordml/wordml-final.xsl,1.8; wordml/wordml-sections.xsl,1.2 - Steve -Ball

      -
    • -

      fixed handling linebreaks when -generating WordML added Apple Pages -support

      -

      Modified: wordml/docbook.xsl,1.13; wordml/template-pages.xml,1.2 - -Steve Ball

      -
    -
    -
    - -

    Release 1.69.1

    - -

    This release is a minor bug-fix update to the 1.69.0 - release. Along with bug fixes, it includes one - configuration-parameter change: The default value of the - annotation.support parameter is now - 0 (off). The reason for that change is that - there have been reports that annotation handling is - causing a significant performance degradation in processing of - large documents with xsltproc.

    -
    - - -

    Release 1.69.0

    - -

    The release includes major feature changes, - particularly in the manpages - stylesheets, as well as a large number of bug fixes.

    - -

    As with all DocBook Project dot zero releases, this is an - experimental release .

    - -

    Common

    - -
    • -

      This release adds localizations for the following - languages: - Albanian, Amharic, Azerbaijani, Hindi, Irish (Gaelic), Gujarati, Kannada, Mongolian, Oriya, Punjabi, Tagalog, Tamil, and Welsh.

      -
    • -

      Added support for specifying number format for auto - labels for chapter, appendix, - part, and preface. Contolled with the - appendix.autolabel, - chapter.autolabel, - part.autolabel, and - preface.autolabel parameters.

      -
    • -

      Added basic support for biblioref cross - referencing.

      -
    • -

      Added support for align - on caption in mediaobject.

      -
    • -

      Added support for processing documents that use the - DocBook V5 namespace.

      -
    • -

      Added support for termdef and - mathphrase.

      -
    • -

      EXPERIMENTAL: Incorporated the Slides and Website - stylesheets into the DocBook XSL stylesheets package. So, - for example, Website documents can now be processed using - the following URI for the driver Website - tabular.xsl file:

      http://docbook.sourceforge.net/release/xsl/current/website/tabular.xsl
      -
    • -

      A procedure without a title is - now treated as an informal procedure (meaning - that it is not added to any generated list of - procedures and has no affect on numbering of - generated labels for other procedures).

      -
    • -

      docname is no longer added to - olink when pointing to a root element.

      -
    • -

      Added support for generation of choice separator in - inline simplelist. This enables auto-generation of an - appropriate localized choice separator (for - example, and or or) before the - final item in an inline simplelist.

      -

      To indicate that you want a choice separator - generated for a particular list, you need to put a processing - instruction (PI) of the form - <?dbchoice choice="foo"?> as a - child of the list. For example: -

        <para>Choose from
      -  ONE and ONLY ONE of the following: 
      -  <simplelist type="inline">
      -  <?dbchoice choice="or" ?>
      -  <member>A</member>
      -  <member>B</member>
      -  <member>C</member>.</simplelist></para>

      - - Output (for English): -

      -

      Choose from ONE and only ONE of the - following choices: A, B, or C.

      -

      - As a temporary workaround for the fact that most of the - DocBook non-English locale files don't have a localization for - the word or, you can put in a literal string to - be used; example for French: <?dbchoice choice="ou">. That is, use - ou instead of or.

      -
    -
    -

    FO

    - -
    • -

      Added content-type property to - external-graphic element, based on - imagedata format - attribute.

      -
    • -

      Added support for generating - <rx:meta-field creator="$VERSION"/> - field for XEP output. This makes the DocBook XSL - stylesheet version information available through the - Document Properties menu in Acrobat - Reader and other PDF viewers.

      -
    • -

      Trademark symbol handling made consistent with - handling of same in HTML stylesheets. Prior to this change, - if you processed a document that contained no value for the - class attribute on the - trademark element, the HTML stylesheets would - default to rendering a superscript TM - symbol after the trademark contents, - but the FO stylesheets would render nothing.

      -
    • -

      Added support for generating XEP bookmarks for - refentry.

      -
    • -

      Added support for HTML markup table border attribute, applied to each - table cell.

      -
    • -

      The table.width template can now - sum column specs if none use % or - *.

      -
    • -

      Added fox:destination extension - inside fox:outline to support linking to - internal destinations.

      -
    • -

      Added support for customizing - abstract with property sets. Controlled - with the abstract.properties and - abstract.title.properties - parameters.

      -
    • -

      Add footnotes in table title to - table footnote set, and add support for table footnotes to - HTML table markup.

      -
    • -

      Added support for title in - glosslist.

      -
    • -

      Added support for itemizedlist symbol - none.

      -
    • -

      Implemented the new - graphical.admonition.properties and - nongraphical.admonition.properties - attribute sets.

      -
    • -

      Added id to - formalpara and some other blocks that were - missing it.

      -
    • -

      Changed the anchor template to output - fo:inline instead of - fo:wrapper.

      -
    • -

      Added support for toc.max.depth - parameter.

      -
    -
    - -

    Help

    - -
    • -

      Eclipse Help: Added support for generating olink - database.

      -
    -
    - -

    HTML

    - -
    -
    -

    man

    - -

    This release closes out 44 manpages stylesheet bug reports - and feature requests. It adds more than 35 new configuration - parameters for controlling aspects of man-page output -- - including hyphenation and justification, handling of links, - conversion of Unicode characters, and contents of man-page - headers and footers.

    -
    • -

      New options for globally disabling/enabling - hyphenation and justification: - man.justify and - man.hyphenate.

      -

      Note that the default - for the both of those is zero (off), because justified text - looks good only when it is also hyphenated; to quote the - Hyphenation node from the groff info page: -

      -

      Since the odds are not great for finding a - set of words, for every output line, which fit nicely on a - line without inserting excessive amounts of space between - words, `gtroff' hyphenates words so that it can justify - lines without inserting too much space between - words.

      -

      - The problem is that groff can end up hyphenating a lot of - things that you don't want hyphenated (variable names and - command names, for example). Keeping both justification and - hyphenation disabled ensures that hyphens won't get inserted - where you don't want to them, and you don't end up with - lines containing excessive amounts of space between - words. These default settings run counter to how most - existing man pages are formatted. But there are some notable - exceptions, such as the perl man pages.

      -
    • -

      Added parameters for controlling hyphenation of - computer inlines, filenames, and URLs. By default, even when - hyphenation is enabled (globally), hyphenation is now - suppressed for "computer inlines" (currently, just - classname, constant, envar, - errorcode, option, - replaceable, userinput, - type, and varname, and for - filenames, and for URLs from link. It - can be (re)enabled using the - man.hyphenate.computer.inlines, - man.hyphenate.filenames, and - man.hyphenate.urls parameters.

      -
    • -

      Implemented a new system for replacing Unicode - characters. There are two parts to the new system: a - string substitution map for doing - essential replacements, and a - character map that can optionally be disabled - and enabled.

      -

      The new system fixes all open bugs that had to do with - literal Unicode numbered entities such as &#8220; and - &#8221; showing up in output, and greatly expands the - ability of the stylesheets to generate good roff - equivalents for Unicode symbols and special - characters.

      -

      Here are some details...

      -

      The previous manpages mechanism for replacing Unicode - symbols and special characters with roff equivalents (the - replace-entities template) was not - scalable and not complete. The mechanism handled a somewhat - arbitrary selection of less than 20 or so Unicode - characters. But there are potentially more than - 800 Unicode special characters that - have some groff equivalent they can be mapped to. And there - are about 34 symbols in the Latin-1 (ISO-8859-1) block - alone. Users might reasonably expect that if they include - any of those Latin-1 characters in their DocBook source - documents, they will get correctly converted to known roff - equivalents in output.

      -

      In addition to those common symbols, certain users may - have a need to use symbols from other Unicode blocks. Say, - somebody who is documenting an application related to math - might need to use a bunch of symbols from the - Mathematical Operators Unicode block (there - are about 65 characters in that block that have reasonable - roff equivalents). Or somebody else might really like - Dingbats -- such as the checkmark character -- and so might - use a bunch of things from the Dingbat block - (141 characters in that that have roff equivalents or that - can at least be degraded somewhat gracefully - into roff).

      -

      So, the old replace-entities - mechanism was replaced with a completely different mechanism - that is based on use of two maps: a - substitution map and a character - map (the latter in a format compliant with the XSLT - 2.0 spec and therefore completely forward - compatible with XSLT 2.0).

      -

      The substitution map is controlled through the - man.string.subst.map parameter, and - is used to replace things like the backslash character - (which needs special handling to prevent it from being - interpreted as a roff escape). The substitution map cannot - be disabled, because disabling it will cause the output to - be broken. However, you can add to it and change it if - needed.

      - -

      The character map mechanism, on the - other hand, can be completely disabled. It is enabled by - default, and, by default, does replacement of all Latin-1 - symbols, along with most special spaces, dashes, and quotes - (about 75 characters by default). Also, you can optionally - enable a full character map that provides - support for converting all 800 or so of the characters that - have some reasonable groff equivalent.

      - -

      The character-map mechanism is controlled through the - following parameters: -

      man.charmap.enabled

      turns character-map support - on/off

      man.charmap.use.subset

      specifies that a subset of the character - map is used instead of the full map

      man.charmap.subset.profile

      specifies profile of character-map - subset

      man.charmap.uri

      specifies an alternate character map to - use instead of the standard character map - provided in the distribution

      -

      -
    • -

      Implemented out-of-line handling of display of URLs - for links (currently, only for ulink). This gives - you three choices for handling of links: -

      1. -

        Number and list links. Each link is numbered - inline, with a number in square brackets preceding the - link contents, and a numbered list of all links is added - to the end of the document.

        -
      2. -

        Only list links. Links are not numbered, but an - (unnumbered) list of links is added to the end of the - document.

        -
      3. -

        Suppress links. Don't number links and don't add - any list of links to the end of the document.

        -

      - You can also choose whether links should be underlined. The - default is the works -- list, number, and - underline links. You can use the - man.links.list.enabled, - man.links.are.numbered, and - man.links.are.underlined parameters - to change the defaults. The default heading for the link - list is REFERENCES. You can be change that using the - man.links.list.heading - parameter.

      -
    • -

      Changed default output encoding to UTF-8. This does not mean that man pages are output in - raw UTF-8, because the character map is applied - before final output, causing all UTF-8 characters covered in - the map to be converted to roff equivalents.

      -
    • -

      Added support for processing refsect3 and - formalpara and nested refsection - elements, down to any arbitrary level of nesting.

      -
    • -

      Output of the NAME and - SYNOPSIS and AUTHOR - headings and the headings for admonitions (note, - caution, etc.) are no longer hard-coded for - English. Instead, headings are generated for those in the - correct locale (just as the FO and HTML stylesheets - do).

      -
    • -

      Re-worked mechanism for assembling page - headers/footers (the contents of the .TH - macro title line).

      - -

      Here are some details...

      - -

      All man pages contain a .TH roff - macro whose contents are used for rendering the title - line displayed in the header and footer of each - page. Here are a couple of examples of real-world man pages - that have useful page headers/footers:

      -  gtk-options(7)    GTK+ User's Manual   gtk-options(7) <-- header
      -  GTK+ 1.2              2003-10-20       gtk-options(7) <-- footer
      -
      -  svgalib(7)       Svgalib User Manual       svgalib(7) <-- header
      -  Svgalib 1.4.1      16 December 1999        svgalib(7) <-- footer
      - -

      And here are the terms with which the - groff_man(7) man page refers to the - various parts of the header/footer:

      -  title(section)  extra3  title(section)  <- header
      -  extra2          extra1  title(section)  <- footer
      -

      Or, using the names with which the man(7) - man page refers to those same fields:

      -  title(section)  manual  title(section)  <- page header
      -  source          date    title(section)  <- page footer
      - -

      The easiest way to control the contents of those - fields is to mark up your refentry content like - the following (note that this is a minimal - example).

      -  <refentry>
      -    <info>
      -      <date>2003-10-20</date> 1
      -    </info>
      -    <refmeta>
      -      <refentrytitle>gtk-options</refentrytitle> 2
      -      <manvolnum>7</manvolnum> 3
      -      <refmiscinfo class="source-name">GTK+</refmiscinfo> 4
      -      <refmiscinfo class="version">1.2</refmiscinfo> 5
      -      <refmiscinfo class="manual">GTK+ User's Manual</refmiscinfo> 6
      -    </refmeta>
      -    <refnamediv>
      -      <refname>gtk-options</refname>
      -      <refpurpose>Standard Command Line Options for GTK+ Programs</refpurpose>
      -    </refnamediv>
      -    <refsect1>
      -      <title>Description</title>
      -      <para>This manual page describes the command line options, which
      -      are common to all GTK+ based applications.</para>
      -    </refsect1>
      -  </refentry>

      -

      1

      -

      Sets the date part of the header/footer.

      -

      2

      -

      Sets the title part.

      -

      3

      -

      Sets the section part.

      -

      4

      -

      Sets the source name part.

      -

      5

      -

      Sets the version part.

      -

      6

      -

      Sets the manual part.

      -

      -

      -

      Below are explanations of the steps the stylesheets - take to attempt to assemble and display - good headers and footer. [In the - descriptions, note that *info - is the refentry info child - (whatever its name), and - parentinfo is the - info child of its parent (again, whatever - its name).] -

      extra1 field (date)
      -

      Content of the extra1 field is - what shows up in the center - footer position of each page. The - man(7) man page describes it as - the date of the last revision.

      -

      To provide this content, if the - refentry.date.profile.enabled - is non-zero, the stylesheets check the value of - refentry.date.profile.

      -

      Otherwise, by default, they check for a - date or pubdate not only in the - *info contents, but also in - the parentinfo - contents.

      -

      If a date cannot be found, the stylesheets now - automatically generate a localized long - format date, ensuring that this field always - has content in output.

      -

      However, if for some reason you want to suppress - this field, you can do so by setting a non-zero value - for man.th.extra1.suppress.

      -
      extra2 field (source)
      -

      On Linux systems and on systems with a modern - groff, the content of the extra2 field - are what shows up in the left - footer position of each page.

      - -

      The man(7) man page describes - this as the source of the command, and - provides the following examples: -

      • -

        For binaries, use somwething like: GNU, - NET-2, SLS Distribution, MCC Distribution.

        -
      • -

        For system calls, use the version of the - kernel that you are currently looking at: Linux - 0.99.11.

        -
      • -

        For library calls, use the source of the - function: GNU, BSD 4.3, Linux DLL 4.4.1.

        -

      -

      - -

      In practice, there are many pages that simply - have a version number in the source - field. So, it looks like what we have is a two-part - field, - Name Version, - where: -

      Name
      -

      product name (e.g., BSD) or org. name - (e.g., GNU)

      -
      Version
      -

      version name

      -

      - Each part is optional. If the - Name is a product name, - then the Version is - probably the version of the product. Or there may be - no Name, in which case, if - there is a Version, it is - probably the version of the item itself, not the - product it is part of. Or, if the - Name is an organization - name, then there probably will be no - Version. -

      -

      To provide this content, if the - refentry.source.name.profile.enabled - and - refentry.version.profile.enabled - parameter are non-zero, the stylesheets check the - value of refentry.source.name.profile - refentry.version.profile.

      - -

      Otherwise, by default, they check the following - places, in the following order: -

      1. -
        *info/productnumber
        -
      2. -
        *info/productnumber
        -
      3. -
        refmeta/refmiscinfo[@class = 'version']
        -
      4. -
        parentinfo/productnumber
        -
      5. -
        *info/productname
        -
      6. -
        parentinfo/productname
        -
      7. -
        refmeta/refmiscinfo
        -
      8. -

        [nothing found, so leave it empty]

        -

      -

      -
      extra3 field
      -

      On Linux systems and on systems with a modern - groff, the content of the extra3 field - are what shows up in the center - header position of each page. Some man - pages have extra2 content, some - don't. If a particular man page has it, it is most - often context data about some larger - system the documented item belongs to (for example, - the name or description of a group of related - applications). The stylesheets now check the following - places, in the following order, to look for content to - add to the extra3 field.

      -
      1. -
        parentinfo/title
        -
      2. -
        parent's title
        -
      3. -
        refmeta/refmiscinfo
        -
      4. -

        [nothing found, so leave it empty]

        -
      -

      -

      -
    • -

      Reworked *info gathering. For - each refentry found, the stylesheets now cache its - *info content, then check for any - valid parent of it that might have metainfo content and cache - that, if found; they then then do all further matches against - those node-sets (rather than re-selecting the original - *info nodes each time they are - needed).

      -
    • -

      New option for breaking strings after forward - slashes. This enables long URLs and pathnames to be broken - across lines. Controlled through - man.break.after.slash parameter.

      -
    • -

      Output for servicemark and trademark are now - (SM) and (TM). There is - a groff "\(tm" escape, but output from that - is not acceptable.

      -
    • -

      New option for controlling the length of the title - part of the .TH title line. Controlled - through the man.th.title.max.length - parameter.

      -
    • -

      New option for specifying output encoding of each man - page; controlled with - man.output.encoding (similar to the - HTML chunker.output.encoding - parameter).

      -
    • -

      New option for suppressing filename messages when - generating output; controlled with - man.output.quietly (similar to the HTML - chunk.quietly parameter).

      -
    • -

      The text of cross-references to first-level - refentry (refsect1, top-level - refsection, refnamediv, and - refsynopsisdiv) are now capitalized.

      -
    • -

      Cross-references to refnamediv now use the - localized NAME title instead of using the - first refname child. This makes the output - inconsistent with HTML and FO output, but for man-page output, - it seems to make better sense to have the - NAME. (It may actually make better sense to - do it that way in HTML and FO output as well...)

      -
    • -

      Added support for processing funcparams.

      -
    • -

      Removed the space that was being output between - funcdef and paramdef; example: was: - float rand (void); now: - float rand(void)

      -
    • -

      Turned off bold formatting for the type - element when it occurs within a funcdef or - paramdef

      -
    • -

      Corrected rendering of simplelist. Any - <simplelist type="inline" instance - is now rendered as a comma-separated list (also with an - optional localized and or or before the last item -- see - description elsewhere in these release notes). Any simplelist - instance whose type is not - inline is rendered as a one-column vertical - list (ignoring the values of the type and columns attributes if present)

      -
    • -

      Comment added at top of roff source for each page now - includes DocBook XSL stylesheets version number (as in the - HTML stylesheets)

      -
    • -

      Made change to prevent sticky fonts - changes. Now, when the manpages stylesheets encounter node - sets that need to be boldfaced or italicized, they put the - \fBfoo\fR and \fIbar\fR - groff bold/italic instructions separately around each node in - the set.

      -
    • -

      synop.xsl: Boldface everything in - funcsynopsis output except parameters (which are in - ital). The man(7) man page says: -

      -

      For functions, the arguments are always specified - using italics, even in the SYNOPSIS section, where the rest - of the function is specified in bold.

      -

      - A look through the contents of the - man/man2 directory shows that most - (all) existing pages do follow this everything in - funcsynopsis bold rule. That means the - type content and any punctuation (parens, - semicolons, varargs) also must be bolded.

      -
    • -

      Removed code for adding backslashes before periods/dots - in roff source, because backslashes in front of periods/dots - in roff source are needed only in the very rare case where a - period is the very first character in a line, without any - space in front of it. A better way to deal with that rare case - is for you to add a zero-width space in front of the offending - dot(s) in your source

      -
    • -

      Removed special handling of the quote - element. That was hard-coded to cause anything marked up with - the quote element to be output preceded by two - backticks and followed by two apostrophes -- that is, that - old-school kludge for generating curly quotes in Emacs and - in X-Windows fonts. While Emacs still seems to support that, I - don't think X-Windows has for a long time now. And, anyway, it - looks (and has always looked) like crap when viewed on a - normal tty/console. In addition, it breaks localiztion of - quote. By default, quote content is - output with localized quotation marks, which, depending on the - locale, may or may not be left and right double quotation - marks.

      -
    • -

      Changed mappings for left and right single quotation - marks. Those had previously been incorrectly mapped to the - backtick (&#96;) and apostrophe (&39;) characters (for - kludgy reasons -- see above). They are now correctly mapped to - the \(oq and \(cq roff - escapes. If you want the old (broken) behavior, you need to - manually change the mappings for those in the value of the - man.string.subst.map parameter.

      -
    • -

      Removed xref.xsl file. Now, of the - various cross-reference elements, only the ulink - element is handled differently; the rest are handled exactly - as the HTML stylesheets handle them, except that no hypertext - links are generated. (Because there is no equivalent hypertext - mechanism is man pages.)

      -
    • -

      New option for making subheading dividers in generated - roff source. The dividers are not visible in the rendered man - page; they are just there to make the source - readable. Controlled using - man.subheading.divider.

      -
    • -

      Fixed many places where too much space was being added - between lines.

      -
    - -
    -
    - - -

    Release 1.68.1

    - -

    The release adds localization support for Farsi (thanks to - Sina Heshmati) and improved support for the XLink-based DocBook NG - db:link element. Other than that, it is a minor - bug-fix update to the 1.68.0 release. The main thing it fixes is a - build error that caused the XSLT Java extensions to be jarred up - with the wrong package structure. Thanks to Jens Stavnstrup for - quickly reporting the problem, and to Mauritz Jeanson for - investigating and finding the cause.

    -
    - - -

    Release 1.68.0

    - -

    This release includes some features changes, particularly - for FO/PDF output, and a number of bug fixes. -

    FO

    • -

      Moved footnote properties to attribute-sets.

      -
    • -

      Added support for side floats, margin notes, and - custom floats.

      -
    • -

      Added new parameters - body.start.indent and - body.end.indent to the - set.flow.properties template.

      -
    • -

      Added support for xml:id

      -
    • -

      Added support for - refdescriptor.

      -
    • -

      Added support for multiple refnamedivs.

      -
    • -

      Added index.entry.properties - attribute-set to support customization of index - entries.

      -
    • -

      Added set.flow.properties - template call to each fo:flow - to support customizations entry point.

      -
    • -

      Add support for @floatstyle in - figure

      -
    • -

      Moved hardcoded properties for index division titles - to the index.div.title.properties - attribute-set.

      -
    • -

      Added support for - table-layout="auto" for XEP.

      -
    • -

      Added index.div.title.properties - attribute-set.

      -
    • -

      $verbose parameter is now - passed to most elements.

      -
    • -

      Added refentry to - toc in part, as it is - permitted by the DocBook schema/DTD.

      -
    • -

      Added backmatter elements and - article to toc in - part, since they are permitted by the - DocBook schema/DTD.

      -
    • -

      Added mode="toc" for - simplesect, since it is now permitted in - the toc if - simplesect.in.toc is set.

      -
    • -

      Moved hard-coded properties to - nongraphical.admonintion.properties - and graphical.admonition.properties - attribute sets.

      -
    • -

      Added support for sidebar-width and - float-type processing instructions in - sidebar.

      -
    • -

      For tables with HTML markup elements, added support - for dbfo bgcolor PI, the attribute-sets - named table.properties, - informaltable.properties, - table.table.properties, and - table.cell.padding. Also added - support for the templates named - table.cell.properties and - table.cell.block.properties so that - tabstyles can be implemented. Also added support for tables - containing only tr instead of - tbody with tr.

      -
    • -

      Added new paramater - hyphenate.verbatim.characters which - can specify characters after which a line break can occur in - verbatim environments. This parameter can be used to extend - the initial set of characters which contain only space and - non-breakable space.

      -
    • -

      Added itemizedlist.label.markup to enable - selection of different bullet symbol. Also added several - potential bullet characters, commented out by default.

      -
    • -

      Enabled all id's in XEP output for external olinking.

      -

    - -

    HTML

    -

    Images

    • -

      Added new SVG admonition graphics and navigation images.

      -

    -

    -
    - - -

    Release 1.67.2

    - -

    This release fixes a table bug introduced in the 1.67.1 - release.

    -
    -

    Release 1.67.1

    - -

    This release includes a number of bug fixes.

    -

    The following lists provide details about API and feature changes. -

    FO

    • -

      Tables: Inherited cell properties are now passed to the - table.cell.properties template so they can - be overridden by a customization.

      -
    • -

      Tables: Added support for bgcolor PI on table row - element.

      -
    • -

      TOCs: Added new parameter - simplesect.in.toc; default value of - 0 causes simplesect to be omitted from TOCs; to - cause simplesect to be included in TOCs, you - must set the value of simplesect.in.toc to - 1.Comment from Norm: - -

      -

      Simplesect elements aren't supposed to - appear in the ToC at all... The use case for simplesect - is when, for example, every chapter in a book ends with - "Exercises" or "For More Information" sections and you - don't want those to appear in the ToC.

      -

      -

      -
    • -

      Sections: Reverted change that caused a variable reference - to be used in a template match and rewrote code to preserve - intended semantics.

      -
    • -

      Lists: Added workaround to prevent "* 0.60 + 1em" garbage in - list output from PassiveTeX

      -
    • -

      Moved the literal attributes from - component.title to the - component.title.properties attribute-set so - they can be customized.

      -
    • -

      Lists: Added glossdef's first - para to special handling in - fo:list-item-body.

      -

    - -

    HTML

    -

    HTML Help

    • -

      Added support for generating windows-1252-encoded - output using Saxon; for more details, see the list of XSL Java extensions changes for this release.

      -

    -

    man pages

    • -

      Replaced named/numeric character-entity references for - non-breaking space with groff equivalent (backslash-tilde).

      -

    -

    XSL Java extensions

    • -

      Saxon extensions: Added the - Windows1252 class. It extends Saxon - 6.5.x with the windows-1252 character set, which is - particularly useful when generating HTML Help for Western - European Languages (code from - Pontus Haglund and contributed to the - DocBook community by Sectra AB, Sweden).

      -

      To use: -

      1. -

        Make sure that the Saxon 6.5.x jar file and the jar file for - the DocBook XSL Java extensions are in your CLASSPATH

        -
      2. -

        Create a DocBook XSL customization layer -- a file named - mystylesheet.xsl or whatever -- that, at a - minimum, contains the following: -

          <xsl:stylesheet
        -    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
        -    version='1.0'>
        -    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl"/>
        -    <xsl:output method="html" encoding="WINDOWS-1252" indent="no"/>
        -    <xsl:param name="htmlhelp.encoding" select="'WINDOWS-1252'"></xsl:param>
        -    <xsl:param name="chunker.output.encoding" select="'WINDOWS-1252'"></xsl:param>
        -    <xsl:param name="saxon.character.representation" select="'native'"></xsl:param>
        -  </xsl:stylesheet>

        -

        -

        Invoke Saxon with the - encoding.windows-1252 Java system property set - to com.nwalsh.saxon.Windows1252; for example -

          java \
        -    -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \
        -  com.icl.saxon.StyleSheet \
        -  mydoc.xml mystylesheet.xsl

        - - Or, for a more complete "real world" case showing other - options you'll typically want to use: -

          java \
        -    -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \
        -    -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
        -    -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
        -    -Djavax.xml.transform.TransformerFactory=com.icl.saxon.TransformerFactoryImpl \
        -  com.icl.saxon.StyleSheet \
        -    -x org.apache.xml.resolver.tools.ResolvingXMLReader \
        -    -y org.apache.xml.resolver.tools.ResolvingXMLReader \
        -    -r org.apache.xml.resolver.tools.CatalogResolver \
        -  mydoc.xml mystylesheet.xsl

        - - In both cases, the "mystylesheet.xsl" file should be a - DocBook customization layer containing the parameters - show in step 2.

        -

      -

      -
    • -

      Saxon extensions: Removed Saxon 8 extensions from release package

      -

    -

    -
    -

    Release 1.67.0

    - -
    • -

      A number of important bug fixes.

      -
    • -

      Added Saxon8 extensions

      -
    • -

      Enabled dbfo table-width on - entrytbl in FO output

      -
    • -

      Added support for role=strong on - emphasis in FO output

      -
    • -

      Added new FO parameter - hyphenate.verbatim that can be used to turn - on "intelligent" wrapping of verbatim environments.

      -
    • -

      Replaced all <tt></tt> output with - <code></code>

      -
    • -

      Changed admon.graphic.width template to a - mode so that different admonitions can have different graphical - widths.

      -
    • -

      Deprecated the HTML shade.verbatim - parameter (use CSS instead)

      -
    • -

      Wrapped ToC - refentrytitle/refname and - refpurpose in span with class values. This - makes it possible to style them using a CSS stylesheet.

      -
    • -

      Use strong/em instead of - b/i in HTML output

      -
    • -

      Added support for converting Emphasis to - groff italic and Emphasis role='bold' to - bold. Controlled by - emphasis.propagates.style param, but not - documented yet using litprog system. Will do that next (planning - to add some other parameter-controllable options for hyphenation - and handling of line spacing).

      -
    • -

      callout.graphics.number.limit.xml - param: Changed the default from 10 to - 15.

      -
    • -

      verbatim.properties: Added - hyphenate=false

      -
    • -

      Saxon and Xalan Text.java extensions: Added support for - URIResolver() on insertfile href's

      -
    • -

      Added generated RELEASE-NOTES.txt - file.

      -
    • -

      Added INSTALL file (executable file for - generating catalog.xml)

      -
    • -

      Removed obsolete tools directory from - package

      -
    -
    -

    Release 1.66.1

    - -
    • -

      A number of important bug fixes. -

      -
    • -

      -Now xml:base attributes that are generated by an -XInclude processor are resolved for image files. -

      -
    • -

      -Rewrote olink templates to support several new features. -

      -
      -
    • -

      -Added index.on.type parameter for new type -attribute introduced in DocBook 4.3 for indexterms and index. -This allows you to create multiple indices containing -different categories of entries. -For users of 4.2 and earlier, you can use the new parameter index.on.role -instead. -

      -
    • -

      -Added new -section.autolabel.max.depth parameter to turn off section numbering -below a certain depth. -This permits you to number major section levels and leave minor -section levels unnumbered.

      -
    • -

      -Added footnote.sep.leader.properties attribute set to format -the line separating footnotes in printed output. -

      -
    • -

      -Added parameter img.src.path as a prefix to HTML img src -attributes. -The prefix is added to whatever path is already generated by the -stylesheet for each image file.

      -
    • -

      -Added new attribute-sets -informalequation.properties, -informalexample.properties, -informalfigure.properties, and informaltable.properties, -so each such element type can be formatted -individually if needed. -

      -
    • -

      -Add component.label.includes.part.label -parameter to add any part number to chapter, appendix -and other component labels when -the label.from.part parameter is nonzero. -This permits you to distinguish multiple chapters with the same -chapter number in cross references and the TOC.

      -
    • -

      -Added chunk.separate.lots parameter for HTML output. -This parameter lets you generate separate chunk files for each LOT -(list of tables, list of figures, etc.).

      -
    • -

      Added several table features:

      -
      • -

        -Added table.table.properties attribute set to add -properties to the fo:table element. -

        -
      • -

        -Added placeholder templates named table.cell.properties -and table.cell.block.properties to enable adding properties -to any fo:table-cell or the cell's fo:block, respectively. - These templates are a start for implementing table styles.

        -
      -
    • -

      -Added new attribute -set component.title.properties for easy modifications of -component's title formatting in FO output. -

      -
    • -

      -Added Saxon support for an encoding attribute on the textdata element. Added new parameter -textdata.default.encoding which specifies encoding when -encoding attribute on -textdata is missing. -

      -
    • -

      -Template label.this.section now controls whole -section label, not only sub-label which corresponds to -particular label. Former behaviour was IMHO bug as it was -not usable. -

      -
    • -

      -Formatting in titleabbrev for TOC and headers -is preserved when there are no hotlink elements in the title. Formerly the title showed only the text of the title, no font changes or other markup. -

      -
    • -

      -Added intial.page.number template to set the initial-page-number -property for page sequences in print output. -Customizing this template lets you change when page numbering restarts. This is similar to the format.page.number template that lets you change how the page number formatting changes in the output. -

      -
    • -

      -Added force.page.count template to set the force-page-count -property for page sequences in print output. -This is similar to the format.page.number template. -

      -
    • -

      -Sort language for localized index sorting in autoidx-ng.xsl is now taken from document -lang, not from system environment. -

      -
    • -

      -Numbering and formatting of normal -and ulink footnotes (if turned on) has been unified. -Now ulink footnotes are mixed in with any other footnotes.

      -
    • -

      -Added support for renderas attribute in section and -sect1 et al. -This permits you to render a given section title as if it were a different level.

      -
    • -

      -Added support for label attribute in footnote to manually -supply the footnote mark. -

      -
    • -

      -Added support for DocBook 4.3 corpcredit element. -

      -
    • -

      -Added support for a dbfo keep-together PI for -formal objects (table, figure, example, equation, programlisting). That permits a formal object to be kept together if it is not already, or to be broken if it -is very long and the -default keep-together is not appropriate. -

      -
    • -

      -For graphics files, made file extension matching case -insensitive, and updated the list of graphics extensions. -

      -
    • -

      -Allow calloutlist to have block content before -the first callout -

      -
    • -

      -Added dbfo-need processing instruction to provide -soft page breaks. -

      -
    • -

      -Added implementation of existing but unused -default.image.width parameter for graphics. -

      -
    • -

      -Support DocBook NG tag inline element. -

      -
    • -

      -It appears that XEP now supports Unicode characters in -bookmarks. There is no further need to strip accents from -characters. -

      -
    • -

      -Make segmentedlist HTML markup -more semantic and available to CSS styles. -

      -
    • -

      -Added user.preroot placeholder template to -permit xsl-stylesheet and other PIs and comments to be -output before the HTML root element. -

      -
    • -

      -Non-chunked legalnotice now gets an <a -name="id"> element in HTML output -so it can be referenced with xref or link. -

      -
    • -

      -In chunked HTML output, changed link rel="home" to rel="start", -and link rel="previous" to rel="prev", per W3C HTML 4.01 -spec. -

      -
    • -

      -Added several patches to htmlhelp from W. Borgert -

      -
    • -

      -Added Bosnian locale file as common/bs.xml. -

      -
    -
    -

    Release 1.65.0

    - -
    • -

      A number of important bug fixes. -

      -
    • -

      Added a workaround to allow these stylesheets to process DocBook NG -documents. (It’s a hack that pre-processes the document to strip off the -namespace and then uses exsl:node-set to process -the result.) -

      -
    • -

      Added alternative indexing mechanism which has better -internationalization support. New indexing method allows grouping of -accented letters like e, é, ë into the same group under letter "e". It -can also treat special letters (e.g. "ch") as one character and place -them in the correct position (e.g. between "h" and "i" in Czech -language).

      -

      In order to use this mechanism you must create customization -layer which imports some base stylesheet (like -fo/docbook.xsl, -html/chunk.xsl) and then includes appropriate -stylesheet with new indexing code -(fo/autoidx-ng.xsl or -html/autoidx-ng.xsl). For example:

      -
      <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      -                version="1.0">
      -
      -<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
      -<xsl:include href="http://docbook.sourceforge.net/release/xsl/current/fo/autoidx-ng.xsl"/>
      -
      -</xsl:stylesheet>
      -

      New method is known to work with Saxon and it should also work -with xsltproc 1.1.1 and later. Currently supported languages are -English, Czech, German, French, Spanish and Danish.

      -
    -
    -

    Release 1.64.1

    - -

    General bug fixes and improvements. Sorry about the failure to produce -an updated release notes file for 1.62.0—1.63.2

    • -

      In the course of fixing bug #849787, wrapping Unicode callouts -with an appropriate font change in the Xalan extensions, I discovered -that the Xalan APIs have changed a bit. So xalan2.jar -will work with older Xalan 2 implementations, xalan25.jar -works with Xalan 2.5.

      -
    -
    -

    Release 1.61.0

    - -

    Lots of bug fixes and improvements.

    • -

      Initial support for timestamp PI. From now you - can use <?dbtimestamp format="Y-m-d H:M:S"?> to get current - datetime in your document. Added localization support for datetime PI -

      -
    • -

      Added level 6 to test for section depth in -section.level template so that -section.title.level6.properties will be used for sections -that are 6 deep or deeper. This should also cause a h6 to be -created in html output. -

      -
    • -

      Don't use SVG graphics if use.svg=0 -

      -
    • -

      Now uses number-and-title-template for sections - only if section.autolabel is not zero. -

      -
    • -

      Added missing 'english-language-name' attribute to -the l10n element, and the missing 'style' attribute to the -template element so the current gentext documents will -validate. -

      -
    • -

      Corrected several references to parameter - qanda.defaultlabel that were missing the "$". -

      -
    • -

      Now accepts admon.textlabel parameter to turn off - Note, Warning, etc. label. -

      -
    • -

      FeatReq #684561: support more XEP metadata -

      -
    • -

      Added hyphenation support. Added support for coref. -Added beginpage support. (does nothing; see TDG). -

      -
    • -

      Added support for -hyphenation-character, hyphenation-push-character-count, and -hyphenation-remain-character-count -

      -
    • -

      Added root.properties, -ebnf.assignment, -and ebnf.statement.terminator -

      -
    • -

      Support bgcolor PI in table cells; make sure -rowsep and colsep don't have any effect on the last row or -column -

      -
    • -

      Handle othercredit on titlepage a little -better -

      -
    • -

      Applied fix from Jeff Beal that fixed the bug -that put secondary page numbers on primary entries. Same -with tertiary page numbers on secondary entries. -

      -
    • -

      Added definition of missing variable -collection. -

      -
    • -

      Make footnote formatting 'normal' even when it -occurs in a context that has special formatting -

      -
    • -

      Added warning when glossary.collection is not -blank, but it cannot open the specified file. -

      -
    • -

      Pick up the frame attribute on table and -informaltable. -

      -
    • -

      indexdiv/title -in non-autogenerated indexes are -now picked up. -

      -
    • -

      Removed (unused) -component.title.properties -

      -
    • -

      Move IDs from -page-sequences down to titlepage blocks -

      -
    • -

      Use -proportional-column-width(1) on more tables. -

      -

      Use proportional-column-width() for -header/footer tables; suppress relative-align when when -using FOP -

      -
    • -

      Check for glossterm.auto.link when linking -firstterms; don't output gl. prefix on glossterm links -

      -
    • -

      Generate Part ToCs -

      -
    • -

      Support glossary, bibliography, -and index in component ToCs. -

      -
    • -

      Refactored chunking code so that -customization of chunk algorithm and chunk elements is more -practical -

      -
    • -

      Support textobject/phrase -on inlinemediaobject. -

      -
    • -

      Support 'start' PI on ordered lists -

      -
    • -

      Fixed test of $toc PI to turn on qandaset TOC. -

      -
    • -

      Added process.chunk.footnotes to sect2 through -5 to fix bug of missing footnotes when chunk level greater -than 1. -

      -
    • -

      Added -paramater toc.max.depth which controls maximal depth of ToC -as requested by PHP-DOC group. -

      -
    • -

      Exempted titleabbrev from preamble processing in -lists, and fixed variablelist preamble code to use the same -syntax as the other lists. -

      -
    • -

      Added support for elements between variablelist -and first varlistentry since DocBook 4.2 supports that now. -

      -
    -
    -

    Release 1.60.1

    - -

    Lots of bug fixes.

    • -

      The format of the titlepage.templates.xml files and -the stylesheet that transforms them have been significantly changed. All of the -attributes used to control the templates are now namespace qualified. So what -used to be:

      -
      <t:titlepage element="article" wrapper="fo:block">
      -

      is now:

      -
      <t:titlepage t:element="article" t:wrapper="fo:block">
      -

      Attributes from other namespaces (including those that are unqualified) are -now copied directly through. In practice, this means that the names that used -to be fo: qualified:

      -
      <title named-template="component.title"
      -       param:node="ancestor-or-self::article[1]"
      -       fo:text-align="center"
      -       fo:keep-with-next="always"
      -       fo:font-size="&hsize5;"
      -       fo:font-weight="bold"
      -       fo:font-family="{$title.font.family}"/>
      -

      are now unqualified:

      -
      <title t:named-template="component.title"
      -       param:node="ancestor-or-self::article[1]"
      -       text-align="center"
      -       keep-with-next="always"
      -       font-size="&hsize5;"
      -       font-weight="bold"
      -       font-family="{$title.font.family}"/>
      -

      The t:titlepage and t:titlepage-content -elements both generate wrappers now. And unqualified attributes on those elements -are passed through. This means that you can now make the title font apply to -ane entire titlepage and make the entire recto -titlepage centered by specifying the font and alignment on the those elements:

      -
      <t:titlepage t:element="article" t:wrapper="fo:block"
      -             font-family="{$title.font.family}">
      -
      -  <t:titlepage-content t:side="recto"
      -             text-align="center">
      - - - - - -
    • -

      Support use of titleabbrev in running -headers and footers. -

      -
    • -

      Added (experimental) xref.with.number.and.title -parameter to enable number/title cross references even when the -default would -be just the number. -

      -
    • -

      Generate part ToCs if they're requested. -

      -
    • -

      Use proportional-column-width() in header/footer tables. -

      -
    • -

      Handle alignment correctly when screenshot -wraps a graphic in a figure. -

      -
    • -

      Format chapter and appendix -cross references consistently. -

      -
    • -

      Attempt to support tables with multiple tgroups -in FO. -

      -
    • -

      Output fo:table-columns in -simplelist tables. -

      -
    • -

      Use titlepage.templates.xml for -indexdiv and glossdiv formatting. -

      -
    • -

      Improve support for new bibliography elements. -

      -
    • -

      Added -footnote.number.format, -table.footnote.number.format, -footnote.number.symbols, and -table.footnote.number.symbols for better control of -footnote markers. -

      -
    • -

      Added glossentry.show.acronyms. -

      -
    • -

      Suppress the draft-mode page masters when -draft-mode is no. -

      -
    • -

      Make blank pages verso not recto. D'Oh! -

      -
    • -

      Improved formatting of ulink footnotes. -

      -
    • -

      Fixed bugs in graphic width/height calculations. -

      -
    • -

      Added class attributes to inline elements. -

      -
    • -

      Don't add .html to the filenames identified -with the dbhtml PI. -

      -
    • -

      Don't force a ToC when sections contain refentrys. -

      -
    • -

      Make section title sizes a function of the -body.master.size. -

      -
    -
    -

    Release 1.59.2

    - -

    The 1.59.2 fixes an FO bug in the page masters that causes FOP to fail. -

    • -

      Removed the region-name from the region-body of blank pages. There's -no reason to give the body of blank pages a unique name and doing so causes -a mismatch that FOP detects. -

      -
    • -

      Output IDs for the first paragraphs in listitems. -

      -
    • -

      Fixed some small bugs in the handling of page numbers in double-sided mode. -

      -
    • -

      Attempt to prevent duplicated IDs from being produced when -endterm on xref points -to something with nested structure. -

      -
    • -

      Fix aligment problems in equations. -

      -
    • -

      Output the type attribute on unordered lists (UL) in HTML only if -the css.decoration parameter is true. -

      -
    • -

      Calculate the font size in formal.title.properties so that it's 1.2 times -the base font size, not a fixed "12pt". -

      -
    -
    -

    Release 1.59.1

    - -

    The 1.59.1 fixes a few bugs. -

    • -

      Added Bulgarian localization. -

      -
    • -

      Indexing improvements; localize book indexes to books but allow setindex -to index an entire set. -

      -
    • -

      The default value for rowsep and colsep is now "1" as per CALS. -

      -
    • -

      Added support for titleabbrev (use them for cross -references). -

      -
    • -

      Improvements to mediaobject for selecting print vs. online -images. -

      -
    • -

      Added seperate property sets for figures, -examples, equations, tabless, -and procedures. -

      -
    • -

      Make lineannotations italic. -

      -
    • -

      Support xrefstyle attribute. -

      -
    • -

      Make endterm on -xref higher priority than -xreflabel target. -

      -
    • -

      Glossary formatting improvements. -

      -
    -
    -

    Release 1.58.0

    - -

    The 1.58.0 adds some initial support for extensions in xsltproc, adds -a few features, and fixes bugs. -

    • -

      This release contains the first attempt at extension support for xsltproc. -The only extension available to date is the one that adjusts table column widths. -Run extensions/xsltproc/python/xslt.py. -

      -
    • -

      Fixed bugs in calculation of adjusted column widths to correct for rounding -errors. -

      -
    • -

      Support nested refsection elements correctly. -

      -
    • -

      Reworked gentext.template to take context into consideration. -The name of elements in localization files is now an xpath-like context list, not -just a simple name. -

      -
    • -

      Made some improvements to bibliography formatting. -

      -
    • -

      Improved graphical formatting of admonitions. -

      -
    • -

      Added support for entrytbl. -

      -
    • -

      Support spanning index terms. -

      -
    • -

      Support bibliosource. -

      -
    -
    -

    Release 1.57.0

    - -
    • -

      The 1.57.0 release wasn't documented here. Oops. -

      -
    -
    -

    Release 1.56.0

    - -

    The 1.56.0 release fixes bugs. -

    • -

      Reworked chunking. This will break all existing customizations -layers that change the chunking algorithm. If you're customizing chunking, -look at the new content parameter that's passed to -process-chunk-element and friends. -

      -
    • -

      Support continued and inherited numeration in orderedlist -formatting for FOs. -

      -
    • -

      Added Thai localization. -

      -
    • -

      Tweaked stylesheet documentation stylesheets to link to TDG and -the parameter references. -

      -
    • -

      Allow title on tables of contents ("Table of Contents") to be optional. -Added new keyword to generate.toc. -Support tables of contents on sections. -

      -
    • -

      Made separate parameters for table borders and table cell borders: -table.frame.border.color, -table.frame.border.style, -table.frame.border.thickness, -table.cell.border.color, -table.cell.border.style, and -table.cell.border.thickness. -

      -
    • -

      Suppress formatting of endofrange indexterms. -This is only half-right. They should generate a range, but I haven't figured out how -to do that yet. -

      -
    • -

      Support revdescription. (Bug #582192) -

      -
    • -

      Added default.float.class and fixed figure -floats. (Bug #497603) -

      -
    • -

      Fixed formatting of sbr in FOs. -

      -
    • -

      Added context to the missing template error message. -

      -
    • -

      Process arg correctly in a group. -(Bug #605150) -

      -
    • -

      Removed 'keep-with-next' from formal.title.properties -attribute set now that the stylesheets support the option of putting -such titles below the object. Now the $placement value determines if -'keep-with-next' or 'keep-with-previous' is used in the title block. -

      -
    • -

      Wrap url() around external-destinations when appropriate. -

      -
    • -

      Fixed typo in compact list spacing. (Bug #615464) -

      -
    • -

      Removed spurious hash in anchor name. (Bug #617717) -

      -
    • -

      Address is now displayed verbatim on title pages. (Bug #618600) -

      -
    • -

      The bridgehead.in.toc parameter is now properly -supported. -

      -
    • -

      Improved effectiveness of HTML cleanup by increasing the number -of places where it is used. Improve use of HTML cleanup in XHTML stylesheets. -

      -
    • -

      Support table of contents for appendix in -article. (Bug #596599) -

      -
    • -

      Don't duplicate footnotes in bibliographys and -glossarys. (Bug #583282) -

      -
    • -

      Added default.image.width. (Bug #516859) -

      -
    • -

      Totally reworked funcsynopsis code; it now -supports a 'tabular' presentation style for 'wide' prototypes; see -funcsynopsis.tabular.threshold. (HTML only -right now, I think, FO support, uh, real soon now.) -

      -
    • -

      Reworked support for difference marking; toned down the colors a bit -and added a system.head.content template so that the diff CSS -wasn't overriding user.head.content. (Bug #610660) -

      -
    • -

      Added call to the *.head.content elements when writing -out long description chunks. -

      -
    • -

      Make sure legalnotice link is correct even when -chunking to a different base.dir. -

      -
    • -

      Use CSS to set viewport characteristics if -css.decoration is non-zero, use div instead of p for making -graphic a block element; make figure titles the -default alt -text for images in a figure.

      -
    • -

      Added space-after to list.block.spacing. -

      -
    • -

      Reworked section.level template to give correct answer -instead of being off by one. -

      -
    • -

      When processing tables, use the tabstyle -attribute as the division class. -

      -
    • -

      Fixed bug in html2xhtml.xsl that was causing the -XHTML chunker to output HTML instead of XHTML. -

      -
    -
    -

    Older releases

    - -

    To view the release notes for older releases, see http://cvs.sourceforge.net/viewcvs.py/docbook/xsl/RELEASE-NOTES.xml. Be - aware that there were no release notes for releases prior to the - 1.50.0 release.

    -
    -

    About dot-zero releases

    - -

    DocBook Project “dot zero” releases should be - considered experimental and are always - followed by stable “dot one plus” releases, usually within - two or three weeks. Please help to ensure the stability of - “dot one plus” releases by carefully testing each - “dot zero” release and reporting back about any - problems you find.

    -

    It is not recommended that you use a “dot zero” - release in a production system. Instead, you should wait for - the “dot one” or greater versions.

    -
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.pdf b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.pdf deleted file mode 100644 index 83b9d9c32f5d8b5e55e47ba7c197b4e3f588867a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.pdf +++ /dev/null @@ -1,24334 +0,0 @@ -%PDF-1.4 -%ÐÔÅØ -1 0 obj -<< /S /GoTo /D (section.1) >> -endobj -4 0 obj -(Release Notes: 1.76.1) -endobj -5 0 obj -<< /S /GoTo /D (subsection.1.1) >> -endobj -8 0 obj -(Common) -endobj -9 0 obj -<< /S /GoTo /D (subsection.1.2) >> -endobj -12 0 obj -(FO) -endobj -13 0 obj -<< /S /GoTo /D (subsection.1.3) >> -endobj -16 0 obj -(HTML) -endobj -17 0 obj -<< /S /GoTo /D (subsection.1.4) >> -endobj -20 0 obj -(Epub) -endobj -21 0 obj -<< /S /GoTo /D (subsection.1.5) >> -endobj -24 0 obj -(Webhelp) -endobj -25 0 obj -<< /S /GoTo /D (subsection.1.6) >> -endobj -28 0 obj -(Params) -endobj -29 0 obj -<< /S /GoTo /D (subsection.1.7) >> -endobj -32 0 obj -(Extensions) -endobj -33 0 obj -<< /S /GoTo /D (section.2) >> -endobj -36 0 obj -(Release Notes: 1.76.1) -endobj -37 0 obj -<< /S /GoTo /D (subsection.2.1) >> -endobj -40 0 obj -(FO) -endobj -41 0 obj -<< /S /GoTo /D (subsection.2.2) >> -endobj -44 0 obj -(HTML) -endobj -45 0 obj -<< /S /GoTo /D (subsection.2.3) >> -endobj -48 0 obj -(Params) -endobj -49 0 obj -<< /S /GoTo /D (section.3) >> -endobj -52 0 obj -(Release Notes: 1.76.0) -endobj -53 0 obj -<< /S /GoTo /D (subsection.3.1) >> -endobj -56 0 obj -(Gentext) -endobj -57 0 obj -<< /S /GoTo /D (subsection.3.2) >> -endobj -60 0 obj -(Common) -endobj -61 0 obj -<< /S /GoTo /D (subsection.3.3) >> -endobj -64 0 obj -(FO) -endobj -65 0 obj -<< /S /GoTo /D (subsection.3.4) >> -endobj -68 0 obj -(HTML) -endobj -69 0 obj -<< /S /GoTo /D (subsection.3.5) >> -endobj -72 0 obj -(Manpages) -endobj -73 0 obj -<< /S /GoTo /D (subsection.3.6) >> -endobj -76 0 obj -(Epub) -endobj -77 0 obj -<< /S /GoTo /D (subsection.3.7) >> -endobj -80 0 obj -(Eclipse) -endobj -81 0 obj -<< /S /GoTo /D (subsection.3.8) >> -endobj -84 0 obj -(Params) -endobj -85 0 obj -<< /S /GoTo /D (subsection.3.9) >> -endobj -88 0 obj -(XSL-Xalan) -endobj -89 0 obj -<< /S /GoTo /D (section.4) >> -endobj -92 0 obj -(Release Notes: 1.75.2) -endobj -93 0 obj -<< /S /GoTo /D (subsection.4.1) >> -endobj -96 0 obj -(Gentext) -endobj -97 0 obj -<< /S /GoTo /D (subsection.4.2) >> -endobj -100 0 obj -(Common) -endobj -101 0 obj -<< /S /GoTo /D (subsection.4.3) >> -endobj -104 0 obj -(FO) -endobj -105 0 obj -<< /S /GoTo /D (subsection.4.4) >> -endobj -108 0 obj -(HTML) -endobj -109 0 obj -<< /S /GoTo /D (subsection.4.5) >> -endobj -112 0 obj -(Manpages) -endobj -113 0 obj -<< /S /GoTo /D (subsection.4.6) >> -endobj -116 0 obj -(Epub) -endobj -117 0 obj -<< /S /GoTo /D (subsection.4.7) >> -endobj -120 0 obj -(Profiling) -endobj -121 0 obj -<< /S /GoTo /D (subsection.4.8) >> -endobj -124 0 obj -(XSL-Saxon) -endobj -125 0 obj -<< /S /GoTo /D (subsection.4.9) >> -endobj -128 0 obj -(XSL-Xalan) -endobj -129 0 obj -<< /S /GoTo /D (section.5) >> -endobj -132 0 obj -(Release Notes: 1.75.1) -endobj -133 0 obj -<< /S /GoTo /D (subsection.5.1) >> -endobj -136 0 obj -(FO) -endobj -137 0 obj -<< /S /GoTo /D (subsection.5.2) >> -endobj -140 0 obj -(HTML) -endobj -141 0 obj -<< /S /GoTo /D (subsection.5.3) >> -endobj -144 0 obj -(Epub) -endobj -145 0 obj -<< /S /GoTo /D (subsection.5.4) >> -endobj -148 0 obj -(Params) -endobj -149 0 obj -<< /S /GoTo /D (section.6) >> -endobj -152 0 obj -(Release Notes: 1.75.0) -endobj -153 0 obj -<< /S /GoTo /D (subsection.6.1) >> -endobj -156 0 obj -(Gentext) -endobj -157 0 obj -<< /S /GoTo /D (subsection.6.2) >> -endobj -160 0 obj -(Common) -endobj -161 0 obj -<< /S /GoTo /D (subsection.6.3) >> -endobj -164 0 obj -(FO) -endobj -165 0 obj -<< /S /GoTo /D (subsection.6.4) >> -endobj -168 0 obj -(HTML) -endobj -169 0 obj -<< /S /GoTo /D (subsection.6.5) >> -endobj -172 0 obj -(Manpages) -endobj -173 0 obj -<< /S /GoTo /D (subsection.6.6) >> -endobj -176 0 obj -(ePub) -endobj -177 0 obj -<< /S /GoTo /D (subsection.6.7) >> -endobj -180 0 obj -(HTMLHelp) -endobj -181 0 obj -<< /S /GoTo /D (subsection.6.8) >> -endobj -184 0 obj -(Params) -endobj -185 0 obj -<< /S /GoTo /D (subsection.6.9) >> -endobj -188 0 obj -(Highlighting) -endobj -189 0 obj -<< /S /GoTo /D (subsection.6.10) >> -endobj -192 0 obj -(XSL-Saxon) -endobj -193 0 obj -<< /S /GoTo /D (subsection.6.11) >> -endobj -196 0 obj -(XSL-Xalan) -endobj -197 0 obj -<< /S /GoTo /D (section.7) >> -endobj -200 0 obj -(Release Notes: 1.74.3) -endobj -201 0 obj -<< /S /GoTo /D (section.8) >> -endobj -204 0 obj -(Release Notes: 1.74.2) -endobj -205 0 obj -<< /S /GoTo /D (section.9) >> -endobj -208 0 obj -(Release Notes: 1.74.1) -endobj -209 0 obj -<< /S /GoTo /D (subsection.9.1) >> -endobj -212 0 obj -(Gentext) -endobj -213 0 obj -<< /S /GoTo /D (subsection.9.2) >> -endobj -216 0 obj -(FO) -endobj -217 0 obj -<< /S /GoTo /D (subsection.9.3) >> -endobj -220 0 obj -(HTML) -endobj -221 0 obj -<< /S /GoTo /D (subsection.9.4) >> -endobj -224 0 obj -(Manpages) -endobj -225 0 obj -<< /S /GoTo /D (subsection.9.5) >> -endobj -228 0 obj -(ePub) -endobj -229 0 obj -<< /S /GoTo /D (subsection.9.6) >> -endobj -232 0 obj -(Roundtrip) -endobj -233 0 obj -<< /S /GoTo /D (subsection.9.7) >> -endobj -236 0 obj -(Params) -endobj -237 0 obj -<< /S /GoTo /D (subsection.9.8) >> -endobj -240 0 obj -(Highlighting) -endobj -241 0 obj -<< /S /GoTo /D (section.10) >> -endobj -244 0 obj -(Release Notes: 1.74.0) -endobj -245 0 obj -<< /S /GoTo /D (subsection.10.1) >> -endobj -248 0 obj -(Gentext) -endobj -249 0 obj -<< /S /GoTo /D (subsection.10.2) >> -endobj -252 0 obj -(Common) -endobj -253 0 obj -<< /S /GoTo /D (subsection.10.3) >> -endobj -256 0 obj -(FO) -endobj -257 0 obj -<< /S /GoTo /D (subsection.10.4) >> -endobj -260 0 obj -(HTML) -endobj -261 0 obj -<< /S /GoTo /D (subsection.10.5) >> -endobj -264 0 obj -(Manpages) -endobj -265 0 obj -<< /S /GoTo /D (subsection.10.6) >> -endobj -268 0 obj -(Epub) -endobj -269 0 obj -<< /S /GoTo /D (subsection.10.7) >> -endobj -272 0 obj -(HTMLHelp) -endobj -273 0 obj -<< /S /GoTo /D (subsection.10.8) >> -endobj -276 0 obj -(Eclipse) -endobj -277 0 obj -<< /S /GoTo /D (subsection.10.9) >> -endobj -280 0 obj -(JavaHelp) -endobj -281 0 obj -<< /S /GoTo /D (subsection.10.10) >> -endobj -284 0 obj -(Roundtrip) -endobj -285 0 obj -<< /S /GoTo /D (subsection.10.11) >> -endobj -288 0 obj -(Slides) -endobj -289 0 obj -<< /S /GoTo /D (subsection.10.12) >> -endobj -292 0 obj -(Website) -endobj -293 0 obj -<< /S /GoTo /D (subsection.10.13) >> -endobj -296 0 obj -(Params) -endobj -297 0 obj -<< /S /GoTo /D (subsection.10.14) >> -endobj -300 0 obj -(Profiling) -endobj -301 0 obj -<< /S /GoTo /D (subsection.10.15) >> -endobj -304 0 obj -(Tools) -endobj -305 0 obj -<< /S /GoTo /D (subsection.10.16) >> -endobj -308 0 obj -(Extensions) -endobj -309 0 obj -<< /S /GoTo /D (subsection.10.17) >> -endobj -312 0 obj -(XSL-Saxon) -endobj -313 0 obj -<< /S /GoTo /D (subsection.10.18) >> -endobj -316 0 obj -(XSL-Xalan) -endobj -317 0 obj -<< /S /GoTo /D (subsection.10.19) >> -endobj -320 0 obj -(XSL-libxslt) -endobj -321 0 obj -<< /S /GoTo /D (section.11) >> -endobj -324 0 obj -(Release Notes: 1.73.2) -endobj -325 0 obj -<< /S /GoTo /D (section.12) >> -endobj -328 0 obj -(Release: 1.73.1) -endobj -329 0 obj -<< /S /GoTo /D (subsection.12.1) >> -endobj -332 0 obj -(Gentext) -endobj -333 0 obj -<< /S /GoTo /D (subsection.12.2) >> -endobj -336 0 obj -(FO) -endobj -337 0 obj -<< /S /GoTo /D (subsection.12.3) >> -endobj -340 0 obj -(HTML) -endobj -341 0 obj -<< /S /GoTo /D (subsection.12.4) >> -endobj -344 0 obj -(Manpages) -endobj -345 0 obj -<< /S /GoTo /D (subsection.12.5) >> -endobj -348 0 obj -(HTMLHelp) -endobj -349 0 obj -<< /S /GoTo /D (subsection.12.6) >> -endobj -352 0 obj -(Eclipse) -endobj -353 0 obj -<< /S /GoTo /D (subsection.12.7) >> -endobj -356 0 obj -(JavaHelp) -endobj -357 0 obj -<< /S /GoTo /D (subsection.12.8) >> -endobj -360 0 obj -(Roundtrip) -endobj -361 0 obj -<< /S /GoTo /D (subsection.12.9) >> -endobj -364 0 obj -(Params) -endobj -365 0 obj -<< /S /GoTo /D (section.13) >> -endobj -368 0 obj -(Release: 1.73.0) -endobj -369 0 obj -<< /S /GoTo /D (subsection.13.1) >> -endobj -372 0 obj -(Gentext) -endobj -373 0 obj -<< /S /GoTo /D (subsection.13.2) >> -endobj -376 0 obj -(Common) -endobj -377 0 obj -<< /S /GoTo /D (subsection.13.3) >> -endobj -380 0 obj -(FO) -endobj -381 0 obj -<< /S /GoTo /D (subsection.13.4) >> -endobj -384 0 obj -(HTML) -endobj -385 0 obj -<< /S /GoTo /D (subsection.13.5) >> -endobj -388 0 obj -(Manpages) -endobj -389 0 obj -<< /S /GoTo /D (subsection.13.6) >> -endobj -392 0 obj -(Eclipse) -endobj -393 0 obj -<< /S /GoTo /D (subsection.13.7) >> -endobj -396 0 obj -(JavaHelp) -endobj -397 0 obj -<< /S /GoTo /D (subsection.13.8) >> -endobj -400 0 obj -(Roundtrip) -endobj -401 0 obj -<< /S /GoTo /D (subsection.13.9) >> -endobj -404 0 obj -(Params) -endobj -405 0 obj -<< /S /GoTo /D (subsection.13.10) >> -endobj -408 0 obj -(Highlighting) -endobj -409 0 obj -<< /S /GoTo /D (subsection.13.11) >> -endobj -412 0 obj -(Profiling) -endobj -413 0 obj -<< /S /GoTo /D (subsection.13.12) >> -endobj -416 0 obj -(Lib) -endobj -417 0 obj -<< /S /GoTo /D (subsection.13.13) >> -endobj -420 0 obj -(Tools) -endobj -421 0 obj -<< /S /GoTo /D (subsection.13.14) >> -endobj -424 0 obj -(XSL-Saxon) -endobj -425 0 obj -<< /S /GoTo /D (subsection.13.15) >> -endobj -428 0 obj -(XSL-Xalan) -endobj -429 0 obj -<< /S /GoTo /D (section.14) >> -endobj -432 0 obj -(Release: 1.72.0) -endobj -433 0 obj -<< /S /GoTo /D (subsection.14.1) >> -endobj -436 0 obj -(Common) -endobj -437 0 obj -<< /S /GoTo /D (subsection.14.2) >> -endobj -440 0 obj -(FO) -endobj -441 0 obj -<< /S /GoTo /D (subsection.14.3) >> -endobj -444 0 obj -(HTML) -endobj -445 0 obj -<< /S /GoTo /D (subsection.14.4) >> -endobj -448 0 obj -(Manpages) -endobj -449 0 obj -<< /S /GoTo /D (subsection.14.5) >> -endobj -452 0 obj -(Params) -endobj -453 0 obj -<< /S /GoTo /D (subsection.14.6) >> -endobj -456 0 obj -(Template) -endobj -457 0 obj -<< /S /GoTo /D (subsection.14.7) >> -endobj -460 0 obj -(Roundtrip) -endobj -461 0 obj -<< /S /GoTo /D (section.15) >> -endobj -464 0 obj -(Release: 1.71.1) -endobj -465 0 obj -<< /S /GoTo /D (subsection.15.1) >> -endobj -468 0 obj -(Common) -endobj -469 0 obj -<< /S /GoTo /D (subsection.15.2) >> -endobj -472 0 obj -(FO) -endobj -473 0 obj -<< /S /GoTo /D (subsection.15.3) >> -endobj -476 0 obj -(HTML) -endobj -477 0 obj -<< /S /GoTo /D (subsection.15.4) >> -endobj -480 0 obj -(Highlighting) -endobj -481 0 obj -<< /S /GoTo /D (subsection.15.5) >> -endobj -484 0 obj -(Manpages) -endobj -485 0 obj -<< /S /GoTo /D (subsection.15.6) >> -endobj -488 0 obj -(Params) -endobj -489 0 obj -<< /S /GoTo /D (subsection.15.7) >> -endobj -492 0 obj -(Profiling) -endobj -493 0 obj -<< /S /GoTo /D (section.16) >> -endobj -496 0 obj -(Release: 1.71.0) -endobj -497 0 obj -<< /S /GoTo /D (subsection.16.1) >> -endobj -500 0 obj -(Common) -endobj -501 0 obj -<< /S /GoTo /D (subsection.16.2) >> -endobj -504 0 obj -(Extensions) -endobj -505 0 obj -<< /S /GoTo /D (subsection.16.3) >> -endobj -508 0 obj -(FO) -endobj -509 0 obj -<< /S /GoTo /D (subsection.16.4) >> -endobj -512 0 obj -(HTML) -endobj -513 0 obj -<< /S /GoTo /D (subsection.16.5) >> -endobj -516 0 obj -(Highlighting) -endobj -517 0 obj -<< /S /GoTo /D (subsection.16.6) >> -endobj -520 0 obj -(Manpages) -endobj -521 0 obj -<< /S /GoTo /D (subsection.16.7) >> -endobj -524 0 obj -(Params) -endobj -525 0 obj -<< /S /GoTo /D (subsection.16.8) >> -endobj -528 0 obj -(Tools) -endobj -529 0 obj -<< /S /GoTo /D (section.17) >> -endobj -532 0 obj -(Release: 1.70.1) -endobj -533 0 obj -<< /S /GoTo /D (subsection.17.1) >> -endobj -536 0 obj -(FO) -endobj -537 0 obj -<< /S /GoTo /D (subsection.17.2) >> -endobj -540 0 obj -(HTML) -endobj -541 0 obj -<< /S /GoTo /D (subsection.17.3) >> -endobj -544 0 obj -(HTMLHelp) -endobj -545 0 obj -<< /S /GoTo /D (subsection.17.4) >> -endobj -548 0 obj -(Params) -endobj -549 0 obj -<< /S /GoTo /D (section.18) >> -endobj -552 0 obj -(Release: 1.70.0) -endobj -553 0 obj -<< /S /GoTo /D (subsection.18.1) >> -endobj -556 0 obj -(Common) -endobj -557 0 obj -<< /S /GoTo /D (subsection.18.2) >> -endobj -560 0 obj -(Extensions) -endobj -561 0 obj -<< /S /GoTo /D (subsection.18.3) >> -endobj -564 0 obj -(FO) -endobj -565 0 obj -<< /S /GoTo /D (subsection.18.4) >> -endobj -568 0 obj -(HTML) -endobj -569 0 obj -<< /S /GoTo /D (subsection.18.5) >> -endobj -572 0 obj -(Manpages) -endobj -573 0 obj -<< /S /GoTo /D (subsection.18.6) >> -endobj -576 0 obj -(Params) -endobj -577 0 obj -<< /S /GoTo /D (subsection.18.7) >> -endobj -580 0 obj -(Profiling) -endobj -581 0 obj -<< /S /GoTo /D (subsection.18.8) >> -endobj -584 0 obj -(Tools) -endobj -585 0 obj -<< /S /GoTo /D (subsection.18.9) >> -endobj -588 0 obj -(WordML) -endobj -589 0 obj -<< /S /GoTo /D (section.19) >> -endobj -592 0 obj -(Release 1.69.1) -endobj -593 0 obj -<< /S /GoTo /D (section.20) >> -endobj -596 0 obj -(Release 1.69.0) -endobj -597 0 obj -<< /S /GoTo /D (subsection.20.1) >> -endobj -600 0 obj -(Common) -endobj -601 0 obj -<< /S /GoTo /D (subsection.20.2) >> -endobj -604 0 obj -(FO) -endobj -605 0 obj -<< /S /GoTo /D (subsection.20.3) >> -endobj -608 0 obj -(Help) -endobj -609 0 obj -<< /S /GoTo /D (subsection.20.4) >> -endobj -612 0 obj -(HTML) -endobj -613 0 obj -<< /S /GoTo /D (subsection.20.5) >> -endobj -616 0 obj -(man) -endobj -617 0 obj -<< /S /GoTo /D (section.21) >> -endobj -620 0 obj -(Release 1.68.1) -endobj -621 0 obj -<< /S /GoTo /D (section.22) >> -endobj -624 0 obj -(Release 1.68.0) -endobj -625 0 obj -<< /S /GoTo /D (section.23) >> -endobj -628 0 obj -(Release 1.67.2) -endobj -629 0 obj -<< /S /GoTo /D (section.24) >> -endobj -632 0 obj -(Release 1.67.1) -endobj -633 0 obj -<< /S /GoTo /D (section.25) >> -endobj -636 0 obj -(Release 1.67.0) -endobj -637 0 obj -<< /S /GoTo /D (section.26) >> -endobj -640 0 obj -(Release 1.66.1) -endobj -641 0 obj -<< /S /GoTo /D (section.27) >> -endobj -644 0 obj -(Release 1.65.0) -endobj -645 0 obj -<< /S /GoTo /D (section.28) >> -endobj -648 0 obj -(Release 1.64.1) -endobj -649 0 obj -<< /S /GoTo /D (section.29) >> -endobj -652 0 obj -(Release 1.61.0) -endobj -653 0 obj -<< /S /GoTo /D (section.30) >> -endobj -656 0 obj -(Release 1.60.1) -endobj -657 0 obj -<< /S /GoTo /D (section.31) >> -endobj -660 0 obj -(Release 1.59.2) -endobj -661 0 obj -<< /S /GoTo /D (section.32) >> -endobj -664 0 obj -(Release 1.59.1) -endobj -665 0 obj -<< /S /GoTo /D (section.33) >> -endobj -668 0 obj -(Release 1.58.0) -endobj -669 0 obj -<< /S /GoTo /D (section.34) >> -endobj -672 0 obj -(Release 1.57.0) -endobj -673 0 obj -<< /S /GoTo /D (section.35) >> -endobj -676 0 obj -(Release 1.56.0) -endobj -677 0 obj -<< /S /GoTo /D (section.36) >> -endobj -680 0 obj -(Older releases) -endobj -681 0 obj -<< /S /GoTo /D (section.37) >> -endobj -684 0 obj -(About dot-zero releases) -endobj -685 0 obj -<< /S /GoTo /D [686 0 R /FitH ] >> -endobj -689 0 obj << -/Length 286 -/Filter /FlateDecode ->> -stream -xÚ•AOÃ0 …ïù>v‡zvÚ¤Éu B‚õ€4퀶”!VUÐJˆÓ *Upà’<ÛÑ{ñGð WjU«å¥!ðè­¶P7`5Ú -XTP`›=„SxêÃ"׆²»n}’M÷žÄp<×Ý~Õu¯©xÜÜ.võÄäÌèIn›áóúcCÇ’Îà$Ý1½ô¹dÈ úêœÿß©‹Z½)7cÑú*ÏhIþUÛÁAf’‡bãË êŠ>ÁFÝ+:/>¿ ìÐxËñ/>J%•èªr΢r?,D6 MÙÈCŠÄCÄÄCŠÈc3~é·A²þ? Ï -+Ó2LÞñŽRÇ|·–×-ú›‰Ü‹ú‚- -endstream -endobj -686 0 obj << -/Type /Page -/Contents 689 0 R -/Resources 688 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 696 0 R ->> endobj -687 0 obj << -/Type /XObject -/Subtype /Image -/Width 80 -/Height 15 -/BitsPerComponent 8 -/ColorSpace /DeviceRGB -/Length 211 -/Filter/FlateDecode -/DecodeParms<> ->> -stream -HÇíW;Ã0}T>«™³dÈ2dÉÌiÛ¡*òÇR†H”!ñ±Ÿy2ÅáIq‚–™ÃO¥êÉû8·Ç¢]—À ÎÄàÐ#gFuÛìóÀ—äë²+ÛS½ÙKToYè½µÌ3)ÃV›¦ç¦[Q¥ÞAY›)Ú¢¦~5k¸V0n «‡¶7o]óì¯'N¹RÌ͵‚Õaë‚ßêñ®‹‘8t¥\˜ìð|K#ŸŠ´ÍaÅÙÄL1Fq2‡™ù?‡½Ìa7w<ßž,äíoé/§Í -endstream -endobj -690 0 obj << -/D [686 0 R /XYZ -16.307 900.716 null] ->> endobj -693 0 obj << -/D [686 0 R /XYZ 56.693 759.068 null] ->> endobj -694 0 obj << -/D [686 0 R /XYZ 56.693 759.068 null] ->> endobj -688 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R >> -/XObject << /Im1 687 0 R >> -/ProcSet [ /PDF /Text /ImageC ] ->> endobj -737 0 obj << -/Length 780 -/Filter /FlateDecode ->> -stream -xÚí›[oÚ0€ßó+üHræ»ã=¶k;MíÖ¤!u}HiJÑB Ӻ?‡\ˆU^µIÄø)†ÛŸÏ5£)Âè"8oÎF´¤‘¤ Š ¦ÐèÝnÒ,MViQ‹2]ÕÍÇbY7ʧææ»brRßêãáex7ú`ÄD„€¢mXþÊÒÕSš–«ê¶‘NPl¤KVIçZ1ßD´jäÏfUÇàl|ˆ#‚„©Rš€ÄMæÁíFæž\Çèçºç ‚2iÚŸ¼µrŠMˆ¨„·ƒr ‚ÈZøi‘—iÞÍUmì”YÓ€9¯{’0"ã=Ûõ6ŒÁÊ,n½–zË)ª7X5›„ÛѪ~ídwE\c`ÄlQ k~ë)©§Å|^äad¶pa$̬Žçµ>”¹l"܃ü6"\ÊÔíu­7[tiC÷ü“Y$¥ÇGö(©³†úûÑÕ¥±#RyÒn‘¦-iÞ>[ü¸7¤™öªí¶j‹ø—0ƃôþ)Í•e÷¤{CšZ’– éëˆA²LæU­ˆ×lGy«Ö”?›äa5+òU•O¸§„w2?Ó´ÉûŒC¬›Ä–þÓüý}þG»üÏg.Efelh—ú ÁQÒ´%Í|á0ïŒlÝ‚“ÁÿÁÉ4‡uNæ"ÍË´:ˆÏe)­ý)Ô=9~Üʱ°Î±u9ÙYºÌ‹¹iIû`±ç¤•U°ÈºêâU’/’iõÐVhùðùjKM–þqAïZWO °%ð®¨8Éf‹:ö—žy´{ ›XÂŽ}ªï„rKo­Þãáe4N²Ä¤[1÷€˜,}u‡[qÐ?q0PÅ»ŠÑ—«8±cV¶Ì ÷EGß®aᾈã"ÝN}Ç¥`YR÷Eœc!í‹8ý´ßÌÒ;û"Α)t[Ĺ^_1¦Ù,ŸšÕrx»¢Úéx#£&ÏUì­hìÉ.YnIÖ×jÜ Û^÷½YÈ1`©_óbáoJËÃp -endstream -endobj -736 0 obj << -/Type /Page -/Contents 737 0 R -/Resources 735 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 696 0 R -/Annots [ 697 0 R 698 0 R 699 0 R 700 0 R 701 0 R 702 0 R 703 0 R 704 0 R 705 0 R 706 0 R 707 0 R 708 0 R 709 0 R 710 0 R 711 0 R 712 0 R 713 0 R 714 0 R 715 0 R 716 0 R 717 0 R 718 0 R 719 0 R 720 0 R 721 0 R 722 0 R 723 0 R 724 0 R 725 0 R 726 0 R 727 0 R 728 0 R ] ->> endobj -697 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 706.475 567.925 715.332] -/A << /S /GoTo /D (section.1) >> ->> endobj -698 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 688.543 567.925 697.29] -/A << /S /GoTo /D (subsection.1.1) >> ->> endobj -699 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 670.61 567.925 679.357] -/A << /S /GoTo /D (subsection.1.2) >> ->> endobj -700 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 652.677 567.925 661.424] -/A << /S /GoTo /D (subsection.1.3) >> ->> endobj -701 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 634.744 567.925 643.491] -/A << /S /GoTo /D (subsection.1.4) >> ->> endobj -702 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 616.812 567.925 625.559] -/A << /S /GoTo /D (subsection.1.5) >> ->> endobj -703 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 598.879 567.925 607.626] -/A << /S /GoTo /D (subsection.1.6) >> ->> endobj -704 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 580.946 567.925 589.693] -/A << /S /GoTo /D (subsection.1.7) >> ->> endobj -705 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 552.931 567.925 561.907] -/A << /S /GoTo /D (section.2) >> ->> endobj -706 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 535.018 567.925 543.865] -/A << /S /GoTo /D (subsection.2.1) >> ->> endobj -707 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 517.086 567.925 525.932] -/A << /S /GoTo /D (subsection.2.2) >> ->> endobj -708 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 499.153 567.925 507.999] -/A << /S /GoTo /D (subsection.2.3) >> ->> endobj -709 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 471.237 567.925 480.214] -/A << /S /GoTo /D (section.3) >> ->> endobj -710 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 453.424 567.925 462.171] -/A << /S /GoTo /D (subsection.3.1) >> ->> endobj -711 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 435.491 567.925 444.239] -/A << /S /GoTo /D (subsection.3.2) >> ->> endobj -712 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 417.459 567.925 426.306] -/A << /S /GoTo /D (subsection.3.3) >> ->> endobj -713 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 399.526 567.925 408.104] -/A << /S /GoTo /D (subsection.3.4) >> ->> endobj -714 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [560.952 381.474 567.925 390.44] -/A << /S /GoTo /D (subsection.3.5) >> ->> endobj -715 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 363.661 567.925 372.508] -/A << /S /GoTo /D (subsection.3.6) >> ->> endobj -716 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 345.828 567.925 354.575] -/A << /S /GoTo /D (subsection.3.7) >> ->> endobj -717 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 327.895 567.925 336.642] -/A << /S /GoTo /D (subsection.3.8) >> ->> endobj -718 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 309.962 567.925 318.709] -/A << /S /GoTo /D (subsection.3.9) >> ->> endobj -719 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 282.067 567.925 290.924] -/A << /S /GoTo /D (section.4) >> ->> endobj -720 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 264.134 567.925 272.881] -/A << /S /GoTo /D (subsection.4.1) >> ->> endobj -721 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 246.201 567.925 254.948] -/A << /S /GoTo /D (subsection.4.2) >> ->> endobj -722 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 228.169 567.925 237.016] -/A << /S /GoTo /D (subsection.4.3) >> ->> endobj -723 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 210.236 567.925 219.083] -/A << /S /GoTo /D (subsection.4.4) >> ->> endobj -724 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 192.304 567.925 201.15] -/A << /S /GoTo /D (subsection.4.5) >> ->> endobj -725 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 174.371 567.925 183.217] -/A << /S /GoTo /D (subsection.4.6) >> ->> endobj -726 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 156.438 567.925 165.285] -/A << /S /GoTo /D (subsection.4.7) >> ->> endobj -727 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 138.605 567.925 147.352] -/A << /S /GoTo /D (subsection.4.8) >> ->> endobj -728 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 120.672 567.925 129.419] -/A << /S /GoTo /D (subsection.4.9) >> ->> endobj -738 0 obj << -/D [736 0 R /XYZ -11.232 900.716 null] ->> endobj -735 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -776 0 obj << -/Length 822 -/Filter /FlateDecode ->> -stream -xÚí›;oÛ0Çw} -ŽÖ@–oŠÓæ"é#ö È &ŠcÔ¶R[AÓo_Ê”l'0ÚKÐÁRn0(C2Òïîtü›ädL89NFÉ»#ÉgÞJKF·ÄJfÉ„bÊ‘Ñ ¹œÓ"_)•†>—U±Œ‡·å"TwÍÉåõAYþˆ_.†§éÕèS0C…`Þ˜ØÛ°ú=-–wEQ-ëÓÁº Y°nUm]{Í„%Ô0ïó“ɤ¾09%?ºãDc™õŠ8/˜å’\Ï’Ë+Nn¹`iŸ‘_«+gÄΤ²áxJ†É·„?¹s·uçmŸÚ3Ám4nR*8ç;žÁû”*Á‚9ÃÄj€ql‹1‰çÇ 1<w*|[õ&ôêÂvÏž<Õ™aJúð¼ ?Š‡!«G_Rª¥°”†n±Y5Úû}Ë6Ù®pIƒ?÷€¶]É6tÙ@?G³A÷ -tˆò†´jHÞ?|¤•ÇÈî&p‹lÝðþš -3Èù¬~›:¸{ûYIA…f^k‡ÚBF° š‚Ck -óâšÂ®kŠãb^µ#>V)uÞ£ûuÅý,$ÛØuñ¡œÍÊyJCUp÷®Õv];àÔ Ô3XHkœt´T0Ц}–Ïïóq­ºx÷¯foÛð-¾Ö3?m0qw¸ƒÅ³ÛJÜ'Åô>¥Ö)亿\/ä gôo ·oÃx2¾›†O5™ká.C¶ûËÖßÉ‚‡~ãŸWt˜?ÖSf'‘lgÉn/±{‘Oó6Ó˜•;"°:€Àª™ -¬Š?¡íùh³ñ° dSþ›Í}zMñ:›!Ù£Üõü©èÍè×J2jý§¾o…ZcÇAKhZcñn²·A­ñMÅs«-Ÿ—ó›j1©ÅF­‘ïÞóU0¾5Ç^àÖÀü¡èظU0š_ÉÿœÙC—ˆ©,;o]NpÖ(f8µïªÿV¤ÖÛ#"h\#Ö%¸WE¸(Ûôz„®#t”m: -ZÃTÙ@ÚDÒ¨Ût‹¯²xqsP·yäí6‰—ˆu€ëî8nÛ][–5gÜú×ìXþº[™è -endstream -endobj -775 0 obj << -/Type /Page -/Contents 776 0 R -/Resources 774 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 696 0 R -/Annots [ 729 0 R 730 0 R 731 0 R 732 0 R 733 0 R 734 0 R 740 0 R 741 0 R 742 0 R 743 0 R 744 0 R 745 0 R 746 0 R 747 0 R 748 0 R 749 0 R 750 0 R 751 0 R 752 0 R 753 0 R 754 0 R 755 0 R 756 0 R 757 0 R 758 0 R 759 0 R 760 0 R 761 0 R 762 0 R 763 0 R 764 0 R 765 0 R 766 0 R 767 0 R 768 0 R 769 0 R ] ->> endobj -729 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 748.109 567.925 756.966] -/A << /S /GoTo /D (section.5) >> ->> endobj -730 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 730.38 567.925 739.127] -/A << /S /GoTo /D (subsection.5.1) >> ->> endobj -731 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 712.65 567.925 721.397] -/A << /S /GoTo /D (subsection.5.2) >> ->> endobj -732 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 694.821 567.925 703.668] -/A << /S /GoTo /D (subsection.5.3) >> ->> endobj -733 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 677.091 567.925 685.938] -/A << /S /GoTo /D (subsection.5.4) >> ->> endobj -734 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 649.379 567.925 658.355] -/A << /S /GoTo /D (section.6) >> ->> endobj -740 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 631.669 567.925 640.516] -/A << /S /GoTo /D (subsection.6.1) >> ->> endobj -741 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 613.939 567.925 622.786] -/A << /S /GoTo /D (subsection.6.2) >> ->> endobj -742 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 596.21 567.925 605.056] -/A << /S /GoTo /D (subsection.6.3) >> ->> endobj -743 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 578.48 567.925 587.327] -/A << /S /GoTo /D (subsection.6.4) >> ->> endobj -744 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 560.75 567.925 569.597] -/A << /S /GoTo /D (subsection.6.5) >> ->> endobj -745 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 543.021 567.925 551.867] -/A << /S /GoTo /D (subsection.6.6) >> ->> endobj -746 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 525.291 567.925 534.138] -/A << /S /GoTo /D (subsection.6.7) >> ->> endobj -747 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 507.561 567.925 516.408] -/A << /S /GoTo /D (subsection.6.8) >> ->> endobj -748 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 489.712 567.925 498.678] -/A << /S /GoTo /D (subsection.6.9) >> ->> endobj -749 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 471.982 567.925 480.949] -/A << /S /GoTo /D (subsection.6.10) >> ->> endobj -750 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 454.253 567.925 463.219] -/A << /S /GoTo /D (subsection.6.11) >> ->> endobj -751 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 426.66 567.925 435.636] -/A << /S /GoTo /D (section.7) >> ->> endobj -752 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 398.968 567.925 407.944] -/A << /S /GoTo /D (section.8) >> ->> endobj -753 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 371.275 567.925 380.252] -/A << /S /GoTo /D (section.9) >> ->> endobj -754 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 353.566 567.925 362.412] -/A << /S /GoTo /D (subsection.9.1) >> ->> endobj -755 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 335.836 567.925 344.683] -/A << /S /GoTo /D (subsection.9.2) >> ->> endobj -756 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 318.106 567.925 326.953] -/A << /S /GoTo /D (subsection.9.3) >> ->> endobj -757 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 300.377 567.925 309.223] -/A << /S /GoTo /D (subsection.9.4) >> ->> endobj -758 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 282.647 567.925 291.493] -/A << /S /GoTo /D (subsection.9.5) >> ->> endobj -759 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 264.917 567.925 273.764] -/A << /S /GoTo /D (subsection.9.6) >> ->> endobj -760 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 247.187 567.925 256.034] -/A << /S /GoTo /D (subsection.9.7) >> ->> endobj -761 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 229.458 567.925 238.304] -/A << /S /GoTo /D (subsection.9.8) >> ->> endobj -762 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 201.745 567.925 210.722] -/A << /S /GoTo /D (section.10) >> ->> endobj -763 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 184.036 567.925 192.882] -/A << /S /GoTo /D (subsection.10.1) >> ->> endobj -764 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 166.306 567.925 175.153] -/A << /S /GoTo /D (subsection.10.2) >> ->> endobj -765 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 148.576 567.925 157.423] -/A << /S /GoTo /D (subsection.10.3) >> ->> endobj -766 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 130.946 567.925 139.693] -/A << /S /GoTo /D (subsection.10.4) >> ->> endobj -767 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 113.217 567.925 121.964] -/A << /S /GoTo /D (subsection.10.5) >> ->> endobj -768 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 95.387 567.925 104.234] -/A << /S /GoTo /D (subsection.10.6) >> ->> endobj -769 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 77.658 567.925 86.504] -/A << /S /GoTo /D (subsection.10.7) >> ->> endobj -777 0 obj << -/D [775 0 R /XYZ -16.307 900.716 null] ->> endobj -774 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -817 0 obj << -/Length 899 -/Filter /FlateDecode ->> -stream -xÚíœKsÚ0Çïþ:šƒ½eõ˜6É>3ÍLšƒâ©Á)¸)ùö•-HHJ:NÈì±m­ÅO»’þ^AÐt£ƒcIÁF1…†wH1¬4J)Ç\£á]Åy™gó¼—0IâÏUÏÝî]5s;õýòä§êö°ª~ºƒËA¿w=<³fJ±‘Ò•6¨ŸÊ|~Ÿçõ¼9m­S”ZëŠ7Ö…áXÉ%½´_<6FGÃèWDmqQ$V†#m(V„¡ÛItuMÐÈž³±0)úÓ^9A’̸²û%Dß"òn͵-ËÖY ƒ)Qζ½9í%ÒVçè¶,ܯ bl¿#do7˜]y–¦e¬ºÆ1#·sq¡«Ä¶¬XŠW×­¶mÓT8]5M Û8ØgY‘ø±Çdœæ僥®P7à–ÿÇ-žqSÒ_T¿§£zVXÎJ Û!À´<(‹QÓmi)Á‹c­|c7e-ëï½”Äùͼ¨ó8ত׼š·¤¿ö¨íŸgÙ¤j - ólíÍ[8Þ³ê!¬,¦c[[a€t ¤ñŽá²%=lbxU•íL“í»cw”úš«–úѢΧó¢šZìœR ¼ó„©7aݾô“A¶¨¦vdÆR ,Ùµˆ>“½ÌÊÌ’MçNø¬y&[7‹yY7^«íî²eÙK½¦s'T`#J˜åM—"»JȱÿCÓ“˜bͱ+ƒ}{+fšÛ£¶´7‚’Õù×6Ù+›ë†èv†Þ(ú‰H%æ̼iÚ S'óžäÓ:o&‘‹¦i#Ì°ú?ÝÃÌ‘>þbkÇ`&ö „ùu] sGýtxÞ·AEi iîKZ8ÒçÙô!7¿4€y÷ù -ßø-_<Ù½ˆUšØ`Á¾8®‚´Šà£´7l iû´—)SVÑU^¦IÁ Ø°yËíå"þ®tC|¥¹…tÃAº ½ñÌÝâ+éæc5™4/ŒŒéy÷ézfkñ•DÂ\¨k_Ÿ Ì…MÚø’– ÌØ;kê¿A¿ Þ™µðufÐoºàÛÞ¸A¿é¤?¿oÐo:ÁÛ{*½\çvZŒïKû©Û zÎS`¼»p•7\ -«#‚vcí¶—+ÜúÅÍž&Èïö5ç°(f© X2ÑÑ0.aÉDPC±t#ÙÕvÓÓ‚‰2Ûü/Í_u©je -endstream -endobj -816 0 obj << -/Type /Page -/Contents 817 0 R -/Resources 815 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 696 0 R -/Annots [ 770 0 R 771 0 R 772 0 R 773 0 R 778 0 R 779 0 R 780 0 R 781 0 R 782 0 R 783 0 R 784 0 R 785 0 R 786 0 R 787 0 R 788 0 R 789 0 R 790 0 R 791 0 R 792 0 R 793 0 R 794 0 R 795 0 R 796 0 R 797 0 R 798 0 R 799 0 R 800 0 R 801 0 R 802 0 R 803 0 R 804 0 R 805 0 R 806 0 R 807 0 R 808 0 R 809 0 R 810 0 R 811 0 R 812 0 R ] ->> endobj -770 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 748.01 567.925 756.857] -/A << /S /GoTo /D (subsection.10.8) >> ->> endobj -771 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 731.156 567.925 740.002] -/A << /S /GoTo /D (subsection.10.9) >> ->> endobj -772 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 714.301 567.925 723.148] -/A << /S /GoTo /D (subsection.10.10) >> ->> endobj -773 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 697.447 567.925 706.294] -/A << /S /GoTo /D (subsection.10.11) >> ->> endobj -778 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 680.593 567.925 689.439] -/A << /S /GoTo /D (subsection.10.12) >> ->> endobj -779 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 663.738 567.925 672.585] -/A << /S /GoTo /D (subsection.10.13) >> ->> endobj -780 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 646.884 567.925 655.731] -/A << /S /GoTo /D (subsection.10.14) >> ->> endobj -781 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 630.03 567.925 638.876] -/A << /S /GoTo /D (subsection.10.15) >> ->> endobj -782 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 613.175 567.925 622.022] -/A << /S /GoTo /D (subsection.10.16) >> ->> endobj -783 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 596.321 567.925 605.168] -/A << /S /GoTo /D (subsection.10.17) >> ->> endobj -784 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 579.467 567.925 588.313] -/A << /S /GoTo /D (subsection.10.18) >> ->> endobj -785 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 562.612 567.925 571.459] -/A << /S /GoTo /D (subsection.10.19) >> ->> endobj -786 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 535.775 567.925 544.752] -/A << /S /GoTo /D (section.11) >> ->> endobj -787 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 508.958 567.925 517.935] -/A << /S /GoTo /D (section.12) >> ->> endobj -788 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 492.124 567.925 500.971] -/A << /S /GoTo /D (subsection.12.1) >> ->> endobj -789 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 475.27 567.925 484.116] -/A << /S /GoTo /D (subsection.12.2) >> ->> endobj -790 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 458.415 567.925 467.262] -/A << /S /GoTo /D (subsection.12.3) >> ->> endobj -791 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 441.561 567.925 450.408] -/A << /S /GoTo /D (subsection.12.4) >> ->> endobj -792 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 424.707 567.925 433.553] -/A << /S /GoTo /D (subsection.12.5) >> ->> endobj -793 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 407.852 567.925 416.699] -/A << /S /GoTo /D (subsection.12.6) >> ->> endobj -794 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 390.998 567.925 399.845] -/A << /S /GoTo /D (subsection.12.7) >> ->> endobj -795 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 374.144 567.925 382.99] -/A << /S /GoTo /D (subsection.12.8) >> ->> endobj -796 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 357.289 567.925 366.136] -/A << /S /GoTo /D (subsection.12.9) >> ->> endobj -797 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 330.453 567.925 339.429] -/A << /S /GoTo /D (section.13) >> ->> endobj -798 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 313.618 567.925 322.465] -/A << /S /GoTo /D (subsection.13.1) >> ->> endobj -799 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 296.764 567.925 305.611] -/A << /S /GoTo /D (subsection.13.2) >> ->> endobj -800 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 279.91 567.925 288.756] -/A << /S /GoTo /D (subsection.13.3) >> ->> endobj -801 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 262.936 567.925 271.902] -/A << /S /GoTo /D (subsection.13.4) >> ->> endobj -802 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 246.201 567.925 255.048] -/A << /S /GoTo /D (subsection.13.5) >> ->> endobj -803 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 229.347 567.925 238.193] -/A << /S /GoTo /D (subsection.13.6) >> ->> endobj -804 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 212.492 567.925 221.339] -/A << /S /GoTo /D (subsection.13.7) >> ->> endobj -805 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 195.638 567.925 204.485] -/A << /S /GoTo /D (subsection.13.8) >> ->> endobj -806 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 178.784 567.925 187.63] -/A << /S /GoTo /D (subsection.13.9) >> ->> endobj -807 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 161.929 567.925 170.776] -/A << /S /GoTo /D (subsection.13.10) >> ->> endobj -808 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 145.075 567.925 153.653] -/A << /S /GoTo /D (subsection.13.11) >> ->> endobj -809 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 128.221 567.925 136.798] -/A << /S /GoTo /D (subsection.13.12) >> ->> endobj -810 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 111.366 567.925 119.944] -/A << /S /GoTo /D (subsection.13.13) >> ->> endobj -811 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 94.512 567.925 103.09] -/A << /S /GoTo /D (subsection.13.14) >> ->> endobj -812 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 77.658 567.925 86.504] -/A << /S /GoTo /D (subsection.13.15) >> ->> endobj -818 0 obj << -/D [816 0 R /XYZ -11.232 900.716 null] ->> endobj -815 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -860 0 obj << -/Length 819 -/Filter /FlateDecode ->> -stream -xÚíœÉnÛ0†ïz -¥ƒXîKi³ HÚ4ÐiF¬8Fe+µÕííK‰V¤qÀúdÊs0$A‡äÇe~ÌXMAÇÉA‘¼:’YlS¨¸EŠa¥‘¡sŠ1ºJ/ʪ-Ë,g’¤ïë¦\úÛÛzáoš»ÕË·õÍA]õŸ/O³ëâ3“SŠ­”¾¶ËæwU.ïʲY¶¯uŠŒ³®xk]X‰•°(—Øê•ým¹ä°H¾%ÔÕFERae9Ò–bEº™%W×Ý;g kÐÏ®ä IJ0ãÊÝWè2ù˜G×:Þ×),¦DyÓTd¹$¤‚×YÎ)I)Ö “®U¾A‹ ò7Ç rå1ÓÜ=uUhÓìí>í\‰9s¦ -S¥{³˜:ÃnßÔ³Y=Ïr7)ömÙŸ‹°vWÚòá3̯r7Sm•ë¯Ý -xL—yºG\'Û?²C¢nÈËÔÿn%˜{ê'ÅÙ©ÛH”ÒÃ"½^ß“>ÍïG“ö¼”øî>_ÊWz¾ç•éh1šµ‘¦°ž‡Ê[yÞE¦IZÎî«Qã<^k9 ÞyÆ,ôtÖžñEý}>nÓû,WBÙH?w¹l…@9sÐùŠ¹Ü î(¦âÎðÿwýT“ îbœg<ì° îö’:ˆ»a“^ïÞ+qw2ÜUî×LçGœ€»»pEè2– ÜÍWrß+Þ+Uw¾¨¿ªn¯Âé¸I¿$ïœàòôÕF}¼3r‹à}ãD“aþŸêõÝ᯦œ/§õ|ÙN, -„c'¼^¿üp¨«Pêüž– à£ƒkBg -~€|׋Wƒ‚ß+Þ¦½’ÖuÕ%Ÿ‚O)u»½š×Ô< ÖÚ-Ô¼îÕ<¨áNÀ¶Ý«|P‘’¶i¹úaäö¤¬Ú¼Íl´`×KX€§8\ÞA>ƒÙè3„FžXó DbœhéÀ"±L6Ø#êëu €ÈI«PÒæ%_ÊÒ¼bç-oJ‚lÈóŠuðÞ !aסحÇþ©Ã¾·.“ðÌØI÷×ç¾ï"&Ênóy—?ülHJ -endstream -endobj -859 0 obj << -/Type /Page -/Contents 860 0 R -/Resources 858 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 696 0 R -/Annots [ 813 0 R 814 0 R 819 0 R 820 0 R 821 0 R 822 0 R 823 0 R 824 0 R 825 0 R 826 0 R 827 0 R 828 0 R 829 0 R 830 0 R 831 0 R 832 0 R 833 0 R 834 0 R 835 0 R 836 0 R 837 0 R 838 0 R 839 0 R 840 0 R 841 0 R 842 0 R 843 0 R 844 0 R 845 0 R 846 0 R 847 0 R 848 0 R 849 0 R 850 0 R 851 0 R 852 0 R 853 0 R 854 0 R 855 0 R 856 0 R ] ->> endobj -813 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 747.99 567.925 756.966] -/A << /S /GoTo /D (section.14) >> ->> endobj -814 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 731.724 567.925 740.69] -/A << /S /GoTo /D (subsection.14.1) >> ->> endobj -819 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 715.677 567.925 724.523] -/A << /S /GoTo /D (subsection.14.2) >> ->> endobj -820 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 699.51 567.925 708.356] -/A << /S /GoTo /D (subsection.14.3) >> ->> endobj -821 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 683.343 567.925 692.19] -/A << /S /GoTo /D (subsection.14.4) >> ->> endobj -822 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 667.176 567.925 676.023] -/A << /S /GoTo /D (subsection.14.5) >> ->> endobj -823 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 651.01 567.925 659.856] -/A << /S /GoTo /D (subsection.14.6) >> ->> endobj -824 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 634.843 567.925 643.69] -/A << /S /GoTo /D (subsection.14.7) >> ->> endobj -825 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 608.694 567.925 617.67] -/A << /S /GoTo /D (section.15) >> ->> endobj -826 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 592.547 567.925 601.394] -/A << /S /GoTo /D (subsection.15.1) >> ->> endobj -827 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 576.38 567.925 585.227] -/A << /S /GoTo /D (subsection.15.2) >> ->> endobj -828 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 560.213 567.925 569.06] -/A << /S /GoTo /D (subsection.15.3) >> ->> endobj -829 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 544.047 567.925 552.893] -/A << /S /GoTo /D (subsection.15.4) >> ->> endobj -830 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 527.88 567.925 536.727] -/A << /S /GoTo /D (subsection.15.5) >> ->> endobj -831 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 511.713 567.925 520.56] -/A << /S /GoTo /D (subsection.15.6) >> ->> endobj -832 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 495.547 567.925 504.393] -/A << /S /GoTo /D (subsection.15.7) >> ->> endobj -833 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 469.397 567.925 478.374] -/A << /S /GoTo /D (section.16) >> ->> endobj -834 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 453.251 567.925 462.097] -/A << /S /GoTo /D (subsection.16.1) >> ->> endobj -835 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 437.084 567.925 445.93] -/A << /S /GoTo /D (subsection.16.2) >> ->> endobj -836 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 420.917 567.925 429.764] -/A << /S /GoTo /D (subsection.16.3) >> ->> endobj -837 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 404.75 567.925 413.597] -/A << /S /GoTo /D (subsection.16.4) >> ->> endobj -838 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 388.584 567.925 397.43] -/A << /S /GoTo /D (subsection.16.5) >> ->> endobj -839 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 372.417 567.925 381.264] -/A << /S /GoTo /D (subsection.16.6) >> ->> endobj -840 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 356.25 567.925 365.097] -/A << /S /GoTo /D (subsection.16.7) >> ->> endobj -841 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 339.964 567.925 348.93] -/A << /S /GoTo /D (subsection.16.8) >> ->> endobj -842 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 313.934 567.925 322.91] -/A << /S /GoTo /D (section.17) >> ->> endobj -843 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 297.668 567.925 306.634] -/A << /S /GoTo /D (subsection.17.1) >> ->> endobj -844 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 281.501 567.925 290.467] -/A << /S /GoTo /D (subsection.17.2) >> ->> endobj -845 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 265.334 567.925 274.301] -/A << /S /GoTo /D (subsection.17.3) >> ->> endobj -846 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 249.168 567.925 258.134] -/A << /S /GoTo /D (subsection.17.4) >> ->> endobj -847 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 223.138 567.925 232.114] -/A << /S /GoTo /D (section.18) >> ->> endobj -848 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 206.872 567.925 215.838] -/A << /S /GoTo /D (subsection.18.1) >> ->> endobj -849 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 190.705 567.925 199.671] -/A << /S /GoTo /D (subsection.18.2) >> ->> endobj -850 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 174.538 567.925 183.505] -/A << /S /GoTo /D (subsection.18.3) >> ->> endobj -851 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 158.372 567.925 167.338] -/A << /S /GoTo /D (subsection.18.4) >> ->> endobj -852 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [555.97 142.205 567.925 151.171] -/A << /S /GoTo /D (subsection.18.5) >> ->> endobj -853 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 126.158 567.925 135.004] -/A << /S /GoTo /D (subsection.18.6) >> ->> endobj -854 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 109.991 567.925 118.838] -/A << /S /GoTo /D (subsection.18.7) >> ->> endobj -855 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 93.824 567.925 102.671] -/A << /S /GoTo /D (subsection.18.8) >> ->> endobj -856 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 77.658 567.925 86.504] -/A << /S /GoTo /D (subsection.18.9) >> ->> endobj -861 0 obj << -/D [859 0 R /XYZ -16.307 900.716 null] ->> endobj -858 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -887 0 obj << -/Length 596 -/Filter /FlateDecode ->> -stream -xÚí˜MsÓ0†ïþ{Œ«oéØ-Ã:4>0“é¡4nË`cH üz”Èn› · -“¤9YiôèÝ×Z¯„p ÇÙa‘=;RŽ:Í5W 9Õ,T(¦0•Uy1/sÂŽÞ6m9Í«fíM×ù¢¹çć}DÃZžÎC:÷¯¬å¾…Ó'Djý‡×·vöŠ[{y°÷èÔ«äüéY»[¶»TÛE°ýUY}Y ôÞñ]w\vŽoNr"´Ù[½cVßý²U°º¾ðÿkÃí~oÿŸ†3Œ¾V–&©“r­\dñrѦץL=X—vå:çC ܨW$â ã+˜TNR$‡@lË 5JM -ŽƒôŠl’"©tE“Ù8H¦+zÔ+8ß± ±8ßáŠxJèD<3(—¾üVLQć@éŠd’¢xfP¤ G@½¢xfPfë xfPzPRR]f8­¦ewY3Ë™î<–”ïD—>4ßÚ›6-ùU.‘ÍÖðý3v!$‘¢vsô²lÓË -endstream -endobj -886 0 obj << -/Type /Page -/Contents 887 0 R -/Resources 885 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 696 0 R -/Annots [ 857 0 R 862 0 R 863 0 R 864 0 R 865 0 R 866 0 R 867 0 R 868 0 R 869 0 R 870 0 R 871 0 R 872 0 R 873 0 R 874 0 R 875 0 R 876 0 R 877 0 R 878 0 R 879 0 R 880 0 R 881 0 R 882 0 R 883 0 R 884 0 R ] ->> endobj -857 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 747.99 567.925 756.966] -/A << /S /GoTo /D (section.19) >> ->> endobj -862 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 720.095 567.925 729.071] -/A << /S /GoTo /D (section.20) >> ->> endobj -863 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 702.182 567.925 711.028] -/A << /S /GoTo /D (subsection.20.1) >> ->> endobj -864 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 684.129 567.925 693.096] -/A << /S /GoTo /D (subsection.20.2) >> ->> endobj -865 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 666.197 567.925 675.163] -/A << /S /GoTo /D (subsection.20.3) >> ->> endobj -866 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 648.264 567.925 657.23] -/A << /S /GoTo /D (subsection.20.4) >> ->> endobj -867 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 630.451 567.925 639.297] -/A << /S /GoTo /D (subsection.20.5) >> ->> endobj -868 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 602.535 567.925 611.512] -/A << /S /GoTo /D (section.21) >> ->> endobj -869 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 574.64 567.925 583.616] -/A << /S /GoTo /D (section.22) >> ->> endobj -870 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 546.745 567.925 555.721] -/A << /S /GoTo /D (section.23) >> ->> endobj -871 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 518.849 567.925 527.825] -/A << /S /GoTo /D (section.24) >> ->> endobj -872 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 490.954 567.925 499.93] -/A << /S /GoTo /D (section.25) >> ->> endobj -873 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 463.058 567.925 472.035] -/A << /S /GoTo /D (section.26) >> ->> endobj -874 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 435.163 567.925 444.139] -/A << /S /GoTo /D (section.27) >> ->> endobj -875 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 407.268 567.925 416.244] -/A << /S /GoTo /D (section.28) >> ->> endobj -876 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 379.492 567.925 388.349] -/A << /S /GoTo /D (section.29) >> ->> endobj -877 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 351.596 567.925 360.453] -/A << /S /GoTo /D (section.30) >> ->> endobj -878 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 323.582 567.925 332.558] -/A << /S /GoTo /D (section.31) >> ->> endobj -879 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 295.806 567.925 304.662] -/A << /S /GoTo /D (section.32) >> ->> endobj -880 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 267.91 567.925 276.767] -/A << /S /GoTo /D (section.33) >> ->> endobj -881 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 240.015 567.925 248.872] -/A << /S /GoTo /D (section.34) >> ->> endobj -882 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 212 567.925 220.976] -/A << /S /GoTo /D (section.35) >> ->> endobj -883 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 184.105 567.925 193.081] -/A << /S /GoTo /D (section.36) >> ->> endobj -884 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [550.989 156.209 567.925 165.185] -/A << /S /GoTo /D (section.37) >> ->> endobj -888 0 obj << -/D [886 0 R /XYZ -11.232 900.716 null] ->> endobj -885 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -899 0 obj << -/Length 1388 -/Filter /FlateDecode ->> -stream -xÚWß“›6~÷_Á[ñLLF²IŸ.“¤M›fÒœgÚ™$d›‹à.׿¾»ÚÇqnÒöÉbµÚŸ>í®Ep DðãâÙnñýK)‚,ÊT¢‚Ý!PI¤6Á6^GëM°+ƒ÷á;]ëÜêå*‘"|czmiy0-úo>7Å3c>ÓÇׯ—w?ƒ›UG™”díº¿«µ=iÝ[Üïq°ïjÞÓ,Ž”Ú+eöSU¨¹x±[ü¹ˆÁžâ@ªHeë`ƒú" Šfñþ£JØQšmƒ[§Ù2Q²V°®ƒëÅo Á©Ï Š “b0I&£8É‚MšE±PÍÕÞö]^ô.¤¹ ‡å½U0J°°ZËh i9 »S®·2ìÙUK ¢¨4ÅÐè¶Ç/zÅ|™ˆðf™Àªªó}­I\µ¤æ.S×Õn«öèE]“÷ö)ÇKø}üê—Eð~%·qøÓî××r‚HŸ|íûüå>s®ó1n½Œeø¥ŸÛøa¹Jå:¬–qÈ@œ;ƒª7U©GHÈšî›UçIŠÚue{Ú6‡‘ƒ8˜Ñ èö”·…Fœ—Ó0oK\¬ÃvŽš¥½!!< í=y¿#ÉyØ×UAjWo_ñÁBŠÁrh…i?‘‡ŽnUÏy—7º×ÕøA iH¨5¤?”>X]uî+Ó²rs¶ƒÙ¢dþ†ãƒ”™tÁ´«mЬeø¿è oÍDfaašs a‘`D9¹µº¦Å¦Ìe[µE=”Žu}H¬8áÓÞ¸9{91ÍQOkÝÒªÉKMZ\i”çN#ëo*3pL̇'ð¥Dh5OXW™"õˆ¡ÈV¿¶Î8óæÅï×3ž‚éKž)ŸžÒœH⯼Ô@ÓÑ©oêÇö•Ã¬¦KSqxU[Cf•„§ ‘¦ábÚºjõ·\Ÿ–2¼ƒ7ºŸ—±uI§é~i åª7ÝÝåसÅsy×ÂÝsûê¸dl0ö ŽÝ±ctc/½Qá"¤—ïX1o8ð€«Ž×>L:s˜i¦Ô{ D4úRQæ;Üw´Ûª?ÑŠù;kio;óIsé' »##úŽ0¥Òô«¿4Ô«9^°Ç¬´O|t{ö¿yˉ9ÁÅTX¤r†#óW½Ú»çdP9ÆN஄ödº¾f|öü›ó^ïKÓÄÉ(5JI0€¯RN€©Êí|H’5€B;¦Õ$=׃…”ÄS`Tæ¹ß 3¹=ÃuóŽ+Î tIÃ÷˜ºt‰äP~¡a[¦7_¹=ÐþÇÛSräí©*< -¾Øgf·ˆ/á"y$Hˆë$ví >¡°MZLÛæg¸ÍžàCm¤;îÒ Lh‹8‰9µÉì’ ÙùþÁ»Z ÕÐ9ׯ§æñaw®Ç®…›fU1‰ÄgBEÀŸ“â@qŽ&öxÒ|JT£ŠbÌ×÷É“z³:êVc9g®:Óð»÷… _欅"ïMçÏTí¬dœG£¦ºB¯°Œøgìll劰ãâƒÙqs“a£sò -Ì…“äDÝ#‰:#’ø¼…¶Âgæ±ï +ÉÅNN{­šöZÚåñ««ð ó~ ê)}%ÆÒ’(¢Š;Ý@ ÜÖÇ9¦Ünòv€Bpwñ ”]Kꇫڠ5èvØ[í&0øà1´üø38¨Óq¬YQJNg(9íyK)PŸj -¯^`ã£(©.¶ì×ôÓ`{‰qt¦xùhþzàgÚÿŬ)üEˆé%xÖœÒoœ,Å8YŠoM–b6YFêØ¥P©ˆ„ÊþϨ¿Çů -endstream -endobj -898 0 obj << -/Type /Page -/Contents 899 0 R -/Resources 897 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 901 0 R -/Annots [ 889 0 R 890 0 R 891 0 R 892 0 R 893 0 R 894 0 R 895 0 R 896 0 R ] ->> endobj -889 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 1 1] -/Rect [331.964 710.801 359.359 720.814] -/Subtype/Link/A<> ->> endobj -890 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 1 1] -/Rect [363.062 710.801 381.499 720.814] -/Subtype/Link/A<> ->> endobj -891 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 1 1] -/Rect [385.203 710.801 421.898 720.814] -/Subtype/Link/A<> ->> endobj -892 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 .5 .5] -/Rect [80.603 677.924 107.997 687.937] -/Subtype/Link/A<> ->> endobj -893 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 1 1] -/Rect [160.266 677.924 206.346 687.937] -/Subtype/Link/A<> ->> endobj -894 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 1 1] -/Rect [322.2 677.924 421.978 687.937] -/Subtype/Link/A<> ->> endobj -895 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [186.45 650.029 218.318 660.042] -/A << /S /GoTo /D (dot0) >> ->> endobj -896 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [440.493 633.092 472.361 643.105] -/A << /S /GoTo /D (dot0) >> ->> endobj -900 0 obj << -/D [898 0 R /XYZ -16.307 900.716 null] ->> endobj -897 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -905 0 obj << -/Length 1769 -/Filter /FlateDecode ->> -stream -xÚÕZmoÛ6þî_! _`fHŠ¤¨nÐvM·ômK2 @Z²EÛBdÉ“¨¼ì×ïhI‰-Û5Yi÷!#ÑwÇãÝs_°3q°ó¦÷ò¢w|±ã#_Pá\ŒA‘ðI\äzÎEè\öÏT¬‚\ (Çý©VyÙ§YÙÐÓêãoéèeš^•ÿ|:wôåâÔ A>祴s}«|ª”ÎÍgÐN Ú…k´3"¸Î€#ß«ôçÉþqù T˜ßõ^_ôþéŽâp„ï:žOÀÔÍz—_°Â7И/›Eϙà FÔÐŽóÞ_=\9¯8„:„"Ÿnlª…38µMƆúGÎå€`Œ—<†.<õühà2Ö'ȈTã]ö68‡Âè=ZŠ½¨=9Nã8=¢¼%“òUT¹=(q”법ŽËçh$“zrô4¨>Oƒ#Šû×G„÷+áC¥’²5 Âê]%#՘΅ոlgåÐÐʸKOaäq¿ë"i¦rá$´ÙM¯ÒÙ,M¶xƒ!WðÝÞX¬Ýuú0¾…n˜ÔÝD2äy&0ºGÛlt%rùR·V„ñR—B"WŽûL)o8l]d 36HÄ„¬MxY¤ÿ=pí© -’,&vo¦*±ë9J­nµ¥Ø ·ë§¹¥È°P‡‚"&–"+Yõ»O©\y¾Ú®ÔݪØ݉¸ Ù²3ðY¡e5úÅ´&Õˆnäf'¿ÁËÄ÷çeãtƒ}„!¼åPœŒø>¢”´àdgéPeºÄësÜéJ¦£!¬‘ hÿ\v¸ÍÔxéßq:'{@:€1óܤ3Îp»ƒô†üvÞÞX{Hgܤ¿˜Ïã;;l™z4=,æÅ|žf–ø›3Ûêª\GI £Ô²¶D–ýLïÃ×áø§­½K'«Ì’E¦E6Rã4k–Ý™ÇÜe ?|b¬Êo™­Ý#1˜0¯ÊÄ°&0™Z áêË3S_2nËìÃHÀðžÙ3:<þˆRÆ* -¡XÔõa\&Wº˜ïS`„’¸ÝÕ×HrÖY¨7ä· õöÆîê#ÂH½Q:K¯m¹íTÙ£u>F–ÝgQ®ƒ+ c¶Õ(°ßm¸‰ôôÀ£‹ÛUC1Ó |ìbßõ;$R¾í?Àä~/ÔÝÈ·¿xÿîÇÞ êrã¦a!ˆar¸}PB`¢¼œû­2Ṉ•“`O2uϹ§ÑdßÞS) ˆ'iw˜J¥YŽu‡© ùí0µ½±ö˜J¥©0õÙ뎿K -·;¨nÈoÕíµçoDxˆÐ -ª_“qtÛŠ‹]>s±ØO¾ì`A–`¯’¼È¬—éeeøðê“í‚þúÏ4J´å¹Z`kêD%* ´íbÞš;…{„™µÜíKmKnÀ´ƒŽ¹ˆ¹]°1ºåšsø_•ß2Å[kÏÆHR_ózü¶Põz°= >œÛI¾VYn}Ha{lÍÍòÕ;{œ!æ#)½§Üª&P÷}ïû×gbvÇ:,Ï ïî®YC~ËÜmmìåûÈuýý·¬‹V?á«áLé t`YºË½ ½³ »‹'½ê%͹€> endobj -906 0 obj << -/D [904 0 R /XYZ -16.307 900.716 null] ->> endobj -2 0 obj << -/D [904 0 R /XYZ 56.693 759.068 null] ->> endobj -907 0 obj << -/D [904 0 R /XYZ 56.693 731.272 null] ->> endobj -6 0 obj << -/D [904 0 R /XYZ 56.693 701.45 null] ->> endobj -908 0 obj << -/D [904 0 R /XYZ 56.693 673.064 null] ->> endobj -910 0 obj << -/D [904 0 R /XYZ 56.693 627.296 null] ->> endobj -911 0 obj << -/D [904 0 R /XYZ 65.161 626.738 null] ->> endobj -912 0 obj << -/D [904 0 R /XYZ 56.693 580.472 null] ->> endobj -913 0 obj << -/D [904 0 R /XYZ 65.161 579.914 null] ->> endobj -10 0 obj << -/D [904 0 R /XYZ 56.693 542.763 null] ->> endobj -914 0 obj << -/D [904 0 R /XYZ 56.693 515.21 null] ->> endobj -915 0 obj << -/D [904 0 R /XYZ 56.693 468.2 null] ->> endobj -916 0 obj << -/D [904 0 R /XYZ 65.161 468.884 null] ->> endobj -917 0 obj << -/D [904 0 R /XYZ 65.161 457.925 null] ->> endobj -918 0 obj << -/D [904 0 R /XYZ 56.693 410.417 null] ->> endobj -919 0 obj << -/D [904 0 R /XYZ 65.161 411.1 null] ->> endobj -14 0 obj << -/D [904 0 R /XYZ 56.693 373.95 null] ->> endobj -920 0 obj << -/D [904 0 R /XYZ 56.693 346.396 null] ->> endobj -921 0 obj << -/D [904 0 R /XYZ 56.693 299.387 null] ->> endobj -922 0 obj << -/D [904 0 R /XYZ 65.161 300.07 null] ->> endobj -18 0 obj << -/D [904 0 R /XYZ 56.693 251.961 null] ->> endobj -925 0 obj << -/D [904 0 R /XYZ 56.693 224.407 null] ->> endobj -926 0 obj << -/D [904 0 R /XYZ 56.693 177.398 null] ->> endobj -927 0 obj << -/D [904 0 R /XYZ 65.161 178.081 null] ->> endobj -928 0 obj << -/D [904 0 R /XYZ 56.693 119.615 null] ->> endobj -929 0 obj << -/D [904 0 R /XYZ 65.161 120.298 null] ->> endobj -903 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -932 0 obj << -/Length 1782 -/Filter /FlateDecode ->> -stream -xÚí[Y“›F~ß_A•,=lkî#yóY9|Ä»©¸Êö#‰Á¡=òëÓXK¬å-bã”ýÄZ=ÍÐß×Ç f ž=:==“$°`SÁé4P ” åÀupïo\âÂ¥3I/³Â-«á4Ë«A1¯/>É&²ìcõãíÉïç¿â4Ç”‚•²ÒvR\%n9w®X–—qvœ]ñrv¡hʃc V×ó3Ô§Í`T(SåÿŽžž}:¢¨4 -”å¶aÁdqôî "¼†óƒ°&¸XK.I 0®pœ'G‘z!ZXËÃó ͸T³@ ”¨Rsy^ Z¨€56È]0Ý©Êwn€ -ÝLP)¦¥tWý¨¢mý’PÐÊxÍ°¹Ì -,³0v­0ŸÕàMíˆø×® ÖŽX.(^;ÏË,_„IüOœÎÖN°[_ðîX2ˆ#—ñ4v¹Ÿ|‚î»:ó“»â¹ÔOøåã·~‚aù ¾zýl[pk¥·àqíc¸¤ÒtqâÇ›4Ò ’J–UOï=crËäÖ7 Ð%I%ü›‹‹ùp}§ÏÂy2Ë]úÓð˜²ráãt‹Ì­Æ•¾Ûoï•Ñ~•UÀ…ì ¿-ýÝðÛÝXü*kAqÞ„’h5q¾PœÍ¼q~îòq¶Œ‹«=!> -\ªû„„Ò0Põ‰Ÿ+‘òTGQ6#«Aî‹…ONVQ´'¬HRðþ°²­¿#V:»V¤Ãk×x•&W~Î?ÉÎ<%ãE8sK?Ù,õEj™z –‰¢—`“HúiÍüäž¾þó‘¯Æ,9ìÜ“,Ïݤðþ+N£ìÂó1Wž™»³,/œgv§mZ’þŠ¤D6¼ôžRåò˜hÒ€Ù|#sìK>‚ƒ4¢?nØÖß‘º{“ ŒbjV`t7½{À Ò±¼‘`ÖÕ_TcåMêr†°†“`ÕXYLa;ª¡SQRzöËÏ]rV›+E†ÕgO›²rš%I6drpQæëS“y˜ÎšBt¦CŠº«3ã2/_aTŸC¨^W«•³ò¹© µjÜõb§‘BÇt¦–›dúe\òåv=\újœWU4l¯ ÞpYXZ0æIÁ“ð<Žªˆÿ8.oR$wÙÔ=·ºŒ”XqËd‰ gm rK7`w7Ö?è#°™ê/²Ü3Dnx¨›oøÂíbNŠ,¿‘|ßîD‚!÷šMKd !‰›ñ*N"¸\$¾È¡«êÓeI8PÛ_ºÜÒß9Ý9D0´)-Ù¹ov3ÉWSÏdlšg ß~Ðôÿ^B€uë‘ì‹^a(ÞGØ-ó‰'€Ëž3—ýáW( -“š¾ðÛÒß ¿ÝõǯP”¶ ~wøíA ä[§-ÝY˜‡…'ŠÞxŸ`òç]Ï{—É—ËäÀMå¿Ãóз¢\+Ç€/â$b¹[‡io¦áL³£uX¦IbßΚàX— Ó#ÕP‹©íj¶õw¤šÎÆîA5˜&­PÍwG5ñOè}R ·H³cyªy~tÓ8qMkÏ…ƒw­ûã®Q£1½ñNK7Þén¬?ïpChùƒw¾7ÞáZ€¶ö^yGJ`ÍNëÁ‹©Ñ$[ŒRwyž»QúiÕ\ú¥:ž†ËP.m›¢êß›šêöëÖ†‚Á\‡×; -„¢ ”\h5ò\|H=–tœKÔ¥úã»mýù®³±{ð·ÀtÝ{áòÙ÷›vc²nü¸w³ÓŽó0ÌËÊaånéy_ñr¹j3ÓúÂN¤aBÔ×v¶ˆfayG!®¾ÜÁ–_øÃ`^,|÷XÝâl'eØ>6!9“@Ø-ï·µ­mcçë×oB~{Î]÷Õz þ^neb°#B; pZ'Be*ëë{¡gŸö"ôÝ0wÞž?É]xcÇÜÃ{æÿæ^w_‚IÕ쾪/î¾¾r$ ðËo{óõl—ܬ_Ö:ÜÞ+ÊY½÷z—7²Þdc—U†sR„WEvýFV”‡Óhã…ã¸íñ5cÆÞßkÆ-ýÝ—îÆú'.å>¼f5?=^;¸GDXÔ­’âÀoJ­½ghºh—*¾ I}öánÕiûƒ‡¾EP 0!î— )¥®™P‘ Ÿ^.]ÆYú3¡ûš¸ÈL …"Xo¢4Ý+O¯¡e«¾Ïo-(Ó`züÖ¢¥¿ v7ÖŸ)§e¯¯¢Ü}š2FÞkK… Ìòÿ e/¹Ïï ҂译±­¾:›ê̦ùço~tm¿—®­á@¤îan|ª(eïò¥â¿q8h; -endstream -endobj -931 0 obj << -/Type /Page -/Contents 932 0 R -/Resources 930 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 901 0 R ->> endobj -933 0 obj << -/D [931 0 R /XYZ -11.232 900.716 null] ->> endobj -934 0 obj << -/D [931 0 R /XYZ 56.693 759.068 null] ->> endobj -935 0 obj << -/D [931 0 R /XYZ 65.161 752.393 null] ->> endobj -936 0 obj << -/D [931 0 R /XYZ 56.693 709.908 null] ->> endobj -937 0 obj << -/D [931 0 R /XYZ 65.161 710.592 null] ->> endobj -938 0 obj << -/D [931 0 R /XYZ 56.693 668.107 null] ->> endobj -939 0 obj << -/D [931 0 R /XYZ 65.161 668.79 null] ->> endobj -22 0 obj << -/D [931 0 R /XYZ 56.693 623.076 null] ->> endobj -940 0 obj << -/D [931 0 R /XYZ 56.693 597.196 null] ->> endobj -941 0 obj << -/D [931 0 R /XYZ 56.693 559.8 null] ->> endobj -942 0 obj << -/D [931 0 R /XYZ 65.161 559.241 null] ->> endobj -943 0 obj << -/D [931 0 R /XYZ 56.693 517.998 null] ->> endobj -944 0 obj << -/D [931 0 R /XYZ 65.161 517.439 null] ->> endobj -945 0 obj << -/D [931 0 R /XYZ 56.693 475.627 null] ->> endobj -946 0 obj << -/D [931 0 R /XYZ 65.161 475.638 null] ->> endobj -947 0 obj << -/D [931 0 R /XYZ 56.693 433.825 null] ->> endobj -948 0 obj << -/D [931 0 R /XYZ 65.161 433.836 null] ->> endobj -949 0 obj << -/D [931 0 R /XYZ 56.693 391.745 null] ->> endobj -950 0 obj << -/D [931 0 R /XYZ 65.161 392.034 null] ->> endobj -951 0 obj << -/D [931 0 R /XYZ 56.693 349.549 null] ->> endobj -952 0 obj << -/D [931 0 R /XYZ 65.161 350.232 null] ->> endobj -26 0 obj << -/D [931 0 R /XYZ 56.693 304.518 null] ->> endobj -953 0 obj << -/D [931 0 R /XYZ 56.693 278.639 null] ->> endobj -954 0 obj << -/D [931 0 R /XYZ 56.693 240 null] ->> endobj -955 0 obj << -/D [931 0 R /XYZ 65.161 240.684 null] ->> endobj -30 0 obj << -/D [931 0 R /XYZ 56.693 205.928 null] ->> endobj -956 0 obj << -/D [931 0 R /XYZ 56.693 180.049 null] ->> endobj -957 0 obj << -/D [931 0 R /XYZ 56.693 142.652 null] ->> endobj -958 0 obj << -/D [931 0 R /XYZ 65.161 142.094 null] ->> endobj -959 0 obj << -/D [931 0 R /XYZ 56.693 100.851 null] ->> endobj -960 0 obj << -/D [931 0 R /XYZ 65.161 100.292 null] ->> endobj -930 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -963 0 obj << -/Length 1872 -/Filter /FlateDecode ->> -stream -xÚÍZKsÛ6¾ûWp¦‡È3 €/0ít&qk§i^µÜ63qIlHB%ÁÚίï‚$Š–l*²Ú<$Åå¾°ûíbaìÌ윽¸<:9ó±¡( s9uŠ‚ÐaÄEnè\Nœƒ žñ¸âÇCêãÁ[!y¥o§¢Ô7rn^þ$’B|ÖF¯?]¾1CBPäûšÛHÞf¼šs.+õ¤‡ôÀUÒ½¢¸ÎÐGQhä»À/dƒ}!4Pßý|yô÷îØ!Ž  r0"(ÀÔIò£Ÿ°3w ys®ÊÜñ FÔ à>sFG¿aã¼æêŠ"B|¥“eîÈ'Ö‰6:ØœC‚1ny -m<õìxèzÞ€ 0@ÄØÛö68‡2äy‘f{i=9Y&Ž©?¸N‹™þ)5nõ%K+©ïÄT_“y\ÌìâÈyl^ÏãcŠÿ`˜9/ô]OÌoUZ$¼³œÖXß—Ú4´f·öF¡Yk\X?í$mò7½Ûâ 1>ì‰5Cû™'ÅʶF6,èJ6a -Cì©Ø ñ`™|K’ˆ½)EˆRF{ÈuÑW”úƒžMvxJˆ”€Y.Ę—°Æxt$ã[) -ˆ6Báq"’1ä!º©²ï5ÁMɧ­Ç©Xõ¨…Ar*yêr¾žW$¤p ‘ë•Wêw‡²Áa‘SrgÚN¤5n›½+€ÈeÔ -ÐŒ‰¢Þ—¿H@ºü}¬Vˆõ’ЙE4ze†åÌÑ7uÖ–z©x¤à¸Yðç‹Ev»wAŠ©õ]Ä2™÷#•¢]U/â­qç|ÒtÂ+™±LEÑ'Šñü lÞýd°Ì†õÓ­ÔÚɼì§ÉHÔe¡\Îøú'ö‘GÝÃåÅ:ÿ=óboewÈ Ì O :1Æõ¬ßB”üN›7ß¹˜FÌóQ_DÄy®·"n¹.UY5 ˆò3³mE›[——o^ßS]Éÿ_]ç2Ï6hHäaòhõ•BÏI ƒÔõÕýŠúú+Oå\—˳xžÍJ¾¬¯ót6ÏàOîPC} ߣ‡«¡Ðå"ʼƒaE‡ÿ~X±¿²ý±Biê‡&òÉÏy!U¼÷ H‡IÖ›ZmŠ6àËÛ Ï¸[v~¼¿ì€:;JHïHxv¿YÆE–ä_ÕB<¬P%KÑqè!ìæùŽ"º‹·•ðƒ…Ù‡IE-µÞë¶aÇoÅ©2Äpdç -{ØÀ(kQ…6Ç–fØu<;õ -ëü÷…½•í -ÌG˜@Ä컺¡µ½YíÙ,¢g£\Wüq»^S‚{ÀZSÃúàŽãMx…}¼= {wÉoâºLå—~į8 TgÇФŽOzg†j ‚ÿ´ƒó<èZýÐvpîÆîý± `WÆyõmOIÛttrýàñ:90˜¸ô@“’2žJ”ƒŽè&ïÛʹô–žw¸VÎev8Ôîðßµ÷W¶+ç2ª éæO›ï;e˜Æu&¿®‡ÛÎUEÏ3gû´TO¶³.º žôÝ˺aˆHtP$¼3LäE~`çû»ÏÒñ=³tf±ÑNÌËö€PVO,.¦¹šÄ…™•JÖ@¯0¦7 bÚÉ;´ úf2©:@¶€«tV¤ŠI²ä?屬K¾ÐϺ#õ°cS öþ<@ñœg‹îWk{iE8\?wy®„Fƒ‚7Jê‡q©U® FƒáÃ1xiòÞd”¢ª†‹,–ÍFèÙ ‘Û|©~Ó X¬öÉͯu– %W>»1/+—É\nü ¸­4ŸhTúIÞ.Ò$β[+¥¶Ÿ¤EW…궒<¯ÐÆC&¾±€ˆ­ê×µöãÉD$ÕI" - ›Â“dX¸eBAAŒ°Õ)9þÊE¹Œ-í5ËìDŒ¾Lx.Ð}ëÝT»u@€9ÛŲ‘Û¯ŸØŽþPŸ¯œÎ-Bé}F§úp/ mä§9˜ ÁoHJÃj+ ÑÅ0“0†(H[³óÎöº‡¥ïôÅÂ:@˜¨;^ãýë¹myëj‰ÒO´D· ¦a²œFæñgŽ("Å6l€(ˆ–ÐðdsöWR$æpüt4jÇÌú o!–ÖôAOR–60ž4ó®Ÿßÿþ¢·'ƒV©5ê|lž1w«i0x{úá©«aÙñHBÆ+P•h]\ÐC³M ú†ëá- "Mx³Y¥K»\~sÇé>¢÷ìu6ýKƒ‡¢¯ù†50Ég -endstream -endobj -962 0 obj << -/Type /Page -/Contents 963 0 R -/Resources 961 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 901 0 R ->> endobj -964 0 obj << -/D [962 0 R /XYZ -16.307 900.716 null] ->> endobj -34 0 obj << -/D [962 0 R /XYZ 56.693 759.068 null] ->> endobj -965 0 obj << -/D [962 0 R /XYZ 56.693 731.272 null] ->> endobj -38 0 obj << -/D [962 0 R /XYZ 56.693 702.199 null] ->> endobj -966 0 obj << -/D [962 0 R /XYZ 56.693 674.337 null] ->> endobj -967 0 obj << -/D [962 0 R /XYZ 56.693 629.945 null] ->> endobj -968 0 obj << -/D [962 0 R /XYZ 65.161 630.629 null] ->> endobj -969 0 obj << -/D [962 0 R /XYZ 65.161 619.67 null] ->> endobj -42 0 obj << -/D [962 0 R /XYZ 56.693 583.268 null] ->> endobj -970 0 obj << -/D [962 0 R /XYZ 56.693 556.238 null] ->> endobj -971 0 obj << -/D [962 0 R /XYZ 56.693 511.847 null] ->> endobj -972 0 obj << -/D [962 0 R /XYZ 65.161 512.53 null] ->> endobj -46 0 obj << -/D [962 0 R /XYZ 56.693 465.17 null] ->> endobj -973 0 obj << -/D [962 0 R /XYZ 56.693 438.14 null] ->> endobj -974 0 obj << -/D [962 0 R /XYZ 56.693 393.748 null] ->> endobj -975 0 obj << -/D [962 0 R /XYZ 65.161 394.432 null] ->> endobj -50 0 obj << -/D [962 0 R /XYZ 56.693 356.958 null] ->> endobj -976 0 obj << -/D [962 0 R /XYZ 56.693 321.317 null] ->> endobj -961 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F57 739 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -980 0 obj << -/Length 1726 -/Filter /FlateDecode ->> -stream -xÚí[moÛ6þî_!`_`fy|·/[Û%[×v[›ÚbP,ÚVcKž$7YýN/nlÙi©J -2 ŸLSäñtäóÜ‘õÃ>Gu]½î:ȧ‹f„]<ø†Ð 4q]ÑEô¡ý»D·”>Æø¢OO¸Üt]÷¾Mô+ŽCÙ€¸æšÁ‡Ãõ¾üŽ¸î¬l \ ÜHòÝà7l¨f}Gª¯\•ø9pd\·ÿ» Ybà"¤¸Sj ²Of¸È™!ÝÖ-Ò6lè’ZÇÂP¢ÀŒ-ò»±EweÝÙBNÌöŒ©]TóüÀƒ0…ÀàLÝéA(A4È™b²Âô{Ø#uóúƒ˜¤>s”;Š ߉ÅZµ·”*ôS ª’-!W-ù€´$8ÑF GKûò;ÒRge[ÐÆÛÔgQÌ}ä& 0ýn_­É 4ñ ôHNÁ1Ò‰ÿþååau!²Õ‘ Rn«ºÁi -n˜?-qƒˆWf0ZjÈïFKÝ•mAK”&ë[—öê’î%ñ"Šõá.)‰k Té¡ã¥à°.ý­¹Æqqžàb"î4Á‰Q†»MÞ³/ªó0[8#0¨‡áœø@8.Ó©!¿xº+ë`Hi£1‹®ûÍxœdGÜÚô—§Ž¡ü2s<™9’¿Í¦6ƒ8Ïú\¸Ô=Y“?È­Þ«ìöd™d®dÍðá&ùD"Þœ“O@cX,îôâ¤$‚}MjÙ³(½ *Žú-uùé<h›X÷Ø(uÀ2à‚ Ôáèi_~Gzê¬l zâhjóé3‹4Z¯]*L®â&œ¾ý<œfA–»ÆŠ m×Ô/WØù‚ÁŽG¿·ï ¹bãœüvµ°±óyIÚ³šqòÙPœŸG ‹îå¥.Ù£!¿#^;+Û"¦ˆÏëcò˜8úØâË„é&Ë“Õ±.70p˜J< ;⡌ƗW=‡ÑYAwqvã§jyǾ”ÐꆪíGbÿçò -endstream -endobj -979 0 obj << -/Type /Page -/Contents 980 0 R -/Resources 978 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 901 0 R ->> endobj -981 0 obj << -/D [979 0 R /XYZ -11.232 900.716 null] ->> endobj -54 0 obj << -/D [979 0 R /XYZ 56.693 759.068 null] ->> endobj -982 0 obj << -/D [979 0 R /XYZ 56.693 738.489 null] ->> endobj -983 0 obj << -/D [979 0 R /XYZ 56.693 692.152 null] ->> endobj -984 0 obj << -/D [979 0 R /XYZ 65.161 692.163 null] ->> endobj -985 0 obj << -/D [979 0 R /XYZ 56.693 645.327 null] ->> endobj -986 0 obj << -/D [979 0 R /XYZ 65.161 645.338 null] ->> endobj -987 0 obj << -/D [979 0 R /XYZ 56.693 598.225 null] ->> endobj -988 0 obj << -/D [979 0 R /XYZ 65.161 598.514 null] ->> endobj -989 0 obj << -/D [979 0 R /XYZ 56.693 551.006 null] ->> endobj -990 0 obj << -/D [979 0 R /XYZ 65.161 551.689 null] ->> endobj -991 0 obj << -/D [979 0 R /XYZ 56.693 504.576 null] ->> endobj -992 0 obj << -/D [979 0 R /XYZ 65.161 504.865 null] ->> endobj -993 0 obj << -/D [979 0 R /XYZ 56.693 457.357 null] ->> endobj -994 0 obj << -/D [979 0 R /XYZ 65.161 458.041 null] ->> endobj -995 0 obj << -/D [979 0 R /XYZ 56.693 410.734 null] ->> endobj -996 0 obj << -/D [979 0 R /XYZ 65.161 411.216 null] ->> endobj -997 0 obj << -/D [979 0 R /XYZ 56.693 363.708 null] ->> endobj -998 0 obj << -/D [979 0 R /XYZ 65.161 364.392 null] ->> endobj -58 0 obj << -/D [979 0 R /XYZ 56.693 327.241 null] ->> endobj -999 0 obj << -/D [979 0 R /XYZ 56.693 299.688 null] ->> endobj -1000 0 obj << -/D [979 0 R /XYZ 56.693 253.92 null] ->> endobj -1001 0 obj << -/D [979 0 R /XYZ 65.161 253.362 null] ->> endobj -1002 0 obj << -/D [979 0 R /XYZ 56.693 194.895 null] ->> endobj -1003 0 obj << -/D [979 0 R /XYZ 65.161 195.578 null] ->> endobj -1004 0 obj << -/D [979 0 R /XYZ 56.693 149.312 null] ->> endobj -1005 0 obj << -/D [979 0 R /XYZ 65.161 148.754 null] ->> endobj -978 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1008 0 obj << -/Length 2341 -/Filter /FlateDecode ->> -stream -xÚÍ\moã¸þž_!ôZ\4\¾‹¼¾àzíÝÛ½C»I»÷A±GˆÞN’³ÙûõÙÎ&–íxhJF?²cj8"ç™g8CŠFóˆF?ž}w}öæE#K¬æ:º¾4':Ž DÄÑu}8ïr—´îâ’+zþsÕ¹võñ¶jVº»õÿ¨fßUÕýê˯Þ]ürýº¹dŒX¥VÒ®ºÏ¹kïœëÚþgèEz×¢ï]ÆœÄLD—ŠØxÝ¿y±9³º0®ûûξ¿>ûõŒt±Hi¢­ˆbˈ¦<šg~¡Q -¿AÿDZ}Z¶,"Å(áBÃç<º:û÷] ûýåÇ’a8XÌ£XZ¨î%÷ÿW4&±Ô'ÖبqÑí^QØ„!LÆO¬³¾u¨|E˜fCùŠ2kƒêáå0kb¹AÙ¥Àf­>¼_"LáÒdo -Œ[²yF¤XÏßÒÔ¥Ëéß/)úp©)XgöˆkØÝ%®eݸÖ5®Å5ϳò~£%<À›õ?¶o9ÿ¶©r7h¿”ó‘*ºÿ¶"¹÷QÙ4+±ƒçp wëWÎ6›Ã”«S.4€Uqøi9Û©¤+~nðOm.Wò6¬lÃ5<á‹Ç„3¾6åâ+XY ¾À¥i©Ì0è±^ gZÍ…+»¤Ëª b¦ í'âMùC¬,bˆ¿(n‰bk6û”uw8ÈìrçùÝ~WÐÍæÃæû[/»øT5[. -Ü #XTA˜Àe+î¹nÇ%kŠ×–ªÖcù‘s5ô'/Çß ²ö?%‹&ë~»X>ø[—”mU~sqÉxï-Éc›#[¾4”É¢óÉ`ôBv„”ÄG:V„ƒ7\ÎâÙ#6¸YÌ[,9åI‡ÛU¸vERÖÉËÍI‰ìþ˜ê²X¸jm eü¤x•11Ü×·YsŸ¬ÐúϪu÷OXvʺ̵>üiõ{²èª,}¼¼ïÛùàâØX° q DO‰åMùxVÖÓ‚·«™þO=o’tlü-Zdh:«Š¢BÆ»OÆ·ûnóóZ¸†ŸîRé¶*ÐC‘:ôè"èÛ¶jºäH78X Hjˆ‰Ù  ¡ab:¨nÊ„j°² Í)a«ÁÄ[RY!Õ} ÕpÞT‹:+çKêÞò†wì•_Ýb—Æ©{ì\S´GÓ0DÍæ´a³‚°¹ŸÕÑXø)b^3ðòkÚ¥/¿>y ?+#ˆ’b:~V1'ÊÈÉ@?úpeñü¬ æ6p]'€o“YW5XŸW³$Ï~Û‘CØËP‹º¬z²ê»¤œ/ ÄÆ&st0Þ8ì“âãìX¤®²àᡸªKõ«ÜÉÿSP§ÒŒh®¦CѦü@+ëAJKb§—Ùa­ï¦Zt»Á‚þK1J¢…>)Å0%&àì3sC„R²‹‰°z:;ß”hçÁÊz°DˆÚHïÍ—¹}ösßìæîÝçvä˜2+ê¦zÀª[»$ƒwž¹qCJÂì ÅV}úŠ,nMWïda‘Æ€a©iˆ„j"ÅtEšü@€+ëC$´Úº -ú/_;œ'Øz^‹¬­àcù Sxò¡‚HiOI>Òpµ¹,ÐeÄŒ$c†f¦£ WN§«± ä‡!$\Y<IxiãcŠ»¬ý+n×q|¨À»¦Áò ¾ø÷ظۑKõ½1‡û¤²„Ÿ´xî•P¡@õûêÆÁzrµ6ê’ÏÝ3¨«~„¦!¬´bÂbŸ„HÍNGz›âªª 9þ\õ9{ŽEMö߲¶ËK¼V‹ß…¶Õø;X÷çè|eVvM•.fXO·í{›>Ø:ål:ÓÜ”h›ÁÊâwtH+èº|5ܵï¯÷GV¶Î'ÛuÞ%ÍÜuéÇ-iÒ%Ãæ_¿n+ê¾~l^[R îú¤ ! î3ÒŽËsWöë+Ž÷ÅjÂB²€kl§«N ä‡!1\YÌäfÆTùnMô4ì"(mªi^XÎðÚ“x,·pi‰ä'-×qn—j\ni»&«KŸ •3K˜œ°\Ç©!ÌLW®È„n°²ÔÂØó¡Ãïkôñ—=ÉÖW–“W½YÔè´z™®­“ÙÎn!2 ps‹Þ’ˆõ,IúµøùÍ‘Ží ^˜ Ÿ. ¹)>̘ƒUõ !JŸw¢3aè“Ó_ ‰vó Ç0³Ü3;%#°Xy®sTF`^Û _óÀ<&®¢6ˆ¡`eñ„ÀÀ`…°šÒÒa=ñØ`‡kúîwÇÆg¿w;¶:¾R¼+‡ç°^oÞ:Ÿbbòdyrƒ­<$M†o}ã–k_b‘œP9Ý9Éü@X+‹ç&yÊÁtwØäE•.°–ýÉ ,ÞŠ¤üŒÜ,›eÏ@ˆ“2‹‰ûž›ÄàzÇ& ‹¦<å¸)> gÁªz°( -û6°¯MúŸÃîw öûëlº¨FŽ[—»2¿àûwáùÿ®$¬«ÂŸ#ÆÔ¬*êE7vîS4¸ÃÞhbÔtµ¬Mña¨ VO~–àÚ§ôÞØZV»0þçW*ÁÝV÷××± Hì_¦Ôbß-uNãt/ñª]½ð=¥ù÷¼j±/÷×eÌb£#ˆÑS˶Þ8()¡ÚóÂÁÿïmH’ -endstream -endobj -1007 0 obj << -/Type /Page -/Contents 1008 0 R -/Resources 1006 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 901 0 R ->> endobj -1009 0 obj << -/D [1007 0 R /XYZ -16.307 900.716 null] ->> endobj -1010 0 obj << -/D [1007 0 R /XYZ 56.693 759.068 null] ->> endobj -1011 0 obj << -/D [1007 0 R /XYZ 65.161 752.393 null] ->> endobj -1012 0 obj << -/D [1007 0 R /XYZ 65.161 730.476 null] ->> endobj -1013 0 obj << -/D [1007 0 R /XYZ 56.693 686.805 null] ->> endobj -1014 0 obj << -/D [1007 0 R /XYZ 65.161 686.247 null] ->> endobj -1015 0 obj << -/D [1007 0 R /XYZ 56.693 641.729 null] ->> endobj -1016 0 obj << -/D [1007 0 R /XYZ 65.161 642.018 null] ->> endobj -1017 0 obj << -/D [1007 0 R /XYZ 56.693 586.542 null] ->> endobj -1018 0 obj << -/D [1007 0 R /XYZ 65.161 586.831 null] ->> endobj -1019 0 obj << -/D [1007 0 R /XYZ 56.693 532.201 null] ->> endobj -1020 0 obj << -/D [1007 0 R /XYZ 65.161 531.643 null] ->> endobj -1021 0 obj << -/D [1007 0 R /XYZ 56.693 477.014 null] ->> endobj -1022 0 obj << -/D [1007 0 R /XYZ 65.161 476.455 null] ->> endobj -1023 0 obj << -/D [1007 0 R /XYZ 56.693 431.543 null] ->> endobj -1024 0 obj << -/D [1007 0 R /XYZ 65.161 432.227 null] ->> endobj -1025 0 obj << -/D [1007 0 R /XYZ 65.161 421.268 null] ->> endobj -1026 0 obj << -/D [1007 0 R /XYZ 56.693 376.356 null] ->> endobj -1027 0 obj << -/D [1007 0 R /XYZ 65.161 377.039 null] ->> endobj -1028 0 obj << -/D [1007 0 R /XYZ 65.161 366.08 null] ->> endobj -1029 0 obj << -/D [1007 0 R /XYZ 56.693 321.168 null] ->> endobj -1030 0 obj << -/D [1007 0 R /XYZ 65.161 321.852 null] ->> endobj -1031 0 obj << -/D [1007 0 R /XYZ 56.693 276.939 null] ->> endobj -1032 0 obj << -/D [1007 0 R /XYZ 65.161 277.623 null] ->> endobj -1033 0 obj << -/D [1007 0 R /XYZ 65.161 266.664 null] ->> endobj -1034 0 obj << -/D [1007 0 R /XYZ 56.693 221.752 null] ->> endobj -1035 0 obj << -/D [1007 0 R /XYZ 65.161 222.435 null] ->> endobj -1036 0 obj << -/D [1007 0 R /XYZ 65.161 211.476 null] ->> endobj -1037 0 obj << -/D [1007 0 R /XYZ 56.693 166.564 null] ->> endobj -1038 0 obj << -/D [1007 0 R /XYZ 65.161 167.248 null] ->> endobj -1039 0 obj << -/D [1007 0 R /XYZ 65.161 156.289 null] ->> endobj -1040 0 obj << -/D [1007 0 R /XYZ 56.693 112.618 null] ->> endobj -1041 0 obj << -/D [1007 0 R /XYZ 65.161 112.06 null] ->> endobj -1042 0 obj << -/D [1007 0 R /XYZ 65.161 101.101 null] ->> endobj -1006 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1045 0 obj << -/Length 2209 -/Filter /FlateDecode ->> -stream -xÚí\KsÛȾëW v/Òãycf+I­7‰]q^KI¥ÊÞDI”@€ €–˜_Ÿ®P¤€ÉÁ'QÄ §1Óß×i‹€ï¯~º»zóNÑÀ«¹îææD‡a‚ˆ0¸›Ÿ®?ºÄE…»™pE¯ÿ–•®¨?γ¼þP.›‹Ȧ?eÙCýÏ¿oÿróóݘf±JÕÒnËm⊥seQ]†ÙY``v-ªÙeÈIÈD0QĆÍüä…æúMý‡q]ÝwõÇ»«_®H§ ”&ÚŠ ´ŒhʃéêêÓÏ4˜Á5˜ŸHk‚ÇÝÈU %\høœ·Wÿ¸¢ÍBÐÖ‚ð†…ÊîVd/\Z¨®u‚ÕÙi±¿-ø4a”Òëwoêå’ -pI¨”õ½wûåšgI’Ýpuý§‹ú«é2Jû^F7œ^¹a꺹ãÞ¹´þ´ŠfÍweö¼ »¹A×ç¹™‘$ «çÝÍ=Ï^ÑI"¥Ú™f{ÉEœN]g‹, áõç¼6 Ò^‰ ³–pÎvm…©¥~æ\µÆíôÜm¼¬t0Dj³Wácvïòòf¢aEoËh[fé7Æáß2ºOy*’ZØU%¯úó¾m`Ç,䶰ÿFT&Q}¯hHB©N¬±Aî‚ùKhI{ýÛà BK—û jÁ¬í+_¦YW¾¢°°R˜^âCËíÊîæ‹ þð±Lk+·¤ZÉa¼ÞÑwñSk÷傪í¾ß,ºÀª¾æ°­uséȽ•i¼vóäômoË2ï7¥Ãiøcž=.À/ÇO³7ð1Ë*"h þº‡š(¡| üÈßCßÐ0¡V’p-Ïö_£M—ÿ©‘ýÁEiñŒì8Mâ´´¥$š m!ˆÖjçk° C¥š-nܦ@‹|pÛ¢«.9Í>wK$ïd r‰wÇ8QÀœÏãiìÒ²‹uõÂ<$D\±=Ú?SI›Ä¼ˆòöc&X°s !ú ‹mùžXôVƒEˆG5„mšC¬ WvË ž)Åm)€vê -¼iϲéfû_ôõOü‡2oãÚò=7Î[YÄÆýª¸"T4^ô1.—¸}XEé ÚÊ¡ö¤åcôõõ}¦RsÉ8D ±}8p‚—‰[G‹>‘ˆ‚ÌH=^$¢ÀfŒDù~ òW‰( Iy¨J2 UJЯ$›r™å]”¼9“dù"Vnàd!Z¯]”£Ù;Cz…õ#`ä\²Pð×ØË’…¤-˜“–E­—ñ´èC.¾ÄÚàdÁ)¡ÜŒGmùždá­l²à‚ÖÅÛÙ ›³›õ:Ë‘ÀœgȺÀí¿Þcãù´ìÞ'œ>rÜ -à;‹Êè5"üLÕq„)Šuœc›e­£rº|M™ï¹¥–) J14¿°b+{I~‘Vî`0,¿ô-wJå#’‹ %ÀxäÒ‘ïG.þÊâÉE†×*½?2YáK"@/.Ÿ'›lƒÌÆKW”ØÒV |â8ÍVëM‰Ž<¦Y²Y¥=j8ñ¬\ö,¢üÒWœüujÂ0bÃQjR ©;mùžØñUöxÅBÂÒ6yÛ÷‚R -± A/"Ý.]’ÚEXIø—»%7DP;"µƒÓãU»Ûâ=ÓWÕ¼ªÞ…÷Wñaq­¹ô›ãä÷«9Žu˜§2òªÈq~qqfêWÏ€.¡%ÅE}¤P„‡ü 'ù!΢ÚEþ¢‰‡½ƒ¬ÚâÙÓä¡ú²£ jÁFt”è‡Ç¶|OIYäÙf}˜kŸ:”­lx:Çž½ÌÜ“W… HP^Òéò<©:ÝÝ2ôp¶\›]£ðhΖC(cÔxîÈ÷ƒ°¿²xgË5#L²oÞö›·ý?ñ¶\jbìxEèŽ|O¨z+ÛÃÛrE 3ü›·ÎÛr)ˆ¥ú¢Þ–3H,Õ°-‹O¹›÷ñ·ÕëxVŽèoUtÄ“¤Ž|O{+ÛÃßRIžÝŠÞ½?Yõš¶Õ Ï‘ÞFëºÄ{7ärÎÎ%f)¡áx/+täûÀ_Y|Ï;³‚ˆý›cogØÞ”(OÑîc劢ۙz\2ºí>Fêú%J6ƒ£¥Ì·èçÇæ‡ÀúºY‡–06^zG¾§Y{+Ûì«sUÚxuì`iÈ%n…nÿ,—Q90]¦ÈçY¸Ôåà*° $ogók¨ ãmgJ@Z>t{'n°µù¶GôƤ$œØáÉ„ \×áÙ‘ï‰roeñÑš(ùü®É¹µ„ç¦A­67¨–ë&×6ó[¹N ¸&¹ŒÒYâÐ/«æ¹›–ÉÖ笒 J¸¾h»7ƒ9¬øÇ-î“lÚç˜Ò"ÔˆT`B"ìxLÐïGÞªâyâemš#ʹ÷ïZH«txºnÙã¥,<ò¿,ã¢Ìrd3Ì}î¢dÀPÿ&ª_8Ï:¤Ö# 0¢®1PðÃBR¤š_úþ®Ðn¢ -endstream -endobj -1044 0 obj << -/Type /Page -/Contents 1045 0 R -/Resources 1043 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1075 0 R ->> endobj -1046 0 obj << -/D [1044 0 R /XYZ -11.232 900.716 null] ->> endobj -62 0 obj << -/D [1044 0 R /XYZ 56.693 759.068 null] ->> endobj -1047 0 obj << -/D [1044 0 R /XYZ 56.693 738.489 null] ->> endobj -1048 0 obj << -/D [1044 0 R /XYZ 56.693 693.087 null] ->> endobj -1049 0 obj << -/D [1044 0 R /XYZ 65.161 693.771 null] ->> endobj -1050 0 obj << -/D [1044 0 R /XYZ 56.693 648.47 null] ->> endobj -1051 0 obj << -/D [1044 0 R /XYZ 65.161 647.911 null] ->> endobj -1052 0 obj << -/D [1044 0 R /XYZ 65.161 625.993 null] ->> endobj -1053 0 obj << -/D [1044 0 R /XYZ 56.693 579.45 null] ->> endobj -1054 0 obj << -/D [1044 0 R /XYZ 65.161 580.134 null] ->> endobj -1055 0 obj << -/D [1044 0 R /XYZ 56.693 533.591 null] ->> endobj -1056 0 obj << -/D [1044 0 R /XYZ 65.161 534.274 null] ->> endobj -1057 0 obj << -/D [1044 0 R /XYZ 56.693 488.973 null] ->> endobj -1058 0 obj << -/D [1044 0 R /XYZ 65.161 488.415 null] ->> endobj -1059 0 obj << -/D [1044 0 R /XYZ 56.693 432.155 null] ->> endobj -1060 0 obj << -/D [1044 0 R /XYZ 65.161 431.596 null] ->> endobj -1061 0 obj << -/D [1044 0 R /XYZ 56.693 386.295 null] ->> endobj -1062 0 obj << -/D [1044 0 R /XYZ 65.161 385.737 null] ->> endobj -1063 0 obj << -/D [1044 0 R /XYZ 56.693 329.477 null] ->> endobj -1064 0 obj << -/D [1044 0 R /XYZ 65.161 328.918 null] ->> endobj -1065 0 obj << -/D [1044 0 R /XYZ 56.693 272.658 null] ->> endobj -1066 0 obj << -/D [1044 0 R /XYZ 65.161 272.1 null] ->> endobj -1067 0 obj << -/D [1044 0 R /XYZ 56.693 214.598 null] ->> endobj -1068 0 obj << -/D [1044 0 R /XYZ 65.161 215.282 null] ->> endobj -1069 0 obj << -/D [1044 0 R /XYZ 65.161 204.323 null] ->> endobj -1070 0 obj << -/D [1044 0 R /XYZ 65.161 193.364 null] ->> endobj -1071 0 obj << -/D [1044 0 R /XYZ 56.693 146.821 null] ->> endobj -1072 0 obj << -/D [1044 0 R /XYZ 65.161 147.504 null] ->> endobj -1073 0 obj << -/D [1044 0 R /XYZ 56.693 100.961 null] ->> endobj -1074 0 obj << -/D [1044 0 R /XYZ 65.161 101.645 null] ->> endobj -1043 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1078 0 obj << -/Length 2065 -/Filter /FlateDecode ->> -stream -xÚÅ[Y“ÛÆ~ß_GíGsN*Û±œÈR\‘6©TI~É!‰hÜ#¿Þƒë%öjpúi±d£§çø¾îénÒhÑèÇ‹ï®.Þ¾S4rÄi®£«E¤9Ñ&²La¢«yôåÍ'Ÿú¸ô—®è›æ•/ÛÇE^´Õªûòoùì»<_·ÿü÷ó‡Ë_®ÞÃ0ƈSªÕö¹ºK}¹ò¾*ë¯atY]‹zti81LDEœéÆ7 ÏØ7oÛ?Œëú½‹®.~½` F,Ršh'"ãÑ”G³ÍÅ—_h4‡ï`|"nÉM¤%\hxN£Ïÿº ÝBÐgd¯[:¨nMúʹj¬Ø¿ööˆ4Óõ;–Hmá‹výò©/ªË‰¦fßUyöÍå„qøw™æewä¶L[}°PµÊúχs„a†GF8•«çX®¨!Fêˆg]TøhñpRÚžþôñܱWߪeµl¨vE˜f‡ÚeÄÀBaô?ÜlMwÁ†6êŠeÔ>|êöþ`w¤YsF”µívþ¼«¶»ê`÷«Š¾4ÛÌqrqUÉtWC %Ÿg8¹æ|Í“kœô4Ígk¤eŽ“n¸ÃIÎb䤦¹¨ó¹G®Õ›Íë(d†Éƃɡþ@ ‹€Ê=¾)Ñ0f•ÛÂ/°'ºÀÉ]ýüý ŒB°ÌÉ$Š‡0ç3ŸuºvHæŸñ>)Öqë2~ÊK¿Þ;ŒzE8 m±\Œç,´¡Ä‚ýcá §? áÆâ]†6’0mšÝü!‹§)–‹VwÛ•Ïâ*Á’|¾ÀÉýûÓ$oÀœä.M²5’ßó¬òÖq–h÷‚ôWñë6Cãg^ÅÅÒW=ŒÖ†X£ÎÊV@çøiCܪ>úC(K(pVjDÊâଲõRV°±(‹pV²ÝÑo·Û¸mãj¶:.ÎzVnW ÉÉ~E~ƒô³]Q¢Ù7AŽŸ!§þ×M^x0¶çæ°-|Ùgá1”f‚HnÇÏ¡þ@ð‹{5ÓÄ°.ÇqµÂú¯›$Mq’¾‰!p²×¾@b7­]Ö‹ÁøèiU«{IF#³ÜÆY–dË‘îtšrðin¼³}¨?ðl;àlSEŒêR_Û"Ÿùr”s°°»I†õ%ùmây÷°ß}y¾¬ý}lf%1FïÁ¾ª6érM$e{¡Y¾× n{æ{Õ@€"¼}.Úžr¸Îl”Ø(uL1ýc¼+’êÿ-ë¼÷qVþÎJMýr@Ð* XrD¼–„zúÃH(ÜX< ‰¦.Ö‘ÐÇ|ž,ly$ž­³ü&õó¥ß€¿ÁÖ üf›Æ•?mÜ_çØ -’]Ç)V8ÜbÐ}ó•*úç(´ÏœyV¶³ê©A 1,?Ãñ"¸òŒáÐuC‘<1Ó47œm¼RØŠæœ^aɈ£ãåf{úÙ&ØØlÓÔµô}ȃ¥š¹_Ä»y×(“¹ŸÆÅÀ¬}N“ç¡WúãÓRBÀ¢0wVà1M¸0l1QP „3ä8œRŒ×ÔÓ¹pcñãp£1lŸ–Jn‘]»åSþˆ;ã˜Ö/»²GÙ¡îóÉ˯}û$Ÿ¯ÎùÍÊCˆ]`«~Ø4T^¬¥Â^=ßÜq"åY[š¸võèÔù漂¥m®À4ÆGĶ„y¨ñZ›zú±lìlC Ã%; ¶‚9ö2H÷Ç£ÄÆÚÈN«îÎ{Tís€÷å8}ÖVÎá–Ÿ8ìM²4É´®À‹ëB¼.ƒ=Hõ‚4ØØ ­k¶º»÷üc³-òklØÛ4W¾Ø cÙ]ïºür[·Í¡k>Ó»“—‘Öþ®Ä'%Ûžcly OçØ^È9RåMŒ&=¿X$³¤ßÜÇC=8’IÂÕ}Fï+•´KÚRÎ)ßËL`'Š×X×Ó†Åpc1X”Žh©`0I,횃ð͵]«úhÏóÙØëg)Qj¼Æ—žþÀ 6_udV+»Ä¾P¼‰³;,hk‡:–ŽC˜1D™s†!LÁÁ·'NÀ1ŸæùšÌÊ’ÜnÒ®yí‹i\%›Ñ « Ø#¦ÿ™„Úñ²=ý¸ -6œ0aˆÐ§ÊX)7/»ðÿÔÉ÷¤BÂÒö÷H ¬à,NStS -Lõx” F¨g…9ì²?¸­®¡ëêd Ñt¼tÀ¡ú0,›Š‡²£Äî2ò}ž]×Û‰ìï€ö€|ú??«¼PçéŽî~¾›´ÜöÍx!XûÏRé°Àç/šöœc ÅJ¢ÙÙ‹G¿ß—”ж§yèÏ÷àÓÐ -endstream -endobj -1077 0 obj << -/Type /Page -/Contents 1078 0 R -/Resources 1076 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1075 0 R ->> endobj -1079 0 obj << -/D [1077 0 R /XYZ -16.307 900.716 null] ->> endobj -1080 0 obj << -/D [1077 0 R /XYZ 56.693 741.863 null] ->> endobj -1081 0 obj << -/D [1077 0 R /XYZ 65.161 742.547 null] ->> endobj -1082 0 obj << -/D [1077 0 R /XYZ 65.161 731.588 null] ->> endobj -1083 0 obj << -/D [1077 0 R /XYZ 56.693 685.669 null] ->> endobj -1084 0 obj << -/D [1077 0 R /XYZ 65.161 685.11 null] ->> endobj -1085 0 obj << -/D [1077 0 R /XYZ 56.693 637.95 null] ->> endobj -1086 0 obj << -/D [1077 0 R /XYZ 65.161 638.633 null] ->> endobj -1087 0 obj << -/D [1077 0 R /XYZ 65.161 627.674 null] ->> endobj -1088 0 obj << -/D [1077 0 R /XYZ 65.161 616.715 null] ->> endobj -1089 0 obj << -/D [1077 0 R /XYZ 56.693 569.555 null] ->> endobj -1090 0 obj << -/D [1077 0 R /XYZ 65.161 570.238 null] ->> endobj -1091 0 obj << -/D [1077 0 R /XYZ 65.161 559.279 null] ->> endobj -1092 0 obj << -/D [1077 0 R /XYZ 56.693 512.119 null] ->> endobj -1093 0 obj << -/D [1077 0 R /XYZ 65.161 512.802 null] ->> endobj -66 0 obj << -/D [1077 0 R /XYZ 56.693 475.817 null] ->> endobj -1094 0 obj << -/D [1077 0 R /XYZ 56.693 448.379 null] ->> endobj -1095 0 obj << -/D [1077 0 R /XYZ 56.693 403.19 null] ->> endobj -1096 0 obj << -/D [1077 0 R /XYZ 65.161 402.632 null] ->> endobj -1097 0 obj << -/D [1077 0 R /XYZ 56.693 355.471 null] ->> endobj -1098 0 obj << -/D [1077 0 R /XYZ 65.161 356.155 null] ->> endobj -1099 0 obj << -/D [1077 0 R /XYZ 56.693 308.994 null] ->> endobj -1100 0 obj << -/D [1077 0 R /XYZ 65.161 309.677 null] ->> endobj -1101 0 obj << -/D [1077 0 R /XYZ 56.693 262.517 null] ->> endobj -1102 0 obj << -/D [1077 0 R /XYZ 65.161 263.2 null] ->> endobj -1103 0 obj << -/D [1077 0 R /XYZ 56.693 217.281 null] ->> endobj -1104 0 obj << -/D [1077 0 R /XYZ 65.161 216.723 null] ->> endobj -1105 0 obj << -/D [1077 0 R /XYZ 65.161 194.805 null] ->> endobj -1106 0 obj << -/D [1077 0 R /XYZ 56.693 147.645 null] ->> endobj -1107 0 obj << -/D [1077 0 R /XYZ 65.161 148.328 null] ->> endobj -1108 0 obj << -/D [1077 0 R /XYZ 56.693 101.167 null] ->> endobj -1109 0 obj << -/D [1077 0 R /XYZ 65.161 101.851 null] ->> endobj -1076 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1112 0 obj << -/Length 2154 -/Filter /FlateDecode ->> -stream -xÚÍ\msÛÆþ®_I?Dž)×÷þÒv:mÒ8‰kw¦–2Ó; ð(b4ZR~}h› ¨,xÛO¤€ãÞÞa÷Ùg÷"ÑmD¢/¾»¾xùJ’È‚ULE׋H1P:2”×ÑõbføÚXfGPv+°¼Ú/ï:ãØ{ДYØî<oºíó~•>ìÙÆ¡œè}û|7·{»ËÌâ—ÝÝ:òÛ*»›¸ÄMtŸÖËbSãom74Í+oÙn°7ðú¹1HMãþþ]ÖU˜·87ÀUŽ|€z€¼7eZÿÖ‚ÂkçÕ™ɇÜ(¡,Nít(¡ °Sľø0ŒVÊP¢ io‹OnŽ4ò%Òw+6FâŽõ¦çäÝ­¿Ũ˛†1ôœó¯¿iÅت£÷î@Û£#y÷3n`œaׯ×Yê(Z}Ø_Ùš ˜¤;àø@iI–g@_Fém¬êÆÌ°°¡=‘"t:·Þ—è×ÁÊbÛ3B%¤ŸŒƒòò·ÛY:ïƒé'¤5}u…¸Žëe5¶{$Å -©gƒ+婱VI B°é,g_~ å+‹°œâ~ƒ4ïÒ"çЖ,Ÿã?0ceÿXÉÏIç ¹=½NË»¸%@ÿ,*w·£?ñ¦.ÒùÃ쮹8„1¯‰V’ êóhj¦3ú}ùF¬ìD}jOºbÀ/ëÛ2ž£©2 n°ÁÜàªÈ‘éKî£~˜þ‚‚Ç~æ“AìòúéàñtnéJWh„OŠ¹Cï.rA«Š²Ž‘a+ÎçÏ2bÀèi˜÷ûÓ¹ê¾ü@W Vv³!¬èj^x[Ê $i*ˆ¨·e±Y§ùAºÿòxÒØ^ÿÇsœ¶à1wž -­ªSÉ´¦©¯ž1èJ-AË‘ —Ér“ßÍÐt¥wm'¬OJ)Àðéê“=ùaž®,>èJi€²®>¹­OZa¸âÏǽ[—»Òg ÈP±H3—ÇX€AãFé>n—#ãÖ&O?nÊ|~G£öï;Œà>èÉéìy_~ =+‹Ïœ¤Ðþ³Kð„$EҦɮ\}rŒ9o ìîŒb´8P¬ÖEî}lHðTîëBÏØQ@X DNW©êÉóšpeDB€ïÒoô)Õ*­ªCêµ½õÍqúõý2^÷kFÇ·ïFß<¥Y|ã²±s%|ÖøÄÒžç¢i¾( ?<€, - ŠY„¦@…ùh<¾É†K¡¼FN+’cz:XÙ—+ÁÊâaEH’ŠÝ½ÇR³dSV)¶üRoÊæ‹6[`‰!²à±*JW÷Ø’G]—éͦƞý`é þÈ°ñ±“†[`jº -gO~ ?+‹'§B0»v§ëeZa›42dL[—\È\)N³M‰4¬7f¶²ò”‰mo| ’MÇÊ9|s[J”ôyº1ïåzß`8™®¤Ø“èÁÊð NAÚ®…­ç»‡ÄyŠ=T»5Öx°u¿§ƒÕ°døyIa ÆîWlŽÛê"ihY×£¸ë?Jªmç"r;¸õÊMÙ©È 1a§bO~˜†+‹'kÜл*ÀÕf½.Jd YÅwøu™d.ÎŒ_Ö«lä*Nk¬tøœm wp®½YuNçR‚<©¡ðïùó‰È\HPSör.@M×c¸/>лCUàÜ\ƒÝ%âŸ#Ó¥j - Kïÿ7pQ¹ˆÅ–­C ÙKæVž­Ÿ|bÈ=eRšžYˆ-õ¤È‚\=³^+¦Cf4˜ Û•{òð$\Y<˜0K²]{Z¶wtOcµ}hdØÙ½‚„üÓõÛ7Cš O,9w׿=ŽfçKíÛçs^lÕ"?̉fÇùÍgà§â óÌÕˆ³™1EÁr>.6c•bÒë 'Ä?AÐéNËzòñ/XÙø'0k’©ÏïñÝÕöS ‰ …›Î‹[ôŽ—Óü®·§³^ºÕÉÈÁ vÖê £ÞúÉÈGb브Wðpïn° '^ 1a—3µ¨™îL¬'? <•ŃµM+ªþBèÈGA¹»ÐÞüˆïª*]ž¸“sÚpKkÎé‘Tðbš6Ȧ|@L§Òg¶ÀP¡«é^¹éÉôË`eø¥$ º£¹7iU{LðÃÇÑEŽæÎ÷XoO²Í¦Ño4 Ó$·í_9<ïâú¬ï%5oM iÿ· ,”z%¦dú”|ºûžü@PVv(†uGe?/FíMŠ¬Z»7x‰~Y=9¾©ús7ÊÀ¾æ›¥õè)ÁØe¿aOú©§;èßæRÁªâù-£ºúqWÿFáÈÅUbþÁÿ¬kôIŒ=ypª«óSƒ°Q í!øà_6 DÙSþcÓyàM -endstream -endobj -1111 0 obj << -/Type /Page -/Contents 1112 0 R -/Resources 1110 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1075 0 R ->> endobj -1113 0 obj << -/D [1111 0 R /XYZ -11.232 900.716 null] ->> endobj -1114 0 obj << -/D [1111 0 R /XYZ 56.693 741.747 null] ->> endobj -1115 0 obj << -/D [1111 0 R /XYZ 65.161 742.431 null] ->> endobj -1116 0 obj << -/D [1111 0 R /XYZ 56.693 696.165 null] ->> endobj -1117 0 obj << -/D [1111 0 R /XYZ 65.161 695.606 null] ->> endobj -1118 0 obj << -/D [1111 0 R /XYZ 65.161 673.689 null] ->> endobj -1119 0 obj << -/D [1111 0 R /XYZ 56.693 627.423 null] ->> endobj -1120 0 obj << -/D [1111 0 R /XYZ 65.161 626.864 null] ->> endobj -1121 0 obj << -/D [1111 0 R /XYZ 56.693 568.397 null] ->> endobj -1122 0 obj << -/D [1111 0 R /XYZ 65.161 569.081 null] ->> endobj -1123 0 obj << -/D [1111 0 R /XYZ 65.161 558.122 null] ->> endobj -1124 0 obj << -/D [1111 0 R /XYZ 56.693 510.614 null] ->> endobj -1125 0 obj << -/D [1111 0 R /XYZ 65.161 511.298 null] ->> endobj -1126 0 obj << -/D [1111 0 R /XYZ 56.693 463.79 null] ->> endobj -1127 0 obj << -/D [1111 0 R /XYZ 65.161 464.473 null] ->> endobj -1128 0 obj << -/D [1111 0 R /XYZ 65.161 453.514 null] ->> endobj -1129 0 obj << -/D [1111 0 R /XYZ 65.161 442.555 null] ->> endobj -1130 0 obj << -/D [1111 0 R /XYZ 56.693 395.048 null] ->> endobj -1131 0 obj << -/D [1111 0 R /XYZ 65.161 395.731 null] ->> endobj -1132 0 obj << -/D [1111 0 R /XYZ 56.693 348.223 null] ->> endobj -1133 0 obj << -/D [1111 0 R /XYZ 65.161 348.907 null] ->> endobj -1134 0 obj << -/D [1111 0 R /XYZ 56.693 301.399 null] ->> endobj -1135 0 obj << -/D [1111 0 R /XYZ 65.161 302.082 null] ->> endobj -1136 0 obj << -/D [1111 0 R /XYZ 56.693 254.574 null] ->> endobj -1137 0 obj << -/D [1111 0 R /XYZ 65.161 255.258 null] ->> endobj -1138 0 obj << -/D [1111 0 R /XYZ 56.693 207.75 null] ->> endobj -1139 0 obj << -/D [1111 0 R /XYZ 65.161 208.433 null] ->> endobj -1140 0 obj << -/D [1111 0 R /XYZ 56.693 160.925 null] ->> endobj -1141 0 obj << -/D [1111 0 R /XYZ 65.161 161.609 null] ->> endobj -1142 0 obj << -/D [1111 0 R /XYZ 56.693 114.101 null] ->> endobj -1143 0 obj << -/D [1111 0 R /XYZ 65.161 114.784 null] ->> endobj -1144 0 obj << -/D [1111 0 R /XYZ 65.161 103.826 null] ->> endobj -1110 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1147 0 obj << -/Length 2583 -/Filter /FlateDecode ->> -stream -xÚÕ\ëÛ6ÿ¾…Шè2|KÊ=ÐæÚô.×m²ÅHúA¶h[YôIr6{ýl9±åÇMiû²òJÔp8äüæÁ¡h0 hðÓÕóÛ«§/ bk®ƒÛi 9Ña1ADܦÁ»Ñ“›¤2×7\ÑÑk[›jósjËÍzÞ>üÁNž[ûaóÏïo¾þãö%tsÉ•ÚP{[ß禚SWÍcèô®EÓ» 9 ™n‰Ã¶ÿè…Ñèéæ¸nÞ»úñöê?W ¨Ó€J‹ ŒÑ”“ÅÕ»?hÂ3èŸÈ8 -îÖ-b”p¡áw¼½úõŠ¶‚ '²¥-c¨ްôžsµæbûÚÓÐd= Ù¼©#x°‘Ÿ›²¾¾Ñ”Âè“ûÚÏ®o§k.’œ|ªò 5SC°¹ü´?B˜rà‚ÅÍ›ûŠ†$”:à$†›¥ ¦»CÚ£vüîa†)¶ô7tYÓØ—¼"L³yE AP˜v'[“˜Çþ¬®é•³`óãM;ù{É F*‚É¢Í|¾È>íÍý!àÝz²Ç«Ù^Ãö6¸Š$ox÷nnJƒë¦NÆ9²éÔÚºXk0ª94Å5L–K“”Y1Ã5Ï -\»¿ß¾ú¹#ÁÑÍI¹&65é¥2ƒ÷ V ¹&L2%ôg»ûBŸÉ|U|¨íÄt C§l8üÑ TòÁ¨Cßü™ÅCŽ`ZE?ô„GBF­!í‚ý/R,WYQe)’ò2)‘t—ôjkýÀ" -¶÷ Ùy5·«Ù÷øb(Ó\•|L(ÓšÙf@Ù«dUfõ7XöÒ$Eå‡e -®LˆeF -~ï`X¶Oß˼™uÀ2)‰Ü‚Ù÷)Új/²ªB;E²0Õ2™ &5“<)“:³EuB›N½ú·ÜVX—ê4"ǔꭷ"‚% UoYÆNö¬·[ÔEo)Œ‡Ãé­Ša¤ÀþPzۡ立þÌ:è-…`zÈÿ¶L“íoϱÁŒY,s ‹gJ·Àít`ÍymqíV•¹LRííoN‡= ·³2Yλ°õÍyØ:*ê-ÚÁP; @Ä sŒm5ú=•´mí´ -‰„UÒ¶¹Aª³Š4á4NÛöé{j›7³m“1ÑRAg1‘q›rêÇÈP -´‘Q‘ œ?¦QMÏqxù§ÉêùƼHæù¬4ŸMLVäY±60Ú4ȳª® ŽR‚°h@{#9È™ §ûô=5À›Y¼½QRÚÖ¦¡öãQlüóilwÁí¯ç11)RÇ2ÇLn¦¨«cÝ|uº›4«&v@µ¸ØÛ4ùˆ5¢vŠ ]›?6ÊÝnìŠð«ó"œ–v±OþaŒp=\Z©CßSż™E¨ØgÆ%Ùzt¿Ë·~{~.Ž½³~ÑämßSEO¯ë®Âó‹JþraýøËoÏ»CNØùÑØU½\ÕX+{M#%Å ¶ÎëEÎ?5ñQèè³-sÏ)N‰ r8Íا暑1Û -ƒÆDÈá26úžÂðfÖ&'ZðÏégO4L‰gçÕñµý¿7÷u2«ú5ØGQúéiŽðaLí‰H¦ú~j0³­0"k¿¤›úÆ>}Oax3‹ÇS2åœÅ- DgU•Ù¢ßËáB?éu.ÍäÀé|†4˜2’DŠè1Ãb©‘[I÷–zýcG®$ñ€°”0N1\*¨CßSÕ¼™ÅÂRj¸„_Ìoêk~¥Œ™Æ8èiGMÏæGÈÍÍŸkû]”3ƒlœ!CÔ,ý¶HƒoËúþXŒ‚uÝ¥lÒñZ‡"Y ö%ê7A—¬j›¥Ÿ\ôL²ËPD ãTÃå :ôýÈŸY$¢DíX†’\†Vç*S -춋CQZj>9@Â!.žÃû¥9ápœŽM÷pÚº_Œm^9nUfR£½6t9Τ4‡ûˆ"€hÊ¡âá -U;ô=Ô›Y¼W.bà4jËkÌG¬¢` g=Of°Yò饪wºL#KðG²b’¯°%iIqï£eŸ«ždwè=lz½So›Œ,~)T>žŽˆš áÊÔx£¡Šw]¡­" ¢ºÓÈ(ŒìUR,“kFG3ðeÀ¥ÛžiØuhpÛø­ÝǺݞ–˜Ú<·×\îµ¾µNoÏWÌ“kNG¯™µoŒ ¨óú×"IÛ{>„±Ù‘;}3VÃPo°EÃîì(—0Zñeƒ¿)¥ÞÐ:1s€0ŠðÍïrs:„ì‹F¬ÂõЩÖ=‡®ëµçà/òXˆx†óy“.pÝ'ïgŒ¼YÅ;‹<9oñ¼²i6Íz/ºƒEb<±ª^«!j‘*Û»ÅÊÀÉ1K³šÛò_FÙoÜÛ­¿î”I& Wƒ”ñp\ Whѡ逸ÞÌ:”ñP“hk¡\²3õ]61Žõ²oJÛ§=u`‚Vì« -‡ ü;ô=—ˆ7³ø¸‚Ã5jíø÷9ìLQ­J<æc‘ñë{3ëàksF¢÷·E$x ª†ki«º´K¬»jªI²Ì!àáú,lÉU²\æ÷èÌ/ÞÏ^Y>ô(=™_Z—Å™"MBâ1…ÅÜ q¨¼n¾cPlÖÊ¿’¼šoeœÛÉ.ž˜"]Ÿ?w€Öä~”RXÃŽ‡+ðèÐ÷ƒfñÂÂD‘ò‡5Óóç°±ˆ³½>‘îºÅx(hü-ÒmŒ4 ÃáÎÚí“÷SoVñ*SBu›¹ìðŸp-9Ä.)üHp7íÛ[ðrð‘Òæ ž:¾ä¥ÿµ\4è -endstream -endobj -1146 0 obj << -/Type /Page -/Contents 1147 0 R -/Resources 1145 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1075 0 R ->> endobj -1148 0 obj << -/D [1146 0 R /XYZ -16.307 900.716 null] ->> endobj -1149 0 obj << -/D [1146 0 R /XYZ 56.693 742.693 null] ->> endobj -1150 0 obj << -/D [1146 0 R /XYZ 65.161 743.376 null] ->> endobj -1151 0 obj << -/D [1146 0 R /XYZ 56.693 698.706 null] ->> endobj -1152 0 obj << -/D [1146 0 R /XYZ 65.161 699.389 null] ->> endobj -1153 0 obj << -/D [1146 0 R /XYZ 56.693 655.96 null] ->> endobj -1154 0 obj << -/D [1146 0 R /XYZ 65.161 655.402 null] ->> endobj -1155 0 obj << -/D [1146 0 R /XYZ 56.693 611.973 null] ->> endobj -1156 0 obj << -/D [1146 0 R /XYZ 65.161 611.414 null] ->> endobj -1157 0 obj << -/D [1146 0 R /XYZ 56.693 555.785 null] ->> endobj -1158 0 obj << -/D [1146 0 R /XYZ 65.161 556.468 null] ->> endobj -1159 0 obj << -/D [1146 0 R /XYZ 65.161 545.509 null] ->> endobj -1160 0 obj << -/D [1146 0 R /XYZ 65.161 534.55 null] ->> endobj -1161 0 obj << -/D [1146 0 R /XYZ 65.161 523.591 null] ->> endobj -1162 0 obj << -/D [1146 0 R /XYZ 65.161 512.632 null] ->> endobj -1163 0 obj << -/D [1146 0 R /XYZ 65.161 501.673 null] ->> endobj -1164 0 obj << -/D [1146 0 R /XYZ 56.693 458.244 null] ->> endobj -1165 0 obj << -/D [1146 0 R /XYZ 65.161 457.686 null] ->> endobj -1166 0 obj << -/D [1146 0 R /XYZ 56.693 413.015 null] ->> endobj -1167 0 obj << -/D [1146 0 R /XYZ 65.161 413.699 null] ->> endobj -1168 0 obj << -/D [1146 0 R /XYZ 65.161 402.74 null] ->> endobj -70 0 obj << -/D [1146 0 R /XYZ 56.693 366.942 null] ->> endobj -1169 0 obj << -/D [1146 0 R /XYZ 56.693 340.334 null] ->> endobj -1170 0 obj << -/D [1146 0 R /XYZ 56.693 299.295 null] ->> endobj -1171 0 obj << -/D [1146 0 R /XYZ 65.161 298.736 null] ->> endobj -1172 0 obj << -/D [1146 0 R /XYZ 65.161 276.819 null] ->> endobj -1173 0 obj << -/D [1146 0 R /XYZ 56.693 232.542 null] ->> endobj -1174 0 obj << -/D [1146 0 R /XYZ 65.161 232.831 null] ->> endobj -1175 0 obj << -/D [1146 0 R /XYZ 56.693 188.555 null] ->> endobj -1176 0 obj << -/D [1146 0 R /XYZ 65.161 188.844 null] ->> endobj -1177 0 obj << -/D [1146 0 R /XYZ 56.693 134.456 null] ->> endobj -1178 0 obj << -/D [1146 0 R /XYZ 65.161 133.897 null] ->> endobj -1179 0 obj << -/D [1146 0 R /XYZ 65.161 122.939 null] ->> endobj -1180 0 obj << -/D [1146 0 R /XYZ 65.161 111.98 null] ->> endobj -1181 0 obj << -/D [1146 0 R /XYZ 65.161 101.021 null] ->> endobj -1145 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1184 0 obj << -/Length 2769 -/Filter /FlateDecode ->> -stream -xÚÕ\ëoÛºÿž¿B¸ûp`fHŠÔ£wл¦]·¾ÖænÚâ‚–i[­$úê‘4ÿý(Kv"ÙrŽJ3Á€¢Vä£ÃŸÏ›¤°³p°óâä×Ë“óç;! -=ê9—sÇ£Èó€¸ÈõË™óéô½L¤(äÙ„r|úF•²h.ç*o.Êeûå3ýªÔ·æ^}¹ü‡fB -9o¸}(oY,¥,‹úk=:q=ºçÖ£3ÏG> œ G¡ßŽO°fè§çÍ¡^ýàÉÅåÉ'D³Çq¸‡¼Ðuü S'JO>}ÁÎL§ Îõš2u8Áˆºž¾Nœ'ÿ:Á­$pG"ÔÑd>×"Ù0g!"Øk@¹¨A±yÌù4!ãÓ‹U5m×]©j!P…nÐ<}¹‘Ø\%‰:£üô:ÎÍ­h)²ÅFÆKqFñéÕá§íS)³æ*³ö^©n'b=¶F{;6 òýú¯Ç–ûR1L6D‘Úð.â,’½y&Z4ˆ6×y£¨+ ÕsNô N(Cm˜~¦”wÈÖ@דÏjb^°AðO—˳‰§eú\,“E.³'gBõßÓ8;/V2:—ßEºÒÚtþôµ(þ¨äÛù3qS úþÒ<:SÑTk$ú^$íÛ‡5Õïõʧ *­¤5°úãEW½´QŸ:žV/LÜZ½êûkeežCQ„N.ù]}êpÛww€#ÌÙf€†1©©MùsD<ÒçϱžI-rÈwmÍC! vÍ0_8ÍÅûÖø::AhˆÖ‚ÑþˆÑC*Tr%;ª´ËK[d=ß…J”"*+‘Àhs©²(b•°â F7%®ªÊUU…°Re)g0âé Œ.U¹„J+’ê•Ì·bÕºÀïè£ݺ¨Ï˜á–(¸Cä#¦õ¥¥™@ Û ÖßTå>à¾Rþ~×»cÙ"”ëÖ*­ü”1Ëõ,Qîx>Enà6¡æ°Ù¯r´”Ñ·.9`=›}Ï<ð¹›!µé€ÇÂ,8nh»¯ ªë2Ä­Æ$¸p›1©Ëß0&ƒ“tÊlbÒo«Ús=l*g±PÓ¯2‚úodE¥v‹0òuö¢,—a*uÉa´U!a1WI´ýâ3渽¿ûèéõRE!®Dœˆi"{ƒÔ_öÂåv¢ ¡ˆßçšM,©ËßÐ’ŒÁB,I—TÓ±‚plbÅT—@C‚DVæñ´*Áù$ Z{ì‰Ì€(^GÏT&’ÙØ؆µtÝù€±>âÇŽmÝÊëN½©Âvk6 aq?°[—qÏ·Z—õø›Y®9Xx ä>Öuiæþ"+ªüèçÍß>K'U©®3€. PEr-nŠ1E8¸®(9U”l&RY¬D$G:$®½¶Çzü ­Á,À¶ÀÃÛ’§T°YXåò -\¯r¥s™´8¶zµÃû ¿ÅÙ,‘ hú•Šhg2¿­bîº×ú1Ï%ºžó'æméæqÝÏ\‰¼ŒuÊ¢Ð÷4é‡Å}Ik"®/·I+&ÁÛ+Ò\Ã)%º¤¤é¶?›%e¿¡1;"œW—”m8}:›Õ‹°±Z­Tt"õ ÌÛlÔðèþ¦Ðå,í~§n4Ý.üö<2DÛô“Êh¬çÑÚÎ=þž‡ñÍÂÒãu’˜_/º{fϼºK­™}¿™Ù›ƒ…›½žQäŽ7zmž"Æw`2r­òo"WUL`—*ÏãyÁ¨Ÿ>»VßÕâÑ2œ8Ó8‰Ë›ãJVgn‘Žýûz]öwÓ¼ïðþ -µfý‰©û ~Ì­oñG÷c.FÌb3€‘±[?y|7ÖåoèÆŒÁŽpc”"Ÿ[Gö˜©‹¨Jí›Ú•­út>lnÍSÇ]Ñ}ûî9tU 3QŠñíð«ØxGK!kÜÿ‰å,½æfÛ9‡š"ñ èC:!7dˆQ÷Ë8 <Ü€¡ ìù&×w×foË7õø›ù&s°pßäú>¢d»£-UWrl(ˆÄƒ¨—CÝ?BÈ<žO^–"‰#¤ÊùsÖ×9©®Æ9·¸ÎIuË-ú¿3“7 ¯Æ©ï¡ ›ÃP1t·hsðã9£÷Ô#ïšCo°fããö:Ó*)ã´N–éTÂì\íl¨ºß®ê3„#]¿¡Ú[Û -ƒäùž=atù -ÃØV #ŸØkžôø -Ã,<¢õaÜÖE/ͱUA7ú]Å ðÁ2hž$ ] }SГjÐÆàæ¨q/ùš ×/íydÀï‚v’ê‡:"G¤u¸ä={éò7´c°#ìÅufí–™=M«uìæü3|g#¨ë|wù:3]I€üÐÞO¿¡Nƒ¡ºŽÜV7ÿ…úÆHËÇL]³Ô*;ò–”õ[®ÁßH¥énG -îttX,Z:ì ÕËÔF$lÊ[¢èñ7“…1ØaÃÂX†a!t®ÿX]œ–j‹]+æè û·M„«ªœ?8œÌ›î‡UüÀ y¥,Ê8¢bl°"×ÊioQ¨ÇßЂLÁZ BDIç´èý»›ÎÚïQ5jêú9Òpž§#ØN÷äàº!‡ô$Jä3-P{‹i=þ†Jd l+ ¯©­ £ËßPÆ`áéñ|DÃö8þKèëVöG«û6+ØÊÜÔjÄ!hâ:•àSû³c¿ù¥\BQª,’?š±ÞTƒÖl¢ËßÐ&LÁ[÷ëº÷†™ùÀ¹›É¡gTVîËA> ?òö¸ñõùËW}H_àEÝÄî¿ýaÐ%öö.×s€î«!¬)k­)w—¿¡r[Û -Ã%ˆP{ ±Caƒý\†á·¯„¹ül&óä~ÌpûòÆ#÷LDÉøäþˆ6Ȉ²¬õ*ðÙý$.ŽÜÓÞñ±Ã”q2öÐ>¡MoÍrºü -ÇìË¡.b¼m®_‰ló‰z'é±Ó ¯X«2èêtqäväû‹7O__<ƒ¿ÑmDA¹wuúð#»KÔwÍü<â,ñÏ÷lòÛ‡«Þ - ŽäxÝ°fö†h j#‰0X¿cË–$ºìÍ$a u„'Ò@¹ŽŒáy•e;/8;Òæ¶#Gù8‹’j&xË\ÐTø¶Ô¦ËÞLmL¡*IˆÑæ˜Åä°¿*–ªJfÇí\‰$ž™?Ãv~Å`£JàÄÕNÇÂÚŽ«‘¹]À‹mõÞyÁ:Ã7yÙØ÷«ÿ»I -endstream -endobj -1183 0 obj << -/Type /Page -/Contents 1184 0 R -/Resources 1182 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1075 0 R ->> endobj -1185 0 obj << -/D [1183 0 R /XYZ -11.232 900.716 null] ->> endobj -74 0 obj << -/D [1183 0 R /XYZ 56.693 759.068 null] ->> endobj -1186 0 obj << -/D [1183 0 R /XYZ 56.693 738.489 null] ->> endobj -1187 0 obj << -/D [1183 0 R /XYZ 56.693 693.618 null] ->> endobj -1188 0 obj << -/D [1183 0 R /XYZ 65.161 694.301 null] ->> endobj -1189 0 obj << -/D [1183 0 R /XYZ 56.693 637.117 null] ->> endobj -1190 0 obj << -/D [1183 0 R /XYZ 65.161 637.801 null] ->> endobj -1191 0 obj << -/D [1183 0 R /XYZ 56.693 580.617 null] ->> endobj -1192 0 obj << -/D [1183 0 R /XYZ 65.161 581.3 null] ->> endobj -1193 0 obj << -/D [1183 0 R /XYZ 65.161 570.341 null] ->> endobj -1194 0 obj << -/D [1183 0 R /XYZ 56.693 524.117 null] ->> endobj -1195 0 obj << -/D [1183 0 R /XYZ 65.161 524.8 null] ->> endobj -1196 0 obj << -/D [1183 0 R /XYZ 56.693 478.575 null] ->> endobj -1197 0 obj << -/D [1183 0 R /XYZ 65.161 479.259 null] ->> endobj -1198 0 obj << -/D [1183 0 R /XYZ 56.693 433.034 null] ->> endobj -1199 0 obj << -/D [1183 0 R /XYZ 65.161 433.717 null] ->> endobj -1200 0 obj << -/D [1183 0 R /XYZ 56.693 387.493 null] ->> endobj -1201 0 obj << -/D [1183 0 R /XYZ 65.161 388.176 null] ->> endobj -1202 0 obj << -/D [1183 0 R /XYZ 65.161 377.217 null] ->> endobj -1203 0 obj << -/D [1183 0 R /XYZ 65.161 366.258 null] ->> endobj -1204 0 obj << -/D [1183 0 R /XYZ 65.161 355.299 null] ->> endobj -1205 0 obj << -/D [1183 0 R /XYZ 65.161 344.34 null] ->> endobj -1206 0 obj << -/D [1183 0 R /XYZ 65.161 333.381 null] ->> endobj -1207 0 obj << -/D [1183 0 R /XYZ 56.693 287.157 null] ->> endobj -1208 0 obj << -/D [1183 0 R /XYZ 65.161 287.84 null] ->> endobj -1209 0 obj << -/D [1183 0 R /XYZ 65.161 276.881 null] ->> endobj -1210 0 obj << -/D [1183 0 R /XYZ 65.161 265.922 null] ->> endobj -1211 0 obj << -/D [1183 0 R /XYZ 65.161 254.963 null] ->> endobj -1212 0 obj << -/D [1183 0 R /XYZ 65.161 244.004 null] ->> endobj -1213 0 obj << -/D [1183 0 R /XYZ 65.161 233.046 null] ->> endobj -1214 0 obj << -/D [1183 0 R /XYZ 65.161 222.087 null] ->> endobj -1215 0 obj << -/D [1183 0 R /XYZ 65.161 211.128 null] ->> endobj -1216 0 obj << -/D [1183 0 R /XYZ 65.161 200.169 null] ->> endobj -1217 0 obj << -/D [1183 0 R /XYZ 65.161 189.21 null] ->> endobj -1218 0 obj << -/D [1183 0 R /XYZ 65.161 178.251 null] ->> endobj -1219 0 obj << -/D [1183 0 R /XYZ 65.161 167.292 null] ->> endobj -1220 0 obj << -/D [1183 0 R /XYZ 65.161 156.333 null] ->> endobj -1221 0 obj << -/D [1183 0 R /XYZ 65.161 145.374 null] ->> endobj -1222 0 obj << -/D [1183 0 R /XYZ 65.161 134.415 null] ->> endobj -1223 0 obj << -/D [1183 0 R /XYZ 65.161 123.457 null] ->> endobj -1224 0 obj << -/D [1183 0 R /XYZ 65.161 112.498 null] ->> endobj -1225 0 obj << -/D [1183 0 R /XYZ 65.161 101.539 null] ->> endobj -1182 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1228 0 obj << -/Length 2585 -/Filter /FlateDecode ->> -stream -xÚÍ\[sÛÆ~ׯÀL_¤NµÚ;€ô)Nm·Žã¤–2õŒÉ,Á%‰ -`´¬üú\(‘(p¥Bàâà`÷|ß¹ì!¨·ô¨÷úäÅÕÉÅ+E½„škïjáiN´ïLá{Wsïãé{›XSÚ³s®è黬²e{¸ÈŠö Zu_þ#‹^dÙuûχ˷g¿]½Ûœ3FB¥Zi—ÕmbË•µUY wg^w×¢¾»Ô>ñyà+úÝý~pzÑ~0®ë O^^|>a žzÌSšèPx~Ȉ¦Ü‹Ö'£Þ¾ˆ 惡ö£„ ljwyòïÚÍ=8#[Ù2$ŒêV§Oœ«F‹íe¯`Hó²¾& RðE3øGW«³sMéé+³J–…M¿;;gþŸgÑ fŒ|-“VLT-±þx½ÿˆ°0Ìçž/@ )êG¬Ï+ -&µÇI„^a½Åî3íI{üìÃð€°@noÐ -fõhWùŠ0Íúòeć¹ÂÜaw½5 y8‚²Àbéµï;Ø[LÆCÒÌ<#>›5ý×:/²/vÏÊò>6«^5°¨EUœ¥¸áÙ7.M ÜÐxm–¶Ä½YY¤¢7Yq§K¤ -H¡[¶ÙÜ}%Iwöᥧ_qÒ“Îý‰*zXxý }^P;¦$YH€é:bøD%mIê~ߘY7æË Ì'@JÓÁv_¾#l•ÅÀ[KA‰b¢N¬qº§Ë²gõò3ôŠÈÆÓ80õσ>Jƒÿœë£fqzQæ6º°ùfö{a›yŽ*¯Ï’bö÷öºá¾L ®žÎ•i|?e“a¢'ß îÊâ]™öÑ ~BWöyc’¸ºב¡ïþó/¯7S¤Ì{ËÇŸ!Þ¦å¦@{Çjeª±£Ž‡sðmèªHɧƒÖ¾|Gh9+‹€ÖVq˜ ¿s6Í­mZ!é:ŸB œ[›'HãJmYÙ9ÖÀ mcã?SØq#º¬˜cãÔ~tvxàü¿&‚ÇBb&Cc+.†BF‚Ç ÄtÙ—ïge@F¦>k1“å6E“áMaòk2þyõÓ[d´ڤýÄâ”`£©ˆ å³Æ}œüéa_wæîÊEœØò"+Ö¤A·ÉÎ^F„DÁá]JD(ÀèÝksÏ8Ñ,˜0¤T;™ÄûòAì¬ì€’JÊ®<öýÉÎë ëC"ð6‹M‚¼÷ Y}õXgÒ€v‚ð#˜äÆÜb}>ð­)ŽrûÏV -Q!%þdÝ“î†OWEAT(@~WQGgY¾è{Áï¿æ¼¦òFät¹zO¾ãÂ9+‹ŽT å]®~µŠ±ÅYƒ˜¥Ø\ Kg3H|Æ®!eß‹åÔ|S®°9R{aÙo@2tk±-L­n‡¦“ø¬•ñ|h9@é€øÁt倞|Gô:+;½>'´£]ƒÝŠ*þXÝùo—· »7 ¶(aM>5_⥩w¥L2ˆÆ®{¬Mz‹å -3G‡åmYõ•EajnÁãUÇN¿)å“€OW/èÉwÄ”³²0¥¼°U”·ï~ø€w6 GöÑ ò4ñNzmzTΘ9¦½sIqçóÿzènŠX®ûiVõ¤iÂ$N,•Kµ3t6öŽÀÌ–Èe*³dó`T‹MU™¿!m°ÏWUvhQPIM=]·EO¾#È•rE SÝVfSÃzU˜Ê.oGv?ƒPƒ® ÅY<®Å¦›‘ËâQ¸ÂbK/X2­âõñÙ§$ðÕd5[ÞìnѶ¾ å²µpAü~Â(<ÔËèŒSˆÞóÒvír»å_êsI„VÛìÐn[ó’$;ãêô¦Ms*Z™t¹mÝ[™Zê—3¦N»+fò°æhmæÝ9Xõ»þ¾¶4#vîÍI|_o‹36:¤¤ Å]¡'ʶâËük¯ƒØIÞmß!ÙŸ—sÎë>¼ ©8¢èý“ÙqõG[¬~cMZfwUïî1Ä€. ¬è‡väI¡H ¦ó=ùn>Â]Y|ÍYÖ½Ûv—ïçslFƒMÄîZU±Åìù&½Ž»´©­ý’ód³ì³àùá²}la -žrïS»øQV&›âɦ¼~‰(‚²)JÌhwÇ_ŒÉ}ùŽtVv@¡YÖ¹º£åŸ/_ÇŒqt??ÜqwÈ2^Þ»ž¾a|#è·×œ‰&7›lÍ÷å;®¹³²øP]ÖÝœ´ dêúd\AFÞßÒºÆçÍ›6c;Jæñ¢Käÿ$ÖÊtKKM¯X§€Ž‰Ñnfm+37•÷þe•X¯Œ]Só䮢U“P>©éö{òáï¬,þx×@ý4á²KAJ››:ZÈ­"d$ ƒÉ&·'ßmrÝ•Ås«! -º¶ŠµI㺊VwßLÆÀBÝxg¶ Ý×g¿V6—#Óµý—:Ƶ§OÅerô{ù^<ˆŸžØõ}’Eý€cO@£"`„N—Ëî‹wĹ«ªx$‚û;%’üéS3]÷DO¾ã¼:+;€?}A„¶[×og›jì$7U´z,ÿø ×\jˆI°èÐ>¡!Ö:¤”Ü—!ƒGË¿œ‰ºßÛ¬Ëÿï*d~HG¡ôˆEHA˜àEÈ÷ÙÌU[ƒ¼¬Ìmu_ƒœfQ‘ˆ¢ !(®Ió›Lòu-Hò_lºz$W!ÄØÓ‘MO¾Ù¸+‹¯G؉Ù¼Š‘¿4=(Ø5§yȹ ‚§=~c*â;£pMc~HÌâ´½Dxcgغ2ÛÑÑ»@0ß»ì;¾aïËw4lgeñ^”+F„ß5¼ËnFŽº¿˜dcÇ-<<ò;vPýâ‰fžHÊÓåÀötjÓï -yÂÞ?obtý¦¬²uü‡yø~oCøàî¦kEêÉw†³²€!)‘¼kEBw$Y„m¥«)íñf4© I˜|ÖŸ#qÆ}göó¦1]’nÖ:‘¼Èrˆ b[ À²¸ö§‹XH‰ Ó²zòÝâ®,>6b¡ MÞQ¯ómÓÞ€¦æ›"ÏÊ£=; |ȯŸLK"z]лz m1ð“”«-rOªÛ|H2Àè1åû‚˜DNø¾ ž|G‹wVv€Å×}!þðî„_/»ÄútPÑI­_kSF`HØÂúçµµ]–Gã³ö£¡zV€2Ÿ¨€Ð7qqmZ|þœt½Åç*^®ø«êæ¡j•ºg"^+<·fát` áÙ§ÛÁÞ“îTWEñ0 Á2¤?¥i†íü7³ ÛgYÿj:^Ü¢3è:Ä¿. Ûúëû·óðíÚg ÷Áþ€'¨yÁßÿ–Í_‚ -endstream -endobj -1227 0 obj << -/Type /Page -/Contents 1228 0 R -/Resources 1226 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1075 0 R ->> endobj -1229 0 obj << -/D [1227 0 R /XYZ -16.307 900.716 null] ->> endobj -1230 0 obj << -/D [1227 0 R /XYZ 56.693 741.747 null] ->> endobj -1231 0 obj << -/D [1227 0 R /XYZ 65.161 742.431 null] ->> endobj -1232 0 obj << -/D [1227 0 R /XYZ 56.693 683.964 null] ->> endobj -1233 0 obj << -/D [1227 0 R /XYZ 65.161 684.647 null] ->> endobj -1234 0 obj << -/D [1227 0 R /XYZ 65.161 673.689 null] ->> endobj -1235 0 obj << -/D [1227 0 R /XYZ 65.161 662.73 null] ->> endobj -1236 0 obj << -/D [1227 0 R /XYZ 56.693 615.222 null] ->> endobj -1237 0 obj << -/D [1227 0 R /XYZ 65.161 615.905 null] ->> endobj -1238 0 obj << -/D [1227 0 R /XYZ 65.161 593.987 null] ->> endobj -1239 0 obj << -/D [1227 0 R /XYZ 65.161 583.029 null] ->> endobj -1240 0 obj << -/D [1227 0 R /XYZ 65.161 572.07 null] ->> endobj -1241 0 obj << -/D [1227 0 R /XYZ 65.161 561.111 null] ->> endobj -78 0 obj << -/D [1227 0 R /XYZ 56.693 523.96 null] ->> endobj -1242 0 obj << -/D [1227 0 R /XYZ 56.693 496.407 null] ->> endobj -1243 0 obj << -/D [1227 0 R /XYZ 56.693 449.397 null] ->> endobj -1244 0 obj << -/D [1227 0 R /XYZ 65.161 450.081 null] ->> endobj -1245 0 obj << -/D [1227 0 R /XYZ 65.161 428.163 null] ->> endobj -1246 0 obj << -/D [1227 0 R /XYZ 65.161 406.245 null] ->> endobj -1247 0 obj << -/D [1227 0 R /XYZ 65.161 384.327 null] ->> endobj -82 0 obj << -/D [1227 0 R /XYZ 56.693 347.177 null] ->> endobj -1248 0 obj << -/D [1227 0 R /XYZ 56.693 319.623 null] ->> endobj -1249 0 obj << -/D [1227 0 R /XYZ 56.693 272.614 null] ->> endobj -1250 0 obj << -/D [1227 0 R /XYZ 65.161 273.297 null] ->> endobj -1251 0 obj << -/D [1227 0 R /XYZ 65.161 262.338 null] ->> endobj -1252 0 obj << -/D [1227 0 R /XYZ 65.161 251.379 null] ->> endobj -1253 0 obj << -/D [1227 0 R /XYZ 56.693 203.872 null] ->> endobj -1254 0 obj << -/D [1227 0 R /XYZ 65.161 204.555 null] ->> endobj -1255 0 obj << -/D [1227 0 R /XYZ 56.693 157.047 null] ->> endobj -1256 0 obj << -/D [1227 0 R /XYZ 65.161 157.731 null] ->> endobj -1257 0 obj << -/D [1227 0 R /XYZ 56.693 110.223 null] ->> endobj -1258 0 obj << -/D [1227 0 R /XYZ 65.161 110.906 null] ->> endobj -1226 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1261 0 obj << -/Length 1709 -/Filter /FlateDecode ->> -stream -xÚÍZKsÛ6¾ëWpÒ‹5SÁxhoIšL2­ÛÆžif’ -’˜ð¡”íüû._±DI$ŠžœËÅb±ûáÂØ[xØ{=z~3º|%°§‘–Tz7sOR$}O†˜ïÝ̼ïldMnÇ*ðÅUZؼnÎÓ¬n˦óeò©ò&i¿ŸPPè«‹Ëú‡PY¾8úãfôuD@=öˆ'$’šy¾&HbêñèÃ'ìÍ  @\+ï®’Œ=A0¢LB;ò®GÿŽpã |Ð#­n®Á²¶é#¥¢²¢}íòˆTóàå; -q© £v`:µY1žHŒaúæ[‘&¿'„ÂßYLÁc(Ès”§ë,°è>Ž~¯e6±™)lÕ»´ff³Þ`i¼ÿÍØÔ¾ÕbÃ&®4Ðl¬úˆ1+þÞ"u«š,X9³òçõ¶«!@ˆO=ŸiDa‰ÀÕåsaá¸ô(ÒJ{™õ曾ÝÒ¶ÿéîT!FT;@­˜”Ò}õ D$éê˜ ÖÌe„͸“HS}c+…Ù«ïš@Ü -*B5ª<_yˆÿ˜ÌÄùV(îªò>TQQ¤nrùzµJ!`„Û ¹‰¿¸¾vœ‡[¢0[äœT ÆúÄæßÃè€7?/:دkS„i‚’u Bh•¥+ m^溣/¤¦Hú–¨R¤´?X¢vô÷KÔþƺ'ªT06&®ì[à›¢ÈÂ麰ŽÉjµÜ®ë`sijZY“…ÉÂQ·½/Î VmŽœŒÒ‡…Ãj0° exùBo¢…ä1EëÈ`HwlŸŒ+5yo"“4þ…*Ê48Þ5+FŒøOY£b°¹IŸžŽ:1î#ÅÙ€0À$RŠÛú{Â@oc€Ž+Õã6ø¥ã¡"Z-ÍÔµÀÜ¿0¡ëIáo7±»°p56p®™™ € ¸‹¿>ŽIZœÛäEfn{™üd°Æa xšÒâIa8"ž·ò~Ï@à” pTc0Ÿpýý®¿±îG5*\/ê«ð~ ÎÇ¡= òì0 “™½ï¦ì³ÀÌÊõÝM؃‚™Ý¹Íkz¨¯%vÏmªÊ: Êܦ`¢jä¹E£‚#­õ€É '?ÌÉpɽ­¿gr÷6öˆäÞÈÚp¾E{ØÈ$³0p¯C½€{j}©¼¼À‚>éeÅ *ÛÒ Ý[:y‘Æqú“ß4‡ld -1!ÏX4aˆ0zrÑä*Íb“ÔÐóŸ‰òe > endobj -1262 0 obj << -/D [1260 0 R /XYZ -11.232 900.716 null] ->> endobj -1263 0 obj << -/D [1260 0 R /XYZ 56.693 741.882 null] ->> endobj -1264 0 obj << -/D [1260 0 R /XYZ 65.161 742.565 null] ->> endobj -1265 0 obj << -/D [1260 0 R /XYZ 56.693 695.46 null] ->> endobj -1266 0 obj << -/D [1260 0 R /XYZ 65.161 696.143 null] ->> endobj -86 0 obj << -/D [1260 0 R /XYZ 56.693 659.185 null] ->> endobj -1267 0 obj << -/D [1260 0 R /XYZ 56.693 631.765 null] ->> endobj -1268 0 obj << -/D [1260 0 R /XYZ 56.693 585.427 null] ->> endobj -1269 0 obj << -/D [1260 0 R /XYZ 65.161 586.11 null] ->> endobj -90 0 obj << -/D [1260 0 R /XYZ 56.693 537.121 null] ->> endobj -1270 0 obj << -/D [1260 0 R /XYZ 56.693 501.09 null] ->> endobj -94 0 obj << -/D [1260 0 R /XYZ 56.693 471.459 null] ->> endobj -1271 0 obj << -/D [1260 0 R /XYZ 56.693 443.208 null] ->> endobj -1272 0 obj << -/D [1260 0 R /XYZ 56.693 396.869 null] ->> endobj -1273 0 obj << -/D [1260 0 R /XYZ 65.161 397.553 null] ->> endobj -1274 0 obj << -/D [1260 0 R /XYZ 56.693 350.447 null] ->> endobj -1275 0 obj << -/D [1260 0 R /XYZ 65.161 351.131 null] ->> endobj -1276 0 obj << -/D [1260 0 R /XYZ 56.693 304.026 null] ->> endobj -1277 0 obj << -/D [1260 0 R /XYZ 65.161 304.709 null] ->> endobj -1278 0 obj << -/D [1260 0 R /XYZ 56.693 257.604 null] ->> endobj -1279 0 obj << -/D [1260 0 R /XYZ 65.161 258.287 null] ->> endobj -98 0 obj << -/D [1260 0 R /XYZ 56.693 221.329 null] ->> endobj -1280 0 obj << -/D [1260 0 R /XYZ 56.693 193.909 null] ->> endobj -1281 0 obj << -/D [1260 0 R /XYZ 56.693 147.571 null] ->> endobj -1282 0 obj << -/D [1260 0 R /XYZ 65.161 148.254 null] ->> endobj -1283 0 obj << -/D [1260 0 R /XYZ 56.693 101.149 null] ->> endobj -1284 0 obj << -/D [1260 0 R /XYZ 65.161 101.832 null] ->> endobj -1259 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F52 695 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1288 0 obj << -/Length 1715 -/Filter /FlateDecode ->> -stream -xÚíšKsÛ6Çïúœö"ÍT0Þ$šK'N'ÏÖöL3ç@IÄ1Eª$e[ùô]ðáèmÐ]w¦‡„4.–Àîÿ‰‰ƒ·W—“3…”¤Ò¹;’"é:aˆ¹ÎåÈùÚ=סöSÝëS»ŸâL§Åé8NŠ“lZþø:¾Šãëâ/zß.ßA7}B¢°v‘-CNµÎRó3ôNz—ÌôÎ¥‹\ê9}”[öOt½îIq Tš;o.;w˜Çq„DR1ÇUILá¬óõvFð8€¸òœÛ¼åÌ#Ê$œ‡ÎEçÏ.G¯u ™+T>$•q®Á²pŠ#–{QÝæ|íŒq÷ìsùT«c -C@¢.-Æk‡aÜ£¢{D“âÒpêG“j„§~âîMˆnyÇ@ë¨8›ù£òZÿ˜†¼oðõGßÄãÈuÍóæ}ãþŽ8U“a\YNƒh¨7æ˜À° Rœ'Ed õ‘襥b‰²Âê¥b­]îg>óÜøà!.½Ê…óx “¬×—0¢™¿Ìâè×^ŸPøs »4,,ATcæðv= Š ·T0O<s]`ˆ..Š”§œD;ãÕX³¶ûêvä‰Çª -ÃÄ´njY’MûÃðÃ0Ùô°š)ªŽàln0™8ÅÉy™-kóxï8$KÊ€_$ÑÚÜo‚ü1“Çv Gƒ"’W°Û//lßÒ´Ù6T³l8'› ýè»LGiG©y?L·ð—½æó[æÚÒõÁb² /sùgêÁÔq‚l³ËÈ)Þ$»ö÷CXr‰h…`¾Á¿_~üð¼!<Ífá©D“£a˜Â²K`-0Láþ" ²ï‡ßi?Jp8 ²PÏý‰®cË3YÑŽD$w½Öp¼a¿Ž›;kcèwe)Á>/²ù"ÛE€Ÿöóë4ž/“`2ݼïÀ=¹É©öG&±¬ÀX._ª¸iÇ{(ýp¸º.â0'mñm5÷K¼ 8ºòYä*w‘§X‹¹Ê o/W×í7ÌÕÆÎÖÈUŽsùœOëo£‘­rIï+«²$Ñé"¬sC¶œkËÌÓivdÍ5Ü!tB§aœê´±8bÔSÖð` )(ªžP´Sâ=ŸâdæG;þå9­Èa”J6ëp›’Ëk\A£ZÃƺùfÔhìª=4¸2õÖýŽÍ,¾±ÌR6&‹ [Ú5¿M,súe:÷£šÌË$¾}Äm~dIÈ—Ã8ܲÿpHs…saþ”u‡#ÅnU鈕ÎG?šû=‚»P·Àÿ:}ÞeÏ̸;Ù饀J’±ôaaÏm°uHNéh™mÐT„ðAœ·¨¦˜‰Q¯=5µa¿›;kF v«è¯¡¦"³$†Áw]c— Ø2Üj…†ä0ì%Ð" ¢k[µe:úW´’«˜Õ“ev@[ÄÕ“j%&eÀÇ%Ã(âøº˜0e–j r®E.¬™oˆ…¦®Ö ‚05–÷õŸ®±‡K<­0cXÁ¥{a&w -³7óÅàyk1½ÛÃg·ý^Ù´`í™? '‰¾‡í ˆNFƒ,6ò¢hb.…Áà¤âp2°Œ$*8RÍ^eÆ0åa&Zãð†ýf nî¬=‰)w«Bã4N=Ìli ±ÎÐ_¤ÖV-KṑiWcۨ㠴-ÛÓt1›göïou¢m•¯å’2ÛX-ÒŒ„!¯žPèQjJKu|ô¬s¦P}hÙl›ðð`óý i<ëö‚§±³5ÀƒMaXJÀSX¾"ë×T‹¹]»©ŸŒÌj™ý7~¸°UPA”Ŷ˜J|ÈT¤G‡Õõˆ/l© -i•øÉÒöåží¤–Oêffi3‰ç: —¥Ö+ÆA -©*\aŽËVÞJ+¨y!?Ë6}K\cšÑòéñf®þ}+Å7úÜ—â¶V«doçQV׃u¶›-AéE‘W­/ØXCÛ¨ñ£ëôØ1› -õÅ8‰-ƒöCðÝ·kùÚ—5WwâI$šmrÖ.Lj ˆqU•cîÎrìÄÔOñÆ4,‘õ|+3à -ÈÀÝnš—ž:^yfä˜-}¨™?GO”‹„×¢2Ÿ$RÙšZ7ßL5vÕ^…áÅtžw6p¨GWì0UgAšZ }>V;g‘I ûæi­}<ÿÆB`[¢Ý ¯Ç~ä1$™×N·¾›ç8 óÙü?OE‚w -endstream -endobj -1287 0 obj << -/Type /Page -/Contents 1288 0 R -/Resources 1286 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1285 0 R ->> endobj -1289 0 obj << -/D [1287 0 R /XYZ -16.307 900.716 null] ->> endobj -102 0 obj << -/D [1287 0 R /XYZ 56.693 759.068 null] ->> endobj -1290 0 obj << -/D [1287 0 R /XYZ 56.693 738.489 null] ->> endobj -1291 0 obj << -/D [1287 0 R /XYZ 56.693 696.946 null] ->> endobj -1292 0 obj << -/D [1287 0 R /XYZ 65.161 697.63 null] ->> endobj -106 0 obj << -/D [1287 0 R /XYZ 56.693 662.043 null] ->> endobj -1293 0 obj << -/D [1287 0 R /XYZ 56.693 635.583 null] ->> endobj -1294 0 obj << -/D [1287 0 R /XYZ 56.693 594.041 null] ->> endobj -1295 0 obj << -/D [1287 0 R /XYZ 65.161 594.724 null] ->> endobj -1296 0 obj << -/D [1287 0 R /XYZ 56.693 550.497 null] ->> endobj -1297 0 obj << -/D [1287 0 R /XYZ 65.161 551.18 null] ->> endobj -1298 0 obj << -/D [1287 0 R /XYZ 56.693 508.195 null] ->> endobj -1299 0 obj << -/D [1287 0 R /XYZ 65.161 507.636 null] ->> endobj -110 0 obj << -/D [1287 0 R /XYZ 56.693 472.05 null] ->> endobj -1300 0 obj << -/D [1287 0 R /XYZ 56.693 445.59 null] ->> endobj -1301 0 obj << -/D [1287 0 R /XYZ 56.693 405.289 null] ->> endobj -1302 0 obj << -/D [1287 0 R /XYZ 65.161 404.731 null] ->> endobj -1303 0 obj << -/D [1287 0 R /XYZ 56.693 361.745 null] ->> endobj -1304 0 obj << -/D [1287 0 R /XYZ 65.161 361.187 null] ->> endobj -114 0 obj << -/D [1287 0 R /XYZ 56.693 325.6 null] ->> endobj -1305 0 obj << -/D [1287 0 R /XYZ 56.693 299.14 null] ->> endobj -1306 0 obj << -/D [1287 0 R /XYZ 56.693 257.598 null] ->> endobj -1307 0 obj << -/D [1287 0 R /XYZ 65.161 258.281 null] ->> endobj -1308 0 obj << -/D [1287 0 R /XYZ 56.693 214.054 null] ->> endobj -1309 0 obj << -/D [1287 0 R /XYZ 65.161 214.737 null] ->> endobj -118 0 obj << -/D [1287 0 R /XYZ 56.693 168.192 null] ->> endobj -1310 0 obj << -/D [1287 0 R /XYZ 56.693 141.732 null] ->> endobj -1311 0 obj << -/D [1287 0 R /XYZ 56.693 100.19 null] ->> endobj -1312 0 obj << -/D [1287 0 R /XYZ 65.161 100.873 null] ->> endobj -1286 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1315 0 obj << -/Length 1382 -/Filter /FlateDecode ->> -stream -xÚíšKsÛ6€ïúœéEš© ’¥ÍkÞŘ`\®z|¦wiR/î¶kÁÔGŒ×*¦Ûi§# ¯¢dYÝ -W:Y6Ž^éÅÃË †õ3c’j´ÖóúžMov£œL¾™›H Q,»œ{—ÇãѤó#¶Âš…x˜6³äQšÖ¶ð"Õ8«‚í;ÖMP[ 2HaVi}Oi°'WÚ\ƒ_Ø ‘Ïec½Í"ûïhÌÁ˯ŒNò4y6 -ó,œ„éz’\é8_MÊ5M~Mãí:ù{3×Ö¼XGÖš }Ô—úy¥âø;µ÷‚[–øRù~cË{Œa¹„àë©Fåb Ö‹õ——ûQ -¹Eõ¸”HŠ ˆÒâ~€!æ}îQ¤¤ò2ã-n‡åž¶ÃwïN R„7TŠI!ÝU?ì3'mý†€r™ávÊr¤¨zcK…ÙÒ«ïêÞ ¥ÆpIÅ~µ‹¿Ìçf¾w5AZÁ²ˆv&wÍS79»ÒÖM2Lãe–n7ŽD‰«ÆMðü÷é›×n¢‰^›|£CGÍ:sÜdihòÜu»@|c²øs‹ÐC䚠‡Ð]ôÈõxuáL",®«‹:Z]Îu¬¿—ê²;bëwU]’ÄÓGÚI}E»uìIÀMú=¢¾ ¨”ý¡¾¥¿ê»ëŽú@`pÐÃQ¿Žò¼H'á·ÆžÁâ -òd-·™¶Qš<–MçHª^Ùº n±) ¤T_ú28H¦›C´èå!Ò‡ù~“¾‡y»Kªyå{I^} ÄÛyêYªmM1è¸è®ÄVŽ®OÐK0öÿlæÒÕ%Žr[ÒÅD–µú°<Š1|ÆÚuVÃ`«y½šÚ‰wúç=µ øúµ`‘°øÈ*ºóßË¢¢”tàÿ&²«Šþ§zý–¹Æÿ,NÃOJšc‚2 éù Ȇí ù-ýÝßÝXwä3Á#5¦Î®"®œInÛv³v“›ë|åx¶H3Çò±Ò™áë&>3 Ùµ·6‹fÛ;u©ó!Ãl¢e¦7«vµ{^ß8òZfò4¾t=rl—m4·¢B1)¤kÞr°Ïz+¬­þ·¨«P¡ê¼z—ÎLf+`YýÙÞ´«E-ËÂ+FpÞ#¯(ƒC·èWûú;òª³±àåÈWu>v®-êìp¼C祔/~¾?µ¢ùÃ`zh›])“GëMlÊæÌ¥ŽóoífkÛ3Š%ò‹~;@%”6.šVl›ïi¾Ýfpe«“sËÂ"0y²v%¾vP믔Ðrµ}áµ¥¿^»ëŽWJØÓàG;ø£|D;H±BDÊ/ÙÉm¾²úZí Q´?^HO°ÞxÕÒßWÝuçáqÿ)»A.ä³û3Ko6w&}gh tdÚº¦b%®È Ãhn«ã–=Ç‘ -Å߶œô€.ŽÀ•»Ÿ>¿ïü+ÁÇsõ˜?%üã7u‡ -endstream -endobj -1314 0 obj << -/Type /Page -/Contents 1315 0 R -/Resources 1313 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1285 0 R ->> endobj -1316 0 obj << -/D [1314 0 R /XYZ -11.232 900.716 null] ->> endobj -122 0 obj << -/D [1314 0 R /XYZ 56.693 759.068 null] ->> endobj -1317 0 obj << -/D [1314 0 R /XYZ 56.693 738.489 null] ->> endobj -1318 0 obj << -/D [1314 0 R /XYZ 56.693 691.479 null] ->> endobj -1319 0 obj << -/D [1314 0 R /XYZ 65.161 692.163 null] ->> endobj -126 0 obj << -/D [1314 0 R /XYZ 56.693 655.012 null] ->> endobj -1320 0 obj << -/D [1314 0 R /XYZ 56.693 627.459 null] ->> endobj -1321 0 obj << -/D [1314 0 R /XYZ 56.693 580.449 null] ->> endobj -1322 0 obj << -/D [1314 0 R /XYZ 65.161 581.133 null] ->> endobj -130 0 obj << -/D [1314 0 R /XYZ 56.693 542.91 null] ->> endobj -1323 0 obj << -/D [1314 0 R /XYZ 56.693 506.745 null] ->> endobj -134 0 obj << -/D [1314 0 R /XYZ 56.693 458.99 null] ->> endobj -1324 0 obj << -/D [1314 0 R /XYZ 56.693 430.604 null] ->> endobj -1325 0 obj << -/D [1314 0 R /XYZ 56.693 383.595 null] ->> endobj -1326 0 obj << -/D [1314 0 R /XYZ 65.161 384.278 null] ->> endobj -1327 0 obj << -/D [1314 0 R /XYZ 56.693 336.77 null] ->> endobj -1328 0 obj << -/D [1314 0 R /XYZ 65.161 337.454 null] ->> endobj -138 0 obj << -/D [1314 0 R /XYZ 56.693 300.303 null] ->> endobj -1329 0 obj << -/D [1314 0 R /XYZ 56.693 272.75 null] ->> endobj -1330 0 obj << -/D [1314 0 R /XYZ 56.693 225.74 null] ->> endobj -1331 0 obj << -/D [1314 0 R /XYZ 65.161 226.424 null] ->> endobj -1332 0 obj << -/D [1314 0 R /XYZ 56.693 178.916 null] ->> endobj -1333 0 obj << -/D [1314 0 R /XYZ 65.161 179.599 null] ->> endobj -1313 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1336 0 obj << -/Length 2217 -/Filter /FlateDecode ->> -stream -xÚÅZëoÜ6ÿî¿BH¾ì]š¤øpI/NÓ«Û^âÃH‹B«åîê¢Wôˆûë;)íJ–%k_?+Q£™á<~3C{;{¯Î^\_pì)¤ÞÕÖ éÄG¾ô®6Þ»Åè°ÒËåxñS^ëÊ^nóÒ^Ô{÷ðyô"ÏßÛ›_ßþ¸üýê³")Î-··õ§DW{­ëÊ<éÄ @ºðt&$’4ðV)éä e°8·?„ -óâÙË«³gØcx\ ¡|O*‚¦^”ž½û{x - ¦ﺥL=N0¢¾€ëÄ{{ö¯3ì,¡I®Z“tÌ™B «G~«E÷š÷nE0Æ‹—E³vû:¶*2ä ÷öUg±mž$ù’òÅuœíìR´³]gã}¸¤xñqIø½±Ö:³Wi¸qku~pD+´=È&CRš·²õ´†T †IGåï*Î"=ò3Ó l¯KhhŸð Ð …}Ëõ7Jù€®Õ´õ>3:ˆ‰ SáŸ:®÷Ë•£^„ûdWêìÛåŠP¸_ÇÙyUèèÜìåRóªŠó¬úì¢rý̾·É£5Ä#º©+ÂÐH6?¯†aO$õD @r@fcG&<ŠT ¼R{Ûãˆp›^½-@J¤ˆèXÆÄPŸÊŸ#"Ș?Çà+°é ÇÙ$¢ê”m–;Ï^¼qé5pz§x@ÅÌúþùf£7ƒH¹Í 2Îøøàýyôa6“ñ6¾™GÙ7‹.ÊËRGõ6Ì£'nñö›‹u³½quËìÚäÍ,²0ÕUFz,au·>E©Á2s½åYÆ™.ç‘–¤:³•áóÔq6~WLB*cÕÁÉo˜aŽÁ•D ²ÒѬ梄É./‰‡üOLâ“•‘ÄÔƒ@`@qe®Ò_¾¼zþõú§‹1õùÝÔÓÐÝïܤÉTò=»?]ò䣞“¯«ªÑSRžR©0&rvˆù`Üà”BtÇïí–Ïõ7‚„9ûkJuO·¡=<Ï3  ‹}¡h@’f£¸ï™ËàAž -q¸ìóMpEìÕL»û`E± ß<ìò?;NVö ê#F]ýÏrh6g°®uZÔs‰gVÿDßÄëDÏ/¤3+"”·¸þôÀ½Ê¯¯mŽÌ£.Ê<2Y˜ ;‹ÉA$"Œý?A‰+ãÚÃcR¯Ï»ñ \Ï“òñÀK»qðhà0â8œ®ì|pàR vo§çk¾¿½wE;T咽=Ìmæ_ÜjË»*Ï1côþ–¢ú¯gïàKGœRyYϤõL0ºŒ£}¨“yÄÿ‰õ& ³ìŽîìó™¤OÔ£!ÍÔù÷ý@Üù›<ßùeé.—aZÝsÊÃÿúSžâ.ýù\<Ü9TmâÓÎy.æŒëÿY¨þA‡Y•÷H½wûþjTåMµ=àÌb€NÔD¬fðKåãaõˆÿiX}º²ó±šÁ/ïN:ÿ]lÂÙP¹1óøðx]jè袙Í_—œ³ˆÛýšóŠ»u Q_‹œŒ+DƒGENàE?BN}¡ëq1‰›‡2° Ç}Æ:Œ™Sˆ-I;0«Ù7ºGqj*_˜ÕE ¬6qa¤7-Ä:bÓ]ۋͦ!ßbWñ.‹ “¨ç¿ÕaÝ”z€èߎ€ËÑžŽpòĺ¾©Ço ŽåËá'”Ë|ã1yRªC š?ù\uA÷i¼ê€5êø.OÓ<ûRµí¡®µeSG¾#UyÚ›¿LC÷¦•B—uܹ-wª×!Œgn­©z7}uùc_ØDwÒŸ¶/O}QÈï‰Ò°|ß­yÀŠ¶Ç‰+dd¸¥Ô¹^PÎÞdº+€`z ’ÚŸV|€ ÑFoÃ&©“pmû«‘RJ!Ae÷ÊGÃ:LšvﱚS`ßZÌHoÒµ.;Å*€= Aô#"²ø쎨 ÄíÅZÛßM ³]W{½q!€ó’“Ñç=ˆ¼Êgçš‹ãy£[Aöæ)á¾ÂŒ£þ3¡±ìÀ°>V®E1W&ÄÍ/$Ú&ÑNV¤E9g¨0zŸå׉Þì‡Ê#Ë -Þ;Ãâóˆ'É€öÍŠ™§Â†µÓI'8sªCV£åŠÂö‚fÍqÛi-¡È»-Wq'a™|ê÷=¡ ÆêusÅQ_7dz´¤ê÷Ðj$Ï“d‚íÊToÊÕЫsL@Ñïƒô:î\‹B‡.ÁÃîËq™wššÓ›rÉðâG³5÷  f}²7‡ V÷!é’ ëâçÙh5þDÛV˜vø²ð³u¨Úµ¦‡–¾ï¥÷ÝF@ .-’µ»ü¹ð÷Ac±»Ž;î&qÖ¤³s¾þ/$zuO21_,BóÃ{|j×ÚQA÷^˜À,M–ê8 6V(‚2Õ’*¿O‰oLÌQ‡QF¨9¿/ó¤²ú´u×,ÇY\Ça2™‡€“w +h§ÄúÐÕøÊpuìy¯¹[.5¿U äâ»$¯te—/ÞX|óôÌÁ0ž©¨OÅW¸0Í;ܬ·y_Ûº“8çÒª.›èå½2’qO… ½¡>†elŠ]ŽÀÉ):*¨·í˜ fîýÖuÇÙ0©\¶]®–dw㣇ltåÂüo!_b²¿CЛC<õAazQvŠ¨4 7f6>†ç V¯°Ñ²"±eo‚#4­>‘Gá=ÙbЧ*}Ñ5>pëŠYö¸†AÔY¥€4{R&«zý¤“ÌqiÐhUç«DokX ]L¹Bü³3dSÍ@1™þа>$œÈ(1aPÁ‚Á1ÄhCE†`>õO= #,Ô×üOÏŸ‡2¨” -endstream -endobj -1335 0 obj << -/Type /Page -/Contents 1336 0 R -/Resources 1334 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1285 0 R ->> endobj -1337 0 obj << -/D [1335 0 R /XYZ -16.307 900.716 null] ->> endobj -142 0 obj << -/D [1335 0 R /XYZ 56.693 759.068 null] ->> endobj -1338 0 obj << -/D [1335 0 R /XYZ 56.693 738.489 null] ->> endobj -1339 0 obj << -/D [1335 0 R /XYZ 56.693 691.479 null] ->> endobj -1340 0 obj << -/D [1335 0 R /XYZ 65.161 692.163 null] ->> endobj -1341 0 obj << -/D [1335 0 R /XYZ 56.693 633.696 null] ->> endobj -1342 0 obj << -/D [1335 0 R /XYZ 65.161 634.379 null] ->> endobj -1343 0 obj << -/D [1335 0 R /XYZ 56.693 586.871 null] ->> endobj -1344 0 obj << -/D [1335 0 R /XYZ 65.161 587.555 null] ->> endobj -146 0 obj << -/D [1335 0 R /XYZ 56.693 550.404 null] ->> endobj -1345 0 obj << -/D [1335 0 R /XYZ 56.693 522.851 null] ->> endobj -1346 0 obj << -/D [1335 0 R /XYZ 56.693 475.841 null] ->> endobj -1347 0 obj << -/D [1335 0 R /XYZ 65.161 476.525 null] ->> endobj -150 0 obj << -/D [1335 0 R /XYZ 56.693 438.302 null] ->> endobj -1348 0 obj << -/D [1335 0 R /XYZ 56.693 402.138 null] ->> endobj -1334 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F57 739 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1351 0 obj << -/Length 2605 -/Filter /FlateDecode ->> -stream -xÚÍZ[Û6~Ÿ_! /6P3¼H”Ô½l'MÑ&Ù™šEÚZæØjdÉéL¦¿~oºØòŒ'iû0E“‡çús¨ÁÑ:ÂÑó‹ïo.ž]&8ÊQÎ)nn#NO£Œ0ÄÒèf½]ÉJ -%ç šàÙËFK冷MëzãüWS|ß4ïÜË›ë_æÜü Ç,Ay’8j×ú¾’j#¥Væg8DœÎ™9=æ)Ji-”§þ|Â`šÍž¹¡Ül¼øñæâýò8"QÂÏY”æqL£b{ñö­à7`ÅyÝÙ•Û(!QÆa\E×ÿ¾À^x¤‘t ‘@;ÎÁÜñôÓͯVºnÛiŒrœŽ%ÿ¡©ç1ž}˜“d&[=_°8Ÿ‰ª2ƒlVÀH¹9ݸgQ ¥Ðs2Óm¹œS<Ûky°&lËú©f»mj´ÑÛ -6vŽÈg3µßíšÀǪl s_Ã[Êf•¨×vÏD½rvX;ÅF>–%V؉¦K]IoΡ/baÕ3eí˜1ÜZwYÄ$Aqš{Ýy}7{½Û뿳º3pЭ¬µB@‹àÙå¾úcjc7H¡÷­÷ÑV¾ßKåI}EòœeŒ¡ÎSÁïbw䋺¨öª£Ù¥Í­{nÊõ¦‚?]Ök7S4+Oûn§ ª*·»ª4ŒÈ•gìU]Ý{jµß‹¬ ìØ﬛9M€˜{‘…TJ´÷sžÌ¦øünµ -+Ûv¢[gÑ[Ž'(Ki0IY¯äGT•õ;…tƒ”,´‘øØ’„dˆ%Á# ’ňšp=â‡óÞ¿Ì‹3 XÀ °;Á#Á³Œ=IJ†°óûœìaw›²Ø¸áN¶ÛR+ÿÒÊ¢Tž#{‚ç²qOs´‰×v©0çžìÈ{§U âxù­©;°Þ£ì>#,˜J“ JÙ"à©hìÄq>2ÑŸ†˜¶ €ó”À$õQ&_ï—OEµk Ö¯ÁœÛÆƌ꽨 ¹r/ óªrC¹ ¥cy Ë'½Í·b-›åŸ ÷”¤ cJ:\©À:µÐ¥q(¯ÊkÀË–Rkk÷~I½1arµÔÜøöÍy+ ÞXXÑûñåÍ‹›ÿ(or nÇl¬ÛJÕTŽ)7ñB©½~ÆqLÃJÖôѼôHq%v!=Ðýyã¯f}ìVíESYÜ·&‰X˜·zBÿ9C9ëâ[,•nŤîcÂv^öl‚E)ÏK 4G ëLx·‘µãz+v;ç)ðRÖ.“ñlU|æ(Úrçæ<¸Ä³W¯/=©ÅJhÈ8"Ö¿íL—O`쎈gYí<¬ñÜßØ ¡ÊHgÂC¶öèàsƒ0Émhl•Ü¯š…’[Që²PV‚Õ~ „ éªm¶nô+€VgûßL~.å -ö×°Œ|€Œ`P‹›„3%V@–½ 2%§l ¥Í:S.þéH;-Ãl1A?Žãì€þ”#aDz¸êín2{½ -úU:Dn Í'þ ò‚WLºcŒ0yHP»ÏÙô1N!”R–}.£…`b5ñ·£9‡iÜÒ$=Åõb1,Ášåt5ðÃ*Ô:î¹W!†ì¡ÕåšA~2÷'¥OÉQ]‰ÔCÿ°Ž\ËZBŠ6ê™ÈKàv<ƒ²S$LÃYŠZ´s’]=…ŽÀ`Îî(Œ®µrÇ­©”-T0¢ÐO=œì)ƒ’ÎtÊôJym‹U¨Ô'«s%o-‘}åU -(Ò×ÅÇ߶û*4£`쾞²ÎÚ¾Û{A=A¾S›ñàÑWÀðb«?i²¾ík&ÊÌ<›u%Ö‚Ò¬$ÎJì&m’s”±®À„‰bJ:íÎ,šZ·í;àÍe ”u©KQMe]h£HW+}œ`CN¶RŒûéVJh7hÏ~sI“~m¯ô ªzšÄã^kc:–£Uó¨›zñ—l÷öÁ¨XT¦„1¯&Yêæeà&Czb8¼±]ùÝ/&›Ý¢’}¹V¹ß;øóÛ@·T»JÜk›W¯ÎÊ·D ë+SaßA)ïíxºÛ4•Õ¸‘«@¯&ÇÛ±îtßÅÝlʃ¦Ó³h€¼Îõ/_½vŒò7È ¨Âáò*4¢iNåg5x®Ì2g+mi¦*•F¦sA»¶¾G—RMµM C„öÍ|Ó ±íëh¾ö•Ì!Œ; ܃äj6Mrk|ÆPÆ©“†#2Z½]@îóç¦ñWÇ~„­jç«d$ñyrNÝkRs£´Âµat’IsÀºüÓ;Ï'©ÑÜËæÈT"C_øÒä@ÛcØ… ØÁßU³´_m8¨÷Z‹{ÝÔßÌ„b—^*ùL}@·Õ?Ü?÷§8žÛUfÎ qdÎ6çãOZœ"’‚í9 VÌÌ'-3ŸàdåEy–G­Œn‡ß°FÔ¦gH”eq8À&fõçÒ‡Þ†“Cú cVÏ9aø}Zå³–`»ŽÜàÊðßÃÆs« ÷ñn#‹w#_9¦Ág¬ìrîãët+jU W@žµÃµ-¯ûE®EU7º,äyÔ~¹-µi_ÎããL ·¢¬3ÊÉÅmÇX¾a<$¦Z€_?#HNEÐã9“^–Ï ´¬Î Ù¶M«þ^Ôù®xW7w•\­Ý7ó39nÃ_|R|bŽpJþ—ñ™1D’ô‹‡§'8õÏ(1Ä%t Ÿð¿(ÿ”qæë -endstream -endobj -1350 0 obj << -/Type /Page -/Contents 1351 0 R -/Resources 1349 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1285 0 R ->> endobj -1352 0 obj << -/D [1350 0 R /XYZ -11.232 900.716 null] ->> endobj -154 0 obj << -/D [1350 0 R /XYZ 56.693 244.842 null] ->> endobj -1353 0 obj << -/D [1350 0 R /XYZ 56.693 216.457 null] ->> endobj -1354 0 obj << -/D [1350 0 R /XYZ 56.693 169.447 null] ->> endobj -1355 0 obj << -/D [1350 0 R /XYZ 65.161 170.131 null] ->> endobj -1356 0 obj << -/D [1350 0 R /XYZ 56.693 122.623 null] ->> endobj -1357 0 obj << -/D [1350 0 R /XYZ 65.161 123.306 null] ->> endobj -1349 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F57 739 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1360 0 obj << -/Length 2085 -/Filter /FlateDecode ->> -stream -xÚí\[ã¶~Ÿ_!¤âj.ï—}H²Ý$ER ;óP`7(86m«#[Š.;³ûëKYòf,Û³GKÓmƒ'Ë'ß]}s{õâ•À‰AFR™Ü.I‘T‰& 1•ÜΓ7“×.s¶r×S*ðäïyíªîp‘—ÝA½ê|™Ï¾ÉóûîË?o~¼þùöo¾›)!ÈÑY»©ßg®Z9WWíϾw’hß»dmï\*¤¨N¦Õ÷O”7¨ôäE÷A¨l/¼úëíÕ/WÄ›Ç I„DÒ°D‚$¦Él}õægœÌýoÞÄN¶-׉ Q&ýq–Ü\ýã -÷O{ÛÃöã»'–ýó Š&ŠD°l-·çö~r™Pd´IJ—,Nš‚vÀ4"\í:è “¶u¨}ˆ$Cû¤¤õðô1Kd¨9ƒ³[ƒå2é^÷HôC¸Åß"±wœÄYžoWnv¿þÓ–’7S‰ñ$ÝÀÚÕ¥ÝT™­Ó|SÁ®hÿ´aš÷'O\åY´v›ØGÕÜ­ÓºvsàM¬Ê¼Y®`çù쮥éþ=L¦'ýŸØ¢ø½7ª{TÜá™*D´Ž‡ç}ûxvvž™$%;<¯]UÙ¥ƒ[¾8;ò Ü}]”ivìBŠ±AÝ€Ñäˆ"'>g –ã–÷ÝczK©Ø»…Á£Õˆû±Ç]ã—ö]:¿ÞÞâ·¥]»ò«ë)ñ7;Éò™ÍÜ‹+ô¸ÎþܵèÏÍìá¹²9<·<Òn™==×MjþÖõŽkƒ„?ìý{‹1ñüñˆtG°¡~Ž<ÞD$5FB“hÄØ#n¸³pâJÍ–¦Ä6µ+7ÛYÃfé¨NÍfV7ÛËÎ;‹-³¼ª*T»™3k³*9H¥0ô’’!Gš~Žf¼Îï\Yw¾©íû:ßìTã'{ïiæ ôäÆ"ò“1óxüÜ·ÈÏ`gGð“)D%(.ÒG÷™âɆ/onºe€Š>xt50´åÒAcÍE™¯£D¥…­g«c¡ÇˆÔ¦Å”T>f2Z^TK°F”¨ójI14÷mļwa4bTÅ¡b2^¤>°&(áÎÂEŒ¤ˆ·ò\ÛCu¢)æ¶vQHúÖÀuã]³„5,]‘—õQâ{háPðkŽ˜ºèºCH‚üàÇàý‡Õ¿ê‡1Ôž*4"ó9öTŒêì2?ØÙÌ÷Aæ&f(œÇsX»6- T‡ºL7Ë(J½û¡Ž|ÔÎ ö‡²ÃÇ{J]t!ˆ@³(âÐ¥ ÷Ž=PIÄU7o•1°& áÎÂ¥…8ºÊ'šßù™åáâŒc %(7Ä?2 ´c%ÌS†rÁÑN¸%¢ÃÛ ¸Í -æëu—°'SšPÓüv·¯µÈ³,¿¦ÂÇJ^:·§f+»YîvÂVöšâÉ»k"&ýwÎmº£µ÷ç¼–Ü.ë’„ìIßÄG:JÉ^ÌNùÈüj@î} ?º¥ç/\iÁZUv iV(l¥[Tí4T/gY3$}úß¾<½[¶É‹ážŽ?û%T6™öËNÅ/×0¡Áò¼ì¯í]æÆpŸk„‰ˆÈ}0bo‹}`?ûÁÎŽà¾_Z1λýzehS,óÃ3¢U¾v`“k ì¾(óÂã4…&p¡Û3[Œm6ÕÁÂëÓœ a/77°Ù`gG@–ÄvñÊ÷·?ý8b¼ Ù¹ò¾)†*ŽNo¶oEÏnjոÙeØÃWP¹ôkQÂLoF;ÏÒÍýˆŒ6% )±tbŠ”Š—ؤX°³ðô Åa)Gf´‹ÌÎÜ*ÏæHÁÚ­ý5ÐpZ̳¶c^ -j1 kºÊ¡ÕÃð:cð-Ý»‘¢A A:ÞBdß|²ƒ]…›ÿ‰û²äYSÕù:ý0â}g«ô0±ð§ç§¥ʇWÎÖM Dîk÷K㪣e¢DSÝ`u–h4#—œ_ˆl†ž{Çt[µ?b†!Þ³D”p(‰·°Øäa°³#ˆÈ5òÞþOì™ú 1s³\×9bΈô"‰ñú™-ß:G4bñâÀ~ hƒZ¦Ø/Ž,ȹÌà>ŸDß}0Ûýzш5‰Ç¦ -?‘qsîâš´Îܘ™Âh$cþ…VHFüûŠ}óaŒ vN8ã/ÝýwÅ÷~ ->X¤eU×®2.KïÝÒÁ ƒ_eÊ þòÅ3»g-|Gÿx1ÆPÖkŽ¤ÐHð4û°Ð|ÎÐüËA62 -endstream -endobj -1359 0 obj << -/Type /Page -/Contents 1360 0 R -/Resources 1358 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1285 0 R ->> endobj -1361 0 obj << -/D [1359 0 R /XYZ -16.307 900.716 null] ->> endobj -1362 0 obj << -/D [1359 0 R /XYZ 56.693 759.068 null] ->> endobj -1363 0 obj << -/D [1359 0 R /XYZ 65.161 752.393 null] ->> endobj -1364 0 obj << -/D [1359 0 R /XYZ 65.161 741.435 null] ->> endobj -1365 0 obj << -/D [1359 0 R /XYZ 56.693 694.144 null] ->> endobj -1366 0 obj << -/D [1359 0 R /XYZ 65.161 694.828 null] ->> endobj -1367 0 obj << -/D [1359 0 R /XYZ 56.693 647.538 null] ->> endobj -1368 0 obj << -/D [1359 0 R /XYZ 65.161 648.221 null] ->> endobj -1369 0 obj << -/D [1359 0 R /XYZ 56.693 600.931 null] ->> endobj -1370 0 obj << -/D [1359 0 R /XYZ 65.161 601.614 null] ->> endobj -1371 0 obj << -/D [1359 0 R /XYZ 56.693 554.324 null] ->> endobj -1372 0 obj << -/D [1359 0 R /XYZ 65.161 555.008 null] ->> endobj -1373 0 obj << -/D [1359 0 R /XYZ 56.693 507.717 null] ->> endobj -1374 0 obj << -/D [1359 0 R /XYZ 65.161 508.401 null] ->> endobj -158 0 obj << -/D [1359 0 R /XYZ 56.693 471.354 null] ->> endobj -1375 0 obj << -/D [1359 0 R /XYZ 56.693 443.873 null] ->> endobj -1376 0 obj << -/D [1359 0 R /XYZ 56.693 397.226 null] ->> endobj -1377 0 obj << -/D [1359 0 R /XYZ 65.161 397.91 null] ->> endobj -1378 0 obj << -/D [1359 0 R /XYZ 56.693 350.62 null] ->> endobj -1379 0 obj << -/D [1359 0 R /XYZ 65.161 351.303 null] ->> endobj -1380 0 obj << -/D [1359 0 R /XYZ 65.161 340.344 null] ->> endobj -1381 0 obj << -/D [1359 0 R /XYZ 65.161 329.385 null] ->> endobj -1382 0 obj << -/D [1359 0 R /XYZ 65.161 318.426 null] ->> endobj -1383 0 obj << -/D [1359 0 R /XYZ 65.161 307.468 null] ->> endobj -1384 0 obj << -/D [1359 0 R /XYZ 65.161 296.509 null] ->> endobj -1385 0 obj << -/D [1359 0 R /XYZ 65.161 285.55 null] ->> endobj -1386 0 obj << -/D [1359 0 R /XYZ 65.161 274.591 null] ->> endobj -1387 0 obj << -/D [1359 0 R /XYZ 65.161 263.632 null] ->> endobj -1388 0 obj << -/D [1359 0 R /XYZ 56.693 216.342 null] ->> endobj -1389 0 obj << -/D [1359 0 R /XYZ 65.161 217.025 null] ->> endobj -1390 0 obj << -/D [1359 0 R /XYZ 65.161 206.066 null] ->> endobj -1391 0 obj << -/D [1359 0 R /XYZ 56.693 158.776 null] ->> endobj -1392 0 obj << -/D [1359 0 R /XYZ 65.161 159.46 null] ->> endobj -1393 0 obj << -/D [1359 0 R /XYZ 65.161 148.501 null] ->> endobj -1394 0 obj << -/D [1359 0 R /XYZ 56.693 101.21 null] ->> endobj -1395 0 obj << -/D [1359 0 R /XYZ 65.161 101.894 null] ->> endobj -1358 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1398 0 obj << -/Length 2360 -/Filter /FlateDecode ->> -stream -xÚÅ\[oÛ8~ϯf66,ï»tÚ ¶{)¶Ítæ±éXˆ,º’Ü$ûë÷H²ÛZ¶œ#ÓJ;2uxHžó«D£ÛˆF¿œ½¾>{q¥hdˆÑ\G׳Hs¢ã(a‚ˆ8ºžFÏß»ÌÙÒ]\rEÏÿí+W¶_g¾h¿Tóõó“×Þßµÿüú៿_¿…i.#F©–Ú‡ê1såܹª¬†ÙY”ÀìZÔ³K“˜'Ñ¥"&^ÏÏ 'ç/ÚÆu}ãÙÏ×gŸÎ§‹”&Úˆ(6ŒhÊ£Éâìãï4šÂoÀ‘&‰î›‘‹H1J¸Ðð=‹>œý献w‚öîȆ¶4„QÝòôçªábsÛ‹+Ò¬CÖ÷$Dê~h7Ð߸¢º¸Ô”Âòícå󗗌ÿUZÁn‡2k©Á>Õë_¶WçÂbŸHt½Âúº¢°_RGœ˜ÄD…‹fß.i‹Úþ«»ð„po&h ³zt(}E˜f]úŠ2ÃVaføö¸51Üœ€Ù†`qµ_Þ¯Ïë,7Œ F[KñOÓéÖñïÒ‰>6ç½°ÕdŽêsܸ4Ÿù­‘ÀÏ‹õ…Ý[ZÃRÆÛ% ó~¶¸[-‘´Ýb™ÙdPÃïç®@®n‘–ešßöðý´æqÀaB4¯ç³r('’±# ç_vU¤ÕÿZÌyël^`Ž6À†áãaŽN@µ„ s:ôÃ0'œY<æèD’„·Gúfnó[7íˆosÀ?ô«žÍ'®¬ÀRw¤þåË!ˆûçhÕÖïeì7ªèØÌõòdó½»u˜§W)Ù;l÷Ž{õ°ÈvØ?Úå¹æ—Õ?`‘JÇ”¨XŽ§NÛôÕ)˜Ùê ’è5ž^ÏS¤q¹½É°iYø¥CŠxÐàT]£Ô/r3¬ÏÒ©$àÜ/\^•#x'¦yýîMÙÕ?bUB¢ÁyM%¶éªD0³T6ÈPѪ„EžX汋¥!dé†7’î´ãTÃ"ÿpÀ¶àˆÎíg,¯'¶%A¦¤ÿªªHoV]Ÿ{€o¬k‡•ëçôµ$†¸þ¤áxfo\6È5æ`Qb3¢kÌ€·¶ÈÂV(«P‹iÂi20¯î=n`îîq?‹iÂS7³«¬jÄ 7Ãg›­°`Wz,ØZ$Òå«èŠCîoé&Uêó·OëHCMÆ·é -y0³¤œ*Â¥YÛæ|:Æ™}éÚsh}Ã'é¬Ý -ä4-kÿw•–óØö€&µpýÁVi9KÝP‰S†JÇCÕý0‰ g/qÊHÂ×wålµÂæÖÞ»Fö…Û?2% • -ëK¨$!”‰çô%T½üäÄ©ýœªeÞ8j,Óž…R üzÄD¿’’°¡£)Á6ý@%fv€Ș(³Nô¿ñùçú„qñü*o,`Ç.¤À>Û4«Ó {²>²Tî‹ ¡"ÜOݦJWíKB ÊöŽ[a½º¬xZwmi »j+ ÎÒŒ§&ÛôÕ$˜Ùj"<Å4±®ç¯6C{+dŽ›ÆKK_–¦Ç¹JP"ž5Æ­çP‚ïú41Ñaù°)’ ¬W—°îÐÓ±pfñ:& ɿĹX¯~–>`ƒÆ6÷úXîõï8c\+}Ø:ôÔb~d±2œª—XQŒhÆxyÜý@I e¶_.b¸”¬³¶ŒÞú÷®ö`°¢³€€ÌÞ9$HOüb‘b‹E,u\éîMÅűˆ.µ$ñWH?½4mÓ”¦Pfû¥ICÄÅe+Mü iúïrjÑ„vá6]Ȧ´šÛ~KüËzy–æwKßhY]ìñÂñ’û©E›O滕ôCM9{¸yb¥Ç'ŸVE%H×vÖ¡¨ŠÁÌpTL¨^G£¯\>­\±8­c R‚Sl0»°6å‰M–I48í`ÂÊ r1¹ÇÚ×¼ryu´S”ÄIòœ1‹äq“ ÿÞ1 ›&Ùˆ1 P¤Éx9äý@À -fv`ÝMëø€eÒ5GÁ‰¦9 ºUlr—ûûÌMoÇ膹©›âO rK[TÊ%MÿÌ|XKÐi̲ðWîXš'YM¯7´C?LÏ™Åë™0æksp™.ÒÌÙãiU´7Ø})í'dí§,SñîS4ýåÒÙâ´ÍJ³Âcµ£nïsEO×Z/³î=5Ij©/1Ò¡¨&ÁÌP“œ Å7EôÇ¡‚tO”HêÏgÍ eˆ'î‰òµû;Àóp‰Ø%°>^¤¸M>PÐCY çU볿JŽ+²|ÉéR–Ä,>ŒSÝJÞá|Cæ'60ÞïKÅ_Ö¢^¬¡)Э®·`¾ÜC5 ®{8:®B™°gÅƉVâ;c å$rPíCY õ2!BŸÊ©`Z­äa­]xtõѯªåª:mVxâ—Ez;ßÛËøç~÷ã±fµ¿^jíØÛzk‘Ñú)Ñ£ñErBͳúœµüÎÏqpZGN#:Ì€&%ã•š;ôÃ&œÙœê8Ô±NÑ6“¡ŸÄœ¥·èÞhÐð›Û®ÓUù» ƒ(U:ÉF`y'¹=ox•ÂÄ£á ¯¥6Væ[Àa*!›zª&ÝÞ‘KFaMWïÖï¦ù°htÉ%œožv›÷àd™¿àêü¾ŸæÒ¤yVýžœ¹½àôüóSçë;nX¸æÛÂN××*ÿõe:ÍÜÀê×¹Y"ÁÕ×èk_ÒáI"¥Ú iê) Åi×yS ,¥ý^´ï÷!Û;qÉ 3g°hSø½M‹;Ûâó?|éî6è<óšÕ&v@"i¡ÆÃç$/©´M> ƒYŃ³[7¶ùïù$[•)ö-5ØgÕ¿{ñ•Â{lF¿LË,¥ƒAªo|—cK.û@>°â‹ßrm¥¯‹t¶x<ѧô( ;ïú’”PmŽyÕ×ÿ¥šfž -endstream -endobj -1397 0 obj << -/Type /Page -/Contents 1398 0 R -/Resources 1396 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1433 0 R ->> endobj -1399 0 obj << -/D [1397 0 R /XYZ -11.232 900.716 null] ->> endobj -1400 0 obj << -/D [1397 0 R /XYZ 56.693 741.791 null] ->> endobj -1401 0 obj << -/D [1397 0 R /XYZ 65.161 742.474 null] ->> endobj -1402 0 obj << -/D [1397 0 R /XYZ 56.693 696.338 null] ->> endobj -1403 0 obj << -/D [1397 0 R /XYZ 65.161 695.779 null] ->> endobj -1404 0 obj << -/D [1397 0 R /XYZ 65.161 684.82 null] ->> endobj -1405 0 obj << -/D [1397 0 R /XYZ 65.161 673.861 null] ->> endobj -1406 0 obj << -/D [1397 0 R /XYZ 56.693 626.483 null] ->> endobj -1407 0 obj << -/D [1397 0 R /XYZ 65.161 627.167 null] ->> endobj -1408 0 obj << -/D [1397 0 R /XYZ 65.161 616.208 null] ->> endobj -1409 0 obj << -/D [1397 0 R /XYZ 65.161 605.249 null] ->> endobj -1410 0 obj << -/D [1397 0 R /XYZ 56.693 557.871 null] ->> endobj -1411 0 obj << -/D [1397 0 R /XYZ 65.161 558.554 null] ->> endobj -1412 0 obj << -/D [1397 0 R /XYZ 65.161 547.595 null] ->> endobj -1413 0 obj << -/D [1397 0 R /XYZ 56.693 501.459 null] ->> endobj -1414 0 obj << -/D [1397 0 R /XYZ 65.161 500.9 null] ->> endobj -1415 0 obj << -/D [1397 0 R /XYZ 65.161 489.942 null] ->> endobj -1416 0 obj << -/D [1397 0 R /XYZ 65.161 478.983 null] ->> endobj -1417 0 obj << -/D [1397 0 R /XYZ 65.161 468.024 null] ->> endobj -1418 0 obj << -/D [1397 0 R /XYZ 56.693 421.887 null] ->> endobj -1419 0 obj << -/D [1397 0 R /XYZ 65.161 421.329 null] ->> endobj -1420 0 obj << -/D [1397 0 R /XYZ 65.161 410.37 null] ->> endobj -1421 0 obj << -/D [1397 0 R /XYZ 65.161 399.411 null] ->> endobj -1422 0 obj << -/D [1397 0 R /XYZ 56.693 352.033 null] ->> endobj -1423 0 obj << -/D [1397 0 R /XYZ 65.161 352.716 null] ->> endobj -1424 0 obj << -/D [1397 0 R /XYZ 56.693 305.338 null] ->> endobj -1425 0 obj << -/D [1397 0 R /XYZ 65.161 306.022 null] ->> endobj -1426 0 obj << -/D [1397 0 R /XYZ 56.693 258.643 null] ->> endobj -1427 0 obj << -/D [1397 0 R /XYZ 65.161 259.327 null] ->> endobj -1428 0 obj << -/D [1397 0 R /XYZ 56.693 211.949 null] ->> endobj -1429 0 obj << -/D [1397 0 R /XYZ 65.161 212.632 null] ->> endobj -162 0 obj << -/D [1397 0 R /XYZ 56.693 175.544 null] ->> endobj -1430 0 obj << -/D [1397 0 R /XYZ 56.693 148.033 null] ->> endobj -1431 0 obj << -/D [1397 0 R /XYZ 56.693 101.24 null] ->> endobj -1432 0 obj << -/D [1397 0 R /XYZ 65.161 101.923 null] ->> endobj -1396 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1436 0 obj << -/Length 1939 -/Filter /FlateDecode ->> -stream -xÚí\[sÛ6~÷¯àÌv¦ÉÌÁ`vúÐ˺ÝNoÛøagÒ>P$³¡H•¤b§¿¾‡¤ÔF”儺Mûà‘L‚ïù€MV M>¿øäúâÙ•¢IJRÍur½L4'Ú$– "Lr½H^>ùÞ.kÜÓK®è“oªÖ5Ã×eU_Ú›ÝÉϪù'Uõjøç/¾zúãõ—ÐÍ%c$Uj°ö¢}S¸æƹ¶éNCï,±Ð»]ïRb¸M.IÍ®–‚AcŸ<>×Ý…ÿ¾¾øù‚yš°Di¢S‘˜”My2__¼ü‘& 8ˆLmrÛ·\'ŠQÂ…†ïEòââ¿t7ôäˆìmË”0ªL?p®zûËž]A“þ>dw%R[81 `5suûôRS -·Ÿ½i«òùÓKÆi7†Fîšb°£Ô™ë>>?¼?˜fxb`¢»¿î¸¢0ZR'œ¤6Mj—,ß¾¡k÷=î€[¬Üw0f]ëPûŠ0ÍÆöeÄÀ@azx{²5Iy:ØÞ`½J†/ßïfÿ`&÷À#¨ŸÐ‹ƒÉ?¶“¼ìg»Sªaénq 0¸†î®ue“WeƒD­]³ÉæHÀ 7/²:k¡ƒƒ `tþ¹;pâʼÄõ0ïÖTË«o¿;løn1C@Áñh~h?æÁ`=hÎ)QL 4ÿBHjnËy‹'\V#§w۸Řc»`2Ù¯ö æ‰Ï“~BƒœOí'êuVxx -m…Žç(´·JY4ì‡)(,^AÚ¢Á¼Ÿ£h¶›Msô5®áfu›/*ê^œT¾‹j>ƒÀØG¿B%TDsA”Ññ|h?PÀÁ`=Ì5±Ý‘nN¯ò;‡•ðf[çÕéýæEÕäå -×øç-d]ÓʸÈK7Reœï°íbkÏ)N•ÈNe4qþkhmÛ*_Ü]¾ªwÏq+ ƒÂX<ƒ*ˆQ<šŒGöÃd/ce)¡;¦|Z•¯Ú»îÂرϺ<™Ö<É^gy‘Í -7±ÿ.«…ó€Ñ¸vÜúª(ü±‡S²¶BG➉–‚Ù0©ˆGÏCûô ëAOjÙÀOtöÿûmé9 -¦îcÄ}"^"“±~“ÕÙc"Ë+®iZ*ø´TžÕ{‰”ì3/çõYö:_ .èSDWï]×]í–>Þˆ&n#z#ÖÝAOî‡öå ÖCvÅãìÕ®iÐ…¼:Æ èú]¶lÒ u$õ¼½q%ÞfÓíŒåûч-O$“ã+ž?ìÛ`…rÖÝn²Õ¢áužôÜH* ÿÝ£¾[rL¯Î¹ÊÈTª³OñuLûËp¿_º¬l~’7¹Ç:#­ ŒFܦ€9 LÆÛ¦Ù[gÂÁâ×i‘‚{'¯á櫉ƒÜººõˆqo\¾ºy´Ó—u1uÖr°”špɦôú«¢jš¬~ã£H(LQ‘\/ =4¨ÇP¨rä–hº+&þ§—[ö[fY‘ÿ‚•æ¦ËG·Ç;mÁÑsO£Æa†rág6+šÊ3[”% ÁÎ)O‘¦D23mE©OuÈÝ­›í -GÃW¶»ÿoÚuÑΊ·JKm—HyZXÀ­dó?>… TÆ úGöé ÖƒRBÁwi€+ÜÚ•m3í쟿v %Tõ}01ñ+*omI"ÃD|E…YM8‹·Ÿ3²¦´p°x¥1›µ¸ýÞ‚ôÊÌЫ²W”¶úžz$!á*ÞæÖÈ~ N‚ÁzèÄX¢¤ú‹y$ø#\§çôHL¦Dìácú§h°7.EÊ#:$ØE¼rÍÈ~ Ð‚ÁzMÒ}y•ß!¯êWèw «%v3håóÎÔ:kÐÂnÙNí玞f}hQXåå£_¥f\)Ïú¾ £œ(1õƒèïz¶îð'uv½Ý÷cA÷a™ôý­ _²SƒR -endstream -endobj -1435 0 obj << -/Type /Page -/Contents 1436 0 R -/Resources 1434 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1433 0 R ->> endobj -1437 0 obj << -/D [1435 0 R /XYZ -16.307 900.716 null] ->> endobj -1438 0 obj << -/D [1435 0 R /XYZ 56.693 741.747 null] ->> endobj -1439 0 obj << -/D [1435 0 R /XYZ 65.161 742.431 null] ->> endobj -1440 0 obj << -/D [1435 0 R /XYZ 65.161 731.472 null] ->> endobj -1441 0 obj << -/D [1435 0 R /XYZ 56.693 683.964 null] ->> endobj -1442 0 obj << -/D [1435 0 R /XYZ 65.161 684.647 null] ->> endobj -1443 0 obj << -/D [1435 0 R /XYZ 56.693 637.14 null] ->> endobj -1444 0 obj << -/D [1435 0 R /XYZ 65.161 637.823 null] ->> endobj -1445 0 obj << -/D [1435 0 R /XYZ 56.693 590.315 null] ->> endobj -1446 0 obj << -/D [1435 0 R /XYZ 65.161 590.999 null] ->> endobj -1447 0 obj << -/D [1435 0 R /XYZ 65.161 580.04 null] ->> endobj -1448 0 obj << -/D [1435 0 R /XYZ 56.693 533.774 null] ->> endobj -1449 0 obj << -/D [1435 0 R /XYZ 65.161 533.215 null] ->> endobj -1450 0 obj << -/D [1435 0 R /XYZ 56.693 485.708 null] ->> endobj -1451 0 obj << -/D [1435 0 R /XYZ 65.161 486.391 null] ->> endobj -1452 0 obj << -/D [1435 0 R /XYZ 56.693 438.883 null] ->> endobj -1453 0 obj << -/D [1435 0 R /XYZ 65.161 439.567 null] ->> endobj -1454 0 obj << -/D [1435 0 R /XYZ 56.693 392.059 null] ->> endobj -1455 0 obj << -/D [1435 0 R /XYZ 65.161 392.742 null] ->> endobj -1456 0 obj << -/D [1435 0 R /XYZ 65.161 381.783 null] ->> endobj -1457 0 obj << -/D [1435 0 R /XYZ 65.161 370.824 null] ->> endobj -1458 0 obj << -/D [1435 0 R /XYZ 65.161 359.865 null] ->> endobj -1459 0 obj << -/D [1435 0 R /XYZ 65.161 348.907 null] ->> endobj -1460 0 obj << -/D [1435 0 R /XYZ 65.161 337.948 null] ->> endobj -1461 0 obj << -/D [1435 0 R /XYZ 65.161 326.989 null] ->> endobj -1462 0 obj << -/D [1435 0 R /XYZ 65.161 316.03 null] ->> endobj -1463 0 obj << -/D [1435 0 R /XYZ 65.161 305.071 null] ->> endobj -1464 0 obj << -/D [1435 0 R /XYZ 56.693 257.563 null] ->> endobj -1465 0 obj << -/D [1435 0 R /XYZ 65.161 258.246 null] ->> endobj -1466 0 obj << -/D [1435 0 R /XYZ 65.161 247.288 null] ->> endobj -1467 0 obj << -/D [1435 0 R /XYZ 56.693 199.78 null] ->> endobj -1468 0 obj << -/D [1435 0 R /XYZ 65.161 200.463 null] ->> endobj -1469 0 obj << -/D [1435 0 R /XYZ 65.161 189.504 null] ->> endobj -1470 0 obj << -/D [1435 0 R /XYZ 56.693 141.996 null] ->> endobj -1471 0 obj << -/D [1435 0 R /XYZ 65.161 142.68 null] ->> endobj -1434 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1474 0 obj << -/Length 2342 -/Filter /FlateDecode ->> -stream -xÚí\[oã¸~ϯ¶Í G$EJÚ¢ݶÙnQtÛ$E˜ÝÙ¦c!²èé\úë{$˳±;‡¦h À>Å‘éÃ#ê|ß¹‘Š£û(Ž¾¿øîîâ㵈£œä’ÉènIFde”žFw³èóåªTaÔ‡+&âËh«Ìæã\7›vÑùg=ýNë‡Í?Ÿnÿþá绿Á4W”’\ˆ´[ûR)³PÊšök˜FÌ.y;{"S’²,º$OûùY Óìòãæe²ýáÅ_î.¾\PG4’ÈœGiN‰ŒY4]^|þ9Žfð(@’<‹žº‘ËHИ0.ásÝ^üë"îW"ÛíŸï_I†õ )‹Ò$'4–­äöºˆAÏDFŒäY5*š…€g„&év‚`ÚŽö•/•t(_Ä”¤2CÍðz™%ÉY>‚²Àæ>Ú|¸é-ag Ig‰½â % ï­ç³™šuÿ°¤èó•ŒãË7¬VO¸«¢)–ʪfg8èô»þÂßMË¢y0Ãß‘ƒ¿»œêª*V€9·©ì¢°¸›™êÚ6º2¸Ñ-ÀQ˺´eQá¤\=YÑíCÙP˜æ/f—d92‡áÅý'q?*{5*% €¶sµ™tÇÒwèi‹q–šeÇa3Ôx ãßïã~wÎC¸ÇJýÊAnÅr u)‰ào*7ÏÁ6JáQÖªٶÞ&ŠƒÃ…—Ðt=\ƒ«ÃLó_ÕhœÜÇ¢ZW·ûâ§Xć'@/ÛLÍ‹ue‡ºƒtúíéºzùZ½rXÄJ=ª]Òr -$MiN¡’0d°¸aW¾gÜà­,‚2Aâ ˜Ó>†|Û †Zƒ5ÚÒ¬ªâ“ôþq`®ï³Ô`¸ÍSyB@€¼§…®°Ð’¬·×v|8¥9áÙ )3‹ xŒaéy]üΔ£yø7ò:í|´qF„È6K~”Á¾[”#›L¹\Uj©j‹t›£^ÿøÏ·|'¬Ôa·òÉ‘%þTi£wz}ó–:¿¡iÎ8“m쌰ŒúdÅþî&ú_¦p‰ò¸Œ‰¡ßݱ*ˆ³-‚oôD5öCw£·¶x±ºþöÃÆ’l1©y6Õï7_¯Êöä"È4§ÆÕ¤È ƒ -åâòý\¼¿²øÒ€„‚}- óÎõj¥;2Àg“92nô“Cl¹Påý©ìªÑSeLYßcÃc›õÔ–û)Ã;EU>`ÃtM¢¬±+½°Ëê7¾Và–ʳRç$Óq)«*5.,ÅÂh¥('LdáXjW¾'Ky+ëÀRôˆDþŸ±ÔƒR.)°Õ÷ªMRÎKTøyÊðpÆûZº§éz*ê`¸ˆ¬ç-ŠKlVÜrþÁõT™Sé\ä9áô¬¨HáA$,÷è¤ÒÓz2B „ŠÖoæá‚Ð|?Œø+‹G‰€€W@”Þe÷Ýê¬#¹‹DÎE8ãÝ•ïi¼ÞÊ:o’Éúlz©±ß±“Á:ƒ‡ñ݆UKl)·žáÛ6§»¡œrrÖ¬BP¸”faÝP×Ë"ÏOj²s‚ì´Û-^·ÇöKIì äûAÛ_YhCœ(·ý´_Bo‡x,š²­šíöøΫš¥Ãpp%+°Õ[Ö´,±u‰VeãXYa}e£¾¬ÕÞ -nŠ±ÄÑ\fÒU$à’\“ˆ’”—uUÖÊ!NdDÃà€Ýp)â@¾'Ñx+‹'š¤µÚÀ? C8ÓµZ˜àìáÁ…*š¦¨ï±ýÊf†…-¶µy vˆ,C4x^@³´}Æãú¹Qs8ÓÌ·LûœA"§áö[ä{ÂÙ[Y8ƒ\÷û-ÿ -á3vcÀ¼lŒÝóï#ä÷•6/ÛGXêÙýá›# ì”3ƒÆ|œìÆœá1Ï3 -—Æ…|÷ÜŠæåU>±e>kÿÏ\k[këâôyÊ€%h8–à’ðX0–È÷c eñ,Á!ÜyÞ;ýí¶‰³ù~ÿNHgœ»• ]EØŠ-*ƒLE°ãìB!w9N $®Ê€k£.È÷ă·²x€€»½ÐÂAãK¥öe…Mm±!g‹téu¢L9CkÐÞבþ}ëI Œ‘ge9KH>¶cûtPe]<„‡> endobj -1475 0 obj << -/D [1473 0 R /XYZ -11.232 900.716 null] ->> endobj -1476 0 obj << -/D [1473 0 R /XYZ 56.693 759.068 null] ->> endobj -1477 0 obj << -/D [1473 0 R /XYZ 65.161 752.393 null] ->> endobj -1478 0 obj << -/D [1473 0 R /XYZ 56.693 672.828 null] ->> endobj -1479 0 obj << -/D [1473 0 R /XYZ 65.161 673.511 null] ->> endobj -1480 0 obj << -/D [1473 0 R /XYZ 56.693 626.822 null] ->> endobj -1481 0 obj << -/D [1473 0 R /XYZ 65.161 627.505 null] ->> endobj -1482 0 obj << -/D [1473 0 R /XYZ 65.161 616.546 null] ->> endobj -1483 0 obj << -/D [1473 0 R /XYZ 56.693 569.857 null] ->> endobj -1484 0 obj << -/D [1473 0 R /XYZ 65.161 570.54 null] ->> endobj -1485 0 obj << -/D [1473 0 R /XYZ 65.161 559.581 null] ->> endobj -1486 0 obj << -/D [1473 0 R /XYZ 56.693 512.892 null] ->> endobj -1487 0 obj << -/D [1473 0 R /XYZ 65.161 513.576 null] ->> endobj -1488 0 obj << -/D [1473 0 R /XYZ 56.693 466.886 null] ->> endobj -1489 0 obj << -/D [1473 0 R /XYZ 65.161 467.57 null] ->> endobj -1490 0 obj << -/D [1473 0 R /XYZ 56.693 420.881 null] ->> endobj -1491 0 obj << -/D [1473 0 R /XYZ 65.161 421.564 null] ->> endobj -1492 0 obj << -/D [1473 0 R /XYZ 56.693 374.875 null] ->> endobj -1493 0 obj << -/D [1473 0 R /XYZ 65.161 375.558 null] ->> endobj -1494 0 obj << -/D [1473 0 R /XYZ 65.161 364.599 null] ->> endobj -1495 0 obj << -/D [1473 0 R /XYZ 56.693 317.91 null] ->> endobj -1496 0 obj << -/D [1473 0 R /XYZ 65.161 318.594 null] ->> endobj -1497 0 obj << -/D [1473 0 R /XYZ 56.693 260.945 null] ->> endobj -1498 0 obj << -/D [1473 0 R /XYZ 65.161 261.629 null] ->> endobj -1499 0 obj << -/D [1473 0 R /XYZ 65.161 250.67 null] ->> endobj -1500 0 obj << -/D [1473 0 R /XYZ 56.693 203.981 null] ->> endobj -1501 0 obj << -/D [1473 0 R /XYZ 65.161 204.664 null] ->> endobj -1502 0 obj << -/D [1473 0 R /XYZ 56.693 157.975 null] ->> endobj -1503 0 obj << -/D [1473 0 R /XYZ 65.161 158.658 null] ->> endobj -1504 0 obj << -/D [1473 0 R /XYZ 56.693 111.969 null] ->> endobj -1505 0 obj << -/D [1473 0 R /XYZ 65.161 112.652 null] ->> endobj -1506 0 obj << -/D [1473 0 R /XYZ 65.161 101.694 null] ->> endobj -1472 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1509 0 obj << -/Length 2160 -/Filter /FlateDecode ->> -stream -xÚÅ\ßÛ¸~ß¿B¸>4º Sº¢@s½æp‡öŠ^ö¡@rZ‹^ ‘DE’³vÑ?¾£µ]i×»CSrž,ËÔpHÎ7óÍ2n"ýtñÃÕÅ›wŠF I4×ÑÕ2ÒœhÅLa¢«,úðê7[Ø´µ¯/¹¢¯~umw—K×ì.ºÕþÇÝâç>í¾üçý?^ÿ~õ tsÉI”ÚI{ßm Û®¬íÚþgèE1ô®E߻ԆG—Š$fß?g ÐįÞì>×ýƒ¿ºø|Á@êýe<3C¸2óÁm(?nÁÊzÀS¢¤ÜÁ­r·ÈU]wõziv½J‘fúó¾tS«pçI¬º&·ÈIX`um‘×"û†`h[-,³/Á†M& »›G>ò ÜD2søgºnòî¿;Šð‹M«öž@´ÛÊÕ|AÇ E¬æã ÚNù||a$?Ì…+‹w`Ú³½{›eX#/]! ¡Î–u‘vHl.±QϹE‘Žt€aüïxäs.¯€(,Ó…õzÊn¶îrW -m­¢î¡=½å`°²Ò°¿®Å†„ëõÍh1înÿi.ÀMáFe’³ú\! 4óälØasÐ!Ñ3z\ë*棌#ù¬¬‡Á3MW_=”i·@6uód“y…8cïû—ïŽ;íãö—Ç›?fmß=Ož;$y^æ› ‡Æå*áhF˳rHŠ’oëÏ”1„êýYï*ÏŸä‡ù³peñþL鄈dïÏ~ŦÀÐŒ³Ïi•¥}R¹ÅúÈ¢Àµ\·›'#éµ-f(Ta}iŠœÒµm‘^aÙÄkQH”æHy«´Å² {j®¥|ª³RzÅÁ ÒxÚ˜W°¢Ö'2Иƒ ÝÙŒ€Êl°²€e )õ%õØ],ÛÚ.òeŽ­á,‡äèͳiƒõ®>q9èóÚa$à -Ƚ®U“bÃÿ¸œþ"^ebˆ¼wT“Ãi$? NáÊzÀ‰Rð\æküÛ~£]‚§rÈ?Ï!çß!‰$Òœ3²IÈfÉ7Mî¤âãšT`o|F å1XY<¥’„2í×Úu]»fj÷>}Êø„sGlšæe6©çSiµXŠy(;5òùø‘3_ac(>ÐôCUõ°|)UûtµÊ‘iKÚ¶ëÒ¶× Òu·ÂÂä@[,i)m·Ê«l-Ý´ÇkÛŸ«C*’W£M9„éò˜ÄŒÍg»CùƬ¬‡õ -Nh{öµ&¤ådwCŸáFèúÀ‹=•åú¼W@mÄÇ•rEbÎÏÊÏ(H7lZ~Ö¹…= ¸J‘ÌGÏD ÖÏó‘ü0˜‡+‹‡¹ˆzów§n4—“+{‹%f ¿íÎöT$ -“€<+|r9ñIª.ï -[§7öÁyì…+kW£~p/Ë¿ämF§¸ï% &S“qôCTûH)MýzÅvWÈUš:§g5Ÿcˆô ¡ªz¸-bïC]‹ñ{p†µ‚KÓŧÊÝ6»ña!XuÝ¿2qm0mŽ1…c\yR1ä´ØƒûnaÛÖúÿ\‘̇òq¬¬и!Úì‹cm^æEÚÛi!èÍé3g=ø»¿}ððûçi]Û´ÁæÏè½ ,:Ê´ë¬wée9~&$^óÁd(?&ÁÊzÀ„iós‡’´ÚúÚýé$Æ#¥<' ä±!*áß2㜒fó‘.&dè|v>’fçáÊâíœk°‡äð~ê-z{–¼(8Æxì±›l j·xüØ"híêu?OÙ‰ý¿ 2¥Ub> åb XY (H¼Å¾…>†¥µmʼëð MÕ—óZætçpߧåÔ类 (Âz=.%1±œÏ2‡ò-3XYË”1¡‚ßÑYæ›àWRŒG'Ï3N´%½û×éo™zÙ }CÄ›<1X4)§>E—YŸÿ.àóÑ'–€ªù:’Ðpe= -š -É=«Ùýú¢“V4ÈZkÓ¢uù‰G¿žÙñER¢´±è×æm7.y %ŠP­Î‰tè–p6u±¼?—Q’Í­½ÆŽ>y<'Ö˜4ŸëCùXVu¦$ÑŒr¥Ò}Árºl]}aÀ>j?REïA—®rmýÄ»¿Çù xŒªóiž–yñè/N@-†F#Ð!΋F®ˆŒ'Ž»÷`Üo@ín|õS/OSD)>#8©$*™œCùà VÖœ0ÕqÌ> endobj -1510 0 obj << -/D [1508 0 R /XYZ -16.307 900.716 null] ->> endobj -1511 0 obj << -/D [1508 0 R /XYZ 56.693 741.779 null] ->> endobj -1512 0 obj << -/D [1508 0 R /XYZ 65.161 742.462 null] ->> endobj -1513 0 obj << -/D [1508 0 R /XYZ 65.161 731.503 null] ->> endobj -1514 0 obj << -/D [1508 0 R /XYZ 56.693 684.09 null] ->> endobj -1515 0 obj << -/D [1508 0 R /XYZ 65.161 684.773 null] ->> endobj -1516 0 obj << -/D [1508 0 R /XYZ 65.161 673.814 null] ->> endobj -1517 0 obj << -/D [1508 0 R /XYZ 56.693 626.4 null] ->> endobj -1518 0 obj << -/D [1508 0 R /XYZ 65.161 627.084 null] ->> endobj -1519 0 obj << -/D [1508 0 R /XYZ 56.693 579.67 null] ->> endobj -1520 0 obj << -/D [1508 0 R /XYZ 65.161 580.354 null] ->> endobj -1521 0 obj << -/D [1508 0 R /XYZ 65.161 569.395 null] ->> endobj -1522 0 obj << -/D [1508 0 R /XYZ 56.693 521.981 null] ->> endobj -1523 0 obj << -/D [1508 0 R /XYZ 65.161 522.664 null] ->> endobj -1524 0 obj << -/D [1508 0 R /XYZ 65.161 511.705 null] ->> endobj -1525 0 obj << -/D [1508 0 R /XYZ 56.693 464.292 null] ->> endobj -1526 0 obj << -/D [1508 0 R /XYZ 65.161 464.975 null] ->> endobj -1527 0 obj << -/D [1508 0 R /XYZ 65.161 454.016 null] ->> endobj -1528 0 obj << -/D [1508 0 R /XYZ 65.161 443.057 null] ->> endobj -1529 0 obj << -/D [1508 0 R /XYZ 56.693 395.644 null] ->> endobj -1530 0 obj << -/D [1508 0 R /XYZ 65.161 396.327 null] ->> endobj -1531 0 obj << -/D [1508 0 R /XYZ 56.693 348.913 null] ->> endobj -1532 0 obj << -/D [1508 0 R /XYZ 65.161 349.597 null] ->> endobj -1533 0 obj << -/D [1508 0 R /XYZ 65.161 338.638 null] ->> endobj -1534 0 obj << -/D [1508 0 R /XYZ 65.161 327.679 null] ->> endobj -1535 0 obj << -/D [1508 0 R /XYZ 56.693 280.265 null] ->> endobj -1536 0 obj << -/D [1508 0 R /XYZ 65.161 280.949 null] ->> endobj -1537 0 obj << -/D [1508 0 R /XYZ 65.161 269.99 null] ->> endobj -1538 0 obj << -/D [1508 0 R /XYZ 65.161 259.031 null] ->> endobj -1539 0 obj << -/D [1508 0 R /XYZ 56.693 211.617 null] ->> endobj -1540 0 obj << -/D [1508 0 R /XYZ 65.161 212.301 null] ->> endobj -1541 0 obj << -/D [1508 0 R /XYZ 56.693 164.887 null] ->> endobj -1542 0 obj << -/D [1508 0 R /XYZ 65.161 165.57 null] ->> endobj -1543 0 obj << -/D [1508 0 R /XYZ 56.693 118.157 null] ->> endobj -1544 0 obj << -/D [1508 0 R /XYZ 65.161 118.84 null] ->> endobj -1507 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1547 0 obj << -/Length 2326 -/Filter /FlateDecode ->> -stream -xÚÍ\[Û6~Ÿ_!tèè0$Åk lÚ&-ºÉv7ã‡ih›¶…‘%G’33»è_Ê—v,=‡¦èÉ“/¢¨ó}çF'Ó'?\|;¸xù–ãD#-¨H“DP$d¢HŠR™ ÆÉÇË6·¦¶/®(Ç—ÿ*[¯ßNÊjý¦™m.~_Ž¾-Ë›õ‡_®ß½ømð“›æŠ¤9_K»nîs[Ϭmêö²›$ÊÍ.Òvv&$’T%Wi¹™ŸR'PªË—ëBEûË7ƒ‹OÄ‰Ç I¸@B§‰Ô L“Ñüâão8»kNÄ´JnW#ç 'ÑT¸÷yr}ñŸ ¼Y ìTl߶/?<ìÖƒHšH¦Á¢•Ü~ϱӓ‰„"­tRÙdrPt‚T!Âäv‚µ`ÒŽ•Ï¤+Ÿc‚¤P .³@šê”] ¬¦Éú͇%ºG¸²¶²Ä⌠–n¬çõx¼zø‡å$¯Æ—ó²(ë…ÙáNÚ|±ÿ»Ë϶š&›{üdRÇðÛlÜÌ`7°0•™Ã†6%l\½\,ʪ þ‡‡®e¼§ªœº»Ê³ºÉŠéuÛ±—ÿg\…@ñÀë>ny…p„õÚ¥”ï¨Þ1[…˜ÃÞpg9´nÅWwݘû¦,^½¸"Ô}ÜZº«sècFã ¡9âšDã Žü0 -WÎAB+¤äÆþ½l‚Íýào2 ”&e>¯ÓÎ0/G7ÝñW‡Ç«™¬°L—Û J·Uöò¨2/Ç{þ÷¯Ï+áÍ°;ø+ …bH¤i<¤ìÊDJ°²HQÒ͹ÊíÌ­¹±w@L³ÊŽš êq²6®Ê¦³¦_o›Û PâЎ̲¶°Á&Ͻب¬)¦K3µåz2u鋇ƒ]ù8VÖÒÍé^W@0•=Ñfžà¯Òcð¾‰{Ä\Bb$?gÌ%¸›’Ègº£K1êJ "DÅÃЮü@ +ë¡”!ærn¿ÌÏ+ËikÏ–Õ£ÊB=¤)Æ}äXßä‡õrdwè1‡Ë®ðÕס˜P™ -0±P…ˆ³«s Vo©¹/b¹«ìăT¸ÖˆST¸Rˆ‹xjG~©„+ '—2"Å7OÿmvfíDË”+~U­mô[¶Å¡¾s³V˺-Ά%bgŽºr d¯QYµñ}~j ââÆø|Âeñ­›òâ“÷féâÿ® å'kŠúOBYåì>ŒÂÛ€3bš30Ž¦tä2J°²ŒÂ4¢úϵ}Ö@ÅŒnŠòÖnjç¶hê~ËN¦j²QnOFgÊf:ž íÊ´¡`e=l(U(M7rícÐ'7lsÇöòp¶è< PÊÎMVÔý:¸!´²7/kt™8««h;¡ÛòØs…ž8EŒG =™¦ˆéx¡gG~ÈÕ…ƒœiŽ¤ê-ô”J!‡žY±‰¨€±4¨ƒlÁŽ«.ç@ЗyVÜÔ§¢ž)—zá³FˆLhÄRÑ/ì'¥è™ÀHéˆE,æ‚ Æ‹;òA¬¬èyŠ(õ-bÅo”í÷¾ŽÕŽó²ƒ~ÜZh;£vTfûf’Í%à*¼ý\‚Ùº.«:B"\Ãg.'Ò쬥6FRªçR›Y6eSŽZöûÛz@[ì¬|žæe]›êþÁWk¶Ü|hÌ0·>/ÚΗm– F%.bg$"£:‰©¢ñuW~ £+ëÁ¨N®_DW >Mï3¯ç~†•ž¿bŽ=;ƒ}µki:uÈSq+ì@)¹\6‹esr̘j×æîÈÃb¸²p,¦Z#I6ÿÝÌShõ++êÆ8—ô‘%°‚>7Õ´c<žö\»8 Âÿëð×ÇwµßKjòlê3Þ-wµ‡Äß¡PÜyg»ò¬¬”B’o*:à&­·•FØŸô…š©-öêy¿£ãÎb0+¡»§ú¹^$[õ„¢áeW~ ^‚•õÀ‹tq²»°ÂËj{ íâm|#RÄ#éÈL°²€qsªíñ—©-à•×{lå›ù^euáÈóí'óùú›§Ò€¦*ÇË<¨|ì6Ü£f(=>ÔkšnÂù´esŠ¸ŠWíÈ´ì`e=,›s¤ä¦2zÞ´Ÿ2Ôf~¼wž4•iÄõY+|)uS¦=WøVqº»µÃ? -tív{Öî酠XœK&pÄóù VÖÔíÁaêYœ3MSeC´y`º¶Ð½-àjž8wª€c·m™Ú2­À±.4ÛÉédá@ÙYû T9ƒ”â # *Õª;,¨ˆÉx±mG~Y„+ ' *±Ó”÷ÓE¡g§®Á´âW£>ÎT0ÄÔYOES榤њ{ÐOùªÇ¾”9dÄkÄuäÂ7XYøR…hOÛ™gîE½ê§-ôÉyPã<Ô7ƒ·¿Â† ~þÎóà øøgzVûdzbÿœø‘MŸMÖäÖ ‡•ý ¤¬*²2ž¹6uѧŽxê¥#?ªÁÊz@•HD·§^ÚÖ›5ã~oŸ–¶~¬°þT…(Þ|6YÞnÛ€»ýµó…šèö¿‹á&ÞxÁ%ä=¨® -Ûªv«~r@[ƒ;ïy¢„“ÎËüÓ¶§™ÖÏÕÌòieCöEQóÄ ‘±ˆ'f:òÃØ(\Y8Éœ%øÆýCÛ4п$Y”Y ­ã}xóúû÷ozÎ~¹~7øñ§Ÿ#Âá‚œµÐG˜B)'ÏÚT#E"†ûÄEµŠÇ ÷;òQ¬¬jS·@lsr±„¶c›[knÀ%5x“Õ@Ën3ÓœŽÄƒ…·¼q©ê["øäíÔŽL¾wB÷i R—w?Œ…ÏÀA˜#¹õÏÈAº ¦#J ªãÕ wŇP°ªpþiÏí¨ ÿ¼Îw/LcÁ ;_4ÐÁÀ^¡)l.0Œòåø‘ªå‘ØÞ=ö›ãô5€î‘û¦Ö*E)ŽQ^ÜûW†ú”ÿpý?æwE -endstream -endobj -1546 0 obj << -/Type /Page -/Contents 1547 0 R -/Resources 1545 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1433 0 R ->> endobj -1548 0 obj << -/D [1546 0 R /XYZ -11.232 900.716 null] ->> endobj -1549 0 obj << -/D [1546 0 R /XYZ 56.693 759.068 null] ->> endobj -1550 0 obj << -/D [1546 0 R /XYZ 65.161 752.393 null] ->> endobj -1551 0 obj << -/D [1546 0 R /XYZ 56.693 709.155 null] ->> endobj -1552 0 obj << -/D [1546 0 R /XYZ 65.161 709.838 null] ->> endobj -1553 0 obj << -/D [1546 0 R /XYZ 65.161 698.879 null] ->> endobj -1554 0 obj << -/D [1546 0 R /XYZ 65.161 687.92 null] ->> endobj -1555 0 obj << -/D [1546 0 R /XYZ 56.693 644.681 null] ->> endobj -1556 0 obj << -/D [1546 0 R /XYZ 65.161 645.365 null] ->> endobj -1557 0 obj << -/D [1546 0 R /XYZ 56.693 602.126 null] ->> endobj -1558 0 obj << -/D [1546 0 R /XYZ 65.161 602.81 null] ->> endobj -1559 0 obj << -/D [1546 0 R /XYZ 56.693 560.813 null] ->> endobj -1560 0 obj << -/D [1546 0 R /XYZ 65.161 560.254 null] ->> endobj -1561 0 obj << -/D [1546 0 R /XYZ 65.161 549.295 null] ->> endobj -1562 0 obj << -/D [1546 0 R /XYZ 56.693 506.056 null] ->> endobj -1563 0 obj << -/D [1546 0 R /XYZ 65.161 506.74 null] ->> endobj -1564 0 obj << -/D [1546 0 R /XYZ 56.693 463.501 null] ->> endobj -1565 0 obj << -/D [1546 0 R /XYZ 65.161 464.184 null] ->> endobj -1566 0 obj << -/D [1546 0 R /XYZ 56.693 420.946 null] ->> endobj -1567 0 obj << -/D [1546 0 R /XYZ 65.161 421.629 null] ->> endobj -1568 0 obj << -/D [1546 0 R /XYZ 65.161 410.67 null] ->> endobj -1569 0 obj << -/D [1546 0 R /XYZ 65.161 399.711 null] ->> endobj -1570 0 obj << -/D [1546 0 R /XYZ 65.161 388.752 null] ->> endobj -1571 0 obj << -/D [1546 0 R /XYZ 65.161 377.793 null] ->> endobj -1572 0 obj << -/D [1546 0 R /XYZ 65.161 366.835 null] ->> endobj -1573 0 obj << -/D [1546 0 R /XYZ 56.693 323.596 null] ->> endobj -1574 0 obj << -/D [1546 0 R /XYZ 65.161 324.279 null] ->> endobj -1575 0 obj << -/D [1546 0 R /XYZ 56.693 281.04 null] ->> endobj -1576 0 obj << -/D [1546 0 R /XYZ 65.161 281.724 null] ->> endobj -1577 0 obj << -/D [1546 0 R /XYZ 56.693 238.485 null] ->> endobj -1578 0 obj << -/D [1546 0 R /XYZ 65.161 239.168 null] ->> endobj -1579 0 obj << -/D [1546 0 R /XYZ 65.161 228.21 null] ->> endobj -1580 0 obj << -/D [1546 0 R /XYZ 56.693 184.971 null] ->> endobj -1581 0 obj << -/D [1546 0 R /XYZ 65.161 185.654 null] ->> endobj -1582 0 obj << -/D [1546 0 R /XYZ 56.693 142.415 null] ->> endobj -1583 0 obj << -/D [1546 0 R /XYZ 65.161 143.099 null] ->> endobj -1584 0 obj << -/D [1546 0 R /XYZ 56.693 99.86 null] ->> endobj -1585 0 obj << -/D [1546 0 R /XYZ 65.161 100.543 null] ->> endobj -1545 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1588 0 obj << -/Length 2169 -/Filter /FlateDecode ->> -stream -xÚÍ\Ks㸾ûW°69ØUQ/Þ¤rÈîf“¤2ö!U³{ $Hb™"µ$e{æ×ɱDK6(Ú=¸H‘`³ô×_£Ñ4Š–Š~¸úæîêëï9Š4hADt·ˆ!#…)PÝÍ£×LjâÒÜLG×ÿÎ+S6§‹¼hNªU{ó»|öMžß7?þwûóͯwïìk&ƒæ¼‘v[}JM¹2¦*ëÛöí8Röí‚ÖogB‚$*špв}?¡V T×_7LDýàÕ?ï®~»ÂV<ŠpÄM#©1D¢Ùúêã¯(šÛ{V`ZE»–ëˆc„ -{žF·Wÿ½BíH ƒ!‘m&¹Þ I'œiÀH4J `;-ºÇ¢ŒºþñîýÏm¿öGÕa@Eûô]7b‹5Eu3vTo«øS•g½™`b¦IY•ðT¦0k\µ¼úðáYXcÆ’DB)P’×fQ_çÈ­tT˜h±oÒŽ_}ù)Acѽ ŒëÖ¾ò9`ûò9²3`GÊå û ‰AÙÀb5'ZÐLe§¸Â@ëÉ:0ó x)Ë"©žòÂÌ·Ù<Î*·æ©[Ë8sÔ JªÔ8ʬª"™nk×èÔ>Ï{e Ý­¥EáÚ¸V’•É¼×µ·AT›—álüP¾§{+;ÀÆ¥eÖÒÛ}9ÃÍ™ã\P;0š¤,‚S·ò=áì­ì8 -Œ4“ømž=ÔVæFiêÖpf[:…ìÜD¦qy -÷Gžy&¬‘Õг|½îÑåë]ëâÛ¡#QåCd—’…С|Oy+;@˜XG¹Ns¹ÝlrW¤Í“¢?Ã99ÃÇÃ÷ù#ĉ‰cœøÂæOGžÛj³;êpö|mÐsv„µ‚y0ÌõäûaÎ_Ù˜³šòn™ýý6]$ÎŽxaâj[×UÙo[Ó[“´·þ„µ¦ŠR÷¹ä@ˆ¸d´É%ŠÉ¸ÑælµÍî' M ÈIp{¤L‡ ð8Ç@u8¨ˆ÷DŠ¯ªî@ᜪJòäföÓíò¨ÉÉáôu"y,r×Ü„]·ÜL î)„|áè0’¥õ#«¹C‘O”ç€8†€Q‡ò=!á­ìL0 -ë+ã8eU\,M5v€’ŒlX±kü9µQ¥]òçŧ‘óˆó©{ï-o›,^;²ñ¶ìeS‡„RTcô¢ô‹p¢Ï ßwIq7ìû¯¼4÷÷®’å*µÕâEV !Â/Ó -—(íÉ÷ó3þʺû¦(Ý&JÊfé¶NÀKN_,"qåÜÝV—SËÇØÑ7•Éz“&‹ä$:O=øŸ,ý亃਴UÅy]íê{³üѱ¡™™²Œ{.u€—bÀMIﶠ »Hhʻˇiçy>›æù}¿Ñ¤ÙžÆÅ~B:ÞVy2 -žf¼÷€ÙhÆH.Ý“ïé3½•à39$ÏÈF/¶Ùnÿ¢¼É+©Ð‡8Ië-Ž‘ÓCYßþ®FiúùkªÙ?üº÷tÍ5Ú°iàÒQŠ„Ëõöä{š§·²Ì“j°¾¤±ÏÌ8ÒŸ͗pÍi±wÌ€`ÁhV¿‰‹x=î¥z™Qs'HJ@Q~Q‚DöÁgäûx[$Õ熻ޙ8+Ÿr“ ˆá©¶*pŽ¨²]Ðá²g=ù~€÷WÖðT J~ÉŸ¹–óØ°æ¼T›?ý½hõuöY™zõp.©€¬?¼ © €´<ŽßÅɼã·Ö©™¢Ãâ2ÍwQûDr -˜²€ˆdõ1ÜÖOO¾'"½•€HÆí¤ÒnU]™"‹ëÀ/N“Ï®èÜÔÁâ6®œ—ã®Ô¶³¤Ò˜‘SjØ8-ó¡­#uÑm'ŠIÕÀ¶KÁ:Ǹ÷sšæ³û!øE( -¸E4Êq0üöäûá×_Ywü­@ÐvGê}îº{t+ý4`\õ¿S¹ÍŠ%ŠÕá¶qzò= É[Ù†¤$Ù¦×ÿ1Ÿ»:ë)âÔ\¾Âêôrh½Ic×Ò´ÇU2[¹Æ Î*¬Ì™eçÏuEo²¤ÀV`öä{²·² Y -èèrx©×ë¶ÞVfêZk•åÕȦù²$ôíî Œ¥ˆ=²€%=ùžì«ìi{µG)ºøqtھرõþD¤ÎG 4J畳yŠ­+6G²±Ø™­¹¦.šŸ"T—ø÷ý䌫 -˜¡"˜ƒ`á2T=ùžØóVv{`{éùÛUJÌ=æÚ9øN»ÌŽÓŽØ±åcR­\{õ2yþ÷¯N»¨q>%°7¾g·æheøÛøCÌ:ƒ€ËÍCùžððVv<¬'Ò]¤‰ËÄ8’Ál[Vù:ùÛUt¦ƒzœ¹$`©@*5.œ‘!ÅB"?BÆ\‚á>BîÉ÷3yeÝMÞþî>2¼ò¡I^ä:WýQ“¢ði‡ ””Å'Åö õ ¨kÇ „p@tb ˆ…K[õä{¢Ó[ÙèÄ hWúS6 ÂnHÎê©FòÀuRa⢨«®E1wåR×jÆM‘×tÉË$“3 ‘Ä/Zæ«ì¼R=.žŸ -³€~Ñȱÿà ¡Ïù0ÿ6¯@N -endstream -endobj -1587 0 obj << -/Type /Page -/Contents 1588 0 R -/Resources 1586 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1433 0 R ->> endobj -1589 0 obj << -/D [1587 0 R /XYZ -16.307 900.716 null] ->> endobj -166 0 obj << -/D [1587 0 R /XYZ 56.693 759.068 null] ->> endobj -1590 0 obj << -/D [1587 0 R /XYZ 56.693 738.489 null] ->> endobj -1591 0 obj << -/D [1587 0 R /XYZ 56.693 691.479 null] ->> endobj -1592 0 obj << -/D [1587 0 R /XYZ 65.161 692.163 null] ->> endobj -1593 0 obj << -/D [1587 0 R /XYZ 65.161 681.204 null] ->> endobj -1594 0 obj << -/D [1587 0 R /XYZ 56.693 633.696 null] ->> endobj -1595 0 obj << -/D [1587 0 R /XYZ 65.161 634.379 null] ->> endobj -1596 0 obj << -/D [1587 0 R /XYZ 65.161 623.42 null] ->> endobj -1597 0 obj << -/D [1587 0 R /XYZ 65.161 612.461 null] ->> endobj -1598 0 obj << -/D [1587 0 R /XYZ 56.693 564.954 null] ->> endobj -1599 0 obj << -/D [1587 0 R /XYZ 65.161 565.637 null] ->> endobj -1600 0 obj << -/D [1587 0 R /XYZ 65.161 554.678 null] ->> endobj -1601 0 obj << -/D [1587 0 R /XYZ 56.693 507.17 null] ->> endobj -1602 0 obj << -/D [1587 0 R /XYZ 65.161 507.854 null] ->> endobj -1603 0 obj << -/D [1587 0 R /XYZ 56.693 460.346 null] ->> endobj -1604 0 obj << -/D [1587 0 R /XYZ 65.161 461.029 null] ->> endobj -1605 0 obj << -/D [1587 0 R /XYZ 65.161 450.07 null] ->> endobj -1606 0 obj << -/D [1587 0 R /XYZ 56.693 402.563 null] ->> endobj -1607 0 obj << -/D [1587 0 R /XYZ 65.161 403.246 null] ->> endobj -1608 0 obj << -/D [1587 0 R /XYZ 56.693 355.738 null] ->> endobj -1609 0 obj << -/D [1587 0 R /XYZ 65.161 356.422 null] ->> endobj -1610 0 obj << -/D [1587 0 R /XYZ 56.693 308.914 null] ->> endobj -1611 0 obj << -/D [1587 0 R /XYZ 65.161 309.597 null] ->> endobj -1612 0 obj << -/D [1587 0 R /XYZ 65.161 298.638 null] ->> endobj -1613 0 obj << -/D [1587 0 R /XYZ 65.161 287.679 null] ->> endobj -1614 0 obj << -/D [1587 0 R /XYZ 65.161 276.72 null] ->> endobj -1615 0 obj << -/D [1587 0 R /XYZ 56.693 229.213 null] ->> endobj -1616 0 obj << -/D [1587 0 R /XYZ 65.161 229.896 null] ->> endobj -1617 0 obj << -/D [1587 0 R /XYZ 65.161 218.937 null] ->> endobj -1618 0 obj << -/D [1587 0 R /XYZ 56.693 171.429 null] ->> endobj -1619 0 obj << -/D [1587 0 R /XYZ 65.161 172.113 null] ->> endobj -1620 0 obj << -/D [1587 0 R /XYZ 56.693 124.605 null] ->> endobj -1621 0 obj << -/D [1587 0 R /XYZ 65.161 125.288 null] ->> endobj -1586 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1624 0 obj << -/Length 2279 -/Filter /FlateDecode ->> -stream -xÚÍ\[sã¶~÷¯à¤݉Op'ÑNºi“L&éeíΤ³É%AÇ©%A_2ýñ)ÊkÑ–} Ú}%‡‡Äw¾ó ‰®"}öîòì›ï$‰4hÅTt¹ŒG åÀãèr}xóÞä&­ÍÛs&É›”ÖÔÛÃeYmìªÿóoåü]Y^o¿ürñÓÛß.t—9§´”[kö>7õÊ[·»«Ó(qWW¼½ºP1Ä,‰Î%踿>Î`œ¼ùfûA™jO<ûûåÙÇ3êÌ“ˆFRÒ<Š5EX4_Ÿ}øD ÷Ÿs„N¢Û®å:’”ãÊçÑÅÙ¿ÏHÿ$ˆs±=l?¾dÙ=³((Q­åöwIœŸBE t¢£ÊD˃¦°à Pï.°5LÛÖ¡ö%PE‡ö%¡«u…ÇYfzg;ƒÕU´=xß#Ñua‡Ñ!±w\P¼GÏi±ÈM×ÿ‡MEÎqø̪ÚZS­qÍóìiø*/ëo8+píÖåbßw¿ùªÿåé9oî*³¶??ÜÜ–ÃÆ_Áö—½Ú «lº®Iø|>Í?»H¦ ˜Û^ÿ•1¹çü) eÒ§«rf*û¶{¤6½·eñ§·ç”u]\ÛîêüÏÛ¿Wv?ú:ËËùuûûXˆó1¡ÓååÒgl²œ0°–ÂÅ祸®¿ÿºX˜.¬YoòÔ"üH×XÃór½.‹a|Áá`l‘çÑ<µ¶ÊfM;ôân´Äµ+»iì~ÛWa¯ÜuÇd¨Ü·ˆÊ`g=P™pP²‡å0!„ºê‘˜„Ä9º#Sȸ½Enanq ;Äxp¢…Y¦MnótfrÜnÒ¼Á2¨y{v•"³MѬ]´`smmæ6+‹Ú—›Q -ŠÑé0¾o?äÁÎz œ -ÐDoQŽNü~}öÑ¡ë™N;X4¤Ha`f°tÍ]¾¸j²z5pùÅHÚ&ì‹Ôfõ23Þˆ#”š°FÝ·ˆ¸`g=Gx{n¸ïLj› -ÙïM¤Avýº’‰eRÇ bqJ6!cá:h\2±I«t w·fÖ+5óUS\ŸÏË…y$ßl[9òÕoõ±Gwç,ÓÚ>úíÆT3‡{g{«E»[ÿäH4HwØû÷+!ÔùCÉÃÝ!»B¹ç¢ãéØ”>½Ø Äpgñ(e ”õüOmFæ-ìÅÁF1œâAø…æŽmûHJ7iæ¸VLÇÖiöiæzMŽXuš>rÐü%ÍÑÃfsul&%Dè“æMƒÞMsŒ•8ÓÆ–ÙâΣ“Ô¹³ Ó”³HètêáÀ~`š -vÖ#M9»œPß4…©Ób¾*«zdEoSeë´º÷ŒyWÞ”®Üó>ÍÜ­ ‰lhÿ°Zµ8²,|5ž„V@ät2äÀ~ÜÃÅÃ]h \ôªÓ¢ÙäÙ=3ã8^•aGŒÛÌ®°õÓr骽Ž t¡çÊ·©e¬Òƒ {ìí=gä1² -ͨ“ê›"&@%›¸$y¨>°B9¯’ ÕN!40>]âÙ3˜wB]õH;’¤¾jçÅ@V,Ìaϳâºöhÿt½Ç‹µC'7ÕBô¤QÍ8pÕÉÀŸ>‹vÝœ’F5a >­C?¬÷íÆu°³M¤ÃE¿`è_ù÷ôûªl®VŸi(-¾DŽeþ~Ûú2g®)ˆ Dì‡!=ÜY<Ò¹víí‘ÃÍ‹ôÚl£Ï—•…Á.¾jòvm@q=®Þ…N ;ó„€H¦Sö£&ØY¨I8Ä»‰‰ÿ–Íq¥›;÷/P®Ï…B|ydò‚?~ÉôÌÌÓ+áSJæ;¹É•ÉôtÑ´o?0š‚õˆ¦˜AB{öízj1.ž7y:7#Cf…P:îâ~´›ÖÅ R¢ÍËÛ£‡ ‡yÒya.8(¦>÷üçÎ %¦+Ð8cO¸ît`?0e;ë‘2˜½[wŠV^êf³)+;ò¤:ÑÂϯæŒ!YÝ®²9²TÞ¸±>³Þã-¥]8N<ûöƒ'ØYà¡ïÕMeæYmðdsä]#d®wŒüáò矎߷r¨m•ºhGç,¡õ—38™PÎØ·í`g= MØWÎðJqÏî«ÁR%¦EÐ'ÝüÈbIrÌæÇŸÓ¦Êìï[²ô£I‹úYªï‹rãA•˜ nod’»»˜nŠj`?,$ÂŇ“10é½½±Ý@œ´òíµM­ÊòÙoÿ;ÌVÊ2+Üh²–|¯eîæf2kÅ\IBÈtK‘öñì¬þÚé<Ý/Eú6/kìZ‹§KîúeËŠq—¥ðC€PyÒ”Kc »ÕWŸqs÷Jy2]Ò¥Z¹Ïé$­ý0Ї;‹=ÕÚuk¼G±/ƒ¨ÑëúS}Põ¼/¬ªÇUjŸ¿^Ÿý17¦À–Ø–ÙØO (Øâ×Èø¥‰„ ßØ°o>0¸B]õˆ­$IúU7^â>ëô~ÜÍT•éÖαä -.ãš]þó[$ßBò²çÞƒ©«G˜šnWáÀ~ ¬ƒõÀuƒý®ÂwÆ‘dß×7  ^ŸI‰[lJôÑQf÷cÏtñ¶‹ÖÛVó1#?­ÂWó¡Š'Ó¸ûqì¬GÜ´ÓO›q=fÛ–_NïO"6QE€Ó“NÌQƒ˜f%ö¦™ó€O¸5’R"žnQÌÀ~`;ë‡T;O•çœ\úY&Ï¥$øí§ÿÞ+Ԡľçð.Ha”0©:EQ"9éÞHM@ÆrÊÕÛz¥ô1¯ý?ö ? -endstream -endobj -1623 0 obj << -/Type /Page -/Contents 1624 0 R -/Resources 1622 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1662 0 R ->> endobj -1625 0 obj << -/D [1623 0 R /XYZ -11.232 900.716 null] ->> endobj -1626 0 obj << -/D [1623 0 R /XYZ 56.693 759.068 null] ->> endobj -1627 0 obj << -/D [1623 0 R /XYZ 65.161 752.393 null] ->> endobj -1628 0 obj << -/D [1623 0 R /XYZ 56.693 704.886 null] ->> endobj -1629 0 obj << -/D [1623 0 R /XYZ 65.161 705.569 null] ->> endobj -1630 0 obj << -/D [1623 0 R /XYZ 65.161 694.61 null] ->> endobj -1631 0 obj << -/D [1623 0 R /XYZ 65.161 683.651 null] ->> endobj -1632 0 obj << -/D [1623 0 R /XYZ 56.693 636.143 null] ->> endobj -1633 0 obj << -/D [1623 0 R /XYZ 65.161 636.827 null] ->> endobj -1634 0 obj << -/D [1623 0 R /XYZ 65.161 625.868 null] ->> endobj -1635 0 obj << -/D [1623 0 R /XYZ 65.161 614.909 null] ->> endobj -1636 0 obj << -/D [1623 0 R /XYZ 56.693 567.401 null] ->> endobj -1637 0 obj << -/D [1623 0 R /XYZ 65.161 568.085 null] ->> endobj -1638 0 obj << -/D [1623 0 R /XYZ 56.693 520.577 null] ->> endobj -1639 0 obj << -/D [1623 0 R /XYZ 65.161 521.26 null] ->> endobj -1640 0 obj << -/D [1623 0 R /XYZ 65.161 510.301 null] ->> endobj -1641 0 obj << -/D [1623 0 R /XYZ 56.693 462.793 null] ->> endobj -1642 0 obj << -/D [1623 0 R /XYZ 65.161 463.477 null] ->> endobj -1643 0 obj << -/D [1623 0 R /XYZ 56.693 415.969 null] ->> endobj -1644 0 obj << -/D [1623 0 R /XYZ 65.161 416.652 null] ->> endobj -1645 0 obj << -/D [1623 0 R /XYZ 65.161 405.694 null] ->> endobj -1646 0 obj << -/D [1623 0 R /XYZ 65.161 394.735 null] ->> endobj -1647 0 obj << -/D [1623 0 R /XYZ 65.161 383.776 null] ->> endobj -1648 0 obj << -/D [1623 0 R /XYZ 56.693 336.268 null] ->> endobj -1649 0 obj << -/D [1623 0 R /XYZ 65.161 336.951 null] ->> endobj -1650 0 obj << -/D [1623 0 R /XYZ 65.161 325.992 null] ->> endobj -1651 0 obj << -/D [1623 0 R /XYZ 65.161 315.034 null] ->> endobj -1652 0 obj << -/D [1623 0 R /XYZ 56.693 267.526 null] ->> endobj -1653 0 obj << -/D [1623 0 R /XYZ 65.161 268.209 null] ->> endobj -1654 0 obj << -/D [1623 0 R /XYZ 65.161 257.25 null] ->> endobj -1655 0 obj << -/D [1623 0 R /XYZ 56.693 209.742 null] ->> endobj -1656 0 obj << -/D [1623 0 R /XYZ 65.161 210.426 null] ->> endobj -1657 0 obj << -/D [1623 0 R /XYZ 65.161 199.467 null] ->> endobj -1658 0 obj << -/D [1623 0 R /XYZ 65.161 188.508 null] ->> endobj -1659 0 obj << -/D [1623 0 R /XYZ 65.161 177.549 null] ->> endobj -1660 0 obj << -/D [1623 0 R /XYZ 56.693 130.041 null] ->> endobj -1661 0 obj << -/D [1623 0 R /XYZ 65.161 130.725 null] ->> endobj -1622 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1665 0 obj << -/Length 2304 -/Filter /FlateDecode ->> -stream -xÚÅ\Ýoã¸Ï_! Í ߤڢè^Û½âz{@/y8`÷d›Ž…•%Ÿ$ç£}G¶¼Ëq<4E÷!°¬PÃ5¿™ß G¦É}B“﮾½»ú惢IJRÍur7O4'Ú$– "Lr7K>]ÿä -—5îÝ WôúǪuÍöp^ÕÛƒvÑÿóÕôÛªú²ýòóíï~¹û¦¹aŒ¤Jm¥Ý¶Ï…kεM÷o˜%f×¢›]jC ·É"©éçç -{ýÍöƒqÝ]xõÏ»«_¯ˆ§ K”&:‰IÑ”'ÓåÕ§_h2ƒÿD¦6yÜŒ\&ŠQÂ…†ã"¹½úÏíW‚‚ŠÝa÷ñÝ É°ÌðÄÈ”0ª;ÉÝyEAO©NR›&µKæGEa'–0ivl³nt¨|E˜fCùŠ2b´EÍðr™5Iy:‚²õ}²=ø©·Dx„[Kì—ŒHÑ[ÏÕãæá—“|ºÑ”^?ÕnŽÙV¸q¿få,se[?ãÆ?æE¹páT] ÙÄ!'p/á®pƒó7.C.éÚ5m^!…vþfoàžeí¹ƒ¦¸!ÌÚx˜Ú—ˆ©`e=0%À)½ÅÞªòò ÒPÝÖ¢(Í‘òYƒX•ûw A¶'f% KÓXpäó0½üÌ!$¾Ô}ð-‘`…´ÞÕÄÕí»Í=߶Ùs[•zwÃøΣ5®%OMñçíˆE»,º¯È•Ðoçñ¢¢¶”¸«XÈCp¸²xk+ˆê´yƯ]Ö"AܸUV£G·n¹*²Žòç¢ œVËÕºÍËûÑãY5{)ØÍ£óSZ§DRÏÊ÷åZy°²Vn IùÖÊÇ&¯ó9˜èý‰cBÆf=] Ñ!omâÐŒr62bÑ,!+Ú±IÓØec…¦¶šz"¥AƒÔÄ‹DJ bE¼šß@~jÕţV)C×»=Ç:Gªi”jA[Eˆ†X‡ª¶Ï#ß?6—ZU«u·N³3ç?2ɉ5i<ìËA°² >gA»‘³rõ2oÑÏuZ•]Ü ¯]¶ñ¸·ÙÒœÝUëµ]Ôœôƒ‡Ï0÷ÄÚe¨ªf)áÔnÍòneóü ëk'ëûÁ#ÛœþSp?:}›o£Íè_w@ºÊu»Z˜‡5ì¢Ü‰jB™9ƒ<}ÌÖlÿ»eOß»¬l^°§¼-Ü*»™ÛwÅñª”½87Ëò&¯ÊWJý×ß$í…aPL½PLÚ”Û©ö™Rš0úõˆmpA¦°&JÅcsÒ*BÓxe·ü0‡®,ÞcHk‰°}•éýl†937.;[@6ŽM«²é—²z,Üìþ•(Üu0ézÆÝÎYeÞùvxî.¹ÃÊý:/kµª«©kÊÿ§‘ ™!ñÚò¬¬ÐŒ!’÷ÕŽ&_æEVÏãBЛO³ƒÝÈÓ¶öËLϾ…)[­\†$ Øy]aѱ̀u{Wç­÷N­Ô>ãUòa¬¬L`NøÛÂ$+Ÿ} ÿl&(5%Ì^´G -C¸QcïðÌÜ“G!MrC‹Øz#™&BÅk½È4õ`e=L¥DKö[!­ÂÒVu¾ÌêçÜ{kÅM«rvxe8¿Øæ‚#Uø^ã§@i¼®™ü@ VÖÃ@©%Úö]3e×æ„í³Â6Z¼Z -·ÆƹÑ-dfESycËRj×Õ¦±é×0•9iä"•DŠx ð@~˜‘‡+‹7r‘voŠô ð±êÖ6Ò2¦mÊ8–Qˆ”)/Ú3"´%JŒÜ3’­ÛÊosN(P#âÞœ†h¯Kd ?Иƒ•õ0fE‰Mû.‘ùҵ匃‘ßÞ@ïw­êj‘à\ê.¤$ |I q0‰]¡}, =¸zIÌÒiŒmî5Ô(%ÆÆ«ç äB-XY¨QIè.y{?›EØ‚Fo—üí1Ÿµ ôÞây;='˜Ë«q“SÆÐX ó.§ö’@æFkå¸@†·ÌŠÁë0íÄç®%˜4‹l®Ü—ˆìü0`‡+‹6W†ìê´èzt[Ü“ôí¿ÛÙf'‘ EYµI3:µËÚ¶Î'ktê>­ê˜Eqvë5N“^¶½sKèÈím]O+DöG7ÁÞ7%bv¸qÈ"v¸ äz€`e=<È•»·Õ²”Ðu anŽ‚ÿz‰ÞDÝXÏÙªÂäEKÛÌ2ÂÅ9¥í»¨Ìæ¦?d‹â¾v_!T»ùæ%0Ê èaD<1M‰`ñªÛùa -W"¦Ñôku{‰†òžzdö/Ç‘¹bí¯o‡ð¼lò™‹< : L‹¬i^Óç3Uô ”a=ÒϬ’QC$É #J÷Eˆ?› ÌÎèäÅȼ|ÈŠ|æY^Å+ŒgYM^ÒX7l7)¸º¨¿–žÜ‘ß±MgËA ñí0Æ‘6^;ò@~ ³ VÖÃÙ2MÌîwŽÂ“–T*køÛÀC¿¢YØ·ÕVà²ÚE]­ïãn3M«Â£Bnh}îÆäiŒPNT¼¬{_| ‡ªêa¿TËúrªg:<ö›`eå19XÖzYztÞ_»§Ö• ú#°ýzÙC–øå8Øö> endobj -1666 0 obj << -/D [1664 0 R /XYZ -16.307 900.716 null] ->> endobj -1667 0 obj << -/D [1664 0 R /XYZ 56.693 759.068 null] ->> endobj -1668 0 obj << -/D [1664 0 R /XYZ 65.161 752.393 null] ->> endobj -1669 0 obj << -/D [1664 0 R /XYZ 65.161 741.435 null] ->> endobj -1670 0 obj << -/D [1664 0 R /XYZ 56.693 693.927 null] ->> endobj -1671 0 obj << -/D [1664 0 R /XYZ 65.161 694.61 null] ->> endobj -1672 0 obj << -/D [1664 0 R /XYZ 65.161 683.651 null] ->> endobj -1673 0 obj << -/D [1664 0 R /XYZ 65.161 672.692 null] ->> endobj -1674 0 obj << -/D [1664 0 R /XYZ 56.693 625.185 null] ->> endobj -1675 0 obj << -/D [1664 0 R /XYZ 65.161 625.868 null] ->> endobj -1676 0 obj << -/D [1664 0 R /XYZ 65.161 614.909 null] ->> endobj -1677 0 obj << -/D [1664 0 R /XYZ 56.693 567.401 null] ->> endobj -1678 0 obj << -/D [1664 0 R /XYZ 65.161 568.085 null] ->> endobj -1679 0 obj << -/D [1664 0 R /XYZ 65.161 557.126 null] ->> endobj -1680 0 obj << -/D [1664 0 R /XYZ 65.161 546.167 null] ->> endobj -1681 0 obj << -/D [1664 0 R /XYZ 56.693 498.659 null] ->> endobj -1682 0 obj << -/D [1664 0 R /XYZ 65.161 499.342 null] ->> endobj -1683 0 obj << -/D [1664 0 R /XYZ 65.161 488.383 null] ->> endobj -1684 0 obj << -/D [1664 0 R /XYZ 65.161 477.425 null] ->> endobj -1685 0 obj << -/D [1664 0 R /XYZ 56.693 429.917 null] ->> endobj -1686 0 obj << -/D [1664 0 R /XYZ 65.161 430.6 null] ->> endobj -1687 0 obj << -/D [1664 0 R /XYZ 65.161 419.641 null] ->> endobj -1688 0 obj << -/D [1664 0 R /XYZ 65.161 408.682 null] ->> endobj -1689 0 obj << -/D [1664 0 R /XYZ 56.693 361.175 null] ->> endobj -1690 0 obj << -/D [1664 0 R /XYZ 65.161 361.858 null] ->> endobj -1691 0 obj << -/D [1664 0 R /XYZ 56.693 314.35 null] ->> endobj -1692 0 obj << -/D [1664 0 R /XYZ 65.161 315.034 null] ->> endobj -1693 0 obj << -/D [1664 0 R /XYZ 56.693 267.526 null] ->> endobj -1694 0 obj << -/D [1664 0 R /XYZ 65.161 268.209 null] ->> endobj -1695 0 obj << -/D [1664 0 R /XYZ 56.693 220.701 null] ->> endobj -1696 0 obj << -/D [1664 0 R /XYZ 65.161 221.385 null] ->> endobj -1697 0 obj << -/D [1664 0 R /XYZ 56.693 173.877 null] ->> endobj -1698 0 obj << -/D [1664 0 R /XYZ 65.161 174.56 null] ->> endobj -1699 0 obj << -/D [1664 0 R /XYZ 56.693 127.053 null] ->> endobj -1700 0 obj << -/D [1664 0 R /XYZ 65.161 127.736 null] ->> endobj -1701 0 obj << -/D [1664 0 R /XYZ 65.161 116.777 null] ->> endobj -1702 0 obj << -/D [1664 0 R /XYZ 65.161 105.818 null] ->> endobj -1663 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1705 0 obj << -/Length 1829 -/Filter /FlateDecode ->> -stream -xÚÅ[KsÛ6¾ûWp¦=È3‚7ÀÞÒ$N§MÚ©­Cg’( -–8¦•¤b»¿¾Ë‡‹–âe(:'R¸Xû}»‹i° hðöì—ÙÙ‹ Eƒ„šë`vhN´ ,D˜`¶>L.]ê¢ÂO¹¢“?|éŠæöÚçÍM¹jÿ|íã_¼¿i~ü}õîüŸÙoÐÍ”1*ÕH»*ïSW¬œ+‹êoèz×¢ê]jC ·ÁT‘дýs ¼h. ~Ëgofgÿž1O(Mt(2¢)âõÙ‡h°€ÿ@"CÜÖ-×b”p¡á> ®Îþ:£íLУ3²“-C¨ntúȹªµØ½öâšÔãÕ;–Hmáºñûh›'åçSMéä7e…Ï~>Ÿ2?ç©oÈ]‘6Ò`ž*Õåíþa]˜á …Õ«çŠÂ|IpÚ0È]pýpH{Ò?}Ü·„Y¹ë ̪ÖCå+Â4ëÊW”S…éáárkòðÊÖóeÐÜ\¶ë¿·–;Å#&¨^Ò—‹…[ìÀcIÁ‡zÁ‹ífãó׸ªaßdþ6u‹¥[»¬ÁÒÓo%Rz^&qêöè ÖH™!ñlh_þ@¬lâ”(&Z&ìcØ•›WüÛY¶íƒÇ¯L6VÜ­£$CÚYé‘Ú:¤=>‚[/k”5ã Ì#×£¾Bƒœƒ¯¸ôsKRúªŒîË/®"^m³›iì×kŸõðÚ‚.z<‡¡ 8XÊF{Gþ0°WvmÑ ¾^׋ä ‰í²cèõ㘱†isÊ-KÄ>Ï]ŒÄôÊ#–îîÔ¬ðk$ø}šd7Å·¢_CD)VôKY‡œ'Eÿ¿Q¶€(¼ìƒ|!‰jDèsA”ÑãA_þ@èV¶ô¹&¶zr -è3%áb~ -ú¸Nj;‚ˆ1¿?qȈk6ûóUÉ?}}`ÛÉ 6 -®s®$»ö=¥2)! žÏs÷ ÉZùÈÊì‹š $öÌŽ‡Õ}ù±:XÙXeŠ„´Ý€·t2³ó×HÈm]Q&>ëiø R|ô)JÒh~4];öÞÖDwÛ:¸I -¼Õ’®‘ÉÅ'—0ëß9Ðh0ÆgŒ”ÕÄ05BÞPú¸Gä~’ÅÇ‹€Ï„b46êÈÆFÕų‘Ò!¡–}Þeúž{LK—¹<*“lÙ#PÇ5]De4°äp»rÈ(d[ µÝÁÏš“ÏêO& -®–Êg%’]úÙ‹K~wI¹j¨ä"Z¥ËÜ}æàÔ9Xĺ—pЌ۹„UãÇã’}ù¹d°²=¸„s•îÉ%sW–ÉŸdèÆØMÁË7/_¿sb.ûûêÝì×w=cfU…†ö91+CA¨Öß´Ò -Âèˆe&ià*Ç+3uäípeñ •F)ve¦ÌC`ŒÝQ—ŠÌ°‘Br‡v§è¾(·›dѵ3lb§Û…+°õ³Üȶ›ÜÇ®(|^J>RE‡ WÑÏ°mQtE0õÀLò²Õõ©¤MxêK#SW*Û6S,æ5#ÌŽWµëÈÉÁÊ" iÄâú’0ŸmÕ.wU¤-þΑ»lW>Çn´]&ôxõ(Û;dØ•V–°Ð<«cŠp+¾¿c㊈[É$z¼jXGþ@ V¶‡_c†hÙ¦#ï}ŽÝºuÑÍéÐmt•ˆu–‡"Ì£é¯Çú)l|‹—˜a‹~K‡lGiÚ%ħÈæYër±(ûÝ9HŽX’Ú%Ìh$Ô‘?Œ„†+‹'!a(±¼­Ë½L!uÍ¢{Òâõ¦9t±a›Å‡jŸÓãœu¸žù•³IÅ© Y—Ú¾®pÑ ”šdŒ~IÈzMzÿôi¼HõnOoÎûòšó`e{˜³´ÄŠ–Èñöƒ­÷ÿ莊ÙÏ!s#½Ìœ M›(ÖßZäâ’¥žµbÎYi¥:ñWiR”EÏT°#n+°ÐÃÇ«—wäƒòpe{@™rBëýUF„u.ëMŠNÐfžÌÓÄWVÖóÌΫÔØDÿèIbËTÈ4Ô,TĈ1*×>ß’”Ц6Ú÷ë­ÿÓ´´è -endstream -endobj -1704 0 obj << -/Type /Page -/Contents 1705 0 R -/Resources 1703 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1662 0 R ->> endobj -1706 0 obj << -/D [1704 0 R /XYZ -11.232 900.716 null] ->> endobj -1707 0 obj << -/D [1704 0 R /XYZ 56.693 742.989 null] ->> endobj -1708 0 obj << -/D [1704 0 R /XYZ 65.161 742.431 null] ->> endobj -1709 0 obj << -/D [1704 0 R /XYZ 65.161 731.472 null] ->> endobj -1710 0 obj << -/D [1704 0 R /XYZ 56.693 683.964 null] ->> endobj -1711 0 obj << -/D [1704 0 R /XYZ 65.161 684.647 null] ->> endobj -1712 0 obj << -/D [1704 0 R /XYZ 56.693 637.14 null] ->> endobj -1713 0 obj << -/D [1704 0 R /XYZ 65.161 637.823 null] ->> endobj -1714 0 obj << -/D [1704 0 R /XYZ 65.161 626.864 null] ->> endobj -1715 0 obj << -/D [1704 0 R /XYZ 56.693 579.356 null] ->> endobj -1716 0 obj << -/D [1704 0 R /XYZ 65.161 580.04 null] ->> endobj -1717 0 obj << -/D [1704 0 R /XYZ 56.693 532.532 null] ->> endobj -1718 0 obj << -/D [1704 0 R /XYZ 65.161 533.215 null] ->> endobj -1719 0 obj << -/D [1704 0 R /XYZ 56.693 485.708 null] ->> endobj -1720 0 obj << -/D [1704 0 R /XYZ 65.161 486.391 null] ->> endobj -1721 0 obj << -/D [1704 0 R /XYZ 56.693 427.924 null] ->> endobj -1722 0 obj << -/D [1704 0 R /XYZ 65.161 428.608 null] ->> endobj -1723 0 obj << -/D [1704 0 R /XYZ 56.693 381.1 null] ->> endobj -1724 0 obj << -/D [1704 0 R /XYZ 65.161 381.783 null] ->> endobj -170 0 obj << -/D [1704 0 R /XYZ 56.693 344.633 null] ->> endobj -1725 0 obj << -/D [1704 0 R /XYZ 56.693 317.079 null] ->> endobj -1726 0 obj << -/D [1704 0 R /XYZ 56.693 270.07 null] ->> endobj -1727 0 obj << -/D [1704 0 R /XYZ 65.161 270.753 null] ->> endobj -1728 0 obj << -/D [1704 0 R /XYZ 65.161 259.794 null] ->> endobj -1729 0 obj << -/D [1704 0 R /XYZ 56.693 213.528 null] ->> endobj -1730 0 obj << -/D [1704 0 R /XYZ 65.161 212.97 null] ->> endobj -1703 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1733 0 obj << -/Length 2709 -/Filter /FlateDecode ->> -stream -xÚí\msÛ6þî_Áé}¨}s‚àKs—™&×´¹ks½Ä3—›¤Ó(HbC -IÅN~ý$e›”d/ BîÍô“i -\,@<Ï.»ÄÞÂÃÞ÷'Ï.NÎ_pìÅ(hà]̽€¢ ô"â#?ô.fÞ»Ó×2“¢”gÊñé+Uɲ¹œ«¢¹¨–íWÉ3¥>4ÿ¼}óãÙ/ÿÐÝLA1ç´7ÕçL–K)«Òü¬{'^¤{|Ó; BÒÈ›p‡mÿ4ÔÃèô¼ùCh`<ùîâäã Ñâ±G<  ö½0&(ÀÔKV'ï~ÁÞLÿ¦@,Ž¼ËºåÊã#êú:óÞœüû·3;3B=Ý,äq=%[á,FRúV­Åö1ïÝ„`ŒOåÏ›i;®Û³ª'RÄüæá‹í„ÍU–©3ÊO/Ó|ÑÜJ–"_l§x)Î(>ýtFøiûÄTʼ¹Z‰Y{¯R7ï¡îZ+{Ó5‰ -C3àºo¹Þ« ÃdÛ(Q[Ùeš'²÷š -ò›ë¢Y¨;ª_9Ñ/pB1Âqû"ßSÊ;íjMë—ÏŒbA´UáŸ2­–g“@Ïé ±Ì…Ì¿9›ªÿŸ¦ùy¹–ɹ˯…Ô¿•eªòòWsÓ'Ís×íæ©^rç*×-Åz™&èJ*ÛÌ$ºZeOÚ9ã·4aQŒ¸¾luy1Ñ}|}Eš«z0zm›ñ˜?ßwW¥Æ ©Äâ¼^•æ>Çz³À£(Žb¯Þüö2ìHÛw·ƒ(D\OeÛA#˜˜Ö¶ò9"éËçX¯ý¦ =܆h€b l-°XxÍÅë³¥´U<Æ(ŠHËÎ µºÝŒ ‰tíci1ÎÐÝ•o‰nke ›è>£6š÷SšÀ½Þÿ¤r¦—NÞ_kzÍ€#B&ºˆãcz¾Ü„Fƒàq"q·<äý±¹&œ=éeâGî¼gR¸ÃLW¼d¬U…»Îzâoµ±Üçª(dŽ¦•²rà¼e"_lÄBŽ?²sÜFp Såé—¾ }³±>ôÜóL•Ð8ɳÍâPè“­í»‰A¬É…•Ç8F Ç 3Ä4>†þ¹oh¸ãª®|K²²Vv[ùL{ïq‡­ Á²\¬d¹ tÃ)“LbˆCÝDfi% tLÞþpñÓÀmJ&W2¯F®Ä Þ~¬ –£HE–~Ù)ýjßÙu²SæÔxmÔÖºò-±f­,Ü—æÔGq µ\+‘õü}ÿ+è$M‘„Ó¤°8BAøØ1aÃæ»3,ÔÆ:rw0Õ“o·|í•…› -iña{(ðLŽÖ±NÓêQϦÅTARÚíí{š÷/psÖõ¸ÇØ‚€»;îéof[÷Qd¦Á=Ù(Å -Õb°ÆÉ•óÆ4ž¨Ã'æGu|Á»tå[²‹µ²Ø…™ì76ðÄi›JL£¨S?ú›ìö×ÉÓ»·àýî ½y«“ƒ##𿦨j0I™³È0<*I‘&ã’bXÃîHʵ=`î"{=ùv$e¯ì’ÂúYŸ»$)ã2ü~èiG›ÿnòcsøyÔS?4©ünòü DéÉ·ä kepå7Å'Ï3)òñwl…\l2QìæÙ§‚/d.›4—q«W¯Óm é9 -\øàj ý‚þr÷¾ÿÕó·ŸŸ~ÝJ¿½â`ðËIŒ©í¿·£¯n;wÿ¾ ùnŸ‡ •z ~'C@ 1Ö&@s/a7¥&[ÞBšWõy-PÇ°—v¤ëq]©š–M¸ed¯UšWðúzp”#ËtOîÓ=¼æI“Ÿ­2œÉ}ˆo¾Üâðß_–16à»}Žx'C¹íîË£Ø×mOQàe"$]&BÂèñÊDz'<…œ'™(Ë¥!$ÄnKC5ÊÜÒôäÛù¶öÊÂ}[¢'èº:äµ\©Oã&Òå¦âîßMiïþõ°%\÷)ûé}”]¦3鸰ÑÛe¸PDêÉåžO´9!¾7!µ«Y¿ù?êËT¼Þ­–iþIdél ­„+ w¶÷Úì!4]sçQ«`ˆ>^L¦§™J>|ܨJ®‹!e|„ÆNKc‰œ–Æôä[Rµµ²¨š’›Ò˜og3 -´+~x<òvwž^¼a°)¯ùj@üc]¨i­s¹4°fOÜžœ–àSAèj¸ÇîTåè5ç¤ÂâpX•Ó“o skeáU9ÄÈmQ~ÃÑ;kæÉÝ÷b™–Эw%õÞ{§øçðFVlJøw½®#]ȺÔ]@7új%«%ü;7%Ø•Ó*Àk6š‚P@„0w¶8ÐFÚ?j$ ÛåX'ø##ì·§ˆKh6DÍñÈ“eÏÞïaO¡11ƒ•Kèº6_«p& M–KµÉfgä€ßåReÒÊpæŒÍÑß¾¾ã[^Ë=_ øúüé>~¨¿7ã‚´é –vÅÛ™bkUá–8ŠÞÖ°à`:ƒ‰ª¶j]vœÒ;JµX _<-Ôe)‹rÜ$½UšÏš@Qƃ üÎÊ™æû ~ÈÊÿ±Lh -endstream -endobj -1732 0 obj << -/Type /Page -/Contents 1733 0 R -/Resources 1731 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1662 0 R ->> endobj -1734 0 obj << -/D [1732 0 R /XYZ -16.307 900.716 null] ->> endobj -174 0 obj << -/D [1732 0 R /XYZ 56.693 759.068 null] ->> endobj -1735 0 obj << -/D [1732 0 R /XYZ 56.693 738.489 null] ->> endobj -1736 0 obj << -/D [1732 0 R /XYZ 56.693 701.156 null] ->> endobj -1737 0 obj << -/D [1732 0 R /XYZ 65.161 701.839 null] ->> endobj -1738 0 obj << -/D [1732 0 R /XYZ 56.693 649.179 null] ->> endobj -1739 0 obj << -/D [1732 0 R /XYZ 65.161 649.862 null] ->> endobj -1740 0 obj << -/D [1732 0 R /XYZ 56.693 586.243 null] ->> endobj -1741 0 obj << -/D [1732 0 R /XYZ 65.161 586.926 null] ->> endobj -1742 0 obj << -/D [1732 0 R /XYZ 56.693 545.224 null] ->> endobj -1743 0 obj << -/D [1732 0 R /XYZ 65.161 545.908 null] ->> endobj -1744 0 obj << -/D [1732 0 R /XYZ 56.693 493.247 null] ->> endobj -1745 0 obj << -/D [1732 0 R /XYZ 65.161 493.931 null] ->> endobj -1746 0 obj << -/D [1732 0 R /XYZ 56.693 452.229 null] ->> endobj -1747 0 obj << -/D [1732 0 R /XYZ 65.161 452.912 null] ->> endobj -1748 0 obj << -/D [1732 0 R /XYZ 56.693 411.211 null] ->> endobj -1749 0 obj << -/D [1732 0 R /XYZ 65.161 411.894 null] ->> endobj -1750 0 obj << -/D [1732 0 R /XYZ 56.693 370.192 null] ->> endobj -1751 0 obj << -/D [1732 0 R /XYZ 65.161 370.876 null] ->> endobj -1752 0 obj << -/D [1732 0 R /XYZ 56.693 329.174 null] ->> endobj -1753 0 obj << -/D [1732 0 R /XYZ 65.161 329.858 null] ->> endobj -1754 0 obj << -/D [1732 0 R /XYZ 65.161 318.899 null] ->> endobj -1755 0 obj << -/D [1732 0 R /XYZ 56.693 277.197 null] ->> endobj -1756 0 obj << -/D [1732 0 R /XYZ 65.161 277.88 null] ->> endobj -1757 0 obj << -/D [1732 0 R /XYZ 56.693 236.179 null] ->> endobj -1758 0 obj << -/D [1732 0 R /XYZ 65.161 236.862 null] ->> endobj -1759 0 obj << -/D [1732 0 R /XYZ 56.693 173.243 null] ->> endobj -1760 0 obj << -/D [1732 0 R /XYZ 65.161 173.926 null] ->> endobj -1761 0 obj << -/D [1732 0 R /XYZ 56.693 132.224 null] ->> endobj -1762 0 obj << -/D [1732 0 R /XYZ 65.161 132.908 null] ->> endobj -1731 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1765 0 obj << -/Length 2204 -/Filter /FlateDecode ->> -stream -xÚÍ\Érã8½û+19¢ÆB€`Ÿz™©^¢·±ÑQÝX‚,NQ¤Š„¼ô×Or‘mÑV9!ž9‰–ÀDxï!‘HšF×¾?ùöòäËw’F)IWÑå2Rœ¨$ÒL‘D—‹èÃìÜæÖÔöôŒK:ûµt¶î.—eÕ]¸Uÿã?Ëù·eù±ûãýÅϧ]þÝœ1FR);kî>·õÊZW7?Cï,ÒлMï±JHÂut&Išôýs =û²û`\57žüëòäÓ ó4b‘TD¥"JRFåÑ|}òá/-à7p€Ä©ŽnÛ–ëH2J¸PpG'ÿ>¡ýHнá4KdÚÉÎxœFUç”"IëÅî¶èã”Î~¸üåçl¾éŸíéÈÂ@pAR‘v.w£¶,ó¼<årv›×ÝWó•)®wã¼2§œÎnN™œõw\Y[tWk³è¿såãd´}ƒÇ}3“$ižºí{åÖùêe/%%‚±]Ãy¹³_gÅÜ曑$&¢»®:”ýQ'–„ê.b¢8ï¬þɹÜk×zÛ¢ n|Ð$VzçÂyye+wz¦`t/œ¹weñÕéãðçî1Îæåz]ä®Î;³·Æróñý>PÞ,á‘ Pš6@i¾—`«ˆ“T§Qe£åSdìY{ùÛçhJ¨ÜÙï첦q¨yI˜bó’ÂLÀˆa:xÊERž†»ÚÚ«®£îâ¼çÐÞŒ>¸ ²"t7±ß,{ xnHÕÌz½ÝlJ€ªq£J¨†×¶°•q çPíË<+>âš:S][¤¿ ãÌU#¯ã>ÝS†#Ìf É=›,—’„P˜Ü.ø<¬Å*f„ÇÉN‹õ‹Züû© 3S™uý5Öÿ{5ÞòQh"¤O‹á™àÓhñÂ.Í6wÐœ[RmPänÕc ÂÀ$›NeŸ)ŸLöÃ9ÜY¼$ËD’ØW‘ûÉFÊ·ux•E Ü×-ÄpmsUvµuH‘- \»&Öõ\›êãvƒ]<®ÄXª”p*&ã½P±Ób'„Åâ9ùÅl«ÌýÝéÉOÖõ£ž\ÁF¢¶šÌA‘ÍäÌCNDû€dB9áðì@›Éädß~ œ;ë!'ð!ÔƒžX¤¢\³ÂÞâ¶kªu¶é‹þ‹÷=Àî_¸o¶¨gWne -:/ W•9Ríú˜ãõ†Y‘¹ÌäHwf¨Ÿ¯ÓI¢t:Köí²$ØY–0ý˜ß(—#ÏëÃH³•µx°··ü±²ÅÈ>¿Ì×ÃÛS«+ƒ5Æàì0áÿ¶U‰³{còíptÛþ¤’î=l/bÍ*L%û»VRØŒˆé8ºg>¢¡®z0”jBY—E~?2Þ]¹ñ\nolîG~,?*,Ò²z“›{ìzÞ¯-ƒq{]Z~ƒ¬n³#SäsÜ®ÊÜw‹Sûu6GöÃHî,ž%qš*û„ö³…äðk9 –³:Ê›¬Xs¢ÙtÉ„ý@i: 2¯|…ÏZ5gÏÛ¬^Üî¿to«ÞÆeõòY”ó:ââ„è =öì¬â$ƒêƒßwÖ¸-6ûxþ™ƒIX»c‰-D“ôM# ÎÓãY±°w¤©H«‰+I/>ÁESà [Óé‚ -!\<]äÀ~ ‚õ •9÷åßµ¥eÝ ¶\ý·ì•$z‰-gqóö\¯vXI_™›¬¬ŽMÊò4m«åÞÙ–d¯ç+ÿ³Å.žàð¸cº²U à•ñ›®Äœ’$ÿgA6gŒp9a*x Èt¹ý@¹ vÖCn¨ R+Ï ^[„6î‘F_º‰­M±Mù r­*°(F -$øŠ,tjYqÜP½J¦!’'õ¾ù0L»Š‡4K9Q¼Ož¯”)rž2—c xªqY‚/­ì<þ,——sƒü£Ëp_Çs¢‰ÐÓí—ö쬤5#Jõ‡ˆ­N}æ 1Ì’ˆôM ™lÞgùMºë¼¬ëVŠI[ã‘9{d‹DEf˜€HOLw‚8°ˆì`g=-a¼?Aü{ÞçùžÚ³"^Š~ÀÞ¸»ŸÖ®©îæ6O÷ÙÞ€ÛMZËíuY”õÆÌ-½è¬Nk²„‘Üf ·ò`vªacÁ§#¶n›ÓÕtu°«xV§6Ì“Ôžo¶`C&¯Šðu‹¯qß~…éž,ïNX±{ìYÿ¼²¶8V-tz¶uàóÙ?œ‰)¡*=æÿÍüŠ]ZU -endstream -endobj -1764 0 obj << -/Type /Page -/Contents 1765 0 R -/Resources 1763 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1662 0 R ->> endobj -1766 0 obj << -/D [1764 0 R /XYZ -11.232 900.716 null] ->> endobj -178 0 obj << -/D [1764 0 R /XYZ 56.693 759.068 null] ->> endobj -1767 0 obj << -/D [1764 0 R /XYZ 56.693 738.489 null] ->> endobj -1768 0 obj << -/D [1764 0 R /XYZ 56.693 693.613 null] ->> endobj -1769 0 obj << -/D [1764 0 R /XYZ 65.161 694.297 null] ->> endobj -182 0 obj << -/D [1764 0 R /XYZ 56.693 657.757 null] ->> endobj -1770 0 obj << -/D [1764 0 R /XYZ 56.693 630.63 null] ->> endobj -1771 0 obj << -/D [1764 0 R /XYZ 56.693 585.755 null] ->> endobj -1772 0 obj << -/D [1764 0 R /XYZ 65.161 586.438 null] ->> endobj -1773 0 obj << -/D [1764 0 R /XYZ 56.693 540.211 null] ->> endobj -1774 0 obj << -/D [1764 0 R /XYZ 65.161 540.895 null] ->> endobj -1775 0 obj << -/D [1764 0 R /XYZ 65.161 529.936 null] ->> endobj -1776 0 obj << -/D [1764 0 R /XYZ 65.161 518.977 null] ->> endobj -1777 0 obj << -/D [1764 0 R /XYZ 65.161 508.018 null] ->> endobj -1778 0 obj << -/D [1764 0 R /XYZ 65.161 497.059 null] ->> endobj -1779 0 obj << -/D [1764 0 R /XYZ 65.161 486.1 null] ->> endobj -1780 0 obj << -/D [1764 0 R /XYZ 56.693 439.873 null] ->> endobj -1781 0 obj << -/D [1764 0 R /XYZ 65.161 440.556 null] ->> endobj -1782 0 obj << -/D [1764 0 R /XYZ 65.161 429.597 null] ->> endobj -1783 0 obj << -/D [1764 0 R /XYZ 56.693 383.37 null] ->> endobj -1784 0 obj << -/D [1764 0 R /XYZ 65.161 384.053 null] ->> endobj -1785 0 obj << -/D [1764 0 R /XYZ 65.161 373.095 null] ->> endobj -1786 0 obj << -/D [1764 0 R /XYZ 65.161 362.136 null] ->> endobj -1787 0 obj << -/D [1764 0 R /XYZ 56.693 315.908 null] ->> endobj -1788 0 obj << -/D [1764 0 R /XYZ 65.161 316.592 null] ->> endobj -1789 0 obj << -/D [1764 0 R /XYZ 56.693 270.364 null] ->> endobj -1790 0 obj << -/D [1764 0 R /XYZ 65.161 271.048 null] ->> endobj -1791 0 obj << -/D [1764 0 R /XYZ 65.161 260.089 null] ->> endobj -1792 0 obj << -/D [1764 0 R /XYZ 56.693 213.862 null] ->> endobj -1793 0 obj << -/D [1764 0 R /XYZ 65.161 214.545 null] ->> endobj -1794 0 obj << -/D [1764 0 R /XYZ 65.161 203.586 null] ->> endobj -1795 0 obj << -/D [1764 0 R /XYZ 65.161 192.627 null] ->> endobj -1796 0 obj << -/D [1764 0 R /XYZ 56.693 146.4 null] ->> endobj -1797 0 obj << -/D [1764 0 R /XYZ 65.161 147.083 null] ->> endobj -1798 0 obj << -/D [1764 0 R /XYZ 56.693 100.856 null] ->> endobj -1799 0 obj << -/D [1764 0 R /XYZ 65.161 101.54 null] ->> endobj -1763 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1802 0 obj << -/Length 1881 -/Filter /FlateDecode ->> -stream -xÚí[YSä6~çW¸*‡º-%O›ì•Íæ‚IU›<ˆ±fÆÁcOlsåק} ˆmcLí¦ò@aìv«%õ÷õ!CƒE@ƒ7{ßM÷_+Xb5×ÁthNt&ˆƒi|Ø?ò‰w…?˜pE÷ÎJ_4—ó,o.Êeûðe6û.ËΚ?NŽßü9}ÃL#V©FÛqyøbé}YTat]‹jt©CrL±a;>· 04û‡Í/ÆuõâÞ«éÞß{ ÔÓ€JmEZF4åÁlµ÷áODð Қಖ\ŠQÂ…†ë$8Þûm¶+Aw®ÈF·´„QÝØô窶bóÚák©ç!«w ‘ÚÀƒZø'wžÇå?Méþ;ïÒ"K¿9˜0.ãÅ2Ÿ’Ùy>óäj•4ŠaÉ*ÝÕ¯7Û“…-b!ƒ(ÌV“­î+ -K'uÀ‰56È}0¿=»-m÷ß½;·VªÕßèe•ðPõŠ0Í:êe$„5à p{ß5±Ü7µÖ—/‚æâ¨õƒ­=ݘ-!Ò4[ûû:r¥¶\á®®àC½õ.E -æ>Ë.ÿÁj®ˆŒ|1ËãugéÖ 0‚u;®ø·Ûñ{7ô¨"†=yGÙ©ÏËxÇ¥».?o힬\¾ˆS’—>¯÷m#zûYœ¦Í3äòhÊåx¨ÔFªÕh°ìè†ËáÆâ© p€âÍοˆÐ™¹ ïJ$€OÁSp¢'¯~Å žž/p‚—KŸ"%!ÚÄé¢ ðI{ãî[û«,BH\ )¬Ši=,(³‰Ÿ—¥/m¡¡~NúÒ0´bòiùËåeÍ¢kR”  X.òiÙ$d0ÙæH•‚ËÖ ?(e`£7W¬¹B.¾uz79JleÇ#ÇmýÉq°±=ÈQ«6£þ~éÒ…ï ¨v‰¯ûn·x“–d=Ǩ±ç ݬêÓ£ÜËMO=ǬžCì”+Î×ë,/?GF0€`U*7>·Ô„çPS{ S(Bm[SܾwîïÈÝ'rC gÏ -©!\?m$\$YQD~NN“lvv¼‘Iâ¢|@ê€U¥gôH¨¬%2ãEBeLtŒ…´ŽþaPn,kʬiß2Á•eŸB؃‹¶ÇõiíU+ +¸SÐôP;µË¯‘mðþâ‰{ºâ±¥Œ"Š?k®‡[r†ª©¥ðk—»ªýÒ£¥ À6Ž˜5+©gãeÍý¹b°±=¸B/mz¾ß'.çן_GNAÁų¢„3¢µyZ”¬Ü™'×Þå$¯Ê“¢B'Æð.k?®ñÓ#d[ÿ@„ 6¶Bh…ƶ7ûsv‰sz¨?£Ä#CMå8IŸøUÛÆ@4þ²´tqŠ¥«vµBŠbƒ~äŠ%²ó—Kt‹ÒçyÇ‚œ#-¸‚£‘¯6Tö6ëÈ*6Ë6sWïVäŒÂ¬ÞnÔÚí &\µ’éæärž%ôs+¯Õ·fu“¤=ë\ºN÷/˜Úoß8õ>m®V.jïAñ|s ÚâÖÐÌH†zġ %áœm„gÙfŒ"Ng¾sî -d!‰h®óæ´–l/<‚ý²!\p"ÂÇä7ïâüÌ5ÄýcVø³ m½zñò§WX·]UvD¢PWi1Qwô#êáÆâ‰ZRPÏ[¢þ!%çE7åØMTs$­w\Ö؃‡K‡ E¼Z'ñ<öÑnÛõâ/i‚Lî²{Z²Âwê°'+)6Ȧ~æï=8^Xà])Ÿ3±¡&ÔˆGÐÓb_CO¯Ý2Yä>}C nõˆ S"¡¶õd¨ÁÆâJ(`C®n3h99~?}ûûi…‹V¾gÓZ(A„4Ï -ÁIh§B•›V‡[W‰1?dL*ùx@ØÖ?ƒí ãmŠú")}žºÒ£û”~µÆ~Ï€”+\ê±±1®R‹èžÏ8+»ºï‡ñ>}l‚ñi§‡m¥J> endobj -1803 0 obj << -/D [1801 0 R /XYZ -16.307 900.716 null] ->> endobj -1804 0 obj << -/D [1801 0 R /XYZ 56.693 742.924 null] ->> endobj -1805 0 obj << -/D [1801 0 R /XYZ 65.161 743.607 null] ->> endobj -1806 0 obj << -/D [1801 0 R /XYZ 56.693 699.628 null] ->> endobj -1807 0 obj << -/D [1801 0 R /XYZ 65.161 700.311 null] ->> endobj -1808 0 obj << -/D [1801 0 R /XYZ 56.693 656.332 null] ->> endobj -1809 0 obj << -/D [1801 0 R /XYZ 65.161 657.016 null] ->> endobj -1810 0 obj << -/D [1801 0 R /XYZ 65.161 646.057 null] ->> endobj -1811 0 obj << -/D [1801 0 R /XYZ 56.693 602.078 null] ->> endobj -1812 0 obj << -/D [1801 0 R /XYZ 65.161 602.761 null] ->> endobj -1813 0 obj << -/D [1801 0 R /XYZ 56.693 558.782 null] ->> endobj -1814 0 obj << -/D [1801 0 R /XYZ 65.161 559.465 null] ->> endobj -1815 0 obj << -/D [1801 0 R /XYZ 56.693 515.486 null] ->> endobj -1816 0 obj << -/D [1801 0 R /XYZ 65.161 516.17 null] ->> endobj -186 0 obj << -/D [1801 0 R /XYZ 56.693 480.702 null] ->> endobj -1817 0 obj << -/D [1801 0 R /XYZ 56.693 454.325 null] ->> endobj -1818 0 obj << -/D [1801 0 R /XYZ 56.693 414.438 null] ->> endobj -1819 0 obj << -/D [1801 0 R /XYZ 65.161 413.88 null] ->> endobj -1820 0 obj << -/D [1801 0 R /XYZ 56.693 369.9 null] ->> endobj -1821 0 obj << -/D [1801 0 R /XYZ 65.161 370.584 null] ->> endobj -1822 0 obj << -/D [1801 0 R /XYZ 56.693 326.605 null] ->> endobj -1823 0 obj << -/D [1801 0 R /XYZ 65.161 327.288 null] ->> endobj -190 0 obj << -/D [1801 0 R /XYZ 56.693 291.82 null] ->> endobj -1824 0 obj << -/D [1801 0 R /XYZ 56.693 265.443 null] ->> endobj -1825 0 obj << -/D [1801 0 R /XYZ 56.693 224.315 null] ->> endobj -1826 0 obj << -/D [1801 0 R /XYZ 65.161 224.998 null] ->> endobj -1827 0 obj << -/D [1801 0 R /XYZ 65.161 214.039 null] ->> endobj -194 0 obj << -/D [1801 0 R /XYZ 56.693 178.571 null] ->> endobj -1828 0 obj << -/D [1801 0 R /XYZ 56.693 152.194 null] ->> endobj -1829 0 obj << -/D [1801 0 R /XYZ 56.693 111.066 null] ->> endobj -1830 0 obj << -/D [1801 0 R /XYZ 65.161 111.749 null] ->> endobj -1831 0 obj << -/D [1801 0 R /XYZ 65.161 100.79 null] ->> endobj -1800 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1834 0 obj << -/Length 2077 -/Filter /FlateDecode ->> -stream -xÚÅY[sœF~ׯ */LUhÓÜÉÓú¢Ä»±³Š5•J•“‡虡 4K7‘Æ¿~Oß`JRÖµö@7ô9ç;·ï ß98¾óÓÕ›íÕ«cßÉQž‰³Ý;I€’ÔÉpˆÂÔÙ–Îg÷­)átã±ïþÂåúrÏz}!Žfó+Þ0öEßü~ûaóçö_ ÆÃåq¬O»§šò#¥‚ËmŽ ¤'¡”%)JƒÌñb”§F~èÃiæ¾Ò?8Hä‹W×Û«ÿ\a8Þw°'(ÉC'Í1JüÀ)š«ÏúN { Šò̹SO6NŒ}„ \×ÎíÕ¯W¾AŸ!88@9ƱTÊ%(ƉV*U:Ø—œÏö}(ª úaã…Qäb”F(4Oát‚ ù™>u{¬ ¸ýô?|?¸ßàصÐsÖ˜­Ý&ðÝá`Ö«vá%7˜‰F¯¤ÈŒS(Õº™gÝp‚²T"¥ž9V‡c ÿDÕ^}º~ýîãõŠ=^ò“ؾ4ƈŒ†sp#¿,QÛ#7àÜ\ÎZÎûíÇϵ‹D^©·Q†p4êu×W²b U’.H${ÎìÃ6Ç85"湬zª:Ë9ñWäç1ðm{"’ÕÊ Y‘û`à¨è8›Iu+À–ÝKóxÇò‚0K“õi3C^ßU⨯äã­‘†±;xaZ<à RxÊ%­¨¾–•ç½¶·’Õ8\H²îèt5‡>°kªj6Øep,v‡.ͪæÕüÕ™mËÄÑÈâ@¹KÒm”™£šª°œ•“(®Ù&(ðL".¸yÁ T–©B T2>ImCæP‹®7Cù‚JÈROæÌï°cœ-›Ýw8ÃyŽãçSMz3ìž›÷o™ŒIÛ›M“eÓ&;~°0gÆL^—lg?nT‡JX|®5\ãtCÚ/|µÛv³«¡¶ŸTz±ä ZîŠ;göÀ³À¤AxYk‹ƒ‰q°Õ0ÕZ`Y¥Œr),ËÖg^ÃM¥»<|þŽ;±¢+°Z\Š>&°?¢ -øµæ«×[ÑWšêIX·ØüP}%zå©O›$vÑS¬Ÿôî Ǥ’Ã-¯´Ó$Ù -(ÅÉúÙúKNbµ}2êó1 ìªE8\ðç -Ü@W™YüP•PŽõ¸gÃX•fjÏù4hÎ&ˆSgµñÒ@WúóH]`ðU ß0Y¨'·×r&°¥D®p2@ÍB/ëyHÏá²îõò¼À†ÊKµ52XU®…5ÚòÁh«$fÿŽáµ<ëNñ··zhÔ‰FzKʲ¶6"Ì^ä±þUé+eˆ¾ ~Wâ\ÕVºéeNTçÆöØ0®éâèb‡üöP_>l?^¢ÖÏ~{{k,¸` $Ф"½p˜ÿƶ„,íþ6½2_€hÊqÏ›Ï}#ÿ™1K¥(¢‘RIâ¿ÆsŽÜ‡ð‰$~Égpš"Fß\ÙšHÝ2HU®ˆQ’> endobj -1835 0 obj << -/D [1833 0 R /XYZ -11.232 900.716 null] ->> endobj -198 0 obj << -/D [1833 0 R /XYZ 56.693 759.068 null] ->> endobj -1836 0 obj << -/D [1833 0 R /XYZ 56.693 731.272 null] ->> endobj -202 0 obj << -/D [1833 0 R /XYZ 56.693 684.614 null] ->> endobj -1837 0 obj << -/D [1833 0 R /XYZ 56.693 648.51 null] ->> endobj -206 0 obj << -/D [1833 0 R /XYZ 56.693 618.892 null] ->> endobj -1838 0 obj << -/D [1833 0 R /XYZ 56.693 582.788 null] ->> endobj -1832 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F57 739 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1842 0 obj << -/Length 2158 -/Filter /FlateDecode ->> -stream -xÚÍ[ßsÛ¸~÷_Á¹>Tž©ü @0}:'½´¹Ü]»37“Üt` -”8¢•¤ì8}—"åH”d-EÑíC"˜‚‹Å~ß. õ&õÞ]\ß^¼úIR/$¡âÊ»=ʼn -<Íw;ö>>ÙÔšÂ^^qIG¿ºÒu3vyÝ(§Í—o]tíܬþã÷›—ܾ‡a®#¡”µ´›ò1µÅÔÚ²¨¾†Ñ™§at%ªÑ}€kïJ’0hÆ zôªþ`\U?¼øÛíÅ.ˆ§ó¤"*^2¢(÷¢ùÅç?¨7†ï@â‡Ú{Xõœ{’QÂ…‚vêÝ\üó‚´ÄZ¦FU­Ëízª±KSwÉåè!É&õ£¤±‹©?Ò¤(ë–‹ëÏhj²ÉÚzåÔ4_OÍ%§£ûK&Gð;k³º57ãæY‘d‘mÙ›‘À'´nçõ*‘•mÖ“‚q&Èp5%X !ˆ®l]Í&¶ÕÝû|Å(¥£w6+m¥ÏײY£M»€î¡äq“lÍ7ÏÒ}ŸäjlX‚ïc3í“ ¨Vo5ö¤Rt¯’>h(ĺ_äz™&Ì+'¡ŽIó}á\¶Ì Ê®œÙ¯tÐÄWz­Â/ æ_¨¤åþ§V`ê›yRN__^1¤.2©}5{$_çé_뿘™“ÔÖŽª±ªwÛܲ€{JJBÙ -ÕsIO¾ò8 uèåÖ‹7\~[Úþ§»€e©ëjÁ¬êÝW¾$L±¶|IauÀŠ˜6é@‘‡gPv%0ŸxuãSÃ[Ëü¤x@„ÏêÕÎìÖgìʬUËûs’O¦É7\çÚ?p}ãÜÍq=ÿ‘>š×õÚÌ’ÜÝow>î“>#lÕÃ'|$mÅ4aò˜šež”ßjì½·&+\Ö‚§Í*xbñHA­‡Ã£ ì4[òû᱿²ðH)‘¬É!~í¸ëª%þ¡y¸ëð££YæR;žØ9Ä™¢õóÑé2ô Q÷—#‚«üÿ­Ë&U|žàÏ–û›þ;ê‚©@%D€„ úÃ!`[~OôV)xoòîd¾H“8iÁà Õ¿™&™-Á¦Ì(SS&.k£ Ÿ>S/ŠHc%å' ä“»³yÙ@¤4åNHï7r¸æYdvŸ-ÊÝge¾ûÌÄõ³:%–Šù:$šj_(…Ô’1úÔbu ¹ l"ÂÑJ‘z8°n‰ï‰Õ¾ªv€*U°-ÓOÁ -»HUª½V rW‡cÚ¼Ú¡dol­Žw.ʼ­Ça®pH™ËÅÂåHòd2-;Ø¡¥ÄóS#ÕHa»»4ÕŽ÷T¬’– Æ‚[Õ€†}%`uE€ï­üôÛ3…õ¿/Än~@e¾/ÏV`!X‡³¦pJØxkî“qMëor3·ù:hÄΕ™+-ùZ`Ó*¿"': Q‹)#êmñýˆº·ªx¢¡$ZèC»ŠƒÌ`pÝ¢©fçåÑÈeq’#k«ªä9'´öìÜÆmNüóaÆE–#Ò$›Ù ¹ —´7q½mÛѢ¡ŸµJ図•šh`‚§Ч aê^]¨›>WH’šm†£ó“À¶üž,Ð[Y hI¨V0–OtÖÖ,J·@ú`î"[è\)‰qýÀ¹‹FKî VÙ³Â`YØx™âúÚ> endobj -1843 0 obj << -/D [1841 0 R /XYZ -16.307 900.716 null] ->> endobj -210 0 obj << -/D [1841 0 R /XYZ 56.693 733.012 null] ->> endobj -1844 0 obj << -/D [1841 0 R /XYZ 56.693 704.626 null] ->> endobj -1845 0 obj << -/D [1841 0 R /XYZ 56.693 657.617 null] ->> endobj -1846 0 obj << -/D [1841 0 R /XYZ 65.161 658.3 null] ->> endobj -1847 0 obj << -/D [1841 0 R /XYZ 56.693 611.465 null] ->> endobj -1848 0 obj << -/D [1841 0 R /XYZ 65.161 611.475 null] ->> endobj -1849 0 obj << -/D [1841 0 R /XYZ 56.693 563.968 null] ->> endobj -1850 0 obj << -/D [1841 0 R /XYZ 65.161 564.651 null] ->> endobj -1851 0 obj << -/D [1841 0 R /XYZ 56.693 517.143 null] ->> endobj -1852 0 obj << -/D [1841 0 R /XYZ 65.161 517.827 null] ->> endobj -214 0 obj << -/D [1841 0 R /XYZ 56.693 480.676 null] ->> endobj -1853 0 obj << -/D [1841 0 R /XYZ 56.693 453.123 null] ->> endobj -1854 0 obj << -/D [1841 0 R /XYZ 56.693 407.355 null] ->> endobj -1855 0 obj << -/D [1841 0 R /XYZ 65.161 406.797 null] ->> endobj -1856 0 obj << -/D [1841 0 R /XYZ 56.693 348.33 null] ->> endobj -1857 0 obj << -/D [1841 0 R /XYZ 65.161 349.013 null] ->> endobj -1858 0 obj << -/D [1841 0 R /XYZ 56.693 301.506 null] ->> endobj -1859 0 obj << -/D [1841 0 R /XYZ 65.161 302.189 null] ->> endobj -1860 0 obj << -/D [1841 0 R /XYZ 65.161 291.23 null] ->> endobj -1861 0 obj << -/D [1841 0 R /XYZ 56.693 243.722 null] ->> endobj -1862 0 obj << -/D [1841 0 R /XYZ 65.161 244.406 null] ->> endobj -1863 0 obj << -/D [1841 0 R /XYZ 65.161 233.447 null] ->> endobj -1864 0 obj << -/D [1841 0 R /XYZ 56.693 187.181 null] ->> endobj -1865 0 obj << -/D [1841 0 R /XYZ 65.161 186.622 null] ->> endobj -1866 0 obj << -/D [1841 0 R /XYZ 56.693 139.114 null] ->> endobj -1867 0 obj << -/D [1841 0 R /XYZ 65.161 139.798 null] ->> endobj -1868 0 obj << -/D [1841 0 R /XYZ 65.161 128.839 null] ->> endobj -1869 0 obj << -/D [1841 0 R /XYZ 65.161 117.88 null] ->> endobj -1870 0 obj << -/D [1841 0 R /XYZ 65.161 106.921 null] ->> endobj -1840 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1873 0 obj << -/Length 2513 -/Filter /FlateDecode ->> -stream -xÚí\koã6ýž_!ì»P3$EêÑ.ÁtºÛ™Í&^`iQÐ6m £‡W’“L}I=’H¶ì«PJ:E?E±¨Ëkòžs¼2¶Ö¶¾?{=;»x˱å#ß¡Ž5[YEŽkyÄF¶kÍ–ÖÇÉ• ¥Èäù”r<ùä2+/WIZ^ä›êæ›dñ:I>•ÿüïúÝùO³Ô4SBÏy)í:ÿÊl#ežéÛjvbyjvÇÖ³3ÇE.õ¬)G¾[ÍoS%Ðõ&åBýàÙw³³ÿŸ%[Äâr|Ûr}‚L­Etöñ'l-Õ=¥b¾gÝ##‹Œ¨í¨ëк>ûÏ®V7V„Zj˜ËýbIjáÌG;¥R>² -êǬS‚1žücöþ]õ½¯ªZÊíTOÏê[%a˜œS>¹ âuùÑb#âu½ÆqNñäæœðIõÄ\ʸ¼ŠÄ²ú,O6¢˜[iû07ñr]ý‹¹7yÐ:ˆaRZ$µì,ˆ²µÏ¹ áò:-­5WcJÕžµƒj ò±]Jý‘RÞWhZì>Ó:xˆ9^­ÂU2—i~>uÔª^çâsžÄ_ŸO UÿnE*"tw+çß”÷—Éb® ÝeaõI9DÆyõ¿þÖúv9½2G­þó}Ó”ù—ZŽç!ÏåÚôç+³dŽE‘ïùV*­ÕcËiH;üéþ®‹|âÔ”‚‰m*Ÿ#â¶|ŽÕž©µ…ÌðUò©?€²…Àtm•WÌ›_+îD1+màÕrÙ°—}9 -wz{³Ýv›(k ÖÄx›¹Æeè“ÚÖ÷ŸšD7 Ù -³°o&ß*—wÀ‘Ë •‹uM(¢ãï¾S®<Ã)Âä)dú^ì”-ÿRráRÄÙ›.6»øÓ´t;s‘f}h’)…ÆdI› ìÓñX²)ß%•íÁ’¶Š&\ÿž%¡@°a±¼…²Ø¶Ÿi7;†òF†@Ú»aãñîö±üU§.ÅC…å÷Ðÿ#=\Â=šÀjA]üåjNÕbDl{<85åÂÉXÙp¢6b´DÓì•ÀqÄZÆ2{¡Äq»ûÆ]¾ÝQräØÈM°Þ(w¾+=‚;/ñÖ×ȱJÓ\6ž‘7幩²Ý&M¨ -H+`Ž»êÛTÞ™ŠW¡Ø vÕ£ä8]E"ý´Û±xh¶‘O&öαA¤“€=r¾èþê*¹ wK™½Té,WA³H—=྇³“†Î}QÂG3ô–|3C7W¶›+My]sg/ÎýH¾mC‘Cm®Gç"ˆ¡b—Ë@§r"„æ<ë`1°{3uW=’.òñÊ&-ù†6o¬,Üæ¹gUÙäZyêíU›,‹ÿL0áÄÃÇ)¼mÑ÷{Ä÷ ‡o)CÔ/>TÊåÌEŒÜ—rÙÁRî{oÅ9Qá›J”ñDf¿íºn¤Õ]Ô’cd“k»6GØ3©í¾ÔjÈP‡%yTDe™7Rñi]–xTÓZSx#Þˆåæ:ˆÒñا%ߌ}Ì•…³s}ÄIÅ>—ÐlNhºg"bèùÛUŽnç¶ê•B}fš¬Vûl)ÀLP“JÛ] E¤²GÜ><`šò cªì><\ET«é!^€þHlö§ ž™ãÊao¼enÊ7\fce{ðwQáùõÂowé6É ©d6ì1Ž¼Û†Á"ÈÃÏÐì"Fô¯fmtþ¥;ßg‡3N¾œn÷çHZ.Þ¨ÞEUÆld3<ð5å‚ÏXÙàc*Ø®›H¶©ìQhߦÉBfàzb¾I“ÝèÏòyx Æ…‰C¿9ÎËk8,Xã\ë] -%¥œc÷5b›"{Dnˆ74aSU{X°Jt׫ -I»<‰D,DØ"ñÓ':shH,¶[‘Êì&^˜üŸs¨I¸ì -ê=QÏY™°}ŠêHQåT òr7?R‹à/_‹ÛƒþæzÌþ%õXY -›p­ ÷ôòƒ­‰‰øã•lJÔöŽFÒMñf$m¬*œ¤meô«HúRäмv•&lä¥ØcñIšC7¡µ‚WËd>pOÙÚU±Hnd:0Á‡ºCè -ò\ëA<øj¾ ÖA=Wù®<†Ézº›xÈvÉs6‘QŸ#•Ë–ó ¾È¶rq¡™ÿçTª{™>QÎ~ÖŸ¢´nÔ½· -B™]ÜðÂÂÐ]¶dÛÊÍðGê0OùDu‰ëcmL”ß_‘ò -FØÔS+áX/¦Ê…ñ»%ߌ²Í•…s6u]äQÖ›³õÙh¨hšÎÑá»à`kÜ8â4æ­? q;}D¼ Áµõ(&«E»uÖ|º/äÕýyv{™OÃÙ±wÇ+6·ä¢ÍXÙhSszuZP¿£sàä–#ü×îìñàIñߎ4Kî™ úðïÇw?Nn¡F ŒJ²$ÚkD˜W½oÐã\„rŠ2^Á¾%ßÐTGS¶Z FÃÇ+>µä.†©²Ý(e ù¬ŠË¦Çq’m’]=<”+©"µ…´C¼‡ƒ†æàó_¾º ]°”œBÄ£4{âøOf¹Éû.§éÇöó¬o®P‘ˑ’Ž2™²y|(“¨ïfGî΃y$ÁŸt`µ>/é >Cž=^[hK¾š+ ƒˆï!B«.ÿ1þTê˜~h5øÁérÑl}^*âVû1Ú‘s¹úEp?øuÈ[h@·é|¿#¥¸u¼Ë=Û ­Jªß8Ô/m}$ž!Çÿ2ð]ƆŸø·ßJ}yà%eõl4ð6å‚×TÙnðR‚yaì¾”#£ ü›$ß.B‘A&¯Eþ ®‡C–Æ©FùCŸ÷‡ WGÞã÷×SÐÇ s?ÍØUPïW†Zò ™ÂXY@!ÏÓïK;Š•0b¼"ß»»ÀLýåÏyƨ8òþo†ïoŽUwccªC?L«sEÇÊïÒþ -v™Õµ -endstream -endobj -1872 0 obj << -/Type /Page -/Contents 1873 0 R -/Resources 1871 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1839 0 R ->> endobj -1874 0 obj << -/D [1872 0 R /XYZ -11.232 900.716 null] ->> endobj -218 0 obj << -/D [1872 0 R /XYZ 56.693 759.068 null] ->> endobj -1875 0 obj << -/D [1872 0 R /XYZ 56.693 738.489 null] ->> endobj -1876 0 obj << -/D [1872 0 R /XYZ 56.693 691.479 null] ->> endobj -1877 0 obj << -/D [1872 0 R /XYZ 65.161 692.163 null] ->> endobj -1878 0 obj << -/D [1872 0 R /XYZ 56.693 644.655 null] ->> endobj -1879 0 obj << -/D [1872 0 R /XYZ 65.161 645.338 null] ->> endobj -1880 0 obj << -/D [1872 0 R /XYZ 65.161 634.379 null] ->> endobj -1881 0 obj << -/D [1872 0 R /XYZ 65.161 623.42 null] ->> endobj -1882 0 obj << -/D [1872 0 R /XYZ 65.161 612.461 null] ->> endobj -1883 0 obj << -/D [1872 0 R /XYZ 65.161 601.503 null] ->> endobj -222 0 obj << -/D [1872 0 R /XYZ 56.693 564.352 null] ->> endobj -1884 0 obj << -/D [1872 0 R /XYZ 56.693 536.799 null] ->> endobj -1885 0 obj << -/D [1872 0 R /XYZ 56.693 490.184 null] ->> endobj -1886 0 obj << -/D [1872 0 R /XYZ 65.161 490.472 null] ->> endobj -1887 0 obj << -/D [1872 0 R /XYZ 65.161 479.514 null] ->> endobj -1888 0 obj << -/D [1872 0 R /XYZ 65.161 468.555 null] ->> endobj -1889 0 obj << -/D [1872 0 R /XYZ 65.161 457.596 null] ->> endobj -1890 0 obj << -/D [1872 0 R /XYZ 65.161 446.637 null] ->> endobj -226 0 obj << -/D [1872 0 R /XYZ 56.693 409.487 null] ->> endobj -1891 0 obj << -/D [1872 0 R /XYZ 56.693 381.933 null] ->> endobj -1892 0 obj << -/D [1872 0 R /XYZ 56.693 334.923 null] ->> endobj -1893 0 obj << -/D [1872 0 R /XYZ 65.161 335.607 null] ->> endobj -1894 0 obj << -/D [1872 0 R /XYZ 56.693 288.099 null] ->> endobj -1895 0 obj << -/D [1872 0 R /XYZ 65.161 288.782 null] ->> endobj -1896 0 obj << -/D [1872 0 R /XYZ 65.161 277.824 null] ->> endobj -1897 0 obj << -/D [1872 0 R /XYZ 65.161 266.865 null] ->> endobj -1898 0 obj << -/D [1872 0 R /XYZ 65.161 255.906 null] ->> endobj -1899 0 obj << -/D [1872 0 R /XYZ 56.693 208.398 null] ->> endobj -1900 0 obj << -/D [1872 0 R /XYZ 65.161 209.081 null] ->> endobj -1901 0 obj << -/D [1872 0 R /XYZ 65.161 198.122 null] ->> endobj -1902 0 obj << -/D [1872 0 R /XYZ 65.161 187.164 null] ->> endobj -1903 0 obj << -/D [1872 0 R /XYZ 65.161 176.205 null] ->> endobj -1904 0 obj << -/D [1872 0 R /XYZ 65.161 165.246 null] ->> endobj -1905 0 obj << -/D [1872 0 R /XYZ 65.161 154.287 null] ->> endobj -1906 0 obj << -/D [1872 0 R /XYZ 65.161 143.328 null] ->> endobj -1907 0 obj << -/D [1872 0 R /XYZ 65.161 132.369 null] ->> endobj -1871 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1910 0 obj << -/Length 2325 -/Filter /FlateDecode ->> -stream -xÚí\moã¸þž_¡O…4 ß)n‹ÝÞîõzÛÞu“+Ø[,d‹¶ÕèÅ'Ñɦ¿¾¤%'¶%Th&w@>E‘¨áh8Ï3äph-"}{ôöüèô=ƒ‘’cÏ#ŽQŒ ":O£O“*WI£ŽO0ƒ“UZ5íå¼ªÛ ½ì~SÍÞVÕEûÏÏgŽ?ŸÿÃts‚ŒµÒÎôu®š¥Rº±Mï(ŠMïœØÞ)@à8:a@Š®BŒ@ONÛ?sûâÑ»ó£_#1¸$‘pˆ£Yqôé3ŒRóÌ(¨Œ£«MË"bL¸¹Î£³£ÁÎШh/íŸow${ #A%@[Éö>ƒFOÊ# d,£ZEóAQ® *¶´‚‘mí+ŸÄQ_>ƒ;õ°kf$–Pv#°^DíÅÇÎÍn|n<±Sœ"@Iç=ß«ººT–}:áN¦•^ºµ<{÷ƒ[äLoˆ°iÙ¨")u6s“Ûèz=ÓëÚñ˪¹[»Ùr]^¨Ô­±úq=uì~­Wkí8׎½—ͺÎÊ…[k½Lzýï¹Ù7l†@q`ûò=æ­ì€·»rôÀ$¿J®GçVeêìXŽ Ku@À¶óë÷½Dní²Ò"ÉÌ‘Ï~þûù??Œ ˆ½¦Æ @{ãqL!°q×`˜Ú—`ÊvÆ€ à€|O¼§)|UÁ.0ŒÅ-»l'ˆ=w{ó¦»s×G'ïVý¨ô¨WrIA(ØHôäû …·²ƒ–çR&ekù“A ·½¬ÖyêJW³|ªßQw·ÿ<ìl=Æ6wþò°ÝOÝîÌ=ÏruØS›@­êÃÏ­¦ÍXÇfÊp8ïË÷±·²î„Êc³Ö¥-ªí|œ‡Oï¡ßaŸŒ51Zµ}ùž£æ«ìð xŒ^©÷•zÔËÛŒK0ïË÷±·²#¨—S 0~îô…KåècÙÜ5¹¢ažVníÊÊq]¿L\“{šé¬rüò"©/Ö«±0`1 Ô+å;ð÷nÖ½Ë_sb¦ì„´ö ÆlOåžSí j`Ûø{•éåñæcß'Ë|aøäÍq›‰L«™õ<ðµÉÿÔ¶˜fåi³R³SeW_j•ä¶Á{ ÔÓ~£ …œVu6b ë×6uo>öVKÀÌe§Ð/¦QÁ›+Ô^¹e86ËFÃåÛ9€£€3•}ùž$ç­ì’ÃæÝv ÿš¦ÎÙ©ÒZÕŽØ]¯VUíH }žÎdU—ªnœr[yÚAÖTÎJ×X?gÀpà(ªivà™ŸÝâsjø}V¦ý¹Ñã`GpLŸ“i™$@ |X¦µ”™Nue½f‡Eólzº%á!zýFý7ùÏúLÕÙTzÞ5Ú¾œnYlf6,Û2aÌ-Ã¥äzòýØÖ_Yw¶eB(žÀ·«:+29O—‚P®*¦j„Ή£®F ëúj^•c7™€ †øYÙ†JËß Ùh€¾ÌÖ¾wNžl¨yˆã€lƒí„Û–êÉ÷doeG° !31žmÂÐǺQý¹ÍÙ²‰uÏlž¹Nœ¬ƒWEö¿Ä}˜'ןBn1:–¥°qøYI -ryü,,µ»ú4Í›Æ QsÏt˜Í‚³•"lÅyЊ¯ž|?–òWÖ¥ì8ÞT|a©¿ 3]\¹/uR/”¾OüN~ßK*v'ÝÕ¹ Z Õ“ïé{¾ÊÞõ4»‡[5ãÛÒ§"Ϭoç?¶LtòÐ;MsßÀ~~ãýwÞõ;ú<ìZ‚ý©qœ)ß‘î¿ñæªTu¢]#üÝ2§µK”Ó µK=ùž¦lg f&†"Üú¼'ßÓÁ”íŒA1 (\éAO¾§1¼•˜)»­(zžZ.J ,\š¾'ßs,|•¶<¡7E8S†€HÎxûò=ç«ì°ñ01Ñ¿l5Fràšg½²]ï…ê¸òÇUòÕÒuwúÐr¯ÑX&ë—ëÇØS*YÚŸÇ<X(ƒV^ôä{ÖWÙaÀ" &/ ØŽÖCâ!W’¯8ƒ3"Ûu_(œõäûáÌ[Ùaœmô¢¯ñáv?üøþÐPx…ë8¸2@c,Ž-œ“»ÙpÂÑm6\ÞgnÍ÷|¬ÖeªëlÕeÞͪÃèÄÌ;É^çÛCÒó*Ï«cÌ&W6¯¹¹5[&åb{¬z™c8¹cDˆÕòß…¥f<Ú#6cöÿ6¼œö -endstream -endobj -1909 0 obj << -/Type /Page -/Contents 1910 0 R -/Resources 1908 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1839 0 R ->> endobj -1911 0 obj << -/D [1909 0 R /XYZ -16.307 900.716 null] ->> endobj -1912 0 obj << -/D [1909 0 R /XYZ 56.693 759.068 null] ->> endobj -1913 0 obj << -/D [1909 0 R /XYZ 65.161 752.393 null] ->> endobj -1914 0 obj << -/D [1909 0 R /XYZ 65.161 741.435 null] ->> endobj -1915 0 obj << -/D [1909 0 R /XYZ 65.161 730.476 null] ->> endobj -1916 0 obj << -/D [1909 0 R /XYZ 65.161 719.517 null] ->> endobj -1917 0 obj << -/D [1909 0 R /XYZ 65.161 708.558 null] ->> endobj -1918 0 obj << -/D [1909 0 R /XYZ 65.161 697.599 null] ->> endobj -1919 0 obj << -/D [1909 0 R /XYZ 65.161 686.64 null] ->> endobj -1920 0 obj << -/D [1909 0 R /XYZ 65.161 675.681 null] ->> endobj -1921 0 obj << -/D [1909 0 R /XYZ 56.693 631.176 null] ->> endobj -1922 0 obj << -/D [1909 0 R /XYZ 65.161 631.859 null] ->> endobj -1923 0 obj << -/D [1909 0 R /XYZ 56.693 587.354 null] ->> endobj -1924 0 obj << -/D [1909 0 R /XYZ 65.161 588.038 null] ->> endobj -1925 0 obj << -/D [1909 0 R /XYZ 56.693 543.532 null] ->> endobj -1926 0 obj << -/D [1909 0 R /XYZ 65.161 544.216 null] ->> endobj -1927 0 obj << -/D [1909 0 R /XYZ 56.693 499.71 null] ->> endobj -1928 0 obj << -/D [1909 0 R /XYZ 65.161 500.394 null] ->> endobj -1929 0 obj << -/D [1909 0 R /XYZ 65.161 489.435 null] ->> endobj -1930 0 obj << -/D [1909 0 R /XYZ 65.161 478.476 null] ->> endobj -1931 0 obj << -/D [1909 0 R /XYZ 65.161 467.517 null] ->> endobj -1932 0 obj << -/D [1909 0 R /XYZ 65.161 456.558 null] ->> endobj -1933 0 obj << -/D [1909 0 R /XYZ 65.161 445.599 null] ->> endobj -1934 0 obj << -/D [1909 0 R /XYZ 65.161 434.64 null] ->> endobj -1935 0 obj << -/D [1909 0 R /XYZ 65.161 423.682 null] ->> endobj -1936 0 obj << -/D [1909 0 R /XYZ 65.161 412.723 null] ->> endobj -230 0 obj << -/D [1909 0 R /XYZ 56.693 377.004 null] ->> endobj -1937 0 obj << -/D [1909 0 R /XYZ 56.693 350.451 null] ->> endobj -1938 0 obj << -/D [1909 0 R /XYZ 56.693 308.446 null] ->> endobj -1939 0 obj << -/D [1909 0 R /XYZ 65.161 309.129 null] ->> endobj -1940 0 obj << -/D [1909 0 R /XYZ 65.161 298.171 null] ->> endobj -1941 0 obj << -/D [1909 0 R /XYZ 56.693 254.06 null] ->> endobj -1942 0 obj << -/D [1909 0 R /XYZ 65.161 254.349 null] ->> endobj -1943 0 obj << -/D [1909 0 R /XYZ 56.693 209.844 null] ->> endobj -1944 0 obj << -/D [1909 0 R /XYZ 65.161 210.527 null] ->> endobj -1945 0 obj << -/D [1909 0 R /XYZ 56.693 166.416 null] ->> endobj -1946 0 obj << -/D [1909 0 R /XYZ 65.161 166.705 null] ->> endobj -1947 0 obj << -/D [1909 0 R /XYZ 56.693 122.2 null] ->> endobj -1948 0 obj << -/D [1909 0 R /XYZ 65.161 122.883 null] ->> endobj -1949 0 obj << -/D [1909 0 R /XYZ 65.161 111.924 null] ->> endobj -1950 0 obj << -/D [1909 0 R /XYZ 65.161 100.966 null] ->> endobj -1908 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1953 0 obj << -/Length 3097 -/Filter /FlateDecode ->> -stream -xÚí[ësÛ6ÿî¿‚Ó›¹“f"„ß¹™›I/¦MŸ£Îõ&éX„$N(Rå#Žû×ß. DZŽi+ºÞ‡|° â±X,~»Ø…–®³r\çåÙ÷ó³Ç/×IXŠÐ™/P°0rbî1/ræ©ó~r¡r%k5‰À¼)USqYVThÖ¦ñY¹ø¾,?Ò˯ï^O›ÿÓÌ8gIµwÍu®êµRMÍ0;wb˜=ôpv?ŒX$bg°$2ó{>ŒâÉczpâÀ³çó³ßÏ8wî! ωÎBW8‹ÍÙûß\'…6`€ùIì\éž'à.^åÜywö¯3×HÂíID8Ð- --KÜOwCb*a‘æÂsÞϸ뺓ó©çNd%7vuû²QŸyB¹•Û²Ìór*‚ÉUV¬¨j±–ÅÊJz-§Â|šò`bF\*UPi#SS×”»íÐsÏ»¹yì³(Âuë¹··ñèÅÌ ºnuV,Ô`—9‹|æR¹"l°¾,fBxŒ{ -LʉÖ!‚¡Ì™Oìš©|5å Çš^peø”iJ…,XÙ6Û¶a—ªiT5 ‚ ÛÖLò2W¦—^£ÂVß<†]nÖÔš5†zª–z²6o¨ân…Ì[ÃJ­š>¨ªd@Š¯–¦É®a0¶¶ßÉ9ªLÌü0î«Ín-3/à“¬¦gQ3dVçEÑd¡ªFfµmdõ±Ýî÷µ¹TiŠÒµ¦§’‹5•VªP•llà–Æm%n VÕ­íÛ¬eC¥ó²nÞ-ªlÛPoZ µ-«rcû«Õ–a6ßÖpµIðB0/N, 冧€ë.ã¸Ú8ùÜ7\ú :´¬»ÊòœJï¼MMµ¤~E B2£qÿð© -ÀæBmT¨Á^©ª³U‚Ò³”†Þf[•¨§VY±«^8¶þÞʾ¡É€ÓG-kCž˜ö]bšê.¯m·a§[PëÅpÞ [/baÐÁ6?ˆ’É¿§ þÓ‹7¯Þ¼|BÎɪ;3ŽÆöÄÔǧˆü‰Åa¦…5¸!3ÛggTðŒù5•Ê‚žK%›¶ÒLjHÅz½X¨·j‘}p]± w}ÁsU¼Á.i$ïå›_LÛ†°3ô -Ãã)@˦ãÖ”Ê%=¿[ä²>›:[|‡'T0y:åœOæÓk³Ç¼’ »@a]›JÓ¨O,¤ªÊp÷Æ”QÁkØ0Þ`w*6Gá1„}z+X0€ÂâuÙR¡SýFÇ“f´ˆ6JÜm¼vjNCИaéÒ©”L±Ã!Á”î±'¸Þc|Ö×u£6u¿òjiýÂ@êöö_»=Å—Ážbp\ÓKfègEÝÈxD¨6fZ¤é$¿ÎŠös;Ô á“« ‰ÕDVõú±¤‘b Ö®åd'ýFXOvrØUÆv? Dîs/´§ˆ ì>àp\O2Ž7ô*y0â|?Öã¶_fíŠ@L‚É›·èìÌŸ?¡æ¹åzÏ/Ñë[þ×–PÏÄ„moDœ°Àû'¤5©™›°gtx"ÖèbÛžÑÅ&2ºØ`dZ` ž$ÌÉHïÙPp&¯ 'kiX,JzªŽwÃjAõ;–£>Ë᤭É1ßñM^¼¥ŠK¹øˆ©*RvpÑ–¹ù«ó à!ã¾íòÄØùˆ$IÂÿpWÙ’i\È¢/aªîïEÐÛ -Ú¢}‹Y Íä#a•=-ª¶(†‹ËãªÃð¾Çžu!·ì ã·TЧ¬fá] Ûšsi_(¡Š „1,A_€°8í^pž½ B',Œ²®M”ÓÉ`?ºKÂ…]ƒ‡È–³­Å6]ÒLf±ƒ+ǘCŒ¢ŽãÛb¬OY˜™.Jðsa©!aïyÝ”Lž„_UÖÀªØ¦Lû¼É‰&ˆÉâãe?þx©Â `)„Èc}àÂ+˜Áðà+å,÷îµÃµ7'!PŒìD˜cïcé€W>¤¸T€ÀÆÌ°‚‡–|f5ÁjåPáÂÜNôvÔ2î¹Ìõ ÈÍîõ€p“„߸ó¸Åãzê#b\׶¦Pöîžà1Žê‡Qø8‚êóÈžiVÁ!•ÅàVbÂÆÂ]x,‚ƒç¸ßò¼y/g.¡(xâÚþ3xtRå:Ü›¦.ŽU{µ‘YÎð_SÚ`òêï'œ¹Ü;úû1 <ðO¦þúÇ©ÿñÌŽW?ö˜çX<Õ¡ù((ÔÕW×} ¢[TêÀ˜ Áíö®ÊîæžQÁŸÕÏ84~˜0ZO†à>ý#|4³÷@p„÷|!ø\6ŽÛ_Œ&Fõ<—e>ò°ù"ù<ÏÆcRúg^Öª^qcË_„‡™ŽG ¸Žnô¿ÙúËœF>‚ï~ -±s<4¿,ÀßÆ¢;ò˵.¶Û¤»XuÑmy¿b»(7›²ÀÈÖöeëwIU¾]gF¨Á‹>Á°û%ðƒërà‹»]‰Si\´€¿ÜF1?],¢˜ÅBœì€Ð?î€9žÙñA²ˆA@ü[ü§É"ŒXžîêf@ÿHTËì­nˆ8ãÁ· ùÿ$Hpî'îé®nôDå±ÌÞŽÊÐeܺ=ß‚äoAòŸ$c~VâŸîòj@ÿH½<–ÙÛõÂáyß‚äoAò­Š"tþç ƒd …©°» Y¸èج&wŸ§E1}ž†t¾oãÈÃa3(€ýµsnÒ¬»h“^ÌW¦)Û âea31€nMlùïŸ)œ*(=Ðr®¿˜5h‚àUAIô}“xß‹ÝŸ ‚Û ¬i/fjÛ^š™e…é©«AþÔ@&øQõ“|ÏqM²Åìê8ÑVNMžsZ^*“î UôUôû §tÞ4Ö¿ÐDÖùªR{û· …ÛsO±ÃÏ*ÍäŽNÿn ¦ea¾Ø€fº:ÀjóùQ¼ûî¤>pMáÅÁ~&Éå@ -¦`éR0ÓrÑÚOâ¨K1pf>Üx~?¥´÷ÕcVÐ'<˜ÂùÔ\©Hˆöå¬RK2°×¨\¯A'¬LO­ñæ¦ÆB*¯ËáUÍþ'¬Kx‡‚Ç}„å‹ÃSgÖÂÎJSªÕ©¬±¡ù´j ¯P˜Û«¢QU¡¹•9U=ËVYc_ÎÛË<«×„jx×_Ví†^qï_=;a¾5¹ä`ª¦¢»'ÍfÚçβ_×å"뜒a†ÿÍORÓŽEØ>‹ZÞi[7Õõ4 &}&öÓWi4ySZm”—¥Ín:Ë¡•,ÖJfwòÀ•™Àok»+(ÜœÇÏŸ>ûùyO3}Øê»Ì “‡|×ú_â9ê -endstream -endobj -1952 0 obj << -/Type /Page -/Contents 1953 0 R -/Resources 1951 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 1839 0 R ->> endobj -1954 0 obj << -/D [1952 0 R /XYZ -11.232 900.716 null] ->> endobj -234 0 obj << -/D [1952 0 R /XYZ 56.693 759.068 null] ->> endobj -1955 0 obj << -/D [1952 0 R /XYZ 56.693 738.489 null] ->> endobj -1956 0 obj << -/D [1952 0 R /XYZ 56.693 540.31 null] ->> endobj -1957 0 obj << -/D [1952 0 R /XYZ 65.161 540.994 null] ->> endobj -1958 0 obj << -/D [1952 0 R /XYZ 56.693 494.012 null] ->> endobj -1959 0 obj << -/D [1952 0 R /XYZ 65.161 494.301 null] ->> endobj -1960 0 obj << -/D [1952 0 R /XYZ 65.161 483.342 null] ->> endobj -1961 0 obj << -/D [1952 0 R /XYZ 56.693 435.966 null] ->> endobj -1962 0 obj << -/D [1952 0 R /XYZ 65.161 436.649 null] ->> endobj -1963 0 obj << -/D [1952 0 R /XYZ 65.161 425.69 null] ->> endobj -1964 0 obj << -/D [1952 0 R /XYZ 65.161 414.731 null] ->> endobj -1965 0 obj << -/D [1952 0 R /XYZ 65.161 403.773 null] ->> endobj -238 0 obj << -/D [1952 0 R /XYZ 56.693 366.685 null] ->> endobj -1966 0 obj << -/D [1952 0 R /XYZ 56.693 339.175 null] ->> endobj -1967 0 obj << -/D [1952 0 R /XYZ 56.693 292.385 null] ->> endobj -1968 0 obj << -/D [1952 0 R /XYZ 65.161 293.069 null] ->> endobj -1969 0 obj << -/D [1952 0 R /XYZ 65.161 282.11 null] ->> endobj -1970 0 obj << -/D [1952 0 R /XYZ 65.161 271.151 null] ->> endobj -1971 0 obj << -/D [1952 0 R /XYZ 65.161 260.192 null] ->> endobj -242 0 obj << -/D [1952 0 R /XYZ 56.693 222.032 null] ->> endobj -1972 0 obj << -/D [1952 0 R /XYZ 56.693 185.911 null] ->> endobj -1951 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1975 0 obj << -/Length 2206 -/Filter /FlateDecode ->> -stream -xÚÅ[YsÛ8~÷¯`ÍÃU5Fà±ûädrÌ®3G¬­ªx ’ñPxÄöþúm´%ÊŽAÓô¼˜Ðl4úøº¤±³v°óþäõüäÕ;†Å œùÊ ( -B'"òBgž8ŸÝO"¼³SÊ°ûkÙˆZß®ÊJß43ùs¹|]–[ýãÏ‹óÙ_óÁ2§„ ˜1Íí¢¹ÉD½¢©å4¬NœV<¹º„(¤‘sÊPšõ= ÃÈ}¥/„òÁ“·ó“¯'Øc‡8,@Aì9aLP€©³ÌO>ÿ…æ@äÇ‘s¥(s‡Œ¨À}æ\œüq‚&ðFÂ=t¼ýh™þü0ÿx®÷I1jàÕŒ`w-%_Ç°§_꣇‡:™Ï"ì–À%ˆÝºÝíʪ‘{Å.»v¡Ç˶ٵÍOrÜw¹¡mªtiH;‰`XK7J¢HI¤~ox­‰Bzˆ'‰HÐìÔ "w®ì¨øÞÙH hS‡ÒÔi½/aR =½…¨x#3^$wû¾`´øµMã:uš§ïªì9Öžºïö„újÞ7Úé­žcEz¹÷¢hÄu£ù´»„KW¶5•ùL?]´ùBiË•¾få’g]pløŒb÷ÛŒ0×ìÁèüvéd°üŸÊ¶HÀä;Í&ÍwJ¥ôºoòÈa‡ƒ·¤¼/2¡œËs/1¦ë¶Ò?©Ûˆ|—qe'ð‘ú¦XVe‘þ7iY˜'Œ#w¹á_6J3’Xú‘¾•Â–RZ%ZP5ÓÓŒtÞ¹9OľÂÐU¬T‰vöÈýQ_~—Ï󵨕/ûî… £{H¹|Â~Û‰â·ÕŒ2µû¥@¥ö²6"šû»´ª›[ej§JW‡ÎÂϤ‹ë:3ôà›¢¨%é@ü§ôh Ô=#®Ž\=$¤ZnÙª!µgvjÖz>s¯ª´iD¡§RCûûM³QV– -=䬶œïЃy¡F9}Ïšimè5Ū-–M_ ÉíK º#°üZ,ˬ͋ûŒx•&ÍÆÄZjtûæìü¢ pgå -BèL ~§GB¨â†5¿[Ýׯ>½=ûùã[tþËkHas“¤öM@âuOÞúP^V¢seuå@à)QŒÂ˜Â C]^›wè¶*³¬”¾w¥6®8Ô=7é|ªóˆ´bÝM³áÍã°c‚Im±=ˆ%(ôÕ÷•ÎøGÎOHž!‹•À ž›Šõn`†Ð;ŸO ÆX£®v‰{t‰Uy”<®“ƒ-Ûmt?‘Üã‘Æ:C®Mz8Ò ½[ƒ/ËQz„ SYIÄÚ£¿KJYOß ¬ªŒ|)C„ü êDø˜‚2Dv‰nrø ù>U_äi³ùÇì”PÜ¥£Wi‚®óLs‡—ÌååýaýU ©ãGRÕ“ej1?p N¢Ø©„³Ú/—xÝ?zÌ>dˆú¤[@3&’z,†H@úüc€ÒlVØ/%Óø„U «µ£o>™ÚòÀª·‚GˆQ“æßlÄr jߎyAxI“§…]‰X¥EÚXW~¶bh‹5¯Áp¿ |<> ØŽÂ—Ä®ØgÓbD±‚~€È8Fx2$Âé0âÿHŒ-ìŒðÀÀÝ)Ö›²ªÄÒº4È òiùÚ2›«s -+Ê•-ú‹'Ç%ìö§¡G>…¥*Q7ee«´<­ë´W+™©ƺáUóµ-›£]üðý]lÅÍS«Ï“×øE‘ ÇÈcÞ´Èô…@&Cè±é‰F°0˜ ™züÇ!Óxa푉ÆRR¿C¦|HÓ2ISö…?ÿ±Ò*ŒK«ª´<:ÛòujÙé” ~ÃëMj_Ÿé%’ÄRË‹ -º¹Þ»è‰ÒY2æ•|i ¾¼¸1'ïlÏãü(†>-î°äûØPE{T!¸>íhNmñ# #äò¾´ýØùþüqÈ®ùPÈÛr½ þI¶2b ˆØaaS²\Wbe[óC-–Ö¨ _bÙ5©¥÷¥%Ç ÿ&l¥ùÀ~ƒ‚9Ù„írÿÈ„3ZØ 'ˆQÔµË ±*+ñÔÒ‰b/ÚÓQÃSõtùVÜ¥ªÇ·ïA„NÙÎQù‰Ã„í\ÿH+ìÃK=Dºæí;ÝCQ솔0¶/°Šòj`ÓÓkïîÄ~ÜI€¢—m]Hì#¯³|?QVWbm}ÞøºÜæ—žÏ2Ëb¡âEñ£cÒÇËü9ôSÛgn§>€0v”ïJ ZL6¼]?5{“#E/Š~ˆ¼€NŒ¥DÎö ~ ¢xÐùþ„ˆB!p¢éÞM÷øD”ÑÂ@£04Ùe',ÏGsQ×Öç³öç -/¹‰,õ¹µe½’ˆ¢IW©­N£Â£æÅCþ#½x´°¼˜D("&/N›ëŽ^Ú?¥ØTÏHdý^iÝ ]è¸W°ý> endobj -1976 0 obj << -/D [1974 0 R /XYZ -16.307 900.716 null] ->> endobj -246 0 obj << -/D [1974 0 R /XYZ 56.693 563.932 null] ->> endobj -1977 0 obj << -/D [1974 0 R /XYZ 56.693 535.591 null] ->> endobj -1978 0 obj << -/D [1974 0 R /XYZ 56.693 489.198 null] ->> endobj -1979 0 obj << -/D [1974 0 R /XYZ 65.161 489.487 null] ->> endobj -1980 0 obj << -/D [1974 0 R /XYZ 56.693 442.507 null] ->> endobj -1981 0 obj << -/D [1974 0 R /XYZ 65.161 442.796 null] ->> endobj -1982 0 obj << -/D [1974 0 R /XYZ 56.693 395.816 null] ->> endobj -1983 0 obj << -/D [1974 0 R /XYZ 65.161 396.105 null] ->> endobj -1984 0 obj << -/D [1974 0 R /XYZ 56.693 349.125 null] ->> endobj -1985 0 obj << -/D [1974 0 R /XYZ 65.161 349.414 null] ->> endobj -1986 0 obj << -/D [1974 0 R /XYZ 56.693 302.04 null] ->> endobj -1987 0 obj << -/D [1974 0 R /XYZ 65.161 302.723 null] ->> endobj -1988 0 obj << -/D [1974 0 R /XYZ 65.161 280.805 null] ->> endobj -1989 0 obj << -/D [1974 0 R /XYZ 56.693 233.825 null] ->> endobj -1990 0 obj << -/D [1974 0 R /XYZ 65.161 234.114 null] ->> endobj -1991 0 obj << -/D [1974 0 R /XYZ 56.693 187.134 null] ->> endobj -1992 0 obj << -/D [1974 0 R /XYZ 65.161 187.423 null] ->> endobj -1993 0 obj << -/D [1974 0 R /XYZ 56.693 140.443 null] ->> endobj -1994 0 obj << -/D [1974 0 R /XYZ 65.161 140.732 null] ->> endobj -1995 0 obj << -/D [1974 0 R /XYZ 65.161 129.773 null] ->> endobj -1996 0 obj << -/D [1974 0 R /XYZ 65.161 118.814 null] ->> endobj -1973 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F57 739 0 R /F93 909 0 R /F52 695 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -1999 0 obj << -/Length 2242 -/Filter /FlateDecode ->> -stream -xÚÕ\moã¸þž_!\?ÔÎ\¾‹º¢@oïí]‹^\Ñí¡PdÚÖF–r’œ¬ûë;²å½XŽ×ÃPLÓO–mz8Î3ó̾»x{}ñæ[E£„$šëèziNt&ˆˆ£ëYônò“-lÚØË)WtòתµÍîr^Õ»‹vÙùu•½­ªÛÝ›\ýpùËõŸaš)c$Qj'íªÝ¶YZÛ6Ý×0;‹ Ì®E7»Ô1‰¹‰¦Š$q?¿Ð 06“7»Æu÷Ëo®/~½` žF,RšèDDqˆ¦<ÊVï~¡Ñ ¾ˆLLô°¹Š£„ ×Etuñ÷ Ú[‚‚ŠÝe÷òÝ#É`ó(– aTw’»Ï=¥Ž8ILÕ6šŸ…@Âd¼Ÿ`'˜u£}å+Â4ÊW”‘XÔ Í¬I“”Ý -¬Ñîâ§Þa ·¾ ·žØ+.‘¢÷ž¯ªòÞÖ­m]à´´èÝTS:yŸŒ¤ÿàø“«'µ©ÖufqcçyÙV¸që)°¶)ò†ÖežU3¤Øl™ÖiÖÚºÁZëpÜ?€xfL8$Ê÷D‚·²HÊb½CB»L[¤c-‘+ «ºÆºÌ¢ØÜ-Ÿé'Ýð7îaiKÜÈMµÆ ´³iMô8¤Š)rí‡+™1Ç4áàÎÁ0w(ßs¾ÊžFKˆb=ïøUôt¶È˦µ)2Uó‘¡ú1cSÁÜÖ¶Ìl3̇p“¬Ï‰'„K -tâõ˜…ö|N' É~=8WêÖÐ .EwƒÌÁD¶èÖ°]u7y¹5ÄÕ*o—_\N‡7E•¥…}ó>%SÿYhÃÀy ŽŸšp

    ´}³L/9Ü_25éqc¡ ß^­ÒYÿ-áíÜ ðos3#Ië=d³S: -³;‡í¥ÃâfvÐsŸ†ªdw]ï:ÕäÐ"SÎa‚Ã…"”³P)šQˆ. 6ºHC¡Ô4ᢋÔP˪p%ý@¾_tñW]d̉‘±st)í¶W³ºƒÀ2$ÝÛï>;MþÁJ…°¹NÌ~R¦«£áŸ}º˜WèC[çö}‡Žó€Q†èpÞüXº§/{*êàÉšcúTðM¹(òf9\à©£ vÿ¡÷¼\·«SÙj¶m‹öÁñ»r뺶%²O;«²õj8Ú{H E†dáq(ßÞÊ: BÑ휻ꫨš£®çÖþ¿c ÓFÄÿƒVÈUÞóD+Ä–¥mžï$’hÅ_²„“œÁã@,«ëd—m½qaZŒƒ B2-Ú•+™Ö¡|O$z+ë€D*A|ï -óü–i5›²M? ·»êÚy·K$†Äì%A!bM„Q¯Ü!f÷1„RP¹†ÛÇÈ÷…¿²xP•*•3(ÅYµ¾+Æ&j›»ªqŘâÛyIuç#¤xE ã”ÄqÀ¼  1,\~ ßdÞÊ:€Œ Âhï -°ry‰…нY1z ‘¥ v àaik‹ßÖï\Ò±ÑðÄùµó€A’=?Ë*-‡§‰~›å,t8¤h£ÂÕûù~ží¯¬ƒgS0ìD¬l›ÎÒ™ò&@Û ÂÚz°#„œ§Eq“f·ØZ¶è"þ©S@ç·×ví}q“„;9ï‰oeñhà #lÏ«Ëê7諸•výœÖ%3ùüÿ ½n ú£ÉK2@S+óŠ œ<&Pc3@.»ÿVÌ“‡ò=#ƒ·²‘A*Â÷ÅÀlÐnƒ~š¹´£ÄŸCJÍòr^ý)+Òæh»ù§u™ ÷‘NÎrŸkìAï&D¸pØ+z‚¶"°å]’„ë( ä{ºº¯²§[H¡uçد›åŸ$˜N´užÛbæÚ~àÜJ_´ýÀ©"Úðד|X¢ eÛÀ¼UáÚù~ˆôWŸ|˜1DÈÞ~LgÖ…—ŽÞ|pªçžÎã yUa;¿®s{D<¿Àú}, MÂq¢|O· ¦lo Ý~ -—5ò=á«ì1"c’;55‘¼/§ŸNOز«¬°‡õËþŸ:¥i¹i—£ë&½9þÃÀ'Ž‘ܬ[‡Ñeå2únûÏ¥zؼ=T÷®a2ïéõÞÊ"2“’b:Å0²}8¯ÖåQGìã@îýºi2H±¹”{XB=v3ö®€D£aµ®§fPtsîtÂ@¾'¼•u€‚”8ñ~#¶tŽ1Pâñ€,ã@¼§YC©Ú[‚%DÐpGÑò=má«ìiŽÁ»îc22Ç@ö´«ì\(ÆS¥C  FÇd4öÙÍg6¥ÝUzÁ\ÿP¾§ë{+ë]#ºo¿Ùx|û·ëïýýÜù¼§G´çœBÀ$šü¸7ý¤œçXXÈ ŸpqIL„‘Á p(ÞÞª:€R¢÷³Zb[îU‰ôÏaÕõ‰ 2ösb*9ìO>'ß90ñ<[â©8Ú®Øç» W4u&–fת…§Cñ~xòV'“˜ñ€ûyáZ/©Oþ;ÿX–]EìÑ=â=ŸÜã«jÿzôà?I ÕÉsžû÷_qá$Ï -endstream -endobj -1998 0 obj << -/Type /Page -/Contents 1999 0 R -/Resources 1997 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2039 0 R ->> endobj -2000 0 obj << -/D [1998 0 R /XYZ -11.232 900.716 null] ->> endobj -2001 0 obj << -/D [1998 0 R /XYZ 56.693 759.068 null] ->> endobj -2002 0 obj << -/D [1998 0 R /XYZ 65.161 752.393 null] ->> endobj -2003 0 obj << -/D [1998 0 R /XYZ 65.161 741.435 null] ->> endobj -2004 0 obj << -/D [1998 0 R /XYZ 65.161 730.476 null] ->> endobj -2005 0 obj << -/D [1998 0 R /XYZ 56.693 683.85 null] ->> endobj -2006 0 obj << -/D [1998 0 R /XYZ 65.161 684.534 null] ->> endobj -2007 0 obj << -/D [1998 0 R /XYZ 56.693 638.303 null] ->> endobj -2008 0 obj << -/D [1998 0 R /XYZ 65.161 638.592 null] ->> endobj -2009 0 obj << -/D [1998 0 R /XYZ 56.693 591.966 null] ->> endobj -2010 0 obj << -/D [1998 0 R /XYZ 65.161 592.65 null] ->> endobj -250 0 obj << -/D [1998 0 R /XYZ 56.693 555.92 null] ->> endobj -2011 0 obj << -/D [1998 0 R /XYZ 56.693 528.661 null] ->> endobj -2012 0 obj << -/D [1998 0 R /XYZ 56.693 483.517 null] ->> endobj -2013 0 obj << -/D [1998 0 R /XYZ 65.161 483.806 null] ->> endobj -2014 0 obj << -/D [1998 0 R /XYZ 65.161 472.847 null] ->> endobj -2015 0 obj << -/D [1998 0 R /XYZ 65.161 461.888 null] ->> endobj -2016 0 obj << -/D [1998 0 R /XYZ 56.693 415.262 null] ->> endobj -2017 0 obj << -/D [1998 0 R /XYZ 65.161 415.946 null] ->> endobj -2018 0 obj << -/D [1998 0 R /XYZ 56.693 369.32 null] ->> endobj -2019 0 obj << -/D [1998 0 R /XYZ 65.161 370.004 null] ->> endobj -2020 0 obj << -/D [1998 0 R /XYZ 56.693 323.379 null] ->> endobj -2021 0 obj << -/D [1998 0 R /XYZ 65.161 324.062 null] ->> endobj -2022 0 obj << -/D [1998 0 R /XYZ 65.161 313.103 null] ->> endobj -2023 0 obj << -/D [1998 0 R /XYZ 65.161 302.144 null] ->> endobj -2024 0 obj << -/D [1998 0 R /XYZ 56.693 255.519 null] ->> endobj -2025 0 obj << -/D [1998 0 R /XYZ 65.161 256.202 null] ->> endobj -2026 0 obj << -/D [1998 0 R /XYZ 65.161 245.243 null] ->> endobj -2027 0 obj << -/D [1998 0 R /XYZ 56.693 198.618 null] ->> endobj -2028 0 obj << -/D [1998 0 R /XYZ 65.161 199.301 null] ->> endobj -2029 0 obj << -/D [1998 0 R /XYZ 65.161 188.342 null] ->> endobj -2030 0 obj << -/D [1998 0 R /XYZ 65.161 177.384 null] ->> endobj -2031 0 obj << -/D [1998 0 R /XYZ 65.161 166.425 null] ->> endobj -2032 0 obj << -/D [1998 0 R /XYZ 65.161 155.466 null] ->> endobj -2033 0 obj << -/D [1998 0 R /XYZ 65.161 144.507 null] ->> endobj -2034 0 obj << -/D [1998 0 R /XYZ 65.161 133.548 null] ->> endobj -2035 0 obj << -/D [1998 0 R /XYZ 65.161 122.589 null] ->> endobj -2036 0 obj << -/D [1998 0 R /XYZ 65.161 111.63 null] ->> endobj -2037 0 obj << -/D [1998 0 R /XYZ 65.161 100.671 null] ->> endobj -2038 0 obj << -/D [1998 0 R /XYZ 65.161 89.712 null] ->> endobj -1997 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2042 0 obj << -/Length 2844 -/Filter /FlateDecode ->> -stream -xÚí][ã¶~Ÿ_!¤2\‘)*(ŠînÛ4A¶Ewh€Ý<Ð6m #‰Ž$Ï¥ÈeÉíHMq6yYÏŽ5GŸÎwn<¤Ã`„Á·o¯/^ÿ…A‚Nxp½8A<¦ˆÆÁõ*øtùAeJVêÕaáå?u­ªöǵ.Ûêm÷æ_õò­Ö7í~üø럮¿7·¹Â%ŒµÒ>Ö™ª¶JÕUó¶¹;„¹;§ÍÝ#£˜ˆàŠ¡$îîOc#0—¯ÛLx󇻾øùña€ÆOh'ñËüâÓOa°2ï(JDpw¸2¡Üüœ/þ}vš ÄæÇæåÛG’>pL‚8bH`ÑHn~OP"’7W'A©‚õII“òÂå³£˜ Ðk£„$3€=,7AûÇÎPŒ†*:Êx‚pÈÛGum,¡y6§åŸ®x^Ê…¾^ºÜÊb£*ØÅwªŠÍå -xåB-å¾^lØQ§Åˆ6­·°++÷t¿ÿªûåøÏ.K%3 ]f«ô£äžyô(w$0vå}ùŽÄpkA *Ž:Vé}¹šP©nÍ£|½•õ™&tšœûz«K %\ZÔª¨S]È,{€R_ë -̦ZîqyÚÆ E-ü±tGûvzÚ–IŒ°­-?ãs -]ÀžÁ®TkU–ê”Û9íµË›ýv&?™™¹ªåJÖrˆúëçQËb$SVé— Æ´Åcc=ögó}ùŽVï Ö«cŽˆ¹ç :Ok˨l -9 -úSü˜ü4ž[UV逵>Ńg]n¥Ê>‡,¬só/~Õºäi½ýæÕ&‡‰‚µ*êòÝWTØJˆ‹&»†,ÔcéÔ—ïÈMg°Ü  -IW:ýg«€b£ -UJxà3™ÙN‚Çfè°O¦‹*¡C4; U²x¨·`Å »F“TŠ’ű¿zn ßÍÒÝÁÂ-=J"rÒZ:8Ã9:3è0|,ZI<^NϼÉšº•ÐüvºÔ‡é|Ë1Éï -[$°¿2} ßÑÆÁZظ ‡]™¾+å²NÇe÷×S³ñÅÃìY÷»6FSÑîå -Ü×¥Îg¾ùS¾aÚÒ¹@‚ù+Öò-ݬ…¥ÇFAѱX·ÚZ76=u¥ºßeé2­¡{'‹zÞ*dîé®.mï—+‘Q¿àâ%‹•(2ÒYä©XÉpX ûZ¨DÔ€I°¿B%2¥YHý­«ä;Þ¬á C´ËÞÖû²Ùäa³ñÚµU+h{¾/ì.­—۹㼌YÊlæÝbq¶ÿÀ -#ú’þƒ&áãV«ÙýÇRç¹.,ZT8<öçAhÌ ýµ!òÝ<ˆ;X¸¡±yºIwÄÀ›˜èÕ~¯îÁ^A—›ÑÆ<çÆ}»åzSêÁæÖéìÚxÉ›™[èïdžf™mÊKy„Häo\v ßÑ~ÁZØ/;ž¦òö3exS¤Õ¹ž˜rŒQGL¢÷äˆß˵NÖ6ýñ‰#¨G7ŒcdrfÜ—ïhÆ®`O- QŒ `Ë¿å²½M^^´m€›š8gBÐO(ŽPD_”€$Áˆrå¾Lëÿ¶´û^É¢ÒÅ‘xU]¦»¢²Hˆ08Xâ{$‘¿î`Oºï\ƒ‰)Ç£7>¨\ßBÓpƒ«Vù.wØriŠ¢ñ²é$á6'ö$=uq–7ÃË9}ùjá(û«– Mœ:ý‡à=så -ZâB²ÜÄHØ•¹êó=£Žj;»œv,AÜãá ùŽLukÁU£ äX±ÞéòæÌcÀºßÿÉΈÿü|ÜU™ÊUQòÎ&-›¨1ÞÃðºGQ~wÞDý3žÎzØ»ÞB“;7šV_nÕû‰n™EBš¬„‘M€(E13'@ÍÂVª -ýoåsú³$æ3 Lð8ä9ïè[ÁZøVÌ>y¾‡gA+µÌd9ÐuHkˆVKæ— SúÜX\¿“åÈaŸvï1?Ì|j¡G:Düú4â#£,>äiN“1L /º¦……±|Í숌Ò2eSˆáØÀ`W³°a]’ø[ÍÈwsCî`ánóaÝŠ†&(û|ÔÁf&}î3q¡µP©nÓ'Η;¼3" u×V« > endobj -2043 0 obj << -/D [2041 0 R /XYZ -16.307 900.716 null] ->> endobj -2044 0 obj << -/D [2041 0 R /XYZ 65.161 760.065 null] ->> endobj -2045 0 obj << -/D [2041 0 R /XYZ 65.161 749.106 null] ->> endobj -2046 0 obj << -/D [2041 0 R /XYZ 65.161 738.147 null] ->> endobj -2047 0 obj << -/D [2041 0 R /XYZ 65.161 727.188 null] ->> endobj -2048 0 obj << -/D [2041 0 R /XYZ 65.161 716.229 null] ->> endobj -2049 0 obj << -/D [2041 0 R /XYZ 65.161 705.27 null] ->> endobj -2050 0 obj << -/D [2041 0 R /XYZ 65.161 694.311 null] ->> endobj -2051 0 obj << -/D [2041 0 R /XYZ 65.161 683.352 null] ->> endobj -2052 0 obj << -/D [2041 0 R /XYZ 65.161 672.393 null] ->> endobj -2053 0 obj << -/D [2041 0 R /XYZ 65.161 661.435 null] ->> endobj -2054 0 obj << -/D [2041 0 R /XYZ 65.161 650.476 null] ->> endobj -2055 0 obj << -/D [2041 0 R /XYZ 65.161 639.517 null] ->> endobj -2056 0 obj << -/D [2041 0 R /XYZ 65.161 628.558 null] ->> endobj -2057 0 obj << -/D [2041 0 R /XYZ 65.161 617.599 null] ->> endobj -2058 0 obj << -/D [2041 0 R /XYZ 65.161 606.64 null] ->> endobj -2059 0 obj << -/D [2041 0 R /XYZ 65.161 595.681 null] ->> endobj -2060 0 obj << -/D [2041 0 R /XYZ 65.161 584.722 null] ->> endobj -2061 0 obj << -/D [2041 0 R /XYZ 65.161 573.763 null] ->> endobj -2062 0 obj << -/D [2041 0 R /XYZ 65.161 562.804 null] ->> endobj -2063 0 obj << -/D [2041 0 R /XYZ 56.693 515.297 null] ->> endobj -2064 0 obj << -/D [2041 0 R /XYZ 65.161 515.98 null] ->> endobj -2065 0 obj << -/D [2041 0 R /XYZ 65.161 505.021 null] ->> endobj -2066 0 obj << -/D [2041 0 R /XYZ 65.161 494.062 null] ->> endobj -2067 0 obj << -/D [2041 0 R /XYZ 65.161 483.103 null] ->> endobj -2068 0 obj << -/D [2041 0 R /XYZ 56.693 435.99 null] ->> endobj -2069 0 obj << -/D [2041 0 R /XYZ 65.161 436.279 null] ->> endobj -2070 0 obj << -/D [2041 0 R /XYZ 56.693 389.166 null] ->> endobj -2071 0 obj << -/D [2041 0 R /XYZ 65.161 389.454 null] ->> endobj -2072 0 obj << -/D [2041 0 R /XYZ 65.161 378.496 null] ->> endobj -2073 0 obj << -/D [2041 0 R /XYZ 56.693 331.382 null] ->> endobj -2074 0 obj << -/D [2041 0 R /XYZ 65.161 331.671 null] ->> endobj -2075 0 obj << -/D [2041 0 R /XYZ 56.693 284.163 null] ->> endobj -2076 0 obj << -/D [2041 0 R /XYZ 65.161 284.847 null] ->> endobj -2077 0 obj << -/D [2041 0 R /XYZ 65.161 273.888 null] ->> endobj -2078 0 obj << -/D [2041 0 R /XYZ 56.693 227.622 null] ->> endobj -2079 0 obj << -/D [2041 0 R /XYZ 65.161 227.063 null] ->> endobj -2080 0 obj << -/D [2041 0 R /XYZ 56.693 180.797 null] ->> endobj -2081 0 obj << -/D [2041 0 R /XYZ 65.161 180.239 null] ->> endobj -2082 0 obj << -/D [2041 0 R /XYZ 65.161 158.321 null] ->> endobj -2083 0 obj << -/D [2041 0 R /XYZ 65.161 147.362 null] ->> endobj -2084 0 obj << -/D [2041 0 R /XYZ 65.161 136.403 null] ->> endobj -2085 0 obj << -/D [2041 0 R /XYZ 65.161 125.444 null] ->> endobj -2086 0 obj << -/D [2041 0 R /XYZ 65.161 114.486 null] ->> endobj -2087 0 obj << -/D [2041 0 R /XYZ 65.161 103.527 null] ->> endobj -2040 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2090 0 obj << -/Length 2055 -/Filter /FlateDecode ->> -stream -xÚå\[oã6~ϯ¶/°áð*’ƒ¢è¶;é¶ØîÌN²@i‹Ž…È¢*ÉIÜ_¿”%wƲ-§hŸ¬Häááå;wG·Ž¾;ûæúìÕ¥À‘F:¦qt=‹bŠb)“Ñu}˜¼7¹Ijs~AžüÇ6¦îg¶êšyÿñŸvúµwÝ?]ýûü—ëÜ0„ -DGíªY妞ÓÔíg7:‰”=fíè<–HR]¤e?>SŽ T“WÝ¡qÛñìÍõÙ¯gđljDŒbÍ"© Š1¦‹³¿à(u߈k=¬[."A0¢,vÏytuöß3ܯ>¸"Ú\#‚㎧Ÿ)k.6Ý^]º&ëyð¶BTKÏ[O­2ñT­%¥;¼kŸT´0îTé‡ê¯þä¨>lÜgÍ(qç@’u²0cñÄw£[÷bg£Á S'>ôxܦˆÀ`f=ˆ’¢~{ ƒV -M±è$óÓ±ž7‹²YÁÁ¿ŽØÆ® '[h¸:¥ÖÒ m-_Zk¯Ñ"ÆSÚB¤õxNö€~˜Èg.2„ó=¨ìƒ\ßÿ àöL@ µÐ)£ÉvÙ”K`Ûn)€2y«™Ü,LÑÔP[!r[·!5õÔi²ÃÃó°ça6^:g@?–ÁÌzÀ’+Äh‡J;ó4®ö¦P¾BOã]eî3»¬½ClóäUÎ -§ûÍÇn, 35“W‡×òëÇE¾“¾:Ü1D»çª+1BÛ qAœ·F)qsHˆc—Þ”™‡ÿÄDT1Ïâ”!ÇÓúaú!œY¸~àT"¢{ýð¿2MÀê!µÓeká$Mf‹#ûwÆ”>Õ -öÖ¸“_}nºS÷‘ˆS.˜VˆnLäã.’úÎvL93]·`R"NãÑ`7 »pfá°cëD6ïvôM‘ÜäPØ-k -1ð»Â“c€ò°ÿö=pVP“Ë!!ÀQóL:µÌNõdÂóMɯ—ðxooLÕt²ãªIVÍGÙ‘©yôœ8-¥FÌ}áãåIô…G0³ÂcªîƒÞ—oßØA¯Ì¯Ë¬2àøGÜà¡JÊ -u°ànYŸ^ à‹¦Êv+Ÿ‰#ª^ ·gŠ>¢Çoú¤U D¥zYÉCµp—Œ'y¨sƸ/Ý2 &y™…KªÜR÷žâeöµY -[xmázHHöéôŒW.ç&·Ó»1*w,–å>d<­øÓ›™$OxUÕ -“¶4à´· v¸#%­1¨J¢xÄd÷6ù0˜³ -G©ÆHiº)® TçNíb‘@Õ—i ôRûb™7Y UÓS[®ªìväznó4 ¤8ŠGɈïüWŽî.˜øþS™ÿ7÷ -endstream -endobj -2089 0 obj << -/Type /Page -/Contents 2090 0 R -/Resources 2088 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2039 0 R ->> endobj -2091 0 obj << -/D [2089 0 R /XYZ -11.232 900.716 null] ->> endobj -2092 0 obj << -/D [2089 0 R /XYZ 56.693 743.105 null] ->> endobj -2093 0 obj << -/D [2089 0 R /XYZ 65.161 742.547 null] ->> endobj -2094 0 obj << -/D [2089 0 R /XYZ 65.161 731.588 null] ->> endobj -2095 0 obj << -/D [2089 0 R /XYZ 65.161 720.629 null] ->> endobj -2096 0 obj << -/D [2089 0 R /XYZ 56.693 674.71 null] ->> endobj -2097 0 obj << -/D [2089 0 R /XYZ 65.161 674.151 null] ->> endobj -2098 0 obj << -/D [2089 0 R /XYZ 56.693 628.233 null] ->> endobj -2099 0 obj << -/D [2089 0 R /XYZ 65.161 627.674 null] ->> endobj -2100 0 obj << -/D [2089 0 R /XYZ 65.161 616.715 null] ->> endobj -2101 0 obj << -/D [2089 0 R /XYZ 56.693 570.797 null] ->> endobj -2102 0 obj << -/D [2089 0 R /XYZ 65.161 570.238 null] ->> endobj -2103 0 obj << -/D [2089 0 R /XYZ 65.161 559.279 null] ->> endobj -2104 0 obj << -/D [2089 0 R /XYZ 65.161 548.32 null] ->> endobj -254 0 obj << -/D [2089 0 R /XYZ 56.693 511.335 null] ->> endobj -2105 0 obj << -/D [2089 0 R /XYZ 56.693 483.898 null] ->> endobj -2106 0 obj << -/D [2089 0 R /XYZ 56.693 437.467 null] ->> endobj -2107 0 obj << -/D [2089 0 R /XYZ 65.161 438.15 null] ->> endobj -2108 0 obj << -/D [2089 0 R /XYZ 56.693 392.231 null] ->> endobj -2109 0 obj << -/D [2089 0 R /XYZ 65.161 391.673 null] ->> endobj -2110 0 obj << -/D [2089 0 R /XYZ 56.693 344.512 null] ->> endobj -2111 0 obj << -/D [2089 0 R /XYZ 65.161 345.196 null] ->> endobj -2112 0 obj << -/D [2089 0 R /XYZ 56.693 298.035 null] ->> endobj -2113 0 obj << -/D [2089 0 R /XYZ 65.161 298.719 null] ->> endobj -2114 0 obj << -/D [2089 0 R /XYZ 65.161 287.76 null] ->> endobj -2115 0 obj << -/D [2089 0 R /XYZ 56.693 241.841 null] ->> endobj -2116 0 obj << -/D [2089 0 R /XYZ 65.161 241.282 null] ->> endobj -2117 0 obj << -/D [2089 0 R /XYZ 56.693 194.122 null] ->> endobj -2118 0 obj << -/D [2089 0 R /XYZ 65.161 194.805 null] ->> endobj -2119 0 obj << -/D [2089 0 R /XYZ 56.693 147.645 null] ->> endobj -2120 0 obj << -/D [2089 0 R /XYZ 65.161 148.328 null] ->> endobj -2121 0 obj << -/D [2089 0 R /XYZ 56.693 101.167 null] ->> endobj -2122 0 obj << -/D [2089 0 R /XYZ 65.161 101.851 null] ->> endobj -2088 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2125 0 obj << -/Length 2115 -/Filter /FlateDecode ->> -stream -xÚÍ\[oÛ8~ϯf&6,ØvÚmbº—iX Zblm,Q#ѹ̯_Ê—i¬ÄÎa(yö)¶L‘ü¾óñ*8™'8ùpöÃåÙë÷'Ê$•ÉåU")’i¢C,M.‹äËùOfitg^]PÏÿné6¯l»ùàÛßÙük¯7_þóùÇW?_~ôÝ\‚2!6Ö>»û¥éƸ®ÿÙ÷Nå{—¬ïË¥T%e鶖yƒ©:½ùC¨ìo<ûÛåÙ/gÄ›Ç I„D2cIš$1MòêìËÏ8)üoÞÄ3•Ü®[V‰ Q&ýçeòùì_gx;øàˆìló ,7>}¥T¬½ØÝöú½o²~Þߣ—Êÿ°nüI¯ÚÒýúêBb|þÑ躳õ›W„ú¯z嬳9ºë–Ú4(Ê›²+mÝ_Útá¯ï¥ÿóaÿ±ýd‘”&)ó®qÖ?v]`?ˆ\&e*KZ“\=|Î=kO_}ÜUˆ(¾ë`c˜ô­cí D$Ú˜ Ô¤‡‡k@¢Œf#8»6ØΓ͇Ÿ¶‹bo‚wŽ3‚¸ õ<ÿµ(L±·*[J¾¬'¹²EyUæÚù‰î`·8 k×­šÆ¶Ö¸6ƒúÜ QÏ•©ÝþsùñAÛ nûl Ìþl5˜^_þQ‚ùÕŠ ¨¡~ý¯¨9ð÷0‡`Š¨"/àwú¦,6ñ¶Õ•iw2_Ú®Óí}]ÈŒ"F²éèB*‚<ÅNÅûæãÈ"ÚU8WHÅ‘äi0WÔ¶­ô²üÕ ñtqOç]£s3.¯ü¶¾¾9ð戞‚F&6}cK(½–]ï@YÏaíí¬ÝlδðÑŠÕȓйVßÚzÑV À/Lñ`ar•!!³Ç|Åo4™×KßZ¥ë·mså˜ÔË.L¦ã€}û‘$í,€”@XIßCÒ›_榇âäócìÅ2'ô”Lr¾VÓ¿sc && `”!‘NÁöíG®Þhgb•HõWú)}_ÞAcØÉÆI–½9® wK.(E«ÃŒº°«%ð)V”ÎÀ†}”ÒÀ`¢kËÙÊMÛ: ¦y¹>^ -)FB©SÒÈR$S>ò¼¬—emøG(ÿ¨„LÇ?Î(t2þØãŸxgáü#F˜Kh „­©š¥†¬Ïæ¥3³r¶,‡úõù=ñ%”H÷iý2¾>©nçÐí|ÙLzn=ߌ«ÌÁ·æÊøîóÁÒ*ãT!…'QÆÂ/å4cÓa{ß~$¶£…+c¿ñ·É‘Cxù#t”GŠM—±ØåhgT(Dè6c©ëâeðÚ^þî°[X%Ý;7œåâèŒôäj;ܽëÌÈKži¼¾‚Æ©¨Ùf­Î¯{ñÎQ‚?iêSP¿ùÝ¥é{™0÷)°Bæ=öÍGÒN¬«¬C¢»¼Á'{Daò¥n×e’qõBn«j(BŽï(gK›_´ß¨œJ®t÷ãæ -ûG ›wëõa×N”& ns~xŸG"öaŸ’SrW¾kœŽÌA…ÍgÖ^Wˆp> qIQb2Ø£¡xgá<Ä%÷šm&õßM¡ÁÕÏÊtžõ„žÙPþ¬êJ»|uc[[})èx¯þ²ô¤ cQÅFgW]¡»[3ƒ>9ˆÑ !G8brºÀ?° ¹hg GR$yœ³ HfbÓÚ«r . -æ Ý8ÓŽ«;.ß~x1v½†béIË=Ly@ -52vûLŸoˆ˜,õÖ39|™L‘`édð؃o¼³pø²#EÃ+>î¾±O¥ ¾bëI¿4ºûÚ6Ý}W”7OÝñ—ã¹ß,”OXè{'P¼1¯?i}ƒq‚$ãc–W¯lóàp¡ÿF|mÜÓ‡w¦ $ó¾¦AÅ(%ÓAö#!íl$ixęμ½\˜ ç¦6í°®r|cYÖ…¹—tkz»0uË`±Ð@Ðo+Ý^wÕVFú“Ñì”lD3¾.‚Œýç­neÞP UÞžNG54eH}+eN5ûqTï,œjhšú’Átt\Hý¤ÝâÓã¦ÒËÊïê íôKe9íR–˜<õÖÅK€Yú]Yö"ÌU½Ú@ôsUºÅ •åp2…0pgMiŠ°œ®`:° ÎhgÀÉ0b‚ìÞÒ©àiõU]›Ü<>Su8ítçZ=¶ÒÈm]”ðÔ>ÑpÌ]ÓúQ€µ ŒÙ”HDðtEèýÈ•ílÀÊ%bÙ¶½’ÝÈ¡¢Ñ]WÞ7‘!¼N"Dž’×I†Åôÿƒ×‰ê_”›°RJd†ètškß|6¢]…C£IÈmÊíÝãúÝ÷‡÷LnäS¬W6à…²î\k±ã/©x0›r^Üagÿ59ôØpCv ­é´œfîc+xëxë1XˆPˆÑéŠ û‘à‰v6=²x»e}6š‘·ý‘îÀu,½Úöئ®¯G~ýéãªs+ Í–zX¹ˆ|DÄØI „QÄÉØ…†ÜV­MíBÂõžˆ + „ijé* û‘Øv6»„£T…§6s[Œü–]¹Z¿îŠ.ÿñvd…«Û!Ý4Æï³îÆÝd{o]™/ÍKÓ³ÏÃc$Ø„*rß~$š¢ @fHÑmæî xgóaë?ÑžOÍóñÓfaëò w¾âáï§I™I¯_€Á#K‘àS¤ý§ŽÞc ýG'ÿèCéQ -endstream -endobj -2124 0 obj << -/Type /Page -/Contents 2125 0 R -/Resources 2123 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2039 0 R ->> endobj -2126 0 obj << -/D [2124 0 R /XYZ -16.307 900.716 null] ->> endobj -2127 0 obj << -/D [2124 0 R /XYZ 56.693 742.142 null] ->> endobj -2128 0 obj << -/D [2124 0 R /XYZ 65.161 742.431 null] ->> endobj -2129 0 obj << -/D [2124 0 R /XYZ 56.693 694.923 null] ->> endobj -2130 0 obj << -/D [2124 0 R /XYZ 65.161 695.606 null] ->> endobj -2131 0 obj << -/D [2124 0 R /XYZ 56.693 637.14 null] ->> endobj -2132 0 obj << -/D [2124 0 R /XYZ 65.161 637.823 null] ->> endobj -2133 0 obj << -/D [2124 0 R /XYZ 56.693 591.557 null] ->> endobj -2134 0 obj << -/D [2124 0 R /XYZ 65.161 590.999 null] ->> endobj -2135 0 obj << -/D [2124 0 R /XYZ 65.161 569.081 null] ->> endobj -2136 0 obj << -/D [2124 0 R /XYZ 56.693 522.815 null] ->> endobj -2137 0 obj << -/D [2124 0 R /XYZ 65.161 522.256 null] ->> endobj -2138 0 obj << -/D [2124 0 R /XYZ 56.693 475.99 null] ->> endobj -2139 0 obj << -/D [2124 0 R /XYZ 65.161 475.432 null] ->> endobj -2140 0 obj << -/D [2124 0 R /XYZ 56.693 427.924 null] ->> endobj -2141 0 obj << -/D [2124 0 R /XYZ 65.161 428.608 null] ->> endobj -2142 0 obj << -/D [2124 0 R /XYZ 56.693 381.1 null] ->> endobj -2143 0 obj << -/D [2124 0 R /XYZ 65.161 381.783 null] ->> endobj -2144 0 obj << -/D [2124 0 R /XYZ 56.693 334.275 null] ->> endobj -2145 0 obj << -/D [2124 0 R /XYZ 65.161 334.959 null] ->> endobj -2146 0 obj << -/D [2124 0 R /XYZ 56.693 287.451 null] ->> endobj -2147 0 obj << -/D [2124 0 R /XYZ 65.161 288.134 null] ->> endobj -2148 0 obj << -/D [2124 0 R /XYZ 56.693 241.021 null] ->> endobj -2149 0 obj << -/D [2124 0 R /XYZ 65.161 241.31 null] ->> endobj -2150 0 obj << -/D [2124 0 R /XYZ 65.161 230.351 null] ->> endobj -2151 0 obj << -/D [2124 0 R /XYZ 56.693 183.238 null] ->> endobj -2152 0 obj << -/D [2124 0 R /XYZ 65.161 183.527 null] ->> endobj -2153 0 obj << -/D [2124 0 R /XYZ 65.161 172.568 null] ->> endobj -2154 0 obj << -/D [2124 0 R /XYZ 56.693 125.06 null] ->> endobj -2155 0 obj << -/D [2124 0 R /XYZ 65.161 125.743 null] ->> endobj -2156 0 obj << -/D [2124 0 R /XYZ 65.161 114.784 null] ->> endobj -2123 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2159 0 obj << -/Length 2727 -/Filter /FlateDecode ->> -stream -xÚÅ]mÛ¸þ¾¿BHvt’"%ê®í¥÷’îoÉ(mÓkueѧ—ìn~})K¾D’_†¦è~²W¦†#jžá<Ã!w~¼úööêÅ+Žƒ%‚ÛeQÅ ! -ãàv¼»~­2%Kõü†r|ýw]©²ýºÔEû¥Zu?~¯çßj}ßþñï7¿<ÿpû³é憔pÞJ{S=eª\)U•ÍϦwÓ{6½³(F1Á GIÜõÏ°‹ëí¡QsãÕ·W¿^#$àŠ’0ˆ‚"LƒùúêÝ,ÌoFÄ׋Ô¨õ²Ðë^Ëîú³îâø¶ë‡4_è‡rp×µ14Ž߶•Zi˾ÞÞ¾õ#ž!¨õR3–æWë=ðy½˜"*Èèý›¬‹´úÔb÷g%óRç;ønR ÌF E!Iüa6Ïæ ²}ñnˆuVØH0±n.y»YÈJ-`\èy½Vy%«Tç@Øš9&{¶ÔÿÉäLe#Cø¢Z ÛCAÅÂLéä’ ‹8GŒÇƒ.K˪´Á3Z$Ì#îB†xÈý¯/ßyÎÊZ@/Œ‘ aûJÿºX@WÖ›.ª‰!ׄ©—ÄæAùÿü Ö.:¹Ì2]W[\œíLX×¼¤wÀEax†wx­gʘGMWò©úìÚ€ÚÂ;ðD4„Ç›sàÂH$Ä›sÈwsîÊÂ7„'I’ŽZ!Þºà@ú.Óe)‹' ôe%g Ù†ôU‘ªŠæ2]·V¼H?žgn¢ž˜ÒKâ™G ,¦Å³ñîk™Ùà™-÷h†‘±?@÷å;ÚYY @3fˆuÌX¯7™ªÔ&üîòŸ¾9<973:LøæîaˆRsÿŸŸ‘gßüå8‡Ç!iÞu¿õiæqTø³»¾|G»sVÖÂîÂQÒ¥U¦ÊôÉ•Ög;Xjž4L.ê`1C˜ò‰é”™ð2eá` •B8¢þ,!"8ôfèùn†î®,ÜЙˆP˜t9¬Ÿò‰YÏÖ aŸOez~­Ìd «‘ô?÷¨Î%)­TgO´ò^©«¬ô2gËÓ#\jè3ÊÊrºb±ùdþòQ쬬ŠcŽXØ- Ès±y°éZ©Î¬Pò~_ õs|$”ReA¿ôÔn -š<ù(³zäpÌ£‘>§šÔál$tyhßë8â~·÷Ü®R` ó s¥FN÷4Ö ó#Â_t ßëÎÊZ`=bˆÅ]Š«Ló¹š º® “Ãrê~5Í侂b¦¬‹B×ù¢ô °…‡\A±0Å\}<†zH«Õ Ë{¼¹Îêu>¦§‡ïÙƒ|¥‘žAƒ}Ž¥þ’ùŽÈvVÖÙ> endobj -2160 0 obj << -/D [2158 0 R /XYZ -11.232 900.716 null] ->> endobj -2161 0 obj << -/D [2158 0 R /XYZ 56.693 741.747 null] ->> endobj -2162 0 obj << -/D [2158 0 R /XYZ 65.161 742.431 null] ->> endobj -2163 0 obj << -/D [2158 0 R /XYZ 56.693 694.923 null] ->> endobj -2164 0 obj << -/D [2158 0 R /XYZ 65.161 695.606 null] ->> endobj -2165 0 obj << -/D [2158 0 R /XYZ 56.693 649.34 null] ->> endobj -2166 0 obj << -/D [2158 0 R /XYZ 65.161 648.782 null] ->> endobj -2167 0 obj << -/D [2158 0 R /XYZ 56.693 601.274 null] ->> endobj -2168 0 obj << -/D [2158 0 R /XYZ 65.161 601.958 null] ->> endobj -2169 0 obj << -/D [2158 0 R /XYZ 56.693 554.45 null] ->> endobj -2170 0 obj << -/D [2158 0 R /XYZ 65.161 555.133 null] ->> endobj -2171 0 obj << -/D [2158 0 R /XYZ 65.161 544.174 null] ->> endobj -2172 0 obj << -/D [2158 0 R /XYZ 56.693 497.908 null] ->> endobj -2173 0 obj << -/D [2158 0 R /XYZ 65.161 497.35 null] ->> endobj -2174 0 obj << -/D [2158 0 R /XYZ 65.161 486.391 null] ->> endobj -2175 0 obj << -/D [2158 0 R /XYZ 65.161 475.432 null] ->> endobj -2176 0 obj << -/D [2158 0 R /XYZ 65.161 464.473 null] ->> endobj -2177 0 obj << -/D [2158 0 R /XYZ 65.161 453.514 null] ->> endobj -2178 0 obj << -/D [2158 0 R /XYZ 56.693 406.006 null] ->> endobj -2179 0 obj << -/D [2158 0 R /XYZ 65.161 406.69 null] ->> endobj -2180 0 obj << -/D [2158 0 R /XYZ 56.693 360.424 null] ->> endobj -2181 0 obj << -/D [2158 0 R /XYZ 65.161 359.865 null] ->> endobj -2182 0 obj << -/D [2158 0 R /XYZ 56.693 313.599 null] ->> endobj -2183 0 obj << -/D [2158 0 R /XYZ 65.161 313.041 null] ->> endobj -2184 0 obj << -/D [2158 0 R /XYZ 65.161 291.123 null] ->> endobj -2185 0 obj << -/D [2158 0 R /XYZ 65.161 269.205 null] ->> endobj -2186 0 obj << -/D [2158 0 R /XYZ 56.693 222.092 null] ->> endobj -2187 0 obj << -/D [2158 0 R /XYZ 65.161 222.381 null] ->> endobj -2188 0 obj << -/D [2158 0 R /XYZ 65.161 211.422 null] ->> endobj -2189 0 obj << -/D [2158 0 R /XYZ 65.161 200.463 null] ->> endobj -2190 0 obj << -/D [2158 0 R /XYZ 65.161 189.504 null] ->> endobj -2191 0 obj << -/D [2158 0 R /XYZ 65.161 178.545 null] ->> endobj -2192 0 obj << -/D [2158 0 R /XYZ 65.161 167.586 null] ->> endobj -2193 0 obj << -/D [2158 0 R /XYZ 65.161 156.628 null] ->> endobj -2194 0 obj << -/D [2158 0 R /XYZ 65.161 145.669 null] ->> endobj -2195 0 obj << -/D [2158 0 R /XYZ 65.161 134.71 null] ->> endobj -2196 0 obj << -/D [2158 0 R /XYZ 65.161 123.751 null] ->> endobj -2197 0 obj << -/D [2158 0 R /XYZ 65.161 112.792 null] ->> endobj -2198 0 obj << -/D [2158 0 R /XYZ 65.161 101.833 null] ->> endobj -2199 0 obj << -/D [2158 0 R /XYZ 65.161 90.874 null] ->> endobj -2157 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2202 0 obj << -/Length 2874 -/Filter /FlateDecode ->> -stream -xÚÍ]Û’Û6}Ÿ¯`%«©Ú ðƵU›lÖ‰_{¶ì*'‰‘¸¦-HÍe¿~A‚šR·†@8yÄi¶ÀsÝ Œï-<ßûáâ»ë‹g/"ßKQ“Ø»¾ñb‚âÄ£8@Aâ]çÞ§Ù;^rVóË+ù³7¢áµ~y#¤~Ñ,û¿ÙwB|Ö¿||ÿêò÷ëŸÔm®0Fiik’×KΛºýXÝ{TÝ=Ú»‡q‚B½«¥Iÿ+ƒ =Ó?0‰Û?¼øçõÅ.°2ï{Ø‹b§—¤Å>ñ²Õŧß}/WŸ)P˜Rï®»råEØG$ˆÕëÒ{ñë…ß„¯\l_¶?~xbYNˆ—„¢˜¶–Û÷ JiêáöêÔ“Ü»9hé¤ýáíG>FILAwx: -1JI:³A¹ðô‹w=PÔw*쀲u¬¹,‹ê3Ðp³d ìJ&9ì“Ÿy»v³†]wW4K ÅöË.Uä¯ýþf¾i £Å`WæÅhvK­ DT!Óµ†ö-©eí¬µŠpØGÁJÕ’UyÉ¡«^— ødÿ@r«hÅ«frjßñ?·Os…È!SžZ·ä‰¥£,! ”j–Üï ‚ß ‚³¥ä@T³¦‘…Š—¼›GÇcìõ²â6SÔ]ñÈò¼6ˆEµ˜˜’ÍRÔ@_…š=¤)бMˆÝA}hßìÖÎÀLj¨{vpßOOû¼bs8$Úô~âÀO'vø|ئ€]77›¡AŸç \Á.¥Äʇö-Qní¬Êý‘>ó)*h¨F/jµYÍUŽCƒ§h*±;EtþæGþá‰(çk^å`NŠ -˜b€S¡[Vnx=qDØÔÆ”ˆU ï“Ð%Föí(aï,œq¢c͉%›üQíËœ§6³z)î€\«r7.ì§ÛAók&Ù -xmÍ›³få•â9î> vê#?ŽÜ}hßìÎœí#ÖJ’³ÁÚ· kg ˜Ÿ¨:æ·ìÔepã¤DUù0u1£RLÊF½Y¯…l¾ˆhq:&DZõqFƒ¡}KX;k@ƒ£0è—ààÎXYN´o‰w[g£;òQ˜ôë(Çk°jÖŒÇéÓ˜ãh3©Ë àD)Ъ‡3 í[‚Ä™³ý`®8v6ó–CaëªÁô@(Š¢^v$º–µ€ÆÁÛÉ‹i7¹™<, ¡ºXdQŸ¢Ö%³3¦ í[RÅÚY®àEi/"ïÍ8ì«ù¢‚*² 8›ñ»}IÑWGVw¶=©ÚF–Wzû«ã3gÅVPIñ@:8{8ý‘;…ydß’ÖÎPÀQû†.&ÎBFΞUŠÅ¿GV ¦8ÆKçQªUWLÙ·c‚½³p&Di„bÚ Ëªå?& -GTh)ÑV†p·@1²o‰#gÎöƒ‘èªÕÙ` í[†µ³¤Jåi¯Ù~`²§ØGûR: ¾¬¦ž[o¥‘È'—šsÞp¹**hu_ÀÜ®™N QŠ"쮚Ù·D°µ³VDý>CÒëàÓ6b°º.Õ´69ƒ - ûábÛWÀï¼+VZÎŒ'úwÚN~žp{š¡–Qœñahß’ÖÎð!ˆ†ýòâöã/ Ú¿Íï×’+J@[;ÀëPÛ yî–|·—ɲx_3ÙÙ¦d¦ý Q ¥ -gxÚ·Ä£µ³x }Diâºïµ¨ê†UŸvÊŸ‰âéóSñšd˜’Ô<ü’N–p†öyK°Ûºj€u’ª[öÚ~Å3õ˜,Àí@M¡çŪ‚,2UCæ«;7 ¼ ¯pL_AËcÉo9+ÏMûOãk±ÁÀ‡ö-ní¬ÄqûV/ÉC‘˜ ^Wã`÷—ÃaßÁ"°^”±ZôA›U4æÙ˜…À^ èJ^-VÊœUךìS¦äñC”wbþȾ%y¬5 O‘͸Žˆ‹ÝSoAÐþŠVДç*šaªµ*W°Ù·ƒ•;gûÁ Zöp6Cû–ƒaí,œc!‘ŸM²”¢Þ¿ÍákœPU*§'wÅ1øVm ­~æÀ¬üµÐ½kà*[ò¶…œí¤„§YšhýÁ0‡ö-ií¬0õ3è¥öFŠÍ¼U¹…h¦ßᶖB_hcŠhôD NPÆýè‡eÿO}Ži‡8‰Òî þHŒ0 ˆà~tÔÇᘴØW_ìÇëׯúã8žâ{W$D䱩ŠoOþ(KqI¢Ù];ÄÝ[ºª?dÉ.‰?»½ÄѬÿ‹9WÜì^­XÞ¿§hýx|Hwkåíÿo©J’öœ½á¥Y•{T%hèãíEÝ‚Eg³.ZÉbx:‰Âs€ˆ~-õ™&h8Wcõ õB%þÛ÷¿ ®Á"õ\·.üÜî¼ìÀò‚-Ë…äÕ7—W˜<öK¢ûº|®/¨*±nÂ'Hˆú¶© |ŽÏ}AÛaí. ÍÛkWáñ%ˆƒž„œx?êŠ}FŸ-I'>Âm6L.xî‡.PܲÒøÄ j9‡Åѧ¦£A¡Ói#BÃÔlbTX¢!vpˆ¨ÃýÈ#û–!ÀÚYƒ€© ý@¿Ísh™×4P1ÏÕ) -Â&?6eÉn¹ÍŽè#‹ 'lMÑì|ÿÓ4SY}ÚÉå>¼š"M]æż,„Ax!IŠH¸ /Då¿ŠµÎÂËȾ]x±w^H¢Ï­3‹/¬Ê–ª’X›êP“·¦¬!껨 ꋲ&$(¢dZڨغbå“4ýµJÐnŠ’÷¿¶•H3/Mx¥J°ÄòŠà΢3^ í[òÊÚY^©„ÉßJ/«¢) K[Ù’gŸ‹µ•g‡×VV\‚wF×Þùz37IÎs²+`#¸ØYKq[äP|TÞaàãz#d]“‡Žþ·¹˜›v’V€¡îº Gö-™hí¬U²î'á¶{*‡*ºàã/·a|Z ¼5X\}Ç‹²|8W$í¬Ò §Ï=gûêg©zŠ{©áíüß<¦/óö¡Ý\ÖGŽ¼:ô×ï9/Þí_UNƒ0 Âã7ç˦YïtË>{f„ö#ûÑ„\œ›ànEË]/ÆȾ%l9ÛŽPºÓ‹Fö-ÃÚYcŠ’ >®´›h·A¼ûŸ>ë¬I¹9JëÅ[ðñëÑ ÷ºÉé¯ù¢Xl  Wà£0À%N4 o{\ŠM™OÛ¦¦ÛEMñ°¢º[mÙ·$·µ³än‹‹¤­ÀÑ©¡ä¥JQEeú º?®ÅFfSX ߦ­gOŠêÙ…iò%¥åDØ(8£ê|ÓÊÇ•Ž8XY/wuå­}ÿÆ&lÚLÏù/6ÿZS “ -endstream -endobj -2201 0 obj << -/Type /Page -/Contents 2202 0 R -/Resources 2200 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2039 0 R ->> endobj -2203 0 obj << -/D [2201 0 R /XYZ -16.307 900.716 null] ->> endobj -2204 0 obj << -/D [2201 0 R /XYZ 65.161 760.065 null] ->> endobj -2205 0 obj << -/D [2201 0 R /XYZ 65.161 749.106 null] ->> endobj -2206 0 obj << -/D [2201 0 R /XYZ 65.161 738.147 null] ->> endobj -2207 0 obj << -/D [2201 0 R /XYZ 65.161 727.188 null] ->> endobj -2208 0 obj << -/D [2201 0 R /XYZ 65.161 716.229 null] ->> endobj -2209 0 obj << -/D [2201 0 R /XYZ 65.161 705.27 null] ->> endobj -2210 0 obj << -/D [2201 0 R /XYZ 65.161 694.311 null] ->> endobj -2211 0 obj << -/D [2201 0 R /XYZ 65.161 683.352 null] ->> endobj -2212 0 obj << -/D [2201 0 R /XYZ 65.161 672.393 null] ->> endobj -2213 0 obj << -/D [2201 0 R /XYZ 65.161 661.435 null] ->> endobj -2214 0 obj << -/D [2201 0 R /XYZ 65.161 650.476 null] ->> endobj -2215 0 obj << -/D [2201 0 R /XYZ 65.161 639.517 null] ->> endobj -2216 0 obj << -/D [2201 0 R /XYZ 65.161 628.558 null] ->> endobj -2217 0 obj << -/D [2201 0 R /XYZ 65.161 617.599 null] ->> endobj -2218 0 obj << -/D [2201 0 R /XYZ 65.161 606.64 null] ->> endobj -2219 0 obj << -/D [2201 0 R /XYZ 65.161 595.681 null] ->> endobj -2220 0 obj << -/D [2201 0 R /XYZ 65.161 584.722 null] ->> endobj -2221 0 obj << -/D [2201 0 R /XYZ 65.161 573.763 null] ->> endobj -2222 0 obj << -/D [2201 0 R /XYZ 65.161 562.804 null] ->> endobj -2223 0 obj << -/D [2201 0 R /XYZ 65.161 551.845 null] ->> endobj -2224 0 obj << -/D [2201 0 R /XYZ 65.161 540.887 null] ->> endobj -2225 0 obj << -/D [2201 0 R /XYZ 65.161 529.928 null] ->> endobj -2226 0 obj << -/D [2201 0 R /XYZ 65.161 518.969 null] ->> endobj -2227 0 obj << -/D [2201 0 R /XYZ 65.161 508.01 null] ->> endobj -2228 0 obj << -/D [2201 0 R /XYZ 65.161 497.051 null] ->> endobj -2229 0 obj << -/D [2201 0 R /XYZ 65.161 486.092 null] ->> endobj -258 0 obj << -/D [2201 0 R /XYZ 56.693 449.064 null] ->> endobj -2230 0 obj << -/D [2201 0 R /XYZ 56.693 421.596 null] ->> endobj -2231 0 obj << -/D [2201 0 R /XYZ 56.693 375.013 null] ->> endobj -2232 0 obj << -/D [2201 0 R /XYZ 65.161 375.697 null] ->> endobj -2233 0 obj << -/D [2201 0 R /XYZ 56.693 328.445 null] ->> endobj -2234 0 obj << -/D [2201 0 R /XYZ 65.161 329.129 null] ->> endobj -2235 0 obj << -/D [2201 0 R /XYZ 56.693 281.877 null] ->> endobj -2236 0 obj << -/D [2201 0 R /XYZ 65.161 282.56 null] ->> endobj -2237 0 obj << -/D [2201 0 R /XYZ 56.693 235.309 null] ->> endobj -2238 0 obj << -/D [2201 0 R /XYZ 65.161 235.992 null] ->> endobj -2239 0 obj << -/D [2201 0 R /XYZ 65.161 225.033 null] ->> endobj -2240 0 obj << -/D [2201 0 R /XYZ 56.693 163.126 null] ->> endobj -2241 0 obj << -/D [2201 0 R /XYZ 65.161 162.568 null] ->> endobj -2242 0 obj << -/D [2201 0 R /XYZ 65.161 151.609 null] ->> endobj -2243 0 obj << -/D [2201 0 R /XYZ 65.161 140.65 null] ->> endobj -2244 0 obj << -/D [2201 0 R /XYZ 65.161 129.691 null] ->> endobj -2245 0 obj << -/D [2201 0 R /XYZ 65.161 118.732 null] ->> endobj -2200 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2248 0 obj << -/Length 2869 -/Filter /FlateDecode ->> -stream -xÚí]msÛ6þî_Á釻äæŒà`Û¹™¦½¶é5™»Ø3×™$ ¶x¦H•/±Ý__P¢›ˆ²Ì…@¸™›|H$KàrIî³»Ïbáè2ÂÑ'ÏÏOž}/p” DR_D’"GŠ0Äâè<‹ÞÂ-ð%Šs‚8¬ç»ªÜ<ü;9ö£¿ŒÚ¯Ú±÷ 9•?é¬qƒÞ4Åøì_>{Z­oar&Õ`%ràUYx¦¦í X›¦+Ú¼¼„ ·žceJ Âm½[ÀUÎ|ñ^G–vd³Ö)p¸Þ}Lâ#p• !ûÕo1Ç[Ïi½Ú‡Q1âÖ‹ cN·òv ·ã/ïœQ*œÓÙ•ïét¼•8%VÒ:85b¹½›p©ºúÌ=×WýI›þåÇó—?¯n7r¬õßÖº]êÖÁmÖu]ü==¬Éó®ùîÝ¿ð»7$Uƒ÷ÎØ5p‰ âˆDÔ‚.˜gØ•ï鼕uð Äzc2¤¦iU¾7ukj˜­dÕü9¿\‚M·¯óv Yäöêuá’=8ùGWWÓT3ç|U x~´«^ €J†(÷!!^÷yàÀ¨d‚£C |K©»£ˆ n1=%ÔþñR_™‹¼0ÀË—Ê*#y8&e‚8Á¼ÞH¾Ÿ×óWNÂdL­9Ðí“ý&ËL3ötiÒ+ ÏÓ%PèRƒeB9Å{]çUº¬vfL©ÐÙ,º¼ÈöÜù4€„…(—áì{W¾§}{+ë`ßÒjÊØÖ¾»2ƒFôoo/¯óÒ1 =_æ 4åî.€a*²»,ngÆãJßB9yYÃÿuUCSp®d9ù±®hYܦÙ*\ùn$ßYÞÊ: K`ÇCù®­«nìã¦sº”´ÁóëÆŒ’0oïm öê¨jÏáxp³6i ´`´‚!¸¨†^Ry{»˜ ³ô•†+?ä{‚Æ[Yа)2dݦẖ„A2†K•1Ø{"©Ä²*]TÕú£?} °ÕGÒp¤A¨Ř³â‘|?+öWnÅ"±â²}¸z4 ¾ã‹Ãõ/cŸò^áð‹‡ƒ…cé}‘—¸,Ëvµ7Qôìðe6 Ï"÷&¢Oå{Ñvóy±ÃâÇUæIŒ‰XYP…ãÍ#ùžðVÖŠ"ÌèÈÛ¼*g¦7y³7#Ö#´îÃÊ4Û±YD½f(‰qš0-tz5o o<;¾­A…ãÝ#ùžøðVÖ1A8xwŸ”Ï\Sq0“u]¥– ‚ƒo© Táë¥)¡•ixä}•&À¶¤IE§d³¾ksÊ¿mÖÌÚTÇÞšŸN)²ç“Ö¤wôëvŸsš7ï&;|Ÿ¦ÍRÚÛ Â­CÉ÷4K_eû#É‘âê„ÐÔz+h÷C­Ó«ýõ\ ,O5|%(Ô5êºÖ·Gæ›%P‚<|o®M ½9|uY]­×{í-àB  -‰ø1ë4Œ $…üDê4ŒZm’€ë:á(fá˜îH¾§ñVÖ!Ï! -a:0Ýo—º¼„–RàëFÃ]þ5Û_;«×~…”éÀ8¶9&— -/j2 =ÌPdÆ»ò=‘á­¬2úÙCyÇŒ0¹ÂxA”![hÖóSZ(Ÿ†ô☆ÃvYu—Ëù›^î+ÚMB‚&)ŽäûAÂ_Y8$h"Á)nÚ¼(ŽêêÒ´¹<ŸK!˜Éƒ,ÝÄÌy»áÖ=5§[¤D8š?’ïiÜÞÊ:·²¯|Ȉ¯j—-ô¢+´Ëý”Â&Gnö¡ñÀa«*ƒ‚Ìj]èÖ|Zeúƒì)xÝy1F* WfÉ÷„…·²°è»‰ÔPxø\¦R¦÷ŽVÚu½ Jµ-ìŠ÷4v_Ul]2D©ÚÚú§X£§Üê¬H¸ç¶+ßóÁù*{°FOEZÿ\£^£§l[D -f–»ò=ÍÒWÙÃîƒÄÈçýÿe‰žÒm9(˜ïÊ÷´qoe‚&ȉÁìÁ¤ÝröÜ4à6¢™û‰3ݱ ¾šKY -Þk•Ï¼¼ùC[Ï|ÏÓel ïÖ®Ù,éëRÓÙ]ùžØôVÖ›$Aìn×®Ös*Á•>ù·÷fy³.ÀØ_‚1U[Ë~ˆ©­tj[›1Ħ·µ¬`€Ø•ï oeâwÛ|õ ¼fã4Z¹T*àF«] -…¹k!ã%eàøQŒ7´88ò×.oͼ;'­kÓ¶·¾pœ„I¶µ±P0É÷ƒ™¿²p˜‘¤ßsxXè ËèdšB'g ”Ú§ÜtsÏëæå6väóo‘¦F{eÝ ,‘äQ’©U> endobj -2249 0 obj << -/D [2247 0 R /XYZ -11.232 900.716 null] ->> endobj -2250 0 obj << -/D [2247 0 R /XYZ 56.693 759.068 null] ->> endobj -2251 0 obj << -/D [2247 0 R /XYZ 65.161 752.393 null] ->> endobj -2252 0 obj << -/D [2247 0 R /XYZ 56.693 683.362 null] ->> endobj -2253 0 obj << -/D [2247 0 R /XYZ 65.161 683.651 null] ->> endobj -2254 0 obj << -/D [2247 0 R /XYZ 65.161 672.692 null] ->> endobj -2255 0 obj << -/D [2247 0 R /XYZ 65.161 661.733 null] ->> endobj -2256 0 obj << -/D [2247 0 R /XYZ 65.161 650.775 null] ->> endobj -2257 0 obj << -/D [2247 0 R /XYZ 56.693 603.661 null] ->> endobj -2258 0 obj << -/D [2247 0 R /XYZ 65.161 603.95 null] ->> endobj -2259 0 obj << -/D [2247 0 R /XYZ 65.161 592.991 null] ->> endobj -2260 0 obj << -/D [2247 0 R /XYZ 65.161 582.032 null] ->> endobj -2261 0 obj << -/D [2247 0 R /XYZ 65.161 571.073 null] ->> endobj -2262 0 obj << -/D [2247 0 R /XYZ 56.693 524.807 null] ->> endobj -2263 0 obj << -/D [2247 0 R /XYZ 65.161 524.249 null] ->> endobj -2264 0 obj << -/D [2247 0 R /XYZ 56.693 477.983 null] ->> endobj -2265 0 obj << -/D [2247 0 R /XYZ 65.161 477.425 null] ->> endobj -2266 0 obj << -/D [2247 0 R /XYZ 56.693 429.917 null] ->> endobj -2267 0 obj << -/D [2247 0 R /XYZ 65.161 430.6 null] ->> endobj -2268 0 obj << -/D [2247 0 R /XYZ 65.161 419.641 null] ->> endobj -2269 0 obj << -/D [2247 0 R /XYZ 65.161 408.682 null] ->> endobj -2270 0 obj << -/D [2247 0 R /XYZ 65.161 397.723 null] ->> endobj -2271 0 obj << -/D [2247 0 R /XYZ 65.161 386.765 null] ->> endobj -2272 0 obj << -/D [2247 0 R /XYZ 65.161 375.806 null] ->> endobj -2273 0 obj << -/D [2247 0 R /XYZ 56.693 328.298 null] ->> endobj -2274 0 obj << -/D [2247 0 R /XYZ 65.161 328.981 null] ->> endobj -2275 0 obj << -/D [2247 0 R /XYZ 65.161 318.022 null] ->> endobj -2276 0 obj << -/D [2247 0 R /XYZ 65.161 307.063 null] ->> endobj -2277 0 obj << -/D [2247 0 R /XYZ 65.161 296.105 null] ->> endobj -2278 0 obj << -/D [2247 0 R /XYZ 65.161 285.146 null] ->> endobj -2279 0 obj << -/D [2247 0 R /XYZ 65.161 274.187 null] ->> endobj -2280 0 obj << -/D [2247 0 R /XYZ 65.161 263.228 null] ->> endobj -2281 0 obj << -/D [2247 0 R /XYZ 65.161 252.269 null] ->> endobj -2282 0 obj << -/D [2247 0 R /XYZ 65.161 241.31 null] ->> endobj -2283 0 obj << -/D [2247 0 R /XYZ 65.161 230.351 null] ->> endobj -2284 0 obj << -/D [2247 0 R /XYZ 65.161 219.392 null] ->> endobj -2285 0 obj << -/D [2247 0 R /XYZ 65.161 208.433 null] ->> endobj -2286 0 obj << -/D [2247 0 R /XYZ 56.693 160.925 null] ->> endobj -2287 0 obj << -/D [2247 0 R /XYZ 65.161 161.609 null] ->> endobj -2288 0 obj << -/D [2247 0 R /XYZ 56.693 114.101 null] ->> endobj -2289 0 obj << -/D [2247 0 R /XYZ 65.161 114.784 null] ->> endobj -2290 0 obj << -/D [2247 0 R /XYZ 65.161 103.826 null] ->> endobj -2246 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2294 0 obj << -/Length 2281 -/Filter /FlateDecode ->> -stream -xÚí\mÛÆþ~¿‚p?ä ôÖûþâM§6´ê»´ìÀ ¨½q©’Ô½ä×w(J‹:I³¢(çC¾ÜIÔrv¸œç™Ù™!itÑèÝÙ÷Wg¯Þ*9â4×ÑÕu¤9Ñ&²La¢«qôáü½Ï|\ù—\ÑóŸŠÚWíÇë¢l?Ô“å?É÷EqÛ~ùïå?^þrõ#LsÁqJµÒ.ëÇÌWïëªùfg‘…Ùµhf—ÚÃmt¡ˆ3Ëù¥Æž¿jÿ1®›Ïþvuö¿3âiÄ"¥‰v"2ŽMy”LÏ>üB£1ü -élt¿9£„ Ÿ³èòì_gt¹t늬dKGÕ­N9W -V§½z C×!›s,‘Ú‹ÁÿŒçeZÿúòBSzþ£óªÈ_¿¼`¾Þ”ñl’&y¨²V ,U#³ù÷ný"áÖ0Ã##@)š‹lŽ+ -K&uĉ³.*}týùU­I{þèæÜfåj‚V0kF÷•¯Ó¬+_QF ¬f†Ïï¸&Ž»#(»XÞDí‡÷KX»+Å#hqW¿ýxÍ6%E÷¼šÏfEYã7°B l`‡˜NoÖ‚òdy`óŒóªLFÏâz‚Ób—ñÔ×¾<ò2\þûnà -jø«[œö&+*_á¦Í»+½8ü'f­eÚ,Â9ØüÚá[þog7Ê ·ìÈì–LæùíERL§EÀpÚq"˜Žá´e|ÀP·.¾¿õVOoÚJ¢¥ ¦·iZUi~ƒäÂYœø-ÜoÆBXÂN ­‘ÊŒŸŠrç-.þgÕä ÅtVä>¯C !A '„„D 5&Öå÷EoeP! ±\´÷ômúp˜'Ø:ð~âK¤²d|ÖÖq¥y•Ž±áD~]àFÂÆa -ê"u¸G/D^ —`çã Kc³²˜ù2{\½™*`ÍSrµD qˆ³N“Iì³TÑz -YKO—Ó´~¢§YÀKÊÙf¿8-) Œ–:òûÑReñ´¤œëÜò¶wX+&õ4ûTÕŬë…/¶‡ù‹@íãýtäñáøH°ÄS#‰'Îf“xäë4‰3ÜE9îìLàªÿŒÑÄ(>œ‘®Ëïi¤½• 0RK •­^§X‹¨ý’à‹kܸ«7ÈMbå“:-r¤AÖX¡>k*Ýá_mÞYÔ€hZv$Né¹”¢ÄJw€çú!¾KÇ­·zÓ$ÊÃÜ•„ùíþŠÃ5s;¬ËïI½•  !gê´¹³åáo¾ÝŸÖ"u9‚Ó„ãßþewÆ ÑÄl©!x¯Ëù3¼µ A¸“2•„ruLèf™¾nì­ Õ|8bVFÅ`ÄБßú+‹'i5ŽýA ¿'b¸1&OI RÂI 7YQUqùÂtv@špã†cuù=Y ·², QÚ~Ä Í|<«ÓU‡¦$çDˆ“ê„sD2sä -všgiîBÔ#Õ€…:a@y7\ñº#¿_Ñ_Y|!,hjEðF"Æ&%§³,Æ:ItûJ’Ö~”Ž²´K9ûýä6˜<6…­4¿E^i\ÞxäÆ*­Ž¸Ìâ]áÄfÑ“—þÚÃôIÇtºÑµ¥ƒDB¢„Üëò{‚»·²p[E¨Õ@$”X¾,%là ¶^#Àe(3\’¶#¿ç*÷V6€B•#V/“sq>> ^ËÃ/¶Çll£'¿ØÍŠGg¤g­mGM¨ò’—€išæB¬dä¾kTÆÉ­¯ŽÝ„DÙ“&…… DõÅc7N‰a&uĨá’Àù=‰§·²Äá’ýN:«ÿú°,Z¯wìA'ÅýqAŒOô¤–úV@ ø\È—î÷¹¿dù®sÚ?GéáZ6[O_ ¹;KŒŽü~Ðí¯lt)‡m™¹¿‹³9¶ç0ƶû-AãM+ÛŽJKQ–¾š9>ñM¼„\jg£²ßX?²x“ŽŽ‰OÏÔ­öLrøã)û!f ±¶åwä÷„Xoeñ㎶jAž?ç›vð}Ènþùgt{\Åö°þß±-¹wHØÇU5Ÿ¢[Æ&qýÅ{Hɧ¸óe‰î¹>ÆMß?£‰5Ã%:ò{⯷²økªázÕLj%@غú2Ç6 þü  Æªàˆ »+Nžv«ž/¾Í)y+8™ ñ 6.3‚XkO¹[å -$ù¥w«\2Bn·ÊaWNlkîÈïɽ• à!ˆá­÷>ÉÀÁâû‹±ùí¦õ­›4ßíFY‘Ü=æ[âä‘iýxÜh»íîëjüjG[t£Dê˜ò|ûîÇ"7„ž¶•šSIØA­Ô»Xh’‡{?B^9s ÆÕÌ -Âì¨îÈïÇBý•Å³³š¨:ªò?úɹë4Cï°“Iwä÷„poe ,˜Ã2íýfç7]9*ð)­ë²˜f†îÓ|\ÜoxO04E÷dˆê"p®Ÿ¯ÞnÌc_ Ñ Á˜d'}Ys#;½ï‹‘/ë%tëø±þÍó¶è --†lVnš(ìU^ß´½UÅcÖqbõo/É N….ô.,?gYÈ£X×ßô÷¦ø· „\Ø8½;¸†Ý„FC8ô7ŽIØujwÈ Çþ¸e‹° -endstream -endobj -2293 0 obj << -/Type /Page -/Contents 2294 0 R -/Resources 2292 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2291 0 R ->> endobj -2295 0 obj << -/D [2293 0 R /XYZ -16.307 900.716 null] ->> endobj -2296 0 obj << -/D [2293 0 R /XYZ 56.693 741.747 null] ->> endobj -2297 0 obj << -/D [2293 0 R /XYZ 65.161 742.431 null] ->> endobj -2298 0 obj << -/D [2293 0 R /XYZ 56.693 696.165 null] ->> endobj -2299 0 obj << -/D [2293 0 R /XYZ 65.161 695.606 null] ->> endobj -2300 0 obj << -/D [2293 0 R /XYZ 56.693 648.099 null] ->> endobj -2301 0 obj << -/D [2293 0 R /XYZ 65.161 648.782 null] ->> endobj -2302 0 obj << -/D [2293 0 R /XYZ 56.693 601.274 null] ->> endobj -2303 0 obj << -/D [2293 0 R /XYZ 65.161 601.958 null] ->> endobj -2304 0 obj << -/D [2293 0 R /XYZ 65.161 590.999 null] ->> endobj -2305 0 obj << -/D [2293 0 R /XYZ 56.693 543.491 null] ->> endobj -2306 0 obj << -/D [2293 0 R /XYZ 65.161 544.174 null] ->> endobj -2307 0 obj << -/D [2293 0 R /XYZ 56.693 496.666 null] ->> endobj -2308 0 obj << -/D [2293 0 R /XYZ 65.161 497.35 null] ->> endobj -2309 0 obj << -/D [2293 0 R /XYZ 56.693 449.842 null] ->> endobj -2310 0 obj << -/D [2293 0 R /XYZ 65.161 450.525 null] ->> endobj -2311 0 obj << -/D [2293 0 R /XYZ 56.693 393.301 null] ->> endobj -2312 0 obj << -/D [2293 0 R /XYZ 65.161 392.742 null] ->> endobj -2313 0 obj << -/D [2293 0 R /XYZ 65.161 370.824 null] ->> endobj -2314 0 obj << -/D [2293 0 R /XYZ 56.693 324.558 null] ->> endobj -2315 0 obj << -/D [2293 0 R /XYZ 65.161 324 null] ->> endobj -2316 0 obj << -/D [2293 0 R /XYZ 65.161 313.041 null] ->> endobj -2317 0 obj << -/D [2293 0 R /XYZ 65.161 302.082 null] ->> endobj -2318 0 obj << -/D [2293 0 R /XYZ 65.161 291.123 null] ->> endobj -2319 0 obj << -/D [2293 0 R /XYZ 56.693 244.857 null] ->> endobj -2320 0 obj << -/D [2293 0 R /XYZ 65.161 244.299 null] ->> endobj -2321 0 obj << -/D [2293 0 R /XYZ 56.693 196.791 null] ->> endobj -2322 0 obj << -/D [2293 0 R /XYZ 65.161 197.474 null] ->> endobj -2323 0 obj << -/D [2293 0 R /XYZ 56.693 149.967 null] ->> endobj -2324 0 obj << -/D [2293 0 R /XYZ 65.161 150.65 null] ->> endobj -2325 0 obj << -/D [2293 0 R /XYZ 56.693 103.142 null] ->> endobj -2326 0 obj << -/D [2293 0 R /XYZ 65.161 103.826 null] ->> endobj -2292 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2329 0 obj << -/Length 2627 -/Filter /FlateDecode ->> -stream -xÚÍ\[“Û¶~ß_Áqgêݙƕ¶ã¤¹L2u'÷¡ÛÓáRÄ,Eª$´ëͯ(Rñ’¥ƒ±é“( <8Ïwî–¾¿øúúâÕw1ŠC׋ ¤(ŒIbQp=Þ_þ¬r•ÔêjF¾üg©UÝ^.ʪ½Ð«îÏoÊôë²¼m¿üûÝ?®>^ÿh¦™‚b!ZjïôC®ê•Rºnþ6³“@šÙCÖÌÎÃET3⨛ŸsC0’—¯ÚBÃæÆ‹o¯/þwA y@„(ŒYÅ…˜éúâýGÌ͆ÄcÜïF®A0¢,4×yðîâ_¸[ <º"{ÚX4¾ÙÜbpR[ ^d¹*’õ€ëóhŒœùKŸ¾#Xœ™µKÄ‘d¤Ë&©ÌÒjUÁdbðâFÇÝ«<Ÿ–"Xlç7+½Îÿ{\jÆnúé · NnUšò$MËm¡áØÙÝõŒx¡îͪÎmÁb$$÷Æ>}G0:3kÆ!ihF­Ö›<Ñ -*7@QÜ»2:÷w§ç,5ؘÍ1 ÆeÛl¡kÖGÕÆçµ:/è"BÂüûŒ~qÈ¢‚þûÅ&V‘ðèŽBúÓ.}úŽÚÅ™Y íB"cÞÅ@}±ÝÌÁ:H—“ãïp` tYn¶CŸ{÷óŸHdV&­XÀŸðõ#ÎØP#˜[Èk(Lèj4ƒ?íÓwPgf-›9y—Ø»^©coêD#/†oeöâ´3´©XÄ ¶­Üjc‰€c‹0Þ¯ $\c‘î¸/]ªú`‰_žÈ(ÁÈ®’; IaéhŠ˜£(½!m@ß iîÌ‘fœC¾K>¿9ŒÖO¤:Þ|ZçÃá¯m2grPGö~•¥+ s˜ÔS{†u¿ìpþ†¥*T¶¤ p~ø6î.É·jäEœG‘4bÍb(êÓwD‘3³(’aÚ%ò+Uos ÎÏCÅâê·EåhŒÊm>÷àÝåý–òot -4ûRè$+ IĹMÀ#IýÕÈôç̬âB†Ž‡Zã^Ü”Ë,V9'9´ü•l6y6u†q¤Äw^‰láEû¤°´ÊÕj‚× -O!’Œ=gBS0Žx3Ùê2›²H[ -Ê‘$Ì_ÚR†¤ðWÐwTUÎÌZ¨*!Âɾœ¿.ïÀÐ>žBzÿçq@Õi¹9°6_~<‹©y–‚ƒ»EU®'6Õ:©–JCcÁ*Knò©ëJ`V­ÊZ3/Dïw2b%‰2"Üi‰˜ãn|4(BÜ`²3ƒêL‘ü\î™Â}úŽvfá&@–¡™+DDÒ} ¼P•*:p» Š™¿ -Ï€¾Û:»3 W•<ˆR¾÷ê ž•qôÁ=÷“·h £Góå ’Y1WÀÀM’ÞæYq[O´ókY€Sƒ@ë÷F?l ZVUjêÊ}Y =µžŽâ̇æïz½½)‡>}GåàÌ,\ sÉ »êÚNè è×õS³Â<©¬}ÇuvfÖB ÑfûÆ~¸ÿr¨†NgLËÂbð*hœ#r&¿ú÷¼¬UíXW%–,[ö0BØmG‚m|É9G¡œzÆS:c83@Å·cpÃbîiŸ¼#`]YµÀ+Ûï$8ÜŽÑIòK«ÒÈËéú&oª—‰ î–¿–ƒ]ß™§rYÍ¡N/ô¬ ­I¬Ùyõ@Â1ñß>}Güº2;W"u Á¿œ@e6œñƒÆÃX¡;-hð’‹Þ¡›¨LÞÚôúž/º-ߪÄfÇÇa Õ1{ºóî¨6˜¿ëWuhtîûÀÞ 6ŸÌ_µi@ß¡ÎÌZ˜X,ïÒ?oËy¶ÈžšÂ…ƒx<€ÖºÊnÀÍâåÞww É, -6,&æÓß¾§}7‘tg.’,æ»í™;™œ$Òi;ˆÁ/FJD¤¿­´Y¸HÄC&èç~%ó·>ÁæIÞ&Å&¹"ørib|©öûêÇN8˜5ºü\?î¶ðçyyE… {‹eûSºJŠå~‹ÿ*¹¢øòËŠöj̻ߌ·õû9mRˆ=ššHŽ¢(Üaë†ÛåQ&FŒýÀ´ÜÓ¯³&ùÜ?j iC´½®Ú -Puf´ Ïdd.Ì'RÀ˜™ÕPycäôº1,mèønéÕ>p, K•EÐHc¶Kùz ©¤»´‘/ 2 ï¦AÜ™…k*‚µ¯¶Î³åJC»¹“ù/ÛZCm`½IRx AUn¡âdnÜ£LgP·Nª[UÕ–q bD£ð9s:Ô|ÆŒy‚hSÀ*tõðh#ÔVgy¦lpË#dØôˆ["û˃è;âÖ™Y ܲ )öæãÚû´…ÖHŒ|Ô*ÕÌbCf=ñ†ãM¥R>XJ&`uâS£•eè Nv’Æ°7‰@oˆéÓwDŒ3³ˆ¡í¬bÀQSú(à­óiɬ‚æ³|ïuU…†Æz5Úµº;(Â$–"ÆŸµ\b ÂØ—÷{“—é­…%±ññ}ž`e¢ºæà2_*¡OÞM#8³ -Wĸ١è¢?ø&ÆçÀ.5UÝ$:6Ê©â.«ÊbmÈ×Óöµ]_ÿçɹÛóFª(õ´ì‡ùÎ ÒáÃÞù÷Ó;KõD¢±ç=ŒŽðÓŽó¡ž8GÌç`„1Ä=ž6 ï¨ œ™µÐP¬‘‡½Ç2÷VíÒ/6Aü¬ÑàG™TÆ{‡«I¥ ôx¥<[pŽ¡ŽÖÓò¶Ê„aÄɳn= X"ùÖ%] -Á6ñKÄbûd„8ó·¡OÞM±8³ -×+Æߌ(Ý÷ŠÉâ6¡¶Áå|áµ\g®€uõTÞÄéussk,}6h GrĹ¼æÁ9ÄÜÄ\aü”cˆ÷8! -endstream -endobj -2328 0 obj << -/Type /Page -/Contents 2329 0 R -/Resources 2327 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2291 0 R ->> endobj -2330 0 obj << -/D [2328 0 R /XYZ -11.232 900.716 null] ->> endobj -2331 0 obj << -/D [2328 0 R /XYZ 56.693 742.033 null] ->> endobj -2332 0 obj << -/D [2328 0 R /XYZ 65.161 742.716 null] ->> endobj -2333 0 obj << -/D [2328 0 R /XYZ 56.693 696.065 null] ->> endobj -2334 0 obj << -/D [2328 0 R /XYZ 65.161 696.748 null] ->> endobj -2335 0 obj << -/D [2328 0 R /XYZ 65.161 685.789 null] ->> endobj -2336 0 obj << -/D [2328 0 R /XYZ 65.161 674.831 null] ->> endobj -2337 0 obj << -/D [2328 0 R /XYZ 56.693 628.179 null] ->> endobj -2338 0 obj << -/D [2328 0 R /XYZ 65.161 628.863 null] ->> endobj -2339 0 obj << -/D [2328 0 R /XYZ 65.161 617.904 null] ->> endobj -2340 0 obj << -/D [2328 0 R /XYZ 65.161 606.945 null] ->> endobj -2341 0 obj << -/D [2328 0 R /XYZ 65.161 595.986 null] ->> endobj -2342 0 obj << -/D [2328 0 R /XYZ 65.161 585.027 null] ->> endobj -2343 0 obj << -/D [2328 0 R /XYZ 65.161 574.068 null] ->> endobj -2344 0 obj << -/D [2328 0 R /XYZ 56.693 528.659 null] ->> endobj -2345 0 obj << -/D [2328 0 R /XYZ 65.161 528.1 null] ->> endobj -2346 0 obj << -/D [2328 0 R /XYZ 65.161 506.182 null] ->> endobj -2347 0 obj << -/D [2328 0 R /XYZ 65.161 484.265 null] ->> endobj -2348 0 obj << -/D [2328 0 R /XYZ 56.693 437.613 null] ->> endobj -2349 0 obj << -/D [2328 0 R /XYZ 65.161 438.297 null] ->> endobj -2350 0 obj << -/D [2328 0 R /XYZ 65.161 427.338 null] ->> endobj -2351 0 obj << -/D [2328 0 R /XYZ 65.161 416.379 null] ->> endobj -2352 0 obj << -/D [2328 0 R /XYZ 65.161 405.42 null] ->> endobj -262 0 obj << -/D [2328 0 R /XYZ 56.693 368.678 null] ->> endobj -2353 0 obj << -/D [2328 0 R /XYZ 56.693 341.41 null] ->> endobj -2354 0 obj << -/D [2328 0 R /XYZ 56.693 296.222 null] ->> endobj -2355 0 obj << -/D [2328 0 R /XYZ 65.161 296.511 null] ->> endobj -2356 0 obj << -/D [2328 0 R /XYZ 56.693 249.86 null] ->> endobj -2357 0 obj << -/D [2328 0 R /XYZ 65.161 250.544 null] ->> endobj -2358 0 obj << -/D [2328 0 R /XYZ 65.161 239.585 null] ->> endobj -2359 0 obj << -/D [2328 0 R /XYZ 56.693 193.328 null] ->> endobj -2360 0 obj << -/D [2328 0 R /XYZ 65.161 193.617 null] ->> endobj -2361 0 obj << -/D [2328 0 R /XYZ 56.693 147.36 null] ->> endobj -2362 0 obj << -/D [2328 0 R /XYZ 65.161 147.649 null] ->> endobj -2363 0 obj << -/D [2328 0 R /XYZ 56.693 101.392 null] ->> endobj -2364 0 obj << -/D [2328 0 R /XYZ 65.161 101.681 null] ->> endobj -2327 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2367 0 obj << -/Length 2651 -/Filter /FlateDecode ->> -stream -xÚÍ][sã¶~÷¯à[½ -‹;‰¶“™¦Í¦ÓIz‰=Ótvó@“Ä./*IÙñ¿/(R‰IIæ@8yYÛxx|߹ዃM€ƒ¯o¾¼¿yÿAà@!%© îפH†ADbapŸo¿Ó¹ŽýnE¾ý{Õê¦ÿu]Õý/ívøò/UòeU}îÿøþî›w?ÜÿÍÜfERBôÒîÚç\7[­Û¦ûÚÜ‘¹»dÝݹ QH£`% -‡ûsa†Ñíûþ¡²»ðæ«û›ÿÝ#$IÅ‚P$1 ’âæã8HÍwFÄU<F Q&Íïypwó¯<̾8#GÙ\!‚e¯Ó'JÅA‹ãeï?˜!‡çàÝ5â22_›%ÛX矰Àmaþ%ïVãÛ»"k·¿·"Ôü¡Ë´ì¦ýØä½`3eìîÇ×ã‡5KDB„L!n¦ÕÝHÚùOOo@Íc(y¼A/˜t£]å D$™Ê˜ ÐÌä/W^"EÕÊÖ› ÿå» -£e=*ÎŒ¦ïW÷ƒ¡ÁK$œÊ >ÖûŸw£qæÒ÷çܖU9½º<úþþ?0ª}»Û·SÉ¿»(ùpQš5»<~†Ýa]Um‡d‹g°“_î‹]7°ÁÙxœ"!ÆðyƒüX¾#䕵€<Å(¢ƒ oö;³IíN „ Æ‹p$xäb¼.ü¼hÀ¥¢ˆŠÐ“oã‡\wÖûý—ÍsYí^ü½o³ʯv»ªæ?6æ>ónñç!L$Š„Çi,ßÂÎÊZ@˜bDøâ3s6É6®ãVòºÊ d&»ßf ”L&®-rgØ8—zë+ºqV6Þ°ŽŠ÷‡õ±|G¬;+ku¬‰è`°ãB[:Î&3ÆzaÇ&ÎtÅlQ•U³‹¨)÷‚ñ¬Yx¢NÖër˜ïYBõåB_ÌšÈwc–»²pf !JÙ/áE û"ê hÞÖn,ßqí¼);LFØ×F¼MÆX¾ãd8+käP"†‡ ?åMeé"’ZÇ-Ôð–úÉ¢Œ{¦ªþJÉñ!¯’Ïã›6®¦Ý®úìWm=ÕeÞȾ:á úcùŽÐwVÖúæ'ãÃC«‹]·ÐÔš ‚  ÎÛUî轸õJ€Ö´:N—õ|WD)¢«JxÃ÷KéŽèvTÔÛ‚# {‡ ¡fW•)8]|ÔõCÜfÅYËÊPÈÂ`ECÝó·—l–yBãØ_Œ;%— È'³1Ï>"NÃ75?ÔÀù2?Ó×/²ÒØmcˆ@<òi0G‚z´GcùŽöÈYY {„»V­áíº8M¡Ypg‘,6T(4—Ñ?Ã’•à(ãi lkz‚fu§Í翹lR€óÞÙ_g¹†›ás=³”d&FÒßöäD¾cÜ•…3†©®3lØž„";kã‘ïFtwe-˜ŽMØφ°ÅK}±?­Æ¡Ýòr=¶|Ìêª,à‡áÀ+K`;–ê&Ñeƒu˜&Ž³Ü Q„°ò×Ù8‘ïˆ]geáØ%Š ­õ1I³G˾§²ZºVþ'Ÿ7‡¾”ÚصÍJx3`a!3e˜½¥ƒ!æÖa¿–„ˆf@C=ºNÅþ.'òiꬬM¹@|ð0n—/.~(ǹ4è²Êõò›’çÓ@*~oþÐ}Ü\«Ï³dòdËw$ƒ³²d` F^fVÞjÙ1üˆ‘ÅOãÙdKoáíâÍÒo¥A»©ÁVËú4ZãËüµNä;òÄYY žP†D8D—¬!`/Ûâè†ãÙæ Á߃kÕ¾N–~ùÌ®´JšeÏmØèÒøFp=æô5¢yN`…˜Ç¶©‰|GN8+kÁ B‘ü©mªI²Ì,ïÂ/¿Ú‰MªÒ$\Ý4ù³M\M•Ë‰Øáó?¾ÒGy¾‚ýÅÌyjÖG£©1JcñnuVÕ¡FQùs›’kt²ðÓä}#ÎÜûÂêô<ÈmRívWèül"}h¢ÎýÊ\³XBı¿¶˜±x7¬;« -ǺÂHªaŸüÐÓlL0? -6»ÖL^ÆÍz­¨õ}Óÿ !09âÄGkÌÉÿ5Ã1ÂR]ó_Íüa -endstream -endobj -2366 0 obj << -/Type /Page -/Contents 2367 0 R -/Resources 2365 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2291 0 R ->> endobj -2368 0 obj << -/D [2366 0 R /XYZ -16.307 900.716 null] ->> endobj -2369 0 obj << -/D [2366 0 R /XYZ 56.693 742.454 null] ->> endobj -2370 0 obj << -/D [2366 0 R /XYZ 65.161 742.742 null] ->> endobj -2371 0 obj << -/D [2366 0 R /XYZ 65.161 731.784 null] ->> endobj -2372 0 obj << -/D [2366 0 R /XYZ 56.693 685.211 null] ->> endobj -2373 0 obj << -/D [2366 0 R /XYZ 65.161 685.894 null] ->> endobj -2374 0 obj << -/D [2366 0 R /XYZ 65.161 674.935 null] ->> endobj -2375 0 obj << -/D [2366 0 R /XYZ 65.161 663.976 null] ->> endobj -2376 0 obj << -/D [2366 0 R /XYZ 65.161 653.017 null] ->> endobj -2377 0 obj << -/D [2366 0 R /XYZ 65.161 642.059 null] ->> endobj -2378 0 obj << -/D [2366 0 R /XYZ 65.161 631.1 null] ->> endobj -2379 0 obj << -/D [2366 0 R /XYZ 65.161 620.141 null] ->> endobj -2380 0 obj << -/D [2366 0 R /XYZ 65.161 609.182 null] ->> endobj -2381 0 obj << -/D [2366 0 R /XYZ 65.161 598.223 null] ->> endobj -2382 0 obj << -/D [2366 0 R /XYZ 65.161 587.264 null] ->> endobj -2383 0 obj << -/D [2366 0 R /XYZ 65.161 576.305 null] ->> endobj -2384 0 obj << -/D [2366 0 R /XYZ 65.161 565.346 null] ->> endobj -2385 0 obj << -/D [2366 0 R /XYZ 65.161 554.387 null] ->> endobj -2386 0 obj << -/D [2366 0 R /XYZ 65.161 543.428 null] ->> endobj -2387 0 obj << -/D [2366 0 R /XYZ 65.161 532.47 null] ->> endobj -2388 0 obj << -/D [2366 0 R /XYZ 65.161 521.511 null] ->> endobj -2389 0 obj << -/D [2366 0 R /XYZ 65.161 510.552 null] ->> endobj -2390 0 obj << -/D [2366 0 R /XYZ 56.693 464.373 null] ->> endobj -2391 0 obj << -/D [2366 0 R /XYZ 65.161 464.662 null] ->> endobj -2392 0 obj << -/D [2366 0 R /XYZ 56.693 418.09 null] ->> endobj -2393 0 obj << -/D [2366 0 R /XYZ 65.161 418.773 null] ->> endobj -2394 0 obj << -/D [2366 0 R /XYZ 65.161 407.814 null] ->> endobj -2395 0 obj << -/D [2366 0 R /XYZ 56.693 361.636 null] ->> endobj -2396 0 obj << -/D [2366 0 R /XYZ 65.161 361.925 null] ->> endobj -2397 0 obj << -/D [2366 0 R /XYZ 56.693 315.352 null] ->> endobj -2398 0 obj << -/D [2366 0 R /XYZ 65.161 316.035 null] ->> endobj -2399 0 obj << -/D [2366 0 R /XYZ 56.693 269.857 null] ->> endobj -2400 0 obj << -/D [2366 0 R /XYZ 65.161 270.146 null] ->> endobj -2401 0 obj << -/D [2366 0 R /XYZ 65.161 259.187 null] ->> endobj -2402 0 obj << -/D [2366 0 R /XYZ 56.693 213.009 null] ->> endobj -2403 0 obj << -/D [2366 0 R /XYZ 65.161 213.298 null] ->> endobj -2404 0 obj << -/D [2366 0 R /XYZ 65.161 202.339 null] ->> endobj -2405 0 obj << -/D [2366 0 R /XYZ 56.693 156.16 null] ->> endobj -2406 0 obj << -/D [2366 0 R /XYZ 65.161 156.449 null] ->> endobj -2407 0 obj << -/D [2366 0 R /XYZ 65.161 145.49 null] ->> endobj -2408 0 obj << -/D [2366 0 R /XYZ 65.161 134.531 null] ->> endobj -2409 0 obj << -/D [2366 0 R /XYZ 65.161 123.573 null] ->> endobj -2410 0 obj << -/D [2366 0 R /XYZ 65.161 112.614 null] ->> endobj -2411 0 obj << -/D [2366 0 R /XYZ 65.161 101.655 null] ->> endobj -2365 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2414 0 obj << -/Length 2860 -/Filter /FlateDecode ->> -stream -xÚí][Û6~Ÿ_!ô¥ °Ãoº´ÝŦ»I›E.»X ÉmÓcíÈ’«Ë8ì/uqÉ–u8éK<±©Ãcò|çNÚun×ùåâçÙÅÕ3î:! -=â9³•ãäùN€)¢¾3[:q±¹||I¸ûèUZȼùs•fÍźýðŸéâç4½mþóßë?Ìþ¥¦¹Ä…œ7Ô®‹ûXæk)‹¼úXÍŽ@ÍîÑjvæùÈ'sÉQè·ó3OôƒGWÍ &^õàÅÓÙÅoX‘wìpy!uü#Ï%Îbsñîƒë,ÕgŠÄÂÀÙÕ#7Ç."ÔSÇÎõÅ.Üv%ÜÁÙÓf!®×ðôž^s±ìê™RV= æêƒzðËh±2~ïr·Ø¨ñãKÏu]o¢býÃãKLÔÊ"Š£â}ÌㆮZ±ŠtõòK÷»ªÂ>q|ªøa´ú®ÕûÜU+Ç<‡ 0L:«/¿\‡Úñw' ÂÛOÐÆÕhSúa÷és#_-d†/7ÞC! '`¶&˜Ý8ÍoZIèìêžqŠS Toî“åR.;¢pHÉyWox”ÄQ";cÔ¾qøУMš¤¹ü F=(#…ÜlcQ ±2.zD-„úÔ@ô^‡ÑçDüÕ Ï ¢8´‡>/ÀH©)[àë’7Þ1«pèyCk Ã2Múüý0˜ -6æ©2gll™GÉ l¨€ [”y‘n`c3yå”×"…SógHr ¸Íä]”–ywô8Æ|eº]l]ú† 0fV>Ež"_£`•&E—Ã0X‰MßÃöíNÄ%p‹wk™L6ó8]Üæ°±é -jý>Pƒ Dmº.Ó±Íúqp³êGþ§T‚.pxˆ#ö€Ó¥ocf5€£ȧ nʼïÿÔËýS6ŒžgýÍ{÷¡q'ÐIÄ1¤< ¯Tæ"»™Ø:(@&çbq«-¸bœžÓ±ô(Eœ†–K™,“*bÖñ,‰bÈ÷,z–X…ø8°§ºô µƒ1³Úsºmžb[„Šé  -jOæ`³ ¥øïk  -‹þßëE%æÃ:®r¨Ó( -èȸ®¡”’^§;ØÀ›,]­t˜veÐìa«Kß[ÆÌj`Ëe(dmö,SjQf9Ô¹J -™PIÈn¡Yr;µYîDíÛ'|ƒ·o^@¿Ø"KûÎGmt`V…‡A•×=£aå>G>÷Î`Xl>ߊLlÐÇœwÞø$;ãk¤dÕ-fT9g( ö2ª=úfÚÁœY¸và<@˜½vؤwPoD¢‘P=´Õ§Ç‹L'][VZ­Jñy t <Ǭ·ÇÂÑé–¯fèIœè­¿@É( -|n/]ú†x1fV/ÌW¯m «”erNýCsvK¹e\<0­qbd¦¼5x¨*2Ní†CƒÝy/Z"áÌEAp^ƒ‹}îËR ƒëèËüëÔö–…>RßÆšþèÑ7ÓæÌjè×EtŸôШ`&;Õ’`ÃbÍE®e’³XËf£3‹"º“†´ F¬h¾•‹hAc\¡¶²ÀCnh/aÜ£ocfá@aAˆhÐàä@ô—Õ­ÛQYÓ°… $˜›²š`À©zæï=ôÃ07ëL®4çˆ6B9B¢u8™ŠY1¥öpÐ¥oˆcf5pà+‡´í¢\Fé‰e,'FKyô¹ÏyŒAý·NwÉ´)Q°'|#™‰j#_½ž=½†–BE”&+oŽ ³ÇÔ«½lC¾¡03«!Ìž¯¼ßÖQ>â~œ¨žo•‚1ȤË3¨LjTæ¡eñoÛV'º]+ŒSD°½¤E¾!쌙ՀŠS¹Û&-¶™ÜVU€å´!»Hîm8Toß<Ÿººå“6ŽYP‡^ÞðÐCxƒ].Fáö{ô áb̬\Gœ±.gpž¡Îÿ*ŠeŸú°ôE͡·3Š í5+ô芇5fÛÅ MÚÆÚbté.†1³X!ÕÉÐ -+ϲyŸ–Ð6_iɨLÜ7WØyZf 9ñôjA:dP¸ª+™Ù½®æÖ©kXé7„Š)«H©ú©¼¶¾‘M;®Z‚ñKÅÌŸAÊq •ä²ÐÜǃüÇ(¢hØ$lAªGß SæÌj€ªâÔ ÷í f©Ú}Hq ôº¶[)²c àïNô:<, VO~7’•:!w® 8ÈGNÐdœ¬!§Kß9ÆÌ‘CCùü외©r½« zX î7Ê£‰CQhœ…Ë¡ç¶Ò¹˜CO %©î9ê7!k°èÒ7„…1³°ðCä‡m¹eÎ)=®HtÝ…¹\p ”—ÐC"Ö¬¥€žbL¨€—¹ƒ´\…×ä…¬¦Kß4ÆÌj€Æ P@Û²NÝ5=ç5ü¿Î^¾°Xý¹Nu]ø5ÝN}¤W‰)’(¹Y•ñÛbÇ!Áâ½’K¾!$Œ™Õ€÷QðùÀãÔ×ÉSSãñ¼µÛ0ö#ð3VtwÆÚ„©5Äté"ƘY Ä05'fƒÉŸÙ&"ç6’B·€Ni“¢´&›]ú†²i̬†lRþù-¨íkèôðv¢aÝ$³|ò´Š‘wõ5GôG«ã0 URÑ^£GßÆÌjÀ€0†ŸŽ’+Mš[y­ŒËb³å@™~|Ãq ³¶ßò†Ûm‹Õf%Hؤ?l-E¾ÙZ3{(è¾ÒóDí˜K‘ë·Ýç? ›îOwK€ZC4ŽfTWÊõ)ÿõD á[?ʱ¯„ŒBMªÂš€wé -¸)³ƒNBµ¸­›ýíD7SQl$üêjøÝn§±•·2K¤Žp¥½kuÔ['˜Ù–sÑyº*vGΟzd±Ñ}£—éâ@ʯ~º²§Œ>KE쬷5u… ;g,£d•jÜD8©æ²w~’0‚\×^$Ö£o¨¦Œ™…» „qDB®×o&ì£j¶FÊÁ‰(™¶ñX7åF1!4êìиéõ?Þ¾|újödöüõ+Íè‰PŒ\f/zêÑ7]cf5D—2Di=kÏtZ¹w5“Û4ƒöÎC3­Ð+¡ÄøB‚M”Ão}}òvöëë7Д{s7‘ý€6Kâ"×^{p—¼¡È›²ª!ñ¤ºË¾my> endobj -2415 0 obj << -/D [2413 0 R /XYZ -11.232 900.716 null] ->> endobj -2416 0 obj << -/D [2413 0 R /XYZ 56.693 741.747 null] ->> endobj -2417 0 obj << -/D [2413 0 R /XYZ 65.161 742.431 null] ->> endobj -2418 0 obj << -/D [2413 0 R /XYZ 56.693 694.923 null] ->> endobj -2419 0 obj << -/D [2413 0 R /XYZ 65.161 695.606 null] ->> endobj -2420 0 obj << -/D [2413 0 R /XYZ 65.161 684.647 null] ->> endobj -2421 0 obj << -/D [2413 0 R /XYZ 65.161 673.689 null] ->> endobj -2422 0 obj << -/D [2413 0 R /XYZ 56.693 626.575 null] ->> endobj -2423 0 obj << -/D [2413 0 R /XYZ 65.161 626.864 null] ->> endobj -2424 0 obj << -/D [2413 0 R /XYZ 65.161 615.905 null] ->> endobj -2425 0 obj << -/D [2413 0 R /XYZ 56.693 568.397 null] ->> endobj -2426 0 obj << -/D [2413 0 R /XYZ 65.161 569.081 null] ->> endobj -2427 0 obj << -/D [2413 0 R /XYZ 65.161 558.122 null] ->> endobj -2428 0 obj << -/D [2413 0 R /XYZ 56.693 510.614 null] ->> endobj -2429 0 obj << -/D [2413 0 R /XYZ 65.161 511.298 null] ->> endobj -2430 0 obj << -/D [2413 0 R /XYZ 65.161 500.339 null] ->> endobj -2431 0 obj << -/D [2413 0 R /XYZ 65.161 489.38 null] ->> endobj -2432 0 obj << -/D [2413 0 R /XYZ 65.161 478.421 null] ->> endobj -2433 0 obj << -/D [2413 0 R /XYZ 65.161 467.462 null] ->> endobj -2434 0 obj << -/D [2413 0 R /XYZ 65.161 456.503 null] ->> endobj -2435 0 obj << -/D [2413 0 R /XYZ 65.161 445.544 null] ->> endobj -2436 0 obj << -/D [2413 0 R /XYZ 65.161 434.585 null] ->> endobj -2437 0 obj << -/D [2413 0 R /XYZ 65.161 423.626 null] ->> endobj -2438 0 obj << -/D [2413 0 R /XYZ 65.161 412.667 null] ->> endobj -2439 0 obj << -/D [2413 0 R /XYZ 65.161 401.709 null] ->> endobj -2440 0 obj << -/D [2413 0 R /XYZ 65.161 390.75 null] ->> endobj -2441 0 obj << -/D [2413 0 R /XYZ 65.161 379.791 null] ->> endobj -2442 0 obj << -/D [2413 0 R /XYZ 65.161 368.832 null] ->> endobj -2443 0 obj << -/D [2413 0 R /XYZ 65.161 357.873 null] ->> endobj -2444 0 obj << -/D [2413 0 R /XYZ 65.161 346.914 null] ->> endobj -2445 0 obj << -/D [2413 0 R /XYZ 65.161 335.955 null] ->> endobj -2446 0 obj << -/D [2413 0 R /XYZ 65.161 324.996 null] ->> endobj -2447 0 obj << -/D [2413 0 R /XYZ 65.161 314.037 null] ->> endobj -2448 0 obj << -/D [2413 0 R /XYZ 65.161 303.078 null] ->> endobj -2449 0 obj << -/D [2413 0 R /XYZ 56.693 255.965 null] ->> endobj -2450 0 obj << -/D [2413 0 R /XYZ 65.161 256.254 null] ->> endobj -2451 0 obj << -/D [2413 0 R /XYZ 65.161 245.295 null] ->> endobj -2452 0 obj << -/D [2413 0 R /XYZ 65.161 234.336 null] ->> endobj -2453 0 obj << -/D [2413 0 R /XYZ 65.161 223.377 null] ->> endobj -2454 0 obj << -/D [2413 0 R /XYZ 65.161 212.418 null] ->> endobj -2455 0 obj << -/D [2413 0 R /XYZ 56.693 165.305 null] ->> endobj -2456 0 obj << -/D [2413 0 R /XYZ 65.161 165.594 null] ->> endobj -2457 0 obj << -/D [2413 0 R /XYZ 65.161 154.635 null] ->> endobj -2458 0 obj << -/D [2413 0 R /XYZ 65.161 143.676 null] ->> endobj -2459 0 obj << -/D [2413 0 R /XYZ 65.161 132.717 null] ->> endobj -2412 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2462 0 obj << -/Length 2449 -/Filter /FlateDecode ->> -stream -xÚÍ\[sã¶~÷¯àìK¼3õYÜ 6/I&m:¤MÖîL;»y€$Hb—"’ZÛýõ%:‰hK:Å/k­‚ßwn8I I¾»úæîêÝ_%I2ÈSÉÝ´Ëþâ·Õô›ªú´ûÏ¿o¿ûóÝßÝmn(…LÊ´Ûö±°ÍÒÚ¶é.»»ÓD»»+ÞÝ]¨R¦“ YÚß_¤N`ª¯ßíþP¦º^ýåîê—+êÄ“„&RÊx’faÉtuõág’ÌÜ5§ˆL'÷Û‘«DRŒ+÷¹Hn¯~º"ýL§b÷±ûóÝï$»ù )KR‘%ª“Ü}/‰ÓS¨„A¦³¤¶Éü (ì ¸*Ò§ìÓnt¨| TÑ¡|I(¤J£îðûiV±le·ëE²ûð¾G¢{…[,ˆ-{ÅÁ{ôäóí»?,&ùp£¹¾·¸qSSî t·ø¢ÿâù/®[œÐy^Îp#Mùˆ¸i̤@>“Ù´KGMÔØ™iÍpþtp¶?±«9ù®L]æå;cÈ©ÍËÆÖE÷ ¸g?žHÈR ZÇ#á¾ü@+ëABî¬hªv$4X<¬,öeáÆuž5°Ú´ëÿÛ@³,ÄÆøûÜÍ>9,‡¦{ãö‘1¹§òà]h,d7ø‡|º4¶øH$iWî_úvûà·ŽË?¿½¡l;­ó -šb'ôäó+ç=9cñ|œÒ¸{–XôÈ£W¸²xz)ÍA¹@hûfo,ÒÈM6‹q æ<—-[´5®æçÓñ ÙÀú®iU¶u>A»ƒÖ”SÛŒ;__ÿëîoÿ|ëih”Ê@ûòy¬¬R—}dlǃÆNÛ¼zŸÁñðäniÊOÈ·ÜV¸qßš2·nì÷6Ÿ= <‚£´ã›/ŠúûUÓfdJÚ‡uÕ<³§ù k*öåò!XY>(§)ç;> 10ô -¿‘ñ&$™^2RœEaUƒ..7ƒ|ótu5¨Âuhì¢Âç½Øœëúðuë©- -ÏÙ:;zEöì4/Sí‚ÐxÕ‚ü@^+ëÁKÍ€ð¾Z°2õ§ÍKÌMƒeçÍzSçÕ)´ÈK;©­ù„õ+. Æš}¬\Zdk–7ëÂ<k’ÜJH¥ºd.)%-X¤\²È›¶ñÈ%¥pÚ¤Y¼dRrêHÏ0쉴 ¡ªz˜.½{¯_ÏfØbz!WõØUêÚ–3[£+êÓÊ+ejF®3öb;¤‡ÔÕ=*N’¹‹*^Ad ?ÅÁÊzÀ˜ `¢/ˆÜ"añXmÎk|8’Ýc[,¾t‚Ž _‚yíææxpØEhÞaC‡u]-j³êâ_çîz‰h°÷åb=XY¬S¬‡:ÚV5›éë8'>®ù=döPÀD?áÒ|¶#×ýüÆÐo´’ƒÈ2 "^Éa ?ŒáÊz‚0àœ>¥6ÏA#ìzm!e(縭D½9’‡ñë7'ì·5eƒõ=ÖWùį̀é4žµ¢ã¥êùxVgѵ¥}bÖãá+ã2àÚΑïx]å)Ø2–†º_Ç1¶—äš¿;LÀºšÏChŽ]\i -”Å[›È„t°²Öí×­/Ño|³*B'³WJìSÃ/ÖxTêên›ÂØ7ÔáÄnëCXú ü¢ BR`ìµ4Tá´‰¸oBpœÄ« äÚ§`e=ìç uŸTU%v ½¨dð¥îq› -šµ™b·BÌ[;n'Ég[OL›¯!Ãü¬¢ýqÛnÚsQÖ=º“øñ¬i:MšñJùô VÖƒžŒzêì³-¶7³ã62ytP-j³^z¿\ŠKú?žq<‹äÿ6m^äí£‡äÚ铦ñ\ K¬@Òx»–òÃ8®,žc<• I¿k íØüL¼-?çuU®lÙŽ¼· )òŲÅúí¦ëSÂ:»yU¶ã*[V>5ª»»ÿxÚ®(H™ÅÃø¾ü@Œ+ëq%@‹~«ôYÛÞ¸ÔpÙ–oÎ%(©^É2=gN›LD´ÏT@ÊãUò±¬¬v©žxò³Ü/óÖ>OŽÛ| -Twí6+ÓŽ¿n Mü†¦ë_A|ÒúW›z˜>¥[¤_ùLkÐüµ4è°Ôi£"6è0•B¯6±/>Œ÷ÁªâiÏR -4ët~0ØŒÆÑ2/íó@ëx]´ÛM;òv@ŸÖ[ôÙzfk;Ã7ÞàBhí*ÿßK¢Oóñ6“ñ»/?À¡ÊƫꎌéÊS‹ûØ€Ù%Ô­oo8Ÿ l|õØüRœ·8uä¹có­ïBÀ.èÕµÓ&̾ááÞ«Óô²ˆý—ùôVÖÃÀ‹ Xoß×.6v_vÿå›”‹Ã¾`êÙÐ0—ólúÑ50lŽ…?vW‘Á·ºNl{o­o·siáñŽïÈÄ{°²xç8ë»u¶­Îçúfô6^Üâ$Ä3,(mÙlj;öb/¾m÷€ØÀqeòÒÛº3$—µä¢=XY´³¸bO ‹#¿ÙÆ`¯,š±wUû˜ùÐ6~ýŒQ ú¢9½K嶷~ýTk`$bNOÓX<³°/>Ì*«Š7 -T\{.µüa=ŸmÝæSSü¡EcAʧ:÷ÌKãë?©!‹XüÈdJ°²TQÈ´/'4ù¤ðè]öˆzvýhÙùç”R—ÿnÐûÉæc#7Þ { ¨”Ày¼‚Á@~ %‚•õ „ÔðQb8¿gÆ/¢¢’í`¡,ƒWs"¥N±}… ’Äk_ÈdE°²¬èÖç²~™|·ú1Ã,ø#•ëjƒ>G#o ;ö©f¶ªÊ¼+²yT"AÒ‹žØ«("csóËÝÅÊe¤5 W_:ù^ »•L߃ïÿ´€\K -endstream -endobj -2461 0 obj << -/Type /Page -/Contents 2462 0 R -/Resources 2460 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2291 0 R ->> endobj -2463 0 obj << -/D [2461 0 R /XYZ -16.307 900.716 null] ->> endobj -2464 0 obj << -/D [2461 0 R /XYZ 56.693 759.068 null] ->> endobj -2465 0 obj << -/D [2461 0 R /XYZ 65.161 752.393 null] ->> endobj -2466 0 obj << -/D [2461 0 R /XYZ 65.161 741.435 null] ->> endobj -2467 0 obj << -/D [2461 0 R /XYZ 56.693 694.321 null] ->> endobj -2468 0 obj << -/D [2461 0 R /XYZ 65.161 694.61 null] ->> endobj -2469 0 obj << -/D [2461 0 R /XYZ 65.161 683.651 null] ->> endobj -2470 0 obj << -/D [2461 0 R /XYZ 65.161 672.692 null] ->> endobj -2471 0 obj << -/D [2461 0 R /XYZ 56.693 625.579 null] ->> endobj -2472 0 obj << -/D [2461 0 R /XYZ 65.161 625.868 null] ->> endobj -2473 0 obj << -/D [2461 0 R /XYZ 65.161 614.909 null] ->> endobj -2474 0 obj << -/D [2461 0 R /XYZ 65.161 603.95 null] ->> endobj -2475 0 obj << -/D [2461 0 R /XYZ 65.161 592.991 null] ->> endobj -2476 0 obj << -/D [2461 0 R /XYZ 56.693 545.878 null] ->> endobj -2477 0 obj << -/D [2461 0 R /XYZ 65.161 546.167 null] ->> endobj -2478 0 obj << -/D [2461 0 R /XYZ 65.161 535.208 null] ->> endobj -2479 0 obj << -/D [2461 0 R /XYZ 65.161 524.249 null] ->> endobj -2480 0 obj << -/D [2461 0 R /XYZ 65.161 513.29 null] ->> endobj -2481 0 obj << -/D [2461 0 R /XYZ 65.161 502.331 null] ->> endobj -2482 0 obj << -/D [2461 0 R /XYZ 65.161 491.372 null] ->> endobj -2483 0 obj << -/D [2461 0 R /XYZ 56.693 444.259 null] ->> endobj -2484 0 obj << -/D [2461 0 R /XYZ 65.161 444.548 null] ->> endobj -2485 0 obj << -/D [2461 0 R /XYZ 65.161 433.589 null] ->> endobj -2486 0 obj << -/D [2461 0 R /XYZ 56.693 386.081 null] ->> endobj -2487 0 obj << -/D [2461 0 R /XYZ 65.161 386.765 null] ->> endobj -2488 0 obj << -/D [2461 0 R /XYZ 65.161 375.806 null] ->> endobj -2489 0 obj << -/D [2461 0 R /XYZ 56.693 328.692 null] ->> endobj -2490 0 obj << -/D [2461 0 R /XYZ 65.161 328.981 null] ->> endobj -2491 0 obj << -/D [2461 0 R /XYZ 56.693 281.868 null] ->> endobj -2492 0 obj << -/D [2461 0 R /XYZ 65.161 282.157 null] ->> endobj -2493 0 obj << -/D [2461 0 R /XYZ 65.161 271.198 null] ->> endobj -2494 0 obj << -/D [2461 0 R /XYZ 65.161 260.239 null] ->> endobj -2495 0 obj << -/D [2461 0 R /XYZ 65.161 249.28 null] ->> endobj -2496 0 obj << -/D [2461 0 R /XYZ 65.161 238.321 null] ->> endobj -2497 0 obj << -/D [2461 0 R /XYZ 56.693 191.208 null] ->> endobj -2498 0 obj << -/D [2461 0 R /XYZ 65.161 191.497 null] ->> endobj -2499 0 obj << -/D [2461 0 R /XYZ 65.161 180.538 null] ->> endobj -2500 0 obj << -/D [2461 0 R /XYZ 65.161 169.579 null] ->> endobj -2501 0 obj << -/D [2461 0 R /XYZ 56.693 122.466 null] ->> endobj -2502 0 obj << -/D [2461 0 R /XYZ 65.161 122.755 null] ->> endobj -2460 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2505 0 obj << -/Length 2303 -/Filter /FlateDecode ->> -stream -xÚÝ\[sÛÆ~ׯÀè!•gªã½c‘<%“4m¦WK™éŒ\Š¨p ZÖ¿ï‚€Zij^®œöÅ„ÌÅÁáâûÎ ÑmD¢Ͼ»>{ûI¢ÅTt½ŽGšràqt½ŠÞ_¼3…I;óæ’Irñ׺7Ýx¸®Ûñ ßL_~_gßÕõÝøÇ?¯þüæ—ëŸìe.)…DÊQÚUÿP˜ncLß _Û«ÓHÛ«+>\]¨b¦£K I<]_h+0ÖoÇÊÔpâÙ×g¿žQ+žD4’ -T£8¡ ‹²òìý/$ZÙï¬ ÝïV–‘¤Wö¸ˆ®ÎþqF¦ VÅápøøñ‰d»4fQ, D ’‡ÿ—Äê)TÄ ÑIÔšh½( -{®Šøñ£`:¬ö•/*:—/ …XiÔžn³‚„%'Pv'°½Æƒwí-ÜaAì8).(>¡ç{“»»¿,(z©¹¸Ïû ne6€µ²^ãÖ}4íMÚç%nµ©>æm]•¦)qüŒ~“ö¸•›ô#ò·¥¸eE^™›Ö¤wûË÷nò3áÍb Z‡ƒ÷¾|Ox{+ëoníS¬Fx§ëÞ´X `AÛ˜*¯n‘RÓý…V'˜þcáŒo»n[6}^W¸+ä'Çø¶3-Rè­©L›Ånùjö£ìnünq7.zWJPÌ¢-%öå{RÂ[YJÐ$¼ÿ}Zõ§FÌ‚[\#MhÓ˜IßI—zÛ7Û~ŽÂß¿ÌÉ©ð½Áò·®«K¤ÄÛ¶^¯]ùB$°€ÒžxO¶øªê@¢AJ=’e“fw¦}8-¬KÓu§Ž¹l„Ôç6–ëš4C»°´Z!ã¾¢Æ~hg;hj<(à ˜¦>9ÆÂçaš7%L*N€«ÉÔ~`Lîé>CœaAÆÅɳMjŠD’¾´ÿÒ7» ¸*-¾~sIÙÎÈ –>ur”J@.ËRÒþ¡‚‘™|?+â¯,ÞŒ(e5å|¼·yµ2Ÿl$Zb}YקUfV¢ªïq ›¶^m³Ï÷(‹Ä¯K‡d«ÈïÐVbÜÚ­ü‹|ƒÐá¼ÛL¾'0ƒ);mW Y¸dq&ßs3|•=äd,­äAÍ4RCø@¹89îkÚ¼Lgîÿ¿\ôY&««•ûyýàÃç§!Î$H.í™É÷¼¹Á”6ƒ -P4Ü^ì‰÷Ü -_UœA'SLÛ‹é;Ot}u>[Š,ÿôÁÜštuÚæÉ¿¶k%UZ‹ –†fò=)à«ì2àJÅø'7ô|0qGÊøè -‡E{÷åjýXGžœu–m±m†´?qYÉT'&™C·o!€9NJ!A«pIÜL¾')½•uðKÃ(œÒºzÛ¢ã=×vè2h–n;lE&ïOëen°°N{S9öS´™*œø}Ý«/5.pP7BÔã$ä.ÙžÉ÷$¡·²$&X’)y@Ûáò¡ûõVCŒDwYÄ‹À-S¤×lÒ[ãJŠ¦±.ßåߘÅð«£5&óÑgRYjÑðª‰$I€(‘¼)êìÎ!a‰ÕFðp £°y3Ñ2˜M˜É÷³ þÊâm‚H(p»A“c~¦ñ>ÒdÙtÍœ¸GØtcÖu‹í-æec“€sU æ”òg÷ðå¼rT¾GÛ³ÜÕƈ8ÊÂÕLfò=)à­¬4A¹ó4Zkºmu -ØÙ—mµ2]Þ¦7’!÷›¼79]ŽöÈô¶À÷ !âA ú›—¹7LS;‚Ø⃪pU™|O{+ëâaŠ@Nuó)-›Â¸6ªg𛃹ʷËö¯4m¶msìx̪Î:gìpû©_3Ê‚S"P”ÕVâI™¾{¨êæÉßÛ>/òþÁ%ã8¡ã0š,÷å{ò×[Yþ2Š?vÿª´4ÈÔ|ÝÖÈ‘•>ïm õ›õ¤%Úaë$M^e|ªgåÞš¡ýtâA¸Ö4…õ™+ß`wwÂ%=ÇŒhàš‡Ãÿ¾|Oü{+ë€ÿ¡—Ó‘7¦¿7éŽvV¯ÃV“Ömzë0åòDMQü/1åÙ>¿x"_Ó‡rÍ@hÚ‡" lseT‡ó\Q2\õr&ßÏBø+‹·\ Ðbª^nÑSÌaž±qvÚ#W¤;ËO$á5~_ç^nðic‡w“\W©Ø“îIOEà/9hý䙇gJòôH†7Ž>÷FÒ#>‡" -Þkœxe ãç5<ʤÇÉ bPôUÇÌ8ö3Ô˜™{^Ê©€˜(ã„C49ûò=Ž·²fÇn5yLL³vè^¯þ=o·m¬#Ó"'z ëЂ% Kh®6:“ï‡aeñf‰J¦·)l¬3°·ÁµxÈtš½jñ [EE°çÔÖµƒfV©D¬ 2!!IÂUgò=Ñë­¬zElŠûÖÛŸá·fmÓPì8mð3<)W94*‘uœo¾þãßÞ]!©É_¿pÄ‚!âUIÌ$ô˜ÅgÎé3 YútÆ÷Ô¤¦Ib1nr&ßÔþÊ:š0ó#QWØ·ÛT«M>ôl쪬«| ”«c¤ƒs“×ä90%‘ªÈ»¾s UlDD’"‰öå{’È[Y<‰¨” øTþ[œ¹˜—»Òï~8­“K«ïÀw*ìˆÁŽTa_€²ÁMþô÷gK!Øòµñ —¯ÚR Lô·YSj•‰vlê’†ë(Ìä{ÚoeìÑ ÉÞøxH7T1½y®»¼~{êQúÿð½Lï:þ—ùýû¶^îà(¹2\UqOºï|ų.‰A ýøÒ•Ãâ¼Ã˃ -2Q?xɪ°YÜøJ×w¬þ¨*OÔ -endstream -endobj -2504 0 obj << -/Type /Page -/Contents 2505 0 R -/Resources 2503 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2545 0 R ->> endobj -2506 0 obj << -/D [2504 0 R /XYZ -11.232 900.716 null] ->> endobj -2507 0 obj << -/D [2504 0 R /XYZ 56.693 759.068 null] ->> endobj -2508 0 obj << -/D [2504 0 R /XYZ 65.161 752.393 null] ->> endobj -2509 0 obj << -/D [2504 0 R /XYZ 65.161 741.435 null] ->> endobj -2510 0 obj << -/D [2504 0 R /XYZ 65.161 730.476 null] ->> endobj -2511 0 obj << -/D [2504 0 R /XYZ 65.161 719.517 null] ->> endobj -2512 0 obj << -/D [2504 0 R /XYZ 56.693 672.403 null] ->> endobj -2513 0 obj << -/D [2504 0 R /XYZ 65.161 672.692 null] ->> endobj -2514 0 obj << -/D [2504 0 R /XYZ 65.161 661.733 null] ->> endobj -2515 0 obj << -/D [2504 0 R /XYZ 65.161 650.775 null] ->> endobj -2516 0 obj << -/D [2504 0 R /XYZ 65.161 639.816 null] ->> endobj -2517 0 obj << -/D [2504 0 R /XYZ 65.161 628.857 null] ->> endobj -2518 0 obj << -/D [2504 0 R /XYZ 56.693 581.349 null] ->> endobj -2519 0 obj << -/D [2504 0 R /XYZ 65.161 582.032 null] ->> endobj -2520 0 obj << -/D [2504 0 R /XYZ 65.161 571.073 null] ->> endobj -2521 0 obj << -/D [2504 0 R /XYZ 65.161 560.114 null] ->> endobj -2522 0 obj << -/D [2504 0 R /XYZ 65.161 549.156 null] ->> endobj -2523 0 obj << -/D [2504 0 R /XYZ 56.693 502.042 null] ->> endobj -2524 0 obj << -/D [2504 0 R /XYZ 65.161 502.331 null] ->> endobj -2525 0 obj << -/D [2504 0 R /XYZ 65.161 491.372 null] ->> endobj -2526 0 obj << -/D [2504 0 R /XYZ 65.161 480.413 null] ->> endobj -2527 0 obj << -/D [2504 0 R /XYZ 56.693 432.906 null] ->> endobj -2528 0 obj << -/D [2504 0 R /XYZ 65.161 433.589 null] ->> endobj -2529 0 obj << -/D [2504 0 R /XYZ 65.161 422.63 null] ->> endobj -2530 0 obj << -/D [2504 0 R /XYZ 56.693 375.517 null] ->> endobj -2531 0 obj << -/D [2504 0 R /XYZ 65.161 375.806 null] ->> endobj -2532 0 obj << -/D [2504 0 R /XYZ 65.161 364.847 null] ->> endobj -2533 0 obj << -/D [2504 0 R /XYZ 56.693 317.339 null] ->> endobj -2534 0 obj << -/D [2504 0 R /XYZ 65.161 318.022 null] ->> endobj -2535 0 obj << -/D [2504 0 R /XYZ 65.161 307.063 null] ->> endobj -2536 0 obj << -/D [2504 0 R /XYZ 56.693 259.95 null] ->> endobj -2537 0 obj << -/D [2504 0 R /XYZ 65.161 260.239 null] ->> endobj -2538 0 obj << -/D [2504 0 R /XYZ 56.693 213.126 null] ->> endobj -2539 0 obj << -/D [2504 0 R /XYZ 65.161 213.415 null] ->> endobj -2540 0 obj << -/D [2504 0 R /XYZ 56.693 166.301 null] ->> endobj -2541 0 obj << -/D [2504 0 R /XYZ 65.161 166.59 null] ->> endobj -2542 0 obj << -/D [2504 0 R /XYZ 56.693 119.477 null] ->> endobj -2543 0 obj << -/D [2504 0 R /XYZ 65.161 119.766 null] ->> endobj -2544 0 obj << -/D [2504 0 R /XYZ 65.161 108.807 null] ->> endobj -2503 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2548 0 obj << -/Length 2670 -/Filter /FlateDecode ->> -stream -xÚí]ßsÛ¸~÷_ÁÉ“3S#Äoòútis×tšv{¦íäî– ‰ŠTI(Šï¯/(R“Å…@8ÎM_,K–+àû»‹%Ë ~¾z{wõæ'1ŠÁÝ" D˜"*ƒ»yðéú£ÊTR©×7„‡×/´ªšEÙü£Wí—.fo‹âsóæß·{ýëÝ_Íen0F1ç´[ý©j¥”®ê¯ÍÕq™« Z_ ‰$‰‚ŽbÙ^ŸÅF Œ®ß4/˜ˆºãÕ»»«ÿ^a#> pÀ1 dŒ‘I0[_}ú5 ææ;£bqìö-×Ç!"T˜ÿ³àöêŸWa;áàˆd³áP4:ýBßkqèöæ'Ódÿ;XÝ'BLDæ‹}ãél•¨ì—‡zmþâ×7" ¯oש^ýðúóF'÷™B_«ìÍ—ÕC^lž¼OóEQ¿m.j†³¾nýòsw ÌôaIŒ²æWVDý9Í°2GqPª`ñô—w¤þôø$6?‘.ÐÆukWùaûòyˆ‘4# -¹ÂST“xe÷ËeÐüó±…IgÊŠS‚$'ÍÌ›yÏ—jÞAʱ¬àÓ~Š“,ƒ5LóJ'ùLU°æÅ¢Ó®ýôj?=îu]mNõ¸ÁÃ=ò^‡ëWƒm÷²t1•N¯ Œ 1)\1ð:l1B0¡ž,FaÌniaD,cØŸI‘áˆx3 =ùn&Á]Y¸IQŒ‹Y2ZõU— ¬i–æ -Öò^™EØöö/°v+•Ì¡–(Ï &Ö./Ž,ÏÍ° ¹»ûPÑ­Þlu·í8Á"j< úœÆxM3Oæ>+fŸm gˆñÈ£aõÇþ LW¾£qVÖÂÀ0dôè®ïŠò3Ôé8…ô¡¶µÃódæë"OuZäÕ©E»FÝ0IgɶîÙ§õÎ;ézS”Æ+Ò–ýrÏXvÑéf Ç8EŒsÈ™?wÄ;â×UU øRŽ"ôíá»KÊ<Í—ý®m:?/ïk†Ë*0ŽŽ!ìŸAàÖp©4tñœ«\÷,€Ñ|¢ñs\sÇIB0âöÇ’®|Gš8+kÁÂP$â†'—6ó"3n"pY'fµ)ííüƒÊ²ô[žXz ¯æiµÉ’èÏÈà kÙ‹]‡Û­Ôz€‚ãÀâÏëKò8B„½`•›‰ûô%¹¬ØŸ/Ù“ïfdÜ•…cÌPµiÎçs(Þ~ècýÍ0÷ß}€Ú–YYT{§Æl꾇ñ­-¦s ld.ÁAóŦnœ·B"áÏÁíŠw$•«ªœ’¦/9d€€©š:ú¾(Á;<›ýy·X¸`Hpü¬ cˆÄ‘§É™YªlÖ$¦,<®I¤cé=]ùŽôqVÖ‚?D¢˜µˆ³R%nj?+xt}_dQÓµNu¦ Ü[oTCó´À4éºø^ÉŽ•=¸Õc¾IJ ªm×L=ˆüÑ¢+ß‘ÎÊZЛk\µEY¬¡Ëu"9p •šÊÈÝø#Æx²ân“:̬À! 6ä°÷¢B‚$õœtå;"ÞYY ć…ŽTVÐm/X»m]W  (»õ똆ëÄ&ÜÊ^Žb–Å1’ü9ýC&cDcéÉ?´,¸aÆÅ—˜ûs¯ÇWx³ =ùn6Á]Y¸M`‚¢µ‰«ã”è~fϹ|åô[ç³bóP¦Ë•†6ϵÊu5múqSª/*×æ*‡- -ØÏX* ÃSnóË"ãÌ4æ¢FòsZ&*ÃÜ“e*ÕÂÌkùð¤:ð1½Ú¾·n™ ±$¥í—qV¥ô—êÉw´_ÎÊZØ/¢Ð¼îçÌ6fS¤PrWéojÚL’—ªjQGè©äs+±tòj¦ût¹ì§qÇyfâC=«ŸDcŠ%/dg‡FÌÑOí' ÛŽ¬öc2p> -ê"U›d.ZÔ;¥òé«'64Û|®Jx-fúBÊ-¨y¨¿²Ýž|GÂ8+kAQ—oV[FÖDA{ÖM|JcÄbO¦~“”É}Ý©ûÖÍl>0Îhß …®4DQèq—Ÿâzü%Òzò±í¬¬¶ Eøpƒ—Å.?8ŸµNr‹ƒ½rl,zTÛûJi‹›²X¤™ÍfÊ—YZ­À ÉZiè¶>xQ1ÁžYQ涖'ŒPäöñŽ¨wUÕô¸vCŒä•™« œÇ€FP§?ì,íÁ>q~hž.ª4Æ;…oKÚxbïNÑg¹$–(öèôä»a×]Y ðM n—v°ù°sßÙX¼ªØ–3ui= ‰ÌJêož»òçÙ›²í`HBì/7Ö“ï8ÎÊÂAOê-ž°ÍÁ·|wÉ÷¶Â 4—ÿï×!¨Ÿ–‚7¼Óþ-:×?@)l&)äþnïÉwD­7eÛÁà …±¿í¹ž|ÇÁpVÖ‚Â\"µÛsï‡_’l;qnûÅ„8ÛJ¹DS+iåÃÙøM•Å¥÷ÑÖ„¯ÞØÖ•ïÈ6ge-ØÆb„[z‰Æ•ƒµ<œðr©‡8ƀߕ©Ö*Ÿ6{ÊAÝì¤W‰¾h w¾íZªmKzmâeo,ëÊwd™³²,£1Ñ^f 87$Ù×u6à“‚üú‰Öez¿ÕàÄG5é=26kuH†.× ¼*?u³áØÍÞ+¨ 9òÆùEšÞ¿ºòù嬬¿C<”g(•ÉLÝbzη°Œé [–j–.ÒoV"ú]¤Ô¨¯`ó(uÄ;bÞUU ÈcŠ8ksÓžüsxys}Âxƒ|òÀj±…ž„fh‘o?¶"g¸¶¹4³‰ã&gå à=ùn÷§l;Q„(ó—ÎïÉw geá|ÇõI•íÑpÿ¨½]Z)Ož?˜x¿[W¶È'©²€Æ¡*Së£2ìq#"›¬™7Þtå;òÆYY ÞD!²Ý€†í/ ¿%ÌäH]¤e¥ÁµûÂr`»&XŽgjœ*¢Iyy£JW¾#Uœ•µ Šˆ‘<°Ù`øûHÓCÃm(¡à鱉'/¾×Ewœr¼Éy£\W¾#圕µ ä­[wÚGœ/xyÊÉ.úùçPÆ!Ìš“7wå;BØYY 3‰dÌ·#ý¿ŠóûI¼Œƒž6I&o ïÊw½³² §ET|— ŸuB÷X Ü“ï8ëÞ”mïó.ÞÆ¢#Þq(\UµÀ?f(ÆÑ¡ÎNÙU{¹‘ ~rÆ®ðP¿/ K¬s;a“Âð†Á®|G:+kÂîå~?VøÌá Å—t}B‹Ñ|“æË©º|ôú+OG+DM‚Á»âÝpì¬*Æqÿý«>g«„VmËb£ ¥ u̾M–êb#5AÙ²žüd¸©·3>}#xLPÀ{{¬UG¼ãS­UpDPÈÚûù²¶Óõp€C¼“l³J¯¤ûñöOïß{Ùó=±> endobj -2549 0 obj << -/D [2547 0 R /XYZ -16.307 900.716 null] ->> endobj -2550 0 obj << -/D [2547 0 R /XYZ 56.693 743.028 null] ->> endobj -2551 0 obj << -/D [2547 0 R /XYZ 65.161 743.711 null] ->> endobj -2552 0 obj << -/D [2547 0 R /XYZ 56.693 700.44 null] ->> endobj -2553 0 obj << -/D [2547 0 R /XYZ 65.161 700.729 null] ->> endobj -2554 0 obj << -/D [2547 0 R /XYZ 56.693 657.457 null] ->> endobj -2555 0 obj << -/D [2547 0 R /XYZ 65.161 657.746 null] ->> endobj -2556 0 obj << -/D [2547 0 R /XYZ 65.161 646.787 null] ->> endobj -2557 0 obj << -/D [2547 0 R /XYZ 65.161 635.828 null] ->> endobj -2558 0 obj << -/D [2547 0 R /XYZ 56.693 592.556 null] ->> endobj -2559 0 obj << -/D [2547 0 R /XYZ 65.161 592.845 null] ->> endobj -2560 0 obj << -/D [2547 0 R /XYZ 65.161 581.886 null] ->> endobj -2561 0 obj << -/D [2547 0 R /XYZ 56.693 538.22 null] ->> endobj -2562 0 obj << -/D [2547 0 R /XYZ 65.161 538.904 null] ->> endobj -2563 0 obj << -/D [2547 0 R /XYZ 65.161 527.945 null] ->> endobj -2564 0 obj << -/D [2547 0 R /XYZ 65.161 516.986 null] ->> endobj -2565 0 obj << -/D [2547 0 R /XYZ 56.693 473.714 null] ->> endobj -2566 0 obj << -/D [2547 0 R /XYZ 65.161 474.003 null] ->> endobj -2567 0 obj << -/D [2547 0 R /XYZ 56.693 430.337 null] ->> endobj -2568 0 obj << -/D [2547 0 R /XYZ 65.161 431.02 null] ->> endobj -2569 0 obj << -/D [2547 0 R /XYZ 56.693 387.749 null] ->> endobj -2570 0 obj << -/D [2547 0 R /XYZ 65.161 388.038 null] ->> endobj -2571 0 obj << -/D [2547 0 R /XYZ 65.161 377.079 null] ->> endobj -2572 0 obj << -/D [2547 0 R /XYZ 56.693 333.413 null] ->> endobj -2573 0 obj << -/D [2547 0 R /XYZ 65.161 334.096 null] ->> endobj -2574 0 obj << -/D [2547 0 R /XYZ 65.161 323.137 null] ->> endobj -2575 0 obj << -/D [2547 0 R /XYZ 65.161 312.178 null] ->> endobj -2576 0 obj << -/D [2547 0 R /XYZ 65.161 301.219 null] ->> endobj -2577 0 obj << -/D [2547 0 R /XYZ 65.161 290.26 null] ->> endobj -2578 0 obj << -/D [2547 0 R /XYZ 65.161 279.301 null] ->> endobj -2579 0 obj << -/D [2547 0 R /XYZ 65.161 268.343 null] ->> endobj -2580 0 obj << -/D [2547 0 R /XYZ 65.161 257.384 null] ->> endobj -2581 0 obj << -/D [2547 0 R /XYZ 65.161 246.425 null] ->> endobj -2582 0 obj << -/D [2547 0 R /XYZ 65.161 235.466 null] ->> endobj -2583 0 obj << -/D [2547 0 R /XYZ 65.161 224.507 null] ->> endobj -2584 0 obj << -/D [2547 0 R /XYZ 65.161 213.548 null] ->> endobj -2585 0 obj << -/D [2547 0 R /XYZ 65.161 202.589 null] ->> endobj -2586 0 obj << -/D [2547 0 R /XYZ 65.161 191.63 null] ->> endobj -2587 0 obj << -/D [2547 0 R /XYZ 65.161 180.671 null] ->> endobj -2588 0 obj << -/D [2547 0 R /XYZ 65.161 169.712 null] ->> endobj -2589 0 obj << -/D [2547 0 R /XYZ 65.161 158.753 null] ->> endobj -2590 0 obj << -/D [2547 0 R /XYZ 65.161 147.795 null] ->> endobj -2591 0 obj << -/D [2547 0 R /XYZ 65.161 136.836 null] ->> endobj -2592 0 obj << -/D [2547 0 R /XYZ 65.161 125.877 null] ->> endobj -2593 0 obj << -/D [2547 0 R /XYZ 65.161 114.918 null] ->> endobj -2594 0 obj << -/D [2547 0 R /XYZ 65.161 103.959 null] ->> endobj -2595 0 obj << -/D [2547 0 R /XYZ 65.161 93 null] ->> endobj -2546 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2598 0 obj << -/Length 2713 -/Filter /FlateDecode ->> -stream -xÚÕ]Ksã6¾ûW°rYOUŒ!@€ä×f²µ•¤²±+»›I0I,ó¡€Ôh¼¿> HU†”d6Ô„²¹X²D6›þú‰¦|oåùÞ77÷7oß ßKH²Ð{\z!#aäÅ4 Aä=.¼÷·?ª\ÉZ½¹c¿ý¾jTݽ]Vº{Ó¬û/ÿ^¥÷UõÜýóŸ‡oßüúøOs™;JI"DGí¡yÉU½Vª©Û¯ÍÕ©›«‡A{uF$b±w'Hõ×¾!Å·o»ÊÂöÄ›¯o~»¡†¼ïQO„$L/J( }æ¥ÅÍû_}oa¾3 žÄÞndá ê„æ}î=ÜüëÆï%1~=–Ìá%xf>-6±MÜ2‘ô‘Zµm6[àb²„¸1p°õ|P…ÍÊE–¿7³zç§PŒ'»“ÌjèýÛâ æ$à‰; é#qàŒÙ^‘IyÊb@) -$«gýf;pÈ»þ<¿ÙTûXsl&¦ü¥Luu™Ç8wÜ¢»y•ÊüÈÓŸ—á­Üç(ò¶÷ˆæ•Ôöé#Õͬ…G47Ѹ¯]\žÐœÇF ‘QÐ/­–J«2…2õ²¸¬îË Wõž…JײÌêÂVÑE—µ;Sô!}¤¢£™µPtÁ §žk•gPµ©Ê™ã¢ƒ±;²¥ä[šoÖrf¼åÕÎ%‡Z©¥úrŸ¸Sß!}¤ú¢™µP_اþ®L’©>S—gõ2³…\TÁáÉhúÂ1ä§Õ›uugê=¤To4³ê0ó¾Øü—IHw:kUºÊ^iW¬p¦,CúHeqÆl/ ?"aà®ð;¢–Ùó lK…ýé…ߺÑcÃûzàP¯·Ëå±/˜ÈxUlòqÁkºž¶[géhtõ![€sh©úIKýb w‘tµ W>¢Óp<³pß ’¶GÝm—Û2m2¨‡n[ø–š½WÔÊ=¥ª;`PÔA‘­TÛ0‡zhTä6ºÊmcwgz<¤Ôc4³z'Ä?l¬8mA'ª0äoä3¸*ž–™®—O×RË´ªí¤Wåõô:|nYÅ™E´¯>8ÃÄ€<XV-ÅÄç}9Þ¡‚éªjƒJ+hýä"ÍQM -šögr¡1Û #è -΄1¤–Ù³upÂ(›»ŽS˜Àߢ*Óh‹ƒ/ê[éÕÌ]+—wXVº¹«[,e1^ÆiÓA»Ò‡3´ é#Ñ‚fÖÂG°€0ô>¢/Ö3ÇG¡/´´?RE¬’V 5÷í۶؎@<­ß~Wq¦ßCúHýÆ2{^›)#,é«úŸM¨£Êä+Õ+3L¯4OºTßÕJèãVÚ³½0â.t&Œ!}¤0°Ìž ‚xâ“à°'çnjóãbîLôþ~Œ¤·çtÿµe#áI¦ÏÆ~o¡ÍBË}Ûa¿'è÷ÖòP2j¹Ti3wÙɺΣ.t“!}$LÐÌ£%„Ó¾nZŽša¯o±y|ü/p]OLGL¯X+Y‡F~@¹^®Xí%!ºÏ™(†ô‘²À2{ÞÄ‹ˆð$™x›y`s©vV“[õ¼ñþüf©›yGêj«SÛ?”0†šÊ¶Kç,&Ÿ8Kß6Yž5/ƒéœ~xèn0ŠAìИé#-šYø`:7tÃH¶rÕhy¬® -èLœZ6†.0S~ÖÛ¥µ«ô9 ’øš -bJxÌA¨Ç(mƒ¡ ¢D0æCAèº+½èã0„gŽ¡ m{öz¬ :jþv`[‡¯­š½²CëÄáôõÈ\òRºqÐj Øvÿ"TvÕÚ Üä2…6hK`>Wodj] -xBBß]ÿgD‰H4³ˆl;¬Ißš=À4Æù*HÛ‡¬.— ¥ë´ÒÇ3t“;b [TYo5|'´ÓÜTU^C·?ÛÆÖA“»ëùŒè#‚fÖ!œ’$è{>¹ú¸ÒÕê”BSˆšæ9plj5Ÿò™ObR½ú -Þvÿùëvà”¬Ï‹ö¸õ·Wú³ËbG,"aì®·4¢ÄšY µ»¢> h5bv™Ve#¡>ìDѻ蛀q“ßDWM¥ÚÕŽG©Ô¢JŸªêÙ"“b %1£î2)û$ÝÕ3GôqhÂ3 G‹9¡¼¯Ký0sýÒêRðñS5?lñò„èÊÏEÚ­•žÛ¯Òº¹ÅBcT|w¥‰}$ ÐÌZ* -íñÔ:°þ×Ô͉dáü{îŒÞk»“Ç+øiB µÌʬºƒÎI6®è™0úÂÝ•Fô‘¨A3k# °ÃpÙìm"°)<á[¦+^54'Ú6ðÝs ¸N`éf&@åpd]ÁS=iÛi`<2šç® 0¢Ä šY Ì´]̨â‹lµnæ­ |ÈÔÎB[Q#= -ÁI’„×Ì—cÄÙÿOë‰QóJ‡ “A«dÎP7¤DšY ÔùœpÚ·&´O7œ~&ºëc»-ÛéFYšÄû×+‚“F‚˜XÅ8ÛaÝBnÈ~3»B©ÑöéãiæF(œ)3¢C(žY8B©ˆHxxÈÌWðé£ÿ¥RW'B¿Ÿ/9©¾ä$ðŒÑÃ1õë=lÜfæÃn Þ€ðÒFÊÛŸKq·iD 4³PáÆ„žMoLJ–³WÝÛ@-—•Æ—®?ÿ|†&\ ~à`¹‚¢ádb#ÜáÃmFô‘@@3k„@èðpð-U-™¦í3/–†±>Õì¼»›|ºË‹E ªÄYY7JïàéŠKý •ÊvÅåxÇ4,%\¸›ÔÑGÂͬ,7Qk?©aáÚ•‰p6gwÆL¯5azD¯™D$‚¹þÕ°/»/¶k÷×9õ›iÜ'~˜\ò“i¿;G -endstream -endobj -2597 0 obj << -/Type /Page -/Contents 2598 0 R -/Resources 2596 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2545 0 R ->> endobj -2599 0 obj << -/D [2597 0 R /XYZ -11.232 900.716 null] ->> endobj -2600 0 obj << -/D [2597 0 R /XYZ 56.693 742.142 null] ->> endobj -2601 0 obj << -/D [2597 0 R /XYZ 65.161 742.431 null] ->> endobj -2602 0 obj << -/D [2597 0 R /XYZ 65.161 731.472 null] ->> endobj -2603 0 obj << -/D [2597 0 R /XYZ 65.161 720.513 null] ->> endobj -2604 0 obj << -/D [2597 0 R /XYZ 65.161 709.554 null] ->> endobj -2605 0 obj << -/D [2597 0 R /XYZ 65.161 698.595 null] ->> endobj -2606 0 obj << -/D [2597 0 R /XYZ 65.161 687.636 null] ->> endobj -2607 0 obj << -/D [2597 0 R /XYZ 65.161 676.677 null] ->> endobj -2608 0 obj << -/D [2597 0 R /XYZ 65.161 665.718 null] ->> endobj -2609 0 obj << -/D [2597 0 R /XYZ 65.161 654.76 null] ->> endobj -2610 0 obj << -/D [2597 0 R /XYZ 65.161 643.801 null] ->> endobj -2611 0 obj << -/D [2597 0 R /XYZ 65.161 632.842 null] ->> endobj -2612 0 obj << -/D [2597 0 R /XYZ 65.161 621.883 null] ->> endobj -2613 0 obj << -/D [2597 0 R /XYZ 65.161 610.924 null] ->> endobj -2614 0 obj << -/D [2597 0 R /XYZ 65.161 599.965 null] ->> endobj -2615 0 obj << -/D [2597 0 R /XYZ 65.161 589.006 null] ->> endobj -2616 0 obj << -/D [2597 0 R /XYZ 65.161 578.047 null] ->> endobj -2617 0 obj << -/D [2597 0 R /XYZ 65.161 567.088 null] ->> endobj -2618 0 obj << -/D [2597 0 R /XYZ 65.161 556.129 null] ->> endobj -2619 0 obj << -/D [2597 0 R /XYZ 65.161 545.171 null] ->> endobj -2620 0 obj << -/D [2597 0 R /XYZ 65.161 534.212 null] ->> endobj -2621 0 obj << -/D [2597 0 R /XYZ 65.161 523.253 null] ->> endobj -2622 0 obj << -/D [2597 0 R /XYZ 65.161 512.294 null] ->> endobj -2623 0 obj << -/D [2597 0 R /XYZ 65.161 501.335 null] ->> endobj -2624 0 obj << -/D [2597 0 R /XYZ 65.161 490.376 null] ->> endobj -2625 0 obj << -/D [2597 0 R /XYZ 65.161 479.417 null] ->> endobj -2626 0 obj << -/D [2597 0 R /XYZ 65.161 468.458 null] ->> endobj -2627 0 obj << -/D [2597 0 R /XYZ 56.693 420.95 null] ->> endobj -2628 0 obj << -/D [2597 0 R /XYZ 65.161 421.634 null] ->> endobj -2629 0 obj << -/D [2597 0 R /XYZ 56.693 374.126 null] ->> endobj -2630 0 obj << -/D [2597 0 R /XYZ 65.161 374.809 null] ->> endobj -2631 0 obj << -/D [2597 0 R /XYZ 65.161 363.85 null] ->> endobj -2632 0 obj << -/D [2597 0 R /XYZ 65.161 352.892 null] ->> endobj -2633 0 obj << -/D [2597 0 R /XYZ 65.161 341.933 null] ->> endobj -2634 0 obj << -/D [2597 0 R /XYZ 56.693 294.819 null] ->> endobj -2635 0 obj << -/D [2597 0 R /XYZ 65.161 295.108 null] ->> endobj -2636 0 obj << -/D [2597 0 R /XYZ 65.161 284.149 null] ->> endobj -2637 0 obj << -/D [2597 0 R /XYZ 65.161 273.19 null] ->> endobj -2638 0 obj << -/D [2597 0 R /XYZ 65.161 262.232 null] ->> endobj -2639 0 obj << -/D [2597 0 R /XYZ 56.693 214.724 null] ->> endobj -2640 0 obj << -/D [2597 0 R /XYZ 65.161 215.407 null] ->> endobj -2641 0 obj << -/D [2597 0 R /XYZ 56.693 167.899 null] ->> endobj -2642 0 obj << -/D [2597 0 R /XYZ 65.161 168.583 null] ->> endobj -2643 0 obj << -/D [2597 0 R /XYZ 65.161 157.624 null] ->> endobj -2644 0 obj << -/D [2597 0 R /XYZ 65.161 146.665 null] ->> endobj -2645 0 obj << -/D [2597 0 R /XYZ 65.161 135.706 null] ->> endobj -2596 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2648 0 obj << -/Length 2638 -/Filter /FlateDecode ->> -stream -xÚÝ][sÛ6~÷¯àä¡ufjw‚íS»Ý&ÙÙݦ±vf;I( -’¸¦H•—8þ÷EªcR¦u`ÎtŸ¬XÈááá÷á\Aã`ààõÅ‹‹W? D(’T‹u )’a C, «àÃå{é¸Ò/¯¨À—ÿ.j]u×EÙ}¨·ý—?ÉEqÓýã¿×ÿ|ùÛâæ2W„ HˆNÚu}—éj«u]µ_›«“@™«KÖ^Ë…TWEa}AŒÀP]¾ê~*Ûÿxñ÷ÅÅïĈÇ „D2bA$1 ’ÝŇßp°2ßTp{X¹ Áˆ2i>gÁõÅ/¸·6*¶Û¯ïI6ö ! B!‚e+¹ý½ÀFO.Š"¥Ö“¢ ` -/Ð &íjWùIÆò&(” -t…ûf–(¢Ñ Ê–› ûð¾G¢y„,ð{Å9AœõèIŠ²ÔI­WLK >\IŒ/cزRoJ]Ui‘ÃÖ¿…-Kóº,VMÖvY4õ¬7v§ã(pSÀÖÛ¨c7ÕøÖ`0øH"¢”? å;ÒÀYY 0³…²£ÁªèvOÀã>Ö¥†­3ÝCAú¿¦‚Âyx7ýo_|$Œ£/ÿ¸ºê—L’­ªu dZ®õʯïßÂWÇ{øˆž¼‹ËÛmšlméB$¢‰Þè2”ïHge-èB"$HA¤Àg} ÞÛRàºÛ4Ëæ%`^ÜŽ€vùÍã̈׵.¡›;ÔTÉ6Î7cÈ·'ÝïÈeˆr—xjâçiHÛ‡2Â(T} ñ‘R1Ð~#…¸Á9îÿË3ÖYKßzw¸Çƒ ®wi½ýö塇b­¿¿CŸ« h©2ÂüÅ”2Ä›Ûòµ;Œä»íîÊÂwšôFu÷o$Ç2Nnt\l¯²4ßÀV·éháF續k°à:­MÆ5³×o`ë*­›¸xù8·¥0yãþ >”ïqge- n Ä)é0~¬IYTãXìr:ò:ìz¥Î=s4Uo‹J; ̨†÷Š °««¶E“)ÿ ìÇaëôzmnЖÜäç¡ðÇŠ¡|GV8+kÁ -AŒc§+ éþbñë““£þ›Ç#ÿ¥6¸I¡µÁc©wqšC9e\¼®Ü{½n²ìn:Pœô´5èYˆ(‘þ@?”ïzge-@Ï1˜w /uÕdÐê:!Tf^”»8ƒ–š*mO;«’A±†­kö{]> òP˼»¶e5‰·ðW[Éwd†³²Ì ¼O ܽaÀÆ&Ÿ•êYZŒ‘"ÌSB›æëÂ"™‘IfÃÈ_2+F„o Éw±»²p ÅÇ}6Û@Ãæ]|£á!óeÕ,·f¯„'z·ÏâZÏ›œ(=£ü©ïÜ™ï÷ÿY¼ùùýµ¯„VH“#JêæCùŽ0wVÖæ¡IhyÔm~~÷ëû·¯ß,œrÄ/#lã2)à\*‹õÊò¦Ù;TeÛKBöœ^Lp†Âc¥~v/¶ÌŠäÆÆ1fî•{tc&NÀÔ_j>’ïÈoge-ømâ>vŒfÀ=FÃ# Ýàsh7²,hw_›2Þei/Èê:yj”)(F˜Éçä'B$ñÄÏê./ö-?¿ë¾\ɲ(lËUˆWþËC‰”ò×cÉwc¬»²pÆò6È=Ž$èÝÚDIšª.vP–”Ààp¥×ižZt ùö..ÜÇ]Yvg÷YíN—ñî´¤ªÒ'šá<ãÌó÷ØUŠw¤ƒ«ªl0±0%ê8§öt·°¿¹NžÕ pŒ¸’žœ€ÎWy;Wj³ë3ŒBA=îú$B¡O”å;ÂÜYY œ·1á1—ÀÍ…¿d]¢oÉC ¸ynys'5Œó4 -)æ/ÉwD¹³²('Æ@´o÷'«bÃSC|Ž…‰gŸ5ÄgŠ!yÚÜÛÔÈfgg!Cò~3aîµG"#Æ#ùn˜wWŽyÖKG'ÿýjÝΪÚ>î¾Õ‰J×3.ÆuåËuõ‰I‘¯ùʸÍyž#Â`ŠùKIGò!쬬„…@˜öÅĪ¡Î¹àæ¤{>Å«€QD¦Oº_?ùûÑð Þ5Yî3 ²ŒwHNK(Aƒ'ÆL´=kj̈@ŒùJ ã}Ê{õѦN³´¶™2g&ž”˜ù‹§hÄ‘äþFpGòÝhà®,œ4 -QÄúâm[šÏ3muruIÐ ¦u‡;*èˆaÏ|-ýàÝ}4elýjÚm¼ûñ§§t;Ë5j)©ü¥Ó#ùŽTpVÖ‚ -Ê\3ì›{ërTý?–›~lã|ÿ?‰2Ëõ‹ý‰ÛyñxX—µGÝg»êñ,È€:”­MYjhoó!j]¾:RR3¶#ùŽ÷¦lo Ùjço¬r$ßѮʞr;Fr«¦É¹Ž¯w8sJ×u=Œh×ÅŠ¡ûOº\Æuºóq~ ê²Ç÷wE^T{[88¯'*0RØ_Â3’ïˆxoÊöÆ`RÜ_f$ßÑ®ÊNÓŸ3DŽïŠ9CÿýÌï·ÈÒͶ¶(lJ}?è¹±˜Zêm -]CÏ„?2\¨:%¥>-\~uôT!3/CñŽÐvUÆšðUª–’­uúÊØ㘄]—æ¡Çwà÷»´¶øôXåùÇFÚ”ÓßüH¾ãƒó¦lo Ü%ÞŒ1”ïh We§7èöW¶?—ú8•€v±ÛöÌñÓ»ëùßVs’•>²×ÃG·ñ.´:½ý‡Ï˜ßH$&þ*u#ùn„pVvr'Q„>N´>:þWàñ–;èp±ž ‰ÉNŠL;œP¶9 @T—ìyƒÐP¾#„¼)Û#äGþª!#ùŽÆpUvÒÁ0DLq‡‰3h7t•V{2Á.õzæWPüŸ¹·g9v Ø?d—-z£ÌP¾#e\•vAæ -œ -ˆ úR§ÔÏ?JÑ%CÞåP¾ã£ô¦lo N%þæ‘|Gc¸*;í -8GÊA«2¾¹”à^…þ‹ºóìe‡¬Ð^âáêKÕÞ¤K¼™b(ßÑÎÊ›¶„R$T? oGÚ ìâ•žûÍazî“£ÐKWÆ«e=³žñ²€¾Sl­ãº)¡¶¿Õ¥~j˜`…÷÷–‚‘|GÎxS¶3FÔ¥?¾l1ïf -WU§?ÆH†–ú-?œ?Ë=Ó*µ=‡:561é˜s=ó û½‘ñÑKÕÎsVu)‡/˜Å»ÁÔYUxKGE($ýŒÞ!+²™AŽ+p%G~¶{û¦íqãù!Yêîà5øÔñA-öÀñóoŸˆKÑïP¼ã[Ó]U…s!T(ý^ZW:³=ép›ÖÛÙ‡Q§NÉ<ók—²1À;ÚOzÉÝχþÈ ÇËè)ãæÄäÖ -endstream -endobj -2647 0 obj << -/Type /Page -/Contents 2648 0 R -/Resources 2646 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2545 0 R ->> endobj -2649 0 obj << -/D [2647 0 R /XYZ -16.307 900.716 null] ->> endobj -2650 0 obj << -/D [2647 0 R /XYZ 56.693 759.068 null] ->> endobj -2651 0 obj << -/D [2647 0 R /XYZ 65.161 752.393 null] ->> endobj -2652 0 obj << -/D [2647 0 R /XYZ 65.161 741.435 null] ->> endobj -2653 0 obj << -/D [2647 0 R /XYZ 65.161 730.476 null] ->> endobj -2654 0 obj << -/D [2647 0 R /XYZ 56.693 683.656 null] ->> endobj -2655 0 obj << -/D [2647 0 R /XYZ 65.161 684.339 null] ->> endobj -2656 0 obj << -/D [2647 0 R /XYZ 65.161 673.38 null] ->> endobj -2657 0 obj << -/D [2647 0 R /XYZ 65.161 662.421 null] ->> endobj -2658 0 obj << -/D [2647 0 R /XYZ 65.161 651.462 null] ->> endobj -2659 0 obj << -/D [2647 0 R /XYZ 65.161 640.504 null] ->> endobj -2660 0 obj << -/D [2647 0 R /XYZ 56.693 594.078 null] ->> endobj -2661 0 obj << -/D [2647 0 R /XYZ 65.161 594.367 null] ->> endobj -2662 0 obj << -/D [2647 0 R /XYZ 65.161 583.408 null] ->> endobj -2663 0 obj << -/D [2647 0 R /XYZ 56.693 536.983 null] ->> endobj -2664 0 obj << -/D [2647 0 R /XYZ 65.161 537.272 null] ->> endobj -2665 0 obj << -/D [2647 0 R /XYZ 56.693 490.452 null] ->> endobj -2666 0 obj << -/D [2647 0 R /XYZ 65.161 491.135 null] ->> endobj -2667 0 obj << -/D [2647 0 R /XYZ 65.161 480.176 null] ->> endobj -2668 0 obj << -/D [2647 0 R /XYZ 56.693 433.751 null] ->> endobj -2669 0 obj << -/D [2647 0 R /XYZ 65.161 434.04 null] ->> endobj -2670 0 obj << -/D [2647 0 R /XYZ 65.161 423.081 null] ->> endobj -2671 0 obj << -/D [2647 0 R /XYZ 56.693 376.656 null] ->> endobj -2672 0 obj << -/D [2647 0 R /XYZ 65.161 376.945 null] ->> endobj -2673 0 obj << -/D [2647 0 R /XYZ 65.161 365.986 null] ->> endobj -2674 0 obj << -/D [2647 0 R /XYZ 65.161 355.027 null] ->> endobj -2675 0 obj << -/D [2647 0 R /XYZ 56.693 308.207 null] ->> endobj -2676 0 obj << -/D [2647 0 R /XYZ 65.161 308.89 null] ->> endobj -2677 0 obj << -/D [2647 0 R /XYZ 65.161 297.932 null] ->> endobj -2678 0 obj << -/D [2647 0 R /XYZ 65.161 286.973 null] ->> endobj -2679 0 obj << -/D [2647 0 R /XYZ 65.161 276.014 null] ->> endobj -2680 0 obj << -/D [2647 0 R /XYZ 65.161 265.055 null] ->> endobj -2681 0 obj << -/D [2647 0 R /XYZ 65.161 254.096 null] ->> endobj -2682 0 obj << -/D [2647 0 R /XYZ 65.161 243.137 null] ->> endobj -2683 0 obj << -/D [2647 0 R /XYZ 65.161 232.178 null] ->> endobj -2684 0 obj << -/D [2647 0 R /XYZ 65.161 221.219 null] ->> endobj -2685 0 obj << -/D [2647 0 R /XYZ 65.161 210.26 null] ->> endobj -2686 0 obj << -/D [2647 0 R /XYZ 65.161 199.301 null] ->> endobj -2687 0 obj << -/D [2647 0 R /XYZ 65.161 188.342 null] ->> endobj -2688 0 obj << -/D [2647 0 R /XYZ 65.161 177.384 null] ->> endobj -2689 0 obj << -/D [2647 0 R /XYZ 65.161 166.425 null] ->> endobj -2690 0 obj << -/D [2647 0 R /XYZ 65.161 155.466 null] ->> endobj -2691 0 obj << -/D [2647 0 R /XYZ 65.161 144.507 null] ->> endobj -2692 0 obj << -/D [2647 0 R /XYZ 65.161 133.548 null] ->> endobj -2693 0 obj << -/D [2647 0 R /XYZ 65.161 122.589 null] ->> endobj -2694 0 obj << -/D [2647 0 R /XYZ 65.161 111.63 null] ->> endobj -2695 0 obj << -/D [2647 0 R /XYZ 65.161 100.671 null] ->> endobj -2696 0 obj << -/D [2647 0 R /XYZ 65.161 89.712 null] ->> endobj -2646 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2699 0 obj << -/Length 2731 -/Filter /FlateDecode ->> -stream -xÚÕ]ßsÛ¸~÷_Á¹Î4ÎL ñƒ½§Kïr—6w“Æži;¹{€HHbM‘:Šíþõ%:5%Ë\„“>d,KÐr ~ßâÛ]ÁÑ"ÂÑg¯¯Î^½a8JQÊ)®æ§ˆ‹H’Å"ºÊ£çt©U£_^P†Ï©[Ýì^Îk³{Ñ.û¿¯³×u}½û埗ï^þvõW{™ BPÊØÎÚe{Wêf©uÛtÛ«“HÚ«ó¸»zÂTF ¥¢¿>£Ö ç¯v?åÝÏ~¸:ûýŒXó8"㈧q$R‚8¦Q¶:ûøŽrû™u%©Œn¶#W#јÛ×etyö÷3Ü϶.v/»?>°l烉„!Idg¹{Ÿ¢T¦éF§‘ÑÑü¨¥Qû Nöí3Làt…‡³ÀQJÓ œÝ4‹h÷âC;ÃÛ[•t·JÚ)—ã)"˜ïnÕ¼¨TYÞmïÏq[ÑÇ Žñ¹‚ [©ÌÔ°¡"A×›¶-ªÅ¤~ÎTv½0õ¦Êãí¬¼êß8üây“­«½/lÍýŠ>þ½yQ–::Vßî{d“Ý{ƒÛ? Ô=ðãI‹›`ÀÚ÷¾·³À%"I£Ôá÷ÆSYg×°¡õ6®Õ·­;Öô>zÐñ±‹ƒ±::Øe2Ö¦^µ‚ .‹æ€ÝÐûbQÁ.ðþx_6­4ñㄣ1 -H·‡Ö=ÉÈÑ~ˆ5™p1´ï9¾ÎFaíÜäˆÚ+l£ÌÅ—òº&lÚ¢,Ú;hØX­KÕé¾iWá£Ökð2¼‡Mà€è²:×®„·ÐK% ‡ô¡}O¤{;ë°Âb†h¿ÀÎëjé:ÿv„eSY€UYTúTà¿|度ðÔNnšü6ËJx÷€·íñŸ‡ dŸŠqÁcÉîîýJ)¸¼ÃQb‰û|³žiÓ¾Üþ­—­ºkëêÏ//µ¿=×UkîÐmSõ+·À•4õùÓŸ^¨8³É–ÆÞ¡y?òz» -àîg·mZÈäîŽÚÛ¶Þ˜uÝ^Y.4С7° ŒôvMÚË`Ÿ\y]ƒGQ5­Vù´ëØ¿7M /³Reñíð6k•éGÔ4î5‚òQ$%yÖc”$ô„ôs‘-•.»¿±]mó†]4Zíò>uYFãˆ(F‚ˆ€§H°p%ª=ûž¡ÈÛY‡XDb„“¾Dõ¦¸…ŠdË“EµÒU;-Yç…²µ“ù—’¼`™£U¶tÈÌmÀªÆéa“+Áj­¡}Oôz;ë€Þ8A˜Ý÷¡8èT±ÍÊýT™½àH» \]ª:Rõ?@e·‰Fµ,Óë¾ÌžÚá§I‘ ×­š÷$ƒ¯«\ 6óN{Mæ’F( RntYNkñx^À@Wj~VÉ”¤ Še(É´.:½ôíî“殪×~_+£VèöFÏo|.—ŒNWb&gV"b;IáÖž}?Vú; §e"ì5e/°¾ƒwÁ±~¥*‡M#óM•mÑÕÃךn'!pûHMÝjãXrø 5À3Ó(¨BÕó¹ÎÚ@•²Äþq8õ¶gß“ÞÎ:PÃ^ß7-Œ×jíì„XßÀ¸úRz¢ÖL+É~ºúù+Ê™…]Àø?0ï‰q_W ÎlzÍ‹²~¾/FvéÛNzONÐ!×sµ)V?©rÍšÇ&ãÅq -©ª)ö÷blŸáé=àq‡®V¹P›$]Oây,å(f¡ìgÑ -+á9 ©I1CœŒICûžAÉÛY‡¨„í[Œß?rrS›k¨,]ª*/ÁÕ~h£ôoû,úãqÊ}€/ÒkS·u{·Ö>UžÙú¼Z©Ðußè²ØWL£´‹m+p89ºgßþÎÂY§¥é}㶚X4Jªc#×”§vD©Ù¦TÆgïåx%s¶il¸‚o¤Êkh^æ ‘g„Œ‘`á10ïÉ_Wè Âq/][c¥×¼ÛÏÖug¦í´eƃîhÏ%ÀÂrR/ €"½h,Cï¦ÎX·ù¤Uñ®Äô¡DžCûžÔðvÖ‚#,R÷Z;4‡n“(ª\W-T¼Á^óº,ë°ÎƒñQEæP÷yŠ$¦Ï™5ʼn@q÷ÈôW‘5ű@<–ᲦØ&‰\Ô‡Cûž¤÷vÖô´ƒF¯ß›z­ ôñëÂrtaT&Ëš]«áS³Pƒ{ƒÇ¹Aáîš÷®¯«¸%)¸rÍç#!%×4Äg˺ÈÀ2Û›ƒ=™_)zÁÛK¾ûåòmò8“ÛÔ™oCûžtðvÖX"œôâ-Ûc4guÕš~D»4õfܱ¿>³~þ`©Ý 8(T€矮'6 -lšÆ%àäÀÞ³ïlgáÀ¦©ÍØ{\ŸÚ…ïΚºÏ4ÓÝq=õ¾mÅuU4«©kHŽ!ÁhèÈÚuç•É$‡ô¡}O¤{;ë€tɉIÿ¸úT¡g¼Œ§SÇZ·E¢˜ú `­6Î -A”áêµ{ö=Yáëìq¶Ž]YâÉ%Ý1«Þc?ŸºTéĸ‚®UÛuó1ù3²n¾†R ˜4›5ü~pº±XºöF(·RŽlCûždóvÖa â ¢¤¯ -Bë™Ñ -ª¯ÔÿçöOpš¼R×úKÆpÕì0xŒ³&Ù• -ƒ±fhß“5ÞÎ:°†ÅˆÞŸTsP(å§P®­n´ù45Æ´Ó“ÑNˆœé¥úTÔæ‰å€<{S…|Îþ¥ bq¨?’×Ù¬®¯:$”$H’8\‡„b›Ó³€thß“ÝÞÎ:°ÛN5¹?ÆᄼG›§s]Ë×gìŒâ^ÂIΟ“pDXQˆp(ûÔ‹ª6úþY£Â|„K$0 G>Â:‹áª{öýÈçï,œ|öÂñ±çŒz€sœ$ùlÝu𔊼p¬¸|ót^õþíIJ³¨²Ú¬k‡fl1y{ó@lŒÓÊ.ëB†«îÙ÷D½·³¨gaÑW­V*­MQæ§nA!IŒDÊž5âS‚âûSý'ø'œôHA< Ä"vUå"\órϾ'Þ½uÀ»•s]×óÕŒ^Ø|¨oÞW̶¥Å|Úmm›J7™E’«f9ížÔ™xê¸L‘ áÌм´½]…#;íµ‹Óžº*ðS¾`àz†j·+@W®;jþRÚ 4Ðkñ˜œû‘iB“ºtÙÄA°p*bhÞóðk_WáÈ“ᤗWKUAO>‡“ïUUh`úNyw"ó‰ÚD0;åSJ“ƒÿö'±zkwºëÿúó_FfS™ -endstream -endobj -2698 0 obj << -/Type /Page -/Contents 2699 0 R -/Resources 2697 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2545 0 R ->> endobj -2700 0 obj << -/D [2698 0 R /XYZ -11.232 900.716 null] ->> endobj -2701 0 obj << -/D [2698 0 R /XYZ 65.161 760.065 null] ->> endobj -2702 0 obj << -/D [2698 0 R /XYZ 65.161 749.106 null] ->> endobj -2703 0 obj << -/D [2698 0 R /XYZ 65.161 738.147 null] ->> endobj -2704 0 obj << -/D [2698 0 R /XYZ 65.161 727.188 null] ->> endobj -2705 0 obj << -/D [2698 0 R /XYZ 65.161 716.229 null] ->> endobj -2706 0 obj << -/D [2698 0 R /XYZ 56.693 669.433 null] ->> endobj -2707 0 obj << -/D [2698 0 R /XYZ 65.161 670.117 null] ->> endobj -2708 0 obj << -/D [2698 0 R /XYZ 56.693 623.716 null] ->> endobj -2709 0 obj << -/D [2698 0 R /XYZ 65.161 624.005 null] ->> endobj -2710 0 obj << -/D [2698 0 R /XYZ 65.161 613.046 null] ->> endobj -2711 0 obj << -/D [2698 0 R /XYZ 65.161 602.087 null] ->> endobj -2712 0 obj << -/D [2698 0 R /XYZ 56.693 555.686 null] ->> endobj -2713 0 obj << -/D [2698 0 R /XYZ 65.161 555.975 null] ->> endobj -2714 0 obj << -/D [2698 0 R /XYZ 65.161 545.016 null] ->> endobj -2715 0 obj << -/D [2698 0 R /XYZ 65.161 534.057 null] ->> endobj -2716 0 obj << -/D [2698 0 R /XYZ 56.693 487.261 null] ->> endobj -2717 0 obj << -/D [2698 0 R /XYZ 65.161 487.945 null] ->> endobj -2718 0 obj << -/D [2698 0 R /XYZ 65.161 476.986 null] ->> endobj -2719 0 obj << -/D [2698 0 R /XYZ 65.161 466.027 null] ->> endobj -2720 0 obj << -/D [2698 0 R /XYZ 56.693 419.231 null] ->> endobj -2721 0 obj << -/D [2698 0 R /XYZ 65.161 419.915 null] ->> endobj -2722 0 obj << -/D [2698 0 R /XYZ 65.161 408.956 null] ->> endobj -2723 0 obj << -/D [2698 0 R /XYZ 65.161 397.997 null] ->> endobj -2724 0 obj << -/D [2698 0 R /XYZ 65.161 387.038 null] ->> endobj -2725 0 obj << -/D [2698 0 R /XYZ 56.693 340.242 null] ->> endobj -2726 0 obj << -/D [2698 0 R /XYZ 65.161 340.926 null] ->> endobj -2727 0 obj << -/D [2698 0 R /XYZ 65.161 329.967 null] ->> endobj -2728 0 obj << -/D [2698 0 R /XYZ 65.161 319.008 null] ->> endobj -2729 0 obj << -/D [2698 0 R /XYZ 65.161 308.049 null] ->> endobj -2730 0 obj << -/D [2698 0 R /XYZ 65.161 297.09 null] ->> endobj -2731 0 obj << -/D [2698 0 R /XYZ 65.161 286.131 null] ->> endobj -2732 0 obj << -/D [2698 0 R /XYZ 65.161 275.172 null] ->> endobj -2733 0 obj << -/D [2698 0 R /XYZ 65.161 264.213 null] ->> endobj -2734 0 obj << -/D [2698 0 R /XYZ 56.693 217.812 null] ->> endobj -2735 0 obj << -/D [2698 0 R /XYZ 65.161 218.101 null] ->> endobj -2736 0 obj << -/D [2698 0 R /XYZ 56.693 171.306 null] ->> endobj -2737 0 obj << -/D [2698 0 R /XYZ 65.161 171.989 null] ->> endobj -2738 0 obj << -/D [2698 0 R /XYZ 65.161 161.03 null] ->> endobj -2739 0 obj << -/D [2698 0 R /XYZ 56.693 114.234 null] ->> endobj -2740 0 obj << -/D [2698 0 R /XYZ 65.161 114.918 null] ->> endobj -2741 0 obj << -/D [2698 0 R /XYZ 65.161 103.959 null] ->> endobj -2742 0 obj << -/D [2698 0 R /XYZ 65.161 93 null] ->> endobj -2697 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2745 0 obj << -/Length 2637 -/Filter /FlateDecode ->> -stream -xÚí\moÛÈþî_A ÎêÕ¾“ÌõŠæ./×6¹\m÷Z 9¹’S¤Ž¤ìäK{—o±E‰òÐËuŠ¢_,š\ÎwŸÙyfvHì,ì¼>ùþêdöJ`ÇG¾¤Ò¹Z8’"é:aˆ¹ÎUä¼?½P‰ - -uvN>ý)+UÑ.²¼9(WíÅYø}–]7ÿüëòÍÙ¯WÕÝœ‚|!i—åçD+¥Ê¢º¬{'Ž§{—¬êK¹ÔsÎòݶÁ´@×;5?„ÊêÆ“—W'¿-;ÄIŸ9®OÄÔ ×'ïÅN¤¯i÷=ç¶n¹vÁˆ2©çòäï'¸‰þïþÈt}p,Ý>P*jmºÛf¯t“úyxu‡¸ôô…ºñÛ8\*ù€.×ú/9;—Ÿ^®ãrõììœPýO¦3GŸŠ¤‘ªÇ­\ý¼Þ}b=OÄ¥ŽË|ÄhýÄÕyõøqéPä{¾“+gqÿw¤>»ßõÓ“ÓvÐ&UkSùIúò&ÈÕCéáþôKäSekùÒi.ZìÌi§8ÓXÓà­§öUüIE;@ؗ伯§{“góD­ao54`-£¬1¨‡[ÎUœ.aMUèƒÅ)¬Ý"NT¬PÝlk·T©Êƒ²¯íÃD\Ä1·ð]ù†7VvÀ)Ö m¾FÌîîÌê»Q{bàž’¬Ø»©¾ò;âQ—øâW« ½â©Ì`í^i¬XÛ7*ŽT^<6‚q"Lñ±^LjOéiÐØñbqšÄ©áƤGv…=7&]‚‘Ö¬¼'ßÌÊÍ•…[¹ty½¢Ôsû<Š «}±Ýl²ä‡M¡Î1TEvPE™oÃr¡ 5:´|T \9Noà’l6*ÈÁJAaž-#•”áÚƒñ®|C+;Æ’!ÎÛ#Û–›m ÅqžgÛŒûùgX»¯Þ¾9É?ã±G -õ™?w{e°Üsµß¿e'ªÐQ–«8Öq ¥rP.ûªâ7Z3¡]ù†&d¬ìq¯ lã2rŸu_o7}VÄ`<붺ír€ -QÿHO5±Á/` ÷K«à&\Å×%ˆ’KD±o Ò -S®ðw"ö‘ÛÑ}Yö'€`ýp/7Ûy›Ç¹Ï2±sN9"š®º Ñ"K’ìŒ -ØjoZŸÒl2]v9¥UpFñéͧís¥ÒæhDí9=E_OußZÝ»¾‰Ç‘ëÊŽ¯ªÃR©ié…Y'[sPõòZÚ‚¢ÍqÞdÃÐîhœS¢)›ëê˜tÁ«ÿ¦ªX¿FÌ«`•,s•vtz§³b£ÂÙÅËç/Þ¾ü¶iõålõ„s$ó,»þXBùˆ,!0âÂ"ñÌGÜ·G¼{òÍ–[ceWÁ)r½–f3Ì.Úiì¯ß_K«I‡­Fiv ¤âA±·lUû€±Ž« Á_ŽHs´j¬_éÚ³jîëÛ#Q=ùfVm®,œDéÕ£^AêYüE埡qo¼ŽËøFÁšÿ3N£ì¶øš‘zg@ž®J›W|¾x½IÔZ¥ePÆY:2ÄiLrâÇÍ·iÚOì™pÅxü;æ¸5tï^+qm?m›s =s"Ê}{æ¶+ßÐÜŒ•˜›'Öì’ë_ÑmT–ª€ÆAM –‹ö#t$Ü[Oä:$ž6ùÔl—$#m«Xé•DAmæ—~H={Э®p[-ã3~E'À°vÄIqÈQKaaÅÈ]‚èfÓW¶o@ǯïÛýN—Cfúe°ñ #Ö_‡4R¯ .GÂõšIÛqŸ·¹ èjt0V>!ÿå\è>„uþÛ7uó¢ÐÞ¹è"N ¶N}9Z2±H}u„1µç‹wåúbceGP_êUf_OâmRgҌۻŸ_ï&NÕ´}§Ô9m7I%”éFšSsóÖAS™l‚*<`Ð̓>Á:²'•iMÝqâÌŠ''an¯fª'ßp‰0Vv]'.b¬ÍÕܹ¨U«pjK)‚µ™ââ„hÈŸÒÅ3Ï«k'uñ†i0×C.áö\+«ª?ï’Ñ“ÛMO¾™Ý˜+ w­L3êÊF»ZCp)B§×àÆP_f7ÐðÏq¿.ãôÇ#Ì(ÖAZBÓUyÜ…« k®K©hââÄý!»s'‡Õx,Õ˜ö( –AœŽœrôFêA²o%IÆôjé>´y3qÝësªÚΣŒ¡™ÄÚo·»Vo5ùƒf—^g*O÷?"’f‚!ïiw’43Atê¤G¸YJ´l‹›7L#IXܼéÉ7t³ÆÊŽp³„ÕfWÏé?6QPÂ}'4:)ã2QÓ:xßp“X5»/ÓfœÁj.·q4qø>Ê[g9°¥úTÅùñ#’Ð¥…b¤kóÓíNQ_ût‹»S=ùf뉹²ðp—aŠ¼nwÊÜ%R_jîô”‘ºá®8|òj&õ)¨öy‹Y°Šß¶êceSY¤¢Y˜¥¥^P¶YìeŸû7YÏ(SÉ‘Í7ì¨f:ô.c=½ùìÊ74ceáî˜j -Þ¦=þ’Æe ­I W*¼ÞnfËòZåˉݲý]xÄ{›å×à·.nâÉ+à¶Àéú)ËKh:úÏ£l>6µG9EÌâÖNO¾¡%+;¹@ÝËbà҉ƀšv.bZ¼ƒQž^¨8I>?¶>›Voaö¤®™Hä -ùµƒUŠ5]fÏ;Mz0±÷znO¾™M+;hDÓÖª° žÁï¾;ž¥{} ¶g -7®Ð9Xrø –HE›-¦ÿ{ò §Úš²í`TÔÛbÝ|O¾á`+ ÷EÄuër’¿‡o -ÔdÔßjÿïÙ‘z¾+ÿË6ЭôC‚gÇë -?ŽT&ŸµUÉaö^DíÉ7„§5eÛÁÕ¯½„jO¾á`+;ÂV…¨÷j[í¾ÔCå³gð|¹ç›&'ˆ{ɨž|ù0Uvxä9¯_ĹŸÈ;RÔ»M¢i©Á<ùJ)Ü0Wø - aQ‹ÞvG¼!h UÆ cwù– 1S•R#;`@kÐRõ).JðVFõñš±À!þýŠß鑳+ß:¦Êc‡R$<ÿh½Ñaq­Ê ìÁ{ˆq{©«ž|Cš*; CBd“£°ñ)–çxPàbÄ7f÷6­Dß„T¶À³+Þ ;¦ªCc$]29vVô­Nðy˜å¹‚–È­ãµ*?oþ{ÀæIÄ©½,Ï®x3°™ª:6ÏG.¡_Í[ÞÉáŠÁI^W4ÇÐðk›Àvy‡£}¨Û«Ö>¹#Þð;†ªôÑC®`ÿæSóØ{9ø;fÚ!ToãõZ7¿‡¾•Ì1ÂÒ̧’ÿ_®< -endstream -endobj -2744 0 obj << -/Type /Page -/Contents 2745 0 R -/Resources 2743 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2545 0 R ->> endobj -2746 0 obj << -/D [2744 0 R /XYZ -16.307 900.716 null] ->> endobj -2747 0 obj << -/D [2744 0 R /XYZ 56.693 742.321 null] ->> endobj -2748 0 obj << -/D [2744 0 R /XYZ 65.161 742.61 null] ->> endobj -2749 0 obj << -/D [2744 0 R /XYZ 65.161 731.651 null] ->> endobj -2750 0 obj << -/D [2744 0 R /XYZ 56.693 685.074 null] ->> endobj -2751 0 obj << -/D [2744 0 R /XYZ 65.161 685.362 null] ->> endobj -2752 0 obj << -/D [2744 0 R /XYZ 65.161 674.404 null] ->> endobj -2753 0 obj << -/D [2744 0 R /XYZ 65.161 663.445 null] ->> endobj -266 0 obj << -/D [2744 0 R /XYZ 56.693 626.55 null] ->> endobj -2754 0 obj << -/D [2744 0 R /XYZ 56.693 599.175 null] ->> endobj -2755 0 obj << -/D [2744 0 R /XYZ 56.693 553.059 null] ->> endobj -2756 0 obj << -/D [2744 0 R /XYZ 65.161 553.743 null] ->> endobj -2757 0 obj << -/D [2744 0 R /XYZ 56.693 506.771 null] ->> endobj -2758 0 obj << -/D [2744 0 R /XYZ 65.161 507.455 null] ->> endobj -2759 0 obj << -/D [2744 0 R /XYZ 56.693 438.565 null] ->> endobj -2760 0 obj << -/D [2744 0 R /XYZ 65.161 439.249 null] ->> endobj -2761 0 obj << -/D [2744 0 R /XYZ 56.693 381.318 null] ->> endobj -2762 0 obj << -/D [2744 0 R /XYZ 65.161 382.002 null] ->> endobj -2763 0 obj << -/D [2744 0 R /XYZ 56.693 324.071 null] ->> endobj -2764 0 obj << -/D [2744 0 R /XYZ 65.161 324.754 null] ->> endobj -2765 0 obj << -/D [2744 0 R /XYZ 56.693 266.824 null] ->> endobj -2766 0 obj << -/D [2744 0 R /XYZ 65.161 267.507 null] ->> endobj -2767 0 obj << -/D [2744 0 R /XYZ 65.161 256.548 null] ->> endobj -2768 0 obj << -/D [2744 0 R /XYZ 56.693 209.577 null] ->> endobj -2769 0 obj << -/D [2744 0 R /XYZ 65.161 210.26 null] ->> endobj -2770 0 obj << -/D [2744 0 R /XYZ 65.161 199.301 null] ->> endobj -2771 0 obj << -/D [2744 0 R /XYZ 65.161 188.342 null] ->> endobj -2772 0 obj << -/D [2744 0 R /XYZ 65.161 177.384 null] ->> endobj -2773 0 obj << -/D [2744 0 R /XYZ 65.161 166.425 null] ->> endobj -2774 0 obj << -/D [2744 0 R /XYZ 65.161 155.466 null] ->> endobj -2775 0 obj << -/D [2744 0 R /XYZ 65.161 144.507 null] ->> endobj -2776 0 obj << -/D [2744 0 R /XYZ 65.161 133.548 null] ->> endobj -2777 0 obj << -/D [2744 0 R /XYZ 65.161 122.589 null] ->> endobj -2778 0 obj << -/D [2744 0 R /XYZ 65.161 111.63 null] ->> endobj -2779 0 obj << -/D [2744 0 R /XYZ 65.161 100.671 null] ->> endobj -2780 0 obj << -/D [2744 0 R /XYZ 65.161 89.712 null] ->> endobj -2743 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2783 0 obj << -/Length 2497 -/Filter /FlateDecode ->> -stream -xÚí]íÛ¶ÿ~…m¨¨’")2X -´M.]‘¶[s$A¡³è³Yr%ù^öײäÄ’%™4Í´œ/V$êáOŸ÷GâAïÖƒÞ«‹o®/ž^Qè fÞõÜc°ÀãÈ~à]GÞÛÉÏ2‘a!/§˜ÂÉY)‹úpžåõA¹h.¾ÈfßdÙ‡ú?ÿyóúòýõ÷jš)B@PZS{S>&²XHYÕe5;ò¸šùÕì„ ÀÜ›R ‚f~JÁ€OžÖ?³êÆ‹—׿] EzÈ£ 0á{@€AìÍ–oßC/R×@÷î7#—E`Ÿ©ãÄ{sñ¯ Øp*ˆÕaõój‡²â -° -8âåê<‚ U£…—Ko>Hé } -C]ú"0®5Ã.X؃݈…âçfaÈF,¶0@Õ 3ݬÜLžßzõÁϯ.¼·Sá¤Xdë$jÆ4³ ½‘zãîÂ$n“l.€A,¹ZßèQç¥Ìõ†æ2d§·š”5ÙPiOkdkyZ"¿LŸ®ÖÕ™`¶é[ -¦-ØaÁô9@$8 æçÌ¡‘òN¦z#ã¹æ¸RoÜ",ôf©æ¢ÞæájÏL5ûÀ¡>îR·ÔF; Ãºˆ€8?ëâY\†é£‘2¦Úˆ”däNÛô-5Òì°N"°šá¬“gB'—²Y–Îã|©7¸\„åIí³[÷£/Âqq,^ æ@FÝ p›¾¥Û‚`îŸâ“ pš•ºæg–¬#Møç‹+m«fàèzd3!/Nk¨{¤|ðé—á­4àg©i˜ÁX]Üt¦@mú– -d vX |uáÔ -d¤švýú§oõ&qúáÿNϪLOûû°OÛËSÔ¹¯†‡k­«°Î4¨MßRƒœm˜Aê2˜3f´é[2Ãìžü  - š&ÒUœÆÅBFG)gsCÀ ÷=`¬¤ -B#c™öëʉ³elÓ·\Fg`fàM -êŒ-ò–¬°„:,¾˜J›ò6: sò!\®º]Ý÷ååæ2¿{ÆÉ:—Æ"‹êÎÙ2µé[®“3° 3`8cF›¾%3œ­™AEÛ¹bF‡¾3¬Áª00Þ9ž?WÂËü&+ä©ã¼R¥néäNæÚéOxÆ©.é_Ã$ùU³k:×­ÝH}D™q1˜rˆï®Nסo)ÂÎÀ6ÌêPÊ3Úô-™a V?Ƥ¯6Iì•r£ÚïèŽKûBÑw‘’bžg¹&’2_§û­EDMžÕ'+ €"w[‡¾¥|Ø‚–ÅI²U Ôå©c=gükÓ·äŸ-ØaþQ8iÞàübX¾·/€v$öÙ³á[^j;LméðF·r_f&e¡?Só"Ë8vÍþq6[/eZö=ÜÓá‡û¥ù^F52þƒŒËEïx%îtGÜ ')¥µ¤¿ƒ6£øΨ@y1¼3Õµ$~¨pWFèз´$Ö`5<5§r¦¬œ7míû,ÿ`°°J~ú*šÓ‘;äýÊ›ày(ƒÑ{::>üf¯ø56ºXəɓöãã·ÌTî­Ë$.ºú;På±#lZ&}ÿÖ‡ï¿ÏÅ®¾þÇë—/L3Ìs˜0´È[*ž%ÔaŽ…š€Ÿ=øÙƒŸ=ø‘ÕE#gv¤MßÒXƒ5ðà¨:%ÎüOçÁ—Qñ˜f«".z<8:ƃS7`w5ü}KÕ³;ìÄ!°©ZõOÓpQ×Â\q¯Cߎ{îÀ6Ìàu)È3Úô-™a V¿bJ8PàÓuå™ -9¹@‚¸èÊ“ ®H9[Æ6}Ëet¶a«ShgÌhÓ·d†-Øa f*ö š*/ÆĪ3¨±dkž:s¶Tmú–Kå là ¿1£Mß’¶`‡å–`€)û=åvhôc,“¨èµîÓšG3åKiªH>U+ðiiÖ¬Š¦kìÿ­·ÄÀÕÒTlöÄhv— H›ø«ºÜå ‚êY¾»þáõw2Y5»[ìî­½iõÉ-o–úz»oÆN3p–méq:“?”Bù×Çy½OhsE=q•%ê@`MéÆ´5®›Y¢µðC¸Îãò¿µ|/ôÈÒg—S„«Úšç˜Î²å2KÁÇüí ùDßm]šKиuóýJ‚Ü™ú};ëfV?Òô} i”àë(’‘á[Ì=IúH}ò¾§t4R_X…y¨ù™R.e—òó'ä[Çr¯VþäPxœÈYi2Ë_g‹žš8kïu†É“§_CÓ-¨V‚â¸ía-FÛjú–Jf Ö@É”§Û¶švá÷^Zi :½¢öå¸Øœd`¦ï`´Y>®¤áC„i䆣¥|(­˜3RÔWqcXîGŽºu$r•Æº+€wè[êš5X]CŠAÛæÚõ"ÖþÎþƒn~"“þp6ëÕJåGƒý¨iÏ[3FAoµ¿6LŠìIJmdlàˆ°w¸GA‡¾r؃5P…m»C•€io6°ÿ%œÖK–÷‹x¶ÐlHK¹,NÛ=Öí[ßk⮽]Õ½~w]>¬z¢ÊêÅH0n!ÞHM07ëÛ¾¥û b„û êú,à»|†<ÓJˆÉÇ<Ÿ÷æù/gURžÄ«Bþ±S}9Ið}ÿt™>®>I™þ‹ð.Žê<ÿ[•…É|›æ7Ï`Þ«»óÝe÷ˆ ÀwÁP‡¾½·«oï‘Àº›ýE÷»™ByÝm²Ìã›uyŒsˆõ¿byÔ5¥=/À}zÅ|ØþëîU±F{¿ª8T!ó¥icqeüvã‹ÚV…±¶³ÊºÝÐè÷²ˆ qh(HåÜu*;ô- …5XCA€¨ 8š¤èǺ!ÿGÅ1yCGÊÓî)±ãª5ä„Ýwv4tƒ¨‹‚}V›€ê´ý´]‚#ÌSîÎ,°Ãºe›¼Q°†j`Pº­Zž[øÖÀA=âpø­n‹ºÛÕ—q¡“m±P·ªP¤âèÁ¬Ð{lW¥­ Nfõ÷þ^©6Çü¹†ÿÙƒã/ -endstream -endobj -2782 0 obj << -/Type /Page -/Contents 2783 0 R -/Resources 2781 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2826 0 R ->> endobj -2784 0 obj << -/D [2782 0 R /XYZ -11.232 900.716 null] ->> endobj -2785 0 obj << -/D [2782 0 R /XYZ 65.161 760.065 null] ->> endobj -2786 0 obj << -/D [2782 0 R /XYZ 65.161 749.106 null] ->> endobj -2787 0 obj << -/D [2782 0 R /XYZ 65.161 738.147 null] ->> endobj -2788 0 obj << -/D [2782 0 R /XYZ 65.161 727.188 null] ->> endobj -2789 0 obj << -/D [2782 0 R /XYZ 65.161 716.229 null] ->> endobj -2790 0 obj << -/D [2782 0 R /XYZ 65.161 705.27 null] ->> endobj -2791 0 obj << -/D [2782 0 R /XYZ 65.161 694.311 null] ->> endobj -2792 0 obj << -/D [2782 0 R /XYZ 65.161 683.352 null] ->> endobj -2793 0 obj << -/D [2782 0 R /XYZ 65.161 672.393 null] ->> endobj -2794 0 obj << -/D [2782 0 R /XYZ 65.161 661.435 null] ->> endobj -2795 0 obj << -/D [2782 0 R /XYZ 65.161 650.476 null] ->> endobj -2796 0 obj << -/D [2782 0 R /XYZ 65.161 639.517 null] ->> endobj -2797 0 obj << -/D [2782 0 R /XYZ 65.161 628.558 null] ->> endobj -2798 0 obj << -/D [2782 0 R /XYZ 65.161 617.599 null] ->> endobj -2799 0 obj << -/D [2782 0 R /XYZ 65.161 606.64 null] ->> endobj -2800 0 obj << -/D [2782 0 R /XYZ 65.161 595.681 null] ->> endobj -2801 0 obj << -/D [2782 0 R /XYZ 65.161 584.722 null] ->> endobj -2802 0 obj << -/D [2782 0 R /XYZ 65.161 573.763 null] ->> endobj -2803 0 obj << -/D [2782 0 R /XYZ 65.161 562.804 null] ->> endobj -2804 0 obj << -/D [2782 0 R /XYZ 65.161 540.887 null] ->> endobj -2805 0 obj << -/D [2782 0 R /XYZ 65.161 518.969 null] ->> endobj -2806 0 obj << -/D [2782 0 R /XYZ 65.161 508.01 null] ->> endobj -2807 0 obj << -/D [2782 0 R /XYZ 65.161 497.051 null] ->> endobj -2808 0 obj << -/D [2782 0 R /XYZ 65.161 486.092 null] ->> endobj -2809 0 obj << -/D [2782 0 R /XYZ 65.161 475.133 null] ->> endobj -2810 0 obj << -/D [2782 0 R /XYZ 65.161 464.174 null] ->> endobj -2811 0 obj << -/D [2782 0 R /XYZ 65.161 453.215 null] ->> endobj -270 0 obj << -/D [2782 0 R /XYZ 56.693 416.608 null] ->> endobj -2812 0 obj << -/D [2782 0 R /XYZ 56.693 389.434 null] ->> endobj -2813 0 obj << -/D [2782 0 R /XYZ 56.693 344.322 null] ->> endobj -2814 0 obj << -/D [2782 0 R /XYZ 65.161 345.005 null] ->> endobj -2815 0 obj << -/D [2782 0 R /XYZ 65.161 334.046 null] ->> endobj -2816 0 obj << -/D [2782 0 R /XYZ 65.161 323.087 null] ->> endobj -2817 0 obj << -/D [2782 0 R /XYZ 65.161 312.128 null] ->> endobj -274 0 obj << -/D [2782 0 R /XYZ 56.693 275.521 null] ->> endobj -2818 0 obj << -/D [2782 0 R /XYZ 56.693 248.347 null] ->> endobj -2819 0 obj << -/D [2782 0 R /XYZ 56.693 203.234 null] ->> endobj -2820 0 obj << -/D [2782 0 R /XYZ 65.161 203.918 null] ->> endobj -2821 0 obj << -/D [2782 0 R /XYZ 56.693 157.548 null] ->> endobj -2822 0 obj << -/D [2782 0 R /XYZ 65.161 158.232 null] ->> endobj -2823 0 obj << -/D [2782 0 R /XYZ 56.693 111.862 null] ->> endobj -2824 0 obj << -/D [2782 0 R /XYZ 65.161 112.546 null] ->> endobj -2825 0 obj << -/D [2782 0 R /XYZ 65.161 101.587 null] ->> endobj -2781 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2829 0 obj << -/Length 2150 -/Filter /FlateDecode ->> -stream -xÚí\moãÆþî_A¤ý`ÑzßÉM“¢½\î‚ iÚ³¸ËŠ\K¬)®BR>»¿¾C‘t$êÅK-©¨?‰^gg_fžy†Kcoæaïýśۋëw{ -)I¥w{çIŠ¤ï„!æ{·±÷ñòƒNuXè« øòo¦ÔE}ygòú¢œ77ßšè1÷õÿºùñê—Û › !H Qk»)ŸR]̵.‹ê6ôN¼z—¬êKù4ð&)¿é_Pè—×õ¡²zðâ»Û‹_/¨Çñ„DR1ÏWIL½hqññìÅp @\ÞçµäÂ#Ê$\§ÞÍÅ?.p3øàŒ´º¹BËÚ¦O”Šµíc×ï@d=^= .¸±~>$ñÕDb|ùm.tþÕÕ„PøKGi²,4z,ÒZLS¥¯úy¿=@XâSÏg -1Á«VíÃtqéQ¤ååÚ»ÛÑ–¶ý­»Ð1¸ÕtP+&•´«~ˆ$]ýäÃLÙô°¹Ú)ª0v­0ŸyõŇfù·–²5œÁÖ -X½¢ïu¦ó°Ô[[`W™÷q½èIëÇ-QPš†Ýg.©â»$µ4!ÌbKÁØR0×)L€¥ðÌ;ÁÒRn™®fIv–9=ªwýÈ[£ ;å™)ퟴ¥`±Z.Mn+¬u7h‰ÎŽxP¶>aŽë áó7)qˆÌÄ6nx e´°²­ß1¬8kVp !„a<^Ϧµ—ÂB†iaìS‹ÕàˆóÀEüDO©ªàôü)\åIùŸ?ÐaV˜ìt•E‹ñTúQÐ8ÖNïèwÛéîÆÚ¨ô9¬пÆq;šýõ‘^¤Ý ÿÕaéÏI9ïŠO‹/CÈÌ,ƒ8¤p]Íß|qXõ¯«¤Í¡ñ‹ãR@Ε}zùc4_e÷=qmVú´cØõŸ›f ÑQ˜¦Åi¨ÿ²KHâƒñणßÑÉœíád’!á7T«âeVóÿl¤çrïVûòø¶¤ÔÏ߈Ç&*Ÿ–ºç ¬ºïhKýX:MÎaßÒ‹e•©§& x/£Áx¾¶­ßÑלíák‚"Iš”ævžX»ExoK -éßÀ8D®‹“:Ê¥vÐòðÄ€ áÌvnvòßÃV˜ÜNp®Óe_ bbRçÛúÃÙØÎÁ ’¢©àõ"©Õ¦)ö¥†Ÿ°ÀGâÿ<‰æÖìiQ [˜Ú"í<´œ“Ùª4«Ô•ôãrOV óJ^¨pÜhKc¦«Ù¾¥û‘<`ÙbˆÇOiµë}¡6 ªP -aNë [9EwWü3¼"âòáŠBú¾ ‹½ åˆÞƒnËåij®¨€L%›ÕMÑ<Ìfm9}VZ*ýÍS­³újÆMlÈçš{]›a}“€#ß—-uþwøÎ÷[)0b„´‚‘iõIéNYbC´¾Îë—h{v&”Uå .¢b†¥ùí8zð|Á -¤?Ï‚ÇK‹:úÝ"¿»±ö‘_0˜ %_yþ+Ïwæù‚øHññÒ«Ž~G's6¶‡“Q‚hû‚ö•ç¿ò|wž/0lcEÆóµmýŽ¾æll_«N øÁ+Ïÿ?æù\I„Í9:úÝœÃÝX{çà@›Q¯<ÿ•çŸÀó¹b@ºÙY‰>‡_‹g¢Oð^¦ÿÁ¬²¸Ì“ÿqŠŸ1J;ÎáÎñ9AXŠšãû'Pü›R?èšà¿Òвûij¢û‚ÆÓûŠßÿéªÙíy¼HifòE˜&½^ñ3å#ÁÆcþ,Høã%JýnXàn¬=°@¡@4Xp—Vm©w U®¦öˆTœ!)J÷í¢-½â/‘9±ÚÕ´ -Û܈1±M¾|¿ ©‘}£1.㦱-^ôñ Kév†ñ¸çPUŸ†Ëu:úÝ|ÇÝX{硪:Ü$€áNÿð™íÕ4KÝ9m;Xè2„BË*@˜ÅiÒ…«Ãgø-sŽdš&FgeþÔ©"ˆâ³ú;•P¡=þ¤úc:2÷‘R#:ò¶~GGv6¶‡#CòAƒƒoê†ùæÀ:¯ÖqR&&;µ|M¹@göJ‘ ÁpÞ›hjÌýdYUGw¸ð¤FÎöF~Gr£a­jòÌ¢›zÂöG - ¸|þè0‡àç+R_Y®¡°ùG|í#¾vïèwtfgc{83äC¸}íþA/̃µ;o‘9 K›4î‰ö±^æ:²ÿ°,2ÙPünÜ8–"ÌM|jŒ!*@Qç 2Ä—ë­ÃAôRGÉ]s “VT8ÝF“é=5ÆìOÕ7‚ˆuÔvN?z!²ªiÉñ‚ I2ÞçýnAÆÝXû Cª\­­ÿîÃÏKméö?ßÁŽ?¡Rf;¾}¹ËaáT/€ ô´&Y,sû˜`_üeðnv˜åî0«ó}“J8GRŒ—Jtô;z¹³±öߤ’Šƒð&•ø'¤”錄ï¾ý·X,‚¤> endobj -2830 0 obj << -/D [2828 0 R /XYZ -16.307 900.716 null] ->> endobj -2831 0 obj << -/D [2828 0 R /XYZ 56.693 741.959 null] ->> endobj -2832 0 obj << -/D [2828 0 R /XYZ 65.161 742.642 null] ->> endobj -2833 0 obj << -/D [2828 0 R /XYZ 56.693 684.809 null] ->> endobj -2834 0 obj << -/D [2828 0 R /XYZ 65.161 685.492 null] ->> endobj -2835 0 obj << -/D [2828 0 R /XYZ 65.161 674.533 null] ->> endobj -2836 0 obj << -/D [2828 0 R /XYZ 65.161 663.575 null] ->> endobj -2837 0 obj << -/D [2828 0 R /XYZ 65.161 652.616 null] ->> endobj -278 0 obj << -/D [2828 0 R /XYZ 56.693 615.767 null] ->> endobj -2838 0 obj << -/D [2828 0 R /XYZ 56.693 588.425 null] ->> endobj -2839 0 obj << -/D [2828 0 R /XYZ 56.693 542.472 null] ->> endobj -2840 0 obj << -/D [2828 0 R /XYZ 65.161 543.155 null] ->> endobj -2841 0 obj << -/D [2828 0 R /XYZ 65.161 532.196 null] ->> endobj -2842 0 obj << -/D [2828 0 R /XYZ 65.161 521.237 null] ->> endobj -2843 0 obj << -/D [2828 0 R /XYZ 65.161 510.278 null] ->> endobj -282 0 obj << -/D [2828 0 R /XYZ 56.693 473.43 null] ->> endobj -2844 0 obj << -/D [2828 0 R /XYZ 56.693 446.088 null] ->> endobj -2845 0 obj << -/D [2828 0 R /XYZ 56.693 400.529 null] ->> endobj -2846 0 obj << -/D [2828 0 R /XYZ 65.161 400.818 null] ->> endobj -2847 0 obj << -/D [2828 0 R /XYZ 56.693 353.943 null] ->> endobj -2848 0 obj << -/D [2828 0 R /XYZ 65.161 354.627 null] ->> endobj -2849 0 obj << -/D [2828 0 R /XYZ 56.693 307.753 null] ->> endobj -2850 0 obj << -/D [2828 0 R /XYZ 65.161 308.436 null] ->> endobj -2851 0 obj << -/D [2828 0 R /XYZ 56.693 261.562 null] ->> endobj -2852 0 obj << -/D [2828 0 R /XYZ 65.161 262.245 null] ->> endobj -2853 0 obj << -/D [2828 0 R /XYZ 56.693 215.371 null] ->> endobj -2854 0 obj << -/D [2828 0 R /XYZ 65.161 216.055 null] ->> endobj -2855 0 obj << -/D [2828 0 R /XYZ 56.693 169.18 null] ->> endobj -2856 0 obj << -/D [2828 0 R /XYZ 65.161 169.864 null] ->> endobj -2857 0 obj << -/D [2828 0 R /XYZ 56.693 112.031 null] ->> endobj -2858 0 obj << -/D [2828 0 R /XYZ 65.161 112.714 null] ->> endobj -2827 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2861 0 obj << -/Length 1710 -/Filter /FlateDecode ->> -stream -xÚÍZKoã6¾ûWèè5Í·¤öÔÝvØ>€n´Àîh‰¶ÙèáŠrìüûŽ,9±•¸¡,+é%f¨ápHÍ÷qf(ì-<ì}½»M?ì…(”Tz7sOR$}/ 1ß»‰½/ãÏ:ÑÊê« xü{^j[7çyQ7Êeóð§.㦳Ôéªæ/Xö£a<‘€fcÚWŒ ˜CðC‹Ô-7”Ê"FÂáP*‚€ ‡é±ú~ímª;DeÀ‘äÍéóÁlÛð9·2w”S³D»‰ª,vŸ-Ý$— 31Ù¢#%H?€ˆ€¼&%H!þå(áù® ä`EÈ!ãH01 -õ÷„aoc;àù( ¬~¥*Žµ#ìzµÊ G8TQ¬“ Þ®Gµp<,•5ŽÌ-U¡¢R;šbw1tWCà!€Õ^À8@’±Ëø¹SÚÆ" ªÄf0‹42Š[úû¡¸¿±î(!Œ Ãÿ Š£µ-óÔXõ$œ>9ĸʥj¡=ƒ&>¥¯ a! -pðÆg°`¢—cþpè=Öß½½í€^ÎaƒxýJtG¯ÉÀ¿uªc£òÙß:*ßô©.U¬JÕNŸ‘«ûUH¼*îíüíªMU‚›¨R$λ*ÓîîSzX LÉpX†`aIÃrK?,÷7ÖË<ô¡Ü “¦•Ú>ÂìÔ.¦T¯cB >Ý>a_¶å}žÝéÂ:dzõÂu_Úe„üÃC‚°ÏãZyœ/ÂCâ‚#J›:%<&¤eý„`X×ubb½¯äòö&”#&»ÙßÌó$ɯ¨oª·³ë‚ì'[ìo–êŠâñÝãfÄLë¬n¥*núÊüñꡮ±ƒ¹I'ùrψö”,<<ˆEù^»5Y¤[wr†hÝ.êt¼#J"ŒBC Ÿ“öüf`/tò \¦ð—Ô{šr¹'òy>ýMÝê -h /Ë4yèst)2ˆÊda0„Ùp,ÜÒß…ûëÎÂ,ˆÑÎ,-5Ò®.•³N×âæ*L¾vTš6N{atæ^a­MwOŘO)ùòî}¬¿§{÷6¶ƒ{ûX¿¹ÇYg±kMëýýbc²ŽÇõÍÒµÂfËõ|8ª\/’û ã1U÷3G¿ÍrLj "ör鈯¥vM¨ì¹Tô2²$`c¸›ã–þžÈêmldIŽ8nNŽ²È׳§¡ö ³µ£ÓĹ+'[­Ó˲78ì­£sYçÒ½ŽJדÖ­ÎœZ¹.)»/—gG"t1ÜRKOÐô6¶hCœ7±¸N¬>7cÜ…¯z} ¢âœ<â“)nUü’[}»Ïv™Â*Q&ëP°aÌð#†bl¸›“–þž¾ÛÛؾ‹ÁH8pÁƵˆj—ùæ 1ÖjG]§³vŒø²KbŒ§¯Z¡˜$$úlAäÏ+&ÆzfM©ÿ£*"ß¾*²9i$ »`Y¤úp2lÊ"t ²ˆÞ–:« -wvjÕ6Ï$Ÿ¢(QÖj;E SšE–ûŠÉðV%*£²QžNÿ°‹‹P9¥’êÃ1<¥¶ô÷£ÔþƺS* AC©…ÎT꺖²È1ÛJÁÛRõŸÎyÇÑ­ýؽ^iåeS õܸ -©§‡º&s™Ä”ªt\îÚ: -掕€Eëk°}rzYöîIùbÇUn”@€`âH{ò•<ÇËðœäÿ„‘y¯ -endstream -endobj -2860 0 obj << -/Type /Page -/Contents 2861 0 R -/Resources 2859 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2826 0 R ->> endobj -2862 0 obj << -/D [2860 0 R /XYZ -11.232 900.716 null] ->> endobj -2863 0 obj << -/D [2860 0 R /XYZ 56.693 741.747 null] ->> endobj -2864 0 obj << -/D [2860 0 R /XYZ 65.161 742.431 null] ->> endobj -2865 0 obj << -/D [2860 0 R /XYZ 56.693 694.923 null] ->> endobj -2866 0 obj << -/D [2860 0 R /XYZ 65.161 695.606 null] ->> endobj -2867 0 obj << -/D [2860 0 R /XYZ 56.693 649.34 null] ->> endobj -2868 0 obj << -/D [2860 0 R /XYZ 65.161 648.782 null] ->> endobj -2869 0 obj << -/D [2860 0 R /XYZ 56.693 602.516 null] ->> endobj -2870 0 obj << -/D [2860 0 R /XYZ 65.161 601.958 null] ->> endobj -2871 0 obj << -/D [2860 0 R /XYZ 56.693 555.692 null] ->> endobj -2872 0 obj << -/D [2860 0 R /XYZ 65.161 555.133 null] ->> endobj -2873 0 obj << -/D [2860 0 R /XYZ 56.693 507.625 null] ->> endobj -2874 0 obj << -/D [2860 0 R /XYZ 65.161 508.309 null] ->> endobj -286 0 obj << -/D [2860 0 R /XYZ 56.693 471.158 null] ->> endobj -2875 0 obj << -/D [2860 0 R /XYZ 56.693 443.605 null] ->> endobj -2876 0 obj << -/D [2860 0 R /XYZ 56.693 396.99 null] ->> endobj -2877 0 obj << -/D [2860 0 R /XYZ 65.161 397.279 null] ->> endobj -2878 0 obj << -/D [2860 0 R /XYZ 65.161 386.32 null] ->> endobj -2879 0 obj << -/D [2860 0 R /XYZ 65.161 375.361 null] ->> endobj -2880 0 obj << -/D [2860 0 R /XYZ 65.161 364.402 null] ->> endobj -2881 0 obj << -/D [2860 0 R /XYZ 56.693 316.894 null] ->> endobj -2882 0 obj << -/D [2860 0 R /XYZ 65.161 317.578 null] ->> endobj -290 0 obj << -/D [2860 0 R /XYZ 56.693 280.427 null] ->> endobj -2883 0 obj << -/D [2860 0 R /XYZ 56.693 252.874 null] ->> endobj -2884 0 obj << -/D [2860 0 R /XYZ 56.693 205.864 null] ->> endobj -2885 0 obj << -/D [2860 0 R /XYZ 65.161 206.548 null] ->> endobj -2859 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2888 0 obj << -/Length 2827 -/Filter /FlateDecode ->> -stream -xÚí][sã¶~÷¯àìKå™@‚ Ó¤“¤ÙM“n6éÚétf7YS$C‚–__P$½&)J€ ¨é¾X”œïÜp1tîè|ñííÅõ„>öÛ¥ãcàS'@.p©s»p>ÌÞó„³’_^agï2ÁËæq™̓Xµ_~—EßfÙ}óæß7o/»ýQs… i¨Ýˆ§„—+ÎEY-GGN G÷Ýztϧ€âÀ¹" ¤íø„J‚4˜]7/ûuNj׷¿_ I:È!>ðCס!>ÄN´¾øðtò;ÉðÂÀÙl[®‚ À®/Ÿçæ⟰•ìI;²%áV$q/ú Sòkänùè::®„pöË¥ g¬`ëî÷½”®ö€ë·Tn;É-³$É.1™mâô®ù(Z±ô®“õŠ]b8{¸DdÖö˜sž6Ok¶h?Ù§ ÙŽ-¹þ46 -<@iýË·cçS<ºpÉs³(먗qñÁŒ#@]€›ç¢ÑЗÊÆ®–rN¡ÛPýˆ1éµÛòºÕ¯æ!žt,üƒÇbuyåKá¾a«ä®àé—WË÷<¯æ€U"KØœ'àq4T¥¾Õ„ë—ïûš"õQìøAJjM©?'Pêç;„AèÜY¾TµÝŸŽ „Èïh£ºµ)}†ô ”S!E¦2ÂKØø Äá ˜Ý,îœæá}‹£ÞœvŒ`è5SûŽozj0¦#aUOüV[¹à…ZóÚ6)5¬hãÙŸÛ4º€É.³gíì3tXC©'熚hèÄëØè·Î'@t DbU‹?þÈYZfÏlžp°¬ç̳bÁ eIVÔhýKÓ£iñ$9[,¤ ÜýeÛ]´Ö¼`Ç B@äcËÐG‘Áç'Ô<)šOJ¦up€!¶gúô ­ƒ1³ÖÁ•î‘†Í$~³Xð…Ž×qYÖ®S©qÁ—yUäYÉKµ,UdcÁ˨ˆsgi9a#ëdœážøPJ?Oë›eXø£àiYKCÃ7“Œ}{è#2Â>µ†¾}3ô™3«Ž>P@ºHýõóܩ龌>•Ú•Užg…PküÍ"›sµ¦ßÅw±`‰Zã׋X¨ÿ4®)Š8¦õ§{‚„QL1I:«D^‰cm ©ƒ/œÓ¶"ó ß;qP±Ìòqi£ù:Òìxrtˆ-š—Ïsí™>}C³c̬†Ùñd²Ý†KX/cU¿/VL¨¦9ÒÛµ!_ž83yóó/»Œˆ”2ÜŸŸ(+ æS{E²íó/^ÔBÙÅÚßSU@i¦8¡+^(z†'>6˜@ÙdʈÔ#ÞYM&B€e1ãhÅxò(Öò/jlâÍZiå\³$qz_VpP¥2¡’oùâ… ­›ðt‘Öµ>Ù¶ò]„ Û,³T€Äz2V2B©=Ãì…ø(°f˜ôÍ ³9³ê†Ù ]inÚbeÁ×Ùƒr>ÆR c»ÕGšÊùû[Òñg{L#?Õ’G ,{âkë¤Ì& -_éÑøRݬá¥Oß/ÆÌjà%ä½vÝ¢)à+Ç1\µÂ°dU¢ó¤Ê-‹5B¹„¢ÆŒuÓ8œgÉâØÈ£ÒÅRtNoîPB-ºóy½ìR‰tÈ(¸ŒëâÞ:yõüGFû€†žE7ëb¸ÄžÙèÓ74ÆÌj˜ ×»ÚEÏTkõĆ£ª5Olj–ÔÈNfÞúͦRsÀy–9ê$Uµ|¬¹ôãajoíp@ß(ÆÌjׯmf4Ò½Iùÿúþ퉽ÚNeÓðíµeW×ÿIúU=€æ*æ×»:}1ÍͪàKÍ1â5“ìè@³Ö#d¯P? ocf5€€<€a[¨gÕ"ÎöˆyjzâßÙojì7€«l“U 7€ïxÊ &T仟o_ß(®LðH ‹[Ó…ø¥¦UwC{U†}3e6gVC™¡ °×VvÄWÓF)—æë&SnUuò%?No>bt’Äaù0ì©p¡½bÅ€¾!쌙U‡b€ƒ6/Í žóT9óPMÕYúd# úõý§^Š‹åÏhÆQÞtÓ1¼UC.—zöÐÒ#oSV5° àâ ÁÊ"gÕÈ'|H}Zu…(ây%ø±Å3קöv­ èj‡5f[a¦hcM}ú†Â0fV+$j òƒ¢j>e•¢eSÍùµJyÚtFÝX—YUDüÄÃK*šîІêÎIžŠâI7óšº5¬ôébŘY ¬Ô{ŽH –F4=…òb¥2ÄÎTaó9GÙm¤Òr¼ãäÀ<ŽÊ‡Aå65 k êÓ7•1³ ª·®…n·kÁ¬R;Ùt'Š{MYžsVìªÿ¾Ú³Åá¸|Xö|u ({êzܹ -lÊ9æaäà¦àd 9}ú†È1fV9ØÄõÎ^‰;U­wYdëSÇG»½òÁÂ!9€?M Oëy‘ÍÙò»cä©àâ´žÿï·?½µ¸ús“éÆð™jÚtÏO„i qÍY§wË*9r;ìAHà×··ä2 o sfÕ!CøÝVÀ³˜¯©†VðxÞµÛ`¦àg\ÑmÜ9Œº­™ZL¼!^LYÕ€K€“éÈçZ“Î -gžÅ©Ð]=Ç~S ´¦™}ú†ªi̬†nÒúî›öȼªãW6Ï2ŽSÕ½';ŽäýwC«ÿåt~çrÇa¦¤h }ú†00fV>4èJ­»‡NZWy£|¯Ï#[ç ŸX¥?<ß^S³6ß}ú†ómÙVnSý°&Œ>}Ca˜2;VuJ$åšÍ>ntýËiçýX&›C4Žf¤l=Rè¯ö,!ü¿åèVB£7• -k -Þ§o¨à¦ÌN+8¦ ìnfûëžýLBä# ¿¾žî°Ùl4¦òž)×Q®¬¸¶ÞÃÌŽÛÛö´.³¥Øì8n¼¯K´Öh} Ö‹,iùõ—×öŒÑ'MP@þy/¬CaèqÖ)­,EQßFWVóR€5Ë5ÎS¢@2gñ9D%ÅÐ^j6 ofµÌ™UIQ€ìî+¯8ÿƒkÞÇTŽ ÜGäzÓíuí€öžšŸò.kň[jrb, …ƒkª|çàéiËtüQº¡Ê¼*â¬Ò­ ©Ûk/)Ð7 1³¤ 6PV¯c¨–&6«Xð2g?uaΕï?ˆÓ’Ê… ¶T¾¹6/²;é„ë[w”™á":vK7"Ô^¢; o¨ÃÆÌjè0 ·¯[%V]~‰¤N0åÆlxÿhïè¥ÂÔaä¬ñ–Qd)ÞêêG2ÎJ+–€%K’9‹îÄD}ÐáÅíSÏM›*Ò¸©õK©$ÇÂÀbxC={‹¨ú†È4fV™·ûç‹Ñ]tûöY‰“2X®ã2ŠÓeöu”°rç¯ö¤rLœþp©ê®Ñ/'¿á¨ã2‹ƒö½GÝLÍ Véz[NWFµ¯±«fþJë,Ùá­ÇùÕeÍÝ%°çÜOºñv(…m\Ý4ú?"ž´íÍ–Ý#ò©­´“ -endstream -endobj -2887 0 obj << -/Type /Page -/Contents 2888 0 R -/Resources 2886 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2826 0 R ->> endobj -2889 0 obj << -/D [2887 0 R /XYZ -16.307 900.716 null] ->> endobj -294 0 obj << -/D [2887 0 R /XYZ 56.693 759.068 null] ->> endobj -2890 0 obj << -/D [2887 0 R /XYZ 56.693 738.489 null] ->> endobj -2891 0 obj << -/D [2887 0 R /XYZ 56.693 691.479 null] ->> endobj -2892 0 obj << -/D [2887 0 R /XYZ 65.161 692.163 null] ->> endobj -2893 0 obj << -/D [2887 0 R /XYZ 56.693 644.655 null] ->> endobj -2894 0 obj << -/D [2887 0 R /XYZ 65.161 645.338 null] ->> endobj -2895 0 obj << -/D [2887 0 R /XYZ 56.693 597.83 null] ->> endobj -2896 0 obj << -/D [2887 0 R /XYZ 65.161 598.514 null] ->> endobj -2897 0 obj << -/D [2887 0 R /XYZ 56.693 551.006 null] ->> endobj -2898 0 obj << -/D [2887 0 R /XYZ 65.161 551.689 null] ->> endobj -2899 0 obj << -/D [2887 0 R /XYZ 56.693 504.576 null] ->> endobj -2900 0 obj << -/D [2887 0 R /XYZ 65.161 504.865 null] ->> endobj -2901 0 obj << -/D [2887 0 R /XYZ 65.161 493.906 null] ->> endobj -2902 0 obj << -/D [2887 0 R /XYZ 56.693 446.793 null] ->> endobj -2903 0 obj << -/D [2887 0 R /XYZ 65.161 447.082 null] ->> endobj -2904 0 obj << -/D [2887 0 R /XYZ 65.161 436.123 null] ->> endobj -2905 0 obj << -/D [2887 0 R /XYZ 65.161 425.164 null] ->> endobj -2906 0 obj << -/D [2887 0 R /XYZ 65.161 414.205 null] ->> endobj -2907 0 obj << -/D [2887 0 R /XYZ 65.161 403.246 null] ->> endobj -2908 0 obj << -/D [2887 0 R /XYZ 65.161 392.287 null] ->> endobj -2909 0 obj << -/D [2887 0 R /XYZ 65.161 381.328 null] ->> endobj -2910 0 obj << -/D [2887 0 R /XYZ 65.161 370.369 null] ->> endobj -2911 0 obj << -/D [2887 0 R /XYZ 65.161 359.41 null] ->> endobj -2912 0 obj << -/D [2887 0 R /XYZ 65.161 348.451 null] ->> endobj -2913 0 obj << -/D [2887 0 R /XYZ 65.161 337.493 null] ->> endobj -2914 0 obj << -/D [2887 0 R /XYZ 65.161 326.534 null] ->> endobj -2915 0 obj << -/D [2887 0 R /XYZ 65.161 315.575 null] ->> endobj -2916 0 obj << -/D [2887 0 R /XYZ 65.161 304.616 null] ->> endobj -2917 0 obj << -/D [2887 0 R /XYZ 65.161 293.657 null] ->> endobj -2918 0 obj << -/D [2887 0 R /XYZ 65.161 282.698 null] ->> endobj -2919 0 obj << -/D [2887 0 R /XYZ 65.161 271.739 null] ->> endobj -2920 0 obj << -/D [2887 0 R /XYZ 65.161 260.78 null] ->> endobj -2921 0 obj << -/D [2887 0 R /XYZ 65.161 249.821 null] ->> endobj -2922 0 obj << -/D [2887 0 R /XYZ 65.161 238.862 null] ->> endobj -2923 0 obj << -/D [2887 0 R /XYZ 56.693 191.355 null] ->> endobj -2924 0 obj << -/D [2887 0 R /XYZ 65.161 192.038 null] ->> endobj -2925 0 obj << -/D [2887 0 R /XYZ 65.161 181.079 null] ->> endobj -2926 0 obj << -/D [2887 0 R /XYZ 65.161 170.12 null] ->> endobj -2927 0 obj << -/D [2887 0 R /XYZ 56.693 122.612 null] ->> endobj -2928 0 obj << -/D [2887 0 R /XYZ 65.161 123.296 null] ->> endobj -2929 0 obj << -/D [2887 0 R /XYZ 65.161 112.337 null] ->> endobj -2886 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2932 0 obj << -/Length 2902 -/Filter /FlateDecode ->> -stream -xÚí]ÝsÛÆ×_ÉKìë|_8é“ãÚgÒ6µÔigì<@ä‘ÄX­üõ= #¤°ÇÅYvÜ‘"‹åÞï··»÷ê-=êýtñãõÅó×>õ")®¼ë…§8Q2ADà]ϽwOÞêTÇ¥~zÉ}úäïy¥Ëæí"/š7Õªýò¯ùìÇ<ÿÐüóŸ«_žþvý³¹Í%c$òýFÚUu—êr¥uUÖ_›»3/4wW¢¾»T xè]ú$ -Úûû¡„Ož7/Œ«ú‹W×ÿ½`F<õ˜ç+¢"á#Šro¶¾x÷õææ;£‘Qèíö-מÏ(áB™÷©wuñÏ ÚZ‚ž´ÈA¶Œ£ªÑé=çþ^‹ÃeÏ_›&ûß!ëkB"Uh¾Ø7þ[2[Å:}O}Z­Í_öôRQúäjT«ž^2nþYÇ1­Šu¼!åö¦ÔÙù"I5ù¸NÿÒ\q¿‘Îâ›TÏO|[nãFþ=¥dß¼mÕzO©Ñ„1úékÞí—é±ú§Õ/?ummÂîÂØCŠÚÖõç>5='•ÇIF^¡½Å}ãv¤ÿtxÊà Á¬n•ï¦X_¾O L§AîpxŠD<š@Ù½Àbé5oÞ¶Hì ê ¸`Dí{qÏu‰CAÞ»=>Ê| l¹Ø†Ó¬ñ<ŸÁV;(am Æ•žçÀv«ÞïÇ8 ˆaº;vå#!ˆVÖ‚œŸ‰³Ž]ÍG¤ý`ØOZeqEã-.h=§Å:[¦I¹‚áhñÚIr?ì ¼å‰×“–2ƒ¡àüÿVÛ*4öPîÆ+˜Hƒ2g΢'ç,ðÊÂ… -QFü¾_Ìç`¿¾ŽWߤÒt„Ž³9tÔ]$Y¿wÆyåGDJî÷]ùHÜ£•µÀ½1PÐŽ‘`,¯Lo¥I¶„µÎ°vÇ0:PÜýœ6øš'‹….tV%&°ƒ]r£MȨ3XãWÇ4Ž]i¾P¸ÃnW>»he-°ëMÖ€ì@²|àˆ/Oû¼W6>¯Ì·Åì”GïgŸ»Ë%{ò‘ýìLÙÖ\™°Ê]VÓ“4ZY Ðóˆ„~뱯W Ðîâ»ÇöÂq¡¡ ÝYŒCÐH j©ªoScç f>QT¹CmW>µÎ”mA%Q2pgŒ®|¤1ÐÊZPؤu‘hkÍo'·qºÕÓFf_L’³-5.%š*]:»`ãw]äýæÏ€®ÇšÖÛzòqlÃ+ g›™{Ê2J¼3¡¬åaBéÜqŒ1¾+’ª‚æ* "§i¿ªks§Á^­âê,CüAŠ“ýZÒ]ÆYîÓeg$ëˆGr «ªÅBE(k§BÓ\2ìã:=ÃüþqUÉͶW= îô5|ªËÐ -È\=šê2úµŒ"™«™,?hòygìêÊGÒ ­¬¿ŸP?løUGMñ¬©<XX&tÀ¶=K 4ÿº¹û+êÔ+JBæ®4Ý“D=ZY Ô+IÚ➣èܤÐâAVV:ž?RZµØ¦)pv$_XTÛ‡nä²mέkú²©X9xW>àΔm!BF=ùHc •µ`»4 -Û•ÿ¨ã]2Ìö' -üÁÌûÓ³y6±¥Šš†êT¯uVÙ“¼)š9#NW>’8he-ˆ#á¼€fí_@yJ˜É‘ºHŠ²/60H-îÀÆÖW†=5NÖT¼œQ¥+I´²Tá”ðú“š*6X§þ.ªôЄJ(xulbãdù×:èŽSŽ60g”ëÊGR­¬åhDm纎Ç(ãa¢èd—þü‰«(£–QSdráž|„ñÊÂ!,£©¾áuä_måeôa]crùûÒ‘€G*j÷0 " ¾J¸÷w “{¼+ÙçΔm¡š’‹3ctå#VÖ‚æUªè°ÆNÛ­ž¹X: lª]î`í|ñ\l[Ø‘~S¿p†Â®|$ -ÑÊZ Ð—Ägì+rħ£ˆ"¿MæºÏ5l’l l½€&ŸBþò¼ -Í8’eS^p†ä®|$’ÑÊZ Y -âûmmÿßÚttuѶÈ7º¢¡NÜ·ñRŸí¬&Xº _oX=ÒlâÛ¼ïLÐæMï Ú]ùHhc•= dÁ‰‰ÃVχ–·_·_bóp±#N7«øfà‹+ê^\½|óÆÉìï‘¡¡þ!ਛ+"ØgÝX,© ’>ÎÆb UDdT‘»Í¾"äD†î’ž|iñÊÂÇ#ú{M­7ûB÷êE¼M+nàuh¡Ð@y32-¶¼ˆ€Ÿ»K"{ò‘ s¦lk E‰¯Üå2=ùHc`•ò+ðäZMA¶æ9ZÚ?6Ð}÷À쌮1¼ùø»‡ïã>Þj?þþ´æ/LòË<«Š<F±/ [~‰«d¸e$¹Ún6g­×2"ŠºK†zò‘TÀ*;¤Bhâ3œ Ÿ“0âˆqÊþi´ï¾ø_Y2Ë¡G3ݤùìƒ-DH”t—6ôä#A€Uö´?”ŒDB€â§“ã•ÎúÁËÃS˜/ÎíkPr³­&N“cèÂ×ɳdÛjÑ¢ÈmÏ[<0>ÂÝ:ž|$;ÐÊâóƒÓæÚ@N%ViŽx¨ÓkVnµ‹b$”ºËÁBíñUe>õz¤YO\(+«¤Oíq¾0Eîn‘MO>’/he-øÂ)¡Ì?ì•(KøéUE¾]—Ä¥Å@3ܳùGåk¼£i“Ÿ;ëè®|dG;S¶1$ ©»Ý=ù8cà•…Wqx–³´z±Ð3è´'ÜAB'HMX‘-õÄÎÔb+uvÞÞºòjðtËRgº€Ÿ˜:˜×u<Ü—œ¥#ɬª4 ÂD[ì\çÐ¥ï_Î4øÌðLðë$ËŽÌÍ<›˜Iq©Ã8€ƒ¦Xà Á]ùH£•µÀp ŒÚ9_é«Õ|xLåå6«C—ƒ¶ÏžŽ•dãÙLgÕ°1R“=Á»X‘«¦¶âŒ3]ùHΠ•µàŒy=œ¬ Ž$fyv«‹ÉO5_Â÷%ëro†ÓQЩfî7¥gpèÊGÂÁ™²­1d“:3FW>Òhe-¸!´-ÈþZèÛ$ß–ée@bµšÞA—Ô¹Jó«U^:ª‘Æg®6g=õÝUR{ò‘@Ç*{Ö‚!%d² ToKp÷fZO¾”b[êG;LÃje†ÅÑwÐ#[³ÉâaÝ{œ[¬)³8ãVW>’[he-Έ8,spè5Çd–Kð8mªÎz±+ًΔmŒÁ¢&teŒž|œ1ðÊÂ!Í¢ˆHÕ–T_L{Ü]¡KpôYê®ãÞ—Xµª×ºî“DgDèˆGò«ª Âø´-™:­mîh0r=X"Ñ»ú!FÓÎÀç”uv›yV¯HšxÎ|·Jf¶ÏÎ`$\¹[Ý“D8ZY ˆñeôéÁ/wµÆ¯¸Å™Ô0‹xgY¾´;ÛÛ¢"lV³}°ÞâÇFx >ç^&C"ü蜽ñ¶Hªß›÷ÏÆÉ—yvØãq¨Iª—qjðœÌÌû$ûpïépŸÚúÖ„"U^Ü}jµ—0ÊGùÆx@¤p—¿õä#] ZY (( ¸o½ $ÉLP¶Ž«z2´Ý -úÜ‹£ÎRÅ뉜ŸåëÍöH> -v\)ÃÏê" *}!'vma—TõFvɼZY0?2*Ý?zj⇔(ænb¬+G{´ªpÖ‡‚´#ÅË4.,N^úõ ´b/Ï>ŸÄDeêþ#ºÐÌ<~¼žeQÑ9Oÿ'Ƙ< -endstream -endobj -2931 0 obj << -/Type /Page -/Contents 2932 0 R -/Resources 2930 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2826 0 R ->> endobj -2933 0 obj << -/D [2931 0 R /XYZ -11.232 900.716 null] ->> endobj -2934 0 obj << -/D [2931 0 R /XYZ 56.693 741.747 null] ->> endobj -2935 0 obj << -/D [2931 0 R /XYZ 65.161 742.431 null] ->> endobj -2936 0 obj << -/D [2931 0 R /XYZ 65.161 731.472 null] ->> endobj -2937 0 obj << -/D [2931 0 R /XYZ 56.693 683.964 null] ->> endobj -2938 0 obj << -/D [2931 0 R /XYZ 65.161 684.647 null] ->> endobj -2939 0 obj << -/D [2931 0 R /XYZ 65.161 673.689 null] ->> endobj -2940 0 obj << -/D [2931 0 R /XYZ 65.161 662.73 null] ->> endobj -2941 0 obj << -/D [2931 0 R /XYZ 65.161 651.771 null] ->> endobj -2942 0 obj << -/D [2931 0 R /XYZ 65.161 640.812 null] ->> endobj -2943 0 obj << -/D [2931 0 R /XYZ 65.161 629.853 null] ->> endobj -2944 0 obj << -/D [2931 0 R /XYZ 65.161 618.894 null] ->> endobj -2945 0 obj << -/D [2931 0 R /XYZ 65.161 607.935 null] ->> endobj -2946 0 obj << -/D [2931 0 R /XYZ 65.161 596.976 null] ->> endobj -2947 0 obj << -/D [2931 0 R /XYZ 65.161 586.017 null] ->> endobj -2948 0 obj << -/D [2931 0 R /XYZ 65.161 575.058 null] ->> endobj -2949 0 obj << -/D [2931 0 R /XYZ 65.161 564.1 null] ->> endobj -2950 0 obj << -/D [2931 0 R /XYZ 65.161 553.141 null] ->> endobj -2951 0 obj << -/D [2931 0 R /XYZ 65.161 542.182 null] ->> endobj -2952 0 obj << -/D [2931 0 R /XYZ 65.161 531.223 null] ->> endobj -2953 0 obj << -/D [2931 0 R /XYZ 65.161 520.264 null] ->> endobj -2954 0 obj << -/D [2931 0 R /XYZ 65.161 509.305 null] ->> endobj -2955 0 obj << -/D [2931 0 R /XYZ 65.161 498.346 null] ->> endobj -2956 0 obj << -/D [2931 0 R /XYZ 65.161 487.387 null] ->> endobj -2957 0 obj << -/D [2931 0 R /XYZ 65.161 476.428 null] ->> endobj -2958 0 obj << -/D [2931 0 R /XYZ 65.161 465.469 null] ->> endobj -2959 0 obj << -/D [2931 0 R /XYZ 65.161 454.511 null] ->> endobj -2960 0 obj << -/D [2931 0 R /XYZ 65.161 443.552 null] ->> endobj -2961 0 obj << -/D [2931 0 R /XYZ 56.693 396.044 null] ->> endobj -2962 0 obj << -/D [2931 0 R /XYZ 65.161 396.727 null] ->> endobj -2963 0 obj << -/D [2931 0 R /XYZ 65.161 385.768 null] ->> endobj -2964 0 obj << -/D [2931 0 R /XYZ 65.161 374.809 null] ->> endobj -2965 0 obj << -/D [2931 0 R /XYZ 65.161 363.85 null] ->> endobj -2966 0 obj << -/D [2931 0 R /XYZ 65.161 352.892 null] ->> endobj -2967 0 obj << -/D [2931 0 R /XYZ 65.161 341.933 null] ->> endobj -2968 0 obj << -/D [2931 0 R /XYZ 65.161 330.974 null] ->> endobj -2969 0 obj << -/D [2931 0 R /XYZ 65.161 320.015 null] ->> endobj -2970 0 obj << -/D [2931 0 R /XYZ 65.161 309.056 null] ->> endobj -2971 0 obj << -/D [2931 0 R /XYZ 65.161 298.097 null] ->> endobj -2972 0 obj << -/D [2931 0 R /XYZ 65.161 287.138 null] ->> endobj -2973 0 obj << -/D [2931 0 R /XYZ 65.161 276.179 null] ->> endobj -2974 0 obj << -/D [2931 0 R /XYZ 65.161 265.22 null] ->> endobj -2975 0 obj << -/D [2931 0 R /XYZ 65.161 254.261 null] ->> endobj -2976 0 obj << -/D [2931 0 R /XYZ 65.161 243.303 null] ->> endobj -2977 0 obj << -/D [2931 0 R /XYZ 65.161 232.344 null] ->> endobj -2978 0 obj << -/D [2931 0 R /XYZ 65.161 221.385 null] ->> endobj -2979 0 obj << -/D [2931 0 R /XYZ 65.161 210.426 null] ->> endobj -2980 0 obj << -/D [2931 0 R /XYZ 65.161 199.467 null] ->> endobj -2981 0 obj << -/D [2931 0 R /XYZ 65.161 188.508 null] ->> endobj -2982 0 obj << -/D [2931 0 R /XYZ 56.693 141 null] ->> endobj -2983 0 obj << -/D [2931 0 R /XYZ 65.161 141.684 null] ->> endobj -2984 0 obj << -/D [2931 0 R /XYZ 56.693 95.418 null] ->> endobj -2985 0 obj << -/D [2931 0 R /XYZ 65.161 94.859 null] ->> endobj -2930 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -2988 0 obj << -/Length 2142 -/Filter /FlateDecode ->> -stream -xÚÍ\Ksã6¾ûW°²‡ñ„@’S&»™ÝÉ£*±·v«fr€IH⊅¤lÏþúmŠ’cR~4QÙ‹IK`£ ö×ß×(,|¸x}ñî{ICŒâ*¸žŠš…$Œ‚ë$øtù«Ëœ­ÝÛ—ôòç²quw:/«î¤Yî¾ük¿/ËU÷Ï¿¯~|ûÛõGèfÆ1RvÖ®š/™«—Î5uû5ôÎ ½«°í]¨ˆD\3IL´ë_0éËwÝqÕ^xñ·ë‹ß/˜§ ¤"Ê„AdQ”q~ñé7$ð8@„ÑÁݶeHF œgÁÕÅ/t7ÃãáÈìû†0ª:ß>s.·Þì/{÷=4ÙÞh¯ÑD( _lÿ”ÆKë²ÏTÒ&‡¿ìíLQzy•§Íòë·3ÆáŸÜd¾)âúKQ®ë´&u;^ä>Ϻn` ÛžÚÇþÀƒc¢<ŽÂvÚÏ%…*àÄhT.˜?¾çžµ§?=ì€B™ØwÐfmk_û’0ņö%e$‚1Äôð81ÜœÀÙ­Ájt'¿î£÷÷Ž‡œ„”uÏúÛ$qI/2-Ÿ¶Ï¿…ª!ÄF¯!tCv^qù8ŠF\¶7œ?k[ÙÜ5®Â›ß^÷w[Ÿxdjð×ÒÍç.npmÓþp#°Ç4¡è&ƒFß¾'4¼ ÎH(x ãµ]8d ”›f½A>°“ÇÕŸ…¡g›/±·8ŒÝg±xýÓc£(…5]”÷í{F¹·³#¢ì†ZtQþDÜî†|6{9=ºûØ­l$[l2k‘“¸¹ÝdH«·6Û #ýAÛOß<"[Ôéto^º´¨g‘¼[ÎG:´: º7«Ê¨Ñù¨²±:UiN´äéÔžFmìÍ&³i–Hû2KFèU…$bf:½ªàM—­úæý’•·«ø\¥ K**¼¼¼=¹\=’]"mQâÚee±êƒ×a%ÑPŒLö}ûžqïíìˆÀ—’P­»À¿qi±À=…MVz¡— ²¥-´Ž,FD4R Ü8‡¼÷:-blÕ›&Oñ4²¯šhÆÏʾ<"RFÇ°¯ÝTióߎs?:PAe±g]È™#ëª\»ªI]=†g¡Ü\Lȳ`Q¨éŠß}ÏŒãí숌v£½»rH,­œ[:{¡åÂABC›w çÒbDq™mrlr+ŸíW/¨ýÍÁ%—_½ÂÊ×Ëɵµsy}”ç/$»SOï•uƒ½(n†S ¯¦i‘t:)<°ï‡Pgñ•Æ¾Ø"tªú·].ÁL›äŸS̈‡ÉÎZiʈ®ø‰¹.-`Är›‘òæ?.n¬÷MwMò² ‹Ê®—i\wߴЀþh²·ã~ßt Np³¸#´!Nw}¦ª]ÆèÃë΃¯B¸žŽd¥lÓ!¸gÞÀ¾®ŽÀ/hz±[WîÖU6CfR dÓ¤Œ7¹+Û@|!!ŸÞ{¹]gÔì¬@Ñj¸:1s[¤sW7$-È­IÒj„p• \#Ã'ÄXÔa8¨úö=QåíìX1Ùl· ù¯²JÐŲ_àSA´ç |¡4Áúiélâ*—°Ò36/ËæÙ6È‘€ô§¦CˆZf:ÚØ÷Cˆ¿³x„è3Òrô’åæëMµ.kw,H„¢ ÍYAÂexbl²´X‘E»µè4ºoêey7 !%lB²ÌlŸüdPèÛ÷„‚·³# À9b—Bÿ¹Nlƒº0Úo/{bbA¢qÃÔöxFÜ„Fâ“—G‰»'¹k–eò4‹¬¬k`”œ´*d !Ý$áÀ¾|üÅÃ'Œ4al—\¯Ö.ËÐb =éw6 F Tª:+Ê$¢f'FY åa¹iž™aÀŽ†`'œô„6Ó¡ªoßUÞÎŽ@U’h¿ø»ÌVPˆ"ÁbomšÙì>®}€ )/·Ø 9h|?Äæñ¸mW­ÎŠZªòĨݫIR»5ɺ*ì¨ÊŠ›²ò„r’k#rº¹‡}?äú;‹G.×ræ¸eU¹¸9_qÅuNˆs+F =fâcZ­lƒàžW 8.ò%‡Ì9áœRÔNeì{F¾·³#"_À‘ŠÑs -yYa÷?R7±-±¯(¬°ÛA‘+l€ã'Ö:}o+åS…Ý~³M?Ù,·ï¦2÷—Ù¿³¨N[–³a›ËY‚î½ô£V€À]›6#€nÓROؾ}OÀz;‹¬nw’AN aÌ÷æÖU7¶Is¤bË\»¤t´^ã ×´:ë, Ŧ˜8õlF¾ u“µm–#XŠ>›²°b x$ç“ÅüÀ¾_Ìû;‹')È1Dïå -<¼1/ÇTñˆÖm@ g7VXBK±FÓ"K ·+î°T gÖ.C…á9áÌ kéù¶÷eA⥭lÜ.oUn]¹z¿x>à”¸˜pB’ 8êé&$ö=îí섃 Q8Z†^÷¹­=-VG%4„™³nrb,"F°ÿÞ£Òï„ļªÅtŠ}ó~ ðvu&ÀQ¶ÿY„Qk\‰«ã*]ã· ^N{ž Îɽ¯¿'ó~³xjyî/,Ò MÄËWîÖÙ ÿÒðÕÇWaiÂYòžu¿˜öuÒ†ÂÈìè¿Ý?Ž¬³ï°ï![d=žÖ«Ó#OëM[ã×-ð«^Ëòî´Ó‡ªtÍ4tŠµêƒN”ЮŽû»)ÿìƒ: -endstream -endobj -2987 0 obj << -/Type /Page -/Contents 2988 0 R -/Resources 2986 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 2826 0 R ->> endobj -2989 0 obj << -/D [2987 0 R /XYZ -16.307 900.716 null] ->> endobj -2990 0 obj << -/D [2987 0 R /XYZ 56.693 742.577 null] ->> endobj -2991 0 obj << -/D [2987 0 R /XYZ 65.161 743.26 null] ->> endobj -2992 0 obj << -/D [2987 0 R /XYZ 65.161 732.301 null] ->> endobj -2993 0 obj << -/D [2987 0 R /XYZ 65.161 721.342 null] ->> endobj -2994 0 obj << -/D [2987 0 R /XYZ 56.693 676.323 null] ->> endobj -2995 0 obj << -/D [2987 0 R /XYZ 65.161 677.006 null] ->> endobj -2996 0 obj << -/D [2987 0 R /XYZ 65.161 666.047 null] ->> endobj -2997 0 obj << -/D [2987 0 R /XYZ 56.693 621.028 null] ->> endobj -2998 0 obj << -/D [2987 0 R /XYZ 65.161 621.711 null] ->> endobj -2999 0 obj << -/D [2987 0 R /XYZ 65.161 610.752 null] ->> endobj -3000 0 obj << -/D [2987 0 R /XYZ 56.693 565.733 null] ->> endobj -3001 0 obj << -/D [2987 0 R /XYZ 65.161 566.416 null] ->> endobj -3002 0 obj << -/D [2987 0 R /XYZ 56.693 522.638 null] ->> endobj -3003 0 obj << -/D [2987 0 R /XYZ 65.161 522.08 null] ->> endobj -3004 0 obj << -/D [2987 0 R /XYZ 56.693 477.061 null] ->> endobj -3005 0 obj << -/D [2987 0 R /XYZ 65.161 477.744 null] ->> endobj -3006 0 obj << -/D [2987 0 R /XYZ 56.693 433.119 null] ->> endobj -3007 0 obj << -/D [2987 0 R /XYZ 65.161 433.408 null] ->> endobj -3008 0 obj << -/D [2987 0 R /XYZ 56.693 388.388 null] ->> endobj -3009 0 obj << -/D [2987 0 R /XYZ 65.161 389.072 null] ->> endobj -3010 0 obj << -/D [2987 0 R /XYZ 56.693 344.052 null] ->> endobj -3011 0 obj << -/D [2987 0 R /XYZ 65.161 344.736 null] ->> endobj -3012 0 obj << -/D [2987 0 R /XYZ 56.693 299.716 null] ->> endobj -3013 0 obj << -/D [2987 0 R /XYZ 65.161 300.399 null] ->> endobj -3014 0 obj << -/D [2987 0 R /XYZ 56.693 255.38 null] ->> endobj -3015 0 obj << -/D [2987 0 R /XYZ 65.161 256.063 null] ->> endobj -3016 0 obj << -/D [2987 0 R /XYZ 56.693 200.085 null] ->> endobj -3017 0 obj << -/D [2987 0 R /XYZ 65.161 200.768 null] ->> endobj -3018 0 obj << -/D [2987 0 R /XYZ 56.693 155.749 null] ->> endobj -3019 0 obj << -/D [2987 0 R /XYZ 65.161 156.432 null] ->> endobj -3020 0 obj << -/D [2987 0 R /XYZ 56.693 111.412 null] ->> endobj -3021 0 obj << -/D [2987 0 R /XYZ 65.161 112.096 null] ->> endobj -3022 0 obj << -/D [2987 0 R /XYZ 65.161 101.137 null] ->> endobj -2986 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3025 0 obj << -/Length 2324 -/Filter /FlateDecode ->> -stream -xÚÍ\Ïs㶾û¯àôбg*˜ÌL»M7ÝM6“®}èÌn”Ù¬IB%©x¿¾"[”d=‚³‹¦À‡Gà}ßû@ap„Ágo¯Ï.߉0HI*™ ®—dDÆAB9áqpŸÏ?©Re­º˜1žÿ¬;Õö—KÝôÝíðå÷zñVë»þŸÿ\ýtñëõèfF)I…è¥]u¥jo•êZó5ôNƒz—ÜôɘÄ, f‚¤ñп A`œœ_ö”IóàÙ?¯ÏþwFA|Ð@H"SÄ)%2dÁ¢:ûükäð(@¢4 î7-«@Ð0.Ạ®Îþ}#n  Y,Ò͌£”ÐPöJÁ×4Úè1>|žÑ0 Ïi.Xx®¿„!+‹úfxɧC #Â"Âå êz¾¥.K}ÁÄù½ynskq›Õ7ã€ßfFòoTœOÌ•ªû«*ˇ{~œ•Mß úcß4‰H›×ßô½jô²8 &¼6KÒ±åB´E½P“™§$æ„õ×Mo/d{tà•) ¥€ ˜Û÷R¿0&¶ÚmÔÝØCdtHH$“Q…Es—]Ì$ òºUwß]Ì(ƒ¾¶%ë_D¸îåÅ‘æã‡m[ §1 d’$ÆVÌ}‚åE2`$…—nT°|j[ÒößÝí ŽIJåØA/˜šÖ®ò¡’Nå‹& ÓÃSàH’²ôÊn67Añi@ÒÖlŽŠ'”°0ê'õMž«|Ëv%´Ì¤×ê×°YÅàšZPíûÂ5ÎÊ×p¡ëNÕ®ñªU“uØÑš?àÚýëúãOÈ–ª\M)ÏÜÿŠp¸¿ûä9°E¹ÎŠÁŒ]‘!çÎLH;QÈ(C± G`û± øÜu«ƒ‘‚‘¾„ü>é¹jºžý®ºì¡ÓõȃmÎ* hŒ@ŸüÇðSæÿ¶å;òŸ³²üÇÁûÇi?¯ëI*fv§Æþ÷¿ÆÝ>Æ‚Û‡ŸØôRÔm§2$Åè%®Ý6ù¨Æw‡_èÕôùìps¬&\Å1P×5Å|Ýa]H;q!ÇÇ xäÜ0¶å;ÃYY `0N"ÖãBK¤[d5Ò#¢‘Ö [Bœ[”X5×m§«â÷‰ÿ†W%X¦1$‘7µ/é ¤K){LzÄÞ¤çú":ÐeûLº#þüt§; "g@ÈÉéR3Q"rHu>0ª4‘UWmBšÞñWEw;ºý*»S—áÏ&ñsoœ) @u(™?ç/B“,û㸉|7ŽsWÏq‚‚­ ¾ÿ·¬)ôéfFlà|XtáYž]¡ë§KízµÒ 2±CF§÷䛵‹¢ÈõÛÚÒ‰Giò”ŒOnàùn…ƒ¦§½…c]sQ¯Ö:Ž«²Îz¶@9!^3Õ‹bFXD¿Aòà“»óFþ‘ „ÓÔ6¶å;bÃYY<6"um3…8“ÏçeÖ©¯HŠ¾ÅJUËl]"Q÷Ë÷ïÐd®šgdèWR_³j…­ÒUzl©$JÈÓäê˜ÂȈJOLÉùå|]”ùåmW•¬ÑË¥E)¢ ›ˆ±Á¯•Ü5%Ì.›¯Ë ë ¸¸¬Û]ùøÛó6>ÇØV%àÿ®[¤Ø\c“×¼hÔÂ6Âç #"Žý!b[¾#"œ•µ@D"H2ߺ&«Û>ƒ*Ðè@’ž‰,y÷6ôà[ö;Š# *°Æ^´Ò‡öÄü³Êš¬‚¸Ý1%’&þ°±-ßÎÊZ`ì[zöÄ3‰­ÃaååªF/í—E‹.–”¥¾G‡zxCÜ”Y¬ep™ÉÒ×L£x$HLÅKÒ¨lÝÝï}òôA…>.¾?¦O&ŸœÁ¿³ J[‹$ŠsÐLpIg‰SÅʉ|GpVÖ‚XB„ŽÓœ+Ë%b‹ ¯v<" -ªš«¦=mvfçc^ÈCÇ=þõm|1Ugsô6.ÈfïN¼„áwŽ‹—¦&ÇÉ„r’p“‰|G¬;+ku³*ˆ‚I£–ªQfu™¼,ÖxèÝ°ÙÆçÁ‹%‘|MŸÇ’˜¤œ}“¥Cf¶œÊÔŸ×c2&!õ„mñn8pV›ÉþÝgƒ¹&ñó·ï}Ô±tè§ÆØ>ÔzÕb“Mž€^⨲z•ÝXuðåën -Û7'òñ㬬€DJø¸…ãí@°ÛŸ•å§ýÞü|õþ嶰NBùªKbŒ›ó7é·é×ÌŽÉDzôkaJóWêœÈwD¦³²ȤŒˆ1ÃoV‚+‹ªJQ]‘•68¡½€Ó´Z6x -*šªŽ¢ˆ¦ aÒ_Ír"ßÍÈÝ•µ0rÐTˆ¡fù‚Rl¨µ7"9í²ë›ÅBJ‹ööÔ‡šÌ¶F,Œv·{7NH«xèoƒÓD¾£q:+‹7Nš†D¤Ã§ý+•Î…t%«îo*•Y÷ÒõÝ#ë¶Ú¢ñÎòØaßòÇiì€d¯j%ñXLÚïh箪Z˜yœɇz)âÆÒíƒaéÖºÑÀ9”Œ^¶n(ÛJMÆ÷;'Èl±cQ¥£1'Üíh„m6CEH¢(ñžÍäz13•ò\̵¾³Hjh*&O‹R–ÁüíhšÈw¤ge-¸†3’ÐÈv‰ - ö=‡3/Ÿsyà *d{;é»Tú|ûéñŽçIǘ¾Eó$¯ÈRÒ„é/õŸÈwD‰³²(a”$ãoÌ>7?pLÚ«]¯ë¶úÔ¡¶P‰>M›[ýrÆÉwG/mñ~K†« -Ûòñ㬬~ÌÚd:Tj½g{é‘\þº1»6±‰|«+üV£y©*ßëꇋlÍêþ¬-û¬üyvÚ»ã¨H! üU3¶Å»aÂYU<$RˆÓÇß@ÃoüÞÂ`s”)©‡Ôcç—Ò"sþ;}É¥ý{KÊ -endstream -endobj -3024 0 obj << -/Type /Page -/Contents 3025 0 R -/Resources 3023 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3060 0 R ->> endobj -3026 0 obj << -/D [3024 0 R /XYZ -11.232 900.716 null] ->> endobj -298 0 obj << -/D [3024 0 R /XYZ 56.693 759.068 null] ->> endobj -3027 0 obj << -/D [3024 0 R /XYZ 56.693 738.489 null] ->> endobj -3028 0 obj << -/D [3024 0 R /XYZ 56.693 691.479 null] ->> endobj -3029 0 obj << -/D [3024 0 R /XYZ 65.161 692.163 null] ->> endobj -3030 0 obj << -/D [3024 0 R /XYZ 56.693 644.655 null] ->> endobj -3031 0 obj << -/D [3024 0 R /XYZ 65.161 645.338 null] ->> endobj -3032 0 obj << -/D [3024 0 R /XYZ 65.161 634.379 null] ->> endobj -302 0 obj << -/D [3024 0 R /XYZ 56.693 597.229 null] ->> endobj -3033 0 obj << -/D [3024 0 R /XYZ 56.693 569.675 null] ->> endobj -3034 0 obj << -/D [3024 0 R /XYZ 56.693 523.06 null] ->> endobj -3035 0 obj << -/D [3024 0 R /XYZ 65.161 523.349 null] ->> endobj -3036 0 obj << -/D [3024 0 R /XYZ 65.161 512.39 null] ->> endobj -3037 0 obj << -/D [3024 0 R /XYZ 56.693 465.277 null] ->> endobj -3038 0 obj << -/D [3024 0 R /XYZ 65.161 465.566 null] ->> endobj -3039 0 obj << -/D [3024 0 R /XYZ 56.693 418.453 null] ->> endobj -3040 0 obj << -/D [3024 0 R /XYZ 65.161 418.741 null] ->> endobj -3041 0 obj << -/D [3024 0 R /XYZ 65.161 407.783 null] ->> endobj -3042 0 obj << -/D [3024 0 R /XYZ 65.161 396.824 null] ->> endobj -3043 0 obj << -/D [3024 0 R /XYZ 65.161 385.865 null] ->> endobj -3044 0 obj << -/D [3024 0 R /XYZ 56.693 338.357 null] ->> endobj -3045 0 obj << -/D [3024 0 R /XYZ 65.161 339.04 null] ->> endobj -3046 0 obj << -/D [3024 0 R /XYZ 65.161 328.081 null] ->> endobj -3047 0 obj << -/D [3024 0 R /XYZ 56.693 280.968 null] ->> endobj -3048 0 obj << -/D [3024 0 R /XYZ 65.161 281.257 null] ->> endobj -3049 0 obj << -/D [3024 0 R /XYZ 65.161 270.298 null] ->> endobj -3050 0 obj << -/D [3024 0 R /XYZ 56.693 223.185 null] ->> endobj -3051 0 obj << -/D [3024 0 R /XYZ 65.161 223.474 null] ->> endobj -3052 0 obj << -/D [3024 0 R /XYZ 65.161 212.515 null] ->> endobj -3053 0 obj << -/D [3024 0 R /XYZ 65.161 201.556 null] ->> endobj -3054 0 obj << -/D [3024 0 R /XYZ 65.161 190.597 null] ->> endobj -3055 0 obj << -/D [3024 0 R /XYZ 56.693 143.484 null] ->> endobj -3056 0 obj << -/D [3024 0 R /XYZ 65.161 143.773 null] ->> endobj -3057 0 obj << -/D [3024 0 R /XYZ 65.161 132.814 null] ->> endobj -3058 0 obj << -/D [3024 0 R /XYZ 65.161 121.855 null] ->> endobj -3059 0 obj << -/D [3024 0 R /XYZ 65.161 110.896 null] ->> endobj -3023 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3063 0 obj << -/Length 1750 -/Filter /FlateDecode ->> -stream -xÚí[ÛrÛ6}×WpÚi¦‚q'Ð<5q’isqk»™Ì$™ -AJTIúö÷]Š”mR7ÐÕL«“&ÁÅØsvÏJÂÞ¥‡½×çç£W{iI¥w>ò$EÒ÷aˆùÞùÐûÔ=5‘ RÓëS»ïã̤Åé(NŠ“l\Þ<ŽÏãø[ñÏdz·½/ç¿Á4}B¢°v–ÝE&“¥ùm˜x -f—,ŸKùTy}´_Î/ ôU÷¨8*ó;/Ï;w˜Çñ„DR3Ï×IL½Á¤óé ö†p@\+ïf>râ ‚eÎ#ï¬óG—+++B=æ =_’…q®Á²p -n“ÂŃާ>Áw_Þffš†ñtñ~Wƒ²ÂÂùbÕFqÅ=*º7áô²¸4ÓËÅ:ƒÅÝëÝò‰ c¦ÅÙ$–ײøa3æó‚ÇóÅ‘ïço=ŸÛlò"€Êû¡ƒx1CN¦¶ãù Ñâ<)âUW¥O¹0§pBÂåž~¦TTÆÍýÇÏ}PˆKµpá ³q¯/aq_ãè21ÓŸ{}BáÿwÁ73 -#SØ‚(ËÍå‡×Õø€w">õ¤È/â#¿.0D—EZi/1Þèq@T¬­¾º> endobj -3064 0 obj << -/D [3062 0 R /XYZ -16.307 900.716 null] ->> endobj -306 0 obj << -/D [3062 0 R /XYZ 56.693 759.068 null] ->> endobj -3065 0 obj << -/D [3062 0 R /XYZ 56.693 738.489 null] ->> endobj -3066 0 obj << -/D [3062 0 R /XYZ 56.693 698.306 null] ->> endobj -3067 0 obj << -/D [3062 0 R /XYZ 65.161 698.99 null] ->> endobj -3068 0 obj << -/D [3062 0 R /XYZ 56.693 655.973 null] ->> endobj -3069 0 obj << -/D [3062 0 R /XYZ 65.161 656.261 null] ->> endobj -3070 0 obj << -/D [3062 0 R /XYZ 65.161 645.303 null] ->> endobj -3071 0 obj << -/D [3062 0 R /XYZ 56.693 601.891 null] ->> endobj -3072 0 obj << -/D [3062 0 R /XYZ 65.161 602.574 null] ->> endobj -310 0 obj << -/D [3062 0 R /XYZ 56.693 567.377 null] ->> endobj -3073 0 obj << -/D [3062 0 R /XYZ 56.693 541.189 null] ->> endobj -3074 0 obj << -/D [3062 0 R /XYZ 56.693 501.401 null] ->> endobj -3075 0 obj << -/D [3062 0 R /XYZ 65.161 501.69 null] ->> endobj -3076 0 obj << -/D [3062 0 R /XYZ 65.161 490.731 null] ->> endobj -3077 0 obj << -/D [3062 0 R /XYZ 56.693 447.32 null] ->> endobj -3078 0 obj << -/D [3062 0 R /XYZ 65.161 448.003 null] ->> endobj -3079 0 obj << -/D [3062 0 R /XYZ 65.161 437.044 null] ->> endobj -3080 0 obj << -/D [3062 0 R /XYZ 56.693 394.027 null] ->> endobj -3081 0 obj << -/D [3062 0 R /XYZ 65.161 394.316 null] ->> endobj -3082 0 obj << -/D [3062 0 R /XYZ 56.693 350.904 null] ->> endobj -3083 0 obj << -/D [3062 0 R /XYZ 65.161 351.588 null] ->> endobj -314 0 obj << -/D [3062 0 R /XYZ 56.693 316.39 null] ->> endobj -3084 0 obj << -/D [3062 0 R /XYZ 56.693 290.202 null] ->> endobj -3085 0 obj << -/D [3062 0 R /XYZ 56.693 250.414 null] ->> endobj -3086 0 obj << -/D [3062 0 R /XYZ 65.161 250.703 null] ->> endobj -3087 0 obj << -/D [3062 0 R /XYZ 65.161 239.744 null] ->> endobj -3088 0 obj << -/D [3062 0 R /XYZ 56.693 196.333 null] ->> endobj -3089 0 obj << -/D [3062 0 R /XYZ 65.161 197.016 null] ->> endobj -3090 0 obj << -/D [3062 0 R /XYZ 65.161 186.057 null] ->> endobj -3091 0 obj << -/D [3062 0 R /XYZ 56.693 143.04 null] ->> endobj -3092 0 obj << -/D [3062 0 R /XYZ 65.161 143.329 null] ->> endobj -3093 0 obj << -/D [3062 0 R /XYZ 56.693 99.918 null] ->> endobj -3094 0 obj << -/D [3062 0 R /XYZ 65.161 100.601 null] ->> endobj -3061 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3097 0 obj << -/Length 1639 -/Filter /FlateDecode ->> -stream -xÚÕZKsÛ6¾ëWp¦i¦‚Ïö”L“LÒ¦¶™‰s %Hâ„"’ò#¿¾ ‚´EZN ÓLÓ)p±»Ø7ù «¯GÏg£“WiAE0[‚"!EBÊ`¶>OMb¢ÂL¦”ãñ_Yi -w»ÌrwS®ë‡/²ùó,ûâ~|<{7ù<{ b¦„ ͹ãvVÞ$¦XSö1H'é"´Ò™HRL9Ò²–/(0”j|â.„ -»qôr6ú:"À$à R$0 æ›Ñ§Ï8XÀ3P1­‚«Šrp‚ Ü'ÁÙ蟮-[¡I®+“4Ì™F §<&ºÒ£Ù|šŒ«sO“øâºHÊú€ûækP†BQ³™5¦[fI’M(_ÅéÊ-Í×QºjŒ½Ž&/'„ëƤîn-êµ2»óH%Ô¾“MCRÚ£W²AÃéd -Ôk+’Œ6æY#§ˆÓ¹é8Ÿ "êîs2¨m x"N”½A‡Žë9¥¼EWi]…³:(Ä„jTxíò¸ü6™ -°ô[¥E–þ1™ -?·7å:KOìQÐöƱ„¸³\íåu;b Ή¤pB…”ä6bì:ÇLi¥ƒÜËýiq;¼z_€”HÑpŒ‰¥îËŸ#"H—?Çà°—„ýôHSýÊV óUànNë|j9´Q\D1s~ýÇiÙŠ‚ûœ Á¬×ëØþ1anŠ]âË4ó£+ÊE¶óä/ýèROÙ x'ž‡_G…aUF¼(Wñe‡‡|óÌF—Ã¥A›Ï4è­ìi ¡±¦9fOÿîÒÔÌMQDùgäšM<Ï’,-|³g“]šÅãýÂIUŸºúÀõþÈR÷gÁÂœý]%U4°«P˜?Âp¸tjóï™N½•="hˆ`b©Üúl±èðƒÑù‘-w鼌³Ô·SEž­â뮫½h·QmLir?òË(ÙuX×OÎ1Çõúý½ÞѤÅ.7Omhòžu-ò†É·9XÎ7&Šná{ñåªMSAÎ1ÃõÄ­öˆ$bòv|žú ï’ —Ûmþ=s»·²¹­8ÂJ‚P¨ÚÄY³(ad\uÛ5ñíQ\+D ÌÐþý Ý_Ù#Š(hÊ›÷³S³M¢¹oÒ, ¤Ø<òN²¦¢z¿ežmžø5Á’í&[ì|'ð«¸\ qdQ{ñþ城 µ†Þ½yþñìÝÌ×@p ™nrãPŸB=\Íi±ïYrúªê_q8gHHåüž›&σy7¦O5{Ÿºöwœ<¼ÃÓ\Ø=íg‡ÿÃ!ïªÐ¡ ­,<5³‘AAÀô§–+ÊSj˜·È}³ýøð„#ÐfÀR„‚\®µù÷,F½•=¢©Uó%ave¢/¾ÕÈ{ê(Íuù¤¯¦I\–Ñ䘹ÀN|R–h4€Ù]˜_ï2q„Ð5žB‚)wØ“T{‚Œ -kІà 8TÒ`‰-‚¢áýÏ^•Yb’·¹¥MœVX¬\X˜e·šžcL¯ÝÒn»€yÖQV‹nPX¨ô nñõ˜2ªÇoJGá8Yܦ¸ªí{üüK´rh™ -ÅHr9\“¥Œ#©Õ`M¶Ã¿_“í¯¬“¥LW_uܧÚí6‰}›ì6*çëC_4#RÀUûv=Ê(RXÿÌñ’”æ½ ×\“`/ˆUm+øpXE‡¿ è¯ì€)¢Í÷Ì#ÀŠÊËñ·È‰°Õñ"üg‹]õAîÌ”&‰†ê®øÃä½?ç&-ÆÔtäÃSŒ17bþß7âev@?ÂcüÉz0ÑQJêÁet‘@ÿí|¯8ô_-†ú1ÕúRB~| -endstream -endobj -3096 0 obj << -/Type /Page -/Contents 3097 0 R -/Resources 3095 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3060 0 R ->> endobj -3098 0 obj << -/D [3096 0 R /XYZ -11.232 900.716 null] ->> endobj -318 0 obj << -/D [3096 0 R /XYZ 56.693 759.068 null] ->> endobj -3099 0 obj << -/D [3096 0 R /XYZ 56.693 738.489 null] ->> endobj -3100 0 obj << -/D [3096 0 R /XYZ 56.693 691.479 null] ->> endobj -3101 0 obj << -/D [3096 0 R /XYZ 65.161 692.163 null] ->> endobj -3102 0 obj << -/D [3096 0 R /XYZ 65.161 681.204 null] ->> endobj -3103 0 obj << -/D [3096 0 R /XYZ 56.693 633.696 null] ->> endobj -3104 0 obj << -/D [3096 0 R /XYZ 65.161 634.379 null] ->> endobj -3105 0 obj << -/D [3096 0 R /XYZ 65.161 612.461 null] ->> endobj -3106 0 obj << -/D [3096 0 R /XYZ 56.693 564.954 null] ->> endobj -3107 0 obj << -/D [3096 0 R /XYZ 65.161 565.637 null] ->> endobj -3108 0 obj << -/D [3096 0 R /XYZ 56.693 518.129 null] ->> endobj -3109 0 obj << -/D [3096 0 R /XYZ 65.161 518.813 null] ->> endobj -322 0 obj << -/D [3096 0 R /XYZ 56.693 480.59 null] ->> endobj -3110 0 obj << -/D [3096 0 R /XYZ 56.693 444.425 null] ->> endobj -326 0 obj << -/D [3096 0 R /XYZ 56.693 401.575 null] ->> endobj -3111 0 obj << -/D [3096 0 R /XYZ 56.693 364.579 null] ->> endobj -330 0 obj << -/D [3096 0 R /XYZ 56.693 334.756 null] ->> endobj -3112 0 obj << -/D [3096 0 R /XYZ 56.693 306.371 null] ->> endobj -3113 0 obj << -/D [3096 0 R /XYZ 56.693 260.034 null] ->> endobj -3114 0 obj << -/D [3096 0 R /XYZ 65.161 260.044 null] ->> endobj -3115 0 obj << -/D [3096 0 R /XYZ 56.693 212.931 null] ->> endobj -3116 0 obj << -/D [3096 0 R /XYZ 65.161 213.22 null] ->> endobj -334 0 obj << -/D [3096 0 R /XYZ 56.693 176.07 null] ->> endobj -3117 0 obj << -/D [3096 0 R /XYZ 56.693 148.516 null] ->> endobj -3095 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3120 0 obj << -/Length 2932 -/Filter /FlateDecode ->> -stream -xÚÍ][—Û¶~ß_Á“>Ä{Nƅɤí©8Nsâ6õnzrŽˆ„$Ö¼¨$´ëí¯/x‘½¤nƒ¹î“´4óÍ|3`±·ò°÷úâåÍÅó8ö" *¼›¥'(†XàÝ$Þ»goU¦d­.¯(ÇÏþ^jUwo—eÕ½ÑëþËïËøeY~èþøíúçËßo~2—¹"EœwÒ®õ}¦êµRºn¾6W'^h®.Xsu_( ¡wÅQô×Ì ÂgÏ»BEóËW7ÿ¹ F<öˆÇó‚ˆ ©çï~Ç^b¾3 - ? -½»vdîq‚e¼ϼë‹^àþN`£bó¶yyý@²¹$ ^àGˆ`ÑHn>çØèé ¢(Œ¼JyË£¢ `!"~°»@'˜4£]åsDË瘠@„ +<¼ÍE4š@ÙV`µòº7o{K4°µ¿µÄ^qŸ ŸõÖó¦LÒeª’ÖŽ óÞ] Ü&làª*·àX•o2©’몪ԃ‘f²ì?8ò“0Ùra {—ê5ld¾ÍtºÉ¬îp}dŠ{‡ †ó¡c(ßÎÊZ ƒ÷ˆúŒèC–ZWéb µöheåVo¶8¶ªše°qYUªÞ”E’+ØO–åØp¿9ŠÍCp3Ÿ¢Ó`þ¥R·i¹­³ûGC„DõÍ‘¡|Gˆ8+k!Nz2aBB4æ; ´f 5Ðä7U¹N©Û§^§cƒk?9>n¨²H&`\æ¹*€s¬å½Åô¤¶q,ð——ck83Ì‘§ Ä;¢ÌUU áqî@& ¨sW_:fÝ¥àÀ!·5P(tþªªF,ÎÜ>ƒZr&\¼„FÏ=ÏpJåÀ¡HjÀ»Uåee±R•%^Eä#FÈl€ÉwC¬»²pÈŠ(@<Š:ÈV&É¿•Å^òíi;Lõ´Ä°(õ¤!ÉDRCÆò©sŸþñË¡pkž;}¿ )Ûo¯^ÀGÆN_Ử¬¡ÉÞb»:t•?@`Î#dž""ˆQêR9òº_žê ="hPF;Û}O)Ìcdï!ò q_AÛ*Õÿ½lgú“’E]ß\^jþ\Ur³Nã}¬3èÜkó¯ÙêB‚Ó–½Î澆òÝ—³²î‹sb¾«Qn2CëB&Œ› í cþÓ º<ö9Ds†O^x¹“U'¸fžr¥‘hõÑðèZU@l†«¢NGéúÎœ‡“or5>©+¡ÍGÁÄ®D&yYØøJéŒ~ÄÀ0 l>?2”ïèGœ•µð#ÄG˜tOôUÑÔn€^d¥ -UIB TåÈ•’G ª„U%ëÎÄÃ:˜ŸLTšN‹¤ñ4óH¡ÅÀ~)üÙèT¨Ù)À?º¶o ‘?0D?0‚í¼Ê{ìãne, - - Í »1W@¯bè½A¡?èGòÝ@ï®,ô!G8žÀ +îîæÆHˤ’‡aK>f»±CùŽ7ÖYY¸7åEØ|Ñ'•KU©"V£¼®×ºhq§˜¶¨WJêQ,9¿0MúpcäPÎÅ &B"fã\´±µ€GIç~g%„"6žÁf"?Þ¼ù¹ïxÈÛ°wE©!K}åâf×}°,³¬¼¤ÜPiÃŽÛâµ,V»~…µ¼¤øÙí%áÏú_,”*ºw¹LúÏtù¹©¡óÂìÁµIè£ ;?¼Öyv@C*ÉnP\îdשÁ¨gÂÛÜŠî}ÕuZ áݸ¢„˜˜7…›˜©¶¡¯qlµñG$š‘­úQÓ¥1[Éwó¯îÊÂý«1“ õëE’ì9˜sY짇 b€ñxUõ3ù8œ3ÚôF2Wcáþê¸ôMUÆûiû j\B©‹¶ciô›¯žŸIÞ¡%n¹¨u%cíÒ;rn~!ÌÇ6FòÑବBŠø® øh:~"9d>Îô%-ö³°ç'êNV&&¡ËÛ=š¾C82Anü@ Š§¬ -ùæ5 ü1±65¬CeMº®ó6Unç|§z½‹¹›´ ¶ßvßÔ÷E¹±¾¾o®Ç¢ƒ/3Éæ|½VCñŽÎÆUU _ããVÑö!×K`¡ÈŒM2pÅZ&Ú±ãi»­àM…Ð,ΓÖÂkèà^[ÊyDÂÝ¢Ù,v(ßÑd•µ°Y™Ì¿O”–Û"¶{W0u±m¼ž:Ë¿¦ 4ºÖZÂkàxÙ—{¡ ßÒy+&¼%3³YñP¾£;+kaÅ$D!ÿÔ¿\ÍO—`Gv?±©$ªŽU‘HðâÔçËâÞ -¹Ð¾½B˾¦ì½HÆõgé¸éñ<°ž¯h=’ïˆge-p`˜^õ¹?4N'‹Æïï?†£È³Ì^dui ¶›\$ó •/Ô^=äèèO¥ià],ãznu,bHøó•FòÝ€á®,,2×d}àˆÛ³Íé€4q7e.?@—= Ž?S²šš©Áã飗\Î#%lÄ|HÊwDŠ³²H ›•ý¶†z˦9 ¼ô> G»Õ»u -Í>¬3S¨ö™–´Þ†ÀšÈ÷!Œä;š¸³²&p„IŸ.ÜÊ š7Æë4K %8BÎ?¢€=iëk6%ÁLEJ¹\f…Iæã–ŸÎV˜dM«ÞŒ«‚#ùŽ6שּׁ…Í3†(ݵÂÞªJO¾Ez#¡ Ðd¶Ùñx _´ýNDœžY ’vÛN2u™Iñº¬fÞ0srÄØB0_®<’ïˆge-A)¢¢Ï•]Kw“lc^¿ ”ºø·Šµíf㛵,>Llº×X—»Ö*-Vef[äg8lãúl¦>”ïhêÎÊZ˜:!ˆáÞûƒm·R›²ÚÛ(kÃw°áYôIe©É^|ñ˜EÙ·å¢ÙÈР¼×6ýde]ËêÞ‚èÐ 0¯3®ÀRÑlŸÍÔ‡âÝ,ÝYU¸¡S!ŽûØq\n'Ï¥íÍL½µº¶½~’ÞN›¶¶RMF—kÆD…a­ìI÷ RŸ!ÿƒJÊ8b!ŸÑ‡Pùt¾ØH¾£qVÖÂPs«‰ÿ˜¥2µ’YQêºnðD‡E¹§w Y+‹ÆʽÖÍSy£«U5íFñXfñ6ÛçôçqG˜õ|u³‘|GX8+k "P°;¥oò5Ø`î$t9~ê¹JÝ®ÓZ—ðø·§Qçs¯_ë}Î=m϶ÜlöO‘4m׶H´¥c³!i(ßIÎÊZ ÉdFAÔŸÉ–7»?,šÜ[£²xzË4S‡é¿:Ó£¥2ë}ÅÐÙÎøZ!ŸåqWV&†r²LYÜÆý=€S}º ?v°"AÜŸï·‘|7X¹+ ‡‰|²Ïç¸ÍÁÀà©œƒíygòζ¾$>à«UX‚¦~$ ä)S?"¢/\ ¸Í=fËúˆµ,n6ï1”ïè=œ•µðíŽÓ¾óá׶ Çêí¦)•N¡®ÿõÚþ”‡| í>‚îR–¥ž‰:rrÍcÓú¼ï_º­Ü斿͆¡¡|G 9+k!Ÿ"úÇ6Ÿ>1‚ÞH½†noÍ;h”65§ROØš³tý©0궨Agm¦‰;?¢a<ß‚ÈP¼ UµÀ#ƈFÖpLÊxÛtÞYœ]4ý¶°d±^?²#(áà™5»$ÔGmA§ëæ<4Þª©7ôý¨²Ë)k¡h©Ð\hŠwC“«ªG±Fˆ±ÝBÐI[º§šw¥]NZC¿µá_‡«†_×{a泯O×vÀ;œj >5z›³TÖ ûd¾šçeá–±Zá¦94ÊŸ!¶ïý##,¢Çü›ÿRó'3 -endstream -endobj -3119 0 obj << -/Type /Page -/Contents 3120 0 R -/Resources 3118 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3060 0 R ->> endobj -3121 0 obj << -/D [3119 0 R /XYZ -16.307 900.716 null] ->> endobj -3122 0 obj << -/D [3119 0 R /XYZ 56.693 759.068 null] ->> endobj -3123 0 obj << -/D [3119 0 R /XYZ 65.161 752.393 null] ->> endobj -3124 0 obj << -/D [3119 0 R /XYZ 65.161 741.435 null] ->> endobj -3125 0 obj << -/D [3119 0 R /XYZ 65.161 730.476 null] ->> endobj -3126 0 obj << -/D [3119 0 R /XYZ 65.161 719.517 null] ->> endobj -3127 0 obj << -/D [3119 0 R /XYZ 65.161 708.558 null] ->> endobj -3128 0 obj << -/D [3119 0 R /XYZ 56.693 666.08 null] ->> endobj -3129 0 obj << -/D [3119 0 R /XYZ 65.161 666.764 null] ->> endobj -3130 0 obj << -/D [3119 0 R /XYZ 56.693 625.528 null] ->> endobj -3131 0 obj << -/D [3119 0 R /XYZ 65.161 624.969 null] ->> endobj -3132 0 obj << -/D [3119 0 R /XYZ 65.161 603.051 null] ->> endobj -338 0 obj << -/D [3119 0 R /XYZ 56.693 568.3 null] ->> endobj -3133 0 obj << -/D [3119 0 R /XYZ 56.693 542.423 null] ->> endobj -3134 0 obj << -/D [3119 0 R /XYZ 56.693 503.797 null] ->> endobj -3135 0 obj << -/D [3119 0 R /XYZ 65.161 504.48 null] ->> endobj -3136 0 obj << -/D [3119 0 R /XYZ 65.161 493.521 null] ->> endobj -3137 0 obj << -/D [3119 0 R /XYZ 56.693 451.043 null] ->> endobj -3138 0 obj << -/D [3119 0 R /XYZ 65.161 451.727 null] ->> endobj -3139 0 obj << -/D [3119 0 R /XYZ 65.161 440.768 null] ->> endobj -3140 0 obj << -/D [3119 0 R /XYZ 65.161 429.809 null] ->> endobj -3141 0 obj << -/D [3119 0 R /XYZ 65.161 418.85 null] ->> endobj -3142 0 obj << -/D [3119 0 R /XYZ 65.161 407.891 null] ->> endobj -3143 0 obj << -/D [3119 0 R /XYZ 65.161 396.932 null] ->> endobj -3144 0 obj << -/D [3119 0 R /XYZ 65.161 385.973 null] ->> endobj -3145 0 obj << -/D [3119 0 R /XYZ 56.693 343.89 null] ->> endobj -3146 0 obj << -/D [3119 0 R /XYZ 65.161 344.179 null] ->> endobj -3147 0 obj << -/D [3119 0 R /XYZ 65.161 333.22 null] ->> endobj -3148 0 obj << -/D [3119 0 R /XYZ 65.161 322.261 null] ->> endobj -3149 0 obj << -/D [3119 0 R /XYZ 56.693 279.784 null] ->> endobj -3150 0 obj << -/D [3119 0 R /XYZ 65.161 280.467 null] ->> endobj -3151 0 obj << -/D [3119 0 R /XYZ 56.693 237.989 null] ->> endobj -3152 0 obj << -/D [3119 0 R /XYZ 65.161 238.673 null] ->> endobj -3153 0 obj << -/D [3119 0 R /XYZ 65.161 227.714 null] ->> endobj -3154 0 obj << -/D [3119 0 R /XYZ 65.161 216.755 null] ->> endobj -3155 0 obj << -/D [3119 0 R /XYZ 65.161 205.796 null] ->> endobj -3156 0 obj << -/D [3119 0 R /XYZ 56.693 163.318 null] ->> endobj -3157 0 obj << -/D [3119 0 R /XYZ 65.161 164.002 null] ->> endobj -3158 0 obj << -/D [3119 0 R /XYZ 65.161 153.043 null] ->> endobj -3159 0 obj << -/D [3119 0 R /XYZ 56.693 110.565 null] ->> endobj -3160 0 obj << -/D [3119 0 R /XYZ 65.161 111.249 null] ->> endobj -3161 0 obj << -/D [3119 0 R /XYZ 65.161 100.29 null] ->> endobj -3118 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3164 0 obj << -/Length 1408 -/Filter /FlateDecode ->> -stream -xÚíZMsÛ6½ëWà(ÍT¾A´§fš&ÍÄi¬Cg’h–T“„JRvòï»)[”e Å4ÎäbÁàr±Ø}»K’ "èåèùlôìwIÁF1…f—H1¬4Š(Ç\£Y‚ÞßÚÔÆ¥L™$ã?]eËzxéŠzP-›‹¿¹ùsç®êþ>3ù0{ ËL)ÅFÊZÛyõ)µåÒÚªô—auŠ"X]q¿ºPk¡©ÄF7ë+ -u4~VÿP¦ü£³Ñ¿# -ê ¢H*¬ GÚP¬CólôîA \°0ºÙJfHR‚W0NÑùè¯i!‚.± Êmý=±ÜÛØ`&P+…ù>9–›Í¿*ÇrE1Û#Y}”d_Çž ¯='Æß~[»¸ï¡­Ýí§×r¤Zfà8ȇ+Púû¨þƆ(f8 Ìü`Û'ĶL¨»Ãô÷soc;€9bPÑ¿O²eZAé_•l7˜qvK¶ÑQ²}ë6yâóïÛfÙâ3a¿ Üx2šþ„){Ðìye¯mM­Ïã4Ý1ëEêæW%K.®<·þR ìM&UÒLn?`¹+²8]uj{©OXB‡ãbªàØ(†+_úû•¯þƆ—/ª)æ ZÎ\²IãBXîPpZVô¹›À¯6eå²UyôÝq(¹Q©¡ÎñáÐÑÖ߽퀽€¦ÝOj]Î:Á¯Å«ø"µ'~×P³:¾§R`b†x¹zïóSáŸ-›/ùúô?Ò¼‹c -endstream -endobj -3163 0 obj << -/Type /Page -/Contents 3164 0 R -/Resources 3162 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3060 0 R ->> endobj -3165 0 obj << -/D [3163 0 R /XYZ -11.232 900.716 null] ->> endobj -342 0 obj << -/D [3163 0 R /XYZ 56.693 759.068 null] ->> endobj -3166 0 obj << -/D [3163 0 R /XYZ 56.693 738.489 null] ->> endobj -3167 0 obj << -/D [3163 0 R /XYZ 56.693 691.874 null] ->> endobj -3168 0 obj << -/D [3163 0 R /XYZ 65.161 692.163 null] ->> endobj -3169 0 obj << -/D [3163 0 R /XYZ 65.161 681.204 null] ->> endobj -3170 0 obj << -/D [3163 0 R /XYZ 65.161 670.245 null] ->> endobj -3171 0 obj << -/D [3163 0 R /XYZ 65.161 659.286 null] ->> endobj -346 0 obj << -/D [3163 0 R /XYZ 56.693 622.135 null] ->> endobj -3172 0 obj << -/D [3163 0 R /XYZ 56.693 594.582 null] ->> endobj -3173 0 obj << -/D [3163 0 R /XYZ 56.693 547.572 null] ->> endobj -3174 0 obj << -/D [3163 0 R /XYZ 65.161 548.256 null] ->> endobj -3175 0 obj << -/D [3163 0 R /XYZ 65.161 537.297 null] ->> endobj -350 0 obj << -/D [3163 0 R /XYZ 56.693 500.147 null] ->> endobj -3176 0 obj << -/D [3163 0 R /XYZ 56.693 472.593 null] ->> endobj -3177 0 obj << -/D [3163 0 R /XYZ 56.693 425.583 null] ->> endobj -3178 0 obj << -/D [3163 0 R /XYZ 65.161 426.267 null] ->> endobj -3179 0 obj << -/D [3163 0 R /XYZ 65.161 415.308 null] ->> endobj -354 0 obj << -/D [3163 0 R /XYZ 56.693 378.158 null] ->> endobj -3180 0 obj << -/D [3163 0 R /XYZ 56.693 350.604 null] ->> endobj -3181 0 obj << -/D [3163 0 R /XYZ 56.693 303.595 null] ->> endobj -3182 0 obj << -/D [3163 0 R /XYZ 65.161 304.278 null] ->> endobj -3183 0 obj << -/D [3163 0 R /XYZ 65.161 293.319 null] ->> endobj -358 0 obj << -/D [3163 0 R /XYZ 56.693 256.169 null] ->> endobj -3184 0 obj << -/D [3163 0 R /XYZ 56.693 228.615 null] ->> endobj -3185 0 obj << -/D [3163 0 R /XYZ 56.693 181.606 null] ->> endobj -3186 0 obj << -/D [3163 0 R /XYZ 65.161 182.289 null] ->> endobj -3187 0 obj << -/D [3163 0 R /XYZ 65.161 171.33 null] ->> endobj -3162 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3191 0 obj << -/Length 2717 -/Filter /FlateDecode ->> -stream -xÚÍ]sÛ6òÝ¿‚Ó‡i&Bð»÷”ºi’6i|¶;w½¤sQÄš"t$h[ùõ· ~™¶)û|s/‚»‹ýÞ±³q°óîä‡Ë“×?ù؉QÐÀ¹\;EAèDÄEnè\®œ/³sžqVòù‚úxö«¼Ôõ(ô@nÍÃEòƒWzò‹ó?.4 BPìûÚ…W”ºˆ¸>Š"OCýJ©ßÛWÓZ«§hˆD–„s±ä…œ/àî…d)òïç Baº/DÂWUÁŒö°+å%ºÝe6(¯þÞõÕ”œ„Ô "@ uQë>åóDÅNÁuW?zÐÆWï"C{‘E µû¹ð}D2„ïc0n -†®í(¦ñØ`±qôàÜSO²–ðˆ€—ÐH±§w¡‰)¸aå´i¾åE*•IMÚÅù~`Ó³…Y¸û -˜Û†ƒ%Ó€¯ ±›¸S;– A÷"–òDñBk,×^ÝûRMڲ꣙`bJ¹@^ÌúðŸiÏ&ö !…&š°išq¤¡¬Ÿh)¹7r¾š¶‚Ѥ}K>Õ8÷r*æcìry˜ÈL¾fUvŸ•M°ï9aæžÿ»é›ÉU YÏñÑöGvÍu¬=c7eje*3ŽÖ"—hÍvivPqö¯zg"v{‘sx”±%Ïd -Yµ‚P I†]kwK¶T ýàhi¿CŽÅȇ¡!è+Æh ¸=šÈx— âÑŒñ#¹/çáúðŸéážMì2?/$¶ˆØT+Žˆ€rzà8ćö(6O6b"¿œ!CÕ°ñ;–ì‡>r±á"qGkS¡©ºžg“òñêCIÉ·ÕGZöRw=±Ækf`Ù…d¹4e‡ªC*S¢€ÒÛº&1›Y¾2ƒÕª” -#%N™nòTIøkΤŠoÝèûïòÃÁ™:…ůüF¿›‰„eé7&S‘©ë>Ó+Õ~Åä X˜u[ŒÃ~-û÷y„uAæª#ó•Ê›9x+¡'9¯­'=ª”¸H0ûÈäuÊr%70Þ–¡[Ä+5÷Ú¶Üs¢5NƒÎðÛ~ãÉÖ¼|ºMs^š Ò¬f;_™çŸD¾ñj´bçŲ~V³êƒdY;kxúÛUÁÒÜœcÀ~ô ca˜ÂøÃÅç 6ue’ÊŽ¤JÕ>0º¢k{Ët™¥bS°ýViäA¯ŠJî+‰&Ë5°'–ƒJš`Úqp4 m€ê > Mß]Û‹cäÒ°W|sÉ‹¦p·õz‹Ä§]ûFZ -Å‘‘rªú ¶Ûl  ²ÖÜådMÛc Èóݾ4£Z‰¤ÚA˜ïÈ£'„}1'Ñ rÔ²lŒ<ÍKYTIÇ¿bŸ}€_r¬½é~‰GÀa­yÁu?¦Cº`In™Ô£r›îf‚뙫'z"[`ÖûÁ$Ö\aÒ¸BM§ŽWŽý¢ð=øí?Ë2=8û0,¶ –΃¨ô aæÝÊUKU=ì«Ù˜‘jM72Q¥fßû–m×íxkläoä«|GÖ¸Ñ岯Ænº™¡¢²²j•ÖBÔZÝ¥Ãó‘O­V^f \„|ŸØM7¢X•é7þR-ä&*Ùíñî÷¹Ê.kö+c}X« -µê[ Ž¿Õ1>ÐÚDÃõk€e•b}·A×ñ*Æ¡wwð€;îæô€‘Em³¯Ë›aIY¤:ÆCdyXS\p¨Êi·kiÑŽå‹=Ûð®O~šéG*þå -V©g­^ëy+3õ°Ú«äÅn‘e)ÍB_”‘ ¾c[ÛÆ6L|ƒ -´¾Ü³„[JŠt¿o`)'÷gU²˜c?4Þ÷—Ÿ>ªÜÍÄS5øé3ü»q×pÍŽ¬z´ʇ¢ù‡,ä ,CLvj3µ¤±ÒçS³µµÊ¾Úùr£¦þÛñUÊÚŽÒÝÛNiö—1ŃrËm]šzþ0ÌX…œæ sÅ¿·,ÙŽ`€ˆ§ò=‹aÇ6u¶ï,<8‰çöC9‡‰ OŃy5QHI×Å= <ÀJ¢ÔÂ¥Þl”Õª|À±]§+~L+zv'(^2Ž!ˆIHçTîˆglIˆQÐZþ£â¤AƒF…q…A mŒó@¿ºÍ^4äÆ<ñ²€d¿ÖTx¢,DŸ¨ž~— ÉXÝäüA)ª"áß©ÝÄX ¦³Ú4`¡Ö{nkfÁâ®uªWj­–J°a½T§ìì`à•zØpU¶(Fl| ªýW dë$`D¤. -ã†y¯Ç ¡°1–1¼:qãG`´ÙàZ©9¦´Â^ë÷ ÃÍ+Úñ²jÕ¤ÑuʶðöFsd¸ ¨ƒxÚ8 ÷¾Ú2cÚ(Ë«äV%*y*"ž«.ÑjŒ^Œp›JwrÚ7µ¨ ?ûC‘n¶r -?Fat7Y/Í™jÿKg€^ëffÀ”y8$hª,Ñ7x&[¾Ùê6e7*ŽTàÀ±ØðÊAÉGC}åiâ›ß.ß>¿“9FÀ¼ yCsôÓÏg¿Ÿx÷þrLŸ1Déšáêc9¡(ðƒ~ÎðÄ’)Ñ´¸G*ŒÓ§å PfoûX`eÇUƒ!-wzª¯³I83¼nö•Èìo €:݃us5ªväúë­fʆÔ#R·y èä%ðèt-KK…ÜݧÜÖBbPn¹r‚µÃt`â߶ÿJòö›(sìã9Hq?åÛ¹ÿ È -endstream -endobj -3190 0 obj << -/Type /Page -/Contents 3191 0 R -/Resources 3189 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3060 0 R -/Annots [ 3188 0 R ] ->> endobj -3188 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 1 1] -/Rect [359.467 429.64 460.541 440.544] -/Subtype/Link/A<> ->> endobj -3192 0 obj << -/D [3190 0 R /XYZ -16.307 900.716 null] ->> endobj -362 0 obj << -/D [3190 0 R /XYZ 56.693 759.068 null] ->> endobj -3193 0 obj << -/D [3190 0 R /XYZ 56.693 738.489 null] ->> endobj -3194 0 obj << -/D [3190 0 R /XYZ 56.693 691.511 null] ->> endobj -3195 0 obj << -/D [3190 0 R /XYZ 65.161 692.194 null] ->> endobj -3196 0 obj << -/D [3190 0 R /XYZ 65.161 681.235 null] ->> endobj -3197 0 obj << -/D [3190 0 R /XYZ 56.693 633.746 null] ->> endobj -3198 0 obj << -/D [3190 0 R /XYZ 65.161 634.43 null] ->> endobj -366 0 obj << -/D [3190 0 R /XYZ 56.693 596.216 null] ->> endobj -3199 0 obj << -/D [3190 0 R /XYZ 56.693 560.058 null] ->> endobj -370 0 obj << -/D [3190 0 R /XYZ 56.693 193.564 null] ->> endobj -3201 0 obj << -/D [3190 0 R /XYZ 56.693 165.185 null] ->> endobj -3202 0 obj << -/D [3190 0 R /XYZ 56.693 118.601 null] ->> endobj -3203 0 obj << -/D [3190 0 R /XYZ 65.161 118.89 null] ->> endobj -3189 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F57 739 0 R /F102 977 0 R /F105 3200 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3206 0 obj << -/Length 2185 -/Filter /FlateDecode ->> -stream -xÚ½\[oã¶~ϯú” —¤HŠjŸv»mN÷Rà$)P`·8`dÚV£[%9—þúŽ,yO$ÇÎÈ´òË25’ó}s!ê-<ê]œ¼»>yó‹¤^HBÅ•w=÷'*ð4ó‰x×3ïËé¥M¬©ìÙ9—ôô·¼¶U{9ÏËö¢^v?¾Ï£wy~Û~ùãêÓٟנ›sÆH(e+íª~Llµ´¶®šŸ¡wæiè]ùMïB$àÚ;—$ ºþ•>}Ó~0®šO~¾>ùû„xê1O*¢Bß BFå^”ž|ù“z3ø  "ÔÞýºeêIF ÷\'ÞÕÉOh7Tl.›‹'’a>XÀ½@„„QÕHnîK -z -åqêÐ+­7ß) -Û¯ Á¦ƒV0kZ»Ê—„)6”/)#Ò¨žN³"! ìZ`¹ðÚ‹ËÎa ׶ Ö–Ø).~g=ïÊ|µXÖkØ-Ëûr®(=]¸vuŽk73µÅµ¼ë%®¥Ízí`ˆ¤»±ýÀéCšà¤Ærä¶L+\Ó|Žìº¶‘{Ç´~æ-NôÜÞãVug äÀRSÞÚR <ÜÄ–&«SÇù®õíÁ¢Çeßì_jÆÙñ¹MúúdœHßo¡ö•sÙÓ}OMðmˆË[s¶úǼ²·?œ3_’<2‰}Uä›í¾%*„$¾š}ùŽ¨pVv*„&Jv¨ø ëƒÚ5>²[ù¹*,Àg°Œp*JpˆëƒWE Àø$J³1¢ ›/¦C a ÁtÈwC»²#«ŽD/ðqô¼ÌS\Ë “Ýä Ò_]WfaLv»\­’WêW’ 'WüøÑ™]£èdz'¼5.b“Ê'RL‰, ©–Ó!«/ßYÎÊâ‘%¥$:èu¹Jlud“åej’øtx·Hòª2å#6ý…T «ôµ‘ÌQ/-RƒYåeˆ#“aÇ„]dÜ1‹çs[¼f`fò‰™ àˆ~;ùJm‹v¡~Ò( 0Úµ9Çr†`¤á·É Ý—ïigeÖ|i} ².Ü´&B’“-Vfavh>D¹þë:4¦e‡äVŸãhilò•JZ§ð—uAb×Ës«Êÿ}2õ3®*Çx8 -i`8aö% žhÊÒSÁa ß îÊâ=œ€8Uò?å),1ž…— -´KDÇšŸãd+ûÊ}¾¿Èù1OMŸk=¦aꘂÙa¾ØP,§›m“'·£ÝEa{÷¥rF$ {B¹£„Ž*‹_Ùò&Æú»y<ŒQFp”!¯ÊQB…ÀüÓd¯™ $dH40ÆB-¦‹±òÈYÙ ñ<ÛTʼnÐÜSÔ¶<î~M”gµ}@†v¥‘v¾›G²Uz3Ðwÿ&›h]Çõ°ö²Í ÈnäëâûàÚ¦Á{\Á;ƒÈ›M‰wʉâ½/ßïÎÊŽÀ;•0ÕÞM‹2¿Ãw¶¬†[~G8Ø—ñͪÎËC]§†`¬ê5¡ä -8šÞ›U×ÿ´Xú`MVmaiu;K¾ -åþtXòaÈTM‡¥|7,¹+‹Ç’Q‹¿)þ¿-Š$ÆB©0õ õí~`2äTûh×>¡Át†Ï›© dس|Hl%ô¹5ð8ŽƒQH“Ì´\1ÀDé\Î;è\oŽWÍó.Oï›jÜúÖ&ÃYYš3tÆäi÷ĵY{•šYwÂúo§¶ÚZŽÿ¤o¦ µAb´KG_ú>i¶‘^ÅYdÇÂÀX9¡íuÙ&#ý9çàv¸]hDNU076©ÈC…%.8Ü6œ÷Š0NFùnÄá®,ž8¸â»€?­­IÐv– ËÕØcMK7UÕY®5«í=Ú=ÁñÚ0Ñ:W+lQ°^šÚi|/#d}J‰MgÀ}ùŽìªìns>¾ÞÔp$ݽÖ÷K›aÒ!­(¬)‘e.¬AtEž¡7{g“­êYÃ×{‹Qquä}3ŸÛ]I¼y¤(óÂâÛFvÄIáalþ2~TSqšÎ—ä;Ú·³²#ì;h¶ýZóÎËEfR{\‡d°›"1öŒ61ƒLkyxY”)Ÿhùº>G€›ãS•8š<.«ËÇ1^ÇgD06¡Ûá”9!,ûòaé¬ìXr¦zó–å<ΰ~'É <®êbU¿Ò˜òý[›™©ÍˆŠÈ€,ñ/•Ø´H†ÇŠAÌX ЈПÎDûòMÔYÙ&Ê8 tW‰FGUŽu0‘©ìao vw¿ÛmCϽ–·¿ÛŸïØĦ`ÛÕsí¯ì( Ë(Îæ96,[Íç#Ó1[G[ήñß#-½ÉxþÿÄÑ ½/ÞÍÎUaæ ¨ÞóAà@ÃX¬*ƒ>‰†®aÅY”¬fHe¿ütÜ<%ÊËÒVE9?–¦‹áU÷7˜GÜt)ÿt[µ}ñnpV€½yCç}ŠÄu|‡\«‹U<³ãéòúýÅsu`l讑zŠ}Ý­ÿ*!(¡*<äŸJü ‘õ[¤ -endstream -endobj -3205 0 obj << -/Type /Page -/Contents 3206 0 R -/Resources 3204 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3239 0 R ->> endobj -3207 0 obj << -/D [3205 0 R /XYZ -11.232 900.716 null] ->> endobj -3208 0 obj << -/D [3205 0 R /XYZ 56.693 759.068 null] ->> endobj -3209 0 obj << -/D [3205 0 R /XYZ 65.161 752.393 null] ->> endobj -3210 0 obj << -/D [3205 0 R /XYZ 56.693 705.992 null] ->> endobj -3211 0 obj << -/D [3205 0 R /XYZ 65.161 706.003 null] ->> endobj -3212 0 obj << -/D [3205 0 R /XYZ 56.693 658.929 null] ->> endobj -3213 0 obj << -/D [3205 0 R /XYZ 65.161 659.613 null] ->> endobj -3214 0 obj << -/D [3205 0 R /XYZ 56.693 612.539 null] ->> endobj -3215 0 obj << -/D [3205 0 R /XYZ 65.161 613.222 null] ->> endobj -3216 0 obj << -/D [3205 0 R /XYZ 56.693 566.543 null] ->> endobj -3217 0 obj << -/D [3205 0 R /XYZ 65.161 566.832 null] ->> endobj -3218 0 obj << -/D [3205 0 R /XYZ 56.693 509.001 null] ->> endobj -3219 0 obj << -/D [3205 0 R /XYZ 65.161 509.482 null] ->> endobj -3220 0 obj << -/D [3205 0 R /XYZ 56.693 462.409 null] ->> endobj -3221 0 obj << -/D [3205 0 R /XYZ 65.161 463.092 null] ->> endobj -3222 0 obj << -/D [3205 0 R /XYZ 56.693 416.018 null] ->> endobj -3223 0 obj << -/D [3205 0 R /XYZ 65.161 416.702 null] ->> endobj -3224 0 obj << -/D [3205 0 R /XYZ 56.693 370.3 null] ->> endobj -3225 0 obj << -/D [3205 0 R /XYZ 65.161 370.311 null] ->> endobj -374 0 obj << -/D [3205 0 R /XYZ 56.693 333.368 null] ->> endobj -3226 0 obj << -/D [3205 0 R /XYZ 56.693 305.959 null] ->> endobj -3227 0 obj << -/D [3205 0 R /XYZ 56.693 260.067 null] ->> endobj -3228 0 obj << -/D [3205 0 R /XYZ 65.161 260.356 null] ->> endobj -3229 0 obj << -/D [3205 0 R /XYZ 65.161 249.397 null] ->> endobj -3230 0 obj << -/D [3205 0 R /XYZ 65.161 238.438 null] ->> endobj -3231 0 obj << -/D [3205 0 R /XYZ 56.693 191.759 null] ->> endobj -3232 0 obj << -/D [3205 0 R /XYZ 65.161 192.048 null] ->> endobj -3233 0 obj << -/D [3205 0 R /XYZ 65.161 181.089 null] ->> endobj -3234 0 obj << -/D [3205 0 R /XYZ 56.693 134.015 null] ->> endobj -3235 0 obj << -/D [3205 0 R /XYZ 65.161 134.698 null] ->> endobj -3236 0 obj << -/D [3205 0 R /XYZ 65.161 123.74 null] ->> endobj -3237 0 obj << -/D [3205 0 R /XYZ 65.161 112.781 null] ->> endobj -3238 0 obj << -/D [3205 0 R /XYZ 65.161 101.822 null] ->> endobj -3204 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3242 0 obj << -/Length 2051 -/Filter /FlateDecode ->> -stream -xÚÍ\[oã6~ϯÐv_’EÃáT/ ´ØE»Ûíä¡À´´LÇDdÉ•ä&é¯ß#KNÆò8CšfЗ±"SÈó+Ç8»ÍpöÝÅ·7oÞ -œå(—Tf7‹LR$U¦ CLe7óìýå϶´¦µW×TàËÿÔm‡ËEÝ Ýrüò_uñm]ß üòßn¾‡i® A¹ڻíÒÚ®í¿†ÙI¦avÉúÙ¹THQ] ”«q~©PéË7á²ðâß7¿_€ÇÉ„D2g™Ê ’˜fÅêâýo8›Ãw â¹Îî·#W™ Q&áºÌÞ]üï+®È›çˆ`9Èô+¥b+Åî±7oaÈö=xÿŒF\jøbXÀzf›îêZb ¯o»ºúâêšPø³s¬zhË Ö©ì?¾ÛCØ¢h¦XŽì ¼a_`X/.3Šrg;ÒÚÇïN@5Jï&€I?:_ "É_`‚,•Ï n·D9ÍÏ ì°¹Í†‹ŸÇýßÛËàŒ -Çýÿf>ßÛþCœìýv¿»hmѹºÚoƇ^ºjQ ß*‘Ÿ8íf½®A'àÈWû¨@–8BûŽ|§fÀ%zí~tÅÒØòW,p·‚ÉÈÀ•ë–'óDBæLÆ?©‹ñdü›àÇñ/^XþI-¥ô‰v~ºÊÜû4¯EÝ4Àk¿ÁKSÍKWÝú®~ãÀ¶øìj¿qàèW¶³êÒLÞÿÓìQ (™N¹÷ñ#•;ZØåVÑ>ê•»¨«Î¸ÊoÒùŠ¹m [Í·BÌ6ž|¨<õ1@ØbéÊyc«S=›”a¢Òiæ>~¤f&v\ ébÀ ~äbD @Si3™›¥ó$F»¬7¥§»šy*übÓ@ÞÕxG¡®òv˜õ©öÿ¨ -ñ“ÖsQMõ¸Ovšc$‡t ™{ôc–P  -÷<ðÀŒz˜ HÅpž§cÉ>~$K¢… ` §°ºcöþјâÙ0ÛÝoª¹¯ÚÆ“2ÆwຩgfV>úòeå‰[û3v]šÂ— ÷þKк•+Mªéf“„)É|¤žÇŠ æŒ Nõ æa!þ4Í€´ò¨|kº”§åRG ×ùj ¼–9ÈÛBb4 - /ÈkV$fS~JõÁl×ý9Ô¾·¦jŸ«~kPq9C\ˆtI<ÏÓ%eü8~Ç ëOp¡RzÜüë¹[¸åÝnïWÇùö´ÏÏêþÅñÑ`É2˜¾ì(}óĹélç&žêE?Ü[©•oˆ×Ù¸¬Îž· q_7w¾J@Ö.XºÜe‚©ÍÑÂh³âHÓ1w1M½ñ°~1¥©|+·§w!5<]i™öëªDþ¡uŒ")F‚÷¯)¹ †—zûß±Qõ¡ÀÙ5e(Wt— Ú]S¬,ë+*.ïû``{«€Øàv×4[š+Š/ÿ¸"âr|bfóÛ«•™÷€OµíÜ ìóÜDs¤”ÜyšÁÿOä#qHTñ®¢´Cn]UØIÛ4˜"<\7C³í¯Ä5ÉsD)—†©)=o¬¨W뺂$!À+rÐf–“t^‘Kp»Œ%³#ü8;/¬¿á0§¢m°µiÌÊv¶iÏë F‚øpâúZûûÆöLñßt®tÝc„§ 0”\b 6Í(˜3QgŽ‚ûþEã!³S\'d<D®ž3Ád|´°Œ§áÝiŒ€Î[XLèÝz;ßË4ÖäÐýðÖžÜDçX"бìÁGjY¬¨J¸„ŒÕ”ŸŒoÃÖ·YºpgVÃÃXw{ûïD*!L^øà…ä0½&¿©ï“Íþ˜„¿3¤ù«–c˜m&"ÑaW•®².‰AÜL¸Lç’˜$ˆèt]É ~œ±ˆÖßZ0 ùâ‰]ÒÊtÅòÌfc 1p]Ç8¯‰XxŽkŸjžêè˜ÐˆäúU “ªó槥k»3bŒJ$†S¨‰ÌHðt!Ä?Ò,D `ˆ†x…üEΈµkSL[B ×ןúRˆ)÷ÙyjÀ˜Æ™Yi{…žNñùËS¬í‰aÑ g>ru ¡0—co;C(q’P;ÓŸ5xêýí0x¿7v†jŒ´ÈÓÙÚ·%“Y™=ô8+¨¿…¡ŠA3nüvÃ<Ýþí½›ÛCS@>Aí&¬)}îlÚ(±_(œ­›LEç¼Oñt]ãf›ÃrØõKŹ“CÚ+ yÕœ…rþÜE<[ñ,8W¡L J¶‘)刊tmä ~¤Áˆ6ÀdPЮlî|O´ºÎôÿoÄ“HÕfŽÅ7àqžu‡™›•®¾mÌzù`>*Ìù·¯…övï”D嫦}»‹ð3§Ûz¸·³/¯ž›"è)ÁûäB#¡æDi$Iº¼b‚Gáxaý)L4A9&M¯ÊÞ{Ÿ7\8ÿÓc¡Í4ï„Ålæοëe|Ü×ͼužÜñ"J I_µãECŽÑ¢ú30Çàêy ûMSÔ{ý¹ótžþ¹>€ ¦æˆÅýÀ‘σWàa™ŸòÛ -ÿîþ"ç -endstream -endobj -3241 0 obj << -/Type /Page -/Contents 3242 0 R -/Resources 3240 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3239 0 R ->> endobj -3243 0 obj << -/D [3241 0 R /XYZ -16.307 900.716 null] ->> endobj -3244 0 obj << -/D [3241 0 R /XYZ 56.693 742.141 null] ->> endobj -3245 0 obj << -/D [3241 0 R /XYZ 65.161 742.824 null] ->> endobj -3246 0 obj << -/D [3241 0 R /XYZ 56.693 696.892 null] ->> endobj -3247 0 obj << -/D [3241 0 R /XYZ 65.161 697.181 null] ->> endobj -3248 0 obj << -/D [3241 0 R /XYZ 65.161 686.222 null] ->> endobj -3249 0 obj << -/D [3241 0 R /XYZ 65.161 675.263 null] ->> endobj -3250 0 obj << -/D [3241 0 R /XYZ 65.161 664.304 null] ->> endobj -3251 0 obj << -/D [3241 0 R /XYZ 65.161 653.345 null] ->> endobj -3252 0 obj << -/D [3241 0 R /XYZ 65.161 642.387 null] ->> endobj -3253 0 obj << -/D [3241 0 R /XYZ 56.693 596.06 null] ->> endobj -3254 0 obj << -/D [3241 0 R /XYZ 65.161 596.743 null] ->> endobj -3255 0 obj << -/D [3241 0 R /XYZ 65.161 585.784 null] ->> endobj -378 0 obj << -/D [3241 0 R /XYZ 56.693 549.197 null] ->> endobj -3256 0 obj << -/D [3241 0 R /XYZ 56.693 522.037 null] ->> endobj -3257 0 obj << -/D [3241 0 R /XYZ 56.693 476.996 null] ->> endobj -3258 0 obj << -/D [3241 0 R /XYZ 65.161 477.679 null] ->> endobj -3259 0 obj << -/D [3241 0 R /XYZ 56.693 432.594 null] ->> endobj -3260 0 obj << -/D [3241 0 R /XYZ 65.161 432.036 null] ->> endobj -3261 0 obj << -/D [3241 0 R /XYZ 65.161 421.077 null] ->> endobj -3262 0 obj << -/D [3241 0 R /XYZ 56.693 375.144 null] ->> endobj -3263 0 obj << -/D [3241 0 R /XYZ 65.161 375.433 null] ->> endobj -3264 0 obj << -/D [3241 0 R /XYZ 56.693 329.107 null] ->> endobj -3265 0 obj << -/D [3241 0 R /XYZ 65.161 329.79 null] ->> endobj -3266 0 obj << -/D [3241 0 R /XYZ 56.693 283.463 null] ->> endobj -3267 0 obj << -/D [3241 0 R /XYZ 65.161 284.147 null] ->> endobj -3268 0 obj << -/D [3241 0 R /XYZ 56.693 239.061 null] ->> endobj -3269 0 obj << -/D [3241 0 R /XYZ 65.161 238.503 null] ->> endobj -3270 0 obj << -/D [3241 0 R /XYZ 56.693 192.176 null] ->> endobj -3271 0 obj << -/D [3241 0 R /XYZ 65.161 192.86 null] ->> endobj -3272 0 obj << -/D [3241 0 R /XYZ 56.693 146.533 null] ->> endobj -3273 0 obj << -/D [3241 0 R /XYZ 65.161 147.216 null] ->> endobj -3274 0 obj << -/D [3241 0 R /XYZ 56.693 100.889 null] ->> endobj -3275 0 obj << -/D [3241 0 R /XYZ 65.161 101.573 null] ->> endobj -3240 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3278 0 obj << -/Length 2216 -/Filter /FlateDecode ->> -stream -xÚÍ\]oã¶}ϯú´û.¿%ö¢@?¶[t{o‹ÛM lû Ët,Dµ’'ÿþŽ,;Ëk‡Ec;2=IgÎœ!GÆÑm„£_®~¼¹zóNàH!%©Œn‘¤HÆQBbqt3>¾úS:môëk*ð«ßM«›þíÂÔý›v¹ûð­É~4æ®ÿçþýúŸ›÷0Í5!H Ñ[ûÐ>ºYjÝ6ÝÇ0;‰˜]²nv.cÓ$ºHÅ»ùeãäÕ›þ…PÙ}ñê盫OWÌãˆDB"©X+‚$¦Q¶ºúøŽæð8€¸J¢Ívä*#Ê$¼/¢Wÿ½Â»+O^‘½m®Á²÷éoJÅÖ‹ý×Þ¼ƒ!ÛóàÝwÄeôÐÌtݾ¾–Ã駭)¿}}M(ü›®[Óš =4Å¿úUZ§+ô°Ñ³ƒºlûùàJvSv/¿^¸s$¦QÌÀu¡ºkЮ(—E*QQ­£Åó“>°öå£ÇÐ'ã½Q‚·úÙˆHòܶÀÅpm¬?‚D -Œø9¹5VßFý›?w¨8¸Ã{‡E4IúýÃ|~Šc;ÑÇí=mÖUeêÖnpgV?¥å<= ->¡Ýãï¼ÊK‡Á€R;/Zc{Zvãnþøé„›/‡•ê -'^O³æ(fÓ’DfV•):š°âRŠpJx`ß3¢½uˆhPŠ˯"‰äåâ¨ÔyóŠã´ ë»À@Êø¢A 2%cdàÛô>Ÿ÷1üS—2ë}o›ñí²ÄÏp‚(¨©ŠAî„Óû~!ìï¬CƒñNþ'½ÓÓ>Âði­›ãˆð_`MËf£kK«3½LïõÄ]Kµ¢Ü¤–‹ai3vAéÅ£Š#ø»$³Ð ³Fü>¯ïÒžY~3¾ÛK‘7­K7• %2`7å¡p¸n}OVñvÖžU(`€<Û9´m*[åM“—·>zgö觖Um2=_×®m”C°‹®öP -‚ÅãÑVÿ,Ÿ¹y¶{37Y×9ô„ççn€þ+×yc¤Â.MâŸó¤ G ×0°ï×ÞÎ:Ä5!(Ù·$;ÄuÉW@Ö„Ñí+/훲ÌÔsël×ýð Þr¹!oÓ£&¹ÓWº{È|lùA@xŠ8œJØ÷ý¿³¸•œìêÜßõÆn·uZ-ÇÞ¼Ó¨HK[ñk Ýu]Ú†³-gÖ©Ù>Š4OÞ…¬±¿­q|ƧÏwýo@"?£' - ©ö©÷oÌ÷£’g£bÄ!Vwc®mC;!@^Xèú:Œ›óŸ‡ûᜧÂÝÖêSà9•ç -êP „!ö Ü…w…ò7¶W=HŠpŠì{ª·³ö„Jb8ÄwÅámÍ™¹uÍÝXkøûÜZÇØÚû´LíF¾½7uzgîSÇþ”}.›‚X".Ü1Üu…B~XWõáQðÉm¢q¸}ϸövÖ!®‡ ;îtNOt¸îÿ:÷ -Û®C.Œi¿.ÏÇu9Þ± 49xžû4s`¬¦¥¡¼,òÒ¥sŠDÜ°£p¸&‚Có~üâíª=½(ŒˆrmZY˜Š¸<-öÐ겱߳°^®Xér-Mnûk4imÝ˶Â*¬+(ýéêÌsw/‚?aHi8?úY;ŽîÛ:]ÕîÿSø -endstream -endobj -3277 0 obj << -/Type /Page -/Contents 3278 0 R -/Resources 3276 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3239 0 R ->> endobj -3279 0 obj << -/D [3277 0 R /XYZ -11.232 900.716 null] ->> endobj -3280 0 obj << -/D [3277 0 R /XYZ 56.693 742.564 null] ->> endobj -3281 0 obj << -/D [3277 0 R /XYZ 65.161 743.247 null] ->> endobj -3282 0 obj << -/D [3277 0 R /XYZ 56.693 698.188 null] ->> endobj -3283 0 obj << -/D [3277 0 R /XYZ 65.161 698.871 null] ->> endobj -3284 0 obj << -/D [3277 0 R /XYZ 56.693 653.812 null] ->> endobj -3285 0 obj << -/D [3277 0 R /XYZ 65.161 654.496 null] ->> endobj -3286 0 obj << -/D [3277 0 R /XYZ 65.161 643.537 null] ->> endobj -3287 0 obj << -/D [3277 0 R /XYZ 65.161 632.578 null] ->> endobj -3288 0 obj << -/D [3277 0 R /XYZ 65.161 621.619 null] ->> endobj -3289 0 obj << -/D [3277 0 R /XYZ 56.693 576.56 null] ->> endobj -3290 0 obj << -/D [3277 0 R /XYZ 65.161 577.243 null] ->> endobj -3291 0 obj << -/D [3277 0 R /XYZ 65.161 566.284 null] ->> endobj -3292 0 obj << -/D [3277 0 R /XYZ 56.693 521.225 null] ->> endobj -3293 0 obj << -/D [3277 0 R /XYZ 65.161 521.909 null] ->> endobj -3294 0 obj << -/D [3277 0 R /XYZ 65.161 510.95 null] ->> endobj -3295 0 obj << -/D [3277 0 R /XYZ 56.693 465.891 null] ->> endobj -3296 0 obj << -/D [3277 0 R /XYZ 65.161 466.574 null] ->> endobj -3297 0 obj << -/D [3277 0 R /XYZ 65.161 455.615 null] ->> endobj -3298 0 obj << -/D [3277 0 R /XYZ 56.693 410.556 null] ->> endobj -3299 0 obj << -/D [3277 0 R /XYZ 65.161 411.24 null] ->> endobj -3300 0 obj << -/D [3277 0 R /XYZ 65.161 400.281 null] ->> endobj -3301 0 obj << -/D [3277 0 R /XYZ 56.693 355.222 null] ->> endobj -3302 0 obj << -/D [3277 0 R /XYZ 65.161 355.905 null] ->> endobj -3303 0 obj << -/D [3277 0 R /XYZ 56.693 310.846 null] ->> endobj -3304 0 obj << -/D [3277 0 R /XYZ 65.161 311.529 null] ->> endobj -3305 0 obj << -/D [3277 0 R /XYZ 56.693 267.712 null] ->> endobj -3306 0 obj << -/D [3277 0 R /XYZ 65.161 267.154 null] ->> endobj -3307 0 obj << -/D [3277 0 R /XYZ 56.693 222.095 null] ->> endobj -3308 0 obj << -/D [3277 0 R /XYZ 65.161 222.778 null] ->> endobj -3309 0 obj << -/D [3277 0 R /XYZ 65.161 211.819 null] ->> endobj -3310 0 obj << -/D [3277 0 R /XYZ 65.161 189.901 null] ->> endobj -3311 0 obj << -/D [3277 0 R /XYZ 56.693 144.842 null] ->> endobj -3312 0 obj << -/D [3277 0 R /XYZ 65.161 145.526 null] ->> endobj -3313 0 obj << -/D [3277 0 R /XYZ 56.693 100.467 null] ->> endobj -3314 0 obj << -/D [3277 0 R /XYZ 65.161 101.15 null] ->> endobj -3276 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3317 0 obj << -/Length 2664 -/Filter /FlateDecode ->> -stream -xÚÝ][“Û¶~ß_ÁIº;Ó…q'™Lâ¦M‰;®½3錓ˆ‚VŒ)R%©•7¿¾à­^R·AP¦}±´xxH|ß¹á€ÆÁc€ƒïo^?ܼú›ÀAŒbIeð°$E2 " ƒ‡yðñö½Î´ªôÝ=øöE­«îë¢(»/õ²ÿñ»"y]Ÿº?þõáÇ»_~0—¹'ÅBtÒ>ÔÏ™®–Z×Uó³¹: "suÉš«s¢FÁ½@qØ__ÆF`ݾê>•Í‰7}¸ù÷ 1âq@!‘ŒYÆILƒduóñÌÍoFÄã(ض#W Q&Í÷,øpóÏÜ? Ó^ž6¡?å;ÒÈYY …ÆñÞ©–úqcÈ1uHÍ#ÿêðô¶6S׺„MÞJ%Ë4×åóA_!¨Ñ•ÌÜFäbt|îÆ1½Ó–œ ,ø9î'5ŽXg?cë•ù—tŽæÃ*­—ƒRóU‘£ÿÒäô`F›˜zô:#˜?ºŒå;ÒÅYY ºP°ÑnfÿÒX@ç`ÆÎ3°9†ú…:­M 4ñ ¹‰Í§ÜüÓAú·§lU™OoîôY‰Úì¸ÊÓg¥«uQÖjÑvÎ;Ílðû÷X¾#¸•µ7¡Ær‘ÝuºÆGñJ›‰¬¦3òõñ™üIC¹ÒfS¯7õ…ú!pœÇi¼v‘gÏ°‘éÂ2"q„(ÞX0‘ïÆwe-X`4C¦Ù‚Û"Ô­õç:S3 xÓ -Ê€%î+ñ›.4Ô%¤‹3óÓF8>©7*ƒ’!)L–Nì€Qˆ¨ð—kOä;RÂYY8%DŒ‘à}ô«,B“)h¿9î -ƒŸr›VÖᇆfè;4úã.ûp:¿—'QP ³ì€¹;MŸP"û˱'òéãªìa²„1QŸQ7ißa„½+õSZlªìÙà·ºÔ6(®Á -Ézµ®Ÿ/ z?ÎÈÝÉŸ&ˆAc‘?‚Œå;ÄYY ÿ"#ÔÖ[Êl0(‚‡9àXÿws–P{žnµu( U7ŸŒÇ×,¶ #ÎÄ…×z>—zaQcÔ(256A"$ˆ¿2ÄD¾£5pVÖÂP‚"Ü—!¾Ï¡%¶ÚøšLÕúÂå°7—]¾P¥VSJ¾:ìnšá•®ÏË r…ð˜èå;âÌYY œ¹ïýwª¬/[›]¤Ÿ/ŒÄÙæqßÒ̈ … ¬³zÇ#Î+€ù°úeñIïÄY+‚C™#ƒ”kú"$½°/j½òZ=êÆ!õ­I±Z¹ÎëÇæéSZ¥ÝÚP¨ÒI[kµpe<4÷Åþ\—…þV‹ÆâÝ Œ³ªpûÂ%G˜DÖ~Ì蚘¤OE -íbج³4»ÑtTu»ÔÀøQçºT»kPG2²ÉͬêºLg›ZWû¬éŸ;šmç1 -CâücùŽèwVÖþ‚!läöjéÞ§}Ü[-‹µ^l²ÝòÈ—üå` 8+*(‹ŽøU‚…#A¢0bWõN”¡HÆžÚL`²RÙ ß³Nm¼a(ÆÒ£×ÁF÷WoœÈwdž³²ÌÃÑ!~Ûtw^¶¨1Ÿ-6y’¥0b~÷è"ŠòП™æµÎ§Ž÷¨whOû6« ŽîÖçErf>p’j,&Oþ -‹ùnLpWÎ Dþ°h [xãç,YÍmèP›Ë³ÈÜb|Õb3Ó†#áÉÅteHmžóbmáa˜Q‘P%:Æù+ÑMä;òÊYY ^q3Ó‚xô0VŒ‚;°[m¼Z“õZ«òÂyÝR=ï§Ýîq¾Ï‘qD±¿2ãD¾#Wœ•µà - û2#tbw}:hy¯«º(ÁÑÈlØ¿l*š§¥2üL%Ÿ.ˉuê°5ÁÆ3‚(¹j1’á1L=ùâ}EIç R46*3µG…ÈãšúX¼›ÕqVnthŒ‘”öµÇ\[m[=߬ªK•Ô´Ì‹ýëÖǶ;©Yv0Ñ; ÓP"N©?å;âÈYY …1 -q_az³¸J»*`@~ùÞ¼ââ½ûp¸Q*Ó+CuÍ-º?“^»Y‚péomg"ß‘ÎÊZCF(ìÓâyZ™çùg»†Õ¹;½Ú¬×¥®*ó+8Ø_¢=‘ïˆ2ge-P&L¼÷‰ök¨Mœ¼ªXé:]A×@ž‹ l`©á}ø^ú­· -l%¡Þ4¸Åh©Î§Ùip†÷—BOä;²ÀYY p‰"6¤ÐËiSschØÔpŒ„¸jÚFIˆ$÷•¶%ËMþé¾yÑÆ‹¼í±TëešØt‰Pó$dè1S#±D¡¿{,Þ ÜΪZ`c„qŸ©ýn’€îPÐ -ŒÀíÿY9×UR¦ëÝý¡îýp+=OU1ûUCcŸ4¯j•'Úvc‰„“GèŽå;b×YY8xI#Ìûì0Í¡%ºJ7åh‰¾×&Ý[¤ÙÁ¬ÈyEpSùë^ª,77™«Õ™ñþi^„EØ_r8‘ïÈ ge-xFh(šø/†Jåɪ.¡ÝÐ=co¾³|िOtpîDgó3Uí¡ìi*J†"î/ƒžÈw¤¢³²T”!"¬Ï Á¡xºv¡«h_¢!¸›²oœô½‘zo‹î¥yï N×æO³HPEþ2ð‰|G9+kÁ¢¦Õ&^Šqnôÿg—! -¾þC`µw†pbPãïåùŽÐvVÖÚ\ Jø—ª‚×?³Lg—†Y©ð*P÷†Wè[÷ÀMZÀ$΢ýæ»K§þ™~TY³JœXJÌü(ýuOä;òÀYY 4=QÃë•TJ\13Ó`Ç1¿¬Ì÷Õ€x´Îvv0¡]µÐzÇòÑ묬z)C4î;½wú÷OG¾pûØ,¬mnšCaTêEš· •çWå^ÎñT¾¶3ÜU½|,ßäÎÊZ€œPĆ÷éŸgyÞVjc¦°DøªklC„ËktFŽ$ïû߸±z2>ç?ø.Øºß -endstream -endobj -3316 0 obj << -/Type /Page -/Contents 3317 0 R -/Resources 3315 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3239 0 R ->> endobj -3318 0 obj << -/D [3316 0 R /XYZ -16.307 900.716 null] ->> endobj -382 0 obj << -/D [3316 0 R /XYZ 56.693 759.068 null] ->> endobj -3319 0 obj << -/D [3316 0 R /XYZ 56.693 738.489 null] ->> endobj -3320 0 obj << -/D [3316 0 R /XYZ 56.693 691.479 null] ->> endobj -3321 0 obj << -/D [3316 0 R /XYZ 65.161 692.163 null] ->> endobj -3322 0 obj << -/D [3316 0 R /XYZ 65.161 681.204 null] ->> endobj -3323 0 obj << -/D [3316 0 R /XYZ 56.693 634.09 null] ->> endobj -3324 0 obj << -/D [3316 0 R /XYZ 65.161 634.379 null] ->> endobj -3325 0 obj << -/D [3316 0 R /XYZ 65.161 623.42 null] ->> endobj -3326 0 obj << -/D [3316 0 R /XYZ 65.161 612.461 null] ->> endobj -3327 0 obj << -/D [3316 0 R /XYZ 65.161 601.503 null] ->> endobj -3328 0 obj << -/D [3316 0 R /XYZ 65.161 590.544 null] ->> endobj -3329 0 obj << -/D [3316 0 R /XYZ 65.161 579.585 null] ->> endobj -3330 0 obj << -/D [3316 0 R /XYZ 56.693 533.319 null] ->> endobj -3331 0 obj << -/D [3316 0 R /XYZ 65.161 532.76 null] ->> endobj -3332 0 obj << -/D [3316 0 R /XYZ 65.161 521.801 null] ->> endobj -3333 0 obj << -/D [3316 0 R /XYZ 56.693 474.294 null] ->> endobj -3334 0 obj << -/D [3316 0 R /XYZ 65.161 474.977 null] ->> endobj -3335 0 obj << -/D [3316 0 R /XYZ 65.161 464.018 null] ->> endobj -3336 0 obj << -/D [3316 0 R /XYZ 56.693 416.51 null] ->> endobj -3337 0 obj << -/D [3316 0 R /XYZ 65.161 417.194 null] ->> endobj -3338 0 obj << -/D [3316 0 R /XYZ 65.161 406.235 null] ->> endobj -3339 0 obj << -/D [3316 0 R /XYZ 56.693 358.727 null] ->> endobj -3340 0 obj << -/D [3316 0 R /XYZ 65.161 359.41 null] ->> endobj -3341 0 obj << -/D [3316 0 R /XYZ 65.161 348.451 null] ->> endobj -3342 0 obj << -/D [3316 0 R /XYZ 56.693 300.944 null] ->> endobj -3343 0 obj << -/D [3316 0 R /XYZ 65.161 301.627 null] ->> endobj -3344 0 obj << -/D [3316 0 R /XYZ 65.161 290.668 null] ->> endobj -3345 0 obj << -/D [3316 0 R /XYZ 65.161 279.709 null] ->> endobj -3346 0 obj << -/D [3316 0 R /XYZ 65.161 268.75 null] ->> endobj -3347 0 obj << -/D [3316 0 R /XYZ 65.161 257.791 null] ->> endobj -3348 0 obj << -/D [3316 0 R /XYZ 56.693 210.284 null] ->> endobj -3349 0 obj << -/D [3316 0 R /XYZ 65.161 210.967 null] ->> endobj -3350 0 obj << -/D [3316 0 R /XYZ 65.161 200.008 null] ->> endobj -3351 0 obj << -/D [3316 0 R /XYZ 65.161 189.049 null] ->> endobj -3352 0 obj << -/D [3316 0 R /XYZ 65.161 178.09 null] ->> endobj -3353 0 obj << -/D [3316 0 R /XYZ 65.161 167.131 null] ->> endobj -3354 0 obj << -/D [3316 0 R /XYZ 65.161 156.173 null] ->> endobj -3355 0 obj << -/D [3316 0 R /XYZ 65.161 145.214 null] ->> endobj -3356 0 obj << -/D [3316 0 R /XYZ 65.161 134.255 null] ->> endobj -3357 0 obj << -/D [3316 0 R /XYZ 65.161 123.296 null] ->> endobj -3315 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3360 0 obj << -/Length 2383 -/Filter /FlateDecode ->> -stream -xÚí\[ã¶~Ÿ_¡: Ô ¯™^€¦›&Ý$º3@ ìæcѶ:ºx%yn¿>”%gÆòxæHÝvÑ—¯LQçûÎ…‡ÂÁ2ÀÁwgß\ž}õW…THÃàr„…Q C, -.ãàÃù{“]™73*ðùß‹ÚTíÇEQ¶êU÷åÛbþMQ\·ÿù×Åo~¾|g§™‚”­´‹ú>5Õʘºj¾¶³“@ÚÙCÖÌÎÃET3TÔÍa+0’ç_µ ›ž}{yöéŒXñ8 Q¨X)‚BLƒyvöágÄö;«âJ·Û‘Y F”…ös\œýã w+­ŠÍÇæÏwO$Ûõ  "®Áa#¹¹.°Õ“‡EJª 4Áâ¨(èL"£Ý­`ÒŒv•/ I_¾ÀE¡Íðt™C¤¨š@Ù­Àr´Þw–háÖøÖ;Å9AœuÖóç86ñöñ—|˜…ŸW›õº(kØຎ³¦øýåO?õÜÄë?hp¸.‹µ›ªJò%l|±Ø·÷”÷ ¹³o!"¥?ûÞ—ïhßÎÊ°of * -[û.Êe®3 i ÁhØ°ù*IãqOÿèÌ›zÕ³V{“¨½0ŽˆR.œ{äï¡ÛÛ9Æl0kÆGJÅžî½(·†ÛÁ?%ó•6éG,pÙÉ›í -\dI½úúÍŒÐí -oòëÙ¼ˆ º«Rà*„ªñžþO(í7ŠxfO¾0Ý•…3”Ù€£}¼ÿ\™fó_.MnJ]›#fÿÌïÎS³Ôi^ÔÉ|Я’ü¦SdŠ¼ÈûóÏŽÏÿ`J ÛÔy<Ð]„F˜QV¹/ßÑ*•`•‘̉j­òËM5Ä`’xÀàžwyyð"I ÜqAÍQ§Uqõ×~wtx«òbR_{ ðG°;{ Mýíí‘xšB!1ÐÜ—ïMge@Ó.³·Ð¬Á#É«Úè©#/Ë/sp8ßÏkºË_¼à|÷‡ã£w>1>4»?}ñ2ò®t5€ZF'r¯›=·9/áþÌ~_¾£Ù;+;Àì…MÐ1í˜M½Þ“îÆiLœòÖ+]»1ðë®àß› -8Gß;§hî_Žâwç$r`˜M¢…ð˜}ùŽ€qVv`¸Íøy—d£·@0#AØ]ŸÍ^FÔnnzÄ@â¾ûÕm¶ /hÙ®­IMfò>d_Ç Q¡?<ìËwă³²ð@â’ïâ&(ƒ¯ôra5¶R†(ŽNYƒ²£ˆ5¨·úƦxÛ[þKi9¥ÜžîJ³PrªùRú«9‰ÈÞõceor(ôä»AÁ]Y8„´æ&»¯ïuC#$Bw:ÌpdäÙƸªi£s›­«©ýØ%6³C–©ò ßOƒ&g6`¹¡NêÔŒ¥@E“S2  §dÀ4©êjrn)Ã#2†$öWßìÉwd@ge0  ıTǶ{;ƒ~¡Ô°>(0¼ÈvÑoe±Éc(Ó–´w£ËD_¥¦1æ©ÙÑf™®kèî:8mlôÖ9蛢Wȶ–$žXg1Evœðsܶš(ùdT„¸Åa7f¥J‘äþjŸ=ùŽ°uV[),\C;—ͺ”6K*&Ë+hU) Eiƒ¥¤6#õnUgésÄÕìç®aÛŸ6Iy ÄaVÄÀv—úEn|®š÷:FˆBRðS \Eˆ 9eÀðÉZ®L= fà2B!æþ‚ÙÛåþ*j=ùnìã®,K$üÕöÅ;BÞUÕœ$I—£}> $øI+ãL2„¹ÓŸ®7eR?´^ó± A‘ïÜf’§I>¤'Ùø—*êÏo²¦•ŽùÃPO¾ˆÜ•…ûMÖ„Ü”ìžé5°¶:Ojݤ•Ð>ðMveJh-Ú{•\¥I±,õzu? ·øYe:‘¿ùckк™Å„BŒŸ´8ÅXˆ$Sœz_د»ƒ$µ¾¯!»Ö6ðEw·æê÷í÷í…_C€×‚F+Å*FšŠ°¿L¶'ßÂÎÊ€pfÓÇb•‡ãŒà6±ÜÜ‚Ï.’ÜM¥ëºL®6ÍYaàA±819´jÞe\%£·¾aû‡fý³U…‚L˾c‹ ATb$Uä,hØpýíÉw# weádA›H‹†ÿdq?pV4CG7ÝÑf¡ÅIQÇ9âb̹Ïw65Ñ-¨~(*s½ƒÜ2-ªJ—÷CPÆ8ò‰1ʬD={ò1æ¬ìŒ5¡íZNÞoR3õAü¼é­H“°ûÜ°9·Îªô•±jpÇÜ=´`í­³´dÀ•µzOÐçŒvâd±°)G>’AO¶[D E‘ô×EÖ“ïigeáÅ&jãyÜU—ž¯ „ùr£—£ÃEŠŠ;¥ã"2BTEÓ†‹»÷dY‘? ÷__Ð]Ìtž,LU÷Ç ð{$ŠàSQb-PH}=ùn0qWîùˆdeDwïyZèy]€Ë>à~êaq²"†»`èvJV€;ªS`‹@sh Ü š­S]½©×$š¢ ¿RKO¾£};+;À¾…½´k$ßšá€]‡–ÿ*e¼éÚv Æ˜éêäñEZÝØ8¬-à ùPÙ0 ý½­'ßEÎÊ@ßßW”1´‘ j:&‡7‰_™º†Îh’LJnªºÈ’}Ð{7 ü#Ìæ¬Ø_«'ßÑ€œ•`@ÌΩº"Ö…1SÇ–¨Ïãº6½Ÿ>¨]6‚›šàýX> J=ÐÁÁ {9F8TcÞ×û úßk -endstream -endobj -3359 0 obj << -/Type /Page -/Contents 3360 0 R -/Resources 3358 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3239 0 R ->> endobj -3361 0 obj << -/D [3359 0 R /XYZ -11.232 900.716 null] ->> endobj -3362 0 obj << -/D [3359 0 R /XYZ 56.693 759.068 null] ->> endobj -3363 0 obj << -/D [3359 0 R /XYZ 65.161 752.393 null] ->> endobj -3364 0 obj << -/D [3359 0 R /XYZ 65.161 741.435 null] ->> endobj -3365 0 obj << -/D [3359 0 R /XYZ 56.693 694.948 null] ->> endobj -3366 0 obj << -/D [3359 0 R /XYZ 65.161 695.237 null] ->> endobj -3367 0 obj << -/D [3359 0 R /XYZ 65.161 684.278 null] ->> endobj -3368 0 obj << -/D [3359 0 R /XYZ 65.161 673.319 null] ->> endobj -3369 0 obj << -/D [3359 0 R /XYZ 65.161 662.361 null] ->> endobj -3370 0 obj << -/D [3359 0 R /XYZ 65.161 651.402 null] ->> endobj -3371 0 obj << -/D [3359 0 R /XYZ 65.161 640.443 null] ->> endobj -3372 0 obj << -/D [3359 0 R /XYZ 56.693 594.804 null] ->> endobj -3373 0 obj << -/D [3359 0 R /XYZ 65.161 594.245 null] ->> endobj -3374 0 obj << -/D [3359 0 R /XYZ 56.693 548.607 null] ->> endobj -3375 0 obj << -/D [3359 0 R /XYZ 65.161 548.048 null] ->> endobj -3376 0 obj << -/D [3359 0 R /XYZ 56.693 490.209 null] ->> endobj -3377 0 obj << -/D [3359 0 R /XYZ 65.161 490.892 null] ->> endobj -3378 0 obj << -/D [3359 0 R /XYZ 56.693 434.294 null] ->> endobj -3379 0 obj << -/D [3359 0 R /XYZ 65.161 433.736 null] ->> endobj -3380 0 obj << -/D [3359 0 R /XYZ 56.693 377.138 null] ->> endobj -3381 0 obj << -/D [3359 0 R /XYZ 65.161 376.579 null] ->> endobj -3382 0 obj << -/D [3359 0 R /XYZ 56.693 329.699 null] ->> endobj -3383 0 obj << -/D [3359 0 R /XYZ 65.161 330.382 null] ->> endobj -3384 0 obj << -/D [3359 0 R /XYZ 56.693 283.502 null] ->> endobj -3385 0 obj << -/D [3359 0 R /XYZ 65.161 284.185 null] ->> endobj -3386 0 obj << -/D [3359 0 R /XYZ 56.693 237.304 null] ->> endobj -3387 0 obj << -/D [3359 0 R /XYZ 65.161 237.988 null] ->> endobj -3388 0 obj << -/D [3359 0 R /XYZ 56.693 180.148 null] ->> endobj -3389 0 obj << -/D [3359 0 R /XYZ 65.161 180.831 null] ->> endobj -3390 0 obj << -/D [3359 0 R /XYZ 65.161 169.872 null] ->> endobj -3391 0 obj << -/D [3359 0 R /XYZ 65.161 158.914 null] ->> endobj -3392 0 obj << -/D [3359 0 R /XYZ 65.161 147.955 null] ->> endobj -3393 0 obj << -/D [3359 0 R /XYZ 56.693 101.074 null] ->> endobj -3394 0 obj << -/D [3359 0 R /XYZ 65.161 101.757 null] ->> endobj -3358 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3397 0 obj << -/Length 2586 -/Filter /FlateDecode ->> -stream -xÚÍ\m“Û¶þ~¿‚“v¦¾N ’i§3I;q㸽SgÒ±ó¢pç(R!©{ɯïR¤îDêm!ñѸ\Ï.öÙH™Cwߎ/^¿Ô I(¹tÆ7ŽäDúNÀ\âúÎxê|zu¥­ -}9₾ú9+uQ_Þdy}QΛßdÑ·Yv[ÿç—ëŸ.¿‡×Œ#¡µ´ëò1ÑÅ\벨~†·3'€·K·z»'}âóÀ úÍû}ýàÕëúã²zðâûñÅo ÄS‡9BºŽ2")w¢Åŧ_©3…ß@â…s¿n¹p£„»®çúâ?´ zpD6²½0*k>s.ÖZl{ýš¬ûáUÏÄ“üP`6Ñyy9’”B÷Õc™¥__Ž‡ÿæúF§eþHŠ¤–#U‰¬þ¼k÷f†ùÜñݸ"¬úXÝFÌ“'a:¹vn¶;Õ’¶ÿîî 8h¿_‹eU[[é‚0ÉÚÒećÂÈßžlIBZ+º—Ïœú⪙ûÖ­çºX-—L<ªqeM¨†qz“µZ‚J¯›»¼*ã2ÑXɸvÚBGeœ¥EÏ}›ND·kk\1³8ð÷°G  œ•¹Gxç·ªvÿÊ -}»qK•«y¸×“¿×¿NâIg•whnL³h.vëNý x‘Ö#£¸ÈdH ü -ôˆ°`8·"N8çƒ9–Ž|;×b¯,Þ¹È@AÃ'ç¢ÿP÷ ª,ãt†k_íZÄbt*Š²|Š~C™áÚýxýkÅ¥ªr¤«˜å\Ç$}F8D7ƒá¾-ß÷ÖÊàÞ÷È&*üYß›Àm–«åüñÜÉ;Œ -…Ä)°\å)Öœ±`œ`û­ ¬x½ˆèRç–³ðlûbƒ©(»1ÎúîW‡e×ë]M)‘Ïhó‚n–ÞÏÔÛ´ -¶ZùÄ[mÚŒ°¦-)q鉴«k×nŽÿ¾kîíw2w¬Ô'ä+ÛT;„Þê²zÔ¿ÂŽ:1×Ã9Ô¶|K‡j­¬CÀÝ]·Íñëô²)²å½B.ðË<»‹Ñq Ö¡½W©Âµ|s—åê6»ë4G Kµ–/É!$wIà»ýfâ4‰S½Å€²™PæÆå€\€×þp&Ü–oiÂÖʘ0•Äža¢!RIÒo,%ª( Vv` y˜(Œ7XÄË×NH„Û!¯ç»à»šðÑ-Q…ž}PéR]2ˆe!¦R¹ÙݲCSgTyXñœ¡k6Ò$IvÉLl:«oEsð;›6suÉÁ·\2ñªyb¢uZ_-Ô´¹Þäi7Nßv·^Íø¾Üã‹JÛÙ^%…m®³ƒk¹EœFº³áLZ_çõ6!Ò¯‚ À‡ A¸8‹8Ä0:ùL-ð/kr^ 0ƒƒ…ó#ur$Ô<æ¸Ã º0|Ãí´éÈ·sŒöÊâ£CM3ŽYKlÊ{±ëå¶Vå<ËM²aÍîƒ'tZ… ØÀ¸ëmObÙ 9Ìýp%“Ž|;¨Ù+‹‡šs¯¿qŠSeËÇ<žÍË/OU\°Ö¾T—XËŠž£ÛßuŽly?צ™R7`$ r8à·å[ßZYàWØ°)4áR ´ÈTŸ(1È×2ß'bÈOO0@©xþdNï¦Ô‘ogJöÊâM‰Ua¢×l·ýhpfjÿæûtM¢g*I3 ÿ=³fÏÞŽ£î»ã×ä V×û9ГŠtÚŒ„ ÃR-é–·TÔß"Xñê¥"Q‘îûð:y÷œ`…Øjµ@gX³|ÚÁÓYUêçS;!n8`áù4Ú&Io¸ÚBG¾%â­•5À¼ç¯ß¹Æü¾:ý¡)ØWx¶¤r]}¤¨ DGÌc@AÝŽXC~1m¢·ýi«¾¤°êÄp©Ý¶x;S²VÕÀ’*EÛ|³(³üý6W´óèýuš#™µ<^.{ÿ„×~ÖuÒ>€Ì:\f¶-Þ¾ÖªâáÒuÅo^ûLhàG"ºóWZïÞ1ý†ëÿê¯|; -endstream -endobj -3396 0 obj << -/Type /Page -/Contents 3397 0 R -/Resources 3395 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3239 0 R ->> endobj -3398 0 obj << -/D [3396 0 R /XYZ -16.307 900.716 null] ->> endobj -3399 0 obj << -/D [3396 0 R /XYZ 56.693 741.963 null] ->> endobj -3400 0 obj << -/D [3396 0 R /XYZ 65.161 742.646 null] ->> endobj -3401 0 obj << -/D [3396 0 R /XYZ 56.693 695.785 null] ->> endobj -3402 0 obj << -/D [3396 0 R /XYZ 65.161 696.468 null] ->> endobj -3403 0 obj << -/D [3396 0 R /XYZ 65.161 685.509 null] ->> endobj -3404 0 obj << -/D [3396 0 R /XYZ 65.161 663.591 null] ->> endobj -3405 0 obj << -/D [3396 0 R /XYZ 56.693 616.73 null] ->> endobj -3406 0 obj << -/D [3396 0 R /XYZ 65.161 617.413 null] ->> endobj -3407 0 obj << -/D [3396 0 R /XYZ 65.161 606.454 null] ->> endobj -3408 0 obj << -/D [3396 0 R /XYZ 56.693 559.593 null] ->> endobj -3409 0 obj << -/D [3396 0 R /XYZ 65.161 560.276 null] ->> endobj -3410 0 obj << -/D [3396 0 R /XYZ 65.161 549.317 null] ->> endobj -3411 0 obj << -/D [3396 0 R /XYZ 65.161 538.358 null] ->> endobj -3412 0 obj << -/D [3396 0 R /XYZ 65.161 527.4 null] ->> endobj -386 0 obj << -/D [3396 0 R /XYZ 56.693 490.557 null] ->> endobj -3413 0 obj << -/D [3396 0 R /XYZ 56.693 463.219 null] ->> endobj -3414 0 obj << -/D [3396 0 R /XYZ 56.693 417.287 null] ->> endobj -3415 0 obj << -/D [3396 0 R /XYZ 65.161 417.97 null] ->> endobj -3416 0 obj << -/D [3396 0 R /XYZ 65.161 407.011 null] ->> endobj -3417 0 obj << -/D [3396 0 R /XYZ 65.161 396.052 null] ->> endobj -3418 0 obj << -/D [3396 0 R /XYZ 65.161 385.094 null] ->> endobj -3419 0 obj << -/D [3396 0 R /XYZ 65.161 374.135 null] ->> endobj -3420 0 obj << -/D [3396 0 R /XYZ 56.693 327.668 null] ->> endobj -3421 0 obj << -/D [3396 0 R /XYZ 65.161 327.957 null] ->> endobj -3422 0 obj << -/D [3396 0 R /XYZ 65.161 316.998 null] ->> endobj -3423 0 obj << -/D [3396 0 R /XYZ 65.161 306.039 null] ->> endobj -3424 0 obj << -/D [3396 0 R /XYZ 65.161 295.08 null] ->> endobj -3425 0 obj << -/D [3396 0 R /XYZ 65.161 284.121 null] ->> endobj -3426 0 obj << -/D [3396 0 R /XYZ 56.693 237.654 null] ->> endobj -3427 0 obj << -/D [3396 0 R /XYZ 65.161 237.943 null] ->> endobj -3428 0 obj << -/D [3396 0 R /XYZ 65.161 226.984 null] ->> endobj -3429 0 obj << -/D [3396 0 R /XYZ 56.693 180.517 null] ->> endobj -3430 0 obj << -/D [3396 0 R /XYZ 65.161 180.806 null] ->> endobj -3431 0 obj << -/D [3396 0 R /XYZ 65.161 169.847 null] ->> endobj -3432 0 obj << -/D [3396 0 R /XYZ 65.161 158.888 null] ->> endobj -3433 0 obj << -/D [3396 0 R /XYZ 56.693 112.421 null] ->> endobj -3434 0 obj << -/D [3396 0 R /XYZ 65.161 112.71 null] ->> endobj -3435 0 obj << -/D [3396 0 R /XYZ 65.161 101.751 null] ->> endobj -3395 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3438 0 obj << -/Length 3271 -/Filter /FlateDecode ->> -stream -xÚå][“›8~ï_Ae¶Sµ­ vjf&ÉT¦&³µÓý°UIÔX¶©æâA·÷ׯ08eðíÈ%ÙÚ—¶ÛƇƒø>«„ë,×ùå槇›Wo׉IÌwæg„‡ND=â…ÎÃÌùpû‡Ì¤Pòå ÜÛßËZªîí¼¬º7õ²ÿòu™üT–OÝ?ÿ¾ÿí姇_õiî(%qtÒîëM&ÕRÊZµ_ë³S'Ògç^{vŸ‡$d‘s8ìÏ2-0Œn_u/”ñö‡7onþ¼¡Z¼ëP'à„ǞƔp—9I~óá“ëÌôwZâÇ‘³Þ™;u ó¸~Ÿ9÷7ÿºqû‘pOŽÈN¶êòN§Œ[-v?{õV²½¿ýMD|é/¶¿O“¥ÙG7pë\ÿ¥/ï¸ëÞÞçi½üûË;Êô?jS”+ò¬²º/³2yÚû?-æåàß,-äÞYªjµ÷¿,fE{«ö>jênÀã`OQ?ŠI ßöª~t]­¥î—w´{·½V}ÛËm_~Ž¿F ™zzŒ|¯ÿöóÀÕwÓç#q;•tæû>vüÓðˆÐÈß LÛ£±òB9Ë\JB}#!gØ#'1‹'Pv+°Z8Ý›?zt¶SÜ£Ä×´½‹?/E±³@e9¶°ÐÇÎ4˜°£Ë9ì¸Ç2ž_Ÿv`Z‹,MÇêk}Õpø£Û¦˜Éªå ðÒšzÕq K;.ÅJ,¤}™G4$z†±ó¡|$ÌÑÊÀœ¹$ ^ó#7LJN¢›u—e…æ#9u% -µ•,€ð©KØq’•_àßÎ_àã‘!!:»œ0Îío( ÷»\Š5ô å#ÑcMÙ~0XL‚À^by$9he ¨ä1ù}bùÇb³ÉaTR¨²¡‰ã›ÿ‘0ÌÐy•±³F»äŽ5& å#™€VÖ€ Œ’(êsϪÌeæÐÛ€OPÌ6ÚÁI[¹ ?t$f>cÞT_ 5 :؃lØl¶~¡šÖ1ÔSG>¦åeV¸]rÇ+†ò‘¬@+kÀŠV.óûÈ~Y*à<6+¥* ‚Îœà-×°CWBÁqØÖß<–ÍÔ“~ÒTÅ¥ó¹cmKNRµ|6åCw [|ÉÇñ¯,œAÜvŽôµ‘ÕÂ#e0hTÙTÉxÊä¡Šrjøš› t5Êkp¿™z|¿t2‹Â€AXu k<ÊGò­¬¢˜¸»v«ºœÚßîœxø®j±'jk—or¸MGX»ÇñÈ[lKÕ~$¸G"×^&x$9he àÎCâFÑ®¤.¿Rmb -? -îÅó4°Þ<4·×z{àä:0ÐÁ4u®‚.çb%CùH– •5`IÀ Õçܲd%* ÿZVÖ÷“'oŽÕÄ_/[Û1g»Ùš½(Àýj¦P÷»¤Š5¨å#¡ŽVÖê¾~ i_<2sž÷¡ÅZTðiy–Ö)4ñ”,eò4š‰3äu kw|(yÇ­)Ûí¢Ekƒ1” ´²ðgagÚb¸†šäG¡Œ’§2‘J‰j3­QV3YMë©fµª´®S·9ž²0—ùîvœ5ˆå#!ŽVÖâ”÷™S(bê´Î¤ib~½L`ÇF©}™jB³¸‹q•à4.“J®¡x³‚:ÿ‰h ºB{„ái­&,ÓÌ©GÄõíeNGòq|À+kÀ­©çõ™Óq™y/½*çsƒÞsh¤\HÏA"ý7˺„‚5˜ å#afMÙ~0Â.n´6CùÈÁ@+ çœÆħ}_îÏY©lË·¡<ôÏßk/:ñ÷ ÔÔhæO×v_‹"•À˜ù7™jï«6¶¥à'Ô¦/ÿüööY4!ñH4cU53ˆô9ÔY™<¶kÑá!󳂮 jb穯¡y™§¦0’Ý@ 4S™,SùjÎ~©À-ï…ª¡¡ŽªEݨ« _û1Ìô¯'·ð½˜0YÚàËVÐ`1ñÜÀÞ"|ŸFÄóíEt#ùÈù­¬ÁÄ(á^ѽMŸ¿í|ù,òU¶UšuEuz¡Åt1ƒÏ}à¸ËèÂd&óƒuÙ—9¤IãE-ìP>âhe ®åò00-ËC[*D.m0ÖòÊúºýxU•mæL‚yºh*i¸ˆ÷ˆã~â^̉Ïìˆ#ù8ˆ£•= h/ŽIHû>“>Ή..šþ.#¨‡äÅñ÷‘Ú÷¼Ð% ,yHýJ]ÉãZnq£"Ï wíU¹Fò‘ìB+ 7 ^Û.÷ëI^—Z€Ó"Éhße&àÀ˜-NÏ÷™,ÆVï|Vp%êe6”éüÊh—ÔŸVB楇©ÚË<Õs1÷íÕGGò‘4B+k@#Ÿ’Øë룩iA¨, …Ï…,dö³ŽèLúâÏFdé<…†I-W¤ˆ¢&öéŠÃYëÌE¾)Yª–˜•šžð¯j°)Óç`– öþî„Ð1pµBalÏb³˜’ˆÙkMÉÇM5xeáS ‹õ«Ûg·ÞY±‚Ç·.º0‰Éº¦z-ªBG`ÓÏÂÛEÊÜÎ˲n˜^t}° 1XnÀ"—DÜ^géH>ähe @ù„úñn´¦¼ŸÁ«qrÙnݲ0èÀ×Ñ =Е°ÚÙ|ºg0=,|C­ãÚ:¹öZDGò‘˜µ¦l?†®o/®ÉGZYëb3]@Ñä²’3nÖKƒÃÛ]R#¯8-fàDû¾Ç3Ûùˆ[Ó¦³+mëeöû¡†½p$ x´²€×ñ û°’í^‘`ìüïi3à4ÿïÿ|xs4›2·¦C+c9Ü`‚]ØU&ÀÕ³Ö0¥—Ù«¹Žä#i€VÖ€¾K<Ú×\³TÇÊ —&”jòU‹05íöËÉWÏí®píÚoôf6¹¨ž®làÕ#ýÃù¸¦ÍÓd§vºÌƉËí•kGò‘ì@+kÀŽ¶d÷èï:°…þ‘8˜ë±1¾m¼ø­]¤5Þ’ ]ÚeW¬Aw( ]´²Ðmwâ¾0»í2ð¡3ùZLÝƦ•4…]:õj}àfê¤0<·=ºÐ•KÐÎaaÚëÀÜ.»cdCùH’¡•5 ™÷ ' Zjñm¾‚œ´–yú9kŸb4­äí -;ÁpÃßÚT”VªžœVã è"Yhìj+Cñ8ª U…3…¶HadÄ”+]!h·Ü%´P²™6Ò>ž—¸°êi›ÿ2ØXWl?bÜ J£.¯hCùH> •5 D€îöâ¨Ê•¬²Í7J(™å³ŒA1‚†]Ö͆ò‘p°¦l?¼Ë½XŒ¡|ä` •5à÷wé®Ñ([[&›•ÙOìXw.ä_ž……QÉ8 -íÞ 9ùÎÑÆíjÚmߦ[¬b(I´²„á~_¬H„’¶¶VÍBÓ¡¾Ò5ï?~qn5ßóác„Y1ƒ-Ò‰;ËוXM«¸>¼Ì!¯ËûXãÐP>’Che 8äS£Ý~!Ö"浞öÚG[L¼UÞÔ*&=:W—åN¯ê‘ó¶-¶„ntl÷.°ËéÄßL¤ýîOJñcï»Y®A]F‹«5bJ‚Ð^ëçP‘K¸Åý ÅãàVïÈ#=¸¯×¥Qƒu·‡û+^r‘•õÔ1Øjö@?«*™Ô‡UðêCÂ÷7zDÛÅ}8v;¸ÄåÛüò‡O®3Ó_ýªeøq䬷æN ÁÉ<®ßgÎýÞ ÿ ‡ÔÑç -endstream -endobj -3437 0 obj << -/Type /Page -/Contents 3438 0 R -/Resources 3436 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3492 0 R ->> endobj -3439 0 obj << -/D [3437 0 R /XYZ -11.232 900.716 null] ->> endobj -3440 0 obj << -/D [3437 0 R /XYZ 56.693 741.747 null] ->> endobj -3441 0 obj << -/D [3437 0 R /XYZ 65.161 742.431 null] ->> endobj -3442 0 obj << -/D [3437 0 R /XYZ 65.161 731.472 null] ->> endobj -3443 0 obj << -/D [3437 0 R /XYZ 65.161 720.513 null] ->> endobj -3444 0 obj << -/D [3437 0 R /XYZ 65.161 709.554 null] ->> endobj -3445 0 obj << -/D [3437 0 R /XYZ 65.161 698.595 null] ->> endobj -3446 0 obj << -/D [3437 0 R /XYZ 65.161 687.636 null] ->> endobj -3447 0 obj << -/D [3437 0 R /XYZ 65.161 676.677 null] ->> endobj -3448 0 obj << -/D [3437 0 R /XYZ 65.161 665.718 null] ->> endobj -3449 0 obj << -/D [3437 0 R /XYZ 65.161 654.76 null] ->> endobj -3450 0 obj << -/D [3437 0 R /XYZ 65.161 643.801 null] ->> endobj -3451 0 obj << -/D [3437 0 R /XYZ 65.161 632.842 null] ->> endobj -3452 0 obj << -/D [3437 0 R /XYZ 65.161 621.883 null] ->> endobj -3453 0 obj << -/D [3437 0 R /XYZ 65.161 610.924 null] ->> endobj -3454 0 obj << -/D [3437 0 R /XYZ 65.161 599.965 null] ->> endobj -3455 0 obj << -/D [3437 0 R /XYZ 65.161 589.006 null] ->> endobj -3456 0 obj << -/D [3437 0 R /XYZ 65.161 578.047 null] ->> endobj -3457 0 obj << -/D [3437 0 R /XYZ 65.161 567.088 null] ->> endobj -3458 0 obj << -/D [3437 0 R /XYZ 65.161 556.129 null] ->> endobj -3459 0 obj << -/D [3437 0 R /XYZ 65.161 545.171 null] ->> endobj -3460 0 obj << -/D [3437 0 R /XYZ 65.161 534.212 null] ->> endobj -3461 0 obj << -/D [3437 0 R /XYZ 65.161 523.253 null] ->> endobj -3462 0 obj << -/D [3437 0 R /XYZ 65.161 512.294 null] ->> endobj -3463 0 obj << -/D [3437 0 R /XYZ 65.161 501.335 null] ->> endobj -3464 0 obj << -/D [3437 0 R /XYZ 65.161 490.376 null] ->> endobj -3465 0 obj << -/D [3437 0 R /XYZ 65.161 479.417 null] ->> endobj -3466 0 obj << -/D [3437 0 R /XYZ 56.693 432.304 null] ->> endobj -3467 0 obj << -/D [3437 0 R /XYZ 65.161 432.593 null] ->> endobj -3468 0 obj << -/D [3437 0 R /XYZ 65.161 421.634 null] ->> endobj -3469 0 obj << -/D [3437 0 R /XYZ 65.161 410.675 null] ->> endobj -3470 0 obj << -/D [3437 0 R /XYZ 56.693 363.167 null] ->> endobj -3471 0 obj << -/D [3437 0 R /XYZ 65.161 363.85 null] ->> endobj -3472 0 obj << -/D [3437 0 R /XYZ 65.161 352.892 null] ->> endobj -3473 0 obj << -/D [3437 0 R /XYZ 56.693 305.778 null] ->> endobj -3474 0 obj << -/D [3437 0 R /XYZ 65.161 306.067 null] ->> endobj -3475 0 obj << -/D [3437 0 R /XYZ 65.161 295.108 null] ->> endobj -3476 0 obj << -/D [3437 0 R /XYZ 65.161 284.149 null] ->> endobj -3477 0 obj << -/D [3437 0 R /XYZ 65.161 273.19 null] ->> endobj -3478 0 obj << -/D [3437 0 R /XYZ 65.161 262.232 null] ->> endobj -3479 0 obj << -/D [3437 0 R /XYZ 65.161 251.273 null] ->> endobj -3480 0 obj << -/D [3437 0 R /XYZ 65.161 240.314 null] ->> endobj -3481 0 obj << -/D [3437 0 R /XYZ 65.161 229.355 null] ->> endobj -3482 0 obj << -/D [3437 0 R /XYZ 65.161 218.396 null] ->> endobj -3483 0 obj << -/D [3437 0 R /XYZ 65.161 207.437 null] ->> endobj -3484 0 obj << -/D [3437 0 R /XYZ 65.161 196.478 null] ->> endobj -3485 0 obj << -/D [3437 0 R /XYZ 65.161 185.519 null] ->> endobj -3486 0 obj << -/D [3437 0 R /XYZ 65.161 174.56 null] ->> endobj -3487 0 obj << -/D [3437 0 R /XYZ 65.161 163.601 null] ->> endobj -3488 0 obj << -/D [3437 0 R /XYZ 65.161 152.643 null] ->> endobj -3489 0 obj << -/D [3437 0 R /XYZ 56.693 105.135 null] ->> endobj -3490 0 obj << -/D [3437 0 R /XYZ 65.161 105.818 null] ->> endobj -3491 0 obj << -/D [3437 0 R /XYZ 65.161 94.859 null] ->> endobj -3436 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3495 0 obj << -/Length 3389 -/Filter /FlateDecode ->> -stream -xÚÝ_“›8ÀßçSP{UwÉÕŽ Ø<íÞ&[»•\ÝÍÌU]U’d›@^À3™ýô' žü¯åF›»{™Á¶hñS«Õj ×Y8®óÓÕwW¯Þ2׉IÌ)wî槄‡NäùÄ»ÔùðâFæRÔòå5eî‹¿«FÖÝá\UÝA³ìüQ%?(uß}ø÷í»—Ÿî~Ñ—¹ö<3ÖI»mžrY/¥lêög}uωôÕ¹ß^=à! iä\3‡ýõC_ £¯ºåí‰Woî®~»ò´x×ñÆ }'Œ=Â]ê$ÅÕ‡O®“êß´$ˆ#çqS²p˜çês}œ;·Wÿ¼rûšÿ߯™í5‚˜x.ïtûH)Ûh³=íÕ[]ds?A{NDé6…ßgÉRÈü£Ëܦн—×Üu_ÜY³üîåµGõ‡FÌrI>×ùëîÇú©T«Ï³\%÷;Ÿ³r®v>æYÝÔ;Ÿ+9—eS=í|%Ë´«ø˜í(D1aú°Wõ£ëjí<Ï}>òº£Í½ê§ÙÞnûï§ásÐôx!uB?&eísh¿g®~ªw(‰£Ø©¤3ß­ø´Ãßî_€¶5n/Ð öÚÒXùŒxÜËg®GBý !WØ…’“˜Æ(»X-œîধs@ÚVq_kÊ‚mË}U#Ó¡ûÂœ0J™ÈºÕ¬¸¬±Êʬ´šÃÊÍDr_ç¢^Šë{ù¶ÿâÈy©j Ï%°^Ò±6þ½07²‡çP>O´²xR—„qߨu3-b´²»1‰üÞ(²z±ÎÒ=2^|éà¿9G!ª{YOýæ´å*¤ö#ʬ.ÌaÔ$W*]'Ð>!+/kyý×ú‰Râyã1#ÌnCñ8ÚЪÂaãqD¢0ê`«zWü(j×קÑy\jöH ‘­éº–ÓÚq‘7²*E“=¤êÒötžÀ( Ü÷ì!8”d­¬„QHb/î ÔƧ‰~B5ðiÖP[³yê9¬t%W•¬u·,ÚŽ¹žÚ‘Pc¦ÏÃúzäLíÁ3”„­¬<¡¾&?É΄޺î‰J0A¹÷„Zn+ùëºzr«*SðòÊGý?ô|{8å#qD+k€£¾¦ëzµ¬2‘g¿oŒÈ¡¾æ\‡ -æ²Ø‚í c–boÔû—ãc մΑçOºÎ£Éº…54‡ò‘h¢•5@“1â´Gó©n &§ƒpho¬ºÔº3N𘸧äùõé³ö+ð<ÅAÊ°FñP>’b´²q#¿£83íèáÖOñÕÄa¦úy -V>QБ¼/úù@œö³LÖ{AàóxÓ.Èa ï¡|$Þhe ðö}âÑ>Â}\àÈäL.²²œ<¬¾ªTÜË:939WðD ô”®`·Q©ùÜ_¯ ›Ø› ÉGâ‹VÖ_ª+ˆ÷ø6\²^`¹}‹ONÓu·Ì€¦¬ {. ±¦ÙC&Ú¹êiÛg)¡nÑì™;ÐnŽ±÷P>n´²p{¡Û¹ù±Àã]ú¾³}ÜŸh8³VÐÄo묂B t€rÔS;5À+ß|ÿ8wº®öú²³x³x0²E÷P<n´ªl».¡AŸsº??=6L¹¨ ÖvžåÒÔÓÛ\“†|xn À\ÔE…¬A7”¤­,;Å„Fýü“,S°k -õ:›»ÈböîØ¡r! 5Ê|é'Öpòˆ…]ðÆACùH‚¬)ÛWïbÖ*c(Yhe š‰öÑç¿åª†‚<[4õò¸vzÂð¬-ÊûzÚ Ým¢ gq[È4—O:Îç›ë†äÖhÊGÒ†VÖ€6ÆIàÑgŸá!ƒÛo w©-14 ¶–x+`/aþðX@ý‰:\ε0Œ%Í­Tm™cA7‚·FûP>’v´²´Œ¬<ƒ¹ÑÍb–C'Z³f9qDïÝ~©žgÇïÈÖØÊG²cMÙ¾2h7¢²VCùÈÊ@+kШO˜ßÇ¿G/ -õ`MÏ¡ƒn‰*ÛÜxpoXJžURÜ_øp»±–5 ‡ò‘@¢•5Ò£„…}\¯^‰ì5[Ⱥ³[‹:i¢yùJ©ðèÉL“ÞÇåÄÇ, -2]«D>Ù®6˜|©ÖóZ+àÝa@hhoMTÀ}â{öBX#ù8ëWn=}M÷Ù«o³ÏðÄ+žaV&ªªdÒ€»´B4ÍäSÂ¥¸AkâATY»0±EþÒÆ0J|f/>6’Ä­¬žŒLÒ]³ï}…ˆÐÚS“¹aÊþ±È}Õ›'i¸TæÌRY]ÎlŸÿ±] ‰ëÿ-}–ß,vZ­KÚ fŒä#­ZY« ÝkÎûÐÝ{quçÖÕä¹f"®ÉhéÊYÔÓ..kEf¿Ët¯÷Áge«J›#É•i²†3xöB.#ù8ÂñÊ ÷㈄®¿ NËD¦Pdö4i {–뾊x)­å7͵o:mîG%U›' Ê©‚J’µöbMƒ×~€Ù‹¹ä#[ZYƒÖµ]k?V}/bÊʺe"ë¯>¸û4ÊTjòÅ ²šz‰*´O‚&ŸWò!SëÚ´•„þfÓk­d(ÙJÐÊ´’“0겪m¬ý”poÇ &¬Ç[ÚÏ€Žâákà ~Ìšd Ñ›ëÍí¸^¯„›7l !±6^ŽëëÿÌ·—#;’lBhe šþÑ>j¾S%ëÒ`©a­¬V -º<§ Xí'<îæha;)±nT!“Õ YÊ -žg~¹Czx] Ìb—1Ä«ªí, ïÓ9ïg’TÁ»÷ŒÌ ¥–t~´q 4Û?MÁƒ2qÈ´“Ë‘WÐ%QðÕGR$KC5Æî|C "Âbï -ú”º]’7´²¼…!ñ£>R»YÕU¯”ÁIf¶,ÓÖ¡8~›5_Ù 0…‘w#k0å#aD+k£¾fûÒ=³í/z¨ê sÛ˜©wÆ•à5óÉý -Ä~1¯ 7Á;Ï?ëÂÖøÊGòVÖ€ÆHÀùóNup[ÙÎájßqê½bÿuóh«+UL|ívCÆJBß·Ô4U6[7Æ(¡÷¡ÉG¢ˆVÖÅ Ìí£Ó“Û£ÿã©9ƒðœço/Ö؈G¢gKÕ¾&¼nLo­*†ò‘uVÖ RJØ6·í­IBƒÉìxØu:×aª%^¼ÊÄs»a³5€†ò‘¡•5ÈóïW¨.ŃœxçÄÏ É2ËS[{,›* ¦Y½ÊÅ“ñ:ѸXÛ"r($ZU]—ðíî±&éb¨-1F[ zùˆï¾H~r†âqXSµs7º±ö6æx䢑ªórDÂíŸg#od) -hª–²‚¾yt8¹&g3{~°¸$0BYè\{„ñÞIùë1AºúBîì”Ü,°˜xÿ³;;9úrwÔ'¡àî¦Íåî|;00Û=q\âòÍÈíÃ'×IõO¿hdÚ5Ç›‚…ÃÚYXŸëãܹÝáë?ª¼ -endstream -endobj -3494 0 obj << -/Type /Page -/Contents 3495 0 R -/Resources 3493 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3492 0 R ->> endobj -3496 0 obj << -/D [3494 0 R /XYZ -16.307 900.716 null] ->> endobj -3497 0 obj << -/D [3494 0 R /XYZ 56.693 742.03 null] ->> endobj -3498 0 obj << -/D [3494 0 R /XYZ 65.161 742.713 null] ->> endobj -3499 0 obj << -/D [3494 0 R /XYZ 65.161 731.754 null] ->> endobj -3500 0 obj << -/D [3494 0 R /XYZ 65.161 720.795 null] ->> endobj -3501 0 obj << -/D [3494 0 R /XYZ 65.161 709.836 null] ->> endobj -3502 0 obj << -/D [3494 0 R /XYZ 65.161 698.878 null] ->> endobj -3503 0 obj << -/D [3494 0 R /XYZ 65.161 687.919 null] ->> endobj -3504 0 obj << -/D [3494 0 R /XYZ 65.161 676.96 null] ->> endobj -3505 0 obj << -/D [3494 0 R /XYZ 65.161 666.001 null] ->> endobj -3506 0 obj << -/D [3494 0 R /XYZ 65.161 655.042 null] ->> endobj -3507 0 obj << -/D [3494 0 R /XYZ 65.161 644.083 null] ->> endobj -3508 0 obj << -/D [3494 0 R /XYZ 65.161 633.124 null] ->> endobj -3509 0 obj << -/D [3494 0 R /XYZ 65.161 622.165 null] ->> endobj -3510 0 obj << -/D [3494 0 R /XYZ 65.161 611.206 null] ->> endobj -3511 0 obj << -/D [3494 0 R /XYZ 65.161 600.247 null] ->> endobj -3512 0 obj << -/D [3494 0 R /XYZ 65.161 589.288 null] ->> endobj -3513 0 obj << -/D [3494 0 R /XYZ 65.161 578.33 null] ->> endobj -3514 0 obj << -/D [3494 0 R /XYZ 65.161 567.371 null] ->> endobj -3515 0 obj << -/D [3494 0 R /XYZ 65.161 556.412 null] ->> endobj -3516 0 obj << -/D [3494 0 R /XYZ 65.161 545.453 null] ->> endobj -3517 0 obj << -/D [3494 0 R /XYZ 65.161 534.494 null] ->> endobj -3518 0 obj << -/D [3494 0 R /XYZ 65.161 523.535 null] ->> endobj -3519 0 obj << -/D [3494 0 R /XYZ 56.693 477.269 null] ->> endobj -3520 0 obj << -/D [3494 0 R /XYZ 65.161 477.558 null] ->> endobj -3521 0 obj << -/D [3494 0 R /XYZ 65.161 466.599 null] ->> endobj -3522 0 obj << -/D [3494 0 R /XYZ 56.693 420.332 null] ->> endobj -3523 0 obj << -/D [3494 0 R /XYZ 65.161 420.621 null] ->> endobj -3524 0 obj << -/D [3494 0 R /XYZ 65.161 409.662 null] ->> endobj -3525 0 obj << -/D [3494 0 R /XYZ 65.161 398.703 null] ->> endobj -3526 0 obj << -/D [3494 0 R /XYZ 65.161 387.745 null] ->> endobj -3527 0 obj << -/D [3494 0 R /XYZ 65.161 376.786 null] ->> endobj -3528 0 obj << -/D [3494 0 R /XYZ 65.161 365.827 null] ->> endobj -3529 0 obj << -/D [3494 0 R /XYZ 56.693 319.166 null] ->> endobj -3530 0 obj << -/D [3494 0 R /XYZ 65.161 319.849 null] ->> endobj -3531 0 obj << -/D [3494 0 R /XYZ 65.161 308.89 null] ->> endobj -3532 0 obj << -/D [3494 0 R /XYZ 65.161 297.932 null] ->> endobj -3533 0 obj << -/D [3494 0 R /XYZ 65.161 286.973 null] ->> endobj -3534 0 obj << -/D [3494 0 R /XYZ 65.161 276.014 null] ->> endobj -3535 0 obj << -/D [3494 0 R /XYZ 65.161 265.055 null] ->> endobj -3536 0 obj << -/D [3494 0 R /XYZ 65.161 254.096 null] ->> endobj -3537 0 obj << -/D [3494 0 R /XYZ 65.161 243.137 null] ->> endobj -3538 0 obj << -/D [3494 0 R /XYZ 65.161 232.178 null] ->> endobj -3539 0 obj << -/D [3494 0 R /XYZ 65.161 221.219 null] ->> endobj -3540 0 obj << -/D [3494 0 R /XYZ 65.161 210.26 null] ->> endobj -3541 0 obj << -/D [3494 0 R /XYZ 65.161 199.301 null] ->> endobj -3542 0 obj << -/D [3494 0 R /XYZ 65.161 188.342 null] ->> endobj -3543 0 obj << -/D [3494 0 R /XYZ 65.161 177.384 null] ->> endobj -3544 0 obj << -/D [3494 0 R /XYZ 65.161 166.425 null] ->> endobj -3545 0 obj << -/D [3494 0 R /XYZ 65.161 155.466 null] ->> endobj -3546 0 obj << -/D [3494 0 R /XYZ 65.161 144.507 null] ->> endobj -3547 0 obj << -/D [3494 0 R /XYZ 65.161 133.548 null] ->> endobj -3548 0 obj << -/D [3494 0 R /XYZ 65.161 122.589 null] ->> endobj -3549 0 obj << -/D [3494 0 R /XYZ 65.161 111.63 null] ->> endobj -3550 0 obj << -/D [3494 0 R /XYZ 65.161 100.671 null] ->> endobj -3551 0 obj << -/D [3494 0 R /XYZ 65.161 89.712 null] ->> endobj -3493 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3554 0 obj << -/Length 2192 -/Filter /FlateDecode ->> -stream -xÚÍ\[oã6~ϯЇM€š#R$EÍ ì´¶ƒ¶@gò°ÀLh™NÔH¢W’“L}.ÎXrì…RÚ'ÓuxD~ç;Òö½+Ï÷~8{syöê­ð½ˆD’IïríIFdè) ô.WÞÇó÷&5º4 &üó_meʶ¹¶EÛ¨®»›ßÙøµ7í—ÿ}øùâ÷Ëw0Ì‚R ÑJûP}NMymLUÖ·atê)]õè\†$dÊ[…Ýø!¡:Õ~P&ëϾ¿<ûÿñ¾G=!‰Œ/Œ(‘>óâììãï¾·‚{ á‘òîšž™'¨OX ¡zÎ~;ó»™ðAźYü°'æƒ†Ì ¹ ŠªZr}‘HE­{G^a¼õQIOÊ„J:”/|JB©P#ìÏ‚$‹&P¶X\ymã}˜áf©x½T!,«õe»T•m–æ¸ïãBúþyaÖ©‰+\çêZ#{®õô2kp£:š|•7Æê&%RÜÞõ;öV¬g;¬œ(XêÙ°Ú—ïˆUgeG`5P„òŽVb›W:É‘ë•Ù ¡•ãzþ±Åb Mò›¾¢ð¤»pä™ÿ¦%ÒWÉ -×±L²$ÕÅX8²€ÌÆ}éŽPtTtYH¨R- “ë,ɯg \G¤—m¶4H‘vÄɃbvq³çI^™"×)nˆ[]3ˆ§Iaq9’}ùŽ œMÙn2@»H±ù&£/ßq2\•=´È5agX˱N¤*ŒÎÀ`°¸¥¬§£4HnVé3\´™×l ëËw³²#\R±KIWfd–÷Ó1þëøâ•XÀ%)2 ÏLY~žï7é6¿™Z(Ú&–ºLâ±èæm:7ºûòÑí¬ìt Ÿð°+f&öHÊ · 2Ù–Øš[‚ìwk -$ü€“×ë$†'îA×ÊÆÛ:ê)Ç"1„±ùª-ùŽHtVvƒˆÚ%xøêoW$œ´â’ÚjÚrKãÃí¶ˆ=ùק½Çr‹T;_õNQõ,û幞¶Ö¤ó³™AO¼£¸ª:˜"BteG$Z—X^šª2ÅÔ5rìèwúÙå@Éaj¯\’Ën%Kðøg»»Êêå EÔl¯v•B ûÚ… ‘Ãò õá¾/X]ûß”¦Û*Ýߨõ½ƒä_vÞõr· »¶ij/˜8¿«ÃôæRíw¯v۶׺–z{AÅy÷ÄÒ˜¼mezÕ]«ì—½ÝflPúËØTq†õ&j3¶‰)ÉAà ØõkâÛFl™ä±ìƒ1â·í¢Ýs&ýyY€·€t0‚Úg­ÔOŒ‰^¿øá`œ -¿èm‘T^4 yi]ió× Êàë/úƬ“Ô q#@ E.¸9© ÊÉŒE¯¾x7sVAbj‡D°ŽÄÞ&÷جx¹½z¬ú ©ð£àõiOÙÇÆdq^ ©}…ÞûÙ¶Öa…cËÄæÓÆ{¦ŽËRÏïKd.©êê#H\PJ˜˜Ä÷I­ãp®[ø úNß&«–‚¾-tfŠu³KæìÉ÷æ!(ŠùH¨>‘Ãé|åÂ|7rWÏC<¯îw>|ÄžPn‹L§ÉŸfDÕ­ÜèI=º°[LQ¤Áö¼Ž¾µØ3à·WhB»»N uÁ¿Üº°ÈêÞlŒ.Њ`Sá`¬~¯œý4y“q1_š4ïhÛÎÊ"lÂr_I+å»j)ÌôUVs_úål -µç;Ư_ömFøæø#UR¥CüçtàõÖÚáß¼;D½Yxz˜É  -ÈŒ,[p4qÂK¦¢à/‰ÜUÆ  ÍEßé:a¼­SGý£I7ÿì„ô}«¯×Rø͆ùdiP3FØe¤ÁÄéî=F„,k ä|aÀá3ÖÖòÝœ†»²ø€0àŠ„´s?e›öÜ6,|ûþñì”> ‚ y—¶@–ä+s?mh´osÏ=¨pFx ^2‹ („WŒÿ ׯã<:Ÿá²Hí~1‹áä»®»²# 4éO"×Zˆÿt„‚Mìš(¥Ž‚ʉ·ÐGpð^‘`À&¡w¶¸™6~N -º)옽ûñÒKejL…Dòà´9 5Æéû‡öÜó˜=c¥>Xö,¯rô¸W—ѱž ºƒ’XwÄBðj¾ -ü@¾#c:+‹gL‚ ÙhÊœç„êUjËRSZ&Ë4±W…Þ\ž¸Šdã‰uÍ4òÔa½ðìR3ÉMOY ‰Ú•b =U¦§ïkŸs*/^ZœPÞ—©hºÄ”ÓæñóÓ•¹5mtûF§é.´]¦6¾)ÙjyS·ÿ¾ØùæU–².$jw0º[×Xiâ*±y¹wsw‰µRÉQ¯Ê¿xUŸ‚&ÔhѶ…ƒ0­Y’óEÙ(RŠù|Æ@¾›ÏpWï3¨„K¼ó¹¹ûS²rb¯1æ¼J otx›²Ä*1Ê!¢½ðA‚}µL×?¼Ëu>ºXIë¿ -ò%“uDàØtdV™l“êÊ,6xŸÜg;bzcw›G˜jQnL\wÄ•ÕŒ§D(UDóñMO¼#ݸª:‚mÌíN‰¬G{ÖRÊGþß‚×? Šžó÷+“F -endstream -endobj -3553 0 obj << -/Type /Page -/Contents 3554 0 R -/Resources 3552 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3492 0 R ->> endobj -3555 0 obj << -/D [3553 0 R /XYZ -11.232 900.716 null] ->> endobj -3556 0 obj << -/D [3553 0 R /XYZ 65.161 760.065 null] ->> endobj -3557 0 obj << -/D [3553 0 R /XYZ 65.161 749.106 null] ->> endobj -3558 0 obj << -/D [3553 0 R /XYZ 65.161 738.147 null] ->> endobj -3559 0 obj << -/D [3553 0 R /XYZ 65.161 727.188 null] ->> endobj -3560 0 obj << -/D [3553 0 R /XYZ 65.161 716.229 null] ->> endobj -3561 0 obj << -/D [3553 0 R /XYZ 65.161 705.27 null] ->> endobj -3562 0 obj << -/D [3553 0 R /XYZ 65.161 694.311 null] ->> endobj -3563 0 obj << -/D [3553 0 R /XYZ 65.161 683.352 null] ->> endobj -3564 0 obj << -/D [3553 0 R /XYZ 65.161 672.393 null] ->> endobj -3565 0 obj << -/D [3553 0 R /XYZ 65.161 661.435 null] ->> endobj -3566 0 obj << -/D [3553 0 R /XYZ 65.161 650.476 null] ->> endobj -3567 0 obj << -/D [3553 0 R /XYZ 65.161 639.517 null] ->> endobj -390 0 obj << -/D [3553 0 R /XYZ 56.693 602.366 null] ->> endobj -3568 0 obj << -/D [3553 0 R /XYZ 56.693 574.813 null] ->> endobj -3569 0 obj << -/D [3553 0 R /XYZ 56.693 529.045 null] ->> endobj -3570 0 obj << -/D [3553 0 R /XYZ 65.161 528.487 null] ->> endobj -3571 0 obj << -/D [3553 0 R /XYZ 56.693 480.979 null] ->> endobj -3572 0 obj << -/D [3553 0 R /XYZ 65.161 481.662 null] ->> endobj -394 0 obj << -/D [3553 0 R /XYZ 56.693 433.553 null] ->> endobj -3573 0 obj << -/D [3553 0 R /XYZ 56.693 406 null] ->> endobj -3574 0 obj << -/D [3553 0 R /XYZ 56.693 358.99 null] ->> endobj -3575 0 obj << -/D [3553 0 R /XYZ 65.161 359.673 null] ->> endobj -3576 0 obj << -/D [3553 0 R /XYZ 56.693 312.166 null] ->> endobj -3577 0 obj << -/D [3553 0 R /XYZ 65.161 312.849 null] ->> endobj -3578 0 obj << -/D [3553 0 R /XYZ 65.161 290.931 null] ->> endobj -398 0 obj << -/D [3553 0 R /XYZ 56.693 253.781 null] ->> endobj -3579 0 obj << -/D [3553 0 R /XYZ 56.693 226.227 null] ->> endobj -3580 0 obj << -/D [3553 0 R /XYZ 56.693 179.612 null] ->> endobj -3581 0 obj << -/D [3553 0 R /XYZ 65.161 179.901 null] ->> endobj -3582 0 obj << -/D [3553 0 R /XYZ 56.693 132.393 null] ->> endobj -3583 0 obj << -/D [3553 0 R /XYZ 65.161 133.077 null] ->> endobj -3552 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3586 0 obj << -/Length 2436 -/Filter /FlateDecode ->> -stream -xÚÕ\[sã¶~÷¯àä%r§:Á…à¥}ê&MšmÓIcw¦3»y€)Èâš"’²­ýõ=¼e-ʲÑÓ¾X4ßwnļ[y?\¼»¾øæ{żâ@ÞõÒ ¡q 2ô®Þ‡Ù/&3º4—s¡Ø쟶2e{¹´E{Q­º/¿³É;kïÚþsõË_¯ßc7sÎ!Vª•vUí2S®Œ©Êúkì{öȺw?!‘7W‡]ÿ¡Ba4û¦ýà"¨¼øëõÅoÅ3{*€ –^s˜ð’õŇ_™·ÀïPðãÈ{hZ®=Åàuæ]]üë‚u#ÁöFDxØ,Tq3$½p?΂V)Ÿ¸Q£Îû0猱ÙÏ—’Ít¡×ýë=\ რ:!×ýÀ-m–ÙK¡fi~ÛÞJV:¿í‡z¥/›Ý_r5랸1&o¯ÖzÑÝ«ì—ùhúF¥¿ôÍ#°~ñ¦ïÍ1eRýÞ,±½ô2Í3˜pŽ“¬½.Z˜Àþ¨Ì…À¥À œR&[©…P{í]øµøAÔ«ð“Þiõùràð¾7:/mþ§Ë9øïªZg+“màf[U6‡ÜÁã:ûsÛzø5BöA‹Z|¶ÝЩ'êøQ -/;…>2ƱÎ~¿âíUóFõú¥êöAŠÔâ¡ð‚(‚(T5HëûŠ!äýÀG±Woù•{Òž¿{ØAB̃¾ƒV0¯[»ÊWÀ>”¯§‹ÒÃSÆ‹ø Ê6‹[¯½ø¥£ðžzÅ#‚ù¬ì"]¦f±‡ÃCaÈë'…Yn¶ÅÆ–†Ö¾2ÕÀ>Ì€ -ÐÇ¡ ]räóÐÜw¶-PÈc>;×zË43Ï9™˜¦…Π³T—Ï5k¿XNÏNGbJrJ,Ó‘s_¾#9•AN‰ž1ŒÛIü>}¤2³Ú!+‡TûcwãÈ3Ï$I/íšÚr­³ŒÖ´÷í§Úa "ßÔ>0œ¤(>³}ø¤ïuCn“cœ¡OM|â ¨XÁtDU/‰ œŒ¨ùnDuW–NT… úpþ'{O%êÂ$UjsÚ舒m²]›¼!Û.iízˆáê3Íz0Ó:Xv=™*%Ñ"U–Øn5°†¯ó4ÄL’EÓÑh_¾#œ•A£0€&Á¬iT˜Û-’c˜QÖCþÕñémr8S™‚6yk¬ÒÜ»!‚¾¢z2<~KÏ£ü|¦Îìyn Žƒ® ¤rVU‘búgÊ1îG¢Z¾œÐýˆüÈŸŽ7ûòyã¬ìÞˆB fŽÿ²Xü/fpJHðcõ¦VVìøT?¬¨ÁRJœ:½Ù]]åᣡ]o0‹È‰r3so²!3»ýâ2_J|½Ü>Ça¹Ä\‰œÖî¦*ªKUoª™®88ïÈgeG8 |Ñû8bµä`)æåæuT@Œëh|äõ§mIe25Ek­¦úu=0PÚT‡IÊ+O‘—îj3”/ÒÇSÃN©pÿM+­R„ ä¹+­‰Î2 þûbi æ±2yY×OGDžU &,}ÖY©dÓ•>ò ³²# ‹AÅ]ÙîÛL#ö–Ä[Ýý¯_XcîÁ1äÍ×/ó² ØÊó® ×¥¢ŸÕëÓw½H&AŠ7­ÅŠˆÏ¦ªÅ꛲*tRAn«´Ê ˜\ßdf1‚ï"Dý +¤BÅàGÓUHòÝøî®,ï(ìk#–:rópjÌp܇v@»tµ«¥ç©ì~JLWRÈw’³²#€¤8D¼+)þ¸¤&,ùˆ:ÁgSØ‘ñµ„Þ® ·hBN"ŸÅýÑÖÝêQWâû7,Úèg6sRkíB† &Üf8ïH geGÃgõÛ i¹Éôîÿh‡–Õ¹@Qn7˜½•¥ƒýÒL¸ o ßfÎÊŽ€™ˆ!ê·á½3‰Þ–#¶†W隺,¸³[jQSÁuçëˆ `Fðƒ&›É‚õœœ ¡Ùë,à -ºôu ß‘ÎÊŽ`Ç[ýO´‹ÅahdSÃÁ›&j<Š±©µµÎ@}>¡Ü¢+h+Ñ“4¢rÑ„I"ˆÄtIÚ@¾ªÝ•¥£xªíß›…&—îqÊ£ºãž Ljˆ¼QZm+CUgsÞšMa–™¡4Kzès`½_g‡ -! -¦K òÁë¬ìð¸êÛ1 5þÕ¹­M=1 9{jÏ·±}L\z³™éÅÝvsÒƲîî E“«¿eƒ@cÓeƒùŽlpVvêuž¸ËŸ©:¼^Òx ©‰€Ì,büüñ/±w½ .°c~[ÜéÂn©ëväMŽô$;IÒE}ˆ/Ë© ö§Kmò9ã¬ìÎȸù©“†3h>M‘èòü{œì’ØÒ”‰ÞPc*z"h“d[T‚¡¹Oí¶Ìv§–R¸ÄY Þ4½A€0ÿ”3pïS¤u›ÒüÝ–æîKJSܦy½òd`™Y]AµÛ<ýy†vEjió -–zf»§ßÕ+°¬ÏÂ-¦€Äf¶€ÇÉp†#Mxìµåbº5ûâÝL‰³ªtK ðy·«æÇõ¦ ú{DÕTº>“2ÒDp9Å&ƒ_˜òA|ÊLýTQ -endstream -endobj -3585 0 obj << -/Type /Page -/Contents 3586 0 R -/Resources 3584 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3492 0 R ->> endobj -3587 0 obj << -/D [3585 0 R /XYZ -16.307 900.716 null] ->> endobj -402 0 obj << -/D [3585 0 R /XYZ 56.693 759.068 null] ->> endobj -3588 0 obj << -/D [3585 0 R /XYZ 56.693 738.489 null] ->> endobj -3589 0 obj << -/D [3585 0 R /XYZ 56.693 691.479 null] ->> endobj -3590 0 obj << -/D [3585 0 R /XYZ 65.161 692.163 null] ->> endobj -3591 0 obj << -/D [3585 0 R /XYZ 56.693 644.655 null] ->> endobj -3592 0 obj << -/D [3585 0 R /XYZ 65.161 645.338 null] ->> endobj -3593 0 obj << -/D [3585 0 R /XYZ 56.693 597.83 null] ->> endobj -3594 0 obj << -/D [3585 0 R /XYZ 65.161 598.514 null] ->> endobj -3595 0 obj << -/D [3585 0 R /XYZ 65.161 587.555 null] ->> endobj -3596 0 obj << -/D [3585 0 R /XYZ 56.693 540.047 null] ->> endobj -3597 0 obj << -/D [3585 0 R /XYZ 65.161 540.73 null] ->> endobj -3598 0 obj << -/D [3585 0 R /XYZ 56.693 493.223 null] ->> endobj -3599 0 obj << -/D [3585 0 R /XYZ 65.161 493.906 null] ->> endobj -3600 0 obj << -/D [3585 0 R /XYZ 56.693 446.398 null] ->> endobj -3601 0 obj << -/D [3585 0 R /XYZ 65.161 447.082 null] ->> endobj -3602 0 obj << -/D [3585 0 R /XYZ 65.161 436.123 null] ->> endobj -3603 0 obj << -/D [3585 0 R /XYZ 56.693 388.615 null] ->> endobj -3604 0 obj << -/D [3585 0 R /XYZ 65.161 389.298 null] ->> endobj -3605 0 obj << -/D [3585 0 R /XYZ 65.161 378.339 null] ->> endobj -3606 0 obj << -/D [3585 0 R /XYZ 65.161 367.38 null] ->> endobj -3607 0 obj << -/D [3585 0 R /XYZ 56.693 319.873 null] ->> endobj -3608 0 obj << -/D [3585 0 R /XYZ 65.161 320.556 null] ->> endobj -3609 0 obj << -/D [3585 0 R /XYZ 56.693 273.443 null] ->> endobj -3610 0 obj << -/D [3585 0 R /XYZ 65.161 273.732 null] ->> endobj -3611 0 obj << -/D [3585 0 R /XYZ 65.161 262.773 null] ->> endobj -3612 0 obj << -/D [3585 0 R /XYZ 65.161 251.814 null] ->> endobj -3613 0 obj << -/D [3585 0 R /XYZ 65.161 240.855 null] ->> endobj -3614 0 obj << -/D [3585 0 R /XYZ 65.161 229.896 null] ->> endobj -3615 0 obj << -/D [3585 0 R /XYZ 56.693 182.388 null] ->> endobj -3616 0 obj << -/D [3585 0 R /XYZ 65.161 183.072 null] ->> endobj -3617 0 obj << -/D [3585 0 R /XYZ 65.161 172.113 null] ->> endobj -3618 0 obj << -/D [3585 0 R /XYZ 65.161 161.154 null] ->> endobj -3619 0 obj << -/D [3585 0 R /XYZ 65.161 150.195 null] ->> endobj -3620 0 obj << -/D [3585 0 R /XYZ 56.693 102.687 null] ->> endobj -3621 0 obj << -/D [3585 0 R /XYZ 65.161 103.371 null] ->> endobj -3584 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3624 0 obj << -/Length 2144 -/Filter /FlateDecode ->> -stream -xÚÍ\Ksã6¾ûW°r² ’»§L“LRÙlìÝMÕ$˜‚,”(’CBöx}š¯H¢GNS$U9¸D ÍFèïën4õ<ê½»z{wõæ[I½ˆDŠ+ïnå)NTà…Ì'~àÝ-½׿˜ÄèÒÜ,¸¤×?eΔÍå*+š ·n¿Îâ·Y¶i¾üzûãÍïwï¡›c$’²ÑvëžS®qeÕ ½3/„Þ•_õ.T@z I¢ í?P 0¯ß4Œ«êÆ«oî®>^1PO=æIETä{AĈ¢Ü‹·W~§ÞÚÀ"¢Ð{ª%·žd”p_ÁuâÝ^ýûŠ¶#AOŽH§[D„QÕØô粶¢»íÍ· R?‡¨î ‰P!44˜Ý›ÂÝ,¥ðøúÙeé?nŒÃ×¼ÈV61ä)+–¥ý¿!Ÿ¶É?É®Iï–Ö¤qÝÔt ƒYõZ}¼;˜<p/ð#úa5 Õï’  -åq…‘WouøÜGÚ>ÿëËxH ê:h³Jz¬~I˜b}ý’2Àxbz8ô E"M`l­°xðš‹_Z'9šðÎpHµNòåryä#/õxê©.wyž‡ „+Ø¡²éNr¾"‚†…$ ý3 ÷ÞÝ î‡¬4›oK³Ò»Ä‘]j]y,×»tA´a%²5n-Ú]C€-qÏùanßÊÛtiÒ¦ -‚'ÞÛ$ˆH¸l­úR†0úçk®3@%QLÎx ¢öŒ29à{úÇ~¼±xÀË( ‘h¹ÿ?ùR;l8Îu¡Á› 2z‚¨í'í±¶ªë§- Øê³£·¬ª{uQ*‘…„aJ*Ùê´£‹;k\ò|ÈÖAÅ¿ÊRGVzkÚVYæÒÌRšœ$F/w ÄË!G°¦œE¤¢PEÏÉ"FŸÍÈ"ÇúG²Èhc°ˆô §þà”¾Š9ØZK;¨ñi½M±2È ÐZˆ±»Q­šHQMfpQ>á²!>m5Pš¸1Å€Ó6^0‰ÙšÔ ¨ -$SP£Šá YÛóÇôð>Ö?Þ£oZÍs ïÛ!+e®ñ€Eªl\iêê>×ÕX ¨Å¦,³â|`Sø Õ%-B -¹ ›¸Ì϶y–V@®ƒ\?˜ƒ?Ý"`Påúó¡[@v öô19º{úÇ¡{¼±xt²IÀ[Âÿf›»ç‹çXÜN½{à²'˜˜G“ i óg¤ ÓãÄï“,ÞœK:1cxêééÀ£àÀ’ƒ¥]ö™$ÙS‰vI‡Þ|Òøˆ7ínVícØÚ[¤ä^Šˆ G$.à'6aézoï›Õ ‚Ϥ¬öñ‡„ &k³æ AT`Ît¬$‚G;Á`Ò. ¨›n¦]PúŸýÁbËF,ë?Y·ÆÖ–e\Ø_\b×ÓËÜÄV#càV›]Ž]W3èÙBöïoÿ¥"Š ©5â!`¶¿‹ÿ×€¯".Jy>$áœOœ„oõÆg£ RèôaPÚíU#Ÿó| cÍÇy=ýã8o¼±xÎó!íæaë _%º°«g좷F¦§Û]âlŽÍ*ÂI¶‹7ØS3Ò€Â|ÜÙ¢G'R_„RyQ<û²¦iál—äI)d¦ƒÌálN$CzÄ¥?’õDòhc ™…DŠÉw»»‘ÁÛžÄgn¸î<=ŸÑ‹ÞÕîòÙÀdœp%. LQH_£¿KmLõ0›¹ÜÃrtöôCçxcñèäOÂÁ•Å<ç]›ÍeüšÃ+ÉíÉ`ÇY±D÷€­‹†¤ä±mvê#]!é\bá°ÉcROÿH¯m쯇 -»˜ôöðÃ!Å;{¯œéBzÄ=R¡ƒP‹Å3Ö±qÐÒáÀ擳ðzä0®¿JXÿúÅiݶÌZøöG´?Á!:©ð@*€ØÇ;™ÛÒª¿*Æú¶öózûK¼÷y -ïX­"–G9LŽÓIhÉ…d$ ÛUµ/°£îDùóí2ôôdÔÑÆ`T÷òv—á{î,ΖØUB]¢7Ÿ-:‘ÁÚ{"w8¾~Ì -½ÉõÀÕ6î ¢ÄEϲpæÆ'>˲n¶9}Ÿô÷ºÎÁÀ¢BÒ*gÜŠ`äÑ|0ïéóñÆâaÎ"EXGšƒÎºè倴»r 4ÜPN—Ñ7n<ñ›l烳Ð0H<":ßÚ=¯,Ñ!0) “Ö7*j¡ý4ŠQx°ïìÃ:¿.AìqõÜ'*`ûPÒ¾¬œ$Ù —×OÕ}õOñº^Ïo¾¬õ §×7L^·wÜ“6W[˜ËöMçlÿÆs“ˆù}³ž PË­_·4õ^E+\‡²Zwi«w _¬|sB›ë¢y›4Ú¢ ~üM¹4/ÖÉÿ~*·Nq–®ìÃ֭·30 Bù|œ{¬~åŽ6ϸ%>óÿ&+4_!7ž—»þð«åY}Ûϳ¤no‹]Š$ýw;óÐ+Ãp.õç Üÿ%rmª¢sþIÂÊo\â -endstream -endobj -3623 0 obj << -/Type /Page -/Contents 3624 0 R -/Resources 3622 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3492 0 R ->> endobj -3625 0 obj << -/D [3623 0 R /XYZ -11.232 900.716 null] ->> endobj -3626 0 obj << -/D [3623 0 R /XYZ 56.693 742.442 null] ->> endobj -3627 0 obj << -/D [3623 0 R /XYZ 65.161 743.125 null] ->> endobj -3628 0 obj << -/D [3623 0 R /XYZ 56.693 697.701 null] ->> endobj -3629 0 obj << -/D [3623 0 R /XYZ 65.161 698.385 null] ->> endobj -3630 0 obj << -/D [3623 0 R /XYZ 56.693 652.96 null] ->> endobj -3631 0 obj << -/D [3623 0 R /XYZ 65.161 653.644 null] ->> endobj -3632 0 obj << -/D [3623 0 R /XYZ 56.693 608.22 null] ->> endobj -3633 0 obj << -/D [3623 0 R /XYZ 65.161 608.903 null] ->> endobj -3634 0 obj << -/D [3623 0 R /XYZ 56.693 563.479 null] ->> endobj -3635 0 obj << -/D [3623 0 R /XYZ 65.161 564.162 null] ->> endobj -3636 0 obj << -/D [3623 0 R /XYZ 56.693 518.738 null] ->> endobj -3637 0 obj << -/D [3623 0 R /XYZ 65.161 519.421 null] ->> endobj -3638 0 obj << -/D [3623 0 R /XYZ 56.693 473.997 null] ->> endobj -3639 0 obj << -/D [3623 0 R /XYZ 65.161 474.681 null] ->> endobj -3640 0 obj << -/D [3623 0 R /XYZ 65.161 463.722 null] ->> endobj -3641 0 obj << -/D [3623 0 R /XYZ 56.693 418.298 null] ->> endobj -3642 0 obj << -/D [3623 0 R /XYZ 65.161 418.981 null] ->> endobj -3643 0 obj << -/D [3623 0 R /XYZ 56.693 373.557 null] ->> endobj -3644 0 obj << -/D [3623 0 R /XYZ 65.161 374.24 null] ->> endobj -3645 0 obj << -/D [3623 0 R /XYZ 56.693 328.816 null] ->> endobj -3646 0 obj << -/D [3623 0 R /XYZ 65.161 329.499 null] ->> endobj -3647 0 obj << -/D [3623 0 R /XYZ 56.693 284.075 null] ->> endobj -3648 0 obj << -/D [3623 0 R /XYZ 65.161 284.759 null] ->> endobj -3649 0 obj << -/D [3623 0 R /XYZ 65.161 273.8 null] ->> endobj -3650 0 obj << -/D [3623 0 R /XYZ 65.161 251.882 null] ->> endobj -3651 0 obj << -/D [3623 0 R /XYZ 56.693 206.458 null] ->> endobj -3652 0 obj << -/D [3623 0 R /XYZ 65.161 207.141 null] ->> endobj -406 0 obj << -/D [3623 0 R /XYZ 56.693 170.984 null] ->> endobj -3653 0 obj << -/D [3623 0 R /XYZ 56.693 144.125 null] ->> endobj -3654 0 obj << -/D [3623 0 R /XYZ 56.693 100.588 null] ->> endobj -3655 0 obj << -/D [3623 0 R /XYZ 65.161 101.272 null] ->> endobj -3622 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3658 0 obj << -/Length 2036 -/Filter /FlateDecode ->> -stream -xÚÍ[ÑrÛ¶}÷Wp¦/ÒL @€÷>µi“6“´½±¦·3I -²XS„JR‘Ó¯ïR¤l‰–ìeI&}±h -\,{öõn<꽺úvv5})©’0à7[z'ò4󉯼ÙÂ{?zgkr;žpIG?¹ÂæÕåÒeÕE±ª¿üÎEß:w[ýóÛõ›ñï³×ÐÍ„1JYY».>%6_Y[äå×Ð;ó4ôøeï"PDqíM$ UÝ¿R`PéÑ´ú`<(¼ú~võçóÔcž Húž - (÷¢õÕûß©·€ïÀ"Bííö-מd”p?€ëÄ»¾úß­#AO"Â=h¦d¸ÉÁ¸ £Aåć±½‡½÷F)ý’9¹”ò$Noê—<1D„ ⵩Ù!|K—$nÌåhW>·¿­LzsøÊ”–?Ž™ÕOÌ­M««µYÔ÷ -÷0*û¾Áõ‡¾™D©òõ÷}o2·Œ/¸ ¯Íuxh¹CyœF¶1ò FÐê:«ò…œF^™H¸€±¥~eõçò¤ÝÞÝ}>ˆÒMD .¼ss›ãIQ¾.̧¥ÿO‡«÷°“5xIîò¤² YWš-?^æ d9SÜ ´&ZÉ2_Êû’Bö‰Àã$„Ϭ·î@)²àÐAe˜•­»Ú—„¬i_R¦‡cð$äaÎî f7^uñ®FÓɈ׌p*ªýf±8I‚Çv\å¨çÛÍÆA - —ü„j˜Ú®á ZžonŠ"‹çÛ’0qí·‹Ø–ØµN‘AÛ¹l‘ÇÙ[$J@z¨. ¹ðy™k_ªŽ¸–ŸåÚ7ñüßͯÉY9LIÜïY)`* ;0ëÛa“TÒb YM²ë¸X(^…Üíì™5ÈD‹©µd-­‡£Ö†ýnÔÚÝY<µJE!@5µ¾Ø'8’)R³F’[bÓnlƒ¨À«I}ãñS£A:[Øõ&1Òa@-ÎaÓÆÙ=`ùºØAu|‹³¼ñbÏSÊc:ï7§ö;⦳³-p#CÂY-Sbd‘™×pLÀ¹+V¸–Y|³*šÉ:½œ¬‰]h,šyÝ¢`ÆÉןµ`, T«‡‚Á?[0ÌÆÈË%ù¿»l(.¸èsP庿Â)¤¨ >Pá0ÓÿV·ájºpÑÜ¹Û ˆ´Év³¸'ðg³Jh WP!ˆ‡#ƆýnÄØÝY<1 -¡ Ó51~£'&l1Ar¦ÛM¿y³çÆi^˜$¹@vggý6Û¬w5ÔŒ- LËÊ@øþ1o÷€SûÐÙÙð἞jkQ%Þ¯G¡Z“â³eñ¦øBÀéˆË¦c¨¬]Óò×-·s|³Í6.·mÑÁ!ÇT8:NíwDGgg[ ƒ„ué…†»TH‚ÎûMð¥‰â$.Ð ƒÊ鎟ҨҿrKÙœŸ åÏC‹A¥Ê‡CÖ‰ùŽÀêêj \1I|ª+\å©Ùä+×Ô{û!*«ïËÃ1G&¼ßÕŸì J•€U’‚†„úì³*IdÓBRœ’¿]¿™\›;—>!$å—’¥ÊOJ…xÁWxi²¹ÏM>ø]–¢Í6‹‹¿*ÁøºÌɇ]¾;“˜”«ižEÓÈ­§éÎ$ùjº¿=ýÕfsSÄkò‡ùhjÁùäuôä‘'B‡à¾8øòR´ŒÑû+V]á²×/÷½E8œbõ)|3\Erj¾ovvÏ›>„+}¿µˆ•Kk·ˆ—q9ä°D˜£gfSô<‡£7-#·n[´Ð·qäÒ6r¸¹·øĺbfÖ¶°YÏ…Ÿ¹µ)Vìc‹)En›ž[“5”O„ÿ@‚ÖôQ#E ¶n3A2éñü×;Âö»A¼»³ŒkI¨ }â³ð0Á63åùÀ*(,Ôp%gÃ~ÇÀvvOž\s¨\êÃAÃÀu›c}‚ãåÏÈÂu[l¶ÿ †Þ­l†ä¸ë__! Üíz¦AôÂ]šm‚œn2³­ž£Glmú>ŸSÏ`ùÅ‚-„{MO£®éqOÿ˜6Nû¼DX«÷2È«+©³­”F¯úx .S} ýSŠ>.8áŒõ¬Wö¢+Mù±¿=}¹‡Ê‹*·1¢ep½Â}‚ÐÃéÎÙþHé`³î©ýŽ³ngg[̺\y8ïÜB²ìõz¿d{cS›ÂkÁn¶= éÒö“¦þǵûaööMÏwjôÙ êûÃ!ìÄ|G€uuµ¾˜O‚âÞles´`-¢6cmjæ vË;syÞbM=³K¨@ÓÈö¼Ò=›ÄDXjÂ.;›Ì,Ù¹l§¦I!-ÐÁÂøj8=Ý°ß ÝmÊI k=ýc>X~›÷=ýTr£åÖï6ñS!þ ¦½+:À¨M^j¨)ÙpË ûó²³³ø¼d!xZeå/ûÃìöÔ2¾ë9{çÛ›s‹ _±@IÉü1b©á¨¾_ŽÇ3ìßð5¤.²º½+lš?Úk3ÉùšÈ0€ýXPBƒðŸü øoÇh@Ö -endstream -endobj -3657 0 obj << -/Type /Page -/Contents 3658 0 R -/Resources 3656 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3492 0 R ->> endobj -3659 0 obj << -/D [3657 0 R /XYZ -16.307 900.716 null] ->> endobj -410 0 obj << -/D [3657 0 R /XYZ 56.693 759.068 null] ->> endobj -3660 0 obj << -/D [3657 0 R /XYZ 56.693 738.489 null] ->> endobj -3661 0 obj << -/D [3657 0 R /XYZ 56.693 691.479 null] ->> endobj -3662 0 obj << -/D [3657 0 R /XYZ 65.161 692.163 null] ->> endobj -414 0 obj << -/D [3657 0 R /XYZ 56.693 655.012 null] ->> endobj -3663 0 obj << -/D [3657 0 R /XYZ 56.693 627.459 null] ->> endobj -3664 0 obj << -/D [3657 0 R /XYZ 56.693 580.844 null] ->> endobj -3665 0 obj << -/D [3657 0 R /XYZ 65.161 581.133 null] ->> endobj -3666 0 obj << -/D [3657 0 R /XYZ 65.161 570.174 null] ->> endobj -418 0 obj << -/D [3657 0 R /XYZ 56.693 533.023 null] ->> endobj -3667 0 obj << -/D [3657 0 R /XYZ 56.693 505.47 null] ->> endobj -3668 0 obj << -/D [3657 0 R /XYZ 56.693 458.46 null] ->> endobj -3669 0 obj << -/D [3657 0 R /XYZ 65.161 459.144 null] ->> endobj -3670 0 obj << -/D [3657 0 R /XYZ 65.161 448.185 null] ->> endobj -3671 0 obj << -/D [3657 0 R /XYZ 65.161 437.226 null] ->> endobj -3672 0 obj << -/D [3657 0 R /XYZ 65.161 426.267 null] ->> endobj -422 0 obj << -/D [3657 0 R /XYZ 56.693 389.117 null] ->> endobj -3673 0 obj << -/D [3657 0 R /XYZ 56.693 361.563 null] ->> endobj -3674 0 obj << -/D [3657 0 R /XYZ 56.693 314.553 null] ->> endobj -3675 0 obj << -/D [3657 0 R /XYZ 65.161 315.237 null] ->> endobj -3676 0 obj << -/D [3657 0 R /XYZ 65.161 293.319 null] ->> endobj -3677 0 obj << -/D [3657 0 R /XYZ 56.693 234.852 null] ->> endobj -3678 0 obj << -/D [3657 0 R /XYZ 65.161 235.536 null] ->> endobj -3679 0 obj << -/D [3657 0 R /XYZ 65.161 224.577 null] ->> endobj -3680 0 obj << -/D [3657 0 R /XYZ 65.161 213.618 null] ->> endobj -3681 0 obj << -/D [3657 0 R /XYZ 65.161 202.659 null] ->> endobj -3682 0 obj << -/D [3657 0 R /XYZ 56.693 155.151 null] ->> endobj -3683 0 obj << -/D [3657 0 R /XYZ 65.161 155.835 null] ->> endobj -3656 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3686 0 obj << -/Length 3471 -/Filter /FlateDecode ->> -stream -xÚ½Ërã6òî¯`Õ"UY0A ˜=M&;ÙLev’Ø•IU’LA3©ðáG¾~R$EÏ@C+$ÀF£ß 4ä{wžï}wñÍÍÅÕê{1ŠYÀ¼›ÇÄ"ã…‘w³ö~[ü,3)*¹\Ô_ü¯¨eeš›¢4zk;¿-’oŠâ£yøõú‡å7oašÆ(¦Ô@»®Ÿ2Ym¥¬+Õ ³cÃì,T³¡(àÞŠ¢8²óGF|qeþဩ/þssñ×ð¾‡=Ê‹C/Š1b~à%»‹ßþð½5ôˆÄÜ{Ð#wÅ> -BíÌ»¾øé·”ð <ÑX“¤Nb„}fú`ªñh?ô~[aß×ë^ý*2‘Ûåõ‰ ´BDüعi ·)²¬XtñæwæU²ù]Kê­Xþâ~‰éÂ~q+enZ;±¶ïêâÀ=7 }˜s‚¢H-\ÏýXe«å -F?>ƒ+¬:âQ;<)ÚYª4Oäˆñ˜†|Ó.¸ !qVÁˆ“ü¨¿Áˆg-DáÀa¼Eá] -4‘Ùï>õëüÅËz_ïÒzûõr…xx'>ÊMšÉ›>½¶ÀÌ"¨&Qÿ¾ -ˆ<ŽxŒ”ð¨÷ÔQ$Ì PÌc¯”Þ¦/-hÓo'à [ Šv«ÑsáS„ç>°Èç2C_“ŠƒøÕË;Ï4~¶ª5ào‡8¨;·šuÓ”¹\¤â(›âo±Ù¸ ì B§¯‹VF?Zü)J7È·Mš­Ýëon¶iå½”»â^:nͯÓ`kžŸaâ¤~D Oä|Ò;?Sxç¢z‚ìFùuUoŽp#¿|¬e^¥EîÈÛªÙv¬<³ÓÀ{Yž€Cá¨l÷ûüÐ}™ºâ -ÞíDyeàÂ9>ŸÀáÏ”ØÙÈž ²Œ 0Õ"{Ì,KïEŸ1cß;ÊÃSѸ ¥t˜4e)ó:{rÞT*¬r“²­œ§ÀŸK#yœO,‡ðgŠåldOK -1u?@Pç(4Ž¦FŠ2Kåi†ñÜvzùisÖ\ºMcCú¬ÖìïJ•[œ(Þ!Gâü³‰÷þLñžì âM€@6 veƒqv`E¼XžÖ<óÿxóÀfÊ ˜2ü’O4eZÿm²··RäU‘·¹‰á£«ªL®’bw•?ˆ¬Ú^é×W¿ÈòVÔéý !Ø û{æ›!Ó&„Ç¢’—ß}RLŒý®…MË‘î>Ð1¤1A±¾trž¦ÍGÖ]ÓhÌŽm:ùj½v5Œ»bnÒÄÈ=,/\à -Q¿p’ËÇ`IdYÑÔ'$¿iRä' ¯Ò¿qÞ‹Rìdíê…]³äZ|”Ž¾:Í]m¯H’¢É§É66QˆHx°Ä·ƒxoP„(­³r4"”‡(&ñùt|¦ŽÏFÖAÇ9¤ÛœÁ\ -Úêãý”Ï6ôÎH×ø™d‹ê –3b(ˆlfx&em*W{ì¼ñæ½c ÞÔû#C¨{Ô¦òóîa+]3Óë_¾s4ßÅà AWDZ–ÑdŽîR€ý6M*gŽíÄKoRYÿU=±Åg±¼ðß?³!3Æx¬€Ÿî?¶Ã9Ÿ3®P;r–¥ô“€I ‹ -qÜr†bׄ…Òù$ø' -y Oð ',•x,rFÇù‡~}õF«Êk#Û.YËÙÝCzÆ„•#v>§;„?ÓëÎFö·`2rr¢e_ÖØÞÉ\–¹î—¦Ž¨Šº.ÓÛ¦v=ËrÝ{ë;—èßmÜoÞýàºû¸þb”…³í¥Å8:ŸŠ áÏT±ÙÈž b—ø´«»¨œ3Ö:Ùº -­ÌÅmæz„QU5fóêù´”BóÄ×4÷4Úg"qµN·OΧ>ÂÕÞå:ÍÅØŠœ  $fÓómšàÏSùȺ+‰cDˆÝ4ûÞ1†(ÊÕK{ “qœxNÒä©»7t6Úµ|¬g¨Ñ)r QóùÎÐgÊäLDOH‘6·[#5„?ÓLÍFöCE¢a`¸øºØ§Îå‹÷®›«Vؾ°´ï¹³ËÕNqp!Geg³ ‡V'ìqcŽXdƒÉd¹¶­n• i ™§+·9ò1í8ôËÍCš'Y³n«¶Ó*ÙymK¶U wcË»A±ƒG]Ïm«˜Ä4ÖëjT^=Q^¥wyª€$üuSÊAùø×#{H££jô®ûÕ¾kêbébgü»)Á±êÿwd.¢|2O2‡Ä~h¨£ßhx @—¾‡~lRmÝÒP H•W!˜ÁªwU@wä†æ¡­ˆ4ßðÖ}-ÞêÁ#Õ ÀNpF[ÛÛ­é˜óbpÜm1Ûå¢å -“ÅÍ’]Ì46ùÓí‰zØ\ÂS@•´8Û {Öª´€ t¯–*²Fñ“ņøQ¯¶ûAߕĈS>^ ªlÉèhIH²ßWÎyôL&°‘ |KLqûž€ äT^õöÉ`¼†ˆ˜©Ž.Õ²H믖”.*3_¡Q{Ü1šò ¸»Š0¥ž…¼79D,«`Øê[ÐRuT~Ë&õ²'É‘`Óñü úO­¿“ùÊ°p¼1²¯ž”%Ì;2‚åسÔúQ¡$º[¡=í훣îËMYì¦.æ¾ûáchð¿×™M— ü“¼º––÷5²2E“K|£ æû×_–€!³¹Ø·žR˜žŽ™ªs_Š0÷©É¼TŒÝÙ[x0÷”a\Ú­a“†ájøzë#¼[ßTØ Øï;½&LX· éù$x²tAfP›C¨ž.T€÷Ö½µ)B Žžé4À~ØåúæÃàN) µ€ÆV¹(ïa®ž,æ—æÉd2ýѽX^=j °qÁDÒ‚9Ó÷Z\æ¥9ª‹d_¦Šzûiríaðé$EÕ'Ž’½ÌA’rvHR&"P†ÈÇt„…Ô¦#j>+ªÆáÈpLñÕrFyÅçˆN'xÞ–¼5Ò·ÇüÚÓª÷V츱ZêUkˆÍ“Ñ!èæ¹'Ð\¥.YfºíÈdÂMŽ¢³•M&…$©c£öÇÕådð‹¢pð™4f &= A†”ò™±Yú”.QDdockdìwË¿'dæE?õí9ÿeiM¹§û{JÀÁÝغw®·3,Ã==ó°)û(dbŒ.!ìý\‚*mŽcÜý\B»ÙvøÉ -D,¡ÔoDLü¶ƒlå'ŠÌš÷>HepÐÛÈÐôµ›!WæK.ä±NBô+±Ù,C mR›‘ÛœEu‚"¨@5k¿ÒŒóž6èQ:zSý;¡`Ùo¥y©•KcRK+^û=´ƒ8B$ìäÅfþÇËöPÒ’©MÁ‘ÆH§†¿«Ú~“)üŠ€]V ¢ñ‘V @‚Ìö2”1-rnGƨÿ6Ãî»õt£â«÷¯GK²Åm-¹«h¶‚~ô« Ä7É‚ü¿ ×w -endstream -endobj -3685 0 obj << -/Type /Page -/Contents 3686 0 R -/Resources 3684 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3708 0 R ->> endobj -3687 0 obj << -/D [3685 0 R /XYZ -11.232 900.716 null] ->> endobj -426 0 obj << -/D [3685 0 R /XYZ 56.693 759.068 null] ->> endobj -3688 0 obj << -/D [3685 0 R /XYZ 56.693 738.489 null] ->> endobj -3689 0 obj << -/D [3685 0 R /XYZ 56.693 696.656 null] ->> endobj -3690 0 obj << -/D [3685 0 R /XYZ 65.161 696.945 null] ->> endobj -3691 0 obj << -/D [3685 0 R /XYZ 65.161 685.986 null] ->> endobj -3692 0 obj << -/D [3685 0 R /XYZ 65.161 675.027 null] ->> endobj -3693 0 obj << -/D [3685 0 R /XYZ 65.161 664.068 null] ->> endobj -3694 0 obj << -/D [3685 0 R /XYZ 65.161 653.109 null] ->> endobj -3695 0 obj << -/D [3685 0 R /XYZ 56.693 608.471 null] ->> endobj -3696 0 obj << -/D [3685 0 R /XYZ 65.161 609.154 null] ->> endobj -3697 0 obj << -/D [3685 0 R /XYZ 65.161 587.237 null] ->> endobj -3698 0 obj << -/D [3685 0 R /XYZ 56.693 531.639 null] ->> endobj -3699 0 obj << -/D [3685 0 R /XYZ 65.161 532.323 null] ->> endobj -3700 0 obj << -/D [3685 0 R /XYZ 65.161 521.364 null] ->> endobj -3701 0 obj << -/D [3685 0 R /XYZ 65.161 510.405 null] ->> endobj -3702 0 obj << -/D [3685 0 R /XYZ 65.161 499.446 null] ->> endobj -3703 0 obj << -/D [3685 0 R /XYZ 56.693 454.808 null] ->> endobj -3704 0 obj << -/D [3685 0 R /XYZ 65.161 455.491 null] ->> endobj -430 0 obj << -/D [3685 0 R /XYZ 56.693 418.637 null] ->> endobj -3705 0 obj << -/D [3685 0 R /XYZ 56.693 383.429 null] ->> endobj -3684 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F95 923 0 R /F98 924 0 R /F57 739 0 R /F102 977 0 R /F108 3706 0 R /F110 3707 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3711 0 obj << -/Length 2425 -/Filter /FlateDecode ->> -stream -xÚÅYYsãÆ~ׯ@UR1™ -GÜp^²ëb§ìͱzHÕ®@p(¢„ƒÆ±’üëÓ=Ý3HVÒ¦â'ÌÅžî¯ï¡ï]y¾÷·³·—gç±ïå"O‚Ä»Ü{I ’ÔËd(ÂÔ»ÜyWÿVµ*µÞ±¿zßj á¾ëi0xó]W¾íºkšüçÃëŸ/ÿ×l¤yµã]­†ƒRã€Ûp»ô2¸= ñö(IEdÞ&yÊ÷§9L³Õ9}dàÏþzyöË™ò¾'½8Izi.Eâ^Ùœ}üÙ÷v° ˆ(ϼ}²ñbé‹ L`\{Îþuæ3þ ‘ÔAÄÐŽr!ý„xú±h¯¦âŠå®vª«O¾(†¤jéÛíæhÏá‰ZµEc ,Ú ŽÅx uÍðrO5A$r?Ãùf·SH#JW­Zñê'ìÜüh%€¢QŽPî "tšð(ºiõ @8A®åÊbˆ‹­Ú²žvĈh¥"1VÇ«áëM(ýÕ#­ß¬aÒõ×|¾®®qA3¯†o­IƒFtù{ØOrvƒÔ_}F=õ¤h½Û/é kJïÑA.2™,¸¬íÚͯªïP'i웟,zf—î¥Å›j<ÐjA Žž`63tRG"eùÜ(­Æf¾øTý#š1¡ää¤0jêºÓÖM°¢U |ó§ ˆç>nbxXÔL…Å :¦í®ê‡§àTñ ~`Ô…¦ªÐa%f@ŒÐxÇþD\ t/ÄWíRŵ›óߣ‚Îõì|ßu"[bÕ påæ'â9L›(ˆE”3Ëþ­Ñ|’lÂ3ü&C)¢Ðº b¦!\D°N’Ìœ=í½ -¥{Ã&L!‡e’ ÓF¨º芢š­êű+eò ›sd -™Ù«ýZf+}þŽdÔøTªØHðË@3áøåÅZÆäja²ºø~cÆaóÕ¤ó<¬b0[Ê3ë{†P3-ÇÄŠÀüzìˆNt/M1ŽU{E›ÝžÖ9ˆÁ -Ý4Ð2Ä–'¡HN:Ö\.°ä"ˆì)kBpØ}Ê0tæ¢0Q|/÷~òcßA -±½-šc­`]¯¦ï®ŽuqgbœIP'Q(L.‰BÅÇ—E ó’8±·0|ì1ŠîUqœ–Ê®îlTŽ}Ã1ÜT•ÅhS_1žj=”E¡¢3e{= Üâ¾UºV ÙÂy>Ùß±m› n³¯áÝ•gO‡š½iGÕ¶,Û÷ÝdŠT,=õà¥%‹¢„õ¬ÒŠ]öÃtŒÕ8UǬ Ì”ºhÙóˆüÂjör9êÈL¤~æfbLhÆDSEÝ•E áG-–J‘H¤­w± -\N_‰>ç’n)Èò\žÒ,àH„`@ëKCPŽ¢²$‘%é@¦à!Of°§¤jâP™nãAy¼‚î1ÛÓ0—!™xì¨u¯0,Ž?ë -™í”&ý< 16n3WelÈÚW[„eÕæ mÉCÑ\6‘ÞÙïÊN»#N,¤çà$¼ƒÆŠ_ƇÅhrŠü …uÚ+jˆÛÎòèµ®ôq^ÊTIQ|£zæ«q”Á ðúkx·¬l–ÚeàÏMªàFêì–BtY´&p±Ÿv½cBõk#Õ¯j÷rCPí¡hKcC…9PÜbJ`†¬`.ya4xß™†V&Ü]Áà}Ü2ôõLÇ#ý…pn@¿é¬·ƒm.a1zàÅ^éÔX2©“MàìviD}$ N<†¬ªkh*ƒ<_½©]½‚ƒ3æ.É]Cp©bÈ°é®m`cx÷6¦ø~jKtêLønÄ«è”]kö”›0Ó@óPm+Mö…Êtß}6aA«ÄÚÅ D°| -Aƒ ã‚g_ܶÜà$¦ÏÌ ˜&ºí0!Nú¯Þ6õ·k Í+(›$ŒrÂÌ_$^µûŽø8Ù€&‰zt¹_RãA•×6*b§]w:ä&™±:|à'Xü#݆«æ6ݾ‡lhø¶ü¸ §”O ú÷Ø’ ä\wÂŽ1¾™)¸íïø -9+lmï¸ÍÇ̶yHh€{™µj4Òè@?†d]4eS',™‘‘‘ß^ ˆ›¦„8b+7ÙõÊ©€ìsãàšÔ¼õ[ºwו“qçÙá¦j«¦¨Oíåít|¹Ç|ùW`e] K¡Ú¾ >nL]Ùîêû/%š€˜ýÖÄîzMM……·a081,0˜ü…#ìÆT¯sD0˲8Õi<0ú¬bi¢Ÿ¯@þïÄq÷ôcLÐRÅ[n! Ó-³RõZÄRÊät0¼ÔY}L¬¿ÓûÔƒäê¦QcÝl}<Ð §zœ¿]@%a¾µì’±Aò¥IÊÏmUntçv›ÖÌk̼OœÆ®.¶ª~ñCô{‡zÀ± ¾àÒGìC"_?‡Ø•M:Ä…‡88išü‘†5ÈO9'÷‚ü¾hxn~ùÍAµîéiÆßDÅ ȘóÕ7D\Óþff]ìæöO¶•?üî6IäŸ?‡22A ßÀuÀÙ+¦U‚1ÓŸ«±¨¬R°Êäš~¿ 1R·môñÉÕÒ%‹½rBš®2çi¶ôóÎdÞã6…õŠÊ"×L¥H¥&Dë‰jàI_¤q® ° C‘á=ˆŒŒà×÷ޥ㻮iºv¡Éò5ÄaÚVÏ“qt*è…§×,ijŒÊÇx 3Æα¯BßLB!Àm*|äeöþ÷N™ov``‰ïŸj,œè7 8@ Žw%ÜÁès&VãYz—£¯xòy’ø™åϯéRøpxJª¿`X±àê³êï J`žÓ›fý1áŽñùÄÿ ¸.cÄg…®Pµ‚£¥R-áÖ6Ñ=çÀ²—`MÃÿWŠ/˜º¿CÓHmËÌHyVlu)97ï^SϘj}xtßwÍRŽ(Ú;{Üœå”>—~é?ìÈ~’¿æ/ìÿÂZc‰ -endstream -endobj -3710 0 obj << -/Type /Page -/Contents 3711 0 R -/Resources 3709 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3708 0 R ->> endobj -3712 0 obj << -/D [3710 0 R /XYZ -16.307 900.716 null] ->> endobj -434 0 obj << -/D [3710 0 R /XYZ 56.693 268.753 null] ->> endobj -3714 0 obj << -/D [3710 0 R /XYZ 56.693 240.367 null] ->> endobj -3709 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F57 739 0 R /F102 977 0 R /F93 909 0 R /F113 3713 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3717 0 obj << -/Length 1220 -/Filter /FlateDecode ->> -stream -xÚÕXKoã6¾ûWèh5WoK½mÒ¦i±tã ¤{`¤±-„"’Š“þúR")YŠƒ¤EªdO")>¾™ùæAºÎÖq_g'ëÙ»³ÈuR”Æ~ì¬7Nì£xå$^€‚•³ÎËù €,–~äÎ?1 B77Œë†Ü™Ÿ?³ì„±kÝùzñañmý»:féy("½Û…¼' vR4¿Õéž“¨Óã 9=ŒWhå'Î2BéÊœŸ¸jÃU2§?ž7 g¿¬g73Omï:žÅ(Ng•z(v}'+g—ß\'Wÿ¦‰³og–Nä¹ÈbÕ&ÎÅì™k4á4â;jÚ*J[•ØÍÃyn¬Ay!ò[vs¹ô\ן}6b*UéÀQ›Åk«° #„-üh¾/èVe;L·VÅ;¼ðÝùí‹æfÅÕ­çfL²ÞíÙ -l¶—„hµjnÏÞ°#ø”4aÙ)³;‹‚f02²‡Vòt›kj ¡&–^š"ß÷”ÐÊŒn wýË÷£Á¼ñw„;AaœXHïó|±Œ•zE]UŒKÝiØŽª¡VƒMgK˜˜ßëPÉ ƒ“GÒ/õQ -6Jýè%ÑJ|Eq¶Gg(eÛ?PVK0=¦¿Y-$+‹¿á`¹nª=šTˆìŒ˜Ýx …Á¥RòU-a)¿6612aªW0Òì^2nþ(.低­ -šÃªð­Ë+àl6r¨ÅÄ›±f ÝÒûü »Å/ Ї9žíNcĸ#½þi§¦ý¨jÑùŽ(-µS†DÖ*_`Ï™õŽCP2¦¹e—åfaÔ¿/änD[S¹€›¡@â•xöPÅŠgˆÞ–Tx9·„†QÆ[”*º½šG#q¦|Æ@ÅüZX×Òß÷T¥XwÎY-²jx-ø @It‰78šxÏ×?¼íÔ»“%9‚ÐQèz/–|}UmyªvÒÉ×ÿ®’oüÿ£½Q¾„QA‘dÙ(‰Ù…픺‘â¦! FGI/gYÝ8 î­?ŸNëˆøñ€2ܽżhê Rùh|Ñ{õSt¼™H°¥bwê~hïÍ- q†ÛœŒ·møÍMb”é”çòaØÉuÙÛVù9­-Šãdfg±-8.AÚ˜Þ‚ANëê6¸&òpñ¤d> endobj -3718 0 obj << -/D [3716 0 R /XYZ -11.232 900.716 null] ->> endobj -438 0 obj << -/D [3716 0 R /XYZ 56.693 759.068 null] ->> endobj -3719 0 obj << -/D [3716 0 R /XYZ 56.693 738.489 null] ->> endobj -442 0 obj << -/D [3716 0 R /XYZ 56.693 543.889 null] ->> endobj -3720 0 obj << -/D [3716 0 R /XYZ 56.693 514.881 null] ->> endobj -3715 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3723 0 obj << -/Length 1745 -/Filter /FlateDecode ->> -stream -xÚÍX[Ó8~﯈$ZíÔ“K“¦Ë,,bˆ)ÒJÀƒ›¸mÔÔÎÚeøõ{œØÎ¥`W#؇ªNâœËw¾sq|oçùÞ‹ÉÓõäê÷Ø÷Vh•„‰·ÞzIˆ’¥—Š–Þ:÷ÞO¯II° ³yûÓ7LÑ.·Œ· ¹×Ÿ±ì)c‡ö⯛W³ë?@Í<Ð*Ž[i7ò¶$bOˆê1h¼´'‘Ò¾H–h¦Þâ½Ô´ØíeyëÒŠ³Œ•À'ý¦"”ú†iAÊvýŠ99óºâìS‘[¿­M[‚eÍõ'×DÈ!?FÜ›·žp+ ï—+”œzÑÿ.¶\ê î‹l?,1ÉA%g¥0Ûx®!yøêÉ›íò.k51e>Œe?)DZQ\êÑSKeM/ß—:6'ÆzoYˆ L!~5Òí‚VøËí(p=“Ùö_$–ñ2:ÿB8»t¹b˜ß%‰qÊP¥Õ£±©`­ëåDÛ1¦Ž€ˆ‚wz{€Z*ÓÛ´…}à͵ÂsœD½É .¾QsIp¶ï ³[•:ÝÃ>BÒÊ@;¤—¸ý»j º›Ò«-c(:Ùˆ7rïÁ§oûÓï™oɸøa>C#Æ~»¯–’€0ºÇZòNh?.>Ñ‚\¢ Ip>L–f‡ú]Œ*ågQb±ï#¡!Û ×‚tdwäÎŽ³íÖö>ÓŠð­y ËGb”-ãœdÒV[¥™‘óX£] -6´Äaô¿®Á}ðctÒƒÐ.¼ÅµnÏê +l´{HŸÎJ7L9#‚>’Æœ¾uwG¨mÃô$Ÿ+p‘äGp“ÏX5íK·:E4S{5Õ¤bµ¶˜c× ÅŠ„衪×uõÓ:œ ¹ÊW!9¥òzîW¨d.Qej¬ê îâ|ç«LÈÑü$ìÅ q»g.ñmÙÐ}IIÕÆä9ÌMŒŽ»›ƒû„mÍ›7æ²Vï·«ª ijÓMÄbÇú¿¯Žqr‘ÄÂÑeL;N *¢%¬à;æÚ(q µå8tN¥ÔpÌsxû XÄÉ2JmxTŽ½13Ð$ —•ùÈnÀÁ:ëÒÝ䯥AØ#žÑÄ»éOÕ~Ñ0Å©,DÕÕ³®^tErÜÌ2ØU¨öd@IñóÓò5æ‡Z{ ‡¥#¡r»P‘C¾éýg%tgÐî5ÕM‰Û@Œ¿Bˆç¼Ð‡©½ëßÍ,pפ*qf°ÃeiØ!ÅpZî:¡>YˆñÀøî—0òÃŽuPômçI8„+^ŽªîbID†«¢;‘Ï«6¬éjBÀpvÈ‚GnÞšÐÚq˜2ù-×ûY="}&ãIŽiP|uÚgؤœ[lSpç5·oÈ® Ô^žj9ëeùmØÚÓ|60ñì¢)®n«Î­Á,« ÈãŠ>2ЀM^Qâ -Ýåðf¯B709gÚTÌ#$+>ZÞŽR² @(h¸Ò²Y ¬9 ã·²Óõ]m˜«ãƒy-Î> Fwü±Éý›ïƒ>« #Ttý¦AW ÕqÛÖL -xÝqØÓÐÐ;‹/$ïØŒf<Î÷žŒrÔddLE¸ lAsPOò»¾™z;Œ²€$±g!ÎtúÕÂƭߎÄø±#¶¬”µ#Vô¥\ß\¡ëçÎ’â”k -Áà£Òvp±Æ©Ù|TŽ°:wÑS·“6)ëù•øa$Èe¦‹öŽoOgŒ|´5”"”Æ©ýh;?Ú¾EªÌÂpðÿþZ[Ýe#LxQœÜÓ·Z×—õ…üdõ_>¬ÿx«v -endstream -endobj -3722 0 obj << -/Type /Page -/Contents 3723 0 R -/Resources 3721 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3708 0 R ->> endobj -3724 0 obj << -/D [3722 0 R /XYZ -16.307 900.716 null] ->> endobj -446 0 obj << -/D [3722 0 R /XYZ 56.693 759.068 null] ->> endobj -3725 0 obj << -/D [3722 0 R /XYZ 56.693 738.489 null] ->> endobj -450 0 obj << -/D [3722 0 R /XYZ 56.693 122.884 null] ->> endobj -3726 0 obj << -/D [3722 0 R /XYZ 56.693 92.499 null] ->> endobj -3721 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3729 0 obj << -/Length 1423 -/Filter /FlateDecode ->> -stream -xÚÅXK“Ó8¾çW¸€Ã¤ -+–¿ØÚ, Å µLT [‰]ãXÆ’ á×oËzÄvÌ KÍÎœ,ÙR?¾þÔݲçìÏy={±ž-^ž“ $ôCg½uB…‘ã%ZFÎ:s®.>Ð’Nç®x\ ·¬Q‘ë/Yú‚±k5ùxùvþyý¨q1FI(i—âXRžS*¸ü Ú±ƒöp)µ¯ÂE~ì¸J"­?öA`_,Ôû¡Ü8ûs=û2à Þs°„(L–N”`z¾“îgWŸ='ƒo`Z%±sèVî{È_†0.ËÙ?3O#áý#{• ì…ʦO¾tVŒ·›çâl9ɈÑ*ŒáC·ùy–Ñlw‘±T :0å`O*ÄZQ·•¤Ú¡¢BÙSD+²)Ͷš4ðNЩù:/øØiNÓë¢R‹R¶¯KÚ…ONy[׬#õ‡¦EµÓo‹’.j"ri?7Ô­ÉŽk|…ÈÕ²'Ò 5,ª´l3j&êÙ‘G:ÚŸ?JÆÂÇ8ˆƒx¡¦×U±ËEyœr—¤)+Ifv -¦ž/IUÐRßÒ"£g^× ûZdÖokÓ–Ñ6zÒÐ/-å â>⊫íbxåwË•ŠzÑÿ)¶<ÕAÍ‹4Ÿä«DÃJn–Qð\Còäíów¯Õð+)[5>e6Œ%XsέJr©G#RY*kzéø¾Ñ±9°æZ¯-‹kjSðgFº¿D ÆJú›í(r=›Ùö?œ,ã`Å*÷;mØÓ)_ õO§Äxe¸¢ôhOìY°ÖõEÜ1¨ªADÑœôöµ\žWbÏmY²ÿm€ž’éj…ç8ñv“ ¿ ¢nJIšŸ ³K¥:íÀ CôVÚ!=$ê±è Z€MñbËŠ‡Nvâ @wàÓíþôÃ{æ[0Î~Ä€ÏP爱ßÄîÆ\âCåò—ÿO2±T”ÈpÑ@î“È@zÛ“•,%%ª ›åaHò7me\ŒJ·µŠq:þ6Eu ¤TmL–A‰bÕ8‘¤9à;NýÊ<·3¯­ÜgÜ®kø2©X†YnÚúD-v¬¯ñçϧ)½µí“x*s¸g‹à;i´QüÈÝ xXQ'´>Æ« Œ–± ©®G(^šrs)(Èee62ê8ئ§ÖA^Ò)¥ÜvFSs*´Ð¢ˆÙ´,xmÛ¦Î9ƒ=Ñëé7 ÞÅO‘“OV(Éï½Æ›”ŸÑoHVTµû ´wИÔЮ†×›£€nI[>\/r»¥†;D–À– ¶/¾“Þñ5gäTN•<>ì,:}ôžãò7ûªmâ9;¸ÐW¿;ãÔк$)}dûGé¼ζa{Ãdh¹‰ #H$ƒM+¨Ë©˜â#× Më”h6tˆ$͈©Ó—¯lØAÆá¤Ñ˜Ph4 •€îßZVŸ¿ Âà2òEfÒѽDŸIe» Ž< 3{˜„;?m}j™‹»•Eºl0“á¾_”Ç37}.Ï\Æú~.—(–—wi*^¡p°É¹r±'«Ê<©ú0¨k3Ù®Ð2Ôü_› -]Ó:÷(É’Vò•-ór’“¹%wŽƒ ½cCi¥F{’éwóŸ¢Ó=ÀÇ+E¡A[üØÊÀCKŒÍ”ù¸DG¿B0Š0Âjܨ(C8e· /Ž` Äóï6AËëiX[KõGRZ´»gjÔšòËÜSã{ê­X}4ÇÚ ’ÏE}tÍDÖìÇ8ôVQä©äXM²èƒô^ß@¡àá)ÔÜ`f"?NîŽC+Œ¼0ÐZÞ‡u/dëÐSÛ‚«ÁûšVï·Û"¥Ã²ÐW>õŸnåÕɯü¦û¦n3 -endstream -endobj -3728 0 obj << -/Type /Page -/Contents 3729 0 R -/Resources 3727 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3708 0 R ->> endobj -3730 0 obj << -/D [3728 0 R /XYZ -11.232 900.716 null] ->> endobj -454 0 obj << -/D [3728 0 R /XYZ 56.693 299.263 null] ->> endobj -3731 0 obj << -/D [3728 0 R /XYZ 56.693 270.255 null] ->> endobj -458 0 obj << -/D [3728 0 R /XYZ 56.693 215.132 null] ->> endobj -3732 0 obj << -/D [3728 0 R /XYZ 56.693 186.124 null] ->> endobj -3727 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3735 0 obj << -/Length 1776 -/Filter /FlateDecode ->> -stream -xÚíYKÛ6¾ï¯ÜCl`M‹zkƒ’¶i$-šÝ’h‰¶K¢+Rko}‡/ù¥ ¶iAO¤øÎ|óÍ iûÞÒó½Ÿ.žÝ\̞Ǿ—£< ïfá%JR/Ã! -Sï¦ôÞŽ_ÓŠA'Ó öÇ¿rI…é.xk:re'àÅ3Î×æãÍõËÉû›pÌc”DZ‘v-ï**V”J¡¦átìepzªÓ£$EiyÓå©=? A`šg¦ÁA¢6^üxsñ×ñ¾‡½8AIziŽQâ^Q_¼}ï{%Ì(Ê3o«WÖ^Œ}„ ô+ïúâ÷ ß"á!x8@9ƱRÊ ãÄ(…c­„Ûå½bß÷VW“iEcŒRŒ°5ódÀ$HQ–b#ìfÅ,¦®%¦©Yã@î6%‘gÉO€×ù¦ß¨€ýñÓŠ7K3±eru$½éê9µâù´óIgÙï|?ØMp<¦âÒê'mÛUW:&È펲J-(‘]k+V¤YRqu –2hæ[óßÁš1€ù´,iiäˆn³á­ãÙk>VD%±[±mB¤Ëš”ÕÃÿ0L#”¦}®)îÓ1ÌP,sÒ”:TžðIy:BB8D8 La¸'Õž¶'šg‡9蹪‰¯JB±Þ’¶4_`ΆH2g“wfˆt’³r7m–h'*3¦bE·Í-_k¬Õ×hÍ]ÜTIwýTMåŠÛ3È"âŒ&‡Ø9–|´°ük¡ú˜³ûr£>ƒ7¤RV]ý½âÄ4-”ÓSõr®¯{ê«bkÛdÇ›O"0Hþç¿}ÝÄ_ð¡¡(Š?éqž£ Àÿ“þ “^9^+évìéÞhž¿SÎcÛá…x¸Ñç1~ÔD¸ÿ.XÕûÃÞ~U—7{£ÌíWÛß8qöö«õí÷üæûÀè£ûç›W/¿îø^ɺºÑ%(òñç+kpuÂpCüø{çÛŒñè[ñø[ˆñ/ê¾WÄ!߇³¡˜u <ÄÄF=7 ú^=­~ŽŠc§nZz ·ÿÞ^ÀC>G?/ÙúY†7ê%Éþ¦ÁEËk+N=¸z(!Ží8±ÇAÃü-Ôî׿ô<ûR©,·!=5k¾×V–½ž¸Z?} ·ä -1Ááþ…ôUŠá¬A×®wMÛ[VÐÑ^þɳË!Ñ ]I¹¹šÍ¶Û­ 'Ì]£ß8bö°óþD§VYdŠ‚n¤…‡2€¬íùYí}çǾ ²ÑZB˜u5øS»zFwð²̤®½Heh‡ùÙá¡u½´iLgfÍââH=欳{7ÚH¢`=™]°†ØTùhöè$gÖ5<›[Fª‘áSè~"XÅ(Z¢C÷íni;2R.j¶¤+´S‰ ý ÀI=êÙŽäèÍ€óýòŸ¥KçØ~ª›A'D ^Vñv9Ó*L?8÷:~§¢aÚÇÖÔ=½×Ñ:!£ô€ž%׿LjïØU[VYŽ«7•-†8uµ€”ا¾Ÿ°¶eËÕ}|Òs5û¼½/Ê¢"bu¬|¿ïÀ`S£ù©Ç¥œ“ëˆQ -ì––¬¥…|2ü+ à Ñ'^Û¥M8{ÑqöÌ­]îkÑ€KI©œê ãyÁHÿ]ôÕÚ©P“õ©óŠ®mû‚p@k§ÅC ôéK6LÝ -fjÌL[c+6Ÿ9û\uT)‡þ¡ˆ|ä'ù§üAñp"Ää -endstream -endobj -3734 0 obj << -/Type /Page -/Contents 3735 0 R -/Resources 3733 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3708 0 R ->> endobj -3736 0 obj << -/D [3734 0 R /XYZ -16.307 900.716 null] ->> endobj -462 0 obj << -/D [3734 0 R /XYZ 56.693 759.068 null] ->> endobj -3737 0 obj << -/D [3734 0 R /XYZ 56.693 731.272 null] ->> endobj -466 0 obj << -/D [3734 0 R /XYZ 56.693 637.689 null] ->> endobj -3738 0 obj << -/D [3734 0 R /XYZ 56.693 610.404 null] ->> endobj -470 0 obj << -/D [3734 0 R /XYZ 56.693 541.333 null] ->> endobj -3739 0 obj << -/D [3734 0 R /XYZ 56.693 513.426 null] ->> endobj -474 0 obj << -/D [3734 0 R /XYZ 56.693 425.531 null] ->> endobj -3740 0 obj << -/D [3734 0 R /XYZ 56.693 397.624 null] ->> endobj -3733 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3743 0 obj << -/Length 1476 -/Filter /FlateDecode ->> -stream -xÚíXmoÛ6þî_!xÀ6£K²Òb@³¹ë†µÝô%Ñ’`JÔHªŽÿýNI[ªR ]ŠX?$¢Lñî¹·çN²­Ì²­Ÿ'×›ÉåK߶"n`m¶Vࢠ´VŽ‡¼ÐÚ¤ÖÝÅ ¡ 2[¸¾}ñ†I"ºå–ñn!sµùK®Ûu7Ýþ6{·ùÔ,E¾ßI»•JDNˆí6hw¬h¼Vû2Q讬…¢Pé_-A`¸º¸ì.Ž´'ëÍäï‰âm˱ü‘g…‘ƒÛµ’rr÷ζRØh­¬ýñÉÒò¹^kjÝNþ˜ØÊö£Ѳ—rì ÃtïºþÅð¸¾^¾„#'+´ V°q<ü"MI:[¶r]»ÈeI®kR©¬IÞT»ÞV9.‰$\ î‡ëCwMÉ7TÎO²GðÓF)eÛî3™w«BtWRÖòðLí6r¶¨@y…iwg¢ÞÞ´Q?.D?Î…r`ÜT™#ÚG´‚‚wË3”’u×éóA¯$y?|ÿ݃Ÿ=¿4?L癲Œ§„Y¯…‘J4\+ȱ²SeÓ¶ DôEëS–Ä`ï”/`­c’ìpF´ð´A©ÈžÑQ† &àVÒ{Û·¯I‚¡µÛí 3+u ×ÞbT!/ñAG³cçL+‰€_—z§bÊ91Éñ{¥ë C;Îjd­;ËV“Í–1 õO暇àæ˜ó11Lˆ©Q%$ߘΈE‘«N=ñ0 úŠí»EF”ˆwJ?èÐzfÙÈj7€a¨MáÙœô›îà 6 ªy«®@±ýiëž±Ž*XÃAãôª{î…²®)cµøónºÕg¤"ü Á°Ù×'ä‘VXâ¢í²Ð“U@©v/4‡SÃÕ^`IÒðSlª怄Á¬QI1pZZÀu8åÞxz˜v\uck7n$Gº·Ö´n=Ùª{›éóm“üRe,d›:#hnÖ/×7ë7?®o烤_W-D~^óÁèµ/tºÆ§X)íHoÞnÖ·mDë¡D‘œŽy¿<Å ït!$¬¬) š*yÑ`߉ %Ò$(0:Žù RCÛ`Vˆq¬X‚'Žõׯ„Œ±ô<£ûA:ÊU(_3NÆsR»ç#þ¬I‡î„é† 2¬€KI)N1ÃÖžhј -6†ÆgÎÒFWÕiŒ‹›L f2wÅ-žÞ!2ŽëüŒòàÔ¼Û÷ò´,´‹bÊ’Ý´W££=.é |Q¥pV‹5¢ú^—‚™3Ó†Çc„hN×ð¦Äªî¹q{ñçæÕÛ›ÛA ?¸f F’ßg^%\~l ¾ü$R?†Ñ[!ÏžnVrœˆ<'rÞr.»·m—~ü›Á×Àæ†òF^,䮢§#ô¥ƒlx—þ,/–_€ÐǾ-/m01ú”OËÿj+n -endstream -endobj -3742 0 obj << -/Type /Page -/Contents 3743 0 R -/Resources 3741 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3749 0 R ->> endobj -3744 0 obj << -/D [3742 0 R /XYZ -11.232 900.716 null] ->> endobj -478 0 obj << -/D [3742 0 R /XYZ 56.693 662.341 null] ->> endobj -3745 0 obj << -/D [3742 0 R /XYZ 56.693 632.895 null] ->> endobj -482 0 obj << -/D [3742 0 R /XYZ 56.693 579.152 null] ->> endobj -3746 0 obj << -/D [3742 0 R /XYZ 56.693 548.764 null] ->> endobj -486 0 obj << -/D [3742 0 R /XYZ 56.693 326.269 null] ->> endobj -3747 0 obj << -/D [3742 0 R /XYZ 56.693 297.261 null] ->> endobj -490 0 obj << -/D [3742 0 R /XYZ 56.693 150.92 null] ->> endobj -3748 0 obj << -/D [3742 0 R /XYZ 56.693 121.474 null] ->> endobj -3741 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3755 0 obj << -/Length 2042 -/Filter /FlateDecode ->> -stream -xÚÍXK“Û6¾Ï¯àm¨”…ø–÷;ÎÚŽíÊî¨j·ÊÎ"!‘;$¡ðaÍä×oÝàyÆN|ÈAE¼ÑÝøúënqçàpçŸ/¶W?‡ÜÙ°MäEÎvïD‹b'>ócg›;ÝËJ¦\­½»T/;lîU‹¾ ÉŸTöB©ìü÷úÝê·í[¸f-Û„!žvÝßU²+¤ì;= · 'Û#_ßD1‹½ÄY‡lÓýIƉ{…áEzãÅ«íÅïŽçŽpˆE߉7‚EÜs²úâãoÜÉa`Á&qNfeí„‚3Ï ]9×ÿºàd >³ˆçm„µPöð b¡ˆP(BØ]Îǵàœ[[=_­ý p‹ã¤æÔÈ`”Ž=V²–MŸö¥jpm+ÊÖ¨½ëô'|7mr«Ó'»d0œ ÀbøÈè­7Žmý¢ýF/}_º*Üö^U€4™-ü˽\…¡Û}ù$p@y‰O6%?Õ,´ñÜíëwËó‚ð½²ÏeŸ–¹FjG'*«tWÙaÂðÛ²½!ýe凮êä IjOrו½œ{Íý÷¡W?ÃÛM\tÚ`È#œ}|~uu[W‡¡XöÇ•ÇytÅã«\e; àõj­}íÞïÛ3h?âqës÷m-¿Ï¼×RU6´- ŲUUÖ oNCÜR< ãE:J¼GÌ5Å" ýúúוÂ¥îO²:å3ûnùP¥k$3ÎÐÑ"o>¼¹çK` öy­Gº™èþYo®N:ôªlryû„5güMyn/ÁÉRŒ¦‘Îo pcn`£ižÛ€j³|^‰Ð¥ÝúzݽE‹ÂRpòBåNŸdK'À×°¢&úý3'~­ÝaA™ã&Ù¶ª¥£€çò!“4³»ÃÑL¶à- Â0~7niTŽßvÒë{p§q$ÝÒRà·’-˜C÷À+áÔ>éH U\§£¿C3ºÒíýÐdš¨à}ס»ÿY:øt²‰®ºu*ý@Ç‹fqf_ÐÆ}¹‰³¹Ë›²ÞÉö’¶¶vÔXØxÿÕï'Ñs‚ÈƨÜöp³)Èå^Ÿ™U3“ˆŠú|㾡=ªÍe‹»Ì«Â²/ -Í¢=­(”#±žaïœ[ÙÐõª.ÿÐÀ®!z­Ò;{K H™ÚPÂñ≯y¢:ê×2„N9å>Ú³—‰†I-47%xø'Ï —X XÑ×Õ•ñÏüv=¾ »íªÇ ÈT‚o9ͼ»æö?{Ü^}‹hâë{ Ùh.Ê¡¯¥¼ƒ39†/X›3ncŽ3 äèÐÚ2Á°éè¸Ç¸«îÓƒ\” õqËk“cfvÖ)HæØ®îN3UJ´³¤tNÏ@?ò!z¦¬þ%›R¤K¾ÆK¾…%dÓ¾O=¡ù3î‰Ó,ƒ )i=ˆÝ¦جÃ~I; ”͘ˆémñÒ8¼vÑȨ†+ÿ‡K^5ÈA ;?–Z¾´1éÁ#_"Ï‘ŽHã#Òø=Ò̽¾þ‡ œ|c¦¸‡ŠÅ3>›/¦6O´ÇÚð0÷åÂfØå'”ûèWÊƖɹMMË‘rÆ0å7gbV%?H¡Ðç,7¶|­’È·5>ì>Wå¿Tu Añ|]0? -Ÿ6ÇLÛ¯ÓÑòÛéY¥ ’€ÅqdAš}IF?a~8Yö—,úz>¾7ÇÁ÷]~²#H?š¿ÖŸ¦C”_²Â‰‰ Fœb‹nØjÛ˜Y˜=¶ÑË4e°Ì"Sê³G‹$ËW:¢DßAãk[WÕ‰äEÐ-]jÑ…ŽÓ¦¢`q@¶þÁÌèÿËg2 ï5|/¡.3óŽ‡É“qõY¶Uz<ÚGÐ)?ŠC&‚„êÑÄ ð%eÌ¢$x"‹½>È^M©âT¦ŽŽ¥šéÉÛ^6V _ûÈá÷~ä®O€TÙ &{³ůNèenHò1ƲR.hË;K[¯FÍÿÞÔ%“3ò˜}Gú -bƃïI_/ï8ì…·u¦‰nè\CYÑTw×õ²þvE‡t€–~ý “Ó!%4¹mÌ!rîñ€3mþÌßâÿÊnK -endstream -endobj -3754 0 obj << -/Type /Page -/Contents 3755 0 R -/Resources 3753 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3749 0 R -/Annots [ 3750 0 R 3751 0 R 3752 0 R ] ->> endobj -3750 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 1 1] -/Rect [489.208 664.578 561.28 675.481] -/Subtype/Link/A<> ->> endobj -3751 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 1 1] -/Rect [80.603 654.68 119.866 663.526] -/Subtype/Link/A<> ->> endobj -3752 0 obj << -/Type /Annot -/Border[0 0 0]/H/I/C[0 1 1] -/Rect [102.521 633.32 422.322 643.218] -/Subtype/Link/A<> ->> endobj -3756 0 obj << -/D [3754 0 R /XYZ -16.307 900.716 null] ->> endobj -494 0 obj << -/D [3754 0 R /XYZ 56.693 759.068 null] ->> endobj -3757 0 obj << -/D [3754 0 R /XYZ 56.693 731.272 null] ->> endobj -498 0 obj << -/D [3754 0 R /XYZ 56.693 338.81 null] ->> endobj -3758 0 obj << -/D [3754 0 R /XYZ 56.693 310.424 null] ->> endobj -502 0 obj << -/D [3754 0 R /XYZ 56.693 183.57 null] ->> endobj -3759 0 obj << -/D [3754 0 R /XYZ 56.693 154.562 null] ->> endobj -3753 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F57 739 0 R /F102 977 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3762 0 obj << -/Length 1600 -/Filter /FlateDecode ->> -stream -xÚíYQ“›6~¿_Áøåîš³‚À€ÉÛ%iÚˤI›ót2“äAaÓ‰"q>ç×wÌ¥Î'y¸±v÷ÛÝoël×ùåìùêìé«Àub‡^è¬2'ôP9Kì#?rV©óñâ=e”Hz9÷÷â­PT¶ÃLTí@mÍâK‘<âKûðáöÍåçÕk3ÇÅAОv«öŒÊ-¥JêeŽ%H}-}F(ò–Î<@qdä/C80Z^Ãp¼ë`'QûNcºž“g?»N -k ZÄKg×¼Y8v‘ç‡0fÎíÙg®A â9ðZÄ $öðEŒ°¶JáùvŸóqŽ]×½xõΘÕ0ð<´ íæ•,Œ‰K/¸Øå|ÓN%[Â7â-¹ôÜ‹»K\˜kJy;*Hjæ”8ø¡‘ ÊdãåE‘6¸‘‰ ýð-}%öd™ó„ŽœŒQä"ÜŽ«64Љ9ŽcäyŒÆÈ?y^0xoü;Ò{‰áÒªt/Ù3)*u9cF4ZzD”ªòu­hûÈÅ®ÔRC¨Gj'æ€iÕ>Éz-a‡Ý.²Ú4ÂkÞ*7Çð‹`ßm]–y*WŒ&MÊéÇÙkrGfWæáwZ1û@xjfo^¾™™9c÷aµÅ ÉÔæä6BÆ9©Í¯É†Nb*xû›0"¥ÜsQÊ\¨JP;úänÎ¥¢$BûW-Õ¤L±£UÏÈ¿úF–“Fæ)›lD^3)¬W{èÍ’'Ofã­/ôÜ„ßVÛœW–F¬9ÀóQŒq{Àu–ÑDœ]ýöÆhýêÝXý‚ð’l¬KD­ÊZK^0ÑÅëº6‘ˆƒÀó}ϼ²Zø"§LP„Ùó*'ÆW×fן Vëº2gÞÜÌþ{\û××iJÓ ' "²T4£ºA¤V‚‘5eíBI*R´Ãœ‚íƒv‰|sË¿H†®-ܧ´}Ó•ØYBÚ3Gª6±QàF E Ã&?5+º -.Þt"Š’QEÙ¾]Úƒ‰ÆöÞ¼¸ƒœ"eiݱÞPV4¡iG ð7Ñòp„Âåâ9ð=%U¥‹ŸÑPQ°•¨Ik¾Š”ÞwzTmE:™)]Œ´56ío0õƒvúœò ËåöÜ5Yv¾&2OÎOIo©)k…HkvˆÉ¬‚! ô^Q.sÁåiKÚª®¸åTCªk(4_æk‘îGd¢Äè ¨…ÜÒ{Û…˜Û‹boÊÇ©°ðp¡&ˆ'7¿4‡0ªNN†­ð„Y¦¾#šµÕ0È æÇ> endobj -3763 0 obj << -/D [3761 0 R /XYZ -11.232 900.716 null] ->> endobj -506 0 obj << -/D [3761 0 R /XYZ 56.693 759.068 null] ->> endobj -3764 0 obj << -/D [3761 0 R /XYZ 56.693 738.489 null] ->> endobj -510 0 obj << -/D [3761 0 R /XYZ 56.693 229.998 null] ->> endobj -3765 0 obj << -/D [3761 0 R /XYZ 56.693 202.502 null] ->> endobj -3760 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3768 0 obj << -/Length 1670 -/Filter /FlateDecode ->> -stream -xÚÅY[sÓ8~ϯððÒ²Ó¨¶“8 o…Â.LÚf€ÙVMe)HrÛðë÷È–äKÜ”îtÊĶ,ÛwÎùŽë þ½¾¾›…Á-“8 ®VA£d,¢ šÌƒ«<øvü…0‚y9ŽgáñG¡‰ª/WBÖzcÏEöZˆëúæëåÅËW@Ì8ŠÐr6«O»Ô;FÔ†­Ì2H‚HO&Fú4™£y¼Æ3´œ[ù‹98_ŸÖ?Qœ˜£·W£Ÿ£Žƒ(˜%(YN‚ù2BIY1úö# rXÐt¹n«7‹`…(ž$pÍ‚ËÑçQh=Þëwöt‰¢0©uúdzJ‹þv÷{ú¶4g,Ð4YÀBµù,ÏIþrœ„á±*·[!u}S9Ô\T5’¬ˆ$<#—Z0œV/l±ÄE}Iyýû=œ…_á¿èŸ«/êG˜[1ï> …B”z[jÔ±£gû¸V|-Q2ŸÀö˶ÁRÜ*g1¶Ï°$•®Ñ$B³p¢Ñ|:©7ÿU­h,‚ÖãL[F4a»z}‰æóÙÀÆÊö¤½SÜÉðvë‘îzØJ’‘œòµWø ·âhŽ’ÅÔú+z}!XJÌ×NCMÀV\åà0d&9¹ózDoD®†@à1’mZbê õ5Ç…{|DøšQµ9²B…}œbE³£çEÒGrkuyÉöb3Ë» ër§ WTpõûJGOœúÀ‡m>sgL“¼UŠªeß²Lp-cÞ`xÊD}/V@'.K8Øl³Lð¾8M5s Çk¢^¹3â ZFÍ’¦ˆrNá8e$Õ$׬‹­÷+kàã_DŠ¦Py¸æd…K¦MÝ:±ªUUÉ[ÒE·ÕÀ‘‘Â[DÑSé²s>ÇÊÁÐéO‘Dù”¼»-e"»îìªÐãEÖ¾²Îæ¤LBõЈÑ몄o„|¼×~Ç/-a¾qÑ®b\E÷>sýÅËRK{ezy×Eµ‘½öcÔr]Ó©nœ©8Ty*}«Û>¢V£ž9¥jò¦mÅ #VUûÕ}<4ÝÊâ€Ù ’²R¦Hpäó$èXIQ´ÕªÄôtÛB]¼µbódt`Õ*CÁ}læW6 ¨ö(rƾîK¢ÔCJ6•º‡½ß‰²KCzâ÷ÑãCgëB©´(è/¬©ØCK†KE<ã!E·‹¦Ä%\ÆJhÆ3ÀcÐEòtç ó´UØZ3úË9óm%³Ë•67é÷ªp -¼k¿2ž¡º5ç`ÍkïµX8ÜÌc˜âÉÓvóZüWÌ\m¸Á’b_2„cmªÏñÉbú9+âKžÜ ¡þÝ’‘¹‹Òå‚Û¹ÇØœîVxSçÕ\ÅôPÔ€úŠ5‡àÛ˜è½ꤎñ ¦Ì Ð‰ùs¬ª=_8÷ÃøÓTz;{v£¥=g-®¨´¡Sª‹¼Or=ä§[hB=‰,+o +šw©Y”Dh²´3Ê´?Ü̃ÖcÊW¢G9êêºÇàZÖزÓôdwqT@òåCV·ÍtšwWŒ.pÛë%”;G[b¯ô´L¡UùÎEÆŸu9õKÍÍ™ZÍvnxà -®¢ÏV+Êh«N{>ˆ´ªêÏ âsaòp¯ìmMŽ•-5S¢o ±7_ÈŠ{:æ €§ÛRn}§¤ƒÁÞ[°0aêßS¢ãÛÃÐ#¼ŸÖÝvÀë>µNz:KÒ¦…ïLi¹^{AJ—«U¿­Þ:ò¹&F*Ýb®˜·@ÛÕÅ–×ý^Ãó^10vþÑùÑŒ¤€â‹rÂhA͸è A3FöÙ0€È>/hÄ4„%'⌫[Ò¥mÊD±wÔCSèÕ§7ÖÞ7Lx> endobj -3769 0 obj << -/D [3767 0 R /XYZ -16.307 900.716 null] ->> endobj -3766 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3772 0 obj << -/Length 1575 -/Filter /FlateDecode ->> -stream -xÚÍXKÛ6¾ûWèP v±¦õ°$«=åÑ6 6E›u€I´DÛìR¤JRvÜ_ß‘ER–VIÛÀØô˜’Èy|3óÍp}oçùÞÏ“§ëÉâ§Ø÷2”%aâ­·^¢$õVA„¢Ô[Þ»éÂVd6cú‹ÐDµË­íBïÍÇç"*Ä}ûðûÝíìÃú¨™Ê⸕v§OŒ¨=!Z5ŸA{à­@{5Ú—IŠÒpåÍc”¥FÿjÓÕtÑþaÒœü¸žü9 @¼ï^œ $‹¼4 Pâ‡^^NÞ}ð½¾h™­¼ãygéÅÂ(5óî&¿M|ƒ„ÿID¬ìe†?imz†ñÙŠáqû»ø Žt2Vh™¬àC A]UBêÙ<ñý©»ž òy{rdàØòÚÊ+"•àÿZ|mýßÜR!IÖô@-ñŽ ZRÕ~ÆL‰vuÜÞ®ò}Íï)ZèA`Ó8ëYEhéG­â A}«½wóÀ‰/ènÏàŸ6R@þ†Kä/ øk›ì[Á˜˜…ñôØœ;¿Ê÷˜ïlyìñ,ô§‡YO͉ iœhV%.Ì;-º:ëî!¬–(M‹Ýþó–¦K†Ýœ «CQž“A©(õQЮe[à¨|‚ºÌÒ³ûÙ5Rï%§šbÖÆQõŠ`k^ž¸ÆÛuÏÙÞ®JŠÄ%£ªù¦Ð—¤B2š -¯1¯ð,ð§ þ'ê3ùý|(sw£VÆ>Š‚+æB#er!ʮĒ(Sé[!4‡ÖÒ>•XÞ3à… ­«Ú$ÌKîòBï±î‹±G%éµ CÞ°£ý~"º—Œ¤@ÊÅ/À7f|¦\i ±Qý\ÇEÑ ´-Ù<,jFù½=c6Õzß4ãfm]²uf÷˜„¶c…Kb!=™“ÆRbÊÆý0Dœª›vQPU1+”•Æ õ-ÔÂC¯Hßw¦õÏ("Õ݃ΑYrü¸á{.ø·^—"mGoæ IÙ<6༽ `‹«mrBY”´té}À¬¶I¢Æ £ášæ6âZ à»`ÓŠjƒq-Í)¬Aå¦Ö€áùùUm ïE–Ú¸sðâ?à_ïK.¨jžë&›k¢ÄÎ oÈ–»w\o«ZVoºöÁ.W•>œž¸%R’HÄô¯¦¸ô.©`S¸ÐT³ÑBpµv3°Y’R¬t%¬OÙÔ»S¤t½Ý«ôhKjG8Ј³‘ò1 \[yµM­† IFx1 ®ÆOˆ‰zÜ¢|RÖ;NŽL† -ÂhI54D8Þ0»­Â0L˜h¾4¶sÁçiÜ}ïÇþ?M/)È×LÃŽÀ¡SÓ5¡1ì±µ -™w\kßÂßè6! •ØÃÐ ‚N^14¦ ¼k<»ü¤ÙÊ4êÇnŽ/¹Íµ‡Ùx㪶ïÃJ/8ÛU W5—¶%˜…Ò¥™þ¾;i/˜¯)ߊpv¤çý0ù4#PÐÇr˜·fXºò†“òd)ÀX]BŠÐʶúg¢:Éf²u¾°=ã–ì0ƒù„æ£Üï)ƒìà7nÎÝÕõ\ÌX—;nØùúƒkK¥}'8Q™òŒ —@/c¶1 ’&æÀèî^õYâƒî4~¬è í"Iwp|gÅ<Çœ6V|·ZŸÔ©€ÊŽ±­rï¿èªŽ^~EM‘àRý¿ïŒÕ§lŒV(Š“ëÝÂQx½Ûâ‘K¨*Èúœ ˜ÃÂ.¨›h;y¹È!`í’à|F¹‘t$ŽKžùz­ ÜRÎ9ç@1çgPc…È뎬 s©ŽÎxÙÚgD=îüö¶*.G‚|D¼½(œ+߈Êa&uq Ê?D×ÕÀKZ6$âB~V``ù¨ W_uQäÍŸ “ë×·ƒLVÿ”ʸª Áu·1:º6Ç\ZØÁ¸S×NŸF3ÐÏ÷VTqt"~dF}33µ;ªžÊÏÏN&¢Ãiérº|0Ì Fºòà"d‡±ö¦â&,uyWéD:)PQ{âzæýc&òûÞ©~öŒýzé#?ɾäïÏÍH -endstream -endobj -3771 0 obj << -/Type /Page -/Contents 3772 0 R -/Resources 3770 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3749 0 R ->> endobj -3773 0 obj << -/D [3771 0 R /XYZ -11.232 900.716 null] ->> endobj -514 0 obj << -/D [3771 0 R /XYZ 56.693 694.564 null] ->> endobj -3774 0 obj << -/D [3771 0 R /XYZ 56.693 665.877 null] ->> endobj -518 0 obj << -/D [3771 0 R /XYZ 56.693 612.177 null] ->> endobj -3775 0 obj << -/D [3771 0 R /XYZ 56.693 583.49 null] ->> endobj -522 0 obj << -/D [3771 0 R /XYZ 56.693 276.351 null] ->> endobj -3776 0 obj << -/D [3771 0 R /XYZ 56.693 247.664 null] ->> endobj -3770 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3779 0 obj << -/Length 1466 -/Filter /FlateDecode ->> -stream -xÚÍXKsÛ6¾ëWpr²f,„ñ•['m:IÓÄ:dÆÍ"! P@вòë» Š/ÙNÇÓôà1@ØÝoß·ël×ùmöj5{þ6t¥‘9«ù(ŠÄ P;«Ü¹¹øLÁ™/üнø“KRéᆠ=;óòŠg¯8ÿ¦'_®ßÏ¿®þ3 ÏCiêݮ呑jGˆ¬Ôk°î9 Xe}Å(ög¢46ö“6Œ“‹çúŸçGjáìÍjö}æÁö®ã9a„¢4pâÔC‘ë;Y1»ùê:9¼Ð2MœCóeá„ž‹ü ‚1s®gŸfn Ø¢ƒDˆ¼Èsâ F8ÙøÂ!V‘ ’S‰ýF®åŽ DJ¼f$ÑDlÂÕaGzá»Í|¹îEÉËÅ"ø¥žòZîkiÆæ“ÎæÁɘ~‰(Hi?/ÍçT2²Ç[•5§Õì9­ö In>*¶*\Ø‘Jb³¥ÒŒK³…rË>Ôa =±¡ª0§\ùÛ ÝÖnN6¸fžy—g¢îbDGƒpꊖ[ã_7ŠI 6"Zå·PàA"î 5[Û~€RS!kV‹5â%jóò$ű¼èzÕ˜¸¶'¢âeç©—Ÿ)Œ^U™mUmMå¶=”Ía .@<9ã±Nf½ß RU9yò¨.dÌüÈk”˜¬ˆqñ´©ÓÓ¬®$/è,)K†ëÊZL’¤AgMìyËX“\!3U;¦xTq‘|}´%3®˜pºb• ãfô‡óMcÓ¸{Ôÿwç-(ª¼æ·dL %ÐJÕ§œ{)¯»ÖÔBWKÓµZøÀî~®Á3ߌEÃÿ¢OÐ2JàE³øežÛ˜Jr0ž˜2”F ÀJTmzLé \ ÎÇt^¦`eédæTµÍ`KJ"p›+,xÝ’ÒByhžçysV:§Á@>a~œ€ÓF]²£Ó9XxÖíÓá½?“: :‘ÑÓ&ò;P$F%© © O8L`9`oZV—™ÍƒEú™v㙞}RžÈâØÉVyâË2-šÙŽ2Èoy_2_–ÕôQ¥²8Øê¡–`õñµ‰÷5ãm=í±Ìvzè…nêzÉ9?IÖ.)1UõžÐœˆnU½®…Òcvì“;άü¾úð~LÊJÉ»~M¸²±|òöãx‡½à·´ËËÿYy¾+©¤˜ÎR¬Ž¥Äw†évÇàO¶¬l¿‚¶PÄŒVê]5 -Âw áôE $òµ#^„’Þ"çfá¹*ÿóÌpfûô.€±¿DAdXÙÀ†3Æç~xqhU2è°¶öΰÃsN×Ü /ÌŠ5bnFÎÍ3¥žöbÑØîÁè%KÇ‘Ržq1ðáÓÂq»9¨}FÅ.òôXèëNH×S×€% àjâOPŸq¶#-çü` -ÃmsZJèÃ(ó@SÉ.ö¶*ð7²¡vÖ¯úÇ×økiôƒ~K)躖V(ˆì7O“Q]Z„UEÙŠ‰“x¿?µ1«["ÖÐÉ%NŸ‰ê“ *L ¨ìÊJ•¥}óì/-_¿HUÏ8:•$¸ÎáuA*褕­µø®b“$›šïTîì‘ÉlÓ²&ʯ_VÝ·XPÕ>¢~‡ÈÀa@š-8à„UïŽì‰)X¾œ>°mJÛ%N)¯®aO @ÃA<)æçŸóE°\Z¦œVØ+ö­"PCùö?6ô+5PªÕU#R¶kÚߌ g<èÀ¤Ù\ß«Œ ^ª&¢clC-2»˜± MÒ}J+.j‘ŽQ+Ü B%ÅýzætS÷x1<«Wî=z5~w ù±Îá(ÙÀ‚ÿk±ßð ÿ¼%Z.ßPúû›úYq K¢ôßüªø9–œ -endstream -endobj -3778 0 obj << -/Type /Page -/Contents 3779 0 R -/Resources 3777 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3749 0 R ->> endobj -3780 0 obj << -/D [3778 0 R /XYZ -16.307 900.716 null] ->> endobj -526 0 obj << -/D [3778 0 R /XYZ 56.693 422.8 null] ->> endobj -3781 0 obj << -/D [3778 0 R /XYZ 56.693 393.792 null] ->> endobj -530 0 obj << -/D [3778 0 R /XYZ 56.693 222.03 null] ->> endobj -3782 0 obj << -/D [3778 0 R /XYZ 56.693 184.411 null] ->> endobj -534 0 obj << -/D [3778 0 R /XYZ 56.693 136.655 null] ->> endobj -3783 0 obj << -/D [3778 0 R /XYZ 56.693 108.27 null] ->> endobj -3777 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3787 0 obj << -/Length 1622 -/Filter /FlateDecode ->> -stream -xÚíXÛnÜ6}÷WyÒ^.©û&(Š¤MÚÜš4vI¸ãe-‰ªHyí~}‡·Ý•¼vÜ -‚´O¢Hg4sæÌP88 pðÓѣӣœK´Ì¢,8ýdÊò  1Šóà´ -Þ…oXͨd³y”â𡘴â·µv‹?Šò‘çöåíÉ‹Ù‡Óg fNZ¦©=íD]ÕL®SR/ƒv =‹µö$ËQÁà ‚50%Ë"ؘMŒ¢8ƒqœýz„'ðñg'KDpfmzE©±Â‹ïæ)ÆáêbÕl§x¥gLIزY”†;O•êùjápPÌNIí ³ó=Nqov_¬¹T¢¿šeiˆW5C]/:Ö+Îä1ìÎóðÐNºít:[gÔ%«ëØŒ„L!VHZG²@IVŒ£YŠVõ¢®y{f£N»ŽÑž¶¥ƒ„øhŸÅfŽ·öùä•Û;¨nPh‹À@L¬ž—¢âï1ŽXuö|‹U-Êst)ëc‚âäÌ3ßþ±VÁ<Ádºp¹a+½BöDŒ;zÆÜq‰—2"rqG·ItÙhq>€üOuèã—['¸ð‚VnnÏxNíðù,NC!Ùù»sY=ÎoGøÉÐu¢W.á]¤£ørÉEëøaÃÕÚ1ÅP׃Z{Úhiã@¢Qß -w¦hë«ýͼåŠÓÚâq†7Á#&×á?ðœu=Öøïy Ø! -€DòtièÁ;/ŽQ»P“ESç Þûùôå G{ûH‰±óý©'ÔZÂpÇ6ÁÊ5mÏ<¯©æ‘‹IC'±bÌeUC+7§ÄŽ§n`³nR$(Ï5!ÝkÕÔ,Œ2pñ›JáÏ–|›êÛ2@PŽö¸0ÅMAb x؃Š$û §7]äAgV¦°‹“/»l »øFØýÌêîèe_ôÖ‡­L1ŠÉ„_œ"\Ü~Þ,tÆZÖSÅoA?|ø¥îH–!—öÙ -Wæu2¤}¬ÇYhVhwÁÚsÃ÷›e7â°Ø0Úº“Ôš*;ºƒ]-ikg„ÖlýÞ÷Ü8BÛ œ(ôÊFLWÉ^4NjP6¥…Wºgû ¤Ìµ2ï\³YûÐZ{`àáK¹óˆb}#}VMé_íÒO2æóCu÷‹ÍfcŠÔ0TŠfÑ «]D' œ/H²¨Vmu‰t8¾×‰ô]¬ósÜ.Ü’›:„ ?˜ƒ‚F´>‹«`–ë¡=GJ”AO†j¡ä¸2ÂŽ\&Ü™|nûÀü©qÉA²y=‹HuËòuWºî&ãÅiöåÈ&Š‰£»‘Í7r3cÊÿˆÿÄÂÒE„–„¤#º(Pá9™ÉÂý\Ð4–$>›ÓFžp‡=¼ÖïQßîþA¼îÅï¬TF³ýUПvðÆØ 7UBÍÿd½˜Ú·—Ò:_lÚsÏ×îImõ/ò€Cë #’~ª¼ÕÞØÕ5öÓÉo¸ÚPå»Ò•ïNÝš ÷uÎ1xÉ! -‰'Woe¿ÿ ‡V•×ÍŠõãtÛ2Ž1Q5ô[/ ÖC{ì2|7Š“Û‚˜¤î' $˜XºÎ^i DK7õ´Ÿd»N*\]C›DBn: XktïæãàÍ„† `  x9Ô´Ÿ%8<¶»Û1È vŸÕ㔤aÍW=5 /ÛÙWCUvzå–×\¨›¨ï9×n÷wŒÏk.x¹»k+_,ÛjǨ>¤£Ìpw¨J”ƒ¬,@ ˜Wîš4(Bb8[ñ·(ÙÑ’Í%T¢®Ûjj˜®Ù\6×? -»ïù6v×6¹ß6m5þððʼnO¼jÚ1™´˜ôS m5-ËýqزOxšN>qbXéÁú‹­+ ã¦à…ÙßÞ<Øç =ÁPå ?Ÿì9)‡oŸš$dŸååþÝö4÷\òßÛöPæm¢‰x™¡.N®7UÈš(‹ýwS‘Ü_ü> endobj -3784 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [173.304 230.848 208.492 241.752] -/A << /S /GoTo /D (dot0) >> ->> endobj -3788 0 obj << -/D [3786 0 R /XYZ -11.232 900.716 null] ->> endobj -538 0 obj << -/D [3786 0 R /XYZ 56.693 657.341 null] ->> endobj -3789 0 obj << -/D [3786 0 R /XYZ 56.693 628.975 null] ->> endobj -542 0 obj << -/D [3786 0 R /XYZ 56.693 557.382 null] ->> endobj -3790 0 obj << -/D [3786 0 R /XYZ 56.693 529.015 null] ->> endobj -546 0 obj << -/D [3786 0 R /XYZ 56.693 409.63 null] ->> endobj -3791 0 obj << -/D [3786 0 R /XYZ 56.693 381.264 null] ->> endobj -550 0 obj << -/D [3786 0 R /XYZ 56.693 284.688 null] ->> endobj -3792 0 obj << -/D [3786 0 R /XYZ 56.693 247.711 null] ->> endobj -3785 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3796 0 obj << -/Length 2305 -/Filter /FlateDecode ->> -stream -xÚ½YKsÛ8¾ûW°<©*‚Ið\Öã$oMkvw*™$BË|(Ûûë·nP¢,'NR™!4n@¾·ö|ï·“_ç'g/cßËYžðÄ›¯¼„³$õ² daêÍ ïÃ佬¤Pr:ã±?yÓj©°¹j;lè Ÿ·Ë_Ûöü÷ê÷é_óÂ6³ `yãjWú®’j#¥VF »^»'¡Ù=JR–òÌ›Å,Oiÿ<€Ólr†Ÿ€'fâÉ‹ùɧ“–÷½À‹–ä¡—æK|î-ë“ù^2P€EyæÝØ‘µ>ãaíÊ»:ù׉O–ð´ˆ[;ÊYà'¨ÓGÎc«…›æ}˜Å¾?½nײ‘ÐeÛ !Ú~ϧq<ùcþêí{ü-šoßýùþò·Wsü©äÒL&+—´J-š­X;Û·½Þöz¬14hÍ¿¢¢ê·Û¶Ó>tJ7kü½ìÚ­Û¸»>ÐååÛ³wÏ_~]“ø{4ùv¸Q· ­~º¶%€²–>Tì')õÑ÷ÃVheÀ{ྲྀ+=œËEUQhˆ…› ï¶RýT•œ@Â×}'Ÿh*§A<¹õ&|r¶ë›²l Ð.-“|"´îÊÅ”û“^ËzºIk„{kÙ±t¬fŽ´³rÔæ:#B³ltKêªäJ;až0“;)\¯ÒRÐR6r[Ñ4¨ üªûjf¹*cQ’ùJ—[gße[õu£˜:£±˜ÊqìÜ᪭ªvÊãÉÍPåÈ…Ô¢¬$y¦*•“…l6¢YZˆ«7ž¿»$}`ÈÀz#h‰0¾ølÌIê,¤X¤ >UÂòü ä G‘†¬ÏF@fähç–8aȲ„ãùƒ f'ð9m]Cl ßïs+,À#&É× 8:íãÎh±B´{ïö²ˆ¥©ÉvïåC:† ã½a?dA8/Yò1r -¹ó¢8ØáVUO¯§EóÝC©øº¬²s¼P`p ¶¬¥Þ´a´‰P™×mQšà”ÅÓé, |2Í™Ineq;kÖ ´x0Ž«Íðó¾… ƒWZÜi´æÞÑÝVà¼áà÷ÈÏ9Ò ‘qP±Á=Cö¸ïÇ(d~˜¹ÅþJuüJ,d¥èèaúÌ‘‚ª~¡K • ÉÄ#Yÿ€Ý¾ÂÑWûæ*]WgÅbE ´p2G"ÇM„¹J2VÛ²“…¥©û†MõIîÆ6½AÞŽ÷(*­Þ`ëÕüõï”y½‘s's~ȤI@ö¶6z:cÇþÈØoÚ*)lÿgš™T­6?SÇáÿ¾" Û@èA±÷­¦ ‘n§yÀL.,™£J˜ø­ç"MÉûHáåöüÍŸDz(h #gé_Þ]<ŸF¦‚`2Ÿæ!4‰¶—¢W{4º#µeÛW{Š]%Ü]÷Ûoµ- dPçêB@Aaˆ¹Ð…‰ÔŸJb`ãûѦ,†€éä -ìÙÝ=DYÃ@´-œ€}êK©+²ÓVt¢&:K9óó‘=.WÆ Áä²k±õÑ}›'ÌB®L2}¥¡?€Z,äé¤Á[ž`cÔ4nì¸ÎTMN´€:Û4ùä´.§ÁDAJ\Ÿbz‰v´Ý2$-YôÈV4';CÀï¾é"?f c»Òì@÷ÆtÆñl:‹}—+´W’€J> -š¦mfÆ\Orª[c\Ð Š»p:%f‡Z©Wnv·êÇö¶¢Nîrb'•’”Âý‘Çß¼5¡6øçylÀódr×öØË@ -ù¥´>#~*)8OÔmoÃDG]ä\ŒåP2 v•”¥9P/àÜáf R“ªhY¶!j+­±¡Ë@ìØYT¹n,,Eƒ‘ówèuùÌÏ¢q¡EÃîú+œ_ øë³)HEÕË/fNX3{lhg‡v%J±,üËñl`¹aC3Òˆ-E‚Ý Â†1=HããÒ۹؟l{Õxý£:ßÖvÓcO?¯K(åeei¨6¤Cl[—zóýí|¥MÞ ƒdÒˆZÂoiI `²ê\kò qÀ¨í»%µ‹vÙcZ3SJ…½ÃP-k(«ÜÊu'I°„{&ñ™ÅŠ‡ÜÖø“@ŠƒˆX“I©ñ»ê`úM×ÂÔ.¦&…Á˜q‡«?Þ_ÁØ3JS7Æ^Â06¡Krw±ÂÞp\uàâ;‹ÁÅ/DW•’æàÈNვé1UƒùêMI=xe2-ÈôæÐabCÙŽ²& ã¡Ã úÖ­`Ó´4h+ôrƒæ  A% mwcptü@Èù¾Í¾#cþÃl[Á9WX4ŒÞ4ÌÁ£,‡Û©Õ'pܬðGÙ@½÷©à ýœœ ñ)ªe_9¨š§ïBµU?L=îÓsfH¿æT 7Ʋ³-ŸTY ©Õå"£ŸM\ØY—ëvG@S…Yv<ˆð§ |Nù¥ð)GTÅ°e|Á´àˆ•\j0g˜f“K%e­°Ù.ŒŸ>—mO+5ø€RÊ )…°‘w¨3öÑËÇ<Ò¢%h5UÖÛên Ÿ˜wB+¤5ùÁùì“Þ¾Ø>Aa·¡ZvIÝQ -C›ž7Åa!àN¾WH[dµÝõ8±ßroHÿŽ ðÀîfžDô½§ª]iª]ä) -é%ÏÁý…TK,+¡Š†äªPäžbÆäs–ñýôZ—jY6p¿½±¹ÙcŸ¡÷Ž©W’ -Úq¹í4o‰%„­LBÅN1mœš.ÉìÙ0VüÅáA¬À‡óîÕŒ»Lçh§=,œ‚ãzQ+òFPˆâüK€gîr8¬Êô†Ñ¥®œÕâ–U²YC/¦ïÐÎŽf}<>3IÖ<#qÒ¼èïOû» øñgòÑRôð2³½ýðŸ-jøËŠBù¢j•v@ýÒ½Þþ@­”äü[/§£·Œ8y6Öâ ˜dgpòq€?Ú®Çþ03…p’Ïÿeÿ<€‡ -endstream -endobj -3795 0 obj << -/Type /Page -/Contents 3796 0 R -/Resources 3794 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3793 0 R ->> endobj -3797 0 obj << -/D [3795 0 R /XYZ -16.307 900.716 null] ->> endobj -554 0 obj << -/D [3795 0 R /XYZ 56.693 595.527 null] ->> endobj -3798 0 obj << -/D [3795 0 R /XYZ 56.693 567.142 null] ->> endobj -3794 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3801 0 obj << -/Length 2025 -/Filter /FlateDecode ->> -stream -xÚÍYÝsÛ6÷_ÁéK¤™"ÀïöîfÚÆÉ¥½¦½Xéu&éDÂb’ÐP-ÿ÷·ø¢HE²e7éÜ‹ˆÏÝÅîo‹U¬‚0xuñÝâbþ2 ƒ)IƒÅu”fAŽ#eÁ¢ -ÞOÞ²šQɦ3’„“7B1i›×¢³ µv“/Dù7¶óÛÕ¿¦¿/~63ŒQ‘$–Ú•º«™\3¦¤žî8È{iîqš¡ŒäÁ,AEæøfùdn?˜¤zãÅåââ¿ȇ’¥EdFiH‚²¹xÿ{T0 ¸Èƒ[³² "¥Ð®ƒ«‹_„NáIxÚqp˜Z™>’)ü¶àý, ÃÉ·UŪé,J’Éßv²þZ±fSSÅìP3ŪÊõß¿šõ;¤„›¢7SNÜB©:¾i%v`+é²6“ñ„J;FýZÚV´m¿×+Ø.7fê‰nx»²]±U¶Ñ[M¯Næo^õ’ióå(Nó± GfŽ,ÇTÀCA& Û«:>%Éä)N&¬“‡;y[ÖÛª'ÈÝ‚áÙtŸÖµmMÇëø~£k4^ënÜYõ¸ÅØžî'QñaHXõµ=Y)šF´óMžc[J3ûù‰—kÊêaª~±¾j¸Za2óú|‘ä~0½Ù6K¦}¬È&Z¢Õ¶cò98ëŽÂ9ìÈ 0°k•ÆŠ´íëN4ÖÏÂÆÏbiœ'ê¸ –ÚJÖ‡È'1ŠsìñkG~Í:­×"ŸpÇ¥ö»é˜tggµ:8-Ïâ„èí†ÿ( SÏÔ¸Q¬Ct«DM—¬>"URᢗʉ &€«r²„ÚŽ÷bí—Ñ) (ð#xe"P0‹ÃåF _Û•Æ]H‘:,ɤæRÙ–¸¶S½mìð­×Ï`ÓhI:iî$œ’‹­¬ïì˜R´Sý6ÞÙñvÛ°Ž*.Z;µÑÛ*^òïzví1ÍÆa¡”‚’#ŒcREå øïµ±ä6>!g(Œ£~W±PMQ^ôðE ín¶¦Dåbè:CI‘Ÿ¥Mé×æ82½Bœ©®½S¢}z@Òº4”Ê5¯«Žµ¶§ýüVG:«šJî# q›+4ÔÇêåGV*9†€ŠóÉÊꢊ¢Ñt†z^8üÊ8ïª7×Òv³žpŸ•}Ò´wÑq&ìôÏ–¢míG@9É{ÐT‚Éö™>«ãYŠVQîÌ!7¬4ú)mßt×àkÚhTöרзñ­?'5ºÀdBªÃg– $ÂgÙÅ~œI’1>àÝ µÍ§ÄTÉnFÚE¸%P–FÞDQ„r3jÆ8GäÐD8]îk%OyD§ªÀãÔ~á“…káÕaƒ¿Á;mW>ïu7ƒI6ìÈ’yWhhŸ{ˆ}âM¿çóeYí±ûä„Œœ¤ûRx’¤ÃDÒ_ÈRm»³y;:€81aŠ@,F÷ƒüjˆìßhMÝ9 ÊÎqÎ8Ê\¦âÏ7ßi"$›£òÉ!^µ¢cÚU¿ÌÄÉ©åK­ó-D´kꇗ·ËM't˜±|LŽ÷‘¶mùe$ÝÐ{ÝÂkv”òs ü‹^O!Ù•_FìÅ4‡>< ?—ÀC¨œKsvÌ©bôëc ïzð2Þ|Âi”M¼ÑˆrWÔÌÌÓóÝ“º>¼bGi]w8Ë5:^:|Ù‚–jëlºwì=Ýö—ü»·¯$8Eû7 ²ÄƒÚ÷Õ–±ÊeŠîÆ=+À((H§¬&éN´iZÇŒ?äñ#ísfºM÷^þüÿæ]‹cV…Gwœ|¶ô"Ÿ—Þ}[颀Núsb¢¿†[ŽFF=v”·•Å…ÕŒ”浪«'`×ÁJ9i»·¦^ôjîkœzœºÕp£mL•Ë°¦n­.p8f“yœ¤aj-ªçºSc¾â­ó6½\—ÈÖêcž¨gj7>«zq-æº|«ݬ]ù÷Ìãž3O}bnôÕÀT_*í_™kXìæ×B([&9|d&ŠÉ¾*aêÈGªŠú÷eÃ[ÞlÏ€¯ÖÊ—%2p%@ëCjÚ@PLm7NKiø—{nŽ‚À"æþÉÄî–-õ Žþ‚BÆÐm…xÞdû -#nwF!Ç ðÀZÓ$™8Õ¥|†âöÊ)Š“º!_®®±Üøת³ÿ[ƒú†îØÿÀÓÔºcnÁØ'õˆÕ†„ƒ%…‘Óîp뽓ÚÞe»ª¹\ÏD«v¿‚KF -³¹è]K7{×z¦õ+‡{,£­ì¹ìÿw8áýãÛÎý›á{Ysáôú#×ÅxÏÐ\ƒ;†ÆúZ´Í£¤ßÉèþìh’ 0yŸbptQI¸6JïÎQãâܨçKŒù£Ðwìº8DaZ<åºÿZæ» -endstream -endobj -3800 0 obj << -/Type /Page -/Contents 3801 0 R -/Resources 3799 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3793 0 R ->> endobj -3802 0 obj << -/D [3800 0 R /XYZ -11.232 900.716 null] ->> endobj -558 0 obj << -/D [3800 0 R /XYZ 56.693 538.461 null] ->> endobj -3803 0 obj << -/D [3800 0 R /XYZ 56.693 509.358 null] ->> endobj -562 0 obj << -/D [3800 0 R /XYZ 56.693 306.166 null] ->> endobj -3804 0 obj << -/D [3800 0 R /XYZ 56.693 277.78 null] ->> endobj -3799 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3807 0 obj << -/Length 2155 -/Filter /FlateDecode ->> -stream -xÚÅYYoÛÆ~÷¯ Ò ˆÆ³réEÒÜæ6m’¶±€[ é%,ÂG!G±Ý_ß3)Ê”%Ç°ûÄ!g;ëwâè2ÂÑÿÎ~œž¿8ÊPÓ8š.£˜¢8‰RÂK¢é"ú4ú(K™7r<¡>(-7\ªÚ ôÊOþWÍTêʽüyñnü×ô¸fBÊ„p§]èÛR6+)uc¦áv¥p{ÌÌíûôŽ0 ž¥Ñµ]¹ŽÁˆ²ÆetqöÇö’À%Îæ"8v4}¦TX*¶èÓD`x£}-ªCCz¢áVüæö;)A‚´‹Ð&¿”¨Ú®AXc!F^;4«HNÐŽ¥ ÉJƒ²´Óû~s-g0Ay:Õ¼]oJ¹ -Œ¸|XÊ\oké^jùe+m^È軌SA¹›ÑÊ=óÅÂÍ–+% ‚|»`w.$£¼,Çd¤ÆTŒ®Ý{ ]#+îe^«¦q+j¹”µ¬æ²é¿ÊǾŽ‰y†s·ÁÜîUÉ02FÚÈ}…ããš¾¼§ÅÉ“zÚ}à¶çn;èömÞæïòµVµ2f2ŸƒÏùó܃ÙÌ/˜Õ2÷Ah£ŠJ7Á9Ýs[—M‹t1J$áø™Æá‹ž¯Üð;ÀyÐìcn p -$ʽH <ú/Òàî‹ ÷«œuïμùm7 øÕa×\Æ5¼MßuFÆ1 MzÌ9­Ãæ^9ײ,½R\Á¦ñÐ:ÙcÎmñdë|VÙ1Í rv[éªË—ª€+æ¥^w…#na5F0Âqv” 0ë¬Ã»!Ü„¤ˆì:”60„YÚ!g­6 Ú"ð”k]3ÃÊV{>LÔ÷𰛦ÉqM†ûC¶ÀžÃ¤‘B ä'fQmF|°ò‘YbHg}¡æ3H™=çœø4qÀÈq¼›^ßÇSg6†®<ªfštÝ kEå¡c²võKN³ Ñ$鯆3Æ( ‹^™½‡w߬„Ìàg½.ÝÈÐvóÒ0ÎLøw[lc¦›|íG;ª1¯×+YûÅ(ÄÖ¥=¤½„9ÙÚC‚>ÌËæòºXHa­tn´â_[úÀÚ™ÊM*7"Míe­ÌÂPC-¤™šŸd¶Â‡@ê\®T¹CiL#ÆıÊdWyQنŭ<ܵ¶å@wrór]ç›5OKã ˜^ïQJ”]çÌj˜ºf\]æ·P*%k1Š;›9K£–Ø’ß2iíþôû‡C#ö¨·¤ =xÙ„s`¥§ÅF´Eµ• Ÿû0)«lã@‹¡ëF˜œ8@mÑ%s'÷nœçùØ)h‡¥+ð= 3Y7a9 !8}–‚¡’;¥ëpÍ7d_X@EÓÁ«šõ¸cDvRõlüN8mÿ4UÕª,ÛL\BÌr¢MxíÓ³×ö™šìC½>§¦¾ùC ˆ§â¡mnšíÇ;ÅÁ8ØWÒ/E}å«¢_Ç BC#¯¯%žÝmËÙ¯ÍÜKÈœçÆ^ÝÄ0'Pý´^ ÕˆÌã Q¿Q~6Ç-iCý†oMhY\nëAŒ¢‹vqÄœ¸ÃäËÐÉâ2ƈÓø&Í?”¶púŒv 7npPûÿ31C€}˜Ñ×&_ñâÿZä½êx1 ?bœD~xA<õÒ ÷‡A×Û¹!î'ß3äšÄŽ“û;F“¶YtbÒs8~Ðá’»Ò¬år^æMs¼7a£–M³ó?Égãñ^¹ùÖÀ[J}Ÿ7%£¯—ór+Ý÷ÁzêZ3z eptѸ+UMþ–µ2•Ù]¹‹¢”ävð%ÿ;…RÞ†tßQÚ# e‘Å|÷÷‡_˜ŽÅè•/„æa÷ÏÓ÷ïÜ~Pí¤p1'ÞMýÝ¡þ·ª Àǧü¡é]+eÆJÉ•Æ~ÆDúþ|wÆïÊ2?e¿6çA˜­¶ÐÍÚUá «÷‡÷Å|•ËÒâ×Ú ˆw (Uû¥ùÐ/vîÐßð‡ý7tgÓ -endstream -endobj -3806 0 obj << -/Type /Page -/Contents 3807 0 R -/Resources 3805 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3793 0 R ->> endobj -3808 0 obj << -/D [3806 0 R /XYZ -16.307 900.716 null] ->> endobj -3805 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3811 0 obj << -/Length 2352 -/Filter /FlateDecode ->> -stream -xÚÅY]oܸ}÷¯db xhQ))E6I³ÝÝ8Ic-ìƒF¢g´–D­>b»¿¾÷ò’š‘#gìEí¾Œ8$Åsï=÷ò›…·øéèÕÅÑé[á-–H_...Òg2ZÄ<`A´¸ÈŸ—ŸT©ÒN¯|á-ßë^uT¼Ô-ú­m|£³WZ_ÑŸŸ¿;þíâ˜fÅ9K„ ÑÎûÛRu[¥ú›av¾ˆavàì¡ŒXäÇ‹•`IdçOB0Š—§ôà¾Äþ~qôLJá½_Éd,¢„3éù‹¬:úü›·È¡ ÀÂ$^\›žÕBpù„r¹8?úç‘g‘ðîEÄ&Œ{’ÖôÅ÷…Y…{mñy%"òv¨³\]ÎzÌ“ÂõKëÙÁ$,=p}>¦mZÝ3˜`a8¦‡¾z»—!Ûb‰CD¤¶®è©&Kkª¨t«¨ -‚ª(o©vmëò¢ËT[;t®·ÊõÖµ";û2a2”Ó¨Run£2­ó;Q©¡d#¦·ÜuÇÈ^—`LûæÜç/C6†-:’¼ß‘ºÛZ7Öcx¾ðO_ÎLì³0ö]|R—5@ž_gBTðÄu £[Ä¡dƒ}œ×àO‹;”w(ìᎠ4¸#™Å(EeË,-!¾¤Xž`¯d Õeè4=•¿Ý] ó¹ÛÞŠ¢/Œ“~b£Ï‡Ùúa'LìÆ@ceºªÒU§ÐA‰#¾, ,YG†šj(û¢)ýƒpíÓ:£Í¢gCZ›ckGÏ¡£ñ<3¾£R;Á¬ý|0 î·3 X¤½í‹¾œÛKº Gµ“6@O>d»B]y‹‹2XKdŸšV£ªUžvÛÂ/ˆCxÑ”½lgKZ3Æ€wv<+m†¶àšsµÀЈízO$úT­'Ž!©'‡¹®µð ;¹$é=åý˜çdV¹c­HÌ[4Š˜ìE¤‘mE}©gp’¿?f±^ӭʨ(–Æ0Ĩ·õb~N¹ ìæ¶-6Û~.kžùh—4(ïYÜ#ŒBɼpä#/g•‘/ÇumH¢{kdå8^^l)`PÈÕ1—ÂJR¦†ç”žÑù®/YlÖžïîrÂwÈ?€@'¦¦  ¡+ÛdІçGÌËéPZ=¼ÒÅ]•Ý*ÔÀÓüü=¡çLÈzU5%NÇn*t]?~F× 8bš}¡Ñ0o÷õrlµëRgW+ÐÏ›Vut^åè[,±ª¨‹j¨è-7LŸ®KŽj’HèÚQ} —;ú 8±*ôß*tNÓC ´ªÉ“8öü I;îR7œ©›žÖÑÍøÞ*ô9)Ÿºš'Þ²†müGµlïÃß·hgÜ=¶¡$ħe7` :%Œ°O#ã°ÐB4»ÆK7ÄØJ¹ídŽç¹w´èÔk‚øå#·¿Ä4Šg‚¾yyzz]\,•¾U fåñrs -N´iÓf[dôæôO Ü×x²ÓMzú2®ßéÍÓdjR¯@О˜oMrWýàôHžÏc/kE.õ-ž"fј‹ -deÚÍùEÝùÃ3 ú5 o*-±àz˜€À -8 €SÜÒŸYÆçQÂÂ`?‡ß»8ÞxbŸ!qP"/,a…$M3Ÿc3˜jù¦p°èÞöÏmMa+zmI€ý` ;µ†¾ºVY:tÆqAê¤xúƒ2`¥ – –5wãu½ëâ*Ú(ÏOø”ö…¢Ü«/6µnÐ9ý©+ò‚]È’=éSc¸Þ^cîHIPl;ʧ`ýcPnI?ðPr8€Ú~–ÿ ­d•'§rÒ%…7é±ï-¿âK2U•Ñùsm*vp(]ˆ< ·ÑÔ.¯ûOê³×ùA´KXÔ¹º™ƒRU²'«é*Íqœ¹ƒœóuÇ‘ kÕ+ò;£4Cõƒ=Œ™ÐO;7¬«‚Ãj -y`ÔÛáhO‡^ùË!ò©1~èǧ¢ÙnYÔ³!ñ7ªå¹ƒ&¨äxä}ß(óìnÓg:g±CiàáU#£æ–²8»¿F½o.Ù»¢›¿ò ýdÿ³¹Ð¶(s8|Ø뻯܉曯 ï:Ž -Jb²EÙ:DàÁ÷ÍEìóä¤å9NËçÖ±f`ö!’ny:KhÃ¥ãÇ+§ÕÁ}ì÷.8o{â Fï8¡9I!Ó¦iؽGIk§ý×ql({ -Ê܇fóE1ù3ß™ÿ ŠÍ6 -endstream -endobj -3810 0 obj << -/Type /Page -/Contents 3811 0 R -/Resources 3809 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3793 0 R ->> endobj -3812 0 obj << -/D [3810 0 R /XYZ -11.232 900.716 null] ->> endobj -3809 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3815 0 obj << -/Length 2872 -/Filter /FlateDecode ->> -stream -xÚ½ZK“Û6¾Ï¯P)ªv ’våàØ›d³ö&ëQ*[eç‰Ðˆ5|h hÆã_¿5²½»>L‰ Ðýu÷×Í g·³pöÓÕ««g?Òp–¡Œ6[mgŒ –ÌR¡(™­òÙûà(—b±$4 þÑ(!íã¶iíƒÚ¹É×Í懦¹³_þuófñçêØf‰1Ê(µÒnÔc)äN%õ4ìŽg)ìÎ"½{Ì”t¶¤(KÜþI<³˜0ýë¿®®þ}…A|8Ã3ÊË¢Y’aÄB2ÛTWïÿ g9ÌÁPœ¥³³²šQ"1x.g7Wÿ¼ -&³ñ²ã áÙ3} „šSøŸÍÞ/i/ó\äöþµX<Ø/{ÞòJ(ÑÚ;c8£¹t¬7ÈRPybŒè;!ö¨%WŽ@EÅo:´…×ÖðdË î‚1(ÔÛŸ¿mòâC‘?‡­Sm¦gfw$ju †À/`Æ?>ˆ5Là0v3;U•£ß¤ÉéŒûUÆÜ”•ÏîðÜß@«à~i0¼ úX•zÃ<œb—fmÅkûüÇnÁK¹+|™¢˜R0èƒÐ§Íò–ï­¬ßëbÓä®rÏ7îq³ƒãoÀ>Û¿ÿ…„a¸4/Êûçà9,EæþgLYUçÍf ®>J}õ(}á…:¥èI ýñÑ-Œûuæ´Òc;ì´õKÑÞqûø÷EDƒFŠ»¯WÖ¯µ?(+ÎIm/퓨ìgÎÁã0 ªe?šõíš;)BµT 6;ÐlN4\œbw <îE-a9>Õ->¯ÜmãÔ’ŒÔò¶³ŠRï®*-ÔßT…ú/°tsØï›ÖÝ,[}~(•õO½c'Q¦Î±K¾å„“ E÷?¹ÚÅŒãx[(QŸ|œáµWj  ô£e!m€… ¡8Í. ó §G <³Á#ÇF-™›#s5ïûãÕîèçO呯 â÷O¢-W:*Ä8(› /¦Om›R„ÓÔ›Mªglë×hûÊÁ1 -q‡‘wb+ëf/ ™÷ȸ۶ØÚƒÖýäû}ÛìÛBßàt+y†øŸ®>ãĹQç¼VVü¶9°ÁcQÛOÙÚ@àŠa¼*!òH;ñ&˜DÚìÔjW88’ŒBº£ck‚£Ö·.WÜ&ûµØñ ƒûÂãD<&4Jb'ÝEoœ>-{8g¨$†ÌØyᦩáJÔÎÍ -ï”×9=–j?¯Þ¾9rM€è²Ÿ»Qc¬p€Jíþãþ²”͵³¨#Q€k>?H±äJµÅZï}Pb)H}?¯µ”hJ:EØßL;Ü”Õ1¢ÆN5¿çv_“ø¢,Xƒ;ÜÙ¡[ç&îdg P -³L¯ªÜC{â ПÀk Ã‚ßZä@ÑY>. œnÔÎ$8€=šÑg”Æ@×Ø^;Ÿxê¦OýpCg&ŸìÊÒÏŠ‹×;È%>Jˆö>ÎÊá·VùùÃ~Ì6ÚEà£ÁiGC8c'8>U^LÁzxwf‘WäDB/²“Vlë­Q®Kd@QŒÝ<óˆþ9öóiôqô:“Ã4ì5Φîœq‘)h´‹u.>^JÇ:¹sê:˜œrI˜ ‹ÊåÕ¹gtéï]³þ7Š?*¸ÀWS«¶‰ -#Jà„Ñèæ¨>T°5’BkXy©ãQer=% ‡ÉXr«cùÁ"Ù@08zdÂåÄ„ ôx ÀCua‡¥Q< {Š²È¢(#Á`Ù,­eã0DÌÔUÃuŠ°c`¸POADõš| -{i·J»d!¤O18_’]fãÊ-#ÂFþß84yþª]`Íð*,ôŸš|¯†zf>©« ‘ž7K±1ʈ{!¡¬m¾°ùWoE—ÒáÉ°=Ú%÷®´í -›áõ´ÉðzèÇ_;)¶"YÆIæssDpP5Z€-Ûò£Û*¶1iAOYqLk¤‘Ž a«Ýg´§•C×aöYºÁq·®/^˲ô%::3SÔw&çŸn „-ŠÈå-!Ê0Úmé£$‰®ÙÅ(y„Nìp;Ñq ß6ýíµg íG¹H‡ ‡JÉ€Ù[«N(lšuyI”¢ç•}é,Ð-r<¤È¿Ÿ+¾.56Î4á èýÔÄ©X‚h€hGÈ&cA1í$­ô±.åS[ï9wÒ–¿i|š¿=é+:µêx ‘,{‰<¬ÝÙå8—é!;Ö×CÞÑv㵎Jz}‡¤5$ é£ùDß‚·ëBµ¼uWÊæöa'Í?길ÅH’±Ë½Çn'ßíN¾¨Ë8õ?=p“e_ó/=ÿÈÇA -endstream -endobj -3814 0 obj << -/Type /Page -/Contents 3815 0 R -/Resources 3813 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3793 0 R ->> endobj -3816 0 obj << -/D [3814 0 R /XYZ -16.307 900.716 null] ->> endobj -3813 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F102 977 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3819 0 obj << -/Length 2596 -/Filter /FlateDecode ->> -stream -xÚ½ZmÛ6þ¾¿Â@¾ÈÀšKRï ú!M“»ô’&—5p=$ÅA¶è5±²èJT¼î¯¿á›$Û´w›\î“)’’ÙgžOî&xò·«ŸæW7¯c<ÉQžÐd2_MŠ’t’‘…éd^N>YÅŠ–Mg4ÆÁ¯B²Ö4W¢1 ¹¶ƒ?‹åOBÜ›‡ßnßNŸÿËÌAyi·r_±v͘lÕ0¬N&¬ž„jõ(IQJ³É,Fyj×ϘfÁù!4Q/^½š_ýqE@<žIœ $'iNP‚éd¹¹úô;ž”0@QžMvzæfŒh˜@»šÜ^ýó -[Mà³q²£œ˜=}¦4Ö»p¯M>ÍbŒƒeiuÂeŶÅt¥O ‚ôi#%9ͦ!¼¯e¶¼d‹ÂÎ;ØA˜¢$ÎÝ<¤Õ:#8C”DЈQœGfì(ùgŒ)+˜ÎB¢¾é·‚$Ûl«.=lªk‚hjv73?Å‚5Ò´oe±—¢><ã,CQ—CrPatYo`)¶aµdV#_¿2g„æ4]ës8‘£C€õK9 SŠƒ®^®Õcˆ•é®Ù”ÆÁÎtn‹¦Ø0ÉšÖ ~Æ1.¤l¸yY23­‹ƒ!b&Éu!M±R²Vl)ÍHÅ[ÛÚ6¬…’‹Z©3õ ZTby¶Ø‚º8k¯=Wæ…YgTÏÿd¥~zÁI„â8ë/ø²èY™Gé¡_‰¦dÍÙb°Ýô© D Êàz¿jëqü¸ U±`•G …5óܳÁ)XŠºôHN0ŠÁÛñWhà¾O¤l ­¦àvEWI³ó[Ê¿pÑ5¦KY±úm¡p2 bpxx¯ëÂÂm-¬k.«Mk¹.ê;ç_ÖÚ-Þt  ²Åçe×Jw¨ ÙJÛñªrâÌï¦Ó^¦Z¢±}€û¤Ä±l5ö ò%@¥~À—VáKBžC?MU¿öRîýYzÜÿ°c È3; {Û›±í!}%c#§¯Ì|§—ã——f%x}Ü?udr·çãpî”×N$@Ä·}‹Ñ¿ðæ¾0ÍLÃ8-»¿Òá7€tD1€Ø9þ÷”À©DÓ3,‹Ú4X],*f;á|¦µ)šûÖ4¹žH‚½vÕSŠe§ö`ž{ó p-y}7HBZÈÄô(@Ї)‰¶ELý>HV·ÊÈ$àN‚Û-Í×Kf–ÕäÜÞÔ)ƪ·ÁÞyÈRÔ²UÕ{ÜÞüŽ ˜4À -* pÚLŒ±Ò1Yˆâ(qóU4K¶RE®kŸx!€SébµúÄg(†7O##ßœ¦‡ÚÃu¢¥$9]gÇK¹öŸ‚dÙxk³Ž%0QXzù«VÀ.¢LqJ BÐä­ù‚¾z—vªe5æiYØ ‚v×x*ά‘̶\átˆó±ùê—jÓjâ=»Ù5Ü åÒþºiÊ‹íêvÃàÌe·´ó[±±­oZw B-fíÉ<üöêƒÏíú—¬]£q¦ÇmXK¹ýáæf·ÛMé†Õ°±´››†­@…`øh-7Õ³÷Üvò?¯ÕÙD³)lÌÁø#Í4ÿ\«·˜&ÐŽ1ý¤ßaz: 8g5¢hxˆG®áP/²ß†Íé_=khÃ}dRâ<ùQ W È3Ò8×¾à 9¤ú,$è;†d‚“ÿ>÷ÖãOpfBjf/j¾î3‹ªÚ1 Zö´ÀŽeZñÇüaS”¶O[±Må3Ö&Y„Ò´w~eO~jáž@-…“Ýrƒ¾ãL¸Aî´Ú˜ü…1 -WL TÇÎè#y2O¤À,ú<‹ƒ<“›)=Þ¼|p.‘}CFöH°/tZåIUàr‡rA;OÒ³¤¶Ûn…Û{èP«4aº7ÕC­Å*fG2Z­µ1òäÑs†ýˆÅ‚Ãï§Ïò†ÀfY!;µÔCÃþè˜Ê$ÕÃ3‚Slž¦‡aæ"Ç’µ­Ö‰zæu+›n©ÈºéP*ÕY³áÒMZV]Ù¿ãØOS•éÑ0¢—QaFÓ+óž“æp¦'w#Æ#t°@Fˆá>¸5àüûéÛ–TæÔSõ0 ‡¶äàÔÙ@[Ö]}¤X¶|U¢/BM$ :p)˜/_§IŸ}ê*‹Ïo2”æý¬Ýš«,KmÛF›àšZƒÂI›!zÖÃ)"s{Ú‚Š(èÚ¦œLiKÚe´:LsÇ¥Ý×| -a_¼¼y+æÓ4rÕ¦0…às\sø™·Àö•zŠD—ÝÛlŽ’¸GfÃŒÒÄ0î4uLlozέºÊŒð•éÛk -…¦‹ÐsÇjG4Ï+eŠ -ëiƲ͈"¥;VU׊ê„Á^‡L˜Ô²ñËvÂaÃ$Kñ`ŽI¯Mù  to´–ÅäPi;]¨e7¦õ|6pã‹yvf}NßÞLÅYë{$¶Té"ÃÓ‘"é ;õíú -{>ôÿÊPoÇa¤\èý—‹• 2²pcÞ\ª´’0æš<­T”;Iú`Ww±>b9æ½Ò–K Òð‚×ïmh•l]FP`ëQߘŸƒÒ‰ jã¢JŒ öWEæížþ¥\·¨Úõ×—m_86é# -1l«×á\¼ôag†’ÞŸ¨€ÃùD# “' CØßCarÃñ‡ãÕñÙò`ˆð@ûTã[4JNjëpo)NžùgqÙQ:¾¶’+U~áª$á|”þµTâÊ9I -‡C¡R=ýÔÕT·©öæñŒ§D@‡«Yñ;Ei<ß$ F¦½ÞB¦ÄÒBmÃ[XÑ@°邤Gv†6Lô_.Iª$¼V'+ª³ÛMc’lØî©À‘<<–ÇÌa|õ {LÎïß*U…ù‘è™-‚Ä®i~ˆ¤Õ%Ý€=ìÈ^mçÌÕËeôû}ÿqqÆYŸóŽ ÃÄ8ú‹Õw^£õ4ö@Œ…Üò‘þEQ*æ¢Q>lë‹òÒ¢ê˜évüÂns Æòí»…Ex_ݯg²F\›n-²µûpÕxÃùMq+·µ¨<8 ×ÜkOI¸ÚŽâ–=µÇD3óIÉaû{/¶'ˆ„#¨Ôò´6•|9:Þ^+Ya÷bNfL•‚îÒcƒwÇUFâŽÛÊþEÉÛmUìÝѶ ÍiáÂïYu(]\{¾•ô ö_XÎÉ(*áh€áË+›¼IÓË -€½uö)݇H “8K2dt¾.êûöð\E]HQÙB³dË58%¿?÷^Ë~œB&€Ò¾à¥JxQš{ø#=éù#±c–?:™æ{È‘Ñõ´ÓÀ[Í{RÁ*EÎåf(Kßn¸<ä5¾?Da n_ñýÿ¿*Ñþ -endstream -endobj -3818 0 obj << -/Type /Page -/Contents 3819 0 R -/Resources 3817 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3822 0 R ->> endobj -3820 0 obj << -/D [3818 0 R /XYZ -11.232 900.716 null] ->> endobj -566 0 obj << -/D [3818 0 R /XYZ 56.693 517.591 null] ->> endobj -3821 0 obj << -/D [3818 0 R /XYZ 56.693 489.898 null] ->> endobj -3817 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3825 0 obj << -/Length 2501 -/Filter /FlateDecode ->> -stream -xÚÍZ[sÛ6~÷¯à¸/ÒLãB`²Ù™¶iÚt“¶k{gw&éEAס’Tl÷×ïÁ™²ä¤ÞÝ—˜@ààÃ9ßù¬üpöíõÙÅŽƒ%‚ëeQÅ ±8¸^&—²i-§3ÊñägÕÈÚ>.Uešµë|­²o•º±/ÿºz7ýíú'XfFJ8·³]5÷…¬×R6µî†ÕI `õˆéÕÃ(F1ÁŒ£$vë'1L‹É…ýCh¤?<ûþúì÷3Óã€ñ9eY©Íž½{Ÿ7>ÆÒ²,ÿKž¶‰År4„y³Q K·™J.¿ÊZ:'mÔxÿ¸|7„­íÑîV¸çL•Mš—­?´™aˆäšǧ:ó£÷vÍ0÷‰N`9Þ…FÞc³RxÄí±îa¥§vX1LYzL:‚¿õ”LL¢g —ù;º_ÏBx|’M&“¸)™ª*YoU¹ÐðŽ„t„Bž*HW"˜«ó¢&¥CB*Ä'BÚ®¿­Ô -´[ -¤Eqo'_È’À<ó¤ z?9nòÒñü~Ï׺oR¦Íc¼ÑЬ~¹K7Àý/FÆþed«E$y --u½:à 2rÒ¢‘©í}•¯Ö͘€ç -kœwqüê¼(gùT¸?Cš§\¯9‚WçïÌWSímÍ~þW o"@Ò‘Áž¿+À­]°EÂ8 -Sl¦¸^§åM= ÿ«Ô‘èU#ÁëTaI²’ØYß«…Ë: Õ©°œz‘­wåÍ,S›*Ñ]]|MPÈ_§å/ŒºG¡'!{înåºƮϖ=-ÙГ”ènc{9VU¹9:Ö?4I+ílƾ¶$9á{CÜþcû­#ë÷y¶Ne¡Ã®Ù8í§1Þ€ø–J3MPãpÊO)¨z"‹ûùü*+ÒºsDÖWݨÞm·@8uoÛ®Vˆ’•Ž¬¨p¦n2‰µE+~–aÂÒ±^±Wлê@Xäõ¶HïÇx9$êžS,àH„¼‹æ²¯Ý3À›eÈK·»õÕ®Ùî²óÉ7K ̪ ÷µ+à{]6Z½$Z·}ó‹K¿f6÷\±F|rZL.Õ0à˜ ª¶½ ·è`âƒAš$Ãõ`¶§ÕFÂHL>k\¼Ý@.Ò!:ЇÚ,Uõ$ùC÷HàÐ[^nÒúh.¨ws§ô`#°ÉÒA¨ Î…YüõäŽ!ÙËN•Ú òS^Ý8íü·)ƒŒWË›G:í*†E¢½}‰Vbò%Áª§7ÎaM¤ü#uƒXó2Ê$NPÈZyùˆ5Š;MeŠ˜Ô~2w5úAÇ—YÏG+,5y{XTãÆ/\Kî SZm@‡” ýz“–Ût¥ó-JšË,ÝiQIâ»@CÖ¶¡w¡Gçî«l²¯l´„Ò¯ÿÞÕû /zíùªTÕ¸0¤"FQWø?†V´Ð22Ô0÷ær.uDc¸Õ‹½n%ßIo(Š胻qNQX|H=¼W_{™ñ:Õ¢ð“þÇk·_2Y䙯08^(ÓбB[FWR2lh¼±hçà*»#]4é‡ÝØö_Èà¿V°I0ƒ#4‰ª;˜bLG¢6—5Vû:~»ÕfÙÛUUmÒ"ÿCÎêmj.ž°6ßIÀK —9­Ý¤sW– —íS™ j' ` -ΣG2¿À½€ª`»Î³ÚËã°—j.=+_5é}cïÜ>ÏïlžnëÖRc¨…,Ë›ôÐGœ&£·9¾rNwêU;ºÉ”°íöš{¿¦žçó"WÑ"ÎmSõÉÑ«#Üî|ÚeŽŽIˆïjáù¼’ŸF–¦q2¸Ý€ -Ž‡ Øã1gÎÝnÖ‡SÔ·¼¨¤/â~×Ä¢÷ñ%)ð¸xv¨I(ÓF>& û`Êž¢ rw=³Q ¨Ûô¦f:wþ<âGbx«‡EÄôŒát5(Þ¾v„`ÒC¥ï|\O¾C„Ž1BÀÜ ¢D¼MÇ\ÊÔ`vßd¸ïŸ5Í9Ìÿ9ñ›õúOðŽªÑ߀1•6&ƒ·¡>¢Z(C¢+x–ùjWÉS juHâü†]Ž÷‘FžÏ!~õTØ»>Öxa*ÚQÇC…u׆&õ‘U2½ÐÿØKI¡4T'½sØZþº¿¯m[ç¦+j¥Ó\’LÞº¾NY™; 'Bt‘`W)%M¾q“xÛµËÖV…õªº n>Œ9Êg\Ïÿײ’Ãd1wï²Lç…Ï$·¶¸å{«çÒŽq×/y,'h¤¤=ñ¡gc{Ü°ÿëy¯Š«ª|ÑÞ2¯àzgœ¶ m‰Ž“òîX:ÝîʬÙ]à‘rQr€ýÂY ôå°pÏ Û0‚ -ïÆ¿BÞ‹$h,T¦Å¡•A¦e¼üPw¿>dØÁ ™Õ™ÒÇtÆ°8xuE0Aññ‹P¯Þ”z§qX«„M;z™]ÿz¬lk¦6[ûIØûÕ–1ŽB²®ý©µ›vÛp¡šÖÞ“}“TžtZEæ‹;ÏÝOKæcÿÍ#ă·~ÆÿòøÅW -endstream -endobj -3824 0 obj << -/Type /Page -/Contents 3825 0 R -/Resources 3823 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3822 0 R ->> endobj -3826 0 obj << -/D [3824 0 R /XYZ -16.307 900.716 null] ->> endobj -3823 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3829 0 obj << -/Length 2542 -/Filter /FlateDecode ->> -stream -xÚíZ[ÛÆ~ß_!, -”B¬Ñ ïtÖ.âÄ1\4Ô»m -ØyI#‰5oæÖnƒü÷ž™9ËDynE_–äÜÎeÎùÎEKg»½ºxq{±ü> ³„$¡În·³Ð%a4‹™G¼hv»™½uÞˆLp)æ 7 ÎuÙi^·em^š=N~W®_”å{óñ›¿Ì¾ý3Y0F’ 0§Ý4÷™{!©¦:›Å@=ôu?ŒHäƳE@’é'1ÅÎÒ<˜ª/o/>\08žÎØ,I˜x³(a$¤îl_¼ý™Î60 ?‰g½2ŸŒ× á=›Ý\üõ‚¢&èYسý„0žÞ¹n ¹°Ûfo¥Î7›ØŸnâpxxÔ¹Ú¤s7p>šÁuÆ¥|vùËô˯‹uY4¢häås3¨yU‰ÚlåuÙxZÙ6UÛ˜ñr‹‡áf\±Å]Yfà~rŽïåêŸbÝH2_xÔw¾ÉdùD­ö>`¸Àã«&- »ójUëkŒ‰Æ㫴 ,«Zð÷—Ëçæú³´zÄ|òm#Ð\ ƒÆ€ ƒðÞ1hM Àg†ÎOsæ‚jß\¿¾~õTI8/Äš·Ê&=ƒý¥Ò ¯÷¼Øáh•ñµÀq%šiS+œÿîõßÍÄJ4! -3ªíYâôàZÔ¨¶{»N›0X‡6a_™‹éЄÐÌ‹-W$Ñ؇†å‡„1×.äêª?q¬K¢Gºðƒ˜DÞÑU¡©¨[©“*K -b'ç÷ê%qº›ŠY漉9 œ»T6i±3#ßÞÜà¢ëš=Ç3÷|·õQíÅsVZ³êm dmo°å6{3Œ÷#e›kó³öTXR Ü7g`/m¶13…0þ¥èÕ– WL!P -ª¨Íú%£æªÌj16C³í֢̲ܶRѳ·ûò6ÀíÌ Cåp€¼ÒúÞ{¥#¤Í-sæQ Ùf͘­Áá†ë:]™û‚ý«R‰e4g4´`‰OÜh¤§à© FLÈ púÞcÜÄ#ÔëD¾D|¹Bq -ž‹g—;â/cc¿Ÿ_-ùsÃha-vǸrU=È£KX-MÚdb‚A7$q2`ðjõü (#<ØÕr|TÈG˜ê?¬/«Žq€PbËÊÙy¶YuÈ’óf_íkÃO™<Axì˜g_±gÞÕR‘±$—ÈáÉ·Š “\›P€"»>#ñØFÞpƒÂàÜå[:Á C ¤:TOSŸ áG-­Ôef>´SkÄð¢‘?­™]'ó&î,LÈ™„Zp²èÁ[áÖ}»ªÈÔ#’,G¤ÙéNuÃèQ^àC¤õÇõ½:S‡ß‚ À¹†N+5©I»àEëJ½\¾£Ô+y3i(~Db¿µªKˆrÍýt¬òë­_e:¸"É ×õÄ*Ñ£Äcá8‘}f£ ”æ¹BÑjQl¤q­Š#É%ÏñMå òqâ¼D46y$ ÁXÇ}H{:•„ ]È,ÙclÚ¿ŸÉy=g±³K‹ESV*¯Èviu÷õÉüªlš2?]ò«y´0ãHï·gbÛtÛµ6ন;rÏßNÖO:ë] ñâG©Œ~=%fîöÍ©&õp§È¡&µ*Têöß­‰Õèj·pß‹ƒUh€yHª1PŽ\C±Wãa`wûÑQG>¡ŠA›@ðæ(•¨Úº*¥8“h\ñp9$ãœJc¨:¯6éGº£|F§ƒ&ík):Ò€ÊÇôÑZäT¦÷Z-NBç¾lÍ‹!¡ã |iðL Ù®’£$8ÎzÕ²IXd6h➘σZëœ D‰=¯5þ†ÜÉàE9¸yÓJÞÎpBCâ2ÿq†œôP>(%<õJZë¼^6È‘*$ 4Ó9²âË&¥æ øãG¬ -¹§ò»cï!Ý4{öèÇä!Xý/ƒò ö|&³ÿƒò'@ÙóC¹IAë®Øàú}“gK“w’;™=aÄ¥fûÂ<~H!ç™*Yš\U,fø&Wõù¨Çµ°M àÝ × ëz½o õ<bŠWò¡M…eµÈå<ö†*^CJ×õdy6æ I˜[,­„µ;>tW÷¶àÝj¤Wõñ°ç5°½iõ‹†zGz¾Vw€ìü4Uu#˶ªÊºéÛ²§Vû„Òì!1~?eÕ œÃ®y2•ÔC è|£õj‡Åº%ݯUwmJéABX÷¼ð¼À$]ªø/Q—Ø©4©ešz¶¸…¨m;1¶?GijqÛÊãnb)JñG~ζ,õY»ÃŸºµÝÌ{ó€…º¤Ðs^cO €…G XÓ´T‰šF—Ú<÷Ú¾¸Åª¦D¤ã»]-¤´þ4•Ž­)`ÆjVé*KK IÚ bœZ—yUœØÙh8‹]žTBL²Vdž FA…%é]VJÉëûyØ£!äÝX½\ý±çxê ¬)hL·;ìl8œÕ&I€˜‰ãÓ™»ƒXÁT §d`ǘ5w¸@‚Å€È'½i¾5¹T–>0Qr—k6¿$ðkOEwiýØ=—ÄQ‡ôï…¨ˆiN}$ÍùN¶žÄBæx¬óáaÔjÚLUpå›q<ò"˜1舌é¾’eÖ6“ÕGè‘°¯iþöæõG°Þë -n¹XólÝfèüð½­ËܼÁ<]©V'sóÅgi¾Ã:ÄS}ªä¨T¯Õ_¾Ã›¦NW -@Š'æ±VÿÞ†ý&µè£ržµøy¦ÚG¥(¼mö6Lûa> úe²kôhý˳·&£Á 9àˆl ‚Àë ¹¦‡¦f:ÅõÌêùO\•«:}|›fB5ݧ“k7ì¸7€ DŒa} =UßÑöˆ Ûž\ØýTSC™®åðw(§4&=:ûÝÕ¼ÚÃ!èÑÁÍËn0›ü5!èÔ¸áx(ÙáG?+¥…êh}P îƒÙ„Ù‚‚ûÞ0Oýg: «}N1Ìì'€,‰I%Ÿd‹„—±óºqc­›aøH†€nƒ£þÙ96Na˜0ÅA'AÈ’t±c"Ú<úZ¦þ+§x&ŸóOÿã"ê -endstream -endobj -3828 0 obj << -/Type /Page -/Contents 3829 0 R -/Resources 3827 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3822 0 R ->> endobj -3830 0 obj << -/D [3828 0 R /XYZ -11.232 900.716 null] ->> endobj -3827 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3833 0 obj << -/Length 2934 -/Filter /FlateDecode ->> -stream -xÚÅZYsã¸~÷¯P)/ô”à=û4›Í&“ÚI%±«’ª™} DÈbÌCKPöx}ºÑ‰’½“­Ê‹Eâhôݚ拇_üùêûû«ÛC¾HYÉhq¿]D’Eñ">óãÅ}¾øìýS•*Óêz%Cîý­é”¦ÇmÓÒC·³“?4›ï›æ‘^þ}÷ÓõÏ÷…cVB°4 ‰Ú]÷R*½SªÓ8 §‹E§G>žD1‹e²X…,íùi -ãÄ»¥!#Üxõ§û«_®ç ±#¥þ"N‹¸\lª«Ï?óEsÀ ÒdñlVV‹Pp&ýžËÅÝÕ?®¸Õ?«G;H™àñôEÊÐpá¶->¯Bνy®r«•çkÁ½†^ju-Cï™^öY›UªSí±"wY—Eý@oÍ–~«CÙ+X^‘€£°™“2f2Dq _OY[ºSu×¾XõNŒ3$n1ص‚•ú=­ ¸ðJ&!K@Q+¶zòE¶.žÁ#¶nUöȲ-¼Ìœ'@w¾ßøþzHîýk§êë•ÏCã93gðGòo=4ßíURh:«nêÕ¯ªmnàU¤^ÑÑðsQ–ôô jÕf¢· ÌaX\¬ü(`1O¬7[?0œ™ˆó¨²ÍnÆVQÄPNË×`Ð ÷2`\¸5M„Lˆ·>`a»ÅlÖà"MY§¯\+tß®™Õ<°Æcs‡2pæcÐéŒh„|« ˆì»Å›¦î²¢ÖDÜèj_ª™3bŸ…þkzÃãÐ@gIÊp~yºkM|âz¯6ÅÎ%F<VLëÕà2aé(™&À'ÌYy@Š>E¹/Ós¡BB ÅùP¸lŽ„%Q¿¹O;t ‰ ``_f#ŒYÆá3>,@O~ê¿îÄÉàéêZ„Þ×ÚwDš´ Ç•ˆN$ÞýÎê#W[Ì›XsÊçm¤Þ’^¿ðgNÍ"3žªyÓTÄ°L"ȯeÙ˜ükrszëšÉèUïA@P3ˆ½ûë„27ÎöûViMZUçŠ\'MŠ†aª€ð0˜#à0,Óƺɪpì8Tf,ïc0]Ê‚¯™>ƒ™ÒTbv9ÒT_¾Uµï^èÑù9>£¦—KR+è˜!mË9pp\زÖM´Eü—–zQw¨GW(m\ÛÅ­¶‡Ò®´5ð¥9¸y ä =J”GóNÊíÓHáàJ·Ëºs4ÊÆ ‹tôTNóe£ ©(ôþ |EqÄ(Þï¡n?Ú)#LywYEwM6eNãTëa|ß6ÈÀS‘“¢a.«iŠâ%«0™™‰eÙt–¾ñ8²ã‰Èñ’FófcIXRUSƒ9¡°ånÎ’»!‘žÁkVY½7tƒ¹›}Wí9m}(5Zã$ª›¶ÊÊâWµrÇÑ­hr“•åÔ!@Eˆ¼@t&5I™0¼Z_ E:©„€uÛÅ)Ç"Üï -ã9ÒÛ€}ŒÌ2$*m«6´\ ¯9tûCGƒ[Ô­@1ÿrÿé§Z÷÷~ÄôrC“UVï³¥möñÁò÷;{Ö$ââµrÖ Ä(=½kƵ`9¤©ŽâÈ@Ef´UU†… Gm¤Ã6S+žÝÁ(kÀ5y°±S¸_Uû ´.Õ*2ü%2o@pö¢;qØ'žAÁÎÙ$Ú&?lì¸n*5ƒ¥‰¹‡€izÖ?5¹-Òï1Û"Ú¾ÅÜ ÙW]Þ@u•ßÁ¸0ã&1È0ž$Çã_ŸÕ&ÒÔN캪œ -’ñÌ„Xt:ãÈùßÍ…ó‹Éy…º0ÌŽÁü¬=HDvÚŒê[›'/@ë0ôØ× -³<^$4T§²ÙŠ~>`wU¢ÏtÕàwUÑí¦w«³a„± ßv boùÜfû=.²ª!! O-iÊ°N&Ûøb}<µZýBs°‰ˆAñ†êXB½¡Uƒ¸”™àÍD.jè½Ï=]m'Àç[»vgò= þç íÚ%äÅzÉæ`r,Z÷þæmê—¹ü¶ -ë žN.–s`.f~ÒÃõk0þÓ I?d2C^%E˜k•€œn£ÑçK7+ÇP9ø딃0/Òèr.£ ¼»÷É:;+´JîYE”Ù²Ì@2;è€=½¡ïÁ¢SYnyÛÚ-ÆF+ÿ„79g‰Œ¦Á€˜ /5Iœ˜`TÏàÃŒïÿ™Òݸ֎ä«éÍwƪߦ¥ðÛÂt,`8Lɳlú>ä3ŸŽ ;‰BÁ! ?aÂÜ¢À_¥g¬Æ±ð2? -{ éôáðz¯ R€>‡ßÖJÕ®|äjªõþb®5È Üæ‡&K™3\ÂåÂîÙ›ÆÑ\âjSo'('©Ër-µÍØQ*“M<©”ûoo']Ð%bÓÆY¸T9¸Ú=NQDVê®;ö\äÝŽºièöW=Ì­WÀ¦­ímÕVú¡iܽn´¾´g]Úµ>»%™aÑ”½‹;拦ÛOÞÑ®³®¨ôNÆtfî2ØÝD0Ü£”ˆ›[=þ*¼SP‡'õtí{™Œü9åÂ*?šö»ZñÑê 4=6園1dG¬ô‚–‡²VÙ3vY>¦çTTxT¶¦Œ¼cYŽÕÈ&1DñGÞ7gUçô8mA½óàãòC·kZmlÔgC@|Ý<óôê9N2>ÆÅ2ªN¡_šz·4@ÒÀ²±²aÜ\0`8£Wª+6‡2ké}$û;Z8ØB˜Æ :†¡QÏQúÃø¦i[¥÷Mm/°›YT˜pêÁFÚ»›y;¢Êü8ì¡*tÀ©Ôæ€njólfC›1[ã‚ÂÉ}º©#µ¼ÐPÝ_LC^Ÿ±(Ð -(Õ¶£¸Ð_‹Ä{0]/äÃhÆmÄËh› -|T¿²’& "ˆ]{ ƽ1˜Ÿ¿‘ÇÚlWbRÃ0q`õÄ„» -ühÀÎp•ë>Úf~„­‹zÛ8XÎ7A»Ï/|‚„$Ôð®0 ò¥œŸµ _ÇÓàEÔMú„[tªËøë ÿ´"Œ9O{’’_]M¦íï "5f ÿN÷›¨fÐhêïwxÝ™ë/D, +Û6MWã73–èÜOEî¾áRÆØë›~kùˆiœêL·ÃGc'¯r“ªž[Ô€èÐ:<â!“ÊpiUj•?ô»Íó¸ßÛLÕ†Õg'¥Ï¸/'ÍÁ9£N6¾VŒþÖcÔÁø#àŽ÷ yô ‡2鸿ԟ<óóTºà0£pÄظŽ.÷+Îe$ÿ8Òò?ö]‹9D\Î!þ8(gEª‘õŒþ?—þc¤B)ŵ#0Ù÷構æzð’ƒq׈ç‘À©}ñ3Öð©Åµ>ëüä}XÍLÁ1=4Îû†$Ð;;˜ç^anÿi½…c¸Õ‡ÁÌÇ!õƶðÍN(Œ:·ç½ð+&sÿ+pÆ£ô[þUè¿-‘2 -endstream -endobj -3832 0 obj << -/Type /Page -/Contents 3833 0 R -/Resources 3831 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3822 0 R ->> endobj -3834 0 obj << -/D [3832 0 R /XYZ -16.307 900.716 null] ->> endobj -570 0 obj << -/D [3832 0 R /XYZ 56.693 466.386 null] ->> endobj -3835 0 obj << -/D [3832 0 R /XYZ 56.693 437.627 null] ->> endobj -3831 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3838 0 obj << -/Length 2398 -/Filter /FlateDecode ->> -stream -xÚÍZ[“Û¶~ß_ÁÙ¼P™ lŸl'iÝ©“I¼éŒJ„$Æ© ×ê¯ïÁ7Q»O_–œsp®ß{[{»{ùt÷øÅ^‚0ïiã±±Øã$Daì=eÞ;ÿ7Qˆ´‹e@±ÿs%Ec†›ª6¹³“?Të—UõÁüø÷Û.~ú°Y‚J µ·òXˆf'„lÔ4p'î,TÜ#`G¡·¤(‰-‚1PŒ¹ÿh$`jçÝOwÞ =âQ†XzqB÷Þß½û{Ì(J¸÷¬Wî=J0 -BãÂ{{÷붪ÀgUâhG "˜¡ÞÕR¸mÞ»%ÅØ‘e"3 -ا%ÚT¥Dæœ@AŸ3R$cŠb¬dÐÄdº*„ÕÆqÀO· -íDšååÖª?-oà“P1ò™|fè ÂžL.çÉ$(ì¨Ò:Ý7WYƒœuUp 7SJ3Ê˾$§üê€3ïXŸÑ“»Ñ§ó–ƈ|<-2ûÞTYþã@d\könEó˜Uë86úÔÅä¯0Oóú°H”fI2?ûéY¬`:p›‚;ëé³u6FŸöŠ,ÆêvºUŸÏí3G^šÇ›|½KEñS,÷ð×ξÝçr7vâ%áÀ tЛ\=$ÁeWg( bg›M[®›cYš¼ÉËM5cLaÖÙR[ï JãtÈâPW²’ÇÃœ³Ä!ÂôÄMÀ7UÌšƒX監öÒ„&鉺Ú,êoÌkã¼ê½Rm·[,õ?¥ûC!,á—¯ŒÛŸGã”øÒFÉëÞ4ŠÖé9Â!ùUrDêr&Ä øãøfåA&:ŠU+­´!ÈÝapcH­Šjíê4dÆÇ’‹Ç/sÉìÑš´ü‚~&Âìì¹é®à³k‡Æëâv&Ü¿E»B2]1"¬ ˜FlÏåÿ«/¨i‡Z46 ›O"C:ÊëÍK|Tq–­ýYm.Ês„£øVùsû,«rùQWL¥eys(Òc'ÒL4QŒhÝ" E4tëT]ožÈá¤sÊ­£° ØÔþ%•Œñ‹_ ¬.j¾ÝèÜgÎÜ)÷ÿÅ·j{ü‰JìÍi™Î°6߈F^wqQª¼Í2ËË‘šóYÆ(ˆ:WÙäÛŸs•`‚¬œõ1$dÆRB®YÅuý/‡ÚUá9™?5o‹¼‘f¤ã7Á¾òJsN»Ñ@C#­hW3í(EJÇlu4O“$`ÐtÍ„¡.ë´l€â>•yUvjMAŽsÿsKé¢[V“d„µ9D¶ö]oò)BA…Qr«‚ùÍøû‚§, ˆ?æ_– Nâ½UÔ Jý³…z”/Øå|Á‡ùb9— L™ÆŽu¸óuº¡w²ÉYU…Úòa?Äã;0ë‘m_a}´€ü¢á³zœ&§¹¾ök¤ªÈ#Ú£áZl@Õõñzî…LÑVHôg› YO‹0 9œœä_űé#ìKüLl”¶Ò¶J ÚÆøúB@-°XøÏz]]š&LO­ÀFßï*(õlï´¯?´»°¶Ü¡¯™·µEã0µd <³{3[Š#„·èŽA&ìâO©.KA}‹e”„J+¦c¤€Z —Yý)ØÔ`iŒëy'¸Ë$÷Ö:÷¶][:2©kŠ›)岿€é -ÎXßzªS:¯U'FþŸYDØúQ%†„ÚÊÁücÕš† ×®…6š0"­„ƒ±Ì¾t_µºŸ‡©yx”Dˆà›lRò <ÒÅ%î¥Ûk(ƒ••R_hIt.‡7ÐÉ™êA}åb§Ga~“oK×i) pΣy¿:Ú¾&ÂóIáh„”Ý%F:†³v¾£#@“ßÝü|t3êÛ°&šÄðJXWû}U>v YŸáã‹ž^Îðñ87èÏÊ<‡ é×@†W®é^íÒrkƒûá¦p°[aP a üÁy:lÁí9ÍØxרÀ,Dß«7±ÿ¢hìôë´ÎcX–+/ù˜gmZœnGCš°³Í¼ç=ôÍç\®w.Ç8TóGÛؤÒ6SÏ5þУ+Àsž’ûÊáPÅa9†B“Ú0Î5Ÿ‰BNP„éÏ1›³}û €9ix´ÎÞ L#üvWjZ³ã‘f®š,e )P–×ë<Œím¯Zm…Ø ­ Ó>Ö])éÈï´†ÎãÔÉàúâZ¬eU‘;õ ØŒ< ¼pÝ£³ Ì·2/r92Gô o8CÐÁAE½B3Abï ÃÉu¶z1Êj©J(jâ£ê‹E½‚©½¥h;‡%ÿ•%¤ÙÁ6¹««v»3+  ‡¡©9 !Ñ¥ÙP¼t”«ÅÄe:“ÂåÚMm±WEÕ8ÿøŽQ$ñµXYztíwbç‰|³o±“IwœLlL&U@­ÈK3¡S‘ye¡0·s‰ÿýªhë•yçâi¸×¢ìÄ¡²Õ¿žþþËoogÛq2¸Œ[k1Nô Œ>é,)ac/ÓL—‘DK`?@g€Ùe—1i\üM%œYÒyÓ™Ui+wU=!¥Õ§Z¯s«>ª–ÒÙ Ž+¤¨óþЩ1.·©Ü«N×jC_èò²‘"ÍÆ—ï?LŠàx=ŸÒ75r&¢"è8X2W>ˆPÚa1àÄ}¥"Ö„­’EV&u©qè xkZ„ÆüX `Ø»´šýü–àag¤ -q½O a>nÌ}pQÐÁçÖä¸ÿµ•$×ØJKêt üÓÌD×"xšh4csI«Ìá:é»Äµ´P=!ò'P]%µW!‡Ø-Δyùaì Ï]÷eCâä›$0 Øg)…ð­}ºÆÍÝúª§«ÿÝ'Ӫηy €tˆòÌ#Ñ…úzþcKtåcKx ñ‹ø‹ó{“ȃª G‹esH×¾] ¯ð”Κ3 -P÷)U}”ÙÔév¯¬tí˜[­ûÿˆ{ÔlÕ"å}ŸGîݶÌÝ5¿þÊh Ö—³Ù„s(R¼† î{gCzc}èâ_VaçþõBuÉ,ù’ÿ¼ø/]©fö -endstream -endobj -3837 0 obj << -/Type /Page -/Contents 3838 0 R -/Resources 3836 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3822 0 R ->> endobj -3839 0 obj << -/D [3837 0 R /XYZ -11.232 900.716 null] ->> endobj -3836 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3842 0 obj << -/Length 3649 -/Filter /FlateDecode ->> -stream -xÚÅÙrãÆñ]_Á’]e*µÍ…ËyÚ#¶×å++¹âÔz p(" 0kõ÷éžž@º\•Í‹swOßݾº^ñÕ·'¯.Oο ø*aI(ÃÕånJF«X(¦¢Õåvõ~ýÎ&mÍÙF|ýSÕ™–š»ª¡F·w“oªìUU}¤Îo?œ}¸üÀl„`IÐiÝmaÚ½1]‹Ó]¬b€*„®|¤Õj°$rðpb¯ÏéOÈwžüãòäçó•X! µŠÁB.WÙáäý¾ÚÂ`Àt¯nìÊÃ*œIB»X]œüó„;Rð{IâÏÖ <$¤~—2°Xøm«÷›€óõËíÖlÏ6*Œ×m_×UÓQÇ 7MÞåå5v’õ!-iôwÎe„ÅN^vµRwRm²—dÔ¯ú®îÝÁÛ¼1YW5·nG¹¥£'‡ÔuSÕMžvÆ#våwåæMÞís‡L·O»#@ÈƘé0>få: Ö ˜“„ë×UÙ5UQ $ᬦê¯÷؉œ @î͈û˜eÙ¯‘Ò" àA-€+;Pœ Ly¢¦¥ð ë´I¦3 ÿ;x›ò"uH -ÂÆ,M ™<èÀ_„€´›\1\wùã4Ôx ³lò둼¥%“Ž¾NÆJÄ«–™2½"¢&zr]Í×/€UïfŸg{šNû®:¤]ž¥EqKC[\}ÈK«»Ð'4¡QÂAØ -ÖÕÎí.ÝÿTlp€P¡ÅHaÒ˜0g"XJua,2b~¿èÅ’p“âÙ ÓeŒ£·ÔßÒDUŽæÅòtp"*"aq0ð1‡ <ãLè¹e¸2 ‚GÒýy&LƒânfÐÚªo²Eè -l‚Žü±ïÌ΀Üß.ÁWŒ«A¢™c¶JXk KÀ”Ö4÷º¨ZË%×_\…ØSNZì°ˆ¸C2ëõå>-?¶´ÆŠ8,ycÊÜòªI·À¤-- vÁ0ÝF@ý¯ó2-hxgÒ®o uóGoÚY¤Bòºj;+ñо}ÏÍ ÈÊ!ﬡ[€”¨[§YKq49غ9)H‹ù%Ë mÃÞÞõ®/¨“;éÈQì@}kT¹G -ÊØ…«­µ¨fû5 ˆD^›ö|[eWàÄا¶xÎDþæû./òŽl­Š–lèïGPÄÔ¨"ÝÁ©< _AöÇ.cãjÌ"¥v,ï ¢[zåøí$MÚ9úµ¨)RÁŽ8²êÈs¤V?è*¦mñ*£¿+àÀDÀiЯæX ³”nÓÎqäs[cœØË0aQ‹ý'dÌ×Yu8Tå9ý9 ²A “>.h·ä>NŠù|’Òœã ÑÙF$–øw—SQv6ú1®ª'… 2w’ÜÇ”8`RzJgU} -¼ïx¦„ö+QLXÄd<8³Â\§ -‹7wÇçAäMŒØFƒŽ_’A õvàÙé²:“èµíøÐW¦KXˆ@èA½þù—¿{ûíw— ¤R=`æc8"¶Y7$ÖéŽB‚„~#Ì$HŽ¹ø¥à×Ëï~~w±€S£w5*baLpЂ9ð)*Š/+5 ¢§1TüÂEÙ’ˆ>Hå—¢·@wUocÇ(´¶‡¬%ÅòƒÀ÷Hyy¯?Ö2~‚CL 1^ºìÒ¼lG€ ô—,ŽÕSÈ´Ñä-Á±·A£eÜApJéMéÕíƒq‡ôadÒ#„3&Ó»!`Ffðïë ¡.yâ £Ž-0Œ¸(²S•—»jbÓþç¾éM“¶C¸©¸wA*HWÍGü³I„,°†káR’1˜x4§ ²nÀWµ´¦oé…"º¤Oš ¡žâ´BÆG+3:-r}fÑ0 ¥il³¡p>ltf¼æ¡B4)Lq7ü¢sŽì*çõbÁ"ÍB «k’­¾±N]éhý¥Ýd‡]ú¦#›Â@k:ê[ÂÁ@Ymmò¦#Ÿ°ÙmYÑOÆ ÿÍM´'è°û„Ž©(xJ”²aY]ôît?áÇGð#'0ìãõrª@¬ éwÇ;-3O}ÂPèíÒ€LäÙb¼t,]>Tò~ -:ý†¸ ¶ê]€š;FêÛ»Qç$:Î*²½É>ë‡êÉ’cÐJ±‘î[LÁîÒ\‚ê‹ÁØ 2í\\qB˜[DVÆÞŸŸã¡pÓû”×ÍŠvÜ‹‹ó%Éæµ@öÌ2Òç½Ø8ÅãN©mÙ~>¢?K¡4¸Ëð±K¢‹¼ŠuLp0À9N=HqÐÍc“4uÐLÌ[ ¤1¬J×0¡ìýΪ/²`YxÈ¢1özXx2"Ü•vÍ»l#³Ž¡s̳Ž\Ï­ÅTÜmv¯Ã -9xùÔÌ4™e¦‚+ª™'zÛ}…’ü"'‹^ ~Ó«ø–òÚxg䦯“~ôéôÁ {Êëöï³¥¥”Î]±Î3··¯çgԹɼ?-ÒÎ…òK2û²h«S·3ÝšM;û¢ó‰'˜‚´èÍB©s±n6ŠA nº=3Ÿº&•ì~b…)¯ÉÃΘ ,-Ø5•«Eh~L Å}¡®¶îäÙITüh¹¶ÂÔžû‹X“6» ûtÀòxÇÑ™¨Ó¬n*ªnŽò¨¥í½O‹¥ ¤—‹[\ ŠU­{ö‰Å}®Ð€Îà1„Ç*Öb0σ±;Yfð"2ŸWŽU™ •êFHµ¶N3³i»&¯ëÁWùZË$Ñ ¦‰ÞB€ë -H>Ú ÉŽ*É…º‹âÎI;#ýçu¿É?ù`O†c{=ýBÒB¹[‡eÜ%?ÙS2d컪êJ|iAÊj±þV+s¼gpÃ!¤@Ûªû… ¯x£Ð„Žý®¡‰Àð(n¹ã©Ð…b® s¾ØèÊBÓ*žgmk3ª1_Ø -¾òw‡Öàl°í%Ïå^ò óE(’@I$ëÓŸÜ)“Ò½/ZâÙHšö”:IHŸŸ`£*¶Ã±Yß`ŒooÃ庪MIÊàÉCIuÄk±$îÊ¥óŒô•qŠwa²fÐ&”è«¢µC£\û(V‚ßðÈkeU^7€Ga+€í±Wñ¾ô}vcõpKQ˼ -ï‚êìã‡gÖT¯Š*ój*Ä#jÌç-_þ/ÖSM<Ð÷•åÆãø) -&ëò® õ–ÜÆ'É7˜|åR RÛù$µ–f %4LKR+ƒÐ˜¤8z}:¸õ ;uK©p¬×Û¼­‹ôÖCùOïNwÝ™_éâEH¹ž…« +yãküÓ­Y”ŽEç¹µý pèÏ( -"ùÚÕUìŸ>"›ÐÔÍfà;Zr&„†añaP8-W3DØð¡šñM_fímYÕmÞ.•ž Q -¦%Z||)²ÍÌ3 `ŇÌ`€Ý=C½~…„CNëŠ8…qà–h@ð Íì#áñ¹¡ç#؃\‹Óh„ž˜ë44¼Šù÷.—³ãTq¨¬¼Â†¾Ì‘>Âs>·¹,Rƒ¼õD€I Ì*)Öo 6Ê;ãßÐRz À-Hs†£·•È+(È–K›huÖ¤µ;ʽ©íS|$4ý—"e¬-5‹9jÀ×O—Ð~`á+ʾ*¯‘þQZñŠx^ÑÐ[úKhåbilK§08j€V ÐÞ™ºÃ©u$ÚrõÜÔ0AÙpTî0¼¡H1¡¿mN@Œµ5V¾ Øä±8¯fÄ%Hè£ -ûø ]Uºèåΰkö‚•ÓwoOiÂ…Î äšeêÝeçâ“vÞ¥U›ðã °Ïé–:Öh‡ƒMæÙf²>}eX<Z|RÌÁ@­@¡uºôg–f°ì‰çÊÒËkã¼øéø ÆqÉT? §ªéPWu·õb½š“Çm¤âéìò>@ó…cQ7‘V_9¿ð„ŒK°|Áï 2^Ñ\ù”Þ•ˆ|L5« ‘õq3/ÑK©£¡¨èÞÚ'ÑÓ÷•ösÓù8éîWQc8æE;ALâ'Y8fdå5~›iírSÎ5B-þð“hpçI4/!ØÜiøpækæÖÊÏ‘|ýj¿B“ñÑ{ D…“ñr&ÈO0ÜK»{éü¨ëw;:òÆœ™‘†™hqNµ^èÕ¦ÚVJ`X·&¿Â}½MgðåÀW¤Àʇ|°oR'–ø±–ýFBúšæˆM¼¾6¥i–««JFLÕÕ´ïöUã_@!“YòÐ4a0Ô¢ÍèKKzdµœÀœCýmU~u&àúÔ=¦˜}•] v¸œ#¾sö jÁ¤èÍÓ–Ž-*z®¡¯Gp /f* ÖÀ¤­CЕƒ¡á‹Á x(Tå9ºÚî–fýõ2ûÉ®éÝy9€[òÊQ‚0xîë1ÙxâW0ûÑÄ„]”1(È=Ó-†æþY,m[s¸¢÷)éÞؤs¡%Ë9 V0õXà~ùý1}8sO;œ$Ù’[öµxéh8ICp°¬ÜlUúw5ä–PŒÁeŒ•íûED‚ˆÄÓO@öœþ¹7Çƨ›`^zÒÐéÕX’ç‰õU³óºlïœ]îrågäAF¼ -PÂN§“_\þ`éß3Í¢ñyÙ}º7­–û7*+ù¾¢¯é{ù[3ªÎ)`uî^Gw‘ºªôEgÀ2Qð¶èìýÛ£õ郵ükŽdék`.>ù+ÿÆ+ -endstream -endobj -3841 0 obj << -/Type /Page -/Contents 3842 0 R -/Resources 3840 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3822 0 R ->> endobj -3843 0 obj << -/D [3841 0 R /XYZ -16.307 900.716 null] ->> endobj -3840 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F102 977 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3846 0 obj << -/Length 3405 -/Filter /FlateDecode ->> -stream -xÚ½ZK“Û6¾Ï¯P)sªF_ÙÚƒ8›¤’8뙭ݪ8J„F,“¢LR¶'¿~»ÑHJœG²®½H$výüºI¾¸[ðÅ?.^Ý^\ñEƲXÆ‹Ûí"–,N©Y˜,n‹ÅoÁ[]é¼Ó—+ñà—¦×]n›–.úü¶Ù¼jš÷t󟛟.¿ýج„`Yµ›þ¾ÒÝNë¾Ãià.)pC䮀}¢ÂÅ*bYbù .b’×ô'dŒO^¼¾½øp!€>_ˆE³8 I&XÌåbS_üö;_0;`*KŸÌÊz ÎdÃuµ¸¹øç·¢àŠÄÑV<¦M½“22»p-~[EœßìòýJHdVB"A«?u×ÓèWBªËä -ŽÃÃ`ùC}h.E|ÄMk€JQ•û;ºk¶$*Ø„•Â]I3 2â´¡—ÿºýþÍ[ )dÐéM_6{+ßñQÁÒ0rÏ°%Ñ¿Ý•m4/ -»÷îx84mOÃxód!‹¤£õMSUùz†e(a›™[f-au{Èýè*XIàà¦ÕE5Ãl¥xÄšÆØšÞ´wû¼ÖslG#¶çKeèüz\W%˜eû¹.Ãt|ŠP ¤YÅ°ˆŸž!ªR¦„'Ê.W!HáeÕ5HÞ)C†#eà ù\4Çþp´ƒ³&"Bð)¼‰l·eUæ˜F,˜J¼:ñh†pÙÛ=lveU´z?:»ÙåÙÞÐéWaÚ -•Õ–ušcgL¼/¸Óû^£Á6OFA×·0ÙѬ=b€4«¼‡¹õ¥äÁ±÷Ú¦2½ãŸ;}š€"!s{Ú@g-%ŽÝ‚×EÙ :Ï7 #ñ4¸½„³¶ù¾«ò~ð›0 t¿a a (òEYX1Ò}ÕXaƒµ˜MShÙ@ŒßVy"E4u5£ðt\7űÊÛò²$3†C™yUÑæ„• o$ÑIÌšeÄ"xÂ.‚!RÆ=ÃI#•/Ý–Þq.?›ðirú#£¹s[Ê{ºút)`IG[Þäd–3ŽÌAaƒ'[Z…q”ûm3çC²¦÷·¾!vûÆò]kby(7ïq n·NîJJŠ“·iÚâyu’ukÝçfænÓÔ5¸Ý|²ùX×kd—åÞ>•ïW‡üÎ.èšc»iº< bW‚ØþÜ%ŠU__¢Aà“ø`wLÙ箺L¢³¢¿ŸËÍ.×úc_£EÒðM]ö»i²\Ç)p„”*ŸH©7>À$2X7UAW>ú% -—sFÇ3–p>ìò®ìæÜ.ðá´Õu~øû‹W/–èX Å™µF{ÑÄíu[nèêm~_7ûâÅe‘Œ†ŠfS•Û^·ø˜°Ò€½öMSÑŠ xx1åý¶·ÏݵàL2 -¶tK*¢ë:o½Ý )g7BÅ,K“©Ý|B¡ù/Ù«%]y‚7ΖïD¨¶n‰î6ùÁA¼¾™v³2, ãðy2ŽÂ™Ó@¬cI>ß!6hgêKdò¸A¾, -£L’ÜÌ£¤4b¡O«7úÝTC<5<3Àî”’Á·èéU‡ÏÒà³{àˆ° ÿûœ"„e›0X €ù}CÿÍB¶Û­¹Xâ^––ÐýAÛ¥†ÝÁ˜çü)C4½0³/ûjI­Tú•ÙÔZ¡Æ@Áày”‚˜Œ›T¡‰˜8rnu×±ÃíúÞëÞ"X ÁæL3N!·³îá©ñá u‹LMZMƒæ$]ÚÏ85˜½Š=Ïï)Z+«DØ?IsºŠv'xʾЭ;iÅSöyeBòªƒ+4wÌ9”ËyÊxt"mEQ’>ž)E‰ -éš4nˆê¶.÷yÕy5XsÇG-‘ÐbAœoìþFûÒûîØjK€JEx¤ëýCÍÑ4–i5]æù{|“¯?÷mnùòÍèЬ;Ð FëÞí¤˜«Hç¡3‡ÔïSø׬VeÆÔ°Ê¢©HŽÎ ‹;p¸´ÿwº·sÚPŽ–ÓL/lÊ–®¼†y[…‹àÀFíhvtá>ÚMÞiÌ`?øÏç¼£s:@Ô¼ÍçN-Fu*ò×7èÌrÝj80d§V¯\Â!xÀ7éTú_ Å9ÏFaý$òþ4ûäûRWtý“.Áú‡:‡¼ßجGö…cÇnwu2æH¿¬r°ÄÒ’y ¼ÁrNˆcÚ!ø9aմ嚦] g>¶z’fÿ$®Â0ÜÙ<&ÿy¼F³PúTeGËuüÿë~¨í¨;aÅ7 ò1 €|MÒõT‹å|iḢ0\g ŽAãÍÙ8ëdÄ­År×ö«eW‚?gœ€ßÜfg¼ì¶SJ:wV2`a¤Ž˜ºÈûÜ¢ãþHHŒ‚ÏŒ2_¼†Ð8¶(su›÷^TÖ—“ªà[æA¨¼ÜêYx€î)}†2†9Ú=Äñí±:Ù)ì<ÿ£DŽÀ”. 9@x謓¸rÒbËDOùˆËtd¦€z×€­‰ªÍøâ!;kÐbA;—§+Î ¦nÕŠþÎ}`®ùeÐÚ™.Ýì­1[³js0&ÝžöJO<ÇÚc}¬úr…Én® • “‘/š?æ-F -°÷ö~A&Œ«¡Ø±°êë9»ÍE, ã‰Où³ò`¸#¶nuþž‘ÅœóQ̲‚=(°§ïôž@¨oLy+¸ÌÔèL’i…¶ÏS˜î‡?tÛ þ™I·„ƒMW®¬;jºÃ&'°`±R¬ Rb4È«£mù˜Ù¸/6Õ ä—8»ÃãIYû‡}è!ÆÆ7€ñ¡¨\Ø.Ù1?`ÇDfáÓ†œr¯Wjçnô¡'.)!ÄX¦c—¼³c…Þš&(tºÏ%ªCeÁÒuö"ž;1sðÎdÚRÆÔé:ŦqU5&›øœFT&ÂLN·¦Z°…„Ip{™RôÆ9[ìÑTmQ˜Nm»† ûÁÅ Û…ÍL-:YMÇ]1Õ¼ÜE§T¯†—}cv†æ¤ä«®ý½C8­ÏE(éåòA¨šëô|rËî=´e ûw­Ê1Ü,mž\ÛÅc´RÚÂêÔ[ˆhžwŠMR¦L*ùTh‚Ud“lxGAúƒHybØ®ZÞ˜w·T0ç„ü¡·“vÛbè;c¥‹'u+ðœßßþüÓ­ûõÛï0¾\Ѥƒ°®ª¿uÅù$ââµvê ØÅý®9R/@^º'²G*d„i¥žu :|™Içéæ ðZà ôÕ¸°ÎSºëV‡¦3E×+rçýnž^©Üwƒ¢Gô‘g0bú!J´MqÜøWµžÔöMTܦ#÷Ta5ɶ™”Ô±«&`ÜD0qÆÓôtüó'½ÆúÄ(»¾®&¤T:ž™‹Ïg9(égT0_þã^!3 ³c&BÍÏZF"¶Óf´»¶‘ò€mJ®Ú”\³{|”ПFdþZg|Xbç-‰2jÛ²,”,‘öc”ŧU™àP–ýz‰¯ýpŸ3Ñ€ã[ʼnÏe®,sÁGŸû€c>…¬µöoÒ -= dãwž£BQ1Ô*‡‡ö¦,ŒÎz‰àåÞù†w$°æÌ ¹¥ÏsØIE+áÀ"”tð§¾Zùå±ÚÕJEÃÑÛëmÓøêl -#,[žÓ<ºíu¹/ëcí”w;Û5Z HÀP1œ~Pø `Uár»§€@äyípk’c©ZsLÿ”9Î}¨8ã Þ¿ðqà_⯠-endstream -endobj -3845 0 obj << -/Type /Page -/Contents 3846 0 R -/Resources 3844 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3849 0 R ->> endobj -3847 0 obj << -/D [3845 0 R /XYZ -11.232 900.716 null] ->> endobj -574 0 obj << -/D [3845 0 R /XYZ 56.693 239.626 null] ->> endobj -3848 0 obj << -/D [3845 0 R /XYZ 56.693 212.04 null] ->> endobj -3844 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3852 0 obj << -/Length 2705 -/Filter /FlateDecode ->> -stream -xÚÅZY“Û6~Ÿ_¡š¼H. Cðf¼Þ*Ç96Y;[ëÑVm•ˆ„†Ì€„BBO~}/A3Û•< $Žn|}7å-nÞ⇋o6WßGÞ"CYìÇ‹Ínû(N)P,6Åâýòe”ttµö#où3´ÓÃoõ@”fò[žÃù­~øÿõ›Õ/›Ÿ€Ìc”E‘>íZÜ3Ú•”ŠNNu¼HzHê!OÂ`±ŽP–úØ àÄ$]^éìÇrçÅw›‹ß.0œï-ð"ŠQœ‹$Ã(öüE^_¼ÿÅ[0 0Kwje½ˆ°‡ü †1[\_ü÷Â3Px'!±g‡Â^¬™úàû‘âÂn[¼_Gž·$E¡¯ßö{ÞŠT{rc°jõ–š·-ÝÑ–6¹EVp UЄ’ œd(ÁS °ª¹5ŽyõCäa»WÓFØC9RYã,B~”ÀPõÒ·¼¨>xžO‹¯WëKN[RwWUÓÑV I Iæ‘á;Š–ècÍžc„õñkýóŽÃ¬¡x-ȽàͦuŠÂ8•L ÌÌWƒYóÖ€™—Àm.h;¨~ËU´¼ß—´ÑÜüÞÉ7 -; º2@ìc9N,|uëR@u §©]_Yꇶ¡…%i@÷³Åéy –y ä ;‹ø «L§VëuÁgH&zX2?Ó•-ïôiDˆ¶Ú®|oytÝQ1È«&¥ѷ4,߶ڲŠƒ¾¶÷¨c0ì8³kIS¸ŒQš$Óóêê#-çE`ÌI/:+¤0ádg iÌn Ö°où®h÷—†T0œ±’Š5 -vàÒî ÐIc{ã¼<€ÖžwÀDŒ÷þxŒœ€|ÜCŠJÒ!ð)òãÞíˆJ0—µø)J2ß®º+«¼ÔlçPä¬3—hi'¡~â;=/Ax0ÔóV>‘蟎J´„!£àÐûJ¾6«x}õ†oVIh•$HÀ’ÃdÖ¾­:úÐÜ8¸ ± -@1›¡8ê!'ÒW%ñr+]\’,_áhIA×ÔÛCGw¦gª~wÏúQnÞÜІÂ%Wêy'µCÛ',ã±?=óÁ‹¼;ÊØsxLƒå½ŠD°F”¼£ãÍf±v½¨ãµY“:Ê ÃcK c÷µ Bý´»˜éTIk=z±~0êÓ‡ÆèƒtJQ³+%¼uÎ ð|2½HºHl¦•U °T˜É‚ã™wt+7y¾™3î0eJ‚½‘;rcò?Uí-Ñï‚h PÞ~¶Í«Üá¤÷5á’:Ý­¡‡½òÜeð1ÂAïfeܧ#Ï6 ÀÆn™V0ÉË~O;e¼*úíô¯<Æl®L Û–ÎJ åôÒè,ß ¼ÏYs:Ý'Jà‘ ÷Š1®?7ˆPŒ{ç*Àœ°ñÜç¢Òé>g!R–ÚÜõ›,ȪÑØÊ‘HZ^Û\Rî¼90ÒZi2Æ}A6éy0Ëk {À_á®é©›ö©ôÍ]UЗ—øÒèÚöWš sKKéñ;êc¾ìÝ¢³-¹/ÈAp©ÕÕJ!¥÷z³edK™Kµ ºgƒáVÉi«*…!a´EDö0˜šÛÒ\Ãlàêw©w„¨~ÏÍüÌfÂÙç3 Dl6ÝðfýmùsýZÙ>lþ_59;hPåÎFÿNΉ÷ Wb…—lâ‘Ì­/ä§1àÓ§›ÿ¼~Ükêó~4ί£ )ö:A‰áEßLI$ô»$3¡$!hí¯Û‰Š1ëº=#÷öjû¶ê«r>S±à`:°ÃÃØÇÁü>ƒ0nc€NŸ&”5W<ÍÀ%wV;Env~uv”Æ)Ò¦º)Is;s“ -ÎîÍKš—`’Õí©Î„:ûÑ„"Ï©ò«à:›bÈ Â$sdþñLŸM`3g=SIt®òƒÓ =œŽ#©x é2¡Lfj¢–ù‘ñFµÄûKdB¥cÜ‘bè¿)¯ŠJP`g!y(H‡&½! ”§Êéy%ØÜø q~¬áQÔ§øH ÖZs¯çš}QvñüâÁUÔ&ª=DYS[dòeÿkæ•?ÖÊ,#¯,ùhÞQö%àkûšŠ€¢ÑUÑ Nq"oðjÒ}I2#„‘¤ÚÌøëúŸ~¶DÍRƒ«ù)¢>ÔŸƒ|;ˆðŏʼ>ÿšA¾5»Ìk¶mÞ¾‘óC›ScTðLÁ¦TsÆÄ,$—Q=VÝÊÓä1P’øÇ-:)ÉvzK鉬Ë: ‘?»oÄ>™Ä03”ý“¿QÓ5³*N´IË 'ȃO‘4ÕmÙÒÝg`yÔCíÑûß»7SÜú©oŒ…9©š^!N¤¶lB/9Õµ]=ÓŸòâ2Ops>£é•y½\gXÉ£ V‡'afT<‚ßryi`,áR¿ÎûÊ€ÆáÓxR¡Ä©ØÈyÛÒnÏ›ÂÝíƒz!LÃó@}}ÏOFé•NA -±Ð;Òž>Ôµ7¼`@õâÔá…jûžI4ÁëúÇͺê?blïgº6Dx3Óêï¥è=¬|øHjpþ_;ÖþÃqUÙMÉžâÁw½¼ta6©Gs¾¿o«›R¸2PÜ»ËÁŽ_^²f]†€úH:ªËQ]óòòn¹¬¤vö_IAà—ÿÔðf)ätxê/Æ…ÏW8Lâ¼ÊéjçšÔ¶ù@Aí8+žÞ­kÞ˜Š&<ÝÅôG½it”LŒrJSÔ„/\åŒ9cpû§é3dçǯÇ÷+Ïílê|bEõ ÝGŒ¶5Õ¼[5Š'P;Ö¤R±Ù »ªP…u’*GÑ«lnÖ½S,Ì`ÓZ¯í-–©³ž–»·œ3Jš‡ölÙ¡Ýv'·¤YÕ‰‡w8a´ß|ãØ‚·ª;Õ¦ç+½üG¬%ÜDè‘jéÄ2·ƒêZeÏ–]Cö]É…juÄ [X¥¿ItzCj%K«‰,AP^®íDã(ÛÊ3¶ò‡¹~’‡˜U%)b !Vé^‹ùê=cä"ů‡NïñŠuóœÁ%T«&#é/-“VƒçÄÈA”¼í ÉADÖÕËOA¢Å<õg£«•d¹¥¦Ñ­V~ -¥€m9Àt%Û ~fºh~bËœtZ%¦ Ju™–ÈKé›î7<îþL/d¡—+ ཮H’I¿1ð-Ýd÷Õ™fÁÉf£ÄÁÚ³çn9JÈ‚$\V‚ÖR C/\jH•`®ö´íx£ÆjÖfÓ­¾´4 mMAèîœ> endobj -3853 0 obj << -/D [3851 0 R /XYZ -16.307 900.716 null] ->> endobj -3850 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3856 0 obj << -/Length 2387 -/Filter /FlateDecode ->> -stream -xÚÅZY“Û¸~Ÿ_ÁòU5 A‚¹ªÖÉnâÔz·ÏCªì} $hÄ2Ej ÊcåקqòEɳŽ÷eHáh4úüº98x -pð÷»×w?0d(Kh`#%ð^ïîþu‡/‹‚!’ 3Dpb˜y[oŠS±ùÃbÉy“ïåÃ>¯PQmDÕ¢UylV}Þ—÷‘?.–q”„0ÈŸ„|ØÔëÈ}–j:õ<ëæ‹j[ÛIŠÇ›ËB¶ÒÎF0;!_¿¶µ4 ÆÂ>5Jp·B³Ž€e5K§g??‹•šŽÇÓØÂÎæ´Hü Ä-:—‰e܉¤Ï·ìù8AŠuÛä4íO ÂBѬò¶ØË««Ÿ‹M»s«K’ápio‹õ.åÌp»‡¿vöݾhwÚàœ¥KŽâ„ÿñÈòÿR6\õ~É0¿ÛlÄÆx„âÂØÞ¨zÑ}Þžo‹v@¡‹ƒ=#3ü}ò‰âg qd -ÙnSùûËrÿNäUr"E\:'cÀ:yÆ#1(±:2E{ 3F<¤y?‚B6°–Ꙫ3ñóƒ ¥ˆ³ì¸Ú;ú‚ 4ß.OÆ£„²B(2ç&$›w“‰âEëÏ "Çü­nÒÛª/øí="tÞØ!¿P…¶Çj-OU}…TÅð„69äÙ Í\;‚1”pÖ?âÐÔmÝžSÖ’BYÁÎì4¢ÜØ©:L£˜íI›iD"“ ÔDѲÁÖ ëUãJ´~·P%ëç|(…%üúͽÅg\ŸÐÇkë&o:Õ(ZÅ[Ü÷†[DÉKx_–>7 êRÈ®îá -¸¡P]Ð[}jUÖkçQç>3ô¸$›õ8>ïq½¼µœv'µG‹ÒuSÎÎ3.fg/¹ð@x—{~m_{Þq'ü¿ºñ_wyõä« Ú!Œ0ÅŸ_áWsÑtšxè؈íºÌ¥œ®rpÔ¥y<!¥ÃA •l!ò BÁz@H_ÕÀ:À QϘXÔ‰Úñã³"Ž¾=¸Ú’âéR^•]¿”©â~Ü ú0;»9Âqz+“ü“c }ïyª‚•‡2?y–&LaÄh| ' 1o’ -o@Œñá¸srèzÍ" -¹¿!$|6^¥³ñÊÃ^È:§˜KíùÛ‡Œ‘uÏT—îˆïàÁÚb+d{ÝÈMŽ©nˆ#5e´$J¡À÷¶²-J ·¿d+tYú1$ºdi´7eäÚ¥•kGño¹5œ¡ž=§‰0Ñ ŒÚî#¼iö-uQ»Ñ€níyѶf^ŸD%TMeÓ-Yxš0/ÒÇ1ÔÛ&¯$PÜçmQWžC”K“4ÚßsS´­óo—UFÍ€e«àÕé&£" Dص§¯ ˜ß\Ú̘ʒb(¦RþÂxpæñãï7dá$óƒßØy{ϨB¾XÀû •ö´u]ª-ðC<¼µ/f=²Ÿa}|å£ÌÔ7ů¬&ÀtŠXWg¼¼ >ÇP„³‰üË©µ|NùÆ'“˜·zû-œi@ø €ÐÌg]Xà²îD%e7;†xÌ&ÒmAºUãö|ß¾1 ¿3u€N»ûo4ûmÙ¢Š'å÷dØÔûáçóv™î'ÞÜ ÛÖ_ËÜg ?î¼ ;/ܵûr¸ŸÏØ]Ù(›_B¥¿W¿Á1Ì—à«æ·mŽžD‹~=¢-OóÒK©!ºKjÞô-M½MÂت8’ËVÝ[—Óih¿²©¶?@Âg½®©LçGO­ê£-Ï_-  -­§W®Ð|<ìÂÆžÖËŠúðcc;0µ·U1ÛLº.˜2Jht‹ð >5)ÙmrxC)©˜6LŸ¡QœÃh›5-!ØõŒ»$ûʪÇVvË¥#“»NœSî}Õô`l(ïA »sø¡Z•ÿô³úöø½r¿ŒYP•„§úh xRz-´Òì„y”y³ <ÔmtØ—ïë£n"ÂÔtíÅà»7é„¡Œ‚™Æ]iÇÝ^×)ð²²\ꞤæDÑa€ •‰_% eñTé(´ÎwÀs'3¾:¹ïxa>ÂTR´­ïœæÚj²º›î" Éouo~Ù½}€íÆn®a£u½ß×Õä¿–¤³à‡ÍƒŸô,Àvô'™þŠwê¿””ê’ì%ÿ¤ô?ÀÃL™ -endstream -endobj -3855 0 obj << -/Type /Page -/Contents 3856 0 R -/Resources 3854 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3849 0 R ->> endobj -3857 0 obj << -/D [3855 0 R /XYZ -11.232 900.716 null] ->> endobj -3854 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3860 0 obj << -/Length 2683 -/Filter /FlateDecode ->> -stream -xÚ½ZÝÛ6ß¿Âب]Ä´H}§‡ær)R\Ó^v+ä–h[·’èŠt6›¿þ†R²¼òf7‡ÜCV‡ä çó7t‚ÙvÌ~¹xq}±z³œä Kf×›YÂH’Î2’0]—³wó·¢\‰Å’ÅÁüÔBáëFvø¢wŽøR/¤¼Á?¯þ¹øpý+°YRJò8ÆÝ®ô]-ÔN­ ¸ÓYÜ“Ðp€}…³eLòÔñ§A ;¦Ù|…ʳòâ×]PØ?˜ÑYœ$giNI°YÑ\¼ûÌJ $ʳ٭ÙÌb&ð^Ï®.þu8UgUâ÷ŽrBƒ…zÏXl¥ðËfï–qÌ.KQ‚œI/dÓÈv:íº»ˆL>©ú£ÂáÄÍ÷¼ãZÁ¶DïˆXÐxþIwœ‘†"µh·0ú©1KB»‚ú£Mñü¤å ûN!jáÖES!±ÄãüV;.ê÷AèþR¾j*½»Ú2#Qb4 ÆdñÃù²ãª×ØœÂx’5±ìnÌÃ(: À ë_ä§ÚÀ6þatÁA;ŽšÙwB©J¶ -çîΫI׌"Bix䚨±û~%$H˜ŸØÍK®92Ù.¬¢«Ú-2[.‘æÝ×B‹á˜4b~4ü ¿{gr1[²Œ’4HÇö°áFÙ\ºÖ.Òù÷v‘®Z-qã81~[ÅÁ@+K§fHï¸öËŠúp4.pøG¿q -gh5ˆ§€›áÌûú !…iìÕôöA}Æõ÷õá¬ÙH‚Ô9 »—á€foˆjHŽYšœ*°Jûòå£1{X -Því«Åš«ªpµbð/»bä_8ÖJt[û¾†µ§“‡íNô8ƒ˜(:(ë%£…[sã+8`NdžÅN7ýü¾¶ñ ÕGaH̓sŠ ­3JbšûI&œŸ£Æ¢8&,ÉÇÙʈkþY/{·Z™M?˜Eï hG¥ì¸¦ÆY·¹Fg RpÉJ‰ÂÇéüÒìv‰ïÖê«AúÑi‘$N¾tƈÄC°·—²8ƒã—ìJÑá+†jðV)¨!cƒ„²u/¢Ò&Îýèp‰Ô$$eìq¡äƒÀ´´ñbÞçd_ŠZ*pfg;ÊHGy»/NÓ¢&‰óGI’ ìÝm½¤PB“ŽLþZÿ°ˆl ׺Œޗʨ-íÖù|Ãy uÖÁ5%ѯi·ê§“©­èCÎp_níaºÇ¾…lj58OgdœòØŸk%ŸKXžl)6já=š@¡Vðß‘'›5¤?_ÛOëú„ hh°d›N6È) -ÆŠâ« f[MΖˆàÃA83ú¦Á(%u3RØxÅhOÑ÷Ð ,˜€'SËyMm°d9{2,ÂuÓp - xg*Á#áö|+Ô -2Ñú‘‘Ž­O;º´&€`Œ¾) óBÉf¯±¾…™óc4 ëPhë-xû§¬eíÂä†kÝO›D\4ÏÛôˆëÕ¡-Ô]+÷ªRÞž@.³!á@òKæ/€#†_!žÀ‡AŸ¼6ÀØÚƒDȈÔ>Þlâ`­Ò5aæøA&†™¾›pM&™5Æj©3Ž˜—pn,CØuÁ rbURÝH¥qÁ¡­Œ ¼º6Ä,kñ‰!X)¯”ž³Ì,î âùK¡ö•v¼M 4i/Œ¡ -!HÅýÖ¥N¦ûióæR;Î.:¾w[I|îø‚NLÀ©è0ø·›,£1tBÑcÝ%± º› ðkoX¢Zài¼Õ1›Kzî" -]À›wæ"‡€!"×øÍñm䑵êÊoÔ‰}Í‹~«ÊIx[Y i$ÁGY!ašô¯ -}FÇšëY ŸT{QT¼Ælm£ÀS-±í/_¾}}‰W¨rp.¨‡-w"ÃÞ®*ÍkÄÃ9èPiÁKü°5éKb~Zóùå ËÄÊÑáä{LŒÆÆ)!œ®ýž­èáuî­2á<Ð> ½7™jK ô“ä8ô!gk©ïöS2×pH:F‹î&ƒóFIL’,iâB_×µ,nŽ¯EFÔ“zJOéU[W­ðË“qqNNŠ³5—›ËÒoYxO!!®ñžB-^eÜ÷›4…ªÔOµ¡²õ8»7Û«ßÿð0µ‡-8àÿÄ»ïêjäWŽÝYˆ ³¢#þsâ÷·LÇÚ|+×¢sàùJó;W‡_‡^®úKÍãSƒ$ÎFãTŠÄ8ô§è‹uLUA§uA¿.Þ -{ñó˜.Ň¼höÚ¹ ƤoœÜ4 ›DÓßr¸Œ±5‰Oç¯7Ö)ý¬ÏíIÖ°z&eM‰Smü¥Š>–+™ÒüÃÙ¥jKŒ´‡fí¬§„¡š–Øbë©fdX×™®ïiKàXÍôŠ®WŸfú/\ó¿Êe6èúùTšÆ$ŠûBU•ä–[x£¾x%okt<½A6­l—ŸEgÛe¨ðî’·²\qλˆÎ_ ûÖ^t¥k?(×ÿÁ "K°72[Èö‡…$œ€J¿‡r¢]/àOwp¤õ>‚ÁX01Àï/Xe!›o¢ÛÒ»ª÷ÍáêⶪëqqÖÒ ßní-á€Ðÿö¥ÒÆt¾ÓM½ZW뺒¾ÅFÔÌ‘Ìe²l!èúútL-‘]e[RWìèñ‹IkOÊI[€Š{Lv±vºùã÷ ]8X Cµ¨Ö# È”,»Oùt+Ö@ÊÓcÒÄcÇÌS˜Y-1 º.0Ž~ä¡“ÙøÑ“Ë\ÿ6Œ×j÷õAé;k{[uT¦‡\8žÐ«&iß«Þ±'€\}¤j©C7Ù-¡]e”>œ%7rd‹ÜC¦~ÜY¯³öKÏÛ/gHlû Aqt’Þç3åSÍòÈp\(ïƒú”‘8é1zÍ×¢žºvÎÉp5z[•þgƒÞΧ?PCÛÝTŸ½oô€Ã^M÷øx÷›F’(Ë¿p‹´K\0$Ñ©eŃ³OÊ›ÒìJìщ=›7Øx¶“ýÜäÿŸu‚îTÿô@OmçgLÌuÐëWýÓ¥4ë²ê›!út$BŸŒDèÿ€D¦þcCdºÍükþ_ÃEW'‘ -endstream -endobj -3859 0 obj << -/Type /Page -/Contents 3860 0 R -/Resources 3858 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3849 0 R ->> endobj -3861 0 obj << -/D [3859 0 R /XYZ -16.307 900.716 null] ->> endobj -3858 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3864 0 obj << -/Length 2993 -/Filter /FlateDecode ->> -stream -xÚµZYsã6~÷¯PyB¥,˜àÍ™ÊC®ÉN’Ifc×n¶’Ô$AË$Á%¡±_¿Ýh€‡LÙžTå‰ 6úüº’¿¸Yø‹ïξº>»|û‹œåI,®w‹$`IºÈxÈÂtq½]üæý"K):¹\±ïý¤´ìh¸S- ôÞ.~£6_)uK/¿^ý¸üãú{8fÅ9Ë㘨]é‡Rv{)u‡Ëp:_dpzâéŸFáb³<µçs?Šiæ]Òƒ ~yöíõÙÿÎ8Ð÷|',ÉÃEšs–øÁbSýö‡¿ØÂpÀ¢<[Ü™Õ"æ> ÂÆåâêìŸg¾U…R%Žv”3à…˜ú=bÃ…ûlñÛ*ö}ïËíVn­Zî–Ü÷½ÔrÄÞ½4¢•Ô²=Öä^ÔÛ²¨oèMíèYJ]¬`{E^ŒÆ"d.RÄ(Žáë£hË¢Ó²ÖíƒÕïĺ)ó£ÌmÃV°³{M;9(n ¼ -²˜e ¨‡g÷ô ±.%Â%¶n¥¸eb/3rP^ö'¾^®¢À÷þ½—õrú±ñ™Ã#æÑH¨O<4ïíuRttV­êÕŸ²UðÊs¯Ð4}W”%nd-[¡%½ |DØð¸X…IÄR?›ú³á„ìD옡›ýŒ±’„¡œ–¯Á¢ùÜíyÒöQÌ8©å#Ç©ÛÌf-Îóœ¥in-R~'ѵšU=ð§c{ÇAä짠Ô1kxðR929t›7ªÖ¢¨;"n”Õ”ræŒ4dqøœâcæ§ñqp ·d\'^§[¡x`×ÈMñ»ïó8QX1­[ƒÏÄ1Ò‘Ï|D,å)†çaŸŠ… -æ§cáisd,Kú{à¡M`M)6F˜³NŒÓ'œ˜ƒžÂ<|Þ‹³ÁÕå’ÇÞýF6šH“6á¸R€à$Qæ]ï­>¶r‡È)ÀšS>ÏÑQîÓëï~ì §fB3ªy£ª -‚8È@زT :g±·~ A¯]*‚˜‰xê]/3Ân\;4M+»Ž>he½•ä¸h@¦) Â`0Gä{ÀpG0§'»â± àgú(̤HSQŽðâ4e³YŸÁeÕè:?Ç1júüœÔãrú"Àr®>8Nm¢u mQÿ¥¥^ÔõèR¥Í’k»ùÐÉÝ¡´;m|P—$—B>¢GÉG Ò¼“r{)\Å¢÷BŸ¢Q*',ÒéfåüºT¡•ÄÞ+úI’&ŒþR÷­]2Ò$‰w%*š¸ÒT©Ê-ÍSº‡ù¦UÈÁÇbKš†5QÓŒ¨ÍÌÂy©´¥o\¦,Ëx"²|N³[µ±“$-NÉJÕ`OHm[·fÉŽýHÏÔlV[½;èÁÞªÑОªË~öeÙa®5n0”Eµj+QÊ•‹9‹7¢,§.:Ú@ì=*ŠN€Sd,ˆžM±œÅ<Ÿ$C¨w ¾K+\»0Îx°ð‘šH¢Úvr£í¢e›{ê ›ƒ¦ÉJêv œÿ¸~ÿãíûðÍ[D˜ Z¬D݈ÙY -Áö×{{Ö qóZ:{PÙxÝ^ŒsÁv@*M! d #3ÛÊJ`nÂYìðDª•§›3ûZ‚ÒZpGløîi«Q`¡u)´.þKdÞTÂâ¡ =„b=ƒ‚!¢Å€­Ú6v¾S•œ)¨‰¹›(ÕºùÐ}¯¶6Q¿FÄÅšûñ¡c÷]y6xóÜÌ c€0ŸeÇó÷wr ynöº*'¤¢l¼2!–<^qäÂ7X`vŽ19 @^!7 «ãCx4¿jâ‰]6³Ý¥ÅÊ'êë8öØ}…ó7snò$¡!CÈÑVôx_€áe‰N£«ÁA®ªBï§Ö -Z‚¥T}Iøtöµª1ÿ·ÖÕ>«ÕgSt'9Šÿ8àü#ɳ§¼+ä¾Ó‰‚æá–"ëB—ÒŠMÄÿE­{þ®´xÐÀøi©£§¥~‡ù«V¶¿¼ý–¯x ð|J׸æ¦Ú`GâÂôq09Éó9Á›Ð M‹’¶Aáã‚>\ÐÃ| KîÙ)ôÚ†ÅÈ 0³ >óØ,²u©6· Bƒ¤~1ƒÿa°0롽в‚T³5ÄO4E}³ò éU½l™ª…jðäЈòô¥D‰±ð_b}.²¨×C)Ö²œK„ Ñ wKð6ˆ€z;×Ãú, -ûOÿ“ü\fùŸ Æ÷¾G,r>J‘‡–¦Ð‹ñÙMïŸØP0?œÂîÞ¥¯ZiW™Êzœ¦¶3Yqwh!™Ù€Í¡Ó - h¼ØR£›†q¡ë24Œ”«”¥è - »Ïg2œãLÆ1Éé£L–ϻԓÙ ZcÇcÆ$c÷™àø“Õ\nèéÌSr6Àç·Ž\îIö濘îø1 i†u‹Ïßí­ áË*äNÞþM> ×)€þÏ’ãu"6AT£¦Q€¬^8 ²ÑZ-ÓÀФµŒcÿÔÒ ä£ò@oÔÕÚvµD‰"_pšA00ƒ{“RF -4X:ø¦qöï˦‘ õÚTlp,õÇ'xC)f OC -«¿²ì£íáQ“9Ó5s²hÀÑ^p/)·3ð’…,ŽúÛBÌdI£1k]Ì‘"À:PW»¶ù3ä3'é˜|}[";˜=º YÊ“ÇçÜ[½Ÿ—‚gÙøj:Ç68Q8z”õ¡E.¢ Ëp@04U=<‡„/ ñ­Ý*Á‹Í5)¾aËæV ooWÖIVMúùØ}ÍG5 ¨¦*í®-QÓ`àÓmö§[†›¾/€ÛÀèûΠ$ôÑaÖŸèå×o?ÌUÜù·²Û@5ã\χ{­›×——wwwKh—]ݳª.[¹‚ã3,ï_ýl:Áÿ¾EÙl#ø¾âs­Ô­Åó09Ñ™$§:“tXpÁj‡pŠ‹G¡1ž³¨>þRQ%®?þ<ž9Ã8î3›ºÙá1ø¹Ö`œÀ¡uvÕ7Y¼åë¾#0W*ãj>­Lòù|,È´¹›»ì>éVûo]-0êçû¬?Îñ\—GN{ ·Þ÷¬'lµ£–³~T.k获Ffkè¶ÂCŸ 7쇟u!ðˆþ_ëùã‚÷YçäœCÇÛß3–Û™û`苪Ìü¨ö3}¼õaA:Üc:;»ëâ¾;¤²¯;u}8Ô‡•ØÊ©ô÷úPùŽîg³ˆ¥ÃTg»â›Ðw´o”; +jw1Òߢ@˜»ðié—[v+AÄ™Iö°$HŸŽ–í @JªÏ -)]ì(Êç›o¤-áí­i¶aò0·}­¡OlK15¹ê_1-¹Ú¤¿ -ƒÔñÓÌ×=;ýÝ׈›éñ™½ƒ ÇÅ¿ ²‘󺾒(\’UàLîÞêÍTlÜ+A¿ÙîKÿFl~?ªÐ -iîM%‡‰N sMCeZ¯ÌÞ -Ä+MLÕ‘§îúV*q‹Þ!iÿè¿Rôlå¡“ÓSX:PÉ /T2ƒÙFÑŠòˆz¥ºÙ°MÝŸá¥0?[ÞœtÂ>Ä ¨/j]¸e0TjHÕÎEû„4ý½`¼‚—Îv$ËÆ6¢¶Ø³56 6¾Ï¥KwwJÿ»*ùzQ¹›ê™‚æ6†ø+DýÙ’gær^oÔ€·»ý’b%À_ÄÌ¡8kzxûB‘Ÿ€i¸WÓ˜@?2½ Ê‘Jš¢[k÷^<¬í7¶D„þ3%¼kz³²ªÖž¼Ù+ò”-½«šž…¶4­„{è#-7ÐER• #ôüù'© 9nì_±sZ Îý_&ò!äåï2ÿñ1ÎÖ -endstream -endobj -3863 0 obj << -/Type /Page -/Contents 3864 0 R -/Resources 3862 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3849 0 R ->> endobj -3865 0 obj << -/D [3863 0 R /XYZ -11.232 900.716 null] ->> endobj -578 0 obj << -/D [3863 0 R /XYZ 56.693 240.288 null] ->> endobj -3866 0 obj << -/D [3863 0 R /XYZ 56.693 211.621 null] ->> endobj -3862 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3871 0 obj << -/Length 1689 -/Filter /FlateDecode ->> -stream -xÚÍYKÛ6¾ûWèh—=›S‚¤ŠlÑf ¤@’-Ѷº’èHr6é¯ïP$-É–½rš,rH,‘ÃáÌ7‡£Yìlìü6{¹œÝüêc'Fq@g¹vŠ‚ЉC,t–©ó~þVä‚×báRÏÿ¨õãZVú¡ÙšÉW2y)å½~ùûîÍâãòwØÆ%ž¯µÝ5_sQo…hj5 »'‚ݦv÷`ûÐcŽë£84û‚Æ0šßèBµröz9û4# ;ÄñÄÌ c‚L¤˜½ÿˆæÀäÅ‘óÐJŽO0¢,€çܹ›ý5à -<€„: úq‹‰UîňàÀX¡¨5îsÞ»c<_."<—2·îõÁ,¨‡X`t,-pk™çrAýùCVnôP²ååÆB½å ŠçŸÄŸ›+!JýTðÔŒ5²‹G»7ØÜíM"…¡ò»Ý»9c"£øÈJ%Ò*¯³2Gñ¬ý\i– !&.%!"¾QÌ´Ö”úÇØùÝ­Tj7S­ö–ß/ž‹Ó\ ÃÖ•,Ž¶òZGYŒ( ;ʦÊV#®z/¶r…L÷ù’_êÜ€ÜN¶ÎC ¾Dð>yzõ­L3e£HY¸Œ`ïMaÌ¿÷ã±ð¹ÆÝ â.òØÇMÿ›Ù»"k¶ÄŽ)êFÈ À$ÆPÐEãQŠ¾[@ÑJq*½}ósóôAVi‘5B̾Q)C„ÑiDåi -=¥Ó;F]fžoÅÀžB”Í3 XÓˆÊÂY¦ùi¹Ö¿©X+*ñ}Þè¯ø¦â»­@eXÍÔ @#—‰ú ”µ ßì8DÒ-eUð<ˆ€þÀÐà¹ÖÛ¬÷»¬‘¢/…¡§"Ý£«¶+ynÔoÀø»F(Bõ9ó’çùQt » @Hýï›U•¥±< KD£ ¸Ñhàk*“œf·Å¯³8„§ãðOQìrÞ»ePØ¿pÍáY…RÙ€¼wµƒ„ÖH¼kËž"°úä2¹¯{to Šav15 ²UžÉöd¢6Gm“˺æUf³œ6ýð ž Eè -ű&NãÂ0Ñ[”‡Ñ{ûúÅ«Û×0ÇNç´kn½‰ ÂY& wÂw¬ü:aa0•…#~Ô"i2Y¬qIͶx%¼·~± ¼³½ÏõàüZÃî Ú/Ðc·Ž„Åé¢èÑA ÄÞR‹¡YË~†äXˆ4ãrõ˜¦Kî„?(Uz¦J:©èÄdé?£Øy:ÑÇ“åU· ùŸ&'ËÉý7%³±h±G£åMM)Wä -25\ƒ _u}á'»¾ÞµŸˆ•y³–ë7}oL‰»˜þž„_%¾ª›ŠC)Âì ø¬sþ‹ùü;ÕMCD½Ã§igÿ -(ë1ý‡|?:Ò¿‡júÞ|ÄêÄ“á=GL|ÅâË°>z#ϦÈéhXðRI5ßv‚7ûÊÖB¶ŠúSIðÃÞ ¨:Çê…(‡ØVâób$«¯#aò -ãã0e%ÄéP¦m³Í6‡ œnA ½ „sA ù„}{%G§btjú£Ó*ªG«‰3ÔŒ'Þ„ -¥kªŸè¢ìX?*蟒áW¶bÞªÜ~^> endobj -3872 0 obj << -/D [3870 0 R /XYZ -16.307 900.716 null] ->> endobj -582 0 obj << -/D [3870 0 R /XYZ 56.693 759.068 null] ->> endobj -3873 0 obj << -/D [3870 0 R /XYZ 56.693 738.489 null] ->> endobj -586 0 obj << -/D [3870 0 R /XYZ 56.693 667.177 null] ->> endobj -3874 0 obj << -/D [3870 0 R /XYZ 56.693 638.418 null] ->> endobj -590 0 obj << -/D [3870 0 R /XYZ 56.693 183.094 null] ->> endobj -3875 0 obj << -/D [3870 0 R /XYZ 56.693 146.098 null] ->> endobj -3869 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F102 977 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3878 0 obj << -/Length 2390 -/Filter /FlateDecode ->> -stream -xÚ­YYsÛº~÷¯àäÅÒLÜéºÎ8©“ºÍMÒØmo'¹3†HH¢C*—&¾¿¾ç`!Evœ´O àà,ßÙ ×Ù8®óæèåõÑòuè:)I#/r®×Nä‘(vê?v®sçÓì#/9kø|á…îìhy£†kQ«A»Õ?þId/…ø¢&¿^½ÿvý¸fA)IÃPQ»jïJÞl9oün§N·G>ÞÀõqà;‹¤±¾Ÿº PŒ“ÙR}¨áÉ£‹ë£Q ï:Ô #¥¾§”D®çd»£O¿¹N¿$Hç«Ü¹sBêÏ`\:WG;rµ*Ü‘J<‡z$¥4D® ñ "!Wž+™0§œO êºî²S8F\-æ¡’A'{ŠÖµQ`}¨ê¢ÊÊ.7ÚÞ±[£ï5gmWë]Ù–UÞÀÄœ&³f´êv+®%kõ]Í=wÖmÔä³ëzßæ4œñ†ôȉIêûJKçæ¢Ýê‹ÌÍ#à}¨Å-ÏZ5¹É…ýÎkqhì|·eu‘™XdÅŠ[Ø!W‚ÙŸ‹*/ô¯—uÑlÕÏnè¾a¼,2Q½÷MwËjàñ¹„JB‚(š¿²ªb9Ó6þETQ*Vpþ¾.îÌoºê–­ -=»ž'€Í<x‰ÍhqW”zþOœó²ÙŽë, #`ï;†8Ïsž£„þ¬éö{Q·j¢• «{žë;­]¿÷ ½iÇÚ‘uüëZ¡F%[w=‚ „ÉH Z¼(!IàC’I#û–×–XåÇ$ -³ï¹…TH¢€š l¿ç`ÅoJO\ÿé”0–Y¨x‚p:P4Dà°¹MF¸0zz5_³Œ?$bO’v£®jáÆD2ê Ô04Út:ÐáuùšBö8 ‰À!'º!h(i" 3iDH½c-©$MèÄrÓ¤$€&ªþQ‚qH|z`J5se0X2H[áqv}’ñ3lÇAÄfêläèz?än2í°¦Ètž3žg*šû(¢nã^€U±* RX]’º=²Z4I k^ó*_ž -AØ$Pëü¨÷8×)±Ø茯²ÅT -nû=‹€Âl;+$¢¸…•ÔQƒ·îx^0±’™×¢˜”Ð8Ñ™JË^Àþ#Ô…  ¯Ù#fÇ츚ßèçù½¯Ô$ ®Û‡,ý.·"md{ô£‘Ä•±k·ûm­ë“©y|§š‡¦I¼ôiæ¹øõÃÅÇË_.Þ]ÏS(ÞB%à§Ñì²ÊD ³VTX‘JÇÁUYÈ*Ç(‰¨»jŠVï:,HåBQÉdwH©7N°ÿ°Ÿ[~"â|¤³+á+ð=c[-¡ê=¶Û—|Thþ,(˘öÂJ•H:ððD .º¬='Õ.ýýãåCW^¸÷?²|®ï³hÐqó ÏøÐØ -›ò­±Åc(¼!b^ò“‘ñ‡’tt $RÈ• äJHÅÐM)۶ݟ,— ±X‹4¢«32I*Þ.uYº^–YWCØl—_•Ë Ÿ•Â¦ “·~Ç=mžÇé ÑX96\Ç¡„F}ÀÇAtèß1@ÙB¼vHímÑ–6š^ -UPOS¶$@nÀLÚš+G’éqð½)*Y–Çj>ð/§XMï8ÝVHLDòÜidÑ1 w‹þ6ÀÚšlxÅ룛²hZU,Q4äÓ±;™ö¯ç¬9*9Øš^²ú—5Š¿îû:Qv•½‹ʇ ÉVT•Ã#çà=õ”ì0~¦¦Ÿ†qyD›€Ž9ä»Iv"r -‹a I `IqÃÈP‚F§úbG–?€u˵÷béĨ‹¯…i Á-1ÀÝËàânüX2 âƒdehÃÒ¾0—…o¶EÆõIŽ%akŽ•ù‚ØfK±aH°|Ou׋?ñŠ­J®'X….º“é9”íµØ×k5uÝ!óü¡|qÓ³‹Yß°{lÞ9B·áýÌrN wšM7pi’œžV.”+ó‘r7~ý1ÙHëè>€ å†RºñƒþžV-8 ?pÉZ<„â]¿ka’pBëäE¦43S„%³;Ñ©¥¯sŠ|¶jÆÔgÐãØìa2vqƒ áäð¦æ(‹Ôpj®Lf7§[Íå¾ß?®%¢ië.ÓX hÌ—Æ8;R@n{ýÄÀ¬µŸ<Ø"Zìƒ-HŸ9^ä+£˜Èuµ’þøl-ijêÒ`ì÷ÑáÌÖqö‡“w¼l[”ù8¼ö°3¦{H¶Àúi……ÖÉ|HÙW?†¢ÁÏ^m…h´¨ëZìlz}ÿîBmïß½ý—éß{üJî%5¬±°¾:±Ñ<=puînZV.ôìltD‡½Ó,#êgjáÅ™õ¦Ç,vv~ºÔ£Çv½|Ò®Wý.rº$9;]J¥Z0`ÈŒLð¾kµOL×Eµz[D¾ÝÂê”Nò¦±¥LÄhKõ‡åQ™÷ëþ·{سTÈJßøúˆˆ<×õåóq8}¥CÖˆÁhxdÆçE¦>H±i©ïÔTÆ(Qaµèd§kêõ ÷Ê6Wd$ÃJE-3=Ú‰FP–Ñ‘¡sI%ª…V¯ZùFïTÕ·æ2Õ1¾±k²[†ïéª ‰qø¤káÚ#-)šÚ8L@øÒæ†:xšêp` ð‘*ÙÀSÓrN1Õ2+Á"§2l‘ñÖdCshÅó?¨‡ßƒÐ¡~SƒÍ¯ñe{b‹ŸÐÌ¡÷¿PÑÙã'ô~øhüDêÑáb€íÌ(¦‘Ê ô‹ƒThw¬_½„ÄÁ¤@Æ4ÃÙ$è¢ÆÅ—í°ãhú3€ýW—E{ -endstream -endobj -3877 0 obj << -/Type /Page -/Contents 3878 0 R -/Resources 3876 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3882 0 R -/Annots [ 3867 0 R 3868 0 R ] ->> endobj -3867 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [305.796 714.391 393.287 725.295] -/A << /S /GoTo /D (V1690_MAN) >> ->> endobj -3868 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [289.228 696.458 373.232 707.362] -/A << /S /GoTo /D (dot0) >> ->> endobj -3879 0 obj << -/D [3877 0 R /XYZ -11.232 900.716 null] ->> endobj -594 0 obj << -/D [3877 0 R /XYZ 56.693 759.068 null] ->> endobj -3880 0 obj << -/D [3877 0 R /XYZ 56.693 731.272 null] ->> endobj -598 0 obj << -/D [3877 0 R /XYZ 56.693 683.517 null] ->> endobj -3881 0 obj << -/D [3877 0 R /XYZ 56.693 655.131 null] ->> endobj -3876 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F102 977 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3886 0 obj << -/Length 2548 -/Filter /FlateDecode ->> -stream -xÚµZmÛ6þ¾¿B(îí¡fHŠz[ô®èKÒ¦èK.k -$ýÀ•èµYREº›í¯¿¡HêŦ×N.÷É%ÍÙgž÷¾»úz}õìEŒƒå M‚õ&H(JÒ #ŠÒ`]oÂ×¢\Šëqøs«„4ÃMÛ›Úڛ߶Å×mûÎ\üzûãõoë@ÍŠ”DZ‘v«k!·B(©oƒvd =‰´vêS«å©ÕOpÓ,|f~Mô›WÏ×W\Ä Jò(Hs‚Lƒbwõæ7”pV€XžÓ» &Ñ(qÜ^ýû -[Sà…Ih¥q>ØÄ g9"81«¢ eX†{/x³"ãðÅ/‹éó‚5(CQb¥¼¥4>”ƒ¯ÊR”Æ> x°Ó¯G)ŠIOom£D£Vê±Ö˜‹£LfãÃ]ßv¢WöÌZt– –Åîñ^‰¾áõê¾çݶ*<² ÅI6¾P‹,çs£á|¦4öñ(K"1qïV;~/J®¸GKŒQŽÇ}€Ûí¸2‚¹R}uwMq¸W- ¹Š†’Œ€û(_bpð/Ê}×µ½2ÆÉap/ÑsU5÷ž½š£›ù¢³Š¯6•¨Aj -Š^pÕöÿüìoÿyþúöå/?öì_ž½p`L#'é-Æt±X˯Ï_™A»WÝ^¡ëU”Ñp½­¤™ÞñwׇC ¦‘O˜wñ©ÃrŠpœ,£S-Ø ‡r Ssýç5‰CÑË -Îr˜¨sã×Çðç5C^Õü®fZmûv¿uvV²×¾¢¯Høʸf¥¬ï½Ób~¿*úöŽÛµ¼¼½ÕÚ”fЂl;÷êÛvÑ•Ðëy€u:G†8îE®±¾Žâ°•;Þ¿Ó‚óP>îîÚÚŒ·°„Z»\e`úR˜yNYIe7™‡•Ú¿‘‡íÆÊä;ad˜Mçá÷ëŸ~´÷&Єæy&«ÚÞÜ„P6¿Ãùkh¸:Á ªkZíÞ -!¥˜ÀÙBûÅ%®ã+ Ëñ˜ô•Úr;ÒÀëÆÄw6­™6§_ï…¹´ "u Þ«¹”f¸]3¥=É=~cpP8u‘¡ÆñFšú`)wkI¬uµ¾™uÍ㎞v?Ķ‚Øè ¾¯!ZB8ƒdÉ–!Ô‹¼s8ޢ̀ -xaÑWòì-Pš ^ÿä†æžpþ7(Ø(1KÄÇÂ! Ðèb»áÃì"ž›³:HùíÌþ–6ÄKbk3n VÁ>‡! IÅìñÚ˜Öâõœ”ÌðÚБ3õ>õþg,Æãl:ûÓ1³õb–è=6cÂÑh³£=Åp²À§>ÍžœËBÂö/1ˆ6æp5ññª!_M‹¾kûñlaiOžw]]¹•©Öü -^líŒ{=,D]š€¤@C¢Øšà ïYûCxÉD}è¡*O=¤àDI”Øu5Wny¼q8ägë½ÝÖû}Bv¢°RmÜK•³—¾U’œ!:ÆÙß=kKÑä^·Ó^—ƒ¥€Uåæ±øÂEY0{æˆø`°Í?ÄéÎ1ÍMûþ¦ÂÉd|ŒÉ&*¨éðÇƆÁŒ0.½ø” l© h äGqþt[O´À›ïƨwOTá²æj¶“#b@5ÉÏÙ‡El’Îָ̃b/U»«þ:A£eÙHöøt.”ebÈ}£ •Ðòg¤^¯Áðƒ(!á7Þ}[×nyÓ+c’ P'ÍÖg("äp-¨›¸™')a.=ž‡&c>ѺI%¯Le€:ÌR(R•‚R5¤Ìœš;Þ}R¢KAŒ$—Áœ§~2D¦Ü»i[LœÍ>|Ådóg— t6ÊŒ²tëôŽË2!\6äaP>™[<¢äRÙ”}fÏšDtdt8rÿïYïØpC³¥IΤ7ÿ@ùΨ{ä¾n¥¬­ûè1ÉN%x’ê*Šýÿ·ZA*«þå‰U.k}Ë=¨NЄ7CBóR =Ih âŽ.ÛïKH¾÷Ö»ŽòØÐÆ(gac -3/Z`‚†öŒ9Ó{à5âå®m*Ùg0)…$Š“s˜¤Ñ.›Yâ#e¸Ø¤hQÐlK2`tYZþèjtæCUùD/àcºhšÔ%}|"At‚™0d»³Ankë=×mᨳ«±®°TRŽÙ·RÇÀ)¿ã3”±åAÅÁ›b;‚Ö‚Þ9 2]/êBJ¡M{S5'ˆÆ²î¢wݬ¯uAƒg9âæü |Ç'J‚ü$ @¯Ê> ,þ<Ûíø{TŠÎˤÙ4‹<Ì°×q|°èÃv銀G±@"ŠP¦»¶ay¦ß‹º»¤ezÆÏ‹ºê\›Z˼¨!Q)¶šAZ¢È!Õq)žÞ/>Ú(óoT'ÐOÕ^Q’ÍøÑ]Â^ê}‘ (§²7íï´k¸Ð½%ýk“9ä1cÅù±ï6·—¼ûwy®óô¹WÊ}ç -é“—BýJÒ³}Çk“4‚¬ìó.BÁ½&î0cÀ@s²8{BI¤Ð—H¤¿1%çK(R–]åßrŠºÒv†ŠÙ¤Rý}ÄQîî)ÚHbHE‹Ï*íÝï¢PE{ -㳃ºRÛ¬\ºf‡¿x]¶8ÉŽW½¿vGιf%íéïkŸ¬\ÈNf¼/|ۀѸ‹/«Ý=’}:®¶_zä ¾;ÚË÷'G,å½zy\/Ä(e——£¦~§óö‚ }t\N§s@p!l³„NŽ0mÌ_>ƒ¾ -ˆŸ²@²D<3£?å4\›+ç¡0\t¤™{ØŠÆŒ€­î+®?Ù­"–4+舳0<nƒã‘ZÇ‹bAB„öµÏlš@6"4¹€á€š¢*gŸ¨‘ûÇðÆ\د&ŽÍ-¾¦3x…˜á{ÍOn¶½Ø<ñuÒTq(C<ûJ=rDü?vu¾ï¢`áÈÖÊ[G)?_¬ŸÝËSe«ÎvøÃIµ+S‡‹É?|„D ³m)6úk2­ê~ïD÷,Åéa7³0ÑpÜ–1SiµË"WzUrlnÏ OWôšù÷)³Ò…9|ÿ¯`á$ÿ˜¿Wü¯ÃÕ -endstream -endobj -3885 0 obj << -/Type /Page -/Contents 3886 0 R -/Resources 3884 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3882 0 R ->> endobj -3887 0 obj << -/D [3885 0 R /XYZ -16.307 900.716 null] ->> endobj -602 0 obj << -/D [3885 0 R /XYZ 56.693 759.068 null] ->> endobj -3888 0 obj << -/D [3885 0 R /XYZ 56.693 738.489 null] ->> endobj -606 0 obj << -/D [3885 0 R /XYZ 56.693 369.916 null] ->> endobj -3889 0 obj << -/D [3885 0 R /XYZ 56.693 341.531 null] ->> endobj -610 0 obj << -/D [3885 0 R /XYZ 56.693 311.688 null] ->> endobj -3890 0 obj << -/D [3885 0 R /XYZ 56.693 283.303 null] ->> endobj -3884 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F102 977 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3893 0 obj << -/Length 4417 -/Filter /FlateDecode ->> -stream -xÚ­\Y“ã¶~ß_¡JªbNÕ -æ}¬Ÿâ\vbçðŽ«Re§Ê IÌ„L;;ùõéF¼†Zi4û2ÂÙh4¯ปÃÆÝüåÍ×÷o¾üsän2–Å~¼¹ßobŸÅÉ&õ$›ûbó“óƒ¨WânëG®ówÙ Eɽl)ÑMåeþµ””ù÷ûïîþsÿWfëy,‹"¢ö¾{ª„: -Ñ)¬†Ñ½M -£ÇŽÂðIl¶Ë3¾ç¹@1I/éÇócìùæO÷o~}ã}wãm¢˜ÅY°I2Å®¿Éë7?ýÇÝP°0K7ºe½‰<—ùA éjóþÍ¿Þ¸FîY‘XÚaÆ<7&¦~öýHsa»m~ÚF®ëü¾(Dq· ¼È)›²+yõrëˆ;(úxmY‹¦ãµQýé$ÛŽ2Z :ш–wes Š\6tZ´ÒbÇ’oî¿ÿŽd \jY†ÈvàfÌ q¢šã®ì*aD>]à27m+Þum¹»ó]§ï ù}+kqƇÜÓ/²ñ|pÏKX T«ned/c~2Œ Z†’aZi¶aœ°Vi¦;÷ÇRëHäÈ›ƒ 4/ -S:HÓb«ž‘UO”\UÉ;?rµd±¨lª²1Õ†CK6Õ¥~v#·‘¶NÉÕڌߚª]%ó‡9-èë½[Oè‚úƒxv»V|X[$”ÙfoWEÓ%æy.ª2~ÌÒì"™qµòV6[» Ó̬ƒQþ§zm5]–ÄŸÇM>ŒÑ•²¹qÊ~<êëéT•9?C,‚›¤×뻣l;U+ô’ˆ^r5½8”͉Ö¶]˜²Ð»žµ¼ìÎM2 `¿ˆ’hÅ´³}Z¡‡,ŠÒ«×©³,zŠÙKH­1ä{,ò®Wˆ¼âJ5¼¾MæÛ0C£”ÌíN. q#g‘?l«\Ö5oŠ5OX|IæsB'°Î­ì;ø½QM#™lTÇ›îœne/ ÔŸQ+=Åë ¼ã;¯fIÔ¼¼Õ&Nd.š¼½™ÌÈMÛÊöŒ:]c¦!©›ý9WÝ`ñC€9Ù|ˆ«x̼ðêýM£<>ƒ5sqBsxfþpheÁõFlÏ?¾zvû²çVã -Ln_¶ª{ÅÂ.I¥¨?)ÙŠòÐœŽíú¶Ô"¿þhÜ÷MþyγC%•ºyŽëÿЗ»¾ëÖÙ»H3dY8è*óu¤sÑ$"!B¨â»U|wYÁ–”œö7³,¨o_K®T¿;ÃX°$»~†GÞˆË_-«£lîËü&|3#U‚óÔîy.>©OlæŒ yáIü žr~º¨/謟{/gH­: /d¿uhþB†4¡¦‘gº†cé èÁâòêõŒÕ¼}è?ÃÒÕ¢èŒí¹¼3´ÀÅ*Ψ¦¦u½ jiw@±ØOç; Wâ6Ž˜Ñ›•§O9«/¥Ã«[½d²;‚ŽE{«Ûµ õ¸1ÎïÄó‡Ol©—j!Ø7ó4Lï$Zu'^£pS¶ŽºÍ ˜²$wgàæE”8áEªîœ#qQ—¨Ç„uN­,úüô¼&–’1-K¬¯w«Ëx ^œ“«Oݶ,ó½ ЈÕ@Ã50}Bé×^v·*Ãdb6s.ˆr+3áªhõo–Ó„­S‚ïªÛuaÂT×·à@WýmÄÖAzÇ7m#@Ré xê>iÞw7m£9%8ÿoÓ$dZ!nSô%Ø~ûRTÅ­Ø|:·ö†á¢3ÖïTÞ–«›ù*ßjÂVÖý±ëæ8᫽1Ï =Õ;Y}†|·¶.-ƉR–ø ”¿îx]·†­þš}4¼û›Žþ9!ù š›·Ñ`r:@GçLáuZ6r´²ºý1Ô·å-1¦9 %Ú²Yù^åAŽ¤>ð×iû@èQ¶Wøwvº º |PþÌõÍX|ݪú“=ÈÐ^8ù±oðoåÞј'ãÉóáXªN®Æ¤£˜ùž7ñ©¥T þÄëOÌýìº~%h`¼ -Te]V¼¥JÛ…îç –aß)$Ý8b”ºN=–Ýqe~èÂF´¯^sYæ—ÏN¼mdwÛÀMœâu3ïò£±‰Ë´ô'ƃîuñªþþ(knnõßçÇ–#ABžëüA:‘U¥WD_ö·²?Æ=ןÊ>‰§'f#ï¶1¬§¹Îl\ NóÚÖôà0 '¨oð¢Èas]Ù ©™öú.«Tå¹ û¨ªw0©0t¾ãÓ‰S§âÍ¡çú*9NôE¢äþƒ-«OUÉñfzÄþ Ð™S ð ðR™2;)+ÁÛ·Aõ9Póq6¡k7Ö\‚A<Û[škäiìÄÚ}Έs( Â‘,B?ÍÅX=N%Ioñ.;ñõ5 }»ùF6Ûÿ‰VR)*=é7T¡­à}Õ¡¶½¥'0_P·'jß7žÊ²5]ʆÊ9e'‡BíÂèòDzª¨lgJ0l -’ú€´³k©CµÞsPÍ){¼ƒ‘OGaF¡Ñ|z¡KèšLO91SÌ”}œ²–$‰g&G”ÀÛÅ — ó3ÌCÊ0©m)ö¥¸Ú–Š-­£¯/Ì£ŒÌ#ï8E•faÐð¾Ëž©²ç‚.×|í|t7`T˜7}(@óx'@ •TÂT€T¨0 ©ÈâUµ¢R5<Ó¡Zzr°DÑÆ™–x¥©K÷‚Ì7Cµâ×^¨æ½¢ÐùÖ Fo5ôp’šz \Ü.XDT2l(Í´ÙC}Kñ5ÝâÄ·k‹ÌþB5Ní¥ÔÓïVІ‘NqIN"×/= V¿èHµ\·'ZÛÔ3ZC5Û-••M^õÅ@eÐ<Ã6ÑÒÀÊÿöª+‘qzœ€Š”fLµ¨Ê;˜âÝÖs bÀÃ@âƒÒ Ó…î+C_·]™÷M9êb~;“£ŒöOZ_õûcéé%ËlÞ; -^§=÷R"Á… F‹.¿‰úû`qT[>!;TrÇ+zqã:E©Àñ9 ²Ý™e‹V>eq!ðw«öÕM™—yc€´aºÛ~õ%„ˆj|°boîgÀÒ$™</_’Ù§Nݲ4b©kÞ¼á3;˜V–âî@-Ì2c„ hbƒ©€Ä8m²“€-tJ¯²®’ÊTj3¿ÆÄC%šxh«´7VþÈyO²Q¼Ú #cô¢Í°PIù ¨åAJÓļ¡‚Ô#Ùg¨-»9¼R†‰ÉêŠâ«;„Œhë§êOC/sËüË7£f|AEÍ°%F¨3´?´f”-›½¤n…w35­¶ç¦s ó þÄLÏÁF ]£b˜HIFŠ6‰cŠÔQéJ¹ÉÒ?h€ÒnÈÜèÎTª„i§àÁ/`oì_àvÒ`ì¯èƒìKíEÃ*ýêÍC¢»<Ë©%l‚a•%ÐÌ¡—sš@²’¼’¥e*ðYè%£Ÿ)Ãcäc.”*?hÅ -^ã£Eõ¤­¡£NxO¦‹v¢{¤=Ñ|®.rć•îꥸœ™ï|AT†­¨½Í ’Ší‹Œr†NÎÍxÖ:è NØt]›qü|ƨpÒèUÝ[cÎNP#;A–E¶b>¶kw¯5Ú0´¹«ô£Dß@9ø5sƒÔTá!KS„„Ðý‰~§VVÏÂ'ì?•4ÄäÞ’‡&φz’=% -Ü‹°*¦üQ›­¦{6Ž0, ú€Lò¶Ô¡G]ŠŽªƒ[f'©–  ›¿%˜G–°7+ØYX/)Žœ¿áXBœhžqfí&tX'TMÃCí³“ÊèÔ"ß ±*CŠªŒh¦5Ó"™H š„I&Y‚`B[ã´ |WöÚDÚœFicQ³þ=Š7O4 7ŸÖ 3 -©–£jh’è²ê”Ù  u¼lÈNAžD­÷8Š— ö:¶Óö ¡&mL[aà_¶aÈÝÙé ¸"0‘éeàfNÛ7”ЯÓDK-ø=J‹5!SKÕQŠ&Î*M ë¸!cQ2$õÓ_L€žÕ¼ƒµ^Ã4q¾î ŽVmÖXÉÚ¤ðÒX«ù8¤yؤ è¹êó£é®Š†ÑVk³×ŒÚ“l Ù¬§ñ‚0L쎞«¢¼ÙVîYÇ+-6@S7¦w‹”£§×z£Æ‰² [7öí^søU 8ü5ZâØÖ€4¨€!!Fm3Ôñœ-”šÄô°R¾5êÔsO Yxj]Þ,YÿÙп±:…Œ!PDÏ‚5hý›‰<ÒÔÊã7”ÃQó¾m®Ãñ ¦ê-Á%4Kkoý—¹nôyÁF,€—‡^¤”¾þ åúýÏkßR&nxÝv‰NðùnÍ&Ä^푺2„­-ÎàèÌ£’óÆ¥¼>z¬Q<4.éþšò²t|ÛdRª+–u`XÇ< øÂ0h1Ì€üŸ˜&Ì “Éž‡‹Òц]2Ì““”ñâ:†0US(¤OGZ 8F“Õ½2áàxüzfáVz!‹²`Õ¯dÖn0c2V£} ²åÍÂ| |Q¶î¹²O­FØ“`ò¥Ì#9çƒ “Ô[ÄÞkÁö£Ehšõm¥(x<9zžó’ÆÌMæþôä¨Ë@†atÕY÷-CübG¼å'ÚÇñ'¡]ÌÐ…¦ÇBÚò„ ;Db03Fb„B €¡hÔΡ ÌVÃ#,7EtÞÏyI /ïîðõŸeöÕµ#xÍÚ•]ÿ©ó®æ§/{S5Z ~ -cë¦?lZ†–¸é3LÙÆ–ìcÊâûʆ}lèt¤§C˜-Ä̃ñ’tâq<d†‹# 0>jp ¨’cÄò¤'¤LSQâ˼ „^ø-$51xJì£=•9Ò/`´^ÅM`QJ˃AwÈ)ùÝoSßw¿‚u,›-õ¾ZźÇé'm^Hnüê@8ü’ÛëåÛð¤‡Þ à<41ß&B¥¢Š’@‚ïÊ -?Ë!JûE-‰‚ÙÏ9©RÒ¯½ô¡Ü/ú‚Ò?Çþµ7nº}• OB©$°:7qH}¹®Ö$1( -wK^-£¡«Šó 9U¨g6Að\+¢Ç¦RŒÍ»&3‹œÆr[„žH){³˜“:4«~µXªš*É‚@ùÔ‚Ì•'¦K:Ò%&ˆ¥ã—:9 -ZkÞš ±™½ßY¹èM]æ‡ÙÝ .©b&´ ÛA¿WžÁ,!*lL˜v§GtêRã¯*ÊPp *ǧ§ÚG -Rë²Nêõ}œha“Ð, -”ƒ´aEŽ¸4è&¹C…Á C†›ApÉqÑ–ÇŠvWv-×±3l *‘Ûë‡ÔFá·fJs1€ÙDo%¶ò]úÕK¿y -ÂéiÆ‹Ó°>9‘ZÓˆÛÄIvdœut -Ì…Š×ÆéìK_H»ÐJ]wíx\3ƒ£Ú… µ£A ·GŽftpûõt +â3€”ùÙBb“ÈT+ŠJ娣tˈ9}ŠQ¨O ,€£æ¤—›JaìeÎï›bè¬ÅH„PÆwt É ¤ßq¿Et•hÖ‰ï0"¶õ(ƒÛæÛ÷ÿئi”m=£ÆÈ}¬¨d# '?*a–᪺<;újl²’xÊ™/í7ãyg¿9æ¦e¹¿m67¯úkf¼Ÿ²ŸEw²&VLíé’ÃdÌ÷ÔÃj¥á+çÒ|F=ù¸,ìÛÜ*dÞ˜ YðdoF#×Z1Û¹/7ï,X»ôÕaTú}0¾µó þúY¢£ûq˜«à)\û7!xÓîoø/ÿKCÌ/ -endstream -endobj -3892 0 obj << -/Type /Page -/Contents 3893 0 R -/Resources 3891 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3882 0 R ->> endobj -3894 0 obj << -/D [3892 0 R /XYZ -11.232 900.716 null] ->> endobj -614 0 obj << -/D [3892 0 R /XYZ 56.693 538.389 null] ->> endobj -3883 0 obj << -/D [3892 0 R /XYZ 56.693 510.269 null] ->> endobj -3891 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R /F108 3706 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3897 0 obj << -/Length 3415 -/Filter /FlateDecode ->> -stream -xÚµ]sÛ8î=¿ÂoQfjUõ¹oÝmzíMÛÜ5éÌíìîLd‰Žu‘EW”šÍ¿?€õáÈÉÎvîÅ"A_´·º[y«œý|söú]ä­27‹ƒxu³]Å'«Ô®HV7åê7独e®åÅ:ˆ<ç³ê¤¦æVµÔèv<øV?+uOÿ\¼øã柰ÍÚ÷Ý,ŠÛu÷XK½“²Ó8 »û«vîÂöI(VëÈÍÞß÷}À˜¤ÎkúøAŒ+Ï.oξù€ß[ù«(vãL¬’Ìwc/Xû³ßþðV%Œn˜¥«3s¿Š|Ï D ízu}öï3ï4+"×ýUf®ïÅḊˆð<'/˪«÷:u±ö³ 8¡ £T¨ýÞëÇýFÕúô|‘m—W ­èµl5ÍÚçÔØåç|¿ð#‡‘åôi¤,y#EÞnÇ[PgÛª=µȦ¥%_›ªP%OßÔª¸×.t2á\ÃÆqä0yZíåF•KÂ{Øá¾IäTš¾¥*ú½lºª¹#@Þð÷p¨«"g •uÞ!ùØéÍ>ïvܪîv5é”ÓitJÄJŸ ò§o -^«¶ôyæbÙñêÛO°„=°š@WÙæjõùì¸,ìeBøÄ2jþîE2–Gò¡±Q}GÍ8¢o±Ëۼ茱rÇo·ËÍÌ`Š×ý#@H wP5ù¦¶}8uǤžüÖWØýŽ?y Ñ@¤Ž"á\µ4k-­©5ã"æ/È6­kÔÊ,têêþÔC’μ‰oòNÓØzM_Ý™ÀxÎ#Ä|h;YÜïóöž»pHPL)œÅphŽ*oJÆ©£Õ‘>à$šê@>˜½HMSX¦ÝòÎ ÉGP¾~è/qd*O´r(O²(ºyëèdö„F£aµ¨Šœ÷±4ÉÜÜ0ò[ÐTØê®ÍKYž %ŽØL0\ÈmOb50·lB)Ž=;â-·B  æ`ì;ª.Ɇƒå56<46?èóŸ.Öaj´TˆÄ¹ÕýFz2ŠBÄ`ÿç4hÔÝ4xò hÔg²ñ¡ØÔaJÅH¸ç=™“„Så w‰qØ¡·Îç†zë.}ÅÆðr¹d1g@„‰$Á¶dM†`ÁŽ±Š²9b °4œÒÄCu˜:G Ÿhå‰ßB5]«ê…Šº]«ú» âñ>ú3Œìg¢ˆtÐȼquׂµp͆.nòT!N8!²« ¿½Dé„úV‘ÌĺU‹!x ñË*n‰% †£ý5ÓÑ~’Ö ÝÄs Üäààë\ÞfÎDPƒQ‰vUÁ£èr55Qâ•q1Z°¦¬É·Gtô²b4l¡C +þ²¡Ñ. +ÁÈÈ–Q{¡sêNíbæH]äÉþKˆŒämˆ›É!,Š'f:o…‰ˆì#èrYitŸ%Z1‘¸ÈéfÃ#zajÅKªº¦Ö07fó0pö‡¾c šnßV‘¸<ƒ9Ò >º«œðQõvŸ†B€I‹¹âÈ1âTÎœV[ê£@eyòîQ4³0Ø' cZÖF"qQLv0²48ªÄ&jOcÅ<€ïÜ„ƒ#À…M3–¾ÒD7%ãx¤o)·Æ|ôuÇÛŒžžS*r4Oãs¹ö¤µ!‡ -!zßšÁ65kŸ “¸ÝÌQF?ÂÈÚ,˜¿WÆ ãäáâX`ZÔÀ-”#>h|ë9• -)ààà‡’ˆÀ³`#d¦|r`{K¼ÔySkðÐ F™”+ XBÐP¼AÛ¥‚YOc9}n1F8çuM®±±¸Œ½'€­Bþ^•æHÑýá Z¦T1.…6&j9mLĘz“È+Lø‡ý­ÝSÅŽÄÌâ®-0A…<“ š‚£´gn”7al¿&.xrDhG8:& -öØ1ÍRê-Ì ËÁÆÔ‹þÉäÁ6/æOã0¤¼S^ )º\{ÕæËgÞ,†ùé\‘º¾mô³g¥ŽalóÚ²ó9:×ÃV#O§Ä‚á5~Wv™^+h¼’¿{^`Kc@[z ^"w{Äû™ôœáV‚ä¼)ˆÖÌËxð&(~„D® ·m[Õò‡Ùx°kµß~R¶ 2xŽ~A–mõÃT©P $6y÷‚´lzÓÛÖóºÕ˜hWÏŸG;±xåq*ȨÀßAÔHÉ©‰X¦'Ç°Íi<¿¤¿A4ŸöÛ:ò<çzRt[f³ÌÇØc­¶kY$&¡ZÆ™ -|ðx&ƒ÷à×/5µÈ.CVÞ3 }QÑ·˜2Õ¶.$<@ÙP%€V=MûDº^0Í=¢\ˆ’ƒØM³ÌÎb÷ -f´b -îª1Hb¹°ÌXIÉ'.vª*¤žÑ\7Œ²¹MãØQææÐs -„†q4— ¥ ÇùÜï7¤Ö²‘’ò€p£c†C\æg”ZdC|§1hH…Ú @_QÇ&Fä’‡¹v&}õ·Þ”Ÿ°½E¥ ³cìrC¶Ì¬fŽtøÆ aááÕì$¸%rÓG^Š¹˜Rì '¹š[cgujb1!¨Ü:º-²9u%m‘ñHëºÑX‹²ºjl>:’; -Ès>Ž”23=‡Òlðy_qµ…®óÜáé;•úwþßL™‡&b‘×à¤[©õSF¼UÍù…ÙåäèOÏ-Qå|:¥,ÄPûÇ¿Àƒ¿{àÕzá¢þzácY¦§@‘ƒ]Œ-)†h1¨>í‡ä,:–"hêêë’Ú&‘IC§oJÙâÍÄÔ%ôlB -3&‘8*FsÛÙ)T+jïõ9õMÓì©Mº’ ›ÓÁÌ^C˜4ì<¡“iN»T†1g;½Pœªt„±‰lZè -¸i”ø¤Ô‘º‰Úu¯‹(àÞ¼ð)j¸aî`CN¡ŽFÔ&ãA†,ìñB¤Ë{ŒB[ÚEøà†Ä“Zfnqm/ 3í¸Ly÷˜ÏR2ÍùíÍÂ'Í~°QŽì3Ú—µÎÑpwl’:_.ß]~¹üüËåµK¥¢ã<<"6gl½æíÓŠ!7ðcÍœ¡ñcPgìÑž²ü²Ÿ>-Ž5Çv=ñÜ8LÿZ`ô‹9_IŸ1ZáP¡ÁAÙŠ¸Ž=Snƒ_oÞ­S—ÉM¦’n0Ü -NÌXZ0K‡@Ð^"× VzÀÁ½ò;» oÑXJ‚OI3•[˜Ðæ0T-O‘ëeÓË!B1V²ˆiu¤é''ž/ðM0¦hx:?ãg;zdŒ¯)óš6à V7°C´ãÕôbS3lÅãü±A'0Í…§Í#BS1ÀîJ/£\f›ñ+klt›–ÏŠ M‹&EE„.<¶ë] -.Ū]ü¼Ú½aŸg“”7Nù2ÒˆMõpf¡²dnùãÉVË¢ Ç·?¶+8Ç–¸^<˜2Sö¯ñ~- ‹b7L¢):Cl#u'O<åø£º1œÉ<‹ZR¶bÂÊÜ$•0ÚŽêÈÙ$LÀN»©º6o‰‘õ¤PZÓ µå? À³)6 ôψôKre/¤ e!&ÆqÆ•8vãÑ”}~óér骆 âàEÉ%Ôë_?_ýëúÃõ’Ä®Hü—qùƒ½zóõæýÕ—T"Ú‡=ÙZk:5?ñ„öU(š‡¤Üfb¹Wùû¯Äøw‰¦Ôw£lˆÀ`Ê%NÁ¤‘òWK w=1¨Ø›*.)Ž²©qŒàÞw…Ky‡ö©÷èáqäÈ°Ðk^Õb©c[®ñ_%õ‰ иlîÀ=ïÀ Çaæ| ¢nŠÉøÈ7˜I›BãN6øwƒ'¨øo#Ø4®À¾±b£PŠujUä5 ÏÿÛk3˜•ÙºwW¼yû½¿ù´ø‡=ùCÚûÛß3Ž_äÚ½&-ë Ã߇r­å~SOê›wò#ÁY¼Þ*5¾¸ˆ:y7Ÿä Š 5ÿãaýpoÞ/†©;ÚÒ}^´œ ÜvUgëdTžo“ O©ÄóªÝ{iÉ!£ËÎ¥ìòªÖ®»TN~còç  "„ !†ç5ÿBx¾pÈ,qÃñ òäáf V},y›MéÈfH”,ñ¶Ìæ€õÁ\ lÆZ‰a7É2°‡@Œü â¹>eÑÐÉ&ËHHî*À{ƒêÀ¯ïÀ¹$>º¿V$^H§8Ç]Ln•©?×BÍ_*þ̱üv¤døß«çµUq[°"{áÿ ÀÀm_¿ öó -ÕÒ¿ÞB"€ìïüéíO¹Ÿl -endstream -endobj -3896 0 obj << -/Type /Page -/Contents 3897 0 R -/Resources 3895 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3882 0 R ->> endobj -3898 0 obj << -/D [3896 0 R /XYZ -16.307 900.716 null] ->> endobj -3899 0 obj << -/D [3896 0 R /XYZ 56.693 398.257 null] ->> endobj -3900 0 obj << -/D [3896 0 R /XYZ 56.693 372.418 null] ->> endobj -3901 0 obj << -/D [3896 0 R /XYZ 56.693 354.421 null] ->> endobj -3895 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F113 3713 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3904 0 obj << -/Length 2643 -/Filter /FlateDecode ->> -stream -xÚÍ[moãÆþî_A䋥洷ï$‹k^ÒÚ$M»@Ë¡Ç“V6aJTIÚÎõ×wö…’H‘¥5¯sµÜ™yfö…;8¸ pðîêííÕëïbK*ƒÛe )’a†XÜ.‚÷“ŸU¦’RMgTàÉßòJ•¶¸Ì [¨îÝËoóùÛ<°?þuóÃôÃí_ÍŒ a©ÝTŸ3UÞ+U•ú5p'AÜ%ÓÜ9°9 fÅ¡ãOŠa4ym„JÝóêÏ·Wÿ¹"@$ɘaLÄ4˜¯®ÞÀÁÞˆÇQðlZ®A0¢LB9 n®þq…*ÚO£ ¹SM"Bdò,­pwÕÃ,ßTi¾.Á‡ð€˜ãÉ»Ûï¿žÎ$”þYªâº´å“õc’Mg$‚ݽu³7³™-Ü«d¡Š.MîèŠ4OŠ1›<£x:ãt‡e6Ýr  Å„XåÓ]’¥Ÿö:š7¶z7¶æÈL›Ã®GÕ NGЕ™²´uߪ¹Z}ª™’8Žetšån˜-Ä×ìíЭZ/,ŠïUáÀÔ…-ÜÜÊùÂsZÝ»Ò}:¿ß54ìEâ\³#‚£˜E0n  "_.ÿ½JÖ;¹E”!Â|Û[›äΉR¨¥*œ,UÞ’óiJˆŸæeݯ¨\1_¶[˼¶Úú½q´¶g´ÜbFÁ£0#MìTi•)=¦RÍ5ü¬EˆÆ†úµ*æ~i÷æ$X %jZ9²d8Ù³ñS1åxòÊêè±L×w-½­“•º œAp"{–=ÆQ(ã³a×Á»m錩Êå0)ÃM…Qðªq aåï±´‹³eþXÌ•³ô"©” ²g‘?Ëâ·Æ²!ŸÀä—ª²Ò?ÄäyJ |¶oŒŠ¡rž¯«"Ï\¥ígkÕÚ8TGƒÚÚPUÁ¾HË&ÑUR<ØšÇ}~t`ˆÆ: Ð ÎçŽarÂÕ |–v–>è‘©ZH'â2ϲ\‡g‹xx§•½Î+U6©ê>©™Ñƒã….û®š:X&öñq•®ÓU’]ÛŸjJÄä×dµ1Æ$ÈÂzkDêÇ»ætËÒ@0X''˜îu=x¬d@QÅA¡‚åþüÞ Ö]{È€‚n¢c` ÝÚ—¾@D’6} xx4ˆÃþÚG¢˜ÆþÂÖKž¶BÐ/ÕbF°fâÖ’o\ÌÐÅ]` ?¿»jaoKêÿ8Ôž°ìŒ£p³« Î|/6;ˆâ Iâí©ÑÀ“˜ÉYЀ#Ac3u! ->Õ¦ÎIý4$xLÏùšäýá+j¯ëñX &œ"™ÕÇ÷xD`'IÆÓt“¾§ª}…í×uăù€Ye¥ªäbm‡AÇÓv“¾§¶}…í‹tåÙúqu`Ûð,ú»uM±D2êƒ Ð†éÇ.Å· éÑ0Ñ¤ï‰ _a{1;æ:‡Üä"†Ø÷üRD3»W ÑMúžˆö¶Ñ#¡?aüßý¤ŠæÖCŒ‚É_xB".càÕ¡T\ -ÓÛ+| §QOí¾g4Ô7é{¢Þ[ØÕõúƒ®¡;Ñ÷iá²ú16ðt+ɲ±–†Ÿ’R Än²Ùdé<é„%:“ŠÓà$v“88›ô=Áé+lÿ’†b„É°£ ¿E ¶›²Ñôݤï©o_a{¯2#\ßæò¡ÿr}S†±ÏЮLý]ЈÀ>>ã²Vëâ.Õé0q0£×Ç;7ª¾Â¿½‚þQ_5»Þ]ñrÃ*ÄYÏ(G!¬Xf„"F¥ßé ѬF÷Æ8–ìÇ?ô÷Ë^#¼KvwEý Hü£îeš¯oà×É_Ðâ\#ˆþa<é›æöé|ÁØÅ|[xè!¦¯©PØlwøV¹ëûúŽ>s9LP°÷í7Y²v«¨¥.GÕ×ÿÙ¤¬Ô¦<¨Û%ðÙ7É.u€ºô`UUjµ©\“º²,ÕêSæ(%&É - -‹´Q>[ïò|qm_ØPU¶šïG® £Éû¿¬wBv¤ -v;ßòtÑÄf00&mƒ±>ÁtÉÊÆ‘±¢tVü!.+íUןÛæä( -·©=:ÿÁ²ëÊÓ J†¤pHĶ@5çkKw~Ÿf ] M†Æó½¾v –wx·ÒÊI¡X'Z8m¸ÝV[D0€ð6³°bõŒV„ˆð¸k´F¦NQ¥Aœ~V.w„Ã$ -›æ³|ëÄ%“»©˜$éúUdÕª®MkÇ©‡Š>t;é ê ÷Ô£ ¿ê8RçªíåbíƧ§ñ:¬7VX'oèé›mBqùF jJ&Æu¡üѺ½f}m[íxÓ¢ žmNÔ”÷6z”ö§IDÒ ×ŽvåÆP)˜ˆm¶âD2FŽKM­/ KHXó-Øò25GUѨÄäÓA>¦÷§qd2µ:Rë0,iåðÌ:¾ãm3ë[jœuh˜R$LŒßOqrMÊz±RÇl—°ÖµË’²ª“÷ ˆS35¡mc(æ.šßN#  c^<Ù¹6æSºP¶Âä_™’Kì÷à„NÒeý^uú8L˜ÄíЃ´È˜,ÓL!µN j/:G¤¾¯Üp{àµÎ׳ÿª"w"Ø(õ¹Ãˆz¯æ;ùLÁ¦«fî'h¬Cl˜í"ØþÄM tJß%5Ìéq¸jxZW^9‡Í¢Œ/I+ÿ(Àh -endstream -endobj -3903 0 obj << -/Type /Page -/Contents 3904 0 R -/Resources 3902 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3882 0 R ->> endobj -3905 0 obj << -/D [3903 0 R /XYZ -11.232 900.716 null] ->> endobj -3906 0 obj << -/D [3903 0 R /XYZ 56.693 537.733 null] ->> endobj -3907 0 obj << -/D [3903 0 R /XYZ 65.161 539.193 null] ->> endobj -3908 0 obj << -/D [3903 0 R /XYZ 65.161 528.234 null] ->> endobj -3909 0 obj << -/D [3903 0 R /XYZ 65.161 517.275 null] ->> endobj -3910 0 obj << -/D [3903 0 R /XYZ 226.558 517.275 null] ->> endobj -3912 0 obj << -/D [3903 0 R /XYZ 65.161 506.316 null] ->> endobj -3913 0 obj << -/D [3903 0 R /XYZ 65.161 495.357 null] ->> endobj -3914 0 obj << -/D [3903 0 R /XYZ 65.161 484.398 null] ->> endobj -3915 0 obj << -/D [3903 0 R /XYZ 328.775 484.398 null] ->> endobj -3916 0 obj << -/D [3903 0 R /XYZ 65.161 473.44 null] ->> endobj -3917 0 obj << -/D [3903 0 R /XYZ 231.937 473.44 null] ->> endobj -3918 0 obj << -/D [3903 0 R /XYZ 65.161 462.481 null] ->> endobj -3919 0 obj << -/D [3903 0 R /XYZ 377.194 462.481 null] ->> endobj -3920 0 obj << -/D [3903 0 R /XYZ 65.161 451.522 null] ->> endobj -3921 0 obj << -/D [3903 0 R /XYZ 350.295 451.522 null] ->> endobj -3922 0 obj << -/D [3903 0 R /XYZ 65.161 440.563 null] ->> endobj -3923 0 obj << -/D [3903 0 R /XYZ 425.613 440.563 null] ->> endobj -3924 0 obj << -/D [3903 0 R /XYZ 65.161 429.604 null] ->> endobj -3925 0 obj << -/D [3903 0 R /XYZ 65.161 418.645 null] ->> endobj -3926 0 obj << -/D [3903 0 R /XYZ 65.161 407.686 null] ->> endobj -3927 0 obj << -/D [3903 0 R /XYZ 65.161 396.727 null] ->> endobj -3928 0 obj << -/D [3903 0 R /XYZ 65.161 385.768 null] ->> endobj -3929 0 obj << -/D [3903 0 R /XYZ 65.161 374.809 null] ->> endobj -3930 0 obj << -/D [3903 0 R /XYZ 65.161 363.85 null] ->> endobj -3931 0 obj << -/D [3903 0 R /XYZ 65.161 352.892 null] ->> endobj -3932 0 obj << -/D [3903 0 R /XYZ 65.161 341.933 null] ->> endobj -3933 0 obj << -/D [3903 0 R /XYZ 65.161 330.974 null] ->> endobj -3934 0 obj << -/D [3903 0 R /XYZ 65.161 320.015 null] ->> endobj -3902 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F4 3911 0 R /F52 695 0 R /F102 977 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3937 0 obj << -/Length 3059 -/Filter /FlateDecode ->> -stream -xÚÅiã¶õûü -O±æŠ’¨#E"W›b»A3“ Àf¥%z,D–\IÞÉä×÷=¾GJòhföHÚ/&Åë|¬nWÁêo_Þ\¼üV«\äI˜¬nv«$IºÊd$¢tuS®Þ¬0µÑ½¹Ú„*X¿nÓSw×vÔö<ùu[|Ù¶¿ÐÇ¿¯_]½½ù€ÙH)r¥è´ëá¾6ýÞ˜¡Çi€.W@O"„ø4ŽV%ò”áKÁ‰i¶~I ÜyñÍÍÅ.$œ¬äJ%"É£UšK‘áª8\¼y¬J˜ Dœg«;»ò°R2a”@¿^]_üë"x”Y*‚4_¥q.d2ß±Ý]Õ›€Lž¬·÷Ðfɺ4»+¬õ©x¹"՚狽)1YÊ|ƒ1M ´-b„)À|,°R†™4Å+ŒA6±[§-#…T‘[rÇ Ø–Ð‹¹6»åË3ùZBZp®Ý’•LE’%Þ¤µ}5T­»d;j.öÔ;ê[C—nÃéê±;½qØÎF*òlª“(ùÔ ü Ÿ(àœÇµ#\ꕦ/ºjë¾zhC¸}çCT®ÂÌIñ“E{€ÓË˼»a­<Â…¾¯Ê„qAI]“°èª"g¬¸õáf÷‹'o†‚àÃz¼’m`ÈáÆ#:=ïh¿EP.,ÚVî*Ó3ö§Þ“|¸3À‡_]ý‚öË|Æ8Xÿíõ¼ãõ77Wy¸Þ„ü}ýêšã¬ª€¿äAxþŸ_}µ<ÿ´= -f:òéDÓíeñ{@½—›ýþ&ûÄ–®1µ›ÐìaÈh£JtNUN:z¶ O! õ Ö³–mŽ"‡¨N~8g²ÏåL]m;ÝÝkž¼»SS P¨Ë—×_Sb*šüõ«Wn6’íƒ#pôß¡0WL”†¹‰^,§aF»^|pqÜþžº,§$^÷Ü:^°×¨$u>‰š¹"À@s:lMG}KÀID> ¼#æ\Ò[n¼Pj}Ý2ºÕ@Ó¨Œ”»eôuçQ¼3 è-ÄBÞ„±8lÌÑn ¾f~óÅ’ËOc‘eÞ=¿Ö6šTæ'&{Á¡C“øD€Åy‡RxÚ„É(H Û0 𠥕™°j0!Lly*˜´†æxÀˆ[1ªœu¤©o!Z¸¤ŸîÅ]Š'æÔ0bÓôð=X|ûš8y`qæËh¼ß?MQ³­ˆ¡guÚöˆP×Hb¦lN€Ã$$¿ -Ï„¿˜…ÊËÛÒŒ| ÒÈÂÌÍ3 ¥ˆéŽ}\Ý ŒòàîVoíf¶3ç#òcw¶‚fþ|ßùéŽùf¹Py>×¹ƒFHydó§0·™ÑRü¬D˜$ÏñrO9½?Q‘1óïö•nŽi›MåíìŽf­ƒYËÒËÌ…[=x37‚(L=Àe £ D8å5á@Ãs^ÃŒåuºxõ·ˆíЛzÇçS.?=jԢܷ’@dn¹:7Þ¸µ;¾Îßû< ½‰oZ²zyò¼â -êl33%Wpšê7=Ìnî ¼ñ=L¸‰v³ª9„Øòü²f…!Y‹”(;ÓHE r/Ü\e@†ó©>luŽÒ ^ˆ3ë¾râkòø­†1™Ö™líîyF¼kWÕF˜Ø`Ê@4XéãC0¶^•Bª?€ôž83BáÔ5‚Ì@åj®Eb)!ƒhR©ÄëøãŒÃŒ8õ)ö 'u†Î¬Ž‚ ]‰m\”Î2r‡Ë³$ö(ñX2zŠŸdÈF>0Ýa’ -•Ê9Ýs-П*ÉôL‹xp¦D³¢£âŠ„ͳfEG¾‰“a”Éy&A:ÖºðiJÕ<¿¡í ŸÇ!«DÈ4yгàú¼µ èDA -]°Hãx^IÌS,%úa,æ½dcÆ¡âqºö8:»•á'£-£ýn¨EŸ‚Ú¨¹pƒôKl«¾@lÞüµ¨5ÖÀˆšþBÍ%_ßË·OcçÈžD_ñg`7–b?†ES$˜Eê!½gBæEÙ%¿/wžEaA@éï«>-›lõf£@ãÞ@42<\YœR]ÎŽÍ<=DKı‡9‡û·Oæ a&ëvÎJšÑ¼¤ù¡¥K5–.Ñ9»,<²/Nâ8Õ£`´å…“YÅ¥K»ŽWºÄÉié’óëY ÀçîΓ__ºŒ.ij¬ÖŽ©yw•M¢ªÜéVKq€i&{žØ´=®’)>Øhºï,–„ú% •z@TC½mO¼…ч"†á° ‘pÆÕÚdÊ*‚g´Åé€"+é›ÓØ·5øHÔóú–ZLÊé™>&•R¤.ŒÇc9Gx1ym&¼T/±e÷€êöЀÂÛ²yú™ÎÔÚ¢i—uUؿDzJ(Il±ÚÎÏ_Í‚é«|p ƒ]*óòÚ؇Ÿ ü’#“Oƒý¿œÝr4ô9;°)‰P¶<ø„‰/D«%è?ºXì¨ä¹˜Ù)¬ }ÎË=ð!ñ9¨MÑ1Kº±Rd“âwœ¡øê”âyéyâµTŸR"Ÿ§> endobj -3938 0 obj << -/D [3936 0 R /XYZ -16.307 900.716 null] ->> endobj -3939 0 obj << -/D [3936 0 R /XYZ 56.693 408.219 null] ->> endobj -3940 0 obj << -/D [3936 0 R /XYZ 56.693 394.894 null] ->> endobj -3941 0 obj << -/D [3936 0 R /XYZ 56.693 380.946 null] ->> endobj -3942 0 obj << -/D [3936 0 R /XYZ 56.693 367.437 null] ->> endobj -3943 0 obj << -/D [3936 0 R /XYZ 56.693 353.051 null] ->> endobj -3944 0 obj << -/D [3936 0 R /XYZ 56.693 339.103 null] ->> endobj -3945 0 obj << -/D [3936 0 R /XYZ 56.693 325.156 null] ->> endobj -3946 0 obj << -/D [3936 0 R /XYZ 56.693 311.955 null] ->> endobj -3947 0 obj << -/D [3936 0 R /XYZ 56.693 220.986 null] ->> endobj -3948 0 obj << -/D [3936 0 R /XYZ 56.693 205.604 null] ->> endobj -3949 0 obj << -/D [3936 0 R /XYZ 56.693 191.656 null] ->> endobj -3950 0 obj << -/D [3936 0 R /XYZ 56.693 178.456 null] ->> endobj -3935 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3953 0 obj << -/Length 3991 -/Filter /FlateDecode ->> -stream -xÚ­Z_Ü6ßO1è/Q,ËÛ»‡$×^shÒ»föЈÇÖÌë±'–íöÓ)R¶gÖÓݶ÷°;²$S)’?RöW»•¿úçÕ«›«_Eþ*YÄ«›í*Dœ¬R©„JV7åêGï;]ëÜèëuùÞ»¶×†šÛ¶£F¿çÁ´Å«¶½¥‡ÞsýóÍ¿`™µ”"‹"¢ö¾¿¯µÙk݆Õå*…Õc…«‡°|ªÕ:YÂëKÅ$õ^Ð b|óêË›«Wèû+¹Šbgj•dRÄ~°*W?þì¯JD˜¥«;;󰊤/C»^½¿úÏ•Ï¢ð/ŠÄÑ3!ý˜˜ú)"Ë…{mõã:ò}ïÛ¡?ýõZù’„ £»OU¡yw‹¾—7%ô]^ŽýÒË;M¦½"ïŽ$k[ …ÈLàKĬI|ø‘ÿþ-ü—,Í9ãA("»©¸èCz2* æän.’“"g -bôf¯Ï•áÍÑã®k·¸‰í¢‰a(©Ï~’*Ä•ûÃg ˪HIä&kSäGýÖ¡·¹|Äí{í\ô]{` ïóþ”¿¦ííÁ\+8l™ŠNÏg^úØç›Z‹Sý®SÆ)L΂GNÁ;MêC^{쫶9±émÓwm]WÍîĈ¤Wëf×ï©$hûF 뫾æyǼëyíDbáÀ„±HGY‹›¯D,S«ñ Ìþ4jZJï5s¬KÇS×»ýÙÒŒov¸”„µCGø7¢ß K_ò_ìuͺHS‘dÁ©.P˜u$A -ùA÷º»Ž"ï\cA"üÌ©,zªÊT8© Ú¤2h˜£.ªí=i 'ñyönŠ¶ä‘ˆ‚½y±§ìœÇ|§¿Àf6+Pº«ÜvO…¨€}œñLˆ´´W]’ ?ž›µ©Uó^ú–íÁ‚Æ×7o¿YZ|ÊHÄAvª˜b?4·º{ -*R¦Ô….æ\]2ôE”Æ¿ÓÄ”T£¾°M^f8;mŒU vüäûœ8`€ž0ê0ôt·×–Bàít£»¼ߣ]‚ÖTh;vIkq4^ÐÚÇ¡Ò}}¿¨4"M¶¨5\ ´f%Œà?9ÕÉè#.©2ŒÀÓ;ÚVƒ¿ÁJ¢„L‚§© Í,xš•ÝX&CØŠ¾–‘÷ šO’Á@oѵƬ;½… Òh„ŠkHúëL¿®­ê?!]/†4ð:cÀ@j ²¥M‚DpÌŽ@ €LfÄŒ.ú¥è*°ÒQwÏ‘åX?>Ên5t^óÃ5"N2ÖX :Hg´ð´—Õ§'вü.cü‰:‘Á}ÓMeJöÞ!úyuzì•Ì½’¤#kq6î±è«>¯«_uùàÌe"žŒ_?8TÊOØ–Î6šÙ${šø ªFãÔ‘o$=Íkìm#õ궠},¬™Ó‹G=¼{ùöË HnbŒ4.Q5¦×yIhF¸ÜÀ>ob!qƳd. Ä8 -Ïv½tÂAy2›p@)ä¾zÓßéC‹‡ƒNHI@‚,æ˜ÚõÙd%ŒXà†6šìšc’c»û;­›E‡ Ž,Mæû,õvɤ% äÇ3Ä48܈D@ÄK™ò(Îç‡#x,é}~ ‘nwŸ/§†2ž­[”H Bìì!ÃÚ§¶*/¤©$—QrÆ;è¥×af)=Å‹+Ÿ¯9ªølñßs–o®A‰C׸íòe2Õ¶.Ç£}Èû~ÌOê. ê‚|/žðDÔËÅ“B]ëù]4S‹ƒçn -Š¡sF ^ÙÙ~ÁÂÂL=áäùB†#—°¥Zo²¥swQø -Щ”òiâÝv -+ý$†¸×”º#)'6–.qˆ‰iÀæpªëÊEÕ‡îcîÅUÞ«Ak¸_²ØX@ªä¦ÿmFÚAÔâß?«ÌÇ?[L³I¹{QAÞ WÁalÆ-MàjÜ.m>! ½9=íá¯F¡÷„ZVXž†b1H”µÊ¼6B’ÀEoè·™oâr´¼¦§ ÙéÀÄžñ¼Ž~?´÷l4yMíœÈžÛuîÖ®z} ÖzM!¤SG©MÑU.Ÿ‡]J©re_oè%0(Ã]ÝXôLÐyôÚPê³VI:WãXÞŒœ‰µRr¦ ¥Ð¶Z‹ aÀÚ%M1ôËu©ó#iªáÑ X.’EɈáÉIÉødÉ¢<¶^m=z¦èÔõUJ· r¹Õ®iÉ>,ÿ{í^aæõ yM B•?M˜vÊñ£g -ÅÙQ"^ØÏ€Ãë*t®à\m]ˆ55ýŸ¯áˆ³ÏK½Ü¡ -hrdnÔ êZêu3÷œz¦:k_Ðf‡œºzO”y 8¡o–Ѥˆr롤ý¤óryjËåDyV ·¬ÃED 96š—´Vguf}Ïk»JÀÊÉe&íÙ2NoóÕEäÍŽÛ)ñt5e¿(nìü`àÝZzF=Û¶ÁíNT ˜Z /¾cñŦ¨ -r ®ÓDAA þ‘ 9ðt"@ìÀòÔÐXà‹Më6ã^8ª­¹Ì¶°ÑdÈÆŽ1zk¡LaO’÷‚_›¸èà0³ŽI)ÖiØaÇqx1†‡"P£9c}|ûjÛ¶¶ñÝR´= -ãü©g)½ÙäÝÓHîf§¸Æ¿ -òvÁÍuƒ-[êqÁÃ&" ½¼°ØN Eº -ä‚X j[ 1ñǪ-[ˆ_Lý9ÖÓ|ïÕLDvX»{D:»1åYÒ8Ýðë¸ÂÈ‚O·ÄÜ ÑÔŠÇÅßÿ÷Ý·ÿ~ÿæ=“¦"¿îÀLãù W ?ª»¸¡Là¶ËÚb­žò>S'—`c*òìp¿ÄX€ÂÈ¡”š.b”+ècëÔ$EœCAùÔÝÌÐ#d?˜_Ó¼€¿`Ù)Àd7±¬@·Ý=7{rÖÆñe}*Þ~´†[kªüá$:û€3XÐ ‰¡&Ö#”½‚©ë±Àf)W<ãÃ’Áâ€s'2`ŸžN,‚Š²2Fñ¥ðêoø)X’ÝAŠWychü‚ÇNN’ßKYW$4R­@WÂ)Ö¸8N`ïÎó팢Á?hk;¡Œáœ*@NÖ˜–n‹HÝ‚ŸÀ±tK·4*Á”tVre=.| sºq%=• -åŸÁ -äÃríïðÑj%AŠWe6Ld.ù….€ldêÐÞäÅ­l`o‘UæO !©kKó¢l­Kkh0kÓ —Ú{u‘Û2î"yK¶]k$4­ €¡ «Áïü:| LLˆR:X4â.\Û†Šz’=E0Ý; §n|½àï6&†ÄiŒ8e‚æäž98#èjÇts½‡STp1`^˜*]?§LÛßO5ŽpÅk¾'Êñ:«³bé’—K™'Õɱ˜©m®É5‹ó‚f7FÑbü¶¥:ÿ°å¾Ni¡s¥ûó«îÚõ]U:úãÆ&o>nÌ?¹§Ÿ| Iœ{í7Ý8BÀŒ«ÜÒIù?šXÌ¡ÔJ ‚—üiBÌá-N.bÕ\ÌXºø8@²¼äú2Mðƒ+NˆXbÉ~—ËžÄEW®Ñô™E«øu¦ M>V©ÅxÑQÅ›_ŽL™ÁÅmI ±6úCÛ`˜øÐÀrEžÁMoa™L¸ú 7*ؼadsO½½•AËàz0W24FuvhLñ7_Ïy»öHž FmyD&Î$‡Ð\5vu¹¾–ž)öm[S×-¤­ûÙµ;êœß“ãÀ‡bèjÈèŒÖŠÓzO^ðûå!/¸‹ïuÒqì‡õ÷×!žýr„ØmÓD¼s÷ðý¾²_©À[3J$êš›îV‡OvWÉÀ^eÞê)ÛæÐqBÕÜÒ -øÙç#cï„~ ï– `_ìS] ŽèSªØ{ÙØ\1¥sk”û!WdUfÁŸ!:QYñÁñ Ëþ,«”£µ v.H¨¯‡`FÑåGjqZŸ*=3x£åþÜm£;X¯í¾¿·x­P¸¥7n2k‡¦C¾wƒîM§ó[³t^¸<ȸ'–˱Q YJø¨ÉÆ"=©ÄFÕ_!À -¤‡eÒP÷Ï—Wð}õØ -ÊŸß*M°ø¶ùw÷6«âê³*( ý|Ú3º2´Nbåò?n—úèB†%ÍÓ ú;ªú9à8I*/\ºH7v`’ã+ýÖzÛŸ]òuÕnß»p5ljž9ãžH÷¾¶u ’Ò!?aÃöV9rVÆ̶ø‹ÊØ1‡Ó0¤{òøD´–že|vчŠ²Ð½Ï™Š+[Uí`u!¹Öü6^VÛ»"ö«¶lä»êt8~©‡ü׿dñl–qÆ¢ŽÕÌÓ³«275ñ'8fƒ&%ä`ºuÛ÷Ô[3\á29üR™ÚÌ +&„™-&¸²•b\«YUfÂ@œ0pˆB¶ºx®D0PÜg íÇå +9åWË%®u˜Ò׬'>ב-.õ§/ç5^ÅŸš[VI¼7ÜË P±w%p7bqåñ½ibÓ±Ïm Ãü‰¿¨@M`ÎÏÏèR[;Q¢Íx¥¯Æ2ëɪ“à#Xo Ï8KÔT¸g¾·\s ‰<¨¿-}Þò‹æŸ¸Áa.„6¦ÀÓÒU•ôçW]¿ñçÒÞ¡/|HçÿÀ÷Ýÿoï<† -endstream -endobj -3952 0 obj << -/Type /Page -/Contents 3953 0 R -/Resources 3951 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3955 0 R ->> endobj -3954 0 obj << -/D [3952 0 R /XYZ -11.232 900.716 null] ->> endobj -3951 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3958 0 obj << -/Length 2388 -/Filter /FlateDecode ->> -stream -xÚµY[Û6~Ÿ_! ¬ ÄŒHŠº¤X`7›¦EKwÇÒ+Kô ;º¸"•÷×÷P$%K–Çãtöe†’HžÛw¾sHûÞç{?^½^_½|Ë|/AIHBo½õB‚ÂÈ‹1E4òÖ¹÷eñ_^ðTòåŠ0ñ±V\šá¶nÌ@ÝÚoêìu]ß™‡Ï×ï—¿®ß˜Æ(aÌìv­ö—·œ+©?ƒtìÅ =¤Zz⣀z+†’ÈÊǘÁŽQ¼xiþaê•W?¬¯~¿Â°¿ïa…(L¨%…>ñ²òê˯¾—Ã7ÐIìÝw3Ka¸ð®¯þså[Wø']âö„ýÐ(õ !¬ÓÂ-󾬘Êz‰Ùâ«þÃsc",vƒ]H¨Õîöyhø=ÈÂúb$ÖGanâ/¾O -Ž–«€2ˆÂ’°Åý2d‹ËõÉ¢Þ‚slc‘Pf¤¨[i¾dM-å -Äñ†W™¡-y¥¤Û¥*öÃ>N÷.˜8-¼ ) -Âd ¥†K½kˆÁNmOèì o¹ŽÁCš©Î(=MšÿÆI0ý§õ‡÷æ•<€e÷ÂìÔÏ/_è!µ{f|§Ü§ÔŽªÚª°d‹ýŽ7ÊLµ_µ§äHY¼¸áo`9hšC`i@!ÊÌͳ´•VCí¦ 9Ê' ÄN,¤ÿ½Úƒ&î…q8›UÞ–<…,Í£°)]¦•ìÒ.hƒÇ _ņ4€`öx*|䤠< k§D]™±!”é¨nŒuÿ“íæ–§¹}¡Ñ™#rÞÈ¿›WÂn`gâLMm°cždÝ6ïüÉkéñnæ *3ø*¤Ø|,ËbÚ*XìdOÁ@{êû.0Î5Õ‹Áë{ãT#¿µRõÔé^ªÚÅàn‰!žn5f™q~J7P˜úïºRM]ÜÃçVj'vi‰ Ò—%ˆ”6 Áë({fòãŠBâÖ¡ &h¢ "OCÅ[ñ`©±GÜà¡]‘f®¼ÜºÆù¦Ín­;v©óƽvWjWm¸vwž;)®î9·Ø†Tlt{‰‡ J Öhƒ}mØbL!xjö;ªwuQ%ÆÏø¶"°Ud÷2€Œ#ˆ¡[  ª4£¢ÎÒBü‘Úl7²ÝíêF™“:0x«½–6R˜GÍ@E†cà¹ü¿UjF?»•°m—ÓFh•›(wͨh="W9ý?¿F[mÀ;ßÿ™šÿñÇ™Z‚#äÓØa*ß¼:QLQŒ'ÅD#Ÿ%‹O:t†šˆ«~¤4[GÀk]fG†ßàSjþ•¢ªí²Í’@Âܬty}0¯Ú]Übv~ìöäfÐÅÙ7cB«ËÚM)SÑkbÙ,²š„ #G»Ùª4R-²úˆ"7oyÓÔ),B4H¦üÒUŸ8Yt%#7cÛ˜ jëÚ¼~—ê½M}0olIà•´I»¸6k7Ü<ÿ–6۸ݙÿ÷BÝšYðª©;Sa™y¤h¤jÚLµM×¹¼ä@jEiÅx'¶»VFÇJ/³Â,ô’¸ìJù À®¡Úg~Oš€k É®vkB¨ò1Õ~HÛF¨?ÌÃ;žV²®&½-„2ðmbH%n š¦ƒ ~GÖ*?V  ËE\CžÈ5þS¸ÆÕõæ°…UV´¹£YY—öý–§:Pö½î xáúpoÖiSì'zûéåÏoÞšqݪ]«¦îNÍ¿ª-7Ü.êÚUMÌ&ý'ÚÜ@&ʈtˆPB©± ÁÌO“ -d'85øäñúóaÂt)µ‚&`ÀŒn—„s„KªT#Œ¾Š¯$4Š“:èÛxæ„ð¯¡, {èP U¸w­Så‚P¦ÍÇ‹aAªu–SggÐ[Ôåxý EÙ“­úVÎ`!-¹ÒÔLOˆ±¾ÇØÔùIðAú'èJa›P” ‡ -mÉܾ!Š£h´-4d§7)Âq_^\ûcͤ1 -8¡› ±EÛ¢¾G‡PÁ#Š—С(>×"Ái-¤ìT‹íœã‹?‡²x%ògGßqŽäû½QpvÚȱSõ\›ÂF§\€™3y&”m¡Ä®˜;¤bá¥+€+4·sGlŠ¢¤‰«áß–UŤOLh‹±Ù<…Á1‚ÅýªmýJËo-qL9â´+åà4w`©…nFÇÞƒB<9!ŸœŽQ€z«þ 6µëk‹¹T„!<ÀÜ\šè¢Ù§ÉVÜ@íŸ6*‡[®pB<Ÿ†‰™*{›6yV÷i=-³×¡îà.{(+¡Šiq>ÉëšØ'¹T€º=Îä_@º8•ǧà‘ˆýu~;GÃJýWEº‡nk.ôÔßž6þñÝÌ~ 4ýõ\Ú‚gîððaò~7 Òç~^bŒI>î Ù%µè‰ŒùŠšV8ŽÏEmª ¹ê±2þö•7›ZÎ¥aÀ#½!}ã4¾t«êQs%%ŸSÊÚ]¹ëÚ©º´&ÑÅt=ÅØéúž¸£¹sF9ðs ¦ds‘’¤0”>‚œÀi/É5ÃÖ³B= °)…Rý­Ðþ±ß/dvËËôå›õ›#Ì_œé8—€HÍ¡ƒŸñM?¤sw ›e|]ËØù àg -yBP,½pçš*;¸Õœ¹}¦øðYL“‹âªÓ,_BcKƒ3Ž „j†.g~D“BØ{P -è~¸ä™:ÕŸ>âÇ)ÀÇT2ö¦;5Îÿ²ƒ©üäplç˜;F,ŠMƒcšß3Òv@õîR☨ŒaÑ·µ>îÚ•ë?üIÿß]ÊLN4DQܧ_UW7Mº»Љ¢4/ë -Ú?hLÎÔ¤r&Áç¸t¨ÊS1祬(…f' Æ7c£Ø;÷¨€\ð³Î_i]ôÕÆ&mV÷"W·36À)9 ñ‘£ÆH]t]ðJíwsœÈBD†;ð^Æ¥ì/éDe.'‡ÆþሒxbÂŒ4( !;ñ#ÉÜoÕÀØ>ôèßðSõŸ1C'ß -endstream -endobj -3957 0 obj << -/Type /Page -/Contents 3958 0 R -/Resources 3956 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3955 0 R ->> endobj -3959 0 obj << -/D [3957 0 R /XYZ -16.307 900.716 null] ->> endobj -618 0 obj << -/D [3957 0 R /XYZ 56.693 656.223 null] ->> endobj -3960 0 obj << -/D [3957 0 R /XYZ 56.693 619.227 null] ->> endobj -622 0 obj << -/D [3957 0 R /XYZ 56.693 552.466 null] ->> endobj -3961 0 obj << -/D [3957 0 R /XYZ 56.693 515.47 null] ->> endobj -3962 0 obj << -/D [3957 0 R /XYZ 72.912 483.808 null] ->> endobj -3956 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3966 0 obj << -/Length 2440 -/Filter /FlateDecode ->> -stream -xÚ­YKsÜ6¾ëW°| g׃|Ó{r¼²ã-{ã]Mm¥ÊÉä`4,‘Cr$+¿>Ýh€1%Y®½ ènôãënŒç\;žóîâ§ÝÅo#ÏÉXû±³;8±ÏâÄIyÀ‚ÄÙíÏîe%E/7[?òÜ«Aö4<¨ŽÃÑ|ü§*~Rê†&¿^}Øü¾û°Ùrβ("jWÃ}%û£”CŸ;wRàÈ=öI8Ûˆe‰áÏy “Ôý‘ÜqçÅåîâ ô=‡;QÌâ,p’Œ³Øó¢¾øü»çìáHÀÂ,uîôÊÚ‰¸Çü †qå\]üçÂ3ªðT‰¥fŒ{1 õ›ïGZ -»Íù¼<Ï}»á‘«“$î òJk+‰Ý»r8ÒÛŸw?ШÝÍ©¥ï äZ6Cÿ¦ièŠý^îéKj[Õ ´•®Õiµ…(¡¢¥È¡eÛçµÙÆ M~]¨ÊîXš9aíŽOï_‰µ)©†®Ì7¾çž¹íÑZzA#jKÓã çIÎ}ð˜Q}tÖvª•ÝPnµ'lCŸ3/áK‡ýŠx`£$¶´^®ñ‹˜q»¢l@/µ¨–\×)û`Eþ ÚDó[(ó”ÑŒ²V˜hVÕ僶ÂpÉ£UÅZ°|Ù\¯ÐÏÀdaj·°ÍÔí¾®z…ŒüÉcøÜc|¦0@Ûj3iÊB If0=Ⱥ­wʶsâ=$ø㺉X2yÇJá ãi´B;¯Tqó‡0e^4 -¦µçŽb0#‘÷{hZˆ†¹¤g ç—õ†»…rÏŒª"6M—ktguÃIç h´ãB5ƒ(4®ž«¦º_‰ež†,ŠG7Ö¢Ðyáýý …‘CVh†œE^0’ÌÕþ~…*DFÙE¯VÀÓ n»l ’ÛÀK}PhÆ¢àq,}mµ»Üø‘{‡“ÈmE'jpÕn͇²”¥“ïÛ£l`-»•].†²fŶ°{Õ‹¢”?jöîXGbJþ¢ô­,Êýy;ÓÅÅҟƽð–U ÞÕHšä744¤!oÅ©#ÇóÁ3ÈÀ Ç+a]$î-&sz#›Mè¹·e§E"ùݱìiÖ™ÔÂáT³Äz?>O=ªGƒ2$‘É—A6öýÑ,JQÑ2Rô;¢<ÓÎô' -šhï'­( iƒ ç5C£š­ÖF“ 7Ütî\kqj\‹‹o­øOD&/Ë?å¾*ûU"—3I{-(­õ†`’Ç=dùb(UCS­3xî˺÷Av`;zE©·ª¤™÷÷u®*4kæÂ×€ˆ6Ò0®¡ÍB¨@¹Ö èwöÍŒ°v4•&…Â'#¾´ØU× Èœ Ðå÷ôÜËÆžªá1£œáûB½S{~fÛ ã鳌 ÙÚŸ‰¿R¢!x6YƒÿˆÍ -É7Tâ›X1†À ß®~µðé)1q(}fõCBí,‚öjn}l*Í-'ÍD·Ñ½ë›4FïtÈjàóM3ªW¶­µ5lCŠƒÝz"õƬ4t ` /ɼؤêriP;"T@Æg¢–FÈ»£lÐàA6­•˜è¾Ü€Áôr­iÕ¸y+;DÂ8âô(ZjÁC:F¦˜Oqšë‹sAÇÝÓˆîŒqÑ‹Ë/R+«(!²^Ðge(½x BDãô£"µÒÎ÷t5ª{@Ä8îšÝ¦ò4¬tÒÄvjìÕh¤s'¨5E½«^š¡ZœÜ”N£±Öêc,öh%xà™ñ7Áÿ•9Æ+¼Å‹ î™uÁ„+7ÉÇž½Ä·‚n=p,è#EkWš$ À¶¼°»½ÎÍ|¢ O:QšÒ)¾èË Ï–'š²†þN †V¡öf¹åÒvà†Ö@= þAWŽM’sÌ“5 -ŠìïO¨°øú:—Þ¡§«îFtÐÀ˜w6Ûn¦v‹!/þFOÅþnJ^Y¿0–ü].®åÒ[°þ[iïGPú„Œ >*'®»MIú×gµ~æÀgUŒŽ‚Ì\vÁ ‚ÎܦdË?Ezz§…Zƒô0bÓ=d¡êV5X? å`ê…ϧ!ãI¸¼<ʦ‚ïì߃˜¥Iúñ§îÉhÆ´ðÕÿ<Ä·Ÿñ7ą̊üƒAnÿI€ÿôY„¿­ëÌ%ú¨íµÿëBzÎì{þ®û ‘óc— -endstream -endobj -3965 0 obj << -/Type /Page -/Contents 3966 0 R -/Resources 3964 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3955 0 R ->> endobj -3967 0 obj << -/D [3965 0 R /XYZ -11.232 900.716 null] ->> endobj -3968 0 obj << -/D [3965 0 R /XYZ 89.4 594.066 null] ->> endobj -3969 0 obj << -/D [3965 0 R /XYZ 93.036 486.04 null] ->> endobj -626 0 obj << -/D [3965 0 R /XYZ 56.693 444.326 null] ->> endobj -3970 0 obj << -/D [3965 0 R /XYZ 56.693 407.724 null] ->> endobj -630 0 obj << -/D [3965 0 R /XYZ 56.693 377.394 null] ->> endobj -3971 0 obj << -/D [3965 0 R /XYZ 56.693 340.793 null] ->> endobj -3972 0 obj << -/D [3965 0 R /XYZ 72.912 292.384 null] ->> endobj -3964 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R /F108 3706 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -3976 0 obj << -/Length 3159 -/Filter /FlateDecode ->> -stream -xÚí\[sÛ¶~÷¯Ðä%ÒL7^rÚÎ8—6é8MNä9ÉLÓš‚-6©’TdŸ_Ò"EÑdhö´¼Ø ì.v¿],°­ÉõÄšütòìâäôGnM<äÙÄž\\Ml‚lgâbŠ¨3¹XN~¾‘ð31›nMIr‘éæU’êF¾2_$Á³$ù¬>.Îg¿]ü læ#sMm‘ßF"[ ‘gò3pǸÛTrgÀÞat2çÈs Œ è¸ÓSý [ŽÐH–²%_-õ¨d›o¶¹¦¸ÍJb ÿ&‰¥›SëŽã:I…þ¼çðÄ6O -‡‡ïÆáÉ=Oôºª†ü¼g+=T#3q&qVÕ‘‹˜íV¡Ô'HÔÌ9wÄŠŠYÞ(›ž©Ÿ¿¦eœIÙ¦?©÷/•Å­ß‹ìð»ÕâïÅ&òƒ2œCˆYžÆÛµHÃ`V„ÁÔdÜíÌE Îp[ÌíÎq+Ó“xþè.¿l*7Zì;ÓÏ Ú'”~6sèô?3P÷™Ô:7Jþ¨~¡Ú/ £ÀÏ…zóZµßVÞ·8ºn·õV9HÂíåAîÖHf$úb$…—éÉ饻 ƒg6„1™K•1<-gHNÇ™¾Î5R†e¦…*åãSqt£ßjËÊ–rIùu?<(îêó¤T'XbÔÊ@ ††!f:hbÔ‰mÅë`-ÌÃ`ùi$±ˆ¹T\m#Ý6‘Z•hϯ.Þœ›–ˆ6º¥Q 3@+CjF¿Ü¦ÉFøæé}ëk_‡R¢2H–ÂI“µn½Kâ|›&þu´—úÁ/ôHÃKéNÛ\'·õ¿H'›wA²^oãÒ /ÍïäR©¯ÛgÏLZ´Ø‰¥ˆ÷üqÄ]¬]È9f Â§U0zï¸Id\³Ä£&¼¾ñ?Ï°ŒÚÙ·i™‹ùym&:²i #›¿ûé]R™®Zcûƒ»uØC©F-ÖóƒX¯™²‡FÊÛd›6e°I°ÀÛ`·ÛÕû£–Þ´Gç$½®÷>ÅžçµHcêr•!Ç{_¤~œÁ*µ®yÔ-DQU%"ã!¶JbËÚ±ÔÈ8fƒóE¤r?@ácX?ÿÐQÓh„Òñ4]¥?LÓCemÑ«k!Jðìp­ê •`ÝÐonCJ°Ju1w´x²L‚K™Kuä7¾=Fŵå©=R˜jA &hélÓTî«»Xåëh%÷JMC>¼’ó½’ø'‹Y¦“»×ÉAì.·œwtK€¼å°ñܲJ˜[–µK$਄3Q›he3ê…žG§]c%çc>žQªô‡e¨¬-±’»ˆYôc¥)vŠ•k‘¯’e¿h¹ŽŽä"ǘˆ8H–²ŽÒƒÍ‡×¿¼xûaQ¢ -A÷°“G‡qªYœ|=’C˜Ûã!¹J’‡ÊÚ‚d±™±F²:¶êdYè ãžïŒïcërÐÇÇ_þÇ~øît<Ãˮȧzg>ò«ô‡!¨¬-ȧ6b.ÿû ?XmãÏú$¸ë&÷pAùæ)}<…èâÈhžR¥?ÌS†ÊÚâ)âsbÿ}<%SÇ Ýaw4Õ}L*6©È _Ñ%øÑ&>_´ð×q¬«2£¹J•þ0W*ëÑ¢7Å q»(zŸŽ\õîaðd²wbðç÷^ö3†"AŒš2ÒëxÆÔé›5MŠÃBÊhy”ÌXq~ /›µ=®òSS;((´Ó‡Ûó#§ÛÛˆzåu¡ê) d–Ýf¹Xk6òÄ7•'«ê‹ºû$åIï!1d[å `¬Q¼ó£l…TÐAí‡î˜[ȦüîÞ•:íb²¨çâêiWyÀ©Ï+}yq®›±‰ð¦x´Ã-b[à>ãU¦kô¹úpY;fŒó›"ÎMaúwÿ‹_?á•‘ÿ¦¬£™‡(¯,]£?LÍCe=ž|€#!»R8lŠ/Že®mçEÚUSÐï[’…dݧ¬‚CŸŠsÏÜ¥pຈòñê­5úÃð6XÖnÍ0²)ã}Û„A4¢åÕ,²‚¾†'¬•ãÕtkô‡~°¬= Oa±viq!f©o«w-²×Š­Ç ¹·Ç³»EüVfˆYöŸ’ÊÐÍLÐ~›ÊðIíÖ–¹‹e®ùêëmàäæéQ*Š¿§ØÉ´1I£å#Ó±ü‹šlU^û1—º!ƒ4ô“M~w»ë6Ù>–T"C2¿Ý„E·{üââi~p1î>Íb?k¼| »ìØxùVþ ÿ.kwÿÄòO–èC¥[’pꎷüÕèÓòPY§[Ø… çào ×ø k22Þº[£? qCemAœí!“û'}üfÀÜÞ{㧙H³#^$Áv-âüÙVþuBú£äIz{PÔëu­…¿ñƒUŸ[(7"•¥Ñ}ÀïþMó±ZíÊ…M5ãcÜùÀœ#fw([£?Ì%ËÚãÎæ.r¸Yìš÷¨‰1Ä­ñkô‡i¨¬-‰9Èñøß/ -Î>¾SƒþÁ¡¨ÛÌÀ(…=ÌxG5úÃ|a¨¬-¾@mȵíÿ·/äÇ.S£°¿ÆþJužÃ‰<¼ AÜ︮F¼ËÚcOI`ó^üÿŒb±cµiÍîòÃÌ>PÒ– †ò°{oP»éVÁ{íì)S‘%Ñ—^7ò$‰ú¬Íï Øú|sþ^øËf}!ié’Ãh˜¬ÒÊ¡²¶ Ò¢ŠÌ}¨¼ý†Ê?•®®JŒÊ*ùA˜*éqHzô^4¦ßÐØÔÿ¹ŸûQrý¾™SO(:zï?«äAq°¤Ý35— ‹áÈáœÃ‘có<›;øÿnÌB–í}Í¿wûäZxr -endstream -endobj -3975 0 obj << -/Type /Page -/Contents 3976 0 R -/Resources 3974 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3955 0 R -/Annots [ 3963 0 R 3973 0 R ] ->> endobj -3963 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [381.086 698.453 395.81 709.357] -/A << /S /GoTo /D (V1671_FO) >> ->> endobj -3973 0 obj << -/Type /Annot -/Subtype /Link -/Border[0 0 0]/H/I/C[1 0 0] -/Rect [483.555 619.791 567.925 630.695] -/A << /S /GoTo /D (V1671_EXT) >> ->> endobj -3977 0 obj << -/D [3975 0 R /XYZ -16.307 900.716 null] ->> endobj -3978 0 obj << -/D [3975 0 R /XYZ 89.4 725.356 null] ->> endobj -3979 0 obj << -/D [3975 0 R /XYZ 115.223 646.694 null] ->> endobj -3980 0 obj << -/D [3975 0 R /XYZ 108.398 587.239 null] ->> endobj -3981 0 obj << -/D [3975 0 R /XYZ 158.958 539.74 null] ->> endobj -3982 0 obj << -/D [3975 0 R /XYZ 56.693 470.78 null] ->> endobj -3983 0 obj << -/D [3975 0 R /XYZ 56.693 453.501 null] ->> endobj -3984 0 obj << -/D [3975 0 R /XYZ 56.693 422.697 null] ->> endobj -3985 0 obj << -/D [3975 0 R /XYZ 87.079 424.156 null] ->> endobj -3986 0 obj << -/D [3975 0 R /XYZ 87.079 413.197 null] ->> endobj -3987 0 obj << -/D [3975 0 R /XYZ 87.079 402.238 null] ->> endobj -3988 0 obj << -/D [3975 0 R /XYZ 87.079 391.279 null] ->> endobj -3989 0 obj << -/D [3975 0 R /XYZ 87.079 369.362 null] ->> endobj -3990 0 obj << -/D [3975 0 R /XYZ 87.079 358.403 null] ->> endobj -3991 0 obj << -/D [3975 0 R /XYZ 87.079 347.444 null] ->> endobj -3992 0 obj << -/D [3975 0 R /XYZ 87.079 336.485 null] ->> endobj -3993 0 obj << -/D [3975 0 R /XYZ 87.079 325.526 null] ->> endobj -3994 0 obj << -/D [3975 0 R /XYZ 56.693 273.059 null] ->> endobj -3995 0 obj << -/D [3975 0 R /XYZ 87.079 274.518 null] ->> endobj -3996 0 obj << -/D [3975 0 R /XYZ 87.079 263.559 null] ->> endobj -3997 0 obj << -/D [3975 0 R /XYZ 87.079 252.6 null] ->> endobj -3998 0 obj << -/D [3975 0 R /XYZ 87.079 241.642 null] ->> endobj -3999 0 obj << -/D [3975 0 R /XYZ 56.693 201.13 null] ->> endobj -4000 0 obj << -/D [3975 0 R /XYZ 87.079 202.589 null] ->> endobj -4001 0 obj << -/D [3975 0 R /XYZ 87.079 191.63 null] ->> endobj -4002 0 obj << -/D [3975 0 R /XYZ 87.079 180.671 null] ->> endobj -4003 0 obj << -/D [3975 0 R /XYZ 87.079 158.753 null] ->> endobj -4004 0 obj << -/D [3975 0 R /XYZ 87.079 147.795 null] ->> endobj -4005 0 obj << -/D [3975 0 R /XYZ 87.079 136.836 null] ->> endobj -4006 0 obj << -/D [3975 0 R /XYZ 87.079 125.877 null] ->> endobj -4007 0 obj << -/D [3975 0 R /XYZ 87.079 114.918 null] ->> endobj -4008 0 obj << -/D [3975 0 R /XYZ 87.079 103.959 null] ->> endobj -4009 0 obj << -/D [3975 0 R /XYZ 87.079 93 null] ->> endobj -3974 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F95 923 0 R /F98 924 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4012 0 obj << -/Length 2601 -/Filter /FlateDecode ->> -stream -xÚÕYYsÛ8~÷¯`å%TÕx3•ÙªLÆÙÍV6S{j¦*3I܇ {ý6.¬È~Û›q4úøúëöööþ~õÓÝÕõ»{9Ê“ ñîv^ $õ2¢0õî -ï³ÿ‰UŒ -¶Z1ö?òž ý¸ã~èæãÏ|ûç_ôËï·VÞýŽY‚ò8Ö»ÝöÆz!?ÃéÄËàô$”§Gp|…Þ:FyjÎ'$ƒÓÌ¿ÖÿHÈ•W7wW]Ø{Ä‹”ä¡—æ%8ð¶õÕç?±WÀ7Eyæ}S3k/&aÏ•w{õï+lTUI–"œæ^åˆàD õ¾Y­CùÞäSìoAGâxFäà‹úAŒF÷¢z¡—ýqP1ý,|¨ -=cƨ~*Ƕƒèy]þ—ö%7§WôuæxÞô´lÊf¯?"¿¥­YÏ:¡'Âq« ö¿é¯eã2’èY«­ ¥k«obf LÏQ -WÓÿ‚x9íó:ÆØ¿¥÷RR¹[ÁÑ÷=k/^ÉÃ1xVÍåøWù‡zælQæZkœ¯ãµ~êæîÙÒíºg aÀšG”KsÂ]à ‘8ÓŸŠN0Æ3¯—.1ðñ®sMƒ Ea~^#o´˜ÍPo˜‰¾Óÿ˺å]O›^¿nVö‡½~‘îr¯”$Žì/³Ä›¢Xè×­Ùçì|ÓÐM{«X†É*–#Ë!„¢Œ3µ¾ØìøjÀŠ^.X+ ˆ‹`ËPœdvoƒ-£8´SXÓwý¦rìÅ(r;±4^õî£ø¡o‡þȽIŽÁ5’'kU ­4ß„Œ§bgÂ8²Òt¼b?Š¾ã°§’'àqIþ-ÔíŠR<¢…ðIJ0˜î©JÀ©ß0ƒ,Îô 08â:Ï.·pl¥;<´ÖО¡¯¬ÛÐÕŽûä9Âáè!ýöú -môÉDåÀ ´`™ßs=Ò™£ F^”MϪªÜƒ½ÐCß:Ú¶ -GÕÄÕe„R_X³Š°ÿµÖ°ú82× j s™Òbp^‹ŸX[Ñ­õ&ZU‹'ȲÀ^üußÿíõ5üq¨(Æ(Ç“ûh«¿•6ê–±*q\ðzË ›«çPo ‹$‹åí6{7R$@6F¤ EÍ´+Ê-z 'ŽPŠÓÑ *pÃH¸Ñ£þWÃ=L˜rKY¨QHQî¤ÓîXÇ,ô*Ê~J6Ú³àá@%*kWxt¹‘œVVãpç 1A8 /ÓÜϬíØnW®Üýëƒ3¬0àG>ƈ8ÐâlH¥)ʣѳ¦ˆ5É'ƃM°oooMºj€$Ð>’ã«¥91.ºÙo2ÖX¡éÀÝ*@zëòü ØxŽí4è—}Å\à áè׎ý€d¦³Ý¸® 81pÑ1(hãr]’¢hr]Ø«º– ×v@Q³l‘ä¥EKÍ“ -Mx"þvE€Ú ¡ß¾J£Õ sÿ:ÊAO‡Rè%5ý²‚ÌÌ,{= ˆr£ù¥u’$¢fèÀ”HEp,éß 4üM4š}ÆfÌìòöEVÿÕêgi”}V¥ÆkVÞŒ'ŽlÊ/ÅSæÝ\—.<ÉPr’%U|! !(/.Cx“'Ã(œÈ‚|QeTE’Á«„¢M_Zb°ô·f:jéæLÚ—êœÒ$קí;®K¿–=­Ê­>ßíàiŒ¢IwãyŠÉ)órëâ¥K£àR˜$ÇÈéàÈ18ò[¨Y`Êêeóà³<™s!KtÖÚ¡06îkj3Ôv¼¥{ÀK´Ó;HD™/ï­M¼¥q‚Äo¸zˆý‚o™å•¨ðá™&VäXñG|8ܼ ¨ýX-ï&þoÒ¶%äuõ©àzµÎCê$ÃÅõ¸Ä\Èg©çäL®çѢЂ×LA ªÙ•·6×ZDóçp±õÖèœ*|P®ÝÎRÝXÔV±oØXië1é!&6E5b„­``ĦY¨Ãà³LωcÐkŒ­ ±V– ¤‹)T•u %v]9ƒ#Ä s›Ô²’eb-ØN+ª~VoºÂ1Ž7†#Á®ÃCL¸vtlƒ»ÄN¾ƒ¦AÞS!íÆdô«÷oïÞ|øàJ -§‹Ì•*í¢ ¯²ívè'<œÏáÐèkÄ<`ã´â{‰7 -œ”ÅÅÙãðÀlÇå³ÅWï9¯\ -4!LG%Ô=g—ôË ™$(ÈQÛ,¹¨m– òÜ6ûhZ¥hƒ„2Õà¯6ÔÉú—=(Ú÷]i†í£Oµ(íØqtêK=Xt3àö¾ÙVƒ­i°·Lë©ã& ¹WÞ\ÖÒè3o?©OöÉæÝ…½ ¥¥ŽÛò›0¿غ\, ó¨ -µÞð^[6O½$)8£ýÐK šNç¡™E@™NÎyŸ|9ÿÌ#>:¹ÌBj{•e'í¬„k} ÿÀ©ÓgÈø¦¸<)ÉÐ Gœ¸‡,ò^–S µIi¦ŠóFX“ UmN}Éì—ü8Z>Yþz$¡Ö:ŒO -€—ÉW`†µŒ[·yå쑨No6«"!ñ"µAõÀ ¯t%º WeVþàÚ=†½‰{ïb‡vÝ;+¦EYúÝG«ê f‹¡’+¬_ÐÿÍà< -Šªø;á8]”j€¼UHH°¿Öl]EÀ¥’ðÉûŸ¥žY2GÜïoÙÊ6Q‡d·kh¥µÿˆÒƒ4˜¨5ÔT™Ë”ï'¶$HTשS÷U¯­AÐĆŸLöq¼T?£ÛƒÍµ‹¶ÚÆ5ïÆ8ƒÁZ\§¼I·i$º‘übÚ´Ôð¦|ržÐîÁQýCËÜ5K\=ÁÜ4-‚|z0ª6RÃÇ KYwƒîq«w=uúÑ°éQs@¨¤4 ½«…Ó,?¦²3ÙΘšE¢’LhÛȪûe£à`í˜èâþo;(à™j#Ë×Ê¿²­ÌVnU«MÎœÿÜzÚVSä> Üžw¥]&Y‹œ.û—¥jè%$ôßÉiª Ÿ¡ªgÐJ ÔÅÕzÚU%î,Ûi2ÝE5«åƒêÙ†¶ª•#ÖXŽ_|ÏþJîrâ7²ýóÝÂÆtç–þìúéj(œäÏùåþ@[U« -endstream -endobj -4011 0 obj << -/Type /Page -/Contents 4012 0 R -/Resources 4010 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 3955 0 R ->> endobj -4013 0 obj << -/D [4011 0 R /XYZ -11.232 900.716 null] ->> endobj -634 0 obj << -/D [4011 0 R /XYZ 56.693 700.821 null] ->> endobj -4014 0 obj << -/D [4011 0 R /XYZ 56.693 664.356 null] ->> endobj -638 0 obj << -/D [4011 0 R /XYZ 56.693 288.073 null] ->> endobj -4015 0 obj << -/D [4011 0 R /XYZ 56.693 251.609 null] ->> endobj -4010 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F102 977 0 R /F57 739 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4018 0 obj << -/Length 3207 -/Filter /FlateDecode ->> -stream -xÚ­ZK“㶾ϯÐ-šªL|ú;qì”íM²sH•í%B½Aó‘™ñ¯O7º‘wwfíh4ýøºÁ`sÚ›Ü}õp÷Å7q°ÉEž„Éæá¸IB‘¤›L*¡ÒÍC¹ùiû]ë¢×÷»0¶?šA÷Ô<šŽÙ_þ;2æ=uþûîûû_þ Ëì¤yµwÃs­û³ÖC¯au¹É`õDáê,ŸFj³‹EžòúRæ@1Ͷ_ÐC† μûûÃÝow蹉‘äj“æR$A¸9\î~ú%Ø”ð8Qžmí——M,ªÚõæÝÝ¿ïEðA‘8ÚQ.dS?‡al¹pÓ6?íâ Øþµ,u‰|FÛF߇ñö‘v))»Íˆ)fQó,­^†Ê4¢S{]‹Kñ$JÝgÑ”¥"Ïr7¹-ºâ¢ÝÑ¢ƒÁg¼Æ®¡sD6Ž4ÌK1ƒãe¯»ª9Q6ıý´ Ñƒî†¢â–'q¿SY´}8W=¶º»TtœpÖy"TÏýÙŒ¬*†ž´4µ/ůN“®ìA§¶òûß½Œ·ºf+šÒ½,îÀß2ªy1±!t)槸ËD”d¸ ‘fÑKÎzåxU*béOèhÌЀو^·ø.u'Ú΀ԆJ÷k'œ(‘e±›_ CWíq·ã Ýþ†¹<Á/Å°0Ǻjü÷¨&µýœXbiT,©”aÐ,a3í8,ÅRDAÄR/2¥²‰š®È+“"μ9T—“軃h‹UýO@ýCé…Óý)ì@ÿá ¢tpôÛ‡¾§ MC°OœJ·ÝŽÓt[3Ûzé¶r‹¹}¥¼D¶}<ÃDÏ:f·@ »©uð̶I€›ÙÊI7ÎÊÃþyqª½w  7¬‹Ã™ÏóRœøkä¾ÖXÉw*Þ¡A'œËm×{w>?Y ;K"o -UcµÖ¿…uy·ƒ(aìíàͪ'IxCý©¸´°éW¹ÈÒO—KêÇê4v–øŽNQ幈ãp~Š^œCç×u½_[a ”"‹³%C±ÿäîBˆU2Y¬Ò›¥¦ô£kA¿èƹç–õçP°oØ멧ñêY5eeÕ¾*Ç¢®YY«#»y­Ë[+ó©|±Y• 4C/Ń¹´¦öÅϪ9Ôc æ n‡ÇÖ„`!Î×"©R![¶Dc§˜ö3u0µ\(ÃoiN¸=œ‹ EŠ^Å0¹m5ˆêÉ‘bš̚׃=°B…2€3æúd·‡ñ6ßÚýô†Ϻ¡Qt+‚ÊÁ†¤Wsϱ3+š¡dJD©ZEù¶âUÓü®;ƒH O<È<°SÐGÎ ½-«CÐXõgzqë¡K¥×,4žýX gç<ÒL$YÆ‚a Ö¬ª,ô€áÂÛ¡3=G¼N!ø7½ÄÞÍ>ÜËlûöëyNõùð R¯»ç±y/8BkQ›aÕ ƒHä*Y=Å1é°åÂ÷NÝ ©åÄZü‚OKùøC=Çõ,¯Ô¤Àb'‡×õ­g¡ÃR‘U¼™ÿMâÁ…¦8¨A%n°Ë°Î­ãÌò5.‹þ×}¡‡ƒBòŸã¤I/ê Gìüt1àâ_ÎèÀQ¥S Z ®ÉrÊôt±åmîƒz>vê>£(ð¢X@¶‘¼NZŸGˆÐž}àÍäh¾œÈ‡ƒˆø˜xv2†È‹î-)äeŸ+ ]æÛ¶.úlêÒ*4 BAȺ (;Ë2¸ .‰‘Ù\–]ן¥DDâ§ù¨=§ éb²Fz_›ÃûOAH”÷ VÜ° Ý°Œ¡ gƒ8ÞYB²•ÊE¨˜YÌgûøuËq’‹èªXîHwÈô -iÂïÐgì4"Þ⬿ÜC£_Y Sè0›¬de²²H¤g3ü’€×î[Ìì&ùÜó}oÑË…‡`Ë’ÒÁd¦ ¸ûŽù+èÑ6‚cóèöP!lDæD)fÛ§¨ -ÈÀø À ä«ð5:O¯Ñ¥.ÍÔúâac 2½ÅBC5|Ò7D!@ ðz Þ÷ÏÄÇÅ”:݃ì,¬7ÆxàÖâ·3ì²>.!X䃢H Ÿ|óÖ)‡y¢@DÑR“oóÏÏðëQ²}W<Ùj4û±m=yèÐ~¡Qð[€¦$vqtq0äÈx´5Sï0ŒD|µ^ý4”ÅP¬©w,®Y‘÷šXåS¶¯ -fÐ2LE¸\W”úXÄ°+—«d8Ýp¡Œs( &!Þäw çÊg `…V)\X˜ˆ zŒIoÆW"ˆsEŠRÎ{¡ãkPõ®Ô÷°èMéÒŽ8‹_¦<÷)°OdÍe€ÐÃ9ªd Wyºå³D7¡ñ…¶$#j†ÎX@Ÿ  7ÖzàŵŠ»Æ2ŸÆ 4h›qá·ã~GyS¡Ã²ä;ô›¦){°ñ Im -Sƺèhí¡7Ày47ÇoÐå‚E;\½×g*ÂUfä¡Ç{Øš v¾ûáÛ·ü¥=t§®ê4¬Ì¡­a…®·óóÍßq{õ?)ûŸ”\T±ßwŒ÷ì ;¿ÔAêPf³­ÜõLˆŸ-ˆVw‹ø;—‘¥è#lÐA*®Ñ¦f†º",:Ð/˜<ë ·6×’“3°'ó™=>'¥išt&•óÕ½¦^–@ÑöÓû×Hþ;%‡þ\Å’¯æäÜ«HqvKEÞîýØþ9ÙÔÌUˆâZ!ª0\qÒ‚3ÀUCÌÉwa#ß)IøVIIˆØ¬úù4ˆ7©jU¸ì—ݹÄ3 > endobj -4019 0 obj << -/D [4017 0 R /XYZ -16.307 900.716 null] ->> endobj -4016 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F102 977 0 R /F57 739 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4022 0 obj << -/Length 2820 -/Filter /FlateDecode ->> -stream -xÚí]Û6ò}…à{8/sEê;h 4i›Ë¡ zÝ=4@ÓY¦-ÝÊ¢OÙMýÍCYòÊoܽ‡ÃÁ¦Èáp8_ÎÐu6Žë¼¹xusqõCà: KB:7k',Œœ˜{Ì‹œ›•óÛüYÊ´‘— ¸ówª•i®UmmNƒß©ì•R·æãýõ—¿ßü–YpÎ’ 0Ø®ÛO¥lr)Û‡auîÄ°zèáê>,ùž³XÑú\¸€1ŠçWæ‹g^|sñï ø]‡;AÈÂÄs¢„³ÐN¶½øíw×YÁPÀü$vî4äÖ ¸Ë„B»t®/þqá+Ü£,±¸ý„q74D}"ÐTØiÎo‹Àuçß®Vre6SôÆ|ÄáE,à @êÙ«åZ-*i!Ç«¹,q{È]­2Ù4Eµ1\-ª¦­»¬-TEÌWæ/y0ÿX¬HZ·4”n¨oYËô¶acÂqÌ|ƒ˜€qÒþ )Û])·²jÓ=5jmþ%Òr_4mOøòR¸óŽ(ꪮ±›ç ®=Ÿx"@òAÏ(¹N»²eÅöÀîŠU›O°Œ»>‹Ü¨çYZ§[ÙÊú@O7uºË‹ìÁþE±0Ä€àq\w»ªÛ …÷fBîÜu™ M"­M7SôÇ ÔŸ@Šª,*’—4 >$˜ã„Ä?à·DkºÛÉ´n¬É¦ÔýþûŸM£R—"˜ß‘ò˜]ô?«"SV¯²Ø›w«‘$``Ä6­Q½wç7¹¬iJÑôK‰t5ø ’Š6ƒ‘*ƒ†;":Ë`ÿÖáÔj{HÃkÜÓxòSz{ÉQK' ÕcßË«‘€\• Ë’‹„6‚þÛÍO?‘ía«,¹M«¶Èhoí;EÓøˆÜO‹2]–rÌŽ×××–/è:(ƒ‹¾R<Å|'v -ÕgÍvµ¬•šÚt3!ÂÞÚÊ4“¹*W(P/Œç­Ƕ’¾þ'ó¬·Ekúî›rÑôç€éÓÜÀ†2ªÍŸß6fr?˜©íÖ(Äw<_ÒZªkw]k¦,åZó]ÃåZÒÎ"OÑè@Ú Mo÷1»ƒÙa|š†½SÕ"Ë»Êè ºÔnqs ‚.+Š 'Lo#­¾§dY_¥^íëY±š}3¢rl†ûíXn˜Ã€ è;³¸—DB-×`®UfI½+ÀÓêÖ= B²XðO·_fwoqUáÏÇœ¢¸`¨~ Úyµ™TXpæòþœ@’.¡‹)¿žåj+gšÃáâñÞ« Ä÷h5²¦Mëv -[ñ@Ô?‘Œªú«àÌKÂ#Ô‚¥},T×ÌŽm~ðDŠá$Á‹’C‚Á0qø±ÏDDÆA~äWïõ¡ZùÀwRªÌÎ0‘A(Ñ%ˆþ#Z‡¬ÓÒ†-m–Û`Ó:üݖ¹,w‡'¯—‰˜3Ó~ŠÊc0¤ºý"-öJ5Uam¥TYjó׶èœTuµlØý¶3!ÚÇAgA@ ¸ÜDBDtH„ î ðƨ—…s‘¥ 8E¬‚ÇwGΤÛ.íl£6ˆèàÐO­K1!Ûf¿á{- /ô‘.vHÄ„[ŒÁÄýþö á¤}YAè¶häç×ÁU‚9¤©– FâÀ3~?‡> ýàij‡ cˆà*¸=ìß ÕŠ.úö=[‰GAÑ µÇÑüÂøÜŒäÚú ±”­ ù5¬ª´,þ°¡ÀÀçÉü´:vdÕ6W=±¤´Ü”v‡‡R'Ï©m -5JG°FóCˆZŠœa¨,( -Õ_ýq,æ¼€ë&ǦgæÁ†ÔHç@cAGÌ &Åt‚i vË€˜É™VùÐÜ`ÔÚЋ.‡­GÏ^h?Ü#"šÑd$Û¶Y–Ï´BèY)Á¨ŠHìÃô©D@¯Ô:€ì•m;gzõËT]ËÌÞhUSì/š8F4í´f2Ëg&4+fã^ÿ!3 -uJˆ6:¸hâ–XO3„×¾!Y‡/¾Ÿe¸ M-øï´{ÂŽ\ßv 5ÔYøü¤:êïšÖ´2ä8ÍË Wm÷º -]eúÉ.cšÆIÓÚÒüej)FÖøìéUͺŒ½ð½pI­Õx3¼Ì1 - h|$<ð+SÁJá•·/.2/îã/<˯t(Ȧñ3 ã>j2Šæ…Â^<ò‡ØUTYÙ­dcúá®[«]]Ð-dÌü6á-‚VÖ,C€ÃæÞ‹cÈƉ‰(ËìK»V«ûÅå=ùæÈÞðÚí}¯ª'p/üÄÏ’Œy¯Ùvâ"¢5$+ù·iz³çó9/φÕÐmãß›q¢-ô -Ç àèð#L´aàFÀ…Ð'NœZ:ëafm„mº÷á>g~Û bŽÐçâù!þÀå,~Ê -ìc'^r>±:é8:É{2}Et¦|E*þêc¿àÑj rpÚÎ_‡˜ÃpÒ¬¾¦@<[5OÀ?AÍ׳ãàyÛî`¿º:>áîîîž=í=XÕ›Cè+ž$É#ÔP¦{4å8ôMVÍZÕÛÃ9³SMÏsYJ÷l–1ƦeœMì>´LóXÌ©lðbm|]ù‰–3lÙC›œe3™cµ/¾¯6eÑä/)Oj¿‘õ6­èã,Û‘ëf/óƒüéwºóñê–­K\ñI%.Ÿñ‰4ÖAeë¬öUÂcEª²!¦Rz¸¯®U]"ð¥²ó>ñ¼FA¦EÙÕòÁ‹«U·/ÑP]f·J[[=¬‡/çªý˹añ°»Ìý D-‰E6°Äõ>_`÷óâÑ<ƒÃ¾‘¦Kا¹d2œÐÛ3‡þûIG/0½ÖQ§»]ˆ¯€.ùvÏç+‹Ë"~”U…þ”è'ba`­°†C¦¶oz‹1Ùñü}Z%'[Yám¾yq¬Êö  ¬h²œk…—ªã!„YºìÐ÷­yi9=Æ1Å(³oôpjþ–V"Ïå™Ê û` ûGD÷¸`ÿJë©Ç4 £þåÍ]Q–fÙ½ÿÀ‰³ÐoÚ 7 æ ŽŸä5Sxp)p$ ~Ï×$ÇhŒ™ØoÇRÖ¾!z°)X0vS5}|—|É[Íÿ_]@à -endstream -endobj -4021 0 obj << -/Type /Page -/Contents 4022 0 R -/Resources 4020 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 4034 0 R ->> endobj -4023 0 obj << -/D [4021 0 R /XYZ -11.232 900.716 null] ->> endobj -642 0 obj << -/D [4021 0 R /XYZ 56.693 530.759 null] ->> endobj -4024 0 obj << -/D [4021 0 R /XYZ 56.693 491.705 null] ->> endobj -4025 0 obj << -/D [4021 0 R /XYZ 56.693 354.275 null] ->> endobj -4026 0 obj << -/D [4021 0 R /XYZ 65.161 355.735 null] ->> endobj -4027 0 obj << -/D [4021 0 R /XYZ 65.161 344.776 null] ->> endobj -4028 0 obj << -/D [4021 0 R /XYZ 65.161 333.817 null] ->> endobj -4029 0 obj << -/D [4021 0 R /XYZ 65.161 322.858 null] ->> endobj -4030 0 obj << -/D [4021 0 R /XYZ 65.161 311.899 null] ->> endobj -4031 0 obj << -/D [4021 0 R /XYZ 65.161 300.94 null] ->> endobj -4032 0 obj << -/D [4021 0 R /XYZ 65.161 289.981 null] ->> endobj -646 0 obj << -/D [4021 0 R /XYZ 56.693 224.696 null] ->> endobj -4033 0 obj << -/D [4021 0 R /XYZ 56.693 187.699 null] ->> endobj -4020 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4037 0 obj << -/Length 2522 -/Filter /FlateDecode ->> -stream -xÚµYm“Ô6þ¾¿ÂÅ¥jgªv„%[~á.—: R!!ìæ.W[3ãà7l™…üúkY/~;,uŸ,Ûrw«ÕýôÓ²ëì×y~ñøæâá3ê:1Š87;' ({È ›Ôy³zÍsÎZ¾Þê®~®oÕpW5j úåÓ*y\UïÔÍï×?­ÿ¸ùÔl0F1¥JÚµø”óöÀ¹håkÐŽ´žÔîƒúÐ÷œ Eq¨õc‚Ab­ª &üòâû›‹÷ä»vh€‚Øs£À%NR\¼ùÃuRx ?ŽœÛ~fáPì"â0Îë‹_/\í -wââ`‚bŒ©´Ê÷Dq ¬"qo„ùÊy³Á®ëŽœ%-EF®^æØÉà¡ íeýT íÓj§®Û5qWÝ^ݼu]òqéÊxž•©dEÝTò͇þuÁKÑ¢©]REn¬U½%„Î §`÷‹2ËAl¬Ú®®«F¨µÍ]‰¬à­`E­ž¿zÔàYSjTVkBW·jú§ªSOVªA×ûÿø.ÝΤ–‚‰oüw1^mŠMª¤üðèå£ëßýSÍ•ºî¹6.éš­æ¦Lp)V½ÊÊ>ü"äÑ4Á2¹i•tÒi°»«¥)מͫ„åÙ_LdU©ž NÇþH'ܽz1õíÆhQ@ƒÏï€QN¢UÎ¥ÕžÊ-!á*PozÈ+øN¤%}€A€öyäËÃ.Ea‚ü^gË“~!Ç‘èÁDf^ÊkqPr³R]Û5^©¯Ñ‘YÒŽ¢ÎÁz®±îÀ„2[+F"9Ÿ -ÄnÍ‘õa ŸÝf¹»Õ!bR%H9\êP{ðÇz!"4œî¯V/¥ÑèÝâ¼Ö‰Ö Ox³¦t¥càæé,kU—ëp`y¿6%¬3XÈÔå … =c«_' ϘLÕQtE®-èDÝ ô™€¡Ÿ˜§Uy¹Æàm%Ïšuýoéàçêfß°ú%zIÙN…ä Pa µöKÁ!lcê[wf:¦€3€ægÿ³… -eº6°ìŠ-l€ß@nÓ‡ÍfdãÔ³‘ ÜYæŸ>·HâùÈ ãYF Ö‰*g[ˆçãåÆŠ}›&,ÊJ;ü/ÞTóíóÖ]žç“ñ¾·*²¶ÍJ‰÷>Y]òrŸgía“³rß±=ß”¬à—j&¢ÉTyè=óûÀƒWªÃ»¥zÕHâÛ•¼óuÝ_¨™s½kê÷ù.Kô)užV72Úx¬Už_“G–4 .ÃF\†ïG1Ehí| 0ú ã ZðW$Ñ“ -´'6MÛB5L«jøŽƒ‰‰ R“è5k`_o“*²@=ïÁ÷ ¥|Ǻ\œ ¸yÄ&Øc·ÜàØ°_c>øæÁÜ$¤(¢Þ=’‘% TviMÀf¢ÈÚÇÒB";ÿxr=‘‡pdhp×Ä‹¢kJK~ÀŒÝ@4¯Ôð?ëHBy ×O¸H4\÷ªç‹Ç> QHÏ[ü3@é×ü½ü· òi€)á“’_Tf~ÿþ•~ăøcGŒëK²_…5Ð¥úÀËcºqÌLŽxÈqõ'.P\lŸ€å»…í!û±Eĉ¦c™Ÿ@ÑõÜ-ßge È´ •º(vœ,ã­KÝ´â’`OÿnRO»÷æés˜‡ ¹$Q_D¦Nò¶©Ë7É‚3‘±é»««Å)uˆ<Ì“%*©:…­cN>û¬áËÊ¥¿"jrˆÅÖíMU‰1¿ZÈMz›ËWK"}GÄÌàÛr‡ Ï¾4ð~‡Dë–¥j HB£‰lhD_9Rš"÷©Ø¶˜©6÷\ˆ»GÁvŸT¹‰àì†&Ø67¥‰çy«Ã³`ïÖÁÜ•ƒFagkˆ¥Pa¦Sªv`2 -T•1_ÉM`¸ÂA(K†ÚÌð>g­˜hŸrZÐÜå½Âë0?çKé£Ð³—7ÀoÓl) LÝ\k½är=fŒÉsž aܽåBÓ1–»y€RçeG]ç™L|`Ý6÷Ã]ߢz„¬~ä¦ÈÈ繬ñr¤Šíð™ÜšT}Ò»]¾±Mùô`ñj"pÊ -ª|óI?ï×*GŠÕ¶êFúCή›¬°s!ìÈS€IJüÕ5p0Vp5ï6“-Y¯R&óTü ’eŽÃgd^eFå½¹ÓdS.Ý&Ϫrz’1a,Š´5YŸbK¤‰BI"CÝÊó“+õ Á†â5£?ÀŸ¹Ž—&µÂÞCÔ÷– *­¥ªŒƒ’x˜(O3„]÷e)ä—ÚóÇÔκ=˜Qfr>^ÜN‘‰™ôžqä(˜é]kžd†¿Ž¬™z)Œ&y_¼Ù·Ò[ŠÌ_ØÎ8@ÁÀg÷yÕ¶~è³ûŠ]…nx²ëÚBSôîj|J&¦žKXi'Cý›cgï¬f5rœµDÂŽçŸç›WY¢=»z¦n×0s84o¥Tj.œÝrÐr-1$Ë”½A³`Ζ٩$ȦppeÙB~J`C/<™QáAÞA¿f(0±úSþ1Í>,e‡Üa1—(- -;¡/%w¹ÄdM $LvùÐZBK7:IUMVMU/Çuµ–Û+"5›|šø&8/X^óbtdkƒº])»$õ5y^ÔUÙ¢þôlJ羸´¿iU -^<5'ùê·oi÷|Óò÷ݨÝM•/ÊYÛ6-çÛ¼JÞÝÏ°ßÌÁ•\ p4À–o‰ÙÜf©8HïàÁ1¦ÄôÙBÔG>òýðÎü™t?ªʼ'3²p@ÿìjËϳp0pè28KyóPÖ ÛöJs ©”½IÃÛÖœ3äÐ3 ÅaÃr`Ûó -1Œº¡°>ûåÕWœ¸Á/ÛONz:J&8.9zx†ò¬|·ˆãЃ»Å«å|k·ߦ•´¯0>™qeuLªO‡rÝG‚Ó4»ǃ5lPÔ.œQRrfÉ{®C÷ rO˜i!nä™Dõä~oš‘ãØõ tqó‚y'`^-I‚æÍJÚfÛ<«ú³à%ièÐÍ;·)O·ÒÏb‹gSWÞ*ïÙ`ºëÉHÍ¢ÁÒäÐ",©RSù«9]JºVTÅä/¡­½sö¿¯ áżÁ¦è3OÃ×Úù‰Q-{ÿ,aùÿ3\äI\µýS¶'èòù¶>4ò/æÂ/`gᨵ[¢/ȧްù†àœ4c'm‹1|qšxx!´ùÑ=ÚüKù[§³—ÓVßnvèlÿøe­8‘Îw6=Ë>Žk¹þ77 -¦oD•L-X8üÔ×þ ¸å6I y2õÉÒoßE.lß=þ{ÿ ¼;æ -endstream -endobj -4036 0 obj << -/Type /Page -/Contents 4037 0 R -/Resources 4035 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 4034 0 R ->> endobj -4038 0 obj << -/D [4036 0 R /XYZ -16.307 900.716 null] ->> endobj -650 0 obj << -/D [4036 0 R /XYZ 56.693 759.068 null] ->> endobj -4039 0 obj << -/D [4036 0 R /XYZ 56.693 731.272 null] ->> endobj -4035 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4042 0 obj << -/Length 2663 -/Filter /FlateDecode ->> -stream -xÚí\ëÛ¸ÿ¾…p(¨¾%¥à^M[Úëe È8­MÛjdÉ‘äx·Eÿ÷’%Ù»‘VÑ^òA´D‡3¿Îp‡ÁÞÆÃÞË«¯®¯žÿQ`/D¡¤Ò»^{’"é{aˆùÞõÊ{=ûA%**Ô|Ažý5+Ua›ë,·rë>~“-¿Ê²·öÇ?_}7sý˜fA -…°Ô^•w‰*¶J•…þ ³/€Ù%Ó³s˜ÞçÌ[ún~B)PôƒÙsû Tê‘Wß^_½»"@{ÄÉy~HÄÔ[î®^¿ÁÞ -¾ˆ‡w4=wž Q&¡x¯®þ~…(ð½"©hó,-S?R* Õ0ïõB`<ûrµR++€}ž-UQ åö¾Eë,+Ó“ðÊÌ> µ,i%Æ<;l¶ö‡hwûczk›7sŠg‡ý‘­ísEœn*Å´¦:nUj[†ÛLÔœŠÙû93•ØW›\E¥ªu¹Aµ×©õ"ýåÑÎ6 -' £q®…ë‡(à0Ð+³%ÚE·h¥öåÖÁ£© Ÿ"Nƒª÷q/¸–YZæYâV $â]ä–eiµ¤u=àÇ×öGäåêÝAeÅôÍ}~ÿ§ïßüíëJDÙaß‘Ç‚Š¨ ú‰åÛ[#òÝ^OdÈ:IC„CR‹#.Áônnrõþ‚0$AB°ªï:ÏvÀ$ w*ÚÝ$Ú&YX¡Ð‚¾Æ©}&qQ¿6'³(]Ù—fšÁ•ý^£$Êãèéç3 û•›Ë Þ -÷ÉzøRD;÷ª¸KËèÖ¶è]7í*sD|Ùö|v¨4Lwå ^Kßï Êâ°ßgyÙqeàêv*-$nTyT•ñ\…FOº:Yh^½u}u7 –;(–—<%G´ÅSQ› #—fšÞq.Ŭ½x@õE!!BCl“8*ÏÍpWƒN]{Sð—ˆ\€Т’Œ[Zße_•µÑ 9Ź¿ áÚ¹ÖHa¡ÔªØéu³Ð73éwÆVN ù@¶i+ûh£P Ö•€»)Ðí.¹°0 ˆ¨ö9šóDûJ=“Q§žº¬ø)êýªâ¥â®Ì£´Ðì5—;ÛÚFZ4Ö¹Ú¾7F†^¼Ic=ç2JËäÎâžx}À{ ÷KpÁµB0Žt“¤-þz×Ê2­2jŸ¸jï ÎCvÆÖ²r¤rÕFœýÆ[ì£ -»ïQbVPóö*«vš -±çóߨVï°@­zýxÙÞÃaï'>…íàÂ}½‡ë÷ûHPÚΕ·nnÚ-j—ßžO  -ÀQ» ,a¢{¥/‘¤K_`‚|ðP}fh4…4Ϭ‰gZ›Lͦoœ­ÛïœQêùƳ´yÎÊŽ½Î^<з²ÂÖ˜K]×î¶;Á￸†(/ãe¢ºCîa&:æÑ~o¾­³ë¾I²åÛ3žþÐñƒƒ Ç þƒAl¥t!TYÇEËÚ{(¥(tB7d'3Ð6ý‘:–Ùû ”À3ø9ísé'³å!L}âvAç˜?…Ýó²à€X0}Ù°¨òhUñ64ëßt’+ AlrXÙ|º”ÛÌ„’¦i¶,\CÚˆ`4é|?Å@}™íc6À‡UœCfœÜU”Mj á ÅìÏ©}»Ï£%Hé,†p軵ìDf—N!u™%vîKá‹}þ´Î^<³QOce}='$* p2çä°§‡œNæ9;ôÇyÎÑÌÞë99äÆ”}ØsjoØÏj˜¬º†¾x€´ ¬‡xže¶Ûg銆,áä@? GŠ¦Ûg;ôG¢e4³gò;ÇÁÚh3ˆúÎ[šã«{BªÏC†ì‚)ø×2Ë kPçB%ë3ö_ Þ•_“7½qÅ$”O‡«6ý‘¸Íì\±1B݉Ý@£T·åÃδIùp;çqRo…S°”Ó)¼M¤ÂG3;@á4@L°G(ü­Rû -?ÆöÀ¼g÷ôœôQÉ1º+ ÂÁþtðhÓ ÑÌ€ñ ù#à±ÎÒ!þ ˆÿ}aOúõý¶zD÷¤vöÛÞÇ >Ý[‡þHfv€Æ±Dœ‰é5~Tñf;ÈÆo²dõX g!<ƒp2}wèÓ÷xfûë›…âtÞ6¥¾×Ñ.¶Nhëû?÷ùÕÅä c eé¿_<ï{>‚ѧ8a>F¾ïŽÚ.ÿ¤u’Ñ7ßg‡Á¦Ë÷$*$œ.ÒîÐiwc™½7߇ëtºõqþ!§ŒŸåáƒ\…ÂN5´ÚôGBk4³\:§HPúËáÀã¤DÔŸ.WìЉ«ÑÌÀ#HH— |Úù>Óy ™.¡ëЩÃÑÌÐ!ÅHbÞN)<ƒ¼…‰éºý‘ÍìãI.«ÿ“ÎÊ)$#,œ.KëЧÄñÌöW" $ÿQJ|ÚD›ñéâý6ù‘ -ËêýXÑàQúûgÄyŠÔ™J†0uÕ×B͆’ôø©¨ùE«åüúf~ÕW—c^ ç#Êùz ]äèR¤nÑ'û²Ô¨ó |0HS!­JU®33óËU¸^­*ܧdö¥)þ…OÃ9±ÅÓðö¬0Þe©}Ú² [ü öqЮTh0È©;’€Æ>*li´OE  úØu¶Õ®‹©h€Ö]v°¥©ë‡ÆétC‰ÞÎ ž©jXÕ087Mah±ÈÄÔeèï™ã/u½€å8o6jv}VÎå†^¨ÚøI—‚dÏ\AFƒª.k5ql·h¿Ø«e¼¾«oDÔÕnÍÂm:›Ê%[^›vKd]K£:¼ïñ¥!â!Ÿîø‡‚i‰ sôý‘ûÁXfï=þ¡”À.@©”û¿«”ëkH`9bÂ3ƒý‘8ÍlŸÀ‡ç`R’}îqOß°‡„É %:ôÇÁd:f0ä„{‡þHaŒeöÜB|”5›ðŠ?Å-‡‡Í­š~Üݤˆ‡(›`걎˜øÉ O:ôG‚j4³½1ñ} îÿ¬g·½½¤Bý˜¹áoNqpUNyß ÀWÍ ™‡*äÎÖ@B.×û’¬”õ%ÁØ÷ù!Mëä`«¢•Mòši¾D oÏ.û2Œ|ºnÊ|n*畾x AV¬Ã¿(1õð®D ÷k¦osµFúp¥‡ÝÊðˆêøìr#C×ɶùó”2·º5:_ÓO•Fæú®n[¢Ï]ª§ß,ó¬(l¦†ì*5˜Ïf[ã©íao—âÕ-^Ê$"„¶“¸•Zë¬/:$NÅGý3;$«vý¿ÅY‰¾áp.º·_ÛW?pñúe•ÙŸÃIÞÙ¥ÊƵNÜ rš¸q%Ds÷lnî“wî•w™÷AË”õãþ•=ìóL[Iœ¥Q²XfÉa—.ŽñªÜj€¹ š£´‰íçÌŽI­ú®/ýW -#,ÃÇüO -ÿñ¿ -endstream -endobj -4041 0 obj << -/Type /Page -/Contents 4042 0 R -/Resources 4040 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 4034 0 R ->> endobj -4043 0 obj << -/D [4041 0 R /XYZ -11.232 900.716 null] ->> endobj -654 0 obj << -/D [4041 0 R /XYZ 56.693 661.367 null] ->> endobj -4044 0 obj << -/D [4041 0 R /XYZ 56.693 624.708 null] ->> endobj -4045 0 obj << -/D [4041 0 R /XYZ 56.693 566.675 null] ->> endobj -4046 0 obj << -/D [4041 0 R /XYZ 65.161 568.134 null] ->> endobj -4047 0 obj << -/D [4041 0 R /XYZ 56.693 526.737 null] ->> endobj -4048 0 obj << -/D [4041 0 R /XYZ 65.161 526.139 null] ->> endobj -4049 0 obj << -/D [4041 0 R /XYZ 56.693 470.729 null] ->> endobj -4050 0 obj << -/D [4041 0 R /XYZ 65.161 472.189 null] ->> endobj -4051 0 obj << -/D [4041 0 R /XYZ 65.161 461.23 null] ->> endobj -4052 0 obj << -/D [4041 0 R /XYZ 65.161 450.271 null] ->> endobj -4053 0 obj << -/D [4041 0 R /XYZ 65.161 439.312 null] ->> endobj -4054 0 obj << -/D [4041 0 R /XYZ 65.161 428.353 null] ->> endobj -4055 0 obj << -/D [4041 0 R /XYZ 65.161 417.394 null] ->> endobj -4056 0 obj << -/D [4041 0 R /XYZ 65.161 406.435 null] ->> endobj -4057 0 obj << -/D [4041 0 R /XYZ 56.693 362.981 null] ->> endobj -4058 0 obj << -/D [4041 0 R /XYZ 65.161 364.44 null] ->> endobj -4059 0 obj << -/D [4041 0 R /XYZ 65.161 353.481 null] ->> endobj -4060 0 obj << -/D [4041 0 R /XYZ 65.161 342.522 null] ->> endobj -4061 0 obj << -/D [4041 0 R /XYZ 65.161 331.564 null] ->> endobj -4062 0 obj << -/D [4041 0 R /XYZ 65.161 320.605 null] ->> endobj -4063 0 obj << -/D [4041 0 R /XYZ 65.161 309.646 null] ->> endobj -4064 0 obj << -/D [4041 0 R /XYZ 65.161 298.687 null] ->> endobj -4065 0 obj << -/D [4041 0 R /XYZ 56.693 231.322 null] ->> endobj -4066 0 obj << -/D [4041 0 R /XYZ 65.161 232.781 null] ->> endobj -4067 0 obj << -/D [4041 0 R /XYZ 65.161 221.822 null] ->> endobj -4068 0 obj << -/D [4041 0 R /XYZ 65.161 210.863 null] ->> endobj -4069 0 obj << -/D [4041 0 R /XYZ 65.161 199.905 null] ->> endobj -4070 0 obj << -/D [4041 0 R /XYZ 65.161 188.946 null] ->> endobj -4040 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F102 977 0 R /F93 909 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4073 0 obj << -/Length 1808 -/Filter /FlateDecode ->> -stream -xÚ­X]“›6}ß_Aó²öL¬ øè[“4M:I7Í:3I2 ²­ "Dv·¿¾W€„Á8ëlób,çá:;Çuþ¸xº¾xò‚ºNŒâ€Îzë¡ay¡³Îœ‹w,gIÍ–+BÝÅ_B±ºû¹²û¡öýŸÏEúTˆ/ÝÅ?ׯ—ŸÖ‚›Æ(¦´³v­îrVïSµþ¼c'什ûà>ô=gEQöþ1ñÀb-žt_˜úÉ‹ß×_/0Øwìбç„1FKœ´¸øðÉu2ø"@~97íÊ¡ØEÄ àwî\_ü}áö©pO¦ÄØöc„Ý  ê#!´Â<æ|XQ×]¼LÊ,ïÓ‘ä|W¬TÝe*¤d©ÊïºË›=+» €í6¾v†}¹^6[?u*+ë½P}¶&‘(6KodRõ¥Iº¯ÜÙó´»à¥ùïØiYÇÖЖïÉfüy‘Ð.Cãý¯—’m™dejÚ>eÍke…Jô( Ø'ûAŸúý4ü¦+ª¾A”è¾ë¦ª„47“Mn\ßpµï~M®x•³Ù‡°eÛ@j'ESÝ[ÌzÜ$/®¦Û"®NvxÞ¶®U5³•PàÙ’můíöV©È›¢¬g¢Œ"D»>;10Ͼ햚—*tïÀt©=ª_ì¡ÐóÎÛèûz(Áà†ȧ6"ÅUΪdÇ®už€¢Û"Ÿ CãÇáAzä,@ -…CF2v›ño÷vôwÆÃÛåÐõçÛ¶“«x¹;j(˜; ^•¾é6Óý–cJ¶$tqÓ]lø&ç¢E·%]ôx -,¥±vZO÷ÌAÌ2Ö'tlûñ† U¢²)6L¢í„K‰#äQ <çLû(ö‚Q3¢óíS÷p’î·?µ\ß‘Ïð- ÀAè+âÓ¡Æ>F!=ÚĪeþ•OAEÐ1ÿŸ°‰„‡³ÐÕž)MŠ•yw!¶¦e:=P&òËCwÈãA‡}ÆýáþZˆèÀœíAÊ;”}ƒà‘ò®˜Ï2¨ œ"Sm}Ïš£kÉ aY9–Éd«V…ÈúkA&+@`²ž -‘qiq!ø{¬Ý¬¼·ü¹—Gô{gòÈ›¤+^_ú<)¿ [étØ!ëž<¡ô†·S%Ðd ÓË«ý/Â… De–zü³½7ÇK>Ì‘íà&çýqê ¼(žŽéq·z€û$8S]Ä9w³$î¢ÙM8~¤ox¦öOöŒïöF®&yÚ[qÐ;ÿS;cybÚò&y‘=JåÃKHûxþ\”—K-úÍ$YÈg´WE~9vk'æ£ë’œ•Iaã„Àõm³“AƒÙ§>g›£o_ý”ˆ¡ÅR6Róëeöì`h;¾„>×5 1™—I!ÀúÀõZÖj šãzN ƒ2<š`-ð™8žà>Ö>Zõ÷ù¿l|tÙ6åÁRƒí:åsH‚䉉x#²;ÔAÒ–çde€Ü!ãÂRðŒb  ½2øGK¸½ƒâ®ô¤é›áb+Eqz®hw³íXo¸nµ\@ï_gR²Ë%¥íÖ•ÂK궛´‡þÞŽkMiµ'¬¶¾§£#‡ÝIw§)ùצí3ÇÈßÉÓï²-a"™°Üaˆë°ý¼šI÷ÓÒÙreLÁDMè¡?ï¤ÖZ{õüä›ÝŒ²V¦µdÒ’Ç„Pô¡‹Ãç=!­Z˜¬Aòü{LfÃÜë·/‡¬<…NuNžÎD£Ï 5·l¥EΉ=8σ6ͼ Êš*ç)³iò»Ih¥®Ý -ˆ¬I-Yðge³Ý¯s°ï -ñ]«3o÷çDˆ\{`­ 9Õ„™u5ÔÞÆ3°`Éj»‡ZÉ&UdG¯†í|œßöýÙðú Re*†âÍPLOì>Øצ•/§(.:Iq˜BÒhüã#d;QÝUlFïØBµßM)d€• óS›y£îû×ð‰Ç½úrýæµ±a^$òíÄwZ×(c©ÉÀ zf¡‚æäd:Œ=lZŸõòMœo…)XK½£è[Ùœ£–øÔ³bRqƒyµ˜ÂWÉ[n$F7Xyf½nì ê±ÿÇ“CA2åÖ>õ0©Ô£q&æÞ/û.rƒø!¯—ÿñ£ -endstream -endobj -4072 0 obj << -/Type /Page -/Contents 4073 0 R -/Resources 4071 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 4034 0 R ->> endobj -4074 0 obj << -/D [4072 0 R /XYZ -16.307 900.716 null] ->> endobj -658 0 obj << -/D [4072 0 R /XYZ 56.693 421.881 null] ->> endobj -4075 0 obj << -/D [4072 0 R /XYZ 56.693 384.108 null] ->> endobj -4071 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F93 909 0 R /F102 977 0 R /F52 695 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4078 0 obj << -/Length 1558 -/Filter /FlateDecode ->> -stream -xÚ½XMÛ6½ûW½Ôb.?DIFOIÛ)ÒÍî¡@’ƒ,qm&²äˆT²Û_ß¡HÊúÚµw ôdQ¤†3Ã÷fƒ]€ƒ7‹W7‹«×´‰hÜÜEQ$„!7yðaù^"Ubµ¦/ÿ¨´Pöñ¶ªíƒÞ»É_ªìUU}±ƒ¿¯ß­>ÝüÛ¬ Aέµk}_µB+3 »“ Ý#fvaû8dÁš£Mìö'4‹q²¼²?„FæËů7‹¯ öq@¡hÂxCP„i>á ‡9ð…›$øÞ®<œ`DYÏEp½øk]*ð %4 máÆ+o<Œ'‘õŠÑÖ ÿUðaM0ƽdOß âÂì'rB!è˜Z[7>îƒöù#ÆônEøÒç;ui+Ê—ßí`»¢xÙì:cìÇ(Ù8_?RÊÇÞrpöež‹ÜzÕ»_¦µLKû¦¨²´ÿ¤ZVåÔ<`(ÜüÛ2&€;Yî¬My8Ö•yõ­ ì J­~lç±í`$½‘~*tuZ¦ú™Ð.UEQõ²¤„>™½ö±ƒ_²ÝÇÏ ¿;Õ\Ü®o -çÞ7ã[Z4bD¤Ú:­ÄÑ»ãN'«Šî¥t—ý ?¸OÜìQ8›?¿|wý<ÿ{èPÍñXÕúän i DËÜÐ@: Æ!|ßÚÔR¶ÛZ|›$6~íGÌqãë Ô’Ã(+Y])U-nE-ÊL(øˆŒÂZ“Cíb.º3Ø;ÅÓðâ…Pœˑ˴Ú~™>^‡‚ÒéŽ ÇZ–Àß5ˆTe!KṒƈħŸ D¤Zø½+êûáê±£5{†ŒvÉ]ä˜ÆÍ(¢q·z1‡”ðدwéáXÌZŠQÄ“'XúÚ´ujÆTÈfçŠ:ä¦[èO—D×Qtj‘r3æ×B¶3‘Ïç,\‘“Õñq³$B!Þ\vÜ¿§_L31†xرӀ,-ËJ?”´˜#Fºì:pH :›Cú"ré®ûuäجŒp™Ôº–®Š‹çU¬.®ˆçZÔ®šø0‡Oa©?3¹ P؈_³—»½¯¬@ખžDzï›ØÞÍÒ­(ÜTZ¯H²ÜM $#¨Z—E÷¦€:˜Ö÷U²G[ëp»±ªÁ^°­Ó3ì"=“ ü4=c>°ç›çHª:øWJ-Óâ&cO±mÏZ” - ê‘è3­ -mÈõb¼ÃœTº©ö‰;¯³Îhª³]ß4h`4+—:3ȪR§²l§"«˜Ík³y­´ÀqŠÃ±Ø¥ƒøíT—(3he|2 •€Äµg`ÞCO¹·OS$Šz9" SùìJ#ÌoÞv óäƒržG`֯ݧm^…Q2ûiþ¹Q]_µöžiî¿Ë\ï}|ßœxz‚úÁ©mx4\ù˜¯Ž÷z_•íïçXŒ¨þ®¥Lêl#Mà""¾–/ù/Cl‚šÍšÂX[n=JMNDþP&†5«êÚ¨Œ±Plʼ£¾¨ëªV”̧TäR´ŽÍ¨ÜW?¦n%3Û:à®D“®¡zÊÊxŒøäàZW¿ •Í{Çl£™j[ôçüH»3ß#€dHV`OOÄ6]±oÏ€Qn×Vk™ì˜d§Aƹ…0¥dntV{gZ3ºZ“ezpZ$À›^rZ3ö·ï²ëM‘(„_æ~Oò©[ywLõ~ݲqMÙ…ìwÈa(æ&•~á¯îAë ª*Ùª6» -‚¤¯5ì\LzÂcÂÜNn Yíêô¸‡+ë¤>£û€£g»‰Ì|‹7ݧ•iepþÿÿ] TßëmqVüN#²Ë< -uùx’£»5ˆ®ÿX¦!‡ñŽ˜ªjêlŽÅQˆ8 ÔE¨H‚Á«ÑB Ä­ -/C±C}㨢³ÿ8‹î¦ÛûÓ­­s©*42ÒA^eᆇ ÈRášèŸÕq”ÿ¹¿ÊàR‡á–úŒÊþ, > -endstream -endobj -4077 0 obj << -/Type /Page -/Contents 4078 0 R -/Resources 4076 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 4034 0 R ->> endobj -4079 0 obj << -/D [4077 0 R /XYZ -11.232 900.716 null] ->> endobj -662 0 obj << -/D [4077 0 R /XYZ 56.693 759.068 null] ->> endobj -4080 0 obj << -/D [4077 0 R /XYZ 56.693 731.272 null] ->> endobj -666 0 obj << -/D [4077 0 R /XYZ 56.693 493.155 null] ->> endobj -4081 0 obj << -/D [4077 0 R /XYZ 56.693 456.158 null] ->> endobj -670 0 obj << -/D [4077 0 R /XYZ 56.693 214.055 null] ->> endobj -4082 0 obj << -/D [4077 0 R /XYZ 56.693 177.058 null] ->> endobj -4076 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F93 909 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4085 0 obj << -/Length 2617 -/Filter /FlateDecode ->> -stream -xÚµZm“Û¶þ~¿B“v椎… ’í§:®Swâ´ÍÝL3cgÆ IìQ¤’w¾þú.Þø"Aw»ý$»‹}yv!¼Ø-ðâû«×·Wß¾ex‘¡ŒS¾¸Ý.8E0ÏjªöÓÏ+–^ù›ÅË~×¢9šp‚pfé~¤ôŒKf˜\Q¶|X¼lÔþ‘Šù¾¯ïÊz‡,Ó§®³%$BŽé²µ=”UeŸ6j%K)îì«ðãRsû¹l; í6êÛ®9”ÿ]ÙÔŽN%¥Òܘwv%:·Z‹¾ð±æÕŽY«&-ß~ß]£Ên@ÝG1F‰âÝÖ~ñØô×+£ô9{kcÂ똂=‚¡Î,ÙnÇF¥½²¯Õà†ý©ƒÔNñæåSÞÔ¬»kûzJd'§0ÃزõÓmkNIÏ5V.°Iã:±–‹ò¥4ö’U“˶]æÖ`KØ* 0qóA!¢v{lU)ëâÔ¾ÖQ -vË2ÐD>Áž¶³›þxl”S‚–¶¬{/ðQYï%–¯ûƒTÆ*üt@V’%ˆ¤ƒ)6ªJX@B!§~-D­ƒèºáð†(ööïgÂR–¢”%/öÏEáe¸Ý‹ÒÛB.*gåç®jÈò§ÉÞ®Rð0íRÞMl;Qû^4y¯Ïw¢·vg½ÑX–Êún>rûæû“3 öÄ(•Ü‚¢k0¬ Â<§£ªj`Ë®ì*i-Û0$6•q0¶µ¿ÎOÜèGÌð7F+zé|åwnå7°ˆ8‚ýÝø¥G­#Q¡Õ:¢|<56uN¶´êÖ‘åÑÅÉb çB#d”RÄ œ;#ÛÉZ±D]“‡,2FœÖk8aSgÔ`ƒO.‡£yð±ã™nðr8|™›¸zjÐ)¸zú²£z/ -­±XÓVй·Á"ô–Qæü&:wð¸1ÙÚkT°r² —&3ŒKÿR*M"ÄSâõd¾G[½=²Ÿ¡¼©`û@P£Š£AïBÔc”]¦ìâ~”eˆ˜©× -eŠhòô¦ EYü„@ݾÌïjˆÛ!¡Fg[øüËá<Óìä¦Û?©8’¢ˆñÑßæNxÒ$Î…cí¥Jo~FO’ q^I—Ÿ u6p°õN^‡Ò <šÊ,ëB~:xÁeɼZ+ &9ì;ùߦ®íÓ^T+²Ü®U¹Ûwf=7S‡2»¢…ù=„E²ìõÒÂŽú˜eß„ý1"¼²Ïrvöåx/ôà½A¦õõŠ¤K7¯뮇¤ld qtÃz—¾öÍù¬T4#²O²ûŠ€æãëùqÄ»‡(£ä}!Û\•&ON$GOÄ(›¤ôºwâw,¥$£&˜IÀÔÒß(BÉ&~g-äVôU‡¶U#:”W"ì8†$róÆÂb2 nx‹€l3ÎŽ£˜ Q -û¾HÌ·ålÿS|.u~bBÓxpèvŒi)DËÑÅ.‚<‚'ü7ƒ<“y5矻¹áàéÓ¡lÛANŽø—ƒûR)<OÄN~>ü‡Åù!³&Ód#Ôî9%åRl ÁƒÎD€6c/†wªéê:°fÙ“®ÂÁzÚDŠ—ËOòÐ裸÷–ñhym1œ<® \×î°®íìV5‡s‘8B”óY¹P!ƒTÔTG©ºR= -ï1;ƒ «ÒELiwl5Z×µw§.¼éac7fẛ ín™E²îykã,å‘8ÇÙc?øÿ>ßÛ'#SkãøFN€9õ& ieóo°—u~ .ù=Xun«Kó~¯‰ªwÓHMÀÚe-}ÎrYòò™­Upd_½Á}ÙôíµeÞçÀ¾uéŸê'Ž9Ô€?¡B»ûŠ¬ò/%ŽÎÛ{UiÛÖ¶ì|\€_ø@ë„“ -j5d8‘¡÷Ó{éÝí¨ÍL•º|ø¢"ë$ vÇfîÐys8Š¼óå`ëžZ4­Ÿ›óøÜM_¤ÎüÓî×+}Šˆvwê|ïCd­1r˜±$!ÉeÆžçÍagGxôOCÊö¨SŽi+ÚÀÙæ5×ĨŽÍÛ ì¦ã/fWã¸læ(ÌF•ÅNî¥(PY_¨@3Àû#„8©òƒz°±Ïç‘dq¦1dÓ—IóîDçfC¨Øê]·º‚5Žn±¥=¤ØAl(ÿzûþ;’WRÔýѾlíoYçJ -—}câ|?6ý¥t E–&‚9úàˆÊ--;GËMéø¢O'§¬óÏñ¨£“.õ³ûbÞ¿ù€^k¡¾a‚/´¶¾8œW+PfCB„ðÅ „˜@­ÂÛáÆFtl“È¥y¸”NgO#–ÁŠ,€¨.÷²—¦7ͤjgïU™»"Hë£éêñÂ#,Ô¬i<Ô›rS•Í²Âþ1Üùal,çƶ[ Ÿ 8$!VÕHT!šXptR"žW$MC eºÇ’ü_*’ò QíCYtû`EEIž>cÂS:ce¦«ð²¨©›…M'*½-©ÐýÇù $Peð@oû:oëæØ–!øÇD’t„Ò…ü“¾rQdŠúèˆèZû&ìµDaQc%ÔµÖý†Io×DûhÛoúcг¾hºò¾l5<èÌ pð~&¡ïºÄ @ðy¤á°¨ÙCÝ8Û7Uì¹D(áðätÇç{xizó¤ÃÙÒݧ¼óè­¬ï^ù2n–†Üh¿åÛÔ¢r Ÿž'tQÈ (A©i²¾¨ÜÞŸq>"uÊ60„Ëi¦wn'Bé;#c$1ÔŽµ%‘辇&^ÛOmÞ‚Óºkía‡6Ö´¸«æõ„+Oõ˜ùÔ>¶Py"&Nš´+HçýÀµ[ÜÖò•Ȫö»›bµ*D; ©“,©˜ åð'È–JßoÍY»€š0ç¡"qš ùË+w{/,Ùÿp¦)ÝííÙTPå¤Qá»YU㇦¤ñ¦ð ïNÞ»+ oùJ†êr -õü_+¹$°2——îņ =^ yøçÚ¾|±Ø©òñòu¢Sáñóhû]°àÎ6!RlD+QQªp¢‹8 ·qCˆ1 àüà¿?ju; -endstream -endobj -4084 0 obj << -/Type /Page -/Contents 4085 0 R -/Resources 4083 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 4034 0 R ->> endobj -4086 0 obj << -/D [4084 0 R /XYZ -16.307 900.716 null] ->> endobj -674 0 obj << -/D [4084 0 R /XYZ 56.693 759.068 null] ->> endobj -4087 0 obj << -/D [4084 0 R /XYZ 56.693 731.272 null] ->> endobj -4083 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F52 695 0 R /F108 3706 0 R /F93 909 0 R /F102 977 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4090 0 obj << -/Length 1429 -/Filter /FlateDecode ->> -stream -xÚW[“Û4~ϯðÎL­XòžZØB™¥-M:ÓvÇV³Ž,¹Ùô×s¤#9É®Ë/±t$ëw. ½­z?Î^¬f‹—Iè¤HYê­6^ÊHšy9H”y«Úûà¿ã-/%Ÿ, ý×Bq‰Ëèq¡vöðQ½â7ï—·óO«ŸAL@))’¹-Õ©årǹ’ú¤S/éi¤¥Ç >‹#/HH‘Yù”¥À1Ëý~ô^ÎnV³¿fø‡õ’”¤Eäe%iȼj?ûð)ôj8 H\äÞÑÜÜ{ ‹RX·Þröë,´®¿êÇ;. STê#c‰ÑÂ=ó>Iú¿iGE`þ÷Ë%,âÂW ’+$|nøœ%þñ z…GÕ®ìËJñ¾‘ª©$^k6è -æÅZšG„²D5*)IÍ+Ñ—ªuè¥îYNrw¹‘(®]ð…÷âl³ØœÊu£õúlÅwRñ²Æ±ÁïÏLäõ~_Þ5݉۾<ìš -Jü¬[QÝ$"®ÀÈÚóN}‡ˆnsúLÃm‡ž£Qàÿ³ò”$aâÌRjù„é,%yQ¸[òVk¾ÑÂÊ¡UH(ÝBñ9Mü{õå;Ü:è7}3¡ÉÃ1B›ælÄ•z#€fw\ƒ)`E -n‚D ð‚=ºçuÍkÔHÊŠåÀd­S0*"RÄ™ÞÑïuHë[d$Š¿ª/…ÄcEbõMþYßw˜Úÿ¢Ç˜;õy¥LZŽP„@ðÖ…ehKÅG³ÌwÛœ/"åȆØ|cCÔÉ£óňif1­¿kn lIÀÌÑO–ØñƆÿÎÊßwÜÂäЋŠK9ÊQåjà3Ü ®´ŽÐ„c©«¤5@©¾YÏÜtÆ—ÀŒ^h¤.†Rµ%”†i½Ÿ@ÓËæÞ¸Óú EoGà;Ä_´Œ9uÈØ©}Ëîõ/¹—í {i6bOíJ›iδª.üåì|ÿÓê—[{a7tþbP‡Á²<_Ÿ ½awí$Еy”‘‚ÒD+Ð8#4ɽ ‚ì¡*¥GCðÜ›¶6Ú@“ê±iÊ û! xe y­æ9h¯Òxl z—X³Ü¨íÀ@ÇÚ añ¬Ñ•æPS”P£Xv™:|»XTŸ%‘bè+Œ·œt\-@££¦N‹ZTkèî ˆêâÝÍíÍóåM`qwü®Šûë7«›%¹ßOa ÎIL/ŠIA$_8xkø!ú17JÀ)ŽxW}9ªt£Ê›—x€žjZ ¯^=k“Šm”MâäùZ„Nj¡‚/óqÌÿ >ãÌ…ÿ¶Bé›1HüŽ€=žè~„ÎnÐgr'†¶Æ“5GZ%:Ù¨  -Øö‘_¶VHŠ4Š]ü¸Öüþó‹îæåTÀ“šâø ìjc¬åÂ#êJÀÉêµm+L>p§ÝÉjl*è„™P¬qqhiì5øŒB>¢üŸ—™1¨ÃCÙ¶ºè³Ô?6jgš<Ë|… -7/š¸ë9Çå‘ó;©!Fþ[‡? ïx{°—ícÞÉ¡çŽ]h[°ÞoÔÉÊØàw´Ì;{´Ìì. »µåP_7ƒµdq˜+M1ÕJ”Õnj0?KÄŸáò(­Lìª'رH¯ËÊNþ¥…·¹¬sù4¶AˆÚÞ&ßI çA¯«É¨SFŠ(B^é°† 'Wøv Á‹=€ÍÌ=š€B¯ _½À¹%~Î@ÍÙ@dg 4º«g u=˜©÷òdñŽÓÔ…mEOÒÚN'Úe”^#¦+Gg£0ŸP ¢|Ö -®NÄiÛórœîpðéußÐí§þÅPÑÒâÿü9úcjªM -endstream -endobj -4089 0 obj << -/Type /Page -/Contents 4090 0 R -/Resources 4088 0 R -/MediaBox [0 0 595.276 841.89] -/Parent 4093 0 R ->> endobj -4091 0 obj << -/D [4089 0 R /XYZ -11.232 900.716 null] ->> endobj -678 0 obj << -/D [4089 0 R /XYZ 56.693 640.283 null] ->> endobj -4092 0 obj << -/D [4089 0 R /XYZ 56.693 603.286 null] ->> endobj -682 0 obj << -/D [4089 0 R /XYZ 56.693 560.436 null] ->> endobj -902 0 obj << -/D [4089 0 R /XYZ 56.693 523.44 null] ->> endobj -4088 0 obj << -/Font << /F50 691 0 R /F51 692 0 R /F102 977 0 R /F93 909 0 R /F52 695 0 R /F108 3706 0 R >> -/ProcSet [ /PDF /Text ] ->> endobj -4094 0 obj -[700] -endobj -4096 0 obj -[600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600] -endobj -4097 0 obj -[556 222 222 500 222 833 556 556 556 556 333 500 278 556 500 722] -endobj -4098 0 obj -[500 500 167 333 556 278 333 333 0 333 675 0 556 389 333 278 0 0 0 0 0 0 0 0 0 0 0 0 333 214 250 333 420 500 500 833 778 333 333 333 500 675 250 333 250 278 500 500 500 500 500 500 500 500 500 500 333 333 675 675 675 500 920 611 611 667 722 611 611 722 722 333 444 667 556 833 667 722 611 722 611 500 556 722 611 833 611 556 556 389 278 389 422 500 333 500 500 444 500 444 278 500 500 278 278 444 278 722 500 500 500 500 389 389 278 500 444 667 444 444 389] -endobj -4099 0 obj -[600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600] -endobj -4100 0 obj -[600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600] -endobj -4101 0 obj -[277.8 500 500 500 500 500 500 500 500 500 500 500 500 277.8 277.8 777.8 500 777.8] -endobj -4102 0 obj -[277.8 777.8 500 777.8 500 777.8 777.8 777.8 777.8 777.8 777.8 777.8 1000 500 500 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 777.8 1000 1000 777.8 777.8 1000] -endobj -4103 0 obj -[600 600 0 0 0 0 0 0 0 0 0 0 0 0 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 0 0 0 600 600 600 600 600 600 600 600 600 600 600 0 0 0 0 0 0 600 600 600 600 600 600 600 600 600 600 0 0 600 0 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600 600] -endobj -4104 0 obj -[556 556 167 333 667 278 333 333 0 333 570 0 667 444 333 278 0 0 0 0 0 0 0 0 0 0 0 0 333 278 250 333 555 500 500 1000 833 333 333 333 500 570 250 333 250 278 500 500 500 500 500 500 500 500 500 500 333 333 570 570 570 500 930 722 667 722 722 667 611 778 778 389 500 778 667 944 722 778 611 778 722 556 667 722 722 1000 722 722 667 333 278 333 581 500 333 500 556 444 556 444 333 500 556 278 333 556 278 833 556 500 556 556 444 389 333 556 500 722 500 500 444 394 220 394 520 0 0 0 333 500 500 1000 500 500 333 1000 556 333 1000 0 0 0 0 0 0 500 500 350 500] -endobj -4105 0 obj -[611 611 167 333 611 278 333 333 0 333 584 0 611 500 333 278 0 0 0 0 0 0 0 0 0 0 0 0 333 238 278 333 474 556 556 889 722 278 333 333 389 584 278 333 278 278 556 556 556 556 556 556 556 556 556 556 333 333 584 584 584 611 975 722 722 722 722 667 611 778 722 278 556 722 611 833 722 778 667 778 722 667 611 722 667 944 667 667 611 333 278 333 584 556 278 556 611 556 611 556 333 611 611 278 278 556 278 889 611 611 611 611 389 556 333 611 556 778 556 556 500] -endobj -4106 0 obj -[333 333 389 584 278 333 278 278 556 556 556 556 556 556 556 556 556 556 278 278 584 584 584 556 1015 667 667 722 722 667 611 778 722 278 500 667 556 833 722 778 667 778 722 667 611 722 667 944 667 667 611 278 278 278 469 556 222 556 556 500 556 556 278 556 556 222 222 500 222 833 556 556 556 556 333 500 278 556 500 722 500 500] -endobj -4107 0 obj -[556 556 167 333 611 278 333 333 0 333 564 0 611 444 333 278 0 0 0 0 0 0 0 0 0 0 0 0 333 180 250 333 408 500 500 833 778 333 333 333 500 564 250 333 250 278 500 500 500 500 500 500 500 500 500 500 278 278 564 564 564 444 921 722 667 667 722 611 556 722 722 333 389 722 611 889 722 722 556 722 667 556 611 722 722 944 722 722 611 333 278 333 469 500 333 444 500 444 500 444 333 500 500 278 278 500 278 778 500 500 500 500 333 389 278 500 500 722 500 500 444 480 200 480 541 0 0 0 333 500 444 1000 500 500 333 1000 556 333 889 0 0 0 0 0 0 444 444 350 500 1000 333 980 389 333 722 0 0 722 0 333 500 500 500 500 200 500 333 760 276 500 564 333 760 333 400 564 300 300 333 500 453 250 333 300 310 500 750 750 750 444 722 722 722 722 722 722 889 667 611 611 611 611 333 333 333 333 722 722 722 722 722 722 722 564 722 722 722 722 722 722 556 500 444 444 444 444 444 444 667 444 444 444 444 444] -endobj -4108 0 obj << -/Length1 1465 -/Length2 6153 -/Length3 0 -/Length 7141 -/Filter /FlateDecode ->> -stream -xÚwTÓ}Û?R"!")C›ÞFIw§4ˆÄFlcÒÒ]Ò"Ý J -¢4HH¨(ïPïçyîçÿ?ç}ÏÎÙ~W_Ÿïõ¹¾ç7¶ûüò¶H˜ -å €$ŠÚÚê`É88 áXgØßz2cG"$þÃC ƒ`q:%ç¨D4Üœ`!XT|O‚@â;"Ñ%ˆ;Ü -Ð@"`2E$Ê ·wÀâêüýà‚rÀââ÷ø~…ä]`h8‚hC°0\E(Ä`€„ÂaX¯¤à’rÀbQ@ ‡‡‡Ä#€DÛËpó<àX€> C»Ãl—:ØhdC8æ·Ái‡õ€ aœÂ…!0¸7„- ÀU¨ktQ0Äog­ß|€?‡ €ÿ•îOôe"8âW0 -Eº  /8Â`w†tU´°žX>a{éqÆ qñwÜbƒsøÕ: "¯€àþÁ‡¢á(,Fw¾Ä¼Lƒ;fe„­"ÒņÀbÈ.ûS‚£aPܹ{ÿ × ô@øü-ÙÁ¶v—0lÝP@#ÜÕ ¦®ôǧ"û·Î†ˆ€Äî ‰‰`®˜'ÔxYÀÐ ûe_ªqü|PHÀæ·ƒá~È|0w‹vƒùùü§áŸ °…C±˜=Aöïì85Ìî·Œ›?î 0áè€.?ÿz²À1̉pöú·û¯•u•5uõyÿ@þ—QAé ðá𠊀`°àîÁïŸyþu£ÿ¥½ÿéî?2ª#ì€Ë—(pÇ÷7÷?Ôàú³7Ü€–ÐAâ pý›ÿA" (î üÞ‚_!ÿ?ò_fù_ùÿß©¸9;ÿ²sývø츳סݰ¸åÐFâVñß®&°ß­ ³…»¹ü·U Á-‰<ÂGt~°°Hø·ŽQ{ÂlïñP‡ßdú{¸Îpì>¿¼xpQ ÐÙp»uÂ].ÜÌ~› Ü"b÷R†áVíŸ}(# HÛË@ÐhˆŽ8IàÆ-¯-Ìóç@‹ à0ûìh²ËA ‹€¸(¤‡éô{„8û/“¨ hyùáNè_:è|Ùߥâ@ÝÐh\§¿„ëòoù×Mƒy dS“H¨dˆcmHÛQµ<“ÿê°ÑvÚ‘© ÿp¡% ¶GyÌj)Á ;kZ³Leª¬béØ¡£àz”3ÿa×g¥ŽµÞKø€ŸUeÝžÕ&nòâàÊD¢Ï!óIÊf¼§&) -·%JÐ=x÷Y¢©:Iemí{ 8(}ÿªíú˜èÁI[ªrO#´M§½³º4K‹ŽYÜøË'}l‹M¿áªÈý_¹Ÿ\ž/Ç<ŒLÕɸ£)Õ~L–àQEµØ7Ð?KÝÍò*:PÃ=hõ;{–ZY²ŸYIøj•ñlþõŸ¹%î[4>6ª7ä¶l{ž/p§Õêì8¬ìlY°q%uÞs°N²‹ñ>f¡FÍÒ*¤¡ó -Ö¢lgrÂY šúd1Æ]épµ×óŸXœ4ÂC5½¦'ºFºi¦ª›ô†pñi'HŸ—¯|ñkàxën†ßúWu -õŠ2/]÷¦Ÿ]p~/»söìW脉 ¹XšC›¡Lñ¬xHk€)µ…;<­Òè:°ásßÕ"³oáóüÝövÎiתhD,MŒ÷bݬoFáÓ“m0ðM=4½&FÑÛÃeéÀ·ÊsÉB«ÏYäWáÝæ"òuñõ㤀5çÙfGTH,½@k䊙åîˆýÛåøq¶x¥:yÏOöéÞö"Ûð„ÈÜKcN¶¼Ï¶ð3:d¨zo¢²û7%Ç:ìEûò{Èñe¦ø.~È´¦êh»Èƒ†Îô…'[xhû}ÚyóéZWhÄ©—Bán«#ÚI+ºr”~ü7f¸SÑêõo$<‰i“_ÜkÉæ¯ašøz­­T:D@üÙ笭=!{&ÆÝ,éë¬æíV¬6H«›ß˜ Nzƒ¯6î˜ÜaýÊ€¿Ò˜ùz²³| ‚ÑçI*äضÜiñˆÑyQ1®&³¯ä·ÿd&;¾Ç,ùzÛ×ú°ãƒÊ`ûÒëÄ`›ö–,2ˆ¯u»Cl‰Í#îWfÁÛPsNcÒ÷ZS¼{^Göd7Ò šBó9‰ùÑ ÎùÇ6í&-ÓI+²&gaoãÝu„þîb‹U,L®ªŽßÛ7%>Ù.Ð$>Äý¸/=S!ÌàñFhäɧ<>Ë›„ŒïÞƒ-$òÁPa+âåÍD4³§½Ã'àmÞÑiêñ+”_LjPÈ,¥Ó¬ç‘íž2vÔêNÌY- •^9fè÷GùyOÉWVè6iTsÎb+Þ¦³ ¨Ú½ÜÌl56ãÃÙ@ÛF¶ÆI[áüÃ"Ê) ¾åwÚ»PÍ'<³“’¼Þ#7¯šÆTÑxS8nê/xôÈ@\{mDWÁ±ê'-ÚTœ¡²°wïã¥#6íZ¥¾;jþ|<ÎîÔì|0ÏaµçÂnA•.¾Ìßœ·zË ¢5øˆqö8Ípä>Øç]à FZD^äã÷9*Ó>6†/‡ÚìˆÃ>}Í«ð‰ÔÛâŒèì$0Í_(^<9üÖ° #xcz¥Þ0ïc?ò›¾GÆø’YøíLXË6p‡4²u…ù=×é×æë~!yáصiÓüàÖ;÷v\±!‹v'~4k£IÜÕab„úã¦É^·h¤²0õ‚ŽÉº–mKÁ­Tמe·†.úÈLÄóÊ«ž)º VAÃå~OQ3·l?û8Ð ËDÑD]µôP*þ.ÓÛ³½ÞM° ÛšZ.Êu4È’ ®Á…$™kzZäY`§§·ûöö¯ŒÞ©Ð„n¬Y‘‘íÉü|óÓ9*]ÈÃ|£ùÍà‰WaÀÔ]Ô böt£afHq@m@¶ˆžà! úì&¦~)3ÕQðÑÔX¡š@”Ë -­}ç(j©™ÅV÷zºÓ¼¼á°¢ÂÏžy'Ó†–«ÁÛIIOß+Y×w}ñ°¹;Û‰|E‡á@¸bœXø8}o¡nöÂQž'ÓÚ~,\¯¬¦–”«ø³ä``µ…kˆ"Êfý­œäQ—"ž8lƒSÅœ+š,ÿgèqÜq±ì0},/êkZ[«Õ^eèUê1;]“ùwøË¥¹¥nÇ ¹ÃøX'`B%g•Èþµ7c¥Ç ï?’Öð/h™?(³ù"lšc>rr¤“Qžpª ¨e3íéÔŠko1TcîGŒ{evÃŒz{/~bBå g³¢¡B¬Ã¾¬€*‹ô•5&ï–À9JÎdÆ$Õ÷F`¹†0 8¾dߨú•Íï$öâö£@M|çv¢ž®‹y,¤^dµ~5AjjÀ:Ž“›d§ÄªŸf5^HÏwŽ•ßR= j ^¦<ôjàFÜ’mÍ1^Òhd¸}LÌËÚÏä Í3§óž²K«  Iý`§Î3gnÇ ¯MC'4ÎÍÑöãY%U¢kYe£.QÇCþl1 ·s¶4ºÈÔ¸™Ñzq ,z" ém´ü€2Ã"N4_è¥õ<òuÏïщüŒ¸Ë$‘ü/ßÈŠNë¾l|CßÀ-ÅÊ5íƒ÷ðí÷Ó2Éש{G#V¯­þâùàxפ+[iSl=š}gÜw'‡­I%ja`(ªùœqcZ+QÒê™­^Š†:{ckJ—Y?×Gz:}×õ‡æô þv“Tâ|)ÏEë>ݲŸŒû{È_l=c6à#’?‘ &!ß”ŸèYðræ -ZÖºÒ2‚}‘ÇJ°mGóíË:i'Ãs¹1ºÓ8CZñ¸åü"]{þé”ÉW1”Õj¨5úë5âÛwHzž½¦ŽßQv4&òÉG‚ k’µÎÆD¼L4}½Æv—S¿ûN7b¯:*Øn„KWzO MwNjø·­™×¶7œ¿²>sÏ;G!ÐÁF×´MÊ2>ß0ãÇ®§§mTWÔ -zg¿ÿR„N&e Š78wÏY¿°ÉX‹ÂËmÅSߢe±âÎ~¾;a£R¾n€¥(2‚Š|y«¸$„ì¡êóÔRzÛ!ŸÕøè¬G§˜å> @+úk–]¯çš WJÐ"¯vz2k>[62ú,CÑ5ÕüéD=ORMp{WÙü?AùYÓ—ýëëÁ¥Þ/SVŸ +‰(7ÇØ‹ÊȵðQqŸ%šèö“ó8T™rƆÁn¢ Œu YÂ^²oFk"W pîB ×Æw…Ú3~j§¶-9½)NEK{§/4oWºDÏÉÍ[Êÿµö¡óAëx' »>ŒÔeBÉœ "¶3å?ø½ò{$9±él¢ü™˜‹¼÷Ôþç,BÛvÉ;+éþôÄ£ ¥í¨…¶ƒÔ›Í ŠªÅ×uÞåV?î^ð•h^ý&JÕ)¿p8Ñgm½Òî($Ç¿…÷ îIÀŹQ1ω(Óû -kK‰ÓñR›«÷cØQŽ½]ØP^xé<¼²P£l"§éçà¥QQÏàw̺Yk¶c¨_>ÙÃ×X5ÅÍ«ÛÇ·ÓdJK«€¤>pX÷òµt‚r©§ULí›#g¾¯|R¡ÕáÎG Ç\%tÓIÒx¿½enfžzÐ|Žbpþ ‚”PÖ³+—%¨¨Åºàq/Üš/"*Ç.è¯Â3ÙAžNlgŠé⟭†ù_ø9ùkÊ}þZþšbPUºÛò¹ÃÇMn§ªÌ8©˜Íxü‘ÆòÖ‘§ê…@| å½îaXƃèoŽUË*´†³mï(øØ!ÛÁŒú3Õ'»¤ú‚Â] N`d ïÚ#’𡵀WÊ›á6ÛÑ|Š•®»]œag¦7¶Ô 2{'ÒÑ/Î4¾zsñéT†´vOXjEÛÞBÉ~™¨¬Ê²{¯8|“¸æÙd‹ Ñ*lb׉8?x¸_>•ŠkÊB{…á5%)íÁlœe`Åè{Ýä繑w^ÒÌ{¥–Þ"Ê1 ÞìçAƒÐ¯ó A'ƒ(Ô“—òßñJÐòЗÖDoÏ¢ÛZ†T•&8×eo‡ -n,V2Y'g/ˉG³¥!Êi%B S-ô±ä_(½;ªþbäyuh$Ư<ʸšˆ|ahói®Cd¥ª©ãçKÁ¤v™ç_4=]…ºŠßXaKX*27âÞùŽš|àˆ I¯)ÇËUµ& l Z.¢ëŠ$r¹XÔdÊaëÓ÷‡æê&$«?ö}xâçb’µÁÿ£A{I~Øc±ñ‹Ë‰™:ëÂ4ËÑZ%bÚ€ø©9Ë*!”º ʯŸ§:‹žwx¨jmsår[¬0£‰k~§ßÒHèF•kFýÄþöò®"ÑçîÑÍûŽçÔx±²i¹'³ƒò,ãMk"¥‰v‹>&I5ÁÊЗµ²ÎõµPZš•s¼ûE‡{l0’‚™M~,øñG #°/ÞF*,9qöÌé¸ê³@¼1š„Ìλòäm/Áò—"1UêHÔpÛ›­Þ&íãÉ'ˆ³×ìPƒ€-&¶²„œVPrÔ§i¹P¶”Fÿ%Òñ»b’×=Ý©¿ØŲäZnVKÛ+~ϯœ“=^ßúà}U2ÖÊ"± íûs¨–X Äþ$ïÚ]U|vOÕþqKÚñ& Êciqöý«?ú¶èÙ3yšDã÷OúДûlÁ¤¬°rÉõÁëc&=¥¶þ‡ªç å´¥aR¼Ây9ðJcQ¬'¼:ʸÌõZüPsÕó¤ -ªIÔgûB+^ “³f1‚®.ßÎes>i6žHúìï¶Q…uæ¾~R¢“¿=AµHÜî´µØm»èùJÝAYº/¸$¢È"Á 0Lèô£hý¦tú5SpŽ¡ò.EQ8aúùf9iu*Ùû¨Û™W‹‘~ Ó"Aî¤a ’éùÛÀŽ°ß6ÓûyÆ/{¸6¼çG7]|Ü_>îÒÁòäýÈ€Rá)¥× 1&[Ib&æù3³7…Y8JJ‰TJ·Ó®Í}­e¼B ¯›ËU†ycWÃÁ5{ŠVšQ»#ÈI”ÆŠ"×Üö¯Ž´YÞb“vSÞÕÛHJ%áÚR’’¬s¬îh:Y˜R_=Äвä7.œÊ×Û‡©&¾Õ1è‹‚ö -Nülý€¦›[¾÷^ñ±¥¢BÞRôz5­ô:nÔ:e‡6ËÙµ‚KÐb®#]Æ”­¹žªcù"[2†§þ ·ŒMÛ¹N{“Úú¾¿Á«´æÜ…¬òñš&Sf&gïndú!» )»ù‡ ç$J¨oë“™ÑÓr×`¢|ë<4àÙ¡‚÷¶¤4E&¡êÌ£GÞbT÷ Ð(ΰZöH§ý•·rË$ ÅiÑ퀈×)·hïÔÂ|OÓölª>ÝN'¿†Õ -­¥DøŽŒo¶ëÞæ^p}·J¥’Œ%MÑÍÅ/ö¬-jí!Šž¦øXlµÖ#}‘HuÆ›Z5¦+¾&ï7Dÿô!ù’—%%Ÿ´§UÌ«çFD/žt.<Õ% wT˜^“ • ù¼ªDô"/žÙüñž—RÒTÇU“b«» 6Ñ‹_njuëEÊŠ.8â éżäÐÈ6DÝê——ã\ó’{ù•îÓx˜8¿3 —cì…Í*´/6†‰:–¢é97mW׿ÅH·zà•÷Ç’Ÿ²ò°>QaÞIå/íš©;¦~ä î/š}^g[N@¥ü(ñt€³‹6è#qoIáÑ#­YPýÿûåikÅkxA÷\a†…t%R6Eä(¶¶i~¬kh¢kÆ<ö]X@דÝ3Áó3õÇG¦Í yåƒöbšª´Vß@ul“È=ïb“àïCƒp‰>b“6ÞÂTͺ¶ŽŸ“†„ŸŸa\à ËÛ‚DÑÓ›;Z‰œ&fQÝméñ€eû²Â-[™˜Èp|Í«™r§Bï~3Б{Z@÷—=áFñ‰‘ì<÷Ê„¾ Çèé42¦) m]&J”b¹»ÏŸ;T7ìù³>S‘·À;ƒK¾Né¥\0v ý¼ÆóvUòæÅÄÛ}û¯r˜AÚûÈ»¨Qà ŽîÕ+üúy\2E<Ã'¤c¥_úE"ÚÖ·[}ÕDÜ^YëÝ/8œ â¶þñ,UO¯¯qƒëçÕCáDúä:Ë’àù Zí…*d ‰ˆ*µì[}íRŠÅ®€ó÷CöË7QvÓ ø‚s¼v‘^0¥myaKüWÍî-s-2¯fWÒz…ÎFö.¹¿"D7ØL¶ɆãN”o6öª·l‹ñª¾b=öÊœ -ÿ–xE-oY»0†:äXÐ;sÎ,6¶¨«¸ŠýEqT@Îdyï©Õ`þ¨ëŠåEÛ2Ti–óñ]Dâ…©[à G*Wÿ¡iSR¾L&Ž(K:`hâ–:áõ×h†²¥x¦Ï»5ã¸-ÇAÀÿ0)å! -endstream -endobj -4109 0 obj << -/Type /FontDescriptor -/FontName /EOEKOR+CMMI10 -/Flags 4 -/FontBBox [-32 -250 1048 750] -/Ascent 694 -/CapHeight 683 -/Descent -194 -/ItalicAngle -14 -/StemV 72 -/XHeight 431 -/CharSet (/arrowhookright/greater/less) -/FontFile 4108 0 R ->> endobj -4110 0 obj << -/Length1 1432 -/Length2 6046 -/Length3 0 -/Length 7021 -/Filter /FlateDecode ->> -stream -xÚxTTíÚ6Ò ]Ò HwHw×Ð ’3 3À ÝÒ%%Jƒ€„4JJ— ˆ‚”tˆ ßèë{ÎyÏÿ¯õ}k¯5{?w>×}_÷³÷V ±€áQGÀQ"‚ÂÒ=cKa€°°˜ °°(!‡ ƒü-'ä0ƒx"¡¸ôX¨xBìQh™ª= -m¨‡€´½`1€ˆ„´ˆ¤´°0@TXXêoC„§4@ÕÞ -è ´p’Cáîç urF¡óüýàñD¤¤$ù»”Ü žP= gr†¸¡3‚ìac -Aùý#·¬3 -å.-$äãã#hï†Dx:Éóð| (g€ ñô†€¿ ôíÝ   rLœ¡È¿ÆG”½'€À  ‰vñ‚ƒ!žtv€±–.ÀÀÿËX÷/~ÀŸâDEþî÷¯@Pøog{áæn÷ƒÂŽP` ®+ˆòEñìáà_†ö0$íoïm…Ù;  ~oÝ ®d°G#üƒ ò„º£‚H(ìF¡_aÐeVƒƒUnn8 -IøkªPO]w?¡?Íu…#|௡p°ã/`/w!S8Ôà ¢¥úÇ-"ü·Ì ‚ˆ KIHˆ‹ ˆ/ÈYèW?wÈoåo1CP€;Âàˆ† ‚:BÐ7¤½7€òô‚ü§âŸ+B -B NP8á¿££ÅÇ¿Öèþ{B}VÂhú‰„]ÿz²F3 Œ€Ãüþmþ»ÅBf–Ú*æ| ÿK©¬ŒðˆJ¤$„"""IIq@Ð?ãü«£ÿ-ÚCÿìî?"jÁ©¿@ «÷7ï?Ìàþ36<€fÐG ù pÿ›þ…Å…Aè‘ÿóüvùÿqÿW”ÿ•þÿ½#u/ì·žû/ƒÿGoï…ùý±@óÙ …ž =zBàÿmjùk õ `¨—ÛkµPöèQ‚;¡y. rOPøÞ_r(Rê ¡(ó_\ú»è0(D ¡¿Î´—°ðéУrEŸ-HtË~« èÉúg^58þ5‚¢â{OO{?B4Ð+q@€zVÁßß Â(´ 1àˆð$üÕX1Q€Ú áƒ8¢~©~KEBîè!Àè¡G]è_š$yyz¢•¿‚ÞÕßëßâ .Ì!@2‘./#;.ê”|6Æp—WºâR,ûcÅQœïŸ8ëâåjL{(ÛkhGç+¢§æx.Æ}¾É[ÊÒ,Da¨õ¯)  }?yãa#è&$Ç­‘¦2‘ÚYa[q¥›Ï]EIöˆm¾øòüº ¹ù@jà(=#cÍb@%*tíb>²de_A [>$K¢ð´Êö2Ñ2¸Æ|M:WîH ûî·f•”3üéÓÛüþÇbÇÅ:½µ5Ñ”tTþÚ¬#iƒtÔ©ùÚ¯œÊâg*™)lt%nÑœKXv’K?fŠÚSżšœôUÂn6{5 Äçä -z–Žm×óL¾ Ó¶¤Å9ó×=fWæ¨cœ gÖŠÁ -{±i˜¸ ]‹7z3ˆ²òsK]ÌÍ xÁb6_&i/ìsSED­3å`÷??S–˜ÝGÍ?\Éf(é9(ZXú¬.+^#wù¿=ë‡VY°¤ÃO·ZÞv ÷Ä!ؘ¨§ÃR,:swûvR_i‰Ÿ½#7ãU“@Õë¼GtÛò$$Ï„`Û»4d(JÍO²%›‰‘™¿7ÑÝÄÈÖ'°”ŽR -!#¡t=¨`zñ¡Zbô©\x‹\æýPáàÅÉ£[ª†{Édõk· {¾ãؤ8x ‰âÛèv=p¶+ÓçÒFÝK6ï¦\m)[N‡IÎ-*ÿ4 ±¥,~Xè˜ø#éÛæiÓa¡…RCìX\F÷tÈší³Q¦ÎIŒÙ¯'÷z;¹27}5›.Ï°(†5¤Ù"K`UÍÉâm*Ÿ¨ãL­ìu;N[ð={F›O¿‰XËÜ[s·ÙjÒ?tÿQ顬 -  åš’[«Ñ å” -À&Š5 Q%þvŸ‚Ø~²)\t.ˆáìØL¸SÐù@S¼kÅþ¨%ž¼áRÃý謗ñe[=£ö ?è«$\ýþo ØÇÏBoý”ÝõÁ»›Öæ ªáz­¸±–÷–ËN¢[È‹-“gG‹-€jGº×¢k¶¢­·kZ+š™„"w|§é¨†v¸º;¼èÛÄg—æú,LF¹jÇ¥û9­É3˜§?83Ö²a,ê74CtÉ1œE^0«8|-­™â‹«\XJK{¸ñ#½g|Ž´ùz»û, Aç0FïR,ÛAMˆQõëJ·èu²wвHJƒ¡é$V­Û /g^þؤýfDþÓ5c.“Ó=ú5{ÐK‘ûn%Šw´Œræ¶éÓü€Àµoß ƒìÅ6ÔËaX™]'÷}±«ðžO£Ò4Í•Ê{jVeX?˜-Mþ$Vi¦Š0C4<^ôn+ØKSèiÈ`‘Éȯ—ù(Ï9°VVÕõ­ê{sfî)£}o#•Ìùì|CUgB:’E[þ‚Aš‘|ÒNW -šDGئ’Öг²!Çg!—²¬5¤éïÊ :‹ðý‘Â?¶g°âî_¾Ÿßšyˆh·yÏþŠ3aãäØšü>,3yý²•32òPÊêª O.«ÉF_¨=ñ æJõÁÂdà -MX§1[‘LòVæ•— †q¡’øqŽ„²ùb±7|1Çd ¿&'¹~¢ƒ-j꼂ÒZwL $( vj`H±p&‹ïc.”äÖuÈ~Ü>´¸Ö8óy6 ’X¿"ãЙù½rû¨€Ñú~Eÿ9MøúFµÙ‡õñÁˆnûŠ\ëÓ-…Y~"ÌýcT,=Û™L"õÆ Ö»Ç¶ ×h{´A*Å`ƒÜg5t?'x“ÂpÞê)qÞñF¦¤áAÖV÷Àº÷<³”+‘yM“fšŸ» ½êÐû5@º ݾHþ¤ô‘Q¤uõ§< 6Žð@ȧÖ­ú¬1‰Ä‘#àû—W­Ò7ïx†:“ÔîÎo•€¹ª{7ºZ›‰ÞŠb1ô8¾&Å,t3$̼Cä6UûàŠ¾¯X—äþÄëÓ…DÐÈIÓ‚j³:>OW³ä]›ÎÇÓ“æžìox|ïA–~™ýcí%…y·)mõF®íð„)Ìp¯¸Nó'ê'Ï*PÆåCÏIÁ -Ÿê-¨±)¹#,#¢úÎ]õÍ›,_ï«ÏËn)5dm»6,öâ-ís˜°ç ÆTººÞs‹lÇH'݆ºE fÞîUÜ£3Üh£®‰,ò{B˜žüÁ›…â/8åy!s_†Z(éÝˬ4½Ý÷B5gL4»¨ù(¬+MHnôP¥qÛ[ÿ`“MC"ˆ¨tø¯°ÀºI¤HéNÊë„ ¾ÀÍ:îõV³Ù¯ËñåÕ0ÉpGs*ÿ%ÏBÛ}¹l\•÷F¢-ô¥ÜÝ´½™õчtþBšü§u{D¶Æ©Þb¸'@ú}EXmß½9žþñeˉÒàJL5~lÃÛºù¥õŒÖ7(XWý¸æu‘†I˜/r\¯˜) -ÇÛø©H.u,íÂðqýCË|¡)Â#‰_ž eKœì= gfšÿÖXÕk¦í¦ ˆó?Ù¼?ÐØ]"¾qñ3ÉM ëm2süòx…ΣlÔIe˜.õ$õpþu[î-)œö “X•¥¡>Tp[jv4N‚‰wÿ±T€çĬ֣"„K­é¾Î¥¯KQ› ?îØŸƒHÝÜ˯D½Zy0UÝCÃXbaçÍ@8â´ã¸“KvÒ²s"°'"tA’P(–À«&~÷18æësDRV€µJ¥<ûO,u'ÖÉXÞgˆ6Œ—øwú?ÂöÇJÆjÇ÷“ûu| >%ºçóŠØP’„ ÎÅÇ>ïÙ­'Ò5‹ >}{suáFL³'¶æ Úd+µKi¯°}aø -ÊB¿îþú¬?‰y™†)î'h‘ŒÅ8=ö‚çëÆb“¢}ŒÒ3°ˆNa±kUÕh¼Ë§ªb|¸°ÿJL+,q¯’wí+Ì ·9ü#ghµ_¶Î[<§/îCiù ÷u=Äž¹×o•~÷9S„ê]µwáiîîµê¼Uåßê—²½= fÀãpIøíçäÓXŽR¼µ {Òߺ6å;r¥yÇ–t™1Ç©{¥Ò8íÓ\dø˜¨Û…cx&?(¥9õÖéðî„Yèô`.š5sù/<8UbúÀC?8›¸Ý0kÒ‘AÞ›“²¨;¾L¢½{x¼m£ --¿¶*=’FÊ>ùØ"ÚÃú•jÉ4æ20#ë.îwq³È]Ç)Óø`XÐùÕt ÜMB.ú{¦GÜ Ø‹»…Ì•úZÆœ´¾‘ÎKÈÄçä®Ê_ÇÿF.Ð¥JTœ\e(\2ïÛ,QÚaVmÓãyF²Ám!õr†¡Öáâ,”QþJ[<¦ £„È™ž®›ú²>çæ~| ƒhT¬«_Í -»±=ÚQš+[5¤ÞîVf6; f?’R+n£Iq‘#|d­¨ÚzàƒSkK*.v^¢~à4ÓÝpï‰rÎÖzÞžRyÅJ§Çˉ£R–å×KS÷šðâ™cž§Lˆ¼:Ò¾#¨>áŸ3î/”8]ëÀa|êù¼Ì*õÓo»ÏDMõ?ïœv‡øžk°ß2D–ìLµŽßÍxU~çãD—úXN¨®>75\Ž¶æ#ë[,¼#•‚¸B›>¸}qF÷Û¸åúƒZ:{õ9µÜ|z&oÁúÖ-òuXqFCb~Ã6m¦¢¹uñäþ;×;³©8²~ùú^Äöx;%åý‚¥‡˜(ýÆ’¾X˜èK²W%-ëž;z¤!ÍÆÅ_n,³àMôቸ¸9ɳœå¼6ILƒ©\W E ÒUÚ+ÎWC²ËãýÏŸw1OÑï×QÜì,Tòe€HjB›e‹‚ý¸Üö²9¦ÛaR]˜e†¾­s•êçi4®àdË“`ö—½v±n¤€ŸˆYÈkù+,¨î‡Êé_DÝêt€3%xÜq°ä–g[¸Ï»õ¨kh̵ÜOì±ñz§¹ÖCœ¬ê³Úzaý<”¨“!…zü4@-z¸¤÷‘OØÝJ¹ ;µÙʦ3=*ÿÌß•ÝÕ•ÝúÞn-5öȱ¥è²–¬]Û'5E¦׫3½²µëŒGGóUuL[vA$)„«¸3Ïð¡`†\ÝF'W<©7Ü–Z) 0»ßdìf©7¿(MâkJ7¾xºb©Éä ’Þ´Ú®9Ðâ1hdc9•KGÂOø”]½ü]–¦ê±½‚û1žßÔãV*à‡º\{xÏà€r îÙÂY‘†Î<й!X¿Ñª[kØv'6TÿÈ„ÆiÚ‘`“@v&+#á*ì–Ý=ô[YMdN›«ãzå»].i8Þ‡‡å¡ä«ú¢®ŽÅö'/mI±'!d;ÇÞ+;ݧ!:‹æùz3Kb -ï“+ôŽ­¿K›ÓÉP‘{³¤D‘eãX¬ÊàD*³¤Ä•YP& W´d -YMžÇo¿BÒìa™Z¯¿ˆH“›²ˆÿyû:M¼ñu|¨g¨JÞO®6šw-ÌA«+؆¸ÕÏ äY_ãj¾è/ͼ:¹õðô|¾pˆQ7 s7¢˜Î)‰B‘bžyiøËè8Ýûp2•È,óÊ‹‡m»Aæò£qfVwçÈÑÕ7•à…níˆv¡4u6 SÁ:aùM\ÌS¾:†3‘ÂtlÃ3USr»a_‘ÛKû¾më•÷•¬£>WŸƒ„¢vGBÄÉŠÍVG*øªÉK^U×¼¾b’Œo0E†ç¾˜«ðÛÜîKÇ3)LP¿ÒðtZ5Åí#eOŽyœÀX—ÜÔœùI£r}þ~Áãâ¢Z\=ïen—;¨²ˆµeñ׉bø×ý<ëqë~CÌQsÚ(ƒùTúX7Á„gI5GFV]w&³ú².w¿àÿä -ßìë©¡œ'y-ÄBzõP/ä hŽ[z’\¯p½Fù ç³N¬S vEÿÖóžŠMRJÅ„|“ê À,—ýÇ€N ¡NÐçâ·kÇ^ªÑùéq$A'œ¡×}÷¥¯çÊÚ7轕A|!jÝ| -DC⥱œ0©S‹V ü$Üé”@K}SZ¡•1Ÿ‚klj0 qUq³*ù\e )æj~éZR\щ9bQËñò€©”&Ÿ”ºGÖ´ìå{ýÅûº°Ë"ò=‰YŒ–N»èg…âs½T­ð¥mbTiÓ¼7nDôìCúV!‡µ©Þc=3uêaañ›q>W­ Qs)yǬ ŠW²É‹¾æS1TLsÕM[‘Ketio [Yã—Óƒ”9ÂÂÁ!+êÝxçBÌ$K -êžy„¸¤+õòÏô»!xši1ø«}ÇO‘µHßýÍYuòµõ˜yœ±}ç²Û­$&i£0Üø—¦œÌP$“`kÓr½ª;–+_ÿ裿ñ¤ÁV)Ç~a ¾ \ô鵌SŽgÕY‹›a³Ù˜úîäñSJ¸ÞQm€[ÆMîç°#è½`ž«rVed7l-žÀàû×];Šaü2÷´ì€–år-‰;*Y:×*XB>uOܨðª>¿caøƒyJE÷´ø$µ…Æ7Û‡àsW)S”zËR'q0[äºZºüXt`³Œ6i?‘÷Ž –µ&Vû 9\ëÃpf<›ÆcSz—Äå*ÜH¿ø#”·ï¬´Ø0•ÆëŸ-ÕK0[zå3¾Í7ÑÖó°ZßÏ\>Çk/UȺUu˜ ðèÞÄ8æq;)úX;–šåŒôXí„ï&ˆ¨ßf¶!Uó®&\5Èóž®el½åMDè¹aÒ²t9"¼ð‰ÊáîYÞ-«<¿‰´YvlˆHõ¢ë¬øc°‘Òžw”b@ŠŽŸ¹|÷Qìºüejí¦Ÿâ—þ›VÓ•Küß)ôjÊ ‚²Ždý”$+`¬œ¾ÉmG8Š1ï3ñÀEØ‹^ë;1zÆ0¿°e‡œsy R³Ê/ŠýnL¼ÓÛñÌföE-ÏlŽ@À+ƒäÖ:ƒ¹KQ2£òžFRß·[»ø,±†ýø§>ÊN“©«×Æ×íylï+ayGgþ2­õÙZ~³ÕÞã¼Ù‰s÷,wÕ#z¥ˆ«Øá|ýT,3Ö;‡2>ÿÒÇÁ¶Ï³%än4x±´ðº’V´É‹0[ ’&~Á×·P‡,{pÌEOUßZö-ûó¦C¬áKúÓ£:cE¡Kÿ …ŽÞÏ›ƒl)t5˜CRÇÿ¡>UQ|äæÕÚ9ÚÿÄLtš\Nï‚’‡J L4höù¹ô4½é‚èT‹üHìû·él¤Ý†æmO# ®¿M¥Þã5ðÿÑ&j9qeTYr^-œŸŸ LÞÛ‘Û•¤È°¤Íi<»x{´Ã¯$ÖZVÏÊW¸ÏY!¶¶G -6êón¾4ikLI¥ÜŒ5+È™0OÓfÛr[0W;ÝzêYyì þ¤ï‹ê[çvæW]z’GÕc[Þ³åM8æ÷•‘r%ÛŽo{Á\ – ­zÁØÌY€ñ¶Jé‰V¯+yýÅ)ÜÏÇ7î ¢¿C¼»/±tFàÝŒ«ÎïÉÏìK¢ c -ºß·Ó3Å+hYFíJ³Õ²Ö±[ò.H–A@†‰fœsƒº«¢iLg » Œì‚7íµ&7E§¢ñ= ®·>é+êÅïÞS›ŸHØÉl+í¦€Bm4±qøßtäPLù™æË4okjœN¬<‡}Ûdo·ÚwH{…; ;Evµ¼£ý£HY±¯‘øáÉ;Ö.¶?ßcLè‹¿¶jàµ$åÐ×ɨÄÍç ~I*J Úž¡íÎ#&âÁëÛ“dØ0F¸ÒÂ>­DmV°ÿžuÕÉ‹Æ}ÇDV©Çúþþ±‘z‹ÒWqÁÐ<€+/uƒ&]vc ÿ`B`n¥akÊ\q'óeMÛ×ãG ìôUçQuŸ±ÑŸ$¥ûjjݬÁfš[Þ ¶%–Rn'˜O¼ðÊ3ïÉúÈè&'H> endobj -4112 0 obj << -/Length1 1360 -/Length2 1006 -/Length3 0 -/Length 1841 -/Filter /FlateDecode ->> -stream -xÚSiTWÃmpQPà º«ÁnÖHš¥‘fDP¡¨zM—tWµÕÕ„H"ã‰ÑaDe :jd dY<ä A– '.P˜°›¸ÄDã1š©nÅ™9}Îëzßýî}ï»ï~.ŒMðáT £HÆ“ÏEüATˆ$>$*”ñæ"ˆÇÅ%‘`p^ˆã’i5A‘þóH!4D£ Ë•R$ˆÔ(ßð…þ|^â÷‚HÑþ@Œj H¹ ’"¡šãB© 4‘)güÁì'pÃÜßÏÏÇÔDJHJ)ÊÈ¡’=C ÂÈ”p ”3ŒÊŸÇÓét\T©æRtæ&w #9ˆ‡jHk!ŒÂA4ª„sê¸('ÔÓ±JÆèPP$Õl–†Ä! Ø €IˆQArš5Mð3ý|.¶ÜL¶±Aš’Q £”*”4d& -b¢¸Œžñ(‰‰¨BM±ù¨%hK0Ýa¢8€²"g$ª1šP1j®šPeòŒeØN‡’x¥TB’QsŒ÷4ÄØÖxs¯œER:2g #H\fƒkT¼?‘Ä. ”ˆgh,Ä™Ã2!Ÿï·Ñ À]ê19ÏxL¢AMA¾f•äæ¨(±b`.!ƒì'Gj!`h ÌÍ™X¸ãðù'0dÀL‚äÌUga(›Þ³ƒ@zŠ°sȈñ7ûµ5œ"†9ºé­y‰±›S¶Š6Ì©žSzãɦW/dãÌ’»°Ül#^4Á„Æ¢ÄÌ%çU•2 -øLka›øBvfLÜfläžM±ó Ûœ¶!cþo6…)åÿyÁXå·ØáåK…i -Åm–ó?TI( 3$4&¿LاÍ-…8¡Q¾•0(k™©˜m"¡#ô%L>=I&²6Y˜Jbnô“—@PšF „/äðYãáPošTÀã’敆É2Šæ†Ï÷<Ô¸²0gAiLCÓ¬•LoÈžûboò-„zˆqúz), `ç'Í“µ¢5:ϱËBòQnÄk´ÇwG5­ì?øþwNײªªj)ÿ°†¤²û¶¿h[këWî!Žè‡ïsȶ{Èònð3-RqÆéÁ4‡ûx~¡­ƒ]I[µ«okºCnóŸ=E]Å1—NÝg¶ýÀ×}«Ë|»v£ÃHj}K’×Uí÷¾Üá”j#z±OÛsUfœø:Hr7œ¾k¾kä@Ùã¢g¤}§8Ï1²Êã+AÙ2/ëˆPù˜•õ—R^ÿ¥@I£™üûŸƒÜä[ýNCgËÅ›Éô–âíZó-híö<ôûOáÎØ ·±æ4ÉhcqruàýOŃ×}o7÷¬²þ¡&» ñXœÚíòJ[ü×;”±•gŽHíŸ8ãܼv¯tÓþºìc=ÝâÛ[¯¸S~?;<¯«àVS¯Ÿ!üoõÇVQ’þ 7üÝÛuÞ¹þøßÖsµý×¢“‹Æìñ ’ôð|§÷ª&ÉAK)ZÔ4â.Ìêª!J+Ê#÷Û¼§Ê=­Nù>Ç·:?ÐÕØL"iXùÈá¸Òè›_Äv…7Å¿Š¿QYX”„\|¢oŒçtÞ4ë³1?-yºÿbÐOmSâ -3çÂÞH½wöÝ=š žqZÞ®Î:ú1q5ݲä_Ñ{žï -Ý©ë´{vbóÑÉ ÉÂÉ牖¢÷ƒKõ¿6ÆÖ}dmïÖŠÎýãdÝõâ㷼υ+ˆ2ïáÅþâ7«Ö[9í (¾ƒTÖœÞ\¾w¨üzjý¦E;_ó¼6ù¤ìÑ•Ñþé:¶¯n¸<6áòýx ´=jÏj´è®ZÚY¼¢ÓéÕdÊ>úÐ_O´Ï««yÃèÊÎÖ…jhS¬NY[¡ÎÚóøÊú#Ï÷û \¦+bòÍÊÃ솺[^Ä>ÿ}ú(¹Üa­_ÀàDß­£ë/-~çKùòqWóo_—ܧò~ç”_纎WêIÙu¤D[¬ ªæWïøPy° =Kß¹ž²Rt(/OŸý2Ú1êô¬;¥òcíÈǼ%Íõ?Úàéf¢CKU¸ ¯zøé**ßõp÷›¥Ïï}”ŒÓqcX$ Y$=sóq¸.vé:ÞÀêH«+êÊeb¯!¦þ˜®¿§aÒОøíÎhŸy¼´JÝF“§Ÿžݶ캤ó§&²o®éÊÈÙWÿ´&Ùâ+û¬²-MÛK‚l?kÔyë¯önÓZ>°ZÏzO„ZmPìø¬˜’ü4‰4´r±–æÔº¸·»Z …Øù·##–,‘]Ht«l™ð8WjÆ S%½ïž ïë쬿žfoÇ3o Kÿeó_ÃŸË -endstream -endobj -4113 0 obj << -/Type /FontDescriptor -/FontName /TPKZYA+LCIRCLE10 -/Flags 4 -/FontBBox [-2000 -2000 2040 2040] -/Ascent 0 -/CapHeight 0 -/Descent 0 -/ItalicAngle 0 -/StemV 40 -/XHeight 0 -/CharSet (/a118) -/FontFile 4112 0 R ->> endobj -4114 0 obj << -/Length1 1606 -/Length2 7713 -/Length3 0 -/Length 8530 -/Filter /FlateDecode ->> -stream -xÚ­VeT\Ý’Å‚“` ¤qww kph ‘n »qK ¸‡à4hp÷`!¸÷à.CòÍ{oÖ7ï×Ìûq׺§ªÎ®]µëœ{hÔµ8d¬  (ÎÁÃÉ- -‚-0U(D…Cê`x0 -`30ȹ€Ìá`(DÞè¬ò K//€GDD› uòpÛØÂÌ:šz,llìÿ²üXxüÃó°¶^\AP'GþñÞ¨ච€5ØSS7x T0+uŠ ÈÅÜ Ž°p[TÀ–  Ä°†ºþZ,¡+ðïÒ`œX20€9æ²?l¹[‚œ~»ØN G0 öðÃ6.æøCàPb逰úMàÁn ýCÈÉúáøà{S‡Âà0K°ðU]^á/žp[søïÜ0ðƒµ~ˆ´‚Z"~—ôÇ÷óà…›ƒ!0äÿË°ÃœÌ=r?€9¹€ÿÐ@ÀÀ›1`¸€lÌ]¬@0ØÌöïîü«NÀÿ¨ÞÜÉÉÁãÏn蟨rÃa kNlÞ‡œ–ð‡Ü6`6×ïAy ±†x¸ÿ²[!œþás¹üióï™ay an…8x¬@ÖØ\@(ü!%€ùÿ¦2çNäÿ€Äÿÿ#òþÿÄý»FÿãÿÏóß¡@sLJøë‚<Ü0P€ -à÷ó¿bÍÁÿ&úïz ¿þ;—pó‡6È@l¤àæäþˆ)€ÝAVê`¸¥-ÀÚÜá¡Gì:+‹zÐòO<ÜÜóiÛ‚-í!¿›.ð— ±ú;óyþðæ’×74Ð`ûûmú'JýAu¸¶‡Ó±ÿ®CjõÏÅo YY¨;À‹ƒŸÀÁ+$ æ ñøü›l`xþµV5‡»€Ý¯JææùSø?ÿZÿ æÄjõ{J´à櫇Áú§á·Ûáâò çŸ³þPð?ÖFrYbOÿ€ZŠÚ%§¥À?‘döÉ¿îlçAí}çTX­—ã_móKY)1»©xÇYóMô®ÁcbÛévU™u­¿ý™S["h?›Â‡Ž¥#‡`ž±Iˆmí-—I!^ÊŽ^„ׯï*‹h†‚ܺk?‡44M -nÐ)¿5ñ¹`þ:gñ§sÍñ'¦?szìk™Tý´¿‰ðSîöãûÍó3¦î¾Þž¶ÃG«ÏÙ2¢±ÄÌI|¶iâáf.'Õ–w®\…WX[C ÞD¶Óߢp_âÝlÕ;b‰[ÙÅ™™ƒRZ•1÷K¨.Uc¬‹å¤½7*ÙM|¨†GÕñËã‚jÙ*C_*Ù+Ä'M•ã¹‘Ÿ™w´=RÖ›Ó;àݽ¯…ályºb¨æ=a­=|ÐAÿ¶Ï‚ ¼I{:1לéÍ‹ÁCˆ’¸«cÞÖhX/¦Ç‰ž VªÔÜh<)ËpO9®`ÓÞ.ñ]îÍên>gËÆ>5²y›\­ l?éšq’ îv~ÖL®]O>´Õn¤ ¶®ƒ¹ý¤~áç}¶ìŽRþÓ¢àoÆð¦êò4dûA‡ùGaUøç‡%̽5Ýz#¤²î @¶I9™Ëþ«ëL‚·Îo™oƒÅœGÞ%_îèŽG_I8?>y£Í¯¨Öä}R#F&ªå{‡áÀø‘òÅô‘ßPصþuseóq)4»0ì3¥°Lh䤢£SÎGïhf©riü;nèh àè|ctQùM‹’b­lÚ·Žá¾‰]6ªe|±q“g\½£Gôq†x¾µõ¿ÎßÒë>jŠ¢BÓ+Ÿ¸h>š¦5½âMkù.Â5ô%²Ôîqøò£X7„/W—,H5ö3ýc-§Û¯Ì$óp\>Ïèq -ãاÏ!¢MêoP¦O®Qƒ§"ß&‰i9G$OD¤ŒÐ}Vy–^Û%1“¨ ˜w/&»§»0}¿Sš/7U•kܼ©"Ÿ‹& ¿IÛ$æÁ7¿‹ð×°,HðY/V>¿[nxö¯¿ÙÊ'Ée¡?c^|âAÒëàm¸•š‚ãâíà8”AКÜåÆ¡Ô„~±¦ë¡–¹K5u[vK\{¾¯w˜£êÎøA tâ>0]jýî:/¡«þ ¦¸‡ÒÑë^îÑÒ‘åË+Ã[ÉNŒ¾[ßÆnl[QåFàá»f«ø™;·ˆóMi:²´Ÿúæª`ñ¢J$XíàRȃñäZ=á$ú,d˜&¬­!\–¶ßÀÌ`÷¨Prшwì}8¹²p+WUÃ|¡uüz2S˜àÊ붗ÔŠ6ªæ2ƒ~¥Óö³7B’TÔÁ!Ô“Í¢>V,ì:ÁÇpzsÔûÍ;v)ÍÌ3J¦ñ»ˆ&K¨Òz5À­eíÉ4|¸À/~—¬k—·ØÂ> -Œƒô-§ÕûÿêMœô¡y$89J6°gÙŒ2Ö˜$˜ÉZË$¢ì:ê´ G¾I‚Q?É‹S¢­eÔƒåoÚ‘äQÁ>wwû³œª[Kâa8"ý¦ £öóNÈ\ãuÙª^hÛŒ‘¸ùZqñºyµÀ‡/û’Ð(±“Y+Û¿§Ä¸(J4?²_ ÞrÚÄ”¼8‹óöM<’ÃŒ"»I·Ì -äµNëgùõÜ·ëŠëë4àÓùrW4QÔRWËødk/±¿a¾……؉¬¸€YÕyQÑl -ÔÇoæí§«'ÛÉ6zÂÐÍqgˆÜ€©”_6”°ð’ž²åä3u(òuu0þßAÒ9¸ä”\/Õ Þ[Ü-Äó„ÜGß¡]]ÉVùÈ÷¸=Ó¥Ô¢¬êäÎ/e”©[1Xù¶ËW†gêÆÊ£¢ ­ñéÊÚȾ"N2AÖ)a|ïÂÊœ‡Ñ»n×3±'f§cÆ—º7GC“)Â1»mFé8·Qde Egˆ]÷ä¾¹*|ßý|½«^þ³¤¾9ÏY|ÛÁž[a Ÿ7Žÿ¥‘v”1°û†t -鸪°võ§=à¥E³m©bsÏXfHù–Fç ÚâDÞ®cÏØÆÆ2‰fø0»_®ëUÞ?,f“[L.½ò0WP‚ÑtW¿Ÿ¢ü’è"0Är’[«ẩ¡´Ÿ~ošÒU¦mãà|›¿üá¤/>ïê QoUx˜ðþµMÙ /4Y©‘YQ¹4¿ 8ã;ž,BTjÁ‰3¬Ø`—WiQ) ­f-$¨° î'¿ÿð¦§dñê)°"q:Ý:7ÒcD”CÀåBÞTªb8 fÆùF6=g¿<—Ñ2rGéípQ¹3ZDÈEBnbS©¢B)cå ¾³Øw嚣[VPphueÊûÅFäÏgEÇ#aè„€¥…¨jn?0(¾6?!@?cå?'ΕTÌãfŠñ‹Q -Ö÷w1nßf¦c;ühù994úÖÆâ·^ô– -5÷M·mCÙí¦ç+?%eûüznÍRº“j+Yþi%ÓXöFŠ@ZO³4^õÍ2JïU¨®šß‡ìŸ<Óqϵi Ž–Ý­§8±×5Ç'†T?ÁQ“¯ÌRö€Þ±]üTö0€‘Ãç^Ñû¶'ìlÚ [þrô@tíuntžŽõ÷œÝæÂlóUÛ=w¶–Çb*÷—x™…‹ÇN[XRAÑŠ#JˆÀÊË…ãÔ²yá¥H63»ªæÉ’÷EXc/•Ä>_IÃ*.±$µ{&w±¶7ó¥9Á³ï•&’%ÑfÈE6Ò®ˆ‘;™óuè8®á3¬•ßÖÒxÛlȧ¸pç)¸ëö*9ô2N>]þŒI˜Ô•>ã³a]ávk¥ªG• ”µñ¼D[*¡GÕéÖ¦ Ä Â”=êcý9”'­K}ÑEj†˜ƒîg-&‰£=ÎÝáN“n©r=¸uH9..’ ^öûª¤·ý~Ò"ùº:2c´—¤C,náuh²!g&ïá+÷4ÛÞ7ÛS#"'Ç!~Ì9ÓkÏÕsëpÍ#[y%ðzýøâ#±°¢j[íw`V7‹¨ˆ·ìåIŒí2¡ä øГ”åŽ±zð#/­kÞŸ&¡˜"QÛ,ë\`–qÎkQžêøž0»žCªMŠUoüÕ¯tod?ZÞ¶£Ïƒä³E™ù,¯šœËkrÕŒdáÑž’YÍ -¹_²éKìi/¥ôñäUØBW°K¼Ë ÷1>ý@?ð6­ -*ßI©VrUdγ†QüÌ'àᨅ¡cûÂÈ]W&C+Ö+NbR¿Õ^±œ¬ît|.³¹ÕhÕ%‘^„uò¬ksm³Û1¼`¶—!Åþ…´¨.¤­ÌWÇ8T‘,xi§dû´à)®¿eíØH»ä5Ý‚§À׌vk‡™0p>£À\¨3õuc(hXXJMy}&yÔœòÑZÆt+îµhéwhYIŽ½6߸øl“Äh@’­ò;Ï‘ælpݧ·¾ø¶#|E» gO‘­o[ÏVe˜_äc^dj]j={¦,Ü?m§šKE÷²ê¥a€ÐPVÕ¦˜·÷AñÚF–fz[¡Di˜^t7c,sÀQƒ2¢1ìl—2ýÖN\Îëc ï„Ö°§Ã…AÜ<_©‹.!å„Ñ»Û.› âîÆÌ®þÆM·“áõ³žÈë7/ÃÚ쟨=ïTié±ãj›,RK{à“’…,èÀ“ÏÈø^§Nf*KF•×·¦9ä*ôù× Èèëa®F¥Q­5ÈLjôÀ~ EW¹/AQ‘]½˜U÷…·Éƒ‘*ìu?ü®® r%ôœJuqh‰“Ûta"Í%ÁÎö”O–®¯ßi"pëÑÉ«Bð¼Q‰Ž¹ Vp;Ùæ"\Ä! -Ü›RPõ!w˜„‡•¹¢þ}áüN3Üϱv>eg7ÒxùËɘ­`pv¢vÂ^˜Ðé¼ð{AþÆmÓ!¦²z€¡Xgû!J#7ã]ÚúuŒ&t)r ò¸cà͆“ć;î)‚qS4yì° -fDzq ²ÖU¿±3jà9~JÜs•W–G†KäjáY¯OÓæÎÓÑ8q¾¶X=Ï°‘T¬M}» W&ßoƒCËŠÚå>±ݽò¼ü@óìp-Š›f¢sqÕ©[â0£= Ýת5IFõ׌œß´žðΟ/J1ôõŠÏUˆXJä gW«/<Õ­Ø›O3 êuùeêƒøÅ/ã9Ò³ø\>´ÏV1ƒœÅÂ5”ßp†M*ÎýâÛc[óù‹jU½OÇ,5bªà7æµf!â:v߸%Œ‚W6†å)"¸ -`EgkªÜŸ¥®ÝÚ*˜ûžºN'ê±3ôarŽ¤èo ž+@ét"Gïf ]ɬoÙ ÓcUf¾Fi–Ĥ‘ÿÈVnŸìåuDò¦?íæÔ¯)œ»pbü1üÃïCÞ=ß Y]õZç€' ¹9Úº°*âõñ¬mb¯c ÂW|ã¤K -×:ÂÚóLì)‘â|Z+m -jÿ¤ð¥MK;ÞÓ•Ù¢þº!¢‹ª•´§ú&Ϊ\ââ ¥ú Yõú]MÃXN°1æY0”-ܤÌÞ©!´„ýd_„»ýœ.ñéË=b+Ì° †>|pÆŒ`æJ˜¬èÅgZ~ü¥¡ Íb¸cÏŒÅÞø„þ<Ú«Wx©DøøMO><­‘ÁÀÂ9VÊžo.~Sšï#“~¯«ò-õ1)[Z¼ü­0~ {q~?Ea½`®ëÒXZI*UŽR4Úþdªv‘¨.f2dú”çs©OqÝ“Šp¹Ké÷q«Ód^rÊW©Ÿ.¹v&Á¢wôv•o±K}ãëb»^@s -1þ1xý£àT¯ŠfcI 9Îôì+¿”þÈùjœ žeëlìÆKX^åeˆ Í,hò†’Lþ"ø2ØÒíq†aæVt@ðãñ›ÅNgS!òH;Fcý×%c -ú¦ßUü®'êÝÕ•å"Äø†‹©ZsãOÜÔ÷ª)›V_m™áò}_¢1ÖD^­Sý+'G%;øÇW¥Wh®St¥í#£.™ˆvëŸS‹ó“r§Ž7ؘ2¾Ëf)6ôˆ"D ¿qö7hvCö8ª‡ÙÁÎŽÒHAV׺ȸè@´%{#ž T)† (!ÏMêݛ㢭L«X*÷±ÅíwÙždï0¥y‰ÚÓ‚°L¤ú0|eò»õŽ…õ ˜$7È mua bâW¼aÏÄ©§øԌڊì“ZÕ¬I‚R;9„К›~Þ_¤8ª¡ø#5`åñŸÔø‡P¦XY¦—8à†ˆP¨R…?¶Ó ª;ÙLFKA{šÑ ¡ñró}Øvç£ÆäŠ ®fQŒèš(ój4°ãœw¿³yÚV=K?ŸŠÂ~ªCñ'Jž1§ò,Š/Hª [‹Îx¦ôHÇì.ô ´+ï‡}Æšm\ZׯœA÷†? …Oßù+&¤N·X\­­«'B$sR¡ -£wót VHzÈ`)¨ÖÂf^U±¯( jÂAÀ±Iéz8Oa££_Šå¦ô^Ç-ïý)ÌÔZ"é؉˜X7ÆEžmNaÊâì+DØÐ6é4OÛÊ´"(Px ±3U.©ÍܯQ¹܉S+üíðÅ(è¨îöUÊ:r.IDüã,«ÕŸòbƒýS"Þ4-ØÆX?ë%ôôÌ ª.„šC]£^]ÄæÈ,›s«j°þ^„MÀórŒ°ú8_zôi\6ÓÃÿº5ºZêê:%лrÕ¢‰ôuúÊ'¦¦ê  ¶Þårµ¿Àlmp"C¬cujwµŽS8W¬mŸékeF•¡´ü"ô…¹V¾jUV=~àg²`=&övLçsFûǶï·e7‰Ÿ(õRx6P¯6™Ãt)]òÈÔnpÔ(5+®…ÎÆùü7L§M! -XAîw;$óh8"Ÿ¿Ì‡LonÁLèÒ6 €»^C‰³¥I.'çË<”yë…ÂYNÖ6ýý¸b”wågW ¨Êñ“xzL.r‚›ñdÇ:¶t+ ¦Ã©§;‡AÏ Éiçð”½4¨1·'IuÒ&¥&Ú)™øyåê -€§úay¶‰/ rV¯#Ýí—SýÐE¢ž×£ÝÆìz,®§o¿à¥uîšvfÌ&Ï$,†eÛæ]Õ%W+N¦¨½}⯑µ»u±´à¹%"ÃxÆAPò¢°É³4ŽP” ÊP£§ŒÂ>Ú<o Â{¿íÍçµúÌØVPg6¨¾Ø”Ræj9F5RâÜԀѰݯÕÖ£÷Ôˆ¬X‚z+`L$g?¿»åSS’`GäW&ÊÎÞívF­X Té­—ÉçcÆs_,¦"wL.êXÛ´]!×^„w@hq´Y›4”h“¿»û”ÙPʮٴ’©iÙÉÝ^—$‹B,õ'òºTùL»zŽx–7éL1Lí`Whä[!5RdÞÇèÈ„Q·f²9Œ¹þHe–q}X%Fu¬‰]:n£Ïgô’l¡ÝÍG£¯Oµ„×ÛN˜°-Áƒ»,ÂŒM㛉‚1BD8 m„«ˆùdÓ\kþÅñh#ÓmÙB©‡!lÚXNH¯¸ÆÀƒ”úÚiœÛ8Çy[±)lâÑ™tÊÝ}Iΰ4•‰ -y,ɜݱ‹¬ž0U·íh|ƒd±ð5Ëgkô_„ôótþÜÂÚ7ÄDŒùÛöñ›Ù<‡©^„Û>¥QjÛ鮣Oô¨–å‡.ÊG(\¥¦øå½ü³†À®ýÊ€èÇz#€ïŸ5UJ ñ²äÖhðÍŠ\ÄwÓ ‘•¼|K†˜A]˜í¦}jêEið<ÊÏ`—ç¹Øü~üç묭òågäh…ùe<+ûU/¸<9­¤d§({Ž²=’®[m7'° Ûr‰æõ:%bJDù0NÚŸq¬ÐK<|¸KÎ<[W -Nyû¦÷¡(NAïXËÎΗýŒD„µÖ‡Åœ¦¡ƒo^¼aß#.eÉgVºñð¢NÙÇ·ñB¬Ÿ³l¬´^™Û#L‰ŒøÄ‚ÇE6{ü»…¹ì(bÄžO¡"¿ŽÒ(±sÚDµQØä%®;Ƭ†=ÔÏYx‰Ž¯?®Ôí,Söù"ÝTmœÛ×<ʱ©¦{¢Ó.´ˆâf|J£Ë®-¡z£‹Ÿß/üU|7yï–RPåÔŸOµ)#´)–wã§Î(±æÜž…ð£NF‡ =›,¯©Ã£"Ã:LciòÁªÍe÷mõQ]¯{:@!ýX«ò5éÕÛÕˆ€æ: ec¢› -ôÜ;•AâyAgñ-÷Ÿ3FïTÃ4½]_›0’dqÅiPm‚vÌHœÆìà±´°è7sÊÛÏžp ƒ?àÓ¾u]{Q’°”@3—æbYäPN«†Ößo÷,+—É—É3Ãáé÷ëâó6ªÃëì…¥Ãní1-¿ Xb©)Êz> tåÝ‹Qžò|å7d¢ßÖ­l6›“BQw§VêsÓ8ÇgvËØ0÷õâ»°FÍÛ³@´á‘Α÷Éú¯Ö#ú-ujêï¤Â'sÇWý‚¸˜Ç9Û––ï?nÐNTþš\½zŽÑ¢¥`HæçKmj‹²çGêwK2Æ<¿<Ûi´¸žºWù"ØkÑ×dòâDõS*sÇc–©Àü¥ÉÙµÐK¬úYìw0PA•}“žÞ¬ -ž'²±¨mtóÑDK@ó—ÄÃYŒV_/1›/–çœnŸ>³"qn16Ü~ñ_ Ž¦™\†Û&ŸH2Ù$é~äwWÙFÝ#F[%ÙˆRTðû(žT¬G¾¸Õ=þBºLyuv™L-.°‘œš8R5S&®ErÞ#\å÷õÈyí&í—ÿRcq§SS5P T»íqçu‚ÛbLÈâõõrÒ×#Â3Ì¢‘_·ÆÞŠXŸ,ÑšŒ:ò»5¢é·ÚGà b˜SÓè¤WÅ´Ñ¡‚7º¨ôñþˆèQIº’ýÀ{7 bËpaÔòÂnM[½´½2w_KÛ¶&ž!7}Iʽw÷´^´¢;îCËXº‡ZJmÔFIþíÒ¾o?E)ÌæÃƲ¾Ø\ìˆñ—2d–nc¶qm@©66¸”k÷v}§& ŠíQÒ°%ΰ/€âAŸn¼±#³lzpRh9ñ5î~‘ŠSmÏ92Ž?îÇ9JdL>˜Ãy¿Í3ÚJ»>E¾ÌÆ­Äi®\}½6¨Óõî›Ï)ÂÒÎî½F¤„vŒ^wUË µª>^=–ò¬©Üi5è9ˆÐÒt— ;kG‡é¢Qô'ÝÐr>¡áU¢cz#õ…†…©ð?šx¯×•tÄf1ëT -ûämÏýÙç;§ÔÌXnzïwÝp¹XÖ5@5Sù¸Nj˜‚­&ÆÝwñ¨Dúã)§¼KxxΧ5o™!~´™'iÀÍYÜ'½g4O¦ç×MT7·­È![¼G§m¤;RÒ™.¿Fö¾œ"TÃ>íIzßzu¤Áu‹[; ãÄ÷íéð*]ø1¡¸CûÇ7œãùBPιϤÜÇ-~lõœ&¹Í„Q»ÎIâ¼ÿÒ@þ=&€u_¿œ©~™$æú”QºÒIðw¥gÿ×ůéF,`T±k!Û>i÷ٸK•‰{§öÇFß6 Ã£í¬ƒ¥›’sµÒ/ù¨ªæ~*<)ÛI9ݤ“²M´˜qÜñ+´<0˜qáumÚ¯hx§!ŒU_Ä¢žˆuÛãIΜòÕP˜9êqÄ‘ˤ1…ë}šDË\)_õ¯qÇHqÚIFËÌëbÇ"”¡ã{Af`²Î–â ñÆ-|î 6@MhZ¤ ¬r¿žö8k/Ùñ®ëôfË/ç~'¸uÍM÷®cŠ°¨ò ǵWÙM«×Ùj±ínŸ¾µì2.Ðú‡Ø÷V¸½—5@B{Õã6Äî«uöú™Sï&Ó•µ8\>VŒ^ i¤*eúPˆëNPvÿÊÞmÃJW3à´[RšäUAîS…iÿ„#TKÌóÀòÜÇÇ°¥³«š8½Y²qbŠÖé›M£1Wö—ú9ôv;A%yk`ÉñA‹_cRÛÓï%>% fcr/Ä?œ#B‰“ Zn."ìKÚ¬“œ÷`TÎ1­`Õ¥| ž›8¦ù¥¼ZU²m\m#•5‹ãH«i°Ÿnú!”^K<<5à[ÑÐäZ× ïX̤6•3;ñ…·÷ðÕÇÏ (Âä_>hÆÒ(¡Îôæ -Å«{QûáëkçÙ˜W}—mµ¯47š¶`!¤ã_J?¢ÓH—c&ªíü¬‰î0é ÝE2ŒÆfR#¶uN¯‰î[|sÆ4±Ùˆ„n;:,}µAWÍXêÑfM-mÐ ß+/b&œo#º°›ñµxä÷󀾿™µbdí“^gQ¸ó›ÀgVÁ²µÕPÐ$k7QÕ”­êt9Ã[Ã`ú -endstream -endobj -4115 0 obj << -/Type /FontDescriptor -/FontName /DQDZYQ+NimbusMonL-Bold -/Flags 4 -/FontBBox [-43 -278 681 871] -/Ascent 623 -/CapHeight 552 -/Descent -126 -/ItalicAngle 0 -/StemV 101 -/XHeight 439 -/CharSet (/a/b/c/d/e/hyphen/i/k/l/n/o/p/r/s/t/u/w/x/z) -/FontFile 4114 0 R ->> endobj -4116 0 obj << -/Length1 1624 -/Length2 7166 -/Length3 0 -/Length 7996 -/Filter /FlateDecode ->> -stream -xÚ­tuXÔm·.!¤”Ô tww7(90300Ìà0”4ÒRÒ!-(RÒHƒ Ýê‹„t7C }Ï·¿}½gÿµÏ÷ÇÌõ{Ö½Ö½îÏÃÎbh§B8€ÕpŸ¿ 4@êæà顇€ëò)#` pˆ²³« Á@W¢ÀÒ 0  -v „¤¤¤Ù*w_$ÔÉà23¶à~ü˜÷ß–ß.ß!w‘P'8€ãîà C¸»á¨;Šÿu   @9ƒ( P10|¢¥¯àÒÐ7h€á`$0ô¼+Å  uÃ=ÀÜ €ý}8"à èïÒ<ø︔<@€‡;Øzöq»ÿ†xî`¤ÔÃãîõ8!pÔ]Pîóýpg‡ þrG"î<Üî°;2C„Êà uGªÿ­å DýÎí½ƒÈ'áèù»¤?ØÍŠBáØõ;—‚z¸Ã€¾w¹ïÈÜ‘Ð?2<= p§+à ÁN@$ö𸣹ãþÝ× øoÕÝÝa¾¢¼þKå†Aø …„ïr:¢îr;Aá„¿—E A„ÿ¶ƒ<Ýÿ…y‘Äõ{g¸ïDA8ÌCô¨»”®ÿÝ”ùÿsCþŒø?2àÿÈxÿÿ†ûÏý·Küÿ{ŸÿI­î ƒéÝîàïGp÷Ê º€ßï à÷CóÌüÿÄÝ 0ßÿ!꟎à¿•þ&û'¦…ÞµC ît7>!a~Á¿ÍPu¨dE9: @Ø]·þØÍà 0…ƒï¦ú§¡wA‚‚ÿÀL¡Ž®ðßíûÃAÿÔ~7¨?ÊtÍM5ôôÿOoëOû@™úºƒÿ7…ô_‡ß<ÊÊ€Ÿ¸€OXB )*” -ø2þ¡ú÷YˆBB}V‚ü‚‚B€»ÿýþ}²ùÜú½3&( t·fÿeø ;z"‘wÓýsóïŠþ×ùσÁ>`GÂo3G™0—ô¬ TM^ߪUW‡v_¸{i­iQAðD{PzÔ¢Ô;ûëÊpþ#Ò7M¾Ó[î¿V´yVû;¨aœí©à½|†VîÎò-WClKïgl[ÄúíOé.Ü{*.h¾º4ddl[rË8Ò"‚ÄßGs³z?`;s' tL«yEÕJöƒ¢ªpk›#y}ÆÙ3𹯷ý§s…þqî+v Màë-–”¯=ò¤ÖñçÒK“d™§- -áOéümO¬uÿz³Ñ@ä’dO g´iãï½cºÐK€”«(úoxêæ·ˆ`?=’«ÅKù9)k¯;48_‰É[);k§"ˆù «‡jó„F=Š<¿¤9 ˸È@h1†i¯°ü‹}5žCÆ{íO¬ûX‡øÎTŽç¡=‡\ÏeKDHîÛPb+O†ŠÕ¤‹Y2¬ô­‚‡Ùi˜ÉCîÉÞhøí°˜"³²:%ŸÍFx6‘’µçš1"Ć˜—KUÉ Êdo>ŠcºØÈ>öVëߊ–ŒæbºÝ¥}DïDžþ¡oL{é—œOô¯{?ØÇ)”•ÎD†›¾\nÏ\U^:û½%’™ßh<ú^ÌmoLõ•2ê\ºZûHïÂÇKXhÍx–Üö#u¾ühUÒИÉ;&! ·÷%ÅÀ¶«‘}3zÝ„ãz!ãCÞŽyÂ%‡ÝŒ‚¥©ñXv· -¥h¼%ÖÅüø²_vD8œ_#CöY*èD"ÑfÌ;‹fCω–“_›$^iÒ+*U§/°¤Ø&:óퟖ ¢ET.ÑÔF–r¤ ( ªæ›p”ËÍ!צ¦&yð@Ù!¸;´™)%Z¿ªû¶¡Rkaú~÷ &@!C•5m;¢Œ÷*ÎüØ”]túàÈñRWîRÂ_kTobÔøÊÊÿ¸qŠäg^["uó}%5Áóɱ¯'ÄAEx‰\¹RªåIúqVt„Ç7—¸?ß?½]ÿêoŸöJ¢"&ÁÌSÌÚ¬=/l½¾¦™tÿÿ6Ýg\jË)šó} ˜k &S-mŠQ”s‰>YìŸb5UÏ7$XlTZ>ùTõ3œ*NítC=cü•Ùú>_g7T‚B„;TK]_¢äüˆm3ƒÊ¢µ¨u7ÞŶÿâ¥ynOÀj=‚ü)û}>'¢.ü’êÐwGxÝ Tè3`³7cœFûK¨5*Iù™.t¨Å­8ê'»V—"ιä#úOúVüíî”Íe«¾P`Þ߶¢˜ê ¿º -fŸøk&ƒùBÞŸ ÎHLê¹÷Ä_`’)æƶ³Øp?W`¾êD̲(2@Ýäu/ÑR1þªÕì’žYA³\eøe%ç›Ê²nýlÌzþ#9«tyoá£ÜÇ⣕|ß¹f„zŸ´^ñŸª©$®gD }Ÿ| ù«„£ïEm¿‰8ÛV”’OÐN„‚¥óeû;³ØÉ—g"3˜S,Ô§xÇ  w7bhuòý€â®yK)íWk÷5ê«E90|8#óSƒ€DØ7‘)œE–­¾³û¼µ«–uö÷„¸{9‘õE°Ø]ÒCÈCÌ(cðùY6§ë?·Þ†ÓËëöÐ*öZÆ͸uOêžÇ€Z¤ñnö#®z6E%~qÔ”¯uƤmøža™bøj!–k5¼Da&ŒVîÈRÂÝkYhД­¤æ´}ªë;8£*tJÇ?9ôPqe­ò òf–Ãj×ÆŸá—xaÝ3¦Å>ĉ>¸ÍcÄàQJy›E´TrFu`䪕¡¼ -¿JÅ…òu8Ø|Bž–ÿt÷*8“ƒ-ùõ|ýˆµåFsš9"Šåì³ZM§ÉËøáS[i2ÍjèÛôM³‡¹ÌÙW¡]ÙrsøõÅFU]a)×&jVm¬ò³…Šƒm¿¥4*õo¼Gbl>HâÀ9©#˜±Ÿuéz7Fò÷ã8V®ë¬¡JqÏõFNx”lÄUÇKQp,å^ÿj|ÖÎÖ6yíÜ¿¢Z Êšµ -pOÚ}ÛÁîç-áó¥å†_“ìélNà„…MÕW- eô…nnñ8ƒoDå!WölÙg ¯ 1Uï'¿ÚÉÆLNïôý.µ4DÅsúâË -sPÐb¹sÀ7JŠ"¦î…Ú±µ]ýRNR97•÷à>áOBGy¸!«> -‰•Ä[îµZ«&¹?«²¬\ø¿:åªèºŠìMJ!²%ê[>\\¸´¿£ÿ"ÿÙ„ƒ6žû¦Koº¤â…´NÉb-h ûxž¨W¨§òWÓ-תØÌméÚõÈk¶Ðb¢‰ñ_ÅmAk†j|¹Ò"sÅ -uEV·ËS#³ÜŽŠ. )ùÚ4µäñ†e?f'çÊÉ‘oôUŸr=<²hÿuùéz=#ZœñÍì»—iYßÛU®Œµì ÍÕÄ™ýÑ߶Z›R‰¦z9¼\G|Ý{Hw:'¿d†S6¾lè²0Ycrú®¿±uËZ›qtK ÖæF.4$^•±Í*eH‹‰ñh ü=oLí·5 -óÏ4Òê£%1+9B™)>L’n $Þû¹6;¸§E–2‰-B+¶”¤÷Ã^zä@5̓¥ãg²±Ml'6ÚNB Ó¬ãjV¾ý©Ög2á-ˆ·»Ë°žF4Ë5/!ai¶N|ëÛMôš:¼Hèœ.L䀹û6ÍWr•_­t~ÙÙ™œ\'­sº‘T@˜ ÁXc¤aEi2àºN9sÎK?>ïƒO)Vª×ºß"Á.#;A²Ò<õÈ^šÙFƒ4R¬–çPÌ>7øçM›¶ƒÔ’èß1v¤Œ„¹èË*]Â)¥@-=›Í3­.ÌäCsSÅCH¶&Ï FCÌ4‡¹Ÿ¸X×_Œw°çËèJ³cýÉËØSO¸áj®òí%ÊÂà({Âœi_ -!^IuM+& [hÜŠÓ1îÛÔG׶PŠÝHzzŠ½ú\AebwÉ”6,$¯¸°½ÂA7šóñE÷ÃØ-ß4Rn«òÆ‘ÃUH-Hr® Í§î@‚{—L¾ BáA脱!yŠ„/:ª…T ºK·##Î.Ì­Þ_ÄrÃ6uy‰.¦¤»ó|Ǩª<#0 p£ãÜMÚ’ÿLi¿©™‰EÈüÚAï{ëMà8÷Ì‹Õ’5ü^ïmÎùq“ËÅâlP÷›¾Æ÷m‡¨ü8¦§¹|öVckšÔÐ42‹Kf}Ñ®¼ECz´•®iÊÖhV~‹vXVÕŠ‰ þF¤fã¢^HÝ"m«çÊï½Vb϶x¥lrùþ†¼°ÃÞ™6qpUùUm+óÒš6½œ)J»:¾>´ÏÆyê:`ä_Eo[Z€®qÓêÖOÈU('wøñ´HJð¦3«e®ê ’FÆàgoÕà·uô‡’ýp|ðž­ò+6îjUÅ h9cù†e9]r×#•VÖ -í!ÉMR³5`2¾Í—7tè\Ö„lD}ÀØ3µ.!¶L+C¢Û­êÇq™v}þ¯‹ _—æ–JªI"LìÄ8)å¦åÇ$ßèìœïQØûœb3\=²Ú{@A~„!¿[b h²ëkZâ!"-ÃûÅOÄ|_0ÀtÅ÷»¢”Æí­°µ¶w ÜôªÍx^5;µ-.ªÜéuð&ÐF˜tð”QôŸ”|U³KƒØÍþ-#ºÃD\Lr$› 9¶akÿâ/ˆ?ñ .¬TÝz/èXµfŒ™óv ôÅ«°÷:Vxqm^ȨJª³œ{_LãÁìdcú˜/P—>ç}jqóܘ˜Iqªå‹ ö1Nm¦HTž+}8åóšáù ´t?ÙÏ#0z…¯kq&Ãt\þe´Bƒ¨b£{½ƒ‚džZ¡“Ë#ù)*/{Û¢a·aÞKõ¡® LÕgÍé1+ŠyÎVbÎs}ß—ÁÛ·llÂÊÉ’ è,XLyë꞊ ¨$Ö§3U$ÉòJmY’šg¨E «uO˜H€R0òq[&|›eˆl¾t¹cñøe*¨«ã§b¶i™°¸<‘¢Ï{Œ‰ +®,oeÕÐÉ1]#/µ!ë•/%ãxVÑÔS‰‚ŒˆWgž›¿²¥–a÷Ñ›Îu½Å_»¶éX›pæUhÖt³Pr⬇ðÙ°¼W©œnì˜0dxj£qïÎsfÑTSy@ð>Añ™Ï¦:0#-ßš=ú4ú -ÊþHK(ÅñŒ,¥XúoàuCJþ…¢X ˜3t“ò™L‚ŒºaÝð¯³(4ÍÖð‹M7ßç‰S1¤È“|L´M? LrÅÁ£2y_–)Dè©|­}ã)˜8#1¼ÔwU¥=Æke -àŸì ¬íÛ£xáÖøÈñíŽâ -‘”Õt¢nѵ~¢¤£% Ž\l×ìݱ´§ÏfÉt, • :Mo°Ó+K¨ -p9>T­?¹­ìì]0¾)Âd h,ÕÒÉñ-)nšÓøÀ;p#ošÐEÄØjãz²ÇzÁYxõjöìäV„åŠAÆ™l“u–šB‡Qô¥˜”Y¨xxàõëɇ˜Qþ‰Õ59Ó̱ôÜIWv¥rú^?:&‚¡”Oü -‰âÅ ±†ìÀÙ†õÏ0„Ö¬¾G‘­I–{ᲈá·bÇÒ®)k2Æ$°­˜*¸}ƒýµ…êˆ2‹Ý,±]•ùäÅq<ªéH³ýèä1©g/ê's›àÓ(b•¦üÅ0µ •ð•¾rS ÁËI_%õô‘Ý\Yã³³¢‘]önP«njq¯GÃÔëW*õé6.¢SÒBp­9ªO¡?õcäeÊ—z/Ø(³o“®s„)˜ÛwftÅ„îÙý¥A!¨ÁZlÑÓqHGN}ØßÈi¹Âȼºå¢KþöÐ((¢Ôª-‚èæÑÖRc,«AÁ¢gÓÍ–Í8ñ˜˜½­…´mN£÷_ayÅÁŸÏx/íEuæÝ“œ)éDh«¹çŒN)¢Ý£©¢Dø-q 3(צŒ¹fíÚ! ý3ôùýûçrr0¿ -ŽJE-;v,Y hô¤…”Ù˜8™Cÿ5·CgEµ°!6\ÔÎdµÏ àû²¥ºŠk.½PÍ@ê8±ˆ^ýrndÄ2ÂœXÎoN½<èMÏz#½ô²~^VGíÑ‚™qPj|Œž·^õõùì.*—9ß=X±@¼_mhÀuôŸî…ëD}ŸæêsÝŠ&3F+g¯ã°È(F¯GáÒÞßœ¾÷%B2µßcã A#>¸Y±ÏìûÒ:ؽVÖ¬~òÓ¶s.̾yŸð‡¨ ƒü[gã nD$I— …û緥絷~~&Zòe[‡s$=E˯ã¶OÔ#Cüݘ"kuöH©GHJQ-þ+)6™ITëp×`ëÅ'Bºí$ëß…¯Çô0!škÓ †y7P ûò¾C¾švÃÓ¿xu×ìç˜'•9:·'/ég&¯ãÔ¸õó“’,G­Ê®Rrî¼ÖÛïTmxsBá—rèO/,ÜZ ¸ÖúÕø±ý¡•Ytæ³ö«7Îä½°ùo0ŠÜ¸-#šÚ~^ò K¾ƒJÊT†EPò€ÿÜüÛ&-oÜ{:c†Ï›µE|®š;@)ð¥ËÃÝSŒ$€äËÛE «WŠ¥ŽÑ*ó©=[;ìZä<÷%Ýù[—€TUêç'¤"½âe+®i…8|žÞÎåçú¼^ZDêmpR¹xô±ë#ƒ¡$>©÷©~X»9!ÃÌ ¤vh}3ÚCíàž¯„ê8å §,yä´O×Õ_¼À¸ÍD²r––âs+—>e`/cÝÊÑ”ø°>Y9~“dh]K§Ð‡Y×ýü¡1’ìvÞ®(æ8ÏR "H³ôk‚dT2ûY1”Ô¡9úðÝΦ!U™^Ið[ÀÜu8ÿ“HÑa"ž3„{%éœÁ8xJ°°ŽdÕ㯠7óµ`\ÛÐS¯¶œ¯ôÊ;Û*JVÉWÖ¾h}õ…xº%jœ0.²»''m©2Ólfðýušr0¦WÃ|ØæÏl1ïÎâÂNÞ~Òô‹1‘‚=¿(6Š>lQëþ,”äáF¿ % >ʃ¿Þ»b‰¯8‹z¶KPkÍ=(,_ªUÜÇ_–ÀÃÈ{0žÁR¯¶Ûl6(­_íwN7#–\•óc·Ž2U²né_j~õÁAõM’x׸‡¼Ð¶<Ïó`i‹ G5i>„$©8ØcÊ>¯²SNìqÌ Û‰1—•·Yåñ4¯^̹T–+÷’Þ?_­íMSÙGó´:›l¬â}–+aŠ?üd—’7ÿ‡ö“‡h<¯ôÆâÅNŠ¡3h™Òt|ÈûKîáf+Ìh‘žç¾ ãÜ…'¶LмñÓg/¸L,Ì[K&ÜVr>`7¼uÏì$¼7Y“Èl»ló$×dß‚œý`Ðm¸°è̸–ߦ߹_u™µkk_"¨h`škkKôdW1X®Ø(ò~æNÙeŒžX7a•£½áP!MÉŒDí4n§§?5ÀŽ¶Zð«ø°k§r šÂ>hùî€2<áÔ—}ͪçÇÒ}oOS"_°éUƒ&G$G6ÄæùÔ׸äŽ~‚4®º“3/Ç,»D²ôÚëT<Ð5T‡Ýs¯7 ,ŠÈ/¢5p*Ûy»œ29Pã·­0‰ŒÅb›‚ŸD> endobj -4118 0 obj << -/Length1 1612 -/Length2 19759 -/Length3 0 -/Length 20600 -/Filter /FlateDecode ->> -stream -xÚ¬»c”e]³%œv¥Í“V¥Ui۶͓¶*mÛ¶••v¥mÛ¶ºž÷íÛ·ÇýúûÓ}œ1öŠˆ5cFÌXkìýã+(Ó šLÅ€vÎtLôŒ\9K[#'Y  ’©¹ ௑ Žœ\ØÑÔÐÙh'bèlÊP75ˆ˜˜™Lœœœpäa ½‡£¥¹…3€JUIš–öûZþ yü‡çïN'Ks;ÅßWS ½­©ó_ˆÿëʦ¦g S€™¥)@X^ASRN@%.§ -7µ3u4´(¸ÙXd,MíœL©f@G€Í¿c ‰å?¥9ÑÿÅtœìM-ÿn3u76µÿÇõ`oêhkéäô÷`é0w4´sþÛg ÀÒÎØÆÅäífÀ²wþ°ýëû ¦trv2v´´wüͪ "öožÎ†Îÿäv²üëÍþFš]þ)é_¾¿0½Î†–vNgSwçr™L,ìm =þæþ fïhù/.N–væÿÉà;ÀÑÔÜÐÑÄÆÔÉé/Ì_ìºóŸuþ·ê íím<þµø¯¨ÿÅÁÒÙÉÔÆŒŽ‰ùoNc翹Í-íàþI;3 €‰ñßvûÿð¹š:þ«ATÿÌ õ_†&@;€‰©ƒÐùoJÕÿÊôÿ}"ÿ7Hüß"ð‹¼ÿoâþWþ·Cüÿzžÿ+´˜‹œ¡íßø÷ø{Ã2€îCÇÿO¸¡­¥Çÿaà T7ý7ÉÿIgÿÍ´3ÿ+#=ã¿–Nb–î¦& -–ÎÆ3C›¿ú—]ÕÎÄÔÑÆÒÎô¯¢ÿj&€Ž‰‘ñ¿øT,,­íþi=Û¿]¦v&ÿ•ü_‘þEA^KVFE˜ö¿Þ©ÿŠRø«½³Š‡ý_bÿ³Y ÉÿZüƒ!$txÑý=tÌ,ö¿ 01ùü²ý †é?ײ†ÎŽ–îí¿%32ý«ðÿùûÏ•îµ3šü3+ÊΆv&Çëþq»8:þUõ_'þoÁÿ±þ× ›šº›í,¹ƒ¬Ò2Óë°r‡ÆE´ûz˜À‡‚íKUŠ -ük€Ý~iaÛœ•ïµÁôM“\Ÿí §öûR4#=˜6”Ý)¦—ùø>¤Ô½(´ z¥ßÒÏÔ£¼®æe¶ ´ØÕvÆ•ôJÞ¡&;Xa®ž¨ýI] üÑÉí}Sb1~#7 ÖžžQ$?=RŒ vß@öîãÑæÄÂ’sbù&Ÿ'9{8Þ7B¾ºr¸íp+"WÓŸ%µEùŒ8]i -6{A…p´Xa“§Ï(úå 8—+çb2çû-Š5SOö51ÞLô¯`›`ÉÙ¨·[Ñu·Œ ¿gÁ´šó²¯Äð¹—í»G²îÙ5 ÷,F°ï’ôÜü"‘0æ:wùm“ã׳ -Z ãf$–á[tWÎ,x{'ã¸ÆbxÚcú£„é±l\¼¾yË»;'Žzž¡Z:îVæá;lˆ¼©·7›ƒ?‡¼ Àcßqh ÷».ø :;Èô†pzZ²uZÊ×ïŽV¿Þs}B¡À8tijvßY²Ó}Å1>Öìl!ÚÕH«­]¬l¬Ba$”ä×”Ë÷“/ðÝ6VǽïM±ªæSÔµ?ð­[–ë/Q­Û+Ãþuö>àØl¤‚>°û͸ݜÚ90^bËcBD@·¥˜µT¿¾âËGÒå4B=¢ß^d -9Omxeg|‹—>˜FÖ'QáÀU½ÑujxÊ÷‡3ú~ÖKwy…è‰êOzëŸNUzúÓצ›·3¬ÓMÊLš}ÝH-É)áGdz؟Y©\¡UˆÁ\*tm9^I"Õ")µ-)]ˆµ£žBØjõ=¿^´õËBÍâɪÙÓšEôŠ§~É)ºË)‰1pQòn#å/s[E!zÔNܘ·ûÒ-¥´1ÍMSÇŸÄ­ß®u€P¼ä+ö8B˜Æ|ï)~?&W“»šŽù¾–ò°%>»Nõ«„9@Uxú±xTŒñ¥¤ºÁD„¯uú±?ŒGÍðÞ¯S¯1Á…ÞØË eõœ]~¬`z¦¡­å“ó6 <²X„½%Ï+–Ü&Õ»ŸÞOØtDuƒlá.ð¦Â]íý‚B>p‚кvÄ©m -aι<µEpV̤ó“óÉ‹$‘,ioßÄMÿ̸—¼ð(au’‹»õ!tw²˜óhÇЂaø/ò¸vãÇÿÔœVÔ¬w—[›>6,ÒÍ…²‹úMüùPb%ó¼T¿ëÏ3Õ;úNÓ™G‰Ï‚*Îï÷ýR£:ë -Yßhm·ËæWiàшÌç ‚ª÷)ËÃB"ŽYÎÚÁ¬Á²Þ¹=fdêŽ[#«nõ¦²$P‹¤‚Aóy.Äþ3Ñ -ÒCHè$kã4º¸éàÀ*TG’—Nb¼ÆÐ@™T[Ú¤F¹Ø){œ§S <‚”©²haØ¿vqä¤0eçdo31êª-2Þ{ºfä3"g6<ºr–›ç´g,1Æ^åפ÷4BšèýVŒË4‚ù‚Œ9ónÚ2oì– -8;Þï¢C¤ -¹J€|{75þã_5uÞ:rM̼ª@†š Úù³®#n!æjƯQù:—¸º)i”šraw.ÕŸÎIàËŠXˆ'Ë{î'Üj'»G³jù6r¬›Z§‡LûýÅ’§/¨ß¶ÊO<¾Â‡ºïɬ\zM’Ž<¹GÁ΂Ÿ•ã‰ö}Ás+×y;ÄÓ$±‘oLx1@ñ!/ð&ÝQø¥@–93b±¬ÕèÇkX-½K\5#H-mÔE1™ÉË\ý–"„}©Kw <ÒÍÄ蜥ažo[EŸ ÛPÒ΄isSÆ,Ö)¨BÉ5‡‚·RÙ P„¤šó8‚ÍfÁm€î}ø4…IÓî+xÄHÍņ-T÷}„-WàS.Ûí‚ÒÖ—‹tµæ–¨=W™¯õ¼:yÀÁ¡b+ÜhH$fŒüz—ŽüsUº×¦9e&²_îy¦4]/ê2Šl)@…ú«qÔIöŽ”êbÒ´Út9¿Â~A˜ÊfI|†çœ†çÏÛlµÔsCc2YÁçnÈdUz]v[«¼Ø…êÈU'¿Êcm%n:-ÆN÷^Ë{‹«eEG¹Œˆ6?ZvéÝã÷ºÚëioÅâ‚ŒöWˆ€“õ:á){y¬ÎÞW"_Ãä‹o ùöˆ_º–Ncð%nåõ%to¾òu—¡ÆD¢­È3?ƒºƒ·ð¿„V6Š„ábÒ@ÐYÕå•)‰[‹m±¢Ì!é±%g:X(˜üò»l‘_+yz}ÃͧÒɹø•°ÎÊ^km0Âç-¿ú5²Ú -õ7ž‹õ÷EôösƲ{y2E^•LBàí˜`T¦Îµ_PøVâA+(oËß­••'†¿x‘ŒM“‚›ÊÉâ^ó;d6©ÍTúKYåÀì`Loü»ý’”‡oìñ8¨å—òj.RæÛ-%ôãïÃ0 —$Óƒþ“ƒ¡‘ãÍ/9µ‰©’œÀêÖŠ'›fcªG®nûÎõC¥wJß D:u¤pó -o»¦7\È—OÞ_o•¦—Ø?¬ˆŽ3'A4‰‹ÔÈs»·_ZϺ^AæÌ<Å.ˆ,¿ñetL‹9¶7Zñ%›)Bjw=-í»…yÓ:“ftõÖ’2­SóÕ=ƒíH£š¯é -±Ë,hC×hØÐbCѦëLå ü>žP¢A’íõ²J( \ -OôñB©p—뮹P?ݺEç6m`G/m–ªggÔâhaºT+³â¹y Ÿ}¢$]7éamº¿¤«Ùö¶Ä‚»^Øo}cŸ§Þ˜Ëñ7¡cñKP*‰½ã²ñæIœš½Éó¯ûÊ`HÊúr¹Oö×7Ú6¡œïhÉ ƒ]f\kxw9Läû ž -ƒó«}R?%K0mžŸÌVìíЊú›„é|6·Ü¼uá7Ü3‘KÆÚzljIÄ>LJl€¿*ž)¡Šã—~ÁÎiS°}½”B¯Šô¸/ÇÄ44ï>OijÎk`’¬˜’Õ¦¶SQ3ØainCì’ëvl—‚øª‚ŠÔ²y2O0ïI|ÐÌ÷"°L3¿ƒ}E„{KKë°¥ÓÛTDŒšY)!Ò§a˽7çÐ)ËÊE6ã¤Æį'솦éæ×dÛ FÑsCrðïZ‚šÊâºK -cþϺÖCÀá¤ÝV£LZÆ4‡ßÊø¤c]gz§¡I[%ýMj·œº [?Jv_ͦn*P¨ïß(ñasÙ¼#ÍŸ]ƒ¿júŽ¡‡ÜÌEID:¤œê€q±.ºþ‘ͺàf:•Ì6É'¸~"rüR*+IÍýq”âb$sÑ,GuÓ¦³G¤'Û“¦ôÐä%?EKÔ˜t_6:éï[‘1¿¼±ŒYíµYø“PÜñ{]>§y÷º‘>ÎCë ¹¨n«i³¾8´©® aÔª©·~kz(Ú åì+ ó’³ÀýX -ëç—†çT?H&'ˆ~ÌM;>•C茸´#äúŸÄæù<·¨w\þn_‰â‘(Êm5¥¹þŠ?»c™ZÂÙì¡{´«ÅRLž@û@ž°ÚHÛ ‹c æ#3J´I@ÚAgöÔ¥„Šr<™‡œ@ÄÚY±_á/9ìýÐÊÅ[+^½‹Ìç=8·%j¹/†Þ+,‰ï*ªoI ÁëNç¹êkL“G{êrX r]ÀðûàƒÓ°j©˜éŒWÁ9ÿS¬Ý · Ôx·Þvá¾Éi¨C߆‚äKDUÇÖ.²þ.ÂÉŸž:AB^È7Ôõ€&XSÛ~ÔÙz7}0_ÝŒÒk¤YoM-‚´<ºq<~Ü ';ÈEHÑxFûS绪¨çé,qÞe‚ ,.C‹sU^ågþAÃ!ÂÞmð>ødÀ†ÚµtÜÈçPJÁvK®ÃRi!ЪhêÊÜW¦[ï²3Gv­HVüZˆ‘d$â/ -¦^V ¹ÙIÝÆ_ÉÃÏã<÷vgI`}¯^ëH=2Š0y±¶À¬c¢m uÐáÝ-MUßu÷,¾hÜñ®â ƒüt-ü3 ïo*d/¢]®ê–ñpü¦/³eÖBÙž0ÁÛ|-ݼÁïLÞˆM'è -ÿ™Ü•º‡v‘ºG?ÑkË«.E›KÓ\mƒ©Åy†IŽö{× ËdÉbp—–º¬=¦l‚ÍIȺž¶l+ û&˜Ï5!'<ü"–QK >SwÇHÆŒ¦ÅYwÈï6-îŸ?faN]–åU}Î8WÞ„ÙOªp&ìä@–S*k'rm6ü©Z -„¢”}ï ê> ¥8Ð;nòylrE$¹CØ^%ê(W“Yq†ÖÁ´ïè.¤ÕÆH›IË/o£ -ý)¯kuPîwxÂèÇ$¾-_„¤Öî’D]µ†HüuÉyѦH»© {Ã`…'«BtJù(P<&ß" ÁàÒm½^æ¼úµüî©i‰FRn,Uê×ÝÆÖÊ,)É+â|ì¦uø:5r³y1#yt«KbŠðÎÀóÄýÁ!m„פ1&äžÅ5»Tö1ÃÌ64oŒm Ý÷9dÆC©ÉÚÍbŽ· +ÕÉ&€HÕSŠž>ù€D•*4"LSQŸ#ŽºÞvYNp7·À˜íI>ñÖNoPu´|µŒÅ¦+êXüMY25mN3÷\”šèV­¢ª”0ˆŒÔ­>/4jÄ7â^0F3*¹ÀÞ.ˆ`ƒ²A6g[DYŽîJg*õùܺ†~N! ëVB‘Gé£ê B£iˆ@ñ|¾™‘†Þ¦òV»^Ø›_U֫ljà ¿œänûCN®ä@þ§˜l¤Ñ¹bÒêtdL0 ,ôJšä” íÌÎñføý•f€ùB]å£Ëêi_VŠˆ¿Ò¤öNgÇ~ŽˆÓ˜E~ˆ¡K¡BdÀòt3ñk)Ôà§7³F“guÀdqYõ‘ž7)žÂ3Ö‹TIbvÍmË'¸‰›9,²ëÉ#B\óÞ°Ú¼PŽÖ4,¸ïÎê½”u׸äw«_øA+Äb¿}í‰Æ]o¯üÆ~kwªq×.ïÑü2'*‡J+—L -M/|ë¡/± Õb- ã ‰È}Ûí#_«a[Is^H¬ÜàèQ3½ÙˆFÜsÏv7t]• ./€€“Q¸¦Ð• §µ×ˆö;ÊñĦÿ-[û½8±u$ Ÿöw,íMæìŒ)ƒ^ÃoÛÁ÷WÌ{BlŸLPYuƒ"/»ÄÈzRb®CÒzLÄbº+£“~–K4!ÝäÛÛðµSîìjⓦËUÚ]ïî¥Ú´Nø36j¬Ý¨à6q£ä¤´ÞõNçžÏ¼­ŸË…‹Ò£föbÔ›·›Q%]Õ\-)áÞÕôÀúÃÈdÌÑ\]· 'ÕßU'[óç†&A¥ZÁjÙÇ~»ü(—{rدi]ɵ`p5ìlù¶¶ŠúDºó!WZYÝo©Iñ’¾³Ìš$öîÌ‹«Ûo•œìÛå~Úéh€ÝU2š>Ó§4"tö(ñ|×_ Åÿp§¡ÆN’à6ËÈ»meŠ®}NxÐvá(v5ü¨ü$ ¬'Û½õïq´ƒ”iÜ¥ t2aí–ÏT‘Aõ9â³{ñäSúà -¶¡ªÝÒ ”ƒ¿Û!€öŽd ¼Æÿ9OÛ”H­kÓ¸MÈ´ž½?wý–ÊêhÙÏ¢óè}¸)¤Ã`äó˜’=}œÈEŽþE—¦Î’ÿŠBöx¼Ú¾9vÚo¹Dè*âÕCÖÜEíâ»EjÞK•ÀœäȦÄ|_déÿð¬Ößx^JZø…nºD&q$%Í1Ø«ãÒ;PÊCB5½oRèß·ÝËqZôV J•ð²) ÍIÄ«p,ðNÞ¿H41ÚögEÄûáXÔ©ÄÕµ1B)1V#pa;Õ!pUQêêÞ›ø+­°dá1ÔÅ=®À… o܃¤(S[ö§Û1ô b¦ÍÚ*gÒdf®ðåjI©ÇTÁ»KXÿª¸ÝÌŬ](º¼}§Ž‘ÆáÓƒ×`s/”q1MÓ°hH @—J4l`ÒîÅä—Pµ¬iÒvÚ˜;f³·µLœ8¾{¶µm ÂÌ¡ï`+ýZî¬wA>¤¾¸ÁPIç–QGËm Ôžviy7^i7w¿ùÛóìicœT¬çêó-«ä¯§ ÑP4 ö‹=/f¿¬îæ±x¦RÛÓ^–žùonE’ ¨Ø¸4;¼å¾j—B§ÛŠøý5®)\i#›Êù`—ÙIÔ¬^¸EQ×ÞÓå…R>MQ„jŒö»5™J‘büû:ù§ ‹ƒ¯ÖâN?èèý‹v†Ûž³\K8A¶ÆKŸ^3úyö–†ávMpg´©bÌgä(šÚÜWa1S~±Sü"“R³åF¢ôS¯Ž!«4k<ìšç©á÷l† -~Bg7³™à›ƒô<¿½&^L|hÓNZ¼ð×ïÓ²«Á]‰q«ŽÜGÌÝ{†u8ˆh¨|B«*_Öp’;AGjs#ÈÂ¥¤ÖÙ*ì -æ![:²tê_2t¶ -jëÛ+ BgR•¥6„å  $òߺ§e£–ëL:ô€˜ƒÒ‹= „—B$W°o¨¢ö3²Y`"+çOPþ]´¼h퇄±¿‰èñƒ4–£ôâØ"¿ š0Våo|Ñ@¯ÂfâÄÞ>:‚pø"1N2+gh DHea–¡÷œÏ&Ï=á]ˆ~„ÂIYˆã—”VeÎ|ÕB¾Ê²HßìÞ—½ÅÜ õ¿LÕ#]ÃæËO0Í-Æçi0ŠÎ*ÃÓ…ýz£øsÚ &o¾”¼{Pºi"  “gÕÐz‡œ§àÈÊ#AJ„eWIc@¶ÑÅ<¦)Ø#y§E¼)ÏaËÿM4Ã¥™%‹•¥Lé ž¯BN"K‚qUõ£§1¿wVCœ/B¼Ê¾OäÞ ˆ%ˆêôÛS*|(Ä_er(ÊlÔÓ88Ás@Ø&éjžî¨<‹V†­öÁ-½¼Žô™áðGò -D_Ó®+„u8phãh“ô\ Æ9ºMf -sš$ˆ€|è]]œs‚⨠ý=“y»´«7š^¥E,ËÎ wÀØÿm:'›©^²7ìŽþ›döÃK0::µ[»{¤èB† ó£õic0í‹Oo“‚ŽÇ3¼°ž¬ÈŽ±ë¨ Ö¯A¬íêçû· åÖ,Oý‡ÑHcH ;ƒÅiò‘f'ž”¢Ó]BéÅ —ž¤Œ$!Ö\&D-ÅÄc1}º YµæÉ'h~·fRã½›|O,ñJÎ=Þ‰LßtPs‘ÒáζÝ@0λ£º=›¼ø¢Òô|OºSXXö8•uµdÒ|iÁ—ÙI­`ÓаˆÎkØI%TCE§Üa^VhOWÚ»[ ‹Ùz1zù4.?Q ÏVùªÇÝ êYÕÄÍüÈî'HJöJÄhß'wÐC £Žg}àÿä»;ìâö¯ú‡w|?ôŹàX¢ìJ|SíðíÇzœ€Óõ†w3C:¬ÃxAjŒ]µO‘¯xËÓPSÂg\C &x;:f&ØkŒÄv€Éæ÷:æ:ûí&î½®+ªO]¡œDÄƱ|Q Ì™øÕ õ»@R© íÁîØü¬pcô ,³C -àvfÍŒÀùÁý*ÜÒ';ä ¤$ø­r¸qZ…g.œäÇ×IÌÑÙÊ©ùÒ+4SG[íÜëÛÁ«•NZaÏ¿‰!ÊW>¡H½¥š³ÿÔd)#¤™Â™©Øì¾³Üm!ÁÃKÁCŠTÚ—…¥ß ÚM -Ÿ1Œ"X­ãMÀZdŒBÐ|àõõɶœl6A8(Ÿ§•Ï¹`¨Í¥QŸ;cÈ*"ÒoX;]‘œ2Ј,ß%èü“0‡ìyÕ'Ú=,&\0œÎkÅñ²TÞZ|;ÓBÓaOö÷w’LÂÙ^¡–ûœ›!¬B:«(b¿<î;Ø|ug¶. äÊák›g,ÃaøT šôZA)"&EÂb;B³¸üÇí¾€äBŹ„o\¹08Æ_Çt¨Z ªJæ +Іá{Z?«cŸÇ2\ÇꀤÎO䘰sx¬p”J@,‘ßyÞÚ6¿Òö®SÌHg‰—‘j.ñg)Æ ó“Íø߸PÙ¯Ž¡ût´Þ…iôyGN`ÄŠc™„oo@h–èQæûZÇ{Ã(=k 0ùÀ4|ìÎB¡öÔ‘× ‡¹ý>Ý - æ['ÅU|öqkUÔ^î¦(ˆd-]_g• +aòÑ”‰÷ÄÆû6ÌãÛœY« °º®oCð]§ãÉîõ~„+ÓÖnÛ¬ÅÐD•¨–8/f'NñÜGÂît™:`*â…|¹jάn¸'J¡‘ÝБE7ÃúÙÈ’Þ—ïIÌ -¶>¨´š’äçy¯i6iç[î"Lõ èîÏŸQ¼7Ñ\^‘µ?X¤¿ó2Àµ¾·Uov%‘¤rmÛ±â!iÝbÃqÁˆ;#R Þmõ¹!`dSùE/¯ð)&!‚d±"ñ¶ÂáI9òN²ú¢h[#p^xYî#ìLt¸lKtͦÚƨc‚ AÚèQ{…-É9+Uÿ¶¬ßËâ õ[ tGßæ\æ”åS46ü)KÐÄjŠÐ:¼È5S²0ïD^C׼īšs©ðŸ+&¹“®{–ã?.`°Âõ @ôÉjï­øXÊ3zÐü¨“ƒÔ¿²‘Ϋ€}¬ÇapÞd@õÔŒÜ]-'â`‚\\ƾb V=7ò˃¹©3r'¶1Ï]Üaxý¨.RL³`#²HOW nည’ß°|„ïì:&žåó2§¯¯qu,yB4ÎnyŒ¡óÀöUº„ɬPšz½TmîÉmp&i…O–W•‚Ýb¶ÜZ@uÁ«òµ‘ò`ý5}ÙraÁý~«bãWâ(ñYcË¡&>ìŠî&mkÜÕ¿iÿ,ÄQ6Aþ Ž )&›™à4)TÂà·/Gœ&ÜÀs'ÖœP5†h¡­¹ôµŸ¨™mc‘Y<¤{Yº9-ÆàšÛtY¹N¢‡;;ìü ¢OiÃÊ~žDÖ>_‘‹v=ˆ`³]A4°}æ½7DÑš@«̧.}êÄâH´'è±óà³bCyÖÁŽñ¿W3Í!¯ëŒJcÞMw}ÕzÑn¨Ô}…Eñ¢* -ˆ‚pöîÃ/Ÿ6ù>ŠÚ’Žz„n>ø3»Ž…ÇÑ ~[¹U TÚÜØøµÇkß =ÚOЧÓul´LôîÙGÍâ©›hç;‹²fU½§w‘¥½À[ý9gû“-IGusÁŠÔ‹69ö’–fã sýaÔÃï™ç*0Z6B(¡sîŽtKùÄ{Õ˜å4o0 ýÛáu^²É% -*É nLcs_øª ª>ùµäxëÕ¬ßôS˜‹|Y†¾*1HìÖüH)Sd•£WͶìøÆBV­s~YõýÅÝ•eÉiefpÔB >ô‹ð9"k¡¢²;icGdv X\{?nx­è®ÑAöuZh_æ{FÀÅdáµÙ |P$§¬T%µèÇÄGLx#¹I˜I™±î}ÑoÓC¿u?òú£+ø`o@EŸHG”>w†ëùxZMlÜJ°öˆ9ð³öÓ ¿âŽpfâŠ@Ÿ§qŠv0D *?ùìAjt°×£"¶0Á«{ÿ/6 y×;¨‡:þ&Hz®³xÒÓ $Ð]UÔfèþý‡!=ÏOÙ%­ŸIÇ‘1P_ÕïÕˆFȺúÛÅ;¬Pöœö"Ñ]o¹ËÄho橃d¹á -¬¶$.nD<¦a´/¤¹à•˜,_†…Aμš}j'gf¡·ºÓZÂ.Ù-e >î¼n±N㟓¨¼U¨aå4ôýØ'ï"ówœV 9aú !•{oÏöRð$¤ìjÐÝKDÅìuà3›¢;otá`yºc ÔX¥×`F©_ZB„ÿüîHdü²O…Aö¾…)¼cJȽ;@¨Iâ—ÉÆw-3Ú9™âžŒÕ·ïq¶ -ɼO:RNcg÷í‹Fb«#‚AvþÝ{úåZ›Ñb쪻ÓÂ]Ðb}»Î¸1Ø@3ÞÙÙ\ÂœZ—S.ê"ºŸúõt^ùŽëÛ @£îyÜ„¼‡ÏÛô;ct‡ôq¾C†A’8ž•ûÑDjSjë6Rë‰Öø\ÇüYó€³ê°ÑóRðïrT ɽۖÞJ«¶UýU3gw·ˆ“‡A™+r&ž¥îu3ijV#½#=¿—híU>>ªZò'ÓSz~²ô™5ØòA÷ŒùFáà~Ua7è¦èmó›}ݧËág_ýæ—¦•–—îXÊ|ïþ_˜m1€'ü-/<,xí¼N¤dzƒåÓ6¯PY T?fŠÎ9¡.L³Cn½Ÿ¯nÓHj‚ÏWòº¯…Ž¿¥ƒ“sgÆ‘uá ÞpJÀÏ›Fì"&èŠdáý=¶X]îäû4*…N»ÖÒG¢äÄq4™„ÁOÎýFiŽ ¤T¼ëCXr3¦21©¨Ø/9jêÔ=ŽNlWW 3xý¸PîÆb-xŸÿЛŠ›°ÑEr­V½Éí܃Ê4y)P¡%Áܯ½ hüÌÁ–MìõgDdÂZ§Den0ž‘-q¼Y¸[f&xÕ*TžÍ^HÛ»¹kÙc,Þc -y«>ä—ï«ñ…i=­ÃüÙ«H`›‹$,Ý…«†Ê´Ô¨‰R\7ÊÉÁÖÞ>xÖÀÝçö(Œ^¹È:Çи·üŸôSÁeU8@V¢"-/'šÖGªÏ§Ý£HÍoLáá.S§øÕ Ú> -ðAÑô(,Ñ¡ u´R Žª¥©ʫ퉾ú_ÖCK/uk (x¿·Ÿfµ®í!€ø$vTëmMÌnßDÅ2GÄ„è2‹7)š%¹. -‹£I½É+“øíÊÞooÝH‚¼ÃF{ -¾!Y­\¸IS:W…;¿b˜×Ã#LH€…ÑêEl6ä\«héýÜ0aÆ“qM ü–=¢)ðáܬœOµµ×²²„¿ ÝeþnUÛ^q†J…É;ÃÏÇpÀ‰x蟕õA~ïÞ¤9 „;TFܱv¥‚ùÚZ]ÉA¨Ú=Ô´(p‹——oY¢ìKûA¾8mIÛ)NDxœE $ƒrýè Š£y‚|–§oD„À§øçO†µä•l,Ô ¶[ÙùUÆÖå–C­¼$: Ôý »ù®- •%Á+É·Àª×çfÛßÀÛ)"õB±|Wuü]½Ò?Äëƒ1÷•jXÈ•rvþ¸Í²P*Ö†w ¹ÞŸc{œñINX|Vêû¹í()æÁܦ¼¨ž<™g§!V ¡áülðߪÓ:¹&¼&[”µŒxðÒsôœÖ„䯑»pòâVñû²/nÙê"‹¤0¬>¸k -H<ŠE5Z“$¥” óÚ˜rzŸ=w¯Î ]³È~· @Í&¸<}Fuò.þœ¦¬Åé\Ýy3ÈÝŠ5<Ügr¬"áÏTc¿±K¶7Iª8ÿ@}cÕÉZ•ÑÛ$#Cá¯ì ,½þqRc€L³xËÒD©ž±Iµº?ôy¢ò7Àßð©Ì°iâóÉ$Š/ÞmŽ%b]70CœŒk.—?;§-aድQ+D:‰©ÊˆöÉ lP\5Í-R­“ád eÇÌ.<¹~`EZX÷tkSþc˜ÈúéqèG±W3ç´cŒ"DÁc«LçF—üÐ#ß­Yø0{WQØñÅJL­Cõp¢ «ÏOØþkÜbyå0¸OCo#×ð¼|ŠÇxlèÃÚ -yiáêùZý×]ðŒÁN¥ò{ ¨Û=©fÍ8ÉÀ>¬æöóʦ¤ß+k~¢2Å?šÖ¾V>ÅØÊÔLË¾ì… Zx‚!jMÏ¢¼Dõ@”tG %XÂódš áǯÆ. UÆ­¥j'fT2º×³-^O¡>ÖÛövíY—W<Û¿¬²±û^„ñŒ"ûÊûGð³ ¬MÿôAbÀ΋ÃR+ÊláÓ'‰†3HƒÅõÛDMÖ¯Tˆ4†I@ùÑ,­KŠ3ÙLÂ4Æšô>@ç -º 5GÌYc~×ö<á.~æ¥/GÏO0™]T2ÌÒœÈl«Òn‰ïðàd¢>}¬3“ Þ«¿{ßM_Ÿ¤¤¦í‰´©Êì]¶TçxŸI#hžCƒÕSóÇÞ^OG@³Ž½0ûΆJÃ^nX»A ±Ýª·r¼Ú -£´Q ì§öqÕP9_7h‘d%*aÏàeŒ¥¿àG +òôÎNŒáG@6:ã'ï§sÐvyW'm©®t;*.yF>ÊDÐ ÚnÑ‹Ü…?»Ôô¥‰<¢kʤãÕ^ªišnSW •†£Ú„צV?Ÿ^m¸œ‰CÓ%€ßÛ½çGkR—Ù°^ÔÊ1¸C)ìyÿH´n¾ÉYÒ¢åuŒ|ƒœ´6Õpªû8Bª<¹:pxy /ŸñR¿nÉL ¯?Ò‡=JHx¥'Ýa=ÝÄĘúF2½Bma|o䱜{JNuYjXŸex¬ËkväÕš¦½àÞ8©±ÂéC–`ƒoB51ÿûlömeèäU.p-äïËÁŽ-¾ö×*úéÆOÄØĽR¤Òüt ³Äk[  ¯0³Ñ­‚÷ ÐCxÞ³Ïêþ‹Õ Is²òµR=âã}.)ÉA/ËÄi²—àGêžaÛæ8”N u"Q»2¦üîa :k.œvÃÎ ‰•ÿ^ÞBV%Ùò4xiE‰½±–É›û]:o pÍ›m-EÔÐSxÑIÆ­u-…ÑM­E²h(}*”£‡·´A`A—,Raå™_²å¬¯cí|5$Ðʇz IcðÛ}2zþb¢šãWÄ‹ïÈB˜¨Ÿÿ¢ßöW<ÃFÊ‚®Oí¢ï«‡Q× -8–0c&íf~³—v´¦ wvº‘ïcÔáÍZ·Û–=54]wdp*á§>…4…hh>ô! ’­ÄÀûï(CæcAs¿¦Ž]ÄQjg!—ñJË_ÀL¹,÷'r+sá0#¯µ™©Ö5ÞÁ)Ïå§i Vݾ5p íçšB7pUp_ŹO‘0ØB -Ò’lz N¡ºúû”´…•ÙNkY ’­^òô×÷œ~ÒC‡i3ãŸ,¨R2¿À}ÜHô†Ë¿“Z+¿)ê>JDÌíóU=ÂŽÄE=·äšõó|óf<Œm•V86ê¹õñèÁâ:5ŒKðá’r|ÃH#‰…Ͻr¶ÏɼðɪÅnÏ**]3Í -g½ø£™1^ËÁE?ƒ14P°JO·Ö;ßëT>iE‘,²‰¸Q¼‚ipØèÆD¸x Šª à&ÁjC-q4\šŠ%”®fSJIzµNöâ4å7 -† VNËzÑgè!˜Ä¿[Bä‘i|æà5éΡ¦ÌÑ€æC×ZúÃKe¼Œ”¾³—ÙÊÚé+kv0àáyCìÅŒéÝø§ZÏ‚­ñ0:ÆÓ¦GY…EP;×öñ aŸ¸ÒõhJoÑL=›ƒÙ½že……Á»Êr–2^bkU­âïV(—žêñR§’bc6îWQ¬®šÁºr½ ‘†8J1ýÙgåY•¥\$¢øµç_{oê‡ËÏç6Ë{uÛÝ°£’Éî*Ø£q䡬¸n…£­ÚòuY ͘0U$Û…í¢”¦˜ÊÙÅHÝ̈¶Ì®Šº“ÎOp‰d×~J¼Ý‚ûcåãÐ`±ß/y8 ]õ²F–¶¹ÍÑ:>Ýöéø¡ð½£2Á’gü]¹º—ô來C§z`Ü}´’‹(‘£Ã²pFà!²5=Ç­aŽ@à`‰Ÿ){Ñ$kTa̧ÇPÑ…ÃtßYkë×Ù<=ü€B »ÑùÈú'ÈEê•JŒ>ýW´wÚ¹#誤=á¶t×ÉüRIn¸±ÿm?xWVC6S~ 29|êý˜ç‡Ã -ù -g·ÓíP‡¹»ùÄ1¶\Ôù‡Ð ¿cÚ=›gAY†.ô†œÅ Y`ÖõÕ(›.ahØ0Â=ž)¼léÓ߯¢ ··8.á¼eŒÞ²¬ÊŽíÙÓŒòÈ5«¤pQÖ“Ú†–]+kâ±¥CS4¼¶4Ïy‚?Þœå]q½ðAáV´èºïN$; £1šM­jëÊÐþ`‹‹¿Ÿ„VpºfÚ'µsA/ò½¬F”>ÿá#”Ú/_íÁ®Š @xOŠìÌR˜Ñ/Ñ@_ÄaÐk²“ Lmë…å[8Nq{ÅžãîØÝü½øÛÂ"bu4þL¤¬0¦?Cƒ†lF6Præ’ClGþ¾B œg»‘¢í*¥}º­Ú#&žV§”hߺÑ;§÷ó'³¢ÐΟ¥?NQ(CЇyvÜ—5„zÊ—¯¼¯l_ß{èôª¤ ÈzÕD¸`?H¼¬P"–»…+,m…tâSOŸ™6æ ¶·ÈÈ*í¸¢)Xq’ôAæŽ?q¤‘À !;K˜ÖÇu%*ôÐ>ˆ¶1`JnË,­1ÝL$ÖâFìüüJ -‚”iä:WwêðSGã[®&t8¾Ê&Û Î„ ¥nŸLS‘ä{ †«T5,S™ ÒQö -#8÷Y[ï%*&ÉàId³±/fzn‰SÎxÎåÝ÷…}ŒÓ›ñv“ªë† k.3š³åZR°ª -ü$UâQø´¨ì6tIþnPõk[B[„tÅ6Ôj“» ä\˜²Ì—²y… ÍþÐpÊhò/X+àß#B±Ýý¤{ÒÛؘ[߃¯J‰%“,vÛäNq’ÈÅö!ÚYò_  un™`qiBbîLi÷h˜ÑIÕpÜa½x+áÒ9eã‡ÏáŠ-ðR"9-ĺòñð[篸Šm0J·jô%q9’ -¿RH‹}%Õ™ÈR ²ÅÏRàbÊ-Rd>jÀa~OŸÂn6­Í¶ÌžûU}àŽyvƒX½y\_žãAn(c_ë³#㙨ÇwÒb—úÖ÷¸7]G¸ÈT®ÀZf -}P¥’ßù›áÄïW Ó$™Zè7•ð‚}iߊñ¡õãT¬¹›ï…àï7L D·Ä -y(åºßð}¶/ÖMof9ôÆÜÇaÊoíï²þj¶Yñ4MžtŸaª¢Û 뎖cÏngj¯œ‚°—&Ÿ½¨ä­ êßå5ˆäý‹÷ãº%ÚÐ9NüC¾sf‡+ª¹AQ‰Ed<¡ŠôMÞ[¤d†§–m¹øªQOD–‘Lï£_j*03pˆ9øÈýxšy¿$× yµWÄùal¨<%eòÉw8ä»õÕ‘Ö> -Öý‡ú©jŸ­CENBÉYs‹ž"(5ë®úWòu¬Ô~½É’?øzûK5‹¶¯-~ Ñlï"›ëPùÓ[²‹ºË³³·›GNü¨èl$÷|DWM”רBÁ +ŨËØ`=¯á{ý×Ø28JTÆÜ¥ *qð2l TI^èS—c_;ƒEmrN*ö{7Úe-š€Ö …/aÆn«æáå?þq?Øàæli#Å]ŸB¬a¬¨?Ý;vvóm:ëî{ÈdQ-þÊž6_ŒŸ~qíUeô!”sSN:¹£å•}æëÝ9V6Zö@”Ž!´×)òCÛ>g÷SøÂÏG9Óèkë«S(ÎÞܘUÃO¾ó°ú|i¡ËÊX˜GŸKŠ Õ,Äýø}y¢cŒMÃßp)µpÁ{ â½b¬›EJ2HxŽOQ|G¡zGªûŸ@~Œ±!ö‚‘Á<Þ$NÿÐÑ`;‚ô­ßßÕÁ• †áŠã)*vAÌ%ì j쵨ROüxK@v~fW6qîÔëô®3(âMØ÷4¿gbÆ4kwJJ\!]8Q©-u#7ÓU¬âÀbø2Ù=óiòñ)z³–J»ÇšÂ)kc‘/¼ö–rÔ¡r¿×ìm(¼‘äg Š¢´)yà8)") –ÖÌ:„ËÖ àÈ îúqô ZcðËR¦“2²æ¥Ï—Š.r˜SI‹ðá°Åšöהʥ¡N¡ÌX³¯¯]þÚ2ºf´«]Ýõâ€9\®ÜÞ -Y6¾5äÁHh=/Ò#ŸgÏ5Ópè>Í9¯|BQ ¹§äŒÌÉ-Ê#&8{‡–)ä]$¦O˜Ç^òjGU®ŽlU_ûʲ¶àn®­’YìOHÑyF/Aû¶âˆ²r2h!ݼ긧™à{KÑ}¨ê©Â?+@t_¿Ëx/ä9„§P1Ïj–âyv8‹«cÔikŒ¤ÖMWê0C8"çÞÕý©šòDS•àßûZÞZ¿ž.u}U¹!ȇœŽN°Tlì«ù¤TÀ¯~Óá6®–‹õ:QXÜHt¨žðäøÁU늅ªdQr .PN€1ʤê?7ƒrà M^ž)2NIWseçÏ]‰òCS¶NUþöñ;wª—¬ÓY áùNW÷ªÅu - +/n‰2+g >"F5:$P£çø@EÞ~yöDÅЛw^´z%áK±'“’‚!£€ÍମÚ9H ¢ÚVÞ,} -Új¿(XytyZ¼üZ 9À¢(<” >Û<«*ºÉŠ„‚SäL·?Ô¢èÞCË_ùšYºëu…f ¦êgƒS‰lgœ` gRi9üë b¤mÕƒfùx:nš¤ZaFGãëWk^§Èñ¶5‹ÃÅH,çˆx•|,ÁóYƒC9iÿtL³SF:KªVP(ÿÑq<Ç›1ŸÞ<¯Íh¶XžÄ!úC’'Ža¾gøCïÀ‹ôÄyELÕË -ËOÃ$œ¨?ùÞ›ëˆí¶g}§ê²†Í%øw ø2 PÓê« -¤“ìóýºn†+|Ø͆=Æ!Þb62ÖFòŠ«f`ö7:fæËð©øn¨o…z’Yξ˨àwšg8µÐôù -¹ðâ 2¿äHxN ¢Özàõ}ŸÒ‘¿ Øâù…&Zò¶êTV­êòJŒmE|6ÏôÚFÎfkÝï¶+_LüE´îrh›Ã guXÍ -kU½°:/Áû Ð>òz¯–nÏv˘̠“À; žªNaàtC:ç«]%SFNPžØUåñ˜&ÎØÝHjË«¬ÁßÕMeÐÏä ãÞé冥.cªm¹«ÇpþF.Ò}AåÙ_¥ñ]Sñ(‰g« ˜ìÀ DI¼º®”"„?Ï°JÚ¥Br„¨§9(”ð×$®¡§hÓL S¡²È”›â½^Ä‘<¥n¬ûôŸÛÓújMÄŠß×Bèå±ßCvˆƒÞÆ÷‚û×):r²”KÖçÙ<ûÇé3Z^Ì’1Qò5¨u¾uuN´h‹ÅÐõF çüN´ùËÖ úOˆ¤ô¨=é\-o‘@ëxƒ¥ã4Y˜;›,ÊŽa,:FªÆ.A_–€ÕýÙñ‰.ô§ÚÕnê¨a¡aÁ ŦƒQ_Û¤IÔ;-´­æ öÀ¢Qéopf™O6"C<—Fí„2»ŸŠÁ>–HÈR_VÐ4‰¯5ûŒÎcƒ–ïÙôÌuªN")£¹Fµ½y¤®É(A0ÂËž¦Ÿp{T¶‡gtEìL$ Š£knð¶Œu¹EãÆ‘£þ@ç)mMÂx-ʧū©W¨ŠàÊz-à€¦ŸüdR«ºÇ«e!ÚqÂó³ÍÞ#ä3„Ξë"œUqD œMýÞ\8³„è½^÷ˆˆžÖ÷4I9îåË¢ÞÕšìÕ"©O$î)´Ò´ÊŠãtÍœï]±EÓþﺈàÌù{g -ÓSç,ºgÁŽª’p®‹à§-ó&:~b»6d9Gû¡·˜O²N©&΀HrñYCºÛ6 Õb'5³¥YŽ ffÄ=èEGÔ’Oýž”·onE×>Gw/]å¯ C/9â­Òä‹y¼Ri›¾U²Ò­Ûc|‰t«¨ -›ë¯8hîM›CEÕ¥RzÐ.¡&{šÉyÑŒºj8þHÁ榙Èø‡Þʽò•‘×z2PRr‘z˜ñ¼Ä¸"†þjE5T'ÜŽFkzµF21ÜÔ9Kþk¶;öZE`{ !«Œ 6B®×ÄK®¢dàcLBëa÷îúšÿv÷äEšZï³=²lå _lj Û-V§.2…'oxèøÂc†.%>ˆ;jèC4U4ÙZâ¬ÝWˆ¶É„ù'oWàs¢Ôð ¿óÅæ,ªàS"ì±a|Æï/49_ÊfÅKƒ¾$¢±)€å´q羃UYçv´ÝöÉšù!Zý:0Æì»'M3½•íA¤SÊØ¢×!Gi\˜Krb:üúÇ­ßý<ÒÄx…ó1œ6h§¦ã¥ôFˆ*¼†äles°>ì$Êf³Ídf:Y°'"v?EbØ€*jÞ*L¥Je0&׶`æáË?hĉAøåaÅU›ªüì¯Á¯`Ñc€)°ŒþÐ –(ú)ò'ܳ -êgùÄ,×wÏSU^·>š!A=G»6S¤HÅ -V«CßR7Dr=/ w¬„s¢†±Ah"˜äÀæòáê“i8£`ê·DV&=ÛZ!m·ft'-ç.ªx[…« ý‡´˜ºbmp·ÅŸ([NŸêaü8÷~ª$И -ó‘SLý¬¾¸¸ ¿‹ðÙ[¡ñ£—ìæ+1'":÷ûÞã†3'‡)€jNq 噟oÓÓøÀ% @±Xn f: ý2üi°3ƒ$KfÞÅíý½`gÕ6H‰¥hx…y +Ðow——êži¢ø|ˆäæuâð4ƳËÈ{w;[»&vg…¹X1 ™ºÑкžÉžeZÿÓœI'çüñ¿w‘²{Þ¦ý'ß)šË-Oeþ)¯oõÁò4 LV‡]FÞ¼xl@Q/”åçø>D£(æP+¤—Ù .Èc`ß;öÛƒ¯ZfòùÚáÎ7g{”ç>åŠì媀 ]Œ}˜0(§´}˜žI” ð4±±-jGF _`¶í†rÒR8æu½kŸµ©-á -å¢#oÚ\^ Ë³ƒ¹/ƒYKæaÇÉ6m]>Ïú/è@iHÌ;ð ¸Ëëúú†¢#½]¨¸Çœä“C‡×*Í”¤,?#}¥íK®fA‡_ô-~á~JÞ/›îs2h’¢ä'°?ÇöîT^y¨A¶ö8M&òO ¹2V>Þ¹º§7Ç<¿{/F3²b½Û×­.ÊÙºJ2¡×e®weâ½ì1΂Ï^QÝ„¢¸*#núEž.5qZŸÀ_<ãѱþ@V˳ޥÆ&ãi}¬ŠÝ·›¨© åƒ~^þ·Tìê@;tXµ¢[¢'p7®Åˆ}GóEé^òØó3±ôs¸•jÞÚvæ+Ùmnµ8CoÅ¿wm²Fh z¥Èx宦û$ª€P©ù}턨k‘=ÄE ÝjËá~ISÎäÖ[=©»IÁØoÙ @è¡~f»þÙÅyŵ0³¦;9¾õeyd$”ù_L7úz -ô°¡IÆú•£6RmŸé`Ö°ÃÅ.¤Q‰É¬­°|Y†sóÜa´*è8 °%ˆ Ð$²,ÏOfT@*ºB§”v›{žD€fxxÇ¢êbÎXåj~/³ýÐQ!;5]B˜Cн‡åÊÔÿÏôó§W“ƒ.Cì~Jb(f3}yX:¦¿­¦åG=m€-ˆc>hË£«„í›ÐæþäoX',Ù½Ö‘üã‹ig -z…6ˆãªÝ†ë[ÜBuyà]Oo0¸«rnq¦f_ðX>8¡³œbLO³Ù‡¼Kb’Ã"«& -!Ktöæ¡•¬váâaïS°äqPà>Rè `pªm›ý€v®SñH?·Hž[M!%¿¿Þ:£Ï¢-/ æ!½š°+#l -ሜS‘ÿ[…U¥q5ÀE›‡æêlà°þ#÷Á –²X­~[€ëè ã¡Á bò8i™ÐÍWèªh‹§›áwR3l¶ ä—Œµ·BZn„Ô‹Ñp¯Üç,’%ß cˆ¯N´S>:eç{¶ÍŸªAÂÙª íÒãxrf„,V_A% -™",e:Á— -œ]u(èM²:ïk×þ†~¬‹f4 ®sÊ“îqÙ§=CÈj¬ôöôˆ>Rö~“ê*ròKes\„œ$•þÛ `„‚¤ -‹ýÁß­w†ª_H†A ÏA92™ä݃S!Ýìâ´‡0QÀ7 Jˆ]ùîY‚¹“Ã)³øýCç«ÎDm-ÒÛUl—`Ç]-иˆo7Õìæ Ä`ôl7L$$Ÿ ä¶M±L/í¿J¡Uz¼•v¸èÏY·0q<@Ñ·ámD<4{é¥e©\JÇDQ`[`ÚãGùÚÍïA–Y®*Yvíû‰– kÐG«‚ìÃÔ¹Kýä¨N6Xå=|Ÿ|%s6ê캭4µ‚ߺ»°[ŠJ"yY å8XzÚ‹”âvžê\õr»yŸ21Úƒk4 ‹Zåj%eÙÝœñ—3[iGI¶%)ÅåŽKò"tÓö9ÆÄMŠê˜Ý¦>{‚KC:@à¨mp¥îó‚Nw`+=SI ¸aYV¸ŸæØàÝoó&t7Yå+¥WÍ}¾i¥'2É‹Ý´Ž‘D³ñ–X¦F7Ê>ö øÅ©[¯·ß&rÙzZ5W4m˜â»åVûߢòÙ ´ß¬)i›ÚÆ°F×@ÏQZŠ}…a˜o¹ÌÙ˜Sq~ª„ÄŠaß0†eìgæÄŽ³«Ý$º ÊE@È •á½:ó=gÍ6…e»z=‹à,„I©™¥tûݪõô„qeƒ*àb10¿ Ý©8HÙbÊ4νúPŒì¤ˆ!ö}ø¯éé:ò9ªÓVèȹßÎÅÊ;Uþ[¸èÊpµÑY‹ó 4"ÃÚnLȲ])*Émü˜Ú‡gæÎm€†9ÖË_Rƒ™ßÄß…2B?C½øÞ6F¥[®c±Oîæ³ÛÒP[ƒe~Ã\Ú>‹°ëTß%bæF€M‚ËPAðó _gKÝ&ÀTÓÆô„=·Ã2}µ…±¶plxrj¦Q -Ö½‡é½ó<šl lA˜\>g¥ç¾¨eTãþÖT‚Gù+~O]Ã]2&/¶Ò4>Çÿ/é]/2sO~°Ê{µè_æ8¦Úgh¨­¤ƒÇ«ÃBX‹%›Véî.=\Û>X§V%1Wg ,³HP÷íLw`çø°]™¡A“Çn±h|÷ÓftÓÃpei;eåùeKz4ÀŽnœ  ^Kw’ ¯‡A"nÝ*i¿á€Ò;™-uD«ŒwB¨ä§v$c|ˆä¸%©9UÆX%ØB½Ýhmc%H Y&M†>äq´H@“ŸÍ(ÓÍ­µ¢à+ç2Ð?Nˆ™ïS h4q¾¥s‹.;…1í¸Ø÷TI ?Š—i&h‰Mñ#2æ°Ef¹gyœ¯áG&àlRZQ$&æ±bö ˆÍ©ÆUr±qÚY=VʲÁIŒ” 8é‘õùÖÙ_næc -Rq„Ôž§Íºè¼»4ÖtANÁÉ`›oíÈùCØÃä}tÅ-¦gÞçæÅi4¿gž5I‰;|'‡‰Í0„4…ã -šg¦äðÏÜ5½ -jí?èUý8ó¡´á²ïQ®•‰„Ö¥€\ϹɊ w”>baú­—öØIZò±"0ŒGèBvõÚh3Tŧ1"5ï.€Üº÷Çb³¾´ß@²r2!H¸½–ÞüÛÝÛ›7õô1­'$Îε,†&P|zf«è# -áòWJ„ù´~• ÿ܇MB]ÏSZcã²k¬ªÙ w·`P°kƒ“S»/Í>Xm\•oz± ¬@²LæÏËÌß~©Öa»¿w$)†‰ÅAt º"²&<ÿ¾MŸWƒfš¸œq$+ѧ¢ò -endstream -endobj -4119 0 obj << -/Type /FontDescriptor -/FontName /OZMLTC+NimbusMonL-Regu -/Flags 4 -/FontBBox [-12 -237 650 811] -/Ascent 625 -/CapHeight 557 -/Descent -147 -/ItalicAngle 0 -/StemV 41 -/XHeight 426 -/CharSet (/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/a/acute/ampersand/aring/asciitilde/asterisk/at/b/backslash/bar/braceleft/braceright/bracketleft/bracketright/c/caron/colon/comma/d/dollar/e/eacute/eight/equal/exclam/f/five/four/g/greater/h/hyphen/i/j/k/l/less/m/n/nine/numbersign/o/one/p/parenleft/parenright/percent/period/plus/q/question/quotedbl/quoteright/r/s/scaron/semicolon/seven/six/slash/t/three/two/u/underscore/v/w/x/y/z/zero) -/FontFile 4118 0 R ->> endobj -4120 0 obj << -/Length1 1630 -/Length2 9604 -/Length3 0 -/Length 10449 -/Filter /FlateDecode ->> -stream -xÚ­weTœk–5î\ ÷Â=8Á]ƒ‚P8EáÁÝÝÝ]‚{€\C 8 Np ¹wº{Vók¦T­÷9ûœ}dŸ÷YUôÔêZì’Žf YG(;S  -¶7suQqtPf×Y¹ª™Ù/=½4d -;:ȘBAÂ=@dàæp ¡Ñ¤ÊO.9GÝ5hùYqw«:ä·#Š‰Hb•Ï'óslñtM—Kïýf"%Ü“ßqÓ!¼Â"šü›¨¿›)[/,³:[nGp*ÝDón\ÖV44ÝÌ èI€óî7ý{fþ<#íL/¦XŠ#«V -JóÜ•[“ã¯gÏ®¹ÉaÞµÀßoö ŽìM,µŒÎªÃ¨ ÚÎ’Ïô¿ 2X§âîÓ2›TçÃœžÊ°—¤jÜx¶ñØ)Ç&£ây÷Ó3£š%0™ê•Ž¯Ë0€y À쬮þ=ÿ©Ý¾Ji’*Í,¥y{_ÅÖ¼¿!YkVh&*ÜM±Ð‘ä–]Û¶ u w3"胈TkÆ0­§·°¤ý0¶ º!:rÈh|Èz‰Ø4s6Iì[7*úØÊÁɹ½˜õ):ûÇÎÅ= íjrþŠŠá—êÊUÆ{O÷7l±¹û¥4×æ0­Ù†Œ¼n)çþ8¶¿{– -_fñ 5­… -îŸÑ—kÏoá| öæxŸ(i³7dÙž‚ÿ^Ô?¯ðYöD58oôh’%ÏŽkƒdq/Ÿ ‹&çÊZs“¿Á³&ª™Ø*U±”cÿû<ºüyŸ“]„£âõ„@3*Œ?q3«‚¡YŠÄ˱®f¾³¶ôÖX9"è\κŠ -+W²¿:)ÿjJ£ÔêÇxq†Áyóg¢Ç‘×&&)gïl iñmN»Å¹IZÏ=îdºÏd‡Ü}Ä‘À4òìR“õ -¿ÞGØæúM`:ÿÇ`8ÕŸÚdï¹hÆduZê -!ó:H 7üÀ½ôÚÆdËž•†+›Ü óN…–ü]þ{$Qûh-õHÏþu¨ʶê)£<ÇÊ/£{Š³N^ƒoçÇ¢­,ê1ÁDnvU•'0ôSþ©â—x¢ý×VJêQêíé“÷‰=~E„™ýž¨%Õ¦Æ|Ù0ƒž'^‡=êMÿã|Úô—qK[OØ®¸ÌuñÂç¦ÍÄhaüŽ=¾vTæ7½ãg±²ÈÜ6%%T²–Vh=6é4Ï%ßwcU)ý™Ö_-ÚQ¹fÚz~ç¯ -cz÷ïÊ…­µO˜žÈ8toËÌ‚l)y*ÆÏÝÔQ5ºeEaX6y*#·§·©{…˜$c¿ÛÑÈi5w9º ÓnàÓ%nw²ÓeéÄ%ÔbYô:ÝpFē܆ý´ùÚŠiô;ëü††\ÍzÜnQßîåÙŠCrýï¨I‘<@ž—eŸ<£©4voø‘oÌù{ÓRmP’-D÷“$IÇè“jÌ÷ ŸÁsÒhï{»¶€=°Ú¤Û×(ƒ†©Û‚›m±½”›Øk,·U–€u”=Ѭ»’K~Zazhû«ò ‡h$ ,XC ‰6:ëѽXxë‡W˜™hœ[ÝxfïˆÔ ;Î-¾µà&YÎô&¡3/YR#ºüc46r3a{K‚_jÇÌ‘Ö¨®år‰M‹?€yªß|ý ÕDLÌùßt5\…ˆñ/£PX¨ŽÎ`YÍXéfmä—€ 5Ú°Y´•xC6±±–—ÞÁ{«À}Ô˜­Fá«?é£\Ò‘»¦²¼äBÊ'hî™JNòÙÕ?ô#vE”œnhÓá®È"š8ÂäˆóR%É||^¿Ue²_.íþ'¡‘3~˜aœ47íqcOdË™„zòSÇVõ€V†nª±Mäg³5ÞÍÒ<œxŸ 5÷zzû¯Ïi'NÌ3©'¥×¹« ý˜èô»ë•u—͆/&sƒEåFE†ß]½Ö6Z§ì](™ÈGàj”¬—2p,¨IýS´úéï›ÌoB5~›Â1–&:PÓö„©yÚô‡Ê$“†)7¢‘4û{ˆÂ"´±à“¬ÉÇÀ …nvÞ8À¹Sž]o´Ø„ø:JªÞ£ ƒ†æ©ÞŠ‘òë#ά|RàÄF¹GŠÉ@°°W­psåÊ‚ÜC)<Ž¾à¼¢“þçC{bþqv¼ÄÉô³yi™•šøcá½ó)wö½ø¹˜7ˆj5öFlï+‡çõ!<Š¬æj1¬Ò' -"úx?´oÖ_eýäÑkÂ(”Ö™kg€G¾²¹u«gÕþ°i·â~;þáç;ðñ;”ûË’~©ä@ù‡Û«[.ÅÐ}Œåâˤ-$&œºš‘ Åà-‹¥Ó[­·búG^¤—ÀŸ®žœ²¡!pYGkk”” dú„N!1¬»§=ä,º¢-/…ÉèŸIÏT|€KLþÑBÁÏÊ°Äa`™™€W»ÉOŸúæ‘®]x|ß“Z]ú[3«i’óëÊ Ì «v±Ü÷¼É¦ýåɶ­\©ýw۞짟vž"llïúIÛûEãçѨ³|›ª/¥ü?-ŽHX1ÁþÖJ´]ÊJiÖÞ<`k®7© -CO³axCU¾ΆˆÎ•çUò˜á‹b™2'ʆø!| w³ÆT™‰n‰‡ªè/Ëå`smWrgoݧôŽ•e¬ð´ÚÑÿn•`ý·I®¾*xOÈí4³ÒeªðºŒ©¾¶Qeb³,ê\®»Cw{ŸEPö$–l$ð o‚·'“6ð]€J¹ÿ=X󅱼蠻÷ë3 ?G?›ó.öç„DM—~‰·ùl --iË:™ ]ͽE$„Š ï;Âê9FLâÃ|Œ¨Zíáþ”Yì˜Cñ”2gî -¨"M½H`æ±ußw_[Û1  ¸‚Qy“ÿQ&E_ç¦Óœ"2œûÑQ”ÚÄã6¤à«!{“fåè -Ý鯆qÔt&\UC´yòüUÅL·ý>€Èvä—£™ÔÝé6 m6†h8燉•ï•-`{¼p!¿oõy+ˆ„¦€–+ òu<ÜÒOÉAW®Sµ—Œc -…W{°eh¦g˜V^ñoQ´Þßãî °£XeÍñÛ® ¶Qq=JÑ®¥ñÙÏÔ‡oYågwØà€µS5SòÝ?ß.7o#½!œöõ„sFóH3Ýu4ß Ò¶‰ûN^Øosùî|Ö—.綣#£ÿ®éÜ­OŽ¬-0Ûݤ§ïX–+{ïWbhí¶‚om†ÞÞøŠ®Ýb\g‰¥·×œ€NŠ¦ -ÍàÛ6AÈ„wΘ W¶ç.÷c&´ O>L­Cp«ÐÀŲ§ÿé•´Í«£nƒê 4â¥q‹GR2ðFpçò+æ,Y¬<(#’ÐƹSÈ[-Ö„ -l²Ôàw‘6 ´òEÑ1 ÄBY -DFD}Ó¿˜w姮š®YÒÍ¥,5 3ïìö¹_‰ë‰®Y+Km9S©fæjò¢¡šRÖ; ÊÐËð)úS"mŠWG‚J¸ÝGËD ‘,¦ÐUJ#3Õd$44;©úÜœs‡åZì?kÝyҚν®U2ž¯îfÇõ=·{7ݬ -p­OÈF„Ö|ðÕw»÷•a¼Ï÷W8ïÒº.úr†ºº¾Œ,\çÒM\ìa^`?©VÁ¼GX{w²·~3ß«*‹ÚúýýÅ|÷VxèÏ gλ矤â|-ÕzóÊÎR -Š {u½&xß]C -1G³ßWF‡YZD¦¦i)æø ^åa½º=¹ðÝw“Ñ5O{núÖ®”l}µIÖ9àTI -%1X¿ÞZßò^â -ÃŽÈiùÝ·ïe_-0K¯MùlÄ#w±ü³ž‹ôf[Ÿ_¼gߘÙ\•½ªÈðl¯Ò=@`‘©‰ïÉR”-Þ£ >Ú[1`õ’é"ÔÒ+Â!Õió{]?Ž¸¼Û™9{e¨v¸%ÈcÂû vgm’$K#az~Û3·ßñΨ Lᬠ-ÏCkÐáïÞïö(Ú`¤MC%Âm»9YË–„•Jè²’‰idiv‰>ÿ4ìK®‹¯úy|ÓÉW;p]M@š=¯kÉÄ{E¤>D÷´Àfhhp„ôI¾ÓÓSb¥.˳ ¬ŒõÅ®býY·­µ±‰{¯È/j‰"à³¼™¿é$ÑË$æÊO‰Œôï1ŠD¥£Ênu°vÏ]e\¬FÛ®Î\ÚáÉ6÷Ï»Éeï!M ƒóÝÈ_¦4 GL­‹ Úéux¿yíÄKcú÷‚UEmS\BÏåìhÍÔPƒCE~žLY+}S6ÓãrØùŠRþL,ø…Ì~ÓO[õ3onœ¾bËÉûÞ^áVA’^ä¾€@£ÞÞˆ ø¡C¶†V²“ÅÄ}+ð¹Ô=Ú¯ãTyá²Ý]÷½ùè`²;p,ê|çX™íäÁ/PìÁEú@ç a[¼@üùEßÏÆ“ñ|J¶‚” Šx‘Ãh¤òJȯ•c‡ -|OM‘2îé^SÕ¹o,oïÂáaãK”AÝä”õ+°5q㶑²3ìê"‰©ñÐ[±MâºúÌc‡ñA -Øiúºk$²Yú¦K1’Óã¤FþÑSáF(¨ÑeDwG4ÝEÆtåΙ訪RsJ°´vFÂbV˜ââd"¸Øi+3ª¾³Î ;æîSòl.ue<Ñb¥»ôWø1’úC¼ŸN ½ 6ý©ú‘ó6±Î]cB‡oèE$h¾"<¬™ùÈݬ[Mĸ5NÉ%mºLs_uœ­N=×sˆ0ÛÂx¿màÿ€ÐûéDÑp³uz?ò³,)k21„£åé÷,œÿ°ˆ{ig@åçñÃ}ÕǪ…›öî3¶äÕ—Âò¢ƒ=RÍÑŠ†ë×4:MW¯wR…â0mG©¶?vÃAà›HÅóNËEFDÑf -þI x™:£Y¶†(Cá"’¤!$ú’Pƒza"žL­xlbl`ó*…±Ûè3@')Wü÷<Ê‚jåê§â™Žk"T¢á’€¶@òFéžcv§R{æÔ5cXHý×R)nùØâv5£ -ñe|Î/5²„±M¼¨]Š5ojz ëî®vŒâTù+õa¾Ãß̳™¢JŠmîÓÇjì¯B<ª'`Ç·Ð¥•{!ß‚Øh™ã7Èúè$Õ{;1w¾ždHΫÄ4ÆwÁ¦êZè:þ¼_×Ö -Ùl?Ë8¨Ä9+|³4W„Ž¦_ž&¡‚&iðé€ û ‘™–^_mó¬ã:,o¼#ZhëÇ„«DBOƒD¯òv؇^Ñp‰4Ûõ%’ÔºÕŽhò‚m]‡ž—$èü¤%~xK¿IšŠx¾+ˆ ™^=V°ÇèÎdÜ+†(Rü¸'á̾Ì~{bú ž}»/Q#IêAVèÂD ì6Zd¿-Xe]ɦ¼MH£M½Â¢ã$~±Ã=¯ÿéëpù«Bv9ÆÍ#æŽEïT¤yù£±¸r¢–†8¼ÊU¨döÓôŸÞù'éЯnýøp〱¾FJ¤®â}žú däáLÌPœ‚ƒoœ<‹nû]QÆ‘o'9Ž¯[ Ë]«SX+Ooû㯱?òÏÞh«Ãs—©áS„y\$ „6ÐWÎØÚú|Á”9ôI2-Q¥ä8šhù¡´Òªlp÷ÞBæIŽyT )¶z+›ÊD•Ä}-ÇjšÏµúö•tÑO*þÒ.?X–\xòÎWŠS…0ÎÐaE`d¤³òsúyYæŽerõA¢[Ô++›œ:ö%P]䬟c¡x¨Óùc»wSÐÛ -íla|ov©%È·a—Ù:-‚ ñú¨FC¿–ßë›x~±ÉÚ²¨gG&t-Çò)Ȁ„W²^x•›°0‹£ôdÚ=ç‹ÐʇÜãÔÏ•j…C3,<¨ø´ƒX -«ùþÌ´õ§û¸}´½†£š±vïaE/³MTdx­*Dß­,«ÌlûÔTö.iýG¢«"tôè£Ûf §ÛWÉÙ¤0ÙüÔ%/õîB¨¸>²i¯Q}}FºHµ¿)™`"J¸ÝÄ ‡¹¾¡ìÆ‹A_· ;•WMmóÂ’ÈR1&ÂÁ.Fo×ËvövûENøÑzæ¹vYÇ|m€þ9:÷øÌýÄpŠÉ5]”ÙšM·39ZÄ‚1²ó#šœYÉ·°\“Ð,ãÖ«WÆQ³ÚKçnZ“™«÷Õ¯T‹(~}š .fNeïé©2Ë9ÿí Y,ªþî+‚ŸKtD9®Úb%d7pÇ, ÖæÈ~=³9©ã·Î@5þmÙÝ ãsZýœ³ï¶ïEH™Í–Á‡—±1v›Å±¢0€ÃÊôÀ]‹Çk6:ûŽ$Ó¸Ûp%þ„V€»ø1¡J6È?P›uÜ\·(å‡w" ñü‘o5{NµËZž¸Š>ïñµ?V·à£ô¸š~ÓÅû›²«mæì°RÙ» ôÈj¸Ó^8ñ¦ê¦ÃÎI=±N6”r¼]2‹¹&ú~÷Œí¬ãF éšó1­Ý¶Vžì·å¢µÌìænµ쳨‹>œ(ûW%Ñ~_¬/¶ýLx;¬lH0,3šB4¡­Êy=š†ÄʽÝjN¯Ÿýãå8ùr TÛõ’¥YtÒˆ…A¾ ¤Žfz„_1ÐVI>àkO®Ÿ„¾ù¢ô¶Ž§Jþý ëÇ)ýYÍ•ˆB –¹úl74ûÁbGL`cx -GŒ,%‘«r±ÚÂÒþö=ULÝ–£\ñ¨QÎ%=ŠëÿÚk™â!á¾™M(#—Jª'ú±/CÝhû8Pv˜r:ÚØí.ô¤ùD ÔÐ$J÷Ñr/2•‚ë ·_•œ;ù„c|Æ–>ꤛ0ó±ìòAuÜeìo„_¶´f€¢¬+´†J“m™B§®~>ÜX¨’²§²zšÕÁ`U¥¸¨ˆÐÂõ± µ| ¿¨<Œ¬9ëEËáÌPÂZæm2ü ÍãG¥íQÇ4‹ŸK¢,§B8½5>CËgöáÇ¥reòwGó³{æ‹ŒÜ;>ÑÖ]ÁýCŒx†{ñËcp&:d„Eß&Ñ&5»%ºÔßÌ‚1R@œvë«ix†0úoü²j¸êG4q@bÎqßùß P¤¥mÂTW=ê„L“Ž…¹”sì ÿ Ÿ9„=£Mñb'};4¡HíES+1•£ú-á`~<¡Túü:ÝkhǺüyœ]¯óé„ »±fN*^ ›z¨0`ÌSšé'ö<&Ñ¢ýütä½oHçgïk}•‘ú!#ŸýqØŠÓ\ÞŠôà¨&%„9B.òN¶³UKÑÛ# ï›÷Èš‡¿Ò¤é¤ºÃwIbÏôÐEË5BÛ=¢ÖÇP­-Ê#>êrq§€J(`™à»ò @R¿€d½Ü2þ>÷„÷õnäÉ{ã¸+Ÿã[ÝC[ :}RlÞ¦iéÌšaèªúéÊhºfüÝUè*“€Ì«ùùm£?\ø)^çï+ÍZàÞ¶kMÀœiI Ýb‹“EH«³»_žTG´@-!èñFËÍ ¤¯jøÀâ—!¦àû%Bk¹X=Î ~R—Þ:Æß’~ãFm;PƒÖ²ç*·{hU^~u&9… -kAì–ŽÏfÒ.¦n"%C{ÊÃíl!4[ž¿¦¸ÅàL94ÉÛr™$Áª‘?™Bƒr„~!µÑÌû…‘tRx}n?? T¬1Î5qñ¬Ñx2¼o¬yË4îXž¬Y/ijy‰–æ¬×ËG”ãÊ‚«¹†Ò¿L×Ýßt¶¦Tïwg«v£þeÇ‚díéÛ{\»MW,™ÚòªúÈ+W»U‹7^ªÞùe®ǧû0q°†™Kãˆ.a½ÄÖ·¨¬Ø†éÈ]׈lK% CÙŸ‘}”Ï}Ýýá~»j¿æ(-¥dNäÄÌK¶¢žÆ@¬g®J{ZÓ8)½b2˼1»Ï`”?,O¦™Ü™H…‰v|3;sƒõEonAY–tCÚ”­üCï!¦¥ïÎ"8ÿ‘£|ÇwpQo랇*…¢Xƒ÷ì]ƒdU7üP¾´Ê`Ýýý*É -\+½WŒî¶{“ pA²ÝC]°[ú&ç´)ØõZjËrtÍ=«~…i;RFÁ‘÷IgÈÓ9C“Ô¯xw²Kbˆ¼$’-¯`£ëZîÄHùéóÝàÑ»IÄb¦D¢2ÒP±Ž*…Íùµ¯+íD1åꮞWg`oÒ(K$à}S<‚3»ÎR4WZkjeŸ2ž°{Ãñ¤ ®*öF*apðÉåŠÂ ®‚²à‚»æíÞV‰(š¨îaú`™àcj7ÖÙÖõÞÔW$s¹Œw4¹ˆì_c¼´6Üè‹:ÈŠÃ0³[ÑuGy½'Á}[ç^B4ørÅòÈ-˦6\eÙŒåÎb«0>&éw¥·!êm9ëD§HÒ~ϱ䤾̸~ÚÒ¤â…M,l6=båßVŸ-S2΋ѽýÖ¤„­ ÂâQ¨¿/È@ácl¨ Jª—ZŸ·Úù¢ž~ן‰m“›&÷Í´®F//#½¢¯¥Tnõþ¡]Œ`ìÎt;ö}ïá¬mc¹i ¼6ËÖþó3~s¶ñY9Êožµùò•™+oö‚˜u¾íE¾ÐíÄhâÙºÀo¦Øsa|ø¨k\§OIýmx‚nèhº8>Æ„*ù¥Œ–‚¦Oñ®Ü»éªy3]ò"ùd’¾"‡³¸×5SŸ-òØz¸^{i,ål|ÉJ³ÓzÛq\ ·€1ºûñšL+¼ -‘K¿Eõ'*Êi+«³@ý›à:Z’/f5gC$q¯®]é>\~¥5ü¦pº.Õ…¯Ú:³í‰ ž-Ö¿é!Z¯ üYÜìdÝYÙ>ythèP˜TÓ¤~P Ü<뾪€ö/Íñ²ñÚ˜½Þ$Æ‘qSÌÆôÛãÖü<ü]è×[j{˜]aÄy¥êÃÖ"lj Ýžgp"9ðófÌØšD8ß‘dIËxû¦V Õž‹²]\s_‰óÄÿ—Qqï35(ÛM;ª™ŽLH£Õ/½Pí(ËÖÅ~¾ÐMtªÖ‹£ Æcý!²3ußÁ^9´¢h<ŒÄߦ³>½å=,Ë‚KÅöÁ„}=yïo«ŸŠ–9Fcæ×ψ=áYÙKgâ[©7Çö Š7QŽq?4ž/ò_-xpô'“ž„PÞÝ:Æ+?6·„w±º07¡åI<žm¼!rí-ó‡®b*'­ÜÚسÑ°1JcõR´:¨¸:/¸¶IÙ8R†ùÒd7„»m†‹²%¿Ôˆ¥šŠ3=ÖËiÈúÏË+ù™–KPÚ\ö}kß¡ÑxO±ê-’\Z5÷ù°¸øå$Ÿ äË!tõa‰E¡ÕÄqãÌ}TIB0=:Â&Æ\ÛÇÀû”áï£ Ÿ.ò¶@ú1-OŽHuè½ù:´J¶(¥:ðydô(”V‘vº{à!É¢~“X¹ÈWtÎ݃Xë•ÄÈùšç{+Yô+‰õ«ä¥‹6¸Q¬[Ka Þ·¿Àܬºp¡½üÂ|*#zÁwõÂvƒÆ¹ŽÎ¯>?ô?1åÊ­g­sƒ¹·S©ÃããÊÙŽ, 9ŽsœšÉµ‰¨D´ ¹Rjl}JµÚð÷òùbÒ¼‰%¿ÝQˆumcêÞãÃúN^"8¢ªã û61§¤Æ‚·Œ¨®™˜Ú€(>žÜ3}}çxÊ7ä;ŒÛ;eÍô ?½»~Øm±,q¬&¥/Ô“ª àÉ>^ÅЊøãuž” cÍšôË­¾s(‹¨ Ö­Åk²ë\šJ’̺…4æ2Uu1tÅzÜ»–|7ªòs4Ú‹«DvÓNdGs1ÒNøéø4ÄúÜf iS®)Ê=Ðx]²oâ`8‹²Ðñ¨æƒnßµ{ü¨Ô&^ÆôáÖE ÊL‡ª<ž]Yóœ\Zl¦ , -£(JD¹G“˜—”Ô²ñl¾p™‹¡×V«Có%ÂÜÔç`’êºyj(ºo”Ëõa#M˜FsðÒ2ÊÐœ¨4ÅÈÍÉ':ðDØt»Þª?êÔåÆ,n)näÆ$Û;›qP®&€Ÿ…“{}ý£ºÈÃ;Ï»§]'Ä˜Ú pYÜ9 ÛœWæ=IјOѯmü§©Æ¤‡9˜½[v¾ÇÝ¡î˜Jÿ†AJéªé&)ĈzXà°ðf˜Ð°eÊtiø½sõ—/Õm%uØ,ó|ã,ÖTº9ѴRëkDQ…À»¯zcBÎqÌL ¸•c¹°ƒ©V6mßB|&–¬ø³Fq\…«Ô¯6—4¼æ>Ÿ˜‚¯«aø¿î§²&ð¬ßÏûÍ>²[œ÷Þþ?FªÙ` -endstream -endobj -4121 0 obj << -/Type /FontDescriptor -/FontName /CFFDXI+NimbusMonL-ReguObli -/Flags 4 -/FontBBox [-61 -237 774 811] -/Ascent 625 -/CapHeight 557 -/Descent -147 -/ItalicAngle -12 -/StemV 43 -/XHeight 426 -/CharSet (/N/V/a/asterisk/b/c/d/dollar/e/f/g/h/hyphen/i/j/k/l/m/n/o/one/p/period/q/r/s/t/two/u/v/w/x/y/z/zero) -/FontFile 4120 0 R ->> endobj -4122 0 obj << -/Length1 1608 -/Length2 10628 -/Length3 0 -/Length 11456 -/Filter /FlateDecode ->> -stream -xÚ­veT]Û’5Npw;¸»»»»;8ÈÁœà\ƒ;ÁÝ=@p î.÷¾~ýz¼¯u÷=Æ^UµfͪYkíMK©¡Í*iãb”sCX9Ù8„j g+OmK° -«”‹“ àÍÈ‹LK+í´„€\À2– @hZ¸¸œ‚‚‚È´iW_w=À «¥ÏÈÌÌò/Ë_!+ßzÞvz€ìÀº·/ “‹«3 yƒøoÔ{ ÀäH«k*ªÉäÕtò@0ÐÝÒ  ái岨€¬` #ÀÖÅàôÀÚlú«4¶7,I€%ÀÃh zÛô±ºþåb¸ÝAoïÀÎÝ yëÄ[;yÚüEàÍnëò7!Ww—·ç7ߘ†‹ÄÃÚä -¼eÕ‘ûOˆ½%ä¯Ü 77ÀÅö-ÒÆÅÚó¯’þö½Á¼y!– °ôü•Ë -°y¸:Yú¾å~suýMÃÓ¶û€;ÐÎÒÝÆ èáñó†ýWwþU'à¿Toéêêäû÷n—¿£þ“ât²eCæäzËi yËm#³ÿ5(Š`['Ç?ì6ž®ÿôyÝÿnÃ_3ÃøFÂÒÆìä °Ú"³«¹@ÞRþg*³ý߉ü ñÿ‰Àÿ'òþïÄýwþË!þߞ燖ótrR³t~€\0€·Æ øëŽùÿb-AN¾ÿMô¿êÿÁð¿Q„X¾µAl÷&Ç?Œ 9ÐF±¶ØZ:½õèo».Øèîß´ü»VN^Þóé؃¬Á5OðolóïÌßäù›7»œ¡¶¬– -ó¿ß¦Gi¼©Ññu}#öu¨ºØüçâ/ ))€+'?7€•›ƒÿí°qpyþ›|qþk­j qùŒßŠæàü»ôÿxþµ2ý7Y°µ‹Í_s¢ ±Û¼Öþr[{º»¿)ú÷i+ùŸë¿‡ôZ#/λX ‡9¤f¤AªrúGeŒ»;9aû?ºÕêä®téJX,³xúñ‘­n\è¥ÙwîÀõy[‰ig°߉¾#xò4€š±ë;Ö -]+?óN(»YZÚ¡~´ßé¬Êœ‡ÞÎƨ¦–YáÙx+·û»Ó[Æ`j¯ïÁ¸47®èÖ_kbñÚ0ë °«òé÷ooè{‡úû:ÎỶI˜³c‘h…- “(“ ¾îWµÖÏÞ¬•BY‰Ç(­»ØîРtÒÀíH’HÙŸ˜¦Šr¯}¶nX -œ•Þ#þ£Ä5NVmêÓÖ>ÄR7Ø2iðÖ–"*Ïçy,¶bo å§L¿M¯³³tþTGK‹ ß+òåV*ÒÆauÖÎÿÃwä×iÚì¤@‡^®4nêý'R/$;]ƒJy¢§?“o§wÎ/ªÙg¼.¦ú“â(¬2Y–ÀfŸNh«j›èoÔÕ¯ÅÝmkØ6£ƒ¤ç‰F²±òž^¶bR>yíY¦ÔqSI\¿ÖœDõ -’lÆlH¬—ç4éô†lî´*'_aŸË1߃ < ³8ø^gBùâ“…;Ô8Œü‡Bm¥jf‚0nÄwQγÛÄ¿ÐŽ(>GÍõ­9)]ÒNúœ—ò‚‹ FÆÜèJÁíd>ÙYHt“˜g f–dáä"FÈöûiä°õ§âm¿3—ÈeCÔAÌ—?{êÏ-Ï=}A{È Åg‹úâCÀßð­åÆíÎl·*ê¸pÔ9ÕbKaú5V -Ã&ù3w)U% 8cäß´u¢·PPB18üûo^Ùós>;F·¨TMñ-!Š—u ¶`).’J±ËKeK4ÁpAÛ-æ<$ÅÝ—õ`RPþ¼é¿Àë30 çF(ñµ •÷tµ~•ì{ÚøŽt`„î½ô+I؃б+ö¡cÌ ¿çs½šªü‚$T»Š‡ÎþQvÈ‚dº€³˜ŒKíËAÜ8ßMÄùtßDªù~º|Ûª,"m3!-”|¥:&5|$0FhýçÏè¤Ôg^©$‚ñ¶SåÃÛµãápÐ$Ü´4ë1•D#—±s‘lô4Xž£·r¬ 1fëñ‡Ó´g]ë0+j»Ô¡& -©Á™´ E_BΰÿHeDÃxë²b6ß¼c×ûÓœ"ö"mý•ü@´eõÛËSP÷x†e|K<)Å€„NRJ©×&°úJç%E‚¡yTgûL¹¥0¾”³; }(£Ld²{ûBÊ´BuE‹Y×ç Ô2$0Ž -_ÍÓèd ¦št ¶ ßòíüº«-~‘s‘GžÓ çcÁÆ (™‰¹KS¶oâ -«¸> Ö[êt¾18eò ô8v 8?ÉsIJ]¥öcD&¬  ½¿ú~p(lµiוH¯k(üÃÊa&ñUí -éj1öÏ~ùñ2KŒg)VdeÃÇ«3V@ˆÒ|ëV/ŸòT¿z&AÜ -džW ¡°íkp´a¿í9v¹’îÀjË–@×&Íœ QKw¡Göú»£ÐCr -[’À“0&uÎàO¤«¥é–«Ó«VMG›ËS¿£¶BÒ{þ”Ž€ñ ©•è$øú¡ýä~$çêK~ÜuÂ'?¦HkRtÈ™(ÇQd}§ì E%›åzÔâ‡F@x çh6Z„žª¹O_V¾‡:êÜ(¡š_ë=+ŸŠƒñÜ1óò”8°Ôa™sÞÊ5Ñ°5 ê¦èÔ} /sì>/£÷½×K½p\Ûܦ¨Xص—¶)wÓWgµÓ܆»Õ¡ÈÑS¨u34&û•ÛÀêØ)ó‚2}*õ¹ú‡ÀXGb¦ö2ƒI8èKL „Á¯tø=%<äõ³3´®Ú¶óËùFáY×]¸nQNNÊü±‰ãÑê'}Õ‘jÚa_Ól¯R^ -FΗƒødˆ -þ¼ÀéÙÄF„æü¨ˆ×Bü&­ìV©(]Ê"´nx‚§ìt"•å;Ýõí»áCRFÑØ&Ý «ˆa<Èõ#|ñï_ÉÛ¼[îa¨‘aŸÂÔNîe#GcHS£À™¿E¡ŠU÷;£òÏDî>³´ò7Ò£a¦Ú½Ü`;£¢7$­JÆÒ¦ìžM–¯…{r¾©”i¡°ÅŸ¾gÔâ -5ãØ:æEýSá›A_DŒÂ.¼ ˆ˜!«-ÂNkO¬=/qïTÇ -‚oÏÖ`lH;¤ÝúΓ;¬¢ª¶=¬ý¡ÿ0ÚI6‚*r‚I+Q½ÑKWïà°…z*èÃMÞLá!FP›p<Úž.ĨNgõ8ÿ‹íCmnðlRÓØQöwŽÇd´ëgÒç˦ª>‡\ü(èÒÂ8Cqªn3pÉôªkSkâèؾät3u]ªÿèsW/ÔÎÌéÄwhÁ ¤ Qú‡#S8’¬8»Þ>þGB@ ñô®› - æö‚¯ FµÚRéÆí—kÐ`“ÚîV¢½5}ÛNp±ý=Þº&NöÄ&ÓP“œƒiÞgò<úëí -™XJWó¡Q€Í Û™xÒoJÒš‘¤ïž4ùÝš!V—YºêJ¬¤Íô6PìF?wùóà’C¡´ŒµmØ1çßñ &‹?ºŽcT«£3Üz'Nz°ÐÛ!ï6`²;u¾x™3=Ŭ§~°±ÓÒ¿1¶G?ºrÛR›ƒãÆᵟSƒò>;çÏy×"Ø:$fD­–ƒÜÜÞDDåVw…ZÜé7¿d”…ïu=Xáˆôþ•ê±Ê„¡,úvÞg1ÞÔ[D&`ŘΊt¬OOö{·†zoœWÊÎ%OÒ‰úÓ…u‘ XS¬Ô„Ã-0¸AÍ “‚ †K7=“õé² K&*|žÓ¹‚ùŽþ×5¾ú¤Ç£ª¯k¯[§xó«³2Õ–éƒ:£¸2•E‘S°âûòX ¢Ña†¤]c0ªŸ!ä¬n\¼Rªõ[“(ÿ´÷÷îk,P‡ óx˜E3Øc9‡¤þÊê™±-7í`<Q¶S5½à¹ÎÞ„q¡LäžPh"a!"ò´,Y9åèÛNhIcÿ -L¬[ - g‚¨§öp“Ý„küÀÀ $¢»-‰’ -¶›X°áÓ]¸Ô°+@jÜå„äOÆÊš™‹}XÁTúQ»k:×Vq‰Ð!eXÖŒ Sÿ¸“þ*瀺ڟ´íáÕ©šïCžç*éé`·§ÑýØ4=¯µñ*D†1(×€¸ìûSÈS–ùͪÐ+VèAÖû¸¯EsØéï´¶¿¸9@« l±Ô'îº eáHÙëÀ_ú| }hôS× †¯ïus¥Òý)Õ9 BÊû•p'DeÓû4Ûê›­/¤³ß•´, üN3"ëtà«tP~¸* -ù>PÉÔH"IŸŽ•EëÒôÁëW;CÍ -~7³ÊôÖâÛ/¾U -¯MuQºéÝU´´ˆIÁºÝr»ø×±õNy[æݼÈO}Êþ…<}]»e%µv=»ä¦,¦ÌïËo¿ºÕm „s›'á1¥+äTMoØ~Î[X’ôsj öM,Á§‡jKÇ“-è6]¼bë€ìk«k @ð§2“KC3¬ºüJ;V×Çg¿¬G1h<^蘼iòŸú ¹=ÇHŠ²lå}6Nî´»²^u’“öª¾0ç’Z““ê÷ä˶eºÉÊõä «Ü¿D€Èß…š“vèÀÊ%Äß #TOåéH›«‚ô½«¬iü'Ï4a~¶y:’lÇ» BY9áYTOç«°Ë1!V¥ŠJÈÏ.Y´r -Pü`ê×”h4[«|r=pæ«LÚL¯³™ÚG.¤Œ“ü£2*6ªëŽ'cr˜ùpêè'JîÍ‘$•!œpíÀåŠñ’\·*û).%lç";¥_óg7Iì:;¼ÒÇÎó´ÑVm8óÁ* º~yúDî]Mïy¡¤‡4>>¨!ü06hSÈ·ßœü·Iç¯ØNb\Ú¹B-ñÕ\/e»]‘N±™‚.ØÌïþVg¦jÀÔÈŸØÚ+š¢½®©#KÅàE³ëÛˆ`…›>µÓœ3úî°Ìz¥‡8Þ‘°ÇmWrìâ?)ÌO¨4‡L‹£;ÁëíCˆ'ÖùP°L¯×WˆË¿°Ë&çÆ&ô¤R€8ö®j™Ø¯~ d¤oÁL¡¦ÒÚÛ×9PÅÊÏ$®¨ÖÐ&K~¹W;^òTü<†Ö7²è†ôg{Ûjç3£ÈT› ÔBÓÈ\šÂÞüŽmæËŸ>Ãl›Z™i©›Rج¢Oše[tXÆèñäqñ' â\ËÇ” ¢»Âï?$÷Á¯‹À:À¦¼P/ù†¿Ç‰›yF 5³é«¦æÄ]gcKŽ‚¥YTÀü3¬cy1!YÜq*ôE¬oéazÊŽíæËŠR-uŒñ¬X*ç¹C^¤z¬Í‹Dˆœ1ØÒò~r?*2‚ŒÜ%}rs¾úŸÇêgÄ®S¤J6uQ8†ídQx»<5Ää¬~þu,NöÂuçúþÈå­,–èL$ñK'¨0m›v×Hh(´]õZ‹'7ëX}.ÃÑ™jdîdŠ66í(Z²’¼P›ºSvä‡4Ùuïø~õn ©‡ª~ÚHtIù܈ÉXìÃJùD]ÈìLWPeÈQLaZa¢‹TL|!~ƒ:™e×;éªÐv©àË×Cú­¥_c 1f¶•S®èçzŽD”K•DHa\xÅ|*u;SŠPöîƒÛD’‚"ö|¯P©36­ @R .(¬È(¯ËZMV5 lØK®Ô ÝÃŽ2U)Ûé-½6´/ƒpùSõ9üÊ3íòßþÀ)š|\¯Ó×Z:PR¶ƒ€ôªå‘ãyv>­1ßõ¯ÚqǤÙÍS+ËÌ·@.Ö¬é!Œüç7Xè{¶cSÐ嚦!ë"ž¬òýþ5üÜòB+¶‡òK OÄ=˜‘GçÛêÐAó•…=ÇùŠ5LÜæ{S.aµ­[;‡%ýþœÝù2ïÁ<¬%óaï£Zv}y‡ùO°úâ9ϳ¬dE-ÎØÆ) µ88]ºQYÝ}ž¿b`Ì JHf5¶)œŠ9UƵå#æ(úaÔ²ý5+qwBD›„æ¹ÅÂßw¾”k’e„).7B¶úyt~ÔàW¦ åSú½O3„[L ƒB;^d•Š°“¤h‰¦ù†y¨“õÊ‘^¼rýpßVÍn`[|°½¸®b<ÈÔj7RÕIE4Ã}¾ˆö,L>›r×nðVuøCtÄ¿všy¸ÚR%bçÚQ~¹[P‹ò®ƒ W$—´Ç“×!ØIþJÁ&ÔÞÛýmà'B±QžÍÊž~¶!ãnC ²™‚žÙS{—Þ‹‘/íUláÞ ¯¥~Ý«ŠgJ&€;!9ƉU‚z1ËD -&¸~£á¢#ô)žS8fƒ¼Qã#uoÌ)”øø¡ý¨Ç:Ñç€éùgv%©|8p„óŸ(žÉš¯ù#‘ì;ƒ‚O6}¾äÝûbÔ³¨Pqå+ñ›ô‰mņ *ª¬R‹ý*±ýbÛ@¬åz c.[”Q¸^ø*‹Äføá­ŽÄ»ûZ)?æ (d0‹}ŒeÖ×Íû¼¾A„WÛ-m¢Šå)²}A¢3ÖzÎÎE·"Àß7\;@ÕJ±'Á¦7‹’ob!³s¿ÞÑ~"¢¤x§™Þ³b¬†Y~î¯Éz‘ç¿¢ðr8N¢VÒ0 -Û”[ƒ>%-b?‰{E ùÚÏ­G)»}ÌÕ«áÓˆW|IY…TòÀò•äèQêÌxòͨÍÖï§âÈœg.’ýHEßçýYõáãu¶¿|ôò½S?f¶³kš&HAtƒÓ@)(”ѯHUfy÷i¾ò+›æ5ºaÚW™ST2_©ÿž?ì)é’®|Nœœ=…êʼn\ë裰ÈòØ ¨÷|IýpàhbU„f¢'Ä秒ȭ7ŒRžÞ6U½6ë¤3.^¾³ÝD;¨|‘f®¢Sm•ób¯/)[£ƒ–»œîÀŒ_nçØe¢¸ú¦¦¢¤u²„É çV-V÷÷ÀæOª½Ô(¹1vPªœ+ßuhSÀÃÛ|~Þñ;ŽWZÏ>Œ`ôr; … , ìé®\: -´)~Ÿ1åÖíJŽA]8†{^\’âúøÝ .íqõÝ%pXY»Uñ%žº³Þ Uo“ùoÿžûÙVL¿)Ú wq¼–CÖZ³#‰éK¢5çOÊ߼⹯bpÃöU ?4Âh¯\èJ§µòè™S<{²}=Á=—z8ðøp÷È9±Æàå„ì{…x®\÷8v²¹‚ ²%cu:Àž×†Ô ãħ=òsá ®áé–Óš`àÃâaþ÷gB“àšh“AÛ­Y2±§N jhyîFÁ:¡‘[eñ‹u¡¢bQ»ªpÆ™e1Õ©;f>/Vgâº÷T5õ ®Dš=è[Q¡JISöAÓ,NA{äšÂÒÉýÈŒtÓ4Át¯/§ugÆ2(#Ï-½ +?ÇÝÃfó3èR1ŠßuÈ}}”‚ ÌÄF Þ]3'·Å"ç ’Úc¹EUy+Í'r¬hų‹b˵ìuç…–f`)¨f¹  67‡bÿfËꎎµ_$´Ih -¤¿/ì-W -Ó»…RŠgn™ëyÙÑÀüb;·Í“Ù²|ñQŽÚh~ŠEíp©F¬\²3㼋hLŸŒ-Â¥{t¶`AŠñÚe2ë[`o‰&1ýN“\­ÙhWÀ×¢çÀ¯wðª:|UZ<ÏPÁz”Ú-A\Z„qûÔã8»ûNü£È&.1f.¿ÒuÎõþ¦É»Ê{ßµ Bã3åqÄ„÷LžÁÈÄIÁÄÈ gu2¿cëzÐmÖñ®œ’8©2b.f†XU¶s÷žk·óó+øƲö †ÍË\5$îPòØסÊø^¨‡Æ0÷ zTiƒi qb©-©1 vf‹SÞÃpe>©¯”Ap' G<ÞA]'P p|¬ ˆ‡[5Y°€Ù•Œ‘R{–°ÓEaW-µ¨hÝ.†OjUžÑîMö? +¹~?J#6 bZîEk[ž¦ÝçâLXÃ@ýžxþLbŒ‰Àßþþw½Ï=V…Ö*9㉊_Ž:ô¼ZceeÂ2pã:‘¬âL”æ÷zió€t¿& …äü Oæ*3D ”#;Õˆeñ<2<Ø×ú(t©ßs+TZ_?ü:à0qÓÆX$"\÷ÅsNö@ã:º@ÔA¬1|ºÝ°Á‹*Ò6Íãú©²Ä Ü.¬`2¡ü€É‰Æ;ëfˆßhùÂ¥ó‡ ZóØŒ,ûbaøÏõô Òê•/ÙtPÊÇcÅ_k2«ÄgÂoö=íŒ÷Á%y)/V“µôC¬îR¶¥ÚUl]rvßDo¸UóqÄŒâAÙÄ£=ÐWa³„”ê2Ñ#9¥Îo.(œÖÀ5¢  -šéN‹–²åA·a·ëƒRþVôŸi:(ÄÕ‹èÒÅÏlí!‡DÁˆ¤(ȨEŸ›ÅW ¢ ‹=—|ÔÁa²½:ñý$3¡|¢]&lÙÚ_Ÿe(ÇnÎËî "F?~ðòðmÇ*4iwgqî®#²€ õ¡—V0`kdõdz–»w;þpoæ¼ôâÃͧ©Zqù­Lkõ'|Œ)QÄM\dÃX„V±Uz·Çê“xNDõœÌ¡wø™r}²8?gÔjYVQäP­7ç‚!Ã9£A<;åtÔ2^=kÂí-Çh>`€ÐÚàìÈm„¡_là~69­|^3¶l±´Ëb_æiµ wl·©B |W]ú9'k­)‡X=a)±!èÚQ–0—óz™4½‚A©d¶g¶A•s‰òË,Ó(áãêØœŸ6ª.šÕª´^Ú/J¶‚F”¨ß„\5ï‚Uܪ¨»~ècÂHåëp¼–gŠ"#‘:†Q}ŸªŠ«Á¦y»¾¡ìøè ?׌ñ=ûbø{%Àüe䃎 ™VÃ`Ú³›3tG­ªN "‹‚КÒÌår;úå<¥âïûC/Ãﮯ'^¯ ÐRûàî£÷¤˜È*šyü'Ò½0Pñ\Øs»£Yqš”cÔ -^*n¡í³µ¯PïvœÊEH䮇Þ1Ü@56Ñy>zðT12ÖH ¾|S_ -‘?ÚòoòâÕÙ~çsúböY\ÃhÞVÛ$#Ÿø˜2óçŽÐœ {O÷z˜U¡AêkÞõ6&Z†ãÝÞ^ëj8pÛ¤ -#š–FˆÒ0cáGñ·\k$òO‚få -Àá>§÷7ÒóÊå~ÚH¾SÈÒ¿òp?òLDÓš®¾à^ž>3Pcí«¶ìÌï$æ/$-±×p!ÝÇ—ä¬]ãÇ’UŽ:ó¹1fÂ65 L¢NúS¸°@IDõP#ßëx$#Ç|DâÃbï0s–Ù(Ò?BOU*Ù¨ð8WÝùJ‹/®uœo"jæÏXì©*eл³Nôçá0ý²h!¹+1q¯ VíÎuíœÚ¤'±81Û`‚_ª”û¤–!_…EIf­¸Ø„ ²&$q–ØrÂÂóU~ñWf@Ðð¶ÕŽœ€ÓcÁmö:­Þ'øQ qX ª²!YÀm‹ë×™Ü â°ÆB²ü£ biNtì1û¼ÿ‡{Zô%{s¾Ðv«Ãý œ¨—Í$[öþ5» æ²>&Cn3Be¹d´J®–¤„ËÖ‚r0Álè!TÚ„¶ŠÊLOBÛ‹Q£‚ -ùsTfxñ:ÇéÁg:ÄG³+˱Üž‰ ŠT3/”hQÓÒ1¶'¬Óñ©Ÿ[®|Wbø’5®˜P îóχéFr¸Ç-!>Á*N:Z[J‚ë·žëìjb†_ŒCj“ô&¶³ƒM´ÃQÖ4nÈGt9Bzù9æL¤ê’…Æž Hz8R)!âIJ×õf… ©v™q -Áìaìï¾uðX¾GIêå—m -Š°¼~ì°y4d‹þY>9ƨ¹.ŸÀ(Ïø[ɵmå¡S Ö.£HpŸR Aª°Rø8\D>Srlô Ãî5U*Ðu@µÜxK@|"0óä.§ä„ÂÅ.wÞ4…KK4WqóésÜ»Ö1H ûEªˆøzÜé,íuå<ŽMÑ­j !›¾ÛR'sÕÒn}]Z˜šNûböÔôVÎYXIÏÖfâÇ å÷—5c«årßo}åªãŠ¬#æ "2Éù`~Bg|ëé“ô4€¬¶‰ºj¦CØP‚Á–)²Ù¬Ö[“Ä-êªTª¥é±ÚcÅ`ÃlV›a¶5ΩêtýÐÎìÞñúH<%B:ãàúMÒ©Ö…Z Šºl_`.·{ïÓI‘Õ<¦7È­ -ØDCþ1½ Ÿ•ÊD&ídhÉøŽ¡z/hH‚cæd=ûCô›C£Ì^CÏ·lIý%pŒgïÚëŒÔe|ÀVŸ} -Êæ44”Ž=aÌ]Ð0x,»MM;A@EÐ×´Û}û;-¥v­Í ûSò Z¡'éJ!Ú:EÈ@iLFD²¦w)~ºt©v#â­^¿ñûR¾Yw‚ <›°rëH…‹Üê TC\—Œ&Èžõayïx`¥¹û®#zE½Ù—~¶<ñ~6Øà ^pÂà'Súþ¸ÁÏ<~¯˜mjÖ!ÁiÖÚ•¥±~¤SõKÈRmŸ¨ñ] -«°w²?,qøñÇT)éF -UO”óô5g3äÎj} @þyæQ0mÉÔYmBó¡-irŠÑЧì£Eíp©ªÄ8 ø VµŽèšëéÂeGDë¿”¦yF~} ÔŒ¹ú±to¾íÓ2ý n ßé&Í7 -^§$è`~Ñm1¥„;”ã:‹É]rù60+MuBå›.ɺ2äV›… ÓúÊþªQÜÕÇEÍTÄs|Áíùçîœ4!Ò¹ç@/.²5¼2AÕµõ™Z£q™ª[? -,Æö´7Æy\]ËšøÕ²aS#ÆHÆ—hû˜†¸T0óHü„­ê‹\'ùh‡/µiÔÎÍíº“Y‡µÏÿdu§]4;@;4«]Œ5 ãìÝ’`ø0N[ð€b–ÃqZÞ.Qò$Fi—M{%át±$_Œ´‰0–«n¨¢î–ØN¹ŠÝY°¥®ÕM©æÖ ’Ø–+'3oªl³ qñÌ —)?ûÄ>¢+[3c£yÞ†O²è/©×jÛ¯"ìûè¹H¸°xz2­ÞVöa]ËoCqwû2ÓøЫPq;™QŸª(½ó†Qh`5Jž‰‘<Óš»êpøƒ;íC>²§£ÎÎ î¹ÌÔÝxÊ^l8ňۖ÷7®åµÎƒˆWFÔCFçoÀ|áë2±ÅØG‡r¦™ê\øÏf] i|ÜÀbU¹l˜äÅtF^îUªš´M]ÅÚ -+®îÖ"ÕÏHb¹åºDí}]h¸*É€Ÿ³p!{4V¼Q¶Ð1Åê4Z‡ï8 – D”eàOÇ.PŠåñ ýÚn¼Ô‚\œ_Nj” NýåcfOGÍòUÄèëJA¸ÃåŸ QRöe5êun5Xˆ¬ò(“n}„Î ¡cƒVÎXzZÁ¤ÓºW–p ha¤Ø¨a§ Ÿ*Wº™á6¿ùoô˜Ž7¶ŸÐeû(FÒ–¸x™ƒÛª ïz]Š¿´NûrÒà -ð0ð…8*qŠ\Oû®ç3$ŒqsV„ÏÛz:âÔ}}Ž¡¯å•E¬œ£íœ=tÙÁSØBÍ€D>k}*&_]\v7ÈåmäÙêu@¡›úiVþ󱇫BÊ\'Xiú“Ѻ)Ò/,uÚu/Êíœ{yÉôè?ôƒø¶èÕÏDf'`>œ^ -O/q®‹1ÔM)“qÝ•|UERùžSƦèögcMrµ­ú)V=ãÐyËÓפì5•ÿ2±®Ù™¬Ý ¦8…0qñ©TQŸ=#ØX’!Á3 -º‡´“{&õ¦ºlS“JkqÊÁÏXÁCÊF¶Bº-Ò—+ß½ÓA´³REï+ìr[¬{ãûÔŠÜx5 ˜w£–Æýª5ß´’ôdÜ´Ä|6}îÐ'+Mþ<²¤Mi¹½ât•pÚ›Œ’d"Ý(³É‚‰­kçßô(^=[,¥½úƒÔxéÑ5nß´ö[U‚ŽÜ1Ô—Rÿ|aª¥éh™¸Ç!-·ž‘¸ƒCc€lxMwã,l‘”Õù‚-sï ­®ÄOï¦|³(Ðl5+j¯q,f÷JþÙñž¿þZÛ¹£QûêÄ;a[4-ßxÂOûBâåÐ'ÁÑ¿*°Øä¡)3üëò‰&]4øácNJ¤ðMídAgÓ¨½`µYçiaÆ: Y1Õô^ â²c£š;Ì,3r¼þÔ.‚,ú  DzµŒ°5CÛ,äØN¨'w õJÒ‘'¾]ý׋0›•E[ä±MJ~ …{ùr¶Åï"Ê©‚cMädÚï_¾JhÝ2¤Q¹nÀfV*sj+²sjd!OkØs]㥷Z~-ó0Í«n=Øø`qYÄxUó^¡áë—QB…C•ià—ì°Kï+h<®(Lj%dq—~£bÏ…ËBcêü°1'C5Ò‘ôDzò¢åÊ–uÀÍF9ªJ{Ûu·0:D/qŠÈû¹WIOó2žczƒ²ë€i´<è¦ô×ó¹ŸßÙ°ÿô”û ë_Á“ å(ßEõl$Þ±#dí©×̧ù ÄŸS¹¶$¸¥_¬Š.É›“šá˜¢ó*éx/ü -WÎU,íT JKªˆ{Ĝض#];.¡%Û£&£­ ŠÚÌŸìÔí’f f­ýUßÔ×~Œ+Ú-g3 -RäBÂíÛu—gT‹&÷ëCó§í¿÷ÜùÃ0zþØ&<¸Ó_ag]Ë_óÁD¥FÕµž6Û|À+›v£I躋ïÔÎxEævIõ ?øäµx¾-'ª/ßLX‹ƒ"bÎ߈þ%f¶»þSC*è•|i~¾x¤åÖÇM^Ÿ¦&ŒžÇHY®o£Þ¿wKBà>üõJÇ,qîZ]·?6SìïÕ—F³Ÿ-¿göèAÈl™Õï|r'·vnr…R7ûùuÄ^pi“ĵ†Â!°oQט±fU?Ž…ý5íÁjCƒûhMJ£ÐVQí½!¸o‘.„âªÎWÍ^ï(…8Ž¤£fÔØæ‰&hiz/haÝ›ag†(ï_¬÷¨ê'ñ9ceó9¾ùùʯœ-ƒôý‚³ÏÿZ.½R -endstream -endobj -4123 0 obj << -/Type /FontDescriptor -/FontName /FYSERL+NimbusSanL-Bold -/Flags 4 -/FontBBox [-173 -307 1003 949] -/Ascent 722 -/CapHeight 722 -/Descent -217 -/ItalicAngle 0 -/StemV 141 -/XHeight 532 -/CharSet (/A/B/C/D/E/F/G/H/J/L/M/N/O/P/R/S/T/W/X/a/b/c/colon/d/e/eight/f/fi/five/four/g/h/hyphen/i/k/l/m/n/nine/o/one/p/period/r/s/seven/six/t/three/two/u/v/x/y/z/zero) -/FontFile 4122 0 R ->> endobj -4124 0 obj << -/Length1 1166 -/Length2 6149 -/Length3 0 -/Length 6914 -/Filter /FlateDecode ->> -stream -xÚuSu\”ÛºQº[rè†Aº»»;``˜Aº»»‘Aº†F:¤Q@@@i¤äâÞwŸ}Ï>çþ¾?¾µžç]o<ëYLtÚz\2vp°"æÁÅË hB\l<Ýõ@0u.]°ƒ'àa21éC< àÿ 970ȇɃ<x}GO€È ð àŠ…ExÖ@¾¿án¢m7ˆ Ü  ö»A!°Jnëé†yèyººB!`;]°;ÜÓÍì. -°èì?«äாnG«®ç߯ˆˆÀÆ÷/ v‡8ÀÌ /0îú»ÒC -%0 ìöдÝïXm{‚Äã÷¸VGWQW{øãv·ç†=xØU€ÙÉÁ]~'pÇü­™<Ä lû0”/Ï?us†Á½aþÿÛC`vŒdçéÊcƒ<÷«Èÿoð„ù7æöŸE€Ïàç°­#Ïï’ú¾®à?HÞß0fèï -w؃ îà@ˆ=øá‡éïò<Ü<Áþÿ—ø÷&//Àbë°;<\ÃßÙ`°ýŸ{ ‡Ä`äyÀßß¿Vj‡A}ÿ×¹€<êÊÚjÊÿœý_Q²²ð‡”\¼Bü®gÂNyÈ("À÷ÏŒÿÒâ/þ@µAÿíøwJ˜= òç8:þ5’ØÍýÁ›Ö?lÌø÷üšpˆ-Àú·uÌÀ×<üxÿ«¥þÿ¯Æúg EO(ôUXÿ”ð ‡;@ð[(Èí?ÂA.¨ï9ðÏ@#ðŸîÿò¨x€ [˜ô_2AÜ!>`;mˆ‡­ãŸvùKe»?Þ!Xîùý’\¼¼ÿàô!¶Î0°»ûÃ]üAavÿ(©³…ÛA`=W‚Üìþü¦m=ÝÜäùã‚Îþµ·‡<4û€m1—á¶bNMW 2”Þ\_ßó½4¸¸÷¤åÇL„"oq?ê×$w®¢ä/9Î,×w”¬3CÑ@AŽJ¡THòv‘íâF#$Š$|¤KqÈÝ,®)Š}ŒÎ:}|G‘š@ž]´'ç;¤|DW}aÂ$)7I¨' ¦¾2ÝÙ}®…JISý²Ckw‘M„ôgØw-ehŽ(êüh·<Ð),:KµçÍÌ5‹ª)Ö›ÃK¢Ú.Bë…ÅYàù(%L¦cJ“*!ÑîÉžg?»Ô¤»‘{9ËãŠYvNy&°~}eŸÇF%OO¥^ÅÆ%'Ÿ -Pw[²E§Ì](èšaÅþÈ%³>°©÷¦[ó«*,f ÷TGSú¼¹rÕ6ñlüC×G¸ý©ƒEBÄ0qgÛÀu®á¢ Ùê¬Åø¶—\·ÚÆÖR£9 ’U0¼>=ÌKþf?@EϪïeŽ R2‚ßID¦Lü¨ÅšÜ]—R†N»_H½3¥wdùÃ’ù §võÅ€ÿŠ­ÛZA¸zYçkɽ²ÒMØbK:$v¹W–‹V#žÆ·j3QèÉ»£w}Ô%ÌÚtÙ »0£bô|WÉüý›¹Ûkq³ÑkÝÊf;ú…Iª5tY šûN`¤.^.”†ÅÈ.6± e¥XYioa3þê&Vo-¦5XÿÕª ¤8!»”E©¬>œçWd° ´Ú(ƒ)9f+<„Râ{lü°Tc.‰Ú¹aŸµê™_¥Í Í MC–Æ´»õnÏæKÉhWÎUì½P˜ô+v‡ ô¦>4jÇׂP)æ rõq«¼YÔÕ©¬ÈâÔv2ë ܸ„#‰×ÒéXG½ÚÜK›ÏMãBbªvÛ0ŽZ8}Ü°òšŸ‰*.£zµ£íï·Šr¿/ŸÞ¼¦î§^%o2}0¥¬€ñâK˜÷ªµ=qÀÛøX@IÝ‚qãðòf˜A:ï!Ž¨*4‰çªó…‡v -–p†Ä´áù¯½ .w¹ŒRuºk›nÝZ¦€Ú¿C2ã(œÃˆ¾µÛ™ž¨Œ^9q¥á%©˜nçq¨#v„-pG‡ò¨Úﲆ†™,Ç·rP»…ÝÀ,¾FfOXš90"“B?•Ëç›»dÊ‘ä6C¯DŸZ"àñsýÅ…†OW øÒõÎÇz‚UôSRJC”ûf›+e㬧”{žÏû±çÂ’ÙÂøøYÑi1Θ»:'U=$¶ÅüÂ3/˜‚KDZ7±F…˜èŠ.‹¥ñ™ÙHòÇ‹÷×Å3|äò× Ôã¹/ÍÜôÞùDŸT2Ì­uÅzE8ž`eJw½úòTæåm:*.çh,B’¨Ý¸wÝ´>õ'×¹ÚIÜ;}Dkߣ«@ëïH]‹×ú,tW¼‰‘–¬Wdz²Ü b¦Mbß̧J•{›@•‹þ‚Ö'R³ö"Oj¡8`…àæ“DíÝU^YÎmŸb—Ž~žñ|õ|?Ï®wIýÖ,A5¾r,Á½„Èï zÐQ*¯´;÷.Ä[V‘Ï ֖諧½bäIŽº-ä g“rÈYˆ'h}yŠoìò~s¹Âp¦*ÂDŸW‹˜]ÓÚ)N)A|¸Í„AŽ[º›˜Cx/[õ÷£é=–©†8uF+_Îí -ŽgŒ ë¶Öîé9¦6"N>u5+™[®1ô&¢´º[lÉkÞ¸t.EÇFÈx1bòä&GÞa§‹Ær_ÿóUCS—A’‘„1>Û¢{’uºÈqRt+D«Ë3˜&ô¤Y>oȼժÅAßM+p%ƈŒÄü>K'Ë;Bˆ’r²¼A hÒ÷ÿ¤ “¬r§²pkBžkT;ó6âdŽ¼ô?™iÊ("˜#­ÛÑ°Ô’1é¹n_¶fd·YØÏ©š0°a ™,µ¼î—îÓi7|bTùóÍ*0˜"²Ýó%*õà -Ž(Â%_U@:Œ•Öš—œÍ s–èZ8ÒiOª6>ÖΓ½å-.q±m¿\;¿>ÍgÎÆêOg^r¬góQzãf£Z‹­8‹§£V^o¥»#á#šÎ89LdÊIr -<ÊÆ•µ8U™VVtc§Å]£îslæB|S3GSŠwÄ=(uKà0ú1“y2m ®Uµz6|ØÂHšC·Õ˜Ó³CÉ6¥BG››!‹BTΉ£¥kíMª¾'ðµÿÅfa"é\qŒRºY—›áÂíä¶#È*ÃSDÛ¦û¼‘š-ÇB+œ-…‚Z[&Ø&ù®Ì3 ß4íÓ6XÚy*'"8¼«Ám®½Ž˜²kî fïKò€>áçäÅæjÛék 3Œ2áOôã{h~MË ͳî¼WYöýMùˆô—Ùš0ÝWv!a÷^R¿sqN¨¸µÖºéʘ÷–ö1ÙZÓÝòtÔ<¥úséÁuŸœ€»ƒ*’{‹: •¼OîµÀ¯«Z×ý¬9Á¶+̘tôÏøcbÙ)ÍMN»K¬¹Ø,TÜß~ªMb);,}Çy—,w‘úójZOô|€NµåÛ,º"åÑy…75jè]»5ÞÓ - ¦áS‘0ö׺iÈÀ¨à+ ¶xG¾m³a°­ž”ñÞagÔo*ƒè^b"óOÔ„IG‘D ¡â]Ì:žT”–gUsÏ[üxó½>:,½ 'Á+½Àenú‘r?Ì«xyŒ'õF èÍj|ñÝÜ¢Bž„·žz b EÊ'‹ -ám»v³ÂR‹¼-z½Û†ò$€³f,bb,ˆ¦?Aä8y¨YUDB=u…ÈÉ¢íJE·¿S¢Dšy† ’Ïׂ%1)ý^ÿ»Ük‡áÁ€Øe“Ù•æÄè³éE2âÇ[™hœÂÅG嚥vaY§Ås}BLÇ´_ ³(\A#{É?Å÷ƒXÜSÀæÒyWaÊ v«BQÕjÁõ0ÉqníˆÚÊònΣRÂ¥†GFÓJŒÆ£lhúõÛ=Ä)JÐZxʶJëÚØ]PÄÕD_âxFV(pb0¢D -(Ó®fd+Œ‹·_‰s½øòEEkr\ r¤E… ýÙ8’ÙJ3ýêéu]¦íÀI‰ dÄcbmªûðìî'3ê+t·‹‚c<ÐfûÏÈ‚ŠÎ_[Æ)û¼D UÄÜÏ;i·Š³é:›Åø5ÚoÖªrÎz¢Ò»%"šŽÍt–Ãó¿ózþè}5ƒƒoôk^àK†ÖÚLÃusêTè£ëÛÇ¥ª«!ž¶éŸKüâ¿Ï‘¢‹g´Hß~G ìÎvDÍ -Ç5¤‰íÜ}®Ä}ñÎG&)1ÃEß(íãÛH{¯ˆ»yÒ"hãÍ Ôy'Ç–|±ÏŸýñäžÇŽ³ÉÓe±2EP‹tÃÈÔßjG†06¿Ñ—še¥5ªQãq6u ë¼²ï&M&t ö¦ÆäG‹_ežÿd(ùÑÀ§æp½5/œÇ¥Lø…vkSŸ³Â­ Þ“€ñ­'Nà©EÄ!DiáÔ4Ч-ô­Ùbá ì·*ÅfÉyh‡ÞMÕÙìâo9U”6ŽzOR%}œWeÆ"¤ÂLŽ”¼•%•ò…\r]Ɖ=jNBeŒyßL½Gω$¹a—òVzšO¶Ò…·~,§:¦ñÑ~ïàçlD˜TÔ±’'»–p„§è‰–s"²2ì{…Œ!–¨¢#þ-kÜ©Ä´Œ€’Kѹԡû>ë’|£¯B=„”)Æü‘§ UØýÚ"—Áî"vª,Eëú|½œ3ðè&+M€“sÖY öÍÌòíÝÙÒýE¡¼úÞÄ&ÅK ­8’·o+9˜ ÇüD)ÃóBÛ4bŽ¥·5O"ï¾ÿ ÷ óó—~®Zþõ3Q`ÈÏ…"U9˜ËO†9E)A™ »2ï®òéiÜkœÁŒãè9Ð Ú£«{Ѳ€gRÓûêÔ $¸@J5#ÓìÞ“^t¹áPpÎS‰jù›ú@ߺ5àP㾆}R7ÿþöM(‰SVýBçø‡Nýþ“#"éƧ¼BŸ¦³3¦Xx>úuF[%5²*±»”Ñçk¸8’¥ˆq÷@œ¶u½ÝT õa6ŒÇ3Ü:ñì•|8ÕYF‚™uõeõíó0w]æÁÏ󄙌•jVáY¤däSœD®þI~K{vµÅ RøŸb‘ {»ÅsuHæ”V&ÒljÈ2Øfæóu~Ý*Œ†B7ÜçËð9¯|Îã™GDz7”ü`Oêb’7S Jëˆ|±L¢Zô [«h©Û^]v0À£{Íß‚‘ dQӠųÖ8ƒG ë&I¼/žÖ¥º§­Å®ä-ÑbŸ?Ô}ï£kPµÂ‚4¹Ã`³IƒÝè—ÙãöužkÛ™Œ«Éñ‹8Þz–†°ÞþW9Ý0§©‚0œí–›ÓןøeêZ‘³‘ñ™Ä¯2Õ·£~e9_„7ýÞn`~ è³¤ÒÝcû\þ¶¸—!ËcÁ“™ƒÑUžÓ‘r®ã€ÑVG7Ô*Ö€UçT) yäˆ=V^ „¸™Oñc¾9îÜöåˆä9>À¤·"ý„z>¿[4âÜ*ή%Æ6Z”èÓÈ”â}L=’Ž]´tûÞèm7CÊVŒ¼”Ó"nƱZˆp-O#â ‚Mš¿É^‚7“>z\×Qä{ro©¯¾Ò֑̔{—óˆüÓÚÛëp–ä Íab߆ÅA4t~ZRã:â±®ÝdÔpóeØ7ªžŽm©öagfÔi®€6»$O -ƒäb•»“iT±ŠcTõQ¿ž¥‹qþä6¿ÛÕk²_ø‹=2+ Ì5sb(éº-õHòn¦bìýE63(• { ¶ KQ¿ïEÒô×S–>"t½øH ÝH†Â˜yM–zjŽÄÜö!&íS£íÃ÷ß% T©È=­ œÂ®'ïD(ÈašV!#X(mÓ®›dû2/pŸÕ†ŠÆعrgIÜx¤êë¯En[ÅŽú±ª £žd@•V”“-æ‘u\»]­(ovH g€MÓ:t¬[¾Ž8wl涽ªÊ'\<&!k" '€íÔÞ7~Aö/@i ¼ˆ‹wIî#³HòÝvL£=ŠÿÙ†þÓð©#Å -ˆº9Y+è2ò(`RÝä,²‘p˜:À®Ç€8®Ü¨q#,34IÉ 94¼È¤z{#ÚÐÇ%¡|TQEíµÎS6º<Ü»¶‘º ³S’¢JÅ:~ËÜ™_♆*¼zé*D‘˜¶a2t;ýCª<4(á†uØF¦’ûf¾;•9˜ŒÄ~XçCÈþn‡8M°Cy^¦·”¯m Æùú×1o†Ìý—æÒêëº*ë(S¤t÷1¥¸Ê­£û ´ùžZœWù1K!Y²]ùsEè"›°Eñz¿–/Mý|?9ìT*Œû†ËúáƒcqíÉ¢#9ºý·.$G¿ÕbÛuÖÖÍ®—¯Wú½^`zV_a,£qÂWî+è9beƒš‚è|OVhk_ûàHºvh( ,©•Ûž˜T"icžIܤ>2· î,‹óK²ðE§°q£®1ðçæT¢ýRÎÊÆ™äÅŠnŸÞ™k&¢;PÍ~ÈÅ þ°—qõ‹÷€§P’"D4w¯«Úÿ6–ÏÂÆrV—mÑeX®7m.Í wÃu«c9¨ÄûE¿GtðuÍ&9ºûž~랥a"ÁÂû–]ð×îˆX·É†|+æ<Ê4b|$2ÚëBÆ´v’åÒ ëGs|!´wž‡Ç†gk§+jË`~ù´ -O/R¿µ\2nŽ×—¶ÎkD§`=-w{÷E×Þæ#*.ú(Ÿ³³„(;‘˜óÚôD–.¼*ÀO,Èv„€`7L½­—Ó©,Ö»!h—ï¾ó”ÛÒAƒá`‰áí3éæ|ûôIÎt!×uÖªláÇ›ŸeÚ¡¾<æµë!æÝ=õ|K:tÓ«}Ò’UïÍS_ ñ³V¿•Ö^µ^ÂBÞWÛ<ËOä9<¼Ò®ÿP$܆ñNÏ—ÌIªž±:)êBkò-ú|)ï ¸f9Ë'j>8\Àzþ‹¸GX¡­ÜgsÞò;¾m#²©ä\øã²›ÛiÝBÓ+MGéôÆQ Ú×*tEâ£ãúkÈíkQñ{šMÌ;Èì5q7j:}•7V -¸ò¢uèTßÁ1÷Ì™Ò-ô*vÞOñ¤E$çÛÆB6ÊéÄZ£*î%ðÕ5å½P¯’p±Å¦‹OL$·9®XQ6_^‘׳³Ø¼8x\”³_Êl]®÷ÕœŒ“t¤j$üŠªcÙ]6ìÑÐw«Â“zeóñ¦·yª’Cªð q'b?ãæ‚xÂp‹ëòð}½¶þ•qûÒt6n!œ_æImó+zÿ‹Üæ‰DJUõÄËÖ”9à½ì©&áCü[ùVñ¼ýf] -M¼,Üæö­˜Òó´Bvõ÷Ý'«7¹ÐÇ…Nq°0?®ïgÖ]ñ”Â\·I{#,Í{eKűzœßÕ^4"JZÈg^×>íZI EhJy¿(˜ —ö2ÍLc’ªDI‚¶eÕ -mØ=Í—HëvÉYËCø -SpqϨ¾ÒñÑÂÌàq>SÀÍdYz÷ÍŒ4¦Õ\‰…1:QÅre«ô•„~¯»eÓØÒ ’®Ôëw¯Ñ³Tê*uµÍ³§â¶úÁÂ/Z¢[Êô!‚4ñ)›ìƒ ‚p£—uºš{ÓÞx4å’ù(ø«”)½ë˜{míLìé®á£ûìh“¸Üá]d©ÕÏ™KÊvB›µ&r½ð¤T׋Vûç‰n÷mÊØhæ~®wfÃ9 ›l¤ó¥O(¡ç[•]³á¹šŠFgIkðk"¹|Á×™@ ¹FGé÷–=“ÜšD‘ˆâ•¤ûšy¿ž;Ä䇾 æyÿxWu$‰AíýÙ[&ïÐWF -ÙŸEHYÙk×÷é2]KŠ³’|:}„ë•¿¦h*Û¯ ­EY°Ñ×CËŠ?}§s.šàŵ½fèeA¨›tv$ä*À³¸'Ž©†æÑ€|ŒÛ[Ÿé÷ ÷—:Öo19H6œS«J =g²Â™Ô;4Oßö¾Ü›¹¢0Þ5ÉÇW ~O´BïÎMaï÷£<õ²)uq%YÀ„ö¨|»öc\‡%hùÍ”å+'¢ÿ2K¼ -endstream -endobj -4125 0 obj << -/Type /FontDescriptor -/FontName /LHPKHM+NimbusSanL-Regu -/Flags 4 -/FontBBox [-174 -285 1001 953] -/Ascent 712 -/CapHeight 712 -/Descent -213 -/ItalicAngle 0 -/StemV 85 -/XHeight 523 -/CharSet (/C/O/T/a/b/c/d/e/eight/f/five/four/g/h/i/l/m/n/nine/o/one/p/parenleft/parenright/period/r/s/seven/six/slash/t/three/two/u/v/y/zero) -/FontFile 4124 0 R ->> endobj -4126 0 obj << -/Length1 1199 -/Length2 2227 -/Length3 0 -/Length 2969 -/Filter /FlateDecode ->> -stream -xÚmSy½>÷ûûï9ßsÎ÷wjµ‡§ž-a&W£ÆnPhãIbºêmi¼\&$ -åqà¢.О ’¸Ìt q>^t@ ±C4€AãÐf8c´àŒ6úé³q€ -…w d3 ¦r€É¼PÉõä±X ¤l90M98€*¨pñÌ€=ÌŠbC4:ÐòÞ¼U[GG÷·ƒÅb ¨Ÿàr X+8„ƒ ˜µM@á2A¶ pÊ‚¯•„§@Ü…¶-:—Ë°¨$P`ÓçPõ™ ×@[P,žI±‡C8ˆý 6H4e°˜†!L8‚½(D…˜”ïíQx,o&Æ7:ü 0!~Ûh 0A¢±h3 ÀH2Ý`!µW übÌ$&%6š³*‰Ác!*(ø!¢9¤pà²y`lôÿÿ¾!0€‘¹@H<Éov¤þ¸H\6 ø£õÑh €^ø~K™Œ¨ßîn¤P0°u!zû8é,Öÿ/O;;X@«‡15ô ÍŒ FÐ'ÖÄèOÖ_züÔâ»ÕƒýS+ú7åF&°?Zhù³­pÍÌ* õ}´µó»Á\ˆ Z¿Ç(m‚Là‡Yt¼þ…/:dæpä1ß•Ñú! Є¸ ª0‹³  Dþ¿(R(ĈZ$îOÇ­à…ø‡îOø»-“Æ=Œá#Äq„"AŠÄ%ÓÌÎO¹)ßô€9Њ BL0`^tˆÂ9Á£|‡@&å¤x&¦@LàÉŒ(‰MùeX€É<6[ Ó÷—Äþ¼S!A‰  ’=]0Ù<1¸<ñ¿Ô¡7øШ~ƒ÷ô¤$Tî+²ÓS†¨mRçïRªïqùt%[>ãMDú6dnbšç'œÔÙCMÖq -' q'¯n/J-äi,YŸµüܺ»_{ŽbÈcY3ix¤ïÀ™{õZ¥s7Ñî$dø{8Ø”xfçxíæX¶­Þt€¤GÙU6ç/s˜PªCÈí MǯY–W IHÃQB9ÖӪݣ»ûƒ¦×«$n+]Áƒ13$|kqÞ åŒF™Åú¦&ïÜ+Š°ŒÍqHÜh”ž>3 •¢%ä—UäÓ~hS%'\nD뽧¾ûz™Î -℧¥)]ªocpºù½:×FN6áaÍø©Àýã©¡å"ϧ„Ûân¨¢ò€V(ÖåIJûïn^½E9Sb\ƈvGZ Gö¦G­údù:í„M˜ÙžÈ3W§Da…vSÄÅ×:3Þ&Ö©}y&”›®Š¸Fâ¸Fmçý5ÍqšVºwíJ?örùJG;ÎèÅ`F©Qï?¿^Û˜B%…µ)È›6™›¿n̸þ‚áS4k›‡A\©k£MYÙ~y“my}¡¨w¼Ä¡ºŠÇ9·+ù‘j¸Ð÷.–Þt»3k{>¾ÆCŸ -,úµ6ä·¾ºVþpx„ý±VòqÏ]6ßfõvÁ=ÉI1(¶Òߎý sün«ÀÀú¦Cæ•ŠCÖ !t™Ö»Œºõ®ºfÑBù9i0o.¥ÿBU°¼ä2ÔåÖ¯:*kŠDQÊ:RÓ*âÁôq …î;ù3¸¥È·.˜ömÏ Q…8^ÆlQudŸL<*¹uàÞ›ves0êÛ&ÝRqanŠEйŸ {ÌÏÆ 6Ϙ—m5ˆäµx]vë“MîDÙÒ -Õ -ˆ[ª:r5G…éc!Ã…S7JÅLЗ/?wÁ“Œï˜´—sÎú–4ðiùgËó"‡ÞIFúó‡ÆðÞqp?DW¬±=ôòÊ(—QHC¨T[3?êß$ -W<»ÿZI’pjsö4jy”ïµÝ¯D-V8užö"–mžäÍ!9¡Î·[íXÍOž iÔ|²p A:Ô êÜzÚqeïiÿwj±Œ«­ò(ë"ç̈Š$cL§sÌç£mGªPϸûŸL*£–R ü(ÊN÷~ÛÔUÿÞ€hÃ;¢å›dþlɾ•ŠJç±u*U_W®s®Òu~›oüãµÅ>™=š.–ú­«ï‡è ¡eõ»¢³s¼Î=OÙ³o¸óøTY%fðƒò«æ¼ú*öUMôD{…vƒ>;¥.TÈïÛÓY*{% Þ…8sáÃ=ZÿÞWŕLj_"cÅ™ M®´#äÎó…SÕ·HÎ+€¥%~îTe¹Iæá´©>æ< éÇ/ê‰v,Á —Êûmß}oÝwݶƒ(Ÿx‰]š/ÏŠ™•¯û/º¿Á~ -endstream -endobj -4127 0 obj << -/Type /FontDescriptor -/FontName /AJQUXG+NimbusSanL-ReguItal -/Flags 4 -/FontBBox [-178 -284 1108 953] -/Ascent 712 -/CapHeight 712 -/Descent -213 -/ItalicAngle -12 -/StemV 88 -/XHeight 523 -/CharSet (/h/i/n/t/w) -/FontFile 4126 0 R ->> endobj -4128 0 obj << -/Length1 1626 -/Length2 15301 -/Length3 0 -/Length 16145 -/Filter /FlateDecode ->> -stream -xÚ­¸ct%\·%ÛvNl;©Ø¶ÛVŶmÛ¶];©'v=ïÛ·oûõ÷§ûþ8cœ½0×\k®½Ç‡‚DI•AØÌÁ(á`ïÊÀÂÈÌ P°²3qsQq°Spà‘cšYþÚ9à((DÆ®VöbÆ®@^€&Ð 4°²Xxxxà(¢Ž^ÎV–®juM::úÿ´ü0ñúÏßL+ {åß/î@[G; ½ë_ˆÿëDU àj ˜[Ù¢ŠJÚÒ -’jIu€$Ðèll Pr3±µ2ÈY™í]€4sg€í¿S{3«Zsaü‹%ì0¸8M­þ¦=MŽÿ¸èŽ@g;+—¿ßV. gc{׿3puXÙ›Úº™ýCà¯ÝÜá_„þFØýõýSrpqu1u¶rtü­ª$&ñož®–Æ®ÿÔv±úë8˜ÿ4s0uû§¥ùþÂüõº[Ù»\ž®ÿÔ2̬\m½þÖþ æèlõ/n.VöÿÉ€à ´0v6³º¸ü…ù‹ýÏtþ³OÀÿÖ½±££­×¿²þõ¿8X¹ºmÍáXXÿÖ4uý[ÛÂÊŽéŸ]‘¶7w°0ÿÛnææø>w ó¿DýÏÎÐü%alæ`oë0šÃ1)8¸þ-  þ¿S™ñ¿Oäÿ‰ÿ[þo‘÷ÿMÜÿªÑÿv‰ÿ_ïó…–p³µU0¶û»ÿ~cc{Àßw øç¡q³ûÿ¤ÛYÙzýÿ%ý×hMà¿ÙŠ8ØšýWŸ´«ñß‘Û[ü•…™‘ùßF+ +O ™’•«©%ÀÜØöï¼þeW·7:ÛZÙÿêú¯‘X˜™ÿ‹OÍÒÊÔÆþ8þíÚ›ýWú¥úy&Eq-qIºÿÃãú¯@¥¿Kàªæåø—ÛÿlEÞÁìþqðø0°prØØYþÞ½¿„x8™ýþ%ÿÄòŸgycWg+O€îß¾™YþÕýÿüüçIÿ¿ÀˆÛ›:˜ý³6ª®Æöf7íþq›º9;ÿø_—ÿo×ÿqþ×Ξ@S¸õS¾ëŒìL×ìü±1Ý¡ð±PÇòfµ’¢À:‡þ€Œˆ=žj£÷úPÆ–9ÞÏN¯åsÇ_2´GX¶TýiÀëB?2šÁ"ÔmÊn.º£`&ƒrÄÌ ÍŸß?åv!t8™5Žög”U ÊÞ¡çºÙœa~?Ó’¹b?9"ù›¦7Åcö ´€ 5Ÿ_P&Ÿ>?QLŽößBþ§ˋ‡¥à3ÆöO='Iqõ2r~h6ý„|uçrQŸtsÔ‘YeL4kíÊ’7¯Ý¦ Èf¦«ÕbÜ_®¯{º·“OÕÖ±{*Sv«?]j”t‚hY&iNÈ"©„|UOxŽmu…Ÿ<~‚[àbæ`j€”a«iè Ž´@<a †¨õdO˜ôægåH/ j4ñçPx0É:Šö> žòŠ„ñ\Ahgy¯ÝM ›@m”jU}ƒ¹%Žoé^uÙ¥ -ÏÈã•+àÙð¦¾Ù™0Ï/@ƒzàKL¢™ÔŠ«Ý3áÅž(}"-~ßÉçe¨[8Ý°†õ‚Þ³ÚXÁÈ<ÚIÓz°¨aØþâÇÿZýŽË8ý”àgé¢Ýñ§²(°š5Øð‘ùMœŸ°ÊQÙqš–Çb“ Ë ƒ–là$ÛµÀÓ:ˆ=¼•ºoEY<žžQp•žqFô“qS²‰ÖõMž]Ñj-µàdS-Ø+È?»—`T1Ê¿Üiai§Eц0'êò؆±‡O¨Ã—3@ˆâ¡¥Æ2Ð ½7¦?'R튑@kqN+‘NhIEÈÇJŠÍà -Ö`;!ÃvákQ_Ê«}¤á;_‚õ' 31<¾XÆj iC#½%'õÔG¨×§ÁÜEЮ ¹.çÝæ°Cöý3ë?íOßvŸ@ô?uâ[}sêw͹$á§÷ª™ÄJF›²Ïn£-iC ?Íû'˜Ók¦ì²Êš•[o·¯YTñž§º(ÞØMk}ñ„lA™4£xÐyðh a/`vy"'æ­ ‡'Ц]U°y$Yãó Ò68?oà‘ uô‹¨n0¹ä9–ô‘<Šòx²=¨ÂîÁ¦ƒ:ØoçkKU…ê²}è¾6¯$|áô`í–˜ù%2ÝÏ}Ó×HgÿJ·t•™+?r€¯€^ ¼ñ„ì‹>C{ ¯0Y'PúÕØÚ]ï)9Ò#ÏKfaÑF‡I?hÙÜ™r ¸FÊs <`Úþ&¯èxe:ÍhŠ³¸xõ…€jã"«Òü¢ô Õísm•“4êÝ1'ºRĬ«1¦A~ -¦[i†H·°ã7hlîæSش׿®—u&;OnŽ>¥²S?M Fà-«Û'üÂäÛbXWjÛ ©oʨ_¤aUƒóör‚üŽ½ZŸž&C‰"t‹³1ú@2f,S®²ž·Ï^}66S ćß{À$±Ï”‰×6kA½„CiÜÈäVc1f¬Q³7FÌÑrïþêÌb¥K?MÀñX-Ž®0¦‡×|-¤jâ`Lz6]dC-SΨµZ GBë㻼¿®[ü²)aÄ—s˜æ -Ãð#íë¡uikb]ö&¤þç£m%ÃJ¤@Û}=t³åÌýõDë·š¯Â‰SͪkNsýß -+¦Å0°L%¿ ?o5Síx¡ SFŠªË4†6¾q†æ °ª3á¿ Y>yà/~DÑykãœ@à&…vêe{rµKµ›z»FâªnláñƒÜŽÈÌÅŠ(a¸nÝ jÉBL.&WO½ÝC±Œ~¼…ÇJÍ®+ä%ÈmÇŽR%üâ~ÄŒIƒ“·ÏDT5̢ÒhÀ®½äNé‵SÇ”£¢Î êb¯ˆ_õÀsñýñÝðV†ñ6·Þ÷b„šÊñ«o¢Ç©-ˆ­8º-/¢è§<¨+¸WéœTjñÞ"áÊï‰åY×y)!ˆ´üþ•l‡‚Ü̃¤ªdÜ4“)/üÛzÀGï‘b– -šFé)¹„„ƒÁ£Ð•ˆ:ušþéIòú£VÑWã€TŸ|•Z'’ë;1S-ˆ*83•1þæl&Pou¾¸Å‚[(5zf‰8Š„¡þÆß8kàØ -¿v­ÚF4L­ÌŽ>v¢:¥n¥í8^ØõÄÄÅ'àwˆ­]&3€%Â#Òü½0Yú°/í«­×U°Cëº7/Â+S£Ýd˜ŽI³i`Fu1?Û‹”dtÚò)[¢ éƒj‡œ¹©xõ«(ïÒ±ÈÇÕJ¶a#ÊUIüÅ^Œk‹Âοšû)KÕÂù«“"‰Å¡‰KüÚ~/×v³.+Åvלj¤x =Wël%÷Êù=ø¶ sfÿ…jH“ëÈ)o’zˆ†=§š~5~ÃÐ „ OË<±}†Ö‰-MÌ|Øú’}mMßù°rþïXL@ÿ” ÎöÊ"Šá^$[eËè4ñŽRbyëë¯S"L¦¾Ó¯hÙIÁxY:Å%k6Æ(ûÜn€´¾º;‚ ê˨¥\`ÓB6Š©ÂŒ‹u‰-B*eÎW‡fSöÑ@¡ìY|?Ŧösa,j *a‚íNÍߣœÊYÉú˜ý:†¢'7©|7} m¯@ÔÏË~6kGbäø–-%¿pK-•ª[ý÷PV@쨫 -²ˆXÈÌ>jùŽÈ2Ýw rôÇÛÕBRvT >k7ÎI.œÅ.y^Œ÷©:Ôo6ßÈèVš!åÚ%v¦CrJ'z#+iO%ljÖFX:Š.°Dû`>Üi™®Ì›4¾B2MêúDéEÑ.JR¯þ/ã#ˆ!;Sg`ÓZ¡‡Yr¿´pòƒô+!è÷™[F©(AÒoKñ㢲5s®!/éåصµ•¨ãñ®?ý+éÔ³óò-…¶%¦Wºl¥KÄc9vóuíqW< ¬hR g ÔgÛíµ¦¨¸AM!dE˜ Æ;É'¿QÏŠTû¬—*ùj\OP5·:€P §>[ø„Cê³Û1ZË©Â_?øjH´¨jÇáÈpülkÆâc‡A%s'î[‡V]GïW5·’º²3ýÍÝž–\´Z¡üik-ÞlÉÎÀ@ã–\4)ÿžu„Vçs‡'|ãݵ:ÍØ;Å€ÿœc³1zLÌÅÚ‹ kúzÝ)ƒþ󣤠°~Æ‚Á70A¨ã²GJ1HPß¹6@&>¤z‚¾_Õ»8)DŒêþ'e˜ßˆAFÖ2ìà'X((XYÜ`À Š•J@HqepÄ‘Ù¤kÙÀ¼w„|ú‡ulËâÏú‡IˆÁlW -éªjbfdÚ%Άû ^UUÔO»~÷îà’È]pJ¡Q;C…c.û0ñ«…2¥3½>kÁ¹~–w†j‹&7OÂ7|o¶ä}’X¶RêE•c!›ŽñÝ•j rP7´C´ %ºõÚ ¡{2 `ôdH–ÚÃj÷­>¬ß Å1,‚`}’M‹ÿL³‘»}}/³/É  n°`ŽpP¸0aúy…±Æ´!©Ø“Öjaòü1PX -«â>Ý›\P»Ç¯88óÚ˜6$M´r_V͹`?%Þ]e”>Ю—¾Yùý›öµCžÿ-Øa{ù×zÙés oF»^8¯ ›aw(¦ˆM ë´ J§ Ñì¸lÑ*øÖ½]¤|>+¿¢`‚ªž´¼ÃWzÄ[éµNàõ¶M&u¦6Èž*Ôž™¥éÔocU7ÈQ!=kÖ³Š[ ]2•9R%3ôãh:® :}©ÌÔ3å¶H±Ðõ¼· žÁ"•³»X(MÛõóÚÃs:¢ßïÇkmÝEºHËóíò^Vw8éG8™ÛE¨Sž !¡ÄŸµÓÀ‡S–à °o­oâ®4¯†WÜ õ»ïCÝe‰~$Ê&¤ïTç–0ÑÔ1§>íθòÁ–‡«ŽÍVêþ3涿Xæ€çJ@Ϭ¡´ÎsY€o_‹*ºÈá{Ý“º« õ’-@œ鎿ݱ"ë&„×A^ϱ{Öi\²µ¯‹ëyçb„`ˆÞÁ¾¥­2Sÿ°+#:K¯$ÐÁGò{œïä"|¤jã@ÉCqj›x‹~pv YU÷+Æ“ø0¤µÚÏãÜkÊís§¬K4ëˆú ÕleyÔGJ·SnW•cÿøÕÈü&•XW—Èžcæ}gµæ¬~5ÊéàÐåÊ‘Ê€Ó.½`Ø‹WS~/)¦ÜÕ±_©}FìMóã« Ê䊘Y1˜‡/]…Ò:-š¯OØßÁ_ü'ÊÕ•…GÕ&Þ¬ê.ö\žBvxMò»k™ÑX²MBîoÒÏÜ£ÊËäfÈ]ɘ¸k«ùJµì‚ j÷F—Ï4«{ú™ÌòJvz=Ã¥ñ‡p. $A™o¿yq?{DÒ ÅWqÈ•<{鯢‡Qjv¹<çß‹7I¢·š¥ôÜañ}-;pú2|žnD½ žJ4"âc‡Ó-% “¶A=dÀ˜ãV§sK§îSŒý¾˜¦ž°==dEˆ£PtqغèNE»ÃÞraïWAô£ðLÌ&šj*„ßûHÝm -'}=Êð¼K9L çyÑ°m¦†kô…„©ÝqZSWTrÚëŒxý.¥ÝÞ`%X‚÷Æööš„ÃáÄ|?'X®5y&Ñ +ãÜï&àÛÒ ÜÐ05öç]cÚ¤R¸û"7”úk¼2ûdhp‰žƒÐ¡-+™$ÒĈæSÊÃéÛ&µÏ×ÐLø”9*t:¯À•ÆÔI<Ø–ÇDz€ ä(}勤¥À8?ÿ‰j=£K‰Ö·íÎ/8÷Ÿè¢¢w_cÚ]¹”PqKìï)À°‹O.Ö*"vI;×1œ8|€å£¡Xϯ¥T«t¿räJVñ÷ž«fšû žø¼ZV¯ Ý`˜|ºLÖ=Á-:ê„Ü%i¤ƒÑ!™D¥nªZ[#–Œéàòý’Õ"¸Ò‰ÜæŸWåÌ¢r{»¬=¿Is¥ô£)1B¼«@)˜.@Þ‹„–8ÅæòÖ¤gTÃøñÁˆömŨȾâïL”4ëL3n¬4œ")T@ÚÙtXLipÜãš« Œ¾…ÕNIׇ½šþù>sG_†Ûȶ.5õ„h–AIQ!BÎì-k1›ÞkÙ±úͽ¼¦Þ•Xû¬!v7ÝfW/ÍRÚ‹µ•B‘”sLÅ\)S÷_Èaà.D‹ózÒüvÒ…nÇÙ2RÛG–dÓ¾šó  È(Z¬í%Xs}ùejò£üù— æÝ„ U’º"=EOý\·´Š÷ZhÈ‘luÍU©a=œ ¬vÊ¥ ‡ -îÁ5úò -'ÃzòËz5Ød -Æ7X -<äƒ_¬ÈT{ÔÄâCø½[õ;7{ˆ“’¥MdôĬ«-B:쎾¼â³jX3}2[ˆ{PIP5¨ëÈÅ;Áóú`hA_F -_±µÁEaÞfÐ'‘G ÞC.MíÉ êe - MíeH·®øÞ-W¬ó>À -`>’JV-LÎD˜h¿’‹ÐvÔïâ’¨®¥i Æ¸3´@%¡¯dV¶ ÿÞÞ³“µ^»Å<í=ó«^з5¶oë’¥)öóýr³*U!Áþ˜dŸKwÙÿj"åòÚ>ÜÓz‚Œ ¡ŽÈî=5$ í½aïÛñØ÷#„¾~4DÐAj½t’ õrÿ~‚—'<€F%é,¿¶‚6ôÅÁ(Á I=³/’\Èc¶hJ",6ÞÉwâ¬U”§pmá‘TãXÛ!˜œ—Gx$ÖÁ -&ñìÙqøÐŽŽ/ˆþ ˆ@T[‘k²$‹éDp„ Sy9õ¨¸×Ü?O±~pùîa鸞4†‹pëÐý¨É?ìÔVœ¡ßxðü2j¦8ïd×GWd!6ôÐpëû«ëdîjÏ5y–Û…a<ŽõƩ狪k€‹öàûü¹Vó…´óºŠŽÐLÂùhÐ%yL['–¨J>37‘YÊ•…QNå-)Í¢I üüÅý\]›¥•¾¯!š·Äy/¤2Õi1ÎöãýpO›äìyWÀ -džA çðñ6îr;_Mµpt -ÈŠ‡“¯$&R9“:ÍXê2âÅpP@“¢Lß.Ûóƒ†QU§4ò¬?ŠäÃ!<äYä¤ìj¸-5µúLî¹åËmØöY^ÍỘüiv½©R©…ñı§†Ö÷5klHv:DúF;ñs–H9ßoÎådÖ4 &ûä% /[;2>'f5ªÖ~=…<:z?l4.ì1{yI˜+Ö}y”Ô Æå S£ Imd•Úʺ¡gVÌÑSÜ8Ðæ¿^ZO¯&LÚ͸4Ñ}cÎr??ÙfjÖ›= ÂjÛ0ƒ>0êpÞÓiýµùeƒF„ЂHʼmK¶‡_±p½5ÅòûN«¢Gì6î7eáµNÚ–Ÿþ´“ÎýÞ7¹-¾iìËaÊšˆ:Š§Å›Dä¢m@+;®¸q;;÷EÇÅÒºj$oÑš‡Z²„ø1uI;ÆßG¾m—S“¢àÈÇnÈÛ±IÇæ=ÃL¯9ß -:HejÑú3+ÔÉÊÈÞ3ùA³œ+étœÂ dêÅb{ZðÓÖU‹Ð&ßOÈ8©:ÓCoÖ2§ÅùVC2bÊTnM©ÔܲKBzÄ ®ŸG„€JƒGUî¼4T?¢ËR@‰Ä,xO¿pcj•£DÕHÆ„û<Ù‹+ؘÅL–~ìôÎAór¢ã-бŠó_j U}ð½Þ„÷ ÕÔRëÃĦ¼ˆµäÃã.­ 7÷©Fßâµ7à Ӟ<ƒÕìïõ9åí½Ø9k¦›ìâöoºá­_Z¬ ðw¯õÁfX?C"µkBxe|õn 8ÑõL8"ÞŽª¡Éñ]ˆÚ̘ˆp-–tË(nÞ+Ss_”Þ‘()‡z5ÒB4Æ笚ɕrDŠ ›.ÄH˜£|ÈWè3ì,ïÂäø/aés“Kêo—>Ço¢{=œäÒËpmQð¤å^«kX&¹„PR$fîI®¥óƒíbÉ(Y>fW¬ƒçÑr³@ÄÅ—ƒñKúãîÖb['GÒ±U}ÄDq"oŸÔÑ€_ 8ª­5©§ì(§:­m†·› òš„½sî1ùŒ T6-Kõû”@ÎB'žHC/¨]+”<†ó¨l‘±d$àÁÐ<‘¶Üj¦–KáP›ò€¶'áoñ˜ÀÕ ‹¾åÂtl†°ŽŒz²?¾nÎíÙx¢°ÑA‡÷`’PÉk'3°cèO^Aá}“§Ïï…5 )à¤âÂâÏ4 E*æZîÔàÇG¾Ó «DgúãÒ*VÞUˆ½“),ov£ÑËÉ#Ú$V¿u ìžTÖï6·(o¨lŽr•±1˜’Ø8=lЙ.¯Ãuvƒ¢k<^¥7ý§øû‡}½cÒQª©ÕÜ"K|˜çvjp’àÔ啸}§Äû0Ü•ð¡‹¾Q+mýO‹¢-Ä{· Ö=ô’”>›<ô-¹ç”_„F3#Ó.°Òâ&Èôø‰‡‚ocýAß=õ,+ªòÑÎPøÞ - E?›Qžü7<˜g5[‰ÅŒý¿?×4âdõX"ŽuCNÒ–ðÄO·jÿ3¶ Á-9T)å -ȶÍGHlU¶¹)á«ä˜)Fú©óBiE;ëttNŒ€M/D^:¢Ôõ M^}‚ò>;.EØE“š&¸§Àa\|0G7€aÛn¥ïsLÏÆžB@û d> &­ï‘K1 Rõ’°U{Ýr¦ÍNã‘Tg7%ÌÊu_ÉñúÝŸ -0PNò±ôKdI/Ø -áxÉ/ÝÀpÈfù¬ÞÀig»¿žÀJÉd^ø]’,Ó¢·äÒ|¹¨Ëâº7dM#õ˜ƒšøT8 ë;Ù+ÓW~˜”tÔ^Ïw3 Í']K¤ËGC…e¨”þ’QØFL¤éÑá(ÖÉë±öÞ}á(-ñ¸ì†1Ãcyäo}°®OÏ”³V}†¼ñ*PØ'†‹$ª¿Ý -GsÞP -**’k6Û±ˆªç¶SYÁí¦hpC"Ϭ¹w7HƒižT5"©š˜òm‚ÞþH#tµ+…4΋šWünó9`‘RZBl³÷‹1iâËæ©áæàyób«£Bf)Y•r:iÀhW‚äP) -ƒ&tÀ7v˜\ ³Øwî„žÃù·· ÕûÕåt³XǬ¢É¡¦CYòa,ͨp)‰ DæõmnìÒ—7òè@Àú[ž\ž€^ÏSøe—À”žùî!’ªœ—ÔûßòÚ34öW@«Rqu~^’ÚÉÕ¶pò».Žgý°¯ƒ&¢´ù5̦=N·†K»¼Á‰TÂ4{È”+ÅeÊš»D›!K^hþÁ~LO$ÀH×qÿe¸¥86ißÓ÷Qƒ™gúƬÅ{×zdÖ›ƒT÷ÎR $,ÓÏÕÙ¦?·j?…f¾8ƒ\¼º 32þr­óeg(âãCIõÄKâ¼”¸ÚÇÐ@þ§èû>U‘Ãk~¸€ 'û|%y“úy2m¹,ÿX¹Šk¦¿§`Ðë©#*ø^”Ñ v)¹i(AßE OrñN5W5ã›”Û‚Æ%@_º¶]µg7?aW—-Tˆã zg -4¬DéOH®®ÿâƸÛ”‘“Úq‡+:ó^4ì5ˆ>À„ÇÕÎÃBC‰Ýo³‡.‡~š¸âà weå,Õ#@V©|†¢ÕØW¾ðˆ®ù Dsý(>ÕBtľZ¬“çO (¹ƒÕ˜PøÑç0Z²×IáÍü‚%¥ª¾b?òB/Œˆ¼3!Ù¿J™„Ôå•N;ncpÏ;#nøÇê-Ñ-K93á—Ýññ*¾é_»Ù“8årÓBèQ #A·&S“Ò_«aõÇÖ¤Ù½o©ÆH”Ü7રCä̻璊&á³.bLý¿jàÖ ºŽô øêüöO!Å#7ÛØÙÀ*žùÕî/ÿ ƒ,¾«9Á\‚-# †·¥™xÏ¥ å—'¦­¥ùO'½¤§5\J¸Ÿ¡N(ÈßÄ0 Єï;Ò¿«[·|Æ/+ŽCy$6³·¦¦Àj„¯¸ìÃÞnñ(gg0«LÆÜ®Åc*|8±²ª#Ï|{‘<„e½Œ\­cTq׆ë‘0ËíeÌ -WF¹ -ßÒÒ7Nyw§l«íʆº“ÁÉÓ,hôlgµ4ª§å £ŠæWW‘úµéª¸‡=BO4¾}÷` ÂXä– †zbxØ‘*ZÚD -®ðD…ÌdÖ³wï¦ÒêfxÂzÞU€/Ž½¯Ñm•ª ) ÈŠ˜<_©Ô¿Q~Ó—™"Â:&ôÌi–¸Ø ëoCízµ˜ëN{¨>¬÷À”ÊÞ[¥žéÍzÑZ²`0¿ZæÖ Mþ¼êÄY “Cußf¨W F‘Ð’¢‰q„È´)šd×ù”áƒc+`Ÿ¶ÕÀÐíZ%3£Vª¾ªƒ6Mn~4¦3²|ÖÂ<âí¦ØhŽxÃ'¿;šou2ÿ†‘ì»ñëåçjð6õȹÒÞiAù9‹´äS&n n¶Í­ÖŠµ¤tÐQ ò3aV2Du%:Ìêøƒ—+È”}Òƒuf}ÜõA3©× eFÍR; O“/õùONVsî*O–ʇÜÃ…hû±ñ1…nâ¤U]“Þ -0@BAóˆ^rý{x–éÀÆÙæb׬íÛÉC„ðõ+H߈LÏCT#uÑ®êÓ©ê8øo¨5Ððµlâë 9veŸY&4±‚!—o9œ#-9ÉÔôÐóf>ÚØŒàO|¯¤™!FA|Ilq8¶‹Ÿ0æëÛ§fÛgOkw6¤Š¹[Þi'Úõå’*§Œ§ÓrÊílkóB‰#5£zl¿xpûEac•”LîÕZ¸¢-¯Î¡VÈî²”ºE¨LCZ(>²0éaèýªËZ¡ÎuÏ{p¦±Þ¯#³EÞMŒmßÅã¨i”nû…л¸G" IIêÜ€5m¤´× -ô”ÌNgH´°b p?×l³o‚žb^‘úÓÚ-Kͯ™ŠÑnM¥à¤XÚ‹/Æë6ï,Ò´îP|ý‚B#æ‚WaœYÜŽ!„H4ÓÀÜÛujÕlŒÇÇã\Å.ÐJ IïÔ4 †¸·ÞÔ¦™ >HóËz4UÇ–jhå¼ó‡j!q Ô¯ü^t€ç‡Z5÷ÃÖ‚;ùñþFBO "”RWö…~°uѵAЪKélú -aŒHq‘U|ÿ»õ|º¶A´óçPϯÇÐÌnƒ—PõäÉûg¯B7ïžíJ¹å6Äý¾Ý‰oÖi2×;–×\Læ¡àV¿OVäÊSñzz“’g° ¼3 ûàÌxV4‘?ŒUº=ÿi8GÞà*Ì<€)4ÁËŒ·V½S³´$?lA“ËÛ¸´Z …O!°‹`¨rf›Î¯róÃ`N{&êHfH «Yâ¨PE-RêÍHDÇ™ƒA–´i£UÇbÛTµÒ™¡ó!Ëža·ðÄfP*f}Kô€PáÄyç–Ž49|Î^>6¯!! vûÁZVî60œZcØÂI½–½˜ð"2÷Øšßøu(1¾CÈ]q Ü¯Æ .ãòÐä Ã3p}HŠLÂñ'è¡£üyp…@uknèDÞš}GwX¦Æ‚t„¥„üôMZææ£*ºQîyªê­´Jÿ›õ`Í—ýQ´x"¨B*Yv%4*·Š½VÍ|\ïžW5¦P™~ ±i©\4}ëd'ä3†èþ †”-Ôsl™ÃÞDúDwiF¶ºÕ jg6¿|þÓ"|a.­“ÞÞºOìÉTÚûËR߯mDØgë·6AWØulhÌcDEÜQ‰´n‰]64ê¾íßf¸LŸãNrr#ëÞR€Šz{ðª¢Ù– Ek¸Žæ»E©9‰´'eôd¨ƒ\Ô~yFz—äi÷ý­Ò®ðý8EèÄ.Ïê]ÒdzÔ- Ö1„Yaäîn -`Ï$•Î»ÛETfq~²rO°áe$Ç&¨ÛÖÍþÊx|?%}ö7I4U}q´ÉF„6 ’®òèÂ"¡þDˆ|UuàË=>¶ŠJ)¾ã-¡¡G‚“£\¿+Ù$Ã'ÁC60m–uõ&ÌöDs -o i‘Ó7ê®Ä¶U¯2e\…l+³x‘hË7Ë©0j%Èþj¦Š¶lGéåÉUÆ"Çl5þ> ¤Ë'Cþ­Ï '»p÷Œt”úˆR+ÈŒõü­å‹#—ø >F°ÕÅÿì°¡…Wã¦U{Àd[p!úg߶-\ DÔ¹¿?wG%%øí¿Ø!Î|svr–‹oAwÕ%¨ìLÇÁ¸®¹s%ÝþƒmZj«SšÿUàuž^P|‰j#æņ+fÕœ‰Ûq,/¹Í;󡪭%l³¹C^œ.ÕÒÙ$ž·U DqŠìè‘’ÜÙu—·ÏÖ„›Bùzç(Y4¨\WGy®àT`“ªÊ02›Èf£K—\„ûåH±ù¦M©´TïœQ`™'÷g¹À(ybpg ùŒ­‹§pÞ³Ò'6ÅØRgGá~¡‡NBdŽDÓïC;QAP¢íÿ¦F1>}}÷KT]«Ó²;ÎC1~= eŽÑ¦8Oܳ -ÜÒfËð*AÄØ‚¹?â°¼ oä¼Rn ÿáXº¯@2œÛV4åËäcgOÛ4–>½Ö®}C}vªZÎ+ÍtjUn°ò‰mÉôgŒ|©`¾A¨TX<×;Áx)ý;lAê¨ä%¢8£3glGcA¦ú9v6QX쫃Y é5úµ"« ¦y»0Ì 9~:—Ý›iD EÔñ§–>Q‘|LלR•IêÔt[]âñ´E¬1¼J2Om’j=4Ÿ†U¾ƒ™aX–‚~®#ƒíÛ9}0=Yb»3†ŽŠ‚p_;ÿN[™Žl¢½GuHRçâ‚>|G‹”fÕó·Pïô5JÒë*MRg±òdz’>J Y¨;¹ç4ø¬Á‹ ï:iBðâHEtâƒPr™”,ªñ=3P«Qˆê¡0³­lÅDV¾Î¼£M7+-ŽR×ÇNlX2ê«Iz‘ÿ -}$^ÿmâ}¹<5o/¬Ú÷ÃÀþeIÉâ<ŽæÙ,~kŸÝƒÉaÓT¬ ÷>hóÕ„ $H*Ë t3ë8nJ_Ec^XSóRrÿêj¦2ícŸj>üÀêí™=8§xÝvÀKbëüD„?|7Ƥn-vk4g³(HôÃNõÝ™"C€UsÖ28Ô‰ˆÞjyÝ;bÔnj>kÍò²R8•|¿ºwÇd}é*¡å4ºŽlã&ËmFñ<ñ -2èÂ9úPJ2ÝÿÙ—A’ýÓŸˆÃC£ó´5Dº˜¼(: 2¹¶ÙžÂÙî0ž\•‰ ¥±ÂY§EWL·â{lÂ:-eypNƒ(LjKf‡âƒ¦ãĹ ¹,Ó›M&­ÆýN0Á9=<„˽Ž3W%Ö:³Æ¸o}Q¾ÖÈo–÷öÁŒÛ„„xß–=CįÒ5¯aæqñ‰ÂSp‘%`5^……'Tµ©e¿Ùï—’µ¹Æ(¦ÎûÛ«ê‘è¯éž,!l±  -Õw$îFÓÊ°«|\ö/Ù¼>ö 2#=ôÈéÍ‚ôë·§‹r<Ä­}éöõ˜@ž>7Ϲ/™燛 ܳR}Ù·+qÉØ_òö³ižúj;ÓŠàNõÍÕÖýÁš$ÇwlƒÞ,2{HÙê··åFW›è^ ¾¤ &Æ#IÅR²îqˆ2~˜æ R È\æR×}‚Ó£éZ}·R2«,ø£³}õk¡ËBT{–ubkÜÆyIÿé×ÚCGß | Ûðôžª6>z¥ê¦~¥•±!ŸaIBç#OAôF¢)§óÛÏ~‚‚ܠߧ­LoÙ?b ²Ìq°© ÏÇˌܼ;É<¦¢2#S7c„,fKœ%WºfåeO­³N?K¬EÀ]_6 ’[9Iè.m¨èög 2G& k‹øIFËLi-–Ë^ÞÀCλ`wxE¿,%`‰nˆæ4_ë«F«¡ˆsÑÚc®{O6Þq’á.Nšà}2|Ù¼•¶äÂ?xÒ~- ±‚7L›PÍ µDŠ­ÎØ!˜Õ¼[¬›Žòé™ Ômäùú¸=ÔŸAl¤Uu’¹$È×\…5³}=?":Ô0'YÉZÏkÄÝc°¹±bÊõ©$¤€Æ)Ùöt›MøJ5‚$r? ¯ˆ^§[vx…Ô‘âY…*_½ôR My58øán¾¥5Ì :*'ËŽí/øô÷öú®iÒ­Á¦ƒÃß°¥…åSs<’¨uR>– -¯oŒ&-¦œæòûxßjmßзˆÙŒmxUâDô}ç?®0ÚÞØ5O‚·´fïA_„ãú¾¥]"uÓ5ƒg·T‹6*Îöä~œ#¯Ž¿„’ˆ<µ¾Ã{[W/ôcŸM€ÿ{*EºÀ©ô¸}’ò /›gÀcƒ8§ì4I4àÆ&w<þˆá`íêH¯²?œ-6TtZ‘ŒiZ~¤øMZí}öåÚ'º¾£ËEWÒ=e츆æw\Ù ƒ)×3¦h!]ð-‡…zî6Ǿ`:ÎÂjâ]%š`- ñ‰.g[ŽOÔО¨„¡—‘4é ›ð÷§¿X¸\’ZéΆ5 , ²&r7 ‡nY¬k÷O¨ùæ‚CÊ:Ê6[EŠî7«¸t²1äŽ;]ÕÚÖ¢ñ4^(;}4nEK¯dÓEŸpZöžaw«”Ém¸Ô£B#¹ ·±¥^LrÇÕD„¤ŠÂ{ -®ãòFÙdÑŒS¡ÞÀ\Q*œ Žœ'¡-².jn‘þ'‡ -ç:¹Ló‚?ÌVɦْ^Ž.‹BW¬Z= -î}S`¸…ˆwç:БI¿®Œ2ºc²¾,¢ñX)„õÐè mø Õ…ÆVxô¤³k0'g¡Îœ­OQUzµP!KL‹åÅ?ŠÁ‡%®éídúQ²{˜{ïãcvÒ!ÍòaÙçÆn?믖%@\Õu¦øó!P£­7Gþü!ªø¹ns®$›ô$´Ô×_R#g­PRike'¢µ­Å;+kô1eßä#Þ'ӛ℈,È#õèi3«6è\¦p¦L/ÄíðÕ Ëž¶h$Mæé{Sax˜žâ%ÌD(÷â£õ€ÑqçvyA͆[hÒ»ìH¡Ú„»“ÿµ{0Ib“ä~Rž1‰A¹]«#‡Ì[d·­šî+jûƒj8m{†æµ–(ðÔ8B<2Ê{Au«$5©PïÿÅÍË”è-POô¥ßì )°ÒòkR¯Ëî°*æTå¯ óÓdôîBÄßs´I,÷èñš¨<QÕ…–dÐéz÷/ó•3–yþ…ºË$¨îP9×£QŠ!¬šÀQ¹nÂזÑÅÙî6K˜ÿJÄS!9¦zÿË´ÃJy4ž¡¤%QÕöwndý{T)ÅøY‹FbœTÈÝ—Œs-%Dëªd¬§»8¢[Ⳝ·^!Ê-·TW R‹6|dDayˆ˜™[2÷¹ü™šf ²¸‹ÝøV;ÜÒÕ`ÁˆhXÕ쳇†}05Í–:WbŸ#óä{÷ÓoóBíIéV),ÔleYhé9s–EšÚ -DæìÐÓQL"3Íòµ¯Gj'!õg}ø?„ú‡Ê]GËb£µý^üeÚD+÷K¦E~XïÕßh?>ÕpcÉÀ­bhűP.£È ¸Év •Ø›œˆ·ñnY«Deƒ<x‡>‹‡j—b¿ vHŸmkr¯ pû=!ª:±¿/9# 4çñþà\ªvRÏ•T}2³¼½Àîí-O¡Ã!$èo™+Ýg ˜ªh¶>$˜ãøÅ“Ûʘ!²¯Äc =Fy÷M‡JG\P¡jø…ù¼_âz/Ñ8Áþá0ÙXàÀMŒÈÈøåa8Qp…Íùº]yõi”þòa»}»ÐjÃΓ…=™±a2%\Š¼üˆm“(®¯–R€ÙÉeʧã&ŽŸpûå~1.A͆‰V9'¨1+òÎ’!$"G›L8Oìà÷“‚ê¶O—Ðô±¼{9ú¤ß¸è(î;¡gÄõ7_ªôtsEnY±lYRTýMëx©€ÊÊ -Žã¡Œ(îþ•PÁÁ¥0âí8 ]ò;È$Ù&3ÇÎø}Ó0[¡ýdŠL³súîৠºy”3Ýó•¡À>æô´Ëüþo’«ÌLUSõäaú9*·ø¬ó[S - æñ2é¬ý‚Ú¶ÑÕ@kÓ áÓô7q­„ÎÓý4žü}2"ÃÕ¯q£Í/— -à'½¡Žu8» ÜewÂœÅu_.ô¥%7"º2ÿÄ ®öî ê 1«üåYÙˆ2a“ÉQ}Å[Öïû?©‚i½ÁÞ®Mîrxº3œÒò3´ÂM*ÝœHí§ÃAzJÇÏFö¿s‡1ØÛÒ¥x÷M¾q¥w‹ñé£êtbù•˜`M†I -M~·Šù¨iÅüôEi»%~ðˆÜæŸG+Ü7@&ëûpoÜ%zã×úV7Ús£é µ$†™!î,ÑB)ÂÉ28(O÷¾po‘Ëþ1ƒTŸ172(0IéàŒmöˆ"JeºØ·Øc˜¾Ž [>Û:q’·ùÌóp úÂ2@)=©]lm‘º&\àÂüÍүĔV[ð0”ÑóÓeBª'€u_ø×ÞÚÍ÷ /Ó…¨=­ -`ì¾ÅGjÿoV¿"¤kIîhhóΧۙ­ Îj;k7éüD¾ôE2mB?êµvöè~3ãR0~Ë…E™ÂÌûz(jÉÐ ¢¹T_EúˆÒ¬DØð Ú©<~”g†ä›0isÞx®9BÍ..>¯!£’bµB‰b™ÐV2eƒA­ˆã@ÛIr°b±±KR_Bšö·0_½€ñ½_ÕÊkÄ2Љ¼åÖjˆÙDp\Â^‹B£?‚NÞ²¶…OR¾¬ ¨c«îGÈq$ɼ ¥ÝYeævmMNIPËOÜõ$†iô¯˜_+w¢S<"Ë;I§tUùn/ M¸'y[iÚ¨m3)+™óE˃2_¦ß©D>§’]Íâ¾YŘa:”ÏѪHQ»„Jfû½2žgûŸ:TŽûÞàh"d{v1Ð]™ÿüÝ7€•ß°E2BýZžÊ6A©kY®ü,?ò8?’D½¹è ?üˆ®^©¶×620—'³ÀõŠË wwÂ}¤é²óýÇD‘bͯ‹Ô|]íí­~ViÏâøÃ"†©Q©óxÖÙféÙ˜Òõ¥e„ ^_2 ZZÐ@k® M\Öზ;bVz_¶&‹¡[]éL ;ÁTÛPÖ`‚ÎØwvÒ2p"ËDÄâylyÔBï’v#™¢®tÂ8Ôéö©jôã¸ÁôßÆŒIŒÈ«‘QQh΋‰@#˜±î ¾B¦»ÖD¥€Ç­‡ïI#UúÙ[©ï0Ï=é PPúHŸ¬' -«KV´ÝëÙ¶å©N†žôG¿n <<7†YR -2àVé ‰ùº¹_x" qôÌëÌ‘'âÚﱿáÂv¹*¯9G¬W -S¸]Þ1ï‘P:†db8Ëý›îê"5 àšú³©7X¬ã‰É²ßnš§Ý[Ù&èÒö•½Ž+Æèt„ðGöì—Àª¿ñ©œ?M.¼pED1¤5µ„¨rgŒí¸ðµÝhÔ7WˆÊ»X1RŠ­æܯÐS¯"%xx®Ju¼ðPÈVþNaVcû•tÓДàAŸhÒ kPîNJZ$8Kpʼnʧ9Ý•¢õ:Â.&ø“k›n±ž@!Bú8ú4ú=\ÒøÔÿ'®ŒÔåR¢;i8š\O7ÙSü‹(=`gbgeíW»ˆÑóBWÙš™7c;Ôÿ.¶P -endstream -endobj -4129 0 obj << -/Type /FontDescriptor -/FontName /OEXEGJ+NimbusRomNo9L-Medi -/Flags 4 -/FontBBox [-168 -341 1000 960] -/Ascent 690 -/CapHeight 690 -/Descent -209 -/ItalicAngle 0 -/StemV 140 -/XHeight 461 -/CharSet (/A/B/C/D/E/F/G/H/I/L/M/N/O/P/Q/R/S/T/U/V/W/X/a/b/c/colon/comma/d/e/eight/endash/f/fi/five/four/g/h/hyphen/i/k/l/m/n/nine/o/one/p/parenleft/parenright/period/q/r/s/seven/six/t/three/two/u/v/w/x/y/z/zero) -/FontFile 4128 0 R ->> endobj -4130 0 obj << -/Length1 1630 -/Length2 20369 -/Length3 0 -/Length 21212 -/Filter /FlateDecode ->> -stream -xÚ¬¸ctem·&œ¤bT’Š½c۶특“ìTl[Û¶m'Û¨ØVÅþêyß>}zœ¯ûO÷ù±ÆX÷Ä5qÍ{Ž½9±’*½°©­1PÂÖƉž™‰ ²6vvT±µV°å–£Wš;þÊÙáÉÉE€FN [1#' @h -šXXÌÜÜÜðäQ[;w¹…€J]E“š––î?%ÿ˜ŒÝÿCó×Ódn øûâ´²µ³Ú8ý…ø¿vTN@€È -UTÒ’VPI*¨$6@#+€’³±È 2Ú8©f¶«&¶6¦ Jsdø‹%ì08ÚM@Ý€n&@»Tt; ƒ5ÈÑñï;ä0w0²qúÛ'[ÈÆÄÊÙôŸþÊÍlÿ•ƒí_ 뿺¿`J¶ŽNŽ& ;'ÀߨJbÿÎÓÉÂÈéŸØŽ ¿j€­Ù_KS[çJú—î/Ì_­“ÈÆàtsú'–1` -r´³2rÿû/˜è_i8;‚lÌÿ3:€ÐÜÈÁÔ -èèøæ/ö?ÝùÏ:ÿKõFvvVîÿò¶ý—ÕÿÌää´2c€gfùÓÄéols <ã?³"mcf `fú·ÜÔÙî?t.@‡5ˆêŸ™¡þ›„‘©­•;ÀhϨ`ëô7$€êÿŽe†ÿ>’ÿ(þo!ø¿…Þÿ7rÿ+GÿË%þ½ÏÿZÂÙÊJÁÈúïü{Çþ.#Àß=ü³h¬Œþ>FÖ +÷ÿ“×µÖþ;Ýÿ˜´“Ñ߶Û˜ÿ¥†‰éßB£È hªr2±˜YýíÙ¿äê6¦@+ ð/·ÿj+€ž™‰é¿èÔ,@&?lþ!ýß* é­à/]ÿÊŸQü»¶¤”0íÿfÁþËPéï 8©¹ÛýÍíT#okú?ÿÀˆˆØº<é™9¸ô,\Ìïßß„¸Yؼÿ7!ÿÄüŸgy#'@çoÝLÌÿªþ<ÿyÒû/0â6&¶¦ÿŒŽª“‘éßiûŸ‚Ô&ÎIþ×ø[õœÿ5÷@ Ð~uÉÖ„7È25#Í©+ghBL§¿—ùËP°]IƒZa¾_µmojØ6w…á[M0CãÏG›ûâ©Ýû¾ ÍÁH/¦eO2ð2ß›”º/uƒ¢ƒ“ö €Q¿)íL3ÒójAn R›ƒIã`gBYE¿ø š`ªƒÕöê‘ÚÔ%ßìÁî«IJ} F'J#Ø·Ú‚Ó3Š„ãÇÊÑá¡Áž¨¾}<Úì8r^#,Ÿ¤SâD'wC‡»“¨NÇÊÅÌÍjÔuW¼×%g"²ûèm4æ´ VBóOað=&¡%ãY×ËЄh–Âx:¢1Ñi5ýºÎ%鳎ßçõ<©?2V¸£A‡K’©¤…웨TBR Ú!q¦RL\(iÊZüÓœlu¸‚äâ_#„jýFËw„Š¢ô;œ¼ aù»ÁªÔRÕe)Ññƒ¾ÐG1º†ßÙó1 iY†ÐœE>À¼¨”±E îòáB$o4bŠ”OZVÎ ­BÁ¦6Ew¡Ö¸Ê^¾à„¢JmX7ñDJçßzÝ&é·ôètu§Š³ Í Nõ7ÊïÀº7 iIu_€•Ê D+äú°%iŸ½]0®ll¤Ó‰8ÖÝ®ÀËlIÎè çØMä%È<\±aîR¸ªç%!…¸…ÿø:=XûMfüހќÉêD¦ú;\=€·C;[Ǭþ)/\Ü"ÆxeÇWîmrFôBÃ"±Âu=·Í.‚‚ÜnÎËÅ%c167§ -ƒt¯‹pñ=ȹ·É3 Kk¶H×®!Ín}Ú:s-9Ö¢ÐøLjI5f2$8šÚ¤@—r“ ^™[Ž‹›Ú͹Låq[ ¹f$¯¬mO•¤)iÅ÷A_©ú"¹,±*vkkÿRƒ`·:G ”·@;tæû|%Va0%@3÷Ýw1ä[á‹Bͧ*4¨pV¸© -¶APö®²4„i®ÂoÈÖš‹‡xEúܪg±ýK6VG7&ÛN¤°ûŸ˜5s>KZ8såB#¦Ï…¾5iàWSñˆ ƒ×úuAKi¿æ“å¢^£Ë+Å°9«?Õ [Ë$¾7 ¾žW-Ž­¿ö_ŸÊS;EÁs ¯ÚŽqAM¢''eùŠ×jH²O‘&ûnšbÔ³ÎpAª”±Ÿ{w¶U·2O_ÎR)â¿Éϧ~¬×D‡ÌŒVëÿ$Jü(¦5Í…Ž‚m•àñt¿ãxÀ‰üÐ3Ð…³_7ª{ À»Ù¦‹ë“>ë3é5›ìáóÿtÈWmntí—1f`sÜÁúrLOHÜN’ŽŽRñBl/Jƒ[r¨]©²`ð4<ȦR d°j^/ '6®-Ža×&÷ãú¥JïžåÀÕ® $ëm-»ctáØZ´h´Ó)ýuÇw’ß]† ø ΟÎXD>£7ö7-ùxŒJkP®ÓÀ€ -Æ ô€0MË5…|7Œ¡±ËÓQ’VòŸÖj¡µ¶G4“ŸùO_»Fº,l-Ã`~í9T¬„¼Eך!$ìz£^B -æÔU­€)¹ò ¦/¶lß Ê>½F{c.^ö°¼¿R%g@o4@s³3qJ±o‚Ô¥¹n’AGÚŒöç(á ÷²i߃ßuÍ>‡UTÀ³m"æôÆ %ôú¯:BŸ,U -7Ù-/¿¶c˜k±À7Þî•*ÈnÛñÒD›þv:2mvûvšÎU %ôvÓÚPösŽòçmWð–hg«ÚB ‹üÙ ê´-©.óË,nMAX4Ê=jòÕ²ö#T}Ù¨E -*±îh šƒ@Årt4Hûøþ0>Í¥SÞø`4oTDÝ–àÈGTÎ7 wè6ÉÜ“=¿Û¾Äw8¾óìy.í‹@è†òo9®^ÏÁÔJÙÇÆòñb`åVœ --ß9iqC÷Ç¿55!12“4QºÊ8U0Ï;cþ &¾0ã~Æš¶«AÍyVç~·cú>NÕË“çeôÛÆ‚#Ìã¦ôeÂås w5UÊ_‘p×"Í`ÂÑ1Ë£Á< 6Ù,¤ÁBhÞŠœãg>âô»ÃN[™äÇx%’ í6ê/+×ݹ° Y¤ù³L)'ŸE=ˆMÊå¿{ª}"ª°ÉÒ“B­_ú®ÎMh‰(~{Ñ Rs ­ÅŸ©µä7‘SÎr6)ñŸÊŠtelá½A”2E`øâO2|àß92;Œ#WB"èðùnäjN$v3 XûN†îØWäÍŠNâf¯Ï:%àÜᤱzh;BLºóóíg®lRY¿5`¡ø­l1­ŒQyÐB"Ú? -´A‰Ôžý)ƒ•`s-žžÌ‰ %fp~y¸IÖa) b³…¹âø¦Ê—oÙ7/‰¬[ÈxÚžÐK›xW“Õ ôÿ–$¹!.x‰–gn,²Ë| Ýˆš"g,/ÿÕKMm×JtÊ›…*+à©’Õ^4™XŽ#u®8!òzšþ6|_y„Ü>^ô×/:9ç&¿RâbæÙúÌ/ÆÎ1ÿZN5=ƒ4s‡CbÆÇðAtBkö²žXbO¶7NÙƒ²5€õ^‡Mï-¢úq‡ª÷,a7Wš}·Ó¬çÚ´í‹s{Žïøóv”%hွó²_ä-\Ò€«%ô´ár‰n;=U+ÞÌJ¼ŒEH°°ˆA#N{ñ³¬0_¨çº~’íÜ–üìbÿ(Óc1Ú5ýõ‚¿I¬,´=kÍ3߉Èl)ÐV]ó.ˆ†ßa¨^ž3ÊÇç*f`ØXà9¼BÈÂí§E ËEÈjÏÎB'3œâ{kÒ þçìÈ |ö¾Ð–?VˆNÙ‹²\½z[!¿sBŒ”DÐë|p0Э$oS5f b_-ܸò cBMŸ†ä"‘ûY=x9)–9¢‰:¤À‹š#jì«ÂL˽Q“+*±ÃBú>Ielª®d}ÉMP 3Äûy9¢Ù[°¨~­·ÉÕ5Áñu@7Z9äá›iðßUmÐOãp3—j³_ä›fD`:öuÛä­óÛñ z+âß­Á•†ÙùÎ[—#ùH=­5bâäþt,Å´¦…t‰vfóðÅLD‹§ñi9ÝN]w¤ïÿ)]6Û=©Uvç"HnVR„VÜG¤Ñl…À:ñÓrË£ÝÈ«éø>üô¦IÊY74ä€Lo‰Ò8æNÅM{Þ#= ›¦x¹²V¿x…¦ [׸•V>§¸²tļ‘7Î\Ž/{Mâ›ôÆ"oñÙ…¤8’%‘^‘¾ sdÁÚ¥ýÒIíþŸPúººÔ´ð½iwθPÀþõ,hp»·é[¨3nšÛnóɹª–»nmh C}DfZó|š«²qaPB†Ç -J3<âð3ãØqâý%ÑÀIŸVœçwÛ•o¾Ü9™× IA|éõà}%ÐÆX[0G4 ìIeR“µ¾½:ÑádªO¤žÇß÷8»„ƒ5¶~¬å.1·–?YèWžv tfŸ*vG¬¼1iùÁOð|Öt ûP±Ó¶_(9µ&oŒ—0ð­zÏŒüÍ(feã¼·pH¿KtÜ=_‹M !/­32oê1o³uþÜ×'}˜ü=ÎÃ÷õÔÆ:zÞa‹ÖnlåyÃ%`þ »+úI -ô¶nÌM»T™ïH­.ô“,’ÁkœsÖ¬œ´n]c¨AÄñŽ(LŠþºtÖ!ÅÔÕAUk´X‚Ô-†=uÝÞ£'áäÀØ£Dý á­qÑË‘>Oa`Cäö%B‰—~®CE«¡„'”JÓ¼ÔHs€‚YHp›óÊìZFD]8æ ›hü $QÈAZ•K·Üµ÷'R{W1"W籉³;ï2^CÞÁGò¦Á;÷_ºJ|¹¨Åï;å0õ }}ÿÒž?"L¯Mþ{"…¾?ü1Œ©µ|¸ó"s¢… Ý *õ¦B_ߤœ«Ê7Ǻ —E æ1DtÓ÷ -üÌÆÝJa†j©7QÌBsD¥¦ö/bW"£ ÷ºYâÅ)­_YcSΤ uýM4•+£\ÚØ·Õ£Š2¡´§à9ÖM ý‰¾J\Mãn©û—°\°NNGñ{‚ÁÇ[œµ€«Ä5Ó8QŸx$ƒÆ9­ -ò×#:󌫀lؾZh­NXMÆKÃ7ð¯xCµÒò›<ÑÃgraqydÊnÞ£•{Úô|¼„©9É ç „"‡ÂÏŠ·ŠéÞ2¯}%žŠRžûS¡m§´NŸz»+F¯AÙ¦Ãå™rÎKI–ºéùgÖ?§ýÊÌjôdÜÀuäLöÂ’6}ä"w£™ØѬ0L7Úfw÷…_K§˜Û9》l—úMVàKAä6sÔò_óÆ؇lVÍ&É Ó¿DµJö–çˆMrâ]fx]Q™ºYÆ— ciéðiur4Oœ7ÏŒ9Ò ºß—tŸs¦ÈZ ?Ÿ¨ì pjöaÞ9É Úf¬³|2¦8.MÕTšÇ÷¹ÙœO”ã´HÀ¦9¢wîÀa[.è>9MÀ°Á7|ëØ~pEÉ€;‹‰Øž´Û‰â«iƒ_ÅûÌïL<ÛëŠÝ^ŸI`5X)üž ¸áíeat´Íoó¸õ“$ ‘"L`p9ün„`¡u¹% -þ´.,ºzEÔ‚ê¹6.¯Em9ž‹xqçlÜ­ê"Â&.±¿-XݯÒâ_èe€*œ,\]±Ñ µÚnc°öBíT;]C®‰!r’ÊãWŽþ™1|¼¯ÈÛË/E7wj¯ÿMÿ.¼Ýø“äX‚øû µâšYŒÉM3{¾e¾ñ‹·&òÊzù%RplW{ÙÇU¤òËkÙÅÉa»­dïY׺åðZyc’ó7÷¢þ ¹ßÚ“ kª˜mÞ¼¨ -ËSHx²Îä¼ÀûªNã¢èH’ŸîÐ;{äù‘¿dÐ -ų9HYQíÊbjÐñü÷³ Øïññ®$+`' Ž¬}Ø@ç³hj…ɸU;D‚ª»ÔY öæÞ9”™ZB -PˆÜ_|ùº–pà |S8—™IÀ4Xc»¡ÅóBóüžî¯Ó0‰áöGÁq~´Ñ¬»ô‚JB/ÍÁÜW'à…,:‹yÎØgAJ€r+ñJÓŸVàÚ¾_þÁ‘é– íé…ߌ*”„ï¶Jq ^©SÂDsÅ€3}ÊÙ)¢Ã² êÃ+is<µGA2 .Ó1>ãù2rñÄæ:gé:Ûœ/o Ô;WÈ55Ìw³NÕ™Ý Ü £²¶úCUNfQ…1: #aöËK\Å0Ep‹{rßõ¸‡¼ãbQŠdâÊ·aJ/ôu•Åû¦v·D¡¢<ž×¹nÀ&VGð3§ýæú!ÒaWh›tPY¾/ ^RÚ -_‚Ðs–®îEóÑS^( Zr¦SÓj1cÔOà ¼£ÄøËr>ú âAô«ÊYöغ}CiLõøÿø9ŒÕêë-hûðH-MÅY’Ç»0Ï Á"/–ºßÞg¾A:·ÔR˜¦Œ!ÊYÉä -Sê:ZeXõ óóÙ7Š0Ä_/W[ÖQZ;5tž¨öTé]\“04¤KaÚÃ&yÂnä)† ‰Os$(s^~cÃr'››ŸBZj³yý-}PÏ¡º -€ˆaߤĩÉ~F,IL¢òrÇ»r„™Ñ`<·Gå×l™Yñ½:«@Ë5U-éú„¯àÍùt«VRçNòÖQ¿1§tŸ„D‡°Ïpµ¦Ôºú¨kô±!#m>æÅ=ê4ï¢1ΚKîéE¬üИifóX掕`”õL»å° ±ºÇÉ“×BÂbèáDÛa}ãŒXã- ±Ô³­ì•3ÇWó㌃/1ùèÐœmKg‰”ÁQÎoÅ”¹¯¿‡-óº€4#ûºRðeëßgœ-RZzî¥6áùyzì¾±¿Â«ðšËNtÈÍÌ·¾àR†Ê•y˜‡DU¾cÍÅ›•ð”D.ôéqSIù*ÛîܯP™3•yÐ#öö÷ϳ“Ñ“þj ¿fïõÛü4L„׼᧘Ø6/ ÉL=u#YH5 ÓpÛ‹p°·_h #Ø:w%ÉU‰¸ÓÁPK‡…Ò±`ëµÂu™Ðí/uH˜DÎÁMR`±ˆé‚ØàILaç£ærynŸú¢±õ‹¿‰í ¹¦)"UQâ¬YÛ9.4¤Ï½6‘:K¾”s»\ƒc©šˆTN†ó6"<¦^Œ"´þîU ªòCp ªÏ”(ôë,Jóju ¨½çùqxæïÓ„ }L«cHäO{峊•_D·gRpÒ5«Í­©f‹\JO„#“;ßÕÚ=H$Äpsžgfåî†.äÇé;+*¹]$‘aÚq|dÊ¥}†=þ¨œÛqˆ÷É)M¾Ã4Ù¬Y•3¦°Xßš38~VùzAdÛI€ab¸’ýíÐál·7TŠ2AKMYXÔâ¸E€5ƒ‰“îo¡²øK¹ÌóÕ"¿£ÚˆÑqª÷#Øz…aÞ„­ó™b üÜP¤ÚvÛñ(–`÷• ,%l”Ö×ÓÓÅÌm‚ê^)âMÒ— ªÏo(ø· ØOabä,–¿dñ_/*ŽDãÍ‚?•h»7VéÙld†Vp`£”†N­°fr­!FCàNà#­+¬_X6“˜³S4PÝû{¯!ÛÅ=vÓ7$²p¶É=àˆX®¦aÜÀhÞ"1¦£z§­‡éh=aÚ&Rè µuä%Ú¢‘e7LJut¾CZ¤¢=Ö†¶”ÌÍë4ké¡’B9ŠXš@m CŽ¬ñyÏNî CY ’õc¨~ö~7¼ÈW70ƒÍNye9 –Þ0¼Ä«Ý(9PèfÞý¥3ó8œþDVÕKÓBŠ9öâ÷¢­Ò²®¶Rs[±æäÊåØåSèŲä ap‘€.ë½clMWTA¸©yPñsçcmÐS‡þ؉•V?NPBÍpâªcîR´_úR«…ÜU‰:.%Ý°}¼`ÉÛH^푲6ÒŽ¶ÏßpÍ>è¡è¢þ ë{ßÅù;þ…¥©5sV1}£E—ó¬Z8ÏœIÌÖhRWïù‘&Š£Ò»ÊšµàA;³=òEKî'a¹¬nkd‡9£ø :„‘;ìŒâÚÇàïÚÁ¤¹ôZxŠG¨AŠÕyµÎÚ±?šçòžßËm<|Gñnn 5E2H?6ŸA»âCHEOg ø玒})H'v3Z•â\bC>enc-j ‰še…™+Äà›G‡X9âÀûË3kLÚ·ÝÌ@øuËÐÒóÇΟ»Å–àÜÍ!zå‘ ã`¯•¤†”Ô~ßsÑ™éb2Z‡¯f§1‰~ñŽ°õ-Ôdk«Å]fÊÎ"Ý’–¯ßo’º&Ï*ìéáaŽýð1\ÞÇ -jÞ† †Wp~åC9«>+ÏÁpߛĤa¢ø·r|k8£ì_QE~4‘™¯jÑ´³&ÛnœÇÀ×W^üˆÉŒóÀ¬Tk°³‡ÙPQÓˆ˜O=”ÃÑíÑ¢Ðnsú'çÁüžyu…XQ–)_°½~°Ñvö@µr}¡Œ>ÖE;ü`” -ÌιCü­Œ›¬‰“¶\2ÐŒêÏ9þԺυ¥„#¢–àªi¬È‹RÍ;dʬ…/øÞïüæv?!è–5U4M ˆÉmýj(z2Tþ›MgñhËÐül†ˆs¨ÿB -Äù,†7bŽãÿý1µøö59­|V;Wd"¦·”Ù+Ýç:@Üùe¾_šUEˆ4}ýELçv-ª’^iË@ÜÖ²ðCÜ{m§6šòìøF:€cÀ³Çç´IP¶þ›¥Ím´Zü] œÅ•s®Àl„ÙH¸9j¢u òŒ‰y}.ááXT=yƒFóü®ƯŸg d¢´„fúEá¾ M²µ -ýyO@>š6‚mÝç?Röa%í/Êl ¢¶¡´OÏáÛ¿º59™q°Üú¡Ê†ÛÛò|Ú¦è| 10 ½¼;'°Rã ¢òþ°´_ÚÁFfS$';ß߶ Ç›¨hEcËí²/pÌ{3w^¤ZRbàiHÔª®1NÊCâÙT©¢X¡a ×ÖÐƬ2Ø9±Û8»EÐŒšM[> …#"ÌÇGS)(Qà7K7mò—ž¼§‡ïùa„Ü6¬êÏ¿¶˜ôO˜îþæ`®ðK?R?ÀZ[ä;ù¨¥W1ÒIø\ŽŒ±&k¨ÕRd8‹d\¤S7ó.ÿb‚*¬.Çjrï@> ëøH®`à75€öILÀ…ª-G0NgFá¾ÔŸ+_Us-R³ÍëO¡$¦ŠÀ -§©þ*àÏvë0x¬÷vààîãÀâ×˾Ðõü¥ƒþvÁY k=èÞ¦¯QÿrÉÄ£¡;É!id¾ÍoèÁ0ç?!rs&‡¹n‘eg(dW}VqÞo¼É¯b¤ë Æ3.†§ñï‘ n°šNåéSßöĤ'túâãÉ¢}Aä¬eȇAùQEƲ ?ƒÊo½ñE jUÍBXä@e%í*î >:°¿2ÍaŸ¾ÉE2+X?…_Wk€ä“ £xù^ξvú1BÍ_zð+dqWQI)ëœ\àØh-¤Ž>\‹–üÁ“=Ô<»# ÈÓŠ >yG0¬ (¯´ËXÚ”8Θ‰ïÆO-5qA­º‡î.®“!º`~A4ÔF*ú‘ª¨n“ðèÊÄQq‹ë¬°³ÃmT¹I-•ñíFzOŸQ‹€¼ -ü\ŽÙ?‹~¸A÷Ïêõ]|>5º`÷‘>þÏ©?º¹¦¼õ…–ú¬Ôos¥ö.L±NÈnDÀ3Ù2€ý¹ˆ(š{'¶X›,Š êts‘ž¿:jÛ?æYÝ LKß3õÚSÈz_=ÉÀ¼ èˆL+V\¼ Æô¤¦Yjü¢3}kõ· ¤>d`C[\ôöÊÙ ÓM†œ!n'â÷Ê^½—àá¸jñiëN¾$d “³£ö§ü™œh ÑŒrÐl€}¨¢_:sÒ1-ñÂs´ øêŽîþÝTD8[v¨w½hÛÙÎ6êØ4ì 8‘ÆLO 9M°Ž”¯†ëwBœåÐcAµJ³Ž_çuzó=±$[Nfàýxo%Iãi®™pI4M¸sGxÉÉfEäÄd³lËÛa ˜ös zw âìLß7ârÊ?„oføp,ô‚¡K²§ð -š."˜É Ìà:¼…— ‹B“”—ò¿V©-Ñ8ç†X;4ƒ‡¤Éž™g›ZÝ]ò_ã.CU&4’ôÈç&º—CÍ ÆÇUÓ(º®Õ]ù€‹³šºKF_ëý˜x1Ž]¦hõŒ¨*ߺýµÕ$ÆÚ—-e‰ð ©fµƒ“8Y1î]S»ÏîíÈÒв ˆò›ýq‡)‰5dCá 8sîR·r5D®n†4jç×+ 3®ˆ¡¼Îß¾Ýó35`edÿ6ÂMÉ|±:&S ”ÕÍp9c[æ6W[¸¤± Ëì¶O_óÜî_ÚÔª£AZ?LP›~±Ô¨‰¸w»Øš]„‡$Œbéê²³=•E‡Ã 5×™nˆRqú‚ªHFãÊÚ"¸ã?oßß6²ö”¤G -46¡/h)PF%Âװͦ质›ÉÐõUÑiX.f ¡¦e~†¬T”¶éMq½ÔËä0Ô¸ôÜV$ú)7Ð<F™Üü£C?]?ìµ» «p©Ày"·ðÖ©:¹›¼oüÊ’›gP…?Þ¡Ø%-AŽ´Ëßà#"š?UlÅD¿¢/GûI’. -è"ÞõçªÔŒÔÌç%tP›×uÛ­~WCÉËÞu·oºŒL5½$¨'¸XÜ«)‡Ê;P{:4¿S3–…AÅÓžî­Ô&/µÉŠåmÕöÑöéÑýÙsòD-ù -††ióѹÐß "sFÎ*š=;ÁÐèÎÅ3÷v Õx…êf¬Wê ¿x𰟼\ÚÊÃYÀsŠñãŽà_²¨& ~ÇÐŒKí<á ÷2Áf¶3÷~SÀ`úÕÒe*ézð‰ujüòÙÆåã§Uà a¦ƒ`$8¶œœ’:Œ½žÈÝågŒøKån&SìØa(AÙš( -—“WJ¶Ç—ýº¹Þà«‚ÊVØR«Â.âÍBðᯄy¨óügnà'€LÆ“Þµp×e–ûÁ“-ÈôÌ¡¥Ç‡àrÄVb¸æ¼×‡ƒýÞÀ™ò¥>á*lÈpÈ ÇÒ¬W–wŒGéC`e,iŽdÿ²üqHÀIhä ƒX«GâiH5Ì´òÅÚ7†·”]-`ØóœEO™°‡h5-Ú¥¥“°Ÿ¤~«v0$%‰Ì’¼p'ìL@¬%R‰Ùê³}oL5Zk¬´é"Û|È[^Š¹„[ù…£†qñˆ¤;(áJ´4F뼤i¶›ˆ -b~T0]Ë!´Â9’¡ª”wEd@á^Ñù¸FGHÿ4 hÈ>¦ð?>Ç×jžiä±ÿkCw­ô_âÊá½2ý¶£Ën]Å‹ùF4$·.ªf¨ðGÿ¦Èö*uJ󺌘(¼¾ ¸ãb®«@ÌpÜNš@t—¡“A-¢Ô?„ &›•@²ìÍGÏQûLî‡É7G²z©Ðà¤ã/Ë‹gŽK¾ûS0 œº†§%[ù(®tAji@¿âûôÕXHëù•|¾#ëÈÈR\³©“úîIÊø¿üTw€í‚•+Øÿ0S¤_+\8 - -'·ÉóÍ„'®«VfTÿÒ’lD«Rw¸PÃÀø®)Xé¸!åZo4ê»~€‰¿¼,JtYëV ' ;Þ:vqKÑ'Ë?ª‹-öÐî—ÈIºœß= Zòh‰â›žOB³ß"ò/t.˜tÝz–G û"XˆyLѬƒØ…¿X@å­É«ý> §c˜Èþ¶Ö~çf×'®GU«ïVE2"y¨.ðƒDLQÏM!»E¯lÍ^aDºTØAòþŸ“`—(!ñAV¹ a;¦->Fþ×g"»ÐK"S½Ý²ˆÊa‰! -½(²ÌM‘n†:¯ðüru¹=0® Ô½{ÏïfG…¸†Û <Ñ=9¥Žyï àã¨)_kË>îñŽ÷AµÔ F:;îâ‚Cþ!0*à¦Eëoçô%ïMTËÅ®JCÒ+¬ëzÆïB*kf(±ê\Y“©y‘ÜÄ—úö¹Ñ¬"r8)óÇ/E@f|U——;þÊì¿ÞŠš _ùSnÊoM³ŸGNI¾¿}׎æáÞœ­.¬Å…F¾l~ieiJeNæé`'u ïiζ}<(áÖúJD¹ÊeõhY'—÷ˆVzj9íµ•‡4ôtÖ–œ-¢ iºÜ9ò›ÉW¨²z'È|úÞJþ²Ø®©+?¿)jMêo|Ú¦=¦Yp–Yv5ª<±Ø¶¥îŽ¥Ôƒõ ÈˆúîQ€·Ò3™…cˆ‚¸®…'JùƒD8›Œù{ÿZ$VbåÕ!س{ùçZ¹‹Y…®äPV:C lã×€a6¼#ºJ"8s}X±?¦ÍãàD,Ï€ð¸‹6ï›4µ,5¼Õ¹o¸§!:J/h0û6‰µh2bMO‚¹Ê<*}FJ™­“‡¼Ó—ý2NçMfà*blq”!l(ß,…AÏ EX¾,Ú{®{¾¾¿mÉè†ñ6l.¦X‘ñf»$¤ã&ª¦uÅZï¿áÅ<^­ó8›Ëín \eÜÓ"®÷Á¾±8:a¬á©« ÍÏU§  ¢ïao³"}(èßáÔ­ë?ˆjºníó"wci¢¸`aäƒûàæ»àþÑ™i>‹w0ƒØö$Ýþõ°4ëŽp'„³©é2sÏÍ_CÞOŸÍ2¨n‰ôÐÛfk³± ‘=£÷‘ª¥Ì$ ®FÒ%`ûЕŒ®aÞñ¤å0DS˜Â‹eg»ôu4]a/—•ž¹Å_Û*õà縫êºìÔL !Ý—tyÓ%Ü~ÙýI Y;_ø{ko*š…ш©}Í­ÔßôfÔ+¿ÈW³,Ô>’E-8Ó;% ·ªë´ç–øU·:!õ(û^ù~?_t›¢ v¤•Iˆw;ºŽUˆ ânqyx¿`øpl:ùÇ;6VÓFÏ=»±ÕìÃàŠÁ¼÷V’ à§HʦD†Èùí`Ôbå5 -f ͼFóæò}(”„e€ ~—ÇhKtÝ/oÌkâ:ÞÈ‚…k÷…ZkW÷b…kéP n¯2Õ¥ù¼P0»ï°Ëߌù”¼ÍO„ìLHžùÑ–‹`¶Ý† -èÎ`GL2f"=ÕõˆMªS§°Ä½øØ©ª,dL×O¤Ocâ®ÅyÂøêé÷}>î{˜ês«ˆX EÆìv²hwjÕ\䬚¨~¨~é˜iÛa§\¢#—\ñq¼üQªú¾ ákáÔ8'+ÌÒÓ•œúñF—™Š×ˆ¡*(I±%Ü%·4¼‡UèêV5 xø/nûHPiÒ {tTf«YáüI#Ñ7¡Dl&«¹ŽØig`i½þ.ëå[gALµESè_ËEŒî÷^+‚»m*.Džv vüÙsûÆ·#Iðh¬6oŒz ϧ÷QCŠF5Ó«#Ä’¬è’¹ïä€2Š -\#­ |)ž±üššo8—F…~ášäYõë>z€CÇÈöàò‡ßbýQñîõ/ÝCU’B§…¬z™ ò1¨óôdS³ìQÿ¶ljQªe¸õn)õ@ñU—:NUêÚ¸Ìnªziºè…AgI«feýt/ƒqŽçû!Þ ¶Êy–…¥§Tw¸[ uRíz¨<sï'|׃'omª:þÚ~³o f._5üB?4ý²ÿ º¨¸ïßKå<$í’N+ß¿©yÓú†*˜'Ü^Ž…>ú*9F6wîªT;Wâ(¨ ¿dï3š0¢Eºí·åÞ¥lÒf“/šó¼±é:ëUgÊCÿ¶Ý^j²j¶2C¿ÓC=ÀÁrFÐÄ–@Œ´ŒwÔT8~ÏqêÂ5¯b8D9ß-¥iÖ ˽IåH ”#ÕÃTLˆËÒJ´±{/&t¢U+èÚ]“¾êíOö’%ÿù’y‚ƒ‚³=0"µ¤Èe÷é=f:™Mþ°¬„ ³a@øȉØÍVTžvšpËH{wiþÍ rC[sYDJâ¯ÚÔeæ´]¸bGÊÓVÓd’Bó6YÓlŒ@@,îAž\XX[†VEK!w%ßdÅ\F»®txL `}PÆ ~ ¨Ì|!‚gTˆž&c¢Íyž{£Oéú[gK"0°n-ÔM6Có©Q5iØ…ºæê̈ó;Ø/â‚[Y/'G–ÈÎú¦°Y¾Âr ›2Û©¼%©ß÷x›v (ÑYcìK­?ÚgO • 1ó]þÈ@íEÝp²`YÏ1ŠŠ ªõ|Ï íïT³*”ÈSNjFH¹phØœPÁúÉ–¹BËR¥œd} Ö¶ -1]#@n‚¿Ý=ؾQ0!×-FÌ{ÀҖ½Ü=áüSÌÃëš[³;²VïÚ¾úÛïq‚\Ô„;¹%Ø>Gü±„8j?;‡´Xx9õÆ8MlC‘³}µ@8ó>ß{Šò}Â:ŒE›'ûãŽ1?8g„µvGó®ž÷ÂÁØ÷3"aW㜖]²I†rª~´~°óvaü”½5ÎùÆU{6q ª"MÃV)¿’èx‰ú‘œ×!Õ9Î;4éNU£5\ AŽ˜3 -±Örjk¥›Ç#øgbf8¸j‰ -é>ê;;¾¦4~_,\Ü8„ -Íþ ›æå·tÒqMsŒbÌb³ B[òrþçÒIBŽeDG$×BJP);Õt¤;ãÂ74B‰–YûoôÕßó[¨ÄLŠ•ë9°ÑÏ©ÑúÙÁA !;ÁÚÍ)]¢gFMMãu>(:€QÌj*ëîa¶ãx¾ÊO´5)¯‡zšÅáèW¾>åöë>ró$—'7o¡èMÜQmåëp è€Ê\ùPµ~„ÃÛ rftRq]>qËã8Ýês¿KE#$¦¥§^æùºˆÖÕô~Vª\¨¤ÔÄŠ¨äÓÆê¹äOÛtûy â6åoP]äÉÞ5¨ÞĘ́ß~2¢ìϯ‚ÿ" ‡/q^:¯µºxÿÁûÙû:-àÿ%]"oÆŽ4Ná! ÜÚ¼Æ%¨ØsP#úÍf•^‡N"ýheï÷Õ>¬ÄdY#1l ðÀ¢–ü šü¦óÍ\{w¡†—&ƒÞÊ3ã¡¢Œ2CY*âr>µ²Š”=ù `L|ÏðÇc™a¬3’‰AÄøu¬¸ç.È…Ž~A¸‘è—žcÀcÞ¸§ç゚œ@pÓ•¨ 8Ù˽T˜ðM$±µõE¶êZÊ‹a/gÀþS½¨p˜WÈV{ÍøPÚÍa_«ÈÙÝ4mO|é3a‹^2B8õäØFèC59ðM8J®.ì+mÀ×Pñ×áBþ²àSÃþmãß“ÇÍŒ.8çÙzÊV –è…C ëè)sFÓ·Ã46tóÎÔS>xŸ¶¢`öî·qµ 1.Du¡­:FÆ6¿'ªÞWlYV±ŽT$žÿæp=3¾»vÏë> ³ÙZ0w,˜fÂ-y)ß<ÿæúüúöMÚ@IÉü6S\cöøþj¯2ÜGR­br]UK™¾÷Q­¥ÊñæØãðƒN;áYò=£`Zè§S˜­­TïL|µÂE؇T3?£±i½S¼cð{OL_ç ïy~`+rx¡-Mp¤4=®ûÝ6Å7HECüßGý´¾ÖvŽ×TMr¼Ñ:vPÈù²†¨áÈÉ34;èø†5 «e(j‹bÇqÞÐ~/½„DéQ%lףȚ6Xû¤ôÏëÖ"b%Àòñ²ãÎw´V·‚ÒqpUÕh¦rQ±{9àª8i0€Þ -tÑBþa -%jM<½õ4imÅÕȲ}Äö$š™+¢¥ÝKëÌk³f‹¢ñÞÀB Ç`è¢yPQE’3åà磞¨!6£ÔŸóülsÞCtmq ›Zþ¹ùlÃÄ*\ÂØõ9¿.¿^þnͨ4;EJò™3@ÛE³8u$2³;üú!WR(Ó©5rÌô - AñdÕÊ‚Êû‰.Ñê¼ÏÛÓ‹z“¨>¿Q•Y¯‰iÆQBO`6^,âbúF½ÈjT)G„BFbJEób3qHWQ²½C ‘óŦ -žHª5ÞÐj 3ý? BÊ’Ö¦¢q˯d°wé_ጥrU²b=.Jú9­½4"ňCV5õlÕ"îÁN¢ØjC¥ÅYËGª,§žŠ Û¿`Ÿçzgà -ÿçÊeƒ¯í°&o¹@íÞˆàçVð5‘•ÐR»&»À™ôê7úRðé9þ˜Ý>¤®ó +÷ç‹oÚ¯ô†uJ§ŸW„üÐáÅ7z9DÅwV£§´øÌ3ù^6†ÜI”àÇÑM6fOõ½×þü*>ç ª`¶´ÙÜM²dF:Èhe+$ìBm¶‰¸„úÌþù3¬Xpæ>iT¯Ž‘îC\‡ À Ï°ˆ›{»‡¤V•lÜýFÕÊòyD³r?¸êiÁLD?h×BèÝ!æ«*KR»ˆ…b"ûI†£ÊÍzŽ¾¸e˜+Ì©ÍÈîï'He%Î`O‡Ë9Ý?Æœ?æ'‘åk5iKWú‰Ó.4MÉ4µIYPâƒÎ4‰_ ÖÕüÿÓ,îmÿLs\DË)ô¦ql… ‡y>º‚˜zÑÚc¢¹/®7Ì ƒ3v›ù†-+¾å•4щîÃæÝéüÌRŸs•ê`kjà·#S:,(nµØN/,;ƒ(ïÎ[Ôö*[Þž¿·ý%óØáô™o -RŒ7YÒ×ÞeÅ<³°Áœ=9Èõà³× …: J}&⩦+@¢‚D—?µèx3UrGM"ñ:ׄ%%H‚[‚©0è™ìrW~EÈ‘ƒgE¡j°“¿ö¨·½êötÌ‚„ÄMÍ@#žY³Qåž/cj½¬œYF^‘{(ïp¿ë¤B -óí宂ÜÃhê7yQÓù˜}N¦eæéÌHè^x‘£ ûô 0_@ˆŒo†ÊÖ"ùzÜ'a‹qâ·1G†a¢;Õäújg©§Ë´ô4n¥Œó4ŽXà$YÄ$³Y¯¨ïó¼Òs)"ú¹ -‚Ä^@‡ãoâ ±«dü‹KdÉb ÏK.ç<ÂéÅŽÉë‡[¹ýâ––…å¹;ăôÌtMPžï¬t瀖ê\s{I6¶"hV¼\œ˜ŠÓí³Òí›»ÔF{Ô”h³ªçøÃ`® ViÀìgc…ËaÛK­Ý)t”ü’'|ãŽÐ¸oþ(·æÓÓò¬8»„}‡*‘“›$ðÌXšRò‹s%tÀ²¹°ãæ:µ TÝ+mŸ^C±ÇZ¤µCiÚÛ™þÖCÁÝ°¦åÉo`R,JnKÑá}à ZVmìÚ]Ö’’“²þÉ<*U¸øËVß–6‡\6Ûöéú¯Ÿ½¨þÜ´¶˜\åÀÿ`BÙCmtâÊYæ?P­(TV¬1T ­ZXÇo¾P¨S³/8øá…ßÓÒÁy‚³Ëö0mµÛñ99ÑÿBxAd©ª2†PÒˆ{3\‡* aœžÆ/ÃA†|4Yýžkx,ýÐKZÒ¨ %†TŒ±,XÓm›×øBp[¾ªOÏÍ -xŽ;ªÌd"§Ì®@ë òµÈaÚ5%‘'ö€Ò90÷Îê’O9ÐþZ‚RÏŸ¨’OýN?|š}ímƒìT§In¢ùG}¿;‡c{ö4lAnÐÄa_™°øUŽýÊËCX®æŒØìÔêSÊwÙT N‰VVõ%P·s¹F/ùþš//ÜVìU˜xkØ«¬ Ø»Œ9í4=h›áö ¼û·®³ký€œ$IÊ­0£%k %FÐ=ž’©8÷º1±×AEÆ Á^w]N_×/ÄqmüKTï4e#ÓÊe|n~Ý .ÙÕÝJjÚæªÛN=ôÆz}¹ø¨Fû‡²à‚P¥¶á¸$µ§PÇÄ>ËWÿ²½þ¡Ì® Ÿ¾Xs’è²kÙvX áï3—š‡îd&~n‘ÌÄ]ácLϪ ¯9ò# Îv9†Ø–sÑQû:‘gk5`GãÚFŸ 6¿«ò˜o©ì¨FïBaT%’cî]% øùä›`O ê´b ý¼ý…ªA‚‡Ra¦Å+c ඔ4;Ø>RŒ–` ÓD‰±Í³ÙAÎæ{ú?I wŽ0(èúÎÞÃÄ},£×åŒMy%žÀ³/¥h¯ŸsP_DX¬œ’ù·ÈHzïkƃ°ÙRþ"­^†`•óëø<õ¦ŒÌêWi3¤Õ;à ¸vÑêƒÇb;R¼çºÍC­X«£E2š mŸèƒ±Æ íT -Áqe@6 -„oÝ–5µ˜_6#®Iì|ÂZ1ü¸ä!*D´‘ G) ;1üŽ@0Û› ÐwTV¡6Ox/Êœ¤´wo…tiÛÄÿ¬2§‚q -¸Ÿ+ªr®¨Ùº\¶ëŸ;í̧ž6Î\ lñKž-LúÔ8ÿrQÒ£]Ë÷l ˜a#ŽS'Ú™ä”ÙáÛˆÔž+€bw¤itë²Ü÷Åý÷XÍúrÿ¼¬z h9á"Þ±–?%eEYL@Vç}Í|ÝKÈ‘i(¬؃DóÖ—ö}EþÉ™ÁgOËIi½W%š.ËÖ¥¯öú‰«Ú -m0‡ñüÊ3ÜüW@HÝŒô÷—cx/‡@5óƆƒmÞM²P¡q—Æ -“t§ò8/ÜïŸa˜ž7·Mö1ð [Ÿ²çêltÆÐFû•G0éÇç×_ÁÇþ -EÞ.ßûpOÂŽt ¿mq÷”$§iûÚZ¼ƒè Ë·fÝùz)6wû‡Cå•t¥k+ìùÜn ‰h¡`Ü­55Žð €Ô— ê§ðÃ077oGC¬rÝPèH«úP‰jfyòuø¯=w½+ð«Ù¾„üŲ+2ÿ2åa)àR¦ÁEg‹% k¤_Óç³ÎDkGÈ(”v·o37ÍGà‘ùƒ*Zx¾Aá˜;½ÝÌü1 E÷Jr×ékìk†»åxåûF¯¾[ÀùÏzÅ%ܺ¸02­P°3Ó·Ö"!siÈEµ•KP^å@ñº€Šx_v~?9|1ýse -½ÿtÆì ‡Ñ6"ÑÛÕ éq(9™QFà¦ìÇÂgå5¯hlBã¼1 þlˆé­F•‡Lþ×ÀQqòËGò&8f(±âWÙš0œ­F¡^BdÙuzpMµ÷3N2‰–¨[6lÿȹä$„=Š”F19›T8ÚÓÚì>F™ƒàÒµór¾6~Âÿ>‡¯y“j¿0¼Ú(“÷‹4"zõÙÀf„¼=»W£GxÒÍxä %¼´·ÆåŒÀuÐÖ­tm²v§Ž=\ò‚~»óÌ_g^«·:’ìÚ†Žt”ú¤‹åUË Aò*ó´î°DBÚmKšÄé¯ðR‡†ùGZ\dÿû­âH.`o›¶¬xé€ÌIüƒ £Ë0Œ‰l’šÑ-Y™$H†ò{:Í>QAy‡ú3õUw¿¼ñ ðZ6KŒn;8'è1¶Çhîû|Ÿ„¼I' -jê 2ûR´†fwÅ¡iù.ö5b _…üýû|4)€L,ä3zöjjà à™ÙÌ~#¿¼ÙÙH삪ËÊDK2ßMg¼…jL©ŸÚµWâ‹Ii˜Eiâ7­ø{Ž”bóTåÄ]./óZÜ°Ùt}ó7$‚“À÷¾”ˆjÂI‡¦g=F: ÏŠîj¾!?î¢õ½aâsÆг¢Mz}`ˆÀ溂“ôû>`”~4U6}{^#b¦ÜD¹Ôº)Y¾÷˜Æ`:¶"ΫDupw‹¦hâ³m%®ÿ`pڥà œ´þwìòAýÁã¥G -¦ÿ‘‰ñ<ŠÞ• ZÄ"|¸{än–³7.÷Ð…Üx%Ë‘»¢"‡¦GU©û)<Ä"w®NYrˆxà¸ï?VŠ.C©Qæb7å|©\ù Î0ßâ [Ya§Hö•ÙºBFn>¤lßS(d)Øp4 Û[i ÐŒãB"C¸=zÂg½|êAQÅîy¼Pó¤Ÿø„¦ºòß`º¶Ú—ÚLÆøIÅûÚ j>Çœ¹èÈL""Ü ±)š4V)hèäšH•¦T @.‹7¹cW¯œAõZô÷ËðmÍ‘qëõ“+øwŸ–kßZŠüh@N¸‘¨sÍeGu:Ø0`O8Õ%X¶Dxbˆõ¬/çâÑ#ÉQ»Yw-G¸uß±™aÁetÊŸ©Íµ[ey[ó;ÊÃûâxGì+ħmä|I“ÿÙjJ´lÂ{C†Üõ^ùœ–ÛïÃ>W»ˆ¥kŽiŸé©.²N#¼eh—º„ -E‚9µGÝ`q­·qX'Ç=ðÕ³¯¾Î*á­#ñ8DªNŒ3dþÿÔ’ó‚æ¤Ò±‰:²KèßkDp Š§JÑjX‹9p8õç*ð× ´'°!4„¬Z -Ÿ’Þ.ÓàWyŽb%yŽ ½%´ U—R¼õÈ°ÂË£äR‰ó‰óæ7Âvçiúá±É[õ͇&?-¹Ñ¼}wK‘–§ŸñÆŽ^x«<®%κ†O6¤,f}àõ!R¤d±Ô„ѵÈ‚I¨e8E²˜ýN !ÝEc˜Sø—‡U\°ýššnµB{—óƤ^’¤?Š±"SdŒ2á2vr0¾—1lÒãÕè舽5‰Ó/VîÕvà’§(7PÜó¨¥4ÒŸh7æ"ÇÙéÕn‰ÎOpwmû <Ãðüóý¥ý‘>&V>ìMEvˆ$~ýˆ£ùTœÚeO‰Ó<|.ûÅ\,OÈûj=š'æ G¸ÏÙZÊ(§¥Šò ,š¶3·Öß3 Ý/Pój‰ð‘k êL£yùM™M=p0‚øˆëGP/öÂùzvw†Æ,'ÿS|Î$¾«‡D}Zƒšw9‘Å©¦(Gá΋üôCBžã[ïµÞÐ÷vMÀ¢·,"¶l§4¨®§÷Çh®i˜'û}@ -çSÐndJWQZHtdö¬EKm92zÐ,. Ö~,´ Aìý«Þðt9Rs—ï’I–¡²ó¦XVD ¿rðÐ[B ©?šb®Ïd°g¨;Ò†5 ^CÝã;T¦vIµ›ÚìÀ‡½6÷Ö¯êË·I …PëÞÙ¦K•0úEÀˆP%-¦Ì*dýó¨Ý­`&„Ž¥3¨Šj:,;ö×LáSô] ÿõßb*Å6‰?¹;> endobj -4132 0 obj << -/Length1 1647 -/Length2 12086 -/Length3 0 -/Length 12939 -/Filter /FlateDecode ->> -stream -xÚ­weTÜ’-Ü]B qîîNp'Xš4Þ¸ww'¸{p‚ÜÝÝÁßwçÎuß›?óæG÷êS»jWÕÙuj­¦&WQg3³5JÛÚ@˜Ø˜YùJ k'G5[k%[>&5 …“Ä xø©©%€Æ­¤1ÈК$¦vv25@ÂÖÎÍda ÐiªiÓ300þËò— ÀÄíŸÈ[¤#ÈÂ@óööµ³Ú@Þ(þÇê@ b ˜ƒÀ@€„²Š®œ’ €NFI ´:¼5¡âd™@¦@G =ÀÜÖþÇ`jkcú«5Gæ7.1G€1ÀÑh -z ºšíþ‚v@k£ãÛoÈ`á`ly»ˆ-dc -v2û«€7»¹íßÙ9ؾyX¿aod*¶ŽGSð–UERúuB,!åv½Á[ó7O3[S§¿Zú{£yC!Æ Gè -ù+— `r´»½å~#³sý]†“#ÈÆâ_0€Æf` £ãÍ÷_·ó¯>ÿ¥{c;;°ÛßѶ{ýg ˆ#lÎŒÌÆþ–Óò–ÛdƒÌò×¼ÈÙ˜ÛØXÿa7s²û'æ tøû‚èþšú·"ŒÍlmÀn3 92‹’-ä-%€î¦2óÿžÈÿ ÿ¯ü¿"ïÿŸ¸ÿ®ÑyÄÿ¿ïùß©¥À`%cë·øÇž¼-cÀÛ®(þZ6`cÀ_ dú…[ƒÀnÿ]ð¿{kÿQõpþ;üb6o -1±q1sýà r”¹ÍT@SK€¹1øíòþ¶kÚ˜À à›Èßï[+ë¿a– Ó¯6©Áõhcöï=¼éöw,ºJòŠŸdþ›mû·³ÊÛT@4Ü쀀ÿȤ­hköŸ‡¿¨ÄÅm]LlÜ|&vÖ·ÇøöùØ9½þiÿ&bû×YÑârè±2³²²Þ¾ÿùù×Éàßh¤lLmÍþš#uˆ±ÙÛèý§á/ØÔÉÁáMñ¿·Á[çÿ<ÿý€@W )ò✭©@€UJz*¤š »DR¯û'l ]QF~žo¥m§OJÈ_Ù—§ª@æú1þ—f·Ù#»çù»ƒ?ñÁ´IÀ³\/Jú®<¬UšV†Ýo,†Eh©ÇÚç3 -ëï>s³jínŽ¨ª>Ákåp@<¿£÷¥tÎóÅ¥úm‡îmš\׆Y…]ýýè˜&þàî7mï¯þ¾ÎK¸®÷ YÑHÔÆÞ‰Gä ·/7u¦/pœyœP\ÐjGDF@¶0{C'çÿ ÞLÐ)„¤ó¼üñź:¶]¤«ã‰À£æ³ª=§¶÷tà“)µ¤ʦ¶ÿØø¦6¶ÈxØY‹KBÆÄN8Ù7º_òj[ÿŒ}%Æÿ­l|*d:Û&Þ`‚š*ÉË¥ÐßzHË_Õê×É ¡0š:œnèJ ©b½Óá²ä«3z¢áuœÞa’àU$hŠ‚+!SÝÍÈFј”N…>Ì㊙p…[í2#ÿB]ó;?(=_\ |„}#Åa ôecïzl!qâö -`Ýh6ßî”Ôè † -p\Ì,É÷`ƒY&Ê?,¯ÙAŠµòéwåÉÅÏsk×˲#§þóþ¿Õ™Hµ6ñ››VçÞ`¤%e±pSr® ɺ÷l@4¶ñ¿”s ÐœbHM³”Çzσ³Re›€»û…%‡ ‘²AW|Ž"A_i20™.BÙÛGï=“ SD_=a¯Tip%ŸgEœ+„(y{¾Løq«8„…‘R?«ê -ÌÔ5¬I5¢v©@Ži/ -+»ÜkÜU„÷Ùp­v’òq6< 2‰EB2Z_F¼ýŒñ²úZUÍ0àþ­š„@쬦»VjÔä㧭§ÐÖ98ÔJï!Z†)—M:ú6éD¬P±Í¾ èUi'×áÓ©Üii˜ôwž#õ`̸di4±&'Âbý__é›ÓÞ«Ì­¼ü‚ÇKá¨öYŽº<Àš±&?lZþÒœ#Ïï¸ëµŽ¾ÌÏèjþËw[P¬%÷Ü‘+¯-#`r£ƒvN˜¡Ñtßd€ÿ£)ΘÔæ¨óÚs÷Ny•ÿ~þ=E)›fZ¬÷û>izfI.GãMþ^7—o^˜WT·²âæK¶¿°ÂÝÐë#­¹lzÐKK/.4FVup+ƒ`Eð>uEþ¢EõP"k8I'òâVžraH;ƒå×™; /5ÇÕ½hUôýØ$úÑ„ˆU Ô†ƒÙÛi«+Ù^ä-îh§ÙãaÖ<¿XS:YD¤œ„Å€*·x˜Z4ŸI#ߟêQµÙÄÐÙ1r½O¢Ñy™i8줲ÝöŽ/³ µ[X2wJÝ'´ó­T>¶Âq‡qLu~Ƕ¬êEœ ª¸ÊCu‚c‘~n`7oªþÖç]h^|wá샂Mû}“‘ƒ­+UÍbÈ…Bw¦a!4/"S¢Ôh·@ð­9TÙï}ÿü¤hðçÙ =¯â^®¼(ê…QÕMR—ÚØùBòqÚª5Ýã„»ìAC ­÷‚Žìä§"\Žd‰X4rä9Ôµo#£°¿)ÝݨG/šûSm€oCtErZRÓ¨2ËÿÀ¶þŒ•Ó†¸X5{VA}¥Ÿfbä QêWØïÙ±¾Ž{wK{¶yUÆ*®A".d¢H*%O?M…Ø~Ì÷1™|à׃ŠÚ -LFx>Áç­#UÍã4œn¥v7="·ƒ™Óâéc…üv‡?¢æjïg(UKAS }'q%·«Ò´Œ® Þ²·b>$Å%¦$£Fñe€m°KñËLäæ3,Ïï9ìœc $þœ¶©Í}¨SDnýV+R‡®Q«üT¼iUY^Y*h—&™èÙ/ðW6„šEkíeq¤Lú}—âH‡2·<,‰œ]jžáôûõö¡&é± )¥¸;s-|R=…h¤_úÕ/Ù†åg•«$rwMwJÛòBHæ“w~%æåÍ5íD©w>$Š“Ÿ…„ñOn´cV3QQvèFÈ°»Ë•6…Šïh9~\×+Ëîmâ·ÿEÉ•Î;±ïØŒZ—ÐÅšXåå¶+ɤkëK­ét)ÿ†”wÈõ¯™ÔH3¸•r3‹ª)ƒ -„Õ›¾Øg_¾{‡úeqÄ]±ÚkÊ.ò sÄļgÁ§!ã)|–µ»€Û6…c¡<]ïÖ•¦îy£Û%è`Grl7ëÀþR^sr-Š\2áì¡®Ni[Ôd».nj”Mï$†Ø3}ÊTiñ÷ÕݽÌtŒ:Ž–’PVž1=̼TׇLµ;tÜ!L$`@-±µleS(w¼U릢`ãƒãÆEóÎçÎ(ík<¡?‰ë¹ >P—PeÊ°òسæ…×K<9™Üí¾â„T@u¡ yJÃi+Jä -Cÿ@cr«Ï€8 J”à]YÊOû ö_•˜‘ÃwmOè_‘ôóš@ÇŸE{+ãÿñ”HÎׄ1qNµ‡7©jf?æ%íK½µšàœ-çm!´·r9 -zi†ö†ùÓ÷J[ -ì\UMˆ@²>kà’öçô X ëËΩÑV>èõŽÏ‚W©‰–¥Ò%áG0ÄÑ ‹Ê‚} kqV¸2&5#ÄqµS:y‚© üØ‹+Ÿ¬à—/–‰–0E9+H&ͤ°iáÇ0“+rƒöÅ8Q0õì36."Ý;VW\EW¤ï`Þi¸¢“ ð«É¬ px8x}É˨‘uËí°w4J5HÒªxœýÖ6bXÄo©±µÒ¨‚Š/‘,­”[‰ –hÇ7ÁÂZ,$€_qaM‹)ošÛŠ½ÿØà{f–9ïë¤Ù2Ijm–Bƒ€zôô{" ¬“ŒêH®VÜ*ÛƒJfUéDZj3sL ¤÷%ÄÁ– ñÇUXMŒÊÄù¦|Æ!Eê¿Ea¬Ù–IÌý€šVšû]Í÷è…l–®¹—†¶Ýx冡à[R ìdŸ8èxŒFï±2õÊbØÍwúÀü‹u¬«žçPê‘‚ŸÐù~P°7“02Z‹n”dòÒ œkbâõºZF\kTÃYÍ•mÁök6Üúè¿Ž-é™ Ô#èCoK÷2pçÖpŽ"\sFÄ6§vQÜÄÂá— Yº¢rnåa*H^Íw÷gá!‡}c:oäÁ¥p0…ÒŸµ‹c~_›îŒ@›b²C´Ïš»KãêQnÁ5ø,ÆÎåÙt+¶­‘§1`@òÀƒU$Ia?ïØWtVˆü“ເÞé©-rKN;ˆ˜¯Y¤%ÔûìCvû@r¥ª[üS7†ÓG'W-RY€±bq^µç•š:ÕÅÚ„•KH ¢f›£ÃäÏ´Žp’a,î“óŸZ÷Ø›2ä®mËâWœ{õÌ=3&Çý¼bjxMÛð]ˆŸQ0¿ò‰¡ûS; ']õ6?a8¶gæëy#j -¿_O›4yÑZÄ‚‘hĨbW”`w­ãý>kö3´ûšÏxüÅÛ­í`nâk–oÀÙ‚9uâñ‹<9aX›rA&ˆº¡ˆ¯°›h‚IXdûŒ*½÷c„™Ôð÷°jTßšFt±^&îÙtÕ@%\Ç’ÀäJàZRɧV¸ŒõŸï|¨dÃià?%ЇãÕ\*²-OÅ@&ØÛÈÃOgÄvO“¬EÅߊ6$ |ï HÀ•3§ ⎯Û=¯WxÜ©Ìj ­vÚWjÓ_þ„Ì\šk]DŠ%#úú[ã[6é͉ßÝ"oÔ§WÁOäÔ(Ü•¦qʯ 1ˆôiª[žTg[—;R|ÀQ ÆLT<°|Âé·Q÷u Ĭ¿îâ¾Áîa8¿óÔm*¼ÑãÀ“®Կñ½ßÔˆ@RGß]=úT‡å_®„¹ÞsX«ºü€Ð‘¼ØLɺ€§GLq2øÕ _„ô>2ÜÓsIàö ¢uc½Aÿ½yÜ‘7— }V5ìWî¦BÛ¯¼è¾¤¬EÁfQÚë Px-òNºgë.±²êÇ(ÇD,½œrðÒËÀ@DxYÈl&ƒÆ]*R!_qïqñ©ö’´M¤dDZÍÐ/ßÈ|GgWÕRÉdÍ2ܸ™j®÷®ò:ó‡R×[l“­p„bKŒ•yAG›F¦^Þ˜0-–úë2ä“Ô†u÷ÇN׊ð?“¢ñ~ ¢f³¿QG ºnNe-ùÒ]1éñzâƒ/î7§ó½pÊÑÓãü„·KtoCNŒé°²Éá®ë+ž´KcÅõ!‰ÄŒŽ±nEu~ü‰Ä*éy]Ú¼IÞY5×Ýú=ª_ (UTMS*À •«x8C§böúwÞhU@f7F"3¼y¹£Û~­#ÐAÎÝR·5|ôó¤j…Ÿ{I<÷ŽPel“¬%†W&)µe(Ä¥°–.äì)!-iŸ.1el+e22f€+ÂʯŽ©T:¦ÿœû‘]3MVz*¦Ã5)2]¸½yª‹èüs]r¢öÈÓ1ü8ðž“Ôj‡%@c>¥¨•Ñ¨ä£O(üJ᯾ǟ -\ä+,±XÙ† CeÀ‘*VÙۂ˩æPùé!ü¡Mãm Ÿáuh}øÓi? …÷¬Ç f¦?E}‘%Á¥ôÊ£9‚‹óÐñå Úk˜ðn…Q¿Ñk\£¤<íÍõ*ò 32sÈîãÄx7 qŒY"°ÃyVË\R¹±âû¶ÕvÊ´*eà#tFÆ‚ô|´h¦›Ü‡¾>Ö×:~l Š‰ß”“oÎ b>È–ÈVbÿuÖÿ£}S&O5`tINçáW(cì(EŠŽbx÷¢Gòàg5ÏçríŸ"óÉ,ˆ¼ -µ—Œþiõ - JqáËñ2Gf›7ÜÂFZå\¾÷œr£=[ø–³ ÎoÕÁxt¹§šÛ—“J«å>°¶ÒÆa`"2‡c#\Zí‘Úa•¸ŒZã_)Ä(‘g(pc7ŠUáÅï›`Ÿq˜}>\47ë‡w¿,NuZ ‹µ˜˜_¯-T4qÃ䙪nP×r@–Q×ÌýU€+jïØGß5hm`>÷©–7æïUŠÐ5Œp‘R Ú<òL¦­²=½—á> ´ÝŸBAĶà•#a ~Ü*msàÌêÛX™?6ó~ìÿ0IR_ó9Zñ³=¤šçS¢?{w ŸWNi•¶ b×üï9øm™Nn’ -–‚挬‹Ù•;B•„z4ìôB£ å\?úsÛ&˜[ýé%Þ `ÉÝ@ÞÕ48±L'ÃL¾7â:AûˆkoÃqw2 PÿŽqn‘«eÏ­)* ˜|áNþ0“Žm€™¥  ëƉ1ŒpÑ û^=——îÞ;4$QŠl±þ‡—Ém– -‚ ªÇ veùÔÒ´ž-úï.ô½:o·BÉåCk£&Ê/ߣÇÃZË-Fº~+É=@\YO‰%¨P›âŒ(æ­‹±‹î‘놣léZ7ñBbvyˆŽlQîD+zü›éóLêÅ_Ó+Î:¼>„¦©^±#ÎîŽ^w -óTðVóF–hX2•"7— Õ­|BH Õ)÷TOî/FŸŸª8f¸>|eçWÉ;÷™/ë,Žö¦§ô…¡‹4ã””Š¡ úØ”îÙŽ&Šù§öœ#;¼kG®00ìÊÊH³Ï*%OÆúÒF:|¢1B.u€ô³Ú‹ARu­u“M?"•~TŸiŠ)cáçâømâ3b6ãôˆ_º3ÑòFäÔ™ ÄÔ­ãÛ—d,*ÇTwÞP~Õ!n×$ô=£Ý(´­ æW({‘>Ãs¯ô¹WýÅ«ê§ù™yjowh{ø*8ëÒüµ|èKA¶#*3¢ŽhŠoŠŽ†¬3‰©¶±£Kô`†õ×ω2ç&±(We“íÕ¹¹n{jLú”§F®r5R?ZãµÙôôK“–ǤU‘ŠŒ¾&ˆw!Ž -!§¡3~‡ã®qxûú>óÏ µƒþºúd îËàÖ%·Œ¯y/± ³dŠG&«êQ ­þ§¾’eð-Ë'üXº‚oÚì,ƒ·i_ -`U[.X”ḡšçé'©*ç`#«Ãí«DÏ6o)PÂ,A>ók‡õíÄ*L“Q&·UÊwV@Íè Ù†~™ »ÄÒ͸Á‡G›Dn5‹§¨ô€ ‰ê˜ùêNYÚ‡»üôúó§‹ÆIù´tåU6cð šßSºÎŽNò”¦ÄþJ®^°½jãK'JÎ Ók3Iy -íÈæñØKc*(«ÙÐ¥ò¦µ€«QN±õ£] A³`ËÆ Hʧ0y<‰›_TLþ— ïVÉ®Á±ßlO¯9°Ñ¿aö'…¢“@Í]$ÍAØ3úŸ_¦ÅnÈV¶駅Åðsœ,VU›¾Q_t¦åÛBùcZHå[UsÍ¥÷Dª^mé´ÓÔe€3â¤ï×ÿD¹•¤U›Ð&n Û¹²&’x´©X•6Öˆx}Œ]'•ÌÞ™ÑJòçǹK"é¶&3®Ã¦ó9ËäòÞ?ؼձq ÇtF¦E}ààdÃë5ÚŸÛ¡9œtá¼¢Ÿ°“dËW ©Ò’ "Ððã)힃§‰–•»XÜ£RÓ‚F·OmÐgúø§LS?}G8à‰¾«§P­£")'‹ÔRb4†^,’E\¾Š¨ ,ÀUP¼ßpp8¾ýIŸŠÃ›ÕøÛ®Åhù¾çx{V…¸߀dû«‡­=yáiŠ2T[ÝZÄ -#‰õ¶Ê&æßq®¨Ú·ï· zp ž©Lž;ý8gŽg€ú>}—G«¿¢ ¹LRÜz©ù¾çmÔï\ñãí -]Ë8·—õÐ 4—ÏÑi2*—4ʈa¥¦,˜Ÿ¶™¡ª¢ÈÚ”è@¯˜7ï› J4ɤsÁ7][ÌÑ< 6žšÁ«?§øCÖ[S5¡Ù¬ÕüOñT­ŒL‡|¯Ï60¤\„ºßùmý„ÒKÚe©  Ê鶴n©qý5·¹¬êGP€ZDÌ?LM €ÊW_v‚,J™†?øeòJ>‘–Wyèýl=¬åô;ŒHò«±H9b.þºqT¿U+:{“#Q?w›V®ÔÿdèÙÙsåEî,2 ñ`-Q0Pù3Õü™¾`TñÆ9d ֳ㠳Ÿcôn/Œ#¾9Ômˆù:RAv ¬GÚ÷n’.x¿OÇñ“Ñ‹ «»Fy·eTq6DkV˜0‡ÜMÉåQh*CïêîÕeùη[1‚‘ºÚj^9.åOcL d4Bô¯}ï°êFP6óª+ø‰ÁØóEq`ïQm‡³Þëkù1ewƒ„öòYSqÇ@€'•ÇΉá,}p?Z@•J´ïÀ³LÌhŸÖÕ×`ú}ãƒs®ã±‰Å¯:}BÓmýÈíÖG/óØ…Â'¯¼O“¯É8õzjkn)t*«î.Èô«×í8 ×ÌÄÙ±lhöJ³d(\±gß]öw­ƒûœ‚Îò‰Œ_q„$=âÌÔª~—Zº×K.îø…Çe¹peôÿLëKMœŠí¿ž"k-Èÿ™^†5ŒBÌrƒ´Ž²V”ÿy¶ðÝîÑç$ãhÛ‘ñÚi„Ë´¥‚Š'Õ¾ú&yÌæ4…:¤ªFÀ÷É€’0mþnEG¨ªP´|^„7[—4Ú=º!ÍëCayÖ15c=ÑÄn!Ó -Uc­­`‘Y¤¡rO9É=îصï‘^»˜à#´!ˆ:ÛN]X”yç~@÷7ÓÁH^é9Q&@5̱±©&Ÿc9Ÿ„ ¶+ÊOiŽ À‘J Aà½í™A»57üÛ¹£)qqÉ¥Û1œMVÒ›þf3fÜ>9Ÿv¸¹M[ :êî­(ÆG½`ÂEcuœ3ôu8%£P"F»8žÂ>׫m¥åò²væÄÃ3yTµÍÝ;‡›Ÿ Ÿ,5Ê$}ÔÙC(Ò—qé½×ñÕHè¼Û£e?^KxꬋF ¢¸Ä†Ó° ã8YÜšäÁ|ŠÎGäoN}Q‘G9ùPòìu5À`l§OKjð8ñn¦}*û=.VµÛ7GvX}ºm·9_¿¶nj«3§~Güðäšâ;ŠNRŸS¸ŸX2V¿¡þPar§Êúè¤<¹!¶KK6HK †½+ãï¾ZúÒŒöW˜èg”vÐËz£$+sÞ¶9>€±œ”º¾Š¯2¿îPaÚ4Š§-¾g‰ÙV¸NþDª*)ËÒ‘ÍÔæ›×œtÓŽ„ï‘ÝÆrèjØ¡m˜a Jà¬]húî’T·9 Û¿+ÌD¶L7€ïJeq2Ê”pä¾öÙõ=”Ôº¶Aâ?|o7¤jÙà·‰*cœ¢ZZxf 3u÷_œýÖ‘c¼Ø xU•yÏágÝ¿÷‘·Ñkÿ5*BGûy6s{´J\qógó¡•ËŸ\¼á^Œ š_5™î -¿bzá1P¶ómŽ÷ðýŽúƵîãNLMÿ1Ç„ ìñÍ@Ãq§*Àæ’’˜É -Œ¹Â|xg óåpVìGS Gk¼²åZkÑÈN`¡w/C"}y<¿R6_Þz=lŸ®bi9­DÚĦÒÌ5MŽ¨Ã¨¹ZàW'e¢@×ÃÀœT¬ÜÄl`ïÞôÑõØ}¨N-å¡]L»Û!·RæjCy{? vPÉ7î+ÁâëîºNàÛʬ™‚}صÛR´èÝ6ÍI6… M˜“»Ñ¯ªÁ%óÆÃg¾lƒðxºÏÔ› aùb±í¹ÜŠý†êo_Ëì2sbù|ÍH$¼‘3ng^øhùÈ -˜}jK‘¦g•¤ã^‚9ý¯-×Óî«õ\HB ð÷Úq¬ ìˆ÷w ‰3†aã Øši„Jh¨j²Èk«2T£»p`"%eÙejÈÏ#š>ÅЛ³àÖø®ª)Iºbƒƒ¾í´lÑ–VÂؤ•*QèÓ‘e¼D~8³¥© =µí±Ö¢¸Ke¥˜ÜQäV¸o“öO“ðÙlEQºf’CÏ#½ãë_YˆÍ’ºðw"˜1UYöàÅápÉÌs3)a%Œ.nV ŠñÓeÕ>0…»FÒF‘øú‡þ‚áé… ÂHnmWÓßÒð›ax &êÓ²Zƒ÷˜|ò¾æè¶Ø{Ó_ؾõ9³48ž²]†™ßîÙô¦¼ŠËRSÔ-ˆìÀˆ…Øƪ”s7%Í”ýNî³d‘ß½X¿ç´3|ÆÅà<,È©øW6; {­ŽqOHS…”]`ÏVIØ D›gƒßóžO‘…zz)Ld ÷«xâ@ࢶœ‹•¬” }φÖÁ’øpø¸Îa± ðÊënðªÿòiâýW^!ó3pdrê—ÎÅ üT~IàÊcùÔјײãö5+¬'ýUB§ÒO-Wãô/èñQ­®(†ø'®ªÃMÓz£i\CƲV²Q Èõ(ÜâânS3íb="¼¾É6–P]÷`vù¹:QoMæ©òh&0æ0›³„`[éæ¤Ñ/q«l*nøºbØÞEjÕ@oLl^«{V’ÅíÊTX§.ó$“*«Ôçt#ðØRÂðIƒ¥{–;Ö:k™m9Ǫ‘Jé½ Ùi-#ûN s<6ôFÅ.Z Ê2ÓÁ‡/2;h)gOØdÐ~ÑUÞä4vÿ +ûÙÀL·žÌr¤0aY0Ê çp*ðà VYð–ùc Îè´Tt°ŒKØû“ç¤n«ñ'N«Ä¢4剛­ ç[sBÄák¿æù Ä!cŠ²Àß –ÇÖúCëÁóù9A‚½àvV–YP­åÁÊxúõðtœM§féMV£û¢Õ¿½»ºü~ï1ìwl>ÇCéDToâyZ‹ÅGT{`ohxÅkÐùk#´“ ➀ž§> endobj -4095 0 obj << -/Type /Encoding -/Differences [2/fi/fl 16/caron 30/grave 33/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright/parenleft/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash/bracketright 95/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/asciitilde 147/quotedblleft/quotedblright/bullet/endash/emdash 154/scaron 180/acute 229/aring 233/eacute 235/edieresis] ->> endobj -924 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /EOEKOR+CMMI10 -/FontDescriptor 4109 0 R -/FirstChar 45 -/LastChar 62 -/Widths 4101 0 R ->> endobj -923 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /VOYJCW+CMSY10 -/FontDescriptor 4111 0 R -/FirstChar 1 -/LastChar 32 -/Widths 4102 0 R ->> endobj -3911 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /TPKZYA+LCIRCLE10 -/FontDescriptor 4113 0 R -/FirstChar 118 -/LastChar 118 -/Widths 4094 0 R ->> endobj -3200 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /DQDZYQ+NimbusMonL-Bold -/FontDescriptor 4115 0 R -/FirstChar 45 -/LastChar 122 -/Widths 4099 0 R -/Encoding 4095 0 R ->> endobj -3713 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /LVTGMN+NimbusMonL-BoldObli -/FontDescriptor 4117 0 R -/FirstChar 46 -/LastChar 120 -/Widths 4096 0 R -/Encoding 4095 0 R ->> endobj -909 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /OZMLTC+NimbusMonL-Regu -/FontDescriptor 4119 0 R -/FirstChar 16 -/LastChar 233 -/Widths 4103 0 R -/Encoding 4095 0 R ->> endobj -977 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /CFFDXI+NimbusMonL-ReguObli -/FontDescriptor 4121 0 R -/FirstChar 36 -/LastChar 122 -/Widths 4100 0 R -/Encoding 4095 0 R ->> endobj -695 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /FYSERL+NimbusSanL-Bold -/FontDescriptor 4123 0 R -/FirstChar 2 -/LastChar 122 -/Widths 4105 0 R -/Encoding 4095 0 R ->> endobj -692 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /LHPKHM+NimbusSanL-Regu -/FontDescriptor 4125 0 R -/FirstChar 40 -/LastChar 121 -/Widths 4106 0 R -/Encoding 4095 0 R ->> endobj -3707 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /AJQUXG+NimbusSanL-ReguItal -/FontDescriptor 4127 0 R -/FirstChar 104 -/LastChar 119 -/Widths 4097 0 R -/Encoding 4095 0 R ->> endobj -739 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /OEXEGJ+NimbusRomNo9L-Medi -/FontDescriptor 4129 0 R -/FirstChar 2 -/LastChar 150 -/Widths 4104 0 R -/Encoding 4095 0 R ->> endobj -691 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /EXZGHA+NimbusRomNo9L-Regu -/FontDescriptor 4131 0 R -/FirstChar 2 -/LastChar 235 -/Widths 4107 0 R -/Encoding 4095 0 R ->> endobj -3706 0 obj << -/Type /Font -/Subtype /Type1 -/BaseFont /YNJMKH+NimbusRomNo9L-ReguItal -/FontDescriptor 4133 0 R -/FirstChar 2 -/LastChar 122 -/Widths 4098 0 R -/Encoding 4095 0 R ->> endobj -696 0 obj << -/Type /Pages -/Count 6 -/Parent 4134 0 R -/Kids [686 0 R 736 0 R 775 0 R 816 0 R 859 0 R 886 0 R] ->> endobj -901 0 obj << -/Type /Pages -/Count 6 -/Parent 4134 0 R -/Kids [898 0 R 904 0 R 931 0 R 962 0 R 979 0 R 1007 0 R] ->> endobj -1075 0 obj << -/Type /Pages -/Count 6 -/Parent 4134 0 R -/Kids [1044 0 R 1077 0 R 1111 0 R 1146 0 R 1183 0 R 1227 0 R] ->> endobj -1285 0 obj << -/Type /Pages -/Count 6 -/Parent 4134 0 R -/Kids [1260 0 R 1287 0 R 1314 0 R 1335 0 R 1350 0 R 1359 0 R] ->> endobj -1433 0 obj << -/Type /Pages -/Count 6 -/Parent 4134 0 R -/Kids [1397 0 R 1435 0 R 1473 0 R 1508 0 R 1546 0 R 1587 0 R] ->> endobj -1662 0 obj << -/Type /Pages -/Count 6 -/Parent 4134 0 R -/Kids [1623 0 R 1664 0 R 1704 0 R 1732 0 R 1764 0 R 1801 0 R] ->> endobj -1839 0 obj << -/Type /Pages -/Count 6 -/Parent 4135 0 R -/Kids [1833 0 R 1841 0 R 1872 0 R 1909 0 R 1952 0 R 1974 0 R] ->> endobj -2039 0 obj << -/Type /Pages -/Count 6 -/Parent 4135 0 R -/Kids [1998 0 R 2041 0 R 2089 0 R 2124 0 R 2158 0 R 2201 0 R] ->> endobj -2291 0 obj << -/Type /Pages -/Count 6 -/Parent 4135 0 R -/Kids [2247 0 R 2293 0 R 2328 0 R 2366 0 R 2413 0 R 2461 0 R] ->> endobj -2545 0 obj << -/Type /Pages -/Count 6 -/Parent 4135 0 R -/Kids [2504 0 R 2547 0 R 2597 0 R 2647 0 R 2698 0 R 2744 0 R] ->> endobj -2826 0 obj << -/Type /Pages -/Count 6 -/Parent 4135 0 R -/Kids [2782 0 R 2828 0 R 2860 0 R 2887 0 R 2931 0 R 2987 0 R] ->> endobj -3060 0 obj << -/Type /Pages -/Count 6 -/Parent 4135 0 R -/Kids [3024 0 R 3062 0 R 3096 0 R 3119 0 R 3163 0 R 3190 0 R] ->> endobj -3239 0 obj << -/Type /Pages -/Count 6 -/Parent 4136 0 R -/Kids [3205 0 R 3241 0 R 3277 0 R 3316 0 R 3359 0 R 3396 0 R] ->> endobj -3492 0 obj << -/Type /Pages -/Count 6 -/Parent 4136 0 R -/Kids [3437 0 R 3494 0 R 3553 0 R 3585 0 R 3623 0 R 3657 0 R] ->> endobj -3708 0 obj << -/Type /Pages -/Count 6 -/Parent 4136 0 R -/Kids [3685 0 R 3710 0 R 3716 0 R 3722 0 R 3728 0 R 3734 0 R] ->> endobj -3749 0 obj << -/Type /Pages -/Count 6 -/Parent 4136 0 R -/Kids [3742 0 R 3754 0 R 3761 0 R 3767 0 R 3771 0 R 3778 0 R] ->> endobj -3793 0 obj << -/Type /Pages -/Count 6 -/Parent 4136 0 R -/Kids [3786 0 R 3795 0 R 3800 0 R 3806 0 R 3810 0 R 3814 0 R] ->> endobj -3822 0 obj << -/Type /Pages -/Count 6 -/Parent 4136 0 R -/Kids [3818 0 R 3824 0 R 3828 0 R 3832 0 R 3837 0 R 3841 0 R] ->> endobj -3849 0 obj << -/Type /Pages -/Count 6 -/Parent 4137 0 R -/Kids [3845 0 R 3851 0 R 3855 0 R 3859 0 R 3863 0 R 3870 0 R] ->> endobj -3882 0 obj << -/Type /Pages -/Count 6 -/Parent 4137 0 R -/Kids [3877 0 R 3885 0 R 3892 0 R 3896 0 R 3903 0 R 3936 0 R] ->> endobj -3955 0 obj << -/Type /Pages -/Count 6 -/Parent 4137 0 R -/Kids [3952 0 R 3957 0 R 3965 0 R 3975 0 R 4011 0 R 4017 0 R] ->> endobj -4034 0 obj << -/Type /Pages -/Count 6 -/Parent 4137 0 R -/Kids [4021 0 R 4036 0 R 4041 0 R 4072 0 R 4077 0 R 4084 0 R] ->> endobj -4093 0 obj << -/Type /Pages -/Count 1 -/Parent 4137 0 R -/Kids [4089 0 R] ->> endobj -4134 0 obj << -/Type /Pages -/Count 36 -/Parent 4138 0 R -/Kids [696 0 R 901 0 R 1075 0 R 1285 0 R 1433 0 R 1662 0 R] ->> endobj -4135 0 obj << -/Type /Pages -/Count 36 -/Parent 4138 0 R -/Kids [1839 0 R 2039 0 R 2291 0 R 2545 0 R 2826 0 R 3060 0 R] ->> endobj -4136 0 obj << -/Type /Pages -/Count 36 -/Parent 4138 0 R -/Kids [3239 0 R 3492 0 R 3708 0 R 3749 0 R 3793 0 R 3822 0 R] ->> endobj -4137 0 obj << -/Type /Pages -/Count 25 -/Parent 4138 0 R -/Kids [3849 0 R 3882 0 R 3955 0 R 4034 0 R 4093 0 R] ->> endobj -4138 0 obj << -/Type /Pages -/Count 133 -/Kids [4134 0 R 4135 0 R 4136 0 R 4137 0 R] ->> endobj -4139 0 obj << -/Type /Outlines -/First 3 0 R -/Last 683 0 R -/Count 37 ->> endobj -683 0 obj << -/Title 684 0 R -/A 681 0 R -/Parent 4139 0 R -/Prev 679 0 R ->> endobj -679 0 obj << -/Title 680 0 R -/A 677 0 R -/Parent 4139 0 R -/Prev 675 0 R -/Next 683 0 R ->> endobj -675 0 obj << -/Title 676 0 R -/A 673 0 R -/Parent 4139 0 R -/Prev 671 0 R -/Next 679 0 R ->> endobj -671 0 obj << -/Title 672 0 R -/A 669 0 R -/Parent 4139 0 R -/Prev 667 0 R -/Next 675 0 R ->> endobj -667 0 obj << -/Title 668 0 R -/A 665 0 R -/Parent 4139 0 R -/Prev 663 0 R -/Next 671 0 R ->> endobj -663 0 obj << -/Title 664 0 R -/A 661 0 R -/Parent 4139 0 R -/Prev 659 0 R -/Next 667 0 R ->> endobj -659 0 obj << -/Title 660 0 R -/A 657 0 R -/Parent 4139 0 R -/Prev 655 0 R -/Next 663 0 R ->> endobj -655 0 obj << -/Title 656 0 R -/A 653 0 R -/Parent 4139 0 R -/Prev 651 0 R -/Next 659 0 R ->> endobj -651 0 obj << -/Title 652 0 R -/A 649 0 R -/Parent 4139 0 R -/Prev 647 0 R -/Next 655 0 R ->> endobj -647 0 obj << -/Title 648 0 R -/A 645 0 R -/Parent 4139 0 R -/Prev 643 0 R -/Next 651 0 R ->> endobj -643 0 obj << -/Title 644 0 R -/A 641 0 R -/Parent 4139 0 R -/Prev 639 0 R -/Next 647 0 R ->> endobj -639 0 obj << -/Title 640 0 R -/A 637 0 R -/Parent 4139 0 R -/Prev 635 0 R -/Next 643 0 R ->> endobj -635 0 obj << -/Title 636 0 R -/A 633 0 R -/Parent 4139 0 R -/Prev 631 0 R -/Next 639 0 R ->> endobj -631 0 obj << -/Title 632 0 R -/A 629 0 R -/Parent 4139 0 R -/Prev 627 0 R -/Next 635 0 R ->> endobj -627 0 obj << -/Title 628 0 R -/A 625 0 R -/Parent 4139 0 R -/Prev 623 0 R -/Next 631 0 R ->> endobj -623 0 obj << -/Title 624 0 R -/A 621 0 R -/Parent 4139 0 R -/Prev 619 0 R -/Next 627 0 R ->> endobj -619 0 obj << -/Title 620 0 R -/A 617 0 R -/Parent 4139 0 R -/Prev 595 0 R -/Next 623 0 R ->> endobj -615 0 obj << -/Title 616 0 R -/A 613 0 R -/Parent 595 0 R -/Prev 611 0 R ->> endobj -611 0 obj << -/Title 612 0 R -/A 609 0 R -/Parent 595 0 R -/Prev 607 0 R -/Next 615 0 R ->> endobj -607 0 obj << -/Title 608 0 R -/A 605 0 R -/Parent 595 0 R -/Prev 603 0 R -/Next 611 0 R ->> endobj -603 0 obj << -/Title 604 0 R -/A 601 0 R -/Parent 595 0 R -/Prev 599 0 R -/Next 607 0 R ->> endobj -599 0 obj << -/Title 600 0 R -/A 597 0 R -/Parent 595 0 R -/Next 603 0 R ->> endobj -595 0 obj << -/Title 596 0 R -/A 593 0 R -/Parent 4139 0 R -/Prev 591 0 R -/Next 619 0 R -/First 599 0 R -/Last 615 0 R -/Count -5 ->> endobj -591 0 obj << -/Title 592 0 R -/A 589 0 R -/Parent 4139 0 R -/Prev 551 0 R -/Next 595 0 R ->> endobj -587 0 obj << -/Title 588 0 R -/A 585 0 R -/Parent 551 0 R -/Prev 583 0 R ->> endobj -583 0 obj << -/Title 584 0 R -/A 581 0 R -/Parent 551 0 R -/Prev 579 0 R -/Next 587 0 R ->> endobj -579 0 obj << -/Title 580 0 R -/A 577 0 R -/Parent 551 0 R -/Prev 575 0 R -/Next 583 0 R ->> endobj -575 0 obj << -/Title 576 0 R -/A 573 0 R -/Parent 551 0 R -/Prev 571 0 R -/Next 579 0 R ->> endobj -571 0 obj << -/Title 572 0 R -/A 569 0 R -/Parent 551 0 R -/Prev 567 0 R -/Next 575 0 R ->> endobj -567 0 obj << -/Title 568 0 R -/A 565 0 R -/Parent 551 0 R -/Prev 563 0 R -/Next 571 0 R ->> endobj -563 0 obj << -/Title 564 0 R -/A 561 0 R -/Parent 551 0 R -/Prev 559 0 R -/Next 567 0 R ->> endobj -559 0 obj << -/Title 560 0 R -/A 557 0 R -/Parent 551 0 R -/Prev 555 0 R -/Next 563 0 R ->> endobj -555 0 obj << -/Title 556 0 R -/A 553 0 R -/Parent 551 0 R -/Next 559 0 R ->> endobj -551 0 obj << -/Title 552 0 R -/A 549 0 R -/Parent 4139 0 R -/Prev 531 0 R -/Next 591 0 R -/First 555 0 R -/Last 587 0 R -/Count -9 ->> endobj -547 0 obj << -/Title 548 0 R -/A 545 0 R -/Parent 531 0 R -/Prev 543 0 R ->> endobj -543 0 obj << -/Title 544 0 R -/A 541 0 R -/Parent 531 0 R -/Prev 539 0 R -/Next 547 0 R ->> endobj -539 0 obj << -/Title 540 0 R -/A 537 0 R -/Parent 531 0 R -/Prev 535 0 R -/Next 543 0 R ->> endobj -535 0 obj << -/Title 536 0 R -/A 533 0 R -/Parent 531 0 R -/Next 539 0 R ->> endobj -531 0 obj << -/Title 532 0 R -/A 529 0 R -/Parent 4139 0 R -/Prev 495 0 R -/Next 551 0 R -/First 535 0 R -/Last 547 0 R -/Count -4 ->> endobj -527 0 obj << -/Title 528 0 R -/A 525 0 R -/Parent 495 0 R -/Prev 523 0 R ->> endobj -523 0 obj << -/Title 524 0 R -/A 521 0 R -/Parent 495 0 R -/Prev 519 0 R -/Next 527 0 R ->> endobj -519 0 obj << -/Title 520 0 R -/A 517 0 R -/Parent 495 0 R -/Prev 515 0 R -/Next 523 0 R ->> endobj -515 0 obj << -/Title 516 0 R -/A 513 0 R -/Parent 495 0 R -/Prev 511 0 R -/Next 519 0 R ->> endobj -511 0 obj << -/Title 512 0 R -/A 509 0 R -/Parent 495 0 R -/Prev 507 0 R -/Next 515 0 R ->> endobj -507 0 obj << -/Title 508 0 R -/A 505 0 R -/Parent 495 0 R -/Prev 503 0 R -/Next 511 0 R ->> endobj -503 0 obj << -/Title 504 0 R -/A 501 0 R -/Parent 495 0 R -/Prev 499 0 R -/Next 507 0 R ->> endobj -499 0 obj << -/Title 500 0 R -/A 497 0 R -/Parent 495 0 R -/Next 503 0 R ->> endobj -495 0 obj << -/Title 496 0 R -/A 493 0 R -/Parent 4139 0 R -/Prev 463 0 R -/Next 531 0 R -/First 499 0 R -/Last 527 0 R -/Count -8 ->> endobj -491 0 obj << -/Title 492 0 R -/A 489 0 R -/Parent 463 0 R -/Prev 487 0 R ->> endobj -487 0 obj << -/Title 488 0 R -/A 485 0 R -/Parent 463 0 R -/Prev 483 0 R -/Next 491 0 R ->> endobj -483 0 obj << -/Title 484 0 R -/A 481 0 R -/Parent 463 0 R -/Prev 479 0 R -/Next 487 0 R ->> endobj -479 0 obj << -/Title 480 0 R -/A 477 0 R -/Parent 463 0 R -/Prev 475 0 R -/Next 483 0 R ->> endobj -475 0 obj << -/Title 476 0 R -/A 473 0 R -/Parent 463 0 R -/Prev 471 0 R -/Next 479 0 R ->> endobj -471 0 obj << -/Title 472 0 R -/A 469 0 R -/Parent 463 0 R -/Prev 467 0 R -/Next 475 0 R ->> endobj -467 0 obj << -/Title 468 0 R -/A 465 0 R -/Parent 463 0 R -/Next 471 0 R ->> endobj -463 0 obj << -/Title 464 0 R -/A 461 0 R -/Parent 4139 0 R -/Prev 431 0 R -/Next 495 0 R -/First 467 0 R -/Last 491 0 R -/Count -7 ->> endobj -459 0 obj << -/Title 460 0 R -/A 457 0 R -/Parent 431 0 R -/Prev 455 0 R ->> endobj -455 0 obj << -/Title 456 0 R -/A 453 0 R -/Parent 431 0 R -/Prev 451 0 R -/Next 459 0 R ->> endobj -451 0 obj << -/Title 452 0 R -/A 449 0 R -/Parent 431 0 R -/Prev 447 0 R -/Next 455 0 R ->> endobj -447 0 obj << -/Title 448 0 R -/A 445 0 R -/Parent 431 0 R -/Prev 443 0 R -/Next 451 0 R ->> endobj -443 0 obj << -/Title 444 0 R -/A 441 0 R -/Parent 431 0 R -/Prev 439 0 R -/Next 447 0 R ->> endobj -439 0 obj << -/Title 440 0 R -/A 437 0 R -/Parent 431 0 R -/Prev 435 0 R -/Next 443 0 R ->> endobj -435 0 obj << -/Title 436 0 R -/A 433 0 R -/Parent 431 0 R -/Next 439 0 R ->> endobj -431 0 obj << -/Title 432 0 R -/A 429 0 R -/Parent 4139 0 R -/Prev 367 0 R -/Next 463 0 R -/First 435 0 R -/Last 459 0 R -/Count -7 ->> endobj -427 0 obj << -/Title 428 0 R -/A 425 0 R -/Parent 367 0 R -/Prev 423 0 R ->> endobj -423 0 obj << -/Title 424 0 R -/A 421 0 R -/Parent 367 0 R -/Prev 419 0 R -/Next 427 0 R ->> endobj -419 0 obj << -/Title 420 0 R -/A 417 0 R -/Parent 367 0 R -/Prev 415 0 R -/Next 423 0 R ->> endobj -415 0 obj << -/Title 416 0 R -/A 413 0 R -/Parent 367 0 R -/Prev 411 0 R -/Next 419 0 R ->> endobj -411 0 obj << -/Title 412 0 R -/A 409 0 R -/Parent 367 0 R -/Prev 407 0 R -/Next 415 0 R ->> endobj -407 0 obj << -/Title 408 0 R -/A 405 0 R -/Parent 367 0 R -/Prev 403 0 R -/Next 411 0 R ->> endobj -403 0 obj << -/Title 404 0 R -/A 401 0 R -/Parent 367 0 R -/Prev 399 0 R -/Next 407 0 R ->> endobj -399 0 obj << -/Title 400 0 R -/A 397 0 R -/Parent 367 0 R -/Prev 395 0 R -/Next 403 0 R ->> endobj -395 0 obj << -/Title 396 0 R -/A 393 0 R -/Parent 367 0 R -/Prev 391 0 R -/Next 399 0 R ->> endobj -391 0 obj << -/Title 392 0 R -/A 389 0 R -/Parent 367 0 R -/Prev 387 0 R -/Next 395 0 R ->> endobj -387 0 obj << -/Title 388 0 R -/A 385 0 R -/Parent 367 0 R -/Prev 383 0 R -/Next 391 0 R ->> endobj -383 0 obj << -/Title 384 0 R -/A 381 0 R -/Parent 367 0 R -/Prev 379 0 R -/Next 387 0 R ->> endobj -379 0 obj << -/Title 380 0 R -/A 377 0 R -/Parent 367 0 R -/Prev 375 0 R -/Next 383 0 R ->> endobj -375 0 obj << -/Title 376 0 R -/A 373 0 R -/Parent 367 0 R -/Prev 371 0 R -/Next 379 0 R ->> endobj -371 0 obj << -/Title 372 0 R -/A 369 0 R -/Parent 367 0 R -/Next 375 0 R ->> endobj -367 0 obj << -/Title 368 0 R -/A 365 0 R -/Parent 4139 0 R -/Prev 327 0 R -/Next 431 0 R -/First 371 0 R -/Last 427 0 R -/Count -15 ->> endobj -363 0 obj << -/Title 364 0 R -/A 361 0 R -/Parent 327 0 R -/Prev 359 0 R ->> endobj -359 0 obj << -/Title 360 0 R -/A 357 0 R -/Parent 327 0 R -/Prev 355 0 R -/Next 363 0 R ->> endobj -355 0 obj << -/Title 356 0 R -/A 353 0 R -/Parent 327 0 R -/Prev 351 0 R -/Next 359 0 R ->> endobj -351 0 obj << -/Title 352 0 R -/A 349 0 R -/Parent 327 0 R -/Prev 347 0 R -/Next 355 0 R ->> endobj -347 0 obj << -/Title 348 0 R -/A 345 0 R -/Parent 327 0 R -/Prev 343 0 R -/Next 351 0 R ->> endobj -343 0 obj << -/Title 344 0 R -/A 341 0 R -/Parent 327 0 R -/Prev 339 0 R -/Next 347 0 R ->> endobj -339 0 obj << -/Title 340 0 R -/A 337 0 R -/Parent 327 0 R -/Prev 335 0 R -/Next 343 0 R ->> endobj -335 0 obj << -/Title 336 0 R -/A 333 0 R -/Parent 327 0 R -/Prev 331 0 R -/Next 339 0 R ->> endobj -331 0 obj << -/Title 332 0 R -/A 329 0 R -/Parent 327 0 R -/Next 335 0 R ->> endobj -327 0 obj << -/Title 328 0 R -/A 325 0 R -/Parent 4139 0 R -/Prev 323 0 R -/Next 367 0 R -/First 331 0 R -/Last 363 0 R -/Count -9 ->> endobj -323 0 obj << -/Title 324 0 R -/A 321 0 R -/Parent 4139 0 R -/Prev 243 0 R -/Next 327 0 R ->> endobj -319 0 obj << -/Title 320 0 R -/A 317 0 R -/Parent 243 0 R -/Prev 315 0 R ->> endobj -315 0 obj << -/Title 316 0 R -/A 313 0 R -/Parent 243 0 R -/Prev 311 0 R -/Next 319 0 R ->> endobj -311 0 obj << -/Title 312 0 R -/A 309 0 R -/Parent 243 0 R -/Prev 307 0 R -/Next 315 0 R ->> endobj -307 0 obj << -/Title 308 0 R -/A 305 0 R -/Parent 243 0 R -/Prev 303 0 R -/Next 311 0 R ->> endobj -303 0 obj << -/Title 304 0 R -/A 301 0 R -/Parent 243 0 R -/Prev 299 0 R -/Next 307 0 R ->> endobj -299 0 obj << -/Title 300 0 R -/A 297 0 R -/Parent 243 0 R -/Prev 295 0 R -/Next 303 0 R ->> endobj -295 0 obj << -/Title 296 0 R -/A 293 0 R -/Parent 243 0 R -/Prev 291 0 R -/Next 299 0 R ->> endobj -291 0 obj << -/Title 292 0 R -/A 289 0 R -/Parent 243 0 R -/Prev 287 0 R -/Next 295 0 R ->> endobj -287 0 obj << -/Title 288 0 R -/A 285 0 R -/Parent 243 0 R -/Prev 283 0 R -/Next 291 0 R ->> endobj -283 0 obj << -/Title 284 0 R -/A 281 0 R -/Parent 243 0 R -/Prev 279 0 R -/Next 287 0 R ->> endobj -279 0 obj << -/Title 280 0 R -/A 277 0 R -/Parent 243 0 R -/Prev 275 0 R -/Next 283 0 R ->> endobj -275 0 obj << -/Title 276 0 R -/A 273 0 R -/Parent 243 0 R -/Prev 271 0 R -/Next 279 0 R ->> endobj -271 0 obj << -/Title 272 0 R -/A 269 0 R -/Parent 243 0 R -/Prev 267 0 R -/Next 275 0 R ->> endobj -267 0 obj << -/Title 268 0 R -/A 265 0 R -/Parent 243 0 R -/Prev 263 0 R -/Next 271 0 R ->> endobj -263 0 obj << -/Title 264 0 R -/A 261 0 R -/Parent 243 0 R -/Prev 259 0 R -/Next 267 0 R ->> endobj -259 0 obj << -/Title 260 0 R -/A 257 0 R -/Parent 243 0 R -/Prev 255 0 R -/Next 263 0 R ->> endobj -255 0 obj << -/Title 256 0 R -/A 253 0 R -/Parent 243 0 R -/Prev 251 0 R -/Next 259 0 R ->> endobj -251 0 obj << -/Title 252 0 R -/A 249 0 R -/Parent 243 0 R -/Prev 247 0 R -/Next 255 0 R ->> endobj -247 0 obj << -/Title 248 0 R -/A 245 0 R -/Parent 243 0 R -/Next 251 0 R ->> endobj -243 0 obj << -/Title 244 0 R -/A 241 0 R -/Parent 4139 0 R -/Prev 207 0 R -/Next 323 0 R -/First 247 0 R -/Last 319 0 R -/Count -19 ->> endobj -239 0 obj << -/Title 240 0 R -/A 237 0 R -/Parent 207 0 R -/Prev 235 0 R ->> endobj -235 0 obj << -/Title 236 0 R -/A 233 0 R -/Parent 207 0 R -/Prev 231 0 R -/Next 239 0 R ->> endobj -231 0 obj << -/Title 232 0 R -/A 229 0 R -/Parent 207 0 R -/Prev 227 0 R -/Next 235 0 R ->> endobj -227 0 obj << -/Title 228 0 R -/A 225 0 R -/Parent 207 0 R -/Prev 223 0 R -/Next 231 0 R ->> endobj -223 0 obj << -/Title 224 0 R -/A 221 0 R -/Parent 207 0 R -/Prev 219 0 R -/Next 227 0 R ->> endobj -219 0 obj << -/Title 220 0 R -/A 217 0 R -/Parent 207 0 R -/Prev 215 0 R -/Next 223 0 R ->> endobj -215 0 obj << -/Title 216 0 R -/A 213 0 R -/Parent 207 0 R -/Prev 211 0 R -/Next 219 0 R ->> endobj -211 0 obj << -/Title 212 0 R -/A 209 0 R -/Parent 207 0 R -/Next 215 0 R ->> endobj -207 0 obj << -/Title 208 0 R -/A 205 0 R -/Parent 4139 0 R -/Prev 203 0 R -/Next 243 0 R -/First 211 0 R -/Last 239 0 R -/Count -8 ->> endobj -203 0 obj << -/Title 204 0 R -/A 201 0 R -/Parent 4139 0 R -/Prev 199 0 R -/Next 207 0 R ->> endobj -199 0 obj << -/Title 200 0 R -/A 197 0 R -/Parent 4139 0 R -/Prev 151 0 R -/Next 203 0 R ->> endobj -195 0 obj << -/Title 196 0 R -/A 193 0 R -/Parent 151 0 R -/Prev 191 0 R ->> endobj -191 0 obj << -/Title 192 0 R -/A 189 0 R -/Parent 151 0 R -/Prev 187 0 R -/Next 195 0 R ->> endobj -187 0 obj << -/Title 188 0 R -/A 185 0 R -/Parent 151 0 R -/Prev 183 0 R -/Next 191 0 R ->> endobj -183 0 obj << -/Title 184 0 R -/A 181 0 R -/Parent 151 0 R -/Prev 179 0 R -/Next 187 0 R ->> endobj -179 0 obj << -/Title 180 0 R -/A 177 0 R -/Parent 151 0 R -/Prev 175 0 R -/Next 183 0 R ->> endobj -175 0 obj << -/Title 176 0 R -/A 173 0 R -/Parent 151 0 R -/Prev 171 0 R -/Next 179 0 R ->> endobj -171 0 obj << -/Title 172 0 R -/A 169 0 R -/Parent 151 0 R -/Prev 167 0 R -/Next 175 0 R ->> endobj -167 0 obj << -/Title 168 0 R -/A 165 0 R -/Parent 151 0 R -/Prev 163 0 R -/Next 171 0 R ->> endobj -163 0 obj << -/Title 164 0 R -/A 161 0 R -/Parent 151 0 R -/Prev 159 0 R -/Next 167 0 R ->> endobj -159 0 obj << -/Title 160 0 R -/A 157 0 R -/Parent 151 0 R -/Prev 155 0 R -/Next 163 0 R ->> endobj -155 0 obj << -/Title 156 0 R -/A 153 0 R -/Parent 151 0 R -/Next 159 0 R ->> endobj -151 0 obj << -/Title 152 0 R -/A 149 0 R -/Parent 4139 0 R -/Prev 131 0 R -/Next 199 0 R -/First 155 0 R -/Last 195 0 R -/Count -11 ->> endobj -147 0 obj << -/Title 148 0 R -/A 145 0 R -/Parent 131 0 R -/Prev 143 0 R ->> endobj -143 0 obj << -/Title 144 0 R -/A 141 0 R -/Parent 131 0 R -/Prev 139 0 R -/Next 147 0 R ->> endobj -139 0 obj << -/Title 140 0 R -/A 137 0 R -/Parent 131 0 R -/Prev 135 0 R -/Next 143 0 R ->> endobj -135 0 obj << -/Title 136 0 R -/A 133 0 R -/Parent 131 0 R -/Next 139 0 R ->> endobj -131 0 obj << -/Title 132 0 R -/A 129 0 R -/Parent 4139 0 R -/Prev 91 0 R -/Next 151 0 R -/First 135 0 R -/Last 147 0 R -/Count -4 ->> endobj -127 0 obj << -/Title 128 0 R -/A 125 0 R -/Parent 91 0 R -/Prev 123 0 R ->> endobj -123 0 obj << -/Title 124 0 R -/A 121 0 R -/Parent 91 0 R -/Prev 119 0 R -/Next 127 0 R ->> endobj -119 0 obj << -/Title 120 0 R -/A 117 0 R -/Parent 91 0 R -/Prev 115 0 R -/Next 123 0 R ->> endobj -115 0 obj << -/Title 116 0 R -/A 113 0 R -/Parent 91 0 R -/Prev 111 0 R -/Next 119 0 R ->> endobj -111 0 obj << -/Title 112 0 R -/A 109 0 R -/Parent 91 0 R -/Prev 107 0 R -/Next 115 0 R ->> endobj -107 0 obj << -/Title 108 0 R -/A 105 0 R -/Parent 91 0 R -/Prev 103 0 R -/Next 111 0 R ->> endobj -103 0 obj << -/Title 104 0 R -/A 101 0 R -/Parent 91 0 R -/Prev 99 0 R -/Next 107 0 R ->> endobj -99 0 obj << -/Title 100 0 R -/A 97 0 R -/Parent 91 0 R -/Prev 95 0 R -/Next 103 0 R ->> endobj -95 0 obj << -/Title 96 0 R -/A 93 0 R -/Parent 91 0 R -/Next 99 0 R ->> endobj -91 0 obj << -/Title 92 0 R -/A 89 0 R -/Parent 4139 0 R -/Prev 51 0 R -/Next 131 0 R -/First 95 0 R -/Last 127 0 R -/Count -9 ->> endobj -87 0 obj << -/Title 88 0 R -/A 85 0 R -/Parent 51 0 R -/Prev 83 0 R ->> endobj -83 0 obj << -/Title 84 0 R -/A 81 0 R -/Parent 51 0 R -/Prev 79 0 R -/Next 87 0 R ->> endobj -79 0 obj << -/Title 80 0 R -/A 77 0 R -/Parent 51 0 R -/Prev 75 0 R -/Next 83 0 R ->> endobj -75 0 obj << -/Title 76 0 R -/A 73 0 R -/Parent 51 0 R -/Prev 71 0 R -/Next 79 0 R ->> endobj -71 0 obj << -/Title 72 0 R -/A 69 0 R -/Parent 51 0 R -/Prev 67 0 R -/Next 75 0 R ->> endobj -67 0 obj << -/Title 68 0 R -/A 65 0 R -/Parent 51 0 R -/Prev 63 0 R -/Next 71 0 R ->> endobj -63 0 obj << -/Title 64 0 R -/A 61 0 R -/Parent 51 0 R -/Prev 59 0 R -/Next 67 0 R ->> endobj -59 0 obj << -/Title 60 0 R -/A 57 0 R -/Parent 51 0 R -/Prev 55 0 R -/Next 63 0 R ->> endobj -55 0 obj << -/Title 56 0 R -/A 53 0 R -/Parent 51 0 R -/Next 59 0 R ->> endobj -51 0 obj << -/Title 52 0 R -/A 49 0 R -/Parent 4139 0 R -/Prev 35 0 R -/Next 91 0 R -/First 55 0 R -/Last 87 0 R -/Count -9 ->> endobj -47 0 obj << -/Title 48 0 R -/A 45 0 R -/Parent 35 0 R -/Prev 43 0 R ->> endobj -43 0 obj << -/Title 44 0 R -/A 41 0 R -/Parent 35 0 R -/Prev 39 0 R -/Next 47 0 R ->> endobj -39 0 obj << -/Title 40 0 R -/A 37 0 R -/Parent 35 0 R -/Next 43 0 R ->> endobj -35 0 obj << -/Title 36 0 R -/A 33 0 R -/Parent 4139 0 R -/Prev 3 0 R -/Next 51 0 R -/First 39 0 R -/Last 47 0 R -/Count -3 ->> endobj -31 0 obj << -/Title 32 0 R -/A 29 0 R -/Parent 3 0 R -/Prev 27 0 R ->> endobj -27 0 obj << -/Title 28 0 R -/A 25 0 R -/Parent 3 0 R -/Prev 23 0 R -/Next 31 0 R ->> endobj -23 0 obj << -/Title 24 0 R -/A 21 0 R -/Parent 3 0 R -/Prev 19 0 R -/Next 27 0 R ->> endobj -19 0 obj << -/Title 20 0 R -/A 17 0 R -/Parent 3 0 R -/Prev 15 0 R -/Next 23 0 R ->> endobj -15 0 obj << -/Title 16 0 R -/A 13 0 R -/Parent 3 0 R -/Prev 11 0 R -/Next 19 0 R ->> endobj -11 0 obj << -/Title 12 0 R -/A 9 0 R -/Parent 3 0 R -/Prev 7 0 R -/Next 15 0 R ->> endobj -7 0 obj << -/Title 8 0 R -/A 5 0 R -/Parent 3 0 R -/Next 11 0 R ->> endobj -3 0 obj << -/Title 4 0 R -/A 1 0 R -/Parent 4139 0 R -/Next 35 0 R -/First 7 0 R -/Last 31 0 R -/Count -7 ->> endobj -4140 0 obj << -/Names [(Doc-Start) 693 0 R (Item.1) 3899 0 R (Item.10) 3945 0 R (Item.11) 3946 0 R (Item.12) 3947 0 R (Item.13) 3948 0 R] -/Limits [(Doc-Start) (Item.13)] ->> endobj -4141 0 obj << -/Names [(Item.14) 3949 0 R (Item.15) 3950 0 R (Item.16) 3982 0 R (Item.17) 3983 0 R (Item.2) 3900 0 R (Item.3) 3901 0 R] -/Limits [(Item.14) (Item.3)] ->> endobj -4142 0 obj << -/Names [(Item.4) 3939 0 R (Item.5) 3940 0 R (Item.6) 3941 0 R (Item.7) 3942 0 R (Item.8) 3943 0 R (Item.9) 3944 0 R] -/Limits [(Item.4) (Item.9)] ->> endobj -4143 0 obj << -/Names [(V1.71.0) 3757 0 R (V1.71.0_Common) 3758 0 R (V1.71.0_Extensions) 3759 0 R (V1.71.0_FO) 3764 0 R (V1.71.0_HTML) 3765 0 R (V1.71.0_Highlighting) 3774 0 R] -/Limits [(V1.71.0) (V1.71.0_Highlighting)] ->> endobj -4144 0 obj << -/Names [(V1.71.0_Manpages) 3775 0 R (V1.71.0_Params) 3776 0 R (V1.71.0_Tools) 3781 0 R (V1.71.1) 3737 0 R (V1.71.1_Common) 3738 0 R (V1.71.1_FO) 3739 0 R] -/Limits [(V1.71.0_Manpages) (V1.71.1_FO)] ->> endobj -4145 0 obj << -/Names [(V1.71.1_HTML) 3740 0 R (V1.71.1_Highlighting) 3745 0 R (V1.71.1_Manpages) 3746 0 R (V1.71.1_Params) 3747 0 R (V1.71.1_Profiling) 3748 0 R (V1.72.0) 3705 0 R] -/Limits [(V1.71.1_HTML) (V1.72.0)] ->> endobj -4146 0 obj << -/Names [(V1.72.0_Common) 3714 0 R (V1.72.0_FO) 3719 0 R (V1.72.0_HTML) 3720 0 R (V1.72.0_Manpages) 3725 0 R (V1.72.0_Params) 3726 0 R (V1.72.0_Roundtrip) 3732 0 R] -/Limits [(V1.72.0_Common) (V1.72.0_Roundtrip)] ->> endobj -4147 0 obj << -/Names [(V1.72.0_Template) 3731 0 R (V1.73.0) 3199 0 R (V1.73.0_Common) 3226 0 R (V1.73.0_Eclipse) 3568 0 R (V1.73.0_FO) 3256 0 R (V1.73.0_Gentext) 3201 0 R] -/Limits [(V1.72.0_Template) (V1.73.0_Gentext)] ->> endobj -4148 0 obj << -/Names [(V1.73.0_HTML) 3319 0 R (V1.73.0_Highlighting) 3653 0 R (V1.73.0_JavaHelp) 3573 0 R (V1.73.0_Lib) 3663 0 R (V1.73.0_Manpages) 3413 0 R (V1.73.0_Params) 3588 0 R] -/Limits [(V1.73.0_HTML) (V1.73.0_Params)] ->> endobj -4149 0 obj << -/Names [(V1.73.0_Profiling) 3660 0 R (V1.73.0_Roundtrip) 3579 0 R (V1.73.0_Tools) 3667 0 R (V1.73.0_XSL-Saxon) 3673 0 R (V1.73.0_XSL-Xalan) 3688 0 R (V1.73.1) 3111 0 R] -/Limits [(V1.73.0_Profiling) (V1.73.1)] ->> endobj -4150 0 obj << -/Names [(V1.73.1_Eclipse) 3176 0 R (V1.73.1_FO) 3117 0 R (V1.73.1_Gentext) 3112 0 R (V1.73.1_HTML) 3133 0 R (V1.73.1_HTMLHelp) 3172 0 R (V1.73.1_JavaHelp) 3180 0 R] -/Limits [(V1.73.1_Eclipse) (V1.73.1_JavaHelp)] ->> endobj -4151 0 obj << -/Names [(V1.73.1_Manpages) 3166 0 R (V1.73.1_Params) 3193 0 R (V1.73.1_Roundtrip) 3184 0 R (V1.73.2) 3110 0 R (V1.74.0) 1972 0 R (V1.74.0_Common) 2011 0 R] -/Limits [(V1.73.1_Manpages) (V1.74.0_Common)] ->> endobj -4152 0 obj << -/Names [(V1.74.0_Eclipse) 2818 0 R (V1.74.0_Epub) 2754 0 R (V1.74.0_Extensions) 3065 0 R (V1.74.0_FO) 2105 0 R (V1.74.0_Gentext) 1977 0 R (V1.74.0_HTML) 2230 0 R] -/Limits [(V1.74.0_Eclipse) (V1.74.0_HTML)] ->> endobj -4153 0 obj << -/Names [(V1.74.0_HTMLHelp) 2812 0 R (V1.74.0_JavaHelp) 2838 0 R (V1.74.0_Manpages) 2353 0 R (V1.74.0_Params) 2890 0 R (V1.74.0_Profiling) 3027 0 R (V1.74.0_Roundtrip) 2844 0 R] -/Limits [(V1.74.0_HTMLHelp) (V1.74.0_Roundtrip)] ->> endobj -4154 0 obj << -/Names [(V1.74.0_Slides) 2875 0 R (V1.74.0_Tools) 3033 0 R (V1.74.0_Website) 2883 0 R (V1.74.0_XSL-Saxon) 3073 0 R (V1.74.0_XSL-Xalan) 3084 0 R (V1.74.0_XSL-libxslt) 3099 0 R] -/Limits [(V1.74.0_Slides) (V1.74.0_XSL-libxslt)] ->> endobj -4155 0 obj << -/Names [(V1.74.1) 1838 0 R (V1.74.2) 1837 0 R (V1.74.3) 1836 0 R (V1.75.0) 1348 0 R (V1.76.0) 976 0 R (V1.76.1) 965 0 R] -/Limits [(V1.74.1) (V1.76.1)] ->> endobj -4156 0 obj << -/Names [(V1.76.1_Common) 908 0 R (V1.76.1_Epub) 925 0 R (V1.76.1_Extensions) 956 0 R (V1.76.1_FO) 914 0 R (V1.76.1_HTML) 920 0 R (V1.76.1_Params) 953 0 R] -/Limits [(V1.76.1_Common) (V1.76.1_Params)] ->> endobj -4157 0 obj << -/Names [(V1.76.1_Webhelp) 940 0 R (V1560) 4087 0 R (V1570) 4082 0 R (V1580) 4081 0 R (V1591) 4080 0 R (V1592) 4075 0 R] -/Limits [(V1.76.1_Webhelp) (V1592)] ->> endobj -4158 0 obj << -/Names [(V1601) 4044 0 R (V1610) 4039 0 R (V1641) 4033 0 R (V1650) 4024 0 R (V1661) 4015 0 R (V1670) 4014 0 R] -/Limits [(V1601) (V1670)] ->> endobj -4159 0 obj << -/Names [(V1671) 3971 0 R (V1671_EXT) 3981 0 R (V1671_FO) 3972 0 R (V1671_HELP) 3979 0 R (V1671_HTML) 3978 0 R (V1671_MAN) 3980 0 R] -/Limits [(V1671) (V1671_MAN)] ->> endobj -4160 0 obj << -/Names [(V1672) 3970 0 R (V1680) 3961 0 R (V1680_FO) 3962 0 R (V1680_HTML) 3968 0 R (V1680_images) 3969 0 R (V1681) 3960 0 R] -/Limits [(V1672) (V1681)] ->> endobj -4161 0 obj << -/Names [(V1690) 3880 0 R (V1690_COMMON) 3881 0 R (V1690_FO) 3888 0 R (V1690_HELP) 3889 0 R (V1690_HTML) 3890 0 R (V1690_MAN) 3883 0 R] -/Limits [(V1690) (V1690_MAN)] ->> endobj -4162 0 obj << -/Names [(V1691) 3875 0 R (V1700) 3792 0 R (V1700_Common) 3798 0 R (V1700_Extensions) 3803 0 R (V1700_FO) 3804 0 R (V1700_HTML) 3821 0 R] -/Limits [(V1691) (V1700_HTML)] ->> endobj -4163 0 obj << -/Names [(V1700_Manpages) 3835 0 R (V1700_Params) 3848 0 R (V1700_Profiling) 3866 0 R (V1700_Tools) 3873 0 R (V1700_WordML) 3874 0 R (V1701) 3782 0 R] -/Limits [(V1700_Manpages) (V1701)] ->> endobj -4164 0 obj << -/Names [(V1701_FO) 3783 0 R (V1701_HTML) 3789 0 R (V1701_HTMLHelp) 3790 0 R (V1701_Params) 3791 0 R (VOlder) 4092 0 R (cocnt.1) 3910 0 R] -/Limits [(V1701_FO) (cocnt.1)] ->> endobj -4165 0 obj << -/Names [(cocnt.2) 3915 0 R (cocnt.3) 3917 0 R (cocnt.4) 3919 0 R (cocnt.5) 3921 0 R (cocnt.6) 3923 0 R (current) 907 0 R] -/Limits [(cocnt.2) (current)] ->> endobj -4166 0 obj << -/Names [(dot0) 902 0 R (lstlisting.-1) 910 0 R (lstlisting.-10) 938 0 R (lstlisting.-100) 1198 0 R (lstlisting.-101) 1200 0 R (lstlisting.-102) 1207 0 R] -/Limits [(dot0) (lstlisting.-102)] ->> endobj -4167 0 obj << -/Names [(lstlisting.-103) 1230 0 R (lstlisting.-104) 1232 0 R (lstlisting.-105) 1236 0 R (lstlisting.-106) 1243 0 R (lstlisting.-107) 1249 0 R (lstlisting.-108) 1253 0 R] -/Limits [(lstlisting.-103) (lstlisting.-108)] ->> endobj -4168 0 obj << -/Names [(lstlisting.-109) 1255 0 R (lstlisting.-11) 941 0 R (lstlisting.-110) 1257 0 R (lstlisting.-111) 1263 0 R (lstlisting.-112) 1265 0 R (lstlisting.-113) 1268 0 R] -/Limits [(lstlisting.-109) (lstlisting.-113)] ->> endobj -4169 0 obj << -/Names [(lstlisting.-114) 1272 0 R (lstlisting.-115) 1274 0 R (lstlisting.-116) 1276 0 R (lstlisting.-117) 1278 0 R (lstlisting.-118) 1281 0 R (lstlisting.-119) 1283 0 R] -/Limits [(lstlisting.-114) (lstlisting.-119)] ->> endobj -4170 0 obj << -/Names [(lstlisting.-12) 943 0 R (lstlisting.-120) 1291 0 R (lstlisting.-121) 1294 0 R (lstlisting.-122) 1296 0 R (lstlisting.-123) 1298 0 R (lstlisting.-124) 1301 0 R] -/Limits [(lstlisting.-12) (lstlisting.-124)] ->> endobj -4171 0 obj << -/Names [(lstlisting.-125) 1303 0 R (lstlisting.-126) 1306 0 R (lstlisting.-127) 1308 0 R (lstlisting.-128) 1311 0 R (lstlisting.-129) 1318 0 R (lstlisting.-13) 945 0 R] -/Limits [(lstlisting.-125) (lstlisting.-13)] ->> endobj -4172 0 obj << -/Names [(lstlisting.-130) 1321 0 R (lstlisting.-131) 1325 0 R (lstlisting.-132) 1327 0 R (lstlisting.-133) 1330 0 R (lstlisting.-134) 1332 0 R (lstlisting.-135) 1339 0 R] -/Limits [(lstlisting.-130) (lstlisting.-135)] ->> endobj -4173 0 obj << -/Names [(lstlisting.-136) 1341 0 R (lstlisting.-137) 1343 0 R (lstlisting.-138) 1346 0 R (lstlisting.-139) 1354 0 R (lstlisting.-14) 947 0 R (lstlisting.-140) 1356 0 R] -/Limits [(lstlisting.-136) (lstlisting.-140)] ->> endobj -4174 0 obj << -/Names [(lstlisting.-141) 1362 0 R (lstlisting.-142) 1365 0 R (lstlisting.-143) 1367 0 R (lstlisting.-144) 1369 0 R (lstlisting.-145) 1371 0 R (lstlisting.-146) 1373 0 R] -/Limits [(lstlisting.-141) (lstlisting.-146)] ->> endobj -4175 0 obj << -/Names [(lstlisting.-147) 1376 0 R (lstlisting.-148) 1378 0 R (lstlisting.-149) 1388 0 R (lstlisting.-15) 949 0 R (lstlisting.-150) 1391 0 R (lstlisting.-151) 1394 0 R] -/Limits [(lstlisting.-147) (lstlisting.-151)] ->> endobj -4176 0 obj << -/Names [(lstlisting.-152) 1400 0 R (lstlisting.-153) 1402 0 R (lstlisting.-154) 1406 0 R (lstlisting.-155) 1410 0 R (lstlisting.-156) 1413 0 R (lstlisting.-157) 1418 0 R] -/Limits [(lstlisting.-152) (lstlisting.-157)] ->> endobj -4177 0 obj << -/Names [(lstlisting.-158) 1422 0 R (lstlisting.-159) 1424 0 R (lstlisting.-16) 951 0 R (lstlisting.-160) 1426 0 R (lstlisting.-161) 1428 0 R (lstlisting.-162) 1431 0 R] -/Limits [(lstlisting.-158) (lstlisting.-162)] ->> endobj -4178 0 obj << -/Names [(lstlisting.-163) 1438 0 R (lstlisting.-164) 1441 0 R (lstlisting.-165) 1443 0 R (lstlisting.-166) 1445 0 R (lstlisting.-167) 1448 0 R (lstlisting.-168) 1450 0 R] -/Limits [(lstlisting.-163) (lstlisting.-168)] ->> endobj -4179 0 obj << -/Names [(lstlisting.-169) 1452 0 R (lstlisting.-17) 954 0 R (lstlisting.-170) 1454 0 R (lstlisting.-171) 1464 0 R (lstlisting.-172) 1467 0 R (lstlisting.-173) 1470 0 R] -/Limits [(lstlisting.-169) (lstlisting.-173)] ->> endobj -4180 0 obj << -/Names [(lstlisting.-174) 1476 0 R (lstlisting.-175) 1478 0 R (lstlisting.-176) 1480 0 R (lstlisting.-177) 1483 0 R (lstlisting.-178) 1486 0 R (lstlisting.-179) 1488 0 R] -/Limits [(lstlisting.-174) (lstlisting.-179)] ->> endobj -4181 0 obj << -/Names [(lstlisting.-18) 957 0 R (lstlisting.-180) 1490 0 R (lstlisting.-181) 1492 0 R (lstlisting.-182) 1495 0 R (lstlisting.-183) 1497 0 R (lstlisting.-184) 1500 0 R] -/Limits [(lstlisting.-18) (lstlisting.-184)] ->> endobj -4182 0 obj << -/Names [(lstlisting.-185) 1502 0 R (lstlisting.-186) 1504 0 R (lstlisting.-187) 1511 0 R (lstlisting.-188) 1514 0 R (lstlisting.-189) 1517 0 R (lstlisting.-19) 959 0 R] -/Limits [(lstlisting.-185) (lstlisting.-19)] ->> endobj -4183 0 obj << -/Names [(lstlisting.-190) 1519 0 R (lstlisting.-191) 1522 0 R (lstlisting.-192) 1525 0 R (lstlisting.-193) 1529 0 R (lstlisting.-194) 1531 0 R (lstlisting.-195) 1535 0 R] -/Limits [(lstlisting.-190) (lstlisting.-195)] ->> endobj -4184 0 obj << -/Names [(lstlisting.-196) 1539 0 R (lstlisting.-197) 1541 0 R (lstlisting.-198) 1543 0 R (lstlisting.-199) 1549 0 R (lstlisting.-2) 912 0 R (lstlisting.-20) 967 0 R] -/Limits [(lstlisting.-196) (lstlisting.-20)] ->> endobj -4185 0 obj << -/Names [(lstlisting.-200) 1551 0 R (lstlisting.-201) 1555 0 R (lstlisting.-202) 1557 0 R (lstlisting.-203) 1559 0 R (lstlisting.-204) 1562 0 R (lstlisting.-205) 1564 0 R] -/Limits [(lstlisting.-200) (lstlisting.-205)] ->> endobj -4186 0 obj << -/Names [(lstlisting.-206) 1566 0 R (lstlisting.-207) 1573 0 R (lstlisting.-208) 1575 0 R (lstlisting.-209) 1577 0 R (lstlisting.-21) 971 0 R (lstlisting.-210) 1580 0 R] -/Limits [(lstlisting.-206) (lstlisting.-210)] ->> endobj -4187 0 obj << -/Names [(lstlisting.-211) 1582 0 R (lstlisting.-212) 1584 0 R (lstlisting.-213) 1591 0 R (lstlisting.-214) 1594 0 R (lstlisting.-215) 1598 0 R (lstlisting.-216) 1601 0 R] -/Limits [(lstlisting.-211) (lstlisting.-216)] ->> endobj -4188 0 obj << -/Names [(lstlisting.-217) 1603 0 R (lstlisting.-218) 1606 0 R (lstlisting.-219) 1608 0 R (lstlisting.-22) 974 0 R (lstlisting.-220) 1610 0 R (lstlisting.-221) 1615 0 R] -/Limits [(lstlisting.-217) (lstlisting.-221)] ->> endobj -4189 0 obj << -/Names [(lstlisting.-222) 1618 0 R (lstlisting.-223) 1620 0 R (lstlisting.-224) 1626 0 R (lstlisting.-225) 1628 0 R (lstlisting.-226) 1632 0 R (lstlisting.-227) 1636 0 R] -/Limits [(lstlisting.-222) (lstlisting.-227)] ->> endobj -4190 0 obj << -/Names [(lstlisting.-228) 1638 0 R (lstlisting.-229) 1641 0 R (lstlisting.-23) 983 0 R (lstlisting.-230) 1643 0 R (lstlisting.-231) 1648 0 R (lstlisting.-232) 1652 0 R] -/Limits [(lstlisting.-228) (lstlisting.-232)] ->> endobj -4191 0 obj << -/Names [(lstlisting.-233) 1655 0 R (lstlisting.-234) 1660 0 R (lstlisting.-235) 1667 0 R (lstlisting.-236) 1670 0 R (lstlisting.-237) 1674 0 R (lstlisting.-238) 1677 0 R] -/Limits [(lstlisting.-233) (lstlisting.-238)] ->> endobj -4192 0 obj << -/Names [(lstlisting.-239) 1681 0 R (lstlisting.-24) 985 0 R (lstlisting.-240) 1685 0 R (lstlisting.-241) 1689 0 R (lstlisting.-242) 1691 0 R (lstlisting.-243) 1693 0 R] -/Limits [(lstlisting.-239) (lstlisting.-243)] ->> endobj -4193 0 obj << -/Names [(lstlisting.-244) 1695 0 R (lstlisting.-245) 1697 0 R (lstlisting.-246) 1699 0 R (lstlisting.-247) 1707 0 R (lstlisting.-248) 1710 0 R (lstlisting.-249) 1712 0 R] -/Limits [(lstlisting.-244) (lstlisting.-249)] ->> endobj -4194 0 obj << -/Names [(lstlisting.-25) 987 0 R (lstlisting.-250) 1715 0 R (lstlisting.-251) 1717 0 R (lstlisting.-252) 1719 0 R (lstlisting.-253) 1721 0 R (lstlisting.-254) 1723 0 R] -/Limits [(lstlisting.-25) (lstlisting.-254)] ->> endobj -4195 0 obj << -/Names [(lstlisting.-255) 1726 0 R (lstlisting.-256) 1729 0 R (lstlisting.-257) 1736 0 R (lstlisting.-258) 1738 0 R (lstlisting.-259) 1740 0 R (lstlisting.-26) 989 0 R] -/Limits [(lstlisting.-255) (lstlisting.-26)] ->> endobj -4196 0 obj << -/Names [(lstlisting.-260) 1742 0 R (lstlisting.-261) 1744 0 R (lstlisting.-262) 1746 0 R (lstlisting.-263) 1748 0 R (lstlisting.-264) 1750 0 R (lstlisting.-265) 1752 0 R] -/Limits [(lstlisting.-260) (lstlisting.-265)] ->> endobj -4197 0 obj << -/Names [(lstlisting.-266) 1755 0 R (lstlisting.-267) 1757 0 R (lstlisting.-268) 1759 0 R (lstlisting.-269) 1761 0 R (lstlisting.-27) 991 0 R (lstlisting.-270) 1768 0 R] -/Limits [(lstlisting.-266) (lstlisting.-270)] ->> endobj -4198 0 obj << -/Names [(lstlisting.-271) 1771 0 R (lstlisting.-272) 1773 0 R (lstlisting.-273) 1780 0 R (lstlisting.-274) 1783 0 R (lstlisting.-275) 1787 0 R (lstlisting.-276) 1789 0 R] -/Limits [(lstlisting.-271) (lstlisting.-276)] ->> endobj -4199 0 obj << -/Names [(lstlisting.-277) 1792 0 R (lstlisting.-278) 1796 0 R (lstlisting.-279) 1798 0 R (lstlisting.-28) 993 0 R (lstlisting.-280) 1804 0 R (lstlisting.-281) 1806 0 R] -/Limits [(lstlisting.-277) (lstlisting.-281)] ->> endobj -4200 0 obj << -/Names [(lstlisting.-282) 1808 0 R (lstlisting.-283) 1811 0 R (lstlisting.-284) 1813 0 R (lstlisting.-285) 1815 0 R (lstlisting.-286) 1818 0 R (lstlisting.-287) 1820 0 R] -/Limits [(lstlisting.-282) (lstlisting.-287)] ->> endobj -4201 0 obj << -/Names [(lstlisting.-288) 1822 0 R (lstlisting.-289) 1825 0 R (lstlisting.-29) 995 0 R (lstlisting.-290) 1829 0 R (lstlisting.-291) 1845 0 R (lstlisting.-292) 1847 0 R] -/Limits [(lstlisting.-288) (lstlisting.-292)] ->> endobj -4202 0 obj << -/Names [(lstlisting.-293) 1849 0 R (lstlisting.-294) 1851 0 R (lstlisting.-295) 1854 0 R (lstlisting.-296) 1856 0 R (lstlisting.-297) 1858 0 R (lstlisting.-298) 1861 0 R] -/Limits [(lstlisting.-293) (lstlisting.-298)] ->> endobj -4203 0 obj << -/Names [(lstlisting.-299) 1864 0 R (lstlisting.-3) 915 0 R (lstlisting.-30) 997 0 R (lstlisting.-300) 1866 0 R (lstlisting.-301) 1876 0 R (lstlisting.-302) 1878 0 R] -/Limits [(lstlisting.-299) (lstlisting.-302)] ->> endobj -4204 0 obj << -/Names [(lstlisting.-303) 1885 0 R (lstlisting.-304) 1892 0 R (lstlisting.-305) 1894 0 R (lstlisting.-306) 1899 0 R (lstlisting.-307) 1912 0 R (lstlisting.-308) 1921 0 R] -/Limits [(lstlisting.-303) (lstlisting.-308)] ->> endobj -4205 0 obj << -/Names [(lstlisting.-309) 1923 0 R (lstlisting.-31) 1000 0 R (lstlisting.-310) 1925 0 R (lstlisting.-311) 1927 0 R (lstlisting.-312) 1938 0 R (lstlisting.-313) 1941 0 R] -/Limits [(lstlisting.-309) (lstlisting.-313)] ->> endobj -4206 0 obj << -/Names [(lstlisting.-314) 1943 0 R (lstlisting.-315) 1945 0 R (lstlisting.-316) 1947 0 R (lstlisting.-317) 1956 0 R (lstlisting.-318) 1958 0 R (lstlisting.-319) 1961 0 R] -/Limits [(lstlisting.-314) (lstlisting.-319)] ->> endobj -4207 0 obj << -/Names [(lstlisting.-32) 1002 0 R (lstlisting.-320) 1967 0 R (lstlisting.-321) 1978 0 R (lstlisting.-322) 1980 0 R (lstlisting.-323) 1982 0 R (lstlisting.-324) 1984 0 R] -/Limits [(lstlisting.-32) (lstlisting.-324)] ->> endobj -4208 0 obj << -/Names [(lstlisting.-325) 1986 0 R (lstlisting.-326) 1989 0 R (lstlisting.-327) 1991 0 R (lstlisting.-328) 1993 0 R (lstlisting.-329) 2001 0 R (lstlisting.-33) 1004 0 R] -/Limits [(lstlisting.-325) (lstlisting.-33)] ->> endobj -4209 0 obj << -/Names [(lstlisting.-330) 2005 0 R (lstlisting.-331) 2007 0 R (lstlisting.-332) 2009 0 R (lstlisting.-333) 2012 0 R (lstlisting.-334) 2016 0 R (lstlisting.-335) 2018 0 R] -/Limits [(lstlisting.-330) (lstlisting.-335)] ->> endobj -4210 0 obj << -/Names [(lstlisting.-336) 2020 0 R (lstlisting.-337) 2024 0 R (lstlisting.-338) 2027 0 R (lstlisting.-339) 2063 0 R (lstlisting.-34) 1010 0 R (lstlisting.-340) 2068 0 R] -/Limits [(lstlisting.-336) (lstlisting.-340)] ->> endobj -4211 0 obj << -/Names [(lstlisting.-341) 2070 0 R (lstlisting.-342) 2073 0 R (lstlisting.-343) 2075 0 R (lstlisting.-344) 2078 0 R (lstlisting.-345) 2080 0 R (lstlisting.-346) 2092 0 R] -/Limits [(lstlisting.-341) (lstlisting.-346)] ->> endobj -4212 0 obj << -/Names [(lstlisting.-347) 2096 0 R (lstlisting.-348) 2098 0 R (lstlisting.-349) 2101 0 R (lstlisting.-35) 1013 0 R (lstlisting.-350) 2106 0 R (lstlisting.-351) 2108 0 R] -/Limits [(lstlisting.-347) (lstlisting.-351)] ->> endobj -4213 0 obj << -/Names [(lstlisting.-352) 2110 0 R (lstlisting.-353) 2112 0 R (lstlisting.-354) 2115 0 R (lstlisting.-355) 2117 0 R (lstlisting.-356) 2119 0 R (lstlisting.-357) 2121 0 R] -/Limits [(lstlisting.-352) (lstlisting.-357)] ->> endobj -4214 0 obj << -/Names [(lstlisting.-358) 2127 0 R (lstlisting.-359) 2129 0 R (lstlisting.-36) 1015 0 R (lstlisting.-360) 2131 0 R (lstlisting.-361) 2133 0 R (lstlisting.-362) 2136 0 R] -/Limits [(lstlisting.-358) (lstlisting.-362)] ->> endobj -4215 0 obj << -/Names [(lstlisting.-363) 2138 0 R (lstlisting.-364) 2140 0 R (lstlisting.-365) 2142 0 R (lstlisting.-366) 2144 0 R (lstlisting.-367) 2146 0 R (lstlisting.-368) 2148 0 R] -/Limits [(lstlisting.-363) (lstlisting.-368)] ->> endobj -4216 0 obj << -/Names [(lstlisting.-369) 2151 0 R (lstlisting.-37) 1017 0 R (lstlisting.-370) 2154 0 R (lstlisting.-371) 2161 0 R (lstlisting.-372) 2163 0 R (lstlisting.-373) 2165 0 R] -/Limits [(lstlisting.-369) (lstlisting.-373)] ->> endobj -4217 0 obj << -/Names [(lstlisting.-374) 2167 0 R (lstlisting.-375) 2169 0 R (lstlisting.-376) 2172 0 R (lstlisting.-377) 2178 0 R (lstlisting.-378) 2180 0 R (lstlisting.-379) 2182 0 R] -/Limits [(lstlisting.-374) (lstlisting.-379)] ->> endobj -4218 0 obj << -/Names [(lstlisting.-38) 1019 0 R (lstlisting.-380) 2186 0 R (lstlisting.-381) 2231 0 R (lstlisting.-382) 2233 0 R (lstlisting.-383) 2235 0 R (lstlisting.-384) 2237 0 R] -/Limits [(lstlisting.-38) (lstlisting.-384)] ->> endobj -4219 0 obj << -/Names [(lstlisting.-385) 2240 0 R (lstlisting.-386) 2250 0 R (lstlisting.-387) 2252 0 R (lstlisting.-388) 2257 0 R (lstlisting.-389) 2262 0 R (lstlisting.-39) 1021 0 R] -/Limits [(lstlisting.-385) (lstlisting.-39)] ->> endobj -4220 0 obj << -/Names [(lstlisting.-390) 2264 0 R (lstlisting.-391) 2266 0 R (lstlisting.-392) 2273 0 R (lstlisting.-393) 2286 0 R (lstlisting.-394) 2288 0 R (lstlisting.-395) 2296 0 R] -/Limits [(lstlisting.-390) (lstlisting.-395)] ->> endobj -4221 0 obj << -/Names [(lstlisting.-396) 2298 0 R (lstlisting.-397) 2300 0 R (lstlisting.-398) 2302 0 R (lstlisting.-399) 2305 0 R (lstlisting.-4) 918 0 R (lstlisting.-40) 1023 0 R] -/Limits [(lstlisting.-396) (lstlisting.-40)] ->> endobj -4222 0 obj << -/Names [(lstlisting.-400) 2307 0 R (lstlisting.-401) 2309 0 R (lstlisting.-402) 2311 0 R (lstlisting.-403) 2314 0 R (lstlisting.-404) 2319 0 R (lstlisting.-405) 2321 0 R] -/Limits [(lstlisting.-400) (lstlisting.-405)] ->> endobj -4223 0 obj << -/Names [(lstlisting.-406) 2323 0 R (lstlisting.-407) 2325 0 R (lstlisting.-408) 2331 0 R (lstlisting.-409) 2333 0 R (lstlisting.-41) 1026 0 R (lstlisting.-410) 2337 0 R] -/Limits [(lstlisting.-406) (lstlisting.-410)] ->> endobj -4224 0 obj << -/Names [(lstlisting.-411) 2344 0 R (lstlisting.-412) 2348 0 R (lstlisting.-413) 2354 0 R (lstlisting.-414) 2356 0 R (lstlisting.-415) 2359 0 R (lstlisting.-416) 2361 0 R] -/Limits [(lstlisting.-411) (lstlisting.-416)] ->> endobj -4225 0 obj << -/Names [(lstlisting.-417) 2363 0 R (lstlisting.-418) 2369 0 R (lstlisting.-419) 2372 0 R (lstlisting.-42) 1029 0 R (lstlisting.-420) 2390 0 R (lstlisting.-421) 2392 0 R] -/Limits [(lstlisting.-417) (lstlisting.-421)] ->> endobj -4226 0 obj << -/Names [(lstlisting.-422) 2395 0 R (lstlisting.-423) 2397 0 R (lstlisting.-424) 2399 0 R (lstlisting.-425) 2402 0 R (lstlisting.-426) 2405 0 R (lstlisting.-427) 2416 0 R] -/Limits [(lstlisting.-422) (lstlisting.-427)] ->> endobj -4227 0 obj << -/Names [(lstlisting.-428) 2418 0 R (lstlisting.-429) 2422 0 R (lstlisting.-43) 1031 0 R (lstlisting.-430) 2425 0 R (lstlisting.-431) 2428 0 R (lstlisting.-432) 2449 0 R] -/Limits [(lstlisting.-428) (lstlisting.-432)] ->> endobj -4228 0 obj << -/Names [(lstlisting.-433) 2455 0 R (lstlisting.-434) 2464 0 R (lstlisting.-435) 2467 0 R (lstlisting.-436) 2471 0 R (lstlisting.-437) 2476 0 R (lstlisting.-438) 2483 0 R] -/Limits [(lstlisting.-433) (lstlisting.-438)] ->> endobj -4229 0 obj << -/Names [(lstlisting.-439) 2486 0 R (lstlisting.-44) 1034 0 R (lstlisting.-440) 2489 0 R (lstlisting.-441) 2491 0 R (lstlisting.-442) 2497 0 R (lstlisting.-443) 2501 0 R] -/Limits [(lstlisting.-439) (lstlisting.-443)] ->> endobj -4230 0 obj << -/Names [(lstlisting.-444) 2507 0 R (lstlisting.-445) 2512 0 R (lstlisting.-446) 2518 0 R (lstlisting.-447) 2523 0 R (lstlisting.-448) 2527 0 R (lstlisting.-449) 2530 0 R] -/Limits [(lstlisting.-444) (lstlisting.-449)] ->> endobj -4231 0 obj << -/Names [(lstlisting.-45) 1037 0 R (lstlisting.-450) 2533 0 R (lstlisting.-451) 2536 0 R (lstlisting.-452) 2538 0 R (lstlisting.-453) 2540 0 R (lstlisting.-454) 2542 0 R] -/Limits [(lstlisting.-45) (lstlisting.-454)] ->> endobj -4232 0 obj << -/Names [(lstlisting.-455) 2550 0 R (lstlisting.-456) 2552 0 R (lstlisting.-457) 2554 0 R (lstlisting.-458) 2558 0 R (lstlisting.-459) 2561 0 R (lstlisting.-46) 1040 0 R] -/Limits [(lstlisting.-455) (lstlisting.-46)] ->> endobj -4233 0 obj << -/Names [(lstlisting.-460) 2565 0 R (lstlisting.-461) 2567 0 R (lstlisting.-462) 2569 0 R (lstlisting.-463) 2572 0 R (lstlisting.-464) 2600 0 R (lstlisting.-465) 2627 0 R] -/Limits [(lstlisting.-460) (lstlisting.-465)] ->> endobj -4234 0 obj << -/Names [(lstlisting.-466) 2629 0 R (lstlisting.-467) 2634 0 R (lstlisting.-468) 2639 0 R (lstlisting.-469) 2641 0 R (lstlisting.-47) 1048 0 R (lstlisting.-470) 2650 0 R] -/Limits [(lstlisting.-466) (lstlisting.-470)] ->> endobj -4235 0 obj << -/Names [(lstlisting.-471) 2654 0 R (lstlisting.-472) 2660 0 R (lstlisting.-473) 2663 0 R (lstlisting.-474) 2665 0 R (lstlisting.-475) 2668 0 R (lstlisting.-476) 2671 0 R] -/Limits [(lstlisting.-471) (lstlisting.-476)] ->> endobj -4236 0 obj << -/Names [(lstlisting.-477) 2675 0 R (lstlisting.-478) 2706 0 R (lstlisting.-479) 2708 0 R (lstlisting.-48) 1050 0 R (lstlisting.-480) 2712 0 R (lstlisting.-481) 2716 0 R] -/Limits [(lstlisting.-477) (lstlisting.-481)] ->> endobj -4237 0 obj << -/Names [(lstlisting.-482) 2720 0 R (lstlisting.-483) 2725 0 R (lstlisting.-484) 2734 0 R (lstlisting.-485) 2736 0 R (lstlisting.-486) 2739 0 R (lstlisting.-487) 2747 0 R] -/Limits [(lstlisting.-482) (lstlisting.-487)] ->> endobj -4238 0 obj << -/Names [(lstlisting.-488) 2750 0 R (lstlisting.-489) 2755 0 R (lstlisting.-49) 1053 0 R (lstlisting.-490) 2757 0 R (lstlisting.-491) 2759 0 R (lstlisting.-492) 2761 0 R] -/Limits [(lstlisting.-488) (lstlisting.-492)] ->> endobj -4239 0 obj << -/Names [(lstlisting.-493) 2763 0 R (lstlisting.-494) 2765 0 R (lstlisting.-495) 2768 0 R (lstlisting.-496) 2813 0 R (lstlisting.-497) 2819 0 R (lstlisting.-498) 2821 0 R] -/Limits [(lstlisting.-493) (lstlisting.-498)] ->> endobj -4240 0 obj << -/Names [(lstlisting.-499) 2823 0 R (lstlisting.-5) 921 0 R (lstlisting.-50) 1055 0 R (lstlisting.-500) 2831 0 R (lstlisting.-501) 2833 0 R (lstlisting.-502) 2839 0 R] -/Limits [(lstlisting.-499) (lstlisting.-502)] ->> endobj -4241 0 obj << -/Names [(lstlisting.-503) 2845 0 R (lstlisting.-504) 2847 0 R (lstlisting.-505) 2849 0 R (lstlisting.-506) 2851 0 R (lstlisting.-507) 2853 0 R (lstlisting.-508) 2855 0 R] -/Limits [(lstlisting.-503) (lstlisting.-508)] ->> endobj -4242 0 obj << -/Names [(lstlisting.-509) 2857 0 R (lstlisting.-51) 1057 0 R (lstlisting.-510) 2863 0 R (lstlisting.-511) 2865 0 R (lstlisting.-512) 2867 0 R (lstlisting.-513) 2869 0 R] -/Limits [(lstlisting.-509) (lstlisting.-513)] ->> endobj -4243 0 obj << -/Names [(lstlisting.-514) 2871 0 R (lstlisting.-515) 2873 0 R (lstlisting.-516) 2876 0 R (lstlisting.-517) 2881 0 R (lstlisting.-518) 2884 0 R (lstlisting.-519) 2891 0 R] -/Limits [(lstlisting.-514) (lstlisting.-519)] ->> endobj -4244 0 obj << -/Names [(lstlisting.-52) 1059 0 R (lstlisting.-520) 2893 0 R (lstlisting.-521) 2895 0 R (lstlisting.-522) 2897 0 R (lstlisting.-523) 2899 0 R (lstlisting.-524) 2902 0 R] -/Limits [(lstlisting.-52) (lstlisting.-524)] ->> endobj -4245 0 obj << -/Names [(lstlisting.-525) 2923 0 R (lstlisting.-526) 2927 0 R (lstlisting.-527) 2934 0 R (lstlisting.-528) 2937 0 R (lstlisting.-529) 2961 0 R (lstlisting.-53) 1061 0 R] -/Limits [(lstlisting.-525) (lstlisting.-53)] ->> endobj -4246 0 obj << -/Names [(lstlisting.-530) 2982 0 R (lstlisting.-531) 2984 0 R (lstlisting.-532) 2990 0 R (lstlisting.-533) 2994 0 R (lstlisting.-534) 2997 0 R (lstlisting.-535) 3000 0 R] -/Limits [(lstlisting.-530) (lstlisting.-535)] ->> endobj -4247 0 obj << -/Names [(lstlisting.-536) 3002 0 R (lstlisting.-537) 3004 0 R (lstlisting.-538) 3006 0 R (lstlisting.-539) 3008 0 R (lstlisting.-54) 1063 0 R (lstlisting.-540) 3010 0 R] -/Limits [(lstlisting.-536) (lstlisting.-540)] ->> endobj -4248 0 obj << -/Names [(lstlisting.-541) 3012 0 R (lstlisting.-542) 3014 0 R (lstlisting.-543) 3016 0 R (lstlisting.-544) 3018 0 R (lstlisting.-545) 3020 0 R (lstlisting.-546) 3028 0 R] -/Limits [(lstlisting.-541) (lstlisting.-546)] ->> endobj -4249 0 obj << -/Names [(lstlisting.-547) 3030 0 R (lstlisting.-548) 3034 0 R (lstlisting.-549) 3037 0 R (lstlisting.-55) 1065 0 R (lstlisting.-550) 3039 0 R (lstlisting.-551) 3044 0 R] -/Limits [(lstlisting.-547) (lstlisting.-551)] ->> endobj -4250 0 obj << -/Names [(lstlisting.-552) 3047 0 R (lstlisting.-553) 3050 0 R (lstlisting.-554) 3055 0 R (lstlisting.-555) 3066 0 R (lstlisting.-556) 3068 0 R (lstlisting.-557) 3071 0 R] -/Limits [(lstlisting.-552) (lstlisting.-557)] ->> endobj -4251 0 obj << -/Names [(lstlisting.-558) 3074 0 R (lstlisting.-559) 3077 0 R (lstlisting.-56) 1067 0 R (lstlisting.-560) 3080 0 R (lstlisting.-561) 3082 0 R (lstlisting.-562) 3085 0 R] -/Limits [(lstlisting.-558) (lstlisting.-562)] ->> endobj -4252 0 obj << -/Names [(lstlisting.-563) 3088 0 R (lstlisting.-564) 3091 0 R (lstlisting.-565) 3093 0 R (lstlisting.-566) 3100 0 R (lstlisting.-567) 3103 0 R (lstlisting.-568) 3106 0 R] -/Limits [(lstlisting.-563) (lstlisting.-568)] ->> endobj -4253 0 obj << -/Names [(lstlisting.-569) 3108 0 R (lstlisting.-57) 1071 0 R (lstlisting.-570) 3113 0 R (lstlisting.-571) 3115 0 R (lstlisting.-572) 3122 0 R (lstlisting.-573) 3128 0 R] -/Limits [(lstlisting.-569) (lstlisting.-573)] ->> endobj -4254 0 obj << -/Names [(lstlisting.-574) 3130 0 R (lstlisting.-575) 3134 0 R (lstlisting.-576) 3137 0 R (lstlisting.-577) 3145 0 R (lstlisting.-578) 3149 0 R (lstlisting.-579) 3151 0 R] -/Limits [(lstlisting.-574) (lstlisting.-579)] ->> endobj -4255 0 obj << -/Names [(lstlisting.-58) 1073 0 R (lstlisting.-580) 3156 0 R (lstlisting.-581) 3159 0 R (lstlisting.-582) 3167 0 R (lstlisting.-583) 3173 0 R (lstlisting.-584) 3177 0 R] -/Limits [(lstlisting.-58) (lstlisting.-584)] ->> endobj -4256 0 obj << -/Names [(lstlisting.-585) 3181 0 R (lstlisting.-586) 3185 0 R (lstlisting.-587) 3194 0 R (lstlisting.-588) 3197 0 R (lstlisting.-589) 3202 0 R (lstlisting.-59) 1080 0 R] -/Limits [(lstlisting.-585) (lstlisting.-59)] ->> endobj -4257 0 obj << -/Names [(lstlisting.-590) 3208 0 R (lstlisting.-591) 3210 0 R (lstlisting.-592) 3212 0 R (lstlisting.-593) 3214 0 R (lstlisting.-594) 3216 0 R (lstlisting.-595) 3218 0 R] -/Limits [(lstlisting.-590) (lstlisting.-595)] ->> endobj -4258 0 obj << -/Names [(lstlisting.-596) 3220 0 R (lstlisting.-597) 3222 0 R (lstlisting.-598) 3224 0 R (lstlisting.-599) 3227 0 R (lstlisting.-6) 926 0 R (lstlisting.-60) 1083 0 R] -/Limits [(lstlisting.-596) (lstlisting.-60)] ->> endobj -4259 0 obj << -/Names [(lstlisting.-600) 3231 0 R (lstlisting.-601) 3234 0 R (lstlisting.-602) 3244 0 R (lstlisting.-603) 3246 0 R (lstlisting.-604) 3253 0 R (lstlisting.-605) 3257 0 R] -/Limits [(lstlisting.-600) (lstlisting.-605)] ->> endobj -4260 0 obj << -/Names [(lstlisting.-606) 3259 0 R (lstlisting.-607) 3262 0 R (lstlisting.-608) 3264 0 R (lstlisting.-609) 3266 0 R (lstlisting.-61) 1085 0 R (lstlisting.-610) 3268 0 R] -/Limits [(lstlisting.-606) (lstlisting.-610)] ->> endobj -4261 0 obj << -/Names [(lstlisting.-611) 3270 0 R (lstlisting.-612) 3272 0 R (lstlisting.-613) 3274 0 R (lstlisting.-614) 3280 0 R (lstlisting.-615) 3282 0 R (lstlisting.-616) 3284 0 R] -/Limits [(lstlisting.-611) (lstlisting.-616)] ->> endobj -4262 0 obj << -/Names [(lstlisting.-617) 3289 0 R (lstlisting.-618) 3292 0 R (lstlisting.-619) 3295 0 R (lstlisting.-62) 1089 0 R (lstlisting.-620) 3298 0 R (lstlisting.-621) 3301 0 R] -/Limits [(lstlisting.-617) (lstlisting.-621)] ->> endobj -4263 0 obj << -/Names [(lstlisting.-622) 3303 0 R (lstlisting.-623) 3305 0 R (lstlisting.-624) 3307 0 R (lstlisting.-625) 3311 0 R (lstlisting.-626) 3313 0 R (lstlisting.-627) 3320 0 R] -/Limits [(lstlisting.-622) (lstlisting.-627)] ->> endobj -4264 0 obj << -/Names [(lstlisting.-628) 3323 0 R (lstlisting.-629) 3330 0 R (lstlisting.-63) 1092 0 R (lstlisting.-630) 3333 0 R (lstlisting.-631) 3336 0 R (lstlisting.-632) 3339 0 R] -/Limits [(lstlisting.-628) (lstlisting.-632)] ->> endobj -4265 0 obj << -/Names [(lstlisting.-633) 3342 0 R (lstlisting.-634) 3348 0 R (lstlisting.-635) 3362 0 R (lstlisting.-636) 3365 0 R (lstlisting.-637) 3372 0 R (lstlisting.-638) 3374 0 R] -/Limits [(lstlisting.-633) (lstlisting.-638)] ->> endobj -4266 0 obj << -/Names [(lstlisting.-639) 3376 0 R (lstlisting.-64) 1095 0 R (lstlisting.-640) 3378 0 R (lstlisting.-641) 3380 0 R (lstlisting.-642) 3382 0 R (lstlisting.-643) 3384 0 R] -/Limits [(lstlisting.-639) (lstlisting.-643)] ->> endobj -4267 0 obj << -/Names [(lstlisting.-644) 3386 0 R (lstlisting.-645) 3388 0 R (lstlisting.-646) 3393 0 R (lstlisting.-647) 3399 0 R (lstlisting.-648) 3401 0 R (lstlisting.-649) 3405 0 R] -/Limits [(lstlisting.-644) (lstlisting.-649)] ->> endobj -4268 0 obj << -/Names [(lstlisting.-65) 1097 0 R (lstlisting.-650) 3408 0 R (lstlisting.-651) 3414 0 R (lstlisting.-652) 3420 0 R (lstlisting.-653) 3426 0 R (lstlisting.-654) 3429 0 R] -/Limits [(lstlisting.-65) (lstlisting.-654)] ->> endobj -4269 0 obj << -/Names [(lstlisting.-655) 3433 0 R (lstlisting.-656) 3440 0 R (lstlisting.-657) 3466 0 R (lstlisting.-658) 3470 0 R (lstlisting.-659) 3473 0 R (lstlisting.-66) 1099 0 R] -/Limits [(lstlisting.-655) (lstlisting.-66)] ->> endobj -4270 0 obj << -/Names [(lstlisting.-660) 3489 0 R (lstlisting.-661) 3497 0 R (lstlisting.-662) 3519 0 R (lstlisting.-663) 3522 0 R (lstlisting.-664) 3529 0 R (lstlisting.-665) 3569 0 R] -/Limits [(lstlisting.-660) (lstlisting.-665)] ->> endobj -4271 0 obj << -/Names [(lstlisting.-666) 3571 0 R (lstlisting.-667) 3574 0 R (lstlisting.-668) 3576 0 R (lstlisting.-669) 3580 0 R (lstlisting.-67) 1101 0 R (lstlisting.-670) 3582 0 R] -/Limits [(lstlisting.-666) (lstlisting.-670)] ->> endobj -4272 0 obj << -/Names [(lstlisting.-671) 3589 0 R (lstlisting.-672) 3591 0 R (lstlisting.-673) 3593 0 R (lstlisting.-674) 3596 0 R (lstlisting.-675) 3598 0 R (lstlisting.-676) 3600 0 R] -/Limits [(lstlisting.-671) (lstlisting.-676)] ->> endobj -4273 0 obj << -/Names [(lstlisting.-677) 3603 0 R (lstlisting.-678) 3607 0 R (lstlisting.-679) 3609 0 R (lstlisting.-68) 1103 0 R (lstlisting.-680) 3615 0 R (lstlisting.-681) 3620 0 R] -/Limits [(lstlisting.-677) (lstlisting.-681)] ->> endobj -4274 0 obj << -/Names [(lstlisting.-682) 3626 0 R (lstlisting.-683) 3628 0 R (lstlisting.-684) 3630 0 R (lstlisting.-685) 3632 0 R (lstlisting.-686) 3634 0 R (lstlisting.-687) 3636 0 R] -/Limits [(lstlisting.-682) (lstlisting.-687)] ->> endobj -4275 0 obj << -/Names [(lstlisting.-688) 3638 0 R (lstlisting.-689) 3641 0 R (lstlisting.-69) 1106 0 R (lstlisting.-690) 3643 0 R (lstlisting.-691) 3645 0 R (lstlisting.-692) 3647 0 R] -/Limits [(lstlisting.-688) (lstlisting.-692)] ->> endobj -4276 0 obj << -/Names [(lstlisting.-693) 3651 0 R (lstlisting.-694) 3654 0 R (lstlisting.-695) 3661 0 R (lstlisting.-696) 3664 0 R (lstlisting.-697) 3668 0 R (lstlisting.-698) 3674 0 R] -/Limits [(lstlisting.-693) (lstlisting.-698)] ->> endobj -4277 0 obj << -/Names [(lstlisting.-699) 3677 0 R (lstlisting.-7) 928 0 R (lstlisting.-70) 1108 0 R (lstlisting.-700) 3682 0 R (lstlisting.-701) 3689 0 R (lstlisting.-702) 3695 0 R] -/Limits [(lstlisting.-699) (lstlisting.-702)] ->> endobj -4278 0 obj << -/Names [(lstlisting.-703) 3698 0 R (lstlisting.-704) 3703 0 R (lstlisting.-705) 3906 0 R (lstlisting.-706) 3984 0 R (lstlisting.-707) 3994 0 R (lstlisting.-708) 3999 0 R] -/Limits [(lstlisting.-703) (lstlisting.-708)] ->> endobj -4279 0 obj << -/Names [(lstlisting.-709) 4025 0 R (lstlisting.-71) 1114 0 R (lstlisting.-710) 4045 0 R (lstlisting.-711) 4047 0 R (lstlisting.-712) 4049 0 R (lstlisting.-713) 4057 0 R] -/Limits [(lstlisting.-709) (lstlisting.-713)] ->> endobj -4280 0 obj << -/Names [(lstlisting.-714) 4065 0 R (lstlisting.-72) 1116 0 R (lstlisting.-73) 1119 0 R (lstlisting.-74) 1121 0 R (lstlisting.-75) 1124 0 R (lstlisting.-76) 1126 0 R] -/Limits [(lstlisting.-714) (lstlisting.-76)] ->> endobj -4281 0 obj << -/Names [(lstlisting.-77) 1130 0 R (lstlisting.-78) 1132 0 R (lstlisting.-79) 1134 0 R (lstlisting.-8) 934 0 R (lstlisting.-80) 1136 0 R (lstlisting.-81) 1138 0 R] -/Limits [(lstlisting.-77) (lstlisting.-81)] ->> endobj -4282 0 obj << -/Names [(lstlisting.-82) 1140 0 R (lstlisting.-83) 1142 0 R (lstlisting.-84) 1149 0 R (lstlisting.-85) 1151 0 R (lstlisting.-86) 1153 0 R (lstlisting.-87) 1155 0 R] -/Limits [(lstlisting.-82) (lstlisting.-87)] ->> endobj -4283 0 obj << -/Names [(lstlisting.-88) 1157 0 R (lstlisting.-89) 1164 0 R (lstlisting.-9) 936 0 R (lstlisting.-90) 1166 0 R (lstlisting.-91) 1170 0 R (lstlisting.-92) 1173 0 R] -/Limits [(lstlisting.-88) (lstlisting.-92)] ->> endobj -4284 0 obj << -/Names [(lstlisting.-93) 1175 0 R (lstlisting.-94) 1177 0 R (lstlisting.-95) 1187 0 R (lstlisting.-96) 1189 0 R (lstlisting.-97) 1191 0 R (lstlisting.-98) 1194 0 R] -/Limits [(lstlisting.-93) (lstlisting.-98)] ->> endobj -4285 0 obj << -/Names [(lstlisting.-99) 1196 0 R (lstnumber.-1.1) 911 0 R (lstnumber.-10.1) 939 0 R (lstnumber.-100.1) 1199 0 R (lstnumber.-101.1) 1201 0 R (lstnumber.-101.2) 1202 0 R] -/Limits [(lstlisting.-99) (lstnumber.-101.2)] ->> endobj -4286 0 obj << -/Names [(lstnumber.-101.3) 1203 0 R (lstnumber.-101.4) 1204 0 R (lstnumber.-101.5) 1205 0 R (lstnumber.-101.6) 1206 0 R (lstnumber.-102.1) 1208 0 R (lstnumber.-102.10) 1217 0 R] -/Limits [(lstnumber.-101.3) (lstnumber.-102.10)] ->> endobj -4287 0 obj << -/Names [(lstnumber.-102.11) 1218 0 R (lstnumber.-102.12) 1219 0 R (lstnumber.-102.13) 1220 0 R (lstnumber.-102.14) 1221 0 R (lstnumber.-102.15) 1222 0 R (lstnumber.-102.16) 1223 0 R] -/Limits [(lstnumber.-102.11) (lstnumber.-102.16)] ->> endobj -4288 0 obj << -/Names [(lstnumber.-102.17) 1224 0 R (lstnumber.-102.18) 1225 0 R (lstnumber.-102.2) 1209 0 R (lstnumber.-102.3) 1210 0 R (lstnumber.-102.4) 1211 0 R (lstnumber.-102.5) 1212 0 R] -/Limits [(lstnumber.-102.17) (lstnumber.-102.5)] ->> endobj -4289 0 obj << -/Names [(lstnumber.-102.6) 1213 0 R (lstnumber.-102.7) 1214 0 R (lstnumber.-102.8) 1215 0 R (lstnumber.-102.9) 1216 0 R (lstnumber.-103.1) 1231 0 R (lstnumber.-104.1) 1233 0 R] -/Limits [(lstnumber.-102.6) (lstnumber.-104.1)] ->> endobj -4290 0 obj << -/Names [(lstnumber.-104.2) 1234 0 R (lstnumber.-104.3) 1235 0 R (lstnumber.-105.1) 1237 0 R (lstnumber.-105.2) 1238 0 R (lstnumber.-105.3) 1239 0 R (lstnumber.-105.4) 1240 0 R] -/Limits [(lstnumber.-104.2) (lstnumber.-105.4)] ->> endobj -4291 0 obj << -/Names [(lstnumber.-105.5) 1241 0 R (lstnumber.-106.1) 1244 0 R (lstnumber.-106.2) 1245 0 R (lstnumber.-106.3) 1246 0 R (lstnumber.-106.4) 1247 0 R (lstnumber.-107.1) 1250 0 R] -/Limits [(lstnumber.-105.5) (lstnumber.-107.1)] ->> endobj -4292 0 obj << -/Names [(lstnumber.-107.2) 1251 0 R (lstnumber.-107.3) 1252 0 R (lstnumber.-108.1) 1254 0 R (lstnumber.-109.1) 1256 0 R (lstnumber.-11.1) 942 0 R (lstnumber.-110.1) 1258 0 R] -/Limits [(lstnumber.-107.2) (lstnumber.-110.1)] ->> endobj -4293 0 obj << -/Names [(lstnumber.-111.1) 1264 0 R (lstnumber.-112.1) 1266 0 R (lstnumber.-113.1) 1269 0 R (lstnumber.-114.1) 1273 0 R (lstnumber.-115.1) 1275 0 R (lstnumber.-116.1) 1277 0 R] -/Limits [(lstnumber.-111.1) (lstnumber.-116.1)] ->> endobj -4294 0 obj << -/Names [(lstnumber.-117.1) 1279 0 R (lstnumber.-118.1) 1282 0 R (lstnumber.-119.1) 1284 0 R (lstnumber.-12.1) 944 0 R (lstnumber.-120.1) 1292 0 R (lstnumber.-121.1) 1295 0 R] -/Limits [(lstnumber.-117.1) (lstnumber.-121.1)] ->> endobj -4295 0 obj << -/Names [(lstnumber.-122.1) 1297 0 R (lstnumber.-123.1) 1299 0 R (lstnumber.-124.1) 1302 0 R (lstnumber.-125.1) 1304 0 R (lstnumber.-126.1) 1307 0 R (lstnumber.-127.1) 1309 0 R] -/Limits [(lstnumber.-122.1) (lstnumber.-127.1)] ->> endobj -4296 0 obj << -/Names [(lstnumber.-128.1) 1312 0 R (lstnumber.-129.1) 1319 0 R (lstnumber.-13.1) 946 0 R (lstnumber.-130.1) 1322 0 R (lstnumber.-131.1) 1326 0 R (lstnumber.-132.1) 1328 0 R] -/Limits [(lstnumber.-128.1) (lstnumber.-132.1)] ->> endobj -4297 0 obj << -/Names [(lstnumber.-133.1) 1331 0 R (lstnumber.-134.1) 1333 0 R (lstnumber.-135.1) 1340 0 R (lstnumber.-136.1) 1342 0 R (lstnumber.-137.1) 1344 0 R (lstnumber.-138.1) 1347 0 R] -/Limits [(lstnumber.-133.1) (lstnumber.-138.1)] ->> endobj -4298 0 obj << -/Names [(lstnumber.-139.1) 1355 0 R (lstnumber.-14.1) 948 0 R (lstnumber.-140.1) 1357 0 R (lstnumber.-141.1) 1363 0 R (lstnumber.-141.2) 1364 0 R (lstnumber.-142.1) 1366 0 R] -/Limits [(lstnumber.-139.1) (lstnumber.-142.1)] ->> endobj -4299 0 obj << -/Names [(lstnumber.-143.1) 1368 0 R (lstnumber.-144.1) 1370 0 R (lstnumber.-145.1) 1372 0 R (lstnumber.-146.1) 1374 0 R (lstnumber.-147.1) 1377 0 R (lstnumber.-148.1) 1379 0 R] -/Limits [(lstnumber.-143.1) (lstnumber.-148.1)] ->> endobj -4300 0 obj << -/Names [(lstnumber.-148.2) 1380 0 R (lstnumber.-148.3) 1381 0 R (lstnumber.-148.4) 1382 0 R (lstnumber.-148.5) 1383 0 R (lstnumber.-148.6) 1384 0 R (lstnumber.-148.7) 1385 0 R] -/Limits [(lstnumber.-148.2) (lstnumber.-148.7)] ->> endobj -4301 0 obj << -/Names [(lstnumber.-148.8) 1386 0 R (lstnumber.-148.9) 1387 0 R (lstnumber.-149.1) 1389 0 R (lstnumber.-149.2) 1390 0 R (lstnumber.-15.1) 950 0 R (lstnumber.-150.1) 1392 0 R] -/Limits [(lstnumber.-148.8) (lstnumber.-150.1)] ->> endobj -4302 0 obj << -/Names [(lstnumber.-150.2) 1393 0 R (lstnumber.-151.1) 1395 0 R (lstnumber.-152.1) 1401 0 R (lstnumber.-153.1) 1403 0 R (lstnumber.-153.2) 1404 0 R (lstnumber.-153.3) 1405 0 R] -/Limits [(lstnumber.-150.2) (lstnumber.-153.3)] ->> endobj -4303 0 obj << -/Names [(lstnumber.-154.1) 1407 0 R (lstnumber.-154.2) 1408 0 R (lstnumber.-154.3) 1409 0 R (lstnumber.-155.1) 1411 0 R (lstnumber.-155.2) 1412 0 R (lstnumber.-156.1) 1414 0 R] -/Limits [(lstnumber.-154.1) (lstnumber.-156.1)] ->> endobj -4304 0 obj << -/Names [(lstnumber.-156.2) 1415 0 R (lstnumber.-156.3) 1416 0 R (lstnumber.-156.4) 1417 0 R (lstnumber.-157.1) 1419 0 R (lstnumber.-157.2) 1420 0 R (lstnumber.-157.3) 1421 0 R] -/Limits [(lstnumber.-156.2) (lstnumber.-157.3)] ->> endobj -4305 0 obj << -/Names [(lstnumber.-158.1) 1423 0 R (lstnumber.-159.1) 1425 0 R (lstnumber.-16.1) 952 0 R (lstnumber.-160.1) 1427 0 R (lstnumber.-161.1) 1429 0 R (lstnumber.-162.1) 1432 0 R] -/Limits [(lstnumber.-158.1) (lstnumber.-162.1)] ->> endobj -4306 0 obj << -/Names [(lstnumber.-163.1) 1439 0 R (lstnumber.-163.2) 1440 0 R (lstnumber.-164.1) 1442 0 R (lstnumber.-165.1) 1444 0 R (lstnumber.-166.1) 1446 0 R (lstnumber.-166.2) 1447 0 R] -/Limits [(lstnumber.-163.1) (lstnumber.-166.2)] ->> endobj -4307 0 obj << -/Names [(lstnumber.-167.1) 1449 0 R (lstnumber.-168.1) 1451 0 R (lstnumber.-169.1) 1453 0 R (lstnumber.-17.1) 955 0 R (lstnumber.-170.1) 1455 0 R (lstnumber.-170.2) 1456 0 R] -/Limits [(lstnumber.-167.1) (lstnumber.-170.2)] ->> endobj -4308 0 obj << -/Names [(lstnumber.-170.3) 1457 0 R (lstnumber.-170.4) 1458 0 R (lstnumber.-170.5) 1459 0 R (lstnumber.-170.6) 1460 0 R (lstnumber.-170.7) 1461 0 R (lstnumber.-170.8) 1462 0 R] -/Limits [(lstnumber.-170.3) (lstnumber.-170.8)] ->> endobj -4309 0 obj << -/Names [(lstnumber.-170.9) 1463 0 R (lstnumber.-171.1) 1465 0 R (lstnumber.-171.2) 1466 0 R (lstnumber.-172.1) 1468 0 R (lstnumber.-172.2) 1469 0 R (lstnumber.-173.1) 1471 0 R] -/Limits [(lstnumber.-170.9) (lstnumber.-173.1)] ->> endobj -4310 0 obj << -/Names [(lstnumber.-174.1) 1477 0 R (lstnumber.-175.1) 1479 0 R (lstnumber.-176.1) 1481 0 R (lstnumber.-176.2) 1482 0 R (lstnumber.-177.1) 1484 0 R (lstnumber.-177.2) 1485 0 R] -/Limits [(lstnumber.-174.1) (lstnumber.-177.2)] ->> endobj -4311 0 obj << -/Names [(lstnumber.-178.1) 1487 0 R (lstnumber.-179.1) 1489 0 R (lstnumber.-18.1) 958 0 R (lstnumber.-180.1) 1491 0 R (lstnumber.-181.1) 1493 0 R (lstnumber.-181.2) 1494 0 R] -/Limits [(lstnumber.-178.1) (lstnumber.-181.2)] ->> endobj -4312 0 obj << -/Names [(lstnumber.-182.1) 1496 0 R (lstnumber.-183.1) 1498 0 R (lstnumber.-183.2) 1499 0 R (lstnumber.-184.1) 1501 0 R (lstnumber.-185.1) 1503 0 R (lstnumber.-186.1) 1505 0 R] -/Limits [(lstnumber.-182.1) (lstnumber.-186.1)] ->> endobj -4313 0 obj << -/Names [(lstnumber.-186.2) 1506 0 R (lstnumber.-187.1) 1512 0 R (lstnumber.-187.2) 1513 0 R (lstnumber.-188.1) 1515 0 R (lstnumber.-188.2) 1516 0 R (lstnumber.-189.1) 1518 0 R] -/Limits [(lstnumber.-186.2) (lstnumber.-189.1)] ->> endobj -4314 0 obj << -/Names [(lstnumber.-19.1) 960 0 R (lstnumber.-190.1) 1520 0 R (lstnumber.-190.2) 1521 0 R (lstnumber.-191.1) 1523 0 R (lstnumber.-191.2) 1524 0 R (lstnumber.-192.1) 1526 0 R] -/Limits [(lstnumber.-19.1) (lstnumber.-192.1)] ->> endobj -4315 0 obj << -/Names [(lstnumber.-192.2) 1527 0 R (lstnumber.-192.3) 1528 0 R (lstnumber.-193.1) 1530 0 R (lstnumber.-194.1) 1532 0 R (lstnumber.-194.2) 1533 0 R (lstnumber.-194.3) 1534 0 R] -/Limits [(lstnumber.-192.2) (lstnumber.-194.3)] ->> endobj -4316 0 obj << -/Names [(lstnumber.-195.1) 1536 0 R (lstnumber.-195.2) 1537 0 R (lstnumber.-195.3) 1538 0 R (lstnumber.-196.1) 1540 0 R (lstnumber.-197.1) 1542 0 R (lstnumber.-198.1) 1544 0 R] -/Limits [(lstnumber.-195.1) (lstnumber.-198.1)] ->> endobj -4317 0 obj << -/Names [(lstnumber.-199.1) 1550 0 R (lstnumber.-2.1) 913 0 R (lstnumber.-20.1) 968 0 R (lstnumber.-20.2) 969 0 R (lstnumber.-200.1) 1552 0 R (lstnumber.-200.2) 1553 0 R] -/Limits [(lstnumber.-199.1) (lstnumber.-200.2)] ->> endobj -4318 0 obj << -/Names [(lstnumber.-200.3) 1554 0 R (lstnumber.-201.1) 1556 0 R (lstnumber.-202.1) 1558 0 R (lstnumber.-203.1) 1560 0 R (lstnumber.-203.2) 1561 0 R (lstnumber.-204.1) 1563 0 R] -/Limits [(lstnumber.-200.3) (lstnumber.-204.1)] ->> endobj -4319 0 obj << -/Names [(lstnumber.-205.1) 1565 0 R (lstnumber.-206.1) 1567 0 R (lstnumber.-206.2) 1568 0 R (lstnumber.-206.3) 1569 0 R (lstnumber.-206.4) 1570 0 R (lstnumber.-206.5) 1571 0 R] -/Limits [(lstnumber.-205.1) (lstnumber.-206.5)] ->> endobj -4320 0 obj << -/Names [(lstnumber.-206.6) 1572 0 R (lstnumber.-207.1) 1574 0 R (lstnumber.-208.1) 1576 0 R (lstnumber.-209.1) 1578 0 R (lstnumber.-209.2) 1579 0 R (lstnumber.-21.1) 972 0 R] -/Limits [(lstnumber.-206.6) (lstnumber.-21.1)] ->> endobj -4321 0 obj << -/Names [(lstnumber.-210.1) 1581 0 R (lstnumber.-211.1) 1583 0 R (lstnumber.-212.1) 1585 0 R (lstnumber.-213.1) 1592 0 R (lstnumber.-213.2) 1593 0 R (lstnumber.-214.1) 1595 0 R] -/Limits [(lstnumber.-210.1) (lstnumber.-214.1)] ->> endobj -4322 0 obj << -/Names [(lstnumber.-214.2) 1596 0 R (lstnumber.-214.3) 1597 0 R (lstnumber.-215.1) 1599 0 R (lstnumber.-215.2) 1600 0 R (lstnumber.-216.1) 1602 0 R (lstnumber.-217.1) 1604 0 R] -/Limits [(lstnumber.-214.2) (lstnumber.-217.1)] ->> endobj -4323 0 obj << -/Names [(lstnumber.-217.2) 1605 0 R (lstnumber.-218.1) 1607 0 R (lstnumber.-219.1) 1609 0 R (lstnumber.-22.1) 975 0 R (lstnumber.-220.1) 1611 0 R (lstnumber.-220.2) 1612 0 R] -/Limits [(lstnumber.-217.2) (lstnumber.-220.2)] ->> endobj -4324 0 obj << -/Names [(lstnumber.-220.3) 1613 0 R (lstnumber.-220.4) 1614 0 R (lstnumber.-221.1) 1616 0 R (lstnumber.-221.2) 1617 0 R (lstnumber.-222.1) 1619 0 R (lstnumber.-223.1) 1621 0 R] -/Limits [(lstnumber.-220.3) (lstnumber.-223.1)] ->> endobj -4325 0 obj << -/Names [(lstnumber.-224.1) 1627 0 R (lstnumber.-225.1) 1629 0 R (lstnumber.-225.2) 1630 0 R (lstnumber.-225.3) 1631 0 R (lstnumber.-226.1) 1633 0 R (lstnumber.-226.2) 1634 0 R] -/Limits [(lstnumber.-224.1) (lstnumber.-226.2)] ->> endobj -4326 0 obj << -/Names [(lstnumber.-226.3) 1635 0 R (lstnumber.-227.1) 1637 0 R (lstnumber.-228.1) 1639 0 R (lstnumber.-228.2) 1640 0 R (lstnumber.-229.1) 1642 0 R (lstnumber.-23.1) 984 0 R] -/Limits [(lstnumber.-226.3) (lstnumber.-23.1)] ->> endobj -4327 0 obj << -/Names [(lstnumber.-230.1) 1644 0 R (lstnumber.-230.2) 1645 0 R (lstnumber.-230.3) 1646 0 R (lstnumber.-230.4) 1647 0 R (lstnumber.-231.1) 1649 0 R (lstnumber.-231.2) 1650 0 R] -/Limits [(lstnumber.-230.1) (lstnumber.-231.2)] ->> endobj -4328 0 obj << -/Names [(lstnumber.-231.3) 1651 0 R (lstnumber.-232.1) 1653 0 R (lstnumber.-232.2) 1654 0 R (lstnumber.-233.1) 1656 0 R (lstnumber.-233.2) 1657 0 R (lstnumber.-233.3) 1658 0 R] -/Limits [(lstnumber.-231.3) (lstnumber.-233.3)] ->> endobj -4329 0 obj << -/Names [(lstnumber.-233.4) 1659 0 R (lstnumber.-234.1) 1661 0 R (lstnumber.-235.1) 1668 0 R (lstnumber.-235.2) 1669 0 R (lstnumber.-236.1) 1671 0 R (lstnumber.-236.2) 1672 0 R] -/Limits [(lstnumber.-233.4) (lstnumber.-236.2)] ->> endobj -4330 0 obj << -/Names [(lstnumber.-236.3) 1673 0 R (lstnumber.-237.1) 1675 0 R (lstnumber.-237.2) 1676 0 R (lstnumber.-238.1) 1678 0 R (lstnumber.-238.2) 1679 0 R (lstnumber.-238.3) 1680 0 R] -/Limits [(lstnumber.-236.3) (lstnumber.-238.3)] ->> endobj -4331 0 obj << -/Names [(lstnumber.-239.1) 1682 0 R (lstnumber.-239.2) 1683 0 R (lstnumber.-239.3) 1684 0 R (lstnumber.-24.1) 986 0 R (lstnumber.-240.1) 1686 0 R (lstnumber.-240.2) 1687 0 R] -/Limits [(lstnumber.-239.1) (lstnumber.-240.2)] ->> endobj -4332 0 obj << -/Names [(lstnumber.-240.3) 1688 0 R (lstnumber.-241.1) 1690 0 R (lstnumber.-242.1) 1692 0 R (lstnumber.-243.1) 1694 0 R (lstnumber.-244.1) 1696 0 R (lstnumber.-245.1) 1698 0 R] -/Limits [(lstnumber.-240.3) (lstnumber.-245.1)] ->> endobj -4333 0 obj << -/Names [(lstnumber.-246.1) 1700 0 R (lstnumber.-246.2) 1701 0 R (lstnumber.-246.3) 1702 0 R (lstnumber.-247.1) 1708 0 R (lstnumber.-247.2) 1709 0 R (lstnumber.-248.1) 1711 0 R] -/Limits [(lstnumber.-246.1) (lstnumber.-248.1)] ->> endobj -4334 0 obj << -/Names [(lstnumber.-249.1) 1713 0 R (lstnumber.-249.2) 1714 0 R (lstnumber.-25.1) 988 0 R (lstnumber.-250.1) 1716 0 R (lstnumber.-251.1) 1718 0 R (lstnumber.-252.1) 1720 0 R] -/Limits [(lstnumber.-249.1) (lstnumber.-252.1)] ->> endobj -4335 0 obj << -/Names [(lstnumber.-253.1) 1722 0 R (lstnumber.-254.1) 1724 0 R (lstnumber.-255.1) 1727 0 R (lstnumber.-255.2) 1728 0 R (lstnumber.-256.1) 1730 0 R (lstnumber.-257.1) 1737 0 R] -/Limits [(lstnumber.-253.1) (lstnumber.-257.1)] ->> endobj -4336 0 obj << -/Names [(lstnumber.-258.1) 1739 0 R (lstnumber.-259.1) 1741 0 R (lstnumber.-26.1) 990 0 R (lstnumber.-260.1) 1743 0 R (lstnumber.-261.1) 1745 0 R (lstnumber.-262.1) 1747 0 R] -/Limits [(lstnumber.-258.1) (lstnumber.-262.1)] ->> endobj -4337 0 obj << -/Names [(lstnumber.-263.1) 1749 0 R (lstnumber.-264.1) 1751 0 R (lstnumber.-265.1) 1753 0 R (lstnumber.-265.2) 1754 0 R (lstnumber.-266.1) 1756 0 R (lstnumber.-267.1) 1758 0 R] -/Limits [(lstnumber.-263.1) (lstnumber.-267.1)] ->> endobj -4338 0 obj << -/Names [(lstnumber.-268.1) 1760 0 R (lstnumber.-269.1) 1762 0 R (lstnumber.-27.1) 992 0 R (lstnumber.-270.1) 1769 0 R (lstnumber.-271.1) 1772 0 R (lstnumber.-272.1) 1774 0 R] -/Limits [(lstnumber.-268.1) (lstnumber.-272.1)] ->> endobj -4339 0 obj << -/Names [(lstnumber.-272.2) 1775 0 R (lstnumber.-272.3) 1776 0 R (lstnumber.-272.4) 1777 0 R (lstnumber.-272.5) 1778 0 R (lstnumber.-272.6) 1779 0 R (lstnumber.-273.1) 1781 0 R] -/Limits [(lstnumber.-272.2) (lstnumber.-273.1)] ->> endobj -4340 0 obj << -/Names [(lstnumber.-273.2) 1782 0 R (lstnumber.-274.1) 1784 0 R (lstnumber.-274.2) 1785 0 R (lstnumber.-274.3) 1786 0 R (lstnumber.-275.1) 1788 0 R (lstnumber.-276.1) 1790 0 R] -/Limits [(lstnumber.-273.2) (lstnumber.-276.1)] ->> endobj -4341 0 obj << -/Names [(lstnumber.-276.2) 1791 0 R (lstnumber.-277.1) 1793 0 R (lstnumber.-277.2) 1794 0 R (lstnumber.-277.3) 1795 0 R (lstnumber.-278.1) 1797 0 R (lstnumber.-279.1) 1799 0 R] -/Limits [(lstnumber.-276.2) (lstnumber.-279.1)] ->> endobj -4342 0 obj << -/Names [(lstnumber.-28.1) 994 0 R (lstnumber.-280.1) 1805 0 R (lstnumber.-281.1) 1807 0 R (lstnumber.-282.1) 1809 0 R (lstnumber.-282.2) 1810 0 R (lstnumber.-283.1) 1812 0 R] -/Limits [(lstnumber.-28.1) (lstnumber.-283.1)] ->> endobj -4343 0 obj << -/Names [(lstnumber.-284.1) 1814 0 R (lstnumber.-285.1) 1816 0 R (lstnumber.-286.1) 1819 0 R (lstnumber.-287.1) 1821 0 R (lstnumber.-288.1) 1823 0 R (lstnumber.-289.1) 1826 0 R] -/Limits [(lstnumber.-284.1) (lstnumber.-289.1)] ->> endobj -4344 0 obj << -/Names [(lstnumber.-289.2) 1827 0 R (lstnumber.-29.1) 996 0 R (lstnumber.-290.1) 1830 0 R (lstnumber.-290.2) 1831 0 R (lstnumber.-291.1) 1846 0 R (lstnumber.-292.1) 1848 0 R] -/Limits [(lstnumber.-289.2) (lstnumber.-292.1)] ->> endobj -4345 0 obj << -/Names [(lstnumber.-293.1) 1850 0 R (lstnumber.-294.1) 1852 0 R (lstnumber.-295.1) 1855 0 R (lstnumber.-296.1) 1857 0 R (lstnumber.-297.1) 1859 0 R (lstnumber.-297.2) 1860 0 R] -/Limits [(lstnumber.-293.1) (lstnumber.-297.2)] ->> endobj -4346 0 obj << -/Names [(lstnumber.-298.1) 1862 0 R (lstnumber.-298.2) 1863 0 R (lstnumber.-299.1) 1865 0 R (lstnumber.-3.1) 916 0 R (lstnumber.-3.2) 917 0 R (lstnumber.-30.1) 998 0 R] -/Limits [(lstnumber.-298.1) (lstnumber.-30.1)] ->> endobj -4347 0 obj << -/Names [(lstnumber.-300.1) 1867 0 R (lstnumber.-300.2) 1868 0 R (lstnumber.-300.3) 1869 0 R (lstnumber.-300.4) 1870 0 R (lstnumber.-301.1) 1877 0 R (lstnumber.-302.1) 1879 0 R] -/Limits [(lstnumber.-300.1) (lstnumber.-302.1)] ->> endobj -4348 0 obj << -/Names [(lstnumber.-302.2) 1880 0 R (lstnumber.-302.3) 1881 0 R (lstnumber.-302.4) 1882 0 R (lstnumber.-302.5) 1883 0 R (lstnumber.-303.1) 1886 0 R (lstnumber.-303.2) 1887 0 R] -/Limits [(lstnumber.-302.2) (lstnumber.-303.2)] ->> endobj -4349 0 obj << -/Names [(lstnumber.-303.3) 1888 0 R (lstnumber.-303.4) 1889 0 R (lstnumber.-303.5) 1890 0 R (lstnumber.-304.1) 1893 0 R (lstnumber.-305.1) 1895 0 R (lstnumber.-305.2) 1896 0 R] -/Limits [(lstnumber.-303.3) (lstnumber.-305.2)] ->> endobj -4350 0 obj << -/Names [(lstnumber.-305.3) 1897 0 R (lstnumber.-305.4) 1898 0 R (lstnumber.-306.1) 1900 0 R (lstnumber.-306.2) 1901 0 R (lstnumber.-306.3) 1902 0 R (lstnumber.-306.4) 1903 0 R] -/Limits [(lstnumber.-305.3) (lstnumber.-306.4)] ->> endobj -4351 0 obj << -/Names [(lstnumber.-306.5) 1904 0 R (lstnumber.-306.6) 1905 0 R (lstnumber.-306.7) 1906 0 R (lstnumber.-306.8) 1907 0 R (lstnumber.-307.1) 1913 0 R (lstnumber.-307.2) 1914 0 R] -/Limits [(lstnumber.-306.5) (lstnumber.-307.2)] ->> endobj -4352 0 obj << -/Names [(lstnumber.-307.3) 1915 0 R (lstnumber.-307.4) 1916 0 R (lstnumber.-307.5) 1917 0 R (lstnumber.-307.6) 1918 0 R (lstnumber.-307.7) 1919 0 R (lstnumber.-307.8) 1920 0 R] -/Limits [(lstnumber.-307.3) (lstnumber.-307.8)] ->> endobj -4353 0 obj << -/Names [(lstnumber.-308.1) 1922 0 R (lstnumber.-309.1) 1924 0 R (lstnumber.-31.1) 1001 0 R (lstnumber.-310.1) 1926 0 R (lstnumber.-311.1) 1928 0 R (lstnumber.-311.2) 1929 0 R] -/Limits [(lstnumber.-308.1) (lstnumber.-311.2)] ->> endobj -4354 0 obj << -/Names [(lstnumber.-311.3) 1930 0 R (lstnumber.-311.4) 1931 0 R (lstnumber.-311.5) 1932 0 R (lstnumber.-311.6) 1933 0 R (lstnumber.-311.7) 1934 0 R (lstnumber.-311.8) 1935 0 R] -/Limits [(lstnumber.-311.3) (lstnumber.-311.8)] ->> endobj -4355 0 obj << -/Names [(lstnumber.-311.9) 1936 0 R (lstnumber.-312.1) 1939 0 R (lstnumber.-312.2) 1940 0 R (lstnumber.-313.1) 1942 0 R (lstnumber.-314.1) 1944 0 R (lstnumber.-315.1) 1946 0 R] -/Limits [(lstnumber.-311.9) (lstnumber.-315.1)] ->> endobj -4356 0 obj << -/Names [(lstnumber.-316.1) 1948 0 R (lstnumber.-316.2) 1949 0 R (lstnumber.-316.3) 1950 0 R (lstnumber.-317.1) 1957 0 R (lstnumber.-318.1) 1959 0 R (lstnumber.-318.2) 1960 0 R] -/Limits [(lstnumber.-316.1) (lstnumber.-318.2)] ->> endobj -4357 0 obj << -/Names [(lstnumber.-319.1) 1962 0 R (lstnumber.-319.2) 1963 0 R (lstnumber.-319.3) 1964 0 R (lstnumber.-319.4) 1965 0 R (lstnumber.-32.1) 1003 0 R (lstnumber.-320.1) 1968 0 R] -/Limits [(lstnumber.-319.1) (lstnumber.-320.1)] ->> endobj -4358 0 obj << -/Names [(lstnumber.-320.2) 1969 0 R (lstnumber.-320.3) 1970 0 R (lstnumber.-320.4) 1971 0 R (lstnumber.-321.1) 1979 0 R (lstnumber.-322.1) 1981 0 R (lstnumber.-323.1) 1983 0 R] -/Limits [(lstnumber.-320.2) (lstnumber.-323.1)] ->> endobj -4359 0 obj << -/Names [(lstnumber.-324.1) 1985 0 R (lstnumber.-325.1) 1987 0 R (lstnumber.-325.2) 1988 0 R (lstnumber.-326.1) 1990 0 R (lstnumber.-327.1) 1992 0 R (lstnumber.-328.1) 1994 0 R] -/Limits [(lstnumber.-324.1) (lstnumber.-328.1)] ->> endobj -4360 0 obj << -/Names [(lstnumber.-328.2) 1995 0 R (lstnumber.-328.3) 1996 0 R (lstnumber.-329.1) 2002 0 R (lstnumber.-329.2) 2003 0 R (lstnumber.-329.3) 2004 0 R (lstnumber.-33.1) 1005 0 R] -/Limits [(lstnumber.-328.2) (lstnumber.-33.1)] ->> endobj -4361 0 obj << -/Names [(lstnumber.-330.1) 2006 0 R (lstnumber.-331.1) 2008 0 R (lstnumber.-332.1) 2010 0 R (lstnumber.-333.1) 2013 0 R (lstnumber.-333.2) 2014 0 R (lstnumber.-333.3) 2015 0 R] -/Limits [(lstnumber.-330.1) (lstnumber.-333.3)] ->> endobj -4362 0 obj << -/Names [(lstnumber.-334.1) 2017 0 R (lstnumber.-335.1) 2019 0 R (lstnumber.-336.1) 2021 0 R (lstnumber.-336.2) 2022 0 R (lstnumber.-336.3) 2023 0 R (lstnumber.-337.1) 2025 0 R] -/Limits [(lstnumber.-334.1) (lstnumber.-337.1)] ->> endobj -4363 0 obj << -/Names [(lstnumber.-337.2) 2026 0 R (lstnumber.-338.1) 2028 0 R (lstnumber.-338.10) 2037 0 R (lstnumber.-338.11) 2038 0 R (lstnumber.-338.12) 2044 0 R (lstnumber.-338.13) 2045 0 R] -/Limits [(lstnumber.-337.2) (lstnumber.-338.13)] ->> endobj -4364 0 obj << -/Names [(lstnumber.-338.14) 2046 0 R (lstnumber.-338.15) 2047 0 R (lstnumber.-338.16) 2048 0 R (lstnumber.-338.17) 2049 0 R (lstnumber.-338.18) 2050 0 R (lstnumber.-338.19) 2051 0 R] -/Limits [(lstnumber.-338.14) (lstnumber.-338.19)] ->> endobj -4365 0 obj << -/Names [(lstnumber.-338.2) 2029 0 R (lstnumber.-338.20) 2052 0 R (lstnumber.-338.21) 2053 0 R (lstnumber.-338.22) 2054 0 R (lstnumber.-338.23) 2055 0 R (lstnumber.-338.24) 2056 0 R] -/Limits [(lstnumber.-338.2) (lstnumber.-338.24)] ->> endobj -4366 0 obj << -/Names [(lstnumber.-338.25) 2057 0 R (lstnumber.-338.26) 2058 0 R (lstnumber.-338.27) 2059 0 R (lstnumber.-338.28) 2060 0 R (lstnumber.-338.29) 2061 0 R (lstnumber.-338.3) 2030 0 R] -/Limits [(lstnumber.-338.25) (lstnumber.-338.3)] ->> endobj -4367 0 obj << -/Names [(lstnumber.-338.30) 2062 0 R (lstnumber.-338.4) 2031 0 R (lstnumber.-338.5) 2032 0 R (lstnumber.-338.6) 2033 0 R (lstnumber.-338.7) 2034 0 R (lstnumber.-338.8) 2035 0 R] -/Limits [(lstnumber.-338.30) (lstnumber.-338.8)] ->> endobj -4368 0 obj << -/Names [(lstnumber.-338.9) 2036 0 R (lstnumber.-339.1) 2064 0 R (lstnumber.-339.2) 2065 0 R (lstnumber.-339.3) 2066 0 R (lstnumber.-339.4) 2067 0 R (lstnumber.-34.1) 1011 0 R] -/Limits [(lstnumber.-338.9) (lstnumber.-34.1)] ->> endobj -4369 0 obj << -/Names [(lstnumber.-34.2) 1012 0 R (lstnumber.-340.1) 2069 0 R (lstnumber.-341.1) 2071 0 R (lstnumber.-341.2) 2072 0 R (lstnumber.-342.1) 2074 0 R (lstnumber.-343.1) 2076 0 R] -/Limits [(lstnumber.-34.2) (lstnumber.-343.1)] ->> endobj -4370 0 obj << -/Names [(lstnumber.-343.2) 2077 0 R (lstnumber.-344.1) 2079 0 R (lstnumber.-345.1) 2081 0 R (lstnumber.-345.2) 2082 0 R (lstnumber.-345.3) 2083 0 R (lstnumber.-345.4) 2084 0 R] -/Limits [(lstnumber.-343.2) (lstnumber.-345.4)] ->> endobj -4371 0 obj << -/Names [(lstnumber.-345.5) 2085 0 R (lstnumber.-345.6) 2086 0 R (lstnumber.-345.7) 2087 0 R (lstnumber.-346.1) 2093 0 R (lstnumber.-346.2) 2094 0 R (lstnumber.-346.3) 2095 0 R] -/Limits [(lstnumber.-345.5) (lstnumber.-346.3)] ->> endobj -4372 0 obj << -/Names [(lstnumber.-347.1) 2097 0 R (lstnumber.-348.1) 2099 0 R (lstnumber.-348.2) 2100 0 R (lstnumber.-349.1) 2102 0 R (lstnumber.-349.2) 2103 0 R (lstnumber.-349.3) 2104 0 R] -/Limits [(lstnumber.-347.1) (lstnumber.-349.3)] ->> endobj -4373 0 obj << -/Names [(lstnumber.-35.1) 1014 0 R (lstnumber.-350.1) 2107 0 R (lstnumber.-351.1) 2109 0 R (lstnumber.-352.1) 2111 0 R (lstnumber.-353.1) 2113 0 R (lstnumber.-353.2) 2114 0 R] -/Limits [(lstnumber.-35.1) (lstnumber.-353.2)] ->> endobj -4374 0 obj << -/Names [(lstnumber.-354.1) 2116 0 R (lstnumber.-355.1) 2118 0 R (lstnumber.-356.1) 2120 0 R (lstnumber.-357.1) 2122 0 R (lstnumber.-358.1) 2128 0 R (lstnumber.-359.1) 2130 0 R] -/Limits [(lstnumber.-354.1) (lstnumber.-359.1)] ->> endobj -4375 0 obj << -/Names [(lstnumber.-36.1) 1016 0 R (lstnumber.-360.1) 2132 0 R (lstnumber.-361.1) 2134 0 R (lstnumber.-361.2) 2135 0 R (lstnumber.-362.1) 2137 0 R (lstnumber.-363.1) 2139 0 R] -/Limits [(lstnumber.-36.1) (lstnumber.-363.1)] ->> endobj -4376 0 obj << -/Names [(lstnumber.-364.1) 2141 0 R (lstnumber.-365.1) 2143 0 R (lstnumber.-366.1) 2145 0 R (lstnumber.-367.1) 2147 0 R (lstnumber.-368.1) 2149 0 R (lstnumber.-368.2) 2150 0 R] -/Limits [(lstnumber.-364.1) (lstnumber.-368.2)] ->> endobj -4377 0 obj << -/Names [(lstnumber.-369.1) 2152 0 R (lstnumber.-369.2) 2153 0 R (lstnumber.-37.1) 1018 0 R (lstnumber.-370.1) 2155 0 R (lstnumber.-370.2) 2156 0 R (lstnumber.-371.1) 2162 0 R] -/Limits [(lstnumber.-369.1) (lstnumber.-371.1)] ->> endobj -4378 0 obj << -/Names [(lstnumber.-372.1) 2164 0 R (lstnumber.-373.1) 2166 0 R (lstnumber.-374.1) 2168 0 R (lstnumber.-375.1) 2170 0 R (lstnumber.-375.2) 2171 0 R (lstnumber.-376.1) 2173 0 R] -/Limits [(lstnumber.-372.1) (lstnumber.-376.1)] ->> endobj -4379 0 obj << -/Names [(lstnumber.-376.2) 2174 0 R (lstnumber.-376.3) 2175 0 R (lstnumber.-376.4) 2176 0 R (lstnumber.-376.5) 2177 0 R (lstnumber.-377.1) 2179 0 R (lstnumber.-378.1) 2181 0 R] -/Limits [(lstnumber.-376.2) (lstnumber.-378.1)] ->> endobj -4380 0 obj << -/Names [(lstnumber.-379.1) 2183 0 R (lstnumber.-379.2) 2184 0 R (lstnumber.-379.3) 2185 0 R (lstnumber.-38.1) 1020 0 R (lstnumber.-380.1) 2187 0 R (lstnumber.-380.10) 2196 0 R] -/Limits [(lstnumber.-379.1) (lstnumber.-380.10)] ->> endobj -4381 0 obj << -/Names [(lstnumber.-380.11) 2197 0 R (lstnumber.-380.12) 2198 0 R (lstnumber.-380.13) 2199 0 R (lstnumber.-380.14) 2204 0 R (lstnumber.-380.15) 2205 0 R (lstnumber.-380.16) 2206 0 R] -/Limits [(lstnumber.-380.11) (lstnumber.-380.16)] ->> endobj -4382 0 obj << -/Names [(lstnumber.-380.17) 2207 0 R (lstnumber.-380.18) 2208 0 R (lstnumber.-380.19) 2209 0 R (lstnumber.-380.2) 2188 0 R (lstnumber.-380.20) 2210 0 R (lstnumber.-380.21) 2211 0 R] -/Limits [(lstnumber.-380.17) (lstnumber.-380.21)] ->> endobj -4383 0 obj << -/Names [(lstnumber.-380.22) 2212 0 R (lstnumber.-380.23) 2213 0 R (lstnumber.-380.24) 2214 0 R (lstnumber.-380.25) 2215 0 R (lstnumber.-380.26) 2216 0 R (lstnumber.-380.27) 2217 0 R] -/Limits [(lstnumber.-380.22) (lstnumber.-380.27)] ->> endobj -4384 0 obj << -/Names [(lstnumber.-380.28) 2218 0 R (lstnumber.-380.29) 2219 0 R (lstnumber.-380.3) 2189 0 R (lstnumber.-380.30) 2220 0 R (lstnumber.-380.31) 2221 0 R (lstnumber.-380.32) 2222 0 R] -/Limits [(lstnumber.-380.28) (lstnumber.-380.32)] ->> endobj -4385 0 obj << -/Names [(lstnumber.-380.33) 2223 0 R (lstnumber.-380.34) 2224 0 R (lstnumber.-380.35) 2225 0 R (lstnumber.-380.36) 2226 0 R (lstnumber.-380.37) 2227 0 R (lstnumber.-380.38) 2228 0 R] -/Limits [(lstnumber.-380.33) (lstnumber.-380.38)] ->> endobj -4386 0 obj << -/Names [(lstnumber.-380.39) 2229 0 R (lstnumber.-380.4) 2190 0 R (lstnumber.-380.5) 2191 0 R (lstnumber.-380.6) 2192 0 R (lstnumber.-380.7) 2193 0 R (lstnumber.-380.8) 2194 0 R] -/Limits [(lstnumber.-380.39) (lstnumber.-380.8)] ->> endobj -4387 0 obj << -/Names [(lstnumber.-380.9) 2195 0 R (lstnumber.-381.1) 2232 0 R (lstnumber.-382.1) 2234 0 R (lstnumber.-383.1) 2236 0 R (lstnumber.-384.1) 2238 0 R (lstnumber.-384.2) 2239 0 R] -/Limits [(lstnumber.-380.9) (lstnumber.-384.2)] ->> endobj -4388 0 obj << -/Names [(lstnumber.-385.1) 2241 0 R (lstnumber.-385.2) 2242 0 R (lstnumber.-385.3) 2243 0 R (lstnumber.-385.4) 2244 0 R (lstnumber.-385.5) 2245 0 R (lstnumber.-386.1) 2251 0 R] -/Limits [(lstnumber.-385.1) (lstnumber.-386.1)] ->> endobj -4389 0 obj << -/Names [(lstnumber.-387.1) 2253 0 R (lstnumber.-387.2) 2254 0 R (lstnumber.-387.3) 2255 0 R (lstnumber.-387.4) 2256 0 R (lstnumber.-388.1) 2258 0 R (lstnumber.-388.2) 2259 0 R] -/Limits [(lstnumber.-387.1) (lstnumber.-388.2)] ->> endobj -4390 0 obj << -/Names [(lstnumber.-388.3) 2260 0 R (lstnumber.-388.4) 2261 0 R (lstnumber.-389.1) 2263 0 R (lstnumber.-39.1) 1022 0 R (lstnumber.-390.1) 2265 0 R (lstnumber.-391.1) 2267 0 R] -/Limits [(lstnumber.-388.3) (lstnumber.-391.1)] ->> endobj -4391 0 obj << -/Names [(lstnumber.-391.2) 2268 0 R (lstnumber.-391.3) 2269 0 R (lstnumber.-391.4) 2270 0 R (lstnumber.-391.5) 2271 0 R (lstnumber.-391.6) 2272 0 R (lstnumber.-392.1) 2274 0 R] -/Limits [(lstnumber.-391.2) (lstnumber.-392.1)] ->> endobj -4392 0 obj << -/Names [(lstnumber.-392.10) 2283 0 R (lstnumber.-392.11) 2284 0 R (lstnumber.-392.12) 2285 0 R (lstnumber.-392.2) 2275 0 R (lstnumber.-392.3) 2276 0 R (lstnumber.-392.4) 2277 0 R] -/Limits [(lstnumber.-392.10) (lstnumber.-392.4)] ->> endobj -4393 0 obj << -/Names [(lstnumber.-392.5) 2278 0 R (lstnumber.-392.6) 2279 0 R (lstnumber.-392.7) 2280 0 R (lstnumber.-392.8) 2281 0 R (lstnumber.-392.9) 2282 0 R (lstnumber.-393.1) 2287 0 R] -/Limits [(lstnumber.-392.5) (lstnumber.-393.1)] ->> endobj -4394 0 obj << -/Names [(lstnumber.-394.1) 2289 0 R (lstnumber.-394.2) 2290 0 R (lstnumber.-395.1) 2297 0 R (lstnumber.-396.1) 2299 0 R (lstnumber.-397.1) 2301 0 R (lstnumber.-398.1) 2303 0 R] -/Limits [(lstnumber.-394.1) (lstnumber.-398.1)] ->> endobj -4395 0 obj << -/Names [(lstnumber.-398.2) 2304 0 R (lstnumber.-399.1) 2306 0 R (lstnumber.-4.1) 919 0 R (lstnumber.-40.1) 1024 0 R (lstnumber.-40.2) 1025 0 R (lstnumber.-400.1) 2308 0 R] -/Limits [(lstnumber.-398.2) (lstnumber.-400.1)] ->> endobj -4396 0 obj << -/Names [(lstnumber.-401.1) 2310 0 R (lstnumber.-402.1) 2312 0 R (lstnumber.-402.2) 2313 0 R (lstnumber.-403.1) 2315 0 R (lstnumber.-403.2) 2316 0 R (lstnumber.-403.3) 2317 0 R] -/Limits [(lstnumber.-401.1) (lstnumber.-403.3)] ->> endobj -4397 0 obj << -/Names [(lstnumber.-403.4) 2318 0 R (lstnumber.-404.1) 2320 0 R (lstnumber.-405.1) 2322 0 R (lstnumber.-406.1) 2324 0 R (lstnumber.-407.1) 2326 0 R (lstnumber.-408.1) 2332 0 R] -/Limits [(lstnumber.-403.4) (lstnumber.-408.1)] ->> endobj -4398 0 obj << -/Names [(lstnumber.-409.1) 2334 0 R (lstnumber.-409.2) 2335 0 R (lstnumber.-409.3) 2336 0 R (lstnumber.-41.1) 1027 0 R (lstnumber.-41.2) 1028 0 R (lstnumber.-410.1) 2338 0 R] -/Limits [(lstnumber.-409.1) (lstnumber.-410.1)] ->> endobj -4399 0 obj << -/Names [(lstnumber.-410.2) 2339 0 R (lstnumber.-410.3) 2340 0 R (lstnumber.-410.4) 2341 0 R (lstnumber.-410.5) 2342 0 R (lstnumber.-410.6) 2343 0 R (lstnumber.-411.1) 2345 0 R] -/Limits [(lstnumber.-410.2) (lstnumber.-411.1)] ->> endobj -4400 0 obj << -/Names [(lstnumber.-411.2) 2346 0 R (lstnumber.-411.3) 2347 0 R (lstnumber.-412.1) 2349 0 R (lstnumber.-412.2) 2350 0 R (lstnumber.-412.3) 2351 0 R (lstnumber.-412.4) 2352 0 R] -/Limits [(lstnumber.-411.2) (lstnumber.-412.4)] ->> endobj -4401 0 obj << -/Names [(lstnumber.-413.1) 2355 0 R (lstnumber.-414.1) 2357 0 R (lstnumber.-414.2) 2358 0 R (lstnumber.-415.1) 2360 0 R (lstnumber.-416.1) 2362 0 R (lstnumber.-417.1) 2364 0 R] -/Limits [(lstnumber.-413.1) (lstnumber.-417.1)] ->> endobj -4402 0 obj << -/Names [(lstnumber.-418.1) 2370 0 R (lstnumber.-418.2) 2371 0 R (lstnumber.-419.1) 2373 0 R (lstnumber.-419.10) 2382 0 R (lstnumber.-419.11) 2383 0 R (lstnumber.-419.12) 2384 0 R] -/Limits [(lstnumber.-418.1) (lstnumber.-419.12)] ->> endobj -4403 0 obj << -/Names [(lstnumber.-419.13) 2385 0 R (lstnumber.-419.14) 2386 0 R (lstnumber.-419.15) 2387 0 R (lstnumber.-419.16) 2388 0 R (lstnumber.-419.17) 2389 0 R (lstnumber.-419.2) 2374 0 R] -/Limits [(lstnumber.-419.13) (lstnumber.-419.2)] ->> endobj -4404 0 obj << -/Names [(lstnumber.-419.3) 2375 0 R (lstnumber.-419.4) 2376 0 R (lstnumber.-419.5) 2377 0 R (lstnumber.-419.6) 2378 0 R (lstnumber.-419.7) 2379 0 R (lstnumber.-419.8) 2380 0 R] -/Limits [(lstnumber.-419.3) (lstnumber.-419.8)] ->> endobj -4405 0 obj << -/Names [(lstnumber.-419.9) 2381 0 R (lstnumber.-42.1) 1030 0 R (lstnumber.-420.1) 2391 0 R (lstnumber.-421.1) 2393 0 R (lstnumber.-421.2) 2394 0 R (lstnumber.-422.1) 2396 0 R] -/Limits [(lstnumber.-419.9) (lstnumber.-422.1)] ->> endobj -4406 0 obj << -/Names [(lstnumber.-423.1) 2398 0 R (lstnumber.-424.1) 2400 0 R (lstnumber.-424.2) 2401 0 R (lstnumber.-425.1) 2403 0 R (lstnumber.-425.2) 2404 0 R (lstnumber.-426.1) 2406 0 R] -/Limits [(lstnumber.-423.1) (lstnumber.-426.1)] ->> endobj -4407 0 obj << -/Names [(lstnumber.-426.2) 2407 0 R (lstnumber.-426.3) 2408 0 R (lstnumber.-426.4) 2409 0 R (lstnumber.-426.5) 2410 0 R (lstnumber.-426.6) 2411 0 R (lstnumber.-427.1) 2417 0 R] -/Limits [(lstnumber.-426.2) (lstnumber.-427.1)] ->> endobj -4408 0 obj << -/Names [(lstnumber.-428.1) 2419 0 R (lstnumber.-428.2) 2420 0 R (lstnumber.-428.3) 2421 0 R (lstnumber.-429.1) 2423 0 R (lstnumber.-429.2) 2424 0 R (lstnumber.-43.1) 1032 0 R] -/Limits [(lstnumber.-428.1) (lstnumber.-43.1)] ->> endobj -4409 0 obj << -/Names [(lstnumber.-43.2) 1033 0 R (lstnumber.-430.1) 2426 0 R (lstnumber.-430.2) 2427 0 R (lstnumber.-431.1) 2429 0 R (lstnumber.-431.10) 2438 0 R (lstnumber.-431.11) 2439 0 R] -/Limits [(lstnumber.-43.2) (lstnumber.-431.11)] ->> endobj -4410 0 obj << -/Names [(lstnumber.-431.12) 2440 0 R (lstnumber.-431.13) 2441 0 R (lstnumber.-431.14) 2442 0 R (lstnumber.-431.15) 2443 0 R (lstnumber.-431.16) 2444 0 R (lstnumber.-431.17) 2445 0 R] -/Limits [(lstnumber.-431.12) (lstnumber.-431.17)] ->> endobj -4411 0 obj << -/Names [(lstnumber.-431.18) 2446 0 R (lstnumber.-431.19) 2447 0 R (lstnumber.-431.2) 2430 0 R (lstnumber.-431.20) 2448 0 R (lstnumber.-431.3) 2431 0 R (lstnumber.-431.4) 2432 0 R] -/Limits [(lstnumber.-431.18) (lstnumber.-431.4)] ->> endobj -4412 0 obj << -/Names [(lstnumber.-431.5) 2433 0 R (lstnumber.-431.6) 2434 0 R (lstnumber.-431.7) 2435 0 R (lstnumber.-431.8) 2436 0 R (lstnumber.-431.9) 2437 0 R (lstnumber.-432.1) 2450 0 R] -/Limits [(lstnumber.-431.5) (lstnumber.-432.1)] ->> endobj -4413 0 obj << -/Names [(lstnumber.-432.2) 2451 0 R (lstnumber.-432.3) 2452 0 R (lstnumber.-432.4) 2453 0 R (lstnumber.-432.5) 2454 0 R (lstnumber.-433.1) 2456 0 R (lstnumber.-433.2) 2457 0 R] -/Limits [(lstnumber.-432.2) (lstnumber.-433.2)] ->> endobj -4414 0 obj << -/Names [(lstnumber.-433.3) 2458 0 R (lstnumber.-433.4) 2459 0 R (lstnumber.-434.1) 2465 0 R (lstnumber.-434.2) 2466 0 R (lstnumber.-435.1) 2468 0 R (lstnumber.-435.2) 2469 0 R] -/Limits [(lstnumber.-433.3) (lstnumber.-435.2)] ->> endobj -4415 0 obj << -/Names [(lstnumber.-435.3) 2470 0 R (lstnumber.-436.1) 2472 0 R (lstnumber.-436.2) 2473 0 R (lstnumber.-436.3) 2474 0 R (lstnumber.-436.4) 2475 0 R (lstnumber.-437.1) 2477 0 R] -/Limits [(lstnumber.-435.3) (lstnumber.-437.1)] ->> endobj -4416 0 obj << -/Names [(lstnumber.-437.2) 2478 0 R (lstnumber.-437.3) 2479 0 R (lstnumber.-437.4) 2480 0 R (lstnumber.-437.5) 2481 0 R (lstnumber.-437.6) 2482 0 R (lstnumber.-438.1) 2484 0 R] -/Limits [(lstnumber.-437.2) (lstnumber.-438.1)] ->> endobj -4417 0 obj << -/Names [(lstnumber.-438.2) 2485 0 R (lstnumber.-439.1) 2487 0 R (lstnumber.-439.2) 2488 0 R (lstnumber.-44.1) 1035 0 R (lstnumber.-44.2) 1036 0 R (lstnumber.-440.1) 2490 0 R] -/Limits [(lstnumber.-438.2) (lstnumber.-440.1)] ->> endobj -4418 0 obj << -/Names [(lstnumber.-441.1) 2492 0 R (lstnumber.-441.2) 2493 0 R (lstnumber.-441.3) 2494 0 R (lstnumber.-441.4) 2495 0 R (lstnumber.-441.5) 2496 0 R (lstnumber.-442.1) 2498 0 R] -/Limits [(lstnumber.-441.1) (lstnumber.-442.1)] ->> endobj -4419 0 obj << -/Names [(lstnumber.-442.2) 2499 0 R (lstnumber.-442.3) 2500 0 R (lstnumber.-443.1) 2502 0 R (lstnumber.-444.1) 2508 0 R (lstnumber.-444.2) 2509 0 R (lstnumber.-444.3) 2510 0 R] -/Limits [(lstnumber.-442.2) (lstnumber.-444.3)] ->> endobj -4420 0 obj << -/Names [(lstnumber.-444.4) 2511 0 R (lstnumber.-445.1) 2513 0 R (lstnumber.-445.2) 2514 0 R (lstnumber.-445.3) 2515 0 R (lstnumber.-445.4) 2516 0 R (lstnumber.-445.5) 2517 0 R] -/Limits [(lstnumber.-444.4) (lstnumber.-445.5)] ->> endobj -4421 0 obj << -/Names [(lstnumber.-446.1) 2519 0 R (lstnumber.-446.2) 2520 0 R (lstnumber.-446.3) 2521 0 R (lstnumber.-446.4) 2522 0 R (lstnumber.-447.1) 2524 0 R (lstnumber.-447.2) 2525 0 R] -/Limits [(lstnumber.-446.1) (lstnumber.-447.2)] ->> endobj -4422 0 obj << -/Names [(lstnumber.-447.3) 2526 0 R (lstnumber.-448.1) 2528 0 R (lstnumber.-448.2) 2529 0 R (lstnumber.-449.1) 2531 0 R (lstnumber.-449.2) 2532 0 R (lstnumber.-45.1) 1038 0 R] -/Limits [(lstnumber.-447.3) (lstnumber.-45.1)] ->> endobj -4423 0 obj << -/Names [(lstnumber.-45.2) 1039 0 R (lstnumber.-450.1) 2534 0 R (lstnumber.-450.2) 2535 0 R (lstnumber.-451.1) 2537 0 R (lstnumber.-452.1) 2539 0 R (lstnumber.-453.1) 2541 0 R] -/Limits [(lstnumber.-45.2) (lstnumber.-453.1)] ->> endobj -4424 0 obj << -/Names [(lstnumber.-454.1) 2543 0 R (lstnumber.-454.2) 2544 0 R (lstnumber.-455.1) 2551 0 R (lstnumber.-456.1) 2553 0 R (lstnumber.-457.1) 2555 0 R (lstnumber.-457.2) 2556 0 R] -/Limits [(lstnumber.-454.1) (lstnumber.-457.2)] ->> endobj -4425 0 obj << -/Names [(lstnumber.-457.3) 2557 0 R (lstnumber.-458.1) 2559 0 R (lstnumber.-458.2) 2560 0 R (lstnumber.-459.1) 2562 0 R (lstnumber.-459.2) 2563 0 R (lstnumber.-459.3) 2564 0 R] -/Limits [(lstnumber.-457.3) (lstnumber.-459.3)] ->> endobj -4426 0 obj << -/Names [(lstnumber.-46.1) 1041 0 R (lstnumber.-46.2) 1042 0 R (lstnumber.-460.1) 2566 0 R (lstnumber.-461.1) 2568 0 R (lstnumber.-462.1) 2570 0 R (lstnumber.-462.2) 2571 0 R] -/Limits [(lstnumber.-46.1) (lstnumber.-462.2)] ->> endobj -4427 0 obj << -/Names [(lstnumber.-463.1) 2573 0 R (lstnumber.-463.10) 2582 0 R (lstnumber.-463.11) 2583 0 R (lstnumber.-463.12) 2584 0 R (lstnumber.-463.13) 2585 0 R (lstnumber.-463.14) 2586 0 R] -/Limits [(lstnumber.-463.1) (lstnumber.-463.14)] ->> endobj -4428 0 obj << -/Names [(lstnumber.-463.15) 2587 0 R (lstnumber.-463.16) 2588 0 R (lstnumber.-463.17) 2589 0 R (lstnumber.-463.18) 2590 0 R (lstnumber.-463.19) 2591 0 R (lstnumber.-463.2) 2574 0 R] -/Limits [(lstnumber.-463.15) (lstnumber.-463.2)] ->> endobj -4429 0 obj << -/Names [(lstnumber.-463.20) 2592 0 R (lstnumber.-463.21) 2593 0 R (lstnumber.-463.22) 2594 0 R (lstnumber.-463.23) 2595 0 R (lstnumber.-463.3) 2575 0 R (lstnumber.-463.4) 2576 0 R] -/Limits [(lstnumber.-463.20) (lstnumber.-463.4)] ->> endobj -4430 0 obj << -/Names [(lstnumber.-463.5) 2577 0 R (lstnumber.-463.6) 2578 0 R (lstnumber.-463.7) 2579 0 R (lstnumber.-463.8) 2580 0 R (lstnumber.-463.9) 2581 0 R (lstnumber.-464.1) 2601 0 R] -/Limits [(lstnumber.-463.5) (lstnumber.-464.1)] ->> endobj -4431 0 obj << -/Names [(lstnumber.-464.10) 2610 0 R (lstnumber.-464.11) 2611 0 R (lstnumber.-464.12) 2612 0 R (lstnumber.-464.13) 2613 0 R (lstnumber.-464.14) 2614 0 R (lstnumber.-464.15) 2615 0 R] -/Limits [(lstnumber.-464.10) (lstnumber.-464.15)] ->> endobj -4432 0 obj << -/Names [(lstnumber.-464.16) 2616 0 R (lstnumber.-464.17) 2617 0 R (lstnumber.-464.18) 2618 0 R (lstnumber.-464.19) 2619 0 R (lstnumber.-464.2) 2602 0 R (lstnumber.-464.20) 2620 0 R] -/Limits [(lstnumber.-464.16) (lstnumber.-464.20)] ->> endobj -4433 0 obj << -/Names [(lstnumber.-464.21) 2621 0 R (lstnumber.-464.22) 2622 0 R (lstnumber.-464.23) 2623 0 R (lstnumber.-464.24) 2624 0 R (lstnumber.-464.25) 2625 0 R (lstnumber.-464.26) 2626 0 R] -/Limits [(lstnumber.-464.21) (lstnumber.-464.26)] ->> endobj -4434 0 obj << -/Names [(lstnumber.-464.3) 2603 0 R (lstnumber.-464.4) 2604 0 R (lstnumber.-464.5) 2605 0 R (lstnumber.-464.6) 2606 0 R (lstnumber.-464.7) 2607 0 R (lstnumber.-464.8) 2608 0 R] -/Limits [(lstnumber.-464.3) (lstnumber.-464.8)] ->> endobj -4435 0 obj << -/Names [(lstnumber.-464.9) 2609 0 R (lstnumber.-465.1) 2628 0 R (lstnumber.-466.1) 2630 0 R (lstnumber.-466.2) 2631 0 R (lstnumber.-466.3) 2632 0 R (lstnumber.-466.4) 2633 0 R] -/Limits [(lstnumber.-464.9) (lstnumber.-466.4)] ->> endobj -4436 0 obj << -/Names [(lstnumber.-467.1) 2635 0 R (lstnumber.-467.2) 2636 0 R (lstnumber.-467.3) 2637 0 R (lstnumber.-467.4) 2638 0 R (lstnumber.-468.1) 2640 0 R (lstnumber.-469.1) 2642 0 R] -/Limits [(lstnumber.-467.1) (lstnumber.-469.1)] ->> endobj -4437 0 obj << -/Names [(lstnumber.-469.2) 2643 0 R (lstnumber.-469.3) 2644 0 R (lstnumber.-469.4) 2645 0 R (lstnumber.-47.1) 1049 0 R (lstnumber.-470.1) 2651 0 R (lstnumber.-470.2) 2652 0 R] -/Limits [(lstnumber.-469.2) (lstnumber.-470.2)] ->> endobj -4438 0 obj << -/Names [(lstnumber.-470.3) 2653 0 R (lstnumber.-471.1) 2655 0 R (lstnumber.-471.2) 2656 0 R (lstnumber.-471.3) 2657 0 R (lstnumber.-471.4) 2658 0 R (lstnumber.-471.5) 2659 0 R] -/Limits [(lstnumber.-470.3) (lstnumber.-471.5)] ->> endobj -4439 0 obj << -/Names [(lstnumber.-472.1) 2661 0 R (lstnumber.-472.2) 2662 0 R (lstnumber.-473.1) 2664 0 R (lstnumber.-474.1) 2666 0 R (lstnumber.-474.2) 2667 0 R (lstnumber.-475.1) 2669 0 R] -/Limits [(lstnumber.-472.1) (lstnumber.-475.1)] ->> endobj -4440 0 obj << -/Names [(lstnumber.-475.2) 2670 0 R (lstnumber.-476.1) 2672 0 R (lstnumber.-476.2) 2673 0 R (lstnumber.-476.3) 2674 0 R (lstnumber.-477.1) 2676 0 R (lstnumber.-477.10) 2685 0 R] -/Limits [(lstnumber.-475.2) (lstnumber.-477.10)] ->> endobj -4441 0 obj << -/Names [(lstnumber.-477.11) 2686 0 R (lstnumber.-477.12) 2687 0 R (lstnumber.-477.13) 2688 0 R (lstnumber.-477.14) 2689 0 R (lstnumber.-477.15) 2690 0 R (lstnumber.-477.16) 2691 0 R] -/Limits [(lstnumber.-477.11) (lstnumber.-477.16)] ->> endobj -4442 0 obj << -/Names [(lstnumber.-477.17) 2692 0 R (lstnumber.-477.18) 2693 0 R (lstnumber.-477.19) 2694 0 R (lstnumber.-477.2) 2677 0 R (lstnumber.-477.20) 2695 0 R (lstnumber.-477.21) 2696 0 R] -/Limits [(lstnumber.-477.17) (lstnumber.-477.21)] ->> endobj -4443 0 obj << -/Names [(lstnumber.-477.22) 2701 0 R (lstnumber.-477.23) 2702 0 R (lstnumber.-477.24) 2703 0 R (lstnumber.-477.25) 2704 0 R (lstnumber.-477.26) 2705 0 R (lstnumber.-477.3) 2678 0 R] -/Limits [(lstnumber.-477.22) (lstnumber.-477.3)] ->> endobj -4444 0 obj << -/Names [(lstnumber.-477.4) 2679 0 R (lstnumber.-477.5) 2680 0 R (lstnumber.-477.6) 2681 0 R (lstnumber.-477.7) 2682 0 R (lstnumber.-477.8) 2683 0 R (lstnumber.-477.9) 2684 0 R] -/Limits [(lstnumber.-477.4) (lstnumber.-477.9)] ->> endobj -4445 0 obj << -/Names [(lstnumber.-478.1) 2707 0 R (lstnumber.-479.1) 2709 0 R (lstnumber.-479.2) 2710 0 R (lstnumber.-479.3) 2711 0 R (lstnumber.-48.1) 1051 0 R (lstnumber.-48.2) 1052 0 R] -/Limits [(lstnumber.-478.1) (lstnumber.-48.2)] ->> endobj -4446 0 obj << -/Names [(lstnumber.-480.1) 2713 0 R (lstnumber.-480.2) 2714 0 R (lstnumber.-480.3) 2715 0 R (lstnumber.-481.1) 2717 0 R (lstnumber.-481.2) 2718 0 R (lstnumber.-481.3) 2719 0 R] -/Limits [(lstnumber.-480.1) (lstnumber.-481.3)] ->> endobj -4447 0 obj << -/Names [(lstnumber.-482.1) 2721 0 R (lstnumber.-482.2) 2722 0 R (lstnumber.-482.3) 2723 0 R (lstnumber.-482.4) 2724 0 R (lstnumber.-483.1) 2726 0 R (lstnumber.-483.2) 2727 0 R] -/Limits [(lstnumber.-482.1) (lstnumber.-483.2)] ->> endobj -4448 0 obj << -/Names [(lstnumber.-483.3) 2728 0 R (lstnumber.-483.4) 2729 0 R (lstnumber.-483.5) 2730 0 R (lstnumber.-483.6) 2731 0 R (lstnumber.-483.7) 2732 0 R (lstnumber.-483.8) 2733 0 R] -/Limits [(lstnumber.-483.3) (lstnumber.-483.8)] ->> endobj -4449 0 obj << -/Names [(lstnumber.-484.1) 2735 0 R (lstnumber.-485.1) 2737 0 R (lstnumber.-485.2) 2738 0 R (lstnumber.-486.1) 2740 0 R (lstnumber.-486.2) 2741 0 R (lstnumber.-486.3) 2742 0 R] -/Limits [(lstnumber.-484.1) (lstnumber.-486.3)] ->> endobj -4450 0 obj << -/Names [(lstnumber.-487.1) 2748 0 R (lstnumber.-487.2) 2749 0 R (lstnumber.-488.1) 2751 0 R (lstnumber.-488.2) 2752 0 R (lstnumber.-488.3) 2753 0 R (lstnumber.-489.1) 2756 0 R] -/Limits [(lstnumber.-487.1) (lstnumber.-489.1)] ->> endobj -4451 0 obj << -/Names [(lstnumber.-49.1) 1054 0 R (lstnumber.-490.1) 2758 0 R (lstnumber.-491.1) 2760 0 R (lstnumber.-492.1) 2762 0 R (lstnumber.-493.1) 2764 0 R (lstnumber.-494.1) 2766 0 R] -/Limits [(lstnumber.-49.1) (lstnumber.-494.1)] ->> endobj -4452 0 obj << -/Names [(lstnumber.-494.2) 2767 0 R (lstnumber.-495.1) 2769 0 R (lstnumber.-495.10) 2778 0 R (lstnumber.-495.11) 2779 0 R (lstnumber.-495.12) 2780 0 R (lstnumber.-495.13) 2785 0 R] -/Limits [(lstnumber.-494.2) (lstnumber.-495.13)] ->> endobj -4453 0 obj << -/Names [(lstnumber.-495.14) 2786 0 R (lstnumber.-495.15) 2787 0 R (lstnumber.-495.16) 2788 0 R (lstnumber.-495.17) 2789 0 R (lstnumber.-495.18) 2790 0 R (lstnumber.-495.19) 2791 0 R] -/Limits [(lstnumber.-495.14) (lstnumber.-495.19)] ->> endobj -4454 0 obj << -/Names [(lstnumber.-495.2) 2770 0 R (lstnumber.-495.20) 2792 0 R (lstnumber.-495.21) 2793 0 R (lstnumber.-495.22) 2794 0 R (lstnumber.-495.23) 2795 0 R (lstnumber.-495.24) 2796 0 R] -/Limits [(lstnumber.-495.2) (lstnumber.-495.24)] ->> endobj -4455 0 obj << -/Names [(lstnumber.-495.25) 2797 0 R (lstnumber.-495.26) 2798 0 R (lstnumber.-495.27) 2799 0 R (lstnumber.-495.28) 2800 0 R (lstnumber.-495.29) 2801 0 R (lstnumber.-495.3) 2771 0 R] -/Limits [(lstnumber.-495.25) (lstnumber.-495.3)] ->> endobj -4456 0 obj << -/Names [(lstnumber.-495.30) 2802 0 R (lstnumber.-495.31) 2803 0 R (lstnumber.-495.32) 2804 0 R (lstnumber.-495.33) 2805 0 R (lstnumber.-495.34) 2806 0 R (lstnumber.-495.35) 2807 0 R] -/Limits [(lstnumber.-495.30) (lstnumber.-495.35)] ->> endobj -4457 0 obj << -/Names [(lstnumber.-495.36) 2808 0 R (lstnumber.-495.37) 2809 0 R (lstnumber.-495.38) 2810 0 R (lstnumber.-495.39) 2811 0 R (lstnumber.-495.4) 2772 0 R (lstnumber.-495.5) 2773 0 R] -/Limits [(lstnumber.-495.36) (lstnumber.-495.5)] ->> endobj -4458 0 obj << -/Names [(lstnumber.-495.6) 2774 0 R (lstnumber.-495.7) 2775 0 R (lstnumber.-495.8) 2776 0 R (lstnumber.-495.9) 2777 0 R (lstnumber.-496.1) 2814 0 R (lstnumber.-496.2) 2815 0 R] -/Limits [(lstnumber.-495.6) (lstnumber.-496.2)] ->> endobj -4459 0 obj << -/Names [(lstnumber.-496.3) 2816 0 R (lstnumber.-496.4) 2817 0 R (lstnumber.-497.1) 2820 0 R (lstnumber.-498.1) 2822 0 R (lstnumber.-499.1) 2824 0 R (lstnumber.-499.2) 2825 0 R] -/Limits [(lstnumber.-496.3) (lstnumber.-499.2)] ->> endobj -4460 0 obj << -/Names [(lstnumber.-5.1) 922 0 R (lstnumber.-50.1) 1056 0 R (lstnumber.-500.1) 2832 0 R (lstnumber.-501.1) 2834 0 R (lstnumber.-501.2) 2835 0 R (lstnumber.-501.3) 2836 0 R] -/Limits [(lstnumber.-5.1) (lstnumber.-501.3)] ->> endobj -4461 0 obj << -/Names [(lstnumber.-501.4) 2837 0 R (lstnumber.-502.1) 2840 0 R (lstnumber.-502.2) 2841 0 R (lstnumber.-502.3) 2842 0 R (lstnumber.-502.4) 2843 0 R (lstnumber.-503.1) 2846 0 R] -/Limits [(lstnumber.-501.4) (lstnumber.-503.1)] ->> endobj -4462 0 obj << -/Names [(lstnumber.-504.1) 2848 0 R (lstnumber.-505.1) 2850 0 R (lstnumber.-506.1) 2852 0 R (lstnumber.-507.1) 2854 0 R (lstnumber.-508.1) 2856 0 R (lstnumber.-509.1) 2858 0 R] -/Limits [(lstnumber.-504.1) (lstnumber.-509.1)] ->> endobj -4463 0 obj << -/Names [(lstnumber.-51.1) 1058 0 R (lstnumber.-510.1) 2864 0 R (lstnumber.-511.1) 2866 0 R (lstnumber.-512.1) 2868 0 R (lstnumber.-513.1) 2870 0 R (lstnumber.-514.1) 2872 0 R] -/Limits [(lstnumber.-51.1) (lstnumber.-514.1)] ->> endobj -4464 0 obj << -/Names [(lstnumber.-515.1) 2874 0 R (lstnumber.-516.1) 2877 0 R (lstnumber.-516.2) 2878 0 R (lstnumber.-516.3) 2879 0 R (lstnumber.-516.4) 2880 0 R (lstnumber.-517.1) 2882 0 R] -/Limits [(lstnumber.-515.1) (lstnumber.-517.1)] ->> endobj -4465 0 obj << -/Names [(lstnumber.-518.1) 2885 0 R (lstnumber.-519.1) 2892 0 R (lstnumber.-52.1) 1060 0 R (lstnumber.-520.1) 2894 0 R (lstnumber.-521.1) 2896 0 R (lstnumber.-522.1) 2898 0 R] -/Limits [(lstnumber.-518.1) (lstnumber.-522.1)] ->> endobj -4466 0 obj << -/Names [(lstnumber.-523.1) 2900 0 R (lstnumber.-523.2) 2901 0 R (lstnumber.-524.1) 2903 0 R (lstnumber.-524.10) 2912 0 R (lstnumber.-524.11) 2913 0 R (lstnumber.-524.12) 2914 0 R] -/Limits [(lstnumber.-523.1) (lstnumber.-524.12)] ->> endobj -4467 0 obj << -/Names [(lstnumber.-524.13) 2915 0 R (lstnumber.-524.14) 2916 0 R (lstnumber.-524.15) 2917 0 R (lstnumber.-524.16) 2918 0 R (lstnumber.-524.17) 2919 0 R (lstnumber.-524.18) 2920 0 R] -/Limits [(lstnumber.-524.13) (lstnumber.-524.18)] ->> endobj -4468 0 obj << -/Names [(lstnumber.-524.19) 2921 0 R (lstnumber.-524.2) 2904 0 R (lstnumber.-524.20) 2922 0 R (lstnumber.-524.3) 2905 0 R (lstnumber.-524.4) 2906 0 R (lstnumber.-524.5) 2907 0 R] -/Limits [(lstnumber.-524.19) (lstnumber.-524.5)] ->> endobj -4469 0 obj << -/Names [(lstnumber.-524.6) 2908 0 R (lstnumber.-524.7) 2909 0 R (lstnumber.-524.8) 2910 0 R (lstnumber.-524.9) 2911 0 R (lstnumber.-525.1) 2924 0 R (lstnumber.-525.2) 2925 0 R] -/Limits [(lstnumber.-524.6) (lstnumber.-525.2)] ->> endobj -4470 0 obj << -/Names [(lstnumber.-525.3) 2926 0 R (lstnumber.-526.1) 2928 0 R (lstnumber.-526.2) 2929 0 R (lstnumber.-527.1) 2935 0 R (lstnumber.-527.2) 2936 0 R (lstnumber.-528.1) 2938 0 R] -/Limits [(lstnumber.-525.3) (lstnumber.-528.1)] ->> endobj -4471 0 obj << -/Names [(lstnumber.-528.10) 2947 0 R (lstnumber.-528.11) 2948 0 R (lstnumber.-528.12) 2949 0 R (lstnumber.-528.13) 2950 0 R (lstnumber.-528.14) 2951 0 R (lstnumber.-528.15) 2952 0 R] -/Limits [(lstnumber.-528.10) (lstnumber.-528.15)] ->> endobj -4472 0 obj << -/Names [(lstnumber.-528.16) 2953 0 R (lstnumber.-528.17) 2954 0 R (lstnumber.-528.18) 2955 0 R (lstnumber.-528.19) 2956 0 R (lstnumber.-528.2) 2939 0 R (lstnumber.-528.20) 2957 0 R] -/Limits [(lstnumber.-528.16) (lstnumber.-528.20)] ->> endobj -4473 0 obj << -/Names [(lstnumber.-528.21) 2958 0 R (lstnumber.-528.22) 2959 0 R (lstnumber.-528.23) 2960 0 R (lstnumber.-528.3) 2940 0 R (lstnumber.-528.4) 2941 0 R (lstnumber.-528.5) 2942 0 R] -/Limits [(lstnumber.-528.21) (lstnumber.-528.5)] ->> endobj -4474 0 obj << -/Names [(lstnumber.-528.6) 2943 0 R (lstnumber.-528.7) 2944 0 R (lstnumber.-528.8) 2945 0 R (lstnumber.-528.9) 2946 0 R (lstnumber.-529.1) 2962 0 R (lstnumber.-529.10) 2971 0 R] -/Limits [(lstnumber.-528.6) (lstnumber.-529.10)] ->> endobj -4475 0 obj << -/Names [(lstnumber.-529.11) 2972 0 R (lstnumber.-529.12) 2973 0 R (lstnumber.-529.13) 2974 0 R (lstnumber.-529.14) 2975 0 R (lstnumber.-529.15) 2976 0 R (lstnumber.-529.16) 2977 0 R] -/Limits [(lstnumber.-529.11) (lstnumber.-529.16)] ->> endobj -4476 0 obj << -/Names [(lstnumber.-529.17) 2978 0 R (lstnumber.-529.18) 2979 0 R (lstnumber.-529.19) 2980 0 R (lstnumber.-529.2) 2963 0 R (lstnumber.-529.20) 2981 0 R (lstnumber.-529.3) 2964 0 R] -/Limits [(lstnumber.-529.17) (lstnumber.-529.3)] ->> endobj -4477 0 obj << -/Names [(lstnumber.-529.4) 2965 0 R (lstnumber.-529.5) 2966 0 R (lstnumber.-529.6) 2967 0 R (lstnumber.-529.7) 2968 0 R (lstnumber.-529.8) 2969 0 R (lstnumber.-529.9) 2970 0 R] -/Limits [(lstnumber.-529.4) (lstnumber.-529.9)] ->> endobj -4478 0 obj << -/Names [(lstnumber.-53.1) 1062 0 R (lstnumber.-530.1) 2983 0 R (lstnumber.-531.1) 2985 0 R (lstnumber.-532.1) 2991 0 R (lstnumber.-532.2) 2992 0 R (lstnumber.-532.3) 2993 0 R] -/Limits [(lstnumber.-53.1) (lstnumber.-532.3)] ->> endobj -4479 0 obj << -/Names [(lstnumber.-533.1) 2995 0 R (lstnumber.-533.2) 2996 0 R (lstnumber.-534.1) 2998 0 R (lstnumber.-534.2) 2999 0 R (lstnumber.-535.1) 3001 0 R (lstnumber.-536.1) 3003 0 R] -/Limits [(lstnumber.-533.1) (lstnumber.-536.1)] ->> endobj -4480 0 obj << -/Names [(lstnumber.-537.1) 3005 0 R (lstnumber.-538.1) 3007 0 R (lstnumber.-539.1) 3009 0 R (lstnumber.-54.1) 1064 0 R (lstnumber.-540.1) 3011 0 R (lstnumber.-541.1) 3013 0 R] -/Limits [(lstnumber.-537.1) (lstnumber.-541.1)] ->> endobj -4481 0 obj << -/Names [(lstnumber.-542.1) 3015 0 R (lstnumber.-543.1) 3017 0 R (lstnumber.-544.1) 3019 0 R (lstnumber.-545.1) 3021 0 R (lstnumber.-545.2) 3022 0 R (lstnumber.-546.1) 3029 0 R] -/Limits [(lstnumber.-542.1) (lstnumber.-546.1)] ->> endobj -4482 0 obj << -/Names [(lstnumber.-547.1) 3031 0 R (lstnumber.-547.2) 3032 0 R (lstnumber.-548.1) 3035 0 R (lstnumber.-548.2) 3036 0 R (lstnumber.-549.1) 3038 0 R (lstnumber.-55.1) 1066 0 R] -/Limits [(lstnumber.-547.1) (lstnumber.-55.1)] ->> endobj -4483 0 obj << -/Names [(lstnumber.-550.1) 3040 0 R (lstnumber.-550.2) 3041 0 R (lstnumber.-550.3) 3042 0 R (lstnumber.-550.4) 3043 0 R (lstnumber.-551.1) 3045 0 R (lstnumber.-551.2) 3046 0 R] -/Limits [(lstnumber.-550.1) (lstnumber.-551.2)] ->> endobj -4484 0 obj << -/Names [(lstnumber.-552.1) 3048 0 R (lstnumber.-552.2) 3049 0 R (lstnumber.-553.1) 3051 0 R (lstnumber.-553.2) 3052 0 R (lstnumber.-553.3) 3053 0 R (lstnumber.-553.4) 3054 0 R] -/Limits [(lstnumber.-552.1) (lstnumber.-553.4)] ->> endobj -4485 0 obj << -/Names [(lstnumber.-554.1) 3056 0 R (lstnumber.-554.2) 3057 0 R (lstnumber.-554.3) 3058 0 R (lstnumber.-554.4) 3059 0 R (lstnumber.-555.1) 3067 0 R (lstnumber.-556.1) 3069 0 R] -/Limits [(lstnumber.-554.1) (lstnumber.-556.1)] ->> endobj -4486 0 obj << -/Names [(lstnumber.-556.2) 3070 0 R (lstnumber.-557.1) 3072 0 R (lstnumber.-558.1) 3075 0 R (lstnumber.-558.2) 3076 0 R (lstnumber.-559.1) 3078 0 R (lstnumber.-559.2) 3079 0 R] -/Limits [(lstnumber.-556.2) (lstnumber.-559.2)] ->> endobj -4487 0 obj << -/Names [(lstnumber.-56.1) 1068 0 R (lstnumber.-56.2) 1069 0 R (lstnumber.-56.3) 1070 0 R (lstnumber.-560.1) 3081 0 R (lstnumber.-561.1) 3083 0 R (lstnumber.-562.1) 3086 0 R] -/Limits [(lstnumber.-56.1) (lstnumber.-562.1)] ->> endobj -4488 0 obj << -/Names [(lstnumber.-562.2) 3087 0 R (lstnumber.-563.1) 3089 0 R (lstnumber.-563.2) 3090 0 R (lstnumber.-564.1) 3092 0 R (lstnumber.-565.1) 3094 0 R (lstnumber.-566.1) 3101 0 R] -/Limits [(lstnumber.-562.2) (lstnumber.-566.1)] ->> endobj -4489 0 obj << -/Names [(lstnumber.-566.2) 3102 0 R (lstnumber.-567.1) 3104 0 R (lstnumber.-567.2) 3105 0 R (lstnumber.-568.1) 3107 0 R (lstnumber.-569.1) 3109 0 R (lstnumber.-57.1) 1072 0 R] -/Limits [(lstnumber.-566.2) (lstnumber.-57.1)] ->> endobj -4490 0 obj << -/Names [(lstnumber.-570.1) 3114 0 R (lstnumber.-571.1) 3116 0 R (lstnumber.-572.1) 3123 0 R (lstnumber.-572.2) 3124 0 R (lstnumber.-572.3) 3125 0 R (lstnumber.-572.4) 3126 0 R] -/Limits [(lstnumber.-570.1) (lstnumber.-572.4)] ->> endobj -4491 0 obj << -/Names [(lstnumber.-572.5) 3127 0 R (lstnumber.-573.1) 3129 0 R (lstnumber.-574.1) 3131 0 R (lstnumber.-574.2) 3132 0 R (lstnumber.-575.1) 3135 0 R (lstnumber.-575.2) 3136 0 R] -/Limits [(lstnumber.-572.5) (lstnumber.-575.2)] ->> endobj -4492 0 obj << -/Names [(lstnumber.-576.1) 3138 0 R (lstnumber.-576.2) 3139 0 R (lstnumber.-576.3) 3140 0 R (lstnumber.-576.4) 3141 0 R (lstnumber.-576.5) 3142 0 R (lstnumber.-576.6) 3143 0 R] -/Limits [(lstnumber.-576.1) (lstnumber.-576.6)] ->> endobj -4493 0 obj << -/Names [(lstnumber.-576.7) 3144 0 R (lstnumber.-577.1) 3146 0 R (lstnumber.-577.2) 3147 0 R (lstnumber.-577.3) 3148 0 R (lstnumber.-578.1) 3150 0 R (lstnumber.-579.1) 3152 0 R] -/Limits [(lstnumber.-576.7) (lstnumber.-579.1)] ->> endobj -4494 0 obj << -/Names [(lstnumber.-579.2) 3153 0 R (lstnumber.-579.3) 3154 0 R (lstnumber.-579.4) 3155 0 R (lstnumber.-58.1) 1074 0 R (lstnumber.-580.1) 3157 0 R (lstnumber.-580.2) 3158 0 R] -/Limits [(lstnumber.-579.2) (lstnumber.-580.2)] ->> endobj -4495 0 obj << -/Names [(lstnumber.-581.1) 3160 0 R (lstnumber.-581.2) 3161 0 R (lstnumber.-582.1) 3168 0 R (lstnumber.-582.2) 3169 0 R (lstnumber.-582.3) 3170 0 R (lstnumber.-582.4) 3171 0 R] -/Limits [(lstnumber.-581.1) (lstnumber.-582.4)] ->> endobj -4496 0 obj << -/Names [(lstnumber.-583.1) 3174 0 R (lstnumber.-583.2) 3175 0 R (lstnumber.-584.1) 3178 0 R (lstnumber.-584.2) 3179 0 R (lstnumber.-585.1) 3182 0 R (lstnumber.-585.2) 3183 0 R] -/Limits [(lstnumber.-583.1) (lstnumber.-585.2)] ->> endobj -4497 0 obj << -/Names [(lstnumber.-586.1) 3186 0 R (lstnumber.-586.2) 3187 0 R (lstnumber.-587.1) 3195 0 R (lstnumber.-587.2) 3196 0 R (lstnumber.-588.1) 3198 0 R (lstnumber.-589.1) 3203 0 R] -/Limits [(lstnumber.-586.1) (lstnumber.-589.1)] ->> endobj -4498 0 obj << -/Names [(lstnumber.-59.1) 1081 0 R (lstnumber.-59.2) 1082 0 R (lstnumber.-590.1) 3209 0 R (lstnumber.-591.1) 3211 0 R (lstnumber.-592.1) 3213 0 R (lstnumber.-593.1) 3215 0 R] -/Limits [(lstnumber.-59.1) (lstnumber.-593.1)] ->> endobj -4499 0 obj << -/Names [(lstnumber.-594.1) 3217 0 R (lstnumber.-595.1) 3219 0 R (lstnumber.-596.1) 3221 0 R (lstnumber.-597.1) 3223 0 R (lstnumber.-598.1) 3225 0 R (lstnumber.-599.1) 3228 0 R] -/Limits [(lstnumber.-594.1) (lstnumber.-599.1)] ->> endobj -4500 0 obj << -/Names [(lstnumber.-599.2) 3229 0 R (lstnumber.-599.3) 3230 0 R (lstnumber.-6.1) 927 0 R (lstnumber.-60.1) 1084 0 R (lstnumber.-600.1) 3232 0 R (lstnumber.-600.2) 3233 0 R] -/Limits [(lstnumber.-599.2) (lstnumber.-600.2)] ->> endobj -4501 0 obj << -/Names [(lstnumber.-601.1) 3235 0 R (lstnumber.-601.2) 3236 0 R (lstnumber.-601.3) 3237 0 R (lstnumber.-601.4) 3238 0 R (lstnumber.-602.1) 3245 0 R (lstnumber.-603.1) 3247 0 R] -/Limits [(lstnumber.-601.1) (lstnumber.-603.1)] ->> endobj -4502 0 obj << -/Names [(lstnumber.-603.2) 3248 0 R (lstnumber.-603.3) 3249 0 R (lstnumber.-603.4) 3250 0 R (lstnumber.-603.5) 3251 0 R (lstnumber.-603.6) 3252 0 R (lstnumber.-604.1) 3254 0 R] -/Limits [(lstnumber.-603.2) (lstnumber.-604.1)] ->> endobj -4503 0 obj << -/Names [(lstnumber.-604.2) 3255 0 R (lstnumber.-605.1) 3258 0 R (lstnumber.-606.1) 3260 0 R (lstnumber.-606.2) 3261 0 R (lstnumber.-607.1) 3263 0 R (lstnumber.-608.1) 3265 0 R] -/Limits [(lstnumber.-604.2) (lstnumber.-608.1)] ->> endobj -4504 0 obj << -/Names [(lstnumber.-609.1) 3267 0 R (lstnumber.-61.1) 1086 0 R (lstnumber.-61.2) 1087 0 R (lstnumber.-61.3) 1088 0 R (lstnumber.-610.1) 3269 0 R (lstnumber.-611.1) 3271 0 R] -/Limits [(lstnumber.-609.1) (lstnumber.-611.1)] ->> endobj -4505 0 obj << -/Names [(lstnumber.-612.1) 3273 0 R (lstnumber.-613.1) 3275 0 R (lstnumber.-614.1) 3281 0 R (lstnumber.-615.1) 3283 0 R (lstnumber.-616.1) 3285 0 R (lstnumber.-616.2) 3286 0 R] -/Limits [(lstnumber.-612.1) (lstnumber.-616.2)] ->> endobj -4506 0 obj << -/Names [(lstnumber.-616.3) 3287 0 R (lstnumber.-616.4) 3288 0 R (lstnumber.-617.1) 3290 0 R (lstnumber.-617.2) 3291 0 R (lstnumber.-618.1) 3293 0 R (lstnumber.-618.2) 3294 0 R] -/Limits [(lstnumber.-616.3) (lstnumber.-618.2)] ->> endobj -4507 0 obj << -/Names [(lstnumber.-619.1) 3296 0 R (lstnumber.-619.2) 3297 0 R (lstnumber.-62.1) 1090 0 R (lstnumber.-62.2) 1091 0 R (lstnumber.-620.1) 3299 0 R (lstnumber.-620.2) 3300 0 R] -/Limits [(lstnumber.-619.1) (lstnumber.-620.2)] ->> endobj -4508 0 obj << -/Names [(lstnumber.-621.1) 3302 0 R (lstnumber.-622.1) 3304 0 R (lstnumber.-623.1) 3306 0 R (lstnumber.-624.1) 3308 0 R (lstnumber.-624.2) 3309 0 R (lstnumber.-624.3) 3310 0 R] -/Limits [(lstnumber.-621.1) (lstnumber.-624.3)] ->> endobj -4509 0 obj << -/Names [(lstnumber.-625.1) 3312 0 R (lstnumber.-626.1) 3314 0 R (lstnumber.-627.1) 3321 0 R (lstnumber.-627.2) 3322 0 R (lstnumber.-628.1) 3324 0 R (lstnumber.-628.2) 3325 0 R] -/Limits [(lstnumber.-625.1) (lstnumber.-628.2)] ->> endobj -4510 0 obj << -/Names [(lstnumber.-628.3) 3326 0 R (lstnumber.-628.4) 3327 0 R (lstnumber.-628.5) 3328 0 R (lstnumber.-628.6) 3329 0 R (lstnumber.-629.1) 3331 0 R (lstnumber.-629.2) 3332 0 R] -/Limits [(lstnumber.-628.3) (lstnumber.-629.2)] ->> endobj -4511 0 obj << -/Names [(lstnumber.-63.1) 1093 0 R (lstnumber.-630.1) 3334 0 R (lstnumber.-630.2) 3335 0 R (lstnumber.-631.1) 3337 0 R (lstnumber.-631.2) 3338 0 R (lstnumber.-632.1) 3340 0 R] -/Limits [(lstnumber.-63.1) (lstnumber.-632.1)] ->> endobj -4512 0 obj << -/Names [(lstnumber.-632.2) 3341 0 R (lstnumber.-633.1) 3343 0 R (lstnumber.-633.2) 3344 0 R (lstnumber.-633.3) 3345 0 R (lstnumber.-633.4) 3346 0 R (lstnumber.-633.5) 3347 0 R] -/Limits [(lstnumber.-632.2) (lstnumber.-633.5)] ->> endobj -4513 0 obj << -/Names [(lstnumber.-634.1) 3349 0 R (lstnumber.-634.2) 3350 0 R (lstnumber.-634.3) 3351 0 R (lstnumber.-634.4) 3352 0 R (lstnumber.-634.5) 3353 0 R (lstnumber.-634.6) 3354 0 R] -/Limits [(lstnumber.-634.1) (lstnumber.-634.6)] ->> endobj -4514 0 obj << -/Names [(lstnumber.-634.7) 3355 0 R (lstnumber.-634.8) 3356 0 R (lstnumber.-634.9) 3357 0 R (lstnumber.-635.1) 3363 0 R (lstnumber.-635.2) 3364 0 R (lstnumber.-636.1) 3366 0 R] -/Limits [(lstnumber.-634.7) (lstnumber.-636.1)] ->> endobj -4515 0 obj << -/Names [(lstnumber.-636.2) 3367 0 R (lstnumber.-636.3) 3368 0 R (lstnumber.-636.4) 3369 0 R (lstnumber.-636.5) 3370 0 R (lstnumber.-636.6) 3371 0 R (lstnumber.-637.1) 3373 0 R] -/Limits [(lstnumber.-636.2) (lstnumber.-637.1)] ->> endobj -4516 0 obj << -/Names [(lstnumber.-638.1) 3375 0 R (lstnumber.-639.1) 3377 0 R (lstnumber.-64.1) 1096 0 R (lstnumber.-640.1) 3379 0 R (lstnumber.-641.1) 3381 0 R (lstnumber.-642.1) 3383 0 R] -/Limits [(lstnumber.-638.1) (lstnumber.-642.1)] ->> endobj -4517 0 obj << -/Names [(lstnumber.-643.1) 3385 0 R (lstnumber.-644.1) 3387 0 R (lstnumber.-645.1) 3389 0 R (lstnumber.-645.2) 3390 0 R (lstnumber.-645.3) 3391 0 R (lstnumber.-645.4) 3392 0 R] -/Limits [(lstnumber.-643.1) (lstnumber.-645.4)] ->> endobj -4518 0 obj << -/Names [(lstnumber.-646.1) 3394 0 R (lstnumber.-647.1) 3400 0 R (lstnumber.-648.1) 3402 0 R (lstnumber.-648.2) 3403 0 R (lstnumber.-648.3) 3404 0 R (lstnumber.-649.1) 3406 0 R] -/Limits [(lstnumber.-646.1) (lstnumber.-649.1)] ->> endobj -4519 0 obj << -/Names [(lstnumber.-649.2) 3407 0 R (lstnumber.-65.1) 1098 0 R (lstnumber.-650.1) 3409 0 R (lstnumber.-650.2) 3410 0 R (lstnumber.-650.3) 3411 0 R (lstnumber.-650.4) 3412 0 R] -/Limits [(lstnumber.-649.2) (lstnumber.-650.4)] ->> endobj -4520 0 obj << -/Names [(lstnumber.-651.1) 3415 0 R (lstnumber.-651.2) 3416 0 R (lstnumber.-651.3) 3417 0 R (lstnumber.-651.4) 3418 0 R (lstnumber.-651.5) 3419 0 R (lstnumber.-652.1) 3421 0 R] -/Limits [(lstnumber.-651.1) (lstnumber.-652.1)] ->> endobj -4521 0 obj << -/Names [(lstnumber.-652.2) 3422 0 R (lstnumber.-652.3) 3423 0 R (lstnumber.-652.4) 3424 0 R (lstnumber.-652.5) 3425 0 R (lstnumber.-653.1) 3427 0 R (lstnumber.-653.2) 3428 0 R] -/Limits [(lstnumber.-652.2) (lstnumber.-653.2)] ->> endobj -4522 0 obj << -/Names [(lstnumber.-654.1) 3430 0 R (lstnumber.-654.2) 3431 0 R (lstnumber.-654.3) 3432 0 R (lstnumber.-655.1) 3434 0 R (lstnumber.-655.2) 3435 0 R (lstnumber.-656.1) 3441 0 R] -/Limits [(lstnumber.-654.1) (lstnumber.-656.1)] ->> endobj -4523 0 obj << -/Names [(lstnumber.-656.10) 3450 0 R (lstnumber.-656.11) 3451 0 R (lstnumber.-656.12) 3452 0 R (lstnumber.-656.13) 3453 0 R (lstnumber.-656.14) 3454 0 R (lstnumber.-656.15) 3455 0 R] -/Limits [(lstnumber.-656.10) (lstnumber.-656.15)] ->> endobj -4524 0 obj << -/Names [(lstnumber.-656.16) 3456 0 R (lstnumber.-656.17) 3457 0 R (lstnumber.-656.18) 3458 0 R (lstnumber.-656.19) 3459 0 R (lstnumber.-656.2) 3442 0 R (lstnumber.-656.20) 3460 0 R] -/Limits [(lstnumber.-656.16) (lstnumber.-656.20)] ->> endobj -4525 0 obj << -/Names [(lstnumber.-656.21) 3461 0 R (lstnumber.-656.22) 3462 0 R (lstnumber.-656.23) 3463 0 R (lstnumber.-656.24) 3464 0 R (lstnumber.-656.25) 3465 0 R (lstnumber.-656.3) 3443 0 R] -/Limits [(lstnumber.-656.21) (lstnumber.-656.3)] ->> endobj -4526 0 obj << -/Names [(lstnumber.-656.4) 3444 0 R (lstnumber.-656.5) 3445 0 R (lstnumber.-656.6) 3446 0 R (lstnumber.-656.7) 3447 0 R (lstnumber.-656.8) 3448 0 R (lstnumber.-656.9) 3449 0 R] -/Limits [(lstnumber.-656.4) (lstnumber.-656.9)] ->> endobj -4527 0 obj << -/Names [(lstnumber.-657.1) 3467 0 R (lstnumber.-657.2) 3468 0 R (lstnumber.-657.3) 3469 0 R (lstnumber.-658.1) 3471 0 R (lstnumber.-658.2) 3472 0 R (lstnumber.-659.1) 3474 0 R] -/Limits [(lstnumber.-657.1) (lstnumber.-659.1)] ->> endobj -4528 0 obj << -/Names [(lstnumber.-659.10) 3483 0 R (lstnumber.-659.11) 3484 0 R (lstnumber.-659.12) 3485 0 R (lstnumber.-659.13) 3486 0 R (lstnumber.-659.14) 3487 0 R (lstnumber.-659.15) 3488 0 R] -/Limits [(lstnumber.-659.10) (lstnumber.-659.15)] ->> endobj -4529 0 obj << -/Names [(lstnumber.-659.2) 3475 0 R (lstnumber.-659.3) 3476 0 R (lstnumber.-659.4) 3477 0 R (lstnumber.-659.5) 3478 0 R (lstnumber.-659.6) 3479 0 R (lstnumber.-659.7) 3480 0 R] -/Limits [(lstnumber.-659.2) (lstnumber.-659.7)] ->> endobj -4530 0 obj << -/Names [(lstnumber.-659.8) 3481 0 R (lstnumber.-659.9) 3482 0 R (lstnumber.-66.1) 1100 0 R (lstnumber.-660.1) 3490 0 R (lstnumber.-660.2) 3491 0 R (lstnumber.-661.1) 3498 0 R] -/Limits [(lstnumber.-659.8) (lstnumber.-661.1)] ->> endobj -4531 0 obj << -/Names [(lstnumber.-661.10) 3507 0 R (lstnumber.-661.11) 3508 0 R (lstnumber.-661.12) 3509 0 R (lstnumber.-661.13) 3510 0 R (lstnumber.-661.14) 3511 0 R (lstnumber.-661.15) 3512 0 R] -/Limits [(lstnumber.-661.10) (lstnumber.-661.15)] ->> endobj -4532 0 obj << -/Names [(lstnumber.-661.16) 3513 0 R (lstnumber.-661.17) 3514 0 R (lstnumber.-661.18) 3515 0 R (lstnumber.-661.19) 3516 0 R (lstnumber.-661.2) 3499 0 R (lstnumber.-661.20) 3517 0 R] -/Limits [(lstnumber.-661.16) (lstnumber.-661.20)] ->> endobj -4533 0 obj << -/Names [(lstnumber.-661.21) 3518 0 R (lstnumber.-661.3) 3500 0 R (lstnumber.-661.4) 3501 0 R (lstnumber.-661.5) 3502 0 R (lstnumber.-661.6) 3503 0 R (lstnumber.-661.7) 3504 0 R] -/Limits [(lstnumber.-661.21) (lstnumber.-661.7)] ->> endobj -4534 0 obj << -/Names [(lstnumber.-661.8) 3505 0 R (lstnumber.-661.9) 3506 0 R (lstnumber.-662.1) 3520 0 R (lstnumber.-662.2) 3521 0 R (lstnumber.-663.1) 3523 0 R (lstnumber.-663.2) 3524 0 R] -/Limits [(lstnumber.-661.8) (lstnumber.-663.2)] ->> endobj -4535 0 obj << -/Names [(lstnumber.-663.3) 3525 0 R (lstnumber.-663.4) 3526 0 R (lstnumber.-663.5) 3527 0 R (lstnumber.-663.6) 3528 0 R (lstnumber.-664.1) 3530 0 R (lstnumber.-664.10) 3539 0 R] -/Limits [(lstnumber.-663.3) (lstnumber.-664.10)] ->> endobj -4536 0 obj << -/Names [(lstnumber.-664.11) 3540 0 R (lstnumber.-664.12) 3541 0 R (lstnumber.-664.13) 3542 0 R (lstnumber.-664.14) 3543 0 R (lstnumber.-664.15) 3544 0 R (lstnumber.-664.16) 3545 0 R] -/Limits [(lstnumber.-664.11) (lstnumber.-664.16)] ->> endobj -4537 0 obj << -/Names [(lstnumber.-664.17) 3546 0 R (lstnumber.-664.18) 3547 0 R (lstnumber.-664.19) 3548 0 R (lstnumber.-664.2) 3531 0 R (lstnumber.-664.20) 3549 0 R (lstnumber.-664.21) 3550 0 R] -/Limits [(lstnumber.-664.17) (lstnumber.-664.21)] ->> endobj -4538 0 obj << -/Names [(lstnumber.-664.22) 3551 0 R (lstnumber.-664.23) 3556 0 R (lstnumber.-664.24) 3557 0 R (lstnumber.-664.25) 3558 0 R (lstnumber.-664.26) 3559 0 R (lstnumber.-664.27) 3560 0 R] -/Limits [(lstnumber.-664.22) (lstnumber.-664.27)] ->> endobj -4539 0 obj << -/Names [(lstnumber.-664.28) 3561 0 R (lstnumber.-664.29) 3562 0 R (lstnumber.-664.3) 3532 0 R (lstnumber.-664.30) 3563 0 R (lstnumber.-664.31) 3564 0 R (lstnumber.-664.32) 3565 0 R] -/Limits [(lstnumber.-664.28) (lstnumber.-664.32)] ->> endobj -4540 0 obj << -/Names [(lstnumber.-664.33) 3566 0 R (lstnumber.-664.34) 3567 0 R (lstnumber.-664.4) 3533 0 R (lstnumber.-664.5) 3534 0 R (lstnumber.-664.6) 3535 0 R (lstnumber.-664.7) 3536 0 R] -/Limits [(lstnumber.-664.33) (lstnumber.-664.7)] ->> endobj -4541 0 obj << -/Names [(lstnumber.-664.8) 3537 0 R (lstnumber.-664.9) 3538 0 R (lstnumber.-665.1) 3570 0 R (lstnumber.-666.1) 3572 0 R (lstnumber.-667.1) 3575 0 R (lstnumber.-668.1) 3577 0 R] -/Limits [(lstnumber.-664.8) (lstnumber.-668.1)] ->> endobj -4542 0 obj << -/Names [(lstnumber.-668.2) 3578 0 R (lstnumber.-669.1) 3581 0 R (lstnumber.-67.1) 1102 0 R (lstnumber.-670.1) 3583 0 R (lstnumber.-671.1) 3590 0 R (lstnumber.-672.1) 3592 0 R] -/Limits [(lstnumber.-668.2) (lstnumber.-672.1)] ->> endobj -4543 0 obj << -/Names [(lstnumber.-673.1) 3594 0 R (lstnumber.-673.2) 3595 0 R (lstnumber.-674.1) 3597 0 R (lstnumber.-675.1) 3599 0 R (lstnumber.-676.1) 3601 0 R (lstnumber.-676.2) 3602 0 R] -/Limits [(lstnumber.-673.1) (lstnumber.-676.2)] ->> endobj -4544 0 obj << -/Names [(lstnumber.-677.1) 3604 0 R (lstnumber.-677.2) 3605 0 R (lstnumber.-677.3) 3606 0 R (lstnumber.-678.1) 3608 0 R (lstnumber.-679.1) 3610 0 R (lstnumber.-679.2) 3611 0 R] -/Limits [(lstnumber.-677.1) (lstnumber.-679.2)] ->> endobj -4545 0 obj << -/Names [(lstnumber.-679.3) 3612 0 R (lstnumber.-679.4) 3613 0 R (lstnumber.-679.5) 3614 0 R (lstnumber.-68.1) 1104 0 R (lstnumber.-68.2) 1105 0 R (lstnumber.-680.1) 3616 0 R] -/Limits [(lstnumber.-679.3) (lstnumber.-680.1)] ->> endobj -4546 0 obj << -/Names [(lstnumber.-680.2) 3617 0 R (lstnumber.-680.3) 3618 0 R (lstnumber.-680.4) 3619 0 R (lstnumber.-681.1) 3621 0 R (lstnumber.-682.1) 3627 0 R (lstnumber.-683.1) 3629 0 R] -/Limits [(lstnumber.-680.2) (lstnumber.-683.1)] ->> endobj -4547 0 obj << -/Names [(lstnumber.-684.1) 3631 0 R (lstnumber.-685.1) 3633 0 R (lstnumber.-686.1) 3635 0 R (lstnumber.-687.1) 3637 0 R (lstnumber.-688.1) 3639 0 R (lstnumber.-688.2) 3640 0 R] -/Limits [(lstnumber.-684.1) (lstnumber.-688.2)] ->> endobj -4548 0 obj << -/Names [(lstnumber.-689.1) 3642 0 R (lstnumber.-69.1) 1107 0 R (lstnumber.-690.1) 3644 0 R (lstnumber.-691.1) 3646 0 R (lstnumber.-692.1) 3648 0 R (lstnumber.-692.2) 3649 0 R] -/Limits [(lstnumber.-689.1) (lstnumber.-692.2)] ->> endobj -4549 0 obj << -/Names [(lstnumber.-692.3) 3650 0 R (lstnumber.-693.1) 3652 0 R (lstnumber.-694.1) 3655 0 R (lstnumber.-695.1) 3662 0 R (lstnumber.-696.1) 3665 0 R (lstnumber.-696.2) 3666 0 R] -/Limits [(lstnumber.-692.3) (lstnumber.-696.2)] ->> endobj -4550 0 obj << -/Names [(lstnumber.-697.1) 3669 0 R (lstnumber.-697.2) 3670 0 R (lstnumber.-697.3) 3671 0 R (lstnumber.-697.4) 3672 0 R (lstnumber.-698.1) 3675 0 R (lstnumber.-698.2) 3676 0 R] -/Limits [(lstnumber.-697.1) (lstnumber.-698.2)] ->> endobj -4551 0 obj << -/Names [(lstnumber.-699.1) 3678 0 R (lstnumber.-699.2) 3679 0 R (lstnumber.-699.3) 3680 0 R (lstnumber.-699.4) 3681 0 R (lstnumber.-7.1) 929 0 R (lstnumber.-70.1) 1109 0 R] -/Limits [(lstnumber.-699.1) (lstnumber.-70.1)] ->> endobj -4552 0 obj << -/Names [(lstnumber.-700.1) 3683 0 R (lstnumber.-701.1) 3690 0 R (lstnumber.-701.2) 3691 0 R (lstnumber.-701.3) 3692 0 R (lstnumber.-701.4) 3693 0 R (lstnumber.-701.5) 3694 0 R] -/Limits [(lstnumber.-700.1) (lstnumber.-701.5)] ->> endobj -4553 0 obj << -/Names [(lstnumber.-702.1) 3696 0 R (lstnumber.-702.2) 3697 0 R (lstnumber.-703.1) 3699 0 R (lstnumber.-703.2) 3700 0 R (lstnumber.-703.3) 3701 0 R (lstnumber.-703.4) 3702 0 R] -/Limits [(lstnumber.-702.1) (lstnumber.-703.4)] ->> endobj -4554 0 obj << -/Names [(lstnumber.-704.1) 3704 0 R (lstnumber.-705.1) 3907 0 R (lstnumber.-705.10) 3922 0 R (lstnumber.-705.11) 3924 0 R (lstnumber.-705.12) 3925 0 R (lstnumber.-705.13) 3926 0 R] -/Limits [(lstnumber.-704.1) (lstnumber.-705.13)] ->> endobj -4555 0 obj << -/Names [(lstnumber.-705.14) 3927 0 R (lstnumber.-705.15) 3928 0 R (lstnumber.-705.16) 3929 0 R (lstnumber.-705.17) 3930 0 R (lstnumber.-705.18) 3931 0 R (lstnumber.-705.19) 3932 0 R] -/Limits [(lstnumber.-705.14) (lstnumber.-705.19)] ->> endobj -4556 0 obj << -/Names [(lstnumber.-705.2) 3908 0 R (lstnumber.-705.20) 3933 0 R (lstnumber.-705.21) 3934 0 R (lstnumber.-705.3) 3909 0 R (lstnumber.-705.4) 3912 0 R (lstnumber.-705.5) 3913 0 R] -/Limits [(lstnumber.-705.2) (lstnumber.-705.5)] ->> endobj -4557 0 obj << -/Names [(lstnumber.-705.6) 3914 0 R (lstnumber.-705.7) 3916 0 R (lstnumber.-705.8) 3918 0 R (lstnumber.-705.9) 3920 0 R (lstnumber.-706.1) 3985 0 R (lstnumber.-706.2) 3986 0 R] -/Limits [(lstnumber.-705.6) (lstnumber.-706.2)] ->> endobj -4558 0 obj << -/Names [(lstnumber.-706.3) 3987 0 R (lstnumber.-706.4) 3988 0 R (lstnumber.-706.5) 3989 0 R (lstnumber.-706.6) 3990 0 R (lstnumber.-706.7) 3991 0 R (lstnumber.-706.8) 3992 0 R] -/Limits [(lstnumber.-706.3) (lstnumber.-706.8)] ->> endobj -4559 0 obj << -/Names [(lstnumber.-706.9) 3993 0 R (lstnumber.-707.1) 3995 0 R (lstnumber.-707.2) 3996 0 R (lstnumber.-707.3) 3997 0 R (lstnumber.-707.4) 3998 0 R (lstnumber.-708.1) 4000 0 R] -/Limits [(lstnumber.-706.9) (lstnumber.-708.1)] ->> endobj -4560 0 obj << -/Names [(lstnumber.-708.10) 4009 0 R (lstnumber.-708.2) 4001 0 R (lstnumber.-708.3) 4002 0 R (lstnumber.-708.4) 4003 0 R (lstnumber.-708.5) 4004 0 R (lstnumber.-708.6) 4005 0 R] -/Limits [(lstnumber.-708.10) (lstnumber.-708.6)] ->> endobj -4561 0 obj << -/Names [(lstnumber.-708.7) 4006 0 R (lstnumber.-708.8) 4007 0 R (lstnumber.-708.9) 4008 0 R (lstnumber.-709.1) 4026 0 R (lstnumber.-709.2) 4027 0 R (lstnumber.-709.3) 4028 0 R] -/Limits [(lstnumber.-708.7) (lstnumber.-709.3)] ->> endobj -4562 0 obj << -/Names [(lstnumber.-709.4) 4029 0 R (lstnumber.-709.5) 4030 0 R (lstnumber.-709.6) 4031 0 R (lstnumber.-709.7) 4032 0 R (lstnumber.-71.1) 1115 0 R (lstnumber.-710.1) 4046 0 R] -/Limits [(lstnumber.-709.4) (lstnumber.-710.1)] ->> endobj -4563 0 obj << -/Names [(lstnumber.-711.1) 4048 0 R (lstnumber.-712.1) 4050 0 R (lstnumber.-712.2) 4051 0 R (lstnumber.-712.3) 4052 0 R (lstnumber.-712.4) 4053 0 R (lstnumber.-712.5) 4054 0 R] -/Limits [(lstnumber.-711.1) (lstnumber.-712.5)] ->> endobj -4564 0 obj << -/Names [(lstnumber.-712.6) 4055 0 R (lstnumber.-712.7) 4056 0 R (lstnumber.-713.1) 4058 0 R (lstnumber.-713.2) 4059 0 R (lstnumber.-713.3) 4060 0 R (lstnumber.-713.4) 4061 0 R] -/Limits [(lstnumber.-712.6) (lstnumber.-713.4)] ->> endobj -4565 0 obj << -/Names [(lstnumber.-713.5) 4062 0 R (lstnumber.-713.6) 4063 0 R (lstnumber.-713.7) 4064 0 R (lstnumber.-714.1) 4066 0 R (lstnumber.-714.2) 4067 0 R (lstnumber.-714.3) 4068 0 R] -/Limits [(lstnumber.-713.5) (lstnumber.-714.3)] ->> endobj -4566 0 obj << -/Names [(lstnumber.-714.4) 4069 0 R (lstnumber.-714.5) 4070 0 R (lstnumber.-72.1) 1117 0 R (lstnumber.-72.2) 1118 0 R (lstnumber.-73.1) 1120 0 R (lstnumber.-74.1) 1122 0 R] -/Limits [(lstnumber.-714.4) (lstnumber.-74.1)] ->> endobj -4567 0 obj << -/Names [(lstnumber.-74.2) 1123 0 R (lstnumber.-75.1) 1125 0 R (lstnumber.-76.1) 1127 0 R (lstnumber.-76.2) 1128 0 R (lstnumber.-76.3) 1129 0 R (lstnumber.-77.1) 1131 0 R] -/Limits [(lstnumber.-74.2) (lstnumber.-77.1)] ->> endobj -4568 0 obj << -/Names [(lstnumber.-78.1) 1133 0 R (lstnumber.-79.1) 1135 0 R (lstnumber.-8.1) 935 0 R (lstnumber.-80.1) 1137 0 R (lstnumber.-81.1) 1139 0 R (lstnumber.-82.1) 1141 0 R] -/Limits [(lstnumber.-78.1) (lstnumber.-82.1)] ->> endobj -4569 0 obj << -/Names [(lstnumber.-83.1) 1143 0 R (lstnumber.-83.2) 1144 0 R (lstnumber.-84.1) 1150 0 R (lstnumber.-85.1) 1152 0 R (lstnumber.-86.1) 1154 0 R (lstnumber.-87.1) 1156 0 R] -/Limits [(lstnumber.-83.1) (lstnumber.-87.1)] ->> endobj -4570 0 obj << -/Names [(lstnumber.-88.1) 1158 0 R (lstnumber.-88.2) 1159 0 R (lstnumber.-88.3) 1160 0 R (lstnumber.-88.4) 1161 0 R (lstnumber.-88.5) 1162 0 R (lstnumber.-88.6) 1163 0 R] -/Limits [(lstnumber.-88.1) (lstnumber.-88.6)] ->> endobj -4571 0 obj << -/Names [(lstnumber.-89.1) 1165 0 R (lstnumber.-9.1) 937 0 R (lstnumber.-90.1) 1167 0 R (lstnumber.-90.2) 1168 0 R (lstnumber.-91.1) 1171 0 R (lstnumber.-91.2) 1172 0 R] -/Limits [(lstnumber.-89.1) (lstnumber.-91.2)] ->> endobj -4572 0 obj << -/Names [(lstnumber.-92.1) 1174 0 R (lstnumber.-93.1) 1176 0 R (lstnumber.-94.1) 1178 0 R (lstnumber.-94.2) 1179 0 R (lstnumber.-94.3) 1180 0 R (lstnumber.-94.4) 1181 0 R] -/Limits [(lstnumber.-92.1) (lstnumber.-94.4)] ->> endobj -4573 0 obj << -/Names [(lstnumber.-95.1) 1188 0 R (lstnumber.-96.1) 1190 0 R (lstnumber.-97.1) 1192 0 R (lstnumber.-97.2) 1193 0 R (lstnumber.-98.1) 1195 0 R (lstnumber.-99.1) 1197 0 R] -/Limits [(lstnumber.-95.1) (lstnumber.-99.1)] ->> endobj -4574 0 obj << -/Names [(page.1) 906 0 R (page.10) 1185 0 R (page.100) 3839 0 R (page.101) 3843 0 R (page.102) 3847 0 R (page.103) 3853 0 R] -/Limits [(page.1) (page.103)] ->> endobj -4575 0 obj << -/Names [(page.104) 3857 0 R (page.105) 3861 0 R (page.106) 3865 0 R (page.107) 3872 0 R (page.108) 3879 0 R (page.109) 3887 0 R] -/Limits [(page.104) (page.109)] ->> endobj -4576 0 obj << -/Names [(page.11) 1229 0 R (page.110) 3894 0 R (page.111) 3898 0 R (page.112) 3905 0 R (page.113) 3938 0 R (page.114) 3954 0 R] -/Limits [(page.11) (page.114)] ->> endobj -4577 0 obj << -/Names [(page.115) 3959 0 R (page.116) 3967 0 R (page.117) 3977 0 R (page.118) 4013 0 R (page.119) 4019 0 R (page.12) 1262 0 R] -/Limits [(page.115) (page.12)] ->> endobj -4578 0 obj << -/Names [(page.120) 4023 0 R (page.121) 4038 0 R (page.122) 4043 0 R (page.123) 4074 0 R (page.124) 4079 0 R (page.125) 4086 0 R] -/Limits [(page.120) (page.125)] ->> endobj -4579 0 obj << -/Names [(page.126) 4091 0 R (page.13) 1289 0 R (page.14) 1316 0 R (page.15) 1337 0 R (page.16) 1352 0 R (page.17) 1361 0 R] -/Limits [(page.126) (page.17)] ->> endobj -4580 0 obj << -/Names [(page.18) 1399 0 R (page.19) 1437 0 R (page.2) 933 0 R (page.20) 1475 0 R (page.21) 1510 0 R (page.22) 1548 0 R] -/Limits [(page.18) (page.22)] ->> endobj -4581 0 obj << -/Names [(page.23) 1589 0 R (page.24) 1625 0 R (page.25) 1666 0 R (page.26) 1706 0 R (page.27) 1734 0 R (page.28) 1766 0 R] -/Limits [(page.23) (page.28)] ->> endobj -4582 0 obj << -/Names [(page.29) 1803 0 R (page.3) 964 0 R (page.30) 1835 0 R (page.31) 1843 0 R (page.32) 1874 0 R (page.33) 1911 0 R] -/Limits [(page.29) (page.33)] ->> endobj -4583 0 obj << -/Names [(page.34) 1954 0 R (page.35) 1976 0 R (page.36) 2000 0 R (page.37) 2043 0 R (page.38) 2091 0 R (page.39) 2126 0 R] -/Limits [(page.34) (page.39)] ->> endobj -4584 0 obj << -/Names [(page.4) 981 0 R (page.40) 2160 0 R (page.41) 2203 0 R (page.42) 2249 0 R (page.43) 2295 0 R (page.44) 2330 0 R] -/Limits [(page.4) (page.44)] ->> endobj -4585 0 obj << -/Names [(page.45) 2368 0 R (page.46) 2415 0 R (page.47) 2463 0 R (page.48) 2506 0 R (page.49) 2549 0 R (page.5) 1009 0 R] -/Limits [(page.45) (page.5)] ->> endobj -4586 0 obj << -/Names [(page.50) 2599 0 R (page.51) 2649 0 R (page.52) 2700 0 R (page.53) 2746 0 R (page.54) 2784 0 R (page.55) 2830 0 R] -/Limits [(page.50) (page.55)] ->> endobj -4587 0 obj << -/Names [(page.56) 2862 0 R (page.57) 2889 0 R (page.58) 2933 0 R (page.59) 2989 0 R (page.6) 1046 0 R (page.60) 3026 0 R] -/Limits [(page.56) (page.60)] ->> endobj -4588 0 obj << -/Names [(page.61) 3064 0 R (page.62) 3098 0 R (page.63) 3121 0 R (page.64) 3165 0 R (page.65) 3192 0 R (page.66) 3207 0 R] -/Limits [(page.61) (page.66)] ->> endobj -4589 0 obj << -/Names [(page.67) 3243 0 R (page.68) 3279 0 R (page.69) 3318 0 R (page.7) 1079 0 R (page.70) 3361 0 R (page.71) 3398 0 R] -/Limits [(page.67) (page.71)] ->> endobj -4590 0 obj << -/Names [(page.72) 3439 0 R (page.73) 3496 0 R (page.74) 3555 0 R (page.75) 3587 0 R (page.76) 3625 0 R (page.77) 3659 0 R] -/Limits [(page.72) (page.77)] ->> endobj -4591 0 obj << -/Names [(page.78) 3687 0 R (page.79) 3712 0 R (page.8) 1113 0 R (page.80) 3718 0 R (page.81) 3724 0 R (page.82) 3730 0 R] -/Limits [(page.78) (page.82)] ->> endobj -4592 0 obj << -/Names [(page.83) 3736 0 R (page.84) 3744 0 R (page.85) 3756 0 R (page.86) 3763 0 R (page.87) 3769 0 R (page.88) 3773 0 R] -/Limits [(page.83) (page.88)] ->> endobj -4593 0 obj << -/Names [(page.89) 3780 0 R (page.9) 1148 0 R (page.90) 3788 0 R (page.91) 3797 0 R (page.92) 3802 0 R (page.93) 3808 0 R] -/Limits [(page.89) (page.93)] ->> endobj -4594 0 obj << -/Names [(page.94) 3812 0 R (page.95) 3816 0 R (page.96) 3820 0 R (page.97) 3826 0 R (page.98) 3830 0 R (page.99) 3834 0 R] -/Limits [(page.94) (page.99)] ->> endobj -4595 0 obj << -/Names [(page.i) 690 0 R (page.ii) 738 0 R (page.iii) 777 0 R (page.iv) 818 0 R (page.v) 861 0 R (page.vi) 888 0 R] -/Limits [(page.i) (page.vi)] ->> endobj -4596 0 obj << -/Names [(page.vii) 900 0 R (releasenotes) 694 0 R (rnV1.76.0_Common) 999 0 R (rnV1.76.0_Eclipse) 1242 0 R (rnV1.76.0_Epub) 1186 0 R (rnV1.76.0_FO) 1047 0 R] -/Limits [(page.vii) (rnV1.76.0_FO)] ->> endobj -4597 0 obj << -/Names [(rnV1.76.0_Gentext) 982 0 R (rnV1.76.0_HTML) 1094 0 R (rnV1.76.0_Manpages) 1169 0 R (rnV1.76.0_Params) 1248 0 R (rnV1.76.0_XSL-Xalan) 1267 0 R (rnV1.76.1_FO) 966 0 R] -/Limits [(rnV1.76.0_Gentext) (rnV1.76.1_FO)] ->> endobj -4598 0 obj << -/Names [(rnV1.76.1_HTML) 970 0 R (rnV1.76.1_Params) 973 0 R (rn_V1.75.0_Common) 1375 0 R (rn_V1.75.0_Epub) 1735 0 R (rn_V1.75.0_FO) 1430 0 R (rn_V1.75.0_Gentext) 1353 0 R] -/Limits [(rnV1.76.1_HTML) (rn_V1.75.0_Gentext)] ->> endobj -4599 0 obj << -/Names [(rn_V1.75.0_HTML) 1590 0 R (rn_V1.75.0_HTMLHelp) 1767 0 R (rn_V1.75.0_Highlighting) 1817 0 R (rn_V1.75.0_Manpages) 1725 0 R (rn_V1.75.0_Params) 1770 0 R (rn_V1.75.0_XSL-Saxon) 1824 0 R] -/Limits [(rn_V1.75.0_HTML) (rn_V1.75.0_XSL-Saxon)] ->> endobj -4600 0 obj << -/Names [(rn_V1.75.0_XSL-Xalan) 1828 0 R (rn_V1.75.1) 1323 0 R (rn_V1.75.1_Epub) 1338 0 R (rn_V1.75.1_FO) 1324 0 R (rn_V1.75.1_HTML) 1329 0 R (rn_V1.75.1_Params) 1345 0 R] -/Limits [(rn_V1.75.0_XSL-Xalan) (rn_V1.75.1_Params)] ->> endobj -4601 0 obj << -/Names [(rn_V1.75.2) 1270 0 R (rn_V1.75.2_Common) 1280 0 R (rn_V1.75.2_Epub) 1305 0 R (rn_V1.75.2_FO) 1290 0 R (rn_V1.75.2_Gentext) 1271 0 R (rn_V1.75.2_HTML) 1293 0 R] -/Limits [(rn_V1.75.2) (rn_V1.75.2_HTML)] ->> endobj -4602 0 obj << -/Names [(rn_V1.75.2_Manpages) 1300 0 R (rn_V1.75.2_Profiling) 1310 0 R (rn_V1.75.2_XSL-Saxon) 1317 0 R (rn_V1.75.2_XSL-Xalan) 1320 0 R (section.1) 2 0 R (section.10) 242 0 R] -/Limits [(rn_V1.75.2_Manpages) (section.10)] ->> endobj -4603 0 obj << -/Names [(section.11) 322 0 R (section.12) 326 0 R (section.13) 366 0 R (section.14) 430 0 R (section.15) 462 0 R (section.16) 494 0 R] -/Limits [(section.11) (section.16)] ->> endobj -4604 0 obj << -/Names [(section.17) 530 0 R (section.18) 550 0 R (section.19) 590 0 R (section.2) 34 0 R (section.20) 594 0 R (section.21) 618 0 R] -/Limits [(section.17) (section.21)] ->> endobj -4605 0 obj << -/Names [(section.22) 622 0 R (section.23) 626 0 R (section.24) 630 0 R (section.25) 634 0 R (section.26) 638 0 R (section.27) 642 0 R] -/Limits [(section.22) (section.27)] ->> endobj -4606 0 obj << -/Names [(section.28) 646 0 R (section.29) 650 0 R (section.3) 50 0 R (section.30) 654 0 R (section.31) 658 0 R (section.32) 662 0 R] -/Limits [(section.28) (section.32)] ->> endobj -4607 0 obj << -/Names [(section.33) 666 0 R (section.34) 670 0 R (section.35) 674 0 R (section.36) 678 0 R (section.37) 682 0 R (section.4) 90 0 R] -/Limits [(section.33) (section.4)] ->> endobj -4608 0 obj << -/Names [(section.5) 130 0 R (section.6) 150 0 R (section.7) 198 0 R (section.8) 202 0 R (section.9) 206 0 R (subsection.1.1) 6 0 R] -/Limits [(section.5) (subsection.1.1)] ->> endobj -4609 0 obj << -/Names [(subsection.1.2) 10 0 R (subsection.1.3) 14 0 R (subsection.1.4) 18 0 R (subsection.1.5) 22 0 R (subsection.1.6) 26 0 R (subsection.1.7) 30 0 R] -/Limits [(subsection.1.2) (subsection.1.7)] ->> endobj -4610 0 obj << -/Names [(subsection.10.1) 246 0 R (subsection.10.10) 282 0 R (subsection.10.11) 286 0 R (subsection.10.12) 290 0 R (subsection.10.13) 294 0 R (subsection.10.14) 298 0 R] -/Limits [(subsection.10.1) (subsection.10.14)] ->> endobj -4611 0 obj << -/Names [(subsection.10.15) 302 0 R (subsection.10.16) 306 0 R (subsection.10.17) 310 0 R (subsection.10.18) 314 0 R (subsection.10.19) 318 0 R (subsection.10.2) 250 0 R] -/Limits [(subsection.10.15) (subsection.10.2)] ->> endobj -4612 0 obj << -/Names [(subsection.10.3) 254 0 R (subsection.10.4) 258 0 R (subsection.10.5) 262 0 R (subsection.10.6) 266 0 R (subsection.10.7) 270 0 R (subsection.10.8) 274 0 R] -/Limits [(subsection.10.3) (subsection.10.8)] ->> endobj -4613 0 obj << -/Names [(subsection.10.9) 278 0 R (subsection.12.1) 330 0 R (subsection.12.2) 334 0 R (subsection.12.3) 338 0 R (subsection.12.4) 342 0 R (subsection.12.5) 346 0 R] -/Limits [(subsection.10.9) (subsection.12.5)] ->> endobj -4614 0 obj << -/Names [(subsection.12.6) 350 0 R (subsection.12.7) 354 0 R (subsection.12.8) 358 0 R (subsection.12.9) 362 0 R (subsection.13.1) 370 0 R (subsection.13.10) 406 0 R] -/Limits [(subsection.12.6) (subsection.13.10)] ->> endobj -4615 0 obj << -/Names [(subsection.13.11) 410 0 R (subsection.13.12) 414 0 R (subsection.13.13) 418 0 R (subsection.13.14) 422 0 R (subsection.13.15) 426 0 R (subsection.13.2) 374 0 R] -/Limits [(subsection.13.11) (subsection.13.2)] ->> endobj -4616 0 obj << -/Names [(subsection.13.3) 378 0 R (subsection.13.4) 382 0 R (subsection.13.5) 386 0 R (subsection.13.6) 390 0 R (subsection.13.7) 394 0 R (subsection.13.8) 398 0 R] -/Limits [(subsection.13.3) (subsection.13.8)] ->> endobj -4617 0 obj << -/Names [(subsection.13.9) 402 0 R (subsection.14.1) 434 0 R (subsection.14.2) 438 0 R (subsection.14.3) 442 0 R (subsection.14.4) 446 0 R (subsection.14.5) 450 0 R] -/Limits [(subsection.13.9) (subsection.14.5)] ->> endobj -4618 0 obj << -/Names [(subsection.14.6) 454 0 R (subsection.14.7) 458 0 R (subsection.15.1) 466 0 R (subsection.15.2) 470 0 R (subsection.15.3) 474 0 R (subsection.15.4) 478 0 R] -/Limits [(subsection.14.6) (subsection.15.4)] ->> endobj -4619 0 obj << -/Names [(subsection.15.5) 482 0 R (subsection.15.6) 486 0 R (subsection.15.7) 490 0 R (subsection.16.1) 498 0 R (subsection.16.2) 502 0 R (subsection.16.3) 506 0 R] -/Limits [(subsection.15.5) (subsection.16.3)] ->> endobj -4620 0 obj << -/Names [(subsection.16.4) 510 0 R (subsection.16.5) 514 0 R (subsection.16.6) 518 0 R (subsection.16.7) 522 0 R (subsection.16.8) 526 0 R (subsection.17.1) 534 0 R] -/Limits [(subsection.16.4) (subsection.17.1)] ->> endobj -4621 0 obj << -/Names [(subsection.17.2) 538 0 R (subsection.17.3) 542 0 R (subsection.17.4) 546 0 R (subsection.18.1) 554 0 R (subsection.18.2) 558 0 R (subsection.18.3) 562 0 R] -/Limits [(subsection.17.2) (subsection.18.3)] ->> endobj -4622 0 obj << -/Names [(subsection.18.4) 566 0 R (subsection.18.5) 570 0 R (subsection.18.6) 574 0 R (subsection.18.7) 578 0 R (subsection.18.8) 582 0 R (subsection.18.9) 586 0 R] -/Limits [(subsection.18.4) (subsection.18.9)] ->> endobj -4623 0 obj << -/Names [(subsection.2.1) 38 0 R (subsection.2.2) 42 0 R (subsection.2.3) 46 0 R (subsection.20.1) 598 0 R (subsection.20.2) 602 0 R (subsection.20.3) 606 0 R] -/Limits [(subsection.2.1) (subsection.20.3)] ->> endobj -4624 0 obj << -/Names [(subsection.20.4) 610 0 R (subsection.20.5) 614 0 R (subsection.3.1) 54 0 R (subsection.3.2) 58 0 R (subsection.3.3) 62 0 R (subsection.3.4) 66 0 R] -/Limits [(subsection.20.4) (subsection.3.4)] ->> endobj -4625 0 obj << -/Names [(subsection.3.5) 70 0 R (subsection.3.6) 74 0 R (subsection.3.7) 78 0 R (subsection.3.8) 82 0 R (subsection.3.9) 86 0 R (subsection.4.1) 94 0 R] -/Limits [(subsection.3.5) (subsection.4.1)] ->> endobj -4626 0 obj << -/Names [(subsection.4.2) 98 0 R (subsection.4.3) 102 0 R (subsection.4.4) 106 0 R (subsection.4.5) 110 0 R (subsection.4.6) 114 0 R (subsection.4.7) 118 0 R] -/Limits [(subsection.4.2) (subsection.4.7)] ->> endobj -4627 0 obj << -/Names [(subsection.4.8) 122 0 R (subsection.4.9) 126 0 R (subsection.5.1) 134 0 R (subsection.5.2) 138 0 R (subsection.5.3) 142 0 R (subsection.5.4) 146 0 R] -/Limits [(subsection.4.8) (subsection.5.4)] ->> endobj -4628 0 obj << -/Names [(subsection.6.1) 154 0 R (subsection.6.10) 190 0 R (subsection.6.11) 194 0 R (subsection.6.2) 158 0 R (subsection.6.3) 162 0 R (subsection.6.4) 166 0 R] -/Limits [(subsection.6.1) (subsection.6.4)] ->> endobj -4629 0 obj << -/Names [(subsection.6.5) 170 0 R (subsection.6.6) 174 0 R (subsection.6.7) 178 0 R (subsection.6.8) 182 0 R (subsection.6.9) 186 0 R (subsection.9.1) 210 0 R] -/Limits [(subsection.6.5) (subsection.9.1)] ->> endobj -4630 0 obj << -/Names [(subsection.9.2) 214 0 R (subsection.9.3) 218 0 R (subsection.9.4) 222 0 R (subsection.9.5) 226 0 R (subsection.9.6) 230 0 R (subsection.9.7) 234 0 R] -/Limits [(subsection.9.2) (subsection.9.7)] ->> endobj -4631 0 obj << -/Names [(subsection.9.8) 238 0 R (summary_V1.74.1_Epub) 1891 0 R (summary_V1.74.1_FO) 1853 0 R (summary_V1.74.1_Gentext) 1844 0 R (summary_V1.74.1_HTML) 1875 0 R (summary_V1.74.1_Highlighting) 1966 0 R] -/Limits [(subsection.9.8) (summary_V1.74.1_Highlighting)] ->> endobj -4632 0 obj << -/Names [(summary_V1.74.1_Manpages) 1884 0 R (summary_V1.74.1_Params) 1955 0 R (summary_V1.74.1_Roundtrip) 1937 0 R] -/Limits [(summary_V1.74.1_Manpages) (summary_V1.74.1_Roundtrip)] ->> endobj -4633 0 obj << -/Kids [4140 0 R 4141 0 R 4142 0 R 4143 0 R 4144 0 R 4145 0 R] -/Limits [(Doc-Start) (V1.72.0)] ->> endobj -4634 0 obj << -/Kids [4146 0 R 4147 0 R 4148 0 R 4149 0 R 4150 0 R 4151 0 R] -/Limits [(V1.72.0_Common) (V1.74.0_Common)] ->> endobj -4635 0 obj << -/Kids [4152 0 R 4153 0 R 4154 0 R 4155 0 R 4156 0 R 4157 0 R] -/Limits [(V1.74.0_Eclipse) (V1592)] ->> endobj -4636 0 obj << -/Kids [4158 0 R 4159 0 R 4160 0 R 4161 0 R 4162 0 R 4163 0 R] -/Limits [(V1601) (V1701)] ->> endobj -4637 0 obj << -/Kids [4164 0 R 4165 0 R 4166 0 R 4167 0 R 4168 0 R 4169 0 R] -/Limits [(V1701_FO) (lstlisting.-119)] ->> endobj -4638 0 obj << -/Kids [4170 0 R 4171 0 R 4172 0 R 4173 0 R 4174 0 R 4175 0 R] -/Limits [(lstlisting.-12) (lstlisting.-151)] ->> endobj -4639 0 obj << -/Kids [4176 0 R 4177 0 R 4178 0 R 4179 0 R 4180 0 R 4181 0 R] -/Limits [(lstlisting.-152) (lstlisting.-184)] ->> endobj -4640 0 obj << -/Kids [4182 0 R 4183 0 R 4184 0 R 4185 0 R 4186 0 R 4187 0 R] -/Limits [(lstlisting.-185) (lstlisting.-216)] ->> endobj -4641 0 obj << -/Kids [4188 0 R 4189 0 R 4190 0 R 4191 0 R 4192 0 R 4193 0 R] -/Limits [(lstlisting.-217) (lstlisting.-249)] ->> endobj -4642 0 obj << -/Kids [4194 0 R 4195 0 R 4196 0 R 4197 0 R 4198 0 R 4199 0 R] -/Limits [(lstlisting.-25) (lstlisting.-281)] ->> endobj -4643 0 obj << -/Kids [4200 0 R 4201 0 R 4202 0 R 4203 0 R 4204 0 R 4205 0 R] -/Limits [(lstlisting.-282) (lstlisting.-313)] ->> endobj -4644 0 obj << -/Kids [4206 0 R 4207 0 R 4208 0 R 4209 0 R 4210 0 R 4211 0 R] -/Limits [(lstlisting.-314) (lstlisting.-346)] ->> endobj -4645 0 obj << -/Kids [4212 0 R 4213 0 R 4214 0 R 4215 0 R 4216 0 R 4217 0 R] -/Limits [(lstlisting.-347) (lstlisting.-379)] ->> endobj -4646 0 obj << -/Kids [4218 0 R 4219 0 R 4220 0 R 4221 0 R 4222 0 R 4223 0 R] -/Limits [(lstlisting.-38) (lstlisting.-410)] ->> endobj -4647 0 obj << -/Kids [4224 0 R 4225 0 R 4226 0 R 4227 0 R 4228 0 R 4229 0 R] -/Limits [(lstlisting.-411) (lstlisting.-443)] ->> endobj -4648 0 obj << -/Kids [4230 0 R 4231 0 R 4232 0 R 4233 0 R 4234 0 R 4235 0 R] -/Limits [(lstlisting.-444) (lstlisting.-476)] ->> endobj -4649 0 obj << -/Kids [4236 0 R 4237 0 R 4238 0 R 4239 0 R 4240 0 R 4241 0 R] -/Limits [(lstlisting.-477) (lstlisting.-508)] ->> endobj -4650 0 obj << -/Kids [4242 0 R 4243 0 R 4244 0 R 4245 0 R 4246 0 R 4247 0 R] -/Limits [(lstlisting.-509) (lstlisting.-540)] ->> endobj -4651 0 obj << -/Kids [4248 0 R 4249 0 R 4250 0 R 4251 0 R 4252 0 R 4253 0 R] -/Limits [(lstlisting.-541) (lstlisting.-573)] ->> endobj -4652 0 obj << -/Kids [4254 0 R 4255 0 R 4256 0 R 4257 0 R 4258 0 R 4259 0 R] -/Limits [(lstlisting.-574) (lstlisting.-605)] ->> endobj -4653 0 obj << -/Kids [4260 0 R 4261 0 R 4262 0 R 4263 0 R 4264 0 R 4265 0 R] -/Limits [(lstlisting.-606) (lstlisting.-638)] ->> endobj -4654 0 obj << -/Kids [4266 0 R 4267 0 R 4268 0 R 4269 0 R 4270 0 R 4271 0 R] -/Limits [(lstlisting.-639) (lstlisting.-670)] ->> endobj -4655 0 obj << -/Kids [4272 0 R 4273 0 R 4274 0 R 4275 0 R 4276 0 R 4277 0 R] -/Limits [(lstlisting.-671) (lstlisting.-702)] ->> endobj -4656 0 obj << -/Kids [4278 0 R 4279 0 R 4280 0 R 4281 0 R 4282 0 R 4283 0 R] -/Limits [(lstlisting.-703) (lstlisting.-92)] ->> endobj -4657 0 obj << -/Kids [4284 0 R 4285 0 R 4286 0 R 4287 0 R 4288 0 R 4289 0 R] -/Limits [(lstlisting.-93) (lstnumber.-104.1)] ->> endobj -4658 0 obj << -/Kids [4290 0 R 4291 0 R 4292 0 R 4293 0 R 4294 0 R 4295 0 R] -/Limits [(lstnumber.-104.2) (lstnumber.-127.1)] ->> endobj -4659 0 obj << -/Kids [4296 0 R 4297 0 R 4298 0 R 4299 0 R 4300 0 R 4301 0 R] -/Limits [(lstnumber.-128.1) (lstnumber.-150.1)] ->> endobj -4660 0 obj << -/Kids [4302 0 R 4303 0 R 4304 0 R 4305 0 R 4306 0 R 4307 0 R] -/Limits [(lstnumber.-150.2) (lstnumber.-170.2)] ->> endobj -4661 0 obj << -/Kids [4308 0 R 4309 0 R 4310 0 R 4311 0 R 4312 0 R 4313 0 R] -/Limits [(lstnumber.-170.3) (lstnumber.-189.1)] ->> endobj -4662 0 obj << -/Kids [4314 0 R 4315 0 R 4316 0 R 4317 0 R 4318 0 R 4319 0 R] -/Limits [(lstnumber.-19.1) (lstnumber.-206.5)] ->> endobj -4663 0 obj << -/Kids [4320 0 R 4321 0 R 4322 0 R 4323 0 R 4324 0 R 4325 0 R] -/Limits [(lstnumber.-206.6) (lstnumber.-226.2)] ->> endobj -4664 0 obj << -/Kids [4326 0 R 4327 0 R 4328 0 R 4329 0 R 4330 0 R 4331 0 R] -/Limits [(lstnumber.-226.3) (lstnumber.-240.2)] ->> endobj -4665 0 obj << -/Kids [4332 0 R 4333 0 R 4334 0 R 4335 0 R 4336 0 R 4337 0 R] -/Limits [(lstnumber.-240.3) (lstnumber.-267.1)] ->> endobj -4666 0 obj << -/Kids [4338 0 R 4339 0 R 4340 0 R 4341 0 R 4342 0 R 4343 0 R] -/Limits [(lstnumber.-268.1) (lstnumber.-289.1)] ->> endobj -4667 0 obj << -/Kids [4344 0 R 4345 0 R 4346 0 R 4347 0 R 4348 0 R 4349 0 R] -/Limits [(lstnumber.-289.2) (lstnumber.-305.2)] ->> endobj -4668 0 obj << -/Kids [4350 0 R 4351 0 R 4352 0 R 4353 0 R 4354 0 R 4355 0 R] -/Limits [(lstnumber.-305.3) (lstnumber.-315.1)] ->> endobj -4669 0 obj << -/Kids [4356 0 R 4357 0 R 4358 0 R 4359 0 R 4360 0 R 4361 0 R] -/Limits [(lstnumber.-316.1) (lstnumber.-333.3)] ->> endobj -4670 0 obj << -/Kids [4362 0 R 4363 0 R 4364 0 R 4365 0 R 4366 0 R 4367 0 R] -/Limits [(lstnumber.-334.1) (lstnumber.-338.8)] ->> endobj -4671 0 obj << -/Kids [4368 0 R 4369 0 R 4370 0 R 4371 0 R 4372 0 R 4373 0 R] -/Limits [(lstnumber.-338.9) (lstnumber.-353.2)] ->> endobj -4672 0 obj << -/Kids [4374 0 R 4375 0 R 4376 0 R 4377 0 R 4378 0 R 4379 0 R] -/Limits [(lstnumber.-354.1) (lstnumber.-378.1)] ->> endobj -4673 0 obj << -/Kids [4380 0 R 4381 0 R 4382 0 R 4383 0 R 4384 0 R 4385 0 R] -/Limits [(lstnumber.-379.1) (lstnumber.-380.38)] ->> endobj -4674 0 obj << -/Kids [4386 0 R 4387 0 R 4388 0 R 4389 0 R 4390 0 R 4391 0 R] -/Limits [(lstnumber.-380.39) (lstnumber.-392.1)] ->> endobj -4675 0 obj << -/Kids [4392 0 R 4393 0 R 4394 0 R 4395 0 R 4396 0 R 4397 0 R] -/Limits [(lstnumber.-392.10) (lstnumber.-408.1)] ->> endobj -4676 0 obj << -/Kids [4398 0 R 4399 0 R 4400 0 R 4401 0 R 4402 0 R 4403 0 R] -/Limits [(lstnumber.-409.1) (lstnumber.-419.2)] ->> endobj -4677 0 obj << -/Kids [4404 0 R 4405 0 R 4406 0 R 4407 0 R 4408 0 R 4409 0 R] -/Limits [(lstnumber.-419.3) (lstnumber.-431.11)] ->> endobj -4678 0 obj << -/Kids [4410 0 R 4411 0 R 4412 0 R 4413 0 R 4414 0 R 4415 0 R] -/Limits [(lstnumber.-431.12) (lstnumber.-437.1)] ->> endobj -4679 0 obj << -/Kids [4416 0 R 4417 0 R 4418 0 R 4419 0 R 4420 0 R 4421 0 R] -/Limits [(lstnumber.-437.2) (lstnumber.-447.2)] ->> endobj -4680 0 obj << -/Kids [4422 0 R 4423 0 R 4424 0 R 4425 0 R 4426 0 R 4427 0 R] -/Limits [(lstnumber.-447.3) (lstnumber.-463.14)] ->> endobj -4681 0 obj << -/Kids [4428 0 R 4429 0 R 4430 0 R 4431 0 R 4432 0 R 4433 0 R] -/Limits [(lstnumber.-463.15) (lstnumber.-464.26)] ->> endobj -4682 0 obj << -/Kids [4434 0 R 4435 0 R 4436 0 R 4437 0 R 4438 0 R 4439 0 R] -/Limits [(lstnumber.-464.3) (lstnumber.-475.1)] ->> endobj -4683 0 obj << -/Kids [4440 0 R 4441 0 R 4442 0 R 4443 0 R 4444 0 R 4445 0 R] -/Limits [(lstnumber.-475.2) (lstnumber.-48.2)] ->> endobj -4684 0 obj << -/Kids [4446 0 R 4447 0 R 4448 0 R 4449 0 R 4450 0 R 4451 0 R] -/Limits [(lstnumber.-480.1) (lstnumber.-494.1)] ->> endobj -4685 0 obj << -/Kids [4452 0 R 4453 0 R 4454 0 R 4455 0 R 4456 0 R 4457 0 R] -/Limits [(lstnumber.-494.2) (lstnumber.-495.5)] ->> endobj -4686 0 obj << -/Kids [4458 0 R 4459 0 R 4460 0 R 4461 0 R 4462 0 R 4463 0 R] -/Limits [(lstnumber.-495.6) (lstnumber.-514.1)] ->> endobj -4687 0 obj << -/Kids [4464 0 R 4465 0 R 4466 0 R 4467 0 R 4468 0 R 4469 0 R] -/Limits [(lstnumber.-515.1) (lstnumber.-525.2)] ->> endobj -4688 0 obj << -/Kids [4470 0 R 4471 0 R 4472 0 R 4473 0 R 4474 0 R 4475 0 R] -/Limits [(lstnumber.-525.3) (lstnumber.-529.16)] ->> endobj -4689 0 obj << -/Kids [4476 0 R 4477 0 R 4478 0 R 4479 0 R 4480 0 R 4481 0 R] -/Limits [(lstnumber.-529.17) (lstnumber.-546.1)] ->> endobj -4690 0 obj << -/Kids [4482 0 R 4483 0 R 4484 0 R 4485 0 R 4486 0 R 4487 0 R] -/Limits [(lstnumber.-547.1) (lstnumber.-562.1)] ->> endobj -4691 0 obj << -/Kids [4488 0 R 4489 0 R 4490 0 R 4491 0 R 4492 0 R 4493 0 R] -/Limits [(lstnumber.-562.2) (lstnumber.-579.1)] ->> endobj -4692 0 obj << -/Kids [4494 0 R 4495 0 R 4496 0 R 4497 0 R 4498 0 R 4499 0 R] -/Limits [(lstnumber.-579.2) (lstnumber.-599.1)] ->> endobj -4693 0 obj << -/Kids [4500 0 R 4501 0 R 4502 0 R 4503 0 R 4504 0 R 4505 0 R] -/Limits [(lstnumber.-599.2) (lstnumber.-616.2)] ->> endobj -4694 0 obj << -/Kids [4506 0 R 4507 0 R 4508 0 R 4509 0 R 4510 0 R 4511 0 R] -/Limits [(lstnumber.-616.3) (lstnumber.-632.1)] ->> endobj -4695 0 obj << -/Kids [4512 0 R 4513 0 R 4514 0 R 4515 0 R 4516 0 R 4517 0 R] -/Limits [(lstnumber.-632.2) (lstnumber.-645.4)] ->> endobj -4696 0 obj << -/Kids [4518 0 R 4519 0 R 4520 0 R 4521 0 R 4522 0 R 4523 0 R] -/Limits [(lstnumber.-646.1) (lstnumber.-656.15)] ->> endobj -4697 0 obj << -/Kids [4524 0 R 4525 0 R 4526 0 R 4527 0 R 4528 0 R 4529 0 R] -/Limits [(lstnumber.-656.16) (lstnumber.-659.7)] ->> endobj -4698 0 obj << -/Kids [4530 0 R 4531 0 R 4532 0 R 4533 0 R 4534 0 R 4535 0 R] -/Limits [(lstnumber.-659.8) (lstnumber.-664.10)] ->> endobj -4699 0 obj << -/Kids [4536 0 R 4537 0 R 4538 0 R 4539 0 R 4540 0 R 4541 0 R] -/Limits [(lstnumber.-664.11) (lstnumber.-668.1)] ->> endobj -4700 0 obj << -/Kids [4542 0 R 4543 0 R 4544 0 R 4545 0 R 4546 0 R 4547 0 R] -/Limits [(lstnumber.-668.2) (lstnumber.-688.2)] ->> endobj -4701 0 obj << -/Kids [4548 0 R 4549 0 R 4550 0 R 4551 0 R 4552 0 R 4553 0 R] -/Limits [(lstnumber.-689.1) (lstnumber.-703.4)] ->> endobj -4702 0 obj << -/Kids [4554 0 R 4555 0 R 4556 0 R 4557 0 R 4558 0 R 4559 0 R] -/Limits [(lstnumber.-704.1) (lstnumber.-708.1)] ->> endobj -4703 0 obj << -/Kids [4560 0 R 4561 0 R 4562 0 R 4563 0 R 4564 0 R 4565 0 R] -/Limits [(lstnumber.-708.10) (lstnumber.-714.3)] ->> endobj -4704 0 obj << -/Kids [4566 0 R 4567 0 R 4568 0 R 4569 0 R 4570 0 R 4571 0 R] -/Limits [(lstnumber.-714.4) (lstnumber.-91.2)] ->> endobj -4705 0 obj << -/Kids [4572 0 R 4573 0 R 4574 0 R 4575 0 R 4576 0 R 4577 0 R] -/Limits [(lstnumber.-92.1) (page.12)] ->> endobj -4706 0 obj << -/Kids [4578 0 R 4579 0 R 4580 0 R 4581 0 R 4582 0 R 4583 0 R] -/Limits [(page.120) (page.39)] ->> endobj -4707 0 obj << -/Kids [4584 0 R 4585 0 R 4586 0 R 4587 0 R 4588 0 R 4589 0 R] -/Limits [(page.4) (page.71)] ->> endobj -4708 0 obj << -/Kids [4590 0 R 4591 0 R 4592 0 R 4593 0 R 4594 0 R 4595 0 R] -/Limits [(page.72) (page.vi)] ->> endobj -4709 0 obj << -/Kids [4596 0 R 4597 0 R 4598 0 R 4599 0 R 4600 0 R 4601 0 R] -/Limits [(page.vii) (rn_V1.75.2_HTML)] ->> endobj -4710 0 obj << -/Kids [4602 0 R 4603 0 R 4604 0 R 4605 0 R 4606 0 R 4607 0 R] -/Limits [(rn_V1.75.2_Manpages) (section.4)] ->> endobj -4711 0 obj << -/Kids [4608 0 R 4609 0 R 4610 0 R 4611 0 R 4612 0 R 4613 0 R] -/Limits [(section.5) (subsection.12.5)] ->> endobj -4712 0 obj << -/Kids [4614 0 R 4615 0 R 4616 0 R 4617 0 R 4618 0 R 4619 0 R] -/Limits [(subsection.12.6) (subsection.16.3)] ->> endobj -4713 0 obj << -/Kids [4620 0 R 4621 0 R 4622 0 R 4623 0 R 4624 0 R 4625 0 R] -/Limits [(subsection.16.4) (subsection.4.1)] ->> endobj -4714 0 obj << -/Kids [4626 0 R 4627 0 R 4628 0 R 4629 0 R 4630 0 R 4631 0 R] -/Limits [(subsection.4.2) (summary_V1.74.1_Highlighting)] ->> endobj -4715 0 obj << -/Kids [4632 0 R] -/Limits [(summary_V1.74.1_Manpages) (summary_V1.74.1_Roundtrip)] ->> endobj -4716 0 obj << -/Kids [4633 0 R 4634 0 R 4635 0 R 4636 0 R 4637 0 R 4638 0 R] -/Limits [(Doc-Start) (lstlisting.-151)] ->> endobj -4717 0 obj << -/Kids [4639 0 R 4640 0 R 4641 0 R 4642 0 R 4643 0 R 4644 0 R] -/Limits [(lstlisting.-152) (lstlisting.-346)] ->> endobj -4718 0 obj << -/Kids [4645 0 R 4646 0 R 4647 0 R 4648 0 R 4649 0 R 4650 0 R] -/Limits [(lstlisting.-347) (lstlisting.-540)] ->> endobj -4719 0 obj << -/Kids [4651 0 R 4652 0 R 4653 0 R 4654 0 R 4655 0 R 4656 0 R] -/Limits [(lstlisting.-541) (lstlisting.-92)] ->> endobj -4720 0 obj << -/Kids [4657 0 R 4658 0 R 4659 0 R 4660 0 R 4661 0 R 4662 0 R] -/Limits [(lstlisting.-93) (lstnumber.-206.5)] ->> endobj -4721 0 obj << -/Kids [4663 0 R 4664 0 R 4665 0 R 4666 0 R 4667 0 R 4668 0 R] -/Limits [(lstnumber.-206.6) (lstnumber.-315.1)] ->> endobj -4722 0 obj << -/Kids [4669 0 R 4670 0 R 4671 0 R 4672 0 R 4673 0 R 4674 0 R] -/Limits [(lstnumber.-316.1) (lstnumber.-392.1)] ->> endobj -4723 0 obj << -/Kids [4675 0 R 4676 0 R 4677 0 R 4678 0 R 4679 0 R 4680 0 R] -/Limits [(lstnumber.-392.10) (lstnumber.-463.14)] ->> endobj -4724 0 obj << -/Kids [4681 0 R 4682 0 R 4683 0 R 4684 0 R 4685 0 R 4686 0 R] -/Limits [(lstnumber.-463.15) (lstnumber.-514.1)] ->> endobj -4725 0 obj << -/Kids [4687 0 R 4688 0 R 4689 0 R 4690 0 R 4691 0 R 4692 0 R] -/Limits [(lstnumber.-515.1) (lstnumber.-599.1)] ->> endobj -4726 0 obj << -/Kids [4693 0 R 4694 0 R 4695 0 R 4696 0 R 4697 0 R 4698 0 R] -/Limits [(lstnumber.-599.2) (lstnumber.-664.10)] ->> endobj -4727 0 obj << -/Kids [4699 0 R 4700 0 R 4701 0 R 4702 0 R 4703 0 R 4704 0 R] -/Limits [(lstnumber.-664.11) (lstnumber.-91.2)] ->> endobj -4728 0 obj << -/Kids [4705 0 R 4706 0 R 4707 0 R 4708 0 R 4709 0 R 4710 0 R] -/Limits [(lstnumber.-92.1) (section.4)] ->> endobj -4729 0 obj << -/Kids [4711 0 R 4712 0 R 4713 0 R 4714 0 R 4715 0 R] -/Limits [(section.5) (summary_V1.74.1_Roundtrip)] ->> endobj -4730 0 obj << -/Kids [4716 0 R 4717 0 R 4718 0 R 4719 0 R 4720 0 R 4721 0 R] -/Limits [(Doc-Start) (lstnumber.-315.1)] ->> endobj -4731 0 obj << -/Kids [4722 0 R 4723 0 R 4724 0 R 4725 0 R 4726 0 R 4727 0 R] -/Limits [(lstnumber.-316.1) (lstnumber.-91.2)] ->> endobj -4732 0 obj << -/Kids [4728 0 R 4729 0 R] -/Limits [(lstnumber.-92.1) (summary_V1.74.1_Roundtrip)] ->> endobj -4733 0 obj << -/Kids [4730 0 R 4731 0 R 4732 0 R] -/Limits [(Doc-Start) (summary_V1.74.1_Roundtrip)] ->> endobj -4734 0 obj << -/Dests 4733 0 R ->> endobj -4735 0 obj << -/Type /Catalog -/Pages 4138 0 R -/Outlines 4139 0 R -/Names 4734 0 R -/PageMode/UseOutlines/PageLabels<>7<>]>> -/OpenAction 685 0 R ->> endobj -4736 0 obj << -/Author()/Title(Release Notes for the DocBook XSL Stylesheets)/Subject()/Creator(DBLaTeX-0.3)/Producer(pdfTeX-1.40.10)/Keywords() -/CreationDate (D:20101101131526-07'00') -/ModDate (D:20101101131526-07'00') -/Trapped /False -/PTEX.Fullbanner (This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live/MacPorts 2009_6) kpathsea version 5.0.0) ->> endobj -xref -0 4737 -0000000000 65535 f -0000000015 00000 n -0000054077 00000 n -0000747653 00000 n -0000000060 00000 n -0000000099 00000 n -0000054197 00000 n -0000747583 00000 n -0000000149 00000 n -0000000173 00000 n -0000054560 00000 n -0000747499 00000 n -0000000223 00000 n -0000000244 00000 n -0000054981 00000 n -0000747413 00000 n -0000000295 00000 n -0000000318 00000 n -0000055222 00000 n -0000747327 00000 n -0000000369 00000 n -0000000392 00000 n -0000058133 00000 n -0000747241 00000 n -0000000443 00000 n -0000000469 00000 n -0000058984 00000 n -0000747155 00000 n -0000000520 00000 n -0000000545 00000 n -0000059223 00000 n -0000747082 00000 n -0000000596 00000 n -0000000625 00000 n -0000061859 00000 n -0000746957 00000 n -0000000671 00000 n -0000000711 00000 n -0000061980 00000 n -0000746883 00000 n -0000000762 00000 n -0000000783 00000 n -0000062283 00000 n -0000746796 00000 n -0000000834 00000 n -0000000857 00000 n -0000062525 00000 n -0000746722 00000 n -0000000908 00000 n -0000000933 00000 n -0000062766 00000 n -0000746596 00000 n -0000000979 00000 n -0000001019 00000 n -0000065039 00000 n -0000746522 00000 n -0000001070 00000 n -0000001096 00000 n -0000066136 00000 n -0000746435 00000 n -0000001147 00000 n -0000001172 00000 n -0000074054 00000 n -0000746348 00000 n -0000001223 00000 n -0000001244 00000 n -0000079227 00000 n -0000746261 00000 n -0000001295 00000 n -0000001318 00000 n -0000089039 00000 n -0000746174 00000 n -0000001369 00000 n -0000001396 00000 n -0000093094 00000 n -0000746087 00000 n -0000001447 00000 n -0000001470 00000 n -0000099414 00000 n -0000746000 00000 n -0000001521 00000 n -0000001547 00000 n -0000099852 00000 n -0000745913 00000 n -0000001598 00000 n -0000001623 00000 n -0000102973 00000 n -0000745839 00000 n -0000001674 00000 n -0000001702 00000 n -0000103222 00000 n -0000745711 00000 n -0000001748 00000 n -0000001788 00000 n -0000103345 00000 n -0000745637 00000 n -0000001839 00000 n -0000001865 00000 n -0000103973 00000 n -0000745548 00000 n -0000001916 00000 n -0000001942 00000 n -0000106471 00000 n -0000745457 00000 n -0000001994 00000 n -0000002016 00000 n -0000106721 00000 n -0000745365 00000 n -0000002068 00000 n -0000002092 00000 n -0000107223 00000 n -0000745273 00000 n -0000002144 00000 n -0000002172 00000 n -0000107598 00000 n -0000745181 00000 n -0000002224 00000 n -0000002248 00000 n -0000107972 00000 n -0000745089 00000 n -0000002300 00000 n -0000002329 00000 n -0000110011 00000 n -0000744997 00000 n -0000002381 00000 n -0000002410 00000 n -0000110262 00000 n -0000744919 00000 n -0000002462 00000 n -0000002491 00000 n -0000110513 00000 n -0000744787 00000 n -0000002538 00000 n -0000002579 00000 n -0000110637 00000 n -0000744708 00000 n -0000002631 00000 n -0000002653 00000 n -0000111012 00000 n -0000744615 00000 n -0000002705 00000 n -0000002729 00000 n -0000113998 00000 n -0000744522 00000 n -0000002781 00000 n -0000002805 00000 n -0000114501 00000 n -0000744443 00000 n -0000002857 00000 n -0000002883 00000 n -0000114752 00000 n -0000744309 00000 n -0000002930 00000 n -0000002971 00000 n -0000117916 00000 n -0000744230 00000 n -0000003023 00000 n -0000003050 00000 n -0000121605 00000 n -0000744137 00000 n -0000003102 00000 n -0000003128 00000 n -0000127625 00000 n -0000744044 00000 n -0000003180 00000 n -0000003202 00000 n -0000149247 00000 n -0000743951 00000 n -0000003254 00000 n -0000003278 00000 n -0000164547 00000 n -0000743858 00000 n -0000003330 00000 n -0000003358 00000 n -0000168101 00000 n -0000743765 00000 n -0000003410 00000 n -0000003434 00000 n -0000172537 00000 n -0000743672 00000 n -0000003486 00000 n -0000003514 00000 n -0000172788 00000 n -0000743579 00000 n -0000003566 00000 n -0000003592 00000 n -0000177813 00000 n -0000743486 00000 n -0000003644 00000 n -0000003676 00000 n -0000178313 00000 n -0000743393 00000 n -0000003729 00000 n -0000003758 00000 n -0000178626 00000 n -0000743314 00000 n -0000003811 00000 n -0000003840 00000 n -0000181410 00000 n -0000743220 00000 n -0000003887 00000 n -0000003928 00000 n -0000181535 00000 n -0000743126 00000 n -0000003975 00000 n -0000004016 00000 n -0000181659 00000 n -0000742993 00000 n -0000004063 00000 n -0000004104 00000 n -0000184350 00000 n -0000742914 00000 n -0000004156 00000 n -0000004183 00000 n -0000184977 00000 n -0000742821 00000 n -0000004235 00000 n -0000004257 00000 n -0000189090 00000 n -0000742728 00000 n -0000004309 00000 n -0000004333 00000 n -0000189718 00000 n -0000742635 00000 n -0000004385 00000 n -0000004413 00000 n -0000190221 00000 n -0000742542 00000 n -0000004465 00000 n -0000004489 00000 n -0000195658 00000 n -0000742449 00000 n -0000004541 00000 n -0000004570 00000 n -0000200090 00000 n -0000742356 00000 n -0000004622 00000 n -0000004648 00000 n -0000200843 00000 n -0000742277 00000 n -0000004700 00000 n -0000004732 00000 n -0000201282 00000 n -0000742143 00000 n -0000004780 00000 n -0000004821 00000 n -0000204020 00000 n -0000742064 00000 n -0000004874 00000 n -0000004901 00000 n -0000208631 00000 n -0000741971 00000 n -0000004954 00000 n -0000004980 00000 n -0000219712 00000 n -0000741878 00000 n -0000005033 00000 n -0000005055 00000 n -0000235761 00000 n -0000741785 00000 n -0000005108 00000 n -0000005132 00000 n -0000251684 00000 n -0000741692 00000 n -0000005185 00000 n -0000005213 00000 n -0000301635 00000 n -0000741599 00000 n -0000005266 00000 n -0000005290 00000 n -0000307996 00000 n -0000741506 00000 n -0000005343 00000 n -0000005371 00000 n -0000308436 00000 n -0000741413 00000 n -0000005424 00000 n -0000005451 00000 n -0000312000 00000 n -0000741320 00000 n -0000005504 00000 n -0000005532 00000 n -0000312440 00000 n -0000741227 00000 n -0000005586 00000 n -0000005615 00000 n -0000316317 00000 n -0000741134 00000 n -0000005669 00000 n -0000005695 00000 n -0000316881 00000 n -0000741041 00000 n -0000005749 00000 n -0000005776 00000 n -0000320353 00000 n -0000740948 00000 n -0000005830 00000 n -0000005856 00000 n -0000336809 00000 n -0000740855 00000 n -0000005910 00000 n -0000005939 00000 n -0000337249 00000 n -0000740762 00000 n -0000005993 00000 n -0000006018 00000 n -0000341140 00000 n -0000740669 00000 n -0000006072 00000 n -0000006102 00000 n -0000341705 00000 n -0000740576 00000 n -0000006156 00000 n -0000006185 00000 n -0000342458 00000 n -0000740483 00000 n -0000006239 00000 n -0000006268 00000 n -0000345230 00000 n -0000740404 00000 n -0000006322 00000 n -0000006353 00000 n -0000345985 00000 n -0000740310 00000 n -0000006401 00000 n -0000006442 00000 n -0000346109 00000 n -0000740177 00000 n -0000006490 00000 n -0000006525 00000 n -0000346234 00000 n -0000740098 00000 n -0000006578 00000 n -0000006605 00000 n -0000346610 00000 n -0000740005 00000 n -0000006658 00000 n -0000006680 00000 n -0000350765 00000 n -0000739912 00000 n -0000006733 00000 n -0000006757 00000 n -0000354462 00000 n -0000739819 00000 n -0000006810 00000 n -0000006838 00000 n -0000354902 00000 n -0000739726 00000 n -0000006891 00000 n -0000006919 00000 n -0000355216 00000 n -0000739633 00000 n -0000006972 00000 n -0000006999 00000 n -0000355530 00000 n -0000739540 00000 n -0000007052 00000 n -0000007080 00000 n -0000355844 00000 n -0000739447 00000 n -0000007133 00000 n -0000007162 00000 n -0000359482 00000 n -0000739368 00000 n -0000007215 00000 n -0000007241 00000 n -0000359921 00000 n -0000739234 00000 n -0000007289 00000 n -0000007324 00000 n -0000360046 00000 n -0000739155 00000 n -0000007377 00000 n -0000007404 00000 n -0000364049 00000 n -0000739062 00000 n -0000007457 00000 n -0000007483 00000 n -0000368142 00000 n -0000738969 00000 n -0000007536 00000 n -0000007558 00000 n -0000377318 00000 n -0000738876 00000 n -0000007611 00000 n -0000007635 00000 n -0000388532 00000 n -0000738783 00000 n -0000007688 00000 n -0000007716 00000 n -0000407545 00000 n -0000738690 00000 n -0000007769 00000 n -0000007796 00000 n -0000407922 00000 n -0000738597 00000 n -0000007849 00000 n -0000007877 00000 n -0000408357 00000 n -0000738504 00000 n -0000007930 00000 n -0000007959 00000 n -0000411577 00000 n -0000738411 00000 n -0000008012 00000 n -0000008038 00000 n -0000418012 00000 n -0000738318 00000 n -0000008092 00000 n -0000008124 00000 n -0000420706 00000 n -0000738225 00000 n -0000008178 00000 n -0000008207 00000 n -0000420957 00000 n -0000738132 00000 n -0000008261 00000 n -0000008284 00000 n -0000421271 00000 n -0000738039 00000 n -0000008338 00000 n -0000008363 00000 n -0000421709 00000 n -0000737946 00000 n -0000008417 00000 n -0000008446 00000 n -0000426342 00000 n -0000737867 00000 n -0000008500 00000 n -0000008529 00000 n -0000427475 00000 n -0000737734 00000 n -0000008577 00000 n -0000008612 00000 n -0000430489 00000 n -0000737655 00000 n -0000008665 00000 n -0000008691 00000 n -0000432257 00000 n -0000737562 00000 n -0000008744 00000 n -0000008766 00000 n -0000432382 00000 n -0000737469 00000 n -0000008819 00000 n -0000008843 00000 n -0000434633 00000 n -0000737376 00000 n -0000008896 00000 n -0000008924 00000 n -0000434758 00000 n -0000737283 00000 n -0000008977 00000 n -0000009003 00000 n -0000436686 00000 n -0000737190 00000 n -0000009056 00000 n -0000009084 00000 n -0000436811 00000 n -0000737111 00000 n -0000009137 00000 n -0000009166 00000 n -0000439093 00000 n -0000736978 00000 n -0000009214 00000 n -0000009249 00000 n -0000439218 00000 n -0000736899 00000 n -0000009302 00000 n -0000009328 00000 n -0000439343 00000 n -0000736806 00000 n -0000009381 00000 n -0000009403 00000 n -0000439468 00000 n -0000736713 00000 n -0000009456 00000 n -0000009480 00000 n -0000441450 00000 n -0000736620 00000 n -0000009533 00000 n -0000009565 00000 n -0000441575 00000 n -0000736527 00000 n -0000009618 00000 n -0000009646 00000 n -0000441700 00000 n -0000736434 00000 n -0000009699 00000 n -0000009725 00000 n -0000441825 00000 n -0000736355 00000 n -0000009778 00000 n -0000009807 00000 n -0000444965 00000 n -0000736222 00000 n -0000009855 00000 n -0000009890 00000 n -0000445090 00000 n -0000736143 00000 n -0000009943 00000 n -0000009969 00000 n -0000445214 00000 n -0000736050 00000 n -0000010022 00000 n -0000010052 00000 n -0000447346 00000 n -0000735957 00000 n -0000010105 00000 n -0000010127 00000 n -0000447471 00000 n -0000735864 00000 n -0000010180 00000 n -0000010204 00000 n -0000451590 00000 n -0000735771 00000 n -0000010257 00000 n -0000010289 00000 n -0000451715 00000 n -0000735678 00000 n -0000010342 00000 n -0000010370 00000 n -0000451839 00000 n -0000735585 00000 n -0000010423 00000 n -0000010449 00000 n -0000453811 00000 n -0000735506 00000 n -0000010502 00000 n -0000010527 00000 n -0000453934 00000 n -0000735373 00000 n -0000010575 00000 n -0000010610 00000 n -0000454058 00000 n -0000735294 00000 n -0000010663 00000 n -0000010685 00000 n -0000456354 00000 n -0000735201 00000 n -0000010738 00000 n -0000010762 00000 n -0000456479 00000 n -0000735108 00000 n -0000010815 00000 n -0000010843 00000 n -0000456604 00000 n -0000735029 00000 n -0000010896 00000 n -0000010922 00000 n -0000456728 00000 n -0000734896 00000 n -0000010970 00000 n -0000011005 00000 n -0000459539 00000 n -0000734817 00000 n -0000011058 00000 n -0000011084 00000 n -0000462070 00000 n -0000734724 00000 n -0000011137 00000 n -0000011167 00000 n -0000462195 00000 n -0000734631 00000 n -0000011220 00000 n -0000011242 00000 n -0000473835 00000 n -0000734538 00000 n -0000011295 00000 n -0000011319 00000 n -0000483096 00000 n -0000734445 00000 n -0000011372 00000 n -0000011400 00000 n -0000493832 00000 n -0000734352 00000 n -0000011453 00000 n -0000011479 00000 n -0000506265 00000 n -0000734259 00000 n -0000011532 00000 n -0000011561 00000 n -0000508474 00000 n -0000734166 00000 n -0000011614 00000 n -0000011639 00000 n -0000508599 00000 n -0000734087 00000 n -0000011692 00000 n -0000011718 00000 n -0000508724 00000 n -0000733993 00000 n -0000011766 00000 n -0000011800 00000 n -0000511978 00000 n -0000733860 00000 n -0000011848 00000 n -0000011882 00000 n -0000512103 00000 n -0000733781 00000 n -0000011935 00000 n -0000011961 00000 n -0000515184 00000 n -0000733688 00000 n -0000012014 00000 n -0000012036 00000 n -0000515309 00000 n -0000733595 00000 n -0000012089 00000 n -0000012113 00000 n -0000515434 00000 n -0000733502 00000 n -0000012166 00000 n -0000012190 00000 n -0000520384 00000 n -0000733423 00000 n -0000012243 00000 n -0000012266 00000 n -0000540735 00000 n -0000733329 00000 n -0000012314 00000 n -0000012348 00000 n -0000540860 00000 n -0000733235 00000 n -0000012396 00000 n -0000012430 00000 n -0000544005 00000 n -0000733141 00000 n -0000012478 00000 n -0000012512 00000 n -0000544130 00000 n -0000733047 00000 n -0000012560 00000 n -0000012594 00000 n -0000553236 00000 n -0000732953 00000 n -0000012642 00000 n -0000012676 00000 n -0000553361 00000 n -0000732859 00000 n -0000012724 00000 n -0000012758 00000 n -0000560316 00000 n -0000732765 00000 n -0000012806 00000 n -0000012840 00000 n -0000560944 00000 n -0000732671 00000 n -0000012888 00000 n -0000012922 00000 n -0000563986 00000 n -0000732577 00000 n -0000012970 00000 n -0000013004 00000 n -0000567169 00000 n -0000732483 00000 n -0000013052 00000 n -0000013086 00000 n -0000571133 00000 n -0000732389 00000 n -0000013134 00000 n -0000013168 00000 n -0000573211 00000 n -0000732295 00000 n -0000013216 00000 n -0000013250 00000 n -0000573336 00000 n -0000732201 00000 n -0000013298 00000 n -0000013332 00000 n -0000573461 00000 n -0000732107 00000 n -0000013380 00000 n -0000013414 00000 n -0000576584 00000 n -0000732013 00000 n -0000013462 00000 n -0000013496 00000 n -0000578548 00000 n -0000731919 00000 n -0000013544 00000 n -0000013578 00000 n -0000578673 00000 n -0000731839 00000 n -0000013626 00000 n -0000013669 00000 n -0000014089 00000 n -0000014208 00000 n -0000014840 00000 n -0000013722 00000 n -0000014656 00000 n -0000728003 00000 n -0000727473 00000 n -0000014718 00000 n -0000014779 00000 n -0000727300 00000 n -0000728360 00000 n -0000016222 00000 n -0000016374 00000 n -0000016530 00000 n -0000016686 00000 n -0000016843 00000 n -0000017000 00000 n -0000017157 00000 n -0000017314 00000 n -0000017471 00000 n -0000017623 00000 n -0000017780 00000 n -0000017937 00000 n -0000018094 00000 n -0000018246 00000 n -0000018403 00000 n -0000018560 00000 n -0000018717 00000 n -0000018874 00000 n -0000019030 00000 n -0000019186 00000 n -0000019342 00000 n -0000019498 00000 n -0000019654 00000 n -0000019805 00000 n -0000019961 00000 n -0000020117 00000 n -0000020273 00000 n -0000020429 00000 n -0000020584 00000 n -0000020740 00000 n -0000020896 00000 n -0000021052 00000 n -0000022703 00000 n -0000022854 00000 n -0000023009 00000 n -0000023164 00000 n -0000023320 00000 n -0000023476 00000 n -0000021270 00000 n -0000015835 00000 n -0000014974 00000 n -0000021208 00000 n -0000727827 00000 n -0000023627 00000 n -0000023783 00000 n -0000023939 00000 n -0000024094 00000 n -0000024249 00000 n -0000024404 00000 n -0000024560 00000 n -0000024716 00000 n -0000024872 00000 n -0000025028 00000 n -0000025185 00000 n -0000025342 00000 n -0000025492 00000 n -0000025643 00000 n -0000025794 00000 n -0000025950 00000 n -0000026106 00000 n -0000026262 00000 n -0000026418 00000 n -0000026574 00000 n -0000026730 00000 n -0000026886 00000 n -0000027042 00000 n -0000027194 00000 n -0000027351 00000 n -0000027508 00000 n -0000027665 00000 n -0000027822 00000 n -0000027979 00000 n -0000028135 00000 n -0000029873 00000 n -0000030029 00000 n -0000030186 00000 n -0000030344 00000 n -0000028352 00000 n -0000022284 00000 n -0000021381 00000 n -0000028290 00000 n -0000030502 00000 n -0000030660 00000 n -0000030818 00000 n -0000030976 00000 n -0000031133 00000 n -0000031291 00000 n -0000031449 00000 n -0000031607 00000 n -0000031765 00000 n -0000031917 00000 n -0000032069 00000 n -0000032226 00000 n -0000032382 00000 n -0000032539 00000 n -0000032696 00000 n -0000032853 00000 n -0000033010 00000 n -0000033167 00000 n -0000033323 00000 n -0000033480 00000 n -0000033632 00000 n -0000033789 00000 n -0000033946 00000 n -0000034102 00000 n -0000034259 00000 n -0000034416 00000 n -0000034573 00000 n -0000034730 00000 n -0000034887 00000 n -0000035043 00000 n -0000035201 00000 n -0000035359 00000 n -0000035517 00000 n -0000035675 00000 n -0000035831 00000 n -0000037498 00000 n -0000037649 00000 n -0000036049 00000 n -0000029430 00000 n -0000028450 00000 n -0000035987 00000 n -0000037805 00000 n -0000037962 00000 n -0000038118 00000 n -0000038274 00000 n -0000038431 00000 n -0000038587 00000 n -0000038743 00000 n -0000038894 00000 n -0000039051 00000 n -0000039207 00000 n -0000039363 00000 n -0000039520 00000 n -0000039676 00000 n -0000039832 00000 n -0000039989 00000 n -0000040141 00000 n -0000040298 00000 n -0000040454 00000 n -0000040611 00000 n -0000040767 00000 n -0000040923 00000 n -0000041080 00000 n -0000041236 00000 n -0000041392 00000 n -0000041543 00000 n -0000041700 00000 n -0000041857 00000 n -0000042014 00000 n -0000042171 00000 n -0000042323 00000 n -0000042480 00000 n -0000042637 00000 n -0000042794 00000 n -0000042951 00000 n -0000043108 00000 n -0000043266 00000 n -0000043424 00000 n -0000043581 00000 n -0000044897 00000 n -0000043799 00000 n -0000037047 00000 n -0000036147 00000 n -0000043737 00000 n -0000045049 00000 n -0000045202 00000 n -0000045360 00000 n -0000045518 00000 n -0000045676 00000 n -0000045833 00000 n -0000045991 00000 n -0000046144 00000 n -0000046296 00000 n -0000046449 00000 n -0000046602 00000 n -0000046754 00000 n -0000046907 00000 n -0000047060 00000 n -0000047213 00000 n -0000047366 00000 n -0000047519 00000 n -0000047672 00000 n -0000047825 00000 n -0000047977 00000 n -0000048130 00000 n -0000048279 00000 n -0000048432 00000 n -0000048647 00000 n -0000044574 00000 n -0000043897 00000 n -0000048585 00000 n -0000050409 00000 n -0000050626 00000 n -0000050842 00000 n -0000051058 00000 n -0000051216 00000 n -0000051378 00000 n -0000051593 00000 n -0000051739 00000 n -0000051948 00000 n -0000050214 00000 n -0000048745 00000 n -0000051886 00000 n -0000728478 00000 n -0000578735 00000 n -0000055587 00000 n -0000053896 00000 n -0000052046 00000 n -0000054015 00000 n -0000054136 00000 n -0000054255 00000 n -0000726948 00000 n -0000054316 00000 n -0000054377 00000 n -0000054438 00000 n -0000054499 00000 n -0000054620 00000 n -0000054680 00000 n -0000054739 00000 n -0000054800 00000 n -0000054861 00000 n -0000054922 00000 n -0000055040 00000 n -0000055101 00000 n -0000055162 00000 n -0000726299 00000 n -0000726154 00000 n -0000055282 00000 n -0000055343 00000 n -0000055404 00000 n -0000055465 00000 n -0000055526 00000 n -0000059588 00000 n -0000057587 00000 n -0000055724 00000 n -0000057706 00000 n -0000057768 00000 n -0000057829 00000 n -0000057890 00000 n -0000057951 00000 n -0000058012 00000 n -0000058073 00000 n -0000058193 00000 n -0000058254 00000 n -0000058313 00000 n -0000058374 00000 n -0000058435 00000 n -0000058496 00000 n -0000058557 00000 n -0000058618 00000 n -0000058679 00000 n -0000058740 00000 n -0000058801 00000 n -0000058862 00000 n -0000058923 00000 n -0000059044 00000 n -0000059105 00000 n -0000059162 00000 n -0000059283 00000 n -0000059344 00000 n -0000059405 00000 n -0000059466 00000 n -0000059527 00000 n -0000062887 00000 n -0000061678 00000 n -0000059725 00000 n -0000061797 00000 n -0000061919 00000 n -0000062040 00000 n -0000062101 00000 n -0000062162 00000 n -0000062223 00000 n -0000062343 00000 n -0000062404 00000 n -0000062465 00000 n -0000062584 00000 n -0000062644 00000 n -0000062705 00000 n -0000062826 00000 n -0000727122 00000 n -0000066628 00000 n -0000064858 00000 n -0000063051 00000 n -0000064977 00000 n -0000065099 00000 n -0000065160 00000 n -0000065221 00000 n -0000065282 00000 n -0000065343 00000 n -0000065404 00000 n -0000065465 00000 n -0000065526 00000 n -0000065587 00000 n -0000065648 00000 n -0000065709 00000 n -0000065770 00000 n -0000065831 00000 n -0000065892 00000 n -0000065953 00000 n -0000066014 00000 n -0000066075 00000 n -0000066196 00000 n -0000066257 00000 n -0000066318 00000 n -0000066380 00000 n -0000066442 00000 n -0000066504 00000 n -0000066566 00000 n -0000071451 00000 n -0000069188 00000 n -0000066765 00000 n -0000069310 00000 n -0000069374 00000 n -0000069437 00000 n -0000069500 00000 n -0000069563 00000 n -0000069626 00000 n -0000069689 00000 n -0000069752 00000 n -0000069815 00000 n -0000069878 00000 n -0000069941 00000 n -0000070004 00000 n -0000070067 00000 n -0000070130 00000 n -0000070193 00000 n -0000070256 00000 n -0000070319 00000 n -0000070382 00000 n -0000070445 00000 n -0000070508 00000 n -0000070570 00000 n -0000070633 00000 n -0000070696 00000 n -0000070759 00000 n -0000070822 00000 n -0000070885 00000 n -0000070948 00000 n -0000071011 00000 n -0000071074 00000 n -0000071137 00000 n -0000071200 00000 n -0000071263 00000 n -0000071326 00000 n -0000071388 00000 n -0000075875 00000 n -0000073867 00000 n -0000071576 00000 n -0000073990 00000 n -0000074115 00000 n -0000074178 00000 n -0000074241 00000 n -0000074304 00000 n -0000074366 00000 n -0000074429 00000 n -0000074492 00000 n -0000074554 00000 n -0000074617 00000 n -0000074680 00000 n -0000074743 00000 n -0000074806 00000 n -0000074869 00000 n -0000074932 00000 n -0000074995 00000 n -0000075058 00000 n -0000075121 00000 n -0000075184 00000 n -0000075247 00000 n -0000075310 00000 n -0000075371 00000 n -0000075434 00000 n -0000075497 00000 n -0000075560 00000 n -0000075623 00000 n -0000075686 00000 n -0000075749 00000 n -0000075812 00000 n -0000728597 00000 n -0000080293 00000 n -0000078160 00000 n -0000076013 00000 n -0000078283 00000 n -0000078347 00000 n -0000078410 00000 n -0000078473 00000 n -0000078536 00000 n -0000078599 00000 n -0000078661 00000 n -0000078723 00000 n -0000078786 00000 n -0000078849 00000 n -0000078912 00000 n -0000078975 00000 n -0000079038 00000 n -0000079101 00000 n -0000079164 00000 n -0000079288 00000 n -0000079351 00000 n -0000079413 00000 n -0000079476 00000 n -0000079539 00000 n -0000079602 00000 n -0000079665 00000 n -0000079728 00000 n -0000079791 00000 n -0000079852 00000 n -0000079915 00000 n -0000079978 00000 n -0000080041 00000 n -0000080104 00000 n -0000080167 00000 n -0000080230 00000 n -0000084805 00000 n -0000082667 00000 n -0000080431 00000 n -0000082790 00000 n -0000082854 00000 n -0000082917 00000 n -0000082980 00000 n -0000083043 00000 n -0000083106 00000 n -0000083169 00000 n -0000083232 00000 n -0000083295 00000 n -0000083358 00000 n -0000083421 00000 n -0000083484 00000 n -0000083547 00000 n -0000083610 00000 n -0000083672 00000 n -0000083735 00000 n -0000083798 00000 n -0000083861 00000 n -0000083924 00000 n -0000083987 00000 n -0000084050 00000 n -0000084113 00000 n -0000084176 00000 n -0000084239 00000 n -0000084302 00000 n -0000084365 00000 n -0000084427 00000 n -0000084490 00000 n -0000084553 00000 n -0000084616 00000 n -0000084679 00000 n -0000084742 00000 n -0000089918 00000 n -0000087595 00000 n -0000084930 00000 n -0000087718 00000 n -0000087782 00000 n -0000087845 00000 n -0000087908 00000 n -0000087971 00000 n -0000088034 00000 n -0000088096 00000 n -0000088159 00000 n -0000088222 00000 n -0000088285 00000 n -0000088348 00000 n -0000088411 00000 n -0000088474 00000 n -0000088536 00000 n -0000088599 00000 n -0000088662 00000 n -0000088725 00000 n -0000088788 00000 n -0000088851 00000 n -0000088914 00000 n -0000088977 00000 n -0000089100 00000 n -0000089163 00000 n -0000089226 00000 n -0000089289 00000 n -0000089352 00000 n -0000089415 00000 n -0000089478 00000 n -0000089541 00000 n -0000089604 00000 n -0000089667 00000 n -0000089730 00000 n -0000089793 00000 n -0000089855 00000 n -0000095668 00000 n -0000092907 00000 n -0000090056 00000 n -0000093030 00000 n -0000093155 00000 n -0000093218 00000 n -0000093281 00000 n -0000093344 00000 n -0000093407 00000 n -0000093470 00000 n -0000093533 00000 n -0000093594 00000 n -0000093657 00000 n -0000093720 00000 n -0000093781 00000 n -0000093844 00000 n -0000093907 00000 n -0000093970 00000 n -0000094033 00000 n -0000094096 00000 n -0000094159 00000 n -0000094222 00000 n -0000094285 00000 n -0000094348 00000 n -0000094410 00000 n -0000094473 00000 n -0000094536 00000 n -0000094598 00000 n -0000094661 00000 n -0000094724 00000 n -0000094787 00000 n -0000094850 00000 n -0000094913 00000 n -0000094976 00000 n -0000095039 00000 n -0000095102 00000 n -0000095164 00000 n -0000095227 00000 n -0000095290 00000 n -0000095353 00000 n -0000095416 00000 n -0000095479 00000 n -0000095542 00000 n -0000095605 00000 n -0000100606 00000 n -0000098473 00000 n -0000095806 00000 n -0000098596 00000 n -0000098660 00000 n -0000098723 00000 n -0000098786 00000 n -0000098849 00000 n -0000098912 00000 n -0000098975 00000 n -0000099037 00000 n -0000099100 00000 n -0000099163 00000 n -0000099226 00000 n -0000099289 00000 n -0000099351 00000 n -0000099474 00000 n -0000099537 00000 n -0000099600 00000 n -0000099663 00000 n -0000099726 00000 n -0000099789 00000 n -0000099913 00000 n -0000099976 00000 n -0000100039 00000 n -0000100102 00000 n -0000100165 00000 n -0000100228 00000 n -0000100291 00000 n -0000100354 00000 n -0000100417 00000 n -0000100480 00000 n -0000100543 00000 n -0000104349 00000 n -0000102535 00000 n -0000100744 00000 n -0000102658 00000 n -0000102722 00000 n -0000102785 00000 n -0000102848 00000 n -0000102910 00000 n -0000103034 00000 n -0000103097 00000 n -0000103160 00000 n -0000103283 00000 n -0000103406 00000 n -0000103469 00000 n -0000103532 00000 n -0000103595 00000 n -0000103658 00000 n -0000103721 00000 n -0000103784 00000 n -0000103847 00000 n -0000103910 00000 n -0000104034 00000 n -0000104097 00000 n -0000104160 00000 n -0000104223 00000 n -0000104286 00000 n -0000728722 00000 n -0000108222 00000 n -0000106284 00000 n -0000104487 00000 n -0000106407 00000 n -0000106533 00000 n -0000106596 00000 n -0000106659 00000 n -0000106783 00000 n -0000106846 00000 n -0000106909 00000 n -0000106972 00000 n -0000107035 00000 n -0000107097 00000 n -0000107160 00000 n -0000107284 00000 n -0000107346 00000 n -0000107409 00000 n -0000107472 00000 n -0000107535 00000 n -0000107658 00000 n -0000107720 00000 n -0000107783 00000 n -0000107846 00000 n -0000107909 00000 n -0000108034 00000 n -0000108097 00000 n -0000108159 00000 n -0000111387 00000 n -0000109824 00000 n -0000108360 00000 n -0000109947 00000 n -0000110073 00000 n -0000110136 00000 n -0000110199 00000 n -0000110324 00000 n -0000110387 00000 n -0000110450 00000 n -0000110574 00000 n -0000110698 00000 n -0000110761 00000 n -0000110824 00000 n -0000110887 00000 n -0000110949 00000 n -0000111074 00000 n -0000111136 00000 n -0000111198 00000 n -0000111261 00000 n -0000111324 00000 n -0000114877 00000 n -0000113811 00000 n -0000111512 00000 n -0000113934 00000 n -0000114060 00000 n -0000114123 00000 n -0000114186 00000 n -0000114249 00000 n -0000114312 00000 n -0000114375 00000 n -0000114438 00000 n -0000114563 00000 n -0000114626 00000 n -0000114689 00000 n -0000114814 00000 n -0000118293 00000 n -0000117729 00000 n -0000115042 00000 n -0000117852 00000 n -0000117978 00000 n -0000118041 00000 n -0000118104 00000 n -0000118167 00000 n -0000118230 00000 n -0000122985 00000 n -0000120599 00000 n -0000118432 00000 n -0000120722 00000 n -0000120786 00000 n -0000120849 00000 n -0000120912 00000 n -0000120975 00000 n -0000121038 00000 n -0000121101 00000 n -0000121164 00000 n -0000121227 00000 n -0000121290 00000 n -0000121353 00000 n -0000121416 00000 n -0000121479 00000 n -0000121542 00000 n -0000121667 00000 n -0000121730 00000 n -0000121793 00000 n -0000121855 00000 n -0000121917 00000 n -0000121980 00000 n -0000122043 00000 n -0000122106 00000 n -0000122169 00000 n -0000122232 00000 n -0000122295 00000 n -0000122357 00000 n -0000122420 00000 n -0000122483 00000 n -0000122546 00000 n -0000122609 00000 n -0000122672 00000 n -0000122735 00000 n -0000122797 00000 n -0000122860 00000 n -0000122922 00000 n -0000127875 00000 n -0000125552 00000 n -0000123110 00000 n -0000125675 00000 n -0000125739 00000 n -0000125802 00000 n -0000125865 00000 n -0000125928 00000 n -0000125991 00000 n -0000126053 00000 n -0000126116 00000 n -0000126179 00000 n -0000126242 00000 n -0000126305 00000 n -0000126368 00000 n -0000126431 00000 n -0000126494 00000 n -0000126557 00000 n -0000126620 00000 n -0000126681 00000 n -0000126744 00000 n -0000126807 00000 n -0000126870 00000 n -0000126933 00000 n -0000126996 00000 n -0000127058 00000 n -0000127121 00000 n -0000127184 00000 n -0000127247 00000 n -0000127310 00000 n -0000127373 00000 n -0000127436 00000 n -0000127499 00000 n -0000127562 00000 n -0000127687 00000 n -0000127750 00000 n -0000127812 00000 n -0000728847 00000 n -0000132332 00000 n -0000130008 00000 n -0000127987 00000 n -0000130131 00000 n -0000130195 00000 n -0000130258 00000 n -0000130321 00000 n -0000130384 00000 n -0000130447 00000 n -0000130510 00000 n -0000130572 00000 n -0000130635 00000 n -0000130698 00000 n -0000130761 00000 n -0000130823 00000 n -0000130886 00000 n -0000130949 00000 n -0000131012 00000 n -0000131075 00000 n -0000131138 00000 n -0000131201 00000 n -0000131264 00000 n -0000131327 00000 n -0000131390 00000 n -0000131453 00000 n -0000131516 00000 n -0000131579 00000 n -0000131642 00000 n -0000131705 00000 n -0000131767 00000 n -0000131830 00000 n -0000131893 00000 n -0000131956 00000 n -0000132019 00000 n -0000132081 00000 n -0000132144 00000 n -0000132207 00000 n -0000132270 00000 n -0000136991 00000 n -0000134855 00000 n -0000132431 00000 n -0000134978 00000 n -0000135042 00000 n -0000135105 00000 n -0000135168 00000 n -0000135231 00000 n -0000135294 00000 n -0000135357 00000 n -0000135420 00000 n -0000135483 00000 n -0000135546 00000 n -0000135608 00000 n -0000135671 00000 n -0000135734 00000 n -0000135797 00000 n -0000135860 00000 n -0000135922 00000 n -0000135985 00000 n -0000136048 00000 n -0000136111 00000 n -0000136174 00000 n -0000136237 00000 n -0000136299 00000 n -0000136362 00000 n -0000136425 00000 n -0000136488 00000 n -0000136550 00000 n -0000136613 00000 n -0000136676 00000 n -0000136739 00000 n -0000136802 00000 n -0000136865 00000 n -0000136928 00000 n -0000141680 00000 n -0000139358 00000 n -0000137116 00000 n -0000139481 00000 n -0000139545 00000 n -0000139608 00000 n -0000139671 00000 n -0000139734 00000 n -0000139796 00000 n -0000139859 00000 n -0000139922 00000 n -0000139983 00000 n -0000140046 00000 n -0000140108 00000 n -0000140171 00000 n -0000140234 00000 n -0000140297 00000 n -0000140360 00000 n -0000140423 00000 n -0000140486 00000 n -0000140549 00000 n -0000140612 00000 n -0000140675 00000 n -0000140738 00000 n -0000140801 00000 n -0000140864 00000 n -0000140927 00000 n -0000140990 00000 n -0000141053 00000 n -0000141116 00000 n -0000141179 00000 n -0000141241 00000 n -0000141304 00000 n -0000141367 00000 n -0000141430 00000 n -0000141493 00000 n -0000141555 00000 n -0000141618 00000 n -0000146710 00000 n -0000144200 00000 n -0000141792 00000 n -0000144323 00000 n -0000144387 00000 n -0000144450 00000 n -0000144513 00000 n -0000144576 00000 n -0000144639 00000 n -0000144702 00000 n -0000144764 00000 n -0000144827 00000 n -0000144890 00000 n -0000144953 00000 n -0000145015 00000 n -0000145078 00000 n -0000145141 00000 n -0000145204 00000 n -0000145267 00000 n -0000145329 00000 n -0000145392 00000 n -0000145455 00000 n -0000145518 00000 n -0000145581 00000 n -0000145643 00000 n -0000145706 00000 n -0000145769 00000 n -0000145832 00000 n -0000145895 00000 n -0000145958 00000 n -0000146021 00000 n -0000146083 00000 n -0000146146 00000 n -0000146209 00000 n -0000146272 00000 n -0000146334 00000 n -0000146397 00000 n -0000146460 00000 n -0000146523 00000 n -0000146586 00000 n -0000146647 00000 n -0000151321 00000 n -0000149060 00000 n -0000146809 00000 n -0000149183 00000 n -0000149309 00000 n -0000149372 00000 n -0000149435 00000 n -0000149498 00000 n -0000149561 00000 n -0000149624 00000 n -0000149687 00000 n -0000149749 00000 n -0000149812 00000 n -0000149875 00000 n -0000149938 00000 n -0000150001 00000 n -0000150063 00000 n -0000150126 00000 n -0000150189 00000 n -0000150252 00000 n -0000150314 00000 n -0000150377 00000 n -0000150440 00000 n -0000150503 00000 n -0000150566 00000 n -0000150629 00000 n -0000150692 00000 n -0000150755 00000 n -0000150818 00000 n -0000150880 00000 n -0000150943 00000 n -0000151006 00000 n -0000151069 00000 n -0000151132 00000 n -0000151195 00000 n -0000151258 00000 n -0000156259 00000 n -0000153807 00000 n -0000151446 00000 n -0000153930 00000 n -0000153994 00000 n -0000154057 00000 n -0000154120 00000 n -0000154183 00000 n -0000154246 00000 n -0000154308 00000 n -0000154371 00000 n -0000154434 00000 n -0000154497 00000 n -0000154560 00000 n -0000154623 00000 n -0000154686 00000 n -0000154749 00000 n -0000154812 00000 n -0000154874 00000 n -0000154937 00000 n -0000155000 00000 n -0000155063 00000 n -0000155126 00000 n -0000155189 00000 n -0000155252 00000 n -0000155315 00000 n -0000155378 00000 n -0000155441 00000 n -0000155504 00000 n -0000155567 00000 n -0000155630 00000 n -0000155693 00000 n -0000155756 00000 n -0000155818 00000 n -0000155881 00000 n -0000155944 00000 n -0000156007 00000 n -0000156070 00000 n -0000156133 00000 n -0000156196 00000 n -0000728972 00000 n -0000161207 00000 n -0000158757 00000 n -0000156371 00000 n -0000158880 00000 n -0000158944 00000 n -0000159007 00000 n -0000159070 00000 n -0000159133 00000 n -0000159196 00000 n -0000159258 00000 n -0000159321 00000 n -0000159384 00000 n -0000159447 00000 n -0000159510 00000 n -0000159573 00000 n -0000159636 00000 n -0000159699 00000 n -0000159762 00000 n -0000159825 00000 n -0000159888 00000 n -0000159951 00000 n -0000160014 00000 n -0000160077 00000 n -0000160140 00000 n -0000160201 00000 n -0000160264 00000 n -0000160327 00000 n -0000160390 00000 n -0000160453 00000 n -0000160515 00000 n -0000160578 00000 n -0000160641 00000 n -0000160704 00000 n -0000160767 00000 n -0000160830 00000 n -0000160893 00000 n -0000160955 00000 n -0000161018 00000 n -0000161081 00000 n -0000161144 00000 n -0000164985 00000 n -0000163230 00000 n -0000161319 00000 n -0000163353 00000 n -0000163417 00000 n -0000163480 00000 n -0000163543 00000 n -0000163606 00000 n -0000163669 00000 n -0000163732 00000 n -0000163794 00000 n -0000163857 00000 n -0000163920 00000 n -0000163983 00000 n -0000164045 00000 n -0000164108 00000 n -0000164171 00000 n -0000164234 00000 n -0000164297 00000 n -0000164360 00000 n -0000164423 00000 n -0000164484 00000 n -0000164609 00000 n -0000164672 00000 n -0000164734 00000 n -0000164797 00000 n -0000164860 00000 n -0000164923 00000 n -0000169926 00000 n -0000167914 00000 n -0000165123 00000 n -0000168037 00000 n -0000168163 00000 n -0000168226 00000 n -0000168289 00000 n -0000168352 00000 n -0000168415 00000 n -0000168478 00000 n -0000168541 00000 n -0000168604 00000 n -0000168667 00000 n -0000168730 00000 n -0000168793 00000 n -0000168856 00000 n -0000168919 00000 n -0000168982 00000 n -0000169045 00000 n -0000169108 00000 n -0000169171 00000 n -0000169234 00000 n -0000169297 00000 n -0000169360 00000 n -0000169423 00000 n -0000169486 00000 n -0000169548 00000 n -0000169611 00000 n -0000169674 00000 n -0000169737 00000 n -0000169800 00000 n -0000169863 00000 n -0000174733 00000 n -0000172350 00000 n -0000170064 00000 n -0000172473 00000 n -0000172599 00000 n -0000172662 00000 n -0000172725 00000 n -0000172850 00000 n -0000172912 00000 n -0000172975 00000 n -0000173038 00000 n -0000173101 00000 n -0000173164 00000 n -0000173227 00000 n -0000173290 00000 n -0000173353 00000 n -0000173416 00000 n -0000173477 00000 n -0000173540 00000 n -0000173603 00000 n -0000173666 00000 n -0000173728 00000 n -0000173791 00000 n -0000173854 00000 n -0000173917 00000 n -0000173980 00000 n -0000174043 00000 n -0000174106 00000 n -0000174169 00000 n -0000174232 00000 n -0000174295 00000 n -0000174358 00000 n -0000174421 00000 n -0000174484 00000 n -0000174545 00000 n -0000174608 00000 n -0000174671 00000 n -0000178939 00000 n -0000176808 00000 n -0000174845 00000 n -0000176931 00000 n -0000176995 00000 n -0000177058 00000 n -0000177121 00000 n -0000177184 00000 n -0000177247 00000 n -0000177310 00000 n -0000177373 00000 n -0000177436 00000 n -0000177499 00000 n -0000177562 00000 n -0000177625 00000 n -0000177688 00000 n -0000177751 00000 n -0000177875 00000 n -0000177938 00000 n -0000178001 00000 n -0000178063 00000 n -0000178124 00000 n -0000178187 00000 n -0000178250 00000 n -0000178374 00000 n -0000178437 00000 n -0000178500 00000 n -0000178563 00000 n -0000178688 00000 n -0000178751 00000 n -0000178814 00000 n -0000178877 00000 n -0000181784 00000 n -0000181223 00000 n -0000179064 00000 n -0000181346 00000 n -0000181472 00000 n -0000181597 00000 n -0000181721 00000 n -0000729097 00000 n -0000186170 00000 n -0000184163 00000 n -0000181923 00000 n -0000184286 00000 n -0000184412 00000 n -0000184475 00000 n -0000184538 00000 n -0000184599 00000 n -0000184662 00000 n -0000184725 00000 n -0000184788 00000 n -0000184851 00000 n -0000184914 00000 n -0000185039 00000 n -0000185102 00000 n -0000185165 00000 n -0000185228 00000 n -0000185290 00000 n -0000185353 00000 n -0000185416 00000 n -0000185479 00000 n -0000185541 00000 n -0000185604 00000 n -0000185667 00000 n -0000185730 00000 n -0000185793 00000 n -0000185856 00000 n -0000185919 00000 n -0000185982 00000 n -0000186045 00000 n -0000186107 00000 n -0000191354 00000 n -0000188903 00000 n -0000186308 00000 n -0000189026 00000 n -0000189152 00000 n -0000189215 00000 n -0000189278 00000 n -0000189341 00000 n -0000189404 00000 n -0000189467 00000 n -0000189530 00000 n -0000189592 00000 n -0000189655 00000 n -0000189780 00000 n -0000189843 00000 n -0000189906 00000 n -0000189969 00000 n -0000190032 00000 n -0000190095 00000 n -0000190158 00000 n -0000190283 00000 n -0000190346 00000 n -0000190409 00000 n -0000190472 00000 n -0000190535 00000 n -0000190598 00000 n -0000190661 00000 n -0000190724 00000 n -0000190787 00000 n -0000190850 00000 n -0000190913 00000 n -0000190976 00000 n -0000191039 00000 n -0000191102 00000 n -0000191165 00000 n -0000191228 00000 n -0000191291 00000 n -0000196599 00000 n -0000193899 00000 n -0000191492 00000 n -0000194022 00000 n -0000194086 00000 n -0000194149 00000 n -0000194212 00000 n -0000194275 00000 n -0000194338 00000 n -0000194401 00000 n -0000194464 00000 n -0000194527 00000 n -0000194589 00000 n -0000194652 00000 n -0000194715 00000 n -0000194778 00000 n -0000194841 00000 n -0000194904 00000 n -0000194967 00000 n -0000195030 00000 n -0000195092 00000 n -0000195155 00000 n -0000195218 00000 n -0000195281 00000 n -0000195344 00000 n -0000195407 00000 n -0000195470 00000 n -0000195532 00000 n -0000195595 00000 n -0000195720 00000 n -0000195783 00000 n -0000195846 00000 n -0000195909 00000 n -0000195972 00000 n -0000196034 00000 n -0000196097 00000 n -0000196160 00000 n -0000196223 00000 n -0000196286 00000 n -0000196349 00000 n -0000196410 00000 n -0000196473 00000 n -0000196536 00000 n -0000201407 00000 n -0000199903 00000 n -0000196724 00000 n -0000200026 00000 n -0000200152 00000 n -0000200215 00000 n -0000200277 00000 n -0000200340 00000 n -0000200403 00000 n -0000200466 00000 n -0000200529 00000 n -0000200592 00000 n -0000200655 00000 n -0000200717 00000 n -0000200780 00000 n -0000200905 00000 n -0000200968 00000 n -0000201031 00000 n -0000201094 00000 n -0000201156 00000 n -0000201219 00000 n -0000201344 00000 n -0000205341 00000 n -0000203833 00000 n -0000201545 00000 n -0000203956 00000 n -0000204082 00000 n -0000204145 00000 n -0000204208 00000 n -0000204271 00000 n -0000204334 00000 n -0000204397 00000 n -0000204460 00000 n -0000204523 00000 n -0000204586 00000 n -0000204649 00000 n -0000204711 00000 n -0000204774 00000 n -0000204837 00000 n -0000204900 00000 n -0000204963 00000 n -0000205026 00000 n -0000205089 00000 n -0000205152 00000 n -0000205215 00000 n -0000205278 00000 n -0000210453 00000 n -0000207816 00000 n -0000205492 00000 n -0000207939 00000 n -0000208003 00000 n -0000208066 00000 n -0000208129 00000 n -0000208192 00000 n -0000208255 00000 n -0000208317 00000 n -0000208380 00000 n -0000208443 00000 n -0000208506 00000 n -0000208569 00000 n -0000208692 00000 n -0000208755 00000 n -0000208818 00000 n -0000208881 00000 n -0000208944 00000 n -0000209007 00000 n -0000209070 00000 n -0000209133 00000 n -0000209195 00000 n -0000209258 00000 n -0000209321 00000 n -0000209384 00000 n -0000209447 00000 n -0000209510 00000 n -0000209573 00000 n -0000209636 00000 n -0000209699 00000 n -0000209762 00000 n -0000209825 00000 n -0000209888 00000 n -0000209951 00000 n -0000210014 00000 n -0000210077 00000 n -0000210140 00000 n -0000210203 00000 n -0000210266 00000 n -0000210328 00000 n -0000210391 00000 n -0000729222 00000 n -0000216446 00000 n -0000213491 00000 n -0000210565 00000 n -0000213614 00000 n -0000213678 00000 n -0000213741 00000 n -0000213804 00000 n -0000213867 00000 n -0000213930 00000 n -0000213993 00000 n -0000214055 00000 n -0000214118 00000 n -0000214181 00000 n -0000214244 00000 n -0000214307 00000 n -0000214370 00000 n -0000214433 00000 n -0000214496 00000 n -0000214559 00000 n -0000214621 00000 n -0000214684 00000 n -0000214747 00000 n -0000214810 00000 n -0000214873 00000 n -0000214936 00000 n -0000214998 00000 n -0000215061 00000 n -0000215124 00000 n -0000215187 00000 n -0000215249 00000 n -0000215312 00000 n -0000215375 00000 n -0000215438 00000 n -0000215501 00000 n -0000215564 00000 n -0000215627 00000 n -0000215690 00000 n -0000215753 00000 n -0000215816 00000 n -0000215879 00000 n -0000215942 00000 n -0000216005 00000 n -0000216068 00000 n -0000216131 00000 n -0000216194 00000 n -0000216257 00000 n -0000216320 00000 n -0000216383 00000 n -0000220906 00000 n -0000218708 00000 n -0000216571 00000 n -0000218831 00000 n -0000218895 00000 n -0000218958 00000 n -0000219021 00000 n -0000219084 00000 n -0000219147 00000 n -0000219209 00000 n -0000219272 00000 n -0000219335 00000 n -0000219398 00000 n -0000219461 00000 n -0000219524 00000 n -0000219587 00000 n -0000219650 00000 n -0000219774 00000 n -0000219837 00000 n -0000219900 00000 n -0000219962 00000 n -0000220025 00000 n -0000220088 00000 n -0000220151 00000 n -0000220214 00000 n -0000220277 00000 n -0000220340 00000 n -0000220402 00000 n -0000220465 00000 n -0000220528 00000 n -0000220591 00000 n -0000220654 00000 n -0000220717 00000 n -0000220780 00000 n -0000220843 00000 n -0000225286 00000 n -0000223215 00000 n -0000221018 00000 n -0000223338 00000 n -0000223402 00000 n -0000223465 00000 n -0000223528 00000 n -0000223591 00000 n -0000223654 00000 n -0000223716 00000 n -0000223779 00000 n -0000223842 00000 n -0000223905 00000 n -0000223968 00000 n -0000224031 00000 n -0000224094 00000 n -0000224156 00000 n -0000224219 00000 n -0000224282 00000 n -0000224345 00000 n -0000224406 00000 n -0000224469 00000 n -0000224532 00000 n -0000224595 00000 n -0000224658 00000 n -0000224721 00000 n -0000224784 00000 n -0000224846 00000 n -0000224909 00000 n -0000224972 00000 n -0000225035 00000 n -0000225098 00000 n -0000225160 00000 n -0000225223 00000 n -0000230858 00000 n -0000228220 00000 n -0000225411 00000 n -0000228343 00000 n -0000228407 00000 n -0000228470 00000 n -0000228533 00000 n -0000228596 00000 n -0000228659 00000 n -0000228721 00000 n -0000228784 00000 n -0000228847 00000 n -0000228910 00000 n -0000228972 00000 n -0000229035 00000 n -0000229098 00000 n -0000229161 00000 n -0000229223 00000 n -0000229286 00000 n -0000229349 00000 n -0000229412 00000 n -0000229475 00000 n -0000229538 00000 n -0000229600 00000 n -0000229663 00000 n -0000229726 00000 n -0000229789 00000 n -0000229852 00000 n -0000229915 00000 n -0000229978 00000 n -0000230041 00000 n -0000230104 00000 n -0000230167 00000 n -0000230230 00000 n -0000230293 00000 n -0000230356 00000 n -0000230419 00000 n -0000230482 00000 n -0000230545 00000 n -0000230607 00000 n -0000230670 00000 n -0000230733 00000 n -0000230796 00000 n -0000236829 00000 n -0000233939 00000 n -0000230983 00000 n -0000234062 00000 n -0000234126 00000 n -0000234189 00000 n -0000234252 00000 n -0000234315 00000 n -0000234378 00000 n -0000234441 00000 n -0000234503 00000 n -0000234566 00000 n -0000234629 00000 n -0000234692 00000 n -0000234755 00000 n -0000234818 00000 n -0000234881 00000 n -0000234944 00000 n -0000235007 00000 n -0000235069 00000 n -0000235132 00000 n -0000235195 00000 n -0000235258 00000 n -0000235321 00000 n -0000235384 00000 n -0000235447 00000 n -0000235510 00000 n -0000235573 00000 n -0000235635 00000 n -0000235698 00000 n -0000235823 00000 n -0000235886 00000 n -0000235949 00000 n -0000236012 00000 n -0000236075 00000 n -0000236138 00000 n -0000236201 00000 n -0000236263 00000 n -0000236326 00000 n -0000236389 00000 n -0000236452 00000 n -0000236515 00000 n -0000236578 00000 n -0000236641 00000 n -0000236703 00000 n -0000236766 00000 n -0000242658 00000 n -0000239892 00000 n -0000236941 00000 n -0000240015 00000 n -0000240079 00000 n -0000240142 00000 n -0000240205 00000 n -0000240268 00000 n -0000240331 00000 n -0000240394 00000 n -0000240457 00000 n -0000240520 00000 n -0000240583 00000 n -0000240645 00000 n -0000240708 00000 n -0000240771 00000 n -0000240834 00000 n -0000240897 00000 n -0000240960 00000 n -0000241023 00000 n -0000241086 00000 n -0000241149 00000 n -0000241210 00000 n -0000241273 00000 n -0000241336 00000 n -0000241399 00000 n -0000241462 00000 n -0000241525 00000 n -0000241588 00000 n -0000241651 00000 n -0000241714 00000 n -0000241777 00000 n -0000241840 00000 n -0000241903 00000 n -0000241966 00000 n -0000242029 00000 n -0000242092 00000 n -0000242154 00000 n -0000242217 00000 n -0000242280 00000 n -0000242343 00000 n -0000242406 00000 n -0000242469 00000 n -0000242532 00000 n -0000242595 00000 n -0000729347 00000 n -0000247280 00000 n -0000245146 00000 n -0000242783 00000 n -0000245269 00000 n -0000245333 00000 n -0000245396 00000 n -0000245459 00000 n -0000245522 00000 n -0000245585 00000 n -0000245648 00000 n -0000245711 00000 n -0000245774 00000 n -0000245837 00000 n -0000245900 00000 n -0000245963 00000 n -0000246026 00000 n -0000246089 00000 n -0000246151 00000 n -0000246214 00000 n -0000246277 00000 n -0000246340 00000 n -0000246403 00000 n -0000246466 00000 n -0000246529 00000 n -0000246588 00000 n -0000246651 00000 n -0000246714 00000 n -0000246777 00000 n -0000246840 00000 n -0000246903 00000 n -0000246966 00000 n -0000247029 00000 n -0000247092 00000 n -0000247154 00000 n -0000247217 00000 n -0000252499 00000 n -0000250114 00000 n -0000247405 00000 n -0000250237 00000 n -0000250301 00000 n -0000250364 00000 n -0000250427 00000 n -0000250490 00000 n -0000250553 00000 n -0000250616 00000 n -0000250679 00000 n -0000250742 00000 n -0000250805 00000 n -0000250868 00000 n -0000250931 00000 n -0000250994 00000 n -0000251057 00000 n -0000251120 00000 n -0000251183 00000 n -0000251244 00000 n -0000251307 00000 n -0000251370 00000 n -0000251433 00000 n -0000251496 00000 n -0000251559 00000 n -0000251622 00000 n -0000251746 00000 n -0000251808 00000 n -0000251871 00000 n -0000251934 00000 n -0000251996 00000 n -0000252059 00000 n -0000252122 00000 n -0000252185 00000 n -0000252248 00000 n -0000252310 00000 n -0000252373 00000 n -0000252436 00000 n -0000258260 00000 n -0000255370 00000 n -0000252637 00000 n -0000255493 00000 n -0000255557 00000 n -0000255620 00000 n -0000255683 00000 n -0000255746 00000 n -0000255809 00000 n -0000255872 00000 n -0000255935 00000 n -0000255998 00000 n -0000256061 00000 n -0000256124 00000 n -0000256185 00000 n -0000256248 00000 n -0000256311 00000 n -0000256374 00000 n -0000256437 00000 n -0000256500 00000 n -0000256563 00000 n -0000256626 00000 n -0000256689 00000 n -0000256751 00000 n -0000256814 00000 n -0000256877 00000 n -0000256940 00000 n -0000257003 00000 n -0000257065 00000 n -0000257128 00000 n -0000257191 00000 n -0000257254 00000 n -0000257317 00000 n -0000257380 00000 n -0000257443 00000 n -0000257506 00000 n -0000257569 00000 n -0000257632 00000 n -0000257695 00000 n -0000257758 00000 n -0000257821 00000 n -0000257883 00000 n -0000257946 00000 n -0000258008 00000 n -0000258071 00000 n -0000258134 00000 n -0000258197 00000 n -0000264258 00000 n -0000261301 00000 n -0000258359 00000 n -0000261424 00000 n -0000261488 00000 n -0000261551 00000 n -0000261614 00000 n -0000261677 00000 n -0000261740 00000 n -0000261803 00000 n -0000261866 00000 n -0000261929 00000 n -0000261992 00000 n -0000262055 00000 n -0000262118 00000 n -0000262181 00000 n -0000262244 00000 n -0000262307 00000 n -0000262370 00000 n -0000262433 00000 n -0000262495 00000 n -0000262558 00000 n -0000262621 00000 n -0000262684 00000 n -0000262747 00000 n -0000262810 00000 n -0000262873 00000 n -0000262936 00000 n -0000262999 00000 n -0000263061 00000 n -0000263124 00000 n -0000263187 00000 n -0000263250 00000 n -0000263313 00000 n -0000263376 00000 n -0000263439 00000 n -0000263502 00000 n -0000263565 00000 n -0000263628 00000 n -0000263691 00000 n -0000263754 00000 n -0000263817 00000 n -0000263880 00000 n -0000263943 00000 n -0000264006 00000 n -0000264069 00000 n -0000264132 00000 n -0000264195 00000 n -0000269528 00000 n -0000266888 00000 n -0000264357 00000 n -0000267011 00000 n -0000267075 00000 n -0000267138 00000 n -0000267201 00000 n -0000267264 00000 n -0000267327 00000 n -0000267389 00000 n -0000267452 00000 n -0000267515 00000 n -0000267578 00000 n -0000267641 00000 n -0000267704 00000 n -0000267766 00000 n -0000267829 00000 n -0000267892 00000 n -0000267955 00000 n -0000268018 00000 n -0000268081 00000 n -0000268143 00000 n -0000268206 00000 n -0000268269 00000 n -0000268332 00000 n -0000268395 00000 n -0000268458 00000 n -0000268521 00000 n -0000268584 00000 n -0000268647 00000 n -0000268710 00000 n -0000268773 00000 n -0000268836 00000 n -0000268899 00000 n -0000268962 00000 n -0000269025 00000 n -0000269087 00000 n -0000269150 00000 n -0000269213 00000 n -0000269276 00000 n -0000269339 00000 n -0000269402 00000 n -0000269465 00000 n -0000274590 00000 n -0000272012 00000 n -0000269627 00000 n -0000272135 00000 n -0000272199 00000 n -0000272262 00000 n -0000272325 00000 n -0000272388 00000 n -0000272451 00000 n -0000272514 00000 n -0000272577 00000 n -0000272640 00000 n -0000272703 00000 n -0000272766 00000 n -0000272829 00000 n -0000272892 00000 n -0000272955 00000 n -0000273018 00000 n -0000273081 00000 n -0000273144 00000 n -0000273207 00000 n -0000273270 00000 n -0000273333 00000 n -0000273396 00000 n -0000273459 00000 n -0000273522 00000 n -0000273585 00000 n -0000273647 00000 n -0000273710 00000 n -0000273773 00000 n -0000273836 00000 n -0000273899 00000 n -0000273962 00000 n -0000274025 00000 n -0000274087 00000 n -0000274150 00000 n -0000274213 00000 n -0000274276 00000 n -0000274339 00000 n -0000274401 00000 n -0000274464 00000 n -0000274527 00000 n -0000729472 00000 n -0000280516 00000 n -0000277441 00000 n -0000274689 00000 n -0000277564 00000 n -0000277628 00000 n -0000277691 00000 n -0000277754 00000 n -0000277816 00000 n -0000277879 00000 n -0000277942 00000 n -0000278005 00000 n -0000278068 00000 n -0000278131 00000 n -0000278194 00000 n -0000278257 00000 n -0000278320 00000 n -0000278382 00000 n -0000278445 00000 n -0000278508 00000 n -0000278571 00000 n -0000278634 00000 n -0000278697 00000 n -0000278760 00000 n -0000278822 00000 n -0000278885 00000 n -0000278948 00000 n -0000279011 00000 n -0000279074 00000 n -0000279137 00000 n -0000279200 00000 n -0000279263 00000 n -0000279326 00000 n -0000279388 00000 n -0000279451 00000 n -0000279514 00000 n -0000279577 00000 n -0000279640 00000 n -0000279703 00000 n -0000279766 00000 n -0000279829 00000 n -0000279892 00000 n -0000279954 00000 n -0000280017 00000 n -0000280080 00000 n -0000280143 00000 n -0000280206 00000 n -0000280269 00000 n -0000280332 00000 n -0000280395 00000 n -0000280458 00000 n -0000286491 00000 n -0000283410 00000 n -0000280615 00000 n -0000283533 00000 n -0000283597 00000 n -0000283660 00000 n -0000283723 00000 n -0000283786 00000 n -0000283849 00000 n -0000283912 00000 n -0000283975 00000 n -0000284038 00000 n -0000284101 00000 n -0000284164 00000 n -0000284226 00000 n -0000284289 00000 n -0000284352 00000 n -0000284415 00000 n -0000284478 00000 n -0000284541 00000 n -0000284604 00000 n -0000284667 00000 n -0000284730 00000 n -0000284793 00000 n -0000284856 00000 n -0000284919 00000 n -0000284982 00000 n -0000285045 00000 n -0000285108 00000 n -0000285171 00000 n -0000285234 00000 n -0000285297 00000 n -0000285359 00000 n -0000285422 00000 n -0000285485 00000 n -0000285548 00000 n -0000285610 00000 n -0000285673 00000 n -0000285736 00000 n -0000285799 00000 n -0000285862 00000 n -0000285925 00000 n -0000285987 00000 n -0000286050 00000 n -0000286113 00000 n -0000286176 00000 n -0000286239 00000 n -0000286302 00000 n -0000286365 00000 n -0000286428 00000 n -0000292452 00000 n -0000289310 00000 n -0000286590 00000 n -0000289433 00000 n -0000289497 00000 n -0000289560 00000 n -0000289623 00000 n -0000289686 00000 n -0000289749 00000 n -0000289812 00000 n -0000289875 00000 n -0000289937 00000 n -0000290000 00000 n -0000290063 00000 n -0000290126 00000 n -0000290189 00000 n -0000290252 00000 n -0000290315 00000 n -0000290378 00000 n -0000290441 00000 n -0000290504 00000 n -0000290567 00000 n -0000290630 00000 n -0000290693 00000 n -0000290755 00000 n -0000290818 00000 n -0000290881 00000 n -0000290944 00000 n -0000291007 00000 n -0000291070 00000 n -0000291133 00000 n -0000291195 00000 n -0000291258 00000 n -0000291321 00000 n -0000291384 00000 n -0000291447 00000 n -0000291510 00000 n -0000291573 00000 n -0000291636 00000 n -0000291699 00000 n -0000291761 00000 n -0000291824 00000 n -0000291887 00000 n -0000291950 00000 n -0000292013 00000 n -0000292076 00000 n -0000292139 00000 n -0000292202 00000 n -0000292265 00000 n -0000292327 00000 n -0000292390 00000 n -0000298190 00000 n -0000295364 00000 n -0000292551 00000 n -0000295487 00000 n -0000295551 00000 n -0000295614 00000 n -0000295677 00000 n -0000295740 00000 n -0000295803 00000 n -0000295866 00000 n -0000295929 00000 n -0000295992 00000 n -0000296055 00000 n -0000296118 00000 n -0000296181 00000 n -0000296244 00000 n -0000296307 00000 n -0000296370 00000 n -0000296433 00000 n -0000296496 00000 n -0000296559 00000 n -0000296622 00000 n -0000296685 00000 n -0000296748 00000 n -0000296811 00000 n -0000296874 00000 n -0000296937 00000 n -0000297000 00000 n -0000297063 00000 n -0000297126 00000 n -0000297189 00000 n -0000297252 00000 n -0000297315 00000 n -0000297378 00000 n -0000297440 00000 n -0000297503 00000 n -0000297566 00000 n -0000297629 00000 n -0000297692 00000 n -0000297755 00000 n -0000297818 00000 n -0000297881 00000 n -0000297943 00000 n -0000298006 00000 n -0000298069 00000 n -0000298132 00000 n -0000303394 00000 n -0000301008 00000 n -0000298289 00000 n -0000301131 00000 n -0000301195 00000 n -0000301258 00000 n -0000301320 00000 n -0000301383 00000 n -0000301446 00000 n -0000301509 00000 n -0000301572 00000 n -0000301696 00000 n -0000301759 00000 n -0000301822 00000 n -0000301885 00000 n -0000301948 00000 n -0000302011 00000 n -0000302074 00000 n -0000302137 00000 n -0000302200 00000 n -0000302263 00000 n -0000302326 00000 n -0000302389 00000 n -0000302452 00000 n -0000302515 00000 n -0000302578 00000 n -0000302641 00000 n -0000302703 00000 n -0000302766 00000 n -0000302829 00000 n -0000302892 00000 n -0000302955 00000 n -0000303018 00000 n -0000303081 00000 n -0000303144 00000 n -0000303207 00000 n -0000303269 00000 n -0000303332 00000 n -0000309002 00000 n -0000306111 00000 n -0000303532 00000 n -0000306234 00000 n -0000306298 00000 n -0000306361 00000 n -0000306424 00000 n -0000306487 00000 n -0000306550 00000 n -0000306613 00000 n -0000306675 00000 n -0000306738 00000 n -0000306801 00000 n -0000306864 00000 n -0000306927 00000 n -0000306990 00000 n -0000307053 00000 n -0000307116 00000 n -0000307179 00000 n -0000307241 00000 n -0000307304 00000 n -0000307367 00000 n -0000307430 00000 n -0000307493 00000 n -0000307556 00000 n -0000307619 00000 n -0000307681 00000 n -0000307744 00000 n -0000307807 00000 n -0000307870 00000 n -0000307933 00000 n -0000308058 00000 n -0000308121 00000 n -0000308184 00000 n -0000308247 00000 n -0000308310 00000 n -0000308373 00000 n -0000308498 00000 n -0000308561 00000 n -0000308624 00000 n -0000308687 00000 n -0000308750 00000 n -0000308813 00000 n -0000308876 00000 n -0000308939 00000 n -0000729597 00000 n -0000313445 00000 n -0000311372 00000 n -0000309140 00000 n -0000311495 00000 n -0000311559 00000 n -0000311622 00000 n -0000311685 00000 n -0000311748 00000 n -0000311811 00000 n -0000311874 00000 n -0000311937 00000 n -0000312062 00000 n -0000312125 00000 n -0000312188 00000 n -0000312251 00000 n -0000312314 00000 n -0000312377 00000 n -0000312501 00000 n -0000312564 00000 n -0000312627 00000 n -0000312690 00000 n -0000312753 00000 n -0000312816 00000 n -0000312879 00000 n -0000312942 00000 n -0000313005 00000 n -0000313068 00000 n -0000313131 00000 n -0000313194 00000 n -0000313256 00000 n -0000313319 00000 n -0000313382 00000 n -0000317132 00000 n -0000315375 00000 n -0000313583 00000 n -0000315498 00000 n -0000315562 00000 n -0000315625 00000 n -0000315688 00000 n -0000315751 00000 n -0000315814 00000 n -0000315876 00000 n -0000315939 00000 n -0000316002 00000 n -0000316065 00000 n -0000316128 00000 n -0000316191 00000 n -0000316254 00000 n -0000316379 00000 n -0000316442 00000 n -0000316504 00000 n -0000316567 00000 n -0000316629 00000 n -0000316692 00000 n -0000316755 00000 n -0000316818 00000 n -0000316943 00000 n -0000317006 00000 n -0000317069 00000 n -0000322931 00000 n -0000320166 00000 n -0000317257 00000 n -0000320289 00000 n -0000320415 00000 n -0000320478 00000 n -0000320541 00000 n -0000320604 00000 n -0000320667 00000 n -0000320730 00000 n -0000320792 00000 n -0000320855 00000 n -0000320918 00000 n -0000320981 00000 n -0000321044 00000 n -0000321107 00000 n -0000321170 00000 n -0000321233 00000 n -0000321296 00000 n -0000321359 00000 n -0000321422 00000 n -0000321485 00000 n -0000321548 00000 n -0000321611 00000 n -0000321674 00000 n -0000321737 00000 n -0000321799 00000 n -0000321862 00000 n -0000321925 00000 n -0000321988 00000 n -0000322051 00000 n -0000322114 00000 n -0000322177 00000 n -0000322240 00000 n -0000322303 00000 n -0000322365 00000 n -0000322428 00000 n -0000322491 00000 n -0000322554 00000 n -0000322617 00000 n -0000322680 00000 n -0000322742 00000 n -0000322805 00000 n -0000322868 00000 n -0000329492 00000 n -0000326040 00000 n -0000323056 00000 n -0000326163 00000 n -0000326227 00000 n -0000326290 00000 n -0000326353 00000 n -0000326416 00000 n -0000326479 00000 n -0000326542 00000 n -0000326605 00000 n -0000326667 00000 n -0000326730 00000 n -0000326793 00000 n -0000326856 00000 n -0000326919 00000 n -0000326982 00000 n -0000327045 00000 n -0000327108 00000 n -0000327171 00000 n -0000327232 00000 n -0000327295 00000 n -0000327358 00000 n -0000327421 00000 n -0000327484 00000 n -0000327547 00000 n -0000327610 00000 n -0000327673 00000 n -0000327736 00000 n -0000327799 00000 n -0000327862 00000 n -0000327925 00000 n -0000327988 00000 n -0000328051 00000 n -0000328114 00000 n -0000328177 00000 n -0000328239 00000 n -0000328302 00000 n -0000328365 00000 n -0000328428 00000 n -0000328491 00000 n -0000328554 00000 n -0000328617 00000 n -0000328680 00000 n -0000328743 00000 n -0000328805 00000 n -0000328868 00000 n -0000328931 00000 n -0000328994 00000 n -0000329057 00000 n -0000329120 00000 n -0000329183 00000 n -0000329246 00000 n -0000329305 00000 n -0000329368 00000 n -0000329430 00000 n -0000334091 00000 n -0000331828 00000 n -0000329604 00000 n -0000331951 00000 n -0000332015 00000 n -0000332078 00000 n -0000332140 00000 n -0000332203 00000 n -0000332266 00000 n -0000332329 00000 n -0000332392 00000 n -0000332455 00000 n -0000332518 00000 n -0000332581 00000 n -0000332644 00000 n -0000332707 00000 n -0000332770 00000 n -0000332833 00000 n -0000332895 00000 n -0000332958 00000 n -0000333021 00000 n -0000333084 00000 n -0000333147 00000 n -0000333210 00000 n -0000333273 00000 n -0000333336 00000 n -0000333399 00000 n -0000333462 00000 n -0000333525 00000 n -0000333587 00000 n -0000333650 00000 n -0000333713 00000 n -0000333776 00000 n -0000333839 00000 n -0000333902 00000 n -0000333965 00000 n -0000334028 00000 n -0000339009 00000 n -0000336622 00000 n -0000334216 00000 n -0000336745 00000 n -0000336871 00000 n -0000336934 00000 n -0000336997 00000 n -0000337060 00000 n -0000337123 00000 n -0000337186 00000 n -0000337311 00000 n -0000337374 00000 n -0000337436 00000 n -0000337499 00000 n -0000337561 00000 n -0000337624 00000 n -0000337687 00000 n -0000337750 00000 n -0000337813 00000 n -0000337876 00000 n -0000337939 00000 n -0000338002 00000 n -0000338065 00000 n -0000338127 00000 n -0000338190 00000 n -0000338253 00000 n -0000338316 00000 n -0000338379 00000 n -0000338442 00000 n -0000338505 00000 n -0000338568 00000 n -0000338631 00000 n -0000338694 00000 n -0000338757 00000 n -0000338820 00000 n -0000338883 00000 n -0000338946 00000 n -0000729722 00000 n -0000343210 00000 n -0000340953 00000 n -0000339121 00000 n -0000341076 00000 n -0000341202 00000 n -0000341265 00000 n -0000341328 00000 n -0000341390 00000 n -0000341453 00000 n -0000341516 00000 n -0000341579 00000 n -0000341642 00000 n -0000341767 00000 n -0000341830 00000 n -0000341893 00000 n -0000341955 00000 n -0000342018 00000 n -0000342080 00000 n -0000342143 00000 n -0000342206 00000 n -0000342269 00000 n -0000342332 00000 n -0000342395 00000 n -0000342519 00000 n -0000342582 00000 n -0000342645 00000 n -0000342708 00000 n -0000342771 00000 n -0000342834 00000 n -0000342897 00000 n -0000342960 00000 n -0000343022 00000 n -0000343085 00000 n -0000343147 00000 n -0000346734 00000 n -0000345043 00000 n -0000343322 00000 n -0000345166 00000 n -0000345292 00000 n -0000345355 00000 n -0000345418 00000 n -0000345481 00000 n -0000345544 00000 n -0000345607 00000 n -0000345670 00000 n -0000345733 00000 n -0000345796 00000 n -0000345859 00000 n -0000345922 00000 n -0000346046 00000 n -0000346171 00000 n -0000346296 00000 n -0000346359 00000 n -0000346422 00000 n -0000346485 00000 n -0000346548 00000 n -0000346671 00000 n -0000352647 00000 n -0000349886 00000 n -0000346872 00000 n -0000350009 00000 n -0000350073 00000 n -0000350136 00000 n -0000350199 00000 n -0000350262 00000 n -0000350325 00000 n -0000350388 00000 n -0000350451 00000 n -0000350513 00000 n -0000350576 00000 n -0000350639 00000 n -0000350702 00000 n -0000350825 00000 n -0000350888 00000 n -0000350951 00000 n -0000351013 00000 n -0000351076 00000 n -0000351139 00000 n -0000351202 00000 n -0000351265 00000 n -0000351328 00000 n -0000351390 00000 n -0000351453 00000 n -0000351516 00000 n -0000351579 00000 n -0000351641 00000 n -0000351704 00000 n -0000351766 00000 n -0000351829 00000 n -0000351892 00000 n -0000351955 00000 n -0000352018 00000 n -0000352081 00000 n -0000352144 00000 n -0000352207 00000 n -0000352270 00000 n -0000352333 00000 n -0000352396 00000 n -0000352459 00000 n -0000352522 00000 n -0000352585 00000 n -0000356157 00000 n -0000354275 00000 n -0000352785 00000 n -0000354398 00000 n -0000354524 00000 n -0000354587 00000 n -0000354650 00000 n -0000354713 00000 n -0000354776 00000 n -0000354839 00000 n -0000354964 00000 n -0000355027 00000 n -0000355090 00000 n -0000355153 00000 n -0000355278 00000 n -0000355341 00000 n -0000355404 00000 n -0000355467 00000 n -0000355592 00000 n -0000355655 00000 n -0000355718 00000 n -0000355781 00000 n -0000355906 00000 n -0000355969 00000 n -0000356032 00000 n -0000356095 00000 n -0000359212 00000 n -0000360296 00000 n -0000359068 00000 n -0000356269 00000 n -0000359418 00000 n -0000359544 00000 n -0000359607 00000 n -0000359670 00000 n -0000359733 00000 n -0000359796 00000 n -0000359859 00000 n -0000359983 00000 n -0000726594 00000 n -0000360108 00000 n -0000360171 00000 n -0000360234 00000 n -0000364929 00000 n -0000362730 00000 n -0000360463 00000 n -0000362853 00000 n -0000362917 00000 n -0000362980 00000 n -0000363043 00000 n -0000363106 00000 n -0000363169 00000 n -0000363232 00000 n -0000363295 00000 n -0000363358 00000 n -0000363421 00000 n -0000363484 00000 n -0000363547 00000 n -0000363610 00000 n -0000363673 00000 n -0000363736 00000 n -0000363799 00000 n -0000363862 00000 n -0000363925 00000 n -0000363986 00000 n -0000364111 00000 n -0000364174 00000 n -0000364237 00000 n -0000364300 00000 n -0000364363 00000 n -0000364426 00000 n -0000364489 00000 n -0000364552 00000 n -0000364615 00000 n -0000364678 00000 n -0000364741 00000 n -0000364803 00000 n -0000364866 00000 n -0000729847 00000 n -0000369462 00000 n -0000367200 00000 n -0000365067 00000 n -0000367323 00000 n -0000367387 00000 n -0000367450 00000 n -0000367513 00000 n -0000367576 00000 n -0000367639 00000 n -0000367702 00000 n -0000367765 00000 n -0000367828 00000 n -0000367891 00000 n -0000367954 00000 n -0000368016 00000 n -0000368079 00000 n -0000368204 00000 n -0000368267 00000 n -0000368330 00000 n -0000368393 00000 n -0000368456 00000 n -0000368519 00000 n -0000368582 00000 n -0000368645 00000 n -0000368708 00000 n -0000368771 00000 n -0000368833 00000 n -0000368896 00000 n -0000368959 00000 n -0000369022 00000 n -0000369085 00000 n -0000369148 00000 n -0000369210 00000 n -0000369273 00000 n -0000369336 00000 n -0000369399 00000 n -0000374260 00000 n -0000371872 00000 n -0000369574 00000 n -0000371995 00000 n -0000372059 00000 n -0000372122 00000 n -0000372185 00000 n -0000372248 00000 n -0000372311 00000 n -0000372374 00000 n -0000372437 00000 n -0000372500 00000 n -0000372563 00000 n -0000372626 00000 n -0000372688 00000 n -0000372751 00000 n -0000372814 00000 n -0000372877 00000 n -0000372940 00000 n -0000373002 00000 n -0000373065 00000 n -0000373128 00000 n -0000373191 00000 n -0000373254 00000 n -0000373316 00000 n -0000373379 00000 n -0000373442 00000 n -0000373505 00000 n -0000373568 00000 n -0000373631 00000 n -0000373694 00000 n -0000373757 00000 n -0000373820 00000 n -0000373883 00000 n -0000373946 00000 n -0000374009 00000 n -0000374072 00000 n -0000374135 00000 n -0000374198 00000 n -0000379830 00000 n -0000377131 00000 n -0000374385 00000 n -0000377254 00000 n -0000377380 00000 n -0000377443 00000 n -0000377506 00000 n -0000377569 00000 n -0000377632 00000 n -0000377694 00000 n -0000377757 00000 n -0000377819 00000 n -0000377882 00000 n -0000377945 00000 n -0000378008 00000 n -0000378071 00000 n -0000378134 00000 n -0000378196 00000 n -0000378259 00000 n -0000378322 00000 n -0000378385 00000 n -0000378448 00000 n -0000378510 00000 n -0000378573 00000 n -0000378636 00000 n -0000378699 00000 n -0000378761 00000 n -0000378824 00000 n -0000378887 00000 n -0000378950 00000 n -0000379013 00000 n -0000379076 00000 n -0000379138 00000 n -0000379201 00000 n -0000379264 00000 n -0000379327 00000 n -0000379390 00000 n -0000379453 00000 n -0000379515 00000 n -0000379578 00000 n -0000379641 00000 n -0000379704 00000 n -0000379767 00000 n -0000384673 00000 n -0000382407 00000 n -0000379942 00000 n -0000382530 00000 n -0000382594 00000 n -0000382657 00000 n -0000382720 00000 n -0000382783 00000 n -0000382846 00000 n -0000382909 00000 n -0000382972 00000 n -0000383035 00000 n -0000383098 00000 n -0000383161 00000 n -0000383224 00000 n -0000383287 00000 n -0000383350 00000 n -0000383413 00000 n -0000383476 00000 n -0000383539 00000 n -0000383602 00000 n -0000383665 00000 n -0000383728 00000 n -0000383791 00000 n -0000383854 00000 n -0000383917 00000 n -0000383980 00000 n -0000384043 00000 n -0000384106 00000 n -0000384169 00000 n -0000384232 00000 n -0000384295 00000 n -0000384358 00000 n -0000384421 00000 n -0000384484 00000 n -0000384547 00000 n -0000384610 00000 n -0000390040 00000 n -0000387466 00000 n -0000384798 00000 n -0000387589 00000 n -0000387653 00000 n -0000387716 00000 n -0000387779 00000 n -0000387842 00000 n -0000387905 00000 n -0000387968 00000 n -0000388031 00000 n -0000388093 00000 n -0000388156 00000 n -0000388219 00000 n -0000388282 00000 n -0000388345 00000 n -0000388408 00000 n -0000388471 00000 n -0000388594 00000 n -0000388657 00000 n -0000388720 00000 n -0000388782 00000 n -0000388845 00000 n -0000388908 00000 n -0000388971 00000 n -0000389034 00000 n -0000389097 00000 n -0000389160 00000 n -0000389223 00000 n -0000389286 00000 n -0000389348 00000 n -0000389411 00000 n -0000389474 00000 n -0000389537 00000 n -0000389600 00000 n -0000389663 00000 n -0000389726 00000 n -0000389789 00000 n -0000389852 00000 n -0000389915 00000 n -0000389977 00000 n -0000396989 00000 n -0000393531 00000 n -0000390178 00000 n -0000393654 00000 n -0000393718 00000 n -0000393781 00000 n -0000393844 00000 n -0000393907 00000 n -0000393970 00000 n -0000394033 00000 n -0000394096 00000 n -0000394159 00000 n -0000394222 00000 n -0000394285 00000 n -0000394347 00000 n -0000394410 00000 n -0000394473 00000 n -0000394536 00000 n -0000394599 00000 n -0000394662 00000 n -0000394725 00000 n -0000394788 00000 n -0000394851 00000 n -0000394914 00000 n -0000394977 00000 n -0000395040 00000 n -0000395103 00000 n -0000395166 00000 n -0000395229 00000 n -0000395292 00000 n -0000395355 00000 n -0000395418 00000 n -0000395481 00000 n -0000395544 00000 n -0000395607 00000 n -0000395670 00000 n -0000395732 00000 n -0000395795 00000 n -0000395858 00000 n -0000395921 00000 n -0000395984 00000 n -0000396047 00000 n -0000396109 00000 n -0000396172 00000 n -0000396235 00000 n -0000396298 00000 n -0000396361 00000 n -0000396424 00000 n -0000396487 00000 n -0000396550 00000 n -0000396613 00000 n -0000396675 00000 n -0000396738 00000 n -0000396801 00000 n -0000396864 00000 n -0000396927 00000 n -0000729972 00000 n -0000404217 00000 n -0000400572 00000 n -0000397101 00000 n -0000400695 00000 n -0000400759 00000 n -0000400821 00000 n -0000400884 00000 n -0000400947 00000 n -0000401010 00000 n -0000401073 00000 n -0000401136 00000 n -0000401199 00000 n -0000401261 00000 n -0000401324 00000 n -0000401387 00000 n -0000401450 00000 n -0000401513 00000 n -0000401576 00000 n -0000401639 00000 n -0000401702 00000 n -0000401765 00000 n -0000401827 00000 n -0000401890 00000 n -0000401953 00000 n -0000402016 00000 n -0000402079 00000 n -0000402142 00000 n -0000402205 00000 n -0000402268 00000 n -0000402331 00000 n -0000402394 00000 n -0000402457 00000 n -0000402520 00000 n -0000402583 00000 n -0000402646 00000 n -0000402709 00000 n -0000402772 00000 n -0000402835 00000 n -0000402898 00000 n -0000402960 00000 n -0000403023 00000 n -0000403086 00000 n -0000403149 00000 n -0000403212 00000 n -0000403275 00000 n -0000403338 00000 n -0000403401 00000 n -0000403464 00000 n -0000403526 00000 n -0000403589 00000 n -0000403652 00000 n -0000403715 00000 n -0000403778 00000 n -0000403841 00000 n -0000403904 00000 n -0000403967 00000 n -0000404030 00000 n -0000404092 00000 n -0000404155 00000 n -0000408734 00000 n -0000406603 00000 n -0000404329 00000 n -0000406726 00000 n -0000406790 00000 n -0000406853 00000 n -0000406916 00000 n -0000406979 00000 n -0000407042 00000 n -0000407105 00000 n -0000407167 00000 n -0000407230 00000 n -0000407293 00000 n -0000407356 00000 n -0000407419 00000 n -0000407482 00000 n -0000407607 00000 n -0000407670 00000 n -0000407733 00000 n -0000407796 00000 n -0000407859 00000 n -0000407984 00000 n -0000408043 00000 n -0000408105 00000 n -0000408168 00000 n -0000408231 00000 n -0000408294 00000 n -0000408419 00000 n -0000408482 00000 n -0000408545 00000 n -0000408608 00000 n -0000408671 00000 n -0000413778 00000 n -0000411390 00000 n -0000408872 00000 n -0000411513 00000 n -0000411639 00000 n -0000411702 00000 n -0000411765 00000 n -0000411828 00000 n -0000411891 00000 n -0000411954 00000 n -0000412016 00000 n -0000412079 00000 n -0000412142 00000 n -0000412205 00000 n -0000412267 00000 n -0000412330 00000 n -0000412393 00000 n -0000412456 00000 n -0000412519 00000 n -0000412582 00000 n -0000412645 00000 n -0000412708 00000 n -0000412771 00000 n -0000412833 00000 n -0000412896 00000 n -0000412959 00000 n -0000413022 00000 n -0000413085 00000 n -0000413148 00000 n -0000413211 00000 n -0000413274 00000 n -0000413337 00000 n -0000413400 00000 n -0000413463 00000 n -0000413526 00000 n -0000413589 00000 n -0000413652 00000 n -0000413715 00000 n -0000418263 00000 n -0000416129 00000 n -0000413903 00000 n -0000416252 00000 n -0000416316 00000 n -0000416379 00000 n -0000416442 00000 n -0000416505 00000 n -0000416568 00000 n -0000416630 00000 n -0000416693 00000 n -0000416755 00000 n -0000416818 00000 n -0000416881 00000 n -0000416944 00000 n -0000417007 00000 n -0000417070 00000 n -0000417133 00000 n -0000417196 00000 n -0000417259 00000 n -0000417322 00000 n -0000417385 00000 n -0000417448 00000 n -0000417510 00000 n -0000417573 00000 n -0000417636 00000 n -0000417699 00000 n -0000417762 00000 n -0000417823 00000 n -0000417886 00000 n -0000417949 00000 n -0000418074 00000 n -0000418137 00000 n -0000418200 00000 n -0000422464 00000 n -0000420519 00000 n -0000418401 00000 n -0000420642 00000 n -0000420768 00000 n -0000420831 00000 n -0000420894 00000 n -0000421019 00000 n -0000421082 00000 n -0000421145 00000 n -0000421208 00000 n -0000421333 00000 n -0000421395 00000 n -0000421457 00000 n -0000421520 00000 n -0000421583 00000 n -0000421646 00000 n -0000421771 00000 n -0000421834 00000 n -0000421897 00000 n -0000421960 00000 n -0000422023 00000 n -0000422086 00000 n -0000422149 00000 n -0000422212 00000 n -0000422275 00000 n -0000422338 00000 n -0000422401 00000 n -0000427600 00000 n -0000426155 00000 n -0000422602 00000 n -0000426278 00000 n -0000426404 00000 n -0000426467 00000 n -0000426530 00000 n -0000426593 00000 n -0000426656 00000 n -0000426719 00000 n -0000426782 00000 n -0000426845 00000 n -0000426908 00000 n -0000426971 00000 n -0000427034 00000 n -0000427097 00000 n -0000427160 00000 n -0000427223 00000 n -0000427286 00000 n -0000427349 00000 n -0000427412 00000 n -0000427537 00000 n -0000728179 00000 n -0000727647 00000 n -0000730097 00000 n -0000430614 00000 n -0000430302 00000 n -0000427795 00000 n -0000430425 00000 n -0000726769 00000 n -0000430551 00000 n -0000432507 00000 n -0000432070 00000 n -0000430768 00000 n -0000432193 00000 n -0000432319 00000 n -0000432444 00000 n -0000434882 00000 n -0000434446 00000 n -0000432619 00000 n -0000434569 00000 n -0000434695 00000 n -0000434820 00000 n -0000436936 00000 n -0000436499 00000 n -0000434994 00000 n -0000436622 00000 n -0000436748 00000 n -0000436873 00000 n -0000439593 00000 n -0000438906 00000 n -0000437048 00000 n -0000439029 00000 n -0000439155 00000 n -0000439280 00000 n -0000439405 00000 n -0000439530 00000 n -0000441949 00000 n -0000441263 00000 n -0000439705 00000 n -0000441386 00000 n -0000441512 00000 n -0000441637 00000 n -0000441762 00000 n -0000441886 00000 n -0000730222 00000 n -0000444347 00000 n -0000444515 00000 n -0000444700 00000 n -0000445338 00000 n -0000444185 00000 n -0000442061 00000 n -0000444901 00000 n -0000445027 00000 n -0000445151 00000 n -0000445275 00000 n -0000447596 00000 n -0000447159 00000 n -0000445477 00000 n -0000447282 00000 n -0000447408 00000 n -0000447533 00000 n -0000449647 00000 n -0000449460 00000 n -0000447708 00000 n -0000449583 00000 n -0000451964 00000 n -0000451403 00000 n -0000449746 00000 n -0000451526 00000 n -0000451652 00000 n -0000451777 00000 n -0000451901 00000 n -0000454182 00000 n -0000453624 00000 n -0000452076 00000 n -0000453747 00000 n -0000453871 00000 n -0000453995 00000 n -0000454120 00000 n -0000456142 00000 n -0000456853 00000 n -0000455998 00000 n -0000454294 00000 n -0000456290 00000 n -0000456416 00000 n -0000456541 00000 n -0000456665 00000 n -0000456790 00000 n -0000730347 00000 n -0000459664 00000 n -0000459352 00000 n -0000456965 00000 n -0000459475 00000 n -0000459601 00000 n -0000462319 00000 n -0000461883 00000 n -0000459776 00000 n -0000462006 00000 n -0000462132 00000 n -0000462257 00000 n -0000464869 00000 n -0000464682 00000 n -0000462445 00000 n -0000464805 00000 n -0000467603 00000 n -0000467416 00000 n -0000464982 00000 n -0000467539 00000 n -0000470857 00000 n -0000470670 00000 n -0000467716 00000 n -0000470793 00000 n -0000473960 00000 n -0000473648 00000 n -0000470970 00000 n -0000473771 00000 n -0000473897 00000 n -0000730472 00000 n -0000476856 00000 n -0000476669 00000 n -0000474086 00000 n -0000476792 00000 n -0000479780 00000 n -0000479593 00000 n -0000476969 00000 n -0000479716 00000 n -0000483221 00000 n -0000482909 00000 n -0000479893 00000 n -0000483032 00000 n -0000483158 00000 n -0000486014 00000 n -0000485827 00000 n -0000483347 00000 n -0000485950 00000 n -0000490045 00000 n -0000489858 00000 n -0000486127 00000 n -0000489981 00000 n -0000493956 00000 n -0000493645 00000 n -0000490158 00000 n -0000493768 00000 n -0000493894 00000 n -0000730597 00000 n -0000497056 00000 n -0000496869 00000 n -0000494082 00000 n -0000496992 00000 n -0000499825 00000 n -0000499638 00000 n -0000497169 00000 n -0000499761 00000 n -0000502890 00000 n -0000502703 00000 n -0000499938 00000 n -0000502826 00000 n -0000506390 00000 n -0000506078 00000 n -0000503003 00000 n -0000506201 00000 n -0000506327 00000 n -0000511613 00000 n -0000511766 00000 n -0000508849 00000 n -0000508287 00000 n -0000506516 00000 n -0000508410 00000 n -0000508536 00000 n -0000508661 00000 n -0000508786 00000 n -0000512228 00000 n -0000511460 00000 n -0000508988 00000 n -0000511914 00000 n -0000512040 00000 n -0000512165 00000 n -0000730722 00000 n -0000520446 00000 n -0000515559 00000 n -0000514997 00000 n -0000512367 00000 n -0000515120 00000 n -0000515246 00000 n -0000515371 00000 n -0000515496 00000 n -0000520509 00000 n -0000520197 00000 n -0000515698 00000 n -0000520320 00000 n -0000524523 00000 n -0000524147 00000 n -0000520650 00000 n -0000524270 00000 n -0000524334 00000 n -0000524397 00000 n -0000524460 00000 n -0000529343 00000 n -0000527389 00000 n -0000524664 00000 n -0000527512 00000 n -0000527576 00000 n -0000527639 00000 n -0000527702 00000 n -0000527765 00000 n -0000527828 00000 n -0000726443 00000 n -0000527892 00000 n -0000527955 00000 n -0000528018 00000 n -0000528081 00000 n -0000528145 00000 n -0000528207 00000 n -0000528270 00000 n -0000528333 00000 n -0000528397 00000 n -0000528460 00000 n -0000528524 00000 n -0000528587 00000 n -0000528651 00000 n -0000528714 00000 n -0000528777 00000 n -0000528840 00000 n -0000528903 00000 n -0000528966 00000 n -0000529029 00000 n -0000529091 00000 n -0000529154 00000 n -0000529217 00000 n -0000529280 00000 n -0000533579 00000 n -0000532636 00000 n -0000529495 00000 n -0000532759 00000 n -0000532823 00000 n -0000532886 00000 n -0000532949 00000 n -0000533012 00000 n -0000533075 00000 n -0000533138 00000 n -0000533201 00000 n -0000533264 00000 n -0000533327 00000 n -0000533390 00000 n -0000533453 00000 n -0000533516 00000 n -0000537965 00000 n -0000537778 00000 n -0000533705 00000 n -0000537901 00000 n -0000730847 00000 n -0000541047 00000 n -0000540548 00000 n -0000538078 00000 n -0000540671 00000 n -0000540797 00000 n -0000540922 00000 n -0000540984 00000 n -0000547853 00000 n -0000544318 00000 n -0000543695 00000 n -0000541173 00000 n -0000543818 00000 n -0000543882 00000 n -0000543943 00000 n -0000544067 00000 n -0000544192 00000 n -0000544255 00000 n -0000548004 00000 n -0000550227 00000 n -0000547700 00000 n -0000544459 00000 n -0000548157 00000 n -0000548221 00000 n -0000548282 00000 n -0000548346 00000 n -0000548410 00000 n -0000548473 00000 n -0000548535 00000 n -0000548598 00000 n -0000548661 00000 n -0000548724 00000 n -0000548787 00000 n -0000548850 00000 n -0000548913 00000 n -0000548976 00000 n -0000549039 00000 n -0000549102 00000 n -0000549165 00000 n -0000549228 00000 n -0000549291 00000 n -0000549354 00000 n -0000549417 00000 n -0000549478 00000 n -0000549541 00000 n -0000549603 00000 n -0000549666 00000 n -0000549728 00000 n -0000549791 00000 n -0000549854 00000 n -0000549917 00000 n -0000549980 00000 n -0000550043 00000 n -0000550106 00000 n -0000550169 00000 n -0000553486 00000 n -0000553049 00000 n -0000550366 00000 n -0000553172 00000 n -0000553298 00000 n -0000553423 00000 n -0000557101 00000 n -0000556914 00000 n -0000553625 00000 n -0000557037 00000 n -0000561069 00000 n -0000560129 00000 n -0000557227 00000 n -0000560252 00000 n -0000560378 00000 n -0000560441 00000 n -0000560504 00000 n -0000560567 00000 n -0000560630 00000 n -0000560693 00000 n -0000560756 00000 n -0000560819 00000 n -0000560881 00000 n -0000561006 00000 n -0000730972 00000 n -0000564111 00000 n -0000563799 00000 n -0000561195 00000 n -0000563922 00000 n -0000564048 00000 n -0000568930 00000 n -0000566982 00000 n -0000564237 00000 n -0000567105 00000 n -0000567231 00000 n -0000567294 00000 n -0000567357 00000 n -0000567420 00000 n -0000567483 00000 n -0000567546 00000 n -0000567609 00000 n -0000567672 00000 n -0000567734 00000 n -0000567797 00000 n -0000567860 00000 n -0000567923 00000 n -0000567986 00000 n -0000568049 00000 n -0000568112 00000 n -0000568174 00000 n -0000568237 00000 n -0000568300 00000 n -0000568363 00000 n -0000568426 00000 n -0000568489 00000 n -0000568552 00000 n -0000568615 00000 n -0000568678 00000 n -0000568741 00000 n -0000568804 00000 n -0000568867 00000 n -0000571258 00000 n -0000570946 00000 n -0000569056 00000 n -0000571069 00000 n -0000571195 00000 n -0000573586 00000 n -0000573024 00000 n -0000571384 00000 n -0000573147 00000 n -0000573273 00000 n -0000573398 00000 n -0000573523 00000 n -0000576709 00000 n -0000576397 00000 n -0000573698 00000 n -0000576520 00000 n -0000576646 00000 n -0000578796 00000 n -0000578361 00000 n -0000576850 00000 n -0000578484 00000 n -0000578610 00000 n -0000731097 00000 n -0000578937 00000 n -0000725542 00000 n -0000578961 00000 n -0000579281 00000 n -0000579365 00000 n -0000579841 00000 n -0000580173 00000 n -0000580541 00000 n -0000580643 00000 n -0000580843 00000 n -0000581687 00000 n -0000582262 00000 n -0000582738 00000 n -0000583087 00000 n -0000583994 00000 n -0000591256 00000 n -0000591506 00000 n -0000598648 00000 n -0000598895 00000 n -0000600857 00000 n -0000601080 00000 n -0000609731 00000 n -0000610003 00000 n -0000618120 00000 n -0000618400 00000 n -0000639122 00000 n -0000639789 00000 n -0000650359 00000 n -0000650692 00000 n -0000662270 00000 n -0000662658 00000 n -0000669693 00000 n -0000670053 00000 n -0000673143 00000 n -0000673389 00000 n -0000689656 00000 n -0000690091 00000 n -0000711425 00000 n -0000712119 00000 n -0000725180 00000 n -0000731177 00000 n -0000731301 00000 n -0000731427 00000 n -0000731553 00000 n -0000731670 00000 n -0000731762 00000 n -0000747762 00000 n -0000747941 00000 n -0000748115 00000 n -0000748284 00000 n -0000748513 00000 n -0000748734 00000 n -0000748960 00000 n -0000749195 00000 n -0000749424 00000 n -0000749660 00000 n -0000749893 00000 n -0000750129 00000 n -0000750355 00000 n -0000750585 00000 n -0000750835 00000 n -0000751084 00000 n -0000751259 00000 n -0000751482 00000 n -0000751662 00000 n -0000751823 00000 n -0000752009 00000 n -0000752185 00000 n -0000752374 00000 n -0000752566 00000 n -0000752775 00000 n -0000752968 00000 n -0000753144 00000 n -0000753357 00000 n -0000753598 00000 n -0000753837 00000 n -0000754078 00000 n -0000754316 00000 n -0000754554 00000 n -0000754795 00000 n -0000755034 00000 n -0000755275 00000 n -0000755514 00000 n -0000755755 00000 n -0000755994 00000 n -0000756235 00000 n -0000756474 00000 n -0000756715 00000 n -0000756953 00000 n -0000757191 00000 n -0000757432 00000 n -0000757667 00000 n -0000757908 00000 n -0000758147 00000 n -0000758388 00000 n -0000758627 00000 n -0000758868 00000 n -0000759107 00000 n -0000759348 00000 n -0000759587 00000 n -0000759828 00000 n -0000760066 00000 n -0000760304 00000 n -0000760545 00000 n -0000760784 00000 n -0000761025 00000 n -0000761264 00000 n -0000761505 00000 n -0000761744 00000 n -0000761985 00000 n -0000762221 00000 n -0000762462 00000 n -0000762702 00000 n -0000762943 00000 n -0000763182 00000 n -0000763421 00000 n -0000763662 00000 n -0000763902 00000 n -0000764143 00000 n -0000764383 00000 n -0000764624 00000 n -0000764864 00000 n -0000765105 00000 n -0000765345 00000 n -0000765586 00000 n -0000765825 00000 n -0000766064 00000 n -0000766305 00000 n -0000766541 00000 n -0000766782 00000 n -0000767022 00000 n -0000767263 00000 n -0000767503 00000 n -0000767744 00000 n -0000767984 00000 n -0000768225 00000 n -0000768465 00000 n -0000768706 00000 n -0000768945 00000 n -0000769184 00000 n -0000769425 00000 n -0000769665 00000 n -0000769906 00000 n -0000770146 00000 n -0000770387 00000 n -0000770627 00000 n -0000770868 00000 n -0000771105 00000 n -0000771346 00000 n -0000771586 00000 n -0000771827 00000 n -0000772066 00000 n -0000772305 00000 n -0000772546 00000 n -0000772786 00000 n -0000773027 00000 n -0000773267 00000 n -0000773508 00000 n -0000773748 00000 n -0000773989 00000 n -0000774229 00000 n -0000774470 00000 n -0000774709 00000 n -0000774948 00000 n -0000775189 00000 n -0000775425 00000 n -0000775666 00000 n -0000775906 00000 n -0000776147 00000 n -0000776387 00000 n -0000776628 00000 n -0000776868 00000 n -0000777109 00000 n -0000777349 00000 n -0000777590 00000 n -0000777829 00000 n -0000778068 00000 n -0000778309 00000 n -0000778549 00000 n -0000778790 00000 n -0000779030 00000 n -0000779271 00000 n -0000779511 00000 n -0000779752 00000 n -0000779989 00000 n -0000780230 00000 n -0000780470 00000 n -0000780705 00000 n -0000780936 00000 n -0000781169 00000 n -0000781400 00000 n -0000781633 00000 n -0000781873 00000 n -0000782124 00000 n -0000782381 00000 n -0000782633 00000 n -0000782882 00000 n -0000783131 00000 n -0000783380 00000 n -0000783627 00000 n -0000783876 00000 n -0000784123 00000 n -0000784372 00000 n -0000784619 00000 n -0000784868 00000 n -0000785115 00000 n -0000785364 00000 n -0000785613 00000 n -0000785860 00000 n -0000786109 00000 n -0000786358 00000 n -0000786607 00000 n -0000786854 00000 n -0000787103 00000 n -0000787350 00000 n -0000787599 00000 n -0000787848 00000 n -0000788097 00000 n -0000788344 00000 n -0000788593 00000 n -0000788842 00000 n -0000789088 00000 n -0000789337 00000 n -0000789586 00000 n -0000789828 00000 n -0000790077 00000 n -0000790326 00000 n -0000790572 00000 n -0000790821 00000 n -0000791070 00000 n -0000791317 00000 n -0000791566 00000 n -0000791815 00000 n -0000792061 00000 n -0000792310 00000 n -0000792559 00000 n -0000792808 00000 n -0000793057 00000 n -0000793304 00000 n -0000793553 00000 n -0000793802 00000 n -0000794049 00000 n -0000794298 00000 n -0000794545 00000 n -0000794794 00000 n -0000795041 00000 n -0000795290 00000 n -0000795539 00000 n -0000795788 00000 n -0000796034 00000 n -0000796283 00000 n -0000796530 00000 n -0000796779 00000 n -0000797019 00000 n -0000797268 00000 n -0000797517 00000 n -0000797766 00000 n -0000798015 00000 n -0000798264 00000 n -0000798513 00000 n -0000798761 00000 n -0000799010 00000 n -0000799259 00000 n -0000799508 00000 n -0000799756 00000 n -0000800005 00000 n -0000800254 00000 n -0000800501 00000 n -0000800750 00000 n -0000800999 00000 n -0000801253 00000 n -0000801510 00000 n -0000801765 00000 n -0000802020 00000 n -0000802271 00000 n -0000802518 00000 n -0000802765 00000 n -0000803014 00000 n -0000803263 00000 n -0000803512 00000 n -0000803759 00000 n -0000804008 00000 n -0000804255 00000 n -0000804504 00000 n -0000804752 00000 n -0000805001 00000 n -0000805250 00000 n -0000805500 00000 n -0000805757 00000 n -0000806013 00000 n -0000806270 00000 n -0000806526 00000 n -0000806783 00000 n -0000807034 00000 n -0000807283 00000 n -0000807532 00000 n -0000807781 00000 n -0000808029 00000 n -0000808278 00000 n -0000808531 00000 n -0000808780 00000 n -0000809029 00000 n -0000809273 00000 n -0000809522 00000 n -0000809771 00000 n -0000810018 00000 n -0000810267 00000 n -0000810516 00000 n -0000810765 00000 n -0000811018 00000 n -0000811273 00000 n -0000811522 00000 n -0000811770 00000 n -0000812019 00000 n -0000812268 00000 n -0000812515 00000 n -0000812765 00000 n -0000813022 00000 n -0000813275 00000 n -0000813524 00000 n -0000813773 00000 n -0000814022 00000 n -0000814271 00000 n -0000814520 00000 n -0000814767 00000 n -0000815016 00000 n -0000815265 00000 n -0000815514 00000 n -0000815763 00000 n -0000816010 00000 n -0000816257 00000 n -0000816506 00000 n -0000816755 00000 n -0000817001 00000 n -0000817256 00000 n -0000817511 00000 n -0000817765 00000 n -0000818014 00000 n -0000818271 00000 n -0000818527 00000 n -0000818784 00000 n -0000819033 00000 n -0000819282 00000 n -0000819531 00000 n -0000819779 00000 n -0000820028 00000 n -0000820277 00000 n -0000820528 00000 n -0000820785 00000 n -0000821041 00000 n -0000821296 00000 n -0000821545 00000 n -0000821791 00000 n -0000822040 00000 n -0000822289 00000 n -0000822538 00000 n -0000822787 00000 n -0000823036 00000 n -0000823283 00000 n -0000823537 00000 n -0000823794 00000 n -0000824049 00000 n -0000824304 00000 n -0000824561 00000 n -0000824815 00000 n -0000825064 00000 n -0000825313 00000 n -0000825556 00000 n -0000825805 00000 n -0000826054 00000 n -0000826301 00000 n -0000826550 00000 n -0000826798 00000 n -0000827051 00000 n -0000827308 00000 n -0000827560 00000 n -0000827809 00000 n -0000828058 00000 n -0000828315 00000 n -0000828571 00000 n -0000828824 00000 n -0000829075 00000 n -0000829332 00000 n -0000829586 00000 n -0000829835 00000 n -0000830082 00000 n -0000830331 00000 n -0000830579 00000 n -0000830828 00000 n -0000831075 00000 n -0000831324 00000 n -0000831573 00000 n -0000831822 00000 n -0000832071 00000 n -0000832316 00000 n -0000832565 00000 n -0000832812 00000 n -0000833061 00000 n -0000833310 00000 n -0000833559 00000 n -0000833808 00000 n -0000834056 00000 n -0000834305 00000 n -0000834554 00000 n -0000834803 00000 n -0000835049 00000 n -0000835298 00000 n -0000835543 00000 n -0000835792 00000 n -0000836041 00000 n -0000836290 00000 n -0000836536 00000 n -0000836785 00000 n -0000837034 00000 n -0000837281 00000 n -0000837530 00000 n -0000837779 00000 n -0000838028 00000 n -0000838275 00000 n -0000838524 00000 n -0000838773 00000 n -0000839022 00000 n -0000839271 00000 n -0000839519 00000 n -0000839768 00000 n -0000840017 00000 n -0000840265 00000 n -0000840514 00000 n -0000840763 00000 n -0000841012 00000 n -0000841269 00000 n -0000841525 00000 n -0000841780 00000 n -0000842029 00000 n -0000842278 00000 n -0000842535 00000 n -0000842784 00000 n -0000843032 00000 n -0000843289 00000 n -0000843545 00000 n -0000843796 00000 n -0000844045 00000 n -0000844296 00000 n -0000844553 00000 n -0000844809 00000 n -0000845066 00000 n -0000845322 00000 n -0000845574 00000 n -0000845823 00000 n -0000846071 00000 n -0000846320 00000 n -0000846569 00000 n -0000846816 00000 n -0000847065 00000 n -0000847314 00000 n -0000847562 00000 n -0000847811 00000 n -0000848060 00000 n -0000848304 00000 n -0000848553 00000 n -0000848802 00000 n -0000849056 00000 n -0000849313 00000 n -0000849564 00000 n -0000849813 00000 n -0000850062 00000 n -0000850311 00000 n -0000850562 00000 n -0000850811 00000 n -0000851059 00000 n -0000851308 00000 n -0000851557 00000 n -0000851806 00000 n -0000852050 00000 n -0000852291 00000 n -0000852530 00000 n -0000852771 00000 n -0000853012 00000 n -0000853251 00000 n -0000853492 00000 n -0000853733 00000 n -0000853912 00000 n -0000854097 00000 n -0000854280 00000 n -0000854463 00000 n -0000854648 00000 n -0000854827 00000 n -0000855002 00000 n -0000855179 00000 n -0000855354 00000 n -0000855531 00000 n -0000855705 00000 n -0000855880 00000 n -0000856057 00000 n -0000856233 00000 n -0000856410 00000 n -0000856586 00000 n -0000856763 00000 n -0000856939 00000 n -0000857116 00000 n -0000857292 00000 n -0000857469 00000 n -0000857638 00000 n -0000857855 00000 n -0000858099 00000 n -0000858343 00000 n -0000858612 00000 n -0000858860 00000 n -0000859094 00000 n -0000859338 00000 n -0000859533 00000 n -0000859726 00000 n -0000859921 00000 n -0000860114 00000 n -0000860306 00000 n -0000860501 00000 n -0000860722 00000 n -0000860963 00000 n -0000861204 00000 n -0000861439 00000 n -0000861674 00000 n -0000861911 00000 n -0000862152 00000 n -0000862387 00000 n -0000862622 00000 n -0000862857 00000 n -0000863092 00000 n -0000863327 00000 n -0000863562 00000 n -0000863797 00000 n -0000864025 00000 n -0000864251 00000 n -0000864472 00000 n -0000864698 00000 n -0000864925 00000 n -0000865154 00000 n -0000865381 00000 n -0000865608 00000 n -0000865893 00000 n -0000866098 00000 n -0000866216 00000 n -0000866346 00000 n -0000866468 00000 n -0000866580 00000 n -0000866705 00000 n -0000866836 00000 n -0000866968 00000 n -0000867100 00000 n -0000867232 00000 n -0000867363 00000 n -0000867495 00000 n -0000867627 00000 n -0000867759 00000 n -0000867890 00000 n -0000868022 00000 n -0000868154 00000 n -0000868286 00000 n -0000868418 00000 n -0000868550 00000 n -0000868682 00000 n -0000868814 00000 n -0000868946 00000 n -0000869078 00000 n -0000869209 00000 n -0000869341 00000 n -0000869475 00000 n -0000869609 00000 n -0000869743 00000 n -0000869877 00000 n -0000870010 00000 n -0000870144 00000 n -0000870278 00000 n -0000870412 00000 n -0000870546 00000 n -0000870680 00000 n -0000870814 00000 n -0000870948 00000 n -0000871082 00000 n -0000871216 00000 n -0000871350 00000 n -0000871485 00000 n -0000871620 00000 n -0000871755 00000 n -0000871889 00000 n -0000872024 00000 n -0000872159 00000 n -0000872293 00000 n -0000872428 00000 n -0000872564 00000 n -0000872698 00000 n -0000872831 00000 n -0000872965 00000 n -0000873099 00000 n -0000873233 00000 n -0000873367 00000 n -0000873502 00000 n -0000873637 00000 n -0000873771 00000 n -0000873905 00000 n -0000874039 00000 n -0000874173 00000 n -0000874307 00000 n -0000874441 00000 n -0000874576 00000 n -0000874711 00000 n -0000874846 00000 n -0000874981 00000 n -0000875115 00000 n -0000875249 00000 n -0000875383 00000 n -0000875518 00000 n -0000875651 00000 n -0000875775 00000 n -0000875892 00000 n -0000876007 00000 n -0000876123 00000 n -0000876248 00000 n -0000876378 00000 n -0000876504 00000 n -0000876636 00000 n -0000876767 00000 n -0000876911 00000 n -0000877017 00000 n -0000877143 00000 n -0000877275 00000 n -0000877407 00000 n -0000877538 00000 n -0000877670 00000 n -0000877804 00000 n -0000877938 00000 n -0000878074 00000 n -0000878209 00000 n -0000878343 00000 n -0000878478 00000 n -0000878612 00000 n -0000878738 00000 n -0000878865 00000 n -0000878992 00000 n -0000879125 00000 n -0000879231 00000 n -0000879340 00000 n -0000879380 00000 n -0000879552 00000 n -trailer -<< /Size 4737 -/Root 4735 0 R -/Info 4736 0 R -/ID [ ] >> -startxref -879912 -%%EOF diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.txt b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.txt deleted file mode 100644 index 65e1d862a71f172e5469574ca624404afe075e32..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.txt +++ /dev/null @@ -1,8575 +0,0 @@ -Release Notes for the DocBook XSL Stylesheets - -$Revision: 8934 $ $Date: 2010-11-01 13:03:14 -0700 (Mon, 01 Nov 2010) $ - -2010-11-01 - -This release-notes document is available in the following formats: HTML, PDF, -plain text; it provides a per-release list of enhancements and changes to the -stylesheets’ public APIs (user-configurable parameters) and excludes -descriptions of most bug fixes. For a complete list of all changes (including -all bug fixes) that have been made since the previous release, see the separate -NEWS (plain text) or NEWS.html files. Also available: An online hyperlinked -change history (warning: big file) of all changes made over the entire history -of the codebase. - -As with all DocBook Project “dot one plus†releases, this release aspires to be -stable (in contrast to dot-zero releases, which are experimental). - -â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”â” - -Table of Contents - -Release Notes: 1.76.1 - - FO - HTML - Params - -Release Notes: 1.76.0 - - Gentext - Common - FO - HTML - Manpages - Epub - Eclipse - Params - XSL-Xalan - -Release Notes: 1.75.2 - - Gentext - Common - FO - HTML - Manpages - Epub - Profiling - XSL-Saxon - XSL-Xalan - -Release Notes: 1.75.1 - - FO - HTML - Epub - Params - -Release Notes: 1.75.0 - - Gentext - Common - FO - HTML - Manpages - ePub - HTMLHelp - Params - Highlighting - XSL-Saxon - XSL-Xalan - -Release Notes: 1.74.3 -Release Notes: 1.74.2 -Release Notes: 1.74.1 - - Gentext - FO - HTML - Manpages - ePub - Roundtrip - Params - Highlighting - -Release Notes: 1.74.0 - - Gentext - Common - FO - HTML - Manpages - Epub - HTMLHelp - Eclipse - JavaHelp - Roundtrip - Slides - Website - Params - Profiling - Tools - Extensions - XSL-Saxon - XSL-Xalan - XSL-libxslt - -Release Notes: 1.73.2 -Release: 1.73.1 - - Gentext - FO - HTML - Manpages - HTMLHelp - Eclipse - JavaHelp - Roundtrip - Params - -Release: 1.73.0 - - Gentext - Common - FO - HTML - Manpages - Eclipse - JavaHelp - Roundtrip - Params - Highlighting - Profiling - Lib - Tools - XSL-Saxon - XSL-Xalan - -Release: 1.72.0 - - Common - FO - HTML - Manpages - Params - Template - Roundtrip - -Release: 1.71.1 - - Common - FO - HTML - Highlighting - Manpages - Params - Profiling - -Release: 1.71.0 - - Common - Extensions - FO - HTML - Highlighting - Manpages - Params - Tools - -Release: 1.70.1 - - FO - HTML - HTMLHelp - Params - -Release: 1.70.0 - - Common - Extensions - FO - HTML - Manpages - Params - Profiling - Tools - WordML - -Release 1.69.1 -Release 1.69.0 - - Common - FO - Help - HTML - man - -Release 1.68.1 -Release 1.68.0 -Release 1.67.2 -Release 1.67.1 -Release 1.67.0 -Release 1.66.1 -Release 1.65.0 -Release 1.64.1 -Release 1.61.0 -Release 1.60.1 -Release 1.59.2 -Release 1.59.1 -Release 1.58.0 -Release 1.57.0 -Release 1.56.0 -Older releases -About dot-zero releases - -Release Notes: 1.76.1 - -The following is a list of changes that have been made since the 1.76.0 -release. - -FO - -The following changes have been made to the fo code since the 1.76.0 release. - - â— Robert Stayton: docbook.xsl; xref.xsl; fop1.xsl - - Apply patch to support named destination in fop1.xsl, per Sourceforge - bug report #3029845. - -HTML - -The following changes have been made to the html code since the 1.76.0 release. - - â— Keith Fahlgren: highlight.xsl - - Implementing handling for and : transform to and for XHTML outputs and do not use in the highliting output (per Mauritz Jeanson) - -Params - -The following changes have been made to the params code since the 1.76.0 -release. - - â— Robert Stayton: draft.mode.xml - - Change default for draft.mode to 'no'. - -Release Notes: 1.76.0 - -This release includes important bug fixes and adds the following significant -feature changes: - -Webhelp - - A new browser-based, cross-platform help format with full-text search and - other features typically found in help systems. See webhelp/docs/content/ - ch01.html for more information and a demo. - -Gentext - - Many updates and additions to translation/locales thanks to Red Hat, the - Fedora Project, and other contributors. - -Common - - Faster localization support, as language files are loaded on demand. - -FO - - Support for SVG content in imagedata added. - -HTML - - Output improved when using 'make.clean.html' and a stock CSS file is now - provided. - -EPUB - - A number of improvements to NCX, cover and image selection, and XHTML 1.1 - element choices - -The following is a list of changes that have been made since the 1.75.2 -release. - -Gentext - -The following changes have been made to the gentext code since the 1.75.2 -release. - - â— rlandmann: locale/fa.xml - - Update to Persian translation from the Fedora Project - - - â— rlandmann: locale/nds.xml - - Locale for Low German - - - â— Mauritz Jeanson: locale/ka.xml; Makefile - - Added support for Georgian based on patch #2917147. - - - â— rlandmann: locale/nl.xml; locale/ja.xml - - Updated translations from Red Hat and the Fedora Project - - - â— rlandmann: locale/bs.xml; locale/ru.xml; locale/hr.xml - - Updated locales from Red Hat and the Fedora Project - - - â— rlandmann: locale/pt.xml; locale/cs.xml; locale/es.xml; locale/bg.xml; - locale/nl.xml; loca⋯ - - Updated translations from Red Hat and the Fedora Project - - - â— rlandmann: locale/as.xml; locale/bn_IN.xml; locale/ast.xml; locale/ml.xml; - locale/te.xml; ⋯ - - New translations from Red Hat and the Fedora Project - - - â— rlandmann: locale/pt.xml; locale/ca.xml; locale/da.xml; locale/sr.xml; - locale/ru.xml; loca⋯ - - Updated translations from Red Hat and the Fedora Project - - -Common - -The following changes have been made to the common code since the 1.75.2 -release. - - â— Mauritz Jeanson: common.xsl - - Fixed bug in output-orderedlist-starting-number template (@startingnumber did not work for FO). - - - â— Mauritz Jeanson: gentext.xsl - - Added fix to catch ID also of descendants of listitem. Closes bug #2955077. - - - â— Jirka Kosek: l10n.xsl - - Stripped down, faster version of gentext.template is used when there is no localization customization. - - - â— Mauritz Jeanson: stripns.xsl - - Added fix that preserves link/@role (makes links in the reference documentation - with @role="tcg" work). - - - â— Mauritz Jeanson: l10n.xsl - - Fixed bugs related to manpages and L10n. - - - â— Jirka Kosek: entities.ent; autoidx-kosek.xsl - - Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms. - - - â— Jirka Kosek: l10n.xsl; l10n.dtd; l10n.xml; autoidx-kosek.xsl - - Refactored localization support. Language files are loaded on demand. Speedup is about 30%. - - - â— Jirka Kosek: l10n.xsl - - Added xsl:keys for improved performance of localization texts look up. Performance gain around 15%. - - - â— Mauritz Jeanson: titles.xsl - - Fixed bug #2912677 (error with xref in title). - - - â— Robert Stayton: olink.xsl - - Fix bug in xrefstyle "title" handling introduced with - the 'insert.targetdb.data' template. - - - â— Robert Stayton: gentext.xsl - - Fix bug in xref to equation without title to use context="xref-number" instead - of "xref-number-and-title". - - - â— Robert Stayton: labels.xsl - - Number all equations in one sequence, with or without title. - - - â— Robert Stayton: entities.ent - - Fix bug #2896909 where duplicate @sortas on indexterms caused - some indexterms to drop out of index. - - - â— Robert Stayton: stripns.xsl - - Expand the "Stripping namespace ..." message to advise users to - use the namespaced stylesheets. - - - â— Robert Stayton: stripns.xsl - - need a local version of $exsl.node.set.available variable because - this module imported many places. - - - â— Mauritz Jeanson: olink.xsl - - Added /node() to the select expression that is used to compute the title text - so that no elements end up in the output. Closes bug #2830119. - - -FO - -The following changes have been made to the fo code since the 1.75.2 release. - - â— Robert Stayton: table.xsl - - Fix bug 2979166 able - Attribute @rowheader not working - - - â— Mauritz Jeanson: inline.xsl - - Improved glossterm auto-linking by using keys. The old code was inefficient when processing documents - with many inline glossterms. - - - â— Robert Stayton: titlepage.xsl - - Fix bug 2805530 author/orgname not appearing on title page. - - - â— Mauritz Jeanson: graphics.xsl - - Added support for SVG content in imagedata (inspired by patch #2909154). - - - â— Mauritz Jeanson: table.xsl - - Removed superfluous test used when computing column-width. Closes bug #3000898. - - - â— Mauritz Jeanson: inline.xsl - - Added missing . Closes bug #2998567. - - - â— Mauritz Jeanson: lists.xsl - - Added table-layout="fixed" on segmentedlist table (required by XSL spec when proportional-column-width() is used). - - - â— Jirka Kosek: autoidx-kosek.xsl - - Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms. - - - â— Jirka Kosek: index.xsl - - Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms. - - - â— Robert Stayton: xref.xsl - - Fix bug in olink template when an olink has an id. - Add warning message with id value when trying to link - to an element that has no generated text. - - - â— Mauritz Jeanson: refentry.xsl - - Fixed bug #2930968 (indexterm in refmeta not handled correctly). - - - â— Robert Stayton: block.xsl - - fix bug 2949567 title in revhistory breaks FO transform. - - - â— Robert Stayton: glossary.xsl - - Output id attributes on glossdiv blocks so they can be added to - xrefs or TOC. - - - â— Jirka Kosek: xref.xsl - - Enabled hyphenation of URLs when ulink content is the same as link target - - - â— Robert Stayton: table.xsl - - Apply patch to turn off row recursion if no @morerows attributes present. - This will enable very large tables without row spanning to - process without running into recursion limits. - - - â— Robert Stayton: formal.xsl - - Format equation without title using table layout with equation number - next to the equation. - - - â— Robert Stayton: param.xweb; param.ent - - Add equation.number.properties. - - -HTML - -The following changes have been made to the html code since the 1.75.2 release. - - â— Mauritz Jeanson: block.xsl - - Modified acknowledgements template to avoid invalid output (

    in

    ). - - - ◠Mauritz Jeanson: titlepage.xsl - - Added default sidebar attribute-sets. - - - ◠Robert Stayton: table.xsl - - Fix bug 2979166 able - Attribute @rowheader not working - - - ◠Robert Stayton: footnote.xsl - - Fix bug 3033191 footnotes in html tables. - - - ◠Mauritz Jeanson: inline.xsl - - Improved glossterm auto-linking by using keys. The old code was inefficient when processing documents - with many inline glossterms. - - - ◠Robert Stayton: docbook.css.xml; verbatim.xsl - - Fix bug 2844927 Validity error for callout bugs. - - - ◠Robert Stayton: formal.xsl - - Convert formal.object.heading to respect make.clean.html param. - - - ◠Robert Stayton: titlepage.templates.xml; block.xsl - - Fix bug 2840768 sidebar without title inserts empty b tag. - - - ◠Mauritz Jeanson: docbook.xsl - - Moved the template that outputs so that the base URI also applies to relative CSS paths that come later. - See patch #2896121. - - - ◠Jirka Kosek: autoidx-kosek.xsl - - Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms. - - - ◠Robert Stayton: chunk-code.xsl - - fix bug 2948363 generated filename for refentry not unique, when - used in a set. - - - ◠Robert Stayton: component.xsl - - Fix missing "Chapter n" label when use chapter/info/title. - - - ◠Robert Stayton: table.xsl - - Row recursion turned off if no @morerows attributes in the table. - This will prevent failure on long table (with no @morerows) due - to excessive depth of recursion. - - - ◠Robert Stayton: autotoc.xsl; docbook.css.xml - - Support make.clean.html in autotoc.xsl. - - - ◠Robert Stayton: docbook.css.xml; block.xsl - - Add support for make.clean.html setting in block elements. - - - ◠Robert Stayton: docbook.css.xml - - Stock CSS styles for DocBook HTML output when 'make.clean.html' is non-zero. - - - ◠Robert Stayton: html.xsl - - Add templates for generating CSS files and links to them. - - - ◠Robert Stayton: param.xweb - - Fix bugs in new entity references. - - - ◠Robert Stayton: chunk-common.xsl - - List of Equations now includes on equations with titles. - - - ◠Robert Stayton: table.xsl - - If a colspec has a colname attribute, add it to the HTML col - element as a class attribute so it can be styled. - - - ◠Robert Stayton: formal.xsl - - Fix bug 2825842 where table footnotes not appearing in HTML-coded table. - - - ◠Robert Stayton: chunktoc.xsl - - Fix bug #2834826 where appendix inside part was not chunked as it should be. - - - ◠Mauritz Jeanson: chunktoc.xsl - - Added missing namespace declarations. Closes bug #2890069. - - - ◠Mauritz Jeanson: footnote.xsl - - Updated the template for footnote paras to use the 'paragraph' template. Closes bug #2803739. - - - ◠Keith Fahlgren: inline.xsl; lists.xsl - - Remove and elements "discouraged in favor of style sheets" from - XHTML, XHTML 1.1 (and therefore EPUB) outputs by changing html2xhtml.xsl. - - Fixes bug #2873153: No and tags in XHTML/EPUB - - Added regression to EPUB specs: - - - ◠Mauritz Jeanson: inline.xsl - - Fixed bug #2844916 (don't output @target if ulink.target is empty). - - - ◠Keith Fahlgren: autoidx.xsl - - Fix a bug when using index.on.type: an 'index symbols' section was created - even if that typed index didn't include any symbols (they were in the other types). - - -Manpages - -The following changes have been made to the manpages code since the 1.75.2 -release. - - ◠Mauritz Jeanson: other.xsl - - Modified the write.stubs template so that the section directory name is not output twice. Should fix bug #2831602. - Also ensured that $lang is added to the .so path (when man.output.lang.in.name.enabled=1). - - - ◠Mauritz Jeanson: docbook.xsl; other.xsl - - Fixed bug #2412738 (apostrophe escaping) by applying the submitted patch. - - - ◠Norman Walsh: block.xsl; endnotes.xsl - - Fix bug where simpara in footnote didn't work. Patch by Jonathan Nieder, jrnieder@gmail.com - - - ◠dleidert: lists.xsl - - Fix two indentation issues: In the first case there is no corresponding .RS - macro (Debian #519438, sf.net 2793873). In the second case an .RS instead of - the probably intended .sp leads to an indentation bug (Debian #527309, - sf.net #2642139). - - -Epub - -The following changes have been made to the epub code since the 1.75.2 release. - - ◠Keith Fahlgren: bin/spec/examples/AMasqueOfDays.epub; docbook.xsl; bin/spec - /epub_spec.rb - - Resolve some actual regressions in date output spotted by more recent versions of epubcheck - - - ◠Keith Fahlgren: docbook.xsl - - Updated mediaobject selection code that better uses roles (when available); based on contributons by Glenn McDonald - - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl - - Ensure that NCX documents are always outputted with a default namespace - to prevent problems with the kindlegen machinery - - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/ - partintro.xml; docbook.x⋯ - - Adding support for partintros with sect2s, 3s, etc - - - ◠Keith Fahlgren: docbook.xsl - - Adding param to workaround horrific ADE bug with the inability to process
    - - - ◠Keith Fahlgren: docbook.xsl - - Add support for authorgroup/author in OPF metadata (via Michael Wiedmann) - - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb - - Remove and elements "discouraged in favor of style sheets" from - XHTML, XHTML 1.1 (and therefore EPUB) outputs by changing html2xhtml.xsl. - - Fixes bug #2873153: No and tags in XHTML/EPUB - - Added regression to EPUB specs: - - - ◠Keith Fahlgren: bin/lib/docbook.rb; bin/spec/files/DejaVuSerif-Italic.otf; - docbook.xsl; bi⋯ - - This resolves bug #2873142, Please add support for multiple embedded fonts - - - If you navigate to a checkout of DocBook-XSL and go to: - xsl/epub/bin/spec/files - You can now run the following command: - - ../../dbtoepub -f DejaVuSerif.otf -f DejaVuSerif-Italic.otf -c test.css - -s test_cust.xsl orm.book.001.xml - - In dbtoepub, the following option can be used more than once: - -f, --font [OTF FILE] Embed OTF FILE in .epub. - - The underlying stylesheet now accepts a comma-separated list of font file - names rather than just one as the RENAMED epub.embedded.fonts ('s' added). - - The runnable EPUB spec now includes: - - should be valid .epub after including more than one embedded font - - - ◠Keith Fahlgren: docbook.xsl - - Improve the selection of cover images when working in DocBook 4.x land (work in progress) - - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl - - Improve the quality of the OPF spine regression by ensuring that the spine - elements for deeply nested refentries are in order and adjacent to their - opening wrapper XHTML chunk. - - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl; bin/spec/ - files/orm.book.00⋯ - - Add more careful handling of refentries to ensure that they always appear in the opf:spine. - This was only a problem when refentries were pushed deep into the hierarchy (like inside - a sect2), but presented navigational problems for many reading systems (despite the - correct NCX references). This may *not* be the best solution, but attacking a better - chunking strategy for refentries was too big a nut to crack at this time. - - -Eclipse - -The following changes have been made to the eclipse code since the 1.75.2 -release. - - ◠Mauritz Jeanson: eclipse3.xsl - - Added a stylesheet module that generates plug-ins conforming to the standard (OSGi-based) Eclipse 3.x - architecture. The main difference to the older format is that metadata is stored in a separate - manifest file. The module imports and extends the existing eclipse.xsl module. Based on code - contributed in patch #2624668. - - -Params - -The following changes have been made to the params code since the 1.75.2 -release. - - ◠Robert Stayton: draft.watermark.image.xml - - Fix bug 2922488 draft.watermark.image pointing to web resource. - Now the value is images/draft.png, and may require customization - for local resolution. - - - ◠Mauritz Jeanson: equation.number.properties.xml - - Corrected refpurpose. - - - ◠Norman Walsh: paper.type.xml - - Added USlegal and USlegallandscape paper types. - - - ◠Jirka Kosek: highlight.xslthl.config.xml - - Added note about specifying location as URL - - - ◠Robert Stayton: docbook.css.source.xml; generate.css.header.xml; - custom.css.source.xml; ma⋯ - - Params to support generated CSS files. - - - ◠Robert Stayton: equation.number.properties.xml - - New attribute set for numbers appearing next to equations. - - -XSL-Xalan - -The following changes have been made to the xsl-xalan code since the 1.75.2 -release. - - ◠dleidert: nbproject/genfiles.properties; nbproject/build-impl.xml - - Rebuild netbeans build files after adding missing Netbeans configuration to allow easier packaging for Debian. - - -Release Notes: 1.75.2 - -The following is a list of changes that have been made since the 1.75.1 -release. - -Gentext - -The following changes have been made to the gentext code since the 1.75.1 -release. - - ◠dleidert: locale/ja.xml - - Improved Japanese translation for Note(s). Closes bug #2823965. - - ◠dleidert: locale/pl.xml - - Polish alphabet contains O with acute accent, not with grave accent. Closes bug #2823964. - - ◠Robert Stayton: locale/ja.xml - - Fix translation of "index", per bug report 2796064. - - ◠Robert Stayton: locale/is.xml - - New Icelandic locale file. - -Common - -The following changes have been made to the common code since the 1.75.1 -release. - - ◠Norman Walsh: stripns.xsl - - Support more downconvert cases - - ◠Robert Stayton: titles.xsl - - Make sure title inside info is used if no other title. - -FO - -The following changes have been made to the fo code since the 1.75.1 release. - - ◠Robert Stayton: pi.xsl - - Turn off dbfo-need for fop1.extensions also, per bug #2816141. - -HTML - -The following changes have been made to the html code since the 1.75.1 release. - - ◠Mauritz Jeanson: titlepage.xsl - - Output "Copyright" heading in XHTML too. - - ◠Mauritz Jeanson: titlepage.xsl - - Added stylesheet.result.type test for copyright. Closes bug #2813289. - - ◠Norman Walsh: htmltbl.xsl - - Remove ambiguity wrt @span, @rowspan, and @colspan - -Manpages - -The following changes have been made to the manpages code since the 1.75.1 -release. - - ◠Mauritz Jeanson: endnotes.xsl - - Added normalize-space() for ulink content. Closes bug #2793877. - - ◠Mauritz Jeanson: docbook.xsl - - Added stylesheet.result.type test for copyright. Closes bug #2813289. - -Epub - -The following changes have been made to the epub code since the 1.75.1 release. - - ◠Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb - - Corrected bugs caused by path and file assumptions were not met - - ◠Keith Fahlgren: bin/lib/docbook.rb; docbook.xsl - - Cleaning up hardcoded values into parameters and fixing Ruby library to pass them properly; all thanks to patch from Liza Daly - -Profiling - -The following changes have been made to the profiling code since the 1.75.1 -release. - - ◠Robert Stayton: profile.xsl - - Fix bug 2815493 missing exsl.node.set.available parameter. - -XSL-Saxon - -The following changes have been made to the xsl-saxon code since the 1.75.1 -release. - - ◠Mauritz Jeanson: src/com/nwalsh/saxon/ColumnUpdateEmitter.java; src/com/ - nwalsh/saxon/Colum⋯ - - Added fixes so that colgroups in the XHTML namespace are processed properly. - -XSL-Xalan - -The following changes have been made to the xsl-xalan code since the 1.75.1 -release. - - ◠Mauritz Jeanson: nbproject/project.xml - - Added missing NetBeans configuration. - -Release Notes: 1.75.1 - -This release includes bug fixes. - -The following is a list of changes that have been made since the 1.75.0 -release. - -FO - -The following changes have been made to the fo code since the 1.75.0 release. - - ◠Keith Fahlgren: block.xsl - - Switching to em dash for character before attribution in epigraph; resolves Bug #2793878 - - ◠Robert Stayton: lists.xsl - - Fixed bug 2789947, id attribute missing on simplelist fo output. - -HTML - -The following changes have been made to the html code since the 1.75.0 release. - - ◠Keith Fahlgren: block.xsl - - Switching to em dash for character before attribution in epigraph; resolves Bug #2793878 - - ◠Robert Stayton: lists.xsl - - Fixed bug 2789678: apply-templates line accidentally deleted. - -Epub - -The following changes have been made to the epub code since the 1.75.0 release. - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl - - Added regression and fix to correct "bug" with namespace-prefixed container elements in META-INF/container.xml ; resolves Issue #2790017 - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/ - onegraphic.xinclude.xml;⋯ - - Another attempt at flexible named entity and XInclude processing - - ◠Keith Fahlgren: bin/lib/docbook.rb - - Tweaking solution to Bug #2750442 following regression reported by Michael Wiedmann. - -Params - -The following changes have been made to the params code since the 1.75.0 -release. - - ◠Mauritz Jeanson: highlight.source.xml - - Updated documentation to reflect changes made in r8419. - -Release Notes: 1.75.0 - -This release includes important bug fixes and adds the following significant -feature changes: - -Gentext - - Modifications to translations have been made. - -Common - - Added support for some format properties on tables using HTML table markup. - - Added two new qanda.defaultlabel values so that numbered sections and - numbered questions can be distinguished. Satisfies Feature Request # - 1539045. - - Added code to handle acknowledgements in book and part. The element is - processed similarly to dedication. All acknowledgements will appear as - front matter, after any dedications. - -FO - - The inclusion of highlighting code has been simplified. - - Add support for pgwide on informal objects. - - Added a new parameter, bookmarks.collapse, that controls the initial state - of the bookmark tree. Closes FR #1792326. - - Add support for more dbfo processing instructions. - - Add new variablelist.term.properties to format terms, per request # - 1968513. - - Add support for @width on screen and programlisting, fixes bug #2012736. - - Add support for writing-mode="rl-tb" (right-to-left) in FO outputs. - - Add writing.mode param for FO output. - -HTML - - Convert all calls to class.attribute to calls to common.html.attributes to - support dir, lang, and title attributes in html output for all elements. - Fulfills feature request #1993833. - - Inclusion of highlighting code was simplified. Only one import is now - necessary. - - Add new param index.links.to.section. - - Add support for the new index.links.to.section param which permits precise - links to indexterms in HTML output rather than to the section title. - -ePub - - Slightly more nuanced handling of imageobject alternatives and better - support in dbtoepub for XIncludes and ENTITYs to resolve Issue #2750442 - reported by Raphael Hertzog. - - Added a colon after an abstract/title when mapping into the dc:description - for OPF metadata in ePub output to help the flat text have more - pseudo-semantics (sugestions from Michael Wiedmann) - - Added DocBook subjectset -> OPF dc:subject mapping and tests - - Added DocBook date -> OPF dc:date mapping and tests - - Added DocBook abstract -> OPF dc:description mapping and tests - - Added --output option to dbtoepub based on user request - -HTMLHelp - - Add support for generating olink target database for htmlhelp files. - -Params - - Add default setting for @rules attribute on HTML markup tables. - - Added a new parameter, bookmarks.collapse, that controls the initial state - of the bookmark tree. When the parameter has a non-zero value (the - default), only the top-level bookmarks are displayed initially. Otherwise, - the whole tree of bookmarks is displayed. This is implemented for FOP 0.9X. - Closes FR #1792326. - - Add new variablelist.term.properties to format terms, per request # - 1968513. - - Add two new qanda.defaultlabel values so that numbered sections and - numbered questions can be distinguished. Satisfies Feature Request # - 1539045. - - Add param to control whether an index entry links to a section title or to - the precise location of the indexterm. - - New attribute list for glossentry in glossary. - - New parameter to support @width on programlisting and screen. - - Add attribute-sets for formatting glossary terms and defs. - -Highlighting - - Inclusion of highlighting code was simplified. Only one import is now - necessary. - -The following is a list of changes that have been made since the 1.74.3 -release. - -Gentext - -The following changes have been made to the gentext code since the 1.74.3 -release. - - ◠Robert Stayton: locale/sv.xml; locale/ja.xml; locale/pl.xml - - Check in translations of Legalnotice submitted on mailing list. - - ◠Robert Stayton: locale/es.xml - - Fix spelling errors in Acknowledgements entries. - - ◠Robert Stayton: locale/es.xml - - Check in translations for 4 elements submitted through docbook-apps - message of 14 April 2009. - - ◠David Cramer: locale/zh.xml; locale/ca.xml; locale/ru.xml; locale/ga.xml; - locale/gl.xml; l⋯ - - Internationalized punctuation in glosssee and glossseealso - - ◠Robert Stayton: Makefile - - Check in fixes for DSSSL gentext targets from submitted patch #1689633. - - ◠Robert Stayton: locale/uk.xml - - Check in major update submitted with bug report #2008524. - - ◠Robert Stayton: locale/zh_tw.xml - - Check in fix to Note string submitted in bug #2441051. - - ◠Robert Stayton: locale/ru.xml - - Checkin typo fix submitted in bug #2453406. - -Common - -The following changes have been made to the common code since the 1.74.3 -release. - - ◠Robert Stayton: gentext.xsl - - Fix extra generated space when xrefstyle includes 'nopage'. - - ◠Robert Stayton: table.xsl - - Add support for some format properties on tables using - HTML table markup. These include: - - frame attribute on table (or uses $default.table.frame parameter). - - rules attribute on table (or uses $default.table.rules parameter). - - align attribute on td and th - - valign attribute on td and th - - colspan on td and th - - rowspan on td and th - - bgcolor on td and th - - ◠Robert Stayton: olink.xsl - - Add placeholder template to massage olink hot text to make - customization easier, per Feature Request 1828608. - - ◠Robert Stayton: targets.xsl - - Add support for collecting olink targets from a glossary - generated from a glossary.collection. - - ◠Robert Stayton: titles.xsl - - Handle firstterm like glossterm in mode="title.markup". - - ◠Robert Stayton: titles.xsl - - Add match on info/title in title.markup templates where missing. - - ◠Mauritz Jeanson: titles.xsl - - Changed "ancestor::title" to "(ancestor::title and (@id or @xml:id))". - This enables proper formatting of inline elements in titles in TOCs, - as long as these inlines don't have id or xml:id attributes. - - ◠Robert Stayton: labels.xsl - - Add two new qanda.defaultlabel values so that numbered sections - and numbered questions can be distinguished. Satisfies - Feature Request #1539045. - - ◠Robert Stayton: stripns.xsl; pi.xsl - - Convert function-available(exsl:node-set) to use the new param - so Xalan bug is isolated. - - ◠Mauritz Jeanson: titles.xsl - - Added fixes for bugs #2112656 and #1759205: - 1. Reverted mistaken commits r7485 and r7523. - 2. Updated the template with match="link" and mode="no.anchor.mode" so that - @endterm is used if it exists and if the link has no content. - - ◠Mauritz Jeanson: titles.xsl - - Added code to handle acknowledgements in book and part. The element is processed - similarly to dedication. All acknowledgements will appear as front matter, after - any dedications. - - ◠Robert Stayton: olink.xsl - - Fix bug #2018717 use.local.olink.style uses wrong gentext context. - - ◠Robert Stayton: olink.xsl - - Fix bug #1787167 incorrect hot text for some olinks. - - ◠Robert Stayton: common.xsl - - Fix bug #1669654 Broken output if copyright contains a range. - - ◠Robert Stayton: labels.xsl - - Fix bug in labelling figure inside appendix inside article inside book. - -FO - -The following changes have been made to the fo code since the 1.74.3 release. - - ◠Jirka Kosek: highlight.xsl - - Inclusion of highlighting code was simplified. Only one import is now necessary. - - ◠Robert Stayton: fop1.xsl - - Add the new fop extensions namespace declaration, in case FOP - extension functions are used. - - ◠Robert Stayton: formal.xsl - - Add support for pgwide on informal objects. - - ◠Robert Stayton: docbook.xsl - - Fixed spurious closing quote on line 134. - - ◠Robert Stayton: docbook.xsl; autoidx-kosek.xsl; autoidx.xsl - - Convert function-available for node-set() to use - new $exsl.node.set.available param in test. - - ◠David Cramer: xref.xsl - - Suppress extra space after xref when xrefstyle='select: label nopage' (#2740472) - - ◠Mauritz Jeanson: pi.xsl - - Fixed doc bug for row-height. - - ◠David Cramer: glossary.xsl - - Internationalized punctuation in glosssee and glossseealso - - ◠Robert Stayton: param.xweb; param.ent; htmltbl.xsl; table.xsl - - Add support for some format properties on tables using - HTML table markup. These include: - - frame attribute on table (or uses $default.table.frame parameter). - - rules attribute on table (or uses $default.table.rules parameter). - - align attribute on td and th - - valign attribute on td and th - - colspan on td and th - - rowspan on td and th - - bgcolor on td and th - - ◠Robert Stayton: table.xsl - - Add support bgcolor in td and th - elements in HTML table markup. - - ◠Robert Stayton: htmltbl.xsl - - Add support for colspan and rowspan and bgcolor in td and th - elements in HTML table markup. - - ◠Robert Stayton: param.xweb - - Fix working of page-master left and right margins. - - ◠Mauritz Jeanson: param.xweb; param.ent; fop1.xsl - - Added a new parameter, bookmarks.collapse, that controls the initial state of the bookmark tree. When the parameter has a non-zero value (the default), only the top-level bookmarks are displayed initially. Otherwise, the whole tree of bookmarks is displayed. This is implemented for FOP 0.9X. Closes FR #1792326. - - ◠Robert Stayton: table.xsl; pi.xsl - - Add support for dbfo row-height processing instruction, like that in dbhtml. - - ◠Robert Stayton: lists.xsl - - Add support for dbfo keep-together processing instruction for - entire list instances. - - ◠Robert Stayton: lists.xsl; block.xsl - - Add support fo dbfo keep-together processing instruction to - more blocks like list items and paras. - - ◠Robert Stayton: lists.xsl; param.xweb; param.ent - - Add new variablelist.term.properties to format terms, per request # 1968513. - - ◠Robert Stayton: inline.xsl - - In simple.xlink, rearrange order of processing. - - ◠Robert Stayton: xref.xsl - - Handle firstterm like glossterm in mode="xref-to". - - ◠Robert Stayton: glossary.xsl; xref.xsl; pi.xsl; footnote.xsl - - Implement simple.xlink for glosssee and glossseealso so they can use - other types of linking besides otherterm. - - ◠Robert Stayton: qandaset.xsl - - Add two new qanda.defaultlabel values so that numbered sections and numbered questions can be distinguished. Satisfies Feature Request #1539045. - - ◠Robert Stayton: titlepage.xsl - - For the book title templates, I changed info/title to book/info/title - so other element's titles will not be affected. - - ◠Robert Stayton: xref.xsl; verbatim.xsl - - Use param exsl.node.set.available to test for function. - - ◠Robert Stayton: param.xweb; param.ent; footnote.xsl - - Start using new param exsl.node.set.available to work around Xalan bug. - - ◠Robert Stayton: titlepage.templates.xml - - Add comment on use of t:predicate for editor to prevent - extra processing of multiple editors. Fixes bug 2687842. - - ◠Robert Stayton: xref.xsl; autoidx.xsl - - An indexterm primary, secondary, or tertiary element with an id or xml:id - now outputs that ID, so that index entries can be cross referenced to. - - ◠Mauritz Jeanson: synop.xsl - - Added modeless template for ooclass|oointerface|ooexception. - Closes bug #1623468. - - ◠Robert Stayton: xref.xsl - - Add template with match on indexterm in mode="xref-to" to fix bug 2102592. - - ◠Robert Stayton: xref.xsl - - Now xref to qandaentry will use the label element in a question for - the link text if it has one. - - ◠Robert Stayton: inline.xsl - - Add id if specified from @id to output for quote and phrase so - they can be xref'ed to. - - ◠Robert Stayton: xref.xsl - - Add support for xref to phrase, simpara, anchor, and quote. - This assumes the author specifies something using xrefstyle since - the elements don't have ordinary link text. - - ◠Robert Stayton: toc.xsl - - Fix bug in new toc templates. - - ◠Mauritz Jeanson: titlepage.xsl; component.xsl; division.xsl; xref.xsl; - titlepage.templates⋯ - - Added code to handle acknowledgements in book and part. The element is processed - similarly to dedication. All acknowledgements will appear as front matter, after - any dedications. - - ◠Robert Stayton: toc.xsl - - Rewrite toc templates to support an empty toc or populated toc - in all permitted contexts. Same for lot elements. - This fixes bug #1595969 for FO outputs. - - ◠Robert Stayton: index.xsl - - Fix indents for seealsoie so they are consistent. - - ◠Mauritz Jeanson: param.xweb - - Removed duplicate (monospace.font.family). - - ◠Robert Stayton: param.xweb; param.ent - - Add glossentry.list.item.properties. - - ◠Robert Stayton: param.xweb; param.ent - - Add monospace.verbatim.font.width param to support @width on programlisting. - - ◠Robert Stayton: verbatim.xsl - - Put programlisting in fo:block-container with writing-mode="lr-tb" - when text direction is right to left because all program languages - are left-to-right. - - ◠Robert Stayton: verbatim.xsl - - Add support for @width on screen and programlisting, fixes bug #2012736. - - ◠Robert Stayton: xref.xsl - - Fix bug #1973585 xref to para with xrefstyle not handled correctly. - - ◠Mauritz Jeanson: block.xsl - - Added support for acknowledgements in article. - Support in book/part remains to be added. - - ◠Robert Stayton: xref.xsl - - Fix bug #1787167 incorrect hot text for some olinks. - - ◠Robert Stayton: fo.xsl - - Add writing-mode="tb-rl" as well since some XSL-FO processors support it. - - ◠Robert Stayton: autotoc.xsl; lists.xsl; glossary.xsl; fo.xsl; table.xsl; - pagesetup.xsl - - Add support for writing-mode="rl-tb" (right-to-left) in FO outputs. - Changed instances of margin-left to margin-{$direction.align.start} - and margin-right to margin-{$direction.align.end}. Those direction.align - params are computed from the writing mode value in each locale's - gentext key named 'writing-mode', introduced in 1.74.3 to add - right-to-left support to HTML outputs. - - ◠Robert Stayton: param.xweb; param.ent - - Add attribute-sets for formatting glossary terms and defs. - - ◠Robert Stayton: param.xweb; param.ent - - Add writing.mode param for FO output. - - ◠Robert Stayton: autotoc.xsl - - Fix bug 1546008: in qandaentry in a TOC, use its blockinfo/titleabbrev or blockinfo/title - instead of question, if available. For DocBook 5, use the info versions. - - ◠Keith Fahlgren: verbatim.xsl - - Add better pointer to README for XSLTHL - - ◠Keith Fahlgren: verbatim.xsl - - More tweaking the way that XSLTHL does or does not get called - - ◠Keith Fahlgren: verbatim.xsl - - Alternate attempt at sanely including/excluding XSLTHT code - -HTML - -The following changes have been made to the html code since the 1.74.3 release. - - ◠Robert Stayton: lists.xsl - - Removed redundant lang and title attributes on list element inside - div element for lists. - - ◠Robert Stayton: inline.xsl; titlepage.xsl; division.xsl; toc.xsl; - sections.xsl; table.xsl;⋯ - - Convert all calls to class.attribute to calls to common.html.attributes - to support dir, lang, and title attributes in html output for all elements. - Fulfills feature request #1993833. - - ◠Robert Stayton: chunk-common.xsl - - Fix bug #2750253 wrong links in list of figures in chunk.html - when target html is in a subdirectory and dbhtml filename used. - - ◠Jirka Kosek: highlight.xsl - - Inclusion of highlighting code was simplified. Only one import is now necessary. - - ◠Robert Stayton: chunk-common.xsl; chunktoc.xsl; docbook.xsl; - chunk-changebars.xsl; autoidx⋯ - - Convert function-available for node-set() to use - new $exsl.node.set.available param in test. - - ◠Mauritz Jeanson: pi.xsl - - Fixed doc bug for row-height. - - ◠David Cramer: glossary.xsl - - Internationalized punctuation in glosssee and glossseealso - - ◠Robert Stayton: lists.xsl; html.xsl; block.xsl - - More elements get common.html.attributes. - Added locale.html.attributes template which does the lang, - dir, and title attributes, but not the class attribute - (used on para, for example). - - ◠Robert Stayton: lists.xsl - - Replace more literal class atts with mode="class.attribute" to support - easier customization. - - ◠Robert Stayton: glossary.xsl - - Support olinking in glosssee and glossseealso. - - ◠Robert Stayton: inline.xsl - - In simple.xlink, rearrange order of processing. - - ◠Robert Stayton: xref.xsl - - Handle firstterm like glossterm in mode="xref-to". - - ◠Robert Stayton: lists.xsl; html.xsl; block.xsl - - Added template named common.html.attributes to output - class, title, lang, and dir for most elements. - Started adding it to some list and block elements. - - ◠Robert Stayton: qandaset.xsl - - Add two new qanda.defaultlabel values so that numbered sections - and numbered questions can be distinguished. Satisfies - Feature Request #1539045. - - ◠Robert Stayton: param.xweb; chunk-code.xsl; param.ent; xref.xsl; - chunkfast.xsl; verbatim.x⋯ - - Use new param exsl.node.set.available to test, handles Xalan bug. - - ◠Robert Stayton: autoidx.xsl - - Use named anchors for primary, secondary, and tertiary ids so - duplicate entries with different ids can still have an id output. - - ◠Robert Stayton: param.xweb; param.ent - - Add new param index.links.to.section. - - ◠Robert Stayton: xref.xsl; autoidx.xsl - - Pass through an id on primary, secondary, or tertiary to - the index entry, so that one could link to an index entry. - You can't link to the id on an indexterm because that is - used to place the main anchor in the text flow. - - ◠Robert Stayton: autoidx.xsl - - Add support for the new index.links.to.section param which permits - precise links to indexterms in HTML output rather than to - the section title. - - ◠Mauritz Jeanson: synop.xsl - - Added modeless template for ooclass|oointerface|ooexception. - Closes bug #1623468. - - ◠Robert Stayton: qandaset.xsl - - Make sure a qandaset has an anchor, even when it has no title, - because it may be referenced in a TOC or xref. - Before, the anchor was output by the title, but there was no - anchor if there was no title. - - ◠Robert Stayton: xref.xsl - - Add a template for indexterm with mode="xref-to" to fix bug 2102592. - - ◠Robert Stayton: xref.xsl - - Now xref to qandaentry will use the label element in a question for - the link text if it has one. - - ◠Robert Stayton: qandaset.xsl; html.xsl - - Create separate templates for computing label of question and answer - in a qandaentry, so such can be used for the alt text of an xref - to a qandaentry. - - ◠Robert Stayton: inline.xsl; xref.xsl - - Now support xref to phrase, simpara, anchor, and quote, - most useful when an xrefstyle is used. - - ◠Robert Stayton: toc.xsl - - Rewrite toc templates to support an empty toc or populated toc - in all permitted contexts. Same for lot elements. - This fixes bug #1595969 for HTML outputs. - - ◠Mauritz Jeanson: titlepage.xsl; component.xsl; division.xsl; xref.xsl; - titlepage.templates⋯ - - Added code to handle acknowledgements in book and part. The element is processed - similarly to dedication. All acknowledgements will appear as front matter, after - any dedications. - - ◠Robert Stayton: index.xsl - - Rewrote primaryie, secondaryie and tertiaryie templates to handle - nesting of elements and seeie and seealsoie, as reported in - bug # 1168912. - - ◠Robert Stayton: autotoc.xsl - - Fix simplesect in toc problem. - - ◠Robert Stayton: verbatim.xsl - - Add support for @width per bug report #2012736. - - ◠Robert Stayton: formal.xsl; htmltbl.xsl - - Fix bug #1787140 HTML tables not handling attributes correctly. - - ◠Robert Stayton: param.xweb - - Move writing-mode param. - - ◠Keith Fahlgren: refentry.xsl - - Remove a nesting of

    inside

    for refclass (made XHTML* invalid, made HTML silly) - - ◠Robert Stayton: table.xsl - - Fix bug #1945872 to allow passthrough of colwidth values to - HTML table when no tablecolumns.extension is available and - when no instance of * appears in the table's colspecs. - - ◠Mauritz Jeanson: block.xsl - - Added support for acknowledgements in article. - Support in book/part remains to be added. - - ◠Robert Stayton: chunk-common.xsl - - Fix bug #1787167 incorrect hot text for some olinks. - - ◠Robert Stayton: qandaset.xsl - - Fix bug 1546008: in qandaentry in a TOC, use its blockinfo/titleabbrev or blockinfo/title - instead of question, if available. For DocBook 5, use the info versions. - - ◠Robert Stayton: chunktoc.xsl - - Add support for generating olink database when using chunktoc.xsl. - - ◠Keith Fahlgren: verbatim.xsl - - Add better pointer to README for XSLTHL - - ◠Keith Fahlgren: verbatim.xsl - - Another stab at fixing the stupid XSLTHT includes across processors (Saxon regression reported by Sorin Ristache) - - ◠Keith Fahlgren: verbatim.xsl - - More tweaking the way that XSLTHL does or does not get called - - ◠Keith Fahlgren: verbatim.xsl - - Alternate attempt at sanely including/excluding XSLTHT code - -Manpages - -The following changes have been made to the manpages code since the 1.74.3 -release. - - ◠Robert Stayton: table.xsl - - Convert function-available test for node-set() function to - test of $exsl.node.set.available param. - - ◠Mauritz Jeanson: lists.xsl - - Added a template for bibliolist. Closes bug #1815916. - -ePub - -The following changes have been made to the epub code since the 1.74.3 release. - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/ - onegraphic.xinclude.xml;⋯ - - Slightly more nuanced handling of imageobject alternatives and better support in dbtoepub for XIncludes and ENTITYs to resolve Issue #2750442 reported by Raphael Hertzog. - - ◠Keith Fahlgren: docbook.xsl - - Add a colon after an abstract/title when mapping into the dc:description for OPF metadata in ePub output to help the flat text have more pseudo-semantics (sugestions from Michael Wiedmann) - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl; bin/spec/ - files/de.xml - - Correctly set dc:language in OPF metadata when i18nizing. Closes Bug #2755150 - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl - - Corrected namespace declarations for literal XHTML elements to make them serialize "normally" - - ◠Keith Fahlgren: docbook.xsl - - Be a little bit more nuanced about dates - - ◠Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files - /orm.book.001.x⋯ - - Add DocBook subjectset -> OPF dc:subject mapping and tests - - ◠Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files - /orm.book.001.x⋯ - - Add DocBook date -> OPF dc:date mapping and tests - - ◠Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files - /orm.book.001.x⋯ - - Add DocBook abstract -> OPF dc:description mapping and tests - - ◠Robert Stayton: docbook.xsl - - Check in patch submitted by user to add opf:file-as attribute - to dc:creator element. - - ◠Keith Fahlgren: bin/dbtoepub - - Adding --output option to dbtoepub based on user request - - ◠Keith Fahlgren: docbook.xsl; bin/spec/epub_spec.rb - - Cleaning and regularizing the generation of namespaced nodes for OPF, NCX, XHTML and other outputted filetypes (hat tip to bobstayton for pointing out the silly, incorrect code) - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/ - refclass.xml - - Remove a nesting of

    inside

    for refclass (made XHTML* invalid, made HTML silly) - - â— Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/ - blockquotepre.xml - - Added regression test and fix for XHTML validation problem with s added inside

    ; This potentially causes another problem (where something is referenced by has no anchor, but someone reporting that should cause the whole thing to be reconsidered with modern browsers in mind. - -HTMLHelp - -The following changes have been made to the htmlhelp code since the 1.74.3 -release. - - ◠Robert Stayton: htmlhelp-common.xsl - - Add support for generating olink target database for htmlhelp files. - -Params - -The following changes have been made to the params code since the 1.74.3 -release. - - ◠Robert Stayton: default.table.rules.xml - - Add default setting for @rules attribute on HTML markup tables. - - ◠Mauritz Jeanson: bookmarks.collapse.xml - - Added a new parameter, bookmarks.collapse, that controls the initial state - of the bookmark tree. When the parameter has a non-zero value (the default), - only the top-level bookmarks are displayed initially. Otherwise, the whole - tree of bookmarks is displayed. - - This is implemented for FOP 0.9X. Closes FR #1792326. - - ◠Robert Stayton: variablelist.term.properties.xml - - Add new variablelist.term.properties to format terms, per - request # 1968513. - - ◠Robert Stayton: qanda.defaultlabel.xml - - Add two new qanda.defaultlabel values so that numbered sections - and numbered questions can be distinguished. Satisfies - Feature Request #1539045. - - ◠Robert Stayton: index.links.to.section.xml - - Change default to 1 to match past behavior. - - ◠Robert Stayton: exsl.node.set.available.xml - - Isolate this text for Xalan bug regarding exsl:node-set available. - If it is ever fixed in Xalan, just fix it here. - - ◠Robert Stayton: index.links.to.section.xml - - Add param to control whether an index entry links to - a section title or to the precise location of the - indexterm. - - ◠Robert Stayton: glossentry.list.item.properties.xml - - New attribute list for glossentry in glossary. - - ◠Robert Stayton: monospace.verbatim.font.width.xml - - New parameter to support @width on programlisting and screen. - - ◠Mauritz Jeanson: highlight.source.xml - - Updated and reorganized the description. - - ◠Robert Stayton: page.margin.outer.xml; page.margin.inner.xml - - Add caveat about XEP bug when writing-mode is right-to-left. - - ◠Robert Stayton: article.appendix.title.properties.xml; writing.mode.xml; - body.start.indent⋯ - - Change 'left' to 'start' and 'right' to 'end' to support right-to-left - writing mode. - - ◠Robert Stayton: glossdef.block.properties.xml; - glossdef.list.properties.xml; glossterm.blo⋯ - - Add attribute-sets for formatting glossary terms and defs. - - ◠Robert Stayton: glossterm.separation.xml - - Clarify the description. - - ◠Robert Stayton: make.year.ranges.xml - - Now handles year element containing a comma or dash without error. - -Highlighting - -The following changes have been made to the highlighting code since the 1.74.3 -release. - - ◠Jirka Kosek: README - - Inclusion of highlighting code was simplified. Only one import is now necessary. - - ◠Keith Fahlgren: README - - Adding XSLTHL readme - - ◠Keith Fahlgren: common.xsl - - Alternate attempt at sanely including/excluding XSLTHT code - -XSL-Saxon - -The following changes have been made to the xsl-saxon code since the 1.74.3 -release. - - ◠Mauritz Jeanson: src/com/nwalsh/saxon/Text.java - - Added a fix that prevents output of extra blank line. - Hopefully this closes bug #894805. - -XSL-Xalan - -The following changes have been made to the xsl-xalan code since the 1.74.3 -release. - - ◠Mauritz Jeanson: src/com/nwalsh/xalan/Text.java - - Added a fix that prevents output of extra blank line. - Hopefully this closes bug #894805. - -Release Notes: 1.74.3 - -This release fixes some bugs in the 1.74.2 release. - -See highlighting/README for XSLTHL usage instructions. - -Release Notes: 1.74.2 - -This release fixes some bugs in the 1.74.1 release. - -Release Notes: 1.74.1 - -This release includes important bug fixes and adds the following significant -feature changes: - -Gentext - - Kirghiz locale added and Chinese translations have been simplified. - - Somme support for gentext and right-to-left languages has been added. - -FO - - Various bugs have been resolved. - - Support for a new processing instruction: dbfo funcsynopsis-style has been - added. - - Added new param email.mailto.enabled for FO output. Patch from Paolo - Borelli. - - Support for documented metadata in fop1 mode has been added. - -Highlighting - - Support for the latest version of XSLTHL 2.0 and some new language syntaxes - have been added to a variety of outputs. - -Manpages - - Added man.output.better.ps.enabled param (zero default). It non-zero, no - such markup is embedded in generated man pages, and no enhancements are - included in the PostScript output generated from those man pages by the man - -Tps command. - -HTML - - Support for writing.mode to set text direction and alignment based on - document locale has been added. - - Added a new top-level stylesheet module, chunk-changebars.xsl, to be used - for generating chunked output with highlighting based on change - (@revisionflag) markup. The module imports/includes the standard chunking - and changebars templates and contains additional logic for chunked output. - See FRs #1015180 and #1819915. - -ePub - - Covers now look better in Adobe Digital Editions thanks to a patch from - Paul Norton of Adobe - - Cover handling now more generic (including limited DocBook 5.0 cover - support thanks to patch contributed by Liza Daly. - - Cover markup now carries more reliably into files destined for .mobi and - the Kindle. - - dc:identifiers are now generated from more types of numbering schemes. - - Both SEO and semantic structure of chunked ePub output by ensuring that we - always send out one and only one h1 in each XHTML chunk. - - Primitive support for embedding a single font added. - - Support for embedding a CSS customizations added. - -Roundtrip - - Support for imagedata-metadata and table as images added. - - Support for imagedata-metadata and legalnotice as images added. - -Params - - man.output.better.ps.enabled added for Manpages output - - writing.mode.xml added to set text direction. - - Added new param email.mailto.enabled for FO output. Patch from Paolo - Borelli. Closes #2086321. - - highlight.source upgraded to support the latest version of XSLTHL 2.0. - -The following is a list of changes that have been made since the 1.74.0 -release. - -Gentext - -The following changes have been made to the gentext code since the 1.74.0 -release. - - ◠Michael(tm) Smith: locale/ky.xml; Makefile - - new Kirghiz locale from Ilyas Bakirov - - ◠Mauritz Jeanson: locale/en.xml - - Added "Acknowledgements". - - ◠Dongsheng Song: locale/zh_cn.xml - - Simplified Chinese translation. - - ◠Robert Stayton: locale/lv.xml; locale/ca.xml; locale/pt.xml; locale/tr.xml; - locale/af.xml;⋯ - - Add writing-mode gentext string to support right-to-left languages. - -FO - -The following changes have been made to the fo code since the 1.74.0 release. - - ◠David Cramer: footnote.xsl - - Added a check to confirm that a footnoteref's linkend points to a footnote. Stylesheets stop processing if not and provide a useful error message. - - ◠Mauritz Jeanson: spaces.xsl - - Convert spaces to fo:leader also in elements in the DB 5 namespace. - - ◠Mauritz Jeanson: pi.xsl; synop.xsl - - Added support for a new processing instruction: dbfo funcsynopsis-style. - Closes bug #1838213. - - ◠Michael(tm) Smith: inline.xsl; param.xweb; param.ent - - Added new param email.mailto.enabled for FO output. - Patch from Paolo Borelli. Closes #2086321. - - ◠Mauritz Jeanson: docbook.xsl - - Added support for document metadata for fop1 (patch #2067318). - - ◠Jirka Kosek: param.ent; param.xweb; highlight.xsl - - Upgraded to support the latest version of XSLTHL 2.0 - -- nested markup in highlited code is now processed - -- it is no longer needed to specify path XSLTHL configuration file using Java property - -- support for new languages, including Perl, Python and Ruby was added - -HTML - -The following changes have been made to the html code since the 1.74.0 release. - - ◠Robert Stayton: param.xweb; docbook.xsl; param.ent; html.xsl - - Add support for writing.mode to set text direction and alignment based on document locale. - - ◠Mauritz Jeanson: chunk-changebars.xsl - - Added a new top-level stylesheet module, chunk-changebars.xsl, to be - used for generating chunked output with highlighting based on change - (@revisionflag) markup. The module imports/includes the standard chunking - and changebars templates and contains additional logic for chunked output. - See FRs #1015180 and #1819915. - -Manpages - -The following changes have been made to the manpages code since the 1.74.0 -release. - - ◠Michael(tm) Smith: docbook.xsl - - Put the following at the top of generated roff for each page: - \" t - purpose is to explicitly tell AT&T troff that the page needs to be - pre-processed through tbl(1); groff can figure it out - automatically, but apparently AT&T troff needs to be explicitly told - -ePub - -The following changes have been made to the epub code since the 1.74.0 release. - - ◠Keith Fahlgren: docbook.xsl - - Patch from Paul Norton of Adobe to get covers to look better in Adobe Digital Editions - - ◠Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/ - v5cover.xml; bin/spec/sp⋯ - - Patch contributed by Liza Daly to make ePub cover handling more generic. Additionally - DocBook 5.0's now has some limited support: - - - should reference a cover in the OPF guide for a DocBook 5.0 test document - - ◠Keith Fahlgren: bin/spec/files/isbn.xml; bin/spec/files/issn.xml; bin/spec/ - files/biblioid.⋯ - - Liza Daly reported that the dc:identifer-generation code was garbage (she was right). - - Added new tests: - - should include at least one dc:identifier - - should include an ISBN as URN for dc:identifier if an ISBN was in the metadata - - should include an ISSN as URN for dc:identifier if an ISSN was in the metadata - - should include an biblioid as a dc:identifier if an biblioid was in the metadata - - should include a URN for a biblioid with @class attribute as a dc:identifier if an biblioid was in the metadata - - ◠Keith Fahlgren: docbook.xsl; bin/spec/epub_spec.rb - - Improve both SEO and semantic structure of chunked ePub output by ensuring that - we always send out one and only one h1 in each XHTML chunk. - - DocBook::Epub - - should include one and only one

    in each HTML file in rendered ePub files - for s - - should include one and only one

    in each HTML file in rendered ePub files - for s even if they do not have section markup - - â— Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files - /orm.book.001.x⋯ - - Adding better support for covers in epub files destined for .mobi and the Kindle - - â— Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb; bin/spec/files/ - DejaVuSerif.otf; docbook.⋯ - - Adding primitive support for embedding a single font - - â— Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb; bin/spec/files/ - test_cust.xsl; bin/spec/e⋯ - - Adding support for user-specified customization layers in dbtoepub - - â— Keith Fahlgren: bin/dbtoepub; bin/spec/epub_regressions_spec.rb; bin/lib/ - docbook.rb; bin/s⋯ - - Adding CSS support to .epub target & dbtoepub: - -c, --css [FILE] Use FILE for CSS on generated XHTML. - - - DocBook::Epub - ... - - should include a CSS link in HTML files when a CSS file has been provided - - should include CSS file in .epub when a CSS file has been provided - - should include a CSS link in OPF file when a CSS file has been provided - -Roundtrip - -The following changes have been made to the roundtrip code since the 1.74.0 -release. - - â— Steve Ball: blocks2dbk.xsl; template.xml; template.dot - - added support for imagedata-metadata - added support for table as images - - â— Steve Ball: blocks2dbk.xsl; normalise2sections.xsl; sections2blocks.xsl - - Improved support for personname inlines. - - â— Steve Ball: blocks2dbk.xsl; blocks2dbk.dtd; template.xml - - Added support for legalnotice. - - â— Steve Ball: blocks2dbk.xsl; wordml2normalise.xsl - - added support for orgname in author - - â— Steve Ball: specifications.xml; supported.xml; blocks2dbk.xsl; - wordml2normalise.xsl; dbk2w⋯ - - Updated specification. - to-DocBook: add cols attribute to tgroup - from-DocBook: fix for blockquote title - -Params - -The following changes have been made to the params since the 1.74.0 release. - - â— The change was to add man.output.better.ps.enabled parameter, with its - default value set to zero. If the value of the man.output.better.ps.enabled - parameter is non-zero, certain markup is embedded in each generated man - page such that PostScript output from the man -Tps command for that page - will include a number of enhancements designed to improve the quality of - that output. If man.output.better.ps.enabled is zero (the default), no such - markup is embedded in generated man pages, and no enhancements are included - in the PostScript output generated from those man pages by the man -Tps - command. WARNING: The enhancements provided by this parameter rely on - features that are specific to groff (GNU troff) and that are not part of - "classic" AT&T troff or any of its derivatives. Therefore, any man pages - you generate with this parameter enabled will be readable only on systems - on which the groff (GNU troff) program is installed, such as GNU/Linux - systems. The pages will not not be readable on systems on with the classic - troff (AT&T troff) command is installed. NOTE: The value of this parameter - only affects PostScript output generated from the man command. It has no - effect on output generated using the FO backend. TIP: You can generate - PostScript output for any man page by running the following command: man - FOO -Tps > FOO.ps You can then generate PDF output by running the following - command: ps2pdf FOO.ps - - â— Robert Stayton: writing.mode.xml - - writing mode param used to set text direction. - - â— Michael(tm) Smith: email.mailto.enabled.xml - - Added new param email.mailto.enabled for FO output. - Patch from Paolo Borelli. Closes #2086321. - - â— Jirka Kosek: highlight.source.xml; highlight.xslthl.config.xml - - Upgraded to support the latest version of XSLTHL 2.0 - -- nested markup in highlited code is now processed - -- it is no longer needed to specify path XSLTHL configuration file using Java property - -- support for new languages, including Perl, Python and Ruby was added - -Highlighting - -The following changes have been made to the highlighting code since the 1.74.0 -release. - - â— Jirka Kosek: cpp-hl.xml; c-hl.xml; tcl-hl.xml; php-hl.xml; common.xsl; - perl-hl.xml; delphi⋯ - - Upgraded to support the latest version of XSLTHL 2.0 - -- nested markup in highlited code is now processed - -- it is no longer needed to specify path XSLTHL configuration file using Java property - -- support for new languages, including Perl, Python and Ruby was added - -Release Notes: 1.74.0 - -This release includes important bug fixes and adds the following significant -feature changes: - -.epub target - - Paul Norton (Adobe) and Keith Fahlgren(O'Reilly Media) have donated code - that generates .epub documents from DocBook input. An alpha-reference - implementation in Ruby has also been provided. - - .epub is an open standard of the The International Digital Publishing Forum - (IDPF), a the trade and standards association for the digital publishing - industry. - - Read more about this target in epub/README - -XHTML 1.1 target - - To support .epub output, a strict XHTML 1.1 target has been added. The - stylesheets for this output are generated and are quite similar to the - XHTML target. - -Gentext updates - - A number of locales have been updated. - -Roundtrip improvements - - Table, figure, template syncronization, and character style improvements - have been made for WordML & Pages. Support added for OpenOffice.org. - -First implementation of a libxslt extension - - A stylesheet extension for libxslt, written in Python, has been added. The - extension is a function for adjusting column widths in CALS tables. See - extensions/README.LIBXSLT for more information. - -The following is a list of changes that have been made since the 1.73.2 -release. - -Gentext - -The following changes have been made to the gentext code since the 1.73.2 -release. - - â— Michael(tm) Smith: locale/id.xml - - Checked in changes to Indonesion locale submitted by Euis Luhuanam a long time ago. - - â— Michael(tm) Smith: locale/lt.xml - - Added changes to Lithuanian locate submitted a long time back by Nikolajus Krauklis. - - â— Michael(tm) Smith: locale/hu.xml - - fixed error in lowercase.alpha definition in Hungarian locale - - â— Michael(tm) Smith: locale/nb.xml - - Corrected language code for nb locale, and restored missing "startquote" key. - - â— Michael(tm) Smith: locale/ja.xml - - Committed changes to ja locale file, from Akagi Kobayashi. Adds bracket quotes around many xref instances that did not have them - before. - - â— Michael(tm) Smith: Makefile - - "no" locale is now "nb" - - â— Michael(tm) Smith: locale/nb.xml - - Update Norwegian BokmÃ¥l translation. Thanks to Hans F. Nordhaug. - - â— Michael(tm) Smith: locale/no.xml; locale/nb.xml - - per message from Hans F. Nordhaug, correct identifier for - Norwegian BokmÃ¥l is "nb" (not "no") and has been for quite some - time now... - - â— Michael(tm) Smith: locale/ja.xml - - Converted ja.xml source file to use real unicode characters so - that the actual glyphs so up when you edit it in a text editor - (instead of the character references). - - â— Michael(tm) Smith: locale/ja.xml - - Checked in changes to ja.xml locale file. Thanks to Akagi Kobayashi. - - â— Michael(tm) Smith: locale/it.xml - - Changes from Federico Zenith - - â— Dongsheng Song: locale/zh_cn.xml - - Added missing translations. - -Common - -The following changes have been made to the common code since the 1.73.2 -release. - - â— Michael(tm) Smith: l10n.xsl - - Added new template "l10.language.name" for retrieving the - English-language name of the lang setting of the current document. - Closes #1916837. Thanks to Simon Kennedy. - - â— Michael(tm) Smith: refentry.xsl - - fixed syntax error - - â— Michael(tm) Smith: refentry.xsl - - fixed a couple of typos - - â— Michael(tm) Smith: refentry.xsl - - refined handling of cases where refentry "source" or "manual" - metadata is missing or when we use fallback content instead. We - now report a Warning if we use fallback content. - - â— Michael(tm) Smith: refentry.xsl - - don't use refmiscinfo@class=date value as fallback for refentry - "source" or "manual" metadata fields - - â— Michael(tm) Smith: refentry.xsl - - Made reporting of missing refentry metadata more quiet: - - - we no longer report anything if usable-but-not-preferred - metadata is found; we just quietly use whatever we manage to - find - - - we now only report missing "source" metadata if the refentry - is missing BOTH "source name" and "version" metadata; if it - has one but not the other, we use whichever one it has and - don't report anything as missing - - The above changes were made because testing with some "real world" - source reveals that some authors are intentionally choosing to use - "non preferred" markup for some metadata, and also choosing to - omit "source name" or "version" metadata in there DocBook XML. So - it does no good to give them pedantic reminders about what they - already know... - - Also, changed code to cause "fixme" text to be inserted in output - in particular cases: - - - if we can't manage to find any "source" metadata at all, we - now put fixme text into the output - - - if we can't manage to find any "manual" metadata a all, we - now put fixme text into the output - - The "source" and "manual" metadata is necessary information, so - buy putting the fixme stuff in the output, we alert users to the - need problem of it being missing. - - â— Michael(tm) Smith: refentry.xsl - - When generating manpages output, we no longer report anything if - the refentry source is missing date or pubdate content. In - practice, many users intentionally omit the date from the source - because they explicitly want it to be generated. - - â— Michael(tm) Smith: l10n.xml - - further change needed for switch from no locale to nb. - - â— Michael(tm) Smith: common.xsl - - Added support for orgname in authorgroup. Thanks to Camille - Bégnis. - - â— Michael(tm) Smith: Makefile - - "no" locale is now "nb" - - â— Mauritz Jeanson: stripns.xsl - - Removed the template matching "ng:link|db:link" (in order to make @xlink:show - work with elements). As far as I can tell, this template is no longer needed. - - â— Mauritz Jeanson: entities.ent - - Moved declaration of comment.block.parents entity to common/entities.ent. - - â— Mauritz Jeanson: titles.xsl - - Added an update the fix made in revision 7528 (handling of xref/link in no.anchor.mode mode). - Having xref in title is not a problem as long as the target is not an ancestor element. - Closes bug #1838136. - - Note that an xref that is in a title and whose target is an ancestor element is still not - rendered in the TOC. This could be considered a bug, but on the other hand I cannot really - see the point in having such an xref in a document. - - â— Mauritz Jeanson: titles.xsl - - Added a "not(ancestor::title)" test to work around "too many nested - apply-templates" problems when processing xrefs or links in no.anchor.mode mode. - Hopefully, this closes bug #1811721. - - â— Mauritz Jeanson: titles.xsl - - Removed old template matching "link" in no.anchor.mode mode. - - â— Mauritz Jeanson: titles.xsl - - Process in no.anchor.mode mode with the same template as . - Closes bug #1759205 (Empty link in no.anchor.mode mode). - - â— Mauritz Jeanson: titles.xsl - - In no.anchor.mode mode, do not output anchors for elements that are descendants - of . Previously, having inline elements with @id/@xml:id in <title>s - resulted in anchors both in the TOC and in the main flow. Closes bug #1797492. - -FO - -The following changes have been made to the fo code since the 1.73.2 release. - - â— Mauritz Jeanson: pi.xsl - - Updated documentation for keep-together. - - â— Mauritz Jeanson: task.xsl - - Enabled use of the keep-together PI on task elements. - - â— Robert Stayton: index.xsl - - FOP1 requires fo:wrapper for inline index entries, not fo:inline. - - â— Robert Stayton: index.xsl - - Fixed non-working inline.or.block template for indexterm wrappers. - Add fop1 to list of processors using inline.or.block. - - â— Mauritz Jeanson: table.xsl - - Fixed bug #1891965 (colsep in entytbl not working). - - â— Mauritz Jeanson: titlepage.xsl - - Added support for title in revhistory. Closes bug #1842847. - - â— Mauritz Jeanson: pi.xsl - - Small doc cleanup (dbfo float-type). - - â— Mauritz Jeanson: titlepage.xsl - - Insert commas between multiple copyright holders. - - â— Mauritz Jeanson: autotoc.xsl; division.xsl - - Added modifications to support nested set elements. See bug #1853172. - - â— David Cramer: glossary.xsl - - Added normalize-space to xsl:sorts to avoid missorting of glossterms due to stray leading spaces. - - â— David Cramer: glossary.xsl - - Fixed bug #1854199: glossary.xsl should use the sortas attribute on glossentry - - â— Mauritz Jeanson: inline.xsl - - Added a template for citebiblioid. The hyperlink target is the parent of the referenced biblioid, - and the "hot text" is the biblioid itself enclosed in brackets. - - â— Mauritz Jeanson: inline.xsl - - Moved declaration of comment.block.parents entity to common/entities.ent. - - â— Mauritz Jeanson: docbook.xsl - - Updated message about unmatched element. - - â— Mauritz Jeanson: param.xweb - - Added link to profiling chapter of TCG. - - â— Mauritz Jeanson: refentry.xsl - - Fixed typo (refsynopsysdiv -> refsynopsisdiv). - - â— David Cramer: fop.xsl; fop1.xsl; ptc.xsl; xep.xsl - - Added test to check generate.index param when generating pdf bookmarks - - â— Mauritz Jeanson: graphics.xsl - - Added support for MathML in imagedata. - - â— Michael(tm) Smith: math.xsl - - Removed unnecessary extra test condition in test express that - checks for passivetex. - - â— Michael(tm) Smith: math.xsl - - Don't use fo:instream-foreign-object if we are processing with - passivetex. Closes #1806899. Thanks to Justus Piater. - - â— Mauritz Jeanson: component.xsl - - Added code to output a TOC for an appendix in an article when - generate.toc='article/appendix toc'. Closes bug #1669658. - - â— Dongsheng Song: biblio-iso690.xsl - - Change encoding from "windows-1250" to "UTF-8". - - â— Mauritz Jeanson: pi.xsl - - Updated documentation for dbfo_label-width. - - â— Mauritz Jeanson: lists.xsl - - Added support for the dbfo_label-width PI in calloutlists. - - â— Robert Stayton: biblio.xsl - - Support finding glossary database entries inside bibliodivs. - - â— Robert Stayton: formal.xsl - - Complete support for <?dbfo pgwide="1"?> for informal - elements too. - - â— Mauritz Jeanson: table.xsl - - In the table.block template, added a check for the dbfo_keep-together PI, so that - a table may break (depending on the PI value) at a page break. This was needed - since the outer fo:block that surrounds fo:table has keep-together.within-column="always" - by default, which prevents the table from breaking. Closes bug #1740964 (Titled - table does not respect dbfo PI). - - â— Mauritz Jeanson: pi.xsl - - Added a few missing @role="tcg". - - â— Mauritz Jeanson: inline.xsl - - Use normalize-space() in glossterm comparisons (as in html/inline.xsl). - - â— Mauritz Jeanson: autoidx.xsl - - Removed the [&scope;] predicate from the target variable in the template with name="reference". - This filter was the cause of missing index backlinks when @zone and @type were used on indexterms, - with index.on.type=1. Closes bug #1680836. - - â— Michael(tm) Smith: inline.xsl; xref.xsl; footnote.xsl - - Added capability in FO output for displaying URLs for all - hyperlinks (elements marked up with xlink:href attributes) in the - same way as URLs for ulinks are already handled (which is to say, - either inline or as numbered footnotes). - - Background on this change: - DocBook 5 allows "ubiquitous" linking, which means you can make - any element a hyperlink just by adding an xlink:href attribute to - it, with the value set to an external URL. That's in contrast to - DocBook 4, which only allows you to use specific elements (e.g., - the link and ulink elements) to mark up hyperlinks. - - The existing FO stylesheets have a mechanism for handling display - of URLs for hyperlinks that are marked up with ulink, but they did - not handle display of URLs for elements that were marked up with - xlink:href attributes. This change adds handling for those other - elements, enabling the URLs they link to be displayed either - inline or as numbered footnotes (depending on what values the user - has the ulink.show and ulink.footnotes params set to). - - Note that this change only adds URL display support for elements - that call the simple.xlink template -- which currently is most - (but not all) inline elements. - - This change also moves the URL display handling out of the ulink - template and into a new "hyperlink.url.display" named template; - the ulink template and the simple.xlink named template now both - call the hyperlink.url.display template. - - Warning: In the stylesheet code that determines what footnote - number to assign to each footnote or external hyperlink, there is - an XPath expression for determining whether a particular - xlink:href instance is an external hyperlink; that expression is - necessarily a bit complicated and further testing may reveal that - it doesn't handle all cases as expected -- so some refinements to - it may need to be done later. - - Closes #1785519. Thanks to Ken Morse for reporting and - troubleshooting the problem. - -HTML - -The following changes have been made to the html code since the 1.73.2 release. - - â— Keith Fahlgren: inline.xsl; synop.xsl - - Work to make HTML and XHTML targets more valid - - â— Keith Fahlgren: table.xsl - - Add better handling for tables that have footnotes in the titles - - â— Keith Fahlgren: biblio.xsl - - Add anchors to bibliodivs - - â— Keith Fahlgren: formal.xsl; Makefile; htmltbl.xsl - - Initial checkin/merge of epub target from work provided by Paul Norton of Adobe - and Keith Fahlgren of O'Reilly. - - This change includes new code for generating the XHTML 1.1 target sanely. - - â— Mauritz Jeanson: biblio.xsl - - Added code for creating URLs from biblioids with @class="doi" (representing Digital - Object Identifiers). See FR #1934434 and http://doi.org. - - To do: 1) Add support for FO output. 2) Figure out how @class="doi" should be handled - for bibliorelation, bibliosource and citebiblioid. - - â— Norman Walsh: formal.xsl - - Don't use xsl:copy because it forces the resulting element to be in the same namespace as the source element; in the XHTML stylesheets, that's wrong. But the HTML-to-XHTML converter does the right thing with literal result elements, so use one of them. - - â— Michael(tm) Smith: Makefile - - Added checks and hacks to various makefiles to enable building - under Cygwin. This stuff is ugly and maybe not worth the mess and - trouble, but does seem to work as expected and not break anything - else. - - â— Michael(tm) Smith: docbook.xsl - - added "exslt" namespace binding to html/docbook.xsl file (in - addition to existing "exsl" binding. reason is because lack of it - seems to cause processing problems when using the profiled - version of the stylsheet - - â— Norman Walsh: chunk-common.xsl - - Rename link - - â— Mauritz Jeanson: table.xsl - - Added a fix to make rowsep apply to the last row of thead in entrytbl. - - â— Michael(tm) Smith: synop.xsl - - Simplified and streamlined handling of output for ANSI-style - funcprototype output, to correct a problem that was causing type - data to be lost in the output parameter definitions. For example, - for an instance like this: - <paramdef>void *<parameter>dataptr</parameter>[]</paramdef> - ... the brackets (indicating an array type) were being dropped. - - â— Michael(tm) Smith: synop.xsl - - Changed HTML handling of K&R-style paramdef output. The parameter - definitions are no longer output in a table (though the prototype - still is). The reason for the change is that the - kr-tabular-funcsynopsis-mode template was causing type data to be - lost in the output parameter definitions. For example, for an - instance like this: - <paramdef>void *<parameter>dataptr</parameter>[]</paramdef> - ... the brackets (indicating an array type) were being dropped. - The easiest way to deal with the problem is to not try to chop up - the parameter definitions and display them in table format, but to - instead just output them as-is. May not look quite as pretty, but - at least we can be sure no information is being lost... - - â— Michael(tm) Smith: pi.xsl - - updated wording of doc for funcsynopsis-style PI - - â— Michael(tm) Smith: param.xweb; param.ent; synop.xsl - - Removed the funcsynopsis.tabular.threshold param. It's no longer - being used in the code and hasn't been since mid 2006. - - â— Mauritz Jeanson: graphics.xsl - - Added support for the img.src.path parameter for SVG graphics. Closes bug #1888169. - - â— Mauritz Jeanson: chunk-common.xsl - - Added missing space. - - â— Norman Walsh: component.xsl - - Fix bug where component titles inside info elements were not handled properly - - â— Michael(tm) Smith: pi.xsl - - Moved dbhtml_stop-chunking embedded doc into alphabetical order, - fixed text of TCG section it see-also'ed. - - â— David Cramer: pi.xsl - - Added support for <?dbhtml stop-chunking?> processing instruction - - â— David Cramer: chunk-common.xsl; pi.xsl - - Added support for <?dbhtml stop-chunking?> processing instruction - - â— David Cramer: glossary.xsl - - Fixed bug #1854199: glossary.xsl should use the sortas attribute on glossentry. Also added normalize-space to avoid missorting due to stray leading spaces. - - â— Mauritz Jeanson: inline.xsl - - Added a template for citebiblioid. The hyperlink target is the parent of the referenced biblioid, - and the "hot text" is the biblioid itself enclosed in brackets. - - â— Mauritz Jeanson: inline.xsl - - Added support for @xlink:show in the simple.xlink template. The "new" and "replace" - values are supported (corresponding to values of "_blank" and "_top" for the - ulink.target parameter). I have assumed that @xlink:show should override ulink.target - for external URI links. This closes bugs #1762023 and #1727498. - - â— Mauritz Jeanson: inline.xsl - - Moved declaration of comment.block.parents entity to common/entities.ent. - - â— Mauritz Jeanson: param.xweb - - Added link to profiling chapter of TCG. - - â— Dongsheng Song: biblio-iso690.xsl - - Change encoding from "windows-1250" to "UTF-8". - - â— Robert Stayton: biblio.xsl - - Add support in biblio collection to entries in bibliodivs. - - â— Mauritz Jeanson: pi.xsl - - Added missing @role="tcg". - - â— Mauritz Jeanson: chunk-common.xsl; titlepage.xsl - - Refactored legalnotice/revhistory chunking, so that the use.id.as.filename - parameter as well as the dbhtml_filename PI are taken into account. A new named - template in titlepage.xsl is used to compute the filename. - - â— Mauritz Jeanson: chunk-common.xsl; titlepage.xsl - - An update to the fix for bug #1790495 (r7433): - The "ln-" prefix is output only when the legalnotice doesn't have an - @id/@xml:id, in which case the stylesheets generate an ID value, - resulting in a filename like "ln-7e0fwgj.html". This is useful because - without the prefix, you wouldn't know that the file contained a legalnotice. - The same logic is also applied to revhistory, using an "rh-" prefix. - - â— Mauritz Jeanson: autoidx.xsl - - Removed the [&scope;] predicate from the target variable in the template with name="reference". - This filter was the cause of missing index backlinks when @zone and @type were used on indexterms, - with index.on.type=1. Closes bug #1680836. - - â— Mauritz Jeanson: titlepage.xsl - - Added 'ln-' prefix to the name of the legalnotice chunk, in order to match the - <link href"..."> that is output by make.legalnotice.head.links (chunk-common.xsl). - Modified the href attribute on the legalnotice link. - Closes bug #1790495. - -Manpages - -The following changes have been made to the manpages code since the 1.73.2 -release. - - â— Michael(tm) Smith: other.xsl - - slightly adjusted spacing around admonition markers - - â— Michael(tm) Smith: refentry.xsl; utility.xsl - - make sure refsect3 titles are preceded by a line of space, and - make the indenting of their child content less severe - - â— Michael(tm) Smith: block.xsl - - only indent verbatim environments in TTY output, not in non-TTY/PS - - â— Michael(tm) Smith: block.xsl - - made another adjustment to correct vertical alignment of admonition marker - - â— Michael(tm) Smith: block.xsl; other.xsl - - Adjusted/corrected alignment of adominition marker in PS/non-TTY output. - - â— Michael(tm) Smith: endnotes.xsl - - For PS/non-TTY output, display footnote/endnote numbers in - superscript. - - â— Michael(tm) Smith: table.xsl; synop.xsl; utility.xsl - - Changed handling of hanging indents for cmdsynopsis, funcsynopsis, - and synopfragment such that they now look correct in non-TTY/PS - output. We now use the groff \w escape to hang by the actual width - -- in the current font -- of the command, funcdef, or - synopfragment references number (as opposed to hanging by the - number of characters). This rendering in TTY output remains the - same, since the width in monospaced TTY output is the same as the - number of characters. - - Also, created new synopsis-block-start and synopsis-block-end - templates to use for cmdsynopsis and funcsynopsis instead of the - corresponding verbatim-* templates. - - Along with those changes, also corrected a problem that caused the - content of synopfragment to be dropped, and made a - vertical-spacing change to adjust spacing around table titles and - among sibling synopfragment instances. - - â— Michael(tm) Smith: other.xsl - - use common l10.language.name template to retrieve English-language name - - â— Michael(tm) Smith: synop.xsl; inline.xsl - - added comment in code explaining why we don't put filename output - in italic (despite the fact that man guidelines say we should) - - â— Michael(tm) Smith: inline.xsl - - put filename output in monospace instead of italic - - â— Michael(tm) Smith: synop.xsl - - put cmdsynopsis in monospace - - â— Michael(tm) Smith: inline.xsl - - removed template match for literal. template matches for monospace - inlines are all imported from the HTML stylesheet - - â— Michael(tm) Smith: block.xsl - - don't indent verbatim environments that are descendants of - refsynopsisdiv, not put backgrounds behind them - - â— Michael(tm) Smith: inline.xsl - - set output of the literal element in monospace. this causes all - inline monospace instances in the git man pages to be set in - monospace (since DocBook XML source for git docs is generated with - asciidoc and asciidoc consistently outputs only <literal> for - inline monospace (not <command> or <code> or anything else). - Of course this only affects non-TTY output... - - â— Michael(tm) Smith: utility.xsl - - Added inline.monoseq named template. - - â— Michael(tm) Smith: utility.xsl - - don't bother using a custom register to store the previous - font-family value when setting blocks of text in code font; just - use \F[] .fam with no arg to switch back - - â— Michael(tm) Smith: endnotes.xsl - - put links in blue in PS output (note that this matches how groff - renders content marked up with the .URL macro) - - â— Michael(tm) Smith: endnotes.xsl; param.xweb; param.ent - - removed man.links.are.underlined and added man.font.links. Also, - changed the default font formatting for links to bold. - - â— Michael(tm) Smith: endnotes.xsl; param.xweb; param.ent - - Added new param man.base.url.for.relative.links .. specifies a - base URL for relative links (for ulink, @xlink:href, imagedata, - audiodata, videodata) shown in the generated NOTES section of - man-page output. The value of man.base.url.for.relative.links is - prepended to any relative URI that is a value of ulink url, - xlink:href, or fileref attribute. - - If you use relative URIs in link sources in your DocBook refentry - source, and you leave man.base.url.for.relative.links unset, the - relative links will appear "as is" in the NOTES section of any - man-page output generated from your source. That's probably not - what you want, because such relative links are only usable in the - context of HTML output. So, to make the links meaningful and - usable in the context of man-page output, set a value for - man.base.url.for.relative.links that points - to the online version of HTML output generated from your DocBook - refentry source. For example: - - <xsl:param name="man.base.url.for.relative.links" - >http://www.kernel.org/pub/software/scm/git/docs/</xsl:param> - - â— Michael(tm) Smith: info.xsl - - If a source refentry contains a Documentation or DOCUMENTATION - section, don't report it as having missing AUTHOR information. - Also, if missing a contrib/personblurb for a person or org, report - pointers to http://docbook.sf.net/el/personblurb and to - http://docbook.sf.net/el/contrib - - â— Michael(tm) Smith: info.xsl - - If we encounter an author|editor|othercredit instance that lacks a - personblurb or contrib, report it to the user (because that means - we have no information about that author|editor|othercredit to - display in the generated AUTHOR|AUTHORS section...) - - â— Michael(tm) Smith: info.xsl; docbook.xsl; other.xsl - - if we can't find any usable author data, emit a warning and insert - a fixme in the output - - â— Michael(tm) Smith: info.xsl - - fixed bug in indenting of output for contrib instances in AUTHORS - section. Thanks to Daniel Leidert and the fglrx docs for exposing - the bug. - - â— Michael(tm) Smith: block.xsl - - for a para or simpara that is the first child of a callout, - suppress the .sp or .PP that would normally be output (because in - those cases, the output goes into a table cell, and the .sp or .PP - markup causes a spurious linebreak before it when displayed - - â— Michael(tm) Smith: lists.xsl - - Added support for rendering co callouts and calloutlist instances. - So you can now use simple callouts -- marking up programlisting - and such with co instances -- and have the callouts displayed in - man-page output. ("simple callouts" means using co@id and - callout@arearefs pointing to co@id instances; in man/roff output, - we can't/don't support markup that uses areaset and area) - - â— Michael(tm) Smith: block.xsl - - only put a line of space after a verbatim if it's followed by a - text node or a paragraph - - â— Michael(tm) Smith: utility.xsl - - put verbatim environments in slightly smaller font in non-TTY - output - - â— Michael(tm) Smith: lists.xsl - - minor whitespace-only reformatting of lists.xsl source - - â— Michael(tm) Smith: lists.xsl - - Made refinements/fixes to output of orderedlist and itemizedlist - -- in part, to get mysql man pages to display correctly. This - change causes a "\c" continuation marker to be added between - listitem markers and contents (to ensure that the content remains - on the same line as the marker when displayed) - - â— Michael(tm) Smith: block.xsl - - put a line of vertical space after all verbatim output that has - sibling content following it (not just if that sibling content is - a text node) - - â— Michael(tm) Smith: block.xsl - - refined spacing around titles for admonitions - - â— Michael(tm) Smith: block.xsl; other.xsl - - Deal with case of verbatim environments that have a linebreak - after the opening tag. Assumption is that users generally don't - want that linebreak to appear in output, so we do some groff - hackery to mess with vertical spacing and close the space. - - â— Michael(tm) Smith: inline.xsl - - indexterm instances now produce groff comments like this: - - .\" primary: secondary: tertiary - - remark instances, if non-empty, now produce groff comments - - â— Michael(tm) Smith: charmap.groff.xsl; other.xsl - - convert no-break space character to groff "\ \&" (instead of just - "\ "). the reason is that if a space occurs at the end of a line, - our processing causes it to be eaten. a real-world case of this is - the mysql(1) man page. appending the "\&" prevents that - - â— Michael(tm) Smith: block.xsl - - output "sp" before simpara output, not after it (outputting it - after results in undesirable whitespace in particular cases; for - example, in the hg/mercurial docs - - â— Michael(tm) Smith: table.xsl; synop.xsl; utility.xsl - - renamed from title-preamble to pinch.together and replaced "sp -1" - between synopsis fragments with call to pinch.together instead - - â— Michael(tm) Smith: table.xsl - - use title-preamble template for table titles (instead of "sp -1" - hack), and "sp 1" after all tables (instead of just "sp" - - â— Michael(tm) Smith: utility.xsl - - created title-preamble template for suppressing line spacing after - headings - - â— Michael(tm) Smith: info.xsl - - further refinement of indenting in AUTHORS section - - â— Michael(tm) Smith: block.xsl; other.xsl - - refined handling of admonitions - - â— Michael(tm) Smith: lists.xsl - - Use RS/RE in another place where we had IP "" - - â— Michael(tm) Smith: info.xsl - - Replace (ab)use of IP with "sp -1" in AUTHORS section with RS/RE - instead. - - â— Michael(tm) Smith: table.xsl; synop.xsl; info.xsl - - changed all instances of ".sp -1n" to ".sp -1" - - â— Michael(tm) Smith: other.xsl - - add extra line before SH heads only in non-TTY output - - â— Michael(tm) Smith: block.xsl - - Reworked output for admonitions (caution, important, note, tip, - warning). In TTY output, admonitions now get indented. In non-TTY - output, a colored marker (yellow) is displayed next to them. - - â— Michael(tm) Smith: other.xsl - - Added BM/EM macros for putting a colored marker in margin next to - a block of text. - - â— Michael(tm) Smith: utility.xsl - - created make.bold.title template by moving title-bolding part out - from nested-section-title template. This allows the bolding to - also be used by the template for formatting admonitions - - â— Michael(tm) Smith: info.xsl - - put .br before copyright contents to prevent them from getting run in - - â— Michael(tm) Smith: refentry.xsl; other.xsl; utility.xsl - - made point size of output for Refsect2 and Refsect3 heads bigger - - â— Michael(tm) Smith: other.xsl - - put slightly more space between SH head and underline in non-TTY - output - - â— Michael(tm) Smith: param.xweb; param.ent; other.xsl - - Added the man.charmap.subset.profile.english parameter and refined - the handling of charmap subsets to differentiate between English - and non-English source. - - This way charmap subsets are now handled is this: - - If the value of the man.charmap.use.subset parameter is non-zero, - and your DocBook source is not written in English (that is, if its - lang or xml:lang attribute has a value other than en), then the - character-map subset specified by the man.charmap.subset.profile - parameter is used instead of the full roff character map. - - Otherwise, if the lang or xml:lang attribute on the root element - in your DocBook source or on the first refentry element in your - source has the value en or if it has no lang or xml:lang - attribute, then the character-map subset specified by the - man.charmap.subset.profile.english parameter is used instead of - man.charmap.subset.profile. - - The difference between the two subsets is that - man.charmap.subset.profile provides mappings for characters in - Western European languages that are not part of the Roman - (English) alphabet (ASCII character set). - - â— Michael(tm) Smith: other.xsl - - Various updates, mainly related to uppercasing SH titles: - - - added a "Language: " metadata line to the top comment area of - output man pages, to indicate the language the page is in - - - added a "toupper" macro of doing locale-aware uppercasing of - SH titles and cross-references to SH titles; the mechanism - relies on the uppercase.alpha and lowercase.alpha DocBook - gentext keys to do locale-aware uppercasing based on the - language the page is written in - - - added a "string.shuffle" template, which provides a library - function for "shuffling" two strings together into a single - string; it takes the first character for the first string, the - first character from second string, etc. The only current use - for it is to generate the argument for the groff tr request - that does string uppercasing. - - - added make.tr.uppercase.arg and make.tr.normalcase.arg named - templates for use in generating groff code for uppercasing and - "normal"-casing SH titles - - - made the BB/BE "background drawing" macros have effect only in - non-TTY output - - - output a few comments in the top part of source - - â— Michael(tm) Smith: utility.xsl - - removed some leftover kruft - - â— Michael(tm) Smith: refentry.xsl - - To create the name(s) for each man page, we now replace any spaces - in the refname(s) with underscores. This ensures that tools like - lexgrog(1) will be able to parse the name (lexgrog won't parse - names that contain spaces). - - â— Michael(tm) Smith: docbook.xsl - - Put a comment into source of man page to indicate where the main - content starts. (We now have a few of macro definitions at the - start of the source, so putting this comment in helps those that - might be viewing the source.) - - â— Michael(tm) Smith: refentry.xsl - - refined mechanism for generating SH titles - - â— Michael(tm) Smith: charmap.groff.xsl - - Added zcaron, Zcaron, scaron, and Scaron to the groff character map. - This means that generated Finnish man pages will no longer contain - any raw accented characters -- they'll instead by marked up with - groff escapes. - - â— Michael(tm) Smith: other.xsl; utility.xsl - - corrected a regression I introduced about a year ago that caused - dots to be output just as "\." -- instead needs to be "\&." (which - is what it will be now, after this change) - - â— Michael(tm) Smith: refentry.xsl - - Changed backend handling for generating titles for SH sections and - for cross-references to those sections. This should have no effect - on TTY output (behavior should remain the same hopefully) but - results in titles in normal case (instead of uppercase) in PS - output. - - â— Michael(tm) Smith: info.xsl - - use make.subheading template to make subheadings for AUTHORS and - COPYRIGHT sections (instead of harcoding roff markup) - - â— Michael(tm) Smith: block.xsl - - put code font around programlisting etc. - - â— Michael(tm) Smith: synop.xsl; docbook.xsl - - embed custom macro definitions in man pages, plus wrap synopsis in - code font - - â— Michael(tm) Smith: endnotes.xsl - - use the make.subheading template to generated SH subheading for - endnotes section. - - â— Michael(tm) Smith: lists.xsl - - Added some templates for generating if-then-else conditional - markup in groff, so let's use those instead of hard-coding it in - multiple places... - - â— Michael(tm) Smith: other.xsl; utility.xsl - - Initial checkin of some changes related to making PS/PDF output - from "man -l -Tps" look better. The current changes: - - - render synopsis and verbatim sections in a monospace/code font - - - put a light-grey background behind all programlisting, screen, - and literallayout instances - - - prevent SH heads in PS output from being rendered in uppercase - (as they are in console output) - - - also display xrefs to SH heads in PS output in normal case - (instead of uppercase) - - - draw a line under SH heads in PS output - - The changes made to the code to support the above features were: - - - added some embedded/custom macros: one for conditionally - upper-casing SH x-refs, one for redefining the SH macro - itself, with some conditional handling for PS output, and - finally a macro for putting a background/screen (filled box) - around a block of text (e.g., a program listing) in PS output - - - added utility templates for wrapping blocks of text in code - font; also templates for inline code font - - â— Robert Stayton: refentry.xsl - - refpurpose nodes now get apply-templates instead of just normalize-space(). - - â— Michael(tm) Smith: lists.xsl - - Fixed alignment of first lined of text for each listitem in - orderedlist output for TTY. Existing code seemed to have been - causing an extra undesirable space to appear. - - â— Michael(tm) Smith: lists.xsl - - Wrapped some roff conditionals around roff markup for orderedlist - and itemizedlist output, so that the lists look acceptable in PS - output as well as TTY. - - â— Michael(tm) Smith: pi.xsl; synop.xsl; param.xweb; param.ent - - Added the man.funcsynopsis.style parameter. Has the same effect in - manpages output as the funcsynopsis.style parameter has in HTML - output -- except that its default value is 'ansi' instead of 'kr'. - - â— Michael(tm) Smith: synop.xsl - - Reworked handling of K&R funcprototype output. It no longer relies - on the HTML kr-tabular templates, but instead just does direct - transformation to roff. For K&R output, it displays the paramdef - output in an indented list following the prototype. - - â— Michael(tm) Smith: synop.xsl - - Properly integrated handling for K&R output into manpages - stylesheet. The choice between K&R output and ANSI output is - currently controlled through use of the (HTML) funcsynopsis.style - parameter. Note that because the mechanism does currently rely on - funcsynopsis.style, the default in manpages output is now K&R - (because that's the default of that param). But I suppose I ought - to create a man.funcsynopsis.style and make the default for that - ANSI (to preserve the existing default behavior). - - â— Michael(tm) Smith: docbook.xsl - - added manpages/pi.xsl file - - â— Michael(tm) Smith: .cvsignore; pi.xsl - - Added "dbman funcsynopsis-style" PI and incorporated it into the - doc build. - - â— Michael(tm) Smith: refentry.xsl - - Fixed regression that caused an unescaped dash to be output - between refname and refpurpose content. Closes bug #1894244. - Thanks to Daniel Leidert. - - â— Michael(tm) Smith: other.xsl - - Fixed problem with dots being escaped in filenames of generated - man files. Closes #1827195. Thanks to Daniel Leidert. - - â— Michael(tm) Smith: inline.xsl - - Added support for processing structfield (was appearing in roff - output surrounded by HTML <em> tags; fixed so that it gets roff - ital markup). Closes bug #1858329. Thanks to Sam Varshavchik. - -Epub - -The following changes have been made to the epub code since the 1.73.2 release. - - â— Keith Fahlgren: bin/spec/README; bin/spec/epub_realbook_spec.rb - - 'Realbook' spec now passes - - â— Keith Fahlgren: bin/dbtoepub; README; bin/spec/README; bin/lib/docbook.rb; - bin/spec/epub_r⋯ - - Very primitive Windows support for dbtoepub reference implementation; README for running tests and for the .epub target in general; shorter realbook test document (still fails for now) - - â— Keith Fahlgren: bin/dbtoepub; bin/spec/epub_regressions_spec.rb; bin/lib/ - docbook.rb; bin/s⋯ - - Changes to OPF spine to not duplicate idrefs for documents with parts not at the root; regression specs for same - - â— Keith Fahlgren: docbook.xsl - - Fixing linking to cover @id, distinct from other needs of cover-image-id (again, thanks to Martin Goerner) - - â— Keith Fahlgren: docbook.xsl - - Updating the title of the toc element in the guide to be more explicit (thanks to Martin Goerner) - - â— Keith Fahlgren: bin/spec/examples/amasque_exploded/content.opf; bin/spec/ - examples/amasque_⋯ - - Initial checkin/merge of epub target from work provided by Paul Norton of Adobe - and Keith Fahlgren of O'Reilly. - - â— Keith Fahlgren: docbook.xsl - - == General epub test support - - $ spec -O ~/.spec.opts spec/epub_spec.rb - - DocBook::Epub - - should be able to be created - - should fail on a nonexistent file - - should be able to render to a file - - should create a file after rendering - - should have the correct mimetype after rendering - - should be valid .epub after rendering an article - - should be valid .epub after rendering an article without sections - - should be valid .epub after rendering a book - - should be valid .epub after rendering a book even if it has one graphic - - should be valid .epub after rendering a book even if it has many graphics - - should be valid .epub after rendering a book even if it has many duplicated graphics - - should report an empty file as invalid - - should confirm that a valid .epub file is valid - - should not include PDFs in rendered epub files as valid image inclusions - - should include a TOC link in rendered epub files for <book>s - - Finished in 20.608395 seconds - - 15 examples, 0 failures - - - == Verbose epub test coverage against _all_ of the testdocs - - Fails on only (errors truncated): - 1) - 'DocBook::Epub should be able to render a valid .epub for the test document /Users/keith/work/docbook-dev/trunk/xsl/epub/bin/spec/testdocs/calloutlist.003.xml [30]' FAILED - 'DocBook::Epub should be able to render a valid .epub for the test document /Users/keith/work/docbook-dev/trunk/xsl/epub/bin/spec/testdocs/cmdsynopsis.001.xml [35]' FAILED - .... - - Finished in 629.89194 seconds - - 224 examples, 15 failures - - 224 examples, 15 failures yields 6% failure rate - -HTMLHelp - -The following changes have been made to the htmlhelp code since the 1.73.2 -release. - - â— Mauritz Jeanson: htmlhelp-common.xsl - - Added <xsl:with-param name="quiet" select="$chunk.quietly"/> to calls to - the write.chunk, write.chunk.with.doctype, and write.text.chunk templates. - This makes chunk.quietly=1 suppress chunk filename messages also for help - support files (which seems to be what one would expect). See bug #1648360. - -Eclipse - -The following changes have been made to the eclipse code since the 1.73.2 -release. - - â— David Cramer: eclipse.xsl - - Use sortas attributes (if they exist) when sorting indexterms - - â— David Cramer: eclipse.xsl - - Added support for indexterm/see in eclipse index.xml - - â— Mauritz Jeanson: eclipse.xsl - - Added <xsl:with-param name="quiet" select="$chunk.quietly"/> - to helpidx template. - - â— David Cramer: eclipse.xsl - - Generate index.xml file and add related goo to plugin.xml file. Does not yet support see and seealso. - - â— Mauritz Jeanson: eclipse.xsl - - Added <xsl:with-param name="quiet" select="$chunk.quietly"/> to calls to - the write.chunk, write.chunk.with.doctype, and write.text.chunk templates. - This makes chunk.quietly=1 suppress chunk filename messages also for help - support files (which seems to be what one would expect). See bug #1648360. - -JavaHelp - -The following changes have been made to the javahelp code since the 1.73.2 -release. - - â— Mauritz Jeanson: javahelp.xsl - - Added <xsl:with-param name="quiet" select="$chunk.quietly"/> to calls to - the write.chunk, write.chunk.with.doctype, and write.text.chunk templates. - This makes chunk.quietly=1 suppress chunk filename messages also for help - support files (which seems to be what one would expect). See bug #1648360. - -Roundtrip - -The following changes have been made to the roundtrip code since the 1.73.2 -release. - - â— Steve Ball: blocks2dbk.xsl; wordml2normalise.xsl - - fix table/cell borders for wordml, fix formal figure, add emphasis-strong - - â— Mauritz Jeanson: supported.xml - - Changed @cols to 5. - - â— Steve Ball: blocks2dbk.xsl; blocks2dbk.dtd; template.xml - - added pubdate, fixed metadata handling in biblioentry - - â— Steve Ball: supported.xml - - Added support for edition. - - â— Steve Ball: docbook-pages.xsl; wordml-blocks.xsl; docbook.xsl; wordml.xsl; - pages-normalise⋯ - - Removed stylesheets for old, deprecated conversion method. - - â— Steve Ball: specifications.xml; dbk2ooo.xsl; blocks2dbk.xsl; dbk2pages.xsl; - blocks2dbk.dtd⋯ - - Added support for Open Office, added edition element, improved list and table support in Word and Pages - - â— Steve Ball: normalise-common.xsl; blocks2dbk.xsl; dbk2pages.xsl; - template-pages.xml; templ⋯ - - Fixed bug in WordML table handling, improved table handling for Pages 08, synchronised WordML and Pages templates. - - â— Steve Ball: normalise-common.xsl; blocks2dbk.xsl; wordml2normalise.xsl; - dbk2wp.xsl - - fix caption, attributes - - â— Steve Ball: specifications.xml; blocks2dbk.xsl; wordml2normalise.xsl; - blocks2dbk.dtd; temp⋯ - - Fixes to table and list handling - - â— Steve Ball: blocks2dbk.xsl - - added support for explicit emphasis character styles - - â— Steve Ball: wordml2normalise.xsl - - added support for customisation in image handling - - â— Steve Ball: blocks2dbk.xsl - - Added inlinemediaobject support for metadata. - - â— Steve Ball: normalise-common.xsl; blocks2dbk.xsl; template.xml; - dbk2wordml.xsl; dbk2wp.xsl - - Added support file. Added style locking. Conversion bug fixes. - -Slides - -The following changes have been made to the slides code since the 1.73.2 -release. - - â— Michael(tm) Smith: fo/Makefile; html/Makefile - - Added checks and hacks to various makefiles to enable building - under Cygwin. This stuff is ugly and maybe not worth the mess and - trouble, but does seem to work as expected and not break anything - else. - - â— Jirka Kosek: html/plain.xsl - - Added support for showing foil number - -Website - -The following changes have been made to the website code since the 1.73.2 -release. - - â— Michael(tm) Smith: extensions/saxon64/.classes/.gitignore; extensions/ - xalan2/.classes/com/⋯ - - renamed a bunch more .cvsignore files to .gitignore (to facilitate use of git-svn) - -Params - -The following changes have been made to the params code since the 1.73.2 -release. - - â— Keith Fahlgren: epub.autolabel.xml - - New parameter for epub, epub.autolabel - - â— Mauritz Jeanson: table.frame.border.color.xml; table.cell.padding.xml; - table.cell.border.t⋯ - - Added missing refpurposes and descriptions. - - â— Keith Fahlgren: ade.extensions.xml - - Extensions to support Adobe Digital Editions extensions in .epub output. - - â— Mauritz Jeanson: fop.extensions.xml; fop1.extensions.xml - - Clarified that fop1.extensions is for FOP 0.90 and later. Version 1 is not here yet... - - â— Michael(tm) Smith: man.links.are.underlined.xml; - man.endnotes.list.enabled.xml; man.font.l⋯ - - removed man.links.are.underlined and added man.font.links. Also, - changed the default font formatting for links to bold. - - â— Michael(tm) Smith: man.base.url.for.relative.links.xml - - Added new param man.base.url.for.relative.links .. specifies a - base URL for relative links (for ulink, @xlink:href, imagedata, - audiodata, videodata) shown in the generated NOTES section of - man-page output. The value of man.base.url.for.relative.links is - prepended to any relative URI that is a value of ulink url, - xlink:href, or fileref attribute. - - If you use relative URIs in link sources in your DocBook refentry - source, and you leave man.base.url.for.relative.links unset, the - relative links will appear "as is" in the NOTES section of any - man-page output generated from your source. That's probably not - what you want, because such relative links are only usable in the - context of HTML output. So, to make the links meaningful and - usable in the context of man-page output, set a value for - man.base.url.for.relative.links that points - to the online version of HTML output generated from your DocBook - refentry source. For example: - - <xsl:param name="man.base.url.for.relative.links" - >http://www.kernel.org/pub/software/scm/git/docs/</xsl:param> - - â— Michael(tm) Smith: man.string.subst.map.xml - - squeeze .sp\n.sp into a single .sp (to prevent a extra, spurious - line of whitespace from being inserted after programlisting etc. - in certain cases) - - â— Michael(tm) Smith: refentry.manual.fallback.profile.xml; - refentry.source.fallback.profile.⋯ - - don't use refmiscinfo@class=date value as fallback for refentry - "source" or "manual" metadata fields - - â— Michael(tm) Smith: man.charmap.subset.profile.xml; man.charmap.enabled.xml; - man.charmap.su⋯ - - made some further doc tweaks related to the - man.charmap.subset.profile.english param - - â— Michael(tm) Smith: man.charmap.subset.profile.xml; man.charmap.enabled.xml; - man.charmap.su⋯ - - Added the man.charmap.subset.profile.english parameter and refined - the handling of charmap subsets to differentiate between English - and non-English source. - - This way charmap subsets are now handled is this: - - If the value of the man.charmap.use.subset parameter is non-zero, - and your DocBook source is not written in English (that is, if its - lang or xml:lang attribute has a value other than en), then the - character-map subset specified by the man.charmap.subset.profile - parameter is used instead of the full roff character map. - - Otherwise, if the lang or xml:lang attribute on the root element - in your DocBook source or on the first refentry element in your - source has the value en or if it has no lang or xml:lang - attribute, then the character-map subset specified by the - man.charmap.subset.profile.english parameter is used instead of - man.charmap.subset.profile. - - The difference between the two subsets is that - man.charmap.subset.profile provides mappings for characters in - Western European languages that are not part of the Roman - (English) alphabet (ASCII character set). - - â— Michael(tm) Smith: man.charmap.subset.profile.xml - - Added to default charmap used by manpages: - - - the "letters" part of the 'C1 Controls And Latin-1 Supplement - (Latin-1 Supplement)' Unicode block - - Latin Extended-A block (but not all of the characters from - that block have mappings in groff, so some of them are still - passed through as-is) - - The effects of this change are that in man pages generated for - most Western European languages and for Finnish, all characters - not part of the Roman alphabet are (e.g., "accented" characters) - are converted to groff escapes. - - Previously, by default we passed through those characters as is - (and users needed to use the full charmap if they wanted to have - those characters converted). - - As a result of this change, man pages generated for Western - European languages will be viewable in some environments in which - they are not viewable if the "raw" non-Roman characters are in them. - - â— Mauritz Jeanson: generate.legalnotice.link.xml; - generate.revhistory.link.xml - - Added information on how the filename is computed. - - â— Mauritz Jeanson: default.table.width.xml - - Clarified PI usage. - - â— Michael(tm) Smith: man.funcsynopsis.style.xml - - Added the man.funcsynopsis.style parameter. Has the same effect in - manpages output as the funcsynopsis.style parameter has in HTML - output -- except that its default value is 'ansi' instead of 'kr'. - - â— Michael(tm) Smith: funcsynopsis.tabular.threshold.xml - - Removed the funcsynopsis.tabular.threshold param. It's no longer - being used in the code and hasn't been since mid 2006. - - â— Mauritz Jeanson: table.properties.xml - - Set keep-together.within-column to "auto". This seems to be the most sensible - default value for tables. - - â— Mauritz Jeanson: informal.object.properties.xml; - admon.graphics.extension.xml; informalequ⋯ - - Several small documentation fixes. - - â— Mauritz Jeanson: manifest.in.base.dir.xml - - Wording fixes. - - â— Mauritz Jeanson: header.content.properties.xml; - footer.content.properties.xml - - Added refpurpose. - - â— Mauritz Jeanson: ulink.footnotes.xml; ulink.show.xml - - Updated for DocBook 5. - - â— Mauritz Jeanson: index.method.xml; glossterm.auto.link.xml - - Spelling and wording fixes. - - â— Mauritz Jeanson: callout.graphics.extension.xml - - Clarifed available graphics formats and extensions. - - â— Mauritz Jeanson: footnote.sep.leader.properties.xml - - Corrected refpurpose. - - â— Jirka Kosek: footnote.properties.xml - - Added more properties which make it possible to render correctly footnotes placed inside verbatim elements. - - â— Mauritz Jeanson: img.src.path.xml - - img.src.path works with inlinegraphic too. - - â— Mauritz Jeanson: saxon.character.representation.xml - - Added TCG link. - - â— Mauritz Jeanson: img.src.path.xml - - Updated description of img.src.path. Bug #1785224 revealed that - there was a risk of misunderstanding how it works. - -Profiling - -The following changes have been made to the profiling code since the 1.73.2 -release. - - â— Jirka Kosek: xsl2profile.xsl - - Added new rules to profile all content generated by HTML Help (including alias files) - - â— Robert Stayton: profile-mode.xsl - - use mode="profile" instead of xsl:copy-of for attributes so - they can be more easily customized. - -Tools - -The following changes have been made to the tools code since the 1.73.2 -release. - - â— Michael(tm) Smith: make/Makefile.DocBook - - various changes and additions to support making with asciidoc as - an input format - - â— Michael(tm) Smith: make/Makefile.DocBook - - make dblatex the default PDF maker for the example makefile - - â— Michael(tm) Smith: xsl/build/html2roff.xsl - - Reworked handling of K&R funcprototype output. It no longer relies - on the HTML kr-tabular templates, but instead just does direct - transformation to roff. For K&R output, it displays the paramdef - output in an indented list following the prototype. - - â— Mauritz Jeanson: xsl/build/make-xsl-params.xsl - - Made attribute-sets members of the param list. This enables links to attribute-sets in the - reference documentation. - - â— Michael(tm) Smith: xsl/build/html2roff.xsl - - use .BI handling in K&R funsynopsis output for manpages, just as - we do already of ANSI output - - â— Michael(tm) Smith: xsl/build/html2roff.xsl - - Implemented initial support for handling tabular K&R output of - funcprototype in manpages output. Accomplished by adding more - templates to the intermediate HTML-to-roff stylesheet that the - build uses to create the manpages/html-synop.xsl stylesheet. - - â— Michael(tm) Smith: xsl/build/doc-link-docbook.xsl - - Made the xsl/tools/xsl/build/doc-link-docbook.xsl stylesheet - import profile-docbook.xsl, so that we can do profiling of release - notes. Corrected some problems in the target for the release-notes - HTML build. - -Extensions - -The following changes have been made to the extensions code since the 1.73.2 -release. - - â— Keith Fahlgren: Makefile - - Use DOCBOOK_SVN variable everywhere, please; build with PDF_MAKER - - â— Michael(tm) Smith: Makefile - - moved extensions build targets from master xsl/Makefile to - xsl/extensions/Makefile - - â— Michael(tm) Smith: .cvsignore - - re-adding empty extensions subdir - -XSL-Saxon - -The following changes have been made to the xsl-saxon code since the 1.73.2 -release. - - â— Michael(tm) Smith: VERSION - - bring xsl2, xsl-saxon, and xsl-xalan VERSION files up-to-date with - recent change to snapshot build infrastructure - - â— Michael(tm) Smith: nbproject/build-impl.xml; nbproject/project.properties - - Changed hard-coded file references in "clean" target to variable - references. Closes #1792043. Thanks to Daniel Leidert. - - â— Michael(tm) Smith: VERSION; Makefile - - Did post-release wrap-up of xsl-saxon and xsl-xalan dirs - - â— Michael(tm) Smith: nbproject/build-impl.xml; VERSION; Makefile; test - - More tweaks to get release-ready - -XSL-Xalan - -The following changes have been made to the xsl-xalan code since the 1.73.2 -release. - - â— Michael(tm) Smith: VERSION - - bring xsl2, xsl-saxon, and xsl-xalan VERSION files up-to-date with - recent change to snapshot build infrastructure - - â— Michael(tm) Smith: nbproject/build-impl.xml - - Changed hard-coded file references in "clean" target to variable - references. Closes #1792043. Thanks to Daniel Leidert. - - â— Michael(tm) Smith: Makefile; VERSION - - Did post-release wrap-up of xsl-saxon and xsl-xalan dirs - - â— Michael(tm) Smith: Makefile; nbproject/build-impl.xml; VERSION - - More tweaks to get release-ready - -XSL-libxslt - -The following changes have been made to the xsl-libxslt code since the 1.73.2 -release. - - â— Mauritz Jeanson: python/xslt.py - - Print the result to stdout if no outfile has been given. - Some unnecessary semicolons removed. - - â— Mauritz Jeanson: python/xslt.py - - Added a function that quotes parameter values (to ensure that they are interpreted as strings). - Replaced deprecated functions from the string module with string methods. - - â— Michael(tm) Smith: python/README; python/README.LIBXSLT - - renamed xsl-libxslt/python/README to xsl-libxslt/python/README.LIBXSLT - - â— Mauritz Jeanson: python/README - - Tweaked the text a little. - -Release Notes: 1.73.2 - -This is solely a minor bug-fix update to the 1.73.1 release. It fixes a -packaging error in the 1.73.1 package, as well as a bug in footnote handling in -FO output. - -Release: 1.73.1 - -This is mostly a bug-fix update to the 1.73.0 release. - -Gentext - -The following changes have been made to the gentext code since the 1.73.0 -release. - - â— Mauritz Jeanson: locale/de.xml - - Applied patch #1766009. - - â— Michael(tm) Smith: locale/lv.xml - - Added localization for ProductionSet. - -FO - -The following changes have been made to the fo code since the 1.73.0 release. - - â— Mauritz Jeanson: table.xsl - - Modified the tgroup template so that, for tables with multiple tgroups, - a width attribute is output on all corresponding fo:tables. Previously, - there was a test prohibiting this (and a comment saying that outputting more - than one width attribute will cause an error). But this seems to be no longer - relevant; it is not a problem with FOP 0.93 or XEP 4.10. Closes bug #1760559. - - â— Mauritz Jeanson: graphics.xsl - - Replaced useless <a> elements with warning messages (textinsert extension). - - â— Mauritz Jeanson: admon.xsl - - Enabled generation of ids (on fo:wrapper) for indexterms in admonition titles, so that page - references in the index can be created. Closes bug #1775086. - -HTML - -The following changes have been made to the html code since the 1.73.0 release. - - â— Mauritz Jeanson: titlepage.xsl - - Added <xsl:call-template name="process.footnotes"/> to abstract template - so that footnotes in info/abstract are processed. Closes bug #1760907. - - â— Michael(tm) Smith: pi.xsl; synop.xsl - - Changed handling of HTML output for the cmdsynopsis and - funcsynopsis elements, such that a@id instances are generated for - them if they are descendants of any element containing a dbcmdlist - or dbfunclist PI. Also, update the embedded reference docs for the - dbcmdlist and dbfunclist PIs to make it clear that they can be - used within any element for which cmdsynopsis or funcsynopsis are - valid children. - - â— Michael(tm) Smith: formal.xsl - - Reverted the part of revision 6952 that caused a@id anchors to be - generated for output of informal objects. Thanks to Sam Steingold - for reporting. - - â— Robert Stayton: glossary.xsl - - Account for a glossary with no glossdiv or glossentry children. - - â— Mauritz Jeanson: titlepage.xsl - - Modified legalnotice template so that the base.name parameter is calculated - in the same way as for revhistory chunks. Using <xsl:apply-templates - mode="chunk-filename" select="."/> did not work for single-page output since - the template with that mode is in chunk-code.xsl. - - â— Mauritz Jeanson: graphics.xsl - - Updated support for SVG (must be a child of imagedata in DB 5). - Added support for MathML in imagedata. - - â— Mauritz Jeanson: pi.xsl - - Added documentation for the dbhh PI (used for context-sensitive HTML Help). - (The two templates matching 'dbhh' are still in htmlhelp-common.xsl). - -Manpages - -The following changes have been made to the manpages code since the 1.73.0 -release. - - â— Michael(tm) Smith: endnotes.xsl - - In manpages output, generate warnings about notesources with - non-para children only if the notesource is a footnote or - annotation. Thanks to Sam Steingold for reporting problems with - the existing handling. - -HTMLHelp - -The following changes have been made to the htmlhelp code since the 1.73.0 -release. - - â— Michael(tm) Smith: htmlhelp-common.xsl - - Added single-pass namespace-stripping support to the htmlhelp, - eclipse, and javahelp stylesheets. - -Eclipse - -The following changes have been made to the eclipse code since the 1.73.0 -release. - - â— Michael(tm) Smith: eclipse.xsl - - Added single-pass namespace-stripping support to the htmlhelp, - eclipse, and javahelp stylesheets. - -JavaHelp - -The following changes have been made to the javahelp code since the 1.73.0 -release. - - â— Michael(tm) Smith: javahelp.xsl - - Added single-pass namespace-stripping support to the htmlhelp, - eclipse, and javahelp stylesheets. - -Roundtrip - -The following changes have been made to the roundtrip code since the 1.73.0 -release. - - â— Steve Ball: blocks2dbk.xsl; blocks2dbk.dtd; pages2normalise.xsl - - Modularised blocks2dbk to allow customisation, - Added support for tables to pages2normalise - -Params - -The following changes have been made to the params code since the 1.73.0 -release. - - â— Robert Stayton: procedure.properties.xml - - procedure was inheriting keep-together from formal.object.properties, but - a procedure does not need to be kept together by default. - - â— Dave Pawson: title.font.family.xml; - component.label.includes.part.label.xml; table.frame.b⋯ - - Regular formatting re-org. - -Release: 1.73.0 - -This release includes important bug fixes and adds the following significant -feature changes: - -New localizations and localization updates - - We added two new localizations: Latvian and Esperanto, and made updates to - the Czech, Chinese Simplified, Mongolian, Serbian, Italian, and Ukrainian - localizations. - -ISO690 citation style for bibliography output. - - Set the bibliography.style parameter to iso690 to use ISO690 style. - -New documentation for processing instructions (PI) - - The reference documentation that ships with the release now includes - documentation on all PIs that you can use to control output from the - stylesheets. - -New profiling parameters for audience and wordsize - - You can now do profiling based on the values of the audience and wordsize - attributes. - -Changes to man-page output - - The manpages stylesheet now supports single-pass profiling and single-pass - DocBook 5 namespace stripping (just as the HTML and FO stylesheets also - do). Also, added handling for mediaobject & inlinemediaobject. (Each - imagedata, audiodata, or videodata element within a mediaobject or inline - mediaobject is now treated as a "notesource" and so handled in much the - same way as links and annotation/alt/footnote are in manpages output.) And - added the man.authors.section.enabled and man.copyright.section.enabled - parameters to enable control over whether output includes auto-generated - AUTHORS and COPYRIGHT sections. - -Highlighting support for C - - The highlighting mechanism for generating syntax-highlighted code snippets - in output now supports C code listings (along with Java, PHP, XSLT, and - others). - -Experimental docbook-xsl-update script - - We added an experimental docbook-xsl-update script, the purpose of which is - to facilitate easy sync-up to the latest docbook-xsl snapshot (by means of - rsync). - -Gentext - -The following changes have been made to the gentext code since the 1.72.0 -release. - - â— Michael(tm) Smith: locale/lv.xml; Makefile - - Added Latvian localization file, from Girts Ziemelis. - - â— Dongsheng Song: locale/zh_cn.xml - - Brought up to date with en.xml in terms of items. A few strings marked for translation. - - â— Jirka Kosek: locale/cs.xml - - Added missing translations - - â— Robert Stayton: locale/eo.xml - - New locale for Esperanto. - - â— Robert Stayton: locale/mn.xml - - Update from Ganbold Tsagaankhuu. - - â— Jirka Kosek: locale/en.xml; locale/cs.xml - - Rules for normalizing glossary entries before they are sorted can be now different for each language. - - â— Michael(tm) Smith: locale/sr_Latn.xml; locale/sr.xml - - Committed changes from MiloÅ¡ KomarÄević to Serbian files. - - â— Robert Stayton: locale/ja.xml - - Fix chapter in context xref-number-and-title - - â— Robert Stayton: locale/it.xml - - Improved version from contributor. - - â— Mauritz Jeanson: locale/uk.xml - - Applied patch 1592083. - -Common - -The following changes have been made to the common code since the 1.72.0 -release. - - â— Michael(tm) Smith: labels.xsl - - Changed handling of reference auto-labeling such that reference - (when it appears at the component level) is now affected by the - label.from.part param, just as preface, chapter, and appendix. - - â— Michael(tm) Smith: common.xsl - - Added support to the HTML stylesheets for proper processing of - orgname as a child of author. - - â— Michael(tm) Smith: refentry.xsl - - Refined logging output of refentry metadata-gathering template; - for some cases of "missing" elements (refmiscinfo stuff, etc.), - the log messages now include URL to corresponding page in the - Definitive Guide (TDG). - - â— Robert Stayton: titles.xsl - - Add refsection/info/title support. - - â— Michael(tm) Smith: titles.xsl - - Added support for correct handling of xref to elements that - contain info/title descendants but no title children. - - This should be further refined so that it handles any *info - elements. And there are probably some other places where similar - handling for *info/title should be added. - - â— Mauritz Jeanson: pi.xsl - - Modified <xsl:when> in datetime.format template to work - around Xalan bug. - -FO - -The following changes have been made to the fo code since the 1.72.0 release. - - â— Robert Stayton: component.xsl - - Add parameters to the page.sequence utility template. - - â— Mauritz Jeanson: xref.xsl - - Added template for xref to area/areaset. - Part of fix for bug #1675513 (xref to area broken). - - â— Michael(tm) Smith: inline.xsl - - Added template match for person element to fo stylesheet. - - â— Robert Stayton: lists.xsl - - Added support for spacing="compact" in variablelist, per bug report #1722540. - - â— Robert Stayton: table.xsl - - table pgwide="1" should also use pgwide.properties attribute-set. - - â— Mauritz Jeanson: inline.xsl - - Make citations numbered if bibliography.numbered != 0. - - â— Robert Stayton: param.xweb; param.ent - - Add new profiling parameters for audience and wordsize. - - â— Robert Stayton: param.xweb; param.ent - - Added callout.icon.size parameter. - - â— Robert Stayton: inline.xsl; xref.xsl - - Add support for xlink as olink. - - â— Robert Stayton: autotoc.xsl; param.xweb; param.ent - - Add support for qanda.in.toc to fo TOC. - - â— Robert Stayton: component.xsl - - Improved the page.sequence utility template for use with book. - - â— Robert Stayton: division.xsl - - Refactored the big book template into smaller pieces. - Used the "page.sequence" utility template in - component.xsl to shorten the toc piece. - Added placeholder templates for front.cover and back.cover. - - â— Robert Stayton: param.xweb; param.ent; sections.xsl - - Add section.container.element parameter to enable - pgwide spans inside sections. - - â— Robert Stayton: param.xweb; param.ent; component.xsl - - Add component.titlepage.properties attribute-set to - support span="all" and other properties. - - â— Robert Stayton: htmltbl.xsl; table.xsl - - Apply table.row.properties template to html tr rows too. - Add keep-with-next to table.row.properties when row is in thead. - - â— Robert Stayton: table.xsl - - Add support for default.table.frame parameter. - Fix bug 1575446 rowsep last check for @morerows. - - â— Robert Stayton: refentry.xsl - - Add support for info/title in refsections. - - â— David Cramer: qandaset.xsl - - Make fo questions and answers behave the same way as html - - â— Jirka Kosek: lists.xsl - - Added missing attribute set for procedure - - â— Jirka Kosek: param.xweb; biblio.xsl; docbook.xsl; param.ent; - biblio-iso690.xsl - - Added support for formatting biblioentries according to ISO690 citation style. - New bibliography style can be turned on by setting parameter bibliography.style to "iso690" - The code was provided by Jana Dvorakova - - â— Robert Stayton: param.xweb; param.ent; pagesetup.xsl - - Add header.table.properties and footer.table.properties attribute-sets. - - â— Robert Stayton: inline.xsl - - Add fop1.extensions for menuchoice arrow handling exception. - -HTML - -The following changes have been made to the html code since the 1.72.0 release. - - â— Mauritz Jeanson: param.xweb; param.ent - - Moved declaration and documentation of javahelp.encoding from javahelp.xsl to the - regular "parameter machinery". - - â— Michael(tm) Smith: admon.xsl - - Changed handling of titles for note, warning, caution, important, - tip admonitions: We now output and HTML h3 head only if - admon.textlabel is non-zero or if the admonition actually contains - a title; otherwise, we don't output an h3 head at all. - (Previously, we were outputting an empty h3 if the admon.textlabel - was zero and if the admonition had no title.) - - â— Mauritz Jeanson: xref.xsl - - Added template for xref to area/areaset. - Part of fix for bug #1675513 (xref to area broken). - - â— Mauritz Jeanson: titlepage.xsl; component.xsl; division.xsl; sections.xsl - - Added fixes to avoid duplicate ids when generate.id.attributes = 1. - This (hopefully) closes bug #1671052. - - â— Michael(tm) Smith: formal.xsl; pi.xsl - - Made the dbfunclist PI work as intended. Also added doc for - dbfunclist and dbcmdlist PIs. - - â— Michael(tm) Smith: pi.xsl; synop.xsl - - Made the dbcmdlist work the way it appears to have been intended - to work. Restored dbhtml-dir template back to pi.xsl. - - â— Michael(tm) Smith: titlepage.xsl; param.xweb; param.ent - - Added new param abstract.notitle.enabled. - If non-zero, in output of the abstract element on titlepages, - display of the abstract title is suppressed. - Because sometimes you really don't want or need that title - there... - - â— Michael(tm) Smith: chunk-code.xsl; graphics.xsl - - When we are chunking long descriptions for mediaobject instances - into separate HTML output files, and use.id.as.filename is - non-zero, if a mediaobject has an ID, use that ID as the basename - for the long-description file (otherwise, we generate an ID for it - and use that ID as the basename for the file). - The parallels the recent change made to cause IDs for legalnotice - instances to be used as basenames for legalnotice chunks. - Also, made some minor refinements to the recent changes for - legalnotice chunk handling. - - â— Michael(tm) Smith: titlepage.xsl - - Added support to the HTML stylesheets for proper processing of - orgname as a child of author. - - â— Michael(tm) Smith: chunk-code.xsl - - When $generate.legalnotice.link is non-zero and - $use.id.as.filename is also non-zero, if a legalnotice has an ID, - then instead of assigning the "ln-<generatedID>" basename to the - output file for that legalnotice, just use its real ID as the - basename for the file -- as we do when chunking other elements - that have IDs. - - â— David Cramer: xref.xsl - - Handle alt text on xrefs to steps when the step doesn't have a title. - - â— David Cramer: lists.xsl - - Added <p> element around term in variablelist when formatted as table to avoid misalignment of term and listitem in xhtml (non-quirks mode) output - - â— David Cramer: qandaset.xsl - - Added <p> element around question and answer labels to avoid misalignment of label and listitem in xhtml (non-quirks mode) output - - â— David Cramer: lists.xsl - - Added <p> element around callouts to avoid misalignment of callout and listitem in xhtml (non-quirks mode) output - - â— Mauritz Jeanson: inline.xsl - - Make citations numbered if bibliography.numbered != 0. - - â— Robert Stayton: param.xweb; param.ent - - Add support for new profiling attributes audience and wordsize. - - â— Robert Stayton: inline.xsl; xref.xsl - - Add support for xlink olinks. - - â— Jirka Kosek: glossary.xsl - - Rules for normalizing glossary entries before they are sorted can be now different for each language. - - â— Robert Stayton: chunk-common.xsl; chunk-code.xsl; manifest.xsl; chunk.xsl - - Refactored the chunking modules to move all named templates to - chunk-common.xsl and all match templates to chunk-code.xsl, in - order to enable better chunk customization. - See the comments in chunk.xsl for more details. - - â— Robert Stayton: lists.xsl - - Add anchor for xml:id for listitem in varlistentry. - - â— Robert Stayton: refentry.xsl - - Add support for info/title in refsections for db5. - - â— Jirka Kosek: param.xweb; biblio.xsl; docbook.xsl; param.ent; - biblio-iso690.xsl - - Added support for formatting biblioentries according to ISO690 citation style. - New bibliography style can be turned on by setting parameter bibliography.style to "iso690" - The code was provided by Jana Dvorakova - - â— Robert Stayton: inline.xsl; xref.xsl - - Add call to class.attribute to <a> output elements so they can - have a class value too. - - â— Mauritz Jeanson: glossary.xsl - - Fixed bug #1644881: - * Added curly braces around all $language attribute values. - * Moved declaration of language variable to top level of stylesheet. - Tested with Xalan, Saxon, and xsltproc. - -Manpages - -The following changes have been made to the manpages code since the 1.72.0 -release. - - â— Michael(tm) Smith: param.xweb; docbook.xsl; param.ent - - Added the man.authors.section.enabled and - man.copyright.section.enabled parameters. Set those to zero when - you want to suppress display of the auto-generated AUTHORS and - COPYRIGHT sections. Closes request #1467806. Thanks to Daniel - Leidert. - - â— Michael(tm) Smith: docbook.xsl - - Took the test that the manpages stylesheet does to see if there - are any Refentry chilren in current doc, and made it - namespace-agnostic. Reason for that is because the test otherwise - won't work when it is copied over into the generated - profile-docbook.xsl stylesheet. - - â— Michael(tm) Smith: Makefile - - Added a manpages/profile-docbook.xsl file to enable single-pass - profiling for manpages output. - - â— Michael(tm) Smith: info.xsl - - Output copyright and legalnotice in man-page output in whatever - place they are in in document order. Closes #1690539. Thanks to - Daniel Leidert for reporting. - - â— Michael(tm) Smith: docbook.xsl - - Restored support for single-pass namespace stripping to manpages - stylesheet. - - â— Michael(tm) Smith: synop.xsl; block.xsl; info.xsl; inline.xsl; lists.xsl; - endnotes.xsl; ut⋯ - - Changed handling of bold and italic/underline output in manpages - output. Should be transparent to users, but... - - This touches handling of all bold and italic/underline output. The - exact change is that the mode="bold" and mode="italic" utility - templates were changed to named templates. (I think maybe I've - changed it back and forth from mode to named before, so this is - maybe re-reverting it yet again). - - Anyway, the reason for the change is that the templates are - sometimes call on dynamically node-sets, and using modes to format - those doesn't allow passing info about the current/real context - node from the source (not the node-set created by the stylesheet) - to that formatting stage. - - The named templates allow the context to be passed in as a - parameter, so that the bold/ital formatting template can use - context-aware condition checking. - - This was basically necessary in order to suppress bold formatting - in titles, which otherwise gets screwed up because of the numbnut - way that roff handles nested bold/ital. - - Closes #1674534). Much thanks to Daniel Leidert, whose in his - docbook-xsl bug-finding kung-fu has achieved Grand Master status. - - â— Michael(tm) Smith: block.xsl - - Fixed handling of example instances by adding the example element - to the same template we use for processing figure. Closes - #1674538. Thanks to Daniel Leidert. - - â— Michael(tm) Smith: utility.xsl - - Don't include lang in manpages filename/pathname if lang=en (that - is, only generate lang-qualified file-/pathnames for non-English). - - â— Michael(tm) Smith: endnotes.xsl - - In manpages output, emit warnings for notesources (footnote, etc.) - that have something other than para as a child. - - The numbered-with-hanging-indent formatting that's used for - rendering endnotes in the NOTES section of man pages places some - limits/assumptions on how the DocBook source is marked up; namely, - for notesources (footnote, annotation, etc.) that can contain - block-level children, if the they have a block-level child such as - a table or itemizedlist or orderedlist that is the first child of - a footnote, we have no way of rendering/indenting its content - properly in the endnotes list. - - Thus, the manpages stylesheet not emits a warning message for that - case, and suggests the "fix" (which is to wrap the table or - itemizedlist or whatever in a para that has some preferatory text. - - â— Michael(tm) Smith: utility.xsl - - Added support to mixed-block template for handling tables in - mixed-blocks (e.g., as child of para) correctly. - - â— Michael(tm) Smith: table.xsl; synop.xsl; block.xsl; info.xsl; lists.xsl; - refentry.xsl; end⋯ - - Reverted necessary escaping of backslash, dot, and dash - out of the well-intentioned (but it now appears, - misguided) "marker" mechanism (introduced in the 1.72.0 - release) -- which made use of alternative "marker" - characters as internal representations of those - characters, and then replaced them just prior to - serialization -- and back into what's basically the - system that was used prior to the 1.69.0 release; that - is, into a part of stylesheet code that gets executed - at the beginning of processing -- before any other roff - markup up is. This change obviates the need for the - marker system. It also requires a lot less RAM during - processing (for large files, the marker mechanism - ending up requiring gigabytes of memory). - - Closes bug #1661177. Thanks to Scott Smedley for - providing a test case (the fvwm man page) that exposed - the problem with the marker mechanism. - - Also moved the mechanism for converting non-breaking - spaces back into the same area of the stylesheet code. - - â— Michael(tm) Smith: lists.xsl - - Fixed problem with incorrect formatting of nested variablelist. - Closes bug #1650931. Thanks to Daniel "Eagle Eye" Leidert. - - â— Michael(tm) Smith: lists.xsl - - Make sure that all listitems in itemizedlist and orderedlist are - preceded by a blank line. This fixes a regression that occurred - when instances of the TP macro that were use in a previous - versions of the list-handling code were switched to RS/RE (because - TP doesn't support nesting). TP automatically generates a blank - line, but RS doesn't. So I added a .sp before each .RS - - â— Michael(tm) Smith: block.xsl; inline.xsl; param.xweb; docbook.xsl; - links.xsl; param.ent - - Made a number of changes related to elements with - out-of-line content: - - - Added handling for mediaobject & inlinemediaobject. - Each imagedata, audiodata, or videodata element - within a mediaobject or inline mediaobject is now - treated as a "notesource" and so handled in much the - same way as links and annotation/alt/footnotes. - - That means a numbered marker is generated inline to - mark the place in the main flow where the imagedata, - audiodata, or videodata element occurs, and a - corresponding numbered endnote for it is generated in - the endnotes list at the end of the man page; the - endnote contains the URL from the fileref attribute - of the imagedata, audiodata, or videodata element. - - For mediobject and inlinemediaobject instances that - have a textobject child, the textobject is displayed - within the main text flow. - - - Renamed several man.link.* params to man.endnotes.*, - to reflect that fact that the endnotes list now - contains more than just links. Also did similar - renaming for a number of stylesheet-internal vars. - - - Added support for xlink:href (along with existing - support for the legacy ulink element). - - - Cleaned up and streamlined the endnotes-handling - code. It's still messy and klunky and the basic - mechanism it uses is very inefficent for documents - that contain a lot of notesources, but at least it's - a bit better than it was. - -Eclipse - -The following changes have been made to the eclipse code since the 1.72.0 -release. - - â— Mauritz Jeanson: Makefile - - Fixed bug #1715093: Makefile for creating profiled version of eclipse.xsl added. - - â— David Cramer: eclipse.xsl - - Added normalize-space around to avoid leading whitespace from appearing in the output if there's extra leading whitespace (e.g. <title> Foo) in the source - -JavaHelp - -The following changes have been made to the javahelp code since the 1.72.0 -release. - - â— Mauritz Jeanson: javahelp.xsl - - Implemented FR #1230233 (sorted index in javahelp). - - â— Mauritz Jeanson: javahelp.xsl - - Added normalize-space() around titles and index entries to work around whitespace problems. - Added support for glossary and bibliography in toc and map files. - -Roundtrip - -The following changes have been made to the roundtrip code since the 1.72.0 -release. - - â— Steve Ball: blocks2dbk.xsl; wordml2normalise.xsl; normalise2sections.xsl; - sections2blocks.⋯ - - new stylesheets for better word processor support and easier maintenance - - â— Steve Ball: template-pages.xml; dbk2wp.xsl; sections-spec.xml - - fixed bugs - -Params - -The following changes have been made to the params code since the 1.72.0 -release. - - â— Mauritz Jeanson: htmlhelp.button.back.xml; htmlhelp.button.forward.xml; - htmlhelp.button.zo⋯ - - Modified refpurpose text. - - â— Mauritz Jeanson: htmlhelp.map.file.xml; htmlhelp.force.map.and.alias.xml; - htmlhelp.alias.f⋯ - - Fixed typos, made some small changes. - - â— Mauritz Jeanson: javahelp.encoding.xml - - Moved declaration and documentation of javahelp.encoding from javahelp.xsl to the - regular "parameter machinery". - - â— Mauritz Jeanson: generate.id.attributes.xml - - Added refpurpose text. - - â— Mauritz Jeanson: annotation.js.xml; annotation.graphic.open.xml; - annotation.graphic.close.⋯ - - Added better refpurpose texts. - - â— Michael(tm) Smith: chunker.output.cdata-section-elements.xml; - chunker.output.standalone.xm⋯ - - Fixed some broken formatting in source files for chunker.* params, - as pointed out by Dave Pawson. - - â— Michael(tm) Smith: label.from.part.xml - - Changed handling of reference auto-labeling such that reference - (when it appears at the component level) is now affected by the - label.from.part param, just as preface, chapter, and appendix. - - â— Mauritz Jeanson: callout.graphics.extension.xml - - Clarified that 'extension' refers to file names. - - â— Michael(tm) Smith: abstract.notitle.enabled.xml - - Added new param abstract.notitle.enabled. - If non-zero, in output of the abstract element on titlepages, - display of the abstract title is suppressed. - Because sometimes you really don't want or need that title - there... - - â— Michael(tm) Smith: man.string.subst.map.xml - - Updated manpages string-substitute map to reflect fact that - because of another recent change to suppress bold markup in .SH - output, we no longer need to add a workaround for the accidental - uppercasing of roff escapes that occurred previously. - - â— Jirka Kosek: margin.note.float.type.xml; title.font.family.xml; - table.frame.border.color.x⋯ - - Improved parameter metadata - - â— Robert Stayton: profile.wordsize.xml; profile.audience.xml - - Add support for profiling on new attributes audience and wordsize. - - â— Robert Stayton: callout.graphics.number.limit.xml; - callout.graphics.extension.xml - - Added SVG graphics for fo output. - - â— Robert Stayton: callout.icon.size.xml - - Set size of callout graphics. - - â— Jirka Kosek: default.units.xml; chunker.output.method.xml; - toc.list.type.xml; output.inden⋯ - - Updated parameter metadata to the new format. - - â— Jirka Kosek: man.output.quietly.xml; title.font.family.xml; - footnote.sep.leader.properties⋯ - - Added type annotations into parameter definition files. - - â— Robert Stayton: section.container.element.xml - - Support spans in sections for certain processors. - - â— Robert Stayton: component.titlepage.properties.xml - - Empty attribute set for top level component titlepage block. - Allows setting a span on title info. - - â— Jirka Kosek: bibliography.style.xml - - Added link to WiKi page with description of special markup needed for ISO690 biblioentries - - â— Robert Stayton: make.year.ranges.xml - - Clarify that multiple year elements are required. - - â— Robert Stayton: id.warnings.xml - - Turn off id.warnings by default. - - â— Jirka Kosek: bibliography.style.xml - - Added support for formatting biblioentries according to ISO690 citation style. - New bibliography style can be turned on by setting parameter bibliography.style to "iso690" - The code was provided by Jana Dvorakova - - â— Robert Stayton: header.table.properties.xml; footer.table.properties.xml - - Support adding table properties to header and footer tables. - -Highlighting - -The following changes have been made to the highlighting code since the 1.72.0 -release. - - â— Jirka Kosek: c-hl.xml; xslthl-config.xml - - Added support for C language. Provided by Bruno Guegan. - -Profiling - -The following changes have been made to the profiling code since the 1.72.0 -release. - - â— Robert Stayton: profile-mode.xsl - - Add support for new profiling attributes audience and wordsize. - -Lib - -The following changes have been made to the lib code since the 1.72.0 release. - - â— Michael(tm) Smith: lib.xweb - - Changed name of prepend-pad template to pad-string and twheeked so - it can do both right/left padding. - -Tools - -The following changes have been made to the tools code since the 1.72.0 -release. - - â— Michael(tm) Smith: bin; bin/docbook-xsl-update - - Did some cleanup to the install.sh source and added a - docbook-xsl-update script to the docbook-xsl distro, the purpose - of which is to facilitate easy sync-up to the latest docbook-xsl - snapshot (by means of rsync). - -XSL-Saxon - -The following changes have been made to the xsl-saxon code since the 1.72.0 -release. - - â— Mauritz Jeanson: xalan27/src/com/nwalsh/xalan/Verbatim.java; xalan27/src/ - com/nwalsh/xalan/⋯ - - Added modifications so that the new callout.icon.size parameter is taken into account. This - parameter is used for FO output (where SVG now is the default graphics format for callouts). - - â— Mauritz Jeanson: saxon65/src/com/nwalsh/saxon/FormatCallout.java; xalan27/ - src/com/nwalsh/x⋯ - - Added code for generating id attributes on callouts in HTML and FO output. - These patches enable cross-references to callouts placed by area coordinates. - It works for graphic, unicode and text callouts. - Part of fix for bug #1675513 (xref to area broken). - - â— Michael(tm) Smith: saxon65/src/com/nwalsh/saxon/Website.java; xalan27/src/ - com/nwalsh/xalan⋯ - - Copied over Website XSL Java extensions. - -XSL-Xalan - -The following changes have been made to the xsl-xalan code since the 1.72.0 -release. - - â— Michael(tm) Smith: Makefile; xalan2 - - Turned off xalan2.jar build. This removes DocBook XSL - Java extensions support for versions of Xalan prior to - Xalan 2.7. If you are currently using the extensions - with an earlier version of Xalan, you need to upgrade - to Xalan 2.7. - - â— Mauritz Jeanson: xalan27/src/com/nwalsh/xalan/Verbatim.java; xalan27/src/ - com/nwalsh/xalan/⋯ - - Added modifications so that the new callout.icon.size parameter is taken into account. This - parameter is used for FO output (where SVG now is the default graphics format for callouts). - - â— Mauritz Jeanson: saxon65/src/com/nwalsh/saxon/FormatCallout.java; xalan27/ - src/com/nwalsh/x⋯ - - Added code for generating id attributes on callouts in HTML and FO output. - These patches enable cross-references to callouts placed by area coordinates. - It works for graphic, unicode and text callouts. - Part of fix for bug #1675513 (xref to area broken). - - â— Michael(tm) Smith: saxon65/src/com/nwalsh/saxon/Website.java; xalan27/src/ - com/nwalsh/xalan⋯ - - Copied over Website XSL Java extensions. - -Release: 1.72.0 - -This release includes important bug fixes and adds the following significant -feature changes: - -Automatic sorting of glossary entries - - The HTML and FO stylesheets now support automatic sorting of glossary - entries. To enable glossary sorting, set the value of the glossary.sort - parameter to 1 (by default, it’s value is 0). When you enable glossary - sorting, glossentry elements within a glossary, glossdiv, or glosslist are - sorted on the glossterm, using the current language setting. If you don’t - enable glossary sorting, then the order of glossentry elements is left “as - is†— that is, they are not sorted but are instead just displayed in - document order. - -WordML renamed to Roundtrip, OpenOffice support added - - Stylesheets for “roundtrip†conversion between documents in OpenOffice - format (ODF) and DocBook XML have been added to the set of stylesheets that - formerly had the collective title WordML, and that set of stylesheets has - been renamed to Roundtrip to better reflect the actual scope and purpose of - its contents. - - So the DocBook XSL Stylesheets now support roundtrip conversion (with - certain limitations) of WordML, OpenOffice, and Apple Pages documents to - and from DocBook XML. - -Including QandASet questions in TOCs - - The HTML stylesheet now provides support for including QandASet questions - in the document TOC. To enable display of questions in the document TOC, - set the value of the qanda.in.toc to 1 (by default, it’s 0). When you - enable qanda.in.toc, then the generated table of contents for a document - will include qandaset titles, qandadiv titles, and question elements. The - default value of zero excludes them from the TOC. - - Note - - The qanda.in.toc parameter does not affect any tables of contents that may - be generated within a qandaset or qandadiv (only in the document TOC). - -Language identifier in man-page filenames and pathnames - - Added new parameter man.output.lang.in.name.enabled, which controls whether - a language identifier is included in man-page filenames and pathnames. It - works like this: - - If the value of man.output.lang.in.name.enabled is non-zero, man-page files - are output with a language identifier included in their filenames or - pathnames as follows: - - â— if man.output.subdirs.enabled is non-zero, each file is output to, - e.g., a /$lang/man8/foo.8 pathname - - â— if man.output.subdirs.enabled is zero, each file is output with a - foo.$lang.8 filename - -index.page.number.properties property set - - For FO output, use the index.page.number.properties to control formatting - of page numbers in index output — to (for example) to display page numbers - in index output in a different color (to indicate that they are links). - -Crop marks in output from Antenna House XSL Formatter - - Support has been added for generating crop marks in print/PDF output - generated using Antenna House XSL Formatter - -More string-substitution hooks in manpages output - - The man.string.subst.map.local.pre and man.string.subst.map.local.post - parameters have been added to enable easier control over custom string - substitutions. - -Moved verbatim properties to attribute-set - - The hardcoded properties used in verbatim elements (literallayout, - programlisting, screen) were moved to the verbatim.properties attribute-set - so they can be more easily customized. - -enhanced simple.xlink template - - Now the simple.xlink template in inline.xsl works with cross reference - elements xref and link as well. Also, more elements call simple.xlink, - which enables DB5 xlink functionality. - -DocBook 5 compatibility - - Stylesheets now consistently support DocBook 5 attributes (such as xml:id). - Also, DocBook 5 info elements are now checked along with other *info - elements, and the use of name() function was replaced by local-name() so it - also matches on DocBook 5 elements. These changes enable reusing the - stylesheets with DocBook 5 documents with minimal fixup. - -HTML class attributes now handled in class.attribute mode - - The HTML class attributes were formerly hardcoded to the element name. Now - the class attribute is generated by applying templates in class.attribute - mode so class attribute names can be customized. The default is still the - element name. - -arabic-indic numbering enabled in autolabels - - Numbering of chapter, sections, and pages can now use arabic-indic - numbering when number format is set to 'arabicindic' or to Ù¡. - -The following is a detailed list of changes (not including bug fixes) that have -been made since the 1.71.1 release. - -Common - -The following changes have been made to the common code since the 1.71.1 -release. - - â— Add support for arabicindic numbering to autolabel.format template. - - â— Finish support for @xml:id everywhere @id is used. - - â— replace name() with local-name() in most cases. - - â— Add support for info. - - â— Add utility template tabstyle to return the tabstyle from - any table element. - -FO - -The following changes have been made to the fo code since the 1.71.1 release. - - â— Add support for sorting glossary entries - - â— Add table.row.properties template to customize table rows. - - â— Moved all properties to attribute-sets so can be customized more easily. - - â— Add index.page.number.properties attribute-set to format page numbers. - - â— xref now supports xlink:href, using simple.xlink template. - - â— Rewrote simple.xlink, and call it with all charseq templates. - - â— Add simple.xlink processing to term and member elements. - - â— Add support for crop marks in Antenna House. - -HTML - -The following changes have been made to the html code since the 1.71.1 release. - - â— Add support for sorting glossary entries - - â— Add support for qanda.in.toc to add qandaentry questions to document TOC. - - â— add simple.xlink support to variablelist term and simplelist member. - - â— *.propagates.style now handled in class.attribute mode. - - â— add class parameter to class.attribute mode to set default class. - - â— Convert all class attributes to use the class.attribute mode - so class names can be customized more easily. - - â— Add class.attribute mode to generate class attributes. - - â— Added simple.xlink to most remaining inlines. - Changed class attributes to applying class.attributes mode. - - â— Changed xref template to use simple.xlink tempalte. - - â— Improve generate.html.title to work with link targets too. - - â— Improved simple.xlink to support link and xref. - - â— Use new link.title.attribute now. - - â— Rewrote simple.xlink to handle linkend also. - Better computation of title attribute on link too. - - â— Handle Xalan quirk as special case. - - â— Add support for info. - - â— Fixed imagemaps so they work properly going from calspair coords - to HTML area coords. - -Manpages - -The following changes have been made to the manpages code since the 1.71.1 -release. - - â— Added doc for man.output.lang.in.name.enabled parameter. This - checkin completes support for writing file/pathnames for man-pages - with $lang include in the names. Closes #1585967. knightly - accolades to Daniel Leidert for providing the feature request. - - â— Added new param man.output.lang.in.name.enabled, which - controls whether $LANG value is included in manpages - filenames and pathnames. It works like this: - - If the value of man.output.lang.in.name.enabled is non-zero, - man-page files are output with the $lang value included in - their filenames or pathnames as follows; - - - if man.output.subdirs.enabled is non-zero, each file is -   output to, e.g., a /$lang/man8/foo.8 pathname - - - if man.output.subdirs.enabled is zero, each file is output -   with a foo.$lang.8 filename - - â— Use "\e" instead of "\\" for backslash output, because the - groff docs say that's the correct thing to do; also because - testing (thanks, Paul Dubois) shows that "\\" doesn't always - work as expected; for example, "\\" within a table seems to - mess things up. - - â— Added the man.string.subst.map.local.pre and - man.string.subst.map.local.post parameters. Those parameters - enable local additions and changes to string-substitution mappings - without the need to change the value of man.string.subst.map - parameter (which is for standard system mappings). Closes - #1456738. Thanks to Sam Steingold for constructing a true - stylesheet torture test (the clisp docs) that exposed the need for - these params. - - â— Added the Markup element to the list of elements that get output - in bold. Thanks to Eric S. Raymond. - - â— Replaced all dots in roff requests with U+2302 ("house" - character), and added escaping in output for all instances of dot - that are not in roff requests. This fixes the problem case where a - string beginning with a dot (for example, the string ".bashrc") - might occur at the beginning of a line in output, in which case  - would mistakenly get interpreted as a roff request. Thanks to Eric - S. Raymond for pushing to fix this. - - â— Made change to ensure that list content nested in - itemizedlist and orderedlist instances is properly indented. This - is a switch from using .TP to format those lists to using .RS/.RE - to format them instead (because .TP does not allow nesting). Closes bug # - 1602616. - Thanks to Daniel Leidert. - -Params - -The following changes have been made to the params code since the 1.71.1 -release. - - â— Added doc for man.output.lang.in.name.enabled parameter. This - checkin completes support for writing file/pathnames for man-pages - with $lang include in the names. Closes #1585967. knightly - accolades to Daniel Leidert for providing the feature request. - - â— Added new param man.output.lang.in.name.enabled, which - controls whether $LANG value is included in manpages - filenames and pathnames. It works like this: - - If the value of man.output.lang.in.name.enabled is non-zero, - man-page files are output with the $lang value included in - their filenames or pathnames as follows; - - - if man.output.subdirs.enabled is non-zero, each file is -   output to, e.g., a /$lang/man8/foo.8 pathname - - - if man.output.subdirs.enabled is zero, each file is output -   with a foo.$lang.8 filename - - â— Added the man.string.subst.map.local.pre and - man.string.subst.map.local.post parameters. Those parameters - enable local additions and changes to string-substitution mappings - without the need to change the value of man.string.subst.map - parameter (which is for standard system mappings). Closes - #1456738. Thanks to Sam Steingold for constructing a true - stylesheet torture test (the clisp docs) that exposed the need for - these params. - - â— Add index.page.number.properties by default. - - â— Added index.page.number.properties -  to allow customizations of page numbers in indexes. - - â— Move show-destination="replace" property from template to attribute-set - so it can be customized. - - â— Add support for sorting glossary entries - - â— Add option to include qanda in tables of contents. - - â— Moved all properties to attribute-sets so can be customized more easily. - -Template - -The following changes have been made to the template code since the 1.71.1 -release. - - â— Added workaround for Xalan bug: use for-each and copy instead of copy-of (# - 1604770). - -Roundtrip - -The following changes have been made to the roundtrip code since the 1.71.1 -release. - - â— rename to roundtrip, add OpenOffice support - -Release: 1.71.1 - -This is a minor update to the 1.71.0 release. Along with a number of bug fixes, -it includes two feature changes: - - â— Added support for profiling based on xml:lang and status attributes. - - â— Added initial support in manpages output for footnote, annotation, and alt - instances. Basically, they all now get handled the same way ulink instances - are. They are treated as a class as "note sources": A numbered marker is - generated at the place in the main text flow where they occur, then their - contents are displayed in an endnotes section at the end of the man page. - -Common - -The following changes have been made to the common code since the 1.71.1 -release. - - â— For backward compatability autoidx-ng.xsl is invoking "kosek" indexing method again. - - â— Add support for Xalan generating a root xml:base like saxon. - -FO - -The following changes have been made to the fo code since the 1.71.1 release. - - â— For backward compatability autoidx-ng.xsl is invoking "kosek" indexing method again. - - â— Add support for Xalan to add root node xml:base for db5 docs. - - â— Added support for profiling based on xml:lang and status attributes. - -HTML - -The following changes have been made to the html code since the 1.71.1 release. - - â— For backward compatability autoidx-ng.xsl is invoking "kosek" indexing method again. - - â— Add support for Xalan to add root node xml:base for db5 docs. - - â— Added support for profiling based on xml:lang and status attributes. - - â— Made changes in namespace declarations to prevent xmllint's - canonicalizer from treating them as relative namespace URIs. - -   - Changed xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService" -     to xmlns:k="http://www.isogen.com/functions/ - com.isogen.saxoni18n.Saxoni18nService"; -     Saxon accepts either form -     (see http://www.saxonica.com/documentation/extensibility/ - functions.html); -     to Saxon, "the part of the URI before the final '/' is immaterial". - -   - Changed, e.g. xmlns:xverb="com.nwalsh.xalan.Verbatim" to -     xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"; Xalan accepts -     either form -     (see http://xml.apache.org/xalan-j/extensions.html# - java-namespace-declare); -     just as Saxon does, it will "simply use the string to the -     right of the rightmost forward slash as the Java class name". - -   - Changed xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect" -     to xmlns:redirect="http://xml.apache.org/xalan/redirect", and -     adjusted associated code to make the current Xalan redirect spec. -     (see http://xml.apache.org/xalan-j/apidocs/org/apache/xalan/lib/ - Redirect.html) - - â— Added the html.append and chunk.append parameters. By default, the - value of both is empty; but the internal DocBook XSL stylesheets - build sets their value to " ", in order - to ensure that all files in the docbook-xsl-doc package end in a - newline character. (Because diff and some other tools may emit - error messages and/or not behave as expected when processing - files that are not newline-terminated.) - -Highlighting - -The following changes have been made to the highlighting code since the 1.71.1 -release. - - â— Added license information - -Manpages - -The following changes have been made to the manpages code since the 1.71.1 -release. - - â— Added initial support in manpages output for footnote, annotation, - and alt instances. Basically, they all now get handled the same - way ulink instances are. They are treated as a class as "note - sources": A numbered marker is generated at the place in the main - text flow where they occur, then their contents are displayed in - an endnotes section at the end of the man page (currently titled - REFERENCES, for English output, but will be changed to NOTES). - - This support is not yet complete. It works for most "normal" - cases, but probably mishandles a good number of cases. More - testing will be needed to expose the problems. It may well also - introduce some bugs and regressions in other areas, including - basic paragraph handling, handling of "mixed block" content, - handling of other indented content, and handling of authorblurb - and personblurb in the AUTHORS section. - -Params - -The following changes have been made to the params code since the 1.71.1 -release. - - â— Added support for profiling based on xml:lang and status attributes. - - â— Added the html.append and chunk.append parameters. By default, the - value of both is empty; but the internal DocBook XSL stylesheets - build sets their value to " ", in order - to ensure that all files in the docbook-xsl-doc package end in a - newline character. (Because diff and some other tools may emit - error messages and/or not behave as expected when processing - files that are not newline-terminated.) - -Profiling - -The following changes have been made to the profiling code since the 1.71.1 -release. - - â— Added support for profiling based on xml:lang and status attributes. - -Release: 1.71.0 - -This is mainly a bug fix release, but it also includes two significant feature -changes: - -Highlighting support added - - The stylesheets now include support for source-code highlighting in output - of programlisting instances (controlled through the highlight.source - parameter). The Java-based implementation requires Saxon and makes use of - Michal Molhanec’s XSLTHL. More details are available at Jirka Kosek’s - website: - - http://xmlguru.cz/2006/07/docbook-syntax-highlighting - - The support is currently limited to highlighting of XML, Java, PHP, Delphi, - Modula-2 sources, and INI files. - -Changes to autoindexing - - The templates that handle alternative indexing methods were reworked to - avoid errors produced by certain processors not being able to tolerate the - presence of unused functions. With this release, none of the code for the - 'kimber' or 'kosek' methods is included in the default stylesheets. In - order to use one of those methods, your customization layer must import one - of the optional stylesheet modules: - - â— html/autoidx-kosek.xsl - â— html/autoidx-kimber.xsl - â— fo/autoidx-kosek.xsl - â— fo/autoidx-kimber.xsl - - See the index.method parameter reference page for more information. - - Two other changes to note: - - â— The default indexing method now can handle accented characters in - latin-based alphabets, not just English. This means accented latin - letters will group and sort with their unaccented counterpart. - â— The default value for the index.method parameter was changed from - 'english' to 'basic' because now the default method can handle - latin-based alphabets, not just English. - -The following is a list of changes that have been made since the 1.70.1 -release. - -Common - -The following changes have been made to the common code since the 1.70.1 -release. - - â— Added reference.autolabel parameter for controlling labels on - reference output. - - â— Support rows that are *completely* overlapped by the preceding row - - â— New modules for supporting indexing extensions. - - â— Support startinglinenumber on orderedlist - -Extensions - -The following changes have been made to the extensions code since the 1.70.1 -release. - - â— Completely reworked extensions build system; now uses NetBeans and ant - -FO - -The following changes have been made to the fo code since the 1.70.1 release. - - â— xsl:sort lang attribute now uses two-char substring of lang attribute. - - â— Support titlecase "Java", "Perl", and "IDL" as values for the - language attribute on classsynopsis, etc. (instead of just - lowercase "java", "perl", and "idl"). Also support "c++" and "C++" - (instead of just "cpp"). - - Affects HTML, FO, and manpages output. Closes bug 1552332. Thanks - to "Brian A. Vanderburg II". - - â— Added support for the reference.autolabel param in (X)HTML and FO - output. - - â— Support rows that are *completely* overlapped by the preceding row - - â— Rearranged templates for the 3 indexing methods - and changed method named 'english' to 'basic'. - - â— New modules for supporting indexing extensions. - - â— Turn off blank-body for fop1.extensions too since fop 0.92 - does not support it either. - - â— Add Xalan variant to test for exslt:node-set function. - Xalan can use function named node-set(), but doesn't - recognize it using function-available(). - - â— Added support to FO stylesheets for handling instances of Org - where it occurs outside of *info content. In HTML stylesheets, - moved handling of Org out of info.xsl and into inline.xsl. In both - FO and HTML stylesheets, added support for correctly processing - Affiliation and Jobtitle. - - â— Don't output punctuation between Refname and Refpurpose if - Refpurpose is empty. Also corrected handling of Refsect2/title - instances, and removed some debugging stuff that was generated in - manpages output to mark the ends of sections. - - â— Added new email.delimiters.enabled param. If non-zero (the - default), delimiters are generated around e-mail addresses (output - of the email element). If zero, the delimiters are suppressed. - - â— Initial support of syntax highlighting of programlistings. - - â— Chapter after preface should restart numbering of pages. - -HTML - -The following changes have been made to the html code since the 1.70.1 release. - - â— xsl:sort lang attribute now uses two-char substring of lang attribute. - - â— Support titlecase "Java", "Perl", and "IDL" as values for the - language attribute on classsynopsis, etc. (instead of just - lowercase "java", "perl", and "idl"). Also support "c++" and "C++" - (instead of just "cpp"). - - Affects HTML, FO, and manpages output. Closes bug 1552332. Thanks - to "Brian A. Vanderburg II". - - â— Added support for the reference.autolabel param in (X)HTML and FO - output. - - â— Support rows that are *completely* overlapped by the preceding row - - â— Rearranged templates for the 3 indexing methods - and changed method named 'english' to 'basic'. - - â— New modules for supporting indexing extensions. - - â— Added several new HTML parameters for controlling appearance of - content on HTML title pages: - - contrib.inline.enabled: -   If non-zero (the default), output of the contrib element is -   displayed as inline content rather than as block content. - - othercredit.like.author.enabled: -   If non-zero, output of the othercredit element on titlepages is -   displayed in the same style as author and editor output. If zero -   (the default), othercredit output is displayed using a style -   different than that of author and editor. - - blurb.on.titlepage.enabled: -   If non-zero, output from authorblurb and personblurb elements is -   displayed on title pages. If zero (the default), output from -   those elements is suppressed on title pages (unless you are -   using a titlepage customization that causes them to be included). - - editedby.enabled -   If non-zero (the default), a localized Edited by heading is -   displayed above editor names in output of the editor element. - - â— Add Xalan variant to test for exslt:node-set function. - Xalan can use function named node-set(), but doesn't - recognize it using function-available(). - - â— Added support to FO stylesheets for handling instances of Org - where it occurs outside of *info content. In HTML stylesheets, - moved handling of Org out of info.xsl and into inline.xsl. In both - FO and HTML stylesheets, added support for correctly processing - Affiliation and Jobtitle. - - â— Don't output punctuation between Refname and Refpurpose if - Refpurpose is empty. Also corrected handling of Refsect2/title - instances, and removed some debugging stuff that was generated in - manpages output to mark the ends of sections. - - â— Added new email.delimiters.enabled param. If non-zero (the - default), delimiters are generated around e-mail addresses (output - of the email element). If zero, the delimiters are suppressed. - - â— Added qanda.nested.in.toc param. Default value is zero. If - non-zero, instances of "nested" Qandaentry (ones that are children - of Answer elements) are displayed in the TOC. Closes patch 1509018 - (from Daniel Leidert). Currently on affects HTML output (no patch - for FO output provided). - - â— Improved handling of relative locations generated files - - â— Initial support of syntax highlighting of programlistings. - - â— Support org - - â— Support person - - â— Support $keep.relative.image.uris also when chunking - -Highlighting - -The following changes have been made to the highlighting code since the 1.70.1 -release. - - â— Initial support of syntax highlighting of programlistings. - -Manpages - -The following changes have been made to the manpages code since the 1.70.1 -release. - - â— Suppress footnote markers and output warning that footnotes are - not yet supported. - - â— Handle instances of address/otheraddr/ulink in author et al in the - same way as email instances; that is, display them on the same - linke as the author, editor, etc., name. - - â— Don't number or link-list any Ulink instance whose string value is - identical to the value of its url attribute. Just display it inline. - - â— Don't output punctuation between Refname and Refpurpose if - Refpurpose is empty. Also corrected handling of Refsect2/title - instances, and removed some debugging stuff that was generated in - manpages output to mark the ends of sections. - - â— Added new email.delimiters.enabled param. If non-zero (the - default), delimiters are generated around e-mail addresses (output - of the email element). If zero, the delimiters are suppressed. - - â— In manpages output, if the last/nearest *info element for - particular Refentry has multiple Copyright and/or Legalnotice - children, process them all (not just the first ones). Closes bug - 1524576. Thanks to Sam Steingold for the report and to Daniel - Leidert for providing a patch. - -Params - -The following changes have been made to the params code since the 1.70.1 -release. - - â— Added reference.autolabel parameter for controlling labels on - reference output. - - â— Added namespace declarations to document elements for all param files. - - â— Updated index.method doc to describe revised setup for importing index -  extensions. - - â— Added several new HTML parameters for controlling appearance of - content on HTML title pages: - - contrib.inline.enabled: -   If non-zero (the default), output of the contrib element is -   displayed as inline content rather than as block content. - - othercredit.like.author.enabled: -   If non-zero, output of the othercredit element on titlepages is -   displayed in the same style as author and editor output. If zero -   (the default), othercredit output is displayed using a style -   different than that of author and editor. - - blurb.on.titlepage.enabled: -   If non-zero, output from authorblurb and personblurb elements is -   displayed on title pages. If zero (the default), output from -   those elements is suppressed on title pages (unless you are -   using a titlepage customization that causes them to be included). - - editedby.enabled -   If non-zero (the default), a localized Edited by heading is -   displayed above editor names in output of the editor element. - - â— Added new email.delimiters.enabled param. If non-zero (the - default), delimiters are generated around e-mail addresses (output - of the email element). If zero, the delimiters are suppressed. - - â— Added qanda.nested.in.toc param. Default value is zero. If - non-zero, instances of "nested" Qandaentry (ones that are children - of Answer elements) are displayed in the TOC. Closes patch 1509018 - (from Daniel Leidert). Currently on affects HTML output (no patch - for FO output provided). - - â— Initial support of syntax highlighting of programlistings. - -Tools - -The following changes have been made to the tools code since the 1.70.1 -release. - - â— Racheted down font sizes of headings in example makefile FO output. - - â— Added param and attribute set to example makefile, for getting - wrapping in verbatims in FO output. - - â— Renamed Makefile.paramDoc to Makefile.docParam. - - â— Added Makefile.paramDoc file, for creating versions of param.xsl - files with doc embedded. - - â— Added variable to example makefile for controlling whether HTML or - XHTML is generated. - -Release: 1.70.1 - -This is a stable release of the 1.70 stylesheets. It includes only a few small -changes from 1.70.0. - -The following is a list of changes that have been made since the 1.70.0 -release. - -FO - -The following changes have been made to the fo code since the 1.70.0 release. - - â— Added three new attribute sets (revhistory.title.properties, - revhistory.table.properties and revhistory.table.cell.properties) for - controlling appearance of revhistory in FO output. - - Modified: fo/block.xsl,1.34; fo/param.ent,1.101; fo/param.xweb,1.114; fo/ - titlepage.xsl,1.41; params/revhistory.table.cell.properties.xml,1.1; params - /revhistory.table.properties.xml,1.1; params/ - revhistory.title.properties.xml,1.1 - Jirka Kosek - - â— Support DBv5 revisions with full author name (not only authorinitials) - - Modified: fo/block.xsl,1.33; fo/titlepage.xsl,1.40 - Jirka Kosek - -HTML - -The following changes have been made to the html code since the 1.70.0 release. - - â— Support DBv5 revisions with full author name (not only authorinitials) - - Modified: html/block.xsl,1.23; html/titlepage.xsl,1.34 - Jirka Kosek - -HTMLHelp - -The following changes have been made to the htmlhelp code since the 1.70.0 -release. - - â— htmlhelp.generate.index is now param, not variable. This means that you can - override its setting from outside. This is useful when you generate - indexterms on the fly (see http://www.xml.com/pub/a/2004/07/14/dbndx.html? - page=3). - - Modified: htmlhelp/htmlhelp-common.xsl,1.38 - Jirka Kosek - - â— Support chunk.tocs.and.lots in HTML Help - - Modified: htmlhelp/htmlhelp-common.xsl,1.37 - Jirka Kosek - -Params - -The following changes have been made to the params code since the 1.70.0 -release. - - â— Added three new attribute sets (revhistory.title.properties, - revhistory.table.properties and revhistory.table.cell.properties) for - controlling appearance of revhistory in FO output. - - Modified: fo/block.xsl,1.34; fo/param.ent,1.101; fo/param.xweb,1.114; fo/ - titlepage.xsl,1.41; params/revhistory.table.cell.properties.xml,1.1; params - /revhistory.table.properties.xml,1.1; params/ - revhistory.title.properties.xml,1.1 - Jirka Kosek - -Release: 1.70.0 - -As with all DocBook Project dot-zero releases, this is an experimental release. -It will be followed shortly by a stable release. - -This release adds a number of new features, including: - - â— support for selecting alternative index-collation methods (in particular, - support for using a collation library developed by Eliot Kimber) - - â— improved handling of DocBook 5 document instances (through a - namespace-stripping mechanism) - - â— full support for CALS and HTML tables in manpages output - - â— a mechanism for preserving relative URIs in documents that make use of - XInclude - - â— support for the "new" .90 version of FOP - - â— enhanced capabilities for controlling formatting of lists in HTML and FO - output - - â— autogeneration of AUTHOR and COPYRIGHT sections in manpages output - - â— support for generating crop marks in FO/PDF output - - â— support for qandaset as a root element in FO output - - â— support for floatstyle and orient on all table types - - â— support for floatstyle in figure, and example - - â— pgwide.properties attribute-set supports extending figure, example and - table into the left indent area instead of spanning multiple columns. - -The following is a detailed list of enhancements and API changes that have been -made since the 1.69.1 release. - -Common - -The following changes have been made to the common code since the 1.69.1 -release. - - â— Add the xsl:key for the kimber indexing method. - - Modified: common/autoidx-ng.xsl,1.2 - Robert Stayton - - â— Add support for qandaset. - - Modified: common/labels.xsl,1.37; common/subtitles.xsl,1.7; common/ - titles.xsl,1.35 - Robert Stayton - - â— Support dbhtml/dbfo start PI for orderedlist numbering in both HTML and FO - - Modified: common/common.xsl,1.61; html/lists.xsl,1.50 - Norman Walsh - - â— Added CVS header. - - Modified: common/stripns.xsl,1.12 - Robert Stayton - - â— Changed content model of text element to ANY rather than #PCDATA because - they could contain markup. - - Modified: common/targetdatabase.dtd,1.7 - Robert Stayton - - â— Added refentry.meta.get.quietly param. - - If zero (the default), notes and warnings about "missing" markup are - generated during gathering of refentry metadata. If non-zero, the metadata - is gathered "quietly" -- that is, the notes and warnings are suppressed. - - NOTE: If you are processing a large amount of refentry content, you may be - able to speed up processing significantly by setting a non-zero value for - refentry.meta.get.quietly. - - Modified: common/refentry.xsl,1.17; manpages/param.ent,1.15; manpages/ - param.xweb,1.17; params/refentry.meta.get.quietly.xml,1.1 - Michael(tm) - Smith - - â— After namespace stripping, the source document is the temporary tree - created by the stripping process and it has the wrong base URI for relative - references. Earlier versions of this code used to try to fix that by - patching the elements with relative @fileref attributes. That was - inadequate because it calculated an absolute base URI without considering - that there might be xml:base attributes already in effect. It seems obvious - now that the right thing to do is simply to put the xml:base on the root of - the document. And that seems to work. - - Modified: common/stripns.xsl,1.7 - Norman Walsh - - â— Added support for "software" and "sectdesc" class values on refmiscinfo; - "software" is treated identically to "source", and "setdesc" is treated - identically to "manual". - - Modified: common/refentry.xsl,1.10; params/ - man.th.extra2.max.length.xml,1.3; params/ - refentry.source.name.profile.xml,1.4 - Michael(tm) Smith - - â— Added support for DocBook 5 namespace-stripping in manpages stylesheet. - Closes request #1210692. - - Modified: common/common.xsl,1.56; manpages/docbook.xsl,1.57 - Michael(tm) - Smith - - â— Added to make stripns.xsl usable as a standalone - stylesheet for stripping out DocBook 5/NG to DocBook 4. Note that DocBook - XSLT drivers that include this stylesheet all override the match="/" - template. - - Modified: common/stripns.xsl,1.4 - Michael(tm) Smith - - â— Number figures, examples, and tables from book if there is no prefix (i.e. - if chapter.autolabel is set to 0). This avoids having the list of figures - where the figures mysteriously restart their numeration periodically when - chapter.autolabel is set to 0. - - Modified: common/labels.xsl,1.36 - David Cramer - - â— Add task template in title.markup mode. - - Modified: common/titles.xsl,1.34 - Robert Stayton - - â— Add children (with ids) of formal objects to target data. - - Modified: common/targets.xsl,1.10 - Robert Stayton - - â— Added support for case when personname doesn't contain specific name markup - (as allowed in DocBook 5.0) - - Modified: common/common.xsl,1.54 - Jirka Kosek - -Extensions - -The following changes have been made to the extensions code since the 1.69.1 -release. - - â— Support Xalan 2.7 - - Modified: extensions/xalan27/.cvsignore,1.1; extensions/xalan27/ - build.xml,1.1; extensions/xalan27/nbproject/.cvsignore,1.1; extensions/ - xalan27/nbproject/build-impl.xml,1.1; extensions/xalan27/nbproject/ - genfiles.properties,1.1; extensions/xalan27/nbproject/ - project.properties,1.1; extensions/xalan27/nbproject/project.xml,1.1; - extensions/xalan27/src/com/nwalsh/xalan/CVS.java,1.1; extensions/xalan27/ - src/com/nwalsh/xalan/Callout.java,1.1; extensions/xalan27/src/com/nwalsh/ - xalan/FormatCallout.java,1.1; extensions/xalan27/src/com/nwalsh/xalan/ - FormatDingbatCallout.java,1.1; extensions/xalan27/src/com/nwalsh/xalan/ - FormatGraphicCallout.java,1.1; extensions/xalan27/src/com/nwalsh/xalan/ - FormatTextCallout.java,1.1; extensions/xalan27/src/com/nwalsh/xalan/ - FormatUnicodeCallout.java,1.1; extensions/xalan27/src/com/nwalsh/xalan/ - Func.java,1.1; extensions/xalan27/src/com/nwalsh/xalan/ - ImageIntrinsics.java,1.1; extensions/xalan27/src/com/nwalsh/xalan/ - Params.java,1.1; extensions/xalan27/src/com/nwalsh/xalan/Table.java,1.1; - extensions/xalan27/src/com/nwalsh/xalan/Text.java,1.1; extensions/xalan27/ - src/com/nwalsh/xalan/Verbatim.java,1.1 - Norman Walsh - - â— Handle the case where the imageFn is actually a URI. This still needs work. - - Modified: extensions/saxon643/com/nwalsh/saxon/ImageIntrinsics.java,1.4 - - Norman Walsh - -FO - -The following changes have been made to the fo code since the 1.69.1 release. - - â— Adapted to the new indexing code. Now works just like a wrapper that calls - kosek indexing method, originally implemented here. - - Modified: fo/autoidx-ng.xsl,1.5 - Jirka Kosek - - â— Added parameters for header/footer table minimum height. - - Modified: fo/pagesetup.xsl,1.60; fo/param.ent,1.100; fo/param.xweb,1.113 - - Robert Stayton - - â— Add the index.method parameter. - - Modified: fo/param.ent,1.99; fo/param.xweb,1.112 - Robert Stayton - - â— Integrate support for three indexing methods: - the original English-only - method. - Jirka Kosek's method using EXSLT extensions. - Eliot Kimber's - method using Saxon extensions. Use the 'index.method' parameter to select. - - Modified: fo/autoidx.xsl,1.38 - Robert Stayton - - â— Add support for TOC for qandaset in fo output. - - Modified: fo/autotoc.xsl,1.30; fo/qandaset.xsl,1.20 - Robert Stayton - - â— Added parameter ulink.hyphenate.chars. Added parameter insert.link - .page.number. - - Modified: fo/param.ent,1.98; fo/param.xweb,1.111 - Robert Stayton - - â— Implemented feature request #942524 to add insert.link.page.number to allow - link element cross references to have a page number. - - Modified: fo/xref.xsl,1.67 - Robert Stayton - - â— Add support for ulink.hyphenate.chars so more characters can be break - points in urls. - - Modified: fo/xref.xsl,1.66 - Robert Stayton - - â— Implemented patch #1075144 to make the url text in a ulink in FO output an - active link as well. - - Modified: fo/xref.xsl,1.65 - Robert Stayton - - â— table footnotes now have their own table.footnote.properties attribute set. - - Modified: fo/footnote.xsl,1.23 - Robert Stayton - - â— Add qandaset to root.elements. - - Modified: fo/docbook.xsl,1.41 - Robert Stayton - - â— Added mode="page.sequence" to make it easier to put content into a page - sequence. First used for qandaset. - - Modified: fo/component.xsl,1.37 - Robert Stayton - - â— Implemented feature request #1434408 to support formatting of biblioentry. - - Modified: fo/biblio.xsl,1.35 - Robert Stayton - - â— Added biblioentry.properties. - - Modified: fo/param.ent,1.97; fo/param.xweb,1.110 - Robert Stayton - - â— Support PTC/Arbortext bookmarks - - Modified: fo/docbook.xsl,1.40; fo/ptc.xsl,1.1 - Norman Walsh - - â— Added table.footnote.properties to permit table footnotes to format - differently from regular footnotes. - - Modified: fo/param.ent,1.96; fo/param.xweb,1.109 - Robert Stayton - - â— Refactored table templates to unify their processing and support all - options in all types. Now table and informaltable, in both Cals and Html - markup, use the same templates where possible, and all support pgwide, - rotation, and floats. There is also a placeholder table.container template - to support wrapping a table in a layout table, so the XEP table title - "continued" extension can be more easily implemented. - - Modified: fo/formal.xsl,1.52; fo/htmltbl.xsl,1.9; fo/table.xsl,1.48 - - Robert Stayton - - â— Added new attribute set toc.line.properties for controlling appearance of - lines in ToC/LoT - - Modified: fo/autotoc.xsl,1.29; fo/param.ent,1.95; fo/param.xweb,1.108 - - Jirka Kosek - - â— Added support for float to example and equation. Added support for pgwide - to figure, example, and equation (the latter two via a dbfo pgwide="1" - processing instruction). - - Modified: fo/formal.xsl,1.51 - Robert Stayton - - â— Add pgwide.properties attribute-set. - - Modified: fo/param.ent,1.94; fo/param.xweb,1.107 - Robert Stayton - - â— Added refclass.suppress param. - - If the value of refclass.suppress is non-zero, then display refclass - contents is suppressed in output. Affects HTML and FO output only. - - Modified: fo/param.ent,1.93; fo/param.xweb,1.106; html/param.ent,1.90; html - /param.xweb,1.99; params/refclass.suppress.xml,1.1 - Michael(tm) Smith - - â— Improved support for task subelements - - Modified: fo/task.xsl,1.3; html/task.xsl,1.3 - Jirka Kosek - - â— Adjusted spacing around K&R-formatted Funcdef and Paramdef output such that - it can more easily be discerned where one ends and the other begins. Closes - #1213264. - - Modified: fo/synop.xsl,1.18 - Michael(tm) Smith - - â— Made handling of paramdef/parameter in FO output consistent with that in - HTML and manpages output. Closes #1213259. - - Modified: fo/synop.xsl,1.17 - Michael(tm) Smith - - â— Made handling of Refnamediv consistent with formatting in HTML and manpages - output; specifically, changed so that Refname (comma-separated list of - multiple instances found) is used (instead of Refentrytitle as previously), - then em-dash, then the Refpurpose. Closes #1212562. - - Modified: fo/refentry.xsl,1.30 - Michael(tm) Smith - - â— Added output of Releaseinfo to recto titlepage ("copyright" page) for Book - in FO output. This makes it consistent with HTML output. Closes #1327034. - Thanks to Paul DuBois for reporting. - - Modified: fo/titlepage.templates.xml,1.28 - Michael(tm) Smith - - â— Added condition for setting block-progression-dimension.minimum on - table-row, instead of height, when fop1.extensions is non-zero. For an - explanation of the reason for the change, see: http://wiki.apache.org/ - xmlgraphics-fop/Troubleshooting/CommonLogMessages - - Modified: fo/pagesetup.xsl,1.59 - Michael(tm) Smith - - â— Added new refclass.suppress param for suppressing display of Refclass in - HTML and FO output. Did not add it to manpages because manpages stylesheet - is currently just silently ignoring Refclass anyway. Closes request # - 1461065. Thanks to Davor Ocelic (docelic) for reporting. - - Modified: fo/refentry.xsl,1.29; html/refentry.xsl,1.23 - Michael(tm) Smith - - â— Add support for keep-together PI to informal objects. - - Modified: fo/formal.xsl,1.50 - Robert Stayton - - â— Add support for fop1.extensions. - - Modified: fo/formal.xsl,1.49; fo/graphics.xsl,1.44; fo/table.xsl,1.47 - - Robert Stayton - - â— Add support for fop1 bookmarks. - - Modified: fo/docbook.xsl,1.39 - Robert Stayton - - â— Add fop1.extentions parameter to add support for fop development version. - - Modified: fo/param.ent,1.92; fo/param.xweb,1.105 - Robert Stayton - - â— Start supporting fop development version, which will become fop version 1. - - Modified: fo/fop1.xsl,1.1 - Robert Stayton - - â— Add template for task in mode="xref-to". - - Modified: fo/xref.xsl,1.63; html/xref.xsl,1.57 - Robert Stayton - - â— table footnotes now also get footnote.properties attribute-set. - - Modified: fo/footnote.xsl,1.22 - Robert Stayton - - â— Added index.separator named template to compute the separator punctuation - based on locale. - - Modified: fo/autoidx.xsl,1.36 - Robert Stayton - - â— Added support for link, olink, and xref within OO Classsynopsis and - children. (Because DocBook NG/5 allows it). - - Modified: fo/synop.xsl,1.15; html/synop.xsl,1.19 - Michael(tm) Smith - - â— Support date as an inline - - Modified: fo/inline.xsl,1.43; html/inline.xsl,1.46 - Norman Walsh - - â— Added new parameter keep.relative.image.uris - - Modified: fo/param.ent,1.91; fo/param.xweb,1.104; html/param.ent,1.87; html - /param.xweb,1.96; params/keep.relative.image.uris.xml,1.1 - Norman Walsh - - â— Map Unicode space characters U+2000-U+200A to fo:leaders. - - Modified: fo/docbook.xsl,1.38; fo/passivetex.xsl,1.4; fo/spaces.xsl,1.1 - - Jirka Kosek - - â— Output a real em dash for em-dash dingbat (instead of two hypens). - - Modified: fo/fo.xsl,1.7 - Michael(tm) Smith - - â— Support default label width parameters for itemized and ordered lists - - Modified: fo/lists.xsl,1.64; fo/param.ent,1.90; fo/param.xweb,1.103; params - /itemizedlist.label.width.xml,1.1; params/orderedlist.label.width.xml,1.1 - - Norman Walsh - - â— Generate localized title for Refsynopsisdiv if no appropriate Title - descendant found in source. Closes #1212398. This change makes behavior for - the Synopsis title consistent with the behavior of HTML and manpages - output. - - Also, added xsl:use-attribute-sets="normal.para.spacing" to block generated - for Cmdsynopsis output. Previously, that block had no spacing at all - specified, which resulted it being crammed up to closely to the Synopsis - head. - - Modified: fo/refentry.xsl,1.28; fo/synop.xsl,1.13 - Michael(tm) Smith - - â— Added parameters to support localization of index item punctuation. - - Modified: fo/autoidx.xsl,1.35 - Robert Stayton - - â— Added index.number.separator, index.range.separator, and - index.term.separator parameters to support localization of punctuation in - index entries. - - Modified: fo/param.ent,1.89; fo/param.xweb,1.102 - Robert Stayton - - â— Added "Cross References" section in HTML doc (for consistency with the FO - doc). Also, moved the existing FO "Cross References" section to follow the - "Linking" section. - - Modified: fo/param.xweb,1.101; html/param.xweb,1.95 - Michael(tm) Smith - - â— Added ID attribues to all Reference elements (e.g., id="tables" for the doc - for section on Table params). So pages for all subsections of ref docs now - have stable filenames instead of arbitrary generated filenames. - - Modified: fo/param.xweb,1.100; html/param.xweb,1.94 - Michael(tm) Smith - - â— Added two new parameters for handling of multi-term varlistentry elements: - - variablelist.term.break.after: When the variablelist.term.break.after is - non-zero, it will generate a line break after each term multi-term - varlistentry. - - variablelist.term.separator: When a varlistentry contains multiple term - elements, the string specified in the value of the - variablelist.term.separator parameter is placed after each term except the - last. The default is ", " (a comma followed by a space). To suppress - rendering of the separator, set the value of variablelist.term.separator to - the empty string (""). - - These parameters are primarily intended to be useful if you have multi-term - varlistentries that have long terms. - - Closes #1306676. Thanks to Sam Steingold for providing an example "lots of - long terms" doc that demonstrated the value of having these options. - - Also, added normalize-space() call to processing of each term. - - This change affects all output formats (HTML, PDF, manpages). The default - behavior should pretty much remain the same as before, but it is possible - (as always) that the change may introduce some new bugginess. - - Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; fo/param.xweb,1.99; html/ - lists.xsl,1.48; html/param.ent,1.86; html/param.xweb,1.93; manpages/ - lists.xsl,1.22; manpages/param.ent,1.14; manpages/param.xweb,1.16; params/ - variablelist.term.break.after.xml,1.1; params/ - variablelist.term.separator.xml,1.1 - Michael(tm) Smith - - â— Add sidebar titlepage placeholder attset for styles. - - Modified: fo/titlepage.xsl,1.37 - Robert Stayton - - â— Add titlepage for sidebar. - - Modified: fo/titlepage.templates.xml,1.27 - Robert Stayton - - â— Implemented RFE #1292615. - - Added bunch of new parameters (attribute sets) that affect list - presentation: list.block.properties, itemizedlist.properties, orderedlist - .properties, itemizedlist.label.properties and orderedlist.label - .properties. Default behaviour of stylesheets has not been changed but - further customizations will be much more easier. - - Modified: fo/lists.xsl,1.61; fo/param.ent,1.87; fo/param.xweb,1.98; params/ - itemizedlist.label.properties.xml,1.1; params/ - itemizedlist.properties.xml,1.1; params/list.block.properties.xml,1.1; - params/orderedlist.label.properties.xml,1.1; params/ - orderedlist.properties.xml,1.1 - Jirka Kosek - - â— Implemented RFE #1242092. - - You can enable crop marks in your document by setting crop.marks=1 and - xep.extensions=1. Appearance of crop marks can be controlled by parameters - crop.mark.bleed (6pt), crop.mark.offset (24pt) and crop.mark.width (0.5pt). - - Also there is new named template called user-xep-pis. You can overwrite it - in order to produce some PIs that can control XEP as described in http:// - www.renderx.com/reference.html#Output_Formats - - Modified: fo/docbook.xsl,1.36; fo/param.ent,1.86; fo/param.xweb,1.97; fo/ - xep.xsl,1.23; params/crop.mark.bleed.xml,1.1; params/ - crop.mark.offset.xml,1.1; params/crop.mark.width.xml,1.1; params/ - crop.marks.xml,1.1 - Jirka Kosek - -HTML - -The following changes have been made to the html code since the 1.69.1 release. - - â— implemented index.method parameter and three methods. - - Modified: html/autoidx.xsl,1.28 - Robert Stayton - - â— added index.method parameter to support 3 indexing methods. - - Modified: html/param.ent,1.94; html/param.xweb,1.103 - Robert Stayton - - â— Implemented feature request #1072510 as a processing instruction to permit - including external HTML content into HTML output. - - Modified: html/pi.xsl,1.9 - Robert Stayton - - â— Added new parameter chunk.tocs.and.lots.has.title which controls presence - of title in a separate chunk with ToC/LoT. Disabling title can be very - useful if you are generating frameset output (well, yes those frames, but - some customers really want them ;-). - - Modified: html/chunk-code.xsl,1.15; html/param.ent,1.93; html/ - param.xweb,1.102; params/chunk.tocs.and.lots.has.title.xml,1.1 - Jirka - Kosek - - â— Support dbhtml/dbfo start PI for orderedlist numbering in both HTML and FO - - Modified: common/common.xsl,1.61; html/lists.xsl,1.50 - Norman Walsh - - â— Allow ToC without title also for set and book. - - Modified: html/autotoc.xsl,1.37; html/division.xsl,1.12 - Jirka Kosek - - â— Implemented floats uniformly for figure, example, equation and - informalfigure, informalexample, and informalequation. - - Modified: html/formal.xsl,1.22 - Robert Stayton - - â— Added the autotoc.label.in.hyperlink param. - - If the value of autotoc.label.in.hyperlink is non-zero, labels are included - in hyperlinked titles in the TOC. If it is instead zero, labels are still - displayed prior to the hyperlinked titles, but are not hyperlinked along - with the titles. - - Closes patch #1065868. Thanks to anatoly techtonik for the patch. - - Modified: html/autotoc.xsl,1.36; html/param.ent,1.92; html/ - param.xweb,1.101; params/autotoc.label.in.hyperlink.xml,1.1 - Michael(tm) - Smith - - â— Added two new params: html.head.legalnotice.link.types and html.head. - legalnotice.link.multiple. - - If the value of the generate.legalnotice.link is non-zero, then the - stylesheet generates (in the head section of the HTML source) either a - single HTML link element or, if the value of the html.head.legalnotice.link - .multiple is non-zero, one link element for each link type specified. Each - link has the following attributes: - - - a rel attribute whose value is derived from the value of html.head. - legalnotice.link.types - - - an href attribute whose value is set to the URL of the file containing - the legalnotice - - - a title attribute whose value is set to the title of the corresponding - legalnotice (or a title programatically determined by the stylesheet) - - For example: - - - - Closes #1476450. Thanks to Sam Steingold. - - Modified: html/chunk-common.xsl,1.45; html/param.ent,1.91; html/ - param.xweb,1.100; params/generate.legalnotice.link.xml,1.4; params/ - html.head.legalnotice.link.multiple.xml,1.1; params/ - html.head.legalnotice.link.types.xml,1.1 - Michael(tm) Smith - - â— Added refclass.suppress param. - - If the value of refclass.suppress is non-zero, then display refclass - contents is suppressed in output. Affects HTML and FO output only. - - Modified: fo/param.ent,1.93; fo/param.xweb,1.106; html/param.ent,1.90; html - /param.xweb,1.99; params/refclass.suppress.xml,1.1 - Michael(tm) Smith - - â— Improved support for task subelements - - Modified: fo/task.xsl,1.3; html/task.xsl,1.3 - Jirka Kosek - - â— Added new refclass.suppress param for suppressing display of Refclass in - HTML and FO output. Did not add it to manpages because manpages stylesheet - is currently just silently ignoring Refclass anyway. Closes request # - 1461065. Thanks to Davor Ocelic (docelic) for reporting. - - Modified: fo/refentry.xsl,1.29; html/refentry.xsl,1.23 - Michael(tm) Smith - - â— Process alt text with normalize-space(). Replace tab indents with spaces. - - Modified: html/graphics.xsl,1.57 - Robert Stayton - - â— Content of citation element is automatically linked to the bibliographic - entry with the corresponding abbrev. - - Modified: html/biblio.xsl,1.26; html/inline.xsl,1.47; html/xref.xsl,1.58 - - Jirka Kosek - - â— Add template for task in mode="xref-to". - - Modified: fo/xref.xsl,1.63; html/xref.xsl,1.57 - Robert Stayton - - â— Suppress ID warnings if the .warnings parameter is 0 - - Modified: html/html.xsl,1.17 - Norman Walsh - - â— Add support for floatstyle to figure. - - Modified: html/formal.xsl,1.21 - Robert Stayton - - â— Handling of xref to area/areaset need support in extensions code also. I - currently have no time to touch extensions code, so code is here to be - enabled when extension is fixed also. - - Modified: html/xref.xsl,1.56 - Jirka Kosek - - â— Added 3 parameters for overriding gentext for index punctuation. - - Modified: html/param.ent,1.89; html/param.xweb,1.98 - Robert Stayton - - â— Added parameters to support localization of index item punctuation. Added - index.separator named template to compute the separator punctuation based - on locale. - - Modified: html/autoidx.xsl,1.27 - Robert Stayton - - â— Added a
    wrapper around output of contents - of all formal objects. Also, added an optional
    - linebreak after all formal objects. - - WARNING: Because this change places an additional DIV between the DIV - wrapper for the equation and the equation contents, it may break some - existing CSS stylesheets that have been created with the assumption that - there would never be an intervening DIV there. - - The following is an example of what Equation output looks like as a result - of the changes described above. - -
    - -

    (1.3)

    - -
    1+1=3

    - - Rationale: These changes allow CSS control of the placement of the - formal-object title relative to the formal-object contents. For example, - using the CSS "float" property enables the title and contents to be - rendered on the same line. Example stylesheet: - - .equation { margin-top: 20px; margin-bottom: 20px; } .equation-contents { - float: left; } - - .equation .title { margin-top: 0; float: right; margin-right: 200px; } - - .equation .title b { font-weight: normal; } - - .equation-break { clear: both; } - - Note that the purpose of the ".equation-break" class is to provide a way to - clear off the floats. - - If you want to instead have the equation title rendered to the left of the - equation contents, you can do something like this: - - .equation { margin-top: 20px; width: 300px; margin-bottom: 20px; } - .equation-contents { float: right; } - - .equation .title { margin-top: 0; float: left; margin-right: 200px; } - - .equation .title b { font-weight: normal; } - - .equation-break { clear: both; } - - Modified: html/formal.xsl,1.20 - Michael(tm) Smith - - â— Added a chunker.output.quiet top-level parameter so that the chunker can be - made quiet by default - - Modified: html/chunker.xsl,1.26 - Norman Walsh - - â— Added support for link, olink, and xref within OO Classsynopsis and - children. (Because DocBook NG/5 allows it). - - Modified: fo/synop.xsl,1.15; html/synop.xsl,1.19 - Michael(tm) Smith - - â— New parameter: id.warnings. If non-zero, warnings are generated for titled - objects that don't have titles. True by default; I wonder if this will be - too aggressive? - - Modified: html/biblio.xsl,1.25; html/component.xsl,1.27; html/ - division.xsl,1.11; html/formal.xsl,1.19; html/glossary.xsl,1.20; html/ - html.xsl,1.13; html/index.xsl,1.16; html/param.ent,1.88; html/ - param.xweb,1.97; html/refentry.xsl,1.22; html/sections.xsl,1.30; params/ - id.warnings.xml,1.1 - Norman Walsh - - â— If the keep.relative.image.uris parameter is true, don't use the absolute - URI (as calculated from xml:base) in the img src attribute, us the value - the author specified. Note that we still have to calculate the absolute - filename for use in the image intrinsics extension. - - Modified: html/graphics.xsl,1.56 - Norman Walsh - - â— Support date as an inline - - Modified: fo/inline.xsl,1.43; html/inline.xsl,1.46 - Norman Walsh - - â— Added new parameter keep.relative.image.uris - - Modified: fo/param.ent,1.91; fo/param.xweb,1.104; html/param.ent,1.87; html - /param.xweb,1.96; params/keep.relative.image.uris.xml,1.1 - Norman Walsh - - â— Added two new parameters for handling of multi-term varlistentry elements: - - variablelist.term.break.after: When the variablelist.term.break.after is - non-zero, it will generate a line break after each term multi-term - varlistentry. - - variablelist.term.separator: When a varlistentry contains multiple term - elements, the string specified in the value of the - variablelist.term.separator parameter is placed after each term except the - last. The default is ", " (a comma followed by a space). To suppress - rendering of the separator, set the value of variablelist.term.separator to - the empty string (""). - - These parameters are primarily intended to be useful if you have multi-term - varlistentries that have long terms. - - Closes #1306676. Thanks to Sam Steingold for providing an example "lots of - long terms" doc that demonstrated the value of having these options. - - Also, added normalize-space() call to processing of each term. - - This change affects all output formats (HTML, PDF, manpages). The default - behavior should pretty much remain the same as before, but it is possible - (as always) that the change may introduce some new bugginess. - - Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; fo/param.xweb,1.99; html/ - lists.xsl,1.48; html/param.ent,1.86; html/param.xweb,1.93; manpages/ - lists.xsl,1.22; manpages/param.ent,1.14; manpages/param.xweb,1.16; params/ - variablelist.term.break.after.xml,1.1; params/ - variablelist.term.separator.xml,1.1 - Michael(tm) Smith - - â— Added "wrapper-name" param to inline.charseq named template, enabling it to - output inlines other than just "span". Acronym and Abbrev templates now use - inline.charseq to output HTML "acronym" and "abbr" elements (instead of - "span"). Closes #1305468. Thanks to Sam Steingold for suggesting the - change. - - Modified: html/inline.xsl,1.45 - Michael(tm) Smith - -Manpages - -The following changes have been made to the manpages code since the 1.69.1 -release. - - â— Added the following params: - - - man.indent.width (string-valued) - man.indent.refsect (boolean) - - man.indent.blurbs (boolean) - man.indent.lists (boolean) - - man.indent.verbatims (boolean) - - Note that in earlier snapshots, man.indent.width was named - man.indentation.default.value and the boolean params had names like - man.indentation.*.adjust. Also the man.indent.blurbs param was called - man.indentation.authors.adjust (or something). - - The behavior now is: If the value of a particular man.indent.* boolean - param is non-zero, the corresponding contents (refsect*, list items, - authorblurb/personblurb, vervatims) are displayed with a left margin - indented by a width equal to the value of man.indent.width. - - Modified: params/man.indent.blurbs.xml,1.1; manpages/docbook.xsl,1.74; - manpages/info.xsl,1.20; manpages/lists.xsl,1.30; manpages/other.xsl,1.20; - manpages/param.ent,1.22; manpages/param.xweb,1.24; manpages/ - refentry.xsl,1.14; params/man.indent.lists.xml,1.1; params/ - man.indent.refsect.xml,1.1; params/man.indent.verbatims.xml,1.1; params/ - man.indent.width.xml,1.1 - Michael(tm) Smith - - â— Added man.table.footnotes.divider param. - - In each table that contains footenotes, the string specified by the man. - table.footnotes.divider parameter is output before the list of footnotes - for the table. - - Modified: manpages/docbook.xsl,1.73; manpages/links.xsl,1.6; manpages/ - param.ent,1.21; manpages/param.xweb,1.23; params/ - man.table.footnotes.divider.xml,1.1 - Michael(tm) Smith - - â— Added the man.output.in.separate.dir, man.output.base.dir, and - man.output.subdirs.enabled parameters. - - The man.output.base.dir parameter specifies the base directory into which - man-page files are output. The man.output.subdirs.enabled parameter - controls whether the files are output in subdirectories within the base - directory. - - The values of the man.output.base.dir and man.output.subdirs.enabled - parameters are used only if the value of man.output.in.separate.dir - parameter is non-zero. If the value of man.output.in.separate.dir is zero, - man-page files are not output in a separate directory. - - Modified: manpages/docbook.xsl,1.72; manpages/param.ent,1.20; manpages/ - param.xweb,1.22; params/man.output.base.dir.xml,1.1; params/ - man.output.in.separate.dir.xml,1.1; params/ - man.output.subdirs.enabled.xml,1.1 - Michael(tm) Smith - - â— Added man.font.table.headings and man.font.table.title params, for - controlling font in table headings and titles. - - Modified: manpages/docbook.xsl,1.71; manpages/param.ent,1.19; manpages/ - param.xweb,1.21; params/man.font.table.headings.xml,1.1; params/ - man.font.table.title.xml,1.1 - Michael(tm) Smith - - â— Added man.font.funcsynopsisinfo and man.font.funcprototype params, for - specifying the roff font (for example, BI, B, I) for funcsynopsisinfo and - funcprototype output. - - Modified: manpages/block.xsl,1.19; manpages/docbook.xsl,1.69; manpages/ - param.ent,1.18; manpages/param.xweb,1.20; manpages/synop.xsl,1.29; manpages - /table.xsl,1.21; params/man.font.funcprototype.xml,1.1; params/ - man.font.funcsynopsisinfo.xml,1.1 - Michael(tm) Smith - - â— Added man.segtitle.suppress param. - - If the value of man.segtitle.suppress is non-zero, then display of segtitle - contents is suppressed in output. - - Modified: manpages/docbook.xsl,1.68; manpages/param.ent,1.17; manpages/ - param.xweb,1.19; params/man.segtitle.suppress.xml,1.1 - Michael(tm) Smith - - â— Added man.output.manifest.enabled and man.output.manifest.filename params. - - If man.output.manifest.enabled is non-zero, a list of filenames for man - pages generated by the stylesheet transformation is written to the file - named by man.output.manifest.filename - - Modified: manpages/docbook.xsl,1.67; manpages/other.xsl,1.19; manpages/ - param.ent,1.16; manpages/param.xweb,1.18; params/ - man.output.manifest.enabled.xml,1.1; params/ - man.output.manifest.filename.xml,1.1; tools/make/Makefile.DocBook,1.4 - - Michael(tm) Smith - - â— Added refentry.meta.get.quietly param. - - If zero (the default), notes and warnings about "missing" markup are - generated during gathering of refentry metadata. If non-zero, the metadata - is gathered "quietly" -- that is, the notes and warnings are suppressed. - - NOTE: If you are processing a large amount of refentry content, you may be - able to speed up processing significantly by setting a non-zero value for - refentry.meta.get.quietly. - - Modified: common/refentry.xsl,1.17; manpages/param.ent,1.15; manpages/ - param.xweb,1.17; params/refentry.meta.get.quietly.xml,1.1 - Michael(tm) - Smith - - â— Changed names of all boolean indentation params to man.indent.* Also - discarded individual man.indent.*.value params and switched to just using a - common man.indent.width param (3n by default). - - Modified: manpages/docbook.xsl,1.66; manpages/info.xsl,1.19; manpages/ - lists.xsl,1.29; manpages/other.xsl,1.18; manpages/refentry.xsl,1.13 - - Michael(tm) Smith - - â— Added boolean man.output.in.separate.dir param, to control whether or not - man files are output in separate directory. - - Modified: manpages/docbook.xsl,1.65; manpages/utility.xsl,1.14 - Michael - (tm) Smith - - â— Added options for controlling indentation of verbatim output. Controlled - through the man.indentation.verbatims.adjust and - man.indentation.verbatims.value params. Closes #1242997 - - Modified: manpages/block.xsl,1.15; manpages/docbook.xsl,1.64 - Michael(tm) - Smith - - â— Added options for controlling indentation in lists and in *blurb output in - the AUTHORS section. Controlled through the man.indentation.lists.adjust, - man.indentation.lists.value, man.indentation.authors.adjust, and - man.indentation.authors.value parameters. Default is 3 characters (instead - of the roff default of 8 characters). Closes #1449369. - - Also, removed the indent that was being set on informalexample outuput. I - will instead add an option for indenting verbatims, which I think is what - the informalexample indent was intended for originally. - - Modified: manpages/block.xsl,1.14; manpages/docbook.xsl,1.63; manpages/ - info.xsl,1.18; manpages/lists.xsl,1.28 - Michael(tm) Smith - - â— Changed line-spacing call before synopfragment to use ".sp -1n" ("n" units - specified) instead of plain ".sp -1" - - Modified: manpages/synop.xsl,1.28 - Michael(tm) Smith - - â— Added support for writing man files into a specific output directory and - into appropriate subdirectories within that output directory. Controlled - through the man.base.dir parameter (similar to the base.dir support in the - HTML stylesheet) and the man.subdirs.enabled parameter, which automatically - determines the name of an appropriate subdir (for example, man/man7, man/ - man1, etc.) based on the section number/manvolnum of the source Refentry. - - Closes #1255036 and #1170317. Thanks to Denis Bradford for the original - feature request, and to Costin Stroie for submitting a patch that was very - helpful in implementing the support. - - Modified: manpages/docbook.xsl,1.62; manpages/utility.xsl,1.13 - Michael - (tm) Smith - - â— Refined XPath statements and notification messages for refentry metadata - handling. - - Modified: common/common.xsl,1.59; common/refentry.xsl,1.14; manpages/ - docbook.xsl,1.61; manpages/other.xsl,1.17 - Michael(tm) Smith - - â— Added support for copyright and legalnotice. The manpages stylesheets now - output a COPYRIGHT section, after the AUTHORS section, if a copyright or - legalnotice is found in the source. The section contains the copyright - contents followed by the legalnotice contents. Closes #1450209. - - Modified: manpages/docbook.xsl,1.59; manpages/info.xsl,1.17 - Michael(tm) - Smith - - â— Drastically reworked all of the XPath expressions used in refentry metadata - gathering -- completely removed $parentinfo and turned $info into a set of - nodes that includes the *info contents of the Refentry plus the *info - contents all all of its ancestor elements. The basic XPath expression now - used throughout is (using the example of checking for a date): - - (($info[//date])[last()]/date)[1]. - - That selects the "last" *info/date date in document order -- that is, the - one eitther on the Refentry itself or on the closest ancestor to the - Refentry. - - It's likely this change may break some things; may need to pick up some - pieces later. - - Also, changed the default value for the man.th.extra2.max.length from 40 to - 30. - - Modified: common/common.xsl,1.58; common/refentry.xsl,1.7; params/ - man.th.extra2.max.length.xml,1.2; params/refentry.date.profile.xml,1.2; - params/refentry.manual.profile.xml,1.2; params/ - refentry.source.name.profile.xml,1.2; params/ - refentry.version.profile.xml,1.2; manpages/docbook.xsl,1.58; manpages/ - other.xsl,1.15 - Michael(tm) Smith - - â— Added support for DocBook 5 namespace-stripping in manpages stylesheet. - Closes request #1210692. - - Modified: common/common.xsl,1.56; manpages/docbook.xsl,1.57 - Michael(tm) - Smith - - â— Fixed handling of table footnotes. With this checkin, the table support in - the manpages stylesheet is now basically feature complete. So this change - closes request #619532, "No support for tables" -- the oldest currently - open manpages feature request, submitted by Ben Secrest (blsecres) on - 2002-10-07. Congratulations to me [patting myself on the back]. - - Modified: manpages/block.xsl,1.11; manpages/docbook.xsl,1.55; manpages/ - table.xsl,1.15 - Michael(tm) Smith - - â— Added handling for table titles. Also fixed handling of nested tables; nest - tables are now "extracted" and displayed just after their parent tables. - - Modified: manpages/docbook.xsl,1.54; manpages/table.xsl,1.14 - Michael(tm) - Smith - - â— Added option for turning off bold formatting in Funcsynopsis. Boldface - formatting in function synopsis is mandated in the man(7) man page and is - used almost universally in existing man pages. Despite that, it really does - look like crap to have an entire Funcsynopsis output in bold, so I added - params for turning off the bold formatting and/or replacing it with a - different roff special font (e.g., "RI" for alternating roman/italic - instead of the default "BI" for alternating bold/italic). The new params - are "man.funcprototype.font" and "man.funcsynopsisinfo.font". To be - documented later. - - Closes #1452247. Thanks to Joe Orton for the feature request. - - Modified: params/man.string.subst.map.xml,1.16; manpages/block.xsl,1.10; - manpages/docbook.xsl,1.51; manpages/inline.xsl,1.16; manpages/ - synop.xsl,1.27 - Michael(tm) Smith - - â— Use AUTHORS instead of AUTHOR if we have multiple people to attribute. - Also, fixed checking such that we generate author section even if we don't - have an author (as long as there is at least one other person/entity we can - put in the section). Also adjusted assembly of content for Author metainfo - field such that we now not only use author, but try to find a "best match" - if we can't find an author name to put there. - - Closes #1233592. Thanks to Sam Steingold for the request. - - Modified: manpages/info.xsl,1.12 - Michael(tm) Smith - - â— Changes for request #1243027, "Impove handling of AUTHOR section." This - adds support for Collab, Corpauthor, Corpcredt, Orgname, Publishername, and - Publisher. Also adds support for output of Affiliation and its children, - and support for using gentext strings for auto-attributing roles (Author, - Editor, Publisher, Translator, etc.). Also did a lot of code cleanup and - modularization of all the AUTHOR handling code. And fixed a bug that was - causing Author info to not be picked up correctly for metainfo comment we - embed in man-page source. - - Modified: manpages/info.xsl,1.11 - Michael(tm) Smith - - â— Support bold output for "emphasis remap='B'". (because Eric Raymond's - doclifter(1) tool converts groff source marked up with ".B" request or "\ - fB" escapes to DocBook "emphasis remap='B'".) - - Modified: manpages/inline.xsl,1.14 - Michael(tm) Smith - - â— Added support for Segmentedlist. Details: Output is tabular, with no option - for "list" type output. Output for Segtitle elements can be supressed by - setting man.segtitle.suppress. If Segtitle content is output, it is - rendered in italic type (not bold because not all terminals support bold - and so italic ensures the stand out on those terminals). Extra space (.sp - line) at end of table code ensures that it gets handled correctly in the - case where its source is the child of a Para. Closes feature-request # - 1400097. Thanks to Daniel Leidert for the patch and push, and to Alastair - Rankine for filing the original feature request. - - Modified: manpages/lists.xsl,1.23; manpages/utility.xsl,1.10 - Michael(tm) - Smith - - â— Improved handling or Author/Editor/Othercredit. - - Reworked content of (non-visible) comment added at top of each page - (metadata stuff). - - Added support for generating a manifest file (useful for cleaning up after - builds, etc.) - - Modified: manpages/docbook.xsl,1.46; manpages/info.xsl,1.9; manpages/ - other.xsl,1.12; manpages/utility.xsl,1.6 - Michael(tm) Smith - - â— Added two new parameters for handling of multi-term varlistentry elements: - - variablelist.term.break.after: When the variablelist.term.break.after is - non-zero, it will generate a line break after each term multi-term - varlistentry. - - variablelist.term.separator: When a varlistentry contains multiple term - elements, the string specified in the value of the - variablelist.term.separator parameter is placed after each term except the - last. The default is ", " (a comma followed by a space). To suppress - rendering of the separator, set the value of variablelist.term.separator to - the empty string (""). - - These parameters are primarily intended to be useful if you have multi-term - varlistentries that have long terms. - - Closes #1306676. Thanks to Sam Steingold for providing an example "lots of - long terms" doc that demonstrated the value of having these options. - - Also, added normalize-space() call to processing of each term. - - This change affects all output formats (HTML, PDF, manpages). The default - behavior should pretty much remain the same as before, but it is possible - (as always) that the change may introduce some new bugginess. - - Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; fo/param.xweb,1.99; html/ - lists.xsl,1.48; html/param.ent,1.86; html/param.xweb,1.93; manpages/ - lists.xsl,1.22; manpages/param.ent,1.14; manpages/param.xweb,1.16; params/ - variablelist.term.break.after.xml,1.1; params/ - variablelist.term.separator.xml,1.1 - Michael(tm) Smith - -Params - -The following changes have been made to the params code since the 1.69.1 -release. - - â— New parameters to set header/footer table minimum height. - - Modified: params/footer.table.height.xml,1.1; params/ - header.table.height.xml,1.1 - Robert Stayton - - â— Support multiple indexing methods for different languages. - - Modified: params/index.method.xml,1.1 - Robert Stayton - - â— Remove qandaset and qandadiv from generate.toc for fo output because - formerly it wasn't working, but now it is and the default behavior should - stay the same. - - Modified: params/generate.toc.xml,1.8 - Robert Stayton - - â— add support for page number references to link element too. - - Modified: params/insert.link.page.number.xml,1.1 - Robert Stayton - - â— Add support for more characters to hyphen on when ulink.hyphenate is turned - on. - - Modified: params/ulink.hyphenate.chars.xml,1.1; params/ - ulink.hyphenate.xml,1.3 - Robert Stayton - - â— New attribute-set to format biblioentry and bibliomixed. - - Modified: params/biblioentry.properties.xml,1.1 - Robert Stayton - - â— Added new parameter chunk.tocs.and.lots.has.title which controls presence - of title in a separate chunk with ToC/LoT. Disabling title can be very - useful if you are generating frameset output (well, yes those frames, but - some customers really want them ;-). - - Modified: html/chunk-code.xsl,1.15; html/param.ent,1.93; html/ - param.xweb,1.102; params/chunk.tocs.and.lots.has.title.xml,1.1 - Jirka - Kosek - - â— Added new attribute set toc.line.properties for controlling appearance of - lines in ToC/LoT - - Modified: params/toc.line.properties.xml,1.1 - Jirka Kosek - - â— Allow table footnotes to have different properties from regular footnotes. - - Modified: params/table.footnote.properties.xml,1.1 - Robert Stayton - - â— Set properties for pgwide="1" objects. - - Modified: params/pgwide.properties.xml,1.1 - Robert Stayton - - â— Added the autotoc.label.in.hyperlink param. - - If the value of autotoc.label.in.hyperlink is non-zero, labels are included - in hyperlinked titles in the TOC. If it is instead zero, labels are still - displayed prior to the hyperlinked titles, but are not hyperlinked along - with the titles. - - Closes patch #1065868. Thanks to anatoly techtonik for the patch. - - Modified: html/autotoc.xsl,1.36; html/param.ent,1.92; html/ - param.xweb,1.101; params/autotoc.label.in.hyperlink.xml,1.1 - Michael(tm) - Smith - - â— Added two new params: html.head.legalnotice.link.types and html.head. - legalnotice.link.multiple. - - If the value of the generate.legalnotice.link is non-zero, then the - stylesheet generates (in the head section of the HTML source) either a - single HTML link element or, if the value of the html.head.legalnotice.link - .multiple is non-zero, one link element for each link type specified. Each - link has the following attributes: - - - a rel attribute whose value is derived from the value of html.head. - legalnotice.link.types - - - an href attribute whose value is set to the URL of the file containing - the legalnotice - - - a title attribute whose value is set to the title of the corresponding - legalnotice (or a title programatically determined by the stylesheet) - - For example: - - - - Closes #1476450. Thanks to Sam Steingold. - - Modified: html/chunk-common.xsl,1.45; html/param.ent,1.91; html/ - param.xweb,1.100; params/generate.legalnotice.link.xml,1.4; params/ - html.head.legalnotice.link.multiple.xml,1.1; params/ - html.head.legalnotice.link.types.xml,1.1 - Michael(tm) Smith - - â— Added the following params: - - - man.indent.width (string-valued) - man.indent.refsect (boolean) - - man.indent.blurbs (boolean) - man.indent.lists (boolean) - - man.indent.verbatims (boolean) - - Note that in earlier snapshots, man.indent.width was named - man.indentation.default.value and the boolean params had names like - man.indentation.*.adjust. Also the man.indent.blurbs param was called - man.indentation.authors.adjust (or something). - - The behavior now is: If the value of a particular man.indent.* boolean - param is non-zero, the corresponding contents (refsect*, list items, - authorblurb/personblurb, vervatims) are displayed with a left margin - indented by a width equal to the value of man.indent.width. - - Modified: params/man.indent.blurbs.xml,1.1; manpages/docbook.xsl,1.74; - manpages/info.xsl,1.20; manpages/lists.xsl,1.30; manpages/other.xsl,1.20; - manpages/param.ent,1.22; manpages/param.xweb,1.24; manpages/ - refentry.xsl,1.14; params/man.indent.lists.xml,1.1; params/ - man.indent.refsect.xml,1.1; params/man.indent.verbatims.xml,1.1; params/ - man.indent.width.xml,1.1 - Michael(tm) Smith - - â— Added man.table.footnotes.divider param. - - In each table that contains footenotes, the string specified by the man. - table.footnotes.divider parameter is output before the list of footnotes - for the table. - - Modified: manpages/docbook.xsl,1.73; manpages/links.xsl,1.6; manpages/ - param.ent,1.21; manpages/param.xweb,1.23; params/ - man.table.footnotes.divider.xml,1.1 - Michael(tm) Smith - - â— Added the man.output.in.separate.dir, man.output.base.dir, and - man.output.subdirs.enabled parameters. - - The man.output.base.dir parameter specifies the base directory into which - man-page files are output. The man.output.subdirs.enabled parameter - controls whether the files are output in subdirectories within the base - directory. - - The values of the man.output.base.dir and man.output.subdirs.enabled - parameters are used only if the value of man.output.in.separate.dir - parameter is non-zero. If the value of man.output.in.separate.dir is zero, - man-page files are not output in a separate directory. - - Modified: manpages/docbook.xsl,1.72; manpages/param.ent,1.20; manpages/ - param.xweb,1.22; params/man.output.base.dir.xml,1.1; params/ - man.output.in.separate.dir.xml,1.1; params/ - man.output.subdirs.enabled.xml,1.1 - Michael(tm) Smith - - â— Added man.font.table.headings and man.font.table.title params, for - controlling font in table headings and titles. - - Modified: manpages/docbook.xsl,1.71; manpages/param.ent,1.19; manpages/ - param.xweb,1.21; params/man.font.table.headings.xml,1.1; params/ - man.font.table.title.xml,1.1 - Michael(tm) Smith - - â— Added man.font.funcsynopsisinfo and man.font.funcprototype params, for - specifying the roff font (for example, BI, B, I) for funcsynopsisinfo and - funcprototype output. - - Modified: manpages/block.xsl,1.19; manpages/docbook.xsl,1.69; manpages/ - param.ent,1.18; manpages/param.xweb,1.20; manpages/synop.xsl,1.29; manpages - /table.xsl,1.21; params/man.font.funcprototype.xml,1.1; params/ - man.font.funcsynopsisinfo.xml,1.1 - Michael(tm) Smith - - â— Changed to select="0" in refclass.suppress (instead of ..>0 as a child of the list. For example: - - Choose from - ONE and ONLY ONE of the following: - - - A - B - C. - - Output (for English): - - Choose from ONE and only ONE of the following choices: A, B, or C. - - As a temporary workaround for the fact that most of the DocBook non-English - locale files don't have a localization for the word “orâ€, you can put in a - literal string to be used; example for French: . - That is, use “ou†instead of “orâ€. - -FO - - â— Added content-type property to external-graphic element, based on imagedata - format attribute. - - â— Added support for generating field for - XEP output. This makes the DocBook XSL stylesheet version information - available through the Document Properties menu in Acrobat Reader and other - PDF viewers. - - â— Trademark symbol handling made consistent with handling of same in HTML - stylesheets. Prior to this change, if you processed a document that - contained no value for the class attribute on the trademark element, the - HTML stylesheets would default to rendering a superscript TM symbol after - the trademark contents, but the FO stylesheets would render nothing. - - â— Added support for generating XEP bookmarks for refentry. - - â— Added support for HTML markup table border attribute, applied to each table - cell. - - â— The table.width template can now sum column specs if none use % or *. - - â— Added fox:destination extension inside fox:outline to support linking to - internal destinations. - - â— Added support for customizing abstract with property sets. Controlled with - the abstract.properties and abstract.title.properties parameters. - - â— Add footnotes in table title to table footnote set, and add support for - table footnotes to HTML table markup. - - â— Added support for title in glosslist. - - â— Added support for itemizedlist symbol none. - - â— Implemented the new graphical.admonition.properties and - nongraphical.admonition.properties attribute sets. - - â— Added id to formalpara and some other blocks that were missing it. - - â— Changed the anchor template to output fo:inline instead of fo:wrapper. - - â— Added support for toc.max.depth parameter. - -Help - - â— Eclipse Help: Added support for generating olink database. - -HTML - - â— Added a first cut at support in HTML output for DocBook 5 style annotation - s. Controlled using the annotation.support parameter, and implemented using - JavaScript and CSS styling. For more details, see the documentation for the - annotation.js, annotation.css, annotation.graphic.open, and - annotation.graphic.close parameters. - - â— Generate client-side image map for imageobjectco with areas using calspair - units - - â— Added support for PI. - - â— Added support for passing img.src.path to DocBook Java XSLT image - extensions when appropriate. Controlled using the - graphicsize.use.img.src.path parameter. - - â— Added support for (not valid for DocBook 4) xlink:href on area and (not - valid for DocBook 4) alt in area. - - â— Added new parameter default.table.frame to control table framing if there - is no frame attribute on a table. - - â— Added initial, experimental support for generating content for the HTML - title attribute from content of the alt element. This change adds support - for the following inline elements only (none of them are block elements): - abbrev, accel, acronym, action, application, authorinitials, beginpage, - citation, citerefentry, citetitle, city, classname, code, command, - computeroutput, constant, country, database, email, envar, errorcode, - errorname, errortext, errortype, exceptionname, fax, filename, firstname, - firstterm, foreignphrase, function, glossterm, guibutton, guiicon, guilabel - , guimenu, guimenuitem, guisubmenu, hardware, honorific, interface, - interfacename, keycap, keycode, keysym, lineage, lineannotation, literal, - markup, medialabel, methodname, mousebutton, option, optional, otheraddr, - othername, package, parameter, personname, phone, pob, postcode, - productname, productnumber, prompt, property, quote, refentrytitle, remark, - replaceable, returnvalue, tag, shortcut, state, street, structfield, - structname, subscript, superscript, surname, symbol, systemitem, tag, - termdef, token, trademark, type, uri, userinput, varname, and wordasword - - â— Added support for chunking revhistory into separate file (similar to the - support for doing same with legalnotice). Patch from Thomas Schraitle. - Controlled through new generate.revhistory.link parameter. - - â— l10n.xsl: Made language codes RFC compliant. Added a new boolean config - parameter, l10n.lang.value.rfc.compliant. If it is non-zero (the default), - any underscore in a language code will be converted to a hyphen in HTML - output. If it is zero, the language code will be left as-is. - -man - -This release closes out 44 manpages stylesheet bug reports and feature -requests. It adds more than 35 new configuration parameters for controlling -aspects of man-page output -- including hyphenation and justification, handling -of links, conversion of Unicode characters, and contents of man-page headers -and footers. - - â— New options for globally disabling/enabling hyphenation and justification: - man.justify and man.hyphenate. - - Note that the default for the both of those is zero (off), because - justified text looks good only when it is also hyphenated; to quote the - “Hyphenation†node from the groff info page: - - Since the odds are not great for finding a set of words, for every - output line, which fit nicely on a line without inserting excessive - amounts of space between words, `gtroff' hyphenates words so that it - can justify lines without inserting too much space between words. - - The problem is that groff can end up hyphenating a lot of things that you - don't want hyphenated (variable names and command names, for example). - Keeping both justification and hyphenation disabled ensures that hyphens - won't get inserted where you don't want to them, and you don't end up with - lines containing excessive amounts of space between words. These default - settings run counter to how most existing man pages are formatted. But - there are some notable exceptions, such as the perl man pages. - - â— Added parameters for controlling hyphenation of computer inlines, - filenames, and URLs. By default, even when hyphenation is enabled - (globally), hyphenation is now suppressed for "computer inlines" - (currently, just classname, constant, envar, errorcode, option, replaceable - , userinput, type, and varname, and for filenames, and for URLs from link. - It can be (re)enabled using the man.hyphenate.computer.inlines, - man.hyphenate.filenames, and man.hyphenate.urls parameters. - - â— Implemented a new system for replacing Unicode characters. There are two - parts to the new system: a “string substitution map†for doing “essential†- replacements, and a “character map†that can optionally be disabled and - enabled. - - The new system fixes all open bugs that had to do with literal Unicode - numbered entities such as “ and ” showing up in output, and - greatly expands the ability of the stylesheets to generate “good†roff - equivalents for Unicode symbols and special characters. - - Here are some details... - - The previous manpages mechanism for replacing Unicode symbols and special - characters with roff equivalents (the replace-entities template) was not - scalable and not complete. The mechanism handled a somewhat arbitrary - selection of less than 20 or so Unicode characters. But there are - potentially more than 800 Unicode special characters that have some groff - equivalent they can be mapped to. And there are about 34 symbols in the - Latin-1 (ISO-8859-1) block alone. Users might reasonably expect that if - they include any of those Latin-1 characters in their DocBook source - documents, they will get correctly converted to known roff equivalents in - output. - - In addition to those common symbols, certain users may have a need to use - symbols from other Unicode blocks. Say, somebody who is documenting an - application related to math might need to use a bunch of symbols from the - “Mathematical Operators†Unicode block (there are about 65 characters in - that block that have reasonable roff equivalents). Or somebody else might - really like Dingbats -- such as the checkmark character -- and so might use - a bunch of things from the “Dingbat†block (141 characters in that that - have roff equivalents or that can at least be “degraded†somewhat - gracefully into roff). - - So, the old replace-entities mechanism was replaced with a completely - different mechanism that is based on use of two “mapsâ€: a “substitution - map†and a “character map†(the latter in a format compliant with the XSLT - 2.0 spec and therefore completely “forward compatible†with XSLT 2.0). - - The substitution map is controlled through the man.string.subst.map - parameter, and is used to replace things like the backslash character - (which needs special handling to prevent it from being interpreted as a - roff escape). The substitution map cannot be disabled, because disabling it - will cause the output to be broken. However, you can add to it and change - it if needed. - - The “character map†mechanism, on the other hand, can be completely - disabled. It is enabled by default, and, by default, does replacement of - all Latin-1 symbols, along with most special spaces, dashes, and quotes - (about 75 characters by default). Also, you can optionally enable a “full†- character map that provides support for converting all 800 or so of the - characters that have some reasonable groff equivalent. - - The character-map mechanism is controlled through the following parameters: - - man.charmap.enabled - - turns character-map support on/off - - man.charmap.use.subset - - specifies that a subset of the character map is used instead of the - full map - - man.charmap.subset.profile - - specifies profile of character-map subset - - man.charmap.uri - - specifies an alternate character map to use instead of the “standard†- character map provided in the distribution - - â— Implemented out-of-line handling of display of URLs for links (currently, - only for ulink). This gives you three choices for handling of links: - - 1. Number and list links. Each link is numbered inline, with a number in - square brackets preceding the link contents, and a numbered list of all - links is added to the end of the document. - - 2. Only list links. Links are not numbered, but an (unnumbered) list of - links is added to the end of the document. - - 3. Suppress links. Don't number links and don't add any list of links to - the end of the document. - - You can also choose whether links should be underlined. The default is “the - works†-- list, number, and underline links. You can use the - man.links.list.enabled, man.links.are.numbered, and - man.links.are.underlined parameters to change the defaults. The default - heading for the link list is REFERENCES. You can be change that using the - man.links.list.heading parameter. - - â— Changed default output encoding to UTF-8. This does not mean that man pages - are output in raw UTF-8, because the character map is applied before final - output, causing all UTF-8 characters covered in the map to be converted to - roff equivalents. - - â— Added support for processing refsect3 and formalpara and nested refsection - elements, down to any arbitrary level of nesting. - - â— Output of the NAME and SYNOPSIS and AUTHOR headings and the headings for - admonitions (note, caution, etc.) are no longer hard-coded for English. - Instead, headings are generated for those in the correct locale (just as - the FO and HTML stylesheets do). - - â— Re-worked mechanism for assembling page headers/footers (the contents of - the .TH macro “title lineâ€). - - Here are some details... - - All man pages contain a .TH roff macro whose contents are used for - rendering the “title line†displayed in the header and footer of each page. - Here are a couple of examples of real-world man pages that have useful page - headers/footers: - - gtk-options(7) GTK+ User's Manual gtk-options(7) <-- header - GTK+ 1.2 2003-10-20 gtk-options(7) <-- footer - - svgalib(7) Svgalib User Manual svgalib(7) <-- header - Svgalib 1.4.1 16 December 1999 svgalib(7) <-- footer - - And here are the terms with which the groff_man(7) man page refers to the - various parts of the header/footer: - - title(section) extra3 title(section) <- header - extra2 extra1 title(section) <- footer - - Or, using the names with which the man(7) man page refers to those same - fields: - - title(section) manual title(section) <- page header - source date title(section) <- page footer - - The easiest way to control the contents of those fields is to mark up your - refentry content like the following (note that this is a “minimal†- example). - - - - 2003-10-20 1 - - - gtk-options 2 - 7 3 - GTK+ 4 - 1.2 5 - GTK+ User's Manual 6 - - - gtk-options - Standard Command Line Options for GTK+ Programs - - - Description - This manual page describes the command line options, which - are common to all GTK+ based applications. - - - - 1 Sets the “date†part of the header/footer. - - 2 Sets the “title†part. - - 3 Sets the “section†part. - - 4 Sets the “source name†part. - - 5 Sets the “version†part. - - 6 Sets the “manual†part. - - Below are explanations of the steps the stylesheets take to attempt to - assemble and display “good†headers and footer. [In the descriptions, note - that *info is the refentry “info†child (whatever its name), and parentinfo - is the “info†child of its parent (again, whatever its name).] - - extra1 field (date) - - Content of the “extra1†field is what shows up in the center footer - position of each page. The man(7) man page describes it as “the date of - the last revisionâ€. - - To provide this content, if the refentry.date.profile.enabled is - non-zero, the stylesheets check the value of refentry.date.profile. - - Otherwise, by default, they check for a date or pubdate not only in the - *info contents, but also in the parentinfo contents. - - If a date cannot be found, the stylesheets now automatically generate a - localized “long format†date, ensuring that this field always has - content in output. - - However, if for some reason you want to suppress this field, you can do - so by setting a non-zero value for man.th.extra1.suppress. - - extra2 field (source) - - On Linux systems and on systems with a modern groff, the content of the - “extra2†field are what shows up in the left footer position of each - page. - - The man(7) man page describes this as “the source of the commandâ€, and - provides the following examples: - - â—‹ For binaries, use somwething like: GNU, NET-2, SLS Distribution, - MCC Distribution. - - â—‹ For system calls, use the version of the kernel that you are - currently looking at: Linux 0.99.11. - - â—‹ For library calls, use the source of the function: GNU, BSD 4.3, - Linux DLL 4.4.1. - - In practice, there are many pages that simply have a version number in - the “source†field. So, it looks like what we have is a two-part field, - Name Version, where: - - Name - - product name (e.g., BSD) or org. name (e.g., GNU) - - Version - - version name - - Each part is optional. If the Name is a product name, then the Version - is probably the version of the product. Or there may be no Name, in - which case, if there is a Version, it is probably the version of the - item itself, not the product it is part of. Or, if the Name is an - organization name, then there probably will be no Version. - - To provide this content, if the refentry.source.name.profile.enabled - and refentry.version.profile.enabled parameter are non-zero, the - stylesheets check the value of refentry.source.name.profile - refentry.version.profile. - - Otherwise, by default, they check the following places, in the - following order: - - 1. *info/productnumber - - 2. *info/productnumber - - 3. refmeta/refmiscinfo[@class = 'version'] - - 4. parentinfo/productnumber - - 5. *info/productname - - 6. parentinfo/productname - - 7. refmeta/refmiscinfo - - 8. [nothing found, so leave it empty] - - extra3 field - - On Linux systems and on systems with a modern groff, the content of the - “extra3†field are what shows up in the center header position of each - page. Some man pages have “extra2†content, some don't. If a particular - man page has it, it is most often “context†data about some larger - system the documented item belongs to (for example, the name or - description of a group of related applications). The stylesheets now - check the following places, in the following order, to look for content - to add to the “extra3†field. - - 1. parentinfo/title - - 2. parent's title - - 3. refmeta/refmiscinfo - - 4. [nothing found, so leave it empty] - - â— Reworked *info gathering. For each refentry found, the stylesheets now - cache its *info content, then check for any valid parent of it that might - have metainfo content and cache that, if found; they then then do all - further matches against those node-sets (rather than re-selecting the - original *info nodes each time they are needed). - - â— New option for breaking strings after forward slashes. This enables long - URLs and pathnames to be broken across lines. Controlled through - man.break.after.slash parameter. - - â— Output for servicemark and trademark are now (SM) and (TM). There is a - groff "\(tm" escape, but output from that is not acceptable. - - â— New option for controlling the length of the title part of the .TH title - line. Controlled through the man.th.title.max.length parameter. - - â— New option for specifying output encoding of each man page; controlled with - man.output.encoding (similar to the HTML chunker.output.encoding - parameter). - - â— New option for suppressing filename messages when generating output; - controlled with man.output.quietly (similar to the HTML chunk.quietly - parameter). - - â— The text of cross-references to first-level refentry (refsect1, top-level - refsection, refnamediv, and refsynopsisdiv) are now capitalized. - - â— Cross-references to refnamediv now use the localized NAME title instead of - using the first refname child. This makes the output inconsistent with HTML - and FO output, but for man-page output, it seems to make better sense to - have the NAME. (It may actually make better sense to do it that way in HTML - and FO output as well...) - - â— Added support for processing funcparams. - - â— Removed the space that was being output between funcdef and paramdef; - example: was: float rand (void); now: float rand(void) - - â— Turned off bold formatting for the type element when it occurs within a - funcdef or paramdef - - â— Corrected rendering of simplelist. Any - - - - - - - - Invoke Saxon with the encoding.windows-1252 Java system property set to - com.nwalsh.saxon.Windows1252; for example - - java \ - -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \ - com.icl.saxon.StyleSheet \ - mydoc.xml mystylesheet.xsl - - Or, for a more complete "real world" case showing other options you'll - typically want to use: - - java \ - -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \ - -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \ - -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \ - -Djavax.xml.transform.TransformerFactory=com.icl.saxon.TransformerFactoryImpl \ - com.icl.saxon.StyleSheet \ - -x org.apache.xml.resolver.tools.ResolvingXMLReader \ - -y org.apache.xml.resolver.tools.ResolvingXMLReader \ - -r org.apache.xml.resolver.tools.CatalogResolver \ - mydoc.xml mystylesheet.xsl - - In both cases, the "mystylesheet.xsl" file should be a DocBook - customization layer containing the parameters show in step 2. - - â— Saxon extensions: Removed Saxon 8 extensions from release package - -Release 1.67.0 - - â— A number of important bug fixes. - - â— Added Saxon8 extensions - - â— Enabled dbfo table-width on entrytbl in FO output - - â— Added support for role=strong on emphasis in FO output - - â— Added new FO parameter hyphenate.verbatim that can be used to turn on - "intelligent" wrapping of verbatim environments. - - â— Replaced all output with - - â— Changed admon.graphic.width template to a mode so that different - admonitions can have different graphical widths. - - â— Deprecated the HTML shade.verbatim parameter (use CSS instead) - - â— Wrapped ToC refentrytitle/refname and refpurpose in span with class values. - This makes it possible to style them using a CSS stylesheet. - - â— Use strong/em instead of b/i in HTML output - - â— Added support for converting Emphasis to groff italic and Emphasis role= - 'bold' to bold. Controlled by emphasis.propagates.style param, but not - documented yet using litprog system. Will do that next (planning to add - some other parameter-controllable options for hyphenation and handling of - line spacing). - - â— callout.graphics.number.limit.xml param: Changed the default from 10 to 15. - - â— verbatim.properties: Added hyphenate=false - - â— Saxon and Xalan Text.java extensions: Added support for URIResolver() on - insertfile href's - - â— Added generated RELEASE-NOTES.txt file. - - â— Added INSTALL file (executable file for generating catalog.xml) - - â— Removed obsolete tools directory from package - -Release 1.66.1 - - â— A number of important bug fixes. - - â— Now xml:base attributes that are generated by an XInclude processor are - resolved for image files. - - â— Rewrote olink templates to support several new features. - - â—‹ Extended full olink support to FO output. - - â—‹ Add support for xrefstyle attribute in olinks. - - â—‹ New parameters to support new olink features: insert.olink.page.number, - insert.olink.pdf.frag, olink.debug, olink.lang.fallback.sequence, - olink.properties, prefer.internal.olink. See the reference page for - each parameter for more information. - - â— Added index.on.type parameter for new type attribute introduced in DocBook - 4.3 for indexterms and index. This allows you to create multiple indices - containing different categories of entries. For users of 4.2 and earlier, - you can use the new parameter index.on.role instead. - - â— Added new section.autolabel.max.depth parameter to turn off section - numbering below a certain depth. This permits you to number major section - levels and leave minor section levels unnumbered. - - â— Added footnote.sep.leader.properties attribute set to format the line - separating footnotes in printed output. - - â— Added parameter img.src.path as a prefix to HTML img src attributes. The - prefix is added to whatever path is already generated by the stylesheet for - each image file. - - â— Added new attribute-sets informalequation.properties, - informalexample.properties, informalfigure.properties, and - informaltable.properties, so each such element type can be formatted - individually if needed. - - â— Add component.label.includes.part.label parameter to add any part number to - chapter, appendix and other component labels when the label.from.part - parameter is nonzero. This permits you to distinguish multiple chapters - with the same chapter number in cross references and the TOC. - - â— Added chunk.separate.lots parameter for HTML output. This parameter lets - you generate separate chunk files for each LOT (list of tables, list of - figures, etc.). - - â— Added several table features: - - â—‹ Added table.table.properties attribute set to add properties to the - fo:table element. - - â—‹ Added placeholder templates named table.cell.properties and - table.cell.block.properties to enable adding properties to any - fo:table-cell or the cell's fo:block, respectively. These templates are - a start for implementing table styles. - - â— Added new attribute set component.title.properties for easy modifications - of component's title formatting in FO output. - - â— Added Saxon support for an encoding attribute on the textdata element. - Added new parameter textdata.default.encoding which specifies encoding when - encoding attribute on textdata is missing. - - â— Template label.this.section now controls whole section label, not only - sub-label which corresponds to particular label. Former behaviour was IMHO - bug as it was not usable. - - â— Formatting in titleabbrev for TOC and headers is preserved when there are - no hotlink elements in the title. Formerly the title showed only the text - of the title, no font changes or other markup. - - â— Added intial.page.number template to set the initial-page-number property - for page sequences in print output. Customizing this template lets you - change when page numbering restarts. This is similar to the - format.page.number template that lets you change how the page number - formatting changes in the output. - - â— Added force.page.count template to set the force-page-count property for - page sequences in print output. This is similar to the format.page.number - template. - - â— Sort language for localized index sorting in autoidx-ng.xsl is now taken - from document lang, not from system environment. - - â— Numbering and formatting of normal and ulink footnotes (if turned on) has - been unified. Now ulink footnotes are mixed in with any other footnotes. - - â— Added support for renderas attribute in section and sect1 et al. This - permits you to render a given section title as if it were a different - level. - - â— Added support for label attribute in footnote to manually supply the - footnote mark. - - â— Added support for DocBook 4.3 corpcredit element. - - â— Added support for a dbfo keep-together PI for formal objects (table, - figure, example, equation, programlisting). That permits a formal object to - be kept together if it is not already, or to be broken if it is very long - and the default keep-together is not appropriate. - - â— For graphics files, made file extension matching case insensitive, and - updated the list of graphics extensions. - - â— Allow calloutlist to have block content before the first callout - - â— Added dbfo-need processing instruction to provide soft page breaks. - - â— Added implementation of existing but unused default.image.width parameter - for graphics. - - â— Support DocBook NG tag inline element. - - â— It appears that XEP now supports Unicode characters in bookmarks. There is - no further need to strip accents from characters. - - â— Make segmentedlist HTML markup more semantic and available to CSS styles. - - â— Added user.preroot placeholder template to permit xsl-stylesheet and other - PIs and comments to be output before the HTML root element. - - â— Non-chunked legalnotice now gets an element in HTML output so - it can be referenced with xref or link. - - â— In chunked HTML output, changed link rel="home" to rel="start", and link - rel="previous" to rel="prev", per W3C HTML 4.01 spec. - - â— Added several patches to htmlhelp from W. Borgert - - â— Added Bosnian locale file as common/bs.xml. - -Release 1.65.0 - - â— A number of important bug fixes. - - â— Added a workaround to allow these stylesheets to process DocBook NG - documents. (It’s a hack that pre-processes the document to strip off the - namespace and then uses exsl:node-set to process the result.) - - â— Added alternative indexing mechanism which has better internationalization - support. New indexing method allows grouping of accented letters like e, é, - ë into the same group under letter "e". It can also treat special letters - (e.g. "ch") as one character and place them in the correct position (e.g. - between "h" and "i" in Czech language). - - In order to use this mechanism you must create customization layer which - imports some base stylesheet (like fo/docbook.xsl, html/chunk.xsl) and then - includes appropriate stylesheet with new indexing code (fo/autoidx-ng.xsl - or html/autoidx-ng.xsl). For example: - - - - - - - - - New method is known to work with Saxon and it should also work with - xsltproc 1.1.1 and later. Currently supported languages are English, Czech, - German, French, Spanish and Danish. - -Release 1.64.1 - -General bug fixes and improvements. Sorry about the failure to produce an -updated release notes file for 1.62.0—1.63.2 - - â— In the course of fixing bug #849787, wrapping Unicode callouts with an - appropriate font change in the Xalan extensions, I discovered that the - Xalan APIs have changed a bit. So xalan2.jar will work with older Xalan 2 - implementations, xalan25.jar works with Xalan 2.5. - -Release 1.61.0 - -Lots of bug fixes and improvements. - - â— Initial support for timestamp PI. From now you can use to get current datetime in your document. Added - localization support for datetime PI - - â— Added level 6 to test for section depth in section.level template so that - section.title.level6.properties will be used for sections that are 6 deep - or deeper. This should also cause a h6 to be created in html output. - - â— Don't use SVG graphics if use.svg=0 - - â— Now uses number-and-title-template for sections only if section.autolabel - is not zero. - - â— Added missing 'english-language-name' attribute to the l10n element, and - the missing 'style' attribute to the template element so the current - gentext documents will validate. - - â— Corrected several references to parameter qanda.defaultlabel that were - missing the "$". - - â— Now accepts admon.textlabel parameter to turn off Note, Warning, etc. - label. - - â— FeatReq #684561: support more XEP metadata - - â— Added hyphenation support. Added support for coref. Added beginpage - support. (does nothing; see TDG). - - â— Added support for hyphenation-character, hyphenation-push-character-count, - and hyphenation-remain-character-count - - â— Added root.properties, ebnf.assignment, and ebnf.statement.terminator - - â— Support bgcolor PI in table cells; make sure rowsep and colsep don't have - any effect on the last row or column - - â— Handle othercredit on titlepage a little better - - â— Applied fix from Jeff Beal that fixed the bug that put secondary page - numbers on primary entries. Same with tertiary page numbers on secondary - entries. - - â— Added definition of missing variable collection. - - â— Make footnote formatting 'normal' even when it occurs in a context that has - special formatting - - â— Added warning when glossary.collection is not blank, but it cannot open the - specified file. - - â— Pick up the frame attribute on table and informaltable. - - â— indexdiv/title in non-autogenerated indexes are now picked up. - - â— Removed (unused) component.title.properties - - â— Move IDs from page-sequences down to titlepage blocks - - â— Use proportional-column-width(1) on more tables. - - Use proportional-column-width() for header/footer tables; suppress - relative-align when when using FOP - - â— Check for glossterm.auto.link when linking firstterms; don't output gl. - prefix on glossterm links - - â— Generate Part ToCs - - â— Support glossary, bibliography, and index in component ToCs. - - â— Refactored chunking code so that customization of chunk algorithm and chunk - elements is more practical - - â— Support textobject/phrase on inlinemediaobject. - - â— Support 'start' PI on ordered lists - - â— Fixed test of $toc PI to turn on qandaset TOC. - - â— Added process.chunk.footnotes to sect2 through 5 to fix bug of missing - footnotes when chunk level greater than 1. - - â— Added paramater toc.max.depth which controls maximal depth of ToC as - requested by PHP-DOC group. - - â— Exempted titleabbrev from preamble processing in lists, and fixed - variablelist preamble code to use the same syntax as the other lists. - - â— Added support for elements between variablelist and first varlistentry - since DocBook 4.2 supports that now. - -Release 1.60.1 - -Lots of bug fixes. - - â— The format of the titlepage.templates.xml files and the stylesheet that - transforms them have been significantly changed. All of the attributes used - to control the templates are now namespace qualified. So what used to be: - - - - is now: - - - - Attributes from other namespaces (including those that are unqualified) are - now copied directly through. In practice, this means that the names that - used to be “fo:†qualified: - - - - are now unqualified: - - <title t:named-template="component.title" - param:node="ancestor-or-self::article[1]" - text-align="center" - keep-with-next="always" - font-size="&hsize5;" - font-weight="bold" - font-family="{$title.font.family}"/> - - The t:titlepage and t:titlepage-content elements both generate wrappers - now. And unqualified attributes on those elements are passed through. This - means that you can now make the title font apply to ane entire titlepage - and make the entire “recto†titlepage centered by specifying the font and - alignment on the those elements: - - <t:titlepage t:element="article" t:wrapper="fo:block" - font-family="{$title.font.family}"> - - <t:titlepage-content t:side="recto" - text-align="center"> - - â— Support use of titleabbrev in running headers and footers. - - â— Added (experimental) xref.with.number.and.title parameter to enable number/ - title cross references even when the default would be just the number. - - â— Generate part ToCs if they're requested. - - â— Use proportional-column-width() in header/footer tables. - - â— Handle alignment correctly when screenshot wraps a graphic in a figure. - - â— Format chapter and appendix cross references consistently. - - â— Attempt to support tables with multiple tgroups in FO. - - â— Output fo:table-columns in simplelist tables. - - â— Use titlepage.templates.xml for indexdiv and glossdiv formatting. - - â— Improve support for new bibliography elements. - - â— Added footnote.number.format, table.footnote.number.format, - footnote.number.symbols, and table.footnote.number.symbols for better - control of footnote markers. - - â— Added glossentry.show.acronyms. - - â— Suppress the draft-mode page masters when draft-mode is “noâ€. - - â— Make blank pages verso not recto. D'Oh! - - â— Improved formatting of ulink footnotes. - - â— Fixed bugs in graphic width/height calculations. - - â— Added class attributes to inline elements. - - â— Don't add “.html†to the filenames identified with the “dbhtml†PI. - - â— Don't force a ToC when sections contain refentrys. - - â— Make section title sizes a function of the body.master.size. - -Release 1.59.2 - -The 1.59.2 fixes an FO bug in the page masters that causes FOP to fail. - - â— Removed the region-name from the region-body of blank pages. There's no - reason to give the body of blank pages a unique name and doing so causes a - mismatch that FOP detects. - - â— Output IDs for the first paragraphs in listitems. - - â— Fixed some small bugs in the handling of page numbers in double-sided mode. - - â— Attempt to prevent duplicated IDs from being produced when endterm on xref - points to something with nested structure. - - â— Fix aligment problems in equations. - - â— Output the type attribute on unordered lists (UL) in HTML only if the - css.decoration parameter is true. - - â— Calculate the font size in formal.title.properties so that it's 1.2 times - the base font size, not a fixed "12pt". - -Release 1.59.1 - -The 1.59.1 fixes a few bugs. - - â— Added Bulgarian localization. - - â— Indexing improvements; localize book indexes to books but allow setindex to - index an entire set. - - â— The default value for rowsep and colsep is now "1" as per CALS. - - â— Added support for titleabbrev (use them for cross references). - - â— Improvements to mediaobject for selecting print vs. online images. - - â— Added seperate property sets for figures, examples, equations, tabless, and - procedures. - - â— Make lineannotations italic. - - â— Support xrefstyle attribute. - - â— Make endterm on xref higher priority than xreflabel target. - - â— Glossary formatting improvements. - -Release 1.58.0 - -The 1.58.0 adds some initial support for extensions in xsltproc, adds a few -features, and fixes bugs. - - â— This release contains the first attempt at extension support for xsltproc. - The only extension available to date is the one that adjusts table column - widths. Run extensions/xsltproc/python/xslt.py. - - â— Fixed bugs in calculation of adjusted column widths to correct for rounding - errors. - - â— Support nested refsection elements correctly. - - â— Reworked gentext.template to take context into consideration. The name of - elements in localization files is now an xpath-like context list, not just - a simple name. - - â— Made some improvements to bibliography formatting. - - â— Improved graphical formatting of admonitions. - - â— Added support for entrytbl. - - â— Support spanning index terms. - - â— Support bibliosource. - -Release 1.57.0 - - â— The 1.57.0 release wasn't documented here. Oops. - -Release 1.56.0 - -The 1.56.0 release fixes bugs. - - â— Reworked chunking. This will break all existing customizations layers that - change the chunking algorithm. If you're customizing chunking, look at the - new “content†parameter that's passed to process-chunk-element and friends. - - â— Support continued and inherited numeration in orderedlist formatting for - FOs. - - â— Added Thai localization. - - â— Tweaked stylesheet documentation stylesheets to link to TDG and the - parameter references. - - â— Allow title on tables of contents ("Table of Contents") to be optional. - Added new keyword to generate.toc. Support tables of contents on sections. - - â— Made separate parameters for table borders and table cell borders: - table.frame.border.color, table.frame.border.style, - table.frame.border.thickness, table.cell.border.color, - table.cell.border.style, and table.cell.border.thickness. - - â— Suppress formatting of “endofrange†indexterms. This is only half-right. - They should generate a range, but I haven't figured out how to do that yet. - - â— Support revdescription. (Bug #582192) - - â— Added default.float.class and fixed figure floats. (Bug #497603) - - â— Fixed formatting of sbr in FOs. - - â— Added context to the “missing template†error message. - - â— Process arg correctly in a group. (Bug #605150) - - â— Removed 'keep-with-next' from formal.title.properties attribute set now - that the stylesheets support the option of putting such titles below the - object. Now the $placement value determines if 'keep-with-next' or - 'keep-with-previous' is used in the title block. - - â— Wrap “url()†around external-destinations when appropriate. - - â— Fixed typo in compact list spacing. (Bug #615464) - - â— Removed spurious hash in anchor name. (Bug #617717) - - â— Address is now displayed verbatim on title pages. (Bug #618600) - - â— The bridgehead.in.toc parameter is now properly supported. - - â— Improved effectiveness of HTML cleanup by increasing the number of places - where it is used. Improve use of HTML cleanup in XHTML stylesheets. - - â— Support table of contents for appendix in article. (Bug #596599) - - â— Don't duplicate footnotes in bibliographys and glossarys. (Bug #583282) - - â— Added default.image.width. (Bug #516859) - - â— Totally reworked funcsynopsis code; it now supports a 'tabular' - presentation style for 'wide' prototypes; see - funcsynopsis.tabular.threshold. (HTML only right now, I think, FO support, - uh, real soon now.) - - â— Reworked support for difference marking; toned down the colors a bit and - added a “system.head.content†template so that the diff CSS wasn't - overriding “user.head.contentâ€. (Bug #610660) - - â— Added call to the “*.head.content†elements when writing out long - description chunks. - - â— Make sure legalnotice link is correct even when chunking to a different - base.dir. - - â— Use CSS to set viewport characteristics if css.decoration is non-zero, use - div instead of p for making graphic a block element; make figure titles the - default alt text for images in a figure. - - â— Added space-after to list.block.spacing. - - â— Reworked section.level template to give “correct†answer instead of being - off by one. - - â— When processing tables, use the tabstyle attribute as the division class. - - â— Fixed bug in html2xhtml.xsl that was causing the XHTML chunker to output - HTML instead of XHTML. - -Older releases - -To view the release notes for older releases, see http://cvs.sourceforge.net/ -viewcvs.py/docbook/xsl/RELEASE-NOTES.xml. Be aware that there were no release -notes for releases prior to the 1.50.0 release. - -About dot-zero releases - -DocBook Project “dot zero†releases should be considered experimental and are -always followed by stable “dot one plus†releases, usually within two or three -weeks. Please help to ensure the stability of “dot one plus†releases by -carefully testing each “dot zero†release and reporting back about any problems -you find. - -It is not recommended that you use a “dot zero†release in a production system. -Instead, you should wait for the “dot one†or greater versions. - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.xml deleted file mode 100644 index 9c50d9ab9e9eeb1bb37539e0669e391d2aaab8f2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/RELEASE-NOTES.xml +++ /dev/null @@ -1,10327 +0,0 @@ -<article xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xml:lang="en" xml:id="releasenotes" - version="5.0"> - -<info> - <title>Release Notes for the DocBook XSL Stylesheets - - $Revision: 8934 $ $Date: 2010-11-01 13:03:14 -0700 (Mon, 01 Nov 2010) $ - - -This release-notes - document is available in the following formats: - HTML, - PDF, - plain text; it provides a per-release list -of enhancements and changes to the stylesheets’ public APIs -(user-configurable parameters) and excludes descriptions of most -bug fixes. For a complete list of all changes (including all bug -fixes) that have been made since the previous release, see the -separate NEWS (plain text) or NEWS.html files. Also available: -An online hyperlinked change history (warning: big file) of all -changes made over the entire history of the codebase. -As with all DocBook Project dot-zero releases, this is an - experimental release. It will be followed shortly by a stable - release. -As with all DocBook Project “dot - one plus†releases, this release aspires to be stable (in - contrast to dot-zero releases, which - are experimental). -This is a pre-release “snapshot†of the -DocBook XSL Stylesheets. The change information in the first -section of this file -(for “â€) is -auto-generated from change descriptions stored in the project -source-code repository. -That means the first section contains -descriptions both of bug fixes and of feature changes. The -remaining sections are manually edited changelog subsets that -exclude bug-fix descriptions – that is, trimmed down to just those -those descriptions that document enhancements and changes to the -public APIs (user-configurable parameters). - - - - - - - -Release Notes: 1.76.1 -The following is a list of changes that have been made - since the 1.76.0 release. - - -FO -The following changes have been made to the - fo code - since the 1.76.0 release. - - -Robert Stayton: docbook.xsl; xref.xsl; fop1.xslApply patch to support named destination in fop1.xsl, per Sourceforge -bug report #3029845. - - - - - -HTML -The following changes have been made to the html code since the 1.76.0 release. - - -Keith Fahlgren: highlight.xslImplementing handling for <b> and <i>: transform to <strong> and <em> for XHTML outputs and do not use in the highliting output (per Mauritz Jeanson) - - - - - -Params -The following changes have been made to the - params code - since the 1.76.0 release. - - -Robert Stayton: draft.mode.xmlChange default for draft.mode to 'no'. - - - - - - - - Release Notes: 1.76.0 -This release includes important bug fixes and adds the following -significant feature changes: - - -Webhelp -A new browser-based, cross-platform help format with full-text search and other features typically found in help systems. See webhelp/docs/content/ch01.html for more information and a demo. - - - - -Gentext -Many updates and additions to translation/locales thanks to Red Hat, the Fedora Project, and other contributors. - - -Common -Faster localization support, as language files are loaded on demand. - - - - FO - Support for SVG content in imagedata added. - - - HTML - Output improved when using 'make.clean.html' and a stock CSS file is now provided. - - -EPUB -A number of improvements to NCX, cover and image selection, and XHTML 1.1 element choices - - - - - The following is a list of changes that have been made since the 1.75.2 release. - - Gentext - The following changes have been made to the gentext code since the 1.75.2 release. - - - - rlandmann: locale/fa.xml - - - Update to Persian translation from the Fedora Project - - - - - rlandmann: locale/nds.xml - - - Locale for Low German - - - - - Mauritz Jeanson: locale/ka.xml; Makefile - - - Added support for Georgian based on patch #2917147. - - - - - rlandmann: locale/nl.xml; locale/ja.xml - - - Updated translations from Red Hat and the Fedora Project - - - - - rlandmann: locale/bs.xml; locale/ru.xml; locale/hr.xml - - - Updated locales from Red Hat and the Fedora Project - - - - - rlandmann: locale/pt.xml; locale/cs.xml; locale/es.xml; locale/bg.xml; locale/nl.xml; loca⋯ - - - Updated translations from Red Hat and the Fedora Project - - - - - rlandmann: locale/as.xml; locale/bn_IN.xml; locale/ast.xml; locale/ml.xml; locale/te.xml; ⋯ - - - New translations from Red Hat and the Fedora Project - - - - - rlandmann: locale/pt.xml; locale/ca.xml; locale/da.xml; locale/sr.xml; locale/ru.xml; loca⋯ - - - Updated translations from Red Hat and the Fedora Project - - - - - - - Common - The following changes have been made to the common code since the 1.75.2 release. - - - - Mauritz Jeanson: common.xsl - - - Fixed bug in output-orderedlist-starting-number template (@startingnumber did not work for FO). - - - - - Mauritz Jeanson: gentext.xsl - - - Added fix to catch ID also of descendants of listitem. Closes bug #2955077. - - - - - Jirka Kosek: l10n.xsl - - - Stripped down, faster version of gentext.template is used when there is no localization customization. - - - - - Mauritz Jeanson: stripns.xsl - - - Added fix that preserves link/@role (makes links in the reference documentation -with @role="tcg" work). - - - - - Mauritz Jeanson: l10n.xsl - - - Fixed bugs related to manpages and L10n. - - - - - Jirka Kosek: entities.ent; autoidx-kosek.xsl - - - Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms. - - - - - Jirka Kosek: l10n.xsl; l10n.dtd; l10n.xml; autoidx-kosek.xsl - - - Refactored localization support. Language files are loaded on demand. Speedup is about 30%. - - - - - Jirka Kosek: l10n.xsl - - - Added xsl:keys for improved performance of localization texts look up. Performance gain around 15%. - - - - - Mauritz Jeanson: titles.xsl - - - Fixed bug #2912677 (error with xref in title). - - - - - Robert Stayton: olink.xsl - - - Fix bug in xrefstyle "title" handling introduced with -the 'insert.targetdb.data' template. - - - - - Robert Stayton: gentext.xsl - - - Fix bug in xref to equation without title to use context="xref-number" instead -of "xref-number-and-title". - - - - - Robert Stayton: labels.xsl - - - Number all equations in one sequence, with or without title. - - - - - Robert Stayton: entities.ent - - - Fix bug #2896909 where duplicate @sortas on indexterms caused -some indexterms to drop out of index. - - - - - Robert Stayton: stripns.xsl - - - Expand the "Stripping namespace ..." message to advise users to -use the namespaced stylesheets. - - - - - Robert Stayton: stripns.xsl - - - need a local version of $exsl.node.set.available variable because -this module imported many places. - - - - - Mauritz Jeanson: olink.xsl - - - Added /node() to the select expression that is used to compute the title text -so that no <ttl> elements end up in the output. Closes bug #2830119. - - - - - - - FO - The following changes have been made to the - fo code - since the 1.75.2 release. - - - - Robert Stayton: table.xsl - - - Fix bug 2979166 able - Attribute @rowheader not working - - - - - Mauritz Jeanson: inline.xsl - - - Improved glossterm auto-linking by using keys. The old code was inefficient when processing documents -with many inline glossterms. - - - - - Robert Stayton: titlepage.xsl - - - Fix bug 2805530 author/orgname not appearing on title page. - - - - - Mauritz Jeanson: graphics.xsl - - - Added support for SVG content in imagedata (inspired by patch #2909154). - - - - - Mauritz Jeanson: table.xsl - - - Removed superfluous test used when computing column-width. Closes bug #3000898. - - - - - Mauritz Jeanson: inline.xsl - - - Added missing <xsl:call-template name="anchor"/>. Closes bug #2998567. - - - - - Mauritz Jeanson: lists.xsl - - - Added table-layout="fixed" on segmentedlist table (required by XSL spec when proportional-column-width() is used). - - - - - Jirka Kosek: autoidx-kosek.xsl - - - Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms. - - - - - Jirka Kosek: index.xsl - - - Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms. - - - - - Robert Stayton: xref.xsl - - - Fix bug in olink template when an olink has an id. -Add warning message with id value when trying to link -to an element that has no generated text. - - - - - Mauritz Jeanson: refentry.xsl - - - Fixed bug #2930968 (indexterm in refmeta not handled correctly). - - - - - Robert Stayton: block.xsl - - - fix bug 2949567 title in revhistory breaks FO transform. - - - - - Robert Stayton: glossary.xsl - - - Output id attributes on glossdiv blocks so they can be added to -xrefs or TOC. - - - - - Jirka Kosek: xref.xsl - - - Enabled hyphenation of URLs when ulink content is the same as link target - - - - - Robert Stayton: table.xsl - - - Apply patch to turn off row recursion if no @morerows attributes present. -This will enable very large tables without row spanning to -process without running into recursion limits. - - - - - Robert Stayton: formal.xsl - - - Format equation without title using table layout with equation number -next to the equation. - - - - - Robert Stayton: param.xweb; param.ent - - - Add equation.number.properties. - - - - - - - HTML - The following changes have been made to the - html code - since the 1.75.2 release. - - - - Mauritz Jeanson: block.xsl - - - Modified acknowledgements template to avoid invalid output (<p> in <p>). - - - - - Mauritz Jeanson: titlepage.xsl - - - Added default sidebar attribute-sets. - - - - - Robert Stayton: table.xsl - - - Fix bug 2979166 able - Attribute @rowheader not working - - - - - Robert Stayton: footnote.xsl - - - Fix bug 3033191 footnotes in html tables. - - - - - Mauritz Jeanson: inline.xsl - - - Improved glossterm auto-linking by using keys. The old code was inefficient when processing documents -with many inline glossterms. - - - - - Robert Stayton: docbook.css.xml; verbatim.xsl - - - Fix bug 2844927 Validity error for callout bugs. - - - - - Robert Stayton: formal.xsl - - - Convert formal.object.heading to respect make.clean.html param. - - - - - Robert Stayton: titlepage.templates.xml; block.xsl - - - Fix bug 2840768 sidebar without title inserts empty b tag. - - - - - Mauritz Jeanson: docbook.xsl - - - Moved the template that outputs <base> so that the base URI also applies to relative CSS paths that come later. -See patch #2896121. - - - - - Jirka Kosek: autoidx-kosek.xsl - - - Upgraded to use common entities. Fixed bug when some code used @sortas and some not for grouping/sorting of indexterms. - - - - - Robert Stayton: chunk-code.xsl - - - fix bug 2948363 generated filename for refentry not unique, when -used in a set. - - - - - Robert Stayton: component.xsl - - - Fix missing "Chapter n" label when use chapter/info/title. - - - - - Robert Stayton: table.xsl - - - Row recursion turned off if no @morerows attributes in the table. -This will prevent failure on long table (with no @morerows) due -to excessive depth of recursion. - - - - - Robert Stayton: autotoc.xsl; docbook.css.xml - - - Support make.clean.html in autotoc.xsl. - - - - - Robert Stayton: docbook.css.xml; block.xsl - - - Add support for make.clean.html setting in block elements. - - - - - Robert Stayton: docbook.css.xml - - - Stock CSS styles for DocBook HTML output when 'make.clean.html' is non-zero. - - - - - Robert Stayton: html.xsl - - - Add templates for generating CSS files and links to them. - - - - - Robert Stayton: param.xweb - - - Fix bugs in new entity references. - - - - - Robert Stayton: chunk-common.xsl - - - List of Equations now includes on equations with titles. - - - - - Robert Stayton: table.xsl - - - If a colspec has a colname attribute, add it to the HTML col -element as a class attribute so it can be styled. - - - - - Robert Stayton: formal.xsl - - - Fix bug 2825842 where table footnotes not appearing in HTML-coded table. - - - - - Robert Stayton: chunktoc.xsl - - - Fix bug #2834826 where appendix inside part was not chunked as it should be. - - - - - Mauritz Jeanson: chunktoc.xsl - - - Added missing namespace declarations. Closes bug #2890069. - - - - - Mauritz Jeanson: footnote.xsl - - - Updated the template for footnote paras to use the 'paragraph' template. Closes bug #2803739. - - - - - Keith Fahlgren: inline.xsl; lists.xsl - - - Remove <b> and <i> elements "discouraged in favor of style sheets" from -XHTML, XHTML 1.1 (and therefore EPUB) outputs by changing html2xhtml.xsl. - -Fixes bug #2873153: No <b> and <i> tags in XHTML/EPUB - -Added regression to EPUB specs: - - - - - Mauritz Jeanson: inline.xsl - - - Fixed bug #2844916 (don't output @target if ulink.target is empty). - - - - - Keith Fahlgren: autoidx.xsl - - - Fix a bug when using index.on.type: an 'index symbols' section was created -even if that typed index didn't include any symbols (they were in the other types). - - - - - - - Manpages - The following changes have been made to the - manpages code - since the 1.75.2 release. - - - - Mauritz Jeanson: other.xsl - - - Modified the write.stubs template so that the section directory name is not output twice. Should fix bug #2831602. -Also ensured that $lang is added to the .so path (when man.output.lang.in.name.enabled=1). - - - - - Mauritz Jeanson: docbook.xsl; other.xsl - - - Fixed bug #2412738 (apostrophe escaping) by applying the submitted patch. - - - - - Norman Walsh: block.xsl; endnotes.xsl - - - Fix bug where simpara in footnote didn't work. Patch by Jonathan Nieder, jrnieder@gmail.com - - - - - dleidert: lists.xsl - - - Fix two indentation issues: In the first case there is no corresponding .RS -macro (Debian #519438, sf.net 2793873). In the second case an .RS instead of -the probably intended .sp leads to an indentation bug (Debian #527309, -sf.net #2642139). - - - - - - - Epub - The following changes have been made to the - epub code - since the 1.75.2 release. - - - - Keith Fahlgren: bin/spec/examples/AMasqueOfDays.epub; docbook.xsl; bin/spec/epub_spec.rb - - - Resolve some actual regressions in date output spotted by more recent versions of epubcheck - - - - - Keith Fahlgren: docbook.xsl - - - Updated mediaobject selection code that better uses roles (when available); based on contributons by Glenn McDonald - - - - - Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl - - - Ensure that NCX documents are always outputted with a default namespace -to prevent problems with the kindlegen machinery - - - - - Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/partintro.xml; docbook.x⋯ - - - Adding support for partintros with sect2s, 3s, etc - - - - - Keith Fahlgren: docbook.xsl - - - Adding param to workaround horrific ADE bug with the inability to process <br> - - - - - Keith Fahlgren: docbook.xsl - - - Add support for authorgroup/author in OPF metadata (via Michael Wiedmann) - - - - - Keith Fahlgren: bin/spec/epub_regressions_spec.rb - - - Remove <b> and <i> elements "discouraged in favor of style sheets" from -XHTML, XHTML 1.1 (and therefore EPUB) outputs by changing html2xhtml.xsl. - -Fixes bug #2873153: No <b> and <i> tags in XHTML/EPUB - -Added regression to EPUB specs: - - - - - Keith Fahlgren: bin/lib/docbook.rb; bin/spec/files/DejaVuSerif-Italic.otf; docbook.xsl; bi⋯ - - - This resolves bug #2873142, Please add support for multiple embedded fonts - - -If you navigate to a checkout of DocBook-XSL and go to: -xsl/epub/bin/spec/files -You can now run the following command: - -../../dbtoepub -f DejaVuSerif.otf -f DejaVuSerif-Italic.otf -c test.css --s test_cust.xsl orm.book.001.xml - -In dbtoepub, the following option can be used more than once: --f, --font [OTF FILE] Embed OTF FILE in .epub. - -The underlying stylesheet now accepts a comma-separated list of font file -names rather than just one as the RENAMED epub.embedded.fonts ('s' added). - -The runnable EPUB spec now includes: -- should be valid .epub after including more than one embedded font - - - - - Keith Fahlgren: docbook.xsl - - - Improve the selection of cover images when working in DocBook 4.x land (work in progress) - - - - - Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl - - - Improve the quality of the OPF spine regression by ensuring that the spine -elements for deeply nested refentries are in order and adjacent to their -opening wrapper XHTML chunk. - - - - - Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl; bin/spec/files/orm.book.00⋯ - - - Add more careful handling of refentries to ensure that they always appear in the opf:spine. -This was only a problem when refentries were pushed deep into the hierarchy (like inside -a sect2), but presented navigational problems for many reading systems (despite the -correct NCX references). This may *not* be the best solution, but attacking a better -chunking strategy for refentries was too big a nut to crack at this time. - - - - - - - Eclipse - The following changes have been made to the - eclipse code - since the 1.75.2 release. - - - - Mauritz Jeanson: eclipse3.xsl - - - Added a stylesheet module that generates plug-ins conforming to the standard (OSGi-based) Eclipse 3.x -architecture. The main difference to the older format is that metadata is stored in a separate -manifest file. The module imports and extends the existing eclipse.xsl module. Based on code -contributed in patch #2624668. - - - - - - - Params - The following changes have been made to the - params code - since the 1.75.2 release. - - - - Robert Stayton: draft.watermark.image.xml - - - Fix bug 2922488 draft.watermark.image pointing to web resource. -Now the value is images/draft.png, and may require customization -for local resolution. - - - - - Mauritz Jeanson: equation.number.properties.xml - - - Corrected refpurpose. - - - - - Norman Walsh: paper.type.xml - - - Added USlegal and USlegallandscape paper types. - - - - - Jirka Kosek: highlight.xslthl.config.xml - - - Added note about specifying location as URL - - - - - Robert Stayton: docbook.css.source.xml; generate.css.header.xml; custom.css.source.xml; ma⋯ - - - Params to support generated CSS files. - - - - - Robert Stayton: equation.number.properties.xml - - - New attribute set for numbers appearing next to equations. - - - - - - - XSL-Xalan - The following changes have been made to the - xsl-xalan code - since the 1.75.2 release. - - - - dleidert: nbproject/genfiles.properties; nbproject/build-impl.xml - - - Rebuild netbeans build files after adding missing Netbeans configuration to allow easier packaging for Debian. - - - - - - - -Release Notes: 1.75.2 -The following is a list of changes that have been made - since the 1.75.1 release. - - -Gentext -The following changes have been made to the - gentext code - since the 1.75.1 release. - - -dleidert: locale/ja.xmlImproved Japanese translation for Note(s). Closes bug #2823965. - - -dleidert: locale/pl.xmlPolish alphabet contains O with acute accent, not with grave accent. Closes bug #2823964. - - -Robert Stayton: locale/ja.xmlFix translation of "index", per bug report 2796064. - - -Robert Stayton: locale/is.xmlNew Icelandic locale file. - - - - - -Common -The following changes have been made to the - common code - since the 1.75.1 release. - - -Norman Walsh: stripns.xslSupport more downconvert cases - - -Robert Stayton: titles.xslMake sure title inside info is used if no other title. - - - - - -FO -The following changes have been made to the - fo code - since the 1.75.1 release. - - -Robert Stayton: pi.xslTurn off dbfo-need for fop1.extensions also, per bug #2816141. - - - - - -HTML -The following changes have been made to the - html code - since the 1.75.1 release. - - -Mauritz Jeanson: titlepage.xslOutput "Copyright" heading in XHTML too. - - -Mauritz Jeanson: titlepage.xslAdded stylesheet.result.type test for copyright. Closes bug #2813289. - - -Norman Walsh: htmltbl.xslRemove ambiguity wrt @span, @rowspan, and @colspan - - - - - -Manpages -The following changes have been made to the - manpages code - since the 1.75.1 release. - - -Mauritz Jeanson: endnotes.xslAdded normalize-space() for ulink content. Closes bug #2793877. - - -Mauritz Jeanson: docbook.xslAdded stylesheet.result.type test for copyright. Closes bug #2813289. - - - - - -Epub -The following changes have been made to the - epub code - since the 1.75.1 release. - - -Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rbCorrected bugs caused by path and file assumptions were not met - - -Keith Fahlgren: bin/lib/docbook.rb; docbook.xslCleaning up hardcoded values into parameters and fixing Ruby library to pass them properly; all thanks to patch from Liza Daly - - - - - -Profiling -The following changes have been made to the - profiling code - since the 1.75.1 release. - - -Robert Stayton: profile.xslFix bug 2815493 missing exsl.node.set.available parameter. - - - - - -XSL-Saxon -The following changes have been made to the - xsl-saxon code - since the 1.75.1 release. - - -Mauritz Jeanson: src/com/nwalsh/saxon/ColumnUpdateEmitter.java; src/com/nwalsh/saxon/Colum⋯Added fixes so that colgroups in the XHTML namespace are processed properly. - - - - - -XSL-Xalan -The following changes have been made to the - xsl-xalan code - since the 1.75.1 release. - - -Mauritz Jeanson: nbproject/project.xmlAdded missing NetBeans configuration. - - - - - - - - -Release Notes: 1.75.1 -This release includes bug fixes. - -The following is a list of changes that have been made since the 1.75.0 release. - - - -FO -The following changes have been made to the fo code since the 1.75.0 release. - - -Keith Fahlgren: block.xslSwitching to em dash for character before attribution in epigraph; resolves Bug #2793878 - - -Robert Stayton: lists.xslFixed bug 2789947, id attribute missing on simplelist fo output. - - - - - -HTML -The following changes have been made to the - html code - since the 1.75.0 release. - - -Keith Fahlgren: block.xslSwitching to em dash for character before attribution in epigraph; resolves Bug #2793878 - - -Robert Stayton: lists.xslFixed bug 2789678: apply-templates line accidentally deleted. - - - - - -Epub -The following changes have been made to the - epub code - since the 1.75.0 release. - - -Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xslAdded regression and fix to correct "bug" with namespace-prefixed container elements in META-INF/container.xml ; resolves Issue #2790017 - - -Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/onegraphic.xinclude.xml;⋯Another attempt at flexible named entity and XInclude processing - - -Keith Fahlgren: bin/lib/docbook.rbTweaking solution to Bug #2750442 following regression reported by Michael Wiedmann. - - - - - -Params -The following changes have been made to the - params code - since the 1.75.0 release. - - -Mauritz Jeanson: highlight.source.xmlUpdated documentation to reflect changes made in r8419. - - - - - - - - -Release Notes: 1.75.0 -This release includes important bug fixes and adds the following -significant feature changes: - - -Gentext -Modifications to translations have been made. - - - -Common - -Added support for some format properties on tables using -HTML table markup. -Added two new qanda.defaultlabel values so that numbered sections -and numbered questions can be distinguished. Satisfies -Feature Request #1539045. -Added code to handle acknowledgements in book and part. The element is processed -similarly to dedication. All acknowledgements will appear as front matter, after -any dedications. - - - - -FO - -The inclusion of highlighting code has been simplified. -Add support for pgwide on informal objects. -Added a new parameter, bookmarks.collapse, that controls the initial state of the bookmark tree. Closes FR #1792326. -Add support for more dbfo processing instructions. -Add new variablelist.term.properties to format terms, per request # 1968513. -Add support for @width on screen and programlisting, fixes bug #2012736. -Add support for writing-mode="rl-tb" (right-to-left) in FO outputs. -Add writing.mode param for FO output. - - - -HTML - -Convert all calls to class.attribute to calls to common.html.attributes to support dir, lang, and title attributes in html output for all elements. Fulfills feature request #1993833. -Inclusion of highlighting code was simplified. Only one import is now necessary. -Add new param index.links.to.section. -Add support for the new index.links.to.section param which permits precise links to indexterms in HTML output rather than to the section title. - - - -ePub - -Slightly more nuanced handling of imageobject alternatives and better support in dbtoepub for XIncludes and ENTITYs to resolve Issue #2750442 reported by Raphael Hertzog. -Added a colon after an abstract/title when mapping into the dc:description for OPF metadata in ePub output to help the flat text have more pseudo-semantics (sugestions from Michael Wiedmann) -Added DocBook subjectset -> OPF dc:subject mapping and tests -Added DocBook date -> OPF dc:date mapping and tests -Added DocBook abstract -> OPF dc:description mapping and tests -Added --output option to dbtoepub based on user request - - - - -HTMLHelp - -Add support for generating olink target database for htmlhelp files. - - - - -Params - -Add default setting for @rules attribute on HTML markup tables. -Added a new parameter, bookmarks.collapse, that controls the initial state of the bookmark tree. When the parameter has a non-zero value (the default), only the top-level bookmarks are displayed initially. Otherwise, the whole tree of bookmarks is displayed. This is implemented for FOP 0.9X. Closes FR #1792326. -Add new variablelist.term.properties to format terms, per request # 1968513. -Add two new qanda.defaultlabel values so that numbered sections and numbered questions can be distinguished. Satisfies Feature Request #1539045. -Add param to control whether an index entry links to a section title or to the precise location of the indexterm. -New attribute list for glossentry in glossary. -New parameter to support @width on programlisting and screen. -Add attribute-sets for formatting glossary terms and defs. - - - -Highlighting - -Inclusion of highlighting code was simplified. Only one import is now necessary. - - - - - - - -The following is a list of changes that have been made - since the 1.74.3 release. - - -Gentext -The following changes have been made to the - gentext code - since the 1.74.3 release. - - -Robert Stayton: locale/sv.xml; locale/ja.xml; locale/pl.xmlCheck in translations of Legalnotice submitted on mailing list. - - -Robert Stayton: locale/es.xmlFix spelling errors in Acknowledgements entries. - - -Robert Stayton: locale/es.xmlCheck in translations for 4 elements submitted through docbook-apps -message of 14 April 2009. - - -David Cramer: locale/zh.xml; locale/ca.xml; locale/ru.xml; locale/ga.xml; locale/gl.xml; l⋯Internationalized punctuation in glosssee and glossseealso - - -Robert Stayton: MakefileCheck in fixes for DSSSL gentext targets from submitted patch #1689633. - - -Robert Stayton: locale/uk.xmlCheck in major update submitted with bug report #2008524. - - -Robert Stayton: locale/zh_tw.xmlCheck in fix to Note string submitted in bug #2441051. - - -Robert Stayton: locale/ru.xmlCheckin typo fix submitted in bug #2453406. - - - - - -Common -The following changes have been made to the - common code - since the 1.74.3 release. - - -Robert Stayton: gentext.xslFix extra generated space when xrefstyle includes 'nopage'. - - -Robert Stayton: table.xslAdd support for some format properties on tables using -HTML table markup. These include: - - frame attribute on table (or uses $default.table.frame parameter). - - rules attribute on table (or uses $default.table.rules parameter). - - align attribute on td and th - - valign attribute on td and th - - colspan on td and th - - rowspan on td and th - - bgcolor on td and th - - -Robert Stayton: olink.xslAdd placeholder template to massage olink hot text to make -customization easier, per Feature Request 1828608. - - -Robert Stayton: targets.xslAdd support for collecting olink targets from a glossary -generated from a glossary.collection. - - -Robert Stayton: titles.xslHandle firstterm like glossterm in mode="title.markup". - - -Robert Stayton: titles.xslAdd match on info/title in title.markup templates where missing. - - -Mauritz Jeanson: titles.xslChanged "ancestor::title" to "(ancestor::title and (@id or @xml:id))". -This enables proper formatting of inline elements in titles in TOCs, -as long as these inlines don't have id or xml:id attributes. - - -Robert Stayton: labels.xslAdd two new qanda.defaultlabel values so that numbered sections -and numbered questions can be distinguished. Satisfies -Feature Request #1539045. - - -Robert Stayton: stripns.xsl; pi.xslConvert function-available(exsl:node-set) to use the new param -so Xalan bug is isolated. - - -Mauritz Jeanson: titles.xslAdded fixes for bugs #2112656 and #1759205: -1. Reverted mistaken commits r7485 and r7523. -2. Updated the template with match="link" and mode="no.anchor.mode" so that -@endterm is used if it exists and if the link has no content. - - -Mauritz Jeanson: titles.xslAdded code to handle acknowledgements in book and part. The element is processed -similarly to dedication. All acknowledgements will appear as front matter, after -any dedications. - - -Robert Stayton: olink.xslFix bug #2018717 use.local.olink.style uses wrong gentext context. - - -Robert Stayton: olink.xslFix bug #1787167 incorrect hot text for some olinks. - - -Robert Stayton: common.xslFix bug #1669654 Broken output if copyright <year> contains a range. - - -Robert Stayton: labels.xslFix bug in labelling figure inside appendix inside article inside book. - - - - - -FO -The following changes have been made to the - fo code - since the 1.74.3 release. - - -Jirka Kosek: highlight.xslInclusion of highlighting code was simplified. Only one import is now necessary. - - -Robert Stayton: fop1.xslAdd the new fop extensions namespace declaration, in case FOP -extension functions are used. - - -Robert Stayton: formal.xslAdd support for pgwide on informal objects. - - -Robert Stayton: docbook.xslFixed spurious closing quote on line 134. - - -Robert Stayton: docbook.xsl; autoidx-kosek.xsl; autoidx.xslConvert function-available for node-set() to use -new $exsl.node.set.available param in test. - - -David Cramer: xref.xslSuppress extra space after xref when xrefstyle='select: label nopage' (#2740472) - - -Mauritz Jeanson: pi.xslFixed doc bug for row-height. - - -David Cramer: glossary.xslInternationalized punctuation in glosssee and glossseealso - - -Robert Stayton: param.xweb; param.ent; htmltbl.xsl; table.xslAdd support for some format properties on tables using -HTML table markup. These include: - - frame attribute on table (or uses $default.table.frame parameter). - - rules attribute on table (or uses $default.table.rules parameter). - - align attribute on td and th - - valign attribute on td and th - - colspan on td and th - - rowspan on td and th - - bgcolor on td and th - - -Robert Stayton: table.xslAdd support bgcolor in td and th -elements in HTML table markup. - - -Robert Stayton: htmltbl.xslAdd support for colspan and rowspan and bgcolor in td and th -elements in HTML table markup. - - -Robert Stayton: param.xwebFix working of page-master left and right margins. - - -Mauritz Jeanson: param.xweb; param.ent; fop1.xslAdded a new parameter, bookmarks.collapse, that controls the initial state of the bookmark tree. When the parameter has a non-zero value (the default), only the top-level bookmarks are displayed initially. Otherwise, the whole tree of bookmarks is displayed. This is implemented for FOP 0.9X. Closes FR #1792326. - - -Robert Stayton: table.xsl; pi.xslAdd support for dbfo row-height processing instruction, like that in dbhtml. - - -Robert Stayton: lists.xslAdd support for dbfo keep-together processing instruction for -entire list instances. - - -Robert Stayton: lists.xsl; block.xslAdd support fo dbfo keep-together processing instruction to -more blocks like list items and paras. - - -Robert Stayton: lists.xsl; param.xweb; param.entAdd new variablelist.term.properties to format terms, per request # 1968513. - - -Robert Stayton: inline.xslIn simple.xlink, rearrange order of processing. - - -Robert Stayton: xref.xslHandle firstterm like glossterm in mode="xref-to". - - -Robert Stayton: glossary.xsl; xref.xsl; pi.xsl; footnote.xslImplement simple.xlink for glosssee and glossseealso so they can use -other types of linking besides otherterm. - - -Robert Stayton: qandaset.xslAdd two new qanda.defaultlabel values so that numbered sections and numbered questions can be distinguished. Satisfies Feature Request #1539045. - - -Robert Stayton: titlepage.xslFor the book title templates, I changed info/title to book/info/title -so other element's titles will not be affected. - - -Robert Stayton: xref.xsl; verbatim.xslUse param exsl.node.set.available to test for function. - - -Robert Stayton: param.xweb; param.ent; footnote.xslStart using new param exsl.node.set.available to work around Xalan bug. - - -Robert Stayton: titlepage.templates.xmlAdd comment on use of t:predicate for editor to prevent -extra processing of multiple editors. Fixes bug 2687842. - - -Robert Stayton: xref.xsl; autoidx.xslAn indexterm primary, secondary, or tertiary element with an id or xml:id -now outputs that ID, so that index entries can be cross referenced to. - - -Mauritz Jeanson: synop.xslAdded modeless template for ooclass|oointerface|ooexception. -Closes bug #1623468. - - -Robert Stayton: xref.xslAdd template with match on indexterm in mode="xref-to" to fix bug 2102592. - - -Robert Stayton: xref.xslNow xref to qandaentry will use the label element in a question for -the link text if it has one. - - -Robert Stayton: inline.xslAdd id if specified from @id to output for quote and phrase so -they can be xref'ed to. - - -Robert Stayton: xref.xslAdd support for xref to phrase, simpara, anchor, and quote. -This assumes the author specifies something using xrefstyle since -the elements don't have ordinary link text. - - -Robert Stayton: toc.xslFix bug in new toc templates. - - -Mauritz Jeanson: titlepage.xsl; component.xsl; division.xsl; xref.xsl; titlepage.templates⋯Added code to handle acknowledgements in book and part. The element is processed -similarly to dedication. All acknowledgements will appear as front matter, after -any dedications. - - -Robert Stayton: toc.xslRewrite toc templates to support an empty toc or populated toc -in all permitted contexts. Same for lot elements. -This fixes bug #1595969 for FO outputs. - - -Robert Stayton: index.xslFix indents for seealsoie so they are consistent. - - -Mauritz Jeanson: param.xwebRemoved duplicate (monospace.font.family). - - -Robert Stayton: param.xweb; param.entAdd glossentry.list.item.properties. - - -Robert Stayton: param.xweb; param.entAdd monospace.verbatim.font.width param to support @width on programlisting. - - -Robert Stayton: verbatim.xslPut programlisting in fo:block-container with writing-mode="lr-tb" -when text direction is right to left because all program languages -are left-to-right. - - -Robert Stayton: verbatim.xslAdd support for @width on screen and programlisting, fixes bug #2012736. - - -Robert Stayton: xref.xslFix bug #1973585 xref to para with xrefstyle not handled correctly. - - -Mauritz Jeanson: block.xslAdded support for acknowledgements in article. -Support in book/part remains to be added. - - -Robert Stayton: xref.xslFix bug #1787167 incorrect hot text for some olinks. - - -Robert Stayton: fo.xslAdd writing-mode="tb-rl" as well since some XSL-FO processors support it. - - -Robert Stayton: autotoc.xsl; lists.xsl; glossary.xsl; fo.xsl; table.xsl; pagesetup.xslAdd support for writing-mode="rl-tb" (right-to-left) in FO outputs. -Changed instances of margin-left to margin-{$direction.align.start} -and margin-right to margin-{$direction.align.end}. Those direction.align -params are computed from the writing mode value in each locale's -gentext key named 'writing-mode', introduced in 1.74.3 to add -right-to-left support to HTML outputs. - - -Robert Stayton: param.xweb; param.entAdd attribute-sets for formatting glossary terms and defs. - - -Robert Stayton: param.xweb; param.entAdd writing.mode param for FO output. - - -Robert Stayton: autotoc.xslFix bug 1546008: in qandaentry in a TOC, use its blockinfo/titleabbrev or blockinfo/title -instead of question, if available. For DocBook 5, use the info versions. - - -Keith Fahlgren: verbatim.xslAdd better pointer to README for XSLTHL - - -Keith Fahlgren: verbatim.xslMore tweaking the way that XSLTHL does or does not get called - - -Keith Fahlgren: verbatim.xslAlternate attempt at sanely including/excluding XSLTHT code - - - - - -HTML -The following changes have been made to the - html code - since the 1.74.3 release. - - -Robert Stayton: lists.xslRemoved redundant lang and title attributes on list element inside -div element for lists. - - -Robert Stayton: inline.xsl; titlepage.xsl; division.xsl; toc.xsl; sections.xsl; table.xsl;⋯Convert all calls to class.attribute to calls to common.html.attributes -to support dir, lang, and title attributes in html output for all elements. -Fulfills feature request #1993833. - - -Robert Stayton: chunk-common.xslFix bug #2750253 wrong links in list of figures in chunk.html -when target html is in a subdirectory and dbhtml filename used. - - -Jirka Kosek: highlight.xslInclusion of highlighting code was simplified. Only one import is now necessary. - - -Robert Stayton: chunk-common.xsl; chunktoc.xsl; docbook.xsl; chunk-changebars.xsl; autoidx⋯Convert function-available for node-set() to use -new $exsl.node.set.available param in test. - - -Mauritz Jeanson: pi.xslFixed doc bug for row-height. - - -David Cramer: glossary.xslInternationalized punctuation in glosssee and glossseealso - - -Robert Stayton: lists.xsl; html.xsl; block.xslMore elements get common.html.attributes. -Added locale.html.attributes template which does the lang, -dir, and title attributes, but not the class attribute -(used on para, for example). - - -Robert Stayton: lists.xslReplace more literal class atts with mode="class.attribute" to support -easier customization. - - -Robert Stayton: glossary.xslSupport olinking in glosssee and glossseealso. - - -Robert Stayton: inline.xslIn simple.xlink, rearrange order of processing. - - -Robert Stayton: xref.xslHandle firstterm like glossterm in mode="xref-to". - - -Robert Stayton: lists.xsl; html.xsl; block.xslAdded template named common.html.attributes to output -class, title, lang, and dir for most elements. -Started adding it to some list and block elements. - - -Robert Stayton: qandaset.xslAdd two new qanda.defaultlabel values so that numbered sections -and numbered questions can be distinguished. Satisfies -Feature Request #1539045. - - -Robert Stayton: param.xweb; chunk-code.xsl; param.ent; xref.xsl; chunkfast.xsl; verbatim.x⋯Use new param exsl.node.set.available to test, handles Xalan bug. - - -Robert Stayton: autoidx.xslUse named anchors for primary, secondary, and tertiary ids so -duplicate entries with different ids can still have an id output. - - -Robert Stayton: param.xweb; param.entAdd new param index.links.to.section. - - -Robert Stayton: xref.xsl; autoidx.xslPass through an id on primary, secondary, or tertiary to -the index entry, so that one could link to an index entry. -You can't link to the id on an indexterm because that is -used to place the main anchor in the text flow. - - -Robert Stayton: autoidx.xslAdd support for the new index.links.to.section param which permits -precise links to indexterms in HTML output rather than to -the section title. - - -Mauritz Jeanson: synop.xslAdded modeless template for ooclass|oointerface|ooexception. -Closes bug #1623468. - - -Robert Stayton: qandaset.xslMake sure a qandaset has an anchor, even when it has no title, -because it may be referenced in a TOC or xref. -Before, the anchor was output by the title, but there was no -anchor if there was no title. - - -Robert Stayton: xref.xslAdd a template for indexterm with mode="xref-to" to fix bug 2102592. - - -Robert Stayton: xref.xslNow xref to qandaentry will use the label element in a question for -the link text if it has one. - - -Robert Stayton: qandaset.xsl; html.xslCreate separate templates for computing label of question and answer -in a qandaentry, so such can be used for the alt text of an xref -to a qandaentry. - - -Robert Stayton: inline.xsl; xref.xslNow support xref to phrase, simpara, anchor, and quote, -most useful when an xrefstyle is used. - - -Robert Stayton: toc.xslRewrite toc templates to support an empty toc or populated toc -in all permitted contexts. Same for lot elements. -This fixes bug #1595969 for HTML outputs. - - -Mauritz Jeanson: titlepage.xsl; component.xsl; division.xsl; xref.xsl; titlepage.templates⋯Added code to handle acknowledgements in book and part. The element is processed -similarly to dedication. All acknowledgements will appear as front matter, after -any dedications. - - -Robert Stayton: index.xslRewrote primaryie, secondaryie and tertiaryie templates to handle -nesting of elements and seeie and seealsoie, as reported in -bug # 1168912. - - -Robert Stayton: autotoc.xslFix simplesect in toc problem. - - -Robert Stayton: verbatim.xslAdd support for @width per bug report #2012736. - - -Robert Stayton: formal.xsl; htmltbl.xslFix bug #1787140 HTML tables not handling attributes correctly. - - -Robert Stayton: param.xwebMove writing-mode param. - - -Keith Fahlgren: refentry.xslRemove a nesting of <p> inside <p> for refclass (made XHTML* invalid, made HTML silly) - - -Robert Stayton: table.xslFix bug #1945872 to allow passthrough of colwidth values to -HTML table when no tablecolumns.extension is available and -when no instance of * appears in the table's colspecs. - - -Mauritz Jeanson: block.xslAdded support for acknowledgements in article. -Support in book/part remains to be added. - - -Robert Stayton: chunk-common.xslFix bug #1787167 incorrect hot text for some olinks. - - -Robert Stayton: qandaset.xslFix bug 1546008: in qandaentry in a TOC, use its blockinfo/titleabbrev or blockinfo/title -instead of question, if available. For DocBook 5, use the info versions. - - -Robert Stayton: chunktoc.xslAdd support for generating olink database when using chunktoc.xsl. - - -Keith Fahlgren: verbatim.xslAdd better pointer to README for XSLTHL - - -Keith Fahlgren: verbatim.xslAnother stab at fixing the stupid XSLTHT includes across processors (Saxon regression reported by Sorin Ristache) - - -Keith Fahlgren: verbatim.xslMore tweaking the way that XSLTHL does or does not get called - - -Keith Fahlgren: verbatim.xslAlternate attempt at sanely including/excluding XSLTHT code - - - - - -Manpages -The following changes have been made to the - manpages code - since the 1.74.3 release. - - -Robert Stayton: table.xslConvert function-available test for node-set() function to -test of $exsl.node.set.available param. - - -Mauritz Jeanson: lists.xslAdded a template for bibliolist. Closes bug #1815916. - - - - - -ePub -The following changes have been made to the - epub code - since the 1.74.3 release. - - -Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/onegraphic.xinclude.xml;⋯Slightly more nuanced handling of imageobject alternatives and better support in dbtoepub for XIncludes and ENTITYs to resolve Issue #2750442 reported by Raphael Hertzog. - - -Keith Fahlgren: docbook.xslAdd a colon after an abstract/title when mapping into the dc:description for OPF metadata in ePub output to help the flat text have more pseudo-semantics (sugestions from Michael Wiedmann) - - -Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xsl; bin/spec/files/de.xmlCorrectly set dc:language in OPF metadata when i18nizing. Closes Bug #2755150 - - -Keith Fahlgren: bin/spec/epub_regressions_spec.rb; docbook.xslCorrected namespace declarations for literal XHTML elements to make them serialize "normally" - - -Keith Fahlgren: docbook.xslBe a little bit more nuanced about dates - - -Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files/orm.book.001.x⋯Add DocBook subjectset -> OPF dc:subject mapping and tests - - -Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files/orm.book.001.x⋯Add DocBook date -> OPF dc:date mapping and tests - - -Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files/orm.book.001.x⋯Add DocBook abstract -> OPF dc:description mapping and tests - - -Robert Stayton: docbook.xslCheck in patch submitted by user to add opf:file-as attribute -to dc:creator element. - - -Keith Fahlgren: bin/dbtoepubAdding --output option to dbtoepub based on user request - - -Keith Fahlgren: docbook.xsl; bin/spec/epub_spec.rbCleaning and regularizing the generation of namespaced nodes for OPF, NCX, XHTML and other outputted filetypes (hat tip to bobstayton for pointing out the silly, incorrect code) - - -Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/refclass.xmlRemove a nesting of <p> inside <p> for refclass (made XHTML* invalid, made HTML silly) - - -Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/blockquotepre.xmlAdded regression test and fix for XHTML validation problem with <a>s added inside <blockquote>; This potentially causes another problem (where something is referenced by has no anchor, but someone reporting that should cause the whole <a id='thing'/> thing to be reconsidered with modern browsers in mind. - - - - - -HTMLHelp -The following changes have been made to the - htmlhelp code - since the 1.74.3 release. - - -Robert Stayton: htmlhelp-common.xslAdd support for generating olink target database for htmlhelp files. - - - - - - -Params -The following changes have been made to the - params code - since the 1.74.3 release. - - -Robert Stayton: default.table.rules.xmlAdd default setting for @rules attribute on HTML markup tables. - - -Mauritz Jeanson: bookmarks.collapse.xmlAdded a new parameter, bookmarks.collapse, that controls the initial state -of the bookmark tree. When the parameter has a non-zero value (the default), -only the top-level bookmarks are displayed initially. Otherwise, the whole -tree of bookmarks is displayed. - -This is implemented for FOP 0.9X. Closes FR #1792326. - - -Robert Stayton: variablelist.term.properties.xmlAdd new variablelist.term.properties to format terms, per -request # 1968513. - - -Robert Stayton: qanda.defaultlabel.xmlAdd two new qanda.defaultlabel values so that numbered sections -and numbered questions can be distinguished. Satisfies -Feature Request #1539045. - - -Robert Stayton: index.links.to.section.xmlChange default to 1 to match past behavior. - - -Robert Stayton: exsl.node.set.available.xmlIsolate this text for Xalan bug regarding exsl:node-set available. -If it is ever fixed in Xalan, just fix it here. - - -Robert Stayton: index.links.to.section.xmlAdd param to control whether an index entry links to -a section title or to the precise location of the -indexterm. - - -Robert Stayton: glossentry.list.item.properties.xmlNew attribute list for glossentry in glossary. - - -Robert Stayton: monospace.verbatim.font.width.xmlNew parameter to support @width on programlisting and screen. - - -Mauritz Jeanson: highlight.source.xmlUpdated and reorganized the description. - - -Robert Stayton: page.margin.outer.xml; page.margin.inner.xmlAdd caveat about XEP bug when writing-mode is right-to-left. - - -Robert Stayton: article.appendix.title.properties.xml; writing.mode.xml; body.start.indent⋯Change 'left' to 'start' and 'right' to 'end' to support right-to-left -writing mode. - - -Robert Stayton: glossdef.block.properties.xml; glossdef.list.properties.xml; glossterm.blo⋯Add attribute-sets for formatting glossary terms and defs. - - -Robert Stayton: glossterm.separation.xmlClarify the description. - - -Robert Stayton: make.year.ranges.xmlNow handles year element containing a comma or dash without error. - - - - - -Highlighting -The following changes have been made to the - highlighting code - since the 1.74.3 release. - - -Jirka Kosek: READMEInclusion of highlighting code was simplified. Only one import is now necessary. - - -Keith Fahlgren: READMEAdding XSLTHL readme - - -Keith Fahlgren: common.xslAlternate attempt at sanely including/excluding XSLTHT code - - - - - -XSL-Saxon -The following changes have been made to the - xsl-saxon code - since the 1.74.3 release. - - -Mauritz Jeanson: src/com/nwalsh/saxon/Text.javaAdded a fix that prevents output of extra blank line. -Hopefully this closes bug #894805. - - - - - -XSL-Xalan -The following changes have been made to the - xsl-xalan code - since the 1.74.3 release. - - -Mauritz Jeanson: src/com/nwalsh/xalan/Text.javaAdded a fix that prevents output of extra blank line. -Hopefully this closes bug #894805. - - - - - - - - -Release Notes: 1.74.3 -This release fixes some bugs in the 1.74.2 release. -See highlighting/README for XSLTHL usage instructions. - - -Release Notes: 1.74.2 -This release fixes some bugs in the 1.74.1 release. - - - -Release Notes: 1.74.1 -This release includes important bug fixes and adds the following -significant feature changes: - - -Gentext -Kirghiz locale added and Chinese translations have been simplified. -Somme support for gentext and right-to-left languages has been added. - - -FO -Various bugs have been resolved. -Support for a new processing instruction: dbfo funcsynopsis-style has been added. -Added new param email.mailto.enabled for FO output. Patch from Paolo Borelli. - -Support for documented metadata in fop1 mode has been added. - - - - -Highlighting -Support for the latest version of XSLTHL 2.0 and some new language syntaxes have been added to a variety of outputs. - - - - -Manpages -Added man.output.better.ps.enabled param (zero default). It non-zero, no such -markup is embedded in generated man pages, and no enhancements are -included in the PostScript output generated from those man pages -by the man -Tps command. - - - - - -HTML -Support for writing.mode to set text direction and alignment based on document locale has been added. - -Added a new top-level stylesheet module, chunk-changebars.xsl, to be -used for generating chunked output with highlighting based on change -(@revisionflag) markup. The module imports/includes the standard chunking -and changebars templates and contains additional logic for chunked output. -See FRs #1015180 and #1819915. - - - - -ePub - -Covers now look better in Adobe Digital Editions thanks to a patch from Paul Norton of Adobe - -Cover handling now more generic (including limited DocBook 5.0 cover support thanks to patch contributed by Liza Daly. -Cover markup now carries more reliably into files destined for .mobi and the Kindle. -dc:identifiers are now generated from more types of numbering schemes. -Both SEO and semantic structure of chunked ePub output by ensuring that we always send out one and only one h1 in each XHTML chunk. - -Primitive support for embedding a single font added. - - -Support for embedding a CSS customizations added. - - - - - -Roundtrip - - -Support for imagedata-metadata and table as images added. - - -Support for imagedata-metadata and legalnotice as images added. - - - - -Params -man.output.better.ps.enabled added for Manpages output - -writing.mode.xml added to set text direction. - - -Added new param email.mailto.enabled for FO output. -Patch from Paolo Borelli. Closes #2086321. - - -highlight.source upgraded to support the latest version of XSLTHL 2.0. - - - - - - - - -The following is a list of changes that have been made since the 1.74.0 release. - - - -Gentext -The following changes have been made to the gentext code since the 1.74.0 release. - - -Michael(tm) Smith: locale/ky.xml; Makefilenew Kirghiz locale from Ilyas Bakirov - - -Mauritz Jeanson: locale/en.xmlAdded "Acknowledgements". - - -Dongsheng Song: locale/zh_cn.xmlSimplified Chinese translation. - - -Robert Stayton: locale/lv.xml; locale/ca.xml; locale/pt.xml; locale/tr.xml; locale/af.xml;⋯Add writing-mode gentext string to support right-to-left languages. - - - - - -FO -The following changes have been made to the fo code since the 1.74.0 release. - - -David Cramer: footnote.xslAdded a check to confirm that a footnoteref's linkend points to a footnote. Stylesheets stop processing if not and provide a useful error message. - - -Mauritz Jeanson: spaces.xslConvert spaces to fo:leader also in elements in the DB 5 namespace. - - -Mauritz Jeanson: pi.xsl; synop.xslAdded support for a new processing instruction: dbfo funcsynopsis-style. -Closes bug #1838213. - - -Michael(tm) Smith: inline.xsl; param.xweb; param.entAdded new param email.mailto.enabled for FO output. -Patch from Paolo Borelli. Closes #2086321. - - -Mauritz Jeanson: docbook.xslAdded support for document metadata for fop1 (patch #2067318). - - -Jirka Kosek: param.ent; param.xweb; highlight.xslUpgraded to support the latest version of XSLTHL 2.0 - -- nested markup in highlited code is now processed - -- it is no longer needed to specify path XSLTHL configuration file using Java property - -- support for new languages, including Perl, Python and Ruby was added - - - - - -HTML -The following changes have been made to the html code since the 1.74.0 release. - - -Robert Stayton: param.xweb; docbook.xsl; param.ent; html.xslAdd support for writing.mode to set text direction and alignment based on document locale. - - -Mauritz Jeanson: chunk-changebars.xslAdded a new top-level stylesheet module, chunk-changebars.xsl, to be -used for generating chunked output with highlighting based on change -(@revisionflag) markup. The module imports/includes the standard chunking -and changebars templates and contains additional logic for chunked output. -See FRs #1015180 and #1819915. - - - - - -Manpages -The following changes have been made to the manpages code since the 1.74.0 release. - - -Michael(tm) Smith: docbook.xslPut the following at the top of generated roff for each page: - \" t -purpose is to explicitly tell AT&T troff that the page needs to be -pre-processed through tbl(1); groff can figure it out -automatically, but apparently AT&T troff needs to be explicitly told - - - - - -ePub -The following changes have been made to the epub code since the 1.74.0 release. - - -Keith Fahlgren: docbook.xslPatch from Paul Norton of Adobe to get covers to look better in Adobe Digital Editions - - -Keith Fahlgren: bin/spec/epub_regressions_spec.rb; bin/spec/files/v5cover.xml; bin/spec/sp⋯Patch contributed by Liza Daly to make ePub cover handling more generic. Additionally -DocBook 5.0's <cover> now has some limited support: - -- should reference a cover in the OPF guide for a DocBook 5.0 test document - - -Keith Fahlgren: bin/spec/files/isbn.xml; bin/spec/files/issn.xml; bin/spec/files/biblioid.⋯Liza Daly reported that the dc:identifer-generation code was garbage (she was right). - -Added new tests: -- should include at least one dc:identifier -- should include an ISBN as URN for dc:identifier if an ISBN was in the metadata -- should include an ISSN as URN for dc:identifier if an ISSN was in the metadata -- should include an biblioid as a dc:identifier if an biblioid was in the metadata -- should include a URN for a biblioid with @class attribute as a dc:identifier if an biblioid was in the metadata - - -Keith Fahlgren: docbook.xsl; bin/spec/epub_spec.rbImprove both SEO and semantic structure of chunked ePub output by ensuring that -we always send out one and only one h1 in each XHTML chunk. - -DocBook::Epub -- should include one and only one <h1> in each HTML file in rendered ePub files -for <book>s -- should include one and only one <h1> in each HTML file in rendered ePub files -for <book>s even if they do not have section markup - - -Keith Fahlgren: docbook.xsl; bin/spec/epub_realbook_spec.rb; bin/spec/files/orm.book.001.x⋯Adding better support for covers in epub files destined for .mobi and the Kindle - - -Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb; bin/spec/files/DejaVuSerif.otf; docbook.⋯Adding primitive support for embedding a single font - - -Keith Fahlgren: bin/dbtoepub; bin/lib/docbook.rb; bin/spec/files/test_cust.xsl; bin/spec/e⋯Adding support for user-specified customization layers in dbtoepub - - -Keith Fahlgren: bin/dbtoepub; bin/spec/epub_regressions_spec.rb; bin/lib/docbook.rb; bin/s⋯Adding CSS support to .epub target & dbtoepub: - -c, --css [FILE] Use FILE for CSS on generated XHTML. - - -DocBook::Epub -... -- should include a CSS link in HTML files when a CSS file has been provided -- should include CSS file in .epub when a CSS file has been provided -- should include a CSS link in OPF file when a CSS file has been provided - - - - - -Roundtrip -The following changes have been made to the - roundtrip code - since the 1.74.0 release. - - -Steve Ball: blocks2dbk.xsl; template.xml; template.dotadded support for imagedata-metadata -added support for table as images - - -Steve Ball: blocks2dbk.xsl; normalise2sections.xsl; sections2blocks.xslImproved support for personname inlines. - - -Steve Ball: blocks2dbk.xsl; blocks2dbk.dtd; template.xmlAdded support for legalnotice. - - -Steve Ball: blocks2dbk.xsl; wordml2normalise.xsladded support for orgname in author - - -Steve Ball: specifications.xml; supported.xml; blocks2dbk.xsl; wordml2normalise.xsl; dbk2w⋯Updated specification. -to-DocBook: add cols attribute to tgroup -from-DocBook: fix for blockquote title - - - - - -Params -The following changes have been made to the params since the 1.74.0 release. - - -The change was to add man.output.better.ps.enabled parameter, with -its default value set to zero. - -If the value of the man.output.better.ps.enabled parameter is -non-zero, certain markup is embedded in each generated man page -such that PostScript output from the man -Tps command for that -page will include a number of enhancements designed to improve the -quality of that output. - -If man.output.better.ps.enabled is zero (the default), no such -markup is embedded in generated man pages, and no enhancements are -included in the PostScript output generated from those man pages -by the man -Tps command. - -WARNING: The enhancements provided by this parameter rely on -features that are specific to groff (GNU troff) and that are not -part of "classic" AT&T troff or any of its derivatives. Therefore, -any man pages you generate with this parameter enabled will be -readable only on systems on which the groff (GNU troff) program is -installed, such as GNU/Linux systems. The pages will not not be -readable on systems on with the classic troff (AT&T troff) command -is installed. - -NOTE: The value of this parameter only affects PostScript output -generated from the man command. It has no effect on output -generated using the FO backend. - -TIP: You can generate PostScript output for any man page by -running the following command: - -man FOO -Tps > FOO.ps - -You can then generate PDF output by running the following command: - -ps2pdf FOO.ps - - -Robert Stayton: writing.mode.xmlwriting mode param used to set text direction. - - -Michael(tm) Smith: email.mailto.enabled.xmlAdded new param email.mailto.enabled for FO output. -Patch from Paolo Borelli. Closes #2086321. - - -Jirka Kosek: highlight.source.xml; highlight.xslthl.config.xmlUpgraded to support the latest version of XSLTHL 2.0 - -- nested markup in highlited code is now processed - -- it is no longer needed to specify path XSLTHL configuration file using Java property - -- support for new languages, including Perl, Python and Ruby was added - - - - - -Highlighting -The following changes have been made to the - highlighting code - since the 1.74.0 release. - - -Jirka Kosek: cpp-hl.xml; c-hl.xml; tcl-hl.xml; php-hl.xml; common.xsl; perl-hl.xml; delphi⋯Upgraded to support the latest version of XSLTHL 2.0 - -- nested markup in highlited code is now processed - -- it is no longer needed to specify path XSLTHL configuration file using Java property - -- support for new languages, including Perl, Python and Ruby was added - - - - - - - - -Release Notes: 1.74.0 -This release includes important bug fixes and adds the following -significant feature changes: - - -.epub target -Paul Norton (Adobe) and Keith Fahlgren(O'Reilly Media) have donated code that generates .epub documents from -DocBook input. An alpha-reference implementation in Ruby has also been provided. -.epub is an open standard of the The International Digital Publishing Forum (IDPF), -a the trade and standards association for the digital publishing industry. -Read more about this target in epub/README - - - - -XHTML 1.1 target -To support .epub output, a strict XHTML 1.1 target has been added. The stylesheets for this output are -generated and are quite similar to the XHTML target. - - -Gentext updates -A number of locales have been updated. - - -Roundtrip improvements -Table, figure, template syncronization, and character style improvements have been made for WordML & Pages. Support added for OpenOffice.org. - - - - - First implementation of a libxslt extension - - A stylesheet extension for libxslt, written in Python, has been added. - The extension is a function for adjusting column widths in CALS tables. See - extensions/README.LIBXSLT for more information. - - - - - -The following is a list of changes that have been made - since the 1.73.2 release. - - -Gentext -The following changes have been made to the - gentext code - since the 1.73.2 release. - - -Michael(tm) Smith: locale/id.xmlChecked in changes to Indonesion locale submitted by Euis Luhuanam a long time ago. - - -Michael(tm) Smith: locale/lt.xmlAdded changes to Lithuanian locate submitted a long time back by Nikolajus Krauklis. - - -Michael(tm) Smith: locale/hu.xmlfixed error in lowercase.alpha definition in Hungarian locale - - -Michael(tm) Smith: locale/nb.xmlCorrected language code for nb locale, and restored missing "startquote" key. - - -Michael(tm) Smith: locale/ja.xmlCommitted changes to ja locale file, from Akagi Kobayashi. Adds bracket quotes around many xref instances that did not have them -before. - - -Michael(tm) Smith: Makefile"no" locale is now "nb" - - -Michael(tm) Smith: locale/nb.xmlUpdate Norwegian BokmÃ¥l translation. Thanks to Hans F. Nordhaug. - - -Michael(tm) Smith: locale/no.xml; locale/nb.xmlper message from Hans F. Nordhaug, correct identifier for -Norwegian BokmÃ¥l is "nb" (not "no") and has been for quite some -time now... - - -Michael(tm) Smith: locale/ja.xmlConverted ja.xml source file to use real unicode characters so -that the actual glyphs so up when you edit it in a text editor -(instead of the character references). - - -Michael(tm) Smith: locale/ja.xmlChecked in changes to ja.xml locale file. Thanks to Akagi Kobayashi. - - -Michael(tm) Smith: locale/it.xmlChanges from Federico Zenith - - -Dongsheng Song: locale/zh_cn.xmlAdded missing translations. - - - - - -Common -The following changes have been made to the - common code - since the 1.73.2 release. - - -Michael(tm) Smith: l10n.xslAdded new template "l10.language.name" for retrieving the -English-language name of the lang setting of the current document. -Closes #1916837. Thanks to Simon Kennedy. - - -Michael(tm) Smith: refentry.xslfixed syntax error - - -Michael(tm) Smith: refentry.xslfixed a couple of typos - - -Michael(tm) Smith: refentry.xslrefined handling of cases where refentry "source" or "manual" -metadata is missing or when we use fallback content instead. We -now report a Warning if we use fallback content. - - -Michael(tm) Smith: refentry.xsldon't use refmiscinfo@class=date value as fallback for refentry -"source" or "manual" metadata fields - - -Michael(tm) Smith: refentry.xslMade reporting of missing refentry metadata more quiet: - - - we no longer report anything if usable-but-not-preferred - metadata is found; we just quietly use whatever we manage to - find - - - we now only report missing "source" metadata if the refentry - is missing BOTH "source name" and "version" metadata; if it - has one but not the other, we use whichever one it has and - don't report anything as missing - -The above changes were made because testing with some "real world" -source reveals that some authors are intentionally choosing to use -"non preferred" markup for some metadata, and also choosing to -omit "source name" or "version" metadata in there DocBook XML. So -it does no good to give them pedantic reminders about what they -already know... - -Also, changed code to cause "fixme" text to be inserted in output -in particular cases: - - - if we can't manage to find any "source" metadata at all, we - now put fixme text into the output - - - if we can't manage to find any "manual" metadata a all, we - now put fixme text into the output - -The "source" and "manual" metadata is necessary information, so -buy putting the fixme stuff in the output, we alert users to the -need problem of it being missing. - - -Michael(tm) Smith: refentry.xslWhen generating manpages output, we no longer report anything if -the refentry source is missing date or pubdate content. In -practice, many users intentionally omit the date from the source -because they explicitly want it to be generated. - - -Michael(tm) Smith: l10n.xmlfurther change needed for switch from no locale to nb. - - -Michael(tm) Smith: common.xslAdded support for orgname in authorgroup. Thanks to Camille -Bégnis. - - -Michael(tm) Smith: Makefile"no" locale is now "nb" - - -Mauritz Jeanson: stripns.xslRemoved the template matching "ng:link|db:link" (in order to make @xlink:show -work with <link> elements). As far as I can tell, this template is no longer needed. - - -Mauritz Jeanson: entities.entMoved declaration of comment.block.parents entity to common/entities.ent. - - -Mauritz Jeanson: titles.xslAdded an update the fix made in revision 7528 (handling of xref/link in no.anchor.mode mode). -Having xref in title is not a problem as long as the target is not an ancestor element. -Closes bug #1838136. - -Note that an xref that is in a title and whose target is an ancestor element is still not -rendered in the TOC. This could be considered a bug, but on the other hand I cannot really -see the point in having such an xref in a document. - - -Mauritz Jeanson: titles.xslAdded a "not(ancestor::title)" test to work around "too many nested -apply-templates" problems when processing xrefs or links in no.anchor.mode mode. -Hopefully, this closes bug #1811721. - - -Mauritz Jeanson: titles.xslRemoved old template matching "link" in no.anchor.mode mode. - - -Mauritz Jeanson: titles.xslProcess <link> in no.anchor.mode mode with the same template as <xref>. -Closes bug #1759205 (Empty link in no.anchor.mode mode). - - -Mauritz Jeanson: titles.xslIn no.anchor.mode mode, do not output anchors for elements that are descendants -of <title>. Previously, having inline elements with @id/@xml:id in <title>s -resulted in anchors both in the TOC and in the main flow. Closes bug #1797492. - - - - - -FO -The following changes have been made to the - fo code - since the 1.73.2 release. - - Mauritz Jeanson: pi.xslUpdated documentation for keep-together. - Mauritz Jeanson: task.xslEnabled use of the keep-together PI on task elements. - -Robert Stayton: index.xslFOP1 requires fo:wrapper for inline index entries, not fo:inline. - - -Robert Stayton: index.xslFixed non-working inline.or.block template for indexterm wrappers. -Add fop1 to list of processors using inline.or.block. - - -Mauritz Jeanson: table.xslFixed bug #1891965 (colsep in entytbl not working). - - -Mauritz Jeanson: titlepage.xslAdded support for title in revhistory. Closes bug #1842847. - - -Mauritz Jeanson: pi.xslSmall doc cleanup (dbfo float-type). - - -Mauritz Jeanson: titlepage.xslInsert commas between multiple copyright holders. - - -Mauritz Jeanson: autotoc.xsl; division.xslAdded modifications to support nested set elements. See bug #1853172. - - -David Cramer: glossary.xslAdded normalize-space to xsl:sorts to avoid missorting of glossterms due to stray leading spaces. - - -David Cramer: glossary.xslFixed bug #1854199: glossary.xsl should use the sortas attribute on glossentry - - -Mauritz Jeanson: inline.xslAdded a template for citebiblioid. The hyperlink target is the parent of the referenced biblioid, -and the "hot text" is the biblioid itself enclosed in brackets. - - -Mauritz Jeanson: inline.xslMoved declaration of comment.block.parents entity to common/entities.ent. - - -Mauritz Jeanson: docbook.xslUpdated message about unmatched element. - - -Mauritz Jeanson: param.xwebAdded link to profiling chapter of TCG. - - -Mauritz Jeanson: refentry.xslFixed typo (refsynopsysdiv -> refsynopsisdiv). - - -David Cramer: fop.xsl; fop1.xsl; ptc.xsl; xep.xslAdded test to check generate.index param when generating pdf bookmarks - - -Mauritz Jeanson: graphics.xslAdded support for MathML in imagedata. - - -Michael(tm) Smith: math.xslRemoved unnecessary extra test condition in test express that -checks for passivetex. - - -Michael(tm) Smith: math.xslDon't use fo:instream-foreign-object if we are processing with -passivetex. Closes #1806899. Thanks to Justus Piater. - - -Mauritz Jeanson: component.xslAdded code to output a TOC for an appendix in an article when -generate.toc='article/appendix toc'. Closes bug #1669658. - - -Dongsheng Song: biblio-iso690.xslChange encoding from "windows-1250" to "UTF-8". - - -Mauritz Jeanson: pi.xslUpdated documentation for dbfo_label-width. - - -Mauritz Jeanson: lists.xslAdded support for the dbfo_label-width PI in calloutlists. - - -Robert Stayton: biblio.xslSupport finding glossary database entries inside bibliodivs. - - -Robert Stayton: formal.xslComplete support for <?dbfo pgwide="1"?> for informal -elements too. - - -Mauritz Jeanson: table.xslIn the table.block template, added a check for the dbfo_keep-together PI, so that -a table may break (depending on the PI value) at a page break. This was needed -since the outer fo:block that surrounds fo:table has keep-together.within-column="always" -by default, which prevents the table from breaking. Closes bug #1740964 (Titled -table does not respect dbfo PI). - - -Mauritz Jeanson: pi.xslAdded a few missing @role="tcg". - - -Mauritz Jeanson: inline.xslUse normalize-space() in glossterm comparisons (as in html/inline.xsl). - - -Mauritz Jeanson: autoidx.xslRemoved the [&scope;] predicate from the target variable in the template with name="reference". -This filter was the cause of missing index backlinks when @zone and @type were used on indexterms, -with index.on.type=1. Closes bug #1680836. - - -Michael(tm) Smith: inline.xsl; xref.xsl; footnote.xslAdded capability in FO output for displaying URLs for all -hyperlinks (elements marked up with xlink:href attributes) in the -same way as URLs for ulinks are already handled (which is to say, -either inline or as numbered footnotes). - -Background on this change: -DocBook 5 allows "ubiquitous" linking, which means you can make -any element a hyperlink just by adding an xlink:href attribute to -it, with the value set to an external URL. That's in contrast to -DocBook 4, which only allows you to use specific elements (e.g., -the link and ulink elements) to mark up hyperlinks. - -The existing FO stylesheets have a mechanism for handling display -of URLs for hyperlinks that are marked up with ulink, but they did -not handle display of URLs for elements that were marked up with -xlink:href attributes. This change adds handling for those other -elements, enabling the URLs they link to be displayed either -inline or as numbered footnotes (depending on what values the user -has the ulink.show and ulink.footnotes params set to). - -Note that this change only adds URL display support for elements -that call the simple.xlink template -- which currently is most -(but not all) inline elements. - -This change also moves the URL display handling out of the ulink -template and into a new "hyperlink.url.display" named template; -the ulink template and the simple.xlink named template now both -call the hyperlink.url.display template. - -Warning: In the stylesheet code that determines what footnote -number to assign to each footnote or external hyperlink, there is -an XPath expression for determining whether a particular -xlink:href instance is an external hyperlink; that expression is -necessarily a bit complicated and further testing may reveal that -it doesn't handle all cases as expected -- so some refinements to -it may need to be done later. - -Closes #1785519. Thanks to Ken Morse for reporting and -troubleshooting the problem. - - - - - -HTML -The following changes have been made to the - html code - since the 1.73.2 release. - - Keith Fahlgren: inline.xsl; synop.xslWork to make HTML and XHTML targets more valid - Keith Fahlgren: table.xslAdd better handling for tables that have footnotes in the titles - Keith Fahlgren: biblio.xslAdd anchors to bibliodivs - -Keith Fahlgren: formal.xsl; Makefile; htmltbl.xslInitial checkin/merge of epub target from work provided by Paul Norton of Adobe -and Keith Fahlgren of O'Reilly. -This change includes new code for generating the XHTML 1.1 target sanely. - - -Mauritz Jeanson: biblio.xslAdded code for creating URLs from biblioids with @class="doi" (representing Digital -Object Identifiers). See FR #1934434 and http://doi.org. - -To do: 1) Add support for FO output. 2) Figure out how @class="doi" should be handled -for bibliorelation, bibliosource and citebiblioid. - - -Norman Walsh: formal.xslDon't use xsl:copy because it forces the resulting element to be in the same namespace as the source element; in the XHTML stylesheets, that's wrong. But the HTML-to-XHTML converter does the right thing with literal result elements, so use one of them. - - -Michael(tm) Smith: MakefileAdded checks and hacks to various makefiles to enable building -under Cygwin. This stuff is ugly and maybe not worth the mess and -trouble, but does seem to work as expected and not break anything -else. - - -Michael(tm) Smith: docbook.xsladded "exslt" namespace binding to html/docbook.xsl file (in -addition to existing "exsl" binding. reason is because lack of it -seems to cause processing problems when using the profiled -version of the stylsheet - - -Norman Walsh: chunk-common.xslRename link - - -Mauritz Jeanson: table.xslAdded a fix to make rowsep apply to the last row of thead in entrytbl. - - -Michael(tm) Smith: synop.xslSimplified and streamlined handling of output for ANSI-style -funcprototype output, to correct a problem that was causing type -data to be lost in the output parameter definitions. For example, -for an instance like this: - <paramdef>void *<parameter>dataptr</parameter>[]</paramdef> -... the brackets (indicating an array type) were being dropped. - - -Michael(tm) Smith: synop.xslChanged HTML handling of K&R-style paramdef output. The parameter -definitions are no longer output in a table (though the prototype -still is). The reason for the change is that the -kr-tabular-funcsynopsis-mode template was causing type data to be -lost in the output parameter definitions. For example, for an -instance like this: - <paramdef>void *<parameter>dataptr</parameter>[]</paramdef> -... the brackets (indicating an array type) were being dropped. -The easiest way to deal with the problem is to not try to chop up -the parameter definitions and display them in table format, but to -instead just output them as-is. May not look quite as pretty, but -at least we can be sure no information is being lost... - - -Michael(tm) Smith: pi.xslupdated wording of doc for funcsynopsis-style PI - - -Michael(tm) Smith: param.xweb; param.ent; synop.xslRemoved the funcsynopsis.tabular.threshold param. It's no longer -being used in the code and hasn't been since mid 2006. - - -Mauritz Jeanson: graphics.xslAdded support for the img.src.path parameter for SVG graphics. Closes bug #1888169. - - -Mauritz Jeanson: chunk-common.xslAdded missing space. - - -Norman Walsh: component.xslFix bug where component titles inside info elements were not handled properly - - -Michael(tm) Smith: pi.xslMoved dbhtml_stop-chunking embedded doc into alphabetical order, -fixed text of TCG section it see-also'ed. - - -David Cramer: pi.xslAdded support for <?dbhtml stop-chunking?> processing instruction - - -David Cramer: chunk-common.xsl; pi.xslAdded support for <?dbhtml stop-chunking?> processing instruction - - -David Cramer: glossary.xslFixed bug #1854199: glossary.xsl should use the sortas attribute on glossentry. Also added normalize-space to avoid missorting due to stray leading spaces. - - -Mauritz Jeanson: inline.xslAdded a template for citebiblioid. The hyperlink target is the parent of the referenced biblioid, -and the "hot text" is the biblioid itself enclosed in brackets. - - -Mauritz Jeanson: inline.xslAdded support for @xlink:show in the simple.xlink template. The "new" and "replace" -values are supported (corresponding to values of "_blank" and "_top" for the -ulink.target parameter). I have assumed that @xlink:show should override ulink.target -for external URI links. This closes bugs #1762023 and #1727498. - - -Mauritz Jeanson: inline.xslMoved declaration of comment.block.parents entity to common/entities.ent. - - -Mauritz Jeanson: param.xwebAdded link to profiling chapter of TCG. - - -Dongsheng Song: biblio-iso690.xslChange encoding from "windows-1250" to "UTF-8". - - -Robert Stayton: biblio.xslAdd support in biblio collection to entries in bibliodivs. - - -Mauritz Jeanson: pi.xslAdded missing @role="tcg". - - -Mauritz Jeanson: chunk-common.xsl; titlepage.xslRefactored legalnotice/revhistory chunking, so that the use.id.as.filename -parameter as well as the dbhtml_filename PI are taken into account. A new named -template in titlepage.xsl is used to compute the filename. - - -Mauritz Jeanson: chunk-common.xsl; titlepage.xslAn update to the fix for bug #1790495 (r7433): -The "ln-" prefix is output only when the legalnotice doesn't have an -@id/@xml:id, in which case the stylesheets generate an ID value, -resulting in a filename like "ln-7e0fwgj.html". This is useful because -without the prefix, you wouldn't know that the file contained a legalnotice. -The same logic is also applied to revhistory, using an "rh-" prefix. - - -Mauritz Jeanson: autoidx.xslRemoved the [&scope;] predicate from the target variable in the template with name="reference". -This filter was the cause of missing index backlinks when @zone and @type were used on indexterms, -with index.on.type=1. Closes bug #1680836. - - -Mauritz Jeanson: titlepage.xslAdded 'ln-' prefix to the name of the legalnotice chunk, in order to match the -<link href"..."> that is output by make.legalnotice.head.links (chunk-common.xsl). -Modified the href attribute on the legalnotice link. -Closes bug #1790495. - - - - - -Manpages -The following changes have been made to the - manpages code - since the 1.73.2 release. - - -Michael(tm) Smith: other.xslslightly adjusted spacing around admonition markers - - -Michael(tm) Smith: refentry.xsl; utility.xslmake sure refsect3 titles are preceded by a line of space, and -make the indenting of their child content less severe - - -Michael(tm) Smith: block.xslonly indent verbatim environments in TTY output, not in non-TTY/PS - - -Michael(tm) Smith: block.xslmade another adjustment to correct vertical alignment of admonition marker - - -Michael(tm) Smith: block.xsl; other.xslAdjusted/corrected alignment of adominition marker in PS/non-TTY output. - - -Michael(tm) Smith: endnotes.xslFor PS/non-TTY output, display footnote/endnote numbers in -superscript. - - -Michael(tm) Smith: table.xsl; synop.xsl; utility.xslChanged handling of hanging indents for cmdsynopsis, funcsynopsis, -and synopfragment such that they now look correct in non-TTY/PS -output. We now use the groff \w escape to hang by the actual width --- in the current font -- of the command, funcdef, or -synopfragment references number (as opposed to hanging by the -number of characters). This rendering in TTY output remains the -same, since the width in monospaced TTY output is the same as the -number of characters. - -Also, created new synopsis-block-start and synopsis-block-end -templates to use for cmdsynopsis and funcsynopsis instead of the -corresponding verbatim-* templates. - -Along with those changes, also corrected a problem that caused the -content of synopfragment to be dropped, and made a -vertical-spacing change to adjust spacing around table titles and -among sibling synopfragment instances. - - -Michael(tm) Smith: other.xsluse common l10.language.name template to retrieve English-language name - - -Michael(tm) Smith: synop.xsl; inline.xsladded comment in code explaining why we don't put filename output -in italic (despite the fact that man guidelines say we should) - - -Michael(tm) Smith: inline.xslput filename output in monospace instead of italic - - -Michael(tm) Smith: synop.xslput cmdsynopsis in monospace - - -Michael(tm) Smith: inline.xslremoved template match for literal. template matches for monospace -inlines are all imported from the HTML stylesheet - - -Michael(tm) Smith: block.xsldon't indent verbatim environments that are descendants of -refsynopsisdiv, not put backgrounds behind them - - -Michael(tm) Smith: inline.xslset output of the literal element in monospace. this causes all -inline monospace instances in the git man pages to be set in -monospace (since DocBook XML source for git docs is generated with -asciidoc and asciidoc consistently outputs only <literal> for -inline monospace (not <command> or <code> or anything else). -Of course this only affects non-TTY output... - - -Michael(tm) Smith: utility.xslAdded inline.monoseq named template. - - -Michael(tm) Smith: utility.xsldon't bother using a custom register to store the previous -font-family value when setting blocks of text in code font; just -use \F[] .fam with no arg to switch back - - -Michael(tm) Smith: endnotes.xslput links in blue in PS output (note that this matches how groff -renders content marked up with the .URL macro) - - -Michael(tm) Smith: endnotes.xsl; param.xweb; param.entremoved man.links.are.underlined and added man.font.links. Also, -changed the default font formatting for links to bold. - - -Michael(tm) Smith: endnotes.xsl; param.xweb; param.entAdded new param man.base.url.for.relative.links .. specifies a -base URL for relative links (for ulink, @xlink:href, imagedata, -audiodata, videodata) shown in the generated NOTES section of -man-page output. The value of man.base.url.for.relative.links is -prepended to any relative URI that is a value of ulink url, -xlink:href, or fileref attribute. - -If you use relative URIs in link sources in your DocBook refentry -source, and you leave man.base.url.for.relative.links unset, the -relative links will appear "as is" in the NOTES section of any -man-page output generated from your source. That's probably not -what you want, because such relative links are only usable in the -context of HTML output. So, to make the links meaningful and -usable in the context of man-page output, set a value for -man.base.url.for.relative.links that points -to the online version of HTML output generated from your DocBook -refentry source. For example: - - <xsl:param name="man.base.url.for.relative.links" - >http://www.kernel.org/pub/software/scm/git/docs/</xsl:param> - - -Michael(tm) Smith: info.xslIf a source refentry contains a Documentation or DOCUMENTATION -section, don't report it as having missing AUTHOR information. -Also, if missing a contrib/personblurb for a person or org, report -pointers to http://docbook.sf.net/el/personblurb and to -http://docbook.sf.net/el/contrib - - -Michael(tm) Smith: info.xslIf we encounter an author|editor|othercredit instance that lacks a -personblurb or contrib, report it to the user (because that means -we have no information about that author|editor|othercredit to -display in the generated AUTHOR|AUTHORS section...) - - -Michael(tm) Smith: info.xsl; docbook.xsl; other.xslif we can't find any usable author data, emit a warning and insert -a fixme in the output - - -Michael(tm) Smith: info.xslfixed bug in indenting of output for contrib instances in AUTHORS -section. Thanks to Daniel Leidert and the fglrx docs for exposing -the bug. - - -Michael(tm) Smith: block.xslfor a para or simpara that is the first child of a callout, -suppress the .sp or .PP that would normally be output (because in -those cases, the output goes into a table cell, and the .sp or .PP -markup causes a spurious linebreak before it when displayed - - -Michael(tm) Smith: lists.xslAdded support for rendering co callouts and calloutlist instances. -So you can now use simple callouts -- marking up programlisting -and such with co instances -- and have the callouts displayed in -man-page output. ("simple callouts" means using co@id and -callout@arearefs pointing to co@id instances; in man/roff output, -we can't/don't support markup that uses areaset and area) - - -Michael(tm) Smith: block.xslonly put a line of space after a verbatim if it's followed by a -text node or a paragraph - - -Michael(tm) Smith: utility.xslput verbatim environments in slightly smaller font in non-TTY -output - - -Michael(tm) Smith: lists.xslminor whitespace-only reformatting of lists.xsl source - - -Michael(tm) Smith: lists.xslMade refinements/fixes to output of orderedlist and itemizedlist --- in part, to get mysql man pages to display correctly. This -change causes a "\c" continuation marker to be added between -listitem markers and contents (to ensure that the content remains -on the same line as the marker when displayed) - - -Michael(tm) Smith: block.xslput a line of vertical space after all verbatim output that has -sibling content following it (not just if that sibling content is -a text node) - - -Michael(tm) Smith: block.xslrefined spacing around titles for admonitions - - -Michael(tm) Smith: block.xsl; other.xslDeal with case of verbatim environments that have a linebreak -after the opening tag. Assumption is that users generally don't -want that linebreak to appear in output, so we do some groff -hackery to mess with vertical spacing and close the space. - - -Michael(tm) Smith: inline.xslindexterm instances now produce groff comments like this: - - .\" primary: secondary: tertiary - -remark instances, if non-empty, now produce groff comments - - -Michael(tm) Smith: charmap.groff.xsl; other.xslconvert no-break space character to groff "\ \&" (instead of just -"\ "). the reason is that if a space occurs at the end of a line, -our processing causes it to be eaten. a real-world case of this is -the mysql(1) man page. appending the "\&" prevents that - - -Michael(tm) Smith: block.xsloutput "sp" before simpara output, not after it (outputting it -after results in undesirable whitespace in particular cases; for -example, in the hg/mercurial docs - - -Michael(tm) Smith: table.xsl; synop.xsl; utility.xslrenamed from title-preamble to pinch.together and replaced "sp -1" -between synopsis fragments with call to pinch.together instead - - -Michael(tm) Smith: table.xsluse title-preamble template for table titles (instead of "sp -1" -hack), and "sp 1" after all tables (instead of just "sp" - - -Michael(tm) Smith: utility.xslcreated title-preamble template for suppressing line spacing after -headings - - -Michael(tm) Smith: info.xslfurther refinement of indenting in AUTHORS section - - -Michael(tm) Smith: block.xsl; other.xslrefined handling of admonitions - - -Michael(tm) Smith: lists.xslUse RS/RE in another place where we had IP "" - - -Michael(tm) Smith: info.xslReplace (ab)use of IP with "sp -1" in AUTHORS section with RS/RE -instead. - - -Michael(tm) Smith: table.xsl; synop.xsl; info.xslchanged all instances of ".sp -1n" to ".sp -1" - - -Michael(tm) Smith: other.xsladd extra line before SH heads only in non-TTY output - - -Michael(tm) Smith: block.xslReworked output for admonitions (caution, important, note, tip, -warning). In TTY output, admonitions now get indented. In non-TTY -output, a colored marker (yellow) is displayed next to them. - - -Michael(tm) Smith: other.xslAdded BM/EM macros for putting a colored marker in margin next to -a block of text. - - -Michael(tm) Smith: utility.xslcreated make.bold.title template by moving title-bolding part out -from nested-section-title template. This allows the bolding to -also be used by the template for formatting admonitions - - -Michael(tm) Smith: info.xslput .br before copyright contents to prevent them from getting run in - - -Michael(tm) Smith: refentry.xsl; other.xsl; utility.xslmade point size of output for Refsect2 and Refsect3 heads bigger - - -Michael(tm) Smith: other.xslput slightly more space between SH head and underline in non-TTY -output - - -Michael(tm) Smith: param.xweb; param.ent; other.xslAdded the man.charmap.subset.profile.english parameter and refined -the handling of charmap subsets to differentiate between English -and non-English source. - -This way charmap subsets are now handled is this: - -If the value of the man.charmap.use.subset parameter is non-zero, -and your DocBook source is not written in English (that is, if its -lang or xml:lang attribute has a value other than en), then the -character-map subset specified by the man.charmap.subset.profile -parameter is used instead of the full roff character map. - -Otherwise, if the lang or xml:lang attribute on the root element -in your DocBook source or on the first refentry element in your -source has the value en or if it has no lang or xml:lang -attribute, then the character-map subset specified by the -man.charmap.subset.profile.english parameter is used instead of -man.charmap.subset.profile. - -The difference between the two subsets is that -man.charmap.subset.profile provides mappings for characters in -Western European languages that are not part of the Roman -(English) alphabet (ASCII character set). - - -Michael(tm) Smith: other.xslVarious updates, mainly related to uppercasing SH titles: - - - added a "Language: " metadata line to the top comment area of - output man pages, to indicate the language the page is in - - - added a "toupper" macro of doing locale-aware uppercasing of - SH titles and cross-references to SH titles; the mechanism - relies on the uppercase.alpha and lowercase.alpha DocBook - gentext keys to do locale-aware uppercasing based on the - language the page is written in - - - added a "string.shuffle" template, which provides a library - function for "shuffling" two strings together into a single - string; it takes the first character for the first string, the - first character from second string, etc. The only current use - for it is to generate the argument for the groff tr request - that does string uppercasing. - - - added make.tr.uppercase.arg and make.tr.normalcase.arg named - templates for use in generating groff code for uppercasing and - "normal"-casing SH titles - - - made the BB/BE "background drawing" macros have effect only in - non-TTY output - - - output a few comments in the top part of source - - -Michael(tm) Smith: utility.xslremoved some leftover kruft - - -Michael(tm) Smith: refentry.xslTo create the name(s) for each man page, we now replace any spaces -in the refname(s) with underscores. This ensures that tools like -lexgrog(1) will be able to parse the name (lexgrog won't parse -names that contain spaces). - - -Michael(tm) Smith: docbook.xslPut a comment into source of man page to indicate where the main -content starts. (We now have a few of macro definitions at the -start of the source, so putting this comment in helps those that -might be viewing the source.) - - -Michael(tm) Smith: refentry.xslrefined mechanism for generating SH titles - - -Michael(tm) Smith: charmap.groff.xslAdded zcaron, Zcaron, scaron, and Scaron to the groff character map. -This means that generated Finnish man pages will no longer contain -any raw accented characters -- they'll instead by marked up with -groff escapes. - - -Michael(tm) Smith: other.xsl; utility.xslcorrected a regression I introduced about a year ago that caused -dots to be output just as "\." -- instead needs to be "\&." (which -is what it will be now, after this change) - - -Michael(tm) Smith: refentry.xslChanged backend handling for generating titles for SH sections and -for cross-references to those sections. This should have no effect -on TTY output (behavior should remain the same hopefully) but -results in titles in normal case (instead of uppercase) in PS -output. - - -Michael(tm) Smith: info.xsluse make.subheading template to make subheadings for AUTHORS and -COPYRIGHT sections (instead of harcoding roff markup) - - -Michael(tm) Smith: block.xslput code font around programlisting etc. - - -Michael(tm) Smith: synop.xsl; docbook.xslembed custom macro definitions in man pages, plus wrap synopsis in -code font - - -Michael(tm) Smith: endnotes.xsluse the make.subheading template to generated SH subheading for -endnotes section. - - -Michael(tm) Smith: lists.xslAdded some templates for generating if-then-else conditional -markup in groff, so let's use those instead of hard-coding it in -multiple places... - - -Michael(tm) Smith: other.xsl; utility.xslInitial checkin of some changes related to making PS/PDF output -from "man -l -Tps" look better. The current changes: - - - render synopsis and verbatim sections in a monospace/code font - - - put a light-grey background behind all programlisting, screen, - and literallayout instances - - - prevent SH heads in PS output from being rendered in uppercase - (as they are in console output) - - - also display xrefs to SH heads in PS output in normal case - (instead of uppercase) - - - draw a line under SH heads in PS output - -The changes made to the code to support the above features were: - - - added some embedded/custom macros: one for conditionally - upper-casing SH x-refs, one for redefining the SH macro - itself, with some conditional handling for PS output, and - finally a macro for putting a background/screen (filled box) - around a block of text (e.g., a program listing) in PS output - - - added utility templates for wrapping blocks of text in code - font; also templates for inline code font - - -Robert Stayton: refentry.xslrefpurpose nodes now get apply-templates instead of just normalize-space(). - - -Michael(tm) Smith: lists.xslFixed alignment of first lined of text for each listitem in -orderedlist output for TTY. Existing code seemed to have been -causing an extra undesirable space to appear. - - -Michael(tm) Smith: lists.xslWrapped some roff conditionals around roff markup for orderedlist -and itemizedlist output, so that the lists look acceptable in PS -output as well as TTY. - - -Michael(tm) Smith: pi.xsl; synop.xsl; param.xweb; param.entAdded the man.funcsynopsis.style parameter. Has the same effect in -manpages output as the funcsynopsis.style parameter has in HTML -output -- except that its default value is 'ansi' instead of 'kr'. - - -Michael(tm) Smith: synop.xslReworked handling of K&R funcprototype output. It no longer relies -on the HTML kr-tabular templates, but instead just does direct -transformation to roff. For K&R output, it displays the paramdef -output in an indented list following the prototype. - - -Michael(tm) Smith: synop.xslProperly integrated handling for K&R output into manpages -stylesheet. The choice between K&R output and ANSI output is -currently controlled through use of the (HTML) funcsynopsis.style -parameter. Note that because the mechanism does currently rely on -funcsynopsis.style, the default in manpages output is now K&R -(because that's the default of that param). But I suppose I ought -to create a man.funcsynopsis.style and make the default for that -ANSI (to preserve the existing default behavior). - - -Michael(tm) Smith: docbook.xsladded manpages/pi.xsl file - - -Michael(tm) Smith: .cvsignore; pi.xslAdded "dbman funcsynopsis-style" PI and incorporated it into the -doc build. - - -Michael(tm) Smith: refentry.xslFixed regression that caused an unescaped dash to be output -between refname and refpurpose content. Closes bug #1894244. -Thanks to Daniel Leidert. - - -Michael(tm) Smith: other.xslFixed problem with dots being escaped in filenames of generated -man files. Closes #1827195. Thanks to Daniel Leidert. - - -Michael(tm) Smith: inline.xslAdded support for processing structfield (was appearing in roff -output surrounded by HTML <em> tags; fixed so that it gets roff -ital markup). Closes bug #1858329. Thanks to Sam Varshavchik. - - - - - -Epub -The following changes have been made to the - epub code - since the 1.73.2 release. - - Keith Fahlgren: bin/spec/README; bin/spec/epub_realbook_spec.rb'Realbook' spec now passes - Keith Fahlgren: bin/dbtoepub; README; bin/spec/README; bin/lib/docbook.rb; bin/spec/epub_r⋯Very primitive Windows support for dbtoepub reference implementation; README for running tests and for the .epub target in general; shorter realbook test document (still fails for now) - Keith Fahlgren: bin/dbtoepub; bin/spec/epub_regressions_spec.rb; bin/lib/docbook.rb; bin/s⋯Changes to OPF spine to not duplicate idrefs for documents with parts not at the root; regression specs for same - Keith Fahlgren: docbook.xslFixing linking to cover @id, distinct from other needs of cover-image-id (again, thanks to Martin Goerner) - Keith Fahlgren: docbook.xslUpdating the title of the toc element in the guide to be more explicit (thanks to Martin Goerner) - -Keith Fahlgren: bin/spec/examples/amasque_exploded/content.opf; bin/spec/examples/amasque_⋯Initial checkin/merge of epub target from work provided by Paul Norton of Adobe -and Keith Fahlgren of O'Reilly. - - -Keith Fahlgren: docbook.xsl== General epub test support - -$ spec -O ~/.spec.opts spec/epub_spec.rb - -DocBook::Epub -- should be able to be created -- should fail on a nonexistent file -- should be able to render to a file -- should create a file after rendering -- should have the correct mimetype after rendering -- should be valid .epub after rendering an article -- should be valid .epub after rendering an article without sections -- should be valid .epub after rendering a book -- should be valid .epub after rendering a book even if it has one graphic -- should be valid .epub after rendering a book even if it has many graphics -- should be valid .epub after rendering a book even if it has many duplicated graphics -- should report an empty file as invalid -- should confirm that a valid .epub file is valid -- should not include PDFs in rendered epub files as valid image inclusions -- should include a TOC link in rendered epub files for <book>s - -Finished in 20.608395 seconds - -15 examples, 0 failures - - -== Verbose epub test coverage against _all_ of the testdocs - -Fails on only (errors truncated): -1) -'DocBook::Epub should be able to render a valid .epub for the test document /Users/keith/work/docbook-dev/trunk/xsl/epub/bin/spec/testdocs/calloutlist.003.xml [30]' FAILED -'DocBook::Epub should be able to render a valid .epub for the test document /Users/keith/work/docbook-dev/trunk/xsl/epub/bin/spec/testdocs/cmdsynopsis.001.xml [35]' FAILED -.... - -Finished in 629.89194 seconds - -224 examples, 15 failures - -224 examples, 15 failures yields 6% failure rate - - - - - -HTMLHelp -The following changes have been made to the - htmlhelp code - since the 1.73.2 release. - - -Mauritz Jeanson: htmlhelp-common.xslAdded <xsl:with-param name="quiet" select="$chunk.quietly"/> to calls to -the write.chunk, write.chunk.with.doctype, and write.text.chunk templates. -This makes chunk.quietly=1 suppress chunk filename messages also for help -support files (which seems to be what one would expect). See bug #1648360. - - - - - -Eclipse -The following changes have been made to the - eclipse code - since the 1.73.2 release. - - -David Cramer: eclipse.xslUse sortas attributes (if they exist) when sorting indexterms - - -David Cramer: eclipse.xslAdded support for indexterm/see in eclipse index.xml - - -Mauritz Jeanson: eclipse.xslAdded <xsl:with-param name="quiet" select="$chunk.quietly"/> -to helpidx template. - - -David Cramer: eclipse.xslGenerate index.xml file and add related goo to plugin.xml file. Does not yet support see and seealso. - - -Mauritz Jeanson: eclipse.xslAdded <xsl:with-param name="quiet" select="$chunk.quietly"/> to calls to -the write.chunk, write.chunk.with.doctype, and write.text.chunk templates. -This makes chunk.quietly=1 suppress chunk filename messages also for help -support files (which seems to be what one would expect). See bug #1648360. - - - - - -JavaHelp -The following changes have been made to the - javahelp code - since the 1.73.2 release. - - -Mauritz Jeanson: javahelp.xslAdded <xsl:with-param name="quiet" select="$chunk.quietly"/> to calls to -the write.chunk, write.chunk.with.doctype, and write.text.chunk templates. -This makes chunk.quietly=1 suppress chunk filename messages also for help -support files (which seems to be what one would expect). See bug #1648360. - - - - - -Roundtrip -The following changes have been made to the - roundtrip code - since the 1.73.2 release. - - -Steve Ball: blocks2dbk.xsl; wordml2normalise.xslfix table/cell borders for wordml, fix formal figure, add emphasis-strong - - -Mauritz Jeanson: supported.xmlChanged @cols to 5. - - -Steve Ball: blocks2dbk.xsl; blocks2dbk.dtd; template.xmladded pubdate, fixed metadata handling in biblioentry - - -Steve Ball: supported.xmlAdded support for edition. - - -Steve Ball: docbook-pages.xsl; wordml-blocks.xsl; docbook.xsl; wordml.xsl; pages-normalise⋯Removed stylesheets for old, deprecated conversion method. - - -Steve Ball: specifications.xml; dbk2ooo.xsl; blocks2dbk.xsl; dbk2pages.xsl; blocks2dbk.dtd⋯Added support for Open Office, added edition element, improved list and table support in Word and Pages - - -Steve Ball: normalise-common.xsl; blocks2dbk.xsl; dbk2pages.xsl; template-pages.xml; templ⋯Fixed bug in WordML table handling, improved table handling for Pages 08, synchronised WordML and Pages templates. - - -Steve Ball: normalise-common.xsl; blocks2dbk.xsl; wordml2normalise.xsl; dbk2wp.xslfix caption, attributes - - -Steve Ball: specifications.xml; blocks2dbk.xsl; wordml2normalise.xsl; blocks2dbk.dtd; temp⋯Fixes to table and list handling - - -Steve Ball: blocks2dbk.xsladded support for explicit emphasis character styles - - -Steve Ball: wordml2normalise.xsladded support for customisation in image handling - - -Steve Ball: blocks2dbk.xslAdded inlinemediaobject support for metadata. - - -Steve Ball: normalise-common.xsl; blocks2dbk.xsl; template.xml; dbk2wordml.xsl; dbk2wp.xslAdded support file. Added style locking. Conversion bug fixes. - - - - - -Slides -The following changes have been made to the - slides code - since the 1.73.2 release. - - -Michael(tm) Smith: fo/Makefile; html/MakefileAdded checks and hacks to various makefiles to enable building -under Cygwin. This stuff is ugly and maybe not worth the mess and -trouble, but does seem to work as expected and not break anything -else. - - -Jirka Kosek: html/plain.xslAdded support for showing foil number - - - - - -Website -The following changes have been made to the - website code - since the 1.73.2 release. - - -Michael(tm) Smith: extensions/saxon64/.classes/.gitignore; extensions/xalan2/.classes/com/⋯renamed a bunch more .cvsignore files to .gitignore (to facilitate use of git-svn) - - - - - -Params -The following changes have been made to the - params code - since the 1.73.2 release. - - Keith Fahlgren: epub.autolabel.xmlNew parameter for epub, epub.autolabel - -Mauritz Jeanson: table.frame.border.color.xml; table.cell.padding.xml; table.cell.border.t⋯Added missing refpurposes and descriptions. - - -Keith Fahlgren: ade.extensions.xmlExtensions to support Adobe Digital Editions extensions in .epub output. - - -Mauritz Jeanson: fop.extensions.xml; fop1.extensions.xmlClarified that fop1.extensions is for FOP 0.90 and later. Version 1 is not here yet... - - -Michael(tm) Smith: man.links.are.underlined.xml; man.endnotes.list.enabled.xml; man.font.l⋯removed man.links.are.underlined and added man.font.links. Also, -changed the default font formatting for links to bold. - - -Michael(tm) Smith: man.base.url.for.relative.links.xmlAdded new param man.base.url.for.relative.links .. specifies a -base URL for relative links (for ulink, @xlink:href, imagedata, -audiodata, videodata) shown in the generated NOTES section of -man-page output. The value of man.base.url.for.relative.links is -prepended to any relative URI that is a value of ulink url, -xlink:href, or fileref attribute. - -If you use relative URIs in link sources in your DocBook refentry -source, and you leave man.base.url.for.relative.links unset, the -relative links will appear "as is" in the NOTES section of any -man-page output generated from your source. That's probably not -what you want, because such relative links are only usable in the -context of HTML output. So, to make the links meaningful and -usable in the context of man-page output, set a value for -man.base.url.for.relative.links that points -to the online version of HTML output generated from your DocBook -refentry source. For example: - - <xsl:param name="man.base.url.for.relative.links" - >http://www.kernel.org/pub/software/scm/git/docs/</xsl:param> - - -Michael(tm) Smith: man.string.subst.map.xmlsqueeze .sp\n.sp into a single .sp (to prevent a extra, spurious -line of whitespace from being inserted after programlisting etc. -in certain cases) - - -Michael(tm) Smith: refentry.manual.fallback.profile.xml; refentry.source.fallback.profile.⋯don't use refmiscinfo@class=date value as fallback for refentry -"source" or "manual" metadata fields - - -Michael(tm) Smith: man.charmap.subset.profile.xml; man.charmap.enabled.xml; man.charmap.su⋯made some further doc tweaks related to the -man.charmap.subset.profile.english param - - -Michael(tm) Smith: man.charmap.subset.profile.xml; man.charmap.enabled.xml; man.charmap.su⋯Added the man.charmap.subset.profile.english parameter and refined -the handling of charmap subsets to differentiate between English -and non-English source. - -This way charmap subsets are now handled is this: - -If the value of the man.charmap.use.subset parameter is non-zero, -and your DocBook source is not written in English (that is, if its -lang or xml:lang attribute has a value other than en), then the -character-map subset specified by the man.charmap.subset.profile -parameter is used instead of the full roff character map. - -Otherwise, if the lang or xml:lang attribute on the root element -in your DocBook source or on the first refentry element in your -source has the value en or if it has no lang or xml:lang -attribute, then the character-map subset specified by the -man.charmap.subset.profile.english parameter is used instead of -man.charmap.subset.profile. - -The difference between the two subsets is that -man.charmap.subset.profile provides mappings for characters in -Western European languages that are not part of the Roman -(English) alphabet (ASCII character set). - - -Michael(tm) Smith: man.charmap.subset.profile.xmlAdded to default charmap used by manpages: - - - the "letters" part of the 'C1 Controls And Latin-1 Supplement - (Latin-1 Supplement)' Unicode block - - Latin Extended-A block (but not all of the characters from - that block have mappings in groff, so some of them are still - passed through as-is) - -The effects of this change are that in man pages generated for -most Western European languages and for Finnish, all characters -not part of the Roman alphabet are (e.g., "accented" characters) -are converted to groff escapes. - -Previously, by default we passed through those characters as is -(and users needed to use the full charmap if they wanted to have -those characters converted). - -As a result of this change, man pages generated for Western -European languages will be viewable in some environments in which -they are not viewable if the "raw" non-Roman characters are in them. - - -Mauritz Jeanson: generate.legalnotice.link.xml; generate.revhistory.link.xmlAdded information on how the filename is computed. - - -Mauritz Jeanson: default.table.width.xmlClarified PI usage. - - -Michael(tm) Smith: man.funcsynopsis.style.xmlAdded the man.funcsynopsis.style parameter. Has the same effect in -manpages output as the funcsynopsis.style parameter has in HTML -output -- except that its default value is 'ansi' instead of 'kr'. - - -Michael(tm) Smith: funcsynopsis.tabular.threshold.xmlRemoved the funcsynopsis.tabular.threshold param. It's no longer -being used in the code and hasn't been since mid 2006. - - -Mauritz Jeanson: table.properties.xmlSet keep-together.within-column to "auto". This seems to be the most sensible -default value for tables. - - -Mauritz Jeanson: informal.object.properties.xml; admon.graphics.extension.xml; informalequ⋯Several small documentation fixes. - - -Mauritz Jeanson: manifest.in.base.dir.xmlWording fixes. - - -Mauritz Jeanson: header.content.properties.xml; footer.content.properties.xmlAdded refpurpose. - - -Mauritz Jeanson: ulink.footnotes.xml; ulink.show.xmlUpdated for DocBook 5. - - -Mauritz Jeanson: index.method.xml; glossterm.auto.link.xmlSpelling and wording fixes. - - -Mauritz Jeanson: callout.graphics.extension.xmlClarifed available graphics formats and extensions. - - -Mauritz Jeanson: footnote.sep.leader.properties.xmlCorrected refpurpose. - - -Jirka Kosek: footnote.properties.xmlAdded more properties which make it possible to render correctly footnotes placed inside verbatim elements. - - -Mauritz Jeanson: img.src.path.xmlimg.src.path works with inlinegraphic too. - - -Mauritz Jeanson: saxon.character.representation.xmlAdded TCG link. - - -Mauritz Jeanson: img.src.path.xmlUpdated description of img.src.path. Bug #1785224 revealed that -there was a risk of misunderstanding how it works. - - - - - -Profiling -The following changes have been made to the - profiling code - since the 1.73.2 release. - - -Jirka Kosek: xsl2profile.xslAdded new rules to profile all content generated by HTML Help (including alias files) - - -Robert Stayton: profile-mode.xsluse mode="profile" instead of xsl:copy-of for attributes so -they can be more easily customized. - - - - - - -Tools -The following changes have been made to the - tools code - since the 1.73.2 release. - - -Michael(tm) Smith: make/Makefile.DocBookvarious changes and additions to support making with asciidoc as -an input format - - -Michael(tm) Smith: make/Makefile.DocBookmake dblatex the default PDF maker for the example makefile - - -Michael(tm) Smith: xsl/build/html2roff.xslReworked handling of K&R funcprototype output. It no longer relies -on the HTML kr-tabular templates, but instead just does direct -transformation to roff. For K&R output, it displays the paramdef -output in an indented list following the prototype. - - -Mauritz Jeanson: xsl/build/make-xsl-params.xslMade attribute-sets members of the param list. This enables links to attribute-sets in the -reference documentation. - - -Michael(tm) Smith: xsl/build/html2roff.xsluse .BI handling in K&R funsynopsis output for manpages, just as -we do already of ANSI output - - -Michael(tm) Smith: xsl/build/html2roff.xslImplemented initial support for handling tabular K&R output of -funcprototype in manpages output. Accomplished by adding more -templates to the intermediate HTML-to-roff stylesheet that the -build uses to create the manpages/html-synop.xsl stylesheet. - - -Michael(tm) Smith: xsl/build/doc-link-docbook.xslMade the xsl/tools/xsl/build/doc-link-docbook.xsl stylesheet -import profile-docbook.xsl, so that we can do profiling of release -notes. Corrected some problems in the target for the release-notes -HTML build. - - - - - -Extensions -The following changes have been made to the - extensions code - since the 1.73.2 release. - - Keith Fahlgren: MakefileUse DOCBOOK_SVN variable everywhere, please; build with PDF_MAKER - -Michael(tm) Smith: Makefilemoved extensions build targets from master xsl/Makefile to -xsl/extensions/Makefile - - -Michael(tm) Smith: .cvsignorere-adding empty extensions subdir - - - - - -XSL-Saxon -The following changes have been made to the - xsl-saxon code - since the 1.73.2 release. - - -Michael(tm) Smith: VERSIONbring xsl2, xsl-saxon, and xsl-xalan VERSION files up-to-date with -recent change to snapshot build infrastructure - - -Michael(tm) Smith: nbproject/build-impl.xml; nbproject/project.propertiesChanged hard-coded file references in "clean" target to variable -references. Closes #1792043. Thanks to Daniel Leidert. - - -Michael(tm) Smith: VERSION; MakefileDid post-release wrap-up of xsl-saxon and xsl-xalan dirs - - -Michael(tm) Smith: nbproject/build-impl.xml; VERSION; Makefile; testMore tweaks to get release-ready - - - - - -XSL-Xalan -The following changes have been made to the - xsl-xalan code - since the 1.73.2 release. - - -Michael(tm) Smith: VERSIONbring xsl2, xsl-saxon, and xsl-xalan VERSION files up-to-date with -recent change to snapshot build infrastructure - - -Michael(tm) Smith: nbproject/build-impl.xmlChanged hard-coded file references in "clean" target to variable -references. Closes #1792043. Thanks to Daniel Leidert. - - -Michael(tm) Smith: Makefile; VERSIONDid post-release wrap-up of xsl-saxon and xsl-xalan dirs - - -Michael(tm) Smith: Makefile; nbproject/build-impl.xml; VERSIONMore tweaks to get release-ready - - - - - -XSL-libxslt -The following changes have been made to the - xsl-libxslt code - since the 1.73.2 release. - - -Mauritz Jeanson: python/xslt.pyPrint the result to stdout if no outfile has been given. -Some unnecessary semicolons removed. - - -Mauritz Jeanson: python/xslt.pyAdded a function that quotes parameter values (to ensure that they are interpreted as strings). -Replaced deprecated functions from the string module with string methods. - - -Michael(tm) Smith: python/README; python/README.LIBXSLTrenamed xsl-libxslt/python/README to xsl-libxslt/python/README.LIBXSLT - - -Mauritz Jeanson: python/READMETweaked the text a little. - - - - - - - -Release Notes: 1.73.2 -This is solely a minor bug-fix update to the 1.73.1 release. - It fixes a packaging error in the 1.73.1 package, as well as a - bug in footnote handling in FO output. - - - -Release: 1.73.1 -This is mostly a bug-fix update to the 1.73.0 release. - - -Gentext -The following changes have been made to the - gentext code - since the 1.73.0 release. - - -Mauritz Jeanson: locale/de.xmlApplied patch #1766009. - - -Michael(tm) Smith: locale/lv.xmlAdded localization for ProductionSet. - - - - - -FO -The following changes have been made to the - fo code - since the 1.73.0 release. - - -Mauritz Jeanson: table.xslModified the tgroup template so that, for tables with multiple tgroups, -a width attribute is output on all corresponding fo:tables. Previously, -there was a test prohibiting this (and a comment saying that outputting more -than one width attribute will cause an error). But this seems to be no longer -relevant; it is not a problem with FOP 0.93 or XEP 4.10. Closes bug #1760559. - - -Mauritz Jeanson: graphics.xslReplaced useless <a> elements with warning messages (textinsert extension). - - -Mauritz Jeanson: admon.xslEnabled generation of ids (on fo:wrapper) for indexterms in admonition titles, so that page -references in the index can be created. Closes bug #1775086. - - - - - -HTML -The following changes have been made to the - html code - since the 1.73.0 release. - - -Mauritz Jeanson: titlepage.xslAdded <xsl:call-template name="process.footnotes"/> to abstract template -so that footnotes in info/abstract are processed. Closes bug #1760907. - - -Michael(tm) Smith: pi.xsl; synop.xslChanged handling of HTML output for the cmdsynopsis and -funcsynopsis elements, such that a@id instances are generated for -them if they are descendants of any element containing a dbcmdlist -or dbfunclist PI. Also, update the embedded reference docs for the -dbcmdlist and dbfunclist PIs to make it clear that they can be -used within any element for which cmdsynopsis or funcsynopsis are -valid children. - - -Michael(tm) Smith: formal.xslReverted the part of revision 6952 that caused a@id anchors to be -generated for output of informal objects. Thanks to Sam Steingold -for reporting. - - -Robert Stayton: glossary.xslAccount for a glossary with no glossdiv or glossentry children. - - -Mauritz Jeanson: titlepage.xslModified legalnotice template so that the base.name parameter is calculated -in the same way as for revhistory chunks. Using <xsl:apply-templates -mode="chunk-filename" select="."/> did not work for single-page output since -the template with that mode is in chunk-code.xsl. - - -Mauritz Jeanson: graphics.xslUpdated support for SVG (must be a child of imagedata in DB 5). -Added support for MathML in imagedata. - - -Mauritz Jeanson: pi.xslAdded documentation for the dbhh PI (used for context-sensitive HTML Help). -(The two templates matching 'dbhh' are still in htmlhelp-common.xsl). - - - - - -Manpages -The following changes have been made to the - manpages code - since the 1.73.0 release. - - -Michael(tm) Smith: endnotes.xslIn manpages output, generate warnings about notesources with -non-para children only if the notesource is a footnote or -annotation. Thanks to Sam Steingold for reporting problems with -the existing handling. - - - - - -HTMLHelp -The following changes have been made to the - htmlhelp code - since the 1.73.0 release. - - -Michael(tm) Smith: htmlhelp-common.xslAdded single-pass namespace-stripping support to the htmlhelp, -eclipse, and javahelp stylesheets. - - - - - -Eclipse -The following changes have been made to the - eclipse code - since the 1.73.0 release. - - -Michael(tm) Smith: eclipse.xslAdded single-pass namespace-stripping support to the htmlhelp, -eclipse, and javahelp stylesheets. - - - - - -JavaHelp -The following changes have been made to the - javahelp code - since the 1.73.0 release. - - -Michael(tm) Smith: javahelp.xslAdded single-pass namespace-stripping support to the htmlhelp, -eclipse, and javahelp stylesheets. - - - - - -Roundtrip -The following changes have been made to the - roundtrip code - since the 1.73.0 release. - - -Steve Ball: blocks2dbk.xsl; blocks2dbk.dtd; pages2normalise.xslModularised blocks2dbk to allow customisation, -Added support for tables to pages2normalise - - - - - -Params -The following changes have been made to the - params code - since the 1.73.0 release. - - -Robert Stayton: procedure.properties.xmlprocedure was inheriting keep-together from formal.object.properties, but -a procedure does not need to be kept together by default. - - -Dave Pawson: title.font.family.xml; component.label.includes.part.label.xml; table.frame.b⋯Regular formatting re-org. - - - - - - -Release: 1.73.0 -This release includes important bug fixes and adds the following -significant feature changes: - - - New localizations and localization updates - - We added two new localizations: Latvian and - Esperanto, and made updates to the Czech, Chinese - Simplified, Mongolian, Serbian, Italian, and Ukrainian - localizations. - - - - ISO690 citation style for bibliography output. - - Set the - bibliography.style parameter to - iso690 to use ISO690 style. - - - - New documentation for processing instructions (PI) - - The reference documentation that ships with the - release now includes documentation on all PIs that you can use to - control output from the stylesheets. - - - - New profiling parameters for audience and wordsize - - You can now do profiling based on the values of the - audience and - wordsize attributes. - - - - Changes to man-page output - - The manpages stylesheet now supports single-pass - profiling and single-pass DocBook 5 namespace stripping - (just as the HTML and FO stylesheets also do). Also, added - handling for mediaobject & - inlinemediaobject. (Each imagedata, - audiodata, or videodata element - within a mediaobject or inline - mediaobject is now treated as a "notesource" - and so handled in much the same way as links and - annotation/alt/footnote - are in manpages output.) And added the - man.authors.section.enabled and - man.copyright.section.enabled - parameters to enable control over whether output includes - auto-generated AUTHORS and - COPYRIGHT sections. - - - - Highlighting support for C - - The highlighting mechanism for generating - syntax-highlighted code snippets in output now supports C - code listings (along with Java, PHP, XSLT, and others). - - - - Experimental docbook-xsl-update script - - We added an experimental docbook-xsl-update - script, the purpose of which is to facilitate - easy sync-up to the latest docbook-xsl snapshot (by means - of rsync). - - - - - - -Gentext -The following changes have been made to the -gentext code -since the 1.72.0 release. - - -Michael(tm) Smith: locale/lv.xml; MakefileAdded Latvian localization file, from Girts Ziemelis. - - -Dongsheng Song: locale/zh_cn.xmlBrought up to date with en.xml in terms of items. A few strings marked for translation. - - -Jirka Kosek: locale/cs.xmlAdded missing translations - - -Robert Stayton: locale/eo.xmlNew locale for Esperanto. - - -Robert Stayton: locale/mn.xmlUpdate from Ganbold Tsagaankhuu. - - -Jirka Kosek: locale/en.xml; locale/cs.xmlRules for normalizing glossary entries before they are sorted can be now different for each language. - - -Michael(tm) Smith: locale/sr_Latn.xml; locale/sr.xmlCommitted changes from MiloÅ¡ KomarÄević to Serbian files. - - -Robert Stayton: locale/ja.xmlFix chapter in context xref-number-and-title - - -Robert Stayton: locale/it.xmlImproved version from contributor. - - -Mauritz Jeanson: locale/uk.xmlApplied patch 1592083. - - - - -Common -The following changes have been made to the -common code -since the 1.72.0 release. - - -Michael(tm) Smith: labels.xslChanged handling of reference auto-labeling such that reference -(when it appears at the component level) is now affected by the -label.from.part param, just as preface, chapter, and appendix. - - -Michael(tm) Smith: common.xslAdded support to the HTML stylesheets for proper processing of -orgname as a child of author. - - -Michael(tm) Smith: refentry.xslRefined logging output of refentry metadata-gathering template; -for some cases of "missing" elements (refmiscinfo stuff, etc.), -the log messages now include URL to corresponding page in the -Definitive Guide (TDG). - - -Robert Stayton: titles.xslAdd refsection/info/title support. - - -Michael(tm) Smith: titles.xslAdded support for correct handling of xref to elements that -contain info/title descendants but no title children. - -This should be further refined so that it handles any *info -elements. And there are probably some other places where similar -handling for *info/title should be added. - - -Mauritz Jeanson: pi.xslModified <xsl:when> in datetime.format template to work -around Xalan bug. - - - - -FO -The following changes have been made to the -fo code -since the 1.72.0 release. - - -Robert Stayton: component.xslAdd parameters to the page.sequence utility template. - - -Mauritz Jeanson: xref.xslAdded template for xref to area/areaset. -Part of fix for bug #1675513 (xref to area broken). - - -Michael(tm) Smith: inline.xslAdded template match for person element to fo stylesheet. - - -Robert Stayton: lists.xslAdded support for spacing="compact" in variablelist, per bug report #1722540. - - -Robert Stayton: table.xsltable pgwide="1" should also use pgwide.properties attribute-set. - - -Mauritz Jeanson: inline.xslMake citations numbered if bibliography.numbered != 0. - - -Robert Stayton: param.xweb; param.entAdd new profiling parameters for audience and wordsize. - - -Robert Stayton: param.xweb; param.entAdded callout.icon.size parameter. - - -Robert Stayton: inline.xsl; xref.xslAdd support for xlink as olink. - - -Robert Stayton: autotoc.xsl; param.xweb; param.entAdd support for qanda.in.toc to fo TOC. - - -Robert Stayton: component.xslImproved the page.sequence utility template for use with book. - - -Robert Stayton: division.xslRefactored the big book template into smaller pieces. -Used the "page.sequence" utility template in -component.xsl to shorten the toc piece. -Added placeholder templates for front.cover and back.cover. - - -Robert Stayton: param.xweb; param.ent; sections.xslAdd section.container.element parameter to enable -pgwide spans inside sections. - - -Robert Stayton: param.xweb; param.ent; component.xslAdd component.titlepage.properties attribute-set to -support span="all" and other properties. - - -Robert Stayton: htmltbl.xsl; table.xslApply table.row.properties template to html tr rows too. -Add keep-with-next to table.row.properties when row is in thead. - - -Robert Stayton: table.xslAdd support for default.table.frame parameter. -Fix bug 1575446 rowsep last check for @morerows. - - -Robert Stayton: refentry.xslAdd support for info/title in refsections. - - -David Cramer: qandaset.xslMake fo questions and answers behave the same way as html - - -Jirka Kosek: lists.xslAdded missing attribute set for procedure - - -Jirka Kosek: param.xweb; biblio.xsl; docbook.xsl; param.ent; biblio-iso690.xslAdded support for formatting biblioentries according to ISO690 citation style. -New bibliography style can be turned on by setting parameter bibliography.style to "iso690" -The code was provided by Jana Dvorakova - - -Robert Stayton: param.xweb; param.ent; pagesetup.xslAdd header.table.properties and footer.table.properties attribute-sets. - - -Robert Stayton: inline.xslAdd fop1.extensions for menuchoice arrow handling exception. - - - - -HTML -The following changes have been made to the - html code - since the 1.72.0 release. - - -Mauritz Jeanson: param.xweb; param.entMoved declaration and documentation of javahelp.encoding from javahelp.xsl to the -regular "parameter machinery". - - -Michael(tm) Smith: admon.xslChanged handling of titles for note, warning, caution, important, -tip admonitions: We now output and HTML h3 head only if -admon.textlabel is non-zero or if the admonition actually contains -a title; otherwise, we don't output an h3 head at all. -(Previously, we were outputting an empty h3 if the admon.textlabel -was zero and if the admonition had no title.) - - -Mauritz Jeanson: xref.xslAdded template for xref to area/areaset. -Part of fix for bug #1675513 (xref to area broken). - - -Mauritz Jeanson: titlepage.xsl; component.xsl; division.xsl; sections.xslAdded fixes to avoid duplicate ids when generate.id.attributes = 1. -This (hopefully) closes bug #1671052. - - -Michael(tm) Smith: formal.xsl; pi.xslMade the dbfunclist PI work as intended. Also added doc for -dbfunclist and dbcmdlist PIs. - - -Michael(tm) Smith: pi.xsl; synop.xslMade the dbcmdlist work the way it appears to have been intended -to work. Restored dbhtml-dir template back to pi.xsl. - - -Michael(tm) Smith: titlepage.xsl; param.xweb; param.entAdded new param abstract.notitle.enabled. -If non-zero, in output of the abstract element on titlepages, -display of the abstract title is suppressed. -Because sometimes you really don't want or need that title -there... - - -Michael(tm) Smith: chunk-code.xsl; graphics.xslWhen we are chunking long descriptions for mediaobject instances -into separate HTML output files, and use.id.as.filename is -non-zero, if a mediaobject has an ID, use that ID as the basename -for the long-description file (otherwise, we generate an ID for it -and use that ID as the basename for the file). -The parallels the recent change made to cause IDs for legalnotice -instances to be used as basenames for legalnotice chunks. -Also, made some minor refinements to the recent changes for -legalnotice chunk handling. - - -Michael(tm) Smith: titlepage.xslAdded support to the HTML stylesheets for proper processing of -orgname as a child of author. - - -Michael(tm) Smith: chunk-code.xslWhen $generate.legalnotice.link is non-zero and -$use.id.as.filename is also non-zero, if a legalnotice has an ID, -then instead of assigning the "ln-<generatedID>" basename to the -output file for that legalnotice, just use its real ID as the -basename for the file -- as we do when chunking other elements -that have IDs. - - -David Cramer: xref.xslHandle alt text on xrefs to steps when the step doesn't have a title. - - -David Cramer: lists.xslAdded <p> element around term in variablelist when formatted as table to avoid misalignment of term and listitem in xhtml (non-quirks mode) output - - -David Cramer: qandaset.xslAdded <p> element around question and answer labels to avoid misalignment of label and listitem in xhtml (non-quirks mode) output - - -David Cramer: lists.xslAdded <p> element around callouts to avoid misalignment of callout and listitem in xhtml (non-quirks mode) output - - -Mauritz Jeanson: inline.xslMake citations numbered if bibliography.numbered != 0. - - -Robert Stayton: param.xweb; param.entAdd support for new profiling attributes audience and wordsize. - - -Robert Stayton: inline.xsl; xref.xslAdd support for xlink olinks. - - -Jirka Kosek: glossary.xslRules for normalizing glossary entries before they are sorted can be now different for each language. - - -Robert Stayton: chunk-common.xsl; chunk-code.xsl; manifest.xsl; chunk.xslRefactored the chunking modules to move all named templates to -chunk-common.xsl and all match templates to chunk-code.xsl, in -order to enable better chunk customization. -See the comments in chunk.xsl for more details. - - -Robert Stayton: lists.xslAdd anchor for xml:id for listitem in varlistentry. - - -Robert Stayton: refentry.xslAdd support for info/title in refsections for db5. - - -Jirka Kosek: param.xweb; biblio.xsl; docbook.xsl; param.ent; biblio-iso690.xslAdded support for formatting biblioentries according to ISO690 citation style. -New bibliography style can be turned on by setting parameter bibliography.style to "iso690" -The code was provided by Jana Dvorakova - - -Robert Stayton: inline.xsl; xref.xslAdd call to class.attribute to <a> output elements so they can -have a class value too. - - -Mauritz Jeanson: glossary.xslFixed bug #1644881: -* Added curly braces around all $language attribute values. -* Moved declaration of language variable to top level of stylesheet. -Tested with Xalan, Saxon, and xsltproc. - - - - -Manpages -The following changes have been made to the - manpages code - since the 1.72.0 release. - - -Michael(tm) Smith: param.xweb; docbook.xsl; param.entAdded the man.authors.section.enabled and -man.copyright.section.enabled parameters. Set those to zero when -you want to suppress display of the auto-generated AUTHORS and -COPYRIGHT sections. Closes request #1467806. Thanks to Daniel -Leidert. - - -Michael(tm) Smith: docbook.xslTook the test that the manpages stylesheet does to see if there -are any Refentry chilren in current doc, and made it -namespace-agnostic. Reason for that is because the test otherwise -won't work when it is copied over into the generated -profile-docbook.xsl stylesheet. - - -Michael(tm) Smith: MakefileAdded a manpages/profile-docbook.xsl file to enable single-pass -profiling for manpages output. - - -Michael(tm) Smith: info.xslOutput copyright and legalnotice in man-page output in whatever -place they are in in document order. Closes #1690539. Thanks to -Daniel Leidert for reporting. - - -Michael(tm) Smith: docbook.xslRestored support for single-pass namespace stripping to manpages -stylesheet. - - -Michael(tm) Smith: synop.xsl; block.xsl; info.xsl; inline.xsl; lists.xsl; endnotes.xsl; ut⋯Changed handling of bold and italic/underline output in manpages -output. Should be transparent to users, but... - -This touches handling of all bold and italic/underline output. The -exact change is that the mode="bold" and mode="italic" utility -templates were changed to named templates. (I think maybe I've -changed it back and forth from mode to named before, so this is -maybe re-reverting it yet again). - -Anyway, the reason for the change is that the templates are -sometimes call on dynamically node-sets, and using modes to format -those doesn't allow passing info about the current/real context -node from the source (not the node-set created by the stylesheet) -to that formatting stage. - -The named templates allow the context to be passed in as a -parameter, so that the bold/ital formatting template can use -context-aware condition checking. - -This was basically necessary in order to suppress bold formatting -in titles, which otherwise gets screwed up because of the numbnut -way that roff handles nested bold/ital. - -Closes #1674534). Much thanks to Daniel Leidert, whose in his -docbook-xsl bug-finding kung-fu has achieved Grand Master status. - - -Michael(tm) Smith: block.xslFixed handling of example instances by adding the example element -to the same template we use for processing figure. Closes -#1674538. Thanks to Daniel Leidert. - - -Michael(tm) Smith: utility.xslDon't include lang in manpages filename/pathname if lang=en (that -is, only generate lang-qualified file-/pathnames for non-English). - - -Michael(tm) Smith: endnotes.xslIn manpages output, emit warnings for notesources (footnote, etc.) -that have something other than para as a child. - -The numbered-with-hanging-indent formatting that's used for -rendering endnotes in the NOTES section of man pages places some -limits/assumptions on how the DocBook source is marked up; namely, -for notesources (footnote, annotation, etc.) that can contain -block-level children, if the they have a block-level child such as -a table or itemizedlist or orderedlist that is the first child of -a footnote, we have no way of rendering/indenting its content -properly in the endnotes list. - -Thus, the manpages stylesheet not emits a warning message for that -case, and suggests the "fix" (which is to wrap the table or -itemizedlist or whatever in a para that has some preferatory text. - - -Michael(tm) Smith: utility.xslAdded support to mixed-block template for handling tables in -mixed-blocks (e.g., as child of para) correctly. - - -Michael(tm) Smith: table.xsl; synop.xsl; block.xsl; info.xsl; lists.xsl; refentry.xsl; end⋯Reverted necessary escaping of backslash, dot, and dash -out of the well-intentioned (but it now appears, -misguided) "marker" mechanism (introduced in the 1.72.0 -release) -- which made use of alternative "marker" -characters as internal representations of those -characters, and then replaced them just prior to -serialization -- and back into what's basically the -system that was used prior to the 1.69.0 release; that -is, into a part of stylesheet code that gets executed -at the beginning of processing -- before any other roff -markup up is. This change obviates the need for the -marker system. It also requires a lot less RAM during -processing (for large files, the marker mechanism -ending up requiring gigabytes of memory). - -Closes bug #1661177. Thanks to Scott Smedley for -providing a test case (the fvwm man page) that exposed -the problem with the marker mechanism. - -Also moved the mechanism for converting non-breaking -spaces back into the same area of the stylesheet code. - - -Michael(tm) Smith: lists.xslFixed problem with incorrect formatting of nested variablelist. -Closes bug #1650931. Thanks to Daniel "Eagle Eye" Leidert. - - -Michael(tm) Smith: lists.xslMake sure that all listitems in itemizedlist and orderedlist are -preceded by a blank line. This fixes a regression that occurred -when instances of the TP macro that were use in a previous -versions of the list-handling code were switched to RS/RE (because -TP doesn't support nesting). TP automatically generates a blank -line, but RS doesn't. So I added a .sp before each .RS - - -Michael(tm) Smith: block.xsl; inline.xsl; param.xweb; docbook.xsl; links.xsl; param.entMade a number of changes related to elements with -out-of-line content: - -- Added handling for mediaobject & inlinemediaobject. - Each imagedata, audiodata, or videodata element - within a mediaobject or inline mediaobject is now - treated as a "notesource" and so handled in much the - same way as links and annotation/alt/footnotes. - - That means a numbered marker is generated inline to - mark the place in the main flow where the imagedata, - audiodata, or videodata element occurs, and a - corresponding numbered endnote for it is generated in - the endnotes list at the end of the man page; the - endnote contains the URL from the fileref attribute - of the imagedata, audiodata, or videodata element. - - For mediobject and inlinemediaobject instances that - have a textobject child, the textobject is displayed - within the main text flow. - -- Renamed several man.link.* params to man.endnotes.*, - to reflect that fact that the endnotes list now - contains more than just links. Also did similar - renaming for a number of stylesheet-internal vars. - -- Added support for xlink:href (along with existing - support for the legacy ulink element). - -- Cleaned up and streamlined the endnotes-handling - code. It's still messy and klunky and the basic - mechanism it uses is very inefficent for documents - that contain a lot of notesources, but at least it's - a bit better than it was. - - - - -Eclipse -The following changes have been made to the - eclipse code - since the 1.72.0 release. - - -Mauritz Jeanson: MakefileFixed bug #1715093: Makefile for creating profiled version of eclipse.xsl added. - - -David Cramer: eclipse.xslAdded normalize-space around to avoid leading whitespace from appearing in the output if there's extra leading whitespace (e.g. <title> Foo</title>) in the source - - - - -JavaHelp -The following changes have been made to the - javahelp code - since the 1.72.0 release. - - -Mauritz Jeanson: javahelp.xslImplemented FR #1230233 (sorted index in javahelp). - - -Mauritz Jeanson: javahelp.xslAdded normalize-space() around titles and index entries to work around whitespace problems. -Added support for glossary and bibliography in toc and map files. - - - - -Roundtrip -The following changes have been made to the - roundtrip code - since the 1.72.0 release. - - -Steve Ball: blocks2dbk.xsl; wordml2normalise.xsl; normalise2sections.xsl; sections2blocks.⋯new stylesheets for better word processor support and easier maintenance - - -Steve Ball: template-pages.xml; dbk2wp.xsl; sections-spec.xmlfixed bugs - - - - -Params -The following changes have been made to the - params code - since the 1.72.0 release. - - -Mauritz Jeanson: htmlhelp.button.back.xml; htmlhelp.button.forward.xml; htmlhelp.button.zo⋯Modified refpurpose text. - - -Mauritz Jeanson: htmlhelp.map.file.xml; htmlhelp.force.map.and.alias.xml; htmlhelp.alias.f⋯Fixed typos, made some small changes. - - -Mauritz Jeanson: javahelp.encoding.xmlMoved declaration and documentation of javahelp.encoding from javahelp.xsl to the -regular "parameter machinery". - - -Mauritz Jeanson: generate.id.attributes.xmlAdded refpurpose text. - - -Mauritz Jeanson: annotation.js.xml; annotation.graphic.open.xml; annotation.graphic.close.⋯Added better refpurpose texts. - - -Michael(tm) Smith: chunker.output.cdata-section-elements.xml; chunker.output.standalone.xm⋯Fixed some broken formatting in source files for chunker.* params, -as pointed out by Dave Pawson. - - -Michael(tm) Smith: label.from.part.xmlChanged handling of reference auto-labeling such that reference -(when it appears at the component level) is now affected by the -label.from.part param, just as preface, chapter, and appendix. - - -Mauritz Jeanson: callout.graphics.extension.xmlClarified that 'extension' refers to file names. - - -Michael(tm) Smith: abstract.notitle.enabled.xmlAdded new param abstract.notitle.enabled. -If non-zero, in output of the abstract element on titlepages, -display of the abstract title is suppressed. -Because sometimes you really don't want or need that title -there... - - -Michael(tm) Smith: man.string.subst.map.xmlUpdated manpages string-substitute map to reflect fact that -because of another recent change to suppress bold markup in .SH -output, we no longer need to add a workaround for the accidental -uppercasing of roff escapes that occurred previously. - - -Jirka Kosek: margin.note.float.type.xml; title.font.family.xml; table.frame.border.color.x⋯Improved parameter metadata - - -Robert Stayton: profile.wordsize.xml; profile.audience.xmlAdd support for profiling on new attributes audience and wordsize. - - -Robert Stayton: callout.graphics.number.limit.xml; callout.graphics.extension.xmlAdded SVG graphics for fo output. - - -Robert Stayton: callout.icon.size.xmlSet size of callout graphics. - - -Jirka Kosek: default.units.xml; chunker.output.method.xml; toc.list.type.xml; output.inden⋯Updated parameter metadata to the new format. - - -Jirka Kosek: man.output.quietly.xml; title.font.family.xml; footnote.sep.leader.properties⋯Added type annotations into parameter definition files. - - -Robert Stayton: section.container.element.xmlSupport spans in sections for certain processors. - - -Robert Stayton: component.titlepage.properties.xmlEmpty attribute set for top level component titlepage block. -Allows setting a span on title info. - - -Jirka Kosek: bibliography.style.xmlAdded link to WiKi page with description of special markup needed for ISO690 biblioentries - - -Robert Stayton: make.year.ranges.xmlClarify that multiple year elements are required. - - -Robert Stayton: id.warnings.xmlTurn off id.warnings by default. - - -Jirka Kosek: bibliography.style.xmlAdded support for formatting biblioentries according to ISO690 citation style. -New bibliography style can be turned on by setting parameter bibliography.style to "iso690" -The code was provided by Jana Dvorakova - - -Robert Stayton: header.table.properties.xml; footer.table.properties.xmlSupport adding table properties to header and footer tables. - - - - -Highlighting -The following changes have been made to the - highlighting code - since the 1.72.0 release. - - -Jirka Kosek: c-hl.xml; xslthl-config.xmlAdded support for C language. Provided by Bruno Guegan. - - - - -Profiling -The following changes have been made to the - profiling code - since the 1.72.0 release. - - -Robert Stayton: profile-mode.xslAdd support for new profiling attributes audience and wordsize. - - - - -Lib -The following changes have been made to the - lib code - since the 1.72.0 release. - - -Michael(tm) Smith: lib.xwebChanged name of prepend-pad template to pad-string and twheeked so -it can do both right/left padding. - - - - -Tools -The following changes have been made to the - tools code - since the 1.72.0 release. - - -Michael(tm) Smith: bin; bin/docbook-xsl-updateDid some cleanup to the install.sh source and added a -docbook-xsl-update script to the docbook-xsl distro, the purpose -of which is to facilitate easy sync-up to the latest docbook-xsl -snapshot (by means of rsync). - - - - -XSL-Saxon -The following changes have been made to the - xsl-saxon code - since the 1.72.0 release. - - -Mauritz Jeanson: xalan27/src/com/nwalsh/xalan/Verbatim.java; xalan27/src/com/nwalsh/xalan/⋯Added modifications so that the new callout.icon.size parameter is taken into account. This -parameter is used for FO output (where SVG now is the default graphics format for callouts). - - -Mauritz Jeanson: saxon65/src/com/nwalsh/saxon/FormatCallout.java; xalan27/src/com/nwalsh/x⋯Added code for generating id attributes on callouts in HTML and FO output. -These patches enable cross-references to callouts placed by area coordinates. -It works for graphic, unicode and text callouts. -Part of fix for bug #1675513 (xref to area broken). - - -Michael(tm) Smith: saxon65/src/com/nwalsh/saxon/Website.java; xalan27/src/com/nwalsh/xalan⋯Copied over Website XSL Java extensions. - - - - -XSL-Xalan -The following changes have been made to the - xsl-xalan code - since the 1.72.0 release. - - -Michael(tm) Smith: Makefile; xalan2Turned off xalan2.jar build. This removes DocBook XSL -Java extensions support for versions of Xalan prior to -Xalan 2.7. If you are currently using the extensions -with an earlier version of Xalan, you need to upgrade -to Xalan 2.7. - - -Mauritz Jeanson: xalan27/src/com/nwalsh/xalan/Verbatim.java; xalan27/src/com/nwalsh/xalan/⋯Added modifications so that the new callout.icon.size parameter is taken into account. This -parameter is used for FO output (where SVG now is the default graphics format for callouts). - - -Mauritz Jeanson: saxon65/src/com/nwalsh/saxon/FormatCallout.java; xalan27/src/com/nwalsh/x⋯Added code for generating id attributes on callouts in HTML and FO output. -These patches enable cross-references to callouts placed by area coordinates. -It works for graphic, unicode and text callouts. -Part of fix for bug #1675513 (xref to area broken). - - -Michael(tm) Smith: saxon65/src/com/nwalsh/saxon/Website.java; xalan27/src/com/nwalsh/xalan⋯Copied over Website XSL Java extensions. - - - - - - -Release: 1.72.0 -This release includes important bug fixes and adds the following -significant feature changes: - - - Automatic sorting of glossary entries - - The HTML and FO stylesheets now support automatic sorting - of glossary entries. To enable glossary sorting, set - the value of the glossary.sort parameter - to 1 (by default, it’s value is - 0). When you enable glossary sorting, - glossentry elements within a glossary, - glossdiv, or glosslist are sorted on the - glossterm, using the current language setting. If you - don’t enable glossary sorting, then the order of - glossentry elements is left “as is†— that is, they - are not sorted but are instead just displayed in document - order. - - - - WordML renamed to Roundtrip, OpenOffice support added - - Stylesheets for “roundtrip†conversion between documents in - OpenOffice format (ODF) and DocBook XML have been added to the set - of stylesheets that formerly had the collective title - WordML, and that set of stylesheets has - been renamed to Roundtrip to better - reflect the actual scope and purpose of its contents. - So the DocBook XSL Stylesheets now support roundtrip - conversion (with certain limitations) of WordML, OpenOffice, and - Apple Pages documents to and from DocBook XML. - - - - Including QandASet questions in TOCs - - The HTML stylesheet now provides support for including - QandASet questions in the document TOC. To - enable display of questions in the document TOC, set - the value of the qanda.in.toc to - 1 (by default, it’s 0). When you - enable qanda.in.toc, then the generated - table of contents for a document will include - qandaset titles, qandadiv titles, and - question elements. The default value of zero - excludes them from the TOC. - - The qanda.in.toc parameter does - not affect any tables of contents that may be generated - within a qandaset or - qandadiv (only in the document TOC). - - - - - - Language identifier in man-page filenames and pathnames - - Added new parameter man.output.lang.in.name.enabled, which controls whether - a language identifier is included in man-page filenames and - pathnames. It works like this: - - If the value of man.output.lang.in.name.enabled is non-zero, - man-page files are output with a language identifier included in - their filenames or pathnames as follows: - - - if - man.output.subdirs.enabled is non-zero, - each file is output to, e.g., a - /$lang/man8/foo.8 pathname - - if - man.output.subdirs.enabled is zero, - each file is output with a foo.$lang.8 - filename - - - - - - index.page.number.properties property set - - For FO output, use the - index.page.number.properties to control - formatting of page numbers in index output — to (for - example) to display page numbers in index output in a - different color (to indicate that they are links). - - - - Crop marks in output from Antenna House XSL Formatter - - Support has been added for generating crop marks in - print/PDF output generated using Antenna House XSL Formatter - - - - More string-substitution hooks in manpages output - - The man.string.subst.map.local.pre - and man.string.subst.map.local.post - parameters have been added to enable easier control over - custom string substitutions. - - - - Moved verbatim properties to attribute-set - - The hardcoded properties used in verbatim elements (literallayout, - programlisting, screen) were moved to the verbatim.properties - attribute-set so they can be more easily customized. - - - - enhanced simple.xlink template - - Now the simple.xlink template in inline.xsl works with - cross reference elements xref and link as well. Also, more elements - call simple.xlink, which enables DB5 xlink functionality. - - - - - DocBook 5 compatibility - - Stylesheets now consistently support DocBook 5 attributes - (such as xml:id). Also, DocBook 5 info elements are now checked - along with other *info elements, and the use of name() function - was replaced by local-name() so it also matches on DocBook 5 elements. - These changes enable reusing the stylesheets with DocBook 5 - documents with minimal fixup. - - - - - HTML class attributes now handled in class.attribute mode - - The HTML class attributes were formerly hardcoded to the - element name. Now the class attribute is generated by applying - templates in class.attribute mode so class attribute names - can be customized. The default is still the element name. - - - - arabic-indic numbering enabled in autolabels - - Numbering of chapter, sections, and pages can now use - arabic-indic numbering when number format is set to 'arabicindic' or - to ١. - - - -The following is a detailed list of changes (not -including bug fixes) that have been made since the 1.71.1 -release. - - -Common -The following changes have been made to the - common code - since the 1.71.1 release. - - -Add support for arabicindic numbering to autolabel.format template.M: /trunk/xsl/common/labels.xsl - Robert Stayton - - -Finish support for @xml:id everywhere @id is used.M: /trunk/xsl/common/gentext.xsl; M: /trunk/xsl/common/titles.xsl - Robert Stayton - - -replace name() with local-name() in most cases.M: /trunk/xsl/common/l10n.xsl; M: /trunk/xsl/common/olink.xsl; M: /trunk/xsl/common/subtitles.xsl; M: /trunk/xsl/common/labels.xsl; M: /trunk/xsl/common/titles.xsl; M: /trunk/xsl/common/common.xsl - Robert Stayton - - -Add support for info.M: /trunk/xsl/common/subtitles.xsl; M: /trunk/xsl/common/labels.xsl; M: /trunk/xsl/common/titles.xsl; M: /trunk/xsl/common/common.xsl; M: /trunk/xsl/common/targets.xsl - Robert Stayton - - -Add utility template tabstyle to return the tabstyle from -any table element.M: /trunk/xsl/common/table.xsl - Robert Stayton - - - - - -FO -The following changes have been made to the - fo code - since the 1.71.1 release. - - -Add support for sorting glossary entriesM: /trunk/xsl/fo/param.xweb; M: /trunk/xsl/fo/param.ent; M: /trunk/xsl/fo/glossary.xsl - Robert Stayton - - -Add table.row.properties template to customize table rows.M: /trunk/xsl/fo/table.xsl - Robert Stayton - - -Moved all properties to attribute-sets so can be customized more easily.M: /trunk/xsl/fo/verbatim.xsl - Robert Stayton - - -Add index.page.number.properties attribute-set to format page numbers.M: /trunk/xsl/fo/autoidx.xsl - Robert Stayton - - -xref now supports xlink:href, using simple.xlink template.M: /trunk/xsl/fo/xref.xsl - Robert Stayton - - -Rewrote simple.xlink, and call it with all charseq templates.M: /trunk/xsl/fo/inline.xsl - Robert Stayton - - -Add simple.xlink processing to term and member elements.M: /trunk/xsl/fo/lists.xsl - Robert Stayton - - -Add support for crop marks in Antenna House.M: /trunk/xsl/fo/axf.xsl; M: /trunk/xsl/fo/pagesetup.xsl - Robert Stayton - - - - - -HTML -The following changes have been made to the - html code - since the 1.71.1 release. - - -Add support for sorting glossary entriesM: /trunk/xsl/html/glossary.xsl - Robert Stayton - - -Add support for qanda.in.toc to add qandaentry questions to document TOC.M: /trunk/xsl/html/autotoc.xsl; M: /trunk/xsl/html/param.xweb; M: /trunk/xsl/html/param.ent - Robert Stayton - - -add simple.xlink support to variablelist term and simplelist member.M: /trunk/xsl/html/lists.xsl - Robert Stayton - - -*.propagates.style now handled in class.attribute mode.M: /trunk/xsl/html/inline.xsl; M: /trunk/xsl/html/lists.xsl; M: /trunk/xsl/html/table.xsl; M: /trunk/xsl/html/block.xsl; M: /trunk/xsl/html/footnote.xsl - Robert Stayton - - -add class parameter to class.attribute mode to set default class.M: /trunk/xsl/html/html.xsl - Robert Stayton - - -Convert all class attributes to use the class.attribute mode -so class names can be customized more easily.M: /trunk/xsl/html/titlepage.xsl; M: /trunk/xsl/html/chunk-code.xsl; M: /trunk/xsl/html/division.xsl; M: /trunk/xsl/html/sections.xsl; M: /trunk/xsl/html/math.xsl; M: /trunk/xsl/html/block.xsl; M: /trunk/xsl/html/info.xsl; M: /trunk/xsl/html/footnote.xsl; M: /trunk/xsl/html/lists.xsl; M: /trunk/xsl/html/admon.xsl; M: /trunk/xsl/html/refentry.xsl; M: /trunk/xsl/html/qandaset.xsl; M: /trunk/xsl/html/graphics.xsl; M: /trunk/xsl/html/biblio.xsl; M: /trunk/xsl/html/task.xsl; M: /trunk/xsl/html/component.xsl; M: /trunk/xsl/html/glossary.xsl; M: /trunk/xsl/html/callout.xsl; M: /trunk/xsl/html/index.xsl; M: /trunk/xsl/html/synop.xsl; M: /trunk/xsl/html/verbatim.xsl; M: /trunk/xsl/html/ebnf.xsl - Robert Stayton - - -Add class.attribute mode to generate class attributes.M: /trunk/xsl/html/html.xsl - Robert Stayton - - -Added simple.xlink to most remaining inlines. -Changed class attributes to applying class.attributes mode.M: /trunk/xsl/html/inline.xsl - Robert Stayton - - -Changed xref template to use simple.xlink tempalte.M: /trunk/xsl/html/xref.xsl - Robert Stayton - - -Improve generate.html.title to work with link targets too.M: /trunk/xsl/html/html.xsl - Robert Stayton - - -Improved simple.xlink to support link and xref.M: /trunk/xsl/html/inline.xsl - Robert Stayton - - -Use new link.title.attribute now.M: /trunk/xsl/html/xref.xsl - Robert Stayton - - -Rewrote simple.xlink to handle linkend also. -Better computation of title attribute on link too.M: /trunk/xsl/html/inline.xsl - Robert Stayton - - -Handle Xalan quirk as special case.M: /trunk/xsl/html/db5strip.xsl - Robert Stayton - - -Add support for info.M: /trunk/xsl/html/admon.xsl; M: /trunk/xsl/html/autotoc.xsl; M: /trunk/xsl/html/lists.xsl; M: /trunk/xsl/html/refentry.xsl; M: /trunk/xsl/html/biblio.xsl; M: /trunk/xsl/html/qandaset.xsl; M: /trunk/xsl/html/component.xsl; M: /trunk/xsl/html/glossary.xsl; M: /trunk/xsl/html/division.xsl; M: /trunk/xsl/html/index.xsl; M: /trunk/xsl/html/sections.xsl; M: /trunk/xsl/html/table.xsl; M: /trunk/xsl/html/block.xsl - Robert Stayton - - -Fixed imagemaps so they work properly going from calspair coords -to HTML area coords.M: /trunk/xsl/html/graphics.xsl - Robert Stayton - - - - - -Manpages -The following changes have been made to the - manpages code - since the 1.71.1 release. - - -Added doc for man.output.lang.in.name.enabled parameter. This -checkin completes support for writing file/pathnames for man-pages -with $lang include in the names. Closes #1585967. knightly -accolades to Daniel Leidert for providing the feature request.M: /trunk/xsl/manpages/param.xweb; M: /trunk/xsl/manpages/param.ent - Michael(tm) Smith - - -Added new param man.output.lang.in.name.enabled, which -controls whether $LANG value is included in manpages -filenames and pathnames. It works like this: - -If the value of man.output.lang.in.name.enabled is non-zero, -man-page files are output with the $lang value included in -their filenames or pathnames as follows; - -- if man.output.subdirs.enabled is non-zero, each file is - output to, e.g., a /$lang/man8/foo.8 pathname - -- if man.output.subdirs.enabled is zero, each file is output - with a foo.$lang.8 filenameM: /trunk/xsl/manpages/docbook.xsl; M: /trunk/xsl/manpages/other.xsl; M: /trunk/xsl/manpages/utility.xsl - Michael(tm) Smith - - -Use "\e" instead of "\\" for backslash output, because the -groff docs say that's the correct thing to do; also because -testing (thanks, Paul Dubois) shows that "\\" doesn't always -work as expected; for example, "\\" within a table seems to -mess things up.M: /trunk/xsl/manpages/charmap.groff.xsl - Michael(tm) Smith - - -Added the man.string.subst.map.local.pre and -man.string.subst.map.local.post parameters. Those parameters -enable local additions and changes to string-substitution mappings -without the need to change the value of man.string.subst.map -parameter (which is for standard system mappings). Closes -#1456738. Thanks to Sam Steingold for constructing a true -stylesheet torture test (the clisp docs) that exposed the need for -these params.M: /trunk/xsl/manpages/param.xweb; M: /trunk/xsl/manpages/param.ent; M: /trunk/xsl/manpages/other.xsl - Michael(tm) Smith - - -Added the Markup element to the list of elements that get output -in bold. Thanks to Eric S. Raymond.M: /trunk/xsl/manpages/inline.xsl - Michael(tm) Smith - - -Replaced all dots in roff requests with U+2302 ("house" -character), and added escaping in output for all instances of dot -that are not in roff requests. This fixes the problem case where a -string beginning with a dot (for example, the string ".bashrc") -might occur at the beginning of a line in output, in which case -would mistakenly get interpreted as a roff request. Thanks to Eric -S. Raymond for pushing to fix this.M: /trunk/xsl/manpages/table.xsl; M: /trunk/xsl/manpages/synop.xsl; M: /trunk/xsl/manpages/block.xsl; M: /trunk/xsl/manpages/info.xsl; M: /trunk/xsl/manpages/lists.xsl; M: /trunk/xsl/manpages/refentry.xsl; M: /trunk/xsl/manpages/links.xsl; M: /trunk/xsl/manpages/other.xsl; M: /trunk/xsl/manpages/utility.xsl - Michael(tm) Smith - - -Made change to ensure that list content nested in -itemizedlist and orderedlist instances is properly indented. This -is a switch from using .TP to format those lists to using .RS/.RE -to format them instead (because .TP does not allow nesting). Closes bug #1602616. -Thanks to Daniel Leidert.M: /trunk/xsl/manpages/lists.xsl - Michael(tm) Smith - - - - - -Params -The following changes have been made to the - params code - since the 1.71.1 release. - - -Added doc for man.output.lang.in.name.enabled parameter. This -checkin completes support for writing file/pathnames for man-pages -with $lang include in the names. Closes #1585967. knightly -accolades to Daniel Leidert for providing the feature request.A: /trunk/xsl/params/man.output.lang.in.name.enabled.xml - Michael(tm) Smith - - -Added new param man.output.lang.in.name.enabled, which -controls whether $LANG value is included in manpages -filenames and pathnames. It works like this: - -If the value of man.output.lang.in.name.enabled is non-zero, -man-page files are output with the $lang value included in -their filenames or pathnames as follows; - -- if man.output.subdirs.enabled is non-zero, each file is - output to, e.g., a /$lang/man8/foo.8 pathname - -- if man.output.subdirs.enabled is zero, each file is output - with a foo.$lang.8 filenameM: /trunk/xsl/manpages/docbook.xsl; M: /trunk/xsl/manpages/other.xsl; M: /trunk/xsl/manpages/utility.xsl - Michael(tm) Smith - - -Added the man.string.subst.map.local.pre and -man.string.subst.map.local.post parameters. Those parameters -enable local additions and changes to string-substitution mappings -without the need to change the value of man.string.subst.map -parameter (which is for standard system mappings). Closes -#1456738. Thanks to Sam Steingold for constructing a true -stylesheet torture test (the clisp docs) that exposed the need for -these params.A: /trunk/xsl/params/man.string.subst.map.local.post.xml; A: /trunk/xsl/params/man.string.subst.map.local.pre.xml; M: /trunk/xsl/params/man.string.subst.map.xml - Michael(tm) Smith - - -Add index.page.number.properties by default.M: /trunk/xsl/params/xep.index.item.properties.xml - Robert Stayton - - -Added index.page.number.properties to allow customizations of page numbers in indexes.A: /trunk/xsl/params/index.page.number.properties.xml - Robert Stayton - - -Move show-destination="replace" property from template to attribute-set -so it can be customized.M: /trunk/xsl/params/olink.properties.xml - Robert Stayton - - -Add support for sorting glossary entriesA: /trunk/xsl/params/glossary.sort.xml - Robert Stayton - - -Add option to include qanda in tables of contents.A: /trunk/xsl/params/qanda.in.toc.xml - Robert Stayton - - -Moved all properties to attribute-sets so can be customized more easily.M: /trunk/xsl/params/verbatim.properties.xml - Robert Stayton - - - - - -Template -The following changes have been made to the - template code - since the 1.71.1 release. - - -Added workaround for Xalan bug: use for-each and copy instead of copy-of (#1604770).M: /trunk/xsl/template/titlepage.xsl - Mauritz Jeanson - - - - - -Roundtrip -The following changes have been made to the - roundtrip code - since the 1.71.1 release. - - -rename to roundtrip, add OpenOffice supportM: /trunk/xsl/roundtrip/docbook-pages.xsl; M: /trunk/xsl/roundtrip/specifications.xml; A: /trunk/xsl/roundtrip/dbk2ooo.xsl; M: /trunk/xsl/roundtrip/docbook.xsl; A: /trunk/xsl/roundtrip/dbk2pages.xsl; M: /trunk/xsl/roundtrip/template.xml; A: /trunk/xsl/roundtrip/dbk2wordml.xsl; A: /trunk/xsl/roundtrip/dbk2wp.xsl; M: /trunk/xsl/roundtrip/template.dot; M: /trunk/xsl/roundtrip/wordml-final.xsl - Steve Ball - - - - - - -Release: 1.71.1 -This is a minor update to the 1.71.0 release. Along with a -number of bug fixes, it includes two feature changes: - - - - Added support for profiling based on xml:lang and status attributes. - - - Added initial support in manpages output for - footnote, annotation, and alt - instances. Basically, they all now get handled the same way - ulink instances are. They are treated as a class as - "note sources": A numbered marker is generated at the place in the - main text flow where they occur, then their contents are displayed - in an endnotes section at the end of the man page. - - - - - -Common -The following changes have been made to the - common code - since the 1.71.1 release. - - -For backward compatability autoidx-ng.xsl is invoking "kosek" indexing method again.D: /trunk/xsl/common/autoidx-ng.xsl - Jirka Kosek - - -Add support for Xalan generating a root xml:base like saxon.M: /trunk/xsl/common/stripns.xsl - Robert Stayton - - - - - -FO -The following changes have been made to the - fo code - since the 1.71.1 release. - - -For backward compatability autoidx-ng.xsl is invoking "kosek" indexing method again.M: /trunk/xsl/fo/autoidx-ng.xsl; M: /trunk/xsl/fo/autoidx-kosek.xsl - Jirka Kosek - - -Add support for Xalan to add root node xml:base for db5 docs.M: /trunk/xsl/fo/docbook.xsl - Robert Stayton - - -Added support for profiling based on xml:lang and status attributes.M: /trunk/xsl/fo/param.xweb; M: /trunk/xsl/fo/param.ent - Jirka Kosek - - - - - -HTML -The following changes have been made to the - html code - since the 1.71.1 release. - - -For backward compatability autoidx-ng.xsl is invoking "kosek" indexing method again.M: /trunk/xsl/html/autoidx-ng.xsl; M: /trunk/xsl/html/autoidx-kosek.xsl - Jirka Kosek - - -Add support for Xalan to add root node xml:base for db5 docs.M: /trunk/xsl/html/chunk-code.xsl; M: /trunk/xsl/html/docbook.xsl - Robert Stayton - - -Added support for profiling based on xml:lang and status attributes.M: /trunk/xsl/html/param.xweb; M: /trunk/xsl/html/param.ent - Jirka Kosek - - -Made changes in namespace declarations to prevent xmllint's -canonicalizer from treating them as relative namespace URIs. - - - Changed xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService" - to xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService"; - Saxon accepts either form - (see http://www.saxonica.com/documentation/extensibility/functions.html); - to Saxon, "the part of the URI before the final '/' is immaterial". - - - Changed, e.g. xmlns:xverb="com.nwalsh.xalan.Verbatim" to - xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim"; Xalan accepts - either form - (see http://xml.apache.org/xalan-j/extensions.html#java-namespace-declare); - just as Saxon does, it will "simply use the string to the - right of the rightmost forward slash as the Java class name". - - - Changed xmlns:xalanredirect="org.apache.xalan.xslt.extensions.Redirect" - to xmlns:redirect="http://xml.apache.org/xalan/redirect", and - adjusted associated code to make the current Xalan redirect spec. - (see http://xml.apache.org/xalan-j/apidocs/org/apache/xalan/lib/Redirect.html)M: /trunk/xsl/html/oldchunker.xsl; M: /trunk/xsl/html/chunker.xsl; M: /trunk/xsl/html/graphics.xsl; M: /trunk/xsl/html/callout.xsl; M: /trunk/xsl/html/autoidx-kimber.xsl; M: /trunk/xsl/html/autoidx-kosek.xsl; M: /trunk/xsl/html/table.xsl; M: /trunk/xsl/html/verbatim.xsl - Michael(tm) Smith - - -Added the html.append and chunk.append parameters. By default, the -value of both is empty; but the internal DocBook XSL stylesheets -build sets their value to "<xsl:text>&#x0a;</xsl:text>", in order -to ensure that all files in the docbook-xsl-doc package end in a -newline character. (Because diff and some other tools may emit -error messages and/or not behave as expected when processing -files that are not newline-terminated.)M: /trunk/xsl/html/chunk-common.xsl; M: /trunk/xsl/html/titlepage.xsl; M: /trunk/xsl/html/param.xweb; M: /trunk/xsl/html/docbook.xsl; M: /trunk/xsl/html/graphics.xsl; M: /trunk/xsl/html/param.ent - Michael(tm) Smith - - - - - -Highlighting -The following changes have been made to the - highlighting code - since the 1.71.1 release. - - -Added license informationM: /trunk/xsl/highlighting/delphi-hl.xml; M: /trunk/xsl/highlighting/myxml-hl.xml; M: /trunk/xsl/highlighting/php-hl.xml; M: /trunk/xsl/highlighting/m2-hl.xml; M: /trunk/xsl/highlighting/ini-hl.xml; M: /trunk/xsl/highlighting/xslthl-config.xml; M: /trunk/xsl/highlighting/java-hl.xml - Jirka Kosek - - - - - -Manpages -The following changes have been made to the - manpages code - since the 1.71.1 release. - - -Added initial support in manpages output for footnote, annotation, -and alt instances. Basically, they all now get handled the same -way ulink instances are. They are treated as a class as "note -sources": A numbered marker is generated at the place in the main -text flow where they occur, then their contents are displayed in -an endnotes section at the end of the man page (currently titled -REFERENCES, for English output, but will be changed to NOTES). - -This support is not yet complete. It works for most "normal" -cases, but probably mishandles a good number of cases. More -testing will be needed to expose the problems. It may well also -introduce some bugs and regressions in other areas, including -basic paragraph handling, handling of "mixed block" content, -handling of other indented content, and handling of authorblurb -and personblurb in the AUTHORS section.M: /trunk/xsl/manpages/table.xsl; M: /trunk/xsl/manpages/block.xsl; M: /trunk/xsl/manpages/docbook.xsl; M: /trunk/xsl/manpages/links.xsl; M: /trunk/xsl/manpages/other.xsl; M: /trunk/xsl/manpages/utility.xsl - Michael(tm) Smith - - - - - -Params -The following changes have been made to the - params code - since the 1.71.1 release. - - -Added support for profiling based on xml:lang and status attributes.A: /trunk/xsl/params/profile.status.xml - Jirka Kosek - - -Added the html.append and chunk.append parameters. By default, the -value of both is empty; but the internal DocBook XSL stylesheets -build sets their value to "<xsl:text>&#x0a;</xsl:text>", in order -to ensure that all files in the docbook-xsl-doc package end in a -newline character. (Because diff and some other tools may emit -error messages and/or not behave as expected when processing -files that are not newline-terminated.)A: /trunk/xsl/params/html.append.xml; A: /trunk/xsl/params/chunk.append.xml - Michael(tm) Smith - - - - - -Profiling -The following changes have been made to the - profiling code - since the 1.71.1 release. - - -Added support for profiling based on xml:lang and status attributes.M: /trunk/xsl/profiling/profile.xsl; M: /trunk/xsl/profiling/profile-mode.xsl - Jirka Kosek - - - - - - - -Release: 1.71.0 -This is mainly a bug fix release, but it also includes two -significant feature changes: - - - Highlighting support added - - The stylesheets now include support for source-code - highlighting in output of programlisting instances (controlled - through the highlight.source - parameter). The Java-based implementation requires Saxon and - makes use of MichalMolhanec’s XSLTHL. More details are available at Jirka Kosek’s - website:
    The support is currently limited to highlighting - of XML, Java, PHP, Delphi, Modula-2 sources, and INI - files.
    -
    -
    - - Changes to autoindexing - - The templates that handle alternative indexing methods - were reworked to avoid errors produced by certain processors not - being able to tolerate the presence of unused functions. With - this release, none of the code for the 'kimber' or 'kosek' - methods is included in the default stylesheets. In order to use - one of those methods, your customization layer must import one - of the optional stylesheet modules: - - - - html/autoidx-kosek.xsl - - - html/autoidx-kimber.xsl - - - fo/autoidx-kosek.xsl - - - fo/autoidx-kimber.xsl - - - See the index.method parameter - reference page for more information. - - Two other changes to note: - - - The default indexing method now can handle accented - characters in latin-based alphabets, not just English. This - means accented latin letters will group and sort with their - unaccented counterpart. - - - The default value for the - index.method parameter was changed - from 'english' to 'basic' because now the default method can - handle latin-based alphabets, not just English. - - - - - -
    -The following is a list of changes that have -been made since the 1.70.1 release.
    - - -Common -The following changes have been made to the - common code - since the 1.70.1 release. - - - -Added reference.autolabel parameter for controlling labels on -reference output.M: /trunk/xsl/common/labels.xsl - Michael(tm) Smith - - -Support rows that are *completely* overlapped by the preceding rowM: /trunk/xsl/common/table.xsl - Norman Walsh - - -New modules for supporting indexing extensions.A: /trunk/xsl/common/autoidx-kimber.xsl; A: /trunk/xsl/common/autoidx-kosek.xsl - Robert Stayton - - -Support startinglinenumber on orderedlistM: /trunk/xsl/common/common.xsl - Norman Walsh - - - - - -Extensions -The following changes have been made to the - extensions code - since the 1.70.1 release. - - -Completely reworked extensions build system; now uses NetBeans and antD: /trunk/xsl/extensions/xalan27/.cvsignore; A: /trunk/xsl/extensions/saxon65/nbproject; A: /trunk/xsl/extensions/saxon65/nbproject/project.properties; D: /trunk/xsl/extensions/prj.el; A: /trunk/xsl/extensions/saxon65/src; A: /trunk/xsl/extensions/xalan2/src/com; M: /trunk/xsl/extensions/xalan2/src/com/nwalsh/xalan/Text.java; A: /trunk/xsl/extensions/saxon65/nbproject/project.xml; D: /trunk/xsl/extensions/build.xml; A: /trunk/xsl/extensions/saxon65/build.xml; A: /trunk/xsl/extensions/xalan2/nbproject/genfiles.properties; A: /trunk/xsl/extensions/saxon65; D: /trunk/xsl/extensions/xalan2/com; M: /trunk/xsl/extensions/xalan2/src/com/nwalsh/xalan/Func.java; A: /trunk/xsl/extensions/xalan2/test; A: /trunk/xsl/extensions/saxon65/src/com; A: /trunk/xsl/extensions/xalan2/nbproject/build-impl.xml; A: /trunk/xsl/extensions/xalan2/nbproject; A: /trunk/xsl/extensions/xalan2/src; A: /trunk/xsl/extensions/xalan2/nbproject/project.properties; D: /trunk/xsl/extensions/.cvsignore; M: /trunk/xsl/extensions/Makefile; D: /trunk/xsl/extensions/saxon8; A: /trunk/xsl/extensions/saxon65/nbproject/genfiles.properties; A: /trunk/xsl/extensions/xalan2/nbproject/project.xml; A: /trunk/xsl/extensions/saxon65/test; M: /trunk/xsl/extensions/xalan2/src/com/nwalsh/xalan/Verbatim.java; A: /trunk/xsl/extensions/xalan2/build.xml; M: /trunk/xsl/extensions/xalan2; D: /trunk/xsl/extensions/saxon643; A: /trunk/xsl/extensions/saxon65/nbproject/build-impl.xml - Norman Walsh - - - - - -FO -The following changes have been made to the - fo code - since the 1.70.1 release. - - - -xsl:sort lang attribute now uses two-char substring of lang attribute.M: /trunk/xsl/fo/autoidx-kimber.xsl - Robert Stayton - - - -Support titlecase "Java", "Perl", and "IDL" as values for the -language attribute on classsynopsis, etc. (instead of just -lowercase "java", "perl", and "idl"). Also support "c++" and "C++" -(instead of just "cpp"). - -Affects HTML, FO, and manpages output. Closes bug 1552332. Thanks -to "Brian A. Vanderburg II".M: /trunk/xsl/fo/synop.xsl - Michael(tm) Smith - - - -Added support for the reference.autolabel param in (X)HTML and FO -output.M: /trunk/xsl/fo/param.xweb; M: /trunk/xsl/fo/param.ent - Michael(tm) Smith - - - -Support rows that are *completely* overlapped by the preceding rowM: /trunk/xsl/fo/table.xsl - Norman Walsh - - - -Rearranged templates for the 3 indexing methods -and changed method named 'english' to 'basic'.M: /trunk/xsl/fo/autoidx.xsl - Robert Stayton - - -New modules for supporting indexing extensions.A: /trunk/xsl/fo/autoidx-kimber.xsl; A: /trunk/xsl/fo/autoidx-kosek.xsl - Robert Stayton - - - -Turn off blank-body for fop1.extensions too since fop 0.92 -does not support it either.M: /trunk/xsl/fo/pagesetup.xsl - Robert Stayton - - - -Add Xalan variant to test for exslt:node-set function. -Xalan can use function named node-set(), but doesn't -recognize it using function-available().M: /trunk/xsl/fo/autoidx.xsl - Robert Stayton - - - -Added support to FO stylesheets for handling instances of Org -where it occurs outside of *info content. In HTML stylesheets, -moved handling of Org out of info.xsl and into inline.xsl. In both -FO and HTML stylesheets, added support for correctly processing -Affiliation and Jobtitle.M: /trunk/xsl/fo/inline.xsl - Michael(tm) Smith - - -Don't output punctuation between Refname and Refpurpose if -Refpurpose is empty. Also corrected handling of Refsect2/title -instances, and removed some debugging stuff that was generated in -manpages output to mark the ends of sections.M: /trunk/xsl/fo/refentry.xsl - Michael(tm) Smith - - -Added new email.delimiters.enabled param. If non-zero (the -default), delimiters are generated around e-mail addresses (output -of the email element). If zero, the delimiters are suppressed.M: /trunk/xsl/fo/inline.xsl; M: /trunk/xsl/fo/param.xweb; M: /trunk/xsl/fo/param.ent - Michael(tm) Smith - - - -Initial support of syntax highlighting of programlistings.M: /trunk/xsl/fo/param.ent; M: /trunk/xsl/fo/param.xweb; A: /trunk/xsl/fo/highlight.xsl; M: /trunk/xsl/fo/verbatim.xsl - Jirka Kosek - - -Chapter after preface should restart numbering of pages.M: /trunk/xsl/fo/pagesetup.xsl - Jirka Kosek - - - - - -HTML -The following changes have been made to the - html code - since the 1.70.1 release. - - - -xsl:sort lang attribute now uses two-char substring of lang attribute.M: /trunk/xsl/html/autoidx-kimber.xsl - Robert Stayton - - -Support titlecase "Java", "Perl", and "IDL" as values for the -language attribute on classsynopsis, etc. (instead of just -lowercase "java", "perl", and "idl"). Also support "c++" and "C++" -(instead of just "cpp"). - -Affects HTML, FO, and manpages output. Closes bug 1552332. Thanks -to "Brian A. Vanderburg II".M: /trunk/xsl/html/synop.xsl - Michael(tm) Smith - - - -Added support for the reference.autolabel param in (X)HTML and FO -output.M: /trunk/xsl/html/param.xweb; M: /trunk/xsl/html/param.ent - Michael(tm) Smith - - -Support rows that are *completely* overlapped by the preceding rowM: /trunk/xsl/html/table.xsl - Norman Walsh - - - -Rearranged templates for the 3 indexing methods -and changed method named 'english' to 'basic'.M: /trunk/xsl/html/autoidx.xsl - Robert Stayton - - -New modules for supporting indexing extensions.A: /trunk/xsl/html/autoidx-kimber.xsl; A: /trunk/xsl/html/autoidx-kosek.xsl - Robert Stayton - - - -Added several new HTML parameters for controlling appearance of -content on HTML title pages: - -contrib.inline.enabled: - If non-zero (the default), output of the contrib element is - displayed as inline content rather than as block content. - -othercredit.like.author.enabled: - If non-zero, output of the othercredit element on titlepages is - displayed in the same style as author and editor output. If zero - (the default), othercredit output is displayed using a style - different than that of author and editor. - -blurb.on.titlepage.enabled: - If non-zero, output from authorblurb and personblurb elements is - displayed on title pages. If zero (the default), output from - those elements is suppressed on title pages (unless you are - using a titlepage customization that causes them to be included). - -editedby.enabled - If non-zero (the default), a localized Edited by heading is - displayed above editor names in output of the editor element.M: /trunk/xsl/html/titlepage.xsl; M: /trunk/xsl/html/param.xweb; M: /trunk/xsl/html/param.ent - Michael(tm) Smith - - - -Add Xalan variant to test for exslt:node-set function. -Xalan can use function named node-set(), but doesn't -recognize it using function-available().M: /trunk/xsl/html/autoidx.xsl - Robert Stayton - - - -Added support to FO stylesheets for handling instances of Org -where it occurs outside of *info content. In HTML stylesheets, -moved handling of Org out of info.xsl and into inline.xsl. In both -FO and HTML stylesheets, added support for correctly processing -Affiliation and Jobtitle.M: /trunk/xsl/html/inline.xsl; M: /trunk/xsl/html/info.xsl - Michael(tm) Smith - - -Don't output punctuation between Refname and Refpurpose if -Refpurpose is empty. Also corrected handling of Refsect2/title -instances, and removed some debugging stuff that was generated in -manpages output to mark the ends of sections.M: /trunk/xsl/html/refentry.xsl - Michael(tm) Smith - - -Added new email.delimiters.enabled param. If non-zero (the -default), delimiters are generated around e-mail addresses (output -of the email element). If zero, the delimiters are suppressed.M: /trunk/xsl/html/inline.xsl; M: /trunk/xsl/html/param.xweb; M: /trunk/xsl/html/param.ent - Michael(tm) Smith - - - -Added qanda.nested.in.toc param. Default value is zero. If -non-zero, instances of "nested" Qandaentry (ones that are children -of Answer elements) are displayed in the TOC. Closes patch 1509018 -(from Daniel Leidert). Currently on affects HTML output (no patch -for FO output provided).M: /trunk/xsl/html/param.xweb; M: /trunk/xsl/html/param.ent; M: /trunk/xsl/html/qandaset.xsl - Michael(tm) Smith - - - - -Improved handling of relative locations generated filesM: /trunk/xsl/html/html.xsl - Jirka Kosek - - - -Initial support of syntax highlighting of programlistings.M: /trunk/xsl/html/param.ent; M: /trunk/xsl/html/param.xweb; A: /trunk/xsl/html/highlight.xsl; M: /trunk/xsl/html/verbatim.xsl - Jirka Kosek - - -Support orgM: /trunk/xsl/html/info.xsl - Norman Walsh - - -Support personM: /trunk/xsl/html/inline.xsl - Norman Walsh - - -Support $keep.relative.image.uris also when chunkingM: /trunk/xsl/html/chunk-code.xsl - Jirka Kosek - - - - - -Highlighting -The following changes have been made to the - highlighting code - since the 1.70.1 release. - - - -Initial support of syntax highlighting of programlistings.A: /trunk/xsl/highlighting/php-hl.xml; A: /trunk/xsl/highlighting/common.xsl; A: /trunk/xsl/highlighting/delphi-hl.xml; A: /trunk/xsl/highlighting/myxml-hl.xml; A: /trunk/xsl/highlighting/m2-hl.xml; A: /trunk/xsl/highlighting/ini-hl.xml; A: /trunk/xsl/highlighting/xslthl-config.xml; A: /trunk/xsl/highlighting/java-hl.xml - Jirka Kosek - - - - - -Manpages -The following changes have been made to the - manpages code - since the 1.70.1 release. - - - -Suppress footnote markers and output warning that footnotes are -not yet supported.M: /trunk/xsl/manpages/docbook.xsl; M: /trunk/xsl/manpages/links.xsl; M: /trunk/xsl/manpages/other.xsl - Michael(tm) Smith - - - -Handle instances of address/otheraddr/ulink in author et al in the -same way as email instances; that is, display them on the same -linke as the author, editor, etc., name.M: /trunk/xsl/manpages/info.xsl - Michael(tm) Smith - - -Don't number or link-list any Ulink instance whose string value is -identical to the value of its url attribute. Just display it inline.M: /trunk/xsl/manpages/links.xsl - Michael(tm) Smith - - - -Don't output punctuation between Refname and Refpurpose if -Refpurpose is empty. Also corrected handling of Refsect2/title -instances, and removed some debugging stuff that was generated in -manpages output to mark the ends of sections.M: /trunk/xsl/manpages/refentry.xsl - Michael(tm) Smith - - -Added new email.delimiters.enabled param. If non-zero (the -default), delimiters are generated around e-mail addresses (output -of the email element). If zero, the delimiters are suppressed.M: /trunk/xsl/manpages/param.xweb; M: /trunk/xsl/manpages/param.ent - Michael(tm) Smith - - - -In manpages output, if the last/nearest *info element for -particular Refentry has multiple Copyright and/or Legalnotice -children, process them all (not just the first ones). Closes bug -1524576. Thanks to Sam Steingold for the report and to Daniel -Leidert for providing a patch.M: /trunk/xsl/manpages/info.xsl - Michael(tm) Smith - - - - - - -Params -The following changes have been made to the - params code - since the 1.70.1 release. - - -Added reference.autolabel parameter for controlling labels on -reference output.A: /trunk/xsl/params/reference.autolabel.xml - Michael(tm) Smith - - -Added namespace declarations to document elements for all param files.M: /trunk/xsl/params/toc.line.properties.xml; M: /trunk/xsl/params/title.font.family.xml; M: /trunk/xsl/params/component.label.includes.part.label.xml; M: /trunk/xsl/params/refentry.manual.profile.xml; M: /trunk/xsl/params/orderedlist.properties.xml; M: /trunk/xsl/params/olink.pubid.xml; M: /trunk/xsl/params/informalexample.properties.xml; M: /trunk/xsl/params/appendix.autolabel.xml; M: /trunk/xsl/params/htmlhelp.show.toolbar.text.xml; M: /trunk/xsl/params/index.on.role.xml; M: /trunk/xsl/params/htmlhelp.button.jump2.url.xml; M: /trunk/xsl/params/variablelist.term.separator.xml; M: /trunk/xsl/params/para.propagates.style.xml; M: /trunk/xsl/params/html.stylesheet.xml; M: /trunk/xsl/params/qanda.nested.in.toc.xml; M: /trunk/xsl/params/annotation.css.xml; M: /trunk/xsl/params/funcsynopsis.style.xml; M: /trunk/xsl/params/htmlhelp.encoding.xml; M: /trunk/xsl/params/footer.content.properties.xml; M: /trunk/xsl/params/verbatim.properties.xml; M: /trunk/xsl/params/autotoc.label.in.hyperlink.xml; M: /trunk/xsl/params/body.margin.top.xml; M: /trunk/xsl/params/bibliography.numbered.xml; M: /trunk/xsl/params/figure.properties.xml; M: /trunk/xsl/params/variablelist.max.termlength.xml; M: /trunk/xsl/params/table.cell.border.style.xml; M: /trunk/xsl/params/htmlhelp.button.options.xml; M: /trunk/xsl/params/preferred.mediaobject.role.xml; M: /trunk/xsl/params/htmlhelp.chm.xml; M: /trunk/xsl/params/man.charmap.subset.profile.xml; M: /trunk/xsl/params/qanda.title.level3.properties.xml; M: /trunk/xsl/params/page.width.xml; M: /trunk/xsl/params/firstterm.only.link.xml; M: /trunk/xsl/params/section.level6.properties.xml; M: /trunk/xsl/params/htmlhelp.button.locate.xml; M: /trunk/xsl/params/chunk.sections.xml; M: /trunk/xsl/params/use.local.olink.style.xml; M: /trunk/xsl/params/refentry.date.profile.enabled.xml; M: /trunk/xsl/params/refentry.version.suppress.xml; M: /trunk/xsl/params/refentry.generate.title.xml; M: /trunk/xsl/params/punct.honorific.xml; M: /trunk/xsl/params/column.gap.index.xml; M: /trunk/xsl/params/body.start.indent.xml; M: /trunk/xsl/params/crop.mark.width.xml; M: /trunk/xsl/params/refentry.version.profile.enabled.xml; M: /trunk/xsl/params/superscript.properties.xml; M: /trunk/xsl/params/chunker.output.doctype-public.xml; M: /trunk/xsl/params/saxon.character.representation.xml; M: /trunk/xsl/params/saxon.linenumbering.xml; M: /trunk/xsl/params/shade.verbatim.style.xml; M: /trunk/xsl/params/annotate.toc.xml; M: /trunk/xsl/params/profile.attribute.xml; M: /trunk/xsl/params/callout.graphics.number.limit.xml; M: /trunk/xsl/params/profile.arch.xml; M: /trunk/xsl/params/saxon.tablecolumns.xml; M: /trunk/xsl/params/glossterm.auto.link.xml; M: /trunk/xsl/params/default.units.xml; M: /trunk/xsl/params/qanda.title.level1.properties.xml; M: /trunk/xsl/params/list.block.spacing.xml; M: /trunk/xsl/params/section.level4.properties.xml; M: /trunk/xsl/params/spacing.paras.xml; M: /trunk/xsl/params/column.count.index.xml; M: /trunk/xsl/params/dingbat.font.family.xml; M: /trunk/xsl/params/citerefentry.link.xml; M: /trunk/xsl/params/keep.relative.image.uris.xml; M: /trunk/xsl/params/ulink.footnotes.xml; M: /trunk/xsl/params/prefer.internal.olink.xml; M: /trunk/xsl/params/refentry.title.properties.xml; M: /trunk/xsl/params/variablelist.term.break.after.xml; M: /trunk/xsl/params/use.id.function.xml; M: /trunk/xsl/params/callout.unicode.start.character.xml; M: /trunk/xsl/params/column.gap.titlepage.xml; M: /trunk/xsl/params/editedby.enabled.xml; M: /trunk/xsl/params/funcsynopsis.tabular.threshold.xml; M: /trunk/xsl/params/use.extensions.xml; M: /trunk/xsl/params/index.preferred.page.properties.xml; M: /trunk/xsl/params/man.th.extra3.max.length.xml; M: /trunk/xsl/params/column.gap.back.xml; M: /trunk/xsl/params/tex.math.delims.xml; M: /trunk/xsl/params/article.appendix.title.properties.xml; M: /trunk/xsl/params/ulink.target.xml; M: /trunk/xsl/params/suppress.header.navigation.xml; M: /trunk/xsl/params/olink.resolver.xml; M: /trunk/xsl/params/admon.textlabel.xml; M: /trunk/xsl/params/procedure.properties.xml; M: /trunk/xsl/params/blurb.on.titlepage.enabled.xml; M: /trunk/xsl/params/section.level2.properties.xml; M: /trunk/xsl/params/column.gap.front.xml; M: /trunk/xsl/params/margin.note.title.properties.xml; M: /trunk/xsl/params/glossary.collection.xml; M: /trunk/xsl/params/admon.graphics.xml; M: /trunk/xsl/params/current.docid.xml; M: /trunk/xsl/params/qanda.inherit.numeration.xml; M: /trunk/xsl/params/table.cell.padding.xml; M: /trunk/xsl/params/preface.autolabel.xml; M: /trunk/xsl/params/man.th.extra3.suppress.xml; M: /trunk/xsl/params/wordml.template.xml; M: /trunk/xsl/params/htmlhelp.use.hhk.xml; M: /trunk/xsl/params/textinsert.extension.xml; M: /trunk/xsl/params/ebnf.table.bgcolor.xml; M: /trunk/xsl/params/refentry.source.fallback.profile.xml; M: /trunk/xsl/params/body.font.master.xml; M: /trunk/xsl/params/l10n.gentext.default.language.xml; M: /trunk/xsl/params/list.block.properties.xml; M: /trunk/xsl/params/refentry.source.name.suppress.xml; M: /trunk/xsl/params/htmlhelp.hhp.window.xml; M: /trunk/xsl/params/sidebar.properties.xml; M: /trunk/xsl/params/tex.math.file.xml; M: /trunk/xsl/params/man.justify.xml; M: /trunk/xsl/params/subscript.properties.xml; M: /trunk/xsl/params/column.count.front.xml; M: /trunk/xsl/params/index.term.separator.xml; M: /trunk/xsl/params/biblioentry.properties.xml; M: /trunk/xsl/params/biblioentry.item.separator.xml; M: /trunk/xsl/params/htmlhelp.button.home.url.xml; M: /trunk/xsl/params/column.count.body.xml; M: /trunk/xsl/params/suppress.navigation.xml; M: /trunk/xsl/params/htmlhelp.remember.window.position.xml; M: /trunk/xsl/params/htmlhelp.hhc.section.depth.xml; M: /trunk/xsl/params/xref.with.number.and.title.xml; M: /trunk/xsl/params/make.year.ranges.xml; M: /trunk/xsl/params/region.before.extent.xml; M: /trunk/xsl/params/xref.label-page.separator.xml; M: /trunk/xsl/params/html.longdesc.link.xml; M: /trunk/xsl/params/man.subheading.divider.enabled.xml; M: /trunk/xsl/params/index.entry.properties.xml; M: /trunk/xsl/params/generate.legalnotice.link.xml; M: /trunk/xsl/params/section.autolabel.xml; M: /trunk/xsl/params/html.base.xml; M: /trunk/xsl/params/suppress.footer.navigation.xml; M: /trunk/xsl/params/nominal.image.depth.xml; M: /trunk/xsl/params/table.footnote.number.symbols.xml; M: /trunk/xsl/params/table.footnote.number.format.xml; M: /trunk/xsl/params/callout.graphics.xml; M: /trunk/xsl/params/man.break.after.slash.xml; M: /trunk/xsl/params/function.parens.xml; M: /trunk/xsl/params/part.autolabel.xml; M: /trunk/xsl/params/saxon.callouts.xml; M: /trunk/xsl/params/css.decoration.xml; M: /trunk/xsl/params/htmlhelp.button.home.xml; M: /trunk/xsl/params/email.delimiters.enabled.xml; M: /trunk/xsl/params/column.count.lot.xml; M: /trunk/xsl/params/draft.mode.xml; M: /trunk/xsl/params/use.role.for.mediaobject.xml; M: /trunk/xsl/params/refentry.separator.xml; M: /trunk/xsl/params/man.font.funcsynopsisinfo.xml; M: /trunk/xsl/params/man.output.manifest.filename.xml; M: /trunk/xsl/params/process.empty.source.toc.xml; M: /trunk/xsl/params/man.output.in.separate.dir.xml; M: /trunk/xsl/params/graphicsize.use.img.src.path.xml; M: /trunk/xsl/params/man.output.encoding.xml; M: /trunk/xsl/params/column.gap.lot.xml; M: /trunk/xsl/params/profile.role.xml; M: /trunk/xsl/params/column.count.titlepage.xml; M: /trunk/xsl/params/show.comments.xml; M: /trunk/xsl/params/informalfigure.properties.xml; M: /trunk/xsl/params/entry.propagates.style.xml; M: /trunk/xsl/params/bibliography.collection.xml; M: /trunk/xsl/params/contrib.inline.enabled.xml; M: /trunk/xsl/params/section.title.level5.properties.xml; M: /trunk/xsl/params/fop.extensions.xml; M: /trunk/xsl/params/htmlhelp.button.jump1.xml; M: /trunk/xsl/params/man.hyphenate.urls.xml; M: /trunk/xsl/params/profile.condition.xml; M: /trunk/xsl/params/header.column.widths.xml; M: /trunk/xsl/params/annotation.js.xml; M: /trunk/xsl/params/chunker.output.standalone.xml; M: /trunk/xsl/params/targets.filename.xml; M: /trunk/xsl/params/default.float.class.xml; M: /trunk/xsl/params/chapter.autolabel.xml; M: /trunk/xsl/params/sidebar.float.type.xml; M: /trunk/xsl/params/profile.separator.xml; M: /trunk/xsl/params/generate.index.xml; M: /trunk/xsl/params/nongraphical.admonition.properties.xml; M: /trunk/xsl/params/navig.graphics.xml; M: /trunk/xsl/params/htmlhelp.button.next.xml; M: /trunk/xsl/params/insert.olink.pdf.frag.xml; M: /trunk/xsl/params/htmlhelp.button.stop.xml; M: /trunk/xsl/params/footnote.font.size.xml; M: /trunk/xsl/params/profile.value.xml; M: /trunk/xsl/params/ebnf.table.border.xml; M: /trunk/xsl/params/htmlhelp.hhc.folders.instead.books.xml; M: /trunk/xsl/params/glossary.as.blocks.xml; M: /trunk/xsl/params/body.end.indent.xml; M: /trunk/xsl/params/use.role.as.xrefstyle.xml; M: /trunk/xsl/params/man.indent.blurbs.xml; M: /trunk/xsl/params/chunker.output.encoding.xml; M: /trunk/xsl/params/chunker.output.omit-xml-declaration.xml; M: /trunk/xsl/params/sans.font.family.xml; M: /trunk/xsl/params/html.cleanup.xml; M: /trunk/xsl/params/htmlhelp.hhp.xml; M: /trunk/xsl/params/htmlhelp.only.xml; M: /trunk/xsl/params/eclipse.plugin.name.xml; M: /trunk/xsl/params/section.title.level3.properties.xml; M: /trunk/xsl/params/man.th.extra1.suppress.xml; M: /trunk/xsl/params/chunk.section.depth.xml; M: /trunk/xsl/params/htmlhelp.hhp.tail.xml; M: /trunk/xsl/params/sidebar.title.properties.xml; M: /trunk/xsl/params/hyphenate.xml; M: /trunk/xsl/params/paper.type.xml; M: /trunk/xsl/params/chunk.tocs.and.lots.has.title.xml; M: /trunk/xsl/params/symbol.font.family.xml; M: /trunk/xsl/params/page.margin.bottom.xml; M: /trunk/xsl/params/callout.unicode.number.limit.xml; M: /trunk/xsl/params/itemizedlist.properties.xml; M: /trunk/xsl/params/root.filename.xml; M: /trunk/xsl/params/tablecolumns.extension.xml; M: /trunk/xsl/params/htmlhelp.show.favorities.xml; M: /trunk/xsl/params/informaltable.properties.xml; M: /trunk/xsl/params/revhistory.table.cell.properties.xml; M: /trunk/xsl/params/htmlhelp.default.topic.xml; M: /trunk/xsl/params/compact.list.item.spacing.xml; M: /trunk/xsl/params/page.height.portrait.xml; M: /trunk/xsl/params/html.head.legalnotice.link.types.xml; M: /trunk/xsl/params/passivetex.extensions.xml; M: /trunk/xsl/params/orderedlist.label.properties.xml; M: /trunk/xsl/params/othercredit.like.author.enabled.xml; M: /trunk/xsl/params/header.content.properties.xml; M: /trunk/xsl/params/refentry.meta.get.quietly.xml; M: /trunk/xsl/params/section.properties.xml; M: /trunk/xsl/params/htmlhelp.button.hideshow.xml; M: /trunk/xsl/params/simplesect.in.toc.xml; M: /trunk/xsl/params/chunk.quietly.xml; M: /trunk/xsl/params/htmlhelp.enumerate.images.xml; M: /trunk/xsl/params/section.title.level1.properties.xml; M: /trunk/xsl/params/qanda.defaultlabel.xml; M: /trunk/xsl/params/htmlhelp.enhanced.decompilation.xml; M: /trunk/xsl/params/man.th.title.max.length.xml; M: /trunk/xsl/params/footnote.number.format.xml; M: /trunk/xsl/params/body.margin.bottom.xml; M: /trunk/xsl/params/htmlhelp.window.geometry.xml; M: /trunk/xsl/params/htmlhelp.button.jump2.xml; M: /trunk/xsl/params/use.svg.xml; M: /trunk/xsl/params/qanda.title.level6.properties.xml; M: /trunk/xsl/params/collect.xref.targets.xml; M: /trunk/xsl/params/html.extra.head.links.xml; M: /trunk/xsl/params/variablelist.as.table.xml; M: /trunk/xsl/params/man.indent.width.xml; M: /trunk/xsl/params/eclipse.plugin.id.xml; M: /trunk/xsl/params/linenumbering.width.xml; M: /trunk/xsl/params/axf.extensions.xml; M: /trunk/xsl/params/menuchoice.separator.xml; M: /trunk/xsl/params/glossterm.separation.xml; M: /trunk/xsl/params/htmlhelp.autolabel.xml; M: /trunk/xsl/params/chunk.separate.lots.xml; M: /trunk/xsl/params/man.hyphenate.computer.inlines.xml; M: /trunk/xsl/params/linenumbering.separator.xml; M: /trunk/xsl/params/htmlhelp.title.xml; M: /trunk/xsl/params/index.number.separator.xml; M: /trunk/xsl/params/htmlhelp.button.prev.xml; M: /trunk/xsl/params/refentry.manual.fallback.profile.xml; M: /trunk/xsl/params/table.frame.border.color.xml; M: /trunk/xsl/params/footnote.sep.leader.properties.xml; M: /trunk/xsl/params/hyphenate.verbatim.characters.xml; M: /trunk/xsl/params/table.cell.border.thickness.xml; M: /trunk/xsl/params/template.xml; M: /trunk/xsl/params/margin.note.properties.xml; M: /trunk/xsl/params/man.segtitle.suppress.xml; M: /trunk/xsl/params/generate.toc.xml; M: /trunk/xsl/params/formal.object.properties.xml; M: /trunk/xsl/params/footnote.mark.properties.xml; M: /trunk/xsl/params/header.table.height.xml; M: /trunk/xsl/params/htmlhelp.button.back.xml; M: /trunk/xsl/params/qanda.title.level4.properties.xml; M: /trunk/xsl/params/man.links.are.numbered.xml; M: /trunk/xsl/params/manual.toc.xml; M: /trunk/xsl/params/olink.lang.fallback.sequence.xml; M: /trunk/xsl/params/refentry.manual.profile.enabled.xml; M: /trunk/xsl/params/ulink.hyphenate.chars.xml; M: /trunk/xsl/params/manifest.xml; M: /trunk/xsl/params/olink.fragid.xml; M: /trunk/xsl/params/refentry.date.profile.xml; M: /trunk/xsl/params/linenumbering.extension.xml; M: /trunk/xsl/params/component.title.properties.xml; M: /trunk/xsl/params/alignment.xml; M: /trunk/xsl/params/refentry.version.profile.xml; M: /trunk/xsl/params/ebnf.assignment.xml; M: /trunk/xsl/params/htmlhelp.button.print.xml; M: /trunk/xsl/params/annotation.support.xml; M: /trunk/xsl/params/sidebar.float.width.xml; M: /trunk/xsl/params/normal.para.spacing.xml; M: /trunk/xsl/params/xref.title-page.separator.xml; M: /trunk/xsl/params/callout.unicode.font.xml; M: /trunk/xsl/params/default.table.frame.xml; M: /trunk/xsl/params/pages.template.xml; M: /trunk/xsl/params/htmlhelp.button.zoom.xml; M: /trunk/xsl/params/admonition.title.properties.xml; M: /trunk/xsl/params/callout.graphics.extension.xml; M: /trunk/xsl/params/make.valid.html.xml; M: /trunk/xsl/params/qanda.title.level2.properties.xml; M: /trunk/xsl/params/page.margin.top.xml; M: /trunk/xsl/params/xep.index.item.properties.xml; M: /trunk/xsl/params/section.level5.properties.xml; M: /trunk/xsl/params/line-height.xml; M: /trunk/xsl/params/table.cell.border.color.xml; M: /trunk/xsl/params/qandadiv.autolabel.xml; M: /trunk/xsl/params/xref.label-title.separator.xml; M: /trunk/xsl/params/chunk.tocs.and.lots.xml; M: /trunk/xsl/params/man.font.funcprototype.xml; M: /trunk/xsl/params/process.source.toc.xml; M: /trunk/xsl/params/page.orientation.xml; M: /trunk/xsl/params/refentry.generate.name.xml; M: /trunk/xsl/params/navig.showtitles.xml; M: /trunk/xsl/params/table.table.properties.xml; M: /trunk/xsl/params/arbortext.extensions.xml; M: /trunk/xsl/params/informalequation.properties.xml; M: /trunk/xsl/params/headers.on.blank.pages.xml; M: /trunk/xsl/params/table.footnote.properties.xml; M: /trunk/xsl/params/root.properties.xml; M: /trunk/xsl/params/htmlhelp.display.progress.xml; M: /trunk/xsl/params/htmlhelp.hhp.windows.xml; M: /trunk/xsl/params/graphical.admonition.properties.xml; M: /trunk/xsl/params/refclass.suppress.xml; M: /trunk/xsl/params/profile.conformance.xml; M: /trunk/xsl/params/htmlhelp.button.forward.xml; M: /trunk/xsl/params/segmentedlist.as.table.xml; M: /trunk/xsl/params/margin.note.float.type.xml; M: /trunk/xsl/params/man.table.footnotes.divider.xml; M: /trunk/xsl/params/man.output.quietly.xml; M: /trunk/xsl/params/htmlhelp.hhc.show.root.xml; M: /trunk/xsl/params/footers.on.blank.pages.xml; M: /trunk/xsl/params/crop.mark.offset.xml; M: /trunk/xsl/params/olink.doctitle.xml; M: /trunk/xsl/params/section.level3.properties.xml; M: /trunk/xsl/params/callout.unicode.xml; M: /trunk/xsl/params/formal.procedures.xml; M: /trunk/xsl/params/toc.section.depth.xml; M: /trunk/xsl/params/index.prefer.titleabbrev.xml; M: /trunk/xsl/params/nominal.image.width.xml; M: /trunk/xsl/params/htmlhelp.show.menu.xml; M: /trunk/xsl/params/linenumbering.everyNth.xml; M: /trunk/xsl/params/double.sided.xml; M: /trunk/xsl/params/generate.revhistory.link.xml; M: /trunk/xsl/params/olink.properties.xml; M: /trunk/xsl/params/tex.math.in.alt.xml; M: /trunk/xsl/params/man.output.subdirs.enabled.xml; M: /trunk/xsl/params/section.title.properties.xml; M: /trunk/xsl/params/column.count.back.xml; M: /trunk/xsl/params/toc.indent.width.xml; M: /trunk/xsl/params/man.charmap.uri.xml; M: /trunk/xsl/params/index.method.xml; M: /trunk/xsl/params/generate.section.toc.level.xml; M: /trunk/xsl/params/page.width.portrait.xml; M: /trunk/xsl/params/man.th.extra2.max.length.xml; M: /trunk/xsl/params/abstract.properties.xml; M: /trunk/xsl/params/revhistory.table.properties.xml; M: /trunk/xsl/params/nominal.table.width.xml; M: /trunk/xsl/params/ulink.show.xml; M: /trunk/xsl/params/htmlhelp.button.jump1.title.xml; M: /trunk/xsl/params/index.div.title.properties.xml; M: /trunk/xsl/params/profile.userlevel.xml; M: /trunk/xsl/params/html.cellpadding.xml; M: /trunk/xsl/params/orderedlist.label.width.xml; M: /trunk/xsl/params/crop.marks.xml; M: /trunk/xsl/params/menuchoice.menu.separator.xml; M: /trunk/xsl/params/author.othername.in.middle.xml; M: /trunk/xsl/params/section.level1.properties.xml; M: /trunk/xsl/params/textdata.default.encoding.xml; M: /trunk/xsl/params/label.from.part.xml; M: /trunk/xsl/params/use.embed.for.svg.xml; M: /trunk/xsl/params/list.item.spacing.xml; M: /trunk/xsl/params/htmlhelp.hhc.width.xml; M: /trunk/xsl/params/column.gap.body.xml; M: /trunk/xsl/params/rootid.xml; M: /trunk/xsl/params/glosslist.as.blocks.xml; M: /trunk/xsl/params/index.range.separator.xml; M: /trunk/xsl/params/html.ext.xml; M: /trunk/xsl/params/callout.list.table.xml; M: /trunk/xsl/params/highlight.source.xml; M: /trunk/xsl/params/show.revisionflag.xml; M: /trunk/xsl/params/man.output.manifest.enabled.xml; M: /trunk/xsl/params/make.single.year.ranges.xml; M: /trunk/xsl/params/pgwide.properties.xml; M: /trunk/xsl/params/generate.id.attributes.xml; M: /trunk/xsl/params/emphasis.propagates.style.xml; M: /trunk/xsl/params/abstract.title.properties.xml; M: /trunk/xsl/params/htmlhelp.hhc.xml; M: /trunk/xsl/params/monospace.properties.xml; M: /trunk/xsl/params/htmlhelp.hhk.xml; M: /trunk/xsl/params/table.borders.with.css.xml; M: /trunk/xsl/params/man.links.are.underlined.xml; M: /trunk/xsl/params/profile.vendor.xml; M: /trunk/xsl/params/shade.verbatim.xml; M: /trunk/xsl/params/callout.graphics.path.xml; M: /trunk/xsl/params/olink.debug.xml; M: /trunk/xsl/params/make.graphic.viewport.xml; M: /trunk/xsl/params/footnote.number.symbols.xml; M: /trunk/xsl/params/man.charmap.enabled.xml; M: /trunk/xsl/params/page.height.xml; M: /trunk/xsl/params/htmlhelp.button.jump1.url.xml; M: /trunk/xsl/params/man.font.table.title.xml; M: /trunk/xsl/params/revhistory.title.properties.xml; M: /trunk/xsl/params/chunker.output.media-type.xml; M: /trunk/xsl/params/glossterm.width.xml; M: /trunk/xsl/params/points.per.em.xml; M: /trunk/xsl/params/page.margin.inner.xml; M: /trunk/xsl/params/itemizedlist.label.width.xml; M: /trunk/xsl/params/ulink.hyphenate.xml; M: /trunk/xsl/params/crop.mark.bleed.xml; M: /trunk/xsl/params/use.id.as.filename.xml; M: /trunk/xsl/params/section.title.level6.properties.xml; M: /trunk/xsl/params/highlight.default.language.xml; M: /trunk/xsl/params/man.th.extra2.suppress.xml; M: /trunk/xsl/params/id.warnings.xml; M: /trunk/xsl/params/title.margin.left.xml; M: /trunk/xsl/params/chunker.output.doctype-system.xml; M: /trunk/xsl/params/man.indent.verbatims.xml; M: /trunk/xsl/params/table.frame.border.thickness.xml; M: /trunk/xsl/params/monospace.verbatim.properties.xml; M: /trunk/xsl/params/formal.title.properties.xml; M: /trunk/xsl/params/margin.note.width.xml; M: /trunk/xsl/params/man.hyphenate.filenames.xml; M: /trunk/xsl/params/blockquote.properties.xml; M: /trunk/xsl/params/callout.defaultcolumn.xml; M: /trunk/xsl/params/profile.security.xml; M: /trunk/xsl/params/informal.object.properties.xml; M: /trunk/xsl/params/formal.title.placement.xml; M: /trunk/xsl/params/draft.watermark.image.xml; M: /trunk/xsl/params/equation.properties.xml; M: /trunk/xsl/params/body.font.family.xml; M: /trunk/xsl/params/ignore.image.scaling.xml; M: /trunk/xsl/params/chunk.first.sections.xml; M: /trunk/xsl/params/base.dir.xml; M: /trunk/xsl/params/footnote.properties.xml; M: /trunk/xsl/params/olink.outline.ext.xml; M: /trunk/xsl/params/img.src.path.xml; M: /trunk/xsl/params/qanda.title.properties.xml; M: /trunk/xsl/params/ebnf.statement.terminator.xml; M: /trunk/xsl/params/callouts.extension.xml; M: /trunk/xsl/params/manifest.in.base.dir.xml; M: /trunk/xsl/params/fop1.extensions.xml; M: /trunk/xsl/params/olink.sysid.xml; M: /trunk/xsl/params/section.title.level4.properties.xml; M: /trunk/xsl/params/monospace.font.family.xml; M: /trunk/xsl/params/l10n.gentext.language.xml; M: /trunk/xsl/params/graphic.default.extension.xml; M: /trunk/xsl/params/default.image.width.xml; M: /trunk/xsl/params/htmlhelp.button.refresh.xml; M: /trunk/xsl/params/chunker.output.cdata-section-elements.xml; M: /trunk/xsl/params/admon.graphics.path.xml; M: /trunk/xsl/params/admon.style.xml; M: /trunk/xsl/params/profile.revision.xml; M: /trunk/xsl/params/generate.manifest.xml; M: /trunk/xsl/params/html.longdesc.xml; M: /trunk/xsl/params/footer.rule.xml; M: /trunk/xsl/params/eclipse.plugin.provider.xml; M: /trunk/xsl/params/refentry.source.name.profile.xml; M: /trunk/xsl/params/toc.max.depth.xml; M: /trunk/xsl/params/chunker.output.indent.xml; M: /trunk/xsl/params/html.head.legalnotice.link.multiple.xml; M: /trunk/xsl/params/toc.list.type.xml; M: /trunk/xsl/params/link.mailto.url.xml; M: /trunk/xsl/params/table.properties.xml; M: /trunk/xsl/params/side.float.properties.xml; M: /trunk/xsl/params/man.charmap.use.subset.xml; M: /trunk/xsl/params/annotation.graphic.open.xml; M: /trunk/xsl/params/html.cellspacing.xml; M: /trunk/xsl/params/default.table.width.xml; M: /trunk/xsl/params/xep.extensions.xml; M: /trunk/xsl/params/admonition.properties.xml; M: /trunk/xsl/params/toc.margin.properties.xml; M: /trunk/xsl/params/chunk.toc.xml; M: /trunk/xsl/params/table.entry.padding.xml; M: /trunk/xsl/params/header.rule.xml; M: /trunk/xsl/params/glossentry.show.acronym.xml; M: /trunk/xsl/params/variablelist.as.blocks.xml; M: /trunk/xsl/params/man.hyphenate.xml; M: /trunk/xsl/params/refentry.source.name.profile.enabled.xml; M: /trunk/xsl/params/section.label.includes.component.label.xml; M: /trunk/xsl/params/bridgehead.in.toc.xml; M: /trunk/xsl/params/section.title.level2.properties.xml; M: /trunk/xsl/params/admon.graphics.extension.xml; M: /trunk/xsl/params/inherit.keywords.xml; M: /trunk/xsl/params/insert.xref.page.number.xml; M: /trunk/xsl/params/pixels.per.inch.xml; M: /trunk/xsl/params/refentry.pagebreak.xml; M: /trunk/xsl/params/profile.lang.xml; M: /trunk/xsl/params/insert.olink.page.number.xml; M: /trunk/xsl/params/generate.meta.abstract.xml; M: /trunk/xsl/params/graphicsize.extension.xml; M: /trunk/xsl/params/man.indent.lists.xml; M: /trunk/xsl/params/funcsynopsis.decoration.xml; M: /trunk/xsl/params/runinhead.title.end.punct.xml; M: /trunk/xsl/params/man.string.subst.map.xml; M: /trunk/xsl/params/man.links.list.enabled.xml; M: /trunk/xsl/params/section.autolabel.max.depth.xml; M: /trunk/xsl/params/htmlhelp.show.advanced.search.xml; M: /trunk/xsl/params/htmlhelp.map.file.xml; M: /trunk/xsl/params/l10n.gentext.use.xref.language.xml; M: /trunk/xsl/params/body.font.size.xml; M: /trunk/xsl/params/html.stylesheet.type.xml; M: /trunk/xsl/params/refentry.xref.manvolnum.xml; M: /trunk/xsl/params/runinhead.default.title.end.punct.xml; M: /trunk/xsl/params/navig.graphics.extension.xml; M: /trunk/xsl/params/itemizedlist.label.properties.xml; M: /trunk/xsl/params/htmlhelp.force.map.and.alias.xml; M: /trunk/xsl/params/profile.os.xml; M: /trunk/xsl/params/htmlhelp.alias.file.xml; M: /trunk/xsl/params/page.margin.outer.xml; M: /trunk/xsl/params/annotation.graphic.close.xml; M: /trunk/xsl/params/eclipse.autolabel.xml; M: /trunk/xsl/params/table.frame.border.style.xml; M: /trunk/xsl/params/navig.graphics.path.xml; M: /trunk/xsl/params/htmlhelp.hhc.binary.xml; M: /trunk/xsl/params/index.on.type.xml; M: /trunk/xsl/params/target.database.document.xml; M: /trunk/xsl/params/man.subheading.divider.xml; M: /trunk/xsl/params/chunker.output.method.xml; M: /trunk/xsl/params/make.index.markup.xml; M: /trunk/xsl/params/olink.base.uri.xml; M: /trunk/xsl/params/phrase.propagates.style.xml; M: /trunk/xsl/params/man.indent.refsect.xml; M: /trunk/xsl/params/example.properties.xml; M: /trunk/xsl/params/man.font.table.headings.xml; M: /trunk/xsl/params/profile.revisionflag.xml; M: /trunk/xsl/params/region.after.extent.xml; M: /trunk/xsl/params/qanda.title.level5.properties.xml; M: /trunk/xsl/params/marker.section.level.xml; M: /trunk/xsl/params/footer.table.height.xml; M: /trunk/xsl/params/autotoc.label.separator.xml; M: /trunk/xsl/params/footer.column.widths.xml; M: /trunk/xsl/params/hyphenate.verbatim.xml; M: /trunk/xsl/params/xref.properties.xml; M: /trunk/xsl/params/man.output.base.dir.xml; M: /trunk/xsl/params/man.links.list.heading.xml; M: /trunk/xsl/params/insert.link.page.number.xml; M: /trunk/xsl/params/htmlhelp.button.jump2.title.xml; M: /trunk/xsl/params/l10n.lang.value.rfc.compliant.xml - Michael(tm) Smith - - -Updated index.method doc to describe revised setup for importing index extensions.M: /trunk/xsl/params/index.method.xml - Robert Stayton - - -Added several new HTML parameters for controlling appearance of -content on HTML title pages: - -contrib.inline.enabled: - If non-zero (the default), output of the contrib element is - displayed as inline content rather than as block content. - -othercredit.like.author.enabled: - If non-zero, output of the othercredit element on titlepages is - displayed in the same style as author and editor output. If zero - (the default), othercredit output is displayed using a style - different than that of author and editor. - -blurb.on.titlepage.enabled: - If non-zero, output from authorblurb and personblurb elements is - displayed on title pages. If zero (the default), output from - those elements is suppressed on title pages (unless you are - using a titlepage customization that causes them to be included). - -editedby.enabled - If non-zero (the default), a localized Edited by heading is - displayed above editor names in output of the editor element.A: /trunk/xsl/params/contrib.inline.enabled.xml; A: /trunk/xsl/params/blurb.on.titlepage.enabled.xml; A: /trunk/xsl/params/othercredit.like.author.enabled.xml; A: /trunk/xsl/params/editedby.enabled.xml - Michael(tm) Smith - - -Added new email.delimiters.enabled param. If non-zero (the -default), delimiters are generated around e-mail addresses (output -of the email element). If zero, the delimiters are suppressed.A: /trunk/xsl/params/email.delimiters.enabled.xml - Michael(tm) Smith - - - -Added qanda.nested.in.toc param. Default value is zero. If -non-zero, instances of "nested" Qandaentry (ones that are children -of Answer elements) are displayed in the TOC. Closes patch 1509018 -(from Daniel Leidert). Currently on affects HTML output (no patch -for FO output provided).A: /trunk/xsl/params/qanda.nested.in.toc.xml - Michael(tm) Smith - - - -Initial support of syntax highlighting of programlistings.A: /trunk/xsl/params/highlight.source.xml; A: /trunk/xsl/params/highlight.default.language.xml - Jirka Kosek - - - - - -Tools -The following changes have been made to the - tools code - since the 1.70.1 release. - - - -Racheted down font sizes of headings in example makefile FO output.M: /trunk/xsl/tools/make/Makefile.DocBook - Michael(tm) Smith - - -Added param and attribute set to example makefile, for getting -wrapping in verbatims in FO output.M: /trunk/xsl/tools/make/Makefile.DocBook - Michael(tm) Smith - - -Renamed Makefile.paramDoc to Makefile.docParam.A: /trunk/xsl/tools/make/Makefile.docParam; D: /trunk/xsl/tools/make/Makefile.paramDoc - Michael(tm) Smith - - -Added Makefile.paramDoc file, for creating versions of param.xsl -files with doc embedded.A: /trunk/xsl/tools/make/Makefile.paramDoc - Michael(tm) Smith - - -Added variable to example makefile for controlling whether HTML or -XHTML is generated.M: /trunk/xsl/tools/make/Makefile.DocBook - Michael(tm) Smith - - - - -
    - - -Release: 1.70.1 - -This is a stable release of the 1.70 stylesheets. It includes only a -few small changes from 1.70.0. - -The following is a list of changes that have been made - since the 1.70.0 release. - - -FO -The following changes have been made to the - fo code - since the 1.70.0 release. - - -Added three new attribute sets (revhistory.title.properties, revhistory.table.properties and revhistory.table.cell.properties) for controlling appearance of revhistory in FO output. -Modified: fo/block.xsl,1.34; fo/param.ent,1.101; fo/param.xweb,1.114; fo/titlepage.xsl,1.41; params/revhistory.table.cell.properties.xml,1.1; params/revhistory.table.properties.xml,1.1; params/revhistory.title.properties.xml,1.1 - Jirka Kosek - - -Support DBv5 revisions with full author name (not only authorinitials) -Modified: fo/block.xsl,1.33; fo/titlepage.xsl,1.40 - Jirka Kosek - - - - - -HTML -The following changes have been made to the - html code - since the 1.70.0 release. - - -Support DBv5 revisions with full author name (not only authorinitials) -Modified: html/block.xsl,1.23; html/titlepage.xsl,1.34 - Jirka Kosek - - - - - -HTMLHelp -The following changes have been made to the - htmlhelp code - since the 1.70.0 release. - - -htmlhelp.generate.index is now param, not variable. This means that you can override its setting from outside. This is useful when you generate indexterms on the fly (see http://www.xml.com/pub/a/2004/07/14/dbndx.html?page=3). -Modified: htmlhelp/htmlhelp-common.xsl,1.38 - Jirka Kosek - - -Support chunk.tocs.and.lots in HTML Help -Modified: htmlhelp/htmlhelp-common.xsl,1.37 - Jirka Kosek - - - - - -Params -The following changes have been made to the - params code - since the 1.70.0 release. - - -Added three new attribute sets (revhistory.title.properties, revhistory.table.properties and revhistory.table.cell.properties) for controlling appearance of revhistory in FO output. -Modified: fo/block.xsl,1.34; fo/param.ent,1.101; fo/param.xweb,1.114; fo/titlepage.xsl,1.41; params/revhistory.table.cell.properties.xml,1.1; params/revhistory.table.properties.xml,1.1; params/revhistory.title.properties.xml,1.1 - Jirka Kosek - - - - - - - -Release: 1.70.0 -As with all DocBook Project dot-zero -releases, this is an experimental release. It will be followed shortly -by a stable release. - -This release adds a number of new features, -including: - - - - support for selecting alternative index-collation methods - (in particular, support for using a collation library developed by - Eliot Kimber) - - - improved handling of DocBook 5 document instances (through a - namespace-stripping mechanism) - - - full support for CALS and HTML tables in manpages - output - - - a mechanism for preserving relative URIs in documents that - make use of XInclude - - - support for the "new" .90 version of - FOP - - - enhanced capabilities for controlling formatting of lists in HTML - and FO output - - - autogeneration of AUTHOR and COPYRIGHT sections in manpages - output - - - support for generating crop marks in FO/PDF output - - - support for qandaset as a root element in FO output - - - support for floatstyle and orient on all table types - - - support for floatstyle in figure, and example - - - pgwide.properties attribute-set supports extending figure, - example and table into the left indent area instead of spanning - multiple columns. - - - The following is a detailed list of enhancements and API - changes that have been made since the 1.69.1 release. - - -Common -The following changes have been made to the - common code - since the 1.69.1 release. - - -Add the xsl:key for the kimber -indexing method. -Modified: common/autoidx-ng.xsl,1.2 - Robert -Stayton - - -Add support for -qandaset. -Modified: common/labels.xsl,1.37; -common/subtitles.xsl,1.7; common/titles.xsl,1.35 - Robert -Stayton - - -Support dbhtml/dbfo start PI for -orderedlist numbering in both HTML and -FO -Modified: common/common.xsl,1.61; html/lists.xsl,1.50 - Norman -Walsh - - -Added CVS -header. -Modified: common/stripns.xsl,1.12 - Robert -Stayton - - -Changed content model of text -element to ANY rather than #PCDATA because they could contain -markup. -Modified: common/targetdatabase.dtd,1.7 - Robert -Stayton - - -Added -refentry.meta.get.quietly param. -If zero (the -default), notes and warnings about "missing" markup are generated -during gathering of refentry metadata. If -non-zero, the metadata is gathered "quietly" -- that is, the -notes and warnings are suppressed. -NOTE: If you are -processing a large amount of refentry content, you -may be able to speed up processing significantly by setting a -non-zero value for -refentry.meta.get.quietly. -Modified: common/refentry.xsl,1.17; -manpages/param.ent,1.15; manpages/param.xweb,1.17; -params/refentry.meta.get.quietly.xml,1.1 - Michael(tm) -Smith - - -After namespace stripping, the -source document is the temporary tree created by the stripping -process and it has the wrong base URI for relative -references. Earlier versions of this code used to try to fix that -by patching the elements with relative @fileref attributes. That -was inadequate because it calculated an absolute base URI -without considering that there might be xml:base attributes -already in effect. It seems obvious now that the right thing to -do is simply to put the xml:base on the root of the document. And -that seems to work. -Modified: common/stripns.xsl,1.7 - Norman -Walsh - - -Added support for "software" and -"sectdesc" class values on refmiscinfo; "software" is -treated identically to "source", and "setdesc" is treated -identically to "manual". -Modified: common/refentry.xsl,1.10; -params/man.th.extra2.max.length.xml,1.3; -params/refentry.source.name.profile.xml,1.4 - Michael(tm) -Smith - - -Added support for DocBook 5 -namespace-stripping in manpages stylesheet. Closes request -#1210692. -Modified: common/common.xsl,1.56; manpages/docbook.xsl,1.57 - -Michael(tm) Smith - - -Added <xsl:template -match="/"> to make stripns.xsl usable as a standalone -stylesheet for stripping out DocBook 5/NG to DocBook 4. Note that -DocBook XSLT drivers that include this stylesheet all override -the match="/" template. -Modified: common/stripns.xsl,1.4 - Michael(tm) -Smith - - -Number figures, examples, and -tables from book if there is no prefix (i.e. if -chapter.autolabel is set to 0). This avoids -having the list of figures where the figures mysteriously restart -their numeration periodically when -chapter.autolabel is set to -0. -Modified: common/labels.xsl,1.36 - David Cramer - - -Add task template in -title.markup mode. -Modified: common/titles.xsl,1.34 - Robert -Stayton - - -Add children (with ids) of formal -objects to target data. -Modified: common/targets.xsl,1.10 - Robert -Stayton - - -Added support for case when -personname doesn't contain specific name markup (as allowed -in DocBook 5.0) -Modified: common/common.xsl,1.54 - Jirka -Kosek - - - - - -Extensions -The following changes have been made to the - extensions code - since the 1.69.1 release. - - -Support Xalan -2.7 -Modified: extensions/xalan27/.cvsignore,1.1; -extensions/xalan27/build.xml,1.1; -extensions/xalan27/nbproject/.cvsignore,1.1; -extensions/xalan27/nbproject/build-impl.xml,1.1; -extensions/xalan27/nbproject/genfiles.properties,1.1; -extensions/xalan27/nbproject/project.properties,1.1; -extensions/xalan27/nbproject/project.xml,1.1; -extensions/xalan27/src/com/nwalsh/xalan/CVS.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Callout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatDingbatCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatGraphicCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatTextCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/FormatUnicodeCallout.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Func.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/ImageIntrinsics.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Params.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Table.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Text.java,1.1; -extensions/xalan27/src/com/nwalsh/xalan/Verbatim.java,1.1 - Norman -Walsh - - -Handle the case where the imageFn -is actually a URI. This still needs -work. -Modified: extensions/saxon643/com/nwalsh/saxon/ImageIntrinsics.java,1.4 -- Norman Walsh - - - - - -FO -The following changes have been made to the - fo code - since the 1.69.1 release. - - -Adapted to the new indexing -code. Now works just like a wrapper that calls kosek indexing method, -originally implemented here. -Modified: fo/autoidx-ng.xsl,1.5 - Jirka -Kosek - - -Added parameters for header/footer -table minimum height. -Modified: fo/pagesetup.xsl,1.60; -fo/param.ent,1.100; fo/param.xweb,1.113 - Robert -Stayton - - -Add the index.method -parameter. -Modified: fo/param.ent,1.99; fo/param.xweb,1.112 - Robert -Stayton - - -Integrate support for three -indexing methods: - the original English-only method. - -Jirka Kosek's method using EXSLT extensions. - Eliot Kimber's -method using Saxon extensions. Use the 'index.method' -parameter to select. -Modified: fo/autoidx.xsl,1.38 - Robert -Stayton - - -Add support for TOC for -qandaset in fo output. -Modified: fo/autotoc.xsl,1.30; -fo/qandaset.xsl,1.20 - Robert Stayton - - -Added parameter -ulink.hyphenate.chars. Added parameter -insert.link.page.number. -Modified: fo/param.ent,1.98; -fo/param.xweb,1.111 - Robert Stayton - - -Implemented feature request -#942524 to add insert.link.page.number to allow link -element cross references to have a page number. -Modified: fo/xref.xsl,1.67 - -Robert Stayton - - -Add support for -ulink.hyphenate.chars so more characters -can be break points in urls. -Modified: fo/xref.xsl,1.66 - Robert -Stayton - - -Implemented patch #1075144 to make -the url text in a ulink in FO output an active link as -well. -Modified: fo/xref.xsl,1.65 - Robert Stayton - - -table footnotes now -have their own table.footnote.properties -attribute set. -Modified: fo/footnote.xsl,1.23 - Robert -Stayton - - -Add qandaset to -root.elements. -Modified: fo/docbook.xsl,1.41 - Robert -Stayton - - -Added mode="page.sequence" to make -it easier to put content into a page sequence. First used for -qandaset. -Modified: fo/component.xsl,1.37 - Robert -Stayton - - -Implemented feature request -#1434408 to support formatting -of biblioentry. -Modified: fo/biblio.xsl,1.35 - Robert -Stayton - - -Added -biblioentry.properties. -Modified: fo/param.ent,1.97; -fo/param.xweb,1.110 - Robert Stayton - - -Support PTC/Arbortext -bookmarks -Modified: fo/docbook.xsl,1.40; fo/ptc.xsl,1.1 - Norman -Walsh - - -Added -table.footnote.properties to permit -table footnotes to format differently from regular -footnotes. -Modified: fo/param.ent,1.96; fo/param.xweb,1.109 - Robert -Stayton - - -Refactored table -templates to unify their processing and support all options in -all types. Now table and informaltable, in -both Cals and Html markup, use the same templates where possible, -and all support pgwide, rotation, and floats. There is also a -placeholder table.container template to -support wrapping a table in a layout table, -so the XEP table title "continued" -extension can be more easily implemented. -Modified: fo/formal.xsl,1.52; -fo/htmltbl.xsl,1.9; fo/table.xsl,1.48 - Robert -Stayton - - -Added new attribute set -toc.line.properties for controlling appearance of lines in -ToC/LoT -Modified: fo/autotoc.xsl,1.29; fo/param.ent,1.95; -fo/param.xweb,1.108 - Jirka Kosek - - -Added support for float to example -and equation. Added support for pgwide to -figure, example, and equation (the latter -two via a dbfo pgwide="1" processing -instruction). -Modified: fo/formal.xsl,1.51 - Robert -Stayton - - -Add pgwide.properties -attribute-set. -Modified: fo/param.ent,1.94; fo/param.xweb,1.107 - Robert -Stayton - - -Added refclass.suppress -param. -If the value of refclass.suppress is -non-zero, then display refclass contents is suppressed -in output. Affects HTML and FO output -only. -Modified: fo/param.ent,1.93; fo/param.xweb,1.106; html/param.ent,1.90; -html/param.xweb,1.99; params/refclass.suppress.xml,1.1 - Michael(tm) -Smith - - -Improved support for -task subelements -Modified: fo/task.xsl,1.3; html/task.xsl,1.3 - -Jirka Kosek - - -Adjusted spacing around -K&R-formatted Funcdef and Paramdef -output such that it can more easily be discerned where one ends -and the other begins. Closes #1213264. -Modified: fo/synop.xsl,1.18 - -Michael(tm) Smith - - -Made handling of -paramdef/parameter in FO output consistent with that in HTML and -manpages output. Closes #1213259. -Modified: fo/synop.xsl,1.17 - Michael(tm) -Smith - - -Made handling of -Refnamediv consistent with formatting in HTML -and manpages output; specifically, changed so that -Refname (comma-separated list of multiple instances -found) is used (instead of Refentrytitle as -previously), then em-dash, then the Refpurpose. Closes -#1212562. -Modified: fo/refentry.xsl,1.30 - Michael(tm) -Smith - - -Added output of -Releaseinfo to recto titlepage ("copyright" -page) for Book in FO output. This makes it consistent -with HTML output. Closes #1327034. Thanks to Paul DuBois for -reporting. -Modified: fo/titlepage.templates.xml,1.28 - Michael(tm) -Smith - - -Added condition for setting -block-progression-dimension.minimum on table-row, instead of -height, when fop1.extensions is -non-zero. For an explanation of the reason for the change, -see: http://wiki.apache.org/xmlgraphics-fop/Troubleshooting/CommonLogMessages -Modified: fo/pagesetup.xsl,1.59 -- Michael(tm) Smith - - -Added new -refclass.suppress param for suppressing display -of Refclass in HTML and FO output. Did not add it to -manpages because manpages stylesheet is currently just silently -ignoring Refclass anyway. Closes request -#1461065. Thanks to Davor Ocelic (docelic) for -reporting. -Modified: fo/refentry.xsl,1.29; html/refentry.xsl,1.23 - -Michael(tm) Smith - - -Add support for keep-together PI -to informal objects. -Modified: fo/formal.xsl,1.50 - Robert -Stayton - - -Add support for -fop1.extensions. -Modified: fo/formal.xsl,1.49; -fo/graphics.xsl,1.44; fo/table.xsl,1.47 - Robert -Stayton - - -Add support for fop1 -bookmarks. -Modified: fo/docbook.xsl,1.39 - Robert -Stayton - - -Add fop1.extentions parameter to -add support for fop development version. -Modified: fo/param.ent,1.92; -fo/param.xweb,1.105 - Robert Stayton - - -Start supporting fop development -version, which will become fop version 1. -Modified: fo/fop1.xsl,1.1 - -Robert Stayton - - -Add template for task -in mode="xref-to". -Modified: fo/xref.xsl,1.63; html/xref.xsl,1.57 - Robert -Stayton - - -table footnotes now -also get footnote.properties -attribute-set. -Modified: fo/footnote.xsl,1.22 - Robert -Stayton - - -Added index.separator -named template to compute the separator punctuation based on -locale. -Modified: fo/autoidx.xsl,1.36 - Robert Stayton - - -Added support for link, -olink, and xref within OO -Classsynopsis and children. (Because DocBook NG/5 -allows it). -Modified: fo/synop.xsl,1.15; html/synop.xsl,1.19 - Michael(tm) -Smith - - -Support date as an -inline -Modified: fo/inline.xsl,1.43; html/inline.xsl,1.46 - Norman -Walsh - - -Added new parameter -keep.relative.image.uris -Modified: fo/param.ent,1.91; -fo/param.xweb,1.104; html/param.ent,1.87; html/param.xweb,1.96; -params/keep.relative.image.uris.xml,1.1 - Norman -Walsh - - -Map Unicode space characters -U+2000-U+200A to fo:leaders. -Modified: fo/docbook.xsl,1.38; -fo/passivetex.xsl,1.4; fo/spaces.xsl,1.1 - Jirka -Kosek - - -Output a real em dash for em-dash -dingbat (instead of two hypens). -Modified: fo/fo.xsl,1.7 - Michael(tm) -Smith - - -Support default label -width parameters for itemized and ordered lists -Modified: fo/lists.xsl,1.64; -fo/param.ent,1.90; fo/param.xweb,1.103; -params/itemizedlist.label.width.xml,1.1; -params/orderedlist.label.width.xml,1.1 - Norman -Walsh - - -Generate localized -title for Refsynopsisdiv if no -appropriate Title descendant found in source. Closes -#1212398. This change makes behavior for the Synopsis -title consistent with the behavior of HTML and -manpages output. -Also, added -xsl:use-attribute-sets="normal.para.spacing" to -block generated for Cmdsynopsis output. Previously, -that block had no spacing at all specified, which resulted it -being crammed up to closely to the Synopsis -head. -Modified: fo/refentry.xsl,1.28; fo/synop.xsl,1.13 - Michael(tm) -Smith - - -Added parameters to support -localization of index -item punctuation. -Modified: fo/autoidx.xsl,1.35 - Robert -Stayton - - -Added -index.number.separator, -index.range.separator, -and index.term.separator parameters to -support localization of punctuation in index -entries. -Modified: fo/param.ent,1.89; fo/param.xweb,1.102 - Robert -Stayton - - -Added "Cross References" -section in HTML doc (for consistency with the FO -doc). Also, moved the existing FO "Cross -References" section to follow the "Linking" -section. -Modified: fo/param.xweb,1.101; html/param.xweb,1.95 - -Michael(tm) Smith - - -Added ID attribues to all -Reference elements (e.g., id="tables" for the doc for -section on Table params). So pages for -all subsections of ref docs now have stable filenames instead -of arbitrary generated filenames. -Modified: fo/param.xweb,1.100; -html/param.xweb,1.94 - Michael(tm) Smith - - -Added two new parameters for -handling of multi-term -varlistentry elements: -variablelist.term.break.after: -When the variablelist.term.break.after is -non-zero, it will generate a line break after each -term multi-term -varlistentry. -variablelist.term.separator: -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is -placed after each term except the last. The default -is ", " (a comma followed by a space). To suppress rendering of -the separator, set the value of -variablelist.term.separator to the empty -string (""). -These parameters are primarily intended to be -useful if you have multi-term varlistentries that have long -terms. -Closes #1306676. Thanks to Sam Steingold for -providing an example "lots of long terms" doc that demonstrated -the value of having these options. -Also, added -normalize-space() call to processing of each -term. -This change affects all output formats -(HTML, PDF, manpages). The default behavior should pretty much -remain the same as before, but it is possible (as always) that -the change may introduce some -new bugginess. -Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; -fo/param.xweb,1.99; html/lists.xsl,1.48; html/param.ent,1.86; -html/param.xweb,1.93; manpages/lists.xsl,1.22; -manpages/param.ent,1.14; manpages/param.xweb,1.16; -params/variablelist.term.break.after.xml,1.1; -params/variablelist.term.separator.xml,1.1 - Michael(tm) -Smith - - -Add sidebar titlepage -placeholder attset for styles. -Modified: fo/titlepage.xsl,1.37 - Robert -Stayton - - -Add titlepage for -sidebar. -Modified: fo/titlepage.templates.xml,1.27 - Robert -Stayton - - -Implemented RFE -#1292615. -Added bunch of new parameters (attribute sets) -that affect list presentation: list.block.properties, -itemizedlist.properties, orderedlist.properties, -itemizedlist.label.properties and -orderedlist.label.properties. Default behaviour -of stylesheets has not been changed but further customizations will be -much more easier. -Modified: fo/lists.xsl,1.61; fo/param.ent,1.87; -fo/param.xweb,1.98; params/itemizedlist.label.properties.xml,1.1; -params/itemizedlist.properties.xml,1.1; -params/list.block.properties.xml,1.1; -params/orderedlist.label.properties.xml,1.1; -params/orderedlist.properties.xml,1.1 - Jirka -Kosek - - -Implemented RFE -#1242092. -You can enable crop marks in your document by -setting crop.marks=1 and xep.extensions=1. Appearance of crop -marks can be controlled by parameters -crop.mark.bleed (6pt), -crop.mark.offset (24pt) and -crop.mark.width (0.5pt). -Also there -is new named template called user-xep-pis. You can overwrite it in -order to produce some PIs that can control XEP as described in -http://www.renderx.com/reference.html#Output_Formats -Modified: fo/docbook.xsl,1.36; -fo/param.ent,1.86; fo/param.xweb,1.97; fo/xep.xsl,1.23; -params/crop.mark.bleed.xml,1.1; params/crop.mark.offset.xml,1.1; -params/crop.mark.width.xml,1.1; params/crop.marks.xml,1.1 - Jirka -Kosek - - - - - -HTML -The following changes have been made to the - html code - since the 1.69.1 release. - - -implemented -index.method parameter and three -methods. -Modified: html/autoidx.xsl,1.28 - Robert -Stayton - - -added index.method -parameter to support 3 indexing methods. -Modified: html/param.ent,1.94; -html/param.xweb,1.103 - Robert Stayton - - -Implemented feature request -#1072510 as a processing instruction to permit including external -HTML content into HTML output. -Modified: html/pi.xsl,1.9 - Robert -Stayton - - -Added new parameter -chunk.tocs.and.lots.has.title which -controls presence of title in a separate chunk with -ToC/LoT. Disabling title can be very useful if you are -generating frameset output (well, yes those frames, but some customers -really want them ;-). -Modified: html/chunk-code.xsl,1.15; -html/param.ent,1.93; html/param.xweb,1.102; -params/chunk.tocs.and.lots.has.title.xml,1.1 - Jirka -Kosek - - -Support dbhtml/dbfo start PI for -orderedlist numbering in both HTML and -FO -Modified: common/common.xsl,1.61; html/lists.xsl,1.50 - Norman -Walsh - - -Allow ToC without -title also for set and -book. -Modified: html/autotoc.xsl,1.37; html/division.xsl,1.12 - -Jirka Kosek - - -Implemented floats uniformly for -figure, example, equation -and informalfigure, informalexample, and -informalequation. -Modified: html/formal.xsl,1.22 - Robert -Stayton - - -Added the -autotoc.label.in.hyperlink param. -If the value -of autotoc.label.in.hyperlink is non-zero, labels -are included in hyperlinked titles in the TOC. If it -is instead zero, labels are still displayed prior to the -hyperlinked titles, but are not hyperlinked along with the -titles. -Closes patch #1065868. Thanks to anatoly techtonik -for the patch. -Modified: html/autotoc.xsl,1.36; html/param.ent,1.92; -html/param.xweb,1.101; params/autotoc.label.in.hyperlink.xml,1.1 - -Michael(tm) Smith - - -Added two new params: -html.head.legalnotice.link.types -and html.head.legalnotice.link.multiple. -If -the value of the generate.legalnotice.link is -non-zero, then the stylesheet generates (in the head -section of the HTML source) either a single HTML -link element or, if the value of -the html.head.legalnotice.link.multiple is -non-zero, one link element for each link -type specified. Each link has the -following attributes: - - a rel attribute whose value -is derived from the value of -html.head.legalnotice.link.types - - -an href attribute whose value is set to the URL of the file -containing the legalnotice - - a title -attribute whose value is set to the title of the -corresponding legalnotice (or a title -programatically determined by the stylesheet) -For -example: - <link rel="copyright" -href="ln-id2524073.html" title="Legal Notice"> -Closes -#1476450. Thanks to Sam Steingold. -Modified: html/chunk-common.xsl,1.45; -html/param.ent,1.91; html/param.xweb,1.100; -params/generate.legalnotice.link.xml,1.4; -params/html.head.legalnotice.link.multiple.xml,1.1; -params/html.head.legalnotice.link.types.xml,1.1 - Michael(tm) -Smith - - -Added refclass.suppress -param. -If the value of refclass.suppress is -non-zero, then display refclass contents is suppressed -in output. Affects HTML and FO output -only. -Modified: fo/param.ent,1.93; fo/param.xweb,1.106; html/param.ent,1.90; -html/param.xweb,1.99; params/refclass.suppress.xml,1.1 - Michael(tm) -Smith - - -Improved support for -task subelements -Modified: fo/task.xsl,1.3; html/task.xsl,1.3 - -Jirka Kosek - - -Added new -refclass.suppress param for suppressing display -of Refclass in HTML and FO output. Did not add it to -manpages because manpages stylesheet is currently just silently -ignoring Refclass anyway. Closes request -#1461065. Thanks to Davor Ocelic (docelic) for -reporting. -Modified: fo/refentry.xsl,1.29; html/refentry.xsl,1.23 - -Michael(tm) Smith - - -Process alt text with -normalize-space(). Replace tab indents with -spaces. -Modified: html/graphics.xsl,1.57 - Robert -Stayton - - -Content of citation -element is automatically linked to the bibliographic entry -with the corresponding abbrev. -Modified: html/biblio.xsl,1.26; -html/inline.xsl,1.47; html/xref.xsl,1.58 - Jirka -Kosek - - -Add template for task -in mode="xref-to". -Modified: fo/xref.xsl,1.63; html/xref.xsl,1.57 - Robert -Stayton - - -Suppress ID warnings if the -.warnings parameter is 0 -Modified: html/html.xsl,1.17 - Norman -Walsh - - -Add support for floatstyle to -figure. -Modified: html/formal.xsl,1.21 - Robert -Stayton - - -Handling of xref to -area/areaset need support in extensions code also. I currently have no -time to touch extensions code, so code is here to be enabled when -extension is fixed also. -Modified: html/xref.xsl,1.56 - Jirka -Kosek - - -Added 3 parameters for overriding -gentext for index -punctuation. -Modified: html/param.ent,1.89; html/param.xweb,1.98 - Robert -Stayton - - -Added parameters to support -localization of index item punctuation. Added -index.separator named template to compute -the separator punctuation based on -locale. -Modified: html/autoidx.xsl,1.27 - Robert -Stayton - - -Added a <div -class="{$class}-contents"> wrapper around output of contents -of all formal objects. Also, added an optional <br -class="{class}-break"/> linebreak after all formal -objects. -WARNING: Because this change places an additional -DIV between the DIV wrapper for the equation and the -equation contents, it may break some existing CSS -stylesheets that have been created with the assumption that there -would never be an intervening DIV there. -The following is -an example of what Equation output looks like as a -result of the changes described above. - <div -class="equation"> <a name="three" -id="three"></a> - <p -class="title"><b>(1.3)</b></p> - -<div class="equation-contents"> <span -class="mathphrase">1+1=3</span> -</div> </div><br -class="equation-break"> -Rationale: These changes allow -CSS control of the placement of the formal-object -title relative to the formal-object -contents. For example, using the CSS "float" property -enables the title and contents to be rendered on the -same line. Example stylesheet: - .equation -{ margin-top: 20px; margin-bottom: 20px; } -.equation-contents { float: left; } - -.equation .title { margin-top: 0; -float: right; margin-right: 200px; } - -.equation .title b { font-weight: -normal; } - .equation-break { clear: both; -} -Note that the purpose of the ".equation-break" class is -to provide a way to clear off the floats. -If you want -to instead have the equation title rendered to -the left of the equation contents, you can do -something like this: - .equation { -margin-top: 20px; width: 300px; margin-bottom: 20px; -} .equation-contents { float: right; } - -.equation .title { margin-top: 0; -float: left; margin-right: 200px; } - -.equation .title b { font-weight: -normal; } - .equation-break { clear: both; -} -Modified: html/formal.xsl,1.20 - Michael(tm) Smith - - -Added a chunker.output.quiet -top-level parameter so that the chunker can be made quiet by -default -Modified: html/chunker.xsl,1.26 - Norman Walsh - - -Added support for link, -olink, and xref within OO -Classsynopsis and children. (Because DocBook NG/5 -allows it). -Modified: fo/synop.xsl,1.15; html/synop.xsl,1.19 - Michael(tm) -Smith - - -New parameter: -id.warnings. If non-zero, warnings are -generated for titled objects that don't have titles. True by default; -I wonder if this will be too aggressive? -Modified: html/biblio.xsl,1.25; -html/component.xsl,1.27; html/division.xsl,1.11; html/formal.xsl,1.19; -html/glossary.xsl,1.20; html/html.xsl,1.13; html/index.xsl,1.16; -html/param.ent,1.88; html/param.xweb,1.97; html/refentry.xsl,1.22; -html/sections.xsl,1.30; params/id.warnings.xml,1.1 - Norman -Walsh - - -If the -keep.relative.image.uris parameter is true, -don't use the absolute URI (as calculated from xml:base) in -the img src attribute, us the value the author -specified. Note that we still have to calculate the absolute -filename for use in the image intrinsics -extension. -Modified: html/graphics.xsl,1.56 - Norman -Walsh - - -Support date as an -inline -Modified: fo/inline.xsl,1.43; html/inline.xsl,1.46 - Norman -Walsh - - -Added new parameter -keep.relative.image.uris -Modified: fo/param.ent,1.91; -fo/param.xweb,1.104; html/param.ent,1.87; html/param.xweb,1.96; -params/keep.relative.image.uris.xml,1.1 - Norman -Walsh - - -Added two new parameters for -handling of multi-term -varlistentry elements: -variablelist.term.break.after: -When the variablelist.term.break.after is -non-zero, it will generate a line break after each -term multi-term -varlistentry. -variablelist.term.separator: -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is -placed after each term except the last. The default -is ", " (a comma followed by a space). To suppress rendering of -the separator, set the value of -variablelist.term.separator to the empty -string (""). -These parameters are primarily intended to be -useful if you have multi-term varlistentries that have long -terms. -Closes #1306676. Thanks to Sam Steingold for -providing an example "lots of long terms" doc that demonstrated -the value of having these options. -Also, added -normalize-space() call to processing of each -term. -This change affects all output formats -(HTML, PDF, manpages). The default behavior should pretty much -remain the same as before, but it is possible (as always) that -the change may introduce some -new bugginess. -Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; -fo/param.xweb,1.99; html/lists.xsl,1.48; html/param.ent,1.86; -html/param.xweb,1.93; manpages/lists.xsl,1.22; -manpages/param.ent,1.14; manpages/param.xweb,1.16; -params/variablelist.term.break.after.xml,1.1; -params/variablelist.term.separator.xml,1.1 - Michael(tm) -Smith - - -Added "wrapper-name" param to -inline.charseq named template, enabling it to output inlines -other than just "span". Acronym and Abbrev -templates now use inline.charseq to output HTML -"acronym" and "abbr" elements (instead of -"span"). Closes #1305468. Thanks to Sam Steingold for suggesting -the change. -Modified: html/inline.xsl,1.45 - Michael(tm) -Smith - - - - - -Manpages -The following changes have been made to the - manpages code - since the 1.69.1 release. - - -Added the following -params: - - man.indent.width (string-valued) - -man.indent.refsect (boolean) - man.indent.blurbs (boolean) -- man.indent.lists (boolean) - man.indent.verbatims -(boolean) -Note that in earlier snapshots, man.indent.width -was named man.indentation.default.value and the boolean params -had names like man.indentation.*.adjust. Also the -man.indent.blurbs param was called man.indentation.authors.adjust -(or something). -The behavior now is: If the value of a -particular man.indent.* boolean param is non-zero, the -corresponding contents (refsect*, list items, -authorblurb/personblurb, vervatims) are displayed with a left -margin indented by a width equal to the value -of man.indent.width. -Modified: params/man.indent.blurbs.xml,1.1; -manpages/docbook.xsl,1.74; manpages/info.xsl,1.20; -manpages/lists.xsl,1.30; manpages/other.xsl,1.20; -manpages/param.ent,1.22; manpages/param.xweb,1.24; -manpages/refentry.xsl,1.14; params/man.indent.lists.xml,1.1; -params/man.indent.refsect.xml,1.1; -params/man.indent.verbatims.xml,1.1; params/man.indent.width.xml,1.1 - -Michael(tm) Smith - - -Added -man.table.footnotes.divider param. -In each -table that contains footenotes, the string specified -by the man.table.footnotes.divider parameter is output -before the list of footnotes for the -table. -Modified: manpages/docbook.xsl,1.73; -manpages/links.xsl,1.6; manpages/param.ent,1.21; -manpages/param.xweb,1.23; params/man.table.footnotes.divider.xml,1.1 - -Michael(tm) Smith - - -Added the -man.output.in.separate.dir, -man.output.base.dir, -and man.output.subdirs.enabled parameters. -The -man.output.base.dir parameter specifies the -base directory into which man-page files are -output. The man.output.subdirs.enabled parameter controls whether -the files are output in subdirectories within the base -directory. -The values of the -man.output.base.dir -and man.output.subdirs.enabled parameters are used only if the -value of man.output.in.separate.dir parameter is non-zero. If the -value of man.output.in.separate.dir is zero, man-page files are -not output in a separate -directory. -Modified: manpages/docbook.xsl,1.72; manpages/param.ent,1.20; -manpages/param.xweb,1.22; params/man.output.base.dir.xml,1.1; -params/man.output.in.separate.dir.xml,1.1; -params/man.output.subdirs.enabled.xml,1.1 - Michael(tm) -Smith - - -Added -man.font.table.headings and -man.font.table.title params, for -controlling font in table headings and -titles. -Modified: manpages/docbook.xsl,1.71; manpages/param.ent,1.19; -manpages/param.xweb,1.21; params/man.font.table.headings.xml,1.1; -params/man.font.table.title.xml,1.1 - Michael(tm) -Smith - - -Added -man.font.funcsynopsisinfo and -man.font.funcprototype params, for specifying the roff -font (for example, BI, B, I) for funcsynopsisinfo and -funcprototype output. -Modified: manpages/block.xsl,1.19; -manpages/docbook.xsl,1.69; manpages/param.ent,1.18; -manpages/param.xweb,1.20; manpages/synop.xsl,1.29; -manpages/table.xsl,1.21; params/man.font.funcprototype.xml,1.1; -params/man.font.funcsynopsisinfo.xml,1.1 - Michael(tm) -Smith - - -Added -man.segtitle.suppress param. -If the value of -man.segtitle.suppress is non-zero, then display -of segtitle contents is suppressed in -output. -Modified: manpages/docbook.xsl,1.68; manpages/param.ent,1.17; -manpages/param.xweb,1.19; params/man.segtitle.suppress.xml,1.1 - -Michael(tm) Smith - - -Added -man.output.manifest.enabled and -man.output.manifest.filename params. -If -man.output.manifest.enabled is non-zero, a list -of filenames for man pages generated by the stylesheet -transformation is written to the file named by -man.output.manifest.filename -Modified: manpages/docbook.xsl,1.67; -manpages/other.xsl,1.19; manpages/param.ent,1.16; -manpages/param.xweb,1.18; params/man.output.manifest.enabled.xml,1.1; -params/man.output.manifest.filename.xml,1.1; -tools/make/Makefile.DocBook,1.4 - Michael(tm) -Smith - - -Added -refentry.meta.get.quietly param. -If zero (the -default), notes and warnings about "missing" markup are generated -during gathering of refentry metadata. If -non-zero, the metadata is gathered "quietly" -- that is, the -notes and warnings are suppressed. -NOTE: If you are -processing a large amount of refentry content, you -may be able to speed up processing significantly by setting a -non-zero value for -refentry.meta.get.quietly. -Modified: common/refentry.xsl,1.17; -manpages/param.ent,1.15; manpages/param.xweb,1.17; -params/refentry.meta.get.quietly.xml,1.1 - Michael(tm) -Smith - - -Changed names of all boolean -indentation params to man.indent.* Also discarded individual -man.indent.*.value params and switched to just using a common -man.indent.width param (3n by default). -Modified: manpages/docbook.xsl,1.66; -manpages/info.xsl,1.19; manpages/lists.xsl,1.29; -manpages/other.xsl,1.18; manpages/refentry.xsl,1.13 - Michael(tm) -Smith - - -Added boolean -man.output.in.separate.dir param, to control whether or not man -files are output in separate directory. -Modified: manpages/docbook.xsl,1.65; -manpages/utility.xsl,1.14 - Michael(tm) Smith - - -Added options for controlling -indentation of verbatim output. Controlled through the -man.indentation.verbatims.adjust -and man.indentation.verbatims.value params. Closes -#1242997 -Modified: manpages/block.xsl,1.15; manpages/docbook.xsl,1.64 - -Michael(tm) Smith - - -Added options for controlling -indentation in lists and in *blurb output in the AUTHORS -section. Controlled through -the man.indentation.lists.adjust, -man.indentation.lists.value, man.indentation.authors.adjust, and -man.indentation.authors.value parameters. Default is 3 characters -(instead of the roff default of 8 characters). Closes -#1449369. -Also, removed the indent that was being set on -informalexample outuput. I will instead add an option -for indenting verbatims, which I think is what the -informalexample indent was intended -for originally. -Modified: manpages/block.xsl,1.14; -manpages/docbook.xsl,1.63; manpages/info.xsl,1.18; -manpages/lists.xsl,1.28 - Michael(tm) Smith - - -Changed line-spacing call before -synopfragment to use ".sp -1n" ("n" units specified) -instead of plain ".sp -1" -Modified: manpages/synop.xsl,1.28 - Michael(tm) -Smith - - -Added support for writing man -files into a specific output directory and into appropriate -subdirectories within that output directory. Controlled through -the man.base.dir parameter (similar to the -base.dir support in the HTML stylesheet) and -the man.subdirs.enabled parameter, which automatically determines -the name of an appropriate subdir (for example, man/man7, -man/man1, etc.) based on the section number/manvolnum -of the source Refentry. -Closes #1255036 and -#1170317. Thanks to Denis Bradford for the original feature -request, and to Costin Stroie for submitting a patch that was -very helpful in implementing the -support. -Modified: manpages/docbook.xsl,1.62; manpages/utility.xsl,1.13 - -Michael(tm) Smith - - -Refined XPath statements and -notification messages for refentry metadata -handling. -Modified: common/common.xsl,1.59; common/refentry.xsl,1.14; -manpages/docbook.xsl,1.61; manpages/other.xsl,1.17 - Michael(tm) -Smith - - -Added support for -copyright and legalnotice. The manpages -stylesheets now output a COPYRIGHT section, -after the AUTHORS section, if a copyright -or legalnotice is found in the source. The -section contains the copyright contents followed -by the legalnotice contents. Closes -#1450209. -Modified: manpages/docbook.xsl,1.59; manpages/info.xsl,1.17 - -Michael(tm) Smith - - -Drastically reworked all of the -XPath expressions used in refentry metadata gathering --- completely removed $parentinfo and turned $info into a set of -nodes that includes the *info contents of the Refentry -plus the *info contents all all of its ancestor elements. The -basic XPath expression now used throughout is (using the example -of checking for a date): - -(($info[//date])[last()]/date)[1]. -That selects the "last" -*info/date date in document order -- that is, the one -eitther on the Refentry itself or on the -closest ancestor to the Refentry. -It's -likely this change may break some things; may need to pick up -some pieces later. -Also, changed the default value for the -man.th.extra2.max.length from 40 to -30. -Modified: common/common.xsl,1.58; common/refentry.xsl,1.7; -params/man.th.extra2.max.length.xml,1.2; -params/refentry.date.profile.xml,1.2; -params/refentry.manual.profile.xml,1.2; -params/refentry.source.name.profile.xml,1.2; -params/refentry.version.profile.xml,1.2; manpages/docbook.xsl,1.58; -manpages/other.xsl,1.15 - Michael(tm) Smith - - -Added support for DocBook 5 -namespace-stripping in manpages stylesheet. Closes request -#1210692. -Modified: common/common.xsl,1.56; manpages/docbook.xsl,1.57 - -Michael(tm) Smith - - -Fixed handling of table -footnotes. With this checkin, the table support in the -manpages stylesheet is now basically feature complete. So this -change closes request #619532, "No support for tables" -- the -oldest currently open manpages feature request, submitted by Ben -Secrest (blsecres) on 2002-10-07. Congratulations to me [patting -myself on the back]. -Modified: manpages/block.xsl,1.11; -manpages/docbook.xsl,1.55; manpages/table.xsl,1.15 - Michael(tm) -Smith - - -Added handling for -table titles. Also fixed handling of nested tables; -nest tables are now "extracted" and displayed just after their -parent tables. -Modified: manpages/docbook.xsl,1.54; manpages/table.xsl,1.14 -- Michael(tm) Smith - - -Added option for turning off bold -formatting in Funcsynopsis. Boldface formatting in -function synopsis is mandated in the -man(7) man page and is used almost universally in existing man -pages. Despite that, it really does look like crap to have an -entire Funcsynopsis output in bold, so I added params -for turning off the bold formatting and/or replacing it with a -different roff special font (e.g., "RI" for alternating -roman/italic instead of the default "BI" for alternating -bold/italic). The new params -are "man.funcprototype.font" and -"man.funcsynopsisinfo.font". To be documented -later. -Closes #1452247. Thanks to Joe Orton for the feature -request. -Modified: params/man.string.subst.map.xml,1.16; -manpages/block.xsl,1.10; manpages/docbook.xsl,1.51; -manpages/inline.xsl,1.16; manpages/synop.xsl,1.27 - Michael(tm) -Smith - - -Use AUTHORS instead of -AUTHOR if we have multiple people to attribute. Also, -fixed checking such that we generate -author section even if we don't have an -author (as long as there is at least one other -person/entity we can put in the -section). Also adjusted assembly of content for -Author metainfo field such that we now not only use -author, but try to find a "best match" if we can't -find an author name to put there. -Closes -#1233592. Thanks to Sam Steingold for the -request. -Modified: manpages/info.xsl,1.12 - Michael(tm) -Smith - - -Changes for request #1243027, -"Impove handling of AUTHOR section." This -adds support for Collab, Corpauthor, Corpcredt, -Orgname, Publishername, and -Publisher. Also adds support for output -of Affiliation and its children, and support for using -gentext strings for auto-attributing roles (Author, -Editor, Publisher, Translator, etc.). Also -did a lot of code cleanup and modularization of all the -AUTHOR handling code. And fixed a bug that was causing -Author info to not be picked up correctly -for metainfo comment we embed in man-page -source. -Modified: manpages/info.xsl,1.11 - Michael(tm) -Smith - - -Support bold output for -"emphasis remap='B'". (because Eric Raymond's -doclifter(1) tool converts groff source marked up with ".B" -request or "\fB" escapes to DocBook "emphasis -remap='B'".) -Modified: manpages/inline.xsl,1.14 - Michael(tm) -Smith - - -Added support for -Segmentedlist. Details: Output is tabular, with no -option for "list" type output. Output for Segtitle -elements can be supressed by -setting man.segtitle.suppress. If Segtitle -content is output, it is rendered in italic type (not bold -because not all terminals support bold and so italic ensures the -stand out on those terminals). Extra space (.sp line) at end of -table code ensures that it gets handled correctly in -the case where its source is the child of a Para. -Closes feature-request #1400097. Thanks to Daniel Leidert for the -patch and push, and to Alastair Rankine for filing the original -feature request. -Modified: manpages/lists.xsl,1.23; -manpages/utility.xsl,1.10 - Michael(tm) Smith - - -Improved handling or -Author/Editor/Othercredit. -Reworked content of -(non-visible) comment added at top of each page (metadata -stuff). -Added support for generating a -manifest file (useful for cleaning up -after builds, etc.) -Modified: manpages/docbook.xsl,1.46; -manpages/info.xsl,1.9; manpages/other.xsl,1.12; -manpages/utility.xsl,1.6 - Michael(tm) Smith - - -Added two new parameters for -handling of multi-term -varlistentry elements: -variablelist.term.break.after: -When the variablelist.term.break.after is -non-zero, it will generate a line break after each -term multi-term -varlistentry. -variablelist.term.separator: -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is -placed after each term except the last. The default -is ", " (a comma followed by a space). To suppress rendering of -the separator, set the value of -variablelist.term.separator to the empty -string (""). -These parameters are primarily intended to be -useful if you have multi-term varlistentries that have long -terms. -Closes #1306676. Thanks to Sam Steingold for -providing an example "lots of long terms" doc that demonstrated -the value of having these options. -Also, added -normalize-space() call to processing of each -term. -This change affects all output formats -(HTML, PDF, manpages). The default behavior should pretty much -remain the same as before, but it is possible (as always) that -the change may introduce some -new bugginess. -Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; -fo/param.xweb,1.99; html/lists.xsl,1.48; html/param.ent,1.86; -html/param.xweb,1.93; manpages/lists.xsl,1.22; -manpages/param.ent,1.14; manpages/param.xweb,1.16; -params/variablelist.term.break.after.xml,1.1; -params/variablelist.term.separator.xml,1.1 - Michael(tm) -Smith - - - - - -Params -The following changes have been made to the - params code - since the 1.69.1 release. - - -New parameters to set -header/footer table minimum -height. -Modified: params/footer.table.height.xml,1.1; -params/header.table.height.xml,1.1 - Robert -Stayton - - -Support multiple indexing methods -for different languages. -Modified: params/index.method.xml,1.1 - Robert -Stayton - - -Remove qandaset and -qandadiv from generate.toc for fo -output because formerly it wasn't working, but now it is and -the default behavior should stay the -same. -Modified: params/generate.toc.xml,1.8 - Robert -Stayton - - -add support for page number -references to link element -too. -Modified: params/insert.link.page.number.xml,1.1 - Robert -Stayton - - -Add support for more characters to -hyphen on when ulink.hyphenate is turned -on. -Modified: params/ulink.hyphenate.chars.xml,1.1; -params/ulink.hyphenate.xml,1.3 - Robert Stayton - - -New attribute-set to format -biblioentry and -bibliomixed. -Modified: params/biblioentry.properties.xml,1.1 - -Robert Stayton - - -Added new parameter -chunk.tocs.and.lots.has.title which -controls presence of title in a separate chunk with -ToC/LoT. Disabling title can be very useful if you are -generating frameset output (well, yes those frames, but some customers -really want them ;-). -Modified: html/chunk-code.xsl,1.15; -html/param.ent,1.93; html/param.xweb,1.102; -params/chunk.tocs.and.lots.has.title.xml,1.1 - Jirka -Kosek - - -Added new attribute set -toc.line.properties for controlling appearance of lines in -ToC/LoT -Modified: params/toc.line.properties.xml,1.1 - Jirka -Kosek - - -Allow table footnotes -to have different properties from regular -footnotes. -Modified: params/table.footnote.properties.xml,1.1 - Robert -Stayton - - -Set properties for pgwide="1" -objects. -Modified: params/pgwide.properties.xml,1.1 - Robert -Stayton - - -Added the -autotoc.label.in.hyperlink param. -If the value -of autotoc.label.in.hyperlink is non-zero, labels -are included in hyperlinked titles in the TOC. If it -is instead zero, labels are still displayed prior to the -hyperlinked titles, but are not hyperlinked along with the -titles. -Closes patch #1065868. Thanks to anatoly techtonik -for the patch. -Modified: html/autotoc.xsl,1.36; html/param.ent,1.92; -html/param.xweb,1.101; params/autotoc.label.in.hyperlink.xml,1.1 - -Michael(tm) Smith - - -Added two new params: -html.head.legalnotice.link.types -and html.head.legalnotice.link.multiple. -If -the value of the generate.legalnotice.link is -non-zero, then the stylesheet generates (in the head -section of the HTML source) either a single HTML -link element or, if the value of -the html.head.legalnotice.link.multiple is -non-zero, one link element for each link -type specified. Each link has the -following attributes: - - a rel attribute whose value -is derived from the value of -html.head.legalnotice.link.types - - -an href attribute whose value is set to the URL of the file -containing the legalnotice - - a title -attribute whose value is set to the title of the -corresponding legalnotice (or a title -programatically determined by the stylesheet) -For -example: - <link rel="copyright" -href="ln-id2524073.html" title="Legal Notice"> -Closes -#1476450. Thanks to Sam Steingold. -Modified: html/chunk-common.xsl,1.45; -html/param.ent,1.91; html/param.xweb,1.100; -params/generate.legalnotice.link.xml,1.4; -params/html.head.legalnotice.link.multiple.xml,1.1; -params/html.head.legalnotice.link.types.xml,1.1 - Michael(tm) -Smith - - -Added the following -params: - - man.indent.width (string-valued) - -man.indent.refsect (boolean) - man.indent.blurbs (boolean) -- man.indent.lists (boolean) - man.indent.verbatims -(boolean) -Note that in earlier snapshots, man.indent.width -was named man.indentation.default.value and the boolean params -had names like man.indentation.*.adjust. Also the -man.indent.blurbs param was called man.indentation.authors.adjust -(or something). -The behavior now is: If the value of a -particular man.indent.* boolean param is non-zero, the -corresponding contents (refsect*, list items, -authorblurb/personblurb, vervatims) are displayed with a left -margin indented by a width equal to the value -of man.indent.width. -Modified: params/man.indent.blurbs.xml,1.1; -manpages/docbook.xsl,1.74; manpages/info.xsl,1.20; -manpages/lists.xsl,1.30; manpages/other.xsl,1.20; -manpages/param.ent,1.22; manpages/param.xweb,1.24; -manpages/refentry.xsl,1.14; params/man.indent.lists.xml,1.1; -params/man.indent.refsect.xml,1.1; -params/man.indent.verbatims.xml,1.1; params/man.indent.width.xml,1.1 - -Michael(tm) Smith - - -Added -man.table.footnotes.divider param. -In each -table that contains footenotes, the string specified -by the man.table.footnotes.divider parameter is output -before the list of footnotes for the -table. -Modified: manpages/docbook.xsl,1.73; -manpages/links.xsl,1.6; manpages/param.ent,1.21; -manpages/param.xweb,1.23; params/man.table.footnotes.divider.xml,1.1 - -Michael(tm) Smith - - -Added the -man.output.in.separate.dir, -man.output.base.dir, -and man.output.subdirs.enabled parameters. -The -man.output.base.dir parameter specifies the -base directory into which man-page files are -output. The man.output.subdirs.enabled parameter controls whether -the files are output in subdirectories within the base -directory. -The values of the -man.output.base.dir -and man.output.subdirs.enabled parameters are used only if the -value of man.output.in.separate.dir parameter is non-zero. If the -value of man.output.in.separate.dir is zero, man-page files are -not output in a separate -directory. -Modified: manpages/docbook.xsl,1.72; manpages/param.ent,1.20; -manpages/param.xweb,1.22; params/man.output.base.dir.xml,1.1; -params/man.output.in.separate.dir.xml,1.1; -params/man.output.subdirs.enabled.xml,1.1 - Michael(tm) -Smith - - -Added -man.font.table.headings and -man.font.table.title params, for -controlling font in table headings and -titles. -Modified: manpages/docbook.xsl,1.71; manpages/param.ent,1.19; -manpages/param.xweb,1.21; params/man.font.table.headings.xml,1.1; -params/man.font.table.title.xml,1.1 - Michael(tm) -Smith - - -Added -man.font.funcsynopsisinfo and -man.font.funcprototype params, for specifying the roff -font (for example, BI, B, I) for funcsynopsisinfo and -funcprototype output. -Modified: manpages/block.xsl,1.19; -manpages/docbook.xsl,1.69; manpages/param.ent,1.18; -manpages/param.xweb,1.20; manpages/synop.xsl,1.29; -manpages/table.xsl,1.21; params/man.font.funcprototype.xml,1.1; -params/man.font.funcsynopsisinfo.xml,1.1 - Michael(tm) -Smith - - -Changed to select="0" in -refclass.suppress (instead of -..>0</..) -Modified: params/refclass.suppress.xml,1.3 - Michael(tm) -Smith - - -Added -man.segtitle.suppress param. -If the value of -man.segtitle.suppress is non-zero, then display -of segtitle contents is suppressed in -output. -Modified: manpages/docbook.xsl,1.68; manpages/param.ent,1.17; -manpages/param.xweb,1.19; params/man.segtitle.suppress.xml,1.1 - -Michael(tm) Smith - - -Added -man.output.manifest.enabled and -man.output.manifest.filename params. -If -man.output.manifest.enabled is non-zero, a list -of filenames for man pages generated by the stylesheet -transformation is written to the file named by -man.output.manifest.filename -Modified: manpages/docbook.xsl,1.67; -manpages/other.xsl,1.19; manpages/param.ent,1.16; -manpages/param.xweb,1.18; params/man.output.manifest.enabled.xml,1.1; -params/man.output.manifest.filename.xml,1.1; -tools/make/Makefile.DocBook,1.4 - Michael(tm) -Smith - - -Added refclass.suppress -param. -If the value of refclass.suppress is -non-zero, then display refclass contents is suppressed -in output. Affects HTML and FO output -only. -Modified: fo/param.ent,1.93; fo/param.xweb,1.106; html/param.ent,1.90; -html/param.xweb,1.99; params/refclass.suppress.xml,1.1 - Michael(tm) -Smith - - -Added -refentry.meta.get.quietly param. -If zero (the -default), notes and warnings about "missing" markup are generated -during gathering of refentry metadata. If -non-zero, the metadata is gathered "quietly" -- that is, the -notes and warnings are suppressed. -NOTE: If you are -processing a large amount of refentry content, you -may be able to speed up processing significantly by setting a -non-zero value for -refentry.meta.get.quietly. -Modified: common/refentry.xsl,1.17; -manpages/param.ent,1.15; manpages/param.xweb,1.17; -params/refentry.meta.get.quietly.xml,1.1 - Michael(tm) -Smith - - -Added support for "software" and -"sectdesc" class values on refmiscinfo; "software" is -treated identically to "source", and "setdesc" is treated -identically to "manual". -Modified: common/refentry.xsl,1.10; -params/man.th.extra2.max.length.xml,1.3; -params/refentry.source.name.profile.xml,1.4 - Michael(tm) -Smith - - -Drastically reworked all of the -XPath expressions used in refentry metadata gathering --- completely removed $parentinfo and turned $info into a set of -nodes that includes the *info contents of the Refentry -plus the *info contents all all of its ancestor elements. The -basic XPath expression now used throughout is (using the example -of checking for a date): - -(($info[//date])[last()]/date)[1]. -That selects the "last" -*info/date date in document order -- that is, the one -eitther on the Refentry itself or on the -closest ancestor to the Refentry. -It's -likely this change may break some things; may need to pick up -some pieces later. -Also, changed the default value for the -man.th.extra2.max.length from 40 to -30. -Modified: common/common.xsl,1.58; common/refentry.xsl,1.7; -params/man.th.extra2.max.length.xml,1.2; -params/refentry.date.profile.xml,1.2; -params/refentry.manual.profile.xml,1.2; -params/refentry.source.name.profile.xml,1.2; -params/refentry.version.profile.xml,1.2; manpages/docbook.xsl,1.58; -manpages/other.xsl,1.15 - Michael(tm) Smith - - -Added option for turning off bold -formatting in Funcsynopsis. Boldface formatting in -function synopsis is mandated in the -man(7) man page and is used almost universally in existing man -pages. Despite that, it really does look like crap to have an -entire Funcsynopsis output in bold, so I added params -for turning off the bold formatting and/or replacing it with a -different roff special font (e.g., "RI" for alternating -roman/italic instead of the default "BI" for alternating -bold/italic). The new params -are "man.funcprototype.font" and -"man.funcsynopsisinfo.font". To be documented -later. -Closes #1452247. Thanks to Joe Orton for the feature -request. -Modified: params/man.string.subst.map.xml,1.16; -manpages/block.xsl,1.10; manpages/docbook.xsl,1.51; -manpages/inline.xsl,1.16; manpages/synop.xsl,1.27 - Michael(tm) -Smith - - -fop.extensions now only -for FOP version 0.20.5 and earlier. -Modified: params/fop.extensions.xml,1.4 -- Robert Stayton - - -Support for fop1 different from -fop 0.20.5 and earlier. -Modified: params/fop1.extensions.xml,1.1 - Robert -Stayton - - -Reset default value to empty -string so template uses gentext first, then the parameter value -if not empty. -Modified: params/index.number.separator.xml,1.2; -params/index.range.separator.xml,1.2; -params/index.term.separator.xml,1.2 - Robert -Stayton - - -New parameter: -id.warnings. If non-zero, warnings are -generated for titled objects that don't have titles. True by default; -I wonder if this will be too aggressive? -Modified: html/biblio.xsl,1.25; -html/component.xsl,1.27; html/division.xsl,1.11; html/formal.xsl,1.19; -html/glossary.xsl,1.20; html/html.xsl,1.13; html/index.xsl,1.16; -html/param.ent,1.88; html/param.xweb,1.97; html/refentry.xsl,1.22; -html/sections.xsl,1.30; params/id.warnings.xml,1.1 - Norman -Walsh - - -Added new parameter -keep.relative.image.uris -Modified: fo/param.ent,1.91; -fo/param.xweb,1.104; html/param.ent,1.87; html/param.xweb,1.96; -params/keep.relative.image.uris.xml,1.1 - Norman -Walsh - - -Support default label -width parameters for itemized and ordered lists -Modified: fo/lists.xsl,1.64; -fo/param.ent,1.90; fo/param.xweb,1.103; -params/itemizedlist.label.width.xml,1.1; -params/orderedlist.label.width.xml,1.1 - Norman -Walsh - - -Added parameters to localize -punctuation in indexes. -Modified: params/index.number.separator.xml,1.1; -params/index.range.separator.xml,1.1; -params/index.term.separator.xml,1.1 - Robert -Stayton - - -Added two new parameters for -handling of multi-term -varlistentry elements: -variablelist.term.break.after: -When the variablelist.term.break.after is -non-zero, it will generate a line break after each -term multi-term -varlistentry. -variablelist.term.separator: -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is -placed after each term except the last. The default -is ", " (a comma followed by a space). To suppress rendering of -the separator, set the value of -variablelist.term.separator to the empty -string (""). -These parameters are primarily intended to be -useful if you have multi-term varlistentries that have long -terms. -Closes #1306676. Thanks to Sam Steingold for -providing an example "lots of long terms" doc that demonstrated -the value of having these options. -Also, added -normalize-space() call to processing of each -term. -This change affects all output formats -(HTML, PDF, manpages). The default behavior should pretty much -remain the same as before, but it is possible (as always) that -the change may introduce some -new bugginess. -Modified: fo/lists.xsl,1.62; fo/param.ent,1.88; -fo/param.xweb,1.99; html/lists.xsl,1.48; html/param.ent,1.86; -html/param.xweb,1.93; manpages/lists.xsl,1.22; -manpages/param.ent,1.14; manpages/param.xweb,1.16; -params/variablelist.term.break.after.xml,1.1; -params/variablelist.term.separator.xml,1.1 - Michael(tm) -Smith - - -Convert 'no' to string in default -value. -Modified: params/olink.doctitle.xml,1.4 - Robert -Stayton - - -Implemented RFE -#1292615. -Added bunch of new parameters (attribute sets) -that affect list presentation: list.block.properties, -itemizedlist.properties, orderedlist.properties, -itemizedlist.label.properties and -orderedlist.label.properties. Default behaviour -of stylesheets has not been changed but further customizations will be -much more easier. -Modified: fo/lists.xsl,1.61; fo/param.ent,1.87; -fo/param.xweb,1.98; params/itemizedlist.label.properties.xml,1.1; -params/itemizedlist.properties.xml,1.1; -params/list.block.properties.xml,1.1; -params/orderedlist.label.properties.xml,1.1; -params/orderedlist.properties.xml,1.1 - Jirka -Kosek - - -Implemented RFE -#1242092. -You can enable crop marks in your document by -setting crop.marks=1 and xep.extensions=1. Appearance of crop -marks can be controlled by parameters -crop.mark.bleed (6pt), -crop.mark.offset (24pt) and -crop.mark.width (0.5pt). -Also there -is new named template called user-xep-pis. You can overwrite it in -order to produce some PIs that can control XEP as described in -http://www.renderx.com/reference.html#Output_Formats -Modified: fo/docbook.xsl,1.36; -fo/param.ent,1.86; fo/param.xweb,1.97; fo/xep.xsl,1.23; -params/crop.mark.bleed.xml,1.1; params/crop.mark.offset.xml,1.1; -params/crop.mark.width.xml,1.1; params/crop.marks.xml,1.1 - Jirka -Kosek - - -Changed short descriptions in doc -for *autolabel* params to match new autolabel -behavior. -Modified: params/appendix.autolabel.xml,1.5; -params/chapter.autolabel.xml,1.4; params/part.autolabel.xml,1.5; -params/preface.autolabel.xml,1.4 - Michael(tm) -Smith - - - - - -Profiling -The following changes have been made to the - profiling code - since the 1.69.1 release. - - -Profiling now works together with -namespace stripping (V5 documents). Namespace striping should work -with all stylesheets named profile-, even if they are not supporting -namespace stripping in a non-profiling -variant. -Modified: profiling/profile-mode.xsl,1.4; -profiling/xsl2profile.xsl,1.7 - Jirka Kosek - - -Moved profiling stage out of -templates. This make possible to reuse profiled content by several -templates and still maintaing node indentity (needed for example for -HTML Help where content is processed multiple times). -I -don't know why this was not on the top level before. Maybe some XSLT -processors choked on it. I hope this will be OK -now. -Modified: profiling/xsl2profile.xsl,1.5 - Jirka -Kosek - - - - - -Tools -The following changes have been made to the - tools code - since the 1.69.1 release. - - -Moved Makefile.DocBook from -contrib module to xsl -module. -Modified: tools/make/Makefile.DocBook,1.1 - Michael(tm) -Smith - - - - - -WordML -The following changes have been made to the - wordml code - since the 1.69.1 release. - - -added contrib element, -better handling of default paragraph -style -Modified: wordml/pages-normalise.xsl,1.6; wordml/supported.xml,1.2; -wordml/wordml-final.xsl,1.14 - Steve Ball - - -added -bridgehead -Modified: wordml/docbook-pages.xsl,1.6; -wordml/docbook.xsl,1.17; wordml/pages-normalise.xsl,1.5; -wordml/template-pages.xml,1.7; wordml/template.dot,1.4; -wordml/template.xml,1.14; wordml/wordml-final.xsl,1.13 - Steve -Ball - - -added blocks stylesheet to support -bibliographies, glossaries and qandasets -Modified: wordml/Makefile,1.4; -wordml/README,1.3; wordml/blocks-spec.xml,1.1; -wordml/docbook-pages.xsl,1.5; wordml/docbook.xsl,1.16; -wordml/pages-normalise.xsl,1.4; wordml/sections-spec.xml,1.3; -wordml/specifications.xml,1.13; wordml/template-pages.xml,1.6; -wordml/template.dot,1.3; wordml/template.xml,1.13; -wordml/wordml-blocks.xsl,1.1; wordml/wordml-final.xsl,1.12; -wordml/wordml-sections.xsl,1.3 - Steve Ball - - -added mediaobject -caption -Modified: wordml/docbook-pages.xsl,1.4; -wordml/docbook.xsl,1.15; wordml/specifications.xml,1.12; -wordml/template-pages.xml,1.5; wordml/template.dot,1.2; -wordml/template.xml,1.12; wordml/wordml-final.xsl,1.11 - Steve -Ball - - -added -callouts -Modified: wordml/docbook-pages.xsl,1.3; wordml/docbook.xsl,1.14; -wordml/pages-normalise.xsl,1.3; wordml/specifications.xml,1.11; -wordml/template-pages.xml,1.4; wordml/wordml-final.xsl,1.10 - Steve -Ball - - -added Word template -file -Modified: wordml/template.dot,1.1 - Steve Ball - - -added abstract, fixed -itemizedlist, ulink -Modified: wordml/specifications.xml,1.10; -wordml/wordml-final.xsl,1.9 - Steve Ball - - -fixed Makefile added many -features to Pages support added revhistory, inlines, -highlights, abstract -Modified: wordml/Makefile,1.2; -wordml/docbook-pages.xsl,1.2; wordml/pages-normalise.xsl,1.2; -wordml/sections-spec.xml,1.2; wordml/specifications.xml,1.9; -wordml/template-pages.xml,1.3; wordml/template.xml,1.11; -wordml/wordml-final.xsl,1.8; wordml/wordml-sections.xsl,1.2 - Steve -Ball - - -fixed handling linebreaks when -generating WordML added Apple Pages -support -Modified: wordml/docbook.xsl,1.13; wordml/template-pages.xml,1.2 - -Steve Ball - - - - - - - Release 1.69.1 - This release is a minor bug-fix update to the 1.69.0 - release. Along with bug fixes, it includes one - configuration-parameter change: The default value of the - annotation.support parameter is now - 0 (off). The reason for that change is that - there have been reports that annotation handling is - causing a significant performance degradation in processing of - large documents with xsltproc. - - - - - Release 1.69.0 - The release includes major feature changes, - particularly in the manpages - stylesheets, as well as a large number of bug fixes. - - As with all DocBook Project dot zero releases, this is an - experimental release . - - - Common - - - This release adds localizations for the following - languages: - - - Albanian - Amharic - Azerbaijani - Hindi - Irish (Gaelic) - Gujarati - Kannada - Mongolian - Oriya - Punjabi - Tagalog - Tamil - Welsh - . - - - Added support for specifying number format for auto - labels for chapter, appendix, - part, and preface. Contolled with the - appendix.autolabel, - chapter.autolabel, - part.autolabel, and - preface.autolabel parameters. - - - Added basic support for biblioref cross - referencing. - - - Added support for align - on caption in mediaobject. - - - Added support for processing documents that use the - DocBook V5 namespace. - - - Added support for termdef and - mathphrase. - - - EXPERIMENTAL: Incorporated the Slides and Website - stylesheets into the DocBook XSL stylesheets package. So, - for example, Website documents can now be processed using - the following URI for the driver Website - tabular.xsl file: http://docbook.sourceforge.net/release/xsl/current/website/tabular.xsl - - - A procedure without a title is - now treated as an informal procedure (meaning - that it is not added to any generated list of - procedures and has no affect on numbering of - generated labels for other procedures). - - - docname is no longer added to - olink when pointing to a root element. - - - - Added support for generation of choice separator in - inline simplelist. This enables auto-generation of an - appropriate localized choice separator (for - example, and or or) before the - final item in an inline simplelist. - To indicate that you want a choice separator - generated for a particular list, you need to put a processing - instruction (PI) of the form - dbchoice choice="foo" as a - child of the list. For example: - <para>Choose from - ONE and ONLY ONE of the following: - <simplelist type="inline"> - <?dbchoice choice="or" ?> - <member>A</member> - <member>B</member> - <member>C</member>.</simplelist></para> - - Output (for English): -
    - Choose from ONE and only ONE of the - following choices: A, B, or C. -
    - As a temporary workaround for the fact that most of the - DocBook non-English locale files don't have a localization for - the word or, you can put in a literal string to - be used; example for French: dbchoice choice="ou". That is, use - ou instead of or.
    -
    -
    -
    - - FO - - - Added content-type property to - external-graphic element, based on - imagedata format - attribute. - - - Added support for generating - <rx:meta-field creator="$VERSION"/> - field for XEP output. This makes the DocBook XSL - stylesheet version information available through the - Document Properties menu in Acrobat - Reader and other PDF viewers. - - - Trademark symbol handling made consistent with - handling of same in HTML stylesheets. Prior to this change, - if you processed a document that contained no value for the - class attribute on the - trademark element, the HTML stylesheets would - default to rendering a superscript TM - symbol after the trademark contents, - but the FO stylesheets would render nothing. - - - Added support for generating XEP bookmarks for - refentry. - - - Added support for HTML markup table border attribute, applied to each - table cell. - - - The table.width template can now - sum column specs if none use % or - *. - - - Added fox:destination extension - inside fox:outline to support linking to - internal destinations. - - - Added support for customizing - abstract with property sets. Controlled - with the abstract.properties and - abstract.title.properties - parameters. - - - Add footnotes in table title to - table footnote set, and add support for table footnotes to - HTML table markup. - - - Added support for title in - glosslist. - - - Added support for itemizedlist symbol - none. - - - Implemented the new - graphical.admonition.properties and - nongraphical.admonition.properties - attribute sets. - - - Added id to - formalpara and some other blocks that were - missing it. - - - Changed the anchor template to output - fo:inline instead of - fo:wrapper. - - - Added support for toc.max.depth - parameter. - - - - - - Help - - - Eclipse Help: Added support for generating olink - database. - - - - - - HTML - - - Added a first cut at support in HTML output for - DocBook 5 style annotations. Controlled using the - annotation.support parameter, and - implemented using JavaScript and CSS styling. For more - details, see the documentation for the - annotation.js, - annotation.css, - annotation.graphic.open, and - annotation.graphic.close - parameters. - - - Generate client-side image map for - imageobjectco with areas using - calspair units - - - Added support for img.src.path PI. - - - Added support for passing - img.src.path to DocBook Java XSLT - image extensions when appropriate. Controlled using the - graphicsize.use.img.src.path - parameter. - - - Added support for (not - valid for DocBook 4) xlink:href - on area and (not valid for DocBook 4) - alt in area. - - - Added new parameter - default.table.frame to control table - framing if there is no frame - attribute on a table. - - - Added initial, experimental support for generating - content for the HTML title attribute from - content of the alt element. This change adds - support for the following inline elements only (none of them - are block elements): - - - abbrev - accel - acronym - action - application - authorinitials - beginpage - citation - citerefentry - citetitle - city - classname - code - command - computeroutput - constant - country - database - email - envar - errorcode - errorname - errortext - errortype - exceptionname - fax - filename - firstname - firstterm - foreignphrase - function - glossterm - guibutton - guiicon - guilabel - guimenu - guimenuitem - guisubmenu - hardware - honorific - interface - interfacename - keycap - keycode - keysym - lineage - lineannotation - literal - markup - medialabel - methodname - mousebutton - option - optional - otheraddr - othername - package - parameter - personname - phone - pob - postcode - productname - productnumber - prompt - property - quote - refentrytitle - remark - replaceable - returnvalue - tag - shortcut - state - street - structfield - structname - subscript - superscript - surname - symbol - systemitem - tag - termdef - token - trademark - type - uri - userinput - varname - wordasword - - - - - Added support for chunking revhistory into - separate file (similar to the support for doing same with - legalnotice). Patch from Thomas - Schraitle. Controlled through new - generate.revhistory.link parameter. - - - l10n.xsl: Made language codes RFC compliant. Added a - new boolean config parameter, - l10n.lang.value.rfc.compliant. If it - is non-zero (the default), any underscore in a language code - will be converted to a hyphen in HTML output. If it is zero, - the language code will be left as-is. - - - - - man - This release closes out 44 manpages stylesheet bug reports - and feature requests. It adds more than 35 new configuration - parameters for controlling aspects of man-page output -- - including hyphenation and justification, handling of links, - conversion of Unicode characters, and contents of man-page - headers and footers. - - - - New options for globally disabling/enabling - hyphenation and justification: - man.justify and - man.hyphenate. - Note that the default - for the both of those is zero (off), because justified text - looks good only when it is also hyphenated; to quote the - Hyphenation node from the groff info page: -
    - Since the odds are not great for finding a - set of words, for every output line, which fit nicely on a - line without inserting excessive amounts of space between - words, `gtroff' hyphenates words so that it can justify - lines without inserting too much space between - words. -
    - The problem is that groff can end up hyphenating a lot of - things that you don't want hyphenated (variable names and - command names, for example). Keeping both justification and - hyphenation disabled ensures that hyphens won't get inserted - where you don't want to them, and you don't end up with - lines containing excessive amounts of space between - words. These default settings run counter to how most - existing man pages are formatted. But there are some notable - exceptions, such as the perl man pages.
    -
    - - Added parameters for controlling hyphenation of - computer inlines, filenames, and URLs. By default, even when - hyphenation is enabled (globally), hyphenation is now - suppressed for "computer inlines" (currently, just - classname, constant, envar, - errorcode, option, - replaceable, userinput, - type, and varname, and for - filenames, and for URLs from link. It - can be (re)enabled using the - man.hyphenate.computer.inlines, - man.hyphenate.filenames, and - man.hyphenate.urls parameters. - - - - Implemented a new system for replacing Unicode - characters. There are two parts to the new system: a - string substitution map for doing - essential replacements, and a - character map that can optionally be disabled - and enabled. - The new system fixes all open bugs that had to do with - literal Unicode numbered entities such as &#8220; and - &#8221; showing up in output, and greatly expands the - ability of the stylesheets to generate good roff - equivalents for Unicode symbols and special - characters. - Here are some details... - The previous manpages mechanism for replacing Unicode - symbols and special characters with roff equivalents (the - replace-entities template) was not - scalable and not complete. The mechanism handled a somewhat - arbitrary selection of less than 20 or so Unicode - characters. But there are potentially more than - 800 Unicode special characters that - have some groff equivalent they can be mapped to. And there - are about 34 symbols in the Latin-1 (ISO-8859-1) block - alone. Users might reasonably expect that if they include - any of those Latin-1 characters in their DocBook source - documents, they will get correctly converted to known roff - equivalents in output. - In addition to those common symbols, certain users may - have a need to use symbols from other Unicode blocks. Say, - somebody who is documenting an application related to math - might need to use a bunch of symbols from the - Mathematical Operators Unicode block (there - are about 65 characters in that block that have reasonable - roff equivalents). Or somebody else might really like - Dingbats -- such as the checkmark character -- and so might - use a bunch of things from the Dingbat block - (141 characters in that that have roff equivalents or that - can at least be degraded somewhat gracefully - into roff). - So, the old replace-entities - mechanism was replaced with a completely different mechanism - that is based on use of two maps: a - substitution map and a character - map (the latter in a format compliant with the XSLT - 2.0 spec and therefore completely forward - compatible with XSLT 2.0). - The substitution map is controlled through the - man.string.subst.map parameter, and - is used to replace things like the backslash character - (which needs special handling to prevent it from being - interpreted as a roff escape). The substitution map cannot - be disabled, because disabling it will cause the output to - be broken. However, you can add to it and change it if - needed. - - The character map mechanism, on the - other hand, can be completely disabled. It is enabled by - default, and, by default, does replacement of all Latin-1 - symbols, along with most special spaces, dashes, and quotes - (about 75 characters by default). Also, you can optionally - enable a full character map that provides - support for converting all 800 or so of the characters that - have some reasonable groff equivalent. - - The character-map mechanism is controlled through the - following parameters: - - - man.charmap.enabled - turns character-map support - on/off - - - man.charmap.use.subset - specifies that a subset of the character - map is used instead of the full map - - - man.charmap.subset.profile - specifies profile of character-map - subset - - - man.charmap.uri - specifies an alternate character map to - use instead of the standard character map - provided in the distribution - - - - - - - Implemented out-of-line handling of display of URLs - for links (currently, only for ulink). This gives - you three choices for handling of links: - - - Number and list links. Each link is numbered - inline, with a number in square brackets preceding the - link contents, and a numbered list of all links is added - to the end of the document. - - - Only list links. Links are not numbered, but an - (unnumbered) list of links is added to the end of the - document. - - - Suppress links. Don't number links and don't add - any list of links to the end of the document. - - - You can also choose whether links should be underlined. The - default is the works -- list, number, and - underline links. You can use the - man.links.list.enabled, - man.links.are.numbered, and - man.links.are.underlined parameters - to change the defaults. The default heading for the link - list is REFERENCES. You can be change that using the - man.links.list.heading - parameter. - - - Changed default output encoding to UTF-8. This does not mean that man pages are output in - raw UTF-8, because the character map is applied - before final output, causing all UTF-8 characters covered in - the map to be converted to roff equivalents. - - - - Added support for processing refsect3 and - formalpara and nested refsection - elements, down to any arbitrary level of nesting. - - - - Output of the NAME and - SYNOPSIS and AUTHOR - headings and the headings for admonitions (note, - caution, etc.) are no longer hard-coded for - English. Instead, headings are generated for those in the - correct locale (just as the FO and HTML stylesheets - do). - - - - Re-worked mechanism for assembling page - headers/footers (the contents of the .TH - macro title line). - - Here are some details... - - All man pages contain a .TH roff - macro whose contents are used for rendering the title - line displayed in the header and footer of each - page. Here are a couple of examples of real-world man pages - that have useful page headers/footers: - gtk-options(7) GTK+ User's Manual gtk-options(7) <-- header - GTK+ 1.2 2003-10-20 gtk-options(7) <-- footer - - svgalib(7) Svgalib User Manual svgalib(7) <-- header - Svgalib 1.4.1 16 December 1999 svgalib(7) <-- footer - - And here are the terms with which the - groff_man(7) man page refers to the - various parts of the header/footer: - title(section) extra3 title(section) <- header - extra2 extra1 title(section) <- footer - Or, using the names with which the man(7) - man page refers to those same fields: - title(section) manual title(section) <- page header - source date title(section) <- page footer - - The easiest way to control the contents of those - fields is to mark up your refentry content like - the following (note that this is a minimal - example). - <refentry> - <info> - <date>2003-10-20</date> - </info> - <refmeta> - <refentrytitle>gtk-options</refentrytitle> - <manvolnum>7</manvolnum> - <refmiscinfo class="source-name">GTK+</refmiscinfo> - <refmiscinfo class="version">1.2</refmiscinfo> - <refmiscinfo class="manual">GTK+ User's Manual</refmiscinfo> - </refmeta> - <refnamediv> - <refname>gtk-options</refname> - <refpurpose>Standard Command Line Options for GTK+ Programs</refpurpose> - </refnamediv> - <refsect1> - <title>Description</title> - <para>This manual page describes the command line options, which - are common to all GTK+ based applications.</para> - </refsect1> - </refentry> - - - Sets the date part of the header/footer. - - - Sets the title part. - - - Sets the section part. - - - Sets the source name part. - - - Sets the version part. - - - Sets the manual part. - - - - Below are explanations of the steps the stylesheets - take to attempt to assemble and display - good headers and footer. [In the - descriptions, note that *info - is the refentry info child - (whatever its name), and - parentinfo is the - info child of its parent (again, whatever - its name).] - - - extra1 field (date) - - Content of the extra1 field is - what shows up in the center - footer position of each page. The - man(7) man page describes it as - the date of the last revision. - To provide this content, if the - refentry.date.profile.enabled - is non-zero, the stylesheets check the value of - refentry.date.profile. - Otherwise, by default, they check for a - date or pubdate not only in the - *info contents, but also in - the parentinfo - contents. - If a date cannot be found, the stylesheets now - automatically generate a localized long - format date, ensuring that this field always - has content in output. - However, if for some reason you want to suppress - this field, you can do so by setting a non-zero value - for man.th.extra1.suppress. - - - - extra2 field (source) - - On Linux systems and on systems with a modern - groff, the content of the extra2 field - are what shows up in the left - footer position of each page. - - The man(7) man page describes - this as the source of the command, and - provides the following examples: - - - For binaries, use somwething like: GNU, - NET-2, SLS Distribution, MCC Distribution. - - - For system calls, use the version of the - kernel that you are currently looking at: Linux - 0.99.11. - - - For library calls, use the source of the - function: GNU, BSD 4.3, Linux DLL 4.4.1. - - - - - In practice, there are many pages that simply - have a version number in the source - field. So, it looks like what we have is a two-part - field, - Name Version, - where: - - - Name - - product name (e.g., BSD) or org. name - (e.g., GNU) - - - - Version - - version name - - - - Each part is optional. If the - Name is a product name, - then the Version is - probably the version of the product. Or there may be - no Name, in which case, if - there is a Version, it is - probably the version of the item itself, not the - product it is part of. Or, if the - Name is an organization - name, then there probably will be no - Version. - - To provide this content, if the - refentry.source.name.profile.enabled - and - refentry.version.profile.enabled - parameter are non-zero, the stylesheets check the - value of refentry.source.name.profile - refentry.version.profile. - - Otherwise, by default, they check the following - places, in the following order: - - - *info/productnumber - - - *info/productnumber - - - refmeta/refmiscinfo[@class = 'version'] - - - parentinfo/productnumber - - - *info/productname - - - parentinfo/productname - - - refmeta/refmiscinfo - - - [nothing found, so leave it empty] - - - - - - - extra3 field - - On Linux systems and on systems with a modern - groff, the content of the extra3 field - are what shows up in the center - header position of each page. Some man - pages have extra2 content, some - don't. If a particular man page has it, it is most - often context data about some larger - system the documented item belongs to (for example, - the name or description of a group of related - applications). The stylesheets now check the following - places, in the following order, to look for content to - add to the extra3 field. - - - parentinfo/title - - - parent's title - - - refmeta/refmiscinfo - - - [nothing found, so leave it empty] - - - - - - - - - - Reworked *info gathering. For - each refentry found, the stylesheets now cache its - *info content, then check for any - valid parent of it that might have metainfo content and cache - that, if found; they then then do all further matches against - those node-sets (rather than re-selecting the original - *info nodes each time they are - needed). - - - - New option for breaking strings after forward - slashes. This enables long URLs and pathnames to be broken - across lines. Controlled through - man.break.after.slash parameter. - - - - Output for servicemark and trademark are now - (SM) and (TM). There is - a groff "\(tm" escape, but output from that - is not acceptable. - - - - New option for controlling the length of the title - part of the .TH title line. Controlled - through the man.th.title.max.length - parameter. - - - - New option for specifying output encoding of each man - page; controlled with - man.output.encoding (similar to the - HTML chunker.output.encoding - parameter). - - - - New option for suppressing filename messages when - generating output; controlled with - man.output.quietly (similar to the HTML - chunk.quietly parameter). - - - - The text of cross-references to first-level - refentry (refsect1, top-level - refsection, refnamediv, and - refsynopsisdiv) are now capitalized. - - - - Cross-references to refnamediv now use the - localized NAME title instead of using the - first refname child. This makes the output - inconsistent with HTML and FO output, but for man-page output, - it seems to make better sense to have the - NAME. (It may actually make better sense to - do it that way in HTML and FO output as well...) - - - - Added support for processing funcparams. - - - - Removed the space that was being output between - funcdef and paramdef; example: was: - float rand (void); now: - float rand(void) - - - - Turned off bold formatting for the type - element when it occurs within a funcdef or - paramdef - - - - Corrected rendering of simplelist. Any - <simplelist type="inline" instance - is now rendered as a comma-separated list (also with an - optional localized and or or before the last item -- see - description elsewhere in these release notes). Any simplelist - instance whose type is not - inline is rendered as a one-column vertical - list (ignoring the values of the type and columns attributes if present) - - - - Comment added at top of roff source for each page now - includes DocBook XSL stylesheets version number (as in the - HTML stylesheets) - - - - Made change to prevent sticky fonts - changes. Now, when the manpages stylesheets encounter node - sets that need to be boldfaced or italicized, they put the - \fBfoo\fR and \fIbar\fR - groff bold/italic instructions separately around each node in - the set. - - - synop.xsl: Boldface everything in - funcsynopsis output except parameters (which are in - ital). The man(7) man page says: -
    - For functions, the arguments are always specified - using italics, even in the SYNOPSIS section, where the rest - of the function is specified in bold. -
    - A look through the contents of the - man/man2 directory shows that most - (all) existing pages do follow this everything in - funcsynopsis bold rule. That means the - type content and any punctuation (parens, - semicolons, varargs) also must be bolded.
    -
    - - - Removed code for adding backslashes before periods/dots - in roff source, because backslashes in front of periods/dots - in roff source are needed only in the very rare case where a - period is the very first character in a line, without any - space in front of it. A better way to deal with that rare case - is for you to add a zero-width space in front of the offending - dot(s) in your source - - - - Removed special handling of the quote - element. That was hard-coded to cause anything marked up with - the quote element to be output preceded by two - backticks and followed by two apostrophes -- that is, that - old-school kludge for generating curly quotes in Emacs and - in X-Windows fonts. While Emacs still seems to support that, I - don't think X-Windows has for a long time now. And, anyway, it - looks (and has always looked) like crap when viewed on a - normal tty/console. In addition, it breaks localiztion of - quote. By default, quote content is - output with localized quotation marks, which, depending on the - locale, may or may not be left and right double quotation - marks. - - - - Changed mappings for left and right single quotation - marks. Those had previously been incorrectly mapped to the - backtick (&#96;) and apostrophe (&39;) characters (for - kludgy reasons -- see above). They are now correctly mapped to - the \(oq and \(cq roff - escapes. If you want the old (broken) behavior, you need to - manually change the mappings for those in the value of the - man.string.subst.map parameter. - - - Removed xref.xsl file. Now, of the - various cross-reference elements, only the ulink - element is handled differently; the rest are handled exactly - as the HTML stylesheets handle them, except that no hypertext - links are generated. (Because there is no equivalent hypertext - mechanism is man pages.) - - - - New option for making subheading dividers in generated - roff source. The dividers are not visible in the rendered man - page; they are just there to make the source - readable. Controlled using - man.subheading.divider. - - - - Fixed many places where too much space was being added - between lines. - -
    - -
    -
    - - - - Release 1.68.1 - The release adds localization support for Farsi (thanks to - Sina Heshmati) and improved support for the XLink-based DocBook NG - db:link element. Other than that, it is a minor - bug-fix update to the 1.68.0 release. The main thing it fixes is a - build error that caused the XSLT Java extensions to be jarred up - with the wrong package structure. Thanks to Jens Stavnstrup for - quickly reporting the problem, and to Mauritz Jeanson for - investigating and finding the cause. - - - - - Release 1.68.0 - This release includes some features changes, particularly - for FO/PDF output, and a number of bug fixes. - - FO - - Moved footnote properties to attribute-sets. - - - Added support for side floats, margin notes, and - custom floats. - - - Added new parameters - body.start.indent and - body.end.indent to the - set.flow.properties template. - - - Added support for xml:id - - - Added support for - refdescriptor. - - - Added support for multiple refnamedivs. - - - Added index.entry.properties - attribute-set to support customization of index - entries. - - - Added set.flow.properties - template call to each fo:flow - to support customizations entry point. - - - Add support for @floatstyle in - figure - - - Moved hardcoded properties for index division titles - to the index.div.title.properties - attribute-set. - - - Added support for - table-layout="auto" for XEP. - - - Added index.div.title.properties - attribute-set. - - - $verbose parameter is now - passed to most elements. - - - Added refentry to - toc in part, as it is - permitted by the DocBook schema/DTD. - - - Added backmatter elements and - article to toc in - part, since they are permitted by the - DocBook schema/DTD. - - - Added mode="toc" for - simplesect, since it is now permitted in - the toc if - simplesect.in.toc is set. - - - Moved hard-coded properties to - nongraphical.admonintion.properties - and graphical.admonition.properties - attribute sets. - - - Added support for sidebar-width and - float-type processing instructions in - sidebar. - - - For tables with HTML markup elements, added support - for dbfo bgcolor PI, the attribute-sets - named table.properties, - informaltable.properties, - table.table.properties, and - table.cell.padding. Also added - support for the templates named - table.cell.properties and - table.cell.block.properties so that - tabstyles can be implemented. Also added support for tables - containing only tr instead of - tbody with tr. - - - Added new paramater - hyphenate.verbatim.characters which - can specify characters after which a line break can occur in - verbatim environments. This parameter can be used to extend - the initial set of characters which contain only space and - non-breakable space. - - - Added itemizedlist.label.markup to enable - selection of different bullet symbol. Also added several - potential bullet characters, commented out by default. - - - Enabled all id's in XEP output for external olinking. - - - - - HTML - - Added support for - refdescriptor. - - - Added support for multiple refnamedivs. - - - Added support for xml:id - - - refsynopsisdiv as a section for - counting section levels - - - - Images - - Added new SVG admonition graphics and navigation images. - - - - - - - - Release 1.67.2 - This release fixes a table bug introduced in the 1.67.1 - release. - - - Release 1.67.1 - This release includes a number of bug fixes. - The following lists provide details about API and feature changes. - - FO - - Tables: Inherited cell properties are now passed to the - table.cell.properties template so they can - be overridden by a customization. - - - Tables: Added support for bgcolor PI on table row - element. - - - TOCs: Added new parameter - simplesect.in.toc; default value of - 0 causes simplesect to be omitted from TOCs; to - cause simplesect to be included in TOCs, you - must set the value of simplesect.in.toc to - 1.Comment from Norm: - -
    - Simplesect elements aren't supposed to - appear in the ToC at all... The use case for simplesect - is when, for example, every chapter in a book ends with - "Exercises" or "For More Information" sections and you - don't want those to appear in the ToC. -
    -
    -
    - - Sections: Reverted change that caused a variable reference - to be used in a template match and rewrote code to preserve - intended semantics. - - - Lists: Added workaround to prevent "* 0.60 + 1em" garbage in - list output from PassiveTeX - - - Moved the literal attributes from - component.title to the - component.title.properties attribute-set so - they can be customized. - - - Lists: Added glossdef's first - para to special handling in - fo:list-item-body. - -
    - - - HTML - - TOCs: Added new parameter - simplesect.in.toc; for details, see - the list of changes for this - release. - - - Indexing: Added new parameter - index.prefer.titleabbrev; when set to - 1, index references will use - titleabbrev instead of - title when available. - - - - HTML Help - - Added support for generating windows-1252-encoded - output using Saxon; for more details, see the list of changes for this release. - - - - man pages - - Replaced named/numeric character-entity references for - non-breaking space with groff equivalent (backslash-tilde). - - - - XSL Java extensions - - Saxon extensions: Added the - Windows1252 class. It extends Saxon - 6.5.x with the windows-1252 character set, which is - particularly useful when generating HTML Help for Western - European Languages (code from - Pontus - Haglund and contributed to the - DocBook community by Sectra AB, Sweden). - To use: - - - Make sure that the Saxon 6.5.x jar file and the jar file for - the DocBook XSL Java extensions are in your CLASSPATH - - - Create a DocBook XSL customization layer -- a file named - mystylesheet.xsl or whatever -- that, at a - minimum, contains the following: - <xsl:stylesheet - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version='1.0'> - <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl"/> - <xsl:output method="html" encoding="WINDOWS-1252" indent="no"/> - <xsl:param name="htmlhelp.encoding" select="'WINDOWS-1252'"></xsl:param> - <xsl:param name="chunker.output.encoding" select="'WINDOWS-1252'"></xsl:param> - <xsl:param name="saxon.character.representation" select="'native'"></xsl:param> - </xsl:stylesheet> - - Invoke Saxon with the - encoding.windows-1252 Java system property set - to com.nwalsh.saxon.Windows1252; for example - java \ - -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \ - com.icl.saxon.StyleSheet \ - mydoc.xml mystylesheet.xsl - - Or, for a more complete "real world" case showing other - options you'll typically want to use: - java \ - -Dencoding.windows-1252=com.nwalsh.saxon.Windows1252 \ - -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \ - -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \ - -Djavax.xml.transform.TransformerFactory=com.icl.saxon.TransformerFactoryImpl \ - com.icl.saxon.StyleSheet \ - -x org.apache.xml.resolver.tools.ResolvingXMLReader \ - -y org.apache.xml.resolver.tools.ResolvingXMLReader \ - -r org.apache.xml.resolver.tools.CatalogResolver \ - mydoc.xml mystylesheet.xsl - - In both cases, the "mystylesheet.xsl" file should be a - DocBook customization layer containing the parameters - show in step 2. - - - - - - Saxon extensions: Removed Saxon 8 extensions from release package - - -
    -
    - - Release 1.67.0 - - - A number of important bug fixes. - - - Added Saxon8 extensions - - - Enabled dbfo table-width on - entrytbl in FO output - - - Added support for role=strong on - emphasis in FO output - - - Added new FO parameter - hyphenate.verbatim that can be used to turn - on "intelligent" wrapping of verbatim environments. - - - Replaced all <tt></tt> output with - <code></code> - - - Changed admon.graphic.width template to a - mode so that different admonitions can have different graphical - widths. - - - Deprecated the HTML shade.verbatim - parameter (use CSS instead) - - - Wrapped ToC - refentrytitle/refname and - refpurpose in span with class values. This - makes it possible to style them using a CSS stylesheet. - - - Use strong/em instead of - b/i in HTML output - - - Added support for converting Emphasis to - groff italic and Emphasis role='bold' to - bold. Controlled by - emphasis.propagates.style param, but not - documented yet using litprog system. Will do that next (planning - to add some other parameter-controllable options for hyphenation - and handling of line spacing). - - - callout.graphics.number.limit.xml - param: Changed the default from 10 to - 15. - - - verbatim.properties: Added - hyphenate=false - - - Saxon and Xalan Text.java extensions: Added support for - URIResolver() on insertfile href's - - - Added generated RELEASE-NOTES.txt - file. - - - Added INSTALL file (executable file for - generating catalog.xml) - - - Removed obsolete tools directory from - package - - - - -Release 1.66.1 - - -A number of important bug fixes. - - - - -Now xml:base attributes that are generated by an -XInclude processor are resolved for image files. - - - - -Rewrote olink templates to support several new features. - - - - -Extended full olink support to FO output. - - - - -Add support for xrefstyle attribute in olinks. - - - - -New parameters to support new olink features: -insert.olink.page.number, insert.olink.pdf.frag, -olink.debug, olink.lang.fallback.sequence, olink.properties, -prefer.internal.olink. -See the reference page for each parameter for more -information. - - - - - -Added index.on.type parameter for new type -attribute introduced in DocBook 4.3 for indexterms and index. -This allows you to create multiple indices containing -different categories of entries. -For users of 4.2 and earlier, you can use the new parameter index.on.role -instead. - - - - -Added new -section.autolabel.max.depth parameter to turn off section numbering -below a certain depth. -This permits you to number major section levels and leave minor -section levels unnumbered. - - - -Added footnote.sep.leader.properties attribute set to format -the line separating footnotes in printed output. - - - - -Added parameter img.src.path as a prefix to HTML img src -attributes. -The prefix is added to whatever path is already generated by the -stylesheet for each image file. - - - -Added new attribute-sets -informalequation.properties, -informalexample.properties, -informalfigure.properties, and informaltable.properties, -so each such element type can be formatted -individually if needed. - - - - -Add component.label.includes.part.label -parameter to add any part number to chapter, appendix -and other component labels when -the label.from.part parameter is nonzero. -This permits you to distinguish multiple chapters with the same -chapter number in cross references and the TOC. - - - -Added chunk.separate.lots parameter for HTML output. -This parameter lets you generate separate chunk files for each LOT -(list of tables, list of figures, etc.). - - -Added several table features: - - - -Added table.table.properties attribute set to add -properties to the fo:table element. - - - - -Added placeholder templates named table.cell.properties -and table.cell.block.properties to enable adding properties -to any fo:table-cell or the cell's fo:block, respectively. - These templates are a start for implementing table styles. - - - - - -Added new attribute -set component.title.properties for easy modifications of -component's title formatting in FO output. - - - - -Added Saxon support for an encoding attribute on the textdata element. Added new parameter -textdata.default.encoding which specifies encoding when -encoding attribute on -textdata is missing. - - - - -Template label.this.section now controls whole -section label, not only sub-label which corresponds to -particular label. Former behaviour was IMHO bug as it was -not usable. - - - - -Formatting in titleabbrev for TOC and headers -is preserved when there are no hotlink elements in the title. Formerly the title showed only the text of the title, no font changes or other markup. - - - - -Added intial.page.number template to set the initial-page-number -property for page sequences in print output. -Customizing this template lets you change when page numbering restarts. This is similar to the format.page.number template that lets you change how the page number formatting changes in the output. - - - - -Added force.page.count template to set the force-page-count -property for page sequences in print output. -This is similar to the format.page.number template. - - - - -Sort language for localized index sorting in autoidx-ng.xsl is now taken from document -lang, not from system environment. - - - - -Numbering and formatting of normal -and ulink footnotes (if turned on) has been unified. -Now ulink footnotes are mixed in with any other footnotes. - - - -Added support for renderas attribute in section and -sect1 et al. -This permits you to render a given section title as if it were a different level. - - - -Added support for label attribute in footnote to manually -supply the footnote mark. - - - - -Added support for DocBook 4.3 corpcredit element. - - - - -Added support for a dbfo keep-together PI for -formal objects (table, figure, example, equation, programlisting). That permits a formal object to be kept together if it is not already, or to be broken if it -is very long and the -default keep-together is not appropriate. - - - - -For graphics files, made file extension matching case -insensitive, and updated the list of graphics extensions. - - - - -Allow calloutlist to have block content before -the first callout - - - - -Added dbfo-need processing instruction to provide -soft page breaks. - - - - -Added implementation of existing but unused -default.image.width parameter for graphics. - - - - -Support DocBook NG tag inline element. - - - - -It appears that XEP now supports Unicode characters in -bookmarks. There is no further need to strip accents from -characters. - - - - -Make segmentedlist HTML markup -more semantic and available to CSS styles. - - - - -Added user.preroot placeholder template to -permit xsl-stylesheet and other PIs and comments to be -output before the HTML root element. - - - - -Non-chunked legalnotice now gets an <a -name="id"> element in HTML output -so it can be referenced with xref or link. - - - - -In chunked HTML output, changed link rel="home" to rel="start", -and link rel="previous" to rel="prev", per W3C HTML 4.01 -spec. - - - - -Added several patches to htmlhelp from W. Borgert - - - - -Added Bosnian locale file as common/bs.xml. - - - - - -Release 1.65.0 - - -A number of important bug fixes. - - - -Added a workaround to allow these stylesheets to process DocBook NG -documents. (It’s a hack that pre-processes the document to strip off the -namespace and then uses exsl:node-set to process -the result.) - - - -Added alternative indexing mechanism which has better -internationalization support. New indexing method allows grouping of -accented letters like e, é, ë into the same group under letter "e". It -can also treat special letters (e.g. "ch") as one character and place -them in the correct position (e.g. between "h" and "i" in Czech -language). -In order to use this mechanism you must create customization -layer which imports some base stylesheet (like -fo/docbook.xsl, -html/chunk.xsl) and then includes appropriate -stylesheet with new indexing code -(fo/autoidx-ng.xsl or -html/autoidx-ng.xsl). For example: -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - -<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/> -<xsl:include href="http://docbook.sourceforge.net/release/xsl/current/fo/autoidx-ng.xsl"/> - -</xsl:stylesheet> -New method is known to work with Saxon and it should also work -with xsltproc 1.1.1 and later. Currently supported languages are -English, Czech, German, French, Spanish and Danish. - - - - -Release 1.64.1 - -General bug fixes and improvements. Sorry about the failure to produce -an updated release notes file for 1.62.0—1.63.2 - -In the course of fixing bug #849787, wrapping Unicode callouts -with an appropriate font change in the Xalan extensions, I discovered -that the Xalan APIs have changed a bit. So xalan2.jar -will work with older Xalan 2 implementations, xalan25.jar -works with Xalan 2.5. - - - - -Release 1.61.0 - -Lots of bug fixes and improvements. - -Initial support for timestamp PI. From now you - can use <?dbtimestamp format="Y-m-d H:M:S"?> to get current - datetime in your document. Added localization support for datetime PI - - - -Added level 6 to test for section depth in -section.level template so that -section.title.level6.properties will be used for sections -that are 6 deep or deeper. This should also cause a h6 to be -created in html output. - - - -Don't use SVG graphics if use.svg=0 - - - -Now uses number-and-title-template for sections - only if section.autolabel is not zero. - - - -Added missing 'english-language-name' attribute to -the l10n element, and the missing 'style' attribute to the -template element so the current gentext documents will -validate. - - - -Corrected several references to parameter - qanda.defaultlabel that were missing the "$". - - - -Now accepts admon.textlabel parameter to turn off - Note, Warning, etc. label. - - - -FeatReq #684561: support more XEP metadata - - - -Added hyphenation support. Added support for coref. -Added beginpage support. (does nothing; see TDG). - - - -Added support for -hyphenation-character, hyphenation-push-character-count, and -hyphenation-remain-character-count - - - -Added root.properties, -ebnf.assignment, -and ebnf.statement.terminator - - - -Support bgcolor PI in table cells; make sure -rowsep and colsep don't have any effect on the last row or -column - - - -Handle othercredit on titlepage a little -better - - - -Applied fix from Jeff Beal that fixed the bug -that put secondary page numbers on primary entries. Same -with tertiary page numbers on secondary entries. - - - -Added definition of missing variable -collection. - - - -Make footnote formatting 'normal' even when it -occurs in a context that has special formatting - - - -Added warning when glossary.collection is not -blank, but it cannot open the specified file. - - - -Pick up the frame attribute on table and -informaltable. - - - -indexdiv/title -in non-autogenerated indexes are -now picked up. - - - -Removed (unused) -component.title.properties - - - -Move IDs from -page-sequences down to titlepage blocks - - - -Use -proportional-column-width(1) on more tables. - -Use proportional-column-width() for -header/footer tables; suppress relative-align when when -using FOP - - - -Check for glossterm.auto.link when linking -firstterms; don't output gl. prefix on glossterm links - - - -Generate Part ToCs - - - -Support glossary, bibliography, -and index in component ToCs. - - - -Refactored chunking code so that -customization of chunk algorithm and chunk elements is more -practical - - - -Support textobject/phrase -on inlinemediaobject. - - - -Support 'start' PI on ordered lists - - - -Fixed test of $toc PI to turn on qandaset TOC. - - - -Added process.chunk.footnotes to sect2 through -5 to fix bug of missing footnotes when chunk level greater -than 1. - - - -Added -paramater toc.max.depth which controls maximal depth of ToC -as requested by PHP-DOC group. - - - -Exempted titleabbrev from preamble processing in -lists, and fixed variablelist preamble code to use the same -syntax as the other lists. - - - -Added support for elements between variablelist -and first varlistentry since DocBook 4.2 supports that now. - - - - - -Release 1.60.1 - -Lots of bug fixes. - -The format of the titlepage.templates.xml files and -the stylesheet that transforms them have been significantly changed. All of the -attributes used to control the templates are now namespace qualified. So what -used to be: -<t:titlepage element="article" wrapper="fo:block"> -is now: -<t:titlepage t:element="article" t:wrapper="fo:block"> -Attributes from other namespaces (including those that are unqualified) are -now copied directly through. In practice, this means that the names that used -to be fo: qualified: -<title named-template="component.title" - param:node="ancestor-or-self::article[1]" - fo:text-align="center" - fo:keep-with-next="always" - fo:font-size="&hsize5;" - fo:font-weight="bold" - fo:font-family="{$title.font.family}"/> -are now unqualified: -<title t:named-template="component.title" - param:node="ancestor-or-self::article[1]" - text-align="center" - keep-with-next="always" - font-size="&hsize5;" - font-weight="bold" - font-family="{$title.font.family}"/> -The t:titlepage and t:titlepage-content -elements both generate wrappers now. And unqualified attributes on those elements -are passed through. This means that you can now make the title font apply to -ane entire titlepage and make the entire recto -titlepage centered by specifying the font and alignment on the those elements: -<t:titlepage t:element="article" t:wrapper="fo:block" - font-family="{$title.font.family}"> - - <t:titlepage-content t:side="recto" - text-align="center"> - - - - - - - -Support use of titleabbrev in running -headers and footers. - - - -Added (experimental) xref.with.number.and.title -parameter to enable number/title cross references even when the -default would -be just the number. - - - -Generate part ToCs if they're requested. - - - -Use proportional-column-width() in header/footer tables. - - - -Handle alignment correctly when screenshot -wraps a graphic in a figure. - - - -Format chapter and appendix -cross references consistently. - - - -Attempt to support tables with multiple tgroups -in FO. - - - -Output fo:table-columns in -simplelist tables. - - - -Use titlepage.templates.xml for -indexdiv and glossdiv formatting. - - - -Improve support for new bibliography elements. - - - -Added -footnote.number.format, -table.footnote.number.format, -footnote.number.symbols, and -table.footnote.number.symbols for better control of -footnote markers. - - - -Added glossentry.show.acronyms. - - - -Suppress the draft-mode page masters when -draft-mode is no. - - - -Make blank pages verso not recto. D'Oh! - - - -Improved formatting of ulink footnotes. - - - -Fixed bugs in graphic width/height calculations. - - - -Added class attributes to inline elements. - - - -Don't add .html to the filenames identified -with the dbhtml PI. - - - -Don't force a ToC when sections contain refentrys. - - - -Make section title sizes a function of the -body.master.size. - - - - - -Release 1.59.2 - -The 1.59.2 fixes an FO bug in the page masters that causes FOP to fail. - - -Removed the region-name from the region-body of blank pages. There's -no reason to give the body of blank pages a unique name and doing so causes -a mismatch that FOP detects. - - - -Output IDs for the first paragraphs in listitems. - - - -Fixed some small bugs in the handling of page numbers in double-sided mode. - - - -Attempt to prevent duplicated IDs from being produced when -endterm on xref points -to something with nested structure. - - - -Fix aligment problems in equations. - - - -Output the type attribute on unordered lists (UL) in HTML only if -the css.decoration parameter is true. - - - -Calculate the font size in formal.title.properties so that it's 1.2 times -the base font size, not a fixed "12pt". - - - - - -Release 1.59.1 - -The 1.59.1 fixes a few bugs. - - -Added Bulgarian localization. - - - -Indexing improvements; localize book indexes to books but allow setindex -to index an entire set. - - - -The default value for rowsep and colsep is now "1" as per CALS. - - - -Added support for titleabbrev (use them for cross -references). - - - -Improvements to mediaobject for selecting print vs. online -images. - - - -Added seperate property sets for figures, -examples, equations, tabless, -and procedures. - - - -Make lineannotations italic. - - - -Support xrefstyle attribute. - - - -Make endterm on -xref higher priority than -xreflabel target. - - - -Glossary formatting improvements. - - - - - -Release 1.58.0 - -The 1.58.0 adds some initial support for extensions in xsltproc, adds -a few features, and fixes bugs. - - -This release contains the first attempt at extension support for xsltproc. -The only extension available to date is the one that adjusts table column widths. -Run extensions/xsltproc/python/xslt.py. - - - -Fixed bugs in calculation of adjusted column widths to correct for rounding -errors. - - - -Support nested refsection elements correctly. - - - -Reworked gentext.template to take context into consideration. -The name of elements in localization files is now an xpath-like context list, not -just a simple name. - - - -Made some improvements to bibliography formatting. - - - -Improved graphical formatting of admonitions. - - - -Added support for entrytbl. - - - -Support spanning index terms. - - - -Support bibliosource. - - - - - -Release 1.57.0 - - -The 1.57.0 release wasn't documented here. Oops. - - - - - -Release 1.56.0 - -The 1.56.0 release fixes bugs. - - -Reworked chunking. This will break all existing customizations -layers that change the chunking algorithm. If you're customizing chunking, -look at the new content parameter that's passed to -process-chunk-element and friends. - - - -Support continued and inherited numeration in orderedlist -formatting for FOs. - - - -Added Thai localization. - - - -Tweaked stylesheet documentation stylesheets to link to TDG and -the parameter references. - - - -Allow title on tables of contents ("Table of Contents") to be optional. -Added new keyword to generate.toc. -Support tables of contents on sections. - - - -Made separate parameters for table borders and table cell borders: -table.frame.border.color, -table.frame.border.style, -table.frame.border.thickness, -table.cell.border.color, -table.cell.border.style, and -table.cell.border.thickness. - - - -Suppress formatting of endofrange indexterms. -This is only half-right. They should generate a range, but I haven't figured out how -to do that yet. - - - -Support revdescription. (Bug #582192) - - - -Added default.float.class and fixed figure -floats. (Bug #497603) - - - -Fixed formatting of sbr in FOs. - - - -Added context to the missing template error message. - - - -Process arg correctly in a group. -(Bug #605150) - - - -Removed 'keep-with-next' from formal.title.properties -attribute set now that the stylesheets support the option of putting -such titles below the object. Now the $placement value determines if -'keep-with-next' or 'keep-with-previous' is used in the title block. - - - -Wrap url() around external-destinations when appropriate. - - - -Fixed typo in compact list spacing. (Bug #615464) - - - -Removed spurious hash in anchor name. (Bug #617717) - - - -Address is now displayed verbatim on title pages. (Bug #618600) - - - -The bridgehead.in.toc parameter is now properly -supported. - - - -Improved effectiveness of HTML cleanup by increasing the number -of places where it is used. Improve use of HTML cleanup in XHTML stylesheets. - - - -Support table of contents for appendix in -article. (Bug #596599) - - - -Don't duplicate footnotes in bibliographys and -glossarys. (Bug #583282) - - - -Added default.image.width. (Bug #516859) - - - -Totally reworked funcsynopsis code; it now -supports a 'tabular' presentation style for 'wide' prototypes; see -funcsynopsis.tabular.threshold. (HTML only -right now, I think, FO support, uh, real soon now.) - - - -Reworked support for difference marking; toned down the colors a bit -and added a system.head.content template so that the diff CSS -wasn't overriding user.head.content. (Bug #610660) - - - -Added call to the *.head.content elements when writing -out long description chunks. - - - -Make sure legalnotice link is correct even when -chunking to a different base.dir. - - - -Use CSS to set viewport characteristics if -css.decoration is non-zero, use div instead of p for making -graphic a block element; make figure titles the -default alt -text for images in a figure. - - -Added space-after to list.block.spacing. - - - -Reworked section.level template to give correct answer -instead of being off by one. - - - -When processing tables, use the tabstyle -attribute as the division class. - - - -Fixed bug in html2xhtml.xsl that was causing the -XHTML chunker to output HTML instead of XHTML. - - - - - - Older releases - To view the release notes for older releases, see http://cvs.sourceforge.net/viewcvs.py/docbook/xsl/RELEASE-NOTES.xml. Be - aware that there were no release notes for releases prior to the - 1.50.0 release. - - - About dot-zero releases - DocBook Project “dot zero†releases should be - considered experimental and are always - followed by stable “dot one plus†releases, usually within - two or three weeks. Please help to ensure the stability of - “dot one plus†releases by carefully testing each - “dot zero†release and reporting back about any - problems you find. - It is not recommended that you use a “dot zero†- release in a production system. Instead, you should wait for - the “dot one†or greater versions. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/TODO b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/TODO deleted file mode 100644 index 1f421cdaf535993640555354ef1094259d43aacf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/TODO +++ /dev/null @@ -1,23 +0,0 @@ -The "to do" list for the DocBook Project XSL stylesheets is -maintained at Sourceforge. To view a list of all open feature -requests for the stylesheets: - - http://docbook.sf.net/tracker/xsl/requests - -To submit a feature request against the stylesheets: - - http://docbook.sf.net/tracker/submit/request - -To do a full-text search of all DocBook Project issues: - - http://docbook.sf.net/tracker/search - -Discussion about the DocBook Project XSL stylesheets takes place -on the docbook-apps mailing list: - - http://wiki.docbook.org/topic/DocBookAppsMailingList - -Real-time discussion takes place on IRC: - - http://wiki.docbook.org/topic/DocBookIrcChannel - irc://irc.freenode.net/docbook diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/VERSION b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/VERSION deleted file mode 100644 index f301744c99f0b95282e3ca11b7e538b37dd1b64f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/VERSION +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - -docbook-xsl-ns -1.76.0 -8900 -$Revision: 8933 $ -$URL: https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl/VERSION $ - - - - - DocBook - XSL-NS Stylesheets - - - 1.76.1 - - - - - - - -* Minor bugfixes - - - - - http://sourceforge.net/projects/docbook/ - http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.tar.gz?download - http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.zip?download - http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.bz2?download - http://sourceforge.net/project/shownotes.php?release_id={SFRELID} - http://docbook.svn.sourceforge.net/viewvc/docbook/ - http://lists.oasis-open.org/archives/docbook-apps/ - This is a release with bugfixes and some enhancements. - - - - - - - - - - - - - - - - - - - - - - - You must specify the sf-relid as a parameter. - - - - - - - - - - - - - - - - - - : - - - - - - - - - : - - - - - - - - - : - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/catalog.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/catalog.xml deleted file mode 100644 index 2b8222e924c9fb0c4f5369547a1e752706fca326..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/catalog.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/addns.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/addns.xsl deleted file mode 100644 index 4625eb4ae3bee188aac47784308b7ddd444de093..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/addns.xsl +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warn - - - no @xml:base - - - cannot add @xml:base to node-set root element - - - - Warn - - - no @xml:base - - - relative paths may not work - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/af.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/af.xml deleted file mode 100644 index 535b612c48b32ce763353f586bc1579b74fd4393..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/af.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/am.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/am.xml deleted file mode 100644 index ddb5035189d342256de8db2059c7bafc69c4eceb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/am.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -áˆáˆáŠ­á‰¶á‰½ -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ar.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ar.xml deleted file mode 100644 index ac55456898aeb4b8f549b80b20fc0d2cb3284968..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ar.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/as.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/as.xml deleted file mode 100644 index 28d0b10cfde881f26c05f1b7326d4a3356abef62..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/as.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -চিহà§à¦¨ -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ast.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ast.xml deleted file mode 100644 index 26a8e186676f24af53ab0b32163859e8a78d522b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ast.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Símbolos -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/autoidx-kimber.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/autoidx-kimber.xsl deleted file mode 100644 index 81b234ee224878ae7abb72c4601a83ddea1168a7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/autoidx-kimber.xsl +++ /dev/null @@ -1,45 +0,0 @@ - - -%common.entities; - - - - -]> - - - - - - - - - - ERROR: the 'kimber' index method requires the - Saxon version 6 or 8 XSLT processor. - - - 1 - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/autoidx-kosek.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/autoidx-kosek.xsl deleted file mode 100644 index 39390d3f786fb576fd3b45103dcada9fa79fed2a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/autoidx-kosek.xsl +++ /dev/null @@ -1,155 +0,0 @@ - - -%common.entities; -]> - - - - - - - - - - ERROR: the 'kosek' index method does not - work with the xsltproc XSLT processor. - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - No " - - " localization of index grouping letters exists - - - . - - - ; using "en". - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No " - - " localization of index grouping letters exists - - - . - - - ; using "en". - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/az.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/az.xml deleted file mode 100644 index c22ec7bff53bf29ac1583e78033cea85461b77bb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/az.xml +++ /dev/null @@ -1,672 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Ä°ÅŸarÉ™lÉ™r -A -a -B -b -C -c -Ç -ç -D -d -E -e -e -e -Æ -É™ -G -g -Äž -ÄŸ -H -h -X -x -I -ı -Ä° -i -J -j -K -k -Q -q -L -l -M -m -N -n -O -o -Ö -ö -P -p -R -r -S -s -Åž -ÅŸ -T -t -U -u -Ãœ -ü -V -v -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bg.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bg.xml deleted file mode 100644 index 10e379f32673fe311eeec721ed91e96aca746671..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bg.xml +++ /dev/null @@ -1,724 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Цифри и знаци -Ð -а -Б -б -Ð’ -в -Г -г -Д -д -Е -е -Ж -ж -З -з -И -и -Й -й -К -к -Л -л -Ðœ -м -Ð -н -О -о -П -п -Р -Ñ€ -С -Ñ -Т -Ñ‚ -У -у -Ф -Ñ„ -Ð¥ -Ñ… -Ц -ц -Ч -ч -Ш -ш -Щ -щ -Ъ -ÑŠ -Ь -ÑŒ -Ю -ÑŽ -Я -Ñ -Э -Ñ -Ы -Ñ‹ -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bn.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bn.xml deleted file mode 100644 index 8ca9503b6ead61d3e8fa520b8faf83be4e75ee5f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bn.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bn_in.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bn_in.xml deleted file mode 100644 index 88404a0f0d513ab1804207b2a3fc444d6234414f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bn_in.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -সংকেত -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bs.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bs.xml deleted file mode 100644 index bd9b281bc1a9a3e92cb1b4d32ad05937c71df1d2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/bs.xml +++ /dev/null @@ -1,662 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Simboli -A -a -B -b -C -c -Ć -ć -ÄŒ -Ä -D -d -Ä -Ä‘ -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -R -r -S -s -Å  -Å¡ -T -t -U -u -V -v -Z -z -Ž -ž - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ca.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ca.xml deleted file mode 100644 index 95fd48b49bcd75061c1fdbc97e49708602ffb17b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ca.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Símbols -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/charmap.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/charmap.xml deleted file mode 100644 index a12a84f2b5f3522b001dfe9397c8ebeb3cb45253..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/charmap.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - - - Common » Character-Map Template Reference - - $Id: charmap.xsl 7266 2007-08-22 11:58:42Z xmldoc $ - - - - - Introduction - -This is technical reference documentation for the - character-map templates in the DocBook XSL Stylesheets. - - - -These templates are defined in a separate file from the set - of “common†templates because some of the common templates - reference DocBook XSL stylesheet parameters, requiring the - entire set of parameters to be imported/included in any - stylesheet that imports/includes the common templates. - - -The character-map templates don’t import or include - any DocBook XSL stylesheet parameters, so the - character-map templates can be used without importing the - whole set of parameters. - - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -apply-character-map -Applies an XSLT character map - - -<xsl:template name="apply-character-map"> -<xsl:param name="content"/> -<xsl:param name="map.contents"/> - ... -</xsl:template> - -Description - -This template applies an XSLT character map; that is, it causes certain - individual characters to be substituted with strings of one - or more characters. It is useful mainly for replacing - multiple “special†characters or symbols in the same target - content. It uses the value of - map.contents to do substitution on - content, and then returns the - modified contents. - - - -This template is a very slightly modified version of - Jeni Tennison’s replace_strings - template in the multiple string replacements section of Dave Pawson’s - XSLT FAQ. - - -The apply-string-subst-map - template is essentially the same template as the - apply-character-map template; the - only difference is that in the map that - apply-string-subst-map expects, oldstring and newstring attributes are used - instead of character and string attributes. - - - Parameters - - - content - - -The content on which to perform the character-map - substitution. - - - - map.contents - - -A node set of elements, with each element having - the following attributes: - - - - character, a - character to be replaced - - - string, a - string with which to replace character - - - - - - - - - - - - - -read-character-map -Reads in all or part of an XSLT character map - - -<xsl:template name="read-character-map"> -<xsl:param name="use.subset"/> -<xsl:param name="subset.profile"/> -<xsl:param name="uri"/> - ... -</xsl:template> - -Description - -The XSLT 2.0 specification describes character maps and explains how they may be used - to allow a specific character appearing in a text or - attribute node in a final result tree to be substituted by - a specified string of characters during serialization. The - read-character-map template provides a - means for reading and using character maps with XSLT - 1.0-based tools. - - -This template reads the character-map contents from - uri (in full or in part, depending on - the value of the use.subset - parameter), then passes those contents to the - apply-character-map template, along with - content, the data on which to perform - the character substitution. - - -Using the character map “in part†means that it uses only - those output-character elements that match the - XPath expression given in the value of the - subset.profile parameter. The current - implementation of that capability here relies on the - evaluate extension XSLT function. - - Parameters - - - use.subset - - -Specifies whether to use a subset of the character - map instead of the whole map; boolean - 0 or 1 - - - - subset.profile - - -XPath expression that specifies what subset of the - character map to use - - - - uri - - -URI for a character map - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/charmap.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/charmap.xsl deleted file mode 100644 index 0edf042acf966dbc2b4f73323642c4b18d3f104a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/charmap.xsl +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - Common » Character-Map Template Reference - - $Id: charmap.xsl 7266 2007-08-22 11:58:42Z xmldoc $ - - - - - Introduction - This is technical reference documentation for the - character-map templates in the DocBook XSL Stylesheets. - - These templates are defined in a separate file from the set - of “common†templates because some of the common templates - reference DocBook XSL stylesheet parameters, requiring the - entire set of parameters to be imported/included in any - stylesheet that imports/includes the common templates. - The character-map templates don’t import or include - any DocBook XSL stylesheet parameters, so the - character-map templates can be used without importing the - whole set of parameters. - - This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - - Applies an XSLT character map - - This template applies an XSLT character map; that is, it causes certain - individual characters to be substituted with strings of one - or more characters. It is useful mainly for replacing - multiple “special†characters or symbols in the same target - content. It uses the value of - map.contents to do substitution on - content, and then returns the - modified contents. - - This template is a very slightly modified version of - Jeni Tennison’s replace_strings - template in the multiple string replacements section of Dave Pawson’s - XSLT FAQ. - The apply-string-subst-map - template is essentially the same template as the - apply-character-map template; the - only difference is that in the map that - apply-string-subst-map expects, oldstring and newstring attributes are used - instead of character and string attributes. - - - - - content - - The content on which to perform the character-map - substitution. - - - map.contents - - A node set of elements, with each element having - the following attributes: - - - character, a - character to be replaced - - - string, a - string with which to replace character - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Reads in all or part of an XSLT character map - - The XSLT 2.0 specification describes character maps and explains how they may be used - to allow a specific character appearing in a text or - attribute node in a final result tree to be substituted by - a specified string of characters during serialization. The - read-character-map template provides a - means for reading and using character maps with XSLT - 1.0-based tools. - This template reads the character-map contents from - uri (in full or in part, depending on - the value of the use.subset - parameter), then passes those contents to the - apply-character-map template, along with - content, the data on which to perform - the character substitution. - Using the character map “in part†means that it uses only - those output-character elements that match the - XPath expression given in the value of the - subset.profile parameter. The current - implementation of that capability here relies on the - evaluate extension XSLT function. - - - - use.subset - - Specifies whether to use a subset of the character - map instead of the whole map; boolean - 0 or 1 - - - subset.profile - - XPath expression that specifies what subset of the - character map to use - - - uri - - URI for a character map - - - - - - - - - - - - - - - - - - - - - - - -Error: To process character-map subsets, you must use an XSLT engine -that supports the evaluate() XSLT extension function. Your XSLT engine -does not support it. - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/common.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/common.xml deleted file mode 100644 index da79980ee63f5b49d222bdd06bdc40bfaa168789..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/common.xml +++ /dev/null @@ -1,622 +0,0 @@ - - - - - Common » Base Template Reference - - $Id: common.xsl 8784 2010-07-28 12:32:54Z mzjn $ - - - - - Introduction - -This is technical reference documentation for the “base†- set of common templates in the DocBook XSL Stylesheets. - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -is.component -Tests if a given node is a component-level element - - -<xsl:template name="is.component"> -<xsl:param name="node" select="."/> - ... -</xsl:template> - -Description - -This template returns '1' if the specified node is a component -(Chapter, Appendix, etc.), and '0' otherwise. - -Parameters - - -node - - -The node which is to be tested. - - - - - -Returns - -This template returns '1' if the specified node is a component -(Chapter, Appendix, etc.), and '0' otherwise. - - - - - -is.section -Tests if a given node is a section-level element - - -<xsl:template name="is.section"> -<xsl:param name="node" select="."/> - ... -</xsl:template> - -Description - -This template returns '1' if the specified node is a section -(Section, Sect1, Sect2, etc.), and '0' otherwise. - -Parameters - - -node - - -The node which is to be tested. - - - - - -Returns - -This template returns '1' if the specified node is a section -(Section, Sect1, Sect2, etc.), and '0' otherwise. - - - - - -section.level -Returns the hierarchical level of a section - - -<xsl:template name="section.level"> -<xsl:param name="node" select="."/> - ... -</xsl:template> - -Description - -This template calculates the hierarchical level of a section. -The element sect1 is at level 1, sect2 is -at level 2, etc. - - - -Recursive sections are calculated down to the fifth level. - -Parameters - - -node - - -The section node for which the level should be calculated. -Defaults to the context node. - - - - - -Returns - -The section level, 1, 2, etc. - - - - - - -qanda.section.level -Returns the hierarchical level of a QandASet - - -<xsl:template name="qanda.section.level"/> - -Description - -This template calculates the hierarchical level of a QandASet. - - -Returns - -The level, 1, 2, etc. - - - - - - -select.mediaobject -Selects and processes an appropriate media object from a list - - -<xsl:template name="select.mediaobject"> -<xsl:param name="olist" select="imageobject|imageobjectco |videoobject|audioobject|textobject"/> - ... -</xsl:template> - -Description - -This template takes a list of media objects (usually the -children of a mediaobject or inlinemediaobject) and processes -the "right" object. - - - -This template relies on a template named -"select.mediaobject.index" to determine which object -in the list is appropriate. - - - -If no acceptable object is located, nothing happens. - -Parameters - - -olist - - -The node list of potential objects to examine. - - - - - -Returns - -Calls <xsl:apply-templates> on the selected object. - - - - - -select.mediaobject.index -Selects the position of the appropriate media object from a list - - -<xsl:template name="select.mediaobject.index"> -<xsl:param name="olist" select="imageobject|imageobjectco |videoobject|audioobject|textobject"/> -<xsl:param name="count">1</xsl:param> - ... -</xsl:template> - -Description - -This template takes a list of media objects (usually the -children of a mediaobject or inlinemediaobject) and determines -the "right" object. It returns the position of that object -to be used by the calling template. - - - -If the parameter use.role.for.mediaobject -is nonzero, then it first checks for an object with -a role attribute of the appropriate value. It takes the first -of those. Otherwise, it takes the first acceptable object -through a recursive pass through the list. - - - -This template relies on a template named "is.acceptable.mediaobject" -to determine if a given object is an acceptable graphic. The semantics -of media objects is that the first acceptable graphic should be used. - - - - -If no acceptable object is located, no index is returned. - -Parameters - - -olist - - -The node list of potential objects to examine. - - - -count - - -The position in the list currently being considered by the -recursive process. - - - - - -Returns - -Returns the position in the original list of the selected object. - - - - - -is.acceptable.mediaobject -Returns '1' if the specified media object is recognized - - -<xsl:template name="is.acceptable.mediaobject"> -<xsl:param name="object"/> - ... -</xsl:template> - -Description - -This template examines a media object and returns '1' if the -object is recognized as a graphic. - -Parameters - - -object - - -The media object to consider. - - - - - -Returns - -0 or 1 - - - - - -check.id.unique -Warn users about references to non-unique IDs - - -<xsl:template name="check.id.unique"> -<xsl:param name="linkend"/> - ... -</xsl:template> - -Description - -If passed an ID in linkend, -check.id.unique prints -a warning message to the user if either the ID does not exist or -the ID is not unique. - - - - - -check.idref.targets -Warn users about incorrectly typed references - - -<xsl:template name="check.idref.targets"> -<xsl:param name="linkend"/> -<xsl:param name="element-list"/> - ... -</xsl:template> - -Description - -If passed an ID in linkend, -check.idref.targets makes sure that the element -pointed to by the link is one of the elements listed in -element-list and warns the user otherwise. - - - - - -copyright.years -Print a set of years with collapsed ranges - - -<xsl:template name="copyright.years"> -<xsl:param name="years"/> -<xsl:param name="print.ranges" select="1"/> -<xsl:param name="single.year.ranges" select="0"/> -<xsl:param name="firstyear" select="0"/> -<xsl:param name="nextyear" select="0"/> - ... -</xsl:template> - -Description - -This template prints a list of year elements with consecutive -years printed as a range. In other words: - - -<year>1992</year> -<year>1993</year> -<year>1994</year> - - -is printed 1992-1994, whereas: - - -<year>1992</year> -<year>1994</year> - - -is printed 1992, 1994. - - - -This template assumes that all the year elements contain only -decimal year numbers, that the elements are sorted in increasing -numerical order, that there are no duplicates, and that all the years -are expressed in full century+year -(1999 not 99) notation. - -Parameters - - -years - - -The initial set of year elements. - - - -print.ranges - - -If non-zero, multi-year ranges are collapsed. If zero, all years -are printed discretely. - - - -single.year.ranges - - -If non-zero, two consecutive years will be printed as a range, -otherwise, they will be printed discretely. In other words, a single -year range is 1991-1992 but discretely it's -1991, 1992. - - - - - -Returns - -This template returns the formatted list of years. - - - - - -find.path.params -Search in a table for the "best" match for the node - - -<xsl:template name="find.path.params"> -<xsl:param name="node" select="."/> -<xsl:param name="table" select="''"/> -<xsl:param name="location"> - <xsl:call-template name="xpath.location"> - <xsl:with-param name="node" select="$node"/> - </xsl:call-template> - </xsl:param> - ... -</xsl:template> - -Description - -This template searches in a table for the value that most-closely -(in the typical best-match sense of XSLT) matches the current (element) -node location. - - - - - -string.upper -Converts a string to all uppercase letters - - -<xsl:template name="string.upper"> -<xsl:param name="string" select="''"/> - ... -</xsl:template> - -Description - -Given a string, this template does a language-aware conversion -of that string to all uppercase letters, based on the values of the -lowercase.alpha and -uppercase.alpha gentext keys for the current -locale. It affects only those characters found in the values of -lowercase.alpha and -uppercase.alpha. All other characters are left -unchanged. - -Parameters - - -string - - -The string to convert to uppercase. - - - - - - - - - -string.lower -Converts a string to all lowercase letters - - -<xsl:template name="string.lower"> -<xsl:param name="string" select="''"/> - ... -</xsl:template> - -Description - -Given a string, this template does a language-aware conversion -of that string to all lowercase letters, based on the values of the -uppercase.alpha and -lowercase.alpha gentext keys for the current -locale. It affects only those characters found in the values of -uppercase.alpha and -lowercase.alpha. All other characters are left -unchanged. - -Parameters - - -string - - -The string to convert to lowercase. - - - - - - - - - -select.choice.separator -Returns localized choice separator - - -<xsl:template name="select.choice.separator"/> - -Description - -This template enables auto-generation of an appropriate - localized "choice" separator (for example, "and" or "or") before - the final item in an inline list (though it could also be useful - for generating choice separators for non-inline lists). - - -It currently works by evaluating a processing instruction - (PI) of the form <?dbchoice choice="foo"?> : - - - - if the value of the choice - pseudo-attribute is "and" or "or", returns a localized "and" - or "or" - - - otherwise returns the literal value of the - choice pseudo-attribute - - - - The latter is provided only as a temporary workaround because the - locale files do not currently have translations for the word - or. So if you want to generate a a - logical "or" separator in French (for example), you currently need - to do this: - <?dbchoice choice="ou"?> - - - - -The dbchoice processing instruction is - an unfortunate hack; support for it may disappear in the future - (particularly if and when a more appropriate means for marking - up "choice" lists becomes available in DocBook). - - - - - - -evaluate.info.profile -Evaluates an info profile - - -<xsl:template name="evaluate.info.profile"> -<xsl:param name="profile"/> -<xsl:param name="info"/> - ... -</xsl:template> - -Description - -This template evaluates an "info profile" matching the XPath - expression given by the profile - parameter. It relies on the XSLT evaluate() - extension function. - - - -The value of the profile parameter - can include the literal string $info. If found - in the value of the profile parameter, the - literal string $info string is replaced with - the value of the info parameter, which - should be a set of *info nodes; the - expression is then evaluated using the XSLT - evaluate() extension function. - - Parameters - - - - profile - - -A string representing an XPath expression - - - - - info - - -A set of *info nodes - - - - - - Returns - -Returns a node (the result of evaluating the - profile parameter) - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/common.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/common.xsl deleted file mode 100644 index 1ea8c15b74991ef5e257efb3a893b6e04a234c2d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/common.xsl +++ /dev/null @@ -1,2040 +0,0 @@ - - - - - - - - Common » Base Template Reference - - $Id: common.xsl 8784 2010-07-28 12:32:54Z mzjn $ - - - - - Introduction - This is technical reference documentation for the “base†- set of common templates in the DocBook XSL Stylesheets. - This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - - - - - - - - -Tests if a given node is a component-level element - - -This template returns '1' if the specified node is a component -(Chapter, Appendix, etc.), and '0' otherwise. - - - - -node - -The node which is to be tested. - - - - - - -This template returns '1' if the specified node is a component -(Chapter, Appendix, etc.), and '0' otherwise. - - - - - - - 1 - 0 - - - - - - -Tests if a given node is a section-level element - - -This template returns '1' if the specified node is a section -(Section, Sect1, Sect2, etc.), and '0' otherwise. - - - - -node - -The node which is to be tested. - - - - - - -This template returns '1' if the specified node is a section -(Section, Sect1, Sect2, etc.), and '0' otherwise. - - - - - - - 1 - 0 - - - - - - -Returns the hierarchical level of a section - - -This template calculates the hierarchical level of a section. -The element sect1 is at level 1, sect2 is -at level 2, etc. - -Recursive sections are calculated down to the fifth level. - - - - -node - -The section node for which the level should be calculated. -Defaults to the context node. - - - - - - -The section level, 1, 2, etc. - - - - - - - - 1 - 2 - 3 - 4 - 5 - - - 6 - 5 - 4 - 3 - 2 - 1 - - - - - - - - - - 2 - 3 - 4 - 5 - 5 - - - 5 - 4 - 3 - 2 - - - 1 - - - 1 - - - - -Returns the hierarchical level of a QandASet - - -This template calculates the hierarchical level of a QandASet. - - - - -The level, 1, 2, etc. - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 2 - 3 - - - 5 - 4 - 3 - 2 - 1 - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - question - answer - qandadiv - qandaset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [FAMILY Given] - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[ -] -{ -} - - -[ -] -... - - - | -4pi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Selects and processes an appropriate media object from a list - - -This template takes a list of media objects (usually the -children of a mediaobject or inlinemediaobject) and processes -the "right" object. - -This template relies on a template named -"select.mediaobject.index" to determine which object -in the list is appropriate. - -If no acceptable object is located, nothing happens. - - - - -olist - -The node list of potential objects to examine. - - - - - - -Calls <xsl:apply-templates> on the selected object. - - - - - - - - - - - - - - - - - - - - - -Selects the position of the appropriate media object from a list - - -This template takes a list of media objects (usually the -children of a mediaobject or inlinemediaobject) and determines -the "right" object. It returns the position of that object -to be used by the calling template. - -If the parameter use.role.for.mediaobject -is nonzero, then it first checks for an object with -a role attribute of the appropriate value. It takes the first -of those. Otherwise, it takes the first acceptable object -through a recursive pass through the list. - -This template relies on a template named "is.acceptable.mediaobject" -to determine if a given object is an acceptable graphic. The semantics -of media objects is that the first acceptable graphic should be used. - - -If no acceptable object is located, no index is returned. - - - - -olist - -The node list of potential objects to examine. - - -count - -The position in the list currently being considered by the -recursive process. - - - - - - -Returns the position in the original list of the selected object. - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - 0 - - - - 0 - - - - 1 - - - - 0 - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Returns '1' if the specified media object is recognized - - -This template examines a media object and returns '1' if the -object is recognized as a graphic. - - - - -object - -The media object to consider. - - - - - - -0 or 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 1 - 1 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - . - - - - - - - - - - - - - - - - -Warn users about references to non-unique IDs - -If passed an ID in linkend, -check.id.unique prints -a warning message to the user if either the ID does not exist or -the ID is not unique. - - - - - - - - - - - - Error: no ID for constraint linkend: - - . - - - - - - - Warning: multiple "IDs" for constraint linkend: - - . - - - - - - -Warn users about incorrectly typed references - -If passed an ID in linkend, -check.idref.targets makes sure that the element -pointed to by the link is one of the elements listed in -element-list and warns the user otherwise. - - - - - - - - - - - - - - Error: linkend ( - - ) points to " - - " not (one of): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unexpected context in procedure.step.numeration: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - loweralpha - lowerroman - upperalpha - upperroman - arabic - arabic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1. - a. - i. - A. - I. - - - - Unexpected numeration: - - - - - - - - - - - - - - - - - - - - - - - - - - circle - square - disc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Print a set of years with collapsed ranges - - -This template prints a list of year elements with consecutive -years printed as a range. In other words: - -1992 -1993 -1994]]> - -is printed 1992-1994, whereas: - -1992 -1994]]> - -is printed 1992, 1994. - -This template assumes that all the year elements contain only -decimal year numbers, that the elements are sorted in increasing -numerical order, that there are no duplicates, and that all the years -are expressed in full century+year -(1999 not 99) notation. - - - - -years - -The initial set of year elements. - - -print.ranges - -If non-zero, multi-year ranges are collapsed. If zero, all years -are printed discretely. - - -single.year.ranges - -If non-zero, two consecutive years will be printed as a range, -otherwise, they will be printed discretely. In other words, a single -year range is 1991-1992 but discretely it's -1991, 1992. - - - - - - -This template returns the formatted list of years. - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - , - - , - - - - - - - , - - - - - - - - - - - - - - - - -Search in a table for the "best" match for the node - - -This template searches in a table for the value that most-closely -(in the typical best-match sense of XSLT) matches the current (element) -node location. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - - - - - - - -Converts a string to all uppercase letters - - -Given a string, this template does a language-aware conversion -of that string to all uppercase letters, based on the values of the -lowercase.alpha and -uppercase.alpha gentext keys for the current -locale. It affects only those characters found in the values of -lowercase.alpha and -uppercase.alpha. All other characters are left -unchanged. - - - - -string - -The string to convert to uppercase. - - - - - - - - - - - - - - - - - - - - - - - -Converts a string to all lowercase letters - - -Given a string, this template does a language-aware conversion -of that string to all lowercase letters, based on the values of the -uppercase.alpha and -lowercase.alpha gentext keys for the current -locale. It affects only those characters found in the values of -uppercase.alpha and -lowercase.alpha. All other characters are left -unchanged. - - - - -string - -The string to convert to lowercase. - - - - - - - - - - - - - - - - - - - - - - - - Returns localized choice separator - - This template enables auto-generation of an appropriate - localized "choice" separator (for example, "and" or "or") before - the final item in an inline list (though it could also be useful - for generating choice separators for non-inline lists). - It currently works by evaluating a processing instruction - (PI) of the form <?dbchoice choice="foo"?> : - - - if the value of the choice - pseudo-attribute is "and" or "or", returns a localized "and" - or "or" - - - otherwise returns the literal value of the - choice pseudo-attribute - - - The latter is provided only as a temporary workaround because the - locale files do not currently have translations for the word - or. So if you want to generate a a - logical "or" separator in French (for example), you currently need - to do this: - <?dbchoice choice="ou"?> - - - The dbchoice processing instruction is - an unfortunate hack; support for it may disappear in the future - (particularly if and when a more appropriate means for marking - up "choice" lists becomes available in DocBook). - - - - - - - - - - - - - - - - - - - - - - - - - - Evaluates an info profile - - This template evaluates an "info profile" matching the XPath - expression given by the profile - parameter. It relies on the XSLT evaluate() - extension function. - - The value of the profile parameter - can include the literal string $info. If found - in the value of the profile parameter, the - literal string $info string is replaced with - the value of the info parameter, which - should be a set of *info nodes; the - expression is then evaluated using the XSLT - evaluate() extension function. - - - - - profile - - A string representing an XPath expression - - - - info - - A set of *info nodes - - - - - - - Returns a node (the result of evaluating the - profile parameter) - - - - - - - - - - - - - - - - -Error: The "info profiling" mechanism currently requires an XSLT -engine that supports the evaluate() XSLT extension function. Your XSLT -engine does not support it. - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/cs.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/cs.xml deleted file mode 100644 index b803f79bd243538b0c0f541e709061940ca7acea..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/cs.xml +++ /dev/null @@ -1,700 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symboly -A -a -à -á -B -b -C -c -ÄŒ -Ä -D -d -ÄŽ -Ä -E -e -É -é -Äš -Ä› -Ë -ë -F -f -G -g -H -h -Ch -ch -cH -CH -I -i -à -í -J -j -K -k -L -l -M -m -N -n -Ň -ň -O -o -Ó -ó -Ö -ö -P -p -Q -q -R -r -Ř -Å™ -S -s -Å  -Å¡ -T -t -Ť -Å¥ -U -u -Ú -ú -Å® -ů -Ãœ -ü -V -v -W -w -X -x -Y -y -à -ý -Z -z -Ž -ž - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/cy.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/cy.xml deleted file mode 100644 index bc0f08a4515e54e853c39a5e35adca566b6608f5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/cy.xml +++ /dev/null @@ -1,1245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -Ch -ch -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -Dd -dd -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -Ff -ff -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -Ng -ng -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -Ll -ll -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Ph -ph -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -Rh -rh -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -Th -th -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/da.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/da.xml deleted file mode 100644 index 90eb01c2a6fcf926ed4579b16d2f43ee449cf2c1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/da.xml +++ /dev/null @@ -1,664 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Æ -æ -Ø -ø -Ã… -Ã¥ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/de.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/de.xml deleted file mode 100644 index 0403153f10fcd883c6817a334dd56a17bbb2d124..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/de.xml +++ /dev/null @@ -1,666 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbole -A -a -Ä -ä -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -Ö -ö -P -p -Q -q -R -r -S -s -T -t -U -u -Ãœ -ü -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/el.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/el.xml deleted file mode 100644 index f8461d1e4b573bbccfa30c86d4c15896181cc53f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/el.xml +++ /dev/null @@ -1,729 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ΣÏμβολα -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Α -α -Ά -ά -Î’ -β -Γ -γ -Δ -δ -Ε -ε -Έ -έ -Ζ -ζ -Η -η -Ή -ή -Θ -θ -Ι -ι -Ί -ί -Ϊ -ÏŠ -Î -Κ -κ -Λ -λ -Îœ -μ -Î -ν -Ξ -ξ -Ο -ο -ÎŒ -ÏŒ -Π -Ï€ -Ρ -Ï -Σ -σ -Ï‚ -Τ -Ï„ -Î¥ -Ï… -ÎŽ -Ï -Ϋ -Ï‹ -ΰ -Φ -φ -Χ -χ -Ψ -ψ -Ω -ω -Î -ÏŽ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/en.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/en.xml deleted file mode 100644 index b77f2c22f7fd84b1766252a67d1b3485956779b7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/en.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/entities.ent b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/entities.ent deleted file mode 100644 index 6db63bd9a7fa969fcdd923ca5549c5576b3affd3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/entities.ent +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - -'> - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/eo.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/eo.xml deleted file mode 100644 index c6b95d08d0065da53bc2dc9306a73f667ce921fc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/eo.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/es.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/es.xml deleted file mode 100644 index aad19800e5db9e4cb06e456cfc01f2996167d82f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/es.xml +++ /dev/null @@ -1,676 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Símbolos -A -a -á -à -B -b -C -c -CH -ch -D -d -E -e -É -é -F -f -G -g -H -h -I -i -à -í -J -j -K -k -L -l -LL -ll -M -m -N -n -Ñ -ñ -O -o -Ó -ó -P -p -Q -q -R -r -S -s -T -t -U -u -Ú -ú -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/et.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/et.xml deleted file mode 100644 index b7d224ffc8ebadb55a59591f53c0cff3257d02a5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/et.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/eu.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/eu.xml deleted file mode 100644 index 3841d3f9258d4e260b67efe7cb946d3fda3e6c22..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/eu.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/fa.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/fa.xml deleted file mode 100644 index 257dc0bf416590de44690565105537ec214438fe..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/fa.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -سمبل‌های راهنم -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/fi.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/fi.xml deleted file mode 100644 index 232d057a33fdb148a2ccecd5276b286c508b8b61..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/fi.xml +++ /dev/null @@ -1,670 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbole -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -Å  -Å¡ -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Ž -ž -Ã… -Ã¥ -Ä -ä -Ö -ö - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/fr.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/fr.xml deleted file mode 100644 index 5ca524822dfda82316446772d6a54f72fedabd99..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/fr.xml +++ /dev/null @@ -1,690 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symboles -A -a -à -À -â - -Æ -æ -B -b -C -c -ç -D -d -E -e -ê -Ê -é -É -è -È -ë -Ë -€ -F -f -G -g -H -h -I -i -ÃŽ -î -à -ï -J -j -K -k -L -l -M -m -N -n -O -o -Ö -ö -Å’ -Å“ -P -p -Q -q -R -r -S -s -T -t -U -u -Ù -ù -Û -û -Ãœ -ü -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ga.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ga.xml deleted file mode 100644 index 054036be46b761ddb26f9018cea0e45dba204305..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ga.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Siombailí -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/gentext.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/gentext.xsl deleted file mode 100644 index 22031f72c21586332b0d5b7e30a0cabc839e126e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/gentext.xsl +++ /dev/null @@ -1,840 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .formal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - object.xref.markup: empty xref template - for linkend=" - - " and @xrefstyle=" - - " - - - - - - - - - - - - - - - - - - - - - - - - - - - Xref is only supported to listitems in an - orderedlist: - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - %n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - Attempt to use %d in gentext with no referrer! - - - - - - - % - - - % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - labelnumber - - - labelname - - - label - - - - - - - - quotedtitle - - - title - - - - - - - - - - - - - - nopage - - - pagenumber - - - pageabbrev - - - Page - - - page - - - - - - - - - - - nodocname - - - docnamelong - - - docname - - - - - - - - - - - - - - - - - - - - - - %n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %t - - - - - - %t - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - %p - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/gl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/gl.xml deleted file mode 100644 index 7346088b6f784278efae825162ba352a77d42b77..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/gl.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/gu.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/gu.xml deleted file mode 100644 index ae7ae2e5a6e9d551d5d06f7a1a9079b4380785ae..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/gu.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -સંકેતો -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/he.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/he.xml deleted file mode 100644 index d084df4badcd572d25df8415d3b183e4c04e5215..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/he.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/hi.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/hi.xml deleted file mode 100644 index 76a075fbbc8e0491ac0a25c6f48ae4aa87b4a473..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/hi.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -संकेत -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/hr.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/hr.xml deleted file mode 100644 index 2db7030fc1d8cc5951fdc9ebf03e137bd3ef8ff9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/hr.xml +++ /dev/null @@ -1,662 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Oznake -A -a -B -b -C -c -Ć -ć -ÄŒ -Ä -D -d -Ä -Ä‘ -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -R -r -S -s -Å  -Å¡ -T -t -U -u -V -v -Z -z -Ž -ž - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/hu.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/hu.xml deleted file mode 100644 index ab90c948a6858b45be8747422a2521b52852bd8d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/hu.xml +++ /dev/null @@ -1,678 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Jelzések -A -a -à -á -B -b -C -c -D -d -E -e -É -é -F -f -G -g -H -h -I -i -à -í -J -j -K -k -L -l -M -m -N -n -O -o -Ó -ó -Ö -ö -Å -Å‘ -P -p -Q -q -R -r -S -s -T -t -U -u -Ú -ú -Ãœ -ü -Å° -ű -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/id.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/id.xml deleted file mode 100644 index b730ad894a6a428a6d321db86ba6881504a2e35d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/id.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Simbol -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html deleted file mode 100644 index 35e46f0bc936d02e523da49c929a81847e2a1d99..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/common - - -

    Index of /release/xsl-ns/1.76.1/common

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] targetdatabase.dtd 01-Nov-2010 20:31 1.2K -[   ] l10n.dtd 01-Nov-2010 20:31 1.3K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 1.6K -[TXT] l10n.xml 01-Nov-2010 20:31 2.9K -[TXT] insertfile.xsl 01-Nov-2010 20:31 4.0K -[TXT] addns.xsl 01-Nov-2010 20:31 4.6K -[TXT] pi.xml 01-Nov-2010 20:31 5.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.1K -[TXT] subtitles.xsl 01-Nov-2010 20:31 6.3K -[TXT] charmap.xml 01-Nov-2010 20:31 6.6K -[TXT] entities.ent 01-Nov-2010 20:31 8.3K -[TXT] charmap.xsl 01-Nov-2010 20:31 9.3K -[TXT] utility.xml 01-Nov-2010 20:31 9.6K -[TXT] targets.xsl 01-Nov-2010 20:31 11K -[TXT] utility.xsl 01-Nov-2010 20:31 12K -[TXT] pi.xsl 01-Nov-2010 20:31 14K -[TXT] table.xsl 01-Nov-2010 20:31 18K -[TXT] common.xml 01-Nov-2010 20:31 18K -[TXT] l10n.xsl 01-Nov-2010 20:31 20K -[TXT] refentry.xml 01-Nov-2010 20:31 22K -[TXT] zh.xml 01-Nov-2010 20:31 27K -[TXT] zh_cn.xml 01-Nov-2010 20:31 27K -[TXT] is.xml 01-Nov-2010 20:31 28K -[TXT] cs.xml 01-Nov-2010 20:31 28K -[TXT] titles.xsl 01-Nov-2010 20:31 29K -[TXT] zh_tw.xml 01-Nov-2010 20:31 29K -[TXT] ja.xml 01-Nov-2010 20:31 29K -[TXT] bs.xml 01-Nov-2010 20:31 29K -[TXT] nds.xml 01-Nov-2010 20:31 29K -[TXT] hr.xml 01-Nov-2010 20:31 30K -[TXT] da.xml 01-Nov-2010 20:31 30K -[TXT] ast.xml 01-Nov-2010 20:31 30K -[TXT] ca.xml 01-Nov-2010 20:31 30K -[TXT] gentext.xsl 01-Nov-2010 20:31 30K -[TXT] tr.xml 01-Nov-2010 20:31 30K -[TXT] fi.xml 01-Nov-2010 20:31 30K -[TXT] hu.xml 01-Nov-2010 20:31 30K -[TXT] pl.xml 01-Nov-2010 20:31 30K -[TXT] nl.xml 01-Nov-2010 20:31 30K -[TXT] az.xml 01-Nov-2010 20:31 30K -[TXT] sv.xml 01-Nov-2010 20:31 30K -[TXT] de.xml 01-Nov-2010 20:31 30K -[TXT] sr_Latn.xml 01-Nov-2010 20:31 30K -[TXT] fr.xml 01-Nov-2010 20:31 30K -[TXT] es.xml 01-Nov-2010 20:31 31K -[TXT] lt.xml 01-Nov-2010 20:31 31K -[TXT] labels.xsl 01-Nov-2010 20:31 31K -[TXT] pa.xml 01-Nov-2010 20:31 32K -[TXT] fa.xml 01-Nov-2010 20:31 32K -[TXT] el.xml 01-Nov-2010 20:31 32K -[TXT] mr.xml 01-Nov-2010 20:31 33K -[TXT] hi.xml 01-Nov-2010 20:31 33K -[TXT] sr.xml 01-Nov-2010 20:31 33K -[TXT] ky.xml 01-Nov-2010 20:31 33K -[TXT] as.xml 01-Nov-2010 20:31 33K -[TXT] gu.xml 01-Nov-2010 20:31 33K -[TXT] uk.xml 01-Nov-2010 20:31 33K -[TXT] mn.xml 01-Nov-2010 20:31 34K -[TXT] ru.xml 01-Nov-2010 20:31 34K -[TXT] bg.xml 01-Nov-2010 20:31 34K -[TXT] bn_in.xml 01-Nov-2010 20:31 34K -[TXT] ml.xml 01-Nov-2010 20:31 34K -[TXT] ta.xml 01-Nov-2010 20:31 35K -[TXT] te.xml 01-Nov-2010 20:31 35K -[TXT] ka.xml 01-Nov-2010 20:31 35K -[TXT] en.xml 01-Nov-2010 20:31 42K -[TXT] eo.xml 01-Nov-2010 20:31 42K -[TXT] it.xml 01-Nov-2010 20:31 42K -[TXT] pt_br.xml 01-Nov-2010 20:31 42K -[TXT] lv.xml 01-Nov-2010 20:31 42K -[TXT] id.xml 01-Nov-2010 20:31 42K -[TXT] pt.xml 01-Nov-2010 20:31 42K -[TXT] sk.xml 01-Nov-2010 20:31 42K -[TXT] la.xml 01-Nov-2010 20:31 43K -[TXT] gl.xml 01-Nov-2010 20:31 43K -[TXT] sq.xml 01-Nov-2010 20:31 43K -[TXT] ga.xml 01-Nov-2010 20:31 43K -[TXT] nn.xml 01-Nov-2010 20:31 43K -[TXT] ko.xml 01-Nov-2010 20:31 43K -[TXT] cy.xml 01-Nov-2010 20:31 43K -[TXT] tl.xml 01-Nov-2010 20:31 43K -[TXT] sl.xml 01-Nov-2010 20:31 43K -[TXT] nb.xml 01-Nov-2010 20:31 43K -[TXT] et.xml 01-Nov-2010 20:31 43K -[TXT] ro.xml 01-Nov-2010 20:31 43K -[TXT] vi.xml 01-Nov-2010 20:31 43K -[TXT] eu.xml 01-Nov-2010 20:31 43K -[TXT] af.xml 01-Nov-2010 20:31 43K -[TXT] xh.xml 01-Nov-2010 20:31 43K -[TXT] ar.xml 01-Nov-2010 20:31 44K -[TXT] he.xml 01-Nov-2010 20:31 44K -[TXT] am.xml 01-Nov-2010 20:31 44K -[TXT] th.xml 01-Nov-2010 20:31 45K -[TXT] or.xml 01-Nov-2010 20:31 46K -[TXT] bn.xml 01-Nov-2010 20:31 46K -[TXT] kn.xml 01-Nov-2010 20:31 47K -[TXT] olink.xsl 01-Nov-2010 20:31 48K -[TXT] refentry.xsl 01-Nov-2010 20:31 55K -[TXT] common.xsl 01-Nov-2010 20:31 73K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=D;O=A deleted file mode 100644 index a256cf045ef80e6b28f05cf7a6bad2a20313c3d8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=D;O=A +++ /dev/null @@ -1,110 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/common - - -

    Index of /release/xsl-ns/1.76.1/common

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] addns.xsl 01-Nov-2010 20:31 4.6K -[TXT] af.xml 01-Nov-2010 20:31 43K -[TXT] am.xml 01-Nov-2010 20:31 44K -[TXT] ar.xml 01-Nov-2010 20:31 44K -[TXT] as.xml 01-Nov-2010 20:31 33K -[TXT] ast.xml 01-Nov-2010 20:31 30K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 1.6K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.1K -[TXT] az.xml 01-Nov-2010 20:31 30K -[TXT] bg.xml 01-Nov-2010 20:31 34K -[TXT] bn.xml 01-Nov-2010 20:31 46K -[TXT] bn_in.xml 01-Nov-2010 20:31 34K -[TXT] bs.xml 01-Nov-2010 20:31 29K -[TXT] ca.xml 01-Nov-2010 20:31 30K -[TXT] charmap.xml 01-Nov-2010 20:31 6.6K -[TXT] charmap.xsl 01-Nov-2010 20:31 9.3K -[TXT] common.xml 01-Nov-2010 20:31 18K -[TXT] common.xsl 01-Nov-2010 20:31 73K -[TXT] cs.xml 01-Nov-2010 20:31 28K -[TXT] cy.xml 01-Nov-2010 20:31 43K -[TXT] da.xml 01-Nov-2010 20:31 30K -[TXT] de.xml 01-Nov-2010 20:31 30K -[TXT] el.xml 01-Nov-2010 20:31 32K -[TXT] en.xml 01-Nov-2010 20:31 42K -[TXT] entities.ent 01-Nov-2010 20:31 8.3K -[TXT] eo.xml 01-Nov-2010 20:31 42K -[TXT] es.xml 01-Nov-2010 20:31 31K -[TXT] et.xml 01-Nov-2010 20:31 43K -[TXT] eu.xml 01-Nov-2010 20:31 43K -[TXT] fa.xml 01-Nov-2010 20:31 32K -[TXT] fi.xml 01-Nov-2010 20:31 30K -[TXT] fr.xml 01-Nov-2010 20:31 30K -[TXT] ga.xml 01-Nov-2010 20:31 43K -[TXT] gentext.xsl 01-Nov-2010 20:31 30K -[TXT] gl.xml 01-Nov-2010 20:31 43K -[TXT] gu.xml 01-Nov-2010 20:31 33K -[TXT] he.xml 01-Nov-2010 20:31 44K -[TXT] hi.xml 01-Nov-2010 20:31 33K -[TXT] hr.xml 01-Nov-2010 20:31 30K -[TXT] hu.xml 01-Nov-2010 20:31 30K -[TXT] id.xml 01-Nov-2010 20:31 42K -[TXT] insertfile.xsl 01-Nov-2010 20:31 4.0K -[TXT] is.xml 01-Nov-2010 20:31 28K -[TXT] it.xml 01-Nov-2010 20:31 42K -[TXT] ja.xml 01-Nov-2010 20:31 29K -[TXT] ka.xml 01-Nov-2010 20:31 35K -[TXT] kn.xml 01-Nov-2010 20:31 47K -[TXT] ko.xml 01-Nov-2010 20:31 43K -[TXT] ky.xml 01-Nov-2010 20:31 33K -[   ] l10n.dtd 01-Nov-2010 20:31 1.3K -[TXT] l10n.xml 01-Nov-2010 20:31 2.9K -[TXT] l10n.xsl 01-Nov-2010 20:31 20K -[TXT] la.xml 01-Nov-2010 20:31 43K -[TXT] labels.xsl 01-Nov-2010 20:31 31K -[TXT] lt.xml 01-Nov-2010 20:31 31K -[TXT] lv.xml 01-Nov-2010 20:31 42K -[TXT] ml.xml 01-Nov-2010 20:31 34K -[TXT] mn.xml 01-Nov-2010 20:31 34K -[TXT] mr.xml 01-Nov-2010 20:31 33K -[TXT] nb.xml 01-Nov-2010 20:31 43K -[TXT] nds.xml 01-Nov-2010 20:31 29K -[TXT] nl.xml 01-Nov-2010 20:31 30K -[TXT] nn.xml 01-Nov-2010 20:31 43K -[TXT] olink.xsl 01-Nov-2010 20:31 48K -[TXT] or.xml 01-Nov-2010 20:31 46K -[TXT] pa.xml 01-Nov-2010 20:31 32K -[TXT] pi.xml 01-Nov-2010 20:31 5.0K -[TXT] pi.xsl 01-Nov-2010 20:31 14K -[TXT] pl.xml 01-Nov-2010 20:31 30K -[TXT] pt.xml 01-Nov-2010 20:31 42K -[TXT] pt_br.xml 01-Nov-2010 20:31 42K -[TXT] refentry.xml 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 55K -[TXT] ro.xml 01-Nov-2010 20:31 43K -[TXT] ru.xml 01-Nov-2010 20:31 34K -[TXT] sk.xml 01-Nov-2010 20:31 42K -[TXT] sl.xml 01-Nov-2010 20:31 43K -[TXT] sq.xml 01-Nov-2010 20:31 43K -[TXT] sr.xml 01-Nov-2010 20:31 33K -[TXT] sr_Latn.xml 01-Nov-2010 20:31 30K -[TXT] subtitles.xsl 01-Nov-2010 20:31 6.3K -[TXT] sv.xml 01-Nov-2010 20:31 30K -[TXT] ta.xml 01-Nov-2010 20:31 35K -[TXT] table.xsl 01-Nov-2010 20:31 18K -[TXT] targetdatabase.dtd 01-Nov-2010 20:31 1.2K -[TXT] targets.xsl 01-Nov-2010 20:31 11K -[TXT] te.xml 01-Nov-2010 20:31 35K -[TXT] th.xml 01-Nov-2010 20:31 45K -[TXT] titles.xsl 01-Nov-2010 20:31 29K -[TXT] tl.xml 01-Nov-2010 20:31 43K -[TXT] tr.xml 01-Nov-2010 20:31 30K -[TXT] uk.xml 01-Nov-2010 20:31 33K -[TXT] utility.xml 01-Nov-2010 20:31 9.6K -[TXT] utility.xsl 01-Nov-2010 20:31 12K -[TXT] vi.xml 01-Nov-2010 20:31 43K -[TXT] xh.xml 01-Nov-2010 20:31 43K -[TXT] zh.xml 01-Nov-2010 20:31 27K -[TXT] zh_cn.xml 01-Nov-2010 20:31 27K -[TXT] zh_tw.xml 01-Nov-2010 20:31 29K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=D;O=D deleted file mode 100644 index 320cdc39a807ee72b8a85853bd20b8353dfbf610..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=D;O=D +++ /dev/null @@ -1,110 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/common - - -

    Index of /release/xsl-ns/1.76.1/common

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] zh_tw.xml 01-Nov-2010 20:31 29K -[TXT] zh_cn.xml 01-Nov-2010 20:31 27K -[TXT] zh.xml 01-Nov-2010 20:31 27K -[TXT] xh.xml 01-Nov-2010 20:31 43K -[TXT] vi.xml 01-Nov-2010 20:31 43K -[TXT] utility.xsl 01-Nov-2010 20:31 12K -[TXT] utility.xml 01-Nov-2010 20:31 9.6K -[TXT] uk.xml 01-Nov-2010 20:31 33K -[TXT] tr.xml 01-Nov-2010 20:31 30K -[TXT] tl.xml 01-Nov-2010 20:31 43K -[TXT] titles.xsl 01-Nov-2010 20:31 29K -[TXT] th.xml 01-Nov-2010 20:31 45K -[TXT] te.xml 01-Nov-2010 20:31 35K -[TXT] targets.xsl 01-Nov-2010 20:31 11K -[TXT] targetdatabase.dtd 01-Nov-2010 20:31 1.2K -[TXT] table.xsl 01-Nov-2010 20:31 18K -[TXT] ta.xml 01-Nov-2010 20:31 35K -[TXT] sv.xml 01-Nov-2010 20:31 30K -[TXT] subtitles.xsl 01-Nov-2010 20:31 6.3K -[TXT] sr_Latn.xml 01-Nov-2010 20:31 30K -[TXT] sr.xml 01-Nov-2010 20:31 33K -[TXT] sq.xml 01-Nov-2010 20:31 43K -[TXT] sl.xml 01-Nov-2010 20:31 43K -[TXT] sk.xml 01-Nov-2010 20:31 42K -[TXT] ru.xml 01-Nov-2010 20:31 34K -[TXT] ro.xml 01-Nov-2010 20:31 43K -[TXT] refentry.xsl 01-Nov-2010 20:31 55K -[TXT] refentry.xml 01-Nov-2010 20:31 22K -[TXT] pt_br.xml 01-Nov-2010 20:31 42K -[TXT] pt.xml 01-Nov-2010 20:31 42K -[TXT] pl.xml 01-Nov-2010 20:31 30K -[TXT] pi.xsl 01-Nov-2010 20:31 14K -[TXT] pi.xml 01-Nov-2010 20:31 5.0K -[TXT] pa.xml 01-Nov-2010 20:31 32K -[TXT] or.xml 01-Nov-2010 20:31 46K -[TXT] olink.xsl 01-Nov-2010 20:31 48K -[TXT] nn.xml 01-Nov-2010 20:31 43K -[TXT] nl.xml 01-Nov-2010 20:31 30K -[TXT] nds.xml 01-Nov-2010 20:31 29K -[TXT] nb.xml 01-Nov-2010 20:31 43K -[TXT] mr.xml 01-Nov-2010 20:31 33K -[TXT] mn.xml 01-Nov-2010 20:31 34K -[TXT] ml.xml 01-Nov-2010 20:31 34K -[TXT] lv.xml 01-Nov-2010 20:31 42K -[TXT] lt.xml 01-Nov-2010 20:31 31K -[TXT] labels.xsl 01-Nov-2010 20:31 31K -[TXT] la.xml 01-Nov-2010 20:31 43K -[TXT] l10n.xsl 01-Nov-2010 20:31 20K -[TXT] l10n.xml 01-Nov-2010 20:31 2.9K -[   ] l10n.dtd 01-Nov-2010 20:31 1.3K -[TXT] ky.xml 01-Nov-2010 20:31 33K -[TXT] ko.xml 01-Nov-2010 20:31 43K -[TXT] kn.xml 01-Nov-2010 20:31 47K -[TXT] ka.xml 01-Nov-2010 20:31 35K -[TXT] ja.xml 01-Nov-2010 20:31 29K -[TXT] it.xml 01-Nov-2010 20:31 42K -[TXT] is.xml 01-Nov-2010 20:31 28K -[TXT] insertfile.xsl 01-Nov-2010 20:31 4.0K -[TXT] id.xml 01-Nov-2010 20:31 42K -[TXT] hu.xml 01-Nov-2010 20:31 30K -[TXT] hr.xml 01-Nov-2010 20:31 30K -[TXT] hi.xml 01-Nov-2010 20:31 33K -[TXT] he.xml 01-Nov-2010 20:31 44K -[TXT] gu.xml 01-Nov-2010 20:31 33K -[TXT] gl.xml 01-Nov-2010 20:31 43K -[TXT] gentext.xsl 01-Nov-2010 20:31 30K -[TXT] ga.xml 01-Nov-2010 20:31 43K -[TXT] fr.xml 01-Nov-2010 20:31 30K -[TXT] fi.xml 01-Nov-2010 20:31 30K -[TXT] fa.xml 01-Nov-2010 20:31 32K -[TXT] eu.xml 01-Nov-2010 20:31 43K -[TXT] et.xml 01-Nov-2010 20:31 43K -[TXT] es.xml 01-Nov-2010 20:31 31K -[TXT] eo.xml 01-Nov-2010 20:31 42K -[TXT] entities.ent 01-Nov-2010 20:31 8.3K -[TXT] en.xml 01-Nov-2010 20:31 42K -[TXT] el.xml 01-Nov-2010 20:31 32K -[TXT] de.xml 01-Nov-2010 20:31 30K -[TXT] da.xml 01-Nov-2010 20:31 30K -[TXT] cy.xml 01-Nov-2010 20:31 43K -[TXT] cs.xml 01-Nov-2010 20:31 28K -[TXT] common.xsl 01-Nov-2010 20:31 73K -[TXT] common.xml 01-Nov-2010 20:31 18K -[TXT] charmap.xsl 01-Nov-2010 20:31 9.3K -[TXT] charmap.xml 01-Nov-2010 20:31 6.6K -[TXT] ca.xml 01-Nov-2010 20:31 30K -[TXT] bs.xml 01-Nov-2010 20:31 29K -[TXT] bn_in.xml 01-Nov-2010 20:31 34K -[TXT] bn.xml 01-Nov-2010 20:31 46K -[TXT] bg.xml 01-Nov-2010 20:31 34K -[TXT] az.xml 01-Nov-2010 20:31 30K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.1K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 1.6K -[TXT] ast.xml 01-Nov-2010 20:31 30K -[TXT] as.xml 01-Nov-2010 20:31 33K -[TXT] ar.xml 01-Nov-2010 20:31 44K -[TXT] am.xml 01-Nov-2010 20:31 44K -[TXT] af.xml 01-Nov-2010 20:31 43K -[TXT] addns.xsl 01-Nov-2010 20:31 4.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=M;O=A deleted file mode 100644 index 60c35a6edd105e5bc1fb851f0ac1d98c820dafd5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=M;O=A +++ /dev/null @@ -1,110 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/common - - -

    Index of /release/xsl-ns/1.76.1/common

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] af.xml 01-Nov-2010 20:31 43K -[TXT] am.xml 01-Nov-2010 20:31 44K -[TXT] ar.xml 01-Nov-2010 20:31 44K -[TXT] as.xml 01-Nov-2010 20:31 33K -[TXT] ast.xml 01-Nov-2010 20:31 30K -[TXT] az.xml 01-Nov-2010 20:31 30K -[TXT] bg.xml 01-Nov-2010 20:31 34K -[TXT] bn.xml 01-Nov-2010 20:31 46K -[TXT] bn_in.xml 01-Nov-2010 20:31 34K -[TXT] bs.xml 01-Nov-2010 20:31 29K -[TXT] ca.xml 01-Nov-2010 20:31 30K -[TXT] charmap.xml 01-Nov-2010 20:31 6.6K -[TXT] common.xml 01-Nov-2010 20:31 18K -[TXT] cs.xml 01-Nov-2010 20:31 28K -[TXT] cy.xml 01-Nov-2010 20:31 43K -[TXT] da.xml 01-Nov-2010 20:31 30K -[TXT] de.xml 01-Nov-2010 20:31 30K -[TXT] el.xml 01-Nov-2010 20:31 32K -[TXT] en.xml 01-Nov-2010 20:31 42K -[TXT] eo.xml 01-Nov-2010 20:31 42K -[TXT] es.xml 01-Nov-2010 20:31 31K -[TXT] et.xml 01-Nov-2010 20:31 43K -[TXT] eu.xml 01-Nov-2010 20:31 43K -[TXT] fa.xml 01-Nov-2010 20:31 32K -[TXT] fi.xml 01-Nov-2010 20:31 30K -[TXT] fr.xml 01-Nov-2010 20:31 30K -[TXT] ga.xml 01-Nov-2010 20:31 43K -[TXT] gl.xml 01-Nov-2010 20:31 43K -[TXT] gu.xml 01-Nov-2010 20:31 33K -[TXT] he.xml 01-Nov-2010 20:31 44K -[TXT] hi.xml 01-Nov-2010 20:31 33K -[TXT] hr.xml 01-Nov-2010 20:31 30K -[TXT] hu.xml 01-Nov-2010 20:31 30K -[TXT] id.xml 01-Nov-2010 20:31 42K -[TXT] is.xml 01-Nov-2010 20:31 28K -[TXT] it.xml 01-Nov-2010 20:31 42K -[TXT] ja.xml 01-Nov-2010 20:31 29K -[TXT] ka.xml 01-Nov-2010 20:31 35K -[TXT] kn.xml 01-Nov-2010 20:31 47K -[TXT] ko.xml 01-Nov-2010 20:31 43K -[TXT] ky.xml 01-Nov-2010 20:31 33K -[   ] l10n.dtd 01-Nov-2010 20:31 1.3K -[TXT] l10n.xml 01-Nov-2010 20:31 2.9K -[TXT] la.xml 01-Nov-2010 20:31 43K -[TXT] lt.xml 01-Nov-2010 20:31 31K -[TXT] lv.xml 01-Nov-2010 20:31 42K -[TXT] ml.xml 01-Nov-2010 20:31 34K -[TXT] mn.xml 01-Nov-2010 20:31 34K -[TXT] mr.xml 01-Nov-2010 20:31 33K -[TXT] nb.xml 01-Nov-2010 20:31 43K -[TXT] nds.xml 01-Nov-2010 20:31 29K -[TXT] nl.xml 01-Nov-2010 20:31 30K -[TXT] nn.xml 01-Nov-2010 20:31 43K -[TXT] or.xml 01-Nov-2010 20:31 46K -[TXT] pa.xml 01-Nov-2010 20:31 32K -[TXT] pi.xml 01-Nov-2010 20:31 5.0K -[TXT] pl.xml 01-Nov-2010 20:31 30K -[TXT] pt.xml 01-Nov-2010 20:31 42K -[TXT] pt_br.xml 01-Nov-2010 20:31 42K -[TXT] refentry.xml 01-Nov-2010 20:31 22K -[TXT] ro.xml 01-Nov-2010 20:31 43K -[TXT] ru.xml 01-Nov-2010 20:31 34K -[TXT] sk.xml 01-Nov-2010 20:31 42K -[TXT] sl.xml 01-Nov-2010 20:31 43K -[TXT] sq.xml 01-Nov-2010 20:31 43K -[TXT] sr.xml 01-Nov-2010 20:31 33K -[TXT] sr_Latn.xml 01-Nov-2010 20:31 30K -[TXT] sv.xml 01-Nov-2010 20:31 30K -[TXT] ta.xml 01-Nov-2010 20:31 35K -[TXT] targetdatabase.dtd 01-Nov-2010 20:31 1.2K -[TXT] te.xml 01-Nov-2010 20:31 35K -[TXT] th.xml 01-Nov-2010 20:31 45K -[TXT] tl.xml 01-Nov-2010 20:31 43K -[TXT] tr.xml 01-Nov-2010 20:31 30K -[TXT] uk.xml 01-Nov-2010 20:31 33K -[TXT] utility.xml 01-Nov-2010 20:31 9.6K -[TXT] vi.xml 01-Nov-2010 20:31 43K -[TXT] xh.xml 01-Nov-2010 20:31 43K -[TXT] zh.xml 01-Nov-2010 20:31 27K -[TXT] zh_cn.xml 01-Nov-2010 20:31 27K -[TXT] zh_tw.xml 01-Nov-2010 20:31 29K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 1.6K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.1K -[TXT] charmap.xsl 01-Nov-2010 20:31 9.3K -[TXT] common.xsl 01-Nov-2010 20:31 73K -[TXT] entities.ent 01-Nov-2010 20:31 8.3K -[TXT] gentext.xsl 01-Nov-2010 20:31 30K -[TXT] insertfile.xsl 01-Nov-2010 20:31 4.0K -[TXT] l10n.xsl 01-Nov-2010 20:31 20K -[TXT] labels.xsl 01-Nov-2010 20:31 31K -[TXT] olink.xsl 01-Nov-2010 20:31 48K -[TXT] pi.xsl 01-Nov-2010 20:31 14K -[TXT] refentry.xsl 01-Nov-2010 20:31 55K -[TXT] subtitles.xsl 01-Nov-2010 20:31 6.3K -[TXT] table.xsl 01-Nov-2010 20:31 18K -[TXT] targets.xsl 01-Nov-2010 20:31 11K -[TXT] titles.xsl 01-Nov-2010 20:31 29K -[TXT] utility.xsl 01-Nov-2010 20:31 12K -[TXT] addns.xsl 01-Nov-2010 20:31 4.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=M;O=D deleted file mode 100644 index 15060ba21b12560412361a1d687150b5f2ba9268..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=M;O=D +++ /dev/null @@ -1,110 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/common - - -

    Index of /release/xsl-ns/1.76.1/common

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] addns.xsl 01-Nov-2010 20:31 4.6K -[TXT] utility.xsl 01-Nov-2010 20:31 12K -[TXT] titles.xsl 01-Nov-2010 20:31 29K -[TXT] targets.xsl 01-Nov-2010 20:31 11K -[TXT] table.xsl 01-Nov-2010 20:31 18K -[TXT] subtitles.xsl 01-Nov-2010 20:31 6.3K -[TXT] refentry.xsl 01-Nov-2010 20:31 55K -[TXT] pi.xsl 01-Nov-2010 20:31 14K -[TXT] olink.xsl 01-Nov-2010 20:31 48K -[TXT] labels.xsl 01-Nov-2010 20:31 31K -[TXT] l10n.xsl 01-Nov-2010 20:31 20K -[TXT] insertfile.xsl 01-Nov-2010 20:31 4.0K -[TXT] gentext.xsl 01-Nov-2010 20:31 30K -[TXT] entities.ent 01-Nov-2010 20:31 8.3K -[TXT] common.xsl 01-Nov-2010 20:31 73K -[TXT] charmap.xsl 01-Nov-2010 20:31 9.3K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.1K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 1.6K -[TXT] zh_tw.xml 01-Nov-2010 20:31 29K -[TXT] zh_cn.xml 01-Nov-2010 20:31 27K -[TXT] zh.xml 01-Nov-2010 20:31 27K -[TXT] xh.xml 01-Nov-2010 20:31 43K -[TXT] vi.xml 01-Nov-2010 20:31 43K -[TXT] utility.xml 01-Nov-2010 20:31 9.6K -[TXT] uk.xml 01-Nov-2010 20:31 33K -[TXT] tr.xml 01-Nov-2010 20:31 30K -[TXT] tl.xml 01-Nov-2010 20:31 43K -[TXT] th.xml 01-Nov-2010 20:31 45K -[TXT] te.xml 01-Nov-2010 20:31 35K -[TXT] targetdatabase.dtd 01-Nov-2010 20:31 1.2K -[TXT] ta.xml 01-Nov-2010 20:31 35K -[TXT] sv.xml 01-Nov-2010 20:31 30K -[TXT] sr_Latn.xml 01-Nov-2010 20:31 30K -[TXT] sr.xml 01-Nov-2010 20:31 33K -[TXT] sq.xml 01-Nov-2010 20:31 43K -[TXT] sl.xml 01-Nov-2010 20:31 43K -[TXT] sk.xml 01-Nov-2010 20:31 42K -[TXT] ru.xml 01-Nov-2010 20:31 34K -[TXT] ro.xml 01-Nov-2010 20:31 43K -[TXT] refentry.xml 01-Nov-2010 20:31 22K -[TXT] pt_br.xml 01-Nov-2010 20:31 42K -[TXT] pt.xml 01-Nov-2010 20:31 42K -[TXT] pl.xml 01-Nov-2010 20:31 30K -[TXT] pi.xml 01-Nov-2010 20:31 5.0K -[TXT] pa.xml 01-Nov-2010 20:31 32K -[TXT] or.xml 01-Nov-2010 20:31 46K -[TXT] nn.xml 01-Nov-2010 20:31 43K -[TXT] nl.xml 01-Nov-2010 20:31 30K -[TXT] nds.xml 01-Nov-2010 20:31 29K -[TXT] nb.xml 01-Nov-2010 20:31 43K -[TXT] mr.xml 01-Nov-2010 20:31 33K -[TXT] mn.xml 01-Nov-2010 20:31 34K -[TXT] ml.xml 01-Nov-2010 20:31 34K -[TXT] lv.xml 01-Nov-2010 20:31 42K -[TXT] lt.xml 01-Nov-2010 20:31 31K -[TXT] la.xml 01-Nov-2010 20:31 43K -[TXT] l10n.xml 01-Nov-2010 20:31 2.9K -[   ] l10n.dtd 01-Nov-2010 20:31 1.3K -[TXT] ky.xml 01-Nov-2010 20:31 33K -[TXT] ko.xml 01-Nov-2010 20:31 43K -[TXT] kn.xml 01-Nov-2010 20:31 47K -[TXT] ka.xml 01-Nov-2010 20:31 35K -[TXT] ja.xml 01-Nov-2010 20:31 29K -[TXT] it.xml 01-Nov-2010 20:31 42K -[TXT] is.xml 01-Nov-2010 20:31 28K -[TXT] id.xml 01-Nov-2010 20:31 42K -[TXT] hu.xml 01-Nov-2010 20:31 30K -[TXT] hr.xml 01-Nov-2010 20:31 30K -[TXT] hi.xml 01-Nov-2010 20:31 33K -[TXT] he.xml 01-Nov-2010 20:31 44K -[TXT] gu.xml 01-Nov-2010 20:31 33K -[TXT] gl.xml 01-Nov-2010 20:31 43K -[TXT] ga.xml 01-Nov-2010 20:31 43K -[TXT] fr.xml 01-Nov-2010 20:31 30K -[TXT] fi.xml 01-Nov-2010 20:31 30K -[TXT] fa.xml 01-Nov-2010 20:31 32K -[TXT] eu.xml 01-Nov-2010 20:31 43K -[TXT] et.xml 01-Nov-2010 20:31 43K -[TXT] es.xml 01-Nov-2010 20:31 31K -[TXT] eo.xml 01-Nov-2010 20:31 42K -[TXT] en.xml 01-Nov-2010 20:31 42K -[TXT] el.xml 01-Nov-2010 20:31 32K -[TXT] de.xml 01-Nov-2010 20:31 30K -[TXT] da.xml 01-Nov-2010 20:31 30K -[TXT] cy.xml 01-Nov-2010 20:31 43K -[TXT] cs.xml 01-Nov-2010 20:31 28K -[TXT] common.xml 01-Nov-2010 20:31 18K -[TXT] charmap.xml 01-Nov-2010 20:31 6.6K -[TXT] ca.xml 01-Nov-2010 20:31 30K -[TXT] bs.xml 01-Nov-2010 20:31 29K -[TXT] bn_in.xml 01-Nov-2010 20:31 34K -[TXT] bn.xml 01-Nov-2010 20:31 46K -[TXT] bg.xml 01-Nov-2010 20:31 34K -[TXT] az.xml 01-Nov-2010 20:31 30K -[TXT] ast.xml 01-Nov-2010 20:31 30K -[TXT] as.xml 01-Nov-2010 20:31 33K -[TXT] ar.xml 01-Nov-2010 20:31 44K -[TXT] am.xml 01-Nov-2010 20:31 44K -[TXT] af.xml 01-Nov-2010 20:31 43K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=N;O=A deleted file mode 100644 index f80fa368972f7148f028c27613ebe7917773c0af..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=N;O=A +++ /dev/null @@ -1,110 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/common - - -

    Index of /release/xsl-ns/1.76.1/common

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] addns.xsl 01-Nov-2010 20:31 4.6K -[TXT] af.xml 01-Nov-2010 20:31 43K -[TXT] am.xml 01-Nov-2010 20:31 44K -[TXT] ar.xml 01-Nov-2010 20:31 44K -[TXT] as.xml 01-Nov-2010 20:31 33K -[TXT] ast.xml 01-Nov-2010 20:31 30K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 1.6K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.1K -[TXT] az.xml 01-Nov-2010 20:31 30K -[TXT] bg.xml 01-Nov-2010 20:31 34K -[TXT] bn.xml 01-Nov-2010 20:31 46K -[TXT] bn_in.xml 01-Nov-2010 20:31 34K -[TXT] bs.xml 01-Nov-2010 20:31 29K -[TXT] ca.xml 01-Nov-2010 20:31 30K -[TXT] charmap.xml 01-Nov-2010 20:31 6.6K -[TXT] charmap.xsl 01-Nov-2010 20:31 9.3K -[TXT] common.xml 01-Nov-2010 20:31 18K -[TXT] common.xsl 01-Nov-2010 20:31 73K -[TXT] cs.xml 01-Nov-2010 20:31 28K -[TXT] cy.xml 01-Nov-2010 20:31 43K -[TXT] da.xml 01-Nov-2010 20:31 30K -[TXT] de.xml 01-Nov-2010 20:31 30K -[TXT] el.xml 01-Nov-2010 20:31 32K -[TXT] en.xml 01-Nov-2010 20:31 42K -[TXT] entities.ent 01-Nov-2010 20:31 8.3K -[TXT] eo.xml 01-Nov-2010 20:31 42K -[TXT] es.xml 01-Nov-2010 20:31 31K -[TXT] et.xml 01-Nov-2010 20:31 43K -[TXT] eu.xml 01-Nov-2010 20:31 43K -[TXT] fa.xml 01-Nov-2010 20:31 32K -[TXT] fi.xml 01-Nov-2010 20:31 30K -[TXT] fr.xml 01-Nov-2010 20:31 30K -[TXT] ga.xml 01-Nov-2010 20:31 43K -[TXT] gentext.xsl 01-Nov-2010 20:31 30K -[TXT] gl.xml 01-Nov-2010 20:31 43K -[TXT] gu.xml 01-Nov-2010 20:31 33K -[TXT] he.xml 01-Nov-2010 20:31 44K -[TXT] hi.xml 01-Nov-2010 20:31 33K -[TXT] hr.xml 01-Nov-2010 20:31 30K -[TXT] hu.xml 01-Nov-2010 20:31 30K -[TXT] id.xml 01-Nov-2010 20:31 42K -[TXT] insertfile.xsl 01-Nov-2010 20:31 4.0K -[TXT] is.xml 01-Nov-2010 20:31 28K -[TXT] it.xml 01-Nov-2010 20:31 42K -[TXT] ja.xml 01-Nov-2010 20:31 29K -[TXT] ka.xml 01-Nov-2010 20:31 35K -[TXT] kn.xml 01-Nov-2010 20:31 47K -[TXT] ko.xml 01-Nov-2010 20:31 43K -[TXT] ky.xml 01-Nov-2010 20:31 33K -[   ] l10n.dtd 01-Nov-2010 20:31 1.3K -[TXT] l10n.xml 01-Nov-2010 20:31 2.9K -[TXT] l10n.xsl 01-Nov-2010 20:31 20K -[TXT] la.xml 01-Nov-2010 20:31 43K -[TXT] labels.xsl 01-Nov-2010 20:31 31K -[TXT] lt.xml 01-Nov-2010 20:31 31K -[TXT] lv.xml 01-Nov-2010 20:31 42K -[TXT] ml.xml 01-Nov-2010 20:31 34K -[TXT] mn.xml 01-Nov-2010 20:31 34K -[TXT] mr.xml 01-Nov-2010 20:31 33K -[TXT] nb.xml 01-Nov-2010 20:31 43K -[TXT] nds.xml 01-Nov-2010 20:31 29K -[TXT] nl.xml 01-Nov-2010 20:31 30K -[TXT] nn.xml 01-Nov-2010 20:31 43K -[TXT] olink.xsl 01-Nov-2010 20:31 48K -[TXT] or.xml 01-Nov-2010 20:31 46K -[TXT] pa.xml 01-Nov-2010 20:31 32K -[TXT] pi.xml 01-Nov-2010 20:31 5.0K -[TXT] pi.xsl 01-Nov-2010 20:31 14K -[TXT] pl.xml 01-Nov-2010 20:31 30K -[TXT] pt.xml 01-Nov-2010 20:31 42K -[TXT] pt_br.xml 01-Nov-2010 20:31 42K -[TXT] refentry.xml 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 55K -[TXT] ro.xml 01-Nov-2010 20:31 43K -[TXT] ru.xml 01-Nov-2010 20:31 34K -[TXT] sk.xml 01-Nov-2010 20:31 42K -[TXT] sl.xml 01-Nov-2010 20:31 43K -[TXT] sq.xml 01-Nov-2010 20:31 43K -[TXT] sr.xml 01-Nov-2010 20:31 33K -[TXT] sr_Latn.xml 01-Nov-2010 20:31 30K -[TXT] subtitles.xsl 01-Nov-2010 20:31 6.3K -[TXT] sv.xml 01-Nov-2010 20:31 30K -[TXT] ta.xml 01-Nov-2010 20:31 35K -[TXT] table.xsl 01-Nov-2010 20:31 18K -[TXT] targetdatabase.dtd 01-Nov-2010 20:31 1.2K -[TXT] targets.xsl 01-Nov-2010 20:31 11K -[TXT] te.xml 01-Nov-2010 20:31 35K -[TXT] th.xml 01-Nov-2010 20:31 45K -[TXT] titles.xsl 01-Nov-2010 20:31 29K -[TXT] tl.xml 01-Nov-2010 20:31 43K -[TXT] tr.xml 01-Nov-2010 20:31 30K -[TXT] uk.xml 01-Nov-2010 20:31 33K -[TXT] utility.xml 01-Nov-2010 20:31 9.6K -[TXT] utility.xsl 01-Nov-2010 20:31 12K -[TXT] vi.xml 01-Nov-2010 20:31 43K -[TXT] xh.xml 01-Nov-2010 20:31 43K -[TXT] zh.xml 01-Nov-2010 20:31 27K -[TXT] zh_cn.xml 01-Nov-2010 20:31 27K -[TXT] zh_tw.xml 01-Nov-2010 20:31 29K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=N;O=D deleted file mode 100644 index 320cdc39a807ee72b8a85853bd20b8353dfbf610..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=N;O=D +++ /dev/null @@ -1,110 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/common - - -

    Index of /release/xsl-ns/1.76.1/common

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] zh_tw.xml 01-Nov-2010 20:31 29K -[TXT] zh_cn.xml 01-Nov-2010 20:31 27K -[TXT] zh.xml 01-Nov-2010 20:31 27K -[TXT] xh.xml 01-Nov-2010 20:31 43K -[TXT] vi.xml 01-Nov-2010 20:31 43K -[TXT] utility.xsl 01-Nov-2010 20:31 12K -[TXT] utility.xml 01-Nov-2010 20:31 9.6K -[TXT] uk.xml 01-Nov-2010 20:31 33K -[TXT] tr.xml 01-Nov-2010 20:31 30K -[TXT] tl.xml 01-Nov-2010 20:31 43K -[TXT] titles.xsl 01-Nov-2010 20:31 29K -[TXT] th.xml 01-Nov-2010 20:31 45K -[TXT] te.xml 01-Nov-2010 20:31 35K -[TXT] targets.xsl 01-Nov-2010 20:31 11K -[TXT] targetdatabase.dtd 01-Nov-2010 20:31 1.2K -[TXT] table.xsl 01-Nov-2010 20:31 18K -[TXT] ta.xml 01-Nov-2010 20:31 35K -[TXT] sv.xml 01-Nov-2010 20:31 30K -[TXT] subtitles.xsl 01-Nov-2010 20:31 6.3K -[TXT] sr_Latn.xml 01-Nov-2010 20:31 30K -[TXT] sr.xml 01-Nov-2010 20:31 33K -[TXT] sq.xml 01-Nov-2010 20:31 43K -[TXT] sl.xml 01-Nov-2010 20:31 43K -[TXT] sk.xml 01-Nov-2010 20:31 42K -[TXT] ru.xml 01-Nov-2010 20:31 34K -[TXT] ro.xml 01-Nov-2010 20:31 43K -[TXT] refentry.xsl 01-Nov-2010 20:31 55K -[TXT] refentry.xml 01-Nov-2010 20:31 22K -[TXT] pt_br.xml 01-Nov-2010 20:31 42K -[TXT] pt.xml 01-Nov-2010 20:31 42K -[TXT] pl.xml 01-Nov-2010 20:31 30K -[TXT] pi.xsl 01-Nov-2010 20:31 14K -[TXT] pi.xml 01-Nov-2010 20:31 5.0K -[TXT] pa.xml 01-Nov-2010 20:31 32K -[TXT] or.xml 01-Nov-2010 20:31 46K -[TXT] olink.xsl 01-Nov-2010 20:31 48K -[TXT] nn.xml 01-Nov-2010 20:31 43K -[TXT] nl.xml 01-Nov-2010 20:31 30K -[TXT] nds.xml 01-Nov-2010 20:31 29K -[TXT] nb.xml 01-Nov-2010 20:31 43K -[TXT] mr.xml 01-Nov-2010 20:31 33K -[TXT] mn.xml 01-Nov-2010 20:31 34K -[TXT] ml.xml 01-Nov-2010 20:31 34K -[TXT] lv.xml 01-Nov-2010 20:31 42K -[TXT] lt.xml 01-Nov-2010 20:31 31K -[TXT] labels.xsl 01-Nov-2010 20:31 31K -[TXT] la.xml 01-Nov-2010 20:31 43K -[TXT] l10n.xsl 01-Nov-2010 20:31 20K -[TXT] l10n.xml 01-Nov-2010 20:31 2.9K -[   ] l10n.dtd 01-Nov-2010 20:31 1.3K -[TXT] ky.xml 01-Nov-2010 20:31 33K -[TXT] ko.xml 01-Nov-2010 20:31 43K -[TXT] kn.xml 01-Nov-2010 20:31 47K -[TXT] ka.xml 01-Nov-2010 20:31 35K -[TXT] ja.xml 01-Nov-2010 20:31 29K -[TXT] it.xml 01-Nov-2010 20:31 42K -[TXT] is.xml 01-Nov-2010 20:31 28K -[TXT] insertfile.xsl 01-Nov-2010 20:31 4.0K -[TXT] id.xml 01-Nov-2010 20:31 42K -[TXT] hu.xml 01-Nov-2010 20:31 30K -[TXT] hr.xml 01-Nov-2010 20:31 30K -[TXT] hi.xml 01-Nov-2010 20:31 33K -[TXT] he.xml 01-Nov-2010 20:31 44K -[TXT] gu.xml 01-Nov-2010 20:31 33K -[TXT] gl.xml 01-Nov-2010 20:31 43K -[TXT] gentext.xsl 01-Nov-2010 20:31 30K -[TXT] ga.xml 01-Nov-2010 20:31 43K -[TXT] fr.xml 01-Nov-2010 20:31 30K -[TXT] fi.xml 01-Nov-2010 20:31 30K -[TXT] fa.xml 01-Nov-2010 20:31 32K -[TXT] eu.xml 01-Nov-2010 20:31 43K -[TXT] et.xml 01-Nov-2010 20:31 43K -[TXT] es.xml 01-Nov-2010 20:31 31K -[TXT] eo.xml 01-Nov-2010 20:31 42K -[TXT] entities.ent 01-Nov-2010 20:31 8.3K -[TXT] en.xml 01-Nov-2010 20:31 42K -[TXT] el.xml 01-Nov-2010 20:31 32K -[TXT] de.xml 01-Nov-2010 20:31 30K -[TXT] da.xml 01-Nov-2010 20:31 30K -[TXT] cy.xml 01-Nov-2010 20:31 43K -[TXT] cs.xml 01-Nov-2010 20:31 28K -[TXT] common.xsl 01-Nov-2010 20:31 73K -[TXT] common.xml 01-Nov-2010 20:31 18K -[TXT] charmap.xsl 01-Nov-2010 20:31 9.3K -[TXT] charmap.xml 01-Nov-2010 20:31 6.6K -[TXT] ca.xml 01-Nov-2010 20:31 30K -[TXT] bs.xml 01-Nov-2010 20:31 29K -[TXT] bn_in.xml 01-Nov-2010 20:31 34K -[TXT] bn.xml 01-Nov-2010 20:31 46K -[TXT] bg.xml 01-Nov-2010 20:31 34K -[TXT] az.xml 01-Nov-2010 20:31 30K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.1K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 1.6K -[TXT] ast.xml 01-Nov-2010 20:31 30K -[TXT] as.xml 01-Nov-2010 20:31 33K -[TXT] ar.xml 01-Nov-2010 20:31 44K -[TXT] am.xml 01-Nov-2010 20:31 44K -[TXT] af.xml 01-Nov-2010 20:31 43K -[TXT] addns.xsl 01-Nov-2010 20:31 4.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=S;O=A deleted file mode 100644 index 35e46f0bc936d02e523da49c929a81847e2a1d99..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=S;O=A +++ /dev/null @@ -1,110 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/common - - -

    Index of /release/xsl-ns/1.76.1/common

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] targetdatabase.dtd 01-Nov-2010 20:31 1.2K -[   ] l10n.dtd 01-Nov-2010 20:31 1.3K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 1.6K -[TXT] l10n.xml 01-Nov-2010 20:31 2.9K -[TXT] insertfile.xsl 01-Nov-2010 20:31 4.0K -[TXT] addns.xsl 01-Nov-2010 20:31 4.6K -[TXT] pi.xml 01-Nov-2010 20:31 5.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.1K -[TXT] subtitles.xsl 01-Nov-2010 20:31 6.3K -[TXT] charmap.xml 01-Nov-2010 20:31 6.6K -[TXT] entities.ent 01-Nov-2010 20:31 8.3K -[TXT] charmap.xsl 01-Nov-2010 20:31 9.3K -[TXT] utility.xml 01-Nov-2010 20:31 9.6K -[TXT] targets.xsl 01-Nov-2010 20:31 11K -[TXT] utility.xsl 01-Nov-2010 20:31 12K -[TXT] pi.xsl 01-Nov-2010 20:31 14K -[TXT] table.xsl 01-Nov-2010 20:31 18K -[TXT] common.xml 01-Nov-2010 20:31 18K -[TXT] l10n.xsl 01-Nov-2010 20:31 20K -[TXT] refentry.xml 01-Nov-2010 20:31 22K -[TXT] zh.xml 01-Nov-2010 20:31 27K -[TXT] zh_cn.xml 01-Nov-2010 20:31 27K -[TXT] is.xml 01-Nov-2010 20:31 28K -[TXT] cs.xml 01-Nov-2010 20:31 28K -[TXT] titles.xsl 01-Nov-2010 20:31 29K -[TXT] zh_tw.xml 01-Nov-2010 20:31 29K -[TXT] ja.xml 01-Nov-2010 20:31 29K -[TXT] bs.xml 01-Nov-2010 20:31 29K -[TXT] nds.xml 01-Nov-2010 20:31 29K -[TXT] hr.xml 01-Nov-2010 20:31 30K -[TXT] da.xml 01-Nov-2010 20:31 30K -[TXT] ast.xml 01-Nov-2010 20:31 30K -[TXT] ca.xml 01-Nov-2010 20:31 30K -[TXT] gentext.xsl 01-Nov-2010 20:31 30K -[TXT] tr.xml 01-Nov-2010 20:31 30K -[TXT] fi.xml 01-Nov-2010 20:31 30K -[TXT] hu.xml 01-Nov-2010 20:31 30K -[TXT] pl.xml 01-Nov-2010 20:31 30K -[TXT] nl.xml 01-Nov-2010 20:31 30K -[TXT] az.xml 01-Nov-2010 20:31 30K -[TXT] sv.xml 01-Nov-2010 20:31 30K -[TXT] de.xml 01-Nov-2010 20:31 30K -[TXT] sr_Latn.xml 01-Nov-2010 20:31 30K -[TXT] fr.xml 01-Nov-2010 20:31 30K -[TXT] es.xml 01-Nov-2010 20:31 31K -[TXT] lt.xml 01-Nov-2010 20:31 31K -[TXT] labels.xsl 01-Nov-2010 20:31 31K -[TXT] pa.xml 01-Nov-2010 20:31 32K -[TXT] fa.xml 01-Nov-2010 20:31 32K -[TXT] el.xml 01-Nov-2010 20:31 32K -[TXT] mr.xml 01-Nov-2010 20:31 33K -[TXT] hi.xml 01-Nov-2010 20:31 33K -[TXT] sr.xml 01-Nov-2010 20:31 33K -[TXT] ky.xml 01-Nov-2010 20:31 33K -[TXT] as.xml 01-Nov-2010 20:31 33K -[TXT] gu.xml 01-Nov-2010 20:31 33K -[TXT] uk.xml 01-Nov-2010 20:31 33K -[TXT] mn.xml 01-Nov-2010 20:31 34K -[TXT] ru.xml 01-Nov-2010 20:31 34K -[TXT] bg.xml 01-Nov-2010 20:31 34K -[TXT] bn_in.xml 01-Nov-2010 20:31 34K -[TXT] ml.xml 01-Nov-2010 20:31 34K -[TXT] ta.xml 01-Nov-2010 20:31 35K -[TXT] te.xml 01-Nov-2010 20:31 35K -[TXT] ka.xml 01-Nov-2010 20:31 35K -[TXT] en.xml 01-Nov-2010 20:31 42K -[TXT] eo.xml 01-Nov-2010 20:31 42K -[TXT] it.xml 01-Nov-2010 20:31 42K -[TXT] pt_br.xml 01-Nov-2010 20:31 42K -[TXT] lv.xml 01-Nov-2010 20:31 42K -[TXT] id.xml 01-Nov-2010 20:31 42K -[TXT] pt.xml 01-Nov-2010 20:31 42K -[TXT] sk.xml 01-Nov-2010 20:31 42K -[TXT] la.xml 01-Nov-2010 20:31 43K -[TXT] gl.xml 01-Nov-2010 20:31 43K -[TXT] sq.xml 01-Nov-2010 20:31 43K -[TXT] ga.xml 01-Nov-2010 20:31 43K -[TXT] nn.xml 01-Nov-2010 20:31 43K -[TXT] ko.xml 01-Nov-2010 20:31 43K -[TXT] cy.xml 01-Nov-2010 20:31 43K -[TXT] tl.xml 01-Nov-2010 20:31 43K -[TXT] sl.xml 01-Nov-2010 20:31 43K -[TXT] nb.xml 01-Nov-2010 20:31 43K -[TXT] et.xml 01-Nov-2010 20:31 43K -[TXT] ro.xml 01-Nov-2010 20:31 43K -[TXT] vi.xml 01-Nov-2010 20:31 43K -[TXT] eu.xml 01-Nov-2010 20:31 43K -[TXT] af.xml 01-Nov-2010 20:31 43K -[TXT] xh.xml 01-Nov-2010 20:31 43K -[TXT] ar.xml 01-Nov-2010 20:31 44K -[TXT] he.xml 01-Nov-2010 20:31 44K -[TXT] am.xml 01-Nov-2010 20:31 44K -[TXT] th.xml 01-Nov-2010 20:31 45K -[TXT] or.xml 01-Nov-2010 20:31 46K -[TXT] bn.xml 01-Nov-2010 20:31 46K -[TXT] kn.xml 01-Nov-2010 20:31 47K -[TXT] olink.xsl 01-Nov-2010 20:31 48K -[TXT] refentry.xsl 01-Nov-2010 20:31 55K -[TXT] common.xsl 01-Nov-2010 20:31 73K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=S;O=D deleted file mode 100644 index be67cdee0f8130f000fa8f5390b541074ccfae58..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/index.html?C=S;O=D +++ /dev/null @@ -1,110 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/common - - -

    Index of /release/xsl-ns/1.76.1/common

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] common.xsl 01-Nov-2010 20:31 73K -[TXT] refentry.xsl 01-Nov-2010 20:31 55K -[TXT] olink.xsl 01-Nov-2010 20:31 48K -[TXT] kn.xml 01-Nov-2010 20:31 47K -[TXT] bn.xml 01-Nov-2010 20:31 46K -[TXT] or.xml 01-Nov-2010 20:31 46K -[TXT] th.xml 01-Nov-2010 20:31 45K -[TXT] am.xml 01-Nov-2010 20:31 44K -[TXT] he.xml 01-Nov-2010 20:31 44K -[TXT] ar.xml 01-Nov-2010 20:31 44K -[TXT] xh.xml 01-Nov-2010 20:31 43K -[TXT] af.xml 01-Nov-2010 20:31 43K -[TXT] eu.xml 01-Nov-2010 20:31 43K -[TXT] vi.xml 01-Nov-2010 20:31 43K -[TXT] ro.xml 01-Nov-2010 20:31 43K -[TXT] et.xml 01-Nov-2010 20:31 43K -[TXT] nb.xml 01-Nov-2010 20:31 43K -[TXT] sl.xml 01-Nov-2010 20:31 43K -[TXT] tl.xml 01-Nov-2010 20:31 43K -[TXT] cy.xml 01-Nov-2010 20:31 43K -[TXT] ko.xml 01-Nov-2010 20:31 43K -[TXT] nn.xml 01-Nov-2010 20:31 43K -[TXT] ga.xml 01-Nov-2010 20:31 43K -[TXT] sq.xml 01-Nov-2010 20:31 43K -[TXT] gl.xml 01-Nov-2010 20:31 43K -[TXT] la.xml 01-Nov-2010 20:31 43K -[TXT] sk.xml 01-Nov-2010 20:31 42K -[TXT] pt.xml 01-Nov-2010 20:31 42K -[TXT] id.xml 01-Nov-2010 20:31 42K -[TXT] lv.xml 01-Nov-2010 20:31 42K -[TXT] pt_br.xml 01-Nov-2010 20:31 42K -[TXT] it.xml 01-Nov-2010 20:31 42K -[TXT] eo.xml 01-Nov-2010 20:31 42K -[TXT] en.xml 01-Nov-2010 20:31 42K -[TXT] ka.xml 01-Nov-2010 20:31 35K -[TXT] te.xml 01-Nov-2010 20:31 35K -[TXT] ta.xml 01-Nov-2010 20:31 35K -[TXT] ml.xml 01-Nov-2010 20:31 34K -[TXT] bn_in.xml 01-Nov-2010 20:31 34K -[TXT] bg.xml 01-Nov-2010 20:31 34K -[TXT] ru.xml 01-Nov-2010 20:31 34K -[TXT] mn.xml 01-Nov-2010 20:31 34K -[TXT] uk.xml 01-Nov-2010 20:31 33K -[TXT] gu.xml 01-Nov-2010 20:31 33K -[TXT] as.xml 01-Nov-2010 20:31 33K -[TXT] ky.xml 01-Nov-2010 20:31 33K -[TXT] sr.xml 01-Nov-2010 20:31 33K -[TXT] hi.xml 01-Nov-2010 20:31 33K -[TXT] mr.xml 01-Nov-2010 20:31 33K -[TXT] el.xml 01-Nov-2010 20:31 32K -[TXT] fa.xml 01-Nov-2010 20:31 32K -[TXT] pa.xml 01-Nov-2010 20:31 32K -[TXT] labels.xsl 01-Nov-2010 20:31 31K -[TXT] lt.xml 01-Nov-2010 20:31 31K -[TXT] es.xml 01-Nov-2010 20:31 31K -[TXT] fr.xml 01-Nov-2010 20:31 30K -[TXT] sr_Latn.xml 01-Nov-2010 20:31 30K -[TXT] de.xml 01-Nov-2010 20:31 30K -[TXT] sv.xml 01-Nov-2010 20:31 30K -[TXT] az.xml 01-Nov-2010 20:31 30K -[TXT] nl.xml 01-Nov-2010 20:31 30K -[TXT] pl.xml 01-Nov-2010 20:31 30K -[TXT] hu.xml 01-Nov-2010 20:31 30K -[TXT] fi.xml 01-Nov-2010 20:31 30K -[TXT] tr.xml 01-Nov-2010 20:31 30K -[TXT] gentext.xsl 01-Nov-2010 20:31 30K -[TXT] ca.xml 01-Nov-2010 20:31 30K -[TXT] ast.xml 01-Nov-2010 20:31 30K -[TXT] da.xml 01-Nov-2010 20:31 30K -[TXT] hr.xml 01-Nov-2010 20:31 30K -[TXT] nds.xml 01-Nov-2010 20:31 29K -[TXT] bs.xml 01-Nov-2010 20:31 29K -[TXT] ja.xml 01-Nov-2010 20:31 29K -[TXT] zh_tw.xml 01-Nov-2010 20:31 29K -[TXT] titles.xsl 01-Nov-2010 20:31 29K -[TXT] cs.xml 01-Nov-2010 20:31 28K -[TXT] is.xml 01-Nov-2010 20:31 28K -[TXT] zh_cn.xml 01-Nov-2010 20:31 27K -[TXT] zh.xml 01-Nov-2010 20:31 27K -[TXT] refentry.xml 01-Nov-2010 20:31 22K -[TXT] l10n.xsl 01-Nov-2010 20:31 20K -[TXT] common.xml 01-Nov-2010 20:31 18K -[TXT] table.xsl 01-Nov-2010 20:31 18K -[TXT] pi.xsl 01-Nov-2010 20:31 14K -[TXT] utility.xsl 01-Nov-2010 20:31 12K -[TXT] targets.xsl 01-Nov-2010 20:31 11K -[TXT] utility.xml 01-Nov-2010 20:31 9.6K -[TXT] charmap.xsl 01-Nov-2010 20:31 9.3K -[TXT] entities.ent 01-Nov-2010 20:31 8.3K -[TXT] charmap.xml 01-Nov-2010 20:31 6.6K -[TXT] subtitles.xsl 01-Nov-2010 20:31 6.3K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.1K -[TXT] pi.xml 01-Nov-2010 20:31 5.0K -[TXT] addns.xsl 01-Nov-2010 20:31 4.6K -[TXT] insertfile.xsl 01-Nov-2010 20:31 4.0K -[TXT] l10n.xml 01-Nov-2010 20:31 2.9K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 1.6K -[   ] l10n.dtd 01-Nov-2010 20:31 1.3K -[TXT] targetdatabase.dtd 01-Nov-2010 20:31 1.2K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/insertfile.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/insertfile.xsl deleted file mode 100644 index b9160f1033bbec3292581befca56069e13742215..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/insertfile.xsl +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/is.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/is.xml deleted file mode 100644 index 6a5b07ff28251562af924d6fc002f9d84a6ad7e8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/is.xml +++ /dev/null @@ -1,672 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -tákn -A -a -à -á -B -b -D -d -Ä -ð -E -e -É -é -F -f -G -g -H -h -I -i -à -í -J -j -K -k -L -l -M -m -N -n -O -o -Ó -ó -P -p -R -r -S -s -T -t -U -u -Ú -ú -V -v -X -x -Y -y -à -ý -Þ -þ -Æ -æ -Ö -ö - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/it.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/it.xml deleted file mode 100644 index 691e4d25862b0a7572d3226bec8e36c07b604cee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/it.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Simboli -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ja.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ja.xml deleted file mode 100644 index 4dd809babbc0163cb816c7e698ac7e5e80de75d4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ja.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -シンボル -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ka.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ka.xml deleted file mode 100644 index bd6d29c45a9e7f5feeab90d3963c5ce605c429cf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ka.xml +++ /dev/null @@ -1,700 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -სიმბáƒáƒšáƒáƒ”ბი -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -რ-ბ -გ -დ -ე -ვ -ზ -ჱ -თ -ი -კ -ლ -მ -ნ -ჲ -რ-პ -ჟ -რ -ს -ტ -ჳ -უ -ფ -ქ -ღ -ყ -შ -ჩ -ც -ძ -წ -ჭ -ხ -ჴ -ჯ -ჰ -ჵ -ჶ -ჷ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/kn.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/kn.xml deleted file mode 100644 index 5c246f1cdf090e5af948846b9656f734213c10fe..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/kn.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ಸಂಕೇತಗಳೠ-A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ko.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ko.xml deleted file mode 100644 index 526407738c8ea62fc24589a3db92957114a7bc9b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ko.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ky.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ky.xml deleted file mode 100644 index eb2e50ec61b11b480d1db4988e3d6716bc10ca6b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ky.xml +++ /dev/null @@ -1,732 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Символдор -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Ð -а -Б -б -Ð’ -в -Г -г -Д -д -Е -е -Ð -Ñ‘ -Ж -ж -З -з -И -и -Й -й -К -к -Л -л -Ðœ -м -Ð -н -Ò¢ -Ò£ -О -о -Ó¨ -Ó© -П -п -Р -Ñ€ -С -Ñ -Т -Ñ‚ -У -у -Ò® -Ò¯ -Ф -Ñ„ -Ð¥ -Ñ… -Ц -ц -Ч -ч -Ш -ш -Щ -щ -Ъ -ÑŠ -Ы -Ñ‹ -Ь -ÑŒ -Э -Ñ -Ю -ÑŽ -Я -Ñ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/l10n.dtd b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/l10n.dtd deleted file mode 100644 index 9bf2f66b70bdc1e2a9834e19875c175a7af5e1a8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/l10n.dtd +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/l10n.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/l10n.xml deleted file mode 100644 index da3df27875a339099bdbf19a239f421d0afa0447..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/l10n.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/l10n.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/l10n.xsl deleted file mode 100644 index 524a38e1ee5137ff915b8a8464722fa2931fc208..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/l10n.xsl +++ /dev/null @@ -1,594 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No localization exists for " - - " or " - - ". Using default " - - ". - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No " - - " localization of " - - " exists - - - . - - - ; using "en". - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bullet - - - - - - - - - - - - - - - - - - - - No " - - " localization of dingbat - - exists; using "en". - - - - - - - - - - - - - - - - startquote - - - - - - endquote - - - - - - nestedstartquote - - - - - - nestedendquote - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No " - - " localization exists. - - - - - - - - No context named " - - " exists in the " - - " localization. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No template for " - - " (or any of its leaves) exists in the context named " - - " in the " - - " localization. - - - - - - - - - - - - - - - - - - - - No " - - " localization exists. - - - - - - - - - - No context named " - - " exists in the " - - " localization. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No template for " - - " (or any of its leaves) exists in the context named " - - " in the " - - " localization. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 0 - - - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/la.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/la.xml deleted file mode 100644 index f8a7013c9116d84c0d53cd1e2ebf1b72962fdb8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/la.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/labels.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/labels.xsl deleted file mode 100644 index 1d6ecacb27d4cd624aa8fbe3ff4634905e984aa3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/labels.xsl +++ /dev/null @@ -1,891 +0,0 @@ - - - - - - - - - - -Provides access to element labels - -Processing an element in the -label.markup mode produces the -element label. -Trailing punctuation is not added to the label. - - - - - - . - - - - - - - Request for label of unexpected element: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - label.markup: this can't happen! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - a - i - A - I - - - - Unexpected numeration: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - -Returns true if $section should be labelled - -Returns true if the specified section should be labelled. -By default, this template returns zero unless -the section level is less than or equal to the value of the -$section.autolabel.max.depth parameter, in -which case it returns -$section.autolabel. -Custom stylesheets may override it to get more selective behavior. - - - - - - - - - - - - - - - 1 - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - Unexpected .autolabel value: - ; using default. - - - - - - - - - -Returns format for autolabel parameters - -Returns format passed as parameter if non zero. Supported - format are 'arabic' or '1', 'loweralpha' or 'a', 'lowerroman' or 'i', - 'upperlapha' or 'A', 'upperroman' or 'I', 'arabicindic' or '١'. - If its not one of these then - returns the default format. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/lt.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/lt.xml deleted file mode 100644 index 9f9a5452335af685e04244d936a478e78fdb37a7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/lt.xml +++ /dev/null @@ -1,678 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Simboliai -A -a -Ä„ -Ä… -B -b -C -c -ÄŒ -Ä -D -d -E -e -Ę -Ä™ -Ä– -Ä— -F -f -G -g -H -h -I -i -Ä® -į -Y -y -J -j -K -k -L -l -M -m -N -n -O -o -P -p -R -r -S -s -Å  -Å¡ -T -t -U -u -Ų -ų -Ū -Å« -V -v -Z -z -Ž -ž -Q -q -W -w -X -x - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/lv.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/lv.xml deleted file mode 100644 index ce6ba4988ea75dacdfa27ef8a366d08f5901fdbc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/lv.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ml.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ml.xml deleted file mode 100644 index 280e7dbb319eb0977ec2c976b7af14fc1c9a488f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ml.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -à´šà´¿à´¹àµà´¨à´™àµà´™à´³àµâ€ -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/mn.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/mn.xml deleted file mode 100644 index ef955266576d372e279a222e01edfc3ff46fa1b1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/mn.xml +++ /dev/null @@ -1,730 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ТÑмдÑгтүүд -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Ð -а -Б -б -Ð’ -в -Г -г -Д -д -Е -е -Ð -Ñ‘ -Ж -ж -З -з -И -и -Й -й -К -к -Л -л -Ðœ -м -Ð -н -О -о -Ó¨ -Ó© -П -п -Р -Ñ€ -С -Ñ -Т -Ñ‚ -У -у -Ò® -Ò¯ -Ф -Ñ„ -Ð¥ -Ñ… -Ц -ц -Ч -ч -Ш -ш -Щ -щ -Ъ -ÑŠ -Ы -Ñ‹ -Ь -ÑŒ -Э -Ñ -Ю -ÑŽ -Я -Ñ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/mr.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/mr.xml deleted file mode 100644 index 798fff56f7ea80547def2f614344bc40a896f7d8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/mr.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -पà¥à¤°à¤¤à¥€à¤• -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nb.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nb.xml deleted file mode 100644 index b9d8a4f15401543560236a4754007eb12b004b44..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nb.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nds.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nds.xml deleted file mode 100644 index af4b296be75b96ce296d8bcbf44e2a6bc2381fa6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nds.xml +++ /dev/null @@ -1,666 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbole -A -a -Ä -ä -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -Ö -ö -P -p -Q -q -R -r -S -s -T -t -U -u -Ãœ -ü -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nl.xml deleted file mode 100644 index 33fb1f41e5d19d98ea29072daa8563d02ddf58ff..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nl.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbolen -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nn.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nn.xml deleted file mode 100644 index 4898d427821f9cfb84cbe3062b3eb22c3d32c43a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/nn.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/olink.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/olink.xsl deleted file mode 100644 index 5c5a2f9f68c07b1920418a98de7f6ff8f7bfda7a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/olink.xsl +++ /dev/null @@ -1,1227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olinks not processed: must specify a - $target.database.document parameter - when using olinks with targetdoc - and targetptr attributes. - - - - - - Olink error: could not open target database ' - - '. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olink debug: cases for targetdoc=' - - ' and targetptr=' - - ' in language ' - - '. - - - - - - - - - - - - - - Olink debug: CaseA matched. - - - - Olink debug: CaseA NOT matched - - - - - - - - - - - - - - - - Olink debug: CaseB matched. - - - - Olink debug: CaseB NOT matched - - - - - - - - - - - - - - - - - Olink debug: CaseC matched. - - - - Olink debug: CaseC NOT matched. - - - - - - - - - - - - - - - - - Olink debug: CaseD matched. - - - - Olink debug: CaseD NOT matched - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olink debug: CaseE matched. - - - - Olink debug: CaseE NOT matched. - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olink debug: CaseF matched. - - - - Olink debug: CaseF NOT matched. - - - - - - - - - - - - - - Olink debug: CaseB key is the final selection: - - - - - - - - - Olink debug: CaseA key is the final selection: - - - - - - - - - Olink debug: CaseC key is the final selection: - - - - - - - - - Olink debug: CaseD key is the final selection: - - - - - - - - - Olink debug: CaseF key is the final selection: - - - - - - - - - Olink debug: CaseE key is the final selection: - - - - - - - - Olink debug: No case matched for lang ' - - '. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olink error: cannot compute relative - sitemap path because $current.docid ' - - ' not found in target database. - - - - - - - Olink warning: cannot compute relative - sitemap path without $current.docid parameter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - xrefstyle is ' - - '. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olink error: no gentext template - exists for xrefstyle ' - - ' for element ' - - ' in language ' - - ' in context 'xref-number-and-title - '. Using template without @style. - - - - - - - - Olink error: no gentext template - exists for xrefstyle ' - - ' for element ' - - ' in language ' - - ' in context 'xref-number - '. Using template without @style. - - - - - - - - Olink error: no gentext template - exists for xrefstyle ' - - ' for element ' - - ' in language ' - - ' in context 'xref - '. Using template without @style. - - - - - - Olink error: no gentext template - exists for xrefstyle ' - - ' for element ' - - ' in language ' - - '. Trying '%t'. - - - - - - - - - - - Olink debug: xrefstyle template is ' - - '. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olink error: no generated text for - targetdoc/targetptr/lang = ' - - '. - - ???? - - - - - - - Olink error: no generated text for - targetdoc/targetptr/lang = ' - - '. - - - ???? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olink error: cannot locate targetdoc in sitemap - - - - - - - / - - - - - - - - - - - ../ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/or.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/or.xml deleted file mode 100644 index 2995ac0fda5e4108299d5adabb487efb1954d72d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/or.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ପà­à¬°à¬¤à­€à¬• -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pa.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pa.xml deleted file mode 100644 index 08ef7714cd6c0f478f8990a4b7aaddf335420e03..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pa.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ਚਿੰਨ -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pi.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pi.xml deleted file mode 100644 index 64efdcae77494581fabba9c6611315944a26671b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pi.xml +++ /dev/null @@ -1,168 +0,0 @@ - - -Common Processing Instruction Reference - - $Id: pi.xsl 8782 2010-07-27 21:15:17Z mzjn $ - - - - Introduction - -This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the - “common†part of the DocBook XSL stylesheets. - - -You add these PIs at particular points in a document to - cause specific “exceptions†to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - -dbchoice_choice -Generates a localized choice separator - - - - dbchoice choice="and"|"or"|string" - - -Description - -Use the dbchoice choice PI to - generate an appropriate localized “choice†separator (for - example, and or or) - before the final item in an inline simplelist - - - -This PI is a less-than-ideal hack; support for it may - disappear in the future (particularly if and when a more - appropriate means for marking up "choice" lists becomes - available in DocBook). - - - Parameters - - - choice="and" - - -generates a localized and separator - - - - choice="or" - - -generates a localized or separator - - - - choice="string" - - -generates a literal string separator - - - - - - - - - -dbtimestamp -Inserts a date timestamp - - - - dbtimestamp format="formatstring" [padding="0"|"1"] - - -Description - -Use the dbtimestamp PI at any point in a - source document to cause a date timestamp (a formatted - string representing the current date and time) to be - inserted in output of the document. - - Parameters - - - format="formatstring" - - -Specifies format in which the date and time are - output - - - -For details of the content of the format string, - see Date and time. - - - - - padding="0"|"1" - - -Specifies padding behavior; if non-zero, padding is is added - - - - - - - - - -dbtex_delims -Generates delimiters around embedded TeX equations - in output - - - - dbtex delims="no"|"yes" - - -Description - -Use the dbtex delims PI as a - child of a textobject containing embedded TeX - markup, to cause that markup to be surrounded by - $ delimiter characters in output. - - - -This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - Parameters - - - dbtex delims="no"|"yes" - - -Specifies whether delimiters are output - - - - - - Related Global Parameters - -tex.math.delims - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pi.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pi.xsl deleted file mode 100644 index 7a425f6dab2c6e646d71ad8bad34f98fe03cd464..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pi.xsl +++ /dev/null @@ -1,347 +0,0 @@ - - - - - -Common Processing Instruction Reference - - $Id: pi.xsl 8782 2010-07-27 21:15:17Z mzjn $ - - - - Introduction - This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the - “common†part of the DocBook XSL stylesheets. - - You add these PIs at particular points in a document to - cause specific “exceptions†to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - Generates a localized choice separator - - Use the dbchoice choice PI to - generate an appropriate localized “choice†separator (for - example, and or or) - before the final item in an inline simplelist - - This PI is a less-than-ideal hack; support for it may - disappear in the future (particularly if and when a more - appropriate means for marking up "choice" lists becomes - available in DocBook). - - - - dbchoice choice="and"|"or"|string" - - - - choice="and" - - generates a localized and separator - - - choice="or" - - generates a localized or separator - - - choice="string" - - generates a literal string separator - - - - - - - - - - choice - - - - - Inserts a date timestamp - - Use the dbtimestamp PI at any point in a - source document to cause a date timestamp (a formatted - string representing the current date and time) to be - inserted in output of the document. - - - dbtimestamp format="formatstring" [padding="0"|"1"] - - - - format="formatstring" - - Specifies format in which the date and time are - output - - For details of the content of the format string, - see Date and time. - - - - padding="0"|"1" - - Specifies padding behavior; if non-zero, padding is is added - - - - - - - - - - - format - - - - - - - - - - - - - - - - - - - padding - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - Timestamp processing requires XSLT processor with EXSLT date support. - - - - - - - Generates delimiters around embedded TeX equations - in output - - Use the dbtex delims PI as a - child of a textobject containing embedded TeX - markup, to cause that markup to be surrounded by - $ delimiter characters in output. - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - - dbtex delims="no"|"yes" - - - - dbtex delims="no"|"yes" - - Specifies whether delimiters are output - - - - - - - tex.math.delims - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - 0 - - - - - - - 0 - - - - 0 - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - Timestamp processing requires an XSLT processor with support - for the EXSLT node-set() function. - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pl.xml deleted file mode 100644 index 186ed3bb34887b10248ff4bce3dbe98b76580d2f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pl.xml +++ /dev/null @@ -1,678 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbole -A -a -Ä„ -Ä… -B -b -C -c -Ć -ć -D -d -E -e -Ę -Ä™ -F -f -G -g -H -h -I -i -J -j -K -k -L -l -Å -Å‚ -M -m -N -n -Ń -Å„ -O -o -Ó -ó -P -p -Q -q -R -r -S -s -Åš -Å› -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Ź -ź -Å» -ż - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pt.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pt.xml deleted file mode 100644 index 4a07359e103337293c557cb39bb93b5f934a9b2e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pt.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Símbolos -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pt_br.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pt_br.xml deleted file mode 100644 index 3e71821cd8841a29af73deacc498072f0f971c3c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/pt_br.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Símbolos -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/refentry.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/refentry.xml deleted file mode 100644 index 4741ce0dad4480da93f3783a2798e25d59f23a53..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/refentry.xml +++ /dev/null @@ -1,781 +0,0 @@ - - - - - Common » Refentry Metadata Template Reference - - $Id: refentry.xsl 7867 2008-03-07 09:54:25Z xmldoc $ - - - - - Introduction - -This is technical reference documentation for the “refentry - metadata†templates in the DocBook XSL Stylesheets. - - -This is not intended to be user documentation. It is provided - for developers writing customization layers for the stylesheets. - - - -Currently, only the manpages stylesheets make use of these - templates. They are, however, potentially useful elsewhere. - - - - - - -get.refentry.metadata -Gathers metadata from a refentry and its ancestors - - -<xsl:template name="get.refentry.metadata"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -Reference documentation for particular commands, functions, - etc., is sometimes viewed in isolation from its greater "context". For - example, users view Unix man pages as, well, individual pages, not as - part of a "book" of some kind. Therefore, it is sometimes necessary to - embed "context" information in output for each refentry. - - - -However, one problem is that different users mark up that - context information in different ways. Often (usually), the - context information is not actually part of the content of the - refentry itself, but instead part of the content of a - parent or ancestor element to the refentry. And - even then, DocBook provides a variety of elements that users might - potentially use to mark up the same kind of information. One user - might use the productnumber element to mark up version - information about a particular product, while another might use - the releaseinfo element. - - - -Taking all that in mind, the - get.refentry.metadata template tries to gather - metadata from a refentry element and its ancestor - elements in an intelligent and user-configurable way. The basic - mechanism used in the XPath expressions throughout this stylesheet - is to select the relevant metadata from the *info element that is - closest to the actual refentry – either on the - refentry itself, or on its nearest ancestor. - - - - -The get.refentry.metadata - template is actually just sort of a "driver" template; it - calls other templates that do the actual data collection, - then returns the data as a set. - - - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing user preferences (from global - stylesheet parameters) - - - - - - Returns - -Returns a node set with the following elements. The - descriptions are verbatim from the man(7) man - page. - - - - title - - -the title of the man page (e.g., MAN) - - - - - section - - -the section number the man page should be placed in (e.g., - 7) - - - - - date - - -the date of the last revision - - - - - source - - -the source of the command - - - - - manual - - -the title of the manual (e.g., Linux - Programmer's Manual) - - - - - - - - - - - -get.refentry.title -Gets title metadata for a refentry - - -<xsl:template name="get.refentry.title"> -<xsl:param name="refname"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - title of the man page (e.g., MAN). This differs - from refname in that, if the refentry has a - refentrytitle, we use that as the title; - otherwise, we just use first refname in the first - refnamediv in the source. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - - Returns - -Returns a title node. - - - - -get.refentry.section -Gets section metadata for a refentry - - -<xsl:template name="get.refentry.section"> -<xsl:param name="refname"/> -<xsl:param name="quiet" select="0"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - section number the man page should be placed in (e.g., - 7)". If we do not find a manvolnum - specified in the source, and we find that the refentry is - for a function, we use the section number 3 - ["Library calls (functions within program libraries)"]; otherwise, we - default to using 1 ["Executable programs or shell - commands"]. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - quiet - - -If non-zero, no "missing" message is emitted - - - - - - Returns - -Returns a string representing a section number. - - - - -get.refentry.date -Gets date metadata for a refentry - - -<xsl:template name="get.refentry.date"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - date of the last revision". If we cannot find a date in the source, we - generate one. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global stylesheet parameters) - - - - - - Returns - -Returns a date node. - - - - - -get.refentry.source -Gets source metadata for a refentry - - -<xsl:template name="get.refentry.source"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - source of the command", and provides the following examples: - - - - -For binaries, use something like: GNU, NET-2, SLS - Distribution, MCC Distribution. - - - - -For system calls, use the version of the kernel that you are - currently looking at: Linux 0.99.11. - - - - -For library calls, use the source of the function: GNU, BSD - 4.3, Linux DLL 4.4.1. - - - - - - - - -The solbook(5) man page describes - something very much like what man(7) calls - "source", except that solbook(5) names it - "software" and describes it like this: -
    - -This is the name of the software product that the topic - discussed on the reference page belongs to. For example UNIX - commands are part of the SunOS x.x - release. - -
    -
    - - - -In practice, there are many pages that simply have a version - number in the "source" field. So, it looks like what we have is a - two-part field, - Name Version, - where: - - - - Name - - -product name (e.g., BSD) or org. name (e.g., GNU) - - - - - Version - - -version name - - - - - - Each part is optional. If the Name is a - product name, then the Version is probably - the version of the product. Or there may be no - Name, in which case, if there is a - Version, it is probably the version of the - item itself, not the product it is part of. Or, if the - Name is an organization name, then there - probably will be no Version. - - -
    Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns - -Returns a source node. - -
    - - - -get.refentry.source.name -Gets source-name metadata for a refentry - - -<xsl:template name="get.refentry.source.name"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -A "source name" is one part of a (potentially) two-part - Name Version - source field. For more details, see the documentation for the - get.refentry.source template. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns - -Depending on what output method is used for the - current stylesheet, either returns a text node or possibly an element - node, containing "source name" data. - - - - - -get.refentry.version -Gets version metadata for a refentry - - -<xsl:template name="get.refentry.version"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -A "version" is one part of a (potentially) two-part - Name Version - source field. For more details, see the documentation for the - get.refentry.source template. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns - -Depending on what output method is used for the - current stylesheet, either returns a text node or possibly an element - node, containing "version" data. - - - - - -get.refentry.manual -Gets source metadata for a refentry - - -<xsl:template name="get.refentry.manual"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - title of the manual (e.g., Linux Programmer's - Manual)". Here are some examples from existing man pages: - - - - -dpkg utilities - (dpkg-name) - - - - -User Contributed Perl Documentation - (GET) - - - - -GNU Development Tools - (ld) - - - - -Emperor Norton Utilities - (ddate) - - - - -Debian GNU/Linux manual - (faked) - - - - -GIMP Manual Pages - (gimp) - - - - -KDOC Documentation System - (qt2kdoc) - - - - - - - - -The solbook(5) man page describes - something very much like what man(7) calls - "manual", except that solbook(5) names it - "sectdesc" and describes it like this: -
    - -This is the section title of the reference page; for - example User Commands. - -
    -
    - - -
    Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns - -Returns a manual node. - -
    - - - -get.refentry.metadata.prefs -Gets user preferences for refentry metadata gathering - - -<xsl:template name="get.refentry.metadata.prefs"/> - -Description - -The DocBook XSL stylesheets include several user-configurable - global stylesheet parameters for controlling refentry - metadata gathering. Those parameters are not read directly by the - other refentry metadata-gathering - templates. Instead, they are read only by the - get.refentry.metadata.prefs template, - which assembles them into a structure that is then passed to - the other refentry metadata-gathering - templates. - - - -So the, get.refentry.metadata.prefs - template is the only interface to collecting stylesheet parameters for - controlling refentry metadata gathering. - - Parameters - -There are no local parameters for this template; however, it - does rely on a number of global parameters. - - Returns - -Returns a manual node. - - - - - -set.refentry.metadata -Sets content of a refentry metadata item - - -<xsl:template name="set.refentry.metadata"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="contents"/> -<xsl:param name="context"/> -<xsl:param name="preferred"/> - ... -</xsl:template> - -Description - -The set.refentry.metadata template is - called each time a suitable source element is found for a certain - metadata field. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A single *info node that contains the selected source element. - - - - - contents - - -A node containing the selected source element. - - - - - context - - -A string describing the metadata context in which the - set.refentry.metadata template was - called: either "date", "source", "version", or "manual". - - - - - - Returns - -Returns formatted contents of a selected source element. - -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/refentry.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/refentry.xsl deleted file mode 100644 index f6014e1c69014c0e3ccea93506b68e3c7382285f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/refentry.xsl +++ /dev/null @@ -1,1353 +0,0 @@ - - - - - - - - - Common » Refentry Metadata Template Reference - - $Id: refentry.xsl 7867 2008-03-07 09:54:25Z xmldoc $ - - - - - Introduction - This is technical reference documentation for the “refentry - metadata†templates in the DocBook XSL Stylesheets. - This is not intended to be user documentation. It is provided - for developers writing customization layers for the stylesheets. - - Currently, only the manpages stylesheets make use of these - templates. They are, however, potentially useful elsewhere. - - - - - - - Gathers metadata from a refentry and its ancestors - - Reference documentation for particular commands, functions, - etc., is sometimes viewed in isolation from its greater "context". For - example, users view Unix man pages as, well, individual pages, not as - part of a "book" of some kind. Therefore, it is sometimes necessary to - embed "context" information in output for each refentry. - - However, one problem is that different users mark up that - context information in different ways. Often (usually), the - context information is not actually part of the content of the - refentry itself, but instead part of the content of a - parent or ancestor element to the refentry. And - even then, DocBook provides a variety of elements that users might - potentially use to mark up the same kind of information. One user - might use the productnumber element to mark up version - information about a particular product, while another might use - the releaseinfo element. - - Taking all that in mind, the - get.refentry.metadata template tries to gather - metadata from a refentry element and its ancestor - elements in an intelligent and user-configurable way. The basic - mechanism used in the XPath expressions throughout this stylesheet - is to select the relevant metadata from the *info element that is - closest to the actual refentry â€“ either on the - refentry itself, or on its nearest ancestor. - - - The get.refentry.metadata - template is actually just sort of a "driver" template; it - calls other templates that do the actual data collection, - then returns the data as a set. - - - - - - - refname - - The first refname in the refentry - - - - info - - A set of info nodes (from a refentry - element and its ancestors) - - - - prefs - - A node containing user preferences (from global - stylesheet parameters) - - - - - - Returns a node set with the following elements. The - descriptions are verbatim from the man(7) man - page. - - - title - - the title of the man page (e.g., MAN) - - - - section - - the section number the man page should be placed in (e.g., - 7) - - - - date - - the date of the last revision - - - - source - - the source of the command - - - - manual - - the title of the manual (e.g., Linux - Programmer's Manual) - - - - - - - - - - - - <xsl:call-template name="get.refentry.title"> - <xsl:with-param name="refname" select="$refname"/> - </xsl:call-template> - -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    - - - - Gets title metadata for a refentry - - The man(7) man page describes this as "the - title of the man page (e.g., MAN). This differs - from refname in that, if the refentry has a - refentrytitle, we use that as the title; - otherwise, we just use first refname in the first - refnamediv in the source. - - - - - refname - - The first refname in the refentry - - - - - - Returns a title node. - - - - - - - - - - - - - - - - - - Gets section metadata for a refentry - - The man(7) man page describes this as "the - section number the man page should be placed in (e.g., - 7)". If we do not find a manvolnum - specified in the source, and we find that the refentry is - for a function, we use the section number 3 - ["Library calls (functions within program libraries)"]; otherwise, we - default to using 1 ["Executable programs or shell - commands"]. - - - - - refname - - The first refname in the refentry - - - - quiet - - If non-zero, no "missing" message is emitted - - - - - - Returns a string representing a section number. - - - - - - - - - - - - - Note - - meta manvol - - no refentry/refmeta/manvolnum - - - - Note - - meta manvol - - see http://docbook.sf.net/el/manvolnum - - - - - - - - - - Note - - meta manvol - - Setting man section to 3 - - - - - 3 - - - 1 - - - - - - - - - Gets date metadata for a refentry - - The man(7) man page describes this as "the - date of the last revision". If we cannot find a date in the source, we - generate one. - - - - - refname - - The first refname in the refentry - - - - info - - A set of info nodes (from a refentry - element and its ancestors) - - - - prefs - - A node containing users preferences (from global stylesheet parameters) - - - - - - Returns a date node. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Gets source metadata for a refentry - - The man(7) man page describes this as "the - source of the command", and provides the following examples: - - - For binaries, use something like: GNU, NET-2, SLS - Distribution, MCC Distribution. - - - For system calls, use the version of the kernel that you are - currently looking at: Linux 0.99.11. - - - For library calls, use the source of the function: GNU, BSD - 4.3, Linux DLL 4.4.1. - - - - - The solbook(5) man page describes - something very much like what man(7) calls - "source", except that solbook(5) names it - "software" and describes it like this: -
    - This is the name of the software product that the topic - discussed on the reference page belongs to. For example UNIX - commands are part of the SunOS x.x - release. -
    -
    - - In practice, there are many pages that simply have a version - number in the "source" field. So, it looks like what we have is a - two-part field, - Name Version, - where: - - - Name - - product name (e.g., BSD) or org. name (e.g., GNU) - - - - Version - - version name - - - - Each part is optional. If the Name is a - product name, then the Version is probably - the version of the product. Or there may be no - Name, in which case, if there is a - Version, it is probably the version of the - item itself, not the product it is part of. Or, if the - Name is an organization name, then there - probably will be no Version. - -
    - - - - refname - - The first refname in the refentry - - - - info - - A set of info nodes (from a refentry - element and its ancestors) - - - - prefs - - A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns a source node. - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warn - - meta source - - using - " - - " - for "source" - - - - - - - - [FIXME: source] - - - Warn - - meta source - - no fallback for source, so inserted a fixme - - - - - - - - - - [FIXME: source] - - - Warn - - meta source - - no source fallback given, so inserted a fixme - - - - - - - - - - Gets source-name metadata for a refentry - - A "source name" is one part of a (potentially) two-part - Name Version - source field. For more details, see the documentation for the - get.refentry.source template. - - - - - refname - - The first refname in the refentry - - - - info - - A set of info nodes (from a refentry - element and its ancestors) - - - - prefs - - A node containing users preferences (from global - stylesheet parameters) - - - - - - Depending on what output method is used for the - current stylesheet, either returns a text node or possibly an element - node, containing "source name" data. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - source - - - - - - - - source - productname - - - - - - - - source - productname - - - - - - - - source - productname - - - - - - - - source - productname - - - - - - - - source - productname - - - - - - - - - - - - - Note - - meta source - - no *info/productname or alternative - - - - Note - - meta source - - see http://docbook.sf.net/el/productname - - - - Note - - meta source - - no refentry/refmeta/refmiscinfo@class=source - - - - Note - - meta source - - see http://docbook.sf.net/el/refmiscinfo - - - - - - - Gets version metadata for a refentry - - A "version" is one part of a (potentially) two-part - Name Version - source field. For more details, see the documentation for the - get.refentry.source template. - - - - - refname - - The first refname in the refentry - - - - info - - A set of info nodes (from a refentry - element and its ancestors) - - - - prefs - - A node containing users preferences (from global - stylesheet parameters) - - - - - - Depending on what output method is used for the - current stylesheet, either returns a text node or possibly an element - node, containing "version" data. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - version - - - - - - - - version - productnumber - - - - - - - - version - productnumber - - - - - - - - - - - - - Note - - meta version - - no *info/productnumber or alternative - - - - Note - - meta version - - see http://docbook.sf.net/el/productnumber - - - - Note - - meta version - - no refentry/refmeta/refmiscinfo@class=version - - - - Note - - meta version - - see http://docbook.sf.net/el/refmiscinfo - - - - - - - Gets source metadata for a refentry - - The man(7) man page describes this as "the - title of the manual (e.g., Linux Programmer's - Manual)". Here are some examples from existing man pages: - - - dpkg utilities - (dpkg-name) - - - User Contributed Perl Documentation - (GET) - - - GNU Development Tools - (ld) - - - Emperor Norton Utilities - (ddate) - - - Debian GNU/Linux manual - (faked) - - - GIMP Manual Pages - (gimp) - - - KDOC Documentation System - (qt2kdoc) - - - - - The solbook(5) man page describes - something very much like what man(7) calls - "manual", except that solbook(5) names it - "sectdesc" and describes it like this: -
    - This is the section title of the reference page; for - example User Commands. -
    -
    - -
    - - - - refname - - The first refname in the refentry - - - - info - - A set of info nodes (from a refentry - element and its ancestors) - - - - prefs - - A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns a manual node. - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - manual - - - - - - - - manual - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warn - - meta manual - - using - " - - " - for "manual" - - - - - - - - [FIXME: manual] - - - Warn - - meta manual - - no fallback for manual, so inserted a fixme - - - - - - - - - - [FIXME: manual] - - - Warn - - meta manual - - no manual fallback given, so inserted a fixme - - - - - - - - - - - Note - - meta manual - - no titled ancestor of refentry - - - - Note - - meta manual - - no refentry/refmeta/refmiscinfo@class=manual - - - - Note - - meta manual - - see http://docbook.sf.net/el/refmiscinfo - - - - - - Gets user preferences for refentry metadata gathering - - The DocBook XSL stylesheets include several user-configurable - global stylesheet parameters for controlling refentry - metadata gathering. Those parameters are not read directly by the - other refentry metadata-gathering - templates. Instead, they are read only by the - get.refentry.metadata.prefs template, - which assembles them into a structure that is then passed to - the other refentry metadata-gathering - templates. - - So the, get.refentry.metadata.prefs - template is the only interface to collecting stylesheet parameters for - controlling refentry metadata gathering. - - - There are no local parameters for this template; however, it - does rely on a number of global parameters. - - - Returns a manual node. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Sets content of a refentry metadata item - - The set.refentry.metadata template is - called each time a suitable source element is found for a certain - metadata field. - - - - - refname - - The first refname in the refentry - - - - info - - A single *info node that contains the selected source element. - - - - contents - - A node containing the selected source element. - - - - context - - A string describing the metadata context in which the - set.refentry.metadata template was - called: either "date", "source", "version", or "manual". - - - - - - Returns formatted contents of a selected source element. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ro.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ro.xml deleted file mode 100644 index 49263117c4e2d5a45e11c1b71c033b8123d2e39f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ro.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ru.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ru.xml deleted file mode 100644 index 67d2c9aa00cec66a8d4cb4fecb6a3bb4ca7a7650..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ru.xml +++ /dev/null @@ -1,726 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Ð -а -Б -б -Ð’ -в -Г -г -Д -д -Е -е -Ð -Ñ‘ -Ж -ж -З -з -И -и -Й -й -К -к -Л -л -Ðœ -м -Ð -н -О -о -П -п -Р -Ñ€ -С -Ñ -Т -Ñ‚ -У -у -Ф -Ñ„ -Ð¥ -Ñ… -Ц -ц -Ч -ч -Ш -ш -Щ -щ -Ъ -ÑŠ -Ы -Ñ‹ -Ь -ÑŒ -Э -Ñ -Ю -ÑŽ -Я -Ñ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sk.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sk.xml deleted file mode 100644 index 09309b68fe0f4c7e936dc281a0d4ec4c9523be37..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sk.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sl.xml deleted file mode 100644 index 43aa2576b70704d6baa6d343a293b59fe0b2aa6b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sl.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sq.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sq.xml deleted file mode 100644 index b566918dc4b1a659662d3dbd349adc79128ac7d7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sq.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sr.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sr.xml deleted file mode 100644 index 413ca4c134588303c0303df3fa7b35eee361dccb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sr.xml +++ /dev/null @@ -1,720 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Симболи -Ð -а -Б -б -Ð’ -в -Г -г -Д -д -Ђ -Ñ’ -Е -е -Ж -ж -З -з -И -и -Ј -ј -К -к -Л -л -Љ -Ñ™ -Ðœ -м -Ð -н -Њ -Ñš -О -о -П -п -Р -Ñ€ -С -Ñ -Т -Ñ‚ -Ћ -Ñ› -У -у -Ф -Ñ„ -Ð¥ -Ñ… -Ц -ц -Ч -ч -Ð -ÑŸ -Ш -ш -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -Q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sr_Latn.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sr_Latn.xml deleted file mode 100644 index 7ebb8daf280e7a7c4e0fdf45ad44b1718b7973d4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sr_Latn.xml +++ /dev/null @@ -1,679 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Simboli -A -a -B -b -C -c -ÄŒ -Ä -Ć -ć -D -d -DŽ -Dž -dž -Ä -Ä‘ -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -LJ -Lj -lj -M -m -N -n -NJ -Nj -nj -O -o -P -p -Q -Q -R -r -S -s -Å  -Å¡ -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Ž -ž - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/subtitles.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/subtitles.xsl deleted file mode 100644 index 83396a076bf7eb66c9f6d750d3fcc877bd9376ad..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/subtitles.xsl +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - -Provides access to element subtitles - -Processing an element in the -subtitle.markup mode produces the -subtitle of the element. - - - - - - - Request for subtitle of unexpected element: - - - ???SUBTITLE??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sv.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sv.xml deleted file mode 100644 index 354c48b3e76892b16a9149b57a8b885a2d7c846a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/sv.xml +++ /dev/null @@ -1,664 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Ã… -Ã¥ -Ä -ä -Ö -ö - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ta.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ta.xml deleted file mode 100644 index 873f1f978b5ba8943fadbcde1e8a00990c47c0b8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/ta.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -கà¯à®±à®¿à®¯à¯€à®Ÿà¯à®•à®³à¯ -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/table.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/table.xsl deleted file mode 100644 index c2d11e9c958c24e9cbf247786162e04d8de1468a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/table.xsl +++ /dev/null @@ -1,515 +0,0 @@ - - - - - - - - - - - 0: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0: - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - -Determine the column number in which a given entry occurs - -If an entry has a -colname or -namest attribute, this template -will determine the number of the column in which the entry should occur. -For other entrys, nothing is returned. - - - -entry - -The entry-element which is to be tested. - - - - - - -This template returns the column number if it can be determined, -or 0 (the empty string) - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/targetdatabase.dtd b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/targetdatabase.dtd deleted file mode 100644 index 2ace1e0030450c17843adf12a159c665d922ab78..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/targetdatabase.dtd +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/targets.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/targets.xsl deleted file mode 100644 index f0ac42548e002dd04bac6cc9735f7392210c2f16..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/targets.xsl +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - - - - - -Collects information for potential cross reference targets - -Processing the root element in the -collect.targets mode produces -a set of target database elements that can be used by -the olink mechanism to resolve external cross references. -The collection process is controlled by the -collect.xref.targets parameter, which can be -yes to collect targets and process -the document for output, only to -only collect the targets, and no -(default) to not collect the targets and only process the document. - - -A targets.filename parameter must be -specified to receive the output if -collect.xref.targets is -set to yes so as to -redirect the target data to a file separate from the -document output. - - - - - - - - - - - Must specify a $targets.filename parameter when - $collect.xref.targets is set to 'yes'. - The xref targets were not collected. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: processing automatic glossary - without a glossary.collection file. - - - - - - Warning: processing automatic glossary but unable to - open glossary.collection file ' - - ' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/te.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/te.xml deleted file mode 100644 index c912fc20696315f8373df302f6d556d828a401b6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/te.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -à°šà°¿à°¹à±à°¨à°®à±à°²à± -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/th.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/th.xml deleted file mode 100644 index f2e8109aa1a00f2f5834c281577ac524479784a4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/th.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/titles.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/titles.xsl deleted file mode 100644 index 348bc31558e6ab66cb35c4c6ac971b20fb117cb6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/titles.xsl +++ /dev/null @@ -1,806 +0,0 @@ - - - - - - - - - - -Provides access to element titles - -Processing an element in the -title.markup mode produces the -title of the element. This does not include the label. - - - - - - - - - - - - - - - - - - - - - - - Request for title of element with no title: - - - - (id=" - - ") - - - (xml:id=" - - ") - - - - - ???TITLE??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - REFENTRY WITHOUT TITLE??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: glossdiv missing its required title - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Note - Important - Caution - Warning - Tip - - - - - - - - - - Question - - - - - Answer - - - - - Question - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Endterm points to nonexistent ID: - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XRef to nonexistent id: - - - - ??? - - - - - - - - - - Endterm points to nonexistent ID: - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/tl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/tl.xml deleted file mode 100644 index b081d8e0d1fd48aaabcb80d919f9a73d673316f4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/tl.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/tr.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/tr.xml deleted file mode 100644 index 652911d83df4deb7345202c519bacab62e91ff61..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/tr.xml +++ /dev/null @@ -1,666 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Semboller -A -a -B -b -C -c -Ç -ç -D -d -E -e -F -f -G -g -Äž -ÄŸ -H -h -I -ı -Ä° -i -J -j -K -k -L -l -M -m -N -n -O -o -Ö -ö -P -p -R -r -S -s -Åž -ÅŸ -T -t -U -u -Ãœ -ü -V -v -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/uk.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/uk.xml deleted file mode 100644 index 4caf73f920e2220d7601afe1819d35fe3b346c92..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/uk.xml +++ /dev/null @@ -1,726 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z -Ð -а -Б -б -Ð’ -в -Г -г -Ò -Ò‘ -Д -д -Е -е -Є -Ñ” -Ж -ж -З -з -И -и -І -Ñ– -Ї -Ñ— -Й -й -К -к -Л -л -Ðœ -м -Ð -н -О -о -П -п -Р -Ñ€ -С -Ñ -Т -Ñ‚ -У -у -Ф -Ñ„ -Ð¥ -Ñ… -Ц -ц -Ч -ч -Ш -ш -Щ -щ -Ь -ÑŒ -Ю -ÑŽ -Я -Ñ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/utility.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/utility.xml deleted file mode 100644 index d9cbe3ca1852511ddb239bf9a1a13d37c9a41c4d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/utility.xml +++ /dev/null @@ -1,259 +0,0 @@ - - - - - Common » Utility Template Reference - - $Id: utility.xsl 7101 2007-07-20 15:32:12Z xmldoc $ - - - - - Introduction - -This is technical reference documentation for the - miscellaneous utility templates in the DocBook XSL - Stylesheets. - - - -These templates are defined in a separate file from the set - of “common†templates because some of the common templates - reference DocBook XSL stylesheet parameters, requiring the - entire set of parameters to be imported/included in any - stylesheet that imports/includes the common templates. - - -The utility templates don’t import or include any DocBook - XSL stylesheet parameters, so the utility templates can be used - without importing the whole set of parameters. - - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -log.message -Logs/emits formatted notes and warnings - - -<xsl:template name="log.message"> -<xsl:param name="level"/> -<xsl:param name="source"/> -<xsl:param name="context-desc"/> -<xsl:param name="context-desc-field-length">12</xsl:param> -<xsl:param name="context-desc-padded"> - <xsl:if test="not($context-desc = '')"> - <xsl:call-template name="pad-string"> - <xsl:with-param name="leftRight">right</xsl:with-param> - <xsl:with-param name="padVar" select="substring($context-desc, 1, $context-desc-field-length)"/> - <xsl:with-param name="length" select="$context-desc-field-length"/> - </xsl:call-template> - </xsl:if> - </xsl:param> -<xsl:param name="message"/> -<xsl:param name="message-field-length" select="45"/> -<xsl:param name="message-padded"> - <xsl:variable name="spaces-for-blank-level"> - <!-- * if the level field is blank, we'll need to pad out --> - <!-- * the message field with spaces to compensate --> - <xsl:choose> - <xsl:when test="$level = ''"> - <xsl:value-of select="4 + 2"/> - <!-- * 4 = hard-coded length of comment text ("Note" or "Warn") --> - <!-- * + 2 = length of colon-plus-space separator ": " --> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="0"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable name="spaces-for-blank-context-desc"> - <!-- * if the context-description field is blank, we'll need --> - <!-- * to pad out the message field with spaces to compensate --> - <xsl:choose> - <xsl:when test="$context-desc = ''"> - <xsl:value-of select="$context-desc-field-length + 2"/> - <!-- * + 2 = length of colon-plus-space separator ": " --> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="0"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable name="extra-spaces" select="$spaces-for-blank-level + $spaces-for-blank-context-desc"/> - <xsl:call-template name="pad-string"> - <xsl:with-param name="leftRight">right</xsl:with-param> - <xsl:with-param name="padVar" select="substring($message, 1, ($message-field-length + $extra-spaces))"/> - <xsl:with-param name="length" select="$message-field-length + $extra-spaces"/> - </xsl:call-template> - </xsl:param> - ... -</xsl:template> - -Description - -The log.message template is a utility - template for logging/emitting formatted messages – that is, - notes and warnings, along with a given log “level†and an - identifier for the “source†that the message relates to. - - Parameters - - - level - - -Text to log/emit in the message-level field to - indicate the message level - (Note or - Warning) - - - - source - - -Text to log/emit in the source field to identify the - “source†to which the notification/warning relates. - This can be any arbitrary string, but because the - message lacks line and column numbers to identify the - exact part of the source document to which it - relates, the intention is that the value you pass - into the source parameter should - give the user some way to identify the portion of - their source document on which to take potentially - take action in response to the log message (for - example, to edit, change, or add content). - - -So the source value should be, - for example, an ID, book/chapter/article title, title - of some formal object, or even a string giving an - XPath expression. - - - - context-desc - - -Text to log/emit in the context-description field to - describe the context for the message. - - - - context-desc-field-length - - -Specifies length of the context-description field - (in characters); default is 12 - - -If the text specified by the - context-desc parameter is longer - than the number of characters specified in - context-desc-field-length, it is - truncated to context-desc-field-length - (12 characters by default). - - -If the specified text is shorter than - context-desc-field-length, - it is right-padded out to - context-desc-field-length (12 by - default). - - -If no value has been specified for the - context-desc parameter, the field is - left empty and the text of the log message begins with - the value of the message - parameter. - - - - message - - -Text to log/emit in the actual message field - - - - message-field-length - - -Specifies length of the message - field (in characters); default is 45 - - - - - - Returns - -Outputs a message (generally, to standard error). - - - - -get.doc.title -Gets a title from the current document - - -<xsl:template name="get.doc.title"/> - -Description - -The get.doc.title template is a - utility template for returning the first title found in the - current document. - - Returns - -Returns a string containing some identifying title for the - current document . - - - - -pad-string -Right-pads or left-pads a string out to a certain length - - -<xsl:template name="pad-string"> -<xsl:param name="padChar" select="' '"/> -<xsl:param name="leftRight">left</xsl:param> -<xsl:param name="padVar"/> -<xsl:param name="length"/> - ... -</xsl:template> - -Description - -This function takes string padVar and - pads it out in the direction rightLeft to - the string-length length, using string - padChar (a space character by default) as - the padding string (note that padChar can - be a string; it is not limited to just being a single - character). - - - -This function began as a copy of Nate Austin's - prepend-pad function in the Padding - Content section of Dave Pawson's XSLT - FAQ. - - - Returns - -Returns a (padded) string. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/utility.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/utility.xsl deleted file mode 100644 index a465db6f5e75604bcdd725be7eedf662ec9fed59..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/utility.xsl +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - Common » Utility Template Reference - - $Id: utility.xsl 7101 2007-07-20 15:32:12Z xmldoc $ - - - - - Introduction - This is technical reference documentation for the - miscellaneous utility templates in the DocBook XSL - Stylesheets. - - These templates are defined in a separate file from the set - of “common†templates because some of the common templates - reference DocBook XSL stylesheet parameters, requiring the - entire set of parameters to be imported/included in any - stylesheet that imports/includes the common templates. - The utility templates don’t import or include any DocBook - XSL stylesheet parameters, so the utility templates can be used - without importing the whole set of parameters. - - This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - - - Logs/emits formatted notes and warnings - - - The log.message template is a utility - template for logging/emitting formatted messages â€“ that is, - notes and warnings, along with a given log “level†and an - identifier for the “source†that the message relates to. - - - - - level - - Text to log/emit in the message-level field to - indicate the message level - (Note or - Warning) - - - source - - Text to log/emit in the source field to identify the - “source†to which the notification/warning relates. - This can be any arbitrary string, but because the - message lacks line and column numbers to identify the - exact part of the source document to which it - relates, the intention is that the value you pass - into the source parameter should - give the user some way to identify the portion of - their source document on which to take potentially - take action in response to the log message (for - example, to edit, change, or add content). - So the source value should be, - for example, an ID, book/chapter/article title, title - of some formal object, or even a string giving an - XPath expression. - - - context-desc - - Text to log/emit in the context-description field to - describe the context for the message. - - - context-desc-field-length - - Specifies length of the context-description field - (in characters); default is 12 - If the text specified by the - context-desc parameter is longer - than the number of characters specified in - context-desc-field-length, it is - truncated to context-desc-field-length - (12 characters by default). - If the specified text is shorter than - context-desc-field-length, - it is right-padded out to - context-desc-field-length (12 by - default). - If no value has been specified for the - context-desc parameter, the field is - left empty and the text of the log message begins with - the value of the message - parameter. - - - message - - Text to log/emit in the actual message field - - - message-field-length - - Specifies length of the message - field (in characters); default is 45 - - - - - - Outputs a message (generally, to standard error). - - - - - - 12 - - - - right - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - right - - - - - - - - - : - - - - : - - - - - - - - - - Gets a title from the current document - - The get.doc.title template is a - utility template for returning the first title found in the - current document. - - - Returns a string containing some identifying title for the - current document . - - - - - - - - - - - - - - - Right-pads or left-pads a string out to a certain length - - This function takes string padVar and - pads it out in the direction rightLeft to - the string-length length, using string - padChar (a space character by default) as - the padding string (note that padChar can - be a string; it is not limited to just being a single - character). - - This function began as a copy of Nate Austin's - prepend-pad function in the Padding - Content section of Dave Pawson's XSLT - FAQ. - - - - Returns a (padded) string. - - - - - - left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/vi.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/vi.xml deleted file mode 100644 index 682c46762a05da33a424eee347d0b10439a1cc69..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/vi.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/xh.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/xh.xml deleted file mode 100644 index db22550c1e08a61506a173a1cf7d36e107eb0388..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/xh.xml +++ /dev/null @@ -1,1229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Symbols -A -a -À -à -à -á - -â -à -ã -Ä -ä -Ã… -Ã¥ -Ä€ -Ä -Ä‚ -ă -Ä„ -Ä… -Ç -ÇŽ -Çž -ÇŸ -Ç  -Ç¡ -Ǻ -Ç» -È€ -È -È‚ -ȃ -Ȧ -ȧ -Ḁ -Ḡ-ẚ -Ạ -ạ -Ả -ả -Ấ -ấ -Ầ -ầ -Ẩ -ẩ -Ẫ -ẫ -Ậ -ậ -Ắ -ắ -Ằ -ằ -Ẳ -ẳ -Ẵ -ẵ -Ặ -ặ -B -b -Æ€ -Æ -É“ -Æ‚ -ƃ -Ḃ -ḃ -Ḅ -ḅ -Ḇ -ḇ -C -c -Ç -ç -Ć -ć -Ĉ -ĉ -ÄŠ -Ä‹ -ÄŒ -Ä -Ƈ -ƈ -É• -Ḉ -ḉ -D -d -ÄŽ -Ä -Ä -Ä‘ -ÆŠ -É— -Æ‹ -ÆŒ -Ç… -Dz -È¡ -É– -Ḋ -ḋ -Ḍ -Ḡ-Ḏ -Ḡ-Ḡ-ḑ -Ḓ -ḓ -E -e -È -è -É -é -Ê -ê -Ë -ë -Ä’ -Ä“ -Ä” -Ä• -Ä– -Ä— -Ę -Ä™ -Äš -Ä› -È„ -È… -Ȇ -ȇ -Ȩ -È© -Ḕ -ḕ -Ḗ -ḗ -Ḙ -ḙ -Ḛ -ḛ -Ḝ -Ḡ-Ẹ -ẹ -Ẻ -ẻ -Ẽ -ẽ -Ế -ế -Ề -á» -Ể -ể -Ễ -á»… -Ệ -ệ -F -f -Æ‘ -Æ’ -Ḟ -ḟ -G -g -Äœ -Ä -Äž -ÄŸ -Ä  -Ä¡ -Ä¢ -Ä£ -Æ“ -É  -Ǥ -Ç¥ -Ǧ -ǧ -Ç´ -ǵ -Ḡ -ḡ -H -h -Ĥ -Ä¥ -Ħ -ħ -Èž -ÈŸ -ɦ -Ḣ -ḣ -Ḥ -ḥ -Ḧ -ḧ -Ḩ -ḩ -Ḫ -ḫ -ẖ -I -i -ÃŒ -ì -à -í -ÃŽ -î -à -ï -Ĩ -Ä© -Ī -Ä« -Ĭ -Ä­ -Ä® -į -Ä° -Æ— -ɨ -Ç -Ç -Ȉ -ȉ -ÈŠ -È‹ -Ḭ -ḭ -Ḯ -ḯ -Ỉ -ỉ -Ị -ị -J -j -Ä´ -ĵ -Ç° -Ê -K -k -Ķ -Ä· -Ƙ -Æ™ -Ǩ -Ç© -Ḱ -ḱ -Ḳ -ḳ -Ḵ -ḵ -L -l -Ĺ -ĺ -Ä» -ļ -Ľ -ľ -Ä¿ -Å€ -Å -Å‚ -Æš -Lj -È´ -É« -ɬ -É­ -Ḷ -ḷ -Ḹ -ḹ -Ḻ -ḻ -Ḽ -ḽ -M -m -ɱ -Ḿ -ḿ -á¹€ -á¹ -Ṃ -ṃ -N -n -Ñ -ñ -Ń -Å„ -Å… -ņ -Ň -ň -Æ -ɲ -Æž -È  -Ç‹ -Ǹ -ǹ -ȵ -ɳ -Ṅ -á¹… -Ṇ -ṇ -Ṉ -ṉ -Ṋ -ṋ -O -o -Ã’ -ò -Ó -ó -Ô -ô -Õ -õ -Ö -ö -Ø -ø -ÅŒ -Å -ÅŽ -Å -Å -Å‘ -ÆŸ -Æ  -Æ¡ -Ç‘ -Ç’ -Ǫ -Ç« -Ǭ -Ç­ -Ǿ -Ç¿ -ÈŒ -È -ÈŽ -È -Ȫ -È« -Ȭ -È­ -È® -ȯ -È° -ȱ -Ṍ -á¹ -Ṏ -á¹ -á¹ -ṑ -á¹’ -ṓ -Ọ -á» -Ỏ -á» -á» -ố -á»’ -ồ -á»” -ổ -á»– -á»— -Ộ -á»™ -Ớ -á»› -Ờ -á» -Ở -ở -á»  -ỡ -Ợ -ợ -P -p -Ƥ -Æ¥ -á¹” -ṕ -á¹– -á¹— -Q -q -Ê  -R -r -Å” -Å• -Å– -Å— -Ř -Å™ -È -È‘ -È’ -È“ -ɼ -ɽ -ɾ -Ṙ -á¹™ -Ṛ -á¹› -Ṝ -á¹ -Ṟ -ṟ -S -s -Åš -Å› -Åœ -Å -Åž -ÅŸ -Å  -Å¡ -Ș -È™ -Ê‚ -á¹  -ṡ -á¹¢ -á¹£ -Ṥ -á¹¥ -Ṧ -ṧ -Ṩ -ṩ -T -t -Å¢ -Å£ -Ť -Å¥ -Ŧ -ŧ -Æ« -Ƭ -Æ­ -Æ® -ʈ -Èš -È› -ȶ -Ṫ -ṫ -Ṭ -á¹­ -á¹® -ṯ -á¹° -á¹± -ẗ -U -u -Ù -ù -Ú -ú -Û -û -Ãœ -ü -Ũ -Å© -Ū -Å« -Ŭ -Å­ -Å® -ů -Å° -ű -Ų -ų -Ư -Æ° -Ç“ -Ç” -Ç• -Ç– -Ç— -ǘ -Ç™ -Çš -Ç› -Çœ -È” -È• -È– -È— -á¹² -á¹³ -á¹´ -á¹µ -Ṷ -á¹· -Ṹ -á¹¹ -Ṻ -á¹» -Ụ -ụ -Ủ -ủ -Ứ -ứ -Ừ -ừ -Ử -á»­ -á»® -ữ -á»° -á»± -V -v -Ʋ -Ê‹ -á¹¼ -á¹½ -á¹¾ -ṿ -W -w -Å´ -ŵ -Ẁ -Ạ-Ẃ -ẃ -Ẅ -ẅ -Ẇ -ẇ -Ẉ -ẉ -ẘ -X -x -Ẋ -ẋ -Ẍ -Ạ-Y -y -à -ý -ÿ -Ÿ -Ŷ -Å· -Ƴ -Æ´ -Ȳ -ȳ -Ẏ -Ạ-ẙ -Ỳ -ỳ -á»´ -ỵ -Ỷ -á»· -Ỹ -ỹ -Z -z -Ź -ź -Å» -ż -Ž -ž -Ƶ -ƶ -Ȥ -È¥ -Ê -Ê‘ -Ạ-ẑ -Ẓ -ẓ -Ẕ -ẕ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/zh.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/zh.xml deleted file mode 100644 index d976ed003f4a5013374a83b532f4e69f90f823b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/zh.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ç¬¦å· -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/zh_cn.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/zh_cn.xml deleted file mode 100644 index f42774ce24b218e721bce566d7c8ddd5922b0858..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/zh_cn.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ç¬¦å· -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/zh_tw.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/zh_tw.xml deleted file mode 100644 index 49cb5b6071942351ff97bd39c642dc392183c272..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/common/zh_tw.xml +++ /dev/null @@ -1,660 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -符號 -A -a -B -b -C -c -D -d -E -e -F -f -G -g -H -h -I -i -J -j -K -k -L -l -M -m -N -n -O -o -P -p -Q -q -R -r -S -s -T -t -U -u -V -v -W -w -X -x -Y -y -Z -z - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/authors.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/authors.xml deleted file mode 100644 index ea4bf024d39a9627dc21db7677b165f475a0b880..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/authors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - WalshNorman - - - - The DocBook Project - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/copyright.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/copyright.xml deleted file mode 100644 index 505f7f8efa1b5c3fbfaf71f7e16f4acec2f47779..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/copyright.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 1999-2007 - Norman Walsh - - - 2003 - Jiří Kosek - - - 2004-2007 - Steve Ball - - - 2001-2007 - The DocBook Project - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html deleted file mode 100644 index fb60112bdaea3471884f1d71397f0b1ef0588240..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/docsrc - - -

    Index of /release/xsl-ns/1.76.1/docsrc

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] authors.xml 01-Nov-2010 20:31 265 -[TXT] copyright.xml 01-Nov-2010 20:31 427 -[TXT] warranty.xml 01-Nov-2010 20:31 617 -[TXT] license.xml 01-Nov-2010 20:31 1.3K -[TXT] reference.css 01-Nov-2010 20:31 1.5K -[TXT] reference.xml 01-Nov-2010 20:31 10K -[IMG] page.png 01-Nov-2010 20:31 17K -[TXT] reference.xml.included 01-Nov-2010 20:31 1.1M -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=D;O=A deleted file mode 100644 index da6e9a80b4290f8b8d37e122e7cc7b2aeb44d598..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=D;O=A +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/docsrc - - -

    Index of /release/xsl-ns/1.76.1/docsrc

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] authors.xml 01-Nov-2010 20:31 265 -[TXT] copyright.xml 01-Nov-2010 20:31 427 -[TXT] license.xml 01-Nov-2010 20:31 1.3K -[IMG] page.png 01-Nov-2010 20:31 17K -[TXT] reference.css 01-Nov-2010 20:31 1.5K -[TXT] reference.xml 01-Nov-2010 20:31 10K -[TXT] reference.xml.included 01-Nov-2010 20:31 1.1M -[TXT] warranty.xml 01-Nov-2010 20:31 617 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=D;O=D deleted file mode 100644 index 79c6b9ef3a301de61f7f0305a6a7c0028fc9b011..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=D;O=D +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/docsrc - - -

    Index of /release/xsl-ns/1.76.1/docsrc

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] warranty.xml 01-Nov-2010 20:31 617 -[TXT] reference.xml.included 01-Nov-2010 20:31 1.1M -[TXT] reference.xml 01-Nov-2010 20:31 10K -[TXT] reference.css 01-Nov-2010 20:31 1.5K -[IMG] page.png 01-Nov-2010 20:31 17K -[TXT] license.xml 01-Nov-2010 20:31 1.3K -[TXT] copyright.xml 01-Nov-2010 20:31 427 -[TXT] authors.xml 01-Nov-2010 20:31 265 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=M;O=A deleted file mode 100644 index 0873a7ca1945e202f8dd5bd6d03109f7f4772004..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=M;O=A +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/docsrc - - -

    Index of /release/xsl-ns/1.76.1/docsrc

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] authors.xml 01-Nov-2010 20:31 265 -[TXT] copyright.xml 01-Nov-2010 20:31 427 -[TXT] license.xml 01-Nov-2010 20:31 1.3K -[IMG] page.png 01-Nov-2010 20:31 17K -[TXT] reference.css 01-Nov-2010 20:31 1.5K -[TXT] reference.xml 01-Nov-2010 20:31 10K -[TXT] reference.xml.included 01-Nov-2010 20:31 1.1M -[TXT] warranty.xml 01-Nov-2010 20:31 617 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=M;O=D deleted file mode 100644 index 79c6b9ef3a301de61f7f0305a6a7c0028fc9b011..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=M;O=D +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/docsrc - - -

    Index of /release/xsl-ns/1.76.1/docsrc

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] warranty.xml 01-Nov-2010 20:31 617 -[TXT] reference.xml.included 01-Nov-2010 20:31 1.1M -[TXT] reference.xml 01-Nov-2010 20:31 10K -[TXT] reference.css 01-Nov-2010 20:31 1.5K -[IMG] page.png 01-Nov-2010 20:31 17K -[TXT] license.xml 01-Nov-2010 20:31 1.3K -[TXT] copyright.xml 01-Nov-2010 20:31 427 -[TXT] authors.xml 01-Nov-2010 20:31 265 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=N;O=A deleted file mode 100644 index 71f0d5457843650c7e2366d9cb3024089a0649bf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=N;O=A +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/docsrc - - -

    Index of /release/xsl-ns/1.76.1/docsrc

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] authors.xml 01-Nov-2010 20:31 265 -[TXT] copyright.xml 01-Nov-2010 20:31 427 -[TXT] license.xml 01-Nov-2010 20:31 1.3K -[IMG] page.png 01-Nov-2010 20:31 17K -[TXT] reference.css 01-Nov-2010 20:31 1.5K -[TXT] reference.xml 01-Nov-2010 20:31 10K -[TXT] reference.xml.included 01-Nov-2010 20:31 1.1M -[TXT] warranty.xml 01-Nov-2010 20:31 617 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=N;O=D deleted file mode 100644 index 79c6b9ef3a301de61f7f0305a6a7c0028fc9b011..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=N;O=D +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/docsrc - - -

    Index of /release/xsl-ns/1.76.1/docsrc

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] warranty.xml 01-Nov-2010 20:31 617 -[TXT] reference.xml.included 01-Nov-2010 20:31 1.1M -[TXT] reference.xml 01-Nov-2010 20:31 10K -[TXT] reference.css 01-Nov-2010 20:31 1.5K -[IMG] page.png 01-Nov-2010 20:31 17K -[TXT] license.xml 01-Nov-2010 20:31 1.3K -[TXT] copyright.xml 01-Nov-2010 20:31 427 -[TXT] authors.xml 01-Nov-2010 20:31 265 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=S;O=A deleted file mode 100644 index fb60112bdaea3471884f1d71397f0b1ef0588240..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=S;O=A +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/docsrc - - -

    Index of /release/xsl-ns/1.76.1/docsrc

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] authors.xml 01-Nov-2010 20:31 265 -[TXT] copyright.xml 01-Nov-2010 20:31 427 -[TXT] warranty.xml 01-Nov-2010 20:31 617 -[TXT] license.xml 01-Nov-2010 20:31 1.3K -[TXT] reference.css 01-Nov-2010 20:31 1.5K -[TXT] reference.xml 01-Nov-2010 20:31 10K -[IMG] page.png 01-Nov-2010 20:31 17K -[TXT] reference.xml.included 01-Nov-2010 20:31 1.1M -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=S;O=D deleted file mode 100644 index 571cfe0cca94e1b4078df9571520df68550f9f7b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/index.html?C=S;O=D +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/docsrc - - -

    Index of /release/xsl-ns/1.76.1/docsrc

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] reference.xml.included 01-Nov-2010 20:31 1.1M -[IMG] page.png 01-Nov-2010 20:31 17K -[TXT] reference.xml 01-Nov-2010 20:31 10K -[TXT] reference.css 01-Nov-2010 20:31 1.5K -[TXT] license.xml 01-Nov-2010 20:31 1.3K -[TXT] warranty.xml 01-Nov-2010 20:31 617 -[TXT] copyright.xml 01-Nov-2010 20:31 427 -[TXT] authors.xml 01-Nov-2010 20:31 265 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/license.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/license.xml deleted file mode 100644 index c265ce8e7ad0ab6f865360af5ba1d8ec687dad69..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/license.xml +++ /dev/null @@ -1,23 +0,0 @@ -License -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the Software), to deal in the Software without -restriction, including without limitation the rights to use, copy, -modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. -Except as contained in this notice, the names of individuals -credited with contribution to this software shall not be used in -advertising or otherwise to promote the sale, use or other dealings in -this Software without prior written authorization from the individuals -in question. -Any stylesheet derived from this Software that is publically -distributed will be identified with a different name and the version -strings in any derived Software will be changed so that no possibility -of confusion between the derived package and this Software will -exist. - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/page.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/page.png deleted file mode 100644 index 9c15d8883d9d6e2b5be3be69470fb443f78a641a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/page.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/reference.css b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/reference.css deleted file mode 100644 index 9e7e51135f51656977b68f4e26e295f4d86e4bd9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/reference.css +++ /dev/null @@ -1,79 +0,0 @@ -/* reference.css, a stylesheet for reference documentation - * generated by the DocBook XSL Stylesheets */ -/* $Id: reference.css 8234 2009-02-09 12:10:48Z xmldoc $ */ - -div.legalnotice { - font-size: 80%; -} - -div.note, div.tip, div.warning { - margin-left: 5%; - margin-right: 10%; - padding: 5px; -} - -div.note, div.tip { - border-left: solid #d5dee3 20px; - border-right: solid #d5dee3 20px; -} - -div.note, div.tip { - border-left: solid palegreen 20px; - border-right: solid palegreen 20px; -} - -div.warning { - border-left: solid yellow 20px; - border-right: solid yellow 20px; -} - -div.note p, div.tip p, div.warning p { - margin-top: 0px; - margin-bottom: 4px; -} - -div.note h3, div.tip h3, div.warning h3 { - margin-top: 0; -} - -div.informalexample { - background-color: #d5dee3; - border-top-width: 2px; - border-top-style: double; - border-top-color: #d3d3d3; - border-bottom-width: 2px; - border-bottom-style: double; - border-bottom-color: #d3d3d3; - padding: 4px; - margin: 0em; - margin-left: 2em; -} - -pre.programlisting, pre.synopsis { - whitespace: pre; - font-family: monospace; - background-color: #d5dee3; - border-top-width: 1px; - border-top-style: single; - border-top-color: #d3d3d3; - border-bottom-width: 1px; - border-bottom-style: single; - border-bottom-color: #d3d3d3; - padding: 4px; - margin: 0em; - margin-top: 6px; - margin-bottom: 6px; -} - -div.informalexample pre { - whitespace: pre; - font-family: monospace; - border-top-width: 0px; - border-bottom-width: 0px; - padding: 0px; -} - -/* Parameter and PI titles */ - div.refnamediv h2 { - font-size: 2em; -} diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/reference.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/reference.xml deleted file mode 100644 index 7d493060c4e6d6996cf474ed826e5283bdf91007..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/reference.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - DocBook XSL Stylesheets: Reference Documentation - $Id: reference.xml 8321 2009-03-12 18:20:36Z mzjn $ - - - - - - About this document - This is generated reference documentation for the DocBook - XSL stylesheets. It is available in the following formats: - - - HTML, - PDF, - plain text - - - This is primarily documentation on the parameters and processing instructions you can use - to control the behavior of the stylesheets. - - This is purely reference documentation â€“ not how-to - documentation. For a thorough step-by-step how-to guide to - publishing content using the DocBook XSL stylesheets, see - Bob Stayton’s DocBook XSL: The Complete Guide, available online - at http://www.sagehill.net/docbookxsl/index.html - - - This document is divided into three sets of references: - the first two sets provides user documentation; the third, - developer documentation. - - - DocBook XSL Stylesheets User Reference: Parameters - - - This is generated reference documentation for all - user-configurable parameters in the DocBook XSL - stylesheets. - - This is purely reference documentation â€“ not how-to - documentation. For a thorough step-by-step how-to guide to - publishing content using the DocBook XSL stylesheets, see - Bob Stayton’s DocBook XSL: The Complete Guide, available online - at http://www.sagehill.net/docbookxsl/index.html - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Slides Parameter Reference - - - - This is reference documentation for all - user-configurable parameters in the DocBook XSL Slides - stylesheets (for generating HTML and PDF slide - presentations). - - The Slides stylesheet for HTML output is a - customization layer of the DocBook XSL HTML - stylesheet; the Slides stylesheet for FO output is a - customization layer of the DocBook XSL FO stylesheet. - Therefore, in addition to the slides-specific - parameters listed in this section, you can also use a - number of HTML stylesheet - parameters and FO - stylesheet parameters to control Slides - output. - - - - - - - - - - - - - - - - DocBook XSL Stylesheets User Reference: PIs - - - - - This is generated reference documentation for all - user-specifiable processing instructions in the DocBook - XSL stylesheets. - - You add these PIs at particular points in a document to - cause specific “exceptions†to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - - - - - - - - - - - DocBook XSL Stylesheets Developer Reference - - - This is technical reference documentation for - developers using the DocBook XSL Stylesheets. It is not - intended to be user documentation, but is instead - provided for developers writing customization layers for - the stylesheets. - - - - - - - - - - - - Common Template Reference - - - - - This is technical reference documentation for the - “baseâ€, “refentryâ€, and “utility†sets of common - templates in the DocBook XSL Stylesheets. These - templates are “common†in that they are shared across - output formats (that is, they’re not - output-format-dependent) - This documentation is not intended to be user - documentation. It is provided for developers writing - customization layers for the stylesheets. - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/reference.xml.included b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/reference.xml.included deleted file mode 100644 index 94869ee7a269708170a712cdabd44d659609c4ff..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/reference.xml.included +++ /dev/null @@ -1,33905 +0,0 @@ - - - - - - - - - - - DocBook XSL Stylesheets: Reference Documentation - $Id: reference.xml 8321 2009-03-12 18:20:36Z mzjn $ - - - - WalshNorman - - - - The DocBook Project - - - - 1999-2007 - Norman Walsh - - 2003 - Jiří Kosek - - 2004-2007 - Steve Ball - - 2001-2007 - The DocBook Project - - License -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the Software), to deal in the Software without -restriction, including without limitation the rights to use, copy, -modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. -Except as contained in this notice, the names of individuals -credited with contribution to this software shall not be used in -advertising or otherwise to promote the sale, use or other dealings in -this Software without prior written authorization from the individuals -in question. -Any stylesheet derived from this Software that is publically -distributed will be identified with a different name and the version -strings in any derived Software will be changed so that no possibility -of confusion between the derived package and this Software will -exist. - - Warranty -THE SOFTWARE IS PROVIDED AS IS, -WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY -OTHER CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT -OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - - - About this document - This is generated reference documentation for the DocBook - XSL stylesheets. It is available in the following formats: - - - HTML, - PDF, - plain text - - - This is primarily documentation on the parameters and processing instructions you can use - to control the behavior of the stylesheets. - - This is purely reference documentation – not how-to - documentation. For a thorough step-by-step how-to guide to - publishing content using the DocBook XSL stylesheets, see - Bob Stayton’s DocBook XSL: The Complete Guide, available online - at http://www.sagehill.net/docbookxsl/index.html - - - This document is divided into three sets of references: - the first two sets provides user documentation; the third, - developer documentation. - - - DocBook XSL Stylesheets User Reference: Parameters - - - This is generated reference documentation for all - user-configurable parameters in the DocBook XSL - stylesheets. - - This is purely reference documentation – not how-to - documentation. For a thorough step-by-step how-to guide to - publishing content using the DocBook XSL stylesheets, see - Bob Stayton’s DocBook XSL: The Complete Guide, available online - at http://www.sagehill.net/docbookxsl/index.html - - - - - - - - - HTML Parameter Reference - - - This is reference documentation for all user-configurable - parameters in the DocBook XSL HTML stylesheets (for generating - HTML output). - - - Admonitions - - -admon.graphics.extension -string - - -admon.graphics.extension -Filename extension for admonition graphics - - - - -<xsl:param name="admon.graphics.extension">.png</xsl:param> - - - -Description - -Sets the filename extension to use on admonition graphics. - - - - - - -admon.graphics.path -string - - -admon.graphics.path -Path to admonition graphics - - - -<xsl:param name="admon.graphics.path">images/</xsl:param> - - -Description - -Sets the path to the directory containing the admonition graphics -(caution.png, important.png etc). This location is normally relative -to the output html directory. See base.dir - - - - - - -admon.graphics -boolean - - -admon.graphics -Use graphics in admonitions? - - - - -<xsl:param name="admon.graphics" select="0"></xsl:param> - - - -Description - -If true (non-zero), admonitions are presented in an alternate style that uses -a graphic. Default graphics are provided in the distribution. - - - - - - - -admon.textlabel -boolean - - -admon.textlabel -Use text label in admonitions? - - - - -<xsl:param name="admon.textlabel" select="1"></xsl:param> - - - -Description - -If true (non-zero), admonitions are presented with a generated -text label such as Note or Warning in the appropriate language. -If zero, such labels are turned off, but any title child -of the admonition element are still output. -The default value is 1. - - - - - - - -admon.style -string - - -admon.style -Specifies the CSS style attribute that should be added to -admonitions. - - - -<xsl:param name="admon.style"> - <xsl:value-of select="concat('margin-', $direction.align.start, ': 0.5in; margin-', $direction.align.end, ': 0.5in;')"></xsl:value-of> -</xsl:param> - - -Description - -Specifies the value of the CSS style -attribute that should be added to admonitions. - - - - - -Callouts - - -callout.defaultcolumn -integer - - -callout.defaultcolumn -Indicates what column callouts appear in by default - - - - -<xsl:param name="callout.defaultcolumn">60</xsl:param> - - - -Description - -If a callout does not identify a column (for example, if it uses -the linerange unit), -it will appear in the default column. - - - - - - - -callout.graphics.extension -string - - -callout.graphics.extension -Filename extension for callout graphics - - - - -<xsl:param name="callout.graphics.extension">.png</xsl:param> - - - - -Description -Sets the filename extension to use on callout graphics. - - -The Docbook XSL distribution provides callout graphics in the following formats: -SVG (extension: .svg) -PNG (extension: .png) -GIF (extension: .gif) - - - - - - -callout.graphics.number.limit -integer - - -callout.graphics.number.limit -Number of the largest callout graphic - - - - -<xsl:param name="callout.graphics.number.limit">15</xsl:param> - - - - -Description - -If callout.graphics is non-zero, graphics -are used to represent callout numbers instead of plain text. The value -of callout.graphics.number.limit is the largest -number for which a graphic exists. If the callout number exceeds this -limit, the default presentation "(plain text instead of a graphic)" -will be used. - - - - - - - -callout.graphics.path -string - - -callout.graphics.path -Path to callout graphics - - - - -<xsl:param name="callout.graphics.path">images/callouts/</xsl:param> - - - -Description - -Sets the path to the directory holding the callout graphics. his -location is normally relative to the output html directory. see -base.dir. Always terminate the directory with / since the graphic file -is appended to this string, hence needs the separator. - - - - - - - -callout.graphics -boolean - - -callout.graphics -Use graphics for callouts? - - - - -<xsl:param name="callout.graphics" select="1"></xsl:param> - - - -Description - -If non-zero, callouts are presented with graphics (e.g., reverse-video -circled numbers instead of "(1)", "(2)", etc.). -Default graphics are provided in the distribution. - - - - - - - -callout.list.table -boolean - - -callout.list.table -Present callout lists using a table? - - - - -<xsl:param name="callout.list.table" select="1"></xsl:param> - - - -Description - -The default presentation of calloutlists uses -an HTML DL element. Some browsers don't align DLs very well -if callout.graphics is used. With this option -turned on, calloutlists are presented in an HTML -TABLE, which usually results in better alignment -of the callout number with the callout description. - - - - - - -callout.unicode.number.limit -integer - - -callout.unicode.number.limit -Number of the largest unicode callout character - - - - -<xsl:param name="callout.unicode.number.limit">10</xsl:param> - - - -Description - -If callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.number.limit -is -the largest number for which a unicode character exists. If the callout number -exceeds this limit, the default presentation "(nnn)" will always -be used. - - - - - - - -callout.unicode.start.character -integer - - -callout.unicode.start.character -First Unicode character to use, decimal value. - - - - -<xsl:param name="callout.unicode.start.character">10102</xsl:param> - - - -Description - -If callout.graphics is zero and callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.start.character -is the decimal unicode value used for callout number one. Currently, -only 10102 is supported in the stylesheets for this parameter. - - - - - - - -callout.unicode -boolean - - -callout.unicode -Use Unicode characters rather than images for callouts. - - - -<xsl:param name="callout.unicode" select="0"></xsl:param> - - -Description - -The stylesheets can use either an image of the numbers one to ten, or the single Unicode character which represents the numeral, in white on a black background. Use this to select the Unicode character option. - - - - - - - -callouts.extension -boolean - - -callouts.extension -Enable the callout extension - - - - -<xsl:param name="callouts.extension" select="1"></xsl:param> - - - -Description - -The callouts extension processes areaset -elements in programlistingco and other text-based -callout elements. - - - - - -EBNF - - -ebnf.table.bgcolor -color - - -ebnf.table.bgcolor -Background color for EBNF tables - - - - -<xsl:param name="ebnf.table.bgcolor">#F5DCB3</xsl:param> - - - -Description - -Sets the background color for EBNF tables (a pale brown). No -bgcolor attribute is output if -ebnf.table.bgcolor is set to the null string. - - - - - - - -ebnf.table.border -boolean - - -ebnf.table.border -Selects border on EBNF tables - - - -<xsl:param name="ebnf.table.border" select="1"></xsl:param> - - -Description - -Selects the border on EBNF tables. If non-zero, the tables have -borders, otherwise they don't. - - - - - - -ebnf.assignment -rtf - - -ebnf.assignment -The EBNF production assignment operator - - - - -<xsl:param name="ebnf.assignment"> -<code>::=</code> -</xsl:param> - - - - -Description - -The ebnf.assignment parameter determines what -text is used to show assignment in productions -in productionsets. - -While ::= is common, so are several -other operators. - - - - - - -ebnf.statement.terminator -rtf - - -ebnf.statement.terminator -Punctuation that ends an EBNF statement. - - - - -<xsl:param name="ebnf.statement.terminator"></xsl:param> - - - - -Description - -The ebnf.statement.terminator parameter determines what -text is used to terminate each production -in productionset. - -Some notations end each statement with a period. - - - - -ToC/LoT/Index Generation - - -annotate.toc -boolean - - -annotate.toc -Annotate the Table of Contents? - - - -<xsl:param name="annotate.toc" select="1"></xsl:param> - - -Description - -If true, TOCs will be annotated. At present, this just means -that the refpurpose of refentry -TOC entries will be displayed. - - - - - - - -autotoc.label.separator -string - - -autotoc.label.separator -Separator between labels and titles in the ToC - - - - -<xsl:param name="autotoc.label.separator">. </xsl:param> - - - -Description - -String used to separate labels and titles in a table of contents. - - - - - - -autotoc.label.in.hyperlink -boolean - - -autotoc.label.in.hyperlink -Include label in hyperlinked titles in TOC? - - - -<xsl:param name="autotoc.label.in.hyperlink" select="1"></xsl:param> - - -Description - -If the value of -autotoc.label.in.hyperlink is non-zero, labels -are included in hyperlinked titles in the TOC. If it is instead zero, -labels are still displayed prior to the hyperlinked titles, but -are not hyperlinked along with the titles. - - - - - - -process.source.toc -boolean - - -process.source.toc -Process a non-empty toc element if it occurs in a source document? - - - -<xsl:param name="process.source.toc" select="0"></xsl:param> - - -Description - -Specifies that the contents of a non-empty "hard-coded" -toc element in a source document are processed to -generate a TOC in output. - - This parameter has no effect on automated generation of - TOCs. An automated TOC may still be generated along with the - "hard-coded" TOC. To suppress automated TOC generation, adjust the - value of the generate.toc paramameter. - - The process.source.toc parameter also has - no effect if the toc element is empty; handling - for empty toc is controlled by the - process.empty.source.toc parameter. - - - - - - - - -process.empty.source.toc -boolean - - -process.empty.source.toc -Generate automated TOC if toc element occurs in a source document? - - - -<xsl:param name="process.empty.source.toc" select="0"></xsl:param> - - -Description - -Specifies that if an empty toc element is found in a -source document, an automated TOC is generated at this point in the -document. - - Depending on what the value of the - generate.toc parameter is, setting this - parameter to 1 could result in generation of - duplicate automated TOCs. So the - process.empty.source.toc is primarily useful - as an "override": by placing an empty toc in your - document and setting this parameter to 1, you can - force a TOC to be generated even if generate.toc - says not to. - - - - - - - - -bridgehead.in.toc -boolean - - -bridgehead.in.toc -Should bridgehead elements appear in the TOC? - - - -<xsl:param name="bridgehead.in.toc" select="0"></xsl:param> - - -Description - -If non-zero, bridgeheads appear in the TOC. Note that -this option is not fully supported and may be removed in a future -version of the stylesheets. - - - - - - - -simplesect.in.toc -boolean - - -simplesect.in.toc -Should simplesect elements appear in the TOC? - - - -<xsl:param name="simplesect.in.toc" select="0"></xsl:param> - - -Description - -If non-zero, simplesects will be included in the TOC. - - - - - - - -manual.toc -string - - -manual.toc -An explicit TOC to be used for the TOC - - - - -<xsl:param name="manual.toc"></xsl:param> - - - -Description - -The manual.toc identifies an explicit TOC that -will be used for building the printed TOC. - - - - - - - -toc.list.type -list -dl -ul -ol - - -toc.list.type -Type of HTML list element to use for Tables of Contents - - - -<xsl:param name="toc.list.type">dl</xsl:param> - - -Description - -When an automatically generated Table of Contents (or List of Titles) -is produced, this HTML element will be used to make the list. - - - - - - - -toc.section.depth -integer - - -toc.section.depth -How deep should recursive sections appear -in the TOC? - - - -<xsl:param name="toc.section.depth">2</xsl:param> - - -Description - -Specifies the depth to which recursive sections should appear in the -TOC. - - - - - - - -toc.max.depth -integer - - -toc.max.depth -How many levels should be created for each TOC? - - - -<xsl:param name="toc.max.depth">8</xsl:param> - - -Description - -Specifies the maximal depth of TOC on all levels. - - - - - - -generate.toc -table - - -generate.toc -Control generation of ToCs and LoTs - - - - -<xsl:param name="generate.toc"> -appendix toc,title -article/appendix nop -article toc,title -book toc,title,figure,table,example,equation -chapter toc,title -part toc,title -preface toc,title -qandadiv toc -qandaset toc -reference toc,title -sect1 toc -sect2 toc -sect3 toc -sect4 toc -sect5 toc -section toc -set toc,title -</xsl:param> - - - - -Description - -This parameter has a structured value. It is a table of space-delimited -path/value pairs. Each path identifies some element in the source document -using a restricted subset of XPath (only the implicit child axis, no wildcards, -no predicates). Paths can be either relative or absolute. - -When processing a particular element, the stylesheets consult this table to -determine if a ToC (or LoT(s)) should be generated. - -For example, consider the entry: - -book toc,figure - -This indicates that whenever a book is formatted, a -Table Of Contents and a List of Figures should be generated. Similarly, - -/chapter toc - -indicates that whenever a document that has a root -of chapter is formatted, a Table of -Contents should be generated. The entry chapter would match -all chapters, but /chapter matches only chapter -document elements. - -Generally, the longest match wins. So, for example, if you want to distinguish -articles in books from articles in parts, you could use these two entries: - -book/article toc,figure -part/article toc - -Note that an article in a part can never match a book/article, -so if you want nothing to be generated for articles in parts, you can simply leave -that rule out. - -If you want to leave the rule in, to make it explicit that you're turning -something off, use the value nop. For example, the following -entry disables ToCs and LoTs for articles: - -article nop - -Do not simply leave the word article in the file -without a matching value. That'd be just begging the silly little -path/value parser to get confused. - -Section ToCs are further controlled by the -generate.section.toc.level parameter. -For a given section level to have a ToC, it must have both an entry in -generate.toc and be within the range enabled by -generate.section.toc.level. - - - - - -generate.section.toc.level -integer - - -generate.section.toc.level -Control depth of TOC generation in sections - - - - -<xsl:param name="generate.section.toc.level" select="0"></xsl:param> - - - -Description - -The generate.section.toc.level parameter -controls the depth of section in which TOCs will be generated. Note -that this is related to, but not the same as -toc.section.depth, which controls the depth to -which TOC entries will be generated in a given TOC. -If, for example, generate.section.toc.level -is 3, TOCs will be generated in first, second, and third -level sections, but not in fourth level sections. - - - - - - - -generate.index -boolean - - -generate.index -Do you want an index? - - - -<xsl:param name="generate.index" select="1"></xsl:param> - - -Description - -Specify if an index should be generated. - - - - - - -index.method -list -basic -kosek -kimber - - -index.method -Select method used to group index entries in an index - - - - -<xsl:param name="index.method">basic</xsl:param> - - - -Description - -This parameter lets you select which method to use for sorting and grouping - index entries in an index. -Indexes in Latin-based languages that have accented characters typically -sort together accented words and unaccented words. -Thus Á (U+00C1 LATIN CAPITAL LETTER A WITH ACUTE) would sort together -with A (U+0041 LATIN CAPITAL LETTER A), so both would appear in the A -section of the index. -Languages using other alphabets (such as Russian, which is written in the Cyrillic alphabet) -and languages using ideographic chararacters (such as Japanese) -require grouping specific to the languages and alphabets. - - -The default indexing method is limited. -It can group accented characters in Latin-based languages only. -It cannot handle non-Latin alphabets or ideographic languages. -The other indexing methods require extensions of one type or -another, and do not work with -all XSLT processors, which is why they are not used by default. - -The three choices for indexing method are: - - -basic - - -(default) Sort and groups words based only on the Latin alphabet. -Words with accented Latin letters will group and sort with -their respective primary letter, but -words in non-Latin alphabets will be -put in the Symbols section of the index. - - - - -kosek - - -This method sorts and groups words based on letter groups configured in -the DocBook locale file for the given language. -See, for example, the French locale file common/fr.xml. -This method requires that the XSLT processor -supports the EXSLT extensions (most do). -It also requires support for using -user-defined functions in xsl:key (xsltproc does not). - -This method is suitable for any language for which you can -list all the individual characters that should appear -in each letter group in an index. -It is probably not practical to use it for ideographic languages -such as Chinese that have hundreds or thousands of characters. - - -To use the kosek method, you must: - - - -Use a processor that supports its extensions, such as -Saxon 6 or Xalan (xsltproc and Saxon 8 do not). - - - -Set the index.method parameter's value to kosek. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kosek.xsl or -html/autoidx-kosek.xsl into your -customization. - - - - - - - -kimber - - -This method uses extensions to the Saxon processor to implement -sophisticated indexing processes. It uses its own -configuration file, which can include information for any number of -languages. Each language's configuration can group -words using one of two processes. In the -enumerated process similar to that used in the kosek method, -you indicate the groupings character-by-character. -In the between-key process, you specify the -break-points in the sort order that should start a new group. -The latter configuration is useful for ideographic languages -such as Chinese, Japanese, and Korean. -You can also define your own collation algorithms and how you -want mixed Latin-alphabet words sorted. - - -For a whitepaper describing the extensions, see: -http://www.innodata-isogen.com/knowledge_center/white_papers/back_of_book_for_xsl_fo.pdf. - - - -To download the extension library, see -http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport. - - - - -To use the kimber method, you must: - - - -Use Saxon (version 6 or 8) as your XSLT processor. - - - -Install and configure the Innodata Isogen library, using -the documentation that comes with it. - - - -Set the index.method parameter's value to kimber. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kimber.xsl or -html/autoidx-kimber.xsl into your -customization. - - - - - - - - - - - - - -index.on.type -boolean - - -index.on.type -Select indexterms based on type -attribute value - - - - -<xsl:param name="index.on.type" select="0"></xsl:param> - - - -Description - - -If non-zero, -then an index element that has a -type attribute -value will contain only those indexterm -elements with a matching type attribute value. -If an index has no type -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - - -If index.on.type is zero, then the -type attribute has no effect -on selecting indexterms for an index. - - -For those using DocBook version 4.2 or earlier, -the type attribute is not available -for index terms. However, you can achieve the same -effect by using the role attribute -in the same manner on indexterm -and index, and setting the stylesheet parameter -index.on.role to a nonzero value. - - - - - - - -index.on.role -boolean - - -index.on.role -Select indexterms based on role value - - - - -<xsl:param name="index.on.role" select="0"></xsl:param> - - - -Description - - -If non-zero, -then an index element that has a -role attribute -value will contain only those indexterm -elements with a matching role value. -If an index has no role -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - -If index.on.role is zero, then the -role attribute has no effect -on selecting indexterms for an index. - - -If you are using DocBook version 4.3 or later, you should -use the type attribute instead of role -on indexterm and index, -and set the index.on.type to a nonzero -value. - - - - - - - -index.links.to.section -boolean - - -index.links.to.section -HTML index entries link to container section title - - - - -<xsl:param name="index.links.to.section" select="1"></xsl:param> - - - -Description - -If zero, then an index entry in an index links -directly to the location of the -generated anchor that is output -for the indexterm. If two identical indexterm elements -exist in the same section, then both entries appear -in the index with the same title but link to different -locations. - -If non-zero, then an index entry in an index links to the -section title containing the indexterm, rather than -directly to the anchor output for the indexterm. -Duplicate indexterm entries in the same section are dropped. - - -The default value is 1, so index entries link to -section titles by default. - -In both cases, the link text in an index entry is the -title of the section containing the indexterm. -That is because HTML does not have numbered pages. -It also provides the reader with context information -for each link. - -This parameter lets you choose which style of -index linking you want. - - - -When set to 0, an index entry takes you -to the precise location of its corresponding indexterm. -However, if you have a lot of duplicate -entries in sections, then you have a lot of duplicate -titles in the index, which makes it more cluttered. -The reader may not recognize why duplicate titles -appear until they follow the links. Also, the links -may land the reader in the middle of a section where the -section title is not visible, which may also be -confusing to the reader. - - -When set to 1, an index entry link is -less precise, but duplicate titles in the -index entries are eliminated. -Landing on the section title location may confirm the reader's -expectation that a link that -shows a section title will take them to that section title, -not a location within the section. - - - - - - - - - -index.prefer.titleabbrev -boolean - - -index.prefer.titleabbrev -Should abbreviated titles be used as back references? - - - - -<xsl:param name="index.prefer.titleabbrev" select="0"></xsl:param> - - - -Description - -If non-zero, and if a titleabbrev is defined, the abbreviated title -is used as the link text of a back reference in the index. - - - - - - - -index.term.separator -string - - -index.term.separator -Override for punctuation separating an index term -from its list of page references in an index - - - - -<xsl:param name="index.term.separator"></xsl:param> - - - -Description - -This parameter permits you to override -the text to insert between -the end of an index term and its list of page references. -Typically that might be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'term-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -fill in the content for this normally empty -override parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. -For fo output, it could be an fo:leader -element to provide space of a specific length, or a dot leader. - - - - - - - -index.number.separator -string - - -index.number.separator -Override for punctuation separating page numbers in index - - - - -<xsl:param name="index.number.separator"></xsl:param> - - - -Description - -This parameter permits you to override the text to insert between -page references in a formatted index entry. Typically -that would be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'number-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. This punctuation appears between -such section titles in an HTML index. - - - - - - - -index.range.separator -string - - -index.range.separator -Override for punctuation separating the two numbers -in a page range in index - - - - -<xsl:param name="index.range.separator"></xsl:param> - - - -Description - -This parameter permits you -to override the text to insert between -the two numbers of a page range in an index. -This parameter is only used by those XSL-FO processors -that support an extension for generating such page ranges -(such as XEP). - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'range-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. So there are no page ranges -and this parameter has no effect. - - - - - -Stylesheet Extensions - - -linenumbering.everyNth -integer - - -linenumbering.everyNth -Indicate which lines should be numbered - - - - -<xsl:param name="linenumbering.everyNth">5</xsl:param> - - - -Description - -If line numbering is enabled, everyNth line will be -numbered. Note that numbering is one based, not zero based. - - - - - - - -linenumbering.extension -boolean - - -linenumbering.extension -Enable the line numbering extension - - - - -<xsl:param name="linenumbering.extension" select="1"></xsl:param> - - - -Description - -If non-zero, verbatim environments (address, literallayout, -programlisting, screen, synopsis) that specify line numbering will -have line numbers. - - - - - - - -linenumbering.separator -string - - -linenumbering.separator -Specify a separator between line numbers and lines - - - - -<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param> - - - -Description - -The separator is inserted between line numbers and lines in the -verbatim environment. The default value is a single white space. - Note the interaction with linenumbering.width - - - - - - - -linenumbering.width -integer - - -linenumbering.width -Indicates the width of line numbers - - - - -<xsl:param name="linenumbering.width">3</xsl:param> - - - -Description - -If line numbering is enabled, line numbers will appear right -justified in a field "width" characters wide. - - - - - - - -tablecolumns.extension -boolean - - -tablecolumns.extension -Enable the table columns extension function - - - - -<xsl:param name="tablecolumns.extension" select="1"></xsl:param> - - - -Description - -The table columns extension function adjusts the widths of table -columns in the HTML result to more accurately reflect the specifications -in the CALS table. - - - - - - - - textinsert.extension - boolean - - - textinsert.extension - Enables the textinsert extension element - - - - <xsl:param name="textinsert.extension" select="1"></xsl:param> - - - Description - The textinsert extension element inserts the contents of - a file into the result tree (as text). - - To use the textinsert extension element, you must use - either Saxon or Xalan as your XSLT processor (it doesn’t - work with xsltproc), along with either the DocBook Saxon - extensions or DocBook Xalan extensions (for more - information about those extensions, see DocBook Saxon Extensions and DocBook Xalan Extensions), and you must set both - the use.extensions and - textinsert.extension parameters to - 1. - As an alternative to using the textinsert element, - consider using an Xinclude element with the - parse="text" attribute and value - specified, as detailed in Using XInclude for text inclusions. - - - See Also - You can also use the dbhtml-include href processing - instruction to insert external files — both files containing - plain text and files with markup content (including HTML - content). - - More information - For how-to documentation on inserting contents of - external code files and other text files into output, see - External code files. - For guidelines on inserting contents of - HTML files into output, see Inserting external HTML code. - - - - - -textdata.default.encoding -string - - -textdata.default.encoding -Default encoding of external text files which are included -using textdata element - - - - -<xsl:param name="textdata.default.encoding"></xsl:param> - - - -Description - -Specifies the encoding of any external text files included using -textdata element. This value is used only when you do -not specify encoding by the appropriate attribute -directly on textdata. An empty string is interpreted as the system -default encoding. - - - - - - -graphicsize.extension -boolean - - -graphicsize.extension -Enable the getWidth()/getDepth() extension functions - - - - -<xsl:param name="graphicsize.extension" select="1"></xsl:param> - - - -Description - -If non-zero (and if use.extensions is non-zero -and if you're using a processor that supports extension functions), the -getWidth and getDepth functions -will be used to extract image sizes from graphics. - - - - - - -graphicsize.use.img.src.path -boolean - - -graphicsize.use.img.src.path -Prepend img.src.path before -filenames passed to extension functions - - - - -<xsl:param name="graphicsize.use.img.src.path" select="0"></xsl:param> - - - -Description - -If non-zero img.src.path parameter will -be appended before filenames passed to extension functions for -measuring image dimensions. - - - - - - -use.extensions -boolean - - -use.extensions -Enable extensions - - - - -<xsl:param name="use.extensions" select="0"></xsl:param> - - - -Description - -If non-zero, extensions may be used. Each extension is -further controlled by its own parameter. But if -use.extensions is zero, no extensions will -be used. - - - - - -Automatic labelling - - -chapter.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -chapter.autolabel -Specifies the labeling format for Chapter titles - - - - -<xsl:param name="chapter.autolabel" select="1"></xsl:param> - - -Description - -If non-zero, then chapters will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - - - - -appendix.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -appendix.autolabel -Specifies the labeling format for Appendix titles - - - - -<xsl:param name="appendix.autolabel">A</xsl:param> - - - -Description - -If non-zero, then appendices will be numbered using the -parameter value as the number format if the value matches one of the -following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperalpha). - - - - - - - -part.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -part.autolabel -Specifies the labeling format for Part titles - - - - -<xsl:param name="part.autolabel">I</xsl:param> - - - -Description - -If non-zero, then parts will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperroman). - - - - - - - - -reference.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -reference.autolabel -Specifies the labeling format for Reference titles - - - - <xsl:param name="reference.autolabel">I</xsl:param> - - -Description -If non-zero, references will be numbered using the parameter - value as the number format if the value matches one of the - following: - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - -Any non-zero value other than the above will generate -the default number format (upperroman). - - - - - - -preface.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -preface.autolabel -Specifices the labeling format for Preface titles - - - -<xsl:param name="preface.autolabel" select="0"></xsl:param> - - -Description - -If non-zero then prefaces will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - - - - - -qandadiv.autolabel -boolean - - -qandadiv.autolabel -Are divisions in QAndASets enumerated? - - - -<xsl:param name="qandadiv.autolabel" select="1"></xsl:param> - - -Description - -If non-zero, unlabeled qandadivs will be enumerated. - - - - - - - -section.autolabel -boolean - - -section.autolabel -Are sections enumerated? - - - -<xsl:param name="section.autolabel" select="0"></xsl:param> - - -Description - -If true (non-zero), unlabeled sections will be enumerated. - - - - - - - -section.autolabel.max.depth -integer - - -section.autolabel.max.depth -The deepest level of sections that are numbered. - - - - -<xsl:param name="section.autolabel.max.depth">8</xsl:param> - - - -Description - -When section numbering is turned on by the -section.autolabel parameter, then this -parameter controls the depth of section nesting that is -numbered. Sections nested to a level deeper than this value will not -be numbered. - - - - - - - -section.label.includes.component.label -boolean - - -section.label.includes.component.label -Do section labels include the component label? - - - -<xsl:param name="section.label.includes.component.label" select="0"></xsl:param> - - -Description - -If non-zero, section labels are prefixed with the label of the -component that contains them. - - - - - - - -label.from.part -boolean - - -label.from.part -Renumber components in each part? - - - - -<xsl:param name="label.from.part" select="0"></xsl:param> - - - -Description - -If label.from.part is non-zero, then - numbering of components — preface, - chapter, appendix, and - reference (when reference occurs at the - component level) — is re-started within each - part. -If label.from.part is zero (the - default), numbering of components is not - re-started within each part; instead, components are - numbered sequentially throughout each book, - regardless of whether or not they occur within part - instances. - - - - - - -component.label.includes.part.label -boolean - - -component.label.includes.part.label -Do component labels include the part label? - - - -<xsl:param name="component.label.includes.part.label" select="0"></xsl:param> - - -Description - -If non-zero, number labels for chapter, -appendix, and other component elements are prefixed with -the label of the part element that contains them. So you might see -Chapter II.3 instead of Chapter 3. Also, the labels for formal -elements such as table and figure will include -the part label. If there is no part element container, then no prefix -is generated. - - -This feature is most useful when the -label.from.part parameter is turned on. -In that case, there would be more than one chapter -1, and the extra part label prefix will identify -each chapter unambiguously. - - - - - -HTML - - -html.base -uri - - -html.base -An HTML base URI - - - - -<xsl:param name="html.base"></xsl:param> - - -Description - -If html.base is set, it is used for the base element -in the head of the html documents. The parameter specifies -the base URL for all relative URLs in the document. This is useful -for dynamically served html where the base URI needs to be -shifted. - - - - - - -html.stylesheet.type -string - - -html.stylesheet.type -The type of the stylesheet used in the generated HTML - - - -<xsl:param name="html.stylesheet.type">text/css</xsl:param> - - -Description - -The type of the stylesheet to place in the HTML link tag. - - - - - - - -html.stylesheet -string - - -html.stylesheet -Name of the stylesheet(s) to use in the generated HTML - - - - -<xsl:param name="html.stylesheet"></xsl:param> - - - -Description - -The html.stylesheet parameter is either -empty, indicating that no stylesheet link tag should be -generated in the html output, or it is a list of one or more -stylesheet files. - -Multiple stylesheets are space-delimited. If you need to -reference a stylesheet URI that includes a space, encode it with -%20. A separate html link element will -be generated for each stylesheet in the order they are listed in the -parameter. - - - - - - -css.decoration -boolean - - -css.decoration -Enable CSS decoration of elements - - - - -<xsl:param name="css.decoration" select="1"></xsl:param> - - - -Description - - -If non-zero, then html elements produced by the stylesheet may be -decorated with style attributes. For example, the -li tags produced for list items may include a -fragment of CSS in the style attribute which sets -the CSS property "list-style-type". - - - - - - - -spacing.paras -boolean - - -spacing.paras -Insert additional <p> elements for spacing? - - - - -<xsl:param name="spacing.paras" select="0"></xsl:param> - - - -Description - -When non-zero, additional, empty paragraphs are inserted in -several contexts (for example, around informal figures), to create a -more pleasing visual appearance in many browsers. - - - - - - - -emphasis.propagates.style -boolean - - -emphasis.propagates.style -Pass emphasis role attribute through to HTML? - - - -<xsl:param name="emphasis.propagates.style" select="1"></xsl:param> - - -Description -If non-zero, the role attribute of -emphasis elements will be passed through to the HTML as a -class attribute on a span that surrounds the -emphasis. - - - - - -para.propagates.style -boolean - - -para.propagates.style -Pass para role attribute through to HTML? - - - - -<xsl:param name="para.propagates.style" select="1"></xsl:param> - - - -Description - -If true, the role attribute of para elements -will be passed through to the HTML as a class attribute on the -p generated for the paragraph. - - - - - - -phrase.propagates.style -boolean - - -phrase.propagates.style -Pass phrase role attribute through to HTML? - - - - -<xsl:param name="phrase.propagates.style" select="1"></xsl:param> - - -Description - -If non-zero, the role attribute of phrase elements -will be passed through to the HTML as a class -attribute on a span that surrounds the -phrase. - - - - - - -entry.propagates.style -boolean - - -entry.propagates.style -Pass entry role attribute through to HTML? - - - - -<xsl:param name="entry.propagates.style" select="1"></xsl:param> - - - -Description - -If true, the role attribute of entry elements -will be passed through to the HTML as a class attribute on the -td or th generated for the table -cell. - - - - - - -html.longdesc -boolean - - -html.longdesc -Should longdesc URIs be created? - - - -<xsl:param name="html.longdesc" select="1"></xsl:param> - - -Description -If non-zero, HTML files will be created for the -longdesc attribute. These files -are created from the textobjects in -mediaobjects and -inlinemediaobject. - - - - - - -html.longdesc.link -boolean - - -html.longdesc.link -Should a link to the longdesc be included in the HTML? - - - - -<xsl:param name="html.longdesc.link" select="$html.longdesc"></xsl:param> - - - -Description - -If non-zero, links will be created to the -HTML files created for the -longdesc attribute. It makes no -sense to enable this option without also enabling the -html.longdesc parameter. - - - - - - - - -make.valid.html -boolean - - -make.valid.html -Attempt to make sure the HTML output is valid HTML - - - - -<xsl:param name="make.valid.html" select="0"></xsl:param> - - - -Description - -If make.valid.html is true, the stylesheets take -extra effort to ensure that the resulting HTML is valid. This may mean that some -para tags are translated into HTML divs or -that other substitutions occur. - -This parameter is different from html.cleanup -because it changes the resulting markup; it does not use extension functions -to manipulate result-tree-fragments and is therefore applicable to any -XSLT processor. - - - - - - -html.cleanup -boolean - - -html.cleanup -Attempt to clean up the resulting HTML? - - - - -<xsl:param name="html.cleanup" select="1"></xsl:param> - - - -Description - -If non-zero, and if the EXSLT -extensions are supported by your processor, the resulting HTML will be -cleaned up. This improves the chances that the -resulting HTML will be valid. It may also improve the formatting of -some elements. - -This parameter is different from make.valid.html -because it uses extension functions to manipulate result-tree-fragments. - - - - - - -html.append -string - - -html.append -Specifies content to append to HTML output - - - -<xsl:param name="html.append"></xsl:param> - - -Description - -Specifies content to append to the end of HTML files output by -the html/docbook.xsl stylesheet, after the -closing <html> tag. You probably don’t want to set any -value for this parameter; but if you do, the only value it should ever -be set to is a newline character: &#x0a; or -&#10; - - - - - - -draft.mode -list -no -yes -maybe - - -draft.mode -Select draft mode - - - - -<xsl:param name="draft.mode">no</xsl:param> - - - -Description - -Selects draft mode. If draft.mode is -yes, the entire document will be treated -as a draft. If it is no, the entire document -will be treated as a final copy. If it is maybe, -individual sections will be treated as draft or final independently, depending -on how their status attribute is set. - - - - - - - -draft.watermark.image -uri - - -draft.watermark.image -The URI of the image to be used for draft watermarks - - - - -<xsl:param name="draft.watermark.image">images/draft.png</xsl:param> - - - -Description - -The image to be used for draft watermarks. - - - - - - -generate.id.attributes -boolean - - -generate.id.attributes -Generate ID attributes on container elements? - - - - -<xsl:param name="generate.id.attributes" select="0"></xsl:param> - - - -Description - -If non-zero, the HTML stylesheet will generate ID attributes on -containers. For example, the markup: - -<section id="foo"><title>Some Title</title> -<para>Some para.</para> -</section> - -might produce: - -<div class="section" id="foo"> -<h2>Some Title</h2> -<p>Some para.</p> -</div> - -The alternative is to generate anchors: - -<div class="section"> -<h2><a name="foo"></a>Some Title</h2> -<p>Some para.</p> -</div> - -Because the name attribute of -the a element and the id -attribute of other tags are both of type ID, producing both -generates invalid documents. - -As of version 1.50, you can use this switch to control which type of -identifier is generated. For backwards-compatibility, generating -a anchors is preferred. - -Note: at present, this switch is incompletely implemented. -Disabling ID attributes will suppress them, but enabling ID attributes -will not suppress the anchors. - - - - - - -generate.meta.abstract -boolean - - -generate.meta.abstract -Generate HTML META element from abstract? - - - - -<xsl:param name="generate.meta.abstract" select="1"></xsl:param> - - - -Description - -If non-zero, document abstracts will be reproduced in the HTML -head, with >meta name="description" content="..." - - - - - - - -make.clean.html -boolean - - -make.clean.html -Make HTML conform to modern coding standards - - - - -<xsl:param name="make.clean.html" select="0"></xsl:param> - - - -Description - -If make.clean.html is true, the stylesheets take -extra effort to ensure that the resulting HTML is conforms to -modern HTML coding standards. In addition to eliminating -excessive and noncompliant coding, it moves presentation -HTML coding to a CSS stylesheet. - -The resulting HTML is dependent on -CSS for formatting, and so the stylesheet is capable of -generating a supporting CSS file. The docbook.css.source -and custom.css.source parameters control -how a CSS file is generated. - -If you require your CSS to reside in the HTML -head element, then the generate.css.header -can be used to do that. - -The make.clean.html parameter is -different from html.cleanup -because the former changes the resulting markup; it does not use extension functions -like the latter to manipulate result-tree-fragments, -and is therefore applicable to any XSLT processor. - -If make.clean.html is set to zero (the default), -then the stylesheet retains its original -old style -HTML formatting features. - - - - - - docbook.css.source - string - - - docbook.css.source - Name of the default CSS input file - - - - <xsl:param name="docbook.css.source">docbook.css.xml</xsl:param> - - - Description - -The docbook.css.source parameter -specifies the name of the file containing the default DocBook -CSS styles. Those styles are necessary when the -make.clean.html parameter is nonzero. - -The file is a well-formed XML file that -must consist of a single style root -element that contains CSS styles as its text content. -The default value of the parameter (and filename) -is docbook.css.xml. -The stylesheets ship with the default file. You can substitute -your own and specify its path in this parameter. - -If docbook.css.source is not blank, -and make.clean.html is nonzero, then -the stylesheet takes the following actions: - - - - The stylesheet uses the XSLT document() - function to open the file specified by the parameter and - load it into a variable. - - - The stylesheet forms an output pathname consisting of the - value of the base.dir parameter (if it is set) - and the value of docbook.css.source, - with the .xml suffix stripped off. - - - - The stylesheet removes the style - wrapper element and writes just the CSS text content to the output file. - - - The stylesheet adds a link element to the - HTML HEAD element to reference the external CSS stylesheet. - For example: - <link rel="stylesheet" href="docbook.css" type="text/css"> - - However, if the docbook.css.link - parameter is set to zero, then no link is written - for the default CSS file. That is useful if a custom - CSS file will import the default CSS stylesheet to ensure - proper cascading of styles. - - - -If the docbook.css.source parameter -is changed from its default docbook.css.xml to blank, -then no default CSS is generated. Likewise if the -make.clean.html parameter is set to zero, -then no default CSS is generated. The -custom.css.source parameter can be used -instead to generate a complete custom CSS file. - -You can use the generate.css.header -parameter to instead write the CSS to each HTML HEAD -element in a style tag instead of an external CSS file. - - - - - - -docbook.css.link -boolean - - -docbook.css.link -Insert a link referencing the default CSS stylesheet - - - - -<xsl:param name="docbook.css.link" select="1"></xsl:param> - - - -Description - -The stylesheets are capable of generating a default -CSS stylesheet file. The parameters -make.clean.html and -docbook.css.source control that feature. - -Normally if a default CSS file is generated, then -the stylesheet inserts a link tag in the HTML -HEAD element to reference it. -However, you can omit that link reference if -you set the docbook.css.link to zero -(1 is the default). - -This parameter is useful when you want to import the -default CSS into a custom CSS file generated using the -custom.css.source parameter. - - - - - - - - custom.css.source - string - - - custom.css.source - Name of a custom CSS input file - - - - <xsl:param name="custom.css.source"></xsl:param> - - - Description - -The custom.css.source -parameter enables you to add CSS styles to DocBook's -HTML output. - -The parameter -specifies the name of a file containing custom -CSS styles. The file must be a well-formed XML file that -consists of a single style root -element that contains CSS styles as its text content. -For example: -<?xml version="1.0"?> -<style> -h2 { - font-weight: bold; - color: blue; -} -... -</style> - - -The filename specified by the parameter -should have a .xml -filename suffix, although that is not required. -The default value of this parameter is blank. - -If custom.css.source is not blank, then -the stylesheet takes the following actions. -These actions take place regardless of the value of -the make.clean.html parameter. - - - - The stylesheet uses the XSLT document() - function to open the file specified by the parameter and - load it into a variable. - - - The stylesheet forms an output pathname consisting of the - value of the base.dir parameter (if it is set) - and the value of custom.css.source, - with the .xml suffix stripped off. - - - - The stylesheet removes the style - wrapper element and writes just the CSS text content to the output file. - - - The stylesheet adds a link element to the - HTML HEAD element to reference this external CSS stylesheet. - For example: - <link rel="stylesheet" href="custom.css" type="text/css"> - - - - - - - -If the make.clean.html parameter is nonzero -(the default is zero), -and if the docbook.css.source parameter -is not blank (the default is not blank), -then the stylesheet will also generate a default CSS file -and add a link tag to reference it. -The link to the custom CSS comes after the -link to the default, so it should cascade properly -in most browsers. -If you do not want two link tags, and -instead want your custom CSS to import the default generated -CSS file, then do the following: - - - - - Add a line like the following to your custom CSS source file: - @import url("docbook.css") - - - - Set the docbook.css.link parameter - to zero. This will omit the link tag - that references the default CSS file. - - - -If you set make.clean.html to nonzero but -you do not want the default CSS generated, then also set -the docbook.css.source parameter to blank. -Then no default CSS will be generated, and so -all CSS styles must come from your custom CSS file. - -You can use the generate.css.header -parameter to instead write the CSS to each HTML HEAD -element in a style tag instead of an external CSS file. - - - - - - -generate.css.header -boolean - - -generate.css.header -Insert generated CSS styles in HEAD element - - - - -<xsl:param name="generate.css.header" select="0"></xsl:param> - - - -Description - -The stylesheets are capable of generating both default -and custom CSS stylesheet files. The parameters -make.clean.html, -docbook.css.source, and -custom.css.source control that feature. - -If you require that CSS styles reside in the HTML -HEAD element instead of external CSS files, -then set the generate.css.header -parameter to nonzero (it is zero by default). -Then instead of generating the CSS in external files, -they are wrapped in style elements in -the HEAD element of each HTML output file. - - - - - -XSLT Processing - - -rootid -string - - -rootid -Specify the root element to format - - - - -<xsl:param name="rootid"></xsl:param> - - -Description - -If rootid is not empty, it must be the -value of an ID that occurs in the document being formatted. The entire -document will be loaded and parsed, but formatting will begin at the -element identified, rather than at the root. For example, this allows -you to process only chapter 4 of a book. -Because the entire document is available to the processor, automatic -numbering, cross references, and other dependencies are correctly -resolved. - - - - - - -suppress.navigation -boolean - - -suppress.navigation -Disable header and footer navigation - - - - -<xsl:param name="suppress.navigation" select="0"></xsl:param> - - - -Description - - -If non-zero, header and footer navigation will be suppressed. - - - - - - -suppress.header.navigation -boolean - - -suppress.header.navigation -Disable header navigation - - - - -<xsl:param name="suppress.header.navigation" select="0"></xsl:param> - - - -Description - -If non-zero, header navigation will be suppressed. - - - - - - -suppress.footer.navigation -boolean - - -suppress.footer.navigation -Disable footer navigation - - - -<xsl:param name="suppress.footer.navigation">0</xsl:param> - - -Description - - -If non-zero, footer navigation will be suppressed. - - - - - - -header.rule -boolean - - -header.rule -Rule under headers? - - - - -<xsl:param name="header.rule" select="1"></xsl:param> - - - -Description - -If non-zero, a rule will be drawn below the page headers. - - - - - - -footer.rule -boolean - - -footer.rule -Rule over footers? - - - - -<xsl:param name="footer.rule" select="1"></xsl:param> - - - -Description - -If non-zero, a rule will be drawn above the page footers. - - - - - - -id.warnings -boolean - - -id.warnings -Should warnings be generated for titled elements without IDs? - - - -<xsl:param name="id.warnings" select="0"></xsl:param> - - -Description -If non-zero, the stylesheet will issue a warning for any element -(other than the root element) which has a title but does not have an -ID. - - - -Meta/*Info and Titlepages - - -inherit.keywords -boolean - - -inherit.keywords -Inherit keywords from ancestor elements? - - - - -<xsl:param name="inherit.keywords" select="1"></xsl:param> - - -Description - -If inherit.keywords -is non-zero, the keyword meta for each HTML -head element will include all of the keywords from -ancestor elements. Otherwise, only the keywords from the current section -will be used. - - - - - - - -make.single.year.ranges -boolean - - -make.single.year.ranges -Print single-year ranges (e.g., 1998-1999) - - - - -<xsl:param name="make.single.year.ranges" select="0"></xsl:param> - - -Description - -If non-zero, year ranges that span a single year will be printed -in range notation (1998-1999) instead of discrete notation -(1998, 1999). - - - - - - -make.year.ranges -boolean - - -make.year.ranges -Collate copyright years into ranges? - - - -<xsl:param name="make.year.ranges" select="0"></xsl:param> - - -Description - -If non-zero, multiple copyright year elements will be -collated into ranges. -This works only if each year number is put into a separate -year element. The copyright element permits multiple -year elements. If a year element contains a dash or -a comma, then that year element will not be merged into -any range. - - - - - - - -author.othername.in.middle -boolean - - -author.othername.in.middle -Is othername in author a -middle name? - - - - -<xsl:param name="author.othername.in.middle" select="1"></xsl:param> - - -Description - -If non-zero, the othername of an author -appears between the firstname and -surname. Otherwise, othername -is suppressed. - - - - - - - -blurb.on.titlepage.enabled -boolean - - -blurb.on.titlepage.enabled -Display personblurb and authorblurb on title pages? - - - - -<xsl:param name="blurb.on.titlepage.enabled" select="0"></xsl:param> - - - -Description - -If non-zero, output from authorblurb and -personblurb elements is displayed on title pages. If zero -(the default), output from those elements is suppressed on title pages -(unless you are using a titlepage customization -that causes them to be included). - - - - - - -contrib.inline.enabled -boolean - - -contrib.inline.enabled -Display contrib output inline? - - - -<xsl:param name="contrib.inline.enabled">1</xsl:param> - - -Description - -If non-zero (the default), output of the contrib element is -displayed as inline content rather than as block content. - - - - - - -editedby.enabled -boolean - - -editedby.enabled -Display “Edited by” heading above editor name? - - - -<xsl:param name="editedby.enabled">1</xsl:param> - - -Description - -If non-zero, a localized Edited -by heading is displayed above editor names in output of the -editor element. - - - - - - -abstract.notitle.enabled -boolean - - -abstract.notitle.enabled -Suppress display of abstract titles? - - - <xsl:param name="abstract.notitle.enabled" select="0"></xsl:param> - -Description -If non-zero, in output of the abstract element on titlepages, -display of the abstract title is suppressed. - - - - - -othercredit.like.author.enabled -boolean - - -othercredit.like.author.enabled -Display othercredit in same style as author? - - - -<xsl:param name="othercredit.like.author.enabled">0</xsl:param> - - -Description - -If non-zero, output of the -othercredit element on titlepages is displayed in -the same style as author and -editor output. If zero then -othercredit output is displayed using a style -different than that of author and -editor. - - - - - - -generate.legalnotice.link -boolean - - -generate.legalnotice.link -Write legalnotice to separate chunk and generate link? - - - -<xsl:param name="generate.legalnotice.link" select="0"></xsl:param> - - -Description - -If the value of generate.legalnotice.link -is non-zero, the stylesheet: - - - - writes the contents of legalnotice to a separate - HTML file - - - inserts a hyperlink to the legalnotice file - - - adds (in the HTML head) either a single - link or element or multiple - link elements (depending on the value of the - html.head.legalnotice.link.multiple - parameter), with the value or values derived from the - html.head.legalnotice.link.types - parameter - - - - Otherwise, if generate.legalnotice.link is - zero, legalnotice contents are rendered on the title - page. - -The name of the separate HTML file is computed as follows: - - - - If a filename is given by the dbhtml filename -processing instruction, that filename is used. - - - If the legalnotice has an id/xml:id -attribute, and if use.id.as.filename != 0, the filename -is the concatenation of the id value and the value of the html.ext -parameter. - - - If the legalnotice does not have an id/xml:id - attribute, or if use.id.as.filename = 0, the filename is the concatenation of "ln-", -auto-generated id value, and html.ext value. - - - - - - - - - - - -generate.revhistory.link -boolean - - -generate.revhistory.link -Write revhistory to separate chunk and generate link? - - - -<xsl:param name="generate.revhistory.link" select="0"></xsl:param> - - -Description - -If non-zero, the contents of revhistory are written -to a separate HTML file and a link to the file is -generated. Otherwise, revhistory contents are rendered on -the title page. - -The name of the separate HTML file is computed as follows: - - - - If a filename is given by the dbhtml filename processing instruction, -that filename is used. - - - If the revhistory has an id/xml:id -attribute, and if use.id.as.filename != 0, the filename is the concatenation of -the id value and the value of the html.ext parameter. - - - If the revhistory does not have an id/xml:id -attribute, or if use.id.as.filename = 0, the filename is the concatenation of "rh-", -auto-generated id value, and html.ext value. - - - - - - - - - - - -html.head.legalnotice.link.types -string - - -html.head.legalnotice.link.types -Specifies link types for legalnotice link in html head - - - - -<xsl:param name="html.head.legalnotice.link.types">copyright</xsl:param> - - - -Description - -The value of -html.head.legalnotice.link.types is a -space-separated list of link types, as described in Section 6.12 -of the HTML 4.01 specification. If the value of the -generate.legalnotice.link parameter is -non-zero, then the stylesheet generates (in the -head section of the HTML source) either a single -HTML link element or, if the value of the -html.head.legalnotice.link.multiple is -non-zero, one link element for each link type -specified. Each link has the following attributes: - - - - a rel attribute whose - value is derived from the value of - html.head.legalnotice.link.types - - - an href attribute whose - value is set to the URL of the file containing the - legalnotice - - - a title attribute whose - value is set to the title of the corresponding - legalnotice (or a title programatically - determined by the stylesheet) - - - -For example: - - <link rel="license" href="ln-id2524073.html" title="Legal Notice"> - - -About the default value - - In an ideal world, the default value of - html.head.legalnotice.link.types would - probably be “license”, since the content of the - DocBook legalnotice is typically license - information, not copyright information. However, the default value - is “copyright” for pragmatic reasons: because - that’s among the set of “recognized link types” listed in Section - 6.12 of the HTML 4.01 specification, and because certain - browsers and browser extensions are preconfigured to recognize that - value. - - - - - - - -html.head.legalnotice.link.multiple -boolean - - -html.head.legalnotice.link.multiple -Generate multiple link instances in html head for legalnotice? - - - - -<xsl:param name="html.head.legalnotice.link.multiple" select="1"></xsl:param> - - - -Description - -If html.head.legalnotice.link.multiple is -non-zero and the value of -html.head.legalnotice.link.types contains -multiple link types, then the stylesheet generates (in the -head section of the HTML source) one -link element for each link type specified. For -example, if the value of -html.head.legalnotice.link.types is -“copyright license”: - - <link rel="copyright" href="ln-id2524073.html" title="Legal Notice"> - <link rel="license" href="ln-id2524073.html" title="Legal Notice"> - - Otherwise, the stylesheet generates generates a single - link instance; for example: - - <link rel="copyright license" href="ln-id2524073.html" title="Legal Notice"> - - - - - -Reference Pages - - -funcsynopsis.decoration -boolean - - -funcsynopsis.decoration -Decorate elements of a funcsynopsis? - - - - -<xsl:param name="funcsynopsis.decoration" select="1"></xsl:param> - - - -Description - -If non-zero, elements of the funcsynopsis will be -decorated (e.g. rendered as bold or italic text). The decoration is controlled by -templates that can be redefined in a customization layer. - - - - - - - -funcsynopsis.style -list -ansi -kr - - -funcsynopsis.style -What style of funcsynopsis should be generated? - - - -<xsl:param name="funcsynopsis.style">kr</xsl:param> - - -Description - -If funcsynopsis.style is ansi, -ANSI-style function synopses are generated for a -funcsynopsis, otherwise K&R-style -function synopses are generated. - - - - - - - -function.parens -boolean - - -function.parens -Generate parens after a function? - - - - -<xsl:param name="function.parens" select="0"></xsl:param> - - - -Description - -If non-zero, the formatting of a function element -will include generated parentheses. - - - - - - - -refentry.generate.name -boolean - - -refentry.generate.name -Output NAME header before refnames? - - - - -<xsl:param name="refentry.generate.name" select="1"></xsl:param> - - - -Description - -If non-zero, a "NAME" section title is output before the list -of refnames. This parameter and -refentry.generate.title are mutually -exclusive. This means that if you change this parameter to zero, you -should set refentry.generate.title to non-zero unless -you want get quite strange output. - - - - - - - -refentry.generate.title -boolean - - -refentry.generate.title -Output title before refnames? - - - - -<xsl:param name="refentry.generate.title" select="0"></xsl:param> - - - -Description - -If non-zero, the reference page title or first name is -output before the list of refnames. This parameter and -refentry.generate.name are mutually exclusive. -This means that if you change this parameter to non-zero, you -should set refentry.generate.name to zero unless -you want get quite strange output. - - - - - - - -refentry.xref.manvolnum -boolean - - -refentry.xref.manvolnum -Output manvolnum as part of -refentry cross-reference? - - - - -<xsl:param name="refentry.xref.manvolnum" select="1"></xsl:param> - - - -Description - -if non-zero, the manvolnum is used when cross-referencing -refentrys, either with xref -or citerefentry. - - - - - - - -citerefentry.link -boolean - - -citerefentry.link -Generate URL links when cross-referencing RefEntrys? - - - - -<xsl:param name="citerefentry.link" select="0"></xsl:param> - - -Description - -If non-zero, a web link will be generated, presumably -to an online man->HTML gateway. The text of the link is -generated by the generate.citerefentry.link template. - - - - - - - -refentry.separator -boolean - - -refentry.separator -Generate a separator between consecutive RefEntry elements? - - - - -<xsl:param name="refentry.separator" select="1"></xsl:param> - - - -Description - -If true, a separator will be generated between consecutive -reference pages. - - - - - - - -refclass.suppress -boolean - - -refclass.suppress -Suppress display of refclass contents? - - - - -<xsl:param name="refclass.suppress" select="0"></xsl:param> - - -Description - -If the value of refclass.suppress is -non-zero, then display of refclass contents is -suppressed in output. - - - - -Tables - - -default.table.width -length - - -default.table.width -The default width of tables - - - -<xsl:param name="default.table.width"></xsl:param> - - -Description -If non-zero, this value will be used for the -width attribute on tables that do not specify an -alternate width (with the dbhtml table-width or -dbfo table-width processing instruction). - - - - - -nominal.table.width -length - - -nominal.table.width -The (absolute) nominal width of tables - - - - -<xsl:param name="nominal.table.width">6in</xsl:param> - - - -Description - -In order to convert CALS column widths into HTML column widths, it -is sometimes necessary to have an absolute table width to use for conversion -of mixed absolute and relative widths. This value must be an absolute -length (not a percentage). - - - - - - -table.borders.with.css -boolean - - -table.borders.with.css -Use CSS to specify table, row, and cell borders? - - - - -<xsl:param name="table.borders.with.css" select="0"></xsl:param> - - - -Description - -If non-zero, CSS will be used to draw table borders. - - - - - - - -table.cell.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.cell.border.style -Specifies the border style of table cells - - - - -<xsl:param name="table.cell.border.style">solid</xsl:param> - - - -Description - -Specifies the border style of table cells. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.cell.border.thickness -length - - -table.cell.border.thickness -Specifies the thickness of table cell borders - - - - -<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param> - - - -Description - -If non-zero, specifies the thickness of borders on table -cells. The units are points. See -CSS - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.cell.border.color -color - - -table.cell.border.color -Specifies the border color of table cells - - - - -<xsl:param name="table.cell.border.color"></xsl:param> - - - - -Description - -Set the color of table cell borders. If non-zero, the value is used -for the border coloration. See CSS. A -color is either a keyword or a numerical RGB specification. -Keywords are aqua, black, blue, fuchsia, gray, green, lime, maroon, -navy, olive, orange, purple, red, silver, teal, white, and -yellow. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.frame.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.frame.border.style -Specifies the border style of table frames - - - - -<xsl:param name="table.frame.border.style">solid</xsl:param> - - - -Description - -Specifies the border style of table frames. - - - - - - -table.frame.border.thickness -length - - -table.frame.border.thickness -Specifies the thickness of the frame border - - - - -<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param> - - - -Description - -Specifies the thickness of the border on the table's frame. - - - - - - -table.frame.border.color -color - - -table.frame.border.color -Specifies the border color of table frames - - - - -<xsl:param name="table.frame.border.color"></xsl:param> - - - - -Description - -Specifies the border color of table frames. - - - - - - -default.table.frame -string - - -default.table.frame -The default framing of tables - - - - -<xsl:param name="default.table.frame">all</xsl:param> - - - -Description - -This value will be used when there is no frame attribute on the -table. - - - - - - -html.cellspacing -integer - - -html.cellspacing -Default value for cellspacing in HTML tables - - - - -<xsl:param name="html.cellspacing"></xsl:param> - - - -Description - -If non-zero, this value will be used as the default cellspacing -value in HTML tables. nn for pixels or nn% for percentage -length. E.g. 5 or 5% - - - - - - -html.cellpadding -integer - - -html.cellpadding -Default value for cellpadding in HTML tables - - - - -<xsl:param name="html.cellpadding"></xsl:param> - - - -Description - -If non-zero, this value will be used as the default cellpadding value -in HTML tables. nn for pixels or nn% for percentage length. E.g. 5 or -5% - - - - -QAndASet - - -qanda.defaultlabel -list -number -qanda -none - - -qanda.defaultlabel -Sets the default for defaultlabel on QandASet. - - - - -<xsl:param name="qanda.defaultlabel">number</xsl:param> - - - -Description - -If no defaultlabel attribute is specified on -a qandaset, this value is used. It is generally one of the legal -values for the defaultlabel attribute (none, -number or -qanda), or one of the additional stylesheet-specific values -(qnumber or qnumberanda). -The default value is 'number'. - -The values are rendered as follows: - -qanda - -questions are labeled "Q:" and -answers are labeled "A:". - - - -number - -The questions are enumerated and the answers -are not labeled. - - - -qnumber - -The questions are labeled "Q:" followed by a number, and answers are not -labeled. -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -qnumberanda - -The questions are labeled "Q:" followed by a number, and -the answers are labeled "A:". -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -none - -No distinguishing label precedes Questions or Answers. - - - - - - - - - - -qanda.inherit.numeration -boolean - - -qanda.inherit.numeration -Does enumeration of QandASet components inherit the numeration of parent elements? - - - - -<xsl:param name="qanda.inherit.numeration" select="1"></xsl:param> - - - -Description - -If non-zero, numbered qandadiv elements and -question and answer inherit the enumeration of -the ancestors of the qandaset. - - - - - - - -qanda.in.toc -boolean - - -qanda.in.toc -Should qandaentry questions appear in -the document table of contents? - - - -<xsl:param name="qanda.in.toc" select="0"></xsl:param> - - -Description - -If true (non-zero), then the generated table of contents -for a document will include qandaset titles, -qandadiv titles, -and question elements. The default value (zero) excludes -them from the TOC. - -This parameter does not affect any tables of contents -that may be generated inside a qandaset or qandadiv. - - - - - - - -qanda.nested.in.toc -boolean - - -qanda.nested.in.toc -Should nested answer/qandaentry instances appear in TOC? - - - - -<xsl:param name="qanda.nested.in.toc" select="0"></xsl:param> - - - -Description - -If non-zero, instances of qandaentry -that are children of answer elements are shown in -the TOC. - - - - -Linking - - -target.database.document -uri - - -target.database.document -Name of master database file for resolving -olinks - - - - <xsl:param name="target.database.document">olinkdb.xml</xsl:param> - - -Description - - -To resolve olinks between documents, the stylesheets use a master -database document that identifies the target datafiles for all the -documents within the scope of the olinks. This parameter value is the -URI of the master document to be read during processing to resolve -olinks. The default value is olinkdb.xml. - -The data structure of the file is defined in the -targetdatabase.dtd DTD. The database file -provides the high level elements to record the identifiers, locations, -and relationships of documents. The cross reference data for -individual documents is generally pulled into the database using -system entity references or XIncludes. See also -targets.filename. - - - - -targets.filename -string - - -targets.filename -Name of cross reference targets data file - - -<xsl:param name="targets.filename">target.db</xsl:param> - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter lets you change the name of the generated -file from the default name target.db. -The name must agree with that used in the target database -used to resolve olinks during processing. -See also target.database.document. - - - - - - -olink.base.uri -uri - - -olink.base.uri -Base URI used in olink hrefs - - -<xsl:param name="olink.base.uri"></xsl:param> - - -Description - -When cross reference data is collected for resolving olinks, it -may be necessary to prepend a base URI to each target's href. This -parameter lets you set that base URI when cross reference data is -collected. This feature is needed when you want to link to a document -that is processed without chunking. The output filename for such a -document is not known to the XSL stylesheet; the only target -information consists of fragment identifiers such as -#idref. To enable the resolution of olinks between -documents, you should pass the name of the HTML output file as the -value of this parameter. Then the hrefs recorded in the cross -reference data collection look like -outfile.html#idref, which can be reached as links -from other documents. - - - - - -use.local.olink.style -boolean - - -use.local.olink.style -Process olinks using xref style of current -document - - -<xsl:param name="use.local.olink.style" select="0"></xsl:param> - -Description - -When cross reference data is collected for use by olinks, the data for each potential target includes one field containing a completely assembled cross reference string, as if it were an xref generated in that document. Other fields record the separate title, number, and element name of each target. When an olink is formed to a target from another document, the olink resolves to that preassembled string by default. If the use.local.olink.style parameter is set to non-zero, then instead the cross -reference string is formed again from the target title, number, and -element name, using the stylesheet processing the targeting document. -Then olinks will match the xref style in the targeting document -rather than in the target document. If both documents are processed -with the same stylesheet, then the results will be the same. - - - - - -current.docid -string - - -current.docid -targetdoc identifier for the document being -processed - - -<xsl:param name="current.docid"></xsl:param> - - -Description - -When olinks between documents are resolved for HTML output, the stylesheet can compute the relative path between the current document and the target document. The stylesheet needs to know the targetdoc identifiers for both documents, as they appear in the target.database.document database file. This parameter passes to the stylesheet -the targetdoc identifier of the current document, since that -identifier does not appear in the document itself. -This parameter can also be used for print output. If an olink's targetdoc id differs from the current.docid, then the stylesheet can append the target document's title to the generated olink text. That identifies to the reader that the link is to a different document, not the current document. See also olink.doctitle to enable that feature. - - - - - -olink.doctitle -list -no -yes -maybe - - -olink.doctitle -show the document title for external olinks? - - - -<xsl:param name="olink.doctitle">no</xsl:param> - - -Description - -When olinks between documents are resolved, the generated text -may not make it clear that the reference is to another document. -It is possible for the stylesheets to append the other document's -title to external olinks. For this to happen, two parameters must -be set. - - -This olink.doctitle parameter -should be set to either yes or maybe -to enable this feature. - - - -And you should also set the current.docid -parameter to the document id for the document currently -being processed for output. - - - - - -Then if an olink's targetdoc id differs from -the current.docid value, the stylesheet knows -that it is a reference to another document and can -append the target document's -title to the generated olink text. - -The text for the target document's title is copied from the -olink database from the ttl element -of the top-level div for that document. -If that ttl element is missing or empty, -no title is output. - - -The supported values for olink.doctitle are: - - - -yes - - -Always insert the title to the target document if it is not -the current document. - - - - -no - - -Never insert the title to the target document, even if requested -in an xrefstyle attribute. - - - - -maybe - - -Only insert the title to the target document, if requested -in an xrefstyle attribute. - - - - -An xrefstyle attribute -may override the global setting for individual olinks. -The following values are supported in an -xrefstyle -attribute using the select: syntax: - - - - -docname - - -Insert the target document name for this olink using the -docname gentext template, but only -if the value of olink.doctitle -is not no. - - - - -docnamelong - - -Insert the target document name for this olink using the -docnamelong gentext template, but only -if the value of olink.doctitle -is not no. - - - - -nodocname - - -Omit the target document name even if -the value of olink.doctitle -is yes. - - - - -Another way of inserting the target document name -for a single olink is to employ an -xrefstyle -attribute using the template: syntax. -The %o placeholder (the letter o, not zero) -in such a template -will be filled in with the target document's title when it is processed. -This will occur regardless of -the value of olink.doctitle. - -Note that prior to version 1.66 of the XSL stylesheets, -the allowed values for this parameter were 0 and 1. Those -values are still supported and mapped to 'no' and 'yes', respectively. - - - - - - -olink.debug -boolean - - -olink.debug -Turn on debugging messages for olinks - - - - -<xsl:param name="olink.debug" select="0"></xsl:param> - - - -Description - -If non-zero, then each olink will generate several -messages about how it is being resolved during processing. -This is useful when an olink does not resolve properly -and the standard error messages are not sufficient to -find the problem. - - -You may need to read through the olink XSL templates -to understand the context for some of the debug messages. - - - - - - - -olink.properties -attribute set - - -olink.properties -Properties associated with the cross-reference -text of an olink. - - - - -<xsl:attribute-set name="olink.properties"> - <xsl:attribute name="show-destination">replace</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the -fo:basic-link element of an olink. It is not applied to the -optional page number or optional title of the external -document. - - - - - - -olink.lang.fallback.sequence -string - - -olink.lang.fallback.sequence -look up translated documents if olink not found? - - - -<xsl:param name="olink.lang.fallback.sequence"></xsl:param> - - -Description - - -This parameter defines a list of lang values -to search among to resolve olinks. - - -Normally an olink tries to resolve to a document in the same -language as the olink itself. The language of an olink -is determined by its nearest ancestor element with a -lang attribute, otherwise the -value of the l10n.gentext.default.lang -parameter. - - -An olink database can contain target data for the same -document in multiple languages. Each set of data has the -same value for the targetdoc attribute in -the document element in the database, but with a -different lang attribute value. - - -When an olink is being resolved, the target is first -sought in the document with the same language as the olink. -If no match is found there, then this parameter is consulted -for additional languages to try. - -The olink.lang.fallback.sequence -must be a whitespace separated list of lang values to -try. The first one with a match in the olink database is used. -The default value is empty. - -For example, a document might be written in German -and contain an olink with -targetdoc="adminguide". -When the document is processed, the processor -first looks for a target dataset in the -olink database starting with: - -<document targetdoc="adminguide" lang="de">. - - -If there is no such element, then the -olink.lang.fallback.sequence -parameter is consulted. -If its value is, for example, fr en, then the processor next -looks for targetdoc="adminguide" lang="fr", and -then for targetdoc="adminguide" lang="en". -If there is still no match, it looks for -targetdoc="adminguide" with no -lang attribute. - - -This parameter is useful when a set of documents is only -partially translated, or is in the process of being translated. -If a target of an olink has not yet been translated, then this -parameter permits the processor to look for the document in -other languages. This assumes the reader would rather have -a link to a document in a different language than to have -a broken link. - - - - - - - -insert.olink.page.number -list -no -yes -maybe - - -insert.olink.page.number -Turns page numbers in olinks on and off - - - - -<xsl:param name="insert.olink.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references made between documents with -olink will -include page number citations. -In most cases this is only applicable to references in printed output. - -The parameter has three possible values. - - - -no -No page number references will be generated for olinks. - - - -yes -Page number references will be generated -for all olink references. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an olink element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - -Olinks that point to targets within the same document -are treated as xrefs, and controlled by -the insert.xref.page.number parameter. - - -Page number references for olinks to -external documents can only be inserted if the -information exists in the olink database. -This means each olink target element -(div or obj) -must have a page attribute -whose value is its page number in the target document. -The XSL stylesheets are not able to extract that information -during processing because pages have not yet been created in -XSLT transformation. Only the XSL-FO processor knows what -page each element is placed on. -Therefore some postprocessing must take place to populate -page numbers in the olink database. - - - - - - - - - -insert.olink.pdf.frag -boolean - - -insert.olink.pdf.frag -Add fragment identifiers for links into PDF files - - - - -<xsl:param name="insert.olink.pdf.frag" select="0"></xsl:param> - - - -Description - -The value of this parameter determines whether -the cross reference URIs to PDF documents made with -olink will -include fragment identifiers. - - -When forming a URI to link to a PDF document, -a fragment identifier (typically a '#' followed by an -id value) appended to the PDF filename can be used by -the PDF viewer to open -the PDF file to a location within the document instead of -the first page. -However, not all PDF files have id -values embedded in them, and not all PDF viewers can -handle fragment identifiers. - - -If insert.olink.pdf.frag is set -to a non-zero value, then any olink targeting a -PDF file will have the fragment identifier appended to the URI. -The URI is formed by concatenating the value of the -olink.base.uri parameter, the -value of the baseuri -attribute from the document -element in the olink database with the matching -targetdoc value, -and the value of the href -attribute for the targeted element in the olink database. -The href attribute -contains the fragment identifier. - - -If insert.olink.pdf.frag is set -to zero (the default value), then -the href attribute -from the olink database -is not appended to PDF olinks, so the fragment identifier is left off. -A PDF olink is any olink for which the -baseuri attribute -from the matching document -element in the olink database ends with '.pdf'. -Any other olinks will still have the fragment identifier added. - - - - - - -prefer.internal.olink -boolean - - -prefer.internal.olink -Prefer a local olink reference to an external reference - - - - -<xsl:param name="prefer.internal.olink" select="0"></xsl:param> - - - -Description - -If you are re-using XML content modules in multiple documents, -you may want to redirect some of your olinks. This parameter -permits you to redirect an olink to the current document. - - -For example: you are writing documentation for a product, -which includes 3 manuals: a little installation -booklet (booklet.xml), a user -guide (user.xml), and a reference manual (reference.xml). -All 3 documents begin with the same introduction section (intro.xml) that -contains a reference to the customization section (custom.xml) which is -included in both user.xml and reference.xml documents. - - -How do you write the link to custom.xml in intro.xml -so that it is interpreted correctly in all 3 documents? - -If you use xref, it will fail in user.xml. - -If you use olink (pointing to reference.xml), -the reference in user.xml -will point to the customization section of the reference manual, while it is -actually available in user.xml. - - - -If you set the prefer.internal.olink -parameter to a non-zero value, then the processor will -first look in the olink database -for the olink's targetptr attribute value -in document matching the current.docid -parameter value. If it isn't found there, then -it tries the document in the database -with the targetdoc -value that matches the olink's targetdoc -attribute. - - -This feature permits an olink reference to resolve to -the current document if there is an element -with an id matching the olink's targetptr -value. The current document's olink data must be -included in the target database for this to work. - - -There is a potential for incorrect links if -the same id attribute value is used for different -content in different documents. -Some of your olinks may be redirected to the current document -when they shouldn't be. It is not possible to control -individual olink instances. - - - - - - - -link.mailto.url -string - - -link.mailto.url -Mailto URL for the LINK REL=made HTML HEAD element - - - - -<xsl:param name="link.mailto.url"></xsl:param> - - - -Description - -If not the empty string, this address will be used for the -rel=made link element in the html head - - - - - - - -ulink.target -string - - -ulink.target -The HTML anchor target for ULinks - - - - -<xsl:param name="ulink.target">_top</xsl:param> - - - -Description - -If ulink.target is non-zero, its value will -be used for the target attribute -on anchors generated for ulinks. - - - - - - -olink.fragid -string - - -olink.fragid -Names the fragment identifier portion of an OLink resolver query - - - -<xsl:param name="olink.fragid">fragid=</xsl:param> - - -Description -The fragment identifier portion of an olink target. - - - - - -olink.outline.ext -string - - -olink.outline.ext -The extension of OLink outline files - - - - -<xsl:param name="olink.outline.ext">.olink</xsl:param> - - - -Description - -The extension to be expected for OLink outline files -Bob has this parameter as dead. Please don't use - - - - - - -olink.pubid -string - - -olink.pubid -Names the public identifier portion of an OLink resolver query - - - - -<xsl:param name="olink.pubid">pubid</xsl:param> - - - -Description - - - - - - - - -olink.sysid -string - - -olink.sysid -Names the system identifier portion of an OLink resolver query - - - - -<xsl:param name="olink.sysid">sysid</xsl:param> - - - -Description - -FIXME - - - - - - -olink.resolver -string - - -olink.resolver -The root name of the OLink resolver (usually a script) - - - - <xsl:param name="olink.resolver">/cgi-bin/olink</xsl:param> - - -Description -FIXME: - - - -Cross References - - -collect.xref.targets -list -no -yes -only - - -collect.xref.targets -Controls whether cross reference data is -collected - - -<xsl:param name="collect.xref.targets">no</xsl:param> - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter determines whether the collection process is run when the document is processed by the stylesheet. The default value is no, which means the data file is not generated during processing. The other choices are yes, which means the data file is created and the document is processed for output, and only, which means the data file is created but the document is not processed for output. -See also targets.filename. - - - - - - -insert.xref.page.number -list -no -yes -maybe - - -insert.xref.page.number -Turns page numbers in xrefs on and off - - - - -<xsl:param name="insert.xref.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references (xrefs) in -printed output will -include page number citations. -It has three possible values. - - - -no -No page number references will be generated. - - - -yes -Page number references will be generated -for all xref elements. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an xref element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - - - - - - - -use.role.as.xrefstyle -boolean - - -use.role.as.xrefstyle -Use role attribute for -xrefstyle on xref? - - - - -<xsl:param name="use.role.as.xrefstyle" select="1"></xsl:param> - - - -Description - -In DocBook documents that conform to a schema older than V4.3, this parameter allows -role to serve the purpose of specifying the cross reference style. - -If non-zero, the role attribute on -xref will be used to select the cross reference style. -In DocBook V4.3, the xrefstyle attribute was added for this purpose. -If the xrefstyle attribute is present, -role will be ignored, regardless of the setting -of this parameter. - - - -Example - -The following small stylesheet shows how to configure the -stylesheets to make use of the cross reference style: - -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - -<xsl:import href="../xsl/html/docbook.xsl"/> - -<xsl:output method="html"/> - -<xsl:param name="local.l10n.xml" select="document('')"/> -<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> - <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en"> - <l:context name="xref"> - <l:template name="chapter" style="title" text="Chapter %n, %t"/> - <l:template name="chapter" text="Chapter %n"/> - </l:context> - </l:l10n> -</l:i18n> - -</xsl:stylesheet> - -With this stylesheet, the cross references in the following document: - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> -<book id="book"><title>Book</title> - -<preface> -<title>Preface</title> - -<para>Normal: <xref linkend="ch1"/>.</para> -<para>Title: <xref xrefstyle="title" linkend="ch1"/>.</para> - -</preface> - -<chapter id="ch1"> -<title>First Chapter</title> - -<para>Irrelevant.</para> - -</chapter> -</book> - -will appear as: - - -Normal: Chapter 1. -Title: Chapter 1, First Chapter. - - - - - - - -xref.with.number.and.title -boolean - - -xref.with.number.and.title -Use number and title in cross references - - - - -<xsl:param name="xref.with.number.and.title" select="1"></xsl:param> - - - -Description - -A cross reference may include the number (for example, the number of -an example or figure) and the title which is a required child of some -targets. This parameter inserts both the relevant number as well as -the title into the link. - - - - - - -xref.label-page.separator -string - - -xref.label-page.separator -Punctuation or space separating label from page number in xref - - - -<xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and page -but no title, -then the value of this parameter is inserted between -label and page number in the output. -If a title is included, then other separators are used. - - - - - - - -xref.label-title.separator -string - - -xref.label-title.separator -Punctuation or space separating label from title in xref - - - -<xsl:param name="xref.label-title.separator">: </xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and title, -then the value of this parameter is inserted between -label and title in the output. - - - - - - - -xref.title-page.separator -string - - -xref.title-page.separator -Punctuation or space separating title from page number in xref - - - -<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both title and page number, -then the value of this parameter is inserted between -title and page number in the output. - - - - - -Lists - - -segmentedlist.as.table -boolean - - -segmentedlist.as.table -Format segmented lists as tables? - - - - -<xsl:param name="segmentedlist.as.table" select="0"></xsl:param> - - - -Description - -If non-zero, segmentedlists will be formatted as -tables. - - - - - - -variablelist.as.table -boolean - - -variablelist.as.table -Format variablelists as tables? - - - - -<xsl:param name="variablelist.as.table" select="0"></xsl:param> - - - -Description - -If non-zero, variablelists will be formatted as -tables. A processing instruction exists to specify a particular width for the -column containing the terms: -dbhtml term-width=".25in" - -You can override this setting with a processing instruction as the -child of variablelist: dbhtml -list-presentation="table" or dbhtml -list-presentation="list". - -This parameter only applies to the HTML transformations. In the -FO case, proper list markup is robust enough to handle the formatting. -But see also variablelist.as.blocks. - - <variablelist> - <?dbhtml list-presentation="table"?> - <?dbhtml term-width="1.5in"?> - <?dbfo list-presentation="list"?> - <?dbfo term-width="1in"?> - <varlistentry> - <term>list</term> - <listitem> - <para> - Formatted as a table even if variablelist.as.table is set to 0. - </para> - </listitem> - </varlistentry> - </variablelist> - - - - - - -variablelist.term.separator -string - - -variablelist.term.separator -Text to separate terms within a multi-term -varlistentry - - - - -<xsl:param name="variablelist.term.separator">, </xsl:param> - - -Description - -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is placed -after each term except the last. - - - To generate a line break between multiple terms in - a varlistentry, set a non-zero value for the - variablelist.term.break.after parameter. If - you do so, you may also want to set the value of the - variablelist.term.separator parameter to an - empty string (to suppress rendering of the default comma and space - after each term). - - - - - - - -variablelist.term.break.after -boolean - - -variablelist.term.break.after -Generate line break after each term within a -multi-term varlistentry? - - - - -<xsl:param name="variablelist.term.break.after">0</xsl:param> - - -Description - -Set a non-zero value for the -variablelist.term.break.after parameter to -generate a line break between terms in a -multi-term varlistentry. - - -If you set a non-zero value for -variablelist.term.break.after, you may also -want to set the value of the -variablelist.term.separator parameter to an -empty string (to suppress rendering of the default comma and space -after each term). - - - - - -Bibliography - - -bibliography.style -list -normal -iso690 - - -bibliography.style -Style used for formatting of biblioentries. - - - - -<xsl:param name="bibliography.style">normal</xsl:param> - - - -Description - -Currently only normal and -iso690 styles are supported. - -In order to use ISO690 style to the full extent you might need -to use additional markup described on the -following WiKi page. - - - - - - -biblioentry.item.separator -string - - -biblioentry.item.separator -Text to separate bibliography entries - - - -<xsl:param name="biblioentry.item.separator">. </xsl:param> - - -Description - -Text to separate bibliography entries - - - - - - - -bibliography.collection -string - - -bibliography.collection -Name of the bibliography collection file - - - - -<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param> - - - - -Description - -Maintaining bibliography entries across a set of documents is tedious, time -consuming, and error prone. It makes much more sense, usually, to store all of -the bibliography entries in a single place and simply extract -the ones you need in each document. - -That's the purpose of the -bibliography.collection parameter. To setup a global -bibliography database, follow these steps: - -First, create a stand-alone bibliography document that contains all of -the documents that you wish to reference. Make sure that each bibliography -entry (whether you use biblioentry or bibliomixed) -has an ID. - -My global bibliography, ~/bibliography.xml begins -like this: - - -<!DOCTYPE bibliography - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<bibliography><title>References</title> - -<bibliomixed id="xml-rec"><abbrev>XML 1.0</abbrev>Tim Bray, -Jean Paoli, C. M. Sperberg-McQueen, and Eve Maler, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml">Extensible Markup -Language (XML) 1.0 Second Edition</ulink></citetitle>. -World Wide Web Consortium, 2000. -</bibliomixed> - -<bibliomixed id="xml-names"><abbrev>Namespaces</abbrev>Tim Bray, -Dave Hollander, -and Andrew Layman, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml-names/">Namespaces in -XML</ulink></citetitle>. -World Wide Web Consortium, 1999. -</bibliomixed> - -<!-- ... --> -</bibliography> - - - -When you create a bibliography in your document, simply -provide empty bibliomixed -entries for each document that you wish to cite. Make sure that these -elements have the same ID as the corresponding real -entry in your global bibliography. - -For example: - - -<bibliography><title>Bibliography</title> - -<bibliomixed id="xml-rec"/> -<bibliomixed id="xml-names"/> -<bibliomixed id="DKnuth86">Donald E. Knuth. <citetitle>Computers and -Typesetting: Volume B, TeX: The Program</citetitle>. Addison-Wesley, -1986. ISBN 0-201-13437-3. -</bibliomixed> -<bibliomixed id="relaxng"/> - -</bibliography> - - -Note that it's perfectly acceptable to mix entries from your -global bibliography with normal entries. You can use -xref or other elements to cross-reference your -bibliography entries in exactly the same way you do now. - -Finally, when you are ready to format your document, simply set the -bibliography.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global bibliography. - -The stylesheets will format the bibliography in your document as if -all of the entries referenced appeared there literally. - - - - - - -bibliography.numbered -boolean - - -bibliography.numbered -Should bibliography entries be numbered? - - - - -<xsl:param name="bibliography.numbered" select="0"></xsl:param> - - - -Description - -If non-zero bibliography entries will be numbered - - - - -Glossary - - -glossterm.auto.link -boolean - - -glossterm.auto.link -Generate links from glossterm to glossentry automatically? - - - - -<xsl:param name="glossterm.auto.link" select="0"></xsl:param> - - - -Description - -If non-zero, links from inline glossterms to the corresponding -glossentry elements in a glossary or glosslist -will be automatically generated. This is useful when your glossterms are consistent -and you don't want to add links manually. - -The automatic link generation feature is not used on glossterm elements -that have a linkend attribute. - - - - - - -firstterm.only.link -boolean - - -firstterm.only.link -Does automatic glossterm linking only apply to firstterms? - - - - -<xsl:param name="firstterm.only.link" select="0"></xsl:param> - - - -Description - -If non-zero, only firstterms will be automatically linked -to the glossary. If glossary linking is not enabled, this parameter -has no effect. - - - - - - -glossary.collection -string - - -glossary.collection -Name of the glossary collection file - - - - -<xsl:param name="glossary.collection"></xsl:param> - - - -Description - -Glossaries maintained independently across a set of documents -are likely to become inconsistent unless considerable effort is -expended to keep them in sync. It makes much more sense, usually, to -store all of the glossary entries in a single place and simply -extract the ones you need in each document. - -That's the purpose of the -glossary.collection parameter. To setup a global -glossary database, follow these steps: - -Setting Up the Glossary Database - -First, create a stand-alone glossary document that contains all of -the entries that you wish to reference. Make sure that each glossary -entry has an ID. - -Here's an example glossary: - - - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE glossary - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<glossary> -<glossaryinfo> -<editor><firstname>Eric</firstname><surname>Raymond</surname></editor> -<title>Jargon File 4.2.3 (abridged)</title> -<releaseinfo>Just some test data</releaseinfo> -</glossaryinfo> - -<glossdiv><title>0</title> - -<glossentry> -<glossterm>0</glossterm> -<glossdef> -<para>Numeric zero, as opposed to the letter `O' (the 15th letter of -the English alphabet). In their unmodified forms they look a lot -alike, and various kluges invented to make them visually distinct have -compounded the confusion. If your zero is center-dotted and letter-O -is not, or if letter-O looks almost rectangular but zero looks more -like an American football stood on end (or the reverse), you're -probably looking at a modern character display (though the dotted zero -seems to have originated as an option on IBM 3270 controllers). If -your zero is slashed but letter-O is not, you're probably looking at -an old-style ASCII graphic set descended from the default typewheel on -the venerable ASR-33 Teletype (Scandinavians, for whom /O is a letter, -curse this arrangement). (Interestingly, the slashed zero long -predates computers; Florian Cajori's monumental "A History of -Mathematical Notations" notes that it was used in the twelfth and -thirteenth centuries.) If letter-O has a slash across it and the zero -does not, your display is tuned for a very old convention used at IBM -and a few other early mainframe makers (Scandinavians curse <emphasis>this</emphasis> -arrangement even more, because it means two of their letters collide). -Some Burroughs/Unisys equipment displays a zero with a <emphasis>reversed</emphasis> -slash. Old CDC computers rendered letter O as an unbroken oval and 0 -as an oval broken at upper right and lower left. And yet another -convention common on early line printers left zero unornamented but -added a tail or hook to the letter-O so that it resembled an inverted -Q or cursive capital letter-O (this was endorsed by a draft ANSI -standard for how to draw ASCII characters, but the final standard -changed the distinguisher to a tick-mark in the upper-left corner). -Are we sufficiently confused yet?</para> -</glossdef> -</glossentry> - -<glossentry> -<glossterm>1TBS</glossterm> -<glossdef> -<para role="accidence"> -<phrase role="pronounce"></phrase> -<phrase role="partsofspeach">n</phrase> -</para> -<para>The "One True Brace Style"</para> -<glossseealso>indent style</glossseealso> -</glossdef> -</glossentry> - -<!-- ... --> - -</glossdiv> - -<!-- ... --> - -</glossary> - - - - -Marking Up Glossary Terms - -That takes care of the glossary database, now you have to get the entries -into your document. Unlike bibliography entries, which can be empty, creating -placeholder glossary entries would be very tedious. So instead, -support for glossary.collection relies on implicit linking. - -In your source document, simply use firstterm and -glossterm to identify the terms you wish to have included -in the glossary. The stylesheets assume that you will either set the -baseform attribute correctly, or that the -content of the element exactly matches a term in your glossary. - -If you're using a glossary.collection, don't -make explicit links on the terms in your document. - -So, in your document, you might write things like this: - - -<para>This is dummy text, without any real meaning. -The point is simply to reference glossary terms like <glossterm>0</glossterm> -and the <firstterm baseform="1TBS">One True Brace Style (1TBS)</firstterm>. -The <glossterm>1TBS</glossterm>, as you can probably imagine, is a nearly -religious issue.</para> - - -If you set the firstterm.only.link parameter, -only the terms marked with firstterm will be links. -Otherwise, all the terms will be linked. - - - -Marking Up the Glossary - -The glossary itself has to be identified for the stylesheets. For lack -of a better choice, the role is used. -To identify the glossary as the target for automatic processing, set -the role to auto. The title of this -glossary (and any other information from the glossaryinfo -that's rendered by your stylesheet) will be displayed, but the entries will -come from the database. - - -Unfortunately, the glossary can't be empty, so you must put in -at least one glossentry. The content of this entry -is irrelevant, it will not be rendered: - - -<glossary role="auto"> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - -What about glossary divisions? If your glossary database has glossary -divisions and your automatic glossary contains at least -one glossdiv, the automic glossary will have divisions. -If the glossdiv is missing from either location, no divisions -will be rendered. - -Glossary entries (and divisions, if appropriate) in the glossary will -occur in precisely the order they occur in your database. - - - -Formatting the Document - -Finally, when you are ready to format your document, simply set the -glossary.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global glossary. - -The stylesheets will format the glossary in your document as if -all of the entries implicilty referenced appeared there literally. - - -Limitations - -Glossary cross-references within the glossary are -not supported. For example, this will not work: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - -If you put glossary cross-references in your glossary that way, -you'll get the cryptic error: Warning: -glossary.collection specified, but there are 0 automatic -glossaries. - -Instead, you must do two things: - - - -Markup your glossary using glossseealso: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - - - -Make sure there is at least one glossterm reference to -gloss-2 in your document. The -easiest way to do that is probably within a remark in your -automatic glossary: - - -<glossary role="auto"> -<remark>Make sure there's a reference to <glossterm>gloss-2</glossterm>.</remark> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - - - - - - - - - -glossary.sort -boolean - - -glossary.sort -Sort glossentry elements? - - - - -<xsl:param name="glossary.sort" select="0"></xsl:param> - - - -Description - -If non-zero, then the glossentry elements within a -glossary, glossdiv, or glosslist are sorted on the glossterm, using -the current lang setting. If zero (the default), then -glossentry elements are not sorted and are presented -in document order. - - - - - - - -glossentry.show.acronym -list -no -yes -primary - - -glossentry.show.acronym -Display glossentry acronyms? - - - - -<xsl:param name="glossentry.show.acronym">no</xsl:param> - - - -Description - -A setting of yes means they should be displayed; -no means they shouldn't. If primary is used, -then they are shown as the primary text for the entry. - - -This setting controls both acronym and -abbrev elements in the glossentry. - - - - - -Miscellaneous - - -formal.procedures -boolean - - -formal.procedures -Selects formal or informal procedures - - - - -<xsl:param name="formal.procedures" select="1"></xsl:param> - - - -Description - -Formal procedures are numbered and always have a title. - - - - - - - -formal.title.placement -table - - -formal.title.placement -Specifies where formal object titles should occur - - - - -<xsl:param name="formal.title.placement"> -figure before -example before -equation before -table before -procedure before -task before -</xsl:param> - - - -Description - -Specifies where formal object titles should occur. For each formal object -type (figure, -example, -equation, -table, and procedure) -you can specify either the keyword -before or -after. - - - - - - -runinhead.default.title.end.punct -string - - -runinhead.default.title.end.punct -Default punctuation character on a run-in-head - - - -<xsl:param name="runinhead.default.title.end.punct">.</xsl:param> - - - -Description - -If non-zero, For a formalpara, use the specified -string as the separator between the title and following text. The period is the default value. - - - - - - -runinhead.title.end.punct -string - - -runinhead.title.end.punct -Characters that count as punctuation on a run-in-head - - - - -<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param> - - - -Description - -Specify which characters are to be counted as punctuation. These -characters are checked for a match with the last character of the -title. If no match is found, the -runinhead.default.title.end.punct contents are -inserted. This is to avoid duplicated punctuation in the output. - - - - - - - -show.comments -boolean - - -show.comments -Display remark elements? - - - - -<xsl:param name="show.comments" select="1"></xsl:param> - - - -Description - -If non-zero, comments will be displayed, otherwise they -are suppressed. Comments here refers to the remark element -(which was called comment prior to DocBook -4.0), not XML comments (<-- like this -->) which are -unavailable. - - - - - - - -show.revisionflag -boolean - - -show.revisionflag -Enable decoration of elements that have a revisionflag - - - - -<xsl:param name="show.revisionflag" select="0"></xsl:param> - - - -Description - - -If show.revisionflag is turned on, then the stylesheets -may produce additional markup designed to allow a CSS stylesheet to -highlight elements that have specific revisionflag settings. - -The markup inserted will be usually be either a <span> or -<div> with an appropriate class -attribute. (The value of the class attribute will be the same as the -value of the revisionflag attribute). In some contexts, for example -tables, where extra markup would be structurally illegal, the class -attribute will be added to the appropriate container element. - -In general, the stylesheets only test for revisionflag in contexts -where an importing stylesheet would have to redefine whole templates. -Most of the revisionflag processing is expected to be done by another -stylesheet, for example changebars.xsl. - - - - - - -shade.verbatim -boolean - - -shade.verbatim -Should verbatim environments be shaded? - - - -<xsl:param name="shade.verbatim" select="0"></xsl:param> - - -Description - -In the FO stylesheet, if this parameter is non-zero then the -shade.verbatim.style properties will be applied -to verbatim environments. - -In the HTML stylesheet, this parameter is now deprecated. Use -CSS instead. - - - - - - -shade.verbatim.style -attribute set - - -shade.verbatim.style -Properties that specify the style of shaded verbatim listings - - - - -<xsl:attribute-set name="shade.verbatim.style"> - <xsl:attribute name="border">0</xsl:attribute> - <xsl:attribute name="bgcolor">#E0E0E0</xsl:attribute> -</xsl:attribute-set> - - - - -Description - -Properties that specify the style of shaded verbatim listings. The -parameters specified (the border and background color) are added to -the styling of the xsl-fo output. A border might be specified as "thin -black solid" for example. See xsl-fo - - - - - - -punct.honorific -string - - -punct.honorific -Punctuation after an honorific in a personal name. - - - - -<xsl:param name="punct.honorific">.</xsl:param> - - - -Description - -This parameter specifies the punctuation that should be added after an -honorific in a personal name. - - - - - - -tex.math.in.alt -list -plain -latex - - -tex.math.in.alt -TeX notation used for equations - - - - -<xsl:param name="tex.math.in.alt"></xsl:param> - - - -Description - -If you want type math directly in TeX notation in equations, -this parameter specifies notation used. Currently are supported two -values -- plain and latex. Empty -value means that you are not using TeX math at all. - -Preferred way for including TeX alternative of math is inside of -textobject element. Eg.: - -<inlineequation> -<inlinemediaobject> -<imageobject> -<imagedata fileref="eq1.gif"/> -</imageobject> -<textobject><phrase>E=mc squared</phrase></textobject> -<textobject role="tex"><phrase>E=mc^2</phrase></textobject> -</inlinemediaobject> -</inlineequation> - -If you are using graphic element, you can -store TeX inside alt element: - -<inlineequation> -<alt role="tex">a^2+b^2=c^2</alt> -<graphic fileref="a2b2c2.gif"/> -</inlineequation> - -If you want use this feature, you should process your FO with -PassiveTeX, which only supports TeX math notation. When calling -stylsheet, don't forget to specify also -passivetex.extensions=1. - -If you want equations in HTML, just process generated file -tex-math-equations.tex by TeX or LaTeX. Then run -dvi2bitmap program on result DVI file. You will get images for -equations in your document. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - - -Related Parameters - tex.math.delims, - passivetex.extensions, - tex.math.file - - - - - - -tex.math.file -string - - -tex.math.file -Name of temporary file for generating images from equations - - - - -<xsl:param name="tex.math.file">tex-math-equations.tex</xsl:param> - - - -Description - -Name of auxiliary file for TeX equations. This file can be -processed by dvi2bitmap to get bitmap versions of equations for HTML -output. - - -Related Parameters - tex.math.in.alt, - tex.math.delims, - - -More information - For how-to documentation on embedding TeX equations and - generating output from them, see - DBTeXMath. - - - - - -tex.math.delims -boolean - - -tex.math.delims -Should equations output for processing by TeX be -surrounded by math mode delimiters? - - - - -<xsl:param name="tex.math.delims" select="1"></xsl:param> - - - -Description - -For compatibility with DSSSL based DBTeXMath from Allin Cottrell -you should set this parameter to 0. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - -Related Parameters - tex.math.in.alt, - passivetex.extensions - - -See Also - You can also use the dbtex delims processing - instruction to control whether delimiters are output. - - - - - - - -pixels.per.inch -integer - - -pixels.per.inch -How many pixels are there per inch? - - - - -<xsl:param name="pixels.per.inch">90</xsl:param> - - - -Description - -When lengths are converted to pixels, this value is used to -determine the size of a pixel. The default value is taken from the -XSL -Recommendation. - - - - - - - -points.per.em -number - - -points.per.em -Specify the nominal size of an em-space in points - - - - -<xsl:param name="points.per.em">10</xsl:param> - - - -Description - -The fixed value used for calculations based upon the size of a -character. The assumption made is that ten point font is in use. This -assumption may not be valid. - - - - - - -use.svg -boolean - - -use.svg -Allow SVG in the result tree? - - - - -<xsl:param name="use.svg" select="1"></xsl:param> - - - -Description - -If non-zero, SVG will be considered an acceptable image format. SVG -is passed through to the result tree, so correct rendering of the resulting -diagram depends on the formatter (FO processor or web browser) that is used -to process the output from the stylesheet. - - - - - - -menuchoice.separator -string - - -menuchoice.separator -Separator between items of a menuchoice -other than guimenuitem and -guisubmenu - - - - -<xsl:param name="menuchoice.separator">+</xsl:param> - - - -Description - -Separator used to connect items of a menuchoice other -than guimenuitem and guisubmenu. The latter -elements are linked with menuchoice.menu.separator. - - - - - - - -menuchoice.menu.separator -string - - -menuchoice.menu.separator -Separator between items of a menuchoice -with guimenuitem or -guisubmenu - - - - -<xsl:param name="menuchoice.menu.separator"> → </xsl:param> - - - -Description - -Separator used to connect items of a menuchoice with -guimenuitem or guisubmenu. Other elements -are linked with menuchoice.separator. - -The default value is &#x2192;, which is the -&rarr; (right arrow) character entity. -The current FOP (0.20.5) requires setting the font-family -explicitly. - -The default value also includes spaces around the arrow, -which will allow a line to break. Replace the spaces with -&#xA0; (nonbreaking space) if you don't want those -spaces to break. - - - - - - - -default.float.class -string - - -default.float.class -Specifies the default float class - - - - -<xsl:param name="default.float.class"> - <xsl:choose> - <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when> - <xsl:otherwise>before</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -Selects the direction in which a float should be placed. for -xsl-fo this is before, for html it is left. For Western texts, the -before direction is the top of the page. - - - - - - -footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -footnote.number.format -Identifies the format used for footnote numbers - - - - -<xsl:param name="footnote.number.format">1</xsl:param> - - - -Description - -The footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A). - - - - - - -table.footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -table.footnote.number.format -Identifies the format used for footnote numbers in tables - - - - -<xsl:param name="table.footnote.number.format">a</xsl:param> - - - -Description - -The table.footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A) in tables. - - - - - - -footnote.number.symbols - - - -footnote.number.symbols -Special characters to use as footnote markers - - - - -<xsl:param name="footnote.number.symbols"></xsl:param> - - - -Description - -If footnote.number.symbols is not the empty string, -footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, , , -, and . If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - - - - -table.footnote.number.symbols -string - - -table.footnote.number.symbols -Special characters to use a footnote markers in tables - - - - -<xsl:param name="table.footnote.number.symbols"></xsl:param> - - - -Description - -If table.footnote.number.symbols is not the empty string, -table footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, , , -, and . If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -table.footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - - - - -highlight.source -boolean - - -highlight.source -Should the content of programlisting -be syntactically highlighted? - - - - -<xsl:param name="highlight.source" select="0"></xsl:param> - - - -Description - -When this parameter is non-zero, the stylesheets will try to do syntax highlighting of the -content of programlisting elements. You specify the language for each programlisting -by using the language attribute. The highlight.default.language -parameter can be used to specify the language for programlistings without a language -attribute. Syntax highlighting also works for screen and synopsis elements. - -The actual highlighting work is done by the XSLTHL extension module. This is an external Java library that has to be -downloaded separately (see below). - - -In order to use this extension, you must - -add xslthl-2.x.x.jar to your Java classpath. The latest version is available -from the XSLT syntax highlighting project -at SourceForge. - - -use a customization layer in which you import one of the following stylesheet modules: - - - html/highlight.xsl - - - - xhtml/highlight.xsl - - - - xhtml-1_1/highlight.xsl - - - - fo/highlight.xsl - - - - - -let either the xslthl.config Java system property or the -highlight.xslthl.config parameter point to the configuration file for syntax -highlighting (using URL syntax). DocBook XSL comes with a ready-to-use configuration file, -highlighting/xslthl-config.xml. - - - -The extension works with Saxon 6.5.x and Xalan-J. (Saxon 8.5 or later is also supported, but since it is -an XSLT 2.0 processor it is not guaranteed to work with DocBook XSL in all circumstances.) - -The following is an example of a Saxon 6 command adapted for syntax highlighting, to be used on Windows: - - -java -cp c:/Java/saxon.jar;c:/Java/xslthl-2.0.1.jar --Dxslthl.config=file:///c:/docbook-xsl/highlighting/xslthl-config.xml com.icl.saxon.StyleSheet --o test.html test.xml myhtml.xsl - - - - - - - -highlight.xslthl.config -uri - - -highlight.xslthl.config -Location of XSLTHL configuration file - - - - -<xsl:param name="highlight.xslthl.config"></xsl:param> - - - -Description - -This location has precedence over the corresponding Java property. - -Please note that usually you have to specify location as URL not -just as a simple path on the local -filesystem. E.g. file:///home/user/xslthl/my-xslthl-config.xml. - - - - - - - - -highlight.default.language -string - - -highlight.default.language -Default language of programlisting - - - - -<xsl:param name="highlight.default.language"></xsl:param> - - - -Description - -This language is used when there is no language attribute on programlisting. - - - - - - -email.delimiters.enabled -boolean - - -email.delimiters.enabled -Generate delimiters around email addresses? - - - - -<xsl:param name="email.delimiters.enabled" select="1"></xsl:param> - - - -Description - -If non-zero, delimiters - -For delimiters, the -stylesheets are currently hard-coded to output angle -brackets. - -are generated around e-mail addresses -(the output of the email element). - - - - - - -exsl.node.set.available -boolean - - -exsl.node.set.available -Is the test function-available('exsl:node-set') true? - - - -<xsl:param name="exsl.node.set.available"> - <xsl:choose> - <xsl:when exsl:foo="" test="function-available('exsl:node-set') or contains(system-property('xsl:vendor'), 'Apache Software Foundation')">1</xsl:when> - <xsl:otherwise>0</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -If non-zero, -then the exsl:node-set() function is available to be used in -the stylesheet. -If zero, then the function is not available. -This param automatically detects the presence of -the function and does not normally need to be set manually. - -This param was created to handle a long-standing -bug in the Xalan processor that fails to detect the -function even though it is available. - - - - -Annotations - - -annotation.support -boolean - - -annotation.support -Enable annotations? - - - - -<xsl:param name="annotation.support" select="0"></xsl:param> - - - -Description - -If non-zero, the stylesheets will attempt to support annotation -elements in HTML by including some JavaScript (see -annotation.js). - - - - - - -annotation.js -string - - -annotation.js -URIs identifying JavaScript files with support for annotation popups - - - - - -<xsl:param name="annotation.js"> -<xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param> - - - - -Description - -If annotation.support is enabled and the -document contains annotations, then the URIs listed -in this parameter will be included. These JavaScript files are required -for popup annotation support. - - - - - - -annotation.css -string - - -annotation.css -CSS rules for annotations - - - - -<xsl:param name="annotation.css"> -/* ====================================================================== - Annotations -*/ - -div.annotation-list { visibility: hidden; - } - -div.annotation-nocss { position: absolute; - visibility: hidden; - } - -div.annotation-popup { position: absolute; - z-index: 4; - visibility: hidden; - padding: 0px; - margin: 2px; - border-style: solid; - border-width: 1px; - width: 200px; - background-color: white; - } - -div.annotation-title { padding: 1px; - font-weight: bold; - border-bottom-style: solid; - border-bottom-width: 1px; - color: white; - background-color: black; - } - -div.annotation-body { padding: 2px; - } - -div.annotation-body p { margin-top: 0px; - padding-top: 0px; - } - -div.annotation-close { position: absolute; - top: 2px; - right: 2px; - } -</xsl:param> - - - -Description - -If annotation.support is enabled and the -document contains annotations, then the CSS in this -parameter will be included in the document. - - - - - - -annotation.graphic.open -uri - - -annotation.graphic.open -Image for identifying a link that opens an annotation popup - - - - -<xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param> - - - -Description - -This image is used inline to identify the location of -annotations. It may be replaced by a user provided graphic. The size should be approximately 10x10 pixels. - - - - - - -annotation.graphic.close -uri - - -annotation.graphic.close -Image for identifying a link that closes an annotation popup - - - - -<xsl:param name="annotation.graphic.close"> -http://docbook.sourceforge.net/release/images/annot-close.png</xsl:param> - - - -Description - -This image is used on popup annotations as the “x” that the -user can click to dismiss the popup. -This image is used on popup annotations as the “x” that the user can -click to dismiss the popup. It may be replaced by a user provided graphic. The size should be approximately 10x10 pixels. - - - - -Graphics - - -img.src.path -string - - -img.src.path -Path to HTML/FO image files - - - -<xsl:param name="img.src.path"></xsl:param> - - -Description - -Add a path prefix to the value of the fileref -attribute of graphic, inlinegraphic, and imagedata elements. The resulting -compound path is used in the output as the value of the src -attribute of img (HTML) or external-graphic (FO). - - - -The path given by img.src.path could be relative to the directory where the HTML/FO -files are created, or it could be an absolute URI. -The default value is empty. -Be sure to include a trailing slash if needed. - - -This prefix is not applied to any filerefs that start -with "/" or contain "//:". - - - - - - - -keep.relative.image.uris -boolean - - -keep.relative.image.uris -Should image URIs be resolved against xml:base? - - - - -<xsl:param name="keep.relative.image.uris" select="1"></xsl:param> - - - - -Description - -If non-zero, relative URIs (in, for example -fileref attributes) will be used in the generated -output. Otherwise, the URIs will be made absolute with respect to the -base URI. - -Note that the stylesheets calculate (and use) the absolute form -for some purposes, this only applies to the resulting output. - - - - - - -graphic.default.extension -string - - -graphic.default.extension -Default extension for graphic filenames - - - -<xsl:param name="graphic.default.extension"></xsl:param> - - -Description - -If a graphic or mediaobject -includes a reference to a filename that does not include an extension, -and the format attribute is -unspecified, the default extension will be used. - - - - - - - -default.image.width -length - - -default.image.width -The default width of images - - - - -<xsl:param name="default.image.width"></xsl:param> - - - -Description - -If specified, this value will be used for the -width attribute on images that do not specify any -viewport dimensions. - - - - - - -nominal.image.width -length - - -nominal.image.width -The nominal image width - - - - -<xsl:param name="nominal.image.width" select="6 * $pixels.per.inch"></xsl:param> - - - -Description - -Graphic widths expressed as a percentage are problematic. In the -following discussion, we speak of width and contentwidth, but -the same issues apply to depth and contentdepth. - -A width of 50% means "half of the available space for the image." -That's fine. But note that in HTML, this is a dynamic property and -the image size will vary if the browser window is resized. - -A contentwidth of 50% means "half of the actual image width". -But what does that mean if the stylesheets cannot assess the image's -actual size? Treating this as a width of 50% is one possibility, but -it produces behavior (dynamic scaling) that seems entirely out of -character with the meaning. - -Instead, the stylesheets define a -nominal.image.width and convert percentages to -actual values based on that nominal size. - - - - - - -nominal.image.depth -length - - -nominal.image.depth -Nominal image depth - - - - -<xsl:param name="nominal.image.depth" select="4 * $pixels.per.inch"></xsl:param> - - - -Description - -See nominal.image.width. - - - - - - -use.embed.for.svg -boolean - - -use.embed.for.svg -Use HTML embed for SVG? - - - - -<xsl:param name="use.embed.for.svg" select="0"></xsl:param> - - - -Description - -If non-zero, an embed element will be created for -SVG figures. An object is always created, -this parameter merely controls whether or not an additional embed -is generated inside the object. - -On the plus side, this may be more portable among browsers and plug-ins. -On the minus side, it isn't valid HTML. - - - - - - -make.graphic.viewport -boolean - - -make.graphic.viewport -Use tables in HTML to make viewports for graphics - - - - -<xsl:param name="make.graphic.viewport" select="1"></xsl:param> - - - -Description - -The HTML img element only supports the notion -of content-area scaling; it doesn't support the distinction between a -content-area and a viewport-area, so we have to make some compromises. - -If make.graphic.viewport is non-zero, a table -will be used to frame the image. This creates an effective viewport-area. - - -Tables and alignment don't work together, so this parameter is ignored -if alignment is specified on an image. - - - - - -preferred.mediaobject.role -string - - -preferred.mediaobject.role -Select which mediaobject to use based on -this value of an object's role attribute. - - - - - -<xsl:param name="preferred.mediaobject.role"></xsl:param> - - - -Description - -A mediaobject may contain several objects such as imageobjects. -If the parameter use.role.for.mediaobject is -non-zero, then the role attribute on -imageobjects and other objects within a -mediaobject container will be used to select which object -will be used. If one of the objects has a role value that matches the -preferred.mediaobject.role parameter, then it -has first priority for selection. If more than one has such a role -value, the first one is used. - - -See the use.role.for.mediaobject parameter -for the sequence of selection. - - - - - -use.role.for.mediaobject -boolean - - -use.role.for.mediaobject -Use role attribute -value for selecting which of several objects within a mediaobject to use. - - - - - -<xsl:param name="use.role.for.mediaobject" select="1"></xsl:param> - - - -Description - -If non-zero, the role attribute on -imageobjects or other objects within a mediaobject container will be used to select which object will be -used. - - -The order of selection when then parameter is non-zero is: - - - - If the stylesheet parameter preferred.mediaobject.role has a value, then the object whose role equals that value is selected. - - -Else if an object's role attribute has a value of -html for HTML processing or -fo for FO output, then the first -of such objects is selected. - - - -Else the first suitable object is selected. - - - -If the value of -use.role.for.mediaobject -is zero, then role attributes are not considered -and the first suitable object -with or without a role value is used. - - - - - - -ignore.image.scaling -boolean - - -ignore.image.scaling -Tell the stylesheets to ignore the author's image scaling attributes - - - - -<xsl:param name="ignore.image.scaling" select="0"></xsl:param> - - - -Description - -If non-zero, the scaling attributes on graphics and media objects are -ignored. - - - - -Chunking - - -chunker.output.cdata-section-elements -string - - -chunker.output.cdata-section-elements -List of elements to escape with CDATA sections - - - -<xsl:param name="chunker.output.cdata-section-elements"></xsl:param> - - -Description -This parameter specifies the list of elements that should be escaped -as CDATA sections by the chunking stylesheet. Not all processors support -specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.doctype-public -string - - -chunker.output.doctype-public -Public identifer to use in the document type of generated pages - - - -<xsl:param name="chunker.output.doctype-public"></xsl:param> - - -Description -This parameter specifies the public identifier that should be used by -the chunking stylesheet in the document type declaration of chunked pages. -Not all processors support specification of -this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.doctype-system -uri - - -chunker.output.doctype-system -System identifier to use for the document type in generated pages - - - -<xsl:param name="chunker.output.doctype-system"></xsl:param> - - -Description -This parameter specifies the system identifier that should be used by -the chunking stylesheet in the document type declaration of chunked pages. -Not all processors support specification of -this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.encoding -string - - -chunker.output.encoding -Encoding used in generated pages - - - -<xsl:param name="chunker.output.encoding">ISO-8859-1</xsl:param> - - -Description -This parameter specifies the encoding to be used in files -generated by the chunking stylesheet. Not all processors support -specification of this parameter. - -This parameter used to be named default.encoding. - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.indent -string - - -chunker.output.indent -Specification of indentation on generated pages - - - -<xsl:param name="chunker.output.indent">no</xsl:param> - - -Description -This parameter specifies the value of the indent -specification for generated pages. Not all processors support -specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.media-type -string - - -chunker.output.media-type -Media type to use in generated pages - - - -<xsl:param name="chunker.output.media-type"></xsl:param> - - -Description -This parameter specifies the media type that should be used by -the chunking stylesheet. Not all processors support specification of -this parameter. - -This parameter specifies the media type that should be used by the -chunking stylesheet. This should be one from those defined in -[RFC2045] and - [RFC2046] - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. -It must be one from html, xml or text - - - - - - -chunker.output.method -list -html -xml - - -chunker.output.method -Method used in generated pages - - - -<xsl:param name="chunker.output.method">html</xsl:param> - - -Description -This parameter specifies the output method to be used in files -generated by the chunking stylesheet. - -This parameter used to be named output.method. - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.omit-xml-declaration -string - - -chunker.output.omit-xml-declaration -Omit-xml-declaration for generated pages - - - -<xsl:param name="chunker.output.omit-xml-declaration">no</xsl:param> - - -Description -This parameter specifies the value of the omit-xml-declaration -specification for generated pages. Not all processors support -specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.standalone -string - - -chunker.output.standalone -Standalone declaration for generated pages - - - -<xsl:param name="chunker.output.standalone">no</xsl:param> - - -Description -This parameter specifies the value of the standalone - specification for generated pages. It must be either - yes or no. Not all - processors support specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -saxon.character.representation -string - - -saxon.character.representation -Saxon character representation used in generated HTML pages - - - - <xsl:param name="saxon.character.representation" select="'entity;decimal'"></xsl:param> - - -Description - -This parameter has effect only when Saxon 6 is used (version 6.4.2 or later). -It sets the character representation in files generated by the chunking stylesheets. -If you want to suppress entity references for characters with direct representations in -chunker.output.encoding, set the parameter value to native. - - - For more information, see Saxon output character representation. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - - - -html.ext -string - - -html.ext -Identifies the extension of generated HTML files - - - - -<xsl:param name="html.ext">.html</xsl:param> - - - -Description - -The extension identified by html.ext will -be used as the filename extension for chunks created by this -stylesheet. - - - - - - -use.id.as.filename -boolean - - -use.id.as.filename -Use ID value of chunk elements as the filename? - - - - -<xsl:param name="use.id.as.filename" select="0"></xsl:param> - - - -Description - -If use.id.as.filename -is non-zero, the filename of chunk elements that have IDs will be -derived from the ID value. - - - - - - - -html.extra.head.links -boolean - - -html.extra.head.links -Toggle extra HTML head link information - - - - -<xsl:param name="html.extra.head.links" select="0"></xsl:param> - - - -Description - -If non-zero, extra link elements will be -generated in the head of chunked HTML files. These -extra links point to chapters, appendixes, sections, etc. as supported -by the Site Navigation Bar in Mozilla 1.0 (as of CR1, at least). - - - - - - - -root.filename -uri - - -root.filename -Identifies the name of the root HTML file when chunking - - - - -<xsl:param name="root.filename">index</xsl:param> - - - -Description - -The root.filename is the base filename for -the chunk created for the root of each document processed. - - - - - - - -base.dir -uri - - -base.dir -The base directory of chunks - - - - -<xsl:param name="base.dir"></xsl:param> - - - -Description - -If specified, the base.dir identifies -the output directory for chunks. (If not specified, the output directory -is system dependent.) - - - - - - - generate.manifest - boolean - - - generate.manifest - Generate a manifest file? - - - - <xsl:param name="generate.manifest" select="0"></xsl:param> - - - Description - - If non-zero, a list of HTML files generated by the - stylesheet transformation is written to the file named by - the manifest parameter. - - - - - - - manifest - string - - - manifest - Name of manifest file - - - - - <xsl:param name="manifest">HTML.manifest</xsl:param> - - - - Description - - The name of the file to which a manifest is written (if the - value of the generate.manifest parameter - is non-zero). - - - - - - -manifest.in.base.dir -boolean - - -manifest.in.base.dir -Should the manifest file be written into base.dir? - - - - -<xsl:param name="manifest.in.base.dir" select="0"></xsl:param> - - - -Description - -If non-zero, the manifest file as well as project files for HTML Help and -Eclipse Help are written into base.dir instead -of the current directory. - - - - - - -chunk.toc -string - - -chunk.toc -An explicit TOC to be used for chunking - - - - -<xsl:param name="chunk.toc"></xsl:param> - - - -Description - -The chunk.toc identifies an explicit TOC that -will be used for chunking. This parameter is only used by the -chunktoc.xsl stylesheet (and customization layers built -from it). - - - - - - -chunk.tocs.and.lots -boolean - - -chunk.tocs.and.lots -Should ToC and LoTs be in separate chunks? - - - - -<xsl:param name="chunk.tocs.and.lots" select="0"></xsl:param> - - - -Description - -If non-zero, ToC and LoT (List of Examples, List of Figures, etc.) -will be put in a separate chunk. At the moment, this chunk is not in the -normal forward/backward navigation list. Instead, a new link is added to the -navigation footer. - -This feature is still somewhat experimental. Feedback welcome. - - - - - - -chunk.separate.lots -boolean - - -chunk.separate.lots -Should each LoT be in its own separate chunk? - - - - -<xsl:param name="chunk.separate.lots" select="0"></xsl:param> - - - -Description - -If non-zero, each of the ToC and LoTs -(List of Examples, List of Figures, etc.) -will be put in its own separate chunk. -The title page includes generated links to each of the separate files. - - -This feature depends on the -chunk.tocs.and.lots -parameter also being non-zero. - - - - - - - -chunk.tocs.and.lots.has.title -boolean - - -chunk.tocs.and.lots.has.title -Should ToC and LoTs in a separate chunks have title? - - - - -<xsl:param name="chunk.tocs.and.lots.has.title" select="1"></xsl:param> - - - -Description - -If non-zero title of document is shown before ToC/LoT in -separate chunk. - - - - - - -chunk.section.depth -integer - - -chunk.section.depth -Depth to which sections should be chunked - - - - -<xsl:param name="chunk.section.depth" select="1"></xsl:param> - - - -Description - -This parameter sets the depth of section chunking. - - - - - - -chunk.first.sections -boolean - - -chunk.first.sections -Chunk the first top-level section? - - - - -<xsl:param name="chunk.first.sections" select="0"></xsl:param> - - - -Description - -If non-zero, a chunk will be created for the first top-level -sect1 or section elements in -each component. Otherwise, that section will be part of the chunk for -its parent. - - - - - - - -chunk.quietly -boolean - - -chunk.quietly -Omit the chunked filename messages. - - - - -<xsl:param name="chunk.quietly" select="0"></xsl:param> - - - -Description - -If zero (the default), the XSL processor emits a message naming -each separate chunk filename as it is being output. -If nonzero, then the messages are suppressed. - - - - - - - -chunk.append -string - - -chunk.append -Specifies content to append to chunked HTML output - - - -<xsl:param name="chunk.append"></xsl:param> - - -Description - -Specifies content to append to the end of HTML files output by -the html/chunk.xsl stylesheet, after the closing -<html> tag. You probably don’t want to set any value -for this parameter; but if you do, the only value it should ever be -set to is a newline character: &#x0a; or -&#10; - - - - - - -navig.graphics -boolean - - -navig.graphics -Use graphics in navigational headers and footers? - - - - -<xsl:param name="navig.graphics" select="0"></xsl:param> - - - -Description - -If non-zero, the navigational headers and footers in chunked -HTML are presented in an alternate style that uses graphical icons for -Next, Previous, Up, and Home. Default graphics are provided in the -distribution. If zero, text is used instead of graphics. - - - - - - - -navig.graphics.extension -string - - -navig.graphics.extension -Extension for navigational graphics - - - - -<xsl:param name="navig.graphics.extension">.gif</xsl:param> - - - -Description - -Sets the filename extension to use on navigational graphics used -in the headers and footers of chunked HTML. - - - - - - -navig.graphics.path -string - - -navig.graphics.path -Path to navigational graphics - - - - -<xsl:param name="navig.graphics.path">images/</xsl:param> - - - -Description - -Sets the path, probably relative to the directory where the HTML -files are created, to the navigational graphics used in the -headers and footers of chunked HTML. - - - - - - - -navig.showtitles -boolean - - -navig.showtitles -Display titles in HTML headers and footers? - - - -<xsl:param name="navig.showtitles">1</xsl:param> - - -Description - -If non-zero, -the headers and footers of chunked HTML -display the titles of the next and previous chunks, -along with the words 'Next' and 'Previous' (or the -equivalent graphical icons if navig.graphics is true). -If false (zero), then only the words 'Next' and 'Previous' -(or the icons) are displayed. - - - - - -Profiling - -The following parameters can be used for attribute-based -profiling of your document. For more information about profiling, see -Profiling (conditional text). - - - -profile.arch -string - - -profile.arch -Target profile for arch -attribute - - - - -<xsl:param name="profile.arch"></xsl:param> - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.audience -string - - -profile.audience -Target profile for audience -attribute - - - - -<xsl:param name="profile.audience"></xsl:param> - - - -Description - -Value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.condition -string - - -profile.condition -Target profile for condition -attribute - - - - -<xsl:param name="profile.condition"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.conformance -string - - -profile.conformance -Target profile for conformance -attribute - - - - -<xsl:param name="profile.conformance"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.lang -string - - -profile.lang -Target profile for lang -attribute - - - - -<xsl:param name="profile.lang"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.os -string - - -profile.os -Target profile for os -attribute - - - - -<xsl:param name="profile.os"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.revision -string - - -profile.revision -Target profile for revision -attribute - - - - -<xsl:param name="profile.revision"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.revisionflag -string - - -profile.revisionflag -Target profile for revisionflag -attribute - - - - -<xsl:param name="profile.revisionflag"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.role -string - - -profile.role -Target profile for role -attribute - - - - -<xsl:param name="profile.role"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - -Note that role is often -used for other purposes than profiling. For example it is commonly -used to get emphasize in bold font: - -<emphasis role="bold">very important</emphasis> - -If you are using role for -these purposes do not forget to add values like bold to -value of this parameter. If you forgot you will get document with -small pieces missing which are very hard to track. - -For this reason it is not recommended to use role attribute for profiling. You should -rather use profiling specific attributes like userlevel, os, arch, condition, etc. - - - - - - - -profile.security -string - - -profile.security -Target profile for security -attribute - - - - -<xsl:param name="profile.security"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.status -string - - -profile.status -Target profile for status -attribute - - - - -<xsl:param name="profile.status"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.userlevel -string - - -profile.userlevel -Target profile for userlevel -attribute - - - - -<xsl:param name="profile.userlevel"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.vendor -string - - -profile.vendor -Target profile for vendor -attribute - - - - -<xsl:param name="profile.vendor"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.wordsize -string - - -profile.wordsize -Target profile for wordsize -attribute - - - - -<xsl:param name="profile.wordsize"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.attribute -string - - -profile.attribute -Name of user-specified profiling attribute - - - - -<xsl:param name="profile.attribute"></xsl:param> - - - -Description - -This parameter is used in conjuction with -profile.value. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.value -string - - -profile.value -Target profile for user-specified attribute - - - - -<xsl:param name="profile.value"></xsl:param> - - - -Description - -When you are using this parameter you must also specify name of -profiling attribute with parameter -profile.attribute. - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.separator -string - - -profile.separator -Separator character for compound profile values - - - - -<xsl:param name="profile.separator">;</xsl:param> - - - -Description - -Separator character used for compound profile values. See profile.arch - - - - -HTML Help - - -htmlhelp.encoding -string - - -htmlhelp.encoding -Character encoding to use in files for HTML Help compiler. - - - - -<xsl:param name="htmlhelp.encoding">iso-8859-1</xsl:param> - - - -Description - -HTML Help Compiler is not UTF-8 aware, so you should always use an -appropriate single-byte encoding here. Use one from iana, the registered charset values. - - - - - - -htmlhelp.autolabel -boolean - - -htmlhelp.autolabel -Should tree-like ToC use autonumbering feature? - - - - -<xsl:param name="htmlhelp.autolabel" select="0"></xsl:param> - - - -Description - -Set this to non-zero to include chapter and section numbers into ToC -in the left panel. - - - - - - -htmlhelp.chm -string - - -htmlhelp.chm -Filename of output HTML Help file. - - - - -<xsl:param name="htmlhelp.chm">htmlhelp.chm</xsl:param> - - - -Description - -Set the name of resulting CHM file - - - - - - -htmlhelp.default.topic -string - - -htmlhelp.default.topic -Name of file with default topic - - - - -<xsl:param name="htmlhelp.default.topic"></xsl:param> - - - -Description - -Normally first chunk of document is displayed when you open HTML -Help file. If you want to display another topic, simply set its -filename by this parameter. - -This is useful especially if you don't generate ToC in front of -your document and you also hide root element in ToC. E.g.: - -<xsl:param name="generate.book.toc" select="0"/> -<xsl:param name="htmlhelp.hhc.show.root" select="0"/> -<xsl:param name="htmlhelp.default.topic">pr01.html</xsl:param> - - - - - - - -htmlhelp.display.progress -boolean - - -htmlhelp.display.progress -Display compile progress? - - - - -<xsl:param name="htmlhelp.display.progress" select="1"></xsl:param> - - - -Description - -Set to non-zero to to display compile progress - - - - - - - -htmlhelp.hhp -string - - -htmlhelp.hhp -Filename of project file. - - - - -<xsl:param name="htmlhelp.hhp">htmlhelp.hhp</xsl:param> - - - -Description - -Change this parameter if you want different name of project -file than htmlhelp.hhp. - - - - - - -htmlhelp.hhc -string - - -htmlhelp.hhc -Filename of TOC file. - - - - -<xsl:param name="htmlhelp.hhc">toc.hhc</xsl:param> - - - -Description - -Set the name of the TOC file. The default is toc.hhc. - - - - - - -htmlhelp.hhk -string - - -htmlhelp.hhk -Filename of index file. - - - - -<xsl:param name="htmlhelp.hhk">index.hhk</xsl:param> - - - -Description - -set the name of the index file. The default is index.hhk. - - - - - - -htmlhelp.hhp.tail -string - - -htmlhelp.hhp.tail -Additional content for project file. - - - - -<xsl:param name="htmlhelp.hhp.tail"></xsl:param> - - - -Description - -If you want to include some additional parameters into project file, -store appropriate part of project file into this parameter. - - - - - - -htmlhelp.hhp.window -string - - -htmlhelp.hhp.window -Name of default window. - - - - -<xsl:param name="htmlhelp.hhp.window">Main</xsl:param> - - - -Description - -Name of default window. If empty no [WINDOWS] section will be -added to project file. - - - - - - -htmlhelp.hhp.windows -string - - -htmlhelp.hhp.windows -Definition of additional windows - - - - -<xsl:param name="htmlhelp.hhp.windows"></xsl:param> - - - -Description - -Content of this parameter is placed at the end of [WINDOWS] -section of project file. You can use it for defining your own -addtional windows. - - - - - - -htmlhelp.enhanced.decompilation -boolean - - -htmlhelp.enhanced.decompilation -Allow enhanced decompilation of CHM? - - - - -<xsl:param name="htmlhelp.enhanced.decompilation" select="0"></xsl:param> - - - -Description - -When non-zero this parameter enables enhanced decompilation of CHM. - - - - - - -htmlhelp.enumerate.images -boolean - - -htmlhelp.enumerate.images -Should the paths to all used images be added to the project file? - - - - -<xsl:param name="htmlhelp.enumerate.images" select="0"></xsl:param> - - - -Description - -Set to non-zero if you insert images into your documents as -external binary entities or if you are using absolute image paths. - - - - - - -htmlhelp.force.map.and.alias -boolean - - -htmlhelp.force.map.and.alias -Should [MAP] and [ALIAS] sections be added to the project file unconditionally? - - - -<xsl:param name="htmlhelp.force.map.and.alias" select="0"></xsl:param> - - -Description - Set to non-zero if you have your own - alias.h and context.h - files and you want to include references to them in the project - file. - - - - - -htmlhelp.map.file -string - - -htmlhelp.map.file -Filename of map file. - - - -<xsl:param name="htmlhelp.map.file">context.h</xsl:param> - - -Description -Set the name of map file. The default is - context.h. (used for context-sensitive - help). - - - - - -htmlhelp.alias.file -string - - -htmlhelp.alias.file -Filename of alias file. - - - - -<xsl:param name="htmlhelp.alias.file">alias.h</xsl:param> - - - -Description - -Specifies the filename of the alias file (used for context-sensitive help). - - - - - - -htmlhelp.hhc.section.depth -integer - - -htmlhelp.hhc.section.depth -Depth of TOC for sections in a left pane. - - - - -<xsl:param name="htmlhelp.hhc.section.depth">5</xsl:param> - - - -Description - -Set the section depth in the left pane of HTML Help viewer. - - - - - - -htmlhelp.hhc.show.root -boolean - - -htmlhelp.hhc.show.root -Should there be an entry for the root element in the ToC? - - - - -<xsl:param name="htmlhelp.hhc.show.root" select="1"></xsl:param> - - - -Description - -If set to zero, there will be no entry for the root element in the -ToC. This is useful when you want to provide the user with an expanded -ToC as a default. - - - - - - -htmlhelp.hhc.folders.instead.books -boolean - - -htmlhelp.hhc.folders.instead.books -Use folder icons in ToC (instead of book icons)? - - - - -<xsl:param name="htmlhelp.hhc.folders.instead.books" select="1"></xsl:param> - - - -Description - -Set to non-zero for folder-like icons or zero for book-like icons in the ToC. -If you want to use folder-like icons, you must switch off the binary ToC using -htmlhelp.hhc.binary. - - - - - - - - -htmlhelp.hhc.binary -boolean - - -htmlhelp.hhc.binary -Generate binary ToC? - - - - -<xsl:param name="htmlhelp.hhc.binary" select="1"></xsl:param> - - - -Description - -Set to non-zero to generate a binary TOC. You must create a binary TOC -if you want to add Prev/Next buttons to toolbar (which is default -behaviour). Files with binary TOC can't be merged. - - - - - - -htmlhelp.hhc.width -integer - - -htmlhelp.hhc.width -Width of navigation pane - - - - -<xsl:param name="htmlhelp.hhc.width"></xsl:param> - - - -Description - -This parameter specifies the width of the navigation pane (containing TOC and -other navigation tabs) in pixels. - - - - - - -htmlhelp.title -string - - -htmlhelp.title -Title of HTML Help - - - - -<xsl:param name="htmlhelp.title"></xsl:param> - - - -Description - -Content of this parameter will be used as a title for generated -HTML Help. If empty, title will be automatically taken from document. - - - - - - -htmlhelp.show.menu -boolean - - -htmlhelp.show.menu -Should the menu bar be shown? - - - - -<xsl:param name="htmlhelp.show.menu" select="0"></xsl:param> - - - -Description - -Set to non-zero to have an application menu bar in your HTML Help window. - - - - - - - -htmlhelp.show.toolbar.text -boolean - - -htmlhelp.show.toolbar.text -Show text under toolbar buttons? - - - - -<xsl:param name="htmlhelp.show.toolbar.text" select="1"></xsl:param> - - - -Description - -Set to non-zero to display texts under toolbar buttons, zero to switch -off displays. - - - - - - -htmlhelp.show.advanced.search -boolean - - -htmlhelp.show.advanced.search -Should advanced search features be available? - - - - -<xsl:param name="htmlhelp.show.advanced.search" select="0"></xsl:param> - - - -Description - -If you want advanced search features in your help, turn this -parameter to 1. - - - - - - -htmlhelp.show.favorities -boolean - - -htmlhelp.show.favorities -Should the Favorites tab be shown? - - - - -<xsl:param name="htmlhelp.show.favorities" select="0"></xsl:param> - - - -Description - -Set to non-zero to include a Favorites tab in the navigation pane -of the help window. - - - - - - -htmlhelp.button.hideshow -boolean - - -htmlhelp.button.hideshow -Should the Hide/Show button be shown? - - - - -<xsl:param name="htmlhelp.button.hideshow" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Hide/Show button shown on toolbar - - - - - - -htmlhelp.button.back -boolean - - -htmlhelp.button.back -Should the Back button be shown? - - - - -<xsl:param name="htmlhelp.button.back" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Hide/Show button shown on toolbar - - - - - - -htmlhelp.button.forward -boolean - - -htmlhelp.button.forward -Should the Forward button be shown? - - - - -<xsl:param name="htmlhelp.button.forward" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Forward button on the toolbar. - - - - - - -htmlhelp.button.stop -boolean - - -htmlhelp.button.stop -Should the Stop button be shown? - - - - -<xsl:param name="htmlhelp.button.stop" select="0"></xsl:param> - - - -Description - -If you want Stop button shown on toolbar, turn this -parameter to 1. - - - - - - -htmlhelp.button.refresh -boolean - - -htmlhelp.button.refresh -Should the Refresh button be shown? - - - - -<xsl:param name="htmlhelp.button.refresh" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Stop button on the toolbar. - - - - - - -htmlhelp.button.home -boolean - - -htmlhelp.button.home -Should the Home button be shown? - - - - -<xsl:param name="htmlhelp.button.home" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Home button on the toolbar. - - - - - - -htmlhelp.button.home.url -string - - -htmlhelp.button.home.url -URL address of page accessible by Home button - - - - -<xsl:param name="htmlhelp.button.home.url"></xsl:param> - - - -Description - -URL address of page accessible by Home button. - - - - - - -htmlhelp.button.options -boolean - - -htmlhelp.button.options -Should the Options button be shown? - - - - -<xsl:param name="htmlhelp.button.options" select="1"></xsl:param> - - - -Description - -If you want Options button shown on toolbar, turn this -parameter to 1. - - - - - - -htmlhelp.button.print -boolean - - -htmlhelp.button.print -Should the Print button be shown? - - - - -<xsl:param name="htmlhelp.button.print" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Print button on the toolbar. - - - - - - - -htmlhelp.button.locate -boolean - - -htmlhelp.button.locate -Should the Locate button be shown? - - - - -<xsl:param name="htmlhelp.button.locate" select="0"></xsl:param> - - - -Description - -If you want Locate button shown on toolbar, turn this -parameter to 1. - - - - - - -htmlhelp.button.jump1 -boolean - - -htmlhelp.button.jump1 -Should the Jump1 button be shown? - - - -<xsl:param name="htmlhelp.button.jump1" select="0"></xsl:param> - - -Description - Set to non-zero to include the Jump1 button on the toolbar. - - - - - -htmlhelp.button.jump1.url -string - - -htmlhelp.button.jump1.url -URL address of page accessible by Jump1 button - - - - -<xsl:param name="htmlhelp.button.jump1.url"></xsl:param> - - - -Description - -URL address of page accessible by Jump1 button. - - - - - - -htmlhelp.button.jump1.title -string - - -htmlhelp.button.jump1.title -Title of Jump1 button - - - - -<xsl:param name="htmlhelp.button.jump1.title">User1</xsl:param> - - - -Description - -Title of Jump1 button. - - - - - - -htmlhelp.button.jump2 -boolean - - -htmlhelp.button.jump2 -Should the Jump2 button be shown? - - - - -<xsl:param name="htmlhelp.button.jump2" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Jump2 button on the toolbar. - - - - - - -htmlhelp.button.jump2.url -string - - -htmlhelp.button.jump2.url -URL address of page accessible by Jump2 button - - - - -<xsl:param name="htmlhelp.button.jump2.url"></xsl:param> - - - -Description - -URL address of page accessible by Jump2 button. - - - - - - -htmlhelp.button.jump2.title -string - - -htmlhelp.button.jump2.title -Title of Jump2 button - - - - -<xsl:param name="htmlhelp.button.jump2.title">User2</xsl:param> - - - -Description - -Title of Jump2 button. - - - - - - -htmlhelp.button.next -boolean - - -htmlhelp.button.next -Should the Next button be shown? - - - - -<xsl:param name="htmlhelp.button.next" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Next button on the toolbar. - - - - - - -htmlhelp.button.prev -boolean - - -htmlhelp.button.prev -Should the Prev button be shown? - - - - -<xsl:param name="htmlhelp.button.prev" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Prev button on the toolbar. - - - - - - - -htmlhelp.button.zoom -boolean - - -htmlhelp.button.zoom -Should the Zoom button be shown? - - - - -<xsl:param name="htmlhelp.button.zoom" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Zoom button on the toolbar. - - - - - - - -htmlhelp.remember.window.position -boolean - - -htmlhelp.remember.window.position -Remember help window position? - - - - -<xsl:param name="htmlhelp.remember.window.position" select="0"></xsl:param> - - - -Description - -Set to non-zero to remember help window position between starts. - - - - - - -htmlhelp.window.geometry -string - - -htmlhelp.window.geometry -Set initial geometry of help window - - - - -<xsl:param name="htmlhelp.window.geometry"></xsl:param> - - - -Description - -This parameter specifies initial position of help -window. E.g. - -<xsl:param name="htmlhelp.window.geometry">[160,64,992,704]</xsl:param> - - - - - - -htmlhelp.use.hhk -boolean - - -htmlhelp.use.hhk -Should the index be built using the HHK file? - - - - -<xsl:param name="htmlhelp.use.hhk" select="0"></xsl:param> - - - -Description - -If non-zero, the index is created using the HHK file (instead of using object -elements in the HTML files). For more information, see Generating an index. - - - - - -htmlhelp.only -boolean - - -htmlhelp.only -Should only project files be generated? - - - - -<xsl:param name="htmlhelp.only" select="0"></xsl:param> - - - -Description - - -Set to non-zero if you want to play with various HTML Help parameters -and you don't need to regenerate all HTML files. This setting will not -process whole document, only project files (hhp, hhc, hhk,...) will be -generated. - - - - - -Eclipse Help Platform - - -eclipse.autolabel -boolean - - -eclipse.autolabel -Should tree-like ToC use autonumbering feature? - - - - -<xsl:param name="eclipse.autolabel" select="0"></xsl:param> - - - -Description - -If you want to include chapter and section numbers into ToC in -the left panel, set this parameter to 1. - - - - - - -eclipse.plugin.name -string - - -eclipse.plugin.name -Eclipse Help plugin name - - - - -<xsl:param name="eclipse.plugin.name">DocBook Online Help Sample</xsl:param> - - - -Description - -Eclipse Help plugin name. - - - - - - -eclipse.plugin.id -string - - -eclipse.plugin.id -Eclipse Help plugin id - - - - -<xsl:param name="eclipse.plugin.id">com.example.help</xsl:param> - - - -Description - -Eclipse Help plugin id. You should change this id to something -unique for each help. - - - - - - -eclipse.plugin.provider -string - - -eclipse.plugin.provider -Eclipse Help plugin provider name - - - - -<xsl:param name="eclipse.plugin.provider">Example provider</xsl:param> - - - -Description - -Eclipse Help plugin provider name. - - - - -JavaHelp - - -javahelp.encoding -string - - -javahelp.encoding -Character encoding to use in control files for JavaHelp. - - - - -<xsl:param name="javahelp.encoding">iso-8859-1</xsl:param> - - - -Description - -JavaHelp crashes on some characters when written as character -references. In that case you can use this parameter to select an appropriate encoding. - - - - - - - -Localization - - -l10n.gentext.language -string - - -l10n.gentext.language -Sets the gentext language - - - - -<xsl:param name="l10n.gentext.language"></xsl:param> - - - -Description - -If this parameter is set to any value other than the empty string, its -value will be used as the value for the language when generating text. Setting -l10n.gentext.language overrides any settings within the -document being formatted. - -It's much more likely that you might want to set the -l10n.gentext.default.language parameter. - - - - - - - l10n.gentext.default.language - string - - - l10n.gentext.default.language - Sets the default language for generated text - - - - -<xsl:param name="l10n.gentext.default.language">en</xsl:param> - - - -Description - -The value of the l10n.gentext.default.language -parameter is used as the language for generated text if no setting is provided -in the source document. - - - - - - -l10n.gentext.use.xref.language -boolean - - -l10n.gentext.use.xref.language -Use the language of target when generating cross-reference text? - - - - -<xsl:param name="l10n.gentext.use.xref.language" select="0"></xsl:param> - - - -Description - -If non-zero, the language of the target will be used when -generating cross reference text. Usually, the current -language is used when generating text (that is, the language of the -element that contains the cross-reference element). But setting this parameter -allows the language of the element pointed to to control -the generated text. - -Consider the following example: - - -<para lang="en">See also <xref linkend="chap3"/>.</para> - - - -Suppose that Chapter 3 happens to be written in German. -If l10n.gentext.use.xref.language is non-zero, the -resulting text will be something like this: - -
    -See also Kapital 3. -
    - -Where the more traditional rendering would be: - -
    -See also Chapter 3. -
    - -
    -
    - - - -l10n.lang.value.rfc.compliant -boolean - - -l10n.lang.value.rfc.compliant -Make value of lang attribute RFC compliant? - - - - -<xsl:param name="l10n.lang.value.rfc.compliant" select="1"></xsl:param> - - - -Description - -If non-zero, ensure that the values for all lang attributes in HTML output are RFC -compliantSection 8.1.1, Language Codes, in the HTML 4.0 Recommendation states that: - -
    [RFC1766] defines and explains the language codes -that must be used in HTML documents. -Briefly, language codes consist of a primary code and a possibly -empty series of subcodes: - -language-code = primary-code ( "-" subcode )* - -And in RFC 1766, Tags for the Identification -of Languages, the EBNF for "language tag" is given as: - -Language-Tag = Primary-tag *( "-" Subtag ) -Primary-tag = 1*8ALPHA -Subtag = 1*8ALPHA - -
    -
    . - -by taking any underscore characters in any lang values found in source documents, and -replacing them with hyphen characters in output HTML files. For -example, zh_CN in a source document becomes -zh-CN in the HTML output form that source. - - -This parameter does not cause any case change in lang values, because RFC 1766 -explicitly states that all "language tags" (as it calls them) "are -to be treated as case insensitive". - -
    - -
    -
    - - - -writing.mode -string - - -writing.mode -Direction of text flow based on locale - - - - -<xsl:param name="writing.mode"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key">writing-mode</xsl:with-param> - <xsl:with-param name="lang"> - <xsl:call-template name="l10n.language"> - <xsl:with-param name="target" select="/*[1]"></xsl:with-param> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> -</xsl:param> - - - -Description - -Sets direction of text flow and text alignment based on locale. -The value is normally taken from the gentext file for the -lang attribute of the document's root element, using the -key name 'writing-mode' to look it up in the gentext file. -But the param can also be -set on the command line to override that gentext value. - -Accepted values are: - - - lr-tb - - Left-to-right text flow in each line, lines stack top to bottom. - - - - rl-tb - - Right-to-left text flow in each line, lines stack top to bottom. - - - - tb-rl - - Top-to-bottom text flow in each vertical line, lines stack right to left. - Supported by only a few XSL-FO processors. Not supported in HTML output. - - - - lr - - Shorthand for lr-tb. - - - - rl - - Shorthand for rl-tb. - - - - tb - - Shorthand for tb-rl. - - - - - - - - -
    -
    - - - - FO Parameter Reference - - - This is reference documentation for all user-configurable - parameters in the DocBook XSL FO stylesheets (for generating - XSL-FO output destined for final print/PDF output). - - - Admonitions - - -admon.graphics -boolean - - -admon.graphics -Use graphics in admonitions? - - - - -<xsl:param name="admon.graphics" select="0"></xsl:param> - - - -Description - -If true (non-zero), admonitions are presented in an alternate style that uses -a graphic. Default graphics are provided in the distribution. - - - - - - - -admon.graphics.extension -string - - -admon.graphics.extension -Filename extension for admonition graphics - - - - -<xsl:param name="admon.graphics.extension">.png</xsl:param> - - - -Description - -Sets the filename extension to use on admonition graphics. - - - - - - -admon.graphics.path -string - - -admon.graphics.path -Path to admonition graphics - - - -<xsl:param name="admon.graphics.path">images/</xsl:param> - - -Description - -Sets the path to the directory containing the admonition graphics -(caution.png, important.png etc). This location is normally relative -to the output html directory. See base.dir - - - - - - -admon.textlabel -boolean - - -admon.textlabel -Use text label in admonitions? - - - - -<xsl:param name="admon.textlabel" select="1"></xsl:param> - - - -Description - -If true (non-zero), admonitions are presented with a generated -text label such as Note or Warning in the appropriate language. -If zero, such labels are turned off, but any title child -of the admonition element are still output. -The default value is 1. - - - - - - - - - admonition.title.properties - attribute set - - -admonition.title.properties -To set the style for admonitions titles. - - - - -<xsl:attribute-set name="admonition.title.properties"> - <xsl:attribute name="font-size">14pt</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> - - -Description -How do you want admonitions titles styled? -Set the font-size, weight etc to the style required. - - - - - - - admonition.properties - attribute set - - -admonition.properties -To set the style for admonitions. - - - -<xsl:attribute-set name="admonition.properties"></xsl:attribute-set> - - -Description -How do you want admonitions styled? -Set the font-size, weight, etc. to the style required - - - - - - -graphical.admonition.properties -attribute set - - -graphical.admonition.properties -To add properties to the outer block of a graphical admonition. - - - -<xsl:attribute-set name="graphical.admonition.properties"> - <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">1.2em</xsl:attribute> -</xsl:attribute-set> - - -Description -These properties are added to the outer block containing the -entire graphical admonition, including its title. -It is used when the parameter -admon.graphics is set to nonzero. -Use this attribute-set to set the space above and below, -and any indent for the whole admonition. - -In addition to these properties, a graphical admonition -also applies the admonition.title.properties -attribute-set to the title, and applies the -admonition.properties attribute-set -to the rest of the content. - - - - - - -nongraphical.admonition.properties -attribute set - - -nongraphical.admonition.properties -To add properties to the outer block of a nongraphical admonition. - - - -<xsl:attribute-set name="nongraphical.admonition.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="margin-{$direction.align.start}">0.25in</xsl:attribute> - <xsl:attribute name="margin-{$direction.align.end}">0.25in</xsl:attribute> -</xsl:attribute-set> - - -Description -These properties are added to the outer block containing the -entire nongraphical admonition, including its title. -It is used when the parameter -admon.graphics is set to zero. -Use this attribute-set to set the space above and below, -and any indent for the whole admonition. - -In addition to these properties, a nongraphical admonition -also applies the admonition.title.properties -attribute-set to the title, and the -admonition.properties attribute-set -to the rest of the content. - - - - -Callouts - - -callout.defaultcolumn -integer - - -callout.defaultcolumn -Indicates what column callouts appear in by default - - - - -<xsl:param name="callout.defaultcolumn">60</xsl:param> - - - -Description - -If a callout does not identify a column (for example, if it uses -the linerange unit), -it will appear in the default column. - - - - - - - -callout.graphics -boolean - - -callout.graphics -Use graphics for callouts? - - - - -<xsl:param name="callout.graphics" select="1"></xsl:param> - - - -Description - -If non-zero, callouts are presented with graphics (e.g., reverse-video -circled numbers instead of "(1)", "(2)", etc.). -Default graphics are provided in the distribution. - - - - - - - -callout.graphics.extension -string - - -callout.graphics.extension -Filename extension for callout graphics - - - - - -<xsl:param name="callout.graphics.extension">.svg</xsl:param> - - - -Description -Sets the filename extension to use on callout graphics. - - -The Docbook XSL distribution provides callout graphics in the following formats: -SVG (extension: .svg) -PNG (extension: .png) -GIF (extension: .gif) - - - - - - -callout.graphics.number.limit -integer - - -callout.graphics.number.limit -Number of the largest callout graphic - - - - - -<xsl:param name="callout.graphics.number.limit">30</xsl:param> - - - -Description - -If callout.graphics is non-zero, graphics -are used to represent callout numbers instead of plain text. The value -of callout.graphics.number.limit is the largest -number for which a graphic exists. If the callout number exceeds this -limit, the default presentation "(plain text instead of a graphic)" -will be used. - - - - - - - -callout.graphics.path -string - - -callout.graphics.path -Path to callout graphics - - - - -<xsl:param name="callout.graphics.path">images/callouts/</xsl:param> - - - -Description - -Sets the path to the directory holding the callout graphics. his -location is normally relative to the output html directory. see -base.dir. Always terminate the directory with / since the graphic file -is appended to this string, hence needs the separator. - - - - - - - -callout.icon.size -length - - -callout.icon.size -Specifies the size of callout marker icons - - - - -<xsl:param name="callout.icon.size">7pt</xsl:param> - - - -Description - -Specifies the size of the callout marker icons. -The default size is 7 points. - - - - - - -callout.unicode -boolean - - -callout.unicode -Use Unicode characters rather than images for callouts. - - - -<xsl:param name="callout.unicode" select="0"></xsl:param> - - -Description - -The stylesheets can use either an image of the numbers one to ten, or the single Unicode character which represents the numeral, in white on a black background. Use this to select the Unicode character option. - - - - - - - -callout.unicode.font -string - - -callout.unicode.font -Specify a font for Unicode glyphs - - - - -<xsl:param name="callout.unicode.font">ZapfDingbats</xsl:param> - - - -Description - -The name of the font to specify around Unicode callout glyphs. -If set to the empty string, no font change will occur. - - - - - - - -callout.unicode.number.limit -integer - - -callout.unicode.number.limit -Number of the largest unicode callout character - - - - -<xsl:param name="callout.unicode.number.limit">10</xsl:param> - - - -Description - -If callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.number.limit -is -the largest number for which a unicode character exists. If the callout number -exceeds this limit, the default presentation "(nnn)" will always -be used. - - - - - - - -callout.unicode.start.character -integer - - -callout.unicode.start.character -First Unicode character to use, decimal value. - - - - -<xsl:param name="callout.unicode.start.character">10102</xsl:param> - - - -Description - -If callout.graphics is zero and callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.start.character -is the decimal unicode value used for callout number one. Currently, -only 10102 is supported in the stylesheets for this parameter. - - - - - - - -callouts.extension -boolean - - -callouts.extension -Enable the callout extension - - - - -<xsl:param name="callouts.extension" select="1"></xsl:param> - - - -Description - -The callouts extension processes areaset -elements in programlistingco and other text-based -callout elements. - - - - - -ToC/LoT/Index Generation - - -autotoc.label.separator -string - - -autotoc.label.separator -Separator between labels and titles in the ToC - - - - -<xsl:param name="autotoc.label.separator">. </xsl:param> - - - -Description - -String used to separate labels and titles in a table of contents. - - - - - - -process.empty.source.toc -boolean - - -process.empty.source.toc -Generate automated TOC if toc element occurs in a source document? - - - -<xsl:param name="process.empty.source.toc" select="0"></xsl:param> - - -Description - -Specifies that if an empty toc element is found in a -source document, an automated TOC is generated at this point in the -document. - - Depending on what the value of the - generate.toc parameter is, setting this - parameter to 1 could result in generation of - duplicate automated TOCs. So the - process.empty.source.toc is primarily useful - as an "override": by placing an empty toc in your - document and setting this parameter to 1, you can - force a TOC to be generated even if generate.toc - says not to. - - - - - - - - -process.source.toc -boolean - - -process.source.toc -Process a non-empty toc element if it occurs in a source document? - - - -<xsl:param name="process.source.toc" select="0"></xsl:param> - - -Description - -Specifies that the contents of a non-empty "hard-coded" -toc element in a source document are processed to -generate a TOC in output. - - This parameter has no effect on automated generation of - TOCs. An automated TOC may still be generated along with the - "hard-coded" TOC. To suppress automated TOC generation, adjust the - value of the generate.toc paramameter. - - The process.source.toc parameter also has - no effect if the toc element is empty; handling - for empty toc is controlled by the - process.empty.source.toc parameter. - - - - - - - - -generate.toc -table - - -generate.toc -Control generation of ToCs and LoTs - - - - - -<xsl:param name="generate.toc"> -/appendix toc,title -article/appendix nop -/article toc,title -book toc,title,figure,table,example,equation -/chapter toc,title -part toc,title -/preface toc,title -reference toc,title -/sect1 toc -/sect2 toc -/sect3 toc -/sect4 toc -/sect5 toc -/section toc -set toc,title -</xsl:param> - - - -Description - -This parameter has a structured value. It is a table of space-delimited -path/value pairs. Each path identifies some element in the source document -using a restricted subset of XPath (only the implicit child axis, no wildcards, -no predicates). Paths can be either relative or absolute. - -When processing a particular element, the stylesheets consult this table to -determine if a ToC (or LoT(s)) should be generated. - -For example, consider the entry: - -book toc,figure - -This indicates that whenever a book is formatted, a -Table Of Contents and a List of Figures should be generated. Similarly, - -/chapter toc - -indicates that whenever a document that has a root -of chapter is formatted, a Table of -Contents should be generated. The entry chapter would match -all chapters, but /chapter matches only chapter -document elements. - -Generally, the longest match wins. So, for example, if you want to distinguish -articles in books from articles in parts, you could use these two entries: - -book/article toc,figure -part/article toc - -Note that an article in a part can never match a book/article, -so if you want nothing to be generated for articles in parts, you can simply leave -that rule out. - -If you want to leave the rule in, to make it explicit that you're turning -something off, use the value nop. For example, the following -entry disables ToCs and LoTs for articles: - -article nop - -Do not simply leave the word article in the file -without a matching value. That'd be just begging the silly little -path/value parser to get confused. - -Section ToCs are further controlled by the -generate.section.toc.level parameter. -For a given section level to have a ToC, it must have both an entry in -generate.toc and be within the range enabled by -generate.section.toc.level. - - - - - -generate.index -boolean - - -generate.index -Do you want an index? - - - -<xsl:param name="generate.index" select="1"></xsl:param> - - -Description - -Specify if an index should be generated. - - - - - - -make.index.markup -boolean - - -make.index.markup -Generate XML index markup in the index? - - - - -<xsl:param name="make.index.markup" select="0"></xsl:param> - - - -Description - -This parameter enables a very neat trick for getting properly -merged, collated back-of-the-book indexes. G. Ken Holman suggested -this trick at Extreme Markup Languages 2002 and I'm indebted to him -for it. - -Jeni Tennison's excellent code in -autoidx.xsl does a great job of merging and -sorting indexterms in the document and building a -back-of-the-book index. However, there's one thing that it cannot -reasonably be expected to do: merge page numbers into ranges. (I would -not have thought that it could collate and suppress duplicate page -numbers, but in fact it appears to manage that task somehow.) - -Ken's trick is to produce a document in which the index at the -back of the book is displayed in XML. Because the index -is generated by the FO processor, all of the page numbers have been resolved. -It's a bit hard to explain, but what it boils down to is that instead of having -an index at the back of the book that looks like this: - -
    -A -ap1, 1, 2, 3 - -
    - -you get one that looks like this: - -
    -<indexdiv>A</indexdiv> -<indexentry> -<primaryie>ap1</primaryie>, -<phrase role="pageno">1</phrase>, -<phrase role="pageno">2</phrase>, -<phrase role="pageno">3</phrase> -</indexentry> -
    - -After building a PDF file with this sort of odd-looking index, you can -extract the text from the PDF file and the result is a proper index expressed in -XML. - -Now you have data that's amenable to processing and a simple Perl script -(such as fo/pdf2index) can -merge page ranges and generate a proper index. - -Finally, reformat your original document using this literal index instead of -an automatically generated one and bingo! - -
    -
    - - - -index.method -list -basic -kosek -kimber - - -index.method -Select method used to group index entries in an index - - - - -<xsl:param name="index.method">basic</xsl:param> - - - -Description - -This parameter lets you select which method to use for sorting and grouping - index entries in an index. -Indexes in Latin-based languages that have accented characters typically -sort together accented words and unaccented words. -Thus Á (U+00C1 LATIN CAPITAL LETTER A WITH ACUTE) would sort together -with A (U+0041 LATIN CAPITAL LETTER A), so both would appear in the A -section of the index. -Languages using other alphabets (such as Russian, which is written in the Cyrillic alphabet) -and languages using ideographic chararacters (such as Japanese) -require grouping specific to the languages and alphabets. - - -The default indexing method is limited. -It can group accented characters in Latin-based languages only. -It cannot handle non-Latin alphabets or ideographic languages. -The other indexing methods require extensions of one type or -another, and do not work with -all XSLT processors, which is why they are not used by default. - -The three choices for indexing method are: - - -basic - - -(default) Sort and groups words based only on the Latin alphabet. -Words with accented Latin letters will group and sort with -their respective primary letter, but -words in non-Latin alphabets will be -put in the Symbols section of the index. - - - - -kosek - - -This method sorts and groups words based on letter groups configured in -the DocBook locale file for the given language. -See, for example, the French locale file common/fr.xml. -This method requires that the XSLT processor -supports the EXSLT extensions (most do). -It also requires support for using -user-defined functions in xsl:key (xsltproc does not). - -This method is suitable for any language for which you can -list all the individual characters that should appear -in each letter group in an index. -It is probably not practical to use it for ideographic languages -such as Chinese that have hundreds or thousands of characters. - - -To use the kosek method, you must: - - - -Use a processor that supports its extensions, such as -Saxon 6 or Xalan (xsltproc and Saxon 8 do not). - - - -Set the index.method parameter's value to kosek. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kosek.xsl or -html/autoidx-kosek.xsl into your -customization. - - - - - - - -kimber - - -This method uses extensions to the Saxon processor to implement -sophisticated indexing processes. It uses its own -configuration file, which can include information for any number of -languages. Each language's configuration can group -words using one of two processes. In the -enumerated process similar to that used in the kosek method, -you indicate the groupings character-by-character. -In the between-key process, you specify the -break-points in the sort order that should start a new group. -The latter configuration is useful for ideographic languages -such as Chinese, Japanese, and Korean. -You can also define your own collation algorithms and how you -want mixed Latin-alphabet words sorted. - - -For a whitepaper describing the extensions, see: -http://www.innodata-isogen.com/knowledge_center/white_papers/back_of_book_for_xsl_fo.pdf. - - - -To download the extension library, see -http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport. - - - - -To use the kimber method, you must: - - - -Use Saxon (version 6 or 8) as your XSLT processor. - - - -Install and configure the Innodata Isogen library, using -the documentation that comes with it. - - - -Set the index.method parameter's value to kimber. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kimber.xsl or -html/autoidx-kimber.xsl into your -customization. - - - - - - - - - - - - - -index.on.type -boolean - - -index.on.type -Select indexterms based on type -attribute value - - - - -<xsl:param name="index.on.type" select="0"></xsl:param> - - - -Description - - -If non-zero, -then an index element that has a -type attribute -value will contain only those indexterm -elements with a matching type attribute value. -If an index has no type -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - - -If index.on.type is zero, then the -type attribute has no effect -on selecting indexterms for an index. - - -For those using DocBook version 4.2 or earlier, -the type attribute is not available -for index terms. However, you can achieve the same -effect by using the role attribute -in the same manner on indexterm -and index, and setting the stylesheet parameter -index.on.role to a nonzero value. - - - - - - - -index.on.role -boolean - - -index.on.role -Select indexterms based on role value - - - - -<xsl:param name="index.on.role" select="0"></xsl:param> - - - -Description - - -If non-zero, -then an index element that has a -role attribute -value will contain only those indexterm -elements with a matching role value. -If an index has no role -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - -If index.on.role is zero, then the -role attribute has no effect -on selecting indexterms for an index. - - -If you are using DocBook version 4.3 or later, you should -use the type attribute instead of role -on indexterm and index, -and set the index.on.type to a nonzero -value. - - - - - - - -index.preferred.page.properties -attribute set - - -index.preferred.page.properties -Properties used to emphasize page number references for -significant index terms - - - - -<xsl:attribute-set name="index.preferred.page.properties"> - <xsl:attribute name="font-weight">bold</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties used to emphasize page number references for -significant index terms (significance=preferred). Currently works only with -XEP. - - - - - - -index.entry.properties -attribute set - - -index.entry.properties -Properties applied to the formatted entries -in an index - - - - -<xsl:attribute-set name="index.entry.properties"> - <xsl:attribute name="start-indent">0pt</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the block containing -the entries in a letter division in an index. It can be used to set the -font-size, font-family, and other inheritable properties that will be -applied to all index entries. - - - - - - -index.div.title.properties -attribute set - - -index.div.title.properties -Properties associated with the letter headings in an -index - - - - -<xsl:attribute-set name="index.div.title.properties"> - <xsl:attribute name="margin-{$direction.align.start}">0pt</xsl:attribute> - <xsl:attribute name="font-size">14.4pt</xsl:attribute> - <xsl:attribute name="font-family"><xsl:value-of select="$title.fontset"></xsl:value-of></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.optimum"><xsl:value-of select="concat($body.font.master,'pt')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master,'pt * 0.8')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master,'pt * 1.2')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="start-indent">0pt</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is used on the letter headings that separate -the divisions in an index. - - - - - - -index.number.separator -string - - -index.number.separator -Override for punctuation separating page numbers in index - - - - -<xsl:param name="index.number.separator"></xsl:param> - - - -Description - -This parameter permits you to override the text to insert between -page references in a formatted index entry. Typically -that would be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'number-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. This punctuation appears between -such section titles in an HTML index. - - - - - - - -index.range.separator -string - - -index.range.separator -Override for punctuation separating the two numbers -in a page range in index - - - - -<xsl:param name="index.range.separator"></xsl:param> - - - -Description - -This parameter permits you -to override the text to insert between -the two numbers of a page range in an index. -This parameter is only used by those XSL-FO processors -that support an extension for generating such page ranges -(such as XEP). - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'range-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. So there are no page ranges -and this parameter has no effect. - - - - - - - -index.term.separator -string - - -index.term.separator -Override for punctuation separating an index term -from its list of page references in an index - - - - -<xsl:param name="index.term.separator"></xsl:param> - - - -Description - -This parameter permits you to override -the text to insert between -the end of an index term and its list of page references. -Typically that might be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'term-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -fill in the content for this normally empty -override parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. -For fo output, it could be an fo:leader -element to provide space of a specific length, or a dot leader. - - - - - - - -xep.index.item.properties -attribute set - - -xep.index.item.properties -Properties associated with XEP index-items - - - - -<xsl:attribute-set name="xep.index.item.properties" use-attribute-sets="index.page.number.properties"> - <xsl:attribute name="merge-subsequent-page-numbers">true</xsl:attribute> - <xsl:attribute name="link-back">true</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties associated with XEP index-items, which generate -page numbers in an index processed by XEP. For more info see -the XEP documentation section "Indexes" in -http://www.renderx.com/reference.html#Indexes. - -This attribute-set also adds by default any properties from the -index.page.number.properties -attribute-set. - - - - - -toc.section.depth -integer - - -toc.section.depth -How deep should recursive sections appear -in the TOC? - - - -<xsl:param name="toc.section.depth">2</xsl:param> - - -Description - -Specifies the depth to which recursive sections should appear in the -TOC. - - - - - - - -toc.max.depth -integer - - -toc.max.depth -How many levels should be created for each TOC? - - - -<xsl:param name="toc.max.depth">8</xsl:param> - - -Description - -Specifies the maximal depth of TOC on all levels. - - - - - - -toc.indent.width -float - - -toc.indent.width -Amount of indentation for TOC entries - - - - -<xsl:param name="toc.indent.width">24</xsl:param> -<!-- inconsistant point specification? --> - - - -Description - -Specifies, in points, the distance by which each level of the -TOC is indented from its parent. - -This value is expressed in points, without -a unit (in other words, it is a bare number). Using a bare number allows the stylesheet -to perform calculations that would otherwise have to be performed by the FO processor -because not all processors support expressions. - - - - - - -toc.line.properties -attribute set - - -toc.line.properties -Properties for lines in ToCs and LoTs - - - - -<xsl:attribute-set name="toc.line.properties"> - <xsl:attribute name="text-align-last">justify</xsl:attribute> - <xsl:attribute name="text-align">start</xsl:attribute> - <xsl:attribute name="end-indent"><xsl:value-of select="concat($toc.indent.width, 'pt')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="last-line-end-indent"><xsl:value-of select="concat('-', $toc.indent.width, 'pt')"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties which are applied to every line in ToC (or LoT). You can -modify them in order to change appearance of all, or some lines. For -example, in order to make lines for chapters bold, specify the -following in your customization layer: - -<xsl:attribute-set name="toc.line.properties"> - <xsl:attribute name="font-weight"> - <xsl:choose> - <xsl:when test="self::chapter">bold</xsl:when> - <xsl:otherwise>normal</xsl:otherwise> - </xsl:choose> - </xsl:attribute> -</xsl:attribute-set> - - - - - - -toc.margin.properties -attribute set - - -toc.margin.properties -Margin properties used on Tables of Contents - - - - -<xsl:attribute-set name="toc.margin.properties"> - <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">2em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.optimum">1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">2em</xsl:attribute> -</xsl:attribute-set> - - - -Description -This attribute set is used on Tables of Contents. These attributes are set -on the wrapper that surrounds the ToC block, not on each individual lines. - - - - - -bridgehead.in.toc -boolean - - -bridgehead.in.toc -Should bridgehead elements appear in the TOC? - - - -<xsl:param name="bridgehead.in.toc" select="0"></xsl:param> - - -Description - -If non-zero, bridgeheads appear in the TOC. Note that -this option is not fully supported and may be removed in a future -version of the stylesheets. - - - - - - - -simplesect.in.toc -boolean - - -simplesect.in.toc -Should simplesect elements appear in the TOC? - - - -<xsl:param name="simplesect.in.toc" select="0"></xsl:param> - - -Description - -If non-zero, simplesects will be included in the TOC. - - - - - - - -generate.section.toc.level -integer - - -generate.section.toc.level -Control depth of TOC generation in sections - - - - -<xsl:param name="generate.section.toc.level" select="0"></xsl:param> - - - -Description - -The generate.section.toc.level parameter -controls the depth of section in which TOCs will be generated. Note -that this is related to, but not the same as -toc.section.depth, which controls the depth to -which TOC entries will be generated in a given TOC. -If, for example, generate.section.toc.level -is 3, TOCs will be generated in first, second, and third -level sections, but not in fourth level sections. - - - - - - - - -
    Processor Extensions - - -arbortext.extensions -boolean - - -arbortext.extensions -Enable Arbortext extensions? - - - -<xsl:param name="arbortext.extensions" select="0"></xsl:param> - - -Description - -If non-zero, -Arbortext -extensions will be used. - -This parameter can also affect which graphics file formats -are supported - - - - - - -axf.extensions -boolean - - -axf.extensions -Enable XSL Formatter extensions? - - - - -<xsl:param name="axf.extensions" select="0"></xsl:param> - - - -Description - -If non-zero, -XSL Formatter -extensions will be used. XSL Formatter extensions consists of PDF bookmarks, -document information and better index processing. - -This parameter can also affect which graphics file formats -are supported - - - - - - -fop.extensions -boolean - - -fop.extensions -Enable extensions for FOP version 0.20.5 and earlier - - - -<xsl:param name="fop.extensions" select="0"></xsl:param> - - -Description - -If non-zero, extensions intended for -FOP -version 0.20.5 and earlier will be used. -At present, this consists of PDF bookmarks. - - -This parameter can also affect which graphics file formats -are supported. - -If you are using a version of FOP beyond -version 0.20.5, then use the fop1.extensions parameter -instead. - - - - - - -fop1.extensions -boolean - - -fop1.extensions -Enable extensions for FOP version 0.90 and later - - - -<xsl:param name="fop1.extensions" select="0"></xsl:param> - - -Description - -If non-zero, extensions for -FOP -version 0.90 and later will be used. - - -This parameter can also affect which graphics file formats -are supported. - -The original fop.extensions parameter -should still be used for FOP version 0.20.5 and earlier. - - - - - - -passivetex.extensions -boolean - - -passivetex.extensions -Enable PassiveTeX extensions? - - - -<xsl:param name="passivetex.extensions" select="0"></xsl:param> - - -Description - -If non-zero, -PassiveTeX -extensions will be used. At present, this consists of PDF bookmarks -and sorted index terms. - - -This parameter can also affect which graphics file formats -are supported - - - PassiveTeX is incomplete and development has ceased. In most cases, -another XSL-FO engine is probably a better choice. - - - - - - - -tex.math.in.alt -list -plain -latex - - -tex.math.in.alt -TeX notation used for equations - - - - -<xsl:param name="tex.math.in.alt"></xsl:param> - - - -Description - -If you want type math directly in TeX notation in equations, -this parameter specifies notation used. Currently are supported two -values -- plain and latex. Empty -value means that you are not using TeX math at all. - -Preferred way for including TeX alternative of math is inside of -textobject element. Eg.: - -<inlineequation> -<inlinemediaobject> -<imageobject> -<imagedata fileref="eq1.gif"/> -</imageobject> -<textobject><phrase>E=mc squared</phrase></textobject> -<textobject role="tex"><phrase>E=mc^2</phrase></textobject> -</inlinemediaobject> -</inlineequation> - -If you are using graphic element, you can -store TeX inside alt element: - -<inlineequation> -<alt role="tex">a^2+b^2=c^2</alt> -<graphic fileref="a2b2c2.gif"/> -</inlineequation> - -If you want use this feature, you should process your FO with -PassiveTeX, which only supports TeX math notation. When calling -stylsheet, don't forget to specify also -passivetex.extensions=1. - -If you want equations in HTML, just process generated file -tex-math-equations.tex by TeX or LaTeX. Then run -dvi2bitmap program on result DVI file. You will get images for -equations in your document. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - - -Related Parameters - tex.math.delims, - passivetex.extensions, - tex.math.file - - - - - - -tex.math.delims -boolean - - -tex.math.delims -Should equations output for processing by TeX be -surrounded by math mode delimiters? - - - - -<xsl:param name="tex.math.delims" select="1"></xsl:param> - - - -Description - -For compatibility with DSSSL based DBTeXMath from Allin Cottrell -you should set this parameter to 0. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - -Related Parameters - tex.math.in.alt, - passivetex.extensions - - -See Also - You can also use the dbtex delims processing - instruction to control whether delimiters are output. - - - - - - - -xep.extensions -boolean - - -xep.extensions -Enable XEP extensions? - - - -<xsl:param name="xep.extensions" select="0"></xsl:param> - - -Description - -If non-zero, -XEP -extensions will be used. XEP extensions consists of PDF bookmarks, -document information and better index processing. - - -This parameter can also affect which graphics file formats -are supported - - - -Stylesheet Extensions - - -linenumbering.everyNth -integer - - -linenumbering.everyNth -Indicate which lines should be numbered - - - - -<xsl:param name="linenumbering.everyNth">5</xsl:param> - - - -Description - -If line numbering is enabled, everyNth line will be -numbered. Note that numbering is one based, not zero based. - - - - - - - -linenumbering.extension -boolean - - -linenumbering.extension -Enable the line numbering extension - - - - -<xsl:param name="linenumbering.extension" select="1"></xsl:param> - - - -Description - -If non-zero, verbatim environments (address, literallayout, -programlisting, screen, synopsis) that specify line numbering will -have line numbers. - - - - - - - -linenumbering.separator -string - - -linenumbering.separator -Specify a separator between line numbers and lines - - - - -<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param> - - - -Description - -The separator is inserted between line numbers and lines in the -verbatim environment. The default value is a single white space. - Note the interaction with linenumbering.width - - - - - - - -linenumbering.width -integer - - -linenumbering.width -Indicates the width of line numbers - - - - -<xsl:param name="linenumbering.width">3</xsl:param> - - - -Description - -If line numbering is enabled, line numbers will appear right -justified in a field "width" characters wide. - - - - - - - -tablecolumns.extension -boolean - - -tablecolumns.extension -Enable the table columns extension function - - - - -<xsl:param name="tablecolumns.extension" select="1"></xsl:param> - - - -Description - -The table columns extension function adjusts the widths of table -columns in the HTML result to more accurately reflect the specifications -in the CALS table. - - - - - - - - textinsert.extension - boolean - - - textinsert.extension - Enables the textinsert extension element - - - - <xsl:param name="textinsert.extension" select="1"></xsl:param> - - - Description - The textinsert extension element inserts the contents of - a file into the result tree (as text). - - To use the textinsert extension element, you must use - either Saxon or Xalan as your XSLT processor (it doesn’t - work with xsltproc), along with either the DocBook Saxon - extensions or DocBook Xalan extensions (for more - information about those extensions, see DocBook Saxon Extensions and DocBook Xalan Extensions), and you must set both - the use.extensions and - textinsert.extension parameters to - 1. - As an alternative to using the textinsert element, - consider using an Xinclude element with the - parse="text" attribute and value - specified, as detailed in Using XInclude for text inclusions. - - - See Also - You can also use the dbhtml-include href processing - instruction to insert external files — both files containing - plain text and files with markup content (including HTML - content). - - More information - For how-to documentation on inserting contents of - external code files and other text files into output, see - External code files. - For guidelines on inserting contents of - HTML files into output, see Inserting external HTML code. - - - - - -textdata.default.encoding -string - - -textdata.default.encoding -Default encoding of external text files which are included -using textdata element - - - - -<xsl:param name="textdata.default.encoding"></xsl:param> - - - -Description - -Specifies the encoding of any external text files included using -textdata element. This value is used only when you do -not specify encoding by the appropriate attribute -directly on textdata. An empty string is interpreted as the system -default encoding. - - - - - - -use.extensions -boolean - - -use.extensions -Enable extensions - - - - -<xsl:param name="use.extensions" select="0"></xsl:param> - - - -Description - -If non-zero, extensions may be used. Each extension is -further controlled by its own parameter. But if -use.extensions is zero, no extensions will -be used. - - - - - -Automatic labelling - - -appendix.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -appendix.autolabel -Specifies the labeling format for Appendix titles - - - - -<xsl:param name="appendix.autolabel">A</xsl:param> - - - -Description - -If non-zero, then appendices will be numbered using the -parameter value as the number format if the value matches one of the -following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperalpha). - - - - - - - -chapter.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -chapter.autolabel -Specifies the labeling format for Chapter titles - - - - -<xsl:param name="chapter.autolabel" select="1"></xsl:param> - - -Description - -If non-zero, then chapters will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - - - - -part.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -part.autolabel -Specifies the labeling format for Part titles - - - - -<xsl:param name="part.autolabel">I</xsl:param> - - - -Description - -If non-zero, then parts will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperroman). - - - - - - - - -reference.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -reference.autolabel -Specifies the labeling format for Reference titles - - - - <xsl:param name="reference.autolabel">I</xsl:param> - - -Description -If non-zero, references will be numbered using the parameter - value as the number format if the value matches one of the - following: - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - -Any non-zero value other than the above will generate -the default number format (upperroman). - - - - - - -preface.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -preface.autolabel -Specifices the labeling format for Preface titles - - - -<xsl:param name="preface.autolabel" select="0"></xsl:param> - - -Description - -If non-zero then prefaces will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - - - - - -section.autolabel -boolean - - -section.autolabel -Are sections enumerated? - - - -<xsl:param name="section.autolabel" select="0"></xsl:param> - - -Description - -If true (non-zero), unlabeled sections will be enumerated. - - - - - - - -section.autolabel.max.depth -integer - - -section.autolabel.max.depth -The deepest level of sections that are numbered. - - - - -<xsl:param name="section.autolabel.max.depth">8</xsl:param> - - - -Description - -When section numbering is turned on by the -section.autolabel parameter, then this -parameter controls the depth of section nesting that is -numbered. Sections nested to a level deeper than this value will not -be numbered. - - - - - - - -section.label.includes.component.label -boolean - - -section.label.includes.component.label -Do section labels include the component label? - - - -<xsl:param name="section.label.includes.component.label" select="0"></xsl:param> - - -Description - -If non-zero, section labels are prefixed with the label of the -component that contains them. - - - - - - - -label.from.part -boolean - - -label.from.part -Renumber components in each part? - - - - -<xsl:param name="label.from.part" select="0"></xsl:param> - - - -Description - -If label.from.part is non-zero, then - numbering of components — preface, - chapter, appendix, and - reference (when reference occurs at the - component level) — is re-started within each - part. -If label.from.part is zero (the - default), numbering of components is not - re-started within each part; instead, components are - numbered sequentially throughout each book, - regardless of whether or not they occur within part - instances. - - - - - - -component.label.includes.part.label -boolean - - -component.label.includes.part.label -Do component labels include the part label? - - - -<xsl:param name="component.label.includes.part.label" select="0"></xsl:param> - - -Description - -If non-zero, number labels for chapter, -appendix, and other component elements are prefixed with -the label of the part element that contains them. So you might see -Chapter II.3 instead of Chapter 3. Also, the labels for formal -elements such as table and figure will include -the part label. If there is no part element container, then no prefix -is generated. - - -This feature is most useful when the -label.from.part parameter is turned on. -In that case, there would be more than one chapter -1, and the extra part label prefix will identify -each chapter unambiguously. - - - - - -XSLT Processing - - -rootid -string - - -rootid -Specify the root element to format - - - - -<xsl:param name="rootid"></xsl:param> - - -Description - -If rootid is not empty, it must be the -value of an ID that occurs in the document being formatted. The entire -document will be loaded and parsed, but formatting will begin at the -element identified, rather than at the root. For example, this allows -you to process only chapter 4 of a book. -Because the entire document is available to the processor, automatic -numbering, cross references, and other dependencies are correctly -resolved. - - - - -Meta/*Info - - -make.single.year.ranges -boolean - - -make.single.year.ranges -Print single-year ranges (e.g., 1998-1999) - - - - -<xsl:param name="make.single.year.ranges" select="0"></xsl:param> - - -Description - -If non-zero, year ranges that span a single year will be printed -in range notation (1998-1999) instead of discrete notation -(1998, 1999). - - - - - - -make.year.ranges -boolean - - -make.year.ranges -Collate copyright years into ranges? - - - -<xsl:param name="make.year.ranges" select="0"></xsl:param> - - -Description - -If non-zero, multiple copyright year elements will be -collated into ranges. -This works only if each year number is put into a separate -year element. The copyright element permits multiple -year elements. If a year element contains a dash or -a comma, then that year element will not be merged into -any range. - - - - - - - -author.othername.in.middle -boolean - - -author.othername.in.middle -Is othername in author a -middle name? - - - - -<xsl:param name="author.othername.in.middle" select="1"></xsl:param> - - -Description - -If non-zero, the othername of an author -appears between the firstname and -surname. Otherwise, othername -is suppressed. - - - - - -Reference Pages - - -funcsynopsis.decoration -boolean - - -funcsynopsis.decoration -Decorate elements of a funcsynopsis? - - - - -<xsl:param name="funcsynopsis.decoration" select="1"></xsl:param> - - - -Description - -If non-zero, elements of the funcsynopsis will be -decorated (e.g. rendered as bold or italic text). The decoration is controlled by -templates that can be redefined in a customization layer. - - - - - - - -funcsynopsis.style -list -ansi -kr - - -funcsynopsis.style -What style of funcsynopsis should be generated? - - - -<xsl:param name="funcsynopsis.style">kr</xsl:param> - - -Description - -If funcsynopsis.style is ansi, -ANSI-style function synopses are generated for a -funcsynopsis, otherwise K&R-style -function synopses are generated. - - - - - - - -function.parens -boolean - - -function.parens -Generate parens after a function? - - - - -<xsl:param name="function.parens" select="0"></xsl:param> - - - -Description - -If non-zero, the formatting of a function element -will include generated parentheses. - - - - - - - -refentry.generate.name -boolean - - -refentry.generate.name -Output NAME header before refnames? - - - - -<xsl:param name="refentry.generate.name" select="1"></xsl:param> - - - -Description - -If non-zero, a "NAME" section title is output before the list -of refnames. This parameter and -refentry.generate.title are mutually -exclusive. This means that if you change this parameter to zero, you -should set refentry.generate.title to non-zero unless -you want get quite strange output. - - - - - - - -refentry.generate.title -boolean - - -refentry.generate.title -Output title before refnames? - - - - -<xsl:param name="refentry.generate.title" select="0"></xsl:param> - - - -Description - -If non-zero, the reference page title or first name is -output before the list of refnames. This parameter and -refentry.generate.name are mutually exclusive. -This means that if you change this parameter to non-zero, you -should set refentry.generate.name to zero unless -you want get quite strange output. - - - - - - - -refentry.pagebreak -boolean - - -refentry.pagebreak -Start each refentry on a new page - - - -<xsl:param name="refentry.pagebreak" select="1"></xsl:param> - - -Description - -If non-zero (the default), each refentry -element will start on a new page. If zero, a page -break will not be generated between refentry elements. -The exception is when the refentry elements are children of -a part element, in which case the page breaks are always -retained. That is because a part element does not generate -a page-sequence for its children, so each refentry must -start its own page-sequence. - - - - - - - -refentry.title.properties -attribute set - - -refentry.title.properties -Title properties for a refentry title - - - - -<xsl:attribute-set name="refentry.title.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.font.family"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-size">18pt</xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="space-after">1em</xsl:attribute> - <xsl:attribute name="hyphenate">false</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="space-after.optimum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.6em</xsl:attribute> - <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -Formatting properties applied to the title generated for the -refnamediv part of output for -refentry when the value of the -refentry.generate.title parameter is -non-zero. The font size is supplied by the appropriate section.levelX.title.properties -attribute-set, computed from the location of the -refentry in the section hierarchy. - - - This parameter has no effect on the the title generated for - the refnamediv part of output for - refentry when the value of the - refentry.generate.name parameter is - non-zero. By default, that title is formatted with the same - properties as the titles for all other first-level children of - refentry. - - - - - - - -refentry.xref.manvolnum -boolean - - -refentry.xref.manvolnum -Output manvolnum as part of -refentry cross-reference? - - - - -<xsl:param name="refentry.xref.manvolnum" select="1"></xsl:param> - - - -Description - -if non-zero, the manvolnum is used when cross-referencing -refentrys, either with xref -or citerefentry. - - - - - - - -refclass.suppress -boolean - - -refclass.suppress -Suppress display of refclass contents? - - - - -<xsl:param name="refclass.suppress" select="0"></xsl:param> - - -Description - -If the value of refclass.suppress is -non-zero, then display of refclass contents is -suppressed in output. - - - - -Tables - - -default.table.width -length - - -default.table.width -The default width of tables - - - -<xsl:param name="default.table.width"></xsl:param> - - -Description -If non-zero, this value will be used for the -width attribute on tables that do not specify an -alternate width (with the dbhtml table-width or -dbfo table-width processing instruction). - - - - - -nominal.table.width -length - - -nominal.table.width -The (absolute) nominal width of tables - - - - -<xsl:param name="nominal.table.width">6in</xsl:param> - - - -Description - -In order to convert CALS column widths into HTML column widths, it -is sometimes necessary to have an absolute table width to use for conversion -of mixed absolute and relative widths. This value must be an absolute -length (not a percentage). - - - - - - -default.table.frame -string - - -default.table.frame -The default framing of tables - - - - -<xsl:param name="default.table.frame">all</xsl:param> - - - -Description - -This value will be used when there is no frame attribute on the -table. - - - - - - -default.table.rules -string - - -default.table.rules -The default column and row rules for tables using HTML markup - - - - -<xsl:param name="default.table.rules">none</xsl:param> - - - -Description - -Tables using HTML markup elements can use an attribute -named rules on the table or -informaltable element -to specify whether column and row border rules should be -displayed. This parameter lets you specify a global default -style for all HTML tables that don't otherwise have -that attribute. -These are the supported values: - - -all - -Rules will appear between all rows and columns. - - - -rows - -Rules will appear between rows only. - - - -cols - -Rules will appear between columns only. - - - -groups - -Rules will appear between row groups (thead, tfoot, tbody). -No support for rules between column groups yet. - - - - -none - -No rules. This is the default value. - - - - - - -The border after the last row and the border after -the last column are not affected by -this setting. Those borders are controlled by -the frame attribute on the table element. - - - - - - - -table.cell.padding -attribute set - - -table.cell.padding -Specifies the padding of table cells - - - - -<xsl:attribute-set name="table.cell.padding"> - <xsl:attribute name="padding-start">2pt</xsl:attribute> - <xsl:attribute name="padding-end">2pt</xsl:attribute> - <xsl:attribute name="padding-top">2pt</xsl:attribute> - <xsl:attribute name="padding-bottom">2pt</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Specifies the padding of table cells. - - - - - - -table.frame.border.thickness -length - - -table.frame.border.thickness -Specifies the thickness of the frame border - - - - -<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param> - - - -Description - -Specifies the thickness of the border on the table's frame. - - - - - - -table.frame.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.frame.border.style -Specifies the border style of table frames - - - - -<xsl:param name="table.frame.border.style">solid</xsl:param> - - - -Description - -Specifies the border style of table frames. - - - - - - -table.frame.border.color -color - - -table.frame.border.color -Specifies the border color of table frames - - - - - -<xsl:param name="table.frame.border.color">black</xsl:param> - - - -Description - -Specifies the border color of table frames. - - - - - - -table.cell.border.thickness -length - - -table.cell.border.thickness -Specifies the thickness of table cell borders - - - - -<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param> - - - -Description - -If non-zero, specifies the thickness of borders on table -cells. The units are points. See -CSS - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.cell.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.cell.border.style -Specifies the border style of table cells - - - - -<xsl:param name="table.cell.border.style">solid</xsl:param> - - - -Description - -Specifies the border style of table cells. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.cell.border.color -color - - -table.cell.border.color -Specifies the border color of table cells - - - - - -<xsl:param name="table.cell.border.color">black</xsl:param> - - - -Description - -Set the color of table cell borders. If non-zero, the value is used -for the border coloration. See CSS. A -color is either a keyword or a numerical RGB specification. -Keywords are aqua, black, blue, fuchsia, gray, green, lime, maroon, -navy, olive, orange, purple, red, silver, teal, white, and -yellow. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.table.properties -attribute set - - -table.table.properties -Properties associated with a table - - - - -<xsl:attribute-set name="table.table.properties"> - <xsl:attribute name="border-before-width.conditionality">retain</xsl:attribute> - <xsl:attribute name="border-collapse">collapse</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for tables. This parameter should really -have been called table.properties, but that parameter -name was inadvertently established for the block-level properties -of the table as a whole. - - -See also table.properties. - - - - -Linking - - -current.docid -string - - -current.docid -targetdoc identifier for the document being -processed - - -<xsl:param name="current.docid"></xsl:param> - - -Description - -When olinks between documents are resolved for HTML output, the stylesheet can compute the relative path between the current document and the target document. The stylesheet needs to know the targetdoc identifiers for both documents, as they appear in the target.database.document database file. This parameter passes to the stylesheet -the targetdoc identifier of the current document, since that -identifier does not appear in the document itself. -This parameter can also be used for print output. If an olink's targetdoc id differs from the current.docid, then the stylesheet can append the target document's title to the generated olink text. That identifies to the reader that the link is to a different document, not the current document. See also olink.doctitle to enable that feature. - - - - - -collect.xref.targets -list -no -yes -only - - -collect.xref.targets -Controls whether cross reference data is -collected - - -<xsl:param name="collect.xref.targets">no</xsl:param> - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter determines whether the collection process is run when the document is processed by the stylesheet. The default value is no, which means the data file is not generated during processing. The other choices are yes, which means the data file is created and the document is processed for output, and only, which means the data file is created but the document is not processed for output. -See also targets.filename. - - - - - - -insert.olink.page.number -list -no -yes -maybe - - -insert.olink.page.number -Turns page numbers in olinks on and off - - - - -<xsl:param name="insert.olink.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references made between documents with -olink will -include page number citations. -In most cases this is only applicable to references in printed output. - -The parameter has three possible values. - - - -no -No page number references will be generated for olinks. - - - -yes -Page number references will be generated -for all olink references. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an olink element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - -Olinks that point to targets within the same document -are treated as xrefs, and controlled by -the insert.xref.page.number parameter. - - -Page number references for olinks to -external documents can only be inserted if the -information exists in the olink database. -This means each olink target element -(div or obj) -must have a page attribute -whose value is its page number in the target document. -The XSL stylesheets are not able to extract that information -during processing because pages have not yet been created in -XSLT transformation. Only the XSL-FO processor knows what -page each element is placed on. -Therefore some postprocessing must take place to populate -page numbers in the olink database. - - - - - - - - - -insert.olink.pdf.frag -boolean - - -insert.olink.pdf.frag -Add fragment identifiers for links into PDF files - - - - -<xsl:param name="insert.olink.pdf.frag" select="0"></xsl:param> - - - -Description - -The value of this parameter determines whether -the cross reference URIs to PDF documents made with -olink will -include fragment identifiers. - - -When forming a URI to link to a PDF document, -a fragment identifier (typically a '#' followed by an -id value) appended to the PDF filename can be used by -the PDF viewer to open -the PDF file to a location within the document instead of -the first page. -However, not all PDF files have id -values embedded in them, and not all PDF viewers can -handle fragment identifiers. - - -If insert.olink.pdf.frag is set -to a non-zero value, then any olink targeting a -PDF file will have the fragment identifier appended to the URI. -The URI is formed by concatenating the value of the -olink.base.uri parameter, the -value of the baseuri -attribute from the document -element in the olink database with the matching -targetdoc value, -and the value of the href -attribute for the targeted element in the olink database. -The href attribute -contains the fragment identifier. - - -If insert.olink.pdf.frag is set -to zero (the default value), then -the href attribute -from the olink database -is not appended to PDF olinks, so the fragment identifier is left off. -A PDF olink is any olink for which the -baseuri attribute -from the matching document -element in the olink database ends with '.pdf'. -Any other olinks will still have the fragment identifier added. - - - - - - -olink.base.uri -uri - - -olink.base.uri -Base URI used in olink hrefs - - -<xsl:param name="olink.base.uri"></xsl:param> - - -Description - -When cross reference data is collected for resolving olinks, it -may be necessary to prepend a base URI to each target's href. This -parameter lets you set that base URI when cross reference data is -collected. This feature is needed when you want to link to a document -that is processed without chunking. The output filename for such a -document is not known to the XSL stylesheet; the only target -information consists of fragment identifiers such as -#idref. To enable the resolution of olinks between -documents, you should pass the name of the HTML output file as the -value of this parameter. Then the hrefs recorded in the cross -reference data collection look like -outfile.html#idref, which can be reached as links -from other documents. - - - - - -olink.debug -boolean - - -olink.debug -Turn on debugging messages for olinks - - - - -<xsl:param name="olink.debug" select="0"></xsl:param> - - - -Description - -If non-zero, then each olink will generate several -messages about how it is being resolved during processing. -This is useful when an olink does not resolve properly -and the standard error messages are not sufficient to -find the problem. - - -You may need to read through the olink XSL templates -to understand the context for some of the debug messages. - - - - - - - -olink.doctitle -list -no -yes -maybe - - -olink.doctitle -show the document title for external olinks? - - - -<xsl:param name="olink.doctitle">no</xsl:param> - - -Description - -When olinks between documents are resolved, the generated text -may not make it clear that the reference is to another document. -It is possible for the stylesheets to append the other document's -title to external olinks. For this to happen, two parameters must -be set. - - -This olink.doctitle parameter -should be set to either yes or maybe -to enable this feature. - - - -And you should also set the current.docid -parameter to the document id for the document currently -being processed for output. - - - - - -Then if an olink's targetdoc id differs from -the current.docid value, the stylesheet knows -that it is a reference to another document and can -append the target document's -title to the generated olink text. - -The text for the target document's title is copied from the -olink database from the ttl element -of the top-level div for that document. -If that ttl element is missing or empty, -no title is output. - - -The supported values for olink.doctitle are: - - - -yes - - -Always insert the title to the target document if it is not -the current document. - - - - -no - - -Never insert the title to the target document, even if requested -in an xrefstyle attribute. - - - - -maybe - - -Only insert the title to the target document, if requested -in an xrefstyle attribute. - - - - -An xrefstyle attribute -may override the global setting for individual olinks. -The following values are supported in an -xrefstyle -attribute using the select: syntax: - - - - -docname - - -Insert the target document name for this olink using the -docname gentext template, but only -if the value of olink.doctitle -is not no. - - - - -docnamelong - - -Insert the target document name for this olink using the -docnamelong gentext template, but only -if the value of olink.doctitle -is not no. - - - - -nodocname - - -Omit the target document name even if -the value of olink.doctitle -is yes. - - - - -Another way of inserting the target document name -for a single olink is to employ an -xrefstyle -attribute using the template: syntax. -The %o placeholder (the letter o, not zero) -in such a template -will be filled in with the target document's title when it is processed. -This will occur regardless of -the value of olink.doctitle. - -Note that prior to version 1.66 of the XSL stylesheets, -the allowed values for this parameter were 0 and 1. Those -values are still supported and mapped to 'no' and 'yes', respectively. - - - - - - -olink.lang.fallback.sequence -string - - -olink.lang.fallback.sequence -look up translated documents if olink not found? - - - -<xsl:param name="olink.lang.fallback.sequence"></xsl:param> - - -Description - - -This parameter defines a list of lang values -to search among to resolve olinks. - - -Normally an olink tries to resolve to a document in the same -language as the olink itself. The language of an olink -is determined by its nearest ancestor element with a -lang attribute, otherwise the -value of the l10n.gentext.default.lang -parameter. - - -An olink database can contain target data for the same -document in multiple languages. Each set of data has the -same value for the targetdoc attribute in -the document element in the database, but with a -different lang attribute value. - - -When an olink is being resolved, the target is first -sought in the document with the same language as the olink. -If no match is found there, then this parameter is consulted -for additional languages to try. - -The olink.lang.fallback.sequence -must be a whitespace separated list of lang values to -try. The first one with a match in the olink database is used. -The default value is empty. - -For example, a document might be written in German -and contain an olink with -targetdoc="adminguide". -When the document is processed, the processor -first looks for a target dataset in the -olink database starting with: - -<document targetdoc="adminguide" lang="de">. - - -If there is no such element, then the -olink.lang.fallback.sequence -parameter is consulted. -If its value is, for example, fr en, then the processor next -looks for targetdoc="adminguide" lang="fr", and -then for targetdoc="adminguide" lang="en". -If there is still no match, it looks for -targetdoc="adminguide" with no -lang attribute. - - -This parameter is useful when a set of documents is only -partially translated, or is in the process of being translated. -If a target of an olink has not yet been translated, then this -parameter permits the processor to look for the document in -other languages. This assumes the reader would rather have -a link to a document in a different language than to have -a broken link. - - - - - - - -olink.properties -attribute set - - -olink.properties -Properties associated with the cross-reference -text of an olink. - - - - -<xsl:attribute-set name="olink.properties"> - <xsl:attribute name="show-destination">replace</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the -fo:basic-link element of an olink. It is not applied to the -optional page number or optional title of the external -document. - - - - - - -prefer.internal.olink -boolean - - -prefer.internal.olink -Prefer a local olink reference to an external reference - - - - -<xsl:param name="prefer.internal.olink" select="0"></xsl:param> - - - -Description - -If you are re-using XML content modules in multiple documents, -you may want to redirect some of your olinks. This parameter -permits you to redirect an olink to the current document. - - -For example: you are writing documentation for a product, -which includes 3 manuals: a little installation -booklet (booklet.xml), a user -guide (user.xml), and a reference manual (reference.xml). -All 3 documents begin with the same introduction section (intro.xml) that -contains a reference to the customization section (custom.xml) which is -included in both user.xml and reference.xml documents. - - -How do you write the link to custom.xml in intro.xml -so that it is interpreted correctly in all 3 documents? - -If you use xref, it will fail in user.xml. - -If you use olink (pointing to reference.xml), -the reference in user.xml -will point to the customization section of the reference manual, while it is -actually available in user.xml. - - - -If you set the prefer.internal.olink -parameter to a non-zero value, then the processor will -first look in the olink database -for the olink's targetptr attribute value -in document matching the current.docid -parameter value. If it isn't found there, then -it tries the document in the database -with the targetdoc -value that matches the olink's targetdoc -attribute. - - -This feature permits an olink reference to resolve to -the current document if there is an element -with an id matching the olink's targetptr -value. The current document's olink data must be -included in the target database for this to work. - - -There is a potential for incorrect links if -the same id attribute value is used for different -content in different documents. -Some of your olinks may be redirected to the current document -when they shouldn't be. It is not possible to control -individual olink instances. - - - - - - - -target.database.document -uri - - -target.database.document -Name of master database file for resolving -olinks - - - - <xsl:param name="target.database.document">olinkdb.xml</xsl:param> - - -Description - - -To resolve olinks between documents, the stylesheets use a master -database document that identifies the target datafiles for all the -documents within the scope of the olinks. This parameter value is the -URI of the master document to be read during processing to resolve -olinks. The default value is olinkdb.xml. - -The data structure of the file is defined in the -targetdatabase.dtd DTD. The database file -provides the high level elements to record the identifiers, locations, -and relationships of documents. The cross reference data for -individual documents is generally pulled into the database using -system entity references or XIncludes. See also -targets.filename. - - - - -targets.filename -string - - -targets.filename -Name of cross reference targets data file - - -<xsl:param name="targets.filename">target.db</xsl:param> - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter lets you change the name of the generated -file from the default name target.db. -The name must agree with that used in the target database -used to resolve olinks during processing. -See also target.database.document. - - - - - - -use.local.olink.style -boolean - - -use.local.olink.style -Process olinks using xref style of current -document - - -<xsl:param name="use.local.olink.style" select="0"></xsl:param> - -Description - -When cross reference data is collected for use by olinks, the data for each potential target includes one field containing a completely assembled cross reference string, as if it were an xref generated in that document. Other fields record the separate title, number, and element name of each target. When an olink is formed to a target from another document, the olink resolves to that preassembled string by default. If the use.local.olink.style parameter is set to non-zero, then instead the cross -reference string is formed again from the target title, number, and -element name, using the stylesheet processing the targeting document. -Then olinks will match the xref style in the targeting document -rather than in the target document. If both documents are processed -with the same stylesheet, then the results will be the same. - - - -Cross References - - -insert.xref.page.number -list -no -yes -maybe - - -insert.xref.page.number -Turns page numbers in xrefs on and off - - - - -<xsl:param name="insert.xref.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references (xrefs) in -printed output will -include page number citations. -It has three possible values. - - - -no -No page number references will be generated. - - - -yes -Page number references will be generated -for all xref elements. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an xref element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - - - - - - - -xref.properties -attribute set - - -xref.properties -Properties associated with cross-reference text - - - - -<xsl:attribute-set name="xref.properties"> -</xsl:attribute-set> - - - -Description - -This attribute set is used to set properties -on cross reference text. - - - - - - -xref.label-title.separator -string - - -xref.label-title.separator -Punctuation or space separating label from title in xref - - - -<xsl:param name="xref.label-title.separator">: </xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and title, -then the value of this parameter is inserted between -label and title in the output. - - - - - - - -xref.label-page.separator -string - - -xref.label-page.separator -Punctuation or space separating label from page number in xref - - - -<xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and page -but no title, -then the value of this parameter is inserted between -label and page number in the output. -If a title is included, then other separators are used. - - - - - - - -xref.title-page.separator -string - - -xref.title-page.separator -Punctuation or space separating title from page number in xref - - - -<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both title and page number, -then the value of this parameter is inserted between -title and page number in the output. - - - - - - - -insert.link.page.number -list -no -yes -maybe - - -insert.link.page.number -Turns page numbers in link elements on and off - - - - -<xsl:param name="insert.link.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references using the link element in -printed output will -include standard page number citations. -It has three possible values. - - - -no -No page number references will be generated. - - - -yes -Page number references will be generated -for all link elements. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for a link element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - - -Although the xrefstyle attribute -can be used to turn the page reference on or off, it cannot be -used to control the formatting of the page number as it -can in xref. -In link it will always format with -the style established by the -gentext template with name="page.citation" -in the l:context name="xref". - - - - -Lists - - -compact.list.item.spacing -attribute set - - -compact.list.item.spacing -What space do you want between list items (when spacing="compact")? - - - -<xsl:attribute-set name="compact.list.item.spacing"> - <xsl:attribute name="space-before.optimum">0em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute> -</xsl:attribute-set> - -Description -Specify what spacing you want between each list item when -spacing is -compact. - - - - - -itemizedlist.properties -attribute set - - -itemizedlist.properties -Properties that apply to each list-block generated by itemizedlist. - - - -<xsl:attribute-set name="itemizedlist.properties" use-attribute-sets="list.block.properties"> -</xsl:attribute-set> - -Description -Properties that apply to each fo:list-block generated by itemizedlist. - - - - - -itemizedlist.label.properties -attribute set - - -itemizedlist.label.properties -Properties that apply to each label inside itemized list. - - - -<xsl:attribute-set name="itemizedlist.label.properties"> -</xsl:attribute-set> - -Description -Properties that apply to each label inside itemized list. E.g.: -<xsl:attribute-set name="itemizedlist.label.properties"> - <xsl:attribute name="text-align">right</xsl:attribute> -</xsl:attribute-set> - - - - - -itemizedlist.label.width -length - - - itemizedlist.label.width -The default width of the label (bullet) in an itemized list. - - - - - <xsl:param name="itemizedlist.label.width">1.0em</xsl:param> - - - -Description -Specifies the default width of the label (usually a bullet or other -symbol) in an itemized list. You can override the default value on any -particular list with the “dbfo” processing instruction using the -“label-width” pseudoattribute. - - - - - -list.block.properties -attribute set - - -list.block.properties -Properties that apply to each list-block generated by list. - - - -<xsl:attribute-set name="list.block.properties"> - <xsl:attribute name="provisional-label-separation">0.2em</xsl:attribute> - <xsl:attribute name="provisional-distance-between-starts">1.5em</xsl:attribute> -</xsl:attribute-set> - -Description -Properties that apply to each fo:list-block generated by itemizedlist/orderedlist. - - - - - -list.block.spacing -attribute set - - -list.block.spacing -What spacing do you want before and after lists? - - - -<xsl:attribute-set name="list.block.spacing"> - <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">1.2em</xsl:attribute> -</xsl:attribute-set> - -Description -Specify the spacing required before and after a list. It is necessary to specify the space after a list block because lists can come inside of paras. - - - - - -list.item.spacing -attribute set - - -list.item.spacing -What space do you want between list items? - - - -<xsl:attribute-set name="list.item.spacing"> - <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-set> - -Description -Specify what spacing you want between each list item. - - - - - -orderedlist.properties -attribute set - - -orderedlist.properties -Properties that apply to each list-block generated by orderedlist. - - - -<xsl:attribute-set name="orderedlist.properties" use-attribute-sets="list.block.properties"> - <xsl:attribute name="provisional-distance-between-starts">2em</xsl:attribute> -</xsl:attribute-set> - -Description -Properties that apply to each fo:list-block generated by orderedlist. - - - - - -orderedlist.label.properties -attribute set - - -orderedlist.label.properties -Properties that apply to each label inside ordered list. - - - -<xsl:attribute-set name="orderedlist.label.properties"> -</xsl:attribute-set> - -Description -Properties that apply to each label inside ordered list. E.g.: -<xsl:attribute-set name="orderedlist.label.properties"> - <xsl:attribute name="text-align">right</xsl:attribute> -</xsl:attribute-set> - - - - - -orderedlist.label.width -length - - -orderedlist.label.width -The default width of the label (number) in an ordered list. - - - - -<xsl:param name="orderedlist.label.width">1.2em</xsl:param> - - - -Description -Specifies the default width of the label (usually a number or -sequence of numbers) in an ordered list. You can override the default -value on any particular list with the “dbfo” processing instruction -using the “label-width” pseudoattribute. - - - - - -variablelist.max.termlength -number - - -variablelist.max.termlength -Specifies the longest term in variablelists - - - - -<xsl:param name="variablelist.max.termlength">24</xsl:param> - - - -Description - -In variablelists, the listitem -is indented to leave room for the -term elements. That indent may be computed -if it is not specified with a termlength -attribute on the variablelist element. - - -The computation counts characters in the -term elements in the list -to find the longest term. However, some terms are very long -and would produce extreme indents. This parameter lets you -set a maximum character count. Any terms longer than the maximum -would line wrap. The default value is 24. - - -The character counts are converted to physical widths -by multiplying by 0.50em. There will be some variability -in how many actual characters fit in the space -since some characters are wider than others. - - - - - - - -variablelist.term.separator -string - - -variablelist.term.separator -Text to separate terms within a multi-term -varlistentry - - - - -<xsl:param name="variablelist.term.separator">, </xsl:param> - - -Description - -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is placed -after each term except the last. - - - To generate a line break between multiple terms in - a varlistentry, set a non-zero value for the - variablelist.term.break.after parameter. If - you do so, you may also want to set the value of the - variablelist.term.separator parameter to an - empty string (to suppress rendering of the default comma and space - after each term). - - - - - - - -variablelist.term.properties -attribute set - - -variablelist.term.properties -To add properties to the term elements in a variablelist. - - - - -<xsl:attribute-set name="variablelist.term.properties"> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -term in a variablelist. -Use this attribute-set to set -font properties or alignment, for example. - - - - - - -variablelist.term.break.after -boolean - - -variablelist.term.break.after -Generate line break after each term within a -multi-term varlistentry? - - - - -<xsl:param name="variablelist.term.break.after">0</xsl:param> - - -Description - -Set a non-zero value for the -variablelist.term.break.after parameter to -generate a line break between terms in a -multi-term varlistentry. - - -If you set a non-zero value for -variablelist.term.break.after, you may also -want to set the value of the -variablelist.term.separator parameter to an -empty string (to suppress rendering of the default comma and space -after each term). - - - - - -QAndASet - - -qandadiv.autolabel -boolean - - -qandadiv.autolabel -Are divisions in QAndASets enumerated? - - - -<xsl:param name="qandadiv.autolabel" select="1"></xsl:param> - - -Description - -If non-zero, unlabeled qandadivs will be enumerated. - - - - - - - -qanda.inherit.numeration -boolean - - -qanda.inherit.numeration -Does enumeration of QandASet components inherit the numeration of parent elements? - - - - -<xsl:param name="qanda.inherit.numeration" select="1"></xsl:param> - - - -Description - -If non-zero, numbered qandadiv elements and -question and answer inherit the enumeration of -the ancestors of the qandaset. - - - - - - - -qanda.defaultlabel -list -number -qanda -none - - -qanda.defaultlabel -Sets the default for defaultlabel on QandASet. - - - - -<xsl:param name="qanda.defaultlabel">number</xsl:param> - - - -Description - -If no defaultlabel attribute is specified on -a qandaset, this value is used. It is generally one of the legal -values for the defaultlabel attribute (none, -number or -qanda), or one of the additional stylesheet-specific values -(qnumber or qnumberanda). -The default value is 'number'. - -The values are rendered as follows: - -qanda - -questions are labeled "Q:" and -answers are labeled "A:". - - - -number - -The questions are enumerated and the answers -are not labeled. - - - -qnumber - -The questions are labeled "Q:" followed by a number, and answers are not -labeled. -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -qnumberanda - -The questions are labeled "Q:" followed by a number, and -the answers are labeled "A:". -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -none - -No distinguishing label precedes Questions or Answers. - - - - - - - - - - -qanda.in.toc -boolean - - -qanda.in.toc -Should qandaentry questions appear in -the document table of contents? - - - -<xsl:param name="qanda.in.toc" select="0"></xsl:param> - - -Description - -If true (non-zero), then the generated table of contents -for a document will include qandaset titles, -qandadiv titles, -and question elements. The default value (zero) excludes -them from the TOC. - -This parameter does not affect any tables of contents -that may be generated inside a qandaset or qandadiv. - - - - - - - -qanda.nested.in.toc -boolean - - -qanda.nested.in.toc -Should nested answer/qandaentry instances appear in TOC? - - - - -<xsl:param name="qanda.nested.in.toc" select="0"></xsl:param> - - - -Description - -If non-zero, instances of qandaentry -that are children of answer elements are shown in -the TOC. - - - - -Bibliography - - -bibliography.style -list -normal -iso690 - - -bibliography.style -Style used for formatting of biblioentries. - - - - -<xsl:param name="bibliography.style">normal</xsl:param> - - - -Description - -Currently only normal and -iso690 styles are supported. - -In order to use ISO690 style to the full extent you might need -to use additional markup described on the -following WiKi page. - - - - - - -biblioentry.item.separator -string - - -biblioentry.item.separator -Text to separate bibliography entries - - - -<xsl:param name="biblioentry.item.separator">. </xsl:param> - - -Description - -Text to separate bibliography entries - - - - - - - -bibliography.collection -string - - -bibliography.collection -Name of the bibliography collection file - - - - -<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param> - - - - -Description - -Maintaining bibliography entries across a set of documents is tedious, time -consuming, and error prone. It makes much more sense, usually, to store all of -the bibliography entries in a single place and simply extract -the ones you need in each document. - -That's the purpose of the -bibliography.collection parameter. To setup a global -bibliography database, follow these steps: - -First, create a stand-alone bibliography document that contains all of -the documents that you wish to reference. Make sure that each bibliography -entry (whether you use biblioentry or bibliomixed) -has an ID. - -My global bibliography, ~/bibliography.xml begins -like this: - - -<!DOCTYPE bibliography - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<bibliography><title>References</title> - -<bibliomixed id="xml-rec"><abbrev>XML 1.0</abbrev>Tim Bray, -Jean Paoli, C. M. Sperberg-McQueen, and Eve Maler, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml">Extensible Markup -Language (XML) 1.0 Second Edition</ulink></citetitle>. -World Wide Web Consortium, 2000. -</bibliomixed> - -<bibliomixed id="xml-names"><abbrev>Namespaces</abbrev>Tim Bray, -Dave Hollander, -and Andrew Layman, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml-names/">Namespaces in -XML</ulink></citetitle>. -World Wide Web Consortium, 1999. -</bibliomixed> - -<!-- ... --> -</bibliography> - - - -When you create a bibliography in your document, simply -provide empty bibliomixed -entries for each document that you wish to cite. Make sure that these -elements have the same ID as the corresponding real -entry in your global bibliography. - -For example: - - -<bibliography><title>Bibliography</title> - -<bibliomixed id="xml-rec"/> -<bibliomixed id="xml-names"/> -<bibliomixed id="DKnuth86">Donald E. Knuth. <citetitle>Computers and -Typesetting: Volume B, TeX: The Program</citetitle>. Addison-Wesley, -1986. ISBN 0-201-13437-3. -</bibliomixed> -<bibliomixed id="relaxng"/> - -</bibliography> - - -Note that it's perfectly acceptable to mix entries from your -global bibliography with normal entries. You can use -xref or other elements to cross-reference your -bibliography entries in exactly the same way you do now. - -Finally, when you are ready to format your document, simply set the -bibliography.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global bibliography. - -The stylesheets will format the bibliography in your document as if -all of the entries referenced appeared there literally. - - - - - - -bibliography.numbered -boolean - - -bibliography.numbered -Should bibliography entries be numbered? - - - - -<xsl:param name="bibliography.numbered" select="0"></xsl:param> - - - -Description - -If non-zero bibliography entries will be numbered - - - - - - - biblioentry.properties - attribute set - - -biblioentry.properties -To set the style for biblioentry. - - - -<xsl:attribute-set name="biblioentry.properties" use-attribute-sets="normal.para.spacing"> - <xsl:attribute name="start-indent">0.5in</xsl:attribute> - <xsl:attribute name="text-indent">-0.5in</xsl:attribute> -</xsl:attribute-set> - - -Description -How do you want biblioentry styled? -Set the font-size, weight, space-above and space-below, indents, etc. to the style required - - - - -Glossary - - -glossterm.auto.link -boolean - - -glossterm.auto.link -Generate links from glossterm to glossentry automatically? - - - - -<xsl:param name="glossterm.auto.link" select="0"></xsl:param> - - - -Description - -If non-zero, links from inline glossterms to the corresponding -glossentry elements in a glossary or glosslist -will be automatically generated. This is useful when your glossterms are consistent -and you don't want to add links manually. - -The automatic link generation feature is not used on glossterm elements -that have a linkend attribute. - - - - - - -firstterm.only.link -boolean - - -firstterm.only.link -Does automatic glossterm linking only apply to firstterms? - - - - -<xsl:param name="firstterm.only.link" select="0"></xsl:param> - - - -Description - -If non-zero, only firstterms will be automatically linked -to the glossary. If glossary linking is not enabled, this parameter -has no effect. - - - - - - -glossary.collection -string - - -glossary.collection -Name of the glossary collection file - - - - -<xsl:param name="glossary.collection"></xsl:param> - - - -Description - -Glossaries maintained independently across a set of documents -are likely to become inconsistent unless considerable effort is -expended to keep them in sync. It makes much more sense, usually, to -store all of the glossary entries in a single place and simply -extract the ones you need in each document. - -That's the purpose of the -glossary.collection parameter. To setup a global -glossary database, follow these steps: - -Setting Up the Glossary Database - -First, create a stand-alone glossary document that contains all of -the entries that you wish to reference. Make sure that each glossary -entry has an ID. - -Here's an example glossary: - - - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE glossary - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<glossary> -<glossaryinfo> -<editor><firstname>Eric</firstname><surname>Raymond</surname></editor> -<title>Jargon File 4.2.3 (abridged)</title> -<releaseinfo>Just some test data</releaseinfo> -</glossaryinfo> - -<glossdiv><title>0</title> - -<glossentry> -<glossterm>0</glossterm> -<glossdef> -<para>Numeric zero, as opposed to the letter `O' (the 15th letter of -the English alphabet). In their unmodified forms they look a lot -alike, and various kluges invented to make them visually distinct have -compounded the confusion. If your zero is center-dotted and letter-O -is not, or if letter-O looks almost rectangular but zero looks more -like an American football stood on end (or the reverse), you're -probably looking at a modern character display (though the dotted zero -seems to have originated as an option on IBM 3270 controllers). If -your zero is slashed but letter-O is not, you're probably looking at -an old-style ASCII graphic set descended from the default typewheel on -the venerable ASR-33 Teletype (Scandinavians, for whom /O is a letter, -curse this arrangement). (Interestingly, the slashed zero long -predates computers; Florian Cajori's monumental "A History of -Mathematical Notations" notes that it was used in the twelfth and -thirteenth centuries.) If letter-O has a slash across it and the zero -does not, your display is tuned for a very old convention used at IBM -and a few other early mainframe makers (Scandinavians curse <emphasis>this</emphasis> -arrangement even more, because it means two of their letters collide). -Some Burroughs/Unisys equipment displays a zero with a <emphasis>reversed</emphasis> -slash. Old CDC computers rendered letter O as an unbroken oval and 0 -as an oval broken at upper right and lower left. And yet another -convention common on early line printers left zero unornamented but -added a tail or hook to the letter-O so that it resembled an inverted -Q or cursive capital letter-O (this was endorsed by a draft ANSI -standard for how to draw ASCII characters, but the final standard -changed the distinguisher to a tick-mark in the upper-left corner). -Are we sufficiently confused yet?</para> -</glossdef> -</glossentry> - -<glossentry> -<glossterm>1TBS</glossterm> -<glossdef> -<para role="accidence"> -<phrase role="pronounce"></phrase> -<phrase role="partsofspeach">n</phrase> -</para> -<para>The "One True Brace Style"</para> -<glossseealso>indent style</glossseealso> -</glossdef> -</glossentry> - -<!-- ... --> - -</glossdiv> - -<!-- ... --> - -</glossary> - - - - -Marking Up Glossary Terms - -That takes care of the glossary database, now you have to get the entries -into your document. Unlike bibliography entries, which can be empty, creating -placeholder glossary entries would be very tedious. So instead, -support for glossary.collection relies on implicit linking. - -In your source document, simply use firstterm and -glossterm to identify the terms you wish to have included -in the glossary. The stylesheets assume that you will either set the -baseform attribute correctly, or that the -content of the element exactly matches a term in your glossary. - -If you're using a glossary.collection, don't -make explicit links on the terms in your document. - -So, in your document, you might write things like this: - - -<para>This is dummy text, without any real meaning. -The point is simply to reference glossary terms like <glossterm>0</glossterm> -and the <firstterm baseform="1TBS">One True Brace Style (1TBS)</firstterm>. -The <glossterm>1TBS</glossterm>, as you can probably imagine, is a nearly -religious issue.</para> - - -If you set the firstterm.only.link parameter, -only the terms marked with firstterm will be links. -Otherwise, all the terms will be linked. - - - -Marking Up the Glossary - -The glossary itself has to be identified for the stylesheets. For lack -of a better choice, the role is used. -To identify the glossary as the target for automatic processing, set -the role to auto. The title of this -glossary (and any other information from the glossaryinfo -that's rendered by your stylesheet) will be displayed, but the entries will -come from the database. - - -Unfortunately, the glossary can't be empty, so you must put in -at least one glossentry. The content of this entry -is irrelevant, it will not be rendered: - - -<glossary role="auto"> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - -What about glossary divisions? If your glossary database has glossary -divisions and your automatic glossary contains at least -one glossdiv, the automic glossary will have divisions. -If the glossdiv is missing from either location, no divisions -will be rendered. - -Glossary entries (and divisions, if appropriate) in the glossary will -occur in precisely the order they occur in your database. - - - -Formatting the Document - -Finally, when you are ready to format your document, simply set the -glossary.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global glossary. - -The stylesheets will format the glossary in your document as if -all of the entries implicilty referenced appeared there literally. - - -Limitations - -Glossary cross-references within the glossary are -not supported. For example, this will not work: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - -If you put glossary cross-references in your glossary that way, -you'll get the cryptic error: Warning: -glossary.collection specified, but there are 0 automatic -glossaries. - -Instead, you must do two things: - - - -Markup your glossary using glossseealso: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - - - -Make sure there is at least one glossterm reference to -gloss-2 in your document. The -easiest way to do that is probably within a remark in your -automatic glossary: - - -<glossary role="auto"> -<remark>Make sure there's a reference to <glossterm>gloss-2</glossterm>.</remark> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - - - - - - - - - -glossary.as.blocks -boolean - - -glossary.as.blocks -Present glossarys using blocks instead of lists? - - - - -<xsl:param name="glossary.as.blocks" select="0"></xsl:param> - - - -Description - -If non-zero, glossarys will be formatted as -blocks. - -If you have long glossterms, proper list -markup in the FO case may produce unattractive lists. By setting this -parameter, you can force the stylesheets to produce block markup -instead of proper lists. - -You can override this setting with a processing instruction as the -child of glossary: dbfo -glossary-presentation="blocks" or dbfo -glossary-presentation="list" - - - - - - -glosslist.as.blocks -boolean - - -glosslist.as.blocks -Use blocks for glosslists? - - - - -<xsl:param name="glosslist.as.blocks" select="0"></xsl:param> - - - -Description - -See glossary.as.blocks. - - - - - - -glossentry.list.item.properties -attribute set - - -glossentry.list.item.properties -To add properties to each glossentry in a list. - - - -<xsl:attribute-set name="glossentry.list.item.properties"> - <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-set> - - -Description -These properties are added to the fo:list-item containing a -glossentry in a glossary when the glossary.as.blocks parameter -is zero. -Use this attribute-set to set -spacing between entries, for example. - - - - - - -glossterm.block.properties -attribute set - - -glossterm.block.properties -To add properties to the block of a glossentry's glossterm. - - - -<xsl:attribute-set name="glossterm.block.properties"> - <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="keep-with-next.within-column">always</xsl:attribute> - <xsl:attribute name="keep-together.within-column">always</xsl:attribute> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -glossary term in a glossary when the glossary.as.blocks parameter -is non-zero. -Use this attribute-set to set the space above and below, -font properties, -and any indent for the glossary term. - - - - - - -glossdef.block.properties -attribute set - - -glossdef.block.properties -To add properties to the block of a glossary definition. - - - -<xsl:attribute-set name="glossdef.block.properties"> - <xsl:attribute name="margin-{$direction.align.start}">.25in</xsl:attribute> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -glossary definition in a glossary when -the glossary.as.blocks parameter -is non-zero. -Use this attribute-set to set the space above and below, -any font properties, -and any indent for the glossary definition. - - - - - - -glossterm.list.properties -attribute set - - -glossterm.list.properties -To add properties to the glossterm in a list. - - - - -<xsl:attribute-set name="glossterm.list.properties"> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -glossary term in a glossary when the glossary.as.blocks parameter -is zero. -Use this attribute-set to set -font properties, for example. - - - - - - -glossdef.list.properties -attribute set - - -glossdef.list.properties -To add properties to the glossary definition in a list. - - - - -<xsl:attribute-set name="glossdef.list.properties"> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -glossary definition in a glossary when -the glossary.as.blocks parameter -is zero. -Use this attribute-set to set font properties, for example. - - - - - - -glossterm.width -length - - -glossterm.width -Width of glossterm in list presentation mode - - - - -<xsl:param name="glossterm.width">2in</xsl:param> - - - -Description - -This parameter specifies the width reserved for glossary terms when -a list presentation is used. - - - - - - -glossterm.separation -length - - -glossterm.separation -Separation between glossary terms and descriptions in list mode - - - - -<xsl:param name="glossterm.separation">0.25in</xsl:param> - - - -Description - -Specifies the miminum horizontal -separation between glossary terms and descriptions when -they are presented side-by-side using lists -when the glossary.as.blocks -is zero. - - - - - - -glossentry.show.acronym -list -no -yes -primary - - -glossentry.show.acronym -Display glossentry acronyms? - - - - -<xsl:param name="glossentry.show.acronym">no</xsl:param> - - - -Description - -A setting of yes means they should be displayed; -no means they shouldn't. If primary is used, -then they are shown as the primary text for the entry. - - -This setting controls both acronym and -abbrev elements in the glossentry. - - - - - - - -glossary.sort -boolean - - -glossary.sort -Sort glossentry elements? - - - - -<xsl:param name="glossary.sort" select="0"></xsl:param> - - - -Description - -If non-zero, then the glossentry elements within a -glossary, glossdiv, or glosslist are sorted on the glossterm, using -the current lang setting. If zero (the default), then -glossentry elements are not sorted and are presented -in document order. - - - - - -Miscellaneous - - -formal.procedures -boolean - - -formal.procedures -Selects formal or informal procedures - - - - -<xsl:param name="formal.procedures" select="1"></xsl:param> - - - -Description - -Formal procedures are numbered and always have a title. - - - - - - - -formal.title.placement -table - - -formal.title.placement -Specifies where formal object titles should occur - - - - -<xsl:param name="formal.title.placement"> -figure before -example before -equation before -table before -procedure before -task before -</xsl:param> - - - -Description - -Specifies where formal object titles should occur. For each formal object -type (figure, -example, -equation, -table, and procedure) -you can specify either the keyword -before or -after. - - - - - - -runinhead.default.title.end.punct -string - - -runinhead.default.title.end.punct -Default punctuation character on a run-in-head - - - -<xsl:param name="runinhead.default.title.end.punct">.</xsl:param> - - - -Description - -If non-zero, For a formalpara, use the specified -string as the separator between the title and following text. The period is the default value. - - - - - - -runinhead.title.end.punct -string - - -runinhead.title.end.punct -Characters that count as punctuation on a run-in-head - - - - -<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param> - - - -Description - -Specify which characters are to be counted as punctuation. These -characters are checked for a match with the last character of the -title. If no match is found, the -runinhead.default.title.end.punct contents are -inserted. This is to avoid duplicated punctuation in the output. - - - - - - - -show.comments -boolean - - -show.comments -Display remark elements? - - - - -<xsl:param name="show.comments" select="1"></xsl:param> - - - -Description - -If non-zero, comments will be displayed, otherwise they -are suppressed. Comments here refers to the remark element -(which was called comment prior to DocBook -4.0), not XML comments (<-- like this -->) which are -unavailable. - - - - - - - -punct.honorific -string - - -punct.honorific -Punctuation after an honorific in a personal name. - - - - -<xsl:param name="punct.honorific">.</xsl:param> - - - -Description - -This parameter specifies the punctuation that should be added after an -honorific in a personal name. - - - - - - -segmentedlist.as.table -boolean - - -segmentedlist.as.table -Format segmented lists as tables? - - - - -<xsl:param name="segmentedlist.as.table" select="0"></xsl:param> - - - -Description - -If non-zero, segmentedlists will be formatted as -tables. - - - - - - -variablelist.as.blocks -boolean - - -variablelist.as.blocks -Format variablelists lists as blocks? - - - - -<xsl:param name="variablelist.as.blocks" select="0"></xsl:param> - - - -Description - -If non-zero, variablelists will be formatted as -blocks. - -If you have long terms, proper list markup in the FO case may produce -unattractive lists. By setting this parameter, you can force the stylesheets -to produce block markup instead of proper lists. - -You can override this setting with a processing instruction as the -child of variablelist: dbfo -list-presentation="blocks" or dbfo -list-presentation="list". - -When using list-presentation="list", -you can also control the amount of space used for the terms with -the dbfo term-width=".25in" processing instruction, -the termlength attribute on variablelist, -or allow the stylesheets to attempt to calculate the amount of space to leave based on the -number of letters in the longest term. - - - <variablelist> - <?dbfo list-presentation="list"?> - <?dbfo term-width="1.5in"?> - <?dbhtml list-presentation="table"?> - <?dbhtml term-width="1.5in"?> - <varlistentry> - <term>list</term> - <listitem> - <para> - Formatted as a list even if variablelist.as.blocks is set to 1. - </para> - </listitem> - </varlistentry> - </variablelist> - - - - - - - - - blockquote.properties - attribute set - - -blockquote.properties -To set the style for block quotations. - - - - -<xsl:attribute-set name="blockquote.properties"> -<xsl:attribute name="margin-{$direction.align.start}">0.5in</xsl:attribute> -<xsl:attribute name="margin-{$direction.align.end}">0.5in</xsl:attribute> -<xsl:attribute name="space-after.minimum">0.5em</xsl:attribute> -<xsl:attribute name="space-after.optimum">1em</xsl:attribute> -<xsl:attribute name="space-after.maximum">2em</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The blockquote.properties attribute set specifies -the formating properties of block quotations. - - - - - - -ulink.show -boolean - - -ulink.show -Display URLs after ulinks? - - - - -<xsl:param name="ulink.show" select="1"></xsl:param> - - - -Description - -If non-zero, the URL of each ulink will -appear after the text of the link. If the text of the link and the URL -are identical, the URL is suppressed. - -See also ulink.footnotes. - -DocBook 5 does not have an ulink element. When processing -DocBoook 5 documents, ulink.show applies to all inline -elements that are marked up with xlink:href attributes -that point to external resources. - - - - - - - -ulink.footnotes -boolean - - -ulink.footnotes -Generate footnotes for ulinks? - - - - -<xsl:param name="ulink.footnotes" select="0"></xsl:param> - - - -Description - -If non-zero, and if ulink.show also is non-zero, -the URL of each ulink will appear as a footnote. - -DocBook 5 does not have an ulink element. When processing -DocBoook 5 documents, ulink.footnotes applies to all inline -elements that are marked up with xlink:href attributes -that point to external resources. - - - - - - - -ulink.hyphenate -string - - -ulink.hyphenate -Allow URLs to be automatically hyphenated - - - - -<xsl:param name="ulink.hyphenate"></xsl:param> - - - -Description - -If not empty, the specified character (or more generally, content) is -added to URLs after every character included in the string -in the ulink.hyphenate.chars parameter (default -is /). If the character in this parameter is a -Unicode soft hyphen (0x00AD) or Unicode zero-width space (0x200B), some FO -processors will be able to reasonably hyphenate long URLs. - -As of 28 Jan 2002, discretionary hyphens are more widely and correctly -supported than zero-width spaces for this purpose. - - - - - - -ulink.hyphenate.chars -string - - -ulink.hyphenate.chars -List of characters to allow ulink URLs to be automatically hyphenated on - - - - -<xsl:param name="ulink.hyphenate.chars">/</xsl:param> - - - -Description - -If the ulink.hyphenate is not empty, then -hyphenation of ulinks is turned on, and any -character contained in this parameter is treated as an allowable -hyphenation point. - -The default value is /, but the parameter -could be customized -to contain other URL characters, as for example: - -<xsl:param name="ulink.hyphenate.chars">:/@&?.#</xsl:param> - - - - - - - -shade.verbatim -boolean - - -shade.verbatim -Should verbatim environments be shaded? - - - -<xsl:param name="shade.verbatim" select="0"></xsl:param> - - -Description - -In the FO stylesheet, if this parameter is non-zero then the -shade.verbatim.style properties will be applied -to verbatim environments. - -In the HTML stylesheet, this parameter is now deprecated. Use -CSS instead. - - - - - - -shade.verbatim.style -attribute set - - -shade.verbatim.style -Properties that specify the style of shaded verbatim listings - - - - - -<xsl:attribute-set name="shade.verbatim.style"> - <xsl:attribute name="background-color">#E0E0E0</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties that specify the style of shaded verbatim listings. The -parameters specified (the border and background color) are added to -the styling of the xsl-fo output. A border might be specified as "thin -black solid" for example. See xsl-fo - - - - - - -hyphenate.verbatim -boolean - - -hyphenate.verbatim -Should verbatim environments be hyphenated on space characters? - - - -<xsl:param name="hyphenate.verbatim" select="0"></xsl:param> - - -Description - -If the lines of program listing are too long to fit into one -line it is quite common to split them at space and indicite by hook -arrow that code continues on the next line. You can turn on this -behaviour for programlisting, -screen and synopsis elements by -using this parameter. - -Note that you must also enable line wrapping for verbatim environments and -select appropriate hyphenation character (e.g. hook arrow). This can -be done using monospace.verbatim.properties -attribute set: - -<xsl:attribute-set name="monospace.verbatim.properties" - use-attribute-sets="verbatim.properties monospace.properties"> - <xsl:attribute name="wrap-option">wrap</xsl:attribute> - <xsl:attribute name="hyphenation-character">&#x25BA;</xsl:attribute> -</xsl:attribute-set> - -For a list of arrows available in Unicode see http://www.unicode.org/charts/PDF/U2190.pdf and http://www.unicode.org/charts/PDF/U2900.pdf and make sure that -selected character is available in the font you are using for verbatim -environments. - - - - - - -hyphenate.verbatim.characters -string - - -hyphenate.verbatim.characters -List of characters after which a line break can occur in listings - - - - -<xsl:param name="hyphenate.verbatim.characters"></xsl:param> - - - -Description - -If you enable hyphenate.verbatim line -breaks are allowed only on space characters. If this is not enough for -your document, you can specify list of additional characters after -which line break is allowed in this parameter. - - - - - - -use.svg -boolean - - -use.svg -Allow SVG in the result tree? - - - - -<xsl:param name="use.svg" select="1"></xsl:param> - - - -Description - -If non-zero, SVG will be considered an acceptable image format. SVG -is passed through to the result tree, so correct rendering of the resulting -diagram depends on the formatter (FO processor or web browser) that is used -to process the output from the stylesheet. - - - - - - -use.role.as.xrefstyle -boolean - - -use.role.as.xrefstyle -Use role attribute for -xrefstyle on xref? - - - - -<xsl:param name="use.role.as.xrefstyle" select="1"></xsl:param> - - - -Description - -In DocBook documents that conform to a schema older than V4.3, this parameter allows -role to serve the purpose of specifying the cross reference style. - -If non-zero, the role attribute on -xref will be used to select the cross reference style. -In DocBook V4.3, the xrefstyle attribute was added for this purpose. -If the xrefstyle attribute is present, -role will be ignored, regardless of the setting -of this parameter. - - - -Example - -The following small stylesheet shows how to configure the -stylesheets to make use of the cross reference style: - -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - -<xsl:import href="../xsl/html/docbook.xsl"/> - -<xsl:output method="html"/> - -<xsl:param name="local.l10n.xml" select="document('')"/> -<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> - <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en"> - <l:context name="xref"> - <l:template name="chapter" style="title" text="Chapter %n, %t"/> - <l:template name="chapter" text="Chapter %n"/> - </l:context> - </l:l10n> -</l:i18n> - -</xsl:stylesheet> - -With this stylesheet, the cross references in the following document: - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> -<book id="book"><title>Book</title> - -<preface> -<title>Preface</title> - -<para>Normal: <xref linkend="ch1"/>.</para> -<para>Title: <xref xrefstyle="title" linkend="ch1"/>.</para> - -</preface> - -<chapter id="ch1"> -<title>First Chapter</title> - -<para>Irrelevant.</para> - -</chapter> -</book> - -will appear as: - - -Normal: Chapter 1. -Title: Chapter 1, First Chapter. - - - - - - - -menuchoice.separator -string - - -menuchoice.separator -Separator between items of a menuchoice -other than guimenuitem and -guisubmenu - - - - -<xsl:param name="menuchoice.separator">+</xsl:param> - - - -Description - -Separator used to connect items of a menuchoice other -than guimenuitem and guisubmenu. The latter -elements are linked with menuchoice.menu.separator. - - - - - - - -menuchoice.menu.separator -string - - -menuchoice.menu.separator -Separator between items of a menuchoice -with guimenuitem or -guisubmenu - - - - -<xsl:param name="menuchoice.menu.separator"> → </xsl:param> - - - -Description - -Separator used to connect items of a menuchoice with -guimenuitem or guisubmenu. Other elements -are linked with menuchoice.separator. - -The default value is &#x2192;, which is the -&rarr; (right arrow) character entity. -The current FOP (0.20.5) requires setting the font-family -explicitly. - -The default value also includes spaces around the arrow, -which will allow a line to break. Replace the spaces with -&#xA0; (nonbreaking space) if you don't want those -spaces to break. - - - - - - - -default.float.class -string - - -default.float.class -Specifies the default float class - - - - -<xsl:param name="default.float.class"> - <xsl:choose> - <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when> - <xsl:otherwise>before</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -Selects the direction in which a float should be placed. for -xsl-fo this is before, for html it is left. For Western texts, the -before direction is the top of the page. - - - - - - -footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -footnote.number.format -Identifies the format used for footnote numbers - - - - -<xsl:param name="footnote.number.format">1</xsl:param> - - - -Description - -The footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A). - - - - - - -table.footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -table.footnote.number.format -Identifies the format used for footnote numbers in tables - - - - -<xsl:param name="table.footnote.number.format">a</xsl:param> - - - -Description - -The table.footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A) in tables. - - - - - - -footnote.number.symbols - - - -footnote.number.symbols -Special characters to use as footnote markers - - - - -<xsl:param name="footnote.number.symbols"></xsl:param> - - - -Description - -If footnote.number.symbols is not the empty string, -footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, , , -, and . If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - - - - -table.footnote.number.symbols -string - - -table.footnote.number.symbols -Special characters to use a footnote markers in tables - - - - -<xsl:param name="table.footnote.number.symbols"></xsl:param> - - - -Description - -If table.footnote.number.symbols is not the empty string, -table footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, , , -, and . If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -table.footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - - - - -footnote.properties -attribute set - - -footnote.properties -Properties applied to each footnote body - - - - - -<xsl:attribute-set name="footnote.properties"> - <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"></xsl:value-of></xsl:attribute> - <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"></xsl:value-of></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:value-of></xsl:attribute> - <xsl:attribute name="start-indent">0pt</xsl:attribute> - <xsl:attribute name="text-indent">0pt</xsl:attribute> - <xsl:attribute name="hyphenate"><xsl:value-of select="$hyphenate"></xsl:value-of></xsl:attribute> - <xsl:attribute name="wrap-option">wrap</xsl:attribute> - <xsl:attribute name="linefeed-treatment">treat-as-space</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the footnote-block -for each footnote. -It can be used to set the -font-size, font-family, and other inheritable properties that will be -applied to all footnotes. - - - - - - -table.footnote.properties -attribute set - - -table.footnote.properties -Properties applied to each table footnote body - - - - - -<xsl:attribute-set name="table.footnote.properties"> - <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"></xsl:value-of></xsl:attribute> - <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"></xsl:value-of></xsl:attribute> - <xsl:attribute name="font-weight">normal</xsl:attribute> - <xsl:attribute name="font-style">normal</xsl:attribute> - <xsl:attribute name="space-before">2pt</xsl:attribute> - <xsl:attribute name="text-align"><xsl:value-of select="$alignment"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the footnote-block -for each table footnote. -It can be used to set the -font-size, font-family, and other inheritable properties that will be -applied to all table footnotes. - - - - - - -footnote.mark.properties -attribute set - - -footnote.mark.properties -Properties applied to each footnote mark - - - - - -<xsl:attribute-set name="footnote.mark.properties"> - <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"></xsl:value-of></xsl:attribute> - <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> - - - -Description - -This attribute set is applied to the footnote mark used -for each footnote. -It should contain only inline properties. - - -The property to make the mark a superscript is contained in the -footnote template itself, because the current version of FOP reports -an error if baseline-shift is used. - - - - - - - -footnote.sep.leader.properties -attribute set - - -footnote.sep.leader.properties -Properties associated with footnote separators - - - - -<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> - - - -Description - -The styling for the rule line that separates the -footnotes from the body text. -These are properties applied to the fo:leader used as -the separator. - -If you want to do more than just set properties on -the leader element, then you can customize the template -named footnote.separator in -fo/pagesetup.xsl. - - - - - - -xref.with.number.and.title -boolean - - -xref.with.number.and.title -Use number and title in cross references - - - - -<xsl:param name="xref.with.number.and.title" select="1"></xsl:param> - - - -Description - -A cross reference may include the number (for example, the number of -an example or figure) and the title which is a required child of some -targets. This parameter inserts both the relevant number as well as -the title into the link. - - - - - - -superscript.properties -attribute set - - -superscript.properties -Properties associated with superscripts - - - - -<xsl:attribute-set name="superscript.properties"> - <xsl:attribute name="font-size">75%</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Specifies styling properties for superscripts. - - - - - - -subscript.properties -attribute set - - -subscript.properties -Properties associated with subscripts - - - - -<xsl:attribute-set name="subscript.properties"> - <xsl:attribute name="font-size">75%</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Specifies styling properties for subscripts. - - - - - - -pgwide.properties -attribute set - - -pgwide.properties -Properties to make a figure or table page wide. - - - - - -<xsl:attribute-set name="pgwide.properties"> - <xsl:attribute name="start-indent">0pt</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is used to set the properties -that make a figure or table "page wide" in fo output. -It comes into effect when an attribute pgwide="1" -is used. - - - -By default, it sets start-indent -to 0pt. -In a stylesheet that sets the parameter -body.start.indent -to a non-zero value in order to indent body text, -this attribute set can be used to outdent pgwide -figures to the start margin. - - -If a document uses a multi-column page layout, -then this attribute set could try setting span -to a value of all. However, this may -not work with some processors because a span property must be on an -fo:block that is a direct child of fo:flow. It may work in -some processors anyway. - - - - - - - -highlight.source -boolean - - -highlight.source -Should the content of programlisting -be syntactically highlighted? - - - - -<xsl:param name="highlight.source" select="0"></xsl:param> - - - -Description - -When this parameter is non-zero, the stylesheets will try to do syntax highlighting of the -content of programlisting elements. You specify the language for each programlisting -by using the language attribute. The highlight.default.language -parameter can be used to specify the language for programlistings without a language -attribute. Syntax highlighting also works for screen and synopsis elements. - -The actual highlighting work is done by the XSLTHL extension module. This is an external Java library that has to be -downloaded separately (see below). - - -In order to use this extension, you must - -add xslthl-2.x.x.jar to your Java classpath. The latest version is available -from the XSLT syntax highlighting project -at SourceForge. - - -use a customization layer in which you import one of the following stylesheet modules: - - - html/highlight.xsl - - - - xhtml/highlight.xsl - - - - xhtml-1_1/highlight.xsl - - - - fo/highlight.xsl - - - - - -let either the xslthl.config Java system property or the -highlight.xslthl.config parameter point to the configuration file for syntax -highlighting (using URL syntax). DocBook XSL comes with a ready-to-use configuration file, -highlighting/xslthl-config.xml. - - - -The extension works with Saxon 6.5.x and Xalan-J. (Saxon 8.5 or later is also supported, but since it is -an XSLT 2.0 processor it is not guaranteed to work with DocBook XSL in all circumstances.) - -The following is an example of a Saxon 6 command adapted for syntax highlighting, to be used on Windows: - - -java -cp c:/Java/saxon.jar;c:/Java/xslthl-2.0.1.jar --Dxslthl.config=file:///c:/docbook-xsl/highlighting/xslthl-config.xml com.icl.saxon.StyleSheet --o test.html test.xml myhtml.xsl - - - - - - - -highlight.xslthl.config -uri - - -highlight.xslthl.config -Location of XSLTHL configuration file - - - - -<xsl:param name="highlight.xslthl.config"></xsl:param> - - - -Description - -This location has precedence over the corresponding Java property. - -Please note that usually you have to specify location as URL not -just as a simple path on the local -filesystem. E.g. file:///home/user/xslthl/my-xslthl-config.xml. - - - - - - - - -highlight.default.language -string - - -highlight.default.language -Default language of programlisting - - - - -<xsl:param name="highlight.default.language"></xsl:param> - - - -Description - -This language is used when there is no language attribute on programlisting. - - - - - - -email.delimiters.enabled -boolean - - -email.delimiters.enabled -Generate delimiters around email addresses? - - - - -<xsl:param name="email.delimiters.enabled" select="1"></xsl:param> - - - -Description - -If non-zero, delimiters - -For delimiters, the -stylesheets are currently hard-coded to output angle -brackets. - -are generated around e-mail addresses -(the output of the email element). - - - - - - -email.mailto.enabled -boolean - - -email.mailto.enabled -Generate mailto: links for email addresses? - - - - -<xsl:param name="email.mailto.enabled" select="0"></xsl:param> - - - -Description - -If non-zero the generated output for the email element -will be a clickable mailto: link that brings up the default mail client -on the system. - - - - - - -section.container.element -list -block -wrapper - - -section.container.element -Select XSL-FO element name to contain sections - - - - -<xsl:param name="section.container.element">block</xsl:param> - - - -Description - -Selects the element name for outer container of -each section. The choices are block (default) -or wrapper. -The fo: namespace prefix is added -by the stylesheet to form the full element name. - - -This element receives the section id -attribute and the appropriate section level attribute-set. - - -Changing this parameter to wrapper -is only necessary when producing multi-column output -that contains page-wide spans. Using fo:wrapper -avoids the nesting of fo:block -elements that prevents spans from working (the standard says -a span must be on a block that is a direct child of -fo:flow). - - -If set to wrapper, the -section attribute-sets only support properties -that are inheritable. That's because there is no -block to apply them to. Properties such as -font-family are inheritable, but properties such as -border are not. - - -Only some XSL-FO processors need to use this parameter. -The Antenna House processor, for example, will handle -spans in nested blocks without changing the element name. -The RenderX XEP product and FOP follow the XSL-FO standard -and need to use wrapper. - - - - - - - -monospace.verbatim.font.width -length - - -monospace.verbatim.font.width -Width of a single monospace font character - - - - -<xsl:param name="monospace.verbatim.font.width">0.60em</xsl:param> - - - -Description - -Specifies with em units the width of a single character -of the monospace font. The default value is 0.6em. - -This parameter is only used when a screen -or programlisting element has a -width attribute, which is -expressed as a plain integer to indicate the maximum character count -of each line. -To convert this character count to an actual maximum width -measurement, the width of the font characters must be provided. -Different monospace fonts have different character width, -so this parameter should be adjusted to fit the -monospace font being used. - - - - - - - -exsl.node.set.available -boolean - - -exsl.node.set.available -Is the test function-available('exsl:node-set') true? - - - -<xsl:param name="exsl.node.set.available"> - <xsl:choose> - <xsl:when exsl:foo="" test="function-available('exsl:node-set') or contains(system-property('xsl:vendor'), 'Apache Software Foundation')">1</xsl:when> - <xsl:otherwise>0</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -If non-zero, -then the exsl:node-set() function is available to be used in -the stylesheet. -If zero, then the function is not available. -This param automatically detects the presence of -the function and does not normally need to be set manually. - -This param was created to handle a long-standing -bug in the Xalan processor that fails to detect the -function even though it is available. - - - - - - -bookmarks.collapse -boolean - - -bookmarks.collapse -Specifies the initial state of bookmarks - - - - -<xsl:param name="bookmarks.collapse" select="1"></xsl:param> - - - -Description - -If non-zero, the bookmark tree is collapsed so that only the -top-level bookmarks are displayed initially. Otherwise, the whole tree -of bookmarks is displayed. - -This parameter currently works with FOP 0.93 or later. - - - - -Graphics - - -graphic.default.extension -string - - -graphic.default.extension -Default extension for graphic filenames - - - -<xsl:param name="graphic.default.extension"></xsl:param> - - -Description - -If a graphic or mediaobject -includes a reference to a filename that does not include an extension, -and the format attribute is -unspecified, the default extension will be used. - - - - - - - -default.image.width -length - - -default.image.width -The default width of images - - - - -<xsl:param name="default.image.width"></xsl:param> - - - -Description - -If specified, this value will be used for the -width attribute on images that do not specify any -viewport dimensions. - - - - - - -preferred.mediaobject.role -string - - -preferred.mediaobject.role -Select which mediaobject to use based on -this value of an object's role attribute. - - - - - -<xsl:param name="preferred.mediaobject.role"></xsl:param> - - - -Description - -A mediaobject may contain several objects such as imageobjects. -If the parameter use.role.for.mediaobject is -non-zero, then the role attribute on -imageobjects and other objects within a -mediaobject container will be used to select which object -will be used. If one of the objects has a role value that matches the -preferred.mediaobject.role parameter, then it -has first priority for selection. If more than one has such a role -value, the first one is used. - - -See the use.role.for.mediaobject parameter -for the sequence of selection. - - - - - -use.role.for.mediaobject -boolean - - -use.role.for.mediaobject -Use role attribute -value for selecting which of several objects within a mediaobject to use. - - - - - -<xsl:param name="use.role.for.mediaobject" select="1"></xsl:param> - - - -Description - -If non-zero, the role attribute on -imageobjects or other objects within a mediaobject container will be used to select which object will be -used. - - -The order of selection when then parameter is non-zero is: - - - - If the stylesheet parameter preferred.mediaobject.role has a value, then the object whose role equals that value is selected. - - -Else if an object's role attribute has a value of -html for HTML processing or -fo for FO output, then the first -of such objects is selected. - - - -Else the first suitable object is selected. - - - -If the value of -use.role.for.mediaobject -is zero, then role attributes are not considered -and the first suitable object -with or without a role value is used. - - - - - - -ignore.image.scaling -boolean - - -ignore.image.scaling -Tell the stylesheets to ignore the author's image scaling attributes - - - - -<xsl:param name="ignore.image.scaling" select="0"></xsl:param> - - - -Description - -If non-zero, the scaling attributes on graphics and media objects are -ignored. - - - - - - -img.src.path -string - - -img.src.path -Path to HTML/FO image files - - - -<xsl:param name="img.src.path"></xsl:param> - - -Description - -Add a path prefix to the value of the fileref -attribute of graphic, inlinegraphic, and imagedata elements. The resulting -compound path is used in the output as the value of the src -attribute of img (HTML) or external-graphic (FO). - - - -The path given by img.src.path could be relative to the directory where the HTML/FO -files are created, or it could be an absolute URI. -The default value is empty. -Be sure to include a trailing slash if needed. - - -This prefix is not applied to any filerefs that start -with "/" or contain "//:". - - - - - - - -keep.relative.image.uris -boolean - - -keep.relative.image.uris -Should image URIs be resolved against xml:base? - - - - - -<xsl:param name="keep.relative.image.uris" select="0"></xsl:param> - - - -Description - -If non-zero, relative URIs (in, for example -fileref attributes) will be used in the generated -output. Otherwise, the URIs will be made absolute with respect to the -base URI. - -Note that the stylesheets calculate (and use) the absolute form -for some purposes, this only applies to the resulting output. - - - - -Pagination and General Styles - -
    Understanding XSL FO Margins - -To make sense of the parameters in this section, it's useful to -consider . - -
    - Page Model - - - - - - - - Figure showing page margins - - This figure shows the physical page with the various FO page regions - identified. - - -
    - -First, let's consider the regions on the page. - -The white region is the physical page. Its dimensions are determined by -the page.height and page.width -parameters. - -The yellow region is the region-body. The size and placement of -the region body is constrained by the dimensions labelled in the -figure. - -The pink region at the top of the page is the region-before. The -darker area inside the region-before is the header text. In XSL, the default -display alignment for a region is before, but the -DocBook stylesheets still explicitly make it before. That's -why the darker area is at the top. - -The pink region at the bottom of the page is the region-after. -The darker area is the footer text. In XSL, the default display -alignment for a region is before, -but the DocBook stylesheets explicitly make it -after. That's why the darker area is at the bottom. - -The dimensions in the figure are: - - -The page-master margin-top. - -The region-before extent. - -The region-body margin-top. - -The region-after extent. - -The page-master margin-bottom. - -The region-body margin-bottom. - -The sum of the page-master margin-left and the -region-body margin-left. In DocBook, the region-body margin-left is -zero by default, so this is simply the page-master margin-left. - -The sum of the page-master margin-right and the -region-body margin-right. In DocBook, the region-body margin-right is -zero by default, so this is simply the page-master margin-right. - - - -
    -
    - - - -page.height -length - - -page.height -The height of the physical page - - - -<xsl:param name="page.height"> - <xsl:choose> - <xsl:when test="$page.orientation = 'portrait'"> - <xsl:value-of select="$page.height.portrait"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$page.width.portrait"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The page height is generally calculated from the -paper.type and -page.orientation parameters. - - - - - - - -page.height.portrait -length - - -page.height.portrait -Specify the physical size of the long edge of the page - - - -<xsl:param name="page.height.portrait"> - <xsl:choose> - <xsl:when test="$paper.type = 'A4landscape'">210mm</xsl:when> - <xsl:when test="$paper.type = 'USletter'">11in</xsl:when> - <xsl:when test="$paper.type = 'USlandscape'">8.5in</xsl:when> - <xsl:when test="$paper.type = '4A0'">2378mm</xsl:when> - <xsl:when test="$paper.type = '2A0'">1682mm</xsl:when> - <xsl:when test="$paper.type = 'A0'">1189mm</xsl:when> - <xsl:when test="$paper.type = 'A1'">841mm</xsl:when> - <xsl:when test="$paper.type = 'A2'">594mm</xsl:when> - <xsl:when test="$paper.type = 'A3'">420mm</xsl:when> - <xsl:when test="$paper.type = 'A4'">297mm</xsl:when> - <xsl:when test="$paper.type = 'A5'">210mm</xsl:when> - <xsl:when test="$paper.type = 'A6'">148mm</xsl:when> - <xsl:when test="$paper.type = 'A7'">105mm</xsl:when> - <xsl:when test="$paper.type = 'A8'">74mm</xsl:when> - <xsl:when test="$paper.type = 'A9'">52mm</xsl:when> - <xsl:when test="$paper.type = 'A10'">37mm</xsl:when> - <xsl:when test="$paper.type = 'B0'">1414mm</xsl:when> - <xsl:when test="$paper.type = 'B1'">1000mm</xsl:when> - <xsl:when test="$paper.type = 'B2'">707mm</xsl:when> - <xsl:when test="$paper.type = 'B3'">500mm</xsl:when> - <xsl:when test="$paper.type = 'B4'">353mm</xsl:when> - <xsl:when test="$paper.type = 'B5'">250mm</xsl:when> - <xsl:when test="$paper.type = 'B6'">176mm</xsl:when> - <xsl:when test="$paper.type = 'B7'">125mm</xsl:when> - <xsl:when test="$paper.type = 'B8'">88mm</xsl:when> - <xsl:when test="$paper.type = 'B9'">62mm</xsl:when> - <xsl:when test="$paper.type = 'B10'">44mm</xsl:when> - <xsl:when test="$paper.type = 'C0'">1297mm</xsl:when> - <xsl:when test="$paper.type = 'C1'">917mm</xsl:when> - <xsl:when test="$paper.type = 'C2'">648mm</xsl:when> - <xsl:when test="$paper.type = 'C3'">458mm</xsl:when> - <xsl:when test="$paper.type = 'C4'">324mm</xsl:when> - <xsl:when test="$paper.type = 'C5'">229mm</xsl:when> - <xsl:when test="$paper.type = 'C6'">162mm</xsl:when> - <xsl:when test="$paper.type = 'C7'">114mm</xsl:when> - <xsl:when test="$paper.type = 'C8'">81mm</xsl:when> - <xsl:when test="$paper.type = 'C9'">57mm</xsl:when> - <xsl:when test="$paper.type = 'C10'">40mm</xsl:when> - <xsl:otherwise>11in</xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The portrait page height is the length of the long -edge of the physical page. - - - - - - - -page.margin.bottom -length - - -page.margin.bottom -The bottom margin of the page - - - - -<xsl:param name="page.margin.bottom">0.5in</xsl:param> - - - -Description - -The bottom page margin is the distance from the bottom of the region-after -to the physical bottom of the page. - - - - - - - -page.margin.inner -length - - -page.margin.inner -The inner page margin - - - -<xsl:param name="page.margin.inner"> - <xsl:choose> - <xsl:when test="$double.sided != 0">1.25in</xsl:when> - <xsl:otherwise>1in</xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The inner page margin is the distance from bound edge of the -page to the first column of text. - -The inner page margin is the distance from bound edge of the -page to the outer edge of the first column of text. - -In left-to-right text direction, -this is the left margin of recto (front side) pages. -For single-sided output, it is the left margin -of all pages. - -In right-to-left text direction, -this is the right margin of recto pages. -For single-sided output, this is the -right margin of all pages. - - -Current versions (at least as of version 4.13) -of the XEP XSL-FO processor do not -correctly handle these margin settings for documents -with right-to-left text direction. -The workaround in that situation is to reverse -the values for page.margin.inner -and page.margin.outer, until -this bug is fixed by RenderX. It does not affect documents -with left-to-right text direction. - - - - - - - -page.margin.outer -length - - -page.margin.outer -The outer page margin - - - -<xsl:param name="page.margin.outer"> - <xsl:choose> - <xsl:when test="$double.sided != 0">0.75in</xsl:when> - <xsl:otherwise>1in</xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The outer page margin is the distance from non-bound edge of the -page to the outer edge of the last column of text. - -In left-to-right text direction, -this is the right margin of recto (front side) pages. -For single-sided output, it is the right margin -of all pages. - -In right-to-left text direction, -this is the left margin of recto pages. -For single-sided output, this is the -left margin of all pages. - - -Current versions (at least as of version 4.13) -of the XEP XSL-FO processor do not -correctly handle these margin settings for documents -with right-to-left text direction. -The workaround in that situation is to reverse -the values for page.margin.inner -and page.margin.outer, until -this bug is fixed by RenderX. It does not affect documents -with left-to-right text direction. - - - - - - - -page.margin.top -length - - -page.margin.top -The top margin of the page - - - - -<xsl:param name="page.margin.top">0.5in</xsl:param> - - - -Description - -The top page margin is the distance from the physical top of the -page to the top of the region-before. - - - - - - -page.orientation -list -portrait -landscape - - -page.orientation -Select the page orientation - - - - -<xsl:param name="page.orientation">portrait</xsl:param> - - - -Description - - Select one from portrait or landscape. -In portrait orientation, the short edge is horizontal; in -landscape orientation, it is vertical. - - - - - - - -page.width -length - - -page.width -The width of the physical page - - - -<xsl:param name="page.width"> - <xsl:choose> - <xsl:when test="$page.orientation = 'portrait'"> - <xsl:value-of select="$page.width.portrait"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$page.height.portrait"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The page width is generally calculated from the -paper.type and -page.orientation parameters. - - - - - - -page.width.portrait -length - - -page.width.portrait -Specify the physical size of the short edge of the page - - - -<xsl:param name="page.width.portrait"> - <xsl:choose> - <xsl:when test="$paper.type = 'USletter'">8.5in</xsl:when> - <xsl:when test="$paper.type = '4A0'">1682mm</xsl:when> - <xsl:when test="$paper.type = '2A0'">1189mm</xsl:when> - <xsl:when test="$paper.type = 'A0'">841mm</xsl:when> - <xsl:when test="$paper.type = 'A1'">594mm</xsl:when> - <xsl:when test="$paper.type = 'A2'">420mm</xsl:when> - <xsl:when test="$paper.type = 'A3'">297mm</xsl:when> - <xsl:when test="$paper.type = 'A4'">210mm</xsl:when> - <xsl:when test="$paper.type = 'A5'">148mm</xsl:when> - <xsl:when test="$paper.type = 'A6'">105mm</xsl:when> - <xsl:when test="$paper.type = 'A7'">74mm</xsl:when> - <xsl:when test="$paper.type = 'A8'">52mm</xsl:when> - <xsl:when test="$paper.type = 'A9'">37mm</xsl:when> - <xsl:when test="$paper.type = 'A10'">26mm</xsl:when> - <xsl:when test="$paper.type = 'B0'">1000mm</xsl:when> - <xsl:when test="$paper.type = 'B1'">707mm</xsl:when> - <xsl:when test="$paper.type = 'B2'">500mm</xsl:when> - <xsl:when test="$paper.type = 'B3'">353mm</xsl:when> - <xsl:when test="$paper.type = 'B4'">250mm</xsl:when> - <xsl:when test="$paper.type = 'B5'">176mm</xsl:when> - <xsl:when test="$paper.type = 'B6'">125mm</xsl:when> - <xsl:when test="$paper.type = 'B7'">88mm</xsl:when> - <xsl:when test="$paper.type = 'B8'">62mm</xsl:when> - <xsl:when test="$paper.type = 'B9'">44mm</xsl:when> - <xsl:when test="$paper.type = 'B10'">31mm</xsl:when> - <xsl:when test="$paper.type = 'C0'">917mm</xsl:when> - <xsl:when test="$paper.type = 'C1'">648mm</xsl:when> - <xsl:when test="$paper.type = 'C2'">458mm</xsl:when> - <xsl:when test="$paper.type = 'C3'">324mm</xsl:when> - <xsl:when test="$paper.type = 'C4'">229mm</xsl:when> - <xsl:when test="$paper.type = 'C5'">162mm</xsl:when> - <xsl:when test="$paper.type = 'C6'">114mm</xsl:when> - <xsl:when test="$paper.type = 'C7'">81mm</xsl:when> - <xsl:when test="$paper.type = 'C8'">57mm</xsl:when> - <xsl:when test="$paper.type = 'C9'">40mm</xsl:when> - <xsl:when test="$paper.type = 'C10'">28mm</xsl:when> - <xsl:otherwise>8.5in</xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The portrait page width is the length of the short -edge of the physical page. - - - - - - - -paper.type -list -open -open -USletter8.5x11in -USlandscape11x8.5in -USlegal8.5inx14in -USlegallandscape14inx8.5in -4A02378x1682mm -2A01682x1189mm -A01189x841mm -A1841x594mm -A2594x420mm -A3420x297mm -A4297x210mm -A5210x148mm -A6148x105mm -A7105x74mm -A874x52mm -A952x37mm -A1037x26mm -B01414x1000mm -B11000x707mm -B2707x500mm -B3500x353mm -B4353x250mm -B5250x176mm -B6176x125mm -B7125x88mm -B888x62mm -B962x44mm -B1044x31mm -C01297x917mm -C1917x648mm -C2648x458mm -C3458x324mm -C4324x229mm -C5229x162mm -C6162x114mm -C7114x81mm -C881x57mm -C957x40mm -C1040x28mm - - -paper.type -Select the paper type - - - - -<xsl:param name="paper.type">USletter</xsl:param> - - - -Description - -The paper type is a convenient way to specify the paper size. -The list of known paper sizes includes USletter and most of the A, -B, and C sizes. See page.width.portrait, for example. - - - - - - - - - -double.sided -boolean - - -double.sided -Is the document to be printed double sided? - - - - -<xsl:param name="double.sided" select="0"></xsl:param> - - - -Description - -Double-sided documents are printed with a slightly wider margin -on the binding edge of the page. - -FIXME: The current set of parameters does not take writing direction -into account. - - - - - - -body.margin.bottom -length - - -body.margin.bottom -The bottom margin of the body text - - - - -<xsl:param name="body.margin.bottom">0.5in</xsl:param> - - - -Description - -The body bottom margin is the distance from the last line of text -in the page body to the bottom of the region-after. - - - - - - - -body.margin.top -length - - -body.margin.top -To specify the size of the top margin of a page - - - - -<xsl:param name="body.margin.top">0.5in</xsl:param> - - - -Description - -The body top margin is the distance from the top of the -region-before to the first line of text in the page body. - - - - - - -body.start.indent -length - - -body.start.indent -The start-indent for the body text - - - - -<xsl:param name="body.start.indent"> - <xsl:choose> - <xsl:when test="$fop.extensions != 0">0pt</xsl:when> - <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when> - <xsl:otherwise>4pc</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -This parameter provides -the means of indenting the body text relative to -section titles. -For left-to-right text direction, it indents the left side. -For right-to-left text direction, it indents the right side. -It is used in place of the -title.margin.left for -all XSL-FO processors except FOP 0.25. -It enables support for side floats to appear -in the indented margin area. - -This start-indent property is added to the fo:flow -for certain page sequences. Which page-sequences it is -applied to is determined by the template named -set.flow.properties. -By default, that template adds it to the flow -for page-sequences using the body -master-reference, as well as appendixes and prefaces. - -If this parameter is used, section titles should have -a start-indent value of 0pt if they are to be -outdented relative to the body text. - - -If you are using FOP, then set this parameter to a zero -width value and set the title.margin.left -parameter to the negative value of the desired indent. - - -See also body.end.indent and -title.margin.left. - - - - - - - -body.end.indent -length - - -body.end.indent -The end-indent for the body text - - - - -<xsl:param name="body.end.indent">0pt</xsl:param> - - - -Description - -This end-indent property is added to the fo:flow -for certain page sequences. Which page-sequences it is -applied to is determined by the template named -set.flow.properties. -By default, that template adds it to the flow -for page-sequences using the body -master-reference, as well as appendixes and prefaces. - - -See also body.start.indent. - - - - - - - -alignment - list - open - left - start - right - end - center - justify - - -alignment -Specify the default text alignment - - - -<xsl:param name="alignment">justify</xsl:param> - - -Description - -The default text alignment is used for most body text. -Allowed values are -left, -right, -start, -end, -center, -justify. -The default value is justify. - - - - - - - -hyphenate -list -closed -true -false - - -hyphenate -Specify hyphenation behavior - - - -<xsl:param name="hyphenate">true</xsl:param> - - -Description - -If true, words may be hyphenated. Otherwise, they may not. - - - - - - - -line-height -string - - -line-height -Specify the line-height property - - - - -<xsl:param name="line-height">normal</xsl:param> - - - -Description - -Sets the line-height property. - - - - - - -column.count.back -integer - - -column.count.back -Number of columns on back matter pages - - - - -<xsl:param name="column.count.back" select="1"></xsl:param> - - - -Description - -Number of columns on back matter (appendix, glossary, etc.) pages. - - - - - - -column.count.body -integer - - -column.count.body -Number of columns on body pages - - - - -<xsl:param name="column.count.body" select="1"></xsl:param> - - - -Description - -Number of columns on body pages. - - - - - - -column.count.front -integer - - -column.count.front -Number of columns on front matter pages - - - - -<xsl:param name="column.count.front" select="1"></xsl:param> - - - -Description - -Number of columns on front matter (dedication, preface, etc.) pages. - - - - - - -column.count.index -integer - - -column.count.index -Number of columns on index pages - - - - -<xsl:param name="column.count.index">2</xsl:param> - - - -Description - -Number of columns on index pages. - - - - - - -column.count.lot -integer - - -column.count.lot -Number of columns on a 'List-of-Titles' page - - - - -<xsl:param name="column.count.lot" select="1"></xsl:param> - - - -Description - -Number of columns on a page sequence containing the Table of Contents, -List of Figures, etc. - - - - - - -column.count.titlepage -integer - - -column.count.titlepage -Number of columns on a title page - - - - -<xsl:param name="column.count.titlepage" select="1"></xsl:param> - - - -Description - -Number of columns on a title page - - - - - - -column.gap.back -length - - -column.gap.back -Gap between columns in back matter - - - - -<xsl:param name="column.gap.back">12pt</xsl:param> - - - -Description - -Specifies the gap between columns in back matter (if -column.count.back is greater than one). - - - - - - -column.gap.body -length - - -column.gap.body -Gap between columns in the body - - - - -<xsl:param name="column.gap.body">12pt</xsl:param> - - - -Description - -Specifies the gap between columns in body matter (if -column.count.body is greater than one). - - - - - - -column.gap.front -length - - -column.gap.front -Gap between columns in the front matter - - - - -<xsl:param name="column.gap.front">12pt</xsl:param> - - - -Description - -Specifies the gap between columns in front matter (if -column.count.front is greater than one). - - - - - - -column.gap.index -length - - -column.gap.index -Gap between columns in the index - - - - -<xsl:param name="column.gap.index">12pt</xsl:param> - - - -Description - -Specifies the gap between columns in indexes (if -column.count.index is greater than one). - - - - - - -column.gap.lot -length - - -column.gap.lot -Gap between columns on a 'List-of-Titles' page - - - - -<xsl:param name="column.gap.lot">12pt</xsl:param> - - - -Description - -Specifies the gap between columns on 'List-of-Titles' pages (if -column.count.lot is greater than one). - - - - - - -column.gap.titlepage -length - - -column.gap.titlepage -Gap between columns on title pages - - - - -<xsl:param name="column.gap.titlepage">12pt</xsl:param> - - - -Description - -Specifies the gap between columns on title pages (if -column.count.titlepage is greater than one). - - - - - - - -region.after.extent -length - - -region.after.extent -Specifies the height of the footer. - - - - -<xsl:param name="region.after.extent">0.4in</xsl:param> - - - -Description - -The region after extent is the height of the area where footers -are printed. - - - - - - - -region.before.extent -length - - -region.before.extent -Specifies the height of the header - - - - -<xsl:param name="region.before.extent">0.4in</xsl:param> - - - -Description - -The region before extent is the height of the area where headers -are printed. - - - - - - - -default.units -list -cm -mm -in -pt -pc -px -em - - -default.units -Default units for an unqualified dimension - - - - -<xsl:param name="default.units">pt</xsl:param> - - - -Description - -If an unqualified dimension is encountered (for example, in a -graphic width), the default.units will be used for the -units. Unqualified dimensions are not allowed in XSL Formatting Objects. - - - - - - - -normal.para.spacing -attribute set - - -normal.para.spacing -What space do you want between normal paragraphs - - - -<xsl:attribute-set name="normal.para.spacing"> - <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-set> - -Description -Specify the spacing required between normal paragraphs - - - - - -body.font.master - number - - -body.font.master -Specifies the default point size for body text - - - - -<xsl:param name="body.font.master">10</xsl:param> - - - -Description - -The body font size is specified in two parameters -(body.font.master and body.font.size) -so that math can be performed on the font size by XSLT. - - - - - - - -body.font.size -length - - -body.font.size -Specifies the default font size for body text - - - - -<xsl:param name="body.font.size"> - <xsl:value-of select="$body.font.master"></xsl:value-of><xsl:text>pt</xsl:text> -</xsl:param> - - -Description - -The body font size is specified in two parameters -(body.font.master and body.font.size) -so that math can be performed on the font size by XSLT. - - - - - - - -footnote.font.size -length - - -footnote.font.size -The font size for footnotes - - - -<xsl:param name="footnote.font.size"> - <xsl:value-of select="$body.font.master * 0.8"></xsl:value-of><xsl:text>pt</xsl:text> -</xsl:param> - - -Description - -The footnote font size is used for...footnotes! - - - - - - - -title.margin.left -length - - -title.margin.left -Adjust the left margin for titles - - - - -<xsl:param name="title.margin.left"> - <xsl:choose> - <xsl:when test="$fop.extensions != 0">-4pc</xsl:when> - <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when> - <xsl:otherwise>0pt</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -This parameter provides -the means of adjusting the left margin for titles -when the XSL-FO processor being used is -an old version of FOP (0.25 and earlier). -It is only useful when the fop.extensions -is nonzero. - -The left margin of the body region -is calculated to include this space, -and titles are outdented to the left outside -the body region by this amount, -effectively leaving titles at the intended left margin -and the body text indented. -Currently this method is only used for old FOP because -it cannot properly use the body.start.indent -parameter. - - -The default value when the fop.extensions -parameter is nonzero is -4pc, which means the -body text is indented 4 picas relative to -the titles. -The default value when the fop.extensions -parameter equals zero is 0pt, and -the body indent should instead be specified -using the body.start.indent -parameter. - - -If you set the value to zero, be sure to still include -a unit indicator such as 0pt, or -the FO processor will report errors. - - - - - - - -draft.mode -list -no -yes -maybe - - -draft.mode -Select draft mode - - - - -<xsl:param name="draft.mode">no</xsl:param> - - - -Description - -Selects draft mode. If draft.mode is -yes, the entire document will be treated -as a draft. If it is no, the entire document -will be treated as a final copy. If it is maybe, -individual sections will be treated as draft or final independently, depending -on how their status attribute is set. - - - - - - - -draft.watermark.image -uri - - -draft.watermark.image -The URI of the image to be used for draft watermarks - - - - -<xsl:param name="draft.watermark.image">images/draft.png</xsl:param> - - - -Description - -The image to be used for draft watermarks. - - - - - - -headers.on.blank.pages -boolean - - -headers.on.blank.pages -Put headers on blank pages? - - - - -<xsl:param name="headers.on.blank.pages" select="1"></xsl:param> - - - -Description - -If non-zero, headers will be placed on blank pages. - - - - - - -footers.on.blank.pages -boolean - - -footers.on.blank.pages -Put footers on blank pages? - - - - -<xsl:param name="footers.on.blank.pages" select="1"></xsl:param> - - - -Description - -If non-zero, footers will be placed on blank pages. - - - - - - -header.rule -boolean - - -header.rule -Rule under headers? - - - - -<xsl:param name="header.rule" select="1"></xsl:param> - - - -Description - -If non-zero, a rule will be drawn below the page headers. - - - - - - -footer.rule -boolean - - -footer.rule -Rule over footers? - - - - -<xsl:param name="footer.rule" select="1"></xsl:param> - - - -Description - -If non-zero, a rule will be drawn above the page footers. - - - - - - -header.column.widths -string - - -header.column.widths -Specify relative widths of header areas - - - -<xsl:param name="header.column.widths">1 1 1</xsl:param> - - -Description - -Page headers in print output use a three column table -to position text at the left, center, and right side of -the header on the page. -This parameter lets you specify the relative sizes of the -three columns. The default value is -"1 1 1". - -The parameter value must be three numbers, separated -by white space. The first number represents the relative -width of the inside header for -double-sided output. The second number is the relative -width of the center header. The third number is the -relative width of the outside header for -double-sided output. - -For single-sided output, the first number is the -relative width of left header for left-to-right -text direction, or the right header for right-to-left -text direction. -The third number is the -relative width of right header for left-to-right -text direction, or the left header for right-to-left -text direction. - -The numbers are used to specify the column widths -for the table that makes up the header area. -In the FO output, this looks like: - - - -<fo:table-column column-number="1" - column-width="proportional-column-width(1)"/> - - - -The proportional-column-width() -function computes a column width by dividing its -argument by the total of the arguments for all the columns, and -then multiplying the result by the width of the whole table -(assuming all the column specs use the function). -Its argument can be any positive integer or floating point number. -Zero is an acceptable value, although some FO processors -may warn about it, in which case using a very small number might -be more satisfactory. - - -For example, the value "1 2 1" means the center -header should have twice the width of the other areas. -A value of "0 0 1" means the entire header area -is reserved for the right (or outside) header text. -Note that to keep the center area centered on -the page, the left and right values must be -the same. A specification like "1 2 3" means the -center area is no longer centered on the page -since the right area is three times the width of the left area. - - - - - - - -footer.column.widths -string - - -footer.column.widths -Specify relative widths of footer areas - - - -<xsl:param name="footer.column.widths">1 1 1</xsl:param> - - -Description - -Page footers in print output use a three column table -to position text at the left, center, and right side of -the footer on the page. -This parameter lets you specify the relative sizes of the -three columns. The default value is -"1 1 1". - -The parameter value must be three numbers, separated -by white space. The first number represents the relative -width of the inside footer for -double-sided output. The second number is the relative -width of the center footer. The third number is the -relative width of the outside footer for -double-sided output. - -For single-sided output, the first number is the -relative width of left footer for left-to-right -text direction, or the right footer for right-to-left -text direction. -The third number is the -relative width of right footer for left-to-right -text direction, or the left footer for right-to-left -text direction. - -The numbers are used to specify the column widths -for the table that makes up the footer area. -In the FO output, this looks like: - - - -<fo:table-column column-number="1" - column-width="proportional-column-width(1)"/> - - - -The proportional-column-width() -function computes a column width by dividing its -argument by the total of the arguments for all the columns, and -then multiplying the result by the width of the whole table -(assuming all the column specs use the function). -Its argument can be any positive integer or floating point number. -Zero is an acceptable value, although some FO processors -may warn about it, in which case using a very small number might -be more satisfactory. - - -For example, the value "1 2 1" means the center -footer should have twice the width of the other areas. -A value of "0 0 1" means the entire footer area -is reserved for the right (or outside) footer text. -Note that to keep the center area centered on -the page, the left and right values must be -the same. A specification like "1 2 3" means the -center area is no longer centered on the page -since the right area is three times the width of the left area. - - - - - - - -header.table.properties -attribute set - - -header.table.properties -Apply properties to the header layout table - - - - -<xsl:attribute-set name="header.table.properties"> - <xsl:attribute name="table-layout">fixed</xsl:attribute> - <xsl:attribute name="width">100%</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties applied to the table that lays out the page header. - - - - - - -header.table.height -length - - -header.table.height -Specify the minimum height of the table containing the running page headers - - - -<xsl:param name="header.table.height">14pt</xsl:param> - - -Description - -Page headers in print output use a three column table -to position text at the left, center, and right side of -the header on the page. -This parameter lets you specify the minimum height -of the single row in the table. -Since this specifies only the minimum height, -the table should automatically grow to fit taller content. -The default value is "14pt". - - - - - - -footer.table.properties -attribute set - - -footer.table.properties -Apply properties to the footer layout table - - - - -<xsl:attribute-set name="footer.table.properties"> - <xsl:attribute name="table-layout">fixed</xsl:attribute> - <xsl:attribute name="width">100%</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties applied to the table that lays out the page footer. - - - - - - -footer.table.height -length - - -footer.table.height -Specify the minimum height of the table containing the running page footers - - - -<xsl:param name="footer.table.height">14pt</xsl:param> - - -Description - -Page footers in print output use a three column table -to position text at the left, center, and right side of -the footer on the page. -This parameter lets you specify the minimum height -of the single row in the table. -Since this specifies only the minimum height, -the table should automatically grow to fit taller content. -The default value is "14pt". - - - - - - -header.content.properties -attribute set - - -header.content.properties -Properties of page header content - - - - -<xsl:attribute-set name="header.content.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.fontset"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="margin-left"> - <xsl:value-of select="$title.margin.left"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties of page header content. - - - - - - -footer.content.properties -attribute set - - -footer.content.properties -Properties of page footer content - - - - -<xsl:attribute-set name="footer.content.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.fontset"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="margin-left"> - <xsl:value-of select="$title.margin.left"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties of page footer content. - - - - - - -marker.section.level -integer - - -marker.section.level -Control depth of sections shown in running headers or footers - - - - -<xsl:param name="marker.section.level">2</xsl:param> - - - -Description - -The marker.section.level parameter -controls the depth of section levels that may be displayed -in running headers and footers. For example, if the value -is 2 (the default), then titles from sect1 and -sect2 or equivalent section -elements are candidates for use in running headers and -footers. - -Each candidate title is marked in the FO output with a -<fo:marker marker-class-name="section.head.marker"> -element. - -In order for such titles to appear in headers -or footers, the header.content -or footer.content template -must be customized to retrieve the marker using -an output element such as: - - -<fo:retrieve-marker retrieve-class-name="section.head.marker" - retrieve-position="first-including-carryover" - retrieve-boundary="page-sequence"/> - - - - - - -
    Font Families - - -body.font.family -list -open -serif -sans-serif -monospace - - -body.font.family -The default font family for body text - - - - -<xsl:param name="body.font.family">serif</xsl:param> - - - -Description - -The body font family is the default font used for text in the page body. - - - - - - - -dingbat.font.family -list -open -serif -sans-serif -monospace - - -dingbat.font.family -The font family for copyright, quotes, and other symbols - - - - -<xsl:param name="dingbat.font.family">serif</xsl:param> - - - -Description - -The dingbat font family is used for dingbats. If it is defined -as the empty string, no font change is effected around dingbats. - - - - - - - -monospace.font.family -string - - -monospace.font.family -The default font family for monospace environments - - - - -<xsl:param name="monospace.font.family">monospace</xsl:param> - - - -Description - -The monospace font family is used for verbatim environments -(program listings, screens, etc.). - - - - - - - -sans.font.family -string - - -sans.font.family -The default sans-serif font family - - - - -<xsl:param name="sans.font.family">sans-serif</xsl:param> - - - -Description - -The default sans-serif font family. At the present, this isn't -actually used by the stylesheets. - - - - - - - -title.font.family -list -open -serif -sans-serif -monospace - - -title.font.family -The default font family for titles - - - - -<xsl:param name="title.font.family">sans-serif</xsl:param> - - - -Description - -The title font family is used for titles (chapter, section, figure, -etc.) - - - - - - - -symbol.font.family -list -open -serif -sans-serif -monospace - - -symbol.font.family -The font families to be searched for symbols outside - of the body font - - - - -<xsl:param name="symbol.font.family">Symbol,ZapfDingbats</xsl:param> - - - -Description - -A typical body or title font does not contain all -the character glyphs that DocBook supports. This parameter -specifies additional fonts that should be searched for -special characters not in the normal font. -These symbol font names are automatically appended -to the body or title font family name when fonts -are specified in a -font-family -property in the FO output. - -The symbol font names should be entered as a -comma-separated list. The default value is -Symbol,ZapfDingbats. - - - - - -Property Sets - - -formal.object.properties -attribute set - - -formal.object.properties -Properties associated with a formal object such as a figure, or other component that has a title - - - - -<xsl:attribute-set name="formal.object.properties"> - <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">2em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.optimum">1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">2em</xsl:attribute> - <xsl:attribute name="keep-together.within-column">always</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for formal objects in docbook. Specify the spacing -before and after the object. - - - - - - -formal.title.properties -attribute set - - -formal.title.properties -Style the title element of formal object such as a figure. - - - - -<xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing"> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.2"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute> -</xsl:attribute-set> - - -Description -Specify how the title should be styled. Specify the font size and weight of the title of the formal object. - - - - - -informal.object.properties -attribute set - - -informal.object.properties -Properties associated with an informal (untitled) object, such as an informalfigure - - - -<xsl:attribute-set name="informal.object.properties"> - <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">2em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.optimum">1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">2em</xsl:attribute> -</xsl:attribute-set> - -Description -The styling for informal objects in docbook. Specify the spacing before and after the object. - - - - - -monospace.properties -attribute set - - -monospace.properties -Properties of monospaced content - - - - -<xsl:attribute-set name="monospace.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$monospace.font.family"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -Specifies the font name for monospaced output. This property set -used to set the font-size as well, but that doesn't work very well -when different fonts are used (as they are in titles and paragraphs, -for example). - -If you want to set the font-size in a customization layer, it's -probably going to be more appropriate to set font-size-adjust, if your -formatter supports it. - - - - - - -verbatim.properties -attribute set - - -verbatim.properties -Properties associated with verbatim text - - - - -<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">no-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> - - -Description -This attribute set is used on all verbatim environments. - - - - - - -monospace.verbatim.properties -attribute set - - -monospace.verbatim.properties -What font and size do you want for monospaced content? - - - - -<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">no-wrap</xsl:attribute> -</xsl:attribute-set> - - -Description -Specify the font name and size you want for monospaced output - - - - - -sidebar.properties -attribute set - - -sidebar.properties -Attribute set for sidebar properties - - - - -<xsl:attribute-set name="sidebar.properties" use-attribute-sets="formal.object.properties"> - <xsl:attribute name="border-style">solid</xsl:attribute> - <xsl:attribute name="border-width">1pt</xsl:attribute> - <xsl:attribute name="border-color">black</xsl:attribute> - <xsl:attribute name="background-color">#DDDDDD</xsl:attribute> - <xsl:attribute name="padding-start">12pt</xsl:attribute> - <xsl:attribute name="padding-end">12pt</xsl:attribute> - <xsl:attribute name="padding-top">6pt</xsl:attribute> - <xsl:attribute name="padding-bottom">6pt</xsl:attribute> - <xsl:attribute name="margin-{$direction.align.start}">0pt</xsl:attribute> - <xsl:attribute name="margin-{$direction.align.end}">0pt</xsl:attribute> -<!-- - <xsl:attribute name="margin-top">6pt</xsl:attribute> - <xsl:attribute name="margin-bottom">6pt</xsl:attribute> ---> -</xsl:attribute-set> - - - -Description - -The styling for sidebars. - - - - - - -sidebar.title.properties -attribute set - - -sidebar.title.properties -Attribute set for sidebar titles - - - - -<xsl:attribute-set name="sidebar.title.properties"> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align">start</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for sidebars titles. - - - - - - -sidebar.float.type -list -none -before -left -start -right -end -inside -outside - - -sidebar.float.type -Select type of float for sidebar elements - - - - -<xsl:param name="sidebar.float.type">none</xsl:param> - - - -Description - -Selects the type of float for sidebar elements. - - - -If sidebar.float.type is -none, then -no float is used. - - - -If sidebar.float.type is -before, then -the float appears at the top of the page. On some processors, -that may be the next page rather than the current page. - - - - -If sidebar.float.type is -left, -then a left side float is used. - - - - -If sidebar.float.type is -start, -then when the text direction is left-to-right a left side float is used. -When the text direction is right-to-left, a right side float is used. - - - - -If sidebar.float.type is -right, -then a right side float is used. - - - - -If sidebar.float.type is -end, -then when the text direction is left-to-right a right side float is used. -When the text direction is right-to-left, a left side float is used. - - - - -If your XSL-FO processor supports floats positioned on the -inside or -outside -of double-sided pages, then you have those two -options for side floats as well. - - - - - - - - - -sidebar.float.width -length - - -sidebar.float.width -Set the default width for sidebars - - - - -<xsl:param name="sidebar.float.width">1in</xsl:param> - - - -Description - -Sets the default width for sidebars when used as a side float. -The width determines the degree to which the sidebar block intrudes into -the text area. - -If sidebar.float.type is -before or -none, then -this parameter is ignored. - - - - - - - -margin.note.properties -attribute set - - -margin.note.properties -Attribute set for margin.note properties - - - - -<xsl:attribute-set name="margin.note.properties"> - <xsl:attribute name="font-size">90%</xsl:attribute> - <xsl:attribute name="text-align">start</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for margin notes. -By default, margin notes are not implemented for any -element. A stylesheet customization is needed to make -use of this attribute-set. - -You can use a template named floater -to create the customization. -That template can create side floats by specifying the -content and characteristics as template parameters. - - -For example: -<xsl:template match="para[@role='marginnote']"> - <xsl:call-template name="floater"> - <xsl:with-param name="position"> - <xsl:value-of select="$margin.note.float.type"/> - </xsl:with-param> - <xsl:with-param name="width"> - <xsl:value-of select="$margin.note.width"/> - </xsl:with-param> - <xsl:with-param name="content"> - <xsl:apply-imports/> - </xsl:with-param> - </xsl:call-template> -</xsl:template> - - - - - - -margin.note.title.properties -attribute set - - -margin.note.title.properties -Attribute set for margin note titles - - - - -<xsl:attribute-set name="margin.note.title.properties"> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align">start</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for margin note titles. - - - - - - -margin.note.float.type -list -none -before -left -start -right -end -inside -outside - - -margin.note.float.type -Select type of float for margin note customizations - - - - -<xsl:param name="margin.note.float.type">none</xsl:param> - - - -Description - -Selects the type of float for margin notes. -DocBook does not define a margin note element, so this -feature must be implemented as a customization of the stylesheet. -See margin.note.properties for -an example. - - - -If margin.note.float.type is -none, then -no float is used. - - - -If margin.note.float.type is -before, then -the float appears at the top of the page. On some processors, -that may be the next page rather than the current page. - - - -If margin.note.float.type is -left or -start, then -a left side float is used. - - - -If margin.note.float.type is -right or -end, then -a right side float is used. - - - -If your XSL-FO processor supports floats positioned on the -inside or -outside -of double-sided pages, then you have those two -options for side floats as well. - - - - - - - - - -margin.note.width -length - - -margin.note.width -Set the default width for margin notes - - - - -<xsl:param name="margin.note.width">1in</xsl:param> - - - -Description - -Sets the default width for margin notes when used as a side -float. The width determines the degree to which the margin note block -intrudes into the text area. - -If margin.note.float.type is -before or -none, then -this parameter is ignored. - - - - - - - -component.title.properties -attribute set - - -component.title.properties -Properties for component titles - - - - -<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:value-of></xsl:attribute> - <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align"> - <xsl:choose> - <xsl:when test="((parent::article | parent::articleinfo | parent::info/parent::article) and not(ancestor::book) and not(self::bibliography)) or (parent::slides | parent::slidesinfo)">center</xsl:when> - <xsl:otherwise>start</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties common to all component titles. - - - - - - -component.titlepage.properties -attribute set - - -component.titlepage.properties -Properties for component titlepages - - - - -<xsl:attribute-set name="component.titlepage.properties"> -</xsl:attribute-set> - - - -Description - -The properties that are applied to the outer block containing -all the component title page information. -Its main use is to set a span="all" -property on the block that is a direct child of the flow. - -This attribute-set also applies to index titlepages. It is empty by default. - - - - - - -section.title.properties -attribute set - - -section.title.properties -Properties for section titles - - - - -<xsl:attribute-set name="section.title.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.font.family"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <!-- font size is calculated dynamically by section.heading template --> - <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">start</xsl:attribute> - <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties common to all section titles. - - - - - - -section.title.level1.properties -attribute set - - -section.title.level1.properties -Properties for level-1 section titles - - - - -<xsl:attribute-set name="section.title.level1.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 2.0736"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-1 section titles. - - - - - - - -section.title.level2.properties -attribute set - - -section.title.level2.properties -Properties for level-2 section titles - - - - -<xsl:attribute-set name="section.title.level2.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.728"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-2 section titles. - - - - - - -section.title.level3.properties -attribute set - - -section.title.level3.properties -Properties for level-3 section titles - - - - -<xsl:attribute-set name="section.title.level3.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.44"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-3 section titles. - - - - - - -section.title.level4.properties -attribute set - - -section.title.level4.properties -Properties for level-4 section titles - - - - -<xsl:attribute-set name="section.title.level4.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.2"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-4 section titles. - - - - - - -section.title.level5.properties -attribute set - - -section.title.level5.properties -Properties for level-5 section titles - - - - -<xsl:attribute-set name="section.title.level5.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-5 section titles. - - - - - - -section.title.level6.properties -attribute set - - -section.title.level6.properties -Properties for level-6 section titles - - - - -<xsl:attribute-set name="section.title.level6.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-6 section titles. This property set is actually -used for all titles below level 5. - - - - - - -section.properties -attribute set - - -section.properties -Properties for all section levels - - - - -<xsl:attribute-set name="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of all section levels, and therefore apply to -the whole section. -This attribute set is inherited by the -more specific attribute sets such as -section.level1.properties. -The default is empty. - - - - - - - -section.level1.properties -attribute set - - -section.level1.properties -Properties for level-1 sections - - - - -<xsl:attribute-set name="section.level1.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-1 section, and therefore apply to -the whole section. This includes sect1 -elements and section elements at level 1. - - -For example, you could start each level-1 section on -a new page by using: -<xsl:attribute-set name="section.level1.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level2.properties -attribute set - - -section.level2.properties -Properties for level-2 sections - - - - -<xsl:attribute-set name="section.level2.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-2 section, and therefore apply to -the whole section. This includes sect2 -elements and section elements at level 2. - - -For example, you could start each level-2 section on -a new page by using: -<xsl:attribute-set name="section.level2.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level3.properties -attribute set - - -section.level3.properties -Properties for level-3 sections - - - - -<xsl:attribute-set name="section.level3.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-3 section, and therefore apply to -the whole section. This includes sect3 -elements and section elements at level 3. - - -For example, you could start each level-3 section on -a new page by using: -<xsl:attribute-set name="section.level3.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level4.properties -attribute set - - -section.level4.properties -Properties for level-4 sections - - - - -<xsl:attribute-set name="section.level4.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-4 section, and therefore apply to -the whole section. This includes sect4 -elements and section elements at level 4. - - -For example, you could start each level-4 section on -a new page by using: -<xsl:attribute-set name="section.level4.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level5.properties -attribute set - - -section.level5.properties -Properties for level-5 sections - - - - -<xsl:attribute-set name="section.level5.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-5 section, and therefore apply to -the whole section. This includes sect5 -elements and section elements at level 5. - - -For example, you could start each level-5 section on -a new page by using: -<xsl:attribute-set name="section.level5.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level6.properties -attribute set - - -section.level6.properties -Properties for level-6 sections - - - - -<xsl:attribute-set name="section.level6.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level 6 or lower section, and therefore apply to -the whole section. This includes -section elements at level 6 and lower. - - -For example, you could start each level-6 section on -a new page by using: -<xsl:attribute-set name="section.level6.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -figure.properties -attribute set - - -figure.properties -Properties associated with a figure - - - - -<xsl:attribute-set name="figure.properties" use-attribute-sets="formal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for figures. - - - - - - -example.properties -attribute set - - -example.properties -Properties associated with a example - - - - -<xsl:attribute-set name="example.properties" use-attribute-sets="formal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for examples. - - - - - - -equation.properties -attribute set - - -equation.properties -Properties associated with a equation - - - - -<xsl:attribute-set name="equation.properties" use-attribute-sets="formal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for equations. - - - - - - -equation.number.properties -attribute set - - -equation.number.properties -Properties that apply to the fo:table-cell containing the number -of an equation that does not have a title. - - - -<xsl:attribute-set name="equation.number.properties"> - <xsl:attribute name="text-align">end</xsl:attribute> - <xsl:attribute name="display-align">center</xsl:attribute> -</xsl:attribute-set> - -Description -Properties that apply to the fo:table-cell containing the number -of an equation when it has no title. The number in an equation with a -title is formatted along with the title, and this attribute-set does not apply. - - - - - -table.properties -attribute set - - -table.properties -Properties associated with the block surrounding a table - - - - -<xsl:attribute-set name="table.properties" use-attribute-sets="formal.object.properties"> - <xsl:attribute name="keep-together.within-column">auto</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Block styling properties for tables. This parameter should really -have been called table.block.properties or something -like that, but we’re leaving it to avoid backwards-compatibility -problems. - -See also table.table.properties. - - - - - - -informalfigure.properties -attribute set - - -informalfigure.properties -Properties associated with an informalfigure - - - - -<xsl:attribute-set name="informalfigure.properties" use-attribute-sets="informal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for informalfigures. - - - - - - -informalexample.properties -attribute set - - -informalexample.properties -Properties associated with an informalexample - - - - -<xsl:attribute-set name="informalexample.properties" use-attribute-sets="informal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for informalexamples. - - - - - - -informalequation.properties -attribute set - - -informalequation.properties -Properties associated with an informalequation - - - - -<xsl:attribute-set name="informalequation.properties" use-attribute-sets="informal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for informalequations. - - - - - - -informaltable.properties -attribute set - - -informaltable.properties -Properties associated with the block surrounding an informaltable - - - - -<xsl:attribute-set name="informaltable.properties" use-attribute-sets="informal.object.properties"></xsl:attribute-set> - - - -Description - -Block styling properties for informaltables. This parameter should really -have been called informaltable.block.properties or something -like that, but we’re leaving it to avoid backwards-compatibility -problems. - -See also table.table.properties. - - - - - - -procedure.properties -attribute set - - -procedure.properties -Properties associated with a procedure - - - - -<xsl:attribute-set name="procedure.properties" use-attribute-sets="formal.object.properties"> - <xsl:attribute name="keep-together.within-column">auto</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for procedures. - - - - - - -root.properties -attribute set - - -root.properties -The properties of the fo:root element - - - - -<xsl:attribute-set name="root.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.fontset"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.size"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="text-align"> - <xsl:value-of select="$alignment"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="line-height"> - <xsl:value-of select="$line-height"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-selection-strategy">character-by-character</xsl:attribute> - <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute> - <xsl:attribute name="writing-mode"> - <xsl:value-of select="$direction.mode"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -This property set is used on the fo:root element of -an FO file. It defines a set of default, global parameters. - - - - - - -qanda.title.properties -attribute set - - -qanda.title.properties -Properties for qanda set titles - - - - -<xsl:attribute-set name="qanda.title.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.font.family"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <!-- font size is calculated dynamically by qanda.heading template --> - <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-set> - - - -Description - -The properties common to all qanda set titles. - - - - - - -qanda.title.level1.properties -attribute set - - -qanda.title.level1.properties -Properties for level-1 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level1.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 2.0736"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-1 qanda set titles. - - - - - - -qanda.title.level2.properties -attribute set - - -qanda.title.level2.properties -Properties for level-2 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level2.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.728"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-2 qanda set titles. - - - - - - -qanda.title.level3.properties -attribute set - - -qanda.title.level3.properties -Properties for level-3 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level3.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.44"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-3 qanda set titles. - - - - - - -qanda.title.level4.properties -attribute set - - -qanda.title.level4.properties -Properties for level-4 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level4.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.2"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-4 qanda set titles. - - - - - - -qanda.title.level5.properties -attribute set - - -qanda.title.level5.properties -Properties for level-5 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level5.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-5 qanda set titles. - - - - - - -qanda.title.level6.properties -attribute set - - -qanda.title.level6.properties -Properties for level-6 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level6.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-6 qanda set titles. -This property set is actually -used for all titles below level 5. - - - - - - -article.appendix.title.properties -attribute set - - -article.appendix.title.properties -Properties for appendix titles that appear in an article - - - - -<xsl:attribute-set name="article.appendix.title.properties" use-attribute-sets="section.title.properties section.title.level1.properties"> - <xsl:attribute name="margin-{$direction.align.start}"> - <xsl:value-of select="$title.margin.left"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties for the title of an appendix that -appears inside an article. The default is to use -the properties of sect1 titles. - - - - - - -abstract.properties -attribute set - - -abstract.properties -Properties associated with the block surrounding an abstract - - - - -<xsl:attribute-set name="abstract.properties"> - <xsl:attribute name="start-indent">0.0in</xsl:attribute> - <xsl:attribute name="end-indent">0.0in</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Block styling properties for abstract. - -See also abstract.title.properties. - - - - - - -abstract.title.properties -attribute set - - -abstract.title.properties -Properties for abstract titles - - - - -<xsl:attribute-set name="abstract.title.properties"> - <xsl:attribute name="font-family"><xsl:value-of select="$title.fontset"></xsl:value-of></xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> - <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:value-of></xsl:attribute> - <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align">center</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties for abstract titles. - -See also abstract.properties. - - - - - - -index.page.number.properties -attribute set - - -index.page.number.properties -Properties associated with index page numbers - - - - -<xsl:attribute-set name="index.page.number.properties"> -</xsl:attribute-set> - - - -Description - -Properties associated with page numbers in indexes. -Changing color to indicate the page number is a link is -one possibility. - - - - - - - -revhistory.table.properties -attribute set - - -revhistory.table.properties -The properties of table used for formatting revhistory - - - - -<xsl:attribute-set name="revhistory.table.properties"> -</xsl:attribute-set> - - - -Description - -This property set defines appearance of revhistory table. - - - - - - -revhistory.table.cell.properties -attribute set - - -revhistory.table.cell.properties -The properties of table cells used for formatting revhistory - - - - -<xsl:attribute-set name="revhistory.table.cell.properties"> -</xsl:attribute-set> - - - -Description - -This property set defines appearance of individual cells in revhistory table. - - - - - - -revhistory.title.properties -attribute set - - -revhistory.title.properties -The properties of revhistory title - - - - -<xsl:attribute-set name="revhistory.title.properties"> -</xsl:attribute-set> - - - -Description - -This property set defines appearance of revhistory title. - - - - -Profiling - -The following parameters can be used for attribute-based -profiling of your document. For more information about profiling, see -Profiling (conditional text). - - - -profile.arch -string - - -profile.arch -Target profile for arch -attribute - - - - -<xsl:param name="profile.arch"></xsl:param> - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.audience -string - - -profile.audience -Target profile for audience -attribute - - - - -<xsl:param name="profile.audience"></xsl:param> - - - -Description - -Value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.condition -string - - -profile.condition -Target profile for condition -attribute - - - - -<xsl:param name="profile.condition"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.conformance -string - - -profile.conformance -Target profile for conformance -attribute - - - - -<xsl:param name="profile.conformance"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.lang -string - - -profile.lang -Target profile for lang -attribute - - - - -<xsl:param name="profile.lang"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.os -string - - -profile.os -Target profile for os -attribute - - - - -<xsl:param name="profile.os"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.revision -string - - -profile.revision -Target profile for revision -attribute - - - - -<xsl:param name="profile.revision"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.revisionflag -string - - -profile.revisionflag -Target profile for revisionflag -attribute - - - - -<xsl:param name="profile.revisionflag"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.role -string - - -profile.role -Target profile for role -attribute - - - - -<xsl:param name="profile.role"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - -Note that role is often -used for other purposes than profiling. For example it is commonly -used to get emphasize in bold font: - -<emphasis role="bold">very important</emphasis> - -If you are using role for -these purposes do not forget to add values like bold to -value of this parameter. If you forgot you will get document with -small pieces missing which are very hard to track. - -For this reason it is not recommended to use role attribute for profiling. You should -rather use profiling specific attributes like userlevel, os, arch, condition, etc. - - - - - - - -profile.security -string - - -profile.security -Target profile for security -attribute - - - - -<xsl:param name="profile.security"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.status -string - - -profile.status -Target profile for status -attribute - - - - -<xsl:param name="profile.status"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.userlevel -string - - -profile.userlevel -Target profile for userlevel -attribute - - - - -<xsl:param name="profile.userlevel"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.vendor -string - - -profile.vendor -Target profile for vendor -attribute - - - - -<xsl:param name="profile.vendor"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.wordsize -string - - -profile.wordsize -Target profile for wordsize -attribute - - - - -<xsl:param name="profile.wordsize"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.attribute -string - - -profile.attribute -Name of user-specified profiling attribute - - - - -<xsl:param name="profile.attribute"></xsl:param> - - - -Description - -This parameter is used in conjuction with -profile.value. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.value -string - - -profile.value -Target profile for user-specified attribute - - - - -<xsl:param name="profile.value"></xsl:param> - - - -Description - -When you are using this parameter you must also specify name of -profiling attribute with parameter -profile.attribute. - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.separator -string - - -profile.separator -Separator character for compound profile values - - - - -<xsl:param name="profile.separator">;</xsl:param> - - - -Description - -Separator character used for compound profile values. See profile.arch - - - - -Localization - - -l10n.gentext.language -string - - -l10n.gentext.language -Sets the gentext language - - - - -<xsl:param name="l10n.gentext.language"></xsl:param> - - - -Description - -If this parameter is set to any value other than the empty string, its -value will be used as the value for the language when generating text. Setting -l10n.gentext.language overrides any settings within the -document being formatted. - -It's much more likely that you might want to set the -l10n.gentext.default.language parameter. - - - - - - - l10n.gentext.default.language - string - - - l10n.gentext.default.language - Sets the default language for generated text - - - - -<xsl:param name="l10n.gentext.default.language">en</xsl:param> - - - -Description - -The value of the l10n.gentext.default.language -parameter is used as the language for generated text if no setting is provided -in the source document. - - - - - - -l10n.gentext.use.xref.language -boolean - - -l10n.gentext.use.xref.language -Use the language of target when generating cross-reference text? - - - - -<xsl:param name="l10n.gentext.use.xref.language" select="0"></xsl:param> - - - -Description - -If non-zero, the language of the target will be used when -generating cross reference text. Usually, the current -language is used when generating text (that is, the language of the -element that contains the cross-reference element). But setting this parameter -allows the language of the element pointed to to control -the generated text. - -Consider the following example: - - -<para lang="en">See also <xref linkend="chap3"/>.</para> - - - -Suppose that Chapter 3 happens to be written in German. -If l10n.gentext.use.xref.language is non-zero, the -resulting text will be something like this: - -
    -See also Kapital 3. -
    - -Where the more traditional rendering would be: - -
    -See also Chapter 3. -
    - -
    -
    - - - -l10n.lang.value.rfc.compliant -boolean - - -l10n.lang.value.rfc.compliant -Make value of lang attribute RFC compliant? - - - - -<xsl:param name="l10n.lang.value.rfc.compliant" select="1"></xsl:param> - - - -Description - -If non-zero, ensure that the values for all lang attributes in HTML output are RFC -compliantSection 8.1.1, Language Codes, in the HTML 4.0 Recommendation states that: - -
    [RFC1766] defines and explains the language codes -that must be used in HTML documents. -Briefly, language codes consist of a primary code and a possibly -empty series of subcodes: - -language-code = primary-code ( "-" subcode )* - -And in RFC 1766, Tags for the Identification -of Languages, the EBNF for "language tag" is given as: - -Language-Tag = Primary-tag *( "-" Subtag ) -Primary-tag = 1*8ALPHA -Subtag = 1*8ALPHA - -
    -
    . - -by taking any underscore characters in any lang values found in source documents, and -replacing them with hyphen characters in output HTML files. For -example, zh_CN in a source document becomes -zh-CN in the HTML output form that source. - - -This parameter does not cause any case change in lang values, because RFC 1766 -explicitly states that all "language tags" (as it calls them) "are -to be treated as case insensitive". - -
    - -
    -
    - - - -writing.mode -string - - -writing.mode -Direction of text flow based on locale - - - - -<xsl:param name="writing.mode"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key">writing-mode</xsl:with-param> - <xsl:with-param name="lang"> - <xsl:call-template name="l10n.language"> - <xsl:with-param name="target" select="/*[1]"></xsl:with-param> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> -</xsl:param> - - - -Description - -Sets direction of text flow and text alignment based on locale. -The value is normally taken from the gentext file for the -lang attribute of the document's root element, using the -key name 'writing-mode' to look it up in the gentext file. -But the param can also be -set on the command line to override that gentext value. - -Accepted values are: - - - lr-tb - - Left-to-right text flow in each line, lines stack top to bottom. - - - - rl-tb - - Right-to-left text flow in each line, lines stack top to bottom. - - - - tb-rl - - Top-to-bottom text flow in each vertical line, lines stack right to left. - Supported by only a few XSL-FO processors. Not supported in HTML output. - - - - lr - - Shorthand for lr-tb. - - - - rl - - Shorthand for rl-tb. - - - - tb - - Shorthand for tb-rl. - - - - - - - - -
    EBNF - - -ebnf.assignment -rtf - - -ebnf.assignment -The EBNF production assignment operator - - - - - -<xsl:param name="ebnf.assignment"> - <fo:inline font-family="{$monospace.font.family}"> - <xsl:text>::=</xsl:text> - </fo:inline> -</xsl:param> - - - -Description - -The ebnf.assignment parameter determines what -text is used to show assignment in productions -in productionsets. - -While ::= is common, so are several -other operators. - - - - - - -ebnf.statement.terminator -rtf - - -ebnf.statement.terminator -Punctuation that ends an EBNF statement. - - - - - -<xsl:param name="ebnf.statement.terminator"></xsl:param> - - - -Description - -The ebnf.statement.terminator parameter determines what -text is used to terminate each production -in productionset. - -Some notations end each statement with a period. - - - - -Prepress - - -crop.marks -boolean - - -crop.marks -Output crop marks? - - - - -<xsl:param name="crop.marks" select="0"></xsl:param> - - - -Description - -If non-zero, crop marks will be added to each page. Currently this -works only with XEP if you have xep.extensions set. - - - - - - -crop.mark.width -length - - -crop.mark.width -Width of crop marks. - - - - -<xsl:param name="crop.mark.width">0.5pt</xsl:param> - - - -Description - -Width of crop marks. Crop marks are controlled by -crop.marks parameter. - - - - - - -crop.mark.offset -length - - -crop.mark.offset -Length of crop marks. - - - - -<xsl:param name="crop.mark.offset">24pt</xsl:param> - - - -Description - -Length of crop marks. Crop marks are controlled by -crop.marks parameter. - - - - - - -crop.mark.bleed -length - - -crop.mark.bleed -Length of invisible part of crop marks. - - - - -<xsl:param name="crop.mark.bleed">6pt</xsl:param> - - - -Description - -Length of invisible part of crop marks. Crop marks are controlled by -crop.marks parameter. - - - - - -
    - - - - Manpages Parameter Reference - - - This is reference documentation for all user-configurable - parameters in the DocBook XSL "manpages" stylesheet (for - generating groff/nroff output). Note that the manpages - stylesheet is a customization layer of the DocBook XSL HTML - stylesheet. Therefore, you can also use a number of HTML stylesheet parameters - to control manpages output (in addition to the - manpages-specific parameters listed in this section). - - - - Hyphenation, justification, and breaking - - -man.hyphenate -boolean - - -man.hyphenate -Enable hyphenation? - - - - -<xsl:param name="man.hyphenate">0</xsl:param> - - -Description - -If non-zero, hyphenation is enabled. - - -The default value for this parameter is zero because groff is -not particularly smart about how it does hyphenation; it can end up -hyphenating a lot of things that you don't want hyphenated. To -mitigate that, the default behavior of the stylesheets is to suppress -hyphenation of computer inlines, filenames, and URLs. (You can -override the default behavior by setting non-zero values for the -man.hyphenate.urls, -man.hyphenate.filenames, and -man.hyphenate.computer.inlines parameters.) But -the best way is still to just globally disable hyphenation, as the -stylesheets do by default. - -The only good reason to enabled hyphenation is if you have also -enabled justification (which is disabled by default). The reason is -that justified text can look very bad unless you also hyphenate it; to -quote the Hypenation node from the groff info page: - -
    - Since the odds are not great for finding a set of - words, for every output line, which fit nicely on a line without - inserting excessive amounts of space between words, 'gtroff' - hyphenates words so that it can justify lines without inserting too - much space between words. -
    - -So, if you set a non-zero value for the -man.justify parameter (to enable -justification), then you should probably also set a non-zero value for -man.hyphenate (to enable hyphenation).
    -
    - - -
    -
    - - - -man.hyphenate.urls -boolean - - -man.hyphenate.urls -Hyphenate URLs? - - - - -<xsl:param name="man.hyphenate.urls">0</xsl:param> - - -Description - -If zero (the default), hyphenation is suppressed for output of -the ulink url attribute. - - - If hyphenation is already turned off globally (that is, if - man.hyphenate is zero, setting - man.hyphenate.urls is not necessary. - - -If man.hyphenate.urls is non-zero, URLs -will not be treated specially and are subject to hyphenation just like -other words. - - - If you are thinking about setting a non-zero value for - man.hyphenate.urls in order to make long - URLs break across lines, you'd probably be better off - experimenting with setting the - man.break.after.slash parameter first. That - will cause long URLs to be broken after slashes. - - - - - - - -man.hyphenate.filenames -boolean - - -man.hyphenate.filenames -Hyphenate filenames? - - - - -<xsl:param name="man.hyphenate.filenames">0</xsl:param> - - -Description - -If zero (the default), hyphenation is suppressed for -filename output. - - - If hyphenation is already turned off globally (that is, if - man.hyphenate is zero, setting - man.hyphenate.filenames is not - necessary. - - -If man.hyphenate.filenames is non-zero, -filenames will not be treated specially and are subject to hyphenation -just like other words. - - - If you are thinking about setting a non-zero value for - man.hyphenate.filenames in order to make long - filenames/pathnames break across lines, you'd probably be better off - experimenting with setting the - man.break.after.slash parameter first. That - will cause long pathnames to be broken after slashes. - - - - - - - -man.hyphenate.computer.inlines -boolean - - -man.hyphenate.computer.inlines -Hyphenate computer inlines? - - - - -<xsl:param name="man.hyphenate.computer.inlines">0</xsl:param> - - -Description - -If zero (the default), hyphenation is suppressed for -computer inlines such as environment variables, -constants, etc. This parameter current affects output of the following -elements: - - - classname - constant - envar - errorcode - option - replaceable - userinput - type - varname - - - - - If hyphenation is already turned off globally (that is, if - man.hyphenate is zero, setting the - man.hyphenate.computer.inlines is not - necessary. - - -If man.hyphenate.computer.inlines is -non-zero, computer inlines will not be treated specially and will be -hyphenated like other words when needed. - - - - - - -man.justify -boolean - - -man.justify -Justify text to both right and left margins? - - - - -<xsl:param name="man.justify">0</xsl:param> - - -Description - -If non-zero, text is justified to both the right and left -margins (or, in roff terminology, "adjusted and filled" to both the -right and left margins). If zero (the default), text is adjusted to -the left margin only -- producing what is traditionally called -"ragged-right" text. - - -The default value for this parameter is zero because justified -text looks good only when it is also hyphenated. Without hyphenation, -excessive amounts of space often end up getting between words, in -order to "pad" lines out to align on the right margin. - -The problem is that groff is not particularly smart about how it -does hyphenation; it can end up hyphenating a lot of things that you -don't want hyphenated. So, disabling both justification and -hyphenation ensures that hyphens won't get inserted where you don't -want to them, and you don't end up with lines containing excessive -amounts of space between words. - -However, if do you decide to set a non-zero value for the -man.justify parameter (to enable -justification), then you should probably also set a non-zero value for -man.hyphenate (to enable hyphenation). - -Yes, these default settings run counter to how most existing man -pages are formatted. But there are some notable exceptions, such as -the perl man pages. - - - - - - -man.break.after.slash -boolean - - -man.break.after.slash -Enable line-breaking after slashes? - - - - -<xsl:param name="man.break.after.slash">0</xsl:param> - - -Description - -If non-zero, line-breaking after slashes is enabled. This is -mainly useful for causing long URLs or pathnames/filenames to be -broken up or "wrapped" across lines (though it also has the side -effect of sometimes causing relatively short URLs and pathnames to be -broken up across lines too). - -If zero (the default), line-breaking after slashes is -disabled. In that case, strings containing slashes (for example, URLs -or filenames) are not broken across lines, even if they exceed the -maximum column widith. - - - If you set a non-zero value for this parameter, check your - man-page output carefuly afterwards, in order to make sure that the - setting has not introduced an excessive amount of breaking-up of URLs - or pathnames. If your content contains mostly short URLs or - pathnames, setting a non-zero value for - man.break.after.slash will probably result in - in a significant number of relatively short URLs and pathnames being - broken across lines, which is probably not what you want. - - - - - -
    - Indentation - - -man.indent.width -length - - -man.indent.width -Specifies width used for adjusted indents - - - - -<xsl:param name="man.indent.width">4</xsl:param> - - - -Description -The man.indent.width parameter specifies -the width used for adjusted indents. The value of -man.indent.width is used for indenting of -lists, verbatims, headings, and elsewhere, depending on whether the -values of certain man.indent.* boolean parameters -are non-zero. - -The value of man.indent.width should -include a valid roff measurement unit (for example, -n or u). The default value of -4n specifies a 4-en width; when viewed on a -console, that amounts to the width of four characters. For details -about roff measurment units, see the Measurements -node in the groff info page. - - - - - - -man.indent.refsect -boolean - - -man.indent.refsect -Adjust indentation of refsect* and refsection? - - - - -<xsl:param name="man.indent.refsect" select="0"></xsl:param> - - -Description - -If the value of man.indent.refsect is -non-zero, the width of the left margin for -refsect1, refsect2 and -refsect3 contents and titles (and first-level, -second-level, and third-level nested -refsectioninstances) is adjusted by the value of -the man.indent.width parameter. With -man.indent.width set to its default value of -3n, the main results are that: - - - - contents of refsect1 are output with a - left margin of three characters instead the roff default of seven - or eight characters - - - contents of refsect2 are displayed in - console output with a left margin of six characters instead the of - the roff default of seven characters - - - the contents of refsect3 and nested - refsection instances are adjusted - accordingly. - - - -If instead the value of man.indent.refsect is -zero, no margin adjustment is done for refsect* -output. - - - If your content is primarly comprised of - refsect1 and refsect2 content - (or the refsection equivalent) – with few or - no refsect3 or lower nested sections , you may be - able to “conserve” space in your output by setting - man.indent.refsect to a non-zero value. Doing - so will “squeeze” the left margin in such as way as to provide an - additional four characters of “room” per line in - refsect1 output. That extra room may be useful - if, for example, you have many verbatim sections with long lines in - them. - - - - - - - -man.indent.blurbs -boolean - - -man.indent.blurbs -Adjust indentation of blurbs? - - - - -<xsl:param name="man.indent.blurbs" select="1"></xsl:param> - - -Description - -If the value of man.indent.blurbs is -non-zero, the width of the left margin for -authorblurb, personblurb, and -contrib output is set to the value of the -man.indent.width parameter -(3n by default). If instead the value of -man.indent.blurbs is zero, the built-in roff -default width (7.2n) is used. - - - - - - -man.indent.lists -boolean - - -man.indent.lists -Adjust indentation of lists? - - - - -<xsl:param name="man.indent.lists" select="1"></xsl:param> - - -Description - -If the value of man.indent.lists is -non-zero, the width of the left margin for list items in -itemizedlist, -orderedlist, -variablelist output (and output of some other -lists) is set to the value of the -man.indent.width parameter -(4n by default). If instead the value of -man.indent.lists is zero, the built-in roff -default width (7.2n) is used. - - - - - - -man.indent.verbatims -boolean - - -man.indent.verbatims -Adjust indentation of verbatims? - - - - -<xsl:param name="man.indent.verbatims" select="1"></xsl:param> - - -Description - -If the value of man.indent.verbatims is -non-zero, the width of the left margin for output of verbatim -environments (programlisting, -screen, and so on) is set to the value of the -man.indent.width parameter -(3n by default). If instead the value of -man.indent.verbatims is zero, the built-in roff -default width (7.2n) is used. - - - - - - Fonts - - -man.font.funcprototype -string - - -man.font.funcprototype -Specifies font for funcprototype output - - - - - <xsl:param name="man.font.funcprototype">BI</xsl:param> - - - -Description - -The man.font.funcprototype parameter -specifies the font for funcprototype output. It -should be a valid roff font name, such as BI or -B. - - - - - - -man.font.funcsynopsisinfo -string - - -man.font.funcsynopsisinfo -Specifies font for funcsynopsisinfo output - - - - - <xsl:param name="man.font.funcsynopsisinfo">B</xsl:param> - - - -Description - -The man.font.funcsynopsisinfo parameter -specifies the font for funcsynopsisinfo output. It -should be a valid roff font name, such as B or -I. - - - - - - -man.font.links -string - - -man.font.links -Specifies font for links - - - - -<xsl:param name="man.font.links">B</xsl:param> - - - -Description - -The man.font.links parameter -specifies the font for output of links (ulink instances -and any instances of any element with an xlink:href attribute). - -The value of man.font.links must be - either B or I, or empty. If -the value is empty, no font formatting is applied to links. - -If you set man.endnotes.are.numbered and/or -man.endnotes.list.enabled to zero (disabled), then -you should probably also set an empty value for -man.font.links. But if -man.endnotes.are.numbered is non-zero (enabled), -you should probably keep -man.font.links set to -B or IThe - main purpose of applying a font format to links in most output -formats it to indicate that the formatted text is -“clickable”; given that links rendered in man pages are -not “real” hyperlinks that users can click on, it might -seem like there is never a good reason to have font formatting for -link contents in man output. -In fact, if you suppress the -display of inline link references (by setting -man.endnotes.are.numbered to zero), there is no -good reason to apply font formatting to links. However, if -man.endnotes.are.numbered is non-zero, having -font formatting for links (arguably) serves a purpose: It provides -“context” information about exactly what part of the text -is being “annotated” by the link. Depending on how you -mark up your content, that context information may or may not -have value.. - - -Related Parameters - man.endnotes.list.enabled, - man.endnotes.are.numbered - - - - - - -man.font.table.headings -string - - -man.font.table.headings -Specifies font for table headings - - - - - <xsl:param name="man.font.table.headings">B</xsl:param> - - - -Description - -The man.font.table.headings parameter -specifies the font for table headings. It should be -a valid roff font, such as B or -I. - - - - - - -man.font.table.title -string - - -man.font.table.title -Specifies font for table headings - - - - - <xsl:param name="man.font.table.title">B</xsl:param> - - - -Description - -The man.font.table.title parameter -specifies the font for table titles. It should be -a valid roff font, such as B or -I. - - - - - - SYNOPSIS section - - -man.funcsynopsis.style -list -ansi -kr - - -man.funcsynopsis.style -What style of funcsynopsis should be generated? - - -<xsl:param name="man.funcsynopsis.style">ansi</xsl:param> - -Description -If man.funcsynopsis.style is -ansi, ANSI-style function synopses are -generated for a funcsynopsis, otherwise K&R-style -function synopses are generated. - - - - - AUTHORS and COPYRIGHT sections - - -man.authors.section.enabled -boolean - - -man.authors.section.enabled -Display auto-generated AUTHORS section? - - - -<xsl:param name="man.authors.section.enabled">1</xsl:param> - - -Description - -If the value of -man.authors.section.enabled is non-zero -(the default), then an AUTHORS section is -generated near the end of each man page. The output of the -AUTHORS section is assembled from any -author, editor, and othercredit -metadata found in the contents of the child info or -refentryinfo (if any) of the refentry -itself, or from any author, editor, and -othercredit metadata that may appear in info -contents of any ancestors of the refentry. - -If the value of -man.authors.section.enabled is zero, the -the auto-generated AUTHORS section is -suppressed. - -Set the value of - man.authors.section.enabled to zero if - you want to have a manually created AUTHORS - section in your source, and you want it to appear in output - instead of the auto-generated AUTHORS - section. - - - - - -man.copyright.section.enabled -boolean - - -man.copyright.section.enabled -Display auto-generated COPYRIGHT section? - - - -<xsl:param name="man.copyright.section.enabled">1</xsl:param> - - -Description - -If the value of -man.copyright.section.enabled is non-zero -(the default), then a COPYRIGHT section is -generated near the end of each man page. The output of the -COPYRIGHT section is assembled from any -copyright and legalnotice metadata found in -the contents of the child info or -refentryinfo (if any) of the refentry -itself, or from any copyright and -legalnotice metadata that may appear in info -contents of any ancestors of the refentry. - -If the value of -man.copyright.section.enabled is zero, the -the auto-generated COPYRIGHT section is -suppressed. - -Set the value of - man.copyright.section.enabled to zero if - you want to have a manually created COPYRIGHT - section in your source, and you want it to appear in output - instead of the auto-generated COPYRIGHT - section. - - - - - Endnotes and link handling - - -man.endnotes.list.enabled -boolean - - -man.endnotes.list.enabled -Display endnotes list at end of man page? - - - - -<xsl:param name="man.endnotes.list.enabled">1</xsl:param> - - - -Description - -If the value of man.endnotes.list.enabled is -non-zero (the default), then an endnotes list is added to the end of -the output man page. - -If the value of man.endnotes.list.enabled is -zero, the list is suppressed — unless link numbering is enabled (that -is, if man.endnotes.are.numbered is non-zero), in -which case, that setting overrides the -man.endnotes.list.enabled setting, and the -endnotes list is still displayed. The reason is that inline -numbering of notesources associated with endnotes only makes sense -if a (numbered) list of endnotes is also generated. - - - Leaving - man.endnotes.list.enabled at its default - (non-zero) value ensures that no “out of line” information (such - as the URLs for hyperlinks and images) gets lost in your - man-page output. It just gets “rearranged”. - So if you’re thinking about disabling endnotes listing by - setting the value of - man.endnotes.list.enabled to zero: - Before you do so, first take some time to carefully consider - the information needs and experiences of your users. The “out - of line” information has value even if the presentation of it - in text output is not as interactive as it may be in other - output formats. - As far as the specific case of URLs: Even though the URLs - displayed in text output may not be “real” (clickable) - hyperlinks, many X terminals have convenience features for - recognizing URLs and can, for example, present users with - an options to open a URL in a browser with the user clicks on - the URL is a terminal window. And short of those, users with X - terminals can always manually cut and paste the URLs into a web - browser. - Also, note that various “man to html” tools, such as the - widely used man2html (VH-Man2html) - application, automatically mark up URLs with a@href markup - during conversion — resulting in “real” hyperlinks in HTML - output from those tools. - - -To “turn off” numbering of endnotes in the -endnotes list, set man.endnotes.are.numbered -to zero. The endnotes list will -still be displayed; it will just be displayed without the -numbersIt can still make sense to have -the list of endnotes displayed even if you have endnotes numbering turned -off. In that case, your endnotes list basically becomes a “list -of references” without any association with specific text in -your document. This is probably the best option if you find the inline -endnotes numbering obtrusive. Your users will still have access to all the “out of line” -such as URLs for hyperlinks. - - -The default heading for the endnotes list is -NOTES. To change that, set a non-empty -value for the man.endnotes.list.heading -parameter. - -In the case of notesources that are links: Along with the -URL for each link, the endnotes list includes the contents of the -link. The list thus includes only non-empty - -A “non-empty” link is one that looks like -this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/">manpages</ulink> -an “empty link” is on that looks like this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/"/> - links. - -Empty links are never included, and never numbered. They are simply -displayed inline, without any numbering. - -In addition, if there are multiple instances of links in a -refentry that have the same URL, the URL is listed only -once. The contents listed for that link in the endnotes list are -the contents of the first link which has that URL. - -If you disable endnotes listing, you should probably also set -man.links.are.underlined to zero (to disable -link underlining). - - - - - -man.endnotes.list.heading -string - - -man.endnotes.list.heading -Specifies an alternate name for endnotes list - - - - -<xsl:param name="man.endnotes.list.heading"></xsl:param> - - - -Description - -If the value of the -man.endnotes.are.numbered parameter -and/or the man.endnotes.list.enabled -parameter is non-zero (the defaults for both are non-zero), a -numbered list of endnotes is generated near the end of each man -page. The default heading for the list of endnotes is the -equivalent of the English word NOTES in -the current locale. To cause an alternate heading to be displayed, -set a non-empty value for the -man.endnotes.list.heading parameter — -for example, REFERENCES. - - - - - -man.endnotes.are.numbered -boolean - - -man.endnotes.are.numbered -Number endnotes? - - - - -<xsl:param name="man.endnotes.are.numbered">1</xsl:param> - - - -Description - -If the value of man.endnotes.are.numbered is -non-zero (the default), then for each non-empty -A “non-empty” notesource is one that looks like -this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/">manpages</ulink> -an “empty” notesource is on that looks like this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/"/> - “notesource”: - - - - a number (in square brackets) is displayed inline after the - rendered inline contents (if any) of the notesource - - - the contents of the notesource are included in a - numbered list of endnotes that is generated at the end of - each man page; the number for each endnote corresponds to - the inline number for the notesource with which it is - associated - - -The default heading for the list of endnotes is -NOTES. To output a different heading, set a value -for the man.endnotes.section.heading -parameter. - - - The endnotes list is also displayed (but without - numbers) if the value of - man.endnotes.list.enabled is - non-zero. - - - -If the value of man.endnotes.are.numbered is -zero, numbering of endnotess is suppressed; only inline -contents (if any) of the notesource are displayed inline. - - If you are thinking about disabling endnote numbering by setting - the value of man.endnotes.are.numbered to zero, - before you do so, first take some time to carefully - consider the information needs and experiences of your users. The - square-bracketed numbers displayed inline after notesources may seem - obstrusive and aesthetically unpleasingAs far as notesources that are links, ytou might - think it would be better to just display URLs for non-empty - links inline, after their content, rather than displaying - square-bracketed numbers all over the place. But it's not better. In - fact, it's not even practical, because many (most) URLs for links - are too long to be displayed inline. They end up overflowing the - right margin. You can set a non-zero value for - man.break.after.slash parameter to deal with - that, but it could be argued that what you end up with is at least - as ugly, and definitely more obstrusive, then having short - square-bracketed numbers displayed inline., - - but in a text-only output format, the - numbered-notesources/endnotes-listing mechanism is the only - practical way to handle this kind of content. - - Also, users of “text based” browsers such as - lynx will already be accustomed to seeing inline - numbers for links. And various "man to html" applications, such as - the widely used man2html (VH-Man2html) - application, can automatically turn URLs into "real" HTML hyperlinks - in output. So leaving man.endnotes.are.numbered - at its default (non-zero) value ensures that no information is - lost in your man-page output. It just gets - “rearranged”. - - -The handling of empty links is not affected by this -parameter. Empty links are handled simply by displaying their URLs -inline. Empty links are never auto-numbered. - -If you disable endnotes numbering, you should probably also set -man.font.links to an empty value (to -disable font formatting for links. - - -Related Parameters - man.endnotes.list.enabled, - man.font.links - - - - - - man.base.url.for.relative.links - string - - - man.base.url.for.relative.links - Specifies a base URL for relative links - - - - <xsl:param name="man.base.url.for.relative.links">[set $man.base.url.for.relative.links]/</xsl:param> - - - Description - - For any “notesource” listed in the auto-generated - “NOTES” section of output man pages (which is generated when - the value of the - man.endnotes.list.enabled parameter - is non-zero), if the notesource is a link source with a - relative URI, the URI is displayed in output with the value - of the - man.base.url.for.relative.links - parameter prepended to the value of the link URI. - - - A link source is an notesource that references an - external resource: - - - a ulink element with a url attribute - - - any element with an xlink:href attribute - - - an imagedata, audiodata, or - videodata element - - - - - - If you use relative URIs in link sources in your DocBook - refentry source, and you leave - man.base.url.for.relative.links - unset, the relative links will appear “as is” in the “Notes” - section of any man-page output generated from your source. - That’s probably not what you want, because such relative - links are only usable in the context of HTML output. So, to - make the links meaningful and usable in the context of - man-page output, set a value for - man.base.url.for.relative.links that - points to the online version of HTML output generated from - your DocBook refentry source. For - example: - <xsl:param name="man.base.url.for.relative.links" - >http://www.kernel.org/pub/software/scm/git/docs/</xsl:param> - - - - - Related Parameters - man.endnotes.list.enabled - - - - - - Lists - - -man.segtitle.suppress -boolean - - -man.segtitle.suppress -Suppress display of segtitle contents? - - - - -<xsl:param name="man.segtitle.suppress" select="0"></xsl:param> - - -Description - -If the value of man.segtitle.suppress is -non-zero, then display of segtitle contents is -suppressed in output. - - - - - - Character/string substitution - - -man.charmap.enabled -boolean - - -man.charmap.enabled -Apply character map before final output? - - - - -<xsl:param name="man.charmap.enabled" select="1"></xsl:param> - - - -Description - -If the value of the man.charmap.enabled -parameter is non-zero, a "character map" is used to substitute certain -Unicode symbols and special characters with appropriate roff/groff -equivalents, just before writing each man-page file to the -filesystem. If instead the value of -man.charmap.enabled is zero, Unicode characters -are passed through "as is". - -Details - -For converting certain Unicode symbols and special characters in -UTF-8 or UTF-16 encoded XML source to appropriate groff/roff -equivalents in man-page output, the DocBook XSL Stylesheets -distribution includes a roff character map that is compliant with the XSLT character -map format as detailed in the XSLT 2.0 specification. The map -contains more than 800 character mappings and can be considered the -standard roff character map for the distribution. - -You can use the man.charmap.uri -parameter to specify a URI for the location for an alternate roff -character map to use in place of the standard roff character map -provided in the distribution. - -You can also use a subset of a character map. For details, -see the man.charmap.use.subset, -man.charmap.subset.profile, and -man.charmap.subset.profile.english -parameters. - - - - - - - -man.charmap.uri -uri - - -man.charmap.uri -URI for custom roff character map - - - - -<xsl:param name="man.charmap.uri"></xsl:param> - - - -Description - -For converting certain Unicode symbols and special characters in -UTF-8 or UTF-16 encoded XML source to appropriate groff/roff -equivalents in man-page output, the DocBook XSL Stylesheets -distribution includes an XSLT character -map. That character map can be considered the standard roff -character map for the distribution. - -If the value of the man.charmap.uri -parameter is non-empty, that value is used as the URI for the location -for an alternate roff character map to use in place of the standard -roff character map provided in the distribution. - - -Do not set a value for man.charmap.uri -unless you have a custom roff character map that differs from the -standard one provided in the distribution. - - - - - - -man.charmap.use.subset -boolean - - -man.charmap.use.subset -Use subset of character map instead of full map? - - - - -<xsl:param name="man.charmap.use.subset" select="1"></xsl:param> - - - -Description - -If the value of the -man.charmap.use.subset parameter is non-zero, -a subset of the roff character map is used instead of the full roff -character map. The profile of the subset used is determined either -by the value of the -man.charmap.subset.profile -parameter (if the source is not in English) or the -man.charmap.subset.profile.english -parameter (if the source is in English). - - - You may want to experiment with setting a non-zero value of - man.charmap.use.subset, so that the full - character map is used. Depending on which XSLT engine you run, - setting a non-zero value for - man.charmap.use.subset may significantly - increase the time needed to process your documents. Or it may - not. For example, if you set it and run it with xsltproc, it seems - to dramatically increase processing time; on the other hand, if you - set it and run it with Saxon, it does not seem to increase - processing time nearly as much. - - If processing time is not a important concern and/or you can - tolerate the increase in processing time imposed by using the full - character map, set man.charmap.use.subset to - zero. - - -Details - -For converting certain Unicode symbols and special characters in -UTF-8 or UTF-16 encoded XML source to appropriate groff/roff -equivalents in man-page output, the DocBook XSL Stylesheets -distribution includes a roff character map that is compliant with the XSLT character -map format as detailed in the XSLT 2.0 specification. The map -contains more than 800 character mappings and can be considered the -standard roff character map for the distribution. - - -You can use the man.charmap.uri -parameter to specify a URI for the location for an alternate roff -character map to use in place of the standard roff character map -provided in the distribution. - - -Because it is not terrifically efficient to use the standard -800-character character map in full -- and for most (or all) users, -never necessary to use it in full -- the DocBook XSL Stylesheets -support a mechanism for using, within any given character map, a -subset of character mappings instead of the full set. You can use the -man.charmap.subset.profile or -man.charmap.subset.profile.english -parameter to tune the profile of that subset to use. - - - - - - - -man.charmap.subset.profile -string - - -man.charmap.subset.profile -Profile of character map subset - - - - -<xsl:param name="man.charmap.subset.profile"> -@*[local-name() = 'block'] = 'Miscellaneous Technical' or -(@*[local-name() = 'block'] = 'C1 Controls And Latin-1 Supplement (Latin-1 Supplement)' and - (@*[local-name() = 'class'] = 'symbols' or - @*[local-name() = 'class'] = 'letters') -) or -@*[local-name() = 'block'] = 'Latin Extended-A' -or -(@*[local-name() = 'block'] = 'General Punctuation' and - (@*[local-name() = 'class'] = 'spaces' or - @*[local-name() = 'class'] = 'dashes' or - @*[local-name() = 'class'] = 'quotes' or - @*[local-name() = 'class'] = 'bullets' - ) -) or -@*[local-name() = 'name'] = 'HORIZONTAL ELLIPSIS' or -@*[local-name() = 'name'] = 'WORD JOINER' or -@*[local-name() = 'name'] = 'SERVICE MARK' or -@*[local-name() = 'name'] = 'TRADE MARK SIGN' or -@*[local-name() = 'name'] = 'ZERO WIDTH NO-BREAK SPACE' -</xsl:param> - - - -Description - -If the value of the -man.charmap.use.subset parameter is non-zero, -and your DocBook source is not written in English (that - is, if the lang or xml:lang attribute on the root element - in your DocBook source or on the first refentry - element in your source has a value other than - en), then the character-map subset specified - by the man.charmap.subset.profile - parameter is used instead of the full roff character map. - -Otherwise, if the lang or xml:lang attribute on the root - element in your DocBook - source or on the first refentry element in your source - has the value en or if it has no lang or xml:lang attribute, then the character-map - subset specified by the - man.charmap.subset.profile.english - parameter is used instead of - man.charmap.subset.profile. - -The difference between the two subsets is that - man.charmap.subset.profile provides - mappings for characters in Western European languages that are - not part of the Roman (English) alphabet (ASCII character set). - -The value of man.charmap.subset.profile -is a string representing an XPath expression that matches attribute -names and values for output-character -elements in the character map. - -The attributes supported in the standard roff character map included in the distribution are: - - - character - - a raw Unicode character or numeric Unicode - character-entity value (either in decimal or hex); all - characters have this attribute - - - - name - - a standard full/long ISO/Unicode character name (e.g., - "OHM SIGN"); all characters have this attribute - - - - block - - a standard Unicode "block" name (e.g., "General - Punctuation"); all characters have this attribute. For the full - list of Unicode block names supported in the standard roff - character map, see . - - - - class - - a class of characters (e.g., "spaces"). Not all - characters have this attribute; currently, it is used only with - certain characters within the "C1 Controls And Latin-1 - Supplement" and "General Punctuation" blocks. For details, see - . - - - - entity - - an ISO entity name (e.g., "ohm"); not all characters - have this attribute, because not all characters have ISO entity - names; for example, of the 800 or so characters in the standard - roff character map included in the distribution, only around 300 - have ISO entity names. - - - - - string - - a string representing an roff/groff escape-code (with - "@esc@" used in place of the backslash), or a simple ASCII - string; all characters in the roff character map have this - attribute - - - - -The value of man.charmap.subset.profile -is evaluated as an XPath expression at run-time to select a portion of -the roff character map to use. You can tune the subset used by adding -or removing parts. For example, if you need to use a wide range of -mathematical operators in a document, and you want to have them -converted into roff markup properly, you might add the following: - - @*[local-name() = 'block'] ='MathematicalOperators' - -That will cause a additional set of around 67 additional "math" -characters to be converted into roff markup. - - -Depending on which XSLT engine you use, either the EXSLT -dyn:evaluate extension function (for xsltproc or -Xalan) or saxon:evaluate extension function (for -Saxon) are used to dynamically evaluate the value of -man.charmap.subset.profile at run-time. If you -don't use xsltproc, Saxon, Xalan -- or some other XSLT engine that -supports dyn:evaluate -- you must either set the -value of the man.charmap.use.subset parameter -to zero and process your documents using the full character map -instead, or set the value of the -man.charmap.enabled parameter to zero instead -(so that character-map processing is disabled completely. - - -An alternative to using -man.charmap.subset.profile is to create your -own custom character map, and set the value of -man.charmap.uri to the URI/filename for -that. If you use a custom character map, you will probably want to -include in it just the characters you want to use, and so you will -most likely also want to set the value of -man.charmap.use.subset to zero. -You can create a -custom character map by making a copy of the standard roff character map provided in the distribution, and -then adding to, changing, and/or deleting from that. - - -If you author your DocBook XML source in UTF-8 or UTF-16 -encoding and aren't sure what OSes or environments your man-page -output might end up being viewed on, and not sure what version of -nroff/groff those environments might have, you should be careful about -what Unicode symbols and special characters you use in your source and -what parts you add to the value of -man.charmap.subset.profile. -Many of the escape codes used are specific to groff and using -them may not provide the expected output on an OS or environment that -uses nroff instead of groff. -On the other hand, if you intend for your man-page output to be -viewed only on modern systems (for example, GNU/Linux systems, FreeBSD -systems, or Cygwin environments) that have a good, up-to-date groff, -then you can safely include a wide range of Unicode symbols and -special characters in your UTF-8 or UTF-16 encoded DocBook XML source -and add any of the supported Unicode block names to the value of -man.charmap.subset.profile. - - - -For other details, see the documentation for the -man.charmap.use.subset parameter. - -Supported Unicode block names and "class" values - - - Below is the full list of Unicode block names and "class" - values supported in the standard roff stylesheet provided in the - distribution, along with a description of which codepoints from the - Unicode range corresponding to that block name or block/class - combination are supported. - - - - C1 Controls And Latin-1 Supplement (Latin-1 Supplement) (x00a0 to x00ff) - class values - - - symbols - - - letters - - - - - Latin Extended-A (x0100 to x017f, partial) - - - Spacing Modifier Letters (x02b0 to x02ee, partial) - - - Greek and Coptic (x0370 to x03ff, partial) - - - General Punctuation (x2000 to x206f, partial) - class values - - - spaces - - - dashes - - - quotes - - - daggers - - - bullets - - - leaders - - - primes - - - - - - Superscripts and Subscripts (x2070 to x209f) - - - Currency Symbols (x20a0 to x20b1) - - - Letterlike Symbols (x2100 to x214b) - - - Number Forms (x2150 to x218f) - - - Arrows (x2190 to x21ff, partial) - - - Mathematical Operators (x2200 to x22ff, partial) - - - Control Pictures (x2400 to x243f) - - - Enclosed Alphanumerics (x2460 to x24ff) - - - Geometric Shapes (x25a0 to x25f7, partial) - - - Miscellaneous Symbols (x2600 to x26ff, partial) - - - Dingbats (x2700 to x27be, partial) - - - Alphabetic Presentation Forms (xfb00 to xfb04 only) - - - - - - - - -man.charmap.subset.profile.english -string - - -man.charmap.subset.profile.english -Profile of character map subset - - - - -<xsl:param name="man.charmap.subset.profile.english"> -@*[local-name() = 'block'] = 'Miscellaneous Technical' or -(@*[local-name() = 'block'] = 'C1 Controls And Latin-1 Supplement (Latin-1 Supplement)' and - @*[local-name() = 'class'] = 'symbols') -or -(@*[local-name() = 'block'] = 'General Punctuation' and - (@*[local-name() = 'class'] = 'spaces' or - @*[local-name() = 'class'] = 'dashes' or - @*[local-name() = 'class'] = 'quotes' or - @*[local-name() = 'class'] = 'bullets' - ) -) or -@*[local-name() = 'name'] = 'HORIZONTAL ELLIPSIS' or -@*[local-name() = 'name'] = 'WORD JOINER' or -@*[local-name() = 'name'] = 'SERVICE MARK' or -@*[local-name() = 'name'] = 'TRADE MARK SIGN' or -@*[local-name() = 'name'] = 'ZERO WIDTH NO-BREAK SPACE' -</xsl:param> - - - -Description - -If the value of the - man.charmap.use.subset parameter is - non-zero, and your DocBook source is written in English (that - is, if its lang or xml:lang attribute on the root element - in your DocBook source or on the first refentry - element in your source has the value en or if - it has no lang or xml:lang attribute), then the - character-map subset specified by the - man.charmap.subset.profile.english - parameter is used instead of the full roff character map. - -Otherwise, if the lang or xml:lang attribute - on the root element in your DocBook source or on the first - refentry element in your source has a value other - than en, then the character-map subset - specified by the - man.charmap.subset.profile parameter is - used instead of - man.charmap.subset.profile.english. - -The difference between the two subsets is that - man.charmap.subset.profile provides - mappings for characters in Western European languages that are - not part of the Roman (English) alphabet (ASCII character set). - -The value of man.charmap.subset.profile.english -is a string representing an XPath expression that matches attribute -names and values for output-character elements in the character map. - -For other details, see the documentation for the -man.charmap.subset.profile.english and -man.charmap.use.subset parameters. - - - - - - -man.string.subst.map.local.pre -string - - -man.string.subst.map.local.pre -Specifies “local” string substitutions - - - - - <xsl:param name="man.string.subst.map.local.pre"></xsl:param> - - - -Description - -Use the man.string.subst.map.local.pre -parameter to specify any “local” string substitutions to perform over -the entire roff source for each man page before -performing the string substitutions specified by the man.string.subst.map parameter. - -For details about the format of this parameter, see the -documentation for the man.string.subst.map -parameter. - - - - - - -man.string.subst.map -rtf - - -man.string.subst.map -Specifies a set of string substitutions - - - - -<xsl:param name="man.string.subst.map"> - - <!-- * remove no-break marker at beginning of line (stylesheet artifact) --> - <ss:substitution oldstring="▒▀" newstring="▒"></ss:substitution> - <!-- * replace U+2580 no-break marker (stylesheet-added) w/ no-break space --> - <ss:substitution oldstring="▀" newstring="\ "></ss:substitution> - - <!-- ==================================================================== --> - - <!-- * squeeze multiple newlines before a roff request --> - <ss:substitution oldstring=" - -." newstring=" -."></ss:substitution> - <!-- * remove any .sp instances that directly precede a .PP --> - <ss:substitution oldstring=".sp -.PP" newstring=".PP"></ss:substitution> - <!-- * remove any .sp instances that directly follow a .PP --> - <ss:substitution oldstring=".sp -.sp" newstring=".sp"></ss:substitution> - <!-- * squeeze multiple .sp instances into a single .sp--> - <ss:substitution oldstring=".PP -.sp" newstring=".PP"></ss:substitution> - <!-- * squeeze multiple newlines after start of no-fill (verbatim) env. --> - <ss:substitution oldstring=".nf - -" newstring=".nf -"></ss:substitution> - <!-- * squeeze multiple newlines after REstoring margin --> - <ss:substitution oldstring=".RE - -" newstring=".RE -"></ss:substitution> - <!-- * U+2591 is a marker we add before and after every Parameter in --> - <!-- * Funcprototype output --> - <ss:substitution oldstring="░" newstring=" "></ss:substitution> - <!-- * U+2592 is a marker we add for the newline before output of <sbr>; --> - <ss:substitution oldstring="▒" newstring=" -"></ss:substitution> - <!-- * --> - <!-- * Now deal with some other characters that are added by the --> - <!-- * stylesheets during processing. --> - <!-- * --> - <!-- * bullet --> - <ss:substitution oldstring="•" newstring="\(bu"></ss:substitution> - <!-- * left double quote --> - <ss:substitution oldstring="“" newstring="\(lq"></ss:substitution> - <!-- * right double quote --> - <ss:substitution oldstring="”" newstring="\(rq"></ss:substitution> - <!-- * left single quote --> - <ss:substitution oldstring="‘" newstring="\(oq"></ss:substitution> - <!-- * right single quote --> - <ss:substitution oldstring="’" newstring="\(cq"></ss:substitution> - <!-- * copyright sign --> - <ss:substitution oldstring="©" newstring="\(co"></ss:substitution> - <!-- * registered sign --> - <ss:substitution oldstring="®" newstring="\(rg"></ss:substitution> - <!-- * ...servicemark... --> - <!-- * There is no groff equivalent for it. --> - <ss:substitution oldstring="℠" newstring="(SM)"></ss:substitution> - <!-- * ...trademark... --> - <!-- * We don't do "\(tm" because for console output, --> - <!-- * groff just renders that as "tm"; that is: --> - <!-- * --> - <!-- * Product&#x2122; -> Producttm --> - <!-- * --> - <!-- * So we just make it to "(TM)" instead; thus: --> - <!-- * --> - <!-- * Product&#x2122; -> Product(TM) --> - <ss:substitution oldstring="™" newstring="(TM)"></ss:substitution> - -</xsl:param> - - - -Description - -The man.string.subst.map parameter -contains a map that specifies a set of -string substitutions to perform over the entire roff source for each -man page, either just before generating final man-page output (that -is, before writing man-page files to disk) or, if the value of the -man.charmap.enabled parameter is non-zero, -before applying the roff character map. - -You can use man.string.subst.map as a -“lightweight” character map to perform “essential” substitutions -- -that is, substitutions that are always performed, -even if the value of the man.charmap.enabled -parameter is zero. For example, you can use it to replace quotation -marks or other special characters that are generated by the DocBook -XSL stylesheets for a particular locale setting (as opposed to those -characters that are actually in source XML documents), or to replace -any special characters that may be automatically generated by a -particular customization of the DocBook XSL stylesheets. - - - Do you not change value of the - man.string.subst.map parameter unless you are - sure what you are doing. First consider adding your - string-substitution mappings to either or both of the following - parameters: - - - man.string.subst.map.local.pre - applied before - man.string.subst.map - - - man.string.subst.map.local.post - applied after - man.string.subst.map - - - By default, both of those parameters contain no - string substitutions. They are intended as a means for you to - specify your own local string-substitution mappings. - - If you remove any of default mappings from the value of the - man.string.subst.map parameter, you are - likely to end up with broken output. And be very careful about adding - anything to it; it’s used for doing string substitution over the - entire roff source of each man page – it causes target strings to be - replaced in roff requests and escapes, not just in the visible - contents of the page. - - - - - - Contents of the substitution map - - The string-substitution map contains one or more - ss:substitution elements, each of which has two - attributes: - - - oldstring - - string to replace - - - - newstring - - string with which to replace oldstring - - - - It may also include XML comments (that is, delimited with - "<!--" and "-->"). - - - - - - - - -man.string.subst.map.local.post -string - - -man.string.subst.map.local.post -Specifies “local” string substitutions - - - - -<xsl:param name="man.string.subst.map.local.post"></xsl:param> - - - -Description - -Use the man.string.subst.map.local.post -parameter to specify any “local” string substitutions to perform over -the entire roff source for each man page after -performing the string substitutions specified by the man.string.subst.map parameter. - -For details about the format of this parameter, see the -documentation for the man.string.subst.map -parameter. - - - - - - Refentry metadata gathering - - -refentry.meta.get.quietly -boolean - - -refentry.meta.get.quietly -Suppress notes and warnings when gathering refentry metadata? - - - - -<xsl:param name="refentry.meta.get.quietly" select="0"></xsl:param> - - - -Description - -If zero (the default), notes and warnings about “missing” markup -are generated during gathering of refentry metadata. If non-zero, the -metadata is gathered “quietly” -- that is, the notes and warnings are -suppressed. - - - If you are processing a large amount of refentry - content, you may be able to speed up processing significantly by - setting a non-zero value for - refentry.meta.get.quietly. - - - - - - - -refentry.date.profile -string - - -refentry.date.profile -Specifies profile for refentry "date" data - - - - -<xsl:param name="refentry.date.profile"> - (($info[//date])[last()]/date)[1]| - (($info[//pubdate])[last()]/pubdate)[1] -</xsl:param> - - - -Description - -The value of refentry.date.profile is a -string representing an XPath expression. It is evaluated at run-time -and used only if refentry.date.profile.enabled -is non-zero. Otherwise, the refentry metadata-gathering -logic "hard coded" into the stylesheets is used. - - The man(7) man page describes this content -as "the date of the last revision". In man pages, it is the content -that is usually displayed in the center footer. - - - - - - -refentry.date.profile.enabled -boolean - - -refentry.date.profile.enabled -Enable refentry "date" profiling? - - - - -<xsl:param name="refentry.date.profile.enabled">0</xsl:param> - - -Description - -If the value of -refentry.date.profile.enabled is non-zero, then -during refentry metadata gathering, the info profile -specified by the customizable -refentry.date.profile parameter is used. - -If instead the value of -refentry.date.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "date" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "date" data to show -up in your output, then consider setting a non-zero value for -refentry.date.profile.enabled and adjusting the -value of refentry.date.profile to cause correct -data to be gathered. - -Note that the terms "source" and "date" have special meanings in -this context. For details, see the documentation for the -refentry.date.profile parameter. - - - - - - -refentry.manual.profile -string - - -refentry.manual.profile -Specifies profile for refentry "manual" data - - - - -<xsl:param name="refentry.manual.profile"> - (($info[//title])[last()]/title)[1]| - ../title/node() -</xsl:param> - - - -Description - -The value of refentry.manual.profile is -a string representing an XPath expression. It is evaluated at -run-time and used only if -refentry.manual.profile.enabled is -non-zero. Otherwise, the refentry metadata-gathering logic -"hard coded" into the stylesheets is used. - -In man pages, this content is usually displayed in the middle of -the header of the page. The man(7) man page -describes this as "the title of the manual (e.g., Linux -Programmer's Manual)". Here are some examples from -existing man pages: - - - dpkg utilities - (dpkg-name) - - - User Contributed Perl Documentation - (GET) - - - GNU Development Tools - (ld) - - - Emperor Norton Utilities - (ddate) - - - Debian GNU/Linux manual - (faked) - - - GIMP Manual Pages - (gimp) - - - KDOC Documentation System - (qt2kdoc) - - - - - - - - - -refentry.manual.profile.enabled -boolean - - -refentry.manual.profile.enabled -Enable refentry "manual" profiling? - - - - -<xsl:param name="refentry.manual.profile.enabled">0</xsl:param> - - -Description - -If the value of -refentry.manual.profile.enabled is -non-zero, then during refentry metadata gathering, the info -profile specified by the customizable -refentry.manual.profile parameter is -used. - -If instead the value of -refentry.manual.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "manual" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "manual" data to show -up in your output, then consider setting a non-zero value for -refentry.manual.profile.enabled and adjusting -the value of refentry.manual.profile to cause -correct data to be gathered. - -Note that the term "manual" has a special meanings in this -context. For details, see the documentation for the -refentry.manual.profile parameter. - - - - - - -refentry.source.name.suppress -boolean - - -refentry.source.name.suppress -Suppress "name" part of refentry "source" contents? - - - - -<xsl:param name="refentry.source.name.suppress">0</xsl:param> - - -Description - -If the value of -refentry.source.name.suppress is non-zero, then -during refentry metadata gathering, no "source name" data -is added to the refentry "source" contents. Instead (unless -refentry.version.suppress is also non-zero), -only "version" data is added to the "source" contents. - -If you find that the refentry metadata gathering -mechanism is causing unwanted "source name" data to show up in your -output -- for example, in the footer (or possibly header) of a man -page -- then you might consider setting a non-zero value for -refentry.source.name.suppress. - -Note that the terms "source", "source name", and "version" have -special meanings in this context. For details, see the documentation -for the refentry.source.name.profile -parameter. - - - - - - -refentry.source.name.profile -string - - -refentry.source.name.profile -Specifies profile for refentry "source name" data - - - - -<xsl:param name="refentry.source.name.profile"> - (($info[//productname])[last()]/productname)[1]| - (($info[//corpname])[last()]/corpname)[1]| - (($info[//corpcredit])[last()]/corpcredit)[1]| - (($info[//corpauthor])[last()]/corpauthor)[1]| - (($info[//orgname])[last()]/orgname)[1]| - (($info[//publishername])[last()]/publishername)[1] -</xsl:param> - - - -Description - -The value of refentry.source.name.profile -is a string representing an XPath expression. It is evaluated at -run-time and used only if -refentry.source.name.profile.enabled is -non-zero. Otherwise, the refentry metadata-gathering logic -"hard coded" into the stylesheets is used. - -A "source name" is one part of a (potentially) two-part -Name Version -"source" field. In man pages, it is usually displayed in the left -footer of the page. It typically indicates the software system or -product that the item documented in the man page belongs to. The -man(7) man page describes it as "the source of -the command", and provides the following examples: - - - For binaries, use something like: GNU, NET-2, SLS - Distribution, MCC Distribution. - - - For system calls, use the version of the kernel that you - are currently looking at: Linux 0.99.11. - - - For library calls, use the source of the function: GNU, BSD - 4.3, Linux DLL 4.4.1. - - - - -In practice, there are many pages that simply have a Version -number in the "source" field. So, it looks like what we have is a -two-part field, -Name Version, -where: - - - Name - - product name (e.g., BSD) or org. name (e.g., GNU) - - - - Version - - version number - - - -Each part is optional. If the Name is a -product name, then the Version is probably -the version of the product. Or there may be no -Name, in which case, if there is a -Version, it is probably the version -of the item itself, not the product it is part of. Or, if the -Name is an organization name, then there -probably will be no Version. - - - - - -refentry.source.name.profile.enabled -boolean - - -refentry.source.name.profile.enabled -Enable refentry "source name" profiling? - - - - -<xsl:param name="refentry.source.name.profile.enabled">0</xsl:param> - - -Description - -If the value of -refentry.source.name.profile.enabled is -non-zero, then during refentry metadata gathering, the info -profile specified by the customizable -refentry.source.name.profile parameter is -used. - -If instead the value of -refentry.source.name.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "source name" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "source name" data to -show up in your output, then consider setting a non-zero value for -refentry.source.name.profile.enabled and -adjusting the value of -refentry.source.name.profile to cause correct -data to be gathered. - -Note that the terms "source" and "source name" have special -meanings in this context. For details, see the documentation for the -refentry.source.name.profile parameter. - - - - - - -refentry.version.suppress -boolean - - -refentry.version.suppress -Suppress "version" part of refentry "source" contents? - - - - -<xsl:param name="refentry.version.suppress">0</xsl:param> - - -Description - -If the value of refentry.version.suppress -is non-zero, then during refentry metadata gathering, no -"version" data is added to the refentry "source" -contents. Instead (unless -refentry.source.name.suppress is also -non-zero), only "source name" data is added to the "source" -contents. - -If you find that the refentry metadata gathering -mechanism is causing unwanted "version" data to show up in your output --- for example, in the footer (or possibly header) of a man page -- -then you might consider setting a non-zero value for -refentry.version.suppress. - -Note that the terms "source", "source name", and "version" have -special meanings in this context. For details, see the documentation -for the refentry.source.name.profile -parameter. - - - - - - -refentry.version.profile -string - - -refentry.version.profile -Specifies profile for refentry "version" data - - - - -<xsl:param name="refentry.version.profile"> - (($info[//productnumber])[last()]/productnumber)[1]| - (($info[//edition])[last()]/edition)[1]| - (($info[//releaseinfo])[last()]/releaseinfo)[1] -</xsl:param> - - - -Description - -The value of refentry.version.profile is -a string representing an XPath expression. It is evaluated at -run-time and used only if -refentry.version.profile.enabled is -non-zero. Otherwise, the refentry metadata-gathering logic -"hard coded" into the stylesheets is used. - -A "source.name" is one part of a (potentially) two-part -Name Version -"source" field. For more details, see the documentation for the -refentry.source.name.profile parameter. - - - - - - -refentry.version.profile.enabled -boolean - - -refentry.version.profile.enabled -Enable refentry "version" profiling? - - - - -<xsl:param name="refentry.version.profile.enabled">0</xsl:param> - - -Description - -If the value of -refentry.version.profile.enabled is -non-zero, then during refentry metadata gathering, the info -profile specified by the customizable -refentry.version.profile parameter is -used. - -If instead the value of -refentry.version.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "version" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "version" data to show -up in your output, then consider setting a non-zero value for -refentry.version.profile.enabled and adjusting -the value of refentry.version.profile to cause -correct data to be gathered. - -Note that the terms "source" and "version" have special -meanings in this context. For details, see the documentation for the -refentry.version.profile parameter. - - - - - - -refentry.manual.fallback.profile -string - - -refentry.manual.fallback.profile -Specifies profile of "fallback" for refentry "manual" data - - - - -<xsl:param name="refentry.manual.fallback.profile"> -refmeta/refmiscinfo[not(@class = 'date')][1]/node()</xsl:param> - - - -Description - -The value of -refentry.manual.fallback.profile is a string -representing an XPath expression. It is evaluated at run-time and -used only if no "manual" data can be found by other means (that is, -either using the refentry metadata-gathering logic "hard -coded" in the stylesheets, or the value of -refentry.manual.profile, if it is -enabled). - - -Depending on which XSLT engine you run, either the EXSLT -dyn:evaluate extension function (for xsltproc or -Xalan) or saxon:evaluate extension function (for -Saxon) are used to dynamically evaluate the value of -refentry.manual.fallback.profile at -run-time. If you don't use xsltproc, Saxon, Xalan -- or some other -XSLT engine that supports dyn:evaluate -- you -must manually disable fallback processing by setting an empty value -for the refentry.manual.fallback.profile -parameter. - - - - - - - -refentry.source.fallback.profile -string - - -refentry.source.fallback.profile -Specifies profile of "fallback" for refentry "source" data - - - - -<xsl:param name="refentry.source.fallback.profile"> -refmeta/refmiscinfo[not(@class = 'date')][1]/node()</xsl:param> - - - -Description - -The value of -refentry.source.fallback.profile is a string -representing an XPath expression. It is evaluated at run-time and used -only if no "source" data can be found by other means (that is, either -using the refentry metadata-gathering logic "hard coded" in -the stylesheets, or the value of the -refentry.source.name.profile and -refentry.version.profile parameters, if those -are enabled). - - -Depending on which XSLT engine you run, either the EXSLT -dyn:evaluate extension function (for xsltproc or -Xalan) or saxon:evaluate extension function (for -Saxon) are used to dynamically evaluate the value of -refentry.source.fallback.profile at -run-time. If you don't use xsltproc, Saxon, Xalan -- or some other -XSLT engine that supports dyn:evaluate -- you -must manually disable fallback processing by setting an empty value -for the refentry.source.fallback.profile -parameter. - - - - - - - Page header/footer - - -man.th.extra1.suppress -boolean - - -man.th.extra1.suppress -Suppress extra1 part of header/footer? - - - - -<xsl:param name="man.th.extra1.suppress">0</xsl:param> - - -Description - -If the value of man.th.extra1.suppress is -non-zero, then the extra1 part of the -.TH title line header/footer is suppressed. - -The content of the extra1 field is almost -always displayed in the center footer of the page and is, universally, -a date. - - - - - - -man.th.extra2.suppress -boolean - - -man.th.extra2.suppress -Suppress extra2 part of header/footer? - - - - -<xsl:param name="man.th.extra2.suppress">0</xsl:param> - - -Description - -If the value of man.th.extra2.suppress is -non-zero, then the extra2 part of the -.TH title line header/footer is suppressed. - -The content of the extra2 field is usually -displayed in the left footer of the page and is typically "source" -data, often in the form -Name Version; -for example, "GTK+ 1.2" (from the gtk-options(7) -man page). - - - You can use the - refentry.source.name.suppress and - refentry.version.suppress parameters to - independently suppress the Name and - Version parts of the - extra2 field. - - - - - - - -man.th.extra3.suppress -boolean - - -man.th.extra3.suppress -Suppress extra3 part of header/footer? - - - - -<xsl:param name="man.th.extra3.suppress">0</xsl:param> - - -Description - -If the value of man.th.extra3.suppress is -non-zero, then the extra3 part of the -.TH title line header/footer is -suppressed. - -The content of the extra3 field is usually -displayed in the middle header of the page and is typically a "manual -name"; for example, "GTK+ User's Manual" (from the -gtk-options(7) man page). - - - - - - -man.th.title.max.length -integer - - -man.th.title.max.length -Maximum length of title in header/footer - - - - -<xsl:param name="man.th.title.max.length">20</xsl:param> - - - -Description - -Specifies the maximum permitted length of the title part of the -man-page .TH title line header/footer. If the title -exceeds the maxiumum specified, it is truncated down to the maximum -permitted length. - -Details - - -Every man page generated using the DocBook stylesheets has a -title line, specified using the TH roff -macro. Within that title line, there is always, at a minimum, a title, -followed by a section value (representing a man "section" -- usually -just a number). - -The title and section are displayed, together, in the visible -header of each page. Where in the header they are displayed depends on -OS the man page is viewed on, and on what version of nroff/groff/man -is used for viewing the page. But, at a minimum and across all -systems, the title and section are displayed on the right-hand column -of the header. On many systems -- those with a modern groff, including -Linux systems -- they are displayed twice: both in the left and right -columns of the header. - -So if the length of the title exceeds a certain percentage of -the column width in which the page is viewed, the left and right -titles can end up overlapping, making them unreadable, or breaking to -another line, which doesn't look particularly good. - -So the stylesheets provide the -man.th.title.max.length parameter as a means -for truncating titles that exceed the maximum length that can be -viewing properly in a page header. - -The default value is reasonable but somewhat arbitrary. If you -have pages with long titles, you may want to experiment with changing -the value in order to achieve the correct aesthetic results. - - - - - - - -man.th.extra2.max.length -integer - - -man.th.extra2.max.length -Maximum length of extra2 in header/footer - - - - -<xsl:param name="man.th.extra2.max.length">30</xsl:param> - - - -Description - -Specifies the maximum permitted length of the -extra2 part of the man-page part of the -.TH title line header/footer. If the -extra2 content exceeds the maxiumum specified, it -is truncated down to the maximum permitted length. - -The content of the extra2 field is usually -displayed in the left footer of the page and is typically "source" -data indicating the software system or product that the item -documented in the man page belongs to, often in the form -Name Version; -for example, "GTK+ 1.2" (from the gtk-options(7) -man page). - -The default value for this parameter is reasonable but somewhat -arbitrary. If you are processing pages with long "source" information, -you may want to experiment with changing the value in order to achieve -the correct aesthetic results. - - - - - -man.th.extra3.max.length -integer - - -man.th.extra3.max.length -Maximum length of extra3 in header/footer - - - - -<xsl:param name="man.th.extra3.max.length">30</xsl:param> - - - -Description - -Specifies the maximum permitted length of the -extra3 part of the man-page .TH -title line header/footer. If the extra3 content -exceeds the maxiumum specified, it is truncated down to the maximum -permitted length. - -The content of the extra3 field is usually -displayed in the middle header of the page and is typically a "manual -name"; for example, "GTK+ User's Manual" (from the -gtk-options(7) man page). - -The default value for this parameter is reasonable but somewhat -arbitrary. If you are processing pages with long "manual names" -- or -especially if you are processing pages that have both long "title" -parts (command/function, etc. names) and long -manual names -- you may want to experiment with changing the value in -order to achieve the correct aesthetic results. - - - - - Output - - - man.output.manifest.enabled - boolean - - - man.output.manifest.enabled - Generate a manifest file? - - - - <xsl:param name="man.output.manifest.enabled" select="0"></xsl:param> - - - Description - - If non-zero, a list of filenames for man pages generated by - the stylesheet transformation is written to the file named by the - man.output.manifest.filename parameter. - - - - - - - man.output.manifest.filename - string - - - man.output.manifest.filename - Name of manifest file - - - - <xsl:param name="man.output.manifest.filename">MAN.MANIFEST</xsl:param> - - - Description - - The man.output.manifest.filename parameter - specifies the name of the file to which the manpages manifest file - is written (if the value of the - man.output.manifest.enabled parameter is - non-zero). - - - - - - -man.output.in.separate.dir -boolean - - -man.output.in.separate.dir -Output man-page files in separate output directory? - - - - -<xsl:param name="man.output.in.separate.dir" select="0"></xsl:param> - - - -Description - -If the value of man.output.in.separate.dir -parameter is non-zero, man-page files are output in a separate -directory, specified by the man.output.base.dir -parameter; otherwise, if the value of -man.output.in.separate.dir is zero, man-page files -are not output in a separate directory. - - - - - - -man.output.lang.in.name.enabled -boolean - - -man.output.lang.in.name.enabled -Include $LANG value in man-page filename/pathname? - - - - -<xsl:param name="man.output.lang.in.name.enabled" select="0"></xsl:param> - - - -Description - - The man.output.lang.in.name.enabled - parameter specifies whether a $lang value is - included in man-page filenames and pathnames. - - If the value of - man.output.lang.in.name.enabled is non-zero, - man-page files are output with the $lang value - included in their filenames or pathnames as follows; - - - - if man.output.subdirs.enabled is - non-zero, each file is output to, e.g., a - man/$lang/man8/foo.8 - pathname - - - if man.output.subdirs.enabled is - zero, each file is output with a - foo.$lang.8 - filename - - - - - - - - - -man.output.base.dir -uri - - -man.output.base.dir -Specifies separate output directory - - - -<xsl:param name="man.output.base.dir">man/</xsl:param> - - -Description - -The man.output.base.dir parameter -specifies the base directory into which man-page files are output. The -man.output.subdirs.enabled parameter controls -whether the files are output in subdirectories within the base -directory. - - - The values of the man.output.base.dir - and man.output.subdirs.enabled parameters are - used only if the value of - man.output.in.separate.dir parameter is - non-zero. If the value of the - man.output.in.separate.dir is zero, man-page - files are not output in a separate directory. - - - - - - - -man.output.subdirs.enabled -boolean - - -man.output.subdirs.enabled -Output man-page files in subdirectories within base output directory? - - - - -<xsl:param name="man.output.subdirs.enabled" select="1"></xsl:param> - - - -Description - -The man.output.subdirs.enabled parameter -controls whether man-pages files are output in subdirectories within -the base directory specified by the directory specified by the -man.output.base.dir parameter. - - - The values of the man.output.base.dir - and man.output.subdirs.enabled parameters are - used only if the value of - man.output.in.separate.dir parameter is - non-zero. If the value of the - man.output.in.separate.dir is zero, man-page - files are not output in a separate directory. - - - - - - - -man.output.quietly -boolean - - -man.output.quietly -Suppress filename messages emitted when generating output? - - - - -<xsl:param name="man.output.quietly" select="0"></xsl:param> - - - -Description - -If zero (the default), for each man-page file created, a message -with the name of the file is emitted. If non-zero, the files are -output "quietly" -- that is, the filename messages are -suppressed. - - - If you are processing a large amount of refentry - content, you may be able to speed up processing significantly by - setting a non-zero value for - man.output.quietly. - - - - - - - -man.output.encoding -string - - -man.output.encoding -Encoding used for man-page output - - - - -<xsl:param name="man.output.encoding">UTF-8</xsl:param> - - - -Description - -This parameter specifies the encoding to use for files generated -by the manpages stylesheet. Not all processors support specification -of this parameter. - - - If the value of the man.charmap.enabled - parameter is non-zero (the default), keeping the - man.output.encoding parameter at its default - value (UTF-8) or setting it to - UTF-16 does not cause your - man pages to be output in raw UTF-8 or UTF-16 -- because - any Unicode characters for which matches are found in the enabled - character map will be replaced with roff escape sequences before the - final man-page files are generated. - - So if you want to generate "real" UTF-8 man pages, without any - character substitution being performed on your content, you need to - set man.charmap.enabled to zero (which will - completely disable character-map processing). - - You may also need to set - man.charmap.enabled to zero if you want to - output man pages in an encoding other than UTF-8 - or UTF-16. Character-map processing is based on - Unicode character values and may not work with other output - encodings. - - - - - - - -man.output.better.ps.enabled -boolean - - -man.output.better.ps.enabled -Enable enhanced print/PostScript output? - - - -<xsl:param name="man.output.better.ps.enabled">0</xsl:param> - - -Description - -If the value of the -man.output.better.ps.enabled parameter is -non-zero, certain markup is embedded in each generated man page -such that PostScript output from the man -Tps -command for that page will include a number of enhancements -designed to improve the quality of that output. - -If man.output.better.ps.enabled is -zero (the default), no such markup is embedded in generated man -pages, and no enhancements are included in the PostScript -output generated from those man pages by the man - -Tps command. - - - The enhancements provided by this parameter rely on - features that are specific to groff (GNU troff) and that are - not part of “classic” AT&T troff or any of its - derivatives. Therefore, any man pages you generate with this - parameter enabled will be readable only on systems on which - the groff (GNU troff) program is installed, such as GNU/Linux - systems. The pages will not not be - readable on systems on with the classic troff (AT&T - troff) command is installed. - - -The value of this parameter only affects PostScript output - generated from the man command. It has no - effect on output generated using the FO backend. - - - You can generate PostScript output for any man page by - running the following command: - man FOO -Tps > FOO.ps - You can then generate PDF output by running the following - command: - ps2pdf FOO.ps - - - - - - - Other - - -man.table.footnotes.divider -string - - -man.table.footnotes.divider -Specifies divider string that appears before table footnotes - - - - -<xsl:param name="man.table.footnotes.divider">----</xsl:param> - - - -Description - -In each table that contains footenotes, the string specified by -the man.table.footnotes.divider parameter is -output before the list of footnotes for the table. - - - - - - -man.subheading.divider.enabled -boolean - - -man.subheading.divider.enabled -Add divider comment to roff source before/after subheadings? - - - - -<xsl:param name="man.subheading.divider.enabled">0</xsl:param> - - - -Description - -If the value of the -man.subheading.divider.enabled parameter is -non-zero, the contents of the -man.subheading.divider parameter are used to -add a "divider" before and after subheadings in the roff -output. The divider is not visisble in the -rendered man page; it is added as a comment, in the source, -simply for the purpose of increasing reability of the source. - -If man.subheading.divider.enabled is zero -(the default), the subheading divider is suppressed. - - - - - - -man.subheading.divider -string - - -man.subheading.divider -Specifies string to use as divider comment before/after subheadings - - - - -<xsl:param name="man.subheading.divider">========================================================================</xsl:param> - - - -Description - -If the value of the -man.subheading.divider.enabled parameter is -non-zero, the contents of the -man.subheading.divider parameter are used to -add a "divider" before and after subheadings in the roff -output. The divider is not visisble in the -rendered man page; it is added as a comment, in the source, -simply for the purpose of increasing reability of the source. - -If man.subheading.divider.enabled is zero -(the default), the subheading divider is suppressed. - - - - - -
    - - - - Roundtrip Parameter Reference - - - This is reference documentation for all user-configurable - parameters in the DocBook “Roundtrip” Stylesheets (for - transforming DocBook to WordML, OpenDocument, and Apple Pages, - and for converting from those formats back to DocBook). - - - - - - -wordml.template -uri - - -wordml.template -Specify the template WordML document - - - - -<xsl:param name="wordml.template"></xsl:param> - - - -Description - -The wordml.template parameter specifies a WordML document to use as a template for the generated document. The template document is used to define the (extensive) headers for the generated document, in particular the paragraph and character styles that are used to format the various elements. Any content in the template document is ignored. - -A template document is used in order to allow maintenance of the paragraph and character styles to be done using Word itself, rather than these XSL stylesheets. - - - - - - -pages.template -uri - - -pages.template -Specify the template Pages document - - - - -<xsl:param name="pages.template"></xsl:param> - - - -Description - -The pages.template parameter specifies a Pages (the Apple word processing application) document to use as a template for the generated document. The template document is used to define the (extensive) headers for the generated document, in particular the paragraph and character styles that are used to format the various elements. Any content in the template document is ignored. - -A template document is used in order to allow maintenance of the paragraph and character styles to be done using Pages itself, rather than these XSL stylesheets. - - - - - - - Slides Parameter Reference - - - - This is reference documentation for all - user-configurable parameters in the DocBook XSL Slides - stylesheets (for generating HTML and PDF slide - presentations). - - The Slides stylesheet for HTML output is a - customization layer of the DocBook XSL HTML - stylesheet; the Slides stylesheet for FO output is a - customization layer of the DocBook XSL FO stylesheet. - Therefore, in addition to the slides-specific - parameters listed in this section, you can also use a - number of HTML stylesheet - parameters and FO - stylesheet parameters to control Slides - output. - - - -HTML: General Parameters - - -keyboard.nav -boolean - - -keyboard.nav -Enable keyboard navigation? - - - - -<xsl:param name="keyboard.nav" select="1"></xsl:param> - - - -Description - -If non-zero, JavaScript is added to the slides to enable keyboard -navigation. Pressing 'n', space, or return moves forward; pressing 'p' moves -backward. - - - - - - -css.stylesheet -uri - - -css.stylesheet -CSS stylesheet for slides - - - - -<xsl:param name="css.stylesheet">slides.css</xsl:param> - - - -Description - -Identifies the CSS stylesheet used by all the slides. This parameter -can be set in the source document with the <?dbhtml?> pseudo-attribute -css-stylesheet. - - - - - - -css.stylesheet.dir -uri - - -css.stylesheet.dir -Default directory for CSS stylesheets - - - - -<xsl:param name="css.stylesheet.dir"></xsl:param> - - - -Description - -Identifies the default directory for the CSS stylesheet -generated on all the slides. This parameter can be set in the source -document with the <?dbhtml?> pseudo-attribute -css-stylesheet-dir. - -If non-empty, this value is prepended to each of the stylesheets. - - - - - - - -titlefoil.html -filename - - -titlefoil.html -Name of title foil HTML file - - - - -<xsl:param name="titlefoil.html" select="concat('index', $html.ext)"></xsl:param> - - - -Description - -Sets the filename used for the slides titlepage. - - - - - - -toc.html -filename - - -toc.html -Name of ToC HTML file - - - - -<xsl:param name="toc.html" select="concat('toc', $html.ext)"></xsl:param> - - - -Description - -Sets the filename used for the table of contents page. - - - - - - -foilgroup.toc -boolean - - -foilgroup.toc -Put ToC on foilgroup pages? - - - - -<xsl:param name="foilgroup.toc" select="1"></xsl:param> - - - -Description - -If non-zero, a ToC will be placed on foilgroup pages (after any -other content). - - - - - - - -output.indent -list -no -yes - - -output.indent -Indent output? - - - - -<xsl:param name="output.indent">no</xsl:param> - - - -Description - -Specifies the setting of the indent -parameter on the HTML slides. For more information, see the discussion -of the xsl:output element in the XSLT specification. -Select from yes or no. - - - - - - -overlay -boolean - - -overlay -Overlay footer navigation? - - - - -<xsl:param name="overlay" select="0"></xsl:param> - - - -Description - -If non-zero, JavaScript is added to the slides to make the -bottom navigation appear at the bottom of each page. This option and -multiframe are mutually exclusive. - -If this parameter is zero, the bottom navigation simply appears -below the content of each slide. - - - - - - -show.foil.number -boolean - - -show.foil.number -Show foil number on each foil? - - - - -<xsl:param name="show.foil.number" select="0"></xsl:param> - - - -Description - -If non-zero, on each slide there will be its number. Currently -not supported in all output formats. - - - - - -HTML: Frames Parameters - - -nav.separator -boolean - - -nav.separator -Output separator between navigation and body? - - - - -<xsl:param name="nav.separator" select="1"></xsl:param> - - - -Description - -If non-zero, a separator (<HR>) is -added between the navigation links and the content of each slide. - - - - - - -toc.row.height -length - - -toc.row.height -Height of ToC rows in dynamic ToCs - - - - -<xsl:param name="toc.row.height">22</xsl:param> - - - -Description - -This parameter specifies the height of each row in the table of -contents. This is only applicable if a dynamic ToC is used. You may want to -adjust this parameter for optimal appearance with the font and image -sizes selected by your CSS -stylesheet. - - - - - - - -toc.bg.color -color - - -toc.bg.color -Background color for ToC frame - - - - -<xsl:param name="toc.bg.color">#FFFFFF</xsl:param> - - - -Description - -Specifies the background color used in the ToC frame. - - - - - - -body.bg.color -color - - -body.bg.color -Background color for body frame - - - - -<xsl:param name="body.bg.color">#FFFFFF</xsl:param> - - - -Description - -Specifies the background color used in the body column of -tabular slides. - - - - - - -toc.width -length - - -toc.width -Width of ToC frame - - - - -<xsl:param name="toc.width">250</xsl:param> -<!-- Presumably in pixels? --> - - - -Description - -Specifies the width of the ToC frame in pixels. - - - - - - -toc.hide.show -boolean - - -toc.hide.show -Enable hide/show button for ToC frame - - - - -<xsl:param name="toc.hide.show" select="0"></xsl:param> - - - -Description - -If non-zero, JavaScript (and an additional icon, see -hidetoc.image and -showtoc.image) is added to each slide -to allow the ToC panel to be toggled on each panel. - -There is a bug in Mozilla 1.0 (at least as of CR3) that causes -the browser to reload the titlepage when this feature is used. - - - - - - -dynamic.toc -boolean - - -dynamic.toc -Dynamic ToCs? - - - - -<xsl:param name="dynamic.toc" select="0"></xsl:param> - - - -Description - -If non-zero, JavaScript is used to make the ToC panel dynamic. -In a dynamic ToC, each section in the ToC can be expanded and collapsed by -clicking on the appropriate image. - - - - - - -active.toc -boolean - - -active.toc -Active ToCs? - - - - -<xsl:param name="active.toc" select="0"></xsl:param> - - - -Description - -If non-zero, JavaScript is used to keep the ToC and the current slide -in sync. That is, each time the slide changes, the corresponding -ToC entry will be underlined. - - - - - - - - -multiframe -boolean - - -multiframe -Use multiple frames for slide bodies? - - - - -<xsl:param name="multiframe" select="0"></xsl:param> - - - -Description - -If non-zero, multiple frames are used for the body of each -slide. This is one way of forcing the slide navigation elements to -appear in constant locations. The other way is with overlays. The overlay and -multiframe parameters are mutually -exclusive. - - - - - - -multiframe.top.bgcolor -color - - -multiframe.top.bgcolor -Background color for top navigation frame - - - - -<xsl:param name="multiframe.top.bgcolor">white</xsl:param> - - - -Description - -Specifies the background color of the top navigation frame when -multiframe is enabled. - - - - - - -multiframe.bottom.bgcolor -color - - -multiframe.bottom.bgcolor -Background color for bottom navigation frame - - - - -<xsl:param name="multiframe.bottom.bgcolor">white</xsl:param> - - - -Description - -Specifies the background color of the bottom navigation frame when -multiframe is enabled. - - - - - - -multiframe.navigation.height -length - - -multiframe.navigation.height -Height of navigation frames - - - - -<xsl:param name="multiframe.navigation.height">40</xsl:param> - - - -Description - -Specifies the height of the navigation frames in pixels when -multiframe is enabled. - - - - - -HTML: Graphics Parameters - - -graphics.dir -uri - - -graphics.dir -Graphics directory - - - - -<xsl:param name="graphics.dir"></xsl:param> - - - -Description - -Identifies the graphics directory for the navigation components -generated on all the slides. This parameter can be set in the source -document with the <?dbhtml?> pseudo-attribute -graphics-dir. - -If non-empty, this value is prepended to each of the graphic -image paths. - - - - - - -bullet.image -filename - - -bullet.image -Bullet image - - - - -<xsl:param name="bullet.image">toc/bullet.png</xsl:param> - - - -Description - -Specifies the filename of the bullet image used for foils in the -framed ToC. - - - - - - -next.image -filename - - -next.image -Right-arrow image - - - - -<xsl:param name="next.image">active/nav-next.png</xsl:param> - - - -Description - -Specifies the filename of the right-pointing navigation arrow. - - - - - - -prev.image -filename - - -prev.image -Left-arrow image - - - - -<xsl:param name="prev.image">active/nav-prev.png</xsl:param> - - - -Description - -Specifies the filename of the left-pointing navigation arrow. - - - - - - -up.image -filename - - -up.image -Up-arrow image - - - - -<xsl:param name="up.image">active/nav-up.png</xsl:param> - - - -Description - -Specifies the filename of the upward-pointing navigation arrow. - - - - - - -home.image -filename - - -home.image -Home image - - - - -<xsl:param name="home.image">active/nav-home.png</xsl:param> - - - -Description - -Specifies the filename of the home navigation icon. - - - - - - -toc.image -filename - - -toc.image -ToC image - - - - -<xsl:param name="toc.image">active/nav-toc.png</xsl:param> - - - -Description - -Specifies the filename of the ToC navigation icon. - - - - - - - -no.next.image -filename - - -no.next.image -Inactive right-arrow image - - - - -<xsl:param name="no.next.image">inactive/nav-next.png</xsl:param> - - - -Description - -Specifies the filename of the inactive right-pointing navigation arrow. - - - - - - -no.prev.image -filename - - -no.prev.image -Inactive left-arrow image - - - - -<xsl:param name="no.prev.image">inactive/nav-prev.png</xsl:param> - - - -Description - -Specifies the filename of the inactive left-pointing navigation arrow. - - - - - - -no.up.image -filename - - -no.up.image -Inactive up-arrow image - - - - -<xsl:param name="no.up.image">inactive/nav-up.png</xsl:param> - - - -Description - -Specifies the filename of the inactive upward-pointing navigation arrow. - - - - - - -no.home.image -filename - - -no.home.image -Inactive home image - - - - -<xsl:param name="no.home.image">inactive/nav-home.png</xsl:param> - - - -Description - -Specifies the filename of the inactive home navigation icon. - - - - - - -no.toc.image -filename - - -no.toc.image -Inactive ToC image - - - - -<xsl:param name="no.toc.image">inactive/nav-toc.png</xsl:param> - - - -Description - -Specifies the filename of the inactive ToC navigation icon. - - - - - - - -plus.image -filename - - -plus.image -Plus image - - - - -<xsl:param name="plus.image">toc/closed.png</xsl:param> - - - -Description - -Specifies the filename of the plus image; the image used in a -dynamic ToC to indicate that a section -can be expanded. - - - - - - -minus.image -filename - - -minus.image -Minus image - - - - -<xsl:param name="minus.image">toc/open.png</xsl:param> - - - -Description - -Specifies the filename of the minus image; the image used in a -dynamic ToC to indicate that a section -can be collapsed. - - - - - - -hidetoc.image -filename - - -hidetoc.image -Hide ToC image - - - - -<xsl:param name="hidetoc.image">hidetoc.gif</xsl:param> - - - -Description - -Specifies the filename of the hide ToC image. This is used -when the ToC hide/show parameter is -enabled. - - - - - - -showtoc.image -filename - - -showtoc.image -Show ToC image - - - - -<xsl:param name="showtoc.image">showtoc.gif</xsl:param> - - - -Description - -Specifies the filename of the show ToC image. This is used -when the ToC hide/show parameter is -enabled. - - - - - -HTML: JavaScript Parameters - - -script.dir -uri - - -script.dir -Script directory - - - - -<xsl:param name="script.dir"></xsl:param> - - - -Description - -Identifies the JavaScript source directory for the slides. -This parameter can be set in the source -document with the <?dbhtml?> pseudo-attribute -script-dir. - -If non-empty, this value is prepended to each of the JavaScript files. - - - - - - - -ua.js -filename - - -ua.js -UA JavaScript file - - - - -<xsl:param name="ua.js">ua.js</xsl:param> - - - -Description - -Specifies the filename of the UA JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -xbDOM.js -filename - - -xbDOM.js -xbDOM JavaScript file - - - - -<xsl:param name="xbDOM.js">xbDOM.js</xsl:param> - - - -Description - -Specifies the filename of the xbDOM JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -xbStyle.js -filename - - -xbStyle.js -xbStyle JavaScript file - - - - -<xsl:param name="xbStyle.js">xbStyle.js</xsl:param> - - - -Description - -Specifies the filename of the xbStyle JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -xbLibrary.js -filename - - -xbLibrary.js -xbLibrary JavaScript file - - - - -<xsl:param name="xbLibrary.js">xbLibrary.js</xsl:param> - - - -Description - -Specifies the filename of the xbLibrary JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -xbCollapsibleLists.js -filename - - -xbCollapsibleLists.js -xbCollapsibleLists JavaScript file - - - - -<xsl:param name="xbCollapsibleLists.js">xbCollapsibleLists.js</xsl:param> - - - -Description - -Specifies the filename of the xbCollapsibleLists JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -overlay.js -filename - - -overlay.js -Overlay JavaScript file - - - - -<xsl:param name="overlay.js">overlay.js</xsl:param> - - - -Description - -Specifies the filename of the overlay JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -slides.js -filename - - -slides.js -Slides overlay file - - - - -<xsl:param name="slides.js">slides.js</xsl:param> - - - -Description - -Specifies the filename of the slides JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - -HTML: Localization Parameters - - -text.home -string - - -text.home -Home - - - - -<xsl:param name="text.home">Home</xsl:param> - - - -Description - -FIXME: - - - - - - -text.toc -string - - -text.toc -FIXME: - - - - -<xsl:param name="text.toc">ToC</xsl:param> - - - -Description - -FIXME: - - - - - - -text.prev -string - - -text.prev -FIXME: - - - - -<xsl:param name="text.prev">Prev</xsl:param> - - - -Description - -FIXME: - - - - - - -text.up -string - - -text.up -FIXME: - - - - -<xsl:param name="text.up">Up</xsl:param> - - - -Description - -FIXME: - - - - - - -text.next -string - - -text.next -FIXME: - - - - -<xsl:param name="text.next">Next</xsl:param> - - - -Description - -FIXME: - - - - - - - - - FO: General Params - - -slide.title.font.family -list -open -serif -sans-serif -monospace - - -slide.title.font.family -Specifies font family to use for slide titles - - - - -<xsl:param name="slide.title.font.family">Helvetica</xsl:param> - - - -Description - -Specifies the font family to use for slides titles. - - - - - - -slide.font.family -list -open -serif -sans-serif -monospace - - -slide.font.family -Specifies font family to use for slide bodies - - - - -<xsl:param name="slide.font.family">Helvetica</xsl:param> - - - -Description - -Specifies the font family to use for slides bodies. - - - - - - -foil.title.master -number - - -foil.title.master -Specifies unitless font size to use for foil titles - - - - -<xsl:param name="foil.title.master">36</xsl:param> -<!-- Inconsistant use of point size? --> - - - -Description - -Specifies a unitless font size to use for foil titles; used in -combination with the foil.title.size -parameter. - - - - - -foil.title.size -length - - -foil.title.size -Specifies font size to use for foil titles, including units - - - - - <xsl:param name="foil.title.size"> - <xsl:value-of select="$foil.title.master"></xsl:value-of><xsl:text>pt</xsl:text> - </xsl:param> - - - -Description - -This parameter combines the value of the -foil.title.master parameter with a unit -specification. The default unit is pt -(points). - - - - - - FO: Property Sets - - -slides.properties -attribute set - - -slides.properties -Specifies properties for all slides - - - - - <xsl:attribute-set name="slides.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$slide.font.family"></xsl:value-of> - </xsl:attribute> - </xsl:attribute-set> - - - -Description - -This parameter specifies properties that are applied to all slides. - - - - - - -foilgroup.properties -attribute set - - -foilgroup.properties -Specifies properties for all foilgroups - - - - - <xsl:attribute-set name="foilgroup.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$slide.font.family"></xsl:value-of> - </xsl:attribute> - </xsl:attribute-set> - - - -Description - -This parameter specifies properties that are applied to all foilgroups. - - - - - - -foil.subtitle.properties -attribute set - - -foil.subtitle.properties -Specifies properties for all foil subtitles - - - - - <xsl:attribute-set name="foil.subtitle.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$slide.title.font.family"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="text-align">center</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$foil.title.master * 0.8"></xsl:value-of><xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after">12pt</xsl:attribute> - </xsl:attribute-set> - - - -Description - -This parameter specifies properties that are applied to all foil subtitles. - - - - - - -foil.properties -attribute set - - -foil.properties -Specifies properties for all foils - - - - - <xsl:attribute-set name="foil.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$slide.font.family"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="margin-{$direction.align.start}">1in</xsl:attribute> - <xsl:attribute name="margin-{$direction.align.end}">1in</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.size"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - </xsl:attribute-set> - - - -Description - -This parameter specifies properties that are applied to all foils. - - - - - - -speakernote.properties -attribute set - - -speakernote.properties -Specifies properties for all speakernotes - - - - - <xsl:attribute-set name="speakernote.properties"> - <xsl:attribute name="font-family">Times Roman</xsl:attribute> - <xsl:attribute name="font-style">italic</xsl:attribute> - <xsl:attribute name="font-size">12pt</xsl:attribute> - <xsl:attribute name="font-weight">normal</xsl:attribute> - </xsl:attribute-set> - - - -Description - -This parameter specifies properties that are applied to all speakernotes. - - - - - - -running.foot.properties -attribute set - - -running.foot.properties -Specifies properties for running foot on each slide - - - - - <xsl:attribute-set name="running.foot.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$slide.font.family"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-size">14pt</xsl:attribute> - <xsl:attribute name="color">#9F9F9F</xsl:attribute> - </xsl:attribute-set> - - - -Description - -This parameter specifies properties that are applied to the -running foot area of each slide. - - - - - - - - - - Website Parameter Reference - - - This is reference documentation for all user-configurable - parameters in the DocBook XSL Website stylesheet (for - generating websites from DocBook XML sources). Note that the - Website stylesheet is a customization layer of the DocBook XSL - HTML stylesheet. Therefore, in addition to the - Website-specific parameters listed in this section, you can - also use a number of HTML - stylesheet parameters to control Website output. - - - -General Parameters - - -autolayout-file -filename - - -autolayout-file -Identifies the autolayout.xml file - - - - -<xsl:param name="autolayout-file">autolayout.xml</xsl:param> - - - -Description -When the source pages are spread over several directories, this -parameter can be set (for example, from the command line of a batch-mode -XSLT processor) to indicate the location of the autolayout.xml file. -FIXME: for browser-based use, there needs to be a PI for this... - - - - - - -body.attributes -attribute set - - -body.attributes -DEPRECATED - - - - -<xsl:attribute-set name="body.attributes"> - <xsl:attribute name="bgcolor">white</xsl:attribute> - <xsl:attribute name="text">black</xsl:attribute> - <xsl:attribute name="link">#0000FF</xsl:attribute> - <xsl:attribute name="vlink">#840084</xsl:attribute> - <xsl:attribute name="alink">#0000FF</xsl:attribute> -</xsl:attribute-set> - - - -Description -DEPRECATED - - - - - -currentpage.marker -string - - -currentpage.marker -The text symbol used to mark the current page - - - - -<xsl:param name="currentpage.marker">@</xsl:param> - - - -Description -Character to use as identifying the current page in - - - - - -dry-run -boolean - - -dry-run -Indicates that no files should be produced - - - - <xsl:param name="dry-run" select="0"></xsl:param> - - -Description -When using the XSLT processor to manage dependencies and construct -the website, this parameter can be used to suppress the generation of -new and updated files. Effectively, this allows you to see what the -stylesheet would do, without actually making any changes. -Only applies when XSLT-based chunking is being used. - - - - - -feedback.href -uri - - -feedback.href -HREF (URI) for feedback link - - - - -<xsl:param name="feedback.href"></xsl:param> - - - -Description -The feedback.href value is used as the value -for the href attribute on the feedback -link. If feedback.href -is empty, no feedback link is generated. - - - - - -feedback.link.text -string - - -feedback.link.text -The text of the feedback link - - - - -<xsl:param name="feedback.link.text">Feedback</xsl:param> - - - -Description -The contents of this variable is used as the text of the feedback -link if feedback.href is not empty. If -feedback.href is empty, no feedback link is -generated. - - - - - -feedback.with.ids -boolean - - -feedback.with.ids -Toggle use of IDs in feedback - - - - -<xsl:param name="feedback.with.ids" select="0"></xsl:param> - - - -Description -If feedback.with.ids is non-zero, the ID of the -current page will be added to the feedback link. This can be used, for -example, if the feedback.href is a CGI script. - - - - - -filename-prefix -string - - -filename-prefix -Prefix added to all filenames - - - - -<xsl:param name="filename-prefix"></xsl:param> - - - -Description -To produce the text-only (that is, non-tabular) layout -of a website simultaneously with the tabular layout, the filenames have to -be distinguished. That's accomplished by adding the -filename-prefix to the front of each filename. - - - - - -footer.hr -boolean - - -footer.hr -Toggle <HR> before footer - - - - -<xsl:param name="footer.hr" select="1"></xsl:param> - - - -Description -If non-zero, an <HR> is generated at the bottom of each web page, -before the footer. - - - - - -header.hr -boolean - - -header.hr -Toggle <HR> after header - - - - -<xsl:param name="header.hr" select="1"></xsl:param> - - - -Description -If non-zero, an <HR> is generated at the bottom of each web page, -before the footer. - - - - - -output-root -filename - - -output-root -Specifies the root directory of the website - - - - -<xsl:param name="output-root">.</xsl:param> - - - -Description -When using the XSLT processor to manage dependencies and construct -the website, this parameter can be used to indicate the root directory -where the resulting pages are placed. -Only applies when XSLT-based chunking is being used. - - - - - -rebuild-all -boolean - - -rebuild-all -Indicates that all files should be produced - - - - -<xsl:param name="rebuild-all" select="0"></xsl:param> - - - -Description -When using the XSLT processor to manage dependencies and construct -the website, this parameter can be used to regenerate the whole website, -updating even pages that don't appear to need to be updated. -The dependency extension only looks at the source documents. So -if you change something in the stylesheet, for example, that has a global -effect, you can use this parameter to force the stylesheet to rebuild the -whole website. - -Only applies when XSLT-based chunking is being used. - - - - - -sequential.links -boolean - - -sequential.links -Make sequentional links? - - - - -<xsl:param name="sequential.links" select="0"></xsl:param> - - - -Description -FIXME - - - - - -suppress.homepage.title -boolean - - -suppress.homepage.title -Suppress title on homepage? - - - - -<xsl:param name="suppress.homepage.title" select="1"></xsl:param> - - - -Description -FIXME:If non-zero, the title on the homepage is suppressed? - - - - - -table.spacer.image -filename - - -table.spacer.image -Invisible pixel for tabular accessibility - - - - -<xsl:param name="table.spacer.image">graphics/spacer.gif</xsl:param> - - - -Description -This is the 1x1 pixel, transparent pixel used for the table trick to increase the accessibility of the tabular -website presentation. - - - - -Navigation Parameters - - -banner.before.navigation -boolean - - -banner.before.navigation -Put banner before navigation? - - - - -<xsl:param name="banner.before.navigation" select="1"></xsl:param> - - - -Description -FIXME - - - - - -navbgcolor -color - - -navbgcolor -The background color of the navigation TOC - - - - -<xsl:param name="navbgcolor">#4080FF</xsl:param> - - - -Description -The background color of the navigation TOC. -Only applies with the tabular presentation is being used. - - - - - -navbodywidth -length - - -navbodywidth -Specifies the width of the navigation table body - - - - -<xsl:param name="navbodywidth"></xsl:param> - - - -Description -The width of the body column. -Only applies with the tabular presentation is being used. - - - - - -nav.table.summary -string - - -nav.table.summary -HTML Table summary attribute value for navigation tables - - - - -<xsl:param name="nav.table.summary">Navigation</xsl:param> - - - -Description -The value of this parameter is used as the value of the table -summary attribute for the navigation table. -Only applies with the tabular presentation is being used. - - - - - -navtocwidth -length - - -navtocwidth -Specifies the width of the navigation table TOC - - - - -<xsl:param name="navtocwidth">220</xsl:param> - - - -Description -The width, in pixels, of the navigation column. -Only applies with the tabular presentation is being used. - - - - - -textbgcolor -color - - -textbgcolor -The background color of the table body - - - - -<xsl:param name="textbgcolor">white</xsl:param> - - - -Description -The background color of the table body. -Only applies with the tabular presentation is being used. - - - - -ToC Parameters - - -toc.blank.graphic -boolean - - -toc.blank.graphic -Use graphic for "blanks" in TOC? - - - - -<xsl:param name="toc.blank.graphic" select="1"></xsl:param> - - - -Description -If non-zero, "blanks" in the the TOC will be accomplished -with the graphic identified by toc.spacer.image. - -Only applies with the tabular presentation is being used. - - - - - -toc.blank.image -filename - - -toc.blank.image -The image for "blanks" in the TOC - - - - -<xsl:param name="toc.blank.image">graphics/blank.gif</xsl:param> - - - -Description -If toc.blank.graphic is non-zero, this image -will be used to for "blanks" in the TOC. -Only applies with the tabular presentation is being used. - - - - - -toc.blank.text -string - - -toc.blank.text -The text for "blanks" in the TOC - - - - -<xsl:param name="toc.blank.text">   </xsl:param> - - - -Description -If toc.blank.graphic is zero, this text string -will be used for "blanks" in the TOC. -Only applies with the tabular presentation is being used. - - - - - -toc.pointer.graphic -boolean - - -toc.pointer.graphic -Use graphic for TOC pointer? - - - - -<xsl:param name="toc.pointer.graphic" select="1"></xsl:param> - - - -Description -If non-zero, the "pointer" in the TOC will be displayed -with the graphic identified by toc.pointer.image. - -Only applies with the tabular presentation is being used. - - - - - -toc.pointer.image -filename - - -toc.pointer.image -The image for the "pointer" in the TOC - - - - -<xsl:param name="toc.pointer.image">graphics/arrow.gif</xsl:param> - - - -Description -If toc.pointer.graphic is non-zero, this image -will be used for the "pointer" in the TOC. -Only applies with the tabular presentation is being used. - - - - - -toc.pointer.text -string - - -toc.pointer.text -The text for the "pointer" in the TOC - - - - -<xsl:param name="toc.pointer.text"> > </xsl:param> - - - -Description -If toc.pointer.graphic is zero, this text string -will be used to display the "pointer" in the TOC. -Only applies with the tabular presentation is being used. - - - - - -toc.spacer.graphic -boolean - - -toc.spacer.graphic -Use graphic for TOC spacer? - - - - -<xsl:param name="toc.spacer.graphic" select="1"></xsl:param> - - - -Description -If non-zero, the indentation in the TOC will be accomplished -with the graphic identified by toc.spacer.image. - -Only applies with the tabular presentation is being used. - - - - - -toc.spacer.image -filename - - -toc.spacer.image -The image for spacing the TOC - - - - -<xsl:param name="toc.spacer.image">graphics/blank.gif</xsl:param> - - - -Description -If toc.spacer.graphic is non-zero, this image -will be used to indent the TOC. -Only applies with the tabular presentation is being used. - - - - - -toc.spacer.text -string - - -toc.spacer.text -The text for spacing the TOC - - - - -<xsl:param name="toc.spacer.text">   </xsl:param> - - - -Description -If toc.spacer.graphic is zero, this text string -will be used to indent the TOC. -Only applies with the tabular presentation is being used. - - - - - -
    - DocBook XSL Stylesheets User Reference: PIs - - - - - This is generated reference documentation for all - user-specifiable processing instructions in the DocBook - XSL stylesheets. - - You add these PIs at particular points in a document to - cause specific “exceptions” to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - HTML Processing Instruction Reference - - $Id: pi.xsl 8394 2009-04-02 20:31:30Z mzjn $ - - - - Introduction - -This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for HTML output. - - -You add these PIs at particular points in a document to - cause specific “exceptions” to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - -dbhtml_background-color -Sets background color for an image - - - - dbhtml background-color="color" - - -Description - -Use the dbhtml background-color PI before or - after an image (graphic, inlinegraphic, - imagedata, or videodata element) as a - sibling to the element, to set a background color for the - image. - - Parameters - - - background-color="color" - - -An HTML color value - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Background color - - - - - -dbhtml_bgcolor -Sets background color on a CALS table row or table cell - - - - dbhtml bgcolor="color" - - -Description - -Use the dbhtml bgcolor PI as child of a CALS table row - or cell to set a background color for that table row or cell. - - Parameters - - - bgcolor="color" - - -An HTML color value - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Cell background color - - - - - -dbhtml_cellpadding -Specifies cellpadding in CALS table or qandaset output - - - - dbhtml cellpadding="number" - - -Description - -Use the dbhtml cellpadding PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellpadding attribute in the - output HTML table. - - Parameters - - - cellpadding="number" - - -Specifies the cellpadding - - - - - - Related Global Parameters - -html.cellpadding - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Cell spacing and cell padding, - Q and A formatting - - - - - -dbhtml_cellspacing -Specifies cellspacing in CALS table or qandaset output - - - - dbhtml cellspacing="number" - - -Description - -Use the dbhtml cellspacing PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellspacing attribute in the - output HTML table. - - Parameters - - - cellspacing="number" - - -Specifies the cellspacing - - - - - - Related Global Parameters - -html.cellspacing - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Cell spacing and cell padding, - Q and A formatting - - - - - -dbhtml_class -Set value of the class attribute for a CALS table row - - - - dbhtml class="name" - - -Description - -Use the dbhtml class PI as a child of a - row to specify a class - attribute and value in the HTML output for that row. - - Parameters - - - class="name" - - -Specifies the class name - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Table styles in HTML output - - - - - -dbhtml_dir -Specifies a directory name in which to write files - - - - dbhtml dir="path" - - -Description - -When chunking output, use the dbhtml dir PI - as a child of a chunk source to cause the output of that - chunk to be written to the specified directory; also, use it - as a child of a mediaobject to specify a - directory into which any long-description files for that - mediaobject will be written. - - Parameters - - - dir="path" - - -Specifies the pathname for the directory - - - - - - Related Global Parameters - -base.dir - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -dbhtml dir processing instruction - - - - - -dbhtml_filename -Specifies a filename for a chunk - - - - dbhtml filename="filename" - - -Description - -When chunking output, use the dbhtml filename - PI as a child of a chunk source to specify a filename for - the output file for that chunk. - - Parameters - - - filename="path" - - -Specifies the filename for the file - - - - - - Related Global Parameters - -use.id.as.filename - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -dbhtml filenames - - - - - -dbhtml_funcsynopsis-style -Specifies presentation style for a funcsynopsis - - - - dbhtml funcsynopsis-style="kr"|"ansi" - - -Description - -Use the dbhtml funcsynopsis-style PI as a child of - a funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - Parameters - - - funcsynopsis-style="kr" - - -Displays funcprototype output in K&R style - - - - funcsynopsis-style="ansi" - - -Displays funcprototype output in ANSI style - - - - - - Related Global Parameters - -funcsynopsis.style - - - - - -dbhtml_img.src.path -Specifies a path to the location of an image file - - - - dbhtml img.src.path="path" - - -Description - -Use the dbhtml img.src.path PI before or - after an image (graphic, - inlinegraphic, imagedata, or - videodata element) as a sibling to the element, - to specify a path to the location of the image; in HTML - output, the value specified for the - img.src.path attribute is prepended to the - filename. - - Parameters - - - img.src.path="path" - - -Specifies the pathname to prepend to the name of the image file - - - - - - Related Global Parameters - -img.src.path - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Using fileref - - - - - -dbhtml_label-width -Specifies the label width for a qandaset - - - - dbhtml label-width="width" - - -Description - -Use the dbhtml label-width PI as a child of a - qandaset to specify the width of labels. - - Parameters - - - label-width="width" - - -Specifies the label width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Q and A formatting - - - - - -dbhtml_linenumbering.everyNth -Specifies interval for line numbers in verbatims - - - - dbhtml linenumbering.everyNth="N" - - -Description - -Use the dbhtml linenumbering.everyNth PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the interval at which lines are numbered. - - Parameters - - - linenumbering.everyNth="N" - - -Specifies numbering interval; a number is output - before every Nth line - - - - - - Related Global Parameters - -linenumbering.everyNth - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbhtml_linenumbering.separator -Specifies separator text for line numbers in verbatims - - - - dbhtml linenumbering.separator="text" - - -Description - -Use the dbhtml linenumbering.separator PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the separator text output between the line numbers and content. - - Parameters - - - linenumbering.separator="text" - - -Specifies the text (zero or more characters) - - - - - - Related Global Parameters - -linenumbering.separator - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbhtml_linenumbering.width -Specifies width for line numbers in verbatims - - - - dbhtml linenumbering.width="width" - - -Description - -Use the dbhtml linenumbering.width PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the width set aside for line numbers. - - Parameters - - - linenumbering.width="width" - - -Specifies the width (inluding units) - - - - - - Related Global Parameters - -linenumbering.width - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbhtml_list-presentation -Specifies presentation style for a variablelist or - segmentedlist - - - - dbhtml list-presentation="list"|"table" - - -Description - -Use the dbhtml list-presentation PI as a child of - a variablelist or segmentedlist to - control the presentation style for the list (to cause it, for - example, to be displayed as a table). - - Parameters - - - list-presentation="list" - - -Displays the list as a list - - - - list-presentation="table" - - -Displays the list as a table - - - - - - Related Global Parameters - - - - -variablelist.as.table - - - - -segmentedlist.as.table - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_list-width -Specifies the width of a variablelist or simplelist - - - - dbhtml list-width="width" - - -Description - -Use the dbhtml list-width PI as a child of a - variablelist or a simplelist presented - as a table, to specify the output width. - - Parameters - - - list-width="width" - - -Specifies the output width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_row-height -Specifies the height for a CALS table row - - - - dbhtml row-height="height" - - -Description - -Use the dbhtml row-height PI as a child of a - row to specify the height of the row. - - Parameters - - - row-height="height" - - -Specifies the row height (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Row height - - - - - -dbhtml_start -(obsolete) Sets the starting number on an ordered list - - - - dbhtml start="character" - - -Description - -This PI is obsolete. The intent of - this PI was to provide a means for setting a specific starting - number for an ordered list. Instead of this PI, set a value - for the override attribute on the first - listitem in the list; that will have the same - effect as what this PI was intended for. - - Parameters - - - start="character" - - -Specifies the character to use as the starting - number; use 0-9, a-z, A-Z, or lowercase or uppercase - Roman numerals - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -List starting number - - - - - -dbhtml_stop-chunking -Do not chunk any descendants of this element. - - - - dbhtml stop-chunking - - -Description - -When generating chunked HTML output, adding this PI as the child of an element that contains elements that would normally be generated on separate pages if generating chunked output causes chunking to stop at this point. No descendants of the current element will be split into new HTML pages: -<section> -<title>Configuring pencil</title> -<?dbhtml stop-chunking?> - -... - -</section> - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Chunking into multiple HTML files - - - - - -dbhtml_table-summary -Specifies summary for CALS table, variablelist, segmentedlist, or qandaset output - - - - dbhtml table-summary="text" - - -Description - -Use the dbhtml table-summary PI as a child of - a CALS table, variablelist, - segmentedlist, or qandaset to specify - the text for the HTML summary attribute - in the output HTML table. - - Parameters - - - table-summary="text" - - -Specifies the summary text (zero or more characters) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML, - Table summary text - - - - - -dbhtml_table-width -Specifies the width for a CALS table - - - - dbhtml table-width="width" - - -Description - -Use the dbhtml table-width PI as a child of a - CALS table to specify the width of the table in - output. - - Parameters - - - table-width="width" - - -Specifies the table width (including units or as a percentage) - - - - - - Related Global Parameters - -default.table.width - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Table width - - - - - -dbhtml_term-presentation -Sets character formatting for terms in a variablelist - - - - dbhtml term-presentation="bold"|"italic"|"bold-italic" - - -Description - -Use the dbhtml term-presentation PI as a child - of a variablelist to set character formatting for - the term output of the list. - - Parameters - - - term-presentation="bold" - - -Specifies that terms are displayed in bold - - - - term-presentation="italic" - - -Specifies that terms are displayed in italic - - - - term-presentation="bold-italic" - - -Specifies that terms are displayed in bold-italic - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_term-separator -Specifies separator text among terms in a varlistentry - - - - dbhtml term-separator="text" - - -Description - -Use the dbhtml term-separator PI as a child - of a variablelist to specify the separator text - among term instances. - - Parameters - - - term-separator="text" - - -Specifies the text (zero or more characters) - - - - - - Related Global Parameters - -variablelist.term.separator - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_term-width -Specifies the term width for a variablelist - - - - dbhtml term-width="width" - - -Description - -Use the dbhtml term-width PI as a child of a - variablelist to specify the width for - term output. - - Parameters - - - term-width="width" - - -Specifies the term width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_toc -Specifies whether a TOC should be generated for a qandaset - - - - dbhtml toc="0"|"1" - - -Description - -Use the dbhtml toc PI as a child of a - qandaset to specify whether a table of contents - (TOC) is generated for the qandaset. - - Parameters - - - toc="0" - - -If zero, no TOC is generated - - - - toc="1" - - -If 1 (or any non-zero value), - a TOC is generated - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Q and A list of questions, - Q and A formatting - - - - - -dbcmdlist -Generates a hyperlinked list of commands - - - - dbcmdlist - - -Description - -Use the dbcmdlist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - cmdsynopsis instances; a hyperlinked navigational - “command list” will be generated at the top of output for that - element, enabling users to quickly jump - to each command synopsis. - - Parameters - -[No parameters] - - - - - -dbfunclist -Generates a hyperlinked list of functions - - - - dbfunclist - - -Description - -Use the dbfunclist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - funcsynopsis instances; a hyperlinked - navigational “function list” will be generated at the top of - output for that element, enabling users to quickly - jump to to each function synopsis. - - Parameters - -[No parameters] - - - - - -dbhtml-include_href -Copies an external well-formed HTML/XML file into current doc - - - - dbhtml-include href="URI" - - -Description - -Use the dbhtml-include href PI anywhere in a - document to cause the contents of the file referenced by the - href pseudo-attribute to be copied/inserted “as - is” into your HTML output at the point in document order - where the PI occurs in the source. - - - -The referenced file may contain plain text (as long as - it is “wrapped” in an html element — see the - note below) or markup in any arbitrary vocabulary, - including HTML — but it must conform to XML - well-formedness constraints (because the feature in XSLT - 1.0 for opening external files, the - document() function, can only handle - files that meet XML well-formedness constraints). - - -Among other things, XML well-formedness constraints - require a document to have a single root - element. So if the content you want to - include is plain text or is markup that does - not have a single root element, - wrap the content in an - html element. The stylesheets will - strip out that surrounding html “wrapper” when - they find it, leaving just the content you want to - insert. - - - Parameters - - - href="URI" - - -Specifies the URI for the file to include; the URI - can be, for example, a remote http: - URI, or a local filesystem file: - URI - - - - - - Related Global Parameters - -textinsert.extension - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Inserting external HTML code, - External code files - - - - - -dbhh -Sets topic name and topic id for context-sensitive HTML Help - - - - dbhh topicname="name" topicid="id" - - -Description - -Use the dbhh PI as a child of components - that should be used as targets for context-sensitive help requests. - - Parameters - - - topicname="name" - - -Specifies a unique string constant that identifies a help topic - - - - topicid="id" - - -Specifies a unique integer value for the topicname string - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Context-sensitive help - - - - - - FO Processing Instruction Reference - - $Id: pi.xsl 8487 2009-07-14 21:43:36Z bobstayton $ - - - - - Introduction - - -This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for FO output. - - -You add these PIs at particular points in a document to - cause specific “exceptions” to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - -dbfo_background-color -Sets background color for an image - - - - dbfo background-color="color" - - -Description - -Use the dbfo background-color PI before or - after an image (graphic, inlinegraphic, - imagedata, or videodata element) as a - sibling to the element, to set a background color for the - image. - - Parameters - - - background-color="color" - - -An HTML color value - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Background color - - - - - -dbfo_bgcolor -Sets background color on a table row or table cell - - - - dbfo bgcolor="color" - - -Description - -Use the dbfo bgcolor PI as child of a table row - or cell to set a background color for that table row or cell. - - -This PI works for both CALS and HTML tables. - - Parameters - - - bgcolor="color" - - -An HTML color value - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Cell background color - - - - - -dbfo_float-type -Specifies float behavior for a sidebar - - - - dbfo float-type="margin.note" - - -Description - -Use the dbfo float-type PI to specify the float - behavior for a sidebar (to cause the sidebar to be - displayed as a marginal note). - - Parameters - - - float-type="margin.note" - - -Specifies that the sidebar should be - displayed as a marginal note. - - - - - - Related Global Parameters - -sidebar.float.type (parameter), - sidebar.float.width (parameter), - sidebar.properties (attribute-set), - sidebar.title.properties (attribute-set) - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -A sidebar as - side float - - - - - -dbfo_funcsynopsis-style -Specifies presentation style for a funcsynopsis - - - - dbfo funcsynopsis-style="kr"|"ansi" - - -Description - -Use the dbfo funcsynopsis-style PI as a child of - a funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - Parameters - - - funcsynopsis-style="kr" - - -Displays funcprototype output in K&R style - - - - funcsynopsis-style="ansi" - - -Displays funcprototype output in ANSI style - - - - - - Related Global Parameters - -funcsynopsis.style - - - - - -dbfo_glossary-presentation -Specifies presentation style for a glossary - - - - dbfo glossary-presentation="list"|"blocks" - - -Description - -Use the dbfo glossary-presentation PI as a child of - a glossary to control its presentation style. - - Parameters - - - glossary-presentation="list" - - -Displays the glossary as a list - - - - glossary-presentation="blocks" - - -Displays the glossary as blocks - - - - - - Related Global Parameters - -glossary.as.blocks - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Glossary - formatting in print - - - - - -dbfo_glosslist-presentation -Specifies presentation style for a glosslist - - - - dbfo glosslist-presentation="list"|"blocks" - - -Description - -Use the dbfo glosslist-presentation PI as a child of - a glosslist to control its presentation style. - - Parameters - - - glosslist-presentation="list" - - -Displays the glosslist as a list - - - - glosslist-presentation="blocks" - - -Displays the glosslist as blocks - - - - - - Related Global Parameters - -glosslist.as.blocks - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Glossary - formatting in print - - - - - -dbfo_glossterm-width -Specifies the glossterm width for a glossary or - glosslist - - - - dbfo glossterm-width="width" - - -Description - -Use the dbfo glossterm-width PI as a child of a - glossary or glosslist to specify the - width for output of glossterm instances in the - output. - - Parameters - - - glossterm-width="width" - - -Specifies the glossterm width (including units) - - - - - - Related Global Parameters - -glossterm.width, - glossterm.separation - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Glossary - formatting in print - - - - - -dbfo_keep-together -Specifies “keep” behavior for a table, example, - figure, equation, procedure, or task - - - - dbfo keep-together="auto"|"always" - - -Description - -Use the dbfo keep-together PI as a child of a - formal object (table, example, - figure, equation, procedure, or - task) to specify “keep” behavior (to allow the object to - “break” across a page). - - -The PI also works with informaltable, informalexample, - informalfigure and informalequation. - - - - Parameters - - - keep-together="auto" - - -Enables the object to break across a page - - - - keep-together="always" - - -Prevents the object from breaking across a page (the - default stylesheet behavior) - - - - - - Related Global Parameters - -formal.object.properties - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Keep-together processing instruction - - - - - -dbfo_label-width -Specifies the label width for a qandaset, itemizedlist, orderedlist - or calloutlist - - - - dbfo label-width="width" - - -Description - -Use the dbfo label-width PI as a child of a - qandaset, itemizedlist, orderedlist, - or calloutlist to specify the width of labels. - - Parameters - - - label-width="width" - - -Specifies the label width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Q and A formatting - - - - - -dbfo_linenumbering.everyNth -Specifies interval for line numbers in verbatims - - - - dbfo linenumbering.everyNth="N" - - -Description - -Use the dbfo linenumbering.everyNth PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the interval at which lines are numbered. - - Parameters - - - linenumbering.everyNth="N" - - -Specifies numbering interval; a number is output - before every Nth line - - - - - - Related Global Parameters - -linenumbering.everyNth - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbfo_linenumbering.separator -Specifies separator text for line numbers in verbatims - - - - dbfo linenumbering.separator="text" - - -Description - -Use the dbfo linenumbering.separator PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the separator text output between the line numbers and content. - - Parameters - - - linenumbering.separator="text" - - -Specifies the text (zero or more characters) - - - - - - Related Global Parameters - -linenumbering.separator - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbfo_linenumbering.width -Specifies width for line numbers in verbatims - - - - dbfo linenumbering.width="width" - - -Description - -Use the dbfo linenumbering.width PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the width set aside for line numbers. - - Parameters - - - linenumbering.width="width" - - -Specifies the width (inluding units) - - - - - - Related Global Parameters - -linenumbering.width - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbfo_list-presentation -Specifies presentation style for a variablelist or - segmentedlist - - - - dbfo list-presentation="list"|"blocks"|"table" - - -Description - -Use the dbfo list-presentation PI as a child of - a variablelist or segmentedlist to - control the presentation style for the list (to cause it, for - example, to be displayed as a table). - - Parameters - - - list-presentation="list" - - -Displays the list as a list - - - - list-presentation="blocks" - - -(variablelist only) Displays the list as blocks - - - - list-presentation="table" - - -(segmentedlist only) Displays the list as a table - - - - - - Related Global Parameters - - - - -variablelist.as.blocks - - - - -variablelist.as.table - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in print - - - - - -dbfo_list-width -Specifies the width of a horizontal simplelist - - - - dbfo list-width="width" - - -Description - -Use the dbfo list-width PI as a child of a - simplelist whose class - value is horizontal, to specify the width - of the simplelist. - - Parameters - - - list-width="width" - - -Specifies the simplelist width (including units) - - - - - - - - - -dbfo_orientation -Specifies the orientation for a CALS table row or cell - - - - dbfo orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270" - - -Description - -Use the dbfo orientation PI as a child of a CALS - table row or cell to specify the orientation - (rotation) for the row or cell. - - Parameters - - - orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270" - - -Specifies the number of degrees by which the cell or - row is rotated - - - - - - - - - -dbfo_pgwide -Specifies if an equation or example goes across full page width - - - - dbfo pgwide="0"|"1" - - -Description - -Use the dbfo pgwide PI as a child of an - equation or example to specify that the - content should rendered across the full width of the page. - - Parameters - - - pgwide="0" - - -If zero, the content is rendered across the current - text flow - - - - pgwide="1" - - -If 1 (or any non-zero value), the - content is rendered across the full width of the page - - - - - - Related Global Parameters - -pgwide.properties - - - - - -dbfo_rotated-width -Specifies the width for a CALS table entry or - row - - - - dbfo rotated-width="width" - - -Description - -Use the dbfo rotated-width PI as a child of - entry or row instance in a CALS table to specify the - width of that the entry or row; or - use it higher up in table to cause the width to be inherited - recursively down. - - Parameters - - - rotated-width="width" - - -Specifies the width of a row or cell (including units) - - - - - - - - - -dbfo_sidebar-width -Specifies the width of a sidebar - - - - dbfo sidebar-width="width" - - -Description - -Use the dbfo sidebar-width PI as a child of a - sidebar to specify the width of the sidebar. - - Parameters - - - sidebar-width="width" - - -Specifies the sidebar width (including units) - - - - - - Related Global Parameters - -sidebar.float.type parameter, - sidebar.float.width parameter, - sidebar.properties attribute-set, - sidebar.title.properties - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -A sidebar as - side float - - - - - -dbfo_start -(obsolete) Sets the starting number on an ordered list - - - - dbfo start="character" - - -Description - -This PI is obsolete. The intent of - it was to provide a means for setting a specific starting - number for an ordered list. Instead of this PI, set a value - for the override attribute on the first - listitem in the list; that will have the same - effect as what this PI was intended for. - - Parameters - - - start="character" - - -Specifies the character to use as the starting - number; use 0-9, a-z, A-Z, or lowercase or uppercase - Roman numerals - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -List starting number - - - - - -dbfo_table-width -Specifies the width for a CALS table or for revhistory - output - - - - dbfo table-width="width" - - -Description - -Use the dbfo table-width PI as a child or - sibling of a CALS table, or as a child of an - informaltable, entrytbl, or - revhistory instance (which is rendered as a table - in output) to specify the width of the table in output. - - Parameters - - - table-width="width" - - -Specifies the table width (including units or as a percentage) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Table width - - - - - -dbfo_term-width -Specifies the term width for a variablelist - - - - dbfo term-width="width" - - -Description - -Use the dbfo term-width PI as a child of a - variablelist to specify the width for - term output. - - Parameters - - - term-width="width" - - -Specifies the term width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in print - - - - - -dbfo_toc -Specifies whether a TOC should be generated for a qandaset - - - - dbfo toc="0"|"1" - - -Description - -Use the dbfo toc PI as a child of a - qandaset to specify whether a table of contents - (TOC) is generated for the qandaset. - - Parameters - - - toc="0" - - -If zero, no TOC is generated - - - - toc="1" - - -If 1 (or any non-zero value), - a TOC is generated - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Q and A list of questions, - Q and A formatting - - - - - -dbfo-need -Specify a need for space (a kind of soft page break) - - - - dbfo-need height="n" [space-before="n"] - - -Description - -A “need” is a request for space on a page. If the - requested space is not available, the page breaks and the - content that follows the need request appears on the next - page. If the requested space is available, then no page break - is inserted. - - Parameters - - - height="n" - - -The amount of height needed (including units) - - - - space-before="n" - - -The amount of extra vertical space to add (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Soft page breaks - - - - - -dbfo_row-height -Specifies the height for a CALS table row - - - - dbfo row-height="height" - - -Description - -Use the dbfo row-height PI as a child of a - row to specify the height of the row. - - Parameters - - - row-height="height" - - -Specifies the row height (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Row height - - - - - - manpages Processing Instruction Reference - - $Id: pi.xsl 7644 2008-01-16 11:04:07Z xmldoc $ - - - - Introduction - -This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for manpages output. - - -You add these PIs at particular points in a document to - cause specific “exceptions” to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - -dbman_funcsynopsis-style -Specifies presentation style for a funcsynopsis. - - - - dbman funcsynopsis-style="kr"|"ansi" - - -Description - -Use the dbman - funcsynopsis-style PI as a child of a - funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - Parameters - - - funcsynopsis-style="kr" - - -Displays the funcprototype in K&R style - - - - funcsynopsis-style="ansi" - - -Displays the funcprototype in ANSI style - - - - - - Related Global Parameters - -man.funcsynopsis.style - - - - - - Common Processing Instruction Reference - - $Id: pi.xsl 8782 2010-07-27 21:15:17Z mzjn $ - - - - Introduction - -This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the - “common” part of the DocBook XSL stylesheets. - - -You add these PIs at particular points in a document to - cause specific “exceptions” to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - -dbchoice_choice -Generates a localized choice separator - - - - dbchoice choice="and"|"or"|string" - - -Description - -Use the dbchoice choice PI to - generate an appropriate localized “choice” separator (for - example, and or or) - before the final item in an inline simplelist - - - -This PI is a less-than-ideal hack; support for it may - disappear in the future (particularly if and when a more - appropriate means for marking up "choice" lists becomes - available in DocBook). - - - Parameters - - - choice="and" - - -generates a localized and separator - - - - choice="or" - - -generates a localized or separator - - - - choice="string" - - -generates a literal string separator - - - - - - - - - -dbtimestamp -Inserts a date timestamp - - - - dbtimestamp format="formatstring" [padding="0"|"1"] - - -Description - -Use the dbtimestamp PI at any point in a - source document to cause a date timestamp (a formatted - string representing the current date and time) to be - inserted in output of the document. - - Parameters - - - format="formatstring" - - -Specifies format in which the date and time are - output - - - -For details of the content of the format string, - see Date and time. - - - - - padding="0"|"1" - - -Specifies padding behavior; if non-zero, padding is is added - - - - - - - - - -dbtex_delims -Generates delimiters around embedded TeX equations - in output - - - - dbtex delims="no"|"yes" - - -Description - -Use the dbtex delims PI as a - child of a textobject containing embedded TeX - markup, to cause that markup to be surrounded by - $ delimiter characters in output. - - - -This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - Parameters - - - dbtex delims="no"|"yes" - - -Specifies whether delimiters are output - - - - - - Related Global Parameters - -tex.math.delims - - - - - - DocBook XSL Stylesheets Developer Reference - - - This is technical reference documentation for - developers using the DocBook XSL Stylesheets. It is not - intended to be user documentation, but is instead - provided for developers writing customization layers for - the stylesheets. - - - - - - XSL Library Template Reference - - Introduction - This is technical reference documentation for the - vocabulary-independent “library” templates in the DocBook XSL - Stylesheets. - This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - General Library Templates - - - -dot.count -Returns the number of . characters in a string - - -Description - - Given a string, the dot.count - template returns the number of dot/period characters in the - string. This template is useful, for example, when testing the - nesting level of nested inline markup (for nested emphasis, - quotations, etc.). - - -<xsl:template name="dot.count"> - <!-- Returns the number of "." characters in a string --> - <xsl:param name="string"></xsl:param> - <xsl:param name="count" select="0"></xsl:param> - <xsl:choose> - <xsl:when test="contains($string, '.')"> - <xsl:call-template name="dot.count"> - <xsl:with-param name="string" select="substring-after($string, '.')"></xsl:with-param> - <xsl:with-param name="count" select="$count+1"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$count"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - - -copy-string -Returns count copies of a string - - -Description - - Given a string, the copy-string - template creates n copies of the - string, when the value of n is - given by the count parameter. - - -<xsl:template name="copy-string"> - <!-- returns 'count' copies of 'string' --> - <xsl:param name="string"></xsl:param> - <xsl:param name="count" select="0"></xsl:param> - <xsl:param name="result"></xsl:param> - - <xsl:choose> - <xsl:when test="$count>0"> - <xsl:call-template name="copy-string"> - <xsl:with-param name="string" select="$string"></xsl:with-param> - <xsl:with-param name="count" select="$count - 1"></xsl:with-param> - <xsl:with-param name="result"> - <xsl:value-of select="$result"></xsl:value-of> - <xsl:value-of select="$string"></xsl:value-of> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$result"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - - -string.subst -Substitute one text string for another in a string - - -Description - -The string.subst template replaces all -occurances of target in string -with replacement and returns the result. - - - -<xsl:template name="string.subst"> - <xsl:param name="string"></xsl:param> - <xsl:param name="target"></xsl:param> - <xsl:param name="replacement"></xsl:param> - - <xsl:choose> - <xsl:when test="contains($string, $target)"> - <xsl:variable name="rest"> - <xsl:call-template name="string.subst"> - <xsl:with-param name="string" select="substring-after($string, $target)"></xsl:with-param> - <xsl:with-param name="target" select="$target"></xsl:with-param> - <xsl:with-param name="replacement" select="$replacement"></xsl:with-param> - </xsl:call-template> - </xsl:variable> - <xsl:value-of select="concat(substring-before($string, $target), $replacement, $rest)"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$string"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - - -xpointer.idref -Extract IDREF from an XPointer - - -Description - -The xpointer.idref template returns the -ID portion of an XPointer which is a pointer to an ID within the current -document, or the empty string if it is not. -In other words, xpointer.idref returns -foo when passed either #foo -or #xpointer(id('foo')), otherwise it returns -the empty string. - - -<xsl:template name="xpointer.idref"> - <xsl:param name="xpointer">http://...</xsl:param> - <xsl:choose> - <xsl:when test="starts-with($xpointer, '#xpointer(id(')"> - <xsl:variable name="rest" select="substring-after($xpointer, '#xpointer(id(')"></xsl:variable> - <xsl:variable name="quote" select="substring($rest, 1, 1)"></xsl:variable> - <xsl:value-of select="substring-before(substring-after($xpointer, $quote), $quote)"></xsl:value-of> - </xsl:when> - <xsl:when test="starts-with($xpointer, '#')"> - <xsl:value-of select="substring-after($xpointer, '#')"></xsl:value-of> - </xsl:when> - <!-- otherwise it's a pointer to some other document --> - </xsl:choose> -</xsl:template> - - - - - - - - - - -length-magnitude -Return the unqualified dimension from a length specification - - -Description - -The length-magnitude template returns the -unqualified length ("20" for "20pt") from a dimension. - - - -<xsl:template name="length-magnitude"> - <xsl:param name="length" select="'0pt'"></xsl:param> - - <xsl:choose> - <xsl:when test="string-length($length) = 0"></xsl:when> - <xsl:when test="substring($length,1,1) = '0' or substring($length,1,1) = '1' or substring($length,1,1) = '2' or substring($length,1,1) = '3' or substring($length,1,1) = '4' or substring($length,1,1) = '5' or substring($length,1,1) = '6' or substring($length,1,1) = '7' or substring($length,1,1) = '8' or substring($length,1,1) = '9' or substring($length,1,1) = '.'"> - <xsl:value-of select="substring($length,1,1)"></xsl:value-of> - <xsl:call-template name="length-magnitude"> - <xsl:with-param name="length" select="substring($length,2)"></xsl:with-param> - </xsl:call-template> - </xsl:when> - </xsl:choose> -</xsl:template> - - - - - - - - - -length-units -Return the units from a length specification - - -Description - -The length-units template returns the -units ("pt" for "20pt") from a length. If no units are supplied on the -length, the defauilt.units are returned. - - -<xsl:template name="length-units"> - <xsl:param name="length" select="'0pt'"></xsl:param> - <xsl:param name="default.units" select="'px'"></xsl:param> - <xsl:variable name="magnitude"> - <xsl:call-template name="length-magnitude"> - <xsl:with-param name="length" select="$length"></xsl:with-param> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="units"> - <xsl:value-of select="substring($length, string-length($magnitude)+1)"></xsl:value-of> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$units = ''"> - <xsl:value-of select="$default.units"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$units"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - - -length-spec -Return a fully qualified length specification - - -Description - -The length-spec template returns the -qualified length from a dimension. If an unqualified length is given, -the default.units will be added to it. - - - -<xsl:template name="length-spec"> - <xsl:param name="length" select="'0pt'"></xsl:param> - <xsl:param name="default.units" select="'px'"></xsl:param> - - <xsl:variable name="magnitude"> - <xsl:call-template name="length-magnitude"> - <xsl:with-param name="length" select="$length"></xsl:with-param> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="units"> - <xsl:value-of select="substring($length, string-length($magnitude)+1)"></xsl:value-of> - </xsl:variable> - - <xsl:value-of select="$magnitude"></xsl:value-of> - <xsl:choose> - <xsl:when test="$units='cm' or $units='mm' or $units='in' or $units='pt' or $units='pc' or $units='px' or $units='em'"> - <xsl:value-of select="$units"></xsl:value-of> - </xsl:when> - <xsl:when test="$units = ''"> - <xsl:value-of select="$default.units"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Unrecognized unit of measure: </xsl:text> - <xsl:value-of select="$units"></xsl:value-of> - <xsl:text>.</xsl:text> - </xsl:message> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - - -length-in-points -Returns the size, in points, of a specified length - - -Description - -The length-in-points template converts a length -specification to points and returns that value as an unqualified -number. - - - -There is no way for the template to infer the size of an -em. It relies on the default em.size -which is initially 10 (for 10pt). - -Similarly, converting pixels to points relies on the -pixels.per.inch parameter which is initially -90. - - - - -<xsl:template name="length-in-points"> - <xsl:param name="length" select="'0pt'"></xsl:param> - <xsl:param name="em.size" select="10"></xsl:param> - <xsl:param name="pixels.per.inch" select="90"></xsl:param> - - <xsl:variable name="magnitude"> - <xsl:call-template name="length-magnitude"> - <xsl:with-param name="length" select="$length"></xsl:with-param> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="units"> - <xsl:value-of select="substring($length, string-length($magnitude)+1)"></xsl:value-of> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$units = 'pt'"> - <xsl:value-of select="$magnitude"></xsl:value-of> - </xsl:when> - <xsl:when test="$units = 'cm'"> - <xsl:value-of select="$magnitude div 2.54 * 72.0"></xsl:value-of> - </xsl:when> - <xsl:when test="$units = 'mm'"> - <xsl:value-of select="$magnitude div 25.4 * 72.0"></xsl:value-of> - </xsl:when> - <xsl:when test="$units = 'in'"> - <xsl:value-of select="$magnitude * 72.0"></xsl:value-of> - </xsl:when> - <xsl:when test="$units = 'pc'"> - <xsl:value-of select="$magnitude * 12.0"></xsl:value-of> - </xsl:when> - <xsl:when test="$units = 'px'"> - <xsl:value-of select="$magnitude div $pixels.per.inch * 72.0"></xsl:value-of> - </xsl:when> - <xsl:when test="$units = 'em'"> - <xsl:value-of select="$magnitude * $em.size"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Unrecognized unit of measure: </xsl:text> - <xsl:value-of select="$units"></xsl:value-of> - <xsl:text>.</xsl:text> - </xsl:message> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - - -pi-attribute -Extract a pseudo-attribute from a PI - - -Description - -The pi-attribute template extracts a pseudo-attribute -from a processing instruction. For example, given the PI -<?foo bar="1" baz='red'?>, -<xsl:call-template name="pi-attribute"> - <xsl:with-param name="pis" select="processing-instruction('foo')"/> - <xsl:with-param name="attribute" select="'baz'"/> -</xsl:call-template> -will return red. This template returns the first matching -attribute that it finds. Presented with processing instructions that -contain badly formed pseudo-attributes (missing or unbalanced quotes, -for example), the template may silently return erroneous results. - - -<xsl:template name="pi-attribute"> - <xsl:param name="pis" select="processing-instruction('BOGUS_PI')"></xsl:param> - <xsl:param name="attribute">filename</xsl:param> - <xsl:param name="count">1</xsl:param> - - <xsl:choose> - <xsl:when test="$count>count($pis)"> - <!-- not found --> - </xsl:when> - <xsl:otherwise> - <xsl:variable name="pi"> - <xsl:value-of select="$pis[$count]"></xsl:value-of> - </xsl:variable> - <xsl:variable name="pivalue"> - <xsl:value-of select="concat(' ', normalize-space($pi))"></xsl:value-of> - </xsl:variable> - <xsl:choose> - <xsl:when test="contains($pivalue,concat(' ', $attribute, '='))"> - <xsl:variable name="rest" select="substring-after($pivalue,concat(' ', $attribute,'='))"></xsl:variable> - <xsl:variable name="quote" select="substring($rest,1,1)"></xsl:variable> - <xsl:value-of select="substring-before(substring($rest,2),$quote)"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="pi-attribute"> - <xsl:with-param name="pis" select="$pis"></xsl:with-param> - <xsl:with-param name="attribute" select="$attribute"></xsl:with-param> - <xsl:with-param name="count" select="$count + 1"></xsl:with-param> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - - -lookup.key -Retrieve the value associated with a particular key in a table - - -Description - -Given a table of space-delimited key/value pairs, -the lookup.key template extracts the value associated -with a particular key. - - -<xsl:template name="lookup.key"> - <xsl:param name="key" select="''"></xsl:param> - <xsl:param name="table" select="''"></xsl:param> - - <xsl:if test="contains($table, ' ')"> - <xsl:choose> - <xsl:when test="substring-before($table, ' ') = $key"> - <xsl:variable name="rest" select="substring-after($table, ' ')"></xsl:variable> - <xsl:choose> - <xsl:when test="contains($rest, ' ')"> - <xsl:value-of select="substring-before($rest, ' ')"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$rest"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="lookup.key"> - <xsl:with-param name="key" select="$key"></xsl:with-param> - <xsl:with-param name="table" select="substring-after(substring-after($table,' '), ' ')"></xsl:with-param> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:if> -</xsl:template> - - - - - - - - - -xpath.location -Calculate the XPath child-sequence to the current node - - -Description - -The xpath.location template calculates the -absolute path from the root of the tree to the current element node. - - - -<xsl:template name="xpath.location"> - <xsl:param name="node" select="."></xsl:param> - <xsl:param name="path" select="''"></xsl:param> - - <xsl:variable name="next.path"> - <xsl:value-of select="local-name($node)"></xsl:value-of> - <xsl:if test="$path != ''">/</xsl:if> - <xsl:value-of select="$path"></xsl:value-of> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$node/parent::*"> - <xsl:call-template name="xpath.location"> - <xsl:with-param name="node" select="$node/parent::*"></xsl:with-param> - <xsl:with-param name="path" select="$next.path"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:text>/</xsl:text> - <xsl:value-of select="$next.path"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - - -comment-escape-string -Prepare a string for inclusion in an XML comment - - -Description - -The comment-escape-string template returns a string -that has been transformed so that it can safely be output as an XML comment. -Internal occurrences of "--" will be replaced with "- -" and a leading and/or -trailing space will be added to the string, if necessary. - - -<xsl:template name="comment-escape-string"> - <xsl:param name="string" select="''"></xsl:param> - - <xsl:if test="starts-with($string, '-')"> - <xsl:text> </xsl:text> - </xsl:if> - - <xsl:call-template name="comment-escape-string.recursive"> - <xsl:with-param name="string" select="$string"></xsl:with-param> - </xsl:call-template> - - <xsl:if test="substring($string, string-length($string), 1) = '-'"> - <xsl:text> </xsl:text> - </xsl:if> -</xsl:template> - - - - - - - - - -comment-escape-string.recursive -Internal function used by comment-escape-string - - -Description - -The comment-escape-string.recursive template is used -by comment-escape-string. - - -<xsl:template name="comment-escape-string.recursive"> - <xsl:param name="string" select="''"></xsl:param> - <xsl:choose> - <xsl:when test="contains($string, '--')"> - <xsl:value-of select="substring-before($string, '--')"></xsl:value-of> - <xsl:value-of select="'- -'"></xsl:value-of> - <xsl:call-template name="comment-escape-string.recursive"> - <xsl:with-param name="string" select="substring-after($string, '--')"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$string"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - -trim.text -Trim leading and trailing whitespace from a text node - - -Description - -Given a text node, this function trims leading and trailing -whitespace from it and returns the trimmed contents. - - - - <xsl:template name="trim.text"> - <xsl:param name="contents" select="."></xsl:param> - <xsl:variable name="contents-left-trimmed"> - <xsl:call-template name="trim-left"> - <xsl:with-param name="contents" select="$contents"></xsl:with-param> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="contents-trimmed"> - <xsl:call-template name="trim-right"> - <xsl:with-param name="contents" select="$contents-left-trimmed"></xsl:with-param> - </xsl:call-template> - </xsl:variable> - <xsl:value-of select="$contents-trimmed"></xsl:value-of> - </xsl:template> - - <xsl:template name="trim-left"> - <xsl:param name="contents"></xsl:param> - <xsl:choose> - <xsl:when test="starts-with($contents,' -') or starts-with($contents,' ') or starts-with($contents,' ') or starts-with($contents,' ')"> - <xsl:call-template name="trim-left"> - <xsl:with-param name="contents" select="substring($contents, 2)"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$contents"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template name="trim-right"> - <xsl:param name="contents"></xsl:param> - <xsl:variable name="last-char"> - <xsl:value-of select="substring($contents, string-length($contents), 1)"></xsl:value-of> - </xsl:variable> - <xsl:choose> - <xsl:when test="($last-char = ' -') or ($last-char = ' ') or ($last-char = ' ') or ($last-char = ' ')"> - <xsl:call-template name="trim-right"> - <xsl:with-param name="contents" select="substring($contents, 1, string-length($contents) - 1)"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$contents"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - - - - - - - - -str.tokenize.keep.delimiters -Tokenize a string while preserving any delimiters - -Description -Based on the occurrence of one or more delimiter characters, -this function breaks a string into a list of tokens and delimiters, -marking up each of the tokens with a token element -and preserving the delimiters as text nodes between the tokens. - - This function is a very slightly modified version of a - function from the EXSLT - site. The original is available at: - -
    - - The str.tokenize.keep.delimiters function - differs only in that it preserves the delimiters instead of - discarding them.
    -
    - - <xsl:template name="str.tokenize.keep.delimiters"> - <xsl:param name="string" select="''"></xsl:param> - <xsl:param name="delimiters" select="' '"></xsl:param> - <xsl:choose> - <xsl:when test="not($string)"></xsl:when> - <xsl:when test="not($delimiters)"> - <xsl:call-template name="str.tokenize.keep.delimiters-characters"> - <xsl:with-param name="string" select="$string"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> - <xsl:with-param name="string" select="$string"></xsl:with-param> - <xsl:with-param name="delimiters" select="$delimiters"></xsl:with-param> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - <xsl:template name="str.tokenize.keep.delimiters-characters"> - <xsl:param name="string"></xsl:param> - <xsl:if test="$string"> - <ssb:token><xsl:value-of select="substring($string, 1, 1)"></xsl:value-of></ssb:token> - <xsl:call-template name="str.tokenize.keep.delimiters-characters"> - <xsl:with-param name="string" select="substring($string, 2)"></xsl:with-param> - </xsl:call-template> - </xsl:if> - </xsl:template> - <xsl:template name="str.tokenize.keep.delimiters-delimiters"> - <xsl:param name="string"></xsl:param> - <xsl:param name="delimiters"></xsl:param> - <xsl:variable name="delimiter" select="substring($delimiters, 1, 1)"></xsl:variable> - <xsl:choose> - <xsl:when test="not($delimiter)"> - <ssb:token><xsl:value-of select="$string"></xsl:value-of></ssb:token> - </xsl:when> - <xsl:when test="contains($string, $delimiter)"> - <xsl:if test="not(starts-with($string, $delimiter))"> - <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> - <xsl:with-param name="string" select="substring-before($string, $delimiter)"></xsl:with-param> - <xsl:with-param name="delimiters" select="substring($delimiters, 2)"></xsl:with-param> - </xsl:call-template> - </xsl:if> - <!-- output each delimiter --> - <xsl:value-of select="$delimiter"></xsl:value-of> - <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> - <xsl:with-param name="string" select="substring-after($string, $delimiter)"></xsl:with-param> - <xsl:with-param name="delimiters" select="$delimiters"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="str.tokenize.keep.delimiters-delimiters"> - <xsl:with-param name="string" select="$string"></xsl:with-param> - <xsl:with-param name="delimiters" select="substring($delimiters, 2)"></xsl:with-param> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -
    -
    - - - - - - apply-string-subst-map - Apply a string-substitution map - - Description - This function applies a “string substitution” map. Use it when - you want to do multiple string substitutions on the same target - content. It reads in two things: content, the - content on which to perform the substitution, and - map.contents, a node set of - elements (the names of the elements don't matter), with each element - having the following attributes: - - - oldstring, a string to - be replaced - - - newstring, a string with - which to replace oldstring - - - The function uses map.contents to - do substitution on content, and then - returns the modified contents. - - This function is a very slightly modified version of Jeni - Tennison’s replace_strings function in the - multiple string replacements section of Dave Pawson’s - XSLT - FAQ. - The apply-string-subst-map function is - essentially the same function as the - apply-character-map function; the only - difference is that in the map that - apply-string-subst-map expects, oldstring and newstring attributes are used instead of - character and string attributes. - - - <xsl:template name="apply-string-subst-map"> - <xsl:param name="content"></xsl:param> - <xsl:param name="map.contents"></xsl:param> - <xsl:variable name="replaced_text"> - <xsl:call-template name="string.subst"> - <xsl:with-param name="string" select="$content"></xsl:with-param> - <xsl:with-param name="target" select="$map.contents[1]/@oldstring"></xsl:with-param> - <xsl:with-param name="replacement" select="$map.contents[1]/@newstring"></xsl:with-param> - </xsl:call-template> - </xsl:variable> - <xsl:choose> - <xsl:when test="$map.contents[2]"> - <xsl:call-template name="apply-string-subst-map"> - <xsl:with-param name="content" select="$replaced_text"></xsl:with-param> - <xsl:with-param name="map.contents" select="$map.contents[position() > 1]"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$replaced_text"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - - -
    -Relative URI Functions - -Introduction - -These functions manipulate relative URI references. - -The following assumptions must hold true: - - - -All URIs are relative. - - -No URI contains the ../ sequence -which would effectively move up the hierarchy. - - - -If these assumptions do not hold, the results are unpredictable. - - - - - - - -count.uri.path.depth -Count the number of path components in a relative URI - - -Description - -This function counts the number of path components in a relative URI. - - -<xsl:template name="count.uri.path.depth"> - <xsl:param name="filename" select="''"></xsl:param> - <xsl:param name="count" select="0"></xsl:param> - - <xsl:choose> - <xsl:when test="contains($filename, '/')"> - <xsl:call-template name="count.uri.path.depth"> - <xsl:with-param name="filename" select="substring-after($filename, '/')"></xsl:with-param> - <xsl:with-param name="count" select="$count + 1"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$count"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - - - - -trim.common.uri.paths -Trim common leading path components from a relative URI - - -Description - -This function trims common leading path components from a relative URI. - - -<xsl:template name="trim.common.uri.paths"> - <xsl:param name="uriA" select="''"></xsl:param> - <xsl:param name="uriB" select="''"></xsl:param> - <xsl:param name="return" select="'A'"></xsl:param> - - <xsl:choose> - <xsl:when test="contains($uriA, '/') and contains($uriB, '/') and substring-before($uriA, '/') = substring-before($uriB, '/')"> - <xsl:call-template name="trim.common.uri.paths"> - <xsl:with-param name="uriA" select="substring-after($uriA, '/')"></xsl:with-param> - <xsl:with-param name="uriB" select="substring-after($uriB, '/')"></xsl:with-param> - <xsl:with-param name="return" select="$return"></xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="$return = 'A'"> - <xsl:value-of select="$uriA"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$uriB"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - - - - - - -
    - Common Template Reference - - - - - This is technical reference documentation for the - “base”, “refentry”, and “utility” sets of common - templates in the DocBook XSL Stylesheets. These - templates are “common” in that they are shared across - output formats (that is, they’re not - output-format-dependent) - This documentation is not intended to be user - documentation. It is provided for developers writing - customization layers for the stylesheets. - - - - - Common » Base Template Reference - - $Id: common.xsl 8784 2010-07-28 12:32:54Z mzjn $ - - - - - Introduction - -This is technical reference documentation for the “base” - set of common templates in the DocBook XSL Stylesheets. - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -is.component -Tests if a given node is a component-level element - - -<xsl:template name="is.component"> -<xsl:param name="node" select="."/> - ... -</xsl:template> - -Description - -This template returns '1' if the specified node is a component -(Chapter, Appendix, etc.), and '0' otherwise. - -Parameters - - -node - - -The node which is to be tested. - - - - - -Returns - -This template returns '1' if the specified node is a component -(Chapter, Appendix, etc.), and '0' otherwise. - - - - - -is.section -Tests if a given node is a section-level element - - -<xsl:template name="is.section"> -<xsl:param name="node" select="."/> - ... -</xsl:template> - -Description - -This template returns '1' if the specified node is a section -(Section, Sect1, Sect2, etc.), and '0' otherwise. - -Parameters - - -node - - -The node which is to be tested. - - - - - -Returns - -This template returns '1' if the specified node is a section -(Section, Sect1, Sect2, etc.), and '0' otherwise. - - - - - -section.level -Returns the hierarchical level of a section - - -<xsl:template name="section.level"> -<xsl:param name="node" select="."/> - ... -</xsl:template> - -Description - -This template calculates the hierarchical level of a section. -The element sect1 is at level 1, sect2 is -at level 2, etc. - - - -Recursive sections are calculated down to the fifth level. - -Parameters - - -node - - -The section node for which the level should be calculated. -Defaults to the context node. - - - - - -Returns - -The section level, 1, 2, etc. - - - - - - -qanda.section.level -Returns the hierarchical level of a QandASet - - -<xsl:template name="qanda.section.level"/> - -Description - -This template calculates the hierarchical level of a QandASet. - - -Returns - -The level, 1, 2, etc. - - - - - - -select.mediaobject -Selects and processes an appropriate media object from a list - - -<xsl:template name="select.mediaobject"> -<xsl:param name="olist" select="imageobject|imageobjectco |videoobject|audioobject|textobject"/> - ... -</xsl:template> - -Description - -This template takes a list of media objects (usually the -children of a mediaobject or inlinemediaobject) and processes -the "right" object. - - - -This template relies on a template named -"select.mediaobject.index" to determine which object -in the list is appropriate. - - - -If no acceptable object is located, nothing happens. - -Parameters - - -olist - - -The node list of potential objects to examine. - - - - - -Returns - -Calls <xsl:apply-templates> on the selected object. - - - - - -select.mediaobject.index -Selects the position of the appropriate media object from a list - - -<xsl:template name="select.mediaobject.index"> -<xsl:param name="olist" select="imageobject|imageobjectco |videoobject|audioobject|textobject"/> -<xsl:param name="count">1</xsl:param> - ... -</xsl:template> - -Description - -This template takes a list of media objects (usually the -children of a mediaobject or inlinemediaobject) and determines -the "right" object. It returns the position of that object -to be used by the calling template. - - - -If the parameter use.role.for.mediaobject -is nonzero, then it first checks for an object with -a role attribute of the appropriate value. It takes the first -of those. Otherwise, it takes the first acceptable object -through a recursive pass through the list. - - - -This template relies on a template named "is.acceptable.mediaobject" -to determine if a given object is an acceptable graphic. The semantics -of media objects is that the first acceptable graphic should be used. - - - - -If no acceptable object is located, no index is returned. - -Parameters - - -olist - - -The node list of potential objects to examine. - - - -count - - -The position in the list currently being considered by the -recursive process. - - - - - -Returns - -Returns the position in the original list of the selected object. - - - - - -is.acceptable.mediaobject -Returns '1' if the specified media object is recognized - - -<xsl:template name="is.acceptable.mediaobject"> -<xsl:param name="object"/> - ... -</xsl:template> - -Description - -This template examines a media object and returns '1' if the -object is recognized as a graphic. - -Parameters - - -object - - -The media object to consider. - - - - - -Returns - -0 or 1 - - - - - -check.id.unique -Warn users about references to non-unique IDs - - -<xsl:template name="check.id.unique"> -<xsl:param name="linkend"/> - ... -</xsl:template> - -Description - -If passed an ID in linkend, -check.id.unique prints -a warning message to the user if either the ID does not exist or -the ID is not unique. - - - - - -check.idref.targets -Warn users about incorrectly typed references - - -<xsl:template name="check.idref.targets"> -<xsl:param name="linkend"/> -<xsl:param name="element-list"/> - ... -</xsl:template> - -Description - -If passed an ID in linkend, -check.idref.targets makes sure that the element -pointed to by the link is one of the elements listed in -element-list and warns the user otherwise. - - - - - -copyright.years -Print a set of years with collapsed ranges - - -<xsl:template name="copyright.years"> -<xsl:param name="years"/> -<xsl:param name="print.ranges" select="1"/> -<xsl:param name="single.year.ranges" select="0"/> -<xsl:param name="firstyear" select="0"/> -<xsl:param name="nextyear" select="0"/> - ... -</xsl:template> - -Description - -This template prints a list of year elements with consecutive -years printed as a range. In other words: - - -<year>1992</year> -<year>1993</year> -<year>1994</year> - - -is printed 1992-1994, whereas: - - -<year>1992</year> -<year>1994</year> - - -is printed 1992, 1994. - - - -This template assumes that all the year elements contain only -decimal year numbers, that the elements are sorted in increasing -numerical order, that there are no duplicates, and that all the years -are expressed in full century+year -(1999 not 99) notation. - -Parameters - - -years - - -The initial set of year elements. - - - -print.ranges - - -If non-zero, multi-year ranges are collapsed. If zero, all years -are printed discretely. - - - -single.year.ranges - - -If non-zero, two consecutive years will be printed as a range, -otherwise, they will be printed discretely. In other words, a single -year range is 1991-1992 but discretely it's -1991, 1992. - - - - - -Returns - -This template returns the formatted list of years. - - - - - -find.path.params -Search in a table for the "best" match for the node - - -<xsl:template name="find.path.params"> -<xsl:param name="node" select="."/> -<xsl:param name="table" select="''"/> -<xsl:param name="location"> - <xsl:call-template name="xpath.location"> - <xsl:with-param name="node" select="$node"/> - </xsl:call-template> - </xsl:param> - ... -</xsl:template> - -Description - -This template searches in a table for the value that most-closely -(in the typical best-match sense of XSLT) matches the current (element) -node location. - - - - - -string.upper -Converts a string to all uppercase letters - - -<xsl:template name="string.upper"> -<xsl:param name="string" select="''"/> - ... -</xsl:template> - -Description - -Given a string, this template does a language-aware conversion -of that string to all uppercase letters, based on the values of the -lowercase.alpha and -uppercase.alpha gentext keys for the current -locale. It affects only those characters found in the values of -lowercase.alpha and -uppercase.alpha. All other characters are left -unchanged. - -Parameters - - -string - - -The string to convert to uppercase. - - - - - - - - - -string.lower -Converts a string to all lowercase letters - - -<xsl:template name="string.lower"> -<xsl:param name="string" select="''"/> - ... -</xsl:template> - -Description - -Given a string, this template does a language-aware conversion -of that string to all lowercase letters, based on the values of the -uppercase.alpha and -lowercase.alpha gentext keys for the current -locale. It affects only those characters found in the values of -uppercase.alpha and -lowercase.alpha. All other characters are left -unchanged. - -Parameters - - -string - - -The string to convert to lowercase. - - - - - - - - - -select.choice.separator -Returns localized choice separator - - -<xsl:template name="select.choice.separator"/> - -Description - -This template enables auto-generation of an appropriate - localized "choice" separator (for example, "and" or "or") before - the final item in an inline list (though it could also be useful - for generating choice separators for non-inline lists). - - -It currently works by evaluating a processing instruction - (PI) of the form <?dbchoice choice="foo"?> : - - - - if the value of the choice - pseudo-attribute is "and" or "or", returns a localized "and" - or "or" - - - otherwise returns the literal value of the - choice pseudo-attribute - - - - The latter is provided only as a temporary workaround because the - locale files do not currently have translations for the word - or. So if you want to generate a a - logical "or" separator in French (for example), you currently need - to do this: - <?dbchoice choice="ou"?> - - - - -The dbchoice processing instruction is - an unfortunate hack; support for it may disappear in the future - (particularly if and when a more appropriate means for marking - up "choice" lists becomes available in DocBook). - - - - - - -evaluate.info.profile -Evaluates an info profile - - -<xsl:template name="evaluate.info.profile"> -<xsl:param name="profile"/> -<xsl:param name="info"/> - ... -</xsl:template> - -Description - -This template evaluates an "info profile" matching the XPath - expression given by the profile - parameter. It relies on the XSLT evaluate() - extension function. - - - -The value of the profile parameter - can include the literal string $info. If found - in the value of the profile parameter, the - literal string $info string is replaced with - the value of the info parameter, which - should be a set of *info nodes; the - expression is then evaluated using the XSLT - evaluate() extension function. - - Parameters - - - - profile - - -A string representing an XPath expression - - - - - info - - -A set of *info nodes - - - - - - Returns - -Returns a node (the result of evaluating the - profile parameter) - - - - - - Common » Refentry Metadata Template Reference - - $Id: refentry.xsl 7867 2008-03-07 09:54:25Z xmldoc $ - - - - - Introduction - -This is technical reference documentation for the “refentry - metadata” templates in the DocBook XSL Stylesheets. - - -This is not intended to be user documentation. It is provided - for developers writing customization layers for the stylesheets. - - - -Currently, only the manpages stylesheets make use of these - templates. They are, however, potentially useful elsewhere. - - - - - - -get.refentry.metadata -Gathers metadata from a refentry and its ancestors - - -<xsl:template name="get.refentry.metadata"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -Reference documentation for particular commands, functions, - etc., is sometimes viewed in isolation from its greater "context". For - example, users view Unix man pages as, well, individual pages, not as - part of a "book" of some kind. Therefore, it is sometimes necessary to - embed "context" information in output for each refentry. - - - -However, one problem is that different users mark up that - context information in different ways. Often (usually), the - context information is not actually part of the content of the - refentry itself, but instead part of the content of a - parent or ancestor element to the refentry. And - even then, DocBook provides a variety of elements that users might - potentially use to mark up the same kind of information. One user - might use the productnumber element to mark up version - information about a particular product, while another might use - the releaseinfo element. - - - -Taking all that in mind, the - get.refentry.metadata template tries to gather - metadata from a refentry element and its ancestor - elements in an intelligent and user-configurable way. The basic - mechanism used in the XPath expressions throughout this stylesheet - is to select the relevant metadata from the *info element that is - closest to the actual refentry – either on the - refentry itself, or on its nearest ancestor. - - - - -The get.refentry.metadata - template is actually just sort of a "driver" template; it - calls other templates that do the actual data collection, - then returns the data as a set. - - - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing user preferences (from global - stylesheet parameters) - - - - - - Returns - -Returns a node set with the following elements. The - descriptions are verbatim from the man(7) man - page. - - - - title - - -the title of the man page (e.g., MAN) - - - - - section - - -the section number the man page should be placed in (e.g., - 7) - - - - - date - - -the date of the last revision - - - - - source - - -the source of the command - - - - - manual - - -the title of the manual (e.g., Linux - Programmer's Manual) - - - - - - - - - - - -get.refentry.title -Gets title metadata for a refentry - - -<xsl:template name="get.refentry.title"> -<xsl:param name="refname"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - title of the man page (e.g., MAN). This differs - from refname in that, if the refentry has a - refentrytitle, we use that as the title; - otherwise, we just use first refname in the first - refnamediv in the source. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - - Returns - -Returns a title node. - - - - -get.refentry.section -Gets section metadata for a refentry - - -<xsl:template name="get.refentry.section"> -<xsl:param name="refname"/> -<xsl:param name="quiet" select="0"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - section number the man page should be placed in (e.g., - 7)". If we do not find a manvolnum - specified in the source, and we find that the refentry is - for a function, we use the section number 3 - ["Library calls (functions within program libraries)"]; otherwise, we - default to using 1 ["Executable programs or shell - commands"]. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - quiet - - -If non-zero, no "missing" message is emitted - - - - - - Returns - -Returns a string representing a section number. - - - - -get.refentry.date -Gets date metadata for a refentry - - -<xsl:template name="get.refentry.date"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - date of the last revision". If we cannot find a date in the source, we - generate one. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global stylesheet parameters) - - - - - - Returns - -Returns a date node. - - - - - -get.refentry.source -Gets source metadata for a refentry - - -<xsl:template name="get.refentry.source"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - source of the command", and provides the following examples: - - - - -For binaries, use something like: GNU, NET-2, SLS - Distribution, MCC Distribution. - - - - -For system calls, use the version of the kernel that you are - currently looking at: Linux 0.99.11. - - - - -For library calls, use the source of the function: GNU, BSD - 4.3, Linux DLL 4.4.1. - - - - - - - - -The solbook(5) man page describes - something very much like what man(7) calls - "source", except that solbook(5) names it - "software" and describes it like this: -
    - -This is the name of the software product that the topic - discussed on the reference page belongs to. For example UNIX - commands are part of the SunOS x.x - release. - -
    -
    - - - -In practice, there are many pages that simply have a version - number in the "source" field. So, it looks like what we have is a - two-part field, - Name Version, - where: - - - - Name - - -product name (e.g., BSD) or org. name (e.g., GNU) - - - - - Version - - -version name - - - - - - Each part is optional. If the Name is a - product name, then the Version is probably - the version of the product. Or there may be no - Name, in which case, if there is a - Version, it is probably the version of the - item itself, not the product it is part of. Or, if the - Name is an organization name, then there - probably will be no Version. - - -
    Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns - -Returns a source node. - -
    - - - -get.refentry.source.name -Gets source-name metadata for a refentry - - -<xsl:template name="get.refentry.source.name"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -A "source name" is one part of a (potentially) two-part - Name Version - source field. For more details, see the documentation for the - get.refentry.source template. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns - -Depending on what output method is used for the - current stylesheet, either returns a text node or possibly an element - node, containing "source name" data. - - - - - -get.refentry.version -Gets version metadata for a refentry - - -<xsl:template name="get.refentry.version"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -A "version" is one part of a (potentially) two-part - Name Version - source field. For more details, see the documentation for the - get.refentry.source template. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns - -Depending on what output method is used for the - current stylesheet, either returns a text node or possibly an element - node, containing "version" data. - - - - - -get.refentry.manual -Gets source metadata for a refentry - - -<xsl:template name="get.refentry.manual"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="prefs"/> - ... -</xsl:template> - -Description - -The man(7) man page describes this as "the - title of the manual (e.g., Linux Programmer's - Manual)". Here are some examples from existing man pages: - - - - -dpkg utilities - (dpkg-name) - - - - -User Contributed Perl Documentation - (GET) - - - - -GNU Development Tools - (ld) - - - - -Emperor Norton Utilities - (ddate) - - - - -Debian GNU/Linux manual - (faked) - - - - -GIMP Manual Pages - (gimp) - - - - -KDOC Documentation System - (qt2kdoc) - - - - - - - - -The solbook(5) man page describes - something very much like what man(7) calls - "manual", except that solbook(5) names it - "sectdesc" and describes it like this: -
    - -This is the section title of the reference page; for - example User Commands. - -
    -
    - - -
    Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A set of info nodes (from a refentry - element and its ancestors) - - - - - prefs - - -A node containing users preferences (from global - stylesheet parameters) - - - - - - Returns - -Returns a manual node. - -
    - - - -get.refentry.metadata.prefs -Gets user preferences for refentry metadata gathering - - -<xsl:template name="get.refentry.metadata.prefs"/> - -Description - -The DocBook XSL stylesheets include several user-configurable - global stylesheet parameters for controlling refentry - metadata gathering. Those parameters are not read directly by the - other refentry metadata-gathering - templates. Instead, they are read only by the - get.refentry.metadata.prefs template, - which assembles them into a structure that is then passed to - the other refentry metadata-gathering - templates. - - - -So the, get.refentry.metadata.prefs - template is the only interface to collecting stylesheet parameters for - controlling refentry metadata gathering. - - Parameters - -There are no local parameters for this template; however, it - does rely on a number of global parameters. - - Returns - -Returns a manual node. - - - - - -set.refentry.metadata -Sets content of a refentry metadata item - - -<xsl:template name="set.refentry.metadata"> -<xsl:param name="refname"/> -<xsl:param name="info"/> -<xsl:param name="contents"/> -<xsl:param name="context"/> -<xsl:param name="preferred"/> - ... -</xsl:template> - -Description - -The set.refentry.metadata template is - called each time a suitable source element is found for a certain - metadata field. - - Parameters - - - - refname - - -The first refname in the refentry - - - - - info - - -A single *info node that contains the selected source element. - - - - - contents - - -A node containing the selected source element. - - - - - context - - -A string describing the metadata context in which the - set.refentry.metadata template was - called: either "date", "source", "version", or "manual". - - - - - - Returns - -Returns formatted contents of a selected source element. - -
    - - - Common » Utility Template Reference - - $Id: utility.xsl 7101 2007-07-20 15:32:12Z xmldoc $ - - - - - Introduction - -This is technical reference documentation for the - miscellaneous utility templates in the DocBook XSL - Stylesheets. - - - -These templates are defined in a separate file from the set - of “common” templates because some of the common templates - reference DocBook XSL stylesheet parameters, requiring the - entire set of parameters to be imported/included in any - stylesheet that imports/includes the common templates. - - -The utility templates don’t import or include any DocBook - XSL stylesheet parameters, so the utility templates can be used - without importing the whole set of parameters. - - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -log.message -Logs/emits formatted notes and warnings - - -<xsl:template name="log.message"> -<xsl:param name="level"/> -<xsl:param name="source"/> -<xsl:param name="context-desc"/> -<xsl:param name="context-desc-field-length">12</xsl:param> -<xsl:param name="context-desc-padded"> - <xsl:if test="not($context-desc = '')"> - <xsl:call-template name="pad-string"> - <xsl:with-param name="leftRight">right</xsl:with-param> - <xsl:with-param name="padVar" select="substring($context-desc, 1, $context-desc-field-length)"/> - <xsl:with-param name="length" select="$context-desc-field-length"/> - </xsl:call-template> - </xsl:if> - </xsl:param> -<xsl:param name="message"/> -<xsl:param name="message-field-length" select="45"/> -<xsl:param name="message-padded"> - <xsl:variable name="spaces-for-blank-level"> - <!-- * if the level field is blank, we'll need to pad out --> - <!-- * the message field with spaces to compensate --> - <xsl:choose> - <xsl:when test="$level = ''"> - <xsl:value-of select="4 + 2"/> - <!-- * 4 = hard-coded length of comment text ("Note" or "Warn") --> - <!-- * + 2 = length of colon-plus-space separator ": " --> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="0"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable name="spaces-for-blank-context-desc"> - <!-- * if the context-description field is blank, we'll need --> - <!-- * to pad out the message field with spaces to compensate --> - <xsl:choose> - <xsl:when test="$context-desc = ''"> - <xsl:value-of select="$context-desc-field-length + 2"/> - <!-- * + 2 = length of colon-plus-space separator ": " --> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="0"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:variable name="extra-spaces" select="$spaces-for-blank-level + $spaces-for-blank-context-desc"/> - <xsl:call-template name="pad-string"> - <xsl:with-param name="leftRight">right</xsl:with-param> - <xsl:with-param name="padVar" select="substring($message, 1, ($message-field-length + $extra-spaces))"/> - <xsl:with-param name="length" select="$message-field-length + $extra-spaces"/> - </xsl:call-template> - </xsl:param> - ... -</xsl:template> - -Description - -The log.message template is a utility - template for logging/emitting formatted messages – that is, - notes and warnings, along with a given log “level” and an - identifier for the “source” that the message relates to. - - Parameters - - - level - - -Text to log/emit in the message-level field to - indicate the message level - (Note or - Warning) - - - - source - - -Text to log/emit in the source field to identify the - “source” to which the notification/warning relates. - This can be any arbitrary string, but because the - message lacks line and column numbers to identify the - exact part of the source document to which it - relates, the intention is that the value you pass - into the source parameter should - give the user some way to identify the portion of - their source document on which to take potentially - take action in response to the log message (for - example, to edit, change, or add content). - - -So the source value should be, - for example, an ID, book/chapter/article title, title - of some formal object, or even a string giving an - XPath expression. - - - - context-desc - - -Text to log/emit in the context-description field to - describe the context for the message. - - - - context-desc-field-length - - -Specifies length of the context-description field - (in characters); default is 12 - - -If the text specified by the - context-desc parameter is longer - than the number of characters specified in - context-desc-field-length, it is - truncated to context-desc-field-length - (12 characters by default). - - -If the specified text is shorter than - context-desc-field-length, - it is right-padded out to - context-desc-field-length (12 by - default). - - -If no value has been specified for the - context-desc parameter, the field is - left empty and the text of the log message begins with - the value of the message - parameter. - - - - message - - -Text to log/emit in the actual message field - - - - message-field-length - - -Specifies length of the message - field (in characters); default is 45 - - - - - - Returns - -Outputs a message (generally, to standard error). - - - - -get.doc.title -Gets a title from the current document - - -<xsl:template name="get.doc.title"/> - -Description - -The get.doc.title template is a - utility template for returning the first title found in the - current document. - - Returns - -Returns a string containing some identifying title for the - current document . - - - - -pad-string -Right-pads or left-pads a string out to a certain length - - -<xsl:template name="pad-string"> -<xsl:param name="padChar" select="' '"/> -<xsl:param name="leftRight">left</xsl:param> -<xsl:param name="padVar"/> -<xsl:param name="length"/> - ... -</xsl:template> - -Description - -This function takes string padVar and - pads it out in the direction rightLeft to - the string-length length, using string - padChar (a space character by default) as - the padding string (note that padChar can - be a string; it is not limited to just being a single - character). - - - -This function began as a copy of Nate Austin's - prepend-pad function in the Padding - Content section of Dave Pawson's XSLT - FAQ. - - - Returns - -Returns a (padded) string. - - - - - Common » Character-Map Template Reference - - $Id: charmap.xsl 7266 2007-08-22 11:58:42Z xmldoc $ - - - - - Introduction - -This is technical reference documentation for the - character-map templates in the DocBook XSL Stylesheets. - - - -These templates are defined in a separate file from the set - of “common” templates because some of the common templates - reference DocBook XSL stylesheet parameters, requiring the - entire set of parameters to be imported/included in any - stylesheet that imports/includes the common templates. - - -The character-map templates don’t import or include - any DocBook XSL stylesheet parameters, so the - character-map templates can be used without importing the - whole set of parameters. - - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -apply-character-map -Applies an XSLT character map - - -<xsl:template name="apply-character-map"> -<xsl:param name="content"/> -<xsl:param name="map.contents"/> - ... -</xsl:template> - -Description - -This template applies an XSLT character map; that is, it causes certain - individual characters to be substituted with strings of one - or more characters. It is useful mainly for replacing - multiple “special” characters or symbols in the same target - content. It uses the value of - map.contents to do substitution on - content, and then returns the - modified contents. - - - -This template is a very slightly modified version of - Jeni Tennison’s replace_strings - template in the multiple string replacements section of Dave Pawson’s - XSLT FAQ. - - -The apply-string-subst-map - template is essentially the same template as the - apply-character-map template; the - only difference is that in the map that - apply-string-subst-map expects, oldstring and newstring attributes are used - instead of character and string attributes. - - - Parameters - - - content - - -The content on which to perform the character-map - substitution. - - - - map.contents - - -A node set of elements, with each element having - the following attributes: - - - - character, a - character to be replaced - - - string, a - string with which to replace character - - - - - - - - - - - - - -read-character-map -Reads in all or part of an XSLT character map - - -<xsl:template name="read-character-map"> -<xsl:param name="use.subset"/> -<xsl:param name="subset.profile"/> -<xsl:param name="uri"/> - ... -</xsl:template> - -Description - -The XSLT 2.0 specification describes character maps and explains how they may be used - to allow a specific character appearing in a text or - attribute node in a final result tree to be substituted by - a specified string of characters during serialization. The - read-character-map template provides a - means for reading and using character maps with XSLT - 1.0-based tools. - - -This template reads the character-map contents from - uri (in full or in part, depending on - the value of the use.subset - parameter), then passes those contents to the - apply-character-map template, along with - content, the data on which to perform - the character substitution. - - -Using the character map “in part” means that it uses only - those output-character elements that match the - XPath expression given in the value of the - subset.profile parameter. The current - implementation of that capability here relies on the - evaluate extension XSLT function. - - Parameters - - - use.subset - - -Specifies whether to use a subset of the character - map instead of the whole map; boolean - 0 or 1 - - - - subset.profile - - -XPath expression that specifies what subset of the - character map to use - - - - uri - - -URI for a character map - - - - - - - -
    - - - - - Formatting Object Table Reference - - $Id: table.xsl 8814 2010-08-09 21:19:53Z bobstayton $ - - - - Introduction - -This is technical reference documentation for the FO - table-processing templates in the DocBook XSL Stylesheets. - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -calc.column.width -Calculate an XSL FO table column width specification from a -CALS table column width specification. - - -<xsl:template name="calc.column.width"> -<xsl:param name="colwidth">1*</xsl:param> - ... -</xsl:template> - -Description - -CALS expresses table column widths in the following basic -forms: - - - - - - -99.99units, a fixed length specifier. - - - - -99.99, a fixed length specifier without any units. - - - - -99.99*, a relative length specifier. - - - - -99.99*+99.99units, a combination of both. - - - - - - -The CALS units are points (pt), picas (pi), centimeters (cm), -millimeters (mm), and inches (in). These are the same units as XSL, -except that XSL abbreviates picas "pc" instead of "pi". If a length -specifier has no units, the CALS default unit (pt) is assumed. - - - -Relative length specifiers are represented in XSL with the -proportional-column-width() function. - - - -Here are some examples: - - - - - - -"36pt" becomes "36pt" - - - - -"3pi" becomes "3pc" - - - - -"36" becomes "36pt" - - - - -"3*" becomes "proportional-column-width(3)" - - - - -"3*+2pi" becomes "proportional-column-width(3)+2pc" - - - - -"1*+2" becomes "proportional-column-width(1)+2pt" - - - - -Parameters - - -colwidth - - -The CALS column width specification. - - - - - -Returns - -The XSL column width specification. - - - - - - - - - - Titlepage Template Stylesheet Reference - - $Id: titlepage.xsl 7058 2007-07-17 13:59:29Z xmldoc $ - - - - Introduction - -This is technical reference documentation for the - “titlepage” templates in the DocBook XSL Stylesheets. - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -t:templates -Construct a stylesheet for the templates provided - - -<xsl:template match="t:templates"/> - -Description - -The t:templates element is the root of a -set of templates. This template creates an appropriate -xsl:stylesheet for the templates. - - - -If the t:templates element has a -base-stylesheet attribute, an -xsl:import statement is constructed for it. - - - - - -xsl:* -Copy xsl: elements straight through - - -<xsl:template match="xsl:*"/> - -Description - -This template simply copies the xsl: elements -straight through into the result tree. - - - - - -t:titlepage -Create the templates necessary to construct a title page - - -<xsl:template match="t:titlepage"/> - -Description - -The t:titlepage element creates a set of -templates for processing the titlepage for an element. The -root of this template set is the template named -wrapper.titlepage. That is the -template that should be called to generate the title page. - - - - -The t:titlepage element has three attributes: - - - -element - -The name of the source document element for which -these templates apply. In other words, to make a title page for the -article element, set the -element attribute to -article. This attribute is required. - - - -wrapper - -The entire title page can be wrapped with an element. -This attribute identifies that element. - - - -class - -If the class attribute -is set, a class attribute with this -value will be added to the wrapper element that surrounds the entire -title page. - - - - - - - - - -Any other attributes are copied through literally to the -wrapper element. - - - -The content of a t:titlepage is one or -more t:titlepage-content, -t:titlepage-separator, and -t:titlepage-before elements. - - - -Each of these elements may be provided for the recto -and verso sides of the title page. - - - - - - -@* (in copy.literal.atts mode) -Copy t:titlepage attributes - - -<xsl:template match="@*" mode="copy.literal.atts"/> - -Description - -This template copies all of the other attributes -from a t:titlepage element onto the specified -wrapper. - - - - - -t:titlepage-content -Create templates for the content of one side of a title page - - -<xsl:template match="t:titlepage-content"/> - -Description - -The title page content, that is, the elements from the source -document that are rendered on the title page, can be controlled independently -for the recto and verso sides of the title page. - - - -The t:titlepage-content element has two attributes: - - - -side - -Identifies the side of the page to which this title -page content applies. The -side attribute is required and -must be set to either -recto or -verso. In addition, you must specify -exactly one t:titlepage-content for each side -within each t:titlepage. - - - -order - -Indicates how the order of the elements presented on -the title page is determined. If the -order is -document, the elements are presented -in document order. Otherwise (if the -order is -stylesheet), the elements are presented -in the order that they appear in the template (and consequently in -the stylesheet). - - - - - - - - - -The content of a t:titlepage-content element is -a list of element names. These names should be unqualified. They identify -the elements in the source document that should appear on the title page. - - - - -Each element may have a single attribute: -predicate. The value of this -attribute is used as a predicate for the expression that matches -the element on which it occurs. - - - -In other words, to put only the first three authors on the -recto-side of a title -page, you could specify: - - - <t:titlepage-contents side="recto"> - <!-- other titlepage elements --> - <author predicate="[count(previous-sibling::author)<2]"/> - <!-- other titlepage elements --> - </t:titlepage-contents> - - - - - -Usually, the elements so named are empty. But it is possible to -make one level of selection within them. Suppose that you want to -process authorgroup elements on the title page, but -you want to select only proper authors, editors, or corporate authors, -not collaborators or other credited authors. - - - -In that case, you can put a t:or group inside -the authorgroup element: - - - <t:titlepage-contents side="recto"> - <!-- other titlepage elements --> - <authorgroup> - <t:or> - <author/> - <editor/> - <corpauthor/> - </t:or> - </authorgroup> - <!-- other titlepage elements --> - </t:titlepage-contents> - - - - - -This will have the effect of automatically generating a template -for processing authorgroups in the title page mode, -selecting only the specified children. If you need more complex processing, -you'll have to construct the templates by hand. - - - - - - -t:titlepage-separator -Create templates for the separator - - -<xsl:template match="t:titlepage-separator"/> - -Description - -The title page is separated from the content which follows it by -the markup specified in the t:titlepage-separator -element. - - - - - -t:titlepage-before -Create templates for what precedes a title page - - -<xsl:template match="t:titlepage-before"/> - -Description - -Each side of the title page is preceded by the markup specified -in the t:titlepage-before element for that -side. - - - - - -* (in copy mode) -Copy elements - - -<xsl:template match="*" mode="copy"/> - -Description - -This template simply copies the elements that it applies to -straight through into the result tree. - - - - - -@* (in copy mode) -Copy attributes - - -<xsl:template match="@*" mode="copy"/> - -Description - -This template simply copies the attributes that it applies to -straight through into the result tree. - - - - - -* (in document.order mode) -Create rules to process titlepage elements in document order - - -<xsl:template match="*" mode="document.order"/> - -Description - -This template is called to process all of the children of the -t:titlepage-content element. It creates the hairy -select expression necessary to process each of those elements in -the title page. - - - -Note that this template automatically handles the case where -some DocBook elements, like title and subtitle, can occur both inside -the *info elements where metadata is usually stored and outside. - - - - -It also automatically calculates the name for the *info container -and handles elements that have historically had containers with different -names. - - - - - - -* (in document.order mode) -Create rules to process titlepage elements in stylesheet order - - -<xsl:template match="*" mode="document.order"/> - -Description - -This template is called to process all of the children of the -t:titlepage-content element. It creates the set -of xsl:apply-templates elements necessary -process each of those elements in the title page. - - - -Note that this template automatically handles the case where -some DocBook elements, like title and subtitle, can occur both inside -the *info elements where metadata is usually stored and outside. - - - - -It also automatically calculates the name for the *info container -and handles elements that have historically had containers with different -names. - - - - - - -* (in titlepage.specialrules mode) -Create templates for special rules - - -<xsl:template match="*" mode="titlepage.specialrules"/> - -Description - -This template is called to process all of the descendants of the -t:titlepage-content element that require special -processing. At present, that's just t:or elements. - - - - - - -* (in titlepage.subrules mode) -Create template for individual special rules - - -<xsl:template match="*" mode="titlepage.subrules"/> - -Description - -This template is called to process the children of special -template elements. - - - - - - -t:or -Process the t:or special rule - - -<xsl:template match="t:or"/><xsl:template match="t:or" mode="titlepage.subrules"/> - -Description - -This template processes t:or. - - - - - -t:or (in titlepage.subrules mode) -Process the t:or special rule in -titlepage.subrules mode - - -<xsl:template match="t:or" mode="titlepage.subrules"/> - -Description - -The titlepage.subrules mode doesn't apply to t:or, so just -reprocess this node in the normal mode. - - - - - -element-or-list -Construct the "or-list" used in the select attribute for -special rules. - - -<xsl:template name="element-or-list"> -<xsl:param name="elements" select="*"/> -<xsl:param name="element.count" select="count($elements)"/> -<xsl:param name="count" select="1"/> -<xsl:param name="orlist"/> - ... -</xsl:template> - -Description - -Walk through each of the children of t:or, producing the -text of the select attribute. - - - - -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/warranty.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/warranty.xml deleted file mode 100644 index 3c70d323c6c407033f1ba9e998732e6ff8c9f53f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/docsrc/warranty.xml +++ /dev/null @@ -1,11 +0,0 @@ -Warranty -THE SOFTWARE IS PROVIDED AS IS, -WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY -OTHER CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT -OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/eclipse.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/eclipse.xsl deleted file mode 100644 index a4d58e9512dbd7b06af6fcc987a86b7306f79ad1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/eclipse.xsl +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - Formatting from - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - - ) - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/eclipse3.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/eclipse3.xsl deleted file mode 100644 index efb6328a6b2ca3c063482b0d3d111d3b3aa6cd25..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/eclipse3.xsl +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Manifest-Version: 1.0 - - Bundle-Version: 1.0 - - Bundle-Name: - - Bundle-SymbolicName: - - Bundle-Vendor: - - - - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html deleted file mode 100644 index 93056a3230a913aeed8783d088b3db52ccffbd7e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/eclipse - - -

    Index of /release/xsl-ns/1.76.1/eclipse

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] eclipse3.xsl 01-Nov-2010 20:31 3.9K -[TXT] eclipse.xsl 01-Nov-2010 20:31 11K -[TXT] profile-eclipse.xsl 01-Nov-2010 20:31 12K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=D;O=A deleted file mode 100644 index 4a7aeb6d184afba7a8ad998dd51f95f563d93d3b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=D;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/eclipse - - -

    Index of /release/xsl-ns/1.76.1/eclipse

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] eclipse.xsl 01-Nov-2010 20:31 11K -[TXT] eclipse3.xsl 01-Nov-2010 20:31 3.9K -[TXT] profile-eclipse.xsl 01-Nov-2010 20:31 12K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=D;O=D deleted file mode 100644 index fede33d1a401bb78521bce4ae267e13adbf471a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=D;O=D +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/eclipse - - -

    Index of /release/xsl-ns/1.76.1/eclipse

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-eclipse.xsl 01-Nov-2010 20:31 12K -[TXT] eclipse3.xsl 01-Nov-2010 20:31 3.9K -[TXT] eclipse.xsl 01-Nov-2010 20:31 11K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=M;O=A deleted file mode 100644 index 84d54c391fc4bbc99cbcf028d74d4201c745310f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=M;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/eclipse - - -

    Index of /release/xsl-ns/1.76.1/eclipse

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] eclipse.xsl 01-Nov-2010 20:31 11K -[TXT] eclipse3.xsl 01-Nov-2010 20:31 3.9K -[TXT] profile-eclipse.xsl 01-Nov-2010 20:31 12K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=M;O=D deleted file mode 100644 index fede33d1a401bb78521bce4ae267e13adbf471a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=M;O=D +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/eclipse - - -

    Index of /release/xsl-ns/1.76.1/eclipse

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-eclipse.xsl 01-Nov-2010 20:31 12K -[TXT] eclipse3.xsl 01-Nov-2010 20:31 3.9K -[TXT] eclipse.xsl 01-Nov-2010 20:31 11K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=N;O=A deleted file mode 100644 index 115fdf2979b3b5ca81316e12324a7b615b5aeb36..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=N;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/eclipse - - -

    Index of /release/xsl-ns/1.76.1/eclipse

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] eclipse.xsl 01-Nov-2010 20:31 11K -[TXT] eclipse3.xsl 01-Nov-2010 20:31 3.9K -[TXT] profile-eclipse.xsl 01-Nov-2010 20:31 12K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=N;O=D deleted file mode 100644 index fede33d1a401bb78521bce4ae267e13adbf471a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=N;O=D +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/eclipse - - -

    Index of /release/xsl-ns/1.76.1/eclipse

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-eclipse.xsl 01-Nov-2010 20:31 12K -[TXT] eclipse3.xsl 01-Nov-2010 20:31 3.9K -[TXT] eclipse.xsl 01-Nov-2010 20:31 11K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=S;O=A deleted file mode 100644 index 93056a3230a913aeed8783d088b3db52ccffbd7e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=S;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/eclipse - - -

    Index of /release/xsl-ns/1.76.1/eclipse

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] eclipse3.xsl 01-Nov-2010 20:31 3.9K -[TXT] eclipse.xsl 01-Nov-2010 20:31 11K -[TXT] profile-eclipse.xsl 01-Nov-2010 20:31 12K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=S;O=D deleted file mode 100644 index ebc628d336cb5507a95f623799c3ef54c1d1ac75..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/index.html?C=S;O=D +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/eclipse - - -

    Index of /release/xsl-ns/1.76.1/eclipse

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-eclipse.xsl 01-Nov-2010 20:31 12K -[TXT] eclipse.xsl 01-Nov-2010 20:31 11K -[TXT] eclipse3.xsl 01-Nov-2010 20:31 3.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/profile-eclipse.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/profile-eclipse.xsl deleted file mode 100644 index 375c27f4cb458d256d884c7194de2c49668179c7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/eclipse/profile-eclipse.xsl +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - Formatting from - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - - ) - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/docbook.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/docbook.xsl deleted file mode 100644 index dfa244c2c8f4a1c46ba08408498cd1a7ff2ccbc2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/docbook.xsl +++ /dev/null @@ -1,1678 +0,0 @@ - - - - - - - - - - 1 - 2 - - book toc,title - - - - - 4 - - - - - - - - - - - - - - - ncxtoc - htmltoc - - - - - - 0 - - - - - - - - .png - - - - - - - - - - - - - - - - 1 - - - 1 - - - 1 - - - 1 - - - 0 - - - - - - - - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - Formatting from - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - urn: - - : - - - - - urn:isbn: - - - - urn:issn: - - - - - - - - - - - - - _ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.0 - - - - - - - - - - - - - - - - - - - - - - cover - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.0 - - - - - - - application/oebps-package+xml - - - - - - - - - - - - - - - - - - - - - - - - - 2005-1 - - - - - - cover - - - - - - - dtb:uid - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - : - - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - © - - - - - - - - - - - - - - - - cover - Cover - - - - - - - - - - - toc - Table of Contents - - - - - - - - - - - - - - - - - - - - - - yes - - no - - - - - - - - - - yes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - application/x-dtbncx+xml - - - - - - - application/xhtml+xml - - - - - - - - - - - text/css - css - - - - - - - - - - - application/xhtml+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/gif - - - image/gif - - - image/png - - - image/png - - - image/jpeg - - - image/jpeg - - - image/jpeg - - - image/jpeg - - - image/svg+xml - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WARNING: mediaobjectco almost certainly will not render as expected in .epub! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - application/xhtml+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (missing alt) - - - - - - - - - - - - - - text-align: - - middle - - - - - - - - - - - - - - - - - - - - - - 1 - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - 1 - - 1 - 1 - 1 - 1 - 1 - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - - No insertfile extension available. Use a different processor (with extensions) or turn on $use.extensions and $textinsert.extension (see docs for more). - - - - - - - - - - - - - - - - - - - - - - - - - - - - Cover - - text/css - - img { max-width: 100%; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -toc - - - - - - - - - - - - - - - - - - - - - - - - font/opentype - - - - WARNING: OpenType fonts should be supplied! ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - - - - - - - - - - clear: both - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - 1 - - - - - - - 1 - 2 - 3 - 4 - 5 - - - - - - - - - - - - - - - - - - - - - - - - 6 - 5 - 4 - 3 - 2 - 1 - - - - - title - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html deleted file mode 100644 index f58506eb842111647dc73bf321509df35a32eb0b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/epub - - -

    Index of /release/xsl-ns/1.76.1/epub

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[TXT] docbook.xsl 01-Nov-2010 20:31 72K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=D;O=A deleted file mode 100644 index d3a86638ad747111bd4628a497b269ae22c1d7a7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=D;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/epub - - -

    Index of /release/xsl-ns/1.76.1/epub

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[TXT] docbook.xsl 01-Nov-2010 20:31 72K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=D;O=D deleted file mode 100644 index 757880c956939da98eb8b1e4220b70400d548580..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=D;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/epub - - -

    Index of /release/xsl-ns/1.76.1/epub

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] docbook.xsl 01-Nov-2010 20:31 72K -[DIR] bin/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=M;O=A deleted file mode 100644 index 3b756a6a3bbbf39ae858095d7cbdea6065d3c534..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=M;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/epub - - -

    Index of /release/xsl-ns/1.76.1/epub

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] docbook.xsl 01-Nov-2010 20:31 72K -[DIR] bin/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=M;O=D deleted file mode 100644 index 24fd025576b4b8874d1d491437220f04ce04d9b7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=M;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/epub - - -

    Index of /release/xsl-ns/1.76.1/epub

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[TXT] docbook.xsl 01-Nov-2010 20:31 72K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=N;O=A deleted file mode 100644 index 9d5902c3dc8f758018212bec74a1da7b779f02b2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=N;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/epub - - -

    Index of /release/xsl-ns/1.76.1/epub

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[TXT] docbook.xsl 01-Nov-2010 20:31 72K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=N;O=D deleted file mode 100644 index 757880c956939da98eb8b1e4220b70400d548580..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=N;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/epub - - -

    Index of /release/xsl-ns/1.76.1/epub

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] docbook.xsl 01-Nov-2010 20:31 72K -[DIR] bin/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=S;O=A deleted file mode 100644 index f58506eb842111647dc73bf321509df35a32eb0b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=S;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/epub - - -

    Index of /release/xsl-ns/1.76.1/epub

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[TXT] docbook.xsl 01-Nov-2010 20:31 72K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=S;O=D deleted file mode 100644 index 757880c956939da98eb8b1e4220b70400d548580..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/epub/index.html?C=S;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/epub - - -

    Index of /release/xsl-ns/1.76.1/epub

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] docbook.xsl 01-Nov-2010 20:31 72K -[DIR] bin/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/LICENSE.txt b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/LICENSE.txt deleted file mode 100644 index fed77d97c5aec404d7a6e7cc197f1bbcc9dada3c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/LICENSE.txt +++ /dev/null @@ -1,264 +0,0 @@ -LICENSE - - Copyright (c) 2008 N. Quaine - NexWave Solutions All Rights Reserved. - -CONDITIONS - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of the copyright holders nor the names of the contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -DISCLAIMER - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - -Some code in src/java/org/apache/lucene/util/UnicodeUtil.java was -derived from unicode conversion examples available at -http://www.unicode.org/Public/PROGRAMS/CVTUTF. Here is the copyright -from those sources: - -/* - * Copyright 2001-2004 Unicode, Inc. - * - * Disclaimer - * - * This source code is provided as is by Unicode, Inc. No claims are - * made as to fitness for any particular purpose. No warranties of any - * kind are expressed or implied. The recipient agrees to determine - * applicability of information provided. If this file has been - * purchased on magnetic or optical media from Unicode, Inc., the - * sole remedy for any claim will be exchange of defective media - * within 90 days of receipt. - * - * Limitations on Rights to Redistribute This Code - * - * Unicode, Inc. hereby grants the right to freely use the information - * supplied in this file in the creation of products supporting the - * Unicode Standard, and to make copies of this file in any form - * for internal or external distribution as long as this notice - * remains attached. - */ - - -Some code in src/java/org/apache/lucene/util/ArrayUtil.java was -derived from Python 2.4.2 sources available at -http://www.python.org. Full license is here: - - http://www.python.org/download/releases/2.4.2/license/ - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/NOTICE.txt b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/NOTICE.txt deleted file mode 100644 index 35f247d3c85d31e46567d6ca22e63a925ff90166..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/NOTICE.txt +++ /dev/null @@ -1,12 +0,0 @@ -The webhelpindexer is released under the Apache 2.0 license and -includes software from other projects. - -The webhelpindexer was originally developed by N. Quaine and released -under a MIT/BSD-style license. See LICENSE.txt. - -This product includes software developed by The Apache Software -Foundation (http://www.apache.org/). See LICENSE.txt. - -This product also includes software released as part of the Snowball -project maintained by Martin Porter and Richard Boulton released under -a BSD-style license: http://snowball.tartarus.org/ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/docbook.py b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/docbook.py deleted file mode 100644 index c07060232b987068ffb2d69f355013cba2e900aa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/docbook.py +++ /dev/null @@ -1,239 +0,0 @@ -# docbook.py: extension module -# $Id: docbook.py 8353 2009-03-17 16:57:50Z mzjn $ - -import sys -import string -import libxml2 -import libxslt -import re -import math - -# Some globals -pixelsPerInch = 96.0 -unitHash = { 'in': pixelsPerInch, - 'cm': pixelsPerInch / 2.54, - 'mm': pixelsPerInch / 25.4, - 'pc': (pixelsPerInch / 72.0) * 12, - 'pt': pixelsPerInch / 72.0, - 'px': 1 } - -# ====================================================================== - -def adjustColumnWidths(ctx, nodeset): - # - # Small check to verify the context is correcly accessed - # - try: - pctxt = libxslt.xpathParserContext(_obj=ctx) - ctxt = pctxt.context() - tctxt = ctxt.transformContext() - except: - pass - - # Get the nominal table width - varString = lookupVariable(tctxt, "nominal.table.width", None) - if varString == None: - nominalWidth = 6 * pixelsPerInch; - else: - nominalWidth = convertLength(varString); - - # Get the requested table width - tableWidth = lookupVariable(tctxt, "table.width", "100%") - - foStylesheet = (tctxt.variableLookup("stylesheet.result.type", None) == "fo") - - relTotal = 0 - relParts = [] - - absTotal = 0 - absParts = [] - - colgroup = libxml2.xmlNode(_obj = nodeset[0]) - # If this is an foStylesheet, we've been passed a list of fo:table-columns. - # Otherwise we've been passed a colgroup that contains a list of cols. - if foStylesheet: - colChildren = colgroup - else: - colChildren = colgroup.children - - col = colChildren - while col != None: - if foStylesheet: - width = col.prop("column-width") - else: - width = col.prop("width") - - if width == None: - width = "1*" - - relPart = 0.0 - absPart = 0.0 - starPos = string.find(width, "*") - if starPos >= 0: - relPart, absPart = string.split(width, "*", 2) - relPart = float(relPart) - relTotal = relTotal + float(relPart) - else: - absPart = width - - pixels = convertLength(absPart) - absTotal = absTotal + pixels - - relParts.append(relPart) - absParts.append(pixels) - - col = col.next - - # Ok, now we have the relative widths and absolute widths in - # two parallel arrays. - # - # - If there are no relative widths, output the absolute widths - # - If there are no absolute widths, output the relative widths - # - If there are a mixture of relative and absolute widths, - # - If the table width is absolute, turn these all into absolute - # widths. - # - If the table width is relative, turn these all into absolute - # widths in the nominalWidth and then turn them back into - # percentages. - - widths = [] - - if relTotal == 0: - for absPart in absParts: - if foStylesheet: - inches = absPart / pixelsPerInch - widths.append("%4.2fin" % inches) - else: - widths.append("%d" % absPart) - elif absTotal == 0: - for relPart in relParts: - rel = relPart / relTotal * 100 - widths.append(rel) - widths = correctRoundingError(widths) - else: - pixelWidth = nominalWidth - if string.find(tableWidth, "%") < 0: - pixelWidth = convertLength(tableWidth) - - if pixelWidth <= absTotal: - print "Table is wider than table width" - else: - pixelWidth = pixelWidth - absTotal - - absTotal = 0 - for count in range(len(relParts)): - rel = relParts[count] / relTotal * pixelWidth - relParts[count] = rel + absParts[count] - absTotal = absTotal + rel + absParts[count] - - if string.find(tableWidth, "%") < 0: - for count in range(len(relParts)): - if foStylesheet: - pixels = relParts[count] - inches = pixels / pixelsPerInch - widths.append("%4.2fin" % inches) - else: - widths.append(relParts[count]) - else: - for count in range(len(relParts)): - rel = relParts[count] / absTotal * 100 - widths.append(rel) - widths = correctRoundingError(widths) - - # Danger, Will Robinson! In-place modification of the result tree! - # Side-effect free? We don' need no steenkin' side-effect free! - count = 0 - col = colChildren - while col != None: - if foStylesheet: - col.setProp("column-width", widths[count]) - else: - col.setProp("width", widths[count]) - - count = count+1 - col = col.next - - return nodeset - -def convertLength(length): - # Given "3.4in" return the width in pixels - global pixelsPerInch - global unitHash - - m = re.search('([+-]?[\d\.]+)(\S+)', length) - if m != None and m.lastindex > 1: - unit = pixelsPerInch - if unitHash.has_key(m.group(2)): - unit = unitHash[m.group(2)] - else: - print "Unrecognized length: " + m.group(2) - - pixels = unit * float(m.group(1)) - else: - pixels = 0 - - return pixels - -def correctRoundingError(floatWidths): - # The widths are currently floating point numbers, we have to truncate - # them back to integers and then distribute the error so that they sum - # to exactly 100%. - - totalWidth = 0 - widths = [] - for width in floatWidths: - width = math.floor(width) - widths.append(width) - totalWidth = totalWidth + math.floor(width) - - totalError = 100 - totalWidth - columnError = totalError / len(widths) - error = 0 - for count in range(len(widths)): - width = widths[count] - error = error + columnError - if error >= 1.0: - adj = math.floor(error) - error = error - adj - widths[count] = "%d%%" % (width + adj) - else: - widths[count] = "%d%%" % width - - return widths - -def lookupVariable(tctxt, varName, default): - varString = tctxt.variableLookup(varName, None) - if varString == None: - return default - - # If it's a list, get the first element - if type(varString) == type([]): - varString = varString[0] - - # If it's not a string, it must be a node, get its content - if type(varString) != type(""): - varString = varString.content - - return varString - -# ====================================================================== -# Random notes... - -#once you have a node which is a libxml2 python xmlNode wrapper all common -#operations are possible: -# .children .last .parent .next .prev .doc for navigation -# .content .type for introspection -# .prop("attribute_name") to lookup attribute values - -# # Now make a nodeset to return -# # Danger, Will Robinson! This creates a memory leak! -# newDoc = libxml2.newDoc("1.0") -# newColGroup = newDoc.newDocNode(None, "colgroup", None) -# newDoc.addChild(newColGroup) -# col = colgroup.children -# while col != None: -# newCol = newDoc.newDocNode(None, "col", None) -# newCol.copyPropList(col); -# newCol.setProp("width", "4") -# newColGroup.addChild(newCol) -# col = col.next diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html deleted file mode 100644 index 6c90de367af001157d93fe2601c464860523a391..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/extensions - - -

    Index of /release/xsl-ns/1.76.1/extensions

    -
    Icon  Name                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] NOTICE.txt 01-Nov-2010 20:31 533 -[TXT] xslt.py 01-Nov-2010 20:31 2.1K -[TXT] docbook.py 01-Nov-2010 20:31 7.1K -[TXT] LICENSE.txt 01-Nov-2010 20:31 14K -[   ] xalan27.jar 01-Nov-2010 20:31 56K -[   ] saxon65.jar 01-Nov-2010 20:31 79K -[   ] lucene-analyzers-3.0.0.jar 01-Nov-2010 20:31 196K -[   ] webhelpindexer.jar 01-Nov-2010 20:31 224K -[   ] lucene-core-3.0.0.jar 01-Nov-2010 20:31 1.0M -
    -
    -See webhelp/docs/index.html for more information about the webhelp
    -indexer and the webhelp output format. See webhelp/docs/index.html for
    -more information about the webhelp indexer and the webhelp output
    -format.
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=D;O=A deleted file mode 100644 index 77ad36d0eef441d439e6e2846952b75d018fd5b9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=D;O=A +++ /dev/null @@ -1,25 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/extensions - - -

    Index of /release/xsl-ns/1.76.1/extensions

    -
    Icon  Name                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] LICENSE.txt 01-Nov-2010 20:31 14K -[TXT] NOTICE.txt 01-Nov-2010 20:31 533 -[TXT] docbook.py 01-Nov-2010 20:31 7.1K -[   ] lucene-analyzers-3.0.0.jar 01-Nov-2010 20:31 196K -[   ] lucene-core-3.0.0.jar 01-Nov-2010 20:31 1.0M -[   ] saxon65.jar 01-Nov-2010 20:31 79K -[   ] webhelpindexer.jar 01-Nov-2010 20:31 224K -[   ] xalan27.jar 01-Nov-2010 20:31 56K -[TXT] xslt.py 01-Nov-2010 20:31 2.1K -
    -
    -See webhelp/docs/index.html for more information about the webhelp
    -indexer and the webhelp output format. See webhelp/docs/index.html for
    -more information about the webhelp indexer and the webhelp output
    -format.
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=D;O=D deleted file mode 100644 index 617fd46ab1d66185e50a22b0bdc65577136ee6ae..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=D;O=D +++ /dev/null @@ -1,25 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/extensions - - -

    Index of /release/xsl-ns/1.76.1/extensions

    -
    Icon  Name                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xslt.py 01-Nov-2010 20:31 2.1K -[   ] xalan27.jar 01-Nov-2010 20:31 56K -[   ] webhelpindexer.jar 01-Nov-2010 20:31 224K -[   ] saxon65.jar 01-Nov-2010 20:31 79K -[   ] lucene-core-3.0.0.jar 01-Nov-2010 20:31 1.0M -[   ] lucene-analyzers-3.0.0.jar 01-Nov-2010 20:31 196K -[TXT] docbook.py 01-Nov-2010 20:31 7.1K -[TXT] NOTICE.txt 01-Nov-2010 20:31 533 -[TXT] LICENSE.txt 01-Nov-2010 20:31 14K -
    -
    -See webhelp/docs/index.html for more information about the webhelp
    -indexer and the webhelp output format. See webhelp/docs/index.html for
    -more information about the webhelp indexer and the webhelp output
    -format.
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=M;O=A deleted file mode 100644 index 0a6df5a29d7e9b4655134fa74156b5c44e3fcfe8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=M;O=A +++ /dev/null @@ -1,25 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/extensions - - -

    Index of /release/xsl-ns/1.76.1/extensions

    -
    Icon  Name                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] LICENSE.txt 01-Nov-2010 20:31 14K -[TXT] NOTICE.txt 01-Nov-2010 20:31 533 -[TXT] docbook.py 01-Nov-2010 20:31 7.1K -[   ] lucene-analyzers-3.0.0.jar 01-Nov-2010 20:31 196K -[   ] lucene-core-3.0.0.jar 01-Nov-2010 20:31 1.0M -[   ] saxon65.jar 01-Nov-2010 20:31 79K -[   ] webhelpindexer.jar 01-Nov-2010 20:31 224K -[   ] xalan27.jar 01-Nov-2010 20:31 56K -[TXT] xslt.py 01-Nov-2010 20:31 2.1K -
    -
    -See webhelp/docs/index.html for more information about the webhelp
    -indexer and the webhelp output format. See webhelp/docs/index.html for
    -more information about the webhelp indexer and the webhelp output
    -format.
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=M;O=D deleted file mode 100644 index 617fd46ab1d66185e50a22b0bdc65577136ee6ae..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=M;O=D +++ /dev/null @@ -1,25 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/extensions - - -

    Index of /release/xsl-ns/1.76.1/extensions

    -
    Icon  Name                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xslt.py 01-Nov-2010 20:31 2.1K -[   ] xalan27.jar 01-Nov-2010 20:31 56K -[   ] webhelpindexer.jar 01-Nov-2010 20:31 224K -[   ] saxon65.jar 01-Nov-2010 20:31 79K -[   ] lucene-core-3.0.0.jar 01-Nov-2010 20:31 1.0M -[   ] lucene-analyzers-3.0.0.jar 01-Nov-2010 20:31 196K -[TXT] docbook.py 01-Nov-2010 20:31 7.1K -[TXT] NOTICE.txt 01-Nov-2010 20:31 533 -[TXT] LICENSE.txt 01-Nov-2010 20:31 14K -
    -
    -See webhelp/docs/index.html for more information about the webhelp
    -indexer and the webhelp output format. See webhelp/docs/index.html for
    -more information about the webhelp indexer and the webhelp output
    -format.
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=N;O=A deleted file mode 100644 index ad49a14ef0ffb4e07fbf9eef64a5332e77a9af38..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=N;O=A +++ /dev/null @@ -1,25 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/extensions - - -

    Index of /release/xsl-ns/1.76.1/extensions

    -
    Icon  Name                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] LICENSE.txt 01-Nov-2010 20:31 14K -[TXT] NOTICE.txt 01-Nov-2010 20:31 533 -[TXT] docbook.py 01-Nov-2010 20:31 7.1K -[   ] lucene-analyzers-3.0.0.jar 01-Nov-2010 20:31 196K -[   ] lucene-core-3.0.0.jar 01-Nov-2010 20:31 1.0M -[   ] saxon65.jar 01-Nov-2010 20:31 79K -[   ] webhelpindexer.jar 01-Nov-2010 20:31 224K -[   ] xalan27.jar 01-Nov-2010 20:31 56K -[TXT] xslt.py 01-Nov-2010 20:31 2.1K -
    -
    -See webhelp/docs/index.html for more information about the webhelp
    -indexer and the webhelp output format. See webhelp/docs/index.html for
    -more information about the webhelp indexer and the webhelp output
    -format.
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=N;O=D deleted file mode 100644 index 617fd46ab1d66185e50a22b0bdc65577136ee6ae..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=N;O=D +++ /dev/null @@ -1,25 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/extensions - - -

    Index of /release/xsl-ns/1.76.1/extensions

    -
    Icon  Name                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xslt.py 01-Nov-2010 20:31 2.1K -[   ] xalan27.jar 01-Nov-2010 20:31 56K -[   ] webhelpindexer.jar 01-Nov-2010 20:31 224K -[   ] saxon65.jar 01-Nov-2010 20:31 79K -[   ] lucene-core-3.0.0.jar 01-Nov-2010 20:31 1.0M -[   ] lucene-analyzers-3.0.0.jar 01-Nov-2010 20:31 196K -[TXT] docbook.py 01-Nov-2010 20:31 7.1K -[TXT] NOTICE.txt 01-Nov-2010 20:31 533 -[TXT] LICENSE.txt 01-Nov-2010 20:31 14K -
    -
    -See webhelp/docs/index.html for more information about the webhelp
    -indexer and the webhelp output format. See webhelp/docs/index.html for
    -more information about the webhelp indexer and the webhelp output
    -format.
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=S;O=A deleted file mode 100644 index 6c90de367af001157d93fe2601c464860523a391..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=S;O=A +++ /dev/null @@ -1,25 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/extensions - - -

    Index of /release/xsl-ns/1.76.1/extensions

    -
    Icon  Name                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] NOTICE.txt 01-Nov-2010 20:31 533 -[TXT] xslt.py 01-Nov-2010 20:31 2.1K -[TXT] docbook.py 01-Nov-2010 20:31 7.1K -[TXT] LICENSE.txt 01-Nov-2010 20:31 14K -[   ] xalan27.jar 01-Nov-2010 20:31 56K -[   ] saxon65.jar 01-Nov-2010 20:31 79K -[   ] lucene-analyzers-3.0.0.jar 01-Nov-2010 20:31 196K -[   ] webhelpindexer.jar 01-Nov-2010 20:31 224K -[   ] lucene-core-3.0.0.jar 01-Nov-2010 20:31 1.0M -
    -
    -See webhelp/docs/index.html for more information about the webhelp
    -indexer and the webhelp output format. See webhelp/docs/index.html for
    -more information about the webhelp indexer and the webhelp output
    -format.
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=S;O=D deleted file mode 100644 index 915b271580f5492f88b9cfeb86d689c9a3e53d3e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/index.html?C=S;O=D +++ /dev/null @@ -1,25 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/extensions - - -

    Index of /release/xsl-ns/1.76.1/extensions

    -
    Icon  Name                       Last modified      Size  Description
    [DIR] Parent Directory - -[   ] lucene-core-3.0.0.jar 01-Nov-2010 20:31 1.0M -[   ] webhelpindexer.jar 01-Nov-2010 20:31 224K -[   ] lucene-analyzers-3.0.0.jar 01-Nov-2010 20:31 196K -[   ] saxon65.jar 01-Nov-2010 20:31 79K -[   ] xalan27.jar 01-Nov-2010 20:31 56K -[TXT] LICENSE.txt 01-Nov-2010 20:31 14K -[TXT] docbook.py 01-Nov-2010 20:31 7.1K -[TXT] xslt.py 01-Nov-2010 20:31 2.1K -[TXT] NOTICE.txt 01-Nov-2010 20:31 533 -
    -
    -See webhelp/docs/index.html for more information about the webhelp
    -indexer and the webhelp output format. See webhelp/docs/index.html for
    -more information about the webhelp indexer and the webhelp output
    -format.
    -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/xslt.py b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/xslt.py deleted file mode 100644 index c712f65fb2b4800e6bc5a78ed9f4772b2b68a537..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/extensions/xslt.py +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/python -u -# $Id: xslt.py 8353 2009-03-17 16:57:50Z mzjn $ - -import sys -import libxml2 -import libxslt -from docbook import adjustColumnWidths - -# Check the arguments -usage = "Usage: %s xmlfile.xml xslfile.xsl [outputfile] [param1=val [param2=val]...]" % sys.argv[0] - -xmlfile = None -xslfile = None -outfile = "-" -params = {} - -try: - xmlfile = sys.argv[1] - xslfile = sys.argv[2] -except IndexError: - print usage - sys.exit(1) - -def quote(astring): - if astring.find("'") < 0: - return "'" + astring + "'" - else: - return '"' + astring + '"' - -try: - outfile = sys.argv[3] - if outfile.find("=") > 0: - name, value = outfile.split("=", 2) - params[name] = quote(value) - outfile = None - - count = 4 - while (sys.argv[count]): - try: - name, value = sys.argv[count].split("=", 2) - if params.has_key(name): - print "Warning: '%s' re-specified; replacing value" % name - params[name] = quote(value) - except ValueError: - print "Invalid parameter specification: '" + sys.argv[count] + "'" - print usage - sys.exit(1) - count = count+1 -except IndexError: - pass - -# ====================================================================== -# Memory debug specific -# libxml2.debugMemory(1) - -# Setup environment -libxml2.lineNumbersDefault(1) -libxml2.substituteEntitiesDefault(1) -libxslt.registerExtModuleFunction("adjustColumnWidths", - "http://nwalsh.com/xslt/ext/xsltproc/python/Table", - adjustColumnWidths) - -# Initialize and run -styledoc = libxml2.parseFile(xslfile) -style = libxslt.parseStylesheetDoc(styledoc) -doc = libxml2.parseFile(xmlfile) -result = style.applyStylesheet(doc, params) - -# Save the result -if outfile: - style.saveResultToFilename(outfile, result, 0) -else: - print result - -# Free things up -style.freeStylesheet() -doc.freeDoc() -result.freeDoc() - -# Memory debug specific -#libxslt.cleanup() -#if libxml2.debugMemory(1) != 0: -# print "Memory leak %d bytes" % (libxml2.debugMemory(1)) -# libxml2.dumpMemory() diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/admon.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/admon.xsl deleted file mode 100644 index c594feaeefd3626b6375336325042685b60ca0e3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/admon.xsl +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - 36pt - - - - - - - - - note - warning - caution - tip - important - note - - - - - - - - - - url( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/annotations.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/annotations.xsl deleted file mode 100644 index 428eda7d8097de2c05cc630432834b13f5076509..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/annotations.xsl +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx-kimber.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx-kimber.xsl deleted file mode 100644 index 9b0fd4b6b06c592a2c401b7a6b27841d38f1a803..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx-kimber.xsl +++ /dev/null @@ -1,173 +0,0 @@ - - -%common.entities; - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: the 'kimber' index method requires the - Saxon version 6 or 8 XSLT processor. - - - - - - ERROR: the 'kimber' index method requires the - Innodata Isogen Java extensions for - internationalized indexes. Install those - extensions, or use a different index method. - For more information, see: - http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx-kosek.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx-kosek.xsl deleted file mode 100644 index 855f44cbf0a940958e230050e332d1d0024f6e02..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx-kosek.xsl +++ /dev/null @@ -1,140 +0,0 @@ - - -%common.entities; -]> - - - - - - - - - - - - - - - - ERROR: the 'kosek' index method does not - work with the xsltproc XSLT processor. - - - - - - ERROR: the 'kosek' index method does not - work with the Saxon 8 XSLT processor. - - - - - - - ERROR: the 'kosek' index method requires the - exslt:node-set() function. Use a processor that - has it, or use a different index method. - - - - - - ERROR: the 'kosek' index method requires the - index extension functions be imported: - xsl:import href="common/autoidx-kosek.xsl" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx-ng.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx-ng.xsl deleted file mode 100644 index 59231b037fa0aaae84dc96c87bda3dffb0780f18..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx-ng.xsl +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - -kosek - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx.xsl deleted file mode 100644 index d5ecbf8ade0066522f5b341479252f3f986bce8e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autoidx.xsl +++ /dev/null @@ -1,1331 +0,0 @@ - - -%common.entities; -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: the 'kosek' index method does not - work with the xsltproc XSLT processor. - - - - - - - ERROR: the 'kosek' index method requires the - exslt:node-set() function. Use a processor that - has it, or use a different index method. - - - - - - ERROR: the 'kosek' index method requires the - kosek index extensions be imported: - xsl:import href="fo/autoidx-kosek.xsl" - - - - - - - - - - - - - - ERROR: the 'kimber' index method requires the - Saxon version 6 or 8 XSLT processor. - - - - - - ERROR: the 'kimber' index method requires the - kimber index extensions be imported: - xsl:import href="fo/autoidx-kimber.xsl" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - , - - , - - - - - - - - - , - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - - - - - ) - - - - - - - - - - - - ( - - - - - - ) - - - - - - - - - - - - - - - - - <index> - - <indexdiv> - <title> - - - - </title> - - - - - - - </indexdiv> - - - - - - - - - </index> - - - - - - - - < - - > - - - - - - - - - - - - - <indexdiv> - <title> - - </title> - - - - - - - - </indexdiv> - - - - - - - - - - - - - - - - - - - - - - - - - <indexentry> - <primaryie> - <phrase> - - - - </phrase> - , - - - - - - - - - - - </primaryie> - - - - - - - - - - - - - - - - - - - - - - - - </indexentry> - - - - - - - - - - - <secondaryie> - <phrase> - - - - </phrase> - , - - - - - - - - - - - </secondaryie> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <tertiaryie> - <phrase> - - - - </phrase> - , - - - - - - - - - - - </tertiaryie> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <phrase role="pageno"> - <link linkend=" - - "> - - - - - - - </link> - </phrase> - - - <phrase role="pageno"> - - <link linkend=" - - "> - - - - - - </link> - - </phrase> - - - - - - - - - - - - - - - - - - - - - - - <phrase fole="pageno"> - - <link linkend=" - - "> - - - - - - </link> - - </phrase> - - - - - - - - - - - - - - - - - - - <phrase role="pageno"> - - <link linkend=" - - "> - - - - - - </link> - - </phrase> - - - - - - - - - - <seeie> - <phrase> - - - - </phrase> - </seeie> - - - - - - - - - <seealsoie> - <phrase> - - - - </phrase> - </seealsoie> - - - - - - - - - - - - - &lt; - - - - - - - - &amp; - - - - - - - - &lt; - - - - - - - - &amp; - - - - - - - - - - - - - - - - - - - - - - - - - - - - index - term-separator - - - - - - - - - - - - - - index - number-separator - - - - - - - - - - - - - - index - range-separator - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autotoc.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autotoc.xsl deleted file mode 100644 index 880268f268a402bb63ca297e974dc73aee766296..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/autotoc.xsl +++ /dev/null @@ -1,917 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3em - -3em - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/axf.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/axf.xsl deleted file mode 100644 index a4b89edf6aa960de494770f871e0dbfb7d743119..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/axf.xsl +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - author - - - - - - - - - - - - - - - - - - - - - keywords - - - - - , - - - - - - - - - subject - - - - - , - - - - - - - - - - - - - - crop - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/biblio-iso690.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/biblio-iso690.xsl deleted file mode 100644 index 052ef07dc22f629b9fa1c662b5f66bc4b8829d22..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/biblio-iso690.xsl +++ /dev/null @@ -1,1302 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - In - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/biblio.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/biblio.xsl deleted file mode 100644 index 26e5070be74a06d71c444502b934c9886b49943b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/biblio.xsl +++ /dev/null @@ -1,1171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No bibliography entry: - - found in - - - - Error: no bibliography entry: - - found in - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No bibliography entry: - - found in - - - - Error: no bibliography entry: - - found in - - - - - - - - - - - - - - - - - - - - [ - - ] - - - [ - - ] - - - [ - - ] - - - [ - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - copyright - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/block.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/block.xsl deleted file mode 100644 index 8465d246beb02c5727c04f7238368afa7224bcc1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/block.xsl +++ /dev/null @@ -1,656 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0pt - 0pt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0pt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0pt - 0.5em - 0pt - - - - - 0.5em - 0pt - 0pt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0pt - 0.5em - 0pt - - - - - 0.5em - 0pt - 0pt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/callout.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/callout.xsl deleted file mode 100644 index a09829f6b506ec685e353ac37c922884d29ad76d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/callout.xsl +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Don't know how to do callouts with - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Error: coref link is broken: - - - - - - Error: coref doesn't point to a co: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - url( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - Don't know how to generate Unicode callouts - when $callout.unicode.start.character is - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/component.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/component.xsl deleted file mode 100644 index fc4d51924f633fd1d02f205e4d7f785d5b2622a1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/component.xsl +++ /dev/null @@ -1,889 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - 5 - 4 - 3 - 2 - 1 - - - - - - - - - - - - - inherit - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/division.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/division.xsl deleted file mode 100644 index fad89af2450c938f46da75f19aaf711e39c45381..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/division.xsl +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/docbook.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/docbook.xsl deleted file mode 100644 index 0eccd9a792366abb019c831a495a2ef41dacdd7d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/docbook.xsl +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Element - - in namespace ' - - ' encountered - - in - - - , but no template matches. - - - - < - - > - - </ - - > - - - - - - - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - ERROR: Document root element ($rootid= - - ) for FO output - must be one of the following elements: - - - - - - - - - - - - - - - - - - - - - ERROR: Document root element for FO output - must be one of the following elements: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [could not find document title] - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Making - - pages on - - paper ( - - x - - ) - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/ebnf.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/ebnf.xsl deleted file mode 100644 index ccb9e81d9260c157d435354b9b28392f0aaee9ca..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/ebnf.xsl +++ /dev/null @@ -1,326 +0,0 @@ - - - - - - - - -$Id: ebnf.xsl 6910 2007-06-28 23:23:30Z xmldoc $ - -Walsh -Norman -199920002001 -Norman Walsh - - -HTML EBNF Reference - - -
    Introduction - -This is technical reference documentation for the DocBook XSL -Stylesheets; it documents (some of) the parameters, templates, and -other elements of the stylesheets. - -This reference describes the templates and parameters relevant -to formatting EBNF markup. - -This is not intended to be user documentation. -It is provided for developers writing customization layers for the -stylesheets, and for anyone who's interested in how it -works. - -Although I am trying to be thorough, this documentation is known -to be incomplete. Don't forget to read the source, too :-) -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - Error: no ID for productionrecap linkend: - - . - - - - - - Warning: multiple "IDs" for productionrecap linkend: - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - production - - - - - - - - - Non-terminals with no content must point to - production elements in the current document. - - - Invalid xpointer for empty nt: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - - - - - /*  - -  */ - - - - - - - - - - constraintdef - - - - - - - - - - - - - - - - - - - : - - - - - - - : - - - - - - - - - -  ] - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fo-rtf.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fo-rtf.xsl deleted file mode 100644 index 4a59820e61cc3235a7bb3726622cd8e0650bff52..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fo-rtf.xsl +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fo.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fo.xsl deleted file mode 100644 index 40ea74312fc12ba45969898c0bf2f7ae6df9b570..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fo.xsl +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - left - left - left - right - top - left - - - - - - right - right - right - left - bottom - right - - - - - - - WARNING: FOP does not support right-to-left writing-mode - lr-tb - - - WARNING: FOP does not support right-to-left writing-mode - lr-tb - - lr-tb - rl-tb - tb-rl - lr-tb - - - - - - - - - - - - - - - - - - - bullet - - - o - © - - - ® - (SM) - " - " - ' - ' - - - - o - - - - - - - - - - - - - - - - - - - # - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/footnote.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/footnote.xsl deleted file mode 100644 index 77f44d5d9094e682f72b40835ab47af02af17cd0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/footnote.xsl +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - super - - - super - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ERROR: A footnoteref element has a linkend that points to an element that is not a footnote. -Typically this happens when an id attribute is accidentally applied to the child of a footnote element. -target element: -linkend/id: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: footnote number may not be generated - correctly; - - unexpected as first child of footnote. - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fop.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fop.xsl deleted file mode 100644 index dba282f5d5de28eef69b1f3752c8f2e49bbfc7ed..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fop.xsl +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fop1.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fop1.xsl deleted file mode 100644 index b5e0838d996096e65ab57720e8a934129e52602c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/fop1.xsl +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - - - - hide - show - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - , - - - - - - - - - - - DocBook XSL Stylesheets with Apache FOP - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/formal.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/formal.xsl deleted file mode 100644 index 2f1e8ef7f561e40134fab3be06afd1d3732e47fa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/formal.xsl +++ /dev/null @@ -1,644 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - always - - - always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Broken table: tr descendent of CALS Table. - The text in the first tr is: - - - - - - Broken table: row descendent of HTML table. - The text in the first row is: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/glossary.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/glossary.xsl deleted file mode 100644 index 519ceda697f59c34e52b490ebb7325d7bc86fe4f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/glossary.xsl +++ /dev/null @@ -1,1170 +0,0 @@ - - -%common.entities; -]> - - - - - - - - - - - - - - - - - - - - - - &setup-language-variable; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &setup-language-variable; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: processing automatic glossary - without a glossary.collection file. - - - - - - Warning: processing automatic glossary but unable to - open glossary.collection file ' - - ' - - - - - - - - - - - - &setup-language-variable; - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: processing automatic glossary - without a glossary.collection file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: processing automatic glossary - without a glossary.collection file. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &setup-language-variable; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &setup-language-variable; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - &setup-language-variable; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 1 - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - , - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glosssee @otherterm reference not found: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glossseealso @otherterm reference not found: - - - - - - - - - - - - - - - - - - - - - - - - - &setup-language-variable; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 1 - - - - - - - - - - ( - - ) - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - , - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glosssee @otherterm reference not found: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glossseealso @otherterm reference not found: - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/graphics.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/graphics.xsl deleted file mode 100644 index 1b7ab62aebb466626d9cbae5e9d5e7d6ad48756d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/graphics.xsl +++ /dev/null @@ -1,649 +0,0 @@ - - - - ]> - - - - - - - - - - - - PNG PDF JPG JPEG linespecific - - - BMP GIF TIFF SVG PNG EPS JPG JPEG linespecific - - - BMP GIF TIFF SVG PNG EPS JPG JPEG linespecific - - - PNG PDF JPG JPEG linespecific GIF GIF87a GIF89a TIFF BMP - - - SVG PNG PDF JPG JPEG linespecific GIF GIF87a GIF89a TIFF BMP - - - PNG PDF JPG JPEG linespecific GIF GIF87a GIF89a TIFF BMP - - - - - - - 1 - - - - - - - png pdf jpg jpeg - - - bmp gif tif tiff svg png pdf jpg jpeg eps - - - bmp gif tif tiff svg png pdf jpg jpeg eps - - - png pdf jpg jpeg gif tif tiff bmp - - - svg png pdf jpg jpeg gif tif tiff bmp eps - - - svg png pdf jpg jpeg gif tif tiff bmp eps - - - - - - - - - 1 - - - - - - - - - - - - - - application/postscript - application/pdf - image/png - image/svg+xml - image/jpeg - image/gif - image/gif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - 1 - 1 - 0 - - - - - - 0 - 1.0 - - - - 1.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - auto - - - - - - - - - - - - - - - - auto - - - - - - auto - - - - - - - - - - auto - - - - - - auto - - - - - - - - - - - - % - - scale-to-fit - auto - - - - - - auto - - - - - - - - - - - - % - - scale-to-fit - auto - - - - - - - - - - - - - - - - - - - - - - - - - before - center - after - auto - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Don't know how to insert files with - - - - - - - - Cannot insert - . Check use.extensions and textinsert.extension parameters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Don't know how to insert files with - - - - - - - - Cannot insert - . Check use.extensions and textinsert.extension parameters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Don't know how to insert files with - - - - - - - - Cannot insert - . Check use.extensions and textinsert.extension parameters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/highlight.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/highlight.xsl deleted file mode 100644 index db1ebb92367982e0445a889a891f785bebc0c0d3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/highlight.xsl +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/htmltbl.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/htmltbl.xsl deleted file mode 100644 index e51779d172a9dc03bd6ca9b91c806e0ab05af284..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/htmltbl.xsl +++ /dev/null @@ -1,427 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - fixed - - - - - - - - - - - - 100% - - - - - - - all - all - bottom - top - topbot - sides - lhs - rhs - none - all - none - - - - - - - all - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - none - none - none - none - - - - - none - none - none - - - - - - - - - - - - - - - - 1 - - 1 - 1 - - 1 - 0 - - - - - none - none - none - - - - - - - - - - - - - none - none - - - - - 1 - - 1 - 1 - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - none - none - none - - - - - - - - - - - - none - none - none - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html deleted file mode 100644 index bafe5c729453a18ef3d6c80d4ab49fae1a7b89bf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/fo - - -

    Index of /release/xsl-ns/1.76.1/fo

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] annotations.xsl 01-Nov-2010 20:31 785 -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] keywords.xsl 01-Nov-2010 20:31 926 -[TXT] info.xsl 01-Nov-2010 20:31 1.4K -[TXT] passivetex.xsl 01-Nov-2010 20:31 1.4K -[   ] pdf2index 01-Nov-2010 20:31 2.7K -[TXT] highlight.xsl 01-Nov-2010 20:31 2.7K -[TXT] table.xml 01-Nov-2010 20:31 2.8K -[TXT] task.xsl 01-Nov-2010 20:31 2.9K -[TXT] ptc.xsl 01-Nov-2010 20:31 3.8K -[TXT] axf.xsl 01-Nov-2010 20:31 4.1K -[TXT] fop.xsl 01-Nov-2010 20:31 4.4K -[TXT] fo.xsl 01-Nov-2010 20:31 4.5K -[TXT] math.xsl 01-Nov-2010 20:31 4.8K -[TXT] admon.xsl 01-Nov-2010 20:31 4.8K -[TXT] fo-rtf.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.3K -[TXT] xep.xsl 01-Nov-2010 20:31 7.0K -[TXT] fop1.xsl 01-Nov-2010 20:31 8.3K -[TXT] callout.xsl 01-Nov-2010 20:31 8.3K -[TXT] footnote.xsl 01-Nov-2010 20:31 8.7K -[TXT] spaces.xsl 01-Nov-2010 20:31 10K -[TXT] ebnf.xsl 01-Nov-2010 20:31 11K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 12K -[TXT] toc.xsl 01-Nov-2010 20:31 12K -[TXT] docbook.xsl 01-Nov-2010 20:31 12K -[TXT] qandaset.xsl 01-Nov-2010 20:31 14K -[TXT] verbatim.xsl 01-Nov-2010 20:31 16K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 16K -[TXT] index.xsl 01-Nov-2010 20:31 18K -[TXT] graphics.xsl 01-Nov-2010 20:31 22K -[TXT] block.xsl 01-Nov-2010 20:31 22K -[TXT] formal.xsl 01-Nov-2010 20:31 22K -[TXT] division.xsl 01-Nov-2010 20:31 23K -[TXT] refentry.xsl 01-Nov-2010 20:31 24K -[TXT] titlepage.xsl 01-Nov-2010 20:31 27K -[TXT] sections.xsl 01-Nov-2010 20:31 28K -[TXT] autotoc.xsl 01-Nov-2010 20:31 30K -[TXT] synop.xsl 01-Nov-2010 20:31 32K -[TXT] component.xsl 01-Nov-2010 20:31 33K -[TXT] pi.xml 01-Nov-2010 20:31 33K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 35K -[TXT] biblio.xsl 01-Nov-2010 20:31 36K -[TXT] inline.xsl 01-Nov-2010 20:31 39K -[TXT] pi.xsl 01-Nov-2010 20:31 40K -[TXT] glossary.xsl 01-Nov-2010 20:31 44K -[TXT] param.xsl 01-Nov-2010 20:31 46K -[TXT] lists.xsl 01-Nov-2010 20:31 48K -[TXT] autoidx.xsl 01-Nov-2010 20:31 53K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] xref.xsl 01-Nov-2010 20:31 56K -[TXT] table.xsl 01-Nov-2010 20:31 60K -[TXT] pagesetup.xsl 01-Nov-2010 20:31 115K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 253K -[TXT] param.xml 01-Nov-2010 20:31 435K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=D;O=A deleted file mode 100644 index e8ad9de0043abcada93a137e4d99c4fdd0b22318..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=D;O=A +++ /dev/null @@ -1,67 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/fo - - -

    Index of /release/xsl-ns/1.76.1/fo

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] admon.xsl 01-Nov-2010 20:31 4.8K -[TXT] annotations.xsl 01-Nov-2010 20:31 785 -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.3K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx.xsl 01-Nov-2010 20:31 53K -[TXT] autotoc.xsl 01-Nov-2010 20:31 30K -[TXT] axf.xsl 01-Nov-2010 20:31 4.1K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 36K -[TXT] block.xsl 01-Nov-2010 20:31 22K -[TXT] callout.xsl 01-Nov-2010 20:31 8.3K -[TXT] component.xsl 01-Nov-2010 20:31 33K -[TXT] division.xsl 01-Nov-2010 20:31 23K -[TXT] docbook.xsl 01-Nov-2010 20:31 12K -[TXT] ebnf.xsl 01-Nov-2010 20:31 11K -[TXT] fo-rtf.xsl 01-Nov-2010 20:31 5.2K -[TXT] fo.xsl 01-Nov-2010 20:31 4.5K -[TXT] footnote.xsl 01-Nov-2010 20:31 8.7K -[TXT] fop.xsl 01-Nov-2010 20:31 4.4K -[TXT] fop1.xsl 01-Nov-2010 20:31 8.3K -[TXT] formal.xsl 01-Nov-2010 20:31 22K -[TXT] glossary.xsl 01-Nov-2010 20:31 44K -[TXT] graphics.xsl 01-Nov-2010 20:31 22K -[TXT] highlight.xsl 01-Nov-2010 20:31 2.7K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 16K -[TXT] index.xsl 01-Nov-2010 20:31 18K -[TXT] info.xsl 01-Nov-2010 20:31 1.4K -[TXT] inline.xsl 01-Nov-2010 20:31 39K -[TXT] keywords.xsl 01-Nov-2010 20:31 926 -[TXT] lists.xsl 01-Nov-2010 20:31 48K -[TXT] math.xsl 01-Nov-2010 20:31 4.8K -[TXT] pagesetup.xsl 01-Nov-2010 20:31 115K -[TXT] param.xml 01-Nov-2010 20:31 435K -[TXT] param.xsl 01-Nov-2010 20:31 46K -[TXT] passivetex.xsl 01-Nov-2010 20:31 1.4K -[   ] pdf2index 01-Nov-2010 20:31 2.7K -[TXT] pi.xml 01-Nov-2010 20:31 33K -[TXT] pi.xsl 01-Nov-2010 20:31 40K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 12K -[TXT] ptc.xsl 01-Nov-2010 20:31 3.8K -[TXT] qandaset.xsl 01-Nov-2010 20:31 14K -[TXT] refentry.xsl 01-Nov-2010 20:31 24K -[TXT] sections.xsl 01-Nov-2010 20:31 28K -[TXT] spaces.xsl 01-Nov-2010 20:31 10K -[TXT] synop.xsl 01-Nov-2010 20:31 32K -[TXT] table.xml 01-Nov-2010 20:31 2.8K -[TXT] table.xsl 01-Nov-2010 20:31 60K -[TXT] task.xsl 01-Nov-2010 20:31 2.9K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 35K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 253K -[TXT] titlepage.xsl 01-Nov-2010 20:31 27K -[TXT] toc.xsl 01-Nov-2010 20:31 12K -[TXT] verbatim.xsl 01-Nov-2010 20:31 16K -[TXT] xep.xsl 01-Nov-2010 20:31 7.0K -[TXT] xref.xsl 01-Nov-2010 20:31 56K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=D;O=D deleted file mode 100644 index 4d1c5eb80230c13b04a1db40404cb64d3d6418dc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=D;O=D +++ /dev/null @@ -1,67 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/fo - - -

    Index of /release/xsl-ns/1.76.1/fo

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 56K -[TXT] xep.xsl 01-Nov-2010 20:31 7.0K -[TXT] verbatim.xsl 01-Nov-2010 20:31 16K -[TXT] toc.xsl 01-Nov-2010 20:31 12K -[TXT] titlepage.xsl 01-Nov-2010 20:31 27K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 253K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 35K -[TXT] task.xsl 01-Nov-2010 20:31 2.9K -[TXT] table.xsl 01-Nov-2010 20:31 60K -[TXT] table.xml 01-Nov-2010 20:31 2.8K -[TXT] synop.xsl 01-Nov-2010 20:31 32K -[TXT] spaces.xsl 01-Nov-2010 20:31 10K -[TXT] sections.xsl 01-Nov-2010 20:31 28K -[TXT] refentry.xsl 01-Nov-2010 20:31 24K -[TXT] qandaset.xsl 01-Nov-2010 20:31 14K -[TXT] ptc.xsl 01-Nov-2010 20:31 3.8K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 12K -[TXT] pi.xsl 01-Nov-2010 20:31 40K -[TXT] pi.xml 01-Nov-2010 20:31 33K -[   ] pdf2index 01-Nov-2010 20:31 2.7K -[TXT] passivetex.xsl 01-Nov-2010 20:31 1.4K -[TXT] param.xsl 01-Nov-2010 20:31 46K -[TXT] param.xml 01-Nov-2010 20:31 435K -[TXT] pagesetup.xsl 01-Nov-2010 20:31 115K -[TXT] math.xsl 01-Nov-2010 20:31 4.8K -[TXT] lists.xsl 01-Nov-2010 20:31 48K -[TXT] keywords.xsl 01-Nov-2010 20:31 926 -[TXT] inline.xsl 01-Nov-2010 20:31 39K -[TXT] info.xsl 01-Nov-2010 20:31 1.4K -[TXT] index.xsl 01-Nov-2010 20:31 18K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 16K -[TXT] highlight.xsl 01-Nov-2010 20:31 2.7K -[TXT] graphics.xsl 01-Nov-2010 20:31 22K -[TXT] glossary.xsl 01-Nov-2010 20:31 44K -[TXT] formal.xsl 01-Nov-2010 20:31 22K -[TXT] fop1.xsl 01-Nov-2010 20:31 8.3K -[TXT] fop.xsl 01-Nov-2010 20:31 4.4K -[TXT] footnote.xsl 01-Nov-2010 20:31 8.7K -[TXT] fo.xsl 01-Nov-2010 20:31 4.5K -[TXT] fo-rtf.xsl 01-Nov-2010 20:31 5.2K -[TXT] ebnf.xsl 01-Nov-2010 20:31 11K -[TXT] docbook.xsl 01-Nov-2010 20:31 12K -[TXT] division.xsl 01-Nov-2010 20:31 23K -[TXT] component.xsl 01-Nov-2010 20:31 33K -[TXT] callout.xsl 01-Nov-2010 20:31 8.3K -[TXT] block.xsl 01-Nov-2010 20:31 22K -[TXT] biblio.xsl 01-Nov-2010 20:31 36K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] axf.xsl 01-Nov-2010 20:31 4.1K -[TXT] autotoc.xsl 01-Nov-2010 20:31 30K -[TXT] autoidx.xsl 01-Nov-2010 20:31 53K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.3K -[TXT] annotations.xsl 01-Nov-2010 20:31 785 -[TXT] admon.xsl 01-Nov-2010 20:31 4.8K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=M;O=A deleted file mode 100644 index b9127a4a7512ec3a7fb8b4c7d2a7f4ed9da75bca..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=M;O=A +++ /dev/null @@ -1,67 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/fo - - -

    Index of /release/xsl-ns/1.76.1/fo

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] param.xml 01-Nov-2010 20:31 435K -[   ] pdf2index 01-Nov-2010 20:31 2.7K -[TXT] pi.xml 01-Nov-2010 20:31 33K -[TXT] table.xml 01-Nov-2010 20:31 2.8K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 35K -[TXT] admon.xsl 01-Nov-2010 20:31 4.8K -[TXT] annotations.xsl 01-Nov-2010 20:31 785 -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.3K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx.xsl 01-Nov-2010 20:31 53K -[TXT] autotoc.xsl 01-Nov-2010 20:31 30K -[TXT] axf.xsl 01-Nov-2010 20:31 4.1K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 36K -[TXT] block.xsl 01-Nov-2010 20:31 22K -[TXT] callout.xsl 01-Nov-2010 20:31 8.3K -[TXT] component.xsl 01-Nov-2010 20:31 33K -[TXT] division.xsl 01-Nov-2010 20:31 23K -[TXT] docbook.xsl 01-Nov-2010 20:31 12K -[TXT] ebnf.xsl 01-Nov-2010 20:31 11K -[TXT] fo-rtf.xsl 01-Nov-2010 20:31 5.2K -[TXT] fo.xsl 01-Nov-2010 20:31 4.5K -[TXT] footnote.xsl 01-Nov-2010 20:31 8.7K -[TXT] fop.xsl 01-Nov-2010 20:31 4.4K -[TXT] fop1.xsl 01-Nov-2010 20:31 8.3K -[TXT] formal.xsl 01-Nov-2010 20:31 22K -[TXT] glossary.xsl 01-Nov-2010 20:31 44K -[TXT] graphics.xsl 01-Nov-2010 20:31 22K -[TXT] highlight.xsl 01-Nov-2010 20:31 2.7K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 16K -[TXT] index.xsl 01-Nov-2010 20:31 18K -[TXT] info.xsl 01-Nov-2010 20:31 1.4K -[TXT] inline.xsl 01-Nov-2010 20:31 39K -[TXT] keywords.xsl 01-Nov-2010 20:31 926 -[TXT] lists.xsl 01-Nov-2010 20:31 48K -[TXT] math.xsl 01-Nov-2010 20:31 4.8K -[TXT] pagesetup.xsl 01-Nov-2010 20:31 115K -[TXT] param.xsl 01-Nov-2010 20:31 46K -[TXT] passivetex.xsl 01-Nov-2010 20:31 1.4K -[TXT] pi.xsl 01-Nov-2010 20:31 40K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 12K -[TXT] ptc.xsl 01-Nov-2010 20:31 3.8K -[TXT] qandaset.xsl 01-Nov-2010 20:31 14K -[TXT] refentry.xsl 01-Nov-2010 20:31 24K -[TXT] sections.xsl 01-Nov-2010 20:31 28K -[TXT] spaces.xsl 01-Nov-2010 20:31 10K -[TXT] synop.xsl 01-Nov-2010 20:31 32K -[TXT] table.xsl 01-Nov-2010 20:31 60K -[TXT] task.xsl 01-Nov-2010 20:31 2.9K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 253K -[TXT] titlepage.xsl 01-Nov-2010 20:31 27K -[TXT] toc.xsl 01-Nov-2010 20:31 12K -[TXT] verbatim.xsl 01-Nov-2010 20:31 16K -[TXT] xep.xsl 01-Nov-2010 20:31 7.0K -[TXT] xref.xsl 01-Nov-2010 20:31 56K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=M;O=D deleted file mode 100644 index 3265e526e62b96061a20cdc0b9ff00bb75f22d35..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=M;O=D +++ /dev/null @@ -1,67 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/fo - - -

    Index of /release/xsl-ns/1.76.1/fo

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 56K -[TXT] xep.xsl 01-Nov-2010 20:31 7.0K -[TXT] verbatim.xsl 01-Nov-2010 20:31 16K -[TXT] toc.xsl 01-Nov-2010 20:31 12K -[TXT] titlepage.xsl 01-Nov-2010 20:31 27K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 253K -[TXT] task.xsl 01-Nov-2010 20:31 2.9K -[TXT] table.xsl 01-Nov-2010 20:31 60K -[TXT] synop.xsl 01-Nov-2010 20:31 32K -[TXT] spaces.xsl 01-Nov-2010 20:31 10K -[TXT] sections.xsl 01-Nov-2010 20:31 28K -[TXT] refentry.xsl 01-Nov-2010 20:31 24K -[TXT] qandaset.xsl 01-Nov-2010 20:31 14K -[TXT] ptc.xsl 01-Nov-2010 20:31 3.8K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 12K -[TXT] pi.xsl 01-Nov-2010 20:31 40K -[TXT] passivetex.xsl 01-Nov-2010 20:31 1.4K -[TXT] param.xsl 01-Nov-2010 20:31 46K -[TXT] pagesetup.xsl 01-Nov-2010 20:31 115K -[TXT] math.xsl 01-Nov-2010 20:31 4.8K -[TXT] lists.xsl 01-Nov-2010 20:31 48K -[TXT] keywords.xsl 01-Nov-2010 20:31 926 -[TXT] inline.xsl 01-Nov-2010 20:31 39K -[TXT] info.xsl 01-Nov-2010 20:31 1.4K -[TXT] index.xsl 01-Nov-2010 20:31 18K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 16K -[TXT] highlight.xsl 01-Nov-2010 20:31 2.7K -[TXT] graphics.xsl 01-Nov-2010 20:31 22K -[TXT] glossary.xsl 01-Nov-2010 20:31 44K -[TXT] formal.xsl 01-Nov-2010 20:31 22K -[TXT] fop1.xsl 01-Nov-2010 20:31 8.3K -[TXT] fop.xsl 01-Nov-2010 20:31 4.4K -[TXT] footnote.xsl 01-Nov-2010 20:31 8.7K -[TXT] fo.xsl 01-Nov-2010 20:31 4.5K -[TXT] fo-rtf.xsl 01-Nov-2010 20:31 5.2K -[TXT] ebnf.xsl 01-Nov-2010 20:31 11K -[TXT] docbook.xsl 01-Nov-2010 20:31 12K -[TXT] division.xsl 01-Nov-2010 20:31 23K -[TXT] component.xsl 01-Nov-2010 20:31 33K -[TXT] callout.xsl 01-Nov-2010 20:31 8.3K -[TXT] block.xsl 01-Nov-2010 20:31 22K -[TXT] biblio.xsl 01-Nov-2010 20:31 36K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] axf.xsl 01-Nov-2010 20:31 4.1K -[TXT] autotoc.xsl 01-Nov-2010 20:31 30K -[TXT] autoidx.xsl 01-Nov-2010 20:31 53K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.3K -[TXT] annotations.xsl 01-Nov-2010 20:31 785 -[TXT] admon.xsl 01-Nov-2010 20:31 4.8K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 35K -[TXT] table.xml 01-Nov-2010 20:31 2.8K -[TXT] pi.xml 01-Nov-2010 20:31 33K -[   ] pdf2index 01-Nov-2010 20:31 2.7K -[TXT] param.xml 01-Nov-2010 20:31 435K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=N;O=A deleted file mode 100644 index 1c8259fc0896bc66f1031d0903951768fb61c146..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=N;O=A +++ /dev/null @@ -1,67 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/fo - - -

    Index of /release/xsl-ns/1.76.1/fo

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] admon.xsl 01-Nov-2010 20:31 4.8K -[TXT] annotations.xsl 01-Nov-2010 20:31 785 -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.3K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx.xsl 01-Nov-2010 20:31 53K -[TXT] autotoc.xsl 01-Nov-2010 20:31 30K -[TXT] axf.xsl 01-Nov-2010 20:31 4.1K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 36K -[TXT] block.xsl 01-Nov-2010 20:31 22K -[TXT] callout.xsl 01-Nov-2010 20:31 8.3K -[TXT] component.xsl 01-Nov-2010 20:31 33K -[TXT] division.xsl 01-Nov-2010 20:31 23K -[TXT] docbook.xsl 01-Nov-2010 20:31 12K -[TXT] ebnf.xsl 01-Nov-2010 20:31 11K -[TXT] fo-rtf.xsl 01-Nov-2010 20:31 5.2K -[TXT] fo.xsl 01-Nov-2010 20:31 4.5K -[TXT] footnote.xsl 01-Nov-2010 20:31 8.7K -[TXT] fop.xsl 01-Nov-2010 20:31 4.4K -[TXT] fop1.xsl 01-Nov-2010 20:31 8.3K -[TXT] formal.xsl 01-Nov-2010 20:31 22K -[TXT] glossary.xsl 01-Nov-2010 20:31 44K -[TXT] graphics.xsl 01-Nov-2010 20:31 22K -[TXT] highlight.xsl 01-Nov-2010 20:31 2.7K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 16K -[TXT] index.xsl 01-Nov-2010 20:31 18K -[TXT] info.xsl 01-Nov-2010 20:31 1.4K -[TXT] inline.xsl 01-Nov-2010 20:31 39K -[TXT] keywords.xsl 01-Nov-2010 20:31 926 -[TXT] lists.xsl 01-Nov-2010 20:31 48K -[TXT] math.xsl 01-Nov-2010 20:31 4.8K -[TXT] pagesetup.xsl 01-Nov-2010 20:31 115K -[TXT] param.xml 01-Nov-2010 20:31 435K -[TXT] param.xsl 01-Nov-2010 20:31 46K -[TXT] passivetex.xsl 01-Nov-2010 20:31 1.4K -[   ] pdf2index 01-Nov-2010 20:31 2.7K -[TXT] pi.xml 01-Nov-2010 20:31 33K -[TXT] pi.xsl 01-Nov-2010 20:31 40K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 12K -[TXT] ptc.xsl 01-Nov-2010 20:31 3.8K -[TXT] qandaset.xsl 01-Nov-2010 20:31 14K -[TXT] refentry.xsl 01-Nov-2010 20:31 24K -[TXT] sections.xsl 01-Nov-2010 20:31 28K -[TXT] spaces.xsl 01-Nov-2010 20:31 10K -[TXT] synop.xsl 01-Nov-2010 20:31 32K -[TXT] table.xml 01-Nov-2010 20:31 2.8K -[TXT] table.xsl 01-Nov-2010 20:31 60K -[TXT] task.xsl 01-Nov-2010 20:31 2.9K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 35K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 253K -[TXT] titlepage.xsl 01-Nov-2010 20:31 27K -[TXT] toc.xsl 01-Nov-2010 20:31 12K -[TXT] verbatim.xsl 01-Nov-2010 20:31 16K -[TXT] xep.xsl 01-Nov-2010 20:31 7.0K -[TXT] xref.xsl 01-Nov-2010 20:31 56K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=N;O=D deleted file mode 100644 index 4d1c5eb80230c13b04a1db40404cb64d3d6418dc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=N;O=D +++ /dev/null @@ -1,67 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/fo - - -

    Index of /release/xsl-ns/1.76.1/fo

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 56K -[TXT] xep.xsl 01-Nov-2010 20:31 7.0K -[TXT] verbatim.xsl 01-Nov-2010 20:31 16K -[TXT] toc.xsl 01-Nov-2010 20:31 12K -[TXT] titlepage.xsl 01-Nov-2010 20:31 27K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 253K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 35K -[TXT] task.xsl 01-Nov-2010 20:31 2.9K -[TXT] table.xsl 01-Nov-2010 20:31 60K -[TXT] table.xml 01-Nov-2010 20:31 2.8K -[TXT] synop.xsl 01-Nov-2010 20:31 32K -[TXT] spaces.xsl 01-Nov-2010 20:31 10K -[TXT] sections.xsl 01-Nov-2010 20:31 28K -[TXT] refentry.xsl 01-Nov-2010 20:31 24K -[TXT] qandaset.xsl 01-Nov-2010 20:31 14K -[TXT] ptc.xsl 01-Nov-2010 20:31 3.8K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 12K -[TXT] pi.xsl 01-Nov-2010 20:31 40K -[TXT] pi.xml 01-Nov-2010 20:31 33K -[   ] pdf2index 01-Nov-2010 20:31 2.7K -[TXT] passivetex.xsl 01-Nov-2010 20:31 1.4K -[TXT] param.xsl 01-Nov-2010 20:31 46K -[TXT] param.xml 01-Nov-2010 20:31 435K -[TXT] pagesetup.xsl 01-Nov-2010 20:31 115K -[TXT] math.xsl 01-Nov-2010 20:31 4.8K -[TXT] lists.xsl 01-Nov-2010 20:31 48K -[TXT] keywords.xsl 01-Nov-2010 20:31 926 -[TXT] inline.xsl 01-Nov-2010 20:31 39K -[TXT] info.xsl 01-Nov-2010 20:31 1.4K -[TXT] index.xsl 01-Nov-2010 20:31 18K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 16K -[TXT] highlight.xsl 01-Nov-2010 20:31 2.7K -[TXT] graphics.xsl 01-Nov-2010 20:31 22K -[TXT] glossary.xsl 01-Nov-2010 20:31 44K -[TXT] formal.xsl 01-Nov-2010 20:31 22K -[TXT] fop1.xsl 01-Nov-2010 20:31 8.3K -[TXT] fop.xsl 01-Nov-2010 20:31 4.4K -[TXT] footnote.xsl 01-Nov-2010 20:31 8.7K -[TXT] fo.xsl 01-Nov-2010 20:31 4.5K -[TXT] fo-rtf.xsl 01-Nov-2010 20:31 5.2K -[TXT] ebnf.xsl 01-Nov-2010 20:31 11K -[TXT] docbook.xsl 01-Nov-2010 20:31 12K -[TXT] division.xsl 01-Nov-2010 20:31 23K -[TXT] component.xsl 01-Nov-2010 20:31 33K -[TXT] callout.xsl 01-Nov-2010 20:31 8.3K -[TXT] block.xsl 01-Nov-2010 20:31 22K -[TXT] biblio.xsl 01-Nov-2010 20:31 36K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] axf.xsl 01-Nov-2010 20:31 4.1K -[TXT] autotoc.xsl 01-Nov-2010 20:31 30K -[TXT] autoidx.xsl 01-Nov-2010 20:31 53K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.3K -[TXT] annotations.xsl 01-Nov-2010 20:31 785 -[TXT] admon.xsl 01-Nov-2010 20:31 4.8K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=S;O=A deleted file mode 100644 index bafe5c729453a18ef3d6c80d4ab49fae1a7b89bf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=S;O=A +++ /dev/null @@ -1,67 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/fo - - -

    Index of /release/xsl-ns/1.76.1/fo

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] annotations.xsl 01-Nov-2010 20:31 785 -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] keywords.xsl 01-Nov-2010 20:31 926 -[TXT] info.xsl 01-Nov-2010 20:31 1.4K -[TXT] passivetex.xsl 01-Nov-2010 20:31 1.4K -[   ] pdf2index 01-Nov-2010 20:31 2.7K -[TXT] highlight.xsl 01-Nov-2010 20:31 2.7K -[TXT] table.xml 01-Nov-2010 20:31 2.8K -[TXT] task.xsl 01-Nov-2010 20:31 2.9K -[TXT] ptc.xsl 01-Nov-2010 20:31 3.8K -[TXT] axf.xsl 01-Nov-2010 20:31 4.1K -[TXT] fop.xsl 01-Nov-2010 20:31 4.4K -[TXT] fo.xsl 01-Nov-2010 20:31 4.5K -[TXT] math.xsl 01-Nov-2010 20:31 4.8K -[TXT] admon.xsl 01-Nov-2010 20:31 4.8K -[TXT] fo-rtf.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.3K -[TXT] xep.xsl 01-Nov-2010 20:31 7.0K -[TXT] fop1.xsl 01-Nov-2010 20:31 8.3K -[TXT] callout.xsl 01-Nov-2010 20:31 8.3K -[TXT] footnote.xsl 01-Nov-2010 20:31 8.7K -[TXT] spaces.xsl 01-Nov-2010 20:31 10K -[TXT] ebnf.xsl 01-Nov-2010 20:31 11K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 12K -[TXT] toc.xsl 01-Nov-2010 20:31 12K -[TXT] docbook.xsl 01-Nov-2010 20:31 12K -[TXT] qandaset.xsl 01-Nov-2010 20:31 14K -[TXT] verbatim.xsl 01-Nov-2010 20:31 16K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 16K -[TXT] index.xsl 01-Nov-2010 20:31 18K -[TXT] graphics.xsl 01-Nov-2010 20:31 22K -[TXT] block.xsl 01-Nov-2010 20:31 22K -[TXT] formal.xsl 01-Nov-2010 20:31 22K -[TXT] division.xsl 01-Nov-2010 20:31 23K -[TXT] refentry.xsl 01-Nov-2010 20:31 24K -[TXT] titlepage.xsl 01-Nov-2010 20:31 27K -[TXT] sections.xsl 01-Nov-2010 20:31 28K -[TXT] autotoc.xsl 01-Nov-2010 20:31 30K -[TXT] synop.xsl 01-Nov-2010 20:31 32K -[TXT] component.xsl 01-Nov-2010 20:31 33K -[TXT] pi.xml 01-Nov-2010 20:31 33K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 35K -[TXT] biblio.xsl 01-Nov-2010 20:31 36K -[TXT] inline.xsl 01-Nov-2010 20:31 39K -[TXT] pi.xsl 01-Nov-2010 20:31 40K -[TXT] glossary.xsl 01-Nov-2010 20:31 44K -[TXT] param.xsl 01-Nov-2010 20:31 46K -[TXT] lists.xsl 01-Nov-2010 20:31 48K -[TXT] autoidx.xsl 01-Nov-2010 20:31 53K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] xref.xsl 01-Nov-2010 20:31 56K -[TXT] table.xsl 01-Nov-2010 20:31 60K -[TXT] pagesetup.xsl 01-Nov-2010 20:31 115K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 253K -[TXT] param.xml 01-Nov-2010 20:31 435K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=S;O=D deleted file mode 100644 index 0ff9f554463de516cdf16044a3003410bcd5e6cf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.html?C=S;O=D +++ /dev/null @@ -1,67 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/fo - - -

    Index of /release/xsl-ns/1.76.1/fo

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] param.xml 01-Nov-2010 20:31 435K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 253K -[TXT] pagesetup.xsl 01-Nov-2010 20:31 115K -[TXT] table.xsl 01-Nov-2010 20:31 60K -[TXT] xref.xsl 01-Nov-2010 20:31 56K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autoidx.xsl 01-Nov-2010 20:31 53K -[TXT] lists.xsl 01-Nov-2010 20:31 48K -[TXT] param.xsl 01-Nov-2010 20:31 46K -[TXT] glossary.xsl 01-Nov-2010 20:31 44K -[TXT] pi.xsl 01-Nov-2010 20:31 40K -[TXT] inline.xsl 01-Nov-2010 20:31 39K -[TXT] biblio.xsl 01-Nov-2010 20:31 36K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 35K -[TXT] pi.xml 01-Nov-2010 20:31 33K -[TXT] component.xsl 01-Nov-2010 20:31 33K -[TXT] synop.xsl 01-Nov-2010 20:31 32K -[TXT] autotoc.xsl 01-Nov-2010 20:31 30K -[TXT] sections.xsl 01-Nov-2010 20:31 28K -[TXT] titlepage.xsl 01-Nov-2010 20:31 27K -[TXT] refentry.xsl 01-Nov-2010 20:31 24K -[TXT] division.xsl 01-Nov-2010 20:31 23K -[TXT] formal.xsl 01-Nov-2010 20:31 22K -[TXT] block.xsl 01-Nov-2010 20:31 22K -[TXT] graphics.xsl 01-Nov-2010 20:31 22K -[TXT] index.xsl 01-Nov-2010 20:31 18K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 16K -[TXT] verbatim.xsl 01-Nov-2010 20:31 16K -[TXT] qandaset.xsl 01-Nov-2010 20:31 14K -[TXT] docbook.xsl 01-Nov-2010 20:31 12K -[TXT] toc.xsl 01-Nov-2010 20:31 12K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 12K -[TXT] ebnf.xsl 01-Nov-2010 20:31 11K -[TXT] spaces.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 8.7K -[TXT] callout.xsl 01-Nov-2010 20:31 8.3K -[TXT] fop1.xsl 01-Nov-2010 20:31 8.3K -[TXT] xep.xsl 01-Nov-2010 20:31 7.0K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.3K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.2K -[TXT] fo-rtf.xsl 01-Nov-2010 20:31 5.2K -[TXT] admon.xsl 01-Nov-2010 20:31 4.8K -[TXT] math.xsl 01-Nov-2010 20:31 4.8K -[TXT] fo.xsl 01-Nov-2010 20:31 4.5K -[TXT] fop.xsl 01-Nov-2010 20:31 4.4K -[TXT] axf.xsl 01-Nov-2010 20:31 4.1K -[TXT] ptc.xsl 01-Nov-2010 20:31 3.8K -[TXT] task.xsl 01-Nov-2010 20:31 2.9K -[TXT] table.xml 01-Nov-2010 20:31 2.8K -[TXT] highlight.xsl 01-Nov-2010 20:31 2.7K -[   ] pdf2index 01-Nov-2010 20:31 2.7K -[TXT] passivetex.xsl 01-Nov-2010 20:31 1.4K -[TXT] info.xsl 01-Nov-2010 20:31 1.4K -[TXT] keywords.xsl 01-Nov-2010 20:31 926 -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] annotations.xsl 01-Nov-2010 20:31 785 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.xsl deleted file mode 100644 index fed8d561545525cc7bfa4ad9b6fcbdd81f291f34..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/index.xsl +++ /dev/null @@ -1,486 +0,0 @@ - - -%common.entities; -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - body - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - body - index - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -.tnacifingis - - - - - - - - - fo:wrapper - - - - - - - - - - - - - - , - - - - , - - - - - - - - - - - , - - - - , - - - - - - - - - - - - - - - - - - - - , - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - - - - - ) - - - - - - - - - ( - - - - - - ) - - - - - - - - - ( - - - - - - ) - - - - - - - - - - - - - - - 3pc - 2pc - 1pc - - - ( - - - - - - ) - - - - - - - - - - - - - fo:block - fo:wrapper - fo:inline - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/info.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/info.xsl deleted file mode 100644 index 205100ca50a501596b5823e9bd9eaac06c1b4eec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/info.xsl +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/inline.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/inline.xsl deleted file mode 100644 index 290ea7afd47b109f3f010a31df59437fc366a7ec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/inline.xsl +++ /dev/null @@ -1,1289 +0,0 @@ - - -%common.entities; -]> - - - - - - - - - - - - - - - - - - - - - - - - 1 - 0 - - - - - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XLink to nonexistent id: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XLink to nonexistent id: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ltr - rtl - - - - - - - - - - - - - - - - - - - - - - - - - - ltr - rtl - - - - - - - - - - - - - - - - - - - - - ltr - rtl - - - - - - - - - - - - - - - - - - - - - - ltr - rtl - - - - - - - - - - - - - - - - - - - - - - ltr - rtl - - - - - - - - - - - - - - - - - - - - - - ltr - rtl - - - - - - - - - - - - - - - - - - - - - - ltr - rtl - - - - - - super - - - super - - - - - - - - - - - - - - - - - - - - - ltr - rtl - - - - - - sub - - - sub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - , - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - There's no entry for - - in - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Error: no glossentry for glossterm: - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element - - - - - - - - - - - - - - - - - </ - - > - - - - - - - & - - ; - - - - - - - &# - - ; - - - - - - - % - - ; - - - - - - - <? - - > - - - - - - - <? - - ?> - - - - - - - < - - > - - - - - - - < - - /> - - - - - - - <!-- - - --> - - - - - - - - - - - - - - - < - - - - - - mailto: - - - - - - - - - - > - - - - - - - - - - - - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - - - - - - - - - - - - - - - - - ] - - - - [ - - ] - - - - - - - - - - - - - [ - - - - - - - - - - - ] - - - - [ - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/keywords.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/keywords.xsl deleted file mode 100644 index 64ce02c2568cea355f956fd9a5b9cf13331567b6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/keywords.xsl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/lists.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/lists.xsl deleted file mode 100644 index d8f6fab8d364ac6975183cb191bafbcc2b9526a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/lists.xsl +++ /dev/null @@ -1,1395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - em - - - em * 0.60 - - - - - - - - - - - - - - em - - - em * 0.60 - - - - - - - - - 1em - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.25in - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100% - - - - - - - - - - - - auto - - - - - - fixed - - - - - - - - - - - 1 - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100% - - - - - - - - - - - auto - - - - - - fixed - - - - - - - - - - 1 - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - 1 - 1 - - 1 - - - - - - - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - : ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/math.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/math.xsl deleted file mode 100644 index 56053570ef93ba2bbea5f474b317123e08c254f6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/math.xsl +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $ - - - - $ - - - - - - - - - - - - - $$ - - - - $$ - - - - - - - - - Your equation is misplaced. It should be in inlineequation, equation or informalequation. - - - - - - - - - - - - - - 0 - 0 - 1 - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pagesetup.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pagesetup.xsl deleted file mode 100644 index 2f9b0d335b411767868248f680abe3d45e20da71..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pagesetup.xsl +++ /dev/null @@ -1,2571 +0,0 @@ - - - - - - - - - - , - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - blank - - - - - blank-body - - - - - - - - - - - - - - - - - - - - titlepage-first - - - - - - - - - - - - - - - - - - - - - titlepage-odd - - - - - - - - - - - - - - - - - - - - - titlepage-even - - - - - - - - - - - - - - - - - - - - - - lot-first - - - - - - - - - - - - - - - - - - - - - lot-odd - - - - - - - - - - - - - - - - - - - - - lot-even - - - - - - - - - - - - - - - - - - - - - - front-first - - - - - - - - - - - - - - - - - - - - - front-odd - - - - - - - - - - - - - - - - - - - - - front-even - - - - - - - - - - - - - - - - - - - - - - - - - body-first - - - - - - - - - - - - - - - - - - - - - body-odd - - - - - - - - - - - - - - - - - - - - - body-even - - - - - - - - - - - - - - - - - - - - - - back-first - - - - - - - - - - - - - - - - - - - - - back-odd - - - - - - - - - - - - - - - - - - - - - back-even - - - - - - - - - - - - - - - - - - - - - - index-first - - - - - - - - - - - - - - - - - - - - - index-odd - - - - - - - - - - - - - - - - - - - - - index-even - - - - - - - - - - - - - - - - - - - - - - - blank-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - - titlepage-first-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - titlepage-odd-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - titlepage-even-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - - lot-first-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - lot-odd-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - lot-even-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - - front-first-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - front-odd-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - front-even-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - - body-first-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - body-odd-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - body-even-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - - back-first-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - back-odd-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - back-even-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - - index-first-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - index-odd-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - - - index-even-draft - - - - - - - - - - fixed - no-repeat - center - center - - - - - - - - - - - - - - - - - titlepage-even - titlepage-odd - - - - - - - - - - - - - - - - lot-even - lot-odd - - - - - - - - - - - - - - - - front-even - front-odd - - - - - - - - - - - - - - - - body-even - body-odd - - - - - - - - - - - - - - - - back-even - back-odd - - - - - - - - - - - - - - - - index-even - index-odd - - - - - - - - - - - - - - - - - titlepage-even-draft - titlepage-odd-draft - - - - - - - - - - - - - - - - lot-even-draft - lot-odd-draft - - - - - - - - - - - - - - - - front-even-draft - front-odd-draft - - - - - - - - - - - - - - - - body-even-draft - body-odd-draft - - - - - - - - - - - - - - - - back-even-draft - back-odd-draft - - - - - - - - - - - - - - - - index-even-draft - index-odd-draft - - - - - - - - - - - - - - - - - - - - - - - - - - - - lot - front - front - front - back - back - back - index - back - body - - - - - -draft - - - - - - -draft - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.5pt - solid - black - - - - - - - - - - 0.5pt - solid - black - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0pt - - - - - - 1 - 1 - 3 - - - - - - 3 - 3 - 1 - - - - - - - - - - - - - - proportional-column-width( - - header - - - ) - - - - - proportional-column-width( - - header - - - ) - - - - - proportional-column-width( - - header - - - ) - - - - - - - - - - - baseline - - - - - - - - - - - - - baseline - - - - - - - - - - - - - baseline - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Error: value in .column.widths at position is not a number. - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0pt - - - - - - 1 - 1 - 3 - - - - - - 3 - 3 - 1 - - - - - - - - - - - - - proportional-column-width( - - footer - - - ) - - - - - proportional-column-width( - - footer - - - ) - - - - - proportional-column-width( - - footer - - - ) - - - - - - - - - - - baseline - - - - - - - - - - - - - baseline - - - - - - - - - - - - - baseline - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - i - i - i - i - 1 - - - - - - - - - - - - - - auto-odd - 1 - - - auto-odd - 1 - 1 - auto-odd - - - - - - - auto - 1 - auto - 1 - 1 - auto - - - - - - - - - - - - end-on-even - - no-force - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/param.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/param.xml deleted file mode 100644 index d179d36090a4bea158915bccc40a477c1175cc7f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/param.xml +++ /dev/null @@ -1,12445 +0,0 @@ - - - -FO Parameter Reference - -$Id: param.xweb 8543 2009-12-02 06:05:24Z bobstayton $ - - - - Walsh - Norman - - - - 1999 - 2000 - 2001 - 2002 - 2003 - 2004 - 2005 - 2006 - 2007 - Norman Walsh - - - This is reference documentation for all user-configurable - parameters in the DocBook XSL FO stylesheets (for generating - XSL-FO output destined for final print/PDF output). - - -Admonitions - - -admon.graphics -boolean - - -admon.graphics -Use graphics in admonitions? - - - - -<xsl:param name="admon.graphics" select="0"></xsl:param> - - - -Description - -If true (non-zero), admonitions are presented in an alternate style that uses -a graphic. Default graphics are provided in the distribution. - - - - - - - -admon.graphics.extension -string - - -admon.graphics.extension -Filename extension for admonition graphics - - - - -<xsl:param name="admon.graphics.extension">.png</xsl:param> - - - -Description - -Sets the filename extension to use on admonition graphics. - - - - - - -admon.graphics.path -string - - -admon.graphics.path -Path to admonition graphics - - - -<xsl:param name="admon.graphics.path">images/</xsl:param> - - -Description - -Sets the path to the directory containing the admonition graphics -(caution.png, important.png etc). This location is normally relative -to the output html directory. See base.dir - - - - - - -admon.textlabel -boolean - - -admon.textlabel -Use text label in admonitions? - - - - -<xsl:param name="admon.textlabel" select="1"></xsl:param> - - - -Description - -If true (non-zero), admonitions are presented with a generated -text label such as Note or Warning in the appropriate language. -If zero, such labels are turned off, but any title child -of the admonition element are still output. -The default value is 1. - - - - - - - - - admonition.title.properties - attribute set - - -admonition.title.properties -To set the style for admonitions titles. - - - - -<xsl:attribute-set name="admonition.title.properties"> - <xsl:attribute name="font-size">14pt</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> - - -Description -How do you want admonitions titles styled? -Set the font-size, weight etc to the style required. - - - - - - - admonition.properties - attribute set - - -admonition.properties -To set the style for admonitions. - - - -<xsl:attribute-set name="admonition.properties"></xsl:attribute-set> - - -Description -How do you want admonitions styled? -Set the font-size, weight, etc. to the style required - - - - - - -graphical.admonition.properties -attribute set - - -graphical.admonition.properties -To add properties to the outer block of a graphical admonition. - - - -<xsl:attribute-set name="graphical.admonition.properties"> - <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">1.2em</xsl:attribute> -</xsl:attribute-set> - - -Description -These properties are added to the outer block containing the -entire graphical admonition, including its title. -It is used when the parameter -admon.graphics is set to nonzero. -Use this attribute-set to set the space above and below, -and any indent for the whole admonition. - -In addition to these properties, a graphical admonition -also applies the admonition.title.properties -attribute-set to the title, and applies the -admonition.properties attribute-set -to the rest of the content. - - - - - - -nongraphical.admonition.properties -attribute set - - -nongraphical.admonition.properties -To add properties to the outer block of a nongraphical admonition. - - - -<xsl:attribute-set name="nongraphical.admonition.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="margin-{$direction.align.start}">0.25in</xsl:attribute> - <xsl:attribute name="margin-{$direction.align.end}">0.25in</xsl:attribute> -</xsl:attribute-set> - - -Description -These properties are added to the outer block containing the -entire nongraphical admonition, including its title. -It is used when the parameter -admon.graphics is set to zero. -Use this attribute-set to set the space above and below, -and any indent for the whole admonition. - -In addition to these properties, a nongraphical admonition -also applies the admonition.title.properties -attribute-set to the title, and the -admonition.properties attribute-set -to the rest of the content. - - - - - -Callouts - - -callout.defaultcolumn -integer - - -callout.defaultcolumn -Indicates what column callouts appear in by default - - - - -<xsl:param name="callout.defaultcolumn">60</xsl:param> - - - -Description - -If a callout does not identify a column (for example, if it uses -the linerange unit), -it will appear in the default column. - - - - - - - -callout.graphics -boolean - - -callout.graphics -Use graphics for callouts? - - - - -<xsl:param name="callout.graphics" select="1"></xsl:param> - - - -Description - -If non-zero, callouts are presented with graphics (e.g., reverse-video -circled numbers instead of "(1)", "(2)", etc.). -Default graphics are provided in the distribution. - - - - - - - -callout.graphics.extension -string - - -callout.graphics.extension -Filename extension for callout graphics - - - - - -<xsl:param name="callout.graphics.extension">.svg</xsl:param> - - - -Description -Sets the filename extension to use on callout graphics. - - -The Docbook XSL distribution provides callout graphics in the following formats: -SVG (extension: .svg) -PNG (extension: .png) -GIF (extension: .gif) - - - - - - -callout.graphics.number.limit -integer - - -callout.graphics.number.limit -Number of the largest callout graphic - - - - - -<xsl:param name="callout.graphics.number.limit">30</xsl:param> - - - -Description - -If callout.graphics is non-zero, graphics -are used to represent callout numbers instead of plain text. The value -of callout.graphics.number.limit is the largest -number for which a graphic exists. If the callout number exceeds this -limit, the default presentation "(plain text instead of a graphic)" -will be used. - - - - - - - -callout.graphics.path -string - - -callout.graphics.path -Path to callout graphics - - - - -<xsl:param name="callout.graphics.path">images/callouts/</xsl:param> - - - -Description - -Sets the path to the directory holding the callout graphics. his -location is normally relative to the output html directory. see -base.dir. Always terminate the directory with / since the graphic file -is appended to this string, hence needs the separator. - - - - - - - -callout.icon.size -length - - -callout.icon.size -Specifies the size of callout marker icons - - - - -<xsl:param name="callout.icon.size">7pt</xsl:param> - - - -Description - -Specifies the size of the callout marker icons. -The default size is 7 points. - - - - - - -callout.unicode -boolean - - -callout.unicode -Use Unicode characters rather than images for callouts. - - - -<xsl:param name="callout.unicode" select="0"></xsl:param> - - -Description - -The stylesheets can use either an image of the numbers one to ten, or the single Unicode character which represents the numeral, in white on a black background. Use this to select the Unicode character option. - - - - - - - -callout.unicode.font -string - - -callout.unicode.font -Specify a font for Unicode glyphs - - - - -<xsl:param name="callout.unicode.font">ZapfDingbats</xsl:param> - - - -Description - -The name of the font to specify around Unicode callout glyphs. -If set to the empty string, no font change will occur. - - - - - - - -callout.unicode.number.limit -integer - - -callout.unicode.number.limit -Number of the largest unicode callout character - - - - -<xsl:param name="callout.unicode.number.limit">10</xsl:param> - - - -Description - -If callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.number.limit -is -the largest number for which a unicode character exists. If the callout number -exceeds this limit, the default presentation "(nnn)" will always -be used. - - - - - - - -callout.unicode.start.character -integer - - -callout.unicode.start.character -First Unicode character to use, decimal value. - - - - -<xsl:param name="callout.unicode.start.character">10102</xsl:param> - - - -Description - -If callout.graphics is zero and callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.start.character -is the decimal unicode value used for callout number one. Currently, -only 10102 is supported in the stylesheets for this parameter. - - - - - - - -callouts.extension -boolean - - -callouts.extension -Enable the callout extension - - - - -<xsl:param name="callouts.extension" select="1"></xsl:param> - - - -Description - -The callouts extension processes areaset -elements in programlistingco and other text-based -callout elements. - - - - - - -ToC/LoT/Index Generation - - -autotoc.label.separator -string - - -autotoc.label.separator -Separator between labels and titles in the ToC - - - - -<xsl:param name="autotoc.label.separator">. </xsl:param> - - - -Description - -String used to separate labels and titles in a table of contents. - - - - - - -process.empty.source.toc -boolean - - -process.empty.source.toc -Generate automated TOC if toc element occurs in a source document? - - - -<xsl:param name="process.empty.source.toc" select="0"></xsl:param> - - -Description - -Specifies that if an empty toc element is found in a -source document, an automated TOC is generated at this point in the -document. - - Depending on what the value of the - generate.toc parameter is, setting this - parameter to 1 could result in generation of - duplicate automated TOCs. So the - process.empty.source.toc is primarily useful - as an "override": by placing an empty toc in your - document and setting this parameter to 1, you can - force a TOC to be generated even if generate.toc - says not to. - - - - - - - - -process.source.toc -boolean - - -process.source.toc -Process a non-empty toc element if it occurs in a source document? - - - -<xsl:param name="process.source.toc" select="0"></xsl:param> - - -Description - -Specifies that the contents of a non-empty "hard-coded" -toc element in a source document are processed to -generate a TOC in output. - - This parameter has no effect on automated generation of - TOCs. An automated TOC may still be generated along with the - "hard-coded" TOC. To suppress automated TOC generation, adjust the - value of the generate.toc paramameter. - - The process.source.toc parameter also has - no effect if the toc element is empty; handling - for empty toc is controlled by the - process.empty.source.toc parameter. - - - - - - - - -generate.toc -table - - -generate.toc -Control generation of ToCs and LoTs - - - - - -<xsl:param name="generate.toc"> -/appendix toc,title -article/appendix nop -/article toc,title -book toc,title,figure,table,example,equation -/chapter toc,title -part toc,title -/preface toc,title -reference toc,title -/sect1 toc -/sect2 toc -/sect3 toc -/sect4 toc -/sect5 toc -/section toc -set toc,title -</xsl:param> - - - -Description - -This parameter has a structured value. It is a table of space-delimited -path/value pairs. Each path identifies some element in the source document -using a restricted subset of XPath (only the implicit child axis, no wildcards, -no predicates). Paths can be either relative or absolute. - -When processing a particular element, the stylesheets consult this table to -determine if a ToC (or LoT(s)) should be generated. - -For example, consider the entry: - -book toc,figure - -This indicates that whenever a book is formatted, a -Table Of Contents and a List of Figures should be generated. Similarly, - -/chapter toc - -indicates that whenever a document that has a root -of chapter is formatted, a Table of -Contents should be generated. The entry chapter would match -all chapters, but /chapter matches only chapter -document elements. - -Generally, the longest match wins. So, for example, if you want to distinguish -articles in books from articles in parts, you could use these two entries: - -book/article toc,figure -part/article toc - -Note that an article in a part can never match a book/article, -so if you want nothing to be generated for articles in parts, you can simply leave -that rule out. - -If you want to leave the rule in, to make it explicit that you're turning -something off, use the value nop. For example, the following -entry disables ToCs and LoTs for articles: - -article nop - -Do not simply leave the word article in the file -without a matching value. That'd be just begging the silly little -path/value parser to get confused. - -Section ToCs are further controlled by the -generate.section.toc.level parameter. -For a given section level to have a ToC, it must have both an entry in -generate.toc and be within the range enabled by -generate.section.toc.level. - - - - - -generate.index -boolean - - -generate.index -Do you want an index? - - - -<xsl:param name="generate.index" select="1"></xsl:param> - - -Description - -Specify if an index should be generated. - - - - - - -make.index.markup -boolean - - -make.index.markup -Generate XML index markup in the index? - - - - -<xsl:param name="make.index.markup" select="0"></xsl:param> - - - -Description - -This parameter enables a very neat trick for getting properly -merged, collated back-of-the-book indexes. G. Ken Holman suggested -this trick at Extreme Markup Languages 2002 and I'm indebted to him -for it. - -Jeni Tennison's excellent code in -autoidx.xsl does a great job of merging and -sorting indexterms in the document and building a -back-of-the-book index. However, there's one thing that it cannot -reasonably be expected to do: merge page numbers into ranges. (I would -not have thought that it could collate and suppress duplicate page -numbers, but in fact it appears to manage that task somehow.) - -Ken's trick is to produce a document in which the index at the -back of the book is displayed in XML. Because the index -is generated by the FO processor, all of the page numbers have been resolved. -It's a bit hard to explain, but what it boils down to is that instead of having -an index at the back of the book that looks like this: - -
    -A -ap1, 1, 2, 3 - -
    - -you get one that looks like this: - -
    -<indexdiv>A</indexdiv> -<indexentry> -<primaryie>ap1</primaryie>, -<phrase role="pageno">1</phrase>, -<phrase role="pageno">2</phrase>, -<phrase role="pageno">3</phrase> -</indexentry> -
    - -After building a PDF file with this sort of odd-looking index, you can -extract the text from the PDF file and the result is a proper index expressed in -XML. - -Now you have data that's amenable to processing and a simple Perl script -(such as fo/pdf2index) can -merge page ranges and generate a proper index. - -Finally, reformat your original document using this literal index instead of -an automatically generated one and bingo! - -
    -
    - - - -index.method -list -basic -kosek -kimber - - -index.method -Select method used to group index entries in an index - - - - -<xsl:param name="index.method">basic</xsl:param> - - - -Description - -This parameter lets you select which method to use for sorting and grouping - index entries in an index. -Indexes in Latin-based languages that have accented characters typically -sort together accented words and unaccented words. -Thus Á (U+00C1 LATIN CAPITAL LETTER A WITH ACUTE) would sort together -with A (U+0041 LATIN CAPITAL LETTER A), so both would appear in the A -section of the index. -Languages using other alphabets (such as Russian, which is written in the Cyrillic alphabet) -and languages using ideographic chararacters (such as Japanese) -require grouping specific to the languages and alphabets. - - -The default indexing method is limited. -It can group accented characters in Latin-based languages only. -It cannot handle non-Latin alphabets or ideographic languages. -The other indexing methods require extensions of one type or -another, and do not work with -all XSLT processors, which is why they are not used by default. - -The three choices for indexing method are: - - -basic - - -(default) Sort and groups words based only on the Latin alphabet. -Words with accented Latin letters will group and sort with -their respective primary letter, but -words in non-Latin alphabets will be -put in the Symbols section of the index. - - - - -kosek - - -This method sorts and groups words based on letter groups configured in -the DocBook locale file for the given language. -See, for example, the French locale file common/fr.xml. -This method requires that the XSLT processor -supports the EXSLT extensions (most do). -It also requires support for using -user-defined functions in xsl:key (xsltproc does not). - -This method is suitable for any language for which you can -list all the individual characters that should appear -in each letter group in an index. -It is probably not practical to use it for ideographic languages -such as Chinese that have hundreds or thousands of characters. - - -To use the kosek method, you must: - - - -Use a processor that supports its extensions, such as -Saxon 6 or Xalan (xsltproc and Saxon 8 do not). - - - -Set the index.method parameter's value to kosek. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kosek.xsl or -html/autoidx-kosek.xsl into your -customization. - - - - - - - -kimber - - -This method uses extensions to the Saxon processor to implement -sophisticated indexing processes. It uses its own -configuration file, which can include information for any number of -languages. Each language's configuration can group -words using one of two processes. In the -enumerated process similar to that used in the kosek method, -you indicate the groupings character-by-character. -In the between-key process, you specify the -break-points in the sort order that should start a new group. -The latter configuration is useful for ideographic languages -such as Chinese, Japanese, and Korean. -You can also define your own collation algorithms and how you -want mixed Latin-alphabet words sorted. - - -For a whitepaper describing the extensions, see: -http://www.innodata-isogen.com/knowledge_center/white_papers/back_of_book_for_xsl_fo.pdf. - - - -To download the extension library, see -http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport. - - - - -To use the kimber method, you must: - - - -Use Saxon (version 6 or 8) as your XSLT processor. - - - -Install and configure the Innodata Isogen library, using -the documentation that comes with it. - - - -Set the index.method parameter's value to kimber. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kimber.xsl or -html/autoidx-kimber.xsl into your -customization. - - - - - - - - - - - - - -index.on.type -boolean - - -index.on.type -Select indexterms based on type -attribute value - - - - -<xsl:param name="index.on.type" select="0"></xsl:param> - - - -Description - - -If non-zero, -then an index element that has a -type attribute -value will contain only those indexterm -elements with a matching type attribute value. -If an index has no type -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - - -If index.on.type is zero, then the -type attribute has no effect -on selecting indexterms for an index. - - -For those using DocBook version 4.2 or earlier, -the type attribute is not available -for index terms. However, you can achieve the same -effect by using the role attribute -in the same manner on indexterm -and index, and setting the stylesheet parameter -index.on.role to a nonzero value. - - - - - - - -index.on.role -boolean - - -index.on.role -Select indexterms based on role value - - - - -<xsl:param name="index.on.role" select="0"></xsl:param> - - - -Description - - -If non-zero, -then an index element that has a -role attribute -value will contain only those indexterm -elements with a matching role value. -If an index has no role -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - -If index.on.role is zero, then the -role attribute has no effect -on selecting indexterms for an index. - - -If you are using DocBook version 4.3 or later, you should -use the type attribute instead of role -on indexterm and index, -and set the index.on.type to a nonzero -value. - - - - - - - -index.preferred.page.properties -attribute set - - -index.preferred.page.properties -Properties used to emphasize page number references for -significant index terms - - - - -<xsl:attribute-set name="index.preferred.page.properties"> - <xsl:attribute name="font-weight">bold</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties used to emphasize page number references for -significant index terms (significance=preferred). Currently works only with -XEP. - - - - - - -index.entry.properties -attribute set - - -index.entry.properties -Properties applied to the formatted entries -in an index - - - - -<xsl:attribute-set name="index.entry.properties"> - <xsl:attribute name="start-indent">0pt</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the block containing -the entries in a letter division in an index. It can be used to set the -font-size, font-family, and other inheritable properties that will be -applied to all index entries. - - - - - - -index.div.title.properties -attribute set - - -index.div.title.properties -Properties associated with the letter headings in an -index - - - - -<xsl:attribute-set name="index.div.title.properties"> - <xsl:attribute name="margin-{$direction.align.start}">0pt</xsl:attribute> - <xsl:attribute name="font-size">14.4pt</xsl:attribute> - <xsl:attribute name="font-family"><xsl:value-of select="$title.fontset"></xsl:value-of></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.optimum"><xsl:value-of select="concat($body.font.master,'pt')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master,'pt * 0.8')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master,'pt * 1.2')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="start-indent">0pt</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is used on the letter headings that separate -the divisions in an index. - - - - - - -index.number.separator -string - - -index.number.separator -Override for punctuation separating page numbers in index - - - - -<xsl:param name="index.number.separator"></xsl:param> - - - -Description - -This parameter permits you to override the text to insert between -page references in a formatted index entry. Typically -that would be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'number-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. This punctuation appears between -such section titles in an HTML index. - - - - - - - -index.range.separator -string - - -index.range.separator -Override for punctuation separating the two numbers -in a page range in index - - - - -<xsl:param name="index.range.separator"></xsl:param> - - - -Description - -This parameter permits you -to override the text to insert between -the two numbers of a page range in an index. -This parameter is only used by those XSL-FO processors -that support an extension for generating such page ranges -(such as XEP). - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'range-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. So there are no page ranges -and this parameter has no effect. - - - - - - - -index.term.separator -string - - -index.term.separator -Override for punctuation separating an index term -from its list of page references in an index - - - - -<xsl:param name="index.term.separator"></xsl:param> - - - -Description - -This parameter permits you to override -the text to insert between -the end of an index term and its list of page references. -Typically that might be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'term-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -fill in the content for this normally empty -override parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. -For fo output, it could be an fo:leader -element to provide space of a specific length, or a dot leader. - - - - - - - -xep.index.item.properties -attribute set - - -xep.index.item.properties -Properties associated with XEP index-items - - - - -<xsl:attribute-set name="xep.index.item.properties" use-attribute-sets="index.page.number.properties"> - <xsl:attribute name="merge-subsequent-page-numbers">true</xsl:attribute> - <xsl:attribute name="link-back">true</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties associated with XEP index-items, which generate -page numbers in an index processed by XEP. For more info see -the XEP documentation section "Indexes" in -http://www.renderx.com/reference.html#Indexes. - -This attribute-set also adds by default any properties from the -index.page.number.properties -attribute-set. - - - - - -toc.section.depth -integer - - -toc.section.depth -How deep should recursive sections appear -in the TOC? - - - -<xsl:param name="toc.section.depth">2</xsl:param> - - -Description - -Specifies the depth to which recursive sections should appear in the -TOC. - - - - - - - -toc.max.depth -integer - - -toc.max.depth -How many levels should be created for each TOC? - - - -<xsl:param name="toc.max.depth">8</xsl:param> - - -Description - -Specifies the maximal depth of TOC on all levels. - - - - - - -toc.indent.width -float - - -toc.indent.width -Amount of indentation for TOC entries - - - - -<xsl:param name="toc.indent.width">24</xsl:param> -<!-- inconsistant point specification? --> - - - -Description - -Specifies, in points, the distance by which each level of the -TOC is indented from its parent. - -This value is expressed in points, without -a unit (in other words, it is a bare number). Using a bare number allows the stylesheet -to perform calculations that would otherwise have to be performed by the FO processor -because not all processors support expressions. - - - - - - -toc.line.properties -attribute set - - -toc.line.properties -Properties for lines in ToCs and LoTs - - - - -<xsl:attribute-set name="toc.line.properties"> - <xsl:attribute name="text-align-last">justify</xsl:attribute> - <xsl:attribute name="text-align">start</xsl:attribute> - <xsl:attribute name="end-indent"><xsl:value-of select="concat($toc.indent.width, 'pt')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="last-line-end-indent"><xsl:value-of select="concat('-', $toc.indent.width, 'pt')"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties which are applied to every line in ToC (or LoT). You can -modify them in order to change appearance of all, or some lines. For -example, in order to make lines for chapters bold, specify the -following in your customization layer: - -<xsl:attribute-set name="toc.line.properties"> - <xsl:attribute name="font-weight"> - <xsl:choose> - <xsl:when test="self::chapter">bold</xsl:when> - <xsl:otherwise>normal</xsl:otherwise> - </xsl:choose> - </xsl:attribute> -</xsl:attribute-set> - - - - - - -toc.margin.properties -attribute set - - -toc.margin.properties -Margin properties used on Tables of Contents - - - - -<xsl:attribute-set name="toc.margin.properties"> - <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">2em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.optimum">1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">2em</xsl:attribute> -</xsl:attribute-set> - - - -Description -This attribute set is used on Tables of Contents. These attributes are set -on the wrapper that surrounds the ToC block, not on each individual lines. - - - - - -bridgehead.in.toc -boolean - - -bridgehead.in.toc -Should bridgehead elements appear in the TOC? - - - -<xsl:param name="bridgehead.in.toc" select="0"></xsl:param> - - -Description - -If non-zero, bridgeheads appear in the TOC. Note that -this option is not fully supported and may be removed in a future -version of the stylesheets. - - - - - - - -simplesect.in.toc -boolean - - -simplesect.in.toc -Should simplesect elements appear in the TOC? - - - -<xsl:param name="simplesect.in.toc" select="0"></xsl:param> - - -Description - -If non-zero, simplesects will be included in the TOC. - - - - - - - -generate.section.toc.level -integer - - -generate.section.toc.level -Control depth of TOC generation in sections - - - - -<xsl:param name="generate.section.toc.level" select="0"></xsl:param> - - - -Description - -The generate.section.toc.level parameter -controls the depth of section in which TOCs will be generated. Note -that this is related to, but not the same as -toc.section.depth, which controls the depth to -which TOC entries will be generated in a given TOC. -If, for example, generate.section.toc.level -is 3, TOCs will be generated in first, second, and third -level sections, but not in fourth level sections. - - - - - - - - -
    -Processor Extensions - - -arbortext.extensions -boolean - - -arbortext.extensions -Enable Arbortext extensions? - - - -<xsl:param name="arbortext.extensions" select="0"></xsl:param> - - -Description - -If non-zero, -Arbortext -extensions will be used. - -This parameter can also affect which graphics file formats -are supported - - - - - - -axf.extensions -boolean - - -axf.extensions -Enable XSL Formatter extensions? - - - - -<xsl:param name="axf.extensions" select="0"></xsl:param> - - - -Description - -If non-zero, -XSL Formatter -extensions will be used. XSL Formatter extensions consists of PDF bookmarks, -document information and better index processing. - -This parameter can also affect which graphics file formats -are supported - - - - - - -fop.extensions -boolean - - -fop.extensions -Enable extensions for FOP version 0.20.5 and earlier - - - -<xsl:param name="fop.extensions" select="0"></xsl:param> - - -Description - -If non-zero, extensions intended for -FOP -version 0.20.5 and earlier will be used. -At present, this consists of PDF bookmarks. - - -This parameter can also affect which graphics file formats -are supported. - -If you are using a version of FOP beyond -version 0.20.5, then use the fop1.extensions parameter -instead. - - - - - - -fop1.extensions -boolean - - -fop1.extensions -Enable extensions for FOP version 0.90 and later - - - -<xsl:param name="fop1.extensions" select="0"></xsl:param> - - -Description - -If non-zero, extensions for -FOP -version 0.90 and later will be used. - - -This parameter can also affect which graphics file formats -are supported. - -The original fop.extensions parameter -should still be used for FOP version 0.20.5 and earlier. - - - - - - -passivetex.extensions -boolean - - -passivetex.extensions -Enable PassiveTeX extensions? - - - -<xsl:param name="passivetex.extensions" select="0"></xsl:param> - - -Description - -If non-zero, -PassiveTeX -extensions will be used. At present, this consists of PDF bookmarks -and sorted index terms. - - -This parameter can also affect which graphics file formats -are supported - - - PassiveTeX is incomplete and development has ceased. In most cases, -another XSL-FO engine is probably a better choice. - - - - - - - -tex.math.in.alt -list -plain -latex - - -tex.math.in.alt -TeX notation used for equations - - - - -<xsl:param name="tex.math.in.alt"></xsl:param> - - - -Description - -If you want type math directly in TeX notation in equations, -this parameter specifies notation used. Currently are supported two -values -- plain and latex. Empty -value means that you are not using TeX math at all. - -Preferred way for including TeX alternative of math is inside of -textobject element. Eg.: - -<inlineequation> -<inlinemediaobject> -<imageobject> -<imagedata fileref="eq1.gif"/> -</imageobject> -<textobject><phrase>E=mc squared</phrase></textobject> -<textobject role="tex"><phrase>E=mc^2</phrase></textobject> -</inlinemediaobject> -</inlineequation> - -If you are using graphic element, you can -store TeX inside alt element: - -<inlineequation> -<alt role="tex">a^2+b^2=c^2</alt> -<graphic fileref="a2b2c2.gif"/> -</inlineequation> - -If you want use this feature, you should process your FO with -PassiveTeX, which only supports TeX math notation. When calling -stylsheet, don't forget to specify also -passivetex.extensions=1. - -If you want equations in HTML, just process generated file -tex-math-equations.tex by TeX or LaTeX. Then run -dvi2bitmap program on result DVI file. You will get images for -equations in your document. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - - -Related Parameters - tex.math.delims, - passivetex.extensions, - tex.math.file - - - - - - -tex.math.delims -boolean - - -tex.math.delims -Should equations output for processing by TeX be -surrounded by math mode delimiters? - - - - -<xsl:param name="tex.math.delims" select="1"></xsl:param> - - - -Description - -For compatibility with DSSSL based DBTeXMath from Allin Cottrell -you should set this parameter to 0. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - -Related Parameters - tex.math.in.alt, - passivetex.extensions - - -See Also - You can also use the dbtex delims processing - instruction to control whether delimiters are output. - - - - - - - -xep.extensions -boolean - - -xep.extensions -Enable XEP extensions? - - - -<xsl:param name="xep.extensions" select="0"></xsl:param> - - -Description - -If non-zero, -XEP -extensions will be used. XEP extensions consists of PDF bookmarks, -document information and better index processing. - - -This parameter can also affect which graphics file formats -are supported - - - - -Stylesheet Extensions - - -linenumbering.everyNth -integer - - -linenumbering.everyNth -Indicate which lines should be numbered - - - - -<xsl:param name="linenumbering.everyNth">5</xsl:param> - - - -Description - -If line numbering is enabled, everyNth line will be -numbered. Note that numbering is one based, not zero based. - - - - - - - -linenumbering.extension -boolean - - -linenumbering.extension -Enable the line numbering extension - - - - -<xsl:param name="linenumbering.extension" select="1"></xsl:param> - - - -Description - -If non-zero, verbatim environments (address, literallayout, -programlisting, screen, synopsis) that specify line numbering will -have line numbers. - - - - - - - -linenumbering.separator -string - - -linenumbering.separator -Specify a separator between line numbers and lines - - - - -<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param> - - - -Description - -The separator is inserted between line numbers and lines in the -verbatim environment. The default value is a single white space. - Note the interaction with linenumbering.width - - - - - - - -linenumbering.width -integer - - -linenumbering.width -Indicates the width of line numbers - - - - -<xsl:param name="linenumbering.width">3</xsl:param> - - - -Description - -If line numbering is enabled, line numbers will appear right -justified in a field "width" characters wide. - - - - - - - -tablecolumns.extension -boolean - - -tablecolumns.extension -Enable the table columns extension function - - - - -<xsl:param name="tablecolumns.extension" select="1"></xsl:param> - - - -Description - -The table columns extension function adjusts the widths of table -columns in the HTML result to more accurately reflect the specifications -in the CALS table. - - - - - - - - textinsert.extension - boolean - - - textinsert.extension - Enables the textinsert extension element - - - - <xsl:param name="textinsert.extension" select="1"></xsl:param> - - - Description - The textinsert extension element inserts the contents of - a file into the result tree (as text). - - To use the textinsert extension element, you must use - either Saxon or Xalan as your XSLT processor (it doesn’t - work with xsltproc), along with either the DocBook Saxon - extensions or DocBook Xalan extensions (for more - information about those extensions, see DocBook Saxon Extensions and DocBook Xalan Extensions), and you must set both - the use.extensions and - textinsert.extension parameters to - 1. - As an alternative to using the textinsert element, - consider using an Xinclude element with the - parse="text" attribute and value - specified, as detailed in Using XInclude for text inclusions. - - - See Also - You can also use the dbhtml-include href processing - instruction to insert external files — both files containing - plain text and files with markup content (including HTML - content). - - More information - For how-to documentation on inserting contents of - external code files and other text files into output, see - External code files. - For guidelines on inserting contents of - HTML files into output, see Inserting external HTML code. - - - - - -textdata.default.encoding -string - - -textdata.default.encoding -Default encoding of external text files which are included -using textdata element - - - - -<xsl:param name="textdata.default.encoding"></xsl:param> - - - -Description - -Specifies the encoding of any external text files included using -textdata element. This value is used only when you do -not specify encoding by the appropriate attribute -directly on textdata. An empty string is interpreted as the system -default encoding. - - - - - - -use.extensions -boolean - - -use.extensions -Enable extensions - - - - -<xsl:param name="use.extensions" select="0"></xsl:param> - - - -Description - -If non-zero, extensions may be used. Each extension is -further controlled by its own parameter. But if -use.extensions is zero, no extensions will -be used. - - - - - - -Automatic labelling - - -appendix.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -appendix.autolabel -Specifies the labeling format for Appendix titles - - - - -<xsl:param name="appendix.autolabel">A</xsl:param> - - - -Description - -If non-zero, then appendices will be numbered using the -parameter value as the number format if the value matches one of the -following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperalpha). - - - - - - - -chapter.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -chapter.autolabel -Specifies the labeling format for Chapter titles - - - - -<xsl:param name="chapter.autolabel" select="1"></xsl:param> - - -Description - -If non-zero, then chapters will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - - - - -part.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -part.autolabel -Specifies the labeling format for Part titles - - - - -<xsl:param name="part.autolabel">I</xsl:param> - - - -Description - -If non-zero, then parts will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperroman). - - - - - - - - -reference.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -reference.autolabel -Specifies the labeling format for Reference titles - - - - <xsl:param name="reference.autolabel">I</xsl:param> - - -Description -If non-zero, references will be numbered using the parameter - value as the number format if the value matches one of the - following: - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - -Any non-zero value other than the above will generate -the default number format (upperroman). - - - - - - -preface.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -preface.autolabel -Specifices the labeling format for Preface titles - - - -<xsl:param name="preface.autolabel" select="0"></xsl:param> - - -Description - -If non-zero then prefaces will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - - - - - -section.autolabel -boolean - - -section.autolabel -Are sections enumerated? - - - -<xsl:param name="section.autolabel" select="0"></xsl:param> - - -Description - -If true (non-zero), unlabeled sections will be enumerated. - - - - - - - -section.autolabel.max.depth -integer - - -section.autolabel.max.depth -The deepest level of sections that are numbered. - - - - -<xsl:param name="section.autolabel.max.depth">8</xsl:param> - - - -Description - -When section numbering is turned on by the -section.autolabel parameter, then this -parameter controls the depth of section nesting that is -numbered. Sections nested to a level deeper than this value will not -be numbered. - - - - - - - -section.label.includes.component.label -boolean - - -section.label.includes.component.label -Do section labels include the component label? - - - -<xsl:param name="section.label.includes.component.label" select="0"></xsl:param> - - -Description - -If non-zero, section labels are prefixed with the label of the -component that contains them. - - - - - - - -label.from.part -boolean - - -label.from.part -Renumber components in each part? - - - - -<xsl:param name="label.from.part" select="0"></xsl:param> - - - -Description - -If label.from.part is non-zero, then - numbering of components — preface, - chapter, appendix, and - reference (when reference occurs at the - component level) — is re-started within each - part. -If label.from.part is zero (the - default), numbering of components is not - re-started within each part; instead, components are - numbered sequentially throughout each book, - regardless of whether or not they occur within part - instances. - - - - - - -component.label.includes.part.label -boolean - - -component.label.includes.part.label -Do component labels include the part label? - - - -<xsl:param name="component.label.includes.part.label" select="0"></xsl:param> - - -Description - -If non-zero, number labels for chapter, -appendix, and other component elements are prefixed with -the label of the part element that contains them. So you might see -Chapter II.3 instead of Chapter 3. Also, the labels for formal -elements such as table and figure will include -the part label. If there is no part element container, then no prefix -is generated. - - -This feature is most useful when the -label.from.part parameter is turned on. -In that case, there would be more than one chapter -1, and the extra part label prefix will identify -each chapter unambiguously. - - - - - - -XSLT Processing - - -rootid -string - - -rootid -Specify the root element to format - - - - -<xsl:param name="rootid"></xsl:param> - - -Description - -If rootid is not empty, it must be the -value of an ID that occurs in the document being formatted. The entire -document will be loaded and parsed, but formatting will begin at the -element identified, rather than at the root. For example, this allows -you to process only chapter 4 of a book. -Because the entire document is available to the processor, automatic -numbering, cross references, and other dependencies are correctly -resolved. - - - - - -Meta/*Info - - -make.single.year.ranges -boolean - - -make.single.year.ranges -Print single-year ranges (e.g., 1998-1999) - - - - -<xsl:param name="make.single.year.ranges" select="0"></xsl:param> - - -Description - -If non-zero, year ranges that span a single year will be printed -in range notation (1998-1999) instead of discrete notation -(1998, 1999). - - - - - - -make.year.ranges -boolean - - -make.year.ranges -Collate copyright years into ranges? - - - -<xsl:param name="make.year.ranges" select="0"></xsl:param> - - -Description - -If non-zero, multiple copyright year elements will be -collated into ranges. -This works only if each year number is put into a separate -year element. The copyright element permits multiple -year elements. If a year element contains a dash or -a comma, then that year element will not be merged into -any range. - - - - - - - -author.othername.in.middle -boolean - - -author.othername.in.middle -Is othername in author a -middle name? - - - - -<xsl:param name="author.othername.in.middle" select="1"></xsl:param> - - -Description - -If non-zero, the othername of an author -appears between the firstname and -surname. Otherwise, othername -is suppressed. - - - - - - -Reference Pages - - -funcsynopsis.decoration -boolean - - -funcsynopsis.decoration -Decorate elements of a funcsynopsis? - - - - -<xsl:param name="funcsynopsis.decoration" select="1"></xsl:param> - - - -Description - -If non-zero, elements of the funcsynopsis will be -decorated (e.g. rendered as bold or italic text). The decoration is controlled by -templates that can be redefined in a customization layer. - - - - - - - -funcsynopsis.style -list -ansi -kr - - -funcsynopsis.style -What style of funcsynopsis should be generated? - - - -<xsl:param name="funcsynopsis.style">kr</xsl:param> - - -Description - -If funcsynopsis.style is ansi, -ANSI-style function synopses are generated for a -funcsynopsis, otherwise K&R-style -function synopses are generated. - - - - - - - -function.parens -boolean - - -function.parens -Generate parens after a function? - - - - -<xsl:param name="function.parens" select="0"></xsl:param> - - - -Description - -If non-zero, the formatting of a function element -will include generated parentheses. - - - - - - - -refentry.generate.name -boolean - - -refentry.generate.name -Output NAME header before refnames? - - - - -<xsl:param name="refentry.generate.name" select="1"></xsl:param> - - - -Description - -If non-zero, a "NAME" section title is output before the list -of refnames. This parameter and -refentry.generate.title are mutually -exclusive. This means that if you change this parameter to zero, you -should set refentry.generate.title to non-zero unless -you want get quite strange output. - - - - - - - -refentry.generate.title -boolean - - -refentry.generate.title -Output title before refnames? - - - - -<xsl:param name="refentry.generate.title" select="0"></xsl:param> - - - -Description - -If non-zero, the reference page title or first name is -output before the list of refnames. This parameter and -refentry.generate.name are mutually exclusive. -This means that if you change this parameter to non-zero, you -should set refentry.generate.name to zero unless -you want get quite strange output. - - - - - - - -refentry.pagebreak -boolean - - -refentry.pagebreak -Start each refentry on a new page - - - -<xsl:param name="refentry.pagebreak" select="1"></xsl:param> - - -Description - -If non-zero (the default), each refentry -element will start on a new page. If zero, a page -break will not be generated between refentry elements. -The exception is when the refentry elements are children of -a part element, in which case the page breaks are always -retained. That is because a part element does not generate -a page-sequence for its children, so each refentry must -start its own page-sequence. - - - - - - - -refentry.title.properties -attribute set - - -refentry.title.properties -Title properties for a refentry title - - - - -<xsl:attribute-set name="refentry.title.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.font.family"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-size">18pt</xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="space-after">1em</xsl:attribute> - <xsl:attribute name="hyphenate">false</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="space-after.optimum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.6em</xsl:attribute> - <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -Formatting properties applied to the title generated for the -refnamediv part of output for -refentry when the value of the -refentry.generate.title parameter is -non-zero. The font size is supplied by the appropriate section.levelX.title.properties -attribute-set, computed from the location of the -refentry in the section hierarchy. - - - This parameter has no effect on the the title generated for - the refnamediv part of output for - refentry when the value of the - refentry.generate.name parameter is - non-zero. By default, that title is formatted with the same - properties as the titles for all other first-level children of - refentry. - - - - - - - -refentry.xref.manvolnum -boolean - - -refentry.xref.manvolnum -Output manvolnum as part of -refentry cross-reference? - - - - -<xsl:param name="refentry.xref.manvolnum" select="1"></xsl:param> - - - -Description - -if non-zero, the manvolnum is used when cross-referencing -refentrys, either with xref -or citerefentry. - - - - - - - -refclass.suppress -boolean - - -refclass.suppress -Suppress display of refclass contents? - - - - -<xsl:param name="refclass.suppress" select="0"></xsl:param> - - -Description - -If the value of refclass.suppress is -non-zero, then display of refclass contents is -suppressed in output. - - - - - -Tables - - -default.table.width -length - - -default.table.width -The default width of tables - - - -<xsl:param name="default.table.width"></xsl:param> - - -Description -If non-zero, this value will be used for the -width attribute on tables that do not specify an -alternate width (with the dbhtml table-width or -dbfo table-width processing instruction). - - - - - -nominal.table.width -length - - -nominal.table.width -The (absolute) nominal width of tables - - - - -<xsl:param name="nominal.table.width">6in</xsl:param> - - - -Description - -In order to convert CALS column widths into HTML column widths, it -is sometimes necessary to have an absolute table width to use for conversion -of mixed absolute and relative widths. This value must be an absolute -length (not a percentage). - - - - - - -default.table.frame -string - - -default.table.frame -The default framing of tables - - - - -<xsl:param name="default.table.frame">all</xsl:param> - - - -Description - -This value will be used when there is no frame attribute on the -table. - - - - - - -default.table.rules -string - - -default.table.rules -The default column and row rules for tables using HTML markup - - - - -<xsl:param name="default.table.rules">none</xsl:param> - - - -Description - -Tables using HTML markup elements can use an attribute -named rules on the table or -informaltable element -to specify whether column and row border rules should be -displayed. This parameter lets you specify a global default -style for all HTML tables that don't otherwise have -that attribute. -These are the supported values: - - -all - -Rules will appear between all rows and columns. - - - -rows - -Rules will appear between rows only. - - - -cols - -Rules will appear between columns only. - - - -groups - -Rules will appear between row groups (thead, tfoot, tbody). -No support for rules between column groups yet. - - - - -none - -No rules. This is the default value. - - - - - - -The border after the last row and the border after -the last column are not affected by -this setting. Those borders are controlled by -the frame attribute on the table element. - - - - - - - -table.cell.padding -attribute set - - -table.cell.padding -Specifies the padding of table cells - - - - -<xsl:attribute-set name="table.cell.padding"> - <xsl:attribute name="padding-start">2pt</xsl:attribute> - <xsl:attribute name="padding-end">2pt</xsl:attribute> - <xsl:attribute name="padding-top">2pt</xsl:attribute> - <xsl:attribute name="padding-bottom">2pt</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Specifies the padding of table cells. - - - - - - -table.frame.border.thickness -length - - -table.frame.border.thickness -Specifies the thickness of the frame border - - - - -<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param> - - - -Description - -Specifies the thickness of the border on the table's frame. - - - - - - -table.frame.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.frame.border.style -Specifies the border style of table frames - - - - -<xsl:param name="table.frame.border.style">solid</xsl:param> - - - -Description - -Specifies the border style of table frames. - - - - - - -table.frame.border.color -color - - -table.frame.border.color -Specifies the border color of table frames - - - - - -<xsl:param name="table.frame.border.color">black</xsl:param> - - - -Description - -Specifies the border color of table frames. - - - - - - -table.cell.border.thickness -length - - -table.cell.border.thickness -Specifies the thickness of table cell borders - - - - -<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param> - - - -Description - -If non-zero, specifies the thickness of borders on table -cells. The units are points. See -CSS - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.cell.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.cell.border.style -Specifies the border style of table cells - - - - -<xsl:param name="table.cell.border.style">solid</xsl:param> - - - -Description - -Specifies the border style of table cells. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.cell.border.color -color - - -table.cell.border.color -Specifies the border color of table cells - - - - - -<xsl:param name="table.cell.border.color">black</xsl:param> - - - -Description - -Set the color of table cell borders. If non-zero, the value is used -for the border coloration. See CSS. A -color is either a keyword or a numerical RGB specification. -Keywords are aqua, black, blue, fuchsia, gray, green, lime, maroon, -navy, olive, orange, purple, red, silver, teal, white, and -yellow. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.table.properties -attribute set - - -table.table.properties -Properties associated with a table - - - - -<xsl:attribute-set name="table.table.properties"> - <xsl:attribute name="border-before-width.conditionality">retain</xsl:attribute> - <xsl:attribute name="border-collapse">collapse</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for tables. This parameter should really -have been called table.properties, but that parameter -name was inadvertently established for the block-level properties -of the table as a whole. - - -See also table.properties. - - - - - -Linking - - -current.docid -string - - -current.docid -targetdoc identifier for the document being -processed - - -<xsl:param name="current.docid"></xsl:param> - - -Description - -When olinks between documents are resolved for HTML output, the stylesheet can compute the relative path between the current document and the target document. The stylesheet needs to know the targetdoc identifiers for both documents, as they appear in the target.database.document database file. This parameter passes to the stylesheet -the targetdoc identifier of the current document, since that -identifier does not appear in the document itself. -This parameter can also be used for print output. If an olink's targetdoc id differs from the current.docid, then the stylesheet can append the target document's title to the generated olink text. That identifies to the reader that the link is to a different document, not the current document. See also olink.doctitle to enable that feature. - - - - - -collect.xref.targets -list -no -yes -only - - -collect.xref.targets -Controls whether cross reference data is -collected - - -<xsl:param name="collect.xref.targets">no</xsl:param> - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter determines whether the collection process is run when the document is processed by the stylesheet. The default value is no, which means the data file is not generated during processing. The other choices are yes, which means the data file is created and the document is processed for output, and only, which means the data file is created but the document is not processed for output. -See also targets.filename. - - - - - - -insert.olink.page.number -list -no -yes -maybe - - -insert.olink.page.number -Turns page numbers in olinks on and off - - - - -<xsl:param name="insert.olink.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references made between documents with -olink will -include page number citations. -In most cases this is only applicable to references in printed output. - -The parameter has three possible values. - - - -no -No page number references will be generated for olinks. - - - -yes -Page number references will be generated -for all olink references. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an olink element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - -Olinks that point to targets within the same document -are treated as xrefs, and controlled by -the insert.xref.page.number parameter. - - -Page number references for olinks to -external documents can only be inserted if the -information exists in the olink database. -This means each olink target element -(div or obj) -must have a page attribute -whose value is its page number in the target document. -The XSL stylesheets are not able to extract that information -during processing because pages have not yet been created in -XSLT transformation. Only the XSL-FO processor knows what -page each element is placed on. -Therefore some postprocessing must take place to populate -page numbers in the olink database. - - - - - - - - - -insert.olink.pdf.frag -boolean - - -insert.olink.pdf.frag -Add fragment identifiers for links into PDF files - - - - -<xsl:param name="insert.olink.pdf.frag" select="0"></xsl:param> - - - -Description - -The value of this parameter determines whether -the cross reference URIs to PDF documents made with -olink will -include fragment identifiers. - - -When forming a URI to link to a PDF document, -a fragment identifier (typically a '#' followed by an -id value) appended to the PDF filename can be used by -the PDF viewer to open -the PDF file to a location within the document instead of -the first page. -However, not all PDF files have id -values embedded in them, and not all PDF viewers can -handle fragment identifiers. - - -If insert.olink.pdf.frag is set -to a non-zero value, then any olink targeting a -PDF file will have the fragment identifier appended to the URI. -The URI is formed by concatenating the value of the -olink.base.uri parameter, the -value of the baseuri -attribute from the document -element in the olink database with the matching -targetdoc value, -and the value of the href -attribute for the targeted element in the olink database. -The href attribute -contains the fragment identifier. - - -If insert.olink.pdf.frag is set -to zero (the default value), then -the href attribute -from the olink database -is not appended to PDF olinks, so the fragment identifier is left off. -A PDF olink is any olink for which the -baseuri attribute -from the matching document -element in the olink database ends with '.pdf'. -Any other olinks will still have the fragment identifier added. - - - - - - -olink.base.uri -uri - - -olink.base.uri -Base URI used in olink hrefs - - -<xsl:param name="olink.base.uri"></xsl:param> - - -Description - -When cross reference data is collected for resolving olinks, it -may be necessary to prepend a base URI to each target's href. This -parameter lets you set that base URI when cross reference data is -collected. This feature is needed when you want to link to a document -that is processed without chunking. The output filename for such a -document is not known to the XSL stylesheet; the only target -information consists of fragment identifiers such as -#idref. To enable the resolution of olinks between -documents, you should pass the name of the HTML output file as the -value of this parameter. Then the hrefs recorded in the cross -reference data collection look like -outfile.html#idref, which can be reached as links -from other documents. - - - - - -olink.debug -boolean - - -olink.debug -Turn on debugging messages for olinks - - - - -<xsl:param name="olink.debug" select="0"></xsl:param> - - - -Description - -If non-zero, then each olink will generate several -messages about how it is being resolved during processing. -This is useful when an olink does not resolve properly -and the standard error messages are not sufficient to -find the problem. - - -You may need to read through the olink XSL templates -to understand the context for some of the debug messages. - - - - - - - -olink.doctitle -list -no -yes -maybe - - -olink.doctitle -show the document title for external olinks? - - - -<xsl:param name="olink.doctitle">no</xsl:param> - - -Description - -When olinks between documents are resolved, the generated text -may not make it clear that the reference is to another document. -It is possible for the stylesheets to append the other document's -title to external olinks. For this to happen, two parameters must -be set. - - -This olink.doctitle parameter -should be set to either yes or maybe -to enable this feature. - - - -And you should also set the current.docid -parameter to the document id for the document currently -being processed for output. - - - - - -Then if an olink's targetdoc id differs from -the current.docid value, the stylesheet knows -that it is a reference to another document and can -append the target document's -title to the generated olink text. - -The text for the target document's title is copied from the -olink database from the ttl element -of the top-level div for that document. -If that ttl element is missing or empty, -no title is output. - - -The supported values for olink.doctitle are: - - - -yes - - -Always insert the title to the target document if it is not -the current document. - - - - -no - - -Never insert the title to the target document, even if requested -in an xrefstyle attribute. - - - - -maybe - - -Only insert the title to the target document, if requested -in an xrefstyle attribute. - - - - -An xrefstyle attribute -may override the global setting for individual olinks. -The following values are supported in an -xrefstyle -attribute using the select: syntax: - - - - -docname - - -Insert the target document name for this olink using the -docname gentext template, but only -if the value of olink.doctitle -is not no. - - - - -docnamelong - - -Insert the target document name for this olink using the -docnamelong gentext template, but only -if the value of olink.doctitle -is not no. - - - - -nodocname - - -Omit the target document name even if -the value of olink.doctitle -is yes. - - - - -Another way of inserting the target document name -for a single olink is to employ an -xrefstyle -attribute using the template: syntax. -The %o placeholder (the letter o, not zero) -in such a template -will be filled in with the target document's title when it is processed. -This will occur regardless of -the value of olink.doctitle. - -Note that prior to version 1.66 of the XSL stylesheets, -the allowed values for this parameter were 0 and 1. Those -values are still supported and mapped to 'no' and 'yes', respectively. - - - - - - -olink.lang.fallback.sequence -string - - -olink.lang.fallback.sequence -look up translated documents if olink not found? - - - -<xsl:param name="olink.lang.fallback.sequence"></xsl:param> - - -Description - - -This parameter defines a list of lang values -to search among to resolve olinks. - - -Normally an olink tries to resolve to a document in the same -language as the olink itself. The language of an olink -is determined by its nearest ancestor element with a -lang attribute, otherwise the -value of the l10n.gentext.default.lang -parameter. - - -An olink database can contain target data for the same -document in multiple languages. Each set of data has the -same value for the targetdoc attribute in -the document element in the database, but with a -different lang attribute value. - - -When an olink is being resolved, the target is first -sought in the document with the same language as the olink. -If no match is found there, then this parameter is consulted -for additional languages to try. - -The olink.lang.fallback.sequence -must be a whitespace separated list of lang values to -try. The first one with a match in the olink database is used. -The default value is empty. - -For example, a document might be written in German -and contain an olink with -targetdoc="adminguide". -When the document is processed, the processor -first looks for a target dataset in the -olink database starting with: - -<document targetdoc="adminguide" lang="de">. - - -If there is no such element, then the -olink.lang.fallback.sequence -parameter is consulted. -If its value is, for example, fr en, then the processor next -looks for targetdoc="adminguide" lang="fr", and -then for targetdoc="adminguide" lang="en". -If there is still no match, it looks for -targetdoc="adminguide" with no -lang attribute. - - -This parameter is useful when a set of documents is only -partially translated, or is in the process of being translated. -If a target of an olink has not yet been translated, then this -parameter permits the processor to look for the document in -other languages. This assumes the reader would rather have -a link to a document in a different language than to have -a broken link. - - - - - - - -olink.properties -attribute set - - -olink.properties -Properties associated with the cross-reference -text of an olink. - - - - -<xsl:attribute-set name="olink.properties"> - <xsl:attribute name="show-destination">replace</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the -fo:basic-link element of an olink. It is not applied to the -optional page number or optional title of the external -document. - - - - - - -prefer.internal.olink -boolean - - -prefer.internal.olink -Prefer a local olink reference to an external reference - - - - -<xsl:param name="prefer.internal.olink" select="0"></xsl:param> - - - -Description - -If you are re-using XML content modules in multiple documents, -you may want to redirect some of your olinks. This parameter -permits you to redirect an olink to the current document. - - -For example: you are writing documentation for a product, -which includes 3 manuals: a little installation -booklet (booklet.xml), a user -guide (user.xml), and a reference manual (reference.xml). -All 3 documents begin with the same introduction section (intro.xml) that -contains a reference to the customization section (custom.xml) which is -included in both user.xml and reference.xml documents. - - -How do you write the link to custom.xml in intro.xml -so that it is interpreted correctly in all 3 documents? - -If you use xref, it will fail in user.xml. - -If you use olink (pointing to reference.xml), -the reference in user.xml -will point to the customization section of the reference manual, while it is -actually available in user.xml. - - - -If you set the prefer.internal.olink -parameter to a non-zero value, then the processor will -first look in the olink database -for the olink's targetptr attribute value -in document matching the current.docid -parameter value. If it isn't found there, then -it tries the document in the database -with the targetdoc -value that matches the olink's targetdoc -attribute. - - -This feature permits an olink reference to resolve to -the current document if there is an element -with an id matching the olink's targetptr -value. The current document's olink data must be -included in the target database for this to work. - - -There is a potential for incorrect links if -the same id attribute value is used for different -content in different documents. -Some of your olinks may be redirected to the current document -when they shouldn't be. It is not possible to control -individual olink instances. - - - - - - - -target.database.document -uri - - -target.database.document -Name of master database file for resolving -olinks - - - - <xsl:param name="target.database.document">olinkdb.xml</xsl:param> - - -Description - - -To resolve olinks between documents, the stylesheets use a master -database document that identifies the target datafiles for all the -documents within the scope of the olinks. This parameter value is the -URI of the master document to be read during processing to resolve -olinks. The default value is olinkdb.xml. - -The data structure of the file is defined in the -targetdatabase.dtd DTD. The database file -provides the high level elements to record the identifiers, locations, -and relationships of documents. The cross reference data for -individual documents is generally pulled into the database using -system entity references or XIncludes. See also -targets.filename. - - - - -targets.filename -string - - -targets.filename -Name of cross reference targets data file - - -<xsl:param name="targets.filename">target.db</xsl:param> - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter lets you change the name of the generated -file from the default name target.db. -The name must agree with that used in the target database -used to resolve olinks during processing. -See also target.database.document. - - - - - - -use.local.olink.style -boolean - - -use.local.olink.style -Process olinks using xref style of current -document - - -<xsl:param name="use.local.olink.style" select="0"></xsl:param> - -Description - -When cross reference data is collected for use by olinks, the data for each potential target includes one field containing a completely assembled cross reference string, as if it were an xref generated in that document. Other fields record the separate title, number, and element name of each target. When an olink is formed to a target from another document, the olink resolves to that preassembled string by default. If the use.local.olink.style parameter is set to non-zero, then instead the cross -reference string is formed again from the target title, number, and -element name, using the stylesheet processing the targeting document. -Then olinks will match the xref style in the targeting document -rather than in the target document. If both documents are processed -with the same stylesheet, then the results will be the same. - - - - -Cross References - - -insert.xref.page.number -list -no -yes -maybe - - -insert.xref.page.number -Turns page numbers in xrefs on and off - - - - -<xsl:param name="insert.xref.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references (xrefs) in -printed output will -include page number citations. -It has three possible values. - - - -no -No page number references will be generated. - - - -yes -Page number references will be generated -for all xref elements. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an xref element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - - - - - - - -xref.properties -attribute set - - -xref.properties -Properties associated with cross-reference text - - - - -<xsl:attribute-set name="xref.properties"> -</xsl:attribute-set> - - - -Description - -This attribute set is used to set properties -on cross reference text. - - - - - - -xref.label-title.separator -string - - -xref.label-title.separator -Punctuation or space separating label from title in xref - - - -<xsl:param name="xref.label-title.separator">: </xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and title, -then the value of this parameter is inserted between -label and title in the output. - - - - - - - -xref.label-page.separator -string - - -xref.label-page.separator -Punctuation or space separating label from page number in xref - - - -<xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and page -but no title, -then the value of this parameter is inserted between -label and page number in the output. -If a title is included, then other separators are used. - - - - - - - -xref.title-page.separator -string - - -xref.title-page.separator -Punctuation or space separating title from page number in xref - - - -<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both title and page number, -then the value of this parameter is inserted between -title and page number in the output. - - - - - - - -insert.link.page.number -list -no -yes -maybe - - -insert.link.page.number -Turns page numbers in link elements on and off - - - - -<xsl:param name="insert.link.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references using the link element in -printed output will -include standard page number citations. -It has three possible values. - - - -no -No page number references will be generated. - - - -yes -Page number references will be generated -for all link elements. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for a link element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - - -Although the xrefstyle attribute -can be used to turn the page reference on or off, it cannot be -used to control the formatting of the page number as it -can in xref. -In link it will always format with -the style established by the -gentext template with name="page.citation" -in the l:context name="xref". - - - - - -Lists - - -compact.list.item.spacing -attribute set - - -compact.list.item.spacing -What space do you want between list items (when spacing="compact")? - - - -<xsl:attribute-set name="compact.list.item.spacing"> - <xsl:attribute name="space-before.optimum">0em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute> -</xsl:attribute-set> - -Description -Specify what spacing you want between each list item when -spacing is -compact. - - - - - -itemizedlist.properties -attribute set - - -itemizedlist.properties -Properties that apply to each list-block generated by itemizedlist. - - - -<xsl:attribute-set name="itemizedlist.properties" use-attribute-sets="list.block.properties"> -</xsl:attribute-set> - -Description -Properties that apply to each fo:list-block generated by itemizedlist. - - - - - -itemizedlist.label.properties -attribute set - - -itemizedlist.label.properties -Properties that apply to each label inside itemized list. - - - -<xsl:attribute-set name="itemizedlist.label.properties"> -</xsl:attribute-set> - -Description -Properties that apply to each label inside itemized list. E.g.: -<xsl:attribute-set name="itemizedlist.label.properties"> - <xsl:attribute name="text-align">right</xsl:attribute> -</xsl:attribute-set> - - - - - -itemizedlist.label.width -length - - - itemizedlist.label.width -The default width of the label (bullet) in an itemized list. - - - - - <xsl:param name="itemizedlist.label.width">1.0em</xsl:param> - - - -Description -Specifies the default width of the label (usually a bullet or other -symbol) in an itemized list. You can override the default value on any -particular list with the “dbfo” processing instruction using the -“label-width” pseudoattribute. - - - - - -list.block.properties -attribute set - - -list.block.properties -Properties that apply to each list-block generated by list. - - - -<xsl:attribute-set name="list.block.properties"> - <xsl:attribute name="provisional-label-separation">0.2em</xsl:attribute> - <xsl:attribute name="provisional-distance-between-starts">1.5em</xsl:attribute> -</xsl:attribute-set> - -Description -Properties that apply to each fo:list-block generated by itemizedlist/orderedlist. - - - - - -list.block.spacing -attribute set - - -list.block.spacing -What spacing do you want before and after lists? - - - -<xsl:attribute-set name="list.block.spacing"> - <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">1.2em</xsl:attribute> -</xsl:attribute-set> - -Description -Specify the spacing required before and after a list. It is necessary to specify the space after a list block because lists can come inside of paras. - - - - - -list.item.spacing -attribute set - - -list.item.spacing -What space do you want between list items? - - - -<xsl:attribute-set name="list.item.spacing"> - <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-set> - -Description -Specify what spacing you want between each list item. - - - - - -orderedlist.properties -attribute set - - -orderedlist.properties -Properties that apply to each list-block generated by orderedlist. - - - -<xsl:attribute-set name="orderedlist.properties" use-attribute-sets="list.block.properties"> - <xsl:attribute name="provisional-distance-between-starts">2em</xsl:attribute> -</xsl:attribute-set> - -Description -Properties that apply to each fo:list-block generated by orderedlist. - - - - - -orderedlist.label.properties -attribute set - - -orderedlist.label.properties -Properties that apply to each label inside ordered list. - - - -<xsl:attribute-set name="orderedlist.label.properties"> -</xsl:attribute-set> - -Description -Properties that apply to each label inside ordered list. E.g.: -<xsl:attribute-set name="orderedlist.label.properties"> - <xsl:attribute name="text-align">right</xsl:attribute> -</xsl:attribute-set> - - - - - -orderedlist.label.width -length - - -orderedlist.label.width -The default width of the label (number) in an ordered list. - - - - -<xsl:param name="orderedlist.label.width">1.2em</xsl:param> - - - -Description -Specifies the default width of the label (usually a number or -sequence of numbers) in an ordered list. You can override the default -value on any particular list with the “dbfo” processing instruction -using the “label-width” pseudoattribute. - - - - - -variablelist.max.termlength -number - - -variablelist.max.termlength -Specifies the longest term in variablelists - - - - -<xsl:param name="variablelist.max.termlength">24</xsl:param> - - - -Description - -In variablelists, the listitem -is indented to leave room for the -term elements. That indent may be computed -if it is not specified with a termlength -attribute on the variablelist element. - - -The computation counts characters in the -term elements in the list -to find the longest term. However, some terms are very long -and would produce extreme indents. This parameter lets you -set a maximum character count. Any terms longer than the maximum -would line wrap. The default value is 24. - - -The character counts are converted to physical widths -by multiplying by 0.50em. There will be some variability -in how many actual characters fit in the space -since some characters are wider than others. - - - - - - - -variablelist.term.separator -string - - -variablelist.term.separator -Text to separate terms within a multi-term -varlistentry - - - - -<xsl:param name="variablelist.term.separator">, </xsl:param> - - -Description - -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is placed -after each term except the last. - - - To generate a line break between multiple terms in - a varlistentry, set a non-zero value for the - variablelist.term.break.after parameter. If - you do so, you may also want to set the value of the - variablelist.term.separator parameter to an - empty string (to suppress rendering of the default comma and space - after each term). - - - - - - - -variablelist.term.properties -attribute set - - -variablelist.term.properties -To add properties to the term elements in a variablelist. - - - - -<xsl:attribute-set name="variablelist.term.properties"> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -term in a variablelist. -Use this attribute-set to set -font properties or alignment, for example. - - - - - - -variablelist.term.break.after -boolean - - -variablelist.term.break.after -Generate line break after each term within a -multi-term varlistentry? - - - - -<xsl:param name="variablelist.term.break.after">0</xsl:param> - - -Description - -Set a non-zero value for the -variablelist.term.break.after parameter to -generate a line break between terms in a -multi-term varlistentry. - - -If you set a non-zero value for -variablelist.term.break.after, you may also -want to set the value of the -variablelist.term.separator parameter to an -empty string (to suppress rendering of the default comma and space -after each term). - - - - - - -QAndASet - - -qandadiv.autolabel -boolean - - -qandadiv.autolabel -Are divisions in QAndASets enumerated? - - - -<xsl:param name="qandadiv.autolabel" select="1"></xsl:param> - - -Description - -If non-zero, unlabeled qandadivs will be enumerated. - - - - - - - -qanda.inherit.numeration -boolean - - -qanda.inherit.numeration -Does enumeration of QandASet components inherit the numeration of parent elements? - - - - -<xsl:param name="qanda.inherit.numeration" select="1"></xsl:param> - - - -Description - -If non-zero, numbered qandadiv elements and -question and answer inherit the enumeration of -the ancestors of the qandaset. - - - - - - - -qanda.defaultlabel -list -number -qanda -none - - -qanda.defaultlabel -Sets the default for defaultlabel on QandASet. - - - - -<xsl:param name="qanda.defaultlabel">number</xsl:param> - - - -Description - -If no defaultlabel attribute is specified on -a qandaset, this value is used. It is generally one of the legal -values for the defaultlabel attribute (none, -number or -qanda), or one of the additional stylesheet-specific values -(qnumber or qnumberanda). -The default value is 'number'. - -The values are rendered as follows: - -qanda - -questions are labeled "Q:" and -answers are labeled "A:". - - - -number - -The questions are enumerated and the answers -are not labeled. - - - -qnumber - -The questions are labeled "Q:" followed by a number, and answers are not -labeled. -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -qnumberanda - -The questions are labeled "Q:" followed by a number, and -the answers are labeled "A:". -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -none - -No distinguishing label precedes Questions or Answers. - - - - - - - - - - -qanda.in.toc -boolean - - -qanda.in.toc -Should qandaentry questions appear in -the document table of contents? - - - -<xsl:param name="qanda.in.toc" select="0"></xsl:param> - - -Description - -If true (non-zero), then the generated table of contents -for a document will include qandaset titles, -qandadiv titles, -and question elements. The default value (zero) excludes -them from the TOC. - -This parameter does not affect any tables of contents -that may be generated inside a qandaset or qandadiv. - - - - - - - -qanda.nested.in.toc -boolean - - -qanda.nested.in.toc -Should nested answer/qandaentry instances appear in TOC? - - - - -<xsl:param name="qanda.nested.in.toc" select="0"></xsl:param> - - - -Description - -If non-zero, instances of qandaentry -that are children of answer elements are shown in -the TOC. - - - - - -Bibliography - - -bibliography.style -list -normal -iso690 - - -bibliography.style -Style used for formatting of biblioentries. - - - - -<xsl:param name="bibliography.style">normal</xsl:param> - - - -Description - -Currently only normal and -iso690 styles are supported. - -In order to use ISO690 style to the full extent you might need -to use additional markup described on the -following WiKi page. - - - - - - -biblioentry.item.separator -string - - -biblioentry.item.separator -Text to separate bibliography entries - - - -<xsl:param name="biblioentry.item.separator">. </xsl:param> - - -Description - -Text to separate bibliography entries - - - - - - - -bibliography.collection -string - - -bibliography.collection -Name of the bibliography collection file - - - - -<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param> - - - - -Description - -Maintaining bibliography entries across a set of documents is tedious, time -consuming, and error prone. It makes much more sense, usually, to store all of -the bibliography entries in a single place and simply extract -the ones you need in each document. - -That's the purpose of the -bibliography.collection parameter. To setup a global -bibliography database, follow these steps: - -First, create a stand-alone bibliography document that contains all of -the documents that you wish to reference. Make sure that each bibliography -entry (whether you use biblioentry or bibliomixed) -has an ID. - -My global bibliography, ~/bibliography.xml begins -like this: - - -<!DOCTYPE bibliography - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<bibliography><title>References</title> - -<bibliomixed id="xml-rec"><abbrev>XML 1.0</abbrev>Tim Bray, -Jean Paoli, C. M. Sperberg-McQueen, and Eve Maler, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml">Extensible Markup -Language (XML) 1.0 Second Edition</ulink></citetitle>. -World Wide Web Consortium, 2000. -</bibliomixed> - -<bibliomixed id="xml-names"><abbrev>Namespaces</abbrev>Tim Bray, -Dave Hollander, -and Andrew Layman, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml-names/">Namespaces in -XML</ulink></citetitle>. -World Wide Web Consortium, 1999. -</bibliomixed> - -<!-- ... --> -</bibliography> - - - -When you create a bibliography in your document, simply -provide empty bibliomixed -entries for each document that you wish to cite. Make sure that these -elements have the same ID as the corresponding real -entry in your global bibliography. - -For example: - - -<bibliography><title>Bibliography</title> - -<bibliomixed id="xml-rec"/> -<bibliomixed id="xml-names"/> -<bibliomixed id="DKnuth86">Donald E. Knuth. <citetitle>Computers and -Typesetting: Volume B, TeX: The Program</citetitle>. Addison-Wesley, -1986. ISBN 0-201-13437-3. -</bibliomixed> -<bibliomixed id="relaxng"/> - -</bibliography> - - -Note that it's perfectly acceptable to mix entries from your -global bibliography with normal entries. You can use -xref or other elements to cross-reference your -bibliography entries in exactly the same way you do now. - -Finally, when you are ready to format your document, simply set the -bibliography.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global bibliography. - -The stylesheets will format the bibliography in your document as if -all of the entries referenced appeared there literally. - - - - - - -bibliography.numbered -boolean - - -bibliography.numbered -Should bibliography entries be numbered? - - - - -<xsl:param name="bibliography.numbered" select="0"></xsl:param> - - - -Description - -If non-zero bibliography entries will be numbered - - - - - - - biblioentry.properties - attribute set - - -biblioentry.properties -To set the style for biblioentry. - - - -<xsl:attribute-set name="biblioentry.properties" use-attribute-sets="normal.para.spacing"> - <xsl:attribute name="start-indent">0.5in</xsl:attribute> - <xsl:attribute name="text-indent">-0.5in</xsl:attribute> -</xsl:attribute-set> - - -Description -How do you want biblioentry styled? -Set the font-size, weight, space-above and space-below, indents, etc. to the style required - - - - - -Glossary - - -glossterm.auto.link -boolean - - -glossterm.auto.link -Generate links from glossterm to glossentry automatically? - - - - -<xsl:param name="glossterm.auto.link" select="0"></xsl:param> - - - -Description - -If non-zero, links from inline glossterms to the corresponding -glossentry elements in a glossary or glosslist -will be automatically generated. This is useful when your glossterms are consistent -and you don't want to add links manually. - -The automatic link generation feature is not used on glossterm elements -that have a linkend attribute. - - - - - - -firstterm.only.link -boolean - - -firstterm.only.link -Does automatic glossterm linking only apply to firstterms? - - - - -<xsl:param name="firstterm.only.link" select="0"></xsl:param> - - - -Description - -If non-zero, only firstterms will be automatically linked -to the glossary. If glossary linking is not enabled, this parameter -has no effect. - - - - - - -glossary.collection -string - - -glossary.collection -Name of the glossary collection file - - - - -<xsl:param name="glossary.collection"></xsl:param> - - - -Description - -Glossaries maintained independently across a set of documents -are likely to become inconsistent unless considerable effort is -expended to keep them in sync. It makes much more sense, usually, to -store all of the glossary entries in a single place and simply -extract the ones you need in each document. - -That's the purpose of the -glossary.collection parameter. To setup a global -glossary database, follow these steps: - -Setting Up the Glossary Database - -First, create a stand-alone glossary document that contains all of -the entries that you wish to reference. Make sure that each glossary -entry has an ID. - -Here's an example glossary: - - - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE glossary - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<glossary> -<glossaryinfo> -<editor><firstname>Eric</firstname><surname>Raymond</surname></editor> -<title>Jargon File 4.2.3 (abridged)</title> -<releaseinfo>Just some test data</releaseinfo> -</glossaryinfo> - -<glossdiv><title>0</title> - -<glossentry> -<glossterm>0</glossterm> -<glossdef> -<para>Numeric zero, as opposed to the letter `O' (the 15th letter of -the English alphabet). In their unmodified forms they look a lot -alike, and various kluges invented to make them visually distinct have -compounded the confusion. If your zero is center-dotted and letter-O -is not, or if letter-O looks almost rectangular but zero looks more -like an American football stood on end (or the reverse), you're -probably looking at a modern character display (though the dotted zero -seems to have originated as an option on IBM 3270 controllers). If -your zero is slashed but letter-O is not, you're probably looking at -an old-style ASCII graphic set descended from the default typewheel on -the venerable ASR-33 Teletype (Scandinavians, for whom /O is a letter, -curse this arrangement). (Interestingly, the slashed zero long -predates computers; Florian Cajori's monumental "A History of -Mathematical Notations" notes that it was used in the twelfth and -thirteenth centuries.) If letter-O has a slash across it and the zero -does not, your display is tuned for a very old convention used at IBM -and a few other early mainframe makers (Scandinavians curse <emphasis>this</emphasis> -arrangement even more, because it means two of their letters collide). -Some Burroughs/Unisys equipment displays a zero with a <emphasis>reversed</emphasis> -slash. Old CDC computers rendered letter O as an unbroken oval and 0 -as an oval broken at upper right and lower left. And yet another -convention common on early line printers left zero unornamented but -added a tail or hook to the letter-O so that it resembled an inverted -Q or cursive capital letter-O (this was endorsed by a draft ANSI -standard for how to draw ASCII characters, but the final standard -changed the distinguisher to a tick-mark in the upper-left corner). -Are we sufficiently confused yet?</para> -</glossdef> -</glossentry> - -<glossentry> -<glossterm>1TBS</glossterm> -<glossdef> -<para role="accidence"> -<phrase role="pronounce"></phrase> -<phrase role="partsofspeach">n</phrase> -</para> -<para>The "One True Brace Style"</para> -<glossseealso>indent style</glossseealso> -</glossdef> -</glossentry> - -<!-- ... --> - -</glossdiv> - -<!-- ... --> - -</glossary> - - - - -Marking Up Glossary Terms - -That takes care of the glossary database, now you have to get the entries -into your document. Unlike bibliography entries, which can be empty, creating -placeholder glossary entries would be very tedious. So instead, -support for glossary.collection relies on implicit linking. - -In your source document, simply use firstterm and -glossterm to identify the terms you wish to have included -in the glossary. The stylesheets assume that you will either set the -baseform attribute correctly, or that the -content of the element exactly matches a term in your glossary. - -If you're using a glossary.collection, don't -make explicit links on the terms in your document. - -So, in your document, you might write things like this: - - -<para>This is dummy text, without any real meaning. -The point is simply to reference glossary terms like <glossterm>0</glossterm> -and the <firstterm baseform="1TBS">One True Brace Style (1TBS)</firstterm>. -The <glossterm>1TBS</glossterm>, as you can probably imagine, is a nearly -religious issue.</para> - - -If you set the firstterm.only.link parameter, -only the terms marked with firstterm will be links. -Otherwise, all the terms will be linked. - - - -Marking Up the Glossary - -The glossary itself has to be identified for the stylesheets. For lack -of a better choice, the role is used. -To identify the glossary as the target for automatic processing, set -the role to auto. The title of this -glossary (and any other information from the glossaryinfo -that's rendered by your stylesheet) will be displayed, but the entries will -come from the database. - - -Unfortunately, the glossary can't be empty, so you must put in -at least one glossentry. The content of this entry -is irrelevant, it will not be rendered: - - -<glossary role="auto"> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - -What about glossary divisions? If your glossary database has glossary -divisions and your automatic glossary contains at least -one glossdiv, the automic glossary will have divisions. -If the glossdiv is missing from either location, no divisions -will be rendered. - -Glossary entries (and divisions, if appropriate) in the glossary will -occur in precisely the order they occur in your database. - - - -Formatting the Document - -Finally, when you are ready to format your document, simply set the -glossary.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global glossary. - -The stylesheets will format the glossary in your document as if -all of the entries implicilty referenced appeared there literally. - - -Limitations - -Glossary cross-references within the glossary are -not supported. For example, this will not work: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - -If you put glossary cross-references in your glossary that way, -you'll get the cryptic error: Warning: -glossary.collection specified, but there are 0 automatic -glossaries. - -Instead, you must do two things: - - - -Markup your glossary using glossseealso: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - - - -Make sure there is at least one glossterm reference to -gloss-2 in your document. The -easiest way to do that is probably within a remark in your -automatic glossary: - - -<glossary role="auto"> -<remark>Make sure there's a reference to <glossterm>gloss-2</glossterm>.</remark> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - - - - - - - - - -glossary.as.blocks -boolean - - -glossary.as.blocks -Present glossarys using blocks instead of lists? - - - - -<xsl:param name="glossary.as.blocks" select="0"></xsl:param> - - - -Description - -If non-zero, glossarys will be formatted as -blocks. - -If you have long glossterms, proper list -markup in the FO case may produce unattractive lists. By setting this -parameter, you can force the stylesheets to produce block markup -instead of proper lists. - -You can override this setting with a processing instruction as the -child of glossary: dbfo -glossary-presentation="blocks" or dbfo -glossary-presentation="list" - - - - - - -glosslist.as.blocks -boolean - - -glosslist.as.blocks -Use blocks for glosslists? - - - - -<xsl:param name="glosslist.as.blocks" select="0"></xsl:param> - - - -Description - -See glossary.as.blocks. - - - - - - -glossentry.list.item.properties -attribute set - - -glossentry.list.item.properties -To add properties to each glossentry in a list. - - - -<xsl:attribute-set name="glossentry.list.item.properties"> - <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-set> - - -Description -These properties are added to the fo:list-item containing a -glossentry in a glossary when the glossary.as.blocks parameter -is zero. -Use this attribute-set to set -spacing between entries, for example. - - - - - - -glossterm.block.properties -attribute set - - -glossterm.block.properties -To add properties to the block of a glossentry's glossterm. - - - -<xsl:attribute-set name="glossterm.block.properties"> - <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="keep-with-next.within-column">always</xsl:attribute> - <xsl:attribute name="keep-together.within-column">always</xsl:attribute> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -glossary term in a glossary when the glossary.as.blocks parameter -is non-zero. -Use this attribute-set to set the space above and below, -font properties, -and any indent for the glossary term. - - - - - - -glossdef.block.properties -attribute set - - -glossdef.block.properties -To add properties to the block of a glossary definition. - - - -<xsl:attribute-set name="glossdef.block.properties"> - <xsl:attribute name="margin-{$direction.align.start}">.25in</xsl:attribute> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -glossary definition in a glossary when -the glossary.as.blocks parameter -is non-zero. -Use this attribute-set to set the space above and below, -any font properties, -and any indent for the glossary definition. - - - - - - -glossterm.list.properties -attribute set - - -glossterm.list.properties -To add properties to the glossterm in a list. - - - - -<xsl:attribute-set name="glossterm.list.properties"> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -glossary term in a glossary when the glossary.as.blocks parameter -is zero. -Use this attribute-set to set -font properties, for example. - - - - - - -glossdef.list.properties -attribute set - - -glossdef.list.properties -To add properties to the glossary definition in a list. - - - - -<xsl:attribute-set name="glossdef.list.properties"> -</xsl:attribute-set> - - -Description -These properties are added to the block containing a -glossary definition in a glossary when -the glossary.as.blocks parameter -is zero. -Use this attribute-set to set font properties, for example. - - - - - - -glossterm.width -length - - -glossterm.width -Width of glossterm in list presentation mode - - - - -<xsl:param name="glossterm.width">2in</xsl:param> - - - -Description - -This parameter specifies the width reserved for glossary terms when -a list presentation is used. - - - - - - -glossterm.separation -length - - -glossterm.separation -Separation between glossary terms and descriptions in list mode - - - - -<xsl:param name="glossterm.separation">0.25in</xsl:param> - - - -Description - -Specifies the miminum horizontal -separation between glossary terms and descriptions when -they are presented side-by-side using lists -when the glossary.as.blocks -is zero. - - - - - - -glossentry.show.acronym -list -no -yes -primary - - -glossentry.show.acronym -Display glossentry acronyms? - - - - -<xsl:param name="glossentry.show.acronym">no</xsl:param> - - - -Description - -A setting of yes means they should be displayed; -no means they shouldn't. If primary is used, -then they are shown as the primary text for the entry. - - -This setting controls both acronym and -abbrev elements in the glossentry. - - - - - - - -glossary.sort -boolean - - -glossary.sort -Sort glossentry elements? - - - - -<xsl:param name="glossary.sort" select="0"></xsl:param> - - - -Description - -If non-zero, then the glossentry elements within a -glossary, glossdiv, or glosslist are sorted on the glossterm, using -the current lang setting. If zero (the default), then -glossentry elements are not sorted and are presented -in document order. - - - - - - -Miscellaneous - - -formal.procedures -boolean - - -formal.procedures -Selects formal or informal procedures - - - - -<xsl:param name="formal.procedures" select="1"></xsl:param> - - - -Description - -Formal procedures are numbered and always have a title. - - - - - - - -formal.title.placement -table - - -formal.title.placement -Specifies where formal object titles should occur - - - - -<xsl:param name="formal.title.placement"> -figure before -example before -equation before -table before -procedure before -task before -</xsl:param> - - - -Description - -Specifies where formal object titles should occur. For each formal object -type (figure, -example, -equation, -table, and procedure) -you can specify either the keyword -before or -after. - - - - - - -runinhead.default.title.end.punct -string - - -runinhead.default.title.end.punct -Default punctuation character on a run-in-head - - - -<xsl:param name="runinhead.default.title.end.punct">.</xsl:param> - - - -Description - -If non-zero, For a formalpara, use the specified -string as the separator between the title and following text. The period is the default value. - - - - - - -runinhead.title.end.punct -string - - -runinhead.title.end.punct -Characters that count as punctuation on a run-in-head - - - - -<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param> - - - -Description - -Specify which characters are to be counted as punctuation. These -characters are checked for a match with the last character of the -title. If no match is found, the -runinhead.default.title.end.punct contents are -inserted. This is to avoid duplicated punctuation in the output. - - - - - - - -show.comments -boolean - - -show.comments -Display remark elements? - - - - -<xsl:param name="show.comments" select="1"></xsl:param> - - - -Description - -If non-zero, comments will be displayed, otherwise they -are suppressed. Comments here refers to the remark element -(which was called comment prior to DocBook -4.0), not XML comments (<-- like this -->) which are -unavailable. - - - - - - - -punct.honorific -string - - -punct.honorific -Punctuation after an honorific in a personal name. - - - - -<xsl:param name="punct.honorific">.</xsl:param> - - - -Description - -This parameter specifies the punctuation that should be added after an -honorific in a personal name. - - - - - - -segmentedlist.as.table -boolean - - -segmentedlist.as.table -Format segmented lists as tables? - - - - -<xsl:param name="segmentedlist.as.table" select="0"></xsl:param> - - - -Description - -If non-zero, segmentedlists will be formatted as -tables. - - - - - - -variablelist.as.blocks -boolean - - -variablelist.as.blocks -Format variablelists lists as blocks? - - - - -<xsl:param name="variablelist.as.blocks" select="0"></xsl:param> - - - -Description - -If non-zero, variablelists will be formatted as -blocks. - -If you have long terms, proper list markup in the FO case may produce -unattractive lists. By setting this parameter, you can force the stylesheets -to produce block markup instead of proper lists. - -You can override this setting with a processing instruction as the -child of variablelist: dbfo -list-presentation="blocks" or dbfo -list-presentation="list". - -When using list-presentation="list", -you can also control the amount of space used for the terms with -the dbfo term-width=".25in" processing instruction, -the termlength attribute on variablelist, -or allow the stylesheets to attempt to calculate the amount of space to leave based on the -number of letters in the longest term. - - - <variablelist> - <?dbfo list-presentation="list"?> - <?dbfo term-width="1.5in"?> - <?dbhtml list-presentation="table"?> - <?dbhtml term-width="1.5in"?> - <varlistentry> - <term>list</term> - <listitem> - <para> - Formatted as a list even if variablelist.as.blocks is set to 1. - </para> - </listitem> - </varlistentry> - </variablelist> - - - - - - - - - blockquote.properties - attribute set - - -blockquote.properties -To set the style for block quotations. - - - - -<xsl:attribute-set name="blockquote.properties"> -<xsl:attribute name="margin-{$direction.align.start}">0.5in</xsl:attribute> -<xsl:attribute name="margin-{$direction.align.end}">0.5in</xsl:attribute> -<xsl:attribute name="space-after.minimum">0.5em</xsl:attribute> -<xsl:attribute name="space-after.optimum">1em</xsl:attribute> -<xsl:attribute name="space-after.maximum">2em</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The blockquote.properties attribute set specifies -the formating properties of block quotations. - - - - - - -ulink.show -boolean - - -ulink.show -Display URLs after ulinks? - - - - -<xsl:param name="ulink.show" select="1"></xsl:param> - - - -Description - -If non-zero, the URL of each ulink will -appear after the text of the link. If the text of the link and the URL -are identical, the URL is suppressed. - -See also ulink.footnotes. - -DocBook 5 does not have an ulink element. When processing -DocBoook 5 documents, ulink.show applies to all inline -elements that are marked up with xlink:href attributes -that point to external resources. - - - - - - - -ulink.footnotes -boolean - - -ulink.footnotes -Generate footnotes for ulinks? - - - - -<xsl:param name="ulink.footnotes" select="0"></xsl:param> - - - -Description - -If non-zero, and if ulink.show also is non-zero, -the URL of each ulink will appear as a footnote. - -DocBook 5 does not have an ulink element. When processing -DocBoook 5 documents, ulink.footnotes applies to all inline -elements that are marked up with xlink:href attributes -that point to external resources. - - - - - - - -ulink.hyphenate -string - - -ulink.hyphenate -Allow URLs to be automatically hyphenated - - - - -<xsl:param name="ulink.hyphenate"></xsl:param> - - - -Description - -If not empty, the specified character (or more generally, content) is -added to URLs after every character included in the string -in the ulink.hyphenate.chars parameter (default -is /). If the character in this parameter is a -Unicode soft hyphen (0x00AD) or Unicode zero-width space (0x200B), some FO -processors will be able to reasonably hyphenate long URLs. - -As of 28 Jan 2002, discretionary hyphens are more widely and correctly -supported than zero-width spaces for this purpose. - - - - - - -ulink.hyphenate.chars -string - - -ulink.hyphenate.chars -List of characters to allow ulink URLs to be automatically hyphenated on - - - - -<xsl:param name="ulink.hyphenate.chars">/</xsl:param> - - - -Description - -If the ulink.hyphenate is not empty, then -hyphenation of ulinks is turned on, and any -character contained in this parameter is treated as an allowable -hyphenation point. - -The default value is /, but the parameter -could be customized -to contain other URL characters, as for example: - -<xsl:param name="ulink.hyphenate.chars">:/@&?.#</xsl:param> - - - - - - - -shade.verbatim -boolean - - -shade.verbatim -Should verbatim environments be shaded? - - - -<xsl:param name="shade.verbatim" select="0"></xsl:param> - - -Description - -In the FO stylesheet, if this parameter is non-zero then the -shade.verbatim.style properties will be applied -to verbatim environments. - -In the HTML stylesheet, this parameter is now deprecated. Use -CSS instead. - - - - - - -shade.verbatim.style -attribute set - - -shade.verbatim.style -Properties that specify the style of shaded verbatim listings - - - - - -<xsl:attribute-set name="shade.verbatim.style"> - <xsl:attribute name="background-color">#E0E0E0</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties that specify the style of shaded verbatim listings. The -parameters specified (the border and background color) are added to -the styling of the xsl-fo output. A border might be specified as "thin -black solid" for example. See xsl-fo - - - - - - -hyphenate.verbatim -boolean - - -hyphenate.verbatim -Should verbatim environments be hyphenated on space characters? - - - -<xsl:param name="hyphenate.verbatim" select="0"></xsl:param> - - -Description - -If the lines of program listing are too long to fit into one -line it is quite common to split them at space and indicite by hook -arrow that code continues on the next line. You can turn on this -behaviour for programlisting, -screen and synopsis elements by -using this parameter. - -Note that you must also enable line wrapping for verbatim environments and -select appropriate hyphenation character (e.g. hook arrow). This can -be done using monospace.verbatim.properties -attribute set: - -<xsl:attribute-set name="monospace.verbatim.properties" - use-attribute-sets="verbatim.properties monospace.properties"> - <xsl:attribute name="wrap-option">wrap</xsl:attribute> - <xsl:attribute name="hyphenation-character">&#x25BA;</xsl:attribute> -</xsl:attribute-set> - -For a list of arrows available in Unicode see http://www.unicode.org/charts/PDF/U2190.pdf and http://www.unicode.org/charts/PDF/U2900.pdf and make sure that -selected character is available in the font you are using for verbatim -environments. - - - - - - -hyphenate.verbatim.characters -string - - -hyphenate.verbatim.characters -List of characters after which a line break can occur in listings - - - - -<xsl:param name="hyphenate.verbatim.characters"></xsl:param> - - - -Description - -If you enable hyphenate.verbatim line -breaks are allowed only on space characters. If this is not enough for -your document, you can specify list of additional characters after -which line break is allowed in this parameter. - - - - - - -use.svg -boolean - - -use.svg -Allow SVG in the result tree? - - - - -<xsl:param name="use.svg" select="1"></xsl:param> - - - -Description - -If non-zero, SVG will be considered an acceptable image format. SVG -is passed through to the result tree, so correct rendering of the resulting -diagram depends on the formatter (FO processor or web browser) that is used -to process the output from the stylesheet. - - - - - - -use.role.as.xrefstyle -boolean - - -use.role.as.xrefstyle -Use role attribute for -xrefstyle on xref? - - - - -<xsl:param name="use.role.as.xrefstyle" select="1"></xsl:param> - - - -Description - -In DocBook documents that conform to a schema older than V4.3, this parameter allows -role to serve the purpose of specifying the cross reference style. - -If non-zero, the role attribute on -xref will be used to select the cross reference style. -In DocBook V4.3, the xrefstyle attribute was added for this purpose. -If the xrefstyle attribute is present, -role will be ignored, regardless of the setting -of this parameter. - - - -Example - -The following small stylesheet shows how to configure the -stylesheets to make use of the cross reference style: - -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - -<xsl:import href="../xsl/html/docbook.xsl"/> - -<xsl:output method="html"/> - -<xsl:param name="local.l10n.xml" select="document('')"/> -<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> - <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en"> - <l:context name="xref"> - <l:template name="chapter" style="title" text="Chapter %n, %t"/> - <l:template name="chapter" text="Chapter %n"/> - </l:context> - </l:l10n> -</l:i18n> - -</xsl:stylesheet> - -With this stylesheet, the cross references in the following document: - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> -<book id="book"><title>Book</title> - -<preface> -<title>Preface</title> - -<para>Normal: <xref linkend="ch1"/>.</para> -<para>Title: <xref xrefstyle="title" linkend="ch1"/>.</para> - -</preface> - -<chapter id="ch1"> -<title>First Chapter</title> - -<para>Irrelevant.</para> - -</chapter> -</book> - -will appear as: - - -Normal: Chapter 1. -Title: Chapter 1, First Chapter. - - - - - - - -menuchoice.separator -string - - -menuchoice.separator -Separator between items of a menuchoice -other than guimenuitem and -guisubmenu - - - - -<xsl:param name="menuchoice.separator">+</xsl:param> - - - -Description - -Separator used to connect items of a menuchoice other -than guimenuitem and guisubmenu. The latter -elements are linked with menuchoice.menu.separator. - - - - - - - -menuchoice.menu.separator -string - - -menuchoice.menu.separator -Separator between items of a menuchoice -with guimenuitem or -guisubmenu - - - - -<xsl:param name="menuchoice.menu.separator"> → </xsl:param> - - - -Description - -Separator used to connect items of a menuchoice with -guimenuitem or guisubmenu. Other elements -are linked with menuchoice.separator. - -The default value is &#x2192;, which is the -&rarr; (right arrow) character entity. -The current FOP (0.20.5) requires setting the font-family -explicitly. - -The default value also includes spaces around the arrow, -which will allow a line to break. Replace the spaces with -&#xA0; (nonbreaking space) if you don't want those -spaces to break. - - - - - - - -default.float.class -string - - -default.float.class -Specifies the default float class - - - - -<xsl:param name="default.float.class"> - <xsl:choose> - <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when> - <xsl:otherwise>before</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -Selects the direction in which a float should be placed. for -xsl-fo this is before, for html it is left. For Western texts, the -before direction is the top of the page. - - - - - - -footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -footnote.number.format -Identifies the format used for footnote numbers - - - - -<xsl:param name="footnote.number.format">1</xsl:param> - - - -Description - -The footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A). - - - - - - -table.footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -table.footnote.number.format -Identifies the format used for footnote numbers in tables - - - - -<xsl:param name="table.footnote.number.format">a</xsl:param> - - - -Description - -The table.footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A) in tables. - - - - - - -footnote.number.symbols - - - -footnote.number.symbols -Special characters to use as footnote markers - - - - -<xsl:param name="footnote.number.symbols"></xsl:param> - - - -Description - -If footnote.number.symbols is not the empty string, -footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, , , -, and . If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - - - - -table.footnote.number.symbols -string - - -table.footnote.number.symbols -Special characters to use a footnote markers in tables - - - - -<xsl:param name="table.footnote.number.symbols"></xsl:param> - - - -Description - -If table.footnote.number.symbols is not the empty string, -table footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, , , -, and . If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -table.footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - - - - -footnote.properties -attribute set - - -footnote.properties -Properties applied to each footnote body - - - - - -<xsl:attribute-set name="footnote.properties"> - <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"></xsl:value-of></xsl:attribute> - <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"></xsl:value-of></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:value-of></xsl:attribute> - <xsl:attribute name="start-indent">0pt</xsl:attribute> - <xsl:attribute name="text-indent">0pt</xsl:attribute> - <xsl:attribute name="hyphenate"><xsl:value-of select="$hyphenate"></xsl:value-of></xsl:attribute> - <xsl:attribute name="wrap-option">wrap</xsl:attribute> - <xsl:attribute name="linefeed-treatment">treat-as-space</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the footnote-block -for each footnote. -It can be used to set the -font-size, font-family, and other inheritable properties that will be -applied to all footnotes. - - - - - - -table.footnote.properties -attribute set - - -table.footnote.properties -Properties applied to each table footnote body - - - - - -<xsl:attribute-set name="table.footnote.properties"> - <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"></xsl:value-of></xsl:attribute> - <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"></xsl:value-of></xsl:attribute> - <xsl:attribute name="font-weight">normal</xsl:attribute> - <xsl:attribute name="font-style">normal</xsl:attribute> - <xsl:attribute name="space-before">2pt</xsl:attribute> - <xsl:attribute name="text-align"><xsl:value-of select="$alignment"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the footnote-block -for each table footnote. -It can be used to set the -font-size, font-family, and other inheritable properties that will be -applied to all table footnotes. - - - - - - -footnote.mark.properties -attribute set - - -footnote.mark.properties -Properties applied to each footnote mark - - - - - -<xsl:attribute-set name="footnote.mark.properties"> - <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"></xsl:value-of></xsl:attribute> - <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> - - - -Description - -This attribute set is applied to the footnote mark used -for each footnote. -It should contain only inline properties. - - -The property to make the mark a superscript is contained in the -footnote template itself, because the current version of FOP reports -an error if baseline-shift is used. - - - - - - - -footnote.sep.leader.properties -attribute set - - -footnote.sep.leader.properties -Properties associated with footnote separators - - - - -<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> - - - -Description - -The styling for the rule line that separates the -footnotes from the body text. -These are properties applied to the fo:leader used as -the separator. - -If you want to do more than just set properties on -the leader element, then you can customize the template -named footnote.separator in -fo/pagesetup.xsl. - - - - - - -xref.with.number.and.title -boolean - - -xref.with.number.and.title -Use number and title in cross references - - - - -<xsl:param name="xref.with.number.and.title" select="1"></xsl:param> - - - -Description - -A cross reference may include the number (for example, the number of -an example or figure) and the title which is a required child of some -targets. This parameter inserts both the relevant number as well as -the title into the link. - - - - - - -superscript.properties -attribute set - - -superscript.properties -Properties associated with superscripts - - - - -<xsl:attribute-set name="superscript.properties"> - <xsl:attribute name="font-size">75%</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Specifies styling properties for superscripts. - - - - - - -subscript.properties -attribute set - - -subscript.properties -Properties associated with subscripts - - - - -<xsl:attribute-set name="subscript.properties"> - <xsl:attribute name="font-size">75%</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Specifies styling properties for subscripts. - - - - - - -pgwide.properties -attribute set - - -pgwide.properties -Properties to make a figure or table page wide. - - - - - -<xsl:attribute-set name="pgwide.properties"> - <xsl:attribute name="start-indent">0pt</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is used to set the properties -that make a figure or table "page wide" in fo output. -It comes into effect when an attribute pgwide="1" -is used. - - - -By default, it sets start-indent -to 0pt. -In a stylesheet that sets the parameter -body.start.indent -to a non-zero value in order to indent body text, -this attribute set can be used to outdent pgwide -figures to the start margin. - - -If a document uses a multi-column page layout, -then this attribute set could try setting span -to a value of all. However, this may -not work with some processors because a span property must be on an -fo:block that is a direct child of fo:flow. It may work in -some processors anyway. - - - - - - - -highlight.source -boolean - - -highlight.source -Should the content of programlisting -be syntactically highlighted? - - - - -<xsl:param name="highlight.source" select="0"></xsl:param> - - - -Description - -When this parameter is non-zero, the stylesheets will try to do syntax highlighting of the -content of programlisting elements. You specify the language for each programlisting -by using the language attribute. The highlight.default.language -parameter can be used to specify the language for programlistings without a language -attribute. Syntax highlighting also works for screen and synopsis elements. - -The actual highlighting work is done by the XSLTHL extension module. This is an external Java library that has to be -downloaded separately (see below). - - -In order to use this extension, you must - -add xslthl-2.x.x.jar to your Java classpath. The latest version is available -from the XSLT syntax highlighting project -at SourceForge. - - -use a customization layer in which you import one of the following stylesheet modules: - - - html/highlight.xsl - - - - xhtml/highlight.xsl - - - - xhtml-1_1/highlight.xsl - - - - fo/highlight.xsl - - - - - -let either the xslthl.config Java system property or the -highlight.xslthl.config parameter point to the configuration file for syntax -highlighting (using URL syntax). DocBook XSL comes with a ready-to-use configuration file, -highlighting/xslthl-config.xml. - - - -The extension works with Saxon 6.5.x and Xalan-J. (Saxon 8.5 or later is also supported, but since it is -an XSLT 2.0 processor it is not guaranteed to work with DocBook XSL in all circumstances.) - -The following is an example of a Saxon 6 command adapted for syntax highlighting, to be used on Windows: - - -java -cp c:/Java/saxon.jar;c:/Java/xslthl-2.0.1.jar --Dxslthl.config=file:///c:/docbook-xsl/highlighting/xslthl-config.xml com.icl.saxon.StyleSheet --o test.html test.xml myhtml.xsl - - - - - - - -highlight.xslthl.config -uri - - -highlight.xslthl.config -Location of XSLTHL configuration file - - - - -<xsl:param name="highlight.xslthl.config"></xsl:param> - - - -Description - -This location has precedence over the corresponding Java property. - -Please note that usually you have to specify location as URL not -just as a simple path on the local -filesystem. E.g. file:///home/user/xslthl/my-xslthl-config.xml. - - - - - - - - -highlight.default.language -string - - -highlight.default.language -Default language of programlisting - - - - -<xsl:param name="highlight.default.language"></xsl:param> - - - -Description - -This language is used when there is no language attribute on programlisting. - - - - - - -email.delimiters.enabled -boolean - - -email.delimiters.enabled -Generate delimiters around email addresses? - - - - -<xsl:param name="email.delimiters.enabled" select="1"></xsl:param> - - - -Description - -If non-zero, delimiters - -For delimiters, the -stylesheets are currently hard-coded to output angle -brackets. - -are generated around e-mail addresses -(the output of the email element). - - - - - - -email.mailto.enabled -boolean - - -email.mailto.enabled -Generate mailto: links for email addresses? - - - - -<xsl:param name="email.mailto.enabled" select="0"></xsl:param> - - - -Description - -If non-zero the generated output for the email element -will be a clickable mailto: link that brings up the default mail client -on the system. - - - - - - -section.container.element -list -block -wrapper - - -section.container.element -Select XSL-FO element name to contain sections - - - - -<xsl:param name="section.container.element">block</xsl:param> - - - -Description - -Selects the element name for outer container of -each section. The choices are block (default) -or wrapper. -The fo: namespace prefix is added -by the stylesheet to form the full element name. - - -This element receives the section id -attribute and the appropriate section level attribute-set. - - -Changing this parameter to wrapper -is only necessary when producing multi-column output -that contains page-wide spans. Using fo:wrapper -avoids the nesting of fo:block -elements that prevents spans from working (the standard says -a span must be on a block that is a direct child of -fo:flow). - - -If set to wrapper, the -section attribute-sets only support properties -that are inheritable. That's because there is no -block to apply them to. Properties such as -font-family are inheritable, but properties such as -border are not. - - -Only some XSL-FO processors need to use this parameter. -The Antenna House processor, for example, will handle -spans in nested blocks without changing the element name. -The RenderX XEP product and FOP follow the XSL-FO standard -and need to use wrapper. - - - - - - - -monospace.verbatim.font.width -length - - -monospace.verbatim.font.width -Width of a single monospace font character - - - - -<xsl:param name="monospace.verbatim.font.width">0.60em</xsl:param> - - - -Description - -Specifies with em units the width of a single character -of the monospace font. The default value is 0.6em. - -This parameter is only used when a screen -or programlisting element has a -width attribute, which is -expressed as a plain integer to indicate the maximum character count -of each line. -To convert this character count to an actual maximum width -measurement, the width of the font characters must be provided. -Different monospace fonts have different character width, -so this parameter should be adjusted to fit the -monospace font being used. - - - - - - - -exsl.node.set.available -boolean - - -exsl.node.set.available -Is the test function-available('exsl:node-set') true? - - - -<xsl:param name="exsl.node.set.available"> - <xsl:choose> - <xsl:when exsl:foo="" test="function-available('exsl:node-set') or contains(system-property('xsl:vendor'), 'Apache Software Foundation')">1</xsl:when> - <xsl:otherwise>0</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -If non-zero, -then the exsl:node-set() function is available to be used in -the stylesheet. -If zero, then the function is not available. -This param automatically detects the presence of -the function and does not normally need to be set manually. - -This param was created to handle a long-standing -bug in the Xalan processor that fails to detect the -function even though it is available. - - - - - - -bookmarks.collapse -boolean - - -bookmarks.collapse -Specifies the initial state of bookmarks - - - - -<xsl:param name="bookmarks.collapse" select="1"></xsl:param> - - - -Description - -If non-zero, the bookmark tree is collapsed so that only the -top-level bookmarks are displayed initially. Otherwise, the whole tree -of bookmarks is displayed. - -This parameter currently works with FOP 0.93 or later. - - - - - -Graphics - - -graphic.default.extension -string - - -graphic.default.extension -Default extension for graphic filenames - - - -<xsl:param name="graphic.default.extension"></xsl:param> - - -Description - -If a graphic or mediaobject -includes a reference to a filename that does not include an extension, -and the format attribute is -unspecified, the default extension will be used. - - - - - - - -default.image.width -length - - -default.image.width -The default width of images - - - - -<xsl:param name="default.image.width"></xsl:param> - - - -Description - -If specified, this value will be used for the -width attribute on images that do not specify any -viewport dimensions. - - - - - - -preferred.mediaobject.role -string - - -preferred.mediaobject.role -Select which mediaobject to use based on -this value of an object's role attribute. - - - - - -<xsl:param name="preferred.mediaobject.role"></xsl:param> - - - -Description - -A mediaobject may contain several objects such as imageobjects. -If the parameter use.role.for.mediaobject is -non-zero, then the role attribute on -imageobjects and other objects within a -mediaobject container will be used to select which object -will be used. If one of the objects has a role value that matches the -preferred.mediaobject.role parameter, then it -has first priority for selection. If more than one has such a role -value, the first one is used. - - -See the use.role.for.mediaobject parameter -for the sequence of selection. - - - - - -use.role.for.mediaobject -boolean - - -use.role.for.mediaobject -Use role attribute -value for selecting which of several objects within a mediaobject to use. - - - - - -<xsl:param name="use.role.for.mediaobject" select="1"></xsl:param> - - - -Description - -If non-zero, the role attribute on -imageobjects or other objects within a mediaobject container will be used to select which object will be -used. - - -The order of selection when then parameter is non-zero is: - - - - If the stylesheet parameter preferred.mediaobject.role has a value, then the object whose role equals that value is selected. - - -Else if an object's role attribute has a value of -html for HTML processing or -fo for FO output, then the first -of such objects is selected. - - - -Else the first suitable object is selected. - - - -If the value of -use.role.for.mediaobject -is zero, then role attributes are not considered -and the first suitable object -with or without a role value is used. - - - - - - -ignore.image.scaling -boolean - - -ignore.image.scaling -Tell the stylesheets to ignore the author's image scaling attributes - - - - -<xsl:param name="ignore.image.scaling" select="0"></xsl:param> - - - -Description - -If non-zero, the scaling attributes on graphics and media objects are -ignored. - - - - - - -img.src.path -string - - -img.src.path -Path to HTML/FO image files - - - -<xsl:param name="img.src.path"></xsl:param> - - -Description - -Add a path prefix to the value of the fileref -attribute of graphic, inlinegraphic, and imagedata elements. The resulting -compound path is used in the output as the value of the src -attribute of img (HTML) or external-graphic (FO). - - - -The path given by img.src.path could be relative to the directory where the HTML/FO -files are created, or it could be an absolute URI. -The default value is empty. -Be sure to include a trailing slash if needed. - - -This prefix is not applied to any filerefs that start -with "/" or contain "//:". - - - - - - - -keep.relative.image.uris -boolean - - -keep.relative.image.uris -Should image URIs be resolved against xml:base? - - - - - -<xsl:param name="keep.relative.image.uris" select="0"></xsl:param> - - - -Description - -If non-zero, relative URIs (in, for example -fileref attributes) will be used in the generated -output. Otherwise, the URIs will be made absolute with respect to the -base URI. - -Note that the stylesheets calculate (and use) the absolute form -for some purposes, this only applies to the resulting output. - - - - - -Pagination and General Styles - -
    Understanding XSL FO Margins - -To make sense of the parameters in this section, it's useful to -consider . - -
    - Page Model - - - - - - - - Figure showing page margins - - This figure shows the physical page with the various FO page regions - identified. - - -
    - -First, let's consider the regions on the page. - -The white region is the physical page. Its dimensions are determined by -the page.height and page.width -parameters. - -The yellow region is the region-body. The size and placement of -the region body is constrained by the dimensions labelled in the -figure. - -The pink region at the top of the page is the region-before. The -darker area inside the region-before is the header text. In XSL, the default -display alignment for a region is before, but the -DocBook stylesheets still explicitly make it before. That's -why the darker area is at the top. - -The pink region at the bottom of the page is the region-after. -The darker area is the footer text. In XSL, the default display -alignment for a region is before, -but the DocBook stylesheets explicitly make it -after. That's why the darker area is at the bottom. - -The dimensions in the figure are: - - -The page-master margin-top. - -The region-before extent. - -The region-body margin-top. - -The region-after extent. - -The page-master margin-bottom. - -The region-body margin-bottom. - -The sum of the page-master margin-left and the -region-body margin-left. In DocBook, the region-body margin-left is -zero by default, so this is simply the page-master margin-left. - -The sum of the page-master margin-right and the -region-body margin-right. In DocBook, the region-body margin-right is -zero by default, so this is simply the page-master margin-right. - - - -
    -
    - - - -page.height -length - - -page.height -The height of the physical page - - - -<xsl:param name="page.height"> - <xsl:choose> - <xsl:when test="$page.orientation = 'portrait'"> - <xsl:value-of select="$page.height.portrait"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$page.width.portrait"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The page height is generally calculated from the -paper.type and -page.orientation parameters. - - - - - - - -page.height.portrait -length - - -page.height.portrait -Specify the physical size of the long edge of the page - - - -<xsl:param name="page.height.portrait"> - <xsl:choose> - <xsl:when test="$paper.type = 'A4landscape'">210mm</xsl:when> - <xsl:when test="$paper.type = 'USletter'">11in</xsl:when> - <xsl:when test="$paper.type = 'USlandscape'">8.5in</xsl:when> - <xsl:when test="$paper.type = '4A0'">2378mm</xsl:when> - <xsl:when test="$paper.type = '2A0'">1682mm</xsl:when> - <xsl:when test="$paper.type = 'A0'">1189mm</xsl:when> - <xsl:when test="$paper.type = 'A1'">841mm</xsl:when> - <xsl:when test="$paper.type = 'A2'">594mm</xsl:when> - <xsl:when test="$paper.type = 'A3'">420mm</xsl:when> - <xsl:when test="$paper.type = 'A4'">297mm</xsl:when> - <xsl:when test="$paper.type = 'A5'">210mm</xsl:when> - <xsl:when test="$paper.type = 'A6'">148mm</xsl:when> - <xsl:when test="$paper.type = 'A7'">105mm</xsl:when> - <xsl:when test="$paper.type = 'A8'">74mm</xsl:when> - <xsl:when test="$paper.type = 'A9'">52mm</xsl:when> - <xsl:when test="$paper.type = 'A10'">37mm</xsl:when> - <xsl:when test="$paper.type = 'B0'">1414mm</xsl:when> - <xsl:when test="$paper.type = 'B1'">1000mm</xsl:when> - <xsl:when test="$paper.type = 'B2'">707mm</xsl:when> - <xsl:when test="$paper.type = 'B3'">500mm</xsl:when> - <xsl:when test="$paper.type = 'B4'">353mm</xsl:when> - <xsl:when test="$paper.type = 'B5'">250mm</xsl:when> - <xsl:when test="$paper.type = 'B6'">176mm</xsl:when> - <xsl:when test="$paper.type = 'B7'">125mm</xsl:when> - <xsl:when test="$paper.type = 'B8'">88mm</xsl:when> - <xsl:when test="$paper.type = 'B9'">62mm</xsl:when> - <xsl:when test="$paper.type = 'B10'">44mm</xsl:when> - <xsl:when test="$paper.type = 'C0'">1297mm</xsl:when> - <xsl:when test="$paper.type = 'C1'">917mm</xsl:when> - <xsl:when test="$paper.type = 'C2'">648mm</xsl:when> - <xsl:when test="$paper.type = 'C3'">458mm</xsl:when> - <xsl:when test="$paper.type = 'C4'">324mm</xsl:when> - <xsl:when test="$paper.type = 'C5'">229mm</xsl:when> - <xsl:when test="$paper.type = 'C6'">162mm</xsl:when> - <xsl:when test="$paper.type = 'C7'">114mm</xsl:when> - <xsl:when test="$paper.type = 'C8'">81mm</xsl:when> - <xsl:when test="$paper.type = 'C9'">57mm</xsl:when> - <xsl:when test="$paper.type = 'C10'">40mm</xsl:when> - <xsl:otherwise>11in</xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The portrait page height is the length of the long -edge of the physical page. - - - - - - - -page.margin.bottom -length - - -page.margin.bottom -The bottom margin of the page - - - - -<xsl:param name="page.margin.bottom">0.5in</xsl:param> - - - -Description - -The bottom page margin is the distance from the bottom of the region-after -to the physical bottom of the page. - - - - - - - -page.margin.inner -length - - -page.margin.inner -The inner page margin - - - -<xsl:param name="page.margin.inner"> - <xsl:choose> - <xsl:when test="$double.sided != 0">1.25in</xsl:when> - <xsl:otherwise>1in</xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The inner page margin is the distance from bound edge of the -page to the first column of text. - -The inner page margin is the distance from bound edge of the -page to the outer edge of the first column of text. - -In left-to-right text direction, -this is the left margin of recto (front side) pages. -For single-sided output, it is the left margin -of all pages. - -In right-to-left text direction, -this is the right margin of recto pages. -For single-sided output, this is the -right margin of all pages. - - -Current versions (at least as of version 4.13) -of the XEP XSL-FO processor do not -correctly handle these margin settings for documents -with right-to-left text direction. -The workaround in that situation is to reverse -the values for page.margin.inner -and page.margin.outer, until -this bug is fixed by RenderX. It does not affect documents -with left-to-right text direction. - - - - - - - -page.margin.outer -length - - -page.margin.outer -The outer page margin - - - -<xsl:param name="page.margin.outer"> - <xsl:choose> - <xsl:when test="$double.sided != 0">0.75in</xsl:when> - <xsl:otherwise>1in</xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The outer page margin is the distance from non-bound edge of the -page to the outer edge of the last column of text. - -In left-to-right text direction, -this is the right margin of recto (front side) pages. -For single-sided output, it is the right margin -of all pages. - -In right-to-left text direction, -this is the left margin of recto pages. -For single-sided output, this is the -left margin of all pages. - - -Current versions (at least as of version 4.13) -of the XEP XSL-FO processor do not -correctly handle these margin settings for documents -with right-to-left text direction. -The workaround in that situation is to reverse -the values for page.margin.inner -and page.margin.outer, until -this bug is fixed by RenderX. It does not affect documents -with left-to-right text direction. - - - - - - - -page.margin.top -length - - -page.margin.top -The top margin of the page - - - - -<xsl:param name="page.margin.top">0.5in</xsl:param> - - - -Description - -The top page margin is the distance from the physical top of the -page to the top of the region-before. - - - - - - -page.orientation -list -portrait -landscape - - -page.orientation -Select the page orientation - - - - -<xsl:param name="page.orientation">portrait</xsl:param> - - - -Description - - Select one from portrait or landscape. -In portrait orientation, the short edge is horizontal; in -landscape orientation, it is vertical. - - - - - - - -page.width -length - - -page.width -The width of the physical page - - - -<xsl:param name="page.width"> - <xsl:choose> - <xsl:when test="$page.orientation = 'portrait'"> - <xsl:value-of select="$page.width.portrait"></xsl:value-of> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$page.height.portrait"></xsl:value-of> - </xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The page width is generally calculated from the -paper.type and -page.orientation parameters. - - - - - - -page.width.portrait -length - - -page.width.portrait -Specify the physical size of the short edge of the page - - - -<xsl:param name="page.width.portrait"> - <xsl:choose> - <xsl:when test="$paper.type = 'USletter'">8.5in</xsl:when> - <xsl:when test="$paper.type = '4A0'">1682mm</xsl:when> - <xsl:when test="$paper.type = '2A0'">1189mm</xsl:when> - <xsl:when test="$paper.type = 'A0'">841mm</xsl:when> - <xsl:when test="$paper.type = 'A1'">594mm</xsl:when> - <xsl:when test="$paper.type = 'A2'">420mm</xsl:when> - <xsl:when test="$paper.type = 'A3'">297mm</xsl:when> - <xsl:when test="$paper.type = 'A4'">210mm</xsl:when> - <xsl:when test="$paper.type = 'A5'">148mm</xsl:when> - <xsl:when test="$paper.type = 'A6'">105mm</xsl:when> - <xsl:when test="$paper.type = 'A7'">74mm</xsl:when> - <xsl:when test="$paper.type = 'A8'">52mm</xsl:when> - <xsl:when test="$paper.type = 'A9'">37mm</xsl:when> - <xsl:when test="$paper.type = 'A10'">26mm</xsl:when> - <xsl:when test="$paper.type = 'B0'">1000mm</xsl:when> - <xsl:when test="$paper.type = 'B1'">707mm</xsl:when> - <xsl:when test="$paper.type = 'B2'">500mm</xsl:when> - <xsl:when test="$paper.type = 'B3'">353mm</xsl:when> - <xsl:when test="$paper.type = 'B4'">250mm</xsl:when> - <xsl:when test="$paper.type = 'B5'">176mm</xsl:when> - <xsl:when test="$paper.type = 'B6'">125mm</xsl:when> - <xsl:when test="$paper.type = 'B7'">88mm</xsl:when> - <xsl:when test="$paper.type = 'B8'">62mm</xsl:when> - <xsl:when test="$paper.type = 'B9'">44mm</xsl:when> - <xsl:when test="$paper.type = 'B10'">31mm</xsl:when> - <xsl:when test="$paper.type = 'C0'">917mm</xsl:when> - <xsl:when test="$paper.type = 'C1'">648mm</xsl:when> - <xsl:when test="$paper.type = 'C2'">458mm</xsl:when> - <xsl:when test="$paper.type = 'C3'">324mm</xsl:when> - <xsl:when test="$paper.type = 'C4'">229mm</xsl:when> - <xsl:when test="$paper.type = 'C5'">162mm</xsl:when> - <xsl:when test="$paper.type = 'C6'">114mm</xsl:when> - <xsl:when test="$paper.type = 'C7'">81mm</xsl:when> - <xsl:when test="$paper.type = 'C8'">57mm</xsl:when> - <xsl:when test="$paper.type = 'C9'">40mm</xsl:when> - <xsl:when test="$paper.type = 'C10'">28mm</xsl:when> - <xsl:otherwise>8.5in</xsl:otherwise> - </xsl:choose> -</xsl:param> - - -Description - -The portrait page width is the length of the short -edge of the physical page. - - - - - - - -paper.type -list -open -open -USletter8.5x11in -USlandscape11x8.5in -USlegal8.5inx14in -USlegallandscape14inx8.5in -4A02378x1682mm -2A01682x1189mm -A01189x841mm -A1841x594mm -A2594x420mm -A3420x297mm -A4297x210mm -A5210x148mm -A6148x105mm -A7105x74mm -A874x52mm -A952x37mm -A1037x26mm -B01414x1000mm -B11000x707mm -B2707x500mm -B3500x353mm -B4353x250mm -B5250x176mm -B6176x125mm -B7125x88mm -B888x62mm -B962x44mm -B1044x31mm -C01297x917mm -C1917x648mm -C2648x458mm -C3458x324mm -C4324x229mm -C5229x162mm -C6162x114mm -C7114x81mm -C881x57mm -C957x40mm -C1040x28mm - - -paper.type -Select the paper type - - - - -<xsl:param name="paper.type">USletter</xsl:param> - - - -Description - -The paper type is a convenient way to specify the paper size. -The list of known paper sizes includes USletter and most of the A, -B, and C sizes. See page.width.portrait, for example. - - - - - - - - - -double.sided -boolean - - -double.sided -Is the document to be printed double sided? - - - - -<xsl:param name="double.sided" select="0"></xsl:param> - - - -Description - -Double-sided documents are printed with a slightly wider margin -on the binding edge of the page. - -FIXME: The current set of parameters does not take writing direction -into account. - - - - - - -body.margin.bottom -length - - -body.margin.bottom -The bottom margin of the body text - - - - -<xsl:param name="body.margin.bottom">0.5in</xsl:param> - - - -Description - -The body bottom margin is the distance from the last line of text -in the page body to the bottom of the region-after. - - - - - - - -body.margin.top -length - - -body.margin.top -To specify the size of the top margin of a page - - - - -<xsl:param name="body.margin.top">0.5in</xsl:param> - - - -Description - -The body top margin is the distance from the top of the -region-before to the first line of text in the page body. - - - - - - -body.start.indent -length - - -body.start.indent -The start-indent for the body text - - - - -<xsl:param name="body.start.indent"> - <xsl:choose> - <xsl:when test="$fop.extensions != 0">0pt</xsl:when> - <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when> - <xsl:otherwise>4pc</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -This parameter provides -the means of indenting the body text relative to -section titles. -For left-to-right text direction, it indents the left side. -For right-to-left text direction, it indents the right side. -It is used in place of the -title.margin.left for -all XSL-FO processors except FOP 0.25. -It enables support for side floats to appear -in the indented margin area. - -This start-indent property is added to the fo:flow -for certain page sequences. Which page-sequences it is -applied to is determined by the template named -set.flow.properties. -By default, that template adds it to the flow -for page-sequences using the body -master-reference, as well as appendixes and prefaces. - -If this parameter is used, section titles should have -a start-indent value of 0pt if they are to be -outdented relative to the body text. - - -If you are using FOP, then set this parameter to a zero -width value and set the title.margin.left -parameter to the negative value of the desired indent. - - -See also body.end.indent and -title.margin.left. - - - - - - - -body.end.indent -length - - -body.end.indent -The end-indent for the body text - - - - -<xsl:param name="body.end.indent">0pt</xsl:param> - - - -Description - -This end-indent property is added to the fo:flow -for certain page sequences. Which page-sequences it is -applied to is determined by the template named -set.flow.properties. -By default, that template adds it to the flow -for page-sequences using the body -master-reference, as well as appendixes and prefaces. - - -See also body.start.indent. - - - - - - - -alignment - list - open - left - start - right - end - center - justify - - -alignment -Specify the default text alignment - - - -<xsl:param name="alignment">justify</xsl:param> - - -Description - -The default text alignment is used for most body text. -Allowed values are -left, -right, -start, -end, -center, -justify. -The default value is justify. - - - - - - - -hyphenate -list -closed -true -false - - -hyphenate -Specify hyphenation behavior - - - -<xsl:param name="hyphenate">true</xsl:param> - - -Description - -If true, words may be hyphenated. Otherwise, they may not. - - - - - - - -line-height -string - - -line-height -Specify the line-height property - - - - -<xsl:param name="line-height">normal</xsl:param> - - - -Description - -Sets the line-height property. - - - - - - -column.count.back -integer - - -column.count.back -Number of columns on back matter pages - - - - -<xsl:param name="column.count.back" select="1"></xsl:param> - - - -Description - -Number of columns on back matter (appendix, glossary, etc.) pages. - - - - - - -column.count.body -integer - - -column.count.body -Number of columns on body pages - - - - -<xsl:param name="column.count.body" select="1"></xsl:param> - - - -Description - -Number of columns on body pages. - - - - - - -column.count.front -integer - - -column.count.front -Number of columns on front matter pages - - - - -<xsl:param name="column.count.front" select="1"></xsl:param> - - - -Description - -Number of columns on front matter (dedication, preface, etc.) pages. - - - - - - -column.count.index -integer - - -column.count.index -Number of columns on index pages - - - - -<xsl:param name="column.count.index">2</xsl:param> - - - -Description - -Number of columns on index pages. - - - - - - -column.count.lot -integer - - -column.count.lot -Number of columns on a 'List-of-Titles' page - - - - -<xsl:param name="column.count.lot" select="1"></xsl:param> - - - -Description - -Number of columns on a page sequence containing the Table of Contents, -List of Figures, etc. - - - - - - -column.count.titlepage -integer - - -column.count.titlepage -Number of columns on a title page - - - - -<xsl:param name="column.count.titlepage" select="1"></xsl:param> - - - -Description - -Number of columns on a title page - - - - - - -column.gap.back -length - - -column.gap.back -Gap between columns in back matter - - - - -<xsl:param name="column.gap.back">12pt</xsl:param> - - - -Description - -Specifies the gap between columns in back matter (if -column.count.back is greater than one). - - - - - - -column.gap.body -length - - -column.gap.body -Gap between columns in the body - - - - -<xsl:param name="column.gap.body">12pt</xsl:param> - - - -Description - -Specifies the gap between columns in body matter (if -column.count.body is greater than one). - - - - - - -column.gap.front -length - - -column.gap.front -Gap between columns in the front matter - - - - -<xsl:param name="column.gap.front">12pt</xsl:param> - - - -Description - -Specifies the gap between columns in front matter (if -column.count.front is greater than one). - - - - - - -column.gap.index -length - - -column.gap.index -Gap between columns in the index - - - - -<xsl:param name="column.gap.index">12pt</xsl:param> - - - -Description - -Specifies the gap between columns in indexes (if -column.count.index is greater than one). - - - - - - -column.gap.lot -length - - -column.gap.lot -Gap between columns on a 'List-of-Titles' page - - - - -<xsl:param name="column.gap.lot">12pt</xsl:param> - - - -Description - -Specifies the gap between columns on 'List-of-Titles' pages (if -column.count.lot is greater than one). - - - - - - -column.gap.titlepage -length - - -column.gap.titlepage -Gap between columns on title pages - - - - -<xsl:param name="column.gap.titlepage">12pt</xsl:param> - - - -Description - -Specifies the gap between columns on title pages (if -column.count.titlepage is greater than one). - - - - - - - -region.after.extent -length - - -region.after.extent -Specifies the height of the footer. - - - - -<xsl:param name="region.after.extent">0.4in</xsl:param> - - - -Description - -The region after extent is the height of the area where footers -are printed. - - - - - - - -region.before.extent -length - - -region.before.extent -Specifies the height of the header - - - - -<xsl:param name="region.before.extent">0.4in</xsl:param> - - - -Description - -The region before extent is the height of the area where headers -are printed. - - - - - - - -default.units -list -cm -mm -in -pt -pc -px -em - - -default.units -Default units for an unqualified dimension - - - - -<xsl:param name="default.units">pt</xsl:param> - - - -Description - -If an unqualified dimension is encountered (for example, in a -graphic width), the default.units will be used for the -units. Unqualified dimensions are not allowed in XSL Formatting Objects. - - - - - - - -normal.para.spacing -attribute set - - -normal.para.spacing -What space do you want between normal paragraphs - - - -<xsl:attribute-set name="normal.para.spacing"> - <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-set> - -Description -Specify the spacing required between normal paragraphs - - - - - -body.font.master - number - - -body.font.master -Specifies the default point size for body text - - - - -<xsl:param name="body.font.master">10</xsl:param> - - - -Description - -The body font size is specified in two parameters -(body.font.master and body.font.size) -so that math can be performed on the font size by XSLT. - - - - - - - -body.font.size -length - - -body.font.size -Specifies the default font size for body text - - - - -<xsl:param name="body.font.size"> - <xsl:value-of select="$body.font.master"></xsl:value-of><xsl:text>pt</xsl:text> -</xsl:param> - - -Description - -The body font size is specified in two parameters -(body.font.master and body.font.size) -so that math can be performed on the font size by XSLT. - - - - - - - -footnote.font.size -length - - -footnote.font.size -The font size for footnotes - - - -<xsl:param name="footnote.font.size"> - <xsl:value-of select="$body.font.master * 0.8"></xsl:value-of><xsl:text>pt</xsl:text> -</xsl:param> - - -Description - -The footnote font size is used for...footnotes! - - - - - - - -title.margin.left -length - - -title.margin.left -Adjust the left margin for titles - - - - -<xsl:param name="title.margin.left"> - <xsl:choose> - <xsl:when test="$fop.extensions != 0">-4pc</xsl:when> - <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when> - <xsl:otherwise>0pt</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -This parameter provides -the means of adjusting the left margin for titles -when the XSL-FO processor being used is -an old version of FOP (0.25 and earlier). -It is only useful when the fop.extensions -is nonzero. - -The left margin of the body region -is calculated to include this space, -and titles are outdented to the left outside -the body region by this amount, -effectively leaving titles at the intended left margin -and the body text indented. -Currently this method is only used for old FOP because -it cannot properly use the body.start.indent -parameter. - - -The default value when the fop.extensions -parameter is nonzero is -4pc, which means the -body text is indented 4 picas relative to -the titles. -The default value when the fop.extensions -parameter equals zero is 0pt, and -the body indent should instead be specified -using the body.start.indent -parameter. - - -If you set the value to zero, be sure to still include -a unit indicator such as 0pt, or -the FO processor will report errors. - - - - - - - -draft.mode -list -no -yes -maybe - - -draft.mode -Select draft mode - - - - -<xsl:param name="draft.mode">no</xsl:param> - - - -Description - -Selects draft mode. If draft.mode is -yes, the entire document will be treated -as a draft. If it is no, the entire document -will be treated as a final copy. If it is maybe, -individual sections will be treated as draft or final independently, depending -on how their status attribute is set. - - - - - - - -draft.watermark.image -uri - - -draft.watermark.image -The URI of the image to be used for draft watermarks - - - - -<xsl:param name="draft.watermark.image">images/draft.png</xsl:param> - - - -Description - -The image to be used for draft watermarks. - - - - - - -headers.on.blank.pages -boolean - - -headers.on.blank.pages -Put headers on blank pages? - - - - -<xsl:param name="headers.on.blank.pages" select="1"></xsl:param> - - - -Description - -If non-zero, headers will be placed on blank pages. - - - - - - -footers.on.blank.pages -boolean - - -footers.on.blank.pages -Put footers on blank pages? - - - - -<xsl:param name="footers.on.blank.pages" select="1"></xsl:param> - - - -Description - -If non-zero, footers will be placed on blank pages. - - - - - - -header.rule -boolean - - -header.rule -Rule under headers? - - - - -<xsl:param name="header.rule" select="1"></xsl:param> - - - -Description - -If non-zero, a rule will be drawn below the page headers. - - - - - - -footer.rule -boolean - - -footer.rule -Rule over footers? - - - - -<xsl:param name="footer.rule" select="1"></xsl:param> - - - -Description - -If non-zero, a rule will be drawn above the page footers. - - - - - - -header.column.widths -string - - -header.column.widths -Specify relative widths of header areas - - - -<xsl:param name="header.column.widths">1 1 1</xsl:param> - - -Description - -Page headers in print output use a three column table -to position text at the left, center, and right side of -the header on the page. -This parameter lets you specify the relative sizes of the -three columns. The default value is -"1 1 1". - -The parameter value must be three numbers, separated -by white space. The first number represents the relative -width of the inside header for -double-sided output. The second number is the relative -width of the center header. The third number is the -relative width of the outside header for -double-sided output. - -For single-sided output, the first number is the -relative width of left header for left-to-right -text direction, or the right header for right-to-left -text direction. -The third number is the -relative width of right header for left-to-right -text direction, or the left header for right-to-left -text direction. - -The numbers are used to specify the column widths -for the table that makes up the header area. -In the FO output, this looks like: - - - -<fo:table-column column-number="1" - column-width="proportional-column-width(1)"/> - - - -The proportional-column-width() -function computes a column width by dividing its -argument by the total of the arguments for all the columns, and -then multiplying the result by the width of the whole table -(assuming all the column specs use the function). -Its argument can be any positive integer or floating point number. -Zero is an acceptable value, although some FO processors -may warn about it, in which case using a very small number might -be more satisfactory. - - -For example, the value "1 2 1" means the center -header should have twice the width of the other areas. -A value of "0 0 1" means the entire header area -is reserved for the right (or outside) header text. -Note that to keep the center area centered on -the page, the left and right values must be -the same. A specification like "1 2 3" means the -center area is no longer centered on the page -since the right area is three times the width of the left area. - - - - - - - -footer.column.widths -string - - -footer.column.widths -Specify relative widths of footer areas - - - -<xsl:param name="footer.column.widths">1 1 1</xsl:param> - - -Description - -Page footers in print output use a three column table -to position text at the left, center, and right side of -the footer on the page. -This parameter lets you specify the relative sizes of the -three columns. The default value is -"1 1 1". - -The parameter value must be three numbers, separated -by white space. The first number represents the relative -width of the inside footer for -double-sided output. The second number is the relative -width of the center footer. The third number is the -relative width of the outside footer for -double-sided output. - -For single-sided output, the first number is the -relative width of left footer for left-to-right -text direction, or the right footer for right-to-left -text direction. -The third number is the -relative width of right footer for left-to-right -text direction, or the left footer for right-to-left -text direction. - -The numbers are used to specify the column widths -for the table that makes up the footer area. -In the FO output, this looks like: - - - -<fo:table-column column-number="1" - column-width="proportional-column-width(1)"/> - - - -The proportional-column-width() -function computes a column width by dividing its -argument by the total of the arguments for all the columns, and -then multiplying the result by the width of the whole table -(assuming all the column specs use the function). -Its argument can be any positive integer or floating point number. -Zero is an acceptable value, although some FO processors -may warn about it, in which case using a very small number might -be more satisfactory. - - -For example, the value "1 2 1" means the center -footer should have twice the width of the other areas. -A value of "0 0 1" means the entire footer area -is reserved for the right (or outside) footer text. -Note that to keep the center area centered on -the page, the left and right values must be -the same. A specification like "1 2 3" means the -center area is no longer centered on the page -since the right area is three times the width of the left area. - - - - - - - -header.table.properties -attribute set - - -header.table.properties -Apply properties to the header layout table - - - - -<xsl:attribute-set name="header.table.properties"> - <xsl:attribute name="table-layout">fixed</xsl:attribute> - <xsl:attribute name="width">100%</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties applied to the table that lays out the page header. - - - - - - -header.table.height -length - - -header.table.height -Specify the minimum height of the table containing the running page headers - - - -<xsl:param name="header.table.height">14pt</xsl:param> - - -Description - -Page headers in print output use a three column table -to position text at the left, center, and right side of -the header on the page. -This parameter lets you specify the minimum height -of the single row in the table. -Since this specifies only the minimum height, -the table should automatically grow to fit taller content. -The default value is "14pt". - - - - - - -footer.table.properties -attribute set - - -footer.table.properties -Apply properties to the footer layout table - - - - -<xsl:attribute-set name="footer.table.properties"> - <xsl:attribute name="table-layout">fixed</xsl:attribute> - <xsl:attribute name="width">100%</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties applied to the table that lays out the page footer. - - - - - - -footer.table.height -length - - -footer.table.height -Specify the minimum height of the table containing the running page footers - - - -<xsl:param name="footer.table.height">14pt</xsl:param> - - -Description - -Page footers in print output use a three column table -to position text at the left, center, and right side of -the footer on the page. -This parameter lets you specify the minimum height -of the single row in the table. -Since this specifies only the minimum height, -the table should automatically grow to fit taller content. -The default value is "14pt". - - - - - - -header.content.properties -attribute set - - -header.content.properties -Properties of page header content - - - - -<xsl:attribute-set name="header.content.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.fontset"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="margin-left"> - <xsl:value-of select="$title.margin.left"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties of page header content. - - - - - - -footer.content.properties -attribute set - - -footer.content.properties -Properties of page footer content - - - - -<xsl:attribute-set name="footer.content.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.fontset"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="margin-left"> - <xsl:value-of select="$title.margin.left"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -Properties of page footer content. - - - - - - -marker.section.level -integer - - -marker.section.level -Control depth of sections shown in running headers or footers - - - - -<xsl:param name="marker.section.level">2</xsl:param> - - - -Description - -The marker.section.level parameter -controls the depth of section levels that may be displayed -in running headers and footers. For example, if the value -is 2 (the default), then titles from sect1 and -sect2 or equivalent section -elements are candidates for use in running headers and -footers. - -Each candidate title is marked in the FO output with a -<fo:marker marker-class-name="section.head.marker"> -element. - -In order for such titles to appear in headers -or footers, the header.content -or footer.content template -must be customized to retrieve the marker using -an output element such as: - - -<fo:retrieve-marker retrieve-class-name="section.head.marker" - retrieve-position="first-including-carryover" - retrieve-boundary="page-sequence"/> - - - - - - -
    -Font Families - - -body.font.family -list -open -serif -sans-serif -monospace - - -body.font.family -The default font family for body text - - - - -<xsl:param name="body.font.family">serif</xsl:param> - - - -Description - -The body font family is the default font used for text in the page body. - - - - - - - -dingbat.font.family -list -open -serif -sans-serif -monospace - - -dingbat.font.family -The font family for copyright, quotes, and other symbols - - - - -<xsl:param name="dingbat.font.family">serif</xsl:param> - - - -Description - -The dingbat font family is used for dingbats. If it is defined -as the empty string, no font change is effected around dingbats. - - - - - - - -monospace.font.family -string - - -monospace.font.family -The default font family for monospace environments - - - - -<xsl:param name="monospace.font.family">monospace</xsl:param> - - - -Description - -The monospace font family is used for verbatim environments -(program listings, screens, etc.). - - - - - - - -sans.font.family -string - - -sans.font.family -The default sans-serif font family - - - - -<xsl:param name="sans.font.family">sans-serif</xsl:param> - - - -Description - -The default sans-serif font family. At the present, this isn't -actually used by the stylesheets. - - - - - - - -title.font.family -list -open -serif -sans-serif -monospace - - -title.font.family -The default font family for titles - - - - -<xsl:param name="title.font.family">sans-serif</xsl:param> - - - -Description - -The title font family is used for titles (chapter, section, figure, -etc.) - - - - - - - -symbol.font.family -list -open -serif -sans-serif -monospace - - -symbol.font.family -The font families to be searched for symbols outside - of the body font - - - - -<xsl:param name="symbol.font.family">Symbol,ZapfDingbats</xsl:param> - - - -Description - -A typical body or title font does not contain all -the character glyphs that DocBook supports. This parameter -specifies additional fonts that should be searched for -special characters not in the normal font. -These symbol font names are automatically appended -to the body or title font family name when fonts -are specified in a -font-family -property in the FO output. - -The symbol font names should be entered as a -comma-separated list. The default value is -Symbol,ZapfDingbats. - - - - - - -Property Sets - - -formal.object.properties -attribute set - - -formal.object.properties -Properties associated with a formal object such as a figure, or other component that has a title - - - - -<xsl:attribute-set name="formal.object.properties"> - <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">2em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.optimum">1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">2em</xsl:attribute> - <xsl:attribute name="keep-together.within-column">always</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for formal objects in docbook. Specify the spacing -before and after the object. - - - - - - -formal.title.properties -attribute set - - -formal.title.properties -Style the title element of formal object such as a figure. - - - - -<xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing"> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.2"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute> -</xsl:attribute-set> - - -Description -Specify how the title should be styled. Specify the font size and weight of the title of the formal object. - - - - - -informal.object.properties -attribute set - - -informal.object.properties -Properties associated with an informal (untitled) object, such as an informalfigure - - - -<xsl:attribute-set name="informal.object.properties"> - <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">2em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.optimum">1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">2em</xsl:attribute> -</xsl:attribute-set> - -Description -The styling for informal objects in docbook. Specify the spacing before and after the object. - - - - - -monospace.properties -attribute set - - -monospace.properties -Properties of monospaced content - - - - -<xsl:attribute-set name="monospace.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$monospace.font.family"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -Specifies the font name for monospaced output. This property set -used to set the font-size as well, but that doesn't work very well -when different fonts are used (as they are in titles and paragraphs, -for example). - -If you want to set the font-size in a customization layer, it's -probably going to be more appropriate to set font-size-adjust, if your -formatter supports it. - - - - - - -verbatim.properties -attribute set - - -verbatim.properties -Properties associated with verbatim text - - - - -<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">no-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> - - -Description -This attribute set is used on all verbatim environments. - - - - - - -monospace.verbatim.properties -attribute set - - -monospace.verbatim.properties -What font and size do you want for monospaced content? - - - - -<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">no-wrap</xsl:attribute> -</xsl:attribute-set> - - -Description -Specify the font name and size you want for monospaced output - - - - - -sidebar.properties -attribute set - - -sidebar.properties -Attribute set for sidebar properties - - - - -<xsl:attribute-set name="sidebar.properties" use-attribute-sets="formal.object.properties"> - <xsl:attribute name="border-style">solid</xsl:attribute> - <xsl:attribute name="border-width">1pt</xsl:attribute> - <xsl:attribute name="border-color">black</xsl:attribute> - <xsl:attribute name="background-color">#DDDDDD</xsl:attribute> - <xsl:attribute name="padding-start">12pt</xsl:attribute> - <xsl:attribute name="padding-end">12pt</xsl:attribute> - <xsl:attribute name="padding-top">6pt</xsl:attribute> - <xsl:attribute name="padding-bottom">6pt</xsl:attribute> - <xsl:attribute name="margin-{$direction.align.start}">0pt</xsl:attribute> - <xsl:attribute name="margin-{$direction.align.end}">0pt</xsl:attribute> -<!-- - <xsl:attribute name="margin-top">6pt</xsl:attribute> - <xsl:attribute name="margin-bottom">6pt</xsl:attribute> ---> -</xsl:attribute-set> - - - -Description - -The styling for sidebars. - - - - - - -sidebar.title.properties -attribute set - - -sidebar.title.properties -Attribute set for sidebar titles - - - - -<xsl:attribute-set name="sidebar.title.properties"> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align">start</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for sidebars titles. - - - - - - -sidebar.float.type -list -none -before -left -start -right -end -inside -outside - - -sidebar.float.type -Select type of float for sidebar elements - - - - -<xsl:param name="sidebar.float.type">none</xsl:param> - - - -Description - -Selects the type of float for sidebar elements. - - - -If sidebar.float.type is -none, then -no float is used. - - - -If sidebar.float.type is -before, then -the float appears at the top of the page. On some processors, -that may be the next page rather than the current page. - - - - -If sidebar.float.type is -left, -then a left side float is used. - - - - -If sidebar.float.type is -start, -then when the text direction is left-to-right a left side float is used. -When the text direction is right-to-left, a right side float is used. - - - - -If sidebar.float.type is -right, -then a right side float is used. - - - - -If sidebar.float.type is -end, -then when the text direction is left-to-right a right side float is used. -When the text direction is right-to-left, a left side float is used. - - - - -If your XSL-FO processor supports floats positioned on the -inside or -outside -of double-sided pages, then you have those two -options for side floats as well. - - - - - - - - - -sidebar.float.width -length - - -sidebar.float.width -Set the default width for sidebars - - - - -<xsl:param name="sidebar.float.width">1in</xsl:param> - - - -Description - -Sets the default width for sidebars when used as a side float. -The width determines the degree to which the sidebar block intrudes into -the text area. - -If sidebar.float.type is -before or -none, then -this parameter is ignored. - - - - - - - -margin.note.properties -attribute set - - -margin.note.properties -Attribute set for margin.note properties - - - - -<xsl:attribute-set name="margin.note.properties"> - <xsl:attribute name="font-size">90%</xsl:attribute> - <xsl:attribute name="text-align">start</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for margin notes. -By default, margin notes are not implemented for any -element. A stylesheet customization is needed to make -use of this attribute-set. - -You can use a template named floater -to create the customization. -That template can create side floats by specifying the -content and characteristics as template parameters. - - -For example: -<xsl:template match="para[@role='marginnote']"> - <xsl:call-template name="floater"> - <xsl:with-param name="position"> - <xsl:value-of select="$margin.note.float.type"/> - </xsl:with-param> - <xsl:with-param name="width"> - <xsl:value-of select="$margin.note.width"/> - </xsl:with-param> - <xsl:with-param name="content"> - <xsl:apply-imports/> - </xsl:with-param> - </xsl:call-template> -</xsl:template> - - - - - - -margin.note.title.properties -attribute set - - -margin.note.title.properties -Attribute set for margin note titles - - - - -<xsl:attribute-set name="margin.note.title.properties"> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align">start</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for margin note titles. - - - - - - -margin.note.float.type -list -none -before -left -start -right -end -inside -outside - - -margin.note.float.type -Select type of float for margin note customizations - - - - -<xsl:param name="margin.note.float.type">none</xsl:param> - - - -Description - -Selects the type of float for margin notes. -DocBook does not define a margin note element, so this -feature must be implemented as a customization of the stylesheet. -See margin.note.properties for -an example. - - - -If margin.note.float.type is -none, then -no float is used. - - - -If margin.note.float.type is -before, then -the float appears at the top of the page. On some processors, -that may be the next page rather than the current page. - - - -If margin.note.float.type is -left or -start, then -a left side float is used. - - - -If margin.note.float.type is -right or -end, then -a right side float is used. - - - -If your XSL-FO processor supports floats positioned on the -inside or -outside -of double-sided pages, then you have those two -options for side floats as well. - - - - - - - - - -margin.note.width -length - - -margin.note.width -Set the default width for margin notes - - - - -<xsl:param name="margin.note.width">1in</xsl:param> - - - -Description - -Sets the default width for margin notes when used as a side -float. The width determines the degree to which the margin note block -intrudes into the text area. - -If margin.note.float.type is -before or -none, then -this parameter is ignored. - - - - - - - -component.title.properties -attribute set - - -component.title.properties -Properties for component titles - - - - -<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:value-of></xsl:attribute> - <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align"> - <xsl:choose> - <xsl:when test="((parent::article | parent::articleinfo | parent::info/parent::article) and not(ancestor::book) and not(self::bibliography)) or (parent::slides | parent::slidesinfo)">center</xsl:when> - <xsl:otherwise>start</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties common to all component titles. - - - - - - -component.titlepage.properties -attribute set - - -component.titlepage.properties -Properties for component titlepages - - - - -<xsl:attribute-set name="component.titlepage.properties"> -</xsl:attribute-set> - - - -Description - -The properties that are applied to the outer block containing -all the component title page information. -Its main use is to set a span="all" -property on the block that is a direct child of the flow. - -This attribute-set also applies to index titlepages. It is empty by default. - - - - - - -section.title.properties -attribute set - - -section.title.properties -Properties for section titles - - - - -<xsl:attribute-set name="section.title.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.font.family"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <!-- font size is calculated dynamically by section.heading template --> - <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">start</xsl:attribute> - <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"></xsl:value-of></xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties common to all section titles. - - - - - - -section.title.level1.properties -attribute set - - -section.title.level1.properties -Properties for level-1 section titles - - - - -<xsl:attribute-set name="section.title.level1.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 2.0736"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-1 section titles. - - - - - - - -section.title.level2.properties -attribute set - - -section.title.level2.properties -Properties for level-2 section titles - - - - -<xsl:attribute-set name="section.title.level2.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.728"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-2 section titles. - - - - - - -section.title.level3.properties -attribute set - - -section.title.level3.properties -Properties for level-3 section titles - - - - -<xsl:attribute-set name="section.title.level3.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.44"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-3 section titles. - - - - - - -section.title.level4.properties -attribute set - - -section.title.level4.properties -Properties for level-4 section titles - - - - -<xsl:attribute-set name="section.title.level4.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.2"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-4 section titles. - - - - - - -section.title.level5.properties -attribute set - - -section.title.level5.properties -Properties for level-5 section titles - - - - -<xsl:attribute-set name="section.title.level5.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-5 section titles. - - - - - - -section.title.level6.properties -attribute set - - -section.title.level6.properties -Properties for level-6 section titles - - - - -<xsl:attribute-set name="section.title.level6.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-6 section titles. This property set is actually -used for all titles below level 5. - - - - - - -section.properties -attribute set - - -section.properties -Properties for all section levels - - - - -<xsl:attribute-set name="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of all section levels, and therefore apply to -the whole section. -This attribute set is inherited by the -more specific attribute sets such as -section.level1.properties. -The default is empty. - - - - - - - -section.level1.properties -attribute set - - -section.level1.properties -Properties for level-1 sections - - - - -<xsl:attribute-set name="section.level1.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-1 section, and therefore apply to -the whole section. This includes sect1 -elements and section elements at level 1. - - -For example, you could start each level-1 section on -a new page by using: -<xsl:attribute-set name="section.level1.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level2.properties -attribute set - - -section.level2.properties -Properties for level-2 sections - - - - -<xsl:attribute-set name="section.level2.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-2 section, and therefore apply to -the whole section. This includes sect2 -elements and section elements at level 2. - - -For example, you could start each level-2 section on -a new page by using: -<xsl:attribute-set name="section.level2.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level3.properties -attribute set - - -section.level3.properties -Properties for level-3 sections - - - - -<xsl:attribute-set name="section.level3.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-3 section, and therefore apply to -the whole section. This includes sect3 -elements and section elements at level 3. - - -For example, you could start each level-3 section on -a new page by using: -<xsl:attribute-set name="section.level3.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level4.properties -attribute set - - -section.level4.properties -Properties for level-4 sections - - - - -<xsl:attribute-set name="section.level4.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-4 section, and therefore apply to -the whole section. This includes sect4 -elements and section elements at level 4. - - -For example, you could start each level-4 section on -a new page by using: -<xsl:attribute-set name="section.level4.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level5.properties -attribute set - - -section.level5.properties -Properties for level-5 sections - - - - -<xsl:attribute-set name="section.level5.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level-5 section, and therefore apply to -the whole section. This includes sect5 -elements and section elements at level 5. - - -For example, you could start each level-5 section on -a new page by using: -<xsl:attribute-set name="section.level5.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -section.level6.properties -attribute set - - -section.level6.properties -Properties for level-6 sections - - - - -<xsl:attribute-set name="section.level6.properties" use-attribute-sets="section.properties"> -</xsl:attribute-set> - - - -Description - -The properties that apply to the containing -block of a level 6 or lower section, and therefore apply to -the whole section. This includes -section elements at level 6 and lower. - - -For example, you could start each level-6 section on -a new page by using: -<xsl:attribute-set name="section.level6.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - - - - -figure.properties -attribute set - - -figure.properties -Properties associated with a figure - - - - -<xsl:attribute-set name="figure.properties" use-attribute-sets="formal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for figures. - - - - - - -example.properties -attribute set - - -example.properties -Properties associated with a example - - - - -<xsl:attribute-set name="example.properties" use-attribute-sets="formal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for examples. - - - - - - -equation.properties -attribute set - - -equation.properties -Properties associated with a equation - - - - -<xsl:attribute-set name="equation.properties" use-attribute-sets="formal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for equations. - - - - - - -equation.number.properties -attribute set - - -equation.number.properties -Properties that apply to the fo:table-cell containing the number -of an equation that does not have a title. - - - -<xsl:attribute-set name="equation.number.properties"> - <xsl:attribute name="text-align">end</xsl:attribute> - <xsl:attribute name="display-align">center</xsl:attribute> -</xsl:attribute-set> - -Description -Properties that apply to the fo:table-cell containing the number -of an equation when it has no title. The number in an equation with a -title is formatted along with the title, and this attribute-set does not apply. - - - - - -table.properties -attribute set - - -table.properties -Properties associated with the block surrounding a table - - - - -<xsl:attribute-set name="table.properties" use-attribute-sets="formal.object.properties"> - <xsl:attribute name="keep-together.within-column">auto</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Block styling properties for tables. This parameter should really -have been called table.block.properties or something -like that, but we’re leaving it to avoid backwards-compatibility -problems. - -See also table.table.properties. - - - - - - -informalfigure.properties -attribute set - - -informalfigure.properties -Properties associated with an informalfigure - - - - -<xsl:attribute-set name="informalfigure.properties" use-attribute-sets="informal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for informalfigures. - - - - - - -informalexample.properties -attribute set - - -informalexample.properties -Properties associated with an informalexample - - - - -<xsl:attribute-set name="informalexample.properties" use-attribute-sets="informal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for informalexamples. - - - - - - -informalequation.properties -attribute set - - -informalequation.properties -Properties associated with an informalequation - - - - -<xsl:attribute-set name="informalequation.properties" use-attribute-sets="informal.object.properties"></xsl:attribute-set> - - - -Description - -The styling for informalequations. - - - - - - -informaltable.properties -attribute set - - -informaltable.properties -Properties associated with the block surrounding an informaltable - - - - -<xsl:attribute-set name="informaltable.properties" use-attribute-sets="informal.object.properties"></xsl:attribute-set> - - - -Description - -Block styling properties for informaltables. This parameter should really -have been called informaltable.block.properties or something -like that, but we’re leaving it to avoid backwards-compatibility -problems. - -See also table.table.properties. - - - - - - -procedure.properties -attribute set - - -procedure.properties -Properties associated with a procedure - - - - -<xsl:attribute-set name="procedure.properties" use-attribute-sets="formal.object.properties"> - <xsl:attribute name="keep-together.within-column">auto</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The styling for procedures. - - - - - - -root.properties -attribute set - - -root.properties -The properties of the fo:root element - - - - -<xsl:attribute-set name="root.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.fontset"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.size"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="text-align"> - <xsl:value-of select="$alignment"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="line-height"> - <xsl:value-of select="$line-height"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-selection-strategy">character-by-character</xsl:attribute> - <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute> - <xsl:attribute name="writing-mode"> - <xsl:value-of select="$direction.mode"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -This property set is used on the fo:root element of -an FO file. It defines a set of default, global parameters. - - - - - - -qanda.title.properties -attribute set - - -qanda.title.properties -Properties for qanda set titles - - - - -<xsl:attribute-set name="qanda.title.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.font.family"></xsl:value-of> - </xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <!-- font size is calculated dynamically by qanda.heading template --> - <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-set> - - - -Description - -The properties common to all qanda set titles. - - - - - - -qanda.title.level1.properties -attribute set - - -qanda.title.level1.properties -Properties for level-1 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level1.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 2.0736"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-1 qanda set titles. - - - - - - -qanda.title.level2.properties -attribute set - - -qanda.title.level2.properties -Properties for level-2 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level2.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.728"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-2 qanda set titles. - - - - - - -qanda.title.level3.properties -attribute set - - -qanda.title.level3.properties -Properties for level-3 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level3.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.44"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-3 qanda set titles. - - - - - - -qanda.title.level4.properties -attribute set - - -qanda.title.level4.properties -Properties for level-4 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level4.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.2"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-4 qanda set titles. - - - - - - -qanda.title.level5.properties -attribute set - - -qanda.title.level5.properties -Properties for level-5 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level5.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-5 qanda set titles. - - - - - - -qanda.title.level6.properties -attribute set - - -qanda.title.level6.properties -Properties for level-6 qanda set titles - - - - -<xsl:attribute-set name="qanda.title.level6.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"></xsl:value-of> - <xsl:text>pt</xsl:text> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties of level-6 qanda set titles. -This property set is actually -used for all titles below level 5. - - - - - - -article.appendix.title.properties -attribute set - - -article.appendix.title.properties -Properties for appendix titles that appear in an article - - - - -<xsl:attribute-set name="article.appendix.title.properties" use-attribute-sets="section.title.properties section.title.level1.properties"> - <xsl:attribute name="margin-{$direction.align.start}"> - <xsl:value-of select="$title.margin.left"></xsl:value-of> - </xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties for the title of an appendix that -appears inside an article. The default is to use -the properties of sect1 titles. - - - - - - -abstract.properties -attribute set - - -abstract.properties -Properties associated with the block surrounding an abstract - - - - -<xsl:attribute-set name="abstract.properties"> - <xsl:attribute name="start-indent">0.0in</xsl:attribute> - <xsl:attribute name="end-indent">0.0in</xsl:attribute> -</xsl:attribute-set> - - - -Description - -Block styling properties for abstract. - -See also abstract.title.properties. - - - - - - -abstract.title.properties -attribute set - - -abstract.title.properties -Properties for abstract titles - - - - -<xsl:attribute-set name="abstract.title.properties"> - <xsl:attribute name="font-family"><xsl:value-of select="$title.fontset"></xsl:value-of></xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> - <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:value-of></xsl:attribute> - <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align">center</xsl:attribute> -</xsl:attribute-set> - - - -Description - -The properties for abstract titles. - -See also abstract.properties. - - - - - - -index.page.number.properties -attribute set - - -index.page.number.properties -Properties associated with index page numbers - - - - -<xsl:attribute-set name="index.page.number.properties"> -</xsl:attribute-set> - - - -Description - -Properties associated with page numbers in indexes. -Changing color to indicate the page number is a link is -one possibility. - - - - - - - -revhistory.table.properties -attribute set - - -revhistory.table.properties -The properties of table used for formatting revhistory - - - - -<xsl:attribute-set name="revhistory.table.properties"> -</xsl:attribute-set> - - - -Description - -This property set defines appearance of revhistory table. - - - - - - -revhistory.table.cell.properties -attribute set - - -revhistory.table.cell.properties -The properties of table cells used for formatting revhistory - - - - -<xsl:attribute-set name="revhistory.table.cell.properties"> -</xsl:attribute-set> - - - -Description - -This property set defines appearance of individual cells in revhistory table. - - - - - - -revhistory.title.properties -attribute set - - -revhistory.title.properties -The properties of revhistory title - - - - -<xsl:attribute-set name="revhistory.title.properties"> -</xsl:attribute-set> - - - -Description - -This property set defines appearance of revhistory title. - - - - - -Profiling - -The following parameters can be used for attribute-based -profiling of your document. For more information about profiling, see -Profiling (conditional text). - - - -profile.arch -string - - -profile.arch -Target profile for arch -attribute - - - - -<xsl:param name="profile.arch"></xsl:param> - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.audience -string - - -profile.audience -Target profile for audience -attribute - - - - -<xsl:param name="profile.audience"></xsl:param> - - - -Description - -Value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.condition -string - - -profile.condition -Target profile for condition -attribute - - - - -<xsl:param name="profile.condition"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.conformance -string - - -profile.conformance -Target profile for conformance -attribute - - - - -<xsl:param name="profile.conformance"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.lang -string - - -profile.lang -Target profile for lang -attribute - - - - -<xsl:param name="profile.lang"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.os -string - - -profile.os -Target profile for os -attribute - - - - -<xsl:param name="profile.os"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.revision -string - - -profile.revision -Target profile for revision -attribute - - - - -<xsl:param name="profile.revision"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.revisionflag -string - - -profile.revisionflag -Target profile for revisionflag -attribute - - - - -<xsl:param name="profile.revisionflag"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.role -string - - -profile.role -Target profile for role -attribute - - - - -<xsl:param name="profile.role"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - -Note that role is often -used for other purposes than profiling. For example it is commonly -used to get emphasize in bold font: - -<emphasis role="bold">very important</emphasis> - -If you are using role for -these purposes do not forget to add values like bold to -value of this parameter. If you forgot you will get document with -small pieces missing which are very hard to track. - -For this reason it is not recommended to use role attribute for profiling. You should -rather use profiling specific attributes like userlevel, os, arch, condition, etc. - - - - - - - -profile.security -string - - -profile.security -Target profile for security -attribute - - - - -<xsl:param name="profile.security"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.status -string - - -profile.status -Target profile for status -attribute - - - - -<xsl:param name="profile.status"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.userlevel -string - - -profile.userlevel -Target profile for userlevel -attribute - - - - -<xsl:param name="profile.userlevel"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.vendor -string - - -profile.vendor -Target profile for vendor -attribute - - - - -<xsl:param name="profile.vendor"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.wordsize -string - - -profile.wordsize -Target profile for wordsize -attribute - - - - -<xsl:param name="profile.wordsize"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.attribute -string - - -profile.attribute -Name of user-specified profiling attribute - - - - -<xsl:param name="profile.attribute"></xsl:param> - - - -Description - -This parameter is used in conjuction with -profile.value. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.value -string - - -profile.value -Target profile for user-specified attribute - - - - -<xsl:param name="profile.value"></xsl:param> - - - -Description - -When you are using this parameter you must also specify name of -profiling attribute with parameter -profile.attribute. - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.separator -string - - -profile.separator -Separator character for compound profile values - - - - -<xsl:param name="profile.separator">;</xsl:param> - - - -Description - -Separator character used for compound profile values. See profile.arch - - - - - -Localization - - -l10n.gentext.language -string - - -l10n.gentext.language -Sets the gentext language - - - - -<xsl:param name="l10n.gentext.language"></xsl:param> - - - -Description - -If this parameter is set to any value other than the empty string, its -value will be used as the value for the language when generating text. Setting -l10n.gentext.language overrides any settings within the -document being formatted. - -It's much more likely that you might want to set the -l10n.gentext.default.language parameter. - - - - - - - l10n.gentext.default.language - string - - - l10n.gentext.default.language - Sets the default language for generated text - - - - -<xsl:param name="l10n.gentext.default.language">en</xsl:param> - - - -Description - -The value of the l10n.gentext.default.language -parameter is used as the language for generated text if no setting is provided -in the source document. - - - - - - -l10n.gentext.use.xref.language -boolean - - -l10n.gentext.use.xref.language -Use the language of target when generating cross-reference text? - - - - -<xsl:param name="l10n.gentext.use.xref.language" select="0"></xsl:param> - - - -Description - -If non-zero, the language of the target will be used when -generating cross reference text. Usually, the current -language is used when generating text (that is, the language of the -element that contains the cross-reference element). But setting this parameter -allows the language of the element pointed to to control -the generated text. - -Consider the following example: - - -<para lang="en">See also <xref linkend="chap3"/>.</para> - - - -Suppose that Chapter 3 happens to be written in German. -If l10n.gentext.use.xref.language is non-zero, the -resulting text will be something like this: - -
    -See also Kapital 3. -
    - -Where the more traditional rendering would be: - -
    -See also Chapter 3. -
    - -
    -
    - - - -l10n.lang.value.rfc.compliant -boolean - - -l10n.lang.value.rfc.compliant -Make value of lang attribute RFC compliant? - - - - -<xsl:param name="l10n.lang.value.rfc.compliant" select="1"></xsl:param> - - - -Description - -If non-zero, ensure that the values for all lang attributes in HTML output are RFC -compliantSection 8.1.1, Language Codes, in the HTML 4.0 Recommendation states that: - -
    [RFC1766] defines and explains the language codes -that must be used in HTML documents. -Briefly, language codes consist of a primary code and a possibly -empty series of subcodes: - -language-code = primary-code ( "-" subcode )* - -And in RFC 1766, Tags for the Identification -of Languages, the EBNF for "language tag" is given as: - -Language-Tag = Primary-tag *( "-" Subtag ) -Primary-tag = 1*8ALPHA -Subtag = 1*8ALPHA - -
    -
    . - -by taking any underscore characters in any lang values found in source documents, and -replacing them with hyphen characters in output HTML files. For -example, zh_CN in a source document becomes -zh-CN in the HTML output form that source. - - -This parameter does not cause any case change in lang values, because RFC 1766 -explicitly states that all "language tags" (as it calls them) "are -to be treated as case insensitive". - -
    - -
    -
    - - - -writing.mode -string - - -writing.mode -Direction of text flow based on locale - - - - -<xsl:param name="writing.mode"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key">writing-mode</xsl:with-param> - <xsl:with-param name="lang"> - <xsl:call-template name="l10n.language"> - <xsl:with-param name="target" select="/*[1]"></xsl:with-param> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> -</xsl:param> - - - -Description - -Sets direction of text flow and text alignment based on locale. -The value is normally taken from the gentext file for the -lang attribute of the document's root element, using the -key name 'writing-mode' to look it up in the gentext file. -But the param can also be -set on the command line to override that gentext value. - -Accepted values are: - - - lr-tb - - Left-to-right text flow in each line, lines stack top to bottom. - - - - rl-tb - - Right-to-left text flow in each line, lines stack top to bottom. - - - - tb-rl - - Top-to-bottom text flow in each vertical line, lines stack right to left. - Supported by only a few XSL-FO processors. Not supported in HTML output. - - - - lr - - Shorthand for lr-tb. - - - - rl - - Shorthand for rl-tb. - - - - tb - - Shorthand for tb-rl. - - - - - - - - -
    -EBNF - - -ebnf.assignment -rtf - - -ebnf.assignment -The EBNF production assignment operator - - - - - -<xsl:param name="ebnf.assignment"> - <fo:inline font-family="{$monospace.font.family}"> - <xsl:text>::=</xsl:text> - </fo:inline> -</xsl:param> - - - -Description - -The ebnf.assignment parameter determines what -text is used to show assignment in productions -in productionsets. - -While ::= is common, so are several -other operators. - - - - - - -ebnf.statement.terminator -rtf - - -ebnf.statement.terminator -Punctuation that ends an EBNF statement. - - - - - -<xsl:param name="ebnf.statement.terminator"></xsl:param> - - - -Description - -The ebnf.statement.terminator parameter determines what -text is used to terminate each production -in productionset. - -Some notations end each statement with a period. - - - - - -Prepress - - -crop.marks -boolean - - -crop.marks -Output crop marks? - - - - -<xsl:param name="crop.marks" select="0"></xsl:param> - - - -Description - -If non-zero, crop marks will be added to each page. Currently this -works only with XEP if you have xep.extensions set. - - - - - - -crop.mark.width -length - - -crop.mark.width -Width of crop marks. - - - - -<xsl:param name="crop.mark.width">0.5pt</xsl:param> - - - -Description - -Width of crop marks. Crop marks are controlled by -crop.marks parameter. - - - - - - -crop.mark.offset -length - - -crop.mark.offset -Length of crop marks. - - - - -<xsl:param name="crop.mark.offset">24pt</xsl:param> - - - -Description - -Length of crop marks. Crop marks are controlled by -crop.marks parameter. - - - - - - -crop.mark.bleed -length - - -crop.mark.bleed -Length of invisible part of crop marks. - - - - -<xsl:param name="crop.mark.bleed">6pt</xsl:param> - - - -Description - -Length of invisible part of crop marks. Crop marks are controlled by -crop.marks parameter. - - - - - - -The Stylesheet - -The param.xsl stylesheet is just a wrapper -around all these parameters. - - -<xsl:stylesheet exclude-result-prefixes="src" version="1.0"> - -<!-- This file is generated from param.xweb --> - -<!-- ******************************************************************** - $Id: param.xweb 8543 2009-12-02 06:05:24Z bobstayton $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<src:fragref linkend="abstract.properties.frag"></src:fragref> -<src:fragref linkend="abstract.title.properties.frag"></src:fragref> -<src:fragref linkend="admon.graphics.extension.frag"></src:fragref> -<src:fragref linkend="admon.graphics.frag"></src:fragref> -<src:fragref linkend="admon.graphics.path.frag"></src:fragref> -<src:fragref linkend="admon.textlabel.frag"></src:fragref> -<src:fragref linkend="admonition.properties.frag"></src:fragref> -<src:fragref linkend="admonition.title.properties.frag"></src:fragref> -<src:fragref linkend="graphical.admonition.properties.frag"></src:fragref> -<src:fragref linkend="nongraphical.admonition.properties.frag"></src:fragref> -<src:fragref linkend="alignment.frag"></src:fragref> -<src:fragref linkend="appendix.autolabel.frag"></src:fragref> -<src:fragref linkend="arbortext.extensions.frag"></src:fragref> -<src:fragref linkend="article.appendix.title.properties.frag"></src:fragref> -<src:fragref linkend="author.othername.in.middle.frag"></src:fragref> -<src:fragref linkend="autotoc.label.separator.frag"></src:fragref> -<src:fragref linkend="axf.extensions.frag"></src:fragref> -<src:fragref linkend="biblioentry.item.separator.frag"></src:fragref> -<src:fragref linkend="biblioentry.properties.frag"></src:fragref> -<src:fragref linkend="bibliography.collection.frag"></src:fragref> -<src:fragref linkend="bibliography.numbered.frag"></src:fragref> -<src:fragref linkend="bibliography.style.frag"></src:fragref> -<src:fragref linkend="blockquote.properties.frag"></src:fragref> -<src:fragref linkend="body.font.family.frag"></src:fragref> -<src:fragref linkend="body.font.master.frag"></src:fragref> -<src:fragref linkend="body.font.size.frag"></src:fragref> -<src:fragref linkend="body.margin.bottom.frag"></src:fragref> -<src:fragref linkend="body.margin.top.frag"></src:fragref> -<src:fragref linkend="body.start.indent.frag"></src:fragref> -<src:fragref linkend="body.end.indent.frag"></src:fragref> -<src:fragref linkend="bookmarks.collapse.frag"></src:fragref> -<src:fragref linkend="bridgehead.in.toc.frag"></src:fragref> -<src:fragref linkend="callout.defaultcolumn.frag"></src:fragref> -<src:fragref linkend="callout.graphics.extension.frag"></src:fragref> -<src:fragref linkend="callout.graphics.frag"></src:fragref> -<src:fragref linkend="callout.icon.size.frag"></src:fragref> -<src:fragref linkend="callout.graphics.number.limit.frag"></src:fragref> -<src:fragref linkend="callout.graphics.path.frag"></src:fragref> -<src:fragref linkend="callout.unicode.font.frag"></src:fragref> -<src:fragref linkend="callout.unicode.frag"></src:fragref> -<src:fragref linkend="callout.unicode.number.limit.frag"></src:fragref> -<src:fragref linkend="callout.unicode.start.character.frag"></src:fragref> -<src:fragref linkend="callouts.extension.frag"></src:fragref> -<src:fragref linkend="chapter.autolabel.frag"></src:fragref> -<src:fragref linkend="collect.xref.targets.frag"></src:fragref> -<src:fragref linkend="column.count.back.frag"></src:fragref> -<src:fragref linkend="column.count.body.frag"></src:fragref> -<src:fragref linkend="column.count.front.frag"></src:fragref> -<src:fragref linkend="column.count.index.frag"></src:fragref> -<src:fragref linkend="column.count.lot.frag"></src:fragref> -<src:fragref linkend="column.count.titlepage.frag"></src:fragref> -<src:fragref linkend="column.gap.back.frag"></src:fragref> -<src:fragref linkend="column.gap.body.frag"></src:fragref> -<src:fragref linkend="column.gap.front.frag"></src:fragref> -<src:fragref linkend="column.gap.index.frag"></src:fragref> -<src:fragref linkend="column.gap.lot.frag"></src:fragref> -<src:fragref linkend="column.gap.titlepage.frag"></src:fragref> -<src:fragref linkend="compact.list.item.spacing.frag"></src:fragref> -<src:fragref linkend="component.label.includes.part.label.frag"></src:fragref> -<src:fragref linkend="component.title.properties.frag"></src:fragref> -<src:fragref linkend="component.titlepage.properties.frag"></src:fragref> -<src:fragref linkend="crop.marks.frag"></src:fragref> -<src:fragref linkend="crop.mark.width.frag"></src:fragref> -<src:fragref linkend="crop.mark.offset.frag"></src:fragref> -<src:fragref linkend="crop.mark.bleed.frag"></src:fragref> -<src:fragref linkend="current.docid.frag"></src:fragref> -<src:fragref linkend="default.float.class.frag"></src:fragref> -<src:fragref linkend="default.image.width.frag"></src:fragref> -<src:fragref linkend="default.table.width.frag"></src:fragref> -<src:fragref linkend="default.table.frame.frag"></src:fragref> -<src:fragref linkend="default.table.rules.frag"></src:fragref> -<src:fragref linkend="default.units.frag"></src:fragref> -<src:fragref linkend="dingbat.font.family.frag"></src:fragref> -<src:fragref linkend="double.sided.frag"></src:fragref> -<src:fragref linkend="draft.mode.frag"></src:fragref> -<src:fragref linkend="draft.watermark.image.frag"></src:fragref> -<src:fragref linkend="ebnf.assignment.frag"></src:fragref> -<src:fragref linkend="ebnf.statement.terminator.frag"></src:fragref> -<src:fragref linkend="email.delimiters.enabled.frag"></src:fragref> -<src:fragref linkend="email.mailto.enabled.frag"></src:fragref> -<src:fragref linkend="equation.properties.frag"></src:fragref> -<src:fragref linkend="equation.number.properties.frag"></src:fragref> -<src:fragref linkend="example.properties.frag"></src:fragref> -<src:fragref linkend="exsl.node.set.available.frag"></src:fragref> -<src:fragref linkend="figure.properties.frag"></src:fragref> -<src:fragref linkend="firstterm.only.link.frag"></src:fragref> -<src:fragref linkend="footer.content.properties.frag"></src:fragref> -<src:fragref linkend="footer.rule.frag"></src:fragref> -<src:fragref linkend="footer.column.widths.frag"></src:fragref> -<src:fragref linkend="footer.table.height.frag"></src:fragref> -<src:fragref linkend="footer.table.properties.frag"></src:fragref> -<src:fragref linkend="footers.on.blank.pages.frag"></src:fragref> -<src:fragref linkend="footnote.font.size.frag"></src:fragref> -<src:fragref linkend="footnote.number.format.frag"></src:fragref> -<src:fragref linkend="footnote.number.symbols.frag"></src:fragref> -<src:fragref linkend="footnote.mark.properties.frag"></src:fragref> -<src:fragref linkend="footnote.properties.frag"></src:fragref> -<src:fragref linkend="footnote.sep.leader.properties.frag"></src:fragref> -<src:fragref linkend="fop.extensions.frag"></src:fragref> -<src:fragref linkend="fop1.extensions.frag"></src:fragref> -<src:fragref linkend="formal.object.properties.frag"></src:fragref> -<src:fragref linkend="formal.procedures.frag"></src:fragref> -<src:fragref linkend="formal.title.placement.frag"></src:fragref> -<src:fragref linkend="formal.title.properties.frag"></src:fragref> -<src:fragref linkend="funcsynopsis.decoration.frag"></src:fragref> -<src:fragref linkend="funcsynopsis.style.frag"></src:fragref> -<src:fragref linkend="function.parens.frag"></src:fragref> -<src:fragref linkend="generate.index.frag"></src:fragref> -<src:fragref linkend="generate.section.toc.level.frag"></src:fragref> -<src:fragref linkend="generate.toc.frag"></src:fragref> -<src:fragref linkend="glossary.as.blocks.frag"></src:fragref> -<src:fragref linkend="glossary.collection.frag"></src:fragref> -<src:fragref linkend="glossary.sort.frag"></src:fragref> -<src:fragref linkend="glossentry.show.acronym.frag"></src:fragref> -<src:fragref linkend="glosslist.as.blocks.frag"></src:fragref> -<src:fragref linkend="glossterm.auto.link.frag"></src:fragref> -<src:fragref linkend="glossterm.separation.frag"></src:fragref> -<src:fragref linkend="glossterm.width.frag"></src:fragref> -<src:fragref linkend="glossentry.list.item.properties.frag"></src:fragref> -<src:fragref linkend="glossterm.list.properties.frag"></src:fragref> -<src:fragref linkend="glossterm.block.properties.frag"></src:fragref> -<src:fragref linkend="glossdef.list.properties.frag"></src:fragref> -<src:fragref linkend="glossdef.block.properties.frag"></src:fragref> -<src:fragref linkend="graphic.default.extension.frag"></src:fragref> -<src:fragref linkend="header.content.properties.frag"></src:fragref> -<src:fragref linkend="header.rule.frag"></src:fragref> -<src:fragref linkend="header.column.widths.frag"></src:fragref> -<src:fragref linkend="header.table.height.frag"></src:fragref> -<src:fragref linkend="header.table.properties.frag"></src:fragref> -<src:fragref linkend="headers.on.blank.pages.frag"></src:fragref> -<src:fragref linkend="highlight.default.language.frag"></src:fragref> -<src:fragref linkend="highlight.source.frag"></src:fragref> -<src:fragref linkend="highlight.xslthl.config.frag"></src:fragref> -<src:fragref linkend="hyphenate.frag"></src:fragref> -<src:fragref linkend="hyphenate.verbatim.frag"></src:fragref> -<src:fragref linkend="hyphenate.verbatim.characters.frag"></src:fragref> -<src:fragref linkend="ignore.image.scaling.frag"></src:fragref> -<src:fragref linkend="img.src.path.frag"></src:fragref> -<src:fragref linkend="index.method.frag"></src:fragref> -<src:fragref linkend="index.on.role.frag"></src:fragref> -<src:fragref linkend="index.on.type.frag"></src:fragref> -<src:fragref linkend="index.page.number.properties.frag"></src:fragref> -<src:fragref linkend="informalequation.properties.frag"></src:fragref> -<src:fragref linkend="informalexample.properties.frag"></src:fragref> -<src:fragref linkend="informalfigure.properties.frag"></src:fragref> -<src:fragref linkend="informal.object.properties.frag"></src:fragref> -<src:fragref linkend="informaltable.properties.frag"></src:fragref> -<src:fragref linkend="index.preferred.page.properties.frag"></src:fragref> -<src:fragref linkend="index.div.title.properties.frag"></src:fragref> -<src:fragref linkend="index.entry.properties.frag"></src:fragref> -<src:fragref linkend="index.number.separator.frag"></src:fragref> -<src:fragref linkend="index.range.separator.frag"></src:fragref> -<src:fragref linkend="index.term.separator.frag"></src:fragref> -<src:fragref linkend="insert.link.page.number.frag"></src:fragref> -<src:fragref linkend="insert.xref.page.number.frag"></src:fragref> -<src:fragref linkend="itemizedlist.properties.frag"></src:fragref> -<src:fragref linkend="itemizedlist.label.properties.frag"></src:fragref> -<src:fragref linkend="itemizedlist.label.width.frag"></src:fragref> -<src:fragref linkend="keep.relative.image.uris.frag"></src:fragref> -<src:fragref linkend="l10n.gentext.default.language.frag"></src:fragref> -<src:fragref linkend="l10n.gentext.language.frag"></src:fragref> -<src:fragref linkend="l10n.gentext.use.xref.language.frag"></src:fragref> -<src:fragref linkend="l10n.lang.value.rfc.compliant.frag"></src:fragref> -<src:fragref linkend="label.from.part.frag"></src:fragref> -<src:fragref linkend="line-height.frag"></src:fragref> -<src:fragref linkend="linenumbering.everyNth.frag"></src:fragref> -<src:fragref linkend="linenumbering.extension.frag"></src:fragref> -<src:fragref linkend="linenumbering.separator.frag"></src:fragref> -<src:fragref linkend="linenumbering.width.frag"></src:fragref> -<src:fragref linkend="list.block.properties.frag"></src:fragref> -<src:fragref linkend="list.block.spacing.frag"></src:fragref> -<src:fragref linkend="list.item.spacing.frag"></src:fragref> -<src:fragref linkend="make.index.markup.frag"></src:fragref> -<src:fragref linkend="make.single.year.ranges.frag"></src:fragref> -<src:fragref linkend="make.year.ranges.frag"></src:fragref> -<src:fragref linkend="margin.note.properties.frag"></src:fragref> -<src:fragref linkend="margin.note.title.properties.frag"></src:fragref> -<src:fragref linkend="margin.note.float.type.frag"></src:fragref> -<src:fragref linkend="margin.note.width.frag"></src:fragref> -<src:fragref linkend="marker.section.level.frag"></src:fragref> -<src:fragref linkend="menuchoice.menu.separator.frag"></src:fragref> -<src:fragref linkend="menuchoice.separator.frag"></src:fragref> -<src:fragref linkend="monospace.font.family.frag"></src:fragref> -<src:fragref linkend="monospace.properties.frag"></src:fragref> -<src:fragref linkend="monospace.verbatim.properties.frag"></src:fragref> -<src:fragref linkend="monospace.verbatim.font.width.frag"></src:fragref> -<src:fragref linkend="nominal.table.width.frag"></src:fragref> -<src:fragref linkend="normal.para.spacing.frag"></src:fragref> -<src:fragref linkend="olink.doctitle.frag"></src:fragref> -<src:fragref linkend="olink.base.uri.frag"></src:fragref> -<src:fragref linkend="olink.debug.frag"></src:fragref> -<src:fragref linkend="olink.properties.frag"></src:fragref> -<src:fragref linkend="olink.lang.fallback.sequence.frag"></src:fragref> -<src:fragref linkend="orderedlist.properties.frag"></src:fragref> -<src:fragref linkend="orderedlist.label.properties.frag"></src:fragref> -<src:fragref linkend="orderedlist.label.width.frag"></src:fragref> -<src:fragref linkend="prefer.internal.olink.frag"></src:fragref> -<src:fragref linkend="insert.olink.page.number.frag"></src:fragref> -<src:fragref linkend="insert.olink.pdf.frag.frag"></src:fragref> -<src:fragref linkend="page.height.frag"></src:fragref> -<src:fragref linkend="page.height.portrait.frag"></src:fragref> -<src:fragref linkend="page.margin.bottom.frag"></src:fragref> -<src:fragref linkend="page.margin.inner.frag"></src:fragref> -<src:fragref linkend="page.margin.outer.frag"></src:fragref> -<src:fragref linkend="page.margin.top.frag"></src:fragref> -<src:fragref linkend="page.orientation.frag"></src:fragref> -<src:fragref linkend="page.width.frag"></src:fragref> -<src:fragref linkend="page.width.portrait.frag"></src:fragref> -<src:fragref linkend="paper.type.frag"></src:fragref> -<src:fragref linkend="part.autolabel.frag"></src:fragref> -<src:fragref linkend="passivetex.extensions.frag"></src:fragref> -<src:fragref linkend="pgwide.properties.frag"></src:fragref> -<src:fragref linkend="preface.autolabel.frag"></src:fragref> -<src:fragref linkend="preferred.mediaobject.role.frag"></src:fragref> -<src:fragref linkend="procedure.properties.frag"></src:fragref> -<src:fragref linkend="process.empty.source.toc.frag"></src:fragref> -<src:fragref linkend="process.source.toc.frag"></src:fragref> -<src:fragref linkend="profile.arch.frag"></src:fragref> -<src:fragref linkend="profile.audience.frag"></src:fragref> -<src:fragref linkend="profile.attribute.frag"></src:fragref> -<src:fragref linkend="profile.condition.frag"></src:fragref> -<src:fragref linkend="profile.conformance.frag"></src:fragref> -<src:fragref linkend="profile.lang.frag"></src:fragref> -<src:fragref linkend="profile.os.frag"></src:fragref> -<src:fragref linkend="profile.revision.frag"></src:fragref> -<src:fragref linkend="profile.revisionflag.frag"></src:fragref> -<src:fragref linkend="profile.role.frag"></src:fragref> -<src:fragref linkend="profile.security.frag"></src:fragref> -<src:fragref linkend="profile.separator.frag"></src:fragref> -<src:fragref linkend="profile.status.frag"></src:fragref> -<src:fragref linkend="profile.userlevel.frag"></src:fragref> -<src:fragref linkend="profile.value.frag"></src:fragref> -<src:fragref linkend="profile.vendor.frag"></src:fragref> -<src:fragref linkend="profile.wordsize.frag"></src:fragref> -<src:fragref linkend="punct.honorific.frag"></src:fragref> -<src:fragref linkend="qanda.defaultlabel.frag"></src:fragref> -<src:fragref linkend="qanda.in.toc.frag"></src:fragref> -<src:fragref linkend="qanda.nested.in.toc.frag"></src:fragref> -<src:fragref linkend="qanda.inherit.numeration.frag"></src:fragref> -<src:fragref linkend="qandadiv.autolabel.frag"></src:fragref> -<src:fragref linkend="qanda.title.level1.properties.frag"></src:fragref> -<src:fragref linkend="qanda.title.level2.properties.frag"></src:fragref> -<src:fragref linkend="qanda.title.level3.properties.frag"></src:fragref> -<src:fragref linkend="qanda.title.level4.properties.frag"></src:fragref> -<src:fragref linkend="qanda.title.level5.properties.frag"></src:fragref> -<src:fragref linkend="qanda.title.level6.properties.frag"></src:fragref> -<src:fragref linkend="qanda.title.properties.frag"></src:fragref> -<src:fragref linkend="refentry.generate.name.frag"></src:fragref> -<src:fragref linkend="refentry.generate.title.frag"></src:fragref> -<src:fragref linkend="refentry.pagebreak.frag"></src:fragref> -<src:fragref linkend="refentry.title.properties.frag"></src:fragref> -<src:fragref linkend="refentry.xref.manvolnum.frag"></src:fragref> -<src:fragref linkend="reference.autolabel.frag"></src:fragref> -<src:fragref linkend="refclass.suppress.frag"></src:fragref> -<src:fragref linkend="region.after.extent.frag"></src:fragref> -<src:fragref linkend="region.before.extent.frag"></src:fragref> -<src:fragref linkend="revhistory.table.properties.frag"></src:fragref> -<src:fragref linkend="revhistory.table.cell.properties.frag"></src:fragref> -<src:fragref linkend="revhistory.title.properties.frag"></src:fragref> -<src:fragref linkend="root.properties.frag"></src:fragref> -<src:fragref linkend="rootid.frag"></src:fragref> -<src:fragref linkend="runinhead.default.title.end.punct.frag"></src:fragref> -<src:fragref linkend="runinhead.title.end.punct.frag"></src:fragref> -<src:fragref linkend="sans.font.family.frag"></src:fragref> -<src:fragref linkend="section.autolabel.frag"></src:fragref> -<src:fragref linkend="section.autolabel.max.depth.frag"></src:fragref> -<src:fragref linkend="section.container.element.frag"></src:fragref> -<src:fragref linkend="section.label.includes.component.label.frag"></src:fragref> -<src:fragref linkend="section.title.level1.properties.frag"></src:fragref> -<src:fragref linkend="section.title.level2.properties.frag"></src:fragref> -<src:fragref linkend="section.title.level3.properties.frag"></src:fragref> -<src:fragref linkend="section.title.level4.properties.frag"></src:fragref> -<src:fragref linkend="section.title.level5.properties.frag"></src:fragref> -<src:fragref linkend="section.title.level6.properties.frag"></src:fragref> -<src:fragref linkend="section.title.properties.frag"></src:fragref> -<src:fragref linkend="section.level1.properties.frag"></src:fragref> -<src:fragref linkend="section.level2.properties.frag"></src:fragref> -<src:fragref linkend="section.level3.properties.frag"></src:fragref> -<src:fragref linkend="section.level4.properties.frag"></src:fragref> -<src:fragref linkend="section.level5.properties.frag"></src:fragref> -<src:fragref linkend="section.level6.properties.frag"></src:fragref> -<src:fragref linkend="section.properties.frag"></src:fragref> -<src:fragref linkend="segmentedlist.as.table.frag"></src:fragref> -<src:fragref linkend="shade.verbatim.frag"></src:fragref> -<src:fragref linkend="shade.verbatim.style.frag"></src:fragref> -<src:fragref linkend="show.comments.frag"></src:fragref> -<src:fragref linkend="sidebar.properties.frag"></src:fragref> -<src:fragref linkend="sidebar.title.properties.frag"></src:fragref> -<src:fragref linkend="sidebar.float.type.frag"></src:fragref> -<src:fragref linkend="sidebar.float.width.frag"></src:fragref> -<src:fragref linkend="simplesect.in.toc.frag"></src:fragref> -<src:fragref linkend="subscript.properties.frag"></src:fragref> -<src:fragref linkend="superscript.properties.frag"></src:fragref> -<src:fragref linkend="symbol.font.family.frag"></src:fragref> -<src:fragref linkend="table.cell.border.color.frag"></src:fragref> -<src:fragref linkend="table.cell.border.style.frag"></src:fragref> -<src:fragref linkend="table.cell.border.thickness.frag"></src:fragref> -<src:fragref linkend="table.cell.padding.frag"></src:fragref> -<src:fragref linkend="table.footnote.number.format.frag"></src:fragref> -<src:fragref linkend="table.footnote.number.symbols.frag"></src:fragref> -<src:fragref linkend="table.footnote.properties.frag"></src:fragref> -<src:fragref linkend="table.frame.border.color.frag"></src:fragref> -<src:fragref linkend="table.frame.border.style.frag"></src:fragref> -<src:fragref linkend="table.frame.border.thickness.frag"></src:fragref> -<src:fragref linkend="table.properties.frag"></src:fragref> -<src:fragref linkend="tablecolumns.extension.frag"></src:fragref> -<src:fragref linkend="table.table.properties.frag"></src:fragref> -<src:fragref linkend="target.database.document.frag"></src:fragref> -<src:fragref linkend="targets.filename.frag"></src:fragref> -<src:fragref linkend="textdata.default.encoding.frag"></src:fragref> -<src:fragref linkend="tex.math.delims.frag"></src:fragref> -<src:fragref linkend="tex.math.in.alt.frag"></src:fragref> -<src:fragref linkend="textinsert.extension.frag"></src:fragref> -<src:fragref linkend="title.font.family.frag"></src:fragref> -<src:fragref linkend="title.margin.left.frag"></src:fragref> -<src:fragref linkend="toc.indent.width.frag"></src:fragref> -<src:fragref linkend="toc.line.properties.frag"></src:fragref> -<src:fragref linkend="toc.margin.properties.frag"></src:fragref> -<src:fragref linkend="toc.max.depth.frag"></src:fragref> -<src:fragref linkend="toc.section.depth.frag"></src:fragref> -<src:fragref linkend="ulink.footnotes.frag"></src:fragref> -<src:fragref linkend="ulink.hyphenate.frag"></src:fragref> -<src:fragref linkend="ulink.hyphenate.chars.frag"></src:fragref> -<src:fragref linkend="ulink.show.frag"></src:fragref> -<src:fragref linkend="use.extensions.frag"></src:fragref> -<src:fragref linkend="use.local.olink.style.frag"></src:fragref> -<src:fragref linkend="use.role.as.xrefstyle.frag"></src:fragref> -<src:fragref linkend="use.role.for.mediaobject.frag"></src:fragref> -<src:fragref linkend="use.svg.frag"></src:fragref> -<src:fragref linkend="variablelist.as.blocks.frag"></src:fragref> -<src:fragref linkend="variablelist.max.termlength.frag"></src:fragref> -<src:fragref linkend="variablelist.term.separator.frag"></src:fragref> -<src:fragref linkend="variablelist.term.properties.frag"></src:fragref> -<src:fragref linkend="variablelist.term.break.after.frag"></src:fragref> -<src:fragref linkend="verbatim.properties.frag"></src:fragref> -<src:fragref linkend="writing.mode.frag"></src:fragref> -<src:fragref linkend="xep.extensions.frag"></src:fragref> -<src:fragref linkend="xep.index.item.properties.frag"></src:fragref> -<src:fragref linkend="xref.label-page.separator.frag"></src:fragref> -<src:fragref linkend="xref.label-title.separator.frag"></src:fragref> -<src:fragref linkend="xref.properties.frag"></src:fragref> -<src:fragref linkend="xref.title-page.separator.frag"></src:fragref> -<src:fragref linkend="xref.with.number.and.title.frag"></src:fragref> - -</xsl:stylesheet> - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/param.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/param.xsl deleted file mode 100644 index 6b037bc7ba49e95a1c491cb9797524ebaf915ff7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/param.xsl +++ /dev/null @@ -1,948 +0,0 @@ - - - - - - - - - 0.0in - 0.0in - - - - bold - always - always - - - - false - center - -.png - -images/ - - - - 14pt - bold - false - always - - - 1em - 0.8em - 1.2em - 1em - 0.8em - 1.2em - - - 0.8em - 1em - 1.2em - 0.25in - 0.25in - -justify -A - - - - - - - -. - -. - - 0.5in - -0.5in - -http://docbook.sourceforge.net/release/bibliography/bibliography.xml - - -normal - -0.5in -0.5in -0.5em -1em -2em - -serif -10 - - pt - -0.5in -0.5in - - - 0pt - 0pt - 4pc - - -0pt - - -60 - -.svg - -7pt - -30 -images/callouts/ -ZapfDingbats - -10 -10102 - - -no - - - -2 - - -12pt -12pt -12pt -12pt -12pt -12pt - - 0em - 0em - 0.2em - - - - always - - - - false - - - center - start - - - - - - - -0.5pt -24pt -6pt - - - - left - before - - - - -all -none -pt -serif - -no -images/draft.png - - - - ::= - - - - - - - - - end - center - - - - - 1 - 0 - - - - - - - - - - - - - -1 1 1 -14pt - - fixed - 100% - - - - pt - -1 - - - - 75% - normal - normal - - - - - normal - normal - - 0pt - 0pt - - wrap - treat-as-space - - - black - rule - 1in - - - - - 0.5em - 1em - 2em - 0.5em - 1em - 2em - always - - - -figure before -example before -equation before -table before -procedure before -task before - - - bold - - - pt - - false - 0.4em - 0.6em - 0.8em - - -kr - - - - - -/appendix toc,title -article/appendix nop -/article toc,title -book toc,title,figure,table,example,equation -/chapter toc,title -part toc,title -/preface toc,title -reference toc,title -/sect1 toc -/sect2 toc -/sect3 toc -/sect4 toc -/sect5 toc -/section toc -set toc,title - - - - -no - - -0.25in -2in - - 1em - 0.8em - 1.2em - - - - - 1em - 0.8em - 1.2em - always - always - - - - - .25in - - - - - - - - - - - -1 1 1 -14pt - - fixed - 100% - - - - - -true - - - - -basic - - - - - - - - - 0.5em - 1em - 2em - 0.5em - 1em - 2em - - - - bold - - - 0pt - 14.4pt - - bold - always - - - - 0pt - - - 0pt - - - - -no -no - - - - - 1.0em - - - -en - - - - -normal -5 - - -3 - - 0.2em - 1.5em - - - 1em - 0.8em - 1.2em - 1em - 0.8em - 1.2em - - - 1em - 0.8em - 1.2em - - - - - - 90% - start - - - bold - false - start - always - -none -1in -2 - -+ -monospace - - - - - - - start - no-wrap - -0.60em -6in - - 1em - 0.8em - 1.2em - -no - - - - replace - - - - 2em - - - -1.2em - -no - - - - - - - - - - - - - - 210mm - 11in - 8.5in - 2378mm - 1682mm - 1189mm - 841mm - 594mm - 420mm - 297mm - 210mm - 148mm - 105mm - 74mm - 52mm - 37mm - 1414mm - 1000mm - 707mm - 500mm - 353mm - 250mm - 176mm - 125mm - 88mm - 62mm - 44mm - 1297mm - 917mm - 648mm - 458mm - 324mm - 229mm - 162mm - 114mm - 81mm - 57mm - 40mm - 11in - - -0.5in - - - 1.25in - 1in - - - - - 0.75in - 1in - - -0.5in -portrait - - - - - - - - - - - - - 8.5in - 1682mm - 1189mm - 841mm - 594mm - 420mm - 297mm - 210mm - 148mm - 105mm - 74mm - 52mm - 37mm - 26mm - 1000mm - 707mm - 500mm - 353mm - 250mm - 176mm - 125mm - 88mm - 62mm - 44mm - 31mm - 917mm - 648mm - 458mm - 324mm - 229mm - 162mm - 114mm - 81mm - 57mm - 40mm - 28mm - 8.5in - - -USletter -I - - - 0pt - - - - - auto - - - - - - - - - - - - - - -; - - - - - -. -number - - - - - - - - pt - - - - - - pt - - - - - - pt - - - - - - pt - - - - - - pt - - - - - - pt - - - - - - - bold - - always - 0.8em - 1.0em - 1.2em - - - - - - - - - 18pt - bold - 1em - false - always - 0.8em - 1.0em - 1.2em - 0.5em - 0.4em - 0.6em - - - - I - -0.4in -0.4in - - - - - - - - - - - - - - - - - - - - character-by-character - disregard-shifts - - - - - -. -.!?: -sans-serif - -8 -block - - - - - pt - - - - - - pt - - - - - - pt - - - - - - pt - - - - - - pt - - - - - - pt - - - - - - - bold - - always - 0.8em - 1.0em - 1.2em - start - - - - - - - - - - - - - - - - - - - - - #E0E0E0 - - - - solid - 1pt - black - #DDDDDD - 12pt - 12pt - 6pt - 6pt - 0pt - 0pt - - - - bold - false - start - always - -none -1in - - - 75% - - - 75% - -Symbol,ZapfDingbats - -black -solid -0.5pt - - 2pt - 2pt - 2pt - 2pt - -a - - - - - normal - normal - 2pt - - - -black -solid -0.5pt - - auto - - - - retain - collapse - - olinkdb.xml -target.db - - - - -sans-serif - - - -4pc - 0pt - 0pt - - -24 - - - justify - start - - - - - 0.5em - 1em - 2em - 0.5em - 1em - 2em - -8 -2 - - -/ - - - - - - - -24 -, - - -0 - - 0.8em - 1em - 1.2em - 0.8em - 1em - 1.2em - false - no-wrap - false - preserve - preserve - start - - - - writing-mode - - - - - - - - - - true - true - - -: - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/passivetex.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/passivetex.xsl deleted file mode 100644 index 636323911319a5f7557caad34e447234fc7f5804..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/passivetex.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pdf2index b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pdf2index deleted file mode 100644 index c14d8ecdb31f1a7c15dc845099752543a2df8fb4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pdf2index +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/perl -- # -*- Perl -*- - -# this needs some cleanup... - -my $PSTOTEXT = "pstotext"; - -my $pdf = shift @ARGV; - -my $index = ""; -my $inindex = 0; -open (F, "$PSTOTEXT $pdf |"); -while () { - if (/^<\/index/) { - $index .= $_; - $inindex = 0; - } - $inindex = 1 if /^.*?<\/phrase>\s*)+)/s) { - $cindex .= $1; - $_ = $2; - $index = $'; # ' - - my @pages = m/.*?<\/phrase>\s*/sg; - - # Expand ranges - if ($#pages >= 0) { - my @mpages = (); - foreach my $page (@pages) { - my $pageno = &pageno($page); - if ($pageno =~ /^([0-9]+)[^0-9]([0-9]+)$/) { # funky - - for (my $count = $1; $count <= $2; $count++) { - push (@mpages, "$count"); - } - } else { - push (@mpages, $page); - } - } - @pages = sort rangesort @mpages; - } - - # Remove duplicates... - if ($#pages > 0) { - my @mpages = (); - my $current = ""; - foreach my $page (@pages) { - my $pageno = &pageno($page); - if ($pageno ne $current) { - push (@mpages, $page); - $current = $pageno; - } - } - @pages = @mpages; - } - - # Collapse ranges... - if ($#pages > 1) { - my @cpages = (); - while (@pages) { - my $count = 0; - my $len = &rangelen($count, @pages); - if ($len <= 2) { - my $page = shift @pages; - push (@cpages, $page); - } else { - my $fpage = shift @pages; - my $lpage = ""; - while ($len > 1) { - $lpage = shift @pages; - $len--; - } - my $fpno = &pageno($fpage); - my $lpno = &pageno($lpage); - $fpage =~ s/>$fpno${fpno}-$lpno//; - $page =~ s/^//; - - return $1 if $page =~ /^([^<>]+)/; - return "?"; -} - -sub rangesort { - my $apno = &pageno($a); - my $bpno = &pageno($b); - - # Make sure roman pages come before arabic ones, otherwise sort them in order - return -1 if ($apno !~ /^\d+/ && $bpno =~ /^\d+/); - return 1 if ($apno =~ /^\d+/ && $bpno !~ /^\d+/); - return $apno <=> $bpno; -} - -sub rangelen { - my $count = shift; - my @pages = @_; - my $len = 1; - my $inrange = 1; - - my $current = &pageno($pages[$count]); - while ($count < $#pages && $inrange) { - $count++; - my $next = &pageno($pages[$count]); - if ($current + 1 eq $next) { - $current = $next; - $inrange = 1; - $len++; - } else { - $inrange = 0; - } - } - - return $len; -} diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pi.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pi.xml deleted file mode 100644 index 701d414cf9045ba11f2605363e70f456623be334..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pi.xml +++ /dev/null @@ -1,1002 +0,0 @@ - - -FO Processing Instruction Reference - - $Id: pi.xsl 8487 2009-07-14 21:43:36Z bobstayton $ - - - - - Introduction - - -This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for FO output. - - -You add these PIs at particular points in a document to - cause specific “exceptions†to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - -dbfo_background-color -Sets background color for an image - - - - dbfo background-color="color" - - -Description - -Use the dbfo background-color PI before or - after an image (graphic, inlinegraphic, - imagedata, or videodata element) as a - sibling to the element, to set a background color for the - image. - - Parameters - - - background-color="color" - - -An HTML color value - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Background color - - - - - -dbfo_bgcolor -Sets background color on a table row or table cell - - - - dbfo bgcolor="color" - - -Description - -Use the dbfo bgcolor PI as child of a table row - or cell to set a background color for that table row or cell. - - -This PI works for both CALS and HTML tables. - - Parameters - - - bgcolor="color" - - -An HTML color value - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Cell background color - - - - - -dbfo_float-type -Specifies float behavior for a sidebar - - - - dbfo float-type="margin.note" - - -Description - -Use the dbfo float-type PI to specify the float - behavior for a sidebar (to cause the sidebar to be - displayed as a marginal note). - - Parameters - - - float-type="margin.note" - - -Specifies that the sidebar should be - displayed as a marginal note. - - - - - - Related Global Parameters - -sidebar.float.type (parameter), - sidebar.float.width (parameter), - sidebar.properties (attribute-set), - sidebar.title.properties (attribute-set) - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -A sidebar as - side float - - - - - -dbfo_funcsynopsis-style -Specifies presentation style for a funcsynopsis - - - - dbfo funcsynopsis-style="kr"|"ansi" - - -Description - -Use the dbfo funcsynopsis-style PI as a child of - a funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - Parameters - - - funcsynopsis-style="kr" - - -Displays funcprototype output in K&R style - - - - funcsynopsis-style="ansi" - - -Displays funcprototype output in ANSI style - - - - - - Related Global Parameters - -funcsynopsis.style - - - - - -dbfo_glossary-presentation -Specifies presentation style for a glossary - - - - dbfo glossary-presentation="list"|"blocks" - - -Description - -Use the dbfo glossary-presentation PI as a child of - a glossary to control its presentation style. - - Parameters - - - glossary-presentation="list" - - -Displays the glossary as a list - - - - glossary-presentation="blocks" - - -Displays the glossary as blocks - - - - - - Related Global Parameters - -glossary.as.blocks - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Glossary - formatting in print - - - - - -dbfo_glosslist-presentation -Specifies presentation style for a glosslist - - - - dbfo glosslist-presentation="list"|"blocks" - - -Description - -Use the dbfo glosslist-presentation PI as a child of - a glosslist to control its presentation style. - - Parameters - - - glosslist-presentation="list" - - -Displays the glosslist as a list - - - - glosslist-presentation="blocks" - - -Displays the glosslist as blocks - - - - - - Related Global Parameters - -glosslist.as.blocks - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Glossary - formatting in print - - - - - -dbfo_glossterm-width -Specifies the glossterm width for a glossary or - glosslist - - - - dbfo glossterm-width="width" - - -Description - -Use the dbfo glossterm-width PI as a child of a - glossary or glosslist to specify the - width for output of glossterm instances in the - output. - - Parameters - - - glossterm-width="width" - - -Specifies the glossterm width (including units) - - - - - - Related Global Parameters - -glossterm.width, - glossterm.separation - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Glossary - formatting in print - - - - - -dbfo_keep-together -Specifies “keep†behavior for a table, example, - figure, equation, procedure, or task - - - - dbfo keep-together="auto"|"always" - - -Description - -Use the dbfo keep-together PI as a child of a - formal object (table, example, - figure, equation, procedure, or - task) to specify “keep†behavior (to allow the object to - “break†across a page). - - -The PI also works with informaltable, informalexample, - informalfigure and informalequation. - - - - Parameters - - - keep-together="auto" - - -Enables the object to break across a page - - - - keep-together="always" - - -Prevents the object from breaking across a page (the - default stylesheet behavior) - - - - - - Related Global Parameters - -formal.object.properties - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Keep-together processing instruction - - - - - -dbfo_label-width -Specifies the label width for a qandaset, itemizedlist, orderedlist - or calloutlist - - - - dbfo label-width="width" - - -Description - -Use the dbfo label-width PI as a child of a - qandaset, itemizedlist, orderedlist, - or calloutlist to specify the width of labels. - - Parameters - - - label-width="width" - - -Specifies the label width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Q and A formatting - - - - - -dbfo_linenumbering.everyNth -Specifies interval for line numbers in verbatims - - - - dbfo linenumbering.everyNth="N" - - -Description - -Use the dbfo linenumbering.everyNth PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the interval at which lines are numbered. - - Parameters - - - linenumbering.everyNth="N" - - -Specifies numbering interval; a number is output - before every Nth line - - - - - - Related Global Parameters - -linenumbering.everyNth - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbfo_linenumbering.separator -Specifies separator text for line numbers in verbatims - - - - dbfo linenumbering.separator="text" - - -Description - -Use the dbfo linenumbering.separator PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the separator text output between the line numbers and content. - - Parameters - - - linenumbering.separator="text" - - -Specifies the text (zero or more characters) - - - - - - Related Global Parameters - -linenumbering.separator - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbfo_linenumbering.width -Specifies width for line numbers in verbatims - - - - dbfo linenumbering.width="width" - - -Description - -Use the dbfo linenumbering.width PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the width set aside for line numbers. - - Parameters - - - linenumbering.width="width" - - -Specifies the width (inluding units) - - - - - - Related Global Parameters - -linenumbering.width - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbfo_list-presentation -Specifies presentation style for a variablelist or - segmentedlist - - - - dbfo list-presentation="list"|"blocks"|"table" - - -Description - -Use the dbfo list-presentation PI as a child of - a variablelist or segmentedlist to - control the presentation style for the list (to cause it, for - example, to be displayed as a table). - - Parameters - - - list-presentation="list" - - -Displays the list as a list - - - - list-presentation="blocks" - - -(variablelist only) Displays the list as blocks - - - - list-presentation="table" - - -(segmentedlist only) Displays the list as a table - - - - - - Related Global Parameters - - - - -variablelist.as.blocks - - - - -variablelist.as.table - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in print - - - - - -dbfo_list-width -Specifies the width of a horizontal simplelist - - - - dbfo list-width="width" - - -Description - -Use the dbfo list-width PI as a child of a - simplelist whose class - value is horizontal, to specify the width - of the simplelist. - - Parameters - - - list-width="width" - - -Specifies the simplelist width (including units) - - - - - - - - - -dbfo_orientation -Specifies the orientation for a CALS table row or cell - - - - dbfo orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270" - - -Description - -Use the dbfo orientation PI as a child of a CALS - table row or cell to specify the orientation - (rotation) for the row or cell. - - Parameters - - - orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270" - - -Specifies the number of degrees by which the cell or - row is rotated - - - - - - - - - -dbfo_pgwide -Specifies if an equation or example goes across full page width - - - - dbfo pgwide="0"|"1" - - -Description - -Use the dbfo pgwide PI as a child of an - equation or example to specify that the - content should rendered across the full width of the page. - - Parameters - - - pgwide="0" - - -If zero, the content is rendered across the current - text flow - - - - pgwide="1" - - -If 1 (or any non-zero value), the - content is rendered across the full width of the page - - - - - - Related Global Parameters - -pgwide.properties - - - - - -dbfo_rotated-width -Specifies the width for a CALS table entry or - row - - - - dbfo rotated-width="width" - - -Description - -Use the dbfo rotated-width PI as a child of - entry or row instance in a CALS table to specify the - width of that the entry or row; or - use it higher up in table to cause the width to be inherited - recursively down. - - Parameters - - - rotated-width="width" - - -Specifies the width of a row or cell (including units) - - - - - - - - - -dbfo_sidebar-width -Specifies the width of a sidebar - - - - dbfo sidebar-width="width" - - -Description - -Use the dbfo sidebar-width PI as a child of a - sidebar to specify the width of the sidebar. - - Parameters - - - sidebar-width="width" - - -Specifies the sidebar width (including units) - - - - - - Related Global Parameters - -sidebar.float.type parameter, - sidebar.float.width parameter, - sidebar.properties attribute-set, - sidebar.title.properties - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -A sidebar as - side float - - - - - -dbfo_start -(obsolete) Sets the starting number on an ordered list - - - - dbfo start="character" - - -Description - -This PI is obsolete. The intent of - it was to provide a means for setting a specific starting - number for an ordered list. Instead of this PI, set a value - for the override attribute on the first - listitem in the list; that will have the same - effect as what this PI was intended for. - - Parameters - - - start="character" - - -Specifies the character to use as the starting - number; use 0-9, a-z, A-Z, or lowercase or uppercase - Roman numerals - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -List starting number - - - - - -dbfo_table-width -Specifies the width for a CALS table or for revhistory - output - - - - dbfo table-width="width" - - -Description - -Use the dbfo table-width PI as a child or - sibling of a CALS table, or as a child of an - informaltable, entrytbl, or - revhistory instance (which is rendered as a table - in output) to specify the width of the table in output. - - Parameters - - - table-width="width" - - -Specifies the table width (including units or as a percentage) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Table width - - - - - -dbfo_term-width -Specifies the term width for a variablelist - - - - dbfo term-width="width" - - -Description - -Use the dbfo term-width PI as a child of a - variablelist to specify the width for - term output. - - Parameters - - - term-width="width" - - -Specifies the term width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in print - - - - - -dbfo_toc -Specifies whether a TOC should be generated for a qandaset - - - - dbfo toc="0"|"1" - - -Description - -Use the dbfo toc PI as a child of a - qandaset to specify whether a table of contents - (TOC) is generated for the qandaset. - - Parameters - - - toc="0" - - -If zero, no TOC is generated - - - - toc="1" - - -If 1 (or any non-zero value), - a TOC is generated - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Q and A list of questions, - Q and A formatting - - - - - -dbfo-need -Specify a need for space (a kind of soft page break) - - - - dbfo-need height="n" [space-before="n"] - - -Description - -A “need†is a request for space on a page. If the - requested space is not available, the page breaks and the - content that follows the need request appears on the next - page. If the requested space is available, then no page break - is inserted. - - Parameters - - - height="n" - - -The amount of height needed (including units) - - - - space-before="n" - - -The amount of extra vertical space to add (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Soft page breaks - - - - - -dbfo_row-height -Specifies the height for a CALS table row - - - - dbfo row-height="height" - - -Description - -Use the dbfo row-height PI as a child of a - row to specify the height of the row. - - Parameters - - - row-height="height" - - -Specifies the row height (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Row height - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pi.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pi.xsl deleted file mode 100644 index 58e02b37d3189fb31c74e0e487b114217035c140..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/pi.xsl +++ /dev/null @@ -1,1093 +0,0 @@ - - - - - -FO Processing Instruction Reference - - $Id: pi.xsl 8487 2009-07-14 21:43:36Z bobstayton $ - - - - - Introduction - - This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for FO output. - - You add these PIs at particular points in a document to - cause specific “exceptions†to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - - Sets background color for an image - - Use the dbfo background-color PI before or - after an image (graphic, inlinegraphic, - imagedata, or videodata element) as a - sibling to the element, to set a background color for the - image. - - - dbfo background-color="color" - - - - background-color="color" - - An HTML color value - - - - - - Background color - - - - - - - - - - - - Sets background color on a table row or table cell - - Use the dbfo bgcolor PI as child of a table row - or cell to set a background color for that table row or cell. - This PI works for both CALS and HTML tables. - - - dbfo bgcolor="color" - - - - bgcolor="color" - - An HTML color value - - - - - - Cell background color - - - - - - - - - - - - Specifies float behavior for a sidebar - - Use the dbfo float-type PI to specify the float - behavior for a sidebar (to cause the sidebar to be - displayed as a marginal note). - - - dbfo float-type="margin.note" - - - - float-type="margin.note" - - Specifies that the sidebar should be - displayed as a marginal note. - - - - - - sidebar.float.type (parameter), - sidebar.float.width (parameter), - sidebar.properties (attribute-set), - sidebar.title.properties (attribute-set) - - - - A sidebar as - side float - - - - - - - - - - - - Specifies presentation style for a funcsynopsis - - Use the dbfo funcsynopsis-style PI as a child of - a funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - - dbfo funcsynopsis-style="kr"|"ansi" - - - - funcsynopsis-style="kr" - - Displays funcprototype output in K&R style - - - funcsynopsis-style="ansi" - - Displays funcprototype output in ANSI style - - - - - - funcsynopsis.style - - - - - - - - - - - - Specifies presentation style for a glossary - - Use the dbfo glossary-presentation PI as a child of - a glossary to control its presentation style. - - - dbfo glossary-presentation="list"|"blocks" - - - - glossary-presentation="list" - - Displays the glossary as a list - - - glossary-presentation="blocks" - - Displays the glossary as blocks - - - - - - glossary.as.blocks - - - Glossary - formatting in print - - - - - - - - - - - - Specifies presentation style for a glosslist - - Use the dbfo glosslist-presentation PI as a child of - a glosslist to control its presentation style. - - - dbfo glosslist-presentation="list"|"blocks" - - - - glosslist-presentation="list" - - Displays the glosslist as a list - - - glosslist-presentation="blocks" - - Displays the glosslist as blocks - - - - - - glosslist.as.blocks - - - Glossary - formatting in print - - - - - - - - - - - - Specifies the glossterm width for a glossary or - glosslist - - Use the dbfo glossterm-width PI as a child of a - glossary or glosslist to specify the - width for output of glossterm instances in the - output. - - - dbfo glossterm-width="width" - - - - glossterm-width="width" - - Specifies the glossterm width (including units) - - - - - - glossterm.width, - glossterm.separation - - - - Glossary - formatting in print - - - - - - - - - - - - Specifies “keep†behavior for a table, example, - figure, equation, procedure, or task - - Use the dbfo keep-together PI as a child of a - formal object (table, example, - figure, equation, procedure, or - task) to specify “keep†behavior (to allow the object to - “break†across a page). - The PI also works with informaltable, informalexample, - informalfigure and informalequation. - - - - - dbfo keep-together="auto"|"always" - - - - keep-together="auto" - - Enables the object to break across a page - - - keep-together="always" - - Prevents the object from breaking across a page (the - default stylesheet behavior) - - - - - - formal.object.properties - - - Keep-together processing instruction - - - - - - - - - - - - Specifies the label width for a qandaset, itemizedlist, orderedlist - or calloutlist - - Use the dbfo label-width PI as a child of a - qandaset, itemizedlist, orderedlist, - or calloutlist to specify the width of labels. - - - dbfo label-width="width" - - - - label-width="width" - - Specifies the label width (including units) - - - - - - Q and A formatting - - - - - - - - - - - - Specifies interval for line numbers in verbatims - - Use the dbfo linenumbering.everyNth PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the interval at which lines are numbered. - - - dbfo linenumbering.everyNth="N" - - - - linenumbering.everyNth="N" - - Specifies numbering interval; a number is output - before every Nth line - - - - - - linenumbering.everyNth - - - Line numbering - - - - - - - - - - - - Specifies separator text for line numbers in verbatims - - Use the dbfo linenumbering.separator PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the separator text output between the line numbers and content. - - - dbfo linenumbering.separator="text" - - - - linenumbering.separator="text" - - Specifies the text (zero or more characters) - - - - - - linenumbering.separator - - - Line numbering - - - - - - - - - - - - Specifies width for line numbers in verbatims - - Use the dbfo linenumbering.width PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the width set aside for line numbers. - - - dbfo linenumbering.width="width" - - - - linenumbering.width="width" - - Specifies the width (inluding units) - - - - - - linenumbering.width - - - Line numbering - - - - - - - - - - - - Specifies presentation style for a variablelist or - segmentedlist - - Use the dbfo list-presentation PI as a child of - a variablelist or segmentedlist to - control the presentation style for the list (to cause it, for - example, to be displayed as a table). - - - dbfo list-presentation="list"|"blocks"|"table" - - - - list-presentation="list" - - Displays the list as a list - - - list-presentation="blocks" - - (variablelist only) Displays the list as blocks - - - list-presentation="table" - - (segmentedlist only) Displays the list as a table - - - - - - - - variablelist.as.blocks - - - variablelist.as.table - - - - - Variable list formatting in print - - - - - - - - - - - - Specifies the width of a horizontal simplelist - - Use the dbfo list-width PI as a child of a - simplelist whose class - value is horizontal, to specify the width - of the simplelist. - - - dbfo list-width="width" - - - - list-width="width" - - Specifies the simplelist width (including units) - - - - - - - - - - - - - - - Specifies the orientation for a CALS table row or cell - - Use the dbfo orientation PI as a child of a CALS - table row or cell to specify the orientation - (rotation) for the row or cell. - - - dbfo orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270" - - - - orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270" - - Specifies the number of degrees by which the cell or - row is rotated - - - - - - - - - - - - - - - Specifies if an equation or example goes across full page width - - Use the dbfo pgwide PI as a child of an - equation or example to specify that the - content should rendered across the full width of the page. - - - dbfo pgwide="0"|"1" - - - - pgwide="0" - - If zero, the content is rendered across the current - text flow - - - pgwide="1" - - If 1 (or any non-zero value), the - content is rendered across the full width of the page - - - - - - pgwide.properties - - - - - - - - - - - - Specifies the width for a CALS table entry or - row - - Use the dbfo rotated-width PI as a child of - entry or row instance in a CALS table to specify the - width of that the entry or row; or - use it higher up in table to cause the width to be inherited - recursively down. - - - dbfo rotated-width="width" - - - - rotated-width="width" - - Specifies the width of a row or cell (including units) - - - - - - - - - - - - - - - Specifies the width of a sidebar - - Use the dbfo sidebar-width PI as a child of a - sidebar to specify the width of the sidebar. - - - dbfo sidebar-width="width" - - - - sidebar-width="width" - - Specifies the sidebar width (including units) - - - - - - sidebar.float.type parameter, - sidebar.float.width parameter, - sidebar.properties attribute-set, - sidebar.title.properties - - - - A sidebar as - side float - - - - - - - - - - - - (obsolete) Sets the starting number on an ordered list - - This PI is obsolete. The intent of - it was to provide a means for setting a specific starting - number for an ordered list. Instead of this PI, set a value - for the override attribute on the first - listitem in the list; that will have the same - effect as what this PI was intended for. - - - dbfo start="character" - - - - start="character" - - Specifies the character to use as the starting - number; use 0-9, a-z, A-Z, or lowercase or uppercase - Roman numerals - - - - - - List starting number - - - - - - - - - - - - Specifies the width for a CALS table or for revhistory - output - - Use the dbfo table-width PI as a child or - sibling of a CALS table, or as a child of an - informaltable, entrytbl, or - revhistory instance (which is rendered as a table - in output) to specify the width of the table in output. - - - dbfo table-width="width" - - - - table-width="width" - - Specifies the table width (including units or as a percentage) - - - - - - Table width - - - - - - - - - - - - Specifies the term width for a variablelist - - Use the dbfo term-width PI as a child of a - variablelist to specify the width for - term output. - - - dbfo term-width="width" - - - - term-width="width" - - Specifies the term width (including units) - - - - - - Variable list formatting in print - - - - - - - - - - - - Specifies whether a TOC should be generated for a qandaset - - Use the dbfo toc PI as a child of a - qandaset to specify whether a table of contents - (TOC) is generated for the qandaset. - - - dbfo toc="0"|"1" - - - - toc="0" - - If zero, no TOC is generated - - - toc="1" - - If 1 (or any non-zero value), - a TOC is generated - - - - - - Q and A list of questions, - Q and A formatting - - - - - - - - - - - - Specify a need for space (a kind of soft page break) - - A “need†is a request for space on a page. If the - requested space is not available, the page breaks and the - content that follows the need request appears on the next - page. If the requested space is available, then no page break - is inserted. - - - dbfo-need height="n" [space-before="n"] - - - - height="n" - - The amount of height needed (including units) - - - space-before="n" - - The amount of extra vertical space to add (including units) - - - - - - Soft page breaks - - - - - Specifies the height for a CALS table row - - Use the dbfo row-height PI as a child of a - row to specify the height of the row. - - - dbfo row-height="height" - - - - row-height="height" - - Specifies the row height (including units) - - - - - - Row height - - - - - - - - - - - - - - - - - - - - - - - - - 0pt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - filename - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/profile-docbook.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/profile-docbook.xsl deleted file mode 100644 index 973442f97ec47c63e1cee8b494abaa0183c2c1d4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/profile-docbook.xsl +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Element - - in namespace ' - - ' encountered - - in - - - , but no template matches. - - - - < - - > - - </ - - > - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - ERROR: Document root element ($rootid= - - ) for FO output - must be one of the following elements: - - - - - - - - - - - - - - - - - - - - - ERROR: Document root element for FO output - must be one of the following elements: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [could not find document title] - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Making - - pages on - - paper ( - - x - - ) - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/ptc.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/ptc.xsl deleted file mode 100644 index 2b26b720fc398896d5c7b5f0c1c922dbc5e97e19..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/ptc.xsl +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/qandaset.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/qandaset.xsl deleted file mode 100644 index 5b26b451b7c6e5d5d5695da01a7c4db3d5d63381..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/qandaset.xsl +++ /dev/null @@ -1,397 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.5em - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - em * 0.50 - - - 5em - - - 4em - - - 3em - - 2.5em - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.5em - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/refentry.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/refentry.xsl deleted file mode 100644 index 4128633eed38e3a0377db9731b59d4a5c67d5df3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/refentry.xsl +++ /dev/null @@ -1,640 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - page - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1em - - - - - - - - - - - , - - - - - - - - - em-dash - - - - - - - - - - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/sections.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/sections.xsl deleted file mode 100644 index 8ce7a3f4070ce87ff085fb0ba7d753d0121590bb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/sections.xsl +++ /dev/null @@ -1,766 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 1 - 2 - 3 - 4 - 5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 2 - 3 - 4 - 5 - - - - - - - - - - - - - - - - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - - - - - - - - - - - - 2 - - - - - - 1 - 2 - 3 - 4 - 5 - - - - - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/spaces.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/spaces.xsl deleted file mode 100644 index b5a7200cfa4197eb5452aeddb0e11cf225d01b6e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/spaces.xsl +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -0.5em -1em -0.5em -1em -0.33em -0.25em -0.16em - - -0.2em -0.1em - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/synop.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/synop.xsl deleted file mode 100644 index 7d14c07ab47a45a3e8ecd5a49bd58718a2581595..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/synop.xsl +++ /dev/null @@ -1,1009 +0,0 @@ - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - -   - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (void); - - - (); - - - - - - (...); - - - - - - - - - - - - ( - - - - - - - - - - - , - - - ); - - - - - - - - - - - - - - - , - - - - - - - ; - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - -java - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unrecognized language on - - : - - - - - - - - - - - - &RE; - - - - - - - - - - extends - - - &RE;     - - - - implements - - - &RE;     - - - - throws - - -  {&RE; - - } - - - - - - - - - - - , - - - - - - - - - - - -   - - - - - - , - - - - - - - , - - - - - - - , - - - - - - -    - - ; - - - - - - -   - - - - -   - - - - - - - - - void  - - - - - - - - 0 - - ,&RE; - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - - - ) - - &RE;    throws  - - - - - - - ; - - - - - - - - - - - : - - - &RE;     - - - - implements - - - &RE;     - - - - throws - - -  {&RE; - - } - - - - - - - - - - , - - - - - - - -   - - - - - - , - - - - - - - , - - - - - - - , - - - - - - -    - - ; - - - - - - -   - - - - -   - - - - - - - - - void  - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - &RE;    throws  - - - - - - - ; - - - - - - - - - interface - - - : - - - &RE;     - - - - implements - - - &RE;     - - - - throws - - -  {&RE; - - } - - - - - - - - - - , - - - - - - - -   - - - - - - , - - - - - - - , - - - - - - - , - - - - - - -    - - ; - - - - - - -   - - - - -   - - - - - - - - - void  - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - &RE;    raises( - - ) - - - - - - ; - - - - - - - - - package - - ;&RE; - - - @ISA = ( - - );&RE; - - - - - - - - - - - - - , - - - - - - - -   - - - - - - , - - - - - - - , - - - - - - - , - - - - - - -    - - ; - - - - - - -   - - - - -   - - - - - - - - - void  - - - - - - - - - , - - - - - - - - - - - - - - - sub - - - { ... }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/table.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/table.xml deleted file mode 100644 index f29952ab2157e55ec5956f978cc95c1f60c03485..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/table.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - Formatting Object Table Reference - - $Id: table.xsl 8814 2010-08-09 21:19:53Z bobstayton $ - - - - Introduction - -This is technical reference documentation for the FO - table-processing templates in the DocBook XSL Stylesheets. - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -calc.column.width -Calculate an XSL FO table column width specification from a -CALS table column width specification. - - -<xsl:template name="calc.column.width"> -<xsl:param name="colwidth">1*</xsl:param> - ... -</xsl:template> - -Description - -CALS expresses table column widths in the following basic -forms: - - - - - - -99.99units, a fixed length specifier. - - - - -99.99, a fixed length specifier without any units. - - - - -99.99*, a relative length specifier. - - - - -99.99*+99.99units, a combination of both. - - - - - - -The CALS units are points (pt), picas (pi), centimeters (cm), -millimeters (mm), and inches (in). These are the same units as XSL, -except that XSL abbreviates picas "pc" instead of "pi". If a length -specifier has no units, the CALS default unit (pt) is assumed. - - - -Relative length specifiers are represented in XSL with the -proportional-column-width() function. - - - -Here are some examples: - - - - - - -"36pt" becomes "36pt" - - - - -"3pi" becomes "3pc" - - - - -"36" becomes "36pt" - - - - -"3*" becomes "proportional-column-width(3)" - - - - -"3*+2pi" becomes "proportional-column-width(3)+2pc" - - - - -"1*+2" becomes "proportional-column-width(1)+2pt" - - - - -Parameters - - -colwidth - - -The CALS column width specification. - - - - - -Returns - -The XSL column width specification. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/table.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/table.xsl deleted file mode 100644 index 18d4a8e9748bd252d4b39351e5516b39b6264ef9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/table.xsl +++ /dev/null @@ -1,1682 +0,0 @@ - - - - - - - - - - - Formatting Object Table Reference - - $Id: table.xsl 8814 2010-08-09 21:19:53Z bobstayton $ - - - - Introduction - This is technical reference documentation for the FO - table-processing templates in the DocBook XSL Stylesheets. - This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0pt - none - 0pt - 0pt - 0pt - 0pt - 0pt - 0pt - - - 0pt - none - 0pt - 0pt - 0pt - 0pt - 0pt - 0pt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - all - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - none - none - none - - - - - - - - - - - - - - - - - - none - none - - - - - - - - - - - - - - - - - - none - none - none - - - - - - - - - - - - none - none - none - - - - - - - - - none - none - - - - none - - - - - - - - - none - none - - - - - - - - - - - - - - - - - - - - - none - none - none - none - - - - Impossible frame on table: - - - none - none - none - none - - - - - - - - - - - - - - - - - - - - - - - - - - Error: CALS tables must specify the number of columns. - - - - - - - - - - - - - - - - - - - - - - - - - fixed - - - - - - - - - - - - - - - - - - - - - No adjustColumnWidths function available. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - NOWIDTH - NOWIDTH - - - - - - - - - - - - - - + - - - NOWIDTH - NOWIDTH - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100% - - - - 100% - - - auto - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: overlapped row contains content! - - - - This row intentionally left blank - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - fixed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - center - after - - - Unexpected valign value: - - , center used. - - center - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - center - after - - - Unexpected valign value: - - , center used. - - center - - - - - - - - - - - - - - - - - - bold - - - - bold - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - : - - - - - - - - 0: - - - - - - - - - - - - - - - 0 - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - 1* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Calculate an XSL FO table column width specification from a -CALS table column width specification. - - -CALS expresses table column widths in the following basic -forms: - - - -99.99units, a fixed length specifier. - - -99.99, a fixed length specifier without any units. - - -99.99*, a relative length specifier. - - -99.99*+99.99units, a combination of both. - - - -The CALS units are points (pt), picas (pi), centimeters (cm), -millimeters (mm), and inches (in). These are the same units as XSL, -except that XSL abbreviates picas "pc" instead of "pi". If a length -specifier has no units, the CALS default unit (pt) is assumed. - -Relative length specifiers are represented in XSL with the -proportional-column-width() function. - -Here are some examples: - - - -"36pt" becomes "36pt" - - -"3pi" becomes "3pc" - - -"36" becomes "36pt" - - -"3*" becomes "proportional-column-width(3)" - - -"3*+2pi" becomes "proportional-column-width(3)+2pc" - - -"1*+2" becomes "proportional-column-width(1)+2pt" - - - - - - -colwidth - -The CALS column width specification. - - - - - - -The XSL column width specification. - - - - - 1* - - - - - - - - - - - - proportional-column-width( - - - - - - 1.00 - - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - pc - pt - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/task.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/task.xsl deleted file mode 100644 index 2f85647fd78683e3305723758624d5a4412bc750..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/task.xsl +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/titlepage.templates.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/titlepage.templates.xml deleted file mode 100644 index e3434bc3028e240a22901ceebcade3d5397438d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/titlepage.templates.xml +++ /dev/null @@ -1,1354 +0,0 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - <subtitle/> - - <corpauthor space-before="0.5em" - font-size="&hsize2;"/> - <authorgroup space-before="0.5em" - font-size="&hsize2;"/> - <author space-before="0.5em" - font-size="&hsize2;"/> - - <!-- If you add editor, include this t:predicate attribute - because only the first editor generates the list of editors. - <editor t:predicate="[position() = 1]"/> - --> - <othercredit space-before="0.5em"/> - <releaseinfo space-before="0.5em"/> - <copyright space-before="0.5em"/> - <legalnotice text-align="start" - margin-left="0.5in" - margin-right="0.5in" - font-family="{$body.fontset}"/> - <pubdate space-before="0.5em"/> - <revision space-before="0.5em"/> - <revhistory space-before="0.5em"/> - <abstract space-before="0.5em" - text-align="start" - margin-left="0.5in" - margin-right="0.5in" - font-family="{$body.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="set" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:named-template="division.title" - param:node="ancestor-or-self::set[1]" - text-align="center" - font-size="&hsize5;" - space-before="&hsize5space;" - font-weight="bold" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}" - text-align="center"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="book" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:named-template="division.title" - param:node="ancestor-or-self::book[1]" - text-align="center" - font-size="&hsize5;" - space-before="&hsize5space;" - font-weight="bold" - font-family="{$title.fontset}"/> - <subtitle - text-align="center" - font-size="&hsize4;" - space-before="&hsize4space;" - font-family="{$title.fontset}"/> - <corpauthor font-size="&hsize3;" - keep-with-next.within-column="always" - space-before="2in"/> - <authorgroup space-before="2in"/> - <author font-size="&hsize3;" - space-before="&hsize2space;" - keep-with-next.within-column="always"/> - <!-- If you add editor, include this t:predicate attribute - because only the first editor generates the list of editors. - <editor t:predicate="[position() = 1]"/> - --> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - <title - t:named-template="book.verso.title" - font-size="&hsize2;" - font-weight="bold" - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup t:named-template="verso.authorgroup"/> - <author/> - <!-- If you add editor, include this t:predicate attribute - because only the first editor generates the list of editors. - <editor t:predicate="[position() = 1]"/> - --> - <othercredit/> - <releaseinfo space-before="0.5em"/> - <pubdate space-before="1em"/> - <copyright/> - <abstract/> - <legalnotice font-size="8pt"/> - </t:titlepage-content> - - <t:titlepage-separator> - <fo:block break-after="page"/> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - <fo:block break-after="page"/> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="part" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:named-template="division.title" - param:node="ancestor-or-self::part[1]" - text-align="center" - font-size="&hsize5;" - space-before="&hsize5space;" - font-weight="bold" - font-family="{$title.fontset}"/> - <subtitle - text-align="center" - font-size="&hsize4;" - space-before="&hsize4space;" - font-weight='bold' - font-style='italic' - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="partintro" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - text-align="center" - font-size="&hsize5;" - font-weight="bold" - space-before="1em" - font-family="{$title.fontset}"/> - <subtitle - text-align="center" - font-size="&hsize2;" - font-weight="bold" - font-style="italic" - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="reference" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:named-template="division.title" - param:node="ancestor-or-self::reference[1]" - text-align="center" - font-size="&hsize5;" - space-before="&hsize5space;" - font-weight="bold" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}" - text-align="center"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="refsynopsisdiv" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="refsection" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="refsect1" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="refsect2" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="refsect3" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="dedication" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::dedication[1]" - margin-left="{$title.margin.left}" - font-size="&hsize5;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<!-- Same formatting as dedication --> - <t:titlepage t:element="acknowledgements" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::acknowledgements[1]" - margin-left="{$title.margin.left}" - font-size="&hsize5;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - - -<!-- ==================================================================== --> - - <t:titlepage t:element="preface" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::preface[1]" - margin-left="{$title.margin.left}" - font-size="&hsize5;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="chapter" t:wrapper="fo:block" - font-family="{$title.fontset}"> - <t:titlepage-content t:side="recto" margin-left="{$title.margin.left}"> - <title t:named-template="component.title" - param:node="ancestor-or-self::chapter[1]" - font-size="&hsize5;" - font-weight="bold"/> - - <subtitle space-before="0.5em" - font-style="italic" - font-size="&hsize2;" - font-weight="bold"/> - - <corpauthor space-before="0.5em" - space-after="0.5em" - font-size="&hsize2;"/> - - <authorgroup space-before="0.5em" - space-after="0.5em" - font-size="&hsize2;"/> - - <author space-before="0.5em" - space-after="0.5em" - font-size="&hsize2;"/> - - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="appendix" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:named-template="component.title" - param:node="ancestor-or-self::appendix[1]" - margin-left="{$title.margin.left}" - font-size="&hsize5;" - font-weight="bold" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="section" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - margin-left="{$title.margin.left}" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect1" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - margin-left="{$title.margin.left}" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect2" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - margin-left="{$title.margin.left}" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect3" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - margin-left="{$title.margin.left}" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect4" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - margin-left="{$title.margin.left}" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect5" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - margin-left="{$title.margin.left}" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="simplesect" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - margin-left="{$title.margin.left}" - font-family="{$title.fontset}"/> - <subtitle - font-family="{$title.fontset}"/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="bibliography" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::bibliography[1]" - margin-left="{$title.margin.left}" - font-size="&hsize5;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="bibliodiv" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title t:named-template="component.title" - param:node="ancestor-or-self::bibliodiv[1]" - margin-left="{$title.margin.left}" - font-size="&hsize4;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="glossary" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::glossary[1]" - margin-left="{$title.margin.left}" - font-size="&hsize5;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="glossdiv" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title t:named-template="component.title" - param:node="ancestor-or-self::glossdiv[1]" - margin-left="{$title.margin.left}" - font-size="&hsize4;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="index" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::index[1]" - param:pagewide="1" - margin-left="0pt" - font-size="&hsize5;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> - - <!-- The indexdiv.title template is used so that manual and --> - <!-- automatically generated indexdiv titles get the same --> - <!-- formatting. --> - - <t:titlepage t:element="indexdiv" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title t:force="1" - t:named-template="indexdiv.title" - param:title="title"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="setindex" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::setindex[1]" - param:pagewide="1" - margin-left="0pt" - font-size="&hsize5;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="colophon" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::colophon[1]" - margin-left="{$title.margin.left}" - font-size="&hsize5;" - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="sidebar" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - font-family="{$title.fontset}" - font-weight="bold"/> - <subtitle - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> -<t:titlepage t:element="qandaset" t:wrapper="fo:block" - font-family="{$title.fontset}"> - - <t:titlepage-content t:side="recto" - start-indent="0pt" - text-align="center"> - - <title t:named-template="component.title" - param:node="ancestor-or-self::qandaset[1]" - keep-with-next.within-column="always" - font-size="&hsize5;" - font-weight="bold"/> - - <subtitle/> - - <corpauthor space-before="0.5em" - font-size="&hsize2;"/> - <authorgroup space-before="0.5em" - font-size="&hsize2;"/> - <author space-before="0.5em" - font-size="&hsize2;"/> - - <othercredit space-before="0.5em"/> - <releaseinfo space-before="0.5em"/> - <copyright space-before="0.5em"/> - <legalnotice text-align="start" - margin-left="0.5in" - margin-right="0.5in" - font-family="{$body.fontset}"/> - <pubdate space-before="0.5em"/> - <revision space-before="0.5em"/> - <revhistory space-before="0.5em"/> - <abstract space-before="0.5em" - text-align="start" - margin-left="0.5in" - margin-right="0.5in" - font-family="{$body.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="table.of.contents" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="gentext" - param:key="'TableofContents'" - space-before.minimum="1em" - space-before.optimum="1.5em" - space-before.maximum="2em" - space-after="0.5em" - margin-left="{$title.margin.left}" - start-indent="0pt" - font-size="&hsize3;" - font-weight="bold" - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - - <t:titlepage t:element="list.of.tables" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="gentext" - param:key="'ListofTables'" - space-before.minimum="1em" - space-before.optimum="1.5em" - space-before.maximum="2em" - space-after="0.5em" - margin-left="{$title.margin.left}" - start-indent="0pt" - font-size="&hsize3;" - font-weight="bold" - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - - <t:titlepage t:element="list.of.figures" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="gentext" - param:key="'ListofFigures'" - space-before.minimum="1em" - space-before.optimum="1.5em" - space-before.maximum="2em" - space-after="0.5em" - margin-left="{$title.margin.left}" - start-indent="0pt" - font-size="&hsize3;" - font-weight="bold" - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - - <t:titlepage t:element="list.of.examples" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="gentext" - param:key="'ListofExamples'" - space-before.minimum="1em" - space-before.optimum="1.5em" - space-before.maximum="2em" - space-after="0.5em" - margin-left="{$title.margin.left}" - start-indent="0pt" - font-size="&hsize3;" - font-weight="bold" - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - - <t:titlepage t:element="list.of.equations" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="gentext" - param:key="'ListofEquations'" - space-before.minimum="1em" - space-before.optimum="1.5em" - space-before.maximum="2em" - space-after="0.5em" - margin-left="{$title.margin.left}" - start-indent="0pt" - font-size="&hsize3;" - font-weight="bold" - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - - <t:titlepage t:element="list.of.procedures" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="gentext" - param:key="'ListofProcedures'" - space-before.minimum="1em" - space-before.optimum="1.5em" - space-before.maximum="2em" - space-after="0.5em" - margin-left="{$title.margin.left}" - start-indent="0pt" - font-size="&hsize3;" - font-weight="bold" - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - - <t:titlepage t:element="list.of.unknowns" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="gentext" - param:key="'ListofUnknown'" - space-before.minimum="1em" - space-before.optimum="1.5em" - space-before.maximum="2em" - space-after="0.5em" - margin-left="{$title.margin.left}" - start-indent="0pt" - font-size="&hsize3;" - font-weight="bold" - font-family="{$title.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> - -</t:templates> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/titlepage.templates.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/titlepage.templates.xsl deleted file mode 100644 index 166c1870ecd93b38a88ca03314454048246b6caa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/titlepage.templates.xsl +++ /dev/null @@ -1,5183 +0,0 @@ -<?xml version="1.0"?> - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://docbook.org/ns/docbook" -xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl d"> - -<!-- This stylesheet was created by template/titlepage.xsl--> - -<xsl:template name="article.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:articleinfo/d:title"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:title"/> - </xsl:when> - <xsl:when test="d:artheader/d:title"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:articleinfo/d:subtitle"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:artheader/d:subtitle"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:corpauthor"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:corpauthor"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:authorgroup"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:authorgroup"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:author"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:author"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:othercredit"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:othercredit"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:releaseinfo"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:releaseinfo"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:copyright"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:copyright"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:legalnotice"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:legalnotice"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:pubdate"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:pubdate"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:revision"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:revision"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:revhistory"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:revhistory"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:abstract"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:abstract"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="article.titlepage.verso"> -</xsl:template> - -<xsl:template name="article.titlepage.separator"> -</xsl:template> - -<xsl:template name="article.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="article.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="article.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$title.fontset}"> - <xsl:variable name="recto.content"> - <xsl:call-template name="article.titlepage.before.recto"/> - <xsl:call-template name="article.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block start-indent="0pt" text-align="center"><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="article.titlepage.before.verso"/> - <xsl:call-template name="article.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="article.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="article.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="article.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:article[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="article.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="set.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:setinfo/d:title"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:setinfo/d:subtitle"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:corpauthor"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:authorgroup"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:author"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:othercredit"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:releaseinfo"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:copyright"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:legalnotice"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:pubdate"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:revision"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:revhistory"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:abstract"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="set.titlepage.verso"> -</xsl:template> - -<xsl:template name="set.titlepage.separator"> -</xsl:template> - -<xsl:template name="set.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="set.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="set.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="set.titlepage.before.recto"/> - <xsl:call-template name="set.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="set.titlepage.before.verso"/> - <xsl:call-template name="set.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="set.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="set.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="set.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" text-align="center" font-size="24.8832pt" 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::d:set[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" font-family="{$title.fontset}" text-align="center"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="set.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="book.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:bookinfo/d:title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:bookinfo/d:subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:author"/> -</xsl:template> - -<xsl:template name="book.titlepage.verso"> - <xsl:choose> - <xsl:when test="d:bookinfo/d:title"> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:corpauthor"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:authorgroup"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:author"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:othercredit"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:pubdate"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:copyright"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:abstract"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:abstract"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:bookinfo/d:legalnotice"/> - <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="d:info/d:legalnotice"/> -</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:variable name="recto.content"> - <xsl:call-template name="book.titlepage.before.recto"/> - <xsl:call-template name="book.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="book.titlepage.before.verso"/> - <xsl:call-template name="book.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="book.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="book.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="book.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d: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="24.8832pt" 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::d:book[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d: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="20.736pt" space-before="15.552pt" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" 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" font-size="17.28pt" keep-with-next.within-column="always" space-before="2in"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" 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" space-before="2in"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" 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" font-size="17.28pt" space-before="10.8pt" keep-with-next.within-column="always"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:title" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" font-size="14.4pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="book.verso.title"> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style"> -<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style"> -<xsl:call-template name="verso.authorgroup"> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style"> -<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style"> -<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" space-before="1em"> -<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style"> -<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style"> -<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="book.titlepage.verso.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" font-size="8pt"> -<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="part.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:partinfo/d:title"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:partinfo/d:subtitle"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="part.titlepage.verso"> -</xsl:template> - -<xsl:template name="part.titlepage.separator"> -</xsl:template> - -<xsl:template name="part.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="part.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="part.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="part.titlepage.before.recto"/> - <xsl:call-template name="part.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="part.titlepage.before.verso"/> - <xsl:call-template name="part.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="part.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="part.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="part.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="part.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="24.8832pt" 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::d:part[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="part.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="partintro.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:partintroinfo/d:title"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:partintroinfo/d:subtitle"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:corpauthor"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:authorgroup"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:author"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:othercredit"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:releaseinfo"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:copyright"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:legalnotice"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:pubdate"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:revision"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:revhistory"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:abstract"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="partintro.titlepage.verso"> -</xsl:template> - -<xsl:template name="partintro.titlepage.separator"> -</xsl:template> - -<xsl:template name="partintro.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="partintro.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="partintro.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="partintro.titlepage.before.recto"/> - <xsl:call-template name="partintro.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="partintro.titlepage.before.verso"/> - <xsl:call-template name="partintro.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="partintro.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="partintro.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="partintro.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="24.8832pt" font-weight="bold" space-before="1em" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="14.4pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="partintro.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="reference.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:referenceinfo/d:title"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:referenceinfo/d:subtitle"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:corpauthor"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:authorgroup"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:author"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:othercredit"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:releaseinfo"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:copyright"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:legalnotice"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:pubdate"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:revision"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:revhistory"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:abstract"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="reference.titlepage.verso"> -</xsl:template> - -<xsl:template name="reference.titlepage.separator"> -</xsl:template> - -<xsl:template name="reference.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="reference.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="reference.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="reference.titlepage.before.recto"/> - <xsl:call-template name="reference.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="reference.titlepage.before.verso"/> - <xsl:call-template name="reference.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="reference.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="reference.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="reference.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" text-align="center" font-size="24.8832pt" 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::d:reference[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" font-family="{$title.fontset}" text-align="center"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="reference.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="refsynopsisdiv.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:refsynopsisdivinfo/d:title"> - <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="d:refsynopsisdivinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="refsynopsisdiv.titlepage.verso"> -</xsl:template> - -<xsl:template name="refsynopsisdiv.titlepage.separator"> -</xsl:template> - -<xsl:template name="refsynopsisdiv.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="refsynopsisdiv.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="refsynopsisdiv.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="refsynopsisdiv.titlepage.before.recto"/> - <xsl:call-template name="refsynopsisdiv.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="refsynopsisdiv.titlepage.before.verso"/> - <xsl:call-template name="refsynopsisdiv.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="refsynopsisdiv.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="refsynopsisdiv.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="refsynopsisdiv.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="refsynopsisdiv.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="refsynopsisdiv.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="refsection.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:refsectioninfo/d:title"> - <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="d:refsectioninfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="refsection.titlepage.verso"> -</xsl:template> - -<xsl:template name="refsection.titlepage.separator"> -</xsl:template> - -<xsl:template name="refsection.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="refsection.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="refsection.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="refsection.titlepage.before.recto"/> - <xsl:call-template name="refsection.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="refsection.titlepage.before.verso"/> - <xsl:call-template name="refsection.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="refsection.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="refsection.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="refsection.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="refsection.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsection.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="refsection.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="refsect1.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:refsect1info/d:title"> - <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="d:refsect1info/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="refsect1.titlepage.verso"> -</xsl:template> - -<xsl:template name="refsect1.titlepage.separator"> -</xsl:template> - -<xsl:template name="refsect1.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="refsect1.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="refsect1.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="refsect1.titlepage.before.recto"/> - <xsl:call-template name="refsect1.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="refsect1.titlepage.before.verso"/> - <xsl:call-template name="refsect1.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="refsect1.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="refsect1.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="refsect1.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="refsect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsect1.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="refsect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="refsect2.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:refsect2info/d:title"> - <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="d:refsect2info/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="refsect2.titlepage.verso"> -</xsl:template> - -<xsl:template name="refsect2.titlepage.separator"> -</xsl:template> - -<xsl:template name="refsect2.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="refsect2.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="refsect2.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="refsect2.titlepage.before.recto"/> - <xsl:call-template name="refsect2.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="refsect2.titlepage.before.verso"/> - <xsl:call-template name="refsect2.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="refsect2.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="refsect2.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="refsect2.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="refsect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsect2.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="refsect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="refsect3.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:refsect3info/d:title"> - <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="d:refsect3info/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="refsect3.titlepage.verso"> -</xsl:template> - -<xsl:template name="refsect3.titlepage.separator"> -</xsl:template> - -<xsl:template name="refsect3.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="refsect3.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="refsect3.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="refsect3.titlepage.before.recto"/> - <xsl:call-template name="refsect3.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="refsect3.titlepage.before.verso"/> - <xsl:call-template name="refsect3.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="refsect3.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="refsect3.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="refsect3.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="refsect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsect3.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="refsect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="dedication.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="dedication.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:dedication[1]"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="d:dedicationinfo/d:subtitle"> - <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="d:dedicationinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="dedication.titlepage.verso"> -</xsl:template> - -<xsl:template name="dedication.titlepage.separator"> -</xsl:template> - -<xsl:template name="dedication.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="dedication.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="dedication.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="dedication.titlepage.before.recto"/> - <xsl:call-template name="dedication.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="dedication.titlepage.before.verso"/> - <xsl:call-template name="dedication.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="dedication.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="dedication.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="dedication.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="dedication.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="dedication.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="acknowledgements.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:acknowledgements[1]"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="d:acknowledgementsinfo/d:subtitle"> - <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="d:acknowledgementsinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.verso"> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.separator"> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="acknowledgements.titlepage.before.recto"/> - <xsl:call-template name="acknowledgements.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="acknowledgements.titlepage.before.verso"/> - <xsl:call-template name="acknowledgements.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="acknowledgements.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="acknowledgements.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="acknowledgements.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="acknowledgements.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="acknowledgements.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="acknowledgements.titlepage.recto.mode"/> -</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}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:preface[1]"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="d:prefaceinfo/d:subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:corpauthor"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:authorgroup"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:author"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:othercredit"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:releaseinfo"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:copyright"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:legalnotice"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:pubdate"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:revision"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:revhistory"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:abstract"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="preface.titlepage.verso"> -</xsl:template> - -<xsl:template name="preface.titlepage.separator"> -</xsl:template> - -<xsl:template name="preface.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="preface.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="preface.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="preface.titlepage.before.recto"/> - <xsl:call-template name="preface.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="preface.titlepage.before.verso"/> - <xsl:call-template name="preface.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="preface.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="preface.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="preface.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="preface.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="chapter.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:chapterinfo/d:title"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:chapterinfo/d:subtitle"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:corpauthor"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:authorgroup"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:author"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:othercredit"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:releaseinfo"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:copyright"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:legalnotice"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:pubdate"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:revision"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:revhistory"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:abstract"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="chapter.titlepage.verso"> -</xsl:template> - -<xsl:template name="chapter.titlepage.separator"> -</xsl:template> - -<xsl:template name="chapter.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="chapter.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="chapter.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$title.fontset}"> - <xsl:variable name="recto.content"> - <xsl:call-template name="chapter.titlepage.before.recto"/> - <xsl:call-template name="chapter.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block margin-left="{$title.margin.left}"><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="chapter.titlepage.before.verso"/> - <xsl:call-template name="chapter.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="chapter.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="chapter.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="chapter.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d: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" font-size="24.8832pt" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:chapter[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" 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" space-before="0.5em" font-style="italic" font-size="14.4pt" font-weight="bold"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" 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" space-before="0.5em" space-after="0.5em" font-size="14.4pt"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" 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" space-before="0.5em" space-after="0.5em" font-size="14.4pt"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" 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" space-before="0.5em" space-after="0.5em" font-size="14.4pt"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" 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:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" 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:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" 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:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" 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:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" 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:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" 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:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" 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:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" 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:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="appendix.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:appendixinfo/d:title"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:appendixinfo/d:subtitle"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:corpauthor"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:authorgroup"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:author"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:othercredit"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:releaseinfo"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:copyright"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:legalnotice"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:pubdate"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:revision"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:revhistory"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:abstract"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="appendix.titlepage.verso"> -</xsl:template> - -<xsl:template name="appendix.titlepage.separator"> -</xsl:template> - -<xsl:template name="appendix.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="appendix.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="appendix.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="appendix.titlepage.before.recto"/> - <xsl:call-template name="appendix.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="appendix.titlepage.before.verso"/> - <xsl:call-template name="appendix.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="appendix.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="appendix.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="appendix.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:appendix[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="appendix.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="section.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sectioninfo/d:title"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sectioninfo/d:subtitle"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:corpauthor"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:authorgroup"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:author"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:othercredit"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:releaseinfo"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:copyright"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:legalnotice"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:pubdate"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:revision"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:revhistory"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:abstract"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="section.titlepage.verso"> -</xsl:template> - -<xsl:template name="section.titlepage.separator"> -</xsl:template> - -<xsl:template name="section.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="section.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="section.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="section.titlepage.before.recto"/> - <xsl:call-template name="section.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="section.titlepage.before.verso"/> - <xsl:call-template name="section.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="section.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="section.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="section.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="section.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="sect1.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect1info/d:title"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect1info/d:subtitle"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:corpauthor"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:authorgroup"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:author"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:othercredit"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:releaseinfo"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:copyright"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:legalnotice"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:pubdate"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:revision"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:revhistory"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:abstract"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect1.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect1.titlepage.separator"> -</xsl:template> - -<xsl:template name="sect1.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect1.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect1.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect1.titlepage.before.recto"/> - <xsl:call-template name="sect1.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect1.titlepage.before.verso"/> - <xsl:call-template name="sect1.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="sect1.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="sect1.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect1.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect1.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="sect2.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect2info/d:title"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect2info/d:subtitle"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:corpauthor"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:authorgroup"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:author"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:othercredit"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:releaseinfo"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:copyright"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:legalnotice"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:pubdate"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:revision"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:revhistory"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:abstract"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect2.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect2.titlepage.separator"> -</xsl:template> - -<xsl:template name="sect2.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect2.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect2.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect2.titlepage.before.recto"/> - <xsl:call-template name="sect2.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect2.titlepage.before.verso"/> - <xsl:call-template name="sect2.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="sect2.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="sect2.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect2.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect2.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="sect3.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect3info/d:title"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect3info/d:subtitle"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:corpauthor"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:authorgroup"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:author"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:othercredit"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:releaseinfo"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:copyright"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:legalnotice"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:pubdate"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:revision"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:revhistory"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:abstract"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect3.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect3.titlepage.separator"> -</xsl:template> - -<xsl:template name="sect3.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect3.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect3.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect3.titlepage.before.recto"/> - <xsl:call-template name="sect3.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect3.titlepage.before.verso"/> - <xsl:call-template name="sect3.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="sect3.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="sect3.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect3.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect3.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="sect4.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect4info/d:title"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect4info/d:subtitle"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:corpauthor"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:authorgroup"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:author"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:othercredit"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:releaseinfo"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:copyright"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:legalnotice"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:pubdate"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:revision"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:revhistory"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:abstract"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect4.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect4.titlepage.separator"> -</xsl:template> - -<xsl:template name="sect4.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect4.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect4.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect4.titlepage.before.recto"/> - <xsl:call-template name="sect4.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect4.titlepage.before.verso"/> - <xsl:call-template name="sect4.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="sect4.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="sect4.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect4.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect4.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="sect5.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect5info/d:title"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect5info/d:subtitle"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:corpauthor"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:authorgroup"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:author"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:othercredit"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:releaseinfo"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:copyright"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:legalnotice"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:pubdate"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:revision"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:revhistory"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:abstract"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect5.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect5.titlepage.separator"> -</xsl:template> - -<xsl:template name="sect5.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect5.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect5.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect5.titlepage.before.recto"/> - <xsl:call-template name="sect5.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect5.titlepage.before.verso"/> - <xsl:call-template name="sect5.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="sect5.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="sect5.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect5.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect5.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="simplesect.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:simplesectinfo/d:title"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:simplesectinfo/d:subtitle"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:corpauthor"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:authorgroup"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:author"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:othercredit"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:releaseinfo"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:copyright"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:legalnotice"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:pubdate"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:revision"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:revhistory"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:abstract"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="simplesect.titlepage.verso"> -</xsl:template> - -<xsl:template name="simplesect.titlepage.separator"> -</xsl:template> - -<xsl:template name="simplesect.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="simplesect.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="simplesect.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="simplesect.titlepage.before.recto"/> - <xsl:call-template name="simplesect.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="simplesect.titlepage.before.verso"/> - <xsl:call-template name="simplesect.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="simplesect.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="simplesect.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="simplesect.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="simplesect.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="bibliography.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliography.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:bibliography[1]"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="d:bibliographyinfo/d:subtitle"> - <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="d:bibliographyinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="bibliography.titlepage.verso"> -</xsl:template> - -<xsl:template name="bibliography.titlepage.separator"> -</xsl:template> - -<xsl:template name="bibliography.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="bibliography.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="bibliography.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="bibliography.titlepage.before.recto"/> - <xsl:call-template name="bibliography.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="bibliography.titlepage.before.verso"/> - <xsl:call-template name="bibliography.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="bibliography.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="bibliography.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="bibliography.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="bibliography.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliography.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="bibliodiv.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:bibliodivinfo/d:title"> - <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="d:bibliodivinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:bibliodivinfo/d:subtitle"> - <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="d:bibliodivinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="bibliodiv.titlepage.verso"> -</xsl:template> - -<xsl:template name="bibliodiv.titlepage.separator"> -</xsl:template> - -<xsl:template name="bibliodiv.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="bibliodiv.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="bibliodiv.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="bibliodiv.titlepage.before.recto"/> - <xsl:call-template name="bibliodiv.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="bibliodiv.titlepage.before.verso"/> - <xsl:call-template name="bibliodiv.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="bibliodiv.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="bibliodiv.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="bibliodiv.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="bibliodiv.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:bibliodiv[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="bibliodiv.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="bibliodiv.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="glossary.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossary.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:glossary[1]"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="d:glossaryinfo/d:subtitle"> - <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="d:glossaryinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="glossary.titlepage.verso"> -</xsl:template> - -<xsl:template name="glossary.titlepage.separator"> -</xsl:template> - -<xsl:template name="glossary.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="glossary.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="glossary.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="glossary.titlepage.before.recto"/> - <xsl:call-template name="glossary.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="glossary.titlepage.before.verso"/> - <xsl:call-template name="glossary.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="glossary.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="glossary.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="glossary.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="glossary.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossary.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="glossdiv.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:glossdivinfo/d:title"> - <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="d:glossdivinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:glossdivinfo/d:subtitle"> - <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="d:glossdivinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="glossdiv.titlepage.verso"> -</xsl:template> - -<xsl:template name="glossdiv.titlepage.separator"> -</xsl:template> - -<xsl:template name="glossdiv.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="glossdiv.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="glossdiv.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="glossdiv.titlepage.before.recto"/> - <xsl:call-template name="glossdiv.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="glossdiv.titlepage.before.verso"/> - <xsl:call-template name="glossdiv.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="glossdiv.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="glossdiv.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="glossdiv.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="glossdiv.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossdiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:glossdiv[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="glossdiv.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossdiv.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="glossdiv.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="index.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="index.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:index[1]"/> -<xsl:with-param name="pagewide" select="1"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="d:indexinfo/d:subtitle"> - <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="d:indexinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="index.titlepage.verso"> -</xsl:template> - -<xsl:template name="index.titlepage.separator"> -</xsl:template> - -<xsl:template name="index.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="index.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="index.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="index.titlepage.before.recto"/> - <xsl:call-template name="index.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="index.titlepage.before.verso"/> - <xsl:call-template name="index.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="index.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="index.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="index.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="index.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="index.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="index.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="indexdiv.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="indexdiv.titlepage.recto.style"> -<xsl:call-template name="indexdiv.title"> -<xsl:with-param name="title" select="d:title"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="d:indexdivinfo/d:subtitle"> - <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="d:indexdivinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="indexdiv.titlepage.verso"> -</xsl:template> - -<xsl:template name="indexdiv.titlepage.separator"> -</xsl:template> - -<xsl:template name="indexdiv.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="indexdiv.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="indexdiv.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="indexdiv.titlepage.before.recto"/> - <xsl:call-template name="indexdiv.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="indexdiv.titlepage.before.verso"/> - <xsl:call-template name="indexdiv.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="indexdiv.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="indexdiv.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="indexdiv.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="indexdiv.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="indexdiv.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="indexdiv.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="setindex.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="setindex.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:setindex[1]"/> -<xsl:with-param name="pagewide" select="1"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="d:setindexinfo/d:subtitle"> - <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="d:setindexinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="setindex.titlepage.verso"> -</xsl:template> - -<xsl:template name="setindex.titlepage.separator"> -</xsl:template> - -<xsl:template name="setindex.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="setindex.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="setindex.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="setindex.titlepage.before.recto"/> - <xsl:call-template name="setindex.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="setindex.titlepage.before.verso"/> - <xsl:call-template name="setindex.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="setindex.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="setindex.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="setindex.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="setindex.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="setindex.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="colophon.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="colophon.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:colophon[1]"/> -</xsl:call-template></fo:block> - <xsl:choose> - <xsl:when test="d:colophoninfo/d:subtitle"> - <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="d:colophoninfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="colophon.titlepage.verso"> -</xsl:template> - -<xsl:template name="colophon.titlepage.separator"> -</xsl:template> - -<xsl:template name="colophon.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="colophon.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="colophon.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="colophon.titlepage.before.recto"/> - <xsl:call-template name="colophon.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="colophon.titlepage.before.verso"/> - <xsl:call-template name="colophon.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="colophon.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="colophon.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="colophon.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="colophon.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="colophon.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="colophon.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="sidebar.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sidebarinfo/d:title"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:sidebarinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sidebarinfo/d:subtitle"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:sidebarinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="sidebar.titlepage.verso"> -</xsl:template> - -<xsl:template name="sidebar.titlepage.separator"> -</xsl:template> - -<xsl:template name="sidebar.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sidebar.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sidebar.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sidebar.titlepage.before.recto"/> - <xsl:call-template name="sidebar.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sidebar.titlepage.before.verso"/> - <xsl:call-template name="sidebar.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="sidebar.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="sidebar.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sidebar.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sidebar.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}" font-weight="bold"> -<xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sidebar.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}"> -<xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="qandaset.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:qandasetinfo/d:title"> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:title"/> - </xsl:when> - <xsl:when test="d:blockinfo/d:title"> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:qandasetinfo/d:subtitle"> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:blockinfo/d:subtitle"> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:corpauthor"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:corpauthor"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:authorgroup"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:authorgroup"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:author"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:author"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:othercredit"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:othercredit"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:releaseinfo"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:releaseinfo"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:copyright"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:copyright"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:legalnotice"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:legalnotice"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:pubdate"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:pubdate"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:revision"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:revision"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:revhistory"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:revhistory"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:qandasetinfo/d:abstract"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:blockinfo/d:abstract"/> - <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="qandaset.titlepage.verso"> -</xsl:template> - -<xsl:template name="qandaset.titlepage.separator"> -</xsl:template> - -<xsl:template name="qandaset.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="qandaset.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="qandaset.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$title.fontset}"> - <xsl:variable name="recto.content"> - <xsl:call-template name="qandaset.titlepage.before.recto"/> - <xsl:call-template name="qandaset.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block start-indent="0pt" text-align="center"><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="qandaset.titlepage.before.verso"/> - <xsl:call-template name="qandaset.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="qandaset.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="qandaset.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="qandaset.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:qandaset[1]"/> -</xsl:call-template> -</fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:author" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:othercredit" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:copyright" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:pubdate" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revision" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:revhistory" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template match="d:abstract" mode="qandaset.titlepage.recto.auto.mode"> -<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}"> -<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/> -</fo:block> -</xsl:template> - -<xsl:template name="table.of.contents.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="table.of.contents.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="gentext"> -<xsl:with-param name="key" select="'TableofContents'"/> -</xsl:call-template></fo:block> -</xsl:template> - -<xsl:template name="table.of.contents.titlepage.verso"> -</xsl:template> - -<xsl:template name="table.of.contents.titlepage.separator"> -</xsl:template> - -<xsl:template name="table.of.contents.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="table.of.contents.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="table.of.contents.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="table.of.contents.titlepage.before.recto"/> - <xsl:call-template name="table.of.contents.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="table.of.contents.titlepage.before.verso"/> - <xsl:call-template name="table.of.contents.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="table.of.contents.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="table.of.contents.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="table.of.contents.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template name="list.of.tables.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.tables.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="gentext"> -<xsl:with-param name="key" select="'ListofTables'"/> -</xsl:call-template></fo:block> -</xsl:template> - -<xsl:template name="list.of.tables.titlepage.verso"> -</xsl:template> - -<xsl:template name="list.of.tables.titlepage.separator"> -</xsl:template> - -<xsl:template name="list.of.tables.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="list.of.tables.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="list.of.tables.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="list.of.tables.titlepage.before.recto"/> - <xsl:call-template name="list.of.tables.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="list.of.tables.titlepage.before.verso"/> - <xsl:call-template name="list.of.tables.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="list.of.tables.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="list.of.tables.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="list.of.tables.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template name="list.of.figures.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.figures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="gentext"> -<xsl:with-param name="key" select="'ListofFigures'"/> -</xsl:call-template></fo:block> -</xsl:template> - -<xsl:template name="list.of.figures.titlepage.verso"> -</xsl:template> - -<xsl:template name="list.of.figures.titlepage.separator"> -</xsl:template> - -<xsl:template name="list.of.figures.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="list.of.figures.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="list.of.figures.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="list.of.figures.titlepage.before.recto"/> - <xsl:call-template name="list.of.figures.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="list.of.figures.titlepage.before.verso"/> - <xsl:call-template name="list.of.figures.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="list.of.figures.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="list.of.figures.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="list.of.figures.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template name="list.of.examples.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.examples.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="gentext"> -<xsl:with-param name="key" select="'ListofExamples'"/> -</xsl:call-template></fo:block> -</xsl:template> - -<xsl:template name="list.of.examples.titlepage.verso"> -</xsl:template> - -<xsl:template name="list.of.examples.titlepage.separator"> -</xsl:template> - -<xsl:template name="list.of.examples.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="list.of.examples.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="list.of.examples.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="list.of.examples.titlepage.before.recto"/> - <xsl:call-template name="list.of.examples.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="list.of.examples.titlepage.before.verso"/> - <xsl:call-template name="list.of.examples.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="list.of.examples.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="list.of.examples.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="list.of.examples.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template name="list.of.equations.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.equations.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="gentext"> -<xsl:with-param name="key" select="'ListofEquations'"/> -</xsl:call-template></fo:block> -</xsl:template> - -<xsl:template name="list.of.equations.titlepage.verso"> -</xsl:template> - -<xsl:template name="list.of.equations.titlepage.separator"> -</xsl:template> - -<xsl:template name="list.of.equations.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="list.of.equations.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="list.of.equations.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="list.of.equations.titlepage.before.recto"/> - <xsl:call-template name="list.of.equations.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="list.of.equations.titlepage.before.verso"/> - <xsl:call-template name="list.of.equations.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="list.of.equations.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="list.of.equations.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="list.of.equations.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template name="list.of.procedures.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.procedures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="gentext"> -<xsl:with-param name="key" select="'ListofProcedures'"/> -</xsl:call-template></fo:block> -</xsl:template> - -<xsl:template name="list.of.procedures.titlepage.verso"> -</xsl:template> - -<xsl:template name="list.of.procedures.titlepage.separator"> -</xsl:template> - -<xsl:template name="list.of.procedures.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="list.of.procedures.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="list.of.procedures.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="list.of.procedures.titlepage.before.recto"/> - <xsl:call-template name="list.of.procedures.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="list.of.procedures.titlepage.before.verso"/> - <xsl:call-template name="list.of.procedures.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="list.of.procedures.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="list.of.procedures.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="list.of.procedures.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template name="list.of.unknowns.titlepage.recto"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.unknowns.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}"> -<xsl:call-template name="gentext"> -<xsl:with-param name="key" select="'ListofUnknown'"/> -</xsl:call-template></fo:block> -</xsl:template> - -<xsl:template name="list.of.unknowns.titlepage.verso"> -</xsl:template> - -<xsl:template name="list.of.unknowns.titlepage.separator"> -</xsl:template> - -<xsl:template name="list.of.unknowns.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="list.of.unknowns.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="list.of.unknowns.titlepage"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:variable name="recto.content"> - <xsl:call-template name="list.of.unknowns.titlepage.before.recto"/> - <xsl:call-template name="list.of.unknowns.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <fo:block><xsl:copy-of select="$recto.content"/></fo:block> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="list.of.unknowns.titlepage.before.verso"/> - <xsl:call-template name="list.of.unknowns.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <fo:block><xsl:copy-of select="$verso.content"/></fo:block> - </xsl:if> - <xsl:call-template name="list.of.unknowns.titlepage.separator"/> - </fo:block> -</xsl:template> - -<xsl:template match="*" mode="list.of.unknowns.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="list.of.unknowns.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -</xsl:stylesheet> - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/titlepage.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/titlepage.xsl deleted file mode 100644 index b569968853bc815266494d38a69c13ea8e20a2ed..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/titlepage.xsl +++ /dev/null @@ -1,769 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet exclude-result-prefixes="d" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -xmlns:fo="http://www.w3.org/1999/XSL/Format" - version='1.0'> - -<!-- ******************************************************************** - $Id: titlepage.xsl 8804 2010-08-09 16:41:43Z bobstayton $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<!-- ==================================================================== --> - -<xsl:attribute-set name="book.titlepage.recto.style"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$title.fontset"/> - </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="book.titlepage.verso.style"> - <xsl:attribute name="font-size">10pt</xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="article.titlepage.recto.style"/> -<xsl:attribute-set name="article.titlepage.verso.style"/> - -<xsl:attribute-set name="set.titlepage.recto.style"/> -<xsl:attribute-set name="set.titlepage.verso.style"/> - -<xsl:attribute-set name="part.titlepage.recto.style"> - <xsl:attribute name="text-align">center</xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="part.titlepage.verso.style"/> - -<xsl:attribute-set name="partintro.titlepage.recto.style"/> -<xsl:attribute-set name="partintro.titlepage.verso.style"/> - -<xsl:attribute-set name="reference.titlepage.recto.style"/> -<xsl:attribute-set name="reference.titlepage.verso.style"/> - -<xsl:attribute-set name="dedication.titlepage.recto.style"/> -<xsl:attribute-set name="dedication.titlepage.verso.style"/> - -<xsl:attribute-set name="acknowledgements.titlepage.recto.style"/> -<xsl:attribute-set name="acknowledgements.titlepage.verso.style"/> - -<xsl:attribute-set name="preface.titlepage.recto.style"/> -<xsl:attribute-set name="preface.titlepage.verso.style"/> - -<xsl:attribute-set name="chapter.titlepage.recto.style"/> -<xsl:attribute-set name="chapter.titlepage.verso.style"/> - -<xsl:attribute-set name="appendix.titlepage.recto.style"/> -<xsl:attribute-set name="appendix.titlepage.verso.style"/> - -<xsl:attribute-set name="bibliography.titlepage.recto.style"/> -<xsl:attribute-set name="bibliography.titlepage.verso.style"/> - -<xsl:attribute-set name="bibliodiv.titlepage.recto.style"/> -<xsl:attribute-set name="bibliodiv.titlepage.verso.style"/> - -<xsl:attribute-set name="glossary.titlepage.recto.style"/> -<xsl:attribute-set name="glossary.titlepage.verso.style"/> - -<xsl:attribute-set name="glossdiv.titlepage.recto.style"/> -<xsl:attribute-set name="glossdiv.titlepage.verso.style"/> - -<xsl:attribute-set name="index.titlepage.recto.style"/> -<xsl:attribute-set name="index.titlepage.verso.style"/> - -<xsl:attribute-set name="setindex.titlepage.recto.style"/> -<xsl:attribute-set name="setindex.titlepage.verso.style"/> - -<xsl:attribute-set name="indexdiv.titlepage.recto.style"/> -<xsl:attribute-set name="indexdiv.titlepage.verso.style"/> - -<xsl:attribute-set name="colophon.titlepage.recto.style"/> -<xsl:attribute-set name="colophon.titlepage.verso.style"/> - -<xsl:attribute-set name="sidebar.titlepage.recto.style"/> -<xsl:attribute-set name="sidebar.titlepage.verso.style"/> - -<xsl:attribute-set name="qandaset.titlepage.recto.style"/> -<xsl:attribute-set name="qandaset.titlepage.verso.style"/> - -<xsl:attribute-set name="section.titlepage.recto.style"> - <xsl:attribute name="keep-together.within-column">always</xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="section.titlepage.verso.style"> - <xsl:attribute name="keep-together.within-column">always</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> -</xsl:attribute-set> - -<xsl:attribute-set name="sect1.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect1.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="sect2.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect2.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="sect3.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect3.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="sect4.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect4.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="sect5.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect5.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="simplesect.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="simplesect.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="refnamediv.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="refnamediv.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="refsynopsisdiv.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="refsynopsisdiv.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="refsection.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="refsection.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="refsect1.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="refsect1.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="refsect2.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="refsect2.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="refsect3.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="refsect3.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="table.of.contents.titlepage.recto.style"/> -<xsl:attribute-set name="table.of.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.tables.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.tables.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.figures.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.figures.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.equations.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.equations.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.examples.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.examples.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.procedures.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.procedures.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.unknowns.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.unknowns.contents.titlepage.verso.style"/> - -<!-- ==================================================================== --> - -<xsl:template match="*" mode="titlepage.mode"> - <!-- if an element isn't found in this mode, try the default mode --> - <xsl:apply-templates select="."/> -</xsl:template> - -<xsl:template match="d:abbrev" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:abstract" mode="titlepage.mode"> - <fo:block xsl:use-attribute-sets="abstract.properties"> - <fo:block xsl:use-attribute-sets="abstract.title.properties"> - <xsl:choose> - <xsl:when test="d:title|d:info/d:title"> - <xsl:apply-templates select="d:title|d:info/d:title"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Abstract'"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </fo:block> - <xsl:apply-templates select="*[not(self::d:title)]" mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<xsl:template match="d:abstract/d:title" mode="titlepage.mode"/> - -<xsl:template match="d:abstract/d:title" mode="titlepage.abstract.title.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:address" mode="titlepage.mode"> - <!-- use the normal address handling code --> - <xsl:apply-templates select="."/> -</xsl:template> - -<xsl:template match="d:affiliation" mode="titlepage.mode"> - <fo:block> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<xsl:template match="d:artpagenums" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:author" mode="titlepage.mode"> - <fo:block> - <xsl:call-template name="anchor"/> - <xsl:choose> - <xsl:when test="d:orgname"> - <xsl:apply-templates/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="person.name"/> - <xsl:if test="d:affiliation/d:orgname"> - <xsl:text>, </xsl:text> - <xsl:apply-templates select="d:affiliation/d:orgname" mode="titlepage.mode"/> - </xsl:if> - <xsl:if test="d:email|d:affiliation/d:address/d:email"> - <xsl:text> </xsl:text> - <xsl:apply-templates select="(d:email|d:affiliation/d:address/d:email)[1]"/> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - </fo:block> -</xsl:template> - -<xsl:template match="d:authorblurb" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="titlepage.mode"> - <fo:wrapper> - <xsl:call-template name="anchor"/> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:wrapper> -</xsl:template> - -<xsl:template match="d:authorinitials" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:bibliomisc" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:bibliomset" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:collab" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:confgroup" mode="titlepage.mode"> - <fo:block> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<xsl:template match="d:confdates" mode="titlepage.mode"> - <fo:block> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<xsl:template match="d:conftitle" mode="titlepage.mode"> - <fo:block> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<xsl:template match="d:confnum" mode="titlepage.mode"> - <!-- suppress --> -</xsl:template> - -<xsl:template match="d:contractnum" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:contractsponsor" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:contrib" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:copyright" mode="titlepage.mode"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Copyright'"/> - </xsl:call-template> - <xsl:call-template name="gentext.space"/> - <xsl:call-template name="dingbat"> - <xsl:with-param name="dingbat">copyright</xsl:with-param> - </xsl:call-template> - <xsl:call-template name="gentext.space"/> - <xsl:call-template name="copyright.years"> - <xsl:with-param name="years" select="d:year"/> - <xsl:with-param name="print.ranges" select="$make.year.ranges"/> - <xsl:with-param name="single.year.ranges" - select="$make.single.year.ranges"/> - </xsl:call-template> - <xsl:call-template name="gentext.space"/> - <xsl:apply-templates select="d:holder" mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:year" mode="titlepage.mode"> - <xsl:apply-templates/> -</xsl:template> - -<xsl:template match="d:holder" mode="titlepage.mode"> - <xsl:apply-templates/> - <xsl:if test="position() < last()"> - <xsl:text>, </xsl:text> - </xsl:if> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:corpcredit" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:corpname" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:date" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:edition" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> - <xsl:call-template name="gentext.space"/> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Edition'"/> - </xsl:call-template> -</xsl:template> - -<xsl:template match="d:editor" mode="titlepage.mode"> - <!-- The first editor is dealt with in the following template, - which in turn displays all editors of the same mode. --> -</xsl:template> - -<xsl:template match="d:editor[1]" priority="2" mode="titlepage.mode"> - <xsl:call-template name="gentext.edited.by"/> - <xsl:call-template name="gentext.space"/> - <xsl:call-template name="person.name.list"> - <xsl:with-param name="person.list" select="../d:editor"/> - </xsl:call-template> -</xsl:template> - -<xsl:template match="d:firstname" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:graphic" mode="titlepage.mode"> - <!-- use the normal graphic handling code --> - <xsl:apply-templates select="."/> -</xsl:template> - -<xsl:template match="d:honorific" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:isbn" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:issn" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:biblioid" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:itermset" mode="titlepage.mode"> - <!-- discard --> -</xsl:template> - -<xsl:template match="d:invpartnumber" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:issuenum" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:jobtitle" mode="titlepage.mode"> - <fo:block> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<xsl:template match="d:keywordset" mode="titlepage.mode"> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="titlepage.mode"> - - <xsl:variable name="id"> - <xsl:call-template name="object.id"/> - </xsl:variable> - - <fo:block id="{$id}"> - <xsl:if test="d:title"> <!-- FIXME: add param for using default title? --> - <xsl:call-template name="formal.object.heading"/> - </xsl:if> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<xsl:template match="d:legalnotice/d:title" mode="titlepage.mode"> -</xsl:template> - -<xsl:template match="d:lineage" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:modespec" mode="titlepage.mode"> - <!-- discard --> -</xsl:template> - -<xsl:template match="d:orgdiv" mode="titlepage.mode"> - <xsl:if test="preceding-sibling::*[1][self::d:orgname]"> - <xsl:text> </xsl:text> - </xsl:if> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:orgname" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:othercredit" mode="titlepage.mode"> - <xsl:variable name="contrib" select="string(d:contrib)"/> - <xsl:choose> - <xsl:when test="d:contrib"> - <xsl:if test="not(preceding-sibling::d:othercredit[string(d:contrib)=$contrib])"> - <fo:block> - <xsl:apply-templates mode="titlepage.mode" select="d:contrib"/> - <xsl:text>: </xsl:text> - <xsl:call-template name="person.name"/> - <xsl:apply-templates mode="titlepage.mode" select="d:affiliation"/> - <xsl:apply-templates select="following-sibling::d:othercredit[string(d:contrib)=$contrib]" mode="titlepage.othercredits"/> - </fo:block> - </xsl:if> - </xsl:when> - <xsl:otherwise> - <fo:block><xsl:call-template name="person.name"/></fo:block> - <xsl:apply-templates mode="titlepage.mode" select="./d:affiliation"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:othercredit" mode="titlepage.othercredits"> - <xsl:text>, </xsl:text> - <xsl:call-template name="person.name"/> -</xsl:template> - -<xsl:template match="d:othername" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:pagenums" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:printhistory" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:productname" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:productnumber" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:pubdate" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:publisher" mode="titlepage.mode"> - <fo:block> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<xsl:template match="d:publishername" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:pubsnumber" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revhistory" mode="titlepage.mode"> - - <xsl:variable name="explicit.table.width"> - <xsl:call-template name="pi.dbfo_table-width"/> - </xsl:variable> - - <xsl:variable name="table.width"> - <xsl:choose> - <xsl:when test="$explicit.table.width != ''"> - <xsl:value-of select="$explicit.table.width"/> - </xsl:when> - <xsl:when test="$default.table.width = ''"> - <xsl:text>100%</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$default.table.width"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <fo:table table-layout="fixed" width="{$table.width}" xsl:use-attribute-sets="revhistory.table.properties"> - <fo:table-column column-number="1" column-width="proportional-column-width(1)"/> - <fo:table-column column-number="2" column-width="proportional-column-width(1)"/> - <fo:table-column column-number="3" column-width="proportional-column-width(1)"/> - <fo:table-body start-indent="0pt" end-indent="0pt"> - <fo:table-row> - <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties"> - <fo:block xsl:use-attribute-sets="revhistory.title.properties"> - <xsl:choose> - <xsl:when test="d:title|d:info/d:title"> - <xsl:apply-templates select="d:title|d:info/d:title" mode="titlepage.mode"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'RevHistory'"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </fo:block> - </fo:table-cell> - </fo:table-row> - <xsl:apply-templates select="*[not(self::d:title)]" mode="titlepage.mode"/> - </fo:table-body> - </fo:table> - -</xsl:template> - - -<xsl:template match="d:revhistory/d:revision" mode="titlepage.mode"> - <xsl:variable name="revnumber" select="d:revnumber"/> - <xsl:variable name="revdate" select="d:date"/> - <xsl:variable name="revauthor" select="d:authorinitials|d:author"/> - <xsl:variable name="revremark" select="d:revremark|d:revdescription"/> - <fo:table-row> - <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties"> - <fo:block> - <xsl:if test="$revnumber"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Revision'"/> - </xsl:call-template> - <xsl:call-template name="gentext.space"/> - <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/> - </xsl:if> - </fo:block> - </fo:table-cell> - <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties"> - <fo:block> - <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/> - </fo:block> - </fo:table-cell> - <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties"> - <fo:block> - <xsl:for-each select="$revauthor"> - <xsl:apply-templates select="." mode="titlepage.mode"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:for-each> - </fo:block> - </fo:table-cell> - </fo:table-row> - <xsl:if test="$revremark"> - <fo:table-row> - <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties"> - <fo:block> - <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/> - </fo:block> - </fo:table-cell> - </fo:table-row> - </xsl:if> -</xsl:template> - -<xsl:template match="d:revision/d:revnumber" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:date" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:authorinitials" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:author" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:revremark" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:revdescription" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:seriesvolnums" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:shortaffil" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subjectset" mode="titlepage.mode"> - <!-- discard --> -</xsl:template> - -<xsl:template match="d:subtitle" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:surname" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:titleabbrev" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:volumenum" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<!-- ==================================================================== --> -<!-- Book templates --> - -<!-- Note: these templates cannot use *.titlepage.recto.mode or - *.titlepage.verso.mode. If they do then subsequent use of a custom - titlepage.templates.xml file will not work correctly. --> - -<!-- book recto --> - -<xsl:template match="d:bookinfo/d:authorgroup|d:book/d:info/d:authorgroup" - mode="titlepage.mode" priority="2"> - <fo:block> - <xsl:call-template name="anchor"/> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<!-- book verso --> - -<xsl:template name="book.verso.title"> - <fo:block> - <xsl:apply-templates mode="titlepage.mode"/> - - <xsl:if test="following-sibling::d:subtitle - |following-sibling::d:info/d:subtitle - |following-sibling::d:bookinfo/d:subtitle"> - <xsl:text>: </xsl:text> - - <xsl:apply-templates select="(following-sibling::d:subtitle - |following-sibling::d:info/d:subtitle - |following-sibling::d:bookinfo/d:subtitle)[1]" - mode="book.verso.subtitle.mode"/> - </xsl:if> - </fo:block> -</xsl:template> - -<xsl:template match="d:subtitle" mode="book.verso.subtitle.mode"> - <xsl:apply-templates mode="titlepage.mode"/> - <xsl:if test="following-sibling::d:subtitle"> - <xsl:text>: </xsl:text> - <xsl:apply-templates select="following-sibling::d:subtitle[1]" - mode="book.verso.subtitle.mode"/> - </xsl:if> -</xsl:template> - -<xsl:template name="verso.authorgroup"> - <fo:block> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'by'"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:call-template name="person.name.list"> - <xsl:with-param name="person.list" select="d:author|d:corpauthor|d:editor"/> - </xsl:call-template> - </fo:block> - <xsl:apply-templates select="d:othercredit" mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:bookinfo/d:author|d:book/d:info/d:author" - mode="titlepage.mode" priority="2"> - <fo:block> - <xsl:call-template name="person.name"/> - </fo:block> -</xsl:template> - -<xsl:template match="d:bookinfo/d:corpauthor|d:book/d:info/d:corpauthor" - mode="titlepage.mode" priority="2"> - <fo:block> - <xsl:apply-templates/> - </fo:block> -</xsl:template> - -<xsl:template match="d:bookinfo/d:pubdate|d:book/d:info/d:pubdate" - mode="titlepage.mode" priority="2"> - <fo:block> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'pubdate'"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:apply-templates mode="titlepage.mode"/> - </fo:block> -</xsl:template> - -<!-- ==================================================================== --> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/toc.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/toc.xsl deleted file mode 100644 index d20c0f9a7febd64e04b58c8593425e7c98304c21..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/toc.xsl +++ /dev/null @@ -1,334 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet exclude-result-prefixes="d" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -xmlns:fo="http://www.w3.org/1999/XSL/Format" - version='1.0'> - -<!-- ******************************************************************** - $Id: toc.xsl 8323 2009-03-12 22:52:17Z bobstayton $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<!-- ==================================================================== --> - -<!-- only set, book and part puts toc in its own page sequence --> - -<xsl:template match="d:set/d:toc | d:book/d:toc | d:part/d:toc"> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="node" select="parent::*"/> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - - <!-- Do not output the toc element if one is already generated - by the use of $generate.toc parameter, or if - generating a source toc is turned off --> - <xsl:if test="not(contains($toc.params, 'toc')) and - ($process.source.toc != 0 or $process.empty.source.toc != 0)"> - <!-- Don't generate a page sequence unless there is content --> - <xsl:variable name="content"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <xsl:apply-templates /> - </xsl:when> - <xsl:when test="count(*) = 0 and $process.empty.source.toc != 0"> - <!-- trick to switch context node to parent element --> - <xsl:for-each select="parent::*"> - <xsl:choose> - <xsl:when test="self::d:set"> - <xsl:call-template name="set.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="self::d:book"> - <xsl:call-template name="division.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="self::d:part"> - <xsl:call-template name="division.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:when> - </xsl:choose> - </xsl:for-each> - </xsl:when> - </xsl:choose> - </xsl:variable> - - <xsl:if test="string-length(normalize-space($content)) != 0"> - <xsl:variable name="lot-master-reference"> - <xsl:call-template name="select.pagemaster"> - <xsl:with-param name="pageclass" select="'lot'"/> - </xsl:call-template> - </xsl:variable> - - <xsl:call-template name="page.sequence"> - <xsl:with-param name="master-reference" - select="$lot-master-reference"/> - <xsl:with-param name="element" select="'toc'"/> - <xsl:with-param name="gentext-key" select="'TableofContents'"/> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - </xsl:if> - </xsl:if> -</xsl:template> - -<xsl:template match="d:chapter/d:toc | d:appendix/d:toc | d:preface/d:toc | d:article/d:toc"> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="node" select="parent::*"/> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - - <!-- Do not output the toc element if one is already generated - by the use of $generate.toc parameter, or if - generating a source toc is turned off --> - <xsl:if test="not(contains($toc.params, 'toc')) and - ($process.source.toc != 0 or $process.empty.source.toc != 0)"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <fo:block> - <xsl:apply-templates/> - </fo:block> - </xsl:when> - <xsl:when test="count(*) = 0 and $process.empty.source.toc != 0"> - <!-- trick to switch context node to section element --> - <xsl:for-each select="parent::*"> - <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:for-each> - </xsl:when> - </xsl:choose> - <xsl:call-template name="component.toc.separator"/> - </xsl:if> -</xsl:template> - -<xsl:template match="d:section/d:toc - |d:sect1/d:toc - |d:sect2/d:toc - |d:sect3/d:toc - |d:sect4/d:toc - |d:sect5/d:toc"> - - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="node" select="parent::*"/> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - - <!-- Do not output the toc element if one is already generated - by the use of $generate.toc parameter, or if - generating a source toc is turned off --> - <xsl:if test="not(contains($toc.params, 'toc')) and - ($process.source.toc != 0 or $process.empty.source.toc != 0)"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <fo:block> - <xsl:apply-templates/> - </fo:block> - </xsl:when> - <xsl:when test="count(*) = 0 and $process.empty.source.toc != 0"> - <!-- trick to switch context node to section element --> - <xsl:for-each select="parent::*"> - <xsl:call-template name="section.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:for-each> - </xsl:when> - </xsl:choose> - <xsl:call-template name="section.toc.separator"/> - </xsl:if> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:tocpart|d:tocchap - |d:toclevel1|d:toclevel2|d:toclevel3|d:toclevel4|d:toclevel5"> - <xsl:apply-templates select="d:tocentry"/> - <xsl:if test="d:tocchap|d:toclevel1|d:toclevel2|d:toclevel3|d:toclevel4|d:toclevel5"> - <fo:block start-indent="{count(ancestor::*)*2}pc"> - <xsl:apply-templates select="d:tocchap|d:toclevel1|d:toclevel2|d:toclevel3|d:toclevel4|d:toclevel5"/> - </fo:block> - </xsl:if> -</xsl:template> - -<xsl:template match="d:tocentry|d:lotentry|d:tocdiv|d:tocfront|d:tocback"> - <fo:block text-align-last="justify" - end-indent="2pc" - last-line-end-indent="-2pc"> - <fo:inline keep-with-next.within-line="always"> - <xsl:choose> - <xsl:when test="@linkend"> - <fo:basic-link internal-destination="{@linkend}"> - <xsl:apply-templates/> - </fo:basic-link> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </fo:inline> - - <xsl:choose> - <xsl:when test="@linkend"> - <fo:inline keep-together.within-line="always"> - <xsl:text> </xsl:text> - <fo:leader leader-pattern="dots" - keep-with-next.within-line="always"/> - <xsl:text> </xsl:text> - <fo:basic-link internal-destination="{@linkend}"> - <xsl:choose> - <xsl:when test="@pagenum"> - <xsl:value-of select="@pagenum"/> - </xsl:when> - <xsl:otherwise> - <fo:page-number-citation ref-id="{@linkend}"/> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> - </fo:inline> - </xsl:when> - <xsl:when test="@pagenum"> - <fo:inline keep-together.within-line="always"> - <xsl:text> </xsl:text> - <fo:leader leader-pattern="dots" - keep-with-next.within-line="always"/> - <xsl:text> </xsl:text> - <xsl:value-of select="@pagenum"/> - </fo:inline> - </xsl:when> - <xsl:otherwise> - <!-- just the leaders, what else can I do? --> - <fo:inline keep-together.within-line="always"> - <xsl:text> </xsl:text> - <fo:leader leader-pattern="space" - keep-with-next.within-line="always"/> - </fo:inline> - </xsl:otherwise> - </xsl:choose> - </fo:block> -</xsl:template> - -<xsl:template match="d:toc/d:title"> - <fo:block font-weight="bold"> - <xsl:apply-templates/> - </fo:block> -</xsl:template> - -<xsl:template match="d:toc/d:subtitle"> - <fo:block font-weight="bold"> - <xsl:apply-templates/> - </fo:block> -</xsl:template> - -<xsl:template match="d:toc/d:titleabbrev"> -</xsl:template> - -<!-- ==================================================================== --> - -<!-- A lot element must have content, because there is no attribute - to select what kind of list should be generated --> -<xsl:template match="d:book/d:lot | d:part/d:lot"> - <!-- Don't generate a page sequence unless there is content --> - <xsl:variable name="content"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <xsl:apply-templates /> - </xsl:when> - <xsl:when test="not(child::*) and $process.empty.source.toc != 0"> - <xsl:call-template name="process.empty.lot"/> - </xsl:when> - </xsl:choose> - </xsl:variable> - - <xsl:if test="string-length(normalize-space($content)) != 0"> - <xsl:variable name="lot-master-reference"> - <xsl:call-template name="select.pagemaster"> - <xsl:with-param name="pageclass" select="'lot'"/> - </xsl:call-template> - </xsl:variable> - - <xsl:call-template name="page.sequence"> - <xsl:with-param name="master-reference" - select="$lot-master-reference"/> - <xsl:with-param name="element" select="'toc'"/> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - </xsl:if> -</xsl:template> - -<xsl:template match="d:chapter/d:lot | d:appendix/d:lot | d:preface/d:lot | d:article/d:lot"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <fo:block> - <xsl:apply-templates/> - </fo:block> - <xsl:call-template name="component.toc.separator"/> - </xsl:when> - <xsl:when test="not(child::*) and $process.empty.source.toc != 0"> - <xsl:call-template name="process.empty.lot"/> - </xsl:when> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:section/d:lot - |d:sect1/d:lot - |d:sect2/d:lot - |d:sect3/d:lot - |d:sect4/d:lot - |d:sect5/d:lot"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <fo:block> - <xsl:apply-templates/> - </fo:block> - <xsl:call-template name="section.toc.separator"/> - </xsl:when> - <xsl:when test="not(child::*) and $process.empty.source.toc != 0"> - <xsl:call-template name="process.empty.lot"/> - </xsl:when> - </xsl:choose> -</xsl:template> - -<xsl:template name="process.empty.lot"> - <!-- An empty lot element does not provide any information to indicate - what should be included in it. You can customize this - template to generate a lot based on @role or something --> - <xsl:message> - <xsl:text>Warning: don't know what to generate for </xsl:text> - <xsl:text>lot that has no children.</xsl:text> - </xsl:message> -</xsl:template> - -<xsl:template match="d:lot/d:title"> - <fo:block font-weight="bold"> - <xsl:apply-templates/> - </fo:block> -</xsl:template> - -<xsl:template match="d:lot/d:subtitle"> - <fo:block font-weight="bold"> - <xsl:apply-templates/> - </fo:block> -</xsl:template> - -<xsl:template match="d:lot/d:titleabbrev"> -</xsl:template> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/verbatim.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/verbatim.xsl deleted file mode 100644 index 5f37117dace8f07d6ce63610437e68755c446327..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/verbatim.xsl +++ /dev/null @@ -1,466 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" - xmlns:xverb="com.nwalsh.xalan.Verbatim" - xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:exsl="http://exslt.org/common" - exclude-result-prefixes="sverb xverb lxslt exsl d" - version='1.0'> - -<!-- ******************************************************************** - $Id: verbatim.xsl 8344 2009-03-16 06:35:43Z bobstayton $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<!-- XSLTHL highlighting is turned off by default. See highlighting/README - for instructions on how to turn on XSLTHL --> -<xsl:template name="apply-highlighting"> - <xsl:apply-templates/> -</xsl:template> - -<lxslt:component prefix="xverb" - functions="numberLines"/> - -<xsl:template match="d:programlisting|d:screen|d:synopsis"> - <xsl:param name="suppress-numbers" select="'0'"/> - <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> - - <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:choose> - <xsl:when test="$highlight.source != 0"> - <xsl:call-template name="apply-highlighting"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="$highlight.source != 0"> - <xsl:call-template name="apply-highlighting"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="block.content"> - <xsl:choose> - <xsl:when test="$shade.verbatim != 0"> - <fo:block id="{$id}" - xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style"> - <xsl:choose> - <xsl:when test="$hyphenate.verbatim != 0 and - $exsl.node.set.available != 0"> - <xsl:apply-templates select="exsl:node-set($content)" - mode="hyphenate.verbatim"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$content"/> - </xsl:otherwise> - </xsl:choose> - </fo:block> - </xsl:when> - <xsl:otherwise> - <fo:block id="{$id}" - xsl:use-attribute-sets="monospace.verbatim.properties"> - <xsl:choose> - <xsl:when test="$hyphenate.verbatim != 0 and - $exsl.node.set.available != 0"> - <xsl:apply-templates select="exsl:node-set($content)" - mode="hyphenate.verbatim"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$content"/> - </xsl:otherwise> - </xsl:choose> - </fo:block> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <!-- Need a block-container for these features --> - <xsl:when test="@width != '' or - (self::d:programlisting and - starts-with($writing.mode, 'rl'))"> - <fo:block-container start-indent="0pt" end-indent="0pt"> - <xsl:if test="@width != ''"> - <xsl:attribute name="width"> - <xsl:value-of select="concat(@width, '*', $monospace.verbatim.font.width)"/> - </xsl:attribute> - </xsl:if> - <!-- All known program code is left-to-right --> - <xsl:if test="self::d:programlisting and - starts-with($writing.mode, 'rl')"> - <xsl:attribute name="writing-mode">lr-tb</xsl:attribute> - </xsl:if> - <xsl:copy-of select="$block.content"/> - </fo:block-container> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$block.content"/> - </xsl:otherwise> - </xsl:choose> - -</xsl:template> - -<xsl:template match="d:literallayout"> - <xsl:param name="suppress-numbers" select="'0'"/> - - <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> - - <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> - - <xsl:choose> - <xsl:when test="@class='monospaced'"> - <xsl:choose> - <xsl:when test="$shade.verbatim != 0"> - <fo:block id="{$id}" - xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style"> - - <xsl:copy-of select="$content"/> - </fo:block> - </xsl:when> - <xsl:otherwise> - <fo:block id="{$id}" - xsl:use-attribute-sets="monospace.verbatim.properties"> - <xsl:copy-of select="$content"/> - </fo:block> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="$shade.verbatim != 0"> - <fo:block id="{$id}" - xsl:use-attribute-sets="verbatim.properties shade.verbatim.style"> - <xsl:copy-of select="$content"/> - </fo:block> - </xsl:when> - <xsl:otherwise> - <fo:block id="{$id}" - xsl:use-attribute-sets="verbatim.properties"> - <xsl:copy-of select="$content"/> - </fo:block> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d: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 xsl:use-attribute-sets="verbatim.properties"> - <xsl:copy-of select="$content"/> - </fo:block> -</xsl:template> - -<xsl:template name="number.rtf.lines"> - <xsl:param name="rtf" select="''"/> - <xsl:param name="pi.context" select="."/> - - <!-- Save the global values --> - <xsl:variable name="global.linenumbering.everyNth" - select="$linenumbering.everyNth"/> - - <xsl:variable name="global.linenumbering.separator" - select="$linenumbering.separator"/> - - <xsl:variable name="global.linenumbering.width" - select="$linenumbering.width"/> - - <!-- Extract the <?dbfo linenumbering.*?> PI values --> - <xsl:variable name="pi.linenumbering.everyNth"> - <xsl:call-template name="pi.dbfo_linenumbering.everyNth"> - <xsl:with-param name="node" select="$pi.context"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="pi.linenumbering.separator"> - <xsl:call-template name="pi.dbfo_linenumbering.separator"> - <xsl:with-param name="node" select="$pi.context"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="pi.linenumbering.width"> - <xsl:call-template name="pi.dbfo_linenumbering.width"> - <xsl:with-param name="node" select="$pi.context"/> - </xsl:call-template> - </xsl:variable> - - <!-- Construct the 'in-context' values --> - <xsl:variable name="linenumbering.everyNth"> - <xsl:choose> - <xsl:when test="$pi.linenumbering.everyNth != ''"> - <xsl:value-of select="$pi.linenumbering.everyNth"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$global.linenumbering.everyNth"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="linenumbering.separator"> - <xsl:choose> - <xsl:when test="$pi.linenumbering.separator != ''"> - <xsl:value-of select="$pi.linenumbering.separator"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$global.linenumbering.separator"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="linenumbering.width"> - <xsl:choose> - <xsl:when test="$pi.linenumbering.width != ''"> - <xsl:value-of select="$pi.linenumbering.width"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$global.linenumbering.width"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="linenumbering.startinglinenumber"> - <xsl:choose> - <xsl:when test="$pi.context/@startinglinenumber"> - <xsl:value-of select="$pi.context/@startinglinenumber"/> - </xsl:when> - <xsl:when test="$pi.context/@continuation='continues'"> - <xsl:variable name="lastLine"> - <xsl:choose> - <xsl:when test="$pi.context/self::d:programlisting"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:programlisting[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$pi.context/self::d:screen"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:screen[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$pi.context/self::d:literallayout"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:literallayout[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$pi.context/self::d:address"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:address[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$pi.context/self::d:synopsis"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:synopsis[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Unexpected verbatim environment: </xsl:text> - <xsl:value-of select="local-name(.)"/> - </xsl:message> - <xsl:value-of select="0"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:value-of select="$lastLine + 1"/> - </xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="function-available('sverb:numberLines')"> - <xsl:copy-of select="sverb:numberLines($rtf)"/> - </xsl:when> - <xsl:when test="function-available('xverb:numberLines')"> - <xsl:copy-of select="xverb:numberLines($rtf)"/> - </xsl:when> - <xsl:otherwise> - <xsl:message terminate="yes"> - <xsl:text>No numberLines function available.</xsl:text> - </xsl:message> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- ======================================================================== --> - -<xsl:template name="lastLineNumber"> - <xsl:param name="listings"/> - <xsl:param name="number" select="0"/> - - <xsl:variable name="lines"> - <xsl:call-template name="countLines"> - <xsl:with-param name="listing" select="string($listings[1])"/> - </xsl:call-template> - </xsl:variable> - - <xsl:choose> - <xsl:when test="not($listings)"> - <xsl:value-of select="$number"/> - </xsl:when> - <xsl:when test="$listings[1]/@startinglinenumber"> - <xsl:value-of select="$number + $listings[1]/@startinglinenumber + $lines - 1"/> - </xsl:when> - <xsl:when test="$listings[1]/@continuation='continues'"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" select="d:listings[position() > 1]"/> - <xsl:with-param name="number" select="$number + $lines"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$lines"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="countLines"> - <xsl:param name="listing"/> - <xsl:param name="count" select="1"/> - - <xsl:choose> - <xsl:when test="contains($listing, ' ')"> - <xsl:call-template name="countLines"> - <xsl:with-param name="listing" select="substring-after($listing, ' ')"/> - <xsl:with-param name="count" select="$count + 1"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$count"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- ======================================================================== --> - -<xsl:template match="node()|@*" mode="hyphenate.verbatim"> - <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:apply-templates mode="hyphenate.verbatim"/> - </xsl:copy> -</xsl:template> - -<xsl:template match="text()" mode="hyphenate.verbatim" priority="2"> - <xsl:call-template name="hyphenate.verbatim.block"> - <xsl:with-param name="content" select="."/> - </xsl:call-template> -</xsl:template> - -<xsl:template name="hyphenate.verbatim.block"> - <xsl:param name="content" select="''"/> - <xsl:param name="count" select="1"/> - - <!-- recurse on lines first to keep recursion depth reasonable --> - <xsl:choose> - <xsl:when test="contains($content, ' ')"> - <xsl:variable name="line" select="substring-before($content, ' ')"/> - <xsl:variable name="rest" select="substring-after($content, ' ')"/> - <xsl:call-template name="hyphenate.verbatim"> - <xsl:with-param name="content" select="concat($line, ' ')"/> - </xsl:call-template> - <xsl:call-template name="hyphenate.verbatim.block"> - <xsl:with-param name="content" select="$rest"/> - <xsl:with-param name="count" select="$count + 1"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="hyphenate.verbatim"> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - -</xsl:template> - -<xsl:template name="hyphenate.verbatim"> - <xsl:param name="content"/> - <xsl:variable name="head" select="substring($content, 1, 1)"/> - <xsl:variable name="tail" select="substring($content, 2)"/> - <xsl:choose> - <!-- Place soft-hyphen after space or non-breakable space. --> - <xsl:when test="$head = ' ' or $head = ' '"> - <xsl:text> </xsl:text> - <xsl:text>­</xsl:text> - </xsl:when> - <xsl:when test="$hyphenate.verbatim.characters != '' and - translate($head, $hyphenate.verbatim.characters, '') = '' and not($tail = '')"> - <xsl:value-of select="$head"/> - <xsl:text>­</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$head"/> - </xsl:otherwise> - </xsl:choose> - <xsl:if test="$tail"> - <xsl:call-template name="hyphenate.verbatim"> - <xsl:with-param name="content" select="$tail"/> - </xsl:call-template> - </xsl:if> -</xsl:template> - - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/xep.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/xep.xsl deleted file mode 100644 index 0cd25c3bc32590ca606193d3562e860c99f49122..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/xep.xsl +++ /dev/null @@ -1,182 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet exclude-result-prefixes="d" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:rx="http://www.renderx.com/XSL/Extensions" - version='1.0'> - -<!-- ******************************************************************** - $Id: xep.xsl 7531 2007-10-17 18:06:49Z dcramer $ - ******************************************************************** - (c) Stephane Bline Peregrine Systems 2001 - Implementation of xep extensions: - * Pdf bookmarks (based on the XEP 2.5 implementation) - * Document information (XEP 2.5 meta information extensions) - ******************************************************************** --> - -<!-- FIXME: Norm, I changed things so that the top-level element (book or set) - does not appear in the TOC. Is this the right thing? --> - -<xsl:template name="xep-document-information"> - <rx:meta-info> - <xsl:variable name="authors" - select="(//d:author|//d:editor|//d:corpauthor|//d:authorgroup)[1]"/> - <xsl:if test="$authors"> - <xsl:variable name="author"> - <xsl:choose> - <xsl:when test="$authors[self::d:authorgroup]"> - <xsl:call-template name="person.name.list"> - <xsl:with-param name="person.list" - select="$authors/*[self::d:author|self::d:corpauthor| - self::d:othercredit|self::d:editor]"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$authors[self::d:corpauthor]"> - <xsl:value-of select="$authors"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="person.name"> - <xsl:with-param name="node" select="$authors"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:element name="rx:meta-field"> - <xsl:attribute name="name">author</xsl:attribute> - <xsl:attribute name="value"> - <xsl:value-of select="normalize-space($author)"/> - </xsl:attribute> - </xsl:element> - </xsl:if> - - <xsl:variable name="title"> - <xsl:apply-templates select="/*[1]" mode="label.markup"/> - <xsl:apply-templates select="/*[1]" mode="title.markup"/> - </xsl:variable> - - <xsl:element name="rx:meta-field"> - <xsl:attribute name="name">creator</xsl:attribute> - <xsl:attribute name="value"> - <xsl:text>DocBook </xsl:text> - <xsl:value-of select="$DistroTitle"/> - <xsl:text> V</xsl:text> - <xsl:value-of select="$VERSION"/> - </xsl:attribute> - </xsl:element> - - <xsl:element name="rx:meta-field"> - <xsl:attribute name="name">title</xsl:attribute> - <xsl:attribute name="value"> - <xsl:value-of select="normalize-space($title)"/> - </xsl:attribute> - </xsl:element> - - <xsl:if test="//d:keyword"> - <xsl:element name="rx:meta-field"> - <xsl:attribute name="name">keywords</xsl:attribute> - <xsl:attribute name="value"> - <xsl:for-each select="//d:keyword"> - <xsl:value-of select="normalize-space(.)"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:for-each> - </xsl:attribute> - </xsl:element> - </xsl:if> - - <xsl:if test="//d:subjectterm"> - <xsl:element name="rx:meta-field"> - <xsl:attribute name="name">subject</xsl:attribute> - <xsl:attribute name="value"> - <xsl:for-each select="//d:subjectterm"> - <xsl:value-of select="normalize-space(.)"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:for-each> - </xsl:attribute> - </xsl:element> - </xsl:if> - </rx:meta-info> -</xsl:template> - -<!-- ******************************************************************** - Pdf bookmarks - ******************************************************************** --> - -<xsl:template match="*" mode="xep.outline"> - <xsl:apply-templates select="*" mode="xep.outline"/> -</xsl:template> - -<xsl:template match="d:set|d:book|d:part|d:reference|d:preface|d:chapter|d:appendix|d:article - |d:glossary|d:bibliography|d:index|d:setindex - |d:refentry|d:refsynopsisdiv - |d:refsect1|d:refsect2|d:refsect3|d:refsection - |d:sect1|d:sect2|d:sect3|d:sect4|d:sect5|d:section" - mode="xep.outline"> - <xsl:variable name="id"> - <xsl:call-template name="object.id"/> - </xsl:variable> - <xsl:variable name="bookmark-label"> - <xsl:apply-templates select="." mode="object.title.markup"/> - </xsl:variable> - - <!-- Put the root element bookmark at the same level as its children --> - <!-- If the object is a set or book, generate a bookmark for the toc --> - <xsl:choose> - <xsl:when test="self::d:index and $generate.index = 0"/> - <xsl:when test="parent::*"> - <rx:bookmark internal-destination="{$id}"> - <rx:bookmark-label> - <xsl:value-of select="normalize-space($bookmark-label)"/> - </rx:bookmark-label> - <xsl:apply-templates select="*" mode="xep.outline"/> - </rx:bookmark> - </xsl:when> - <xsl:otherwise> - <xsl:if test="$bookmark-label != ''"> - <rx:bookmark internal-destination="{$id}"> - <rx:bookmark-label> - <xsl:value-of select="normalize-space($bookmark-label)"/> - </rx:bookmark-label> - </rx:bookmark> - </xsl:if> - - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - <xsl:if test="contains($toc.params, 'toc') - and d:set|d:book|d:part|d:reference|d:section|d:sect1|d:refentry - |d:article|d:bibliography|d:glossary|d:chapter - |d:appendix"> - <rx:bookmark internal-destination="toc...{$id}"> - <rx:bookmark-label> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'TableofContents'"/> - </xsl:call-template> - </rx:bookmark-label> - </rx:bookmark> - </xsl:if> - <xsl:apply-templates select="*" mode="xep.outline"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="xep-pis"> - <xsl:if test="$crop.marks != 0"> - <xsl:processing-instruction name="xep-pdf-crop-mark-width"><xsl:value-of select="$crop.mark.width"/></xsl:processing-instruction> - <xsl:processing-instruction name="xep-pdf-crop-offset"><xsl:value-of select="$crop.mark.offset"/></xsl:processing-instruction> - <xsl:processing-instruction name="xep-pdf-bleed"><xsl:value-of select="$crop.mark.bleed"/></xsl:processing-instruction> - </xsl:if> - - <xsl:call-template name="user-xep-pis"/> -</xsl:template> - -<!-- Placeholder for user defined PIs --> -<xsl:template name="user-xep-pis"/> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/xref.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/xref.xsl deleted file mode 100644 index b5bce43a62d2cacb24a16027fc7549926911279c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/fo/xref.xsl +++ /dev/null @@ -1,1539 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:exsl="http://exslt.org/common" - xmlns:xlink='http://www.w3.org/1999/xlink' - exclude-result-prefixes="exsl xlink d" - version='1.0'> - -<!-- ******************************************************************** - $Id: xref.xsl 8913 2010-10-01 04:44:57Z bobstayton $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<!-- Use internal variable for olink xlink role for consistency --> -<xsl:variable - name="xolink.role">http://docbook.org/xlink/role/olink</xsl:variable> - -<!-- ==================================================================== --> - -<xsl:template match="d:anchor"> - <xsl:variable name="id"> - <xsl:call-template name="object.id"/> - </xsl:variable> - <fo:inline id="{$id}"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:xref" name="xref"> - <xsl:param name="xhref" select="@xlink:href"/> - <!-- is the @xlink:href a local idref link? --> - <xsl:param name="xlink.idref"> - <xsl:if test="starts-with($xhref,'#') - and (not(contains($xhref,'(')) - or starts-with($xhref, '#xpointer(id('))"> - <xsl:call-template name="xpointer.idref"> - <xsl:with-param name="xpointer" select="$xhref"/> - </xsl:call-template> - </xsl:if> - </xsl:param> - <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/> - <xsl:param name="linkend.targets" select="key('id',@linkend)"/> - <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/> - <xsl:param name="refelem" select="local-name($target)"/> - - <xsl:variable name="xrefstyle"> - <xsl:choose> - <xsl:when test="@role and not(@xrefstyle) - and $use.role.as.xrefstyle != 0"> - <xsl:value-of select="@role"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@xrefstyle"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="content"> - <fo:inline xsl:use-attribute-sets="xref.properties"> - <xsl:choose> - <xsl:when test="@endterm"> - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$etarget" mode="endterm"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <xsl:when test="$target/@xreflabel"> - <xsl:call-template name="xref.xreflabel"> - <xsl:with-param name="target" select="$target"/> - </xsl:call-template> - </xsl:when> - - <xsl:when test="$target"> - <xsl:if test="not(parent::d:citation)"> - <xsl:apply-templates select="$target" mode="xref-to-prefix"/> - </xsl:if> - - <xsl:apply-templates select="$target" mode="xref-to"> - <xsl:with-param name="referrer" select="."/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - </xsl:apply-templates> - - <xsl:if test="not(parent::d:citation)"> - <xsl:apply-templates select="$target" mode="xref-to-suffix"/> - </xsl:if> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>ERROR: xref linking to </xsl:text> - <xsl:value-of select="@linkend|@xlink:href"/> - <xsl:text> has no generated link text.</xsl:text> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:otherwise> - </xsl:choose> - </fo:inline> - </xsl:variable> - - <!-- Convert it into an active link --> - <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - - <!-- Add standard page reference? --> - <xsl:choose> - <xsl:when test="not($target)"> - <!-- page numbers only for local targets --> - </xsl:when> - <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:') - and contains($xrefstyle, 'nopage')"> - <!-- negative xrefstyle in instance turns it off --> - </xsl:when> - <!-- positive xrefstyle already handles it --> - <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:') - and (contains($xrefstyle, 'page') - or contains($xrefstyle, 'Page'))) - and ( $insert.xref.page.number = 'yes' - or $insert.xref.page.number = '1') - or (local-name($target) = 'para' and - $xrefstyle = '')"> - <xsl:apply-templates select="$target" mode="page.citation"> - <xsl:with-param name="id" select="$target/@id|$target/@xml:id"/> - </xsl:apply-templates> - </xsl:when> - </xsl:choose> -</xsl:template> - -<!-- ==================================================================== --> - -<!-- Handled largely like an xref --> -<!-- To be done: add support for begin, end, and units attributes --> -<xsl:template match="d:biblioref" name="biblioref"> - <xsl:variable name="targets" select="key('id',@linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - <xsl:variable name="refelem" select="local-name($target)"/> - - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="@linkend"/> - </xsl:call-template> - - <xsl:choose> - <xsl:when test="$refelem=''"> - <xsl:message> - <xsl:text>XRef to nonexistent id: </xsl:text> - <xsl:value-of select="@linkend"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - - <xsl:when test="@endterm"> - <fo:basic-link internal-destination="{@linkend}" - xsl:use-attribute-sets="xref.properties"> - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$etarget" mode="endterm"/> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> - </xsl:when> - - <xsl:when test="$target/@xreflabel"> - <fo:basic-link internal-destination="{@linkend}" - xsl:use-attribute-sets="xref.properties"> - <xsl:call-template name="xref.xreflabel"> - <xsl:with-param name="target" select="$target"/> - </xsl:call-template> - </fo:basic-link> - </xsl:when> - - <xsl:otherwise> - <xsl:if test="not(parent::d:citation)"> - <xsl:apply-templates select="$target" mode="xref-to-prefix"/> - </xsl:if> - - <fo:basic-link internal-destination="{@linkend}" - xsl:use-attribute-sets="xref.properties"> - <xsl:apply-templates select="$target" mode="xref-to"> - <xsl:with-param name="referrer" select="."/> - <xsl:with-param name="xrefstyle"> - <xsl:choose> - <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0"> - <xsl:value-of select="@role"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@xrefstyle"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> - </xsl:apply-templates> - </fo:basic-link> - - <xsl:if test="not(parent::d:citation)"> - <xsl:apply-templates select="$target" mode="xref-to-suffix"/> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="*" mode="endterm"> - <!-- Process the children of the endterm element --> - <xsl:variable name="endterm"> - <xsl:apply-templates select="child::node()"/> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$exsl.node.set.available != 0"> - <xsl:apply-templates select="exsl:node-set($endterm)" mode="remove-ids"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$endterm"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="*" mode="remove-ids"> - <xsl:copy> - <xsl:for-each select="@*"> - <xsl:choose> - <xsl:when test="name(.) != 'id'"> - <xsl:copy/> - </xsl:when> - <xsl:otherwise> - <xsl:message>removing <xsl:value-of select="name(.)"/></xsl:message> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> - <xsl:apply-templates mode="remove-ids"/> - </xsl:copy> -</xsl:template> - -<!--- ==================================================================== --> - -<xsl:template match="*" mode="xref-to-prefix"/> -<xsl:template match="*" mode="xref-to-suffix"/> - -<xsl:template match="*" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - - <xsl:if test="$verbose != 0"> - <xsl:message> - <xsl:text>Don't know what gentext to create for xref to: "</xsl:text> - <xsl:value-of select="name(.)"/> - <xsl:text>"</xsl:text> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:if> -</xsl:template> - -<xsl:template match="d:title" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <!-- if you xref to a title, xref to the parent... --> - <xsl:choose> - <!-- FIXME: how reliable is this? --> - <xsl:when test="contains(local-name(parent::*), 'info')"> - <xsl:apply-templates select="parent::*[2]" mode="xref-to"> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="parent::*" mode="xref-to"> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:abstract|d:article|d:authorblurb|d:bibliodiv|d:bibliomset - |d:biblioset|d:blockquote|d:calloutlist|d:caution|d:colophon - |d:constraintdef|d:formalpara|d:glossdiv|d:important|d:indexdiv - |d:itemizedlist|d:legalnotice|d:lot|d:msg|d:msgexplan|d:msgmain - |d:msgrel|d:msgset|d:msgsub|d:note|d:orderedlist|d:partintro - |d:productionset|d:qandadiv|d:refsynopsisdiv|d:segmentedlist - |d:set|d:setindex|d:sidebar|d:tip|d:toc|d:variablelist|d:warning" - mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <!-- catch-all for things with (possibly optional) titles --> - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:author|d:editor|d:othercredit|d:personname" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:call-template name="person.name"/> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:call-template name="person.name.list"/> -</xsl:template> - -<xsl:template match="d:figure|d:example|d:table|d:equation" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:procedure" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:task" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:cmdsynopsis" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="(.//d:command)[1]" mode="xref"/> -</xsl:template> - -<xsl:template match="d:funcsynopsis" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="(.//d:function)[1]" mode="xref"/> -</xsl:template> - -<xsl:template match="d:dedication|d:acknowledgements|d:preface|d:chapter|d:appendix" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:bibliography" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:biblioentry|d:bibliomixed" mode="xref-to-prefix"> - <xsl:text>[</xsl:text> -</xsl:template> - -<xsl:template match="d:biblioentry|d:bibliomixed" mode="xref-to-suffix"> - <xsl:text>]</xsl:text> -</xsl:template> - -<xsl:template match="d:biblioentry|d:bibliomixed" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <!-- handles both biblioentry and bibliomixed --> - <xsl:choose> - <xsl:when test="string(.) = ''"> - <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="id" select="(@id|@xml:id)[1]"/> - <xsl:variable name="entry" select="$bib/d:bibliography/ - *[@id=$id or @xml:id=$id][1]"/> - <xsl:choose> - <xsl:when test="$entry"> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:number from="d:bibliography" count="d:biblioentry|d:bibliomixed" - level="any" format="1"/> - </xsl:when> - <xsl:when test="local-name($entry/*[1]) = 'abbrev'"> - <xsl:apply-templates select="$entry/*[1]"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="(@id|@xml:id)[1]"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>No bibliography entry: </xsl:text> - <xsl:value-of select="$id"/> - <xsl:text> found in </xsl:text> - <xsl:value-of select="$bibliography.collection"/> - </xsl:message> - <xsl:value-of select="(@id|@xml:id)[1]"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:number from="d:bibliography" count="d:biblioentry|d:bibliomixed" - level="any" format="1"/> - </xsl:when> - <xsl:when test="local-name(*[1]) = 'abbrev'"> - <xsl:apply-templates select="*[1]"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="(@id|@xml:id)[1]"/> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:glossary" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:glossentry" mode="xref-to"> - <xsl:choose> - <xsl:when test="$glossentry.show.acronym = 'primary'"> - <xsl:choose> - <xsl:when test="d:acronym|d:abbrev"> - <xsl:apply-templates select="(d:acronym|d:abbrev)[1]"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="d:glossterm[1]" mode="xref-to"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="d:glossterm[1]" mode="xref-to"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:glossterm|d:firstterm" mode="xref-to"> - <xsl:apply-templates/> -</xsl:template> - -<xsl:template match="d:index" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:listitem" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:section|d:simplesect - |d:sect1|d:sect2|d:sect3|d:sect4|d:sect5 - |d:refsect1|d:refsect2|d:refsect3|d:refsection" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - <!-- What about "in Chapter X"? --> -</xsl:template> - -<xsl:template match="d:bridgehead" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - <!-- What about "in Chapter X"? --> -</xsl:template> - -<xsl:template match="d:qandaset" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:qandadiv" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:qandaentry" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="d:question[1]" mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:question|d:answer" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:choose> - <xsl:when test="string-length(d:label) != 0"> - <xsl:apply-templates select="." mode="label.markup"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:part|d:reference" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:refentry" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:choose> - <xsl:when test="d:refmeta/d:refentrytitle"> - <xsl:apply-templates select="d:refmeta/d:refentrytitle"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="d:refnamediv/d:refname[1]"/> - </xsl:otherwise> - </xsl:choose> - <xsl:apply-templates select="d:refmeta/d:manvolnum"/> -</xsl:template> - -<xsl:template match="d:refnamediv" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="d:refname[1]" mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:refname" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:step" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Step'"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:apply-templates select="." mode="number"/> -</xsl:template> - -<xsl:template match="d:varlistentry" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="d:term[1]" mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:varlistentry/d:term" mode="xref-to"> - <xsl:param name="verbose" select="1"/> - <!-- to avoid the comma that will be generated if there are several terms --> - <xsl:apply-templates/> -</xsl:template> - -<xsl:template match="d:co" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="callout-bug"/> -</xsl:template> - -<xsl:template match="d:area|d:areaset" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - - <xsl:call-template name="callout-bug"> - <xsl:with-param name="conum"> - <xsl:apply-templates select="." mode="conumber"/> - </xsl:with-param> - </xsl:call-template> -</xsl:template> - -<xsl:template match="d:book" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<!-- These are elements for which no link text exists, so an xref to one - uses the xrefstyle attribute if specified, or if not it falls back - to the container element's link text --> -<xsl:template match="d:para|d:phrase|d:simpara|d:anchor|d:quote" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose"/> - - <xsl:variable name="context" select="(ancestor::d:simplesect - |ancestor::d:section - |ancestor::d:sect1 - |ancestor::d:sect2 - |ancestor::d:sect3 - |ancestor::d:sect4 - |ancestor::d:sect5 - |ancestor::d:refsection - |ancestor::d:refsect1 - |ancestor::d:refsect2 - |ancestor::d:refsect3 - |ancestor::d:chapter - |ancestor::d:appendix - |ancestor::d:preface - |ancestor::d:partintro - |ancestor::d:dedication - |ancestor::d:acknowledgements - |ancestor::d:colophon - |ancestor::d:bibliography - |ancestor::d:index - |ancestor::d:glossary - |ancestor::d:glossentry - |ancestor::d:listitem - |ancestor::d:varlistentry)[last()]"/> - - <xsl:choose> - <xsl:when test="$xrefstyle != ''"> - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:if test="$verbose != 0"> - <xsl:message> - <xsl:text>WARNING: xref to <</xsl:text> - <xsl:value-of select="local-name()"/> - <xsl:text> id="</xsl:text> - <xsl:value-of select="@id|@xml:id"/> - <xsl:text>"> has no generated text. Trying its ancestor elements.</xsl:text> - </xsl:message> - </xsl:if> - <xsl:apply-templates select="$context" mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:indexterm" mode="xref-to"> - <xsl:value-of select="d:primary"/> -</xsl:template> - -<xsl:template match="d:primary|d:secondary|d:tertiary" mode="xref-to"> - <xsl:value-of select="."/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:link" name="link"> - <xsl:param name="linkend" select="@linkend"/> - <xsl:param name="targets" select="key('id',$linkend)"/> - <xsl:param name="target" select="$targets[1]"/> - - <xsl:variable name="xrefstyle"> - <xsl:choose> - <xsl:when test="@role and not(@xrefstyle) - and $use.role.as.xrefstyle != 0"> - <xsl:value-of select="@role"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@xrefstyle"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="content"> - <fo:inline xsl:use-attribute-sets="xref.properties"> - <xsl:choose> - <xsl:when test="count(child::node()) > 0"> - <!-- If it has content, use it --> - <xsl:apply-templates/> - </xsl:when> - <!-- look for an endterm --> - <xsl:when test="@endterm"> - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$etarget" mode="endterm"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <!-- Use the xlink:href if no other text --> - <xsl:when test="@xlink:href"> - <xsl:call-template name="hyphenate-url"> - <xsl:with-param name="url" select="@xlink:href"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Link element has no content and no Endterm. </xsl:text> - <xsl:text>Nothing to show in the link to </xsl:text> - <xsl:value-of select="$target"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:otherwise> - </xsl:choose> - </fo:inline> - </xsl:variable> - - <xsl:call-template name="simple.xlink"> - <xsl:with-param name="node" select="."/> - <xsl:with-param name="linkend" select="$linkend"/> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - - <!-- Add standard page reference? --> - <xsl:choose> - <!-- page numbering on link only enabled for @linkend --> - <!-- There is no link element in DB5 with xlink:href --> - <xsl:when test="not($linkend)"> - </xsl:when> - <!-- negative xrefstyle in instance turns it off --> - <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:') - and contains($xrefstyle, 'nopage')"> - </xsl:when> - <xsl:when test="(starts-with(normalize-space($xrefstyle), 'select:') - and $insert.link.page.number = 'maybe' - and (contains($xrefstyle, 'page') - or contains($xrefstyle, 'Page'))) - or ( $insert.link.page.number = 'yes' - or $insert.link.page.number = '1') - or local-name($target) = 'para'"> - <xsl:apply-templates select="$target" mode="page.citation"> - <xsl:with-param name="id" select="$linkend"/> - </xsl:apply-templates> - </xsl:when> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:ulink" name="ulink"> - <xsl:param name="url" select="@url"/> - - <xsl:variable name ="ulink.url"> - <xsl:call-template name="fo-external-image"> - <xsl:with-param name="filename" select="$url"/> - </xsl:call-template> - </xsl:variable> - - <fo:basic-link xsl:use-attribute-sets="xref.properties" - external-destination="{$ulink.url}"> - <xsl:choose> - <xsl:when test="count(child::node())=0 or (string(.) = $url)"> - <xsl:call-template name="hyphenate-url"> - <xsl:with-param name="url" select="$url"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> - <!-- * Call the template for determining whether the URL for this --> - <!-- * hyperlink is displayed, and how to display it (either inline or --> - <!-- * as a numbered footnote). --> - <xsl:call-template name="hyperlink.url.display"> - <xsl:with-param name="url" select="$url"/> - <xsl:with-param name="ulink.url" select="$ulink.url"/> - </xsl:call-template> -</xsl:template> - -<xsl:template name="hyperlink.url.display"> - <!-- * This template is called for all external hyperlinks (ulinks and --> - <!-- * for all simple xlinks); it determines whether the URL for the --> - <!-- * hyperlink is displayed, and how to display it (either inline or --> - <!-- * as a numbered footnote). --> - <xsl:param name="url"/> - <xsl:param name="ulink.url"> - <!-- * ulink.url is just the value of the URL wrapped in 'url(...)' --> - <xsl:call-template name="fo-external-image"> - <xsl:with-param name="filename" select="$url"/> - </xsl:call-template> - </xsl:param> - - <xsl:if test="count(child::node()) != 0 - and string(.) != $url - and $ulink.show != 0"> - <!-- * Display the URL for this hyperlink only if it is non-empty, --> - <!-- * and the value of its content is not a URL that is the same as --> - <!-- * URL it links to, and if ulink.show is non-zero. --> - <xsl:choose> - <xsl:when test="$ulink.footnotes != 0 and not(ancestor::d:footnote)"> - <!-- * ulink.show and ulink.footnote are both non-zero; that --> - <!-- * means we display the URL as a footnote (instead of inline) --> - <fo:footnote> - <xsl:call-template name="ulink.footnote.number"/> - <fo:footnote-body xsl:use-attribute-sets="footnote.properties"> - <fo:block> - <xsl:call-template name="ulink.footnote.number"/> - <xsl:text> </xsl:text> - <fo:basic-link external-destination="{$ulink.url}"> - <xsl:value-of select="$url"/> - </fo:basic-link> - </fo:block> - </fo:footnote-body> - </fo:footnote> - </xsl:when> - <xsl:otherwise> - <!-- * ulink.show is non-zero, but ulink.footnote is not; that --> - <!-- * means we display the URL inline --> - <fo:inline hyphenate="false"> - <!-- * put square brackets around the URL --> - <xsl:text> [</xsl:text> - <fo:basic-link external-destination="{$ulink.url}"> - <xsl:call-template name="hyphenate-url"> - <xsl:with-param name="url" select="$url"/> - </xsl:call-template> - </fo:basic-link> - <xsl:text>]</xsl:text> - </fo:inline> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - -</xsl:template> - -<xsl:template name="ulink.footnote.number"> - <fo:inline xsl:use-attribute-sets="footnote.mark.properties"> - <xsl:choose> - <xsl:when test="$fop.extensions != 0"> - <xsl:attribute name="vertical-align">super</xsl:attribute> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="baseline-shift">super</xsl:attribute> - </xsl:otherwise> - </xsl:choose> - <xsl:variable name="fnum"> - <!-- * Determine the footnote number to display for this hyperlink, --> - <!-- * by counting all foonotes, ulinks, and any elements that have --> - <!-- * an xlink:href attribute that meets the following criteria: --> - <!-- * --> - <!-- * - the content of the element is not a URI that is the same --> - <!-- * URI as the value of the href attribute --> - <!-- * - the href attribute is not an internal ID reference (does --> - <!-- * not start with a hash sign) --> - <!-- * - the href is not part of an olink reference (the element --> - <!-- * - does not have an xlink:role attribute that indicates it is --> - <!-- * an olink, and the href does not contain a hash sign) --> - <!-- * - the element either has no xlink:type attribute or has --> - <!-- * an xlink:type attribute whose value is 'simple' --> - <!-- FIXME: list in @from is probably not complete --> - <xsl:number level="any" - from="d:chapter|d:appendix|d:preface|d:article|d:refentry|d:bibliography[not(parent::d:article)]" - count="d:footnote[not(@label)][not(ancestor::d:tgroup)] - |d:ulink[node()][@url != .][not(ancestor::d:footnote)] - |*[node()][@xlink:href][not(@xlink:href = .)][not(starts-with(@xlink:href,'#'))] - [not(contains(@xlink:href,'#') and @xlink:role = $xolink.role)] - [not(@xlink:type) or @xlink:type='simple'] - [not(ancestor::d:footnote)]" - format="1"/> - </xsl:variable> - <xsl:choose> - <xsl:when test="string-length($footnote.number.symbols) >= $fnum"> - <xsl:value-of select="substring($footnote.number.symbols, $fnum, 1)"/> - </xsl:when> - <xsl:otherwise> - <xsl:number value="$fnum" format="{$footnote.number.format}"/> - </xsl:otherwise> - </xsl:choose> - </fo:inline> -</xsl:template> - -<xsl:template name="hyphenate-url"> - <xsl:param name="url" select="''"/> - <xsl:choose> - <xsl:when test="$ulink.hyphenate = ''"> - <xsl:value-of select="$url"/> - </xsl:when> - <xsl:when test="string-length($url) > 1"> - <xsl:variable name="char" select="substring($url, 1, 1)"/> - <xsl:value-of select="$char"/> - <xsl:if test="contains($ulink.hyphenate.chars, $char)"> - <!-- Do not hyphen in-between // --> - <xsl:if test="not($char = '/' and substring($url,2,1) = '/')"> - <xsl:copy-of select="$ulink.hyphenate"/> - </xsl:if> - </xsl:if> - <!-- recurse to the next character --> - <xsl:call-template name="hyphenate-url"> - <xsl:with-param name="url" select="substring($url, 2)"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$url"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:olink" name="olink"> - <!-- olink content may be passed in from xlink olink --> - <xsl:param name="content" select="NOTANELEMENT"/> - - <xsl:variable name="localinfo" select="@localinfo"/> - - <xsl:choose> - <!-- olinks resolved by stylesheet and target database --> - <xsl:when test="@targetdoc or @targetptr or - (@xlink:role=$xolink.role and - contains(@xlink:href, '#') )" > - - <xsl:variable name="targetdoc.att"> - <xsl:choose> - <xsl:when test="@targetdoc != ''"> - <xsl:value-of select="@targetdoc"/> - </xsl:when> - <xsl:when test="@xlink:role=$xolink.role and - contains(@xlink:href, '#')" > - <xsl:value-of select="substring-before(@xlink:href, '#')"/> - </xsl:when> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="targetptr.att"> - <xsl:choose> - <xsl:when test="@targetptr != ''"> - <xsl:value-of select="@targetptr"/> - </xsl:when> - <xsl:when test="@xlink:role=$xolink.role and - contains(@xlink:href, '#')" > - <xsl:value-of select="substring-after(@xlink:href, '#')"/> - </xsl:when> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="olink.lang"> - <xsl:call-template name="l10n.language"> - <xsl:with-param name="xref-context" select="true()"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="target.database.filename"> - <xsl:call-template name="select.target.database"> - <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/> - <xsl:with-param name="targetptr.att" select="$targetptr.att"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="target.database" - select="document($target.database.filename, /)"/> - - <xsl:if test="$olink.debug != 0"> - <xsl:message> - <xsl:text>Olink debug: root element of target.database is '</xsl:text> - <xsl:value-of select="local-name($target.database/*[1])"/> - <xsl:text>'.</xsl:text> - </xsl:message> - </xsl:if> - - <xsl:variable name="olink.key"> - <xsl:call-template name="select.olink.key"> - <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/> - <xsl:with-param name="targetptr.att" select="$targetptr.att"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - <xsl:with-param name="target.database" select="$target.database"/> - </xsl:call-template> - </xsl:variable> - - <xsl:if test="string-length($olink.key) = 0"> - <xsl:message> - <xsl:text>Error: unresolved olink: </xsl:text> - <xsl:text>targetdoc/targetptr = '</xsl:text> - <xsl:value-of select="$targetdoc.att"/> - <xsl:text>/</xsl:text> - <xsl:value-of select="$targetptr.att"/> - <xsl:text>'.</xsl:text> - </xsl:message> - </xsl:if> - - <xsl:variable name="href"> - <xsl:call-template name="make.olink.href"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="target.database" select="$target.database"/> - </xsl:call-template> - </xsl:variable> - - <!-- Olink that points to internal id can be a link --> - <xsl:variable name="linkend"> - <xsl:call-template name="olink.as.linkend"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - <xsl:with-param name="target.database" select="$target.database"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="hottext"> - <xsl:choose> - <xsl:when test="string-length($content) != 0"> - <xsl:copy-of select="$content"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="olink.hottext"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - <xsl:with-param name="target.database" select="$target.database"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="olink.docname.citation"> - <xsl:call-template name="olink.document.citation"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="target.database" select="$target.database"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="olink.page.citation"> - <xsl:call-template name="olink.page.citation"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="target.database" select="$target.database"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - <xsl:with-param name="linkend" select="$linkend"/> - </xsl:call-template> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$linkend != ''"> - <fo:basic-link internal-destination="{$linkend}" - xsl:use-attribute-sets="xref.properties"> - <xsl:call-template name="anchor"/> - <xsl:copy-of select="$hottext"/> - <xsl:copy-of select="$olink.page.citation"/> - </fo:basic-link> - </xsl:when> - <xsl:when test="$href != ''"> - <xsl:choose> - <xsl:when test="$fop1.extensions != 0"> - <xsl:variable name="mybeg" select="substring-before($href,'#')"/> - <xsl:variable name="myend" select="substring-after($href,'#')"/> - <fo:basic-link external-destination="url({concat($mybeg,'#dest=',$myend)})" - xsl:use-attribute-sets="olink.properties"> - <xsl:copy-of select="$hottext"/> - </fo:basic-link> - <xsl:copy-of select="$olink.page.citation"/> - <xsl:copy-of select="$olink.docname.citation"/> - </xsl:when> - <xsl:when test="$xep.extensions != 0"> - <fo:basic-link external-destination="url({$href})" - xsl:use-attribute-sets="olink.properties"> - <xsl:call-template name="anchor"/> - <xsl:copy-of select="$hottext"/> - </fo:basic-link> - <xsl:copy-of select="$olink.page.citation"/> - <xsl:copy-of select="$olink.docname.citation"/> - </xsl:when> - <xsl:when test="$axf.extensions != 0"> - <fo:basic-link external-destination="{$href}" - xsl:use-attribute-sets="olink.properties"> - <xsl:copy-of select="$hottext"/> - </fo:basic-link> - <xsl:copy-of select="$olink.page.citation"/> - <xsl:copy-of select="$olink.docname.citation"/> - </xsl:when> - <xsl:otherwise> - <fo:basic-link external-destination="{$href}" - xsl:use-attribute-sets="olink.properties"> - <xsl:copy-of select="$hottext"/> - </fo:basic-link> - <xsl:copy-of select="$olink.page.citation"/> - <xsl:copy-of select="$olink.docname.citation"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$hottext"/> - <xsl:copy-of select="$olink.page.citation"/> - <xsl:copy-of select="$olink.docname.citation"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <!-- olink never implemented in FO for old olink entity syntax --> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="*" mode="insert.olink.docname.markup"> - <xsl:param name="docname" select="''"/> - - <fo:inline font-style="italic"> - <xsl:value-of select="$docname"/> - </fo:inline> - -</xsl:template> - -<!-- This prevents error message when processing olinks with xrefstyle --> -<xsl:template match="d:olink" mode="object.xref.template"/> - - -<xsl:template name="olink.as.linkend"> - <xsl:param name="olink.key" select="''"/> - <xsl:param name="olink.lang" select="''"/> - <xsl:param name="target.database" select="NotANode"/> - - <xsl:variable name="targetdoc"> - <xsl:value-of select="substring-before($olink.key, '/')"/> - </xsl:variable> - - <xsl:variable name="targetptr"> - <xsl:value-of - select="substring-before(substring-after($olink.key, '/'), '/')"/> - </xsl:variable> - - <xsl:variable name="target.lang"> - <xsl:variable name="candidate"> - <xsl:for-each select="$target.database" > - <xsl:value-of - select="key('targetptr-key', $olink.key)[1]/@lang" /> - </xsl:for-each> - </xsl:variable> - <xsl:choose> - <xsl:when test="$candidate != ''"> - <xsl:value-of select="$candidate"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$olink.lang"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:if test="$current.docid = $targetdoc and - $olink.lang = $target.lang"> - <xsl:variable name="targets" select="key('id',$targetptr)"/> - <xsl:variable name="target" select="$targets[1]"/> - <xsl:if test="$target"> - <xsl:value-of select="$targetptr"/> - </xsl:if> - </xsl:if> - -</xsl:template> - - -<xsl:template name="olink.outline"> - <xsl:param name="outline.base.uri"/> - <xsl:param name="localinfo"/> - <xsl:param name="return" select="d:href"/> - - <xsl:message terminate="yes">Fatal error: olink.outline template: what is this supposed to do?</xsl:message> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template name="title.xref"> - <xsl:param name="target" select="."/> - <xsl:choose> - <xsl:when test="local-name($target) = 'figure' - or local-name($target) = 'example' - or local-name($target) = 'equation' - or local-name($target) = 'table' - or local-name($target) = 'dedication' - or local-name($target) = 'acknowledgements' - or local-name($target) = 'preface' - or local-name($target) = 'bibliography' - or local-name($target) = 'glossary' - or local-name($target) = 'index' - or local-name($target) = 'setindex' - or local-name($target) = 'colophon'"> - <xsl:call-template name="gentext.startquote"/> - <xsl:apply-templates select="$target" mode="title.markup"/> - <xsl:call-template name="gentext.endquote"/> - </xsl:when> - <xsl:otherwise> - <fo:inline font-style="italic"> - <xsl:apply-templates select="$target" mode="title.markup"/> - </fo:inline> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="number.xref"> - <xsl:param name="target" select="."/> - <xsl:apply-templates select="$target" mode="label.markup"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template name="xref.xreflabel"> - <!-- called to process an xreflabel...you might use this to make --> - <!-- xreflabels come out in the right font for different targets, --> - <!-- for example. --> - <xsl:param name="target" select="."/> - <xsl:value-of select="$target/@xreflabel"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:title" mode="xref"> - <xsl:apply-templates/> -</xsl:template> - -<xsl:template match="d:command" mode="xref"> - <xsl:call-template name="inline.boldseq"/> -</xsl:template> - -<xsl:template match="d:function" mode="xref"> - <xsl:call-template name="inline.monoseq"/> -</xsl:template> - -<xsl:template match="*" mode="page.citation"> - <xsl:param name="id" select="'???'"/> - - <fo:basic-link internal-destination="{$id}" - xsl:use-attribute-sets="xref.properties"> - <fo:inline keep-together.within-line="always"> - <xsl:call-template name="substitute-markup"> - <xsl:with-param name="template"> - <xsl:call-template name="gentext.template"> - <xsl:with-param name="name" select="'page.citation'"/> - <xsl:with-param name="context" select="'xref'"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </fo:inline> - </fo:basic-link> -</xsl:template> - -<xsl:template match="*" mode="pagenumber.markup"> - <xsl:variable name="id"> - <xsl:call-template name="object.id"/> - </xsl:variable> - <fo:page-number-citation ref-id="{$id}"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="*" mode="insert.title.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="title"/> - - <xsl:choose> - <!-- FIXME: what about the case where titleabbrev is inside the info? --> - <xsl:when test="$purpose = 'xref' and d:titleabbrev"> - <xsl:apply-templates select="." mode="titleabbrev.markup"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$title"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:chapter|d:appendix" mode="insert.title.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="title"/> - - <xsl:choose> - <xsl:when test="$purpose = 'xref'"> - <fo:inline font-style="italic"> - <xsl:copy-of select="$title"/> - </fo:inline> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$title"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="*" mode="insert.subtitle.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="subtitle"/> - - <xsl:copy-of select="$subtitle"/> -</xsl:template> - -<xsl:template match="*" mode="insert.label.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="label"/> - - <xsl:copy-of select="$label"/> -</xsl:template> - -<xsl:template match="*" mode="insert.pagenumber.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="pagenumber"/> - - <xsl:copy-of select="$pagenumber"/> -</xsl:template> - -<xsl:template match="*" mode="insert.direction.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="direction"/> - - <xsl:copy-of select="$direction"/> -</xsl:template> - -<xsl:template match="d:olink" mode="pagenumber.markup"> - <!-- Local olinks can use page-citation --> - <xsl:variable name="targetdoc.att" select="@targetdoc"/> - <xsl:variable name="targetptr.att" select="@targetptr"/> - - <xsl:variable name="olink.lang"> - <xsl:call-template name="l10n.language"> - <xsl:with-param name="xref-context" select="true()"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="target.database.filename"> - <xsl:call-template name="select.target.database"> - <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/> - <xsl:with-param name="targetptr.att" select="$targetptr.att"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="target.database" - select="document($target.database.filename, /)"/> - - <xsl:if test="$olink.debug != 0"> - <xsl:message> - <xsl:text>Olink debug: root element of target.database is '</xsl:text> - <xsl:value-of select="local-name($target.database/*[1])"/> - <xsl:text>'.</xsl:text> - </xsl:message> - </xsl:if> - - <xsl:variable name="olink.key"> - <xsl:call-template name="select.olink.key"> - <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/> - <xsl:with-param name="targetptr.att" select="$targetptr.att"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - <xsl:with-param name="target.database" select="$target.database"/> - </xsl:call-template> - </xsl:variable> - - <!-- Olink that points to internal id can be a link --> - <xsl:variable name="linkend"> - <xsl:call-template name="olink.as.linkend"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - <xsl:with-param name="target.database" select="$target.database"/> - </xsl:call-template> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$linkend != ''"> - <fo:page-number-citation ref-id="{$linkend}"/> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Olink error: no page number linkend for local olink '</xsl:text> - <xsl:value-of select="$olink.key"/> - <xsl:text>'</xsl:text> - </xsl:message> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/c-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/c-hl.xml deleted file mode 100644 index 1503dd1d94737ecdce203195eeb8df3bd474d939..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/c-hl.xml +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <!-- - Syntax highlighting definition for C xslthl - XSLT Syntax Highlighting http://sourceforge.net/projects/xslthl/ - Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks This software is provided 'as-is', without any - express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this - software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and - to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not - be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an - acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must - be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be - removed or altered from any source distribution. Michal Molhanec <mol1111 at users.sourceforge.net> Jirka Kosek <kosek - at users.sourceforge.net> Michiel Hendriks <elmuerte at users.sourceforge.net> - --> -<highlighters> - <highlighter type="multiline-comment"> - <start>/**</start> - <end>*/</end> - <style>doccomment</style> - </highlighter> - <highlighter type="oneline-comment"> - <start>///</start> - <style>doccomment</style> - </highlighter> - <highlighter type="multiline-comment"> - <start>/*</start> - <end>*/</end> - </highlighter> - <highlighter type="oneline-comment">//</highlighter> - <highlighter type="oneline-comment"> - <!-- use the online-comment highlighter to detect directives --> - <start>#</start> - <lineBreakEscape>\</lineBreakEscape> - <style>directive</style> - </highlighter> - <highlighter type="string"> - <string>"</string> - <escape>\</escape> - </highlighter> - <highlighter type="string"> - <string>'</string> - <escape>\</escape> - </highlighter> - <highlighter type="hexnumber"> - <prefix>0x</prefix> - <suffix>ul</suffix> - <suffix>lu</suffix> - <suffix>u</suffix> - <suffix>l</suffix> - <ignoreCase /> - </highlighter> - <highlighter type="number"> - <point>.</point> - <pointStarts /> - <exponent>e</exponent> - <suffix>ul</suffix> - <suffix>lu</suffix> - <suffix>u</suffix> - <suffix>f</suffix> - <suffix>l</suffix> - <ignoreCase /> - </highlighter> - <highlighter type="keywords"> - <keyword>auto</keyword> - <keyword>_Bool</keyword> - <keyword>break</keyword> - <keyword>case</keyword> - <keyword>char</keyword> - <keyword>_Complex</keyword> - <keyword>const</keyword> - <keyword>continue</keyword> - <keyword>default</keyword> - <keyword>do</keyword> - <keyword>double</keyword> - <keyword>else</keyword> - <keyword>enum</keyword> - <keyword>extern</keyword> - <keyword>float</keyword> - <keyword>for</keyword> - <keyword>goto</keyword> - <keyword>if</keyword> - <keyword>_Imaginary</keyword> - <keyword>inline</keyword> - <keyword>int</keyword> - <keyword>long</keyword> - <keyword>register</keyword> - <keyword>restrict</keyword> - <keyword>return</keyword> - <keyword>short</keyword> - <keyword>signed</keyword> - <keyword>sizeof</keyword> - <keyword>static</keyword> - <keyword>struct</keyword> - <keyword>switch</keyword> - <keyword>typedef</keyword> - <keyword>union</keyword> - <keyword>unsigned</keyword> - <keyword>void</keyword> - <keyword>volatile</keyword> - <keyword>while</keyword> - </highlighter> -</highlighters> \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/common.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/common.xsl deleted file mode 100644 index 0b741d518928da0f2e083f03307bf5a976a89f19..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/common.xsl +++ /dev/null @@ -1,121 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - - xmlns:d="http://docbook.org/ns/docbook" -xmlns:s6hl="http://net.sf.xslthl/ConnectorSaxon6" - xmlns:sbhl="http://net.sf.xslthl/ConnectorSaxonB" - xmlns:xhl="http://net.sf.xslthl/ConnectorXalan" - xmlns:saxon6="http://icl.com/saxon" - xmlns:saxonb="http://saxon.sf.net/" - xmlns:xalan="http://xml.apache.org/xalan" - - xmlns:exsl="http://exslt.org/common" - xmlns:xslthl="http://xslthl.sf.net" - exclude-result-prefixes="exsl xslthl s6hl sbhl xhl d" - version='1.0'> - -<!-- ******************************************************************** - $Id: common.xsl 8257 2009-02-20 04:40:16Z abdelazer $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - and other information. - - ******************************************************************** --> - -<!-- this construction is needed to have the saxon and xalan connectors working alongside each other --> -<xalan:component prefix="xhl" functions="highlight"> - <xalan:script lang="javaclass" src="xalan://net.sf.xslthl.ConnectorXalan" /> -</xalan:component> - -<!-- for saxon 6 --> -<saxon6:script implements-prefix="s6hl" language="java" src="java:net.sf.xslthl.ConnectorSaxon6" /> - -<!-- for saxon 8.5 and later --> -<saxonb:script implements-prefix="sbhl" language="java" src="java:net.sf.xslthl.ConnectorSaxonB" /> - - -<!-- You can override this template to do more complex mapping of - language attribute to highlighter language ID (see xslthl-config.xml) --> -<xsl:template name="language.to.xslthl"> - <xsl:param name="context"/> - - <xsl:choose> - <xsl:when test="$context/@language != ''"> - <xsl:value-of select="$context/@language"/> - </xsl:when> - <xsl:when test="$highlight.default.language != ''"> - <xsl:value-of select="$highlight.default.language"/> - </xsl:when> - </xsl:choose> -</xsl:template> - -<xsl:template name="apply-highlighting"> - <xsl:choose> - <!-- Do we want syntax highlighting --> - <xsl:when test="$highlight.source != 0"> - <xsl:variable name="language"> - <xsl:call-template name="language.to.xslthl"> - <xsl:with-param name="context" select="."/> - </xsl:call-template> - </xsl:variable> - <xsl:choose> - <xsl:when test="$language != ''"> - <xsl:variable name="content"> - <xsl:apply-templates/> - </xsl:variable> - <xsl:choose> - <xsl:when test="function-available('s6hl:highlight')"> - <xsl:apply-templates select="s6hl:highlight($language, exsl:node-set($content), $highlight.xslthl.config)" - mode="xslthl"/> - </xsl:when> - <xsl:when test="function-available('sbhl:highlight')"> - <xsl:apply-templates select="sbhl:highlight($language, exsl:node-set($content), $highlight.xslthl.config)" - mode="xslthl"/> - </xsl:when> - <xsl:when test="function-available('xhl:highlight')"> - <xsl:apply-templates select="xhl:highlight($language, exsl:node-set($content), $highlight.xslthl.config)" - mode="xslthl"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$content"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <!-- No syntax highlighting --> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- A fallback when the specific style isn't recognized --> -<xsl:template match="xslthl:*" mode="xslthl"> - <xsl:message> - <xsl:text>unprocessed xslthl style: </xsl:text> - <xsl:value-of select="local-name(.)" /> - </xsl:message> - <xsl:apply-templates mode="xslthl"/> -</xsl:template> - -<!-- Copy over already produced markup (FO/HTML) --> -<xsl:template match="node()" mode="xslthl" priority="-1"> - <xsl:copy> - <xsl:apply-templates select="node()" mode="xslthl"/> - </xsl:copy> -</xsl:template> - -<xsl:template match="*" mode="xslthl"> - <xsl:copy> - <xsl:copy-of select="@*"/> - <xsl:apply-templates select="node()" mode="xslthl"/> - </xsl:copy> -</xsl:template> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/cpp-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/cpp-hl.xml deleted file mode 100644 index db57d5e767b4452606b2ddf5ebce54166cce0eb2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/cpp-hl.xml +++ /dev/null @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - -Syntax highlighting definition for C++ - -xslthl - XSLT Syntax Highlighting -http://sourceforge.net/projects/xslthl/ -Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -Michal Molhanec <mol1111 at users.sourceforge.net> -Jirka Kosek <kosek at users.sourceforge.net> -Michiel Hendriks <elmuerte at users.sourceforge.net> - ---> -<highlighters> - <highlighter type="multiline-comment"> - <start>/**</start> - <end>*/</end> - <style>doccomment</style> - </highlighter> - <highlighter type="oneline-comment"> - <start>///</start> - <style>doccomment</style> - </highlighter> - <highlighter type="multiline-comment"> - <start>/*</start> - <end>*/</end> - </highlighter> - <highlighter type="oneline-comment">//</highlighter> - <highlighter type="oneline-comment"> - <!-- use the online-comment highlighter to detect directives --> - <start>#</start> - <lineBreakEscape>\</lineBreakEscape> - <style>directive</style> - </highlighter> - <highlighter type="string"> - <string>"</string> - <escape>\</escape> - </highlighter> - <highlighter type="string"> - <string>'</string> - <escape>\</escape> - </highlighter> - <highlighter type="hexnumber"> - <prefix>0x</prefix> - <suffix>ul</suffix> - <suffix>lu</suffix> - <suffix>u</suffix> - <suffix>l</suffix> - <ignoreCase /> - </highlighter> - <highlighter type="number"> - <point>.</point> - <pointStarts /> - <exponent>e</exponent> - <suffix>ul</suffix> - <suffix>lu</suffix> - <suffix>u</suffix> - <suffix>f</suffix> - <suffix>l</suffix> - <ignoreCase /> - </highlighter> - <highlighter type="keywords"> - <!-- C keywords --> - <keyword>auto</keyword> - <keyword>_Bool</keyword> - <keyword>break</keyword> - <keyword>case</keyword> - <keyword>char</keyword> - <keyword>_Complex</keyword> - <keyword>const</keyword> - <keyword>continue</keyword> - <keyword>default</keyword> - <keyword>do</keyword> - <keyword>double</keyword> - <keyword>else</keyword> - <keyword>enum</keyword> - <keyword>extern</keyword> - <keyword>float</keyword> - <keyword>for</keyword> - <keyword>goto</keyword> - <keyword>if</keyword> - <keyword>_Imaginary</keyword> - <keyword>inline</keyword> - <keyword>int</keyword> - <keyword>long</keyword> - <keyword>register</keyword> - <keyword>restrict</keyword> - <keyword>return</keyword> - <keyword>short</keyword> - <keyword>signed</keyword> - <keyword>sizeof</keyword> - <keyword>static</keyword> - <keyword>struct</keyword> - <keyword>switch</keyword> - <keyword>typedef</keyword> - <keyword>union</keyword> - <keyword>unsigned</keyword> - <keyword>void</keyword> - <keyword>volatile</keyword> - <keyword>while</keyword> - <!-- C++ keywords --> - <keyword>asm</keyword> - <keyword>dynamic_cast</keyword> - <keyword>namespace</keyword> - <keyword>reinterpret_cast</keyword> - <keyword>try</keyword> - <keyword>bool</keyword> - <keyword>explicit</keyword> - <keyword>new</keyword> - <keyword>static_cast</keyword> - <keyword>typeid</keyword> - <keyword>catch</keyword> - <keyword>false</keyword> - <keyword>operator</keyword> - <keyword>template</keyword> - <keyword>typename</keyword> - <keyword>class</keyword> - <keyword>friend</keyword> - <keyword>private</keyword> - <keyword>this</keyword> - <keyword>using</keyword> - <keyword>const_cast</keyword> - <keyword>inline</keyword> - <keyword>public</keyword> - <keyword>throw</keyword> - <keyword>virtual</keyword> - <keyword>delete</keyword> - <keyword>mutable</keyword> - <keyword>protected</keyword> - <keyword>true</keyword> - <keyword>wchar_t</keyword> - </highlighter> -</highlighters> \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/csharp-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/csharp-hl.xml deleted file mode 100644 index 99c2e3e6615d80187111294c050580c9d9e0385c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/csharp-hl.xml +++ /dev/null @@ -1,187 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - -Syntax highlighting definition for C# - -xslthl - XSLT Syntax Highlighting -http://sourceforge.net/projects/xslthl/ -Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -Michal Molhanec <mol1111 at users.sourceforge.net> -Jirka Kosek <kosek at users.sourceforge.net> -Michiel Hendriks <elmuerte at users.sourceforge.net> - ---> -<highlighters> - <highlighter type="multiline-comment"> - <start>/**</start> - <end>*/</end> - <style>doccomment</style> - </highlighter> - <highlighter type="oneline-comment"> - <start>///</start> - <style>doccomment</style> - </highlighter> - <highlighter type="multiline-comment"> - <start>/*</start> - <end>*/</end> - </highlighter> - <highlighter type="oneline-comment">//</highlighter> - <highlighter type="annotation"> - <!-- annotations are called (custom) "attributes" in .NET --> - <start>[</start> - <end>]</end> - <valueStart>(</valueStart> - <valueEnd>)</valueEnd> - </highlighter> - <highlighter type="oneline-comment"> - <!-- C# supports a couple of directives --> - <start>#</start> - <lineBreakEscape>\</lineBreakEscape> - <style>directive</style> - </highlighter> - <highlighter type="string"> - <!-- strings starting with an "@" can span multiple lines --> - <string>@"</string> - <endString>"</endString> - <escape>\</escape> - <spanNewLines /> - </highlighter> - <highlighter type="string"> - <string>"</string> - <escape>\</escape> - </highlighter> - <highlighter type="string"> - <string>'</string> - <escape>\</escape> - </highlighter> - <highlighter type="hexnumber"> - <prefix>0x</prefix> - <suffix>ul</suffix> - <suffix>lu</suffix> - <suffix>u</suffix> - <suffix>l</suffix> - <ignoreCase /> - </highlighter> - <highlighter type="number"> - <point>.</point> - <pointStarts /> - <exponent>e</exponent> - <suffix>ul</suffix> - <suffix>lu</suffix> - <suffix>u</suffix> - <suffix>f</suffix> - <suffix>d</suffix> - <suffix>m</suffix> - <suffix>l</suffix> - <ignoreCase /> - </highlighter> - <highlighter type="keywords"> - <keyword>abstract</keyword> - <keyword>as</keyword> - <keyword>base</keyword> - <keyword>bool</keyword> - <keyword>break</keyword> - <keyword>byte</keyword> - <keyword>case</keyword> - <keyword>catch</keyword> - <keyword>char</keyword> - <keyword>checked</keyword> - <keyword>class</keyword> - <keyword>const</keyword> - <keyword>continue</keyword> - <keyword>decimal</keyword> - <keyword>default</keyword> - <keyword>delegate</keyword> - <keyword>do</keyword> - <keyword>double</keyword> - <keyword>else</keyword> - <keyword>enum</keyword> - <keyword>event</keyword> - <keyword>explicit</keyword> - <keyword>extern</keyword> - <keyword>false</keyword> - <keyword>finally</keyword> - <keyword>fixed</keyword> - <keyword>float</keyword> - <keyword>for</keyword> - <keyword>foreach</keyword> - <keyword>goto</keyword> - <keyword>if</keyword> - <keyword>implicit</keyword> - <keyword>in</keyword> - <keyword>int</keyword> - <keyword>interface</keyword> - <keyword>internal</keyword> - <keyword>is</keyword> - <keyword>lock</keyword> - <keyword>long</keyword> - <keyword>namespace</keyword> - <keyword>new</keyword> - <keyword>null</keyword> - <keyword>object</keyword> - <keyword>operator</keyword> - <keyword>out</keyword> - <keyword>override</keyword> - <keyword>params</keyword> - <keyword>private</keyword> - <keyword>protected</keyword> - <keyword>public</keyword> - <keyword>readonly</keyword> - <keyword>ref</keyword> - <keyword>return</keyword> - <keyword>sbyte</keyword> - <keyword>sealed</keyword> - <keyword>short</keyword> - <keyword>sizeof</keyword> - <keyword>stackalloc</keyword> - <keyword>static</keyword> - <keyword>string</keyword> - <keyword>struct</keyword> - <keyword>switch</keyword> - <keyword>this</keyword> - <keyword>throw</keyword> - <keyword>true</keyword> - <keyword>try</keyword> - <keyword>typeof</keyword> - <keyword>uint</keyword> - <keyword>ulong</keyword> - <keyword>unchecked</keyword> - <keyword>unsafe</keyword> - <keyword>ushort</keyword> - <keyword>using</keyword> - <keyword>virtual</keyword> - <keyword>void</keyword> - <keyword>volatile</keyword> - <keyword>while</keyword> - </highlighter> - <highlighter type="keywords"> - <!-- special words, not really keywords --> - <keyword>add</keyword> - <keyword>alias</keyword> - <keyword>get</keyword> - <keyword>global</keyword> - <keyword>partial</keyword> - <keyword>remove</keyword> - <keyword>set</keyword> - <keyword>value</keyword> - <keyword>where</keyword> - <keyword>yield</keyword> - </highlighter> -</highlighters> \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/delphi-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/delphi-hl.xml deleted file mode 100644 index d5b4d1a04e6d5719c3d0c09e5f69024dbeb8a264..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/delphi-hl.xml +++ /dev/null @@ -1,200 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - -Syntax highlighting definition for Delphi (also suitable for Pascal) - -xslthl - XSLT Syntax Highlighting -http://sourceforge.net/projects/xslthl/ -Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - -Michal Molhanec <mol1111 at users.sourceforge.net> -Jirka Kosek <kosek at users.sourceforge.net> -Michiel Hendriks <elmuerte at users.sourceforge.net> - ---> -<highlighters> - <highlighter type="multiline-comment"> - <!-- multiline comments starting with an $ are directives --> - <start>{$</start> - <end>}</end> - <style>directive</style> - </highlighter> - <highlighter type="multiline-comment"> - <!-- multiline comments starting with an $ are directives --> - <start>(*$</start> - <end>)</end> - <style>directive</style> - </highlighter> - <highlighter type="multiline-comment"> - <start>{</start> - <end>}</end> - </highlighter> - <highlighter type="multiline-comment"> - <start>(*</start> - <end>*)</end> - </highlighter> - <highlighter type="oneline-comment">//</highlighter> - <highlighter type="string"> - <string>'</string> - <doubleEscapes /> - </highlighter> - <highlighter type="hexnumber"> - <prefix>#$</prefix> - <ignoreCase /> - <style>string</style> - </highlighter> - <highlighter type="number"> - <prefix>#</prefix> - <ignoreCase /> - <style>string</style> - </highlighter> - <highlighter type="hexnumber"> - <prefix>$</prefix> - <ignoreCase /> - </highlighter> - <highlighter type="number"> - <point>.</point> - <exponent>e</exponent> - <ignoreCase /> - </highlighter> - <highlighter type="keywords"> - <!-- Reserved words --> - <keyword>and</keyword> - <keyword>else</keyword> - <keyword>inherited</keyword> - <keyword>packed</keyword> - <keyword>then</keyword> - <keyword>array</keyword> - <keyword>end</keyword> - <keyword>initialization</keyword> - <keyword>procedure</keyword> - <keyword>threadvar</keyword> - <keyword>as</keyword> - <keyword>except</keyword> - <keyword>inline</keyword> - <keyword>program</keyword> - <keyword>to</keyword> - <keyword>asm</keyword> - <keyword>exports</keyword> - <keyword>interface</keyword> - <keyword>property</keyword> - <keyword>try</keyword> - <keyword>begin</keyword> - <keyword>file</keyword> - <keyword>is</keyword> - <keyword>raise</keyword> - <keyword>type</keyword> - <keyword>case</keyword> - <keyword>final</keyword> - <keyword>label</keyword> - <keyword>record</keyword> - <keyword>unit</keyword> - <keyword>class</keyword> - <keyword>finalization</keyword> - <keyword>library</keyword> - <keyword>repeat</keyword> - <keyword>unsafe</keyword> - <keyword>const</keyword> - <keyword>finally</keyword> - <keyword>mod</keyword> - <keyword>resourcestring</keyword> - <keyword>until</keyword> - <keyword>constructor</keyword> - <keyword>for</keyword> - <keyword>nil</keyword> - <keyword>sealed</keyword> - <keyword>uses</keyword> - <keyword>destructor</keyword> - <keyword>function</keyword> - <keyword>not</keyword> - <keyword>set</keyword> - <keyword>var</keyword> - <keyword>dispinterface</keyword> - <keyword>goto</keyword> - <keyword>object</keyword> - <keyword>shl</keyword> - <keyword>while</keyword> - <keyword>div</keyword> - <keyword>if</keyword> - <keyword>of</keyword> - <keyword>shr</keyword> - <keyword>with</keyword> - <keyword>do</keyword> - <keyword>implementation</keyword> - <keyword>or</keyword> - <keyword>static</keyword> - <keyword>xor</keyword> - <keyword>downto</keyword> - <keyword>in</keyword> - <keyword>out</keyword> - <keyword>string</keyword> - - <!-- Special meaning --> - <keyword>at</keyword> - <keyword>on</keyword> - - <!-- Directives --> - <keyword>absolute</keyword> - <keyword>dynamic</keyword> - <keyword>local</keyword> - <keyword>platform</keyword> - <keyword>requires</keyword> - <keyword>abstract</keyword> - <keyword>export</keyword> - <keyword>message</keyword> - <keyword>private</keyword> - <keyword>resident</keyword> - <keyword>assembler</keyword> - <keyword>external</keyword> - <keyword>name</keyword> - <keyword>protected</keyword> - <keyword>safecall</keyword> - <keyword>automated</keyword> - <keyword>far</keyword> - <keyword>near</keyword> - <keyword>public</keyword> - <keyword>stdcall</keyword> - <keyword>cdecl</keyword> - <keyword>forward</keyword> - <keyword>nodefault</keyword> - <keyword>published</keyword> - <keyword>stored</keyword> - <keyword>contains</keyword> - <keyword>implements</keyword> - <keyword>overload</keyword> - <keyword>read</keyword> - <keyword>varargs</keyword> - <keyword>default</keyword> - <keyword>index</keyword> - <keyword>override</keyword> - <keyword>readonly</keyword> - <keyword>virtual</keyword> - <keyword>deprecated</keyword> - <keyword>inline</keyword> - <keyword>package</keyword> - <keyword>register</keyword> - <keyword>write</keyword> - <keyword>dispid</keyword> - <keyword>library</keyword> - <keyword>pascal</keyword> - <keyword>reintroduce</keyword> - <keyword>writeonly</keyword> - <ignoreCase /> - </highlighter> -</highlighters> \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html deleted file mode 100644 index e8a286d292c223ce3ca3d775b06c63125a067597..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> - <head> - <title>Index of /release/xsl-ns/1.76.1/highlighting - - -

    Index of /release/xsl-ns/1.76.1/highlighting

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] ini-hl.xml 01-Nov-2010 20:31 1.6K -[TXT] xslthl-config.xml 01-Nov-2010 20:31 2.0K -[TXT] m2-hl.xml 01-Nov-2010 20:31 2.7K -[TXT] python-hl.xml 01-Nov-2010 20:31 3.0K -[TXT] myxml-hl.xml 01-Nov-2010 20:31 3.1K -[TXT] ruby-hl.xml 01-Nov-2010 20:31 3.2K -[TXT] c-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] java-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] perl-hl.xml 01-Nov-2010 20:31 3.6K -[TXT] common.xsl 01-Nov-2010 20:31 4.2K -[TXT] cpp-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] javascript-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] php-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] tcl-hl.xml 01-Nov-2010 20:31 5.1K -[TXT] csharp-hl.xml 01-Nov-2010 20:31 5.4K -[TXT] delphi-hl.xml 01-Nov-2010 20:31 5.8K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=D;O=A deleted file mode 100644 index c233f9f40af46ebc8a7805086563b81f70559b5a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=D;O=A +++ /dev/null @@ -1,27 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/highlighting - - -

    Index of /release/xsl-ns/1.76.1/highlighting

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] c-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] common.xsl 01-Nov-2010 20:31 4.2K -[TXT] cpp-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] csharp-hl.xml 01-Nov-2010 20:31 5.4K -[TXT] delphi-hl.xml 01-Nov-2010 20:31 5.8K -[TXT] ini-hl.xml 01-Nov-2010 20:31 1.6K -[TXT] java-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] javascript-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] m2-hl.xml 01-Nov-2010 20:31 2.7K -[TXT] myxml-hl.xml 01-Nov-2010 20:31 3.1K -[TXT] perl-hl.xml 01-Nov-2010 20:31 3.6K -[TXT] php-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] python-hl.xml 01-Nov-2010 20:31 3.0K -[TXT] ruby-hl.xml 01-Nov-2010 20:31 3.2K -[TXT] tcl-hl.xml 01-Nov-2010 20:31 5.1K -[TXT] xslthl-config.xml 01-Nov-2010 20:31 2.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=D;O=D deleted file mode 100644 index af7a5ed6e0309843cf4005c2e1bb3e4f2cd1e8dd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=D;O=D +++ /dev/null @@ -1,27 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/highlighting - - -

    Index of /release/xsl-ns/1.76.1/highlighting

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xslthl-config.xml 01-Nov-2010 20:31 2.0K -[TXT] tcl-hl.xml 01-Nov-2010 20:31 5.1K -[TXT] ruby-hl.xml 01-Nov-2010 20:31 3.2K -[TXT] python-hl.xml 01-Nov-2010 20:31 3.0K -[TXT] php-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] perl-hl.xml 01-Nov-2010 20:31 3.6K -[TXT] myxml-hl.xml 01-Nov-2010 20:31 3.1K -[TXT] m2-hl.xml 01-Nov-2010 20:31 2.7K -[TXT] javascript-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] java-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] ini-hl.xml 01-Nov-2010 20:31 1.6K -[TXT] delphi-hl.xml 01-Nov-2010 20:31 5.8K -[TXT] csharp-hl.xml 01-Nov-2010 20:31 5.4K -[TXT] cpp-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] common.xsl 01-Nov-2010 20:31 4.2K -[TXT] c-hl.xml 01-Nov-2010 20:31 3.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=M;O=A deleted file mode 100644 index 4e1b5c011aeafe3c8ec53dd55f933f5d78332425..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=M;O=A +++ /dev/null @@ -1,27 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/highlighting - - -

    Index of /release/xsl-ns/1.76.1/highlighting

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] c-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] cpp-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] csharp-hl.xml 01-Nov-2010 20:31 5.4K -[TXT] delphi-hl.xml 01-Nov-2010 20:31 5.8K -[TXT] ini-hl.xml 01-Nov-2010 20:31 1.6K -[TXT] java-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] javascript-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] m2-hl.xml 01-Nov-2010 20:31 2.7K -[TXT] myxml-hl.xml 01-Nov-2010 20:31 3.1K -[TXT] perl-hl.xml 01-Nov-2010 20:31 3.6K -[TXT] php-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] python-hl.xml 01-Nov-2010 20:31 3.0K -[TXT] ruby-hl.xml 01-Nov-2010 20:31 3.2K -[TXT] tcl-hl.xml 01-Nov-2010 20:31 5.1K -[TXT] xslthl-config.xml 01-Nov-2010 20:31 2.0K -[TXT] common.xsl 01-Nov-2010 20:31 4.2K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=M;O=D deleted file mode 100644 index 300f54f628654c8f7bd6caf5140d996a93846e9b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=M;O=D +++ /dev/null @@ -1,27 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/highlighting - - -

    Index of /release/xsl-ns/1.76.1/highlighting

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] common.xsl 01-Nov-2010 20:31 4.2K -[TXT] xslthl-config.xml 01-Nov-2010 20:31 2.0K -[TXT] tcl-hl.xml 01-Nov-2010 20:31 5.1K -[TXT] ruby-hl.xml 01-Nov-2010 20:31 3.2K -[TXT] python-hl.xml 01-Nov-2010 20:31 3.0K -[TXT] php-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] perl-hl.xml 01-Nov-2010 20:31 3.6K -[TXT] myxml-hl.xml 01-Nov-2010 20:31 3.1K -[TXT] m2-hl.xml 01-Nov-2010 20:31 2.7K -[TXT] javascript-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] java-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] ini-hl.xml 01-Nov-2010 20:31 1.6K -[TXT] delphi-hl.xml 01-Nov-2010 20:31 5.8K -[TXT] csharp-hl.xml 01-Nov-2010 20:31 5.4K -[TXT] cpp-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] c-hl.xml 01-Nov-2010 20:31 3.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=N;O=A deleted file mode 100644 index 71ea87efbb4801a3cbdf9ea57ab4b2c390de246e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=N;O=A +++ /dev/null @@ -1,27 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/highlighting - - -

    Index of /release/xsl-ns/1.76.1/highlighting

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] c-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] common.xsl 01-Nov-2010 20:31 4.2K -[TXT] cpp-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] csharp-hl.xml 01-Nov-2010 20:31 5.4K -[TXT] delphi-hl.xml 01-Nov-2010 20:31 5.8K -[TXT] ini-hl.xml 01-Nov-2010 20:31 1.6K -[TXT] java-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] javascript-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] m2-hl.xml 01-Nov-2010 20:31 2.7K -[TXT] myxml-hl.xml 01-Nov-2010 20:31 3.1K -[TXT] perl-hl.xml 01-Nov-2010 20:31 3.6K -[TXT] php-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] python-hl.xml 01-Nov-2010 20:31 3.0K -[TXT] ruby-hl.xml 01-Nov-2010 20:31 3.2K -[TXT] tcl-hl.xml 01-Nov-2010 20:31 5.1K -[TXT] xslthl-config.xml 01-Nov-2010 20:31 2.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=N;O=D deleted file mode 100644 index af7a5ed6e0309843cf4005c2e1bb3e4f2cd1e8dd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=N;O=D +++ /dev/null @@ -1,27 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/highlighting - - -

    Index of /release/xsl-ns/1.76.1/highlighting

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xslthl-config.xml 01-Nov-2010 20:31 2.0K -[TXT] tcl-hl.xml 01-Nov-2010 20:31 5.1K -[TXT] ruby-hl.xml 01-Nov-2010 20:31 3.2K -[TXT] python-hl.xml 01-Nov-2010 20:31 3.0K -[TXT] php-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] perl-hl.xml 01-Nov-2010 20:31 3.6K -[TXT] myxml-hl.xml 01-Nov-2010 20:31 3.1K -[TXT] m2-hl.xml 01-Nov-2010 20:31 2.7K -[TXT] javascript-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] java-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] ini-hl.xml 01-Nov-2010 20:31 1.6K -[TXT] delphi-hl.xml 01-Nov-2010 20:31 5.8K -[TXT] csharp-hl.xml 01-Nov-2010 20:31 5.4K -[TXT] cpp-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] common.xsl 01-Nov-2010 20:31 4.2K -[TXT] c-hl.xml 01-Nov-2010 20:31 3.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=S;O=A deleted file mode 100644 index e8a286d292c223ce3ca3d775b06c63125a067597..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=S;O=A +++ /dev/null @@ -1,27 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/highlighting - - -

    Index of /release/xsl-ns/1.76.1/highlighting

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] ini-hl.xml 01-Nov-2010 20:31 1.6K -[TXT] xslthl-config.xml 01-Nov-2010 20:31 2.0K -[TXT] m2-hl.xml 01-Nov-2010 20:31 2.7K -[TXT] python-hl.xml 01-Nov-2010 20:31 3.0K -[TXT] myxml-hl.xml 01-Nov-2010 20:31 3.1K -[TXT] ruby-hl.xml 01-Nov-2010 20:31 3.2K -[TXT] c-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] java-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] perl-hl.xml 01-Nov-2010 20:31 3.6K -[TXT] common.xsl 01-Nov-2010 20:31 4.2K -[TXT] cpp-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] javascript-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] php-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] tcl-hl.xml 01-Nov-2010 20:31 5.1K -[TXT] csharp-hl.xml 01-Nov-2010 20:31 5.4K -[TXT] delphi-hl.xml 01-Nov-2010 20:31 5.8K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=S;O=D deleted file mode 100644 index e12faf7271d25d610a67cca7aa0c7c3f27d1cf24..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/index.html?C=S;O=D +++ /dev/null @@ -1,27 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/highlighting - - -

    Index of /release/xsl-ns/1.76.1/highlighting

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] delphi-hl.xml 01-Nov-2010 20:31 5.8K -[TXT] csharp-hl.xml 01-Nov-2010 20:31 5.4K -[TXT] tcl-hl.xml 01-Nov-2010 20:31 5.1K -[TXT] php-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] javascript-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] cpp-hl.xml 01-Nov-2010 20:31 4.4K -[TXT] common.xsl 01-Nov-2010 20:31 4.2K -[TXT] perl-hl.xml 01-Nov-2010 20:31 3.6K -[TXT] java-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] c-hl.xml 01-Nov-2010 20:31 3.5K -[TXT] ruby-hl.xml 01-Nov-2010 20:31 3.2K -[TXT] myxml-hl.xml 01-Nov-2010 20:31 3.1K -[TXT] python-hl.xml 01-Nov-2010 20:31 3.0K -[TXT] m2-hl.xml 01-Nov-2010 20:31 2.7K -[TXT] xslthl-config.xml 01-Nov-2010 20:31 2.0K -[TXT] ini-hl.xml 01-Nov-2010 20:31 1.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/ini-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/ini-hl.xml deleted file mode 100644 index 8a938f30641c7dbdb940efab1eada7ffec26a74e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/ini-hl.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - ; - - - ^(\[.+\]\s*)$ - - MULTILINE - - - - ^(.+)(?==) - - MULTILINE - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/java-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/java-hl.xml deleted file mode 100644 index 672d518b48ffe1efd050911b5ae9747238fdf578..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/java-hl.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - /** - */ - - - - /* - */ - - // - - " - \ - - - ' - \ - - - @ - ( - ) - - - 0x - - - - . - e - f - d - l - - - - abstract - boolean - break - byte - case - catch - char - class - const - continue - default - do - double - else - extends - final - finally - float - for - goto - if - implements - import - instanceof - int - interface - long - native - new - package - private - protected - public - return - short - static - strictfp - super - switch - synchronized - this - throw - throws - transient - try - void - volatile - while - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/javascript-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/javascript-hl.xml deleted file mode 100644 index 08c90ba526a40e8a092c8b7ad26b9800c0c33bc7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/javascript-hl.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - /* - */ - - // - - " - \ - - - ' - \ - - - 0x - - - - . - e - - - - break - case - catch - continue - default - delete - do - else - finally - for - function - if - in - instanceof - new - return - switch - this - throw - try - typeof - var - void - while - with - - abstract - boolean - byte - char - class - const - debugger - double - enum - export - extends - final - float - goto - implements - import - int - interface - long - native - package - private - protected - public - short - static - super - synchronized - throws - transient - volatile - - - prototype - - Array - Boolean - Date - Error - EvalError - Function - Math - Number - Object - RangeError - ReferenceError - RegExp - String - SyntaxError - TypeError - URIError - - decodeURI - decodeURIComponent - encodeURI - encodeURIComponent - eval - isFinite - isNaN - parseFloat - parseInt - - Infinity - NaN - undefined - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/m2-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/m2-hl.xml deleted file mode 100644 index b145f74443e81aece39ebbf77f37b1fd27946046..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/m2-hl.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - (* - *) - - - " - - - ' - - - . - e - - - - and - array - begin - by - case - const - definition - div - do - else - elsif - end - exit - export - for - from - if - implementation - import - in - loop - mod - module - not - of - or - pointer - procedure - qualified - record - repeat - return - set - then - to - type - until - var - while - with - - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/myxml-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/myxml-hl.xml deleted file mode 100644 index afa4be712e61ff698d58bbb050a67a706c3d9b4b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/myxml-hl.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - A - ABBR - ACRONYM - ADDRESS - APPLET - AREA - B - BASE - BASEFONT - BDO - BIG - BLOCKQUOTE - BODY - BR - BUTTON - CAPTION - CENTER - CITE - CODE - COL - COLGROUP - DD - DEL - DFN - DIR - DIV - DL - DT - EM - FIELDSET - FONT - FORM - FRAME - FRAMESET - H1 - H2 - H3 - H4 - H5 - H6 - HEAD - HR - HTML - I - IFRAME - IMG - INPUT - INS - ISINDEX - KBD - LABEL - LEGEND - LI - LINK - MAP - MENU - META - NOFRAMES - NOSCRIPT - OBJECT - OL - OPTGROUP - OPTION - P - PARAM - PRE - Q - S - SAMP - SCRIPT - SELECT - SMALL - SPAN - STRIKE - STRONG - STYLE - SUB - SUP - TABLE - TBODY - TD - TEXTAREA - TFOOT - TH - THEAD - TITLE - TR - TT - U - UL - VAR - XMP - - - - - xsl: - - - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/perl-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/perl-hl.xml deleted file mode 100644 index da1924aebd807d29a3354a3877bc18e9161c5922..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/perl-hl.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - # - - << - ' - " - - - - " - \ - - - ' - \ - - - - 0x - - - - . - - - - - if - unless - while - until - foreach - else - elsif - for - when - default - given - - caller - continue - die - do - dump - eval - exit - goto - last - next - redo - return - sub - wantarray - - caller - import - local - my - package - use - - do - import - no - package - require - use - - bless - dbmclose - dbmopen - package - ref - tie - tied - untie - use - - and - or - not - eq - ne - lt - gt - le - ge - cmp - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/php-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/php-hl.xml deleted file mode 100644 index 4a70225201a2a980cc770b7c839fa734bd21e6b1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/php-hl.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - /** - */ - - - - /// - - - - /* - */ - - // - # - - " - \ - - - - ' - \ - - - - <<< - - - 0x - - - - . - e - - - - and - or - xor - __FILE__ - exception - __LINE__ - array - as - break - case - class - const - continue - declare - default - die - do - echo - else - elseif - empty - enddeclare - endfor - endforeach - endif - endswitch - endwhile - eval - exit - extends - for - foreach - function - global - if - include - include_once - isset - list - new - print - require - require_once - return - static - switch - unset - use - var - while - __FUNCTION__ - __CLASS__ - __METHOD__ - final - php_user_filter - interface - implements - extends - public - private - protected - abstract - clone - try - catch - throw - cfunction - old_function - true - false - - - - - ?> - <?php - <?= - - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/python-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/python-hl.xml deleted file mode 100644 index 791bc7a0eba456cf001836be9abc8df9f888d40c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/python-hl.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - @ - ( - ) - - # - - """ - - - - ''' - - - - " - \ - - - ' - \ - - - 0x - l - - - - . - - e - l - - - - and - del - from - not - while - as - elif - global - or - with - assert - else - if - pass - yield - break - except - import - print - class - exec - in - raise - continue - finally - is - return - def - for - lambda - try - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/ruby-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/ruby-hl.xml deleted file mode 100644 index 78189b0ad00390fb9ae1e19e2c8a57c5cf9da5fe..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/ruby-hl.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - # - - << - - - - " - \ - - - %Q{ - } - \ - - - %/ - / - \ - - - ' - \ - - - %q{ - } - \ - - - 0x - - - - . - e - - - - alias - and - BEGIN - begin - break - case - class - def - defined - do - else - elsif - END - end - ensure - false - for - if - in - module - next - nil - not - or - redo - rescue - retry - return - self - super - then - true - undef - unless - until - when - while - yield - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/tcl-hl.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/tcl-hl.xml deleted file mode 100644 index 7a8fa9fbd3bcf73412bd2ba9a72eb38c6670d628..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/tcl-hl.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - - # - - " - \ - - - -[\p{javaJavaIdentifierStart}][\p{javaJavaIdentifierPart}]+ - - - - - . - - - - - if - then - else - elseif - for - foreach - break - continue - while - eval - case - in - switch - default - exit - error - proc - rename - exec - return - uplevel - upvar - constructor - destructor - itcl_class - loop - for_array_keys - for_recursive_glob - for_file - method - body - configbody - catch - namespace - class - array - set - unset - package - source - - - subst - list - format - lappend - option - expr - puts - winfo - lindex - string - - - - verified - seteach - fixme - debug - rtl::debug - rtl::verified - rtl::template - rtl::seteach - - - mkProc - getCreator - properties - lappendunique - rtl::lappendunique - - - place - pack - grid - - - - image - font - focus - tk - bind - after - - - toplevel - frame - entry - listbox - button - radiobutton - checkbutton - canvas - menu - menubutton - text - label - message - - - - zinc - - - tkpath::gradient - - - rtl_combobox - rtl_tree - rtl_tabset - rtl_mlistbox - rtl_gridwin - rtlysizer - rtlxsizer - - - - goolbar - gstripes - zoolbar - gistbox - gooleditor - galette - - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/xslthl-config.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/xslthl-config.xml deleted file mode 100644 index b24e4690b955c8c92002210a0ab3306f6c9507dd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/highlighting/xslthl-config.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/admon.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/admon.xsl deleted file mode 100644 index 3f757e3c2e1d2ceec59d58eabe1a545b7d8eae46..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/admon.xsl +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - 25 - - - - - - - - - - - - - - - - - - note - warning - caution - tip - important - note - - - - - - - - Note - Warning - Caution - Tip - Important - Note - - - - - - - - - -
    - - - - - - - - - - - - : - - - - - - - - - - -
    - - - - [{$alt}] - - - - - - - - - -
    - -
    -
    -
    - - -
    - - - - - - - - - - -

    - - -

    -
    - - -
    -
    - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/annotations.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/annotations.xsl deleted file mode 100644 index 17ab943f714fd87073e7621f0da3ae5bcb54c5f2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/annotations.xsl +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/ebnf.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/ebnf.xsl deleted file mode 100644 index 9af1e90c88c724e411d41741df3caaacb6784e6c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/ebnf.xsl +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - -$Id: ebnf.xsl 8178 2008-12-15 22:26:38Z bobstayton $ - -Walsh -Norman -19992000 -Norman Walsh - - -HTML EBNF Reference - - -
    Introduction - -This is technical reference documentation for the DocBook XSL -Stylesheets; it documents (some of) the parameters, templates, and -other elements of the stylesheets. - -This reference describes the templates and parameters relevant -to formatting EBNF markup. - -This is not intended to be user documentation. -It is provided for developers writing customization layers for the -stylesheets, and for anyone who's interested in how it -works. - -Although I am trying to be thorough, this documentation is known -to be incomplete. Don't forget to read the source, too :-) -
    -
    -
    - - - - - - - - - - - - 1 - - - - - - EBNF - - for - - - - - - - - - - - - -
    - - -
    - - - - - - - - - - EBNF productions - -
    -
    -
    - - - - - - - - - - [ - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - Error: no ID for productionrecap linkend: - - . - - - - - - Warning: multiple "IDs" for productionrecap linkend: - - . - - - - - - - - - - - - - - - - | -
    -
    -
    - - - - - - - - - - - - - - - production - - - - - - - - - Non-terminals with no content must point to - production elements in the current document. - - - Invalid xpointer for empty nt: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - - - - - /*  - -  */ -
    -
    - - - - - - - - - constraintdef - - - - - - - - - - - - - - - - : - - - - - - - : - - - - - - - - - -  ] - -
    -
    -
    - - -
    - - - -
    -
    - - -

    -
    - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/footnote.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/footnote.xsl deleted file mode 100644 index 186184e1b3ac123ed0ae4eed7021076b6bff99f2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/footnote.xsl +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - - - - - - #ftn. - - - - - - - [ - - - - - ] - - - - - [ - - - - - ] - - - - - - - - - - - -ERROR: A footnoteref element has a linkend that points to an element that is not a footnote. -Typically this happens when an id attribute is accidentally applied to the child of a footnote element. -target element: -linkend/id: - - - - - - - - - - - - #ftn. - - - - - [ - - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ftn. - - - - - - # - - - - - - - - - - - - - - [ - - - - - ] - - - - - - - - - - - - ftn. - - - - - - # - - - - - - - [ - - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - -
    -
    - - -
    -
    -

    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.

    -
    - - -
    -
    -
    - - - - - - - - -
    - - -
    -
    - - -
    - - - -
    -
    - - - - Warning: footnote number may not be generated - correctly; - - unexpected as first child of footnote. - -
    - - -
    -
    -
    -
    - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/formal.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/formal.xsl deleted file mode 100644 index 45414ab537447c4399255180482a38e0b6cc87fd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/formal.xsl +++ /dev/null @@ -1,427 +0,0 @@ - - - - - -1 - - - - - - - - - - -
    - - - - - - - -
    - -
    - - - - - -

    - - -

    -

    - - - - - - - -
    -
    - -
    -
    -
    - - - - - - - - - -float - - - - - - - - - -
    - - - - - - - - - - - - - -
    - -
    -
    - -

    - - - -

    -
    -
    -
    - - - - - -
    -

    - - - - - - - - -

    -

    -
    - - - - - - - - - -float - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Broken table: tr descendent of CALS Table. - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - Broken table: row descendent of HTML table. - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - float: - - ; - - - -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/glossary.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/glossary.xsl deleted file mode 100644 index 3c84ae281ea6d1e6dbc81fee7d60231c0f1bab55..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/glossary.xsl +++ /dev/null @@ -1,493 +0,0 @@ - - -%common.entities; -]> - - - - - - - - &setup-language-variable; - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    -
    - - - -
    - - - - -
    -
    - - - - - - - - - - - &setup-language-variable; -
    - - - - - -
    - - - - - - - - - - -
    -
    -
    - - - - - &setup-language-variable; - - -
    - - - -
    - - - - - - - - - - -
    -
    -
    - - -

    - - -

    -
    - - - - - - - - -
    - - - - 0 - 1 - - - - - - - - ( - - ) - - - - - -
    -
    - -
    - - - - 0 - 1 - - - - - - - - ( - - ) - -
    -
    - -
    - - - - 0 - 1 - - - - - -
    -
    -
    - - -
    - - - - , - - - - - , - - - - - , - - - - - - - - - - - -
    -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glosssee @otherterm reference not found: - - - - - - - - - - - - - - -

    -
    -
    - - -
    - - -

    - - - - - - - - - - - - - -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glossseealso @otherterm reference not found: - - - - - - - - - - - - - - - - - - - - - - - - - - &setup-language-variable; - - - - - - - - Warning: processing automatic glossary - without a glossary.collection file. - - - - - - Warning: processing automatic glossary but unable to - open glossary.collection file ' - - ' - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - -
    -
    - - - - - - - - - - &setup-language-variable; - -
    - - - -
    - - - - ! - - - - - - - - - - - - - - - -
    -
    -
    - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/graphics.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/graphics.xsl deleted file mode 100644 index dfc5e52ba6cd1b43fc72132e29fda803e9666c4a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/graphics.xsl +++ /dev/null @@ -1,1516 +0,0 @@ - - - - - - - - - - - - - - 1 - - - - - - 1 - - - - - -
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - - 1 - 0 - - - - - - 1.0 - 1.0 - - - - 1.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - px - - - - - - - - - - - px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - px - - - - - - - - - - - px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - middle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: imagemaps not supported - on scaled images - - - - 0 - - - - - - - - - - - - - - - - - - - - middle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - height: - - px - - - - - - - - - - - -
    - - - - - background-color: - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - calspair - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - , - - , - - - - - - - - - - - - Warning: only calspair or - otherunits='imagemap' supported - in imageobjectco - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - middle - - - - - - - - - - - - - - - - - -
    - - - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - Cannot insert - . Check use.extensions and textinsert.extension parameters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - Cannot insert - . Check use.extensions and textinsert.extension parameters. - - - - - - - - -
    - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/highlight.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/highlight.xsl deleted file mode 100644 index a5b0f93739274531b2a3e29c47fb720b3263ea1f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/highlight.xsl +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/html-rtf.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/html-rtf.xsl deleted file mode 100644 index 8de6bb30fd416b691791577e3ddec217ee2275f9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/html-rtf.xsl +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/html.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/html.xsl deleted file mode 100644 index 1a96ae1147b4a02c56eae8662c408c3d664e3155..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/html.xsl +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - - - left - right - left - - - - - - right - left - right - - - - - - ltr - rtl - ltr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - # - - - - - - - - - - - - - - - - - - - bullet - - - - - - - - - bullet - - - © - - - ® - (SM) -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID recommended on - - - : - - - - ... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: no root element for CSS source file' - - '. - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: missing CSS input filename. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/htmltbl.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/htmltbl.xsl deleted file mode 100644 index 2ad7e2bd57c1d94d5af5517ff65492fec851cfaa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/htmltbl.xsl +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - float: - - left - right - - - - - - - - - - - - - none - none - - ; - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html deleted file mode 100644 index 6b66d8514ea918dbbf5e30252fd8f258e81fc423..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/html - - -

    Index of /release/xsl-ns/1.76.1/html

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] manifest.xsl 01-Nov-2010 20:31 1.0K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.3K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] info.xsl 01-Nov-2010 20:31 1.6K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] task.xsl 01-Nov-2010 20:31 2.4K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.7K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.8K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 3.9K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 4.5K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.6K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.0K -[TXT] division.xsl 01-Nov-2010 20:31 7.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.2K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.4K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] block.xsl 01-Nov-2010 20:31 15K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 16K -[TXT] glossary.xsl 01-Nov-2010 20:31 17K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] chunker.xsl 01-Nov-2010 20:31 21K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 24K -[TXT] autotoc.xsl 01-Nov-2010 20:31 25K -[TXT] autoidx.xsl 01-Nov-2010 20:31 29K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] pi.xml 01-Nov-2010 20:31 39K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] inline.xsl 01-Nov-2010 20:31 46K -[TXT] pi.xsl 01-Nov-2010 20:31 47K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 81K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] param.xml 01-Nov-2010 20:31 369K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=D;O=A deleted file mode 100644 index 4fdc044959d19a551832b828b0b203473220bb96..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=D;O=A +++ /dev/null @@ -1,73 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/html - - -

    Index of /release/xsl-ns/1.76.1/html

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 4.5K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx.xsl 01-Nov-2010 20:31 29K -[TXT] autotoc.xsl 01-Nov-2010 20:31 25K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] block.xsl 01-Nov-2010 20:31 15K -[TXT] callout.xsl 01-Nov-2010 20:31 7.2K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 3.9K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 24K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 81K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] chunker.xsl 01-Nov-2010 20:31 21K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.8K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] division.xsl 01-Nov-2010 20:31 7.2K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] glossary.xsl 01-Nov-2010 20:31 17K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.6K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] info.xsl 01-Nov-2010 20:31 1.6K -[TXT] inline.xsl 01-Nov-2010 20:31 46K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.3K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.7K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.0K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.4K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] param.xml 01-Nov-2010 20:31 369K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] pi.xml 01-Nov-2010 20:31 39K -[TXT] pi.xsl 01-Nov-2010 20:31 47K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] task.xsl 01-Nov-2010 20:31 2.4K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 16K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=D;O=D deleted file mode 100644 index 69fb147b9299ce4bd46f8e3ea3883f50c7373c88..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=D;O=D +++ /dev/null @@ -1,73 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/html - - -

    Index of /release/xsl-ns/1.76.1/html

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 16K -[TXT] task.xsl 01-Nov-2010 20:31 2.4K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] pi.xsl 01-Nov-2010 20:31 47K -[TXT] pi.xml 01-Nov-2010 20:31 39K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] param.xml 01-Nov-2010 20:31 369K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.4K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.0K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.7K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.3K -[TXT] inline.xsl 01-Nov-2010 20:31 46K -[TXT] info.xsl 01-Nov-2010 20:31 1.6K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.6K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] glossary.xsl 01-Nov-2010 20:31 17K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] division.xsl 01-Nov-2010 20:31 7.2K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.8K -[TXT] chunker.xsl 01-Nov-2010 20:31 21K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 81K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 24K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 3.9K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] callout.xsl 01-Nov-2010 20:31 7.2K -[TXT] block.xsl 01-Nov-2010 20:31 15K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autotoc.xsl 01-Nov-2010 20:31 25K -[TXT] autoidx.xsl 01-Nov-2010 20:31 29K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 4.5K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.0K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=M;O=A deleted file mode 100644 index 8923fe006e984f36c3aee701a62d27cf9de69369..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=M;O=A +++ /dev/null @@ -1,73 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/html - - -

    Index of /release/xsl-ns/1.76.1/html

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] param.xml 01-Nov-2010 20:31 369K -[TXT] pi.xml 01-Nov-2010 20:31 39K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 16K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 4.5K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx.xsl 01-Nov-2010 20:31 29K -[TXT] autotoc.xsl 01-Nov-2010 20:31 25K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] block.xsl 01-Nov-2010 20:31 15K -[TXT] callout.xsl 01-Nov-2010 20:31 7.2K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 3.9K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 24K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 81K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] chunker.xsl 01-Nov-2010 20:31 21K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.8K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] division.xsl 01-Nov-2010 20:31 7.2K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] glossary.xsl 01-Nov-2010 20:31 17K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.6K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] info.xsl 01-Nov-2010 20:31 1.6K -[TXT] inline.xsl 01-Nov-2010 20:31 46K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.3K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.7K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.0K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.4K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] pi.xsl 01-Nov-2010 20:31 47K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] task.xsl 01-Nov-2010 20:31 2.4K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=M;O=D deleted file mode 100644 index d82d211aac989130df1b9f343a0e068f5f52197a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=M;O=D +++ /dev/null @@ -1,73 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/html - - -

    Index of /release/xsl-ns/1.76.1/html

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] task.xsl 01-Nov-2010 20:31 2.4K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] pi.xsl 01-Nov-2010 20:31 47K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.4K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.0K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.7K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.3K -[TXT] inline.xsl 01-Nov-2010 20:31 46K -[TXT] info.xsl 01-Nov-2010 20:31 1.6K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.6K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] glossary.xsl 01-Nov-2010 20:31 17K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] division.xsl 01-Nov-2010 20:31 7.2K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.8K -[TXT] chunker.xsl 01-Nov-2010 20:31 21K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 81K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 24K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 3.9K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] callout.xsl 01-Nov-2010 20:31 7.2K -[TXT] block.xsl 01-Nov-2010 20:31 15K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autotoc.xsl 01-Nov-2010 20:31 25K -[TXT] autoidx.xsl 01-Nov-2010 20:31 29K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 4.5K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.0K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 16K -[TXT] pi.xml 01-Nov-2010 20:31 39K -[TXT] param.xml 01-Nov-2010 20:31 369K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=N;O=A deleted file mode 100644 index 8ceb2803f8cf522ba8c4639940a44872ff0b91ed..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=N;O=A +++ /dev/null @@ -1,73 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/html - - -

    Index of /release/xsl-ns/1.76.1/html

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 4.5K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx.xsl 01-Nov-2010 20:31 29K -[TXT] autotoc.xsl 01-Nov-2010 20:31 25K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] block.xsl 01-Nov-2010 20:31 15K -[TXT] callout.xsl 01-Nov-2010 20:31 7.2K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 3.9K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 24K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 81K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] chunker.xsl 01-Nov-2010 20:31 21K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.8K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] division.xsl 01-Nov-2010 20:31 7.2K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] glossary.xsl 01-Nov-2010 20:31 17K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.6K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] info.xsl 01-Nov-2010 20:31 1.6K -[TXT] inline.xsl 01-Nov-2010 20:31 46K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.3K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.7K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.0K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.4K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] param.xml 01-Nov-2010 20:31 369K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] pi.xml 01-Nov-2010 20:31 39K -[TXT] pi.xsl 01-Nov-2010 20:31 47K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] task.xsl 01-Nov-2010 20:31 2.4K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 16K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=N;O=D deleted file mode 100644 index 69fb147b9299ce4bd46f8e3ea3883f50c7373c88..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=N;O=D +++ /dev/null @@ -1,73 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/html - - -

    Index of /release/xsl-ns/1.76.1/html

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 16K -[TXT] task.xsl 01-Nov-2010 20:31 2.4K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] pi.xsl 01-Nov-2010 20:31 47K -[TXT] pi.xml 01-Nov-2010 20:31 39K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] param.xml 01-Nov-2010 20:31 369K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.4K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.0K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.7K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.3K -[TXT] inline.xsl 01-Nov-2010 20:31 46K -[TXT] info.xsl 01-Nov-2010 20:31 1.6K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.6K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] glossary.xsl 01-Nov-2010 20:31 17K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] division.xsl 01-Nov-2010 20:31 7.2K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.8K -[TXT] chunker.xsl 01-Nov-2010 20:31 21K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 81K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 24K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 3.9K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] callout.xsl 01-Nov-2010 20:31 7.2K -[TXT] block.xsl 01-Nov-2010 20:31 15K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autotoc.xsl 01-Nov-2010 20:31 25K -[TXT] autoidx.xsl 01-Nov-2010 20:31 29K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 4.5K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.0K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=S;O=A deleted file mode 100644 index 6b66d8514ea918dbbf5e30252fd8f258e81fc423..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=S;O=A +++ /dev/null @@ -1,73 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/html - - -

    Index of /release/xsl-ns/1.76.1/html

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -[TXT] manifest.xsl 01-Nov-2010 20:31 1.0K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.3K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] info.xsl 01-Nov-2010 20:31 1.6K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] task.xsl 01-Nov-2010 20:31 2.4K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.7K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.8K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 3.9K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 4.5K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.6K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.0K -[TXT] division.xsl 01-Nov-2010 20:31 7.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.2K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.4K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] block.xsl 01-Nov-2010 20:31 15K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 16K -[TXT] glossary.xsl 01-Nov-2010 20:31 17K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] chunker.xsl 01-Nov-2010 20:31 21K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 24K -[TXT] autotoc.xsl 01-Nov-2010 20:31 25K -[TXT] autoidx.xsl 01-Nov-2010 20:31 29K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] pi.xml 01-Nov-2010 20:31 39K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] inline.xsl 01-Nov-2010 20:31 46K -[TXT] pi.xsl 01-Nov-2010 20:31 47K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 81K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] param.xml 01-Nov-2010 20:31 369K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=S;O=D deleted file mode 100644 index 147f75105faa2c29b41d7a14d1b6ac95ec9a7ec5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.html?C=S;O=D +++ /dev/null @@ -1,73 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/html - - -

    Index of /release/xsl-ns/1.76.1/html

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] param.xml 01-Nov-2010 20:31 369K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 81K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] pi.xsl 01-Nov-2010 20:31 47K -[TXT] inline.xsl 01-Nov-2010 20:31 46K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] pi.xml 01-Nov-2010 20:31 39K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] autoidx.xsl 01-Nov-2010 20:31 29K -[TXT] autotoc.xsl 01-Nov-2010 20:31 25K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 24K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] chunker.xsl 01-Nov-2010 20:31 21K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] glossary.xsl 01-Nov-2010 20:31 17K -[TXT] titlepage.templates.xml 01-Nov-2010 20:31 16K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] block.xsl 01-Nov-2010 20:31 15K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.4K -[TXT] callout.xsl 01-Nov-2010 20:31 7.2K -[TXT] division.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 6.0K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.6K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 4.5K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 3.9K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.8K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.7K -[TXT] task.xsl 01-Nov-2010 20:31 2.4K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.4K -[TXT] info.xsl 01-Nov-2010 20:31 1.6K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.5K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.3K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 898 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.xsl deleted file mode 100644 index 3da85b2dc29e97cc83b356edee72f766a46808db..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/index.xsl +++ /dev/null @@ -1,290 +0,0 @@ - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    -
    -
    - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - -
    - - - - - - - - - -
    - -
    -
    -
    - - -

    - - -

    -
    - - - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    - - - -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    -
    -
    - - -
    - ( - - - - - - ) -
    -
    - - -
    - ( - - - - - - ) -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/info.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/info.xsl deleted file mode 100644 index 25856805f6f5994cc7a01b1aedc84d2f79667072..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/info.xsl +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/inline.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/inline.xsl deleted file mode 100644 index 6f5ee32304b897c0a0d76487d61c3c8ed235d852..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/inline.xsl +++ /dev/null @@ -1,1491 +0,0 @@ - - -%common.entities; -]> - - - - - - - - - - - - - - - - - - - _blank - _top - - - - - - - - - - - - - - 1 - 0 - - - - - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XLink to nonexistent id: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - span - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - , - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - abbr - - - - - - acronym - - - - - - - - - - - - - - - - - - - - - - - - - - http://example.com/cgi-bin/man.cgi? - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glossary.collection specified, but there are - - automatic glossaries - - - - - - - - - - - - - - - - - - - - - - - - There's no entry for - - in - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Error: no glossentry for glossterm: - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element - - - - - - - - - - - - - - - - </ - - > - - - & - - ; - - - &# - - ; - - - % - - ; - - - <? - - > - - - <? - - ?> - - - < - - > - - - < - - /> - - - <!-- - - --> - - - - - - - - - - - - - - - - - - - - - - < - - - - - mailto: - - - - - - > - - - - - - - - - - - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - - - - - - - - - - - - - - - - - - ] - - - [ - - ] - - - - - - - - - - - - - [ - - - - - - - - - - - - ] - - - [ - - ] - - - - - - - - - - - - -

    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/keywords.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/keywords.xsl deleted file mode 100644 index b614e66a18f936cc6808d0fe767831c0309ad35d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/keywords.xsl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - , - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/lists.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/lists.xsl deleted file mode 100644 index 2f943c721e00329abbac97adcc8ee0a288a574bd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/lists.xsl +++ /dev/null @@ -1,1185 +0,0 @@ - - - - - - - - -
    - - - - - - - - - -
      - - - - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - circle - disc - square - - - - - - -
  • - - - - list-style-type: - - - - - - - - - - - -
    - -
    -
    - - - -
    -
  • -
    - - - - - - - - - - - - - 1 - a - i - A - I - - - - Unexpected numeration: - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    -
    - -
      - - - - - - - - - - - - - - - - - -
    -
    -
    -
    -
    - - - - - - -
  • - - - - - - - - - - - - - - -
    - -
    -
    - - - -
    -
  • -
    - - - - - - - - - - - - - -
    - -
    -
    - - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - - - - - - - - - - - - -

    -
    -
    -
    - - -
    - - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - - - - -
    - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    -
    -
    - - - - - - - - - -
    - -
    -
    - - - -
    -
    - - - - - - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - - - 1 - - - -
    -
    - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - 1 - - - - - - - - -   - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 1 - - 1 - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - -
    - - - - - 0 - 1 - - - - - - - - - - - - -
      - - -
    -
    - -
      - - - - - -
    -
    -
    - - - - -
    -
    - - - - - - - - - - - - -
      - - -
    -
    - - -
  • - - - -
  • -
    - - - -
      - - -
    -
    - - -

    - - - - -

    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    -
    - - -
    - - - - - - - -
    -
    - - - - - - - - - -
    - - - -
    -
    - - - - - - - - -
    - - - - - : - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    -
    - -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - -

    - - - - -

    - - - - - -
    - -
    - - - - -
    -
    -
    -
    -
    - - - - - - - - - -

    - - - - - - - - - - - - - - - -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/maketoc.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/maketoc.xsl deleted file mode 100644 index d1e13094b59a2b438fad01778f3a4e2c648d0faf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/maketoc.xsl +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - filename=" - - " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/manifest.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/manifest.xsl deleted file mode 100644 index 9bfc538f3d949f5bbacddf72b536a923b9bfd80d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/manifest.xsl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/math.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/math.xsl deleted file mode 100644 index bc71ec2ff806ab9546a3bd2a616f4285d32766b7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/math.xsl +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unsupported TeX math notation: - - - - - - - - - - - - - \nopagenumbers - - - - \bye - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - $ - - - - $ - - \vfill\eject - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - $$ - - - - $$ - - \vfill\eject - - - - - - - - - \documentclass{article} - \pagestyle{empty} - \begin{document} - - - - \end{document} - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - $ - - - - $ - - \newpage - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - $$ - - - - $$ - - \newpage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 1 - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/oldchunker.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/oldchunker.xsl deleted file mode 100644 index b1c76b2272231d1340a05c65672696d9b5eeab65..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/oldchunker.xsl +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - -Encoding used in generated HTML pages - -This encoding is used in files generated by chunking stylesheet. Currently -only Saxon is able to change output encoding. - - - - - - - - - -Saxon character representation used in generated HTML pages - -This character representation is used in files generated by chunking stylesheet. If -you want to suppress entity references for characters with direct representation -in default.encoding, set this parameter to value native. - - - - - - - - - - - - - - - - - - - - - - - - Chunking isn't supported with - - - - - - - - - - - - - - - Writing - - - for - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Can't make chunks with - - 's processor. - - - - - - - - - - - - - - - - Writing - - - for - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Can't make chunks with - - 's processor. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/onechunk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/onechunk.xsl deleted file mode 100644 index 9fe6b2992b3def65795147477781d8a4de4049de..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/onechunk.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - -1 - - - - # - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/param.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/param.xml deleted file mode 100644 index e70de9cf282d2833c64b8c480cee14c577f2832e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/param.xml +++ /dev/null @@ -1,10905 +0,0 @@ - - - -HTML Parameter Reference - -$Id: param.xweb 8552 2009-12-07 17:45:26Z bobstayton $ - - - - Walsh - Norman - - - - 1999 - 2000 - 2001 - 2002 - 2003 - 2004 - 2005 - 2006 - 2007 - Norman Walsh - - - This is reference documentation for all user-configurable - parameters in the DocBook XSL HTML stylesheets (for generating - HTML output). - - -Admonitions - - -admon.graphics.extension -string - - -admon.graphics.extension -Filename extension for admonition graphics - - - - -<xsl:param name="admon.graphics.extension">.png</xsl:param> - - - -Description - -Sets the filename extension to use on admonition graphics. - - - - - - -admon.graphics.path -string - - -admon.graphics.path -Path to admonition graphics - - - -<xsl:param name="admon.graphics.path">images/</xsl:param> - - -Description - -Sets the path to the directory containing the admonition graphics -(caution.png, important.png etc). This location is normally relative -to the output html directory. See base.dir - - - - - - -admon.graphics -boolean - - -admon.graphics -Use graphics in admonitions? - - - - -<xsl:param name="admon.graphics" select="0"></xsl:param> - - - -Description - -If true (non-zero), admonitions are presented in an alternate style that uses -a graphic. Default graphics are provided in the distribution. - - - - - - - -admon.textlabel -boolean - - -admon.textlabel -Use text label in admonitions? - - - - -<xsl:param name="admon.textlabel" select="1"></xsl:param> - - - -Description - -If true (non-zero), admonitions are presented with a generated -text label such as Note or Warning in the appropriate language. -If zero, such labels are turned off, but any title child -of the admonition element are still output. -The default value is 1. - - - - - - - -admon.style -string - - -admon.style -Specifies the CSS style attribute that should be added to -admonitions. - - - -<xsl:param name="admon.style"> - <xsl:value-of select="concat('margin-', $direction.align.start, ': 0.5in; margin-', $direction.align.end, ': 0.5in;')"></xsl:value-of> -</xsl:param> - - -Description - -Specifies the value of the CSS style -attribute that should be added to admonitions. - - - - - - -Callouts - - -callout.defaultcolumn -integer - - -callout.defaultcolumn -Indicates what column callouts appear in by default - - - - -<xsl:param name="callout.defaultcolumn">60</xsl:param> - - - -Description - -If a callout does not identify a column (for example, if it uses -the linerange unit), -it will appear in the default column. - - - - - - - -callout.graphics.extension -string - - -callout.graphics.extension -Filename extension for callout graphics - - - - -<xsl:param name="callout.graphics.extension">.png</xsl:param> - - - - -Description -Sets the filename extension to use on callout graphics. - - -The Docbook XSL distribution provides callout graphics in the following formats: -SVG (extension: .svg) -PNG (extension: .png) -GIF (extension: .gif) - - - - - - -callout.graphics.number.limit -integer - - -callout.graphics.number.limit -Number of the largest callout graphic - - - - -<xsl:param name="callout.graphics.number.limit">15</xsl:param> - - - - -Description - -If callout.graphics is non-zero, graphics -are used to represent callout numbers instead of plain text. The value -of callout.graphics.number.limit is the largest -number for which a graphic exists. If the callout number exceeds this -limit, the default presentation "(plain text instead of a graphic)" -will be used. - - - - - - - -callout.graphics.path -string - - -callout.graphics.path -Path to callout graphics - - - - -<xsl:param name="callout.graphics.path">images/callouts/</xsl:param> - - - -Description - -Sets the path to the directory holding the callout graphics. his -location is normally relative to the output html directory. see -base.dir. Always terminate the directory with / since the graphic file -is appended to this string, hence needs the separator. - - - - - - - -callout.graphics -boolean - - -callout.graphics -Use graphics for callouts? - - - - -<xsl:param name="callout.graphics" select="1"></xsl:param> - - - -Description - -If non-zero, callouts are presented with graphics (e.g., reverse-video -circled numbers instead of "(1)", "(2)", etc.). -Default graphics are provided in the distribution. - - - - - - - -callout.list.table -boolean - - -callout.list.table -Present callout lists using a table? - - - - -<xsl:param name="callout.list.table" select="1"></xsl:param> - - - -Description - -The default presentation of calloutlists uses -an HTML DL element. Some browsers don't align DLs very well -if callout.graphics is used. With this option -turned on, calloutlists are presented in an HTML -TABLE, which usually results in better alignment -of the callout number with the callout description. - - - - - - -callout.unicode.number.limit -integer - - -callout.unicode.number.limit -Number of the largest unicode callout character - - - - -<xsl:param name="callout.unicode.number.limit">10</xsl:param> - - - -Description - -If callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.number.limit -is -the largest number for which a unicode character exists. If the callout number -exceeds this limit, the default presentation "(nnn)" will always -be used. - - - - - - - -callout.unicode.start.character -integer - - -callout.unicode.start.character -First Unicode character to use, decimal value. - - - - -<xsl:param name="callout.unicode.start.character">10102</xsl:param> - - - -Description - -If callout.graphics is zero and callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.start.character -is the decimal unicode value used for callout number one. Currently, -only 10102 is supported in the stylesheets for this parameter. - - - - - - - -callout.unicode -boolean - - -callout.unicode -Use Unicode characters rather than images for callouts. - - - -<xsl:param name="callout.unicode" select="0"></xsl:param> - - -Description - -The stylesheets can use either an image of the numbers one to ten, or the single Unicode character which represents the numeral, in white on a black background. Use this to select the Unicode character option. - - - - - - - -callouts.extension -boolean - - -callouts.extension -Enable the callout extension - - - - -<xsl:param name="callouts.extension" select="1"></xsl:param> - - - -Description - -The callouts extension processes areaset -elements in programlistingco and other text-based -callout elements. - - - - - - -EBNF - - -ebnf.table.bgcolor -color - - -ebnf.table.bgcolor -Background color for EBNF tables - - - - -<xsl:param name="ebnf.table.bgcolor">#F5DCB3</xsl:param> - - - -Description - -Sets the background color for EBNF tables (a pale brown). No -bgcolor attribute is output if -ebnf.table.bgcolor is set to the null string. - - - - - - - -ebnf.table.border -boolean - - -ebnf.table.border -Selects border on EBNF tables - - - -<xsl:param name="ebnf.table.border" select="1"></xsl:param> - - -Description - -Selects the border on EBNF tables. If non-zero, the tables have -borders, otherwise they don't. - - - - - - -ebnf.assignment -rtf - - -ebnf.assignment -The EBNF production assignment operator - - - - -<xsl:param name="ebnf.assignment"> -<code>::=</code> -</xsl:param> - - - - -Description - -The ebnf.assignment parameter determines what -text is used to show assignment in productions -in productionsets. - -While ::= is common, so are several -other operators. - - - - - - -ebnf.statement.terminator -rtf - - -ebnf.statement.terminator -Punctuation that ends an EBNF statement. - - - - -<xsl:param name="ebnf.statement.terminator"></xsl:param> - - - - -Description - -The ebnf.statement.terminator parameter determines what -text is used to terminate each production -in productionset. - -Some notations end each statement with a period. - - - - - -ToC/LoT/Index Generation - - -annotate.toc -boolean - - -annotate.toc -Annotate the Table of Contents? - - - -<xsl:param name="annotate.toc" select="1"></xsl:param> - - -Description - -If true, TOCs will be annotated. At present, this just means -that the refpurpose of refentry -TOC entries will be displayed. - - - - - - - -autotoc.label.separator -string - - -autotoc.label.separator -Separator between labels and titles in the ToC - - - - -<xsl:param name="autotoc.label.separator">. </xsl:param> - - - -Description - -String used to separate labels and titles in a table of contents. - - - - - - -autotoc.label.in.hyperlink -boolean - - -autotoc.label.in.hyperlink -Include label in hyperlinked titles in TOC? - - - -<xsl:param name="autotoc.label.in.hyperlink" select="1"></xsl:param> - - -Description - -If the value of -autotoc.label.in.hyperlink is non-zero, labels -are included in hyperlinked titles in the TOC. If it is instead zero, -labels are still displayed prior to the hyperlinked titles, but -are not hyperlinked along with the titles. - - - - - - -process.source.toc -boolean - - -process.source.toc -Process a non-empty toc element if it occurs in a source document? - - - -<xsl:param name="process.source.toc" select="0"></xsl:param> - - -Description - -Specifies that the contents of a non-empty "hard-coded" -toc element in a source document are processed to -generate a TOC in output. - - This parameter has no effect on automated generation of - TOCs. An automated TOC may still be generated along with the - "hard-coded" TOC. To suppress automated TOC generation, adjust the - value of the generate.toc paramameter. - - The process.source.toc parameter also has - no effect if the toc element is empty; handling - for empty toc is controlled by the - process.empty.source.toc parameter. - - - - - - - - -process.empty.source.toc -boolean - - -process.empty.source.toc -Generate automated TOC if toc element occurs in a source document? - - - -<xsl:param name="process.empty.source.toc" select="0"></xsl:param> - - -Description - -Specifies that if an empty toc element is found in a -source document, an automated TOC is generated at this point in the -document. - - Depending on what the value of the - generate.toc parameter is, setting this - parameter to 1 could result in generation of - duplicate automated TOCs. So the - process.empty.source.toc is primarily useful - as an "override": by placing an empty toc in your - document and setting this parameter to 1, you can - force a TOC to be generated even if generate.toc - says not to. - - - - - - - - -bridgehead.in.toc -boolean - - -bridgehead.in.toc -Should bridgehead elements appear in the TOC? - - - -<xsl:param name="bridgehead.in.toc" select="0"></xsl:param> - - -Description - -If non-zero, bridgeheads appear in the TOC. Note that -this option is not fully supported and may be removed in a future -version of the stylesheets. - - - - - - - -simplesect.in.toc -boolean - - -simplesect.in.toc -Should simplesect elements appear in the TOC? - - - -<xsl:param name="simplesect.in.toc" select="0"></xsl:param> - - -Description - -If non-zero, simplesects will be included in the TOC. - - - - - - - -manual.toc -string - - -manual.toc -An explicit TOC to be used for the TOC - - - - -<xsl:param name="manual.toc"></xsl:param> - - - -Description - -The manual.toc identifies an explicit TOC that -will be used for building the printed TOC. - - - - - - - -toc.list.type -list -dl -ul -ol - - -toc.list.type -Type of HTML list element to use for Tables of Contents - - - -<xsl:param name="toc.list.type">dl</xsl:param> - - -Description - -When an automatically generated Table of Contents (or List of Titles) -is produced, this HTML element will be used to make the list. - - - - - - - -toc.section.depth -integer - - -toc.section.depth -How deep should recursive sections appear -in the TOC? - - - -<xsl:param name="toc.section.depth">2</xsl:param> - - -Description - -Specifies the depth to which recursive sections should appear in the -TOC. - - - - - - - -toc.max.depth -integer - - -toc.max.depth -How many levels should be created for each TOC? - - - -<xsl:param name="toc.max.depth">8</xsl:param> - - -Description - -Specifies the maximal depth of TOC on all levels. - - - - - - -generate.toc -table - - -generate.toc -Control generation of ToCs and LoTs - - - - -<xsl:param name="generate.toc"> -appendix toc,title -article/appendix nop -article toc,title -book toc,title,figure,table,example,equation -chapter toc,title -part toc,title -preface toc,title -qandadiv toc -qandaset toc -reference toc,title -sect1 toc -sect2 toc -sect3 toc -sect4 toc -sect5 toc -section toc -set toc,title -</xsl:param> - - - - -Description - -This parameter has a structured value. It is a table of space-delimited -path/value pairs. Each path identifies some element in the source document -using a restricted subset of XPath (only the implicit child axis, no wildcards, -no predicates). Paths can be either relative or absolute. - -When processing a particular element, the stylesheets consult this table to -determine if a ToC (or LoT(s)) should be generated. - -For example, consider the entry: - -book toc,figure - -This indicates that whenever a book is formatted, a -Table Of Contents and a List of Figures should be generated. Similarly, - -/chapter toc - -indicates that whenever a document that has a root -of chapter is formatted, a Table of -Contents should be generated. The entry chapter would match -all chapters, but /chapter matches only chapter -document elements. - -Generally, the longest match wins. So, for example, if you want to distinguish -articles in books from articles in parts, you could use these two entries: - -book/article toc,figure -part/article toc - -Note that an article in a part can never match a book/article, -so if you want nothing to be generated for articles in parts, you can simply leave -that rule out. - -If you want to leave the rule in, to make it explicit that you're turning -something off, use the value nop. For example, the following -entry disables ToCs and LoTs for articles: - -article nop - -Do not simply leave the word article in the file -without a matching value. That'd be just begging the silly little -path/value parser to get confused. - -Section ToCs are further controlled by the -generate.section.toc.level parameter. -For a given section level to have a ToC, it must have both an entry in -generate.toc and be within the range enabled by -generate.section.toc.level. - - - - - -generate.section.toc.level -integer - - -generate.section.toc.level -Control depth of TOC generation in sections - - - - -<xsl:param name="generate.section.toc.level" select="0"></xsl:param> - - - -Description - -The generate.section.toc.level parameter -controls the depth of section in which TOCs will be generated. Note -that this is related to, but not the same as -toc.section.depth, which controls the depth to -which TOC entries will be generated in a given TOC. -If, for example, generate.section.toc.level -is 3, TOCs will be generated in first, second, and third -level sections, but not in fourth level sections. - - - - - - - -generate.index -boolean - - -generate.index -Do you want an index? - - - -<xsl:param name="generate.index" select="1"></xsl:param> - - -Description - -Specify if an index should be generated. - - - - - - -index.method -list -basic -kosek -kimber - - -index.method -Select method used to group index entries in an index - - - - -<xsl:param name="index.method">basic</xsl:param> - - - -Description - -This parameter lets you select which method to use for sorting and grouping - index entries in an index. -Indexes in Latin-based languages that have accented characters typically -sort together accented words and unaccented words. -Thus Á (U+00C1 LATIN CAPITAL LETTER A WITH ACUTE) would sort together -with A (U+0041 LATIN CAPITAL LETTER A), so both would appear in the A -section of the index. -Languages using other alphabets (such as Russian, which is written in the Cyrillic alphabet) -and languages using ideographic chararacters (such as Japanese) -require grouping specific to the languages and alphabets. - - -The default indexing method is limited. -It can group accented characters in Latin-based languages only. -It cannot handle non-Latin alphabets or ideographic languages. -The other indexing methods require extensions of one type or -another, and do not work with -all XSLT processors, which is why they are not used by default. - -The three choices for indexing method are: - - -basic - - -(default) Sort and groups words based only on the Latin alphabet. -Words with accented Latin letters will group and sort with -their respective primary letter, but -words in non-Latin alphabets will be -put in the Symbols section of the index. - - - - -kosek - - -This method sorts and groups words based on letter groups configured in -the DocBook locale file for the given language. -See, for example, the French locale file common/fr.xml. -This method requires that the XSLT processor -supports the EXSLT extensions (most do). -It also requires support for using -user-defined functions in xsl:key (xsltproc does not). - -This method is suitable for any language for which you can -list all the individual characters that should appear -in each letter group in an index. -It is probably not practical to use it for ideographic languages -such as Chinese that have hundreds or thousands of characters. - - -To use the kosek method, you must: - - - -Use a processor that supports its extensions, such as -Saxon 6 or Xalan (xsltproc and Saxon 8 do not). - - - -Set the index.method parameter's value to kosek. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kosek.xsl or -html/autoidx-kosek.xsl into your -customization. - - - - - - - -kimber - - -This method uses extensions to the Saxon processor to implement -sophisticated indexing processes. It uses its own -configuration file, which can include information for any number of -languages. Each language's configuration can group -words using one of two processes. In the -enumerated process similar to that used in the kosek method, -you indicate the groupings character-by-character. -In the between-key process, you specify the -break-points in the sort order that should start a new group. -The latter configuration is useful for ideographic languages -such as Chinese, Japanese, and Korean. -You can also define your own collation algorithms and how you -want mixed Latin-alphabet words sorted. - - -For a whitepaper describing the extensions, see: -http://www.innodata-isogen.com/knowledge_center/white_papers/back_of_book_for_xsl_fo.pdf. - - - -To download the extension library, see -http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport. - - - - -To use the kimber method, you must: - - - -Use Saxon (version 6 or 8) as your XSLT processor. - - - -Install and configure the Innodata Isogen library, using -the documentation that comes with it. - - - -Set the index.method parameter's value to kimber. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kimber.xsl or -html/autoidx-kimber.xsl into your -customization. - - - - - - - - - - - - - -index.on.type -boolean - - -index.on.type -Select indexterms based on type -attribute value - - - - -<xsl:param name="index.on.type" select="0"></xsl:param> - - - -Description - - -If non-zero, -then an index element that has a -type attribute -value will contain only those indexterm -elements with a matching type attribute value. -If an index has no type -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - - -If index.on.type is zero, then the -type attribute has no effect -on selecting indexterms for an index. - - -For those using DocBook version 4.2 or earlier, -the type attribute is not available -for index terms. However, you can achieve the same -effect by using the role attribute -in the same manner on indexterm -and index, and setting the stylesheet parameter -index.on.role to a nonzero value. - - - - - - - -index.on.role -boolean - - -index.on.role -Select indexterms based on role value - - - - -<xsl:param name="index.on.role" select="0"></xsl:param> - - - -Description - - -If non-zero, -then an index element that has a -role attribute -value will contain only those indexterm -elements with a matching role value. -If an index has no role -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - -If index.on.role is zero, then the -role attribute has no effect -on selecting indexterms for an index. - - -If you are using DocBook version 4.3 or later, you should -use the type attribute instead of role -on indexterm and index, -and set the index.on.type to a nonzero -value. - - - - - - - -index.links.to.section -boolean - - -index.links.to.section -HTML index entries link to container section title - - - - -<xsl:param name="index.links.to.section" select="1"></xsl:param> - - - -Description - -If zero, then an index entry in an index links -directly to the location of the -generated anchor that is output -for the indexterm. If two identical indexterm elements -exist in the same section, then both entries appear -in the index with the same title but link to different -locations. - -If non-zero, then an index entry in an index links to the -section title containing the indexterm, rather than -directly to the anchor output for the indexterm. -Duplicate indexterm entries in the same section are dropped. - - -The default value is 1, so index entries link to -section titles by default. - -In both cases, the link text in an index entry is the -title of the section containing the indexterm. -That is because HTML does not have numbered pages. -It also provides the reader with context information -for each link. - -This parameter lets you choose which style of -index linking you want. - - - -When set to 0, an index entry takes you -to the precise location of its corresponding indexterm. -However, if you have a lot of duplicate -entries in sections, then you have a lot of duplicate -titles in the index, which makes it more cluttered. -The reader may not recognize why duplicate titles -appear until they follow the links. Also, the links -may land the reader in the middle of a section where the -section title is not visible, which may also be -confusing to the reader. - - -When set to 1, an index entry link is -less precise, but duplicate titles in the -index entries are eliminated. -Landing on the section title location may confirm the reader's -expectation that a link that -shows a section title will take them to that section title, -not a location within the section. - - - - - - - - - -index.prefer.titleabbrev -boolean - - -index.prefer.titleabbrev -Should abbreviated titles be used as back references? - - - - -<xsl:param name="index.prefer.titleabbrev" select="0"></xsl:param> - - - -Description - -If non-zero, and if a titleabbrev is defined, the abbreviated title -is used as the link text of a back reference in the index. - - - - - - - -index.term.separator -string - - -index.term.separator -Override for punctuation separating an index term -from its list of page references in an index - - - - -<xsl:param name="index.term.separator"></xsl:param> - - - -Description - -This parameter permits you to override -the text to insert between -the end of an index term and its list of page references. -Typically that might be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'term-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -fill in the content for this normally empty -override parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. -For fo output, it could be an fo:leader -element to provide space of a specific length, or a dot leader. - - - - - - - -index.number.separator -string - - -index.number.separator -Override for punctuation separating page numbers in index - - - - -<xsl:param name="index.number.separator"></xsl:param> - - - -Description - -This parameter permits you to override the text to insert between -page references in a formatted index entry. Typically -that would be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'number-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. This punctuation appears between -such section titles in an HTML index. - - - - - - - -index.range.separator -string - - -index.range.separator -Override for punctuation separating the two numbers -in a page range in index - - - - -<xsl:param name="index.range.separator"></xsl:param> - - - -Description - -This parameter permits you -to override the text to insert between -the two numbers of a page range in an index. -This parameter is only used by those XSL-FO processors -that support an extension for generating such page ranges -(such as XEP). - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'range-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. So there are no page ranges -and this parameter has no effect. - - - - - - -Stylesheet Extensions - - -linenumbering.everyNth -integer - - -linenumbering.everyNth -Indicate which lines should be numbered - - - - -<xsl:param name="linenumbering.everyNth">5</xsl:param> - - - -Description - -If line numbering is enabled, everyNth line will be -numbered. Note that numbering is one based, not zero based. - - - - - - - -linenumbering.extension -boolean - - -linenumbering.extension -Enable the line numbering extension - - - - -<xsl:param name="linenumbering.extension" select="1"></xsl:param> - - - -Description - -If non-zero, verbatim environments (address, literallayout, -programlisting, screen, synopsis) that specify line numbering will -have line numbers. - - - - - - - -linenumbering.separator -string - - -linenumbering.separator -Specify a separator between line numbers and lines - - - - -<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param> - - - -Description - -The separator is inserted between line numbers and lines in the -verbatim environment. The default value is a single white space. - Note the interaction with linenumbering.width - - - - - - - -linenumbering.width -integer - - -linenumbering.width -Indicates the width of line numbers - - - - -<xsl:param name="linenumbering.width">3</xsl:param> - - - -Description - -If line numbering is enabled, line numbers will appear right -justified in a field "width" characters wide. - - - - - - - -tablecolumns.extension -boolean - - -tablecolumns.extension -Enable the table columns extension function - - - - -<xsl:param name="tablecolumns.extension" select="1"></xsl:param> - - - -Description - -The table columns extension function adjusts the widths of table -columns in the HTML result to more accurately reflect the specifications -in the CALS table. - - - - - - - - textinsert.extension - boolean - - - textinsert.extension - Enables the textinsert extension element - - - - <xsl:param name="textinsert.extension" select="1"></xsl:param> - - - Description - The textinsert extension element inserts the contents of - a file into the result tree (as text). - - To use the textinsert extension element, you must use - either Saxon or Xalan as your XSLT processor (it doesn’t - work with xsltproc), along with either the DocBook Saxon - extensions or DocBook Xalan extensions (for more - information about those extensions, see DocBook Saxon Extensions and DocBook Xalan Extensions), and you must set both - the use.extensions and - textinsert.extension parameters to - 1. - As an alternative to using the textinsert element, - consider using an Xinclude element with the - parse="text" attribute and value - specified, as detailed in Using XInclude for text inclusions. - - - See Also - You can also use the dbhtml-include href processing - instruction to insert external files — both files containing - plain text and files with markup content (including HTML - content). - - More information - For how-to documentation on inserting contents of - external code files and other text files into output, see - External code files. - For guidelines on inserting contents of - HTML files into output, see Inserting external HTML code. - - - - - -textdata.default.encoding -string - - -textdata.default.encoding -Default encoding of external text files which are included -using textdata element - - - - -<xsl:param name="textdata.default.encoding"></xsl:param> - - - -Description - -Specifies the encoding of any external text files included using -textdata element. This value is used only when you do -not specify encoding by the appropriate attribute -directly on textdata. An empty string is interpreted as the system -default encoding. - - - - - - -graphicsize.extension -boolean - - -graphicsize.extension -Enable the getWidth()/getDepth() extension functions - - - - -<xsl:param name="graphicsize.extension" select="1"></xsl:param> - - - -Description - -If non-zero (and if use.extensions is non-zero -and if you're using a processor that supports extension functions), the -getWidth and getDepth functions -will be used to extract image sizes from graphics. - - - - - - -graphicsize.use.img.src.path -boolean - - -graphicsize.use.img.src.path -Prepend img.src.path before -filenames passed to extension functions - - - - -<xsl:param name="graphicsize.use.img.src.path" select="0"></xsl:param> - - - -Description - -If non-zero img.src.path parameter will -be appended before filenames passed to extension functions for -measuring image dimensions. - - - - - - -use.extensions -boolean - - -use.extensions -Enable extensions - - - - -<xsl:param name="use.extensions" select="0"></xsl:param> - - - -Description - -If non-zero, extensions may be used. Each extension is -further controlled by its own parameter. But if -use.extensions is zero, no extensions will -be used. - - - - - - -Automatic labelling - - -chapter.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -chapter.autolabel -Specifies the labeling format for Chapter titles - - - - -<xsl:param name="chapter.autolabel" select="1"></xsl:param> - - -Description - -If non-zero, then chapters will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - - - - -appendix.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -appendix.autolabel -Specifies the labeling format for Appendix titles - - - - -<xsl:param name="appendix.autolabel">A</xsl:param> - - - -Description - -If non-zero, then appendices will be numbered using the -parameter value as the number format if the value matches one of the -following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperalpha). - - - - - - - -part.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -part.autolabel -Specifies the labeling format for Part titles - - - - -<xsl:param name="part.autolabel">I</xsl:param> - - - -Description - -If non-zero, then parts will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperroman). - - - - - - - - -reference.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -reference.autolabel -Specifies the labeling format for Reference titles - - - - <xsl:param name="reference.autolabel">I</xsl:param> - - -Description -If non-zero, references will be numbered using the parameter - value as the number format if the value matches one of the - following: - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - -Any non-zero value other than the above will generate -the default number format (upperroman). - - - - - - -preface.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -preface.autolabel -Specifices the labeling format for Preface titles - - - -<xsl:param name="preface.autolabel" select="0"></xsl:param> - - -Description - -If non-zero then prefaces will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - - - - - -qandadiv.autolabel -boolean - - -qandadiv.autolabel -Are divisions in QAndASets enumerated? - - - -<xsl:param name="qandadiv.autolabel" select="1"></xsl:param> - - -Description - -If non-zero, unlabeled qandadivs will be enumerated. - - - - - - - -section.autolabel -boolean - - -section.autolabel -Are sections enumerated? - - - -<xsl:param name="section.autolabel" select="0"></xsl:param> - - -Description - -If true (non-zero), unlabeled sections will be enumerated. - - - - - - - -section.autolabel.max.depth -integer - - -section.autolabel.max.depth -The deepest level of sections that are numbered. - - - - -<xsl:param name="section.autolabel.max.depth">8</xsl:param> - - - -Description - -When section numbering is turned on by the -section.autolabel parameter, then this -parameter controls the depth of section nesting that is -numbered. Sections nested to a level deeper than this value will not -be numbered. - - - - - - - -section.label.includes.component.label -boolean - - -section.label.includes.component.label -Do section labels include the component label? - - - -<xsl:param name="section.label.includes.component.label" select="0"></xsl:param> - - -Description - -If non-zero, section labels are prefixed with the label of the -component that contains them. - - - - - - - -label.from.part -boolean - - -label.from.part -Renumber components in each part? - - - - -<xsl:param name="label.from.part" select="0"></xsl:param> - - - -Description - -If label.from.part is non-zero, then - numbering of components — preface, - chapter, appendix, and - reference (when reference occurs at the - component level) — is re-started within each - part. -If label.from.part is zero (the - default), numbering of components is not - re-started within each part; instead, components are - numbered sequentially throughout each book, - regardless of whether or not they occur within part - instances. - - - - - - -component.label.includes.part.label -boolean - - -component.label.includes.part.label -Do component labels include the part label? - - - -<xsl:param name="component.label.includes.part.label" select="0"></xsl:param> - - -Description - -If non-zero, number labels for chapter, -appendix, and other component elements are prefixed with -the label of the part element that contains them. So you might see -Chapter II.3 instead of Chapter 3. Also, the labels for formal -elements such as table and figure will include -the part label. If there is no part element container, then no prefix -is generated. - - -This feature is most useful when the -label.from.part parameter is turned on. -In that case, there would be more than one chapter -1, and the extra part label prefix will identify -each chapter unambiguously. - - - - - - - -HTML - - -html.base -uri - - -html.base -An HTML base URI - - - - -<xsl:param name="html.base"></xsl:param> - - -Description - -If html.base is set, it is used for the base element -in the head of the html documents. The parameter specifies -the base URL for all relative URLs in the document. This is useful -for dynamically served html where the base URI needs to be -shifted. - - - - - - -html.stylesheet.type -string - - -html.stylesheet.type -The type of the stylesheet used in the generated HTML - - - -<xsl:param name="html.stylesheet.type">text/css</xsl:param> - - -Description - -The type of the stylesheet to place in the HTML link tag. - - - - - - - -html.stylesheet -string - - -html.stylesheet -Name of the stylesheet(s) to use in the generated HTML - - - - -<xsl:param name="html.stylesheet"></xsl:param> - - - -Description - -The html.stylesheet parameter is either -empty, indicating that no stylesheet link tag should be -generated in the html output, or it is a list of one or more -stylesheet files. - -Multiple stylesheets are space-delimited. If you need to -reference a stylesheet URI that includes a space, encode it with -%20. A separate html link element will -be generated for each stylesheet in the order they are listed in the -parameter. - - - - - - -css.decoration -boolean - - -css.decoration -Enable CSS decoration of elements - - - - -<xsl:param name="css.decoration" select="1"></xsl:param> - - - -Description - - -If non-zero, then html elements produced by the stylesheet may be -decorated with style attributes. For example, the -li tags produced for list items may include a -fragment of CSS in the style attribute which sets -the CSS property "list-style-type". - - - - - - - -spacing.paras -boolean - - -spacing.paras -Insert additional <p> elements for spacing? - - - - -<xsl:param name="spacing.paras" select="0"></xsl:param> - - - -Description - -When non-zero, additional, empty paragraphs are inserted in -several contexts (for example, around informal figures), to create a -more pleasing visual appearance in many browsers. - - - - - - - -emphasis.propagates.style -boolean - - -emphasis.propagates.style -Pass emphasis role attribute through to HTML? - - - -<xsl:param name="emphasis.propagates.style" select="1"></xsl:param> - - -Description -If non-zero, the role attribute of -emphasis elements will be passed through to the HTML as a -class attribute on a span that surrounds the -emphasis. - - - - - -para.propagates.style -boolean - - -para.propagates.style -Pass para role attribute through to HTML? - - - - -<xsl:param name="para.propagates.style" select="1"></xsl:param> - - - -Description - -If true, the role attribute of para elements -will be passed through to the HTML as a class attribute on the -p generated for the paragraph. - - - - - - -phrase.propagates.style -boolean - - -phrase.propagates.style -Pass phrase role attribute through to HTML? - - - - -<xsl:param name="phrase.propagates.style" select="1"></xsl:param> - - -Description - -If non-zero, the role attribute of phrase elements -will be passed through to the HTML as a class -attribute on a span that surrounds the -phrase. - - - - - - -entry.propagates.style -boolean - - -entry.propagates.style -Pass entry role attribute through to HTML? - - - - -<xsl:param name="entry.propagates.style" select="1"></xsl:param> - - - -Description - -If true, the role attribute of entry elements -will be passed through to the HTML as a class attribute on the -td or th generated for the table -cell. - - - - - - -html.longdesc -boolean - - -html.longdesc -Should longdesc URIs be created? - - - -<xsl:param name="html.longdesc" select="1"></xsl:param> - - -Description -If non-zero, HTML files will be created for the -longdesc attribute. These files -are created from the textobjects in -mediaobjects and -inlinemediaobject. - - - - - - -html.longdesc.link -boolean - - -html.longdesc.link -Should a link to the longdesc be included in the HTML? - - - - -<xsl:param name="html.longdesc.link" select="$html.longdesc"></xsl:param> - - - -Description - -If non-zero, links will be created to the -HTML files created for the -longdesc attribute. It makes no -sense to enable this option without also enabling the -html.longdesc parameter. - - - - - - - - -make.valid.html -boolean - - -make.valid.html -Attempt to make sure the HTML output is valid HTML - - - - -<xsl:param name="make.valid.html" select="0"></xsl:param> - - - -Description - -If make.valid.html is true, the stylesheets take -extra effort to ensure that the resulting HTML is valid. This may mean that some -para tags are translated into HTML divs or -that other substitutions occur. - -This parameter is different from html.cleanup -because it changes the resulting markup; it does not use extension functions -to manipulate result-tree-fragments and is therefore applicable to any -XSLT processor. - - - - - - -html.cleanup -boolean - - -html.cleanup -Attempt to clean up the resulting HTML? - - - - -<xsl:param name="html.cleanup" select="1"></xsl:param> - - - -Description - -If non-zero, and if the EXSLT -extensions are supported by your processor, the resulting HTML will be -cleaned up. This improves the chances that the -resulting HTML will be valid. It may also improve the formatting of -some elements. - -This parameter is different from make.valid.html -because it uses extension functions to manipulate result-tree-fragments. - - - - - - -html.append -string - - -html.append -Specifies content to append to HTML output - - - -<xsl:param name="html.append"></xsl:param> - - -Description - -Specifies content to append to the end of HTML files output by -the html/docbook.xsl stylesheet, after the -closing <html> tag. You probably don’t want to set any -value for this parameter; but if you do, the only value it should ever -be set to is a newline character: &#x0a; or -&#10; - - - - - - -draft.mode -list -no -yes -maybe - - -draft.mode -Select draft mode - - - - -<xsl:param name="draft.mode">no</xsl:param> - - - -Description - -Selects draft mode. If draft.mode is -yes, the entire document will be treated -as a draft. If it is no, the entire document -will be treated as a final copy. If it is maybe, -individual sections will be treated as draft or final independently, depending -on how their status attribute is set. - - - - - - - -draft.watermark.image -uri - - -draft.watermark.image -The URI of the image to be used for draft watermarks - - - - -<xsl:param name="draft.watermark.image">images/draft.png</xsl:param> - - - -Description - -The image to be used for draft watermarks. - - - - - - -generate.id.attributes -boolean - - -generate.id.attributes -Generate ID attributes on container elements? - - - - -<xsl:param name="generate.id.attributes" select="0"></xsl:param> - - - -Description - -If non-zero, the HTML stylesheet will generate ID attributes on -containers. For example, the markup: - -<section id="foo"><title>Some Title</title> -<para>Some para.</para> -</section> - -might produce: - -<div class="section" id="foo"> -<h2>Some Title</h2> -<p>Some para.</p> -</div> - -The alternative is to generate anchors: - -<div class="section"> -<h2><a name="foo"></a>Some Title</h2> -<p>Some para.</p> -</div> - -Because the name attribute of -the a element and the id -attribute of other tags are both of type ID, producing both -generates invalid documents. - -As of version 1.50, you can use this switch to control which type of -identifier is generated. For backwards-compatibility, generating -a anchors is preferred. - -Note: at present, this switch is incompletely implemented. -Disabling ID attributes will suppress them, but enabling ID attributes -will not suppress the anchors. - - - - - - -generate.meta.abstract -boolean - - -generate.meta.abstract -Generate HTML META element from abstract? - - - - -<xsl:param name="generate.meta.abstract" select="1"></xsl:param> - - - -Description - -If non-zero, document abstracts will be reproduced in the HTML -head, with >meta name="description" content="..." - - - - - - - -make.clean.html -boolean - - -make.clean.html -Make HTML conform to modern coding standards - - - - -<xsl:param name="make.clean.html" select="0"></xsl:param> - - - -Description - -If make.clean.html is true, the stylesheets take -extra effort to ensure that the resulting HTML is conforms to -modern HTML coding standards. In addition to eliminating -excessive and noncompliant coding, it moves presentation -HTML coding to a CSS stylesheet. - -The resulting HTML is dependent on -CSS for formatting, and so the stylesheet is capable of -generating a supporting CSS file. The docbook.css.source -and custom.css.source parameters control -how a CSS file is generated. - -If you require your CSS to reside in the HTML -head element, then the generate.css.header -can be used to do that. - -The make.clean.html parameter is -different from html.cleanup -because the former changes the resulting markup; it does not use extension functions -like the latter to manipulate result-tree-fragments, -and is therefore applicable to any XSLT processor. - -If make.clean.html is set to zero (the default), -then the stylesheet retains its original -old style -HTML formatting features. - - - - - - docbook.css.source - string - - - docbook.css.source - Name of the default CSS input file - - - - <xsl:param name="docbook.css.source">docbook.css.xml</xsl:param> - - - Description - -The docbook.css.source parameter -specifies the name of the file containing the default DocBook -CSS styles. Those styles are necessary when the -make.clean.html parameter is nonzero. - -The file is a well-formed XML file that -must consist of a single style root -element that contains CSS styles as its text content. -The default value of the parameter (and filename) -is docbook.css.xml. -The stylesheets ship with the default file. You can substitute -your own and specify its path in this parameter. - -If docbook.css.source is not blank, -and make.clean.html is nonzero, then -the stylesheet takes the following actions: - - - - The stylesheet uses the XSLT document() - function to open the file specified by the parameter and - load it into a variable. - - - The stylesheet forms an output pathname consisting of the - value of the base.dir parameter (if it is set) - and the value of docbook.css.source, - with the .xml suffix stripped off. - - - - The stylesheet removes the style - wrapper element and writes just the CSS text content to the output file. - - - The stylesheet adds a link element to the - HTML HEAD element to reference the external CSS stylesheet. - For example: - <link rel="stylesheet" href="docbook.css" type="text/css"> - - However, if the docbook.css.link - parameter is set to zero, then no link is written - for the default CSS file. That is useful if a custom - CSS file will import the default CSS stylesheet to ensure - proper cascading of styles. - - - -If the docbook.css.source parameter -is changed from its default docbook.css.xml to blank, -then no default CSS is generated. Likewise if the -make.clean.html parameter is set to zero, -then no default CSS is generated. The -custom.css.source parameter can be used -instead to generate a complete custom CSS file. - -You can use the generate.css.header -parameter to instead write the CSS to each HTML HEAD -element in a style tag instead of an external CSS file. - - - - - - -docbook.css.link -boolean - - -docbook.css.link -Insert a link referencing the default CSS stylesheet - - - - -<xsl:param name="docbook.css.link" select="1"></xsl:param> - - - -Description - -The stylesheets are capable of generating a default -CSS stylesheet file. The parameters -make.clean.html and -docbook.css.source control that feature. - -Normally if a default CSS file is generated, then -the stylesheet inserts a link tag in the HTML -HEAD element to reference it. -However, you can omit that link reference if -you set the docbook.css.link to zero -(1 is the default). - -This parameter is useful when you want to import the -default CSS into a custom CSS file generated using the -custom.css.source parameter. - - - - - - - - custom.css.source - string - - - custom.css.source - Name of a custom CSS input file - - - - <xsl:param name="custom.css.source"></xsl:param> - - - Description - -The custom.css.source -parameter enables you to add CSS styles to DocBook's -HTML output. - -The parameter -specifies the name of a file containing custom -CSS styles. The file must be a well-formed XML file that -consists of a single style root -element that contains CSS styles as its text content. -For example: -<?xml version="1.0"?> -<style> -h2 { - font-weight: bold; - color: blue; -} -... -</style> - - -The filename specified by the parameter -should have a .xml -filename suffix, although that is not required. -The default value of this parameter is blank. - -If custom.css.source is not blank, then -the stylesheet takes the following actions. -These actions take place regardless of the value of -the make.clean.html parameter. - - - - The stylesheet uses the XSLT document() - function to open the file specified by the parameter and - load it into a variable. - - - The stylesheet forms an output pathname consisting of the - value of the base.dir parameter (if it is set) - and the value of custom.css.source, - with the .xml suffix stripped off. - - - - The stylesheet removes the style - wrapper element and writes just the CSS text content to the output file. - - - The stylesheet adds a link element to the - HTML HEAD element to reference this external CSS stylesheet. - For example: - <link rel="stylesheet" href="custom.css" type="text/css"> - - - - - - - -If the make.clean.html parameter is nonzero -(the default is zero), -and if the docbook.css.source parameter -is not blank (the default is not blank), -then the stylesheet will also generate a default CSS file -and add a link tag to reference it. -The link to the custom CSS comes after the -link to the default, so it should cascade properly -in most browsers. -If you do not want two link tags, and -instead want your custom CSS to import the default generated -CSS file, then do the following: - - - - - Add a line like the following to your custom CSS source file: - @import url("docbook.css") - - - - Set the docbook.css.link parameter - to zero. This will omit the link tag - that references the default CSS file. - - - -If you set make.clean.html to nonzero but -you do not want the default CSS generated, then also set -the docbook.css.source parameter to blank. -Then no default CSS will be generated, and so -all CSS styles must come from your custom CSS file. - -You can use the generate.css.header -parameter to instead write the CSS to each HTML HEAD -element in a style tag instead of an external CSS file. - - - - - - -generate.css.header -boolean - - -generate.css.header -Insert generated CSS styles in HEAD element - - - - -<xsl:param name="generate.css.header" select="0"></xsl:param> - - - -Description - -The stylesheets are capable of generating both default -and custom CSS stylesheet files. The parameters -make.clean.html, -docbook.css.source, and -custom.css.source control that feature. - -If you require that CSS styles reside in the HTML -HEAD element instead of external CSS files, -then set the generate.css.header -parameter to nonzero (it is zero by default). -Then instead of generating the CSS in external files, -they are wrapped in style elements in -the HEAD element of each HTML output file. - - - - - - -XSLT Processing - - -rootid -string - - -rootid -Specify the root element to format - - - - -<xsl:param name="rootid"></xsl:param> - - -Description - -If rootid is not empty, it must be the -value of an ID that occurs in the document being formatted. The entire -document will be loaded and parsed, but formatting will begin at the -element identified, rather than at the root. For example, this allows -you to process only chapter 4 of a book. -Because the entire document is available to the processor, automatic -numbering, cross references, and other dependencies are correctly -resolved. - - - - - - -suppress.navigation -boolean - - -suppress.navigation -Disable header and footer navigation - - - - -<xsl:param name="suppress.navigation" select="0"></xsl:param> - - - -Description - - -If non-zero, header and footer navigation will be suppressed. - - - - - - -suppress.header.navigation -boolean - - -suppress.header.navigation -Disable header navigation - - - - -<xsl:param name="suppress.header.navigation" select="0"></xsl:param> - - - -Description - -If non-zero, header navigation will be suppressed. - - - - - - -suppress.footer.navigation -boolean - - -suppress.footer.navigation -Disable footer navigation - - - -<xsl:param name="suppress.footer.navigation">0</xsl:param> - - -Description - - -If non-zero, footer navigation will be suppressed. - - - - - - -header.rule -boolean - - -header.rule -Rule under headers? - - - - -<xsl:param name="header.rule" select="1"></xsl:param> - - - -Description - -If non-zero, a rule will be drawn below the page headers. - - - - - - -footer.rule -boolean - - -footer.rule -Rule over footers? - - - - -<xsl:param name="footer.rule" select="1"></xsl:param> - - - -Description - -If non-zero, a rule will be drawn above the page footers. - - - - - - -id.warnings -boolean - - -id.warnings -Should warnings be generated for titled elements without IDs? - - - -<xsl:param name="id.warnings" select="0"></xsl:param> - - -Description -If non-zero, the stylesheet will issue a warning for any element -(other than the root element) which has a title but does not have an -ID. - - - - -Meta/*Info and Titlepages - - -inherit.keywords -boolean - - -inherit.keywords -Inherit keywords from ancestor elements? - - - - -<xsl:param name="inherit.keywords" select="1"></xsl:param> - - -Description - -If inherit.keywords -is non-zero, the keyword meta for each HTML -head element will include all of the keywords from -ancestor elements. Otherwise, only the keywords from the current section -will be used. - - - - - - - -make.single.year.ranges -boolean - - -make.single.year.ranges -Print single-year ranges (e.g., 1998-1999) - - - - -<xsl:param name="make.single.year.ranges" select="0"></xsl:param> - - -Description - -If non-zero, year ranges that span a single year will be printed -in range notation (1998-1999) instead of discrete notation -(1998, 1999). - - - - - - -make.year.ranges -boolean - - -make.year.ranges -Collate copyright years into ranges? - - - -<xsl:param name="make.year.ranges" select="0"></xsl:param> - - -Description - -If non-zero, multiple copyright year elements will be -collated into ranges. -This works only if each year number is put into a separate -year element. The copyright element permits multiple -year elements. If a year element contains a dash or -a comma, then that year element will not be merged into -any range. - - - - - - - -author.othername.in.middle -boolean - - -author.othername.in.middle -Is othername in author a -middle name? - - - - -<xsl:param name="author.othername.in.middle" select="1"></xsl:param> - - -Description - -If non-zero, the othername of an author -appears between the firstname and -surname. Otherwise, othername -is suppressed. - - - - - - - -blurb.on.titlepage.enabled -boolean - - -blurb.on.titlepage.enabled -Display personblurb and authorblurb on title pages? - - - - -<xsl:param name="blurb.on.titlepage.enabled" select="0"></xsl:param> - - - -Description - -If non-zero, output from authorblurb and -personblurb elements is displayed on title pages. If zero -(the default), output from those elements is suppressed on title pages -(unless you are using a titlepage customization -that causes them to be included). - - - - - - -contrib.inline.enabled -boolean - - -contrib.inline.enabled -Display contrib output inline? - - - -<xsl:param name="contrib.inline.enabled">1</xsl:param> - - -Description - -If non-zero (the default), output of the contrib element is -displayed as inline content rather than as block content. - - - - - - -editedby.enabled -boolean - - -editedby.enabled -Display “Edited by” heading above editor name? - - - -<xsl:param name="editedby.enabled">1</xsl:param> - - -Description - -If non-zero, a localized Edited -by heading is displayed above editor names in output of the -editor element. - - - - - - -abstract.notitle.enabled -boolean - - -abstract.notitle.enabled -Suppress display of abstract titles? - - - <xsl:param name="abstract.notitle.enabled" select="0"></xsl:param> - -Description -If non-zero, in output of the abstract element on titlepages, -display of the abstract title is suppressed. - - - - - -othercredit.like.author.enabled -boolean - - -othercredit.like.author.enabled -Display othercredit in same style as author? - - - -<xsl:param name="othercredit.like.author.enabled">0</xsl:param> - - -Description - -If non-zero, output of the -othercredit element on titlepages is displayed in -the same style as author and -editor output. If zero then -othercredit output is displayed using a style -different than that of author and -editor. - - - - - - -generate.legalnotice.link -boolean - - -generate.legalnotice.link -Write legalnotice to separate chunk and generate link? - - - -<xsl:param name="generate.legalnotice.link" select="0"></xsl:param> - - -Description - -If the value of generate.legalnotice.link -is non-zero, the stylesheet: - - - - writes the contents of legalnotice to a separate - HTML file - - - inserts a hyperlink to the legalnotice file - - - adds (in the HTML head) either a single - link or element or multiple - link elements (depending on the value of the - html.head.legalnotice.link.multiple - parameter), with the value or values derived from the - html.head.legalnotice.link.types - parameter - - - - Otherwise, if generate.legalnotice.link is - zero, legalnotice contents are rendered on the title - page. - -The name of the separate HTML file is computed as follows: - - - - If a filename is given by the dbhtml filename -processing instruction, that filename is used. - - - If the legalnotice has an id/xml:id -attribute, and if use.id.as.filename != 0, the filename -is the concatenation of the id value and the value of the html.ext -parameter. - - - If the legalnotice does not have an id/xml:id - attribute, or if use.id.as.filename = 0, the filename is the concatenation of "ln-", -auto-generated id value, and html.ext value. - - - - - - - - - - - -generate.revhistory.link -boolean - - -generate.revhistory.link -Write revhistory to separate chunk and generate link? - - - -<xsl:param name="generate.revhistory.link" select="0"></xsl:param> - - -Description - -If non-zero, the contents of revhistory are written -to a separate HTML file and a link to the file is -generated. Otherwise, revhistory contents are rendered on -the title page. - -The name of the separate HTML file is computed as follows: - - - - If a filename is given by the dbhtml filename processing instruction, -that filename is used. - - - If the revhistory has an id/xml:id -attribute, and if use.id.as.filename != 0, the filename is the concatenation of -the id value and the value of the html.ext parameter. - - - If the revhistory does not have an id/xml:id -attribute, or if use.id.as.filename = 0, the filename is the concatenation of "rh-", -auto-generated id value, and html.ext value. - - - - - - - - - - - -html.head.legalnotice.link.types -string - - -html.head.legalnotice.link.types -Specifies link types for legalnotice link in html head - - - - -<xsl:param name="html.head.legalnotice.link.types">copyright</xsl:param> - - - -Description - -The value of -html.head.legalnotice.link.types is a -space-separated list of link types, as described in Section 6.12 -of the HTML 4.01 specification. If the value of the -generate.legalnotice.link parameter is -non-zero, then the stylesheet generates (in the -head section of the HTML source) either a single -HTML link element or, if the value of the -html.head.legalnotice.link.multiple is -non-zero, one link element for each link type -specified. Each link has the following attributes: - - - - a rel attribute whose - value is derived from the value of - html.head.legalnotice.link.types - - - an href attribute whose - value is set to the URL of the file containing the - legalnotice - - - a title attribute whose - value is set to the title of the corresponding - legalnotice (or a title programatically - determined by the stylesheet) - - - -For example: - - <link rel="license" href="ln-id2524073.html" title="Legal Notice"> - - -About the default value - - In an ideal world, the default value of - html.head.legalnotice.link.types would - probably be “license”, since the content of the - DocBook legalnotice is typically license - information, not copyright information. However, the default value - is “copyright” for pragmatic reasons: because - that’s among the set of “recognized link types” listed in Section - 6.12 of the HTML 4.01 specification, and because certain - browsers and browser extensions are preconfigured to recognize that - value. - - - - - - - -html.head.legalnotice.link.multiple -boolean - - -html.head.legalnotice.link.multiple -Generate multiple link instances in html head for legalnotice? - - - - -<xsl:param name="html.head.legalnotice.link.multiple" select="1"></xsl:param> - - - -Description - -If html.head.legalnotice.link.multiple is -non-zero and the value of -html.head.legalnotice.link.types contains -multiple link types, then the stylesheet generates (in the -head section of the HTML source) one -link element for each link type specified. For -example, if the value of -html.head.legalnotice.link.types is -“copyright license”: - - <link rel="copyright" href="ln-id2524073.html" title="Legal Notice"> - <link rel="license" href="ln-id2524073.html" title="Legal Notice"> - - Otherwise, the stylesheet generates generates a single - link instance; for example: - - <link rel="copyright license" href="ln-id2524073.html" title="Legal Notice"> - - - - - - -Reference Pages - - -funcsynopsis.decoration -boolean - - -funcsynopsis.decoration -Decorate elements of a funcsynopsis? - - - - -<xsl:param name="funcsynopsis.decoration" select="1"></xsl:param> - - - -Description - -If non-zero, elements of the funcsynopsis will be -decorated (e.g. rendered as bold or italic text). The decoration is controlled by -templates that can be redefined in a customization layer. - - - - - - - -funcsynopsis.style -list -ansi -kr - - -funcsynopsis.style -What style of funcsynopsis should be generated? - - - -<xsl:param name="funcsynopsis.style">kr</xsl:param> - - -Description - -If funcsynopsis.style is ansi, -ANSI-style function synopses are generated for a -funcsynopsis, otherwise K&R-style -function synopses are generated. - - - - - - - -function.parens -boolean - - -function.parens -Generate parens after a function? - - - - -<xsl:param name="function.parens" select="0"></xsl:param> - - - -Description - -If non-zero, the formatting of a function element -will include generated parentheses. - - - - - - - -refentry.generate.name -boolean - - -refentry.generate.name -Output NAME header before refnames? - - - - -<xsl:param name="refentry.generate.name" select="1"></xsl:param> - - - -Description - -If non-zero, a "NAME" section title is output before the list -of refnames. This parameter and -refentry.generate.title are mutually -exclusive. This means that if you change this parameter to zero, you -should set refentry.generate.title to non-zero unless -you want get quite strange output. - - - - - - - -refentry.generate.title -boolean - - -refentry.generate.title -Output title before refnames? - - - - -<xsl:param name="refentry.generate.title" select="0"></xsl:param> - - - -Description - -If non-zero, the reference page title or first name is -output before the list of refnames. This parameter and -refentry.generate.name are mutually exclusive. -This means that if you change this parameter to non-zero, you -should set refentry.generate.name to zero unless -you want get quite strange output. - - - - - - - -refentry.xref.manvolnum -boolean - - -refentry.xref.manvolnum -Output manvolnum as part of -refentry cross-reference? - - - - -<xsl:param name="refentry.xref.manvolnum" select="1"></xsl:param> - - - -Description - -if non-zero, the manvolnum is used when cross-referencing -refentrys, either with xref -or citerefentry. - - - - - - - -citerefentry.link -boolean - - -citerefentry.link -Generate URL links when cross-referencing RefEntrys? - - - - -<xsl:param name="citerefentry.link" select="0"></xsl:param> - - -Description - -If non-zero, a web link will be generated, presumably -to an online man->HTML gateway. The text of the link is -generated by the generate.citerefentry.link template. - - - - - - - -refentry.separator -boolean - - -refentry.separator -Generate a separator between consecutive RefEntry elements? - - - - -<xsl:param name="refentry.separator" select="1"></xsl:param> - - - -Description - -If true, a separator will be generated between consecutive -reference pages. - - - - - - - -refclass.suppress -boolean - - -refclass.suppress -Suppress display of refclass contents? - - - - -<xsl:param name="refclass.suppress" select="0"></xsl:param> - - -Description - -If the value of refclass.suppress is -non-zero, then display of refclass contents is -suppressed in output. - - - - - -Tables - - -default.table.width -length - - -default.table.width -The default width of tables - - - -<xsl:param name="default.table.width"></xsl:param> - - -Description -If non-zero, this value will be used for the -width attribute on tables that do not specify an -alternate width (with the dbhtml table-width or -dbfo table-width processing instruction). - - - - - -nominal.table.width -length - - -nominal.table.width -The (absolute) nominal width of tables - - - - -<xsl:param name="nominal.table.width">6in</xsl:param> - - - -Description - -In order to convert CALS column widths into HTML column widths, it -is sometimes necessary to have an absolute table width to use for conversion -of mixed absolute and relative widths. This value must be an absolute -length (not a percentage). - - - - - - -table.borders.with.css -boolean - - -table.borders.with.css -Use CSS to specify table, row, and cell borders? - - - - -<xsl:param name="table.borders.with.css" select="0"></xsl:param> - - - -Description - -If non-zero, CSS will be used to draw table borders. - - - - - - - -table.cell.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.cell.border.style -Specifies the border style of table cells - - - - -<xsl:param name="table.cell.border.style">solid</xsl:param> - - - -Description - -Specifies the border style of table cells. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.cell.border.thickness -length - - -table.cell.border.thickness -Specifies the thickness of table cell borders - - - - -<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param> - - - -Description - -If non-zero, specifies the thickness of borders on table -cells. The units are points. See -CSS - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.cell.border.color -color - - -table.cell.border.color -Specifies the border color of table cells - - - - -<xsl:param name="table.cell.border.color"></xsl:param> - - - - -Description - -Set the color of table cell borders. If non-zero, the value is used -for the border coloration. See CSS. A -color is either a keyword or a numerical RGB specification. -Keywords are aqua, black, blue, fuchsia, gray, green, lime, maroon, -navy, olive, orange, purple, red, silver, teal, white, and -yellow. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - - - - -table.frame.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.frame.border.style -Specifies the border style of table frames - - - - -<xsl:param name="table.frame.border.style">solid</xsl:param> - - - -Description - -Specifies the border style of table frames. - - - - - - -table.frame.border.thickness -length - - -table.frame.border.thickness -Specifies the thickness of the frame border - - - - -<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param> - - - -Description - -Specifies the thickness of the border on the table's frame. - - - - - - -table.frame.border.color -color - - -table.frame.border.color -Specifies the border color of table frames - - - - -<xsl:param name="table.frame.border.color"></xsl:param> - - - - -Description - -Specifies the border color of table frames. - - - - - - -default.table.frame -string - - -default.table.frame -The default framing of tables - - - - -<xsl:param name="default.table.frame">all</xsl:param> - - - -Description - -This value will be used when there is no frame attribute on the -table. - - - - - - -html.cellspacing -integer - - -html.cellspacing -Default value for cellspacing in HTML tables - - - - -<xsl:param name="html.cellspacing"></xsl:param> - - - -Description - -If non-zero, this value will be used as the default cellspacing -value in HTML tables. nn for pixels or nn% for percentage -length. E.g. 5 or 5% - - - - - - -html.cellpadding -integer - - -html.cellpadding -Default value for cellpadding in HTML tables - - - - -<xsl:param name="html.cellpadding"></xsl:param> - - - -Description - -If non-zero, this value will be used as the default cellpadding value -in HTML tables. nn for pixels or nn% for percentage length. E.g. 5 or -5% - - - - - -QAndASet - - -qanda.defaultlabel -list -number -qanda -none - - -qanda.defaultlabel -Sets the default for defaultlabel on QandASet. - - - - -<xsl:param name="qanda.defaultlabel">number</xsl:param> - - - -Description - -If no defaultlabel attribute is specified on -a qandaset, this value is used. It is generally one of the legal -values for the defaultlabel attribute (none, -number or -qanda), or one of the additional stylesheet-specific values -(qnumber or qnumberanda). -The default value is 'number'. - -The values are rendered as follows: - -qanda - -questions are labeled "Q:" and -answers are labeled "A:". - - - -number - -The questions are enumerated and the answers -are not labeled. - - - -qnumber - -The questions are labeled "Q:" followed by a number, and answers are not -labeled. -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -qnumberanda - -The questions are labeled "Q:" followed by a number, and -the answers are labeled "A:". -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -none - -No distinguishing label precedes Questions or Answers. - - - - - - - - - - -qanda.inherit.numeration -boolean - - -qanda.inherit.numeration -Does enumeration of QandASet components inherit the numeration of parent elements? - - - - -<xsl:param name="qanda.inherit.numeration" select="1"></xsl:param> - - - -Description - -If non-zero, numbered qandadiv elements and -question and answer inherit the enumeration of -the ancestors of the qandaset. - - - - - - - -qanda.in.toc -boolean - - -qanda.in.toc -Should qandaentry questions appear in -the document table of contents? - - - -<xsl:param name="qanda.in.toc" select="0"></xsl:param> - - -Description - -If true (non-zero), then the generated table of contents -for a document will include qandaset titles, -qandadiv titles, -and question elements. The default value (zero) excludes -them from the TOC. - -This parameter does not affect any tables of contents -that may be generated inside a qandaset or qandadiv. - - - - - - - -qanda.nested.in.toc -boolean - - -qanda.nested.in.toc -Should nested answer/qandaentry instances appear in TOC? - - - - -<xsl:param name="qanda.nested.in.toc" select="0"></xsl:param> - - - -Description - -If non-zero, instances of qandaentry -that are children of answer elements are shown in -the TOC. - - - - - -Linking - - -target.database.document -uri - - -target.database.document -Name of master database file for resolving -olinks - - - - <xsl:param name="target.database.document">olinkdb.xml</xsl:param> - - -Description - - -To resolve olinks between documents, the stylesheets use a master -database document that identifies the target datafiles for all the -documents within the scope of the olinks. This parameter value is the -URI of the master document to be read during processing to resolve -olinks. The default value is olinkdb.xml. - -The data structure of the file is defined in the -targetdatabase.dtd DTD. The database file -provides the high level elements to record the identifiers, locations, -and relationships of documents. The cross reference data for -individual documents is generally pulled into the database using -system entity references or XIncludes. See also -targets.filename. - - - - -targets.filename -string - - -targets.filename -Name of cross reference targets data file - - -<xsl:param name="targets.filename">target.db</xsl:param> - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter lets you change the name of the generated -file from the default name target.db. -The name must agree with that used in the target database -used to resolve olinks during processing. -See also target.database.document. - - - - - - -olink.base.uri -uri - - -olink.base.uri -Base URI used in olink hrefs - - -<xsl:param name="olink.base.uri"></xsl:param> - - -Description - -When cross reference data is collected for resolving olinks, it -may be necessary to prepend a base URI to each target's href. This -parameter lets you set that base URI when cross reference data is -collected. This feature is needed when you want to link to a document -that is processed without chunking. The output filename for such a -document is not known to the XSL stylesheet; the only target -information consists of fragment identifiers such as -#idref. To enable the resolution of olinks between -documents, you should pass the name of the HTML output file as the -value of this parameter. Then the hrefs recorded in the cross -reference data collection look like -outfile.html#idref, which can be reached as links -from other documents. - - - - - -use.local.olink.style -boolean - - -use.local.olink.style -Process olinks using xref style of current -document - - -<xsl:param name="use.local.olink.style" select="0"></xsl:param> - -Description - -When cross reference data is collected for use by olinks, the data for each potential target includes one field containing a completely assembled cross reference string, as if it were an xref generated in that document. Other fields record the separate title, number, and element name of each target. When an olink is formed to a target from another document, the olink resolves to that preassembled string by default. If the use.local.olink.style parameter is set to non-zero, then instead the cross -reference string is formed again from the target title, number, and -element name, using the stylesheet processing the targeting document. -Then olinks will match the xref style in the targeting document -rather than in the target document. If both documents are processed -with the same stylesheet, then the results will be the same. - - - - - -current.docid -string - - -current.docid -targetdoc identifier for the document being -processed - - -<xsl:param name="current.docid"></xsl:param> - - -Description - -When olinks between documents are resolved for HTML output, the stylesheet can compute the relative path between the current document and the target document. The stylesheet needs to know the targetdoc identifiers for both documents, as they appear in the target.database.document database file. This parameter passes to the stylesheet -the targetdoc identifier of the current document, since that -identifier does not appear in the document itself. -This parameter can also be used for print output. If an olink's targetdoc id differs from the current.docid, then the stylesheet can append the target document's title to the generated olink text. That identifies to the reader that the link is to a different document, not the current document. See also olink.doctitle to enable that feature. - - - - - -olink.doctitle -list -no -yes -maybe - - -olink.doctitle -show the document title for external olinks? - - - -<xsl:param name="olink.doctitle">no</xsl:param> - - -Description - -When olinks between documents are resolved, the generated text -may not make it clear that the reference is to another document. -It is possible for the stylesheets to append the other document's -title to external olinks. For this to happen, two parameters must -be set. - - -This olink.doctitle parameter -should be set to either yes or maybe -to enable this feature. - - - -And you should also set the current.docid -parameter to the document id for the document currently -being processed for output. - - - - - -Then if an olink's targetdoc id differs from -the current.docid value, the stylesheet knows -that it is a reference to another document and can -append the target document's -title to the generated olink text. - -The text for the target document's title is copied from the -olink database from the ttl element -of the top-level div for that document. -If that ttl element is missing or empty, -no title is output. - - -The supported values for olink.doctitle are: - - - -yes - - -Always insert the title to the target document if it is not -the current document. - - - - -no - - -Never insert the title to the target document, even if requested -in an xrefstyle attribute. - - - - -maybe - - -Only insert the title to the target document, if requested -in an xrefstyle attribute. - - - - -An xrefstyle attribute -may override the global setting for individual olinks. -The following values are supported in an -xrefstyle -attribute using the select: syntax: - - - - -docname - - -Insert the target document name for this olink using the -docname gentext template, but only -if the value of olink.doctitle -is not no. - - - - -docnamelong - - -Insert the target document name for this olink using the -docnamelong gentext template, but only -if the value of olink.doctitle -is not no. - - - - -nodocname - - -Omit the target document name even if -the value of olink.doctitle -is yes. - - - - -Another way of inserting the target document name -for a single olink is to employ an -xrefstyle -attribute using the template: syntax. -The %o placeholder (the letter o, not zero) -in such a template -will be filled in with the target document's title when it is processed. -This will occur regardless of -the value of olink.doctitle. - -Note that prior to version 1.66 of the XSL stylesheets, -the allowed values for this parameter were 0 and 1. Those -values are still supported and mapped to 'no' and 'yes', respectively. - - - - - - -olink.debug -boolean - - -olink.debug -Turn on debugging messages for olinks - - - - -<xsl:param name="olink.debug" select="0"></xsl:param> - - - -Description - -If non-zero, then each olink will generate several -messages about how it is being resolved during processing. -This is useful when an olink does not resolve properly -and the standard error messages are not sufficient to -find the problem. - - -You may need to read through the olink XSL templates -to understand the context for some of the debug messages. - - - - - - - -olink.properties -attribute set - - -olink.properties -Properties associated with the cross-reference -text of an olink. - - - - -<xsl:attribute-set name="olink.properties"> - <xsl:attribute name="show-destination">replace</xsl:attribute> -</xsl:attribute-set> - - - -Description - -This attribute set is applied to the -fo:basic-link element of an olink. It is not applied to the -optional page number or optional title of the external -document. - - - - - - -olink.lang.fallback.sequence -string - - -olink.lang.fallback.sequence -look up translated documents if olink not found? - - - -<xsl:param name="olink.lang.fallback.sequence"></xsl:param> - - -Description - - -This parameter defines a list of lang values -to search among to resolve olinks. - - -Normally an olink tries to resolve to a document in the same -language as the olink itself. The language of an olink -is determined by its nearest ancestor element with a -lang attribute, otherwise the -value of the l10n.gentext.default.lang -parameter. - - -An olink database can contain target data for the same -document in multiple languages. Each set of data has the -same value for the targetdoc attribute in -the document element in the database, but with a -different lang attribute value. - - -When an olink is being resolved, the target is first -sought in the document with the same language as the olink. -If no match is found there, then this parameter is consulted -for additional languages to try. - -The olink.lang.fallback.sequence -must be a whitespace separated list of lang values to -try. The first one with a match in the olink database is used. -The default value is empty. - -For example, a document might be written in German -and contain an olink with -targetdoc="adminguide". -When the document is processed, the processor -first looks for a target dataset in the -olink database starting with: - -<document targetdoc="adminguide" lang="de">. - - -If there is no such element, then the -olink.lang.fallback.sequence -parameter is consulted. -If its value is, for example, fr en, then the processor next -looks for targetdoc="adminguide" lang="fr", and -then for targetdoc="adminguide" lang="en". -If there is still no match, it looks for -targetdoc="adminguide" with no -lang attribute. - - -This parameter is useful when a set of documents is only -partially translated, or is in the process of being translated. -If a target of an olink has not yet been translated, then this -parameter permits the processor to look for the document in -other languages. This assumes the reader would rather have -a link to a document in a different language than to have -a broken link. - - - - - - - -insert.olink.page.number -list -no -yes -maybe - - -insert.olink.page.number -Turns page numbers in olinks on and off - - - - -<xsl:param name="insert.olink.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references made between documents with -olink will -include page number citations. -In most cases this is only applicable to references in printed output. - -The parameter has three possible values. - - - -no -No page number references will be generated for olinks. - - - -yes -Page number references will be generated -for all olink references. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an olink element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - -Olinks that point to targets within the same document -are treated as xrefs, and controlled by -the insert.xref.page.number parameter. - - -Page number references for olinks to -external documents can only be inserted if the -information exists in the olink database. -This means each olink target element -(div or obj) -must have a page attribute -whose value is its page number in the target document. -The XSL stylesheets are not able to extract that information -during processing because pages have not yet been created in -XSLT transformation. Only the XSL-FO processor knows what -page each element is placed on. -Therefore some postprocessing must take place to populate -page numbers in the olink database. - - - - - - - - - -insert.olink.pdf.frag -boolean - - -insert.olink.pdf.frag -Add fragment identifiers for links into PDF files - - - - -<xsl:param name="insert.olink.pdf.frag" select="0"></xsl:param> - - - -Description - -The value of this parameter determines whether -the cross reference URIs to PDF documents made with -olink will -include fragment identifiers. - - -When forming a URI to link to a PDF document, -a fragment identifier (typically a '#' followed by an -id value) appended to the PDF filename can be used by -the PDF viewer to open -the PDF file to a location within the document instead of -the first page. -However, not all PDF files have id -values embedded in them, and not all PDF viewers can -handle fragment identifiers. - - -If insert.olink.pdf.frag is set -to a non-zero value, then any olink targeting a -PDF file will have the fragment identifier appended to the URI. -The URI is formed by concatenating the value of the -olink.base.uri parameter, the -value of the baseuri -attribute from the document -element in the olink database with the matching -targetdoc value, -and the value of the href -attribute for the targeted element in the olink database. -The href attribute -contains the fragment identifier. - - -If insert.olink.pdf.frag is set -to zero (the default value), then -the href attribute -from the olink database -is not appended to PDF olinks, so the fragment identifier is left off. -A PDF olink is any olink for which the -baseuri attribute -from the matching document -element in the olink database ends with '.pdf'. -Any other olinks will still have the fragment identifier added. - - - - - - -prefer.internal.olink -boolean - - -prefer.internal.olink -Prefer a local olink reference to an external reference - - - - -<xsl:param name="prefer.internal.olink" select="0"></xsl:param> - - - -Description - -If you are re-using XML content modules in multiple documents, -you may want to redirect some of your olinks. This parameter -permits you to redirect an olink to the current document. - - -For example: you are writing documentation for a product, -which includes 3 manuals: a little installation -booklet (booklet.xml), a user -guide (user.xml), and a reference manual (reference.xml). -All 3 documents begin with the same introduction section (intro.xml) that -contains a reference to the customization section (custom.xml) which is -included in both user.xml and reference.xml documents. - - -How do you write the link to custom.xml in intro.xml -so that it is interpreted correctly in all 3 documents? - -If you use xref, it will fail in user.xml. - -If you use olink (pointing to reference.xml), -the reference in user.xml -will point to the customization section of the reference manual, while it is -actually available in user.xml. - - - -If you set the prefer.internal.olink -parameter to a non-zero value, then the processor will -first look in the olink database -for the olink's targetptr attribute value -in document matching the current.docid -parameter value. If it isn't found there, then -it tries the document in the database -with the targetdoc -value that matches the olink's targetdoc -attribute. - - -This feature permits an olink reference to resolve to -the current document if there is an element -with an id matching the olink's targetptr -value. The current document's olink data must be -included in the target database for this to work. - - -There is a potential for incorrect links if -the same id attribute value is used for different -content in different documents. -Some of your olinks may be redirected to the current document -when they shouldn't be. It is not possible to control -individual olink instances. - - - - - - - -link.mailto.url -string - - -link.mailto.url -Mailto URL for the LINK REL=made HTML HEAD element - - - - -<xsl:param name="link.mailto.url"></xsl:param> - - - -Description - -If not the empty string, this address will be used for the -rel=made link element in the html head - - - - - - - -ulink.target -string - - -ulink.target -The HTML anchor target for ULinks - - - - -<xsl:param name="ulink.target">_top</xsl:param> - - - -Description - -If ulink.target is non-zero, its value will -be used for the target attribute -on anchors generated for ulinks. - - - - - - -olink.fragid -string - - -olink.fragid -Names the fragment identifier portion of an OLink resolver query - - - -<xsl:param name="olink.fragid">fragid=</xsl:param> - - -Description -The fragment identifier portion of an olink target. - - - - - -olink.outline.ext -string - - -olink.outline.ext -The extension of OLink outline files - - - - -<xsl:param name="olink.outline.ext">.olink</xsl:param> - - - -Description - -The extension to be expected for OLink outline files -Bob has this parameter as dead. Please don't use - - - - - - -olink.pubid -string - - -olink.pubid -Names the public identifier portion of an OLink resolver query - - - - -<xsl:param name="olink.pubid">pubid</xsl:param> - - - -Description - - - - - - - - -olink.sysid -string - - -olink.sysid -Names the system identifier portion of an OLink resolver query - - - - -<xsl:param name="olink.sysid">sysid</xsl:param> - - - -Description - -FIXME - - - - - - -olink.resolver -string - - -olink.resolver -The root name of the OLink resolver (usually a script) - - - - <xsl:param name="olink.resolver">/cgi-bin/olink</xsl:param> - - -Description -FIXME: - - - - -Cross References - - -collect.xref.targets -list -no -yes -only - - -collect.xref.targets -Controls whether cross reference data is -collected - - -<xsl:param name="collect.xref.targets">no</xsl:param> - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter determines whether the collection process is run when the document is processed by the stylesheet. The default value is no, which means the data file is not generated during processing. The other choices are yes, which means the data file is created and the document is processed for output, and only, which means the data file is created but the document is not processed for output. -See also targets.filename. - - - - - - -insert.xref.page.number -list -no -yes -maybe - - -insert.xref.page.number -Turns page numbers in xrefs on and off - - - - -<xsl:param name="insert.xref.page.number">no</xsl:param> - - - -Description - -The value of this parameter determines if -cross references (xrefs) in -printed output will -include page number citations. -It has three possible values. - - - -no -No page number references will be generated. - - - -yes -Page number references will be generated -for all xref elements. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an xref element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - - - - - - - -use.role.as.xrefstyle -boolean - - -use.role.as.xrefstyle -Use role attribute for -xrefstyle on xref? - - - - -<xsl:param name="use.role.as.xrefstyle" select="1"></xsl:param> - - - -Description - -In DocBook documents that conform to a schema older than V4.3, this parameter allows -role to serve the purpose of specifying the cross reference style. - -If non-zero, the role attribute on -xref will be used to select the cross reference style. -In DocBook V4.3, the xrefstyle attribute was added for this purpose. -If the xrefstyle attribute is present, -role will be ignored, regardless of the setting -of this parameter. - - - -Example - -The following small stylesheet shows how to configure the -stylesheets to make use of the cross reference style: - -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - -<xsl:import href="../xsl/html/docbook.xsl"/> - -<xsl:output method="html"/> - -<xsl:param name="local.l10n.xml" select="document('')"/> -<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> - <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en"> - <l:context name="xref"> - <l:template name="chapter" style="title" text="Chapter %n, %t"/> - <l:template name="chapter" text="Chapter %n"/> - </l:context> - </l:l10n> -</l:i18n> - -</xsl:stylesheet> - -With this stylesheet, the cross references in the following document: - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> -<book id="book"><title>Book</title> - -<preface> -<title>Preface</title> - -<para>Normal: <xref linkend="ch1"/>.</para> -<para>Title: <xref xrefstyle="title" linkend="ch1"/>.</para> - -</preface> - -<chapter id="ch1"> -<title>First Chapter</title> - -<para>Irrelevant.</para> - -</chapter> -</book> - -will appear as: - - -Normal: Chapter 1. -Title: Chapter 1, First Chapter. - - - - - - - -xref.with.number.and.title -boolean - - -xref.with.number.and.title -Use number and title in cross references - - - - -<xsl:param name="xref.with.number.and.title" select="1"></xsl:param> - - - -Description - -A cross reference may include the number (for example, the number of -an example or figure) and the title which is a required child of some -targets. This parameter inserts both the relevant number as well as -the title into the link. - - - - - - -xref.label-page.separator -string - - -xref.label-page.separator -Punctuation or space separating label from page number in xref - - - -<xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and page -but no title, -then the value of this parameter is inserted between -label and page number in the output. -If a title is included, then other separators are used. - - - - - - - -xref.label-title.separator -string - - -xref.label-title.separator -Punctuation or space separating label from title in xref - - - -<xsl:param name="xref.label-title.separator">: </xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and title, -then the value of this parameter is inserted between -label and title in the output. - - - - - - - -xref.title-page.separator -string - - -xref.title-page.separator -Punctuation or space separating title from page number in xref - - - -<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param> - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both title and page number, -then the value of this parameter is inserted between -title and page number in the output. - - - - - - -Lists - - -segmentedlist.as.table -boolean - - -segmentedlist.as.table -Format segmented lists as tables? - - - - -<xsl:param name="segmentedlist.as.table" select="0"></xsl:param> - - - -Description - -If non-zero, segmentedlists will be formatted as -tables. - - - - - - -variablelist.as.table -boolean - - -variablelist.as.table -Format variablelists as tables? - - - - -<xsl:param name="variablelist.as.table" select="0"></xsl:param> - - - -Description - -If non-zero, variablelists will be formatted as -tables. A processing instruction exists to specify a particular width for the -column containing the terms: -dbhtml term-width=".25in" - -You can override this setting with a processing instruction as the -child of variablelist: dbhtml -list-presentation="table" or dbhtml -list-presentation="list". - -This parameter only applies to the HTML transformations. In the -FO case, proper list markup is robust enough to handle the formatting. -But see also variablelist.as.blocks. - - <variablelist> - <?dbhtml list-presentation="table"?> - <?dbhtml term-width="1.5in"?> - <?dbfo list-presentation="list"?> - <?dbfo term-width="1in"?> - <varlistentry> - <term>list</term> - <listitem> - <para> - Formatted as a table even if variablelist.as.table is set to 0. - </para> - </listitem> - </varlistentry> - </variablelist> - - - - - - -variablelist.term.separator -string - - -variablelist.term.separator -Text to separate terms within a multi-term -varlistentry - - - - -<xsl:param name="variablelist.term.separator">, </xsl:param> - - -Description - -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is placed -after each term except the last. - - - To generate a line break between multiple terms in - a varlistentry, set a non-zero value for the - variablelist.term.break.after parameter. If - you do so, you may also want to set the value of the - variablelist.term.separator parameter to an - empty string (to suppress rendering of the default comma and space - after each term). - - - - - - - -variablelist.term.break.after -boolean - - -variablelist.term.break.after -Generate line break after each term within a -multi-term varlistentry? - - - - -<xsl:param name="variablelist.term.break.after">0</xsl:param> - - -Description - -Set a non-zero value for the -variablelist.term.break.after parameter to -generate a line break between terms in a -multi-term varlistentry. - - -If you set a non-zero value for -variablelist.term.break.after, you may also -want to set the value of the -variablelist.term.separator parameter to an -empty string (to suppress rendering of the default comma and space -after each term). - - - - - - -Bibliography - - -bibliography.style -list -normal -iso690 - - -bibliography.style -Style used for formatting of biblioentries. - - - - -<xsl:param name="bibliography.style">normal</xsl:param> - - - -Description - -Currently only normal and -iso690 styles are supported. - -In order to use ISO690 style to the full extent you might need -to use additional markup described on the -following WiKi page. - - - - - - -biblioentry.item.separator -string - - -biblioentry.item.separator -Text to separate bibliography entries - - - -<xsl:param name="biblioentry.item.separator">. </xsl:param> - - -Description - -Text to separate bibliography entries - - - - - - - -bibliography.collection -string - - -bibliography.collection -Name of the bibliography collection file - - - - -<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param> - - - - -Description - -Maintaining bibliography entries across a set of documents is tedious, time -consuming, and error prone. It makes much more sense, usually, to store all of -the bibliography entries in a single place and simply extract -the ones you need in each document. - -That's the purpose of the -bibliography.collection parameter. To setup a global -bibliography database, follow these steps: - -First, create a stand-alone bibliography document that contains all of -the documents that you wish to reference. Make sure that each bibliography -entry (whether you use biblioentry or bibliomixed) -has an ID. - -My global bibliography, ~/bibliography.xml begins -like this: - - -<!DOCTYPE bibliography - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<bibliography><title>References</title> - -<bibliomixed id="xml-rec"><abbrev>XML 1.0</abbrev>Tim Bray, -Jean Paoli, C. M. Sperberg-McQueen, and Eve Maler, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml">Extensible Markup -Language (XML) 1.0 Second Edition</ulink></citetitle>. -World Wide Web Consortium, 2000. -</bibliomixed> - -<bibliomixed id="xml-names"><abbrev>Namespaces</abbrev>Tim Bray, -Dave Hollander, -and Andrew Layman, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml-names/">Namespaces in -XML</ulink></citetitle>. -World Wide Web Consortium, 1999. -</bibliomixed> - -<!-- ... --> -</bibliography> - - - -When you create a bibliography in your document, simply -provide empty bibliomixed -entries for each document that you wish to cite. Make sure that these -elements have the same ID as the corresponding real -entry in your global bibliography. - -For example: - - -<bibliography><title>Bibliography</title> - -<bibliomixed id="xml-rec"/> -<bibliomixed id="xml-names"/> -<bibliomixed id="DKnuth86">Donald E. Knuth. <citetitle>Computers and -Typesetting: Volume B, TeX: The Program</citetitle>. Addison-Wesley, -1986. ISBN 0-201-13437-3. -</bibliomixed> -<bibliomixed id="relaxng"/> - -</bibliography> - - -Note that it's perfectly acceptable to mix entries from your -global bibliography with normal entries. You can use -xref or other elements to cross-reference your -bibliography entries in exactly the same way you do now. - -Finally, when you are ready to format your document, simply set the -bibliography.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global bibliography. - -The stylesheets will format the bibliography in your document as if -all of the entries referenced appeared there literally. - - - - - - -bibliography.numbered -boolean - - -bibliography.numbered -Should bibliography entries be numbered? - - - - -<xsl:param name="bibliography.numbered" select="0"></xsl:param> - - - -Description - -If non-zero bibliography entries will be numbered - - - - - -Glossary - - -glossterm.auto.link -boolean - - -glossterm.auto.link -Generate links from glossterm to glossentry automatically? - - - - -<xsl:param name="glossterm.auto.link" select="0"></xsl:param> - - - -Description - -If non-zero, links from inline glossterms to the corresponding -glossentry elements in a glossary or glosslist -will be automatically generated. This is useful when your glossterms are consistent -and you don't want to add links manually. - -The automatic link generation feature is not used on glossterm elements -that have a linkend attribute. - - - - - - -firstterm.only.link -boolean - - -firstterm.only.link -Does automatic glossterm linking only apply to firstterms? - - - - -<xsl:param name="firstterm.only.link" select="0"></xsl:param> - - - -Description - -If non-zero, only firstterms will be automatically linked -to the glossary. If glossary linking is not enabled, this parameter -has no effect. - - - - - - -glossary.collection -string - - -glossary.collection -Name of the glossary collection file - - - - -<xsl:param name="glossary.collection"></xsl:param> - - - -Description - -Glossaries maintained independently across a set of documents -are likely to become inconsistent unless considerable effort is -expended to keep them in sync. It makes much more sense, usually, to -store all of the glossary entries in a single place and simply -extract the ones you need in each document. - -That's the purpose of the -glossary.collection parameter. To setup a global -glossary database, follow these steps: - -Setting Up the Glossary Database - -First, create a stand-alone glossary document that contains all of -the entries that you wish to reference. Make sure that each glossary -entry has an ID. - -Here's an example glossary: - - - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE glossary - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<glossary> -<glossaryinfo> -<editor><firstname>Eric</firstname><surname>Raymond</surname></editor> -<title>Jargon File 4.2.3 (abridged)</title> -<releaseinfo>Just some test data</releaseinfo> -</glossaryinfo> - -<glossdiv><title>0</title> - -<glossentry> -<glossterm>0</glossterm> -<glossdef> -<para>Numeric zero, as opposed to the letter `O' (the 15th letter of -the English alphabet). In their unmodified forms they look a lot -alike, and various kluges invented to make them visually distinct have -compounded the confusion. If your zero is center-dotted and letter-O -is not, or if letter-O looks almost rectangular but zero looks more -like an American football stood on end (or the reverse), you're -probably looking at a modern character display (though the dotted zero -seems to have originated as an option on IBM 3270 controllers). If -your zero is slashed but letter-O is not, you're probably looking at -an old-style ASCII graphic set descended from the default typewheel on -the venerable ASR-33 Teletype (Scandinavians, for whom /O is a letter, -curse this arrangement). (Interestingly, the slashed zero long -predates computers; Florian Cajori's monumental "A History of -Mathematical Notations" notes that it was used in the twelfth and -thirteenth centuries.) If letter-O has a slash across it and the zero -does not, your display is tuned for a very old convention used at IBM -and a few other early mainframe makers (Scandinavians curse <emphasis>this</emphasis> -arrangement even more, because it means two of their letters collide). -Some Burroughs/Unisys equipment displays a zero with a <emphasis>reversed</emphasis> -slash. Old CDC computers rendered letter O as an unbroken oval and 0 -as an oval broken at upper right and lower left. And yet another -convention common on early line printers left zero unornamented but -added a tail or hook to the letter-O so that it resembled an inverted -Q or cursive capital letter-O (this was endorsed by a draft ANSI -standard for how to draw ASCII characters, but the final standard -changed the distinguisher to a tick-mark in the upper-left corner). -Are we sufficiently confused yet?</para> -</glossdef> -</glossentry> - -<glossentry> -<glossterm>1TBS</glossterm> -<glossdef> -<para role="accidence"> -<phrase role="pronounce"></phrase> -<phrase role="partsofspeach">n</phrase> -</para> -<para>The "One True Brace Style"</para> -<glossseealso>indent style</glossseealso> -</glossdef> -</glossentry> - -<!-- ... --> - -</glossdiv> - -<!-- ... --> - -</glossary> - - - - -Marking Up Glossary Terms - -That takes care of the glossary database, now you have to get the entries -into your document. Unlike bibliography entries, which can be empty, creating -placeholder glossary entries would be very tedious. So instead, -support for glossary.collection relies on implicit linking. - -In your source document, simply use firstterm and -glossterm to identify the terms you wish to have included -in the glossary. The stylesheets assume that you will either set the -baseform attribute correctly, or that the -content of the element exactly matches a term in your glossary. - -If you're using a glossary.collection, don't -make explicit links on the terms in your document. - -So, in your document, you might write things like this: - - -<para>This is dummy text, without any real meaning. -The point is simply to reference glossary terms like <glossterm>0</glossterm> -and the <firstterm baseform="1TBS">One True Brace Style (1TBS)</firstterm>. -The <glossterm>1TBS</glossterm>, as you can probably imagine, is a nearly -religious issue.</para> - - -If you set the firstterm.only.link parameter, -only the terms marked with firstterm will be links. -Otherwise, all the terms will be linked. - - - -Marking Up the Glossary - -The glossary itself has to be identified for the stylesheets. For lack -of a better choice, the role is used. -To identify the glossary as the target for automatic processing, set -the role to auto. The title of this -glossary (and any other information from the glossaryinfo -that's rendered by your stylesheet) will be displayed, but the entries will -come from the database. - - -Unfortunately, the glossary can't be empty, so you must put in -at least one glossentry. The content of this entry -is irrelevant, it will not be rendered: - - -<glossary role="auto"> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - -What about glossary divisions? If your glossary database has glossary -divisions and your automatic glossary contains at least -one glossdiv, the automic glossary will have divisions. -If the glossdiv is missing from either location, no divisions -will be rendered. - -Glossary entries (and divisions, if appropriate) in the glossary will -occur in precisely the order they occur in your database. - - - -Formatting the Document - -Finally, when you are ready to format your document, simply set the -glossary.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global glossary. - -The stylesheets will format the glossary in your document as if -all of the entries implicilty referenced appeared there literally. - - -Limitations - -Glossary cross-references within the glossary are -not supported. For example, this will not work: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - -If you put glossary cross-references in your glossary that way, -you'll get the cryptic error: Warning: -glossary.collection specified, but there are 0 automatic -glossaries. - -Instead, you must do two things: - - - -Markup your glossary using glossseealso: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - - - -Make sure there is at least one glossterm reference to -gloss-2 in your document. The -easiest way to do that is probably within a remark in your -automatic glossary: - - -<glossary role="auto"> -<remark>Make sure there's a reference to <glossterm>gloss-2</glossterm>.</remark> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - - - - - - - - - -glossary.sort -boolean - - -glossary.sort -Sort glossentry elements? - - - - -<xsl:param name="glossary.sort" select="0"></xsl:param> - - - -Description - -If non-zero, then the glossentry elements within a -glossary, glossdiv, or glosslist are sorted on the glossterm, using -the current lang setting. If zero (the default), then -glossentry elements are not sorted and are presented -in document order. - - - - - - - -glossentry.show.acronym -list -no -yes -primary - - -glossentry.show.acronym -Display glossentry acronyms? - - - - -<xsl:param name="glossentry.show.acronym">no</xsl:param> - - - -Description - -A setting of yes means they should be displayed; -no means they shouldn't. If primary is used, -then they are shown as the primary text for the entry. - - -This setting controls both acronym and -abbrev elements in the glossentry. - - - - - - -Miscellaneous - - -formal.procedures -boolean - - -formal.procedures -Selects formal or informal procedures - - - - -<xsl:param name="formal.procedures" select="1"></xsl:param> - - - -Description - -Formal procedures are numbered and always have a title. - - - - - - - -formal.title.placement -table - - -formal.title.placement -Specifies where formal object titles should occur - - - - -<xsl:param name="formal.title.placement"> -figure before -example before -equation before -table before -procedure before -task before -</xsl:param> - - - -Description - -Specifies where formal object titles should occur. For each formal object -type (figure, -example, -equation, -table, and procedure) -you can specify either the keyword -before or -after. - - - - - - -runinhead.default.title.end.punct -string - - -runinhead.default.title.end.punct -Default punctuation character on a run-in-head - - - -<xsl:param name="runinhead.default.title.end.punct">.</xsl:param> - - - -Description - -If non-zero, For a formalpara, use the specified -string as the separator between the title and following text. The period is the default value. - - - - - - -runinhead.title.end.punct -string - - -runinhead.title.end.punct -Characters that count as punctuation on a run-in-head - - - - -<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param> - - - -Description - -Specify which characters are to be counted as punctuation. These -characters are checked for a match with the last character of the -title. If no match is found, the -runinhead.default.title.end.punct contents are -inserted. This is to avoid duplicated punctuation in the output. - - - - - - - -show.comments -boolean - - -show.comments -Display remark elements? - - - - -<xsl:param name="show.comments" select="1"></xsl:param> - - - -Description - -If non-zero, comments will be displayed, otherwise they -are suppressed. Comments here refers to the remark element -(which was called comment prior to DocBook -4.0), not XML comments (<-- like this -->) which are -unavailable. - - - - - - - -show.revisionflag -boolean - - -show.revisionflag -Enable decoration of elements that have a revisionflag - - - - -<xsl:param name="show.revisionflag" select="0"></xsl:param> - - - -Description - - -If show.revisionflag is turned on, then the stylesheets -may produce additional markup designed to allow a CSS stylesheet to -highlight elements that have specific revisionflag settings. - -The markup inserted will be usually be either a <span> or -<div> with an appropriate class -attribute. (The value of the class attribute will be the same as the -value of the revisionflag attribute). In some contexts, for example -tables, where extra markup would be structurally illegal, the class -attribute will be added to the appropriate container element. - -In general, the stylesheets only test for revisionflag in contexts -where an importing stylesheet would have to redefine whole templates. -Most of the revisionflag processing is expected to be done by another -stylesheet, for example changebars.xsl. - - - - - - -shade.verbatim -boolean - - -shade.verbatim -Should verbatim environments be shaded? - - - -<xsl:param name="shade.verbatim" select="0"></xsl:param> - - -Description - -In the FO stylesheet, if this parameter is non-zero then the -shade.verbatim.style properties will be applied -to verbatim environments. - -In the HTML stylesheet, this parameter is now deprecated. Use -CSS instead. - - - - - - -shade.verbatim.style -attribute set - - -shade.verbatim.style -Properties that specify the style of shaded verbatim listings - - - - -<xsl:attribute-set name="shade.verbatim.style"> - <xsl:attribute name="border">0</xsl:attribute> - <xsl:attribute name="bgcolor">#E0E0E0</xsl:attribute> -</xsl:attribute-set> - - - - -Description - -Properties that specify the style of shaded verbatim listings. The -parameters specified (the border and background color) are added to -the styling of the xsl-fo output. A border might be specified as "thin -black solid" for example. See xsl-fo - - - - - - -punct.honorific -string - - -punct.honorific -Punctuation after an honorific in a personal name. - - - - -<xsl:param name="punct.honorific">.</xsl:param> - - - -Description - -This parameter specifies the punctuation that should be added after an -honorific in a personal name. - - - - - - -tex.math.in.alt -list -plain -latex - - -tex.math.in.alt -TeX notation used for equations - - - - -<xsl:param name="tex.math.in.alt"></xsl:param> - - - -Description - -If you want type math directly in TeX notation in equations, -this parameter specifies notation used. Currently are supported two -values -- plain and latex. Empty -value means that you are not using TeX math at all. - -Preferred way for including TeX alternative of math is inside of -textobject element. Eg.: - -<inlineequation> -<inlinemediaobject> -<imageobject> -<imagedata fileref="eq1.gif"/> -</imageobject> -<textobject><phrase>E=mc squared</phrase></textobject> -<textobject role="tex"><phrase>E=mc^2</phrase></textobject> -</inlinemediaobject> -</inlineequation> - -If you are using graphic element, you can -store TeX inside alt element: - -<inlineequation> -<alt role="tex">a^2+b^2=c^2</alt> -<graphic fileref="a2b2c2.gif"/> -</inlineequation> - -If you want use this feature, you should process your FO with -PassiveTeX, which only supports TeX math notation. When calling -stylsheet, don't forget to specify also -passivetex.extensions=1. - -If you want equations in HTML, just process generated file -tex-math-equations.tex by TeX or LaTeX. Then run -dvi2bitmap program on result DVI file. You will get images for -equations in your document. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - - -Related Parameters - tex.math.delims, - passivetex.extensions, - tex.math.file - - - - - - -tex.math.file -string - - -tex.math.file -Name of temporary file for generating images from equations - - - - -<xsl:param name="tex.math.file">tex-math-equations.tex</xsl:param> - - - -Description - -Name of auxiliary file for TeX equations. This file can be -processed by dvi2bitmap to get bitmap versions of equations for HTML -output. - - -Related Parameters - tex.math.in.alt, - tex.math.delims, - - -More information - For how-to documentation on embedding TeX equations and - generating output from them, see - DBTeXMath. - - - - - -tex.math.delims -boolean - - -tex.math.delims -Should equations output for processing by TeX be -surrounded by math mode delimiters? - - - - -<xsl:param name="tex.math.delims" select="1"></xsl:param> - - - -Description - -For compatibility with DSSSL based DBTeXMath from Allin Cottrell -you should set this parameter to 0. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - -Related Parameters - tex.math.in.alt, - passivetex.extensions - - -See Also - You can also use the dbtex delims processing - instruction to control whether delimiters are output. - - - - - - - -pixels.per.inch -integer - - -pixels.per.inch -How many pixels are there per inch? - - - - -<xsl:param name="pixels.per.inch">90</xsl:param> - - - -Description - -When lengths are converted to pixels, this value is used to -determine the size of a pixel. The default value is taken from the -XSL -Recommendation. - - - - - - - -points.per.em -number - - -points.per.em -Specify the nominal size of an em-space in points - - - - -<xsl:param name="points.per.em">10</xsl:param> - - - -Description - -The fixed value used for calculations based upon the size of a -character. The assumption made is that ten point font is in use. This -assumption may not be valid. - - - - - - -use.svg -boolean - - -use.svg -Allow SVG in the result tree? - - - - -<xsl:param name="use.svg" select="1"></xsl:param> - - - -Description - -If non-zero, SVG will be considered an acceptable image format. SVG -is passed through to the result tree, so correct rendering of the resulting -diagram depends on the formatter (FO processor or web browser) that is used -to process the output from the stylesheet. - - - - - - -menuchoice.separator -string - - -menuchoice.separator -Separator between items of a menuchoice -other than guimenuitem and -guisubmenu - - - - -<xsl:param name="menuchoice.separator">+</xsl:param> - - - -Description - -Separator used to connect items of a menuchoice other -than guimenuitem and guisubmenu. The latter -elements are linked with menuchoice.menu.separator. - - - - - - - -menuchoice.menu.separator -string - - -menuchoice.menu.separator -Separator between items of a menuchoice -with guimenuitem or -guisubmenu - - - - -<xsl:param name="menuchoice.menu.separator"> → </xsl:param> - - - -Description - -Separator used to connect items of a menuchoice with -guimenuitem or guisubmenu. Other elements -are linked with menuchoice.separator. - -The default value is &#x2192;, which is the -&rarr; (right arrow) character entity. -The current FOP (0.20.5) requires setting the font-family -explicitly. - -The default value also includes spaces around the arrow, -which will allow a line to break. Replace the spaces with -&#xA0; (nonbreaking space) if you don't want those -spaces to break. - - - - - - - -default.float.class -string - - -default.float.class -Specifies the default float class - - - - -<xsl:param name="default.float.class"> - <xsl:choose> - <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when> - <xsl:otherwise>before</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -Selects the direction in which a float should be placed. for -xsl-fo this is before, for html it is left. For Western texts, the -before direction is the top of the page. - - - - - - -footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -footnote.number.format -Identifies the format used for footnote numbers - - - - -<xsl:param name="footnote.number.format">1</xsl:param> - - - -Description - -The footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A). - - - - - - -table.footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -table.footnote.number.format -Identifies the format used for footnote numbers in tables - - - - -<xsl:param name="table.footnote.number.format">a</xsl:param> - - - -Description - -The table.footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A) in tables. - - - - - - -footnote.number.symbols - - - -footnote.number.symbols -Special characters to use as footnote markers - - - - -<xsl:param name="footnote.number.symbols"></xsl:param> - - - -Description - -If footnote.number.symbols is not the empty string, -footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, , , -, and . If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - - - - -table.footnote.number.symbols -string - - -table.footnote.number.symbols -Special characters to use a footnote markers in tables - - - - -<xsl:param name="table.footnote.number.symbols"></xsl:param> - - - -Description - -If table.footnote.number.symbols is not the empty string, -table footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, , , -, and . If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -table.footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - - - - -highlight.source -boolean - - -highlight.source -Should the content of programlisting -be syntactically highlighted? - - - - -<xsl:param name="highlight.source" select="0"></xsl:param> - - - -Description - -When this parameter is non-zero, the stylesheets will try to do syntax highlighting of the -content of programlisting elements. You specify the language for each programlisting -by using the language attribute. The highlight.default.language -parameter can be used to specify the language for programlistings without a language -attribute. Syntax highlighting also works for screen and synopsis elements. - -The actual highlighting work is done by the XSLTHL extension module. This is an external Java library that has to be -downloaded separately (see below). - - -In order to use this extension, you must - -add xslthl-2.x.x.jar to your Java classpath. The latest version is available -from the XSLT syntax highlighting project -at SourceForge. - - -use a customization layer in which you import one of the following stylesheet modules: - - - html/highlight.xsl - - - - xhtml/highlight.xsl - - - - xhtml-1_1/highlight.xsl - - - - fo/highlight.xsl - - - - - -let either the xslthl.config Java system property or the -highlight.xslthl.config parameter point to the configuration file for syntax -highlighting (using URL syntax). DocBook XSL comes with a ready-to-use configuration file, -highlighting/xslthl-config.xml. - - - -The extension works with Saxon 6.5.x and Xalan-J. (Saxon 8.5 or later is also supported, but since it is -an XSLT 2.0 processor it is not guaranteed to work with DocBook XSL in all circumstances.) - -The following is an example of a Saxon 6 command adapted for syntax highlighting, to be used on Windows: - - -java -cp c:/Java/saxon.jar;c:/Java/xslthl-2.0.1.jar --Dxslthl.config=file:///c:/docbook-xsl/highlighting/xslthl-config.xml com.icl.saxon.StyleSheet --o test.html test.xml myhtml.xsl - - - - - - - -highlight.xslthl.config -uri - - -highlight.xslthl.config -Location of XSLTHL configuration file - - - - -<xsl:param name="highlight.xslthl.config"></xsl:param> - - - -Description - -This location has precedence over the corresponding Java property. - -Please note that usually you have to specify location as URL not -just as a simple path on the local -filesystem. E.g. file:///home/user/xslthl/my-xslthl-config.xml. - - - - - - - - -highlight.default.language -string - - -highlight.default.language -Default language of programlisting - - - - -<xsl:param name="highlight.default.language"></xsl:param> - - - -Description - -This language is used when there is no language attribute on programlisting. - - - - - - -email.delimiters.enabled -boolean - - -email.delimiters.enabled -Generate delimiters around email addresses? - - - - -<xsl:param name="email.delimiters.enabled" select="1"></xsl:param> - - - -Description - -If non-zero, delimiters - -For delimiters, the -stylesheets are currently hard-coded to output angle -brackets. - -are generated around e-mail addresses -(the output of the email element). - - - - - - -exsl.node.set.available -boolean - - -exsl.node.set.available -Is the test function-available('exsl:node-set') true? - - - -<xsl:param name="exsl.node.set.available"> - <xsl:choose> - <xsl:when exsl:foo="" test="function-available('exsl:node-set') or contains(system-property('xsl:vendor'), 'Apache Software Foundation')">1</xsl:when> - <xsl:otherwise>0</xsl:otherwise> - </xsl:choose> -</xsl:param> - - - -Description - -If non-zero, -then the exsl:node-set() function is available to be used in -the stylesheet. -If zero, then the function is not available. -This param automatically detects the presence of -the function and does not normally need to be set manually. - -This param was created to handle a long-standing -bug in the Xalan processor that fails to detect the -function even though it is available. - - - - - -Annotations - - -annotation.support -boolean - - -annotation.support -Enable annotations? - - - - -<xsl:param name="annotation.support" select="0"></xsl:param> - - - -Description - -If non-zero, the stylesheets will attempt to support annotation -elements in HTML by including some JavaScript (see -annotation.js). - - - - - - -annotation.js -string - - -annotation.js -URIs identifying JavaScript files with support for annotation popups - - - - - -<xsl:param name="annotation.js"> -<xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param> - - - - -Description - -If annotation.support is enabled and the -document contains annotations, then the URIs listed -in this parameter will be included. These JavaScript files are required -for popup annotation support. - - - - - - -annotation.css -string - - -annotation.css -CSS rules for annotations - - - - -<xsl:param name="annotation.css"> -/* ====================================================================== - Annotations -*/ - -div.annotation-list { visibility: hidden; - } - -div.annotation-nocss { position: absolute; - visibility: hidden; - } - -div.annotation-popup { position: absolute; - z-index: 4; - visibility: hidden; - padding: 0px; - margin: 2px; - border-style: solid; - border-width: 1px; - width: 200px; - background-color: white; - } - -div.annotation-title { padding: 1px; - font-weight: bold; - border-bottom-style: solid; - border-bottom-width: 1px; - color: white; - background-color: black; - } - -div.annotation-body { padding: 2px; - } - -div.annotation-body p { margin-top: 0px; - padding-top: 0px; - } - -div.annotation-close { position: absolute; - top: 2px; - right: 2px; - } -</xsl:param> - - - -Description - -If annotation.support is enabled and the -document contains annotations, then the CSS in this -parameter will be included in the document. - - - - - - -annotation.graphic.open -uri - - -annotation.graphic.open -Image for identifying a link that opens an annotation popup - - - - -<xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param> - - - -Description - -This image is used inline to identify the location of -annotations. It may be replaced by a user provided graphic. The size should be approximately 10x10 pixels. - - - - - - -annotation.graphic.close -uri - - -annotation.graphic.close -Image for identifying a link that closes an annotation popup - - - - -<xsl:param name="annotation.graphic.close"> -http://docbook.sourceforge.net/release/images/annot-close.png</xsl:param> - - - -Description - -This image is used on popup annotations as the “x” that the -user can click to dismiss the popup. -This image is used on popup annotations as the “x” that the user can -click to dismiss the popup. It may be replaced by a user provided graphic. The size should be approximately 10x10 pixels. - - - - - -Graphics - - -img.src.path -string - - -img.src.path -Path to HTML/FO image files - - - -<xsl:param name="img.src.path"></xsl:param> - - -Description - -Add a path prefix to the value of the fileref -attribute of graphic, inlinegraphic, and imagedata elements. The resulting -compound path is used in the output as the value of the src -attribute of img (HTML) or external-graphic (FO). - - - -The path given by img.src.path could be relative to the directory where the HTML/FO -files are created, or it could be an absolute URI. -The default value is empty. -Be sure to include a trailing slash if needed. - - -This prefix is not applied to any filerefs that start -with "/" or contain "//:". - - - - - - - -keep.relative.image.uris -boolean - - -keep.relative.image.uris -Should image URIs be resolved against xml:base? - - - - -<xsl:param name="keep.relative.image.uris" select="1"></xsl:param> - - - - -Description - -If non-zero, relative URIs (in, for example -fileref attributes) will be used in the generated -output. Otherwise, the URIs will be made absolute with respect to the -base URI. - -Note that the stylesheets calculate (and use) the absolute form -for some purposes, this only applies to the resulting output. - - - - - - -graphic.default.extension -string - - -graphic.default.extension -Default extension for graphic filenames - - - -<xsl:param name="graphic.default.extension"></xsl:param> - - -Description - -If a graphic or mediaobject -includes a reference to a filename that does not include an extension, -and the format attribute is -unspecified, the default extension will be used. - - - - - - - -default.image.width -length - - -default.image.width -The default width of images - - - - -<xsl:param name="default.image.width"></xsl:param> - - - -Description - -If specified, this value will be used for the -width attribute on images that do not specify any -viewport dimensions. - - - - - - -nominal.image.width -length - - -nominal.image.width -The nominal image width - - - - -<xsl:param name="nominal.image.width" select="6 * $pixels.per.inch"></xsl:param> - - - -Description - -Graphic widths expressed as a percentage are problematic. In the -following discussion, we speak of width and contentwidth, but -the same issues apply to depth and contentdepth. - -A width of 50% means "half of the available space for the image." -That's fine. But note that in HTML, this is a dynamic property and -the image size will vary if the browser window is resized. - -A contentwidth of 50% means "half of the actual image width". -But what does that mean if the stylesheets cannot assess the image's -actual size? Treating this as a width of 50% is one possibility, but -it produces behavior (dynamic scaling) that seems entirely out of -character with the meaning. - -Instead, the stylesheets define a -nominal.image.width and convert percentages to -actual values based on that nominal size. - - - - - - -nominal.image.depth -length - - -nominal.image.depth -Nominal image depth - - - - -<xsl:param name="nominal.image.depth" select="4 * $pixels.per.inch"></xsl:param> - - - -Description - -See nominal.image.width. - - - - - - -use.embed.for.svg -boolean - - -use.embed.for.svg -Use HTML embed for SVG? - - - - -<xsl:param name="use.embed.for.svg" select="0"></xsl:param> - - - -Description - -If non-zero, an embed element will be created for -SVG figures. An object is always created, -this parameter merely controls whether or not an additional embed -is generated inside the object. - -On the plus side, this may be more portable among browsers and plug-ins. -On the minus side, it isn't valid HTML. - - - - - - -make.graphic.viewport -boolean - - -make.graphic.viewport -Use tables in HTML to make viewports for graphics - - - - -<xsl:param name="make.graphic.viewport" select="1"></xsl:param> - - - -Description - -The HTML img element only supports the notion -of content-area scaling; it doesn't support the distinction between a -content-area and a viewport-area, so we have to make some compromises. - -If make.graphic.viewport is non-zero, a table -will be used to frame the image. This creates an effective viewport-area. - - -Tables and alignment don't work together, so this parameter is ignored -if alignment is specified on an image. - - - - - -preferred.mediaobject.role -string - - -preferred.mediaobject.role -Select which mediaobject to use based on -this value of an object's role attribute. - - - - - -<xsl:param name="preferred.mediaobject.role"></xsl:param> - - - -Description - -A mediaobject may contain several objects such as imageobjects. -If the parameter use.role.for.mediaobject is -non-zero, then the role attribute on -imageobjects and other objects within a -mediaobject container will be used to select which object -will be used. If one of the objects has a role value that matches the -preferred.mediaobject.role parameter, then it -has first priority for selection. If more than one has such a role -value, the first one is used. - - -See the use.role.for.mediaobject parameter -for the sequence of selection. - - - - - -use.role.for.mediaobject -boolean - - -use.role.for.mediaobject -Use role attribute -value for selecting which of several objects within a mediaobject to use. - - - - - -<xsl:param name="use.role.for.mediaobject" select="1"></xsl:param> - - - -Description - -If non-zero, the role attribute on -imageobjects or other objects within a mediaobject container will be used to select which object will be -used. - - -The order of selection when then parameter is non-zero is: - - - - If the stylesheet parameter preferred.mediaobject.role has a value, then the object whose role equals that value is selected. - - -Else if an object's role attribute has a value of -html for HTML processing or -fo for FO output, then the first -of such objects is selected. - - - -Else the first suitable object is selected. - - - -If the value of -use.role.for.mediaobject -is zero, then role attributes are not considered -and the first suitable object -with or without a role value is used. - - - - - - -ignore.image.scaling -boolean - - -ignore.image.scaling -Tell the stylesheets to ignore the author's image scaling attributes - - - - -<xsl:param name="ignore.image.scaling" select="0"></xsl:param> - - - -Description - -If non-zero, the scaling attributes on graphics and media objects are -ignored. - - - - - -Chunking - - -chunker.output.cdata-section-elements -string - - -chunker.output.cdata-section-elements -List of elements to escape with CDATA sections - - - -<xsl:param name="chunker.output.cdata-section-elements"></xsl:param> - - -Description -This parameter specifies the list of elements that should be escaped -as CDATA sections by the chunking stylesheet. Not all processors support -specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.doctype-public -string - - -chunker.output.doctype-public -Public identifer to use in the document type of generated pages - - - -<xsl:param name="chunker.output.doctype-public"></xsl:param> - - -Description -This parameter specifies the public identifier that should be used by -the chunking stylesheet in the document type declaration of chunked pages. -Not all processors support specification of -this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.doctype-system -uri - - -chunker.output.doctype-system -System identifier to use for the document type in generated pages - - - -<xsl:param name="chunker.output.doctype-system"></xsl:param> - - -Description -This parameter specifies the system identifier that should be used by -the chunking stylesheet in the document type declaration of chunked pages. -Not all processors support specification of -this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.encoding -string - - -chunker.output.encoding -Encoding used in generated pages - - - -<xsl:param name="chunker.output.encoding">ISO-8859-1</xsl:param> - - -Description -This parameter specifies the encoding to be used in files -generated by the chunking stylesheet. Not all processors support -specification of this parameter. - -This parameter used to be named default.encoding. - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.indent -string - - -chunker.output.indent -Specification of indentation on generated pages - - - -<xsl:param name="chunker.output.indent">no</xsl:param> - - -Description -This parameter specifies the value of the indent -specification for generated pages. Not all processors support -specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.media-type -string - - -chunker.output.media-type -Media type to use in generated pages - - - -<xsl:param name="chunker.output.media-type"></xsl:param> - - -Description -This parameter specifies the media type that should be used by -the chunking stylesheet. Not all processors support specification of -this parameter. - -This parameter specifies the media type that should be used by the -chunking stylesheet. This should be one from those defined in -[RFC2045] and - [RFC2046] - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. -It must be one from html, xml or text - - - - - - -chunker.output.method -list -html -xml - - -chunker.output.method -Method used in generated pages - - - -<xsl:param name="chunker.output.method">html</xsl:param> - - -Description -This parameter specifies the output method to be used in files -generated by the chunking stylesheet. - -This parameter used to be named output.method. - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.omit-xml-declaration -string - - -chunker.output.omit-xml-declaration -Omit-xml-declaration for generated pages - - - -<xsl:param name="chunker.output.omit-xml-declaration">no</xsl:param> - - -Description -This parameter specifies the value of the omit-xml-declaration -specification for generated pages. Not all processors support -specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -chunker.output.standalone -string - - -chunker.output.standalone -Standalone declaration for generated pages - - - -<xsl:param name="chunker.output.standalone">no</xsl:param> - - -Description -This parameter specifies the value of the standalone - specification for generated pages. It must be either - yes or no. Not all - processors support specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - -saxon.character.representation -string - - -saxon.character.representation -Saxon character representation used in generated HTML pages - - - - <xsl:param name="saxon.character.representation" select="'entity;decimal'"></xsl:param> - - -Description - -This parameter has effect only when Saxon 6 is used (version 6.4.2 or later). -It sets the character representation in files generated by the chunking stylesheets. -If you want to suppress entity references for characters with direct representations in -chunker.output.encoding, set the parameter value to native. - - - For more information, see Saxon output character representation. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - - - - -html.ext -string - - -html.ext -Identifies the extension of generated HTML files - - - - -<xsl:param name="html.ext">.html</xsl:param> - - - -Description - -The extension identified by html.ext will -be used as the filename extension for chunks created by this -stylesheet. - - - - - - -use.id.as.filename -boolean - - -use.id.as.filename -Use ID value of chunk elements as the filename? - - - - -<xsl:param name="use.id.as.filename" select="0"></xsl:param> - - - -Description - -If use.id.as.filename -is non-zero, the filename of chunk elements that have IDs will be -derived from the ID value. - - - - - - - -html.extra.head.links -boolean - - -html.extra.head.links -Toggle extra HTML head link information - - - - -<xsl:param name="html.extra.head.links" select="0"></xsl:param> - - - -Description - -If non-zero, extra link elements will be -generated in the head of chunked HTML files. These -extra links point to chapters, appendixes, sections, etc. as supported -by the Site Navigation Bar in Mozilla 1.0 (as of CR1, at least). - - - - - - - -root.filename -uri - - -root.filename -Identifies the name of the root HTML file when chunking - - - - -<xsl:param name="root.filename">index</xsl:param> - - - -Description - -The root.filename is the base filename for -the chunk created for the root of each document processed. - - - - - - - -base.dir -uri - - -base.dir -The base directory of chunks - - - - -<xsl:param name="base.dir"></xsl:param> - - - -Description - -If specified, the base.dir identifies -the output directory for chunks. (If not specified, the output directory -is system dependent.) - - - - - - - generate.manifest - boolean - - - generate.manifest - Generate a manifest file? - - - - <xsl:param name="generate.manifest" select="0"></xsl:param> - - - Description - - If non-zero, a list of HTML files generated by the - stylesheet transformation is written to the file named by - the manifest parameter. - - - - - - - manifest - string - - - manifest - Name of manifest file - - - - - <xsl:param name="manifest">HTML.manifest</xsl:param> - - - - Description - - The name of the file to which a manifest is written (if the - value of the generate.manifest parameter - is non-zero). - - - - - - -manifest.in.base.dir -boolean - - -manifest.in.base.dir -Should the manifest file be written into base.dir? - - - - -<xsl:param name="manifest.in.base.dir" select="0"></xsl:param> - - - -Description - -If non-zero, the manifest file as well as project files for HTML Help and -Eclipse Help are written into base.dir instead -of the current directory. - - - - - - -chunk.toc -string - - -chunk.toc -An explicit TOC to be used for chunking - - - - -<xsl:param name="chunk.toc"></xsl:param> - - - -Description - -The chunk.toc identifies an explicit TOC that -will be used for chunking. This parameter is only used by the -chunktoc.xsl stylesheet (and customization layers built -from it). - - - - - - -chunk.tocs.and.lots -boolean - - -chunk.tocs.and.lots -Should ToC and LoTs be in separate chunks? - - - - -<xsl:param name="chunk.tocs.and.lots" select="0"></xsl:param> - - - -Description - -If non-zero, ToC and LoT (List of Examples, List of Figures, etc.) -will be put in a separate chunk. At the moment, this chunk is not in the -normal forward/backward navigation list. Instead, a new link is added to the -navigation footer. - -This feature is still somewhat experimental. Feedback welcome. - - - - - - -chunk.separate.lots -boolean - - -chunk.separate.lots -Should each LoT be in its own separate chunk? - - - - -<xsl:param name="chunk.separate.lots" select="0"></xsl:param> - - - -Description - -If non-zero, each of the ToC and LoTs -(List of Examples, List of Figures, etc.) -will be put in its own separate chunk. -The title page includes generated links to each of the separate files. - - -This feature depends on the -chunk.tocs.and.lots -parameter also being non-zero. - - - - - - - -chunk.tocs.and.lots.has.title -boolean - - -chunk.tocs.and.lots.has.title -Should ToC and LoTs in a separate chunks have title? - - - - -<xsl:param name="chunk.tocs.and.lots.has.title" select="1"></xsl:param> - - - -Description - -If non-zero title of document is shown before ToC/LoT in -separate chunk. - - - - - - -chunk.section.depth -integer - - -chunk.section.depth -Depth to which sections should be chunked - - - - -<xsl:param name="chunk.section.depth" select="1"></xsl:param> - - - -Description - -This parameter sets the depth of section chunking. - - - - - - -chunk.first.sections -boolean - - -chunk.first.sections -Chunk the first top-level section? - - - - -<xsl:param name="chunk.first.sections" select="0"></xsl:param> - - - -Description - -If non-zero, a chunk will be created for the first top-level -sect1 or section elements in -each component. Otherwise, that section will be part of the chunk for -its parent. - - - - - - - -chunk.quietly -boolean - - -chunk.quietly -Omit the chunked filename messages. - - - - -<xsl:param name="chunk.quietly" select="0"></xsl:param> - - - -Description - -If zero (the default), the XSL processor emits a message naming -each separate chunk filename as it is being output. -If nonzero, then the messages are suppressed. - - - - - - - -chunk.append -string - - -chunk.append -Specifies content to append to chunked HTML output - - - -<xsl:param name="chunk.append"></xsl:param> - - -Description - -Specifies content to append to the end of HTML files output by -the html/chunk.xsl stylesheet, after the closing -<html> tag. You probably don’t want to set any value -for this parameter; but if you do, the only value it should ever be -set to is a newline character: &#x0a; or -&#10; - - - - - - -navig.graphics -boolean - - -navig.graphics -Use graphics in navigational headers and footers? - - - - -<xsl:param name="navig.graphics" select="0"></xsl:param> - - - -Description - -If non-zero, the navigational headers and footers in chunked -HTML are presented in an alternate style that uses graphical icons for -Next, Previous, Up, and Home. Default graphics are provided in the -distribution. If zero, text is used instead of graphics. - - - - - - - -navig.graphics.extension -string - - -navig.graphics.extension -Extension for navigational graphics - - - - -<xsl:param name="navig.graphics.extension">.gif</xsl:param> - - - -Description - -Sets the filename extension to use on navigational graphics used -in the headers and footers of chunked HTML. - - - - - - -navig.graphics.path -string - - -navig.graphics.path -Path to navigational graphics - - - - -<xsl:param name="navig.graphics.path">images/</xsl:param> - - - -Description - -Sets the path, probably relative to the directory where the HTML -files are created, to the navigational graphics used in the -headers and footers of chunked HTML. - - - - - - - -navig.showtitles -boolean - - -navig.showtitles -Display titles in HTML headers and footers? - - - -<xsl:param name="navig.showtitles">1</xsl:param> - - -Description - -If non-zero, -the headers and footers of chunked HTML -display the titles of the next and previous chunks, -along with the words 'Next' and 'Previous' (or the -equivalent graphical icons if navig.graphics is true). -If false (zero), then only the words 'Next' and 'Previous' -(or the icons) are displayed. - - - - - - -Profiling - -The following parameters can be used for attribute-based -profiling of your document. For more information about profiling, see -Profiling (conditional text). - - - -profile.arch -string - - -profile.arch -Target profile for arch -attribute - - - - -<xsl:param name="profile.arch"></xsl:param> - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.audience -string - - -profile.audience -Target profile for audience -attribute - - - - -<xsl:param name="profile.audience"></xsl:param> - - - -Description - -Value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.condition -string - - -profile.condition -Target profile for condition -attribute - - - - -<xsl:param name="profile.condition"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.conformance -string - - -profile.conformance -Target profile for conformance -attribute - - - - -<xsl:param name="profile.conformance"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.lang -string - - -profile.lang -Target profile for lang -attribute - - - - -<xsl:param name="profile.lang"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.os -string - - -profile.os -Target profile for os -attribute - - - - -<xsl:param name="profile.os"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.revision -string - - -profile.revision -Target profile for revision -attribute - - - - -<xsl:param name="profile.revision"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.revisionflag -string - - -profile.revisionflag -Target profile for revisionflag -attribute - - - - -<xsl:param name="profile.revisionflag"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.role -string - - -profile.role -Target profile for role -attribute - - - - -<xsl:param name="profile.role"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - -Note that role is often -used for other purposes than profiling. For example it is commonly -used to get emphasize in bold font: - -<emphasis role="bold">very important</emphasis> - -If you are using role for -these purposes do not forget to add values like bold to -value of this parameter. If you forgot you will get document with -small pieces missing which are very hard to track. - -For this reason it is not recommended to use role attribute for profiling. You should -rather use profiling specific attributes like userlevel, os, arch, condition, etc. - - - - - - - -profile.security -string - - -profile.security -Target profile for security -attribute - - - - -<xsl:param name="profile.security"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.status -string - - -profile.status -Target profile for status -attribute - - - - -<xsl:param name="profile.status"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.userlevel -string - - -profile.userlevel -Target profile for userlevel -attribute - - - - -<xsl:param name="profile.userlevel"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.vendor -string - - -profile.vendor -Target profile for vendor -attribute - - - - -<xsl:param name="profile.vendor"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.wordsize -string - - -profile.wordsize -Target profile for wordsize -attribute - - - - -<xsl:param name="profile.wordsize"></xsl:param> - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.attribute -string - - -profile.attribute -Name of user-specified profiling attribute - - - - -<xsl:param name="profile.attribute"></xsl:param> - - - -Description - -This parameter is used in conjuction with -profile.value. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.value -string - - -profile.value -Target profile for user-specified attribute - - - - -<xsl:param name="profile.value"></xsl:param> - - - -Description - -When you are using this parameter you must also specify name of -profiling attribute with parameter -profile.attribute. - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - - - - -profile.separator -string - - -profile.separator -Separator character for compound profile values - - - - -<xsl:param name="profile.separator">;</xsl:param> - - - -Description - -Separator character used for compound profile values. See profile.arch - - - - - -HTML Help - - -htmlhelp.encoding -string - - -htmlhelp.encoding -Character encoding to use in files for HTML Help compiler. - - - - -<xsl:param name="htmlhelp.encoding">iso-8859-1</xsl:param> - - - -Description - -HTML Help Compiler is not UTF-8 aware, so you should always use an -appropriate single-byte encoding here. Use one from iana, the registered charset values. - - - - - - -htmlhelp.autolabel -boolean - - -htmlhelp.autolabel -Should tree-like ToC use autonumbering feature? - - - - -<xsl:param name="htmlhelp.autolabel" select="0"></xsl:param> - - - -Description - -Set this to non-zero to include chapter and section numbers into ToC -in the left panel. - - - - - - -htmlhelp.chm -string - - -htmlhelp.chm -Filename of output HTML Help file. - - - - -<xsl:param name="htmlhelp.chm">htmlhelp.chm</xsl:param> - - - -Description - -Set the name of resulting CHM file - - - - - - -htmlhelp.default.topic -string - - -htmlhelp.default.topic -Name of file with default topic - - - - -<xsl:param name="htmlhelp.default.topic"></xsl:param> - - - -Description - -Normally first chunk of document is displayed when you open HTML -Help file. If you want to display another topic, simply set its -filename by this parameter. - -This is useful especially if you don't generate ToC in front of -your document and you also hide root element in ToC. E.g.: - -<xsl:param name="generate.book.toc" select="0"/> -<xsl:param name="htmlhelp.hhc.show.root" select="0"/> -<xsl:param name="htmlhelp.default.topic">pr01.html</xsl:param> - - - - - - - -htmlhelp.display.progress -boolean - - -htmlhelp.display.progress -Display compile progress? - - - - -<xsl:param name="htmlhelp.display.progress" select="1"></xsl:param> - - - -Description - -Set to non-zero to to display compile progress - - - - - - - -htmlhelp.hhp -string - - -htmlhelp.hhp -Filename of project file. - - - - -<xsl:param name="htmlhelp.hhp">htmlhelp.hhp</xsl:param> - - - -Description - -Change this parameter if you want different name of project -file than htmlhelp.hhp. - - - - - - -htmlhelp.hhc -string - - -htmlhelp.hhc -Filename of TOC file. - - - - -<xsl:param name="htmlhelp.hhc">toc.hhc</xsl:param> - - - -Description - -Set the name of the TOC file. The default is toc.hhc. - - - - - - -htmlhelp.hhk -string - - -htmlhelp.hhk -Filename of index file. - - - - -<xsl:param name="htmlhelp.hhk">index.hhk</xsl:param> - - - -Description - -set the name of the index file. The default is index.hhk. - - - - - - -htmlhelp.hhp.tail -string - - -htmlhelp.hhp.tail -Additional content for project file. - - - - -<xsl:param name="htmlhelp.hhp.tail"></xsl:param> - - - -Description - -If you want to include some additional parameters into project file, -store appropriate part of project file into this parameter. - - - - - - -htmlhelp.hhp.window -string - - -htmlhelp.hhp.window -Name of default window. - - - - -<xsl:param name="htmlhelp.hhp.window">Main</xsl:param> - - - -Description - -Name of default window. If empty no [WINDOWS] section will be -added to project file. - - - - - - -htmlhelp.hhp.windows -string - - -htmlhelp.hhp.windows -Definition of additional windows - - - - -<xsl:param name="htmlhelp.hhp.windows"></xsl:param> - - - -Description - -Content of this parameter is placed at the end of [WINDOWS] -section of project file. You can use it for defining your own -addtional windows. - - - - - - -htmlhelp.enhanced.decompilation -boolean - - -htmlhelp.enhanced.decompilation -Allow enhanced decompilation of CHM? - - - - -<xsl:param name="htmlhelp.enhanced.decompilation" select="0"></xsl:param> - - - -Description - -When non-zero this parameter enables enhanced decompilation of CHM. - - - - - - -htmlhelp.enumerate.images -boolean - - -htmlhelp.enumerate.images -Should the paths to all used images be added to the project file? - - - - -<xsl:param name="htmlhelp.enumerate.images" select="0"></xsl:param> - - - -Description - -Set to non-zero if you insert images into your documents as -external binary entities or if you are using absolute image paths. - - - - - - -htmlhelp.force.map.and.alias -boolean - - -htmlhelp.force.map.and.alias -Should [MAP] and [ALIAS] sections be added to the project file unconditionally? - - - -<xsl:param name="htmlhelp.force.map.and.alias" select="0"></xsl:param> - - -Description - Set to non-zero if you have your own - alias.h and context.h - files and you want to include references to them in the project - file. - - - - - -htmlhelp.map.file -string - - -htmlhelp.map.file -Filename of map file. - - - -<xsl:param name="htmlhelp.map.file">context.h</xsl:param> - - -Description -Set the name of map file. The default is - context.h. (used for context-sensitive - help). - - - - - -htmlhelp.alias.file -string - - -htmlhelp.alias.file -Filename of alias file. - - - - -<xsl:param name="htmlhelp.alias.file">alias.h</xsl:param> - - - -Description - -Specifies the filename of the alias file (used for context-sensitive help). - - - - - - -htmlhelp.hhc.section.depth -integer - - -htmlhelp.hhc.section.depth -Depth of TOC for sections in a left pane. - - - - -<xsl:param name="htmlhelp.hhc.section.depth">5</xsl:param> - - - -Description - -Set the section depth in the left pane of HTML Help viewer. - - - - - - -htmlhelp.hhc.show.root -boolean - - -htmlhelp.hhc.show.root -Should there be an entry for the root element in the ToC? - - - - -<xsl:param name="htmlhelp.hhc.show.root" select="1"></xsl:param> - - - -Description - -If set to zero, there will be no entry for the root element in the -ToC. This is useful when you want to provide the user with an expanded -ToC as a default. - - - - - - -htmlhelp.hhc.folders.instead.books -boolean - - -htmlhelp.hhc.folders.instead.books -Use folder icons in ToC (instead of book icons)? - - - - -<xsl:param name="htmlhelp.hhc.folders.instead.books" select="1"></xsl:param> - - - -Description - -Set to non-zero for folder-like icons or zero for book-like icons in the ToC. -If you want to use folder-like icons, you must switch off the binary ToC using -htmlhelp.hhc.binary. - - - - - - - - -htmlhelp.hhc.binary -boolean - - -htmlhelp.hhc.binary -Generate binary ToC? - - - - -<xsl:param name="htmlhelp.hhc.binary" select="1"></xsl:param> - - - -Description - -Set to non-zero to generate a binary TOC. You must create a binary TOC -if you want to add Prev/Next buttons to toolbar (which is default -behaviour). Files with binary TOC can't be merged. - - - - - - -htmlhelp.hhc.width -integer - - -htmlhelp.hhc.width -Width of navigation pane - - - - -<xsl:param name="htmlhelp.hhc.width"></xsl:param> - - - -Description - -This parameter specifies the width of the navigation pane (containing TOC and -other navigation tabs) in pixels. - - - - - - -htmlhelp.title -string - - -htmlhelp.title -Title of HTML Help - - - - -<xsl:param name="htmlhelp.title"></xsl:param> - - - -Description - -Content of this parameter will be used as a title for generated -HTML Help. If empty, title will be automatically taken from document. - - - - - - -htmlhelp.show.menu -boolean - - -htmlhelp.show.menu -Should the menu bar be shown? - - - - -<xsl:param name="htmlhelp.show.menu" select="0"></xsl:param> - - - -Description - -Set to non-zero to have an application menu bar in your HTML Help window. - - - - - - - -htmlhelp.show.toolbar.text -boolean - - -htmlhelp.show.toolbar.text -Show text under toolbar buttons? - - - - -<xsl:param name="htmlhelp.show.toolbar.text" select="1"></xsl:param> - - - -Description - -Set to non-zero to display texts under toolbar buttons, zero to switch -off displays. - - - - - - -htmlhelp.show.advanced.search -boolean - - -htmlhelp.show.advanced.search -Should advanced search features be available? - - - - -<xsl:param name="htmlhelp.show.advanced.search" select="0"></xsl:param> - - - -Description - -If you want advanced search features in your help, turn this -parameter to 1. - - - - - - -htmlhelp.show.favorities -boolean - - -htmlhelp.show.favorities -Should the Favorites tab be shown? - - - - -<xsl:param name="htmlhelp.show.favorities" select="0"></xsl:param> - - - -Description - -Set to non-zero to include a Favorites tab in the navigation pane -of the help window. - - - - - - -htmlhelp.button.hideshow -boolean - - -htmlhelp.button.hideshow -Should the Hide/Show button be shown? - - - - -<xsl:param name="htmlhelp.button.hideshow" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Hide/Show button shown on toolbar - - - - - - -htmlhelp.button.back -boolean - - -htmlhelp.button.back -Should the Back button be shown? - - - - -<xsl:param name="htmlhelp.button.back" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Hide/Show button shown on toolbar - - - - - - -htmlhelp.button.forward -boolean - - -htmlhelp.button.forward -Should the Forward button be shown? - - - - -<xsl:param name="htmlhelp.button.forward" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Forward button on the toolbar. - - - - - - -htmlhelp.button.stop -boolean - - -htmlhelp.button.stop -Should the Stop button be shown? - - - - -<xsl:param name="htmlhelp.button.stop" select="0"></xsl:param> - - - -Description - -If you want Stop button shown on toolbar, turn this -parameter to 1. - - - - - - -htmlhelp.button.refresh -boolean - - -htmlhelp.button.refresh -Should the Refresh button be shown? - - - - -<xsl:param name="htmlhelp.button.refresh" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Stop button on the toolbar. - - - - - - -htmlhelp.button.home -boolean - - -htmlhelp.button.home -Should the Home button be shown? - - - - -<xsl:param name="htmlhelp.button.home" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Home button on the toolbar. - - - - - - -htmlhelp.button.home.url -string - - -htmlhelp.button.home.url -URL address of page accessible by Home button - - - - -<xsl:param name="htmlhelp.button.home.url"></xsl:param> - - - -Description - -URL address of page accessible by Home button. - - - - - - -htmlhelp.button.options -boolean - - -htmlhelp.button.options -Should the Options button be shown? - - - - -<xsl:param name="htmlhelp.button.options" select="1"></xsl:param> - - - -Description - -If you want Options button shown on toolbar, turn this -parameter to 1. - - - - - - -htmlhelp.button.print -boolean - - -htmlhelp.button.print -Should the Print button be shown? - - - - -<xsl:param name="htmlhelp.button.print" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Print button on the toolbar. - - - - - - - -htmlhelp.button.locate -boolean - - -htmlhelp.button.locate -Should the Locate button be shown? - - - - -<xsl:param name="htmlhelp.button.locate" select="0"></xsl:param> - - - -Description - -If you want Locate button shown on toolbar, turn this -parameter to 1. - - - - - - -htmlhelp.button.jump1 -boolean - - -htmlhelp.button.jump1 -Should the Jump1 button be shown? - - - -<xsl:param name="htmlhelp.button.jump1" select="0"></xsl:param> - - -Description - Set to non-zero to include the Jump1 button on the toolbar. - - - - - -htmlhelp.button.jump1.url -string - - -htmlhelp.button.jump1.url -URL address of page accessible by Jump1 button - - - - -<xsl:param name="htmlhelp.button.jump1.url"></xsl:param> - - - -Description - -URL address of page accessible by Jump1 button. - - - - - - -htmlhelp.button.jump1.title -string - - -htmlhelp.button.jump1.title -Title of Jump1 button - - - - -<xsl:param name="htmlhelp.button.jump1.title">User1</xsl:param> - - - -Description - -Title of Jump1 button. - - - - - - -htmlhelp.button.jump2 -boolean - - -htmlhelp.button.jump2 -Should the Jump2 button be shown? - - - - -<xsl:param name="htmlhelp.button.jump2" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Jump2 button on the toolbar. - - - - - - -htmlhelp.button.jump2.url -string - - -htmlhelp.button.jump2.url -URL address of page accessible by Jump2 button - - - - -<xsl:param name="htmlhelp.button.jump2.url"></xsl:param> - - - -Description - -URL address of page accessible by Jump2 button. - - - - - - -htmlhelp.button.jump2.title -string - - -htmlhelp.button.jump2.title -Title of Jump2 button - - - - -<xsl:param name="htmlhelp.button.jump2.title">User2</xsl:param> - - - -Description - -Title of Jump2 button. - - - - - - -htmlhelp.button.next -boolean - - -htmlhelp.button.next -Should the Next button be shown? - - - - -<xsl:param name="htmlhelp.button.next" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Next button on the toolbar. - - - - - - -htmlhelp.button.prev -boolean - - -htmlhelp.button.prev -Should the Prev button be shown? - - - - -<xsl:param name="htmlhelp.button.prev" select="1"></xsl:param> - - - -Description - -Set to non-zero to include the Prev button on the toolbar. - - - - - - - -htmlhelp.button.zoom -boolean - - -htmlhelp.button.zoom -Should the Zoom button be shown? - - - - -<xsl:param name="htmlhelp.button.zoom" select="0"></xsl:param> - - - -Description - -Set to non-zero to include the Zoom button on the toolbar. - - - - - - - -htmlhelp.remember.window.position -boolean - - -htmlhelp.remember.window.position -Remember help window position? - - - - -<xsl:param name="htmlhelp.remember.window.position" select="0"></xsl:param> - - - -Description - -Set to non-zero to remember help window position between starts. - - - - - - -htmlhelp.window.geometry -string - - -htmlhelp.window.geometry -Set initial geometry of help window - - - - -<xsl:param name="htmlhelp.window.geometry"></xsl:param> - - - -Description - -This parameter specifies initial position of help -window. E.g. - -<xsl:param name="htmlhelp.window.geometry">[160,64,992,704]</xsl:param> - - - - - - -htmlhelp.use.hhk -boolean - - -htmlhelp.use.hhk -Should the index be built using the HHK file? - - - - -<xsl:param name="htmlhelp.use.hhk" select="0"></xsl:param> - - - -Description - -If non-zero, the index is created using the HHK file (instead of using object -elements in the HTML files). For more information, see Generating an index. - - - - - -htmlhelp.only -boolean - - -htmlhelp.only -Should only project files be generated? - - - - -<xsl:param name="htmlhelp.only" select="0"></xsl:param> - - - -Description - - -Set to non-zero if you want to play with various HTML Help parameters -and you don't need to regenerate all HTML files. This setting will not -process whole document, only project files (hhp, hhc, hhk,...) will be -generated. - - - - - - -Eclipse Help Platform - - -eclipse.autolabel -boolean - - -eclipse.autolabel -Should tree-like ToC use autonumbering feature? - - - - -<xsl:param name="eclipse.autolabel" select="0"></xsl:param> - - - -Description - -If you want to include chapter and section numbers into ToC in -the left panel, set this parameter to 1. - - - - - - -eclipse.plugin.name -string - - -eclipse.plugin.name -Eclipse Help plugin name - - - - -<xsl:param name="eclipse.plugin.name">DocBook Online Help Sample</xsl:param> - - - -Description - -Eclipse Help plugin name. - - - - - - -eclipse.plugin.id -string - - -eclipse.plugin.id -Eclipse Help plugin id - - - - -<xsl:param name="eclipse.plugin.id">com.example.help</xsl:param> - - - -Description - -Eclipse Help plugin id. You should change this id to something -unique for each help. - - - - - - -eclipse.plugin.provider -string - - -eclipse.plugin.provider -Eclipse Help plugin provider name - - - - -<xsl:param name="eclipse.plugin.provider">Example provider</xsl:param> - - - -Description - -Eclipse Help plugin provider name. - - - - - -JavaHelp - - -javahelp.encoding -string - - -javahelp.encoding -Character encoding to use in control files for JavaHelp. - - - - -<xsl:param name="javahelp.encoding">iso-8859-1</xsl:param> - - - -Description - -JavaHelp crashes on some characters when written as character -references. In that case you can use this parameter to select an appropriate encoding. - - - - - - - - -Localization - - -l10n.gentext.language -string - - -l10n.gentext.language -Sets the gentext language - - - - -<xsl:param name="l10n.gentext.language"></xsl:param> - - - -Description - -If this parameter is set to any value other than the empty string, its -value will be used as the value for the language when generating text. Setting -l10n.gentext.language overrides any settings within the -document being formatted. - -It's much more likely that you might want to set the -l10n.gentext.default.language parameter. - - - - - - - l10n.gentext.default.language - string - - - l10n.gentext.default.language - Sets the default language for generated text - - - - -<xsl:param name="l10n.gentext.default.language">en</xsl:param> - - - -Description - -The value of the l10n.gentext.default.language -parameter is used as the language for generated text if no setting is provided -in the source document. - - - - - - -l10n.gentext.use.xref.language -boolean - - -l10n.gentext.use.xref.language -Use the language of target when generating cross-reference text? - - - - -<xsl:param name="l10n.gentext.use.xref.language" select="0"></xsl:param> - - - -Description - -If non-zero, the language of the target will be used when -generating cross reference text. Usually, the current -language is used when generating text (that is, the language of the -element that contains the cross-reference element). But setting this parameter -allows the language of the element pointed to to control -the generated text. - -Consider the following example: - - -<para lang="en">See also <xref linkend="chap3"/>.</para> - - - -Suppose that Chapter 3 happens to be written in German. -If l10n.gentext.use.xref.language is non-zero, the -resulting text will be something like this: - -
    -See also Kapital 3. -
    - -Where the more traditional rendering would be: - -
    -See also Chapter 3. -
    - -
    -
    - - - -l10n.lang.value.rfc.compliant -boolean - - -l10n.lang.value.rfc.compliant -Make value of lang attribute RFC compliant? - - - - -<xsl:param name="l10n.lang.value.rfc.compliant" select="1"></xsl:param> - - - -Description - -If non-zero, ensure that the values for all lang attributes in HTML output are RFC -compliantSection 8.1.1, Language Codes, in the HTML 4.0 Recommendation states that: - -
    [RFC1766] defines and explains the language codes -that must be used in HTML documents. -Briefly, language codes consist of a primary code and a possibly -empty series of subcodes: - -language-code = primary-code ( "-" subcode )* - -And in RFC 1766, Tags for the Identification -of Languages, the EBNF for "language tag" is given as: - -Language-Tag = Primary-tag *( "-" Subtag ) -Primary-tag = 1*8ALPHA -Subtag = 1*8ALPHA - -
    -
    . - -by taking any underscore characters in any lang values found in source documents, and -replacing them with hyphen characters in output HTML files. For -example, zh_CN in a source document becomes -zh-CN in the HTML output form that source. - - -This parameter does not cause any case change in lang values, because RFC 1766 -explicitly states that all "language tags" (as it calls them) "are -to be treated as case insensitive". - -
    - -
    -
    - - - -writing.mode -string - - -writing.mode -Direction of text flow based on locale - - - - -<xsl:param name="writing.mode"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key">writing-mode</xsl:with-param> - <xsl:with-param name="lang"> - <xsl:call-template name="l10n.language"> - <xsl:with-param name="target" select="/*[1]"></xsl:with-param> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> -</xsl:param> - - - -Description - -Sets direction of text flow and text alignment based on locale. -The value is normally taken from the gentext file for the -lang attribute of the document's root element, using the -key name 'writing-mode' to look it up in the gentext file. -But the param can also be -set on the command line to override that gentext value. - -Accepted values are: - - - lr-tb - - Left-to-right text flow in each line, lines stack top to bottom. - - - - rl-tb - - Right-to-left text flow in each line, lines stack top to bottom. - - - - tb-rl - - Top-to-bottom text flow in each vertical line, lines stack right to left. - Supported by only a few XSL-FO processors. Not supported in HTML output. - - - - lr - - Shorthand for lr-tb. - - - - rl - - Shorthand for rl-tb. - - - - tb - - Shorthand for tb-rl. - - - - - - - - -
    -The Stylesheet - -The param.xsl stylesheet is just a wrapper -around all these parameters. - - - -<!-- This file is generated from param.xweb --> - -<xsl:stylesheet exclude-result-prefixes="src" version="1.0"> - -<!-- ******************************************************************** - $Id: param.xweb 8552 2009-12-07 17:45:26Z bobstayton $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<src:fragref linkend="abstract.notitle.enabled.frag"></src:fragref> -<src:fragref linkend="admon.graphics.extension.frag"></src:fragref> -<src:fragref linkend="admon.graphics.frag"></src:fragref> -<src:fragref linkend="admon.graphics.path.frag"></src:fragref> -<src:fragref linkend="admon.style.frag"></src:fragref> -<src:fragref linkend="admon.textlabel.frag"></src:fragref> -<src:fragref linkend="annotate.toc.frag"></src:fragref> -<src:fragref linkend="annotation.css.frag"></src:fragref> -<src:fragref linkend="annotation.graphic.close.frag"></src:fragref> -<src:fragref linkend="annotation.graphic.open.frag"></src:fragref> -<src:fragref linkend="annotation.js.frag"></src:fragref> -<src:fragref linkend="annotation.support.frag"></src:fragref> -<src:fragref linkend="appendix.autolabel.frag"></src:fragref> -<src:fragref linkend="author.othername.in.middle.frag"></src:fragref> -<src:fragref linkend="autotoc.label.in.hyperlink.frag"></src:fragref> -<src:fragref linkend="autotoc.label.separator.frag"></src:fragref> -<src:fragref linkend="base.dir.frag"></src:fragref> -<src:fragref linkend="biblioentry.item.separator.frag"></src:fragref> -<src:fragref linkend="bibliography.collection.frag"></src:fragref> -<src:fragref linkend="bibliography.numbered.frag"></src:fragref> -<src:fragref linkend="bibliography.style.frag"></src:fragref> -<src:fragref linkend="blurb.on.titlepage.enabled.frag"></src:fragref> -<src:fragref linkend="bridgehead.in.toc.frag"></src:fragref> -<src:fragref linkend="callout.defaultcolumn.frag"></src:fragref> -<src:fragref linkend="callout.graphics.extension.frag"></src:fragref> -<src:fragref linkend="callout.graphics.frag"></src:fragref> -<src:fragref linkend="callout.graphics.number.limit.frag"></src:fragref> -<src:fragref linkend="callout.graphics.path.frag"></src:fragref> -<src:fragref linkend="callout.list.table.frag"></src:fragref> -<src:fragref linkend="callout.unicode.frag"></src:fragref> -<src:fragref linkend="callout.unicode.number.limit.frag"></src:fragref> -<src:fragref linkend="callout.unicode.start.character.frag"></src:fragref> -<src:fragref linkend="callouts.extension.frag"></src:fragref> -<src:fragref linkend="chapter.autolabel.frag"></src:fragref> -<src:fragref linkend="chunk.append.frag"></src:fragref> -<src:fragref linkend="chunk.first.sections.frag"></src:fragref> -<src:fragref linkend="chunk.quietly.frag"></src:fragref> -<src:fragref linkend="chunk.section.depth.frag"></src:fragref> -<src:fragref linkend="chunk.separate.lots.frag"></src:fragref> -<src:fragref linkend="chunk.toc.frag"></src:fragref> -<src:fragref linkend="chunk.tocs.and.lots.frag"></src:fragref> -<src:fragref linkend="chunk.tocs.and.lots.has.title.frag"></src:fragref> -<src:fragref linkend="citerefentry.link.frag"></src:fragref> -<src:fragref linkend="collect.xref.targets.frag"></src:fragref> -<src:fragref linkend="component.label.includes.part.label.frag"></src:fragref> -<src:fragref linkend="contrib.inline.enabled.frag"></src:fragref> -<src:fragref linkend="css.decoration.frag"></src:fragref> -<src:fragref linkend="current.docid.frag"></src:fragref> -<src:fragref linkend="custom.css.source.frag"></src:fragref> -<src:fragref linkend="default.float.class.frag"></src:fragref> -<src:fragref linkend="default.image.width.frag"></src:fragref> -<src:fragref linkend="default.table.frame.frag"></src:fragref> -<src:fragref linkend="default.table.width.frag"></src:fragref> -<src:fragref linkend="docbook.css.link.frag"></src:fragref> -<src:fragref linkend="docbook.css.source.frag"></src:fragref> -<src:fragref linkend="draft.mode.frag"></src:fragref> -<src:fragref linkend="draft.watermark.image.frag"></src:fragref> -<src:fragref linkend="ebnf.assignment.frag"></src:fragref> -<src:fragref linkend="ebnf.statement.terminator.frag"></src:fragref> -<src:fragref linkend="ebnf.table.bgcolor.frag"></src:fragref> -<src:fragref linkend="ebnf.table.border.frag"></src:fragref> -<src:fragref linkend="eclipse.autolabel.frag"></src:fragref> -<src:fragref linkend="eclipse.plugin.id.frag"></src:fragref> -<src:fragref linkend="eclipse.plugin.name.frag"></src:fragref> -<src:fragref linkend="eclipse.plugin.provider.frag"></src:fragref> -<src:fragref linkend="editedby.enabled.frag"></src:fragref> -<src:fragref linkend="email.delimiters.enabled.frag"></src:fragref> -<src:fragref linkend="emphasis.propagates.style.frag"></src:fragref> -<src:fragref linkend="entry.propagates.style.frag"></src:fragref> -<src:fragref linkend="exsl.node.set.available.frag"></src:fragref> -<src:fragref linkend="firstterm.only.link.frag"></src:fragref> -<src:fragref linkend="footer.rule.frag"></src:fragref> -<src:fragref linkend="footnote.number.format.frag"></src:fragref> -<src:fragref linkend="footnote.number.symbols.frag"></src:fragref> -<src:fragref linkend="formal.procedures.frag"></src:fragref> -<src:fragref linkend="formal.title.placement.frag"></src:fragref> -<src:fragref linkend="funcsynopsis.decoration.frag"></src:fragref> -<src:fragref linkend="funcsynopsis.style.frag"></src:fragref> -<src:fragref linkend="function.parens.frag"></src:fragref> -<src:fragref linkend="generate.css.header.frag"></src:fragref> -<src:fragref linkend="generate.id.attributes.frag"></src:fragref> -<src:fragref linkend="generate.index.frag"></src:fragref> -<src:fragref linkend="generate.legalnotice.link.frag"></src:fragref> -<src:fragref linkend="generate.manifest.frag"></src:fragref> -<src:fragref linkend="generate.meta.abstract.frag"></src:fragref> -<src:fragref linkend="generate.revhistory.link.frag"></src:fragref> -<src:fragref linkend="generate.section.toc.level.frag"></src:fragref> -<src:fragref linkend="generate.toc.frag"></src:fragref> -<src:fragref linkend="glossary.collection.frag"></src:fragref> -<src:fragref linkend="glossary.sort.frag"></src:fragref> -<src:fragref linkend="glossentry.show.acronym.frag"></src:fragref> -<src:fragref linkend="glossterm.auto.link.frag"></src:fragref> -<src:fragref linkend="graphic.default.extension.frag"></src:fragref> -<src:fragref linkend="graphicsize.extension.frag"></src:fragref> -<src:fragref linkend="graphicsize.use.img.src.path.frag"></src:fragref> -<src:fragref linkend="header.rule.frag"></src:fragref> -<src:fragref linkend="highlight.default.language.frag"></src:fragref> -<src:fragref linkend="highlight.source.frag"></src:fragref> -<src:fragref linkend="highlight.xslthl.config.frag"></src:fragref> -<src:fragref linkend="html.append.frag"></src:fragref> -<src:fragref linkend="html.base.frag"></src:fragref> -<src:fragref linkend="html.cellpadding.frag"></src:fragref> -<src:fragref linkend="html.cellspacing.frag"></src:fragref> -<src:fragref linkend="html.cleanup.frag"></src:fragref> -<src:fragref linkend="html.ext.frag"></src:fragref> -<src:fragref linkend="html.extra.head.links.frag"></src:fragref> -<src:fragref linkend="html.head.legalnotice.link.multiple.frag"></src:fragref> -<src:fragref linkend="html.head.legalnotice.link.types.frag"></src:fragref> -<src:fragref linkend="html.longdesc.frag"></src:fragref> -<src:fragref linkend="html.longdesc.link.frag"></src:fragref> -<src:fragref linkend="html.stylesheet.frag"></src:fragref> -<src:fragref linkend="html.stylesheet.type.frag"></src:fragref> -<src:fragref linkend="htmlhelp.alias.file.frag"></src:fragref> -<src:fragref linkend="htmlhelp.autolabel.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.back.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.forward.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.hideshow.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.home.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.home.url.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.jump1.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.jump1.title.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.jump1.url.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.jump2.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.jump2.title.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.jump2.url.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.locate.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.next.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.options.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.prev.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.print.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.refresh.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.stop.frag"></src:fragref> -<src:fragref linkend="htmlhelp.button.zoom.frag"></src:fragref> -<src:fragref linkend="htmlhelp.chm.frag"></src:fragref> -<src:fragref linkend="htmlhelp.default.topic.frag"></src:fragref> -<src:fragref linkend="htmlhelp.display.progress.frag"></src:fragref> -<src:fragref linkend="htmlhelp.encoding.frag"></src:fragref> -<src:fragref linkend="htmlhelp.enhanced.decompilation.frag"></src:fragref> -<src:fragref linkend="htmlhelp.enumerate.images.frag"></src:fragref> -<src:fragref linkend="htmlhelp.force.map.and.alias.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhc.binary.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhc.folders.instead.books.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhc.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhc.section.depth.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhc.show.root.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhc.width.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhk.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhp.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhp.tail.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhp.window.frag"></src:fragref> -<src:fragref linkend="htmlhelp.hhp.windows.frag"></src:fragref> -<src:fragref linkend="htmlhelp.map.file.frag"></src:fragref> -<src:fragref linkend="htmlhelp.only.frag"></src:fragref> -<src:fragref linkend="htmlhelp.remember.window.position.frag"></src:fragref> -<src:fragref linkend="htmlhelp.show.advanced.search.frag"></src:fragref> -<src:fragref linkend="htmlhelp.show.favorities.frag"></src:fragref> -<src:fragref linkend="htmlhelp.show.menu.frag"></src:fragref> -<src:fragref linkend="htmlhelp.show.toolbar.text.frag"></src:fragref> -<src:fragref linkend="htmlhelp.title.frag"></src:fragref> -<src:fragref linkend="htmlhelp.use.hhk.frag"></src:fragref> -<src:fragref linkend="htmlhelp.window.geometry.frag"></src:fragref> -<src:fragref linkend="id.warnings.frag"></src:fragref> -<src:fragref linkend="ignore.image.scaling.frag"></src:fragref> -<src:fragref linkend="img.src.path.frag"></src:fragref> -<src:fragref linkend="index.links.to.section.frag"></src:fragref> -<src:fragref linkend="index.method.frag"></src:fragref> -<src:fragref linkend="index.number.separator.frag"></src:fragref> -<src:fragref linkend="index.on.role.frag"></src:fragref> -<src:fragref linkend="index.on.type.frag"></src:fragref> -<src:fragref linkend="index.prefer.titleabbrev.frag"></src:fragref> -<src:fragref linkend="index.range.separator.frag"></src:fragref> -<src:fragref linkend="index.term.separator.frag"></src:fragref> -<src:fragref linkend="inherit.keywords.frag"></src:fragref> -<src:fragref linkend="insert.olink.page.number.frag"></src:fragref> -<src:fragref linkend="insert.olink.pdf.frag.frag"></src:fragref> -<src:fragref linkend="insert.xref.page.number.frag"></src:fragref> -<src:fragref linkend="javahelp.encoding.frag"></src:fragref> -<src:fragref linkend="keep.relative.image.uris.frag"></src:fragref> -<src:fragref linkend="l10n.gentext.default.language.frag"></src:fragref> -<src:fragref linkend="l10n.gentext.language.frag"></src:fragref> -<src:fragref linkend="l10n.gentext.use.xref.language.frag"></src:fragref> -<src:fragref linkend="l10n.lang.value.rfc.compliant.frag"></src:fragref> -<src:fragref linkend="label.from.part.frag"></src:fragref> -<src:fragref linkend="linenumbering.everyNth.frag"></src:fragref> -<src:fragref linkend="linenumbering.extension.frag"></src:fragref> -<src:fragref linkend="linenumbering.separator.frag"></src:fragref> -<src:fragref linkend="linenumbering.width.frag"></src:fragref> -<src:fragref linkend="link.mailto.url.frag"></src:fragref> -<src:fragref linkend="make.clean.html.frag"></src:fragref> -<src:fragref linkend="make.graphic.viewport.frag"></src:fragref> -<src:fragref linkend="make.single.year.ranges.frag"></src:fragref> -<src:fragref linkend="make.valid.html.frag"></src:fragref> -<src:fragref linkend="make.year.ranges.frag"></src:fragref> -<src:fragref linkend="manifest.frag"></src:fragref> -<src:fragref linkend="manifest.in.base.dir.frag"></src:fragref> -<src:fragref linkend="manual.toc.frag"></src:fragref> -<src:fragref linkend="menuchoice.menu.separator.frag"></src:fragref> -<src:fragref linkend="menuchoice.separator.frag"></src:fragref> -<src:fragref linkend="navig.graphics.extension.frag"></src:fragref> -<src:fragref linkend="navig.graphics.frag"></src:fragref> -<src:fragref linkend="navig.graphics.path.frag"></src:fragref> -<src:fragref linkend="navig.showtitles.frag"></src:fragref> -<src:fragref linkend="nominal.image.depth.frag"></src:fragref> -<src:fragref linkend="nominal.image.width.frag"></src:fragref> -<src:fragref linkend="nominal.table.width.frag"></src:fragref> -<src:fragref linkend="olink.base.uri.frag"></src:fragref> -<src:fragref linkend="olink.debug.frag"></src:fragref> -<src:fragref linkend="olink.doctitle.frag"></src:fragref> -<src:fragref linkend="olink.fragid.frag"></src:fragref> -<src:fragref linkend="olink.lang.fallback.sequence.frag"></src:fragref> -<src:fragref linkend="olink.outline.ext.frag"></src:fragref> -<src:fragref linkend="olink.properties.frag"></src:fragref> -<src:fragref linkend="olink.pubid.frag"></src:fragref> -<src:fragref linkend="olink.resolver.frag"></src:fragref> -<src:fragref linkend="olink.sysid.frag"></src:fragref> -<src:fragref linkend="othercredit.like.author.enabled.frag"></src:fragref> -<src:fragref linkend="para.propagates.style.frag"></src:fragref> -<src:fragref linkend="part.autolabel.frag"></src:fragref> -<src:fragref linkend="phrase.propagates.style.frag"></src:fragref> -<src:fragref linkend="pixels.per.inch.frag"></src:fragref> -<src:fragref linkend="points.per.em.frag"></src:fragref> -<src:fragref linkend="preface.autolabel.frag"></src:fragref> -<src:fragref linkend="prefer.internal.olink.frag"></src:fragref> -<src:fragref linkend="preferred.mediaobject.role.frag"></src:fragref> -<src:fragref linkend="process.empty.source.toc.frag"></src:fragref> -<src:fragref linkend="process.source.toc.frag"></src:fragref> -<src:fragref linkend="profile.arch.frag"></src:fragref> -<src:fragref linkend="profile.attribute.frag"></src:fragref> -<src:fragref linkend="profile.audience.frag"></src:fragref> -<src:fragref linkend="profile.condition.frag"></src:fragref> -<src:fragref linkend="profile.conformance.frag"></src:fragref> -<src:fragref linkend="profile.lang.frag"></src:fragref> -<src:fragref linkend="profile.os.frag"></src:fragref> -<src:fragref linkend="profile.revision.frag"></src:fragref> -<src:fragref linkend="profile.revisionflag.frag"></src:fragref> -<src:fragref linkend="profile.role.frag"></src:fragref> -<src:fragref linkend="profile.security.frag"></src:fragref> -<src:fragref linkend="profile.separator.frag"></src:fragref> -<src:fragref linkend="profile.status.frag"></src:fragref> -<src:fragref linkend="profile.userlevel.frag"></src:fragref> -<src:fragref linkend="profile.value.frag"></src:fragref> -<src:fragref linkend="profile.vendor.frag"></src:fragref> -<src:fragref linkend="profile.wordsize.frag"></src:fragref> -<src:fragref linkend="punct.honorific.frag"></src:fragref> -<src:fragref linkend="qanda.defaultlabel.frag"></src:fragref> -<src:fragref linkend="qanda.in.toc.frag"></src:fragref> -<src:fragref linkend="qanda.inherit.numeration.frag"></src:fragref> -<src:fragref linkend="qanda.nested.in.toc.frag"></src:fragref> -<src:fragref linkend="qandadiv.autolabel.frag"></src:fragref> -<src:fragref linkend="refclass.suppress.frag"></src:fragref> -<src:fragref linkend="refentry.generate.name.frag"></src:fragref> -<src:fragref linkend="refentry.generate.title.frag"></src:fragref> -<src:fragref linkend="refentry.separator.frag"></src:fragref> -<src:fragref linkend="refentry.xref.manvolnum.frag"></src:fragref> -<src:fragref linkend="reference.autolabel.frag"></src:fragref> -<src:fragref linkend="root.filename.frag"></src:fragref> -<src:fragref linkend="rootid.frag"></src:fragref> -<src:fragref linkend="runinhead.default.title.end.punct.frag"></src:fragref> -<src:fragref linkend="runinhead.title.end.punct.frag"></src:fragref> -<src:fragref linkend="section.autolabel.frag"></src:fragref> -<src:fragref linkend="section.autolabel.max.depth.frag"></src:fragref> -<src:fragref linkend="section.label.includes.component.label.frag"></src:fragref> -<src:fragref linkend="segmentedlist.as.table.frag"></src:fragref> -<src:fragref linkend="shade.verbatim.frag"></src:fragref> -<src:fragref linkend="shade.verbatim.style.frag"></src:fragref> -<src:fragref linkend="show.comments.frag"></src:fragref> -<src:fragref linkend="show.revisionflag.frag"></src:fragref> -<src:fragref linkend="simplesect.in.toc.frag"></src:fragref> -<src:fragref linkend="spacing.paras.frag"></src:fragref> -<src:fragref linkend="suppress.footer.navigation.frag"></src:fragref> -<src:fragref linkend="suppress.header.navigation.frag"></src:fragref> -<src:fragref linkend="suppress.navigation.frag"></src:fragref> -<src:fragref linkend="table.borders.with.css.frag"></src:fragref> -<src:fragref linkend="table.cell.border.color.frag"></src:fragref> -<src:fragref linkend="table.cell.border.style.frag"></src:fragref> -<src:fragref linkend="table.cell.border.thickness.frag"></src:fragref> -<src:fragref linkend="table.footnote.number.format.frag"></src:fragref> -<src:fragref linkend="table.footnote.number.symbols.frag"></src:fragref> -<src:fragref linkend="table.frame.border.color.frag"></src:fragref> -<src:fragref linkend="table.frame.border.style.frag"></src:fragref> -<src:fragref linkend="table.frame.border.thickness.frag"></src:fragref> -<src:fragref linkend="tablecolumns.extension.frag"></src:fragref> -<src:fragref linkend="target.database.document.frag"></src:fragref> -<src:fragref linkend="targets.filename.frag"></src:fragref> -<src:fragref linkend="tex.math.delims.frag"></src:fragref> -<src:fragref linkend="tex.math.file.frag"></src:fragref> -<src:fragref linkend="tex.math.in.alt.frag"></src:fragref> -<src:fragref linkend="textdata.default.encoding.frag"></src:fragref> -<src:fragref linkend="textinsert.extension.frag"></src:fragref> -<src:fragref linkend="toc.list.type.frag"></src:fragref> -<src:fragref linkend="toc.max.depth.frag"></src:fragref> -<src:fragref linkend="toc.section.depth.frag"></src:fragref> -<src:fragref linkend="ulink.target.frag"></src:fragref> -<src:fragref linkend="use.embed.for.svg.frag"></src:fragref> -<src:fragref linkend="use.extensions.frag"></src:fragref> -<src:fragref linkend="use.id.as.filename.frag"></src:fragref> -<src:fragref linkend="use.local.olink.style.frag"></src:fragref> -<src:fragref linkend="use.role.as.xrefstyle.frag"></src:fragref> -<src:fragref linkend="use.role.for.mediaobject.frag"></src:fragref> -<src:fragref linkend="use.svg.frag"></src:fragref> -<src:fragref linkend="variablelist.as.table.frag"></src:fragref> -<src:fragref linkend="variablelist.term.break.after.frag"></src:fragref> -<src:fragref linkend="variablelist.term.separator.frag"></src:fragref> -<src:fragref linkend="writing.mode.frag"></src:fragref> -<src:fragref linkend="xref.label-page.separator.frag"></src:fragref> -<src:fragref linkend="xref.label-title.separator.frag"></src:fragref> -<src:fragref linkend="xref.title-page.separator.frag"></src:fragref> -<src:fragref linkend="xref.with.number.and.title.frag"></src:fragref> - -</xsl:stylesheet> - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/param.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/param.xsl deleted file mode 100644 index 72541e576a71c6f0cc6a3d37d88503974241873d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/param.xsl +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - - -.png - -images/ - - - - - - -/* ====================================================================== - Annotations -*/ - -div.annotation-list { visibility: hidden; - } - -div.annotation-nocss { position: absolute; - visibility: hidden; - } - -div.annotation-popup { position: absolute; - z-index: 4; - visibility: hidden; - padding: 0px; - margin: 2px; - border-style: solid; - border-width: 1px; - width: 200px; - background-color: white; - } - -div.annotation-title { padding: 1px; - font-weight: bold; - border-bottom-style: solid; - border-bottom-width: 1px; - color: white; - background-color: black; - } - -div.annotation-body { padding: 2px; - } - -div.annotation-body p { margin-top: 0px; - padding-top: 0px; - } - -div.annotation-close { position: absolute; - top: 2px; - right: 2px; - } - - -http://docbook.sourceforge.net/release/images/annot-close.png -http://docbook.sourceforge.net/release/images/annot-open.png - - -http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js - - -A - - -. - -. -http://docbook.sourceforge.net/release/bibliography/bibliography.xml - - -normal - - -60 -.png - - -15 - -images/callouts/ - - -10 -10102 - - - - - - - - - - - -no - -1 - - - - - - left - before - - - -all - - -docbook.css.xml -no -images/draft.png - -::= - - - - -#F5DCB3 - - -com.example.help -DocBook Online Help Sample -Example provider -1 - - - - - - 1 - 0 - - - - -1 - - - -figure before -example before -equation before -table before -procedure before -task before - - -kr - - - - - - - - - - -appendix toc,title -article/appendix nop -article toc,title -book toc,title,figure,table,example,equation -chapter toc,title -part toc,title -preface toc,title -qandadiv toc -qandaset toc -reference toc,title -sect1 toc -sect2 toc -sect3 toc -sect4 toc -sect5 toc -section toc -set toc,title - - - - -no - - - - - - - - - - - - - -.html - - -copyright - - - -text/css -alias.h - - - - - - - -User1 - - -User2 - - - - - - - - - -htmlhelp.chm - - -iso-8859-1 - - - - - -toc.hhc -5 - - -index.hhk -htmlhelp.hhp - -Main - -context.h - - - - - - - - - - - - - -basic - - - - - - - -no - -no -iso-8859-1 - - -en - - - - -5 - - -3 - - - - - - - HTML.manifest - - - - -+ -.gif - -images/ -1 - - -6in - - -no -fragid= - -.olink - - replace - -pubid - /cgi-bin/olink -sysid -0 - -I - -90 -10 - - - - - - - - - - - - - - - - -; - - - - - -. -number - - - - - - - - - - I -index - -. -.!?: - -8 - - - - - 0 - #E0E0E0 - - - - - - -0 - - - - - -solid -0.5pt -a - - - -solid -0.5pt - - olinkdb.xml -target.db - -tex-math-equations.tex - - - -dl -8 -2 -_top - - - - - - - - -0 -, - - - writing-mode - - - - - - - - -: - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/pi.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/pi.xml deleted file mode 100644 index a8f357e58d109121b924706c0acb59803c3793f2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/pi.xml +++ /dev/null @@ -1,1113 +0,0 @@ - - -HTML Processing Instruction Reference - - $Id: pi.xsl 8394 2009-04-02 20:31:30Z mzjn $ - - - - Introduction - -This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for HTML output. - - -You add these PIs at particular points in a document to - cause specific “exceptions†to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - -dbhtml_background-color -Sets background color for an image - - - - dbhtml background-color="color" - - -Description - -Use the dbhtml background-color PI before or - after an image (graphic, inlinegraphic, - imagedata, or videodata element) as a - sibling to the element, to set a background color for the - image. - - Parameters - - - background-color="color" - - -An HTML color value - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Background color - - - - - -dbhtml_bgcolor -Sets background color on a CALS table row or table cell - - - - dbhtml bgcolor="color" - - -Description - -Use the dbhtml bgcolor PI as child of a CALS table row - or cell to set a background color for that table row or cell. - - Parameters - - - bgcolor="color" - - -An HTML color value - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Cell background color - - - - - -dbhtml_cellpadding -Specifies cellpadding in CALS table or qandaset output - - - - dbhtml cellpadding="number" - - -Description - -Use the dbhtml cellpadding PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellpadding attribute in the - output HTML table. - - Parameters - - - cellpadding="number" - - -Specifies the cellpadding - - - - - - Related Global Parameters - -html.cellpadding - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Cell spacing and cell padding, - Q and A formatting - - - - - -dbhtml_cellspacing -Specifies cellspacing in CALS table or qandaset output - - - - dbhtml cellspacing="number" - - -Description - -Use the dbhtml cellspacing PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellspacing attribute in the - output HTML table. - - Parameters - - - cellspacing="number" - - -Specifies the cellspacing - - - - - - Related Global Parameters - -html.cellspacing - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Cell spacing and cell padding, - Q and A formatting - - - - - -dbhtml_class -Set value of the class attribute for a CALS table row - - - - dbhtml class="name" - - -Description - -Use the dbhtml class PI as a child of a - row to specify a class - attribute and value in the HTML output for that row. - - Parameters - - - class="name" - - -Specifies the class name - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Table styles in HTML output - - - - - -dbhtml_dir -Specifies a directory name in which to write files - - - - dbhtml dir="path" - - -Description - -When chunking output, use the dbhtml dir PI - as a child of a chunk source to cause the output of that - chunk to be written to the specified directory; also, use it - as a child of a mediaobject to specify a - directory into which any long-description files for that - mediaobject will be written. - - Parameters - - - dir="path" - - -Specifies the pathname for the directory - - - - - - Related Global Parameters - -base.dir - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -dbhtml dir processing instruction - - - - - -dbhtml_filename -Specifies a filename for a chunk - - - - dbhtml filename="filename" - - -Description - -When chunking output, use the dbhtml filename - PI as a child of a chunk source to specify a filename for - the output file for that chunk. - - Parameters - - - filename="path" - - -Specifies the filename for the file - - - - - - Related Global Parameters - -use.id.as.filename - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -dbhtml filenames - - - - - -dbhtml_funcsynopsis-style -Specifies presentation style for a funcsynopsis - - - - dbhtml funcsynopsis-style="kr"|"ansi" - - -Description - -Use the dbhtml funcsynopsis-style PI as a child of - a funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - Parameters - - - funcsynopsis-style="kr" - - -Displays funcprototype output in K&R style - - - - funcsynopsis-style="ansi" - - -Displays funcprototype output in ANSI style - - - - - - Related Global Parameters - -funcsynopsis.style - - - - - -dbhtml_img.src.path -Specifies a path to the location of an image file - - - - dbhtml img.src.path="path" - - -Description - -Use the dbhtml img.src.path PI before or - after an image (graphic, - inlinegraphic, imagedata, or - videodata element) as a sibling to the element, - to specify a path to the location of the image; in HTML - output, the value specified for the - img.src.path attribute is prepended to the - filename. - - Parameters - - - img.src.path="path" - - -Specifies the pathname to prepend to the name of the image file - - - - - - Related Global Parameters - -img.src.path - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Using fileref - - - - - -dbhtml_label-width -Specifies the label width for a qandaset - - - - dbhtml label-width="width" - - -Description - -Use the dbhtml label-width PI as a child of a - qandaset to specify the width of labels. - - Parameters - - - label-width="width" - - -Specifies the label width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Q and A formatting - - - - - -dbhtml_linenumbering.everyNth -Specifies interval for line numbers in verbatims - - - - dbhtml linenumbering.everyNth="N" - - -Description - -Use the dbhtml linenumbering.everyNth PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the interval at which lines are numbered. - - Parameters - - - linenumbering.everyNth="N" - - -Specifies numbering interval; a number is output - before every Nth line - - - - - - Related Global Parameters - -linenumbering.everyNth - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbhtml_linenumbering.separator -Specifies separator text for line numbers in verbatims - - - - dbhtml linenumbering.separator="text" - - -Description - -Use the dbhtml linenumbering.separator PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the separator text output between the line numbers and content. - - Parameters - - - linenumbering.separator="text" - - -Specifies the text (zero or more characters) - - - - - - Related Global Parameters - -linenumbering.separator - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbhtml_linenumbering.width -Specifies width for line numbers in verbatims - - - - dbhtml linenumbering.width="width" - - -Description - -Use the dbhtml linenumbering.width PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the width set aside for line numbers. - - Parameters - - - linenumbering.width="width" - - -Specifies the width (inluding units) - - - - - - Related Global Parameters - -linenumbering.width - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Line numbering - - - - - -dbhtml_list-presentation -Specifies presentation style for a variablelist or - segmentedlist - - - - dbhtml list-presentation="list"|"table" - - -Description - -Use the dbhtml list-presentation PI as a child of - a variablelist or segmentedlist to - control the presentation style for the list (to cause it, for - example, to be displayed as a table). - - Parameters - - - list-presentation="list" - - -Displays the list as a list - - - - list-presentation="table" - - -Displays the list as a table - - - - - - Related Global Parameters - - - - -variablelist.as.table - - - - -segmentedlist.as.table - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_list-width -Specifies the width of a variablelist or simplelist - - - - dbhtml list-width="width" - - -Description - -Use the dbhtml list-width PI as a child of a - variablelist or a simplelist presented - as a table, to specify the output width. - - Parameters - - - list-width="width" - - -Specifies the output width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_row-height -Specifies the height for a CALS table row - - - - dbhtml row-height="height" - - -Description - -Use the dbhtml row-height PI as a child of a - row to specify the height of the row. - - Parameters - - - row-height="height" - - -Specifies the row height (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Row height - - - - - -dbhtml_start -(obsolete) Sets the starting number on an ordered list - - - - dbhtml start="character" - - -Description - -This PI is obsolete. The intent of - this PI was to provide a means for setting a specific starting - number for an ordered list. Instead of this PI, set a value - for the override attribute on the first - listitem in the list; that will have the same - effect as what this PI was intended for. - - Parameters - - - start="character" - - -Specifies the character to use as the starting - number; use 0-9, a-z, A-Z, or lowercase or uppercase - Roman numerals - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -List starting number - - - - - -dbhtml_stop-chunking -Do not chunk any descendants of this element. - - - - dbhtml stop-chunking - - -Description - -When generating chunked HTML output, adding this PI as the child of an element that contains elements that would normally be generated on separate pages if generating chunked output causes chunking to stop at this point. No descendants of the current element will be split into new HTML pages: -<section> -<title>Configuring pencil</title> -<?dbhtml stop-chunking?> - -... - -</section> - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Chunking into multiple HTML files - - - - - -dbhtml_table-summary -Specifies summary for CALS table, variablelist, segmentedlist, or qandaset output - - - - dbhtml table-summary="text" - - -Description - -Use the dbhtml table-summary PI as a child of - a CALS table, variablelist, - segmentedlist, or qandaset to specify - the text for the HTML summary attribute - in the output HTML table. - - Parameters - - - table-summary="text" - - -Specifies the summary text (zero or more characters) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML, - Table summary text - - - - - -dbhtml_table-width -Specifies the width for a CALS table - - - - dbhtml table-width="width" - - -Description - -Use the dbhtml table-width PI as a child of a - CALS table to specify the width of the table in - output. - - Parameters - - - table-width="width" - - -Specifies the table width (including units or as a percentage) - - - - - - Related Global Parameters - -default.table.width - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Table width - - - - - -dbhtml_term-presentation -Sets character formatting for terms in a variablelist - - - - dbhtml term-presentation="bold"|"italic"|"bold-italic" - - -Description - -Use the dbhtml term-presentation PI as a child - of a variablelist to set character formatting for - the term output of the list. - - Parameters - - - term-presentation="bold" - - -Specifies that terms are displayed in bold - - - - term-presentation="italic" - - -Specifies that terms are displayed in italic - - - - term-presentation="bold-italic" - - -Specifies that terms are displayed in bold-italic - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_term-separator -Specifies separator text among terms in a varlistentry - - - - dbhtml term-separator="text" - - -Description - -Use the dbhtml term-separator PI as a child - of a variablelist to specify the separator text - among term instances. - - Parameters - - - term-separator="text" - - -Specifies the text (zero or more characters) - - - - - - Related Global Parameters - -variablelist.term.separator - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_term-width -Specifies the term width for a variablelist - - - - dbhtml term-width="width" - - -Description - -Use the dbhtml term-width PI as a child of a - variablelist to specify the width for - term output. - - Parameters - - - term-width="width" - - -Specifies the term width (including units) - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Variable list formatting in HTML - - - - - -dbhtml_toc -Specifies whether a TOC should be generated for a qandaset - - - - dbhtml toc="0"|"1" - - -Description - -Use the dbhtml toc PI as a child of a - qandaset to specify whether a table of contents - (TOC) is generated for the qandaset. - - Parameters - - - toc="0" - - -If zero, no TOC is generated - - - - toc="1" - - -If 1 (or any non-zero value), - a TOC is generated - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Q and A list of questions, - Q and A formatting - - - - - -dbcmdlist -Generates a hyperlinked list of commands - - - - dbcmdlist - - -Description - -Use the dbcmdlist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - cmdsynopsis instances; a hyperlinked navigational - “command list†will be generated at the top of output for that - element, enabling users to quickly jump - to each command synopsis. - - Parameters - -[No parameters] - - - - - -dbfunclist -Generates a hyperlinked list of functions - - - - dbfunclist - - -Description - -Use the dbfunclist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - funcsynopsis instances; a hyperlinked - navigational “function list†will be generated at the top of - output for that element, enabling users to quickly - jump to to each function synopsis. - - Parameters - -[No parameters] - - - - - -dbhtml-include_href -Copies an external well-formed HTML/XML file into current doc - - - - dbhtml-include href="URI" - - -Description - -Use the dbhtml-include href PI anywhere in a - document to cause the contents of the file referenced by the - href pseudo-attribute to be copied/inserted “as - is†into your HTML output at the point in document order - where the PI occurs in the source. - - - -The referenced file may contain plain text (as long as - it is “wrapped†in an html element — see the - note below) or markup in any arbitrary vocabulary, - including HTML — but it must conform to XML - well-formedness constraints (because the feature in XSLT - 1.0 for opening external files, the - document() function, can only handle - files that meet XML well-formedness constraints). - - -Among other things, XML well-formedness constraints - require a document to have a single root - element. So if the content you want to - include is plain text or is markup that does - not have a single root element, - wrap the content in an - html element. The stylesheets will - strip out that surrounding html “wrapper†when - they find it, leaving just the content you want to - insert. - - - Parameters - - - href="URI" - - -Specifies the URI for the file to include; the URI - can be, for example, a remote http: - URI, or a local filesystem file: - URI - - - - - - Related Global Parameters - -textinsert.extension - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Inserting external HTML code, - External code files - - - - - -dbhh -Sets topic name and topic id for context-sensitive HTML Help - - - - dbhh topicname="name" topicid="id" - - -Description - -Use the dbhh PI as a child of components - that should be used as targets for context-sensitive help requests. - - Parameters - - - topicname="name" - - -Specifies a unique string constant that identifies a help topic - - - - topicid="id" - - -Specifies a unique integer value for the topicname string - - - - - - Related Information in <link xlink:href="http://www.sagehill.net/docbookxsl/">DocBook XSL: The Complete Guide</link> - -Context-sensitive help - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/pi.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/pi.xsl deleted file mode 100644 index 83df3b292918ec5e1096cf64f5c62428d276ecce..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/pi.xsl +++ /dev/null @@ -1,1264 +0,0 @@ - - - - - -HTML Processing Instruction Reference - - $Id: pi.xsl 8394 2009-04-02 20:31:30Z mzjn $ - - - - Introduction - This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for HTML output. - - You add these PIs at particular points in a document to - cause specific “exceptions†to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - - Sets background color for an image - - Use the dbhtml background-color PI before or - after an image (graphic, inlinegraphic, - imagedata, or videodata element) as a - sibling to the element, to set a background color for the - image. - - - dbhtml background-color="color" - - - - background-color="color" - - An HTML color value - - - - - - Background color - - - - - - - - - - - - Sets background color on a CALS table row or table cell - - Use the dbhtml bgcolor PI as child of a CALS table row - or cell to set a background color for that table row or cell. - - - dbhtml bgcolor="color" - - - - bgcolor="color" - - An HTML color value - - - - - - Cell background color - - - - - - - - - - - - Specifies cellpadding in CALS table or qandaset output - - Use the dbhtml cellpadding PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellpadding attribute in the - output HTML table. - - - dbhtml cellpadding="number" - - - - cellpadding="number" - - Specifies the cellpadding - - - - - - html.cellpadding - - - Cell spacing and cell padding, - Q and A formatting - - - - - - - - - - - - Specifies cellspacing in CALS table or qandaset output - - Use the dbhtml cellspacing PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellspacing attribute in the - output HTML table. - - - dbhtml cellspacing="number" - - - - cellspacing="number" - - Specifies the cellspacing - - - - - - html.cellspacing - - - Cell spacing and cell padding, - Q and A formatting - - - - - - - - - - - - Set value of the class attribute for a CALS table row - - Use the dbhtml class PI as a child of a - row to specify a class - attribute and value in the HTML output for that row. - - - dbhtml class="name" - - - - class="name" - - Specifies the class name - - - - - - Table styles in HTML output - - - - - - - - - - - - Specifies a directory name in which to write files - - When chunking output, use the dbhtml dir PI - as a child of a chunk source to cause the output of that - chunk to be written to the specified directory; also, use it - as a child of a mediaobject to specify a - directory into which any long-description files for that - mediaobject will be written. - - - dbhtml dir="path" - - - - dir="path" - - Specifies the pathname for the directory - - - - - - base.dir - - - dbhtml dir processing instruction - - - - - - - - - - - - Specifies a filename for a chunk - - When chunking output, use the dbhtml filename - PI as a child of a chunk source to specify a filename for - the output file for that chunk. - - - dbhtml filename="filename" - - - - filename="path" - - Specifies the filename for the file - - - - - - use.id.as.filename - - - dbhtml filenames - - - - - - - - - - - - Specifies presentation style for a funcsynopsis - - Use the dbhtml funcsynopsis-style PI as a child of - a funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - - dbhtml funcsynopsis-style="kr"|"ansi" - - - - funcsynopsis-style="kr" - - Displays funcprototype output in K&R style - - - funcsynopsis-style="ansi" - - Displays funcprototype output in ANSI style - - - - - - funcsynopsis.style - - - - - - - - - - - - Specifies a path to the location of an image file - - Use the dbhtml img.src.path PI before or - after an image (graphic, - inlinegraphic, imagedata, or - videodata element) as a sibling to the element, - to specify a path to the location of the image; in HTML - output, the value specified for the - img.src.path attribute is prepended to the - filename. - - - dbhtml img.src.path="path" - - - - img.src.path="path" - - Specifies the pathname to prepend to the name of the image file - - - - - - img.src.path - - - Using fileref - - - - - - - - - - - - Specifies the label width for a qandaset - - Use the dbhtml label-width PI as a child of a - qandaset to specify the width of labels. - - - dbhtml label-width="width" - - - - label-width="width" - - Specifies the label width (including units) - - - - - - Q and A formatting - - - - - - - - - - - - Specifies interval for line numbers in verbatims - - Use the dbhtml linenumbering.everyNth PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the interval at which lines are numbered. - - - dbhtml linenumbering.everyNth="N" - - - - linenumbering.everyNth="N" - - Specifies numbering interval; a number is output - before every Nth line - - - - - - linenumbering.everyNth - - - Line numbering - - - - - - - - - - - - Specifies separator text for line numbers in verbatims - - Use the dbhtml linenumbering.separator PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the separator text output between the line numbers and content. - - - dbhtml linenumbering.separator="text" - - - - linenumbering.separator="text" - - Specifies the text (zero or more characters) - - - - - - linenumbering.separator - - - Line numbering - - - - - - - - - - - - Specifies width for line numbers in verbatims - - Use the dbhtml linenumbering.width PI as a child - of a “verbatim†element – programlisting, - screen, synopsis — to specify - the width set aside for line numbers. - - - dbhtml linenumbering.width="width" - - - - linenumbering.width="width" - - Specifies the width (inluding units) - - - - - - linenumbering.width - - - Line numbering - - - - - - - - - - - - Specifies presentation style for a variablelist or - segmentedlist - - Use the dbhtml list-presentation PI as a child of - a variablelist or segmentedlist to - control the presentation style for the list (to cause it, for - example, to be displayed as a table). - - - dbhtml list-presentation="list"|"table" - - - - list-presentation="list" - - Displays the list as a list - - - list-presentation="table" - - Displays the list as a table - - - - - - - - variablelist.as.table - - - segmentedlist.as.table - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies the width of a variablelist or simplelist - - Use the dbhtml list-width PI as a child of a - variablelist or a simplelist presented - as a table, to specify the output width. - - - dbhtml list-width="width" - - - - list-width="width" - - Specifies the output width (including units) - - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies the height for a CALS table row - - Use the dbhtml row-height PI as a child of a - row to specify the height of the row. - - - dbhtml row-height="height" - - - - row-height="height" - - Specifies the row height (including units) - - - - - - Row height - - - - - - - - - - - - (obsolete) Sets the starting number on an ordered list - - This PI is obsolete. The intent of - this PI was to provide a means for setting a specific starting - number for an ordered list. Instead of this PI, set a value - for the override attribute on the first - listitem in the list; that will have the same - effect as what this PI was intended for. - - - dbhtml start="character" - - - - start="character" - - Specifies the character to use as the starting - number; use 0-9, a-z, A-Z, or lowercase or uppercase - Roman numerals - - - - - - List starting number - - - - - - - - - - - - Do not chunk any descendants of this element. - - When generating chunked HTML output, adding this PI as the child of an element that contains elements that would normally be generated on separate pages if generating chunked output causes chunking to stop at this point. No descendants of the current element will be split into new HTML pages: - -Configuring pencil - - -... - -]]> - - - - dbhtml stop-chunking - - - Chunking into multiple HTML files - - - - - - Specifies summary for CALS table, variablelist, segmentedlist, or qandaset output - - Use the dbhtml table-summary PI as a child of - a CALS table, variablelist, - segmentedlist, or qandaset to specify - the text for the HTML summary attribute - in the output HTML table. - - - dbhtml table-summary="text" - - - - table-summary="text" - - Specifies the summary text (zero or more characters) - - - - - - Variable list formatting in HTML, - Table summary text - - - - - - - - - - - - Specifies the width for a CALS table - - Use the dbhtml table-width PI as a child of a - CALS table to specify the width of the table in - output. - - - dbhtml table-width="width" - - - - table-width="width" - - Specifies the table width (including units or as a percentage) - - - - - - default.table.width - - - Table width - - - - - - - - - - - - Sets character formatting for terms in a variablelist - - Use the dbhtml term-presentation PI as a child - of a variablelist to set character formatting for - the term output of the list. - - - dbhtml term-presentation="bold"|"italic"|"bold-italic" - - - - term-presentation="bold" - - Specifies that terms are displayed in bold - - - term-presentation="italic" - - Specifies that terms are displayed in italic - - - term-presentation="bold-italic" - - Specifies that terms are displayed in bold-italic - - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies separator text among terms in a varlistentry - - Use the dbhtml term-separator PI as a child - of a variablelist to specify the separator text - among term instances. - - - dbhtml term-separator="text" - - - - term-separator="text" - - Specifies the text (zero or more characters) - - - - - - variablelist.term.separator - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies the term width for a variablelist - - Use the dbhtml term-width PI as a child of a - variablelist to specify the width for - term output. - - - dbhtml term-width="width" - - - - term-width="width" - - Specifies the term width (including units) - - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies whether a TOC should be generated for a qandaset - - Use the dbhtml toc PI as a child of a - qandaset to specify whether a table of contents - (TOC) is generated for the qandaset. - - - dbhtml toc="0"|"1" - - - - toc="0" - - If zero, no TOC is generated - - - toc="1" - - If 1 (or any non-zero value), - a TOC is generated - - - - - - Q and A list of questions, - Q and A formatting - - - - - - - - - - - - Generates a hyperlinked list of commands - - Use the dbcmdlist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - cmdsynopsis instances; a hyperlinked navigational - “command list†will be generated at the top of output for that - element, enabling users to quickly jump - to each command synopsis. - - - dbcmdlist - - - [No parameters] - - - - - - No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep? - - -
    - - - -
    -
    - - - Generates a hyperlinked list of functions - - Use the dbfunclist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - funcsynopsis instances; a hyperlinked - navigational “function list†will be generated at the top of - output for that element, enabling users to quickly - jump to to each function synopsis. - - - dbfunclist - - - [No parameters] - - - - - - No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep? - - -
    - - - -
    -
    - - - Copies an external well-formed HTML/XML file into current doc - - Use the dbhtml-include href PI anywhere in a - document to cause the contents of the file referenced by the - href pseudo-attribute to be copied/inserted “as - is†into your HTML output at the point in document order - where the PI occurs in the source. - - The referenced file may contain plain text (as long as - it is “wrapped†in an html element — see the - note below) or markup in any arbitrary vocabulary, - including HTML — but it must conform to XML - well-formedness constraints (because the feature in XSLT - 1.0 for opening external files, the - document() function, can only handle - files that meet XML well-formedness constraints). - Among other things, XML well-formedness constraints - require a document to have a single root - element. So if the content you want to - include is plain text or is markup that does - not have a single root element, - wrap the content in an - html element. The stylesheets will - strip out that surrounding html “wrapper†when - they find it, leaving just the content you want to - insert. - - - - dbhtml-include href="URI" - - - - href="URI" - - Specifies the URI for the file to include; the URI - can be, for example, a remote http: - URI, or a local filesystem file: - URI - - - - - - textinsert.extension - - - Inserting external HTML code, - External code files - - - - - - - href - - - - - - - - - - - - - - - - - - - - ERROR: dbhtml-include processing instruction - href has no content. - - - - - - - ERROR: dbhtml-include processing instruction has - missing or empty href value. - - - - - - - - Sets topic name and topic id for context-sensitive HTML Help - - Use the dbhh PI as a child of components - that should be used as targets for context-sensitive help requests. - - - dbhh topicname="name" topicid="id" - - - - topicname="name" - - Specifies a unique string constant that identifies a help topic - - - topicid="id" - - Specifies a unique integer value for the topicname string - - - - - - Context-sensitive help - - - - - - - - - - filename - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - # - - - - - - - - - - - - - - - - - - -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - -
    - - - # - - - - - - - - - - - - - - - - - - -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - - / - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-chunk-code.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-chunk-code.xsl deleted file mode 100644 index 7b3331a98b12e12232821467bfc2e399eb0cd580..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-chunk-code.xsl +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bk - - - - - - - - - - - - - - - ar - - - - - - - - - - - - - - - pr - - - - - - - - - - - - - - - ch - - - - - - - - - - - - - - - ap - - - - - - - - - - - - - - - - - - - pt - - - - - - - - - - - - - - - - - - - rn - - - - - - - - - - - - - - - - - - - - - - - - re - - - - - - - - - - - - - - - - - - - co - - - - - - - - - - - s - - - - - - - - - - - - - - - - - - - bi - - - - - - - - - - - - - - - - - - - go - - - - - - - - - - - - - - - - - - - ix - - - - - - - - si - - - - - - - - chunk-filename-error- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-chunk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-chunk.xsl deleted file mode 100644 index b83c995f7b69ad7c8a92e59c716e1e9fdb1b2061..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-chunk.xsl +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-docbook.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-docbook.xsl deleted file mode 100644 index 4afde6c60258209ab54a8d711fa01025681e56b4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-docbook.xsl +++ /dev/null @@ -1,412 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Element - - in namespace ' - - ' encountered - - in - - - , but no template matches. - - - - < - - > - - </ - - > - - - - - - - - - white - black - #0000FF - #840084 - #0000FF - - rtl - - - - - - - - - - - <xsl:copy-of select="$title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-onechunk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-onechunk.xsl deleted file mode 100644 index 122d64692d93c9315869fe79ac48f2097270a19c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/profile-onechunk.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - -1 - - - - # - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/qandaset.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/qandaset.xsl deleted file mode 100644 index 76cf2e6543e26ec5dd4e19a86a66fcadfced074c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/qandaset.xsl +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - -
    -
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - -
    - - - -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1% - - - - - - - - -
    -
    - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/refentry.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/refentry.xsl deleted file mode 100644 index a3b3494559b46863235cf927c05ed71b16a48e79..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/refentry.xsl +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - -
    - - - - -
    -
    -
    -
    - - - - - - -
    -
    - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - -
    - - - - - - - - - - -

    - - - -

    -
    - -

    - - - - - - - - -

    -
    -
    - -

    - -

    -
    -
    - - - - - - , - - - - - - - - - em-dash - - - - - - - - - - - - - - - - : - - - - - - - -
    - - - - -

    - - - - - - - - - - -

    - -
    -
    - - - - - - - - - - - -
    - - - - - - - - - -
    -
    - - - - - - 0 - 1 - - - - 6 - - - - - - - - - - - - -

    - -

    -
    - - - -

    - -

    -
    - - - -

    - -

    -
    - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/sections.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/sections.xsl deleted file mode 100644 index 33c66f18a87fe93fed26e22230eaf156253364a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/sections.xsl +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - 1 - 2 - 3 - 4 - 5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - - - - - - - - - - clear: both - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - 1 - - - - - - - 2 - 3 - 4 - 5 - 6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/synop.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/synop.xsl deleted file mode 100644 index 221765b08e69dbd8398d3edad55a7bd323871fa2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/synop.xsl +++ /dev/null @@ -1,1556 +0,0 @@ - - -]> - - - - - - - - - - - -
    - -

    - - - - - - - - - - - - -

    -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - ( - - ) - -   - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - -
    -    
    -    
    -  
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - -
    - -
    -

    -
    - - - - - - ( - - - - - - - - - - - - - - - - ) - ; - - - - ... - ) - ; - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - -
    - - - - ; -
    - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - -
    - -
     
    - -
    - -
    -
    -
     
    -
    - - - - - - ( - - - - - - - - - - - - - - - - - ) - ; - -   - - - - - ... - ) - ; - -   - - - - - - - - , - - - ) - ; - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - ; - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - ; - - - - - - -

    - -

    -
    - - - - - - ( - - - - - - - - - - - - - - - - void) - ; - - - - ... - ) - ; - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - -
    - -
     
    -
     
    -
    - - - - - - ( - - - - - - - - - - - - - - - - - void) - ; - -   - - - - - ... - ) - ; - -   - - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - -java - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unrecognized language on - - : - - - - - - - - - - - -
    -
    -
    - - - - - -
    -    
    -    
    -    
    -       extends
    -      
    -      
    -        
    -      -
    -
    - - implements - - -
    -      -
    -
    - - throws - - -  { -
    - - } -
    -
    - - - - - - - - - , - - - - - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - 0 - - , -
    - - -   - - - -
    - - - - -
    - - - - - - - - - - - - - - -    - - - - - - - - - - - - - - - ( - - - - ) - -
    -     throws  - -
    - - - - - ; -
    - -
    - - - - -
    -    
    -    
    -    
    -      : 
    -      
    -      
    -        
    -      -
    -
    - - implements - - -
    -      -
    -
    - - throws - - -  { -
    - - } -
    -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - -    - - - - - - - - - - ( - - ) - -
    -     throws  - -
    - - - - - ; -
    - -
    - - - - -
    -    
    -    interface 
    -    
    -    
    -      : 
    -      
    -      
    -        
    -      -
    -
    - - implements - - -
    -      -
    -
    - - throws - - -  { -
    - - } -
    -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - -    - - - - - - - - - - ( - - ) - -
    -     raises( - - ) -
    - - - - - ; -
    - -
    - - - - -
    -    
    -    package 
    -    
    -    ;
    -    
    - - - @ISA = ( - - ); -
    -
    - - -
    -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - sub - - - { ... }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/table.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/table.xsl deleted file mode 100644 index 8317a937a2ffbbd63f2845220ec043615996d3f6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/table.xsl +++ /dev/null @@ -1,1201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - border- - - : - - - - - - ; - - - - - border- - - -width: - - ; - - - - border- - - -style: - - ; - - - - border- - - -color: - - ; - - - - - - - - - - - Error: CALS tables must specify the number of columns. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100% - - - - - - - - border-collapse: collapse; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - - - - - - - border: none; - - - - - border-collapse: collapse; - - - - - - - 0 - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - 100% - - - - - - - - - - - - - - - - - - - - - - - - No convertLength function available. - - - - - - - - - - - - - - - - - - - - - - - - - - No adjustColumnWidths function available. - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: overlapped row contains content! - - - This row intentionally left blank - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - th - th - - th - - td - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - : - - - - - - - - 0: - - - - - - - - - - - - - - - 0 - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/task.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/task.xsl deleted file mode 100644 index c7cf229bfaf4fe134537d2137888d428a75bad2b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/task.xsl +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - before - - - - - - - - -
    - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/titlepage.templates.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/titlepage.templates.xml deleted file mode 100644 index cae516026cf28c04f85af7caf37a46aef9072626..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/titlepage.templates.xml +++ /dev/null @@ -1,708 +0,0 @@ - - - - - - - - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <hr/> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="set" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <hr/> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="book" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <hr/> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="part" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="division.title" - param:node="ancestor-or-self::part[1]"/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="partintro" t:wrapper="div"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="reference" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <hr/> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="refentry" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> -<!-- uncomment this if you want refentry titlepages - <title t:force="1" - t:named-template="refentry.title" - param:node="ancestor-or-self::refentry[1]"/> ---> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator/> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - - <t:titlepage t:element="dedication" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::dedication[1]"/> - <subtitle/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="acknowledgements" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::acknowledgements[1]"/> - <subtitle/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="preface" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="chapter" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="appendix" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="section" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect1" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect2" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect3" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect4" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="sect5" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<t:titlepage t:element="simplesect" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title/> - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <xsl:if test="count(parent::*)='0'"><hr/></xsl:if> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="bibliography" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::bibliography[1]"/> - <subtitle/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="glossary" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::glossary[1]"/> - <subtitle/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="index" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::index[1]"/> - <subtitle/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -<t:titlepage t:element="setindex" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title - t:force="1" - t:named-template="component.title" - param:node="ancestor-or-self::setindex[1]"/> - <subtitle/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> -<t:titlepage t:element="sidebar" t:wrapper="div" class="titlepage"> - <t:titlepage-content t:side="recto"> - <title - t:named-template="formal.object.heading" - param:object="ancestor-or-self::sidebar[1]"/> - <subtitle/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -</t:templates> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/titlepage.templates.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/titlepage.templates.xsl deleted file mode 100644 index c5937342a6f0560e4b4b6c0bc9d32635ff844c1b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/titlepage.templates.xsl +++ /dev/null @@ -1,3818 +0,0 @@ -<?xml version="1.0"?> - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://docbook.org/ns/docbook" -xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl d"> - -<!-- This stylesheet was created by template/titlepage.xsl--> - -<xsl:template name="article.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:articleinfo/d:title"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:title"/> - </xsl:when> - <xsl:when test="d:artheader/d:title"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:articleinfo/d:subtitle"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:artheader/d:subtitle"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:corpauthor"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:corpauthor"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:authorgroup"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:authorgroup"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:author"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:author"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:othercredit"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:othercredit"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:releaseinfo"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:releaseinfo"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:copyright"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:copyright"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:legalnotice"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:legalnotice"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:pubdate"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:pubdate"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:revision"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:revision"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:revhistory"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:revhistory"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:articleinfo/d:abstract"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:artheader/d:abstract"/> - <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="article.titlepage.verso"> -</xsl:template> - -<xsl:template name="article.titlepage.separator"><hr/> -</xsl:template> - -<xsl:template name="article.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="article.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="article.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="article.titlepage.before.recto"/> - <xsl:call-template name="article.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="article.titlepage.before.verso"/> - <xsl:call-template name="article.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="article.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="article.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="article.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="article.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="article.titlepage.recto.style"> -<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="set.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:setinfo/d:title"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:setinfo/d:subtitle"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:corpauthor"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:authorgroup"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:author"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:othercredit"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:releaseinfo"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:copyright"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:legalnotice"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:pubdate"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:revision"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:revhistory"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:setinfo/d:abstract"/> - <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="set.titlepage.verso"> -</xsl:template> - -<xsl:template name="set.titlepage.separator"><hr/> -</xsl:template> - -<xsl:template name="set.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="set.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="set.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="set.titlepage.before.recto"/> - <xsl:call-template name="set.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="set.titlepage.before.verso"/> - <xsl:call-template name="set.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="set.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="set.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="set.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="set.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="set.titlepage.recto.style"> -<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="book.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:bookinfo/d:title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:bookinfo/d:subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:othercredit"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:copyright"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:legalnotice"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:pubdate"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:revision"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:revhistory"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:bookinfo/d:abstract"/> - <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="book.titlepage.verso"> -</xsl:template> - -<xsl:template name="book.titlepage.separator"><hr/> -</xsl:template> - -<xsl:template name="book.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="book.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="book.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="book.titlepage.before.recto"/> - <xsl:call-template name="book.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="book.titlepage.before.verso"/> - <xsl:call-template name="book.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="book.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="book.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="book.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="book.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="book.titlepage.recto.style"> -<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="part.titlepage.recto"> - <div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:call-template name="division.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:part[1]"/> -</xsl:call-template></div> - <xsl:choose> - <xsl:when test="d:partinfo/d:subtitle"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:corpauthor"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:authorgroup"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:author"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:othercredit"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:releaseinfo"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:copyright"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:legalnotice"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:pubdate"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:revision"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:revhistory"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:partinfo/d:abstract"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="part.titlepage.verso"> -</xsl:template> - -<xsl:template name="part.titlepage.separator"> -</xsl:template> - -<xsl:template name="part.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="part.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="part.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="part.titlepage.before.recto"/> - <xsl:call-template name="part.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="part.titlepage.before.verso"/> - <xsl:call-template name="part.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="part.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="part.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="part.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="part.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="part.titlepage.recto.style"> -<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="partintro.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:partintroinfo/d:title"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:partintroinfo/d:subtitle"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:corpauthor"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:authorgroup"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:author"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:othercredit"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:releaseinfo"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:copyright"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:legalnotice"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:pubdate"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:revision"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:revhistory"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:partintroinfo/d:abstract"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="partintro.titlepage.verso"> -</xsl:template> - -<xsl:template name="partintro.titlepage.separator"> -</xsl:template> - -<xsl:template name="partintro.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="partintro.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="partintro.titlepage"> - <div> - <xsl:variable name="recto.content"> - <xsl:call-template name="partintro.titlepage.before.recto"/> - <xsl:call-template name="partintro.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="partintro.titlepage.before.verso"/> - <xsl:call-template name="partintro.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="partintro.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="partintro.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="partintro.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="partintro.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="partintro.titlepage.recto.style"> -<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="reference.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:referenceinfo/d:title"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:referenceinfo/d:subtitle"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:corpauthor"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:authorgroup"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:author"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:othercredit"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:releaseinfo"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:copyright"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:legalnotice"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:pubdate"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:revision"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:revhistory"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:referenceinfo/d:abstract"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="reference.titlepage.verso"> -</xsl:template> - -<xsl:template name="reference.titlepage.separator"><hr/> -</xsl:template> - -<xsl:template name="reference.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="reference.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="reference.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="reference.titlepage.before.recto"/> - <xsl:call-template name="reference.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="reference.titlepage.before.verso"/> - <xsl:call-template name="reference.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="reference.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="reference.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="reference.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="reference.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="reference.titlepage.recto.style"> -<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="refentry.titlepage.recto"> -</xsl:template> - -<xsl:template name="refentry.titlepage.verso"> -</xsl:template> - -<xsl:template name="refentry.titlepage.separator"> -</xsl:template> - -<xsl:template name="refentry.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="refentry.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="refentry.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="refentry.titlepage.before.recto"/> - <xsl:call-template name="refentry.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="refentry.titlepage.before.verso"/> - <xsl:call-template name="refentry.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="refentry.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="refentry.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="refentry.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template name="dedication.titlepage.recto"> - <div xsl:use-attribute-sets="dedication.titlepage.recto.style"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:dedication[1]"/> -</xsl:call-template></div> - <xsl:choose> - <xsl:when test="d:dedicationinfo/d:subtitle"> - <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="d:dedicationinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="dedication.titlepage.verso"> -</xsl:template> - -<xsl:template name="dedication.titlepage.separator"> -</xsl:template> - -<xsl:template name="dedication.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="dedication.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="dedication.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="dedication.titlepage.before.recto"/> - <xsl:call-template name="dedication.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="dedication.titlepage.before.verso"/> - <xsl:call-template name="dedication.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="dedication.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="dedication.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="dedication.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="dedication.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="dedication.titlepage.recto.style"> -<xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.recto"> - <div xsl:use-attribute-sets="acknowledgements.titlepage.recto.style"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:acknowledgements[1]"/> -</xsl:call-template></div> - <xsl:choose> - <xsl:when test="d:acknowledgementsinfo/d:subtitle"> - <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="d:acknowledgementsinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="acknowledgements.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.verso"> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.separator"> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="acknowledgements.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="acknowledgements.titlepage.before.recto"/> - <xsl:call-template name="acknowledgements.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="acknowledgements.titlepage.before.verso"/> - <xsl:call-template name="acknowledgements.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="acknowledgements.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="acknowledgements.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="acknowledgements.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="acknowledgements.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="acknowledgements.titlepage.recto.style"> -<xsl:apply-templates select="." mode="acknowledgements.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="preface.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:prefaceinfo/d:title"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:prefaceinfo/d:subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:corpauthor"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:authorgroup"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:author"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:othercredit"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:releaseinfo"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:copyright"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:legalnotice"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:pubdate"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:revision"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:revhistory"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:prefaceinfo/d:abstract"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="preface.titlepage.verso"> -</xsl:template> - -<xsl:template name="preface.titlepage.separator"> -</xsl:template> - -<xsl:template name="preface.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="preface.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="preface.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="preface.titlepage.before.recto"/> - <xsl:call-template name="preface.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="preface.titlepage.before.verso"/> - <xsl:call-template name="preface.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="preface.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="preface.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="preface.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="preface.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="preface.titlepage.recto.style"> -<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="chapter.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:chapterinfo/d:title"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:chapterinfo/d:subtitle"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:corpauthor"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:authorgroup"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:author"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:othercredit"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:releaseinfo"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:copyright"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:legalnotice"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:pubdate"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:revision"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:revhistory"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:chapterinfo/d:abstract"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="chapter.titlepage.verso"> -</xsl:template> - -<xsl:template name="chapter.titlepage.separator"> -</xsl:template> - -<xsl:template name="chapter.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="chapter.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="chapter.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="chapter.titlepage.before.recto"/> - <xsl:call-template name="chapter.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="chapter.titlepage.before.verso"/> - <xsl:call-template name="chapter.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="chapter.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="chapter.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="chapter.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="chapter.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="chapter.titlepage.recto.style"> -<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="appendix.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:appendixinfo/d:title"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:appendixinfo/d:subtitle"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:corpauthor"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:authorgroup"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:author"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:othercredit"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:releaseinfo"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:copyright"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:legalnotice"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:pubdate"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:revision"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:revhistory"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:appendixinfo/d:abstract"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="appendix.titlepage.verso"> -</xsl:template> - -<xsl:template name="appendix.titlepage.separator"> -</xsl:template> - -<xsl:template name="appendix.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="appendix.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="appendix.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="appendix.titlepage.before.recto"/> - <xsl:call-template name="appendix.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="appendix.titlepage.before.verso"/> - <xsl:call-template name="appendix.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="appendix.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="appendix.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="appendix.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="appendix.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="appendix.titlepage.recto.style"> -<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="section.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sectioninfo/d:title"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sectioninfo/d:subtitle"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:corpauthor"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:authorgroup"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:author"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:othercredit"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:releaseinfo"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:copyright"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:legalnotice"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:pubdate"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:revision"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:revhistory"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:sectioninfo/d:abstract"/> - <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="section.titlepage.verso"> -</xsl:template> - -<xsl:template name="section.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if> -</xsl:template> - -<xsl:template name="section.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="section.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="section.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="section.titlepage.before.recto"/> - <xsl:call-template name="section.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="section.titlepage.before.verso"/> - <xsl:call-template name="section.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="section.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="section.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="section.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="section.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="section.titlepage.recto.style"> -<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="sect1.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect1info/d:title"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect1info/d:subtitle"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:corpauthor"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:authorgroup"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:author"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:othercredit"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:releaseinfo"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:copyright"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:legalnotice"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:pubdate"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:revision"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:revhistory"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:sect1info/d:abstract"/> - <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect1.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect1.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if> -</xsl:template> - -<xsl:template name="sect1.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect1.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect1.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect1.titlepage.before.recto"/> - <xsl:call-template name="sect1.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect1.titlepage.before.verso"/> - <xsl:call-template name="sect1.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="sect1.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="sect1.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect1.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect1.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect1.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="sect2.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect2info/d:title"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect2info/d:subtitle"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:corpauthor"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:authorgroup"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:author"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:othercredit"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:releaseinfo"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:copyright"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:legalnotice"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:pubdate"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:revision"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:revhistory"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:sect2info/d:abstract"/> - <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect2.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect2.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if> -</xsl:template> - -<xsl:template name="sect2.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect2.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect2.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect2.titlepage.before.recto"/> - <xsl:call-template name="sect2.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect2.titlepage.before.verso"/> - <xsl:call-template name="sect2.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="sect2.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="sect2.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect2.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect2.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect2.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="sect3.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect3info/d:title"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect3info/d:subtitle"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:corpauthor"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:authorgroup"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:author"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:othercredit"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:releaseinfo"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:copyright"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:legalnotice"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:pubdate"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:revision"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:revhistory"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:sect3info/d:abstract"/> - <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect3.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect3.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if> -</xsl:template> - -<xsl:template name="sect3.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect3.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect3.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect3.titlepage.before.recto"/> - <xsl:call-template name="sect3.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect3.titlepage.before.verso"/> - <xsl:call-template name="sect3.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="sect3.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="sect3.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect3.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect3.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect3.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="sect4.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect4info/d:title"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect4info/d:subtitle"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:corpauthor"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:authorgroup"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:author"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:othercredit"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:releaseinfo"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:copyright"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:legalnotice"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:pubdate"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:revision"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:revhistory"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:sect4info/d:abstract"/> - <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect4.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect4.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if> -</xsl:template> - -<xsl:template name="sect4.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect4.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect4.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect4.titlepage.before.recto"/> - <xsl:call-template name="sect4.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect4.titlepage.before.verso"/> - <xsl:call-template name="sect4.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="sect4.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="sect4.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect4.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect4.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect4.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="sect5.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sect5info/d:title"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sect5info/d:subtitle"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:corpauthor"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:authorgroup"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:author"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:othercredit"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:releaseinfo"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:copyright"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:legalnotice"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:pubdate"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:revision"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:revhistory"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:sect5info/d:abstract"/> - <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="sect5.titlepage.verso"> -</xsl:template> - -<xsl:template name="sect5.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if> -</xsl:template> - -<xsl:template name="sect5.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sect5.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sect5.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sect5.titlepage.before.recto"/> - <xsl:call-template name="sect5.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sect5.titlepage.before.verso"/> - <xsl:call-template name="sect5.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="sect5.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="sect5.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sect5.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="sect5.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sect5.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="simplesect.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:simplesectinfo/d:title"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:simplesectinfo/d:subtitle"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:corpauthor"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:corpauthor"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:corpauthor"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:authorgroup"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:authorgroup"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:authorgroup"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:author"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:author"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:author"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:othercredit"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:othercredit"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:othercredit"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:releaseinfo"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:releaseinfo"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:releaseinfo"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:copyright"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:copyright"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:copyright"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:legalnotice"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:legalnotice"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:legalnotice"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:pubdate"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:pubdate"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:pubdate"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:revision"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:revision"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:revision"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:revhistory"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:revhistory"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:revhistory"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:simplesectinfo/d:abstract"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:docinfo/d:abstract"/> - <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="d:info/d:abstract"/> -</xsl:template> - -<xsl:template name="simplesect.titlepage.verso"> -</xsl:template> - -<xsl:template name="simplesect.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if> -</xsl:template> - -<xsl:template name="simplesect.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="simplesect.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="simplesect.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="simplesect.titlepage.before.recto"/> - <xsl:call-template name="simplesect.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="simplesect.titlepage.before.verso"/> - <xsl:call-template name="simplesect.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="simplesect.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="simplesect.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="simplesect.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:author" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:othercredit" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:copyright" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:pubdate" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revision" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:revhistory" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template match="d:abstract" mode="simplesect.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="simplesect.titlepage.recto.style"> -<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="bibliography.titlepage.recto"> - <div xsl:use-attribute-sets="bibliography.titlepage.recto.style"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:bibliography[1]"/> -</xsl:call-template></div> - <xsl:choose> - <xsl:when test="d:bibliographyinfo/d:subtitle"> - <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="d:bibliographyinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="bibliography.titlepage.verso"> -</xsl:template> - -<xsl:template name="bibliography.titlepage.separator"> -</xsl:template> - -<xsl:template name="bibliography.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="bibliography.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="bibliography.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="bibliography.titlepage.before.recto"/> - <xsl:call-template name="bibliography.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="bibliography.titlepage.before.verso"/> - <xsl:call-template name="bibliography.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="bibliography.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="bibliography.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="bibliography.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="bibliography.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="bibliography.titlepage.recto.style"> -<xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="glossary.titlepage.recto"> - <div xsl:use-attribute-sets="glossary.titlepage.recto.style"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:glossary[1]"/> -</xsl:call-template></div> - <xsl:choose> - <xsl:when test="d:glossaryinfo/d:subtitle"> - <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="d:glossaryinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="glossary.titlepage.verso"> -</xsl:template> - -<xsl:template name="glossary.titlepage.separator"> -</xsl:template> - -<xsl:template name="glossary.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="glossary.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="glossary.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="glossary.titlepage.before.recto"/> - <xsl:call-template name="glossary.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="glossary.titlepage.before.verso"/> - <xsl:call-template name="glossary.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="glossary.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="glossary.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="glossary.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="glossary.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="glossary.titlepage.recto.style"> -<xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="index.titlepage.recto"> - <div xsl:use-attribute-sets="index.titlepage.recto.style"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:index[1]"/> -</xsl:call-template></div> - <xsl:choose> - <xsl:when test="d:indexinfo/d:subtitle"> - <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="d:indexinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="index.titlepage.verso"> -</xsl:template> - -<xsl:template name="index.titlepage.separator"> -</xsl:template> - -<xsl:template name="index.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="index.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="index.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="index.titlepage.before.recto"/> - <xsl:call-template name="index.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="index.titlepage.before.verso"/> - <xsl:call-template name="index.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="index.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="index.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="index.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="index.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="index.titlepage.recto.style"> -<xsl:apply-templates select="." mode="index.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="setindex.titlepage.recto"> - <div xsl:use-attribute-sets="setindex.titlepage.recto.style"> -<xsl:call-template name="component.title"> -<xsl:with-param name="node" select="ancestor-or-self::d:setindex[1]"/> -</xsl:call-template></div> - <xsl:choose> - <xsl:when test="d:setindexinfo/d:subtitle"> - <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="d:setindexinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="setindex.titlepage.verso"> -</xsl:template> - -<xsl:template name="setindex.titlepage.separator"> -</xsl:template> - -<xsl:template name="setindex.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="setindex.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="setindex.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="setindex.titlepage.before.recto"/> - <xsl:call-template name="setindex.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="setindex.titlepage.before.verso"/> - <xsl:call-template name="setindex.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="setindex.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="setindex.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="setindex.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:subtitle" mode="setindex.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="setindex.titlepage.recto.style"> -<xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/> -</div> -</xsl:template> - -<xsl:template name="sidebar.titlepage.recto"> - <xsl:choose> - <xsl:when test="d:sidebarinfo/d:title"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:sidebarinfo/d:title"/> - </xsl:when> - <xsl:when test="d:docinfo/d:title"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:docinfo/d:title"/> - </xsl:when> - <xsl:when test="d:info/d:title"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:info/d:title"/> - </xsl:when> - <xsl:when test="d:title"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:title"/> - </xsl:when> - </xsl:choose> - - <xsl:choose> - <xsl:when test="d:sidebarinfo/d:subtitle"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:sidebarinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:docinfo/d:subtitle"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:docinfo/d:subtitle"/> - </xsl:when> - <xsl:when test="d:info/d:subtitle"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:info/d:subtitle"/> - </xsl:when> - <xsl:when test="d:subtitle"> - <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="d:subtitle"/> - </xsl:when> - </xsl:choose> - -</xsl:template> - -<xsl:template name="sidebar.titlepage.verso"> -</xsl:template> - -<xsl:template name="sidebar.titlepage.separator"> -</xsl:template> - -<xsl:template name="sidebar.titlepage.before.recto"> -</xsl:template> - -<xsl:template name="sidebar.titlepage.before.verso"> -</xsl:template> - -<xsl:template name="sidebar.titlepage"> - <div class="titlepage"> - <xsl:variable name="recto.content"> - <xsl:call-template name="sidebar.titlepage.before.recto"/> - <xsl:call-template name="sidebar.titlepage.recto"/> - </xsl:variable> - <xsl:variable name="recto.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count > 0)"> - <div><xsl:copy-of select="$recto.content"/></div> - </xsl:if> - <xsl:variable name="verso.content"> - <xsl:call-template name="sidebar.titlepage.before.verso"/> - <xsl:call-template name="sidebar.titlepage.verso"/> - </xsl:variable> - <xsl:variable name="verso.elements.count"> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')"> - <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count > 0)"> - <div><xsl:copy-of select="$verso.content"/></div> - </xsl:if> - <xsl:call-template name="sidebar.titlepage.separator"/> - </div> -</xsl:template> - -<xsl:template match="*" mode="sidebar.titlepage.recto.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="*" mode="sidebar.titlepage.verso.mode"> - <!-- if an element isn't found in this mode, --> - <!-- try the generic titlepage.mode --> - <xsl:apply-templates select="." mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:title" mode="sidebar.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sidebar.titlepage.recto.style"> -<xsl:call-template name="formal.object.heading"> -<xsl:with-param name="object" select="ancestor-or-self::d:sidebar[1]"/> -</xsl:call-template> -</div> -</xsl:template> - -<xsl:template match="d:subtitle" mode="sidebar.titlepage.recto.auto.mode"> -<div xsl:use-attribute-sets="sidebar.titlepage.recto.style"> -<xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/> -</div> -</xsl:template> - -</xsl:stylesheet> - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/titlepage.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/titlepage.xsl deleted file mode 100644 index e65ed7a61624b5396705c22e7efb30be406671a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/titlepage.xsl +++ /dev/null @@ -1,1049 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet exclude-result-prefixes="d" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -version='1.0'> - -<!-- ******************************************************************** - $Id: titlepage.xsl 8816 2010-08-10 11:56:35Z mzjn $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<!-- ==================================================================== --> - -<xsl:attribute-set name="book.titlepage.recto.style"/> -<xsl:attribute-set name="book.titlepage.verso.style"/> - -<xsl:attribute-set name="article.titlepage.recto.style"/> -<xsl:attribute-set name="article.titlepage.verso.style"/> - -<xsl:attribute-set name="set.titlepage.recto.style"/> -<xsl:attribute-set name="set.titlepage.verso.style"/> - -<xsl:attribute-set name="part.titlepage.recto.style"/> -<xsl:attribute-set name="part.titlepage.verso.style"/> - -<xsl:attribute-set name="partintro.titlepage.recto.style"/> -<xsl:attribute-set name="partintro.titlepage.verso.style"/> - -<xsl:attribute-set name="reference.titlepage.recto.style"/> -<xsl:attribute-set name="reference.titlepage.verso.style"/> - -<xsl:attribute-set name="refentry.titlepage.recto.style"/> -<xsl:attribute-set name="refentry.titlepage.verso.style"/> - -<xsl:attribute-set name="dedication.titlepage.recto.style"/> -<xsl:attribute-set name="dedication.titlepage.verso.style"/> - -<xsl:attribute-set name="acknowledgements.titlepage.recto.style"/> -<xsl:attribute-set name="acknowledgements.titlepage.verso.style"/> - -<xsl:attribute-set name="preface.titlepage.recto.style"/> -<xsl:attribute-set name="preface.titlepage.verso.style"/> - -<xsl:attribute-set name="chapter.titlepage.recto.style"/> -<xsl:attribute-set name="chapter.titlepage.verso.style"/> - -<xsl:attribute-set name="appendix.titlepage.recto.style"/> -<xsl:attribute-set name="appendix.titlepage.verso.style"/> - -<xsl:attribute-set name="bibliography.titlepage.recto.style"/> -<xsl:attribute-set name="bibliography.titlepage.verso.style"/> - -<xsl:attribute-set name="glossary.titlepage.recto.style"/> -<xsl:attribute-set name="glossary.titlepage.verso.style"/> - -<xsl:attribute-set name="index.titlepage.recto.style"/> -<xsl:attribute-set name="index.titlepage.verso.style"/> - -<xsl:attribute-set name="setindex.titlepage.recto.style"/> -<xsl:attribute-set name="setindex.titlepage.verso.style"/> - -<xsl:attribute-set name="sidebar.titlepage.recto.style"/> -<xsl:attribute-set name="sidebar.titlepage.verso.style"/> - -<xsl:attribute-set name="section.titlepage.recto.style"/> -<xsl:attribute-set name="section.titlepage.verso.style"/> - -<xsl:attribute-set name="sect1.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect1.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="sect2.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect2.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="sect3.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect3.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="sect4.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect4.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="sect5.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="sect5.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="simplesect.titlepage.recto.style" - use-attribute-sets="section.titlepage.recto.style"/> -<xsl:attribute-set name="simplesect.titlepage.verso.style" - use-attribute-sets="section.titlepage.verso.style"/> - -<xsl:attribute-set name="table.of.contents.titlepage.recto.style"/> -<xsl:attribute-set name="table.of.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.tables.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.tables.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.figures.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.figures.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.equations.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.equations.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.examples.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.examples.contents.titlepage.verso.style"/> - -<xsl:attribute-set name="list.of.unknowns.titlepage.recto.style"/> -<xsl:attribute-set name="list.of.unknowns.contents.titlepage.verso.style"/> - -<!-- ==================================================================== --> - -<xsl:template match="*" mode="titlepage.mode"> - <!-- if an element isn't found in this mode, try the default mode --> - <xsl:apply-templates select="."/> -</xsl:template> - -<xsl:template match="d:abbrev" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:abstract" mode="titlepage.mode"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:call-template name="anchor"/> - <xsl:if test="$abstract.notitle.enabled = 0"> - <xsl:call-template name="formal.object.heading"> - <xsl:with-param name="title"> - <xsl:apply-templates select="." mode="title.markup"/> - </xsl:with-param> - </xsl:call-template> - </xsl:if> - <xsl:apply-templates mode="titlepage.mode"/> - <xsl:call-template name="process.footnotes"/> - </div> -</xsl:template> - -<xsl:template match="d:abstract/d:title" mode="titlepage.mode"> -</xsl:template> - -<xsl:template match="d:address" mode="titlepage.mode"> - <xsl:param name="suppress-numbers" select="'0'"/> - - <xsl:variable name="rtf"> - <xsl:apply-templates mode="titlepage.mode"/> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$suppress-numbers = '0' - and @linenumbering = 'numbered' - and $use.extensions != '0' - and $linenumbering.extension != '0'"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:call-template name="paragraph"> - <xsl:with-param name="content"> - <xsl:call-template name="number.rtf.lines"> - <xsl:with-param name="rtf" select="$rtf"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </div> - </xsl:when> - - <xsl:otherwise> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:call-template name="paragraph"> - <xsl:with-param name="content"> - <xsl:call-template name="make-verbatim"> - <xsl:with-param name="rtf" select="$rtf"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </div> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:affiliation" mode="titlepage.mode"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - </div> -</xsl:template> - -<xsl:template match="d:artpagenums" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:author|d:editor" mode="titlepage.mode"> - <xsl:call-template name="credits.div"/> -</xsl:template> - -<xsl:template name="credits.div"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:if test="self::d:editor[position()=1] and not($editedby.enabled = 0)"> - <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4> - </xsl:if> - <h3> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:choose> - <xsl:when test="d:orgname"> - <xsl:apply-templates/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="person.name"/> - </xsl:otherwise> - </xsl:choose> - </h3> - <xsl:if test="not($contrib.inline.enabled = 0)"> - <xsl:apply-templates mode="titlepage.mode" select="d:contrib"/> - </xsl:if> - <xsl:apply-templates mode="titlepage.mode" select="d:affiliation"/> - <xsl:apply-templates mode="titlepage.mode" select="d:email"/> - <xsl:if test="not($blurb.on.titlepage.enabled = 0)"> - <xsl:choose> - <xsl:when test="$contrib.inline.enabled = 0"> - <xsl:apply-templates mode="titlepage.mode" - select="d:contrib|d:authorblurb|d:personblurb"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates mode="titlepage.mode" - select="d:authorblurb|d:personblurb"/> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - </div> -</xsl:template> - -<xsl:template match="d:authorblurb|d:personblurb" mode="titlepage.mode"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - </div> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="titlepage.mode"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:if test="parent::d:refentryinfo"> - <h2>Authors</h2> - </xsl:if> - - <xsl:call-template name="anchor"/> - <xsl:apply-templates mode="titlepage.mode"/> - </div> -</xsl:template> - -<xsl:template match="d:authorinitials" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:bibliomisc" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:bibliomset" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:collab" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:collabname" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - </span> -</xsl:template> - -<xsl:template match="d:confgroup" mode="titlepage.mode"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - </div> -</xsl:template> - -<xsl:template match="d:confdates" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:confsponsor" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:conftitle" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:confnum" mode="titlepage.mode"> - <!-- suppress --> -</xsl:template> - -<xsl:template match="d:contractnum" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:contractsponsor" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:contrib" mode="titlepage.mode"> - <xsl:choose> - <xsl:when test="not($contrib.inline.enabled = 0)"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - </span><xsl:text> </xsl:text> - </xsl:when> - <xsl:otherwise> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <p><xsl:apply-templates mode="titlepage.mode"/></p> - </div> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:copyright" mode="titlepage.mode"> - - <xsl:if test="generate-id() = generate-id(//d:refentryinfo/d:copyright[1]) - and ($stylesheet.result.type = 'html' or $stylesheet.result.type = 'xhtml')"> - <h2>Copyright</h2> - </xsl:if> - - <p> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Copyright'"/> - </xsl:call-template> - <xsl:call-template name="gentext.space"/> - <xsl:call-template name="dingbat"> - <xsl:with-param name="dingbat">copyright</xsl:with-param> - </xsl:call-template> - <xsl:call-template name="gentext.space"/> - <xsl:call-template name="copyright.years"> - <xsl:with-param name="years" select="d:year"/> - <xsl:with-param name="print.ranges" select="$make.year.ranges"/> - <xsl:with-param name="single.year.ranges" - select="$make.single.year.ranges"/> - </xsl:call-template> - <xsl:call-template name="gentext.space"/> - <xsl:apply-templates select="d:holder" mode="titlepage.mode"/> - </p> -</xsl:template> - -<xsl:template match="d:year" mode="titlepage.mode"> - <xsl:choose> - <xsl:when test="$show.revisionflag != 0 and @revisionflag"> - <span class="{@revisionflag}"> - <xsl:apply-templates mode="titlepage.mode"/> - </span> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates mode="titlepage.mode"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:holder" mode="titlepage.mode"> - <xsl:choose> - <xsl:when test="$show.revisionflag != 0 and @revisionflag"> - <span class="{@revisionflag}"> - <xsl:apply-templates mode="titlepage.mode"/> - </span> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates mode="titlepage.mode"/> - </xsl:otherwise> - </xsl:choose> - <xsl:if test="position() < last()"> - <xsl:text>, </xsl:text> - </xsl:if> -</xsl:template> - -<xsl:template match="d:corpauthor" mode="titlepage.mode"> - <h3> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - </h3> -</xsl:template> - -<xsl:template match="d:corpcredit" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:corpname" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:date" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:edition" mode="titlepage.mode"> - <p> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <xsl:call-template name="gentext.space"/> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Edition'"/> - </xsl:call-template> - </p> -</xsl:template> - -<xsl:template match="d:email" mode="titlepage.mode"> - <!-- use the normal e-mail handling code --> - <xsl:apply-templates select="."/> -</xsl:template> - -<xsl:template match="d:firstname" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:graphic" mode="titlepage.mode"> - <!-- use the normal graphic handling code --> - <xsl:apply-templates select="."/> -</xsl:template> - -<xsl:template match="d:honorific" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:isbn" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:issn" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:biblioid" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:itermset" mode="titlepage.mode"> -</xsl:template> - -<xsl:template match="d:invpartnumber" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:issuenum" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:jobtitle" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:keywordset" mode="titlepage.mode"> -</xsl:template> - -<xsl:template match="d:legalnotice" mode="titlepage.mode"> - <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> - - <xsl:choose> - <xsl:when test="$generate.legalnotice.link != 0"> - - <!-- Compute name of legalnotice file --> - <xsl:variable name="file"> - <xsl:call-template name="ln.or.rh.filename"/> - </xsl:variable> - - <xsl:variable name="filename"> - <xsl:call-template name="make-relative-filename"> - <xsl:with-param name="base.dir" select="$base.dir"/> - <xsl:with-param name="base.name" select="$file"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="title"> - <xsl:apply-templates select="." mode="title.markup"/> - </xsl:variable> - - <a href="{$file}"> - <xsl:copy-of select="$title"/> - </a> - - <xsl:call-template name="write.chunk"> - <xsl:with-param name="filename" select="$filename"/> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - <xsl:with-param name="content"> - <xsl:call-template name="user.preroot"/> - <html> - <head> - <xsl:call-template name="system.head.content"/> - <xsl:call-template name="head.content"/> - <xsl:call-template name="user.head.content"/> - </head> - <body> - <xsl:call-template name="body.attributes"/> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - </div> - </body> - </html> - <xsl:value-of select="$chunk.append"/> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <a name="{$id}"/> - <xsl:apply-templates mode="titlepage.mode"/> - </div> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:legalnotice/d:title" mode="titlepage.mode"> - <p class="legalnotice-title"><b><xsl:apply-templates/></b></p> -</xsl:template> - -<xsl:template match="d:lineage" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:modespec" mode="titlepage.mode"> -</xsl:template> - -<xsl:template match="d:orgdiv" mode="titlepage.mode"> - <xsl:if test="preceding-sibling::*[1][self::d:orgname]"> - <xsl:text> </xsl:text> - </xsl:if> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:orgname" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:othercredit" mode="titlepage.mode"> -<xsl:choose> - <xsl:when test="not($othercredit.like.author.enabled = 0)"> - <xsl:variable name="contrib" select="string(d:contrib)"/> - <xsl:choose> - <xsl:when test="d:contrib"> - <xsl:if test="not(preceding-sibling::d:othercredit[string(d:contrib)=$contrib])"> - <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="local-name(.)"/> - <xsl:with-param name="content"> - <xsl:apply-templates mode="titlepage.mode" select="d:contrib"/> - <xsl:text>: </xsl:text> - <xsl:call-template name="person.name"/> - <xsl:apply-templates mode="titlepage.mode" select="d:affiliation"/> - <xsl:apply-templates select="following-sibling::d:othercredit[string(d:contrib)=$contrib]" mode="titlepage.othercredits"/> - </xsl:with-param> - </xsl:call-template> - </xsl:if> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="local-name(.)"/> - <xsl:with-param name="content"> - <xsl:call-template name="person.name"/> - </xsl:with-param> - </xsl:call-template> - <xsl:apply-templates mode="titlepage.mode" select="d:affiliation"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="credits.div"/> - </xsl:otherwise> -</xsl:choose> -</xsl:template> - -<xsl:template match="d:othercredit" mode="titlepage.othercredits"> - <xsl:text>, </xsl:text> - <xsl:call-template name="person.name"/> -</xsl:template> - -<xsl:template match="d:othername" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:pagenums" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:printhistory" mode="titlepage.mode"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - </div> -</xsl:template> - -<xsl:template match="d:productname" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:productnumber" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:pubdate" mode="titlepage.mode"> - <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="local-name(.)"/> - <xsl:with-param name="content"> - <xsl:apply-templates mode="titlepage.mode"/> - </xsl:with-param> - </xsl:call-template> -</xsl:template> - -<xsl:template match="d:publisher" mode="titlepage.mode"> - <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="local-name(.)"/> - <xsl:with-param name="content"> - <xsl:apply-templates mode="titlepage.mode"/> - </xsl:with-param> - </xsl:call-template> -</xsl:template> - -<xsl:template match="d:publishername" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:pubsnumber" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:releaseinfo" mode="titlepage.mode"> - <xsl:call-template name="paragraph"> - <xsl:with-param name="class" select="local-name(.)"/> - <xsl:with-param name="content"> - <xsl:apply-templates mode="titlepage.mode"/> - </xsl:with-param> - </xsl:call-template> -</xsl:template> - -<xsl:template match="d:revhistory" mode="titlepage.mode"> - <xsl:variable name="numcols"> - <xsl:choose> - <xsl:when test=".//d:authorinitials|.//d:author">3</xsl:when> - <xsl:otherwise>2</xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable> - - <xsl:variable name="title"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key">RevHistory</xsl:with-param> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="contents"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <table border="1" width="100%" summary="Revision history"> - <tr> - <th align="{$direction.align.start}" valign="top" colspan="{$numcols}"> - <b> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'RevHistory'"/> - </xsl:call-template> - </b> - </th> - </tr> - <xsl:apply-templates mode="titlepage.mode"> - <xsl:with-param name="numcols" select="$numcols"/> - </xsl:apply-templates> - </table> - </div> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$generate.revhistory.link != 0"> - - <!-- Compute name of revhistory file --> - <xsl:variable name="file"> - <xsl:call-template name="ln.or.rh.filename"> - <xsl:with-param name="is.ln" select="false()"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="filename"> - <xsl:call-template name="make-relative-filename"> - <xsl:with-param name="base.dir" select="$base.dir"/> - <xsl:with-param name="base.name" select="$file"/> - </xsl:call-template> - </xsl:variable> - - <a href="{$file}"> - <xsl:copy-of select="$title"/> - </a> - - <xsl:call-template name="write.chunk"> - <xsl:with-param name="filename" select="$filename"/> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - <xsl:with-param name="content"> - <xsl:call-template name="user.preroot"/> - <html> - <head> - <xsl:call-template name="system.head.content"/> - <xsl:call-template name="head.content"> - <xsl:with-param name="title"> - <xsl:value-of select="$title"/> - <xsl:if test="../../d:title"> - <xsl:value-of select="concat(' (', ../../d:title, ')')"/> - </xsl:if> - </xsl:with-param> - </xsl:call-template> - <xsl:call-template name="user.head.content"/> - </head> - <body> - <xsl:call-template name="body.attributes"/> - <xsl:copy-of select="$contents"/> - </body> - </html> - <xsl:text> </xsl:text> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$contents"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:revhistory/d:revision" mode="titlepage.mode"> - <xsl:param name="numcols" select="'3'"/> - <xsl:variable name="revnumber" select="d:revnumber"/> - <xsl:variable name="revdate" select="d:date"/> - <xsl:variable name="revauthor" select="d:authorinitials|d:author"/> - <xsl:variable name="revremark" select="d:revremark|d:revdescription"/> - <tr> - <td align="{$direction.align.start}"> - <xsl:if test="$revnumber"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Revision'"/> - </xsl:call-template> - <xsl:call-template name="gentext.space"/> - <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/> - </xsl:if> - </td> - <td align="{$direction.align.start}"> - <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/> - </td> - <xsl:choose> - <xsl:when test="$revauthor"> - <td align="{$direction.align.start}"> - <xsl:for-each select="$revauthor"> - <xsl:apply-templates select="." mode="titlepage.mode"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:for-each> - </td> - </xsl:when> - <xsl:when test="$numcols > 2"> - <td> </td> - </xsl:when> - <xsl:otherwise></xsl:otherwise> - </xsl:choose> - </tr> - <xsl:if test="$revremark"> - <tr> - <td align="{$direction.align.start}" colspan="{$numcols}"> - <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/> - </td> - </tr> - </xsl:if> -</xsl:template> - -<xsl:template match="d:revision/d:revnumber" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:date" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:authorinitials" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:author" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:revremark" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:revision/d:revdescription" mode="titlepage.mode"> - <xsl:apply-templates mode="titlepage.mode"/> -</xsl:template> - -<xsl:template match="d:seriesvolnums" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:shortaffil" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:subjectset" mode="titlepage.mode"> -</xsl:template> - -<xsl:template match="d:subtitle" mode="titlepage.mode"> - <h2> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - </h2> -</xsl:template> - -<xsl:template match="d:surname" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<xsl:template match="d:title" mode="titlepage.mode"> - <xsl:variable name="id"> - <xsl:choose> - <!-- if title is in an *info wrapper, get the grandparent --> - <xsl:when test="contains(local-name(..), 'info')"> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select="../.."/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="object.id"> - <xsl:with-param name="object" select=".."/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <h1> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:if test="$generate.id.attributes = 0"> - <a name="{$id}"/> - </xsl:if> - <xsl:choose> - <xsl:when test="$show.revisionflag != 0 and @revisionflag"> - <span class="{@revisionflag}"> - <xsl:apply-templates mode="titlepage.mode"/> - </span> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates mode="titlepage.mode"/> - </xsl:otherwise> - </xsl:choose> - </h1> -</xsl:template> - -<xsl:template match="d:titleabbrev" mode="titlepage.mode"> - <!-- nop; title abbreviations don't belong on the title page! --> -</xsl:template> - -<xsl:template match="d:volumenum" mode="titlepage.mode"> - <span> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates mode="titlepage.mode"/> - <br/> - </span> -</xsl:template> - -<!-- This template computes the filename for legalnotice and revhistory chunks --> -<xsl:template name="ln.or.rh.filename"> - <xsl:param name="node" select="."/> - <xsl:param name="is.ln" select="true()"/> - - <xsl:variable name="dbhtml-filename"> - <xsl:call-template name="pi.dbhtml_filename"> - <xsl:with-param name="node" select="$node"/> - </xsl:call-template> - </xsl:variable> - - <xsl:choose> - <!-- 1. If there is a dbhtml_filename PI, use that --> - <xsl:when test="$dbhtml-filename != ''"> - <xsl:value-of select="$dbhtml-filename"/> - </xsl:when> - <xsl:when test="($node/@id or $node/@xml:id) and not($use.id.as.filename = 0)"> - <!-- * 2. If this legalnotice/revhistory has an ID, then go ahead and use --> - <!-- * just the value of that ID as the basename for the file --> - <!-- * (that is, without prepending an "ln-" or "rh-" to it) --> - <xsl:value-of select="($node/@id|$node/@xml:id)[1]"/> - <xsl:value-of select="$html.ext"/> - </xsl:when> - <xsl:when test="not ($node/@id or $node/@xml:id) or $use.id.as.filename = 0"> - <!-- * 3. Otherwise, if this legalnotice/revhistory does not have an ID, or --> - <!-- * if $use.id.as.filename = 0 --> - <!-- * then we generate an ID... --> - <xsl:variable name="id"> - <xsl:value-of select="generate-id($node)"/> - </xsl:variable> - <!-- * ...and then we take that generated ID, prepend a --> - <!-- * prefix to it, and use that as the basename for the file --> - <xsl:choose> - <xsl:when test="$is.ln"> - <xsl:value-of select="concat('ln-',$id,$html.ext)"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="concat('rh-',$id,$html.ext)"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - </xsl:choose> -</xsl:template> - -<!-- ==================================================================== --> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/toc.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/toc.xsl deleted file mode 100644 index 9a37a564a997a6b57f970e1c1d520a683fde1e91..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/toc.xsl +++ /dev/null @@ -1,352 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet exclude-result-prefixes="d" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -version='1.0'> - -<!-- ******************************************************************** - $Id: toc.xsl 8421 2009-05-04 07:49:49Z bobstayton $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<!-- ==================================================================== --> - -<xsl:template match="d:set/d:toc | d:book/d:toc | d:part/d:toc"> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="node" select="parent::*"/> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - - <!-- Do not output the toc element if one is already generated - by the use of $generate.toc parameter, or if - generating a source toc is turned off --> - <xsl:if test="not(contains($toc.params, 'toc')) and - ($process.source.toc != 0 or $process.empty.source.toc != 0)"> - <xsl:variable name="content"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <xsl:apply-templates /> - </xsl:when> - <xsl:when test="count(*) = 0 and $process.empty.source.toc != 0"> - <!-- trick to switch context node to parent element --> - <xsl:for-each select="parent::*"> - <xsl:choose> - <xsl:when test="self::d:set"> - <xsl:call-template name="set.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="self::d:book"> - <xsl:call-template name="division.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="self::d:part"> - <xsl:call-template name="division.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:when> - </xsl:choose> - </xsl:for-each> - </xsl:when> - </xsl:choose> - </xsl:variable> - - <xsl:if test="string-length(normalize-space($content)) != 0"> - <xsl:copy-of select="$content"/> - </xsl:if> - </xsl:if> -</xsl:template> - -<xsl:template match="d:chapter/d:toc | d:appendix/d:toc | d:preface/d:toc | d:article/d:toc"> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="node" select="parent::*"/> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - - <!-- Do not output the toc element if one is already generated - by the use of $generate.toc parameter, or if - generating a source toc is turned off --> - <xsl:if test="not(contains($toc.params, 'toc')) and - ($process.source.toc != 0 or $process.empty.source.toc != 0)"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates select="d:title"/> - <dl> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates select="*[not(self::d:title)]"/> - </dl> - </div> - <xsl:call-template name="component.toc.separator"/> - </xsl:when> - <xsl:when test="count(*) = 0 and $process.empty.source.toc != 0"> - <!-- trick to switch context node to section element --> - <xsl:for-each select="parent::*"> - <xsl:call-template name="component.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:for-each> - <xsl:call-template name="component.toc.separator"/> - </xsl:when> - </xsl:choose> - </xsl:if> -</xsl:template> - -<xsl:template match="d:section/d:toc - |d:sect1/d:toc - |d:sect2/d:toc - |d:sect3/d:toc - |d:sect4/d:toc - |d:sect5/d:toc"> - - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="node" select="parent::*"/> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - - <!-- Do not output the toc element if one is already generated - by the use of $generate.toc parameter, or if - generating a source toc is turned off --> - <xsl:if test="not(contains($toc.params, 'toc')) and - ($process.source.toc != 0 or $process.empty.source.toc != 0)"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates select="d:title"/> - <dl> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates select="*[not(self::d:title)]"/> - </dl> - </div> - <xsl:call-template name="section.toc.separator"/> - </xsl:when> - <xsl:when test="count(*) = 0 and $process.empty.source.toc != 0"> - <!-- trick to switch context node to section element --> - <xsl:for-each select="parent::*"> - <xsl:call-template name="section.toc"> - <xsl:with-param name="toc.title.p" - select="contains($toc.params, 'title')"/> - </xsl:call-template> - </xsl:for-each> - <xsl:call-template name="section.toc.separator"/> - </xsl:when> - </xsl:choose> - </xsl:if> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:tocpart|d:tocchap - |d:toclevel1|d:toclevel2|d:toclevel3|d:toclevel4|d:toclevel5"> - <xsl:variable name="sub-toc"> - <xsl:if test="d:tocchap|d:toclevel1|d:toclevel2|d:toclevel3|d:toclevel4|d:toclevel5"> - <xsl:choose> - <xsl:when test="$toc.list.type = 'dl'"> - <dd> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:element name="{$toc.list.type}"> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates select="d:tocchap|d:toclevel1|d:toclevel2| - d:toclevel3|d:toclevel4|d:toclevel5"/> - </xsl:element> - </dd> - </xsl:when> - <xsl:otherwise> - <xsl:element name="{$toc.list.type}"> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates select="d:tocchap|d:toclevel1|d:toclevel2| - d:toclevel3|d:toclevel4|d:toclevel5"/> - </xsl:element> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - </xsl:variable> - - <xsl:apply-templates select="d:tocentry[position() != last()]"/> - - <xsl:choose> - <xsl:when test="$toc.list.type = 'dl'"> - <dt> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates select="d:tocentry[position() = last()]"/> - </dt> - <xsl:copy-of select="$sub-toc"/> - </xsl:when> - <xsl:otherwise> - <li> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates select="d:tocentry[position() = last()]"/> - <xsl:copy-of select="$sub-toc"/> - </li> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:tocentry|d:tocdiv|d:lotentry|d:tocfront|d:tocback"> - <xsl:choose> - <xsl:when test="$toc.list.type = 'dl'"> - <dt> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:call-template name="tocentry-content"/> - </dt> - </xsl:when> - <xsl:otherwise> - <li> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:call-template name="tocentry-content"/> - </li> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:tocentry[position() = last()]" priority="2"> - <xsl:call-template name="tocentry-content"/> -</xsl:template> - -<xsl:template name="tocentry-content"> - <xsl:variable name="targets" select="key('id',@linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - - <xsl:choose> - <xsl:when test="@linkend"> - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="@linkend"/> - </xsl:call-template> - <a> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:attribute> - <xsl:apply-templates/> - </a> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:toc/d:title"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates/> - </div> -</xsl:template> - -<xsl:template match="d:toc/d:subtitle"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates/> - </div> -</xsl:template> - -<xsl:template match="d:toc/d:titleabbrev"> -</xsl:template> - -<!-- ==================================================================== --> - -<!-- A lot element must have content, because there is no attribute - to select what kind of list should be generated --> -<xsl:template match="d:book/d:lot | d:part/d:lot"> - <!-- Don't generate a page sequence unless there is content --> - <xsl:variable name="content"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates /> - </div> - </xsl:when> - <xsl:when test="not(child::*) and $process.empty.source.toc != 0"> - <xsl:call-template name="process.empty.lot"/> - </xsl:when> - </xsl:choose> - </xsl:variable> - - <xsl:if test="string-length(normalize-space($content)) != 0"> - <xsl:copy-of select="$content"/> - </xsl:if> -</xsl:template> - -<xsl:template match="d:chapter/d:lot | d:appendix/d:lot | d:preface/d:lot | d:article/d:lot"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates /> - </div> - <xsl:call-template name="component.toc.separator"/> - </xsl:when> - <xsl:when test="not(child::*) and $process.empty.source.toc != 0"> - <xsl:call-template name="process.empty.lot"/> - </xsl:when> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:section/d:lot - |d:sect1/d:lot - |d:sect2/d:lot - |d:sect3/d:lot - |d:sect4/d:lot - |d:sect5/d:lot"> - <xsl:choose> - <xsl:when test="* and $process.source.toc != 0"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates/> - </div> - <xsl:call-template name="section.toc.separator"/> - </xsl:when> - <xsl:when test="not(child::*) and $process.empty.source.toc != 0"> - <xsl:call-template name="process.empty.lot"/> - </xsl:when> - </xsl:choose> -</xsl:template> - -<xsl:template name="process.empty.lot"> - <!-- An empty lot element does not provide any information to indicate - what should be included in it. You can customize this - template to generate a lot based on @role or something --> - <xsl:message> - <xsl:text>Warning: don't know what to generate for </xsl:text> - <xsl:text>lot that has no children.</xsl:text> - </xsl:message> -</xsl:template> - -<xsl:template match="d:lot/d:title"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates/> - </div> -</xsl:template> - -<xsl:template match="d:lot/d:subtitle"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates/> - </div> -</xsl:template> - -<xsl:template match="d:lot/d:titleabbrev"> -</xsl:template> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/verbatim.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/verbatim.xsl deleted file mode 100644 index 4d000e3af0ce9fe98475193ca73e47dcd64cd810..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/verbatim.xsl +++ /dev/null @@ -1,411 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" - xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" - xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:exsl="http://exslt.org/common" - exclude-result-prefixes="sverb xverb lxslt exsl d" - version='1.0'> - -<!-- ******************************************************************** - $Id: verbatim.xsl 8807 2010-08-09 18:57:41Z bobstayton $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<!-- XSLTHL highlighting is turned off by default. See highlighting/README - for instructions on how to turn on XSLTHL --> -<xsl:template name="apply-highlighting"> - <xsl:apply-templates/> -</xsl:template> - -<lxslt:component prefix="xverb" - functions="numberLines"/> - -<xsl:template match="d:programlisting|d:screen|d:synopsis"> - <xsl:param name="suppress-numbers" select="'0'"/> - <xsl:variable name="id"> - <xsl:call-template name="object.id"/> - </xsl:variable> - - <xsl:call-template name="anchor"/> - - <xsl:variable name="div.element"> - <xsl:choose> - <xsl:when test="$make.clean.html != 0">div</xsl:when> - <xsl:otherwise>pre</xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:if test="$shade.verbatim != 0"> - <xsl:message> - <xsl:text>The shade.verbatim parameter is deprecated. </xsl:text> - <xsl:text>Use CSS instead,</xsl:text> - </xsl:message> - <xsl:message> - <xsl:text>for example: pre.</xsl:text> - <xsl:value-of select="local-name(.)"/> - <xsl:text> { background-color: #E0E0E0; }</xsl:text> - </xsl:message> - </xsl:if> - - <xsl:choose> - <xsl:when test="$suppress-numbers = '0' - and @linenumbering = 'numbered' - and $use.extensions != '0' - and $linenumbering.extension != '0'"> - <xsl:variable name="rtf"> - <xsl:choose> - <xsl:when test="$highlight.source != 0"> - <xsl:call-template name="apply-highlighting"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:element name="{$div.element}"> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:if test="@width != ''"> - <xsl:attribute name="width"> - <xsl:value-of select="@width"/> - </xsl:attribute> - </xsl:if> - <xsl:call-template name="number.rtf.lines"> - <xsl:with-param name="rtf" select="$rtf"/> - </xsl:call-template> - </xsl:element> - </xsl:when> - <xsl:otherwise> - <xsl:element name="{$div.element}"> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:if test="@width != ''"> - <xsl:attribute name="width"> - <xsl:value-of select="@width"/> - </xsl:attribute> - </xsl:if> - <xsl:choose> - <xsl:when test="$highlight.source != 0"> - <xsl:call-template name="apply-highlighting"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </xsl:element> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:literallayout"> - <xsl:param name="suppress-numbers" select="'0'"/> - - <xsl:variable name="rtf"> - <xsl:apply-templates/> - </xsl:variable> - - <xsl:if test="$shade.verbatim != 0 and @class='monospaced'"> - <xsl:message> - <xsl:text>The shade.verbatim parameter is deprecated. </xsl:text> - <xsl:text>Use CSS instead,</xsl:text> - </xsl:message> - <xsl:message> - <xsl:text>for example: pre.</xsl:text> - <xsl:value-of select="local-name(.)"/> - <xsl:text> { background-color: #E0E0E0; }</xsl:text> - </xsl:message> - </xsl:if> - - <xsl:choose> - <xsl:when test="$suppress-numbers = '0' - and @linenumbering = 'numbered' - and $use.extensions != '0' - and $linenumbering.extension != '0'"> - <xsl:choose> - <xsl:when test="@class='monospaced'"> - <pre> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:call-template name="number.rtf.lines"> - <xsl:with-param name="rtf" select="$rtf"/> - </xsl:call-template> - </pre> - </xsl:when> - <xsl:otherwise> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <p> - <xsl:call-template name="number.rtf.lines"> - <xsl:with-param name="rtf" select="$rtf"/> - </xsl:call-template> - </p> - </div> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="@class='monospaced'"> - <pre> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:copy-of select="$rtf"/> - </pre> - </xsl:when> - <xsl:otherwise> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <p> - <xsl:call-template name="make-verbatim"> - <xsl:with-param name="rtf" select="$rtf"/> - </xsl:call-template> - </p> - </div> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:address"> - <xsl:param name="suppress-numbers" select="'0'"/> - - <xsl:variable name="rtf"> - <xsl:apply-templates/> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$suppress-numbers = '0' - and @linenumbering = 'numbered' - and $use.extensions != '0' - and $linenumbering.extension != '0'"> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <p> - <xsl:call-template name="number.rtf.lines"> - <xsl:with-param name="rtf" select="$rtf"/> - </xsl:call-template> - </p> - </div> - </xsl:when> - - <xsl:otherwise> - <div> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <p> - <xsl:call-template name="make-verbatim"> - <xsl:with-param name="rtf" select="$rtf"/> - </xsl:call-template> - </p> - </div> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="number.rtf.lines"> - <xsl:param name="rtf" select="''"/> - <xsl:param name="pi.context" select="."/> - - <!-- Save the global values --> - <xsl:variable name="global.linenumbering.everyNth" - select="$linenumbering.everyNth"/> - - <xsl:variable name="global.linenumbering.separator" - select="$linenumbering.separator"/> - - <xsl:variable name="global.linenumbering.width" - select="$linenumbering.width"/> - - <!-- Extract the <?dbhtml linenumbering.*?> PI values --> - <xsl:variable name="pi.linenumbering.everyNth"> - <xsl:call-template name="pi.dbhtml_linenumbering.everyNth"> - <xsl:with-param name="node" select="$pi.context"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="pi.linenumbering.separator"> - <xsl:call-template name="pi.dbhtml_linenumbering.separator"> - <xsl:with-param name="node" select="$pi.context"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="pi.linenumbering.width"> - <xsl:call-template name="pi.dbhtml_linenumbering.width"> - <xsl:with-param name="node" select="$pi.context"/> - </xsl:call-template> - </xsl:variable> - - <!-- Construct the 'in-context' values --> - <xsl:variable name="linenumbering.everyNth"> - <xsl:choose> - <xsl:when test="$pi.linenumbering.everyNth != ''"> - <xsl:value-of select="$pi.linenumbering.everyNth"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$global.linenumbering.everyNth"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="linenumbering.separator"> - <xsl:choose> - <xsl:when test="$pi.linenumbering.separator != ''"> - <xsl:value-of select="$pi.linenumbering.separator"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$global.linenumbering.separator"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="linenumbering.width"> - <xsl:choose> - <xsl:when test="$pi.linenumbering.width != ''"> - <xsl:value-of select="$pi.linenumbering.width"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$global.linenumbering.width"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="linenumbering.startinglinenumber"> - <xsl:choose> - <xsl:when test="$pi.context/@startinglinenumber"> - <xsl:value-of select="$pi.context/@startinglinenumber"/> - </xsl:when> - <xsl:when test="$pi.context/@continuation='continues'"> - <xsl:variable name="lastLine"> - <xsl:choose> - <xsl:when test="$pi.context/self::d:programlisting"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:programlisting[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$pi.context/self::d:screen"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:screen[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$pi.context/self::d:literallayout"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:literallayout[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$pi.context/self::d:address"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:address[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:when test="$pi.context/self::d:synopsis"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" - select="preceding::d:synopsis[@linenumbering='numbered']"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Unexpected verbatim environment: </xsl:text> - <xsl:value-of select="local-name($pi.context)"/> - </xsl:message> - <xsl:value-of select="0"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:value-of select="$lastLine + 1"/> - </xsl:when> - <xsl:otherwise>1</xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="function-available('sverb:numberLines')"> - <xsl:copy-of select="sverb:numberLines($rtf)"/> - </xsl:when> - <xsl:when test="function-available('xverb:numberLines')"> - <xsl:copy-of select="xverb:numberLines($rtf)"/> - </xsl:when> - <xsl:otherwise> - <xsl:message terminate="yes"> - <xsl:text>No numberLines function available.</xsl:text> - </xsl:message> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="make-verbatim"> - <xsl:param name="rtf"/> - - <!-- I want to make this RTF verbatim. There are two possibilities: either - I have access to the exsl:node-set extension function and I can "do it right" - or I have to rely on CSS. --> - - <xsl:choose> - <xsl:when test="$exsl.node.set.available != 0"> - <xsl:apply-templates select="exsl:node-set($rtf)" mode="make.verbatim.mode"/> - </xsl:when> - <xsl:otherwise> - <span style="white-space: pre;"> - <xsl:copy-of select="$rtf"/> - </span> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- ======================================================================== --> - -<xsl:template name="lastLineNumber"> - <xsl:param name="listings"/> - <xsl:param name="number" select="0"/> - - <xsl:variable name="lines"> - <xsl:call-template name="countLines"> - <xsl:with-param name="listing" select="string($listings[1])"/> - </xsl:call-template> - </xsl:variable> - - <xsl:choose> - <xsl:when test="not($listings)"> - <xsl:value-of select="$number"/> - </xsl:when> - <xsl:when test="$listings[1]/@startinglinenumber"> - <xsl:value-of select="$number + $listings[1]/@startinglinenumber + $lines - 1"/> - </xsl:when> - <xsl:when test="$listings[1]/@continuation='continues'"> - <xsl:call-template name="lastLineNumber"> - <xsl:with-param name="listings" select="d:listings[position() > 1]"/> - <xsl:with-param name="number" select="$number + $lines"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$lines"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template name="countLines"> - <xsl:param name="listing"/> - <xsl:param name="count" select="1"/> - - <xsl:choose> - <xsl:when test="contains($listing, ' ')"> - <xsl:call-template name="countLines"> - <xsl:with-param name="listing" select="substring-after($listing, ' ')"/> - <xsl:with-param name="count" select="$count + 1"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$count"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/xref.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/xref.xsl deleted file mode 100644 index e17bc881fe1da4ecf7d740827a7488fc1ef7d565..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/html/xref.xsl +++ /dev/null @@ -1,1378 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" - xmlns:exsl="http://exslt.org/common" - xmlns:xlink='http://www.w3.org/1999/xlink' - exclude-result-prefixes="suwl exsl xlink d" - version='1.0'> - -<!-- ******************************************************************** - $Id: xref.xsl 8421 2009-05-04 07:49:49Z bobstayton $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<!-- Use internal variable for olink xlink role for consistency --> -<xsl:variable - name="xolink.role">http://docbook.org/xlink/role/olink</xsl:variable> - -<!-- ==================================================================== --> - -<xsl:template match="d:anchor"> - <xsl:call-template name="anchor"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:xref" name="xref"> - <xsl:param name="xhref" select="@xlink:href"/> - <!-- is the @xlink:href a local idref link? --> - <xsl:param name="xlink.idref"> - <xsl:if test="starts-with($xhref,'#') - and (not(contains($xhref,'(')) - or starts-with($xhref, '#xpointer(id('))"> - <xsl:call-template name="xpointer.idref"> - <xsl:with-param name="xpointer" select="$xhref"/> - </xsl:call-template> - </xsl:if> - </xsl:param> - <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/> - <xsl:param name="linkend.targets" select="key('id',@linkend)"/> - <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/> - - <xsl:variable name="xrefstyle"> - <xsl:choose> - <xsl:when test="@role and not(@xrefstyle) - and $use.role.as.xrefstyle != 0"> - <xsl:value-of select="@role"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@xrefstyle"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:call-template name="anchor"/> - - <xsl:variable name="content"> - <xsl:choose> - - <xsl:when test="@endterm"> - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$etarget" mode="endterm"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <xsl:when test="$target/@xreflabel"> - <xsl:call-template name="xref.xreflabel"> - <xsl:with-param name="target" select="$target"/> - </xsl:call-template> - </xsl:when> - - <xsl:when test="$target"> - <xsl:if test="not(parent::d:citation)"> - <xsl:apply-templates select="$target" mode="xref-to-prefix"/> - </xsl:if> - - <xsl:apply-templates select="$target" mode="xref-to"> - <xsl:with-param name="referrer" select="."/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - </xsl:apply-templates> - - <xsl:if test="not(parent::d:citation)"> - <xsl:apply-templates select="$target" mode="xref-to-suffix"/> - </xsl:if> - </xsl:when> - - <xsl:otherwise> - <xsl:message> - <xsl:text>ERROR: xref linking to </xsl:text> - <xsl:value-of select="@linkend|@xlink:href"/> - <xsl:text> has no generated link text.</xsl:text> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:call-template name="simple.xlink"> - <xsl:with-param name="content" select="$content"/> - </xsl:call-template> - -</xsl:template> - -<!-- ==================================================================== --> - -<!-- biblioref handled largely like an xref --> -<!-- To be done: add support for begin, end, and units attributes --> -<xsl:template match="d:biblioref"> - <xsl:variable name="targets" select="key('id',@linkend)"/> - <xsl:variable name="target" select="$targets[1]"/> - <xsl:variable name="refelem" select="local-name($target)"/> - - <xsl:call-template name="check.id.unique"> - <xsl:with-param name="linkend" select="@linkend"/> - </xsl:call-template> - - <xsl:call-template name="anchor"/> - - <xsl:choose> - <xsl:when test="count($target) = 0"> - <xsl:message> - <xsl:text>XRef to nonexistent id: </xsl:text> - <xsl:value-of select="@linkend"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - - <xsl:when test="@endterm"> - <xsl:variable name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <a href="{$href}"> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:text>???</xsl:text> - </a> - </xsl:when> - <xsl:otherwise> - <a href="{$href}"> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:apply-templates select="$etarget" mode="endterm"/> - </a> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <xsl:when test="$target/@xreflabel"> - <a> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:attribute name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:attribute> - <xsl:call-template name="xref.xreflabel"> - <xsl:with-param name="target" select="$target"/> - </xsl:call-template> - </a> - </xsl:when> - - <xsl:otherwise> - <xsl:variable name="href"> - <xsl:call-template name="href.target"> - <xsl:with-param name="object" select="$target"/> - </xsl:call-template> - </xsl:variable> - - <xsl:if test="not(parent::d:citation)"> - <xsl:apply-templates select="$target" mode="xref-to-prefix"/> - </xsl:if> - - <a href="{$href}"> - <xsl:apply-templates select="." mode="class.attribute"/> - <xsl:if test="$target/d:title or $target/*/d:title"> - <xsl:attribute name="title"> - <xsl:apply-templates select="$target" mode="xref-title"/> - </xsl:attribute> - </xsl:if> - <xsl:apply-templates select="$target" mode="xref-to"> - <xsl:with-param name="referrer" select="."/> - <xsl:with-param name="xrefstyle"> - <xsl:choose> - <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0"> - <xsl:value-of select="@role"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@xrefstyle"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> - </xsl:apply-templates> - </a> - - <xsl:if test="not(parent::d:citation)"> - <xsl:apply-templates select="$target" mode="xref-to-suffix"/> - </xsl:if> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="*" mode="endterm"> - <!-- Process the children of the endterm element --> - <xsl:variable name="endterm"> - <xsl:apply-templates select="child::node()"/> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$exsl.node.set.available != 0"> - <xsl:apply-templates select="exsl:node-set($endterm)" mode="remove-ids"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$endterm"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="*" mode="remove-ids"> - <xsl:choose> - <!-- handle html or xhtml --> - <xsl:when test="local-name(.) = 'a' - and (namespace-uri(.) = '' - or namespace-uri(.) = 'http://www.w3.org/1999/xhtml')"> - <xsl:choose> - <xsl:when test="(@name and count(@*) = 1) - or (@id and count(@*) = 1) - or (@xml:id and count(@*) = 1) - or (@xml:id and @name and count(@*) = 2) - or (@id and @name and count(@*) = 2)"> - <xsl:message>suppress anchor</xsl:message> - <!-- suppress the whole thing --> - </xsl:when> - <xsl:otherwise> - <xsl:copy> - <xsl:for-each select="@*"> - <xsl:choose> - <xsl:when test="local-name(.) != 'name' and local-name(.) != 'id'"> - <xsl:copy/> - </xsl:when> - <xsl:otherwise> - <xsl:message>removing <xsl:value-of - select="local-name(.)"/></xsl:message> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> - </xsl:copy> - <xsl:apply-templates mode="remove-ids"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:copy> - <xsl:for-each select="@*"> - <xsl:choose> - <xsl:when test="local-name(.) != 'id'"> - <xsl:copy/> - </xsl:when> - <xsl:otherwise> - <xsl:message>removing <xsl:value-of - select="local-name(.)"/></xsl:message> - </xsl:otherwise> - </xsl:choose> - </xsl:for-each> - <xsl:apply-templates mode="remove-ids"/> - </xsl:copy> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="*" mode="xref-to-prefix"/> -<xsl:template match="*" mode="xref-to-suffix"/> - -<xsl:template match="*" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:if test="$verbose"> - <xsl:message> - <xsl:text>Don't know what gentext to create for xref to: "</xsl:text> - <xsl:value-of select="name(.)"/> - <xsl:text>", ("</xsl:text> - <xsl:value-of select="(@id|@xml:id)[1]"/> - <xsl:text>")</xsl:text> - </xsl:message> - </xsl:if> - <xsl:text>???</xsl:text> -</xsl:template> - -<xsl:template match="d:title" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <!-- if you xref to a title, xref to the parent... --> - <xsl:choose> - <!-- FIXME: how reliable is this? --> - <xsl:when test="contains(local-name(parent::*), 'info')"> - <xsl:apply-templates select="parent::*[2]" mode="xref-to"> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="parent::*" mode="xref-to"> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:abstract|d:authorblurb|d:personblurb|d:bibliodiv|d:bibliomset - |d:biblioset|d:blockquote|d:calloutlist|d:caution|d:colophon - |d:constraintdef|d:formalpara|d:glossdiv|d:important|d:indexdiv - |d:itemizedlist|d:legalnotice|d:lot|d:msg|d:msgexplan|d:msgmain - |d:msgrel|d:msgset|d:msgsub|d:note|d:orderedlist|d:partintro - |d:productionset|d:qandadiv|d:refsynopsisdiv|d:segmentedlist - |d:set|d:setindex|d:sidebar|d:tip|d:toc|d:variablelist|d:warning" - mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <!-- catch-all for things with (possibly optional) titles --> - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:author|d:editor|d:othercredit|d:personname" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - - <xsl:call-template name="person.name"/> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - - <xsl:call-template name="person.name.list"/> -</xsl:template> - -<xsl:template match="d:figure|d:example|d:table|d:equation" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:procedure" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:task" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:cmdsynopsis" mode="xref-to"> - <xsl:apply-templates select="(.//d:command)[1]" mode="xref"/> -</xsl:template> - -<xsl:template match="d:funcsynopsis" mode="xref-to"> - <xsl:apply-templates select="(.//d:function)[1]" mode="xref"/> -</xsl:template> - -<xsl:template match="d:dedication|d:acknowledgements|d:preface|d:chapter|d:appendix|d:article" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:bibliography" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:biblioentry|d:bibliomixed" mode="xref-to-prefix"> - <xsl:text>[</xsl:text> -</xsl:template> - -<xsl:template match="d:biblioentry|d:bibliomixed" mode="xref-to-suffix"> - <xsl:text>]</xsl:text> -</xsl:template> - -<xsl:template match="d:biblioentry|d:bibliomixed" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <!-- handles both biblioentry and bibliomixed --> - <xsl:choose> - <xsl:when test="string(.) = ''"> - <xsl:variable name="bib" select="document($bibliography.collection,.)"/> - <xsl:variable name="id" select="(@id|@xml:id)[1]"/> - <xsl:variable name="entry" select="$bib/d:bibliography/ - *[@id=$id or @xml:id=$id][1]"/> - <xsl:choose> - <xsl:when test="$entry"> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:number from="d:bibliography" count="d:biblioentry|d:bibliomixed" - level="any" format="1"/> - </xsl:when> - <xsl:when test="local-name($entry/*[1]) = 'abbrev'"> - <xsl:apply-templates select="$entry/*[1]"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="(@id|@xml:id)[1]"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>No bibliography entry: </xsl:text> - <xsl:value-of select="$id"/> - <xsl:text> found in </xsl:text> - <xsl:value-of select="$bibliography.collection"/> - </xsl:message> - <xsl:value-of select="(@id|@xml:id)[1]"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:choose> - <xsl:when test="$bibliography.numbered != 0"> - <xsl:number from="d:bibliography" count="d:biblioentry|d:bibliomixed" - level="any" format="1"/> - </xsl:when> - <xsl:when test="local-name(*[1]) = 'abbrev'"> - <xsl:apply-templates select="*[1]"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="(@id|@xml:id)[1]"/> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:glossary" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:glossentry" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - <xsl:choose> - <xsl:when test="$glossentry.show.acronym = 'primary'"> - <xsl:choose> - <xsl:when test="d:acronym|d:abbrev"> - <xsl:apply-templates select="(d:acronym|d:abbrev)[1]"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="d:glossterm[1]" mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="d:glossterm[1]" mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:glossterm|d:firstterm" mode="xref-to"> - <xsl:apply-templates/> -</xsl:template> - -<xsl:template match="d:index" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:listitem" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:section|d:simplesect - |d:sect1|d:sect2|d:sect3|d:sect4|d:sect5 - |d:refsect1|d:refsect2|d:refsect3|d:refsection" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - <!-- FIXME: What about "in Chapter X"? --> -</xsl:template> - -<xsl:template match="d:bridgehead" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - <!-- FIXME: What about "in Chapter X"? --> -</xsl:template> - -<xsl:template match="d:qandaset" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:qandadiv" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:qandaentry" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="d:question[1]" mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:question|d:answer" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:choose> - <xsl:when test="string-length(d:label) != 0"> - <xsl:apply-templates select="." mode="label.markup"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:part|d:reference" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:refentry" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - - <xsl:choose> - <xsl:when test="d:refmeta/d:refentrytitle"> - <xsl:apply-templates select="d:refmeta/d:refentrytitle"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="d:refnamediv/d:refname[1]"/> - </xsl:otherwise> - </xsl:choose> - <xsl:apply-templates select="d:refmeta/d:manvolnum"/> -</xsl:template> - -<xsl:template match="d:refnamediv" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="d:refname[1]" mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:refname" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates mode="xref-to"/> -</xsl:template> - -<xsl:template match="d:step" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Step'"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:apply-templates select="." mode="number"/> -</xsl:template> - -<xsl:template match="d:varlistentry" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="d:term[1]" mode="xref-to"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<xsl:template match="d:primary|d:secondary|d:tertiary" mode="xref-to"> - <xsl:value-of select="."/> -</xsl:template> - -<xsl:template match="d:indexterm" mode="xref-to"> - <xsl:value-of select="d:primary"/> -</xsl:template> - -<xsl:template match="d:varlistentry/d:term" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - - <!-- to avoid the comma that will be generated if there are several terms --> - <xsl:apply-templates/> -</xsl:template> - -<xsl:template match="d:co" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - - <xsl:apply-templates select="." mode="callout-bug"/> -</xsl:template> - -<xsl:template match="d:area|d:areaset" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - - <xsl:call-template name="callout-bug"> - <xsl:with-param name="conum"> - <xsl:apply-templates select="." mode="conumber"/> - </xsl:with-param> - </xsl:call-template> -</xsl:template> - -<xsl:template match="d:book" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> -</xsl:template> - -<!-- These are elements for which no link text exists, so an xref to one - uses the xrefstyle attribute if specified, or if not it falls back - to the container element's link text --> -<xsl:template match="d:para|d:phrase|d:simpara|d:anchor|d:quote" mode="xref-to"> - <xsl:param name="referrer"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="verbose" select="1"/> - - <xsl:variable name="context" select="(ancestor::d:simplesect - |ancestor::d:section - |ancestor::d:sect1 - |ancestor::d:sect2 - |ancestor::d:sect3 - |ancestor::d:sect4 - |ancestor::d:sect5 - |ancestor::d:refsection - |ancestor::d:refsect1 - |ancestor::d:refsect2 - |ancestor::d:refsect3 - |ancestor::d:chapter - |ancestor::d:appendix - |ancestor::d:preface - |ancestor::d:partintro - |ancestor::d:dedication - |ancestor::d:acknowledgements - |ancestor::d:colophon - |ancestor::d:bibliography - |ancestor::d:index - |ancestor::d:glossary - |ancestor::d:glossentry - |ancestor::d:listitem - |ancestor::d:varlistentry)[last()]"/> - - <xsl:choose> - <xsl:when test="$xrefstyle != ''"> - <xsl:apply-templates select="." mode="object.xref.markup"> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$context" mode="xref-to"> - <xsl:with-param name="purpose" select="'xref'"/> - <xsl:with-param name="xrefstyle" select="$xrefstyle"/> - <xsl:with-param name="referrer" select="$referrer"/> - <xsl:with-param name="verbose" select="$verbose"/> - </xsl:apply-templates> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="*" mode="xref-title"> - <xsl:variable name="title"> - <xsl:apply-templates select="." mode="object.title.markup"/> - </xsl:variable> - - <xsl:value-of select="$title"/> -</xsl:template> - -<xsl:template match="d:author" mode="xref-title"> - <xsl:variable name="title"> - <xsl:call-template name="person.name"/> - </xsl:variable> - - <xsl:value-of select="$title"/> -</xsl:template> - -<xsl:template match="d:authorgroup" mode="xref-title"> - <xsl:variable name="title"> - <xsl:call-template name="person.name.list"/> - </xsl:variable> - - <xsl:value-of select="$title"/> -</xsl:template> - -<xsl:template match="d:cmdsynopsis" mode="xref-title"> - <xsl:variable name="title"> - <xsl:apply-templates select="(.//d:command)[1]" mode="xref"/> - </xsl:variable> - - <xsl:value-of select="$title"/> -</xsl:template> - -<xsl:template match="d:funcsynopsis" mode="xref-title"> - <xsl:variable name="title"> - <xsl:apply-templates select="(.//d:function)[1]" mode="xref"/> - </xsl:variable> - - <xsl:value-of select="$title"/> -</xsl:template> - -<xsl:template match="d:biblioentry|d:bibliomixed" mode="xref-title"> - <!-- handles both biblioentry and bibliomixed --> - <xsl:variable name="title"> - <xsl:text>[</xsl:text> - <xsl:choose> - <xsl:when test="local-name(*[1]) = 'abbrev'"> - <xsl:apply-templates select="*[1]"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="(@id|@xml:id)[1]"/> - </xsl:otherwise> - </xsl:choose> - <xsl:text>]</xsl:text> - </xsl:variable> - - <xsl:value-of select="$title"/> -</xsl:template> - -<xsl:template match="d:step" mode="xref-title"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Step'"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:apply-templates select="." mode="number"/> -</xsl:template> - -<xsl:template match="d:step[not(./d:title)]" mode="title.markup"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'Step'"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:apply-templates select="." mode="number"/> -</xsl:template> - -<xsl:template match="d:co" mode="xref-title"> - <xsl:variable name="title"> - <xsl:apply-templates select="." mode="callout-bug"/> - </xsl:variable> - - <xsl:value-of select="$title"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:link" name="link"> - <xsl:param name="linkend" select="@linkend"/> - <xsl:param name="a.target"/> - <xsl:param name="xhref" select="@xlink:href"/> - - <xsl:variable name="content"> - <xsl:call-template name="anchor"/> - <xsl:choose> - <xsl:when test="count(child::node()) > 0"> - <!-- If it has content, use it --> - <xsl:apply-templates/> - </xsl:when> - <!-- else look for an endterm --> - <xsl:when test="@endterm"> - <xsl:variable name="etargets" select="key('id',@endterm)"/> - <xsl:variable name="etarget" select="$etargets[1]"/> - <xsl:choose> - <xsl:when test="count($etarget) = 0"> - <xsl:message> - <xsl:value-of select="count($etargets)"/> - <xsl:text>Endterm points to nonexistent ID: </xsl:text> - <xsl:value-of select="@endterm"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="$etarget" mode="endterm"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <!-- Use the xlink:href if no other text --> - <xsl:when test="@xlink:href"> - <xsl:value-of select="@xlink:href"/> - </xsl:when> - <xsl:otherwise> - <xsl:message> - <xsl:text>Link element has no content and no Endterm. </xsl:text> - <xsl:text>Nothing to show in the link to </xsl:text> - <xsl:value-of select="(@xlink:href|@linkend)[1]"/> - </xsl:message> - <xsl:text>???</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:call-template name="simple.xlink"> - <xsl:with-param name="node" select="."/> - <xsl:with-param name="linkend" select="$linkend"/> - <xsl:with-param name="content" select="$content"/> - <xsl:with-param name="a.target" select="$a.target"/> - <xsl:with-param name="xhref" select="$xhref"/> - </xsl:call-template> - -</xsl:template> - -<xsl:template match="d:ulink" name="ulink"> - <xsl:param name="url" select="@url"/> - <xsl:variable name="link"> - <a> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:if test="@id or @xml:id"> - <xsl:attribute name="name"> - <xsl:value-of select="(@id|@xml:id)[1]"/> - </xsl:attribute> - </xsl:if> - <xsl:attribute name="href"><xsl:value-of select="$url"/></xsl:attribute> - <xsl:if test="$ulink.target != ''"> - <xsl:attribute name="target"> - <xsl:value-of select="$ulink.target"/> - </xsl:attribute> - </xsl:if> - <xsl:choose> - <xsl:when test="count(child::node())=0"> - <xsl:value-of select="$url"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </a> - </xsl:variable> - - <xsl:choose> - <xsl:when test="function-available('suwl:unwrapLinks')"> - <xsl:copy-of select="suwl:unwrapLinks($link)"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$link"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:olink" name="olink"> - <!-- olink content may be passed in from xlink olink --> - <xsl:param name="content" select="NOTANELEMENT"/> - - <xsl:call-template name="anchor"/> - - <xsl:variable name="localinfo" select="@localinfo"/> - - <xsl:choose> - <!-- olinks resolved by stylesheet and target database --> - <xsl:when test="@targetdoc or @targetptr or - (@xlink:role=$xolink.role and - contains(@xlink:href, '#') )" > - - <xsl:variable name="targetdoc.att"> - <xsl:choose> - <xsl:when test="@targetdoc != ''"> - <xsl:value-of select="@targetdoc"/> - </xsl:when> - <xsl:when test="@xlink:role=$xolink.role and - contains(@xlink:href, '#')" > - <xsl:value-of select="substring-before(@xlink:href, '#')"/> - </xsl:when> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="targetptr.att"> - <xsl:choose> - <xsl:when test="@targetptr != ''"> - <xsl:value-of select="@targetptr"/> - </xsl:when> - <xsl:when test="@xlink:role=$xolink.role and - contains(@xlink:href, '#')" > - <xsl:value-of select="substring-after(@xlink:href, '#')"/> - </xsl:when> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="olink.lang"> - <xsl:call-template name="l10n.language"> - <xsl:with-param name="xref-context" select="true()"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="target.database.filename"> - <xsl:call-template name="select.target.database"> - <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/> - <xsl:with-param name="targetptr.att" select="$targetptr.att"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="target.database" - select="document($target.database.filename,/)"/> - - <xsl:if test="$olink.debug != 0"> - <xsl:message> - <xsl:text>Olink debug: root element of target.database '</xsl:text> - <xsl:value-of select="$target.database.filename"/> - <xsl:text>' is '</xsl:text> - <xsl:value-of select="local-name($target.database/*[1])"/> - <xsl:text>'.</xsl:text> - </xsl:message> - </xsl:if> - - <xsl:variable name="olink.key"> - <xsl:call-template name="select.olink.key"> - <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/> - <xsl:with-param name="targetptr.att" select="$targetptr.att"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - <xsl:with-param name="target.database" select="$target.database"/> - </xsl:call-template> - </xsl:variable> - - <xsl:if test="string-length($olink.key) = 0"> - <xsl:message> - <xsl:text>Error: unresolved olink: </xsl:text> - <xsl:text>targetdoc/targetptr = '</xsl:text> - <xsl:value-of select="$targetdoc.att"/> - <xsl:text>/</xsl:text> - <xsl:value-of select="$targetptr.att"/> - <xsl:text>'.</xsl:text> - </xsl:message> - </xsl:if> - - <xsl:variable name="href"> - <xsl:call-template name="make.olink.href"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="target.database" select="$target.database"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="hottext"> - <xsl:choose> - <xsl:when test="string-length($content) != 0"> - <xsl:copy-of select="$content"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="olink.hottext"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - <xsl:with-param name="target.database" select="$target.database"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="olink.docname.citation"> - <xsl:call-template name="olink.document.citation"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="target.database" select="$target.database"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="olink.page.citation"> - <xsl:call-template name="olink.page.citation"> - <xsl:with-param name="olink.key" select="$olink.key"/> - <xsl:with-param name="target.database" select="$target.database"/> - <xsl:with-param name="olink.lang" select="$olink.lang"/> - </xsl:call-template> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$href != ''"> - <a href="{$href}"> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:copy-of select="$hottext"/> - </a> - <xsl:copy-of select="$olink.page.citation"/> - <xsl:copy-of select="$olink.docname.citation"/> - </xsl:when> - <xsl:otherwise> - <span class="olink"><xsl:copy-of select="$hottext"/></span> - <xsl:copy-of select="$olink.page.citation"/> - <xsl:copy-of select="$olink.docname.citation"/> - </xsl:otherwise> - </xsl:choose> - - </xsl:when> - - <!-- Or use old olink mechanism --> - <xsl:otherwise> - <xsl:variable name="href"> - <xsl:choose> - <xsl:when test="@linkmode"> - <!-- use the linkmode to get the base URI, use localinfo as fragid --> - <xsl:variable name="modespec" select="key('id',@linkmode)"/> - <xsl:if test="count($modespec) != 1 - or local-name($modespec) != 'modespec'"> - <xsl:message>Warning: olink linkmode pointer is wrong.</xsl:message> - </xsl:if> - <xsl:value-of select="$modespec"/> - <xsl:if test="@localinfo"> - <xsl:text>#</xsl:text> - <xsl:value-of select="@localinfo"/> - </xsl:if> - </xsl:when> - <xsl:when test="@type = 'href'"> - <xsl:call-template name="olink.outline"> - <xsl:with-param name="outline.base.uri" - select="unparsed-entity-uri(@targetdocent)"/> - <xsl:with-param name="localinfo" select="@localinfo"/> - <xsl:with-param name="return" select="'href'"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$olink.resolver"/> - <xsl:text>?</xsl:text> - <xsl:value-of select="$olink.sysid"/> - <xsl:value-of select="unparsed-entity-uri(@targetdocent)"/> - <!-- XSL gives no access to the public identifier (grumble...) --> - <xsl:if test="@localinfo"> - <xsl:text>&</xsl:text> - <xsl:value-of select="$olink.fragid"/> - <xsl:value-of select="@localinfo"/> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$href != ''"> - <a href="{$href}"> - <xsl:apply-templates select="." mode="common.html.attributes"/> - <xsl:call-template name="olink.hottext"/> - </a> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="olink.hottext"/> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="*" mode="pagenumber.markup"> - <!-- no-op in HTML --> -</xsl:template> - - -<xsl:template name="olink.outline"> - <xsl:param name="outline.base.uri"/> - <xsl:param name="localinfo"/> - <xsl:param name="return" select="d:href"/> - - <xsl:variable name="outline-file" - select="concat($outline.base.uri, - $olink.outline.ext)"/> - - <xsl:variable name="outline" select="document($outline-file,.)/div"/> - - <xsl:variable name="node-href"> - <xsl:choose> - <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline// - *[@id=$localinfo or @xml:id=$localinfo]"/> - <xsl:value-of select="$node/@href"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$outline/@href"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="node-xref"> - <xsl:choose> - <xsl:when test="$localinfo != ''"> - <xsl:variable name="node" select="$outline// - *[@id=$localinfo or @xml:id=$localinfo]"/> - <xsl:copy-of select="$node/d:xref"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$outline/d:xref"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$return = 'href'"> - <xsl:value-of select="$node-href"/> - </xsl:when> - <xsl:when test="$return = 'xref'"> - <xsl:value-of select="$node-xref"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$node-xref"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template name="xref.xreflabel"> - <!-- called to process an xreflabel...you might use this to make --> - <!-- xreflabels come out in the right font for different targets, --> - <!-- for example. --> - <xsl:param name="target" select="."/> - <xsl:value-of select="$target/@xreflabel"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:title" mode="xref"> - <xsl:apply-templates/> -</xsl:template> - -<xsl:template match="d:command" mode="xref"> - <xsl:call-template name="inline.boldseq"/> -</xsl:template> - -<xsl:template match="d:function" mode="xref"> - <xsl:call-template name="inline.monoseq"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="*" mode="insert.title.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="title"/> - - <xsl:choose> - <!-- FIXME: what about the case where titleabbrev is inside the info? --> - <xsl:when test="$purpose = 'xref' and d:titleabbrev"> - <xsl:apply-templates select="." mode="titleabbrev.markup"/> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$title"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="d:chapter|d:appendix" mode="insert.title.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="title"/> - - <xsl:choose> - <xsl:when test="$purpose = 'xref'"> - <i> - <xsl:copy-of select="$title"/> - </i> - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$title"/> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<xsl:template match="*" mode="insert.subtitle.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="subtitle"/> - - <xsl:copy-of select="$subtitle"/> -</xsl:template> - -<xsl:template match="*" mode="insert.label.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="label"/> - - <xsl:copy-of select="$label"/> -</xsl:template> - -<xsl:template match="*" mode="insert.pagenumber.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="pagenumber"/> - - <xsl:copy-of select="$pagenumber"/> -</xsl:template> - -<xsl:template match="*" mode="insert.direction.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="direction"/> - - <xsl:copy-of select="$direction"/> -</xsl:template> - -<xsl:template match="*" mode="insert.olink.docname.markup"> - <xsl:param name="purpose"/> - <xsl:param name="xrefstyle"/> - <xsl:param name="docname"/> - - <span class="olinkdocname"> - <xsl:copy-of select="$docname"/> - </span> - -</xsl:template> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/htmlhelp-common.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/htmlhelp-common.xsl deleted file mode 100644 index 2c9a87c325b79ebad29d4b4737564220627a48f2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/htmlhelp-common.xsl +++ /dev/null @@ -1,1108 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE xsl:stylesheet [ -<!ENTITY lf '<xsl:text xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> </xsl:text>'> -]> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" - xmlns:exsl="http://exslt.org/common" - xmlns:set="http://exslt.org/sets" - xmlns:h="urn:x-hex" - xmlns:ng="http://docbook.org/docbook-ng" - xmlns:db="http://docbook.org/ns/docbook" - version="1.0" - exclude-result-prefixes="doc exsl set h db ng d"> - -<!-- ******************************************************************** - $Id: htmlhelp-common.xsl 8400 2009-04-08 07:44:54Z bobstayton $ - ******************************************************************** --> - -<!-- ==================================================================== --> -<!-- Customizations of standard HTML stylesheet parameters --> - -<!-- no navigation on pages by default, HTML Help provides its own navigation controls --> -<xsl:param name="suppress.navigation" select="1"/> - -<!-- no separate HTML page with index, index is built inside CHM index pane --> -<xsl:param name="generate.index" select="0"/> - -<!-- ==================================================================== --> - -<xsl:param name="htmlhelp.generate.index" select="//d:indexterm[1]|//db:indexterm[1]|//ng:indexterm[1]"/> - -<!-- Set up HTML Help flag --> -<xsl:variable name="htmlhelp.output" select="1"/> - -<!-- ==================================================================== --> - -<xsl:template match="/"> - - <!-- * Get a title for current doc so that we let the user --> - <!-- * know what document we are processing at this point. --> - <xsl:variable name="doc.title"> - <xsl:call-template name="get.doc.title"/> - </xsl:variable> - <xsl:choose> - - <xsl:when test="namespace-uri(*[1]) != 'http://docbook.org/ns/docbook'"> - <xsl:call-template name="log.message"> - <xsl:with-param name="level">Note</xsl:with-param> - <xsl:with-param name="source" select="$doc.title"/> - <xsl:with-param name="context-desc"> - <xsl:text>namesp. add</xsl:text> - </xsl:with-param> - <xsl:with-param name="message"> - <xsl:text>added namespace before processing</xsl:text> - </xsl:with-param> - </xsl:call-template> - <xsl:variable name="addns"> - <xsl:apply-templates mode="addNS"/> - </xsl:variable> - <xsl:apply-templates select="exsl:node-set($addns)"/> -</xsl:when> - <xsl:otherwise> - <xsl:if test="$htmlhelp.only != 1"> - <xsl:choose> - <xsl:when test="$rootid != ''"> - <xsl:choose> - <xsl:when test="count(key('id',$rootid)) = 0"> - <xsl:message terminate="yes"> - <xsl:text>ID '</xsl:text> - <xsl:value-of select="$rootid"/> - <xsl:text>' not found in document.</xsl:text> - </xsl:message> - </xsl:when> - <xsl:otherwise> - <xsl:message>Formatting from <xsl:value-of select="$rootid"/></xsl:message> - <xsl:apply-templates select="key('id',$rootid)" mode="process.root"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:if test="$collect.xref.targets = 'yes' or - $collect.xref.targets = 'only'"> - <xsl:apply-templates select="/" mode="collect.targets"/> - </xsl:if> - <xsl:if test="$collect.xref.targets != 'only'"> - <xsl:apply-templates select="/" mode="process.root"/> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - - - <xsl:if test="$collect.xref.targets != 'only'"> - <xsl:call-template name="hhp"/> - <xsl:call-template name="hhc"/> - <xsl:if test="($rootid = '' and //processing-instruction('dbhh')) or - ($rootid != '' and key('id',$rootid)//processing-instruction('dbhh'))"> - <xsl:call-template name="hh-map"/> - <xsl:call-template name="hh-alias"/> - </xsl:if> - <xsl:if test="$htmlhelp.generate.index"> - <xsl:call-template name="hhk"/> - </xsl:if> - </xsl:if> -</xsl:otherwise> -</xsl:choose> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template name="hhp"> - <xsl:call-template name="write.text.chunk"> - <xsl:with-param name="filename"> - <xsl:if test="$manifest.in.base.dir != 0"> - <xsl:value-of select="$base.dir"/> - </xsl:if> - <xsl:value-of select="$htmlhelp.hhp"/> - </xsl:with-param> - <xsl:with-param name="method" select="'text'"/> - <xsl:with-param name="content"> - <xsl:call-template name="hhp-main"/> - </xsl:with-param> - <xsl:with-param name="encoding" select="$htmlhelp.encoding"/> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - </xsl:call-template> -</xsl:template> - -<!-- ==================================================================== --> -<xsl:template name="hhp-main"> - - <xsl:variable name="raw.help.title"> - <xsl:choose> - <xsl:when test="$htmlhelp.title = ''"> - <xsl:choose> - <xsl:when test="$rootid != ''"> - <xsl:apply-templates select="key('id',$rootid)" mode="title.markup"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="/*" mode="title.markup"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$htmlhelp.title"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="help.title" select="normalize-space($raw.help.title)"/> - -<xsl:variable name="default.topic"> - <xsl:choose> - <xsl:when test="$htmlhelp.default.topic != ''"> - <xsl:value-of select="$htmlhelp.default.topic"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="make-relative-filename"> - <xsl:with-param name="base.dir"> - <xsl:if test="$manifest.in.base.dir = 0"> - <xsl:value-of select="$base.dir"/> - </xsl:if> - </xsl:with-param> - <xsl:with-param name="base.name"> - <xsl:choose> - <xsl:when test="$rootid != ''"> - <xsl:apply-templates select="key('id',$rootid)" mode="chunk-filename"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="/" mode="chunk-filename"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> -</xsl:variable> -<xsl:variable name="xnavigation"> - <xsl:text>0x</xsl:text> - <xsl:call-template name="toHex"> - <xsl:with-param name="n" select="9504 + $htmlhelp.show.menu * 65536 - + $htmlhelp.show.advanced.search * 131072 - + $htmlhelp.show.favorities * 4096 - + (1 - $htmlhelp.show.toolbar.text) * 64 - + $htmlhelp.remember.window.position * 262144"/> - </xsl:call-template> -</xsl:variable> -<xsl:variable name="xbuttons"> - <xsl:text>0x</xsl:text> - <xsl:call-template name="toHex"> - <xsl:with-param name="n" select="0 + $htmlhelp.button.hideshow * 2 - + $htmlhelp.button.back * 4 - + $htmlhelp.button.forward * 8 - + $htmlhelp.button.stop * 16 - + $htmlhelp.button.refresh * 32 - + $htmlhelp.button.home * 64 - + $htmlhelp.button.options * 4096 - + $htmlhelp.button.print * 8192 - + $htmlhelp.button.locate * 2048 - + $htmlhelp.button.jump1 * 262144 - + $htmlhelp.button.jump2 * 524288 - + $htmlhelp.button.next * 2097152 - + $htmlhelp.button.prev * 4194304 - + $htmlhelp.button.zoom * 1048576"/> - </xsl:call-template> -</xsl:variable> -<xsl:text>[OPTIONS] -</xsl:text> -<xsl:if test="$htmlhelp.generate.index"> -<xsl:text>Auto Index=Yes -</xsl:text></xsl:if> -<xsl:if test="$htmlhelp.hhc.binary != 0"> -<xsl:text>Binary TOC=Yes -</xsl:text></xsl:if> -<xsl:text>Compatibility=1.1 or later -Compiled file=</xsl:text><xsl:value-of select="$htmlhelp.chm"/><xsl:text> -Contents file=</xsl:text><xsl:value-of select="$htmlhelp.hhc"/><xsl:text> -</xsl:text> -<xsl:if test="$htmlhelp.hhp.window != ''"> -<xsl:text>Default Window=</xsl:text><xsl:value-of select="$htmlhelp.hhp.window"/><xsl:text> -</xsl:text></xsl:if> -<xsl:text>Default topic=</xsl:text><xsl:value-of select="$default.topic"/> -<xsl:text> -Display compile progress=</xsl:text> - <xsl:choose> - <xsl:when test="$htmlhelp.display.progress != 1"> - <xsl:text>No</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>Yes</xsl:text> - </xsl:otherwise> - </xsl:choose> -<xsl:text> -Full-text search=Yes -</xsl:text> -<xsl:if test="$htmlhelp.generate.index"> -<xsl:text>Index file=</xsl:text><xsl:value-of select="$htmlhelp.hhk"/><xsl:text> -</xsl:text></xsl:if> -<xsl:text>Language=</xsl:text> -<xsl:for-each select="*"> <!-- Change context from / to root element --> - <xsl:call-template name="gentext.template"> - <xsl:with-param name="context" select="'htmlhelp'"/> - <xsl:with-param name="name" select="'langcode'"/> - </xsl:call-template> -</xsl:for-each> -<xsl:text> -Title=</xsl:text> - <xsl:value-of select="$help.title"/> -<xsl:text> -Enhanced decompilation=</xsl:text> - <xsl:choose> - <xsl:when test="$htmlhelp.enhanced.decompilation != 0"> - <xsl:text>Yes</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>No</xsl:text> - </xsl:otherwise> - </xsl:choose> - -<xsl:if test="$htmlhelp.hhp.window != ''"> - <xsl:text> - -[WINDOWS] -</xsl:text> -<xsl:value-of select="$htmlhelp.hhp.window"/> -<xsl:text>="</xsl:text> -<xsl:value-of select="$help.title"/> -<xsl:text>","</xsl:text><xsl:value-of select="$htmlhelp.hhc"/> -<xsl:text>",</xsl:text> -<xsl:if test="$htmlhelp.generate.index"> - <xsl:text>"</xsl:text> - <xsl:value-of select="$htmlhelp.hhk"/> - <xsl:text>"</xsl:text> -</xsl:if> -<xsl:text>,"</xsl:text> -<xsl:value-of select="$default.topic"/> -<xsl:text>",</xsl:text> -<xsl:text>"</xsl:text> -<xsl:choose> - <xsl:when test="$htmlhelp.button.home != 0"> - <xsl:value-of select="$htmlhelp.button.home.url"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$default.topic"/> - </xsl:otherwise> -</xsl:choose> -<xsl:text>"</xsl:text> -<xsl:text>,</xsl:text> -<xsl:if test="$htmlhelp.button.jump1 != 0"> - <xsl:text>"</xsl:text> - <xsl:value-of select="$htmlhelp.button.jump1.url"/> - <xsl:text>"</xsl:text> -</xsl:if> -<xsl:text>,</xsl:text> -<xsl:if test="$htmlhelp.button.jump1 != 0"> - <xsl:text>"</xsl:text> - <xsl:value-of select="$htmlhelp.button.jump1.title"/> - <xsl:text>"</xsl:text> -</xsl:if> -<xsl:text>,</xsl:text> -<xsl:if test="$htmlhelp.button.jump2 != 0"> - <xsl:text>"</xsl:text> - <xsl:value-of select="$htmlhelp.button.jump2.url"/> - <xsl:text>"</xsl:text> -</xsl:if> -<xsl:text>,</xsl:text> -<xsl:if test="$htmlhelp.button.jump2 != 0"> - <xsl:text>"</xsl:text> - <xsl:value-of select="$htmlhelp.button.jump2.title"/> - <xsl:text>"</xsl:text> -</xsl:if> -<xsl:text>,</xsl:text> -<xsl:value-of select="$xnavigation"/> -<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.hhc.width"/><xsl:text>,</xsl:text> -<xsl:value-of select="$xbuttons"/> -<xsl:text>,</xsl:text><xsl:value-of select="$htmlhelp.window.geometry"/><xsl:text>,,,,,,,0 -</xsl:text> -</xsl:if> - -<!-- - Needs more investigation to generate propetly all fields -<xsl:text>search="</xsl:text> -<xsl:value-of select="normalize-space(//d:title[1])"/> -<xsl:text>","toc.hhc","index.hhk","</xsl:text> -<xsl:value-of select="$root.filename"/> -<xsl:text>.html","</xsl:text> -<xsl:value-of select="$root.filename"/> -<xsl:text>.html",,,,,</xsl:text> -<xsl:value-of select="$xnavigation"/> -<xsl:text>,</xsl:text> -<xsl:value-of select="$htmlhelp.hhc.width"/> -<xsl:text>,</xsl:text> -<xsl:value-of select="$xbuttons"/> -<xsl:text>,</xsl:text> -<xsl:value-of select="$htmlhelp.window.geometry"/> -<xsl:text>,,,,,2,,0 -</xsl:text> ---> - -<xsl:if test="$htmlhelp.hhp.windows"> - <xsl:value-of select="$htmlhelp.hhp.windows"/> -</xsl:if> -<xsl:text> - -[FILES] -</xsl:text> - -<xsl:choose> - <xsl:when test="$rootid != ''"> - <xsl:apply-templates select="key('id',$rootid)" mode="enumerate-files"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="/" mode="enumerate-files"/> - </xsl:otherwise> -</xsl:choose> - -<xsl:if test="$htmlhelp.enumerate.images"> - <xsl:variable name="imagelist"> - <xsl:choose> - <xsl:when test="$rootid != ''"> - <xsl:apply-templates select="key('id',$rootid)" mode="enumerate-images"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="/" mode="enumerate-images"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:choose> - <xsl:when test="$exsl.node.set.available != 0 - and function-available('set:distinct')"> - <xsl:for-each select="set:distinct(exsl:node-set($imagelist)/d:filename)"> - <xsl:value-of select="."/> - <xsl:text> </xsl:text> - </xsl:for-each> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$imagelist"/> - </xsl:otherwise> - </xsl:choose> -</xsl:if> - -<xsl:if test="($htmlhelp.force.map.and.alias != 0) or - ($rootid = '' and //processing-instruction('dbhh')) or - ($rootid != '' and key('id',$rootid)//processing-instruction('dbhh'))"> - <xsl:text> -[ALIAS] -#include </xsl:text><xsl:value-of select="$htmlhelp.alias.file"/><xsl:text> - -[MAP] -#include </xsl:text><xsl:value-of select="$htmlhelp.map.file"/><xsl:text> -</xsl:text> -</xsl:if> - -<xsl:value-of select="$htmlhelp.hhp.tail"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:graphic|d:inlinegraphic[@format!='linespecific']" mode="enumerate-images"> - <xsl:call-template name="write.filename.enumerate-images"> - <xsl:with-param name="filename"> - <xsl:call-template name="mediaobject.filename.enumerate-images"> - <xsl:with-param name="object" select="."/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> -</xsl:template> - -<xsl:template match="d:mediaobject|d:inlinemediaobject" mode="enumerate-images"> - <xsl:call-template name="select.mediaobject.enumerate-images"/> -</xsl:template> - -<xsl:template name="select.mediaobject.enumerate-images"> - <xsl:param name="olist" - select="d:imageobject|d:imageobjectco - |d:videoobject|d:audioobject|d:textobject"/> - <xsl:param name="count">1</xsl:param> - - <xsl:if test="$count <= count($olist)"> - <xsl:variable name="object" select="$olist[position()=$count]"/> - - <xsl:variable name="useobject"> - <xsl:choose> - <!-- The phrase is never used --> - <xsl:when test="name($object)='textobject' and $object/d:phrase"> - <xsl:text>0</xsl:text> - </xsl:when> - <!-- The first textobject is a reasonable fallback (but not for image in HH) --> - <xsl:when test="name($object)='textobject'"> - <xsl:text>0</xsl:text> - </xsl:when> - <!-- If there's only one object, use it --> - <xsl:when test="$count = 1 and count($olist) = 1"> - <xsl:text>1</xsl:text> - </xsl:when> - <!-- Otherwise, see if this one is a useable graphic --> - <xsl:otherwise> - <xsl:choose> - <!-- peek inside imageobjectco to simplify the test --> - <xsl:when test="local-name($object) = 'imageobjectco'"> - <xsl:call-template name="is.acceptable.mediaobject"> - <xsl:with-param name="object" select="$object/d:imageobject"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="is.acceptable.mediaobject"> - <xsl:with-param name="object" select="$object"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$useobject='1' and $object[not(*/@format='linespecific')]"> - <xsl:call-template name="write.filename.enumerate-images"> - <xsl:with-param name="filename"> - <xsl:call-template name="mediaobject.filename.enumerate-images"> - <xsl:with-param name="object" select="$object"/> - </xsl:call-template> - </xsl:with-param> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="select.mediaobject.enumerate-images"> - <xsl:with-param name="olist" select="$olist"/> - <xsl:with-param name="count" select="$count + 1"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - </xsl:if> -</xsl:template> - -<xsl:template name="mediaobject.filename.enumerate-images"> - <xsl:param name="object"/> - - <xsl:variable name="urifilename"> - <xsl:call-template name="mediaobject.filename"> - <xsl:with-param name="object" select="$object"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="filename"> - <xsl:choose> - <xsl:when test="starts-with($urifilename, 'file:/')"> - <xsl:value-of select="substring-after($urifilename, 'file:/')"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$urifilename"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:value-of select="translate($filename, '/', '\')"/> - -</xsl:template> - -<xsl:template match="text()" mode="enumerate-images"> -</xsl:template> - -<xsl:template name="write.filename.enumerate-images"> - <xsl:param name="filename"/> - <xsl:choose> - <xsl:when test="function-available('exsl:node-set') and function-available('set:distinct')"> - <filename><xsl:value-of select="$filename"/></filename> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$filename"/> - <xsl:text> </xsl:text> - </xsl:otherwise> - </xsl:choose> -</xsl:template> - -<!-- ==================================================================== --> - -<!-- HHC and HHK files are processed by compiler line by line - and therefore are very sensitive to whitespaces (linefeeds for sure). --> - -<xsl:template name="hhc"> - <xsl:call-template name="write.chunk"> - <xsl:with-param name="filename"> - <xsl:if test="$manifest.in.base.dir != 0"> - <xsl:value-of select="$base.dir"/> - </xsl:if> - <xsl:value-of select="$htmlhelp.hhc"/> - </xsl:with-param> - <xsl:with-param name="indent" select="'no'"/> - <xsl:with-param name="content"> - <xsl:call-template name="hhc-main"/> - </xsl:with-param> - <xsl:with-param name="encoding" select="$htmlhelp.encoding"/> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - </xsl:call-template> -</xsl:template> - -<xsl:template name="hhc-main"> -<HTML>&lf; - <HEAD></HEAD>&lf; - <BODY>&lf; - <xsl:if test="$htmlhelp.hhc.folders.instead.books != 0"> - <OBJECT type="text/site properties">&lf; - <param name="ImageType" value="Folder"/>&lf; - </OBJECT>&lf; - </xsl:if> - <xsl:variable name="content"> - <xsl:choose> - <xsl:when test="$rootid != ''"> - <xsl:apply-templates select="key('id',$rootid)" mode="hhc"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="/" mode="hhc"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$htmlhelp.hhc.show.root != 0"> - <UL>&lf; - <xsl:copy-of select="$content"/> - </UL>&lf; - </xsl:when> - <xsl:otherwise> - <xsl:copy-of select="$content"/> - </xsl:otherwise> - </xsl:choose> - - </BODY> -</HTML> -</xsl:template> - -<xsl:template name="hhc.entry"> - <xsl:param name="title"> - <xsl:if test="$htmlhelp.autolabel=1"> - <xsl:variable name="label.markup"> - <xsl:apply-templates select="." mode="label.markup"/> - </xsl:variable> - <xsl:if test="normalize-space($label.markup)"> - <xsl:value-of select="concat($label.markup,$autotoc.label.separator)"/> - </xsl:if> - </xsl:if> - <xsl:apply-templates select="." mode="title.markup"/> - </xsl:param> - - <LI><OBJECT type="text/sitemap">&lf; - <param name="Name"> - <xsl:attribute name="value"> - <xsl:value-of select="normalize-space($title)"/> - </xsl:attribute> - </param>&lf; - <param name="Local"> - <xsl:attribute name="value"> - <xsl:call-template name="href.target.with.base.dir"/> - </xsl:attribute> - </param> - </OBJECT></LI>&lf; -</xsl:template> - -<xsl:template match="d:set" mode="hhc"> - <xsl:if test="$htmlhelp.hhc.show.root != 0"> - <xsl:call-template name="hhc.entry"/> - </xsl:if> - <xsl:if test="d:book"> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - <UL> - <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0"> - <LI><OBJECT type="text/sitemap">&lf; - <param name="Name"> - <xsl:attribute name="value"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'TableofContents'"/> - </xsl:call-template> - </xsl:attribute> - </param>&lf; - <param name="Local"> - <xsl:attribute name="value"> - <xsl:choose> - <xsl:when test="$chunk.tocs.and.lots != 0"> - <xsl:apply-templates select="." mode="recursive-chunk-filename"> - <xsl:with-param name="recursive" select="true()"/> - </xsl:apply-templates> - <xsl:text>-toc</xsl:text> - <xsl:value-of select="$html.ext"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="href.target.with.base.dir"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - </param> - </OBJECT></LI>&lf; - </xsl:if> - <xsl:apply-templates select="d:book" mode="hhc"/> - </UL>&lf; - </xsl:if> -</xsl:template> - -<xsl:template match="d:book" mode="hhc"> - <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*"> - <xsl:call-template name="hhc.entry"/> - </xsl:if> - <xsl:if test="d:part|d:reference|d:preface|d:chapter|d:appendix|d:bibliography|d:article|d:colophon|d:glossary"> - <xsl:variable name="toc.params"> - <xsl:call-template name="find.path.params"> - <xsl:with-param name="table" select="normalize-space($generate.toc)"/> - </xsl:call-template> - </xsl:variable> - <UL> - <xsl:if test="contains($toc.params, 'toc') and $htmlhelp.hhc.show.root = 0 and not(parent::*)"> - <LI><OBJECT type="text/sitemap">&lf; - <param name="Name"> - <xsl:attribute name="value"> - <xsl:call-template name="gentext"> - <xsl:with-param name="key" select="'TableofContents'"/> - </xsl:call-template> - </xsl:attribute> - </param>&lf; - <param name="Local"> - <xsl:attribute name="value"> - <xsl:choose> - <xsl:when test="$chunk.tocs.and.lots != 0"> - <xsl:apply-templates select="." mode="recursive-chunk-filename"> - <xsl:with-param name="recursive" select="true()"/> - </xsl:apply-templates> - <xsl:text>-toc</xsl:text> - <xsl:value-of select="$html.ext"/> - </xsl:when> - <xsl:otherwise> - <xsl:call-template name="href.target.with.base.dir"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - </param> - </OBJECT></LI>&lf; - </xsl:if> - <xsl:apply-templates select="d:part|d:reference|d:preface|d:chapter|d:bibliography|d:appendix|d:article|d:colophon|d:glossary" - mode="hhc"/> - </UL>&lf; - </xsl:if> -</xsl:template> - -<xsl:template match="d:part|d:reference|d:preface|d:chapter|d:bibliography|d:appendix|d:article|d:glossary" - mode="hhc"> - <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*"> - <xsl:call-template name="hhc.entry"/> - </xsl:if> - <xsl:if test="d:article|d:reference|d:preface|d:chapter|d:appendix|d:refentry|d:section|d:sect1|d:bibliodiv"> - <UL>&lf; - <xsl:apply-templates - select="d:article|d:reference|d:preface|d:chapter|d:appendix|d:refentry|d:section|d:sect1|d:bibliodiv" - mode="hhc"/> - </UL> - </xsl:if> -</xsl:template> - -<xsl:template match="d:section" mode="hhc"> - <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*"> - <xsl:call-template name="hhc.entry"/> - </xsl:if> - <xsl:if test="d:section[count(ancestor::d:section) < $htmlhelp.hhc.section.depth]|d:refentry"> - <UL>&lf; - <xsl:apply-templates select="d:section|d:refentry" mode="hhc"/> - </UL> - </xsl:if> -</xsl:template> - -<xsl:template match="d:sect1" mode="hhc"> - <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*"> - <xsl:call-template name="hhc.entry"/> - </xsl:if> - <xsl:if test="d:sect2[$htmlhelp.hhc.section.depth > 1]|d:refentry"> - <UL>&lf; - <xsl:apply-templates select="d:sect2|d:refentry" - mode="hhc"/> - </UL> - </xsl:if> -</xsl:template> - -<xsl:template match="d:sect2" mode="hhc"> - <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*"> - <xsl:call-template name="hhc.entry"/> - </xsl:if> - <xsl:if test="d:sect3[$htmlhelp.hhc.section.depth > 2]|d:refentry"> - <UL>&lf; - <xsl:apply-templates select="d:sect3|d:refentry" - mode="hhc"/> - </UL> - </xsl:if> -</xsl:template> - -<xsl:template match="d:sect3" mode="hhc"> - <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*"> - <xsl:call-template name="hhc.entry"/> - </xsl:if> - <xsl:if test="d:sect4[$htmlhelp.hhc.section.depth > 3]|d:refentry"> - <UL>&lf; - <xsl:apply-templates select="d:sect4|d:refentry" - mode="hhc"/> - </UL> - </xsl:if> -</xsl:template> - -<xsl:template match="d:sect4" mode="hhc"> - <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*"> - <xsl:call-template name="hhc.entry"/> - </xsl:if> - <xsl:if test="d:sect5[$htmlhelp.hhc.section.depth > 4]|d:refentry"> - <UL>&lf; - <xsl:apply-templates select="d:sect5|d:refentry" - mode="hhc"/> - </UL> - </xsl:if> -</xsl:template> - -<xsl:template match="d:sect5|d:refentry|d:colophon|d:bibliodiv" mode="hhc"> - <xsl:if test="$htmlhelp.hhc.show.root != 0 or parent::*"> - <xsl:call-template name="hhc.entry"/> - </xsl:if> - <xsl:if test="d:refentry"> - <UL>&lf; - <xsl:apply-templates select="d:refentry" - mode="hhc"/> - </UL> - </xsl:if> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template match="d:indexterm"> - <xsl:choose> - <xsl:when test="$htmlhelp.use.hhk = 0"> - - <xsl:variable name="primary" select="normalize-space(d:primary)"/> - <xsl:variable name="secondary" select="normalize-space(d:secondary)"/> - <xsl:variable name="tertiary" select="normalize-space(d:tertiary)"/> - - <xsl:variable name="text"> - <xsl:value-of select="$primary"/> - <xsl:if test="d:secondary"> - <xsl:text>, </xsl:text> - <xsl:value-of select="$secondary"/> - </xsl:if> - <xsl:if test="d:tertiary"> - <xsl:text>, </xsl:text> - <xsl:value-of select="$tertiary"/> - </xsl:if> - </xsl:variable> - - <xsl:if test="d:secondary"> - <xsl:if test="not(//d:indexterm[normalize-space(d:primary)=$primary and not(d:secondary)])"> - <xsl:call-template name="write.indexterm"> - <xsl:with-param name="text" select="$primary"/> - </xsl:call-template> - </xsl:if> - </xsl:if> - - <xsl:if test="d:tertiary"> - <xsl:if test="not(//d:indexterm[normalize-space(d:primary)=$primary and - normalize-space(d:secondary)=$secondary and not(d:tertiary)])"> - <xsl:call-template name="write.indexterm"> - <xsl:with-param name="text" select="concat($primary, ', ', $secondary)"/> - </xsl:call-template> - </xsl:if> - </xsl:if> - - <xsl:call-template name="write.indexterm"> - <xsl:with-param name="text" select="$text"/> - </xsl:call-template> - - </xsl:when> - <xsl:otherwise> - <a> - <xsl:attribute name="name"> - <xsl:call-template name="object.id"/> - </xsl:attribute> - </a> - </xsl:otherwise> - - </xsl:choose> -</xsl:template> - -<xsl:template name="write.indexterm"> - <xsl:param name="text"/> - <OBJECT type="application/x-oleobject" - classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e"> - <param name="Keyword" value="{$text}"/> - </OBJECT> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template name="hhk"> - <xsl:call-template name="write.chunk"> - <xsl:with-param name="filename"> - <xsl:if test="$manifest.in.base.dir != 0"> - <xsl:value-of select="$base.dir"/> - </xsl:if> - <xsl:value-of select="$htmlhelp.hhk"/> - </xsl:with-param> - <xsl:with-param name="indent" select="'no'"/> - <xsl:with-param name="content"><xsl:text disable-output-escaping="yes"><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<HTML> -<HEAD> -<meta name="GENERATOR" content="Microsoft® HTML Help Workshop 4.1"> -<!-- Sitemap 1.0 --> -</HEAD><BODY> -<OBJECT type="text/site properties"> -</OBJECT> -<UL>]]> -</xsl:text> -<xsl:if test="($htmlhelp.use.hhk != 0) and $htmlhelp.generate.index"> - <xsl:choose> - <xsl:when test="$rootid != ''"> - <xsl:apply-templates select="key('id',$rootid)" mode="hhk"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="/" mode="hhk"/> - </xsl:otherwise> - </xsl:choose> -</xsl:if> -<xsl:text disable-output-escaping="yes"><![CDATA[</UL> -</BODY></HTML>]]> -</xsl:text></xsl:with-param> - <xsl:with-param name="encoding" select="$htmlhelp.encoding"/> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - </xsl:call-template> -</xsl:template> - -<xsl:template match="d:indexterm[@class='endofrange']" mode="hhk"/> - -<xsl:template match="d:indexterm" mode="hhk"> - <xsl:variable name="primary" select="normalize-space(d:primary)"/> - <xsl:variable name="secondary" select="normalize-space(d:secondary)"/> - <xsl:variable name="tertiary" select="normalize-space(d:tertiary)"/> - - <xsl:call-template name="write.indexterm.hhk"> - <xsl:with-param name="text" select="$primary"/> - <xsl:with-param name="seealso" select="d:seealso"/> - </xsl:call-template> - - <xsl:if test="d:secondary"> - <xsl:if test="not(//d:indexterm[normalize-space(d:primary)=$primary and not(d:secondary)])"> - <xsl:call-template name="write.indexterm.hhk"> - <!-- We must create fake entry when there is secondary without primary --> - <xsl:with-param name="text" select="$primary"/> - <xsl:with-param name="seealso" select="$primary"/> - </xsl:call-template> - </xsl:if> - <UL> - <xsl:call-template name="write.indexterm.hhk"> - <xsl:with-param name="text" select="$secondary"/> - <xsl:with-param name="seealso" select="d:secondary/d:seealso"/> - </xsl:call-template> - <xsl:if test="d:tertiary"> - <UL>&lf; - <xsl:call-template name="write.indexterm.hhk"> - <xsl:with-param name="text" select="$tertiary"/> - <xsl:with-param name="seealso" select="d:tertiary/d:seealso"/> - </xsl:call-template> - </UL> - </xsl:if> - </UL> - </xsl:if> - -</xsl:template> - -<xsl:template name="write.indexterm.hhk"> - <xsl:param name="text"/> - <xsl:param name="seealso"/> - - <LI> <OBJECT type="text/sitemap">&lf; - <param name="Name"> - <xsl:attribute name="value"> - <xsl:value-of select="$text"/> - </xsl:attribute> - </param>&lf; - - <xsl:if test="not(d:seealso)"> - <xsl:variable name="href"> - <xsl:call-template name="href.target.with.base.dir"/> - </xsl:variable> - <xsl:variable name="title"> - <xsl:call-template name="nearest.title"> - <xsl:with-param name="object" select=".."/> - </xsl:call-template> - </xsl:variable> - - <param name="Name"> - <xsl:attribute name="value"> - <xsl:value-of select="$title"/> - </xsl:attribute> - </param>&lf; - <param name="Local"> - <xsl:attribute name="value"> - <xsl:value-of select="$href"/> - </xsl:attribute> - </param>&lf; - </xsl:if> - - <xsl:if test="d:seealso"> - <param name="See Also"> - <xsl:attribute name="value"> - <xsl:value-of select="$seealso"/> - </xsl:attribute> - </param>&lf; - </xsl:if> - </OBJECT></LI> -</xsl:template> - -<xsl:template match="text()" mode="hhk"/> - -<xsl:template name="nearest.title"> - <xsl:param name="object"/> - <xsl:apply-templates select="$object/ancestor-or-self::*[d:title][1]" mode="title.markup"/> -</xsl:template> - -<!-- ==================================================================== --> - -<xsl:template name="hh-map"> - <xsl:call-template name="write.text.chunk"> - <xsl:with-param name="filename"> - <xsl:if test="$manifest.in.base.dir != 0"> - <xsl:value-of select="$base.dir"/> - </xsl:if> - <xsl:value-of select="$htmlhelp.map.file"/> - </xsl:with-param> - <xsl:with-param name="method" select="'text'"/> - <xsl:with-param name="content"> - <xsl:choose> - <xsl:when test="$rootid != ''"> - <xsl:apply-templates select="key('id',$rootid)" mode="hh-map"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="/" mode="hh-map"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> - <xsl:with-param name="encoding" select="$htmlhelp.encoding"/> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - </xsl:call-template> -</xsl:template> - -<xsl:template match="processing-instruction('dbhh')" mode="hh-map"> - <xsl:variable name="topicname"> - <xsl:call-template name="pi-attribute"> - <xsl:with-param name="pis" - select="."/> - <xsl:with-param name="attribute" select="'topicname'"/> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="topicid"> - <xsl:call-template name="pi-attribute"> - <xsl:with-param name="pis" - select="."/> - <xsl:with-param name="attribute" select="'topicid'"/> - </xsl:call-template> - </xsl:variable> - <xsl:text>#define </xsl:text> - <xsl:value-of select="$topicname"/> - <xsl:text> </xsl:text> - <xsl:value-of select="$topicid"/> - <xsl:text> </xsl:text> -</xsl:template> - -<xsl:template match="text()" mode="hh-map"/> - -<!-- ==================================================================== --> - -<xsl:template name="hh-alias"> - <xsl:call-template name="write.text.chunk"> - <xsl:with-param name="filename"> - <xsl:if test="$manifest.in.base.dir != 0"> - <xsl:value-of select="$base.dir"/> - </xsl:if> - <xsl:value-of select="$htmlhelp.alias.file"/> - </xsl:with-param> - <xsl:with-param name="method" select="'text'"/> - <xsl:with-param name="content"> - <xsl:choose> - <xsl:when test="$rootid != ''"> - <xsl:apply-templates select="key('id',$rootid)" mode="hh-alias"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="/" mode="hh-alias"/> - </xsl:otherwise> - </xsl:choose> - </xsl:with-param> - <xsl:with-param name="encoding" select="$htmlhelp.encoding"/> - <xsl:with-param name="quiet" select="$chunk.quietly"/> - </xsl:call-template> -</xsl:template> - -<xsl:template match="processing-instruction('dbhh')" mode="hh-alias"> - <xsl:variable name="topicname"> - <xsl:call-template name="pi-attribute"> - <xsl:with-param name="pis" - select="."/> - <xsl:with-param name="attribute" select="'topicname'"/> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="href"> - <xsl:call-template name="href.target.with.base.dir"> - <xsl:with-param name="object" select=".."/> - </xsl:call-template> - </xsl:variable> - <xsl:value-of select="$topicname"/> - <xsl:text>=</xsl:text> - <!-- Some versions of HH doesn't like fragment identifires, but some does. --> - <!-- <xsl:value-of select="substring-before(concat($href, '#'), '#')"/> --> - <xsl:value-of select="$href"/> - <xsl:text> </xsl:text> -</xsl:template> - -<xsl:template match="text()" mode="hh-alias"/> - -<!-- ==================================================================== --> -<!-- This code can be used to convert any number to hexadecimal format --> - - <h:hex> - <d>0</d> - <d>1</d> - <d>2</d> - <d>3</d> - <d>4</d> - <d>5</d> - <d>6</d> - <d>7</d> - <d>8</d> - <d>9</d> - <d>A</d> - <d>B</d> - <d>C</d> - <d>D</d> - <d>E</d> - <d>F</d> - </h:hex> - - <xsl:template name="toHex"> - <xsl:param name="n" select="0"/> - <xsl:param name="digit" select="$n mod 16"/> - <xsl:param name="rest" select="floor($n div 16)"/> - <xsl:if test="$rest > 0"> - <xsl:call-template name="toHex"> - <xsl:with-param name="n" select="$rest"/> - </xsl:call-template> - </xsl:if> - <xsl:value-of select="document('')//h:hex/d[$digit+1]"/> - </xsl:template> - -<!-- ==================================================================== --> -<!-- Modification to standard HTML stylesheets --> - -<!-- There are links from ToC pane to bibliodivs, so there must be anchor --> -<xsl:template match="d:bibliodiv/d:title"> - <h3 class="{name(.)}"> - <xsl:call-template name="anchor"> - <xsl:with-param name="node" select=".."/> - <xsl:with-param name="conditional" select="0"/> - </xsl:call-template> - <xsl:apply-templates/> - </h3> -</xsl:template> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/htmlhelp.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/htmlhelp.xsl deleted file mode 100644 index 901648d058b1139b4845a2bbc0191e0d746cb4dc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/htmlhelp.xsl +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" -xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" - xmlns:exsl="http://exslt.org/common" - xmlns:set="http://exslt.org/sets" - version="1.0" - exclude-result-prefixes="doc exsl set d"> - -<!-- ******************************************************************** - $Id: htmlhelp.xsl 1676 2002-06-12 13:21:54Z kosek $ - ******************************************************************** - - This file is used by htmlhelp.xsl if you want to generate source - files for HTML Help. It is based on the XSL DocBook Stylesheet - distribution (especially on JavaHelp code) from Norman Walsh. - - ******************************************************************** --> - -<xsl:import href="../html/chunk.xsl"/> -<xsl:include href="htmlhelp-common.xsl"/> - -</xsl:stylesheet> diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html deleted file mode 100644 index 906b221d84b2a67d3b1ebee7a4f0aaea4b82827f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> - <head> - <title>Index of /release/xsl-ns/1.76.1/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/htmlhelp

    -
    Icon  Name                        Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 966 -[TXT] profile-htmlhelp.xsl 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp-common.xsl 01-Nov-2010 20:31 37K -[TXT] profile-htmlhelp-common.xsl 01-Nov-2010 20:31 38K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=D;O=A deleted file mode 100644 index 665ca4f972ac3755c46993132b9ce9c2123f5a99..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=D;O=A +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/htmlhelp

    -
    Icon  Name                        Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp-common.xsl 01-Nov-2010 20:31 37K -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 966 -[TXT] profile-htmlhelp-common.xsl 01-Nov-2010 20:31 38K -[TXT] profile-htmlhelp.xsl 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=D;O=D deleted file mode 100644 index 1e3e9a9cc069c470710918f894b65500b85c6144..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=D;O=D +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/htmlhelp

    -
    Icon  Name                        Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-htmlhelp.xsl 01-Nov-2010 20:31 1.0K -[TXT] profile-htmlhelp-common.xsl 01-Nov-2010 20:31 38K -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 966 -[TXT] htmlhelp-common.xsl 01-Nov-2010 20:31 37K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=M;O=A deleted file mode 100644 index bb31c2a4f7604aab5be8f4efd07d921c020c49c4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=M;O=A +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/htmlhelp

    -
    Icon  Name                        Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp-common.xsl 01-Nov-2010 20:31 37K -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 966 -[TXT] profile-htmlhelp-common.xsl 01-Nov-2010 20:31 38K -[TXT] profile-htmlhelp.xsl 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=M;O=D deleted file mode 100644 index 1e3e9a9cc069c470710918f894b65500b85c6144..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=M;O=D +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/htmlhelp

    -
    Icon  Name                        Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-htmlhelp.xsl 01-Nov-2010 20:31 1.0K -[TXT] profile-htmlhelp-common.xsl 01-Nov-2010 20:31 38K -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 966 -[TXT] htmlhelp-common.xsl 01-Nov-2010 20:31 37K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=N;O=A deleted file mode 100644 index b006d6ac83e8a76155afde5c6d00bac16ddecf2d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=N;O=A +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/htmlhelp

    -
    Icon  Name                        Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp-common.xsl 01-Nov-2010 20:31 37K -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 966 -[TXT] profile-htmlhelp-common.xsl 01-Nov-2010 20:31 38K -[TXT] profile-htmlhelp.xsl 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=N;O=D deleted file mode 100644 index 1e3e9a9cc069c470710918f894b65500b85c6144..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=N;O=D +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/htmlhelp

    -
    Icon  Name                        Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-htmlhelp.xsl 01-Nov-2010 20:31 1.0K -[TXT] profile-htmlhelp-common.xsl 01-Nov-2010 20:31 38K -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 966 -[TXT] htmlhelp-common.xsl 01-Nov-2010 20:31 37K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=S;O=A deleted file mode 100644 index 906b221d84b2a67d3b1ebee7a4f0aaea4b82827f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=S;O=A +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/htmlhelp

    -
    Icon  Name                        Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 966 -[TXT] profile-htmlhelp.xsl 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp-common.xsl 01-Nov-2010 20:31 37K -[TXT] profile-htmlhelp-common.xsl 01-Nov-2010 20:31 38K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=S;O=D deleted file mode 100644 index 711b663fc27f897a7d75e49d85208fae9475a7cb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/index.html?C=S;O=D +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/htmlhelp

    -
    Icon  Name                        Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-htmlhelp-common.xsl 01-Nov-2010 20:31 38K -[TXT] htmlhelp-common.xsl 01-Nov-2010 20:31 37K -[TXT] profile-htmlhelp.xsl 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 966 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/profile-htmlhelp-common.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/profile-htmlhelp-common.xsl deleted file mode 100644 index 53eb761adf820e3a996f49a5e04695907bb23a7d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/profile-htmlhelp-common.xsl +++ /dev/null @@ -1,1082 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - Formatting from - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0x - - - - - - 0x - - - - -[OPTIONS] - - -Auto Index=Yes - - -Binary TOC=Yes - -Compatibility=1.1 or later -Compiled file= -Contents file= - - -Default Window= - -Default topic= - -Display compile progress= - - - No - - - Yes - - - -Full-text search=Yes - - -Index file= - -Language= - - - - - - - -Title= - - -Enhanced decompilation= - - - Yes - - - No - - - - - - -[WINDOWS] - - -=" - -"," -", - - " - - " - -," - -", -" - - - - - - - - -" -, - - " - - " - -, - - " - - " - -, - - " - - " - -, - - " - - " - -, - -,, - -,,,,,,,,0 - - - - - - - - - - -[FILES] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[ALIAS] -#include - -[MAP] -#include - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - 0 - - - - 0 - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      - - -
    - -
    - - - -
    - - - -
    - - - - - - - - - - - - - - -
  • - - - - - - - - - - - - -
  • - -
    - - - - - - - - - - - -
      - -
    • - - - - - - - - - - - - - - - - - -toc - - - - - - - - -
    • - -
      - -
    - -
    -
    - - - - - - - - - - - -
      - -
    • - - - - - - - - - - - - - - - - - -toc - - - - - - - - -
    • - -
      - -
    - -
    -
    - - - - - - -
      - - -
    -
    -
    - - - - - - -
      - - -
    -
    -
    - - - - - - -
      - - -
    -
    -
    - - - - - - -
      - - -
    -
    -
    - - - - - - -
      - - -
    -
    -
    - - - - - - -
      - - -
    -
    -
    - - - - - - -
      - - -
    -
    -
    - - - - - - - - - - - - - - - , - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<HTML> -<HEAD> -<meta name="GENERATOR" content="Microsoft&reg; HTML Help Workshop 4.1"> -<!-- Sitemap 1.0 --> -</HEAD><BODY> -<OBJECT type="text/site properties"> -</OBJECT> -<UL> - - - - - - - - - - - -</UL> -</BODY></HTML> - - - - - - - - - - - - - - - - - - - - - - - - - - -
      - - - - - -
        - - - - - -
      -
      -
    -
    - -
    - - - - - -
  • - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #define - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - - - - - - - - - - - - - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - A - B - C - D - E - F - - - - - - - - - - - - - - - - - - - -

    - - - - - -

    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/profile-htmlhelp.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/profile-htmlhelp.xsl deleted file mode 100644 index 75b5f6f7e59772fcb3378b015f7530726cb1c097..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/htmlhelp/profile-htmlhelp.xsl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/annot-close.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/annot-close.png deleted file mode 100644 index b9e1a0d5271d46b85a25b0e2d631a53d82850515..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/annot-close.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/annot-open.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/annot-open.png deleted file mode 100644 index 71040ec80afcf4fcea6abc5d275668a9e827d081..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/annot-open.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/blank.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/blank.png deleted file mode 100644 index 764bf4f0c3bb4a09960b04b6fa9c9024bca703bc..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/blank.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/1.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/1.gif deleted file mode 100644 index 9e7a87f75461ce41cc91ee68246c7bfb47d37ca3..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/1.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/1.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/1.png deleted file mode 100644 index 7d473430b7bec514f7de12f5769fe7c5859e8c5d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/1.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/1.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/1.svg deleted file mode 100644 index e2e87dc5268b38548a996acc2e1a83f6f3e504c8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/1.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/10.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/10.gif deleted file mode 100644 index e80f7f8e632e72463866c08beba2bfb3b17221e9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/10.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/10.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/10.png deleted file mode 100644 index 997bbc8246a316e040e0804174ba260e219d7d33..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/10.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/10.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/10.svg deleted file mode 100644 index 4740f587bd210f341d79c70742d30f3edc63a918..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/10.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/11.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/11.gif deleted file mode 100644 index 67f91a239d66d622f8d254539b6fd580efa42b02..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/11.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/11.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/11.png deleted file mode 100644 index ce47dac3f52ac49017749a3fea53db57d006993c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/11.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/11.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/11.svg deleted file mode 100644 index 09a0b2cf71cf8069507a34eb1043cfd405f4bdff..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/11.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/12.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/12.gif deleted file mode 100644 index 54c4b42f1901629a81924c2f0f59338104adeedd..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/12.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/12.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/12.png deleted file mode 100644 index 31daf4e2f25b6712499ee32de9c2e3b050b691ca..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/12.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/12.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/12.svg deleted file mode 100644 index 9794044c718205cfca2f73beaf55158cb3b1f52e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/12.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/13.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/13.gif deleted file mode 100644 index dd5d7d9b6439affca376bcd60785d528a24ce425..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/13.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/13.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/13.png deleted file mode 100644 index 14021a89c2ed3d4881afea6e3a315bce4f95efce..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/13.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/13.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/13.svg deleted file mode 100644 index 64268bb4fa29c87b2af11b0c60d2fda24d433f4a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/13.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/14.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/14.gif deleted file mode 100644 index 3d7a952a310523200521c1fa87b943637b5d1347..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/14.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/14.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/14.png deleted file mode 100644 index 64014b75fe2e84d45ed861974c72462727979360..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/14.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/14.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/14.svg deleted file mode 100644 index 469aa9748768174855a209430899fabe62308614..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/14.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/15.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/15.gif deleted file mode 100644 index 1c9183d5bb619eb608a5b7543f042ae7fd18684b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/15.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/15.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/15.png deleted file mode 100644 index 0d65765fcf13dcfd87914744dec8bda115e4adf1..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/15.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/15.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/15.svg deleted file mode 100644 index 8202233ef05f9ce17e596e6c1274936b8caf2419..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/15.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/16.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/16.svg deleted file mode 100644 index 01d6bf8164f8e89012b523572730bf6e8ae5f796..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/16.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/17.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/17.svg deleted file mode 100644 index 0a04c5560eb42f16487c94f05121a039baec60a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/17.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/18.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/18.svg deleted file mode 100644 index 1cb891b34dcd510626407e543165f2c5735a8673..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/18.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/19.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/19.svg deleted file mode 100644 index e6fbb179fc234eefea03eb880dbd0d3274fb8bcc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/19.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/2.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/2.gif deleted file mode 100644 index 94d42a30f99b87314127dcd44e6162c2fdf26e6e..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/2.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/2.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/2.png deleted file mode 100644 index 5d09341b2f6d2ea2d1d5dad5d980f14b4b05dfd2..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/2.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/2.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/2.svg deleted file mode 100644 index 07d03395d034fa942fc4b5ce9eae20ecfbe2043c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/2.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/20.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/20.svg deleted file mode 100644 index ccbfd403193a1fe110c36d7a36dad1b6735d6b6c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/20.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/21.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/21.svg deleted file mode 100644 index 93ec53fdd99049c171c274ce2af44d9f7bb43c72..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/21.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/22.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/22.svg deleted file mode 100644 index f48c5f3fd1e67be1cac24b40af1b17b622e54eb3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/22.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/23.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/23.svg deleted file mode 100644 index 6624212957156d5051a9a0adfc4ad4fea2c65cdf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/23.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/24.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/24.svg deleted file mode 100644 index a3d552535ffbea997a3712ce191883897df8debd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/24.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/25.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/25.svg deleted file mode 100644 index 56614a979a59093562e6384cedbc6cdfdff02628..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/25.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/26.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/26.svg deleted file mode 100644 index 56faeaca300660828c12eb397e31de482d721d0e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/26.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/27.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/27.svg deleted file mode 100644 index a75c8121595dae694668b73c2213cd1dabc6a199..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/27.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/28.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/28.svg deleted file mode 100644 index 7f8cf1a350152d2ac4abe49cd33f915aaf14c253..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/28.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/29.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/29.svg deleted file mode 100644 index cb63adf1fe0f2385133a5f3f03c94fae31aee7dd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/29.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/3.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/3.gif deleted file mode 100644 index dd3541a1bc25307e41416082525903a2337a2a43..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/3.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/3.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/3.png deleted file mode 100644 index ef7b70047158970cf4e09f1bab2954d39c2d596b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/3.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/3.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/3.svg deleted file mode 100644 index 918be806f47e23fd9000b89aceea976b1fafec2d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/3.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/30.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/30.svg deleted file mode 100644 index dc43ba1e3ccba1c6ebd68b7d1b35e35b36b3df81..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/30.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - -]> - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/4.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/4.gif deleted file mode 100644 index 4bcbf7e31a17497e65fa0ccc9756961130be6ac7..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/4.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/4.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/4.png deleted file mode 100644 index adb8364eb5d21ecdd4086e16110b62ddcb42aa4a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/4.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/4.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/4.svg deleted file mode 100644 index 8eb6a53b3b1efca1261933b03360781be935920d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/4.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/5.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/5.gif deleted file mode 100644 index 1c62b4f920936c063c93d8551158a80500dfefbe..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/5.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/5.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/5.png deleted file mode 100644 index 4d7eb460021e845981861d77614539314f553993..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/5.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/5.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/5.svg deleted file mode 100644 index ca7a9f22f63381e9e2b691d104ba0d611886eeae..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/5.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/6.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/6.gif deleted file mode 100644 index 23bc5555d2a467d6c3025d7f334a2b5546bd4fd9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/6.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/6.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/6.png deleted file mode 100644 index 0ba694af6c07d947d219b45a629bd32c60a0f5fe..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/6.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/6.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/6.svg deleted file mode 100644 index 783a0b9d774b9f10689d101066709070425faa53..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/6.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/7.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/7.gif deleted file mode 100644 index e55ce89585a8d5f80cc1a83df537578983a4d8e5..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/7.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/7.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/7.png deleted file mode 100644 index 472e96f8ac36862c5645732f2fff19d06ee11a8e..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/7.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/7.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/7.svg deleted file mode 100644 index 59b3714b5648fa2d6df8498e3ab6db3e621d4468..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/7.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/8.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/8.gif deleted file mode 100644 index 49375e09f4cc6397837fbb494c6c3cb1bca7091b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/8.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/8.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/8.png deleted file mode 100644 index 5e60973c213b37df93666c5a00724f34493974ae..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/8.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/8.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/8.svg deleted file mode 100644 index c1803a3c0d7c23476a5dbb71fdcfac5a69f2c85a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/8.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/9.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/9.gif deleted file mode 100644 index da12a4fe2825716c78f2d23c2f87afde98d3dd3e..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/9.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/9.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/9.png deleted file mode 100644 index a0676d26cc2ff1de12c4ecdeefb44a0d71bc6bde..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/9.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/9.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/9.svg deleted file mode 100644 index bc149d3cb21332c45005ab997b85da8a9fdb5193..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/9.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - -]> - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html deleted file mode 100644 index c95dce7045c9a582b0e66c704d4f8c9cd4484090..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/callouts - - -

    Index of /release/xsl-ns/1.76.1/images/callouts

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] 11.gif 01-Nov-2010 20:31 202 -[IMG] 14.gif 01-Nov-2010 20:31 205 -[IMG] 13.gif 01-Nov-2010 20:31 209 -[IMG] 12.gif 01-Nov-2010 20:31 210 -[IMG] 15.gif 01-Nov-2010 20:31 210 -[IMG] 6.gif 01-Nov-2010 20:31 218 -[IMG] 1.png 01-Nov-2010 20:31 329 -[IMG] 7.png 01-Nov-2010 20:31 344 -[IMG] 4.png 01-Nov-2010 20:31 345 -[IMG] 5.png 01-Nov-2010 20:31 348 -[IMG] 3.png 01-Nov-2010 20:31 350 -[IMG] 2.png 01-Nov-2010 20:31 353 -[IMG] 6.png 01-Nov-2010 20:31 355 -[IMG] 8.png 01-Nov-2010 20:31 357 -[IMG] 9.png 01-Nov-2010 20:31 357 -[IMG] 10.png 01-Nov-2010 20:31 361 -[IMG] 14.png 01-Nov-2010 20:31 411 -[IMG] 11.png 01-Nov-2010 20:31 565 -[IMG] 12.png 01-Nov-2010 20:31 617 -[IMG] 13.png 01-Nov-2010 20:31 623 -[IMG] 15.png 01-Nov-2010 20:31 640 -[IMG] 1.svg 01-Nov-2010 20:31 703 -[IMG] 7.svg 01-Nov-2010 20:31 738 -[IMG] 4.svg 01-Nov-2010 20:31 783 -[IMG] 11.svg 01-Nov-2010 20:31 827 -[IMG] 17.svg 01-Nov-2010 20:31 866 -[IMG] 1.gif 01-Nov-2010 20:31 889 -[IMG] 14.svg 01-Nov-2010 20:31 906 -[IMG] 2.gif 01-Nov-2010 20:31 907 -[IMG] 4.gif 01-Nov-2010 20:31 907 -[IMG] 7.gif 01-Nov-2010 20:31 907 -[IMG] 3.gif 01-Nov-2010 20:31 914 -[IMG] 5.gif 01-Nov-2010 20:31 916 -[IMG] 8.gif 01-Nov-2010 20:31 918 -[IMG] 9.gif 01-Nov-2010 20:31 923 -[IMG] 2.svg 01-Nov-2010 20:31 926 -[IMG] 10.gif 01-Nov-2010 20:31 929 -[IMG] 5.svg 01-Nov-2010 20:31 967 -[IMG] 10.svg 01-Nov-2010 20:31 1.0K -[IMG] 12.svg 01-Nov-2010 20:31 1.0K -[IMG] 21.svg 01-Nov-2010 20:31 1.0K -[IMG] 3.svg 01-Nov-2010 20:31 1.0K -[IMG] 9.svg 01-Nov-2010 20:31 1.0K -[IMG] 27.svg 01-Nov-2010 20:31 1.1K -[IMG] 15.svg 01-Nov-2010 20:31 1.1K -[IMG] 6.svg 01-Nov-2010 20:31 1.1K -[IMG] 24.svg 01-Nov-2010 20:31 1.1K -[IMG] 13.svg 01-Nov-2010 20:31 1.2K -[IMG] 19.svg 01-Nov-2010 20:31 1.2K -[IMG] 8.svg 01-Nov-2010 20:31 1.2K -[IMG] 16.svg 01-Nov-2010 20:31 1.2K -[IMG] 20.svg 01-Nov-2010 20:31 1.2K -[IMG] 22.svg 01-Nov-2010 20:31 1.2K -[IMG] 25.svg 01-Nov-2010 20:31 1.3K -[IMG] 18.svg 01-Nov-2010 20:31 1.3K -[IMG] 30.svg 01-Nov-2010 20:31 1.4K -[IMG] 23.svg 01-Nov-2010 20:31 1.4K -[IMG] 29.svg 01-Nov-2010 20:31 1.4K -[IMG] 26.svg 01-Nov-2010 20:31 1.4K -[IMG] 28.svg 01-Nov-2010 20:31 1.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=D;O=A deleted file mode 100644 index 4196b40fb981e5cf2c16d35d57cc45a862f9ca09..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=D;O=A +++ /dev/null @@ -1,71 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/callouts - - -

    Index of /release/xsl-ns/1.76.1/images/callouts

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] 1.gif 01-Nov-2010 20:31 889 -[IMG] 1.png 01-Nov-2010 20:31 329 -[IMG] 1.svg 01-Nov-2010 20:31 703 -[IMG] 10.gif 01-Nov-2010 20:31 929 -[IMG] 10.png 01-Nov-2010 20:31 361 -[IMG] 10.svg 01-Nov-2010 20:31 1.0K -[IMG] 11.gif 01-Nov-2010 20:31 202 -[IMG] 11.png 01-Nov-2010 20:31 565 -[IMG] 11.svg 01-Nov-2010 20:31 827 -[IMG] 12.gif 01-Nov-2010 20:31 210 -[IMG] 12.png 01-Nov-2010 20:31 617 -[IMG] 12.svg 01-Nov-2010 20:31 1.0K -[IMG] 13.gif 01-Nov-2010 20:31 209 -[IMG] 13.png 01-Nov-2010 20:31 623 -[IMG] 13.svg 01-Nov-2010 20:31 1.2K -[IMG] 14.gif 01-Nov-2010 20:31 205 -[IMG] 14.png 01-Nov-2010 20:31 411 -[IMG] 14.svg 01-Nov-2010 20:31 906 -[IMG] 15.gif 01-Nov-2010 20:31 210 -[IMG] 15.png 01-Nov-2010 20:31 640 -[IMG] 15.svg 01-Nov-2010 20:31 1.1K -[IMG] 16.svg 01-Nov-2010 20:31 1.2K -[IMG] 17.svg 01-Nov-2010 20:31 866 -[IMG] 18.svg 01-Nov-2010 20:31 1.3K -[IMG] 19.svg 01-Nov-2010 20:31 1.2K -[IMG] 2.gif 01-Nov-2010 20:31 907 -[IMG] 2.png 01-Nov-2010 20:31 353 -[IMG] 2.svg 01-Nov-2010 20:31 926 -[IMG] 20.svg 01-Nov-2010 20:31 1.2K -[IMG] 21.svg 01-Nov-2010 20:31 1.0K -[IMG] 22.svg 01-Nov-2010 20:31 1.2K -[IMG] 23.svg 01-Nov-2010 20:31 1.4K -[IMG] 24.svg 01-Nov-2010 20:31 1.1K -[IMG] 25.svg 01-Nov-2010 20:31 1.3K -[IMG] 26.svg 01-Nov-2010 20:31 1.4K -[IMG] 27.svg 01-Nov-2010 20:31 1.1K -[IMG] 28.svg 01-Nov-2010 20:31 1.5K -[IMG] 29.svg 01-Nov-2010 20:31 1.4K -[IMG] 3.gif 01-Nov-2010 20:31 914 -[IMG] 3.png 01-Nov-2010 20:31 350 -[IMG] 3.svg 01-Nov-2010 20:31 1.0K -[IMG] 30.svg 01-Nov-2010 20:31 1.4K -[IMG] 4.gif 01-Nov-2010 20:31 907 -[IMG] 4.png 01-Nov-2010 20:31 345 -[IMG] 4.svg 01-Nov-2010 20:31 783 -[IMG] 5.gif 01-Nov-2010 20:31 916 -[IMG] 5.png 01-Nov-2010 20:31 348 -[IMG] 5.svg 01-Nov-2010 20:31 967 -[IMG] 6.gif 01-Nov-2010 20:31 218 -[IMG] 6.png 01-Nov-2010 20:31 355 -[IMG] 6.svg 01-Nov-2010 20:31 1.1K -[IMG] 7.gif 01-Nov-2010 20:31 907 -[IMG] 7.png 01-Nov-2010 20:31 344 -[IMG] 7.svg 01-Nov-2010 20:31 738 -[IMG] 8.gif 01-Nov-2010 20:31 918 -[IMG] 8.png 01-Nov-2010 20:31 357 -[IMG] 8.svg 01-Nov-2010 20:31 1.2K -[IMG] 9.gif 01-Nov-2010 20:31 923 -[IMG] 9.png 01-Nov-2010 20:31 357 -[IMG] 9.svg 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=M;O=A deleted file mode 100644 index 4c6d3386142738ff31842a8476a74a8830361cf4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=M;O=A +++ /dev/null @@ -1,71 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/callouts - - -

    Index of /release/xsl-ns/1.76.1/images/callouts

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] 1.gif 01-Nov-2010 20:31 889 -[IMG] 1.png 01-Nov-2010 20:31 329 -[IMG] 1.svg 01-Nov-2010 20:31 703 -[IMG] 10.gif 01-Nov-2010 20:31 929 -[IMG] 10.png 01-Nov-2010 20:31 361 -[IMG] 10.svg 01-Nov-2010 20:31 1.0K -[IMG] 11.gif 01-Nov-2010 20:31 202 -[IMG] 11.png 01-Nov-2010 20:31 565 -[IMG] 11.svg 01-Nov-2010 20:31 827 -[IMG] 12.gif 01-Nov-2010 20:31 210 -[IMG] 12.png 01-Nov-2010 20:31 617 -[IMG] 12.svg 01-Nov-2010 20:31 1.0K -[IMG] 13.gif 01-Nov-2010 20:31 209 -[IMG] 13.png 01-Nov-2010 20:31 623 -[IMG] 13.svg 01-Nov-2010 20:31 1.2K -[IMG] 14.gif 01-Nov-2010 20:31 205 -[IMG] 14.png 01-Nov-2010 20:31 411 -[IMG] 14.svg 01-Nov-2010 20:31 906 -[IMG] 15.gif 01-Nov-2010 20:31 210 -[IMG] 15.png 01-Nov-2010 20:31 640 -[IMG] 15.svg 01-Nov-2010 20:31 1.1K -[IMG] 16.svg 01-Nov-2010 20:31 1.2K -[IMG] 17.svg 01-Nov-2010 20:31 866 -[IMG] 18.svg 01-Nov-2010 20:31 1.3K -[IMG] 19.svg 01-Nov-2010 20:31 1.2K -[IMG] 2.gif 01-Nov-2010 20:31 907 -[IMG] 2.png 01-Nov-2010 20:31 353 -[IMG] 2.svg 01-Nov-2010 20:31 926 -[IMG] 20.svg 01-Nov-2010 20:31 1.2K -[IMG] 21.svg 01-Nov-2010 20:31 1.0K -[IMG] 22.svg 01-Nov-2010 20:31 1.2K -[IMG] 23.svg 01-Nov-2010 20:31 1.4K -[IMG] 24.svg 01-Nov-2010 20:31 1.1K -[IMG] 25.svg 01-Nov-2010 20:31 1.3K -[IMG] 26.svg 01-Nov-2010 20:31 1.4K -[IMG] 27.svg 01-Nov-2010 20:31 1.1K -[IMG] 28.svg 01-Nov-2010 20:31 1.5K -[IMG] 29.svg 01-Nov-2010 20:31 1.4K -[IMG] 3.gif 01-Nov-2010 20:31 914 -[IMG] 3.png 01-Nov-2010 20:31 350 -[IMG] 3.svg 01-Nov-2010 20:31 1.0K -[IMG] 30.svg 01-Nov-2010 20:31 1.4K -[IMG] 4.gif 01-Nov-2010 20:31 907 -[IMG] 4.png 01-Nov-2010 20:31 345 -[IMG] 4.svg 01-Nov-2010 20:31 783 -[IMG] 5.gif 01-Nov-2010 20:31 916 -[IMG] 5.png 01-Nov-2010 20:31 348 -[IMG] 5.svg 01-Nov-2010 20:31 967 -[IMG] 6.gif 01-Nov-2010 20:31 218 -[IMG] 6.png 01-Nov-2010 20:31 355 -[IMG] 6.svg 01-Nov-2010 20:31 1.1K -[IMG] 7.gif 01-Nov-2010 20:31 907 -[IMG] 7.png 01-Nov-2010 20:31 344 -[IMG] 7.svg 01-Nov-2010 20:31 738 -[IMG] 8.gif 01-Nov-2010 20:31 918 -[IMG] 8.png 01-Nov-2010 20:31 357 -[IMG] 8.svg 01-Nov-2010 20:31 1.2K -[IMG] 9.gif 01-Nov-2010 20:31 923 -[IMG] 9.png 01-Nov-2010 20:31 357 -[IMG] 9.svg 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=N;O=A deleted file mode 100644 index 0bf3b867369b1b37c86072bdbbfcec5dc5552e0a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=N;O=A +++ /dev/null @@ -1,71 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/callouts - - -

    Index of /release/xsl-ns/1.76.1/images/callouts

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] 1.gif 01-Nov-2010 20:31 889 -[IMG] 1.png 01-Nov-2010 20:31 329 -[IMG] 1.svg 01-Nov-2010 20:31 703 -[IMG] 10.gif 01-Nov-2010 20:31 929 -[IMG] 10.png 01-Nov-2010 20:31 361 -[IMG] 10.svg 01-Nov-2010 20:31 1.0K -[IMG] 11.gif 01-Nov-2010 20:31 202 -[IMG] 11.png 01-Nov-2010 20:31 565 -[IMG] 11.svg 01-Nov-2010 20:31 827 -[IMG] 12.gif 01-Nov-2010 20:31 210 -[IMG] 12.png 01-Nov-2010 20:31 617 -[IMG] 12.svg 01-Nov-2010 20:31 1.0K -[IMG] 13.gif 01-Nov-2010 20:31 209 -[IMG] 13.png 01-Nov-2010 20:31 623 -[IMG] 13.svg 01-Nov-2010 20:31 1.2K -[IMG] 14.gif 01-Nov-2010 20:31 205 -[IMG] 14.png 01-Nov-2010 20:31 411 -[IMG] 14.svg 01-Nov-2010 20:31 906 -[IMG] 15.gif 01-Nov-2010 20:31 210 -[IMG] 15.png 01-Nov-2010 20:31 640 -[IMG] 15.svg 01-Nov-2010 20:31 1.1K -[IMG] 16.svg 01-Nov-2010 20:31 1.2K -[IMG] 17.svg 01-Nov-2010 20:31 866 -[IMG] 18.svg 01-Nov-2010 20:31 1.3K -[IMG] 19.svg 01-Nov-2010 20:31 1.2K -[IMG] 2.gif 01-Nov-2010 20:31 907 -[IMG] 2.png 01-Nov-2010 20:31 353 -[IMG] 2.svg 01-Nov-2010 20:31 926 -[IMG] 20.svg 01-Nov-2010 20:31 1.2K -[IMG] 21.svg 01-Nov-2010 20:31 1.0K -[IMG] 22.svg 01-Nov-2010 20:31 1.2K -[IMG] 23.svg 01-Nov-2010 20:31 1.4K -[IMG] 24.svg 01-Nov-2010 20:31 1.1K -[IMG] 25.svg 01-Nov-2010 20:31 1.3K -[IMG] 26.svg 01-Nov-2010 20:31 1.4K -[IMG] 27.svg 01-Nov-2010 20:31 1.1K -[IMG] 28.svg 01-Nov-2010 20:31 1.5K -[IMG] 29.svg 01-Nov-2010 20:31 1.4K -[IMG] 3.gif 01-Nov-2010 20:31 914 -[IMG] 3.png 01-Nov-2010 20:31 350 -[IMG] 3.svg 01-Nov-2010 20:31 1.0K -[IMG] 30.svg 01-Nov-2010 20:31 1.4K -[IMG] 4.gif 01-Nov-2010 20:31 907 -[IMG] 4.png 01-Nov-2010 20:31 345 -[IMG] 4.svg 01-Nov-2010 20:31 783 -[IMG] 5.gif 01-Nov-2010 20:31 916 -[IMG] 5.png 01-Nov-2010 20:31 348 -[IMG] 5.svg 01-Nov-2010 20:31 967 -[IMG] 6.gif 01-Nov-2010 20:31 218 -[IMG] 6.png 01-Nov-2010 20:31 355 -[IMG] 6.svg 01-Nov-2010 20:31 1.1K -[IMG] 7.gif 01-Nov-2010 20:31 907 -[IMG] 7.png 01-Nov-2010 20:31 344 -[IMG] 7.svg 01-Nov-2010 20:31 738 -[IMG] 8.gif 01-Nov-2010 20:31 918 -[IMG] 8.png 01-Nov-2010 20:31 357 -[IMG] 8.svg 01-Nov-2010 20:31 1.2K -[IMG] 9.gif 01-Nov-2010 20:31 923 -[IMG] 9.png 01-Nov-2010 20:31 357 -[IMG] 9.svg 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=S;O=D deleted file mode 100644 index 426ac726cfa6bffa4621112884e01ab399d25612..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/callouts/index.html?C=S;O=D +++ /dev/null @@ -1,71 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/callouts - - -

    Index of /release/xsl-ns/1.76.1/images/callouts

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] 28.svg 01-Nov-2010 20:31 1.5K -[IMG] 26.svg 01-Nov-2010 20:31 1.4K -[IMG] 29.svg 01-Nov-2010 20:31 1.4K -[IMG] 23.svg 01-Nov-2010 20:31 1.4K -[IMG] 30.svg 01-Nov-2010 20:31 1.4K -[IMG] 18.svg 01-Nov-2010 20:31 1.3K -[IMG] 25.svg 01-Nov-2010 20:31 1.3K -[IMG] 22.svg 01-Nov-2010 20:31 1.2K -[IMG] 20.svg 01-Nov-2010 20:31 1.2K -[IMG] 16.svg 01-Nov-2010 20:31 1.2K -[IMG] 8.svg 01-Nov-2010 20:31 1.2K -[IMG] 19.svg 01-Nov-2010 20:31 1.2K -[IMG] 13.svg 01-Nov-2010 20:31 1.2K -[IMG] 24.svg 01-Nov-2010 20:31 1.1K -[IMG] 6.svg 01-Nov-2010 20:31 1.1K -[IMG] 15.svg 01-Nov-2010 20:31 1.1K -[IMG] 27.svg 01-Nov-2010 20:31 1.1K -[IMG] 9.svg 01-Nov-2010 20:31 1.0K -[IMG] 3.svg 01-Nov-2010 20:31 1.0K -[IMG] 21.svg 01-Nov-2010 20:31 1.0K -[IMG] 12.svg 01-Nov-2010 20:31 1.0K -[IMG] 10.svg 01-Nov-2010 20:31 1.0K -[IMG] 5.svg 01-Nov-2010 20:31 967 -[IMG] 10.gif 01-Nov-2010 20:31 929 -[IMG] 2.svg 01-Nov-2010 20:31 926 -[IMG] 9.gif 01-Nov-2010 20:31 923 -[IMG] 8.gif 01-Nov-2010 20:31 918 -[IMG] 5.gif 01-Nov-2010 20:31 916 -[IMG] 3.gif 01-Nov-2010 20:31 914 -[IMG] 7.gif 01-Nov-2010 20:31 907 -[IMG] 4.gif 01-Nov-2010 20:31 907 -[IMG] 2.gif 01-Nov-2010 20:31 907 -[IMG] 14.svg 01-Nov-2010 20:31 906 -[IMG] 1.gif 01-Nov-2010 20:31 889 -[IMG] 17.svg 01-Nov-2010 20:31 866 -[IMG] 11.svg 01-Nov-2010 20:31 827 -[IMG] 4.svg 01-Nov-2010 20:31 783 -[IMG] 7.svg 01-Nov-2010 20:31 738 -[IMG] 1.svg 01-Nov-2010 20:31 703 -[IMG] 15.png 01-Nov-2010 20:31 640 -[IMG] 13.png 01-Nov-2010 20:31 623 -[IMG] 12.png 01-Nov-2010 20:31 617 -[IMG] 11.png 01-Nov-2010 20:31 565 -[IMG] 14.png 01-Nov-2010 20:31 411 -[IMG] 10.png 01-Nov-2010 20:31 361 -[IMG] 9.png 01-Nov-2010 20:31 357 -[IMG] 8.png 01-Nov-2010 20:31 357 -[IMG] 6.png 01-Nov-2010 20:31 355 -[IMG] 2.png 01-Nov-2010 20:31 353 -[IMG] 3.png 01-Nov-2010 20:31 350 -[IMG] 5.png 01-Nov-2010 20:31 348 -[IMG] 4.png 01-Nov-2010 20:31 345 -[IMG] 7.png 01-Nov-2010 20:31 344 -[IMG] 1.png 01-Nov-2010 20:31 329 -[IMG] 6.gif 01-Nov-2010 20:31 218 -[IMG] 15.gif 01-Nov-2010 20:31 210 -[IMG] 12.gif 01-Nov-2010 20:31 210 -[IMG] 13.gif 01-Nov-2010 20:31 209 -[IMG] 14.gif 01-Nov-2010 20:31 205 -[IMG] 11.gif 01-Nov-2010 20:31 202 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.gif deleted file mode 100644 index d9f5e5b1bc52702e490263297e0c686477f8a9a9..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.png deleted file mode 100644 index a202411e72a69114fd0c3f576417e6d326fe05b8..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.svg deleted file mode 100644 index dd84f3fe365469fc7efb53107f0913fdb8dcc174..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - -]> - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.tif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.tif deleted file mode 100644 index 4a282948c4c7ed53a2cab4132152c9923f7eb363..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/caution.tif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/caution.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/caution.svg deleted file mode 100644 index 7a0db0bc0f91bd478cead8869d9c591b457cae3a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/caution.svg +++ /dev/null @@ -1,141 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/home.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/home.svg deleted file mode 100644 index d6dbc01cfb63a593aa12b9f256c4d4b98f9f8ab9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/home.svg +++ /dev/null @@ -1,498 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/important.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/important.svg deleted file mode 100644 index 803ad8d4ac40f5db31daf7e971a69ef6e950634b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/important.svg +++ /dev/null @@ -1,239 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html deleted file mode 100644 index 5143df5beb5e506fd6e99bf7795393e47ad79e4b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/colorsvg - - -

    Index of /release/xsl-ns/1.76.1/images/colorsvg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] caution.svg 01-Nov-2010 20:31 11K -[IMG] warning.svg 01-Nov-2010 20:31 17K -[IMG] note.svg 01-Nov-2010 20:31 18K -[IMG] important.svg 01-Nov-2010 20:31 19K -[IMG] prev.svg 01-Nov-2010 20:31 30K -[IMG] next.svg 01-Nov-2010 20:31 30K -[IMG] up.svg 01-Nov-2010 20:31 30K -[IMG] tip.svg 01-Nov-2010 20:31 33K -[IMG] home.svg 01-Nov-2010 20:31 52K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=D;O=A deleted file mode 100644 index e53ff2ab5e4af0f57a8a003fc93684e186a86823..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=D;O=A +++ /dev/null @@ -1,20 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/colorsvg - - -

    Index of /release/xsl-ns/1.76.1/images/colorsvg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] caution.svg 01-Nov-2010 20:31 11K -[IMG] home.svg 01-Nov-2010 20:31 52K -[IMG] important.svg 01-Nov-2010 20:31 19K -[IMG] next.svg 01-Nov-2010 20:31 30K -[IMG] note.svg 01-Nov-2010 20:31 18K -[IMG] prev.svg 01-Nov-2010 20:31 30K -[IMG] tip.svg 01-Nov-2010 20:31 33K -[IMG] up.svg 01-Nov-2010 20:31 30K -[IMG] warning.svg 01-Nov-2010 20:31 17K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=M;O=A deleted file mode 100644 index 262dac5c677a1eeece6e83f5e863085c68d5f628..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=M;O=A +++ /dev/null @@ -1,20 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/colorsvg - - -

    Index of /release/xsl-ns/1.76.1/images/colorsvg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] caution.svg 01-Nov-2010 20:31 11K -[IMG] home.svg 01-Nov-2010 20:31 52K -[IMG] important.svg 01-Nov-2010 20:31 19K -[IMG] next.svg 01-Nov-2010 20:31 30K -[IMG] note.svg 01-Nov-2010 20:31 18K -[IMG] prev.svg 01-Nov-2010 20:31 30K -[IMG] tip.svg 01-Nov-2010 20:31 33K -[IMG] up.svg 01-Nov-2010 20:31 30K -[IMG] warning.svg 01-Nov-2010 20:31 17K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=N;O=A deleted file mode 100644 index ab4aefd702fd16ee06c5ee8a1a208f60b3396af2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=N;O=A +++ /dev/null @@ -1,20 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/colorsvg - - -

    Index of /release/xsl-ns/1.76.1/images/colorsvg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] caution.svg 01-Nov-2010 20:31 11K -[IMG] home.svg 01-Nov-2010 20:31 52K -[IMG] important.svg 01-Nov-2010 20:31 19K -[IMG] next.svg 01-Nov-2010 20:31 30K -[IMG] note.svg 01-Nov-2010 20:31 18K -[IMG] prev.svg 01-Nov-2010 20:31 30K -[IMG] tip.svg 01-Nov-2010 20:31 33K -[IMG] up.svg 01-Nov-2010 20:31 30K -[IMG] warning.svg 01-Nov-2010 20:31 17K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=S;O=D deleted file mode 100644 index 2ed3f6ec4da5652ebd21a349333d1974c2cf6a66..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/index.html?C=S;O=D +++ /dev/null @@ -1,20 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images/colorsvg - - -

    Index of /release/xsl-ns/1.76.1/images/colorsvg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] home.svg 01-Nov-2010 20:31 52K -[IMG] tip.svg 01-Nov-2010 20:31 33K -[IMG] up.svg 01-Nov-2010 20:31 30K -[IMG] next.svg 01-Nov-2010 20:31 30K -[IMG] prev.svg 01-Nov-2010 20:31 30K -[IMG] important.svg 01-Nov-2010 20:31 19K -[IMG] note.svg 01-Nov-2010 20:31 18K -[IMG] warning.svg 01-Nov-2010 20:31 17K -[IMG] caution.svg 01-Nov-2010 20:31 11K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/next.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/next.svg deleted file mode 100644 index 52b73cf4c8676d4b4e63774cbb017e1b5ee58524..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/next.svg +++ /dev/null @@ -1,338 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/note.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/note.svg deleted file mode 100644 index e94c610ea70c1318ae88874b7ad5a91f282bbbbd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/note.svg +++ /dev/null @@ -1,200 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/prev.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/prev.svg deleted file mode 100644 index 7ceddec8b08f4bad0776a169df36380198a4e308..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/prev.svg +++ /dev/null @@ -1,338 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/tip.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/tip.svg deleted file mode 100644 index 7ec92e31a67d5736d9379169e85302c9d64da72b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/tip.svg +++ /dev/null @@ -1,367 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/up.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/up.svg deleted file mode 100644 index 8eca45f20d82f5de3ef1ba7a1bc7ae65678862fd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/up.svg +++ /dev/null @@ -1,338 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/warning.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/warning.svg deleted file mode 100644 index ae0081d88a0893d599ec652933169fd7887df84e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/colorsvg/warning.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/draft.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/draft.png deleted file mode 100644 index 59673fe1cc03356ff609f90fc9939349890f996a..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/draft.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/home.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/home.gif deleted file mode 100644 index 6784f5bb01e0104c60e006a2ed525163a380135c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/home.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/home.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/home.png deleted file mode 100644 index 41a142c5d369e957c173455abd7d124351754b05..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/home.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/home.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/home.svg deleted file mode 100644 index e803a3178fab7650f153d8b9c3a8b524ee8ccce0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/home.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - -]> - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.gif deleted file mode 100644 index 6795d9a819874ca8b833c4d4993988721489070f..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.png deleted file mode 100644 index 9c6be7f94cc4f2b1c4410c65385680f2748e11e3..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.svg deleted file mode 100644 index dd84f3fe365469fc7efb53107f0913fdb8dcc174..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - -]> - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.tif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.tif deleted file mode 100644 index 184de63711510990ab0a8f483c274d2f11596cef..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/important.tif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html deleted file mode 100644 index 2e4cd8be8ce19d0a1be314eb7ffbf9b65bd5424c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images - - -

    Index of /release/xsl-ns/1.76.1/images

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] callouts/ 01-Nov-2010 22:36 - -[DIR] colorsvg/ 01-Nov-2010 22:36 - -[IMG] annot-close.png 01-Nov-2010 20:31 207 -[IMG] toc-minus.png 01-Nov-2010 20:31 259 -[IMG] toc-plus.png 01-Nov-2010 20:31 264 -[IMG] toc-blank.png 01-Nov-2010 20:31 318 -[IMG] home.gif 01-Nov-2010 20:31 321 -[IMG] blank.png 01-Nov-2010 20:31 374 -[IMG] tip.tif 01-Nov-2010 20:31 420 -[IMG] tip.png 01-Nov-2010 20:31 449 -[IMG] note.tif 01-Nov-2010 20:31 460 -[IMG] note.png 01-Nov-2010 20:31 490 -[IMG] note.gif 01-Nov-2010 20:31 580 -[IMG] tip.gif 01-Nov-2010 20:31 598 -[IMG] important.png 01-Nov-2010 20:31 722 -[IMG] caution.gif 01-Nov-2010 20:31 743 -[IMG] warning.gif 01-Nov-2010 20:31 743 -[IMG] annot-open.png 01-Nov-2010 20:31 837 -[IMG] important.gif 01-Nov-2010 20:31 1.0K -[IMG] next.svg 01-Nov-2010 20:31 1.0K -[IMG] prev.svg 01-Nov-2010 20:31 1.0K -[IMG] up.svg 01-Nov-2010 20:31 1.0K -[IMG] next.gif 01-Nov-2010 20:31 1.1K -[IMG] up.gif 01-Nov-2010 20:31 1.1K -[IMG] up.png 01-Nov-2010 20:31 1.1K -[IMG] prev.gif 01-Nov-2010 20:31 1.1K -[IMG] prev.png 01-Nov-2010 20:31 1.1K -[IMG] warning.svg 01-Nov-2010 20:31 1.1K -[IMG] next.png 01-Nov-2010 20:31 1.1K -[IMG] home.png 01-Nov-2010 20:31 1.1K -[IMG] warning.png 01-Nov-2010 20:31 1.2K -[IMG] caution.svg 01-Nov-2010 20:31 1.2K -[IMG] important.svg 01-Nov-2010 20:31 1.2K -[IMG] caution.png 01-Nov-2010 20:31 1.2K -[IMG] note.svg 01-Nov-2010 20:31 1.7K -[IMG] caution.tif 01-Nov-2010 20:31 1.9K -[IMG] warning.tif 01-Nov-2010 20:31 1.9K -[IMG] important.tif 01-Nov-2010 20:31 2.0K -[IMG] home.svg 01-Nov-2010 20:31 2.0K -[IMG] tip.svg 01-Nov-2010 20:31 2.4K -[IMG] draft.png 01-Nov-2010 20:31 16K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=D;O=A deleted file mode 100644 index 8beaa85382dd58f9ec27c37a09ad70b6160c59c0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=D;O=A +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images - - -

    Index of /release/xsl-ns/1.76.1/images

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] annot-close.png 01-Nov-2010 20:31 207 -[IMG] annot-open.png 01-Nov-2010 20:31 837 -[IMG] blank.png 01-Nov-2010 20:31 374 -[DIR] callouts/ 01-Nov-2010 22:36 - -[IMG] caution.gif 01-Nov-2010 20:31 743 -[IMG] caution.png 01-Nov-2010 20:31 1.2K -[IMG] caution.svg 01-Nov-2010 20:31 1.2K -[IMG] caution.tif 01-Nov-2010 20:31 1.9K -[DIR] colorsvg/ 01-Nov-2010 22:36 - -[IMG] draft.png 01-Nov-2010 20:31 16K -[IMG] home.gif 01-Nov-2010 20:31 321 -[IMG] home.png 01-Nov-2010 20:31 1.1K -[IMG] home.svg 01-Nov-2010 20:31 2.0K -[IMG] important.gif 01-Nov-2010 20:31 1.0K -[IMG] important.png 01-Nov-2010 20:31 722 -[IMG] important.svg 01-Nov-2010 20:31 1.2K -[IMG] important.tif 01-Nov-2010 20:31 2.0K -[IMG] next.gif 01-Nov-2010 20:31 1.1K -[IMG] next.png 01-Nov-2010 20:31 1.1K -[IMG] next.svg 01-Nov-2010 20:31 1.0K -[IMG] note.gif 01-Nov-2010 20:31 580 -[IMG] note.png 01-Nov-2010 20:31 490 -[IMG] note.svg 01-Nov-2010 20:31 1.7K -[IMG] note.tif 01-Nov-2010 20:31 460 -[IMG] prev.gif 01-Nov-2010 20:31 1.1K -[IMG] prev.png 01-Nov-2010 20:31 1.1K -[IMG] prev.svg 01-Nov-2010 20:31 1.0K -[IMG] tip.gif 01-Nov-2010 20:31 598 -[IMG] tip.png 01-Nov-2010 20:31 449 -[IMG] tip.svg 01-Nov-2010 20:31 2.4K -[IMG] tip.tif 01-Nov-2010 20:31 420 -[IMG] toc-blank.png 01-Nov-2010 20:31 318 -[IMG] toc-minus.png 01-Nov-2010 20:31 259 -[IMG] toc-plus.png 01-Nov-2010 20:31 264 -[IMG] up.gif 01-Nov-2010 20:31 1.1K -[IMG] up.png 01-Nov-2010 20:31 1.1K -[IMG] up.svg 01-Nov-2010 20:31 1.0K -[IMG] warning.gif 01-Nov-2010 20:31 743 -[IMG] warning.png 01-Nov-2010 20:31 1.2K -[IMG] warning.svg 01-Nov-2010 20:31 1.1K -[IMG] warning.tif 01-Nov-2010 20:31 1.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=D;O=D deleted file mode 100644 index cae392ce0884189895327710e5e8267634ef173a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=D;O=D +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images - - -

    Index of /release/xsl-ns/1.76.1/images

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] warning.tif 01-Nov-2010 20:31 1.9K -[IMG] warning.svg 01-Nov-2010 20:31 1.1K -[IMG] warning.png 01-Nov-2010 20:31 1.2K -[IMG] warning.gif 01-Nov-2010 20:31 743 -[IMG] up.svg 01-Nov-2010 20:31 1.0K -[IMG] up.png 01-Nov-2010 20:31 1.1K -[IMG] up.gif 01-Nov-2010 20:31 1.1K -[IMG] toc-plus.png 01-Nov-2010 20:31 264 -[IMG] toc-minus.png 01-Nov-2010 20:31 259 -[IMG] toc-blank.png 01-Nov-2010 20:31 318 -[IMG] tip.tif 01-Nov-2010 20:31 420 -[IMG] tip.svg 01-Nov-2010 20:31 2.4K -[IMG] tip.png 01-Nov-2010 20:31 449 -[IMG] tip.gif 01-Nov-2010 20:31 598 -[IMG] prev.svg 01-Nov-2010 20:31 1.0K -[IMG] prev.png 01-Nov-2010 20:31 1.1K -[IMG] prev.gif 01-Nov-2010 20:31 1.1K -[IMG] note.tif 01-Nov-2010 20:31 460 -[IMG] note.svg 01-Nov-2010 20:31 1.7K -[IMG] note.png 01-Nov-2010 20:31 490 -[IMG] note.gif 01-Nov-2010 20:31 580 -[IMG] next.svg 01-Nov-2010 20:31 1.0K -[IMG] next.png 01-Nov-2010 20:31 1.1K -[IMG] next.gif 01-Nov-2010 20:31 1.1K -[IMG] important.tif 01-Nov-2010 20:31 2.0K -[IMG] important.svg 01-Nov-2010 20:31 1.2K -[IMG] important.png 01-Nov-2010 20:31 722 -[IMG] important.gif 01-Nov-2010 20:31 1.0K -[IMG] home.svg 01-Nov-2010 20:31 2.0K -[IMG] home.png 01-Nov-2010 20:31 1.1K -[IMG] home.gif 01-Nov-2010 20:31 321 -[IMG] draft.png 01-Nov-2010 20:31 16K -[DIR] colorsvg/ 01-Nov-2010 22:36 - -[IMG] caution.tif 01-Nov-2010 20:31 1.9K -[IMG] caution.svg 01-Nov-2010 20:31 1.2K -[IMG] caution.png 01-Nov-2010 20:31 1.2K -[IMG] caution.gif 01-Nov-2010 20:31 743 -[DIR] callouts/ 01-Nov-2010 22:36 - -[IMG] blank.png 01-Nov-2010 20:31 374 -[IMG] annot-open.png 01-Nov-2010 20:31 837 -[IMG] annot-close.png 01-Nov-2010 20:31 207 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=M;O=A deleted file mode 100644 index d48ebccc9f3e7e0a5301f581c493ee51172146c5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=M;O=A +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images - - -

    Index of /release/xsl-ns/1.76.1/images

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] annot-close.png 01-Nov-2010 20:31 207 -[IMG] annot-open.png 01-Nov-2010 20:31 837 -[IMG] blank.png 01-Nov-2010 20:31 374 -[IMG] caution.gif 01-Nov-2010 20:31 743 -[IMG] caution.png 01-Nov-2010 20:31 1.2K -[IMG] caution.svg 01-Nov-2010 20:31 1.2K -[IMG] caution.tif 01-Nov-2010 20:31 1.9K -[IMG] draft.png 01-Nov-2010 20:31 16K -[IMG] home.gif 01-Nov-2010 20:31 321 -[IMG] home.png 01-Nov-2010 20:31 1.1K -[IMG] home.svg 01-Nov-2010 20:31 2.0K -[IMG] important.gif 01-Nov-2010 20:31 1.0K -[IMG] important.png 01-Nov-2010 20:31 722 -[IMG] important.svg 01-Nov-2010 20:31 1.2K -[IMG] important.tif 01-Nov-2010 20:31 2.0K -[IMG] next.gif 01-Nov-2010 20:31 1.1K -[IMG] next.png 01-Nov-2010 20:31 1.1K -[IMG] next.svg 01-Nov-2010 20:31 1.0K -[IMG] note.gif 01-Nov-2010 20:31 580 -[IMG] note.png 01-Nov-2010 20:31 490 -[IMG] note.svg 01-Nov-2010 20:31 1.7K -[IMG] note.tif 01-Nov-2010 20:31 460 -[IMG] prev.gif 01-Nov-2010 20:31 1.1K -[IMG] prev.png 01-Nov-2010 20:31 1.1K -[IMG] prev.svg 01-Nov-2010 20:31 1.0K -[IMG] tip.gif 01-Nov-2010 20:31 598 -[IMG] tip.png 01-Nov-2010 20:31 449 -[IMG] tip.svg 01-Nov-2010 20:31 2.4K -[IMG] tip.tif 01-Nov-2010 20:31 420 -[IMG] toc-blank.png 01-Nov-2010 20:31 318 -[IMG] toc-minus.png 01-Nov-2010 20:31 259 -[IMG] toc-plus.png 01-Nov-2010 20:31 264 -[IMG] up.gif 01-Nov-2010 20:31 1.1K -[IMG] up.png 01-Nov-2010 20:31 1.1K -[IMG] up.svg 01-Nov-2010 20:31 1.0K -[IMG] warning.gif 01-Nov-2010 20:31 743 -[IMG] warning.png 01-Nov-2010 20:31 1.2K -[IMG] warning.svg 01-Nov-2010 20:31 1.1K -[IMG] warning.tif 01-Nov-2010 20:31 1.9K -[DIR] callouts/ 01-Nov-2010 22:36 - -[DIR] colorsvg/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=M;O=D deleted file mode 100644 index 97141f35474d0c824e2b4c0ef975e322e526fa08..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=M;O=D +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images - - -

    Index of /release/xsl-ns/1.76.1/images

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] colorsvg/ 01-Nov-2010 22:36 - -[DIR] callouts/ 01-Nov-2010 22:36 - -[IMG] warning.tif 01-Nov-2010 20:31 1.9K -[IMG] warning.svg 01-Nov-2010 20:31 1.1K -[IMG] warning.png 01-Nov-2010 20:31 1.2K -[IMG] warning.gif 01-Nov-2010 20:31 743 -[IMG] up.svg 01-Nov-2010 20:31 1.0K -[IMG] up.png 01-Nov-2010 20:31 1.1K -[IMG] up.gif 01-Nov-2010 20:31 1.1K -[IMG] toc-plus.png 01-Nov-2010 20:31 264 -[IMG] toc-minus.png 01-Nov-2010 20:31 259 -[IMG] toc-blank.png 01-Nov-2010 20:31 318 -[IMG] tip.tif 01-Nov-2010 20:31 420 -[IMG] tip.svg 01-Nov-2010 20:31 2.4K -[IMG] tip.png 01-Nov-2010 20:31 449 -[IMG] tip.gif 01-Nov-2010 20:31 598 -[IMG] prev.svg 01-Nov-2010 20:31 1.0K -[IMG] prev.png 01-Nov-2010 20:31 1.1K -[IMG] prev.gif 01-Nov-2010 20:31 1.1K -[IMG] note.tif 01-Nov-2010 20:31 460 -[IMG] note.svg 01-Nov-2010 20:31 1.7K -[IMG] note.png 01-Nov-2010 20:31 490 -[IMG] note.gif 01-Nov-2010 20:31 580 -[IMG] next.svg 01-Nov-2010 20:31 1.0K -[IMG] next.png 01-Nov-2010 20:31 1.1K -[IMG] next.gif 01-Nov-2010 20:31 1.1K -[IMG] important.tif 01-Nov-2010 20:31 2.0K -[IMG] important.svg 01-Nov-2010 20:31 1.2K -[IMG] important.png 01-Nov-2010 20:31 722 -[IMG] important.gif 01-Nov-2010 20:31 1.0K -[IMG] home.svg 01-Nov-2010 20:31 2.0K -[IMG] home.png 01-Nov-2010 20:31 1.1K -[IMG] home.gif 01-Nov-2010 20:31 321 -[IMG] draft.png 01-Nov-2010 20:31 16K -[IMG] caution.tif 01-Nov-2010 20:31 1.9K -[IMG] caution.svg 01-Nov-2010 20:31 1.2K -[IMG] caution.png 01-Nov-2010 20:31 1.2K -[IMG] caution.gif 01-Nov-2010 20:31 743 -[IMG] blank.png 01-Nov-2010 20:31 374 -[IMG] annot-open.png 01-Nov-2010 20:31 837 -[IMG] annot-close.png 01-Nov-2010 20:31 207 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=N;O=A deleted file mode 100644 index 4e451f229bb6c4754f7f9ec9dd818a6ac7874edf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=N;O=A +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images - - -

    Index of /release/xsl-ns/1.76.1/images

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] annot-close.png 01-Nov-2010 20:31 207 -[IMG] annot-open.png 01-Nov-2010 20:31 837 -[IMG] blank.png 01-Nov-2010 20:31 374 -[DIR] callouts/ 01-Nov-2010 22:36 - -[IMG] caution.gif 01-Nov-2010 20:31 743 -[IMG] caution.png 01-Nov-2010 20:31 1.2K -[IMG] caution.svg 01-Nov-2010 20:31 1.2K -[IMG] caution.tif 01-Nov-2010 20:31 1.9K -[DIR] colorsvg/ 01-Nov-2010 22:36 - -[IMG] draft.png 01-Nov-2010 20:31 16K -[IMG] home.gif 01-Nov-2010 20:31 321 -[IMG] home.png 01-Nov-2010 20:31 1.1K -[IMG] home.svg 01-Nov-2010 20:31 2.0K -[IMG] important.gif 01-Nov-2010 20:31 1.0K -[IMG] important.png 01-Nov-2010 20:31 722 -[IMG] important.svg 01-Nov-2010 20:31 1.2K -[IMG] important.tif 01-Nov-2010 20:31 2.0K -[IMG] next.gif 01-Nov-2010 20:31 1.1K -[IMG] next.png 01-Nov-2010 20:31 1.1K -[IMG] next.svg 01-Nov-2010 20:31 1.0K -[IMG] note.gif 01-Nov-2010 20:31 580 -[IMG] note.png 01-Nov-2010 20:31 490 -[IMG] note.svg 01-Nov-2010 20:31 1.7K -[IMG] note.tif 01-Nov-2010 20:31 460 -[IMG] prev.gif 01-Nov-2010 20:31 1.1K -[IMG] prev.png 01-Nov-2010 20:31 1.1K -[IMG] prev.svg 01-Nov-2010 20:31 1.0K -[IMG] tip.gif 01-Nov-2010 20:31 598 -[IMG] tip.png 01-Nov-2010 20:31 449 -[IMG] tip.svg 01-Nov-2010 20:31 2.4K -[IMG] tip.tif 01-Nov-2010 20:31 420 -[IMG] toc-blank.png 01-Nov-2010 20:31 318 -[IMG] toc-minus.png 01-Nov-2010 20:31 259 -[IMG] toc-plus.png 01-Nov-2010 20:31 264 -[IMG] up.gif 01-Nov-2010 20:31 1.1K -[IMG] up.png 01-Nov-2010 20:31 1.1K -[IMG] up.svg 01-Nov-2010 20:31 1.0K -[IMG] warning.gif 01-Nov-2010 20:31 743 -[IMG] warning.png 01-Nov-2010 20:31 1.2K -[IMG] warning.svg 01-Nov-2010 20:31 1.1K -[IMG] warning.tif 01-Nov-2010 20:31 1.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=N;O=D deleted file mode 100644 index cae392ce0884189895327710e5e8267634ef173a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=N;O=D +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images - - -

    Index of /release/xsl-ns/1.76.1/images

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] warning.tif 01-Nov-2010 20:31 1.9K -[IMG] warning.svg 01-Nov-2010 20:31 1.1K -[IMG] warning.png 01-Nov-2010 20:31 1.2K -[IMG] warning.gif 01-Nov-2010 20:31 743 -[IMG] up.svg 01-Nov-2010 20:31 1.0K -[IMG] up.png 01-Nov-2010 20:31 1.1K -[IMG] up.gif 01-Nov-2010 20:31 1.1K -[IMG] toc-plus.png 01-Nov-2010 20:31 264 -[IMG] toc-minus.png 01-Nov-2010 20:31 259 -[IMG] toc-blank.png 01-Nov-2010 20:31 318 -[IMG] tip.tif 01-Nov-2010 20:31 420 -[IMG] tip.svg 01-Nov-2010 20:31 2.4K -[IMG] tip.png 01-Nov-2010 20:31 449 -[IMG] tip.gif 01-Nov-2010 20:31 598 -[IMG] prev.svg 01-Nov-2010 20:31 1.0K -[IMG] prev.png 01-Nov-2010 20:31 1.1K -[IMG] prev.gif 01-Nov-2010 20:31 1.1K -[IMG] note.tif 01-Nov-2010 20:31 460 -[IMG] note.svg 01-Nov-2010 20:31 1.7K -[IMG] note.png 01-Nov-2010 20:31 490 -[IMG] note.gif 01-Nov-2010 20:31 580 -[IMG] next.svg 01-Nov-2010 20:31 1.0K -[IMG] next.png 01-Nov-2010 20:31 1.1K -[IMG] next.gif 01-Nov-2010 20:31 1.1K -[IMG] important.tif 01-Nov-2010 20:31 2.0K -[IMG] important.svg 01-Nov-2010 20:31 1.2K -[IMG] important.png 01-Nov-2010 20:31 722 -[IMG] important.gif 01-Nov-2010 20:31 1.0K -[IMG] home.svg 01-Nov-2010 20:31 2.0K -[IMG] home.png 01-Nov-2010 20:31 1.1K -[IMG] home.gif 01-Nov-2010 20:31 321 -[IMG] draft.png 01-Nov-2010 20:31 16K -[DIR] colorsvg/ 01-Nov-2010 22:36 - -[IMG] caution.tif 01-Nov-2010 20:31 1.9K -[IMG] caution.svg 01-Nov-2010 20:31 1.2K -[IMG] caution.png 01-Nov-2010 20:31 1.2K -[IMG] caution.gif 01-Nov-2010 20:31 743 -[DIR] callouts/ 01-Nov-2010 22:36 - -[IMG] blank.png 01-Nov-2010 20:31 374 -[IMG] annot-open.png 01-Nov-2010 20:31 837 -[IMG] annot-close.png 01-Nov-2010 20:31 207 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=S;O=A deleted file mode 100644 index 2e4cd8be8ce19d0a1be314eb7ffbf9b65bd5424c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=S;O=A +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images - - -

    Index of /release/xsl-ns/1.76.1/images

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] callouts/ 01-Nov-2010 22:36 - -[DIR] colorsvg/ 01-Nov-2010 22:36 - -[IMG] annot-close.png 01-Nov-2010 20:31 207 -[IMG] toc-minus.png 01-Nov-2010 20:31 259 -[IMG] toc-plus.png 01-Nov-2010 20:31 264 -[IMG] toc-blank.png 01-Nov-2010 20:31 318 -[IMG] home.gif 01-Nov-2010 20:31 321 -[IMG] blank.png 01-Nov-2010 20:31 374 -[IMG] tip.tif 01-Nov-2010 20:31 420 -[IMG] tip.png 01-Nov-2010 20:31 449 -[IMG] note.tif 01-Nov-2010 20:31 460 -[IMG] note.png 01-Nov-2010 20:31 490 -[IMG] note.gif 01-Nov-2010 20:31 580 -[IMG] tip.gif 01-Nov-2010 20:31 598 -[IMG] important.png 01-Nov-2010 20:31 722 -[IMG] caution.gif 01-Nov-2010 20:31 743 -[IMG] warning.gif 01-Nov-2010 20:31 743 -[IMG] annot-open.png 01-Nov-2010 20:31 837 -[IMG] important.gif 01-Nov-2010 20:31 1.0K -[IMG] next.svg 01-Nov-2010 20:31 1.0K -[IMG] prev.svg 01-Nov-2010 20:31 1.0K -[IMG] up.svg 01-Nov-2010 20:31 1.0K -[IMG] next.gif 01-Nov-2010 20:31 1.1K -[IMG] up.gif 01-Nov-2010 20:31 1.1K -[IMG] up.png 01-Nov-2010 20:31 1.1K -[IMG] prev.gif 01-Nov-2010 20:31 1.1K -[IMG] prev.png 01-Nov-2010 20:31 1.1K -[IMG] warning.svg 01-Nov-2010 20:31 1.1K -[IMG] next.png 01-Nov-2010 20:31 1.1K -[IMG] home.png 01-Nov-2010 20:31 1.1K -[IMG] warning.png 01-Nov-2010 20:31 1.2K -[IMG] caution.svg 01-Nov-2010 20:31 1.2K -[IMG] important.svg 01-Nov-2010 20:31 1.2K -[IMG] caution.png 01-Nov-2010 20:31 1.2K -[IMG] note.svg 01-Nov-2010 20:31 1.7K -[IMG] caution.tif 01-Nov-2010 20:31 1.9K -[IMG] warning.tif 01-Nov-2010 20:31 1.9K -[IMG] important.tif 01-Nov-2010 20:31 2.0K -[IMG] home.svg 01-Nov-2010 20:31 2.0K -[IMG] tip.svg 01-Nov-2010 20:31 2.4K -[IMG] draft.png 01-Nov-2010 20:31 16K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=S;O=D deleted file mode 100644 index f078036f4a973526ad6ea3d8d49aa9e6428ac283..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/index.html?C=S;O=D +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/images - - -

    Index of /release/xsl-ns/1.76.1/images

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[IMG] draft.png 01-Nov-2010 20:31 16K -[IMG] tip.svg 01-Nov-2010 20:31 2.4K -[IMG] home.svg 01-Nov-2010 20:31 2.0K -[IMG] important.tif 01-Nov-2010 20:31 2.0K -[IMG] warning.tif 01-Nov-2010 20:31 1.9K -[IMG] caution.tif 01-Nov-2010 20:31 1.9K -[IMG] note.svg 01-Nov-2010 20:31 1.7K -[IMG] caution.png 01-Nov-2010 20:31 1.2K -[IMG] important.svg 01-Nov-2010 20:31 1.2K -[IMG] caution.svg 01-Nov-2010 20:31 1.2K -[IMG] warning.png 01-Nov-2010 20:31 1.2K -[IMG] home.png 01-Nov-2010 20:31 1.1K -[IMG] next.png 01-Nov-2010 20:31 1.1K -[IMG] warning.svg 01-Nov-2010 20:31 1.1K -[IMG] prev.png 01-Nov-2010 20:31 1.1K -[IMG] prev.gif 01-Nov-2010 20:31 1.1K -[IMG] up.png 01-Nov-2010 20:31 1.1K -[IMG] up.gif 01-Nov-2010 20:31 1.1K -[IMG] next.gif 01-Nov-2010 20:31 1.1K -[IMG] up.svg 01-Nov-2010 20:31 1.0K -[IMG] prev.svg 01-Nov-2010 20:31 1.0K -[IMG] next.svg 01-Nov-2010 20:31 1.0K -[IMG] important.gif 01-Nov-2010 20:31 1.0K -[IMG] annot-open.png 01-Nov-2010 20:31 837 -[IMG] warning.gif 01-Nov-2010 20:31 743 -[IMG] caution.gif 01-Nov-2010 20:31 743 -[IMG] important.png 01-Nov-2010 20:31 722 -[IMG] tip.gif 01-Nov-2010 20:31 598 -[IMG] note.gif 01-Nov-2010 20:31 580 -[IMG] note.png 01-Nov-2010 20:31 490 -[IMG] note.tif 01-Nov-2010 20:31 460 -[IMG] tip.png 01-Nov-2010 20:31 449 -[IMG] tip.tif 01-Nov-2010 20:31 420 -[IMG] blank.png 01-Nov-2010 20:31 374 -[IMG] home.gif 01-Nov-2010 20:31 321 -[IMG] toc-blank.png 01-Nov-2010 20:31 318 -[IMG] toc-plus.png 01-Nov-2010 20:31 264 -[IMG] toc-minus.png 01-Nov-2010 20:31 259 -[IMG] annot-close.png 01-Nov-2010 20:31 207 -[DIR] colorsvg/ 01-Nov-2010 22:36 - -[DIR] callouts/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/info.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/info.png deleted file mode 100644 index cf8e1deddf6980dd06c0472756fc60909c05b372..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/info.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/next.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/next.gif deleted file mode 100644 index aa1516e691013051b9d6198ad31e5c902fac8aaa..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/next.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/next.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/next.png deleted file mode 100644 index 3903b5826e969e5d4cfd3c8d9e3380c4655b7f15..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/next.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/next.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/next.svg deleted file mode 100644 index 75fa83ed8c5bd07f65546962f4d36588f42ce215..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/next.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - -]> - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.gif deleted file mode 100644 index f329d359e55c7ed753170a6f04fbc0cba1e1e565..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.png deleted file mode 100644 index 89d81dde2b574b03443c315e014bc4db1ab09b0c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.svg deleted file mode 100644 index 648299d26f80c77dc86c60ddcac6cc5d0f75a019..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.tif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.tif deleted file mode 100644 index 08644d6b5d2be5a7c0fd112bbc526a55ef0d6195..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/note.tif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/prev.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/prev.gif deleted file mode 100644 index 64ca8f3c7c6856d17625615c7845d9adf8b35e6d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/prev.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/prev.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/prev.png deleted file mode 100644 index 997acd06778e58212f6611093f676128e63a49c1..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/prev.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/prev.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/prev.svg deleted file mode 100644 index 6d88ffdd0d243609885ab07d4e8fede37696dfbf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/prev.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - -]> - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.gif deleted file mode 100644 index 823f2b417c797bcc5b5af0d86034bbbe68a9c5d8..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.png deleted file mode 100644 index 02cfd13755972c446b961ea744c8eb8f7e03a025..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.svg deleted file mode 100644 index 4a64a1500ec535992b8d63601b5ae8778a6d4fde..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.tif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.tif deleted file mode 100644 index 4a3d8c75fd58190ceae8d6ffa621ecf7e925c3c1..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/tip.tif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/toc-blank.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/toc-blank.png deleted file mode 100644 index 6ffad17a0c7a78deaae58716e8071cc40cb0b8e0..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/toc-blank.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/toc-minus.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/toc-minus.png deleted file mode 100644 index abbb020c8e2d6705ebc2f0fc17deed30f2977a46..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/toc-minus.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/toc-plus.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/toc-plus.png deleted file mode 100644 index 941312ce0dab168e0efcc5b572e387259880e541..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/toc-plus.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/up.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/up.gif deleted file mode 100644 index aabc2d016580d75da359df27edac6d8081fcc2d3..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/up.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/up.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/up.png deleted file mode 100644 index cca063f3d4125e547b0e2d6b5982d045913f874d..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/up.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/up.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/up.svg deleted file mode 100644 index d31aa9c809a6ca85cfa6fa332e653557c2a89f4e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/up.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - -]> - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.gif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.gif deleted file mode 100644 index 3adf191293748bead3a7592fd86cee64056b5454..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.gif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.png b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.png deleted file mode 100644 index 820a8f5c47be205c862362b89721976810d6593c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.png and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.svg b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.svg deleted file mode 100644 index fc8d7484cb725164072b63f4eb9958051c333858..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - -]> - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.tif b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.tif deleted file mode 100644 index 7b6611ec7a1980022c11ad6877fedf32f41b3df0..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/images/warning.tif and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html deleted file mode 100644 index 37572faa5231caa5d6e475bcad4fe97052b578f3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1 - - -

    Index of /release/xsl-ns/1.76.1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] common/ 01-Nov-2010 22:36 - -[DIR] doc/ 01-Nov-2010 20:08 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] eclipse/ 01-Nov-2010 22:36 - -[DIR] epub/ 01-Nov-2010 22:36 - -[DIR] extensions/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] highlighting/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] images/ 01-Nov-2010 22:36 - -[DIR] javahelp/ 01-Nov-2010 22:36 - -[DIR] lib/ 01-Nov-2010 22:36 - -[DIR] manpages/ 01-Nov-2010 22:36 - -[DIR] params/ 01-Nov-2010 22:36 - -[DIR] profiling/ 01-Nov-2010 22:36 - -[DIR] roundtrip/ 01-Nov-2010 22:36 - -[DIR] slides/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] tests/ 01-Nov-2010 22:36 - -[DIR] tools/ 01-Nov-2010 22:36 - -[DIR] webhelp/ 01-Nov-2010 22:36 - -[DIR] website/ 01-Nov-2010 22:36 - -[DIR] xhtml-1_1/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[TXT] AUTHORS 01-Nov-2010 20:31 143 -[TXT] BUGS 01-Nov-2010 20:31 578 -[TXT] catalog.xml 01-Nov-2010 20:31 609 -[TXT] TODO 01-Nov-2010 20:31 679 -[TXT] COPYING 01-Nov-2010 20:31 1.9K -[TXT] INSTALL 01-Nov-2010 20:31 3.3K -[TXT] NEWS 01-Nov-2010 20:31 3.6K -[TXT] Makefile 01-Nov-2010 20:31 3.7K -[TXT] VERSION 01-Nov-2010 20:31 4.4K -[TXT] NEWS.xml 01-Nov-2010 20:31 6.7K -[TXT] NEWS.html 01-Nov-2010 20:31 9.4K -[   ] install.sh 01-Nov-2010 20:31 28K -[TXT] RELEASE-NOTES.txt 01-Nov-2010 20:31 301K -[TXT] RELEASE-NOTES.xml 01-Nov-2010 20:31 513K -[TXT] RELEASE-NOTES.html 01-Nov-2010 20:31 658K -[   ] RELEASE-NOTES.pdf 01-Nov-2010 20:31 952K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=D;O=A deleted file mode 100644 index e4129bf9f33d0ab41039b3620ed5df99317f0b33..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=D;O=A +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1 - - -

    Index of /release/xsl-ns/1.76.1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] AUTHORS 01-Nov-2010 20:31 143 -[TXT] BUGS 01-Nov-2010 20:31 578 -[TXT] COPYING 01-Nov-2010 20:31 1.9K -[TXT] INSTALL 01-Nov-2010 20:31 3.3K -[TXT] Makefile 01-Nov-2010 20:31 3.7K -[TXT] NEWS 01-Nov-2010 20:31 3.6K -[TXT] NEWS.html 01-Nov-2010 20:31 9.4K -[TXT] NEWS.xml 01-Nov-2010 20:31 6.7K -[TXT] RELEASE-NOTES.html 01-Nov-2010 20:31 658K -[   ] RELEASE-NOTES.pdf 01-Nov-2010 20:31 952K -[TXT] RELEASE-NOTES.txt 01-Nov-2010 20:31 301K -[TXT] RELEASE-NOTES.xml 01-Nov-2010 20:31 513K -[TXT] TODO 01-Nov-2010 20:31 679 -[TXT] VERSION 01-Nov-2010 20:31 4.4K -[TXT] catalog.xml 01-Nov-2010 20:31 609 -[DIR] common/ 01-Nov-2010 22:36 - -[DIR] doc/ 01-Nov-2010 20:08 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] eclipse/ 01-Nov-2010 22:36 - -[DIR] epub/ 01-Nov-2010 22:36 - -[DIR] extensions/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] highlighting/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] images/ 01-Nov-2010 22:36 - -[   ] install.sh 01-Nov-2010 20:31 28K -[DIR] javahelp/ 01-Nov-2010 22:36 - -[DIR] lib/ 01-Nov-2010 22:36 - -[DIR] manpages/ 01-Nov-2010 22:36 - -[DIR] params/ 01-Nov-2010 22:36 - -[DIR] profiling/ 01-Nov-2010 22:36 - -[DIR] roundtrip/ 01-Nov-2010 22:36 - -[DIR] slides/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] tests/ 01-Nov-2010 22:36 - -[DIR] tools/ 01-Nov-2010 22:36 - -[DIR] webhelp/ 01-Nov-2010 22:36 - -[DIR] website/ 01-Nov-2010 22:36 - -[DIR] xhtml-1_1/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=D;O=D deleted file mode 100644 index 48cea7a2ea8b2e9ce6a8f541a75f10f1c3f129ac..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=D;O=D +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1 - - -

    Index of /release/xsl-ns/1.76.1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[DIR] xhtml-1_1/ 01-Nov-2010 22:36 - -[DIR] website/ 01-Nov-2010 22:36 - -[DIR] webhelp/ 01-Nov-2010 22:36 - -[DIR] tools/ 01-Nov-2010 22:36 - -[DIR] tests/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] slides/ 01-Nov-2010 22:36 - -[DIR] roundtrip/ 01-Nov-2010 22:36 - -[DIR] profiling/ 01-Nov-2010 22:36 - -[DIR] params/ 01-Nov-2010 22:36 - -[DIR] manpages/ 01-Nov-2010 22:36 - -[DIR] lib/ 01-Nov-2010 22:36 - -[DIR] javahelp/ 01-Nov-2010 22:36 - -[   ] install.sh 01-Nov-2010 20:31 28K -[DIR] images/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] highlighting/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] extensions/ 01-Nov-2010 22:36 - -[DIR] epub/ 01-Nov-2010 22:36 - -[DIR] eclipse/ 01-Nov-2010 22:36 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] doc/ 01-Nov-2010 20:08 - -[DIR] common/ 01-Nov-2010 22:36 - -[TXT] catalog.xml 01-Nov-2010 20:31 609 -[TXT] VERSION 01-Nov-2010 20:31 4.4K -[TXT] TODO 01-Nov-2010 20:31 679 -[TXT] RELEASE-NOTES.xml 01-Nov-2010 20:31 513K -[TXT] RELEASE-NOTES.txt 01-Nov-2010 20:31 301K -[   ] RELEASE-NOTES.pdf 01-Nov-2010 20:31 952K -[TXT] RELEASE-NOTES.html 01-Nov-2010 20:31 658K -[TXT] NEWS.xml 01-Nov-2010 20:31 6.7K -[TXT] NEWS.html 01-Nov-2010 20:31 9.4K -[TXT] NEWS 01-Nov-2010 20:31 3.6K -[TXT] Makefile 01-Nov-2010 20:31 3.7K -[TXT] INSTALL 01-Nov-2010 20:31 3.3K -[TXT] COPYING 01-Nov-2010 20:31 1.9K -[TXT] BUGS 01-Nov-2010 20:31 578 -[TXT] AUTHORS 01-Nov-2010 20:31 143 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=M;O=A deleted file mode 100644 index f4aef0d3adcb02f6c81c5c4de81cc336018ff909..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=M;O=A +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1 - - -

    Index of /release/xsl-ns/1.76.1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] doc/ 01-Nov-2010 20:08 - -[TXT] AUTHORS 01-Nov-2010 20:31 143 -[TXT] BUGS 01-Nov-2010 20:31 578 -[TXT] COPYING 01-Nov-2010 20:31 1.9K -[TXT] INSTALL 01-Nov-2010 20:31 3.3K -[TXT] Makefile 01-Nov-2010 20:31 3.7K -[TXT] NEWS 01-Nov-2010 20:31 3.6K -[TXT] NEWS.html 01-Nov-2010 20:31 9.4K -[TXT] NEWS.xml 01-Nov-2010 20:31 6.7K -[TXT] RELEASE-NOTES.html 01-Nov-2010 20:31 658K -[   ] RELEASE-NOTES.pdf 01-Nov-2010 20:31 952K -[TXT] RELEASE-NOTES.txt 01-Nov-2010 20:31 301K -[TXT] RELEASE-NOTES.xml 01-Nov-2010 20:31 513K -[TXT] TODO 01-Nov-2010 20:31 679 -[   ] install.sh 01-Nov-2010 20:31 28K -[TXT] VERSION 01-Nov-2010 20:31 4.4K -[TXT] catalog.xml 01-Nov-2010 20:31 609 -[DIR] common/ 01-Nov-2010 22:36 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] eclipse/ 01-Nov-2010 22:36 - -[DIR] epub/ 01-Nov-2010 22:36 - -[DIR] extensions/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] highlighting/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] images/ 01-Nov-2010 22:36 - -[DIR] javahelp/ 01-Nov-2010 22:36 - -[DIR] lib/ 01-Nov-2010 22:36 - -[DIR] manpages/ 01-Nov-2010 22:36 - -[DIR] params/ 01-Nov-2010 22:36 - -[DIR] profiling/ 01-Nov-2010 22:36 - -[DIR] roundtrip/ 01-Nov-2010 22:36 - -[DIR] slides/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] tests/ 01-Nov-2010 22:36 - -[DIR] tools/ 01-Nov-2010 22:36 - -[DIR] webhelp/ 01-Nov-2010 22:36 - -[DIR] website/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[DIR] xhtml-1_1/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=M;O=D deleted file mode 100644 index f5d465c3d4dab1c5288ec5c4566f2e6023db2897..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=M;O=D +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1 - - -

    Index of /release/xsl-ns/1.76.1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xhtml-1_1/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[DIR] website/ 01-Nov-2010 22:36 - -[DIR] webhelp/ 01-Nov-2010 22:36 - -[DIR] tools/ 01-Nov-2010 22:36 - -[DIR] tests/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] slides/ 01-Nov-2010 22:36 - -[DIR] roundtrip/ 01-Nov-2010 22:36 - -[DIR] profiling/ 01-Nov-2010 22:36 - -[DIR] params/ 01-Nov-2010 22:36 - -[DIR] manpages/ 01-Nov-2010 22:36 - -[DIR] lib/ 01-Nov-2010 22:36 - -[DIR] javahelp/ 01-Nov-2010 22:36 - -[DIR] images/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] highlighting/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] extensions/ 01-Nov-2010 22:36 - -[DIR] epub/ 01-Nov-2010 22:36 - -[DIR] eclipse/ 01-Nov-2010 22:36 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] common/ 01-Nov-2010 22:36 - -[TXT] catalog.xml 01-Nov-2010 20:31 609 -[TXT] VERSION 01-Nov-2010 20:31 4.4K -[   ] install.sh 01-Nov-2010 20:31 28K -[TXT] TODO 01-Nov-2010 20:31 679 -[TXT] RELEASE-NOTES.xml 01-Nov-2010 20:31 513K -[TXT] RELEASE-NOTES.txt 01-Nov-2010 20:31 301K -[   ] RELEASE-NOTES.pdf 01-Nov-2010 20:31 952K -[TXT] RELEASE-NOTES.html 01-Nov-2010 20:31 658K -[TXT] NEWS.xml 01-Nov-2010 20:31 6.7K -[TXT] NEWS.html 01-Nov-2010 20:31 9.4K -[TXT] NEWS 01-Nov-2010 20:31 3.6K -[TXT] Makefile 01-Nov-2010 20:31 3.7K -[TXT] INSTALL 01-Nov-2010 20:31 3.3K -[TXT] COPYING 01-Nov-2010 20:31 1.9K -[TXT] BUGS 01-Nov-2010 20:31 578 -[TXT] AUTHORS 01-Nov-2010 20:31 143 -[DIR] doc/ 01-Nov-2010 20:08 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=N;O=A deleted file mode 100644 index e511628a7591a5cc1ac2e671a87328a993b5ab96..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=N;O=A +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1 - - -

    Index of /release/xsl-ns/1.76.1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] AUTHORS 01-Nov-2010 20:31 143 -[TXT] BUGS 01-Nov-2010 20:31 578 -[TXT] COPYING 01-Nov-2010 20:31 1.9K -[TXT] INSTALL 01-Nov-2010 20:31 3.3K -[TXT] Makefile 01-Nov-2010 20:31 3.7K -[TXT] NEWS 01-Nov-2010 20:31 3.6K -[TXT] NEWS.html 01-Nov-2010 20:31 9.4K -[TXT] NEWS.xml 01-Nov-2010 20:31 6.7K -[TXT] RELEASE-NOTES.html 01-Nov-2010 20:31 658K -[   ] RELEASE-NOTES.pdf 01-Nov-2010 20:31 952K -[TXT] RELEASE-NOTES.txt 01-Nov-2010 20:31 301K -[TXT] RELEASE-NOTES.xml 01-Nov-2010 20:31 513K -[TXT] TODO 01-Nov-2010 20:31 679 -[TXT] VERSION 01-Nov-2010 20:31 4.4K -[TXT] catalog.xml 01-Nov-2010 20:31 609 -[DIR] common/ 01-Nov-2010 22:36 - -[DIR] doc/ 01-Nov-2010 20:08 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] eclipse/ 01-Nov-2010 22:36 - -[DIR] epub/ 01-Nov-2010 22:36 - -[DIR] extensions/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] highlighting/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] images/ 01-Nov-2010 22:36 - -[   ] install.sh 01-Nov-2010 20:31 28K -[DIR] javahelp/ 01-Nov-2010 22:36 - -[DIR] lib/ 01-Nov-2010 22:36 - -[DIR] manpages/ 01-Nov-2010 22:36 - -[DIR] params/ 01-Nov-2010 22:36 - -[DIR] profiling/ 01-Nov-2010 22:36 - -[DIR] roundtrip/ 01-Nov-2010 22:36 - -[DIR] slides/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] tests/ 01-Nov-2010 22:36 - -[DIR] tools/ 01-Nov-2010 22:36 - -[DIR] webhelp/ 01-Nov-2010 22:36 - -[DIR] website/ 01-Nov-2010 22:36 - -[DIR] xhtml-1_1/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=N;O=D deleted file mode 100644 index 48cea7a2ea8b2e9ce6a8f541a75f10f1c3f129ac..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=N;O=D +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1 - - -

    Index of /release/xsl-ns/1.76.1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[DIR] xhtml-1_1/ 01-Nov-2010 22:36 - -[DIR] website/ 01-Nov-2010 22:36 - -[DIR] webhelp/ 01-Nov-2010 22:36 - -[DIR] tools/ 01-Nov-2010 22:36 - -[DIR] tests/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] slides/ 01-Nov-2010 22:36 - -[DIR] roundtrip/ 01-Nov-2010 22:36 - -[DIR] profiling/ 01-Nov-2010 22:36 - -[DIR] params/ 01-Nov-2010 22:36 - -[DIR] manpages/ 01-Nov-2010 22:36 - -[DIR] lib/ 01-Nov-2010 22:36 - -[DIR] javahelp/ 01-Nov-2010 22:36 - -[   ] install.sh 01-Nov-2010 20:31 28K -[DIR] images/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] highlighting/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] extensions/ 01-Nov-2010 22:36 - -[DIR] epub/ 01-Nov-2010 22:36 - -[DIR] eclipse/ 01-Nov-2010 22:36 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] doc/ 01-Nov-2010 20:08 - -[DIR] common/ 01-Nov-2010 22:36 - -[TXT] catalog.xml 01-Nov-2010 20:31 609 -[TXT] VERSION 01-Nov-2010 20:31 4.4K -[TXT] TODO 01-Nov-2010 20:31 679 -[TXT] RELEASE-NOTES.xml 01-Nov-2010 20:31 513K -[TXT] RELEASE-NOTES.txt 01-Nov-2010 20:31 301K -[   ] RELEASE-NOTES.pdf 01-Nov-2010 20:31 952K -[TXT] RELEASE-NOTES.html 01-Nov-2010 20:31 658K -[TXT] NEWS.xml 01-Nov-2010 20:31 6.7K -[TXT] NEWS.html 01-Nov-2010 20:31 9.4K -[TXT] NEWS 01-Nov-2010 20:31 3.6K -[TXT] Makefile 01-Nov-2010 20:31 3.7K -[TXT] INSTALL 01-Nov-2010 20:31 3.3K -[TXT] COPYING 01-Nov-2010 20:31 1.9K -[TXT] BUGS 01-Nov-2010 20:31 578 -[TXT] AUTHORS 01-Nov-2010 20:31 143 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=S;O=A deleted file mode 100644 index 37572faa5231caa5d6e475bcad4fe97052b578f3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=S;O=A +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1 - - -

    Index of /release/xsl-ns/1.76.1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] common/ 01-Nov-2010 22:36 - -[DIR] doc/ 01-Nov-2010 20:08 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] eclipse/ 01-Nov-2010 22:36 - -[DIR] epub/ 01-Nov-2010 22:36 - -[DIR] extensions/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] highlighting/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] images/ 01-Nov-2010 22:36 - -[DIR] javahelp/ 01-Nov-2010 22:36 - -[DIR] lib/ 01-Nov-2010 22:36 - -[DIR] manpages/ 01-Nov-2010 22:36 - -[DIR] params/ 01-Nov-2010 22:36 - -[DIR] profiling/ 01-Nov-2010 22:36 - -[DIR] roundtrip/ 01-Nov-2010 22:36 - -[DIR] slides/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] tests/ 01-Nov-2010 22:36 - -[DIR] tools/ 01-Nov-2010 22:36 - -[DIR] webhelp/ 01-Nov-2010 22:36 - -[DIR] website/ 01-Nov-2010 22:36 - -[DIR] xhtml-1_1/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[TXT] AUTHORS 01-Nov-2010 20:31 143 -[TXT] BUGS 01-Nov-2010 20:31 578 -[TXT] catalog.xml 01-Nov-2010 20:31 609 -[TXT] TODO 01-Nov-2010 20:31 679 -[TXT] COPYING 01-Nov-2010 20:31 1.9K -[TXT] INSTALL 01-Nov-2010 20:31 3.3K -[TXT] NEWS 01-Nov-2010 20:31 3.6K -[TXT] Makefile 01-Nov-2010 20:31 3.7K -[TXT] VERSION 01-Nov-2010 20:31 4.4K -[TXT] NEWS.xml 01-Nov-2010 20:31 6.7K -[TXT] NEWS.html 01-Nov-2010 20:31 9.4K -[   ] install.sh 01-Nov-2010 20:31 28K -[TXT] RELEASE-NOTES.txt 01-Nov-2010 20:31 301K -[TXT] RELEASE-NOTES.xml 01-Nov-2010 20:31 513K -[TXT] RELEASE-NOTES.html 01-Nov-2010 20:31 658K -[   ] RELEASE-NOTES.pdf 01-Nov-2010 20:31 952K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=S;O=D deleted file mode 100644 index e0ad5392210b87d0a8b4231f3e7cfa693dc15dc2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/index.html?C=S;O=D +++ /dev/null @@ -1,52 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1 - - -

    Index of /release/xsl-ns/1.76.1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[   ] RELEASE-NOTES.pdf 01-Nov-2010 20:31 952K -[TXT] RELEASE-NOTES.html 01-Nov-2010 20:31 658K -[TXT] RELEASE-NOTES.xml 01-Nov-2010 20:31 513K -[TXT] RELEASE-NOTES.txt 01-Nov-2010 20:31 301K -[   ] install.sh 01-Nov-2010 20:31 28K -[TXT] NEWS.html 01-Nov-2010 20:31 9.4K -[TXT] NEWS.xml 01-Nov-2010 20:31 6.7K -[TXT] VERSION 01-Nov-2010 20:31 4.4K -[TXT] Makefile 01-Nov-2010 20:31 3.7K -[TXT] NEWS 01-Nov-2010 20:31 3.6K -[TXT] INSTALL 01-Nov-2010 20:31 3.3K -[TXT] COPYING 01-Nov-2010 20:31 1.9K -[TXT] TODO 01-Nov-2010 20:31 679 -[TXT] catalog.xml 01-Nov-2010 20:31 609 -[TXT] BUGS 01-Nov-2010 20:31 578 -[TXT] AUTHORS 01-Nov-2010 20:31 143 -[DIR] xhtml/ 01-Nov-2010 22:36 - -[DIR] xhtml-1_1/ 01-Nov-2010 22:36 - -[DIR] website/ 01-Nov-2010 22:36 - -[DIR] webhelp/ 01-Nov-2010 22:36 - -[DIR] tools/ 01-Nov-2010 22:36 - -[DIR] tests/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] slides/ 01-Nov-2010 22:36 - -[DIR] roundtrip/ 01-Nov-2010 22:36 - -[DIR] profiling/ 01-Nov-2010 22:36 - -[DIR] params/ 01-Nov-2010 22:36 - -[DIR] manpages/ 01-Nov-2010 22:36 - -[DIR] lib/ 01-Nov-2010 22:36 - -[DIR] javahelp/ 01-Nov-2010 22:36 - -[DIR] images/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] highlighting/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] extensions/ 01-Nov-2010 22:36 - -[DIR] epub/ 01-Nov-2010 22:36 - -[DIR] eclipse/ 01-Nov-2010 22:36 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] doc/ 01-Nov-2010 20:08 - -[DIR] common/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/install.sh b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/install.sh deleted file mode 100644 index 40716191a68ab10b4529700280808a3d48bc95a3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/install.sh +++ /dev/null @@ -1,977 +0,0 @@ -#!/bin/bash -# $Id: install.sh 7942 2008-03-26 06:08:08Z xmldoc $ -# $Source$ # - -# install.sh - Set up user environment for a XML/XSLT distribution - -# This is as an interactive installer for updating your -# environment to use an XML/XSLT distribution such as the DocBook -# XSL Stylesheets. Its main purpose is to configure your -# environment with XML catalog data and schema "locating rules" -# data provided in the XML/XSLT distribution. -# -# Although this installer was created for the DocBook project, it -# is a general-purpose tool that can be used with any XML/XSLT -# distribution that provides XML/SGML catalogs and locating rules. -# -# This script is mainly intended to make things easier for you if -# you want to install a particular XML/XSLT distribution that has -# not (yet) been packaged for your OS distro (Debian, Fedora, -# whatever), or to use "snapshot" or development releases -# -# It works by updating your shell startup file (e.g., .bashrc and -# .cshrc) and .emacs file and by finding or creating a writable -# CatalogManager.properties file to update. -# -# It makes backup copies of any files it touches, and also -# generates a uninstall.sh script for reverting its changes. -# -# In the same directory where it is located, it expects to find -# the following four files: -# - locatingrules.xml -# - catalog.xml -# - catalog -# - .urilist -# And if it's unable to locate a CatalogManager.properties file in -# your environment, it expects to find an "example" one in the -# same directory as itself, which it copies over to your -# ~/.resolver directory. -# -# If the distribution contains any executables, change the value -# of the thisBinDir to a colon-separated list of the pathnames of -# the directories that contain those executables. - -# mydir is the "canonical" absolute pathname for install.sh -mydir=$(cd -P $(dirname $0) && pwd -P) || exit 1 - -thisLocatingRules=$mydir/locatingrules.xml -thisXmlCatalog=$mydir/catalog.xml -thisSgmlCatalog=$mydir/catalog - -# .urilist file contains a list of pairs of local pathnames and -# URIs to test for catalog resolution -thisUriList=$mydir/.urilist -exampleCatalogManager=$mydir/.CatalogManager.properties.example -thisCatalogManager=$HOME/.resolver/CatalogManager.properties - -# thisBinDir directory is a colon-separated list of the pathnames -# to all directories that contain executables provided with the -# distribution (for example, the DocBook XSL Stylesheets -# distribution contains a "docbook-xsl-update" convenience script -# for rsync'ing up to the latest docbook-xsl snapshot). The -# install.sh script adds the value of thisBinDir to your PATH -# environment variable -thisBinDir=$mydir/tools/bin - -emit_message() { - echo "$1" 1>&2 -} - -if [ ! "${*#--batch}" = "$*" ]; then - batchmode="Yes"; -else - batchmode="No"; - emit_message - if [ ! "$1" = "--test" ]; then - emit_message "NOTE: For non-interactive installs/uninstalls, use --batch" - if [ ! "$1" = "--uninstall" ]; then - emit_message - fi - fi -fi - -osName="Unidentified" -if uname -s | grep -qi "cygwin"; then - osName="Cygwin" -fi - -classPathSeparator=":" -if [ "$osName" = "Cygwin" ]; then - thisJavaXmlCatalog=$(cygpath -m $thisXmlCatalog) - classPathSeparator=";" -else - thisJavaXmlCatalog=$thisXmlCatalog -fi - -main() { - removeOldFiles - checkRoot - updateCatalogManager - checkForResolver - writeDotFiles - updateUserStartupFiles - updateUserDotEmacs - writeUninstallFile - writeTestFile - printExitMessage -} - -removeOldFiles() { - rm -f $mydir/.profile.incl - rm -f $mydir/.cshrc.incl - rm -f $mydir/.emacs.el -} - -checkRoot() { - if [ $(id -u) == "0" ]; then - cat 1>&2 <&2 <&2 <&2 <&2 < $myCatalogManager || exit 1 - emit_message "NOTE: Successfully updated the following file:" - emit_message " $myCatalogManager" - emit_message " Backup written to:" - emit_message " $catalogBackup" - fi - else - mv $myCatalogManager $catalogBackup || exit 1 - cp $catalogBackup $myCatalogManager - echo "catalogs=$thisJavaXmlCatalog;$etcXmlCatalog" \ - | sed 's/;\+/;/' | sed 's/;$//' >> $myCatalogManager || exit 1 - emit_message "NOTE: \"catalogs=\" line added to $myCatalogManager." - emit_message " Backup written to $catalogBackup" - fi - ;; - esac - # end of backing up and updating CatalogManager.properties - fi - fi - # end of CatalogManager.properties updates - - if [ "$osName" = "Cygwin" ]; then - myCatalogManager=$(cygpath -m $myCatalogManager) - fi - return 0 -} - -writeDotFiles() { - while read; do - echo "$REPLY" >> $mydir/.profile.incl - done <> $mydir/.cshrc.incl -done <> $mydir/.profile.incl - done <> $mydir/.cshrc.incl - done <> $mydir/.emacs.el -done <&2 <&2 <> $HOME/$file || exit 1 - cat 1>&2 <&2 <&2 <&2 <&2 <&2 <> $myEmacsFile || exit 1 - cat 1>&2 <&2 <&2 <&2 < $myCatalogManager || exit 1 - cat 1>&2 <&2 <&2 <&2 <&2 <&2 < $uninstallFile || exit 1 - echo 'mydir=$(cd -P $(dirname $0) && pwd -P)' >> $uninstallFile || exit 1 - echo "\$mydir/install.sh \\" >> $uninstallFile || exit 1 - echo " --uninstall \\" >> $uninstallFile || exit 1 - echo " --catalogManager=$myCatalogManager \\" >> $uninstallFile || exit 1 - echo " --dotEmacs='$myEmacsFile' \\" >> $uninstallFile || exit 1 - echo ' $@' >> $uninstallFile || exit 1 - chmod 755 $uninstallFile || exit 1 -} - -writeTestFile() { - testFile=$mydir/test.sh - echo "#!/bin/bash" > $testFile || exit 1 - echo 'mydir=$(cd -P $(dirname $0) && pwd -P)' >> $testFile || exit 1 - echo '$mydir/install.sh --test' >> $testFile || exit 1 - chmod 755 $testFile || exit 1 -} - -printExitMessage() { - cat 1>&2 <&2 <&2 <&2 <&2 < -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without -# restriction, including without limitation the rights to use, copy, -# modify, merge, publish, distribute, sublicense, and/or sell copies -# of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -# vim: number diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html deleted file mode 100644 index d136fdb62f2ed90e691b9fa447b9677394283212..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/javahelp - - -

    Index of /release/xsl-ns/1.76.1/javahelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] javahelp.xsl 01-Nov-2010 20:31 20K -[TXT] profile-javahelp.xsl 01-Nov-2010 20:31 21K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=D;O=A deleted file mode 100644 index c821690f586c9ba88e07ea53522007d627db4f42..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=D;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/javahelp - - -

    Index of /release/xsl-ns/1.76.1/javahelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] javahelp.xsl 01-Nov-2010 20:31 20K -[TXT] profile-javahelp.xsl 01-Nov-2010 20:31 21K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=D;O=D deleted file mode 100644 index 931284f0c7ee5013284fec488ca8e26ec8a0436c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=D;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/javahelp - - -

    Index of /release/xsl-ns/1.76.1/javahelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-javahelp.xsl 01-Nov-2010 20:31 21K -[TXT] javahelp.xsl 01-Nov-2010 20:31 20K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=M;O=A deleted file mode 100644 index 79700df0be4d1750be5520d2f67e4d8f0319a5bd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=M;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/javahelp - - -

    Index of /release/xsl-ns/1.76.1/javahelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] javahelp.xsl 01-Nov-2010 20:31 20K -[TXT] profile-javahelp.xsl 01-Nov-2010 20:31 21K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=M;O=D deleted file mode 100644 index 931284f0c7ee5013284fec488ca8e26ec8a0436c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=M;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/javahelp - - -

    Index of /release/xsl-ns/1.76.1/javahelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-javahelp.xsl 01-Nov-2010 20:31 21K -[TXT] javahelp.xsl 01-Nov-2010 20:31 20K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=N;O=A deleted file mode 100644 index 23ff240a74ebd2f94c221a2e63a2fadf94ac278d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=N;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/javahelp - - -

    Index of /release/xsl-ns/1.76.1/javahelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] javahelp.xsl 01-Nov-2010 20:31 20K -[TXT] profile-javahelp.xsl 01-Nov-2010 20:31 21K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=N;O=D deleted file mode 100644 index 931284f0c7ee5013284fec488ca8e26ec8a0436c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=N;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/javahelp - - -

    Index of /release/xsl-ns/1.76.1/javahelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-javahelp.xsl 01-Nov-2010 20:31 21K -[TXT] javahelp.xsl 01-Nov-2010 20:31 20K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=S;O=A deleted file mode 100644 index d136fdb62f2ed90e691b9fa447b9677394283212..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=S;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/javahelp - - -

    Index of /release/xsl-ns/1.76.1/javahelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] javahelp.xsl 01-Nov-2010 20:31 20K -[TXT] profile-javahelp.xsl 01-Nov-2010 20:31 21K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=S;O=D deleted file mode 100644 index 931284f0c7ee5013284fec488ca8e26ec8a0436c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/index.html?C=S;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/javahelp - - -

    Index of /release/xsl-ns/1.76.1/javahelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-javahelp.xsl 01-Nov-2010 20:31 21K -[TXT] javahelp.xsl 01-Nov-2010 20:31 20K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/javahelp.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/javahelp.xsl deleted file mode 100644 index 21fc6fe4aaf12bbb7b7e5b0fa5844719bc39f1fd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/javahelp.xsl +++ /dev/null @@ -1,613 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - Formatting from - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="normalize-space($title)"/> - - - - - top - - - - - - TOC - - javax.help.TOCView - jhelptoc.xml - - - - Index - - javax.help.IndexView - jhelpidx.xml - - - - Search - - javax.help.SearchView - JavaHelpSearch - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - , - - - - - - - - - - - - - - - - - - - - - bullet - - - - © - - - - TM - - - - - ® - (SM) -   - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/profile-javahelp.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/profile-javahelp.xsl deleted file mode 100644 index 47ea63ec7ad56f7f0356adc760989e4c0960e25a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/javahelp/profile-javahelp.xsl +++ /dev/null @@ -1,548 +0,0 @@ - - - - - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - Formatting from - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="normalize-space($title)"/> - - - - - top - - - - - - TOC - - javax.help.TOCView - jhelptoc.xml - - - - Index - - javax.help.IndexView - jhelpidx.xml - - - - Search - - javax.help.SearchView - JavaHelpSearch - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - , - - - - - - - - - - - - - - - - - - - - - bullet - - - - © - - - - TM - - - - - ® - (SM) -   - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html deleted file mode 100644 index 5d9d2f8bf3f985a0ddb21292fcc3e137c97806a2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/lib - - -

    Index of /release/xsl-ns/1.76.1/lib

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] lib.xsl 01-Nov-2010 20:31 18K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=D;O=A deleted file mode 100644 index 8c59a9607a299af1cff4c02fbae1780a2b315990..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=D;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/lib - - -

    Index of /release/xsl-ns/1.76.1/lib

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] lib.xsl 01-Nov-2010 20:31 18K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=D;O=D deleted file mode 100644 index 6915c52efa1231e27bcc3a3844f5c9e915fcfc23..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=D;O=D +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/lib - - -

    Index of /release/xsl-ns/1.76.1/lib

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] lib.xsl 01-Nov-2010 20:31 18K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=M;O=A deleted file mode 100644 index f5ba996ff2fcf833407dae223b37761e93868527..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=M;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/lib - - -

    Index of /release/xsl-ns/1.76.1/lib

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] lib.xsl 01-Nov-2010 20:31 18K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=M;O=D deleted file mode 100644 index 6915c52efa1231e27bcc3a3844f5c9e915fcfc23..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=M;O=D +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/lib - - -

    Index of /release/xsl-ns/1.76.1/lib

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] lib.xsl 01-Nov-2010 20:31 18K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=N;O=A deleted file mode 100644 index a2209f7a0642af3cddf4a4db0aaedac35b46f103..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=N;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/lib - - -

    Index of /release/xsl-ns/1.76.1/lib

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] lib.xsl 01-Nov-2010 20:31 18K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=N;O=D deleted file mode 100644 index 6915c52efa1231e27bcc3a3844f5c9e915fcfc23..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=N;O=D +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/lib - - -

    Index of /release/xsl-ns/1.76.1/lib

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] lib.xsl 01-Nov-2010 20:31 18K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=S;O=A deleted file mode 100644 index 5d9d2f8bf3f985a0ddb21292fcc3e137c97806a2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=S;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/lib - - -

    Index of /release/xsl-ns/1.76.1/lib

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] lib.xsl 01-Nov-2010 20:31 18K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=S;O=D deleted file mode 100644 index 6915c52efa1231e27bcc3a3844f5c9e915fcfc23..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/index.html?C=S;O=D +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/lib - - -

    Index of /release/xsl-ns/1.76.1/lib

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] lib.xsl 01-Nov-2010 20:31 18K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/lib.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/lib.xsl deleted file mode 100644 index cacc302efe0f34b32241156e63e18acd648cfc66..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/lib/lib.xsl +++ /dev/null @@ -1,482 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unrecognized unit of measure: - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unrecognized unit of measure: - - . - - - - - - - filename - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - - - - - - - - - - / - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/ChangeLog.20020917 b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/ChangeLog.20020917 deleted file mode 100644 index c170cc056014b07090301cb99e6e94b7ef919cdd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/ChangeLog.20020917 +++ /dev/null @@ -1,195 +0,0 @@ -Note: This changelog is a record of descriptions of all changes -made to the DocBook XSL manpages stylesheets during the time when -they were maintained in their original home in the -[cvs]/docbook/contrib/xsl/db2man area of the DocBook Project -source-code repository at Sourceforge; that is, from October 2001 -(when they were contributed to the project by Martijn van Beers) -until September 2002 (when they were moved to the -[cvs]/docbook/xsl/manpages area and became a standard part of all -subsequent DocBook XSL Stylesheets releases). - -2002-09-17 Norman Walsh - - * README, db2man.xsl, lists.xsl, sect23.xsl, synop.xsl, xref.xsl: - Moved to docbook/xsl/manpages - - * db2man.xsl, synop.xsl: Patch from Joe Orton - -2002-06-16 - - * db2man.xsl: commit patch sent by Joe Orton: - - This patch adds support for using the productname, date and title out of - a if one is present, rather than having to add each of - these individually for every refentry. - - * db2man.xsl: Tim Waugh sent: - - This patch normalizes space in each refname before displaying it in - the name section. - -2002-05-21 - - * xref.xsl: from Joe Orton: - this patch allows cross-referencing to a specific refname. I - need this since I'm documenting several different (but related) - functions per refentry, and want to cross-reference them individually, - rather than just by the title used for the refentry as a whole. - -2002-05-17 - - * lists.xsl: apply glosslist support patch from twaugh - -2002-05-15 - - * db2man.xsl: slightly sanitize the filenames we generate. again from twaugh - - * db2man.xsl: Apply twaugh's fix for making the entity transform stuff work - -2002-05-14 - - * db2man.xsl: generalize the tip template for all admonitions - (caution,important,note,tip,warning) - - * db2man.xsl: Apply Joe Orton's patch, modified to be indented. Also show "Tip" - in the title. - - so if foo, you get - Tip: foo - - * synop.xsl: rewrote funcprototype. It used to convert all its children to a single - string and the split it up again through recursion. Now has a nice - foreach loop for the paramdefs, which seems much cleaner than throwing - everything in a big string before processing it. - -2002-05-10 - - * db2man.xsl: add support for simpara - - * db2man.xsl, lists.xsl: fix refsect2 titles - - * synop.xsl: also from twaugh: - - I found some input that goes wrong with the synop.xsl we have in CVS: - - - -o FILE - --output=FILE - - - It gets rendered as (with *bold* and _italic_): - - [*-o FILE* | *--output=FILE*] - - The desired markup should look like: - The following macro does the trick: - - [\fB-o \fIFILE\fR\fR | \fB--output=\fIFILE\fR\fR] - - The trouble is that the named template 'bold' uses value-of, and so - strips of its significance. - - Another thing I found is that the arg/replaceable template is - superfluous altogether: db2man.xsl has a 'replaceable' template which - does the same thing. - - Here is a patch to make those two modifications. - - NOTE TO SELF: must try to fix bold template so we can use it everywhere - -2002-05-09 - - * db2man.xsl: oops, removed too much - - * db2man.xsl: remove stuff that's apparently left-over from sect23.xsl - - * db2man.xsl, lists.xsl, synop.xsl: batch of patches from twaugh: - * This patch (based on one from Jirka Kosek) adds support for - block-level elements inside s---s for example, or lists. - * This patch replaces entities (like '舒') with sensible - characters or groups of characters. - * This patch adds support for sbr. - * This patch normalizes spaces in varlistentry terms. - * This patch normalizes spaces in terminal varlistentry terms. - * This patch allows variable lists to be nested (once). - * This patch prevents variable list item paragraphs from merging into - one another. - * This patch improves the rendering of itemized lists, and adds support - for ordered lists and procedures. - * This patch makes some small adjustments to group/arg: don't put extra - spaces in where they aren't needed, and normalize the space of $arg. - * This patch makes adjustments to cmdsynopsis elements. In particular, - they can now be wrapped if no is provided. - * This patch adds funcsynopsis//* support. Again, wrapping is done - automatically. - - * synop.xsl: make synopsises work for --arg=foo s too - - * synop.xsl: remove unneccesary adding of whitespace for arg/replaceable - -2002-05-01 - - * db2man.xsl: This patch adds support for multiple refnames. - - (another twaugh patch) - - * db2man.xsl: modified ulink patch from twaugh. Be nice to content-less ulinks. But we - don't accomodate silly people who don't understand ulink and put the - url as the content too. - - * db2man.xsl, synop.xsl: db2man.xsl: - * temporarily add some params that chunker.xsl needs - * fix bold/italic templates - * update calls to bold/italic templates for new syntax - synop.xsl: - * add support for synopfragment - * update calls to bold/italic templates for new syntax - -2002-04-30 - - * db2man.xsl: Add twaug's patch for xref support - - * db2man.xsl: This patch adds support for: - - - Multiple authors. - - A (single) man page editor. - - (another patch from twaugh) - - * db2man.xsl: more twaugh patches: - - Use refentrytitle, not refname[1], for title. - - Upper-case it. - - Use date, productname, and title. - - Pick up author from main document if not contained in refentry. - - Use refname[1] for man page filename, not refentrytitle. - - * db2man.xsl: add varname support - - * db2man.xsl: This patch makes userinput (an inline element) have inline formatting. - - * db2man.xsl: This patch adds support for the top-level document being something - other than an article. - - It also emits a helpful warning if no refentry elements are found. - - * db2man.xsl: next twaugh patch: - Instead of writing to stdout, create a file for each - refentry. Plus, for bonus points, a file for each additional refname - within that entry (pointing to the main page). - - * db2man.xsl: Add named templates for bold-ifying and italicizing stuff. Inspired - by yet another twaugh patch - - * db2man.xsl, lists.xsl, sect23.xsl: consistently use instead of a newline - - * db2man.xsl, synop.xsl: * add support for informalexample, screen, errorcode, constant, type, - quote, programlisting and citerefentry - * use the 'bold' and 'italic' named templates - - * xref.xsl: New file. - -2001-12-01 Norman Walsh - - * README, db2man.xsl, lists.xsl, sect23.xsl, synop.xsl: - New file. - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/block.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/block.xsl deleted file mode 100644 index 7133a9ba93f364a61a6b70284c97bd98bb995152..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/block.xsl +++ /dev/null @@ -1,412 +0,0 @@ - - - - - - - - - - n - - .sp - - .RS 4 - - .BM yellow - - - .ps +1 - - .ps -1 - .br - - .sp .5v - - .EM yellow - - .RE - - - - - - - .PP - - - - - - - . - - - - - - - - - - - - - - - - - - - - - .sp - - .RS 4n - - - - - .PP - - - - - - - - .RE - - - - - - - - - - - .sp - - .RS 4n - - - - - .sp - - - - - - - - - - - - - - - - - - - - Yes - - - - - - - - - - - - Yes - - - - - - - - - - - - - - - - .sp - - - - - - - .RS - - - - - - - - - - - - - - - - - - - - - - - - - - - .ft - - - - .nf - - - .fi - - .ft - - - - - .nf - - - - - - - - - - - - - t - - .sp -1 - - .BB lightgray - - adjust-for-leading-newline - - - - .sp -1 - - - .BB lightgray - - - - - - - .EB lightgray - - adjust-for-leading-newline - - t - - - - - - .sp 1 - - - - .EB lightgray - - - - - - - - - - - .fi - - - - - - - .RE - - - - - - .sp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - .PP - - - - - - - - - - .sp - - .RS - - - - - - - - .RE - - - - [IMAGE] - - - - - - [ - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/charmap.groff.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/charmap.groff.xsl deleted file mode 100644 index 47c7536c66748b4a0a1cc4f773328f836c7b3972..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/charmap.groff.xsl +++ /dev/null @@ -1,6014 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/docbook.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/docbook.xsl deleted file mode 100644 index eceda2757aaf1e586c5e7cf0986dd0200451930b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/docbook.xsl +++ /dev/null @@ -1,302 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MAN.MANIFEST - - - - - - - - - - - Erro - - - no refentry - - - No refentry elements found - - in " - - - - ... - - - - - - " - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - '\" t - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .\" ----------------------------------------------------------------- - .\" * MAIN CONTENT STARTS HERE * - .\" ----------------------------------------------------------------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/endnotes.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/endnotes.xsl deleted file mode 100644 index 8d1559f3a16f7ef1c6f7928720fe7a2340bbf5ff..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/endnotes.xsl +++ /dev/null @@ -1,587 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warn - - - endnote - - - - Bad: - - - - - [ - - ] - in source - - - - Note - - - endnote - - - - Has: - - / - - - - - Note - - - endnote - - - - Fix: - - / - para/ - - - - - - - - - - - - - - - - \% - - - - - - - - - - - \m[blue] - - - - - - - - - - - - - - - - - - - - - - - - - - - Warn - - - link font - - - invalid $man.font.links value: - ' - - ' - - - - - - - \m[] - - - - - - - \&\s-2\u[ - - ]\d\s+2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .IP - " - - - . - - - - - - - - " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .RS - - - - - - - - - - \% - - - - - - .RE - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/html-synop.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/html-synop.xsl deleted file mode 100644 index 4a3621a09fc9c6766c95f8215f3e17665e1f2eff..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/html-synop.xsl +++ /dev/null @@ -1,1569 +0,0 @@ - - - - - - - - - - - - -
    - -

    - - - - - - - - - - - - -

    -
    -
    - - - -. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -. - - - - - - - - - - - - - ( - - ) - -   - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - .sp -.nf -
    -    
    -    
    -  
    .fi - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - - -. - - - -

    -
    - - - - - - ( - - - - - - - - - - - - - - - - ) - ; - - - - ... - ) - ; - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - - -. - - - - - ; - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - -
    - -
     
    - -
    - -
    -
    -
     
    -
    - - - - - - ( - - - - - - - - - - - - - - - - - ) - ; - -   - - - - - ... - ) - ; - -   - - - - - - - - , - - - ) - ; - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - ; - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - ; - - - - - - -

    - -

    -
    - - - - - - ( - - - - - - - - - - - - - - - - void) - ; - - - - ... - ) - ; - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - -
    - -
     
    -
     
    -
    - - - - - - ( - - - - - - - - - - - - - - - - - void) - ; - -   - - - - - ... - ) - ; - -   - - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - -java - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unrecognized language on - - : - - - - - - - - - - - - -. - - - - - - - - - .sp -.nf -
    -    
    -    
    -    
    -       extends
    -      
    -      
    -        
    -.
    -
    -	    
    -      
    -    
    -    
    -      implements
    -      
    -      
    -        
    -.
    -
    -	    
    -      
    -    
    -    
    -      throws
    -      
    -    
    -     {
    -    
    -.
    -
    -    
    -    }
    -  
    .fi - -
    - - - - - - - - - , - - - - - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - =  - - - - - - - - void  - - - - - - - - - - - - 0 - - , - -. - - - -   - - - - - - - - - - - - - - - - - - - - - - - -    - - - - - - - - - - - - - - - ( - - - - ) - - -. - -     throws  - - - - - - - ; - - - - - - - - .sp -.nf -
    -    
    -    
    -    
    -      : 
    -      
    -      
    -        
    -.
    -
    -	    
    -      
    -    
    -    
    -       implements
    -      
    -      
    -        
    -.
    -
    -	    
    -      
    -    
    -    
    -       throws
    -      
    -    
    -     {
    -    
    -.
    -
    -    
    -    }
    -  
    .fi - -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - =  - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - -    - - - - - - - - - - ( - - ) - - -. - -     throws  - - - - - - - ; - - - - - - - - .sp -.nf -
    -    
    -    interface 
    -    
    -    
    -      : 
    -      
    -      
    -        
    -.
    -
    -	    
    -      
    -    
    -    
    -       implements
    -      
    -      
    -        
    -.
    -
    -	    
    -      
    -    
    -    
    -       throws
    -      
    -    
    -     {
    -    
    -.
    -
    -    
    -    }
    -  
    .fi - -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - =  - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - -    - - - - - - - - - - ( - - ) - - -. - -     raises( - - ) - - - - - - ; - - - - - - - - .sp -.nf -
    -    
    -    package 
    -    
    -    ;
    -    
    -.
    -
    -
    -    
    -      @ISA = (
    -      
    -      );
    -      
    -.
    -
    -    
    -
    -    
    -  
    .fi - -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - =  - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - sub - - - { ... }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html deleted file mode 100644 index abdbc5f758bdc17030e7976f0eee0923465a797d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/manpages - - -

    Index of /release/xsl-ns/1.76.1/manpages

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] pi.xml 01-Nov-2010 20:31 2.2K -[TXT] pi.xsl 01-Nov-2010 20:31 3.1K -[TXT] ChangeLog.20020917 01-Nov-2010 20:31 6.7K -[TXT] inline.xsl 01-Nov-2010 20:31 7.6K -[TXT] param.xsl 01-Nov-2010 20:31 9.0K -[TXT] refentry.xsl 01-Nov-2010 20:31 12K -[TXT] docbook.xsl 01-Nov-2010 20:31 14K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 15K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] synop.xsl 01-Nov-2010 20:31 16K -[TXT] utility.xsl 01-Nov-2010 20:31 23K -[TXT] lists.xsl 01-Nov-2010 20:31 23K -[TXT] endnotes.xsl 01-Nov-2010 20:31 26K -[TXT] table.xsl 01-Nov-2010 20:31 28K -[TXT] info.xsl 01-Nov-2010 20:31 35K -[TXT] other.xsl 01-Nov-2010 20:31 35K -[TXT] html-synop.xsl 01-Nov-2010 20:31 47K -[TXT] param.xml 01-Nov-2010 20:31 128K -[TXT] charmap.groff.xsl 01-Nov-2010 20:31 150K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=D;O=A deleted file mode 100644 index 2ee58cd3557239fe505886923bd6135915968748..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=D;O=A +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/manpages - - -

    Index of /release/xsl-ns/1.76.1/manpages

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] ChangeLog.20020917 01-Nov-2010 20:31 6.7K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] charmap.groff.xsl 01-Nov-2010 20:31 150K -[TXT] docbook.xsl 01-Nov-2010 20:31 14K -[TXT] endnotes.xsl 01-Nov-2010 20:31 26K -[TXT] html-synop.xsl 01-Nov-2010 20:31 47K -[TXT] info.xsl 01-Nov-2010 20:31 35K -[TXT] inline.xsl 01-Nov-2010 20:31 7.6K -[TXT] lists.xsl 01-Nov-2010 20:31 23K -[TXT] other.xsl 01-Nov-2010 20:31 35K -[TXT] param.xml 01-Nov-2010 20:31 128K -[TXT] param.xsl 01-Nov-2010 20:31 9.0K -[TXT] pi.xml 01-Nov-2010 20:31 2.2K -[TXT] pi.xsl 01-Nov-2010 20:31 3.1K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 12K -[TXT] synop.xsl 01-Nov-2010 20:31 16K -[TXT] table.xsl 01-Nov-2010 20:31 28K -[TXT] utility.xsl 01-Nov-2010 20:31 23K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=D;O=D deleted file mode 100644 index 4a6ddff97e39e07982fe77000d625e8830d4beed..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=D;O=D +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/manpages - - -

    Index of /release/xsl-ns/1.76.1/manpages

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] utility.xsl 01-Nov-2010 20:31 23K -[TXT] table.xsl 01-Nov-2010 20:31 28K -[TXT] synop.xsl 01-Nov-2010 20:31 16K -[TXT] refentry.xsl 01-Nov-2010 20:31 12K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 15K -[TXT] pi.xsl 01-Nov-2010 20:31 3.1K -[TXT] pi.xml 01-Nov-2010 20:31 2.2K -[TXT] param.xsl 01-Nov-2010 20:31 9.0K -[TXT] param.xml 01-Nov-2010 20:31 128K -[TXT] other.xsl 01-Nov-2010 20:31 35K -[TXT] lists.xsl 01-Nov-2010 20:31 23K -[TXT] inline.xsl 01-Nov-2010 20:31 7.6K -[TXT] info.xsl 01-Nov-2010 20:31 35K -[TXT] html-synop.xsl 01-Nov-2010 20:31 47K -[TXT] endnotes.xsl 01-Nov-2010 20:31 26K -[TXT] docbook.xsl 01-Nov-2010 20:31 14K -[TXT] charmap.groff.xsl 01-Nov-2010 20:31 150K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] ChangeLog.20020917 01-Nov-2010 20:31 6.7K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=M;O=A deleted file mode 100644 index ade9672278216acee9258e20b983f748d9ecfabf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=M;O=A +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/manpages - - -

    Index of /release/xsl-ns/1.76.1/manpages

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] ChangeLog.20020917 01-Nov-2010 20:31 6.7K -[TXT] param.xml 01-Nov-2010 20:31 128K -[TXT] pi.xml 01-Nov-2010 20:31 2.2K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] charmap.groff.xsl 01-Nov-2010 20:31 150K -[TXT] docbook.xsl 01-Nov-2010 20:31 14K -[TXT] endnotes.xsl 01-Nov-2010 20:31 26K -[TXT] html-synop.xsl 01-Nov-2010 20:31 47K -[TXT] info.xsl 01-Nov-2010 20:31 35K -[TXT] inline.xsl 01-Nov-2010 20:31 7.6K -[TXT] lists.xsl 01-Nov-2010 20:31 23K -[TXT] other.xsl 01-Nov-2010 20:31 35K -[TXT] param.xsl 01-Nov-2010 20:31 9.0K -[TXT] pi.xsl 01-Nov-2010 20:31 3.1K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 12K -[TXT] synop.xsl 01-Nov-2010 20:31 16K -[TXT] utility.xsl 01-Nov-2010 20:31 23K -[TXT] table.xsl 01-Nov-2010 20:31 28K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=M;O=D deleted file mode 100644 index 8c881f1f3b90a0b956cc391040e3ea08889f8a30..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=M;O=D +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/manpages - - -

    Index of /release/xsl-ns/1.76.1/manpages

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] table.xsl 01-Nov-2010 20:31 28K -[TXT] utility.xsl 01-Nov-2010 20:31 23K -[TXT] synop.xsl 01-Nov-2010 20:31 16K -[TXT] refentry.xsl 01-Nov-2010 20:31 12K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 15K -[TXT] pi.xsl 01-Nov-2010 20:31 3.1K -[TXT] param.xsl 01-Nov-2010 20:31 9.0K -[TXT] other.xsl 01-Nov-2010 20:31 35K -[TXT] lists.xsl 01-Nov-2010 20:31 23K -[TXT] inline.xsl 01-Nov-2010 20:31 7.6K -[TXT] info.xsl 01-Nov-2010 20:31 35K -[TXT] html-synop.xsl 01-Nov-2010 20:31 47K -[TXT] endnotes.xsl 01-Nov-2010 20:31 26K -[TXT] docbook.xsl 01-Nov-2010 20:31 14K -[TXT] charmap.groff.xsl 01-Nov-2010 20:31 150K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] pi.xml 01-Nov-2010 20:31 2.2K -[TXT] param.xml 01-Nov-2010 20:31 128K -[TXT] ChangeLog.20020917 01-Nov-2010 20:31 6.7K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=N;O=A deleted file mode 100644 index fd372f64126856f1b3ed0432db5ec117c300f378..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=N;O=A +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/manpages - - -

    Index of /release/xsl-ns/1.76.1/manpages

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] ChangeLog.20020917 01-Nov-2010 20:31 6.7K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] charmap.groff.xsl 01-Nov-2010 20:31 150K -[TXT] docbook.xsl 01-Nov-2010 20:31 14K -[TXT] endnotes.xsl 01-Nov-2010 20:31 26K -[TXT] html-synop.xsl 01-Nov-2010 20:31 47K -[TXT] info.xsl 01-Nov-2010 20:31 35K -[TXT] inline.xsl 01-Nov-2010 20:31 7.6K -[TXT] lists.xsl 01-Nov-2010 20:31 23K -[TXT] other.xsl 01-Nov-2010 20:31 35K -[TXT] param.xml 01-Nov-2010 20:31 128K -[TXT] param.xsl 01-Nov-2010 20:31 9.0K -[TXT] pi.xml 01-Nov-2010 20:31 2.2K -[TXT] pi.xsl 01-Nov-2010 20:31 3.1K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 12K -[TXT] synop.xsl 01-Nov-2010 20:31 16K -[TXT] table.xsl 01-Nov-2010 20:31 28K -[TXT] utility.xsl 01-Nov-2010 20:31 23K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=N;O=D deleted file mode 100644 index 4a6ddff97e39e07982fe77000d625e8830d4beed..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=N;O=D +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/manpages - - -

    Index of /release/xsl-ns/1.76.1/manpages

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] utility.xsl 01-Nov-2010 20:31 23K -[TXT] table.xsl 01-Nov-2010 20:31 28K -[TXT] synop.xsl 01-Nov-2010 20:31 16K -[TXT] refentry.xsl 01-Nov-2010 20:31 12K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 15K -[TXT] pi.xsl 01-Nov-2010 20:31 3.1K -[TXT] pi.xml 01-Nov-2010 20:31 2.2K -[TXT] param.xsl 01-Nov-2010 20:31 9.0K -[TXT] param.xml 01-Nov-2010 20:31 128K -[TXT] other.xsl 01-Nov-2010 20:31 35K -[TXT] lists.xsl 01-Nov-2010 20:31 23K -[TXT] inline.xsl 01-Nov-2010 20:31 7.6K -[TXT] info.xsl 01-Nov-2010 20:31 35K -[TXT] html-synop.xsl 01-Nov-2010 20:31 47K -[TXT] endnotes.xsl 01-Nov-2010 20:31 26K -[TXT] docbook.xsl 01-Nov-2010 20:31 14K -[TXT] charmap.groff.xsl 01-Nov-2010 20:31 150K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] ChangeLog.20020917 01-Nov-2010 20:31 6.7K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=S;O=A deleted file mode 100644 index abdbc5f758bdc17030e7976f0eee0923465a797d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=S;O=A +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/manpages - - -

    Index of /release/xsl-ns/1.76.1/manpages

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] pi.xml 01-Nov-2010 20:31 2.2K -[TXT] pi.xsl 01-Nov-2010 20:31 3.1K -[TXT] ChangeLog.20020917 01-Nov-2010 20:31 6.7K -[TXT] inline.xsl 01-Nov-2010 20:31 7.6K -[TXT] param.xsl 01-Nov-2010 20:31 9.0K -[TXT] refentry.xsl 01-Nov-2010 20:31 12K -[TXT] docbook.xsl 01-Nov-2010 20:31 14K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 15K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] synop.xsl 01-Nov-2010 20:31 16K -[TXT] utility.xsl 01-Nov-2010 20:31 23K -[TXT] lists.xsl 01-Nov-2010 20:31 23K -[TXT] endnotes.xsl 01-Nov-2010 20:31 26K -[TXT] table.xsl 01-Nov-2010 20:31 28K -[TXT] info.xsl 01-Nov-2010 20:31 35K -[TXT] other.xsl 01-Nov-2010 20:31 35K -[TXT] html-synop.xsl 01-Nov-2010 20:31 47K -[TXT] param.xml 01-Nov-2010 20:31 128K -[TXT] charmap.groff.xsl 01-Nov-2010 20:31 150K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=S;O=D deleted file mode 100644 index 37272cd5c5599c405d64da49351856c4789e23ef..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/index.html?C=S;O=D +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/manpages - - -

    Index of /release/xsl-ns/1.76.1/manpages

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] charmap.groff.xsl 01-Nov-2010 20:31 150K -[TXT] param.xml 01-Nov-2010 20:31 128K -[TXT] html-synop.xsl 01-Nov-2010 20:31 47K -[TXT] other.xsl 01-Nov-2010 20:31 35K -[TXT] info.xsl 01-Nov-2010 20:31 35K -[TXT] table.xsl 01-Nov-2010 20:31 28K -[TXT] endnotes.xsl 01-Nov-2010 20:31 26K -[TXT] lists.xsl 01-Nov-2010 20:31 23K -[TXT] utility.xsl 01-Nov-2010 20:31 23K -[TXT] synop.xsl 01-Nov-2010 20:31 16K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 15K -[TXT] docbook.xsl 01-Nov-2010 20:31 14K -[TXT] refentry.xsl 01-Nov-2010 20:31 12K -[TXT] param.xsl 01-Nov-2010 20:31 9.0K -[TXT] inline.xsl 01-Nov-2010 20:31 7.6K -[TXT] ChangeLog.20020917 01-Nov-2010 20:31 6.7K -[TXT] pi.xsl 01-Nov-2010 20:31 3.1K -[TXT] pi.xml 01-Nov-2010 20:31 2.2K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/info.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/info.xsl deleted file mode 100644 index 2a70b905db06c19dbc8906a6d9322abeea4b3011..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/info.xsl +++ /dev/null @@ -1,801 +0,0 @@ - - - - - - - - - - - - - - - - \n(zqu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " - - - - " - - - - - - - - - - " - - - - " - - - - - - - - - - - - - - " - - " - - - - " - - " - - - - - - - - - - - - - - - - - - - - Documentation - - - DOCUMENTATION - - - - - - - - - - [see the - - section] - - - - - - [FIXME: author] [see http://docbook.sf.net/el/author] - - - Warn - - meta author - - no refentry/info/author - - - - Note - - meta author - - see http://docbook.sf.net/el/author - - - - Warn - - meta author - - no author data, so inserted a fixme - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - < - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Author - - - Authors - - - - - - - - - - - - - - - - - .PP - - - - - - - - - - - .br - - - - - - - - - - - - - - .PP - - - - - - - - - - - - - .PP - - - - - - - - - - - - - .PP - - - - - - - - - - - - - - - .RS - - - - - - - - - . - .RE - - - - - - - - - - - - - - - - - - <\& - - - - - - - - - - - - - - - \&> - - - - - - - , - - - - - - - - - - - - - - - .br - - - - - - - - - - , - - - - - - - - - - - .br - - - - - - - - - - - - .br - - - - - - - - - - - - - - - - - - - - - - - - - Warn - - AUTHOR sect. - - no personblurb|contrib for - - - - - Note - - AUTHOR sect. - - see see http://docbook.sf.net/el/contrib - - - - Note - - AUTHOR sect. - - see see http://docbook.sf.net/el/personblurb - - - - - - - - - - .RS - - - - - - - - - . - .RE - - - - .RS - - - - - - - - - . - .RE - - - - - - - - .RS - - - - - - - - - . - .RE - - - - - - - - - - - - - - - - - - - - - - - - - - - .RE - - - - - - - - - - . - - - - - - - - - - - - - - - - .RE - - - - - - - - - - - .RS - - - - - - - - - - - - - .PP - - - - - .br - - - - - - - - - - - - - - - - - - - - - Copyright - - - - .br - - - - - - - - - - - .br - - - - - .sp - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/inline.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/inline.xsl deleted file mode 100644 index d0e3781c00a2efa8c2e22e722451a5e01c14eb85..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/inline.xsl +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - © - - - ® - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .\" - - - - - - - - - - : - - - - - - - - .\" - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/lists.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/lists.xsl deleted file mode 100644 index 7f7ae7a9581cf253d971b1b0380de3a6328b7041..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/lists.xsl +++ /dev/null @@ -1,606 +0,0 @@ - - - - - - - - - - - - - - - - \n(zqu - - - - - - - - - - - - - - .sp - - - - - - - - - - - .PP - - - - - - - - - - - .PP - - - - - - - - - - - - - - - - - - - - .br - - - - - - .RS - - - - - - - .RE - - - - - - - - - .sp - - - - - - - - - - - - - - - .sp - - .RS - - - - - - - - - - - \h'- - - - 0 - - - - \n(INu - - - ' - - \h'+ - - - 0 - - - - \n(INu-1 - - - '\c - - - - - - - .sp -1 - .IP \(bu 2.3 - - - - - - .RE - - - - - .sp - - .RS - - - - - - - - - - - \h'- - - - 0 - - - - \n(INu+3n - - - ' - - - - - \h'+ - - - 0 - - - - 1n - - - '\c - - - - - - - .sp -1 - .IP " - - - - - " 4.2 - - - - - - .RE - - - - - - .PP - - - - - - - - - - - - - - - - .sp - - - - - - - .PP - - - - - - - - - .sp - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - .RS - - - - - - - - .RE - - - - - - - - - - .PP - - - - - - - .\" line length increase to cope w/ tbl weirdness - .ll +(\n(LLu * 62u / 100u) - - .TS - - - - - - l - - - . - - - - - - - - - - - - - - .TE - .\" line length decrease back to previous value - .ll -(\n(LLu * 62u / 100u) - - .sp - - - - - - - - - - - - - - - - - - - - - - - - - - - - T{ - - - - - T} - - - - - - - - - - - - - - - - - - - - - - - - - - - .TS - tab(:); - - - - r lw(\n(.lu*75u/100u). - - .TE - - - - - - - - - - - - - - \h'-2n': - - - T{ - - T} - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - - \ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - \fB( - - )\fR - - - - - - - \fB - - .\fR - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/other.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/other.xsl deleted file mode 100644 index fecba9e64fc05934116a6e97b4bf8468f092a2b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/other.xsl +++ /dev/null @@ -1,889 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ - - - - - \e - - - - - - - - . - \&. - - - - - - - - - - \- - - - - - - - - ' - \*(Aq - - - - - - - -   - - - - - - - - - - - - - - - - - - - - \ \& - - - - - - - - - - - - - - - - .\" Title: - - - - - .\" Author: - - - - - - - - - - .\" Generator: DocBook - - v - - - - <http://docbook.sf.net/> - - .\" Date: - - - - - .\" Manual: - - - - - .\" Source: - - - - - .\" Language: - - - .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .TH " - - - - - - - - - - - - - " " - - " " - - - - - - - " " - - - - - - - - - - - - " " - - - - - - - - - - - - " - - - - - - - - - - - - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- - - .\" disable hyphenation - .nh - - - - - .\" disable justification - (adjust text to left margin only) - .ad l - - - .\" store initial "default indentation value" - .nr zq \n(IN - .\" adjust default indentation - .nr IN - - - .\" adjust indentation of SS headings - .nr SN \n(IN - - - - - - .\" enable line breaks after slashes - .cflags 4 / - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Note: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Note: - (soelim stub) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Note: - (manifest file) - - - - - - - - - - - - - - .\" ----------------------------------------------------------------- - .\" * Define some portability stuff - .\" ----------------------------------------------------------------- - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .\" http://bugs.debian.org/507673 - .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - .ie \n(.g .ds Aq \(aq - - .el .ds Aq ' - - - - - - - .\" ----------------------------------------------------------------- - .\" * (re)Define some macros - .\" ----------------------------------------------------------------- - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .\" toupper - uppercase a string (locale-aware) - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .de toupper - .tr - - - \\$* - .tr - - - .. - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .\" SH-xref - format a cross-reference to an SH section - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .de SH-xref -.ie n \{\ -.\} -.toupper \\$* -.el \{\ -\\$* -.\} -.. - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .\" SH - level-one heading that works better for non-TTY output - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .de1 SH - .\" put an extra blank line of space above the head in non-TTY output - - t - - .sp 1 - - .sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[an-margin]u -.ti 0 -.HTML-TAG ".NH \\n[an-level]" -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -\." make the size of the head bigger -.ps +3 -.ft B -.ne (2v + 1u) -.ie n \{\ -.\" if n (TTY output), use uppercase -.toupper \\$* -.\} -.el \{\ -.nr an-break-flag 0 -.\" if not n (not TTY), use normal case (not uppercase) -\\$1 -.in \\n[an-margin]u -.ti 0 -.\" if not n (not TTY), put a border/line under subheading -.sp -.6 -\l'\n(.lu' -.\} -.. - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .\" SS - level-two heading that works better for non-TTY output - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .de1 SS -.sp \\n[PD]u -.nr an-level 1 -.set-an-margin -.nr an-prevailing-indent \\n[IN] -.fi -.in \\n[IN]u -.ti \\n[SN]u -.it 1 an-trap -.nr an-no-space-flag 1 -.nr an-break-flag 1 -.ps \\n[PS-SS]u -\." make the size of the head bigger -.ps +2 -.ft B -.ne (2v + 1u) -.if \\n[.$] \&\\$* -.. - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .\" BB/EB - put background/screen (filled box) around block of text - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .de BB -.if t \{\ -.sp -.5 -.br -.in +2n -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EB -.if t \{\ -.if "\\$2"adjust-for-leading-newline" \{\ -.sp -1 -.\} -.br -.di -.in -.ll -.gcolor -.nr BW \\n(.lu-\\n(.i -.nr BH \\n(dn+.5v -.ne \\n(BHu+.5v -.ie "\\$2"adjust-for-leading-newline" \{\ -\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.el \{\ -\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] -.\} -.in 0 -.sp -.5v -.nf -.BX -.in -.sp .5v -.fi -.\} -.. - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .\" BM/EM - put colored marker in margin next to block of text - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - .de BM -.if t \{\ -.br -.ll -2n -.gcolor red -.di BX -.\} -.. -.de EM -.if t \{\ -.br -.di -.ll -.gcolor -.nr BH \\n(dn -.ne \\n(BHu -\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] -.in 0 -.nf -.BX -.in -.fi -.\} -.. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/param.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/param.xml deleted file mode 100644 index 706c99d1ffbd43f09a939028f5f2132ec6c6caba..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/param.xml +++ /dev/null @@ -1,3220 +0,0 @@ - - - - Manpages Parameter Reference - - $Id: param.xweb 8235 2009-02-09 16:22:14Z xmldoc $ - - - The DocBook Project - - - 2005-2007 - The DocBook Project - - - This is reference documentation for all user-configurable - parameters in the DocBook XSL "manpages" stylesheet (for - generating groff/nroff output). Note that the manpages - stylesheet is a customization layer of the DocBook XSL HTML - stylesheet. Therefore, you can also use a number of HTML stylesheet parameters - to control manpages output (in addition to the - manpages-specific parameters listed in this section). - - - - Hyphenation, justification, and breaking - - -man.hyphenate -boolean - - -man.hyphenate -Enable hyphenation? - - - - -<xsl:param name="man.hyphenate">0</xsl:param> - - -Description - -If non-zero, hyphenation is enabled. - - -The default value for this parameter is zero because groff is -not particularly smart about how it does hyphenation; it can end up -hyphenating a lot of things that you don't want hyphenated. To -mitigate that, the default behavior of the stylesheets is to suppress -hyphenation of computer inlines, filenames, and URLs. (You can -override the default behavior by setting non-zero values for the -man.hyphenate.urls, -man.hyphenate.filenames, and -man.hyphenate.computer.inlines parameters.) But -the best way is still to just globally disable hyphenation, as the -stylesheets do by default. - -The only good reason to enabled hyphenation is if you have also -enabled justification (which is disabled by default). The reason is -that justified text can look very bad unless you also hyphenate it; to -quote the Hypenation node from the groff info page: - -
    - Since the odds are not great for finding a set of - words, for every output line, which fit nicely on a line without - inserting excessive amounts of space between words, 'gtroff' - hyphenates words so that it can justify lines without inserting too - much space between words. -
    - -So, if you set a non-zero value for the -man.justify parameter (to enable -justification), then you should probably also set a non-zero value for -man.hyphenate (to enable hyphenation).
    -
    - - -
    -
    - - - -man.hyphenate.urls -boolean - - -man.hyphenate.urls -Hyphenate URLs? - - - - -<xsl:param name="man.hyphenate.urls">0</xsl:param> - - -Description - -If zero (the default), hyphenation is suppressed for output of -the ulink url attribute. - - - If hyphenation is already turned off globally (that is, if - man.hyphenate is zero, setting - man.hyphenate.urls is not necessary. - - -If man.hyphenate.urls is non-zero, URLs -will not be treated specially and are subject to hyphenation just like -other words. - - - If you are thinking about setting a non-zero value for - man.hyphenate.urls in order to make long - URLs break across lines, you'd probably be better off - experimenting with setting the - man.break.after.slash parameter first. That - will cause long URLs to be broken after slashes. - - - - - - - -man.hyphenate.filenames -boolean - - -man.hyphenate.filenames -Hyphenate filenames? - - - - -<xsl:param name="man.hyphenate.filenames">0</xsl:param> - - -Description - -If zero (the default), hyphenation is suppressed for -filename output. - - - If hyphenation is already turned off globally (that is, if - man.hyphenate is zero, setting - man.hyphenate.filenames is not - necessary. - - -If man.hyphenate.filenames is non-zero, -filenames will not be treated specially and are subject to hyphenation -just like other words. - - - If you are thinking about setting a non-zero value for - man.hyphenate.filenames in order to make long - filenames/pathnames break across lines, you'd probably be better off - experimenting with setting the - man.break.after.slash parameter first. That - will cause long pathnames to be broken after slashes. - - - - - - - -man.hyphenate.computer.inlines -boolean - - -man.hyphenate.computer.inlines -Hyphenate computer inlines? - - - - -<xsl:param name="man.hyphenate.computer.inlines">0</xsl:param> - - -Description - -If zero (the default), hyphenation is suppressed for -computer inlines such as environment variables, -constants, etc. This parameter current affects output of the following -elements: - - - classname - constant - envar - errorcode - option - replaceable - userinput - type - varname - - - - - If hyphenation is already turned off globally (that is, if - man.hyphenate is zero, setting the - man.hyphenate.computer.inlines is not - necessary. - - -If man.hyphenate.computer.inlines is -non-zero, computer inlines will not be treated specially and will be -hyphenated like other words when needed. - - - - - - -man.justify -boolean - - -man.justify -Justify text to both right and left margins? - - - - -<xsl:param name="man.justify">0</xsl:param> - - -Description - -If non-zero, text is justified to both the right and left -margins (or, in roff terminology, "adjusted and filled" to both the -right and left margins). If zero (the default), text is adjusted to -the left margin only -- producing what is traditionally called -"ragged-right" text. - - -The default value for this parameter is zero because justified -text looks good only when it is also hyphenated. Without hyphenation, -excessive amounts of space often end up getting between words, in -order to "pad" lines out to align on the right margin. - -The problem is that groff is not particularly smart about how it -does hyphenation; it can end up hyphenating a lot of things that you -don't want hyphenated. So, disabling both justification and -hyphenation ensures that hyphens won't get inserted where you don't -want to them, and you don't end up with lines containing excessive -amounts of space between words. - -However, if do you decide to set a non-zero value for the -man.justify parameter (to enable -justification), then you should probably also set a non-zero value for -man.hyphenate (to enable hyphenation). - -Yes, these default settings run counter to how most existing man -pages are formatted. But there are some notable exceptions, such as -the perl man pages. - - - - - - -man.break.after.slash -boolean - - -man.break.after.slash -Enable line-breaking after slashes? - - - - -<xsl:param name="man.break.after.slash">0</xsl:param> - - -Description - -If non-zero, line-breaking after slashes is enabled. This is -mainly useful for causing long URLs or pathnames/filenames to be -broken up or "wrapped" across lines (though it also has the side -effect of sometimes causing relatively short URLs and pathnames to be -broken up across lines too). - -If zero (the default), line-breaking after slashes is -disabled. In that case, strings containing slashes (for example, URLs -or filenames) are not broken across lines, even if they exceed the -maximum column widith. - - - If you set a non-zero value for this parameter, check your - man-page output carefuly afterwards, in order to make sure that the - setting has not introduced an excessive amount of breaking-up of URLs - or pathnames. If your content contains mostly short URLs or - pathnames, setting a non-zero value for - man.break.after.slash will probably result in - in a significant number of relatively short URLs and pathnames being - broken across lines, which is probably not what you want. - - - - - -
    - - Indentation - - -man.indent.width -length - - -man.indent.width -Specifies width used for adjusted indents - - - - -<xsl:param name="man.indent.width">4</xsl:param> - - - -Description -The man.indent.width parameter specifies -the width used for adjusted indents. The value of -man.indent.width is used for indenting of -lists, verbatims, headings, and elsewhere, depending on whether the -values of certain man.indent.* boolean parameters -are non-zero. - -The value of man.indent.width should -include a valid roff measurement unit (for example, -n or u). The default value of -4n specifies a 4-en width; when viewed on a -console, that amounts to the width of four characters. For details -about roff measurment units, see the Measurements -node in the groff info page. - - - - - - -man.indent.refsect -boolean - - -man.indent.refsect -Adjust indentation of refsect* and refsection? - - - - -<xsl:param name="man.indent.refsect" select="0"></xsl:param> - - -Description - -If the value of man.indent.refsect is -non-zero, the width of the left margin for -refsect1, refsect2 and -refsect3 contents and titles (and first-level, -second-level, and third-level nested -refsectioninstances) is adjusted by the value of -the man.indent.width parameter. With -man.indent.width set to its default value of -3n, the main results are that: - - - - contents of refsect1 are output with a - left margin of three characters instead the roff default of seven - or eight characters - - - contents of refsect2 are displayed in - console output with a left margin of six characters instead the of - the roff default of seven characters - - - the contents of refsect3 and nested - refsection instances are adjusted - accordingly. - - - -If instead the value of man.indent.refsect is -zero, no margin adjustment is done for refsect* -output. - - - If your content is primarly comprised of - refsect1 and refsect2 content - (or the refsection equivalent) – with few or - no refsect3 or lower nested sections , you may be - able to “conserve” space in your output by setting - man.indent.refsect to a non-zero value. Doing - so will “squeeze” the left margin in such as way as to provide an - additional four characters of “room” per line in - refsect1 output. That extra room may be useful - if, for example, you have many verbatim sections with long lines in - them. - - - - - - - -man.indent.blurbs -boolean - - -man.indent.blurbs -Adjust indentation of blurbs? - - - - -<xsl:param name="man.indent.blurbs" select="1"></xsl:param> - - -Description - -If the value of man.indent.blurbs is -non-zero, the width of the left margin for -authorblurb, personblurb, and -contrib output is set to the value of the -man.indent.width parameter -(3n by default). If instead the value of -man.indent.blurbs is zero, the built-in roff -default width (7.2n) is used. - - - - - - -man.indent.lists -boolean - - -man.indent.lists -Adjust indentation of lists? - - - - -<xsl:param name="man.indent.lists" select="1"></xsl:param> - - -Description - -If the value of man.indent.lists is -non-zero, the width of the left margin for list items in -itemizedlist, -orderedlist, -variablelist output (and output of some other -lists) is set to the value of the -man.indent.width parameter -(4n by default). If instead the value of -man.indent.lists is zero, the built-in roff -default width (7.2n) is used. - - - - - - -man.indent.verbatims -boolean - - -man.indent.verbatims -Adjust indentation of verbatims? - - - - -<xsl:param name="man.indent.verbatims" select="1"></xsl:param> - - -Description - -If the value of man.indent.verbatims is -non-zero, the width of the left margin for output of verbatim -environments (programlisting, -screen, and so on) is set to the value of the -man.indent.width parameter -(3n by default). If instead the value of -man.indent.verbatims is zero, the built-in roff -default width (7.2n) is used. - - - - - - - Fonts - - -man.font.funcprototype -string - - -man.font.funcprototype -Specifies font for funcprototype output - - - - - <xsl:param name="man.font.funcprototype">BI</xsl:param> - - - -Description - -The man.font.funcprototype parameter -specifies the font for funcprototype output. It -should be a valid roff font name, such as BI or -B. - - - - - - -man.font.funcsynopsisinfo -string - - -man.font.funcsynopsisinfo -Specifies font for funcsynopsisinfo output - - - - - <xsl:param name="man.font.funcsynopsisinfo">B</xsl:param> - - - -Description - -The man.font.funcsynopsisinfo parameter -specifies the font for funcsynopsisinfo output. It -should be a valid roff font name, such as B or -I. - - - - - - -man.font.links -string - - -man.font.links -Specifies font for links - - - - -<xsl:param name="man.font.links">B</xsl:param> - - - -Description - -The man.font.links parameter -specifies the font for output of links (ulink instances -and any instances of any element with an xlink:href attribute). - -The value of man.font.links must be - either B or I, or empty. If -the value is empty, no font formatting is applied to links. - -If you set man.endnotes.are.numbered and/or -man.endnotes.list.enabled to zero (disabled), then -you should probably also set an empty value for -man.font.links. But if -man.endnotes.are.numbered is non-zero (enabled), -you should probably keep -man.font.links set to -B or IThe - main purpose of applying a font format to links in most output -formats it to indicate that the formatted text is -“clickable”; given that links rendered in man pages are -not “real” hyperlinks that users can click on, it might -seem like there is never a good reason to have font formatting for -link contents in man output. -In fact, if you suppress the -display of inline link references (by setting -man.endnotes.are.numbered to zero), there is no -good reason to apply font formatting to links. However, if -man.endnotes.are.numbered is non-zero, having -font formatting for links (arguably) serves a purpose: It provides -“context” information about exactly what part of the text -is being “annotated” by the link. Depending on how you -mark up your content, that context information may or may not -have value.. - - -Related Parameters - man.endnotes.list.enabled, - man.endnotes.are.numbered - - - - - - -man.font.table.headings -string - - -man.font.table.headings -Specifies font for table headings - - - - - <xsl:param name="man.font.table.headings">B</xsl:param> - - - -Description - -The man.font.table.headings parameter -specifies the font for table headings. It should be -a valid roff font, such as B or -I. - - - - - - -man.font.table.title -string - - -man.font.table.title -Specifies font for table headings - - - - - <xsl:param name="man.font.table.title">B</xsl:param> - - - -Description - -The man.font.table.title parameter -specifies the font for table titles. It should be -a valid roff font, such as B or -I. - - - - - - - SYNOPSIS section - - -man.funcsynopsis.style -list -ansi -kr - - -man.funcsynopsis.style -What style of funcsynopsis should be generated? - - -<xsl:param name="man.funcsynopsis.style">ansi</xsl:param> - -Description -If man.funcsynopsis.style is -ansi, ANSI-style function synopses are -generated for a funcsynopsis, otherwise K&R-style -function synopses are generated. - - - - - - AUTHORS and COPYRIGHT sections - - -man.authors.section.enabled -boolean - - -man.authors.section.enabled -Display auto-generated AUTHORS section? - - - -<xsl:param name="man.authors.section.enabled">1</xsl:param> - - -Description - -If the value of -man.authors.section.enabled is non-zero -(the default), then an AUTHORS section is -generated near the end of each man page. The output of the -AUTHORS section is assembled from any -author, editor, and othercredit -metadata found in the contents of the child info or -refentryinfo (if any) of the refentry -itself, or from any author, editor, and -othercredit metadata that may appear in info -contents of any ancestors of the refentry. - -If the value of -man.authors.section.enabled is zero, the -the auto-generated AUTHORS section is -suppressed. - -Set the value of - man.authors.section.enabled to zero if - you want to have a manually created AUTHORS - section in your source, and you want it to appear in output - instead of the auto-generated AUTHORS - section. - - - - - -man.copyright.section.enabled -boolean - - -man.copyright.section.enabled -Display auto-generated COPYRIGHT section? - - - -<xsl:param name="man.copyright.section.enabled">1</xsl:param> - - -Description - -If the value of -man.copyright.section.enabled is non-zero -(the default), then a COPYRIGHT section is -generated near the end of each man page. The output of the -COPYRIGHT section is assembled from any -copyright and legalnotice metadata found in -the contents of the child info or -refentryinfo (if any) of the refentry -itself, or from any copyright and -legalnotice metadata that may appear in info -contents of any ancestors of the refentry. - -If the value of -man.copyright.section.enabled is zero, the -the auto-generated COPYRIGHT section is -suppressed. - -Set the value of - man.copyright.section.enabled to zero if - you want to have a manually created COPYRIGHT - section in your source, and you want it to appear in output - instead of the auto-generated COPYRIGHT - section. - - - - - - Endnotes and link handling - - -man.endnotes.list.enabled -boolean - - -man.endnotes.list.enabled -Display endnotes list at end of man page? - - - - -<xsl:param name="man.endnotes.list.enabled">1</xsl:param> - - - -Description - -If the value of man.endnotes.list.enabled is -non-zero (the default), then an endnotes list is added to the end of -the output man page. - -If the value of man.endnotes.list.enabled is -zero, the list is suppressed — unless link numbering is enabled (that -is, if man.endnotes.are.numbered is non-zero), in -which case, that setting overrides the -man.endnotes.list.enabled setting, and the -endnotes list is still displayed. The reason is that inline -numbering of notesources associated with endnotes only makes sense -if a (numbered) list of endnotes is also generated. - - - Leaving - man.endnotes.list.enabled at its default - (non-zero) value ensures that no “out of line” information (such - as the URLs for hyperlinks and images) gets lost in your - man-page output. It just gets “rearranged”. - So if you’re thinking about disabling endnotes listing by - setting the value of - man.endnotes.list.enabled to zero: - Before you do so, first take some time to carefully consider - the information needs and experiences of your users. The “out - of line” information has value even if the presentation of it - in text output is not as interactive as it may be in other - output formats. - As far as the specific case of URLs: Even though the URLs - displayed in text output may not be “real” (clickable) - hyperlinks, many X terminals have convenience features for - recognizing URLs and can, for example, present users with - an options to open a URL in a browser with the user clicks on - the URL is a terminal window. And short of those, users with X - terminals can always manually cut and paste the URLs into a web - browser. - Also, note that various “man to html” tools, such as the - widely used man2html (VH-Man2html) - application, automatically mark up URLs with a@href markup - during conversion — resulting in “real” hyperlinks in HTML - output from those tools. - - -To “turn off” numbering of endnotes in the -endnotes list, set man.endnotes.are.numbered -to zero. The endnotes list will -still be displayed; it will just be displayed without the -numbersIt can still make sense to have -the list of endnotes displayed even if you have endnotes numbering turned -off. In that case, your endnotes list basically becomes a “list -of references” without any association with specific text in -your document. This is probably the best option if you find the inline -endnotes numbering obtrusive. Your users will still have access to all the “out of line” -such as URLs for hyperlinks. - - -The default heading for the endnotes list is -NOTES. To change that, set a non-empty -value for the man.endnotes.list.heading -parameter. - -In the case of notesources that are links: Along with the -URL for each link, the endnotes list includes the contents of the -link. The list thus includes only non-empty - -A “non-empty” link is one that looks like -this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/">manpages</ulink> -an “empty link” is on that looks like this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/"/> - links. - -Empty links are never included, and never numbered. They are simply -displayed inline, without any numbering. - -In addition, if there are multiple instances of links in a -refentry that have the same URL, the URL is listed only -once. The contents listed for that link in the endnotes list are -the contents of the first link which has that URL. - -If you disable endnotes listing, you should probably also set -man.links.are.underlined to zero (to disable -link underlining). - - - - - -man.endnotes.list.heading -string - - -man.endnotes.list.heading -Specifies an alternate name for endnotes list - - - - -<xsl:param name="man.endnotes.list.heading"></xsl:param> - - - -Description - -If the value of the -man.endnotes.are.numbered parameter -and/or the man.endnotes.list.enabled -parameter is non-zero (the defaults for both are non-zero), a -numbered list of endnotes is generated near the end of each man -page. The default heading for the list of endnotes is the -equivalent of the English word NOTES in -the current locale. To cause an alternate heading to be displayed, -set a non-empty value for the -man.endnotes.list.heading parameter — -for example, REFERENCES. - - - - - -man.endnotes.are.numbered -boolean - - -man.endnotes.are.numbered -Number endnotes? - - - - -<xsl:param name="man.endnotes.are.numbered">1</xsl:param> - - - -Description - -If the value of man.endnotes.are.numbered is -non-zero (the default), then for each non-empty -A “non-empty” notesource is one that looks like -this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/">manpages</ulink> -an “empty” notesource is on that looks like this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/"/> - “notesource”: - - - - a number (in square brackets) is displayed inline after the - rendered inline contents (if any) of the notesource - - - the contents of the notesource are included in a - numbered list of endnotes that is generated at the end of - each man page; the number for each endnote corresponds to - the inline number for the notesource with which it is - associated - - -The default heading for the list of endnotes is -NOTES. To output a different heading, set a value -for the man.endnotes.section.heading -parameter. - - - The endnotes list is also displayed (but without - numbers) if the value of - man.endnotes.list.enabled is - non-zero. - - - -If the value of man.endnotes.are.numbered is -zero, numbering of endnotess is suppressed; only inline -contents (if any) of the notesource are displayed inline. - - If you are thinking about disabling endnote numbering by setting - the value of man.endnotes.are.numbered to zero, - before you do so, first take some time to carefully - consider the information needs and experiences of your users. The - square-bracketed numbers displayed inline after notesources may seem - obstrusive and aesthetically unpleasingAs far as notesources that are links, ytou might - think it would be better to just display URLs for non-empty - links inline, after their content, rather than displaying - square-bracketed numbers all over the place. But it's not better. In - fact, it's not even practical, because many (most) URLs for links - are too long to be displayed inline. They end up overflowing the - right margin. You can set a non-zero value for - man.break.after.slash parameter to deal with - that, but it could be argued that what you end up with is at least - as ugly, and definitely more obstrusive, then having short - square-bracketed numbers displayed inline., - - but in a text-only output format, the - numbered-notesources/endnotes-listing mechanism is the only - practical way to handle this kind of content. - - Also, users of “text based” browsers such as - lynx will already be accustomed to seeing inline - numbers for links. And various "man to html" applications, such as - the widely used man2html (VH-Man2html) - application, can automatically turn URLs into "real" HTML hyperlinks - in output. So leaving man.endnotes.are.numbered - at its default (non-zero) value ensures that no information is - lost in your man-page output. It just gets - “rearranged”. - - -The handling of empty links is not affected by this -parameter. Empty links are handled simply by displaying their URLs -inline. Empty links are never auto-numbered. - -If you disable endnotes numbering, you should probably also set -man.font.links to an empty value (to -disable font formatting for links. - - -Related Parameters - man.endnotes.list.enabled, - man.font.links - - - - - - man.base.url.for.relative.links - string - - - man.base.url.for.relative.links - Specifies a base URL for relative links - - - - <xsl:param name="man.base.url.for.relative.links">[set $man.base.url.for.relative.links]/</xsl:param> - - - Description - - For any “notesource” listed in the auto-generated - “NOTES” section of output man pages (which is generated when - the value of the - man.endnotes.list.enabled parameter - is non-zero), if the notesource is a link source with a - relative URI, the URI is displayed in output with the value - of the - man.base.url.for.relative.links - parameter prepended to the value of the link URI. - - - A link source is an notesource that references an - external resource: - - - a ulink element with a url attribute - - - any element with an xlink:href attribute - - - an imagedata, audiodata, or - videodata element - - - - - - If you use relative URIs in link sources in your DocBook - refentry source, and you leave - man.base.url.for.relative.links - unset, the relative links will appear “as is” in the “Notes” - section of any man-page output generated from your source. - That’s probably not what you want, because such relative - links are only usable in the context of HTML output. So, to - make the links meaningful and usable in the context of - man-page output, set a value for - man.base.url.for.relative.links that - points to the online version of HTML output generated from - your DocBook refentry source. For - example: - <xsl:param name="man.base.url.for.relative.links" - >http://www.kernel.org/pub/software/scm/git/docs/</xsl:param> - - - - - Related Parameters - man.endnotes.list.enabled - - - - - - - Lists - - -man.segtitle.suppress -boolean - - -man.segtitle.suppress -Suppress display of segtitle contents? - - - - -<xsl:param name="man.segtitle.suppress" select="0"></xsl:param> - - -Description - -If the value of man.segtitle.suppress is -non-zero, then display of segtitle contents is -suppressed in output. - - - - - - - Character/string substitution - - -man.charmap.enabled -boolean - - -man.charmap.enabled -Apply character map before final output? - - - - -<xsl:param name="man.charmap.enabled" select="1"></xsl:param> - - - -Description - -If the value of the man.charmap.enabled -parameter is non-zero, a "character map" is used to substitute certain -Unicode symbols and special characters with appropriate roff/groff -equivalents, just before writing each man-page file to the -filesystem. If instead the value of -man.charmap.enabled is zero, Unicode characters -are passed through "as is". - -Details - -For converting certain Unicode symbols and special characters in -UTF-8 or UTF-16 encoded XML source to appropriate groff/roff -equivalents in man-page output, the DocBook XSL Stylesheets -distribution includes a roff character map that is compliant with the XSLT character -map format as detailed in the XSLT 2.0 specification. The map -contains more than 800 character mappings and can be considered the -standard roff character map for the distribution. - -You can use the man.charmap.uri -parameter to specify a URI for the location for an alternate roff -character map to use in place of the standard roff character map -provided in the distribution. - -You can also use a subset of a character map. For details, -see the man.charmap.use.subset, -man.charmap.subset.profile, and -man.charmap.subset.profile.english -parameters. - - - - - - - -man.charmap.uri -uri - - -man.charmap.uri -URI for custom roff character map - - - - -<xsl:param name="man.charmap.uri"></xsl:param> - - - -Description - -For converting certain Unicode symbols and special characters in -UTF-8 or UTF-16 encoded XML source to appropriate groff/roff -equivalents in man-page output, the DocBook XSL Stylesheets -distribution includes an XSLT character -map. That character map can be considered the standard roff -character map for the distribution. - -If the value of the man.charmap.uri -parameter is non-empty, that value is used as the URI for the location -for an alternate roff character map to use in place of the standard -roff character map provided in the distribution. - - -Do not set a value for man.charmap.uri -unless you have a custom roff character map that differs from the -standard one provided in the distribution. - - - - - - -man.charmap.use.subset -boolean - - -man.charmap.use.subset -Use subset of character map instead of full map? - - - - -<xsl:param name="man.charmap.use.subset" select="1"></xsl:param> - - - -Description - -If the value of the -man.charmap.use.subset parameter is non-zero, -a subset of the roff character map is used instead of the full roff -character map. The profile of the subset used is determined either -by the value of the -man.charmap.subset.profile -parameter (if the source is not in English) or the -man.charmap.subset.profile.english -parameter (if the source is in English). - - - You may want to experiment with setting a non-zero value of - man.charmap.use.subset, so that the full - character map is used. Depending on which XSLT engine you run, - setting a non-zero value for - man.charmap.use.subset may significantly - increase the time needed to process your documents. Or it may - not. For example, if you set it and run it with xsltproc, it seems - to dramatically increase processing time; on the other hand, if you - set it and run it with Saxon, it does not seem to increase - processing time nearly as much. - - If processing time is not a important concern and/or you can - tolerate the increase in processing time imposed by using the full - character map, set man.charmap.use.subset to - zero. - - -Details - -For converting certain Unicode symbols and special characters in -UTF-8 or UTF-16 encoded XML source to appropriate groff/roff -equivalents in man-page output, the DocBook XSL Stylesheets -distribution includes a roff character map that is compliant with the XSLT character -map format as detailed in the XSLT 2.0 specification. The map -contains more than 800 character mappings and can be considered the -standard roff character map for the distribution. - - -You can use the man.charmap.uri -parameter to specify a URI for the location for an alternate roff -character map to use in place of the standard roff character map -provided in the distribution. - - -Because it is not terrifically efficient to use the standard -800-character character map in full -- and for most (or all) users, -never necessary to use it in full -- the DocBook XSL Stylesheets -support a mechanism for using, within any given character map, a -subset of character mappings instead of the full set. You can use the -man.charmap.subset.profile or -man.charmap.subset.profile.english -parameter to tune the profile of that subset to use. - - - - - - - -man.charmap.subset.profile -string - - -man.charmap.subset.profile -Profile of character map subset - - - - -<xsl:param name="man.charmap.subset.profile"> -@*[local-name() = 'block'] = 'Miscellaneous Technical' or -(@*[local-name() = 'block'] = 'C1 Controls And Latin-1 Supplement (Latin-1 Supplement)' and - (@*[local-name() = 'class'] = 'symbols' or - @*[local-name() = 'class'] = 'letters') -) or -@*[local-name() = 'block'] = 'Latin Extended-A' -or -(@*[local-name() = 'block'] = 'General Punctuation' and - (@*[local-name() = 'class'] = 'spaces' or - @*[local-name() = 'class'] = 'dashes' or - @*[local-name() = 'class'] = 'quotes' or - @*[local-name() = 'class'] = 'bullets' - ) -) or -@*[local-name() = 'name'] = 'HORIZONTAL ELLIPSIS' or -@*[local-name() = 'name'] = 'WORD JOINER' or -@*[local-name() = 'name'] = 'SERVICE MARK' or -@*[local-name() = 'name'] = 'TRADE MARK SIGN' or -@*[local-name() = 'name'] = 'ZERO WIDTH NO-BREAK SPACE' -</xsl:param> - - - -Description - -If the value of the -man.charmap.use.subset parameter is non-zero, -and your DocBook source is not written in English (that - is, if the lang or xml:lang attribute on the root element - in your DocBook source or on the first refentry - element in your source has a value other than - en), then the character-map subset specified - by the man.charmap.subset.profile - parameter is used instead of the full roff character map. - -Otherwise, if the lang or xml:lang attribute on the root - element in your DocBook - source or on the first refentry element in your source - has the value en or if it has no lang or xml:lang attribute, then the character-map - subset specified by the - man.charmap.subset.profile.english - parameter is used instead of - man.charmap.subset.profile. - -The difference between the two subsets is that - man.charmap.subset.profile provides - mappings for characters in Western European languages that are - not part of the Roman (English) alphabet (ASCII character set). - -The value of man.charmap.subset.profile -is a string representing an XPath expression that matches attribute -names and values for output-character -elements in the character map. - -The attributes supported in the standard roff character map included in the distribution are: - - - character - - a raw Unicode character or numeric Unicode - character-entity value (either in decimal or hex); all - characters have this attribute - - - - name - - a standard full/long ISO/Unicode character name (e.g., - "OHM SIGN"); all characters have this attribute - - - - block - - a standard Unicode "block" name (e.g., "General - Punctuation"); all characters have this attribute. For the full - list of Unicode block names supported in the standard roff - character map, see . - - - - class - - a class of characters (e.g., "spaces"). Not all - characters have this attribute; currently, it is used only with - certain characters within the "C1 Controls And Latin-1 - Supplement" and "General Punctuation" blocks. For details, see - . - - - - entity - - an ISO entity name (e.g., "ohm"); not all characters - have this attribute, because not all characters have ISO entity - names; for example, of the 800 or so characters in the standard - roff character map included in the distribution, only around 300 - have ISO entity names. - - - - - string - - a string representing an roff/groff escape-code (with - "@esc@" used in place of the backslash), or a simple ASCII - string; all characters in the roff character map have this - attribute - - - - -The value of man.charmap.subset.profile -is evaluated as an XPath expression at run-time to select a portion of -the roff character map to use. You can tune the subset used by adding -or removing parts. For example, if you need to use a wide range of -mathematical operators in a document, and you want to have them -converted into roff markup properly, you might add the following: - - @*[local-name() = 'block'] ='MathematicalOperators' - -That will cause a additional set of around 67 additional "math" -characters to be converted into roff markup. - - -Depending on which XSLT engine you use, either the EXSLT -dyn:evaluate extension function (for xsltproc or -Xalan) or saxon:evaluate extension function (for -Saxon) are used to dynamically evaluate the value of -man.charmap.subset.profile at run-time. If you -don't use xsltproc, Saxon, Xalan -- or some other XSLT engine that -supports dyn:evaluate -- you must either set the -value of the man.charmap.use.subset parameter -to zero and process your documents using the full character map -instead, or set the value of the -man.charmap.enabled parameter to zero instead -(so that character-map processing is disabled completely. - - -An alternative to using -man.charmap.subset.profile is to create your -own custom character map, and set the value of -man.charmap.uri to the URI/filename for -that. If you use a custom character map, you will probably want to -include in it just the characters you want to use, and so you will -most likely also want to set the value of -man.charmap.use.subset to zero. -You can create a -custom character map by making a copy of the standard roff character map provided in the distribution, and -then adding to, changing, and/or deleting from that. - - -If you author your DocBook XML source in UTF-8 or UTF-16 -encoding and aren't sure what OSes or environments your man-page -output might end up being viewed on, and not sure what version of -nroff/groff those environments might have, you should be careful about -what Unicode symbols and special characters you use in your source and -what parts you add to the value of -man.charmap.subset.profile. -Many of the escape codes used are specific to groff and using -them may not provide the expected output on an OS or environment that -uses nroff instead of groff. -On the other hand, if you intend for your man-page output to be -viewed only on modern systems (for example, GNU/Linux systems, FreeBSD -systems, or Cygwin environments) that have a good, up-to-date groff, -then you can safely include a wide range of Unicode symbols and -special characters in your UTF-8 or UTF-16 encoded DocBook XML source -and add any of the supported Unicode block names to the value of -man.charmap.subset.profile. - - - -For other details, see the documentation for the -man.charmap.use.subset parameter. - -Supported Unicode block names and "class" values - - - Below is the full list of Unicode block names and "class" - values supported in the standard roff stylesheet provided in the - distribution, along with a description of which codepoints from the - Unicode range corresponding to that block name or block/class - combination are supported. - - - - C1 Controls And Latin-1 Supplement (Latin-1 Supplement) (x00a0 to x00ff) - class values - - - symbols - - - letters - - - - - Latin Extended-A (x0100 to x017f, partial) - - - Spacing Modifier Letters (x02b0 to x02ee, partial) - - - Greek and Coptic (x0370 to x03ff, partial) - - - General Punctuation (x2000 to x206f, partial) - class values - - - spaces - - - dashes - - - quotes - - - daggers - - - bullets - - - leaders - - - primes - - - - - - Superscripts and Subscripts (x2070 to x209f) - - - Currency Symbols (x20a0 to x20b1) - - - Letterlike Symbols (x2100 to x214b) - - - Number Forms (x2150 to x218f) - - - Arrows (x2190 to x21ff, partial) - - - Mathematical Operators (x2200 to x22ff, partial) - - - Control Pictures (x2400 to x243f) - - - Enclosed Alphanumerics (x2460 to x24ff) - - - Geometric Shapes (x25a0 to x25f7, partial) - - - Miscellaneous Symbols (x2600 to x26ff, partial) - - - Dingbats (x2700 to x27be, partial) - - - Alphabetic Presentation Forms (xfb00 to xfb04 only) - - - - - - - - -man.charmap.subset.profile.english -string - - -man.charmap.subset.profile.english -Profile of character map subset - - - - -<xsl:param name="man.charmap.subset.profile.english"> -@*[local-name() = 'block'] = 'Miscellaneous Technical' or -(@*[local-name() = 'block'] = 'C1 Controls And Latin-1 Supplement (Latin-1 Supplement)' and - @*[local-name() = 'class'] = 'symbols') -or -(@*[local-name() = 'block'] = 'General Punctuation' and - (@*[local-name() = 'class'] = 'spaces' or - @*[local-name() = 'class'] = 'dashes' or - @*[local-name() = 'class'] = 'quotes' or - @*[local-name() = 'class'] = 'bullets' - ) -) or -@*[local-name() = 'name'] = 'HORIZONTAL ELLIPSIS' or -@*[local-name() = 'name'] = 'WORD JOINER' or -@*[local-name() = 'name'] = 'SERVICE MARK' or -@*[local-name() = 'name'] = 'TRADE MARK SIGN' or -@*[local-name() = 'name'] = 'ZERO WIDTH NO-BREAK SPACE' -</xsl:param> - - - -Description - -If the value of the - man.charmap.use.subset parameter is - non-zero, and your DocBook source is written in English (that - is, if its lang or xml:lang attribute on the root element - in your DocBook source or on the first refentry - element in your source has the value en or if - it has no lang or xml:lang attribute), then the - character-map subset specified by the - man.charmap.subset.profile.english - parameter is used instead of the full roff character map. - -Otherwise, if the lang or xml:lang attribute - on the root element in your DocBook source or on the first - refentry element in your source has a value other - than en, then the character-map subset - specified by the - man.charmap.subset.profile parameter is - used instead of - man.charmap.subset.profile.english. - -The difference between the two subsets is that - man.charmap.subset.profile provides - mappings for characters in Western European languages that are - not part of the Roman (English) alphabet (ASCII character set). - -The value of man.charmap.subset.profile.english -is a string representing an XPath expression that matches attribute -names and values for output-character elements in the character map. - -For other details, see the documentation for the -man.charmap.subset.profile.english and -man.charmap.use.subset parameters. - - - - - - -man.string.subst.map.local.pre -string - - -man.string.subst.map.local.pre -Specifies “local” string substitutions - - - - - <xsl:param name="man.string.subst.map.local.pre"></xsl:param> - - - -Description - -Use the man.string.subst.map.local.pre -parameter to specify any “local” string substitutions to perform over -the entire roff source for each man page before -performing the string substitutions specified by the man.string.subst.map parameter. - -For details about the format of this parameter, see the -documentation for the man.string.subst.map -parameter. - - - - - - -man.string.subst.map -rtf - - -man.string.subst.map -Specifies a set of string substitutions - - - - -<xsl:param name="man.string.subst.map"> - - <!-- * remove no-break marker at beginning of line (stylesheet artifact) --> - <ss:substitution oldstring="▒▀" newstring="▒"></ss:substitution> - <!-- * replace U+2580 no-break marker (stylesheet-added) w/ no-break space --> - <ss:substitution oldstring="▀" newstring="\ "></ss:substitution> - - <!-- ==================================================================== --> - - <!-- * squeeze multiple newlines before a roff request --> - <ss:substitution oldstring=" - -." newstring=" -."></ss:substitution> - <!-- * remove any .sp instances that directly precede a .PP --> - <ss:substitution oldstring=".sp -.PP" newstring=".PP"></ss:substitution> - <!-- * remove any .sp instances that directly follow a .PP --> - <ss:substitution oldstring=".sp -.sp" newstring=".sp"></ss:substitution> - <!-- * squeeze multiple .sp instances into a single .sp--> - <ss:substitution oldstring=".PP -.sp" newstring=".PP"></ss:substitution> - <!-- * squeeze multiple newlines after start of no-fill (verbatim) env. --> - <ss:substitution oldstring=".nf - -" newstring=".nf -"></ss:substitution> - <!-- * squeeze multiple newlines after REstoring margin --> - <ss:substitution oldstring=".RE - -" newstring=".RE -"></ss:substitution> - <!-- * U+2591 is a marker we add before and after every Parameter in --> - <!-- * Funcprototype output --> - <ss:substitution oldstring="░" newstring=" "></ss:substitution> - <!-- * U+2592 is a marker we add for the newline before output of <sbr>; --> - <ss:substitution oldstring="▒" newstring=" -"></ss:substitution> - <!-- * --> - <!-- * Now deal with some other characters that are added by the --> - <!-- * stylesheets during processing. --> - <!-- * --> - <!-- * bullet --> - <ss:substitution oldstring="•" newstring="\(bu"></ss:substitution> - <!-- * left double quote --> - <ss:substitution oldstring="“" newstring="\(lq"></ss:substitution> - <!-- * right double quote --> - <ss:substitution oldstring="”" newstring="\(rq"></ss:substitution> - <!-- * left single quote --> - <ss:substitution oldstring="‘" newstring="\(oq"></ss:substitution> - <!-- * right single quote --> - <ss:substitution oldstring="’" newstring="\(cq"></ss:substitution> - <!-- * copyright sign --> - <ss:substitution oldstring="©" newstring="\(co"></ss:substitution> - <!-- * registered sign --> - <ss:substitution oldstring="®" newstring="\(rg"></ss:substitution> - <!-- * ...servicemark... --> - <!-- * There is no groff equivalent for it. --> - <ss:substitution oldstring="℠" newstring="(SM)"></ss:substitution> - <!-- * ...trademark... --> - <!-- * We don't do "\(tm" because for console output, --> - <!-- * groff just renders that as "tm"; that is: --> - <!-- * --> - <!-- * Product&#x2122; -> Producttm --> - <!-- * --> - <!-- * So we just make it to "(TM)" instead; thus: --> - <!-- * --> - <!-- * Product&#x2122; -> Product(TM) --> - <ss:substitution oldstring="™" newstring="(TM)"></ss:substitution> - -</xsl:param> - - - -Description - -The man.string.subst.map parameter -contains a map that specifies a set of -string substitutions to perform over the entire roff source for each -man page, either just before generating final man-page output (that -is, before writing man-page files to disk) or, if the value of the -man.charmap.enabled parameter is non-zero, -before applying the roff character map. - -You can use man.string.subst.map as a -“lightweight” character map to perform “essential” substitutions -- -that is, substitutions that are always performed, -even if the value of the man.charmap.enabled -parameter is zero. For example, you can use it to replace quotation -marks or other special characters that are generated by the DocBook -XSL stylesheets for a particular locale setting (as opposed to those -characters that are actually in source XML documents), or to replace -any special characters that may be automatically generated by a -particular customization of the DocBook XSL stylesheets. - - - Do you not change value of the - man.string.subst.map parameter unless you are - sure what you are doing. First consider adding your - string-substitution mappings to either or both of the following - parameters: - - - man.string.subst.map.local.pre - applied before - man.string.subst.map - - - man.string.subst.map.local.post - applied after - man.string.subst.map - - - By default, both of those parameters contain no - string substitutions. They are intended as a means for you to - specify your own local string-substitution mappings. - - If you remove any of default mappings from the value of the - man.string.subst.map parameter, you are - likely to end up with broken output. And be very careful about adding - anything to it; it’s used for doing string substitution over the - entire roff source of each man page – it causes target strings to be - replaced in roff requests and escapes, not just in the visible - contents of the page. - - - - - - Contents of the substitution map - - The string-substitution map contains one or more - ss:substitution elements, each of which has two - attributes: - - - oldstring - - string to replace - - - - newstring - - string with which to replace oldstring - - - - It may also include XML comments (that is, delimited with - "<!--" and "-->"). - - - - - - - - -man.string.subst.map.local.post -string - - -man.string.subst.map.local.post -Specifies “local” string substitutions - - - - -<xsl:param name="man.string.subst.map.local.post"></xsl:param> - - - -Description - -Use the man.string.subst.map.local.post -parameter to specify any “local” string substitutions to perform over -the entire roff source for each man page after -performing the string substitutions specified by the man.string.subst.map parameter. - -For details about the format of this parameter, see the -documentation for the man.string.subst.map -parameter. - - - - - - - Refentry metadata gathering - - -refentry.meta.get.quietly -boolean - - -refentry.meta.get.quietly -Suppress notes and warnings when gathering refentry metadata? - - - - -<xsl:param name="refentry.meta.get.quietly" select="0"></xsl:param> - - - -Description - -If zero (the default), notes and warnings about “missing” markup -are generated during gathering of refentry metadata. If non-zero, the -metadata is gathered “quietly” -- that is, the notes and warnings are -suppressed. - - - If you are processing a large amount of refentry - content, you may be able to speed up processing significantly by - setting a non-zero value for - refentry.meta.get.quietly. - - - - - - - -refentry.date.profile -string - - -refentry.date.profile -Specifies profile for refentry "date" data - - - - -<xsl:param name="refentry.date.profile"> - (($info[//date])[last()]/date)[1]| - (($info[//pubdate])[last()]/pubdate)[1] -</xsl:param> - - - -Description - -The value of refentry.date.profile is a -string representing an XPath expression. It is evaluated at run-time -and used only if refentry.date.profile.enabled -is non-zero. Otherwise, the refentry metadata-gathering -logic "hard coded" into the stylesheets is used. - - The man(7) man page describes this content -as "the date of the last revision". In man pages, it is the content -that is usually displayed in the center footer. - - - - - - -refentry.date.profile.enabled -boolean - - -refentry.date.profile.enabled -Enable refentry "date" profiling? - - - - -<xsl:param name="refentry.date.profile.enabled">0</xsl:param> - - -Description - -If the value of -refentry.date.profile.enabled is non-zero, then -during refentry metadata gathering, the info profile -specified by the customizable -refentry.date.profile parameter is used. - -If instead the value of -refentry.date.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "date" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "date" data to show -up in your output, then consider setting a non-zero value for -refentry.date.profile.enabled and adjusting the -value of refentry.date.profile to cause correct -data to be gathered. - -Note that the terms "source" and "date" have special meanings in -this context. For details, see the documentation for the -refentry.date.profile parameter. - - - - - - -refentry.manual.profile -string - - -refentry.manual.profile -Specifies profile for refentry "manual" data - - - - -<xsl:param name="refentry.manual.profile"> - (($info[//title])[last()]/title)[1]| - ../title/node() -</xsl:param> - - - -Description - -The value of refentry.manual.profile is -a string representing an XPath expression. It is evaluated at -run-time and used only if -refentry.manual.profile.enabled is -non-zero. Otherwise, the refentry metadata-gathering logic -"hard coded" into the stylesheets is used. - -In man pages, this content is usually displayed in the middle of -the header of the page. The man(7) man page -describes this as "the title of the manual (e.g., Linux -Programmer's Manual)". Here are some examples from -existing man pages: - - - dpkg utilities - (dpkg-name) - - - User Contributed Perl Documentation - (GET) - - - GNU Development Tools - (ld) - - - Emperor Norton Utilities - (ddate) - - - Debian GNU/Linux manual - (faked) - - - GIMP Manual Pages - (gimp) - - - KDOC Documentation System - (qt2kdoc) - - - - - - - - - -refentry.manual.profile.enabled -boolean - - -refentry.manual.profile.enabled -Enable refentry "manual" profiling? - - - - -<xsl:param name="refentry.manual.profile.enabled">0</xsl:param> - - -Description - -If the value of -refentry.manual.profile.enabled is -non-zero, then during refentry metadata gathering, the info -profile specified by the customizable -refentry.manual.profile parameter is -used. - -If instead the value of -refentry.manual.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "manual" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "manual" data to show -up in your output, then consider setting a non-zero value for -refentry.manual.profile.enabled and adjusting -the value of refentry.manual.profile to cause -correct data to be gathered. - -Note that the term "manual" has a special meanings in this -context. For details, see the documentation for the -refentry.manual.profile parameter. - - - - - - -refentry.source.name.suppress -boolean - - -refentry.source.name.suppress -Suppress "name" part of refentry "source" contents? - - - - -<xsl:param name="refentry.source.name.suppress">0</xsl:param> - - -Description - -If the value of -refentry.source.name.suppress is non-zero, then -during refentry metadata gathering, no "source name" data -is added to the refentry "source" contents. Instead (unless -refentry.version.suppress is also non-zero), -only "version" data is added to the "source" contents. - -If you find that the refentry metadata gathering -mechanism is causing unwanted "source name" data to show up in your -output -- for example, in the footer (or possibly header) of a man -page -- then you might consider setting a non-zero value for -refentry.source.name.suppress. - -Note that the terms "source", "source name", and "version" have -special meanings in this context. For details, see the documentation -for the refentry.source.name.profile -parameter. - - - - - - -refentry.source.name.profile -string - - -refentry.source.name.profile -Specifies profile for refentry "source name" data - - - - -<xsl:param name="refentry.source.name.profile"> - (($info[//productname])[last()]/productname)[1]| - (($info[//corpname])[last()]/corpname)[1]| - (($info[//corpcredit])[last()]/corpcredit)[1]| - (($info[//corpauthor])[last()]/corpauthor)[1]| - (($info[//orgname])[last()]/orgname)[1]| - (($info[//publishername])[last()]/publishername)[1] -</xsl:param> - - - -Description - -The value of refentry.source.name.profile -is a string representing an XPath expression. It is evaluated at -run-time and used only if -refentry.source.name.profile.enabled is -non-zero. Otherwise, the refentry metadata-gathering logic -"hard coded" into the stylesheets is used. - -A "source name" is one part of a (potentially) two-part -Name Version -"source" field. In man pages, it is usually displayed in the left -footer of the page. It typically indicates the software system or -product that the item documented in the man page belongs to. The -man(7) man page describes it as "the source of -the command", and provides the following examples: - - - For binaries, use something like: GNU, NET-2, SLS - Distribution, MCC Distribution. - - - For system calls, use the version of the kernel that you - are currently looking at: Linux 0.99.11. - - - For library calls, use the source of the function: GNU, BSD - 4.3, Linux DLL 4.4.1. - - - - -In practice, there are many pages that simply have a Version -number in the "source" field. So, it looks like what we have is a -two-part field, -Name Version, -where: - - - Name - - product name (e.g., BSD) or org. name (e.g., GNU) - - - - Version - - version number - - - -Each part is optional. If the Name is a -product name, then the Version is probably -the version of the product. Or there may be no -Name, in which case, if there is a -Version, it is probably the version -of the item itself, not the product it is part of. Or, if the -Name is an organization name, then there -probably will be no Version. - - - - - -refentry.source.name.profile.enabled -boolean - - -refentry.source.name.profile.enabled -Enable refentry "source name" profiling? - - - - -<xsl:param name="refentry.source.name.profile.enabled">0</xsl:param> - - -Description - -If the value of -refentry.source.name.profile.enabled is -non-zero, then during refentry metadata gathering, the info -profile specified by the customizable -refentry.source.name.profile parameter is -used. - -If instead the value of -refentry.source.name.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "source name" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "source name" data to -show up in your output, then consider setting a non-zero value for -refentry.source.name.profile.enabled and -adjusting the value of -refentry.source.name.profile to cause correct -data to be gathered. - -Note that the terms "source" and "source name" have special -meanings in this context. For details, see the documentation for the -refentry.source.name.profile parameter. - - - - - - -refentry.version.suppress -boolean - - -refentry.version.suppress -Suppress "version" part of refentry "source" contents? - - - - -<xsl:param name="refentry.version.suppress">0</xsl:param> - - -Description - -If the value of refentry.version.suppress -is non-zero, then during refentry metadata gathering, no -"version" data is added to the refentry "source" -contents. Instead (unless -refentry.source.name.suppress is also -non-zero), only "source name" data is added to the "source" -contents. - -If you find that the refentry metadata gathering -mechanism is causing unwanted "version" data to show up in your output --- for example, in the footer (or possibly header) of a man page -- -then you might consider setting a non-zero value for -refentry.version.suppress. - -Note that the terms "source", "source name", and "version" have -special meanings in this context. For details, see the documentation -for the refentry.source.name.profile -parameter. - - - - - - -refentry.version.profile -string - - -refentry.version.profile -Specifies profile for refentry "version" data - - - - -<xsl:param name="refentry.version.profile"> - (($info[//productnumber])[last()]/productnumber)[1]| - (($info[//edition])[last()]/edition)[1]| - (($info[//releaseinfo])[last()]/releaseinfo)[1] -</xsl:param> - - - -Description - -The value of refentry.version.profile is -a string representing an XPath expression. It is evaluated at -run-time and used only if -refentry.version.profile.enabled is -non-zero. Otherwise, the refentry metadata-gathering logic -"hard coded" into the stylesheets is used. - -A "source.name" is one part of a (potentially) two-part -Name Version -"source" field. For more details, see the documentation for the -refentry.source.name.profile parameter. - - - - - - -refentry.version.profile.enabled -boolean - - -refentry.version.profile.enabled -Enable refentry "version" profiling? - - - - -<xsl:param name="refentry.version.profile.enabled">0</xsl:param> - - -Description - -If the value of -refentry.version.profile.enabled is -non-zero, then during refentry metadata gathering, the info -profile specified by the customizable -refentry.version.profile parameter is -used. - -If instead the value of -refentry.version.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "version" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "version" data to show -up in your output, then consider setting a non-zero value for -refentry.version.profile.enabled and adjusting -the value of refentry.version.profile to cause -correct data to be gathered. - -Note that the terms "source" and "version" have special -meanings in this context. For details, see the documentation for the -refentry.version.profile parameter. - - - - - - -refentry.manual.fallback.profile -string - - -refentry.manual.fallback.profile -Specifies profile of "fallback" for refentry "manual" data - - - - -<xsl:param name="refentry.manual.fallback.profile"> -refmeta/refmiscinfo[not(@class = 'date')][1]/node()</xsl:param> - - - -Description - -The value of -refentry.manual.fallback.profile is a string -representing an XPath expression. It is evaluated at run-time and -used only if no "manual" data can be found by other means (that is, -either using the refentry metadata-gathering logic "hard -coded" in the stylesheets, or the value of -refentry.manual.profile, if it is -enabled). - - -Depending on which XSLT engine you run, either the EXSLT -dyn:evaluate extension function (for xsltproc or -Xalan) or saxon:evaluate extension function (for -Saxon) are used to dynamically evaluate the value of -refentry.manual.fallback.profile at -run-time. If you don't use xsltproc, Saxon, Xalan -- or some other -XSLT engine that supports dyn:evaluate -- you -must manually disable fallback processing by setting an empty value -for the refentry.manual.fallback.profile -parameter. - - - - - - - -refentry.source.fallback.profile -string - - -refentry.source.fallback.profile -Specifies profile of "fallback" for refentry "source" data - - - - -<xsl:param name="refentry.source.fallback.profile"> -refmeta/refmiscinfo[not(@class = 'date')][1]/node()</xsl:param> - - - -Description - -The value of -refentry.source.fallback.profile is a string -representing an XPath expression. It is evaluated at run-time and used -only if no "source" data can be found by other means (that is, either -using the refentry metadata-gathering logic "hard coded" in -the stylesheets, or the value of the -refentry.source.name.profile and -refentry.version.profile parameters, if those -are enabled). - - -Depending on which XSLT engine you run, either the EXSLT -dyn:evaluate extension function (for xsltproc or -Xalan) or saxon:evaluate extension function (for -Saxon) are used to dynamically evaluate the value of -refentry.source.fallback.profile at -run-time. If you don't use xsltproc, Saxon, Xalan -- or some other -XSLT engine that supports dyn:evaluate -- you -must manually disable fallback processing by setting an empty value -for the refentry.source.fallback.profile -parameter. - - - - - - - - Page header/footer - - -man.th.extra1.suppress -boolean - - -man.th.extra1.suppress -Suppress extra1 part of header/footer? - - - - -<xsl:param name="man.th.extra1.suppress">0</xsl:param> - - -Description - -If the value of man.th.extra1.suppress is -non-zero, then the extra1 part of the -.TH title line header/footer is suppressed. - -The content of the extra1 field is almost -always displayed in the center footer of the page and is, universally, -a date. - - - - - - -man.th.extra2.suppress -boolean - - -man.th.extra2.suppress -Suppress extra2 part of header/footer? - - - - -<xsl:param name="man.th.extra2.suppress">0</xsl:param> - - -Description - -If the value of man.th.extra2.suppress is -non-zero, then the extra2 part of the -.TH title line header/footer is suppressed. - -The content of the extra2 field is usually -displayed in the left footer of the page and is typically "source" -data, often in the form -Name Version; -for example, "GTK+ 1.2" (from the gtk-options(7) -man page). - - - You can use the - refentry.source.name.suppress and - refentry.version.suppress parameters to - independently suppress the Name and - Version parts of the - extra2 field. - - - - - - - -man.th.extra3.suppress -boolean - - -man.th.extra3.suppress -Suppress extra3 part of header/footer? - - - - -<xsl:param name="man.th.extra3.suppress">0</xsl:param> - - -Description - -If the value of man.th.extra3.suppress is -non-zero, then the extra3 part of the -.TH title line header/footer is -suppressed. - -The content of the extra3 field is usually -displayed in the middle header of the page and is typically a "manual -name"; for example, "GTK+ User's Manual" (from the -gtk-options(7) man page). - - - - - - -man.th.title.max.length -integer - - -man.th.title.max.length -Maximum length of title in header/footer - - - - -<xsl:param name="man.th.title.max.length">20</xsl:param> - - - -Description - -Specifies the maximum permitted length of the title part of the -man-page .TH title line header/footer. If the title -exceeds the maxiumum specified, it is truncated down to the maximum -permitted length. - -Details - - -Every man page generated using the DocBook stylesheets has a -title line, specified using the TH roff -macro. Within that title line, there is always, at a minimum, a title, -followed by a section value (representing a man "section" -- usually -just a number). - -The title and section are displayed, together, in the visible -header of each page. Where in the header they are displayed depends on -OS the man page is viewed on, and on what version of nroff/groff/man -is used for viewing the page. But, at a minimum and across all -systems, the title and section are displayed on the right-hand column -of the header. On many systems -- those with a modern groff, including -Linux systems -- they are displayed twice: both in the left and right -columns of the header. - -So if the length of the title exceeds a certain percentage of -the column width in which the page is viewed, the left and right -titles can end up overlapping, making them unreadable, or breaking to -another line, which doesn't look particularly good. - -So the stylesheets provide the -man.th.title.max.length parameter as a means -for truncating titles that exceed the maximum length that can be -viewing properly in a page header. - -The default value is reasonable but somewhat arbitrary. If you -have pages with long titles, you may want to experiment with changing -the value in order to achieve the correct aesthetic results. - - - - - - - -man.th.extra2.max.length -integer - - -man.th.extra2.max.length -Maximum length of extra2 in header/footer - - - - -<xsl:param name="man.th.extra2.max.length">30</xsl:param> - - - -Description - -Specifies the maximum permitted length of the -extra2 part of the man-page part of the -.TH title line header/footer. If the -extra2 content exceeds the maxiumum specified, it -is truncated down to the maximum permitted length. - -The content of the extra2 field is usually -displayed in the left footer of the page and is typically "source" -data indicating the software system or product that the item -documented in the man page belongs to, often in the form -Name Version; -for example, "GTK+ 1.2" (from the gtk-options(7) -man page). - -The default value for this parameter is reasonable but somewhat -arbitrary. If you are processing pages with long "source" information, -you may want to experiment with changing the value in order to achieve -the correct aesthetic results. - - - - - -man.th.extra3.max.length -integer - - -man.th.extra3.max.length -Maximum length of extra3 in header/footer - - - - -<xsl:param name="man.th.extra3.max.length">30</xsl:param> - - - -Description - -Specifies the maximum permitted length of the -extra3 part of the man-page .TH -title line header/footer. If the extra3 content -exceeds the maxiumum specified, it is truncated down to the maximum -permitted length. - -The content of the extra3 field is usually -displayed in the middle header of the page and is typically a "manual -name"; for example, "GTK+ User's Manual" (from the -gtk-options(7) man page). - -The default value for this parameter is reasonable but somewhat -arbitrary. If you are processing pages with long "manual names" -- or -especially if you are processing pages that have both long "title" -parts (command/function, etc. names) and long -manual names -- you may want to experiment with changing the value in -order to achieve the correct aesthetic results. - - - - - - Output - - - man.output.manifest.enabled - boolean - - - man.output.manifest.enabled - Generate a manifest file? - - - - <xsl:param name="man.output.manifest.enabled" select="0"></xsl:param> - - - Description - - If non-zero, a list of filenames for man pages generated by - the stylesheet transformation is written to the file named by the - man.output.manifest.filename parameter. - - - - - - - man.output.manifest.filename - string - - - man.output.manifest.filename - Name of manifest file - - - - <xsl:param name="man.output.manifest.filename">MAN.MANIFEST</xsl:param> - - - Description - - The man.output.manifest.filename parameter - specifies the name of the file to which the manpages manifest file - is written (if the value of the - man.output.manifest.enabled parameter is - non-zero). - - - - - - -man.output.in.separate.dir -boolean - - -man.output.in.separate.dir -Output man-page files in separate output directory? - - - - -<xsl:param name="man.output.in.separate.dir" select="0"></xsl:param> - - - -Description - -If the value of man.output.in.separate.dir -parameter is non-zero, man-page files are output in a separate -directory, specified by the man.output.base.dir -parameter; otherwise, if the value of -man.output.in.separate.dir is zero, man-page files -are not output in a separate directory. - - - - - - -man.output.lang.in.name.enabled -boolean - - -man.output.lang.in.name.enabled -Include $LANG value in man-page filename/pathname? - - - - -<xsl:param name="man.output.lang.in.name.enabled" select="0"></xsl:param> - - - -Description - - The man.output.lang.in.name.enabled - parameter specifies whether a $lang value is - included in man-page filenames and pathnames. - - If the value of - man.output.lang.in.name.enabled is non-zero, - man-page files are output with the $lang value - included in their filenames or pathnames as follows; - - - - if man.output.subdirs.enabled is - non-zero, each file is output to, e.g., a - man/$lang/man8/foo.8 - pathname - - - if man.output.subdirs.enabled is - zero, each file is output with a - foo.$lang.8 - filename - - - - - - - - - -man.output.base.dir -uri - - -man.output.base.dir -Specifies separate output directory - - - -<xsl:param name="man.output.base.dir">man/</xsl:param> - - -Description - -The man.output.base.dir parameter -specifies the base directory into which man-page files are output. The -man.output.subdirs.enabled parameter controls -whether the files are output in subdirectories within the base -directory. - - - The values of the man.output.base.dir - and man.output.subdirs.enabled parameters are - used only if the value of - man.output.in.separate.dir parameter is - non-zero. If the value of the - man.output.in.separate.dir is zero, man-page - files are not output in a separate directory. - - - - - - - -man.output.subdirs.enabled -boolean - - -man.output.subdirs.enabled -Output man-page files in subdirectories within base output directory? - - - - -<xsl:param name="man.output.subdirs.enabled" select="1"></xsl:param> - - - -Description - -The man.output.subdirs.enabled parameter -controls whether man-pages files are output in subdirectories within -the base directory specified by the directory specified by the -man.output.base.dir parameter. - - - The values of the man.output.base.dir - and man.output.subdirs.enabled parameters are - used only if the value of - man.output.in.separate.dir parameter is - non-zero. If the value of the - man.output.in.separate.dir is zero, man-page - files are not output in a separate directory. - - - - - - - -man.output.quietly -boolean - - -man.output.quietly -Suppress filename messages emitted when generating output? - - - - -<xsl:param name="man.output.quietly" select="0"></xsl:param> - - - -Description - -If zero (the default), for each man-page file created, a message -with the name of the file is emitted. If non-zero, the files are -output "quietly" -- that is, the filename messages are -suppressed. - - - If you are processing a large amount of refentry - content, you may be able to speed up processing significantly by - setting a non-zero value for - man.output.quietly. - - - - - - - -man.output.encoding -string - - -man.output.encoding -Encoding used for man-page output - - - - -<xsl:param name="man.output.encoding">UTF-8</xsl:param> - - - -Description - -This parameter specifies the encoding to use for files generated -by the manpages stylesheet. Not all processors support specification -of this parameter. - - - If the value of the man.charmap.enabled - parameter is non-zero (the default), keeping the - man.output.encoding parameter at its default - value (UTF-8) or setting it to - UTF-16 does not cause your - man pages to be output in raw UTF-8 or UTF-16 -- because - any Unicode characters for which matches are found in the enabled - character map will be replaced with roff escape sequences before the - final man-page files are generated. - - So if you want to generate "real" UTF-8 man pages, without any - character substitution being performed on your content, you need to - set man.charmap.enabled to zero (which will - completely disable character-map processing). - - You may also need to set - man.charmap.enabled to zero if you want to - output man pages in an encoding other than UTF-8 - or UTF-16. Character-map processing is based on - Unicode character values and may not work with other output - encodings. - - - - - - - -man.output.better.ps.enabled -boolean - - -man.output.better.ps.enabled -Enable enhanced print/PostScript output? - - - -<xsl:param name="man.output.better.ps.enabled">0</xsl:param> - - -Description - -If the value of the -man.output.better.ps.enabled parameter is -non-zero, certain markup is embedded in each generated man page -such that PostScript output from the man -Tps -command for that page will include a number of enhancements -designed to improve the quality of that output. - -If man.output.better.ps.enabled is -zero (the default), no such markup is embedded in generated man -pages, and no enhancements are included in the PostScript -output generated from those man pages by the man - -Tps command. - - - The enhancements provided by this parameter rely on - features that are specific to groff (GNU troff) and that are - not part of “classic” AT&T troff or any of its - derivatives. Therefore, any man pages you generate with this - parameter enabled will be readable only on systems on which - the groff (GNU troff) program is installed, such as GNU/Linux - systems. The pages will not not be - readable on systems on with the classic troff (AT&T - troff) command is installed. - - -The value of this parameter only affects PostScript output - generated from the man command. It has no - effect on output generated using the FO backend. - - - You can generate PostScript output for any man page by - running the following command: - man FOO -Tps > FOO.ps - You can then generate PDF output by running the following - command: - ps2pdf FOO.ps - - - - - - - - Other - - -man.table.footnotes.divider -string - - -man.table.footnotes.divider -Specifies divider string that appears before table footnotes - - - - -<xsl:param name="man.table.footnotes.divider">----</xsl:param> - - - -Description - -In each table that contains footenotes, the string specified by -the man.table.footnotes.divider parameter is -output before the list of footnotes for the table. - - - - - - -man.subheading.divider.enabled -boolean - - -man.subheading.divider.enabled -Add divider comment to roff source before/after subheadings? - - - - -<xsl:param name="man.subheading.divider.enabled">0</xsl:param> - - - -Description - -If the value of the -man.subheading.divider.enabled parameter is -non-zero, the contents of the -man.subheading.divider parameter are used to -add a "divider" before and after subheadings in the roff -output. The divider is not visisble in the -rendered man page; it is added as a comment, in the source, -simply for the purpose of increasing reability of the source. - -If man.subheading.divider.enabled is zero -(the default), the subheading divider is suppressed. - - - - - - -man.subheading.divider -string - - -man.subheading.divider -Specifies string to use as divider comment before/after subheadings - - - - -<xsl:param name="man.subheading.divider">========================================================================</xsl:param> - - - -Description - -If the value of the -man.subheading.divider.enabled parameter is -non-zero, the contents of the -man.subheading.divider parameter are used to -add a "divider" before and after subheadings in the roff -output. The divider is not visisble in the -rendered man page; it is added as a comment, in the source, -simply for the purpose of increasing reability of the source. - -If man.subheading.divider.enabled is zero -(the default), the subheading divider is suppressed. - - - - - - - The Stylesheet - - The param.xsl stylesheet is just a - wrapper around all of these parameters. - - -<xsl:stylesheet exclude-result-prefixes="src" version="1.0"> - -<!-- This file is generated from param.xweb --> - -<!-- ******************************************************************** - $Id: param.xweb 8235 2009-02-09 16:22:14Z xmldoc $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<src:fragref linkend="man.authors.section.enabled.frag"></src:fragref> -<src:fragref linkend="man.break.after.slash.frag"></src:fragref> -<src:fragref linkend="man.base.url.for.relative.links.frag"></src:fragref> -<src:fragref linkend="man.charmap.enabled.frag"></src:fragref> -<src:fragref linkend="man.charmap.subset.profile.frag"></src:fragref> -<src:fragref linkend="man.charmap.subset.profile.english.frag"></src:fragref> -<src:fragref linkend="man.charmap.uri.frag"></src:fragref> -<src:fragref linkend="man.charmap.use.subset.frag"></src:fragref> -<src:fragref linkend="man.copyright.section.enabled.frag"></src:fragref> -<src:fragref linkend="man.endnotes.are.numbered.frag"></src:fragref> -<src:fragref linkend="man.endnotes.list.enabled.frag"></src:fragref> -<src:fragref linkend="man.endnotes.list.heading.frag"></src:fragref> -<src:fragref linkend="man.font.funcprototype.frag"></src:fragref> -<src:fragref linkend="man.font.funcsynopsisinfo.frag"></src:fragref> -<src:fragref linkend="man.font.links.frag"></src:fragref> -<src:fragref linkend="man.font.table.headings.frag"></src:fragref> -<src:fragref linkend="man.font.table.title.frag"></src:fragref> -<src:fragref linkend="man.funcsynopsis.style.frag"></src:fragref> -<src:fragref linkend="man.hyphenate.computer.inlines.frag"></src:fragref> -<src:fragref linkend="man.hyphenate.filenames.frag"></src:fragref> -<src:fragref linkend="man.hyphenate.frag"></src:fragref> -<src:fragref linkend="man.hyphenate.urls.frag"></src:fragref> -<src:fragref linkend="man.indent.blurbs.frag"></src:fragref> -<src:fragref linkend="man.indent.lists.frag"></src:fragref> -<src:fragref linkend="man.indent.refsect.frag"></src:fragref> -<src:fragref linkend="man.indent.verbatims.frag"></src:fragref> -<src:fragref linkend="man.indent.width.frag"></src:fragref> -<src:fragref linkend="man.justify.frag"></src:fragref> -<src:fragref linkend="man.output.base.dir.frag"></src:fragref> -<src:fragref linkend="man.output.encoding.frag"></src:fragref> -<src:fragref linkend="man.output.in.separate.dir.frag"></src:fragref> -<src:fragref linkend="man.output.lang.in.name.enabled.frag"></src:fragref> -<src:fragref linkend="man.output.manifest.enabled.frag"></src:fragref> -<src:fragref linkend="man.output.manifest.filename.frag"></src:fragref> -<src:fragref linkend="man.output.better.ps.enabled.frag"></src:fragref> -<src:fragref linkend="man.output.quietly.frag"></src:fragref> -<src:fragref linkend="man.output.subdirs.enabled.frag"></src:fragref> -<src:fragref linkend="man.segtitle.suppress.frag"></src:fragref> -<src:fragref linkend="man.string.subst.map.frag"></src:fragref> -<src:fragref linkend="man.string.subst.map.local.post.frag"></src:fragref> -<src:fragref linkend="man.string.subst.map.local.pre.frag"></src:fragref> -<src:fragref linkend="man.subheading.divider.enabled.frag"></src:fragref> -<src:fragref linkend="man.subheading.divider.frag"></src:fragref> -<src:fragref linkend="man.table.footnotes.divider.frag"></src:fragref> -<src:fragref linkend="man.th.extra1.suppress.frag"></src:fragref> -<src:fragref linkend="man.th.extra2.max.length.frag"></src:fragref> -<src:fragref linkend="man.th.extra2.suppress.frag"></src:fragref> -<src:fragref linkend="man.th.extra3.max.length.frag"></src:fragref> -<src:fragref linkend="man.th.extra3.suppress.frag"></src:fragref> -<src:fragref linkend="man.th.title.max.length.frag"></src:fragref> -<src:fragref linkend="refentry.date.profile.enabled.frag"></src:fragref> -<src:fragref linkend="refentry.date.profile.frag"></src:fragref> -<src:fragref linkend="refentry.manual.fallback.profile.frag"></src:fragref> -<src:fragref linkend="refentry.manual.profile.enabled.frag"></src:fragref> -<src:fragref linkend="refentry.manual.profile.frag"></src:fragref> -<src:fragref linkend="refentry.meta.get.quietly.frag"></src:fragref> -<src:fragref linkend="refentry.source.fallback.profile.frag"></src:fragref> -<src:fragref linkend="refentry.source.name.profile.enabled.frag"></src:fragref> -<src:fragref linkend="refentry.source.name.profile.frag"></src:fragref> -<src:fragref linkend="refentry.source.name.suppress.frag"></src:fragref> -<src:fragref linkend="refentry.version.profile.enabled.frag"></src:fragref> -<src:fragref linkend="refentry.version.profile.frag"></src:fragref> -<src:fragref linkend="refentry.version.suppress.frag"></src:fragref> -</xsl:stylesheet> - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/param.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/param.xsl deleted file mode 100644 index 1031d5d3aac6ec7923e16de04941e26a8fc704ac..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/param.xsl +++ /dev/null @@ -1,195 +0,0 @@ - - - - - - - -1 -0 -[set $man.base.url.for.relative.links]/ - - -@*[local-name() = 'block'] = 'Miscellaneous Technical' or -(@*[local-name() = 'block'] = 'C1 Controls And Latin-1 Supplement (Latin-1 Supplement)' and - (@*[local-name() = 'class'] = 'symbols' or - @*[local-name() = 'class'] = 'letters') -) or -@*[local-name() = 'block'] = 'Latin Extended-A' -or -(@*[local-name() = 'block'] = 'General Punctuation' and - (@*[local-name() = 'class'] = 'spaces' or - @*[local-name() = 'class'] = 'dashes' or - @*[local-name() = 'class'] = 'quotes' or - @*[local-name() = 'class'] = 'bullets' - ) -) or -@*[local-name() = 'name'] = 'HORIZONTAL ELLIPSIS' or -@*[local-name() = 'name'] = 'WORD JOINER' or -@*[local-name() = 'name'] = 'SERVICE MARK' or -@*[local-name() = 'name'] = 'TRADE MARK SIGN' or -@*[local-name() = 'name'] = 'ZERO WIDTH NO-BREAK SPACE' - - -@*[local-name() = 'block'] = 'Miscellaneous Technical' or -(@*[local-name() = 'block'] = 'C1 Controls And Latin-1 Supplement (Latin-1 Supplement)' and - @*[local-name() = 'class'] = 'symbols') -or -(@*[local-name() = 'block'] = 'General Punctuation' and - (@*[local-name() = 'class'] = 'spaces' or - @*[local-name() = 'class'] = 'dashes' or - @*[local-name() = 'class'] = 'quotes' or - @*[local-name() = 'class'] = 'bullets' - ) -) or -@*[local-name() = 'name'] = 'HORIZONTAL ELLIPSIS' or -@*[local-name() = 'name'] = 'WORD JOINER' or -@*[local-name() = 'name'] = 'SERVICE MARK' or -@*[local-name() = 'name'] = 'TRADE MARK SIGN' or -@*[local-name() = 'name'] = 'ZERO WIDTH NO-BREAK SPACE' - - - -1 -1 -1 - - BI - B -B - B - B -ansi -0 -0 -0 -0 - - - - -4 -0 -man/ -UTF-8 - - - -MAN.MANIFEST -0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -0 -======================================================================== ----- -0 -30 -0 -30 -0 -20 -0 - - (($info[//d:date])[last()]/d:date)[1]| - (($info[//d:pubdate])[last()]/d:pubdate)[1] - - -d:refmeta/d:refmiscinfo[not(@class = 'date')][1]/node() -0 - - (($info[//title])[last()]/title)[1]| - ../title/node() - - - -d:refmeta/d:refmiscinfo[not(@class = 'date')][1]/node() -0 - - (($info[//productname])[last()]/productname)[1]| - (($info[//corpname])[last()]/corpname)[1]| - (($info[//corpcredit])[last()]/corpcredit)[1]| - (($info[//corpauthor])[last()]/corpauthor)[1]| - (($info[//orgname])[last()]/orgname)[1]| - (($info[//publishername])[last()]/publishername)[1] - -0 -0 - - (($info[//d:productnumber])[last()]/d:productnumber)[1]| - (($info[//d:edition])[last()]/d:edition)[1]| - (($info[//d:releaseinfo])[last()]/d:releaseinfo)[1] - -0 - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/pi.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/pi.xml deleted file mode 100644 index 8db98d3100240d6ae35c1c9b4e811cf42f6771fc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/pi.xml +++ /dev/null @@ -1,70 +0,0 @@ - - -manpages Processing Instruction Reference - - $Id: pi.xsl 7644 2008-01-16 11:04:07Z xmldoc $ - - - - Introduction - -This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for manpages output. - - -You add these PIs at particular points in a document to - cause specific “exceptions†to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - -dbman_funcsynopsis-style -Specifies presentation style for a funcsynopsis. - - - - dbman funcsynopsis-style="kr"|"ansi" - - -Description - -Use the dbman - funcsynopsis-style PI as a child of a - funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - Parameters - - - funcsynopsis-style="kr" - - -Displays the funcprototype in K&R style - - - - funcsynopsis-style="ansi" - - -Displays the funcprototype in ANSI style - - - - - - Related Global Parameters - -man.funcsynopsis.style - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/pi.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/pi.xsl deleted file mode 100644 index c80428dc2440b7c9a6b564237ad8f86f3250df56..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/pi.xsl +++ /dev/null @@ -1,80 +0,0 @@ - - - - - -manpages Processing Instruction Reference - - $Id: pi.xsl 7644 2008-01-16 11:04:07Z xmldoc $ - - - - Introduction - This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for manpages output. - - You add these PIs at particular points in a document to - cause specific “exceptions†to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - - Specifies presentation style for a funcsynopsis. - - Use the dbman - funcsynopsis-style PI as a child of a - funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - - dbman funcsynopsis-style="kr"|"ansi" - - - - funcsynopsis-style="kr" - - Displays the funcprototype in K&R style - - - funcsynopsis-style="ansi" - - Displays the funcprototype in ANSI style - - - - - - man.funcsynopsis.style - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/profile-docbook.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/profile-docbook.xsl deleted file mode 100644 index 2f3ad7b06d99a7842e6c7b0aa4bdf2edca922be9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/profile-docbook.xsl +++ /dev/null @@ -1,282 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MAN.MANIFEST - - - - - - - - - - - Erro - - - no refentry - - - No refentry elements found - - in " - - - - ... - - - - - - " - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - '\" t - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .\" ----------------------------------------------------------------- - - .\" * MAIN CONTENT STARTS HERE * - - .\" ----------------------------------------------------------------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/refentry.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/refentry.xsl deleted file mode 100644 index 6bd03cf6a81a2d307a6ba6ce06b68476ff32fd00..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/refentry.xsl +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - .br - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - \- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .SS " - - " - - - - - - .RS - - .RE - - - - - - - - - - - - - - - - - - - - - - - - .RS - - - - - - - .RE - - - - - - - - - - .ti (\n(SNu * 5u / 3u) - - - - - - - - - - - - - - - - - - - (\n(SNu) - - - - .RS (\n(SNu) - - .RE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \c - - .SH-xref - " - - \c" - - \& - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/synop.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/synop.xsl deleted file mode 100644 index 0f3407ffde86cbdcf5793cead575a102f5623bd2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/synop.xsl +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - | - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - .HP - \w' - ( - - ) - \ 'u - - ( - - ) - \ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .br▒ - - - - - - .ad l - - - - .hy 0 - - - .HP - \w' - - - - - - - - - \ 'u - - - - - - - .ad - - - - .hy - - - - - - - - - - - - - - - - - - .ad l - - - - .hy 0 - - - - - .ad - - - - .hy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .HP - \w' - - - - - - - - - ('u - - . - - - - - - - - " - - ( - - - - - - - - - " - - - - - - - - - - - .sp - .RS - - - - - - - .RE - - - - - - - - - - - - - - ); - - - - ...); - - - - void); - - - - ...); - - - - - - - - - - - - - - - - , - - - ); - - - - - - - - - - - - , - - - ); - - - - - - - - .br - . - - - - - - - - " - - - - - ; - " - - - - - - - - - - - - - - "░" - - "░" - - - - ( - - ) - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/table.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/table.xsl deleted file mode 100644 index 03076f94bb519965f921e0b556545be7a45c8ea4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/table.xsl +++ /dev/null @@ -1,633 +0,0 @@ - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - allbox - - - - - - - - center - - - - - - - - expand - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - .PP - . - - - - *[nested table] - - - - .sp -1n - - - - - .TS - - - H - - - - - - - - - - - tab( - - ) - - - - ; - - - - - - - - - - - - - - - - .TH - - - - - - - - - - - .T& - - - - - - - - - - - - - - - - - - - - - - .TE - - .sp - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - T{ - - T} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warn - - - tbl convert : Extracted a nested table - - - [\fInested table\fR]* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - - - - - - - - - - ^ - - - c - - - r - - - n - - - - l - - - - - - - - t - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ^ - - - - s - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .br - - - - - - - - - ftn. - - - - - - # - - - - - - [ - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/utility.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/utility.xsl deleted file mode 100644 index d6393936638366bdbf318016347f4609c4323372..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/manpages/utility.xsl +++ /dev/null @@ -1,556 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \fB - - \fR - - - - - - - - - - - - - \fI - - \fR - - - - - - - - - - - - \FC - - - - - - \F[] - - - - - - - - .fam C - .ps -1 - - - - - - .fam - .ps +1 - - - - - - .fam C - - - - - - .fam - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .sp - - .ps +1 - - - - - - .it 1 an-trap - .nr an-no-space-flag 1 - .nr an-break-flag 1 - .br - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .sp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .RS - - - - - - - - - - - - - - - - - - - - - .RE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .SH - - " - - - - - - - - - - - " - - - - - - - - - .\" - - - - - - - - - n - .ie - - \{\ - - - - n - .if - - \{\ - - - - .\} - .el \{\ - - - - .\} - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/abstract.notitle.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/abstract.notitle.enabled.xml deleted file mode 100644 index 1771f72292150a89c45569023dfacd6afd88234a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/abstract.notitle.enabled.xml +++ /dev/null @@ -1,22 +0,0 @@ - - -abstract.notitle.enabled -boolean - - -abstract.notitle.enabled -Suppress display of abstract titles? - - - - -Description -If non-zero, in output of the abstract element on titlepages, -display of the abstract title is suppressed. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/abstract.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/abstract.properties.xml deleted file mode 100644 index e8023126a56dd11e61e662d0778bc707969c79df..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/abstract.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -abstract.properties -attribute set - - -abstract.properties -Properties associated with the block surrounding an abstract - - - - - - 0.0in - 0.0in - - - - -Description - -Block styling properties for abstract. - -See also abstract.title.properties. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/abstract.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/abstract.title.properties.xml deleted file mode 100644 index d01f70cabb11766d10d627e6675e5099f70765c1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/abstract.title.properties.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -abstract.title.properties -attribute set - - -abstract.title.properties -Properties for abstract titles - - - - - - - bold - always - always - - - - false - center - - - - -Description - -The properties for abstract titles. - -See also abstract.properties. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/active.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/active.toc.xml deleted file mode 100644 index f56aee1450ee6990972539b366f9b930e3c20920..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/active.toc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -active.toc -boolean - - -active.toc -Active ToCs? - - - - - - - - -Description - -If non-zero, JavaScript is used to keep the ToC and the current slide -in sync. That is, each time the slide changes, the corresponding -ToC entry will be underlined. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ade.extensions.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ade.extensions.xml deleted file mode 100644 index 479591b9334829ffac7bf74a15bb6cb6316bfd2c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ade.extensions.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - ade.extensions - boolean - - - ade.extensions - Enable Adobe Digitial Editions extensions for ePub rendering? - - - - - - - - - Description - - If non-zero, -Adobe Digital Editions -extensions will be used when rendering to ePub output. Adobe Digital Editions extensions consists -rendering and layout extensions. - This parameter can also affect which graphics file formats are supported. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.graphics.extension.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.graphics.extension.xml deleted file mode 100644 index a7b47ddde6d77f2baba4bd26299e2bfa5b87c772..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.graphics.extension.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -admon.graphics.extension -string - - -admon.graphics.extension -Filename extension for admonition graphics - - - - -.png - - - -Description - -Sets the filename extension to use on admonition graphics. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.graphics.path.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.graphics.path.xml deleted file mode 100644 index 32b12b1273c776987b79ce393de39388ddd239dc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.graphics.path.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -admon.graphics.path -string - - -admon.graphics.path -Path to admonition graphics - - - -images/ - - -Description - -Sets the path to the directory containing the admonition graphics -(caution.png, important.png etc). This location is normally relative -to the output html directory. See base.dir - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.graphics.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.graphics.xml deleted file mode 100644 index f5e5ae467545770ecf12eb449f9db6f362057aa2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.graphics.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -admon.graphics -boolean - - -admon.graphics -Use graphics in admonitions? - - - - - - - - -Description - -If true (non-zero), admonitions are presented in an alternate style that uses -a graphic. Default graphics are provided in the distribution. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.style.xml deleted file mode 100644 index 5abe022b1ec7124402b901f9cbdc53ccdfbb52da..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.style.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -admon.style -string - - -admon.style -Specifies the CSS style attribute that should be added to -admonitions. - - - - - - - - -Description - -Specifies the value of the CSS style -attribute that should be added to admonitions. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.textlabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.textlabel.xml deleted file mode 100644 index ea1a53f108a98909f4f1944f938b8c19ba2f457f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admon.textlabel.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -admon.textlabel -boolean - - -admon.textlabel -Use text label in admonitions? - - - - - - - - -Description - -If true (non-zero), admonitions are presented with a generated -text label such as Note or Warning in the appropriate language. -If zero, such labels are turned off, but any title child -of the admonition element are still output. -The default value is 1. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admonition.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admonition.properties.xml deleted file mode 100644 index 4dddd26b65e9b3d64361477622fa54c35722f429..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admonition.properties.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - admonition.properties - attribute set - - -admonition.properties -To set the style for admonitions. - - - - - - -Description -How do you want admonitions styled? -Set the font-size, weight, etc. to the style required - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admonition.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admonition.title.properties.xml deleted file mode 100644 index 7af23e6157e52dcd3485396e3bb3332638fb8ca2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/admonition.title.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - admonition.title.properties - attribute set - - -admonition.title.properties -To set the style for admonitions titles. - - - - - - 14pt - bold - false - always - - - -Description -How do you want admonitions titles styled? -Set the font-size, weight etc to the style required. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/alignment.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/alignment.xml deleted file mode 100644 index 9c0a3de35e3b89dca283a4c84153e0edfdfddd4c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/alignment.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -alignment - list - open - left - start - right - end - center - justify - - -alignment -Specify the default text alignment - - - -justify - - -Description - -The default text alignment is used for most body text. -Allowed values are -left, -right, -start, -end, -center, -justify. -The default value is justify. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotate.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotate.toc.xml deleted file mode 100644 index 667fa3211fda7d33c37a4185e5517a2d05465551..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotate.toc.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -annotate.toc -boolean - - -annotate.toc -Annotate the Table of Contents? - - - - - - -Description - -If true, TOCs will be annotated. At present, this just means -that the refpurpose of refentry -TOC entries will be displayed. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.css.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.css.xml deleted file mode 100644 index 560c56a739ec6578e7d41d2ef20581fe0d73ebaa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.css.xml +++ /dev/null @@ -1,71 +0,0 @@ - - -annotation.css -string - - -annotation.css -CSS rules for annotations - - - - - -/* ====================================================================== - Annotations -*/ - -div.annotation-list { visibility: hidden; - } - -div.annotation-nocss { position: absolute; - visibility: hidden; - } - -div.annotation-popup { position: absolute; - z-index: 4; - visibility: hidden; - padding: 0px; - margin: 2px; - border-style: solid; - border-width: 1px; - width: 200px; - background-color: white; - } - -div.annotation-title { padding: 1px; - font-weight: bold; - border-bottom-style: solid; - border-bottom-width: 1px; - color: white; - background-color: black; - } - -div.annotation-body { padding: 2px; - } - -div.annotation-body p { margin-top: 0px; - padding-top: 0px; - } - -div.annotation-close { position: absolute; - top: 2px; - right: 2px; - } - - - - -Description - -If annotation.support is enabled and the -document contains annotations, then the CSS in this -parameter will be included in the document. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.graphic.close.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.graphic.close.xml deleted file mode 100644 index 002ebb4a75fcd9ec046728e26c458341f4eb76de..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.graphic.close.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -annotation.graphic.close -uri - - -annotation.graphic.close -Image for identifying a link that closes an annotation popup - - - - - -http://docbook.sourceforge.net/release/images/annot-close.png - - - -Description - -This image is used on popup annotations as the “x†that the -user can click to dismiss the popup. -This image is used on popup annotations as the “x†that the user can -click to dismiss the popup. It may be replaced by a user provided graphic. The size should be approximately 10x10 pixels. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.graphic.open.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.graphic.open.xml deleted file mode 100644 index c7d1c323aa95a61711c577c47ddff1f0e669334e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.graphic.open.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -annotation.graphic.open -uri - - -annotation.graphic.open -Image for identifying a link that opens an annotation popup - - - - -http://docbook.sourceforge.net/release/images/annot-open.png - - - -Description - -This image is used inline to identify the location of -annotations. It may be replaced by a user provided graphic. The size should be approximately 10x10 pixels. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.js.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.js.xml deleted file mode 100644 index 6c7e97ebc63f9427d613a8215128efdaa06d19a1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.js.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -annotation.js -string - - -annotation.js -URIs identifying JavaScript files with support for annotation popups - - - - - - -http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js - - - - -Description - -If annotation.support is enabled and the -document contains annotations, then the URIs listed -in this parameter will be included. These JavaScript files are required -for popup annotation support. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.support.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.support.xml deleted file mode 100644 index 29e763336a48b0fdb3b6352154aff60c85834330..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/annotation.support.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -annotation.support -boolean - - -annotation.support -Enable annotations? - - - - - - - - -Description - -If non-zero, the stylesheets will attempt to support annotation -elements in HTML by including some JavaScript (see -annotation.js). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/appendix.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/appendix.autolabel.xml deleted file mode 100644 index bae38fa10e45027f15626f9305950619b0f478c9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/appendix.autolabel.xml +++ /dev/null @@ -1,73 +0,0 @@ - - -appendix.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -appendix.autolabel -Specifies the labeling format for Appendix titles - - - - -A - - - -Description - -If non-zero, then appendices will be numbered using the -parameter value as the number format if the value matches one of the -following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperalpha). - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/arbortext.extensions.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/arbortext.extensions.xml deleted file mode 100644 index 2e571ddb3827531407329a5c8f7c893ba1cc5616..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/arbortext.extensions.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -arbortext.extensions -boolean - - -arbortext.extensions -Enable Arbortext extensions? - - - - - - -Description - -If non-zero, -Arbortext -extensions will be used. - -This parameter can also affect which graphics file formats -are supported - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/article.appendix.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/article.appendix.title.properties.xml deleted file mode 100644 index 61337a1bd68002618ef87daea02267bd4b8e5519..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/article.appendix.title.properties.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -article.appendix.title.properties -attribute set - - -article.appendix.title.properties -Properties for appendix titles that appear in an article - - - - - - - - - - - - -Description - -The properties for the title of an appendix that -appears inside an article. The default is to use -the properties of sect1 titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/author.othername.in.middle.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/author.othername.in.middle.xml deleted file mode 100644 index 4ad21dd343e8cd62410c08d3e151883dca7c77b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/author.othername.in.middle.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -author.othername.in.middle -boolean - - -author.othername.in.middle -Is othername in author a -middle name? - - - - - - - -Description - -If non-zero, the othername of an author -appears between the firstname and -surname. Otherwise, othername -is suppressed. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/autolayout-file.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/autolayout-file.xml deleted file mode 100644 index 150f1237b9ae4591049572c5c77653dd097854c9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/autolayout-file.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -autolayout-file -filename - - -autolayout-file -Identifies the autolayout.xml file - - - - -autolayout.xml - - - -Description -When the source pages are spread over several directories, this -parameter can be set (for example, from the command line of a batch-mode -XSLT processor) to indicate the location of the autolayout.xml file. -FIXME: for browser-based use, there needs to be a PI for this... - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/autotoc.label.in.hyperlink.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/autotoc.label.in.hyperlink.xml deleted file mode 100644 index dced0bd70eb47ae1105c605bfd740afcda59b21b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/autotoc.label.in.hyperlink.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -autotoc.label.in.hyperlink -boolean - - -autotoc.label.in.hyperlink -Include label in hyperlinked titles in TOC? - - - - - - -Description - -If the value of -autotoc.label.in.hyperlink is non-zero, labels -are included in hyperlinked titles in the TOC. If it is instead zero, -labels are still displayed prior to the hyperlinked titles, but -are not hyperlinked along with the titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/autotoc.label.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/autotoc.label.separator.xml deleted file mode 100644 index b9cd53a355d9c10348bdec44a50bc2c678722fa3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/autotoc.label.separator.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -autotoc.label.separator -string - - -autotoc.label.separator -Separator between labels and titles in the ToC - - - - -. - - - -Description - -String used to separate labels and titles in a table of contents. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/axf.extensions.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/axf.extensions.xml deleted file mode 100644 index 940a187bd1b2004e3e6e335d88191681eba2e791..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/axf.extensions.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -axf.extensions -boolean - - -axf.extensions -Enable XSL Formatter extensions? - - - - - - - - -Description - -If non-zero, -XSL Formatter -extensions will be used. XSL Formatter extensions consists of PDF bookmarks, -document information and better index processing. - -This parameter can also affect which graphics file formats -are supported - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/banner.before.navigation.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/banner.before.navigation.xml deleted file mode 100644 index 0883378073fd52ca3ececc8e3caba0b6af782ca8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/banner.before.navigation.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -banner.before.navigation -boolean - - -banner.before.navigation -Put banner before navigation? - - - - - - - - -Description -FIXME - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/base.dir.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/base.dir.xml deleted file mode 100644 index e22ca14c20f160697a4ce0081d4778b9fc9fcf44..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/base.dir.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -base.dir -uri - - -base.dir -The base directory of chunks - - - - - - - - -Description - -If specified, the base.dir identifies -the output directory for chunks. (If not specified, the output directory -is system dependent.) - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/biblioentry.item.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/biblioentry.item.separator.xml deleted file mode 100644 index 4a56ad6c1739046da5e47e5ac64bee7c8623a355..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/biblioentry.item.separator.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -biblioentry.item.separator -string - - -biblioentry.item.separator -Text to separate bibliography entries - - - -. - - -Description - -Text to separate bibliography entries - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/biblioentry.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/biblioentry.properties.xml deleted file mode 100644 index 9e88ddb5773fcb638c4c78348967157ba42d489a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/biblioentry.properties.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - biblioentry.properties - attribute set - - -biblioentry.properties -To set the style for biblioentry. - - - - - 0.5in - -0.5in - - - -Description -How do you want biblioentry styled? -Set the font-size, weight, space-above and space-below, indents, etc. to the style required - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bibliography.collection.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bibliography.collection.xml deleted file mode 100644 index ee49ddea4e9cea23a753f9b52d19ea7ab4f6d2c3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bibliography.collection.xml +++ /dev/null @@ -1,104 +0,0 @@ - - -bibliography.collection -string - - -bibliography.collection -Name of the bibliography collection file - - - - -http://docbook.sourceforge.net/release/bibliography/bibliography.xml - - - - -Description - -Maintaining bibliography entries across a set of documents is tedious, time -consuming, and error prone. It makes much more sense, usually, to store all of -the bibliography entries in a single place and simply extract -the ones you need in each document. - -That's the purpose of the -bibliography.collection parameter. To setup a global -bibliography database, follow these steps: - -First, create a stand-alone bibliography document that contains all of -the documents that you wish to reference. Make sure that each bibliography -entry (whether you use biblioentry or bibliomixed) -has an ID. - -My global bibliography, ~/bibliography.xml begins -like this: - - -<!DOCTYPE bibliography - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<bibliography><title>References</title> - -<bibliomixed id="xml-rec"><abbrev>XML 1.0</abbrev>Tim Bray, -Jean Paoli, C. M. Sperberg-McQueen, and Eve Maler, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml">Extensible Markup -Language (XML) 1.0 Second Edition</ulink></citetitle>. -World Wide Web Consortium, 2000. -</bibliomixed> - -<bibliomixed id="xml-names"><abbrev>Namespaces</abbrev>Tim Bray, -Dave Hollander, -and Andrew Layman, editors. -<citetitle><ulink url="http://www.w3.org/TR/REC-xml-names/">Namespaces in -XML</ulink></citetitle>. -World Wide Web Consortium, 1999. -</bibliomixed> - -<!-- ... --> -</bibliography> - - - -When you create a bibliography in your document, simply -provide empty bibliomixed -entries for each document that you wish to cite. Make sure that these -elements have the same ID as the corresponding real -entry in your global bibliography. - -For example: - - -<bibliography><title>Bibliography</title> - -<bibliomixed id="xml-rec"/> -<bibliomixed id="xml-names"/> -<bibliomixed id="DKnuth86">Donald E. Knuth. <citetitle>Computers and -Typesetting: Volume B, TeX: The Program</citetitle>. Addison-Wesley, -1986. ISBN 0-201-13437-3. -</bibliomixed> -<bibliomixed id="relaxng"/> - -</bibliography> - - -Note that it's perfectly acceptable to mix entries from your -global bibliography with normal entries. You can use -xref or other elements to cross-reference your -bibliography entries in exactly the same way you do now. - -Finally, when you are ready to format your document, simply set the -bibliography.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global bibliography. - -The stylesheets will format the bibliography in your document as if -all of the entries referenced appeared there literally. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bibliography.numbered.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bibliography.numbered.xml deleted file mode 100644 index 593a1fa980cc0c5b7cabd8cceaf7248fad0e5da9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bibliography.numbered.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -bibliography.numbered -boolean - - -bibliography.numbered -Should bibliography entries be numbered? - - - - - - - - -Description - -If non-zero bibliography entries will be numbered - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bibliography.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bibliography.style.xml deleted file mode 100644 index fa445826af8b6d6111b8299c6535ebfce9ed7d18..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bibliography.style.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -bibliography.style -list -normal -iso690 - - -bibliography.style -Style used for formatting of biblioentries. - - - - -normal - - - -Description - -Currently only normal and -iso690 styles are supported. - -In order to use ISO690 style to the full extent you might need -to use additional markup described on the -following WiKi page. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/blockquote.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/blockquote.properties.xml deleted file mode 100644 index 76d7f1c3616f47b27f3c3760b4bf0c0adf144b1c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/blockquote.properties.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - blockquote.properties - attribute set - - -blockquote.properties -To set the style for block quotations. - - - - - -0.5in -0.5in -0.5em -1em -2em - - - - -Description - -The blockquote.properties attribute set specifies -the formating properties of block quotations. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/blurb.on.titlepage.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/blurb.on.titlepage.enabled.xml deleted file mode 100644 index 27e89d75ff86c9d549dd7dd08a1135b88f8e9147..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/blurb.on.titlepage.enabled.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -blurb.on.titlepage.enabled -boolean - - -blurb.on.titlepage.enabled -Display personblurb and authorblurb on title pages? - - - - - - - - -Description - -If non-zero, output from authorblurb and -personblurb elements is displayed on title pages. If zero -(the default), output from those elements is suppressed on title pages -(unless you are using a titlepage customization -that causes them to be included). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.attributes.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.attributes.xml deleted file mode 100644 index 8ee1ad947238ce347b5517eabdcb10099e15006d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.attributes.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -body.attributes -attribute set - - -body.attributes -DEPRECATED - - - - - - white - black - #0000FF - #840084 - #0000FF - - - - -Description -DEPRECATED - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.bg.color.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.bg.color.xml deleted file mode 100644 index 8315b859d57b471aec52b044e2a7fb3c72fa51ab..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.bg.color.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -body.bg.color -color - - -body.bg.color -Background color for body frame - - - - -#FFFFFF - - - -Description - -Specifies the background color used in the body column of -tabular slides. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.end.indent.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.end.indent.xml deleted file mode 100644 index a5e098c71ec4004d64b3549dd52d8005e7821fa7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.end.indent.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -body.end.indent -length - - -body.end.indent -The end-indent for the body text - - - - -0pt - - - -Description - -This end-indent property is added to the fo:flow -for certain page sequences. Which page-sequences it is -applied to is determined by the template named -set.flow.properties. -By default, that template adds it to the flow -for page-sequences using the body -master-reference, as well as appendixes and prefaces. - - -See also body.start.indent. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.font.family.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.font.family.xml deleted file mode 100644 index 06c3b4790690db6006925bbf4ac57af7ec66c38b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.font.family.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -body.font.family -list -open -serif -sans-serif -monospace - - -body.font.family -The default font family for body text - - - - -serif - - - -Description - -The body font family is the default font used for text in the page body. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.font.master.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.font.master.xml deleted file mode 100644 index 323a6a05277e2e0df6dd407182c9cc95654e2c07..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.font.master.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -body.font.master - number - - -body.font.master -Specifies the default point size for body text - - - - -10 - - - -Description - -The body font size is specified in two parameters -(body.font.master and body.font.size) -so that math can be performed on the font size by XSLT. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.font.size.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.font.size.xml deleted file mode 100644 index fc35ade997b2dcb1ed32bc12514352ef65c6b0c6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.font.size.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -body.font.size -length - - -body.font.size -Specifies the default font size for body text - - - - - - pt - - - -Description - -The body font size is specified in two parameters -(body.font.master and body.font.size) -so that math can be performed on the font size by XSLT. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.margin.bottom.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.margin.bottom.xml deleted file mode 100644 index 2302f6492c9574c36711d3631fa1eefda26797d6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.margin.bottom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -body.margin.bottom -length - - -body.margin.bottom -The bottom margin of the body text - - - - -0.5in - - - -Description - -The body bottom margin is the distance from the last line of text -in the page body to the bottom of the region-after. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.margin.top.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.margin.top.xml deleted file mode 100644 index 182bd9fd349bcba8e91bfd37925eff106c3a38e8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.margin.top.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -body.margin.top -length - - -body.margin.top -To specify the size of the top margin of a page - - - - -0.5in - - - -Description - -The body top margin is the distance from the top of the -region-before to the first line of text in the page body. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.start.indent.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.start.indent.xml deleted file mode 100644 index 4e348f1c77ea921fd4a1c89a54ce5a19917975c1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/body.start.indent.xml +++ /dev/null @@ -1,64 +0,0 @@ - - -body.start.indent -length - - -body.start.indent -The start-indent for the body text - - - - - - - 0pt - 0pt - 4pc - - - - - -Description - -This parameter provides -the means of indenting the body text relative to -section titles. -For left-to-right text direction, it indents the left side. -For right-to-left text direction, it indents the right side. -It is used in place of the -title.margin.left for -all XSL-FO processors except FOP 0.25. -It enables support for side floats to appear -in the indented margin area. - -This start-indent property is added to the fo:flow -for certain page sequences. Which page-sequences it is -applied to is determined by the template named -set.flow.properties. -By default, that template adds it to the flow -for page-sequences using the body -master-reference, as well as appendixes and prefaces. - -If this parameter is used, section titles should have -a start-indent value of 0pt if they are to be -outdented relative to the body text. - - -If you are using FOP, then set this parameter to a zero -width value and set the title.margin.left -parameter to the negative value of the desired indent. - - -See also body.end.indent and -title.margin.left. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bookmarks.collapse.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bookmarks.collapse.xml deleted file mode 100644 index 3320056923e58e1005724e1ff6f48975110c6e3d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bookmarks.collapse.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -bookmarks.collapse -boolean - - -bookmarks.collapse -Specifies the initial state of bookmarks - - - - - - - - -Description - -If non-zero, the bookmark tree is collapsed so that only the -top-level bookmarks are displayed initially. Otherwise, the whole tree -of bookmarks is displayed. - -This parameter currently works with FOP 0.93 or later. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bridgehead.in.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bridgehead.in.toc.xml deleted file mode 100644 index 490d55632960048aa152891f926398b2f89e0520..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bridgehead.in.toc.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -bridgehead.in.toc -boolean - - -bridgehead.in.toc -Should bridgehead elements appear in the TOC? - - - - - - -Description - -If non-zero, bridgeheads appear in the TOC. Note that -this option is not fully supported and may be removed in a future -version of the stylesheets. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bullet.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bullet.image.xml deleted file mode 100644 index acf2af55e938b6ad5d2f765ec60c4bbadd0a36f3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/bullet.image.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -bullet.image -filename - - -bullet.image -Bullet image - - - - -toc/bullet.png - - - -Description - -Specifies the filename of the bullet image used for foils in the -framed ToC. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.defaultcolumn.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.defaultcolumn.xml deleted file mode 100644 index 6cae38134f040794bd2d444058df4d41194a45b0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.defaultcolumn.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -callout.defaultcolumn -integer - - -callout.defaultcolumn -Indicates what column callouts appear in by default - - - - -60 - - - -Description - -If a callout does not identify a column (for example, if it uses -the linerange unit), -it will appear in the default column. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.extension.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.extension.xml deleted file mode 100644 index febc6901d6254ec4540f2927f20a8aa43539163c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.extension.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -callout.graphics.extension -string - - -callout.graphics.extension -Filename extension for callout graphics - - - - -.png -.svg - - - -Description -Sets the filename extension to use on callout graphics. - - -The Docbook XSL distribution provides callout graphics in the following formats: -SVG (extension: .svg) -PNG (extension: .png) -GIF (extension: .gif) - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.number.limit.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.number.limit.xml deleted file mode 100644 index cde5267dcdfb248df93e9381ba40e25dcad59b6e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.number.limit.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -callout.graphics.number.limit -integer - - -callout.graphics.number.limit -Number of the largest callout graphic - - - - -15 -30 - - - -Description - -If callout.graphics is non-zero, graphics -are used to represent callout numbers instead of plain text. The value -of callout.graphics.number.limit is the largest -number for which a graphic exists. If the callout number exceeds this -limit, the default presentation "(plain text instead of a graphic)" -will be used. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.path.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.path.xml deleted file mode 100644 index 00e54c17036dae64e3f9979764a7aeeaeebcefe3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.path.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -callout.graphics.path -string - - -callout.graphics.path -Path to callout graphics - - - - -images/callouts/ - - - -Description - -Sets the path to the directory holding the callout graphics. his -location is normally relative to the output html directory. see -base.dir. Always terminate the directory with / since the graphic file -is appended to this string, hence needs the separator. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.xml deleted file mode 100644 index a97ac0d79dd21baf353f286c165cf8d1b31f9b2d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.graphics.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -callout.graphics -boolean - - -callout.graphics -Use graphics for callouts? - - - - - - - - -Description - -If non-zero, callouts are presented with graphics (e.g., reverse-video -circled numbers instead of "(1)", "(2)", etc.). -Default graphics are provided in the distribution. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.icon.size.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.icon.size.xml deleted file mode 100644 index d3acae838cbdce14439a8eec07cd5b4e7c61bba9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.icon.size.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -callout.icon.size -length - - -callout.icon.size -Specifies the size of callout marker icons - - - - -7pt - - - -Description - -Specifies the size of the callout marker icons. -The default size is 7 points. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.list.table.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.list.table.xml deleted file mode 100644 index 6fece033c31b53b4c50d775f90231dca6f8223a7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.list.table.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -callout.list.table -boolean - - -callout.list.table -Present callout lists using a table? - - - - - - - - -Description - -The default presentation of calloutlists uses -an HTML DL element. Some browsers don't align DLs very well -if callout.graphics is used. With this option -turned on, calloutlists are presented in an HTML -TABLE, which usually results in better alignment -of the callout number with the callout description. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.font.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.font.xml deleted file mode 100644 index e63bffb6104fb2d2e5bff596d94171cb2051d108..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.font.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -callout.unicode.font -string - - -callout.unicode.font -Specify a font for Unicode glyphs - - - - -ZapfDingbats - - - -Description - -The name of the font to specify around Unicode callout glyphs. -If set to the empty string, no font change will occur. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.number.limit.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.number.limit.xml deleted file mode 100644 index a9f1f3dea79b4d84fee85fee191b029d51a230b0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.number.limit.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -callout.unicode.number.limit -integer - - -callout.unicode.number.limit -Number of the largest unicode callout character - - - - -10 - - - -Description - -If callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.number.limit -is -the largest number for which a unicode character exists. If the callout number -exceeds this limit, the default presentation "(nnn)" will always -be used. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.start.character.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.start.character.xml deleted file mode 100644 index 90a1acdf44d789a414e2ad987227cdacfd3c6a06..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.start.character.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -callout.unicode.start.character -integer - - -callout.unicode.start.character -First Unicode character to use, decimal value. - - - - -10102 - - - -Description - -If callout.graphics is zero and callout.unicode -is non-zero, unicode characters are used to represent -callout numbers. The value of -callout.unicode.start.character -is the decimal unicode value used for callout number one. Currently, -only 10102 is supported in the stylesheets for this parameter. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.xml deleted file mode 100644 index 4ec6a5f303e04661b17eb96f21f22191a5013c2b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callout.unicode.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -callout.unicode -boolean - - -callout.unicode -Use Unicode characters rather than images for callouts. - - - - - - -Description - -The stylesheets can use either an image of the numbers one to ten, or the single Unicode character which represents the numeral, in white on a black background. Use this to select the Unicode character option. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callouts.extension.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callouts.extension.xml deleted file mode 100644 index 80b5845aa7c7ba5652b269f7024685ca2dad1726..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/callouts.extension.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -callouts.extension -boolean - - -callouts.extension -Enable the callout extension - - - - - - - - -Description - -The callouts extension processes areaset -elements in programlistingco and other text-based -callout elements. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chapter.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chapter.autolabel.xml deleted file mode 100644 index 32414bcc12f21727f9712cd676bb65eb6d39a589..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chapter.autolabel.xml +++ /dev/null @@ -1,71 +0,0 @@ - - -chapter.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -chapter.autolabel -Specifies the labeling format for Chapter titles - - - - - - - -Description - -If non-zero, then chapters will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.append.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.append.xml deleted file mode 100644 index 1f65aadc9bcf6e906ae2eb60be2105431a5800bd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.append.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -chunk.append -string - - -chunk.append -Specifies content to append to chunked HTML output - - - - - - -Description - -Specifies content to append to the end of HTML files output by -the html/chunk.xsl stylesheet, after the closing -<html> tag. You probably don’t want to set any value -for this parameter; but if you do, the only value it should ever be -set to is a newline character: &#x0a; or -&#10; - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.first.sections.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.first.sections.xml deleted file mode 100644 index f0c1b829ae131e7d46a58238f38cd0960a210a2e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.first.sections.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -chunk.first.sections -boolean - - -chunk.first.sections -Chunk the first top-level section? - - - - - - - - -Description - -If non-zero, a chunk will be created for the first top-level -sect1 or section elements in -each component. Otherwise, that section will be part of the chunk for -its parent. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.quietly.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.quietly.xml deleted file mode 100644 index 8700b29e2f9367f3c800e56af856e878f352a51d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.quietly.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -chunk.quietly -boolean - - -chunk.quietly -Omit the chunked filename messages. - - - - - - - - -Description - -If zero (the default), the XSL processor emits a message naming -each separate chunk filename as it is being output. -If nonzero, then the messages are suppressed. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.section.depth.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.section.depth.xml deleted file mode 100644 index d46193c821b8a98c957e70ea6cc6df96d641c708..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.section.depth.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -chunk.section.depth -integer - - -chunk.section.depth -Depth to which sections should be chunked - - - - - - - - -Description - -This parameter sets the depth of section chunking. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.sections.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.sections.xml deleted file mode 100644 index 2ffb1a3c4e6831cbba4704fc86486280cb8a5768..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.sections.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -chunk.sections -boolean - - -chunk.sections -Should top-level sections be chunks in their own right? - - - - - - - - -Description - -If non-zero, chunks will be created for top-level -sect1 and section elements in -each component. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.separate.lots.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.separate.lots.xml deleted file mode 100644 index aa54eabead18cf06c81baf490519af685cfebf9a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.separate.lots.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -chunk.separate.lots -boolean - - -chunk.separate.lots -Should each LoT be in its own separate chunk? - - - - - - - - -Description - -If non-zero, each of the ToC and LoTs -(List of Examples, List of Figures, etc.) -will be put in its own separate chunk. -The title page includes generated links to each of the separate files. - - -This feature depends on the -chunk.tocs.and.lots -parameter also being non-zero. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.toc.xml deleted file mode 100644 index 12cdb2caa0061f81295b75e522b1670ef3f07e7b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.toc.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -chunk.toc -string - - -chunk.toc -An explicit TOC to be used for chunking - - - - - - - - -Description - -The chunk.toc identifies an explicit TOC that -will be used for chunking. This parameter is only used by the -chunktoc.xsl stylesheet (and customization layers built -from it). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.tocs.and.lots.has.title.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.tocs.and.lots.has.title.xml deleted file mode 100644 index 0bdd31b8381c63fd68444b28592fe0f49780fef8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.tocs.and.lots.has.title.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -chunk.tocs.and.lots.has.title -boolean - - -chunk.tocs.and.lots.has.title -Should ToC and LoTs in a separate chunks have title? - - - - - - - - -Description - -If non-zero title of document is shown before ToC/LoT in -separate chunk. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.tocs.and.lots.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.tocs.and.lots.xml deleted file mode 100644 index 2a01fffa104c71f07e84937f8b3b020cfea0929c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunk.tocs.and.lots.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -chunk.tocs.and.lots -boolean - - -chunk.tocs.and.lots -Should ToC and LoTs be in separate chunks? - - - - - - - - -Description - -If non-zero, ToC and LoT (List of Examples, List of Figures, etc.) -will be put in a separate chunk. At the moment, this chunk is not in the -normal forward/backward navigation list. Instead, a new link is added to the -navigation footer. - -This feature is still somewhat experimental. Feedback welcome. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.cdata-section-elements.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.cdata-section-elements.xml deleted file mode 100644 index 3e9be4d59d6b897d441002e08df38a66a7e50186..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.cdata-section-elements.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -chunker.output.cdata-section-elements -string - - -chunker.output.cdata-section-elements -List of elements to escape with CDATA sections - - - - - - -Description -This parameter specifies the list of elements that should be escaped -as CDATA sections by the chunking stylesheet. Not all processors support -specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.doctype-public.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.doctype-public.xml deleted file mode 100644 index 6aa6e307f5299c6fbb2374d0d04f027b2929ddc3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.doctype-public.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -chunker.output.doctype-public -string - - -chunker.output.doctype-public -Public identifer to use in the document type of generated pages - - - - - - -Description -This parameter specifies the public identifier that should be used by -the chunking stylesheet in the document type declaration of chunked pages. -Not all processors support specification of -this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.doctype-system.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.doctype-system.xml deleted file mode 100644 index 2d67906d644f3e0b06e89d5468fcd65d8e12b9af..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.doctype-system.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -chunker.output.doctype-system -uri - - -chunker.output.doctype-system -System identifier to use for the document type in generated pages - - - - - - -Description -This parameter specifies the system identifier that should be used by -the chunking stylesheet in the document type declaration of chunked pages. -Not all processors support specification of -this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.encoding.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.encoding.xml deleted file mode 100644 index f8993e97c0c3627b8f5b65e1cb7b3b3def9fa5a3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.encoding.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -chunker.output.encoding -string - - -chunker.output.encoding -Encoding used in generated pages - - - -ISO-8859-1 - - -Description -This parameter specifies the encoding to be used in files -generated by the chunking stylesheet. Not all processors support -specification of this parameter. - -This parameter used to be named default.encoding. - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.indent.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.indent.xml deleted file mode 100644 index 3da9ad4b31e03499fd0b43d2427eb10d096b6dbf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.indent.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -chunker.output.indent -string - - -chunker.output.indent -Specification of indentation on generated pages - - - -no - - -Description -This parameter specifies the value of the indent -specification for generated pages. Not all processors support -specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.media-type.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.media-type.xml deleted file mode 100644 index 61869715f2ffb40c518ad60094ba8189a247fd8e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.media-type.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -chunker.output.media-type -string - - -chunker.output.media-type -Media type to use in generated pages - - - - - - -Description -This parameter specifies the media type that should be used by -the chunking stylesheet. Not all processors support specification of -this parameter. - -This parameter specifies the media type that should be used by the -chunking stylesheet. This should be one from those defined in -[RFC2045] and - [RFC2046] - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. -It must be one from html, xml or text - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.method.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.method.xml deleted file mode 100644 index dc9359b5f01bf61f637ecb47a772af87682d7701..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.method.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -chunker.output.method -list -html -xml - - -chunker.output.method -Method used in generated pages - - - -html - - -Description -This parameter specifies the output method to be used in files -generated by the chunking stylesheet. - -This parameter used to be named output.method. - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.omit-xml-declaration.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.omit-xml-declaration.xml deleted file mode 100644 index 4b8262f8a80cfa1578664897f7e8cf708cc24e85..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.omit-xml-declaration.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -chunker.output.omit-xml-declaration -string - - -chunker.output.omit-xml-declaration -Omit-xml-declaration for generated pages - - - -no - - -Description -This parameter specifies the value of the omit-xml-declaration -specification for generated pages. Not all processors support -specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.standalone.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.standalone.xml deleted file mode 100644 index 8972c4733f7bec19af9bfca62eb896386da70cb4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/chunker.output.standalone.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -chunker.output.standalone -string - - -chunker.output.standalone -Standalone declaration for generated pages - - - -no - - -Description -This parameter specifies the value of the standalone - specification for generated pages. It must be either - yes or no. Not all - processors support specification of this parameter. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/citerefentry.link.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/citerefentry.link.xml deleted file mode 100644 index 623511b6d00e9799b3aa71fd7999c7dd05b65423..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/citerefentry.link.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -citerefentry.link -boolean - - -citerefentry.link -Generate URL links when cross-referencing RefEntrys? - - - - - - - -Description - -If non-zero, a web link will be generated, presumably -to an online man->HTML gateway. The text of the link is -generated by the generate.citerefentry.link template. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/collect.xref.targets.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/collect.xref.targets.xml deleted file mode 100644 index 378c969089e242901651319372cc65fa463b8179..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/collect.xref.targets.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -collect.xref.targets -list -no -yes -only - - -collect.xref.targets -Controls whether cross reference data is -collected - - -no - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter determines whether the collection process is run when the document is processed by the stylesheet. The default value is no, which means the data file is not generated during processing. The other choices are yes, which means the data file is created and the document is processed for output, and only, which means the data file is created but the document is not processed for output. -See also targets.filename. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.back.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.back.xml deleted file mode 100644 index 95ee76db0af0bc4cbe718b4dc50f2b5742c68b51..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.back.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -column.count.back -integer - - -column.count.back -Number of columns on back matter pages - - - - - - - - -Description - -Number of columns on back matter (appendix, glossary, etc.) pages. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.body.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.body.xml deleted file mode 100644 index a5d65b32a155c0dfa512f42eb7df390861598c8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.body.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -column.count.body -integer - - -column.count.body -Number of columns on body pages - - - - - - - - -Description - -Number of columns on body pages. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.front.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.front.xml deleted file mode 100644 index 64ff3ac014ae5dd7000ebcb6cdb1ad5f954b631c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.front.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -column.count.front -integer - - -column.count.front -Number of columns on front matter pages - - - - - - - - -Description - -Number of columns on front matter (dedication, preface, etc.) pages. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.index.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.index.xml deleted file mode 100644 index e485448550a4cc5550808192233c59f420ca7336..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.index.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -column.count.index -integer - - -column.count.index -Number of columns on index pages - - - - -2 - - - -Description - -Number of columns on index pages. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.lot.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.lot.xml deleted file mode 100644 index 770988dc5dcbb27c630b362d5570f62786c5c5bc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.lot.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -column.count.lot -integer - - -column.count.lot -Number of columns on a 'List-of-Titles' page - - - - - - - - -Description - -Number of columns on a page sequence containing the Table of Contents, -List of Figures, etc. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.titlepage.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.titlepage.xml deleted file mode 100644 index 3deba6fe541f74ed36ad9b4989f4cc451d6457ef..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.count.titlepage.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -column.count.titlepage -integer - - -column.count.titlepage -Number of columns on a title page - - - - - - - - -Description - -Number of columns on a title page - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.back.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.back.xml deleted file mode 100644 index 3aaa1d3f11821462d965547c391e3b9d96a7762c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.back.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -column.gap.back -length - - -column.gap.back -Gap between columns in back matter - - - - -12pt - - - -Description - -Specifies the gap between columns in back matter (if -column.count.back is greater than one). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.body.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.body.xml deleted file mode 100644 index 57b0168aadb9b46cc15df10d06775cbe8fd685fb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.body.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -column.gap.body -length - - -column.gap.body -Gap between columns in the body - - - - -12pt - - - -Description - -Specifies the gap between columns in body matter (if -column.count.body is greater than one). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.front.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.front.xml deleted file mode 100644 index a6f7263a186e59f4ce5c4096e54a8b585545fca9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.front.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -column.gap.front -length - - -column.gap.front -Gap between columns in the front matter - - - - -12pt - - - -Description - -Specifies the gap between columns in front matter (if -column.count.front is greater than one). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.index.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.index.xml deleted file mode 100644 index 2279f773e8c31e98ee34f5b1cb11fdae8963f086..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.index.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -column.gap.index -length - - -column.gap.index -Gap between columns in the index - - - - -12pt - - - -Description - -Specifies the gap between columns in indexes (if -column.count.index is greater than one). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.lot.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.lot.xml deleted file mode 100644 index da0fa004020f18bba089ff060103acbbd7d9d16b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.lot.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -column.gap.lot -length - - -column.gap.lot -Gap between columns on a 'List-of-Titles' page - - - - -12pt - - - -Description - -Specifies the gap between columns on 'List-of-Titles' pages (if -column.count.lot is greater than one). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.titlepage.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.titlepage.xml deleted file mode 100644 index 7c13dbdaea21089595f6cfd51b414a2565f6ae2e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/column.gap.titlepage.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -column.gap.titlepage -length - - -column.gap.titlepage -Gap between columns on title pages - - - - -12pt - - - -Description - -Specifies the gap between columns on title pages (if -column.count.titlepage is greater than one). - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/compact.list.item.spacing.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/compact.list.item.spacing.xml deleted file mode 100644 index f48f4a628efe282f9f75d9fa53e1ca234c72d086..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/compact.list.item.spacing.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -compact.list.item.spacing -attribute set - - -compact.list.item.spacing -What space do you want between list items (when spacing="compact")? - - - - - 0em - 0em - 0.2em - - -Description -Specify what spacing you want between each list item when -spacing is -compact. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/component.label.includes.part.label.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/component.label.includes.part.label.xml deleted file mode 100644 index 6dd7a6837b1b01d78d17a3fbc67b154d47ee0900..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/component.label.includes.part.label.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -component.label.includes.part.label -boolean - - -component.label.includes.part.label -Do component labels include the part label? - - - - - - -Description - -If non-zero, number labels for chapter, -appendix, and other component elements are prefixed with -the label of the part element that contains them. So you might see -Chapter II.3 instead of Chapter 3. Also, the labels for formal -elements such as table and figure will include -the part label. If there is no part element container, then no prefix -is generated. - - -This feature is most useful when the -label.from.part parameter is turned on. -In that case, there would be more than one chapter -1, and the extra part label prefix will identify -each chapter unambiguously. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/component.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/component.title.properties.xml deleted file mode 100644 index 58cd4b434db42f6503b0a3d6fee1deff3c73b9bb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/component.title.properties.xml +++ /dev/null @@ -1,40 +0,0 @@ - - -component.title.properties -attribute set - - -component.title.properties -Properties for component titles - - - - - - always - - - - false - - - center - start - - - - - - - -Description - -The properties common to all component titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/component.titlepage.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/component.titlepage.properties.xml deleted file mode 100644 index 47179f4f638831dd732c4b72f995b9a3761112d2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/component.titlepage.properties.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -component.titlepage.properties -attribute set - - -component.titlepage.properties -Properties for component titlepages - - - - - - - - - -Description - -The properties that are applied to the outer block containing -all the component title page information. -Its main use is to set a span="all" -property on the block that is a direct child of the flow. - -This attribute-set also applies to index titlepages. It is empty by default. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/contrib.inline.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/contrib.inline.enabled.xml deleted file mode 100644 index 5d5fa99c0c071f42509560f001a1d48108d99b02..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/contrib.inline.enabled.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -contrib.inline.enabled -boolean - - -contrib.inline.enabled -Display contrib output inline? - - - -1 - - -Description - -If non-zero (the default), output of the contrib element is -displayed as inline content rather than as block content. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.mark.bleed.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.mark.bleed.xml deleted file mode 100644 index af3420e86a3308938e2aa2d1b755791ea9c3287a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.mark.bleed.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -crop.mark.bleed -length - - -crop.mark.bleed -Length of invisible part of crop marks. - - - - -6pt - - - -Description - -Length of invisible part of crop marks. Crop marks are controlled by -crop.marks parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.mark.offset.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.mark.offset.xml deleted file mode 100644 index cfd9bd3734619fa72b7cc5ff01925b89da685cf9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.mark.offset.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -crop.mark.offset -length - - -crop.mark.offset -Length of crop marks. - - - - -24pt - - - -Description - -Length of crop marks. Crop marks are controlled by -crop.marks parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.mark.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.mark.width.xml deleted file mode 100644 index 86c28b59f87d3c18430d4488882b9621a611c12d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.mark.width.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -crop.mark.width -length - - -crop.mark.width -Width of crop marks. - - - - -0.5pt - - - -Description - -Width of crop marks. Crop marks are controlled by -crop.marks parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.marks.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.marks.xml deleted file mode 100644 index c68d5a09bcebda75d0562bb0d8573384278935b3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/crop.marks.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -crop.marks -boolean - - -crop.marks -Output crop marks? - - - - - - - - -Description - -If non-zero, crop marks will be added to each page. Currently this -works only with XEP if you have xep.extensions set. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/css.decoration.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/css.decoration.xml deleted file mode 100644 index 02e30266a510eaaa2469fe2471d1929b1dc9a112..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/css.decoration.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -css.decoration -boolean - - -css.decoration -Enable CSS decoration of elements - - - - - - - - -Description - - -If non-zero, then html elements produced by the stylesheet may be -decorated with style attributes. For example, the -li tags produced for list items may include a -fragment of CSS in the style attribute which sets -the CSS property "list-style-type". - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/css.stylesheet.dir.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/css.stylesheet.dir.xml deleted file mode 100644 index e32b17892ff4ce3ea47ccc5639801612cb9e8b15..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/css.stylesheet.dir.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -css.stylesheet.dir -uri - - -css.stylesheet.dir -Default directory for CSS stylesheets - - - - - - - - -Description - -Identifies the default directory for the CSS stylesheet -generated on all the slides. This parameter can be set in the source -document with the <?dbhtml?> pseudo-attribute -css-stylesheet-dir. - -If non-empty, this value is prepended to each of the stylesheets. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/css.stylesheet.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/css.stylesheet.xml deleted file mode 100644 index 2acc66c5773df118a32bfc66b3ea52d723730e4f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/css.stylesheet.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -css.stylesheet -uri - - -css.stylesheet -CSS stylesheet for slides - - - - -slides.css - - - -Description - -Identifies the CSS stylesheet used by all the slides. This parameter -can be set in the source document with the <?dbhtml?> pseudo-attribute -css-stylesheet. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/current.docid.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/current.docid.xml deleted file mode 100644 index 93616f2223a49de98b68b99930123fcfe8b43e00..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/current.docid.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -current.docid -string - - -current.docid -targetdoc identifier for the document being -processed - - - - - -Description - -When olinks between documents are resolved for HTML output, the stylesheet can compute the relative path between the current document and the target document. The stylesheet needs to know the targetdoc identifiers for both documents, as they appear in the target.database.document database file. This parameter passes to the stylesheet -the targetdoc identifier of the current document, since that -identifier does not appear in the document itself. -This parameter can also be used for print output. If an olink's targetdoc id differs from the current.docid, then the stylesheet can append the target document's title to the generated olink text. That identifies to the reader that the link is to a different document, not the current document. See also olink.doctitle to enable that feature. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/currentpage.marker.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/currentpage.marker.xml deleted file mode 100644 index 2bccf301e440ffbe30c4a83fcc5a10b6675dbe63..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/currentpage.marker.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -currentpage.marker -string - - -currentpage.marker -The text symbol used to mark the current page - - - - -@ - - - -Description -Character to use as identifying the current page in - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/custom.css.source.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/custom.css.source.xml deleted file mode 100644 index 24278ad57f757ae13678e3845e6a8e66bb395d79..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/custom.css.source.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - custom.css.source - string - - - custom.css.source - Name of a custom CSS input file - - - - - - - Description - -The custom.css.source -parameter enables you to add CSS styles to DocBook's -HTML output. - -The parameter -specifies the name of a file containing custom -CSS styles. The file must be a well-formed XML file that -consists of a single style root -element that contains CSS styles as its text content. -For example: - - -]]> - -The filename specified by the parameter -should have a .xml -filename suffix, although that is not required. -The default value of this parameter is blank. - -If custom.css.source is not blank, then -the stylesheet takes the following actions. -These actions take place regardless of the value of -the make.clean.html parameter. - - - - The stylesheet uses the XSLT document() - function to open the file specified by the parameter and - load it into a variable. - - - The stylesheet forms an output pathname consisting of the - value of the base.dir parameter (if it is set) - and the value of custom.css.source, - with the .xml suffix stripped off. - - - - The stylesheet removes the style - wrapper element and writes just the CSS text content to the output file. - - - The stylesheet adds a link element to the - HTML HEAD element to reference this external CSS stylesheet. - For example: - <link rel="stylesheet" href="custom.css" type="text/css"> - - - - - - - -If the make.clean.html parameter is nonzero -(the default is zero), -and if the docbook.css.source parameter -is not blank (the default is not blank), -then the stylesheet will also generate a default CSS file -and add a link tag to reference it. -The link to the custom CSS comes after the -link to the default, so it should cascade properly -in most browsers. -If you do not want two link tags, and -instead want your custom CSS to import the default generated -CSS file, then do the following: - - - - - Add a line like the following to your custom CSS source file: - @import url("docbook.css") - - - - Set the docbook.css.link parameter - to zero. This will omit the link tag - that references the default CSS file. - - - -If you set make.clean.html to nonzero but -you do not want the default CSS generated, then also set -the docbook.css.source parameter to blank. -Then no default CSS will be generated, and so -all CSS styles must come from your custom CSS file. - -You can use the generate.css.header -parameter to instead write the CSS to each HTML HEAD -element in a style tag instead of an external CSS file. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.float.class.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.float.class.xml deleted file mode 100644 index 1078b600e4168945a925e928114cc8fa322e3bc3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.float.class.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -default.float.class -string - - -default.float.class -Specifies the default float class - - - - - - - left - before - - - - - -Description - -Selects the direction in which a float should be placed. for -xsl-fo this is before, for html it is left. For Western texts, the -before direction is the top of the page. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.image.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.image.width.xml deleted file mode 100644 index 0e84a72597976e0dddef77c0e6fa161ed2e72d02..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.image.width.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -default.image.width -length - - -default.image.width -The default width of images - - - - - - - - -Description - -If specified, this value will be used for the -width attribute on images that do not specify any -viewport dimensions. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.table.frame.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.table.frame.xml deleted file mode 100644 index 38c8667b9ed55a1dd3475c91a88e3c264f214231..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.table.frame.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -default.table.frame -string - - -default.table.frame -The default framing of tables - - - - -all - - - -Description - -This value will be used when there is no frame attribute on the -table. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.table.rules.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.table.rules.xml deleted file mode 100644 index ed698ec233be89af2e7bb10f8ecfe8fa5d127dd0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.table.rules.xml +++ /dev/null @@ -1,76 +0,0 @@ - - -default.table.rules -string - - -default.table.rules -The default column and row rules for tables using HTML markup - - - - -none - - - -Description - -Tables using HTML markup elements can use an attribute -named rules on the table or -informaltable element -to specify whether column and row border rules should be -displayed. This parameter lets you specify a global default -style for all HTML tables that don't otherwise have -that attribute. -These are the supported values: - - -all - -Rules will appear between all rows and columns. - - - -rows - -Rules will appear between rows only. - - - -cols - -Rules will appear between columns only. - - - -groups - -Rules will appear between row groups (thead, tfoot, tbody). -No support for rules between column groups yet. - - - - -none - -No rules. This is the default value. - - - - - - -The border after the last row and the border after -the last column are not affected by -this setting. Those borders are controlled by -the frame attribute on the table element. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.table.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.table.width.xml deleted file mode 100644 index 184ce52bd2df2d8000004373cdd11ab6abc3f974..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.table.width.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -default.table.width -length - - -default.table.width -The default width of tables - - - - - - -Description -If non-zero, this value will be used for the -width attribute on tables that do not specify an -alternate width (with the dbhtml table-width or -dbfo table-width processing instruction). - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.units.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.units.xml deleted file mode 100644 index f83c82241e21c7119f131d29496627e18a85da44..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/default.units.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -default.units -list -cm -mm -in -pt -pc -px -em - - -default.units -Default units for an unqualified dimension - - - - -pt - - - -Description - -If an unqualified dimension is encountered (for example, in a -graphic width), the default.units will be used for the -units. Unqualified dimensions are not allowed in XSL Formatting Objects. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/dingbat.font.family.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/dingbat.font.family.xml deleted file mode 100644 index f9719cf0a6288ca4eb31e5abcecd8dc0215ebef7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/dingbat.font.family.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -dingbat.font.family -list -open -serif -sans-serif -monospace - - -dingbat.font.family -The font family for copyright, quotes, and other symbols - - - - -serif - - - -Description - -The dingbat font family is used for dingbats. If it is defined -as the empty string, no font change is effected around dingbats. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/docbook.css.link.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/docbook.css.link.xml deleted file mode 100644 index 6d9e6e69255929f76d00284b9a5191ceb9b56df5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/docbook.css.link.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -docbook.css.link -boolean - - -docbook.css.link -Insert a link referencing the default CSS stylesheet - - - - - - - - -Description - -The stylesheets are capable of generating a default -CSS stylesheet file. The parameters -make.clean.html and -docbook.css.source control that feature. - -Normally if a default CSS file is generated, then -the stylesheet inserts a link tag in the HTML -HEAD element to reference it. -However, you can omit that link reference if -you set the docbook.css.link to zero -(1 is the default). - -This parameter is useful when you want to import the -default CSS into a custom CSS file generated using the -custom.css.source parameter. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/docbook.css.source.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/docbook.css.source.xml deleted file mode 100644 index 8ba7eb7685f0a5dbcdde9459d27024ba70869b20..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/docbook.css.source.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - docbook.css.source - string - - - docbook.css.source - Name of the default CSS input file - - - - docbook.css.xml - - - Description - -The docbook.css.source parameter -specifies the name of the file containing the default DocBook -CSS styles. Those styles are necessary when the -make.clean.html parameter is nonzero. - -The file is a well-formed XML file that -must consist of a single style root -element that contains CSS styles as its text content. -The default value of the parameter (and filename) -is docbook.css.xml. -The stylesheets ship with the default file. You can substitute -your own and specify its path in this parameter. - -If docbook.css.source is not blank, -and make.clean.html is nonzero, then -the stylesheet takes the following actions: - - - - The stylesheet uses the XSLT document() - function to open the file specified by the parameter and - load it into a variable. - - - The stylesheet forms an output pathname consisting of the - value of the base.dir parameter (if it is set) - and the value of docbook.css.source, - with the .xml suffix stripped off. - - - - The stylesheet removes the style - wrapper element and writes just the CSS text content to the output file. - - - The stylesheet adds a link element to the - HTML HEAD element to reference the external CSS stylesheet. - For example: - <link rel="stylesheet" href="docbook.css" type="text/css"> - - However, if the docbook.css.link - parameter is set to zero, then no link is written - for the default CSS file. That is useful if a custom - CSS file will import the default CSS stylesheet to ensure - proper cascading of styles. - - - -If the docbook.css.source parameter -is changed from its default docbook.css.xml to blank, -then no default CSS is generated. Likewise if the -make.clean.html parameter is set to zero, -then no default CSS is generated. The -custom.css.source parameter can be used -instead to generate a complete custom CSS file. - -You can use the generate.css.header -parameter to instead write the CSS to each HTML HEAD -element in a style tag instead of an external CSS file. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/double.sided.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/double.sided.xml deleted file mode 100644 index 3758f1ffc5c707534e9075faeaf292e41ff9398c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/double.sided.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -double.sided -boolean - - -double.sided -Is the document to be printed double sided? - - - - - - - - -Description - -Double-sided documents are printed with a slightly wider margin -on the binding edge of the page. - -FIXME: The current set of parameters does not take writing direction -into account. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/draft.mode.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/draft.mode.xml deleted file mode 100644 index 2f62d06efd292bb31ea5643a2ff3fa0401819767..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/draft.mode.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -draft.mode -list -no -yes -maybe - - -draft.mode -Select draft mode - - - - -no - - - -Description - -Selects draft mode. If draft.mode is -yes, the entire document will be treated -as a draft. If it is no, the entire document -will be treated as a final copy. If it is maybe, -individual sections will be treated as draft or final independently, depending -on how their status attribute is set. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/draft.watermark.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/draft.watermark.image.xml deleted file mode 100644 index ef053a0dfa2a091da270beecbba8c782c6592969..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/draft.watermark.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -draft.watermark.image -uri - - -draft.watermark.image -The URI of the image to be used for draft watermarks - - - - -images/draft.png - - - -Description - -The image to be used for draft watermarks. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/dry-run.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/dry-run.xml deleted file mode 100644 index dd481c39b124c0fabb88aa2447cbfc00676104d9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/dry-run.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -dry-run -boolean - - -dry-run -Indicates that no files should be produced - - - - - - -Description -When using the XSLT processor to manage dependencies and construct -the website, this parameter can be used to suppress the generation of -new and updated files. Effectively, this allows you to see what the -stylesheet would do, without actually making any changes. -Only applies when XSLT-based chunking is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/dynamic.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/dynamic.toc.xml deleted file mode 100644 index 232f19e1318d80b8c70f45f5b0377923ad51d907..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/dynamic.toc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -dynamic.toc -boolean - - -dynamic.toc -Dynamic ToCs? - - - - - - - - -Description - -If non-zero, JavaScript is used to make the ToC panel dynamic. -In a dynamic ToC, each section in the ToC can be expanded and collapsed by -clicking on the appropriate image. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.assignment.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.assignment.xml deleted file mode 100644 index 5c8974868444d64e28e0ebd2387ae4d30319822f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.assignment.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -ebnf.assignment -rtf - - -ebnf.assignment -The EBNF production assignment operator - - - - - -::= - - - - ::= - - - - - -Description - -The ebnf.assignment parameter determines what -text is used to show assignment in productions -in productionsets. - -While ::= is common, so are several -other operators. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.statement.terminator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.statement.terminator.xml deleted file mode 100644 index 4e8bd12486fefe93f55832d4f6b727fcfe1e32a1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.statement.terminator.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -ebnf.statement.terminator -rtf - - -ebnf.statement.terminator -Punctuation that ends an EBNF statement. - - - - - - - - - -Description - -The ebnf.statement.terminator parameter determines what -text is used to terminate each production -in productionset. - -Some notations end each statement with a period. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.table.bgcolor.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.table.bgcolor.xml deleted file mode 100644 index 747f14006d798843e121800035fefa6fcd46bc75..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.table.bgcolor.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -ebnf.table.bgcolor -color - - -ebnf.table.bgcolor -Background color for EBNF tables - - - - -#F5DCB3 - - - -Description - -Sets the background color for EBNF tables (a pale brown). No -bgcolor attribute is output if -ebnf.table.bgcolor is set to the null string. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.table.border.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.table.border.xml deleted file mode 100644 index e4e50aee01cd3326a39461dfcc1c69a1da436da7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ebnf.table.border.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -ebnf.table.border -boolean - - -ebnf.table.border -Selects border on EBNF tables - - - - - - -Description - -Selects the border on EBNF tables. If non-zero, the tables have -borders, otherwise they don't. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.autolabel.xml deleted file mode 100644 index 622196e58e5fea227cd8e4e5c814c60ab7d87406..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.autolabel.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -eclipse.autolabel -boolean - - -eclipse.autolabel -Should tree-like ToC use autonumbering feature? - - - - - - - - -Description - -If you want to include chapter and section numbers into ToC in -the left panel, set this parameter to 1. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.plugin.id.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.plugin.id.xml deleted file mode 100644 index 75557e55d8eeac407e14062157ecf257cce6a4ee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.plugin.id.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -eclipse.plugin.id -string - - -eclipse.plugin.id -Eclipse Help plugin id - - - - -com.example.help - - - -Description - -Eclipse Help plugin id. You should change this id to something -unique for each help. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.plugin.name.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.plugin.name.xml deleted file mode 100644 index 0df83ec6652b237ca0f96f85538537edbd80bfcb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.plugin.name.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -eclipse.plugin.name -string - - -eclipse.plugin.name -Eclipse Help plugin name - - - - -DocBook Online Help Sample - - - -Description - -Eclipse Help plugin name. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.plugin.provider.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.plugin.provider.xml deleted file mode 100644 index 03261fe5ccd0a2acf93b07dbcfe3eca62f06f4a5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/eclipse.plugin.provider.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -eclipse.plugin.provider -string - - -eclipse.plugin.provider -Eclipse Help plugin provider name - - - - -Example provider - - - -Description - -Eclipse Help plugin provider name. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/editedby.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/editedby.enabled.xml deleted file mode 100644 index 78089f95aba5421bbb8fe8fa599607878115d4c7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/editedby.enabled.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -editedby.enabled -boolean - - -editedby.enabled -Display “Edited by†heading above editor name? - - - -1 - - -Description - -If non-zero, a localized Edited -by heading is displayed above editor names in output of the -editor element. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/email.delimiters.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/email.delimiters.enabled.xml deleted file mode 100644 index b07cd6d1b8c6174f548f7183a7367de3174bfc97..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/email.delimiters.enabled.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -email.delimiters.enabled -boolean - - -email.delimiters.enabled -Generate delimiters around email addresses? - - - - - - - - -Description - -If non-zero, delimiters - -For delimiters, the -stylesheets are currently hard-coded to output angle -brackets. - -are generated around e-mail addresses -(the output of the email element). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/email.mailto.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/email.mailto.enabled.xml deleted file mode 100644 index e4eb8d108bd85ba501518578ada005386992cbed..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/email.mailto.enabled.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -email.mailto.enabled -boolean - - -email.mailto.enabled -Generate mailto: links for email addresses? - - - - - - - - -Description - -If non-zero the generated output for the email element -will be a clickable mailto: link that brings up the default mail client -on the system. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/emphasis.propagates.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/emphasis.propagates.style.xml deleted file mode 100644 index 9ff55f525538b30c186d308ebf344b20da80a03f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/emphasis.propagates.style.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -emphasis.propagates.style -boolean - - -emphasis.propagates.style -Pass emphasis role attribute through to HTML? - - - - - - -Description -If non-zero, the role attribute of -emphasis elements will be passed through to the HTML as a -class attribute on a span that surrounds the -emphasis. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/entry.propagates.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/entry.propagates.style.xml deleted file mode 100644 index 7f43c66ebeee26ed72e335ecfdf5424d202838d2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/entry.propagates.style.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -entry.propagates.style -boolean - - -entry.propagates.style -Pass entry role attribute through to HTML? - - - - - - - - -Description - -If true, the role attribute of entry elements -will be passed through to the HTML as a class attribute on the -td or th generated for the table -cell. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/epub.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/epub.autolabel.xml deleted file mode 100644 index 8a645558298ec896141ba619fc1dfd02a0024431..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/epub.autolabel.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -epub.autolabel -boolean - - -epub.autolabel -Should tree-like ToC use autonumbering feature? - - - - - - - - -Description - -If you want to include chapter and section numbers into ToC in, -set this parameter to 1. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/equation.number.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/equation.number.properties.xml deleted file mode 100644 index 6e05d398a02ec75d69230eebda16c296a22d7ccf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/equation.number.properties.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -equation.number.properties -attribute set - - -equation.number.properties -Properties that apply to the fo:table-cell containing the number -of an equation that does not have a title. - - - - - end - center - - -Description -Properties that apply to the fo:table-cell containing the number -of an equation when it has no title. The number in an equation with a -title is formatted along with the title, and this attribute-set does not apply. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/equation.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/equation.properties.xml deleted file mode 100644 index a88f6837faeeba946d2bafca5c0715106377ea51..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/equation.properties.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -equation.properties -attribute set - - -equation.properties -Properties associated with a equation - - - - - - - - -Description - -The styling for equations. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/example.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/example.properties.xml deleted file mode 100644 index 53e695b4dfbc9b2a0187698d06a4c44b49eeb5cd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/example.properties.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -example.properties -attribute set - - -example.properties -Properties associated with a example - - - - - - - - -Description - -The styling for examples. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/exsl.node.set.available.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/exsl.node.set.available.xml deleted file mode 100644 index c5d009e037d5546b4773dced0ff1bdfff0fb5d31..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/exsl.node.set.available.xml +++ /dev/null @@ -1,44 +0,0 @@ - - -exsl.node.set.available -boolean - - -exsl.node.set.available -Is the test function-available('exsl:node-set') true? - - - - - - 1 - 0 - - - - - -Description - -If non-zero, -then the exsl:node-set() function is available to be used in -the stylesheet. -If zero, then the function is not available. -This param automatically detects the presence of -the function and does not normally need to be set manually. - -This param was created to handle a long-standing -bug in the Xalan processor that fails to detect the -function even though it is available. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/feedback.href.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/feedback.href.xml deleted file mode 100644 index bc37dafe29fd658678e6897b42d3ac5f9f593cdb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/feedback.href.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -feedback.href -uri - - -feedback.href -HREF (URI) for feedback link - - - - - - - - -Description -The feedback.href value is used as the value -for the href attribute on the feedback -link. If feedback.href -is empty, no feedback link is generated. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/feedback.link.text.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/feedback.link.text.xml deleted file mode 100644 index c80feefaa9127a734cc24950abd7cee5653a4df1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/feedback.link.text.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -feedback.link.text -string - - -feedback.link.text -The text of the feedback link - - - - -Feedback - - - -Description -The contents of this variable is used as the text of the feedback -link if feedback.href is not empty. If -feedback.href is empty, no feedback link is -generated. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/feedback.with.ids.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/feedback.with.ids.xml deleted file mode 100644 index 3edfa260ee875bd79ff3d91dff59d5b783a18021..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/feedback.with.ids.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -feedback.with.ids -boolean - - -feedback.with.ids -Toggle use of IDs in feedback - - - - - - - - -Description -If feedback.with.ids is non-zero, the ID of the -current page will be added to the feedback link. This can be used, for -example, if the feedback.href is a CGI script. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/figure.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/figure.properties.xml deleted file mode 100644 index e9f6748acfa75c71b47e47e14b3ae839d82010e4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/figure.properties.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -figure.properties -attribute set - - -figure.properties -Properties associated with a figure - - - - - - - - -Description - -The styling for figures. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/filename-prefix.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/filename-prefix.xml deleted file mode 100644 index 54c043d3db6469ff9895ab827fa5a83524b8051e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/filename-prefix.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -filename-prefix -string - - -filename-prefix -Prefix added to all filenames - - - - - - - - -Description -To produce the text-only (that is, non-tabular) layout -of a website simultaneously with the tabular layout, the filenames have to -be distinguished. That's accomplished by adding the -filename-prefix to the front of each filename. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/firstterm.only.link.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/firstterm.only.link.xml deleted file mode 100644 index 32ea30538810ff37398e07847ce4d281db8c6c71..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/firstterm.only.link.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -firstterm.only.link -boolean - - -firstterm.only.link -Does automatic glossterm linking only apply to firstterms? - - - - - - - - -Description - -If non-zero, only firstterms will be automatically linked -to the glossary. If glossary linking is not enabled, this parameter -has no effect. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.properties.xml deleted file mode 100644 index 11ad146bbbc7652e90580b1afab5c8e0cdd0a909..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.properties.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -foil.properties -attribute set - - -foil.properties -Specifies properties for all foils - - - - - - - - - 1in - 1in - - - - bold - - - - -Description - -This parameter specifies properties that are applied to all foils. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.subtitle.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.subtitle.properties.xml deleted file mode 100644 index 4832fbe34ad5c929c88206cd7175594835f22f56..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.subtitle.properties.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -foil.subtitle.properties -attribute set - - -foil.subtitle.properties -Specifies properties for all foil subtitles - - - - - - - - - center - - pt - - 12pt - - - - -Description - -This parameter specifies properties that are applied to all foil subtitles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.title.master.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.title.master.xml deleted file mode 100644 index f5ba07f32824daeef7b5a7aa23d8481353974f6d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.title.master.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -foil.title.master -number - - -foil.title.master -Specifies unitless font size to use for foil titles - - - - -36 - - - - -Description - -Specifies a unitless font size to use for foil titles; used in -combination with the foil.title.size -parameter. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.title.size.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.title.size.xml deleted file mode 100644 index 3163600ff6555da33cbbc4153d109174f8eefe1c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foil.title.size.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -foil.title.size -length - - -foil.title.size -Specifies font size to use for foil titles, including units - - - - - - pt - - - - -Description - -This parameter combines the value of the -foil.title.master parameter with a unit -specification. The default unit is pt -(points). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foilgroup.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foilgroup.properties.xml deleted file mode 100644 index cd9805a4692de1b9ec2d50cce9a2ca69361f7447..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foilgroup.properties.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -foilgroup.properties -attribute set - - -foilgroup.properties -Specifies properties for all foilgroups - - - - - - - - - - - - -Description - -This parameter specifies properties that are applied to all foilgroups. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foilgroup.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foilgroup.toc.xml deleted file mode 100644 index 31d7cb342aae4cade6e10890f393ddae05242488..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/foilgroup.toc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -foilgroup.toc -boolean - - -foilgroup.toc -Put ToC on foilgroup pages? - - - - - - - - -Description - -If non-zero, a ToC will be placed on foilgroup pages (after any -other content). - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.column.widths.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.column.widths.xml deleted file mode 100644 index eca22705959c1b672a27076d18012901e78e9dde..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.column.widths.xml +++ /dev/null @@ -1,80 +0,0 @@ - - -footer.column.widths -string - - -footer.column.widths -Specify relative widths of footer areas - - - -1 1 1 - - -Description - -Page footers in print output use a three column table -to position text at the left, center, and right side of -the footer on the page. -This parameter lets you specify the relative sizes of the -three columns. The default value is -"1 1 1". - -The parameter value must be three numbers, separated -by white space. The first number represents the relative -width of the inside footer for -double-sided output. The second number is the relative -width of the center footer. The third number is the -relative width of the outside footer for -double-sided output. - -For single-sided output, the first number is the -relative width of left footer for left-to-right -text direction, or the right footer for right-to-left -text direction. -The third number is the -relative width of right footer for left-to-right -text direction, or the left footer for right-to-left -text direction. - -The numbers are used to specify the column widths -for the table that makes up the footer area. -In the FO output, this looks like: - - - -<fo:table-column column-number="1" - column-width="proportional-column-width(1)"/> - - - -The proportional-column-width() -function computes a column width by dividing its -argument by the total of the arguments for all the columns, and -then multiplying the result by the width of the whole table -(assuming all the column specs use the function). -Its argument can be any positive integer or floating point number. -Zero is an acceptable value, although some FO processors -may warn about it, in which case using a very small number might -be more satisfactory. - - -For example, the value "1 2 1" means the center -footer should have twice the width of the other areas. -A value of "0 0 1" means the entire footer area -is reserved for the right (or outside) footer text. -Note that to keep the center area centered on -the page, the left and right values must be -the same. A specification like "1 2 3" means the -center area is no longer centered on the page -since the right area is three times the width of the left area. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.content.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.content.properties.xml deleted file mode 100644 index 1212cbd16cd79c6e8763f92f146c89921ac874ff..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.content.properties.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -footer.content.properties -attribute set - - -footer.content.properties -Properties of page footer content - - - - - - - - - - - - - - - -Description - -Properties of page footer content. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.hr.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.hr.xml deleted file mode 100644 index d1a5bf8f96e59f4662ec643cecdb7defce4d2dee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.hr.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -footer.hr -boolean - - -footer.hr -Toggle <HR> before footer - - - - - - - - -Description -If non-zero, an <HR> is generated at the bottom of each web page, -before the footer. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.rule.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.rule.xml deleted file mode 100644 index 6b00adeaede3b568ad68550785c0e2c1284f1687..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.rule.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -footer.rule -boolean - - -footer.rule -Rule over footers? - - - - - - - - -Description - -If non-zero, a rule will be drawn above the page footers. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.table.height.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.table.height.xml deleted file mode 100644 index 2f6c45e51a990d3de723b001418f71b100250767..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.table.height.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -footer.table.height -length - - -footer.table.height -Specify the minimum height of the table containing the running page footers - - - -14pt - - -Description - -Page footers in print output use a three column table -to position text at the left, center, and right side of -the footer on the page. -This parameter lets you specify the minimum height -of the single row in the table. -Since this specifies only the minimum height, -the table should automatically grow to fit taller content. -The default value is "14pt". - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.table.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.table.properties.xml deleted file mode 100644 index 12e67d3ed6b90d1e133865a355c3a1a82e8ef4d8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footer.table.properties.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -footer.table.properties -attribute set - - -footer.table.properties -Apply properties to the footer layout table - - - - - - fixed - 100% - - - - -Description - -Properties applied to the table that lays out the page footer. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footers.on.blank.pages.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footers.on.blank.pages.xml deleted file mode 100644 index 2964f7817d7a109c50e48d2d2c7adbea36570bd2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footers.on.blank.pages.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -footers.on.blank.pages -boolean - - -footers.on.blank.pages -Put footers on blank pages? - - - - - - - - -Description - -If non-zero, footers will be placed on blank pages. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.font.size.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.font.size.xml deleted file mode 100644 index 88d0c0b22b4937865a5c1e607c2312a50226dc69..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.font.size.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -footnote.font.size -length - - -footnote.font.size -The font size for footnotes - - - - - pt - - - -Description - -The footnote font size is used for...footnotes! - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.mark.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.mark.properties.xml deleted file mode 100644 index 2dbc9c108c22b9a43455db7a64a0cd864997a1be..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.mark.properties.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -footnote.mark.properties -attribute set - - -footnote.mark.properties -Properties applied to each footnote mark - - - - - - - - 75% - normal - normal - - - - -Description - -This attribute set is applied to the footnote mark used -for each footnote. -It should contain only inline properties. - - -The property to make the mark a superscript is contained in the -footnote template itself, because the current version of FOP reports -an error if baseline-shift is used. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.number.format.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.number.format.xml deleted file mode 100644 index c323720cba265c6f73aa67af43daea74f55ba948..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.number.format.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -footnote.number.format -Identifies the format used for footnote numbers - - - - -1 - - - -Description - -The footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.number.symbols.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.number.symbols.xml deleted file mode 100644 index 10ca7d3cac530b22755e0a01bcd1c5008381467a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.number.symbols.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -footnote.number.symbols - - - -footnote.number.symbols -Special characters to use as footnote markers - - - - - - - - -Description - -If footnote.number.symbols is not the empty string, -footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, †, ‡, -â—Š, and ✠. If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.properties.xml deleted file mode 100644 index f62adee84b4e225071c494de12d31d7c638af97f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.properties.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -footnote.properties -attribute set - - -footnote.properties -Properties applied to each footnote body - - - - - - - - - normal - normal - - 0pt - 0pt - - wrap - treat-as-space - - - - -Description - -This attribute set is applied to the footnote-block -for each footnote. -It can be used to set the -font-size, font-family, and other inheritable properties that will be -applied to all footnotes. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.sep.leader.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.sep.leader.properties.xml deleted file mode 100644 index 27f9489d08cd3cab58465264380763c7f0b41145..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/footnote.sep.leader.properties.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -footnote.sep.leader.properties -attribute set - - -footnote.sep.leader.properties -Properties associated with footnote separators - - - - - - black - rule - 1in - - - - -Description - -The styling for the rule line that separates the -footnotes from the body text. -These are properties applied to the fo:leader used as -the separator. - -If you want to do more than just set properties on -the leader element, then you can customize the template -named footnote.separator in -fo/pagesetup.xsl. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/fop.extensions.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/fop.extensions.xml deleted file mode 100644 index e122368bce9dc65de32c6139864d3219b7a80cf0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/fop.extensions.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -fop.extensions -boolean - - -fop.extensions -Enable extensions for FOP version 0.20.5 and earlier - - - - - - -Description - -If non-zero, extensions intended for -FOP -version 0.20.5 and earlier will be used. -At present, this consists of PDF bookmarks. - - -This parameter can also affect which graphics file formats -are supported. - -If you are using a version of FOP beyond -version 0.20.5, then use the fop1.extensions parameter -instead. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/fop1.extensions.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/fop1.extensions.xml deleted file mode 100644 index dcbcf5be8427d2c496bcd261d2d08925ff23ea47..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/fop1.extensions.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -fop1.extensions -boolean - - -fop1.extensions -Enable extensions for FOP version 0.90 and later - - - - - - -Description - -If non-zero, extensions for -FOP -version 0.90 and later will be used. - - -This parameter can also affect which graphics file formats -are supported. - -The original fop.extensions parameter -should still be used for FOP version 0.20.5 and earlier. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.object.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.object.properties.xml deleted file mode 100644 index f36aeaf71a78bc972f29e7e28b74075de35ebdce..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.object.properties.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -formal.object.properties -attribute set - - -formal.object.properties -Properties associated with a formal object such as a figure, or other component that has a title - - - - - - 0.5em - 1em - 2em - 0.5em - 1em - 2em - always - - - - -Description - -The styling for formal objects in docbook. Specify the spacing -before and after the object. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.procedures.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.procedures.xml deleted file mode 100644 index 4f1088577479910b67bdcd0632c692e477c963a3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.procedures.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -formal.procedures -boolean - - -formal.procedures -Selects formal or informal procedures - - - - - - - - -Description - -Formal procedures are numbered and always have a title. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.title.placement.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.title.placement.xml deleted file mode 100644 index e56f200100e1c5df285eaecf93f620dd9cf35454..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.title.placement.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -formal.title.placement -table - - -formal.title.placement -Specifies where formal object titles should occur - - - - - -figure before -example before -equation before -table before -procedure before -task before - - - - -Description - -Specifies where formal object titles should occur. For each formal object -type (figure, -example, -equation, -table, and procedure) -you can specify either the keyword -before or -after. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.title.properties.xml deleted file mode 100644 index 898d57292e4316b4ac75e1c128a1d4df59eb3ef5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/formal.title.properties.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -formal.title.properties -attribute set - - -formal.title.properties -Style the title element of formal object such as a figure. - - - - - - bold - - - pt - - false - 0.4em - 0.6em - 0.8em - - - -Description -Specify how the title should be styled. Specify the font size and weight of the title of the formal object. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/funcsynopsis.decoration.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/funcsynopsis.decoration.xml deleted file mode 100644 index 44037c3991e93caa4701827f7785a80c1c19b3ac..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/funcsynopsis.decoration.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -funcsynopsis.decoration -boolean - - -funcsynopsis.decoration -Decorate elements of a funcsynopsis? - - - - - - - - -Description - -If non-zero, elements of the funcsynopsis will be -decorated (e.g. rendered as bold or italic text). The decoration is controlled by -templates that can be redefined in a customization layer. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/funcsynopsis.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/funcsynopsis.style.xml deleted file mode 100644 index fc3ad85cb972025ef83ae402ee54604c0f10dcee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/funcsynopsis.style.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -funcsynopsis.style -list -ansi -kr - - -funcsynopsis.style -What style of funcsynopsis should be generated? - - - -kr - - -Description - -If funcsynopsis.style is ansi, -ANSI-style function synopses are generated for a -funcsynopsis, otherwise K&R-style -function synopses are generated. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/function.parens.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/function.parens.xml deleted file mode 100644 index 15d6df078b1a2480c87fc7f6f055424ce578c2e0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/function.parens.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -function.parens -boolean - - -function.parens -Generate parens after a function? - - - - - - - - -Description - -If non-zero, the formatting of a function element -will include generated parentheses. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.css.header.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.css.header.xml deleted file mode 100644 index 05965c10ae9888d284870bdcf66aea72d9bc0768..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.css.header.xml +++ /dev/null @@ -1,40 +0,0 @@ - - -generate.css.header -boolean - - -generate.css.header -Insert generated CSS styles in HEAD element - - - - - - - - -Description - -The stylesheets are capable of generating both default -and custom CSS stylesheet files. The parameters -make.clean.html, -docbook.css.source, and -custom.css.source control that feature. - -If you require that CSS styles reside in the HTML -HEAD element instead of external CSS files, -then set the generate.css.header -parameter to nonzero (it is zero by default). -Then instead of generating the CSS in external files, -they are wrapped in style elements in -the HEAD element of each HTML output file. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.id.attributes.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.id.attributes.xml deleted file mode 100644 index 6326841d61aebf119da54b47eff8f62959799ab7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.id.attributes.xml +++ /dev/null @@ -1,59 +0,0 @@ - - -generate.id.attributes -boolean - - -generate.id.attributes -Generate ID attributes on container elements? - - - - - - - - -Description - -If non-zero, the HTML stylesheet will generate ID attributes on -containers. For example, the markup: - -<section id="foo"><title>Some Title</title> -<para>Some para.</para> -</section> - -might produce: - -<div class="section" id="foo"> -<h2>Some Title</h2> -<p>Some para.</p> -</div> - -The alternative is to generate anchors: - -<div class="section"> -<h2><a name="foo"></a>Some Title</h2> -<p>Some para.</p> -</div> - -Because the name attribute of -the a element and the id -attribute of other tags are both of type ID, producing both -generates invalid documents. - -As of version 1.50, you can use this switch to control which type of -identifier is generated. For backwards-compatibility, generating -a anchors is preferred. - -Note: at present, this switch is incompletely implemented. -Disabling ID attributes will suppress them, but enabling ID attributes -will not suppress the anchors. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.index.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.index.xml deleted file mode 100644 index 8cab3508548cecd785f5b30d02be16952deca503..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.index.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -generate.index -boolean - - -generate.index -Do you want an index? - - - - - - -Description - -Specify if an index should be generated. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.legalnotice.link.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.legalnotice.link.xml deleted file mode 100644 index 534e050504f072528d84d5ba792136bf24fd2afb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.legalnotice.link.xml +++ /dev/null @@ -1,72 +0,0 @@ - - -generate.legalnotice.link -boolean - - -generate.legalnotice.link -Write legalnotice to separate chunk and generate link? - - - - - - -Description - -If the value of generate.legalnotice.link -is non-zero, the stylesheet: - - - - writes the contents of legalnotice to a separate - HTML file - - - inserts a hyperlink to the legalnotice file - - - adds (in the HTML head) either a single - link or element or multiple - link elements (depending on the value of the - html.head.legalnotice.link.multiple - parameter), with the value or values derived from the - html.head.legalnotice.link.types - parameter - - - - Otherwise, if generate.legalnotice.link is - zero, legalnotice contents are rendered on the title - page. - -The name of the separate HTML file is computed as follows: - - - - If a filename is given by the dbhtml filename -processing instruction, that filename is used. - - - If the legalnotice has an id/xml:id -attribute, and if use.id.as.filename != 0, the filename -is the concatenation of the id value and the value of the html.ext -parameter. - - - If the legalnotice does not have an id/xml:id - attribute, or if use.id.as.filename = 0, the filename is the concatenation of "ln-", -auto-generated id value, and html.ext value. - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.manifest.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.manifest.xml deleted file mode 100644 index b561c36096fea6224591baedb366888a106fe05b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.manifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - generate.manifest - boolean - - - generate.manifest - Generate a manifest file? - - - - - - - Description - - If non-zero, a list of HTML files generated by the - stylesheet transformation is written to the file named by - the manifest parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.meta.abstract.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.meta.abstract.xml deleted file mode 100644 index d3ca138d3e3b13204351ea6df690e3ea2c70ae8c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.meta.abstract.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -generate.meta.abstract -boolean - - -generate.meta.abstract -Generate HTML META element from abstract? - - - - - - - - -Description - -If non-zero, document abstracts will be reproduced in the HTML -head, with >meta name="description" content="..." - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.revhistory.link.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.revhistory.link.xml deleted file mode 100644 index bd70cd91d714838051ff4c12ac2ad413d1018dd7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.revhistory.link.xml +++ /dev/null @@ -1,50 +0,0 @@ - - -generate.revhistory.link -boolean - - -generate.revhistory.link -Write revhistory to separate chunk and generate link? - - - - - - -Description - -If non-zero, the contents of revhistory are written -to a separate HTML file and a link to the file is -generated. Otherwise, revhistory contents are rendered on -the title page. - -The name of the separate HTML file is computed as follows: - - - - If a filename is given by the dbhtml filename processing instruction, -that filename is used. - - - If the revhistory has an id/xml:id -attribute, and if use.id.as.filename != 0, the filename is the concatenation of -the id value and the value of the html.ext parameter. - - - If the revhistory does not have an id/xml:id -attribute, or if use.id.as.filename = 0, the filename is the concatenation of "rh-", -auto-generated id value, and html.ext value. - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.section.toc.level.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.section.toc.level.xml deleted file mode 100644 index 227735a159e1a589e868fd2b7a6c04ac2727dbcf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.section.toc.level.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -generate.section.toc.level -integer - - -generate.section.toc.level -Control depth of TOC generation in sections - - - - - - - - -Description - -The generate.section.toc.level parameter -controls the depth of section in which TOCs will be generated. Note -that this is related to, but not the same as -toc.section.depth, which controls the depth to -which TOC entries will be generated in a given TOC. -If, for example, generate.section.toc.level -is 3, TOCs will be generated in first, second, and third -level sections, but not in fourth level sections. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.toc.xml deleted file mode 100644 index d23c45e63a4668f7a452b174bac9f2454dd33589..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/generate.toc.xml +++ /dev/null @@ -1,108 +0,0 @@ - - -generate.toc -table - - -generate.toc -Control generation of ToCs and LoTs - - - - - -appendix toc,title -article/appendix nop -article toc,title -book toc,title,figure,table,example,equation -chapter toc,title -part toc,title -preface toc,title -qandadiv toc -qandaset toc -reference toc,title -sect1 toc -sect2 toc -sect3 toc -sect4 toc -sect5 toc -section toc -set toc,title - - -/appendix toc,title -article/appendix nop -/article toc,title -book toc,title,figure,table,example,equation -/chapter toc,title -part toc,title -/preface toc,title -reference toc,title -/sect1 toc -/sect2 toc -/sect3 toc -/sect4 toc -/sect5 toc -/section toc -set toc,title - - - - -Description - -This parameter has a structured value. It is a table of space-delimited -path/value pairs. Each path identifies some element in the source document -using a restricted subset of XPath (only the implicit child axis, no wildcards, -no predicates). Paths can be either relative or absolute. - -When processing a particular element, the stylesheets consult this table to -determine if a ToC (or LoT(s)) should be generated. - -For example, consider the entry: - -book toc,figure - -This indicates that whenever a book is formatted, a -Table Of Contents and a List of Figures should be generated. Similarly, - -/chapter toc - -indicates that whenever a document that has a root -of chapter is formatted, a Table of -Contents should be generated. The entry chapter would match -all chapters, but /chapter matches only chapter -document elements. - -Generally, the longest match wins. So, for example, if you want to distinguish -articles in books from articles in parts, you could use these two entries: - -book/article toc,figure -part/article toc - -Note that an article in a part can never match a book/article, -so if you want nothing to be generated for articles in parts, you can simply leave -that rule out. - -If you want to leave the rule in, to make it explicit that you're turning -something off, use the value nop. For example, the following -entry disables ToCs and LoTs for articles: - -article nop - -Do not simply leave the word article in the file -without a matching value. That'd be just begging the silly little -path/value parser to get confused. - -Section ToCs are further controlled by the -generate.section.toc.level parameter. -For a given section level to have a ToC, it must have both an entry in -generate.toc and be within the range enabled by -generate.section.toc.level. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossary.as.blocks.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossary.as.blocks.xml deleted file mode 100644 index e18ed19abc8904624576bcdf72ce84274b900359..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossary.as.blocks.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -glossary.as.blocks -boolean - - -glossary.as.blocks -Present glossarys using blocks instead of lists? - - - - - - - - -Description - -If non-zero, glossarys will be formatted as -blocks. - -If you have long glossterms, proper list -markup in the FO case may produce unattractive lists. By setting this -parameter, you can force the stylesheets to produce block markup -instead of proper lists. - -You can override this setting with a processing instruction as the -child of glossary: dbfo -glossary-presentation="blocks" or dbfo -glossary-presentation="list" - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossary.collection.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossary.collection.xml deleted file mode 100644 index 6f9828bddf160848ac3c56765f8eacad223f281d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossary.collection.xml +++ /dev/null @@ -1,252 +0,0 @@ - - -glossary.collection -string - - -glossary.collection -Name of the glossary collection file - - - - - - - - -Description - -Glossaries maintained independently across a set of documents -are likely to become inconsistent unless considerable effort is -expended to keep them in sync. It makes much more sense, usually, to -store all of the glossary entries in a single place and simply -extract the ones you need in each document. - -That's the purpose of the -glossary.collection parameter. To setup a global -glossary database, follow these steps: - -Setting Up the Glossary Database - -First, create a stand-alone glossary document that contains all of -the entries that you wish to reference. Make sure that each glossary -entry has an ID. - -Here's an example glossary: - - - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE glossary - PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -<glossary> -<glossaryinfo> -<editor><firstname>Eric</firstname><surname>Raymond</surname></editor> -<title>Jargon File 4.2.3 (abridged)</title> -<releaseinfo>Just some test data</releaseinfo> -</glossaryinfo> - -<glossdiv><title>0</title> - -<glossentry> -<glossterm>0</glossterm> -<glossdef> -<para>Numeric zero, as opposed to the letter `O' (the 15th letter of -the English alphabet). In their unmodified forms they look a lot -alike, and various kluges invented to make them visually distinct have -compounded the confusion. If your zero is center-dotted and letter-O -is not, or if letter-O looks almost rectangular but zero looks more -like an American football stood on end (or the reverse), you're -probably looking at a modern character display (though the dotted zero -seems to have originated as an option on IBM 3270 controllers). If -your zero is slashed but letter-O is not, you're probably looking at -an old-style ASCII graphic set descended from the default typewheel on -the venerable ASR-33 Teletype (Scandinavians, for whom /O is a letter, -curse this arrangement). (Interestingly, the slashed zero long -predates computers; Florian Cajori's monumental "A History of -Mathematical Notations" notes that it was used in the twelfth and -thirteenth centuries.) If letter-O has a slash across it and the zero -does not, your display is tuned for a very old convention used at IBM -and a few other early mainframe makers (Scandinavians curse <emphasis>this</emphasis> -arrangement even more, because it means two of their letters collide). -Some Burroughs/Unisys equipment displays a zero with a <emphasis>reversed</emphasis> -slash. Old CDC computers rendered letter O as an unbroken oval and 0 -as an oval broken at upper right and lower left. And yet another -convention common on early line printers left zero unornamented but -added a tail or hook to the letter-O so that it resembled an inverted -Q or cursive capital letter-O (this was endorsed by a draft ANSI -standard for how to draw ASCII characters, but the final standard -changed the distinguisher to a tick-mark in the upper-left corner). -Are we sufficiently confused yet?</para> -</glossdef> -</glossentry> - -<glossentry> -<glossterm>1TBS</glossterm> -<glossdef> -<para role="accidence"> -<phrase role="pronounce"></phrase> -<phrase role="partsofspeach">n</phrase> -</para> -<para>The "One True Brace Style"</para> -<glossseealso>indent style</glossseealso> -</glossdef> -</glossentry> - -<!-- ... --> - -</glossdiv> - -<!-- ... --> - -</glossary> - - - - -Marking Up Glossary Terms - -That takes care of the glossary database, now you have to get the entries -into your document. Unlike bibliography entries, which can be empty, creating -placeholder glossary entries would be very tedious. So instead, -support for glossary.collection relies on implicit linking. - -In your source document, simply use firstterm and -glossterm to identify the terms you wish to have included -in the glossary. The stylesheets assume that you will either set the -baseform attribute correctly, or that the -content of the element exactly matches a term in your glossary. - -If you're using a glossary.collection, don't -make explicit links on the terms in your document. - -So, in your document, you might write things like this: - - -<para>This is dummy text, without any real meaning. -The point is simply to reference glossary terms like <glossterm>0</glossterm> -and the <firstterm baseform="1TBS">One True Brace Style (1TBS)</firstterm>. -The <glossterm>1TBS</glossterm>, as you can probably imagine, is a nearly -religious issue.</para> - - -If you set the firstterm.only.link parameter, -only the terms marked with firstterm will be links. -Otherwise, all the terms will be linked. - - - -Marking Up the Glossary - -The glossary itself has to be identified for the stylesheets. For lack -of a better choice, the role is used. -To identify the glossary as the target for automatic processing, set -the role to auto. The title of this -glossary (and any other information from the glossaryinfo -that's rendered by your stylesheet) will be displayed, but the entries will -come from the database. - - -Unfortunately, the glossary can't be empty, so you must put in -at least one glossentry. The content of this entry -is irrelevant, it will not be rendered: - - -<glossary role="auto"> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - -What about glossary divisions? If your glossary database has glossary -divisions and your automatic glossary contains at least -one glossdiv, the automic glossary will have divisions. -If the glossdiv is missing from either location, no divisions -will be rendered. - -Glossary entries (and divisions, if appropriate) in the glossary will -occur in precisely the order they occur in your database. - - - -Formatting the Document - -Finally, when you are ready to format your document, simply set the -glossary.collection parameter (in either a -customization layer or directly through your processor's interface) to -point to your global glossary. - -The stylesheets will format the glossary in your document as if -all of the entries implicilty referenced appeared there literally. - - -Limitations - -Glossary cross-references within the glossary are -not supported. For example, this will not work: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - -If you put glossary cross-references in your glossary that way, -you'll get the cryptic error: Warning: -glossary.collection specified, but there are 0 automatic -glossaries. - -Instead, you must do two things: - - - -Markup your glossary using glossseealso: - - -<glossentry> -<glossterm>gloss-1</glossterm> -<glossdef><para>A description that references <glossterm>gloss-2</glossterm>.</para> -<glossseealso>gloss-2</glossseealso> -</glossdef> -</glossentry> - - - - -Make sure there is at least one glossterm reference to -gloss-2 in your document. The -easiest way to do that is probably within a remark in your -automatic glossary: - - -<glossary role="auto"> -<remark>Make sure there's a reference to <glossterm>gloss-2</glossterm>.</remark> -<glossentry> -<glossterm>Irrelevant</glossterm> -<glossdef> -<para>If you can see this, the document was processed incorrectly. Use -the <parameter>glossary.collection</parameter> parameter.</para> -</glossdef> -</glossentry> -</glossary> - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossary.sort.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossary.sort.xml deleted file mode 100644 index 216130a50640a21e9abb4d7583c4ab42ebffb516..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossary.sort.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -glossary.sort -boolean - - -glossary.sort -Sort glossentry elements? - - - - - - - - -Description - -If non-zero, then the glossentry elements within a -glossary, glossdiv, or glosslist are sorted on the glossterm, using -the current lang setting. If zero (the default), then -glossentry elements are not sorted and are presented -in document order. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossdef.block.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossdef.block.properties.xml deleted file mode 100644 index 4fb481fe628697ef36fe934ea9f0233a462f57d9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossdef.block.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -glossdef.block.properties -attribute set - - -glossdef.block.properties -To add properties to the block of a glossary definition. - - - - - .25in - - - -Description -These properties are added to the block containing a -glossary definition in a glossary when -the glossary.as.blocks parameter -is non-zero. -Use this attribute-set to set the space above and below, -any font properties, -and any indent for the glossary definition. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossdef.list.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossdef.list.properties.xml deleted file mode 100644 index ba715780b38d4f101d049bc8746bc2eb0125da75..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossdef.list.properties.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -glossdef.list.properties -attribute set - - -glossdef.list.properties -To add properties to the glossary definition in a list. - - - - - - - - -Description -These properties are added to the block containing a -glossary definition in a glossary when -the glossary.as.blocks parameter -is zero. -Use this attribute-set to set font properties, for example. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossentry.list.item.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossentry.list.item.properties.xml deleted file mode 100644 index 6830f17810545ae5adb72b6b65888e6bc92fde0f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossentry.list.item.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -glossentry.list.item.properties -attribute set - - -glossentry.list.item.properties -To add properties to each glossentry in a list. - - - - - 1em - 0.8em - 1.2em - - - -Description -These properties are added to the fo:list-item containing a -glossentry in a glossary when the glossary.as.blocks parameter -is zero. -Use this attribute-set to set -spacing between entries, for example. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossentry.show.acronym.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossentry.show.acronym.xml deleted file mode 100644 index 97364387512ed70f760c583e136efd92d5ccd79b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossentry.show.acronym.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -glossentry.show.acronym -list -no -yes -primary - - -glossentry.show.acronym -Display glossentry acronyms? - - - - -no - - - -Description - -A setting of yes means they should be displayed; -no means they shouldn't. If primary is used, -then they are shown as the primary text for the entry. - - -This setting controls both acronym and -abbrev elements in the glossentry. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glosslist.as.blocks.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glosslist.as.blocks.xml deleted file mode 100644 index d72083714a594ca882c8b579482792411d36ca84..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glosslist.as.blocks.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -glosslist.as.blocks -boolean - - -glosslist.as.blocks -Use blocks for glosslists? - - - - - - - - -Description - -See glossary.as.blocks. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.auto.link.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.auto.link.xml deleted file mode 100644 index 03d9a30a45866aaa243a7d072cdad85cef312df8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.auto.link.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -glossterm.auto.link -boolean - - -glossterm.auto.link -Generate links from glossterm to glossentry automatically? - - - - - - - - -Description - -If non-zero, links from inline glossterms to the corresponding -glossentry elements in a glossary or glosslist -will be automatically generated. This is useful when your glossterms are consistent -and you don't want to add links manually. - -The automatic link generation feature is not used on glossterm elements -that have a linkend attribute. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.block.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.block.properties.xml deleted file mode 100644 index 84e6a6c29cb94cb3e7f0aab044591e563823fa00..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.block.properties.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -glossterm.block.properties -attribute set - - -glossterm.block.properties -To add properties to the block of a glossentry's glossterm. - - - - - 1em - 0.8em - 1.2em - always - always - - - -Description -These properties are added to the block containing a -glossary term in a glossary when the glossary.as.blocks parameter -is non-zero. -Use this attribute-set to set the space above and below, -font properties, -and any indent for the glossary term. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.list.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.list.properties.xml deleted file mode 100644 index abe0d313e4f4a257925c88bd290467d4ab854556..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.list.properties.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -glossterm.list.properties -attribute set - - -glossterm.list.properties -To add properties to the glossterm in a list. - - - - - - - - -Description -These properties are added to the block containing a -glossary term in a glossary when the glossary.as.blocks parameter -is zero. -Use this attribute-set to set -font properties, for example. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.separation.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.separation.xml deleted file mode 100644 index d0d2b8de0502eb877f8cae29311c353a3eceecb4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.separation.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -glossterm.separation -length - - -glossterm.separation -Separation between glossary terms and descriptions in list mode - - - - -0.25in - - - -Description - -Specifies the miminum horizontal -separation between glossary terms and descriptions when -they are presented side-by-side using lists -when the glossary.as.blocks -is zero. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.width.xml deleted file mode 100644 index 0cd3b82cd26cc8524f531957d94f41f4f0511839..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/glossterm.width.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -glossterm.width -length - - -glossterm.width -Width of glossterm in list presentation mode - - - - -2in - - - -Description - -This parameter specifies the width reserved for glossary terms when -a list presentation is used. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphic.default.extension.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphic.default.extension.xml deleted file mode 100644 index 93f2983a84a1b19ad23d6593ddc868403d495822..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphic.default.extension.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -graphic.default.extension -string - - -graphic.default.extension -Default extension for graphic filenames - - - - - - -Description - -If a graphic or mediaobject -includes a reference to a filename that does not include an extension, -and the format attribute is -unspecified, the default extension will be used. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphical.admonition.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphical.admonition.properties.xml deleted file mode 100644 index ca257d76065225f1c619ce31c8231aee0db23e13..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphical.admonition.properties.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -graphical.admonition.properties -attribute set - - -graphical.admonition.properties -To add properties to the outer block of a graphical admonition. - - - - - 1em - 0.8em - 1.2em - 1em - 0.8em - 1.2em - - - -Description -These properties are added to the outer block containing the -entire graphical admonition, including its title. -It is used when the parameter -admon.graphics is set to nonzero. -Use this attribute-set to set the space above and below, -and any indent for the whole admonition. - -In addition to these properties, a graphical admonition -also applies the admonition.title.properties -attribute-set to the title, and applies the -admonition.properties attribute-set -to the rest of the content. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphics.dir.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphics.dir.xml deleted file mode 100644 index e8d83ae3c7123819d6063d660de542c73306dbd2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphics.dir.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -graphics.dir -uri - - -graphics.dir -Graphics directory - - - - - - - - -Description - -Identifies the graphics directory for the navigation components -generated on all the slides. This parameter can be set in the source -document with the <?dbhtml?> pseudo-attribute -graphics-dir. - -If non-empty, this value is prepended to each of the graphic -image paths. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphicsize.extension.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphicsize.extension.xml deleted file mode 100644 index c4da7e12359d894eadcb23f22f86d78e04bed65f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphicsize.extension.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -graphicsize.extension -boolean - - -graphicsize.extension -Enable the getWidth()/getDepth() extension functions - - - - - - - - -Description - -If non-zero (and if use.extensions is non-zero -and if you're using a processor that supports extension functions), the -getWidth and getDepth functions -will be used to extract image sizes from graphics. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphicsize.use.img.src.path.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphicsize.use.img.src.path.xml deleted file mode 100644 index aff5b30c08ee39451bf33b39a17153fa5c5fca3b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/graphicsize.use.img.src.path.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -graphicsize.use.img.src.path -boolean - - -graphicsize.use.img.src.path -Prepend img.src.path before -filenames passed to extension functions - - - - - - - - -Description - -If non-zero img.src.path parameter will -be appended before filenames passed to extension functions for -measuring image dimensions. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.column.widths.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.column.widths.xml deleted file mode 100644 index 7d85b96ad64cbc460bc8b2b57d301a412234350f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.column.widths.xml +++ /dev/null @@ -1,80 +0,0 @@ - - -header.column.widths -string - - -header.column.widths -Specify relative widths of header areas - - - -1 1 1 - - -Description - -Page headers in print output use a three column table -to position text at the left, center, and right side of -the header on the page. -This parameter lets you specify the relative sizes of the -three columns. The default value is -"1 1 1". - -The parameter value must be three numbers, separated -by white space. The first number represents the relative -width of the inside header for -double-sided output. The second number is the relative -width of the center header. The third number is the -relative width of the outside header for -double-sided output. - -For single-sided output, the first number is the -relative width of left header for left-to-right -text direction, or the right header for right-to-left -text direction. -The third number is the -relative width of right header for left-to-right -text direction, or the left header for right-to-left -text direction. - -The numbers are used to specify the column widths -for the table that makes up the header area. -In the FO output, this looks like: - - - -<fo:table-column column-number="1" - column-width="proportional-column-width(1)"/> - - - -The proportional-column-width() -function computes a column width by dividing its -argument by the total of the arguments for all the columns, and -then multiplying the result by the width of the whole table -(assuming all the column specs use the function). -Its argument can be any positive integer or floating point number. -Zero is an acceptable value, although some FO processors -may warn about it, in which case using a very small number might -be more satisfactory. - - -For example, the value "1 2 1" means the center -header should have twice the width of the other areas. -A value of "0 0 1" means the entire header area -is reserved for the right (or outside) header text. -Note that to keep the center area centered on -the page, the left and right values must be -the same. A specification like "1 2 3" means the -center area is no longer centered on the page -since the right area is three times the width of the left area. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.content.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.content.properties.xml deleted file mode 100644 index 2d0291c45bb70306be5c2db41b393a3e95a3cd14..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.content.properties.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -header.content.properties -attribute set - - -header.content.properties -Properties of page header content - - - - - - - - - - - - - - - -Description - -Properties of page header content. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.hr.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.hr.xml deleted file mode 100644 index 08d846a9dad65daf39f4cbfe1ba357e8a33967a9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.hr.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -header.hr -boolean - - -header.hr -Toggle <HR> after header - - - - - - - - -Description -If non-zero, an <HR> is generated at the bottom of each web page, -before the footer. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.rule.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.rule.xml deleted file mode 100644 index b4c031e8253c5434b35d6520c24b9014ee9af32b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.rule.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -header.rule -boolean - - -header.rule -Rule under headers? - - - - - - - - -Description - -If non-zero, a rule will be drawn below the page headers. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.table.height.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.table.height.xml deleted file mode 100644 index 69b6f08e5f33bb50e5e7cd0029df2ab10a684a95..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.table.height.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -header.table.height -length - - -header.table.height -Specify the minimum height of the table containing the running page headers - - - -14pt - - -Description - -Page headers in print output use a three column table -to position text at the left, center, and right side of -the header on the page. -This parameter lets you specify the minimum height -of the single row in the table. -Since this specifies only the minimum height, -the table should automatically grow to fit taller content. -The default value is "14pt". - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.table.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.table.properties.xml deleted file mode 100644 index b5f60529de0c7a96031f7154a5bda47d4be360b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/header.table.properties.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -header.table.properties -attribute set - - -header.table.properties -Apply properties to the header layout table - - - - - - fixed - 100% - - - - -Description - -Properties applied to the table that lays out the page header. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/headers.on.blank.pages.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/headers.on.blank.pages.xml deleted file mode 100644 index 1fad48e3d9938eba164bf031eb344160c8850053..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/headers.on.blank.pages.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -headers.on.blank.pages -boolean - - -headers.on.blank.pages -Put headers on blank pages? - - - - - - - - -Description - -If non-zero, headers will be placed on blank pages. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hidetoc.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hidetoc.image.xml deleted file mode 100644 index 705b61f4afce28f3d87b7a8f44c4d0a622aa6520..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hidetoc.image.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -hidetoc.image -filename - - -hidetoc.image -Hide ToC image - - - - -hidetoc.gif - - - -Description - -Specifies the filename of the hide ToC image. This is used -when the ToC hide/show parameter is -enabled. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/highlight.default.language.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/highlight.default.language.xml deleted file mode 100644 index 0f00103f5f2a1492c4dc9cdc1c18f5d161be5dbe..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/highlight.default.language.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -highlight.default.language -string - - -highlight.default.language -Default language of programlisting - - - - - - - - -Description - -This language is used when there is no language attribute on programlisting. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/highlight.source.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/highlight.source.xml deleted file mode 100644 index 41d7b2f85851686097b92995ebab01f8af8a5629..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/highlight.source.xml +++ /dev/null @@ -1,82 +0,0 @@ - - -highlight.source -boolean - - -highlight.source -Should the content of programlisting -be syntactically highlighted? - - - - - - - - -Description - -When this parameter is non-zero, the stylesheets will try to do syntax highlighting of the -content of programlisting elements. You specify the language for each programlisting -by using the language attribute. The highlight.default.language -parameter can be used to specify the language for programlistings without a language -attribute. Syntax highlighting also works for screen and synopsis elements. - -The actual highlighting work is done by the XSLTHL extension module. This is an external Java library that has to be -downloaded separately (see below). - - -In order to use this extension, you must - -add xslthl-2.x.x.jar to your Java classpath. The latest version is available -from the XSLT syntax highlighting project -at SourceForge. - - -use a customization layer in which you import one of the following stylesheet modules: - - - html/highlight.xsl - - - - xhtml/highlight.xsl - - - - xhtml-1_1/highlight.xsl - - - - fo/highlight.xsl - - - - - -let either the xslthl.config Java system property or the -highlight.xslthl.config parameter point to the configuration file for syntax -highlighting (using URL syntax). DocBook XSL comes with a ready-to-use configuration file, -highlighting/xslthl-config.xml. - - - -The extension works with Saxon 6.5.x and Xalan-J. (Saxon 8.5 or later is also supported, but since it is -an XSLT 2.0 processor it is not guaranteed to work with DocBook XSL in all circumstances.) - -The following is an example of a Saxon 6 command adapted for syntax highlighting, to be used on Windows: - - -java -cp c:/Java/saxon.jar;c:/Java/xslthl-2.0.1.jar --Dxslthl.config=file:///c:/docbook-xsl/highlighting/xslthl-config.xml com.icl.saxon.StyleSheet --o test.html test.xml myhtml.xsl - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/highlight.xslthl.config.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/highlight.xslthl.config.xml deleted file mode 100644 index 451937ce6cf842913f337e328e529cdc387bf69d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/highlight.xslthl.config.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -highlight.xslthl.config -uri - - -highlight.xslthl.config -Location of XSLTHL configuration file - - - - - - - - -Description - -This location has precedence over the corresponding Java property. - -Please note that usually you have to specify location as URL not -just as a simple path on the local -filesystem. E.g. file:///home/user/xslthl/my-xslthl-config.xml. - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/home.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/home.image.xml deleted file mode 100644 index 22e54550422cc0e9f1bf343526a19459f2fe4723..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/home.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -home.image -filename - - -home.image -Home image - - - - -active/nav-home.png - - - -Description - -Specifies the filename of the home navigation icon. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.append.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.append.xml deleted file mode 100644 index 461e61b8e366bcde7ce32a80d08547b87381e26e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.append.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -html.append -string - - -html.append -Specifies content to append to HTML output - - - - - - -Description - -Specifies content to append to the end of HTML files output by -the html/docbook.xsl stylesheet, after the -closing <html> tag. You probably don’t want to set any -value for this parameter; but if you do, the only value it should ever -be set to is a newline character: &#x0a; or -&#10; - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.base.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.base.xml deleted file mode 100644 index 74e7fd9a385028cccedd13209b7615b9ee4e3870..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.base.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -html.base -uri - - -html.base -An HTML base URI - - - - - - - -Description - -If html.base is set, it is used for the base element -in the head of the html documents. The parameter specifies -the base URL for all relative URLs in the document. This is useful -for dynamically served html where the base URI needs to be -shifted. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.cellpadding.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.cellpadding.xml deleted file mode 100644 index 7240f0f47208a38ee242c2a3c58260c1998b61e3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.cellpadding.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -html.cellpadding -integer - - -html.cellpadding -Default value for cellpadding in HTML tables - - - - - - - - -Description - -If non-zero, this value will be used as the default cellpadding value -in HTML tables. nn for pixels or nn% for percentage length. E.g. 5 or -5% - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.cellspacing.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.cellspacing.xml deleted file mode 100644 index 5ddfdacd08e0544f9329a3142ddc84064084bac1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.cellspacing.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -html.cellspacing -integer - - -html.cellspacing -Default value for cellspacing in HTML tables - - - - - - - - -Description - -If non-zero, this value will be used as the default cellspacing -value in HTML tables. nn for pixels or nn% for percentage -length. E.g. 5 or 5% - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.cleanup.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.cleanup.xml deleted file mode 100644 index e4fc0c8d94b54b478f9181da9cc500fab8c4de45..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.cleanup.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -html.cleanup -boolean - - -html.cleanup -Attempt to clean up the resulting HTML? - - - - - - - - -Description - -If non-zero, and if the EXSLT -extensions are supported by your processor, the resulting HTML will be -cleaned up. This improves the chances that the -resulting HTML will be valid. It may also improve the formatting of -some elements. - -This parameter is different from make.valid.html -because it uses extension functions to manipulate result-tree-fragments. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.ext.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.ext.xml deleted file mode 100644 index 8d6fd9552f657d04d0b29989f00db50f2b1407ab..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.ext.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -html.ext -string - - -html.ext -Identifies the extension of generated HTML files - - - - -.html - - - -Description - -The extension identified by html.ext will -be used as the filename extension for chunks created by this -stylesheet. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.extra.head.links.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.extra.head.links.xml deleted file mode 100644 index ddc666fc8ea34591199edf11b47a5d6a40003aa4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.extra.head.links.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -html.extra.head.links -boolean - - -html.extra.head.links -Toggle extra HTML head link information - - - - - - - - -Description - -If non-zero, extra link elements will be -generated in the head of chunked HTML files. These -extra links point to chapters, appendixes, sections, etc. as supported -by the Site Navigation Bar in Mozilla 1.0 (as of CR1, at least). - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.head.legalnotice.link.multiple.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.head.legalnotice.link.multiple.xml deleted file mode 100644 index 7c0cba183973e665976aaf9fe0f63ac1a00cb246..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.head.legalnotice.link.multiple.xml +++ /dev/null @@ -1,44 +0,0 @@ - - -html.head.legalnotice.link.multiple -boolean - - -html.head.legalnotice.link.multiple -Generate multiple link instances in html head for legalnotice? - - - - - - - - -Description - -If html.head.legalnotice.link.multiple is -non-zero and the value of -html.head.legalnotice.link.types contains -multiple link types, then the stylesheet generates (in the -head section of the HTML source) one -link element for each link type specified. For -example, if the value of -html.head.legalnotice.link.types is -“copyright licenseâ€: - - <link rel="copyright" href="ln-id2524073.html" title="Legal Notice"> - <link rel="license" href="ln-id2524073.html" title="Legal Notice"> - - Otherwise, the stylesheet generates generates a single - link instance; for example: - - <link rel="copyright license" href="ln-id2524073.html" title="Legal Notice"> - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.head.legalnotice.link.types.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.head.legalnotice.link.types.xml deleted file mode 100644 index 4ca02ffdabdeffafb35fe60c9151da0faab5a3eb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.head.legalnotice.link.types.xml +++ /dev/null @@ -1,75 +0,0 @@ - - -html.head.legalnotice.link.types -string - - -html.head.legalnotice.link.types -Specifies link types for legalnotice link in html head - - - - -copyright - - - -Description - -The value of -html.head.legalnotice.link.types is a -space-separated list of link types, as described in Section 6.12 -of the HTML 4.01 specification. If the value of the -generate.legalnotice.link parameter is -non-zero, then the stylesheet generates (in the -head section of the HTML source) either a single -HTML link element or, if the value of the -html.head.legalnotice.link.multiple is -non-zero, one link element for each link type -specified. Each link has the following attributes: - - - - a rel attribute whose - value is derived from the value of - html.head.legalnotice.link.types - - - an href attribute whose - value is set to the URL of the file containing the - legalnotice - - - a title attribute whose - value is set to the title of the corresponding - legalnotice (or a title programatically - determined by the stylesheet) - - - -For example: - - <link rel="license" href="ln-id2524073.html" title="Legal Notice"> - - -About the default value - - In an ideal world, the default value of - html.head.legalnotice.link.types would - probably be “licenseâ€, since the content of the - DocBook legalnotice is typically license - information, not copyright information. However, the default value - is “copyright†for pragmatic reasons: because - that’s among the set of “recognized link types†listed in Section - 6.12 of the HTML 4.01 specification, and because certain - browsers and browser extensions are preconfigured to recognize that - value. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.longdesc.link.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.longdesc.link.xml deleted file mode 100644 index 24975630e067f1b09c4f3b650cc01a66957149a8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.longdesc.link.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -html.longdesc.link -boolean - - -html.longdesc.link -Should a link to the longdesc be included in the HTML? - - - - - - - - -Description - -If non-zero, links will be created to the -HTML files created for the -longdesc attribute. It makes no -sense to enable this option without also enabling the -html.longdesc parameter. - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.longdesc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.longdesc.xml deleted file mode 100644 index 10f341a29bc1d96c97d72aeef2a76292b42386fd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.longdesc.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -html.longdesc -boolean - - -html.longdesc -Should longdesc URIs be created? - - - - - - -Description -If non-zero, HTML files will be created for the -longdesc attribute. These files -are created from the textobjects in -mediaobjects and -inlinemediaobject. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.stylesheet.type.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.stylesheet.type.xml deleted file mode 100644 index f20b7065ea3f56a033bb59e403aa5a2d0be01fda..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.stylesheet.type.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -html.stylesheet.type -string - - -html.stylesheet.type -The type of the stylesheet used in the generated HTML - - - -text/css - - -Description - -The type of the stylesheet to place in the HTML link tag. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.stylesheet.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.stylesheet.xml deleted file mode 100644 index 34070947129bb2e3435e14e3ff95f16519c3f6fa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/html.stylesheet.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -html.stylesheet -string - - -html.stylesheet -Name of the stylesheet(s) to use in the generated HTML - - - - - - - - -Description - -The html.stylesheet parameter is either -empty, indicating that no stylesheet link tag should be -generated in the html output, or it is a list of one or more -stylesheet files. - -Multiple stylesheets are space-delimited. If you need to -reference a stylesheet URI that includes a space, encode it with -%20. A separate html link element will -be generated for each stylesheet in the order they are listed in the -parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.alias.file.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.alias.file.xml deleted file mode 100644 index be11b28fcb4cc3a67a85065492be32252137498c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.alias.file.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.alias.file -string - - -htmlhelp.alias.file -Filename of alias file. - - - - -alias.h - - - -Description - -Specifies the filename of the alias file (used for context-sensitive help). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.autolabel.xml deleted file mode 100644 index 1426d0088b43c86c90d2c0b98affe2968d700ee8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.autolabel.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.autolabel -boolean - - -htmlhelp.autolabel -Should tree-like ToC use autonumbering feature? - - - - - - - - -Description - -Set this to non-zero to include chapter and section numbers into ToC -in the left panel. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.back.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.back.xml deleted file mode 100644 index 1fc12bbad4e22139e1c7392c11b0ddff85dec5c2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.back.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.back -boolean - - -htmlhelp.button.back -Should the Back button be shown? - - - - - - - - -Description - -Set to non-zero to include the Hide/Show button shown on toolbar - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.forward.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.forward.xml deleted file mode 100644 index f6411bbf586f976efb69ff766a443b646f76a1bc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.forward.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.forward -boolean - - -htmlhelp.button.forward -Should the Forward button be shown? - - - - - - - - -Description - -Set to non-zero to include the Forward button on the toolbar. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.hideshow.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.hideshow.xml deleted file mode 100644 index 04f1ff0ca5ab6baa2c18b80408a19af428827f68..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.hideshow.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.hideshow -boolean - - -htmlhelp.button.hideshow -Should the Hide/Show button be shown? - - - - - - - - -Description - -Set to non-zero to include the Hide/Show button shown on toolbar - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.home.url.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.home.url.xml deleted file mode 100644 index 30275071f6ab34df06bc8e4b22665d74e5f36e53..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.home.url.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.home.url -string - - -htmlhelp.button.home.url -URL address of page accessible by Home button - - - - - - - - -Description - -URL address of page accessible by Home button. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.home.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.home.xml deleted file mode 100644 index e4e97fe281957627299f114d940382b727f0b2ef..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.home.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.home -boolean - - -htmlhelp.button.home -Should the Home button be shown? - - - - - - - - -Description - -Set to non-zero to include the Home button on the toolbar. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump1.title.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump1.title.xml deleted file mode 100644 index aa9da599724a23003c7639d46e496614e2991cea..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump1.title.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.jump1.title -string - - -htmlhelp.button.jump1.title -Title of Jump1 button - - - - -User1 - - - -Description - -Title of Jump1 button. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump1.url.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump1.url.xml deleted file mode 100644 index 22248c4cec24642b8976ab68e3143c2faebae721..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump1.url.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.jump1.url -string - - -htmlhelp.button.jump1.url -URL address of page accessible by Jump1 button - - - - - - - - -Description - -URL address of page accessible by Jump1 button. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump1.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump1.xml deleted file mode 100644 index f6f8d9ce7e4621186c457bc156876a3237276f8b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump1.xml +++ /dev/null @@ -1,23 +0,0 @@ - - -htmlhelp.button.jump1 -boolean - - -htmlhelp.button.jump1 -Should the Jump1 button be shown? - - - - - - -Description - Set to non-zero to include the Jump1 button on the toolbar. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump2.title.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump2.title.xml deleted file mode 100644 index 3b5f124ff6b903722e9790f1310e83a7fcc65709..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump2.title.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.jump2.title -string - - -htmlhelp.button.jump2.title -Title of Jump2 button - - - - -User2 - - - -Description - -Title of Jump2 button. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump2.url.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump2.url.xml deleted file mode 100644 index dcd24341ad2cd346aa8c119a2e117fbdcfcab47b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump2.url.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.jump2.url -string - - -htmlhelp.button.jump2.url -URL address of page accessible by Jump2 button - - - - - - - - -Description - -URL address of page accessible by Jump2 button. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump2.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump2.xml deleted file mode 100644 index 916b1ee182a9b059e46063fba49a062f62126265..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.jump2.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.jump2 -boolean - - -htmlhelp.button.jump2 -Should the Jump2 button be shown? - - - - - - - - -Description - -Set to non-zero to include the Jump2 button on the toolbar. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.locate.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.locate.xml deleted file mode 100644 index 5b555525349e5ebf45a0ec85227fc5e47e30fde9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.locate.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.button.locate -boolean - - -htmlhelp.button.locate -Should the Locate button be shown? - - - - - - - - -Description - -If you want Locate button shown on toolbar, turn this -parameter to 1. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.next.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.next.xml deleted file mode 100644 index b5352b2ca295d7538c5e31aeeb8075dc6b6b238a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.next.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.next -boolean - - -htmlhelp.button.next -Should the Next button be shown? - - - - - - - - -Description - -Set to non-zero to include the Next button on the toolbar. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.options.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.options.xml deleted file mode 100644 index 21bed81a6f77459cd604932167ed1ff22d3e5198..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.options.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.button.options -boolean - - -htmlhelp.button.options -Should the Options button be shown? - - - - - - - - -Description - -If you want Options button shown on toolbar, turn this -parameter to 1. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.prev.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.prev.xml deleted file mode 100644 index a6d989b4b9c553e81db4d8e85ca016b07c3f24af..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.prev.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.button.prev -boolean - - -htmlhelp.button.prev -Should the Prev button be shown? - - - - - - - - -Description - -Set to non-zero to include the Prev button on the toolbar. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.print.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.print.xml deleted file mode 100644 index 1c0e81649c81024d2dd46e567aa199f0eda71f02..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.print.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.button.print -boolean - - -htmlhelp.button.print -Should the Print button be shown? - - - - - - - - -Description - -Set to non-zero to include the Print button on the toolbar. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.refresh.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.refresh.xml deleted file mode 100644 index 294fcbe30853b07108a4625e880b8be2689f5847..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.refresh.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.button.refresh -boolean - - -htmlhelp.button.refresh -Should the Refresh button be shown? - - - - - - - - -Description - -Set to non-zero to include the Stop button on the toolbar. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.stop.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.stop.xml deleted file mode 100644 index fdbe5492a9223dc60ab1cd63c4aa874c9c8bfe82..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.stop.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.button.stop -boolean - - -htmlhelp.button.stop -Should the Stop button be shown? - - - - - - - - -Description - -If you want Stop button shown on toolbar, turn this -parameter to 1. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.zoom.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.zoom.xml deleted file mode 100644 index a25dc4031b84717bb1e51c19c9fefdae54319c75..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.button.zoom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.button.zoom -boolean - - -htmlhelp.button.zoom -Should the Zoom button be shown? - - - - - - - - -Description - -Set to non-zero to include the Zoom button on the toolbar. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.chm.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.chm.xml deleted file mode 100644 index 51cba301d3ce30a2e795d1fe16ee4990c98b13db..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.chm.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.chm -string - - -htmlhelp.chm -Filename of output HTML Help file. - - - - -htmlhelp.chm - - - -Description - -Set the name of resulting CHM file - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.default.topic.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.default.topic.xml deleted file mode 100644 index 577f440929579af5be7b070de17112e5b9cc04ee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.default.topic.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -htmlhelp.default.topic -string - - -htmlhelp.default.topic -Name of file with default topic - - - - - - - - -Description - -Normally first chunk of document is displayed when you open HTML -Help file. If you want to display another topic, simply set its -filename by this parameter. - -This is useful especially if you don't generate ToC in front of -your document and you also hide root element in ToC. E.g.: - -<xsl:param name="generate.book.toc" select="0"/> -<xsl:param name="htmlhelp.hhc.show.root" select="0"/> -<xsl:param name="htmlhelp.default.topic">pr01.html</xsl:param> - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.display.progress.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.display.progress.xml deleted file mode 100644 index eab1c9668e54598409eb01fb602eec9050b848f3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.display.progress.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.display.progress -boolean - - -htmlhelp.display.progress -Display compile progress? - - - - - - - - -Description - -Set to non-zero to to display compile progress - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.encoding.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.encoding.xml deleted file mode 100644 index 579cf7fce6d31141b7953a2b4079a5742324ceef..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.encoding.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.encoding -string - - -htmlhelp.encoding -Character encoding to use in files for HTML Help compiler. - - - - -iso-8859-1 - - - -Description - -HTML Help Compiler is not UTF-8 aware, so you should always use an -appropriate single-byte encoding here. Use one from iana, the registered charset values. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.enhanced.decompilation.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.enhanced.decompilation.xml deleted file mode 100644 index 558e89b0820be398494d4b1bc824ae51c440a1fa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.enhanced.decompilation.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.enhanced.decompilation -boolean - - -htmlhelp.enhanced.decompilation -Allow enhanced decompilation of CHM? - - - - - - - - -Description - -When non-zero this parameter enables enhanced decompilation of CHM. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.enumerate.images.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.enumerate.images.xml deleted file mode 100644 index a2aaac8625717c48c8d0880a0337e53ed38a7151..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.enumerate.images.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.enumerate.images -boolean - - -htmlhelp.enumerate.images -Should the paths to all used images be added to the project file? - - - - - - - - -Description - -Set to non-zero if you insert images into your documents as -external binary entities or if you are using absolute image paths. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.force.map.and.alias.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.force.map.and.alias.xml deleted file mode 100644 index 7dca30b6d810158c34abe81e3be0e813ae8a1b83..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.force.map.and.alias.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -htmlhelp.force.map.and.alias -boolean - - -htmlhelp.force.map.and.alias -Should [MAP] and [ALIAS] sections be added to the project file unconditionally? - - - - - - -Description - Set to non-zero if you have your own - alias.h and context.h - files and you want to include references to them in the project - file. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.binary.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.binary.xml deleted file mode 100644 index ea978f7e8ca9ec6efd8c4110291441ccb529566f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.binary.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -htmlhelp.hhc.binary -boolean - - -htmlhelp.hhc.binary -Generate binary ToC? - - - - - - - - -Description - -Set to non-zero to generate a binary TOC. You must create a binary TOC -if you want to add Prev/Next buttons to toolbar (which is default -behaviour). Files with binary TOC can't be merged. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml deleted file mode 100644 index ca36e5ad455e1e484a02d70c085656667a062d7b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.folders.instead.books.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -htmlhelp.hhc.folders.instead.books -boolean - - -htmlhelp.hhc.folders.instead.books -Use folder icons in ToC (instead of book icons)? - - - - - - - - -Description - -Set to non-zero for folder-like icons or zero for book-like icons in the ToC. -If you want to use folder-like icons, you must switch off the binary ToC using -htmlhelp.hhc.binary. - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.section.depth.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.section.depth.xml deleted file mode 100644 index 35c492af0cfcec527f3cfc130f4fd3a0af5d029e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.section.depth.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.hhc.section.depth -integer - - -htmlhelp.hhc.section.depth -Depth of TOC for sections in a left pane. - - - - -5 - - - -Description - -Set the section depth in the left pane of HTML Help viewer. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.show.root.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.show.root.xml deleted file mode 100644 index 0de26b9ff7ac1a3d33ad8af28a3061df1973abd4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.show.root.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -htmlhelp.hhc.show.root -boolean - - -htmlhelp.hhc.show.root -Should there be an entry for the root element in the ToC? - - - - - - - - -Description - -If set to zero, there will be no entry for the root element in the -ToC. This is useful when you want to provide the user with an expanded -ToC as a default. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.width.xml deleted file mode 100644 index 4011399b3f74913b06aadf4a831acd7b372a8d4a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.width.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.hhc.width -integer - - -htmlhelp.hhc.width -Width of navigation pane - - - - - - - - -Description - -This parameter specifies the width of the navigation pane (containing TOC and -other navigation tabs) in pixels. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.xml deleted file mode 100644 index 475ef2050b9943d2a65604122e0cf138a69a7964..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhc.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.hhc -string - - -htmlhelp.hhc -Filename of TOC file. - - - - -toc.hhc - - - -Description - -Set the name of the TOC file. The default is toc.hhc. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhk.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhk.xml deleted file mode 100644 index aee473e42978a4d079c9bcbc1cb463eb0b30a4c2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhk.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.hhk -string - - -htmlhelp.hhk -Filename of index file. - - - - -index.hhk - - - -Description - -set the name of the index file. The default is index.hhk. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.tail.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.tail.xml deleted file mode 100644 index c239b9afbb4d3fa5595e4828d39b8cd877a03720..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.tail.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.hhp.tail -string - - -htmlhelp.hhp.tail -Additional content for project file. - - - - - - - - -Description - -If you want to include some additional parameters into project file, -store appropriate part of project file into this parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.window.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.window.xml deleted file mode 100644 index 6c29eeda9f2273eb33c6c8534e9026bcdfdf61ed..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.window.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.hhp.window -string - - -htmlhelp.hhp.window -Name of default window. - - - - -Main - - - -Description - -Name of default window. If empty no [WINDOWS] section will be -added to project file. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.windows.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.windows.xml deleted file mode 100644 index afd435f5cf95b39075f3a239dbb0f9de779b5c53..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.windows.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -htmlhelp.hhp.windows -string - - -htmlhelp.hhp.windows -Definition of additional windows - - - - - - - - -Description - -Content of this parameter is placed at the end of [WINDOWS] -section of project file. You can use it for defining your own -addtional windows. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.xml deleted file mode 100644 index 74954d724dc4d9d45d7ed23a4ba09fd55f2c373b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.hhp.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.hhp -string - - -htmlhelp.hhp -Filename of project file. - - - - -htmlhelp.hhp - - - -Description - -Change this parameter if you want different name of project -file than htmlhelp.hhp. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.map.file.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.map.file.xml deleted file mode 100644 index b47c56520d3cae94e8d522402893e539df0ba0df..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.map.file.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -htmlhelp.map.file -string - - -htmlhelp.map.file -Filename of map file. - - - -context.h - - -Description -Set the name of map file. The default is - context.h. (used for context-sensitive - help). - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.only.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.only.xml deleted file mode 100644 index f10dbf5857b694ba739cee9a046e1134ea7c965c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.only.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -htmlhelp.only -boolean - - -htmlhelp.only -Should only project files be generated? - - - - - - - - -Description - - -Set to non-zero if you want to play with various HTML Help parameters -and you don't need to regenerate all HTML files. This setting will not -process whole document, only project files (hhp, hhc, hhk,...) will be -generated. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.remember.window.position.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.remember.window.position.xml deleted file mode 100644 index 3aaea1f70e8777d640b6d517721ec7debcbceea1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.remember.window.position.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -htmlhelp.remember.window.position -boolean - - -htmlhelp.remember.window.position -Remember help window position? - - - - - - - - -Description - -Set to non-zero to remember help window position between starts. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.advanced.search.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.advanced.search.xml deleted file mode 100644 index 3aa09a65898701c7577acd02c83195882e0e2f03..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.advanced.search.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.show.advanced.search -boolean - - -htmlhelp.show.advanced.search -Should advanced search features be available? - - - - - - - - -Description - -If you want advanced search features in your help, turn this -parameter to 1. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.favorities.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.favorities.xml deleted file mode 100644 index 925bbb1fe6f0108da993b10a5dcd25fef06e8137..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.favorities.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.show.favorities -boolean - - -htmlhelp.show.favorities -Should the Favorites tab be shown? - - - - - - - - -Description - -Set to non-zero to include a Favorites tab in the navigation pane -of the help window. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.menu.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.menu.xml deleted file mode 100644 index b3d6285cf49029123c3477eea6f04e2a45fe30d1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.menu.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.show.menu -boolean - - -htmlhelp.show.menu -Should the menu bar be shown? - - - - - - - - -Description - -Set to non-zero to have an application menu bar in your HTML Help window. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.toolbar.text.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.toolbar.text.xml deleted file mode 100644 index fc87d9c297469790005b38d442bbab423603324f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.show.toolbar.text.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.show.toolbar.text -boolean - - -htmlhelp.show.toolbar.text -Show text under toolbar buttons? - - - - - - - - -Description - -Set to non-zero to display texts under toolbar buttons, zero to switch -off displays. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.title.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.title.xml deleted file mode 100644 index f4397cab16ff1920b33c594553199b44fe4f7368..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.title.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.title -string - - -htmlhelp.title -Title of HTML Help - - - - - - - - -Description - -Content of this parameter will be used as a title for generated -HTML Help. If empty, title will be automatically taken from document. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.use.hhk.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.use.hhk.xml deleted file mode 100644 index 720c1e254081c20ea4b0ec203b970fe217bee889..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.use.hhk.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -htmlhelp.use.hhk -boolean - - -htmlhelp.use.hhk -Should the index be built using the HHK file? - - - - - - - - -Description - -If non-zero, the index is created using the HHK file (instead of using object -elements in the HTML files). For more information, see Generating an index. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.window.geometry.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.window.geometry.xml deleted file mode 100644 index 0ec75f744e04768b09c6e7323a1299a38c083a0d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/htmlhelp.window.geometry.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -htmlhelp.window.geometry -string - - -htmlhelp.window.geometry -Set initial geometry of help window - - - - - - - - -Description - -This parameter specifies initial position of help -window. E.g. - -<xsl:param name="htmlhelp.window.geometry">[160,64,992,704]</xsl:param> - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hyphenate.verbatim.characters.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hyphenate.verbatim.characters.xml deleted file mode 100644 index e6cae209651467145e59f54779bde418ab23611b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hyphenate.verbatim.characters.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -hyphenate.verbatim.characters -string - - -hyphenate.verbatim.characters -List of characters after which a line break can occur in listings - - - - - - - - -Description - -If you enable hyphenate.verbatim line -breaks are allowed only on space characters. If this is not enough for -your document, you can specify list of additional characters after -which line break is allowed in this parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hyphenate.verbatim.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hyphenate.verbatim.xml deleted file mode 100644 index c66e700cf1f9bbe4d312bb70b2dfdd5a0fd94d47..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hyphenate.verbatim.xml +++ /dev/null @@ -1,45 +0,0 @@ - - -hyphenate.verbatim -boolean - - -hyphenate.verbatim -Should verbatim environments be hyphenated on space characters? - - - - - - -Description - -If the lines of program listing are too long to fit into one -line it is quite common to split them at space and indicite by hook -arrow that code continues on the next line. You can turn on this -behaviour for programlisting, -screen and synopsis elements by -using this parameter. - -Note that you must also enable line wrapping for verbatim environments and -select appropriate hyphenation character (e.g. hook arrow). This can -be done using monospace.verbatim.properties -attribute set: - -<xsl:attribute-set name="monospace.verbatim.properties" - use-attribute-sets="verbatim.properties monospace.properties"> - <xsl:attribute name="wrap-option">wrap</xsl:attribute> - <xsl:attribute name="hyphenation-character">&#x25BA;</xsl:attribute> -</xsl:attribute-set> - -For a list of arrows available in Unicode see http://www.unicode.org/charts/PDF/U2190.pdf and http://www.unicode.org/charts/PDF/U2900.pdf and make sure that -selected character is available in the font you are using for verbatim -environments. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hyphenate.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hyphenate.xml deleted file mode 100644 index 46a2d614060f043e4e634ac52e7e26e90b958a49..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/hyphenate.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -hyphenate -list -closed -true -false - - -hyphenate -Specify hyphenation behavior - - - -true - - -Description - -If true, words may be hyphenated. Otherwise, they may not. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/id.warnings.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/id.warnings.xml deleted file mode 100644 index 7b2716fdcf9e993133ed5155bf00a015c1884e47..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/id.warnings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -id.warnings -boolean - - -id.warnings -Should warnings be generated for titled elements without IDs? - - - - - - -Description -If non-zero, the stylesheet will issue a warning for any element -(other than the root element) which has a title but does not have an -ID. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ignore.image.scaling.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ignore.image.scaling.xml deleted file mode 100644 index c35d1782364d9b4ea41284398bb5c4ba7c351949..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ignore.image.scaling.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -ignore.image.scaling -boolean - - -ignore.image.scaling -Tell the stylesheets to ignore the author's image scaling attributes - - - - - - - - -Description - -If non-zero, the scaling attributes on graphics and media objects are -ignored. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/img.src.path.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/img.src.path.xml deleted file mode 100644 index d295019b093db3a104e0d3e0253ff460a351e27b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/img.src.path.xml +++ /dev/null @@ -1,40 +0,0 @@ - - -img.src.path -string - - -img.src.path -Path to HTML/FO image files - - - - - - -Description - -Add a path prefix to the value of the fileref -attribute of graphic, inlinegraphic, and imagedata elements. The resulting -compound path is used in the output as the value of the src -attribute of img (HTML) or external-graphic (FO). - - - -The path given by img.src.path could be relative to the directory where the HTML/FO -files are created, or it could be an absolute URI. -The default value is empty. -Be sure to include a trailing slash if needed. - - -This prefix is not applied to any filerefs that start -with "/" or contain "//:". - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.div.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.div.title.properties.xml deleted file mode 100644 index edbec2f2e719f0a632b038b78ff2d88d50a477d7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.div.title.properties.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -index.div.title.properties -attribute set - - -index.div.title.properties -Properties associated with the letter headings in an -index - - - - - - 0pt - 14.4pt - - bold - always - - - - 0pt - - - - -Description - -This attribute set is used on the letter headings that separate -the divisions in an index. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.entry.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.entry.properties.xml deleted file mode 100644 index 323235833c7c73c13985e3be4722c9fe12e68394..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.entry.properties.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -index.entry.properties -attribute set - - -index.entry.properties -Properties applied to the formatted entries -in an index - - - - - - 0pt - - - - -Description - -This attribute set is applied to the block containing -the entries in a letter division in an index. It can be used to set the -font-size, font-family, and other inheritable properties that will be -applied to all index entries. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html deleted file mode 100644 index 077ba198f9d435b2fb671c036b7a58a62425b4aa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html +++ /dev/null @@ -1,677 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/params - - -

    Index of /release/xsl-ns/1.76.1/params

    -
    Icon  Name                                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] template.xml 01-Nov-2010 20:31 730 -[TXT] text.up.xml 01-Nov-2010 20:31 766 -[TXT] text.toc.xml 01-Nov-2010 20:31 771 -[TXT] text.home.xml 01-Nov-2010 20:31 775 -[TXT] text.next.xml 01-Nov-2010 20:31 777 -[TXT] text.prev.xml 01-Nov-2010 20:31 777 -[TXT] table.entry.padding.xml 01-Nov-2010 20:31 808 -[TXT] sequential.links.xml 01-Nov-2010 20:31 824 -[TXT] olink.pubid.xml 01-Nov-2010 20:31 838 -[TXT] line-height.xml 01-Nov-2010 20:31 839 -[TXT] toc.image.xml 01-Nov-2010 20:31 840 -[TXT] olink.sysid.xml 01-Nov-2010 20:31 843 -[TXT] footer.rule.xml 01-Nov-2010 20:31 847 -[TXT] generate.index.xml 01-Nov-2010 20:31 847 -[TXT] header.rule.xml 01-Nov-2010 20:31 848 -[TXT] home.image.xml 01-Nov-2010 20:31 848 -[TXT] up.image.xml 01-Nov-2010 20:31 852 -[TXT] toc.html.xml 01-Nov-2010 20:31 856 -[TXT] htmlhelp.chm.xml 01-Nov-2010 20:31 857 -[TXT] olink.resolver.xml 01-Nov-2010 20:31 859 -[TXT] toc.width.xml 01-Nov-2010 20:31 861 -[TXT] prev.image.xml 01-Nov-2010 20:31 864 -[TXT] column.count.body.xml 01-Nov-2010 20:31 865 -[TXT] toc.bg.color.xml 01-Nov-2010 20:31 865 -[TXT] next.image.xml 01-Nov-2010 20:31 867 -[TXT] banner.before.navigation.xml 01-Nov-2010 20:31 869 -[TXT] column.count.index.xml 01-Nov-2010 20:31 873 -[TXT] no.toc.image.xml 01-Nov-2010 20:31 875 -[TXT] toc.max.depth.xml 01-Nov-2010 20:31 877 -[TXT] htmlhelp.hhc.xml 01-Nov-2010 20:31 878 -[TXT] ua.js.xml 01-Nov-2010 20:31 879 -[TXT] bullet.image.xml 01-Nov-2010 20:31 880 -[TXT] header.hr.xml 01-Nov-2010 20:31 880 -[TXT] footer.hr.xml 01-Nov-2010 20:31 881 -[TXT] no.home.image.xml 01-Nov-2010 20:31 883 -[TXT] section.autolabel.xml 01-Nov-2010 20:31 883 -[TXT] glosslist.as.blocks.xml 01-Nov-2010 20:31 884 -[TXT] eclipse.plugin.name.xml 01-Nov-2010 20:31 886 -[TXT] htmlhelp.hhk.xml 01-Nov-2010 20:31 886 -[TXT] no.up.image.xml 01-Nov-2010 20:31 888 -[TXT] foilgroup.toc.xml 01-Nov-2010 20:31 889 -[TXT] titlefoil.html.xml 01-Nov-2010 20:31 889 -[TXT] body.bg.color.xml 01-Nov-2010 20:31 891 -[TXT] column.count.titlepage.xml 01-Nov-2010 20:31 893 -[TXT] formal.procedures.xml 01-Nov-2010 20:31 895 -[TXT] htmlhelp.hhp.xml 01-Nov-2010 20:31 896 -[TXT] nominal.image.depth.xml 01-Nov-2010 20:31 896 -[TXT] qandadiv.autolabel.xml 01-Nov-2010 20:31 896 -[TXT] htmlhelp.button.jump1.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump2.title.xml 01-Nov-2010 20:31 899 -[TXT] no.prev.image.xml 01-Nov-2010 20:31 900 -[TXT] no.next.image.xml 01-Nov-2010 20:31 901 -[TXT] currentpage.marker.xml 01-Nov-2010 20:31 902 -[TXT] chunk.section.depth.xml 01-Nov-2010 20:31 903 -[TXT] xbDOM.js.xml 01-Nov-2010 20:31 903 -[TXT] footers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] headers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] olink.fragid.xml 01-Nov-2010 20:31 905 -[TXT] column.count.back.xml 01-Nov-2010 20:31 906 -[TXT] htmlhelp.button.home.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.next.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.prev.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.zoom.xml 01-Nov-2010 20:31 909 -[TXT] slides.js.xml 01-Nov-2010 20:31 909 -[TXT] crop.mark.width.xml 01-Nov-2010 20:31 910 -[TXT] htmlhelp.show.menu.xml 01-Nov-2010 20:31 910 -[TXT] suppress.navigation.xml 01-Nov-2010 20:31 910 -[TXT] bibliography.numbered.xml 01-Nov-2010 20:31 911 -[TXT] navbodywidth.xml 01-Nov-2010 20:31 911 -[TXT] figure.properties.xml 01-Nov-2010 20:31 912 -[TXT] column.count.front.xml 01-Nov-2010 20:31 914 -[TXT] default.table.frame.xml 01-Nov-2010 20:31 914 -[TXT] eclipse.plugin.provider.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.button.back.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.display.progress.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.button.jump2.xml 01-Nov-2010 20:31 915 -[TXT] crop.mark.offset.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.alias.file.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.home.url.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.print.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.stop.xml 01-Nov-2010 20:31 916 -[TXT] suppress.homepage.title.xml 01-Nov-2010 20:31 916 -[TXT] example.properties.xml 01-Nov-2010 20:31 917 -[TXT] manual.toc.xml 01-Nov-2010 20:31 917 -[TXT] overlay.js.xml 01-Nov-2010 20:31 919 -[TXT] xbStyle.js.xml 01-Nov-2010 20:31 919 -[TXT] biblioentry.item.separator.xml 01-Nov-2010 20:31 921 -[TXT] simplesect.in.toc.xml 01-Nov-2010 20:31 921 -[TXT] textbgcolor.xml 01-Nov-2010 20:31 921 -[TXT] function.parens.xml 01-Nov-2010 20:31 922 -[TXT] htmlhelp.hhp.window.xml 01-Nov-2010 20:31 922 -[TXT] suppress.footer.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.header.navigation.xml 01-Nov-2010 20:31 922 -[TXT] callout.icon.size.xml 01-Nov-2010 20:31 923 -[TXT] ebnf.table.border.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.plugin.id.xml 01-Nov-2010 20:31 923 -[TXT] epub.autolabel.xml 01-Nov-2010 20:31 923 -[TXT] htmlhelp.button.jump1.url.xml 01-Nov-2010 20:31 923 -[TXT] equation.properties.xml 01-Nov-2010 20:31 924 -[TXT] page.margin.top.xml 01-Nov-2010 20:31 924 -[TXT] crop.marks.xml 01-Nov-2010 20:31 926 -[TXT] htmlhelp.button.refresh.xml 01-Nov-2010 20:31 926 -[TXT] navbgcolor.xml 01-Nov-2010 20:31 926 -[TXT] show.foil.number.xml 01-Nov-2010 20:31 926 -[TXT] segmentedlist.as.table.xml 01-Nov-2010 20:31 927 -[TXT] draft.watermark.image.xml 01-Nov-2010 20:31 928 -[TXT] region.after.extent.xml 01-Nov-2010 20:31 928 -[TXT] table.borders.with.css.xml 01-Nov-2010 20:31 928 -[TXT] htmlhelp.button.forward.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.locate.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.jump1.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.hhc.width.xml 01-Nov-2010 20:31 931 -[TXT] xref.properties.xml 01-Nov-2010 20:31 931 -[TXT] column.count.lot.xml 01-Nov-2010 20:31 933 -[TXT] region.before.extent.xml 01-Nov-2010 20:31 933 -[TXT] htmlhelp.button.jump2.url.xml 01-Nov-2010 20:31 934 -[TXT] glossterm.width.xml 01-Nov-2010 20:31 935 -[TXT] xbLibrary.js.xml 01-Nov-2010 20:31 935 -[TXT] base.dir.xml 01-Nov-2010 20:31 936 -[TXT] htmlhelp.button.options.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.title.xml 01-Nov-2010 20:31 937 -[TXT] navtocwidth.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.map.file.xml 01-Nov-2010 20:31 938 -[TXT] sans.font.family.xml 01-Nov-2010 20:31 938 -[TXT] htmlhelp.button.hideshow.xml 01-Nov-2010 20:31 939 -[TXT] toc.section.depth.xml 01-Nov-2010 20:31 939 -[TXT] admon.graphics.extension.xml 01-Nov-2010 20:31 940 -[TXT] column.gap.body.xml 01-Nov-2010 20:31 941 -[TXT] htmlhelp.autolabel.xml 01-Nov-2010 20:31 941 -[TXT] profile.separator.xml 01-Nov-2010 20:31 942 -[TXT] punct.honorific.xml 01-Nov-2010 20:31 942 -[TXT] refentry.separator.xml 01-Nov-2010 20:31 942 -[TXT] autotoc.label.separator.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.back.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.index.xml 01-Nov-2010 20:31 944 -[TXT] html.stylesheet.type.xml 01-Nov-2010 20:31 944 -[TXT] crop.mark.bleed.xml 01-Nov-2010 20:31 946 -[TXT] saxon.callouts.xml 01-Nov-2010 20:31 946 -[TXT] html.ext.xml 01-Nov-2010 20:31 947 -[TXT] htmlhelp.hhc.section.depth.xml 01-Nov-2010 20:31 949 -[TXT] page.margin.bottom.xml 01-Nov-2010 20:31 951 -[TXT] annotate.toc.xml 01-Nov-2010 20:31 952 -[TXT] eclipse.autolabel.xml 01-Nov-2010 20:31 952 -[TXT] nav.separator.xml 01-Nov-2010 20:31 952 -[TXT] footnote.font.size.xml 01-Nov-2010 20:31 953 -[TXT] overlay.logo.xml 01-Nov-2010 20:31 953 -[TXT] htmlhelp.hhp.tail.xml 01-Nov-2010 20:31 954 -[TXT] linenumbering.width.xml 01-Nov-2010 20:31 955 -[TXT] admon.graphics.xml 01-Nov-2010 20:31 956 -[TXT] body.margin.top.xml 01-Nov-2010 20:31 956 -[TXT] column.gap.front.xml 01-Nov-2010 20:31 956 -[TXT] highlight.default.language.xml 01-Nov-2010 20:31 956 -[TXT] keyboard.nav.xml 01-Nov-2010 20:31 956 -[TXT] htmlhelp.show.favorities.xml 01-Nov-2010 20:31 957 -[TXT] active.toc.xml 01-Nov-2010 20:31 958 -[TXT] olink.outline.ext.xml 01-Nov-2010 20:31 958 -[TXT] plus.image.xml 01-Nov-2010 20:31 959 -[TXT] chunk.sections.xml 01-Nov-2010 20:31 960 -[TXT] column.gap.lot.xml 01-Nov-2010 20:31 961 -[TXT] body.margin.bottom.xml 01-Nov-2010 20:31 963 -[TXT] hidetoc.image.xml 01-Nov-2010 20:31 963 -[TXT] htmlhelp.show.toolbar.text.xml 01-Nov-2010 20:31 963 -[TXT] ignore.image.scaling.xml 01-Nov-2010 20:31 963 -[TXT] root.filename.xml 01-Nov-2010 20:31 963 -[TXT] showtoc.image.xml 01-Nov-2010 20:31 963 -[TXT] table.frame.border.thickness.xml 01-Nov-2010 20:31 963 -[TXT] admonition.properties.xml 01-Nov-2010 20:31 964 -[TXT] minus.image.xml 01-Nov-2010 20:31 965 -[TXT] revhistory.title.properties.xml 01-Nov-2010 20:31 966 -[TXT] informalfigure.properties.xml 01-Nov-2010 20:31 969 -[TXT] dynamic.toc.xml 01-Nov-2010 20:31 972 -[TXT] column.gap.titlepage.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enhanced.decompilation.xml 01-Nov-2010 20:31 1.0K -[TXT] monospace.font.family.xml 01-Nov-2010 20:31 1.0K -[TXT] subscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] ulink.target.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.remember.window.position.xml 01-Nov-2010 20:31 1.0K -[TXT] informalexample.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhp.windows.xml 01-Nov-2010 20:31 1.0K -[TXT] id.warnings.xml 01-Nov-2010 20:31 1.0K -[TXT] link.mailto.url.xml 01-Nov-2010 20:31 1.0K -[TXT] refclass.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] annotation.support.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.font.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.quietly.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.everyNth.xml 01-Nov-2010 20:31 1.0K -[TXT] use.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellpadding.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellspacing.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.show.advanced.search.xml 01-Nov-2010 20:31 1.0K -[TXT] informalequation.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] contrib.inline.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] qanda.nested.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] abstract.notitle.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.tocs.and.lots.has.title.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] superscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.top.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] use.id.as.filename.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.graphics.xml 01-Nov-2010 20:31 1.0K -[TXT] points.per.em.xml 01-Nov-2010 20:31 1.0K -[TXT] editedby.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] css.stylesheet.xml 01-Nov-2010 20:31 1.0K -[TXT] man.segtitle.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.navigation.height.xml 01-Nov-2010 20:31 1.0K -[TXT] bridgehead.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.href.xml 01-Nov-2010 20:31 1.0K -[TXT] saxon.tablecolumns.xml 01-Nov-2010 20:31 1.0K -[TXT] xbCollapsibleLists.js.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.text.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] make.single.year.ranges.xml 01-Nov-2010 20:31 1.0K -[TXT] spacing.paras.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] email.mailto.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.bottom.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] double.sided.xml 01-Nov-2010 20:31 1.0K -[TXT] table.frame.border.color.xml 01-Nov-2010 20:31 1.0K -[TXT] html.longdesc.xml 01-Nov-2010 20:31 1.0K -[TXT] javahelp.encoding.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.image.xml 01-Nov-2010 20:31 1.0K -[TXT] ebnf.table.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.binary.xml 01-Nov-2010 20:31 1.0K -[TXT] firstterm.only.link.xml 01-Nov-2010 20:31 1.0K -[TXT] para.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] procedure.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.title.master.xml 01-Nov-2010 20:31 1.0K -[TXT] tablecolumns.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] index.prefer.titleabbrev.xml 01-Nov-2010 20:31 1.0K -[TXT] arbortext.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] itemizedlist.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.with.ids.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] html.base.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enumerate.images.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] body.font.master.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.cell.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.link.text.xml 01-Nov-2010 20:31 1.0K -[TXT] citerefentry.link.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.show.root.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.window.geometry.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.meta.abstract.xml 01-Nov-2010 20:31 1.0K -[TXT] nav.table.summary.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.title.xml 01-Nov-2010 20:31 1.0K -[TXT] use.svg.xml 01-Nov-2010 20:31 1.0K -[TXT] section.label.includes.component.label.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.first.sections.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.only.xml 01-Nov-2010 20:31 1.0K -[TXT] script.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.defaultcolumn.xml 01-Nov-2010 20:31 1.0K -[TXT] pixels.per.inch.xml 01-Nov-2010 20:31 1.0K -[TXT] callouts.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] entry.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.xml 01-Nov-2010 20:31 1.0K -[TXT] index.page.number.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] glossary.sort.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.xml 01-Nov-2010 20:31 1.0K -[TXT] refentry.xref.manvolnum.xml 01-Nov-2010 20:31 1.0K -[TXT] slides.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] output-root.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.in.base.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.headings.xml 01-Nov-2010 20:31 1.0K -[TXT] phrase.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] shade.verbatim.xml 01-Nov-2010 20:31 1.0K -[TXT] footer.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] header.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.textlabel.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.funcprototype.xml 01-Nov-2010 20:31 1.1K -[TXT] xep.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.separation.xml 01-Nov-2010 20:31 1.1K -[TXT] show.comments.xml 01-Nov-2010 20:31 1.1K -[TXT] emphasis.propagates.style.xml 01-Nov-2010 20:31 1.1K -[TXT] author.othername.in.middle.xml 01-Nov-2010 20:31 1.1K -[TXT] filename-prefix.xml 01-Nov-2010 20:31 1.1K -[TXT] foilgroup.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] funcsynopsis.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.use.hhk.xml 01-Nov-2010 20:31 1.1K -[TXT] runinhead.default.title.end.punct.xml 01-Nov-2010 20:31 1.1K -[TXT] variablelist.term.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] overlay.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.inherit.numeration.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.style.xml 01-Nov-2010 20:31 1.1K -[TXT] body.font.size.xml 01-Nov-2010 20:31 1.1K -[TXT] bookmarks.collapse.xml 01-Nov-2010 20:31 1.1K -[TXT] nominal.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.graphics.xml 01-Nov-2010 20:31 1.1K -[TXT] graphics.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] man.table.footnotes.divider.xml 01-Nov-2010 20:31 1.1K -[TXT] default.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcsynopsisinfo.xml 01-Nov-2010 20:31 1.1K -[TXT] body.attributes.xml 01-Nov-2010 20:31 1.1K -[TXT] inherit.keywords.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.use.img.src.path.xml 01-Nov-2010 20:31 1.1K -[TXT] linenumbering.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] table.spacer.image.xml 01-Nov-2010 20:31 1.1K -[TXT] page.orientation.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] foil.title.size.xml 01-Nov-2010 20:31 1.1K -[TXT] annotation.graphic.open.xml 01-Nov-2010 20:31 1.1K -[TXT] email.delimiters.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] l10n.gentext.default.language.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.encoding.xml 01-Nov-2010 20:31 1.1K -[TXT] man.output.manifest.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.force.map.and.alias.xml 01-Nov-2010 20:31 1.1K -[TXT] saxon.linenumbering.xml 01-Nov-2010 20:31 1.1K -[TXT] axf.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] list.item.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] graphic.default.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] callout.graphics.path.xml 01-Nov-2010 20:31 1.1K -[TXT] section.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] abstract.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] autolayout-file.xml 01-Nov-2010 20:31 1.1K -[TXT] dry-run.xml 01-Nov-2010 20:31 1.1K -[TXT] html.extra.head.links.xml 01-Nov-2010 20:31 1.1K -[TXT] css.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] default.image.width.xml 01-Nov-2010 20:31 1.1K -[TXT] glossdef.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] xref.with.number.and.title.xml 01-Nov-2010 20:31 1.1K -[TXT] normal.para.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] highlight.xslthl.config.xml 01-Nov-2010 20:31 1.1K -[TXT] table.cell.padding.xml 01-Nov-2010 20:31 1.1K -[TXT] menuchoice.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] footer.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] header.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] css.stylesheet.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] list.block.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.folders.instead.books.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.showtitles.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.in.hyperlink.xml 01-Nov-2010 20:31 1.1K -[TXT] make.year.ranges.xml 01-Nov-2010 20:31 1.1K -[TXT] itemizedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] toc.list.type.xml 01-Nov-2010 20:31 1.1K -[TXT] section.autolabel.max.depth.xml 01-Nov-2010 20:31 1.1K -[TXT] html.append.xml 01-Nov-2010 20:31 1.1K -[TXT] multiframe.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.indent.xml 01-Nov-2010 20:31 1.1K -[TXT] default.float.class.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.separate.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.tocs.and.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.append.xml 01-Nov-2010 20:31 1.1K -[TXT] ebnf.statement.terminator.xml 01-Nov-2010 20:31 1.1K -[TXT] sidebar.title.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] hyphenate.verbatim.characters.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.debug.xml 01-Nov-2010 20:31 1.1K -[TXT] monospace.verbatim.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] page.width.xml 01-Nov-2010 20:31 1.2K -[TXT] sidebar.float.width.xml 01-Nov-2010 20:31 1.2K -[TXT] fop1.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.manifest.filename.xml 01-Nov-2010 20:31 1.2K -[TXT] biblioentry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] orderedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] body.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] page.height.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.width.xml 01-Nov-2010 20:31 1.2K -[TXT] index.entry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] blurb.on.titlepage.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] output.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] itemizedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] profile.attribute.xml 01-Nov-2010 20:31 1.2K -[TXT] title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] use.id.function.xml 01-Nov-2010 20:31 1.2K -[TXT] qanda.in.toc.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.title.end.punct.xml 01-Nov-2010 20:31 1.2K -[TXT] othercredit.like.author.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] man.th.extra1.suppress.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] textdata.default.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.row.height.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.list.table.xml 01-Nov-2010 20:31 1.2K -[TXT] man.funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] use.embed.for.svg.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.name.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.hide.show.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.js.xml 01-Nov-2010 20:31 1.2K -[TXT] index.preferred.page.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] speakernote.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] l10n.gentext.language.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.title.xml 01-Nov-2010 20:31 1.2K -[TXT] component.titlepage.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] body.end.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.number.limit.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.omit-xml-declaration.xml 01-Nov-2010 20:31 1.2K -[TXT] header.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.in.separate.dir.xml 01-Nov-2010 20:31 1.2K -[TXT] footer.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] running.foot.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] fop.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.indent.width.xml 01-Nov-2010 20:31 1.2K -[TXT] table.cell.border.thickness.xml 01-Nov-2010 20:31 1.2K -[TXT] informaltable.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.standalone.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.graphic.close.xml 01-Nov-2010 20:31 1.2K -[TXT] man.indent.blurbs.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.title.placement.xml 01-Nov-2010 20:31 1.2K -[TXT] ulink.footnotes.xml 01-Nov-2010 20:31 1.2K -[TXT] compact.list.item.spacing.xml 01-Nov-2010 20:31 1.2K -[TXT] html.cleanup.xml 01-Nov-2010 20:31 1.2K -[TXT] admonition.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] rootid.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.cdata-section-elements.xml 01-Nov-2010 20:31 1.2K -[TXT] dingbat.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] passivetex.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-system.xml 01-Nov-2010 20:31 1.2K -[TXT] glossdef.block.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-public.xml 01-Nov-2010 20:31 1.2K -[TXT] table.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] ade.extensions.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.unicode.start.character.xml 01-Nov-2010 20:31 1.3K -[TXT] man.th.extra3.suppress.xml 01-Nov-2010 20:31 1.3K -[TXT] html.longdesc.link.xml 01-Nov-2010 20:31 1.3K -[TXT] man.output.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.verbatims.xml 01-Nov-2010 20:31 1.3K -[TXT] keep.relative.image.uris.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.lists.xml 01-Nov-2010 20:31 1.3K -[TXT] targets.filename.xml 01-Nov-2010 20:31 1.3K -[TXT] glossterm.auto.link.xml 01-Nov-2010 20:31 1.3K -[TXT] chunker.output.method.xml 01-Nov-2010 20:31 1.3K -[TXT] table.table.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.pagebreak.xml 01-Nov-2010 20:31 1.3K -[TXT] article.appendix.title.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] rebuild-all.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.show.xml 01-Nov-2010 20:31 1.3K -[TXT] equation.number.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] bibliography.style.xml 01-Nov-2010 20:31 1.3K -[TXT] make.valid.html.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.chars.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.os.xml 01-Nov-2010 20:31 1.3K -[TXT] blockquote.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] html.stylesheet.xml 01-Nov-2010 20:31 1.3K -[TXT] make.graphic.viewport.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.lang.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.arch.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.graphics.number.limit.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.pre.xml 01-Nov-2010 20:31 1.3K -[TXT] glossentry.list.item.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.post.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.status.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.vendor.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.xml 01-Nov-2010 20:31 1.3K -[TXT] monospace.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.meta.get.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] wordml.template.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.default.topic.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.audience.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.security.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.wordsize.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.revision.xml 01-Nov-2010 20:31 1.3K -[TXT] glossary.as.blocks.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.subtitle.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.condition.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.userlevel.xml 01-Nov-2010 20:31 1.3K -[TXT] xref.label-title.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.conformance.xml 01-Nov-2010 20:31 1.4K -[TXT] glossentry.show.acronym.xml 01-Nov-2010 20:31 1.4K -[TXT] ebnf.assignment.xml 01-Nov-2010 20:31 1.4K -[TXT] pages.template.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.revisionflag.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] generate.section.toc.level.xml 01-Nov-2010 20:31 1.4K -[TXT] draft.mode.xml 01-Nov-2010 20:31 1.4K -[TXT] list.block.spacing.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.title-page.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] toc.margin.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] informal.object.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] tex.math.file.xml 01-Nov-2010 20:31 1.4K -[TXT] qanda.title.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] label.from.part.xml 01-Nov-2010 20:31 1.4K -[TXT] callout.graphics.extension.xml 01-Nov-2010 20:31 1.4K -[TXT] refentry.date.profile.xml 01-Nov-2010 20:31 1.4K -[TXT] variablelist.term.break.after.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.sep.leader.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] table.footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.mark.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] man.endnotes.list.heading.xml 01-Nov-2010 20:31 1.4K -[TXT] default.units.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.label-page.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] generate.css.header.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.value.xml 01-Nov-2010 20:31 1.5K -[TXT] shade.verbatim.style.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.title.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] img.src.path.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.object.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] xep.index.item.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] menuchoice.menu.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] chunker.output.media-type.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level6.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] docbook.css.link.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.base.dir.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level1.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level2.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level3.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level4.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level5.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] tex.math.delims.xml 01-Nov-2010 20:31 1.5K -[TXT] table.cell.border.color.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.xml 01-Nov-2010 20:31 1.5K -[TXT] monospace.verbatim.font.width.xml 01-Nov-2010 20:31 1.5K -[TXT] glossterm.block.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] process.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] alignment.xml 01-Nov-2010 20:31 1.5K -[TXT] table.footnote.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] process.empty.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.subdirs.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.indent.width.xml 01-Nov-2010 20:31 1.6K -[TXT] olink.base.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] section.title.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] preferred.mediaobject.role.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.term.separator.xml 01-Nov-2010 20:31 1.6K -[TXT] saxon.character.representation.xml 01-Nov-2010 20:31 1.6K -[TXT] component.label.includes.part.label.xml 01-Nov-2010 20:31 1.6K -[TXT] refentry.version.profile.xml 01-Nov-2010 20:31 1.6K -[TXT] table.frame.border.style.xml 01-Nov-2010 20:31 1.6K -[TXT] root.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] exsl.node.set.available.xml 01-Nov-2010 20:31 1.6K -[TXT] target.database.document.xml 01-Nov-2010 20:31 1.6K -[TXT] index.on.role.xml 01-Nov-2010 20:31 1.6K -[TXT] man.charmap.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] man.hyphenate.urls.xml 01-Nov-2010 20:31 1.6K -[TXT] sidebar.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] man.th.extra2.suppress.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.max.termlength.xml 01-Nov-2010 20:31 1.6K -[TXT] nominal.image.width.xml 01-Nov-2010 20:31 1.7K -[TXT] verbatim.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] man.hyphenate.filenames.xml 01-Nov-2010 20:31 1.7K -[TXT] symbol.font.family.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.number.symbols.xml 01-Nov-2010 20:31 1.7K -[TXT] use.local.olink.style.xml 01-Nov-2010 20:31 1.7K -[TXT] current.docid.xml 01-Nov-2010 20:31 1.7K -[TXT] show.revisionflag.xml 01-Nov-2010 20:31 1.7K -[TXT] collect.xref.targets.xml 01-Nov-2010 20:31 1.7K -[TXT] pgwide.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] abstract.title.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] refentry.version.suppress.xml 01-Nov-2010 20:31 1.7K -[TXT] table.cell.border.style.xml 01-Nov-2010 20:31 1.7K -[TXT] man.th.extra3.max.length.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] index.div.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] toc.line.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] html.head.legalnotice.link.multiple.xml 01-Nov-2010 20:31 1.8K -[TXT] refentry.source.name.suppress.xml 01-Nov-2010 20:31 1.8K -[TXT] table.footnote.number.symbols.xml 01-Nov-2010 20:31 1.8K -[TXT] man.th.extra2.max.length.xml 01-Nov-2010 20:31 1.8K -[TXT] index.on.type.xml 01-Nov-2010 20:31 1.8K -[TXT] page.margin.outer.xml 01-Nov-2010 20:31 1.8K -[TXT] man.output.lang.in.name.enabled.xml 01-Nov-2010 20:31 1.8K -[TXT] marker.section.level.xml 01-Nov-2010 20:31 1.8K -[TXT] l10n.gentext.use.xref.language.xml 01-Nov-2010 20:31 1.8K -[TXT] nongraphical.admonition.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] component.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] graphical.admonition.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] insert.xref.page.number.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.date.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.break.after.slash.xml 01-Nov-2010 20:31 1.9K -[TXT] man.hyphenate.computer.inlines.xml 01-Nov-2010 20:31 1.9K -[TXT] index.term.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] page.margin.inner.xml 01-Nov-2010 20:31 1.9K -[TXT] margin.note.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] use.role.for.mediaobject.xml 01-Nov-2010 20:31 1.9K -[TXT] index.number.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.version.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.copyright.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.authors.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] generate.revhistory.link.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] side.float.properties.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.name.profile.enabled.xml 01-Nov-2010 20:31 2.0K -[TXT] index.range.separator.xml 01-Nov-2010 20:31 2.0K -[TXT] make.clean.html.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.id.attributes.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] variablelist.as.table.xml 01-Nov-2010 20:31 2.0K -[TXT] hyphenate.verbatim.xml 01-Nov-2010 20:31 2.1K -[TXT] title.margin.left.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.encoding.xml 01-Nov-2010 20:31 2.1K -[TXT] annotation.css.xml 01-Nov-2010 20:31 2.1K -[TXT] man.justify.xml 01-Nov-2010 20:31 2.1K -[TXT] default.table.rules.xml 01-Nov-2010 20:31 2.2K -[TXT] profile.role.xml 01-Nov-2010 20:31 2.2K -[TXT] body.start.indent.xml 01-Nov-2010 20:31 2.2K -[TXT] insert.link.page.number.xml 01-Nov-2010 20:31 2.3K -[TXT] section.container.element.xml 01-Nov-2010 20:31 2.3K -[TXT] man.hyphenate.xml 01-Nov-2010 20:31 2.3K -[TXT] variablelist.as.blocks.xml 01-Nov-2010 20:31 2.3K -[TXT] part.autolabel.xml 01-Nov-2010 20:31 2.3K -[TXT] chapter.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] preface.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] l10n.lang.value.rfc.compliant.xml 01-Nov-2010 20:31 2.4K -[TXT] appendix.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] reference.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] man.charmap.enabled.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.manual.profile.xml 01-Nov-2010 20:31 2.4K -[TXT] writing.mode.xml 01-Nov-2010 20:31 2.4K -[TXT] insert.olink.pdf.frag.xml 01-Nov-2010 20:31 2.5K -[TXT] refentry.title.properties.xml 01-Nov-2010 20:31 2.6K -[TXT] man.th.title.max.length.xml 01-Nov-2010 20:31 2.6K -[TXT] man.output.better.ps.enabled.xml 01-Nov-2010 20:31 2.6K -[TXT] generate.legalnotice.link.xml 01-Nov-2010 20:31 2.6K -[TXT] man.indent.refsect.xml 01-Nov-2010 20:31 2.6K -[TXT] index.links.to.section.xml 01-Nov-2010 20:31 2.7K -[TXT] margin.note.float.type.xml 01-Nov-2010 20:31 2.7K -[TXT] man.font.links.xml 01-Nov-2010 20:31 2.7K -[TXT] tex.math.in.alt.xml 01-Nov-2010 20:31 2.7K -[TXT] make.index.markup.xml 01-Nov-2010 20:31 2.8K -[TXT] insert.olink.page.number.xml 01-Nov-2010 20:31 2.8K -[TXT] textinsert.extension.xml 01-Nov-2010 20:31 2.8K -[TXT] qanda.defaultlabel.xml 01-Nov-2010 20:31 2.9K -[TXT] prefer.internal.olink.xml 01-Nov-2010 20:31 2.9K -[TXT] sidebar.float.type.xml 01-Nov-2010 20:31 2.9K -[TXT] footer.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] header.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] page.width.portrait.xml 01-Nov-2010 20:31 3.0K -[TXT] html.head.legalnotice.link.types.xml 01-Nov-2010 20:31 3.1K -[TXT] man.base.url.for.relative.links.xml 01-Nov-2010 20:31 3.1K -[TXT] page.height.portrait.xml 01-Nov-2010 20:31 3.1K -[TXT] olink.lang.fallback.sequence.xml 01-Nov-2010 20:31 3.1K -[TXT] use.role.as.xrefstyle.xml 01-Nov-2010 20:31 3.2K -[TXT] highlight.source.xml 01-Nov-2010 20:31 3.4K -[TXT] man.charmap.subset.profile.english.xml 01-Nov-2010 20:31 3.4K -[TXT] refentry.source.name.profile.xml 01-Nov-2010 20:31 3.4K -[TXT] docbook.css.source.xml 01-Nov-2010 20:31 3.5K -[TXT] man.charmap.use.subset.xml 01-Nov-2010 20:31 3.5K -[TXT] generate.toc.xml 01-Nov-2010 20:31 3.6K -[TXT] bibliography.collection.xml 01-Nov-2010 20:31 4.0K -[TXT] custom.css.source.xml 01-Nov-2010 20:31 4.2K -[TXT] paper.type.xml 01-Nov-2010 20:31 4.3K -[TXT] olink.doctitle.xml 01-Nov-2010 20:31 4.6K -[TXT] man.endnotes.are.numbered.xml 01-Nov-2010 20:31 4.8K -[TXT] man.endnotes.list.enabled.xml 01-Nov-2010 20:31 5.0K -[TXT] index.method.xml 01-Nov-2010 20:31 5.6K -[TXT] man.string.subst.map.xml 01-Nov-2010 20:31 6.7K -[TXT] glossary.collection.xml 01-Nov-2010 20:31 10K -[TXT] man.charmap.subset.profile.xml 01-Nov-2010 20:31 14K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=D;O=A deleted file mode 100644 index 8e220c2e9d0f157af0c8c3abb1a6c15f15f1db86..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=D;O=A +++ /dev/null @@ -1,677 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/params - - -

    Index of /release/xsl-ns/1.76.1/params

    -
    Icon  Name                                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] abstract.notitle.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] abstract.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] abstract.title.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] active.toc.xml 01-Nov-2010 20:31 958 -[TXT] ade.extensions.xml 01-Nov-2010 20:31 1.3K -[TXT] admon.graphics.extension.xml 01-Nov-2010 20:31 940 -[TXT] admon.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.graphics.xml 01-Nov-2010 20:31 956 -[TXT] admon.style.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.textlabel.xml 01-Nov-2010 20:31 1.0K -[TXT] admonition.properties.xml 01-Nov-2010 20:31 964 -[TXT] admonition.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] alignment.xml 01-Nov-2010 20:31 1.5K -[TXT] annotate.toc.xml 01-Nov-2010 20:31 952 -[TXT] annotation.css.xml 01-Nov-2010 20:31 2.1K -[TXT] annotation.graphic.close.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.graphic.open.xml 01-Nov-2010 20:31 1.1K -[TXT] annotation.js.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.support.xml 01-Nov-2010 20:31 1.0K -[TXT] appendix.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] arbortext.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] article.appendix.title.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] author.othername.in.middle.xml 01-Nov-2010 20:31 1.1K -[TXT] autolayout-file.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.in.hyperlink.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.separator.xml 01-Nov-2010 20:31 944 -[TXT] axf.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] banner.before.navigation.xml 01-Nov-2010 20:31 869 -[TXT] base.dir.xml 01-Nov-2010 20:31 936 -[TXT] biblioentry.item.separator.xml 01-Nov-2010 20:31 921 -[TXT] biblioentry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] bibliography.collection.xml 01-Nov-2010 20:31 4.0K -[TXT] bibliography.numbered.xml 01-Nov-2010 20:31 911 -[TXT] bibliography.style.xml 01-Nov-2010 20:31 1.3K -[TXT] blockquote.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] blurb.on.titlepage.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] body.attributes.xml 01-Nov-2010 20:31 1.1K -[TXT] body.bg.color.xml 01-Nov-2010 20:31 891 -[TXT] body.end.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] body.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] body.font.master.xml 01-Nov-2010 20:31 1.0K -[TXT] body.font.size.xml 01-Nov-2010 20:31 1.1K -[TXT] body.margin.bottom.xml 01-Nov-2010 20:31 963 -[TXT] body.margin.top.xml 01-Nov-2010 20:31 956 -[TXT] body.start.indent.xml 01-Nov-2010 20:31 2.2K -[TXT] bookmarks.collapse.xml 01-Nov-2010 20:31 1.1K -[TXT] bridgehead.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] bullet.image.xml 01-Nov-2010 20:31 880 -[TXT] callout.defaultcolumn.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.graphics.extension.xml 01-Nov-2010 20:31 1.4K -[TXT] callout.graphics.number.limit.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.graphics.path.xml 01-Nov-2010 20:31 1.1K -[TXT] callout.graphics.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.icon.size.xml 01-Nov-2010 20:31 923 -[TXT] callout.list.table.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.font.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.number.limit.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.start.character.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.unicode.xml 01-Nov-2010 20:31 1.0K -[TXT] callouts.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] chapter.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] chunk.append.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.first.sections.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.quietly.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.section.depth.xml 01-Nov-2010 20:31 903 -[TXT] chunk.sections.xml 01-Nov-2010 20:31 960 -[TXT] chunk.separate.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.tocs.and.lots.has.title.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.tocs.and.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.cdata-section-elements.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-public.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-system.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.indent.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.media-type.xml 01-Nov-2010 20:31 1.5K -[TXT] chunker.output.method.xml 01-Nov-2010 20:31 1.3K -[TXT] chunker.output.omit-xml-declaration.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.standalone.xml 01-Nov-2010 20:31 1.2K -[TXT] citerefentry.link.xml 01-Nov-2010 20:31 1.0K -[TXT] collect.xref.targets.xml 01-Nov-2010 20:31 1.7K -[TXT] column.count.back.xml 01-Nov-2010 20:31 906 -[TXT] column.count.body.xml 01-Nov-2010 20:31 865 -[TXT] column.count.front.xml 01-Nov-2010 20:31 914 -[TXT] column.count.index.xml 01-Nov-2010 20:31 873 -[TXT] column.count.lot.xml 01-Nov-2010 20:31 933 -[TXT] column.count.titlepage.xml 01-Nov-2010 20:31 893 -[TXT] column.gap.back.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.body.xml 01-Nov-2010 20:31 941 -[TXT] column.gap.front.xml 01-Nov-2010 20:31 956 -[TXT] column.gap.index.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.lot.xml 01-Nov-2010 20:31 961 -[TXT] column.gap.titlepage.xml 01-Nov-2010 20:31 1.0K -[TXT] compact.list.item.spacing.xml 01-Nov-2010 20:31 1.2K -[TXT] component.label.includes.part.label.xml 01-Nov-2010 20:31 1.6K -[TXT] component.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] component.titlepage.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] contrib.inline.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] crop.mark.bleed.xml 01-Nov-2010 20:31 946 -[TXT] crop.mark.offset.xml 01-Nov-2010 20:31 916 -[TXT] crop.mark.width.xml 01-Nov-2010 20:31 910 -[TXT] crop.marks.xml 01-Nov-2010 20:31 926 -[TXT] css.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] css.stylesheet.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] css.stylesheet.xml 01-Nov-2010 20:31 1.0K -[TXT] current.docid.xml 01-Nov-2010 20:31 1.7K -[TXT] currentpage.marker.xml 01-Nov-2010 20:31 902 -[TXT] custom.css.source.xml 01-Nov-2010 20:31 4.2K -[TXT] default.float.class.xml 01-Nov-2010 20:31 1.1K -[TXT] default.image.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.table.frame.xml 01-Nov-2010 20:31 914 -[TXT] default.table.rules.xml 01-Nov-2010 20:31 2.2K -[TXT] default.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.units.xml 01-Nov-2010 20:31 1.4K -[TXT] dingbat.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] docbook.css.link.xml 01-Nov-2010 20:31 1.5K -[TXT] docbook.css.source.xml 01-Nov-2010 20:31 3.5K -[TXT] double.sided.xml 01-Nov-2010 20:31 1.0K -[TXT] draft.mode.xml 01-Nov-2010 20:31 1.4K -[TXT] draft.watermark.image.xml 01-Nov-2010 20:31 928 -[TXT] dry-run.xml 01-Nov-2010 20:31 1.1K -[TXT] dynamic.toc.xml 01-Nov-2010 20:31 972 -[TXT] ebnf.assignment.xml 01-Nov-2010 20:31 1.4K -[TXT] ebnf.statement.terminator.xml 01-Nov-2010 20:31 1.1K -[TXT] ebnf.table.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] ebnf.table.border.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.autolabel.xml 01-Nov-2010 20:31 952 -[TXT] eclipse.plugin.id.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.plugin.name.xml 01-Nov-2010 20:31 886 -[TXT] eclipse.plugin.provider.xml 01-Nov-2010 20:31 914 -[TXT] editedby.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] email.delimiters.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] email.mailto.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] emphasis.propagates.style.xml 01-Nov-2010 20:31 1.1K -[TXT] entry.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] epub.autolabel.xml 01-Nov-2010 20:31 923 -[TXT] equation.number.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] equation.properties.xml 01-Nov-2010 20:31 924 -[TXT] example.properties.xml 01-Nov-2010 20:31 917 -[TXT] exsl.node.set.available.xml 01-Nov-2010 20:31 1.6K -[TXT] feedback.href.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.link.text.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.with.ids.xml 01-Nov-2010 20:31 1.0K -[TXT] figure.properties.xml 01-Nov-2010 20:31 912 -[TXT] filename-prefix.xml 01-Nov-2010 20:31 1.1K -[TXT] firstterm.only.link.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.subtitle.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.title.master.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.title.size.xml 01-Nov-2010 20:31 1.1K -[TXT] foilgroup.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] foilgroup.toc.xml 01-Nov-2010 20:31 889 -[TXT] footer.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] footer.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] footer.hr.xml 01-Nov-2010 20:31 881 -[TXT] footer.rule.xml 01-Nov-2010 20:31 847 -[TXT] footer.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] footer.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] footers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] footnote.font.size.xml 01-Nov-2010 20:31 953 -[TXT] footnote.mark.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.number.symbols.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.sep.leader.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] fop.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] fop1.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.object.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.procedures.xml 01-Nov-2010 20:31 895 -[TXT] formal.title.placement.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.title.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] funcsynopsis.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] function.parens.xml 01-Nov-2010 20:31 922 -[TXT] generate.css.header.xml 01-Nov-2010 20:31 1.5K -[TXT] generate.id.attributes.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.index.xml 01-Nov-2010 20:31 847 -[TXT] generate.legalnotice.link.xml 01-Nov-2010 20:31 2.6K -[TXT] generate.manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.meta.abstract.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.revhistory.link.xml 01-Nov-2010 20:31 1.9K -[TXT] generate.section.toc.level.xml 01-Nov-2010 20:31 1.4K -[TXT] generate.toc.xml 01-Nov-2010 20:31 3.6K -[TXT] glossary.as.blocks.xml 01-Nov-2010 20:31 1.3K -[TXT] glossary.collection.xml 01-Nov-2010 20:31 10K -[TXT] glossary.sort.xml 01-Nov-2010 20:31 1.0K -[TXT] glossdef.block.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] glossdef.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossentry.list.item.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] glossentry.show.acronym.xml 01-Nov-2010 20:31 1.4K -[TXT] glosslist.as.blocks.xml 01-Nov-2010 20:31 884 -[TXT] glossterm.auto.link.xml 01-Nov-2010 20:31 1.3K -[TXT] glossterm.block.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] glossterm.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.separation.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.width.xml 01-Nov-2010 20:31 935 -[TXT] graphic.default.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] graphical.admonition.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] graphics.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.use.img.src.path.xml 01-Nov-2010 20:31 1.1K -[TXT] header.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] header.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] header.hr.xml 01-Nov-2010 20:31 880 -[TXT] header.rule.xml 01-Nov-2010 20:31 848 -[TXT] header.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] header.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] headers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] hidetoc.image.xml 01-Nov-2010 20:31 963 -[TXT] highlight.default.language.xml 01-Nov-2010 20:31 956 -[TXT] highlight.source.xml 01-Nov-2010 20:31 3.4K -[TXT] highlight.xslthl.config.xml 01-Nov-2010 20:31 1.1K -[TXT] home.image.xml 01-Nov-2010 20:31 848 -[TXT] html.append.xml 01-Nov-2010 20:31 1.1K -[TXT] html.base.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellpadding.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellspacing.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cleanup.xml 01-Nov-2010 20:31 1.2K -[TXT] html.ext.xml 01-Nov-2010 20:31 947 -[TXT] html.extra.head.links.xml 01-Nov-2010 20:31 1.1K -[TXT] html.head.legalnotice.link.multiple.xml 01-Nov-2010 20:31 1.8K -[TXT] html.head.legalnotice.link.types.xml 01-Nov-2010 20:31 3.1K -[TXT] html.longdesc.link.xml 01-Nov-2010 20:31 1.3K -[TXT] html.longdesc.xml 01-Nov-2010 20:31 1.0K -[TXT] html.stylesheet.type.xml 01-Nov-2010 20:31 944 -[TXT] html.stylesheet.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.alias.file.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.autolabel.xml 01-Nov-2010 20:31 941 -[TXT] htmlhelp.button.back.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.button.forward.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.hideshow.xml 01-Nov-2010 20:31 939 -[TXT] htmlhelp.button.home.url.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.home.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.jump1.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump1.url.xml 01-Nov-2010 20:31 923 -[TXT] htmlhelp.button.jump1.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.button.jump2.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump2.url.xml 01-Nov-2010 20:31 934 -[TXT] htmlhelp.button.jump2.xml 01-Nov-2010 20:31 915 -[TXT] htmlhelp.button.locate.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.next.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.options.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.button.prev.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.print.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.refresh.xml 01-Nov-2010 20:31 926 -[TXT] htmlhelp.button.stop.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.zoom.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.chm.xml 01-Nov-2010 20:31 857 -[TXT] htmlhelp.default.topic.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.display.progress.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.encoding.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.enhanced.decompilation.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enumerate.images.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.force.map.and.alias.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.binary.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.folders.instead.books.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.section.depth.xml 01-Nov-2010 20:31 949 -[TXT] htmlhelp.hhc.show.root.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.width.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.hhc.xml 01-Nov-2010 20:31 878 -[TXT] htmlhelp.hhk.xml 01-Nov-2010 20:31 886 -[TXT] htmlhelp.hhp.tail.xml 01-Nov-2010 20:31 954 -[TXT] htmlhelp.hhp.window.xml 01-Nov-2010 20:31 922 -[TXT] htmlhelp.hhp.windows.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhp.xml 01-Nov-2010 20:31 896 -[TXT] htmlhelp.map.file.xml 01-Nov-2010 20:31 938 -[TXT] htmlhelp.only.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.remember.window.position.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.show.advanced.search.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.show.favorities.xml 01-Nov-2010 20:31 957 -[TXT] htmlhelp.show.menu.xml 01-Nov-2010 20:31 910 -[TXT] htmlhelp.show.toolbar.text.xml 01-Nov-2010 20:31 963 -[TXT] htmlhelp.title.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.use.hhk.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.window.geometry.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.verbatim.characters.xml 01-Nov-2010 20:31 1.1K -[TXT] hyphenate.verbatim.xml 01-Nov-2010 20:31 2.1K -[TXT] hyphenate.xml 01-Nov-2010 20:31 1.0K -[TXT] id.warnings.xml 01-Nov-2010 20:31 1.0K -[TXT] ignore.image.scaling.xml 01-Nov-2010 20:31 963 -[TXT] img.src.path.xml 01-Nov-2010 20:31 1.5K -[TXT] index.div.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] index.entry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.links.to.section.xml 01-Nov-2010 20:31 2.7K -[TXT] index.method.xml 01-Nov-2010 20:31 5.6K -[TXT] index.number.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] index.on.role.xml 01-Nov-2010 20:31 1.6K -[TXT] index.on.type.xml 01-Nov-2010 20:31 1.8K -[TXT] index.page.number.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] index.prefer.titleabbrev.xml 01-Nov-2010 20:31 1.0K -[TXT] index.preferred.page.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.range.separator.xml 01-Nov-2010 20:31 2.0K -[TXT] index.term.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] informal.object.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] informalequation.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informalexample.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informalfigure.properties.xml 01-Nov-2010 20:31 969 -[TXT] informaltable.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] inherit.keywords.xml 01-Nov-2010 20:31 1.1K -[TXT] insert.link.page.number.xml 01-Nov-2010 20:31 2.3K -[TXT] insert.olink.page.number.xml 01-Nov-2010 20:31 2.8K -[TXT] insert.olink.pdf.frag.xml 01-Nov-2010 20:31 2.5K -[TXT] insert.xref.page.number.xml 01-Nov-2010 20:31 1.9K -[TXT] itemizedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] itemizedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] itemizedlist.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] javahelp.encoding.xml 01-Nov-2010 20:31 1.0K -[TXT] keep.relative.image.uris.xml 01-Nov-2010 20:31 1.3K -[TXT] keyboard.nav.xml 01-Nov-2010 20:31 956 -[TXT] l10n.gentext.default.language.xml 01-Nov-2010 20:31 1.1K -[TXT] l10n.gentext.language.xml 01-Nov-2010 20:31 1.2K -[TXT] l10n.gentext.use.xref.language.xml 01-Nov-2010 20:31 1.8K -[TXT] l10n.lang.value.rfc.compliant.xml 01-Nov-2010 20:31 2.4K -[TXT] label.from.part.xml 01-Nov-2010 20:31 1.4K -[TXT] line-height.xml 01-Nov-2010 20:31 839 -[TXT] linenumbering.everyNth.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] linenumbering.width.xml 01-Nov-2010 20:31 955 -[TXT] link.mailto.url.xml 01-Nov-2010 20:31 1.0K -[TXT] list.block.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] list.block.spacing.xml 01-Nov-2010 20:31 1.4K -[TXT] list.item.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] make.clean.html.xml 01-Nov-2010 20:31 2.0K -[TXT] make.graphic.viewport.xml 01-Nov-2010 20:31 1.3K -[TXT] make.index.markup.xml 01-Nov-2010 20:31 2.8K -[TXT] make.single.year.ranges.xml 01-Nov-2010 20:31 1.0K -[TXT] make.valid.html.xml 01-Nov-2010 20:31 1.3K -[TXT] make.year.ranges.xml 01-Nov-2010 20:31 1.1K -[TXT] man.authors.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.base.url.for.relative.links.xml 01-Nov-2010 20:31 3.1K -[TXT] man.break.after.slash.xml 01-Nov-2010 20:31 1.9K -[TXT] man.charmap.enabled.xml 01-Nov-2010 20:31 2.4K -[TXT] man.charmap.subset.profile.english.xml 01-Nov-2010 20:31 3.4K -[TXT] man.charmap.subset.profile.xml 01-Nov-2010 20:31 14K -[TXT] man.charmap.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] man.charmap.use.subset.xml 01-Nov-2010 20:31 3.5K -[TXT] man.copyright.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.endnotes.are.numbered.xml 01-Nov-2010 20:31 4.8K -[TXT] man.endnotes.list.enabled.xml 01-Nov-2010 20:31 5.0K -[TXT] man.endnotes.list.heading.xml 01-Nov-2010 20:31 1.4K -[TXT] man.font.funcprototype.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcsynopsisinfo.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.links.xml 01-Nov-2010 20:31 2.7K -[TXT] man.font.table.headings.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.title.xml 01-Nov-2010 20:31 1.0K -[TXT] man.funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] man.hyphenate.computer.inlines.xml 01-Nov-2010 20:31 1.9K -[TXT] man.hyphenate.filenames.xml 01-Nov-2010 20:31 1.7K -[TXT] man.hyphenate.urls.xml 01-Nov-2010 20:31 1.6K -[TXT] man.hyphenate.xml 01-Nov-2010 20:31 2.3K -[TXT] man.indent.blurbs.xml 01-Nov-2010 20:31 1.2K -[TXT] man.indent.lists.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.refsect.xml 01-Nov-2010 20:31 2.6K -[TXT] man.indent.verbatims.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.width.xml 01-Nov-2010 20:31 1.6K -[TXT] man.justify.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.base.dir.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.better.ps.enabled.xml 01-Nov-2010 20:31 2.6K -[TXT] man.output.encoding.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.in.separate.dir.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.lang.in.name.enabled.xml 01-Nov-2010 20:31 1.8K -[TXT] man.output.manifest.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] man.output.manifest.filename.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] man.output.subdirs.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.segtitle.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] man.string.subst.map.local.post.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.pre.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.xml 01-Nov-2010 20:31 6.7K -[TXT] man.subheading.divider.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.xml 01-Nov-2010 20:31 1.5K -[TXT] man.table.footnotes.divider.xml 01-Nov-2010 20:31 1.1K -[TXT] man.th.extra1.suppress.xml 01-Nov-2010 20:31 1.2K -[TXT] man.th.extra2.max.length.xml 01-Nov-2010 20:31 1.8K -[TXT] man.th.extra2.suppress.xml 01-Nov-2010 20:31 1.6K -[TXT] man.th.extra3.max.length.xml 01-Nov-2010 20:31 1.7K -[TXT] man.th.extra3.suppress.xml 01-Nov-2010 20:31 1.3K -[TXT] man.th.title.max.length.xml 01-Nov-2010 20:31 2.6K -[TXT] manifest.in.base.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] manual.toc.xml 01-Nov-2010 20:31 917 -[TXT] margin.note.float.type.xml 01-Nov-2010 20:31 2.7K -[TXT] margin.note.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] margin.note.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.width.xml 01-Nov-2010 20:31 1.2K -[TXT] marker.section.level.xml 01-Nov-2010 20:31 1.8K -[TXT] menuchoice.menu.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] menuchoice.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] minus.image.xml 01-Nov-2010 20:31 965 -[TXT] monospace.font.family.xml 01-Nov-2010 20:31 1.0K -[TXT] monospace.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] monospace.verbatim.font.width.xml 01-Nov-2010 20:31 1.5K -[TXT] monospace.verbatim.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] multiframe.bottom.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.navigation.height.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.top.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.xml 01-Nov-2010 20:31 1.1K -[TXT] nav.separator.xml 01-Nov-2010 20:31 952 -[TXT] nav.table.summary.xml 01-Nov-2010 20:31 1.0K -[TXT] navbgcolor.xml 01-Nov-2010 20:31 926 -[TXT] navbodywidth.xml 01-Nov-2010 20:31 911 -[TXT] navig.graphics.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.showtitles.xml 01-Nov-2010 20:31 1.1K -[TXT] navtocwidth.xml 01-Nov-2010 20:31 937 -[TXT] next.image.xml 01-Nov-2010 20:31 867 -[TXT] no.home.image.xml 01-Nov-2010 20:31 883 -[TXT] no.next.image.xml 01-Nov-2010 20:31 901 -[TXT] no.prev.image.xml 01-Nov-2010 20:31 900 -[TXT] no.toc.image.xml 01-Nov-2010 20:31 875 -[TXT] no.up.image.xml 01-Nov-2010 20:31 888 -[TXT] nominal.image.depth.xml 01-Nov-2010 20:31 896 -[TXT] nominal.image.width.xml 01-Nov-2010 20:31 1.7K -[TXT] nominal.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] nongraphical.admonition.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] normal.para.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.base.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] olink.debug.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.doctitle.xml 01-Nov-2010 20:31 4.6K -[TXT] olink.fragid.xml 01-Nov-2010 20:31 905 -[TXT] olink.lang.fallback.sequence.xml 01-Nov-2010 20:31 3.1K -[TXT] olink.outline.ext.xml 01-Nov-2010 20:31 958 -[TXT] olink.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.pubid.xml 01-Nov-2010 20:31 838 -[TXT] olink.resolver.xml 01-Nov-2010 20:31 859 -[TXT] olink.sysid.xml 01-Nov-2010 20:31 843 -[TXT] orderedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] orderedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] othercredit.like.author.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] output-root.xml 01-Nov-2010 20:31 1.0K -[TXT] output.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] overlay.js.xml 01-Nov-2010 20:31 919 -[TXT] overlay.logo.xml 01-Nov-2010 20:31 953 -[TXT] overlay.xml 01-Nov-2010 20:31 1.1K -[TXT] page.height.portrait.xml 01-Nov-2010 20:31 3.1K -[TXT] page.height.xml 01-Nov-2010 20:31 1.2K -[TXT] page.margin.bottom.xml 01-Nov-2010 20:31 951 -[TXT] page.margin.inner.xml 01-Nov-2010 20:31 1.9K -[TXT] page.margin.outer.xml 01-Nov-2010 20:31 1.8K -[TXT] page.margin.top.xml 01-Nov-2010 20:31 924 -[TXT] page.orientation.xml 01-Nov-2010 20:31 1.1K -[TXT] page.width.portrait.xml 01-Nov-2010 20:31 3.0K -[TXT] page.width.xml 01-Nov-2010 20:31 1.2K -[TXT] pages.template.xml 01-Nov-2010 20:31 1.4K -[TXT] paper.type.xml 01-Nov-2010 20:31 4.3K -[TXT] para.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] part.autolabel.xml 01-Nov-2010 20:31 2.3K -[TXT] passivetex.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] pgwide.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] phrase.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] pixels.per.inch.xml 01-Nov-2010 20:31 1.0K -[TXT] plus.image.xml 01-Nov-2010 20:31 959 -[TXT] points.per.em.xml 01-Nov-2010 20:31 1.0K -[TXT] preface.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] prefer.internal.olink.xml 01-Nov-2010 20:31 2.9K -[TXT] preferred.mediaobject.role.xml 01-Nov-2010 20:31 1.6K -[TXT] prev.image.xml 01-Nov-2010 20:31 864 -[TXT] procedure.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] process.empty.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] process.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.arch.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.attribute.xml 01-Nov-2010 20:31 1.2K -[TXT] profile.audience.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.condition.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.conformance.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.lang.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.os.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.revision.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.revisionflag.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.role.xml 01-Nov-2010 20:31 2.2K -[TXT] profile.security.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.separator.xml 01-Nov-2010 20:31 942 -[TXT] profile.status.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.userlevel.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.value.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.vendor.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.wordsize.xml 01-Nov-2010 20:31 1.3K -[TXT] punct.honorific.xml 01-Nov-2010 20:31 942 -[TXT] qanda.defaultlabel.xml 01-Nov-2010 20:31 2.9K -[TXT] qanda.in.toc.xml 01-Nov-2010 20:31 1.2K -[TXT] qanda.inherit.numeration.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.nested.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] qanda.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] qandadiv.autolabel.xml 01-Nov-2010 20:31 896 -[TXT] rebuild-all.xml 01-Nov-2010 20:31 1.3K -[TXT] refclass.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] refentry.date.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.date.profile.xml 01-Nov-2010 20:31 1.4K -[TXT] refentry.generate.name.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.title.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.manual.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.manual.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.profile.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.meta.get.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.pagebreak.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.separator.xml 01-Nov-2010 20:31 942 -[TXT] refentry.source.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.name.profile.enabled.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.name.profile.xml 01-Nov-2010 20:31 3.4K -[TXT] refentry.source.name.suppress.xml 01-Nov-2010 20:31 1.8K -[TXT] refentry.title.properties.xml 01-Nov-2010 20:31 2.6K -[TXT] refentry.version.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.version.profile.xml 01-Nov-2010 20:31 1.6K -[TXT] refentry.version.suppress.xml 01-Nov-2010 20:31 1.7K -[TXT] refentry.xref.manvolnum.xml 01-Nov-2010 20:31 1.0K -[TXT] reference.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] region.after.extent.xml 01-Nov-2010 20:31 928 -[TXT] region.before.extent.xml 01-Nov-2010 20:31 933 -[TXT] revhistory.table.cell.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.title.properties.xml 01-Nov-2010 20:31 966 -[TXT] root.filename.xml 01-Nov-2010 20:31 963 -[TXT] root.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] rootid.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.default.title.end.punct.xml 01-Nov-2010 20:31 1.1K -[TXT] runinhead.title.end.punct.xml 01-Nov-2010 20:31 1.2K -[TXT] running.foot.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] sans.font.family.xml 01-Nov-2010 20:31 938 -[TXT] saxon.callouts.xml 01-Nov-2010 20:31 946 -[TXT] saxon.character.representation.xml 01-Nov-2010 20:31 1.6K -[TXT] saxon.linenumbering.xml 01-Nov-2010 20:31 1.1K -[TXT] saxon.tablecolumns.xml 01-Nov-2010 20:31 1.0K -[TXT] script.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] section.autolabel.max.depth.xml 01-Nov-2010 20:31 1.1K -[TXT] section.autolabel.xml 01-Nov-2010 20:31 883 -[TXT] section.container.element.xml 01-Nov-2010 20:31 2.3K -[TXT] section.label.includes.component.label.xml 01-Nov-2010 20:31 1.0K -[TXT] section.level1.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level2.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level3.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level4.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level5.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level6.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] segmentedlist.as.table.xml 01-Nov-2010 20:31 927 -[TXT] sequential.links.xml 01-Nov-2010 20:31 824 -[TXT] shade.verbatim.style.xml 01-Nov-2010 20:31 1.5K -[TXT] shade.verbatim.xml 01-Nov-2010 20:31 1.0K -[TXT] show.comments.xml 01-Nov-2010 20:31 1.1K -[TXT] show.foil.number.xml 01-Nov-2010 20:31 926 -[TXT] show.revisionflag.xml 01-Nov-2010 20:31 1.7K -[TXT] showtoc.image.xml 01-Nov-2010 20:31 963 -[TXT] side.float.properties.xml 01-Nov-2010 20:31 2.0K -[TXT] sidebar.float.type.xml 01-Nov-2010 20:31 2.9K -[TXT] sidebar.float.width.xml 01-Nov-2010 20:31 1.2K -[TXT] sidebar.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] sidebar.title.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] simplesect.in.toc.xml 01-Nov-2010 20:31 921 -[TXT] slide.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] slides.js.xml 01-Nov-2010 20:31 909 -[TXT] slides.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] spacing.paras.xml 01-Nov-2010 20:31 1.0K -[TXT] speakernote.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] subscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] superscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] suppress.footer.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.header.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.homepage.title.xml 01-Nov-2010 20:31 916 -[TXT] suppress.navigation.xml 01-Nov-2010 20:31 910 -[TXT] symbol.font.family.xml 01-Nov-2010 20:31 1.7K -[TXT] table.borders.with.css.xml 01-Nov-2010 20:31 928 -[TXT] table.cell.border.color.xml 01-Nov-2010 20:31 1.5K -[TXT] table.cell.border.style.xml 01-Nov-2010 20:31 1.7K -[TXT] table.cell.border.thickness.xml 01-Nov-2010 20:31 1.2K -[TXT] table.cell.padding.xml 01-Nov-2010 20:31 1.1K -[TXT] table.entry.padding.xml 01-Nov-2010 20:31 808 -[TXT] table.footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] table.footnote.number.symbols.xml 01-Nov-2010 20:31 1.8K -[TXT] table.footnote.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] table.frame.border.color.xml 01-Nov-2010 20:31 1.0K -[TXT] table.frame.border.style.xml 01-Nov-2010 20:31 1.6K -[TXT] table.frame.border.thickness.xml 01-Nov-2010 20:31 963 -[TXT] table.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] table.spacer.image.xml 01-Nov-2010 20:31 1.1K -[TXT] table.table.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] tablecolumns.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] target.database.document.xml 01-Nov-2010 20:31 1.6K -[TXT] targets.filename.xml 01-Nov-2010 20:31 1.3K -[TXT] template.xml 01-Nov-2010 20:31 730 -[TXT] tex.math.delims.xml 01-Nov-2010 20:31 1.5K -[TXT] tex.math.file.xml 01-Nov-2010 20:31 1.4K -[TXT] tex.math.in.alt.xml 01-Nov-2010 20:31 2.7K -[TXT] text.home.xml 01-Nov-2010 20:31 775 -[TXT] text.next.xml 01-Nov-2010 20:31 777 -[TXT] text.prev.xml 01-Nov-2010 20:31 777 -[TXT] text.toc.xml 01-Nov-2010 20:31 771 -[TXT] text.up.xml 01-Nov-2010 20:31 766 -[TXT] textbgcolor.xml 01-Nov-2010 20:31 921 -[TXT] textdata.default.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] textinsert.extension.xml 01-Nov-2010 20:31 2.8K -[TXT] title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] title.margin.left.xml 01-Nov-2010 20:31 2.1K -[TXT] titlefoil.html.xml 01-Nov-2010 20:31 889 -[TXT] toc.bg.color.xml 01-Nov-2010 20:31 865 -[TXT] toc.blank.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.hide.show.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.html.xml 01-Nov-2010 20:31 856 -[TXT] toc.image.xml 01-Nov-2010 20:31 840 -[TXT] toc.indent.width.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.line.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] toc.list.type.xml 01-Nov-2010 20:31 1.1K -[TXT] toc.margin.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] toc.max.depth.xml 01-Nov-2010 20:31 877 -[TXT] toc.pointer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.row.height.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.section.depth.xml 01-Nov-2010 20:31 939 -[TXT] toc.spacer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.width.xml 01-Nov-2010 20:31 861 -[TXT] ua.js.xml 01-Nov-2010 20:31 879 -[TXT] ulink.footnotes.xml 01-Nov-2010 20:31 1.2K -[TXT] ulink.hyphenate.chars.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.show.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.target.xml 01-Nov-2010 20:31 1.0K -[TXT] up.image.xml 01-Nov-2010 20:31 852 -[TXT] use.embed.for.svg.xml 01-Nov-2010 20:31 1.2K -[TXT] use.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] use.id.as.filename.xml 01-Nov-2010 20:31 1.0K -[TXT] use.id.function.xml 01-Nov-2010 20:31 1.2K -[TXT] use.local.olink.style.xml 01-Nov-2010 20:31 1.7K -[TXT] use.role.as.xrefstyle.xml 01-Nov-2010 20:31 3.2K -[TXT] use.role.for.mediaobject.xml 01-Nov-2010 20:31 1.9K -[TXT] use.svg.xml 01-Nov-2010 20:31 1.0K -[TXT] variablelist.as.blocks.xml 01-Nov-2010 20:31 2.3K -[TXT] variablelist.as.table.xml 01-Nov-2010 20:31 2.0K -[TXT] variablelist.max.termlength.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.term.break.after.xml 01-Nov-2010 20:31 1.4K -[TXT] variablelist.term.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] variablelist.term.separator.xml 01-Nov-2010 20:31 1.6K -[TXT] verbatim.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] wordml.template.xml 01-Nov-2010 20:31 1.3K -[TXT] writing.mode.xml 01-Nov-2010 20:31 2.4K -[TXT] xbCollapsibleLists.js.xml 01-Nov-2010 20:31 1.0K -[TXT] xbDOM.js.xml 01-Nov-2010 20:31 903 -[TXT] xbLibrary.js.xml 01-Nov-2010 20:31 935 -[TXT] xbStyle.js.xml 01-Nov-2010 20:31 919 -[TXT] xep.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] xep.index.item.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] xref.label-page.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] xref.label-title.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.properties.xml 01-Nov-2010 20:31 931 -[TXT] xref.title-page.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.with.number.and.title.xml 01-Nov-2010 20:31 1.1K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=D;O=D deleted file mode 100644 index 4833e82705e31c76213b2816ecb9c5de5064a0d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=D;O=D +++ /dev/null @@ -1,677 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/params - - -

    Index of /release/xsl-ns/1.76.1/params

    -
    Icon  Name                                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.with.number.and.title.xml 01-Nov-2010 20:31 1.1K -[TXT] xref.title-page.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.properties.xml 01-Nov-2010 20:31 931 -[TXT] xref.label-title.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.label-page.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] xep.index.item.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] xep.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] xbStyle.js.xml 01-Nov-2010 20:31 919 -[TXT] xbLibrary.js.xml 01-Nov-2010 20:31 935 -[TXT] xbDOM.js.xml 01-Nov-2010 20:31 903 -[TXT] xbCollapsibleLists.js.xml 01-Nov-2010 20:31 1.0K -[TXT] writing.mode.xml 01-Nov-2010 20:31 2.4K -[TXT] wordml.template.xml 01-Nov-2010 20:31 1.3K -[TXT] verbatim.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] variablelist.term.separator.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.term.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] variablelist.term.break.after.xml 01-Nov-2010 20:31 1.4K -[TXT] variablelist.max.termlength.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.as.table.xml 01-Nov-2010 20:31 2.0K -[TXT] variablelist.as.blocks.xml 01-Nov-2010 20:31 2.3K -[TXT] use.svg.xml 01-Nov-2010 20:31 1.0K -[TXT] use.role.for.mediaobject.xml 01-Nov-2010 20:31 1.9K -[TXT] use.role.as.xrefstyle.xml 01-Nov-2010 20:31 3.2K -[TXT] use.local.olink.style.xml 01-Nov-2010 20:31 1.7K -[TXT] use.id.function.xml 01-Nov-2010 20:31 1.2K -[TXT] use.id.as.filename.xml 01-Nov-2010 20:31 1.0K -[TXT] use.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] use.embed.for.svg.xml 01-Nov-2010 20:31 1.2K -[TXT] up.image.xml 01-Nov-2010 20:31 852 -[TXT] ulink.target.xml 01-Nov-2010 20:31 1.0K -[TXT] ulink.show.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.chars.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.footnotes.xml 01-Nov-2010 20:31 1.2K -[TXT] ua.js.xml 01-Nov-2010 20:31 879 -[TXT] toc.width.xml 01-Nov-2010 20:31 861 -[TXT] toc.spacer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.section.depth.xml 01-Nov-2010 20:31 939 -[TXT] toc.row.height.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.pointer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.max.depth.xml 01-Nov-2010 20:31 877 -[TXT] toc.margin.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] toc.list.type.xml 01-Nov-2010 20:31 1.1K -[TXT] toc.line.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] toc.indent.width.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.image.xml 01-Nov-2010 20:31 840 -[TXT] toc.html.xml 01-Nov-2010 20:31 856 -[TXT] toc.hide.show.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.blank.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.bg.color.xml 01-Nov-2010 20:31 865 -[TXT] titlefoil.html.xml 01-Nov-2010 20:31 889 -[TXT] title.margin.left.xml 01-Nov-2010 20:31 2.1K -[TXT] title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] textinsert.extension.xml 01-Nov-2010 20:31 2.8K -[TXT] textdata.default.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] textbgcolor.xml 01-Nov-2010 20:31 921 -[TXT] text.up.xml 01-Nov-2010 20:31 766 -[TXT] text.toc.xml 01-Nov-2010 20:31 771 -[TXT] text.prev.xml 01-Nov-2010 20:31 777 -[TXT] text.next.xml 01-Nov-2010 20:31 777 -[TXT] text.home.xml 01-Nov-2010 20:31 775 -[TXT] tex.math.in.alt.xml 01-Nov-2010 20:31 2.7K -[TXT] tex.math.file.xml 01-Nov-2010 20:31 1.4K -[TXT] tex.math.delims.xml 01-Nov-2010 20:31 1.5K -[TXT] template.xml 01-Nov-2010 20:31 730 -[TXT] targets.filename.xml 01-Nov-2010 20:31 1.3K -[TXT] target.database.document.xml 01-Nov-2010 20:31 1.6K -[TXT] tablecolumns.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] table.table.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] table.spacer.image.xml 01-Nov-2010 20:31 1.1K -[TXT] table.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] table.frame.border.thickness.xml 01-Nov-2010 20:31 963 -[TXT] table.frame.border.style.xml 01-Nov-2010 20:31 1.6K -[TXT] table.frame.border.color.xml 01-Nov-2010 20:31 1.0K -[TXT] table.footnote.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] table.footnote.number.symbols.xml 01-Nov-2010 20:31 1.8K -[TXT] table.footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] table.entry.padding.xml 01-Nov-2010 20:31 808 -[TXT] table.cell.padding.xml 01-Nov-2010 20:31 1.1K -[TXT] table.cell.border.thickness.xml 01-Nov-2010 20:31 1.2K -[TXT] table.cell.border.style.xml 01-Nov-2010 20:31 1.7K -[TXT] table.cell.border.color.xml 01-Nov-2010 20:31 1.5K -[TXT] table.borders.with.css.xml 01-Nov-2010 20:31 928 -[TXT] symbol.font.family.xml 01-Nov-2010 20:31 1.7K -[TXT] suppress.navigation.xml 01-Nov-2010 20:31 910 -[TXT] suppress.homepage.title.xml 01-Nov-2010 20:31 916 -[TXT] suppress.header.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.footer.navigation.xml 01-Nov-2010 20:31 922 -[TXT] superscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] subscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] speakernote.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] spacing.paras.xml 01-Nov-2010 20:31 1.0K -[TXT] slides.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] slides.js.xml 01-Nov-2010 20:31 909 -[TXT] slide.title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] simplesect.in.toc.xml 01-Nov-2010 20:31 921 -[TXT] sidebar.title.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] sidebar.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] sidebar.float.width.xml 01-Nov-2010 20:31 1.2K -[TXT] sidebar.float.type.xml 01-Nov-2010 20:31 2.9K -[TXT] side.float.properties.xml 01-Nov-2010 20:31 2.0K -[TXT] showtoc.image.xml 01-Nov-2010 20:31 963 -[TXT] show.revisionflag.xml 01-Nov-2010 20:31 1.7K -[TXT] show.foil.number.xml 01-Nov-2010 20:31 926 -[TXT] show.comments.xml 01-Nov-2010 20:31 1.1K -[TXT] shade.verbatim.xml 01-Nov-2010 20:31 1.0K -[TXT] shade.verbatim.style.xml 01-Nov-2010 20:31 1.5K -[TXT] sequential.links.xml 01-Nov-2010 20:31 824 -[TXT] segmentedlist.as.table.xml 01-Nov-2010 20:31 927 -[TXT] section.title.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] section.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.level6.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level5.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level4.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level3.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level2.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level1.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.label.includes.component.label.xml 01-Nov-2010 20:31 1.0K -[TXT] section.container.element.xml 01-Nov-2010 20:31 2.3K -[TXT] section.autolabel.xml 01-Nov-2010 20:31 883 -[TXT] section.autolabel.max.depth.xml 01-Nov-2010 20:31 1.1K -[TXT] script.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] saxon.tablecolumns.xml 01-Nov-2010 20:31 1.0K -[TXT] saxon.linenumbering.xml 01-Nov-2010 20:31 1.1K -[TXT] saxon.character.representation.xml 01-Nov-2010 20:31 1.6K -[TXT] saxon.callouts.xml 01-Nov-2010 20:31 946 -[TXT] sans.font.family.xml 01-Nov-2010 20:31 938 -[TXT] running.foot.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.title.end.punct.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.default.title.end.punct.xml 01-Nov-2010 20:31 1.1K -[TXT] rootid.xml 01-Nov-2010 20:31 1.2K -[TXT] root.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] root.filename.xml 01-Nov-2010 20:31 963 -[TXT] revhistory.title.properties.xml 01-Nov-2010 20:31 966 -[TXT] revhistory.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.cell.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] region.before.extent.xml 01-Nov-2010 20:31 933 -[TXT] region.after.extent.xml 01-Nov-2010 20:31 928 -[TXT] reference.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.xref.manvolnum.xml 01-Nov-2010 20:31 1.0K -[TXT] refentry.version.suppress.xml 01-Nov-2010 20:31 1.7K -[TXT] refentry.version.profile.xml 01-Nov-2010 20:31 1.6K -[TXT] refentry.version.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.title.properties.xml 01-Nov-2010 20:31 2.6K -[TXT] refentry.source.name.suppress.xml 01-Nov-2010 20:31 1.8K -[TXT] refentry.source.name.profile.xml 01-Nov-2010 20:31 3.4K -[TXT] refentry.source.name.profile.enabled.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.separator.xml 01-Nov-2010 20:31 942 -[TXT] refentry.pagebreak.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.meta.get.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.manual.profile.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.manual.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.generate.title.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.name.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.date.profile.xml 01-Nov-2010 20:31 1.4K -[TXT] refentry.date.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refclass.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] rebuild-all.xml 01-Nov-2010 20:31 1.3K -[TXT] qandadiv.autolabel.xml 01-Nov-2010 20:31 896 -[TXT] qanda.title.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] qanda.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.nested.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] qanda.inherit.numeration.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.in.toc.xml 01-Nov-2010 20:31 1.2K -[TXT] qanda.defaultlabel.xml 01-Nov-2010 20:31 2.9K -[TXT] punct.honorific.xml 01-Nov-2010 20:31 942 -[TXT] profile.wordsize.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.vendor.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.value.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.userlevel.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.status.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.separator.xml 01-Nov-2010 20:31 942 -[TXT] profile.security.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.role.xml 01-Nov-2010 20:31 2.2K -[TXT] profile.revisionflag.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.revision.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.os.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.lang.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.conformance.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.condition.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.audience.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.attribute.xml 01-Nov-2010 20:31 1.2K -[TXT] profile.arch.xml 01-Nov-2010 20:31 1.3K -[TXT] process.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] process.empty.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] procedure.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] prev.image.xml 01-Nov-2010 20:31 864 -[TXT] preferred.mediaobject.role.xml 01-Nov-2010 20:31 1.6K -[TXT] prefer.internal.olink.xml 01-Nov-2010 20:31 2.9K -[TXT] preface.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] points.per.em.xml 01-Nov-2010 20:31 1.0K -[TXT] plus.image.xml 01-Nov-2010 20:31 959 -[TXT] pixels.per.inch.xml 01-Nov-2010 20:31 1.0K -[TXT] phrase.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] pgwide.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] passivetex.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] part.autolabel.xml 01-Nov-2010 20:31 2.3K -[TXT] para.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] paper.type.xml 01-Nov-2010 20:31 4.3K -[TXT] pages.template.xml 01-Nov-2010 20:31 1.4K -[TXT] page.width.xml 01-Nov-2010 20:31 1.2K -[TXT] page.width.portrait.xml 01-Nov-2010 20:31 3.0K -[TXT] page.orientation.xml 01-Nov-2010 20:31 1.1K -[TXT] page.margin.top.xml 01-Nov-2010 20:31 924 -[TXT] page.margin.outer.xml 01-Nov-2010 20:31 1.8K -[TXT] page.margin.inner.xml 01-Nov-2010 20:31 1.9K -[TXT] page.margin.bottom.xml 01-Nov-2010 20:31 951 -[TXT] page.height.xml 01-Nov-2010 20:31 1.2K -[TXT] page.height.portrait.xml 01-Nov-2010 20:31 3.1K -[TXT] overlay.xml 01-Nov-2010 20:31 1.1K -[TXT] overlay.logo.xml 01-Nov-2010 20:31 953 -[TXT] overlay.js.xml 01-Nov-2010 20:31 919 -[TXT] output.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] output-root.xml 01-Nov-2010 20:31 1.0K -[TXT] othercredit.like.author.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] orderedlist.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] olink.sysid.xml 01-Nov-2010 20:31 843 -[TXT] olink.resolver.xml 01-Nov-2010 20:31 859 -[TXT] olink.pubid.xml 01-Nov-2010 20:31 838 -[TXT] olink.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.outline.ext.xml 01-Nov-2010 20:31 958 -[TXT] olink.lang.fallback.sequence.xml 01-Nov-2010 20:31 3.1K -[TXT] olink.fragid.xml 01-Nov-2010 20:31 905 -[TXT] olink.doctitle.xml 01-Nov-2010 20:31 4.6K -[TXT] olink.debug.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.base.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] normal.para.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] nongraphical.admonition.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] nominal.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] nominal.image.width.xml 01-Nov-2010 20:31 1.7K -[TXT] nominal.image.depth.xml 01-Nov-2010 20:31 896 -[TXT] no.up.image.xml 01-Nov-2010 20:31 888 -[TXT] no.toc.image.xml 01-Nov-2010 20:31 875 -[TXT] no.prev.image.xml 01-Nov-2010 20:31 900 -[TXT] no.next.image.xml 01-Nov-2010 20:31 901 -[TXT] no.home.image.xml 01-Nov-2010 20:31 883 -[TXT] next.image.xml 01-Nov-2010 20:31 867 -[TXT] navtocwidth.xml 01-Nov-2010 20:31 937 -[TXT] navig.showtitles.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.graphics.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] navbodywidth.xml 01-Nov-2010 20:31 911 -[TXT] navbgcolor.xml 01-Nov-2010 20:31 926 -[TXT] nav.table.summary.xml 01-Nov-2010 20:31 1.0K -[TXT] nav.separator.xml 01-Nov-2010 20:31 952 -[TXT] multiframe.xml 01-Nov-2010 20:31 1.1K -[TXT] multiframe.top.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.navigation.height.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.bottom.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] monospace.verbatim.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] monospace.verbatim.font.width.xml 01-Nov-2010 20:31 1.5K -[TXT] monospace.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] monospace.font.family.xml 01-Nov-2010 20:31 1.0K -[TXT] minus.image.xml 01-Nov-2010 20:31 965 -[TXT] menuchoice.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] menuchoice.menu.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] marker.section.level.xml 01-Nov-2010 20:31 1.8K -[TXT] margin.note.width.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] margin.note.float.type.xml 01-Nov-2010 20:31 2.7K -[TXT] manual.toc.xml 01-Nov-2010 20:31 917 -[TXT] manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.in.base.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] man.th.title.max.length.xml 01-Nov-2010 20:31 2.6K -[TXT] man.th.extra3.suppress.xml 01-Nov-2010 20:31 1.3K -[TXT] man.th.extra3.max.length.xml 01-Nov-2010 20:31 1.7K -[TXT] man.th.extra2.suppress.xml 01-Nov-2010 20:31 1.6K -[TXT] man.th.extra2.max.length.xml 01-Nov-2010 20:31 1.8K -[TXT] man.th.extra1.suppress.xml 01-Nov-2010 20:31 1.2K -[TXT] man.table.footnotes.divider.xml 01-Nov-2010 20:31 1.1K -[TXT] man.subheading.divider.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.string.subst.map.xml 01-Nov-2010 20:31 6.7K -[TXT] man.string.subst.map.local.pre.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.post.xml 01-Nov-2010 20:31 1.3K -[TXT] man.segtitle.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] man.output.subdirs.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] man.output.manifest.filename.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.manifest.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] man.output.lang.in.name.enabled.xml 01-Nov-2010 20:31 1.8K -[TXT] man.output.in.separate.dir.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.encoding.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.better.ps.enabled.xml 01-Nov-2010 20:31 2.6K -[TXT] man.output.base.dir.xml 01-Nov-2010 20:31 1.5K -[TXT] man.justify.xml 01-Nov-2010 20:31 2.1K -[TXT] man.indent.width.xml 01-Nov-2010 20:31 1.6K -[TXT] man.indent.verbatims.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.refsect.xml 01-Nov-2010 20:31 2.6K -[TXT] man.indent.lists.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.blurbs.xml 01-Nov-2010 20:31 1.2K -[TXT] man.hyphenate.xml 01-Nov-2010 20:31 2.3K -[TXT] man.hyphenate.urls.xml 01-Nov-2010 20:31 1.6K -[TXT] man.hyphenate.filenames.xml 01-Nov-2010 20:31 1.7K -[TXT] man.hyphenate.computer.inlines.xml 01-Nov-2010 20:31 1.9K -[TXT] man.funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] man.font.table.title.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.headings.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.links.xml 01-Nov-2010 20:31 2.7K -[TXT] man.font.funcsynopsisinfo.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcprototype.xml 01-Nov-2010 20:31 1.1K -[TXT] man.endnotes.list.heading.xml 01-Nov-2010 20:31 1.4K -[TXT] man.endnotes.list.enabled.xml 01-Nov-2010 20:31 5.0K -[TXT] man.endnotes.are.numbered.xml 01-Nov-2010 20:31 4.8K -[TXT] man.copyright.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.charmap.use.subset.xml 01-Nov-2010 20:31 3.5K -[TXT] man.charmap.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] man.charmap.subset.profile.xml 01-Nov-2010 20:31 14K -[TXT] man.charmap.subset.profile.english.xml 01-Nov-2010 20:31 3.4K -[TXT] man.charmap.enabled.xml 01-Nov-2010 20:31 2.4K -[TXT] man.break.after.slash.xml 01-Nov-2010 20:31 1.9K -[TXT] man.base.url.for.relative.links.xml 01-Nov-2010 20:31 3.1K -[TXT] man.authors.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] make.year.ranges.xml 01-Nov-2010 20:31 1.1K -[TXT] make.valid.html.xml 01-Nov-2010 20:31 1.3K -[TXT] make.single.year.ranges.xml 01-Nov-2010 20:31 1.0K -[TXT] make.index.markup.xml 01-Nov-2010 20:31 2.8K -[TXT] make.graphic.viewport.xml 01-Nov-2010 20:31 1.3K -[TXT] make.clean.html.xml 01-Nov-2010 20:31 2.0K -[TXT] list.item.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] list.block.spacing.xml 01-Nov-2010 20:31 1.4K -[TXT] list.block.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] link.mailto.url.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.width.xml 01-Nov-2010 20:31 955 -[TXT] linenumbering.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] linenumbering.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.everyNth.xml 01-Nov-2010 20:31 1.0K -[TXT] line-height.xml 01-Nov-2010 20:31 839 -[TXT] label.from.part.xml 01-Nov-2010 20:31 1.4K -[TXT] l10n.lang.value.rfc.compliant.xml 01-Nov-2010 20:31 2.4K -[TXT] l10n.gentext.use.xref.language.xml 01-Nov-2010 20:31 1.8K -[TXT] l10n.gentext.language.xml 01-Nov-2010 20:31 1.2K -[TXT] l10n.gentext.default.language.xml 01-Nov-2010 20:31 1.1K -[TXT] keyboard.nav.xml 01-Nov-2010 20:31 956 -[TXT] keep.relative.image.uris.xml 01-Nov-2010 20:31 1.3K -[TXT] javahelp.encoding.xml 01-Nov-2010 20:31 1.0K -[TXT] itemizedlist.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] itemizedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] itemizedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] insert.xref.page.number.xml 01-Nov-2010 20:31 1.9K -[TXT] insert.olink.pdf.frag.xml 01-Nov-2010 20:31 2.5K -[TXT] insert.olink.page.number.xml 01-Nov-2010 20:31 2.8K -[TXT] insert.link.page.number.xml 01-Nov-2010 20:31 2.3K -[TXT] inherit.keywords.xml 01-Nov-2010 20:31 1.1K -[TXT] informaltable.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] informalfigure.properties.xml 01-Nov-2010 20:31 969 -[TXT] informalexample.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informalequation.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informal.object.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] index.term.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] index.range.separator.xml 01-Nov-2010 20:31 2.0K -[TXT] index.preferred.page.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.prefer.titleabbrev.xml 01-Nov-2010 20:31 1.0K -[TXT] index.page.number.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] index.on.type.xml 01-Nov-2010 20:31 1.8K -[TXT] index.on.role.xml 01-Nov-2010 20:31 1.6K -[TXT] index.number.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] index.method.xml 01-Nov-2010 20:31 5.6K -[TXT] index.links.to.section.xml 01-Nov-2010 20:31 2.7K -[TXT] index.entry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.div.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] img.src.path.xml 01-Nov-2010 20:31 1.5K -[TXT] ignore.image.scaling.xml 01-Nov-2010 20:31 963 -[TXT] id.warnings.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.verbatim.xml 01-Nov-2010 20:31 2.1K -[TXT] hyphenate.verbatim.characters.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.window.geometry.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.use.hhk.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.title.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.show.toolbar.text.xml 01-Nov-2010 20:31 963 -[TXT] htmlhelp.show.menu.xml 01-Nov-2010 20:31 910 -[TXT] htmlhelp.show.favorities.xml 01-Nov-2010 20:31 957 -[TXT] htmlhelp.show.advanced.search.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.remember.window.position.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.only.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.map.file.xml 01-Nov-2010 20:31 938 -[TXT] htmlhelp.hhp.xml 01-Nov-2010 20:31 896 -[TXT] htmlhelp.hhp.windows.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhp.window.xml 01-Nov-2010 20:31 922 -[TXT] htmlhelp.hhp.tail.xml 01-Nov-2010 20:31 954 -[TXT] htmlhelp.hhk.xml 01-Nov-2010 20:31 886 -[TXT] htmlhelp.hhc.xml 01-Nov-2010 20:31 878 -[TXT] htmlhelp.hhc.width.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.hhc.show.root.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.section.depth.xml 01-Nov-2010 20:31 949 -[TXT] htmlhelp.hhc.folders.instead.books.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.binary.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.force.map.and.alias.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.enumerate.images.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enhanced.decompilation.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.encoding.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.display.progress.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.default.topic.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.chm.xml 01-Nov-2010 20:31 857 -[TXT] htmlhelp.button.zoom.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.stop.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.refresh.xml 01-Nov-2010 20:31 926 -[TXT] htmlhelp.button.print.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.prev.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.options.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.button.next.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.locate.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.jump2.xml 01-Nov-2010 20:31 915 -[TXT] htmlhelp.button.jump2.url.xml 01-Nov-2010 20:31 934 -[TXT] htmlhelp.button.jump2.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump1.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.button.jump1.url.xml 01-Nov-2010 20:31 923 -[TXT] htmlhelp.button.jump1.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.home.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.home.url.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.hideshow.xml 01-Nov-2010 20:31 939 -[TXT] htmlhelp.button.forward.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.back.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.autolabel.xml 01-Nov-2010 20:31 941 -[TXT] htmlhelp.alias.file.xml 01-Nov-2010 20:31 916 -[TXT] html.stylesheet.xml 01-Nov-2010 20:31 1.3K -[TXT] html.stylesheet.type.xml 01-Nov-2010 20:31 944 -[TXT] html.longdesc.xml 01-Nov-2010 20:31 1.0K -[TXT] html.longdesc.link.xml 01-Nov-2010 20:31 1.3K -[TXT] html.head.legalnotice.link.types.xml 01-Nov-2010 20:31 3.1K -[TXT] html.head.legalnotice.link.multiple.xml 01-Nov-2010 20:31 1.8K -[TXT] html.extra.head.links.xml 01-Nov-2010 20:31 1.1K -[TXT] html.ext.xml 01-Nov-2010 20:31 947 -[TXT] html.cleanup.xml 01-Nov-2010 20:31 1.2K -[TXT] html.cellspacing.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellpadding.xml 01-Nov-2010 20:31 1.0K -[TXT] html.base.xml 01-Nov-2010 20:31 1.0K -[TXT] html.append.xml 01-Nov-2010 20:31 1.1K -[TXT] home.image.xml 01-Nov-2010 20:31 848 -[TXT] highlight.xslthl.config.xml 01-Nov-2010 20:31 1.1K -[TXT] highlight.source.xml 01-Nov-2010 20:31 3.4K -[TXT] highlight.default.language.xml 01-Nov-2010 20:31 956 -[TXT] hidetoc.image.xml 01-Nov-2010 20:31 963 -[TXT] headers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] header.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] header.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] header.rule.xml 01-Nov-2010 20:31 848 -[TXT] header.hr.xml 01-Nov-2010 20:31 880 -[TXT] header.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] header.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] graphicsize.use.img.src.path.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] graphics.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] graphical.admonition.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] graphic.default.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.width.xml 01-Nov-2010 20:31 935 -[TXT] glossterm.separation.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.block.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] glossterm.auto.link.xml 01-Nov-2010 20:31 1.3K -[TXT] glosslist.as.blocks.xml 01-Nov-2010 20:31 884 -[TXT] glossentry.show.acronym.xml 01-Nov-2010 20:31 1.4K -[TXT] glossentry.list.item.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] glossdef.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossdef.block.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] glossary.sort.xml 01-Nov-2010 20:31 1.0K -[TXT] glossary.collection.xml 01-Nov-2010 20:31 10K -[TXT] glossary.as.blocks.xml 01-Nov-2010 20:31 1.3K -[TXT] generate.toc.xml 01-Nov-2010 20:31 3.6K -[TXT] generate.section.toc.level.xml 01-Nov-2010 20:31 1.4K -[TXT] generate.revhistory.link.xml 01-Nov-2010 20:31 1.9K -[TXT] generate.meta.abstract.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.legalnotice.link.xml 01-Nov-2010 20:31 2.6K -[TXT] generate.index.xml 01-Nov-2010 20:31 847 -[TXT] generate.id.attributes.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.css.header.xml 01-Nov-2010 20:31 1.5K -[TXT] function.parens.xml 01-Nov-2010 20:31 922 -[TXT] funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] funcsynopsis.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] formal.title.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.title.placement.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.procedures.xml 01-Nov-2010 20:31 895 -[TXT] formal.object.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] fop1.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] fop.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] footnote.sep.leader.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.number.symbols.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.mark.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.font.size.xml 01-Nov-2010 20:31 953 -[TXT] footers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] footer.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] footer.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] footer.rule.xml 01-Nov-2010 20:31 847 -[TXT] footer.hr.xml 01-Nov-2010 20:31 881 -[TXT] footer.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] footer.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] foilgroup.toc.xml 01-Nov-2010 20:31 889 -[TXT] foilgroup.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] foil.title.size.xml 01-Nov-2010 20:31 1.1K -[TXT] foil.title.master.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.subtitle.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] firstterm.only.link.xml 01-Nov-2010 20:31 1.0K -[TXT] filename-prefix.xml 01-Nov-2010 20:31 1.1K -[TXT] figure.properties.xml 01-Nov-2010 20:31 912 -[TXT] feedback.with.ids.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.link.text.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.href.xml 01-Nov-2010 20:31 1.0K -[TXT] exsl.node.set.available.xml 01-Nov-2010 20:31 1.6K -[TXT] example.properties.xml 01-Nov-2010 20:31 917 -[TXT] equation.properties.xml 01-Nov-2010 20:31 924 -[TXT] equation.number.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] epub.autolabel.xml 01-Nov-2010 20:31 923 -[TXT] entry.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] emphasis.propagates.style.xml 01-Nov-2010 20:31 1.1K -[TXT] email.mailto.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] email.delimiters.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] editedby.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] eclipse.plugin.provider.xml 01-Nov-2010 20:31 914 -[TXT] eclipse.plugin.name.xml 01-Nov-2010 20:31 886 -[TXT] eclipse.plugin.id.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.autolabel.xml 01-Nov-2010 20:31 952 -[TXT] ebnf.table.border.xml 01-Nov-2010 20:31 923 -[TXT] ebnf.table.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] ebnf.statement.terminator.xml 01-Nov-2010 20:31 1.1K -[TXT] ebnf.assignment.xml 01-Nov-2010 20:31 1.4K -[TXT] dynamic.toc.xml 01-Nov-2010 20:31 972 -[TXT] dry-run.xml 01-Nov-2010 20:31 1.1K -[TXT] draft.watermark.image.xml 01-Nov-2010 20:31 928 -[TXT] draft.mode.xml 01-Nov-2010 20:31 1.4K -[TXT] double.sided.xml 01-Nov-2010 20:31 1.0K -[TXT] docbook.css.source.xml 01-Nov-2010 20:31 3.5K -[TXT] docbook.css.link.xml 01-Nov-2010 20:31 1.5K -[TXT] dingbat.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] default.units.xml 01-Nov-2010 20:31 1.4K -[TXT] default.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.table.rules.xml 01-Nov-2010 20:31 2.2K -[TXT] default.table.frame.xml 01-Nov-2010 20:31 914 -[TXT] default.image.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.float.class.xml 01-Nov-2010 20:31 1.1K -[TXT] custom.css.source.xml 01-Nov-2010 20:31 4.2K -[TXT] currentpage.marker.xml 01-Nov-2010 20:31 902 -[TXT] current.docid.xml 01-Nov-2010 20:31 1.7K -[TXT] css.stylesheet.xml 01-Nov-2010 20:31 1.0K -[TXT] css.stylesheet.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] css.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] crop.marks.xml 01-Nov-2010 20:31 926 -[TXT] crop.mark.width.xml 01-Nov-2010 20:31 910 -[TXT] crop.mark.offset.xml 01-Nov-2010 20:31 916 -[TXT] crop.mark.bleed.xml 01-Nov-2010 20:31 946 -[TXT] contrib.inline.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] component.titlepage.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] component.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] component.label.includes.part.label.xml 01-Nov-2010 20:31 1.6K -[TXT] compact.list.item.spacing.xml 01-Nov-2010 20:31 1.2K -[TXT] column.gap.titlepage.xml 01-Nov-2010 20:31 1.0K -[TXT] column.gap.lot.xml 01-Nov-2010 20:31 961 -[TXT] column.gap.index.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.front.xml 01-Nov-2010 20:31 956 -[TXT] column.gap.body.xml 01-Nov-2010 20:31 941 -[TXT] column.gap.back.xml 01-Nov-2010 20:31 944 -[TXT] column.count.titlepage.xml 01-Nov-2010 20:31 893 -[TXT] column.count.lot.xml 01-Nov-2010 20:31 933 -[TXT] column.count.index.xml 01-Nov-2010 20:31 873 -[TXT] column.count.front.xml 01-Nov-2010 20:31 914 -[TXT] column.count.body.xml 01-Nov-2010 20:31 865 -[TXT] column.count.back.xml 01-Nov-2010 20:31 906 -[TXT] collect.xref.targets.xml 01-Nov-2010 20:31 1.7K -[TXT] citerefentry.link.xml 01-Nov-2010 20:31 1.0K -[TXT] chunker.output.standalone.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.omit-xml-declaration.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.method.xml 01-Nov-2010 20:31 1.3K -[TXT] chunker.output.media-type.xml 01-Nov-2010 20:31 1.5K -[TXT] chunker.output.indent.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-system.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-public.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.cdata-section-elements.xml 01-Nov-2010 20:31 1.2K -[TXT] chunk.tocs.and.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.tocs.and.lots.has.title.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.separate.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.sections.xml 01-Nov-2010 20:31 960 -[TXT] chunk.section.depth.xml 01-Nov-2010 20:31 903 -[TXT] chunk.quietly.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.first.sections.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.append.xml 01-Nov-2010 20:31 1.1K -[TXT] chapter.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] callouts.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.start.character.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.unicode.number.limit.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.font.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.list.table.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.icon.size.xml 01-Nov-2010 20:31 923 -[TXT] callout.graphics.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.graphics.path.xml 01-Nov-2010 20:31 1.1K -[TXT] callout.graphics.number.limit.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.graphics.extension.xml 01-Nov-2010 20:31 1.4K -[TXT] callout.defaultcolumn.xml 01-Nov-2010 20:31 1.0K -[TXT] bullet.image.xml 01-Nov-2010 20:31 880 -[TXT] bridgehead.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] bookmarks.collapse.xml 01-Nov-2010 20:31 1.1K -[TXT] body.start.indent.xml 01-Nov-2010 20:31 2.2K -[TXT] body.margin.top.xml 01-Nov-2010 20:31 956 -[TXT] body.margin.bottom.xml 01-Nov-2010 20:31 963 -[TXT] body.font.size.xml 01-Nov-2010 20:31 1.1K -[TXT] body.font.master.xml 01-Nov-2010 20:31 1.0K -[TXT] body.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] body.end.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] body.bg.color.xml 01-Nov-2010 20:31 891 -[TXT] body.attributes.xml 01-Nov-2010 20:31 1.1K -[TXT] blurb.on.titlepage.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] blockquote.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] bibliography.style.xml 01-Nov-2010 20:31 1.3K -[TXT] bibliography.numbered.xml 01-Nov-2010 20:31 911 -[TXT] bibliography.collection.xml 01-Nov-2010 20:31 4.0K -[TXT] biblioentry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] biblioentry.item.separator.xml 01-Nov-2010 20:31 921 -[TXT] base.dir.xml 01-Nov-2010 20:31 936 -[TXT] banner.before.navigation.xml 01-Nov-2010 20:31 869 -[TXT] axf.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.separator.xml 01-Nov-2010 20:31 944 -[TXT] autotoc.label.in.hyperlink.xml 01-Nov-2010 20:31 1.1K -[TXT] autolayout-file.xml 01-Nov-2010 20:31 1.1K -[TXT] author.othername.in.middle.xml 01-Nov-2010 20:31 1.1K -[TXT] article.appendix.title.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] arbortext.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] appendix.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] annotation.support.xml 01-Nov-2010 20:31 1.0K -[TXT] annotation.js.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.graphic.open.xml 01-Nov-2010 20:31 1.1K -[TXT] annotation.graphic.close.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.css.xml 01-Nov-2010 20:31 2.1K -[TXT] annotate.toc.xml 01-Nov-2010 20:31 952 -[TXT] alignment.xml 01-Nov-2010 20:31 1.5K -[TXT] admonition.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] admonition.properties.xml 01-Nov-2010 20:31 964 -[TXT] admon.textlabel.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.style.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.graphics.xml 01-Nov-2010 20:31 956 -[TXT] admon.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.graphics.extension.xml 01-Nov-2010 20:31 940 -[TXT] ade.extensions.xml 01-Nov-2010 20:31 1.3K -[TXT] active.toc.xml 01-Nov-2010 20:31 958 -[TXT] abstract.title.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] abstract.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] abstract.notitle.enabled.xml 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=M;O=A deleted file mode 100644 index 4c4e32d116c4d79f18ede5002b774247ef7743ff..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=M;O=A +++ /dev/null @@ -1,677 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/params - - -

    Index of /release/xsl-ns/1.76.1/params

    -
    Icon  Name                                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] abstract.notitle.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] abstract.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] abstract.title.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] active.toc.xml 01-Nov-2010 20:31 958 -[TXT] ade.extensions.xml 01-Nov-2010 20:31 1.3K -[TXT] admon.graphics.extension.xml 01-Nov-2010 20:31 940 -[TXT] admon.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.graphics.xml 01-Nov-2010 20:31 956 -[TXT] admon.style.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.textlabel.xml 01-Nov-2010 20:31 1.0K -[TXT] admonition.properties.xml 01-Nov-2010 20:31 964 -[TXT] admonition.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] alignment.xml 01-Nov-2010 20:31 1.5K -[TXT] annotate.toc.xml 01-Nov-2010 20:31 952 -[TXT] annotation.css.xml 01-Nov-2010 20:31 2.1K -[TXT] annotation.graphic.close.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.graphic.open.xml 01-Nov-2010 20:31 1.1K -[TXT] annotation.js.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.support.xml 01-Nov-2010 20:31 1.0K -[TXT] appendix.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] arbortext.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] article.appendix.title.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] author.othername.in.middle.xml 01-Nov-2010 20:31 1.1K -[TXT] autolayout-file.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.in.hyperlink.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.separator.xml 01-Nov-2010 20:31 944 -[TXT] axf.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] banner.before.navigation.xml 01-Nov-2010 20:31 869 -[TXT] base.dir.xml 01-Nov-2010 20:31 936 -[TXT] biblioentry.item.separator.xml 01-Nov-2010 20:31 921 -[TXT] biblioentry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] bibliography.collection.xml 01-Nov-2010 20:31 4.0K -[TXT] bibliography.numbered.xml 01-Nov-2010 20:31 911 -[TXT] bibliography.style.xml 01-Nov-2010 20:31 1.3K -[TXT] blockquote.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] blurb.on.titlepage.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] body.attributes.xml 01-Nov-2010 20:31 1.1K -[TXT] body.bg.color.xml 01-Nov-2010 20:31 891 -[TXT] body.end.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] body.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] body.font.master.xml 01-Nov-2010 20:31 1.0K -[TXT] body.font.size.xml 01-Nov-2010 20:31 1.1K -[TXT] body.margin.bottom.xml 01-Nov-2010 20:31 963 -[TXT] body.margin.top.xml 01-Nov-2010 20:31 956 -[TXT] body.start.indent.xml 01-Nov-2010 20:31 2.2K -[TXT] bookmarks.collapse.xml 01-Nov-2010 20:31 1.1K -[TXT] bridgehead.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] bullet.image.xml 01-Nov-2010 20:31 880 -[TXT] callout.defaultcolumn.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.graphics.extension.xml 01-Nov-2010 20:31 1.4K -[TXT] callout.graphics.number.limit.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.graphics.path.xml 01-Nov-2010 20:31 1.1K -[TXT] callout.graphics.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.icon.size.xml 01-Nov-2010 20:31 923 -[TXT] callout.list.table.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.font.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.number.limit.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.start.character.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.unicode.xml 01-Nov-2010 20:31 1.0K -[TXT] callouts.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] chapter.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] chunk.append.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.first.sections.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.quietly.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.section.depth.xml 01-Nov-2010 20:31 903 -[TXT] chunk.sections.xml 01-Nov-2010 20:31 960 -[TXT] chunk.separate.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.tocs.and.lots.has.title.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.tocs.and.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.cdata-section-elements.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-public.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-system.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.indent.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.media-type.xml 01-Nov-2010 20:31 1.5K -[TXT] chunker.output.method.xml 01-Nov-2010 20:31 1.3K -[TXT] chunker.output.omit-xml-declaration.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.standalone.xml 01-Nov-2010 20:31 1.2K -[TXT] citerefentry.link.xml 01-Nov-2010 20:31 1.0K -[TXT] collect.xref.targets.xml 01-Nov-2010 20:31 1.7K -[TXT] column.count.back.xml 01-Nov-2010 20:31 906 -[TXT] column.count.body.xml 01-Nov-2010 20:31 865 -[TXT] column.count.front.xml 01-Nov-2010 20:31 914 -[TXT] column.count.index.xml 01-Nov-2010 20:31 873 -[TXT] column.count.lot.xml 01-Nov-2010 20:31 933 -[TXT] column.count.titlepage.xml 01-Nov-2010 20:31 893 -[TXT] column.gap.back.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.body.xml 01-Nov-2010 20:31 941 -[TXT] column.gap.front.xml 01-Nov-2010 20:31 956 -[TXT] column.gap.index.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.lot.xml 01-Nov-2010 20:31 961 -[TXT] column.gap.titlepage.xml 01-Nov-2010 20:31 1.0K -[TXT] compact.list.item.spacing.xml 01-Nov-2010 20:31 1.2K -[TXT] component.label.includes.part.label.xml 01-Nov-2010 20:31 1.6K -[TXT] component.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] component.titlepage.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] contrib.inline.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] crop.mark.bleed.xml 01-Nov-2010 20:31 946 -[TXT] crop.mark.offset.xml 01-Nov-2010 20:31 916 -[TXT] crop.mark.width.xml 01-Nov-2010 20:31 910 -[TXT] crop.marks.xml 01-Nov-2010 20:31 926 -[TXT] css.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] css.stylesheet.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] css.stylesheet.xml 01-Nov-2010 20:31 1.0K -[TXT] current.docid.xml 01-Nov-2010 20:31 1.7K -[TXT] currentpage.marker.xml 01-Nov-2010 20:31 902 -[TXT] custom.css.source.xml 01-Nov-2010 20:31 4.2K -[TXT] default.float.class.xml 01-Nov-2010 20:31 1.1K -[TXT] default.image.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.table.frame.xml 01-Nov-2010 20:31 914 -[TXT] default.table.rules.xml 01-Nov-2010 20:31 2.2K -[TXT] default.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.units.xml 01-Nov-2010 20:31 1.4K -[TXT] dingbat.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] docbook.css.link.xml 01-Nov-2010 20:31 1.5K -[TXT] docbook.css.source.xml 01-Nov-2010 20:31 3.5K -[TXT] double.sided.xml 01-Nov-2010 20:31 1.0K -[TXT] draft.mode.xml 01-Nov-2010 20:31 1.4K -[TXT] draft.watermark.image.xml 01-Nov-2010 20:31 928 -[TXT] dry-run.xml 01-Nov-2010 20:31 1.1K -[TXT] dynamic.toc.xml 01-Nov-2010 20:31 972 -[TXT] ebnf.assignment.xml 01-Nov-2010 20:31 1.4K -[TXT] ebnf.statement.terminator.xml 01-Nov-2010 20:31 1.1K -[TXT] ebnf.table.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] ebnf.table.border.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.autolabel.xml 01-Nov-2010 20:31 952 -[TXT] eclipse.plugin.id.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.plugin.name.xml 01-Nov-2010 20:31 886 -[TXT] eclipse.plugin.provider.xml 01-Nov-2010 20:31 914 -[TXT] editedby.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] email.delimiters.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] email.mailto.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] emphasis.propagates.style.xml 01-Nov-2010 20:31 1.1K -[TXT] entry.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] epub.autolabel.xml 01-Nov-2010 20:31 923 -[TXT] equation.number.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] equation.properties.xml 01-Nov-2010 20:31 924 -[TXT] example.properties.xml 01-Nov-2010 20:31 917 -[TXT] exsl.node.set.available.xml 01-Nov-2010 20:31 1.6K -[TXT] feedback.href.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.link.text.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.with.ids.xml 01-Nov-2010 20:31 1.0K -[TXT] figure.properties.xml 01-Nov-2010 20:31 912 -[TXT] filename-prefix.xml 01-Nov-2010 20:31 1.1K -[TXT] firstterm.only.link.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.subtitle.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.title.master.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.title.size.xml 01-Nov-2010 20:31 1.1K -[TXT] foilgroup.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] foilgroup.toc.xml 01-Nov-2010 20:31 889 -[TXT] footer.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] footer.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] footer.hr.xml 01-Nov-2010 20:31 881 -[TXT] footer.rule.xml 01-Nov-2010 20:31 847 -[TXT] footer.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] footer.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] footers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] footnote.font.size.xml 01-Nov-2010 20:31 953 -[TXT] footnote.mark.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.number.symbols.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.sep.leader.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] fop.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] fop1.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.object.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.procedures.xml 01-Nov-2010 20:31 895 -[TXT] formal.title.placement.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.title.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] funcsynopsis.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] function.parens.xml 01-Nov-2010 20:31 922 -[TXT] generate.css.header.xml 01-Nov-2010 20:31 1.5K -[TXT] generate.id.attributes.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.index.xml 01-Nov-2010 20:31 847 -[TXT] generate.legalnotice.link.xml 01-Nov-2010 20:31 2.6K -[TXT] generate.manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.meta.abstract.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.revhistory.link.xml 01-Nov-2010 20:31 1.9K -[TXT] generate.section.toc.level.xml 01-Nov-2010 20:31 1.4K -[TXT] generate.toc.xml 01-Nov-2010 20:31 3.6K -[TXT] glossary.as.blocks.xml 01-Nov-2010 20:31 1.3K -[TXT] glossary.collection.xml 01-Nov-2010 20:31 10K -[TXT] glossary.sort.xml 01-Nov-2010 20:31 1.0K -[TXT] glossdef.block.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] glossdef.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossentry.list.item.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] glossentry.show.acronym.xml 01-Nov-2010 20:31 1.4K -[TXT] glosslist.as.blocks.xml 01-Nov-2010 20:31 884 -[TXT] glossterm.auto.link.xml 01-Nov-2010 20:31 1.3K -[TXT] glossterm.block.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] glossterm.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.separation.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.width.xml 01-Nov-2010 20:31 935 -[TXT] graphic.default.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] graphical.admonition.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] graphics.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.use.img.src.path.xml 01-Nov-2010 20:31 1.1K -[TXT] header.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] header.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] header.hr.xml 01-Nov-2010 20:31 880 -[TXT] header.rule.xml 01-Nov-2010 20:31 848 -[TXT] header.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] header.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] headers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] hidetoc.image.xml 01-Nov-2010 20:31 963 -[TXT] highlight.default.language.xml 01-Nov-2010 20:31 956 -[TXT] highlight.source.xml 01-Nov-2010 20:31 3.4K -[TXT] highlight.xslthl.config.xml 01-Nov-2010 20:31 1.1K -[TXT] home.image.xml 01-Nov-2010 20:31 848 -[TXT] html.append.xml 01-Nov-2010 20:31 1.1K -[TXT] html.base.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellpadding.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellspacing.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cleanup.xml 01-Nov-2010 20:31 1.2K -[TXT] html.ext.xml 01-Nov-2010 20:31 947 -[TXT] html.extra.head.links.xml 01-Nov-2010 20:31 1.1K -[TXT] html.head.legalnotice.link.multiple.xml 01-Nov-2010 20:31 1.8K -[TXT] html.head.legalnotice.link.types.xml 01-Nov-2010 20:31 3.1K -[TXT] html.longdesc.link.xml 01-Nov-2010 20:31 1.3K -[TXT] html.longdesc.xml 01-Nov-2010 20:31 1.0K -[TXT] html.stylesheet.type.xml 01-Nov-2010 20:31 944 -[TXT] html.stylesheet.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.alias.file.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.autolabel.xml 01-Nov-2010 20:31 941 -[TXT] htmlhelp.button.back.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.button.forward.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.hideshow.xml 01-Nov-2010 20:31 939 -[TXT] htmlhelp.button.home.url.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.home.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.jump1.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump1.url.xml 01-Nov-2010 20:31 923 -[TXT] htmlhelp.button.jump1.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.button.jump2.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump2.url.xml 01-Nov-2010 20:31 934 -[TXT] htmlhelp.button.jump2.xml 01-Nov-2010 20:31 915 -[TXT] htmlhelp.button.locate.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.next.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.options.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.button.prev.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.print.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.refresh.xml 01-Nov-2010 20:31 926 -[TXT] htmlhelp.button.stop.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.zoom.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.chm.xml 01-Nov-2010 20:31 857 -[TXT] htmlhelp.default.topic.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.display.progress.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.encoding.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.enhanced.decompilation.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enumerate.images.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.force.map.and.alias.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.binary.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.folders.instead.books.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.section.depth.xml 01-Nov-2010 20:31 949 -[TXT] htmlhelp.hhc.show.root.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.width.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.hhc.xml 01-Nov-2010 20:31 878 -[TXT] htmlhelp.hhk.xml 01-Nov-2010 20:31 886 -[TXT] htmlhelp.hhp.tail.xml 01-Nov-2010 20:31 954 -[TXT] htmlhelp.hhp.window.xml 01-Nov-2010 20:31 922 -[TXT] htmlhelp.hhp.windows.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhp.xml 01-Nov-2010 20:31 896 -[TXT] htmlhelp.map.file.xml 01-Nov-2010 20:31 938 -[TXT] htmlhelp.only.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.remember.window.position.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.show.advanced.search.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.show.favorities.xml 01-Nov-2010 20:31 957 -[TXT] htmlhelp.show.menu.xml 01-Nov-2010 20:31 910 -[TXT] htmlhelp.show.toolbar.text.xml 01-Nov-2010 20:31 963 -[TXT] htmlhelp.title.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.use.hhk.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.window.geometry.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.verbatim.characters.xml 01-Nov-2010 20:31 1.1K -[TXT] hyphenate.verbatim.xml 01-Nov-2010 20:31 2.1K -[TXT] hyphenate.xml 01-Nov-2010 20:31 1.0K -[TXT] id.warnings.xml 01-Nov-2010 20:31 1.0K -[TXT] ignore.image.scaling.xml 01-Nov-2010 20:31 963 -[TXT] img.src.path.xml 01-Nov-2010 20:31 1.5K -[TXT] index.div.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] index.entry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.links.to.section.xml 01-Nov-2010 20:31 2.7K -[TXT] index.method.xml 01-Nov-2010 20:31 5.6K -[TXT] index.number.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] index.on.role.xml 01-Nov-2010 20:31 1.6K -[TXT] index.on.type.xml 01-Nov-2010 20:31 1.8K -[TXT] index.page.number.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] index.prefer.titleabbrev.xml 01-Nov-2010 20:31 1.0K -[TXT] index.preferred.page.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.range.separator.xml 01-Nov-2010 20:31 2.0K -[TXT] index.term.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] informal.object.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] informalequation.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informalexample.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informalfigure.properties.xml 01-Nov-2010 20:31 969 -[TXT] informaltable.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] inherit.keywords.xml 01-Nov-2010 20:31 1.1K -[TXT] insert.link.page.number.xml 01-Nov-2010 20:31 2.3K -[TXT] insert.olink.page.number.xml 01-Nov-2010 20:31 2.8K -[TXT] insert.olink.pdf.frag.xml 01-Nov-2010 20:31 2.5K -[TXT] insert.xref.page.number.xml 01-Nov-2010 20:31 1.9K -[TXT] itemizedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] itemizedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] itemizedlist.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] javahelp.encoding.xml 01-Nov-2010 20:31 1.0K -[TXT] keep.relative.image.uris.xml 01-Nov-2010 20:31 1.3K -[TXT] keyboard.nav.xml 01-Nov-2010 20:31 956 -[TXT] l10n.gentext.default.language.xml 01-Nov-2010 20:31 1.1K -[TXT] l10n.gentext.language.xml 01-Nov-2010 20:31 1.2K -[TXT] l10n.gentext.use.xref.language.xml 01-Nov-2010 20:31 1.8K -[TXT] l10n.lang.value.rfc.compliant.xml 01-Nov-2010 20:31 2.4K -[TXT] label.from.part.xml 01-Nov-2010 20:31 1.4K -[TXT] line-height.xml 01-Nov-2010 20:31 839 -[TXT] linenumbering.everyNth.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] linenumbering.width.xml 01-Nov-2010 20:31 955 -[TXT] link.mailto.url.xml 01-Nov-2010 20:31 1.0K -[TXT] list.block.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] list.block.spacing.xml 01-Nov-2010 20:31 1.4K -[TXT] list.item.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] make.clean.html.xml 01-Nov-2010 20:31 2.0K -[TXT] make.graphic.viewport.xml 01-Nov-2010 20:31 1.3K -[TXT] make.index.markup.xml 01-Nov-2010 20:31 2.8K -[TXT] make.single.year.ranges.xml 01-Nov-2010 20:31 1.0K -[TXT] make.valid.html.xml 01-Nov-2010 20:31 1.3K -[TXT] make.year.ranges.xml 01-Nov-2010 20:31 1.1K -[TXT] man.authors.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.base.url.for.relative.links.xml 01-Nov-2010 20:31 3.1K -[TXT] man.break.after.slash.xml 01-Nov-2010 20:31 1.9K -[TXT] man.charmap.enabled.xml 01-Nov-2010 20:31 2.4K -[TXT] man.charmap.subset.profile.english.xml 01-Nov-2010 20:31 3.4K -[TXT] man.charmap.subset.profile.xml 01-Nov-2010 20:31 14K -[TXT] man.charmap.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] man.charmap.use.subset.xml 01-Nov-2010 20:31 3.5K -[TXT] man.copyright.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.endnotes.are.numbered.xml 01-Nov-2010 20:31 4.8K -[TXT] man.endnotes.list.enabled.xml 01-Nov-2010 20:31 5.0K -[TXT] man.endnotes.list.heading.xml 01-Nov-2010 20:31 1.4K -[TXT] man.font.funcprototype.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcsynopsisinfo.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.links.xml 01-Nov-2010 20:31 2.7K -[TXT] man.font.table.headings.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.title.xml 01-Nov-2010 20:31 1.0K -[TXT] man.funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] man.hyphenate.computer.inlines.xml 01-Nov-2010 20:31 1.9K -[TXT] man.hyphenate.filenames.xml 01-Nov-2010 20:31 1.7K -[TXT] man.hyphenate.urls.xml 01-Nov-2010 20:31 1.6K -[TXT] man.hyphenate.xml 01-Nov-2010 20:31 2.3K -[TXT] man.indent.blurbs.xml 01-Nov-2010 20:31 1.2K -[TXT] man.indent.lists.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.refsect.xml 01-Nov-2010 20:31 2.6K -[TXT] man.indent.verbatims.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.width.xml 01-Nov-2010 20:31 1.6K -[TXT] man.justify.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.base.dir.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.better.ps.enabled.xml 01-Nov-2010 20:31 2.6K -[TXT] man.output.encoding.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.in.separate.dir.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.lang.in.name.enabled.xml 01-Nov-2010 20:31 1.8K -[TXT] man.output.manifest.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] man.output.manifest.filename.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] man.output.subdirs.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.segtitle.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] man.string.subst.map.local.post.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.pre.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.xml 01-Nov-2010 20:31 6.7K -[TXT] man.subheading.divider.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.xml 01-Nov-2010 20:31 1.5K -[TXT] man.table.footnotes.divider.xml 01-Nov-2010 20:31 1.1K -[TXT] man.th.extra1.suppress.xml 01-Nov-2010 20:31 1.2K -[TXT] man.th.extra2.max.length.xml 01-Nov-2010 20:31 1.8K -[TXT] man.th.extra2.suppress.xml 01-Nov-2010 20:31 1.6K -[TXT] man.th.extra3.max.length.xml 01-Nov-2010 20:31 1.7K -[TXT] man.th.extra3.suppress.xml 01-Nov-2010 20:31 1.3K -[TXT] man.th.title.max.length.xml 01-Nov-2010 20:31 2.6K -[TXT] manifest.in.base.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] manual.toc.xml 01-Nov-2010 20:31 917 -[TXT] margin.note.float.type.xml 01-Nov-2010 20:31 2.7K -[TXT] margin.note.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] margin.note.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.width.xml 01-Nov-2010 20:31 1.2K -[TXT] marker.section.level.xml 01-Nov-2010 20:31 1.8K -[TXT] menuchoice.menu.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] menuchoice.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] minus.image.xml 01-Nov-2010 20:31 965 -[TXT] monospace.font.family.xml 01-Nov-2010 20:31 1.0K -[TXT] monospace.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] monospace.verbatim.font.width.xml 01-Nov-2010 20:31 1.5K -[TXT] monospace.verbatim.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] multiframe.bottom.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.navigation.height.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.top.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.xml 01-Nov-2010 20:31 1.1K -[TXT] nav.separator.xml 01-Nov-2010 20:31 952 -[TXT] nav.table.summary.xml 01-Nov-2010 20:31 1.0K -[TXT] navbgcolor.xml 01-Nov-2010 20:31 926 -[TXT] navbodywidth.xml 01-Nov-2010 20:31 911 -[TXT] navig.graphics.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.showtitles.xml 01-Nov-2010 20:31 1.1K -[TXT] navtocwidth.xml 01-Nov-2010 20:31 937 -[TXT] next.image.xml 01-Nov-2010 20:31 867 -[TXT] no.home.image.xml 01-Nov-2010 20:31 883 -[TXT] no.next.image.xml 01-Nov-2010 20:31 901 -[TXT] no.prev.image.xml 01-Nov-2010 20:31 900 -[TXT] no.toc.image.xml 01-Nov-2010 20:31 875 -[TXT] no.up.image.xml 01-Nov-2010 20:31 888 -[TXT] nominal.image.depth.xml 01-Nov-2010 20:31 896 -[TXT] nominal.image.width.xml 01-Nov-2010 20:31 1.7K -[TXT] nominal.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] nongraphical.admonition.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] normal.para.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.base.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] olink.debug.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.doctitle.xml 01-Nov-2010 20:31 4.6K -[TXT] olink.fragid.xml 01-Nov-2010 20:31 905 -[TXT] olink.lang.fallback.sequence.xml 01-Nov-2010 20:31 3.1K -[TXT] olink.outline.ext.xml 01-Nov-2010 20:31 958 -[TXT] olink.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.pubid.xml 01-Nov-2010 20:31 838 -[TXT] olink.resolver.xml 01-Nov-2010 20:31 859 -[TXT] olink.sysid.xml 01-Nov-2010 20:31 843 -[TXT] orderedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] orderedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] othercredit.like.author.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] output-root.xml 01-Nov-2010 20:31 1.0K -[TXT] output.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] overlay.js.xml 01-Nov-2010 20:31 919 -[TXT] overlay.logo.xml 01-Nov-2010 20:31 953 -[TXT] overlay.xml 01-Nov-2010 20:31 1.1K -[TXT] page.height.portrait.xml 01-Nov-2010 20:31 3.1K -[TXT] page.height.xml 01-Nov-2010 20:31 1.2K -[TXT] page.margin.bottom.xml 01-Nov-2010 20:31 951 -[TXT] page.margin.inner.xml 01-Nov-2010 20:31 1.9K -[TXT] page.margin.outer.xml 01-Nov-2010 20:31 1.8K -[TXT] page.margin.top.xml 01-Nov-2010 20:31 924 -[TXT] page.orientation.xml 01-Nov-2010 20:31 1.1K -[TXT] page.width.portrait.xml 01-Nov-2010 20:31 3.0K -[TXT] page.width.xml 01-Nov-2010 20:31 1.2K -[TXT] pages.template.xml 01-Nov-2010 20:31 1.4K -[TXT] paper.type.xml 01-Nov-2010 20:31 4.3K -[TXT] para.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] part.autolabel.xml 01-Nov-2010 20:31 2.3K -[TXT] passivetex.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] pgwide.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] phrase.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] pixels.per.inch.xml 01-Nov-2010 20:31 1.0K -[TXT] plus.image.xml 01-Nov-2010 20:31 959 -[TXT] points.per.em.xml 01-Nov-2010 20:31 1.0K -[TXT] preface.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] prefer.internal.olink.xml 01-Nov-2010 20:31 2.9K -[TXT] preferred.mediaobject.role.xml 01-Nov-2010 20:31 1.6K -[TXT] prev.image.xml 01-Nov-2010 20:31 864 -[TXT] procedure.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] process.empty.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] process.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.arch.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.attribute.xml 01-Nov-2010 20:31 1.2K -[TXT] profile.audience.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.condition.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.conformance.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.lang.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.os.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.revision.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.revisionflag.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.role.xml 01-Nov-2010 20:31 2.2K -[TXT] profile.security.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.separator.xml 01-Nov-2010 20:31 942 -[TXT] profile.status.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.userlevel.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.value.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.vendor.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.wordsize.xml 01-Nov-2010 20:31 1.3K -[TXT] punct.honorific.xml 01-Nov-2010 20:31 942 -[TXT] qanda.defaultlabel.xml 01-Nov-2010 20:31 2.9K -[TXT] qanda.in.toc.xml 01-Nov-2010 20:31 1.2K -[TXT] qanda.inherit.numeration.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.nested.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] qanda.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] qandadiv.autolabel.xml 01-Nov-2010 20:31 896 -[TXT] rebuild-all.xml 01-Nov-2010 20:31 1.3K -[TXT] refclass.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] refentry.date.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.date.profile.xml 01-Nov-2010 20:31 1.4K -[TXT] refentry.generate.name.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.title.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.manual.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.manual.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.profile.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.meta.get.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.pagebreak.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.separator.xml 01-Nov-2010 20:31 942 -[TXT] refentry.source.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.name.profile.enabled.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.name.profile.xml 01-Nov-2010 20:31 3.4K -[TXT] refentry.source.name.suppress.xml 01-Nov-2010 20:31 1.8K -[TXT] refentry.title.properties.xml 01-Nov-2010 20:31 2.6K -[TXT] refentry.version.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.version.profile.xml 01-Nov-2010 20:31 1.6K -[TXT] refentry.version.suppress.xml 01-Nov-2010 20:31 1.7K -[TXT] refentry.xref.manvolnum.xml 01-Nov-2010 20:31 1.0K -[TXT] reference.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] region.after.extent.xml 01-Nov-2010 20:31 928 -[TXT] region.before.extent.xml 01-Nov-2010 20:31 933 -[TXT] revhistory.table.cell.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.title.properties.xml 01-Nov-2010 20:31 966 -[TXT] root.filename.xml 01-Nov-2010 20:31 963 -[TXT] root.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] rootid.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.default.title.end.punct.xml 01-Nov-2010 20:31 1.1K -[TXT] runinhead.title.end.punct.xml 01-Nov-2010 20:31 1.2K -[TXT] running.foot.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] sans.font.family.xml 01-Nov-2010 20:31 938 -[TXT] saxon.callouts.xml 01-Nov-2010 20:31 946 -[TXT] saxon.character.representation.xml 01-Nov-2010 20:31 1.6K -[TXT] saxon.linenumbering.xml 01-Nov-2010 20:31 1.1K -[TXT] saxon.tablecolumns.xml 01-Nov-2010 20:31 1.0K -[TXT] script.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] section.autolabel.max.depth.xml 01-Nov-2010 20:31 1.1K -[TXT] section.autolabel.xml 01-Nov-2010 20:31 883 -[TXT] section.container.element.xml 01-Nov-2010 20:31 2.3K -[TXT] section.label.includes.component.label.xml 01-Nov-2010 20:31 1.0K -[TXT] section.level1.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level2.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level3.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level4.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level5.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level6.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] segmentedlist.as.table.xml 01-Nov-2010 20:31 927 -[TXT] sequential.links.xml 01-Nov-2010 20:31 824 -[TXT] shade.verbatim.style.xml 01-Nov-2010 20:31 1.5K -[TXT] shade.verbatim.xml 01-Nov-2010 20:31 1.0K -[TXT] show.comments.xml 01-Nov-2010 20:31 1.1K -[TXT] show.foil.number.xml 01-Nov-2010 20:31 926 -[TXT] show.revisionflag.xml 01-Nov-2010 20:31 1.7K -[TXT] showtoc.image.xml 01-Nov-2010 20:31 963 -[TXT] side.float.properties.xml 01-Nov-2010 20:31 2.0K -[TXT] sidebar.float.type.xml 01-Nov-2010 20:31 2.9K -[TXT] sidebar.float.width.xml 01-Nov-2010 20:31 1.2K -[TXT] sidebar.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] sidebar.title.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] simplesect.in.toc.xml 01-Nov-2010 20:31 921 -[TXT] slide.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] slides.js.xml 01-Nov-2010 20:31 909 -[TXT] slides.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] spacing.paras.xml 01-Nov-2010 20:31 1.0K -[TXT] speakernote.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] subscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] superscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] suppress.footer.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.header.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.homepage.title.xml 01-Nov-2010 20:31 916 -[TXT] suppress.navigation.xml 01-Nov-2010 20:31 910 -[TXT] symbol.font.family.xml 01-Nov-2010 20:31 1.7K -[TXT] table.borders.with.css.xml 01-Nov-2010 20:31 928 -[TXT] table.cell.border.color.xml 01-Nov-2010 20:31 1.5K -[TXT] table.cell.border.style.xml 01-Nov-2010 20:31 1.7K -[TXT] table.cell.border.thickness.xml 01-Nov-2010 20:31 1.2K -[TXT] table.cell.padding.xml 01-Nov-2010 20:31 1.1K -[TXT] table.entry.padding.xml 01-Nov-2010 20:31 808 -[TXT] table.footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] table.footnote.number.symbols.xml 01-Nov-2010 20:31 1.8K -[TXT] table.footnote.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] table.frame.border.color.xml 01-Nov-2010 20:31 1.0K -[TXT] table.frame.border.style.xml 01-Nov-2010 20:31 1.6K -[TXT] table.frame.border.thickness.xml 01-Nov-2010 20:31 963 -[TXT] table.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] table.spacer.image.xml 01-Nov-2010 20:31 1.1K -[TXT] table.table.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] tablecolumns.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] target.database.document.xml 01-Nov-2010 20:31 1.6K -[TXT] targets.filename.xml 01-Nov-2010 20:31 1.3K -[TXT] template.xml 01-Nov-2010 20:31 730 -[TXT] tex.math.delims.xml 01-Nov-2010 20:31 1.5K -[TXT] tex.math.file.xml 01-Nov-2010 20:31 1.4K -[TXT] tex.math.in.alt.xml 01-Nov-2010 20:31 2.7K -[TXT] text.home.xml 01-Nov-2010 20:31 775 -[TXT] text.next.xml 01-Nov-2010 20:31 777 -[TXT] text.prev.xml 01-Nov-2010 20:31 777 -[TXT] text.toc.xml 01-Nov-2010 20:31 771 -[TXT] text.up.xml 01-Nov-2010 20:31 766 -[TXT] textbgcolor.xml 01-Nov-2010 20:31 921 -[TXT] textdata.default.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] textinsert.extension.xml 01-Nov-2010 20:31 2.8K -[TXT] title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] title.margin.left.xml 01-Nov-2010 20:31 2.1K -[TXT] titlefoil.html.xml 01-Nov-2010 20:31 889 -[TXT] toc.bg.color.xml 01-Nov-2010 20:31 865 -[TXT] toc.blank.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.hide.show.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.html.xml 01-Nov-2010 20:31 856 -[TXT] toc.image.xml 01-Nov-2010 20:31 840 -[TXT] toc.indent.width.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.line.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] toc.list.type.xml 01-Nov-2010 20:31 1.1K -[TXT] toc.margin.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] toc.max.depth.xml 01-Nov-2010 20:31 877 -[TXT] toc.pointer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.row.height.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.section.depth.xml 01-Nov-2010 20:31 939 -[TXT] toc.spacer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.width.xml 01-Nov-2010 20:31 861 -[TXT] ua.js.xml 01-Nov-2010 20:31 879 -[TXT] ulink.footnotes.xml 01-Nov-2010 20:31 1.2K -[TXT] ulink.hyphenate.chars.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.show.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.target.xml 01-Nov-2010 20:31 1.0K -[TXT] up.image.xml 01-Nov-2010 20:31 852 -[TXT] use.embed.for.svg.xml 01-Nov-2010 20:31 1.2K -[TXT] use.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] use.id.as.filename.xml 01-Nov-2010 20:31 1.0K -[TXT] use.id.function.xml 01-Nov-2010 20:31 1.2K -[TXT] use.local.olink.style.xml 01-Nov-2010 20:31 1.7K -[TXT] use.role.as.xrefstyle.xml 01-Nov-2010 20:31 3.2K -[TXT] use.role.for.mediaobject.xml 01-Nov-2010 20:31 1.9K -[TXT] use.svg.xml 01-Nov-2010 20:31 1.0K -[TXT] variablelist.as.blocks.xml 01-Nov-2010 20:31 2.3K -[TXT] variablelist.as.table.xml 01-Nov-2010 20:31 2.0K -[TXT] variablelist.max.termlength.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.term.break.after.xml 01-Nov-2010 20:31 1.4K -[TXT] variablelist.term.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] variablelist.term.separator.xml 01-Nov-2010 20:31 1.6K -[TXT] verbatim.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] wordml.template.xml 01-Nov-2010 20:31 1.3K -[TXT] writing.mode.xml 01-Nov-2010 20:31 2.4K -[TXT] xbCollapsibleLists.js.xml 01-Nov-2010 20:31 1.0K -[TXT] xbDOM.js.xml 01-Nov-2010 20:31 903 -[TXT] xbLibrary.js.xml 01-Nov-2010 20:31 935 -[TXT] xbStyle.js.xml 01-Nov-2010 20:31 919 -[TXT] xep.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] xep.index.item.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] xref.label-page.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] xref.label-title.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.properties.xml 01-Nov-2010 20:31 931 -[TXT] xref.title-page.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.with.number.and.title.xml 01-Nov-2010 20:31 1.1K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=M;O=D deleted file mode 100644 index 4833e82705e31c76213b2816ecb9c5de5064a0d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=M;O=D +++ /dev/null @@ -1,677 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/params - - -

    Index of /release/xsl-ns/1.76.1/params

    -
    Icon  Name                                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.with.number.and.title.xml 01-Nov-2010 20:31 1.1K -[TXT] xref.title-page.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.properties.xml 01-Nov-2010 20:31 931 -[TXT] xref.label-title.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.label-page.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] xep.index.item.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] xep.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] xbStyle.js.xml 01-Nov-2010 20:31 919 -[TXT] xbLibrary.js.xml 01-Nov-2010 20:31 935 -[TXT] xbDOM.js.xml 01-Nov-2010 20:31 903 -[TXT] xbCollapsibleLists.js.xml 01-Nov-2010 20:31 1.0K -[TXT] writing.mode.xml 01-Nov-2010 20:31 2.4K -[TXT] wordml.template.xml 01-Nov-2010 20:31 1.3K -[TXT] verbatim.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] variablelist.term.separator.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.term.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] variablelist.term.break.after.xml 01-Nov-2010 20:31 1.4K -[TXT] variablelist.max.termlength.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.as.table.xml 01-Nov-2010 20:31 2.0K -[TXT] variablelist.as.blocks.xml 01-Nov-2010 20:31 2.3K -[TXT] use.svg.xml 01-Nov-2010 20:31 1.0K -[TXT] use.role.for.mediaobject.xml 01-Nov-2010 20:31 1.9K -[TXT] use.role.as.xrefstyle.xml 01-Nov-2010 20:31 3.2K -[TXT] use.local.olink.style.xml 01-Nov-2010 20:31 1.7K -[TXT] use.id.function.xml 01-Nov-2010 20:31 1.2K -[TXT] use.id.as.filename.xml 01-Nov-2010 20:31 1.0K -[TXT] use.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] use.embed.for.svg.xml 01-Nov-2010 20:31 1.2K -[TXT] up.image.xml 01-Nov-2010 20:31 852 -[TXT] ulink.target.xml 01-Nov-2010 20:31 1.0K -[TXT] ulink.show.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.chars.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.footnotes.xml 01-Nov-2010 20:31 1.2K -[TXT] ua.js.xml 01-Nov-2010 20:31 879 -[TXT] toc.width.xml 01-Nov-2010 20:31 861 -[TXT] toc.spacer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.section.depth.xml 01-Nov-2010 20:31 939 -[TXT] toc.row.height.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.pointer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.max.depth.xml 01-Nov-2010 20:31 877 -[TXT] toc.margin.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] toc.list.type.xml 01-Nov-2010 20:31 1.1K -[TXT] toc.line.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] toc.indent.width.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.image.xml 01-Nov-2010 20:31 840 -[TXT] toc.html.xml 01-Nov-2010 20:31 856 -[TXT] toc.hide.show.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.blank.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.bg.color.xml 01-Nov-2010 20:31 865 -[TXT] titlefoil.html.xml 01-Nov-2010 20:31 889 -[TXT] title.margin.left.xml 01-Nov-2010 20:31 2.1K -[TXT] title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] textinsert.extension.xml 01-Nov-2010 20:31 2.8K -[TXT] textdata.default.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] textbgcolor.xml 01-Nov-2010 20:31 921 -[TXT] text.up.xml 01-Nov-2010 20:31 766 -[TXT] text.toc.xml 01-Nov-2010 20:31 771 -[TXT] text.prev.xml 01-Nov-2010 20:31 777 -[TXT] text.next.xml 01-Nov-2010 20:31 777 -[TXT] text.home.xml 01-Nov-2010 20:31 775 -[TXT] tex.math.in.alt.xml 01-Nov-2010 20:31 2.7K -[TXT] tex.math.file.xml 01-Nov-2010 20:31 1.4K -[TXT] tex.math.delims.xml 01-Nov-2010 20:31 1.5K -[TXT] template.xml 01-Nov-2010 20:31 730 -[TXT] targets.filename.xml 01-Nov-2010 20:31 1.3K -[TXT] target.database.document.xml 01-Nov-2010 20:31 1.6K -[TXT] tablecolumns.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] table.table.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] table.spacer.image.xml 01-Nov-2010 20:31 1.1K -[TXT] table.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] table.frame.border.thickness.xml 01-Nov-2010 20:31 963 -[TXT] table.frame.border.style.xml 01-Nov-2010 20:31 1.6K -[TXT] table.frame.border.color.xml 01-Nov-2010 20:31 1.0K -[TXT] table.footnote.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] table.footnote.number.symbols.xml 01-Nov-2010 20:31 1.8K -[TXT] table.footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] table.entry.padding.xml 01-Nov-2010 20:31 808 -[TXT] table.cell.padding.xml 01-Nov-2010 20:31 1.1K -[TXT] table.cell.border.thickness.xml 01-Nov-2010 20:31 1.2K -[TXT] table.cell.border.style.xml 01-Nov-2010 20:31 1.7K -[TXT] table.cell.border.color.xml 01-Nov-2010 20:31 1.5K -[TXT] table.borders.with.css.xml 01-Nov-2010 20:31 928 -[TXT] symbol.font.family.xml 01-Nov-2010 20:31 1.7K -[TXT] suppress.navigation.xml 01-Nov-2010 20:31 910 -[TXT] suppress.homepage.title.xml 01-Nov-2010 20:31 916 -[TXT] suppress.header.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.footer.navigation.xml 01-Nov-2010 20:31 922 -[TXT] superscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] subscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] speakernote.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] spacing.paras.xml 01-Nov-2010 20:31 1.0K -[TXT] slides.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] slides.js.xml 01-Nov-2010 20:31 909 -[TXT] slide.title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] simplesect.in.toc.xml 01-Nov-2010 20:31 921 -[TXT] sidebar.title.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] sidebar.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] sidebar.float.width.xml 01-Nov-2010 20:31 1.2K -[TXT] sidebar.float.type.xml 01-Nov-2010 20:31 2.9K -[TXT] side.float.properties.xml 01-Nov-2010 20:31 2.0K -[TXT] showtoc.image.xml 01-Nov-2010 20:31 963 -[TXT] show.revisionflag.xml 01-Nov-2010 20:31 1.7K -[TXT] show.foil.number.xml 01-Nov-2010 20:31 926 -[TXT] show.comments.xml 01-Nov-2010 20:31 1.1K -[TXT] shade.verbatim.xml 01-Nov-2010 20:31 1.0K -[TXT] shade.verbatim.style.xml 01-Nov-2010 20:31 1.5K -[TXT] sequential.links.xml 01-Nov-2010 20:31 824 -[TXT] segmentedlist.as.table.xml 01-Nov-2010 20:31 927 -[TXT] section.title.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] section.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.level6.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level5.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level4.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level3.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level2.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level1.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.label.includes.component.label.xml 01-Nov-2010 20:31 1.0K -[TXT] section.container.element.xml 01-Nov-2010 20:31 2.3K -[TXT] section.autolabel.xml 01-Nov-2010 20:31 883 -[TXT] section.autolabel.max.depth.xml 01-Nov-2010 20:31 1.1K -[TXT] script.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] saxon.tablecolumns.xml 01-Nov-2010 20:31 1.0K -[TXT] saxon.linenumbering.xml 01-Nov-2010 20:31 1.1K -[TXT] saxon.character.representation.xml 01-Nov-2010 20:31 1.6K -[TXT] saxon.callouts.xml 01-Nov-2010 20:31 946 -[TXT] sans.font.family.xml 01-Nov-2010 20:31 938 -[TXT] running.foot.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.title.end.punct.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.default.title.end.punct.xml 01-Nov-2010 20:31 1.1K -[TXT] rootid.xml 01-Nov-2010 20:31 1.2K -[TXT] root.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] root.filename.xml 01-Nov-2010 20:31 963 -[TXT] revhistory.title.properties.xml 01-Nov-2010 20:31 966 -[TXT] revhistory.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.cell.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] region.before.extent.xml 01-Nov-2010 20:31 933 -[TXT] region.after.extent.xml 01-Nov-2010 20:31 928 -[TXT] reference.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.xref.manvolnum.xml 01-Nov-2010 20:31 1.0K -[TXT] refentry.version.suppress.xml 01-Nov-2010 20:31 1.7K -[TXT] refentry.version.profile.xml 01-Nov-2010 20:31 1.6K -[TXT] refentry.version.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.title.properties.xml 01-Nov-2010 20:31 2.6K -[TXT] refentry.source.name.suppress.xml 01-Nov-2010 20:31 1.8K -[TXT] refentry.source.name.profile.xml 01-Nov-2010 20:31 3.4K -[TXT] refentry.source.name.profile.enabled.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.separator.xml 01-Nov-2010 20:31 942 -[TXT] refentry.pagebreak.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.meta.get.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.manual.profile.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.manual.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.generate.title.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.name.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.date.profile.xml 01-Nov-2010 20:31 1.4K -[TXT] refentry.date.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refclass.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] rebuild-all.xml 01-Nov-2010 20:31 1.3K -[TXT] qandadiv.autolabel.xml 01-Nov-2010 20:31 896 -[TXT] qanda.title.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] qanda.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.nested.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] qanda.inherit.numeration.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.in.toc.xml 01-Nov-2010 20:31 1.2K -[TXT] qanda.defaultlabel.xml 01-Nov-2010 20:31 2.9K -[TXT] punct.honorific.xml 01-Nov-2010 20:31 942 -[TXT] profile.wordsize.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.vendor.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.value.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.userlevel.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.status.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.separator.xml 01-Nov-2010 20:31 942 -[TXT] profile.security.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.role.xml 01-Nov-2010 20:31 2.2K -[TXT] profile.revisionflag.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.revision.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.os.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.lang.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.conformance.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.condition.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.audience.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.attribute.xml 01-Nov-2010 20:31 1.2K -[TXT] profile.arch.xml 01-Nov-2010 20:31 1.3K -[TXT] process.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] process.empty.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] procedure.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] prev.image.xml 01-Nov-2010 20:31 864 -[TXT] preferred.mediaobject.role.xml 01-Nov-2010 20:31 1.6K -[TXT] prefer.internal.olink.xml 01-Nov-2010 20:31 2.9K -[TXT] preface.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] points.per.em.xml 01-Nov-2010 20:31 1.0K -[TXT] plus.image.xml 01-Nov-2010 20:31 959 -[TXT] pixels.per.inch.xml 01-Nov-2010 20:31 1.0K -[TXT] phrase.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] pgwide.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] passivetex.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] part.autolabel.xml 01-Nov-2010 20:31 2.3K -[TXT] para.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] paper.type.xml 01-Nov-2010 20:31 4.3K -[TXT] pages.template.xml 01-Nov-2010 20:31 1.4K -[TXT] page.width.xml 01-Nov-2010 20:31 1.2K -[TXT] page.width.portrait.xml 01-Nov-2010 20:31 3.0K -[TXT] page.orientation.xml 01-Nov-2010 20:31 1.1K -[TXT] page.margin.top.xml 01-Nov-2010 20:31 924 -[TXT] page.margin.outer.xml 01-Nov-2010 20:31 1.8K -[TXT] page.margin.inner.xml 01-Nov-2010 20:31 1.9K -[TXT] page.margin.bottom.xml 01-Nov-2010 20:31 951 -[TXT] page.height.xml 01-Nov-2010 20:31 1.2K -[TXT] page.height.portrait.xml 01-Nov-2010 20:31 3.1K -[TXT] overlay.xml 01-Nov-2010 20:31 1.1K -[TXT] overlay.logo.xml 01-Nov-2010 20:31 953 -[TXT] overlay.js.xml 01-Nov-2010 20:31 919 -[TXT] output.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] output-root.xml 01-Nov-2010 20:31 1.0K -[TXT] othercredit.like.author.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] orderedlist.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] olink.sysid.xml 01-Nov-2010 20:31 843 -[TXT] olink.resolver.xml 01-Nov-2010 20:31 859 -[TXT] olink.pubid.xml 01-Nov-2010 20:31 838 -[TXT] olink.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.outline.ext.xml 01-Nov-2010 20:31 958 -[TXT] olink.lang.fallback.sequence.xml 01-Nov-2010 20:31 3.1K -[TXT] olink.fragid.xml 01-Nov-2010 20:31 905 -[TXT] olink.doctitle.xml 01-Nov-2010 20:31 4.6K -[TXT] olink.debug.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.base.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] normal.para.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] nongraphical.admonition.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] nominal.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] nominal.image.width.xml 01-Nov-2010 20:31 1.7K -[TXT] nominal.image.depth.xml 01-Nov-2010 20:31 896 -[TXT] no.up.image.xml 01-Nov-2010 20:31 888 -[TXT] no.toc.image.xml 01-Nov-2010 20:31 875 -[TXT] no.prev.image.xml 01-Nov-2010 20:31 900 -[TXT] no.next.image.xml 01-Nov-2010 20:31 901 -[TXT] no.home.image.xml 01-Nov-2010 20:31 883 -[TXT] next.image.xml 01-Nov-2010 20:31 867 -[TXT] navtocwidth.xml 01-Nov-2010 20:31 937 -[TXT] navig.showtitles.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.graphics.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] navbodywidth.xml 01-Nov-2010 20:31 911 -[TXT] navbgcolor.xml 01-Nov-2010 20:31 926 -[TXT] nav.table.summary.xml 01-Nov-2010 20:31 1.0K -[TXT] nav.separator.xml 01-Nov-2010 20:31 952 -[TXT] multiframe.xml 01-Nov-2010 20:31 1.1K -[TXT] multiframe.top.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.navigation.height.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.bottom.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] monospace.verbatim.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] monospace.verbatim.font.width.xml 01-Nov-2010 20:31 1.5K -[TXT] monospace.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] monospace.font.family.xml 01-Nov-2010 20:31 1.0K -[TXT] minus.image.xml 01-Nov-2010 20:31 965 -[TXT] menuchoice.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] menuchoice.menu.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] marker.section.level.xml 01-Nov-2010 20:31 1.8K -[TXT] margin.note.width.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] margin.note.float.type.xml 01-Nov-2010 20:31 2.7K -[TXT] manual.toc.xml 01-Nov-2010 20:31 917 -[TXT] manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.in.base.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] man.th.title.max.length.xml 01-Nov-2010 20:31 2.6K -[TXT] man.th.extra3.suppress.xml 01-Nov-2010 20:31 1.3K -[TXT] man.th.extra3.max.length.xml 01-Nov-2010 20:31 1.7K -[TXT] man.th.extra2.suppress.xml 01-Nov-2010 20:31 1.6K -[TXT] man.th.extra2.max.length.xml 01-Nov-2010 20:31 1.8K -[TXT] man.th.extra1.suppress.xml 01-Nov-2010 20:31 1.2K -[TXT] man.table.footnotes.divider.xml 01-Nov-2010 20:31 1.1K -[TXT] man.subheading.divider.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.string.subst.map.xml 01-Nov-2010 20:31 6.7K -[TXT] man.string.subst.map.local.pre.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.post.xml 01-Nov-2010 20:31 1.3K -[TXT] man.segtitle.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] man.output.subdirs.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] man.output.manifest.filename.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.manifest.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] man.output.lang.in.name.enabled.xml 01-Nov-2010 20:31 1.8K -[TXT] man.output.in.separate.dir.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.encoding.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.better.ps.enabled.xml 01-Nov-2010 20:31 2.6K -[TXT] man.output.base.dir.xml 01-Nov-2010 20:31 1.5K -[TXT] man.justify.xml 01-Nov-2010 20:31 2.1K -[TXT] man.indent.width.xml 01-Nov-2010 20:31 1.6K -[TXT] man.indent.verbatims.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.refsect.xml 01-Nov-2010 20:31 2.6K -[TXT] man.indent.lists.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.blurbs.xml 01-Nov-2010 20:31 1.2K -[TXT] man.hyphenate.xml 01-Nov-2010 20:31 2.3K -[TXT] man.hyphenate.urls.xml 01-Nov-2010 20:31 1.6K -[TXT] man.hyphenate.filenames.xml 01-Nov-2010 20:31 1.7K -[TXT] man.hyphenate.computer.inlines.xml 01-Nov-2010 20:31 1.9K -[TXT] man.funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] man.font.table.title.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.headings.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.links.xml 01-Nov-2010 20:31 2.7K -[TXT] man.font.funcsynopsisinfo.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcprototype.xml 01-Nov-2010 20:31 1.1K -[TXT] man.endnotes.list.heading.xml 01-Nov-2010 20:31 1.4K -[TXT] man.endnotes.list.enabled.xml 01-Nov-2010 20:31 5.0K -[TXT] man.endnotes.are.numbered.xml 01-Nov-2010 20:31 4.8K -[TXT] man.copyright.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.charmap.use.subset.xml 01-Nov-2010 20:31 3.5K -[TXT] man.charmap.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] man.charmap.subset.profile.xml 01-Nov-2010 20:31 14K -[TXT] man.charmap.subset.profile.english.xml 01-Nov-2010 20:31 3.4K -[TXT] man.charmap.enabled.xml 01-Nov-2010 20:31 2.4K -[TXT] man.break.after.slash.xml 01-Nov-2010 20:31 1.9K -[TXT] man.base.url.for.relative.links.xml 01-Nov-2010 20:31 3.1K -[TXT] man.authors.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] make.year.ranges.xml 01-Nov-2010 20:31 1.1K -[TXT] make.valid.html.xml 01-Nov-2010 20:31 1.3K -[TXT] make.single.year.ranges.xml 01-Nov-2010 20:31 1.0K -[TXT] make.index.markup.xml 01-Nov-2010 20:31 2.8K -[TXT] make.graphic.viewport.xml 01-Nov-2010 20:31 1.3K -[TXT] make.clean.html.xml 01-Nov-2010 20:31 2.0K -[TXT] list.item.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] list.block.spacing.xml 01-Nov-2010 20:31 1.4K -[TXT] list.block.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] link.mailto.url.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.width.xml 01-Nov-2010 20:31 955 -[TXT] linenumbering.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] linenumbering.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.everyNth.xml 01-Nov-2010 20:31 1.0K -[TXT] line-height.xml 01-Nov-2010 20:31 839 -[TXT] label.from.part.xml 01-Nov-2010 20:31 1.4K -[TXT] l10n.lang.value.rfc.compliant.xml 01-Nov-2010 20:31 2.4K -[TXT] l10n.gentext.use.xref.language.xml 01-Nov-2010 20:31 1.8K -[TXT] l10n.gentext.language.xml 01-Nov-2010 20:31 1.2K -[TXT] l10n.gentext.default.language.xml 01-Nov-2010 20:31 1.1K -[TXT] keyboard.nav.xml 01-Nov-2010 20:31 956 -[TXT] keep.relative.image.uris.xml 01-Nov-2010 20:31 1.3K -[TXT] javahelp.encoding.xml 01-Nov-2010 20:31 1.0K -[TXT] itemizedlist.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] itemizedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] itemizedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] insert.xref.page.number.xml 01-Nov-2010 20:31 1.9K -[TXT] insert.olink.pdf.frag.xml 01-Nov-2010 20:31 2.5K -[TXT] insert.olink.page.number.xml 01-Nov-2010 20:31 2.8K -[TXT] insert.link.page.number.xml 01-Nov-2010 20:31 2.3K -[TXT] inherit.keywords.xml 01-Nov-2010 20:31 1.1K -[TXT] informaltable.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] informalfigure.properties.xml 01-Nov-2010 20:31 969 -[TXT] informalexample.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informalequation.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informal.object.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] index.term.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] index.range.separator.xml 01-Nov-2010 20:31 2.0K -[TXT] index.preferred.page.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.prefer.titleabbrev.xml 01-Nov-2010 20:31 1.0K -[TXT] index.page.number.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] index.on.type.xml 01-Nov-2010 20:31 1.8K -[TXT] index.on.role.xml 01-Nov-2010 20:31 1.6K -[TXT] index.number.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] index.method.xml 01-Nov-2010 20:31 5.6K -[TXT] index.links.to.section.xml 01-Nov-2010 20:31 2.7K -[TXT] index.entry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.div.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] img.src.path.xml 01-Nov-2010 20:31 1.5K -[TXT] ignore.image.scaling.xml 01-Nov-2010 20:31 963 -[TXT] id.warnings.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.verbatim.xml 01-Nov-2010 20:31 2.1K -[TXT] hyphenate.verbatim.characters.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.window.geometry.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.use.hhk.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.title.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.show.toolbar.text.xml 01-Nov-2010 20:31 963 -[TXT] htmlhelp.show.menu.xml 01-Nov-2010 20:31 910 -[TXT] htmlhelp.show.favorities.xml 01-Nov-2010 20:31 957 -[TXT] htmlhelp.show.advanced.search.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.remember.window.position.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.only.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.map.file.xml 01-Nov-2010 20:31 938 -[TXT] htmlhelp.hhp.xml 01-Nov-2010 20:31 896 -[TXT] htmlhelp.hhp.windows.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhp.window.xml 01-Nov-2010 20:31 922 -[TXT] htmlhelp.hhp.tail.xml 01-Nov-2010 20:31 954 -[TXT] htmlhelp.hhk.xml 01-Nov-2010 20:31 886 -[TXT] htmlhelp.hhc.xml 01-Nov-2010 20:31 878 -[TXT] htmlhelp.hhc.width.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.hhc.show.root.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.section.depth.xml 01-Nov-2010 20:31 949 -[TXT] htmlhelp.hhc.folders.instead.books.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.binary.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.force.map.and.alias.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.enumerate.images.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enhanced.decompilation.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.encoding.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.display.progress.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.default.topic.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.chm.xml 01-Nov-2010 20:31 857 -[TXT] htmlhelp.button.zoom.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.stop.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.refresh.xml 01-Nov-2010 20:31 926 -[TXT] htmlhelp.button.print.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.prev.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.options.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.button.next.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.locate.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.jump2.xml 01-Nov-2010 20:31 915 -[TXT] htmlhelp.button.jump2.url.xml 01-Nov-2010 20:31 934 -[TXT] htmlhelp.button.jump2.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump1.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.button.jump1.url.xml 01-Nov-2010 20:31 923 -[TXT] htmlhelp.button.jump1.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.home.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.home.url.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.hideshow.xml 01-Nov-2010 20:31 939 -[TXT] htmlhelp.button.forward.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.back.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.autolabel.xml 01-Nov-2010 20:31 941 -[TXT] htmlhelp.alias.file.xml 01-Nov-2010 20:31 916 -[TXT] html.stylesheet.xml 01-Nov-2010 20:31 1.3K -[TXT] html.stylesheet.type.xml 01-Nov-2010 20:31 944 -[TXT] html.longdesc.xml 01-Nov-2010 20:31 1.0K -[TXT] html.longdesc.link.xml 01-Nov-2010 20:31 1.3K -[TXT] html.head.legalnotice.link.types.xml 01-Nov-2010 20:31 3.1K -[TXT] html.head.legalnotice.link.multiple.xml 01-Nov-2010 20:31 1.8K -[TXT] html.extra.head.links.xml 01-Nov-2010 20:31 1.1K -[TXT] html.ext.xml 01-Nov-2010 20:31 947 -[TXT] html.cleanup.xml 01-Nov-2010 20:31 1.2K -[TXT] html.cellspacing.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellpadding.xml 01-Nov-2010 20:31 1.0K -[TXT] html.base.xml 01-Nov-2010 20:31 1.0K -[TXT] html.append.xml 01-Nov-2010 20:31 1.1K -[TXT] home.image.xml 01-Nov-2010 20:31 848 -[TXT] highlight.xslthl.config.xml 01-Nov-2010 20:31 1.1K -[TXT] highlight.source.xml 01-Nov-2010 20:31 3.4K -[TXT] highlight.default.language.xml 01-Nov-2010 20:31 956 -[TXT] hidetoc.image.xml 01-Nov-2010 20:31 963 -[TXT] headers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] header.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] header.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] header.rule.xml 01-Nov-2010 20:31 848 -[TXT] header.hr.xml 01-Nov-2010 20:31 880 -[TXT] header.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] header.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] graphicsize.use.img.src.path.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] graphics.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] graphical.admonition.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] graphic.default.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.width.xml 01-Nov-2010 20:31 935 -[TXT] glossterm.separation.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.block.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] glossterm.auto.link.xml 01-Nov-2010 20:31 1.3K -[TXT] glosslist.as.blocks.xml 01-Nov-2010 20:31 884 -[TXT] glossentry.show.acronym.xml 01-Nov-2010 20:31 1.4K -[TXT] glossentry.list.item.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] glossdef.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossdef.block.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] glossary.sort.xml 01-Nov-2010 20:31 1.0K -[TXT] glossary.collection.xml 01-Nov-2010 20:31 10K -[TXT] glossary.as.blocks.xml 01-Nov-2010 20:31 1.3K -[TXT] generate.toc.xml 01-Nov-2010 20:31 3.6K -[TXT] generate.section.toc.level.xml 01-Nov-2010 20:31 1.4K -[TXT] generate.revhistory.link.xml 01-Nov-2010 20:31 1.9K -[TXT] generate.meta.abstract.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.legalnotice.link.xml 01-Nov-2010 20:31 2.6K -[TXT] generate.index.xml 01-Nov-2010 20:31 847 -[TXT] generate.id.attributes.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.css.header.xml 01-Nov-2010 20:31 1.5K -[TXT] function.parens.xml 01-Nov-2010 20:31 922 -[TXT] funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] funcsynopsis.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] formal.title.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.title.placement.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.procedures.xml 01-Nov-2010 20:31 895 -[TXT] formal.object.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] fop1.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] fop.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] footnote.sep.leader.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.number.symbols.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.mark.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.font.size.xml 01-Nov-2010 20:31 953 -[TXT] footers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] footer.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] footer.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] footer.rule.xml 01-Nov-2010 20:31 847 -[TXT] footer.hr.xml 01-Nov-2010 20:31 881 -[TXT] footer.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] footer.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] foilgroup.toc.xml 01-Nov-2010 20:31 889 -[TXT] foilgroup.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] foil.title.size.xml 01-Nov-2010 20:31 1.1K -[TXT] foil.title.master.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.subtitle.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] firstterm.only.link.xml 01-Nov-2010 20:31 1.0K -[TXT] filename-prefix.xml 01-Nov-2010 20:31 1.1K -[TXT] figure.properties.xml 01-Nov-2010 20:31 912 -[TXT] feedback.with.ids.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.link.text.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.href.xml 01-Nov-2010 20:31 1.0K -[TXT] exsl.node.set.available.xml 01-Nov-2010 20:31 1.6K -[TXT] example.properties.xml 01-Nov-2010 20:31 917 -[TXT] equation.properties.xml 01-Nov-2010 20:31 924 -[TXT] equation.number.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] epub.autolabel.xml 01-Nov-2010 20:31 923 -[TXT] entry.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] emphasis.propagates.style.xml 01-Nov-2010 20:31 1.1K -[TXT] email.mailto.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] email.delimiters.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] editedby.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] eclipse.plugin.provider.xml 01-Nov-2010 20:31 914 -[TXT] eclipse.plugin.name.xml 01-Nov-2010 20:31 886 -[TXT] eclipse.plugin.id.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.autolabel.xml 01-Nov-2010 20:31 952 -[TXT] ebnf.table.border.xml 01-Nov-2010 20:31 923 -[TXT] ebnf.table.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] ebnf.statement.terminator.xml 01-Nov-2010 20:31 1.1K -[TXT] ebnf.assignment.xml 01-Nov-2010 20:31 1.4K -[TXT] dynamic.toc.xml 01-Nov-2010 20:31 972 -[TXT] dry-run.xml 01-Nov-2010 20:31 1.1K -[TXT] draft.watermark.image.xml 01-Nov-2010 20:31 928 -[TXT] draft.mode.xml 01-Nov-2010 20:31 1.4K -[TXT] double.sided.xml 01-Nov-2010 20:31 1.0K -[TXT] docbook.css.source.xml 01-Nov-2010 20:31 3.5K -[TXT] docbook.css.link.xml 01-Nov-2010 20:31 1.5K -[TXT] dingbat.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] default.units.xml 01-Nov-2010 20:31 1.4K -[TXT] default.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.table.rules.xml 01-Nov-2010 20:31 2.2K -[TXT] default.table.frame.xml 01-Nov-2010 20:31 914 -[TXT] default.image.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.float.class.xml 01-Nov-2010 20:31 1.1K -[TXT] custom.css.source.xml 01-Nov-2010 20:31 4.2K -[TXT] currentpage.marker.xml 01-Nov-2010 20:31 902 -[TXT] current.docid.xml 01-Nov-2010 20:31 1.7K -[TXT] css.stylesheet.xml 01-Nov-2010 20:31 1.0K -[TXT] css.stylesheet.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] css.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] crop.marks.xml 01-Nov-2010 20:31 926 -[TXT] crop.mark.width.xml 01-Nov-2010 20:31 910 -[TXT] crop.mark.offset.xml 01-Nov-2010 20:31 916 -[TXT] crop.mark.bleed.xml 01-Nov-2010 20:31 946 -[TXT] contrib.inline.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] component.titlepage.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] component.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] component.label.includes.part.label.xml 01-Nov-2010 20:31 1.6K -[TXT] compact.list.item.spacing.xml 01-Nov-2010 20:31 1.2K -[TXT] column.gap.titlepage.xml 01-Nov-2010 20:31 1.0K -[TXT] column.gap.lot.xml 01-Nov-2010 20:31 961 -[TXT] column.gap.index.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.front.xml 01-Nov-2010 20:31 956 -[TXT] column.gap.body.xml 01-Nov-2010 20:31 941 -[TXT] column.gap.back.xml 01-Nov-2010 20:31 944 -[TXT] column.count.titlepage.xml 01-Nov-2010 20:31 893 -[TXT] column.count.lot.xml 01-Nov-2010 20:31 933 -[TXT] column.count.index.xml 01-Nov-2010 20:31 873 -[TXT] column.count.front.xml 01-Nov-2010 20:31 914 -[TXT] column.count.body.xml 01-Nov-2010 20:31 865 -[TXT] column.count.back.xml 01-Nov-2010 20:31 906 -[TXT] collect.xref.targets.xml 01-Nov-2010 20:31 1.7K -[TXT] citerefentry.link.xml 01-Nov-2010 20:31 1.0K -[TXT] chunker.output.standalone.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.omit-xml-declaration.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.method.xml 01-Nov-2010 20:31 1.3K -[TXT] chunker.output.media-type.xml 01-Nov-2010 20:31 1.5K -[TXT] chunker.output.indent.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-system.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-public.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.cdata-section-elements.xml 01-Nov-2010 20:31 1.2K -[TXT] chunk.tocs.and.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.tocs.and.lots.has.title.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.separate.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.sections.xml 01-Nov-2010 20:31 960 -[TXT] chunk.section.depth.xml 01-Nov-2010 20:31 903 -[TXT] chunk.quietly.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.first.sections.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.append.xml 01-Nov-2010 20:31 1.1K -[TXT] chapter.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] callouts.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.start.character.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.unicode.number.limit.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.font.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.list.table.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.icon.size.xml 01-Nov-2010 20:31 923 -[TXT] callout.graphics.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.graphics.path.xml 01-Nov-2010 20:31 1.1K -[TXT] callout.graphics.number.limit.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.graphics.extension.xml 01-Nov-2010 20:31 1.4K -[TXT] callout.defaultcolumn.xml 01-Nov-2010 20:31 1.0K -[TXT] bullet.image.xml 01-Nov-2010 20:31 880 -[TXT] bridgehead.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] bookmarks.collapse.xml 01-Nov-2010 20:31 1.1K -[TXT] body.start.indent.xml 01-Nov-2010 20:31 2.2K -[TXT] body.margin.top.xml 01-Nov-2010 20:31 956 -[TXT] body.margin.bottom.xml 01-Nov-2010 20:31 963 -[TXT] body.font.size.xml 01-Nov-2010 20:31 1.1K -[TXT] body.font.master.xml 01-Nov-2010 20:31 1.0K -[TXT] body.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] body.end.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] body.bg.color.xml 01-Nov-2010 20:31 891 -[TXT] body.attributes.xml 01-Nov-2010 20:31 1.1K -[TXT] blurb.on.titlepage.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] blockquote.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] bibliography.style.xml 01-Nov-2010 20:31 1.3K -[TXT] bibliography.numbered.xml 01-Nov-2010 20:31 911 -[TXT] bibliography.collection.xml 01-Nov-2010 20:31 4.0K -[TXT] biblioentry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] biblioentry.item.separator.xml 01-Nov-2010 20:31 921 -[TXT] base.dir.xml 01-Nov-2010 20:31 936 -[TXT] banner.before.navigation.xml 01-Nov-2010 20:31 869 -[TXT] axf.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.separator.xml 01-Nov-2010 20:31 944 -[TXT] autotoc.label.in.hyperlink.xml 01-Nov-2010 20:31 1.1K -[TXT] autolayout-file.xml 01-Nov-2010 20:31 1.1K -[TXT] author.othername.in.middle.xml 01-Nov-2010 20:31 1.1K -[TXT] article.appendix.title.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] arbortext.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] appendix.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] annotation.support.xml 01-Nov-2010 20:31 1.0K -[TXT] annotation.js.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.graphic.open.xml 01-Nov-2010 20:31 1.1K -[TXT] annotation.graphic.close.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.css.xml 01-Nov-2010 20:31 2.1K -[TXT] annotate.toc.xml 01-Nov-2010 20:31 952 -[TXT] alignment.xml 01-Nov-2010 20:31 1.5K -[TXT] admonition.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] admonition.properties.xml 01-Nov-2010 20:31 964 -[TXT] admon.textlabel.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.style.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.graphics.xml 01-Nov-2010 20:31 956 -[TXT] admon.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.graphics.extension.xml 01-Nov-2010 20:31 940 -[TXT] ade.extensions.xml 01-Nov-2010 20:31 1.3K -[TXT] active.toc.xml 01-Nov-2010 20:31 958 -[TXT] abstract.title.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] abstract.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] abstract.notitle.enabled.xml 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=N;O=A deleted file mode 100644 index 5d7e100a75004de717980dfff4c4714ff6a4feca..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=N;O=A +++ /dev/null @@ -1,677 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/params - - -

    Index of /release/xsl-ns/1.76.1/params

    -
    Icon  Name                                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] abstract.notitle.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] abstract.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] abstract.title.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] active.toc.xml 01-Nov-2010 20:31 958 -[TXT] ade.extensions.xml 01-Nov-2010 20:31 1.3K -[TXT] admon.graphics.extension.xml 01-Nov-2010 20:31 940 -[TXT] admon.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.graphics.xml 01-Nov-2010 20:31 956 -[TXT] admon.style.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.textlabel.xml 01-Nov-2010 20:31 1.0K -[TXT] admonition.properties.xml 01-Nov-2010 20:31 964 -[TXT] admonition.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] alignment.xml 01-Nov-2010 20:31 1.5K -[TXT] annotate.toc.xml 01-Nov-2010 20:31 952 -[TXT] annotation.css.xml 01-Nov-2010 20:31 2.1K -[TXT] annotation.graphic.close.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.graphic.open.xml 01-Nov-2010 20:31 1.1K -[TXT] annotation.js.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.support.xml 01-Nov-2010 20:31 1.0K -[TXT] appendix.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] arbortext.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] article.appendix.title.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] author.othername.in.middle.xml 01-Nov-2010 20:31 1.1K -[TXT] autolayout-file.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.in.hyperlink.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.separator.xml 01-Nov-2010 20:31 944 -[TXT] axf.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] banner.before.navigation.xml 01-Nov-2010 20:31 869 -[TXT] base.dir.xml 01-Nov-2010 20:31 936 -[TXT] biblioentry.item.separator.xml 01-Nov-2010 20:31 921 -[TXT] biblioentry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] bibliography.collection.xml 01-Nov-2010 20:31 4.0K -[TXT] bibliography.numbered.xml 01-Nov-2010 20:31 911 -[TXT] bibliography.style.xml 01-Nov-2010 20:31 1.3K -[TXT] blockquote.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] blurb.on.titlepage.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] body.attributes.xml 01-Nov-2010 20:31 1.1K -[TXT] body.bg.color.xml 01-Nov-2010 20:31 891 -[TXT] body.end.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] body.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] body.font.master.xml 01-Nov-2010 20:31 1.0K -[TXT] body.font.size.xml 01-Nov-2010 20:31 1.1K -[TXT] body.margin.bottom.xml 01-Nov-2010 20:31 963 -[TXT] body.margin.top.xml 01-Nov-2010 20:31 956 -[TXT] body.start.indent.xml 01-Nov-2010 20:31 2.2K -[TXT] bookmarks.collapse.xml 01-Nov-2010 20:31 1.1K -[TXT] bridgehead.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] bullet.image.xml 01-Nov-2010 20:31 880 -[TXT] callout.defaultcolumn.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.graphics.extension.xml 01-Nov-2010 20:31 1.4K -[TXT] callout.graphics.number.limit.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.graphics.path.xml 01-Nov-2010 20:31 1.1K -[TXT] callout.graphics.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.icon.size.xml 01-Nov-2010 20:31 923 -[TXT] callout.list.table.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.font.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.number.limit.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.start.character.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.unicode.xml 01-Nov-2010 20:31 1.0K -[TXT] callouts.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] chapter.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] chunk.append.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.first.sections.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.quietly.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.section.depth.xml 01-Nov-2010 20:31 903 -[TXT] chunk.sections.xml 01-Nov-2010 20:31 960 -[TXT] chunk.separate.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.tocs.and.lots.has.title.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.tocs.and.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.cdata-section-elements.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-public.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-system.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.indent.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.media-type.xml 01-Nov-2010 20:31 1.5K -[TXT] chunker.output.method.xml 01-Nov-2010 20:31 1.3K -[TXT] chunker.output.omit-xml-declaration.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.standalone.xml 01-Nov-2010 20:31 1.2K -[TXT] citerefentry.link.xml 01-Nov-2010 20:31 1.0K -[TXT] collect.xref.targets.xml 01-Nov-2010 20:31 1.7K -[TXT] column.count.back.xml 01-Nov-2010 20:31 906 -[TXT] column.count.body.xml 01-Nov-2010 20:31 865 -[TXT] column.count.front.xml 01-Nov-2010 20:31 914 -[TXT] column.count.index.xml 01-Nov-2010 20:31 873 -[TXT] column.count.lot.xml 01-Nov-2010 20:31 933 -[TXT] column.count.titlepage.xml 01-Nov-2010 20:31 893 -[TXT] column.gap.back.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.body.xml 01-Nov-2010 20:31 941 -[TXT] column.gap.front.xml 01-Nov-2010 20:31 956 -[TXT] column.gap.index.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.lot.xml 01-Nov-2010 20:31 961 -[TXT] column.gap.titlepage.xml 01-Nov-2010 20:31 1.0K -[TXT] compact.list.item.spacing.xml 01-Nov-2010 20:31 1.2K -[TXT] component.label.includes.part.label.xml 01-Nov-2010 20:31 1.6K -[TXT] component.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] component.titlepage.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] contrib.inline.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] crop.mark.bleed.xml 01-Nov-2010 20:31 946 -[TXT] crop.mark.offset.xml 01-Nov-2010 20:31 916 -[TXT] crop.mark.width.xml 01-Nov-2010 20:31 910 -[TXT] crop.marks.xml 01-Nov-2010 20:31 926 -[TXT] css.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] css.stylesheet.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] css.stylesheet.xml 01-Nov-2010 20:31 1.0K -[TXT] current.docid.xml 01-Nov-2010 20:31 1.7K -[TXT] currentpage.marker.xml 01-Nov-2010 20:31 902 -[TXT] custom.css.source.xml 01-Nov-2010 20:31 4.2K -[TXT] default.float.class.xml 01-Nov-2010 20:31 1.1K -[TXT] default.image.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.table.frame.xml 01-Nov-2010 20:31 914 -[TXT] default.table.rules.xml 01-Nov-2010 20:31 2.2K -[TXT] default.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.units.xml 01-Nov-2010 20:31 1.4K -[TXT] dingbat.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] docbook.css.link.xml 01-Nov-2010 20:31 1.5K -[TXT] docbook.css.source.xml 01-Nov-2010 20:31 3.5K -[TXT] double.sided.xml 01-Nov-2010 20:31 1.0K -[TXT] draft.mode.xml 01-Nov-2010 20:31 1.4K -[TXT] draft.watermark.image.xml 01-Nov-2010 20:31 928 -[TXT] dry-run.xml 01-Nov-2010 20:31 1.1K -[TXT] dynamic.toc.xml 01-Nov-2010 20:31 972 -[TXT] ebnf.assignment.xml 01-Nov-2010 20:31 1.4K -[TXT] ebnf.statement.terminator.xml 01-Nov-2010 20:31 1.1K -[TXT] ebnf.table.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] ebnf.table.border.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.autolabel.xml 01-Nov-2010 20:31 952 -[TXT] eclipse.plugin.id.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.plugin.name.xml 01-Nov-2010 20:31 886 -[TXT] eclipse.plugin.provider.xml 01-Nov-2010 20:31 914 -[TXT] editedby.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] email.delimiters.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] email.mailto.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] emphasis.propagates.style.xml 01-Nov-2010 20:31 1.1K -[TXT] entry.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] epub.autolabel.xml 01-Nov-2010 20:31 923 -[TXT] equation.number.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] equation.properties.xml 01-Nov-2010 20:31 924 -[TXT] example.properties.xml 01-Nov-2010 20:31 917 -[TXT] exsl.node.set.available.xml 01-Nov-2010 20:31 1.6K -[TXT] feedback.href.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.link.text.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.with.ids.xml 01-Nov-2010 20:31 1.0K -[TXT] figure.properties.xml 01-Nov-2010 20:31 912 -[TXT] filename-prefix.xml 01-Nov-2010 20:31 1.1K -[TXT] firstterm.only.link.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.subtitle.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.title.master.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.title.size.xml 01-Nov-2010 20:31 1.1K -[TXT] foilgroup.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] foilgroup.toc.xml 01-Nov-2010 20:31 889 -[TXT] footer.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] footer.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] footer.hr.xml 01-Nov-2010 20:31 881 -[TXT] footer.rule.xml 01-Nov-2010 20:31 847 -[TXT] footer.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] footer.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] footers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] footnote.font.size.xml 01-Nov-2010 20:31 953 -[TXT] footnote.mark.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.number.symbols.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.sep.leader.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] fop.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] fop1.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.object.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.procedures.xml 01-Nov-2010 20:31 895 -[TXT] formal.title.placement.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.title.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] funcsynopsis.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] function.parens.xml 01-Nov-2010 20:31 922 -[TXT] generate.css.header.xml 01-Nov-2010 20:31 1.5K -[TXT] generate.id.attributes.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.index.xml 01-Nov-2010 20:31 847 -[TXT] generate.legalnotice.link.xml 01-Nov-2010 20:31 2.6K -[TXT] generate.manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.meta.abstract.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.revhistory.link.xml 01-Nov-2010 20:31 1.9K -[TXT] generate.section.toc.level.xml 01-Nov-2010 20:31 1.4K -[TXT] generate.toc.xml 01-Nov-2010 20:31 3.6K -[TXT] glossary.as.blocks.xml 01-Nov-2010 20:31 1.3K -[TXT] glossary.collection.xml 01-Nov-2010 20:31 10K -[TXT] glossary.sort.xml 01-Nov-2010 20:31 1.0K -[TXT] glossdef.block.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] glossdef.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossentry.list.item.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] glossentry.show.acronym.xml 01-Nov-2010 20:31 1.4K -[TXT] glosslist.as.blocks.xml 01-Nov-2010 20:31 884 -[TXT] glossterm.auto.link.xml 01-Nov-2010 20:31 1.3K -[TXT] glossterm.block.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] glossterm.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.separation.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.width.xml 01-Nov-2010 20:31 935 -[TXT] graphic.default.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] graphical.admonition.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] graphics.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.use.img.src.path.xml 01-Nov-2010 20:31 1.1K -[TXT] header.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] header.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] header.hr.xml 01-Nov-2010 20:31 880 -[TXT] header.rule.xml 01-Nov-2010 20:31 848 -[TXT] header.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] header.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] headers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] hidetoc.image.xml 01-Nov-2010 20:31 963 -[TXT] highlight.default.language.xml 01-Nov-2010 20:31 956 -[TXT] highlight.source.xml 01-Nov-2010 20:31 3.4K -[TXT] highlight.xslthl.config.xml 01-Nov-2010 20:31 1.1K -[TXT] home.image.xml 01-Nov-2010 20:31 848 -[TXT] html.append.xml 01-Nov-2010 20:31 1.1K -[TXT] html.base.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellpadding.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellspacing.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cleanup.xml 01-Nov-2010 20:31 1.2K -[TXT] html.ext.xml 01-Nov-2010 20:31 947 -[TXT] html.extra.head.links.xml 01-Nov-2010 20:31 1.1K -[TXT] html.head.legalnotice.link.multiple.xml 01-Nov-2010 20:31 1.8K -[TXT] html.head.legalnotice.link.types.xml 01-Nov-2010 20:31 3.1K -[TXT] html.longdesc.link.xml 01-Nov-2010 20:31 1.3K -[TXT] html.longdesc.xml 01-Nov-2010 20:31 1.0K -[TXT] html.stylesheet.type.xml 01-Nov-2010 20:31 944 -[TXT] html.stylesheet.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.alias.file.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.autolabel.xml 01-Nov-2010 20:31 941 -[TXT] htmlhelp.button.back.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.button.forward.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.hideshow.xml 01-Nov-2010 20:31 939 -[TXT] htmlhelp.button.home.url.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.home.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.jump1.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump1.url.xml 01-Nov-2010 20:31 923 -[TXT] htmlhelp.button.jump1.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.button.jump2.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump2.url.xml 01-Nov-2010 20:31 934 -[TXT] htmlhelp.button.jump2.xml 01-Nov-2010 20:31 915 -[TXT] htmlhelp.button.locate.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.next.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.options.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.button.prev.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.print.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.refresh.xml 01-Nov-2010 20:31 926 -[TXT] htmlhelp.button.stop.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.zoom.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.chm.xml 01-Nov-2010 20:31 857 -[TXT] htmlhelp.default.topic.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.display.progress.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.encoding.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.enhanced.decompilation.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enumerate.images.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.force.map.and.alias.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.binary.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.folders.instead.books.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.section.depth.xml 01-Nov-2010 20:31 949 -[TXT] htmlhelp.hhc.show.root.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.width.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.hhc.xml 01-Nov-2010 20:31 878 -[TXT] htmlhelp.hhk.xml 01-Nov-2010 20:31 886 -[TXT] htmlhelp.hhp.tail.xml 01-Nov-2010 20:31 954 -[TXT] htmlhelp.hhp.window.xml 01-Nov-2010 20:31 922 -[TXT] htmlhelp.hhp.windows.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhp.xml 01-Nov-2010 20:31 896 -[TXT] htmlhelp.map.file.xml 01-Nov-2010 20:31 938 -[TXT] htmlhelp.only.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.remember.window.position.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.show.advanced.search.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.show.favorities.xml 01-Nov-2010 20:31 957 -[TXT] htmlhelp.show.menu.xml 01-Nov-2010 20:31 910 -[TXT] htmlhelp.show.toolbar.text.xml 01-Nov-2010 20:31 963 -[TXT] htmlhelp.title.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.use.hhk.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.window.geometry.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.verbatim.characters.xml 01-Nov-2010 20:31 1.1K -[TXT] hyphenate.verbatim.xml 01-Nov-2010 20:31 2.1K -[TXT] hyphenate.xml 01-Nov-2010 20:31 1.0K -[TXT] id.warnings.xml 01-Nov-2010 20:31 1.0K -[TXT] ignore.image.scaling.xml 01-Nov-2010 20:31 963 -[TXT] img.src.path.xml 01-Nov-2010 20:31 1.5K -[TXT] index.div.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] index.entry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.links.to.section.xml 01-Nov-2010 20:31 2.7K -[TXT] index.method.xml 01-Nov-2010 20:31 5.6K -[TXT] index.number.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] index.on.role.xml 01-Nov-2010 20:31 1.6K -[TXT] index.on.type.xml 01-Nov-2010 20:31 1.8K -[TXT] index.page.number.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] index.prefer.titleabbrev.xml 01-Nov-2010 20:31 1.0K -[TXT] index.preferred.page.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.range.separator.xml 01-Nov-2010 20:31 2.0K -[TXT] index.term.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] informal.object.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] informalequation.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informalexample.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informalfigure.properties.xml 01-Nov-2010 20:31 969 -[TXT] informaltable.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] inherit.keywords.xml 01-Nov-2010 20:31 1.1K -[TXT] insert.link.page.number.xml 01-Nov-2010 20:31 2.3K -[TXT] insert.olink.page.number.xml 01-Nov-2010 20:31 2.8K -[TXT] insert.olink.pdf.frag.xml 01-Nov-2010 20:31 2.5K -[TXT] insert.xref.page.number.xml 01-Nov-2010 20:31 1.9K -[TXT] itemizedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] itemizedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] itemizedlist.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] javahelp.encoding.xml 01-Nov-2010 20:31 1.0K -[TXT] keep.relative.image.uris.xml 01-Nov-2010 20:31 1.3K -[TXT] keyboard.nav.xml 01-Nov-2010 20:31 956 -[TXT] l10n.gentext.default.language.xml 01-Nov-2010 20:31 1.1K -[TXT] l10n.gentext.language.xml 01-Nov-2010 20:31 1.2K -[TXT] l10n.gentext.use.xref.language.xml 01-Nov-2010 20:31 1.8K -[TXT] l10n.lang.value.rfc.compliant.xml 01-Nov-2010 20:31 2.4K -[TXT] label.from.part.xml 01-Nov-2010 20:31 1.4K -[TXT] line-height.xml 01-Nov-2010 20:31 839 -[TXT] linenumbering.everyNth.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] linenumbering.width.xml 01-Nov-2010 20:31 955 -[TXT] link.mailto.url.xml 01-Nov-2010 20:31 1.0K -[TXT] list.block.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] list.block.spacing.xml 01-Nov-2010 20:31 1.4K -[TXT] list.item.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] make.clean.html.xml 01-Nov-2010 20:31 2.0K -[TXT] make.graphic.viewport.xml 01-Nov-2010 20:31 1.3K -[TXT] make.index.markup.xml 01-Nov-2010 20:31 2.8K -[TXT] make.single.year.ranges.xml 01-Nov-2010 20:31 1.0K -[TXT] make.valid.html.xml 01-Nov-2010 20:31 1.3K -[TXT] make.year.ranges.xml 01-Nov-2010 20:31 1.1K -[TXT] man.authors.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.base.url.for.relative.links.xml 01-Nov-2010 20:31 3.1K -[TXT] man.break.after.slash.xml 01-Nov-2010 20:31 1.9K -[TXT] man.charmap.enabled.xml 01-Nov-2010 20:31 2.4K -[TXT] man.charmap.subset.profile.english.xml 01-Nov-2010 20:31 3.4K -[TXT] man.charmap.subset.profile.xml 01-Nov-2010 20:31 14K -[TXT] man.charmap.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] man.charmap.use.subset.xml 01-Nov-2010 20:31 3.5K -[TXT] man.copyright.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.endnotes.are.numbered.xml 01-Nov-2010 20:31 4.8K -[TXT] man.endnotes.list.enabled.xml 01-Nov-2010 20:31 5.0K -[TXT] man.endnotes.list.heading.xml 01-Nov-2010 20:31 1.4K -[TXT] man.font.funcprototype.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcsynopsisinfo.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.links.xml 01-Nov-2010 20:31 2.7K -[TXT] man.font.table.headings.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.title.xml 01-Nov-2010 20:31 1.0K -[TXT] man.funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] man.hyphenate.computer.inlines.xml 01-Nov-2010 20:31 1.9K -[TXT] man.hyphenate.filenames.xml 01-Nov-2010 20:31 1.7K -[TXT] man.hyphenate.urls.xml 01-Nov-2010 20:31 1.6K -[TXT] man.hyphenate.xml 01-Nov-2010 20:31 2.3K -[TXT] man.indent.blurbs.xml 01-Nov-2010 20:31 1.2K -[TXT] man.indent.lists.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.refsect.xml 01-Nov-2010 20:31 2.6K -[TXT] man.indent.verbatims.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.width.xml 01-Nov-2010 20:31 1.6K -[TXT] man.justify.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.base.dir.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.better.ps.enabled.xml 01-Nov-2010 20:31 2.6K -[TXT] man.output.encoding.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.in.separate.dir.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.lang.in.name.enabled.xml 01-Nov-2010 20:31 1.8K -[TXT] man.output.manifest.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] man.output.manifest.filename.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] man.output.subdirs.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.segtitle.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] man.string.subst.map.local.post.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.pre.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.xml 01-Nov-2010 20:31 6.7K -[TXT] man.subheading.divider.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.xml 01-Nov-2010 20:31 1.5K -[TXT] man.table.footnotes.divider.xml 01-Nov-2010 20:31 1.1K -[TXT] man.th.extra1.suppress.xml 01-Nov-2010 20:31 1.2K -[TXT] man.th.extra2.max.length.xml 01-Nov-2010 20:31 1.8K -[TXT] man.th.extra2.suppress.xml 01-Nov-2010 20:31 1.6K -[TXT] man.th.extra3.max.length.xml 01-Nov-2010 20:31 1.7K -[TXT] man.th.extra3.suppress.xml 01-Nov-2010 20:31 1.3K -[TXT] man.th.title.max.length.xml 01-Nov-2010 20:31 2.6K -[TXT] manifest.in.base.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] manual.toc.xml 01-Nov-2010 20:31 917 -[TXT] margin.note.float.type.xml 01-Nov-2010 20:31 2.7K -[TXT] margin.note.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] margin.note.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.width.xml 01-Nov-2010 20:31 1.2K -[TXT] marker.section.level.xml 01-Nov-2010 20:31 1.8K -[TXT] menuchoice.menu.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] menuchoice.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] minus.image.xml 01-Nov-2010 20:31 965 -[TXT] monospace.font.family.xml 01-Nov-2010 20:31 1.0K -[TXT] monospace.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] monospace.verbatim.font.width.xml 01-Nov-2010 20:31 1.5K -[TXT] monospace.verbatim.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] multiframe.bottom.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.navigation.height.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.top.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.xml 01-Nov-2010 20:31 1.1K -[TXT] nav.separator.xml 01-Nov-2010 20:31 952 -[TXT] nav.table.summary.xml 01-Nov-2010 20:31 1.0K -[TXT] navbgcolor.xml 01-Nov-2010 20:31 926 -[TXT] navbodywidth.xml 01-Nov-2010 20:31 911 -[TXT] navig.graphics.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.showtitles.xml 01-Nov-2010 20:31 1.1K -[TXT] navtocwidth.xml 01-Nov-2010 20:31 937 -[TXT] next.image.xml 01-Nov-2010 20:31 867 -[TXT] no.home.image.xml 01-Nov-2010 20:31 883 -[TXT] no.next.image.xml 01-Nov-2010 20:31 901 -[TXT] no.prev.image.xml 01-Nov-2010 20:31 900 -[TXT] no.toc.image.xml 01-Nov-2010 20:31 875 -[TXT] no.up.image.xml 01-Nov-2010 20:31 888 -[TXT] nominal.image.depth.xml 01-Nov-2010 20:31 896 -[TXT] nominal.image.width.xml 01-Nov-2010 20:31 1.7K -[TXT] nominal.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] nongraphical.admonition.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] normal.para.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.base.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] olink.debug.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.doctitle.xml 01-Nov-2010 20:31 4.6K -[TXT] olink.fragid.xml 01-Nov-2010 20:31 905 -[TXT] olink.lang.fallback.sequence.xml 01-Nov-2010 20:31 3.1K -[TXT] olink.outline.ext.xml 01-Nov-2010 20:31 958 -[TXT] olink.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.pubid.xml 01-Nov-2010 20:31 838 -[TXT] olink.resolver.xml 01-Nov-2010 20:31 859 -[TXT] olink.sysid.xml 01-Nov-2010 20:31 843 -[TXT] orderedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] orderedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] othercredit.like.author.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] output-root.xml 01-Nov-2010 20:31 1.0K -[TXT] output.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] overlay.js.xml 01-Nov-2010 20:31 919 -[TXT] overlay.logo.xml 01-Nov-2010 20:31 953 -[TXT] overlay.xml 01-Nov-2010 20:31 1.1K -[TXT] page.height.portrait.xml 01-Nov-2010 20:31 3.1K -[TXT] page.height.xml 01-Nov-2010 20:31 1.2K -[TXT] page.margin.bottom.xml 01-Nov-2010 20:31 951 -[TXT] page.margin.inner.xml 01-Nov-2010 20:31 1.9K -[TXT] page.margin.outer.xml 01-Nov-2010 20:31 1.8K -[TXT] page.margin.top.xml 01-Nov-2010 20:31 924 -[TXT] page.orientation.xml 01-Nov-2010 20:31 1.1K -[TXT] page.width.portrait.xml 01-Nov-2010 20:31 3.0K -[TXT] page.width.xml 01-Nov-2010 20:31 1.2K -[TXT] pages.template.xml 01-Nov-2010 20:31 1.4K -[TXT] paper.type.xml 01-Nov-2010 20:31 4.3K -[TXT] para.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] part.autolabel.xml 01-Nov-2010 20:31 2.3K -[TXT] passivetex.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] pgwide.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] phrase.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] pixels.per.inch.xml 01-Nov-2010 20:31 1.0K -[TXT] plus.image.xml 01-Nov-2010 20:31 959 -[TXT] points.per.em.xml 01-Nov-2010 20:31 1.0K -[TXT] preface.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] prefer.internal.olink.xml 01-Nov-2010 20:31 2.9K -[TXT] preferred.mediaobject.role.xml 01-Nov-2010 20:31 1.6K -[TXT] prev.image.xml 01-Nov-2010 20:31 864 -[TXT] procedure.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] process.empty.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] process.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.arch.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.attribute.xml 01-Nov-2010 20:31 1.2K -[TXT] profile.audience.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.condition.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.conformance.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.lang.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.os.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.revision.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.revisionflag.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.role.xml 01-Nov-2010 20:31 2.2K -[TXT] profile.security.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.separator.xml 01-Nov-2010 20:31 942 -[TXT] profile.status.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.userlevel.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.value.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.vendor.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.wordsize.xml 01-Nov-2010 20:31 1.3K -[TXT] punct.honorific.xml 01-Nov-2010 20:31 942 -[TXT] qanda.defaultlabel.xml 01-Nov-2010 20:31 2.9K -[TXT] qanda.in.toc.xml 01-Nov-2010 20:31 1.2K -[TXT] qanda.inherit.numeration.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.nested.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] qanda.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] qandadiv.autolabel.xml 01-Nov-2010 20:31 896 -[TXT] rebuild-all.xml 01-Nov-2010 20:31 1.3K -[TXT] refclass.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] refentry.date.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.date.profile.xml 01-Nov-2010 20:31 1.4K -[TXT] refentry.generate.name.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.title.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.manual.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.manual.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.profile.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.meta.get.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.pagebreak.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.separator.xml 01-Nov-2010 20:31 942 -[TXT] refentry.source.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.name.profile.enabled.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.name.profile.xml 01-Nov-2010 20:31 3.4K -[TXT] refentry.source.name.suppress.xml 01-Nov-2010 20:31 1.8K -[TXT] refentry.title.properties.xml 01-Nov-2010 20:31 2.6K -[TXT] refentry.version.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.version.profile.xml 01-Nov-2010 20:31 1.6K -[TXT] refentry.version.suppress.xml 01-Nov-2010 20:31 1.7K -[TXT] refentry.xref.manvolnum.xml 01-Nov-2010 20:31 1.0K -[TXT] reference.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] region.after.extent.xml 01-Nov-2010 20:31 928 -[TXT] region.before.extent.xml 01-Nov-2010 20:31 933 -[TXT] revhistory.table.cell.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.title.properties.xml 01-Nov-2010 20:31 966 -[TXT] root.filename.xml 01-Nov-2010 20:31 963 -[TXT] root.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] rootid.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.default.title.end.punct.xml 01-Nov-2010 20:31 1.1K -[TXT] runinhead.title.end.punct.xml 01-Nov-2010 20:31 1.2K -[TXT] running.foot.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] sans.font.family.xml 01-Nov-2010 20:31 938 -[TXT] saxon.callouts.xml 01-Nov-2010 20:31 946 -[TXT] saxon.character.representation.xml 01-Nov-2010 20:31 1.6K -[TXT] saxon.linenumbering.xml 01-Nov-2010 20:31 1.1K -[TXT] saxon.tablecolumns.xml 01-Nov-2010 20:31 1.0K -[TXT] script.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] section.autolabel.max.depth.xml 01-Nov-2010 20:31 1.1K -[TXT] section.autolabel.xml 01-Nov-2010 20:31 883 -[TXT] section.container.element.xml 01-Nov-2010 20:31 2.3K -[TXT] section.label.includes.component.label.xml 01-Nov-2010 20:31 1.0K -[TXT] section.level1.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level2.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level3.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level4.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level5.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level6.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] segmentedlist.as.table.xml 01-Nov-2010 20:31 927 -[TXT] sequential.links.xml 01-Nov-2010 20:31 824 -[TXT] shade.verbatim.style.xml 01-Nov-2010 20:31 1.5K -[TXT] shade.verbatim.xml 01-Nov-2010 20:31 1.0K -[TXT] show.comments.xml 01-Nov-2010 20:31 1.1K -[TXT] show.foil.number.xml 01-Nov-2010 20:31 926 -[TXT] show.revisionflag.xml 01-Nov-2010 20:31 1.7K -[TXT] showtoc.image.xml 01-Nov-2010 20:31 963 -[TXT] side.float.properties.xml 01-Nov-2010 20:31 2.0K -[TXT] sidebar.float.type.xml 01-Nov-2010 20:31 2.9K -[TXT] sidebar.float.width.xml 01-Nov-2010 20:31 1.2K -[TXT] sidebar.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] sidebar.title.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] simplesect.in.toc.xml 01-Nov-2010 20:31 921 -[TXT] slide.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] slides.js.xml 01-Nov-2010 20:31 909 -[TXT] slides.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] spacing.paras.xml 01-Nov-2010 20:31 1.0K -[TXT] speakernote.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] subscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] superscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] suppress.footer.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.header.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.homepage.title.xml 01-Nov-2010 20:31 916 -[TXT] suppress.navigation.xml 01-Nov-2010 20:31 910 -[TXT] symbol.font.family.xml 01-Nov-2010 20:31 1.7K -[TXT] table.borders.with.css.xml 01-Nov-2010 20:31 928 -[TXT] table.cell.border.color.xml 01-Nov-2010 20:31 1.5K -[TXT] table.cell.border.style.xml 01-Nov-2010 20:31 1.7K -[TXT] table.cell.border.thickness.xml 01-Nov-2010 20:31 1.2K -[TXT] table.cell.padding.xml 01-Nov-2010 20:31 1.1K -[TXT] table.entry.padding.xml 01-Nov-2010 20:31 808 -[TXT] table.footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] table.footnote.number.symbols.xml 01-Nov-2010 20:31 1.8K -[TXT] table.footnote.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] table.frame.border.color.xml 01-Nov-2010 20:31 1.0K -[TXT] table.frame.border.style.xml 01-Nov-2010 20:31 1.6K -[TXT] table.frame.border.thickness.xml 01-Nov-2010 20:31 963 -[TXT] table.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] table.spacer.image.xml 01-Nov-2010 20:31 1.1K -[TXT] table.table.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] tablecolumns.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] target.database.document.xml 01-Nov-2010 20:31 1.6K -[TXT] targets.filename.xml 01-Nov-2010 20:31 1.3K -[TXT] template.xml 01-Nov-2010 20:31 730 -[TXT] tex.math.delims.xml 01-Nov-2010 20:31 1.5K -[TXT] tex.math.file.xml 01-Nov-2010 20:31 1.4K -[TXT] tex.math.in.alt.xml 01-Nov-2010 20:31 2.7K -[TXT] text.home.xml 01-Nov-2010 20:31 775 -[TXT] text.next.xml 01-Nov-2010 20:31 777 -[TXT] text.prev.xml 01-Nov-2010 20:31 777 -[TXT] text.toc.xml 01-Nov-2010 20:31 771 -[TXT] text.up.xml 01-Nov-2010 20:31 766 -[TXT] textbgcolor.xml 01-Nov-2010 20:31 921 -[TXT] textdata.default.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] textinsert.extension.xml 01-Nov-2010 20:31 2.8K -[TXT] title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] title.margin.left.xml 01-Nov-2010 20:31 2.1K -[TXT] titlefoil.html.xml 01-Nov-2010 20:31 889 -[TXT] toc.bg.color.xml 01-Nov-2010 20:31 865 -[TXT] toc.blank.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.hide.show.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.html.xml 01-Nov-2010 20:31 856 -[TXT] toc.image.xml 01-Nov-2010 20:31 840 -[TXT] toc.indent.width.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.line.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] toc.list.type.xml 01-Nov-2010 20:31 1.1K -[TXT] toc.margin.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] toc.max.depth.xml 01-Nov-2010 20:31 877 -[TXT] toc.pointer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.row.height.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.section.depth.xml 01-Nov-2010 20:31 939 -[TXT] toc.spacer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.width.xml 01-Nov-2010 20:31 861 -[TXT] ua.js.xml 01-Nov-2010 20:31 879 -[TXT] ulink.footnotes.xml 01-Nov-2010 20:31 1.2K -[TXT] ulink.hyphenate.chars.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.show.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.target.xml 01-Nov-2010 20:31 1.0K -[TXT] up.image.xml 01-Nov-2010 20:31 852 -[TXT] use.embed.for.svg.xml 01-Nov-2010 20:31 1.2K -[TXT] use.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] use.id.as.filename.xml 01-Nov-2010 20:31 1.0K -[TXT] use.id.function.xml 01-Nov-2010 20:31 1.2K -[TXT] use.local.olink.style.xml 01-Nov-2010 20:31 1.7K -[TXT] use.role.as.xrefstyle.xml 01-Nov-2010 20:31 3.2K -[TXT] use.role.for.mediaobject.xml 01-Nov-2010 20:31 1.9K -[TXT] use.svg.xml 01-Nov-2010 20:31 1.0K -[TXT] variablelist.as.blocks.xml 01-Nov-2010 20:31 2.3K -[TXT] variablelist.as.table.xml 01-Nov-2010 20:31 2.0K -[TXT] variablelist.max.termlength.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.term.break.after.xml 01-Nov-2010 20:31 1.4K -[TXT] variablelist.term.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] variablelist.term.separator.xml 01-Nov-2010 20:31 1.6K -[TXT] verbatim.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] wordml.template.xml 01-Nov-2010 20:31 1.3K -[TXT] writing.mode.xml 01-Nov-2010 20:31 2.4K -[TXT] xbCollapsibleLists.js.xml 01-Nov-2010 20:31 1.0K -[TXT] xbDOM.js.xml 01-Nov-2010 20:31 903 -[TXT] xbLibrary.js.xml 01-Nov-2010 20:31 935 -[TXT] xbStyle.js.xml 01-Nov-2010 20:31 919 -[TXT] xep.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] xep.index.item.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] xref.label-page.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] xref.label-title.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.properties.xml 01-Nov-2010 20:31 931 -[TXT] xref.title-page.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.with.number.and.title.xml 01-Nov-2010 20:31 1.1K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=N;O=D deleted file mode 100644 index 4833e82705e31c76213b2816ecb9c5de5064a0d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=N;O=D +++ /dev/null @@ -1,677 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/params - - -

    Index of /release/xsl-ns/1.76.1/params

    -
    Icon  Name                                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.with.number.and.title.xml 01-Nov-2010 20:31 1.1K -[TXT] xref.title-page.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.properties.xml 01-Nov-2010 20:31 931 -[TXT] xref.label-title.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.label-page.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] xep.index.item.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] xep.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] xbStyle.js.xml 01-Nov-2010 20:31 919 -[TXT] xbLibrary.js.xml 01-Nov-2010 20:31 935 -[TXT] xbDOM.js.xml 01-Nov-2010 20:31 903 -[TXT] xbCollapsibleLists.js.xml 01-Nov-2010 20:31 1.0K -[TXT] writing.mode.xml 01-Nov-2010 20:31 2.4K -[TXT] wordml.template.xml 01-Nov-2010 20:31 1.3K -[TXT] verbatim.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] variablelist.term.separator.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.term.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] variablelist.term.break.after.xml 01-Nov-2010 20:31 1.4K -[TXT] variablelist.max.termlength.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.as.table.xml 01-Nov-2010 20:31 2.0K -[TXT] variablelist.as.blocks.xml 01-Nov-2010 20:31 2.3K -[TXT] use.svg.xml 01-Nov-2010 20:31 1.0K -[TXT] use.role.for.mediaobject.xml 01-Nov-2010 20:31 1.9K -[TXT] use.role.as.xrefstyle.xml 01-Nov-2010 20:31 3.2K -[TXT] use.local.olink.style.xml 01-Nov-2010 20:31 1.7K -[TXT] use.id.function.xml 01-Nov-2010 20:31 1.2K -[TXT] use.id.as.filename.xml 01-Nov-2010 20:31 1.0K -[TXT] use.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] use.embed.for.svg.xml 01-Nov-2010 20:31 1.2K -[TXT] up.image.xml 01-Nov-2010 20:31 852 -[TXT] ulink.target.xml 01-Nov-2010 20:31 1.0K -[TXT] ulink.show.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.chars.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.footnotes.xml 01-Nov-2010 20:31 1.2K -[TXT] ua.js.xml 01-Nov-2010 20:31 879 -[TXT] toc.width.xml 01-Nov-2010 20:31 861 -[TXT] toc.spacer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.section.depth.xml 01-Nov-2010 20:31 939 -[TXT] toc.row.height.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.pointer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.max.depth.xml 01-Nov-2010 20:31 877 -[TXT] toc.margin.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] toc.list.type.xml 01-Nov-2010 20:31 1.1K -[TXT] toc.line.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] toc.indent.width.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.image.xml 01-Nov-2010 20:31 840 -[TXT] toc.html.xml 01-Nov-2010 20:31 856 -[TXT] toc.hide.show.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.blank.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.image.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.bg.color.xml 01-Nov-2010 20:31 865 -[TXT] titlefoil.html.xml 01-Nov-2010 20:31 889 -[TXT] title.margin.left.xml 01-Nov-2010 20:31 2.1K -[TXT] title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] textinsert.extension.xml 01-Nov-2010 20:31 2.8K -[TXT] textdata.default.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] textbgcolor.xml 01-Nov-2010 20:31 921 -[TXT] text.up.xml 01-Nov-2010 20:31 766 -[TXT] text.toc.xml 01-Nov-2010 20:31 771 -[TXT] text.prev.xml 01-Nov-2010 20:31 777 -[TXT] text.next.xml 01-Nov-2010 20:31 777 -[TXT] text.home.xml 01-Nov-2010 20:31 775 -[TXT] tex.math.in.alt.xml 01-Nov-2010 20:31 2.7K -[TXT] tex.math.file.xml 01-Nov-2010 20:31 1.4K -[TXT] tex.math.delims.xml 01-Nov-2010 20:31 1.5K -[TXT] template.xml 01-Nov-2010 20:31 730 -[TXT] targets.filename.xml 01-Nov-2010 20:31 1.3K -[TXT] target.database.document.xml 01-Nov-2010 20:31 1.6K -[TXT] tablecolumns.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] table.table.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] table.spacer.image.xml 01-Nov-2010 20:31 1.1K -[TXT] table.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] table.frame.border.thickness.xml 01-Nov-2010 20:31 963 -[TXT] table.frame.border.style.xml 01-Nov-2010 20:31 1.6K -[TXT] table.frame.border.color.xml 01-Nov-2010 20:31 1.0K -[TXT] table.footnote.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] table.footnote.number.symbols.xml 01-Nov-2010 20:31 1.8K -[TXT] table.footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] table.entry.padding.xml 01-Nov-2010 20:31 808 -[TXT] table.cell.padding.xml 01-Nov-2010 20:31 1.1K -[TXT] table.cell.border.thickness.xml 01-Nov-2010 20:31 1.2K -[TXT] table.cell.border.style.xml 01-Nov-2010 20:31 1.7K -[TXT] table.cell.border.color.xml 01-Nov-2010 20:31 1.5K -[TXT] table.borders.with.css.xml 01-Nov-2010 20:31 928 -[TXT] symbol.font.family.xml 01-Nov-2010 20:31 1.7K -[TXT] suppress.navigation.xml 01-Nov-2010 20:31 910 -[TXT] suppress.homepage.title.xml 01-Nov-2010 20:31 916 -[TXT] suppress.header.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.footer.navigation.xml 01-Nov-2010 20:31 922 -[TXT] superscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] subscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] speakernote.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] spacing.paras.xml 01-Nov-2010 20:31 1.0K -[TXT] slides.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] slides.js.xml 01-Nov-2010 20:31 909 -[TXT] slide.title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] simplesect.in.toc.xml 01-Nov-2010 20:31 921 -[TXT] sidebar.title.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] sidebar.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] sidebar.float.width.xml 01-Nov-2010 20:31 1.2K -[TXT] sidebar.float.type.xml 01-Nov-2010 20:31 2.9K -[TXT] side.float.properties.xml 01-Nov-2010 20:31 2.0K -[TXT] showtoc.image.xml 01-Nov-2010 20:31 963 -[TXT] show.revisionflag.xml 01-Nov-2010 20:31 1.7K -[TXT] show.foil.number.xml 01-Nov-2010 20:31 926 -[TXT] show.comments.xml 01-Nov-2010 20:31 1.1K -[TXT] shade.verbatim.xml 01-Nov-2010 20:31 1.0K -[TXT] shade.verbatim.style.xml 01-Nov-2010 20:31 1.5K -[TXT] sequential.links.xml 01-Nov-2010 20:31 824 -[TXT] segmentedlist.as.table.xml 01-Nov-2010 20:31 927 -[TXT] section.title.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] section.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.level6.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level5.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level4.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level3.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level2.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level1.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.label.includes.component.label.xml 01-Nov-2010 20:31 1.0K -[TXT] section.container.element.xml 01-Nov-2010 20:31 2.3K -[TXT] section.autolabel.xml 01-Nov-2010 20:31 883 -[TXT] section.autolabel.max.depth.xml 01-Nov-2010 20:31 1.1K -[TXT] script.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] saxon.tablecolumns.xml 01-Nov-2010 20:31 1.0K -[TXT] saxon.linenumbering.xml 01-Nov-2010 20:31 1.1K -[TXT] saxon.character.representation.xml 01-Nov-2010 20:31 1.6K -[TXT] saxon.callouts.xml 01-Nov-2010 20:31 946 -[TXT] sans.font.family.xml 01-Nov-2010 20:31 938 -[TXT] running.foot.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.title.end.punct.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.default.title.end.punct.xml 01-Nov-2010 20:31 1.1K -[TXT] rootid.xml 01-Nov-2010 20:31 1.2K -[TXT] root.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] root.filename.xml 01-Nov-2010 20:31 963 -[TXT] revhistory.title.properties.xml 01-Nov-2010 20:31 966 -[TXT] revhistory.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.cell.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] region.before.extent.xml 01-Nov-2010 20:31 933 -[TXT] region.after.extent.xml 01-Nov-2010 20:31 928 -[TXT] reference.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.xref.manvolnum.xml 01-Nov-2010 20:31 1.0K -[TXT] refentry.version.suppress.xml 01-Nov-2010 20:31 1.7K -[TXT] refentry.version.profile.xml 01-Nov-2010 20:31 1.6K -[TXT] refentry.version.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.title.properties.xml 01-Nov-2010 20:31 2.6K -[TXT] refentry.source.name.suppress.xml 01-Nov-2010 20:31 1.8K -[TXT] refentry.source.name.profile.xml 01-Nov-2010 20:31 3.4K -[TXT] refentry.source.name.profile.enabled.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.separator.xml 01-Nov-2010 20:31 942 -[TXT] refentry.pagebreak.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.meta.get.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.manual.profile.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.manual.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.generate.title.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.name.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.date.profile.xml 01-Nov-2010 20:31 1.4K -[TXT] refentry.date.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refclass.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] rebuild-all.xml 01-Nov-2010 20:31 1.3K -[TXT] qandadiv.autolabel.xml 01-Nov-2010 20:31 896 -[TXT] qanda.title.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] qanda.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.nested.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] qanda.inherit.numeration.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.in.toc.xml 01-Nov-2010 20:31 1.2K -[TXT] qanda.defaultlabel.xml 01-Nov-2010 20:31 2.9K -[TXT] punct.honorific.xml 01-Nov-2010 20:31 942 -[TXT] profile.wordsize.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.vendor.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.value.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.userlevel.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.status.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.separator.xml 01-Nov-2010 20:31 942 -[TXT] profile.security.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.role.xml 01-Nov-2010 20:31 2.2K -[TXT] profile.revisionflag.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.revision.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.os.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.lang.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.conformance.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.condition.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.audience.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.attribute.xml 01-Nov-2010 20:31 1.2K -[TXT] profile.arch.xml 01-Nov-2010 20:31 1.3K -[TXT] process.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] process.empty.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] procedure.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] prev.image.xml 01-Nov-2010 20:31 864 -[TXT] preferred.mediaobject.role.xml 01-Nov-2010 20:31 1.6K -[TXT] prefer.internal.olink.xml 01-Nov-2010 20:31 2.9K -[TXT] preface.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] points.per.em.xml 01-Nov-2010 20:31 1.0K -[TXT] plus.image.xml 01-Nov-2010 20:31 959 -[TXT] pixels.per.inch.xml 01-Nov-2010 20:31 1.0K -[TXT] phrase.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] pgwide.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] passivetex.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] part.autolabel.xml 01-Nov-2010 20:31 2.3K -[TXT] para.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] paper.type.xml 01-Nov-2010 20:31 4.3K -[TXT] pages.template.xml 01-Nov-2010 20:31 1.4K -[TXT] page.width.xml 01-Nov-2010 20:31 1.2K -[TXT] page.width.portrait.xml 01-Nov-2010 20:31 3.0K -[TXT] page.orientation.xml 01-Nov-2010 20:31 1.1K -[TXT] page.margin.top.xml 01-Nov-2010 20:31 924 -[TXT] page.margin.outer.xml 01-Nov-2010 20:31 1.8K -[TXT] page.margin.inner.xml 01-Nov-2010 20:31 1.9K -[TXT] page.margin.bottom.xml 01-Nov-2010 20:31 951 -[TXT] page.height.xml 01-Nov-2010 20:31 1.2K -[TXT] page.height.portrait.xml 01-Nov-2010 20:31 3.1K -[TXT] overlay.xml 01-Nov-2010 20:31 1.1K -[TXT] overlay.logo.xml 01-Nov-2010 20:31 953 -[TXT] overlay.js.xml 01-Nov-2010 20:31 919 -[TXT] output.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] output-root.xml 01-Nov-2010 20:31 1.0K -[TXT] othercredit.like.author.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] orderedlist.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] olink.sysid.xml 01-Nov-2010 20:31 843 -[TXT] olink.resolver.xml 01-Nov-2010 20:31 859 -[TXT] olink.pubid.xml 01-Nov-2010 20:31 838 -[TXT] olink.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.outline.ext.xml 01-Nov-2010 20:31 958 -[TXT] olink.lang.fallback.sequence.xml 01-Nov-2010 20:31 3.1K -[TXT] olink.fragid.xml 01-Nov-2010 20:31 905 -[TXT] olink.doctitle.xml 01-Nov-2010 20:31 4.6K -[TXT] olink.debug.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.base.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] normal.para.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] nongraphical.admonition.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] nominal.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] nominal.image.width.xml 01-Nov-2010 20:31 1.7K -[TXT] nominal.image.depth.xml 01-Nov-2010 20:31 896 -[TXT] no.up.image.xml 01-Nov-2010 20:31 888 -[TXT] no.toc.image.xml 01-Nov-2010 20:31 875 -[TXT] no.prev.image.xml 01-Nov-2010 20:31 900 -[TXT] no.next.image.xml 01-Nov-2010 20:31 901 -[TXT] no.home.image.xml 01-Nov-2010 20:31 883 -[TXT] next.image.xml 01-Nov-2010 20:31 867 -[TXT] navtocwidth.xml 01-Nov-2010 20:31 937 -[TXT] navig.showtitles.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.graphics.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] navbodywidth.xml 01-Nov-2010 20:31 911 -[TXT] navbgcolor.xml 01-Nov-2010 20:31 926 -[TXT] nav.table.summary.xml 01-Nov-2010 20:31 1.0K -[TXT] nav.separator.xml 01-Nov-2010 20:31 952 -[TXT] multiframe.xml 01-Nov-2010 20:31 1.1K -[TXT] multiframe.top.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.navigation.height.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.bottom.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] monospace.verbatim.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] monospace.verbatim.font.width.xml 01-Nov-2010 20:31 1.5K -[TXT] monospace.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] monospace.font.family.xml 01-Nov-2010 20:31 1.0K -[TXT] minus.image.xml 01-Nov-2010 20:31 965 -[TXT] menuchoice.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] menuchoice.menu.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] marker.section.level.xml 01-Nov-2010 20:31 1.8K -[TXT] margin.note.width.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] margin.note.float.type.xml 01-Nov-2010 20:31 2.7K -[TXT] manual.toc.xml 01-Nov-2010 20:31 917 -[TXT] manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.in.base.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] man.th.title.max.length.xml 01-Nov-2010 20:31 2.6K -[TXT] man.th.extra3.suppress.xml 01-Nov-2010 20:31 1.3K -[TXT] man.th.extra3.max.length.xml 01-Nov-2010 20:31 1.7K -[TXT] man.th.extra2.suppress.xml 01-Nov-2010 20:31 1.6K -[TXT] man.th.extra2.max.length.xml 01-Nov-2010 20:31 1.8K -[TXT] man.th.extra1.suppress.xml 01-Nov-2010 20:31 1.2K -[TXT] man.table.footnotes.divider.xml 01-Nov-2010 20:31 1.1K -[TXT] man.subheading.divider.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.string.subst.map.xml 01-Nov-2010 20:31 6.7K -[TXT] man.string.subst.map.local.pre.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.post.xml 01-Nov-2010 20:31 1.3K -[TXT] man.segtitle.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] man.output.subdirs.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] man.output.manifest.filename.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.manifest.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] man.output.lang.in.name.enabled.xml 01-Nov-2010 20:31 1.8K -[TXT] man.output.in.separate.dir.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.encoding.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.better.ps.enabled.xml 01-Nov-2010 20:31 2.6K -[TXT] man.output.base.dir.xml 01-Nov-2010 20:31 1.5K -[TXT] man.justify.xml 01-Nov-2010 20:31 2.1K -[TXT] man.indent.width.xml 01-Nov-2010 20:31 1.6K -[TXT] man.indent.verbatims.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.refsect.xml 01-Nov-2010 20:31 2.6K -[TXT] man.indent.lists.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.blurbs.xml 01-Nov-2010 20:31 1.2K -[TXT] man.hyphenate.xml 01-Nov-2010 20:31 2.3K -[TXT] man.hyphenate.urls.xml 01-Nov-2010 20:31 1.6K -[TXT] man.hyphenate.filenames.xml 01-Nov-2010 20:31 1.7K -[TXT] man.hyphenate.computer.inlines.xml 01-Nov-2010 20:31 1.9K -[TXT] man.funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] man.font.table.title.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.headings.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.links.xml 01-Nov-2010 20:31 2.7K -[TXT] man.font.funcsynopsisinfo.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcprototype.xml 01-Nov-2010 20:31 1.1K -[TXT] man.endnotes.list.heading.xml 01-Nov-2010 20:31 1.4K -[TXT] man.endnotes.list.enabled.xml 01-Nov-2010 20:31 5.0K -[TXT] man.endnotes.are.numbered.xml 01-Nov-2010 20:31 4.8K -[TXT] man.copyright.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.charmap.use.subset.xml 01-Nov-2010 20:31 3.5K -[TXT] man.charmap.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] man.charmap.subset.profile.xml 01-Nov-2010 20:31 14K -[TXT] man.charmap.subset.profile.english.xml 01-Nov-2010 20:31 3.4K -[TXT] man.charmap.enabled.xml 01-Nov-2010 20:31 2.4K -[TXT] man.break.after.slash.xml 01-Nov-2010 20:31 1.9K -[TXT] man.base.url.for.relative.links.xml 01-Nov-2010 20:31 3.1K -[TXT] man.authors.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] make.year.ranges.xml 01-Nov-2010 20:31 1.1K -[TXT] make.valid.html.xml 01-Nov-2010 20:31 1.3K -[TXT] make.single.year.ranges.xml 01-Nov-2010 20:31 1.0K -[TXT] make.index.markup.xml 01-Nov-2010 20:31 2.8K -[TXT] make.graphic.viewport.xml 01-Nov-2010 20:31 1.3K -[TXT] make.clean.html.xml 01-Nov-2010 20:31 2.0K -[TXT] list.item.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] list.block.spacing.xml 01-Nov-2010 20:31 1.4K -[TXT] list.block.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] link.mailto.url.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.width.xml 01-Nov-2010 20:31 955 -[TXT] linenumbering.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] linenumbering.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.everyNth.xml 01-Nov-2010 20:31 1.0K -[TXT] line-height.xml 01-Nov-2010 20:31 839 -[TXT] label.from.part.xml 01-Nov-2010 20:31 1.4K -[TXT] l10n.lang.value.rfc.compliant.xml 01-Nov-2010 20:31 2.4K -[TXT] l10n.gentext.use.xref.language.xml 01-Nov-2010 20:31 1.8K -[TXT] l10n.gentext.language.xml 01-Nov-2010 20:31 1.2K -[TXT] l10n.gentext.default.language.xml 01-Nov-2010 20:31 1.1K -[TXT] keyboard.nav.xml 01-Nov-2010 20:31 956 -[TXT] keep.relative.image.uris.xml 01-Nov-2010 20:31 1.3K -[TXT] javahelp.encoding.xml 01-Nov-2010 20:31 1.0K -[TXT] itemizedlist.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] itemizedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] itemizedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] insert.xref.page.number.xml 01-Nov-2010 20:31 1.9K -[TXT] insert.olink.pdf.frag.xml 01-Nov-2010 20:31 2.5K -[TXT] insert.olink.page.number.xml 01-Nov-2010 20:31 2.8K -[TXT] insert.link.page.number.xml 01-Nov-2010 20:31 2.3K -[TXT] inherit.keywords.xml 01-Nov-2010 20:31 1.1K -[TXT] informaltable.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] informalfigure.properties.xml 01-Nov-2010 20:31 969 -[TXT] informalexample.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informalequation.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] informal.object.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] index.term.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] index.range.separator.xml 01-Nov-2010 20:31 2.0K -[TXT] index.preferred.page.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.prefer.titleabbrev.xml 01-Nov-2010 20:31 1.0K -[TXT] index.page.number.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] index.on.type.xml 01-Nov-2010 20:31 1.8K -[TXT] index.on.role.xml 01-Nov-2010 20:31 1.6K -[TXT] index.number.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] index.method.xml 01-Nov-2010 20:31 5.6K -[TXT] index.links.to.section.xml 01-Nov-2010 20:31 2.7K -[TXT] index.entry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.div.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] img.src.path.xml 01-Nov-2010 20:31 1.5K -[TXT] ignore.image.scaling.xml 01-Nov-2010 20:31 963 -[TXT] id.warnings.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.verbatim.xml 01-Nov-2010 20:31 2.1K -[TXT] hyphenate.verbatim.characters.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.window.geometry.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.use.hhk.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.title.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.show.toolbar.text.xml 01-Nov-2010 20:31 963 -[TXT] htmlhelp.show.menu.xml 01-Nov-2010 20:31 910 -[TXT] htmlhelp.show.favorities.xml 01-Nov-2010 20:31 957 -[TXT] htmlhelp.show.advanced.search.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.remember.window.position.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.only.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.map.file.xml 01-Nov-2010 20:31 938 -[TXT] htmlhelp.hhp.xml 01-Nov-2010 20:31 896 -[TXT] htmlhelp.hhp.windows.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhp.window.xml 01-Nov-2010 20:31 922 -[TXT] htmlhelp.hhp.tail.xml 01-Nov-2010 20:31 954 -[TXT] htmlhelp.hhk.xml 01-Nov-2010 20:31 886 -[TXT] htmlhelp.hhc.xml 01-Nov-2010 20:31 878 -[TXT] htmlhelp.hhc.width.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.hhc.show.root.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.section.depth.xml 01-Nov-2010 20:31 949 -[TXT] htmlhelp.hhc.folders.instead.books.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.binary.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.force.map.and.alias.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.enumerate.images.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enhanced.decompilation.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.encoding.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.display.progress.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.default.topic.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.chm.xml 01-Nov-2010 20:31 857 -[TXT] htmlhelp.button.zoom.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.stop.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.refresh.xml 01-Nov-2010 20:31 926 -[TXT] htmlhelp.button.print.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.prev.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.options.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.button.next.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.locate.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.jump2.xml 01-Nov-2010 20:31 915 -[TXT] htmlhelp.button.jump2.url.xml 01-Nov-2010 20:31 934 -[TXT] htmlhelp.button.jump2.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump1.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.button.jump1.url.xml 01-Nov-2010 20:31 923 -[TXT] htmlhelp.button.jump1.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.home.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.home.url.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.hideshow.xml 01-Nov-2010 20:31 939 -[TXT] htmlhelp.button.forward.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.back.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.autolabel.xml 01-Nov-2010 20:31 941 -[TXT] htmlhelp.alias.file.xml 01-Nov-2010 20:31 916 -[TXT] html.stylesheet.xml 01-Nov-2010 20:31 1.3K -[TXT] html.stylesheet.type.xml 01-Nov-2010 20:31 944 -[TXT] html.longdesc.xml 01-Nov-2010 20:31 1.0K -[TXT] html.longdesc.link.xml 01-Nov-2010 20:31 1.3K -[TXT] html.head.legalnotice.link.types.xml 01-Nov-2010 20:31 3.1K -[TXT] html.head.legalnotice.link.multiple.xml 01-Nov-2010 20:31 1.8K -[TXT] html.extra.head.links.xml 01-Nov-2010 20:31 1.1K -[TXT] html.ext.xml 01-Nov-2010 20:31 947 -[TXT] html.cleanup.xml 01-Nov-2010 20:31 1.2K -[TXT] html.cellspacing.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellpadding.xml 01-Nov-2010 20:31 1.0K -[TXT] html.base.xml 01-Nov-2010 20:31 1.0K -[TXT] html.append.xml 01-Nov-2010 20:31 1.1K -[TXT] home.image.xml 01-Nov-2010 20:31 848 -[TXT] highlight.xslthl.config.xml 01-Nov-2010 20:31 1.1K -[TXT] highlight.source.xml 01-Nov-2010 20:31 3.4K -[TXT] highlight.default.language.xml 01-Nov-2010 20:31 956 -[TXT] hidetoc.image.xml 01-Nov-2010 20:31 963 -[TXT] headers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] header.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] header.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] header.rule.xml 01-Nov-2010 20:31 848 -[TXT] header.hr.xml 01-Nov-2010 20:31 880 -[TXT] header.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] header.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] graphicsize.use.img.src.path.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] graphics.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] graphical.admonition.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] graphic.default.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.width.xml 01-Nov-2010 20:31 935 -[TXT] glossterm.separation.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.block.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] glossterm.auto.link.xml 01-Nov-2010 20:31 1.3K -[TXT] glosslist.as.blocks.xml 01-Nov-2010 20:31 884 -[TXT] glossentry.show.acronym.xml 01-Nov-2010 20:31 1.4K -[TXT] glossentry.list.item.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] glossdef.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossdef.block.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] glossary.sort.xml 01-Nov-2010 20:31 1.0K -[TXT] glossary.collection.xml 01-Nov-2010 20:31 10K -[TXT] glossary.as.blocks.xml 01-Nov-2010 20:31 1.3K -[TXT] generate.toc.xml 01-Nov-2010 20:31 3.6K -[TXT] generate.section.toc.level.xml 01-Nov-2010 20:31 1.4K -[TXT] generate.revhistory.link.xml 01-Nov-2010 20:31 1.9K -[TXT] generate.meta.abstract.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.legalnotice.link.xml 01-Nov-2010 20:31 2.6K -[TXT] generate.index.xml 01-Nov-2010 20:31 847 -[TXT] generate.id.attributes.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.css.header.xml 01-Nov-2010 20:31 1.5K -[TXT] function.parens.xml 01-Nov-2010 20:31 922 -[TXT] funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] funcsynopsis.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] formal.title.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.title.placement.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.procedures.xml 01-Nov-2010 20:31 895 -[TXT] formal.object.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] fop1.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] fop.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] footnote.sep.leader.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.number.symbols.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.mark.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.font.size.xml 01-Nov-2010 20:31 953 -[TXT] footers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] footer.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] footer.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] footer.rule.xml 01-Nov-2010 20:31 847 -[TXT] footer.hr.xml 01-Nov-2010 20:31 881 -[TXT] footer.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] footer.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] foilgroup.toc.xml 01-Nov-2010 20:31 889 -[TXT] foilgroup.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] foil.title.size.xml 01-Nov-2010 20:31 1.1K -[TXT] foil.title.master.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.subtitle.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] firstterm.only.link.xml 01-Nov-2010 20:31 1.0K -[TXT] filename-prefix.xml 01-Nov-2010 20:31 1.1K -[TXT] figure.properties.xml 01-Nov-2010 20:31 912 -[TXT] feedback.with.ids.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.link.text.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.href.xml 01-Nov-2010 20:31 1.0K -[TXT] exsl.node.set.available.xml 01-Nov-2010 20:31 1.6K -[TXT] example.properties.xml 01-Nov-2010 20:31 917 -[TXT] equation.properties.xml 01-Nov-2010 20:31 924 -[TXT] equation.number.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] epub.autolabel.xml 01-Nov-2010 20:31 923 -[TXT] entry.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] emphasis.propagates.style.xml 01-Nov-2010 20:31 1.1K -[TXT] email.mailto.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] email.delimiters.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] editedby.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] eclipse.plugin.provider.xml 01-Nov-2010 20:31 914 -[TXT] eclipse.plugin.name.xml 01-Nov-2010 20:31 886 -[TXT] eclipse.plugin.id.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.autolabel.xml 01-Nov-2010 20:31 952 -[TXT] ebnf.table.border.xml 01-Nov-2010 20:31 923 -[TXT] ebnf.table.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] ebnf.statement.terminator.xml 01-Nov-2010 20:31 1.1K -[TXT] ebnf.assignment.xml 01-Nov-2010 20:31 1.4K -[TXT] dynamic.toc.xml 01-Nov-2010 20:31 972 -[TXT] dry-run.xml 01-Nov-2010 20:31 1.1K -[TXT] draft.watermark.image.xml 01-Nov-2010 20:31 928 -[TXT] draft.mode.xml 01-Nov-2010 20:31 1.4K -[TXT] double.sided.xml 01-Nov-2010 20:31 1.0K -[TXT] docbook.css.source.xml 01-Nov-2010 20:31 3.5K -[TXT] docbook.css.link.xml 01-Nov-2010 20:31 1.5K -[TXT] dingbat.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] default.units.xml 01-Nov-2010 20:31 1.4K -[TXT] default.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.table.rules.xml 01-Nov-2010 20:31 2.2K -[TXT] default.table.frame.xml 01-Nov-2010 20:31 914 -[TXT] default.image.width.xml 01-Nov-2010 20:31 1.1K -[TXT] default.float.class.xml 01-Nov-2010 20:31 1.1K -[TXT] custom.css.source.xml 01-Nov-2010 20:31 4.2K -[TXT] currentpage.marker.xml 01-Nov-2010 20:31 902 -[TXT] current.docid.xml 01-Nov-2010 20:31 1.7K -[TXT] css.stylesheet.xml 01-Nov-2010 20:31 1.0K -[TXT] css.stylesheet.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] css.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] crop.marks.xml 01-Nov-2010 20:31 926 -[TXT] crop.mark.width.xml 01-Nov-2010 20:31 910 -[TXT] crop.mark.offset.xml 01-Nov-2010 20:31 916 -[TXT] crop.mark.bleed.xml 01-Nov-2010 20:31 946 -[TXT] contrib.inline.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] component.titlepage.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] component.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] component.label.includes.part.label.xml 01-Nov-2010 20:31 1.6K -[TXT] compact.list.item.spacing.xml 01-Nov-2010 20:31 1.2K -[TXT] column.gap.titlepage.xml 01-Nov-2010 20:31 1.0K -[TXT] column.gap.lot.xml 01-Nov-2010 20:31 961 -[TXT] column.gap.index.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.front.xml 01-Nov-2010 20:31 956 -[TXT] column.gap.body.xml 01-Nov-2010 20:31 941 -[TXT] column.gap.back.xml 01-Nov-2010 20:31 944 -[TXT] column.count.titlepage.xml 01-Nov-2010 20:31 893 -[TXT] column.count.lot.xml 01-Nov-2010 20:31 933 -[TXT] column.count.index.xml 01-Nov-2010 20:31 873 -[TXT] column.count.front.xml 01-Nov-2010 20:31 914 -[TXT] column.count.body.xml 01-Nov-2010 20:31 865 -[TXT] column.count.back.xml 01-Nov-2010 20:31 906 -[TXT] collect.xref.targets.xml 01-Nov-2010 20:31 1.7K -[TXT] citerefentry.link.xml 01-Nov-2010 20:31 1.0K -[TXT] chunker.output.standalone.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.omit-xml-declaration.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.method.xml 01-Nov-2010 20:31 1.3K -[TXT] chunker.output.media-type.xml 01-Nov-2010 20:31 1.5K -[TXT] chunker.output.indent.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-system.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-public.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.cdata-section-elements.xml 01-Nov-2010 20:31 1.2K -[TXT] chunk.tocs.and.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.tocs.and.lots.has.title.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.separate.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.sections.xml 01-Nov-2010 20:31 960 -[TXT] chunk.section.depth.xml 01-Nov-2010 20:31 903 -[TXT] chunk.quietly.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.first.sections.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.append.xml 01-Nov-2010 20:31 1.1K -[TXT] chapter.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] callouts.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.start.character.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.unicode.number.limit.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.font.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.list.table.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.icon.size.xml 01-Nov-2010 20:31 923 -[TXT] callout.graphics.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.graphics.path.xml 01-Nov-2010 20:31 1.1K -[TXT] callout.graphics.number.limit.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.graphics.extension.xml 01-Nov-2010 20:31 1.4K -[TXT] callout.defaultcolumn.xml 01-Nov-2010 20:31 1.0K -[TXT] bullet.image.xml 01-Nov-2010 20:31 880 -[TXT] bridgehead.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] bookmarks.collapse.xml 01-Nov-2010 20:31 1.1K -[TXT] body.start.indent.xml 01-Nov-2010 20:31 2.2K -[TXT] body.margin.top.xml 01-Nov-2010 20:31 956 -[TXT] body.margin.bottom.xml 01-Nov-2010 20:31 963 -[TXT] body.font.size.xml 01-Nov-2010 20:31 1.1K -[TXT] body.font.master.xml 01-Nov-2010 20:31 1.0K -[TXT] body.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] body.end.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] body.bg.color.xml 01-Nov-2010 20:31 891 -[TXT] body.attributes.xml 01-Nov-2010 20:31 1.1K -[TXT] blurb.on.titlepage.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] blockquote.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] bibliography.style.xml 01-Nov-2010 20:31 1.3K -[TXT] bibliography.numbered.xml 01-Nov-2010 20:31 911 -[TXT] bibliography.collection.xml 01-Nov-2010 20:31 4.0K -[TXT] biblioentry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] biblioentry.item.separator.xml 01-Nov-2010 20:31 921 -[TXT] base.dir.xml 01-Nov-2010 20:31 936 -[TXT] banner.before.navigation.xml 01-Nov-2010 20:31 869 -[TXT] axf.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.separator.xml 01-Nov-2010 20:31 944 -[TXT] autotoc.label.in.hyperlink.xml 01-Nov-2010 20:31 1.1K -[TXT] autolayout-file.xml 01-Nov-2010 20:31 1.1K -[TXT] author.othername.in.middle.xml 01-Nov-2010 20:31 1.1K -[TXT] article.appendix.title.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] arbortext.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] appendix.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] annotation.support.xml 01-Nov-2010 20:31 1.0K -[TXT] annotation.js.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.graphic.open.xml 01-Nov-2010 20:31 1.1K -[TXT] annotation.graphic.close.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.css.xml 01-Nov-2010 20:31 2.1K -[TXT] annotate.toc.xml 01-Nov-2010 20:31 952 -[TXT] alignment.xml 01-Nov-2010 20:31 1.5K -[TXT] admonition.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] admonition.properties.xml 01-Nov-2010 20:31 964 -[TXT] admon.textlabel.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.style.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.graphics.xml 01-Nov-2010 20:31 956 -[TXT] admon.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.graphics.extension.xml 01-Nov-2010 20:31 940 -[TXT] ade.extensions.xml 01-Nov-2010 20:31 1.3K -[TXT] active.toc.xml 01-Nov-2010 20:31 958 -[TXT] abstract.title.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] abstract.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] abstract.notitle.enabled.xml 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=S;O=A deleted file mode 100644 index 077ba198f9d435b2fb671c036b7a58a62425b4aa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=S;O=A +++ /dev/null @@ -1,677 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/params - - -

    Index of /release/xsl-ns/1.76.1/params

    -
    Icon  Name                                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] template.xml 01-Nov-2010 20:31 730 -[TXT] text.up.xml 01-Nov-2010 20:31 766 -[TXT] text.toc.xml 01-Nov-2010 20:31 771 -[TXT] text.home.xml 01-Nov-2010 20:31 775 -[TXT] text.next.xml 01-Nov-2010 20:31 777 -[TXT] text.prev.xml 01-Nov-2010 20:31 777 -[TXT] table.entry.padding.xml 01-Nov-2010 20:31 808 -[TXT] sequential.links.xml 01-Nov-2010 20:31 824 -[TXT] olink.pubid.xml 01-Nov-2010 20:31 838 -[TXT] line-height.xml 01-Nov-2010 20:31 839 -[TXT] toc.image.xml 01-Nov-2010 20:31 840 -[TXT] olink.sysid.xml 01-Nov-2010 20:31 843 -[TXT] footer.rule.xml 01-Nov-2010 20:31 847 -[TXT] generate.index.xml 01-Nov-2010 20:31 847 -[TXT] header.rule.xml 01-Nov-2010 20:31 848 -[TXT] home.image.xml 01-Nov-2010 20:31 848 -[TXT] up.image.xml 01-Nov-2010 20:31 852 -[TXT] toc.html.xml 01-Nov-2010 20:31 856 -[TXT] htmlhelp.chm.xml 01-Nov-2010 20:31 857 -[TXT] olink.resolver.xml 01-Nov-2010 20:31 859 -[TXT] toc.width.xml 01-Nov-2010 20:31 861 -[TXT] prev.image.xml 01-Nov-2010 20:31 864 -[TXT] column.count.body.xml 01-Nov-2010 20:31 865 -[TXT] toc.bg.color.xml 01-Nov-2010 20:31 865 -[TXT] next.image.xml 01-Nov-2010 20:31 867 -[TXT] banner.before.navigation.xml 01-Nov-2010 20:31 869 -[TXT] column.count.index.xml 01-Nov-2010 20:31 873 -[TXT] no.toc.image.xml 01-Nov-2010 20:31 875 -[TXT] toc.max.depth.xml 01-Nov-2010 20:31 877 -[TXT] htmlhelp.hhc.xml 01-Nov-2010 20:31 878 -[TXT] ua.js.xml 01-Nov-2010 20:31 879 -[TXT] bullet.image.xml 01-Nov-2010 20:31 880 -[TXT] header.hr.xml 01-Nov-2010 20:31 880 -[TXT] footer.hr.xml 01-Nov-2010 20:31 881 -[TXT] no.home.image.xml 01-Nov-2010 20:31 883 -[TXT] section.autolabel.xml 01-Nov-2010 20:31 883 -[TXT] glosslist.as.blocks.xml 01-Nov-2010 20:31 884 -[TXT] eclipse.plugin.name.xml 01-Nov-2010 20:31 886 -[TXT] htmlhelp.hhk.xml 01-Nov-2010 20:31 886 -[TXT] no.up.image.xml 01-Nov-2010 20:31 888 -[TXT] foilgroup.toc.xml 01-Nov-2010 20:31 889 -[TXT] titlefoil.html.xml 01-Nov-2010 20:31 889 -[TXT] body.bg.color.xml 01-Nov-2010 20:31 891 -[TXT] column.count.titlepage.xml 01-Nov-2010 20:31 893 -[TXT] formal.procedures.xml 01-Nov-2010 20:31 895 -[TXT] htmlhelp.hhp.xml 01-Nov-2010 20:31 896 -[TXT] nominal.image.depth.xml 01-Nov-2010 20:31 896 -[TXT] qandadiv.autolabel.xml 01-Nov-2010 20:31 896 -[TXT] htmlhelp.button.jump1.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump2.title.xml 01-Nov-2010 20:31 899 -[TXT] no.prev.image.xml 01-Nov-2010 20:31 900 -[TXT] no.next.image.xml 01-Nov-2010 20:31 901 -[TXT] currentpage.marker.xml 01-Nov-2010 20:31 902 -[TXT] chunk.section.depth.xml 01-Nov-2010 20:31 903 -[TXT] xbDOM.js.xml 01-Nov-2010 20:31 903 -[TXT] footers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] headers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] olink.fragid.xml 01-Nov-2010 20:31 905 -[TXT] column.count.back.xml 01-Nov-2010 20:31 906 -[TXT] htmlhelp.button.home.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.next.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.prev.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.zoom.xml 01-Nov-2010 20:31 909 -[TXT] slides.js.xml 01-Nov-2010 20:31 909 -[TXT] crop.mark.width.xml 01-Nov-2010 20:31 910 -[TXT] htmlhelp.show.menu.xml 01-Nov-2010 20:31 910 -[TXT] suppress.navigation.xml 01-Nov-2010 20:31 910 -[TXT] bibliography.numbered.xml 01-Nov-2010 20:31 911 -[TXT] navbodywidth.xml 01-Nov-2010 20:31 911 -[TXT] figure.properties.xml 01-Nov-2010 20:31 912 -[TXT] column.count.front.xml 01-Nov-2010 20:31 914 -[TXT] default.table.frame.xml 01-Nov-2010 20:31 914 -[TXT] eclipse.plugin.provider.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.button.back.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.display.progress.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.button.jump2.xml 01-Nov-2010 20:31 915 -[TXT] crop.mark.offset.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.alias.file.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.home.url.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.print.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.stop.xml 01-Nov-2010 20:31 916 -[TXT] suppress.homepage.title.xml 01-Nov-2010 20:31 916 -[TXT] example.properties.xml 01-Nov-2010 20:31 917 -[TXT] manual.toc.xml 01-Nov-2010 20:31 917 -[TXT] overlay.js.xml 01-Nov-2010 20:31 919 -[TXT] xbStyle.js.xml 01-Nov-2010 20:31 919 -[TXT] biblioentry.item.separator.xml 01-Nov-2010 20:31 921 -[TXT] simplesect.in.toc.xml 01-Nov-2010 20:31 921 -[TXT] textbgcolor.xml 01-Nov-2010 20:31 921 -[TXT] function.parens.xml 01-Nov-2010 20:31 922 -[TXT] htmlhelp.hhp.window.xml 01-Nov-2010 20:31 922 -[TXT] suppress.footer.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.header.navigation.xml 01-Nov-2010 20:31 922 -[TXT] callout.icon.size.xml 01-Nov-2010 20:31 923 -[TXT] ebnf.table.border.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.plugin.id.xml 01-Nov-2010 20:31 923 -[TXT] epub.autolabel.xml 01-Nov-2010 20:31 923 -[TXT] htmlhelp.button.jump1.url.xml 01-Nov-2010 20:31 923 -[TXT] equation.properties.xml 01-Nov-2010 20:31 924 -[TXT] page.margin.top.xml 01-Nov-2010 20:31 924 -[TXT] crop.marks.xml 01-Nov-2010 20:31 926 -[TXT] htmlhelp.button.refresh.xml 01-Nov-2010 20:31 926 -[TXT] navbgcolor.xml 01-Nov-2010 20:31 926 -[TXT] show.foil.number.xml 01-Nov-2010 20:31 926 -[TXT] segmentedlist.as.table.xml 01-Nov-2010 20:31 927 -[TXT] draft.watermark.image.xml 01-Nov-2010 20:31 928 -[TXT] region.after.extent.xml 01-Nov-2010 20:31 928 -[TXT] table.borders.with.css.xml 01-Nov-2010 20:31 928 -[TXT] htmlhelp.button.forward.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.locate.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.jump1.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.hhc.width.xml 01-Nov-2010 20:31 931 -[TXT] xref.properties.xml 01-Nov-2010 20:31 931 -[TXT] column.count.lot.xml 01-Nov-2010 20:31 933 -[TXT] region.before.extent.xml 01-Nov-2010 20:31 933 -[TXT] htmlhelp.button.jump2.url.xml 01-Nov-2010 20:31 934 -[TXT] glossterm.width.xml 01-Nov-2010 20:31 935 -[TXT] xbLibrary.js.xml 01-Nov-2010 20:31 935 -[TXT] base.dir.xml 01-Nov-2010 20:31 936 -[TXT] htmlhelp.button.options.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.title.xml 01-Nov-2010 20:31 937 -[TXT] navtocwidth.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.map.file.xml 01-Nov-2010 20:31 938 -[TXT] sans.font.family.xml 01-Nov-2010 20:31 938 -[TXT] htmlhelp.button.hideshow.xml 01-Nov-2010 20:31 939 -[TXT] toc.section.depth.xml 01-Nov-2010 20:31 939 -[TXT] admon.graphics.extension.xml 01-Nov-2010 20:31 940 -[TXT] column.gap.body.xml 01-Nov-2010 20:31 941 -[TXT] htmlhelp.autolabel.xml 01-Nov-2010 20:31 941 -[TXT] profile.separator.xml 01-Nov-2010 20:31 942 -[TXT] punct.honorific.xml 01-Nov-2010 20:31 942 -[TXT] refentry.separator.xml 01-Nov-2010 20:31 942 -[TXT] autotoc.label.separator.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.back.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.index.xml 01-Nov-2010 20:31 944 -[TXT] html.stylesheet.type.xml 01-Nov-2010 20:31 944 -[TXT] crop.mark.bleed.xml 01-Nov-2010 20:31 946 -[TXT] saxon.callouts.xml 01-Nov-2010 20:31 946 -[TXT] html.ext.xml 01-Nov-2010 20:31 947 -[TXT] htmlhelp.hhc.section.depth.xml 01-Nov-2010 20:31 949 -[TXT] page.margin.bottom.xml 01-Nov-2010 20:31 951 -[TXT] annotate.toc.xml 01-Nov-2010 20:31 952 -[TXT] eclipse.autolabel.xml 01-Nov-2010 20:31 952 -[TXT] nav.separator.xml 01-Nov-2010 20:31 952 -[TXT] footnote.font.size.xml 01-Nov-2010 20:31 953 -[TXT] overlay.logo.xml 01-Nov-2010 20:31 953 -[TXT] htmlhelp.hhp.tail.xml 01-Nov-2010 20:31 954 -[TXT] linenumbering.width.xml 01-Nov-2010 20:31 955 -[TXT] admon.graphics.xml 01-Nov-2010 20:31 956 -[TXT] body.margin.top.xml 01-Nov-2010 20:31 956 -[TXT] column.gap.front.xml 01-Nov-2010 20:31 956 -[TXT] highlight.default.language.xml 01-Nov-2010 20:31 956 -[TXT] keyboard.nav.xml 01-Nov-2010 20:31 956 -[TXT] htmlhelp.show.favorities.xml 01-Nov-2010 20:31 957 -[TXT] active.toc.xml 01-Nov-2010 20:31 958 -[TXT] olink.outline.ext.xml 01-Nov-2010 20:31 958 -[TXT] plus.image.xml 01-Nov-2010 20:31 959 -[TXT] chunk.sections.xml 01-Nov-2010 20:31 960 -[TXT] column.gap.lot.xml 01-Nov-2010 20:31 961 -[TXT] body.margin.bottom.xml 01-Nov-2010 20:31 963 -[TXT] hidetoc.image.xml 01-Nov-2010 20:31 963 -[TXT] htmlhelp.show.toolbar.text.xml 01-Nov-2010 20:31 963 -[TXT] ignore.image.scaling.xml 01-Nov-2010 20:31 963 -[TXT] root.filename.xml 01-Nov-2010 20:31 963 -[TXT] showtoc.image.xml 01-Nov-2010 20:31 963 -[TXT] table.frame.border.thickness.xml 01-Nov-2010 20:31 963 -[TXT] admonition.properties.xml 01-Nov-2010 20:31 964 -[TXT] minus.image.xml 01-Nov-2010 20:31 965 -[TXT] revhistory.title.properties.xml 01-Nov-2010 20:31 966 -[TXT] informalfigure.properties.xml 01-Nov-2010 20:31 969 -[TXT] dynamic.toc.xml 01-Nov-2010 20:31 972 -[TXT] column.gap.titlepage.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enhanced.decompilation.xml 01-Nov-2010 20:31 1.0K -[TXT] monospace.font.family.xml 01-Nov-2010 20:31 1.0K -[TXT] subscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] ulink.target.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.remember.window.position.xml 01-Nov-2010 20:31 1.0K -[TXT] informalexample.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhp.windows.xml 01-Nov-2010 20:31 1.0K -[TXT] id.warnings.xml 01-Nov-2010 20:31 1.0K -[TXT] link.mailto.url.xml 01-Nov-2010 20:31 1.0K -[TXT] refclass.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] annotation.support.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.font.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.quietly.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.everyNth.xml 01-Nov-2010 20:31 1.0K -[TXT] use.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellpadding.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellspacing.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.show.advanced.search.xml 01-Nov-2010 20:31 1.0K -[TXT] informalequation.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] contrib.inline.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] qanda.nested.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] abstract.notitle.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.tocs.and.lots.has.title.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] superscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.top.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] use.id.as.filename.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.graphics.xml 01-Nov-2010 20:31 1.0K -[TXT] points.per.em.xml 01-Nov-2010 20:31 1.0K -[TXT] editedby.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] css.stylesheet.xml 01-Nov-2010 20:31 1.0K -[TXT] man.segtitle.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.navigation.height.xml 01-Nov-2010 20:31 1.0K -[TXT] bridgehead.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.href.xml 01-Nov-2010 20:31 1.0K -[TXT] saxon.tablecolumns.xml 01-Nov-2010 20:31 1.0K -[TXT] xbCollapsibleLists.js.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.text.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] make.single.year.ranges.xml 01-Nov-2010 20:31 1.0K -[TXT] spacing.paras.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] email.mailto.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.bottom.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] double.sided.xml 01-Nov-2010 20:31 1.0K -[TXT] table.frame.border.color.xml 01-Nov-2010 20:31 1.0K -[TXT] html.longdesc.xml 01-Nov-2010 20:31 1.0K -[TXT] javahelp.encoding.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.image.xml 01-Nov-2010 20:31 1.0K -[TXT] ebnf.table.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.binary.xml 01-Nov-2010 20:31 1.0K -[TXT] firstterm.only.link.xml 01-Nov-2010 20:31 1.0K -[TXT] para.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] procedure.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.title.master.xml 01-Nov-2010 20:31 1.0K -[TXT] tablecolumns.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] index.prefer.titleabbrev.xml 01-Nov-2010 20:31 1.0K -[TXT] arbortext.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] itemizedlist.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.with.ids.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] html.base.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enumerate.images.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] body.font.master.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.cell.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.link.text.xml 01-Nov-2010 20:31 1.0K -[TXT] citerefentry.link.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.show.root.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.window.geometry.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.meta.abstract.xml 01-Nov-2010 20:31 1.0K -[TXT] nav.table.summary.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.title.xml 01-Nov-2010 20:31 1.0K -[TXT] use.svg.xml 01-Nov-2010 20:31 1.0K -[TXT] section.label.includes.component.label.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.first.sections.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.only.xml 01-Nov-2010 20:31 1.0K -[TXT] script.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.defaultcolumn.xml 01-Nov-2010 20:31 1.0K -[TXT] pixels.per.inch.xml 01-Nov-2010 20:31 1.0K -[TXT] callouts.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] entry.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.xml 01-Nov-2010 20:31 1.0K -[TXT] index.page.number.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] glossary.sort.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.xml 01-Nov-2010 20:31 1.0K -[TXT] refentry.xref.manvolnum.xml 01-Nov-2010 20:31 1.0K -[TXT] slides.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] output-root.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.in.base.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.headings.xml 01-Nov-2010 20:31 1.0K -[TXT] phrase.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] shade.verbatim.xml 01-Nov-2010 20:31 1.0K -[TXT] footer.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] header.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.textlabel.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.funcprototype.xml 01-Nov-2010 20:31 1.1K -[TXT] xep.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.separation.xml 01-Nov-2010 20:31 1.1K -[TXT] show.comments.xml 01-Nov-2010 20:31 1.1K -[TXT] emphasis.propagates.style.xml 01-Nov-2010 20:31 1.1K -[TXT] author.othername.in.middle.xml 01-Nov-2010 20:31 1.1K -[TXT] filename-prefix.xml 01-Nov-2010 20:31 1.1K -[TXT] foilgroup.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] funcsynopsis.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.use.hhk.xml 01-Nov-2010 20:31 1.1K -[TXT] runinhead.default.title.end.punct.xml 01-Nov-2010 20:31 1.1K -[TXT] variablelist.term.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] overlay.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.inherit.numeration.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.style.xml 01-Nov-2010 20:31 1.1K -[TXT] body.font.size.xml 01-Nov-2010 20:31 1.1K -[TXT] bookmarks.collapse.xml 01-Nov-2010 20:31 1.1K -[TXT] nominal.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.graphics.xml 01-Nov-2010 20:31 1.1K -[TXT] graphics.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] man.table.footnotes.divider.xml 01-Nov-2010 20:31 1.1K -[TXT] default.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcsynopsisinfo.xml 01-Nov-2010 20:31 1.1K -[TXT] body.attributes.xml 01-Nov-2010 20:31 1.1K -[TXT] inherit.keywords.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.use.img.src.path.xml 01-Nov-2010 20:31 1.1K -[TXT] linenumbering.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] table.spacer.image.xml 01-Nov-2010 20:31 1.1K -[TXT] page.orientation.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] foil.title.size.xml 01-Nov-2010 20:31 1.1K -[TXT] annotation.graphic.open.xml 01-Nov-2010 20:31 1.1K -[TXT] email.delimiters.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] l10n.gentext.default.language.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.encoding.xml 01-Nov-2010 20:31 1.1K -[TXT] man.output.manifest.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.force.map.and.alias.xml 01-Nov-2010 20:31 1.1K -[TXT] saxon.linenumbering.xml 01-Nov-2010 20:31 1.1K -[TXT] axf.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] list.item.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] graphic.default.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] callout.graphics.path.xml 01-Nov-2010 20:31 1.1K -[TXT] section.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] abstract.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] autolayout-file.xml 01-Nov-2010 20:31 1.1K -[TXT] dry-run.xml 01-Nov-2010 20:31 1.1K -[TXT] html.extra.head.links.xml 01-Nov-2010 20:31 1.1K -[TXT] css.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] default.image.width.xml 01-Nov-2010 20:31 1.1K -[TXT] glossdef.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] xref.with.number.and.title.xml 01-Nov-2010 20:31 1.1K -[TXT] normal.para.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] highlight.xslthl.config.xml 01-Nov-2010 20:31 1.1K -[TXT] table.cell.padding.xml 01-Nov-2010 20:31 1.1K -[TXT] menuchoice.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] footer.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] header.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] css.stylesheet.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] list.block.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.folders.instead.books.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.showtitles.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.in.hyperlink.xml 01-Nov-2010 20:31 1.1K -[TXT] make.year.ranges.xml 01-Nov-2010 20:31 1.1K -[TXT] itemizedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] toc.list.type.xml 01-Nov-2010 20:31 1.1K -[TXT] section.autolabel.max.depth.xml 01-Nov-2010 20:31 1.1K -[TXT] html.append.xml 01-Nov-2010 20:31 1.1K -[TXT] multiframe.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.indent.xml 01-Nov-2010 20:31 1.1K -[TXT] default.float.class.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.separate.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.tocs.and.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.append.xml 01-Nov-2010 20:31 1.1K -[TXT] ebnf.statement.terminator.xml 01-Nov-2010 20:31 1.1K -[TXT] sidebar.title.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] hyphenate.verbatim.characters.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.debug.xml 01-Nov-2010 20:31 1.1K -[TXT] monospace.verbatim.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] page.width.xml 01-Nov-2010 20:31 1.2K -[TXT] sidebar.float.width.xml 01-Nov-2010 20:31 1.2K -[TXT] fop1.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.manifest.filename.xml 01-Nov-2010 20:31 1.2K -[TXT] biblioentry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] orderedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] body.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] page.height.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.width.xml 01-Nov-2010 20:31 1.2K -[TXT] index.entry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] blurb.on.titlepage.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] output.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] itemizedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] profile.attribute.xml 01-Nov-2010 20:31 1.2K -[TXT] title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] use.id.function.xml 01-Nov-2010 20:31 1.2K -[TXT] qanda.in.toc.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.title.end.punct.xml 01-Nov-2010 20:31 1.2K -[TXT] othercredit.like.author.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] man.th.extra1.suppress.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] textdata.default.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.row.height.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.list.table.xml 01-Nov-2010 20:31 1.2K -[TXT] man.funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] use.embed.for.svg.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.name.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.hide.show.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.js.xml 01-Nov-2010 20:31 1.2K -[TXT] index.preferred.page.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] speakernote.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] l10n.gentext.language.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.title.xml 01-Nov-2010 20:31 1.2K -[TXT] component.titlepage.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] body.end.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.number.limit.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.omit-xml-declaration.xml 01-Nov-2010 20:31 1.2K -[TXT] header.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.in.separate.dir.xml 01-Nov-2010 20:31 1.2K -[TXT] footer.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] running.foot.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] fop.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.indent.width.xml 01-Nov-2010 20:31 1.2K -[TXT] table.cell.border.thickness.xml 01-Nov-2010 20:31 1.2K -[TXT] informaltable.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.standalone.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.graphic.close.xml 01-Nov-2010 20:31 1.2K -[TXT] man.indent.blurbs.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.title.placement.xml 01-Nov-2010 20:31 1.2K -[TXT] ulink.footnotes.xml 01-Nov-2010 20:31 1.2K -[TXT] compact.list.item.spacing.xml 01-Nov-2010 20:31 1.2K -[TXT] html.cleanup.xml 01-Nov-2010 20:31 1.2K -[TXT] admonition.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] rootid.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.cdata-section-elements.xml 01-Nov-2010 20:31 1.2K -[TXT] dingbat.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] passivetex.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-system.xml 01-Nov-2010 20:31 1.2K -[TXT] glossdef.block.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-public.xml 01-Nov-2010 20:31 1.2K -[TXT] table.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] ade.extensions.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.unicode.start.character.xml 01-Nov-2010 20:31 1.3K -[TXT] man.th.extra3.suppress.xml 01-Nov-2010 20:31 1.3K -[TXT] html.longdesc.link.xml 01-Nov-2010 20:31 1.3K -[TXT] man.output.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.verbatims.xml 01-Nov-2010 20:31 1.3K -[TXT] keep.relative.image.uris.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.lists.xml 01-Nov-2010 20:31 1.3K -[TXT] targets.filename.xml 01-Nov-2010 20:31 1.3K -[TXT] glossterm.auto.link.xml 01-Nov-2010 20:31 1.3K -[TXT] chunker.output.method.xml 01-Nov-2010 20:31 1.3K -[TXT] table.table.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.pagebreak.xml 01-Nov-2010 20:31 1.3K -[TXT] article.appendix.title.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] rebuild-all.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.show.xml 01-Nov-2010 20:31 1.3K -[TXT] equation.number.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] bibliography.style.xml 01-Nov-2010 20:31 1.3K -[TXT] make.valid.html.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.chars.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.os.xml 01-Nov-2010 20:31 1.3K -[TXT] blockquote.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] html.stylesheet.xml 01-Nov-2010 20:31 1.3K -[TXT] make.graphic.viewport.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.lang.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.arch.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.graphics.number.limit.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.pre.xml 01-Nov-2010 20:31 1.3K -[TXT] glossentry.list.item.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.post.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.status.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.vendor.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.xml 01-Nov-2010 20:31 1.3K -[TXT] monospace.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.meta.get.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] wordml.template.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.default.topic.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.audience.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.security.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.wordsize.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.revision.xml 01-Nov-2010 20:31 1.3K -[TXT] glossary.as.blocks.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.subtitle.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.condition.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.userlevel.xml 01-Nov-2010 20:31 1.3K -[TXT] xref.label-title.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.conformance.xml 01-Nov-2010 20:31 1.4K -[TXT] glossentry.show.acronym.xml 01-Nov-2010 20:31 1.4K -[TXT] ebnf.assignment.xml 01-Nov-2010 20:31 1.4K -[TXT] pages.template.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.revisionflag.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] generate.section.toc.level.xml 01-Nov-2010 20:31 1.4K -[TXT] draft.mode.xml 01-Nov-2010 20:31 1.4K -[TXT] list.block.spacing.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.title-page.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] toc.margin.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] informal.object.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] tex.math.file.xml 01-Nov-2010 20:31 1.4K -[TXT] qanda.title.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] label.from.part.xml 01-Nov-2010 20:31 1.4K -[TXT] callout.graphics.extension.xml 01-Nov-2010 20:31 1.4K -[TXT] refentry.date.profile.xml 01-Nov-2010 20:31 1.4K -[TXT] variablelist.term.break.after.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.sep.leader.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] table.footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.mark.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] man.endnotes.list.heading.xml 01-Nov-2010 20:31 1.4K -[TXT] default.units.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.label-page.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] generate.css.header.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.value.xml 01-Nov-2010 20:31 1.5K -[TXT] shade.verbatim.style.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.title.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] img.src.path.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.object.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] xep.index.item.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] menuchoice.menu.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] chunker.output.media-type.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level6.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] docbook.css.link.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.base.dir.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level1.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level2.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level3.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level4.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level5.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] tex.math.delims.xml 01-Nov-2010 20:31 1.5K -[TXT] table.cell.border.color.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.xml 01-Nov-2010 20:31 1.5K -[TXT] monospace.verbatim.font.width.xml 01-Nov-2010 20:31 1.5K -[TXT] glossterm.block.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] process.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] alignment.xml 01-Nov-2010 20:31 1.5K -[TXT] table.footnote.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] process.empty.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.subdirs.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] man.indent.width.xml 01-Nov-2010 20:31 1.6K -[TXT] olink.base.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] section.title.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] preferred.mediaobject.role.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.term.separator.xml 01-Nov-2010 20:31 1.6K -[TXT] saxon.character.representation.xml 01-Nov-2010 20:31 1.6K -[TXT] component.label.includes.part.label.xml 01-Nov-2010 20:31 1.6K -[TXT] refentry.version.profile.xml 01-Nov-2010 20:31 1.6K -[TXT] table.frame.border.style.xml 01-Nov-2010 20:31 1.6K -[TXT] root.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] exsl.node.set.available.xml 01-Nov-2010 20:31 1.6K -[TXT] target.database.document.xml 01-Nov-2010 20:31 1.6K -[TXT] index.on.role.xml 01-Nov-2010 20:31 1.6K -[TXT] man.charmap.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] man.hyphenate.urls.xml 01-Nov-2010 20:31 1.6K -[TXT] sidebar.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] man.th.extra2.suppress.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.max.termlength.xml 01-Nov-2010 20:31 1.6K -[TXT] nominal.image.width.xml 01-Nov-2010 20:31 1.7K -[TXT] verbatim.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] man.hyphenate.filenames.xml 01-Nov-2010 20:31 1.7K -[TXT] symbol.font.family.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.number.symbols.xml 01-Nov-2010 20:31 1.7K -[TXT] use.local.olink.style.xml 01-Nov-2010 20:31 1.7K -[TXT] current.docid.xml 01-Nov-2010 20:31 1.7K -[TXT] show.revisionflag.xml 01-Nov-2010 20:31 1.7K -[TXT] collect.xref.targets.xml 01-Nov-2010 20:31 1.7K -[TXT] pgwide.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] abstract.title.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] refentry.version.suppress.xml 01-Nov-2010 20:31 1.7K -[TXT] table.cell.border.style.xml 01-Nov-2010 20:31 1.7K -[TXT] man.th.extra3.max.length.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] index.div.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] toc.line.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] html.head.legalnotice.link.multiple.xml 01-Nov-2010 20:31 1.8K -[TXT] refentry.source.name.suppress.xml 01-Nov-2010 20:31 1.8K -[TXT] table.footnote.number.symbols.xml 01-Nov-2010 20:31 1.8K -[TXT] man.th.extra2.max.length.xml 01-Nov-2010 20:31 1.8K -[TXT] index.on.type.xml 01-Nov-2010 20:31 1.8K -[TXT] page.margin.outer.xml 01-Nov-2010 20:31 1.8K -[TXT] man.output.lang.in.name.enabled.xml 01-Nov-2010 20:31 1.8K -[TXT] marker.section.level.xml 01-Nov-2010 20:31 1.8K -[TXT] l10n.gentext.use.xref.language.xml 01-Nov-2010 20:31 1.8K -[TXT] nongraphical.admonition.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] component.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] graphical.admonition.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] insert.xref.page.number.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.date.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.break.after.slash.xml 01-Nov-2010 20:31 1.9K -[TXT] man.hyphenate.computer.inlines.xml 01-Nov-2010 20:31 1.9K -[TXT] index.term.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] page.margin.inner.xml 01-Nov-2010 20:31 1.9K -[TXT] margin.note.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] use.role.for.mediaobject.xml 01-Nov-2010 20:31 1.9K -[TXT] index.number.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.version.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.copyright.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.authors.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] generate.revhistory.link.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] side.float.properties.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.name.profile.enabled.xml 01-Nov-2010 20:31 2.0K -[TXT] index.range.separator.xml 01-Nov-2010 20:31 2.0K -[TXT] make.clean.html.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.id.attributes.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] variablelist.as.table.xml 01-Nov-2010 20:31 2.0K -[TXT] hyphenate.verbatim.xml 01-Nov-2010 20:31 2.1K -[TXT] title.margin.left.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.encoding.xml 01-Nov-2010 20:31 2.1K -[TXT] annotation.css.xml 01-Nov-2010 20:31 2.1K -[TXT] man.justify.xml 01-Nov-2010 20:31 2.1K -[TXT] default.table.rules.xml 01-Nov-2010 20:31 2.2K -[TXT] profile.role.xml 01-Nov-2010 20:31 2.2K -[TXT] body.start.indent.xml 01-Nov-2010 20:31 2.2K -[TXT] insert.link.page.number.xml 01-Nov-2010 20:31 2.3K -[TXT] section.container.element.xml 01-Nov-2010 20:31 2.3K -[TXT] man.hyphenate.xml 01-Nov-2010 20:31 2.3K -[TXT] variablelist.as.blocks.xml 01-Nov-2010 20:31 2.3K -[TXT] part.autolabel.xml 01-Nov-2010 20:31 2.3K -[TXT] chapter.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] preface.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] l10n.lang.value.rfc.compliant.xml 01-Nov-2010 20:31 2.4K -[TXT] appendix.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] reference.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] man.charmap.enabled.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.manual.profile.xml 01-Nov-2010 20:31 2.4K -[TXT] writing.mode.xml 01-Nov-2010 20:31 2.4K -[TXT] insert.olink.pdf.frag.xml 01-Nov-2010 20:31 2.5K -[TXT] refentry.title.properties.xml 01-Nov-2010 20:31 2.6K -[TXT] man.th.title.max.length.xml 01-Nov-2010 20:31 2.6K -[TXT] man.output.better.ps.enabled.xml 01-Nov-2010 20:31 2.6K -[TXT] generate.legalnotice.link.xml 01-Nov-2010 20:31 2.6K -[TXT] man.indent.refsect.xml 01-Nov-2010 20:31 2.6K -[TXT] index.links.to.section.xml 01-Nov-2010 20:31 2.7K -[TXT] margin.note.float.type.xml 01-Nov-2010 20:31 2.7K -[TXT] man.font.links.xml 01-Nov-2010 20:31 2.7K -[TXT] tex.math.in.alt.xml 01-Nov-2010 20:31 2.7K -[TXT] make.index.markup.xml 01-Nov-2010 20:31 2.8K -[TXT] insert.olink.page.number.xml 01-Nov-2010 20:31 2.8K -[TXT] textinsert.extension.xml 01-Nov-2010 20:31 2.8K -[TXT] qanda.defaultlabel.xml 01-Nov-2010 20:31 2.9K -[TXT] prefer.internal.olink.xml 01-Nov-2010 20:31 2.9K -[TXT] sidebar.float.type.xml 01-Nov-2010 20:31 2.9K -[TXT] footer.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] header.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] page.width.portrait.xml 01-Nov-2010 20:31 3.0K -[TXT] html.head.legalnotice.link.types.xml 01-Nov-2010 20:31 3.1K -[TXT] man.base.url.for.relative.links.xml 01-Nov-2010 20:31 3.1K -[TXT] page.height.portrait.xml 01-Nov-2010 20:31 3.1K -[TXT] olink.lang.fallback.sequence.xml 01-Nov-2010 20:31 3.1K -[TXT] use.role.as.xrefstyle.xml 01-Nov-2010 20:31 3.2K -[TXT] highlight.source.xml 01-Nov-2010 20:31 3.4K -[TXT] man.charmap.subset.profile.english.xml 01-Nov-2010 20:31 3.4K -[TXT] refentry.source.name.profile.xml 01-Nov-2010 20:31 3.4K -[TXT] docbook.css.source.xml 01-Nov-2010 20:31 3.5K -[TXT] man.charmap.use.subset.xml 01-Nov-2010 20:31 3.5K -[TXT] generate.toc.xml 01-Nov-2010 20:31 3.6K -[TXT] bibliography.collection.xml 01-Nov-2010 20:31 4.0K -[TXT] custom.css.source.xml 01-Nov-2010 20:31 4.2K -[TXT] paper.type.xml 01-Nov-2010 20:31 4.3K -[TXT] olink.doctitle.xml 01-Nov-2010 20:31 4.6K -[TXT] man.endnotes.are.numbered.xml 01-Nov-2010 20:31 4.8K -[TXT] man.endnotes.list.enabled.xml 01-Nov-2010 20:31 5.0K -[TXT] index.method.xml 01-Nov-2010 20:31 5.6K -[TXT] man.string.subst.map.xml 01-Nov-2010 20:31 6.7K -[TXT] glossary.collection.xml 01-Nov-2010 20:31 10K -[TXT] man.charmap.subset.profile.xml 01-Nov-2010 20:31 14K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=S;O=D deleted file mode 100644 index df35a811dcabe9f05b37b24aabf5e35bbbe02097..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.html?C=S;O=D +++ /dev/null @@ -1,677 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/params - - -

    Index of /release/xsl-ns/1.76.1/params

    -
    Icon  Name                                       Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] man.charmap.subset.profile.xml 01-Nov-2010 20:31 14K -[TXT] glossary.collection.xml 01-Nov-2010 20:31 10K -[TXT] man.string.subst.map.xml 01-Nov-2010 20:31 6.7K -[TXT] index.method.xml 01-Nov-2010 20:31 5.6K -[TXT] man.endnotes.list.enabled.xml 01-Nov-2010 20:31 5.0K -[TXT] man.endnotes.are.numbered.xml 01-Nov-2010 20:31 4.8K -[TXT] olink.doctitle.xml 01-Nov-2010 20:31 4.6K -[TXT] paper.type.xml 01-Nov-2010 20:31 4.3K -[TXT] custom.css.source.xml 01-Nov-2010 20:31 4.2K -[TXT] bibliography.collection.xml 01-Nov-2010 20:31 4.0K -[TXT] generate.toc.xml 01-Nov-2010 20:31 3.6K -[TXT] man.charmap.use.subset.xml 01-Nov-2010 20:31 3.5K -[TXT] docbook.css.source.xml 01-Nov-2010 20:31 3.5K -[TXT] refentry.source.name.profile.xml 01-Nov-2010 20:31 3.4K -[TXT] man.charmap.subset.profile.english.xml 01-Nov-2010 20:31 3.4K -[TXT] highlight.source.xml 01-Nov-2010 20:31 3.4K -[TXT] use.role.as.xrefstyle.xml 01-Nov-2010 20:31 3.2K -[TXT] olink.lang.fallback.sequence.xml 01-Nov-2010 20:31 3.1K -[TXT] page.height.portrait.xml 01-Nov-2010 20:31 3.1K -[TXT] man.base.url.for.relative.links.xml 01-Nov-2010 20:31 3.1K -[TXT] html.head.legalnotice.link.types.xml 01-Nov-2010 20:31 3.1K -[TXT] page.width.portrait.xml 01-Nov-2010 20:31 3.0K -[TXT] header.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] footer.column.widths.xml 01-Nov-2010 20:31 2.9K -[TXT] sidebar.float.type.xml 01-Nov-2010 20:31 2.9K -[TXT] prefer.internal.olink.xml 01-Nov-2010 20:31 2.9K -[TXT] qanda.defaultlabel.xml 01-Nov-2010 20:31 2.9K -[TXT] textinsert.extension.xml 01-Nov-2010 20:31 2.8K -[TXT] insert.olink.page.number.xml 01-Nov-2010 20:31 2.8K -[TXT] make.index.markup.xml 01-Nov-2010 20:31 2.8K -[TXT] tex.math.in.alt.xml 01-Nov-2010 20:31 2.7K -[TXT] man.font.links.xml 01-Nov-2010 20:31 2.7K -[TXT] margin.note.float.type.xml 01-Nov-2010 20:31 2.7K -[TXT] index.links.to.section.xml 01-Nov-2010 20:31 2.7K -[TXT] man.indent.refsect.xml 01-Nov-2010 20:31 2.6K -[TXT] generate.legalnotice.link.xml 01-Nov-2010 20:31 2.6K -[TXT] man.output.better.ps.enabled.xml 01-Nov-2010 20:31 2.6K -[TXT] man.th.title.max.length.xml 01-Nov-2010 20:31 2.6K -[TXT] refentry.title.properties.xml 01-Nov-2010 20:31 2.6K -[TXT] insert.olink.pdf.frag.xml 01-Nov-2010 20:31 2.5K -[TXT] writing.mode.xml 01-Nov-2010 20:31 2.4K -[TXT] refentry.manual.profile.xml 01-Nov-2010 20:31 2.4K -[TXT] man.charmap.enabled.xml 01-Nov-2010 20:31 2.4K -[TXT] reference.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] appendix.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] l10n.lang.value.rfc.compliant.xml 01-Nov-2010 20:31 2.4K -[TXT] preface.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] chapter.autolabel.xml 01-Nov-2010 20:31 2.4K -[TXT] part.autolabel.xml 01-Nov-2010 20:31 2.3K -[TXT] variablelist.as.blocks.xml 01-Nov-2010 20:31 2.3K -[TXT] man.hyphenate.xml 01-Nov-2010 20:31 2.3K -[TXT] section.container.element.xml 01-Nov-2010 20:31 2.3K -[TXT] insert.link.page.number.xml 01-Nov-2010 20:31 2.3K -[TXT] body.start.indent.xml 01-Nov-2010 20:31 2.2K -[TXT] profile.role.xml 01-Nov-2010 20:31 2.2K -[TXT] default.table.rules.xml 01-Nov-2010 20:31 2.2K -[TXT] man.justify.xml 01-Nov-2010 20:31 2.1K -[TXT] annotation.css.xml 01-Nov-2010 20:31 2.1K -[TXT] man.output.encoding.xml 01-Nov-2010 20:31 2.1K -[TXT] title.margin.left.xml 01-Nov-2010 20:31 2.1K -[TXT] hyphenate.verbatim.xml 01-Nov-2010 20:31 2.1K -[TXT] variablelist.as.table.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.id.attributes.xml 01-Nov-2010 20:31 2.0K -[TXT] make.clean.html.xml 01-Nov-2010 20:31 2.0K -[TXT] index.range.separator.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.source.name.profile.enabled.xml 01-Nov-2010 20:31 2.0K -[TXT] side.float.properties.xml 01-Nov-2010 20:31 2.0K -[TXT] refentry.manual.fallback.profile.xml 01-Nov-2010 20:31 2.0K -[TXT] generate.revhistory.link.xml 01-Nov-2010 20:31 1.9K -[TXT] man.authors.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] man.copyright.section.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.version.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] index.number.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] use.role.for.mediaobject.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.manual.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] margin.note.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] page.margin.inner.xml 01-Nov-2010 20:31 1.9K -[TXT] index.term.separator.xml 01-Nov-2010 20:31 1.9K -[TXT] man.hyphenate.computer.inlines.xml 01-Nov-2010 20:31 1.9K -[TXT] man.break.after.slash.xml 01-Nov-2010 20:31 1.9K -[TXT] refentry.date.profile.enabled.xml 01-Nov-2010 20:31 1.9K -[TXT] insert.xref.page.number.xml 01-Nov-2010 20:31 1.9K -[TXT] graphical.admonition.properties.xml 01-Nov-2010 20:31 1.9K -[TXT] component.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] nongraphical.admonition.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] l10n.gentext.use.xref.language.xml 01-Nov-2010 20:31 1.8K -[TXT] marker.section.level.xml 01-Nov-2010 20:31 1.8K -[TXT] man.output.lang.in.name.enabled.xml 01-Nov-2010 20:31 1.8K -[TXT] page.margin.outer.xml 01-Nov-2010 20:31 1.8K -[TXT] index.on.type.xml 01-Nov-2010 20:31 1.8K -[TXT] man.th.extra2.max.length.xml 01-Nov-2010 20:31 1.8K -[TXT] table.footnote.number.symbols.xml 01-Nov-2010 20:31 1.8K -[TXT] refentry.source.name.suppress.xml 01-Nov-2010 20:31 1.8K -[TXT] html.head.legalnotice.link.multiple.xml 01-Nov-2010 20:31 1.8K -[TXT] toc.line.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] index.div.title.properties.xml 01-Nov-2010 20:31 1.8K -[TXT] footnote.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] man.th.extra3.max.length.xml 01-Nov-2010 20:31 1.7K -[TXT] table.cell.border.style.xml 01-Nov-2010 20:31 1.7K -[TXT] refentry.version.suppress.xml 01-Nov-2010 20:31 1.7K -[TXT] abstract.title.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] pgwide.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] collect.xref.targets.xml 01-Nov-2010 20:31 1.7K -[TXT] show.revisionflag.xml 01-Nov-2010 20:31 1.7K -[TXT] current.docid.xml 01-Nov-2010 20:31 1.7K -[TXT] use.local.olink.style.xml 01-Nov-2010 20:31 1.7K -[TXT] footnote.number.symbols.xml 01-Nov-2010 20:31 1.7K -[TXT] symbol.font.family.xml 01-Nov-2010 20:31 1.7K -[TXT] man.hyphenate.filenames.xml 01-Nov-2010 20:31 1.7K -[TXT] verbatim.properties.xml 01-Nov-2010 20:31 1.7K -[TXT] nominal.image.width.xml 01-Nov-2010 20:31 1.7K -[TXT] variablelist.max.termlength.xml 01-Nov-2010 20:31 1.6K -[TXT] man.th.extra2.suppress.xml 01-Nov-2010 20:31 1.6K -[TXT] sidebar.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] man.hyphenate.urls.xml 01-Nov-2010 20:31 1.6K -[TXT] man.charmap.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] index.on.role.xml 01-Nov-2010 20:31 1.6K -[TXT] target.database.document.xml 01-Nov-2010 20:31 1.6K -[TXT] exsl.node.set.available.xml 01-Nov-2010 20:31 1.6K -[TXT] root.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] table.frame.border.style.xml 01-Nov-2010 20:31 1.6K -[TXT] refentry.version.profile.xml 01-Nov-2010 20:31 1.6K -[TXT] component.label.includes.part.label.xml 01-Nov-2010 20:31 1.6K -[TXT] saxon.character.representation.xml 01-Nov-2010 20:31 1.6K -[TXT] variablelist.term.separator.xml 01-Nov-2010 20:31 1.6K -[TXT] preferred.mediaobject.role.xml 01-Nov-2010 20:31 1.6K -[TXT] section.title.properties.xml 01-Nov-2010 20:31 1.6K -[TXT] olink.base.uri.xml 01-Nov-2010 20:31 1.6K -[TXT] man.indent.width.xml 01-Nov-2010 20:31 1.6K -[TXT] man.output.subdirs.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] process.empty.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] table.footnote.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] alignment.xml 01-Nov-2010 20:31 1.5K -[TXT] process.source.toc.xml 01-Nov-2010 20:31 1.5K -[TXT] glossterm.block.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] monospace.verbatim.font.width.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.xml 01-Nov-2010 20:31 1.5K -[TXT] table.cell.border.color.xml 01-Nov-2010 20:31 1.5K -[TXT] tex.math.delims.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level5.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level4.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level3.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level2.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level1.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] man.output.base.dir.xml 01-Nov-2010 20:31 1.5K -[TXT] docbook.css.link.xml 01-Nov-2010 20:31 1.5K -[TXT] section.level6.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] chunker.output.media-type.xml 01-Nov-2010 20:31 1.5K -[TXT] menuchoice.menu.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] xep.index.item.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.object.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] img.src.path.xml 01-Nov-2010 20:31 1.5K -[TXT] formal.title.properties.xml 01-Nov-2010 20:31 1.5K -[TXT] man.subheading.divider.enabled.xml 01-Nov-2010 20:31 1.5K -[TXT] shade.verbatim.style.xml 01-Nov-2010 20:31 1.5K -[TXT] profile.value.xml 01-Nov-2010 20:31 1.5K -[TXT] generate.css.header.xml 01-Nov-2010 20:31 1.5K -[TXT] xref.label-page.separator.xml 01-Nov-2010 20:31 1.5K -[TXT] default.units.xml 01-Nov-2010 20:31 1.4K -[TXT] man.endnotes.list.heading.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.mark.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] table.footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.sep.leader.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] variablelist.term.break.after.xml 01-Nov-2010 20:31 1.4K -[TXT] refentry.date.profile.xml 01-Nov-2010 20:31 1.4K -[TXT] callout.graphics.extension.xml 01-Nov-2010 20:31 1.4K -[TXT] label.from.part.xml 01-Nov-2010 20:31 1.4K -[TXT] qanda.title.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] tex.math.file.xml 01-Nov-2010 20:31 1.4K -[TXT] informal.object.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] toc.margin.properties.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.title-page.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] list.block.spacing.xml 01-Nov-2010 20:31 1.4K -[TXT] draft.mode.xml 01-Nov-2010 20:31 1.4K -[TXT] generate.section.toc.level.xml 01-Nov-2010 20:31 1.4K -[TXT] footnote.number.format.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.revisionflag.xml 01-Nov-2010 20:31 1.4K -[TXT] pages.template.xml 01-Nov-2010 20:31 1.4K -[TXT] ebnf.assignment.xml 01-Nov-2010 20:31 1.4K -[TXT] glossentry.show.acronym.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.conformance.xml 01-Nov-2010 20:31 1.4K -[TXT] xref.label-title.separator.xml 01-Nov-2010 20:31 1.4K -[TXT] profile.userlevel.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.condition.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.subtitle.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] glossary.as.blocks.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.revision.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.wordsize.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.security.xml 01-Nov-2010 20:31 1.3K -[TXT] foil.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.audience.xml 01-Nov-2010 20:31 1.3K -[TXT] htmlhelp.default.topic.xml 01-Nov-2010 20:31 1.3K -[TXT] wordml.template.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.meta.get.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] monospace.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.vendor.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.status.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.post.xml 01-Nov-2010 20:31 1.3K -[TXT] glossentry.list.item.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] man.string.subst.map.local.pre.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.graphics.number.limit.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.arch.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.lang.xml 01-Nov-2010 20:31 1.3K -[TXT] make.graphic.viewport.xml 01-Nov-2010 20:31 1.3K -[TXT] html.stylesheet.xml 01-Nov-2010 20:31 1.3K -[TXT] blockquote.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] profile.os.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.hyphenate.chars.xml 01-Nov-2010 20:31 1.3K -[TXT] make.valid.html.xml 01-Nov-2010 20:31 1.3K -[TXT] bibliography.style.xml 01-Nov-2010 20:31 1.3K -[TXT] equation.number.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] ulink.show.xml 01-Nov-2010 20:31 1.3K -[TXT] rebuild-all.xml 01-Nov-2010 20:31 1.3K -[TXT] article.appendix.title.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] refentry.pagebreak.xml 01-Nov-2010 20:31 1.3K -[TXT] table.table.properties.xml 01-Nov-2010 20:31 1.3K -[TXT] chunker.output.method.xml 01-Nov-2010 20:31 1.3K -[TXT] glossterm.auto.link.xml 01-Nov-2010 20:31 1.3K -[TXT] targets.filename.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.lists.xml 01-Nov-2010 20:31 1.3K -[TXT] keep.relative.image.uris.xml 01-Nov-2010 20:31 1.3K -[TXT] man.indent.verbatims.xml 01-Nov-2010 20:31 1.3K -[TXT] man.output.quietly.xml 01-Nov-2010 20:31 1.3K -[TXT] html.longdesc.link.xml 01-Nov-2010 20:31 1.3K -[TXT] man.th.extra3.suppress.xml 01-Nov-2010 20:31 1.3K -[TXT] callout.unicode.start.character.xml 01-Nov-2010 20:31 1.3K -[TXT] ade.extensions.xml 01-Nov-2010 20:31 1.3K -[TXT] table.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-public.xml 01-Nov-2010 20:31 1.2K -[TXT] glossdef.block.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.doctype-system.xml 01-Nov-2010 20:31 1.2K -[TXT] passivetex.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] dingbat.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.cdata-section-elements.xml 01-Nov-2010 20:31 1.2K -[TXT] rootid.xml 01-Nov-2010 20:31 1.2K -[TXT] admonition.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] html.cleanup.xml 01-Nov-2010 20:31 1.2K -[TXT] compact.list.item.spacing.xml 01-Nov-2010 20:31 1.2K -[TXT] ulink.footnotes.xml 01-Nov-2010 20:31 1.2K -[TXT] formal.title.placement.xml 01-Nov-2010 20:31 1.2K -[TXT] man.indent.blurbs.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.graphic.close.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.standalone.xml 01-Nov-2010 20:31 1.2K -[TXT] informaltable.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] table.cell.border.thickness.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.indent.width.xml 01-Nov-2010 20:31 1.2K -[TXT] fop.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] running.foot.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] footer.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.in.separate.dir.xml 01-Nov-2010 20:31 1.2K -[TXT] header.table.height.xml 01-Nov-2010 20:31 1.2K -[TXT] chunker.output.omit-xml-declaration.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.unicode.number.limit.xml 01-Nov-2010 20:31 1.2K -[TXT] body.end.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] component.titlepage.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.title.xml 01-Nov-2010 20:31 1.2K -[TXT] l10n.gentext.language.xml 01-Nov-2010 20:31 1.2K -[TXT] speakernote.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] index.preferred.page.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] annotation.js.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.hide.show.xml 01-Nov-2010 20:31 1.2K -[TXT] refentry.generate.name.xml 01-Nov-2010 20:31 1.2K -[TXT] use.embed.for.svg.xml 01-Nov-2010 20:31 1.2K -[TXT] man.funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] callout.list.table.xml 01-Nov-2010 20:31 1.2K -[TXT] toc.row.height.xml 01-Nov-2010 20:31 1.2K -[TXT] textdata.default.encoding.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] man.th.extra1.suppress.xml 01-Nov-2010 20:31 1.2K -[TXT] othercredit.like.author.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] runinhead.title.end.punct.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.title.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] qanda.in.toc.xml 01-Nov-2010 20:31 1.2K -[TXT] use.id.function.xml 01-Nov-2010 20:31 1.2K -[TXT] funcsynopsis.style.xml 01-Nov-2010 20:31 1.2K -[TXT] title.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] profile.attribute.xml 01-Nov-2010 20:31 1.2K -[TXT] itemizedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] output.indent.xml 01-Nov-2010 20:31 1.2K -[TXT] blurb.on.titlepage.enabled.xml 01-Nov-2010 20:31 1.2K -[TXT] index.entry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] margin.note.width.xml 01-Nov-2010 20:31 1.2K -[TXT] page.height.xml 01-Nov-2010 20:31 1.2K -[TXT] body.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] orderedlist.label.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] biblioentry.properties.xml 01-Nov-2010 20:31 1.2K -[TXT] man.output.manifest.filename.xml 01-Nov-2010 20:31 1.2K -[TXT] slide.font.family.xml 01-Nov-2010 20:31 1.2K -[TXT] fop1.extensions.xml 01-Nov-2010 20:31 1.2K -[TXT] sidebar.float.width.xml 01-Nov-2010 20:31 1.2K -[TXT] page.width.xml 01-Nov-2010 20:31 1.2K -[TXT] monospace.verbatim.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.debug.xml 01-Nov-2010 20:31 1.1K -[TXT] hyphenate.verbatim.characters.xml 01-Nov-2010 20:31 1.1K -[TXT] sidebar.title.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] ebnf.statement.terminator.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.append.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.tocs.and.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] chunk.separate.lots.xml 01-Nov-2010 20:31 1.1K -[TXT] default.float.class.xml 01-Nov-2010 20:31 1.1K -[TXT] chunker.output.indent.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level6.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] multiframe.xml 01-Nov-2010 20:31 1.1K -[TXT] html.append.xml 01-Nov-2010 20:31 1.1K -[TXT] section.autolabel.max.depth.xml 01-Nov-2010 20:31 1.1K -[TXT] toc.list.type.xml 01-Nov-2010 20:31 1.1K -[TXT] itemizedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] make.year.ranges.xml 01-Nov-2010 20:31 1.1K -[TXT] autotoc.label.in.hyperlink.xml 01-Nov-2010 20:31 1.1K -[TXT] olink.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.label.width.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.showtitles.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.hhc.folders.instead.books.xml 01-Nov-2010 20:31 1.1K -[TXT] list.block.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] css.stylesheet.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] header.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] footer.content.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] menuchoice.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] table.cell.padding.xml 01-Nov-2010 20:31 1.1K -[TXT] highlight.xslthl.config.xml 01-Nov-2010 20:31 1.1K -[TXT] normal.para.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] xref.with.number.and.title.xml 01-Nov-2010 20:31 1.1K -[TXT] glossdef.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] default.image.width.xml 01-Nov-2010 20:31 1.1K -[TXT] css.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] html.extra.head.links.xml 01-Nov-2010 20:31 1.1K -[TXT] dry-run.xml 01-Nov-2010 20:31 1.1K -[TXT] autolayout-file.xml 01-Nov-2010 20:31 1.1K -[TXT] abstract.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.list.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] callout.graphics.path.xml 01-Nov-2010 20:31 1.1K -[TXT] graphic.default.extension.xml 01-Nov-2010 20:31 1.1K -[TXT] list.item.spacing.xml 01-Nov-2010 20:31 1.1K -[TXT] axf.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] saxon.linenumbering.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.force.map.and.alias.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] man.output.manifest.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.encoding.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] l10n.gentext.default.language.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] email.delimiters.enabled.xml 01-Nov-2010 20:31 1.1K -[TXT] annotation.graphic.open.xml 01-Nov-2010 20:31 1.1K -[TXT] foil.title.size.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level1.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] page.orientation.xml 01-Nov-2010 20:31 1.1K -[TXT] table.spacer.image.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level2.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level3.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] orderedlist.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] section.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level4.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] linenumbering.separator.xml 01-Nov-2010 20:31 1.1K -[TXT] graphicsize.use.img.src.path.xml 01-Nov-2010 20:31 1.1K -[TXT] inherit.keywords.xml 01-Nov-2010 20:31 1.1K -[TXT] body.attributes.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcsynopsisinfo.xml 01-Nov-2010 20:31 1.1K -[TXT] default.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] man.table.footnotes.divider.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.title.level5.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] graphics.dir.xml 01-Nov-2010 20:31 1.1K -[TXT] navig.graphics.xml 01-Nov-2010 20:31 1.1K -[TXT] nominal.table.width.xml 01-Nov-2010 20:31 1.1K -[TXT] bookmarks.collapse.xml 01-Nov-2010 20:31 1.1K -[TXT] body.font.size.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.style.xml 01-Nov-2010 20:31 1.1K -[TXT] qanda.inherit.numeration.xml 01-Nov-2010 20:31 1.1K -[TXT] overlay.xml 01-Nov-2010 20:31 1.1K -[TXT] variablelist.term.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] runinhead.default.title.end.punct.xml 01-Nov-2010 20:31 1.1K -[TXT] htmlhelp.use.hhk.xml 01-Nov-2010 20:31 1.1K -[TXT] funcsynopsis.decoration.xml 01-Nov-2010 20:31 1.1K -[TXT] foilgroup.properties.xml 01-Nov-2010 20:31 1.1K -[TXT] filename-prefix.xml 01-Nov-2010 20:31 1.1K -[TXT] author.othername.in.middle.xml 01-Nov-2010 20:31 1.1K -[TXT] emphasis.propagates.style.xml 01-Nov-2010 20:31 1.1K -[TXT] show.comments.xml 01-Nov-2010 20:31 1.1K -[TXT] glossterm.separation.xml 01-Nov-2010 20:31 1.1K -[TXT] xep.extensions.xml 01-Nov-2010 20:31 1.1K -[TXT] man.font.funcprototype.xml 01-Nov-2010 20:31 1.1K -[TXT] admon.textlabel.xml 01-Nov-2010 20:31 1.0K -[TXT] header.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] footer.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] shade.verbatim.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] phrase.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.headings.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.in.base.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] output-root.xml 01-Nov-2010 20:31 1.0K -[TXT] slides.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] refentry.xref.manvolnum.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.xml 01-Nov-2010 20:31 1.0K -[TXT] glossary.sort.xml 01-Nov-2010 20:31 1.0K -[TXT] index.page.number.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] hyphenate.xml 01-Nov-2010 20:31 1.0K -[TXT] entry.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] callouts.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] pixels.per.inch.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.defaultcolumn.xml 01-Nov-2010 20:31 1.0K -[TXT] script.dir.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.only.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.first.sections.xml 01-Nov-2010 20:31 1.0K -[TXT] section.label.includes.component.label.xml 01-Nov-2010 20:31 1.0K -[TXT] use.svg.xml 01-Nov-2010 20:31 1.0K -[TXT] man.font.table.title.xml 01-Nov-2010 20:31 1.0K -[TXT] admon.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] nav.table.summary.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.meta.abstract.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.window.geometry.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.show.root.xml 01-Nov-2010 20:31 1.0K -[TXT] citerefentry.link.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.link.text.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.cell.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] body.font.master.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.pointer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enumerate.images.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] html.base.xml 01-Nov-2010 20:31 1.0K -[TXT] generate.manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.with.ids.xml 01-Nov-2010 20:31 1.0K -[TXT] itemizedlist.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.graphic.xml 01-Nov-2010 20:31 1.0K -[TXT] arbortext.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] index.prefer.titleabbrev.xml 01-Nov-2010 20:31 1.0K -[TXT] tablecolumns.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] foil.title.master.xml 01-Nov-2010 20:31 1.0K -[TXT] procedure.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] para.propagates.style.xml 01-Nov-2010 20:31 1.0K -[TXT] firstterm.only.link.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhc.binary.xml 01-Nov-2010 20:31 1.0K -[TXT] ebnf.table.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.image.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] javahelp.encoding.xml 01-Nov-2010 20:31 1.0K -[TXT] html.longdesc.xml 01-Nov-2010 20:31 1.0K -[TXT] table.frame.border.color.xml 01-Nov-2010 20:31 1.0K -[TXT] double.sided.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.bottom.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] email.mailto.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.image.xml 01-Nov-2010 20:31 1.0K -[TXT] spacing.paras.xml 01-Nov-2010 20:31 1.0K -[TXT] make.single.year.ranges.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.path.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.blank.text.xml 01-Nov-2010 20:31 1.0K -[TXT] xbCollapsibleLists.js.xml 01-Nov-2010 20:31 1.0K -[TXT] saxon.tablecolumns.xml 01-Nov-2010 20:31 1.0K -[TXT] feedback.href.xml 01-Nov-2010 20:31 1.0K -[TXT] toc.spacer.text.xml 01-Nov-2010 20:31 1.0K -[TXT] bridgehead.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.navigation.height.xml 01-Nov-2010 20:31 1.0K -[TXT] man.segtitle.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] css.stylesheet.xml 01-Nov-2010 20:31 1.0K -[TXT] editedby.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] points.per.em.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.graphics.xml 01-Nov-2010 20:31 1.0K -[TXT] use.id.as.filename.xml 01-Nov-2010 20:31 1.0K -[TXT] multiframe.top.bgcolor.xml 01-Nov-2010 20:31 1.0K -[TXT] superscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] manifest.xml 01-Nov-2010 20:31 1.0K -[TXT] revhistory.table.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.tocs.and.lots.has.title.xml 01-Nov-2010 20:31 1.0K -[TXT] abstract.notitle.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] qanda.nested.in.toc.xml 01-Nov-2010 20:31 1.0K -[TXT] contrib.inline.enabled.xml 01-Nov-2010 20:31 1.0K -[TXT] navig.graphics.extension.xml 01-Nov-2010 20:31 1.0K -[TXT] informalequation.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.show.advanced.search.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellspacing.xml 01-Nov-2010 20:31 1.0K -[TXT] html.cellpadding.xml 01-Nov-2010 20:31 1.0K -[TXT] use.extensions.xml 01-Nov-2010 20:31 1.0K -[TXT] linenumbering.everyNth.xml 01-Nov-2010 20:31 1.0K -[TXT] chunk.quietly.xml 01-Nov-2010 20:31 1.0K -[TXT] callout.unicode.font.xml 01-Nov-2010 20:31 1.0K -[TXT] annotation.support.xml 01-Nov-2010 20:31 1.0K -[TXT] refclass.suppress.xml 01-Nov-2010 20:31 1.0K -[TXT] link.mailto.url.xml 01-Nov-2010 20:31 1.0K -[TXT] id.warnings.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.hhp.windows.xml 01-Nov-2010 20:31 1.0K -[TXT] informalexample.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.remember.window.position.xml 01-Nov-2010 20:31 1.0K -[TXT] ulink.target.xml 01-Nov-2010 20:31 1.0K -[TXT] subscript.properties.xml 01-Nov-2010 20:31 1.0K -[TXT] monospace.font.family.xml 01-Nov-2010 20:31 1.0K -[TXT] htmlhelp.enhanced.decompilation.xml 01-Nov-2010 20:31 1.0K -[TXT] column.gap.titlepage.xml 01-Nov-2010 20:31 1.0K -[TXT] dynamic.toc.xml 01-Nov-2010 20:31 972 -[TXT] informalfigure.properties.xml 01-Nov-2010 20:31 969 -[TXT] revhistory.title.properties.xml 01-Nov-2010 20:31 966 -[TXT] minus.image.xml 01-Nov-2010 20:31 965 -[TXT] admonition.properties.xml 01-Nov-2010 20:31 964 -[TXT] table.frame.border.thickness.xml 01-Nov-2010 20:31 963 -[TXT] showtoc.image.xml 01-Nov-2010 20:31 963 -[TXT] root.filename.xml 01-Nov-2010 20:31 963 -[TXT] ignore.image.scaling.xml 01-Nov-2010 20:31 963 -[TXT] htmlhelp.show.toolbar.text.xml 01-Nov-2010 20:31 963 -[TXT] hidetoc.image.xml 01-Nov-2010 20:31 963 -[TXT] body.margin.bottom.xml 01-Nov-2010 20:31 963 -[TXT] column.gap.lot.xml 01-Nov-2010 20:31 961 -[TXT] chunk.sections.xml 01-Nov-2010 20:31 960 -[TXT] plus.image.xml 01-Nov-2010 20:31 959 -[TXT] olink.outline.ext.xml 01-Nov-2010 20:31 958 -[TXT] active.toc.xml 01-Nov-2010 20:31 958 -[TXT] htmlhelp.show.favorities.xml 01-Nov-2010 20:31 957 -[TXT] keyboard.nav.xml 01-Nov-2010 20:31 956 -[TXT] highlight.default.language.xml 01-Nov-2010 20:31 956 -[TXT] column.gap.front.xml 01-Nov-2010 20:31 956 -[TXT] body.margin.top.xml 01-Nov-2010 20:31 956 -[TXT] admon.graphics.xml 01-Nov-2010 20:31 956 -[TXT] linenumbering.width.xml 01-Nov-2010 20:31 955 -[TXT] htmlhelp.hhp.tail.xml 01-Nov-2010 20:31 954 -[TXT] overlay.logo.xml 01-Nov-2010 20:31 953 -[TXT] footnote.font.size.xml 01-Nov-2010 20:31 953 -[TXT] nav.separator.xml 01-Nov-2010 20:31 952 -[TXT] eclipse.autolabel.xml 01-Nov-2010 20:31 952 -[TXT] annotate.toc.xml 01-Nov-2010 20:31 952 -[TXT] page.margin.bottom.xml 01-Nov-2010 20:31 951 -[TXT] htmlhelp.hhc.section.depth.xml 01-Nov-2010 20:31 949 -[TXT] html.ext.xml 01-Nov-2010 20:31 947 -[TXT] saxon.callouts.xml 01-Nov-2010 20:31 946 -[TXT] crop.mark.bleed.xml 01-Nov-2010 20:31 946 -[TXT] html.stylesheet.type.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.index.xml 01-Nov-2010 20:31 944 -[TXT] column.gap.back.xml 01-Nov-2010 20:31 944 -[TXT] autotoc.label.separator.xml 01-Nov-2010 20:31 944 -[TXT] refentry.separator.xml 01-Nov-2010 20:31 942 -[TXT] punct.honorific.xml 01-Nov-2010 20:31 942 -[TXT] profile.separator.xml 01-Nov-2010 20:31 942 -[TXT] htmlhelp.autolabel.xml 01-Nov-2010 20:31 941 -[TXT] column.gap.body.xml 01-Nov-2010 20:31 941 -[TXT] admon.graphics.extension.xml 01-Nov-2010 20:31 940 -[TXT] toc.section.depth.xml 01-Nov-2010 20:31 939 -[TXT] htmlhelp.button.hideshow.xml 01-Nov-2010 20:31 939 -[TXT] sans.font.family.xml 01-Nov-2010 20:31 938 -[TXT] htmlhelp.map.file.xml 01-Nov-2010 20:31 938 -[TXT] navtocwidth.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.title.xml 01-Nov-2010 20:31 937 -[TXT] htmlhelp.button.options.xml 01-Nov-2010 20:31 937 -[TXT] base.dir.xml 01-Nov-2010 20:31 936 -[TXT] xbLibrary.js.xml 01-Nov-2010 20:31 935 -[TXT] glossterm.width.xml 01-Nov-2010 20:31 935 -[TXT] htmlhelp.button.jump2.url.xml 01-Nov-2010 20:31 934 -[TXT] region.before.extent.xml 01-Nov-2010 20:31 933 -[TXT] column.count.lot.xml 01-Nov-2010 20:31 933 -[TXT] xref.properties.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.hhc.width.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.button.jump1.xml 01-Nov-2010 20:31 931 -[TXT] htmlhelp.button.locate.xml 01-Nov-2010 20:31 930 -[TXT] htmlhelp.button.forward.xml 01-Nov-2010 20:31 930 -[TXT] table.borders.with.css.xml 01-Nov-2010 20:31 928 -[TXT] region.after.extent.xml 01-Nov-2010 20:31 928 -[TXT] draft.watermark.image.xml 01-Nov-2010 20:31 928 -[TXT] segmentedlist.as.table.xml 01-Nov-2010 20:31 927 -[TXT] show.foil.number.xml 01-Nov-2010 20:31 926 -[TXT] navbgcolor.xml 01-Nov-2010 20:31 926 -[TXT] htmlhelp.button.refresh.xml 01-Nov-2010 20:31 926 -[TXT] crop.marks.xml 01-Nov-2010 20:31 926 -[TXT] page.margin.top.xml 01-Nov-2010 20:31 924 -[TXT] equation.properties.xml 01-Nov-2010 20:31 924 -[TXT] htmlhelp.button.jump1.url.xml 01-Nov-2010 20:31 923 -[TXT] epub.autolabel.xml 01-Nov-2010 20:31 923 -[TXT] eclipse.plugin.id.xml 01-Nov-2010 20:31 923 -[TXT] ebnf.table.border.xml 01-Nov-2010 20:31 923 -[TXT] callout.icon.size.xml 01-Nov-2010 20:31 923 -[TXT] suppress.header.navigation.xml 01-Nov-2010 20:31 922 -[TXT] suppress.footer.navigation.xml 01-Nov-2010 20:31 922 -[TXT] htmlhelp.hhp.window.xml 01-Nov-2010 20:31 922 -[TXT] function.parens.xml 01-Nov-2010 20:31 922 -[TXT] textbgcolor.xml 01-Nov-2010 20:31 921 -[TXT] simplesect.in.toc.xml 01-Nov-2010 20:31 921 -[TXT] biblioentry.item.separator.xml 01-Nov-2010 20:31 921 -[TXT] xbStyle.js.xml 01-Nov-2010 20:31 919 -[TXT] overlay.js.xml 01-Nov-2010 20:31 919 -[TXT] manual.toc.xml 01-Nov-2010 20:31 917 -[TXT] example.properties.xml 01-Nov-2010 20:31 917 -[TXT] suppress.homepage.title.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.stop.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.print.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.home.url.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.alias.file.xml 01-Nov-2010 20:31 916 -[TXT] crop.mark.offset.xml 01-Nov-2010 20:31 916 -[TXT] htmlhelp.button.jump2.xml 01-Nov-2010 20:31 915 -[TXT] htmlhelp.display.progress.xml 01-Nov-2010 20:31 914 -[TXT] htmlhelp.button.back.xml 01-Nov-2010 20:31 914 -[TXT] eclipse.plugin.provider.xml 01-Nov-2010 20:31 914 -[TXT] default.table.frame.xml 01-Nov-2010 20:31 914 -[TXT] column.count.front.xml 01-Nov-2010 20:31 914 -[TXT] figure.properties.xml 01-Nov-2010 20:31 912 -[TXT] navbodywidth.xml 01-Nov-2010 20:31 911 -[TXT] bibliography.numbered.xml 01-Nov-2010 20:31 911 -[TXT] suppress.navigation.xml 01-Nov-2010 20:31 910 -[TXT] htmlhelp.show.menu.xml 01-Nov-2010 20:31 910 -[TXT] crop.mark.width.xml 01-Nov-2010 20:31 910 -[TXT] slides.js.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.zoom.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.prev.xml 01-Nov-2010 20:31 909 -[TXT] htmlhelp.button.next.xml 01-Nov-2010 20:31 908 -[TXT] htmlhelp.button.home.xml 01-Nov-2010 20:31 908 -[TXT] column.count.back.xml 01-Nov-2010 20:31 906 -[TXT] olink.fragid.xml 01-Nov-2010 20:31 905 -[TXT] headers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] footers.on.blank.pages.xml 01-Nov-2010 20:31 905 -[TXT] xbDOM.js.xml 01-Nov-2010 20:31 903 -[TXT] chunk.section.depth.xml 01-Nov-2010 20:31 903 -[TXT] currentpage.marker.xml 01-Nov-2010 20:31 902 -[TXT] no.next.image.xml 01-Nov-2010 20:31 901 -[TXT] no.prev.image.xml 01-Nov-2010 20:31 900 -[TXT] htmlhelp.button.jump2.title.xml 01-Nov-2010 20:31 899 -[TXT] htmlhelp.button.jump1.title.xml 01-Nov-2010 20:31 899 -[TXT] qandadiv.autolabel.xml 01-Nov-2010 20:31 896 -[TXT] nominal.image.depth.xml 01-Nov-2010 20:31 896 -[TXT] htmlhelp.hhp.xml 01-Nov-2010 20:31 896 -[TXT] formal.procedures.xml 01-Nov-2010 20:31 895 -[TXT] column.count.titlepage.xml 01-Nov-2010 20:31 893 -[TXT] body.bg.color.xml 01-Nov-2010 20:31 891 -[TXT] titlefoil.html.xml 01-Nov-2010 20:31 889 -[TXT] foilgroup.toc.xml 01-Nov-2010 20:31 889 -[TXT] no.up.image.xml 01-Nov-2010 20:31 888 -[TXT] htmlhelp.hhk.xml 01-Nov-2010 20:31 886 -[TXT] eclipse.plugin.name.xml 01-Nov-2010 20:31 886 -[TXT] glosslist.as.blocks.xml 01-Nov-2010 20:31 884 -[TXT] section.autolabel.xml 01-Nov-2010 20:31 883 -[TXT] no.home.image.xml 01-Nov-2010 20:31 883 -[TXT] footer.hr.xml 01-Nov-2010 20:31 881 -[TXT] header.hr.xml 01-Nov-2010 20:31 880 -[TXT] bullet.image.xml 01-Nov-2010 20:31 880 -[TXT] ua.js.xml 01-Nov-2010 20:31 879 -[TXT] htmlhelp.hhc.xml 01-Nov-2010 20:31 878 -[TXT] toc.max.depth.xml 01-Nov-2010 20:31 877 -[TXT] no.toc.image.xml 01-Nov-2010 20:31 875 -[TXT] column.count.index.xml 01-Nov-2010 20:31 873 -[TXT] banner.before.navigation.xml 01-Nov-2010 20:31 869 -[TXT] next.image.xml 01-Nov-2010 20:31 867 -[TXT] toc.bg.color.xml 01-Nov-2010 20:31 865 -[TXT] column.count.body.xml 01-Nov-2010 20:31 865 -[TXT] prev.image.xml 01-Nov-2010 20:31 864 -[TXT] toc.width.xml 01-Nov-2010 20:31 861 -[TXT] olink.resolver.xml 01-Nov-2010 20:31 859 -[TXT] htmlhelp.chm.xml 01-Nov-2010 20:31 857 -[TXT] toc.html.xml 01-Nov-2010 20:31 856 -[TXT] up.image.xml 01-Nov-2010 20:31 852 -[TXT] home.image.xml 01-Nov-2010 20:31 848 -[TXT] header.rule.xml 01-Nov-2010 20:31 848 -[TXT] generate.index.xml 01-Nov-2010 20:31 847 -[TXT] footer.rule.xml 01-Nov-2010 20:31 847 -[TXT] olink.sysid.xml 01-Nov-2010 20:31 843 -[TXT] toc.image.xml 01-Nov-2010 20:31 840 -[TXT] line-height.xml 01-Nov-2010 20:31 839 -[TXT] olink.pubid.xml 01-Nov-2010 20:31 838 -[TXT] sequential.links.xml 01-Nov-2010 20:31 824 -[TXT] table.entry.padding.xml 01-Nov-2010 20:31 808 -[TXT] text.prev.xml 01-Nov-2010 20:31 777 -[TXT] text.next.xml 01-Nov-2010 20:31 777 -[TXT] text.home.xml 01-Nov-2010 20:31 775 -[TXT] text.toc.xml 01-Nov-2010 20:31 771 -[TXT] text.up.xml 01-Nov-2010 20:31 766 -[TXT] template.xml 01-Nov-2010 20:31 730 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.links.to.section.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.links.to.section.xml deleted file mode 100644 index 47c0da5bb9f5d1524d88a20e9de441246d4238ed..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.links.to.section.xml +++ /dev/null @@ -1,76 +0,0 @@ - - -index.links.to.section -boolean - - -index.links.to.section -HTML index entries link to container section title - - - - - - - - -Description - -If zero, then an index entry in an index links -directly to the location of the -generated anchor that is output -for the indexterm. If two identical indexterm elements -exist in the same section, then both entries appear -in the index with the same title but link to different -locations. - -If non-zero, then an index entry in an index links to the -section title containing the indexterm, rather than -directly to the anchor output for the indexterm. -Duplicate indexterm entries in the same section are dropped. - - -The default value is 1, so index entries link to -section titles by default. - -In both cases, the link text in an index entry is the -title of the section containing the indexterm. -That is because HTML does not have numbered pages. -It also provides the reader with context information -for each link. - -This parameter lets you choose which style of -index linking you want. - - - -When set to 0, an index entry takes you -to the precise location of its corresponding indexterm. -However, if you have a lot of duplicate -entries in sections, then you have a lot of duplicate -titles in the index, which makes it more cluttered. -The reader may not recognize why duplicate titles -appear until they follow the links. Also, the links -may land the reader in the middle of a section where the -section title is not visible, which may also be -confusing to the reader. - - -When set to 1, an index entry link is -less precise, but duplicate titles in the -index entries are eliminated. -Landing on the section title location may confirm the reader's -expectation that a link that -shows a section title will take them to that section title, -not a location within the section. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.method.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.method.xml deleted file mode 100644 index 21279565d8692cfdb1fdef31d62a3984c2ff0f04..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.method.xml +++ /dev/null @@ -1,162 +0,0 @@ - - -index.method -list -basic -kosek -kimber - - -index.method -Select method used to group index entries in an index - - - - -basic - - - -Description - -This parameter lets you select which method to use for sorting and grouping - index entries in an index. -Indexes in Latin-based languages that have accented characters typically -sort together accented words and unaccented words. -Thus à (U+00C1 LATIN CAPITAL LETTER A WITH ACUTE) would sort together -with A (U+0041 LATIN CAPITAL LETTER A), so both would appear in the A -section of the index. -Languages using other alphabets (such as Russian, which is written in the Cyrillic alphabet) -and languages using ideographic chararacters (such as Japanese) -require grouping specific to the languages and alphabets. - - -The default indexing method is limited. -It can group accented characters in Latin-based languages only. -It cannot handle non-Latin alphabets or ideographic languages. -The other indexing methods require extensions of one type or -another, and do not work with -all XSLT processors, which is why they are not used by default. - -The three choices for indexing method are: - - -basic - - -(default) Sort and groups words based only on the Latin alphabet. -Words with accented Latin letters will group and sort with -their respective primary letter, but -words in non-Latin alphabets will be -put in the Symbols section of the index. - - - - -kosek - - -This method sorts and groups words based on letter groups configured in -the DocBook locale file for the given language. -See, for example, the French locale file common/fr.xml. -This method requires that the XSLT processor -supports the EXSLT extensions (most do). -It also requires support for using -user-defined functions in xsl:key (xsltproc does not). - -This method is suitable for any language for which you can -list all the individual characters that should appear -in each letter group in an index. -It is probably not practical to use it for ideographic languages -such as Chinese that have hundreds or thousands of characters. - - -To use the kosek method, you must: - - - -Use a processor that supports its extensions, such as -Saxon 6 or Xalan (xsltproc and Saxon 8 do not). - - - -Set the index.method parameter's value to kosek. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kosek.xsl or -html/autoidx-kosek.xsl into your -customization. - - - - - - - -kimber - - -This method uses extensions to the Saxon processor to implement -sophisticated indexing processes. It uses its own -configuration file, which can include information for any number of -languages. Each language's configuration can group -words using one of two processes. In the -enumerated process similar to that used in the kosek method, -you indicate the groupings character-by-character. -In the between-key process, you specify the -break-points in the sort order that should start a new group. -The latter configuration is useful for ideographic languages -such as Chinese, Japanese, and Korean. -You can also define your own collation algorithms and how you -want mixed Latin-alphabet words sorted. - - -For a whitepaper describing the extensions, see: -http://www.innodata-isogen.com/knowledge_center/white_papers/back_of_book_for_xsl_fo.pdf. - - - -To download the extension library, see -http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport. - - - - -To use the kimber method, you must: - - - -Use Saxon (version 6 or 8) as your XSLT processor. - - - -Install and configure the Innodata Isogen library, using -the documentation that comes with it. - - - -Set the index.method parameter's value to kimber. - - - -Import the appropriate index extensions stylesheet module -fo/autoidx-kimber.xsl or -html/autoidx-kimber.xsl into your -customization. - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.number.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.number.separator.xml deleted file mode 100644 index 8f5151234b0b23aa72f701af9482153e7f0c7846..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.number.separator.xml +++ /dev/null @@ -1,54 +0,0 @@ - - -index.number.separator -string - - -index.number.separator -Override for punctuation separating page numbers in index - - - - - - - - -Description - -This parameter permits you to override the text to insert between -page references in a formatted index entry. Typically -that would be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'number-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. This punctuation appears between -such section titles in an HTML index. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.on.role.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.on.role.xml deleted file mode 100644 index 81d65ddba880f8580a648f9609333f6c439cef90..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.on.role.xml +++ /dev/null @@ -1,48 +0,0 @@ - - -index.on.role -boolean - - -index.on.role -Select indexterms based on role value - - - - - - - - -Description - - -If non-zero, -then an index element that has a -role attribute -value will contain only those indexterm -elements with a matching role value. -If an index has no role -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - -If index.on.role is zero, then the -role attribute has no effect -on selecting indexterms for an index. - - -If you are using DocBook version 4.3 or later, you should -use the type attribute instead of role -on indexterm and index, -and set the index.on.type to a nonzero -value. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.on.type.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.on.type.xml deleted file mode 100644 index a5189c7b135ee75bfd23465105019f97d82ad30e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.on.type.xml +++ /dev/null @@ -1,52 +0,0 @@ - - -index.on.type -boolean - - -index.on.type -Select indexterms based on type -attribute value - - - - - - - - -Description - - -If non-zero, -then an index element that has a -type attribute -value will contain only those indexterm -elements with a matching type attribute value. -If an index has no type -attribute or it is blank, then the index will contain -all indexterms in the current scope. - - - -If index.on.type is zero, then the -type attribute has no effect -on selecting indexterms for an index. - - -For those using DocBook version 4.2 or earlier, -the type attribute is not available -for index terms. However, you can achieve the same -effect by using the role attribute -in the same manner on indexterm -and index, and setting the stylesheet parameter -index.on.role to a nonzero value. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.page.number.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.page.number.properties.xml deleted file mode 100644 index 74d105a78199310db1f8eec448895ea5704d306a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.page.number.properties.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -index.page.number.properties -attribute set - - -index.page.number.properties -Properties associated with index page numbers - - - - - - - - - -Description - -Properties associated with page numbers in indexes. -Changing color to indicate the page number is a link is -one possibility. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.prefer.titleabbrev.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.prefer.titleabbrev.xml deleted file mode 100644 index 3f010ae8ddfeb702c1a7d2e84b191301471305c2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.prefer.titleabbrev.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -index.prefer.titleabbrev -boolean - - -index.prefer.titleabbrev -Should abbreviated titles be used as back references? - - - - - - - - -Description - -If non-zero, and if a titleabbrev is defined, the abbreviated title -is used as the link text of a back reference in the index. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.preferred.page.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.preferred.page.properties.xml deleted file mode 100644 index 1b7a26fff484c6a084e1a6271cdee6f156201e0b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.preferred.page.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -index.preferred.page.properties -attribute set - - -index.preferred.page.properties -Properties used to emphasize page number references for -significant index terms - - - - - - bold - - - - -Description - -Properties used to emphasize page number references for -significant index terms (significance=preferred). Currently works only with -XEP. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.range.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.range.separator.xml deleted file mode 100644 index aff09a93b7acefc330cafae91878ed64f9640185..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.range.separator.xml +++ /dev/null @@ -1,57 +0,0 @@ - - -index.range.separator -string - - -index.range.separator -Override for punctuation separating the two numbers -in a page range in index - - - - - - - - -Description - -This parameter permits you -to override the text to insert between -the two numbers of a page range in an index. -This parameter is only used by those XSL-FO processors -that support an extension for generating such page ranges -(such as XEP). - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'range-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -override the gentext with the content of this parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. - - -In HTML index output, section title references are used instead of -page number references. So there are no page ranges -and this parameter has no effect. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.term.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.term.separator.xml deleted file mode 100644 index ab2f672c94ea3c3935f0be6dca9b4b415dff7ad8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/index.term.separator.xml +++ /dev/null @@ -1,54 +0,0 @@ - - -index.term.separator -string - - -index.term.separator -Override for punctuation separating an index term -from its list of page references in an index - - - - - - - - -Description - -This parameter permits you to override -the text to insert between -the end of an index term and its list of page references. -Typically that might be a comma and a space. - - -Because this text may be locale dependent, -this parameter's value is normally taken from a gentext -template named 'term-separator' in the -context 'index' in the stylesheet -locale file for the language -of the current document. -This parameter can be used to override the gentext string, -and would typically be used on the command line. -This parameter would apply to all languages. - - -So this text string can be customized in two ways. -You can reset the default gentext string using -the local.l10n.xml parameter, or you can -fill in the content for this normally empty -override parameter. -The content can be a simple string, or it can be -something more complex such as a call-template. -For fo output, it could be an fo:leader -element to provide space of a specific length, or a dot leader. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informal.object.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informal.object.properties.xml deleted file mode 100644 index e89cc11780d678f6f858c1080c64e3fd163bdd9f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informal.object.properties.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -informal.object.properties -attribute set - - -informal.object.properties -Properties associated with an informal (untitled) object, such as an informalfigure - - - - - 0.5em - 1em - 2em - 0.5em - 1em - 2em - - -Description -The styling for informal objects in docbook. Specify the spacing before and after the object. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informalequation.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informalequation.properties.xml deleted file mode 100644 index 88a57bec5a69974dc73646d95f915471f17f93a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informalequation.properties.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -informalequation.properties -attribute set - - -informalequation.properties -Properties associated with an informalequation - - - - - - - - -Description - -The styling for informalequations. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informalexample.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informalexample.properties.xml deleted file mode 100644 index 90ffb2c787172b5ce104607ce6fbae58e372e217..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informalexample.properties.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -informalexample.properties -attribute set - - -informalexample.properties -Properties associated with an informalexample - - - - - - - - -Description - -The styling for informalexamples. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informalfigure.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informalfigure.properties.xml deleted file mode 100644 index c7662483c69396928e181dbb9b92f35a9cb6eba8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informalfigure.properties.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -informalfigure.properties -attribute set - - -informalfigure.properties -Properties associated with an informalfigure - - - - - - - - -Description - -The styling for informalfigures. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informaltable.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informaltable.properties.xml deleted file mode 100644 index c9688836fa6727fbe2930a714e8f82fc055c0d07..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/informaltable.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -informaltable.properties -attribute set - - -informaltable.properties -Properties associated with the block surrounding an informaltable - - - - - - - - -Description - -Block styling properties for informaltables. This parameter should really -have been called informaltable.block.properties or something -like that, but we’re leaving it to avoid backwards-compatibility -problems. - -See also table.table.properties. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/inherit.keywords.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/inherit.keywords.xml deleted file mode 100644 index 7939a6a3a677f8a6701ecd9d4a153d1cdcc4b15c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/inherit.keywords.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -inherit.keywords -boolean - - -inherit.keywords -Inherit keywords from ancestor elements? - - - - - - - -Description - -If inherit.keywords -is non-zero, the keyword meta for each HTML -head element will include all of the keywords from -ancestor elements. Otherwise, only the keywords from the current section -will be used. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.link.page.number.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.link.page.number.xml deleted file mode 100644 index b26c0f6afdacf1b7a98cd2314045c6112ba27f9f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.link.page.number.xml +++ /dev/null @@ -1,69 +0,0 @@ - - -insert.link.page.number -list -no -yes -maybe - - -insert.link.page.number -Turns page numbers in link elements on and off - - - - -no - - - -Description - -The value of this parameter determines if -cross references using the link element in -printed output will -include standard page number citations. -It has three possible values. - - - -no -No page number references will be generated. - - - -yes -Page number references will be generated -for all link elements. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for a link element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - - -Although the xrefstyle attribute -can be used to turn the page reference on or off, it cannot be -used to control the formatting of the page number as it -can in xref. -In link it will always format with -the style established by the -gentext template with name="page.citation" -in the l:context name="xref". - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.olink.page.number.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.olink.page.number.xml deleted file mode 100644 index dc6da3d06b823e3c3043093c3a5545d2f469f3fd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.olink.page.number.xml +++ /dev/null @@ -1,83 +0,0 @@ - - -insert.olink.page.number -list -no -yes -maybe - - -insert.olink.page.number -Turns page numbers in olinks on and off - - - - -no - - - -Description - -The value of this parameter determines if -cross references made between documents with -olink will -include page number citations. -In most cases this is only applicable to references in printed output. - -The parameter has three possible values. - - - -no -No page number references will be generated for olinks. - - - -yes -Page number references will be generated -for all olink references. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an olink element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - -Olinks that point to targets within the same document -are treated as xrefs, and controlled by -the insert.xref.page.number parameter. - - -Page number references for olinks to -external documents can only be inserted if the -information exists in the olink database. -This means each olink target element -(div or obj) -must have a page attribute -whose value is its page number in the target document. -The XSL stylesheets are not able to extract that information -during processing because pages have not yet been created in -XSLT transformation. Only the XSL-FO processor knows what -page each element is placed on. -Therefore some postprocessing must take place to populate -page numbers in the olink database. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.olink.pdf.frag.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.olink.pdf.frag.xml deleted file mode 100644 index e937060536e11da49603a610464d77483c8c38b9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.olink.pdf.frag.xml +++ /dev/null @@ -1,68 +0,0 @@ - - -insert.olink.pdf.frag -boolean - - -insert.olink.pdf.frag -Add fragment identifiers for links into PDF files - - - - - - - - -Description - -The value of this parameter determines whether -the cross reference URIs to PDF documents made with -olink will -include fragment identifiers. - - -When forming a URI to link to a PDF document, -a fragment identifier (typically a '#' followed by an -id value) appended to the PDF filename can be used by -the PDF viewer to open -the PDF file to a location within the document instead of -the first page. -However, not all PDF files have id -values embedded in them, and not all PDF viewers can -handle fragment identifiers. - - -If insert.olink.pdf.frag is set -to a non-zero value, then any olink targeting a -PDF file will have the fragment identifier appended to the URI. -The URI is formed by concatenating the value of the -olink.base.uri parameter, the -value of the baseuri -attribute from the document -element in the olink database with the matching -targetdoc value, -and the value of the href -attribute for the targeted element in the olink database. -The href attribute -contains the fragment identifier. - - -If insert.olink.pdf.frag is set -to zero (the default value), then -the href attribute -from the olink database -is not appended to PDF olinks, so the fragment identifier is left off. -A PDF olink is any olink for which the -baseuri attribute -from the matching document -element in the olink database ends with '.pdf'. -Any other olinks will still have the fragment identifier added. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.xref.page.number.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.xref.page.number.xml deleted file mode 100644 index 8c3aa072866a0093ca3aafcbd37ab915bcd88e9a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/insert.xref.page.number.xml +++ /dev/null @@ -1,60 +0,0 @@ - - -insert.xref.page.number -list -no -yes -maybe - - -insert.xref.page.number -Turns page numbers in xrefs on and off - - - - -no - - - -Description - -The value of this parameter determines if -cross references (xrefs) in -printed output will -include page number citations. -It has three possible values. - - - -no -No page number references will be generated. - - - -yes -Page number references will be generated -for all xref elements. -The style of page reference may be changed -if an xrefstyle -attribute is used. - - - -maybe -Page number references will not be generated -for an xref element unless -it has an -xrefstyle -attribute whose value specifies a page reference. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/itemizedlist.label.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/itemizedlist.label.properties.xml deleted file mode 100644 index 49f8ee649f989e130d1f875c019cefe793b896c3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/itemizedlist.label.properties.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -itemizedlist.label.properties -attribute set - - -itemizedlist.label.properties -Properties that apply to each label inside itemized list. - - - - - - -Description -Properties that apply to each label inside itemized list. E.g.: -<xsl:attribute-set name="itemizedlist.label.properties"> - <xsl:attribute name="text-align">right</xsl:attribute> -</xsl:attribute-set> - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/itemizedlist.label.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/itemizedlist.label.width.xml deleted file mode 100644 index 1d2c88c8ddc9df8a605c88ff32f8f49073d2b8cf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/itemizedlist.label.width.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -itemizedlist.label.width -length - - - itemizedlist.label.width -The default width of the label (bullet) in an itemized list. - - - - - 1.0em - - - -Description -Specifies the default width of the label (usually a bullet or other -symbol) in an itemized list. You can override the default value on any -particular list with the “dbfo†processing instruction using the -“label-width†pseudoattribute. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/itemizedlist.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/itemizedlist.properties.xml deleted file mode 100644 index d7c7c1d273905c2589c5a80f5d1496978019c737..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/itemizedlist.properties.xml +++ /dev/null @@ -1,23 +0,0 @@ - - -itemizedlist.properties -attribute set - - -itemizedlist.properties -Properties that apply to each list-block generated by itemizedlist. - - - - - - -Description -Properties that apply to each fo:list-block generated by itemizedlist. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/javahelp.encoding.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/javahelp.encoding.xml deleted file mode 100644 index ba729c8cb0869570220ca9990229485d618a784a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/javahelp.encoding.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -javahelp.encoding -string - - -javahelp.encoding -Character encoding to use in control files for JavaHelp. - - - - -iso-8859-1 - - - -Description - -JavaHelp crashes on some characters when written as character -references. In that case you can use this parameter to select an appropriate encoding. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/keep.relative.image.uris.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/keep.relative.image.uris.xml deleted file mode 100644 index 3a5a098d7bff14fb92b8c2d205f0b784803c27fc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/keep.relative.image.uris.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -keep.relative.image.uris -boolean - - -keep.relative.image.uris -Should image URIs be resolved against xml:base? - - - - - - - - - -Description - -If non-zero, relative URIs (in, for example -fileref attributes) will be used in the generated -output. Otherwise, the URIs will be made absolute with respect to the -base URI. - -Note that the stylesheets calculate (and use) the absolute form -for some purposes, this only applies to the resulting output. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/keyboard.nav.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/keyboard.nav.xml deleted file mode 100644 index 49b0c0b597e7ccfb7caf11fefcb6d984cc2987a1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/keyboard.nav.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -keyboard.nav -boolean - - -keyboard.nav -Enable keyboard navigation? - - - - - - - - -Description - -If non-zero, JavaScript is added to the slides to enable keyboard -navigation. Pressing 'n', space, or return moves forward; pressing 'p' moves -backward. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.gentext.default.language.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.gentext.default.language.xml deleted file mode 100644 index ed89e069a0613b6c33521add0b4709d397f041e6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.gentext.default.language.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - l10n.gentext.default.language - string - - - l10n.gentext.default.language - Sets the default language for generated text - - - - -en - - - -Description - -The value of the l10n.gentext.default.language -parameter is used as the language for generated text if no setting is provided -in the source document. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.gentext.language.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.gentext.language.xml deleted file mode 100644 index ff941c7c7ccfcc52f64af02fd9e36bb796d164f2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.gentext.language.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -l10n.gentext.language -string - - -l10n.gentext.language -Sets the gentext language - - - - - - - - -Description - -If this parameter is set to any value other than the empty string, its -value will be used as the value for the language when generating text. Setting -l10n.gentext.language overrides any settings within the -document being formatted. - -It's much more likely that you might want to set the -l10n.gentext.default.language parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.gentext.use.xref.language.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.gentext.use.xref.language.xml deleted file mode 100644 index d70017afbf4dc8c8189a702a93ae2f16a993d597..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.gentext.use.xref.language.xml +++ /dev/null @@ -1,53 +0,0 @@ - - -l10n.gentext.use.xref.language -boolean - - -l10n.gentext.use.xref.language -Use the language of target when generating cross-reference text? - - - - - - - - -Description - -If non-zero, the language of the target will be used when -generating cross reference text. Usually, the current -language is used when generating text (that is, the language of the -element that contains the cross-reference element). But setting this parameter -allows the language of the element pointed to to control -the generated text. - -Consider the following example: - - -<para lang="en">See also <xref linkend="chap3"/>.</para> - - - -Suppose that Chapter 3 happens to be written in German. -If l10n.gentext.use.xref.language is non-zero, the -resulting text will be something like this: - -
    -See also Kapital 3. -
    - -Where the more traditional rendering would be: - -
    -See also Chapter 3. -
    - -
    -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.lang.value.rfc.compliant.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.lang.value.rfc.compliant.xml deleted file mode 100644 index e0dbd7953144adb1a1fd6a12c81075f354963455..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/l10n.lang.value.rfc.compliant.xml +++ /dev/null @@ -1,57 +0,0 @@ - - -l10n.lang.value.rfc.compliant -boolean - - -l10n.lang.value.rfc.compliant -Make value of lang attribute RFC compliant? - - - - - - - - -Description - -If non-zero, ensure that the values for all lang attributes in HTML output are RFC -compliantSection 8.1.1, Language Codes, in the HTML 4.0 Recommendation states that: - -
    [RFC1766] defines and explains the language codes -that must be used in HTML documents. -Briefly, language codes consist of a primary code and a possibly -empty series of subcodes: - -language-code = primary-code ( "-" subcode )* - -And in RFC 1766, Tags for the Identification -of Languages, the EBNF for "language tag" is given as: - -Language-Tag = Primary-tag *( "-" Subtag ) -Primary-tag = 1*8ALPHA -Subtag = 1*8ALPHA - -
    -
    . - -by taking any underscore characters in any lang values found in source documents, and -replacing them with hyphen characters in output HTML files. For -example, zh_CN in a source document becomes -zh-CN in the HTML output form that source. - - -This parameter does not cause any case change in lang values, because RFC 1766 -explicitly states that all "language tags" (as it calls them) "are -to be treated as case insensitive". - -
    - -
    -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/label.from.part.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/label.from.part.xml deleted file mode 100644 index 5deb96030514d65e77fdcc2ee9191267f991793d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/label.from.part.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -label.from.part -boolean - - -label.from.part -Renumber components in each part? - - - - - - - - -Description - -If label.from.part is non-zero, then - numbering of components — preface, - chapter, appendix, and - reference (when reference occurs at the - component level) — is re-started within each - part. -If label.from.part is zero (the - default), numbering of components is not - re-started within each part; instead, components are - numbered sequentially throughout each book, - regardless of whether or not they occur within part - instances. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/line-height.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/line-height.xml deleted file mode 100644 index f0f4b3246c141f2f5d2842ea4557d883d346016f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/line-height.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -line-height -string - - -line-height -Specify the line-height property - - - - -normal - - - -Description - -Sets the line-height property. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.everyNth.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.everyNth.xml deleted file mode 100644 index 5e7bcacc704e1ce3c5640bc1ca299febe2299c20..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.everyNth.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -linenumbering.everyNth -integer - - -linenumbering.everyNth -Indicate which lines should be numbered - - - - -5 - - - -Description - -If line numbering is enabled, everyNth line will be -numbered. Note that numbering is one based, not zero based. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.extension.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.extension.xml deleted file mode 100644 index 726781aee01b4e1b9b25ada2c9dd11d42fb42854..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.extension.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -linenumbering.extension -boolean - - -linenumbering.extension -Enable the line numbering extension - - - - - - - - -Description - -If non-zero, verbatim environments (address, literallayout, -programlisting, screen, synopsis) that specify line numbering will -have line numbers. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.separator.xml deleted file mode 100644 index 8bf7d22137043494cf3858004b2717bd16eb7c63..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.separator.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -linenumbering.separator -string - - -linenumbering.separator -Specify a separator between line numbers and lines - - - - - - - - -Description - -The separator is inserted between line numbers and lines in the -verbatim environment. The default value is a single white space. - Note the interaction with linenumbering.width - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.width.xml deleted file mode 100644 index 78515c3ee6452acb8e79b65f4cf6cf1e32ca5970..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/linenumbering.width.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -linenumbering.width -integer - - -linenumbering.width -Indicates the width of line numbers - - - - -3 - - - -Description - -If line numbering is enabled, line numbers will appear right -justified in a field "width" characters wide. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/link.mailto.url.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/link.mailto.url.xml deleted file mode 100644 index 0715b32fc128d463dbdcabd4937104eeaca3f9b0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/link.mailto.url.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -link.mailto.url -string - - -link.mailto.url -Mailto URL for the LINK REL=made HTML HEAD element - - - - - - - - -Description - -If not the empty string, this address will be used for the -rel=made link element in the html head - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/list.block.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/list.block.properties.xml deleted file mode 100644 index dbf9dfc13168d7aed478bb5039c8ee3ab6e0209b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/list.block.properties.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -list.block.properties -attribute set - - -list.block.properties -Properties that apply to each list-block generated by list. - - - - - 0.2em - 1.5em - - -Description -Properties that apply to each fo:list-block generated by itemizedlist/orderedlist. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/list.block.spacing.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/list.block.spacing.xml deleted file mode 100644 index 377e6f8a89287ae6eeec2082b18d0663cc6cb563..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/list.block.spacing.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -list.block.spacing -attribute set - - -list.block.spacing -What spacing do you want before and after lists? - - - - - 1em - 0.8em - 1.2em - 1em - 0.8em - 1.2em - - -Description -Specify the spacing required before and after a list. It is necessary to specify the space after a list block because lists can come inside of paras. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/list.item.spacing.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/list.item.spacing.xml deleted file mode 100644 index 21916520fb869f058f4b351f4e0b8a893c68b78f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/list.item.spacing.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -list.item.spacing -attribute set - - -list.item.spacing -What space do you want between list items? - - - - - 1em - 0.8em - 1.2em - - -Description -Specify what spacing you want between each list item. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.clean.html.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.clean.html.xml deleted file mode 100644 index fbf80d02b7db421a5f4be9336c0236586c9fa4f9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.clean.html.xml +++ /dev/null @@ -1,51 +0,0 @@ - - -make.clean.html -boolean - - -make.clean.html -Make HTML conform to modern coding standards - - - - - - - - -Description - -If make.clean.html is true, the stylesheets take -extra effort to ensure that the resulting HTML is conforms to -modern HTML coding standards. In addition to eliminating -excessive and noncompliant coding, it moves presentation -HTML coding to a CSS stylesheet. - -The resulting HTML is dependent on -CSS for formatting, and so the stylesheet is capable of -generating a supporting CSS file. The docbook.css.source -and custom.css.source parameters control -how a CSS file is generated. - -If you require your CSS to reside in the HTML -head element, then the generate.css.header -can be used to do that. - -The make.clean.html parameter is -different from html.cleanup -because the former changes the resulting markup; it does not use extension functions -like the latter to manipulate result-tree-fragments, -and is therefore applicable to any XSLT processor. - -If make.clean.html is set to zero (the default), -then the stylesheet retains its original -old style -HTML formatting features. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.graphic.viewport.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.graphic.viewport.xml deleted file mode 100644 index 0bad336f8e9bac2a444770c9edb33daea13c77f9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.graphic.viewport.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -make.graphic.viewport -boolean - - -make.graphic.viewport -Use tables in HTML to make viewports for graphics - - - - - - - - -Description - -The HTML img element only supports the notion -of content-area scaling; it doesn't support the distinction between a -content-area and a viewport-area, so we have to make some compromises. - -If make.graphic.viewport is non-zero, a table -will be used to frame the image. This creates an effective viewport-area. - - -Tables and alignment don't work together, so this parameter is ignored -if alignment is specified on an image. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.index.markup.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.index.markup.xml deleted file mode 100644 index 7942b5a50c0688ea9f6f630b80eeac5e28ef3331..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.index.markup.xml +++ /dev/null @@ -1,73 +0,0 @@ - - -make.index.markup -boolean - - -make.index.markup -Generate XML index markup in the index? - - - - - - - - -Description - -This parameter enables a very neat trick for getting properly -merged, collated back-of-the-book indexes. G. Ken Holman suggested -this trick at Extreme Markup Languages 2002 and I'm indebted to him -for it. - -Jeni Tennison's excellent code in -autoidx.xsl does a great job of merging and -sorting indexterms in the document and building a -back-of-the-book index. However, there's one thing that it cannot -reasonably be expected to do: merge page numbers into ranges. (I would -not have thought that it could collate and suppress duplicate page -numbers, but in fact it appears to manage that task somehow.) - -Ken's trick is to produce a document in which the index at the -back of the book is displayed in XML. Because the index -is generated by the FO processor, all of the page numbers have been resolved. -It's a bit hard to explain, but what it boils down to is that instead of having -an index at the back of the book that looks like this: - -
    -A -ap1, 1, 2, 3 - -
    - -you get one that looks like this: - -
    -<indexdiv>A</indexdiv> -<indexentry> -<primaryie>ap1</primaryie>, -<phrase role="pageno">1</phrase>, -<phrase role="pageno">2</phrase>, -<phrase role="pageno">3</phrase> -</indexentry> -
    - -After building a PDF file with this sort of odd-looking index, you can -extract the text from the PDF file and the result is a proper index expressed in -XML. - -Now you have data that's amenable to processing and a simple Perl script -(such as fo/pdf2index) can -merge page ranges and generate a proper index. - -Finally, reformat your original document using this literal index instead of -an automatically generated one and bingo! - -
    -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.single.year.ranges.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.single.year.ranges.xml deleted file mode 100644 index c49ab97beff17d9e702ca34209c662b38e3e0378..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.single.year.ranges.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -make.single.year.ranges -boolean - - -make.single.year.ranges -Print single-year ranges (e.g., 1998-1999) - - - - - - - -Description - -If non-zero, year ranges that span a single year will be printed -in range notation (1998-1999) instead of discrete notation -(1998, 1999). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.valid.html.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.valid.html.xml deleted file mode 100644 index 8618d39a7a9664e5d7dee391e96e0c75c2d5251d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.valid.html.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -make.valid.html -boolean - - -make.valid.html -Attempt to make sure the HTML output is valid HTML - - - - - - - - -Description - -If make.valid.html is true, the stylesheets take -extra effort to ensure that the resulting HTML is valid. This may mean that some -para tags are translated into HTML divs or -that other substitutions occur. - -This parameter is different from html.cleanup -because it changes the resulting markup; it does not use extension functions -to manipulate result-tree-fragments and is therefore applicable to any -XSLT processor. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.year.ranges.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.year.ranges.xml deleted file mode 100644 index b1a238267107a5276a85984b136b02664f9c851f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/make.year.ranges.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -make.year.ranges -boolean - - -make.year.ranges -Collate copyright years into ranges? - - - - - - -Description - -If non-zero, multiple copyright year elements will be -collated into ranges. -This works only if each year number is put into a separate -year element. The copyright element permits multiple -year elements. If a year element contains a dash or -a comma, then that year element will not be merged into -any range. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.authors.section.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.authors.section.enabled.xml deleted file mode 100644 index 73cb637823c6fa40b5a44345d22669fd432af05f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.authors.section.enabled.xml +++ /dev/null @@ -1,46 +0,0 @@ - - -man.authors.section.enabled -boolean - - -man.authors.section.enabled -Display auto-generated AUTHORS section? - - - -1 - - -Description - -If the value of -man.authors.section.enabled is non-zero -(the default), then an AUTHORS section is -generated near the end of each man page. The output of the -AUTHORS section is assembled from any -author, editor, and othercredit -metadata found in the contents of the child info or -refentryinfo (if any) of the refentry -itself, or from any author, editor, and -othercredit metadata that may appear in info -contents of any ancestors of the refentry. - -If the value of -man.authors.section.enabled is zero, the -the auto-generated AUTHORS section is -suppressed. - -Set the value of - man.authors.section.enabled to zero if - you want to have a manually created AUTHORS - section in your source, and you want it to appear in output - instead of the auto-generated AUTHORS - section. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.base.url.for.relative.links.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.base.url.for.relative.links.xml deleted file mode 100644 index a802ec80abfbcc7e533614c8080d4a585fe8cc8b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.base.url.for.relative.links.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - man.base.url.for.relative.links - string - - - man.base.url.for.relative.links - Specifies a base URL for relative links - - - - [set $man.base.url.for.relative.links]/ - - - Description - - For any “notesource†listed in the auto-generated - “NOTES†section of output man pages (which is generated when - the value of the - man.endnotes.list.enabled parameter - is non-zero), if the notesource is a link source with a - relative URI, the URI is displayed in output with the value - of the - man.base.url.for.relative.links - parameter prepended to the value of the link URI. - - - A link source is an notesource that references an - external resource: - - - a ulink element with a url attribute - - - any element with an xlink:href attribute - - - an imagedata, audiodata, or - videodata element - - - - - - If you use relative URIs in link sources in your DocBook - refentry source, and you leave - man.base.url.for.relative.links - unset, the relative links will appear “as is†in the “Notes†- section of any man-page output generated from your source. - That’s probably not what you want, because such relative - links are only usable in the context of HTML output. So, to - make the links meaningful and usable in the context of - man-page output, set a value for - man.base.url.for.relative.links that - points to the online version of HTML output generated from - your DocBook refentry source. For - example: - <xsl:param name="man.base.url.for.relative.links" - >http://www.kernel.org/pub/software/scm/git/docs/</xsl:param> - - - - - Related Parameters - man.endnotes.list.enabled - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.break.after.slash.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.break.after.slash.xml deleted file mode 100644 index 859edb731364ca427dc1e230f133dda619fd8575..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.break.after.slash.xml +++ /dev/null @@ -1,46 +0,0 @@ - - -man.break.after.slash -boolean - - -man.break.after.slash -Enable line-breaking after slashes? - - - - -0 - - -Description - -If non-zero, line-breaking after slashes is enabled. This is -mainly useful for causing long URLs or pathnames/filenames to be -broken up or "wrapped" across lines (though it also has the side -effect of sometimes causing relatively short URLs and pathnames to be -broken up across lines too). - -If zero (the default), line-breaking after slashes is -disabled. In that case, strings containing slashes (for example, URLs -or filenames) are not broken across lines, even if they exceed the -maximum column widith. - - - If you set a non-zero value for this parameter, check your - man-page output carefuly afterwards, in order to make sure that the - setting has not introduced an excessive amount of breaking-up of URLs - or pathnames. If your content contains mostly short URLs or - pathnames, setting a non-zero value for - man.break.after.slash will probably result in - in a significant number of relatively short URLs and pathnames being - broken across lines, which is probably not what you want. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.enabled.xml deleted file mode 100644 index 5522339ea912276ff39411629fbd167a35a628e3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.enabled.xml +++ /dev/null @@ -1,55 +0,0 @@ - - -man.charmap.enabled -boolean - - -man.charmap.enabled -Apply character map before final output? - - - - - - - - -Description - -If the value of the man.charmap.enabled -parameter is non-zero, a "character map" is used to substitute certain -Unicode symbols and special characters with appropriate roff/groff -equivalents, just before writing each man-page file to the -filesystem. If instead the value of -man.charmap.enabled is zero, Unicode characters -are passed through "as is". - -Details - -For converting certain Unicode symbols and special characters in -UTF-8 or UTF-16 encoded XML source to appropriate groff/roff -equivalents in man-page output, the DocBook XSL Stylesheets -distribution includes a roff character map that is compliant with the XSLT character -map format as detailed in the XSLT 2.0 specification. The map -contains more than 800 character mappings and can be considered the -standard roff character map for the distribution. - -You can use the man.charmap.uri -parameter to specify a URI for the location for an alternate roff -character map to use in place of the standard roff character map -provided in the distribution. - -You can also use a subset of a character map. For details, -see the man.charmap.use.subset, -man.charmap.subset.profile, and -man.charmap.subset.profile.english -parameters. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.subset.profile.english.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.subset.profile.english.xml deleted file mode 100644 index cbc9fb0b651fa03d47c81646fabf3cc88866309b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.subset.profile.english.xml +++ /dev/null @@ -1,80 +0,0 @@ - - -man.charmap.subset.profile.english -string - - -man.charmap.subset.profile.english -Profile of character map subset - - - - - -@*[local-name() = 'block'] = 'Miscellaneous Technical' or -(@*[local-name() = 'block'] = 'C1 Controls And Latin-1 Supplement (Latin-1 Supplement)' and - @*[local-name() = 'class'] = 'symbols') -or -(@*[local-name() = 'block'] = 'General Punctuation' and - (@*[local-name() = 'class'] = 'spaces' or - @*[local-name() = 'class'] = 'dashes' or - @*[local-name() = 'class'] = 'quotes' or - @*[local-name() = 'class'] = 'bullets' - ) -) or -@*[local-name() = 'name'] = 'HORIZONTAL ELLIPSIS' or -@*[local-name() = 'name'] = 'WORD JOINER' or -@*[local-name() = 'name'] = 'SERVICE MARK' or -@*[local-name() = 'name'] = 'TRADE MARK SIGN' or -@*[local-name() = 'name'] = 'ZERO WIDTH NO-BREAK SPACE' - - - - -Description - -If the value of the - man.charmap.use.subset parameter is - non-zero, and your DocBook source is written in English (that - is, if its lang or xml:lang attribute on the root element - in your DocBook source or on the first refentry - element in your source has the value en or if - it has no lang or xml:lang attribute), then the - character-map subset specified by the - man.charmap.subset.profile.english - parameter is used instead of the full roff character map. - -Otherwise, if the lang or xml:lang attribute - on the root element in your DocBook source or on the first - refentry element in your source has a value other - than en, then the character-map subset - specified by the - man.charmap.subset.profile parameter is - used instead of - man.charmap.subset.profile.english. - -The difference between the two subsets is that - man.charmap.subset.profile provides - mappings for characters in Western European languages that are - not part of the Roman (English) alphabet (ASCII character set). - -The value of man.charmap.subset.profile.english -is a string representing an XPath expression that matches attribute -names and values for output-character elements in the character map. - -For other details, see the documentation for the -man.charmap.subset.profile.english and -man.charmap.use.subset parameters. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.subset.profile.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.subset.profile.xml deleted file mode 100644 index 913a4e3b95b7cd31ed5a094c1e19cc8d1e16e514..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.subset.profile.xml +++ /dev/null @@ -1,297 +0,0 @@ - - -man.charmap.subset.profile -string - - -man.charmap.subset.profile -Profile of character map subset - - - - - -@*[local-name() = 'block'] = 'Miscellaneous Technical' or -(@*[local-name() = 'block'] = 'C1 Controls And Latin-1 Supplement (Latin-1 Supplement)' and - (@*[local-name() = 'class'] = 'symbols' or - @*[local-name() = 'class'] = 'letters') -) or -@*[local-name() = 'block'] = 'Latin Extended-A' -or -(@*[local-name() = 'block'] = 'General Punctuation' and - (@*[local-name() = 'class'] = 'spaces' or - @*[local-name() = 'class'] = 'dashes' or - @*[local-name() = 'class'] = 'quotes' or - @*[local-name() = 'class'] = 'bullets' - ) -) or -@*[local-name() = 'name'] = 'HORIZONTAL ELLIPSIS' or -@*[local-name() = 'name'] = 'WORD JOINER' or -@*[local-name() = 'name'] = 'SERVICE MARK' or -@*[local-name() = 'name'] = 'TRADE MARK SIGN' or -@*[local-name() = 'name'] = 'ZERO WIDTH NO-BREAK SPACE' - - - - -Description - -If the value of the -man.charmap.use.subset parameter is non-zero, -and your DocBook source is not written in English (that - is, if the lang or xml:lang attribute on the root element - in your DocBook source or on the first refentry - element in your source has a value other than - en), then the character-map subset specified - by the man.charmap.subset.profile - parameter is used instead of the full roff character map. - -Otherwise, if the lang or xml:lang attribute on the root - element in your DocBook - source or on the first refentry element in your source - has the value en or if it has no lang or xml:lang attribute, then the character-map - subset specified by the - man.charmap.subset.profile.english - parameter is used instead of - man.charmap.subset.profile. - -The difference between the two subsets is that - man.charmap.subset.profile provides - mappings for characters in Western European languages that are - not part of the Roman (English) alphabet (ASCII character set). - -The value of man.charmap.subset.profile -is a string representing an XPath expression that matches attribute -names and values for output-character -elements in the character map. - -The attributes supported in the standard roff character map included in the distribution are: - - - character - - a raw Unicode character or numeric Unicode - character-entity value (either in decimal or hex); all - characters have this attribute - - - - name - - a standard full/long ISO/Unicode character name (e.g., - "OHM SIGN"); all characters have this attribute - - - - block - - a standard Unicode "block" name (e.g., "General - Punctuation"); all characters have this attribute. For the full - list of Unicode block names supported in the standard roff - character map, see . - - - - class - - a class of characters (e.g., "spaces"). Not all - characters have this attribute; currently, it is used only with - certain characters within the "C1 Controls And Latin-1 - Supplement" and "General Punctuation" blocks. For details, see - . - - - - entity - - an ISO entity name (e.g., "ohm"); not all characters - have this attribute, because not all characters have ISO entity - names; for example, of the 800 or so characters in the standard - roff character map included in the distribution, only around 300 - have ISO entity names. - - - - - string - - a string representing an roff/groff escape-code (with - "@esc@" used in place of the backslash), or a simple ASCII - string; all characters in the roff character map have this - attribute - - - - -The value of man.charmap.subset.profile -is evaluated as an XPath expression at run-time to select a portion of -the roff character map to use. You can tune the subset used by adding -or removing parts. For example, if you need to use a wide range of -mathematical operators in a document, and you want to have them -converted into roff markup properly, you might add the following: - - @*[local-name() = 'block'] ='MathematicalOperators' - -That will cause a additional set of around 67 additional "math" -characters to be converted into roff markup. - - -Depending on which XSLT engine you use, either the EXSLT -dyn:evaluate extension function (for xsltproc or -Xalan) or saxon:evaluate extension function (for -Saxon) are used to dynamically evaluate the value of -man.charmap.subset.profile at run-time. If you -don't use xsltproc, Saxon, Xalan -- or some other XSLT engine that -supports dyn:evaluate -- you must either set the -value of the man.charmap.use.subset parameter -to zero and process your documents using the full character map -instead, or set the value of the -man.charmap.enabled parameter to zero instead -(so that character-map processing is disabled completely. - - -An alternative to using -man.charmap.subset.profile is to create your -own custom character map, and set the value of -man.charmap.uri to the URI/filename for -that. If you use a custom character map, you will probably want to -include in it just the characters you want to use, and so you will -most likely also want to set the value of -man.charmap.use.subset to zero. -You can create a -custom character map by making a copy of the standard roff character map provided in the distribution, and -then adding to, changing, and/or deleting from that. - - -If you author your DocBook XML source in UTF-8 or UTF-16 -encoding and aren't sure what OSes or environments your man-page -output might end up being viewed on, and not sure what version of -nroff/groff those environments might have, you should be careful about -what Unicode symbols and special characters you use in your source and -what parts you add to the value of -man.charmap.subset.profile. -Many of the escape codes used are specific to groff and using -them may not provide the expected output on an OS or environment that -uses nroff instead of groff. -On the other hand, if you intend for your man-page output to be -viewed only on modern systems (for example, GNU/Linux systems, FreeBSD -systems, or Cygwin environments) that have a good, up-to-date groff, -then you can safely include a wide range of Unicode symbols and -special characters in your UTF-8 or UTF-16 encoded DocBook XML source -and add any of the supported Unicode block names to the value of -man.charmap.subset.profile. - - - -For other details, see the documentation for the -man.charmap.use.subset parameter. - -Supported Unicode block names and "class" values - - - Below is the full list of Unicode block names and "class" - values supported in the standard roff stylesheet provided in the - distribution, along with a description of which codepoints from the - Unicode range corresponding to that block name or block/class - combination are supported. - - - - C1 Controls And Latin-1 Supplement (Latin-1 Supplement) (x00a0 to x00ff) - class values - - - symbols - - - letters - - - - - Latin Extended-A (x0100 to x017f, partial) - - - Spacing Modifier Letters (x02b0 to x02ee, partial) - - - Greek and Coptic (x0370 to x03ff, partial) - - - General Punctuation (x2000 to x206f, partial) - class values - - - spaces - - - dashes - - - quotes - - - daggers - - - bullets - - - leaders - - - primes - - - - - - Superscripts and Subscripts (x2070 to x209f) - - - Currency Symbols (x20a0 to x20b1) - - - Letterlike Symbols (x2100 to x214b) - - - Number Forms (x2150 to x218f) - - - Arrows (x2190 to x21ff, partial) - - - Mathematical Operators (x2200 to x22ff, partial) - - - Control Pictures (x2400 to x243f) - - - Enclosed Alphanumerics (x2460 to x24ff) - - - Geometric Shapes (x25a0 to x25f7, partial) - - - Miscellaneous Symbols (x2600 to x26ff, partial) - - - Dingbats (x2700 to x27be, partial) - - - Alphabetic Presentation Forms (xfb00 to xfb04 only) - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.uri.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.uri.xml deleted file mode 100644 index 0c8f57451ebb2879ab4550b1d6aacc4558fab7d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.uri.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -man.charmap.uri -uri - - -man.charmap.uri -URI for custom roff character map - - - - - - - - -Description - -For converting certain Unicode symbols and special characters in -UTF-8 or UTF-16 encoded XML source to appropriate groff/roff -equivalents in man-page output, the DocBook XSL Stylesheets -distribution includes an XSLT character -map. That character map can be considered the standard roff -character map for the distribution. - -If the value of the man.charmap.uri -parameter is non-empty, that value is used as the URI for the location -for an alternate roff character map to use in place of the standard -roff character map provided in the distribution. - - -Do not set a value for man.charmap.uri -unless you have a custom roff character map that differs from the -standard one provided in the distribution. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.use.subset.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.use.subset.xml deleted file mode 100644 index 4403704ff08a0c5b7508d2ad6a866d9076528068..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.charmap.use.subset.xml +++ /dev/null @@ -1,80 +0,0 @@ - - -man.charmap.use.subset -boolean - - -man.charmap.use.subset -Use subset of character map instead of full map? - - - - - - - - -Description - -If the value of the -man.charmap.use.subset parameter is non-zero, -a subset of the roff character map is used instead of the full roff -character map. The profile of the subset used is determined either -by the value of the -man.charmap.subset.profile -parameter (if the source is not in English) or the -man.charmap.subset.profile.english -parameter (if the source is in English). - - - You may want to experiment with setting a non-zero value of - man.charmap.use.subset, so that the full - character map is used. Depending on which XSLT engine you run, - setting a non-zero value for - man.charmap.use.subset may significantly - increase the time needed to process your documents. Or it may - not. For example, if you set it and run it with xsltproc, it seems - to dramatically increase processing time; on the other hand, if you - set it and run it with Saxon, it does not seem to increase - processing time nearly as much. - - If processing time is not a important concern and/or you can - tolerate the increase in processing time imposed by using the full - character map, set man.charmap.use.subset to - zero. - - -Details - -For converting certain Unicode symbols and special characters in -UTF-8 or UTF-16 encoded XML source to appropriate groff/roff -equivalents in man-page output, the DocBook XSL Stylesheets -distribution includes a roff character map that is compliant with the XSLT character -map format as detailed in the XSLT 2.0 specification. The map -contains more than 800 character mappings and can be considered the -standard roff character map for the distribution. - - -You can use the man.charmap.uri -parameter to specify a URI for the location for an alternate roff -character map to use in place of the standard roff character map -provided in the distribution. - - -Because it is not terrifically efficient to use the standard -800-character character map in full -- and for most (or all) users, -never necessary to use it in full -- the DocBook XSL Stylesheets -support a mechanism for using, within any given character map, a -subset of character mappings instead of the full set. You can use the -man.charmap.subset.profile or -man.charmap.subset.profile.english -parameter to tune the profile of that subset to use. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.copyright.section.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.copyright.section.enabled.xml deleted file mode 100644 index 9e835876171ebb8f48f7a0a41fcdd0344c4faba7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.copyright.section.enabled.xml +++ /dev/null @@ -1,46 +0,0 @@ - - -man.copyright.section.enabled -boolean - - -man.copyright.section.enabled -Display auto-generated COPYRIGHT section? - - - -1 - - -Description - -If the value of -man.copyright.section.enabled is non-zero -(the default), then a COPYRIGHT section is -generated near the end of each man page. The output of the -COPYRIGHT section is assembled from any -copyright and legalnotice metadata found in -the contents of the child info or -refentryinfo (if any) of the refentry -itself, or from any copyright and -legalnotice metadata that may appear in info -contents of any ancestors of the refentry. - -If the value of -man.copyright.section.enabled is zero, the -the auto-generated COPYRIGHT section is -suppressed. - -Set the value of - man.copyright.section.enabled to zero if - you want to have a manually created COPYRIGHT - section in your source, and you want it to appear in output - instead of the auto-generated COPYRIGHT - section. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.endnotes.are.numbered.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.endnotes.are.numbered.xml deleted file mode 100644 index b069ec3ed981bfe931e71e9b2145b09196f29346..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.endnotes.are.numbered.xml +++ /dev/null @@ -1,106 +0,0 @@ - - -man.endnotes.are.numbered -boolean - - -man.endnotes.are.numbered -Number endnotes? - - - - -1 - - - -Description - -If the value of man.endnotes.are.numbered is -non-zero (the default), then for each non-empty -A “non-empty†notesource is one that looks like -this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/">manpages</ulink> -an “empty†notesource is on that looks like this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/"/> - “notesourceâ€: - - - - a number (in square brackets) is displayed inline after the - rendered inline contents (if any) of the notesource - - - the contents of the notesource are included in a - numbered list of endnotes that is generated at the end of - each man page; the number for each endnote corresponds to - the inline number for the notesource with which it is - associated - - -The default heading for the list of endnotes is -NOTES. To output a different heading, set a value -for the man.endnotes.section.heading -parameter. - - - The endnotes list is also displayed (but without - numbers) if the value of - man.endnotes.list.enabled is - non-zero. - - - -If the value of man.endnotes.are.numbered is -zero, numbering of endnotess is suppressed; only inline -contents (if any) of the notesource are displayed inline. - - If you are thinking about disabling endnote numbering by setting - the value of man.endnotes.are.numbered to zero, - before you do so, first take some time to carefully - consider the information needs and experiences of your users. The - square-bracketed numbers displayed inline after notesources may seem - obstrusive and aesthetically unpleasingAs far as notesources that are links, ytou might - think it would be better to just display URLs for non-empty - links inline, after their content, rather than displaying - square-bracketed numbers all over the place. But it's not better. In - fact, it's not even practical, because many (most) URLs for links - are too long to be displayed inline. They end up overflowing the - right margin. You can set a non-zero value for - man.break.after.slash parameter to deal with - that, but it could be argued that what you end up with is at least - as ugly, and definitely more obstrusive, then having short - square-bracketed numbers displayed inline., - - but in a text-only output format, the - numbered-notesources/endnotes-listing mechanism is the only - practical way to handle this kind of content. - - Also, users of “text based†browsers such as - lynx will already be accustomed to seeing inline - numbers for links. And various "man to html" applications, such as - the widely used man2html (VH-Man2html) - application, can automatically turn URLs into "real" HTML hyperlinks - in output. So leaving man.endnotes.are.numbered - at its default (non-zero) value ensures that no information is - lost in your man-page output. It just gets - “rearrangedâ€. - - -The handling of empty links is not affected by this -parameter. Empty links are handled simply by displaying their URLs -inline. Empty links are never auto-numbered. - -If you disable endnotes numbering, you should probably also set -man.font.links to an empty value (to -disable font formatting for links. - - -Related Parameters - man.endnotes.list.enabled, - man.font.links - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.endnotes.list.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.endnotes.list.enabled.xml deleted file mode 100644 index 89d81888fc487fe804329847dad0a9e1103ce31d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.endnotes.list.enabled.xml +++ /dev/null @@ -1,105 +0,0 @@ - - -man.endnotes.list.enabled -boolean - - -man.endnotes.list.enabled -Display endnotes list at end of man page? - - - - -1 - - - -Description - -If the value of man.endnotes.list.enabled is -non-zero (the default), then an endnotes list is added to the end of -the output man page. - -If the value of man.endnotes.list.enabled is -zero, the list is suppressed — unless link numbering is enabled (that -is, if man.endnotes.are.numbered is non-zero), in -which case, that setting overrides the -man.endnotes.list.enabled setting, and the -endnotes list is still displayed. The reason is that inline -numbering of notesources associated with endnotes only makes sense -if a (numbered) list of endnotes is also generated. - - - Leaving - man.endnotes.list.enabled at its default - (non-zero) value ensures that no “out of line†information (such - as the URLs for hyperlinks and images) gets lost in your - man-page output. It just gets “rearrangedâ€. - So if you’re thinking about disabling endnotes listing by - setting the value of - man.endnotes.list.enabled to zero: - Before you do so, first take some time to carefully consider - the information needs and experiences of your users. The “out - of line†information has value even if the presentation of it - in text output is not as interactive as it may be in other - output formats. - As far as the specific case of URLs: Even though the URLs - displayed in text output may not be “real†(clickable) - hyperlinks, many X terminals have convenience features for - recognizing URLs and can, for example, present users with - an options to open a URL in a browser with the user clicks on - the URL is a terminal window. And short of those, users with X - terminals can always manually cut and paste the URLs into a web - browser. - Also, note that various “man to html†tools, such as the - widely used man2html (VH-Man2html) - application, automatically mark up URLs with a@href markup - during conversion — resulting in “real†hyperlinks in HTML - output from those tools. - - -To “turn off†numbering of endnotes in the -endnotes list, set man.endnotes.are.numbered -to zero. The endnotes list will -still be displayed; it will just be displayed without the -numbersIt can still make sense to have -the list of endnotes displayed even if you have endnotes numbering turned -off. In that case, your endnotes list basically becomes a “list -of references†without any association with specific text in -your document. This is probably the best option if you find the inline -endnotes numbering obtrusive. Your users will still have access to all the “out of line†-such as URLs for hyperlinks. - - -The default heading for the endnotes list is -NOTES. To change that, set a non-empty -value for the man.endnotes.list.heading -parameter. - -In the case of notesources that are links: Along with the -URL for each link, the endnotes list includes the contents of the -link. The list thus includes only non-empty - -A “non-empty†link is one that looks like -this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/">manpages</ulink> -an “empty link†is on that looks like this: <ulink url="http://docbook.sf.net/snapshot/xsl/doc/manpages/"/> - links. - -Empty links are never included, and never numbered. They are simply -displayed inline, without any numbering. - -In addition, if there are multiple instances of links in a -refentry that have the same URL, the URL is listed only -once. The contents listed for that link in the endnotes list are -the contents of the first link which has that URL. - -If you disable endnotes listing, you should probably also set -man.links.are.underlined to zero (to disable -link underlining). - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.endnotes.list.heading.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.endnotes.list.heading.xml deleted file mode 100644 index fe6545c9339a282b35aa9afe8cabaa9b64210fd2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.endnotes.list.heading.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -man.endnotes.list.heading -string - - -man.endnotes.list.heading -Specifies an alternate name for endnotes list - - - - - - - - -Description - -If the value of the -man.endnotes.are.numbered parameter -and/or the man.endnotes.list.enabled -parameter is non-zero (the defaults for both are non-zero), a -numbered list of endnotes is generated near the end of each man -page. The default heading for the list of endnotes is the -equivalent of the English word NOTES in -the current locale. To cause an alternate heading to be displayed, -set a non-empty value for the -man.endnotes.list.heading parameter — -for example, REFERENCES. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.funcprototype.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.funcprototype.xml deleted file mode 100644 index 67b698ba8a6d9a9fed42eb41a5712f818915bd21..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.funcprototype.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -man.font.funcprototype -string - - -man.font.funcprototype -Specifies font for funcprototype output - - - - - BI - - - -Description - -The man.font.funcprototype parameter -specifies the font for funcprototype output. It -should be a valid roff font name, such as BI or -B. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.funcsynopsisinfo.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.funcsynopsisinfo.xml deleted file mode 100644 index bd7a36fae8b58aaabb4a08db4fc2759343a7dd9c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.funcsynopsisinfo.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -man.font.funcsynopsisinfo -string - - -man.font.funcsynopsisinfo -Specifies font for funcsynopsisinfo output - - - - - B - - - -Description - -The man.font.funcsynopsisinfo parameter -specifies the font for funcsynopsisinfo output. It -should be a valid roff font name, such as B or -I. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.links.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.links.xml deleted file mode 100644 index 0f8a1e0f70af8a78cc84a3f2703061c1639b3b8c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.links.xml +++ /dev/null @@ -1,64 +0,0 @@ - - -man.font.links -string - - -man.font.links -Specifies font for links - - - - -B - - - -Description - -The man.font.links parameter -specifies the font for output of links (ulink instances -and any instances of any element with an xlink:href attribute). - -The value of man.font.links must be - either B or I, or empty. If -the value is empty, no font formatting is applied to links. - -If you set man.endnotes.are.numbered and/or -man.endnotes.list.enabled to zero (disabled), then -you should probably also set an empty value for -man.font.links. But if -man.endnotes.are.numbered is non-zero (enabled), -you should probably keep -man.font.links set to -B or IThe - main purpose of applying a font format to links in most output -formats it to indicate that the formatted text is -“clickableâ€; given that links rendered in man pages are -not “real†hyperlinks that users can click on, it might -seem like there is never a good reason to have font formatting for -link contents in man output. -In fact, if you suppress the -display of inline link references (by setting -man.endnotes.are.numbered to zero), there is no -good reason to apply font formatting to links. However, if -man.endnotes.are.numbered is non-zero, having -font formatting for links (arguably) serves a purpose: It provides -“context†information about exactly what part of the text -is being “annotated†by the link. Depending on how you -mark up your content, that context information may or may not -have value.. - - -Related Parameters - man.endnotes.list.enabled, - man.endnotes.are.numbered - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.table.headings.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.table.headings.xml deleted file mode 100644 index 5056f2b69610662ca87c96ca376109874285d20d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.table.headings.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -man.font.table.headings -string - - -man.font.table.headings -Specifies font for table headings - - - - - B - - - -Description - -The man.font.table.headings parameter -specifies the font for table headings. It should be -a valid roff font, such as B or -I. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.table.title.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.table.title.xml deleted file mode 100644 index a7f2ae9e1a4e41e0255e4f06d7cc9acb74e810c8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.font.table.title.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -man.font.table.title -string - - -man.font.table.title -Specifies font for table headings - - - - - B - - - -Description - -The man.font.table.title parameter -specifies the font for table titles. It should be -a valid roff font, such as B or -I. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.funcsynopsis.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.funcsynopsis.style.xml deleted file mode 100644 index 0597087ba104a7c2e4f1c8af24e69eae5f916c91..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.funcsynopsis.style.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -man.funcsynopsis.style -list -ansi -kr - - -man.funcsynopsis.style -What style of funcsynopsis should be generated? - - -ansi - -Description -If man.funcsynopsis.style is -ansi, ANSI-style function synopses are -generated for a funcsynopsis, otherwise K&R-style -function synopses are generated. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.computer.inlines.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.computer.inlines.xml deleted file mode 100644 index 3e23ade4c21ff8783d2c4b0dee34bdfe5a7a8946..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.computer.inlines.xml +++ /dev/null @@ -1,53 +0,0 @@ - - -man.hyphenate.computer.inlines -boolean - - -man.hyphenate.computer.inlines -Hyphenate computer inlines? - - - - -0 - - -Description - -If zero (the default), hyphenation is suppressed for -computer inlines such as environment variables, -constants, etc. This parameter current affects output of the following -elements: - - - classname - constant - envar - errorcode - option - replaceable - userinput - type - varname - - - - - If hyphenation is already turned off globally (that is, if - man.hyphenate is zero, setting the - man.hyphenate.computer.inlines is not - necessary. - - -If man.hyphenate.computer.inlines is -non-zero, computer inlines will not be treated specially and will be -hyphenated like other words when needed. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.filenames.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.filenames.xml deleted file mode 100644 index 891d6dae181cb02c7cff52846540d67c15667b6b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.filenames.xml +++ /dev/null @@ -1,47 +0,0 @@ - - -man.hyphenate.filenames -boolean - - -man.hyphenate.filenames -Hyphenate filenames? - - - - -0 - - -Description - -If zero (the default), hyphenation is suppressed for -filename output. - - - If hyphenation is already turned off globally (that is, if - man.hyphenate is zero, setting - man.hyphenate.filenames is not - necessary. - - -If man.hyphenate.filenames is non-zero, -filenames will not be treated specially and are subject to hyphenation -just like other words. - - - If you are thinking about setting a non-zero value for - man.hyphenate.filenames in order to make long - filenames/pathnames break across lines, you'd probably be better off - experimenting with setting the - man.break.after.slash parameter first. That - will cause long pathnames to be broken after slashes. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.urls.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.urls.xml deleted file mode 100644 index a64dfa75bb724d47d165203fdcabc9dedad9b786..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.urls.xml +++ /dev/null @@ -1,46 +0,0 @@ - - -man.hyphenate.urls -boolean - - -man.hyphenate.urls -Hyphenate URLs? - - - - -0 - - -Description - -If zero (the default), hyphenation is suppressed for output of -the ulink url attribute. - - - If hyphenation is already turned off globally (that is, if - man.hyphenate is zero, setting - man.hyphenate.urls is not necessary. - - -If man.hyphenate.urls is non-zero, URLs -will not be treated specially and are subject to hyphenation just like -other words. - - - If you are thinking about setting a non-zero value for - man.hyphenate.urls in order to make long - URLs break across lines, you'd probably be better off - experimenting with setting the - man.break.after.slash parameter first. That - will cause long URLs to be broken after slashes. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.xml deleted file mode 100644 index 9198bbbb9e6396a3719ac974af9b2bb62e5ac1e0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.hyphenate.xml +++ /dev/null @@ -1,59 +0,0 @@ - - -man.hyphenate -boolean - - -man.hyphenate -Enable hyphenation? - - - - -0 - - -Description - -If non-zero, hyphenation is enabled. - - -The default value for this parameter is zero because groff is -not particularly smart about how it does hyphenation; it can end up -hyphenating a lot of things that you don't want hyphenated. To -mitigate that, the default behavior of the stylesheets is to suppress -hyphenation of computer inlines, filenames, and URLs. (You can -override the default behavior by setting non-zero values for the -man.hyphenate.urls, -man.hyphenate.filenames, and -man.hyphenate.computer.inlines parameters.) But -the best way is still to just globally disable hyphenation, as the -stylesheets do by default. - -The only good reason to enabled hyphenation is if you have also -enabled justification (which is disabled by default). The reason is -that justified text can look very bad unless you also hyphenate it; to -quote the Hypenation node from the groff info page: - -
    - Since the odds are not great for finding a set of - words, for every output line, which fit nicely on a line without - inserting excessive amounts of space between words, 'gtroff' - hyphenates words so that it can justify lines without inserting too - much space between words. -
    - -So, if you set a non-zero value for the -man.justify parameter (to enable -justification), then you should probably also set a non-zero value for -man.hyphenate (to enable hyphenation).
    -
    - - -
    -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.blurbs.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.blurbs.xml deleted file mode 100644 index bf9bb91ead8417f60d814a1afa5d69f61fc5bdfd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.blurbs.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -man.indent.blurbs -boolean - - -man.indent.blurbs -Adjust indentation of blurbs? - - - - - - - -Description - -If the value of man.indent.blurbs is -non-zero, the width of the left margin for -authorblurb, personblurb, and -contrib output is set to the value of the -man.indent.width parameter -(3n by default). If instead the value of -man.indent.blurbs is zero, the built-in roff -default width (7.2n) is used. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.lists.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.lists.xml deleted file mode 100644 index a2654d093d5f19b153555304e2c2cfe341b9f0fb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.lists.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -man.indent.lists -boolean - - -man.indent.lists -Adjust indentation of lists? - - - - - - - -Description - -If the value of man.indent.lists is -non-zero, the width of the left margin for list items in -itemizedlist, -orderedlist, -variablelist output (and output of some other -lists) is set to the value of the -man.indent.width parameter -(4n by default). If instead the value of -man.indent.lists is zero, the built-in roff -default width (7.2n) is used. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.refsect.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.refsect.xml deleted file mode 100644 index 2865f8c6a439cfbeaedd924d7539b58e3d4dbb63..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.refsect.xml +++ /dev/null @@ -1,70 +0,0 @@ - - -man.indent.refsect -boolean - - -man.indent.refsect -Adjust indentation of refsect* and refsection? - - - - - - - -Description - -If the value of man.indent.refsect is -non-zero, the width of the left margin for -refsect1, refsect2 and -refsect3 contents and titles (and first-level, -second-level, and third-level nested -refsectioninstances) is adjusted by the value of -the man.indent.width parameter. With -man.indent.width set to its default value of -3n, the main results are that: - - - - contents of refsect1 are output with a - left margin of three characters instead the roff default of seven - or eight characters - - - contents of refsect2 are displayed in - console output with a left margin of six characters instead the of - the roff default of seven characters - - - the contents of refsect3 and nested - refsection instances are adjusted - accordingly. - - - -If instead the value of man.indent.refsect is -zero, no margin adjustment is done for refsect* -output. - - - If your content is primarly comprised of - refsect1 and refsect2 content - (or the refsection equivalent) – with few or - no refsect3 or lower nested sections , you may be - able to “conserve†space in your output by setting - man.indent.refsect to a non-zero value. Doing - so will “squeeze†the left margin in such as way as to provide an - additional four characters of “room†per line in - refsect1 output. That extra room may be useful - if, for example, you have many verbatim sections with long lines in - them. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.verbatims.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.verbatims.xml deleted file mode 100644 index 0436c9ed22bd45f55b886e8eb3114f193be4b435..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.verbatims.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -man.indent.verbatims -boolean - - -man.indent.verbatims -Adjust indentation of verbatims? - - - - - - - -Description - -If the value of man.indent.verbatims is -non-zero, the width of the left margin for output of verbatim -environments (programlisting, -screen, and so on) is set to the value of the -man.indent.width parameter -(3n by default). If instead the value of -man.indent.verbatims is zero, the built-in roff -default width (7.2n) is used. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.width.xml deleted file mode 100644 index 2d4496de7b754986ac1a94f508f07e8ade3126f0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.indent.width.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -man.indent.width -length - - -man.indent.width -Specifies width used for adjusted indents - - - - -4 - - - -Description -The man.indent.width parameter specifies -the width used for adjusted indents. The value of -man.indent.width is used for indenting of -lists, verbatims, headings, and elsewhere, depending on whether the -values of certain man.indent.* boolean parameters -are non-zero. - -The value of man.indent.width should -include a valid roff measurement unit (for example, -n or u). The default value of -4n specifies a 4-en width; when viewed on a -console, that amounts to the width of four characters. For details -about roff measurment units, see the Measurements -node in the groff info page. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.justify.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.justify.xml deleted file mode 100644 index 5495d05cb57c43919b71969eed56c025c45820fd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.justify.xml +++ /dev/null @@ -1,52 +0,0 @@ - - -man.justify -boolean - - -man.justify -Justify text to both right and left margins? - - - - -0 - - -Description - -If non-zero, text is justified to both the right and left -margins (or, in roff terminology, "adjusted and filled" to both the -right and left margins). If zero (the default), text is adjusted to -the left margin only -- producing what is traditionally called -"ragged-right" text. - - -The default value for this parameter is zero because justified -text looks good only when it is also hyphenated. Without hyphenation, -excessive amounts of space often end up getting between words, in -order to "pad" lines out to align on the right margin. - -The problem is that groff is not particularly smart about how it -does hyphenation; it can end up hyphenating a lot of things that you -don't want hyphenated. So, disabling both justification and -hyphenation ensures that hyphens won't get inserted where you don't -want to them, and you don't end up with lines containing excessive -amounts of space between words. - -However, if do you decide to set a non-zero value for the -man.justify parameter (to enable -justification), then you should probably also set a non-zero value for -man.hyphenate (to enable hyphenation). - -Yes, these default settings run counter to how most existing man -pages are formatted. But there are some notable exceptions, such as -the perl man pages. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.base.dir.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.base.dir.xml deleted file mode 100644 index 25113d0c2a4f2184c2c9f565556ba1013472bf40..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.base.dir.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -man.output.base.dir -uri - - -man.output.base.dir -Specifies separate output directory - - - -man/ - - -Description - -The man.output.base.dir parameter -specifies the base directory into which man-page files are output. The -man.output.subdirs.enabled parameter controls -whether the files are output in subdirectories within the base -directory. - - - The values of the man.output.base.dir - and man.output.subdirs.enabled parameters are - used only if the value of - man.output.in.separate.dir parameter is - non-zero. If the value of the - man.output.in.separate.dir is zero, man-page - files are not output in a separate directory. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.better.ps.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.better.ps.enabled.xml deleted file mode 100644 index 82d15dd0c0695a08e0ebb157d9e716c50e9c8268..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.better.ps.enabled.xml +++ /dev/null @@ -1,61 +0,0 @@ - - -man.output.better.ps.enabled -boolean - - -man.output.better.ps.enabled -Enable enhanced print/PostScript output? - - - -0 - - -Description - -If the value of the -man.output.better.ps.enabled parameter is -non-zero, certain markup is embedded in each generated man page -such that PostScript output from the man -Tps -command for that page will include a number of enhancements -designed to improve the quality of that output. - -If man.output.better.ps.enabled is -zero (the default), no such markup is embedded in generated man -pages, and no enhancements are included in the PostScript -output generated from those man pages by the man - -Tps command. - - - The enhancements provided by this parameter rely on - features that are specific to groff (GNU troff) and that are - not part of “classic†AT&T troff or any of its - derivatives. Therefore, any man pages you generate with this - parameter enabled will be readable only on systems on which - the groff (GNU troff) program is installed, such as GNU/Linux - systems. The pages will not not be - readable on systems on with the classic troff (AT&T - troff) command is installed. - - -The value of this parameter only affects PostScript output - generated from the man command. It has no - effect on output generated using the FO backend. - - - You can generate PostScript output for any man page by - running the following command: - man FOO -Tps > FOO.ps - You can then generate PDF output by running the following - command: - ps2pdf FOO.ps - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.encoding.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.encoding.xml deleted file mode 100644 index 7154bc87aac9fae5b42bc28bc00ccab81c8be1a7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.encoding.xml +++ /dev/null @@ -1,53 +0,0 @@ - - -man.output.encoding -string - - -man.output.encoding -Encoding used for man-page output - - - - -UTF-8 - - - -Description - -This parameter specifies the encoding to use for files generated -by the manpages stylesheet. Not all processors support specification -of this parameter. - - - If the value of the man.charmap.enabled - parameter is non-zero (the default), keeping the - man.output.encoding parameter at its default - value (UTF-8) or setting it to - UTF-16 does not cause your - man pages to be output in raw UTF-8 or UTF-16 -- because - any Unicode characters for which matches are found in the enabled - character map will be replaced with roff escape sequences before the - final man-page files are generated. - - So if you want to generate "real" UTF-8 man pages, without any - character substitution being performed on your content, you need to - set man.charmap.enabled to zero (which will - completely disable character-map processing). - - You may also need to set - man.charmap.enabled to zero if you want to - output man pages in an encoding other than UTF-8 - or UTF-16. Character-map processing is based on - Unicode character values and may not work with other output - encodings. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.in.separate.dir.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.in.separate.dir.xml deleted file mode 100644 index 1492720b9b6f0bf62557bcc7bf6ec4fcadf5e423..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.in.separate.dir.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -man.output.in.separate.dir -boolean - - -man.output.in.separate.dir -Output man-page files in separate output directory? - - - - - - - - -Description - -If the value of man.output.in.separate.dir -parameter is non-zero, man-page files are output in a separate -directory, specified by the man.output.base.dir -parameter; otherwise, if the value of -man.output.in.separate.dir is zero, man-page files -are not output in a separate directory. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.lang.in.name.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.lang.in.name.enabled.xml deleted file mode 100644 index 1fed3c04dd35a015b51d1a05b7f49b3e8e61b90f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.lang.in.name.enabled.xml +++ /dev/null @@ -1,50 +0,0 @@ - - -man.output.lang.in.name.enabled -boolean - - -man.output.lang.in.name.enabled -Include $LANG value in man-page filename/pathname? - - - - - - - - -Description - - The man.output.lang.in.name.enabled - parameter specifies whether a $lang value is - included in man-page filenames and pathnames. - - If the value of - man.output.lang.in.name.enabled is non-zero, - man-page files are output with the $lang value - included in their filenames or pathnames as follows; - - - - if man.output.subdirs.enabled is - non-zero, each file is output to, e.g., a - man/$lang/man8/foo.8 - pathname - - - if man.output.subdirs.enabled is - zero, each file is output with a - foo.$lang.8 - filename - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.manifest.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.manifest.enabled.xml deleted file mode 100644 index 5da041cd92cbf55262b05672407009695635419c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.manifest.enabled.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - man.output.manifest.enabled - boolean - - - man.output.manifest.enabled - Generate a manifest file? - - - - - - - Description - - If non-zero, a list of filenames for man pages generated by - the stylesheet transformation is written to the file named by the - man.output.manifest.filename parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.manifest.filename.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.manifest.filename.xml deleted file mode 100644 index f514ede9c59e4e673d1fe7cd6da60186e4623a89..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.manifest.filename.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - man.output.manifest.filename - string - - - man.output.manifest.filename - Name of manifest file - - - - MAN.MANIFEST - - - Description - - The man.output.manifest.filename parameter - specifies the name of the file to which the manpages manifest file - is written (if the value of the - man.output.manifest.enabled parameter is - non-zero). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.quietly.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.quietly.xml deleted file mode 100644 index acde7f42f733558b2112b33e8d68f0a09bca0375..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.quietly.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -man.output.quietly -boolean - - -man.output.quietly -Suppress filename messages emitted when generating output? - - - - - - - - -Description - -If zero (the default), for each man-page file created, a message -with the name of the file is emitted. If non-zero, the files are -output "quietly" -- that is, the filename messages are -suppressed. - - - If you are processing a large amount of refentry - content, you may be able to speed up processing significantly by - setting a non-zero value for - man.output.quietly. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.subdirs.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.subdirs.enabled.xml deleted file mode 100644 index 876b94e4d68b797b26be29cbb74f4bc1adf11aeb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.output.subdirs.enabled.xml +++ /dev/null @@ -1,40 +0,0 @@ - - -man.output.subdirs.enabled -boolean - - -man.output.subdirs.enabled -Output man-page files in subdirectories within base output directory? - - - - - - - - -Description - -The man.output.subdirs.enabled parameter -controls whether man-pages files are output in subdirectories within -the base directory specified by the directory specified by the -man.output.base.dir parameter. - - - The values of the man.output.base.dir - and man.output.subdirs.enabled parameters are - used only if the value of - man.output.in.separate.dir parameter is - non-zero. If the value of the - man.output.in.separate.dir is zero, man-page - files are not output in a separate directory. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.segtitle.suppress.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.segtitle.suppress.xml deleted file mode 100644 index e54336d9450af1190d15444a80c7dc82c2cf17f3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.segtitle.suppress.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -man.segtitle.suppress -boolean - - -man.segtitle.suppress -Suppress display of segtitle contents? - - - - - - - -Description - -If the value of man.segtitle.suppress is -non-zero, then display of segtitle contents is -suppressed in output. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.string.subst.map.local.post.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.string.subst.map.local.post.xml deleted file mode 100644 index b12448d827e01fcc0909fc1da825cdc5ba164500..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.string.subst.map.local.post.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -man.string.subst.map.local.post -string - - -man.string.subst.map.local.post -Specifies “local†string substitutions - - - - - - - - -Description - -Use the man.string.subst.map.local.post -parameter to specify any “local†string substitutions to perform over -the entire roff source for each man page after -performing the string substitutions specified by the man.string.subst.map parameter. - -For details about the format of this parameter, see the -documentation for the man.string.subst.map -parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.string.subst.map.local.pre.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.string.subst.map.local.pre.xml deleted file mode 100644 index 6483752fb3547b91d04f37e9c17ae7d9053caab3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.string.subst.map.local.pre.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -man.string.subst.map.local.pre -string - - -man.string.subst.map.local.pre -Specifies “local†string substitutions - - - - - - - - -Description - -Use the man.string.subst.map.local.pre -parameter to specify any “local†string substitutions to perform over -the entire roff source for each man page before -performing the string substitutions specified by the man.string.subst.map parameter. - -For details about the format of this parameter, see the -documentation for the man.string.subst.map -parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.string.subst.map.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.string.subst.map.xml deleted file mode 100644 index 0feed4aa6aad0a3530b00b76f6214b02389b45f5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.string.subst.map.xml +++ /dev/null @@ -1,162 +0,0 @@ - - -man.string.subst.map -rtf - - -man.string.subst.map -Specifies a set of string substitutions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Description - -The man.string.subst.map parameter -contains a map that specifies a set of -string substitutions to perform over the entire roff source for each -man page, either just before generating final man-page output (that -is, before writing man-page files to disk) or, if the value of the -man.charmap.enabled parameter is non-zero, -before applying the roff character map. - -You can use man.string.subst.map as a -“lightweight†character map to perform “essential†substitutions -- -that is, substitutions that are always performed, -even if the value of the man.charmap.enabled -parameter is zero. For example, you can use it to replace quotation -marks or other special characters that are generated by the DocBook -XSL stylesheets for a particular locale setting (as opposed to those -characters that are actually in source XML documents), or to replace -any special characters that may be automatically generated by a -particular customization of the DocBook XSL stylesheets. - - - Do you not change value of the - man.string.subst.map parameter unless you are - sure what you are doing. First consider adding your - string-substitution mappings to either or both of the following - parameters: - - - man.string.subst.map.local.pre - applied before - man.string.subst.map - - - man.string.subst.map.local.post - applied after - man.string.subst.map - - - By default, both of those parameters contain no - string substitutions. They are intended as a means for you to - specify your own local string-substitution mappings. - - If you remove any of default mappings from the value of the - man.string.subst.map parameter, you are - likely to end up with broken output. And be very careful about adding - anything to it; it’s used for doing string substitution over the - entire roff source of each man page – it causes target strings to be - replaced in roff requests and escapes, not just in the visible - contents of the page. - - - - - - Contents of the substitution map - - The string-substitution map contains one or more - ss:substitution elements, each of which has two - attributes: - - - oldstring - - string to replace - - - - newstring - - string with which to replace oldstring - - - - It may also include XML comments (that is, delimited with - "<!--" and "-->"). - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.subheading.divider.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.subheading.divider.enabled.xml deleted file mode 100644 index 1156c5fd0fee711f13d201085c9256e4458c70db..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.subheading.divider.enabled.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -man.subheading.divider.enabled -boolean - - -man.subheading.divider.enabled -Add divider comment to roff source before/after subheadings? - - - - -0 - - - -Description - -If the value of the -man.subheading.divider.enabled parameter is -non-zero, the contents of the -man.subheading.divider parameter are used to -add a "divider" before and after subheadings in the roff -output. The divider is not visisble in the -rendered man page; it is added as a comment, in the source, -simply for the purpose of increasing reability of the source. - -If man.subheading.divider.enabled is zero -(the default), the subheading divider is suppressed. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.subheading.divider.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.subheading.divider.xml deleted file mode 100644 index dbd266963d1fa7af5be790a279e7a75ac3bdf7ef..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.subheading.divider.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -man.subheading.divider -string - - -man.subheading.divider -Specifies string to use as divider comment before/after subheadings - - - - -======================================================================== - - - -Description - -If the value of the -man.subheading.divider.enabled parameter is -non-zero, the contents of the -man.subheading.divider parameter are used to -add a "divider" before and after subheadings in the roff -output. The divider is not visisble in the -rendered man page; it is added as a comment, in the source, -simply for the purpose of increasing reability of the source. - -If man.subheading.divider.enabled is zero -(the default), the subheading divider is suppressed. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.table.footnotes.divider.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.table.footnotes.divider.xml deleted file mode 100644 index 2ad4608b249ec552b694e31be45a21a9504b84f3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.table.footnotes.divider.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -man.table.footnotes.divider -string - - -man.table.footnotes.divider -Specifies divider string that appears before table footnotes - - - - ----- - - - -Description - -In each table that contains footenotes, the string specified by -the man.table.footnotes.divider parameter is -output before the list of footnotes for the table. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra1.suppress.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra1.suppress.xml deleted file mode 100644 index c0241d2e8fa68ac371588023dccb3532eae66385..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra1.suppress.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -man.th.extra1.suppress -boolean - - -man.th.extra1.suppress -Suppress extra1 part of header/footer? - - - - -0 - - -Description - -If the value of man.th.extra1.suppress is -non-zero, then the extra1 part of the -.TH title line header/footer is suppressed. - -The content of the extra1 field is almost -always displayed in the center footer of the page and is, universally, -a date. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra2.max.length.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra2.max.length.xml deleted file mode 100644 index d3513ecd777d80ce851598e03cab354d613324dc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra2.max.length.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -man.th.extra2.max.length -integer - - -man.th.extra2.max.length -Maximum length of extra2 in header/footer - - - - -30 - - - -Description - -Specifies the maximum permitted length of the -extra2 part of the man-page part of the -.TH title line header/footer. If the -extra2 content exceeds the maxiumum specified, it -is truncated down to the maximum permitted length. - -The content of the extra2 field is usually -displayed in the left footer of the page and is typically "source" -data indicating the software system or product that the item -documented in the man page belongs to, often in the form -Name Version; -for example, "GTK+ 1.2" (from the gtk-options(7) -man page). - -The default value for this parameter is reasonable but somewhat -arbitrary. If you are processing pages with long "source" information, -you may want to experiment with changing the value in order to achieve -the correct aesthetic results. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra2.suppress.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra2.suppress.xml deleted file mode 100644 index 0fcd3ed6f04291a361c12f6ccd4b8cd62830a001..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra2.suppress.xml +++ /dev/null @@ -1,44 +0,0 @@ - - -man.th.extra2.suppress -boolean - - -man.th.extra2.suppress -Suppress extra2 part of header/footer? - - - - -0 - - -Description - -If the value of man.th.extra2.suppress is -non-zero, then the extra2 part of the -.TH title line header/footer is suppressed. - -The content of the extra2 field is usually -displayed in the left footer of the page and is typically "source" -data, often in the form -Name Version; -for example, "GTK+ 1.2" (from the gtk-options(7) -man page). - - - You can use the - refentry.source.name.suppress and - refentry.version.suppress parameters to - independently suppress the Name and - Version parts of the - extra2 field. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra3.max.length.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra3.max.length.xml deleted file mode 100644 index 77e55e4c59008ffd8f509cac1eb4651964cae9c2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra3.max.length.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -man.th.extra3.max.length -integer - - -man.th.extra3.max.length -Maximum length of extra3 in header/footer - - - - -30 - - - -Description - -Specifies the maximum permitted length of the -extra3 part of the man-page .TH -title line header/footer. If the extra3 content -exceeds the maxiumum specified, it is truncated down to the maximum -permitted length. - -The content of the extra3 field is usually -displayed in the middle header of the page and is typically a "manual -name"; for example, "GTK+ User's Manual" (from the -gtk-options(7) man page). - -The default value for this parameter is reasonable but somewhat -arbitrary. If you are processing pages with long "manual names" -- or -especially if you are processing pages that have both long "title" -parts (command/function, etc. names) and long -manual names -- you may want to experiment with changing the value in -order to achieve the correct aesthetic results. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra3.suppress.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra3.suppress.xml deleted file mode 100644 index 81d6c0d9deea1178cc9a33f7e68e460d95467cf8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.extra3.suppress.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -man.th.extra3.suppress -boolean - - -man.th.extra3.suppress -Suppress extra3 part of header/footer? - - - - -0 - - -Description - -If the value of man.th.extra3.suppress is -non-zero, then the extra3 part of the -.TH title line header/footer is -suppressed. - -The content of the extra3 field is usually -displayed in the middle header of the page and is typically a "manual -name"; for example, "GTK+ User's Manual" (from the -gtk-options(7) man page). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.title.max.length.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.title.max.length.xml deleted file mode 100644 index 7fdf0bfca0b5a8cbb09292b6949c27966e29d3dd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/man.th.title.max.length.xml +++ /dev/null @@ -1,63 +0,0 @@ - - -man.th.title.max.length -integer - - -man.th.title.max.length -Maximum length of title in header/footer - - - - -20 - - - -Description - -Specifies the maximum permitted length of the title part of the -man-page .TH title line header/footer. If the title -exceeds the maxiumum specified, it is truncated down to the maximum -permitted length. - -Details - - -Every man page generated using the DocBook stylesheets has a -title line, specified using the TH roff -macro. Within that title line, there is always, at a minimum, a title, -followed by a section value (representing a man "section" -- usually -just a number). - -The title and section are displayed, together, in the visible -header of each page. Where in the header they are displayed depends on -OS the man page is viewed on, and on what version of nroff/groff/man -is used for viewing the page. But, at a minimum and across all -systems, the title and section are displayed on the right-hand column -of the header. On many systems -- those with a modern groff, including -Linux systems -- they are displayed twice: both in the left and right -columns of the header. - -So if the length of the title exceeds a certain percentage of -the column width in which the page is viewed, the left and right -titles can end up overlapping, making them unreadable, or breaking to -another line, which doesn't look particularly good. - -So the stylesheets provide the -man.th.title.max.length parameter as a means -for truncating titles that exceed the maximum length that can be -viewing properly in a page header. - -The default value is reasonable but somewhat arbitrary. If you -have pages with long titles, you may want to experiment with changing -the value in order to achieve the correct aesthetic results. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/manifest.in.base.dir.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/manifest.in.base.dir.xml deleted file mode 100644 index d00276750b4613cfaa3b11523bc79668da68f82c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/manifest.in.base.dir.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -manifest.in.base.dir -boolean - - -manifest.in.base.dir -Should the manifest file be written into base.dir? - - - - - - - - -Description - -If non-zero, the manifest file as well as project files for HTML Help and -Eclipse Help are written into base.dir instead -of the current directory. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/manifest.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/manifest.xml deleted file mode 100644 index 96d092a8cb09746a88001a681ffd24580e4191d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/manifest.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - manifest - string - - - manifest - Name of manifest file - - - - - HTML.manifest - - - - Description - - The name of the file to which a manifest is written (if the - value of the generate.manifest parameter - is non-zero). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/manual.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/manual.toc.xml deleted file mode 100644 index 7a640c7a34f4545568672acce18c1c35fe209dee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/manual.toc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -manual.toc -string - - -manual.toc -An explicit TOC to be used for the TOC - - - - - - - - -Description - -The manual.toc identifies an explicit TOC that -will be used for building the printed TOC. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.float.type.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.float.type.xml deleted file mode 100644 index 0b34230b7582b0936a8afa2426fe96f67ec6b198..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.float.type.xml +++ /dev/null @@ -1,77 +0,0 @@ - - -margin.note.float.type -list -none -before -left -start -right -end -inside -outside - - -margin.note.float.type -Select type of float for margin note customizations - - - - -none - - - -Description - -Selects the type of float for margin notes. -DocBook does not define a margin note element, so this -feature must be implemented as a customization of the stylesheet. -See margin.note.properties for -an example. - - - -If margin.note.float.type is -none, then -no float is used. - - - -If margin.note.float.type is -before, then -the float appears at the top of the page. On some processors, -that may be the next page rather than the current page. - - - -If margin.note.float.type is -left or -start, then -a left side float is used. - - - -If margin.note.float.type is -right or -end, then -a right side float is used. - - - -If your XSL-FO processor supports floats positioned on the -inside or -outside -of double-sided pages, then you have those two -options for side floats as well. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.properties.xml deleted file mode 100644 index 02dc20e500b314e046d000febb796db0dc510781..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.properties.xml +++ /dev/null @@ -1,54 +0,0 @@ - - -margin.note.properties -attribute set - - -margin.note.properties -Attribute set for margin.note properties - - - - - - 90% - start - - - - -Description - -The styling for margin notes. -By default, margin notes are not implemented for any -element. A stylesheet customization is needed to make -use of this attribute-set. - -You can use a template named floater -to create the customization. -That template can create side floats by specifying the -content and characteristics as template parameters. - - -For example: -<xsl:template match="para[@role='marginnote']"> - <xsl:call-template name="floater"> - <xsl:with-param name="position"> - <xsl:value-of select="$margin.note.float.type"/> - </xsl:with-param> - <xsl:with-param name="width"> - <xsl:value-of select="$margin.note.width"/> - </xsl:with-param> - <xsl:with-param name="content"> - <xsl:apply-imports/> - </xsl:with-param> - </xsl:call-template> -</xsl:template> - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.title.properties.xml deleted file mode 100644 index 84399bbe92677025ad1bee6c6e8d3308e06eede6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.title.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -margin.note.title.properties -attribute set - - -margin.note.title.properties -Attribute set for margin note titles - - - - - - bold - false - start - always - - - - -Description - -The styling for margin note titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.width.xml deleted file mode 100644 index 3ee0aa4e78eb64548bda73db1e09be3f054a3328..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/margin.note.width.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -margin.note.width -length - - -margin.note.width -Set the default width for margin notes - - - - -1in - - - -Description - -Sets the default width for margin notes when used as a side -float. The width determines the degree to which the margin note block -intrudes into the text area. - -If margin.note.float.type is -before or -none, then -this parameter is ignored. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/marker.section.level.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/marker.section.level.xml deleted file mode 100644 index 70bd4fdcb4ac4a493bf7cd0bbc847cd2e66bd87a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/marker.section.level.xml +++ /dev/null @@ -1,50 +0,0 @@ - - -marker.section.level -integer - - -marker.section.level -Control depth of sections shown in running headers or footers - - - - -2 - - - -Description - -The marker.section.level parameter -controls the depth of section levels that may be displayed -in running headers and footers. For example, if the value -is 2 (the default), then titles from sect1 and -sect2 or equivalent section -elements are candidates for use in running headers and -footers. - -Each candidate title is marked in the FO output with a -<fo:marker marker-class-name="section.head.marker"> -element. - -In order for such titles to appear in headers -or footers, the header.content -or footer.content template -must be customized to retrieve the marker using -an output element such as: - - -<fo:retrieve-marker retrieve-class-name="section.head.marker" - retrieve-position="first-including-carryover" - retrieve-boundary="page-sequence"/> - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/menuchoice.menu.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/menuchoice.menu.separator.xml deleted file mode 100644 index cf142e216faf8731fd06b35cc010b9bda10967cf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/menuchoice.menu.separator.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -menuchoice.menu.separator -string - - -menuchoice.menu.separator -Separator between items of a menuchoice -with guimenuitem or -guisubmenu - - - - - → - - - -Description - -Separator used to connect items of a menuchoice with -guimenuitem or guisubmenu. Other elements -are linked with menuchoice.separator. - -The default value is &#x2192;, which is the -&rarr; (right arrow) character entity. -The current FOP (0.20.5) requires setting the font-family -explicitly. - -The default value also includes spaces around the arrow, -which will allow a line to break. Replace the spaces with -&#xA0; (nonbreaking space) if you don't want those -spaces to break. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/menuchoice.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/menuchoice.separator.xml deleted file mode 100644 index 3034f253b5bb59ae8204fe53985f6ef189760db2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/menuchoice.separator.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -menuchoice.separator -string - - -menuchoice.separator -Separator between items of a menuchoice -other than guimenuitem and -guisubmenu - - - - -+ - - - -Description - -Separator used to connect items of a menuchoice other -than guimenuitem and guisubmenu. The latter -elements are linked with menuchoice.menu.separator. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/minus.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/minus.image.xml deleted file mode 100644 index ea86e23aa68a3a9f13abe04788bd797fba069f63..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/minus.image.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -minus.image -filename - - -minus.image -Minus image - - - - -toc/open.png - - - -Description - -Specifies the filename of the minus image; the image used in a -dynamic ToC to indicate that a section -can be collapsed. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.font.family.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.font.family.xml deleted file mode 100644 index e91548b6a7dc846dc2608586e942a6bfba59afb1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.font.family.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -monospace.font.family -string - - -monospace.font.family -The default font family for monospace environments - - - - -monospace - - - -Description - -The monospace font family is used for verbatim environments -(program listings, screens, etc.). - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.properties.xml deleted file mode 100644 index 0a8425b52ec67e6e190d2efe2dfb6bf14d42127d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.properties.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -monospace.properties -attribute set - - -monospace.properties -Properties of monospaced content - - - - - - - - - - - - -Description - -Specifies the font name for monospaced output. This property set -used to set the font-size as well, but that doesn't work very well -when different fonts are used (as they are in titles and paragraphs, -for example). - -If you want to set the font-size in a customization layer, it's -probably going to be more appropriate to set font-size-adjust, if your -formatter supports it. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.verbatim.font.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.verbatim.font.width.xml deleted file mode 100644 index 88b88dce46051a889793650949559cc36f34fbba..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.verbatim.font.width.xml +++ /dev/null @@ -1,40 +0,0 @@ - - -monospace.verbatim.font.width -length - - -monospace.verbatim.font.width -Width of a single monospace font character - - - - -0.60em - - - -Description - -Specifies with em units the width of a single character -of the monospace font. The default value is 0.6em. - -This parameter is only used when a screen -or programlisting element has a -width attribute, which is -expressed as a plain integer to indicate the maximum character count -of each line. -To convert this character count to an actual maximum width -measurement, the width of the font characters must be provided. -Different monospace fonts have different character width, -so this parameter should be adjusted to fit the -monospace font being used. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.verbatim.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.verbatim.properties.xml deleted file mode 100644 index 3d7ca3dfaa8d6255b19b8407d1e879ec5afeb647..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/monospace.verbatim.properties.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -monospace.verbatim.properties -attribute set - - -monospace.verbatim.properties -What font and size do you want for monospaced content? - - - - - - start - no-wrap - - - -Description -Specify the font name and size you want for monospaced output - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.bottom.bgcolor.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.bottom.bgcolor.xml deleted file mode 100644 index f0667d71ba187c66edfdbb125b18b3845109f2de..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.bottom.bgcolor.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -multiframe.bottom.bgcolor -color - - -multiframe.bottom.bgcolor -Background color for bottom navigation frame - - - - -white - - - -Description - -Specifies the background color of the bottom navigation frame when -multiframe is enabled. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.navigation.height.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.navigation.height.xml deleted file mode 100644 index 06dbc1c233e48a900f2269bf16bc5303472d859e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.navigation.height.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -multiframe.navigation.height -length - - -multiframe.navigation.height -Height of navigation frames - - - - -40 - - - -Description - -Specifies the height of the navigation frames in pixels when -multiframe is enabled. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.top.bgcolor.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.top.bgcolor.xml deleted file mode 100644 index 4814fc89d57cc768215ae26285a9f660e00d0ec2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.top.bgcolor.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -multiframe.top.bgcolor -color - - -multiframe.top.bgcolor -Background color for top navigation frame - - - - -white - - - -Description - -Specifies the background color of the top navigation frame when -multiframe is enabled. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.xml deleted file mode 100644 index b4fbf370fea0620f9baadf8870e6c2227817d744..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/multiframe.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -multiframe -boolean - - -multiframe -Use multiple frames for slide bodies? - - - - - - - - -Description - -If non-zero, multiple frames are used for the body of each -slide. This is one way of forcing the slide navigation elements to -appear in constant locations. The other way is with overlays. The overlay and -multiframe parameters are mutually -exclusive. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nav.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nav.separator.xml deleted file mode 100644 index e3695f9417c6b4a66fb924698af06a08ed1b84a9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nav.separator.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -nav.separator -boolean - - -nav.separator -Output separator between navigation and body? - - - - - - - - -Description - -If non-zero, a separator (<HR>) is -added between the navigation links and the content of each slide. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nav.table.summary.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nav.table.summary.xml deleted file mode 100644 index 1c1559b2100879aee0313226d05b715fc74b4486..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nav.table.summary.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -nav.table.summary -string - - -nav.table.summary -HTML Table summary attribute value for navigation tables - - - - -Navigation - - - -Description -The value of this parameter is used as the value of the table -summary attribute for the navigation table. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navbgcolor.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navbgcolor.xml deleted file mode 100644 index c6fcececb20363a3f0692bfa847406662465843e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navbgcolor.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -navbgcolor -color - - -navbgcolor -The background color of the navigation TOC - - - - -#4080FF - - - -Description -The background color of the navigation TOC. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navbodywidth.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navbodywidth.xml deleted file mode 100644 index b93cf821f28fce10280491d86c6fcf865c22bcf3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navbodywidth.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -navbodywidth -length - - -navbodywidth -Specifies the width of the navigation table body - - - - - - - - -Description -The width of the body column. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.graphics.extension.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.graphics.extension.xml deleted file mode 100644 index 416e0c44a8de42381346f3af47b307ab416e93d6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.graphics.extension.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -navig.graphics.extension -string - - -navig.graphics.extension -Extension for navigational graphics - - - - -.gif - - - -Description - -Sets the filename extension to use on navigational graphics used -in the headers and footers of chunked HTML. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.graphics.path.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.graphics.path.xml deleted file mode 100644 index 373208e7624a21486a29c4a57a7bf5c718b2c720..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.graphics.path.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -navig.graphics.path -string - - -navig.graphics.path -Path to navigational graphics - - - - -images/ - - - -Description - -Sets the path, probably relative to the directory where the HTML -files are created, to the navigational graphics used in the -headers and footers of chunked HTML. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.graphics.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.graphics.xml deleted file mode 100644 index 03e28b61ff15203cfcb741f296d89b4ff4f444be..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.graphics.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -navig.graphics -boolean - - -navig.graphics -Use graphics in navigational headers and footers? - - - - - - - - -Description - -If non-zero, the navigational headers and footers in chunked -HTML are presented in an alternate style that uses graphical icons for -Next, Previous, Up, and Home. Default graphics are provided in the -distribution. If zero, text is used instead of graphics. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.showtitles.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.showtitles.xml deleted file mode 100644 index a4eb3ff4783be68126dbec88d3b471370055dba1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navig.showtitles.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -navig.showtitles -boolean - - -navig.showtitles -Display titles in HTML headers and footers? - - - -1 - - -Description - -If non-zero, -the headers and footers of chunked HTML -display the titles of the next and previous chunks, -along with the words 'Next' and 'Previous' (or the -equivalent graphical icons if navig.graphics is true). -If false (zero), then only the words 'Next' and 'Previous' -(or the icons) are displayed. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navtocwidth.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navtocwidth.xml deleted file mode 100644 index 0d21ae03bad88938b0d0439a3125403f13a980e6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/navtocwidth.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -navtocwidth -length - - -navtocwidth -Specifies the width of the navigation table TOC - - - - -220 - - - -Description -The width, in pixels, of the navigation column. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/next.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/next.image.xml deleted file mode 100644 index 4dbd60a99e55b3fef6b437ef65718d4adad47758..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/next.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -next.image -filename - - -next.image -Right-arrow image - - - - -active/nav-next.png - - - -Description - -Specifies the filename of the right-pointing navigation arrow. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.home.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.home.image.xml deleted file mode 100644 index 2f4ecd867e24aa9c9547ab5fe5cda1c734b3a653..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.home.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -no.home.image -filename - - -no.home.image -Inactive home image - - - - -inactive/nav-home.png - - - -Description - -Specifies the filename of the inactive home navigation icon. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.next.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.next.image.xml deleted file mode 100644 index 966fe2647c68d611df6ebaa033ad1464d7e1b790..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.next.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -no.next.image -filename - - -no.next.image -Inactive right-arrow image - - - - -inactive/nav-next.png - - - -Description - -Specifies the filename of the inactive right-pointing navigation arrow. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.prev.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.prev.image.xml deleted file mode 100644 index 763223112410e83d4ac3fd3f7fc9a063514f6834..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.prev.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -no.prev.image -filename - - -no.prev.image -Inactive left-arrow image - - - - -inactive/nav-prev.png - - - -Description - -Specifies the filename of the inactive left-pointing navigation arrow. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.toc.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.toc.image.xml deleted file mode 100644 index 43e9eea95d2adc6e42cf829e8f630e0de1f43696..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.toc.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -no.toc.image -filename - - -no.toc.image -Inactive ToC image - - - - -inactive/nav-toc.png - - - -Description - -Specifies the filename of the inactive ToC navigation icon. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.up.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.up.image.xml deleted file mode 100644 index a19a34d00a8666eaeab47c31fc65b21ec77435e3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/no.up.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -no.up.image -filename - - -no.up.image -Inactive up-arrow image - - - - -inactive/nav-up.png - - - -Description - -Specifies the filename of the inactive upward-pointing navigation arrow. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nominal.image.depth.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nominal.image.depth.xml deleted file mode 100644 index a4e615f02dfdc90ede1afaa29620ab55e3822eb4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nominal.image.depth.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -nominal.image.depth -length - - -nominal.image.depth -Nominal image depth - - - - - - - - -Description - -See nominal.image.width. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nominal.image.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nominal.image.width.xml deleted file mode 100644 index bfa989a2c87241c42b3eb127af76e685ef019ec0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nominal.image.width.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -nominal.image.width -length - - -nominal.image.width -The nominal image width - - - - - - - - -Description - -Graphic widths expressed as a percentage are problematic. In the -following discussion, we speak of width and contentwidth, but -the same issues apply to depth and contentdepth. - -A width of 50% means "half of the available space for the image." -That's fine. But note that in HTML, this is a dynamic property and -the image size will vary if the browser window is resized. - -A contentwidth of 50% means "half of the actual image width". -But what does that mean if the stylesheets cannot assess the image's -actual size? Treating this as a width of 50% is one possibility, but -it produces behavior (dynamic scaling) that seems entirely out of -character with the meaning. - -Instead, the stylesheets define a -nominal.image.width and convert percentages to -actual values based on that nominal size. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nominal.table.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nominal.table.width.xml deleted file mode 100644 index f5dcfb933e00f2c9fb5c417fe976bc106590c9d6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nominal.table.width.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -nominal.table.width -length - - -nominal.table.width -The (absolute) nominal width of tables - - - - -6in - - - -Description - -In order to convert CALS column widths into HTML column widths, it -is sometimes necessary to have an absolute table width to use for conversion -of mixed absolute and relative widths. This value must be an absolute -length (not a percentage). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nongraphical.admonition.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nongraphical.admonition.properties.xml deleted file mode 100644 index ba8a06a5ee4c52ad7d2e5fb7357a6b65ab1acfc3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/nongraphical.admonition.properties.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -nongraphical.admonition.properties -attribute set - - -nongraphical.admonition.properties -To add properties to the outer block of a nongraphical admonition. - - - - - 0.8em - 1em - 1.2em - 0.25in - 0.25in - - - -Description -These properties are added to the outer block containing the -entire nongraphical admonition, including its title. -It is used when the parameter -admon.graphics is set to zero. -Use this attribute-set to set the space above and below, -and any indent for the whole admonition. - -In addition to these properties, a nongraphical admonition -also applies the admonition.title.properties -attribute-set to the title, and the -admonition.properties attribute-set -to the rest of the content. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/normal.para.spacing.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/normal.para.spacing.xml deleted file mode 100644 index bb2a6c0998ff9655d486008b14b4c3d90f411c48..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/normal.para.spacing.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -normal.para.spacing -attribute set - - -normal.para.spacing -What space do you want between normal paragraphs - - - - - 1em - 0.8em - 1.2em - - -Description -Specify the spacing required between normal paragraphs - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.base.uri.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.base.uri.xml deleted file mode 100644 index d88dd62d201587fee63faccbe38480d18db1aec3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.base.uri.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -olink.base.uri -uri - - -olink.base.uri -Base URI used in olink hrefs - - - - - -Description - -When cross reference data is collected for resolving olinks, it -may be necessary to prepend a base URI to each target's href. This -parameter lets you set that base URI when cross reference data is -collected. This feature is needed when you want to link to a document -that is processed without chunking. The output filename for such a -document is not known to the XSL stylesheet; the only target -information consists of fragment identifiers such as -#idref. To enable the resolution of olinks between -documents, you should pass the name of the HTML output file as the -value of this parameter. Then the hrefs recorded in the cross -reference data collection look like -outfile.html#idref, which can be reached as links -from other documents. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.debug.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.debug.xml deleted file mode 100644 index e49a176222c6fbc646cfcf30d7cc274a85d8e3f5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.debug.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -olink.debug -boolean - - -olink.debug -Turn on debugging messages for olinks - - - - - - - - -Description - -If non-zero, then each olink will generate several -messages about how it is being resolved during processing. -This is useful when an olink does not resolve properly -and the standard error messages are not sufficient to -find the problem. - - -You may need to read through the olink XSL templates -to understand the context for some of the debug messages. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.doctitle.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.doctitle.xml deleted file mode 100644 index 356347da55354ee90862713b14c4bdef2f52cecd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.doctitle.xml +++ /dev/null @@ -1,146 +0,0 @@ - - -olink.doctitle -list -no -yes -maybe - - -olink.doctitle -show the document title for external olinks? - - - -no - - -Description - -When olinks between documents are resolved, the generated text -may not make it clear that the reference is to another document. -It is possible for the stylesheets to append the other document's -title to external olinks. For this to happen, two parameters must -be set. - - -This olink.doctitle parameter -should be set to either yes or maybe -to enable this feature. - - - -And you should also set the current.docid -parameter to the document id for the document currently -being processed for output. - - - - - -Then if an olink's targetdoc id differs from -the current.docid value, the stylesheet knows -that it is a reference to another document and can -append the target document's -title to the generated olink text. - -The text for the target document's title is copied from the -olink database from the ttl element -of the top-level div for that document. -If that ttl element is missing or empty, -no title is output. - - -The supported values for olink.doctitle are: - - - -yes - - -Always insert the title to the target document if it is not -the current document. - - - - -no - - -Never insert the title to the target document, even if requested -in an xrefstyle attribute. - - - - -maybe - - -Only insert the title to the target document, if requested -in an xrefstyle attribute. - - - - -An xrefstyle attribute -may override the global setting for individual olinks. -The following values are supported in an -xrefstyle -attribute using the select: syntax: - - - - -docname - - -Insert the target document name for this olink using the -docname gentext template, but only -if the value of olink.doctitle -is not no. - - - - -docnamelong - - -Insert the target document name for this olink using the -docnamelong gentext template, but only -if the value of olink.doctitle -is not no. - - - - -nodocname - - -Omit the target document name even if -the value of olink.doctitle -is yes. - - - - -Another way of inserting the target document name -for a single olink is to employ an -xrefstyle -attribute using the template: syntax. -The %o placeholder (the letter o, not zero) -in such a template -will be filled in with the target document's title when it is processed. -This will occur regardless of -the value of olink.doctitle. - -Note that prior to version 1.66 of the XSL stylesheets, -the allowed values for this parameter were 0 and 1. Those -values are still supported and mapped to 'no' and 'yes', respectively. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.fragid.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.fragid.xml deleted file mode 100644 index 32580383a654976cebf0f44af33245dbaf4b735b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.fragid.xml +++ /dev/null @@ -1,23 +0,0 @@ - - -olink.fragid -string - - -olink.fragid -Names the fragment identifier portion of an OLink resolver query - - - -fragid= - - -Description -The fragment identifier portion of an olink target. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.lang.fallback.sequence.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.lang.fallback.sequence.xml deleted file mode 100644 index 7d3d8113bf31ad3e4002eb1d9e17c8fb1493703a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.lang.fallback.sequence.xml +++ /dev/null @@ -1,83 +0,0 @@ - - -olink.lang.fallback.sequence -string - - -olink.lang.fallback.sequence -look up translated documents if olink not found? - - - - - - -Description - - -This parameter defines a list of lang values -to search among to resolve olinks. - - -Normally an olink tries to resolve to a document in the same -language as the olink itself. The language of an olink -is determined by its nearest ancestor element with a -lang attribute, otherwise the -value of the l10n.gentext.default.lang -parameter. - - -An olink database can contain target data for the same -document in multiple languages. Each set of data has the -same value for the targetdoc attribute in -the document element in the database, but with a -different lang attribute value. - - -When an olink is being resolved, the target is first -sought in the document with the same language as the olink. -If no match is found there, then this parameter is consulted -for additional languages to try. - -The olink.lang.fallback.sequence -must be a whitespace separated list of lang values to -try. The first one with a match in the olink database is used. -The default value is empty. - -For example, a document might be written in German -and contain an olink with -targetdoc="adminguide". -When the document is processed, the processor -first looks for a target dataset in the -olink database starting with: - -<document targetdoc="adminguide" lang="de">. - - -If there is no such element, then the -olink.lang.fallback.sequence -parameter is consulted. -If its value is, for example, fr en, then the processor next -looks for targetdoc="adminguide" lang="fr", and -then for targetdoc="adminguide" lang="en". -If there is still no match, it looks for -targetdoc="adminguide" with no -lang attribute. - - -This parameter is useful when a set of documents is only -partially translated, or is in the process of being translated. -If a target of an olink has not yet been translated, then this -parameter permits the processor to look for the document in -other languages. This assumes the reader would rather have -a link to a document in a different language than to have -a broken link. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.outline.ext.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.outline.ext.xml deleted file mode 100644 index 2de2fe2d570899e1197116216daede829ee2d11f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.outline.ext.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -olink.outline.ext -string - - -olink.outline.ext -The extension of OLink outline files - - - - -.olink - - - -Description - -The extension to be expected for OLink outline files -Bob has this parameter as dead. Please don't use - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.properties.xml deleted file mode 100644 index b76657e7ce1a653a706ef44b9185abb31fb259e4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.properties.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -olink.properties -attribute set - - -olink.properties -Properties associated with the cross-reference -text of an olink. - - - - - - replace - - - - -Description - -This attribute set is applied to the -fo:basic-link element of an olink. It is not applied to the -optional page number or optional title of the external -document. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.pubid.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.pubid.xml deleted file mode 100644 index 4f0b50c6c450d8360290e4432d152cac59986b81..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.pubid.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -olink.pubid -string - - -olink.pubid -Names the public identifier portion of an OLink resolver query - - - - -pubid - - - -Description - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.resolver.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.resolver.xml deleted file mode 100644 index fa7d471ba405ad16b601b9089d5ac37d404d0ebd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.resolver.xml +++ /dev/null @@ -1,23 +0,0 @@ - - -olink.resolver -string - - -olink.resolver -The root name of the OLink resolver (usually a script) - - - - /cgi-bin/olink - - -Description -FIXME: - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.sysid.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.sysid.xml deleted file mode 100644 index 6d4542f5d8d119a8f942cad42f7c8f1a959a677b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/olink.sysid.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -olink.sysid -string - - -olink.sysid -Names the system identifier portion of an OLink resolver query - - - - -sysid - - - -Description - -FIXME - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/orderedlist.label.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/orderedlist.label.properties.xml deleted file mode 100644 index 39b0432952f6736d7ae23ecd9f4fdb239bb046b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/orderedlist.label.properties.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -orderedlist.label.properties -attribute set - - -orderedlist.label.properties -Properties that apply to each label inside ordered list. - - - - - - -Description -Properties that apply to each label inside ordered list. E.g.: -<xsl:attribute-set name="orderedlist.label.properties"> - <xsl:attribute name="text-align">right</xsl:attribute> -</xsl:attribute-set> - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/orderedlist.label.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/orderedlist.label.width.xml deleted file mode 100644 index 18c8fa84cc7db9a8344d6663e2cbcbf36cfa6508..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/orderedlist.label.width.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -orderedlist.label.width -length - - -orderedlist.label.width -The default width of the label (number) in an ordered list. - - - - -1.2em - - - -Description -Specifies the default width of the label (usually a number or -sequence of numbers) in an ordered list. You can override the default -value on any particular list with the “dbfo†processing instruction -using the “label-width†pseudoattribute. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/orderedlist.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/orderedlist.properties.xml deleted file mode 100644 index 59061cb3da4344e079118146dd9f86db964ea3ca..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/orderedlist.properties.xml +++ /dev/null @@ -1,24 +0,0 @@ - - -orderedlist.properties -attribute set - - -orderedlist.properties -Properties that apply to each list-block generated by orderedlist. - - - - - 2em - - -Description -Properties that apply to each fo:list-block generated by orderedlist. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/othercredit.like.author.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/othercredit.like.author.enabled.xml deleted file mode 100644 index 2e789dd09e7d5c0e0cd2c141a6cbe54708936f97..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/othercredit.like.author.enabled.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -othercredit.like.author.enabled -boolean - - -othercredit.like.author.enabled -Display othercredit in same style as author? - - - -0 - - -Description - -If non-zero, output of the -othercredit element on titlepages is displayed in -the same style as author and -editor output. If zero then -othercredit output is displayed using a style -different than that of author and -editor. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/output-root.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/output-root.xml deleted file mode 100644 index d37b054c72f51aa3db3591dcab050a71e0b15200..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/output-root.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -output-root -filename - - -output-root -Specifies the root directory of the website - - - - -. - - - -Description -When using the XSLT processor to manage dependencies and construct -the website, this parameter can be used to indicate the root directory -where the resulting pages are placed. -Only applies when XSLT-based chunking is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/output.indent.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/output.indent.xml deleted file mode 100644 index 40406d7a07012cd898d228fe28c602c09a09f923..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/output.indent.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -output.indent -list -no -yes - - -output.indent -Indent output? - - - - -no - - - -Description - -Specifies the setting of the indent -parameter on the HTML slides. For more information, see the discussion -of the xsl:output element in the XSLT specification. -Select from yes or no. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/overlay.js.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/overlay.js.xml deleted file mode 100644 index 162f87aa36850dba1f9f8fc913d65970ad596f3b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/overlay.js.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -overlay.js -filename - - -overlay.js -Overlay JavaScript file - - - - -overlay.js - - - -Description - -Specifies the filename of the overlay JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/overlay.logo.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/overlay.logo.xml deleted file mode 100644 index e740771185ad37f61e79f8311a2bea7f3b6e51d9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/overlay.logo.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -overlay.logo -uri - - -overlay.logo -Logo to overlay on ToC frame - - - - -http://docbook.sourceforge.net/release/buttons/slides-1.png - - - -Description - -If this URI is non-empty, JavaScript is used to overlay the -specified image on the ToC frame. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/overlay.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/overlay.xml deleted file mode 100644 index f955b23a77e9061785e52db0bb1657cf8cd47695..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/overlay.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -overlay -boolean - - -overlay -Overlay footer navigation? - - - - - - - - -Description - -If non-zero, JavaScript is added to the slides to make the -bottom navigation appear at the bottom of each page. This option and -multiframe are mutually exclusive. - -If this parameter is zero, the bottom navigation simply appears -below the content of each slide. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.height.portrait.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.height.portrait.xml deleted file mode 100644 index 0dee73eef30eac28f8fe409b2438a8f367dd3717..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.height.portrait.xml +++ /dev/null @@ -1,69 +0,0 @@ - - -page.height.portrait -length - - -page.height.portrait -Specify the physical size of the long edge of the page - - - - - - 210mm - 11in - 8.5in - 2378mm - 1682mm - 1189mm - 841mm - 594mm - 420mm - 297mm - 210mm - 148mm - 105mm - 74mm - 52mm - 37mm - 1414mm - 1000mm - 707mm - 500mm - 353mm - 250mm - 176mm - 125mm - 88mm - 62mm - 44mm - 1297mm - 917mm - 648mm - 458mm - 324mm - 229mm - 162mm - 114mm - 81mm - 57mm - 40mm - 11in - - - - -Description - -The portrait page height is the length of the long -edge of the physical page. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.height.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.height.xml deleted file mode 100644 index 96e32c0e5664e7a52a96e495322db0ca66184a12..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.height.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -page.height -length - - -page.height -The height of the physical page - - - - - - - - - - - - - - - -Description - -The page height is generally calculated from the -paper.type and -page.orientation parameters. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.bottom.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.bottom.xml deleted file mode 100644 index e1877f3ab58d8fc1f21342baee729eedffe2bdc4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.bottom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -page.margin.bottom -length - - -page.margin.bottom -The bottom margin of the page - - - - -0.5in - - - -Description - -The bottom page margin is the distance from the bottom of the region-after -to the physical bottom of the page. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.inner.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.inner.xml deleted file mode 100644 index 97782ba40ba8b252908dd77d1198d9da57cddbab..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.inner.xml +++ /dev/null @@ -1,56 +0,0 @@ - - -page.margin.inner -length - - -page.margin.inner -The inner page margin - - - - - - 1.25in - 1in - - - - -Description - -The inner page margin is the distance from bound edge of the -page to the first column of text. - -The inner page margin is the distance from bound edge of the -page to the outer edge of the first column of text. - -In left-to-right text direction, -this is the left margin of recto (front side) pages. -For single-sided output, it is the left margin -of all pages. - -In right-to-left text direction, -this is the right margin of recto pages. -For single-sided output, this is the -right margin of all pages. - - -Current versions (at least as of version 4.13) -of the XEP XSL-FO processor do not -correctly handle these margin settings for documents -with right-to-left text direction. -The workaround in that situation is to reverse -the values for page.margin.inner -and page.margin.outer, until -this bug is fixed by RenderX. It does not affect documents -with left-to-right text direction. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.outer.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.outer.xml deleted file mode 100644 index 61dfeb8e44d9cfa660f163b82b53852561ade783..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.outer.xml +++ /dev/null @@ -1,53 +0,0 @@ - - -page.margin.outer -length - - -page.margin.outer -The outer page margin - - - - - - 0.75in - 1in - - - - -Description - -The outer page margin is the distance from non-bound edge of the -page to the outer edge of the last column of text. - -In left-to-right text direction, -this is the right margin of recto (front side) pages. -For single-sided output, it is the right margin -of all pages. - -In right-to-left text direction, -this is the left margin of recto pages. -For single-sided output, this is the -left margin of all pages. - - -Current versions (at least as of version 4.13) -of the XEP XSL-FO processor do not -correctly handle these margin settings for documents -with right-to-left text direction. -The workaround in that situation is to reverse -the values for page.margin.inner -and page.margin.outer, until -this bug is fixed by RenderX. It does not affect documents -with left-to-right text direction. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.top.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.top.xml deleted file mode 100644 index a7e53e86ecc4e47f01b875f8ad26c7fcdd3642e1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.margin.top.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -page.margin.top -length - - -page.margin.top -The top margin of the page - - - - -0.5in - - - -Description - -The top page margin is the distance from the physical top of the -page to the top of the region-before. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.orientation.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.orientation.xml deleted file mode 100644 index 37971c0c6521138f03bc21b7e265c5fbcfecf346..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.orientation.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -page.orientation -list -portrait -landscape - - -page.orientation -Select the page orientation - - - - -portrait - - - -Description - - Select one from portrait or landscape. -In portrait orientation, the short edge is horizontal; in -landscape orientation, it is vertical. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.width.portrait.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.width.portrait.xml deleted file mode 100644 index 8216fc32cae624aa3c073f08ad54e4e489ccbfdb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.width.portrait.xml +++ /dev/null @@ -1,67 +0,0 @@ - - -page.width.portrait -length - - -page.width.portrait -Specify the physical size of the short edge of the page - - - - - - 8.5in - 1682mm - 1189mm - 841mm - 594mm - 420mm - 297mm - 210mm - 148mm - 105mm - 74mm - 52mm - 37mm - 26mm - 1000mm - 707mm - 500mm - 353mm - 250mm - 176mm - 125mm - 88mm - 62mm - 44mm - 31mm - 917mm - 648mm - 458mm - 324mm - 229mm - 162mm - 114mm - 81mm - 57mm - 40mm - 28mm - 8.5in - - - - -Description - -The portrait page width is the length of the short -edge of the physical page. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.width.xml deleted file mode 100644 index ff160602cc86728f3d4799d74ab56715a67eedb6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/page.width.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -page.width -length - - -page.width -The width of the physical page - - - - - - - - - - - - - - - -Description - -The page width is generally calculated from the -paper.type and -page.orientation parameters. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/pages.template.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/pages.template.xml deleted file mode 100644 index fff546c104c7de1446edbc721e98b5ab8411c61f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/pages.template.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -pages.template -uri - - -pages.template -Specify the template Pages document - - - - - - - - -Description - -The pages.template parameter specifies a Pages (the Apple word processing application) document to use as a template for the generated document. The template document is used to define the (extensive) headers for the generated document, in particular the paragraph and character styles that are used to format the various elements. Any content in the template document is ignored. - -A template document is used in order to allow maintenance of the paragraph and character styles to be done using Pages itself, rather than these XSL stylesheets. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/paper.type.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/paper.type.xml deleted file mode 100644 index 2656c9cbdca96bade8f97bfcc61536da077656f0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/paper.type.xml +++ /dev/null @@ -1,73 +0,0 @@ - - -paper.type -list -open -open -USletter8.5x11in -USlandscape11x8.5in -USlegal8.5inx14in -USlegallandscape14inx8.5in -4A02378x1682mm -2A01682x1189mm -A01189x841mm -A1841x594mm -A2594x420mm -A3420x297mm -A4297x210mm -A5210x148mm -A6148x105mm -A7105x74mm -A874x52mm -A952x37mm -A1037x26mm -B01414x1000mm -B11000x707mm -B2707x500mm -B3500x353mm -B4353x250mm -B5250x176mm -B6176x125mm -B7125x88mm -B888x62mm -B962x44mm -B1044x31mm -C01297x917mm -C1917x648mm -C2648x458mm -C3458x324mm -C4324x229mm -C5229x162mm -C6162x114mm -C7114x81mm -C881x57mm -C957x40mm -C1040x28mm - - -paper.type -Select the paper type - - - - -USletter - - - -Description - -The paper type is a convenient way to specify the paper size. -The list of known paper sizes includes USletter and most of the A, -B, and C sizes. See page.width.portrait, for example. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/para.propagates.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/para.propagates.style.xml deleted file mode 100644 index 0415adf27b421ebd4e14b30e00739b8957aa14bc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/para.propagates.style.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -para.propagates.style -boolean - - -para.propagates.style -Pass para role attribute through to HTML? - - - - - - - - -Description - -If true, the role attribute of para elements -will be passed through to the HTML as a class attribute on the -p generated for the paragraph. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/part.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/part.autolabel.xml deleted file mode 100644 index 4f1a42c5e044f4676f079ef2be229a907b18e8d5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/part.autolabel.xml +++ /dev/null @@ -1,73 +0,0 @@ - - -part.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -part.autolabel -Specifies the labeling format for Part titles - - - - -I - - - -Description - -If non-zero, then parts will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (upperroman). - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/passivetex.extensions.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/passivetex.extensions.xml deleted file mode 100644 index 2b1cb778d8bd2eb758bcc1083939b5837c0a9c14..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/passivetex.extensions.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -passivetex.extensions -boolean - - -passivetex.extensions -Enable PassiveTeX extensions? - - - - - - -Description - -If non-zero, -PassiveTeX -extensions will be used. At present, this consists of PDF bookmarks -and sorted index terms. - - -This parameter can also affect which graphics file formats -are supported - - - PassiveTeX is incomplete and development has ceased. In most cases, -another XSL-FO engine is probably a better choice. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/pgwide.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/pgwide.properties.xml deleted file mode 100644 index c63b4615bc26eccd4b8fd08aae1aba0a671b218b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/pgwide.properties.xml +++ /dev/null @@ -1,52 +0,0 @@ - - -pgwide.properties -attribute set - - -pgwide.properties -Properties to make a figure or table page wide. - - - - - - - 0pt - - - - -Description - -This attribute set is used to set the properties -that make a figure or table "page wide" in fo output. -It comes into effect when an attribute pgwide="1" -is used. - - - -By default, it sets start-indent -to 0pt. -In a stylesheet that sets the parameter -body.start.indent -to a non-zero value in order to indent body text, -this attribute set can be used to outdent pgwide -figures to the start margin. - - -If a document uses a multi-column page layout, -then this attribute set could try setting span -to a value of all. However, this may -not work with some processors because a span property must be on an -fo:block that is a direct child of fo:flow. It may work in -some processors anyway. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/phrase.propagates.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/phrase.propagates.style.xml deleted file mode 100644 index 8c2589226cefaa65c202ad0a33990bbbf4011e23..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/phrase.propagates.style.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -phrase.propagates.style -boolean - - -phrase.propagates.style -Pass phrase role attribute through to HTML? - - - - - - - -Description - -If non-zero, the role attribute of phrase elements -will be passed through to the HTML as a class -attribute on a span that surrounds the -phrase. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/pixels.per.inch.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/pixels.per.inch.xml deleted file mode 100644 index 86faff5ce5b86700d13978de3fef3cd0b033f95a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/pixels.per.inch.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -pixels.per.inch -integer - - -pixels.per.inch -How many pixels are there per inch? - - - - -90 - - - -Description - -When lengths are converted to pixels, this value is used to -determine the size of a pixel. The default value is taken from the -XSL -Recommendation. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/plus.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/plus.image.xml deleted file mode 100644 index 17b3d3ca2b9397de58e80c397ccd04975eeeec34..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/plus.image.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -plus.image -filename - - -plus.image -Plus image - - - - -toc/closed.png - - - -Description - -Specifies the filename of the plus image; the image used in a -dynamic ToC to indicate that a section -can be expanded. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/points.per.em.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/points.per.em.xml deleted file mode 100644 index 76bd22e8a3cb8bb68cd7b494c5a10b7581477508..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/points.per.em.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -points.per.em -number - - -points.per.em -Specify the nominal size of an em-space in points - - - - -10 - - - -Description - -The fixed value used for calculations based upon the size of a -character. The assumption made is that ten point font is in use. This -assumption may not be valid. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/preface.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/preface.autolabel.xml deleted file mode 100644 index f59115a51a031eb31c8a1074c6b0c307a49005d6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/preface.autolabel.xml +++ /dev/null @@ -1,71 +0,0 @@ - - -preface.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -preface.autolabel -Specifices the labeling format for Preface titles - - - - - - -Description - -If non-zero then prefaces will be numbered using the parameter -value as the number format if the value matches one of the following: - - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - - -Any nonzero value other than the above will generate -the default number format (arabic). - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/prefer.internal.olink.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/prefer.internal.olink.xml deleted file mode 100644 index 2599d76c1a849bac8263a1fcea07b6bb87a2c83c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/prefer.internal.olink.xml +++ /dev/null @@ -1,78 +0,0 @@ - - -prefer.internal.olink -boolean - - -prefer.internal.olink -Prefer a local olink reference to an external reference - - - - - - - - -Description - -If you are re-using XML content modules in multiple documents, -you may want to redirect some of your olinks. This parameter -permits you to redirect an olink to the current document. - - -For example: you are writing documentation for a product, -which includes 3 manuals: a little installation -booklet (booklet.xml), a user -guide (user.xml), and a reference manual (reference.xml). -All 3 documents begin with the same introduction section (intro.xml) that -contains a reference to the customization section (custom.xml) which is -included in both user.xml and reference.xml documents. - - -How do you write the link to custom.xml in intro.xml -so that it is interpreted correctly in all 3 documents? - -If you use xref, it will fail in user.xml. - -If you use olink (pointing to reference.xml), -the reference in user.xml -will point to the customization section of the reference manual, while it is -actually available in user.xml. - - - -If you set the prefer.internal.olink -parameter to a non-zero value, then the processor will -first look in the olink database -for the olink's targetptr attribute value -in document matching the current.docid -parameter value. If it isn't found there, then -it tries the document in the database -with the targetdoc -value that matches the olink's targetdoc -attribute. - - -This feature permits an olink reference to resolve to -the current document if there is an element -with an id matching the olink's targetptr -value. The current document's olink data must be -included in the target database for this to work. - - -There is a potential for incorrect links if -the same id attribute value is used for different -content in different documents. -Some of your olinks may be redirected to the current document -when they shouldn't be. It is not possible to control -individual olink instances. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/preferred.mediaobject.role.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/preferred.mediaobject.role.xml deleted file mode 100644 index 57b09890b91b351c2f07d73194c6b07bf7491bbb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/preferred.mediaobject.role.xml +++ /dev/null @@ -1,40 +0,0 @@ - - -preferred.mediaobject.role -string - - -preferred.mediaobject.role -Select which mediaobject to use based on -this value of an object's role attribute. - - - - - - - - - -Description - -A mediaobject may contain several objects such as imageobjects. -If the parameter use.role.for.mediaobject is -non-zero, then the role attribute on -imageobjects and other objects within a -mediaobject container will be used to select which object -will be used. If one of the objects has a role value that matches the -preferred.mediaobject.role parameter, then it -has first priority for selection. If more than one has such a role -value, the first one is used. - - -See the use.role.for.mediaobject parameter -for the sequence of selection. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/prev.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/prev.image.xml deleted file mode 100644 index b01711579ffc5d77703f21464f3a60e75358c726..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/prev.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -prev.image -filename - - -prev.image -Left-arrow image - - - - -active/nav-prev.png - - - -Description - -Specifies the filename of the left-pointing navigation arrow. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/procedure.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/procedure.properties.xml deleted file mode 100644 index f6cadb02a9c920eac36289934987961b761e32ba..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/procedure.properties.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -procedure.properties -attribute set - - -procedure.properties -Properties associated with a procedure - - - - - - auto - - - - -Description - -The styling for procedures. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/process.empty.source.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/process.empty.source.toc.xml deleted file mode 100644 index 772b45666782b3e440a9815dc6445530392b0a64..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/process.empty.source.toc.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -process.empty.source.toc -boolean - - -process.empty.source.toc -Generate automated TOC if toc element occurs in a source document? - - - - - - -Description - -Specifies that if an empty toc element is found in a -source document, an automated TOC is generated at this point in the -document. - - Depending on what the value of the - generate.toc parameter is, setting this - parameter to 1 could result in generation of - duplicate automated TOCs. So the - process.empty.source.toc is primarily useful - as an "override": by placing an empty toc in your - document and setting this parameter to 1, you can - force a TOC to be generated even if generate.toc - says not to. - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/process.source.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/process.source.toc.xml deleted file mode 100644 index b91657a9a37e379b7f469e68ab9e087b437de2b9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/process.source.toc.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -process.source.toc -boolean - - -process.source.toc -Process a non-empty toc element if it occurs in a source document? - - - - - - -Description - -Specifies that the contents of a non-empty "hard-coded" -toc element in a source document are processed to -generate a TOC in output. - - This parameter has no effect on automated generation of - TOCs. An automated TOC may still be generated along with the - "hard-coded" TOC. To suppress automated TOC generation, adjust the - value of the generate.toc paramameter. - - The process.source.toc parameter also has - no effect if the toc element is empty; handling - for empty toc is controlled by the - process.empty.source.toc parameter. - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.arch.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.arch.xml deleted file mode 100644 index afcd34c44f38b09e060eeb78acf8ac1cfb588d8c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.arch.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -profile.arch -string - - -profile.arch -Target profile for arch -attribute - - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.attribute.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.attribute.xml deleted file mode 100644 index e7dc5d01c648b0dd67e68d035fd64268f769c8dd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.attribute.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -profile.attribute -string - - -profile.attribute -Name of user-specified profiling attribute - - - - - - - - -Description - -This parameter is used in conjuction with -profile.value. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.audience.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.audience.xml deleted file mode 100644 index 1c5b1a309387c1eaaa6b3d1980b1e882220ba0c0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.audience.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.audience -string - - -profile.audience -Target profile for audience -attribute - - - - - - - - -Description - -Value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.condition.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.condition.xml deleted file mode 100644 index 8bb01a3605fe8b85c80edea8c34466f5191e20a0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.condition.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.condition -string - - -profile.condition -Target profile for condition -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.conformance.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.conformance.xml deleted file mode 100644 index 606af4ca060a02fa047ea99b02f35a0c30452e3b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.conformance.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.conformance -string - - -profile.conformance -Target profile for conformance -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.lang.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.lang.xml deleted file mode 100644 index 43b9439aa51f3f053af63ae4990c18c04569f106..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.lang.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.lang -string - - -profile.lang -Target profile for lang -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.os.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.os.xml deleted file mode 100644 index ba6f430b08825a3cdede35d3115ce9afdb9c8a68..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.os.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.os -string - - -profile.os -Target profile for os -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.revision.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.revision.xml deleted file mode 100644 index 28f668d94e9467fc0c1cb141cebcc6eb4f4c7d4f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.revision.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.revision -string - - -profile.revision -Target profile for revision -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.revisionflag.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.revisionflag.xml deleted file mode 100644 index 3ab8919beecf429659f53071574d978e9b2da7d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.revisionflag.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.revisionflag -string - - -profile.revisionflag -Target profile for revisionflag -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.role.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.role.xml deleted file mode 100644 index 5758e4aecb1e81bb746bb0cb3c317ad0ade3fb8d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.role.xml +++ /dev/null @@ -1,54 +0,0 @@ - - -profile.role -string - - -profile.role -Target profile for role -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - -Note that role is often -used for other purposes than profiling. For example it is commonly -used to get emphasize in bold font: - -<emphasis role="bold">very important</emphasis> - -If you are using role for -these purposes do not forget to add values like bold to -value of this parameter. If you forgot you will get document with -small pieces missing which are very hard to track. - -For this reason it is not recommended to use role attribute for profiling. You should -rather use profiling specific attributes like userlevel, os, arch, condition, etc. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.security.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.security.xml deleted file mode 100644 index 8ffca0f62841a6e74921873aa04d3e6f6b7f9348..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.security.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.security -string - - -profile.security -Target profile for security -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.separator.xml deleted file mode 100644 index a4317f53ea2ae4ed4172cceee7addb5c27a2eb99..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.separator.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -profile.separator -string - - -profile.separator -Separator character for compound profile values - - - - -; - - - -Description - -Separator character used for compound profile values. See profile.arch - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.status.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.status.xml deleted file mode 100644 index c9fc469c8f7a656786447d0c64bb23f6b7b45274..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.status.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.status -string - - -profile.status -Target profile for status -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.userlevel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.userlevel.xml deleted file mode 100644 index 39e263b144c21d6edf69a7916d33b77ecc6e1788..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.userlevel.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.userlevel -string - - -profile.userlevel -Target profile for userlevel -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.value.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.value.xml deleted file mode 100644 index 85f7190170df015c4bd1c43a078376d225e21c2d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.value.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -profile.value -string - - -profile.value -Target profile for user-specified attribute - - - - - - - - -Description - -When you are using this parameter you must also specify name of -profiling attribute with parameter -profile.attribute. - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.vendor.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.vendor.xml deleted file mode 100644 index c0187f000c416bdf797e2f8723df1ec8bb418c4f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.vendor.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.vendor -string - - -profile.vendor -Target profile for vendor -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.wordsize.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.wordsize.xml deleted file mode 100644 index e30ffc7fcddb51b2f05536ca6490d32c98b9e12d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/profile.wordsize.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -profile.wordsize -string - - -profile.wordsize -Target profile for wordsize -attribute - - - - - - - - -Description - -The value of this parameter specifies profiles which should be -included in the output. You can specify multiple profiles by -separating them by semicolon. You can change separator character by -profile.separator -parameter. - -This parameter has effect only when you are using profiling -stylesheets (profile-docbook.xsl, -profile-chunk.xsl, …) instead of normal -ones (docbook.xsl, -chunk.xsl, …). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/punct.honorific.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/punct.honorific.xml deleted file mode 100644 index 7c8a38e485dc8326a9e8e563d0ec6eed071fe3ee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/punct.honorific.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -punct.honorific -string - - -punct.honorific -Punctuation after an honorific in a personal name. - - - - -. - - - -Description - -This parameter specifies the punctuation that should be added after an -honorific in a personal name. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.defaultlabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.defaultlabel.xml deleted file mode 100644 index 0b43f0d8b974c2537e3ff2380888ca95cb9f2810..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.defaultlabel.xml +++ /dev/null @@ -1,86 +0,0 @@ - - -qanda.defaultlabel -list -number -qanda -none - - -qanda.defaultlabel -Sets the default for defaultlabel on QandASet. - - - - -number - - - -Description - -If no defaultlabel attribute is specified on -a qandaset, this value is used. It is generally one of the legal -values for the defaultlabel attribute (none, -number or -qanda), or one of the additional stylesheet-specific values -(qnumber or qnumberanda). -The default value is 'number'. - -The values are rendered as follows: - -qanda - -questions are labeled "Q:" and -answers are labeled "A:". - - - -number - -The questions are enumerated and the answers -are not labeled. - - - -qnumber - -The questions are labeled "Q:" followed by a number, and answers are not -labeled. -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -qnumberanda - -The questions are labeled "Q:" followed by a number, and -the answers are labeled "A:". -When sections are numbered, adding a label -to the number distinguishes the question numbers -from the section numbers. -This value is not allowed in the -defaultlabel attribute -of a qandaset element. - - - -none - -No distinguishing label precedes Questions or Answers. - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.in.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.in.toc.xml deleted file mode 100644 index 9597b71dddda1da218479bd10976b523bb6cf0e3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.in.toc.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -qanda.in.toc -boolean - - -qanda.in.toc -Should qandaentry questions appear in -the document table of contents? - - - - - - -Description - -If true (non-zero), then the generated table of contents -for a document will include qandaset titles, -qandadiv titles, -and question elements. The default value (zero) excludes -them from the TOC. - -This parameter does not affect any tables of contents -that may be generated inside a qandaset or qandadiv. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.inherit.numeration.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.inherit.numeration.xml deleted file mode 100644 index 744c0e84ddd966b1223bb2074a9d884f7cb7f3e2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.inherit.numeration.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -qanda.inherit.numeration -boolean - - -qanda.inherit.numeration -Does enumeration of QandASet components inherit the numeration of parent elements? - - - - - - - - -Description - -If non-zero, numbered qandadiv elements and -question and answer inherit the enumeration of -the ancestors of the qandaset. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.nested.in.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.nested.in.toc.xml deleted file mode 100644 index 01bdf5a22efa185a46de74b6c7f0d067750b204d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.nested.in.toc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -qanda.nested.in.toc -boolean - - -qanda.nested.in.toc -Should nested answer/qandaentry instances appear in TOC? - - - - - - - - -Description - -If non-zero, instances of qandaentry -that are children of answer elements are shown in -the TOC. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level1.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level1.properties.xml deleted file mode 100644 index edaecc9000a9a61044fd30228ade1658262f3e73..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level1.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -qanda.title.level1.properties -attribute set - - -qanda.title.level1.properties -Properties for level-1 qanda set titles - - - - - - - - pt - - - - - -Description - -The properties of level-1 qanda set titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level2.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level2.properties.xml deleted file mode 100644 index ca48ca1a52e99481e5546927850135a4367ceaf7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level2.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -qanda.title.level2.properties -attribute set - - -qanda.title.level2.properties -Properties for level-2 qanda set titles - - - - - - - - pt - - - - - -Description - -The properties of level-2 qanda set titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level3.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level3.properties.xml deleted file mode 100644 index c9c098ea986edc0ffb8e7f7f9ebfa5d1ab14e1e7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level3.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -qanda.title.level3.properties -attribute set - - -qanda.title.level3.properties -Properties for level-3 qanda set titles - - - - - - - - pt - - - - - -Description - -The properties of level-3 qanda set titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level4.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level4.properties.xml deleted file mode 100644 index 4344e767941fd7cd6cf2bb3d5df13d67cf8676d2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level4.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -qanda.title.level4.properties -attribute set - - -qanda.title.level4.properties -Properties for level-4 qanda set titles - - - - - - - - pt - - - - - -Description - -The properties of level-4 qanda set titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level5.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level5.properties.xml deleted file mode 100644 index 31b0d203cf1b66b120d064ee0f52ecbc692f5278..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level5.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -qanda.title.level5.properties -attribute set - - -qanda.title.level5.properties -Properties for level-5 qanda set titles - - - - - - - - pt - - - - - -Description - -The properties of level-5 qanda set titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level6.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level6.properties.xml deleted file mode 100644 index 920c7e9ec9f7dfcc0f6142a2c72c4e20b90f5534..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.level6.properties.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -qanda.title.level6.properties -attribute set - - -qanda.title.level6.properties -Properties for level-6 qanda set titles - - - - - - - - pt - - - - - -Description - -The properties of level-6 qanda set titles. -This property set is actually -used for all titles below level 5. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.properties.xml deleted file mode 100644 index 7c3c2a16a869ac24bb881403b8597cec74bccd9e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qanda.title.properties.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -qanda.title.properties -attribute set - - -qanda.title.properties -Properties for qanda set titles - - - - - - - - - bold - - always - 0.8em - 1.0em - 1.2em - - - - -Description - -The properties common to all qanda set titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qandadiv.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qandadiv.autolabel.xml deleted file mode 100644 index 596350af62b6ac83d00e60e3674ebd3ed10c764e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/qandadiv.autolabel.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -qandadiv.autolabel -boolean - - -qandadiv.autolabel -Are divisions in QAndASets enumerated? - - - - - - -Description - -If non-zero, unlabeled qandadivs will be enumerated. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/rebuild-all.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/rebuild-all.xml deleted file mode 100644 index 6dcd5e02787af06379aeae8c92c516a513ee182b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/rebuild-all.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -rebuild-all -boolean - - -rebuild-all -Indicates that all files should be produced - - - - - - - - -Description -When using the XSLT processor to manage dependencies and construct -the website, this parameter can be used to regenerate the whole website, -updating even pages that don't appear to need to be updated. -The dependency extension only looks at the source documents. So -if you change something in the stylesheet, for example, that has a global -effect, you can use this parameter to force the stylesheet to rebuild the -whole website. - -Only applies when XSLT-based chunking is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refclass.suppress.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refclass.suppress.xml deleted file mode 100644 index 8f9b52ae904c1e7af5c9d4820a2e6ec1de6ce1de..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refclass.suppress.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -refclass.suppress -boolean - - -refclass.suppress -Suppress display of refclass contents? - - - - - - - -Description - -If the value of refclass.suppress is -non-zero, then display of refclass contents is -suppressed in output. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.date.profile.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.date.profile.enabled.xml deleted file mode 100644 index 11de66070a81cb5a4bd74f4112aee00ff30bdfbc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.date.profile.enabled.xml +++ /dev/null @@ -1,46 +0,0 @@ - - -refentry.date.profile.enabled -boolean - - -refentry.date.profile.enabled -Enable refentry "date" profiling? - - - - -0 - - -Description - -If the value of -refentry.date.profile.enabled is non-zero, then -during refentry metadata gathering, the info profile -specified by the customizable -refentry.date.profile parameter is used. - -If instead the value of -refentry.date.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "date" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "date" data to show -up in your output, then consider setting a non-zero value for -refentry.date.profile.enabled and adjusting the -value of refentry.date.profile to cause correct -data to be gathered. - -Note that the terms "source" and "date" have special meanings in -this context. For details, see the documentation for the -refentry.date.profile parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.date.profile.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.date.profile.xml deleted file mode 100644 index 1220ed0354507c4ec7b56cc907e287b5c4acc78d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.date.profile.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -refentry.date.profile -string - - -refentry.date.profile -Specifies profile for refentry "date" data - - - - - - (($info[//date])[last()]/date)[1]| - (($info[//pubdate])[last()]/pubdate)[1] - - - - -Description - -The value of refentry.date.profile is a -string representing an XPath expression. It is evaluated at run-time -and used only if refentry.date.profile.enabled -is non-zero. Otherwise, the refentry metadata-gathering -logic "hard coded" into the stylesheets is used. - - The man(7) man page describes this content -as "the date of the last revision". In man pages, it is the content -that is usually displayed in the center footer. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.generate.name.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.generate.name.xml deleted file mode 100644 index f59e6d5502baae9ec1b587764a5f0bb27d7d1c95..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.generate.name.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -refentry.generate.name -boolean - - -refentry.generate.name -Output NAME header before refnames? - - - - - - - - -Description - -If non-zero, a "NAME" section title is output before the list -of refnames. This parameter and -refentry.generate.title are mutually -exclusive. This means that if you change this parameter to zero, you -should set refentry.generate.title to non-zero unless -you want get quite strange output. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.generate.title.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.generate.title.xml deleted file mode 100644 index 8029b2076dd91c0372b0264060e4c108f5519be7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.generate.title.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -refentry.generate.title -boolean - - -refentry.generate.title -Output title before refnames? - - - - - - - - -Description - -If non-zero, the reference page title or first name is -output before the list of refnames. This parameter and -refentry.generate.name are mutually exclusive. -This means that if you change this parameter to non-zero, you -should set refentry.generate.name to zero unless -you want get quite strange output. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.manual.fallback.profile.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.manual.fallback.profile.xml deleted file mode 100644 index 63627856884baf28cc114e2027a5b458d9b24a31..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.manual.fallback.profile.xml +++ /dev/null @@ -1,48 +0,0 @@ - - -refentry.manual.fallback.profile -string - - -refentry.manual.fallback.profile -Specifies profile of "fallback" for refentry "manual" data - - - - - -refmeta/refmiscinfo[not(@class = 'date')][1]/node() - - - -Description - -The value of -refentry.manual.fallback.profile is a string -representing an XPath expression. It is evaluated at run-time and -used only if no "manual" data can be found by other means (that is, -either using the refentry metadata-gathering logic "hard -coded" in the stylesheets, or the value of -refentry.manual.profile, if it is -enabled). - - -Depending on which XSLT engine you run, either the EXSLT -dyn:evaluate extension function (for xsltproc or -Xalan) or saxon:evaluate extension function (for -Saxon) are used to dynamically evaluate the value of -refentry.manual.fallback.profile at -run-time. If you don't use xsltproc, Saxon, Xalan -- or some other -XSLT engine that supports dyn:evaluate -- you -must manually disable fallback processing by setting an empty value -for the refentry.manual.fallback.profile -parameter. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.manual.profile.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.manual.profile.enabled.xml deleted file mode 100644 index a3b7b549cf912ba41ff38b4e7d08b180610b618b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.manual.profile.enabled.xml +++ /dev/null @@ -1,47 +0,0 @@ - - -refentry.manual.profile.enabled -boolean - - -refentry.manual.profile.enabled -Enable refentry "manual" profiling? - - - - -0 - - -Description - -If the value of -refentry.manual.profile.enabled is -non-zero, then during refentry metadata gathering, the info -profile specified by the customizable -refentry.manual.profile parameter is -used. - -If instead the value of -refentry.manual.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "manual" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "manual" data to show -up in your output, then consider setting a non-zero value for -refentry.manual.profile.enabled and adjusting -the value of refentry.manual.profile to cause -correct data to be gathered. - -Note that the term "manual" has a special meanings in this -context. For details, see the documentation for the -refentry.manual.profile parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.manual.profile.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.manual.profile.xml deleted file mode 100644 index 214b1701ec511ab42034dd6825e540deb895fc21..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.manual.profile.xml +++ /dev/null @@ -1,72 +0,0 @@ - - -refentry.manual.profile -string - - -refentry.manual.profile -Specifies profile for refentry "manual" data - - - - - - (($info[//title])[last()]/title)[1]| - ../title/node() - - - - -Description - -The value of refentry.manual.profile is -a string representing an XPath expression. It is evaluated at -run-time and used only if -refentry.manual.profile.enabled is -non-zero. Otherwise, the refentry metadata-gathering logic -"hard coded" into the stylesheets is used. - -In man pages, this content is usually displayed in the middle of -the header of the page. The man(7) man page -describes this as "the title of the manual (e.g., Linux -Programmer's Manual)". Here are some examples from -existing man pages: - - - dpkg utilities - (dpkg-name) - - - User Contributed Perl Documentation - (GET) - - - GNU Development Tools - (ld) - - - Emperor Norton Utilities - (ddate) - - - Debian GNU/Linux manual - (faked) - - - GIMP Manual Pages - (gimp) - - - KDOC Documentation System - (qt2kdoc) - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.meta.get.quietly.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.meta.get.quietly.xml deleted file mode 100644 index 0ed29f6c5af0831df08ad41e62207fa4f9b586cb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.meta.get.quietly.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -refentry.meta.get.quietly -boolean - - -refentry.meta.get.quietly -Suppress notes and warnings when gathering refentry metadata? - - - - - - - - -Description - -If zero (the default), notes and warnings about “missing†markup -are generated during gathering of refentry metadata. If non-zero, the -metadata is gathered “quietly†-- that is, the notes and warnings are -suppressed. - - - If you are processing a large amount of refentry - content, you may be able to speed up processing significantly by - setting a non-zero value for - refentry.meta.get.quietly. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.pagebreak.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.pagebreak.xml deleted file mode 100644 index 42b84661be20ccdc2e698fef89a9165fc0d41ade..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.pagebreak.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -refentry.pagebreak -boolean - - -refentry.pagebreak -Start each refentry on a new page - - - - - - -Description - -If non-zero (the default), each refentry -element will start on a new page. If zero, a page -break will not be generated between refentry elements. -The exception is when the refentry elements are children of -a part element, in which case the page breaks are always -retained. That is because a part element does not generate -a page-sequence for its children, so each refentry must -start its own page-sequence. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.separator.xml deleted file mode 100644 index a7eeb84b816625beb26e6ce242c797419d97a089..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.separator.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -refentry.separator -boolean - - -refentry.separator -Generate a separator between consecutive RefEntry elements? - - - - - - - - -Description - -If true, a separator will be generated between consecutive -reference pages. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.fallback.profile.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.fallback.profile.xml deleted file mode 100644 index 1761378a92576260b369ddd9cfa5222abf06e05f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.fallback.profile.xml +++ /dev/null @@ -1,49 +0,0 @@ - - -refentry.source.fallback.profile -string - - -refentry.source.fallback.profile -Specifies profile of "fallback" for refentry "source" data - - - - - -refmeta/refmiscinfo[not(@class = 'date')][1]/node() - - - -Description - -The value of -refentry.source.fallback.profile is a string -representing an XPath expression. It is evaluated at run-time and used -only if no "source" data can be found by other means (that is, either -using the refentry metadata-gathering logic "hard coded" in -the stylesheets, or the value of the -refentry.source.name.profile and -refentry.version.profile parameters, if those -are enabled). - - -Depending on which XSLT engine you run, either the EXSLT -dyn:evaluate extension function (for xsltproc or -Xalan) or saxon:evaluate extension function (for -Saxon) are used to dynamically evaluate the value of -refentry.source.fallback.profile at -run-time. If you don't use xsltproc, Saxon, Xalan -- or some other -XSLT engine that supports dyn:evaluate -- you -must manually disable fallback processing by setting an empty value -for the refentry.source.fallback.profile -parameter. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.name.profile.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.name.profile.enabled.xml deleted file mode 100644 index f87ec0fe28db06fe33f28320f96700799dac3e0e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.name.profile.enabled.xml +++ /dev/null @@ -1,48 +0,0 @@ - - -refentry.source.name.profile.enabled -boolean - - -refentry.source.name.profile.enabled -Enable refentry "source name" profiling? - - - - -0 - - -Description - -If the value of -refentry.source.name.profile.enabled is -non-zero, then during refentry metadata gathering, the info -profile specified by the customizable -refentry.source.name.profile parameter is -used. - -If instead the value of -refentry.source.name.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "source name" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "source name" data to -show up in your output, then consider setting a non-zero value for -refentry.source.name.profile.enabled and -adjusting the value of -refentry.source.name.profile to cause correct -data to be gathered. - -Note that the terms "source" and "source name" have special -meanings in this context. For details, see the documentation for the -refentry.source.name.profile parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.name.profile.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.name.profile.xml deleted file mode 100644 index c9a101228d4d4d82db09682ab0af9b33416d6d42..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.name.profile.xml +++ /dev/null @@ -1,89 +0,0 @@ - - -refentry.source.name.profile -string - - -refentry.source.name.profile -Specifies profile for refentry "source name" data - - - - - - (($info[//productname])[last()]/productname)[1]| - (($info[//corpname])[last()]/corpname)[1]| - (($info[//corpcredit])[last()]/corpcredit)[1]| - (($info[//corpauthor])[last()]/corpauthor)[1]| - (($info[//orgname])[last()]/orgname)[1]| - (($info[//publishername])[last()]/publishername)[1] - - - - -Description - -The value of refentry.source.name.profile -is a string representing an XPath expression. It is evaluated at -run-time and used only if -refentry.source.name.profile.enabled is -non-zero. Otherwise, the refentry metadata-gathering logic -"hard coded" into the stylesheets is used. - -A "source name" is one part of a (potentially) two-part -Name Version -"source" field. In man pages, it is usually displayed in the left -footer of the page. It typically indicates the software system or -product that the item documented in the man page belongs to. The -man(7) man page describes it as "the source of -the command", and provides the following examples: - - - For binaries, use something like: GNU, NET-2, SLS - Distribution, MCC Distribution. - - - For system calls, use the version of the kernel that you - are currently looking at: Linux 0.99.11. - - - For library calls, use the source of the function: GNU, BSD - 4.3, Linux DLL 4.4.1. - - - - -In practice, there are many pages that simply have a Version -number in the "source" field. So, it looks like what we have is a -two-part field, -Name Version, -where: - - - Name - - product name (e.g., BSD) or org. name (e.g., GNU) - - - - Version - - version number - - - -Each part is optional. If the Name is a -product name, then the Version is probably -the version of the product. Or there may be no -Name, in which case, if there is a -Version, it is probably the version -of the item itself, not the product it is part of. Or, if the -Name is an organization name, then there -probably will be no Version. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.name.suppress.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.name.suppress.xml deleted file mode 100644 index b29127eb4c234908d5b30cc431e1a7b72e886cc9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.source.name.suppress.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -refentry.source.name.suppress -boolean - - -refentry.source.name.suppress -Suppress "name" part of refentry "source" contents? - - - - -0 - - -Description - -If the value of -refentry.source.name.suppress is non-zero, then -during refentry metadata gathering, no "source name" data -is added to the refentry "source" contents. Instead (unless -refentry.version.suppress is also non-zero), -only "version" data is added to the "source" contents. - -If you find that the refentry metadata gathering -mechanism is causing unwanted "source name" data to show up in your -output -- for example, in the footer (or possibly header) of a man -page -- then you might consider setting a non-zero value for -refentry.source.name.suppress. - -Note that the terms "source", "source name", and "version" have -special meanings in this context. For details, see the documentation -for the refentry.source.name.profile -parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.title.properties.xml deleted file mode 100644 index 5bb1f2565b90f046da1e599801e9d1f654a97b0b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.title.properties.xml +++ /dev/null @@ -1,59 +0,0 @@ - - -refentry.title.properties -attribute set - - -refentry.title.properties -Title properties for a refentry title - - - - - - - - - 18pt - bold - 1em - false - always - 0.8em - 1.0em - 1.2em - 0.5em - 0.4em - 0.6em - - - - - -Description - -Formatting properties applied to the title generated for the -refnamediv part of output for -refentry when the value of the -refentry.generate.title parameter is -non-zero. The font size is supplied by the appropriate section.levelX.title.properties -attribute-set, computed from the location of the -refentry in the section hierarchy. - - - This parameter has no effect on the the title generated for - the refnamediv part of output for - refentry when the value of the - refentry.generate.name parameter is - non-zero. By default, that title is formatted with the same - properties as the titles for all other first-level children of - refentry. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.version.profile.enabled.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.version.profile.enabled.xml deleted file mode 100644 index 3b95bbe507341be64c19a5f0fd4dcb5fb41a4ec3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.version.profile.enabled.xml +++ /dev/null @@ -1,47 +0,0 @@ - - -refentry.version.profile.enabled -boolean - - -refentry.version.profile.enabled -Enable refentry "version" profiling? - - - - -0 - - -Description - -If the value of -refentry.version.profile.enabled is -non-zero, then during refentry metadata gathering, the info -profile specified by the customizable -refentry.version.profile parameter is -used. - -If instead the value of -refentry.version.profile.enabled is zero (the -default), then "hard coded" logic within the DocBook XSL stylesheets -is used for gathering refentry "version" data. - -If you find that the default refentry -metadata-gathering behavior is causing incorrect "version" data to show -up in your output, then consider setting a non-zero value for -refentry.version.profile.enabled and adjusting -the value of refentry.version.profile to cause -correct data to be gathered. - -Note that the terms "source" and "version" have special -meanings in this context. For details, see the documentation for the -refentry.version.profile parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.version.profile.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.version.profile.xml deleted file mode 100644 index ff858254125610924c2b7bc082b6e1f7a73fb1f4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.version.profile.xml +++ /dev/null @@ -1,41 +0,0 @@ - - -refentry.version.profile -string - - -refentry.version.profile -Specifies profile for refentry "version" data - - - - - - (($info[//productnumber])[last()]/productnumber)[1]| - (($info[//edition])[last()]/edition)[1]| - (($info[//releaseinfo])[last()]/releaseinfo)[1] - - - - -Description - -The value of refentry.version.profile is -a string representing an XPath expression. It is evaluated at -run-time and used only if -refentry.version.profile.enabled is -non-zero. Otherwise, the refentry metadata-gathering logic -"hard coded" into the stylesheets is used. - -A "source.name" is one part of a (potentially) two-part -Name Version -"source" field. For more details, see the documentation for the -refentry.source.name.profile parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.version.suppress.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.version.suppress.xml deleted file mode 100644 index b701ad8db6d92e4d7bdf5d8db05a976532e0fc6d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.version.suppress.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -refentry.version.suppress -boolean - - -refentry.version.suppress -Suppress "version" part of refentry "source" contents? - - - - -0 - - -Description - -If the value of refentry.version.suppress -is non-zero, then during refentry metadata gathering, no -"version" data is added to the refentry "source" -contents. Instead (unless -refentry.source.name.suppress is also -non-zero), only "source name" data is added to the "source" -contents. - -If you find that the refentry metadata gathering -mechanism is causing unwanted "version" data to show up in your output --- for example, in the footer (or possibly header) of a man page -- -then you might consider setting a non-zero value for -refentry.version.suppress. - -Note that the terms "source", "source name", and "version" have -special meanings in this context. For details, see the documentation -for the refentry.source.name.profile -parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.xref.manvolnum.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.xref.manvolnum.xml deleted file mode 100644 index 56b93b7bba65605c968db55b0c5ddc7fcaac740d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/refentry.xref.manvolnum.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -refentry.xref.manvolnum -boolean - - -refentry.xref.manvolnum -Output manvolnum as part of -refentry cross-reference? - - - - - - - - -Description - -if non-zero, the manvolnum is used when cross-referencing -refentrys, either with xref -or citerefentry. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/reference.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/reference.autolabel.xml deleted file mode 100644 index 1a9dc5b3883f6fa818061223e9440cae957695af..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/reference.autolabel.xml +++ /dev/null @@ -1,67 +0,0 @@ - - -reference.autolabel -list -0none -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -reference.autolabel -Specifies the labeling format for Reference titles - - - - I - - -Description -If non-zero, references will be numbered using the parameter - value as the number format if the value matches one of the - following: - - - - 1 or arabic - - Arabic numeration (1, 2, 3 ...). - - - - A or upperalpha - - Uppercase letter numeration (A, B, C ...). - - - - a or loweralpha - - Lowercase letter numeration (a, b, c ...). - - - - I or upperroman - - Uppercase roman numeration (I, II, III ...). - - - - i or lowerroman - - Lowercase roman letter numeration (i, ii, iii ...). - - - -Any non-zero value other than the above will generate -the default number format (upperroman). - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/region.after.extent.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/region.after.extent.xml deleted file mode 100644 index b29abba74e2562f85b9d1d83e7644bb42c58e3b2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/region.after.extent.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -region.after.extent -length - - -region.after.extent -Specifies the height of the footer. - - - - -0.4in - - - -Description - -The region after extent is the height of the area where footers -are printed. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/region.before.extent.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/region.before.extent.xml deleted file mode 100644 index c62cc408f499455f6a0c1eb30397090a75eba28e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/region.before.extent.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -region.before.extent -length - - -region.before.extent -Specifies the height of the header - - - - -0.4in - - - -Description - -The region before extent is the height of the area where headers -are printed. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/revhistory.table.cell.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/revhistory.table.cell.properties.xml deleted file mode 100644 index 49c40374488628be5cfbfc5cdc92f1d8359528be..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/revhistory.table.cell.properties.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -revhistory.table.cell.properties -attribute set - - -revhistory.table.cell.properties -The properties of table cells used for formatting revhistory - - - - - - - - - -Description - -This property set defines appearance of individual cells in revhistory table. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/revhistory.table.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/revhistory.table.properties.xml deleted file mode 100644 index 43116d03788d4f780f021d8dad463673114856d2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/revhistory.table.properties.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -revhistory.table.properties -attribute set - - -revhistory.table.properties -The properties of table used for formatting revhistory - - - - - - - - - -Description - -This property set defines appearance of revhistory table. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/revhistory.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/revhistory.title.properties.xml deleted file mode 100644 index f97d646ba5e238926d2d3c6f8362065ac77df7e7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/revhistory.title.properties.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -revhistory.title.properties -attribute set - - -revhistory.title.properties -The properties of revhistory title - - - - - - - - - -Description - -This property set defines appearance of revhistory title. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/root.filename.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/root.filename.xml deleted file mode 100644 index ae5ca5b4023d6952c2230d2bfbf21c39c56a5606..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/root.filename.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -root.filename -uri - - -root.filename -Identifies the name of the root HTML file when chunking - - - - -index - - - -Description - -The root.filename is the base filename for -the chunk created for the root of each document processed. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/root.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/root.properties.xml deleted file mode 100644 index 26c9951f52a80e64e868dc5d8248dc70e59b0bd1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/root.properties.xml +++ /dev/null @@ -1,46 +0,0 @@ - - -root.properties -attribute set - - -root.properties -The properties of the fo:root element - - - - - - - - - - - - - - - - - - character-by-character - disregard-shifts - - - - - - - -Description - -This property set is used on the fo:root element of -an FO file. It defines a set of default, global parameters. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/rootid.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/rootid.xml deleted file mode 100644 index a0715af3bf39fa99899966355e8b519ce596e19c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/rootid.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -rootid -string - - -rootid -Specify the root element to format - - - - - - - -Description - -If rootid is not empty, it must be the -value of an ID that occurs in the document being formatted. The entire -document will be loaded and parsed, but formatting will begin at the -element identified, rather than at the root. For example, this allows -you to process only chapter 4 of a book. -Because the entire document is available to the processor, automatic -numbering, cross references, and other dependencies are correctly -resolved. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/runinhead.default.title.end.punct.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/runinhead.default.title.end.punct.xml deleted file mode 100644 index d151e8b3cbcc9e2d908999ee27db6f8d8b995a9d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/runinhead.default.title.end.punct.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -runinhead.default.title.end.punct -string - - -runinhead.default.title.end.punct -Default punctuation character on a run-in-head - - - -. - - - -Description - -If non-zero, For a formalpara, use the specified -string as the separator between the title and following text. The period is the default value. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/runinhead.title.end.punct.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/runinhead.title.end.punct.xml deleted file mode 100644 index 025aeed44f2c96cae241a710a5ee2e48487e0f16..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/runinhead.title.end.punct.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -runinhead.title.end.punct -string - - -runinhead.title.end.punct -Characters that count as punctuation on a run-in-head - - - - -.!?: - - - -Description - -Specify which characters are to be counted as punctuation. These -characters are checked for a match with the last character of the -title. If no match is found, the -runinhead.default.title.end.punct contents are -inserted. This is to avoid duplicated punctuation in the output. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/running.foot.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/running.foot.properties.xml deleted file mode 100644 index ee9859240ebeb9b1b436c29ba4825da282970512..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/running.foot.properties.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -running.foot.properties -attribute set - - -running.foot.properties -Specifies properties for running foot on each slide - - - - - - - - - 14pt - #9F9F9F - - - - -Description - -This parameter specifies properties that are applied to the -running foot area of each slide. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sans.font.family.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sans.font.family.xml deleted file mode 100644 index d569b1284c08b56acfa2931b64ae34751d5755be..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sans.font.family.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -sans.font.family -string - - -sans.font.family -The default sans-serif font family - - - - -sans-serif - - - -Description - -The default sans-serif font family. At the present, this isn't -actually used by the stylesheets. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.callouts.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.callouts.xml deleted file mode 100644 index e08fcdbbb5b850458420b2dd6d773004431899cc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.callouts.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -saxon.callouts -boolean - - -saxon.callouts -Enable the callout extension - - - - - - - - -Description - -The callouts extension processes areaset -elements in ProgramListingCO and other text-based -callout elements. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.character.representation.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.character.representation.xml deleted file mode 100644 index bd8bcac8a35d4400e656e23b4db530e7385d1687..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.character.representation.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -saxon.character.representation -string - - -saxon.character.representation -Saxon character representation used in generated HTML pages - - - - - - -Description - -This parameter has effect only when Saxon 6 is used (version 6.4.2 or later). -It sets the character representation in files generated by the chunking stylesheets. -If you want to suppress entity references for characters with direct representations in -chunker.output.encoding, set the parameter value to native. - - - For more information, see Saxon output character representation. - - -This parameter is documented here, but the declaration is actually -in the chunker.xsl stylesheet module. - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.linenumbering.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.linenumbering.xml deleted file mode 100644 index 451028bdb03d7d5cb68a1a6a765f08ab0aa621da..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.linenumbering.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -saxon.linenumbering -boolean - - -saxon.linenumbering -Enable the line numbering extension - - - - - - - - -Description - -If non-zero, verbatim environments (elements that have the -format='linespecific' notation attribute: address, -literallayout, programlisting, -screen, synopsis) that specify line numbering -will have line numbers. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.tablecolumns.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.tablecolumns.xml deleted file mode 100644 index e9d967433d263d4efac0e355144ac65449d3234f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/saxon.tablecolumns.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -saxon.tablecolumns -boolean - - -saxon.tablecolumns -Enable the table columns extension function - - - - - - - - -Description - -The table columns extension function adjusts the widths of table -columns in the HTML result to more accurately reflect the specifications -in the CALS table. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/script.dir.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/script.dir.xml deleted file mode 100644 index 9cb92afa912f9bc21278310eac0f72c52a107518..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/script.dir.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -script.dir -uri - - -script.dir -Script directory - - - - - - - - -Description - -Identifies the JavaScript source directory for the slides. -This parameter can be set in the source -document with the <?dbhtml?> pseudo-attribute -script-dir. - -If non-empty, this value is prepended to each of the JavaScript files. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.autolabel.max.depth.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.autolabel.max.depth.xml deleted file mode 100644 index e588e00da0987493fe7dd8151e7e6cb735d575da..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.autolabel.max.depth.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -section.autolabel.max.depth -integer - - -section.autolabel.max.depth -The deepest level of sections that are numbered. - - - - -8 - - - -Description - -When section numbering is turned on by the -section.autolabel parameter, then this -parameter controls the depth of section nesting that is -numbered. Sections nested to a level deeper than this value will not -be numbered. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.autolabel.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.autolabel.xml deleted file mode 100644 index 85eede6bc46f01589cf439e5702c2461a66ef95c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.autolabel.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -section.autolabel -boolean - - -section.autolabel -Are sections enumerated? - - - - - - -Description - -If true (non-zero), unlabeled sections will be enumerated. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.container.element.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.container.element.xml deleted file mode 100644 index a6c40599fe18da6e2f2675202c6a7fe5776fd0d4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.container.element.xml +++ /dev/null @@ -1,62 +0,0 @@ - - -section.container.element -list -block -wrapper - - -section.container.element -Select XSL-FO element name to contain sections - - - - -block - - - -Description - -Selects the element name for outer container of -each section. The choices are block (default) -or wrapper. -The fo: namespace prefix is added -by the stylesheet to form the full element name. - - -This element receives the section id -attribute and the appropriate section level attribute-set. - - -Changing this parameter to wrapper -is only necessary when producing multi-column output -that contains page-wide spans. Using fo:wrapper -avoids the nesting of fo:block -elements that prevents spans from working (the standard says -a span must be on a block that is a direct child of -fo:flow). - - -If set to wrapper, the -section attribute-sets only support properties -that are inheritable. That's because there is no -block to apply them to. Properties such as -font-family are inheritable, but properties such as -border are not. - - -Only some XSL-FO processors need to use this parameter. -The Antenna House processor, for example, will handle -spans in nested blocks without changing the element name. -The RenderX XEP product and FOP follow the XSL-FO standard -and need to use wrapper. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.label.includes.component.label.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.label.includes.component.label.xml deleted file mode 100644 index 505d4721000d61cfa57254156bba6ff2d2612d0e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.label.includes.component.label.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -section.label.includes.component.label -boolean - - -section.label.includes.component.label -Do section labels include the component label? - - - - - - -Description - -If non-zero, section labels are prefixed with the label of the -component that contains them. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level1.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level1.properties.xml deleted file mode 100644 index 4aa70b0749c85d001afb89c3c9f76e0010665f49..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level1.properties.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -section.level1.properties -attribute set - - -section.level1.properties -Properties for level-1 sections - - - - - - - - - -Description - -The properties that apply to the containing -block of a level-1 section, and therefore apply to -the whole section. This includes sect1 -elements and section elements at level 1. - - -For example, you could start each level-1 section on -a new page by using: -<xsl:attribute-set name="section.level1.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level2.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level2.properties.xml deleted file mode 100644 index 5dd76e93835871b493a86900d9213b751801212f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level2.properties.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -section.level2.properties -attribute set - - -section.level2.properties -Properties for level-2 sections - - - - - - - - - -Description - -The properties that apply to the containing -block of a level-2 section, and therefore apply to -the whole section. This includes sect2 -elements and section elements at level 2. - - -For example, you could start each level-2 section on -a new page by using: -<xsl:attribute-set name="section.level2.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level3.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level3.properties.xml deleted file mode 100644 index 0bcd6969674be95cef34fcc7e5cab5fd1f63e438..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level3.properties.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -section.level3.properties -attribute set - - -section.level3.properties -Properties for level-3 sections - - - - - - - - - -Description - -The properties that apply to the containing -block of a level-3 section, and therefore apply to -the whole section. This includes sect3 -elements and section elements at level 3. - - -For example, you could start each level-3 section on -a new page by using: -<xsl:attribute-set name="section.level3.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level4.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level4.properties.xml deleted file mode 100644 index 140885169d3cf3b1dea42095301bab7b5bb441af..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level4.properties.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -section.level4.properties -attribute set - - -section.level4.properties -Properties for level-4 sections - - - - - - - - - -Description - -The properties that apply to the containing -block of a level-4 section, and therefore apply to -the whole section. This includes sect4 -elements and section elements at level 4. - - -For example, you could start each level-4 section on -a new page by using: -<xsl:attribute-set name="section.level4.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level5.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level5.properties.xml deleted file mode 100644 index 9093b94ae90bf2c5e03fad43e8be1161cf8616c6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level5.properties.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -section.level5.properties -attribute set - - -section.level5.properties -Properties for level-5 sections - - - - - - - - - -Description - -The properties that apply to the containing -block of a level-5 section, and therefore apply to -the whole section. This includes sect5 -elements and section elements at level 5. - - -For example, you could start each level-5 section on -a new page by using: -<xsl:attribute-set name="section.level5.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level6.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level6.properties.xml deleted file mode 100644 index dda7937890a3c04cf6c494105723ddd8a5e0e8fa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.level6.properties.xml +++ /dev/null @@ -1,43 +0,0 @@ - - -section.level6.properties -attribute set - - -section.level6.properties -Properties for level-6 sections - - - - - - - - - -Description - -The properties that apply to the containing -block of a level 6 or lower section, and therefore apply to -the whole section. This includes -section elements at level 6 and lower. - - -For example, you could start each level-6 section on -a new page by using: -<xsl:attribute-set name="section.level6.properties"> - <xsl:attribute name="break-before">page</xsl:attribute> -</xsl:attribute-set> - - -This attribute set inherits attributes from the -general section.properties attribute set. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.properties.xml deleted file mode 100644 index 06acc314d6e8831af70c811dd51839ec1f26e70b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.properties.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -section.properties -attribute set - - -section.properties -Properties for all section levels - - - - - - - - - -Description - -The properties that apply to the containing -block of all section levels, and therefore apply to -the whole section. -This attribute set is inherited by the -more specific attribute sets such as -section.level1.properties. -The default is empty. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level1.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level1.properties.xml deleted file mode 100644 index 91c63ed25ae72add818682ee72b93bbdc2abf455..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level1.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -section.title.level1.properties -attribute set - - -section.title.level1.properties -Properties for level-1 section titles - - - - - - - - pt - - - - - -Description - -The properties of level-1 section titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level2.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level2.properties.xml deleted file mode 100644 index a25648a7dda96c1bb44e01c4407a80368efc94f0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level2.properties.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - -section.title.level2.properties -attribute set - - -section.title.level2.properties -Properties for level-2 section titles - - - - - - - - pt - - - - - -Description - -The properties of level-2 section titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level3.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level3.properties.xml deleted file mode 100644 index a009a6e317a6fefbce1d5ebefd4c381f6308dd01..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level3.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -section.title.level3.properties -attribute set - - -section.title.level3.properties -Properties for level-3 section titles - - - - - - - - pt - - - - - -Description - -The properties of level-3 section titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level4.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level4.properties.xml deleted file mode 100644 index 00d43989533ee020087be3d8622ecc7c5d7191b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level4.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -section.title.level4.properties -attribute set - - -section.title.level4.properties -Properties for level-4 section titles - - - - - - - - pt - - - - - -Description - -The properties of level-4 section titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level5.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level5.properties.xml deleted file mode 100644 index c25b5efe7e36d723b5e403189c6d9117dac75ab2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level5.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -section.title.level5.properties -attribute set - - -section.title.level5.properties -Properties for level-5 section titles - - - - - - - - pt - - - - - -Description - -The properties of level-5 section titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level6.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level6.properties.xml deleted file mode 100644 index a2a0feb788faa24b29a6a761640c4232bec3ccfe..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.level6.properties.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -section.title.level6.properties -attribute set - - -section.title.level6.properties -Properties for level-6 section titles - - - - - - - - pt - - - - - -Description - -The properties of level-6 section titles. This property set is actually -used for all titles below level 5. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.properties.xml deleted file mode 100644 index ab849afd57c0d3107790bc1ae69f791ae8a54d29..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/section.title.properties.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -section.title.properties -attribute set - - -section.title.properties -Properties for section titles - - - - - - - - - bold - - always - 0.8em - 1.0em - 1.2em - start - - - - - -Description - -The properties common to all section titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/segmentedlist.as.table.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/segmentedlist.as.table.xml deleted file mode 100644 index fb2c2367080a37e297093adbdb37bb23c8d9c7ba..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/segmentedlist.as.table.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -segmentedlist.as.table -boolean - - -segmentedlist.as.table -Format segmented lists as tables? - - - - - - - - -Description - -If non-zero, segmentedlists will be formatted as -tables. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sequential.links.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sequential.links.xml deleted file mode 100644 index 293827dd699068d275b689fc9aa14002d71a15dc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sequential.links.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -sequential.links -boolean - - -sequential.links -Make sequentional links? - - - - - - - - -Description -FIXME - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/shade.verbatim.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/shade.verbatim.style.xml deleted file mode 100644 index 0907806a4ae6794d3c5033fd8373f4b390c6b091..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/shade.verbatim.style.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -shade.verbatim.style -attribute set - - -shade.verbatim.style -Properties that specify the style of shaded verbatim listings - - - - - - 0 - #E0E0E0 - - - #E0E0E0 - - - - -Description - -Properties that specify the style of shaded verbatim listings. The -parameters specified (the border and background color) are added to -the styling of the xsl-fo output. A border might be specified as "thin -black solid" for example. See xsl-fo - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/shade.verbatim.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/shade.verbatim.xml deleted file mode 100644 index 82a721624af607f6c27194c99e639e1476233781..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/shade.verbatim.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -shade.verbatim -boolean - - -shade.verbatim -Should verbatim environments be shaded? - - - - - - -Description - -In the FO stylesheet, if this parameter is non-zero then the -shade.verbatim.style properties will be applied -to verbatim environments. - -In the HTML stylesheet, this parameter is now deprecated. Use -CSS instead. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/show.comments.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/show.comments.xml deleted file mode 100644 index ac7bc24579c10a1988ca145acd5484071fc1b302..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/show.comments.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -show.comments -boolean - - -show.comments -Display remark elements? - - - - - - - - -Description - -If non-zero, comments will be displayed, otherwise they -are suppressed. Comments here refers to the remark element -(which was called comment prior to DocBook -4.0), not XML comments (<-- like this -->) which are -unavailable. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/show.foil.number.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/show.foil.number.xml deleted file mode 100644 index 627c6a7e323bc198c45c4dfb44f1aa16f6822ca7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/show.foil.number.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -show.foil.number -boolean - - -show.foil.number -Show foil number on each foil? - - - - - - - - -Description - -If non-zero, on each slide there will be its number. Currently -not supported in all output formats. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/show.revisionflag.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/show.revisionflag.xml deleted file mode 100644 index c589b01ad12eb8a94dddfb643f33b3ffd474a7c5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/show.revisionflag.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -show.revisionflag -boolean - - -show.revisionflag -Enable decoration of elements that have a revisionflag - - - - - - - - -Description - - -If show.revisionflag is turned on, then the stylesheets -may produce additional markup designed to allow a CSS stylesheet to -highlight elements that have specific revisionflag settings. - -The markup inserted will be usually be either a <span> or -<div> with an appropriate class -attribute. (The value of the class attribute will be the same as the -value of the revisionflag attribute). In some contexts, for example -tables, where extra markup would be structurally illegal, the class -attribute will be added to the appropriate container element. - -In general, the stylesheets only test for revisionflag in contexts -where an importing stylesheet would have to redefine whole templates. -Most of the revisionflag processing is expected to be done by another -stylesheet, for example changebars.xsl. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/showtoc.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/showtoc.image.xml deleted file mode 100644 index 7b1fca38a64224c4ec92c7cac2c4abb806920aa5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/showtoc.image.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -showtoc.image -filename - - -showtoc.image -Show ToC image - - - - -showtoc.gif - - - -Description - -Specifies the filename of the show ToC image. This is used -when the ToC hide/show parameter is -enabled. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/side.float.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/side.float.properties.xml deleted file mode 100644 index 0a6d904ccafc2eff62288c2188b2dc9d02b00a85..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/side.float.properties.xml +++ /dev/null @@ -1,50 +0,0 @@ - - -side.float.properties -attribute set - - -side.float.properties -Attribute set for side float container properties - - - - - - 2in - 4pt - 4pt - 2pt - 2pt - 0pt - 0pt - start - - - - -Description - -Properties that are applied to the -fo:block-container inside of -a side float that is generated by the template named -floater. -That template generates a side float -when the side.float.type is set to one -of the values for a side float. - -If you do only left or -start side floats, you may want to set the -padding-start attribute to zero. -If you do only right or -end side floats, you may want to set the -padding-end attribute to zero. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.float.type.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.float.type.xml deleted file mode 100644 index 8c6a286a0628cc9456f3826edd4802116421e1d3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.float.type.xml +++ /dev/null @@ -1,90 +0,0 @@ - - -sidebar.float.type -list -none -before -left -start -right -end -inside -outside - - -sidebar.float.type -Select type of float for sidebar elements - - - - -none - - - -Description - -Selects the type of float for sidebar elements. - - - -If sidebar.float.type is -none, then -no float is used. - - - -If sidebar.float.type is -before, then -the float appears at the top of the page. On some processors, -that may be the next page rather than the current page. - - - - -If sidebar.float.type is -left, -then a left side float is used. - - - - -If sidebar.float.type is -start, -then when the text direction is left-to-right a left side float is used. -When the text direction is right-to-left, a right side float is used. - - - - -If sidebar.float.type is -right, -then a right side float is used. - - - - -If sidebar.float.type is -end, -then when the text direction is left-to-right a right side float is used. -When the text direction is right-to-left, a left side float is used. - - - - -If your XSL-FO processor supports floats positioned on the -inside or -outside -of double-sided pages, then you have those two -options for side floats as well. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.float.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.float.width.xml deleted file mode 100644 index cb989e4e67727f29e229575a40bef7608748f15b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.float.width.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -sidebar.float.width -length - - -sidebar.float.width -Set the default width for sidebars - - - - -1in - - - -Description - -Sets the default width for sidebars when used as a side float. -The width determines the degree to which the sidebar block intrudes into -the text area. - -If sidebar.float.type is -before or -none, then -this parameter is ignored. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.properties.xml deleted file mode 100644 index fc98ac0cd4d553d19541d18e8aed30002f524c27..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.properties.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -sidebar.properties -attribute set - - -sidebar.properties -Attribute set for sidebar properties - - - - - - solid - 1pt - black - #DDDDDD - 12pt - 12pt - 6pt - 6pt - 0pt - 0pt - - - - - -Description - -The styling for sidebars. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.title.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.title.properties.xml deleted file mode 100644 index f1b1d5184a4691d30145ec46062e762f6b3a0e51..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/sidebar.title.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -sidebar.title.properties -attribute set - - -sidebar.title.properties -Attribute set for sidebar titles - - - - - - bold - false - start - always - - - - -Description - -The styling for sidebars titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/simplesect.in.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/simplesect.in.toc.xml deleted file mode 100644 index 9bc3ab5d8fd7df89c3b6d7752a56c858396ae0b7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/simplesect.in.toc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -simplesect.in.toc -boolean - - -simplesect.in.toc -Should simplesect elements appear in the TOC? - - - - - - -Description - -If non-zero, simplesects will be included in the TOC. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slide.font.family.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slide.font.family.xml deleted file mode 100644 index e1c754104e466888fa0791df1204d2bf7449be89..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slide.font.family.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -slide.font.family -list -open -serif -sans-serif -monospace - - -slide.font.family -Specifies font family to use for slide bodies - - - - -Helvetica - - - -Description - -Specifies the font family to use for slides bodies. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slide.title.font.family.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slide.title.font.family.xml deleted file mode 100644 index a5a3a88afe9b1f35478785605f15cb1a4225a4e2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slide.title.font.family.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -slide.title.font.family -list -open -serif -sans-serif -monospace - - -slide.title.font.family -Specifies font family to use for slide titles - - - - -Helvetica - - - -Description - -Specifies the font family to use for slides titles. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slides.js.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slides.js.xml deleted file mode 100644 index 90fffaeb7fcdf4dd20ca0378e98c86c4cd9bd788..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slides.js.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -slides.js -filename - - -slides.js -Slides overlay file - - - - -slides.js - - - -Description - -Specifies the filename of the slides JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slides.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slides.properties.xml deleted file mode 100644 index daca82c94e5e39e24b497369d6c4a68328be82e7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/slides.properties.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -slides.properties -attribute set - - -slides.properties -Specifies properties for all slides - - - - - - - - - - - - -Description - -This parameter specifies properties that are applied to all slides. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/spacing.paras.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/spacing.paras.xml deleted file mode 100644 index 2f2323a1a2887ae844e67629b95882988f7216f5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/spacing.paras.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -spacing.paras -boolean - - -spacing.paras -Insert additional <p> elements for spacing? - - - - - - - - -Description - -When non-zero, additional, empty paragraphs are inserted in -several contexts (for example, around informal figures), to create a -more pleasing visual appearance in many browsers. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/speakernote.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/speakernote.properties.xml deleted file mode 100644 index 089115a768387eef1d225dea08a6330ea3204604..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/speakernote.properties.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -speakernote.properties -attribute set - - -speakernote.properties -Specifies properties for all speakernotes - - - - - - Times Roman - italic - 12pt - normal - - - - -Description - -This parameter specifies properties that are applied to all speakernotes. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/subscript.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/subscript.properties.xml deleted file mode 100644 index d2c771113a4bfe1b313175367b00dc3984202e35..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/subscript.properties.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -subscript.properties -attribute set - - -subscript.properties -Properties associated with subscripts - - - - - - 75% - - - - -Description - -Specifies styling properties for subscripts. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/superscript.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/superscript.properties.xml deleted file mode 100644 index ecf6af15d5daeaff6307141b59f23e1b4ecc0715..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/superscript.properties.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -superscript.properties -attribute set - - -superscript.properties -Properties associated with superscripts - - - - - - 75% - - - - -Description - -Specifies styling properties for superscripts. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.footer.navigation.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.footer.navigation.xml deleted file mode 100644 index 430ed97775fa4615e9b1fc9ad370c32a16b3c234..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.footer.navigation.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -suppress.footer.navigation -boolean - - -suppress.footer.navigation -Disable footer navigation - - - -0 - - -Description - - -If non-zero, footer navigation will be suppressed. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.header.navigation.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.header.navigation.xml deleted file mode 100644 index 8fff0810a877bd5a89de6afee2e8149c9ca9bc95..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.header.navigation.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -suppress.header.navigation -boolean - - -suppress.header.navigation -Disable header navigation - - - - - - - - -Description - -If non-zero, header navigation will be suppressed. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.homepage.title.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.homepage.title.xml deleted file mode 100644 index 38a33062533828094a3410c4a213f4aecc56cdef..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.homepage.title.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -suppress.homepage.title -boolean - - -suppress.homepage.title -Suppress title on homepage? - - - - - - - - -Description -FIXME:If non-zero, the title on the homepage is suppressed? - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.navigation.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.navigation.xml deleted file mode 100644 index 351fc4d4357d159caf87ed7ce73e7dcb32d365d6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/suppress.navigation.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -suppress.navigation -boolean - - -suppress.navigation -Disable header and footer navigation - - - - - - - - -Description - - -If non-zero, header and footer navigation will be suppressed. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/symbol.font.family.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/symbol.font.family.xml deleted file mode 100644 index 8acc791fd551be6f696a49c046c042b240d99e5b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/symbol.font.family.xml +++ /dev/null @@ -1,45 +0,0 @@ - - -symbol.font.family -list -open -serif -sans-serif -monospace - - -symbol.font.family -The font families to be searched for symbols outside - of the body font - - - - -Symbol,ZapfDingbats - - - -Description - -A typical body or title font does not contain all -the character glyphs that DocBook supports. This parameter -specifies additional fonts that should be searched for -special characters not in the normal font. -These symbol font names are automatically appended -to the body or title font family name when fonts -are specified in a -font-family -property in the FO output. - -The symbol font names should be entered as a -comma-separated list. The default value is -Symbol,ZapfDingbats. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.borders.with.css.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.borders.with.css.xml deleted file mode 100644 index 2640fb98da85be46a8fe7129a319a6853feb76ac..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.borders.with.css.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -table.borders.with.css -boolean - - -table.borders.with.css -Use CSS to specify table, row, and cell borders? - - - - - - - - -Description - -If non-zero, CSS will be used to draw table borders. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.border.color.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.border.color.xml deleted file mode 100644 index 326e148647a21542f3420b0813de04d9ca45c3e4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.border.color.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -table.cell.border.color -color - - -table.cell.border.color -Specifies the border color of table cells - - - - - -black - - - -Description - -Set the color of table cell borders. If non-zero, the value is used -for the border coloration. See CSS. A -color is either a keyword or a numerical RGB specification. -Keywords are aqua, black, blue, fuchsia, gray, green, lime, maroon, -navy, olive, orange, purple, red, silver, teal, white, and -yellow. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.border.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.border.style.xml deleted file mode 100644 index 221a29c33bcb864c1054658463fb9aed7118bd8d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.border.style.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -table.cell.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.cell.border.style -Specifies the border style of table cells - - - - -solid - - - -Description - -Specifies the border style of table cells. - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.border.thickness.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.border.thickness.xml deleted file mode 100644 index 093e38ed846e162b24e2b4a123a2c98563c09312..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.border.thickness.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -table.cell.border.thickness -length - - -table.cell.border.thickness -Specifies the thickness of table cell borders - - - - -0.5pt - - - -Description - -If non-zero, specifies the thickness of borders on table -cells. The units are points. See -CSS - - - To control properties of cell borders in HTML output, you must also turn on the - table.borders.with.css parameter. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.padding.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.padding.xml deleted file mode 100644 index 25fd653581c5ee2dc71788a65791dd41dfa94c22..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.cell.padding.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -table.cell.padding -attribute set - - -table.cell.padding -Specifies the padding of table cells - - - - - - 2pt - 2pt - 2pt - 2pt - - - - -Description - -Specifies the padding of table cells. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.entry.padding.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.entry.padding.xml deleted file mode 100644 index cfd6aa33212f1b2c3a68513d14a07c0e19ebbec4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.entry.padding.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -table.entry.padding -length - - -table.entry.padding - - - - - -2pt - - - -Description - -FIXME: - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.footnote.number.format.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.footnote.number.format.xml deleted file mode 100644 index ebbd2ea3bc1a7f3537ab8440ad02bb14f14ac4bb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.footnote.number.format.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -table.footnote.number.format -list -11,2,3... -AA,B,C... -aa,b,c... -ii,ii,iii... -II,II,III... - - -table.footnote.number.format -Identifies the format used for footnote numbers in tables - - - - -a - - - -Description - -The table.footnote.number.format specifies the format -to use for footnote numeration (1, i, I, a, or A) in tables. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.footnote.number.symbols.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.footnote.number.symbols.xml deleted file mode 100644 index a8d8c23effc870e89f23bdd5066d5bfb08bb7838..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.footnote.number.symbols.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -table.footnote.number.symbols -string - - -table.footnote.number.symbols -Special characters to use a footnote markers in tables - - - - - - - - -Description - -If table.footnote.number.symbols is not the empty string, -table footnotes will use the characters it contains as footnote symbols. For example, -*&#x2020;&#x2021;&#x25CA;&#x2720; will identify -footnotes with *, †, ‡, -â—Š, and ✠. If there are more footnotes -than symbols, the stylesheets will fall back to numbered footnotes using -table.footnote.number.format. - -The use of symbols for footnotes depends on the ability of your -processor (or browser) to render the symbols you select. Not all systems are -capable of displaying the full range of Unicode characters. If the quoted characters -in the preceding paragraph are not displayed properly, that's a good indicator -that you may have trouble using those symbols for footnotes. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.footnote.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.footnote.properties.xml deleted file mode 100644 index 94bed80b253a6191d2d2c74915d80885de00a8c4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.footnote.properties.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -table.footnote.properties -attribute set - - -table.footnote.properties -Properties applied to each table footnote body - - - - - - - - - normal - normal - 2pt - - - - - -Description - -This attribute set is applied to the footnote-block -for each table footnote. -It can be used to set the -font-size, font-family, and other inheritable properties that will be -applied to all table footnotes. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.frame.border.color.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.frame.border.color.xml deleted file mode 100644 index 070cb6a3db9625f420c2994b4c164f39671ac673..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.frame.border.color.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -table.frame.border.color -color - - -table.frame.border.color -Specifies the border color of table frames - - - - - -black - - - -Description - -Specifies the border color of table frames. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.frame.border.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.frame.border.style.xml deleted file mode 100644 index 881840c5ace45a0e379cb21f7cdc8a2e79240038..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.frame.border.style.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -table.frame.border.style -list -none -solid -dotted -dashed -double -groove -ridge -inset -outset -solid - - -table.frame.border.style -Specifies the border style of table frames - - - - -solid - - - -Description - -Specifies the border style of table frames. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.frame.border.thickness.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.frame.border.thickness.xml deleted file mode 100644 index 1eaa04aefc881b02370b921a75eb73bd56ecd216..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.frame.border.thickness.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -table.frame.border.thickness -length - - -table.frame.border.thickness -Specifies the thickness of the frame border - - - - -0.5pt - - - -Description - -Specifies the thickness of the border on the table's frame. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.properties.xml deleted file mode 100644 index 76340c8d33915a9b36f03b9196d7c1ce8424943e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.properties.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -table.properties -attribute set - - -table.properties -Properties associated with the block surrounding a table - - - - - - auto - - - - -Description - -Block styling properties for tables. This parameter should really -have been called table.block.properties or something -like that, but we’re leaving it to avoid backwards-compatibility -problems. - -See also table.table.properties. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.spacer.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.spacer.image.xml deleted file mode 100644 index 12e6d5a521bc8c1669d77174cc33ee23c5608391..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.spacer.image.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -table.spacer.image -filename - - -table.spacer.image -Invisible pixel for tabular accessibility - - - - -graphics/spacer.gif - - - -Description -This is the 1x1 pixel, transparent pixel used for the table trick to increase the accessibility of the tabular -website presentation. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.table.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.table.properties.xml deleted file mode 100644 index 4ee34223c53362187a866829b3240561f90150a6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/table.table.properties.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -table.table.properties -attribute set - - -table.table.properties -Properties associated with a table - - - - - - retain - collapse - - - - -Description - -The styling for tables. This parameter should really -have been called table.properties, but that parameter -name was inadvertently established for the block-level properties -of the table as a whole. - - -See also table.properties. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tablecolumns.extension.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tablecolumns.extension.xml deleted file mode 100644 index 2ec817a3ee75693c94c73d9659e4d3a68a6bb7de..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tablecolumns.extension.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -tablecolumns.extension -boolean - - -tablecolumns.extension -Enable the table columns extension function - - - - - - - - -Description - -The table columns extension function adjusts the widths of table -columns in the HTML result to more accurately reflect the specifications -in the CALS table. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/target.database.document.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/target.database.document.xml deleted file mode 100644 index 042f017374974f3cc24b63633199b7eafddbbb7b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/target.database.document.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -target.database.document -uri - - -target.database.document -Name of master database file for resolving -olinks - - - - olinkdb.xml - - -Description - - -To resolve olinks between documents, the stylesheets use a master -database document that identifies the target datafiles for all the -documents within the scope of the olinks. This parameter value is the -URI of the master document to be read during processing to resolve -olinks. The default value is olinkdb.xml. - -The data structure of the file is defined in the -targetdatabase.dtd DTD. The database file -provides the high level elements to record the identifiers, locations, -and relationships of documents. The cross reference data for -individual documents is generally pulled into the database using -system entity references or XIncludes. See also -targets.filename. - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/targets.filename.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/targets.filename.xml deleted file mode 100644 index de6e29c899c17336d1bfc783560e843e52765c0a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/targets.filename.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -targets.filename -string - - -targets.filename -Name of cross reference targets data file - - -target.db - - -Description - - -In order to resolve olinks efficiently, the stylesheets can -generate an external data file containing information about -all potential cross reference endpoints in a document. -This parameter lets you change the name of the generated -file from the default name target.db. -The name must agree with that used in the target database -used to resolve olinks during processing. -See also target.database.document. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/template.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/template.xml deleted file mode 100644 index 9d35f83f397d89691383404d37b7e2b9420487cd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/template.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -[[NAME]] - - - -[[NAME]] - - - - - - - - - -Description - -FIXME: - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tex.math.delims.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tex.math.delims.xml deleted file mode 100644 index 3a302f795b9e9eca87770baed45ebbed04b1e41d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tex.math.delims.xml +++ /dev/null @@ -1,47 +0,0 @@ - - -tex.math.delims -boolean - - -tex.math.delims -Should equations output for processing by TeX be -surrounded by math mode delimiters? - - - - - - - - -Description - -For compatibility with DSSSL based DBTeXMath from Allin Cottrell -you should set this parameter to 0. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - -Related Parameters - tex.math.in.alt, - passivetex.extensions - - -See Also - You can also use the dbtex delims processing - instruction to control whether delimiters are output. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tex.math.file.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tex.math.file.xml deleted file mode 100644 index fbc6eaa6978f4e107ddd7f4ef1d2b68590a59282..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tex.math.file.xml +++ /dev/null @@ -1,42 +0,0 @@ - - -tex.math.file -string - - -tex.math.file -Name of temporary file for generating images from equations - - - - -tex-math-equations.tex - - - -Description - -Name of auxiliary file for TeX equations. This file can be -processed by dvi2bitmap to get bitmap versions of equations for HTML -output. - - -Related Parameters - tex.math.in.alt, - tex.math.delims, - - -More information - For how-to documentation on embedding TeX equations and - generating output from them, see - DBTeXMath. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tex.math.in.alt.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tex.math.in.alt.xml deleted file mode 100644 index ed1abb97520d52e84aedd134607a201de7acbbd4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/tex.math.in.alt.xml +++ /dev/null @@ -1,76 +0,0 @@ - - -tex.math.in.alt -list -plain -latex - - -tex.math.in.alt -TeX notation used for equations - - - - - - - - -Description - -If you want type math directly in TeX notation in equations, -this parameter specifies notation used. Currently are supported two -values -- plain and latex. Empty -value means that you are not using TeX math at all. - -Preferred way for including TeX alternative of math is inside of -textobject element. Eg.: - -<inlineequation> -<inlinemediaobject> -<imageobject> -<imagedata fileref="eq1.gif"/> -</imageobject> -<textobject><phrase>E=mc squared</phrase></textobject> -<textobject role="tex"><phrase>E=mc^2</phrase></textobject> -</inlinemediaobject> -</inlineequation> - -If you are using graphic element, you can -store TeX inside alt element: - -<inlineequation> -<alt role="tex">a^2+b^2=c^2</alt> -<graphic fileref="a2b2c2.gif"/> -</inlineequation> - -If you want use this feature, you should process your FO with -PassiveTeX, which only supports TeX math notation. When calling -stylsheet, don't forget to specify also -passivetex.extensions=1. - -If you want equations in HTML, just process generated file -tex-math-equations.tex by TeX or LaTeX. Then run -dvi2bitmap program on result DVI file. You will get images for -equations in your document. - - - This feature is useful for print/PDF output only if you - use the obsolete and now unsupported PassiveTeX XSL-FO - engine. - - - - -Related Parameters - tex.math.delims, - passivetex.extensions, - tex.math.file - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.home.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.home.xml deleted file mode 100644 index 0bc81dd796a49a368d4dcf8ecd20a713c57b901f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.home.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -text.home -string - - -text.home -Home - - - - -Home - - - -Description - -FIXME: - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.next.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.next.xml deleted file mode 100644 index d89b8e8e7ccaf1248f9b5aaffcb70bf12f251178..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.next.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -text.next -string - - -text.next -FIXME: - - - - -Next - - - -Description - -FIXME: - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.prev.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.prev.xml deleted file mode 100644 index 62d28e3deb413d49abdf8555727beffd5caa05e6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.prev.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -text.prev -string - - -text.prev -FIXME: - - - - -Prev - - - -Description - -FIXME: - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.toc.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.toc.xml deleted file mode 100644 index 083b8e31a90d4528c6cf05980872d35e7fd088f6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.toc.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -text.toc -string - - -text.toc -FIXME: - - - - -ToC - - - -Description - -FIXME: - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.up.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.up.xml deleted file mode 100644 index f6dca22b87c1a7341ff41ef2ef45498e45bcc4de..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/text.up.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -text.up -string - - -text.up -FIXME: - - - - -Up - - - -Description - -FIXME: - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/textbgcolor.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/textbgcolor.xml deleted file mode 100644 index b9aefe6e930734db0fcc0e19395e803f5afe06d5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/textbgcolor.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -textbgcolor -color - - -textbgcolor -The background color of the table body - - - - -white - - - -Description -The background color of the table body. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/textdata.default.encoding.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/textdata.default.encoding.xml deleted file mode 100644 index b6f30a8b99547433403c124dd281e90cd2294f87..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/textdata.default.encoding.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -textdata.default.encoding -string - - -textdata.default.encoding -Default encoding of external text files which are included -using textdata element - - - - - - - - -Description - -Specifies the encoding of any external text files included using -textdata element. This value is used only when you do -not specify encoding by the appropriate attribute -directly on textdata. An empty string is interpreted as the system -default encoding. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/textinsert.extension.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/textinsert.extension.xml deleted file mode 100644 index a6f1ea40079594b13f61ae65d83ed7e72f908d18..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/textinsert.extension.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - textinsert.extension - boolean - - - textinsert.extension - Enables the textinsert extension element - - - - - - - Description - The textinsert extension element inserts the contents of - a file into the result tree (as text). - - To use the textinsert extension element, you must use - either Saxon or Xalan as your XSLT processor (it doesn’t - work with xsltproc), along with either the DocBook Saxon - extensions or DocBook Xalan extensions (for more - information about those extensions, see DocBook Saxon Extensions and DocBook Xalan Extensions), and you must set both - the use.extensions and - textinsert.extension parameters to - 1. - As an alternative to using the textinsert element, - consider using an Xinclude element with the - parse="text" attribute and value - specified, as detailed in Using XInclude for text inclusions. - - - See Also - You can also use the dbhtml-include href processing - instruction to insert external files — both files containing - plain text and files with markup content (including HTML - content). - - More information - For how-to documentation on inserting contents of - external code files and other text files into output, see - External code files. - For guidelines on inserting contents of - HTML files into output, see Inserting external HTML code. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/title.font.family.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/title.font.family.xml deleted file mode 100644 index 369021f083d232f1c2b59c017be969c7c5658a1d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/title.font.family.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -title.font.family -list -open -serif -sans-serif -monospace - - -title.font.family -The default font family for titles - - - - -sans-serif - - - -Description - -The title font family is used for titles (chapter, section, figure, -etc.) - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/title.margin.left.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/title.margin.left.xml deleted file mode 100644 index dc50dd137ab1f92967cd9fe49029aacb973620f7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/title.margin.left.xml +++ /dev/null @@ -1,65 +0,0 @@ - - -title.margin.left -length - - -title.margin.left -Adjust the left margin for titles - - - - - - - -4pc - 0pt - 0pt - - - - - -Description - -This parameter provides -the means of adjusting the left margin for titles -when the XSL-FO processor being used is -an old version of FOP (0.25 and earlier). -It is only useful when the fop.extensions -is nonzero. - -The left margin of the body region -is calculated to include this space, -and titles are outdented to the left outside -the body region by this amount, -effectively leaving titles at the intended left margin -and the body text indented. -Currently this method is only used for old FOP because -it cannot properly use the body.start.indent -parameter. - - -The default value when the fop.extensions -parameter is nonzero is -4pc, which means the -body text is indented 4 picas relative to -the titles. -The default value when the fop.extensions -parameter equals zero is 0pt, and -the body indent should instead be specified -using the body.start.indent -parameter. - - -If you set the value to zero, be sure to still include -a unit indicator such as 0pt, or -the FO processor will report errors. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/titlefoil.html.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/titlefoil.html.xml deleted file mode 100644 index 5fa2acd5017bc1abacd091ab788eb570dd31ce95..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/titlefoil.html.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -titlefoil.html -filename - - -titlefoil.html -Name of title foil HTML file - - - - - - - - -Description - -Sets the filename used for the slides titlepage. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.bg.color.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.bg.color.xml deleted file mode 100644 index 1389c62b6901ae46c21e1ede44aa9690664a3074..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.bg.color.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -toc.bg.color -color - - -toc.bg.color -Background color for ToC frame - - - - -#FFFFFF - - - -Description - -Specifies the background color used in the ToC frame. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.blank.graphic.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.blank.graphic.xml deleted file mode 100644 index bb24888f82cb919d1d6c110b4ba8c7a93d838faf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.blank.graphic.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -toc.blank.graphic -boolean - - -toc.blank.graphic -Use graphic for "blanks" in TOC? - - - - - - - - -Description -If non-zero, "blanks" in the the TOC will be accomplished -with the graphic identified by toc.spacer.image. - -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.blank.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.blank.image.xml deleted file mode 100644 index 82caa2f321844f130fdab0e0e073ab491b2a34e4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.blank.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -toc.blank.image -filename - - -toc.blank.image -The image for "blanks" in the TOC - - - - -graphics/blank.gif - - - -Description -If toc.blank.graphic is non-zero, this image -will be used to for "blanks" in the TOC. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.blank.text.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.blank.text.xml deleted file mode 100644 index d39aec4fd51342a770945a6d290613c66127966d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.blank.text.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -toc.blank.text -string - - -toc.blank.text -The text for "blanks" in the TOC - - - - -    - - - -Description -If toc.blank.graphic is zero, this text string -will be used for "blanks" in the TOC. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.hide.show.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.hide.show.xml deleted file mode 100644 index 1570ec438b83b733a1fb197ddca4d64f1de10943..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.hide.show.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -toc.hide.show -boolean - - -toc.hide.show -Enable hide/show button for ToC frame - - - - - - - - -Description - -If non-zero, JavaScript (and an additional icon, see -hidetoc.image and -showtoc.image) is added to each slide -to allow the ToC panel to be toggled on each panel. - -There is a bug in Mozilla 1.0 (at least as of CR3) that causes -the browser to reload the titlepage when this feature is used. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.html.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.html.xml deleted file mode 100644 index 62c060c79bc3fcf86306da2d0a43bbaefdbcd581..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.html.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -toc.html -filename - - -toc.html -Name of ToC HTML file - - - - - - - - -Description - -Sets the filename used for the table of contents page. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.image.xml deleted file mode 100644 index 147155cf84ce7caa052ea50ff3eb9e63710d9299..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -toc.image -filename - - -toc.image -ToC image - - - - -active/nav-toc.png - - - -Description - -Specifies the filename of the ToC navigation icon. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.indent.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.indent.width.xml deleted file mode 100644 index 449e74ccb1311c289f2d7aa7c8fc771e17c18cb4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.indent.width.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -toc.indent.width -float - - -toc.indent.width -Amount of indentation for TOC entries - - - - -24 - - - - -Description - -Specifies, in points, the distance by which each level of the -TOC is indented from its parent. - -This value is expressed in points, without -a unit (in other words, it is a bare number). Using a bare number allows the stylesheet -to perform calculations that would otherwise have to be performed by the FO processor -because not all processors support expressions. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.line.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.line.properties.xml deleted file mode 100644 index 0886fa45b6b951a054f7662e724494ebf03febbc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.line.properties.xml +++ /dev/null @@ -1,44 +0,0 @@ - - -toc.line.properties -attribute set - - -toc.line.properties -Properties for lines in ToCs and LoTs - - - - - - justify - start - - - - - - -Description - -Properties which are applied to every line in ToC (or LoT). You can -modify them in order to change appearance of all, or some lines. For -example, in order to make lines for chapters bold, specify the -following in your customization layer: - -<xsl:attribute-set name="toc.line.properties"> - <xsl:attribute name="font-weight"> - <xsl:choose> - <xsl:when test="self::chapter">bold</xsl:when> - <xsl:otherwise>normal</xsl:otherwise> - </xsl:choose> - </xsl:attribute> -</xsl:attribute-set> - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.list.type.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.list.type.xml deleted file mode 100644 index 31dc465df50d6fa4a59790e31d0814db522dfb3f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.list.type.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -toc.list.type -list -dl -ul -ol - - -toc.list.type -Type of HTML list element to use for Tables of Contents - - - -dl - - -Description - -When an automatically generated Table of Contents (or List of Titles) -is produced, this HTML element will be used to make the list. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.margin.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.margin.properties.xml deleted file mode 100644 index 25963df5705a25cc73dab90bc2e6cb33c55df93c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.margin.properties.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -toc.margin.properties -attribute set - - -toc.margin.properties -Margin properties used on Tables of Contents - - - - - - 0.5em - 1em - 2em - 0.5em - 1em - 2em - - - - -Description -This attribute set is used on Tables of Contents. These attributes are set -on the wrapper that surrounds the ToC block, not on each individual lines. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.max.depth.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.max.depth.xml deleted file mode 100644 index 75902b3862f45dc2d90b58e49652bc05e1883db8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.max.depth.xml +++ /dev/null @@ -1,25 +0,0 @@ - - -toc.max.depth -integer - - -toc.max.depth -How many levels should be created for each TOC? - - - -8 - - -Description - -Specifies the maximal depth of TOC on all levels. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.pointer.graphic.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.pointer.graphic.xml deleted file mode 100644 index 4b2cb74f3b4918110b4b8a6c781ddb15caa46084..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.pointer.graphic.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -toc.pointer.graphic -boolean - - -toc.pointer.graphic -Use graphic for TOC pointer? - - - - - - - - -Description -If non-zero, the "pointer" in the TOC will be displayed -with the graphic identified by toc.pointer.image. - -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.pointer.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.pointer.image.xml deleted file mode 100644 index bf0690189c075fe886637b40755c1d7e0157ad7a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.pointer.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -toc.pointer.image -filename - - -toc.pointer.image -The image for the "pointer" in the TOC - - - - -graphics/arrow.gif - - - -Description -If toc.pointer.graphic is non-zero, this image -will be used for the "pointer" in the TOC. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.pointer.text.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.pointer.text.xml deleted file mode 100644 index b094765aebbd4ae9927377d646fa7013ae136500..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.pointer.text.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -toc.pointer.text -string - - -toc.pointer.text -The text for the "pointer" in the TOC - - - - - >  - - - -Description -If toc.pointer.graphic is zero, this text string -will be used to display the "pointer" in the TOC. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.row.height.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.row.height.xml deleted file mode 100644 index 89bac837246bb479b49d8d5e183612741470f68f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.row.height.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -toc.row.height -length - - -toc.row.height -Height of ToC rows in dynamic ToCs - - - - -22 - - - -Description - -This parameter specifies the height of each row in the table of -contents. This is only applicable if a dynamic ToC is used. You may want to -adjust this parameter for optimal appearance with the font and image -sizes selected by your CSS -stylesheet. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.section.depth.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.section.depth.xml deleted file mode 100644 index db99f9c6a4efb435a698aea0d88ad59a0645727c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.section.depth.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -toc.section.depth -integer - - -toc.section.depth -How deep should recursive sections appear -in the TOC? - - - -2 - - -Description - -Specifies the depth to which recursive sections should appear in the -TOC. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.spacer.graphic.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.spacer.graphic.xml deleted file mode 100644 index 0a5729c2392a363185fdf3e142f1860bcd5c559a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.spacer.graphic.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -toc.spacer.graphic -boolean - - -toc.spacer.graphic -Use graphic for TOC spacer? - - - - - - - - -Description -If non-zero, the indentation in the TOC will be accomplished -with the graphic identified by toc.spacer.image. - -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.spacer.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.spacer.image.xml deleted file mode 100644 index 0d550167dc4fc284f0a88dc3248a16893b7e9dbc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.spacer.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -toc.spacer.image -filename - - -toc.spacer.image -The image for spacing the TOC - - - - -graphics/blank.gif - - - -Description -If toc.spacer.graphic is non-zero, this image -will be used to indent the TOC. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.spacer.text.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.spacer.text.xml deleted file mode 100644 index bfb605f5739e9fdc67fd2b7ad45be3c69016c711..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.spacer.text.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -toc.spacer.text -string - - -toc.spacer.text -The text for spacing the TOC - - - - -    - - - -Description -If toc.spacer.graphic is zero, this text string -will be used to indent the TOC. -Only applies with the tabular presentation is being used. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.width.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.width.xml deleted file mode 100644 index 71a3c03b7272a38d15d4a4a83179f5ce8e02de49..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/toc.width.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -toc.width -length - - -toc.width -Width of ToC frame - - - - -250 - - - - -Description - -Specifies the width of the ToC frame in pixels. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ua.js.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ua.js.xml deleted file mode 100644 index 8242a7162feeb1926540c49e8ec56acde4db16b8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ua.js.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -ua.js -filename - - -ua.js -UA JavaScript file - - - - -ua.js - - - -Description - -Specifies the filename of the UA JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.footnotes.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.footnotes.xml deleted file mode 100644 index f17c884a6280a9843d2ca4d876854e7fc3f02b23..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.footnotes.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -ulink.footnotes -boolean - - -ulink.footnotes -Generate footnotes for ulinks? - - - - - - - - -Description - -If non-zero, and if ulink.show also is non-zero, -the URL of each ulink will appear as a footnote. - -DocBook 5 does not have an ulink element. When processing -DocBoook 5 documents, ulink.footnotes applies to all inline -elements that are marked up with xlink:href attributes -that point to external resources. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.hyphenate.chars.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.hyphenate.chars.xml deleted file mode 100644 index 7fdd771d75a8c6efb8694a37f52ed804b4fca783..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.hyphenate.chars.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -ulink.hyphenate.chars -string - - -ulink.hyphenate.chars -List of characters to allow ulink URLs to be automatically hyphenated on - - - - -/ - - - -Description - -If the ulink.hyphenate is not empty, then -hyphenation of ulinks is turned on, and any -character contained in this parameter is treated as an allowable -hyphenation point. - -The default value is /, but the parameter -could be customized -to contain other URL characters, as for example: - -<xsl:param name="ulink.hyphenate.chars">:/@&?.#</xsl:param> - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.hyphenate.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.hyphenate.xml deleted file mode 100644 index 719e9374cf045050c28d1560f93aab7dc7d3ef16..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.hyphenate.xml +++ /dev/null @@ -1,35 +0,0 @@ - - -ulink.hyphenate -string - - -ulink.hyphenate -Allow URLs to be automatically hyphenated - - - - - - - - -Description - -If not empty, the specified character (or more generally, content) is -added to URLs after every character included in the string -in the ulink.hyphenate.chars parameter (default -is /). If the character in this parameter is a -Unicode soft hyphen (0x00AD) or Unicode zero-width space (0x200B), some FO -processors will be able to reasonably hyphenate long URLs. - -As of 28 Jan 2002, discretionary hyphens are more widely and correctly -supported than zero-width spaces for this purpose. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.show.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.show.xml deleted file mode 100644 index 6f90d58004a08425b6f2c4227154c533b2fc71ae..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.show.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -ulink.show -boolean - - -ulink.show -Display URLs after ulinks? - - - - - - - - -Description - -If non-zero, the URL of each ulink will -appear after the text of the link. If the text of the link and the URL -are identical, the URL is suppressed. - -See also ulink.footnotes. - -DocBook 5 does not have an ulink element. When processing -DocBoook 5 documents, ulink.show applies to all inline -elements that are marked up with xlink:href attributes -that point to external resources. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.target.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.target.xml deleted file mode 100644 index cf1d42bd300492083df6a18dc1f3d3643d178509..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/ulink.target.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -ulink.target -string - - -ulink.target -The HTML anchor target for ULinks - - - - -_top - - - -Description - -If ulink.target is non-zero, its value will -be used for the target attribute -on anchors generated for ulinks. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/up.image.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/up.image.xml deleted file mode 100644 index 1c3bfa2141ced4e2e42a3f4058cf94d6844c8799..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/up.image.xml +++ /dev/null @@ -1,27 +0,0 @@ - - -up.image -filename - - -up.image -Up-arrow image - - - - -active/nav-up.png - - - -Description - -Specifies the filename of the upward-pointing navigation arrow. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.embed.for.svg.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.embed.for.svg.xml deleted file mode 100644 index f7c52cc5ffa05522de2ee5368ebe38abbc55baf8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.embed.for.svg.xml +++ /dev/null @@ -1,33 +0,0 @@ - - -use.embed.for.svg -boolean - - -use.embed.for.svg -Use HTML embed for SVG? - - - - - - - - -Description - -If non-zero, an embed element will be created for -SVG figures. An object is always created, -this parameter merely controls whether or not an additional embed -is generated inside the object. - -On the plus side, this may be more portable among browsers and plug-ins. -On the minus side, it isn't valid HTML. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.extensions.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.extensions.xml deleted file mode 100644 index 4dce71bc3b32913b6c606b67dcdd29c51e419604..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.extensions.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -use.extensions -boolean - - -use.extensions -Enable extensions - - - - - - - - -Description - -If non-zero, extensions may be used. Each extension is -further controlled by its own parameter. But if -use.extensions is zero, no extensions will -be used. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.id.as.filename.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.id.as.filename.xml deleted file mode 100644 index e5133e9f5ae80de8dd273253e57b694ba1376ccd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.id.as.filename.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -use.id.as.filename -boolean - - -use.id.as.filename -Use ID value of chunk elements as the filename? - - - - - - - - -Description - -If use.id.as.filename -is non-zero, the filename of chunk elements that have IDs will be -derived from the ID value. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.id.function.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.id.function.xml deleted file mode 100644 index 5f4e6f71aaff244ec72e460d9d87cbf894e337cb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.id.function.xml +++ /dev/null @@ -1,32 +0,0 @@ - - -use.id.function -boolean - - -use.id.function -Use the XPath id() function to find link targets? - - - - - - - - -Description - -If 1, the stylesheets use the id() function -to find the targets of cross reference elements. This is more -efficient, but only works if your XSLT processor implements the -id() function, naturally. -THIS PARAMETER IS NOT SUPPORTED. IT IS ALWAYS ASSUMED TO BE 1. -SEE xref.xsl IF YOU NEED TO TURN IT OFF. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.local.olink.style.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.local.olink.style.xml deleted file mode 100644 index eb4f57aa71ac91d341622e0ed3a2c15ae461defc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.local.olink.style.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -use.local.olink.style -boolean - - -use.local.olink.style -Process olinks using xref style of current -document - - - - -Description - -When cross reference data is collected for use by olinks, the data for each potential target includes one field containing a completely assembled cross reference string, as if it were an xref generated in that document. Other fields record the separate title, number, and element name of each target. When an olink is formed to a target from another document, the olink resolves to that preassembled string by default. If the use.local.olink.style parameter is set to non-zero, then instead the cross -reference string is formed again from the target title, number, and -element name, using the stylesheet processing the targeting document. -Then olinks will match the xref style in the targeting document -rather than in the target document. If both documents are processed -with the same stylesheet, then the results will be the same. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.role.as.xrefstyle.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.role.as.xrefstyle.xml deleted file mode 100644 index 56c4470a4b07f0e85fcfffcd38ca6f6bab16df52..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.role.as.xrefstyle.xml +++ /dev/null @@ -1,93 +0,0 @@ - - -use.role.as.xrefstyle -boolean - - -use.role.as.xrefstyle -Use role attribute for -xrefstyle on xref? - - - - - - - - -Description - -In DocBook documents that conform to a schema older than V4.3, this parameter allows -role to serve the purpose of specifying the cross reference style. - -If non-zero, the role attribute on -xref will be used to select the cross reference style. -In DocBook V4.3, the xrefstyle attribute was added for this purpose. -If the xrefstyle attribute is present, -role will be ignored, regardless of the setting -of this parameter. - - - -Example - -The following small stylesheet shows how to configure the -stylesheets to make use of the cross reference style: - -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - -<xsl:import href="../xsl/html/docbook.xsl"/> - -<xsl:output method="html"/> - -<xsl:param name="local.l10n.xml" select="document('')"/> -<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> - <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en"> - <l:context name="xref"> - <l:template name="chapter" style="title" text="Chapter %n, %t"/> - <l:template name="chapter" text="Chapter %n"/> - </l:context> - </l:l10n> -</l:i18n> - -</xsl:stylesheet> - -With this stylesheet, the cross references in the following document: - -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> -<book id="book"><title>Book</title> - -<preface> -<title>Preface</title> - -<para>Normal: <xref linkend="ch1"/>.</para> -<para>Title: <xref xrefstyle="title" linkend="ch1"/>.</para> - -</preface> - -<chapter id="ch1"> -<title>First Chapter</title> - -<para>Irrelevant.</para> - -</chapter> -</book> - -will appear as: - - -Normal: Chapter 1. -Title: Chapter 1, First Chapter. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.role.for.mediaobject.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.role.for.mediaobject.xml deleted file mode 100644 index 9241aced8cfae4f7d47e4e2838d95bc4865acdbe..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.role.for.mediaobject.xml +++ /dev/null @@ -1,56 +0,0 @@ - - -use.role.for.mediaobject -boolean - - -use.role.for.mediaobject -Use role attribute -value for selecting which of several objects within a mediaobject to use. - - - - - - - - - -Description - -If non-zero, the role attribute on -imageobjects or other objects within a mediaobject container will be used to select which object will be -used. - - -The order of selection when then parameter is non-zero is: - - - - If the stylesheet parameter preferred.mediaobject.role has a value, then the object whose role equals that value is selected. - - -Else if an object's role attribute has a value of -html for HTML processing or -fo for FO output, then the first -of such objects is selected. - - - -Else the first suitable object is selected. - - - -If the value of -use.role.for.mediaobject -is zero, then role attributes are not considered -and the first suitable object -with or without a role value is used. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.svg.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.svg.xml deleted file mode 100644 index 8f13be0f8128d7ecc80e76c8e983d048e73557bb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/use.svg.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -use.svg -boolean - - -use.svg -Allow SVG in the result tree? - - - - - - - - -Description - -If non-zero, SVG will be considered an acceptable image format. SVG -is passed through to the result tree, so correct rendering of the resulting -diagram depends on the formatter (FO processor or web browser) that is used -to process the output from the stylesheet. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.as.blocks.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.as.blocks.xml deleted file mode 100644 index 71e1c98cfd3e787c23fe34ecd4130d24a82437bf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.as.blocks.xml +++ /dev/null @@ -1,62 +0,0 @@ - - -variablelist.as.blocks -boolean - - -variablelist.as.blocks -Format variablelists lists as blocks? - - - - - - - - -Description - -If non-zero, variablelists will be formatted as -blocks. - -If you have long terms, proper list markup in the FO case may produce -unattractive lists. By setting this parameter, you can force the stylesheets -to produce block markup instead of proper lists. - -You can override this setting with a processing instruction as the -child of variablelist: dbfo -list-presentation="blocks" or dbfo -list-presentation="list". - -When using list-presentation="list", -you can also control the amount of space used for the terms with -the dbfo term-width=".25in" processing instruction, -the termlength attribute on variablelist, -or allow the stylesheets to attempt to calculate the amount of space to leave based on the -number of letters in the longest term. - - - <variablelist> - <?dbfo list-presentation="list"?> - <?dbfo term-width="1.5in"?> - <?dbhtml list-presentation="table"?> - <?dbhtml term-width="1.5in"?> - <varlistentry> - <term>list</term> - <listitem> - <para> - Formatted as a list even if variablelist.as.blocks is set to 1. - </para> - </listitem> - </varlistentry> - </variablelist> - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.as.table.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.as.table.xml deleted file mode 100644 index 113d2f58288757ea4cb87e22ab375b0fdb81c8ad..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.as.table.xml +++ /dev/null @@ -1,54 +0,0 @@ - - -variablelist.as.table -boolean - - -variablelist.as.table -Format variablelists as tables? - - - - - - - - -Description - -If non-zero, variablelists will be formatted as -tables. A processing instruction exists to specify a particular width for the -column containing the terms: -dbhtml term-width=".25in" - -You can override this setting with a processing instruction as the -child of variablelist: dbhtml -list-presentation="table" or dbhtml -list-presentation="list". - -This parameter only applies to the HTML transformations. In the -FO case, proper list markup is robust enough to handle the formatting. -But see also variablelist.as.blocks. - - <variablelist> - <?dbhtml list-presentation="table"?> - <?dbhtml term-width="1.5in"?> - <?dbfo list-presentation="list"?> - <?dbfo term-width="1in"?> - <varlistentry> - <term>list</term> - <listitem> - <para> - Formatted as a table even if variablelist.as.table is set to 0. - </para> - </listitem> - </varlistentry> - </variablelist> - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.max.termlength.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.max.termlength.xml deleted file mode 100644 index ff56a8786e491c88e40a2df9f35ded43a6aa1fee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.max.termlength.xml +++ /dev/null @@ -1,46 +0,0 @@ - - -variablelist.max.termlength -number - - -variablelist.max.termlength -Specifies the longest term in variablelists - - - - -24 - - - -Description - -In variablelists, the listitem -is indented to leave room for the -term elements. That indent may be computed -if it is not specified with a termlength -attribute on the variablelist element. - - -The computation counts characters in the -term elements in the list -to find the longest term. However, some terms are very long -and would produce extreme indents. This parameter lets you -set a maximum character count. Any terms longer than the maximum -would line wrap. The default value is 24. - - -The character counts are converted to physical widths -by multiplying by 0.50em. There will be some variability -in how many actual characters fit in the space -since some characters are wider than others. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.term.break.after.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.term.break.after.xml deleted file mode 100644 index 8472f5ec296e1e15e4f09d9aaadd8a23680a9222..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.term.break.after.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -variablelist.term.break.after -boolean - - -variablelist.term.break.after -Generate line break after each term within a -multi-term varlistentry? - - - - -0 - - -Description - -Set a non-zero value for the -variablelist.term.break.after parameter to -generate a line break between terms in a -multi-term varlistentry. - - -If you set a non-zero value for -variablelist.term.break.after, you may also -want to set the value of the -variablelist.term.separator parameter to an -empty string (to suppress rendering of the default comma and space -after each term). - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.term.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.term.properties.xml deleted file mode 100644 index 4a4835de4788ab1c307f620f2e0655bba16f8869..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.term.properties.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -variablelist.term.properties -attribute set - - -variablelist.term.properties -To add properties to the term elements in a variablelist. - - - - - - - - -Description -These properties are added to the block containing a -term in a variablelist. -Use this attribute-set to set -font properties or alignment, for example. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.term.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.term.separator.xml deleted file mode 100644 index f3df883b023a894657b214e6f143e5fae308b774..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/variablelist.term.separator.xml +++ /dev/null @@ -1,40 +0,0 @@ - - -variablelist.term.separator -string - - -variablelist.term.separator -Text to separate terms within a multi-term -varlistentry - - - - -, - - -Description - -When a varlistentry contains multiple term -elements, the string specified in the value of the -variablelist.term.separator parameter is placed -after each term except the last. - - - To generate a line break between multiple terms in - a varlistentry, set a non-zero value for the - variablelist.term.break.after parameter. If - you do so, you may also want to set the value of the - variablelist.term.separator parameter to an - empty string (to suppress rendering of the default comma and space - after each term). - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/verbatim.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/verbatim.properties.xml deleted file mode 100644 index 28a368ae38002912fead374f636f6e2ff83be857..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/verbatim.properties.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -verbatim.properties -attribute set - - -verbatim.properties -Properties associated with verbatim text - - - - - - 0.8em - 1em - 1.2em - 0.8em - 1em - 1.2em - false - no-wrap - false - preserve - preserve - start - - - -Description -This attribute set is used on all verbatim environments. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/wordml.template.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/wordml.template.xml deleted file mode 100644 index 4dae8a89ea68ce848bdd0648c813952ae2c6ec91..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/wordml.template.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -wordml.template -uri - - -wordml.template -Specify the template WordML document - - - - - - - - -Description - -The wordml.template parameter specifies a WordML document to use as a template for the generated document. The template document is used to define the (extensive) headers for the generated document, in particular the paragraph and character styles that are used to format the various elements. Any content in the template document is ignored. - -A template document is used in order to allow maintenance of the paragraph and character styles to be done using Word itself, rather than these XSL stylesheets. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/writing.mode.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/writing.mode.xml deleted file mode 100644 index c6959333d2375ec7ea02f607e19532a11d10fae9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/writing.mode.xml +++ /dev/null @@ -1,83 +0,0 @@ - - -writing.mode -string - - -writing.mode -Direction of text flow based on locale - - - - - - - writing-mode - - - - - - - - - - -Description - -Sets direction of text flow and text alignment based on locale. -The value is normally taken from the gentext file for the -lang attribute of the document's root element, using the -key name 'writing-mode' to look it up in the gentext file. -But the param can also be -set on the command line to override that gentext value. - -Accepted values are: - - - lr-tb - - Left-to-right text flow in each line, lines stack top to bottom. - - - - rl-tb - - Right-to-left text flow in each line, lines stack top to bottom. - - - - tb-rl - - Top-to-bottom text flow in each vertical line, lines stack right to left. - Supported by only a few XSL-FO processors. Not supported in HTML output. - - - - lr - - Shorthand for lr-tb. - - - - rl - - Shorthand for rl-tb. - - - - tb - - Shorthand for tb-rl. - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbCollapsibleLists.js.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbCollapsibleLists.js.xml deleted file mode 100644 index b30391f1a7ce216936f6cb4924371bbdd73a45d4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbCollapsibleLists.js.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -xbCollapsibleLists.js -filename - - -xbCollapsibleLists.js -xbCollapsibleLists JavaScript file - - - - -xbCollapsibleLists.js - - - -Description - -Specifies the filename of the xbCollapsibleLists JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbDOM.js.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbDOM.js.xml deleted file mode 100644 index a699e9c912b6af416741e8e6c78518b04220106b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbDOM.js.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -xbDOM.js -filename - - -xbDOM.js -xbDOM JavaScript file - - - - -xbDOM.js - - - -Description - -Specifies the filename of the xbDOM JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbLibrary.js.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbLibrary.js.xml deleted file mode 100644 index fe2d8fee350deb2b9b4d6d4a2dcda3f5d0eefd4c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbLibrary.js.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -xbLibrary.js -filename - - -xbLibrary.js -xbLibrary JavaScript file - - - - -xbLibrary.js - - - -Description - -Specifies the filename of the xbLibrary JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbStyle.js.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbStyle.js.xml deleted file mode 100644 index b587573e268ca8c5dc8609bc9362e24eebf645c5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xbStyle.js.xml +++ /dev/null @@ -1,28 +0,0 @@ - - -xbStyle.js -filename - - -xbStyle.js -xbStyle JavaScript file - - - - -xbStyle.js - - - -Description - -Specifies the filename of the xbStyle JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xep.extensions.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xep.extensions.xml deleted file mode 100644 index 8ac2520159b0eb7e1096669536503779ee222753..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xep.extensions.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -xep.extensions -boolean - - -xep.extensions -Enable XEP extensions? - - - - - - -Description - -If non-zero, -XEP -extensions will be used. XEP extensions consists of PDF bookmarks, -document information and better index processing. - - -This parameter can also affect which graphics file formats -are supported - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xep.index.item.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xep.index.item.properties.xml deleted file mode 100644 index b1db1290a5458106ba1eacd2e2c53d28a30f48c2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xep.index.item.properties.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -xep.index.item.properties -attribute set - - -xep.index.item.properties -Properties associated with XEP index-items - - - - - - true - true - - - - -Description - -Properties associated with XEP index-items, which generate -page numbers in an index processed by XEP. For more info see -the XEP documentation section "Indexes" in -http://www.renderx.com/reference.html#Indexes. - -This attribute-set also adds by default any properties from the -index.page.number.properties -attribute-set. - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.label-page.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.label-page.separator.xml deleted file mode 100644 index 355fc4a485e09827807672e5a9ebb4c996bc2a3c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.label-page.separator.xml +++ /dev/null @@ -1,38 +0,0 @@ - - -xref.label-page.separator -string - - -xref.label-page.separator -Punctuation or space separating label from page number in xref - - - - - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and page -but no title, -then the value of this parameter is inserted between -label and page number in the output. -If a title is included, then other separators are used. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.label-title.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.label-title.separator.xml deleted file mode 100644 index 3d6e222744e428ba495d77637ff5fa11572e76eb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.label-title.separator.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -xref.label-title.separator -string - - -xref.label-title.separator -Punctuation or space separating label from title in xref - - - -: - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both label and title, -then the value of this parameter is inserted between -label and title in the output. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.properties.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.properties.xml deleted file mode 100644 index 6438f6c8760725e63d371511a83cd49870023a7b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.properties.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -xref.properties -attribute set - - -xref.properties -Properties associated with cross-reference text - - - - - - - - - -Description - -This attribute set is used to set properties -on cross reference text. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.title-page.separator.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.title-page.separator.xml deleted file mode 100644 index 32ef9f14964501c383a853f6d86c21514e85c7dc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.title-page.separator.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -xref.title-page.separator -string - - -xref.title-page.separator -Punctuation or space separating title from page number in xref - - - - - - -Description - - -This parameter allows you to control the punctuation of certain -types of generated cross reference text. -When cross reference text is generated for an -xref or -olink element -using an xrefstyle attribute -that makes use of the select: feature, -and the selected components include both title and page number, -then the value of this parameter is inserted between -title and page number in the output. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.with.number.and.title.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.with.number.and.title.xml deleted file mode 100644 index 06fcc7e63b5494d8e5ffa49e438e3ddf042dcfe5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/params/xref.with.number.and.title.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -xref.with.number.and.title -boolean - - -xref.with.number.and.title -Use number and title in cross references - - - - - - - - -Description - -A cross reference may include the number (for example, the number of -an example or figure) and the title which is a required child of some -targets. This parameter inserts both the relevant number as well as -the title into the link. - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html deleted file mode 100644 index 789d3f978638f57a7131ea903b5bc1bdb6982d8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/profiling - - -

    Index of /release/xsl-ns/1.76.1/profiling

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] strip-attributes.xsl 01-Nov-2010 20:31 712 -[TXT] profile.xsl 01-Nov-2010 20:31 2.3K -[TXT] xsl2profile.xsl 01-Nov-2010 20:31 5.8K -[TXT] profile-mode.xsl 01-Nov-2010 20:31 9.4K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=D;O=A deleted file mode 100644 index 9251b22063bba1a530bf80f3da65ae180145a1e0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=D;O=A +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/profiling - - -

    Index of /release/xsl-ns/1.76.1/profiling

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-mode.xsl 01-Nov-2010 20:31 9.4K -[TXT] profile.xsl 01-Nov-2010 20:31 2.3K -[TXT] strip-attributes.xsl 01-Nov-2010 20:31 712 -[TXT] xsl2profile.xsl 01-Nov-2010 20:31 5.8K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=D;O=D deleted file mode 100644 index da4f322316bd0725cefd30f81a9ae4f3d0b92ba1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=D;O=D +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/profiling - - -

    Index of /release/xsl-ns/1.76.1/profiling

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xsl2profile.xsl 01-Nov-2010 20:31 5.8K -[TXT] strip-attributes.xsl 01-Nov-2010 20:31 712 -[TXT] profile.xsl 01-Nov-2010 20:31 2.3K -[TXT] profile-mode.xsl 01-Nov-2010 20:31 9.4K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=M;O=A deleted file mode 100644 index 63aab58fe74c517d4c6fbf26c2d32bbd55cb1c8f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=M;O=A +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/profiling - - -

    Index of /release/xsl-ns/1.76.1/profiling

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-mode.xsl 01-Nov-2010 20:31 9.4K -[TXT] strip-attributes.xsl 01-Nov-2010 20:31 712 -[TXT] xsl2profile.xsl 01-Nov-2010 20:31 5.8K -[TXT] profile.xsl 01-Nov-2010 20:31 2.3K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=M;O=D deleted file mode 100644 index 9f8301414fb68f191e8d00e8c73aa177e545e4c2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=M;O=D +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/profiling - - -

    Index of /release/xsl-ns/1.76.1/profiling

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile.xsl 01-Nov-2010 20:31 2.3K -[TXT] xsl2profile.xsl 01-Nov-2010 20:31 5.8K -[TXT] strip-attributes.xsl 01-Nov-2010 20:31 712 -[TXT] profile-mode.xsl 01-Nov-2010 20:31 9.4K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=N;O=A deleted file mode 100644 index bbf2b2deee6265c1aebe0e8426b0516b7418a327..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=N;O=A +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/profiling - - -

    Index of /release/xsl-ns/1.76.1/profiling

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-mode.xsl 01-Nov-2010 20:31 9.4K -[TXT] profile.xsl 01-Nov-2010 20:31 2.3K -[TXT] strip-attributes.xsl 01-Nov-2010 20:31 712 -[TXT] xsl2profile.xsl 01-Nov-2010 20:31 5.8K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=N;O=D deleted file mode 100644 index da4f322316bd0725cefd30f81a9ae4f3d0b92ba1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=N;O=D +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/profiling - - -

    Index of /release/xsl-ns/1.76.1/profiling

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xsl2profile.xsl 01-Nov-2010 20:31 5.8K -[TXT] strip-attributes.xsl 01-Nov-2010 20:31 712 -[TXT] profile.xsl 01-Nov-2010 20:31 2.3K -[TXT] profile-mode.xsl 01-Nov-2010 20:31 9.4K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=S;O=A deleted file mode 100644 index 789d3f978638f57a7131ea903b5bc1bdb6982d8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=S;O=A +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/profiling - - -

    Index of /release/xsl-ns/1.76.1/profiling

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] strip-attributes.xsl 01-Nov-2010 20:31 712 -[TXT] profile.xsl 01-Nov-2010 20:31 2.3K -[TXT] xsl2profile.xsl 01-Nov-2010 20:31 5.8K -[TXT] profile-mode.xsl 01-Nov-2010 20:31 9.4K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=S;O=D deleted file mode 100644 index a70c9b9d0bb6a67e1cff295ca2a27db62e50cdad..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/index.html?C=S;O=D +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/profiling - - -

    Index of /release/xsl-ns/1.76.1/profiling

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] profile-mode.xsl 01-Nov-2010 20:31 9.4K -[TXT] xsl2profile.xsl 01-Nov-2010 20:31 5.8K -[TXT] profile.xsl 01-Nov-2010 20:31 2.3K -[TXT] strip-attributes.xsl 01-Nov-2010 20:31 712 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/profile-mode.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/profile-mode.xsl deleted file mode 100644 index c02132a948e1fd35f3a94039d2cf2f6b7b0ef3e5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/profile-mode.xsl +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/profile.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/profile.xsl deleted file mode 100644 index 1fd5ee6bf7ddb8c5c8de5089c871598facca2fd1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/profile.xsl +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 0 - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/strip-attributes.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/strip-attributes.xsl deleted file mode 100644 index d6f55fb5039b921161d70ff51e81b84198eef1a0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/strip-attributes.xsl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/xsl2profile.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/xsl2profile.xsl deleted file mode 100644 index b6648aa4e4df352d294c67391f7ea0adeadeec7c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/profiling/xsl2profile.xsl +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - This file was created automatically by xsl2profile - from the DocBook XSL stylesheets. - - - - - - - dummy - dummy - dummy - - exslt - - - exslt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Note: namesp. cut : stripped namespace before processing - - - - Note: namesp. cut : processing stripped document - - - - - - - - - - - - - - - - - - - - - - - - - - - $profiled-nodes - - - $profiled-nodes - - - - - - - - - - - - - - - - - - - key('id',$rootid) - $profiled-nodes//*[@id=$rootid] - - - - - - - - - - - - - - - - - $profiled-nodes/node() - - - - - - - - false() - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/blocks-spec.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/blocks-spec.xml deleted file mode 100644 index d8ab0057292b9255347b8cb6ee0c61565a8b475d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/blocks-spec.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/blocks2dbk.dtd b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/blocks2dbk.dtd deleted file mode 100644 index 4d1ea043c87ce324b337f9fcb906179beb40fde2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/blocks2dbk.dtd +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/blocks2dbk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/blocks2dbk.xsl deleted file mode 100644 index 188c93e7b0ae0f05f80e9d7427e1cb4751969dc0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/blocks2dbk.xsl +++ /dev/null @@ -1,1734 +0,0 @@ - - -%ext; -]> - - - - - - - - - - - - - 0 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - style "" is not a valid list style - - - - - - - - - - list-wrong-level - list started at the wrong level - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - improper-blockquote-attribution - blockquote attribution must follow a blockquote title - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - formalpara-notitle - formalpara used without a title - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bad-caption - caption does not follow table or figure - - - - - - - - - - - - - - unknown-style - unknown paragraph style "" encountered - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - imagedata-metadata missing value for attribute " - - " - - - - - - - - - - - - 1 - 0 - - - - - - - - - - - - - - imagedata-metadata unknown attribute " - - " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bold - - - - - - - - underline - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - unknown-style - unknown character span style "" encountered - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bad-metadata - style "" must not be metadata for parent "" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bad-author-orgname-combo - character span "" not allowed in an author paragraph combined with orgname - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bad-titleabbrev - titleabbrev style "" mismatches parent "" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bad-title - title style "" mismatches parent "" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bad-subtitle - subtitle style "" mismatches parent "" - - - - - - - - - - bad-publisher-address - publisher-address must follow publisher - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bad-author-inline - character span "" not allowed in an author paragraph - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - metadata-bad-inline - character span "" not allowed in author metadata - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR "": - - - - - - - - - - - - - - - - WARNING "": - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2ooo.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2ooo.xsl deleted file mode 100644 index beca1a4684358666734c24489c54703ab5e47dd7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2ooo.xsl +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2pages.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2pages.xsl deleted file mode 100644 index e16fc5f812ec8fee1336994e1eff44e5037b3c44..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2pages.xsl +++ /dev/null @@ -1,442 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - Please specify the template document with the "pages.template" parameter - - - Unable to open template document "" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DocBookRoundtrip-1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - email - - - - - - - - - - - - - - - - - - - - - - - - - SFTTableAttachment- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - attribute-name - - - - - - - - attribute-value - - - - - - - - - - - - - para - - - - - - - - unable to find paragraph style "" - - - - - - - - - unable to find character style "" - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2wordml.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2wordml.xsl deleted file mode 100644 index 3add3843677cba3f510dd83276623bf5e24745fb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2wordml.xsl +++ /dev/null @@ -1,402 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - Please specify the template document with the "wordml.template" parameter - - - Unable to open template document "" - - - - progid="Word.Document" - - - - - - - - preserve - - - - - - - - Unknown - - - - - - - - - - - Unknown - - - 1 - - - - 2004-01-01T07:07:00Z - 2004-01-01T08:08:00Z - - 1 - 1 - 1 - - - DocBook - - 1 - 1 - 1 - 11.6113 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2wp.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2wp.xsl deleted file mode 100644 index 26af5915becdda14eb80ddf45b76a76db6be692b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/dbk2wp.xsl +++ /dev/null @@ -1,1376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - section nested deeper than 5 levels - - sect5- - - - - sect - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Metadata - - TODO: Handle all metadata elements, apart from titles. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - abstract - - - - - - - - - - - - - - - - - - - - - - - - - - - mailto: - - - - - - - - - Hyperlink - - - - - - - - - - - - - - - otheraddr - - - - - - otheraddr - - - - - - - - - otheraddr - - - - - - otheraddr - - - - - - - - - - Hyperlink - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - para - - - - - - - - - - - - - - - Normal - - - - - - - - - - - - - - Normal - - - - - - - - - - - - - - - - simpara - - - - - - - - - - 1 - 0 - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Text Object - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Caption - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - ] - - encountered - - in - - - , but no template matches. - - - - - - - - - - - - - [ - - ] - - encountered - - in - - - , but no template matches. - - - - - - - - - - - - encountered - - in - - - , but no template matches. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WARNING: - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html deleted file mode 100644 index ab150fa9c7aa16fe612073ba145163f5a24ec455..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/roundtrip - - -

    Index of /release/xsl-ns/1.76.1/roundtrip

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] blocks-spec.xml 01-Nov-2010 20:31 422 -[TXT] param.xsl 01-Nov-2010 20:31 802 -[TXT] sections-spec.xml 01-Nov-2010 20:31 1.4K -[TXT] normalise-common.xsl 01-Nov-2010 20:31 1.4K -[TXT] blocks2dbk.dtd 01-Nov-2010 20:31 2.3K -[TXT] param.xml 01-Nov-2010 20:31 4.1K -[TXT] dbk2ooo.xsl 01-Nov-2010 20:31 5.9K -[TXT] dbk2wordml.xsl 01-Nov-2010 20:31 12K -[TXT] pages2normalise.xsl 01-Nov-2010 20:31 14K -[TXT] sections2blocks.xsl 01-Nov-2010 20:31 16K -[TXT] dbk2pages.xsl 01-Nov-2010 20:31 16K -[TXT] wordml2normalise.xsl 01-Nov-2010 20:31 17K -[   ] template.dot 01-Nov-2010 20:31 38K -[TXT] dbk2wp.xsl 01-Nov-2010 20:31 55K -[TXT] specifications.xml 01-Nov-2010 20:31 66K -[TXT] blocks2dbk.xsl 01-Nov-2010 20:31 68K -[TXT] normalise2sections.xsl 01-Nov-2010 20:31 73K -[TXT] template.xml 01-Nov-2010 20:31 85K -[TXT] template-pages.xml 01-Nov-2010 20:31 417K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=D;O=A deleted file mode 100644 index 8c860ecd1ea59fc9b7a3665c41b97614849ea36e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=D;O=A +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/roundtrip - - -

    Index of /release/xsl-ns/1.76.1/roundtrip

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] blocks-spec.xml 01-Nov-2010 20:31 422 -[TXT] blocks2dbk.dtd 01-Nov-2010 20:31 2.3K -[TXT] blocks2dbk.xsl 01-Nov-2010 20:31 68K -[TXT] dbk2ooo.xsl 01-Nov-2010 20:31 5.9K -[TXT] dbk2pages.xsl 01-Nov-2010 20:31 16K -[TXT] dbk2wordml.xsl 01-Nov-2010 20:31 12K -[TXT] dbk2wp.xsl 01-Nov-2010 20:31 55K -[TXT] normalise-common.xsl 01-Nov-2010 20:31 1.4K -[TXT] normalise2sections.xsl 01-Nov-2010 20:31 73K -[TXT] pages2normalise.xsl 01-Nov-2010 20:31 14K -[TXT] param.xml 01-Nov-2010 20:31 4.1K -[TXT] param.xsl 01-Nov-2010 20:31 802 -[TXT] sections-spec.xml 01-Nov-2010 20:31 1.4K -[TXT] sections2blocks.xsl 01-Nov-2010 20:31 16K -[TXT] specifications.xml 01-Nov-2010 20:31 66K -[TXT] template-pages.xml 01-Nov-2010 20:31 417K -[   ] template.dot 01-Nov-2010 20:31 38K -[TXT] template.xml 01-Nov-2010 20:31 85K -[TXT] wordml2normalise.xsl 01-Nov-2010 20:31 17K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=D;O=D deleted file mode 100644 index 0f1280cd0f56aaa02a8f7855f08c234ba0d5f9b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=D;O=D +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/roundtrip - - -

    Index of /release/xsl-ns/1.76.1/roundtrip

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] wordml2normalise.xsl 01-Nov-2010 20:31 17K -[TXT] template.xml 01-Nov-2010 20:31 85K -[   ] template.dot 01-Nov-2010 20:31 38K -[TXT] template-pages.xml 01-Nov-2010 20:31 417K -[TXT] specifications.xml 01-Nov-2010 20:31 66K -[TXT] sections2blocks.xsl 01-Nov-2010 20:31 16K -[TXT] sections-spec.xml 01-Nov-2010 20:31 1.4K -[TXT] param.xsl 01-Nov-2010 20:31 802 -[TXT] param.xml 01-Nov-2010 20:31 4.1K -[TXT] pages2normalise.xsl 01-Nov-2010 20:31 14K -[TXT] normalise2sections.xsl 01-Nov-2010 20:31 73K -[TXT] normalise-common.xsl 01-Nov-2010 20:31 1.4K -[TXT] dbk2wp.xsl 01-Nov-2010 20:31 55K -[TXT] dbk2wordml.xsl 01-Nov-2010 20:31 12K -[TXT] dbk2pages.xsl 01-Nov-2010 20:31 16K -[TXT] dbk2ooo.xsl 01-Nov-2010 20:31 5.9K -[TXT] blocks2dbk.xsl 01-Nov-2010 20:31 68K -[TXT] blocks2dbk.dtd 01-Nov-2010 20:31 2.3K -[TXT] blocks-spec.xml 01-Nov-2010 20:31 422 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=M;O=A deleted file mode 100644 index 864aadcaf0af7af4f8f0c5807909c3ce097ffa03..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=M;O=A +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/roundtrip - - -

    Index of /release/xsl-ns/1.76.1/roundtrip

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] blocks-spec.xml 01-Nov-2010 20:31 422 -[TXT] blocks2dbk.dtd 01-Nov-2010 20:31 2.3K -[TXT] param.xml 01-Nov-2010 20:31 4.1K -[TXT] sections-spec.xml 01-Nov-2010 20:31 1.4K -[TXT] specifications.xml 01-Nov-2010 20:31 66K -[TXT] template-pages.xml 01-Nov-2010 20:31 417K -[   ] template.dot 01-Nov-2010 20:31 38K -[TXT] template.xml 01-Nov-2010 20:31 85K -[TXT] blocks2dbk.xsl 01-Nov-2010 20:31 68K -[TXT] dbk2ooo.xsl 01-Nov-2010 20:31 5.9K -[TXT] dbk2pages.xsl 01-Nov-2010 20:31 16K -[TXT] dbk2wordml.xsl 01-Nov-2010 20:31 12K -[TXT] dbk2wp.xsl 01-Nov-2010 20:31 55K -[TXT] normalise-common.xsl 01-Nov-2010 20:31 1.4K -[TXT] normalise2sections.xsl 01-Nov-2010 20:31 73K -[TXT] pages2normalise.xsl 01-Nov-2010 20:31 14K -[TXT] param.xsl 01-Nov-2010 20:31 802 -[TXT] sections2blocks.xsl 01-Nov-2010 20:31 16K -[TXT] wordml2normalise.xsl 01-Nov-2010 20:31 17K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=M;O=D deleted file mode 100644 index be8423f8fe448e5558cda570bd3b20d133977152..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=M;O=D +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/roundtrip - - -

    Index of /release/xsl-ns/1.76.1/roundtrip

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] wordml2normalise.xsl 01-Nov-2010 20:31 17K -[TXT] sections2blocks.xsl 01-Nov-2010 20:31 16K -[TXT] param.xsl 01-Nov-2010 20:31 802 -[TXT] pages2normalise.xsl 01-Nov-2010 20:31 14K -[TXT] normalise2sections.xsl 01-Nov-2010 20:31 73K -[TXT] normalise-common.xsl 01-Nov-2010 20:31 1.4K -[TXT] dbk2wp.xsl 01-Nov-2010 20:31 55K -[TXT] dbk2wordml.xsl 01-Nov-2010 20:31 12K -[TXT] dbk2pages.xsl 01-Nov-2010 20:31 16K -[TXT] dbk2ooo.xsl 01-Nov-2010 20:31 5.9K -[TXT] blocks2dbk.xsl 01-Nov-2010 20:31 68K -[TXT] template.xml 01-Nov-2010 20:31 85K -[   ] template.dot 01-Nov-2010 20:31 38K -[TXT] template-pages.xml 01-Nov-2010 20:31 417K -[TXT] specifications.xml 01-Nov-2010 20:31 66K -[TXT] sections-spec.xml 01-Nov-2010 20:31 1.4K -[TXT] param.xml 01-Nov-2010 20:31 4.1K -[TXT] blocks2dbk.dtd 01-Nov-2010 20:31 2.3K -[TXT] blocks-spec.xml 01-Nov-2010 20:31 422 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=N;O=A deleted file mode 100644 index cd78eb3b1429a6f90353594c4c415eb36107206c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=N;O=A +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/roundtrip - - -

    Index of /release/xsl-ns/1.76.1/roundtrip

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] blocks-spec.xml 01-Nov-2010 20:31 422 -[TXT] blocks2dbk.dtd 01-Nov-2010 20:31 2.3K -[TXT] blocks2dbk.xsl 01-Nov-2010 20:31 68K -[TXT] dbk2ooo.xsl 01-Nov-2010 20:31 5.9K -[TXT] dbk2pages.xsl 01-Nov-2010 20:31 16K -[TXT] dbk2wordml.xsl 01-Nov-2010 20:31 12K -[TXT] dbk2wp.xsl 01-Nov-2010 20:31 55K -[TXT] normalise-common.xsl 01-Nov-2010 20:31 1.4K -[TXT] normalise2sections.xsl 01-Nov-2010 20:31 73K -[TXT] pages2normalise.xsl 01-Nov-2010 20:31 14K -[TXT] param.xml 01-Nov-2010 20:31 4.1K -[TXT] param.xsl 01-Nov-2010 20:31 802 -[TXT] sections-spec.xml 01-Nov-2010 20:31 1.4K -[TXT] sections2blocks.xsl 01-Nov-2010 20:31 16K -[TXT] specifications.xml 01-Nov-2010 20:31 66K -[TXT] template-pages.xml 01-Nov-2010 20:31 417K -[   ] template.dot 01-Nov-2010 20:31 38K -[TXT] template.xml 01-Nov-2010 20:31 85K -[TXT] wordml2normalise.xsl 01-Nov-2010 20:31 17K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=N;O=D deleted file mode 100644 index 0f1280cd0f56aaa02a8f7855f08c234ba0d5f9b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=N;O=D +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/roundtrip - - -

    Index of /release/xsl-ns/1.76.1/roundtrip

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] wordml2normalise.xsl 01-Nov-2010 20:31 17K -[TXT] template.xml 01-Nov-2010 20:31 85K -[   ] template.dot 01-Nov-2010 20:31 38K -[TXT] template-pages.xml 01-Nov-2010 20:31 417K -[TXT] specifications.xml 01-Nov-2010 20:31 66K -[TXT] sections2blocks.xsl 01-Nov-2010 20:31 16K -[TXT] sections-spec.xml 01-Nov-2010 20:31 1.4K -[TXT] param.xsl 01-Nov-2010 20:31 802 -[TXT] param.xml 01-Nov-2010 20:31 4.1K -[TXT] pages2normalise.xsl 01-Nov-2010 20:31 14K -[TXT] normalise2sections.xsl 01-Nov-2010 20:31 73K -[TXT] normalise-common.xsl 01-Nov-2010 20:31 1.4K -[TXT] dbk2wp.xsl 01-Nov-2010 20:31 55K -[TXT] dbk2wordml.xsl 01-Nov-2010 20:31 12K -[TXT] dbk2pages.xsl 01-Nov-2010 20:31 16K -[TXT] dbk2ooo.xsl 01-Nov-2010 20:31 5.9K -[TXT] blocks2dbk.xsl 01-Nov-2010 20:31 68K -[TXT] blocks2dbk.dtd 01-Nov-2010 20:31 2.3K -[TXT] blocks-spec.xml 01-Nov-2010 20:31 422 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=S;O=A deleted file mode 100644 index ab150fa9c7aa16fe612073ba145163f5a24ec455..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=S;O=A +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/roundtrip - - -

    Index of /release/xsl-ns/1.76.1/roundtrip

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] blocks-spec.xml 01-Nov-2010 20:31 422 -[TXT] param.xsl 01-Nov-2010 20:31 802 -[TXT] sections-spec.xml 01-Nov-2010 20:31 1.4K -[TXT] normalise-common.xsl 01-Nov-2010 20:31 1.4K -[TXT] blocks2dbk.dtd 01-Nov-2010 20:31 2.3K -[TXT] param.xml 01-Nov-2010 20:31 4.1K -[TXT] dbk2ooo.xsl 01-Nov-2010 20:31 5.9K -[TXT] dbk2wordml.xsl 01-Nov-2010 20:31 12K -[TXT] pages2normalise.xsl 01-Nov-2010 20:31 14K -[TXT] sections2blocks.xsl 01-Nov-2010 20:31 16K -[TXT] dbk2pages.xsl 01-Nov-2010 20:31 16K -[TXT] wordml2normalise.xsl 01-Nov-2010 20:31 17K -[   ] template.dot 01-Nov-2010 20:31 38K -[TXT] dbk2wp.xsl 01-Nov-2010 20:31 55K -[TXT] specifications.xml 01-Nov-2010 20:31 66K -[TXT] blocks2dbk.xsl 01-Nov-2010 20:31 68K -[TXT] normalise2sections.xsl 01-Nov-2010 20:31 73K -[TXT] template.xml 01-Nov-2010 20:31 85K -[TXT] template-pages.xml 01-Nov-2010 20:31 417K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=S;O=D deleted file mode 100644 index 69c381f826e860d5875473bd03f7199a1fc2f590..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/index.html?C=S;O=D +++ /dev/null @@ -1,30 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/roundtrip - - -

    Index of /release/xsl-ns/1.76.1/roundtrip

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] template-pages.xml 01-Nov-2010 20:31 417K -[TXT] template.xml 01-Nov-2010 20:31 85K -[TXT] normalise2sections.xsl 01-Nov-2010 20:31 73K -[TXT] blocks2dbk.xsl 01-Nov-2010 20:31 68K -[TXT] specifications.xml 01-Nov-2010 20:31 66K -[TXT] dbk2wp.xsl 01-Nov-2010 20:31 55K -[   ] template.dot 01-Nov-2010 20:31 38K -[TXT] wordml2normalise.xsl 01-Nov-2010 20:31 17K -[TXT] dbk2pages.xsl 01-Nov-2010 20:31 16K -[TXT] sections2blocks.xsl 01-Nov-2010 20:31 16K -[TXT] pages2normalise.xsl 01-Nov-2010 20:31 14K -[TXT] dbk2wordml.xsl 01-Nov-2010 20:31 12K -[TXT] dbk2ooo.xsl 01-Nov-2010 20:31 5.9K -[TXT] param.xml 01-Nov-2010 20:31 4.1K -[TXT] blocks2dbk.dtd 01-Nov-2010 20:31 2.3K -[TXT] normalise-common.xsl 01-Nov-2010 20:31 1.4K -[TXT] sections-spec.xml 01-Nov-2010 20:31 1.4K -[TXT] param.xsl 01-Nov-2010 20:31 802 -[TXT] blocks-spec.xml 01-Nov-2010 20:31 422 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/normalise-common.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/normalise-common.xsl deleted file mode 100644 index 83a16b37c84507de347b0c0a69fc608027c9c8d0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/normalise-common.xsl +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - caption - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/normalise2sections.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/normalise2sections.xsl deleted file mode 100644 index 393c60b8a00443f25fa38b602f7f170cbccd5a86..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/normalise2sections.xsl +++ /dev/null @@ -1,1270 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/pages2normalise.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/pages2normalise.xsl deleted file mode 100644 index 312fbd383b63186462b11659882f537973e9962b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/pages2normalise.xsl +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bold - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cannot determine number of rows in table - cannot determine number of rows in table - - - cannot determine number of columns in table - cannot determine number of columns in table - - - - - - - all - - - topbot - - - sides - - - top - - - bottom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WARNING: insufficient table cells - WARNING: insufficient table cells (num-rows , row ) - - - WARNING: excess table cells - WARNING: excess table cells (num-rows , row ) - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - element "" not handled - - - - - - - - - - - - - superscript - subscript - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/param.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/param.xml deleted file mode 100644 index ae1480019d8a9c8dd6d09b6e51041647d6e62755..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/param.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - Roundtrip Parameter Reference - - $Id: param.xweb 7042 2007-07-17 04:28:48Z xmldoc $ - - - - Ball - Steve - - - - 2007 - 2006 - 2005 - 2004 - Steve Ball - - - This is reference documentation for all user-configurable - parameters in the DocBook “Roundtrip” Stylesheets (for - transforming DocBook to WordML, OpenDocument, and Apple Pages, - and for converting from those formats back to DocBook). - - - - Parameters - - -wordml.template -uri - - -wordml.template -Specify the template WordML document - - - - -<xsl:param name="wordml.template"></xsl:param> - - - -Description - -The wordml.template parameter specifies a WordML document to use as a template for the generated document. The template document is used to define the (extensive) headers for the generated document, in particular the paragraph and character styles that are used to format the various elements. Any content in the template document is ignored. - -A template document is used in order to allow maintenance of the paragraph and character styles to be done using Word itself, rather than these XSL stylesheets. - - - - - - -pages.template -uri - - -pages.template -Specify the template Pages document - - - - -<xsl:param name="pages.template"></xsl:param> - - - -Description - -The pages.template parameter specifies a Pages (the Apple word processing application) document to use as a template for the generated document. The template document is used to define the (extensive) headers for the generated document, in particular the paragraph and character styles that are used to format the various elements. Any content in the template document is ignored. - -A template document is used in order to allow maintenance of the paragraph and character styles to be done using Pages itself, rather than these XSL stylesheets. - - - - - - - The Stylesheet - The param.xsl stylesheet is just a - wrapper around all of these parameters. - -<xsl:stylesheet exclude-result-prefixes="src" version="1.0"> - -<!-- This file is generated from param.xweb --> - -<!-- ******************************************************************** - $Id: param.xweb 7042 2007-07-17 04:28:48Z xmldoc $ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<src:fragref linkend="wordml.template.frag"></src:fragref> -<src:fragref linkend="pages.template.frag"></src:fragref> -</xsl:stylesheet> - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/param.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/param.xsl deleted file mode 100644 index 35db80b62553202d7918cc140096a81a50d282d1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/param.xsl +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/sections-spec.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/sections-spec.xml deleted file mode 100644 index 6c86d52a168488ab1d5a1a1eb8b7bd159eeb885f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/sections-spec.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/sections2blocks.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/sections2blocks.xsl deleted file mode 100644 index 9e7030a8a0e8f1500bd45362320d44e277a6f897..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/sections2blocks.xsl +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/specifications.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/specifications.xml deleted file mode 100644 index 85db866e1c9b3e9b6f6e04b84ff3a997db856f12..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/specifications.xml +++ /dev/null @@ -1,1420 +0,0 @@ - -
    - - Round-Tripping Specifications - - Bob - Stayton - - Sagehill Enterprises - - - - Steve - Ball - - Explain - - - - - 1.8 - 2008-05-22 - SRB - Updated for current implementation. - - - 1.7 - 2008-02-22 - SRB - Added edition. - - - 1.6 - 2007-10-19 - SRB - Added keyword. - - - 1.5 - 2007-01-05 - SRB - Reduce emphasis on WordML, add support for OpenOffice. - - - 1.4 - 2005-11-11 - SRB - Added bibliography. - - - 1.3 - 2005-10-31 - SRB - Added mediaobjectco, imageobjectco, programlistingco, areaspec, area, calloutlist. - - - 1.2 - 2005-10-13 - SRB - Version prior to using revhistory. - - - - - This document specifies how DocBook elements are mapped to paragraph and character styles in a word processor. The specifications are used to write conversions between DocBook XML and word processor XML formats, such as Microsoft's WordProcessingML (WordML), OpenOffice's OpenDocument and Apple's Pages. - -
    - Introduction - Microsoft Word 2003 introduced WordProcessingML (WordML), an XML vocabulary for Word documents. Since then, other popular word processors have become available that use XML as their data representation, namely Apple's Pages and OpenOffice. By converting Word (or OpenOffice or Pages) to XML, it becomes possible to convert a word processing document to DocBook and vice versa using XSL transformations. Such conversions then enable the following. - - - DocBook content creators write in their familiar wordprocessing application, rather than learning a new XML editing application. - - - DocBook XML documents can be styled for output using the typesetting features of the word processor. - - - Word processors have a simple, flat data model; documents consist of paragraphs (and tables) and paragraphs contain text and character spans. All word processors allow styles to be associated with paragraphs and spans. - This specification describes how DocBook elements map to a set of paragraph and character styles. It defines a specific set of style names for which a Word style template can be created. The style names are also used in XSLT template match patterns for conversion. Although originally targetted to MS Word, the system has subsequently been extended to use other word processors, notably Apple's Pages and Open Office. -
    -
    - Project goals - The goal of this project is to enable a word processor, such as, but not limited to, Microsoft Word, to be used with DocBook files. The specific goals include: - - - Enable authoring of basic DocBook documents in the word processor. - - - Enable importing of basic DocBook XML documents into the word processor. - - - To meet these goals, the project provides a toolkit that can be immediately put to use. The kit includes: - - - Templates for Microsoft Word, Apple Pages and Open Office with formatting styles attached to the style names. - - - XSLT stylesheets that convert a word processing document that is authored with the corresponding template into a DocBook XML file. - - - XSLT stylesheets that convert a DocBook document into a word processing document that can be opened in a word processor. - - -
    - Why basic DocBook? - This project will never be able to support all DocBook elements and structure. Take, for example, the address element. This element can be used both as a block element for metadata. It can also be used as a phrase level element in a block parent, such as the affiliation element. To make matters worse, it can itself contain phrase level markup, such as personname. No word processor allows character styles to be nested. - The project will initially focus on a basic set of commonly used DocBook elements in order to create a useful editing environment that utilises a word processor with DocBook. - One problem facing this conversion project is the sheer number of DocBook elements, over 400 in DocBook 5.0. To support DocBook structural models, several of the elements require more than one paragraph or character style. This would lead to very long and unwieldy list of styles in the word processor interface. That would make authoring less efficient and discourage users. - Accordingly, this project assumes that authors who need the full set of DocBook elements and structures will use an XML authoring tool that better supports them. This project is focused on authors who wish to write basic DocBook documents using a word processor. Because Microsoft Word is so widespread, it is hoped that this project will help a lot of new DocBook users get started with familiar tools. They can then graduate to more advanced tools as their needs develop. -
    -
    -
    - Project Non-Goals - The following goals are not in the scope of this project: - - - Support of versions of Word that do not feature reading/writing WordML (XML). That is, all versions prior to Word 11 (Office 2003). - - - Support of arbitrarily defined styles. This system may expect certain styles to be defined in a particular fashion (in particular, those defining the title of components and divisions). - - -
    -
    - Mapping elements to styles - Although WordML, OpenDocument and DocBook are all XML, there several challenges when trying to convert between them. - The basic problem in mapping paragraph/character styles to DocBook elements is that word processor documents support far less structure than DocBook. DocBook permits nesting of elements within other elements, providing multiple levels of context for each element. - Word's only structural feature is the outlining mode. In Word outlining, certain paragraph styles are assigned outline levels. When a user applies those styles, they effectively create logical structure in the Word document. Unfortunately, Word itself attempts to automatically determine which paragraphs are headings, rendering this method is unreliable. - Instead of relying on Word's built-in outlining mode, this system uses only the names of paragraph styles to determine document structure. Certain heuristics are applied to build the DocBook element structure from the (relatively flat) word processing structure. Titles and other features are used to mark the beginning of a structure and all paragraphs following that are included in that structure until the beginning of the next structure is found. That is, the beginning of one structure marks the end of the previous structure. - Problems may arise when a structure should end, but there is no word processor feature that marks the endpoint. To mark the end of a feature an empty paragraph is used. - Nesting of block elements is another commonly used feature of DocBook. It is not possible to use Word's outline mode for blocks if it is being used for components and sections. So in this specification, nesting of block elements is indicated by adding a number suffix to a style. So a paragraph with style orderedlist2 is considered to be contained within a preceding paragraph with style orderedlist1 or itemizedlist1. Where appropriate in the word processor, paragraph indent levels are used to visually indicate nesting of blocks. - Nesting of inline DocBook elements is particularly difficult to support because word processors do not nest character styles. That means a nested inline would require a separate character style to indicate the parent-child relationship. Given the large number of combinations possible, a prohibitively large number of character styles would have to be created. In this project, nesting of character styles is not supported. Nested inlines being imported from DocBook will be converted to a sequence of single-name character styles, where possible, or rejected. - In many cases, DocBook structure can be derived from the flat sequence of paragraphs based on sibling relationships. For example, when a paragraph styled as para is followed by a paragraph styled as itemizedlist1, the conversion to DocBook will output a para element and then start an itemizedlist element, with the second paragraph as its first listitem. All itemizedlist1 paragraphs that follow without interruption are inserted into the same itemizedlist element. - Some combinations of elements cannot be supported (at least not with the techniques as described in this document). An example is informalexample and its permitted content; there is no title to mark the beginning of the element and no marker for the end of the element, also there are too many parent-child combinations to reasonably define style names. - The design principles used in this project for selecting paragraph/character style names are as follows: - - - Where Word (or OpenOffice or Pages), by default, has a style or feature that corresponds directly to a DocBook element then that style or feature will be used (and documented in this document). For example, the Normal paragraph style maps to a DocBook para element, and a Word table (w:tbl) maps to a DocBook tableIn some cases Word may posess a feature, but it doesn't function in an acceptable manner. For example, lists. In these cases the feature is to be avoided, and a workaround provided.. - - - Paragraph and character style names will match DocBook element names as much as possible. This will enable authors to learn DocBook element names and help debug problems with conversion. - - - A style may indicate a parent-child relationship, but the paragraph for such an element may only occur after a paragraph that denotes the beginning of the parent structure. In this case the element name is used as the style name. For example, a personblurb paragraph may only occur after an author, editor or othercontrib paragraph. If a paragraph occurs without the appropriate preceding paragraph, then an error is signalled. - - - Some styles may also indicate a parent-child relationship, but either the parent structure is ambiguous or the paragraph starts the parent structure. For example, chapter-title indicates that the paragraph is a title element whose DocBook parent is a chapter element. - - - Some style names are simplified to make them easier to use in the word processor. For example, a paragraph in an orderedlist requires three elements in DocBook: orderedlist, listitem, and para. The paragraph style name in Word is shortened from orderedlist-listitem-para to just orderedlist1 (for a first level list). In the case of lists (see below), the list level is appended, which is why this example becomes orderedlist1. - - - Style names with a number suffix indicate a nesting level, as described above. - - - Style names with continue indicate that the paragraph is part of the preceding element. For example, a para paragraph is used for a single paragraph para element. This causes any preceding list to be closed. If a list item in the preceding list is to contain more than one paragraph, then the subsequent paragraphs in the word processor documentmust use the para-continue style. - - - Character styles map to elements that are children of the element for the paragraph, hence there is no need to encode parent-child relationships. For example, a surname character style in an author paragraph becomes a surname child element of the author element. - - - Empty paragraph and character styles are ignored. This can be useful to end structures. - - - The first paragraph style in the word processor document is used to define the root element of the DocBook document. For example, if the document starts with book-title, then the DocBook document will have book element as its root element. All the rest of the document content will be contained in that root element. - - - Sequential structures are coalesced into a single parent element. For example, a sequence of itemizedlist1 paragraphs becomes a single itemizedlist element with several listitem element children. - - DocBook to Paragraph/Character Styles - - - - - - - - DocBook element - - - Style(s) - - - Comments - - - - - - - - Components and sections - - - - - - book/info/title - - - book-title - - - - - - - - book/info/subtitle - - - book-subtitle - - - - - - - - book/info/titleabbrev - - - book-titleabbrev - - - - - - - - chapter/info/title - - - chapter-title - - - Assigned Word outline level 1. - - - - - chapter/info/subtitle - - - chapter-subtitle - - - - - - - - chapter/info/titleabbrev - - - chapter-titleabbrev - - - - - - - - appendix/info/title - - - appendix-title - - - Assigned Word outline level 1. - - - - - preface/info/title - - - preface-title - - - Assigned Word outline level 1. - - - - - article/info/title - - - article-title - - - Assigned Word outline level 1. - - - - - article/info/subtitle - - - article-subtitle - - - - - - - - article/info/titleabbrev - - - article-titleabbrev - - - - - - - - bibliography/info/title - - - bibliography-title - - - Assigned Word outline level 1. - - - - - bibliography/bibliodiv/info/title - - - bibliodiv-title - - - - - - - - biblioentry/title - - - biblioentry-title - - - Metadata elements after the biblioentry-title paragraph become part of the biblioentry. - - - - - glossary/info/title - - - glossary-title - - - Assigned Word outline level 1. - - - - - index/info/title - - - index-title - - - Assigned Word outline level 1. - - - - - part/info/title - - - part-title - - - - - - - - section - - - - - - Unnumbered section elements are translated into their equivalent numbered paragraph style. Sections 6 levels and deeper are reported as an error. - - - - - sect1/info/title - - - sect1-title - - - Assigned Word outline level 2. - - - - - sect1/info/subtitle - - - sect1-subtitle - - - - - - - - sect2/info/title - - - sect2-title - - - Assigned Word outline level 3. - - - - - sect2/info/subtitle - - - sect2-subtitle - - - - - - - - sect3/info/title - - - sect3-title - - - Assigned Word outline level 4. - - - - - sect3/info/subtitle - - - sect3-subtitle - - - - - - - - sect4/info/title - - - sect4-title - - - Assigned Word outline level 5. - - - - - sect4/info/subtitle - - - sect4-subtitle - - - - - - - - sect5/info/title - - - sect5-title - - - Assigned Word outline level 6. - - - - - sect5/info/subtitle - - - sect5-subtitle - - - - - - - - simplesect/info/title - - - simplesect-title - - - - - - - - simplesect/info/subtitle - - - simplesect-subtitle - - - - - - - - bridgehead - - - bridgehead - - - - - - - - - Metadata elements - - - - - - abstract/title - - - abstract-title - - . - - - - abstract/para - - - abstract - - - - - - - - affiliation - - - affiliation - - - - - - - - address - - - address - - - - - - - - author - - - author - - - - - - - - date - - - date - - - - - - - - edition - - - edition - - - - - - - - legalnotice - - - legalnotice - - - - - - - - pubdate - - - pubdate - - - - - - - - publisher/pubishername - - - publisher - - - - - - - - publisher/address - - - publisher-address - - - - - - - - revhistory/revision - - - revision - - - - - - - - - Block-level elements - - - - - - para - - - para, Normal - - - Any Word paragraph with style Normal will also be converted to a para element. - - - - - formalpara/title - - - formalpara-title - - - - - - - - formalpara/para - - - formalpara - - - - - - - - simpara - - - simpara - - - - - - - - note/title - - - note-title - - - - - - - - note/para - - - note - - - Consecutive paragraphs with style note after the first note are to be treated as part of the same note element. That is, consecutive notes are coalesced. The note may or may not have a title. - - - - - caution/title - - - caution-title - - - - - - - - caution/para - - - caution - - - Consecutive cautions are coalesced. - - - - - warning/title - - - warning-title - - - - - - - - warning/para - - - warning - - - Consecutive warnings are coalesced. - - - - - important/title - - - important-title - - - - - - - - important/para - - - important - - - Consecutive importants are coalesced. - - - - - tip/title - - - tip-title - - - - - - - - tip/para - - - tip - - - Consecutive tips are coalesced. - - - - - itemizedlist/listitem/para - - - - itemizedlist1 -itemizedlist2 -itemizedlist3 -itemizedlist4 - - - - A number suffix indicates a nesting level within other lists. - - - - - orderedlist/listitem/para - - - - orderedlist1 -orderedlist2 -orderedlist3 -orderedlist4 - - - - - - - - - listitem/para[position() != 1] - - - para-continue - - - This paragraph is included in the immediately preceding listitem. - - - - - example/title - - - example-title - - - All content following the title is included in the example element. The end of the example content is marked by a caption paragraph or an empty paragraph if there is no caption. - - - - - figure/title - - - figure-title - - - All content following the title is included in the figure element. Metadata must immediately follow the title. The end of the figure content is marked by a caption paragraph or an empty paragraph if there is no caption. - - - - - informalfigure/mediaobject/imageobject/imagedata/@fileref - - - informalfigure-imagedata, caption - - - The content of the imageobject-imagedata paragraph is taken as the URI for the image. Metadata may immediately follow the paragraph. - - - - - mediaobject/imageobject/imagedata/@fileref - - - imageobject-imagedata, caption - - - The content of the imageobject-imagedata paragraph is taken as the URI for the image. May be followed by a caption style paragraph. Metadata may immediately follow the paragraph, before the caption, if any. - - - - - table - - - Word table, caption - - - - - - - - table/title - - - table-title, caption - - - Metadata may immediately follow the paragraph. - - - - - informaltable - - - Word table - - - A table with no title imediately preceding it. - - - - - caption - - - caption - - - - - - - - literallayout - - - literallayout - - - Inside a literallayout paragraph in Word, lines should be separated by line break (Shift-Enter) rather than paragraph break (Enter). - - - - - programlisting - - - programlisting - - - Inside a programlisting paragraph in Word, lines should be separated by line break (Shift-Enter) rather than paragraph break (Enter). Tabs are not supported. - - - - - blockquote/title - - - blockquote-title - - - Must immediately precede a blockquote paragraph in Word. - - - - - blockquote/para - - - blockquote - - - - - - - - blockquote/attribution - - - blockquote-attribution - - - Must immediately follow a blockquote paragraph in Word. - - - - - bibliomisc - - - bibliomisc - - - - - - - - - Non-DocBook elements - - - - - - xi:include - - - xinclude - - - The content of the paragraph becomes the value of the href attribute. - - - - - - Inline elements - - - - - - emphasis - - - emphasis - - - - - - - - emphasis/@role="bold" - - - emphasis-bold - - - - - - - - emphasis/@role="underline" - - - emphasis-underline - - - - - - - - footnote - - - Word footnote - - - - - - - - link - - - link - - - In Word, hyperlink properties identify the DocBook linkend. - - - - - releaseinfo - - - releaseinfo - - - - - - - - surname - - - surname - - - Character style. Must occur in an appropriate parent paragraph, such as author or editor. - - - - - firstname - - - firstname - - - Character style. Must occur in an appropriate parent paragraph, such as author or editor. - - - - - orgname - - - orgname - - - - - - - - keyword - - - keywordset/keyword - - - Paragraph style. Consecutive keyword elements are merged into a single keywordset parent element. Words (phrases) within a paragraph separated by commas become individual keyword elements. - - - - - citetitle - - - citetitle - - - - - - - - city - - - city - - - - - - - - contrib - - - contrib - - - - - - - - country - - - country - - - - - - - - email - - - email - - - - - - - - fax - - - fax - - - - - - - - honorific - - - honorific - - - - - - - - jobtitle - - - jobtitle - - - - - - - - lineage - - - lineage - - - - - - - - orgdiv - - - orgdiv - - - - - - - - otheraddr - - - otheraddr - - - - - - - - othername - - - othername - - - - - - - - phone - - - phone - - - - - - - - pob - - - pob - - - - - - - - postcode - - - postcode - - - - - - - - shortaffil - - - shortaffil - - - - - - - - state - - - state - - - - - - - -
    - - Proposed Additions - not yet implemented - - - - - - - - DocBook element - - - Style(s) - - - Comments - - - - - - - variablelist/varlistentry/term - - - - variablelist1-term -variablelist2-term -variablelist3-term -variablelist4-term - - - - A variablelist in Word should be a sequence of alternating paragraphs styled as variablelistN-term and variablelistN. - - - - - variablelist/varlistentry/listitem/para - - - - variablelist1 -variablelist2 -variablelist3 -variablelist4 - - - - Consecutive paragraphs are coalesced. - - - - -
    -
    - Attributes - Attributes are a feature of DocBook XML that have no direct counterpart in Word. - XML attributes are encoded in Word comments (annotations). Some dummy text (just a space, using a character style that includes the hidden property) anchors the comment. Within the comment text, character types are used to indicate attribute names and values (these must be paired). This approach keeps the attributes separate to the main body and allows multiple attributes to be encoded. - A disadvantage to this approach is that a paragraph may be related to more than one element, but the attributes are associated with only one element (by default the parent). For example, a section may have an attribute as well as the title child element, but only a single paragraph (with paragraph style sect1-title) represents both elements. Any attribute defined in a comment would be associated with the sect1 element. - Pages does not have annotations, so the character styles attribute-name and attribute-value are used. -
    -
    -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/template-pages.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/template-pages.xml deleted file mode 100644 index cc6fc0374d8b2062e2d0db3e71c816e3d7c719c3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/template-pages.xml +++ /dev/null @@ -1,2 +0,0 @@ - -Lorem ipsum dolor sit ametConsectetur adipiscing elitEset eiusmod tempor incidunt et labore et dolore magna aliquam. Ut enim ad minim veniam, quis nostrud exerc. Irure dolor in reprehend incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse molestaie cillum. Tia non ob ea soluad incommod quae egen ium improb fugiend. Officia deserunt mollit anim id est laborum Et harumd dereud facilis est er expedit distinct. Nam liber te conscient to factor tum poen legum odioque civiuda et tam. Neque pecun modut est neque nonor et imper ned libidig met, consectetur adipiscing elit, sed ut labore et dolore magna aliquam is nostrud exercitation ullam mmodo consequet.Duis aute in voluptate velit esseCillum dolore eu fugiat nulla pariatur. At vver eos et accusam dignissum qui blandit est praesent. Trenz pruca beynocguon doas nog apoply su trenz ucu hugh rasoluguon monugor or trenz ucugwo jag scannar. Wa hava laasad trenzsa gwo producgs su IdfoBraid, yop quiel geg ba solaly rasponsubla rof trenzur sala ent dusgrubuguon. Offoctivo immoriatoly, hawrgasi pwicos asi sirucor. Thas sirutciun applios tyu thuso itoms ghuso pwicos gosi sirucor in mixent gosi sirucor ic mixent ples cak ontisi sowios uf Zerm hawr rwivos. Unte af phen neige pheings atoot Prexs eis phat eit sakem eit vory gast te Plok peish ba useing phen roxas. Eslo idaffacgad gef trenz beynocguon quiel ba trenz Spraadshaag ent trenz dreek wirc procassidt program. Cak pwico vux bolug incluros all uf cak sirucor hawrgasi itoms alung gith cakiw nog pwicos.Plloaso mako nuto uf cakso dodtosKoop a cupy uf cak vux noaw yerw phuno. Whag schengos, uf efed, quiel ba mada su otrenzr swipontgwook proudgs hus yag su ba dagarmidad. Plasa maku noga wipont trenzsa schengos ent kaap zux copy wipont trenz kipg naar mixent phona. Cak pwico siructiun ruos nust apoply tyu cak UCU sisulutiun munityuw uw cak UCU-TGU jot scannow. Trens roxas eis ti Plokeing quert loppe eis yop prexs. Piy opher hawers, eit yaggles orn ti sumbloat alohe plok. Su havo loasor cakso tgu pwuructs tyu InfuBwain, ghu gill nug bo suloly sispunsiblo fuw cakiw salo anr ristwibutiun. Hei muk neme eis loppe. Treas em wankeing ont sime ploked peish rof phen sumbloat syug si phat phey gavet peish ta paat ein pheeir sumbloats. Aslu unaffoctor gef cak siructiun gill bo cak spiarshoot anet cak GurGanglo gur pwucossing pwutwam. Ghat dodtos, ig pany, gill bo maro tyu ucakw suftgasi pwuructs hod yot tyubo rotowminor. Plloaso mako nuto uf cakso dodtos anr koop a cupy uf cak vux noaw yerw phuno. Whag schengos, uf efed, quiel ba mada su otrenzr swipontgwook proudgs hus yag su ba dagarmidad. Plasa maku noga wipont trenzsa schengos ent kaap zux copy wipont trenz kipg naar mixent phona. Cak pwico siructiun ruos nust apoply tyu cak UCU sisulutiun munityuw uw cak UCU-TGU jot scannow. Trens roxas eis ti Plokeing quert loppe eis yop prexs. Piy opher hawers, eit yaggles orn ti sumbloat alohe plok. Su havo loasor cakso tgu pwuructs tyu.Document TemplateInsert content here. diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/template.dot b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/template.dot deleted file mode 100644 index b26ec5682c4a8c5ea9c427983a1759bcf5c49481..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/template.dot and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/template.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/template.xml deleted file mode 100644 index e36a7dfd8c92e2f9373b0588643b8919e21d2000..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/template.xml +++ /dev/null @@ -1,3 +0,0 @@ - - -This document left intentionally blankSteve BallSteve Ball15104702007-08-21T22:03:00Z2008-10-08T23:57:00Z1745Explain115111.0000Generic DocBook roundtrip template - 2008-10-09-01. \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/wordml2normalise.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/wordml2normalise.xsl deleted file mode 100644 index 3748587c10a450a4a2556b8ad493639156a1a56c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/roundtrip/wordml2normalise.xsl +++ /dev/null @@ -1,446 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bold-italic - - - bold - - - italic - - - underline - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image - - .jpg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 0 - 1 - 0 - - - - - 1 - 0 - 1 - 0 - - - - - 1 - 0 - 1 - 0 - - - - - 1 - 0 - 1 - 0 - - - - - - - all - - - topbot - - - sides - - - top - - - bottom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - 1 - - - - - - - column- - - - - column- - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - 0 - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/CTOCWidget.js b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/CTOCWidget.js deleted file mode 100644 index a411ea9959f8bb9d8c61db9771dcb65fe1ee189a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/CTOCWidget.js +++ /dev/null @@ -1,169 +0,0 @@ -/* - * CTOCWidget.js - * $Revision: 1.3 $ $Date: 2003/07/14 06:02:50 $ - */ - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Netscape code. - * - * The Initial Developer of the Original Code is - * Netscape Corporation. - * Portions created by the Initial Developer are Copyright (C) 2003 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): Bob Clary - * - * ***** END LICENSE BLOCK ***** */ - -function CTOCWidget(domTOCModel, target) -{ - if (domTOCModel.documentElement.nodeName != 'toc') - { - throw 'CTOCWidget called on non toc Document: ' + domTOCModel.nodeName; - } - - this.model = domTOCModel; - this.target = target; - this.view = document.createElement('div'); - this.view.setAttribute('class', CTOCWidget._classprefix + '_view'); - - var modelItems = domTOCModel.documentElement.childNodes; - for (var i = 0; i < modelItems.length; i++) - { - var modelItem = modelItems.item(i); - if (modelItem.nodeType == Node.ELEMENT_NODE) - { - var viewItem = CTOCWidget.createItemView(modelItem, target); - this.view.appendChild(viewItem); - } - } -} - -CTOCWidget._handleImages = { open: '/toolbox/examples/2003/CTOCWidget/minus.gif', closed: '/toolbox/examples/2003/CTOCWidget/plus.gif', height: '12px', width: '16px'}; -CTOCWidget._classprefix = 'CTOCWidget'; - -CTOCWidget.createItemView = function (modelItem, target) -{ - if (modelItem.nodeType != Node.ELEMENT_NODE) - { - throw 'CTOCWidget.createItemView called on non-Element: ' + modelItem.nodeName; - } - - var i; - - var viewItem = document.createElement('div'); - viewItem.setAttribute('class', CTOCWidget._classprefix + '_item'); - - var viewItemHandle = document.createElement('div'); - viewItemHandle.setAttribute('class', CTOCWidget._classprefix + '_itemhandle'); - viewItemHandle.style.cursor = 'pointer'; - - var viewItemHandleImg = document.createElement('img'); - viewItemHandleImg.style.height = CTOCWidget._handleImages.height; - viewItemHandleImg.style.width = CTOCWidget._handleImages.width; - viewItemHandleImg.addEventListener('click', CTOCWidget.toggleHandle, false); - - var viewItemHandleLink; - if (!modelItem.getAttribute('url')) - { - viewItemHandleLink = document.createElement('span'); - } - else - { - viewItemHandleLink = document.createElement('a'); - viewItemHandleLink.setAttribute('href', modelItem.getAttribute('url')); - viewItemHandleLink.setAttribute('target', target); - } - viewItemHandleLink.appendChild(document.createTextNode(modelItem.getAttribute('title'))); - - viewItemHandle.appendChild(viewItemHandleImg); - viewItemHandle.appendChild(viewItemHandleLink); - viewItem.appendChild(viewItemHandle); - - if (modelItem.childNodes.length == 0) - { - viewItemHandleImg.setAttribute('src', CTOCWidget._handleImages.open); - } - else - { - viewItemHandleImg.setAttribute('src', CTOCWidget._handleImages.closed); - - var viewItemChildren = document.createElement('div'); - viewItemChildren.setAttribute('class', CTOCWidget._classprefix + '_itemchildren'); - viewItemChildren.style.display = 'none'; - viewItemChildren.style.position = 'relative'; - viewItemChildren.style.left = '1em'; - - for (i = 0; i < modelItem.childNodes.length; i++) - { - var modelItemChild = modelItem.childNodes.item(i); - if (modelItemChild.nodeType == Node.ELEMENT_NODE) - { - viewItemChildren.appendChild(CTOCWidget.createItemView(modelItemChild, target)); - } - } - - viewItem.appendChild(viewItemChildren); - } - - return viewItem; -}; - -// fires on img part of the handle -CTOCWidget.toggleHandle = function(e) -{ - switch (e.eventPhase) - { - case Event.CAPTURING_PHASE: - case Event.BUBBLING_PHASE: - return true; - - case Event.AT_TARGET: - - e.preventBubble(); - - var domHandle = e.target.parentNode; - var domChildren = domHandle.nextSibling; - - if (!domChildren) - { - return true; - } - - switch(domChildren.style.display) - { - case '': - case 'block': - domChildren.style.display = 'none'; - e.target.setAttribute('src', CTOCWidget._handleImages.closed); - break; - case 'none': - domChildren.style.display = 'block'; - e.target.setAttribute('src', CTOCWidget._handleImages.open); - break; - default: - return false; - } - - return true; - - default: - dump('Unknown Event Phase ' + e.eventPhase); - break; - } - - return true; -} - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html deleted file mode 100644 index b9fd9804cf61c0822bd94744732d3976976ebd5e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/browser - - -

    Index of /release/xsl-ns/1.76.1/slides/browser

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] slides-plain.css 01-Nov-2010 20:31 27 -[TXT] slides-w3c.css 01-Nov-2010 20:31 27 -[TXT] slides-default.css 01-Nov-2010 20:31 212 -[TXT] slides-table.css 01-Nov-2010 20:31 1.0K -[   ] xbLibrary.js 01-Nov-2010 20:31 2.2K -[TXT] slides-frames.css 01-Nov-2010 20:31 2.2K -[   ] slides.js 01-Nov-2010 20:31 3.0K -[TXT] slides.css 01-Nov-2010 20:31 3.1K -[   ] overlay.js 01-Nov-2010 20:31 3.7K -[   ] xbStyle-not-supported.js 01-Nov-2010 20:31 3.7K -[   ] ua.js 01-Nov-2010 20:31 3.8K -[   ] CTOCWidget.js 01-Nov-2010 20:31 4.9K -[   ] xbDOM.js 01-Nov-2010 20:31 7.2K -[   ] xbDebug.js 01-Nov-2010 20:31 7.8K -[   ] xbStyle.js 01-Nov-2010 20:31 7.9K -[   ] xbStyle-nn4.js 01-Nov-2010 20:31 13K -[   ] xbCollapsibleLists.js 01-Nov-2010 20:31 13K -[   ] xbStyle-css.js 01-Nov-2010 20:31 17K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=D;O=A deleted file mode 100644 index 78dde66391a9443c3795c02dc5544010721b424a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=D;O=A +++ /dev/null @@ -1,29 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/browser - - -

    Index of /release/xsl-ns/1.76.1/slides/browser

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[   ] CTOCWidget.js 01-Nov-2010 20:31 4.9K -[   ] overlay.js 01-Nov-2010 20:31 3.7K -[TXT] slides-default.css 01-Nov-2010 20:31 212 -[TXT] slides-frames.css 01-Nov-2010 20:31 2.2K -[TXT] slides-plain.css 01-Nov-2010 20:31 27 -[TXT] slides-table.css 01-Nov-2010 20:31 1.0K -[TXT] slides-w3c.css 01-Nov-2010 20:31 27 -[TXT] slides.css 01-Nov-2010 20:31 3.1K -[   ] slides.js 01-Nov-2010 20:31 3.0K -[   ] ua.js 01-Nov-2010 20:31 3.8K -[   ] xbCollapsibleLists.js 01-Nov-2010 20:31 13K -[   ] xbDOM.js 01-Nov-2010 20:31 7.2K -[   ] xbDebug.js 01-Nov-2010 20:31 7.8K -[   ] xbLibrary.js 01-Nov-2010 20:31 2.2K -[   ] xbStyle-css.js 01-Nov-2010 20:31 17K -[   ] xbStyle-nn4.js 01-Nov-2010 20:31 13K -[   ] xbStyle-not-supported.js 01-Nov-2010 20:31 3.7K -[   ] xbStyle.js 01-Nov-2010 20:31 7.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=M;O=A deleted file mode 100644 index 4fcdc01ce7006b9c67699fb0adc87ca84eb9f9e1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=M;O=A +++ /dev/null @@ -1,29 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/browser - - -

    Index of /release/xsl-ns/1.76.1/slides/browser

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[   ] CTOCWidget.js 01-Nov-2010 20:31 4.9K -[   ] overlay.js 01-Nov-2010 20:31 3.7K -[TXT] slides-default.css 01-Nov-2010 20:31 212 -[TXT] slides-frames.css 01-Nov-2010 20:31 2.2K -[TXT] slides-plain.css 01-Nov-2010 20:31 27 -[TXT] slides-table.css 01-Nov-2010 20:31 1.0K -[TXT] slides-w3c.css 01-Nov-2010 20:31 27 -[TXT] slides.css 01-Nov-2010 20:31 3.1K -[   ] slides.js 01-Nov-2010 20:31 3.0K -[   ] ua.js 01-Nov-2010 20:31 3.8K -[   ] xbCollapsibleLists.js 01-Nov-2010 20:31 13K -[   ] xbDOM.js 01-Nov-2010 20:31 7.2K -[   ] xbDebug.js 01-Nov-2010 20:31 7.8K -[   ] xbLibrary.js 01-Nov-2010 20:31 2.2K -[   ] xbStyle-css.js 01-Nov-2010 20:31 17K -[   ] xbStyle-nn4.js 01-Nov-2010 20:31 13K -[   ] xbStyle-not-supported.js 01-Nov-2010 20:31 3.7K -[   ] xbStyle.js 01-Nov-2010 20:31 7.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=N;O=A deleted file mode 100644 index 15fcbae0281a589766a47ce7a5fd6fd65d8dae46..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=N;O=A +++ /dev/null @@ -1,29 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/browser - - -

    Index of /release/xsl-ns/1.76.1/slides/browser

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[   ] CTOCWidget.js 01-Nov-2010 20:31 4.9K -[   ] overlay.js 01-Nov-2010 20:31 3.7K -[TXT] slides-default.css 01-Nov-2010 20:31 212 -[TXT] slides-frames.css 01-Nov-2010 20:31 2.2K -[TXT] slides-plain.css 01-Nov-2010 20:31 27 -[TXT] slides-table.css 01-Nov-2010 20:31 1.0K -[TXT] slides-w3c.css 01-Nov-2010 20:31 27 -[TXT] slides.css 01-Nov-2010 20:31 3.1K -[   ] slides.js 01-Nov-2010 20:31 3.0K -[   ] ua.js 01-Nov-2010 20:31 3.8K -[   ] xbCollapsibleLists.js 01-Nov-2010 20:31 13K -[   ] xbDOM.js 01-Nov-2010 20:31 7.2K -[   ] xbDebug.js 01-Nov-2010 20:31 7.8K -[   ] xbLibrary.js 01-Nov-2010 20:31 2.2K -[   ] xbStyle-css.js 01-Nov-2010 20:31 17K -[   ] xbStyle-nn4.js 01-Nov-2010 20:31 13K -[   ] xbStyle-not-supported.js 01-Nov-2010 20:31 3.7K -[   ] xbStyle.js 01-Nov-2010 20:31 7.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=S;O=D deleted file mode 100644 index e4462a8727625403114f4530fbc18df80c6fd38e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/index.html?C=S;O=D +++ /dev/null @@ -1,29 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/browser - - -

    Index of /release/xsl-ns/1.76.1/slides/browser

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[   ] xbStyle-css.js 01-Nov-2010 20:31 17K -[   ] xbCollapsibleLists.js 01-Nov-2010 20:31 13K -[   ] xbStyle-nn4.js 01-Nov-2010 20:31 13K -[   ] xbStyle.js 01-Nov-2010 20:31 7.9K -[   ] xbDebug.js 01-Nov-2010 20:31 7.8K -[   ] xbDOM.js 01-Nov-2010 20:31 7.2K -[   ] CTOCWidget.js 01-Nov-2010 20:31 4.9K -[   ] ua.js 01-Nov-2010 20:31 3.8K -[   ] xbStyle-not-supported.js 01-Nov-2010 20:31 3.7K -[   ] overlay.js 01-Nov-2010 20:31 3.7K -[TXT] slides.css 01-Nov-2010 20:31 3.1K -[   ] slides.js 01-Nov-2010 20:31 3.0K -[TXT] slides-frames.css 01-Nov-2010 20:31 2.2K -[   ] xbLibrary.js 01-Nov-2010 20:31 2.2K -[TXT] slides-table.css 01-Nov-2010 20:31 1.0K -[TXT] slides-default.css 01-Nov-2010 20:31 212 -[TXT] slides-w3c.css 01-Nov-2010 20:31 27 -[TXT] slides-plain.css 01-Nov-2010 20:31 27 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/overlay.js b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/overlay.js deleted file mode 100644 index fc010fbe968c5bbdda6bf5f256d7870e41689511..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/overlay.js +++ /dev/null @@ -1,142 +0,0 @@ -// -*- Java -*- -// -// Overlay.js, adapted from Floating image II on dynamicdrive.com -/* Usage: - - - -...rest of head... - - -
    -...body of overlay... -
    -...rest of page... -*/ - -var overlayNS4 = document.layers ? 1 : 0; -var overlayIE = document.all ? 1 : 0; -var overlayNS6 = document.getElementById && !document.all ? 1 : 0; - -var overlayPadX = 15; -var overlayPadY = 15; -var overlayDelay = 60; - -var overlayCorner = 'ur'; // ul, ll, ur, lr, uc, lc, cl, cr - -function overlayRefresh() { - var overlayLx = 0; - var overlayLy = 0; - - var overlayX = 0; - var overlayY = 0; - var overlayW = 0; - var overlayH = 0; - var contentH = 0; - - var links = document.getElementsByTagName("body")[0]; - - if (overlayIE) { - overlayLx = document.body.clientWidth; - overlayLy = document.body.clientHeight; - - if (document.body.parentElement) { - // For IE6 - overlayLx = document.body.parentElement.clientWidth; - overlayLy = document.body.parentElement.clientHeight; - } - - overlayH = overlayDiv.offsetHeight; - overlayW = body.offsetWidth; // overlayDiv.offsetWidth; - contentH = body.offsetHeight; - } else if (overlayNS4) { - overlayLy = window.innerHeight; - overlayLx = window.innerWidth; - overlayH = document.overlayDiv.clip.height; - overlayW = body.clip.width; // document.overlayDiv.clip.width; - contentH = body.clip.height; - } else if (overlayNS6) { - var odiv = document.getElementById('overlayDiv'); - - overlayLy = window.innerHeight; - overlayLx = window.innerWidth; - overlayH = odiv.offsetHeight; - overlayW = odiv.offsetWidth; // body.offsetWidth; - contentH = odiv.offsetHeight; - } - - if (overlayCorner == 'ul') { - overlayX = overlayPadX; - overlayY = overlayPadY; - } else if (overlayCorner == 'cl') { - overlayX = overlayPadX; - overlayY = (overlayLy - overlayH) / 2; - } else if (overlayCorner == 'll') { - overlayX = overlayPadX; - overlayY = (overlayLy - overlayH) - overlayPadY; - } else if (overlayCorner == 'ur') { - overlayX = (overlayLx - overlayW) - overlayPadX; - overlayY = overlayPadY; - } else if (overlayCorner == 'cr') { - overlayX = (overlayLx - overlayW) - overlayPadX; - overlayY = (overlayLy - overlayH) / 2; - } else if (overlayCorner == 'lr') { - overlayX = (overlayLx - overlayW) - overlayPadX; - overlayY = (overlayLy - overlayH) - overlayPadY; - } else if (overlayCorner == 'uc') { - overlayX = (overlayLx - overlayW) / 2; - overlayY = overlayPadY; - } else { // overlayCorner == 'lc' - overlayX = (overlayLx - overlayW) / 2; - overlayY = (overlayLy - overlayH) - overlayPadY; - } - - if (overlayIE) { - overlayDiv.style.left=overlayX; - overlayDiv.style.top=overlayY+document.body.scrollTop; - - if (contentH > overlayLy) { - overlayDiv.style.visibility = "hidden"; - } - } else if (overlayNS4) { - document.overlayDiv.pageX=overlayX; - document.overlayDiv.pageY=overlayY+window.pageYOffset; - document.overlayDiv.visibility="visible"; - - if (contentH > overlayLy) { - document.overlayDiv.style.visibility = "hidden"; - } - } else if (overlayNS6) { - var div = document.getElementById("overlayDiv"); - var leftpx = overlayX; - var toppx = overlayY+window.pageYOffset; - var widthpx = overlayW; - - div.style.left = leftpx + "px"; - div.style.top = toppx + "px"; - div.style.width = widthpx + "px"; - - if (contentH > overlayLy) { - div.style.visibility = "hidden"; - } else { - div.style.visibility = "visible"; - } - } -} - -function onad() { - loopfunc(); -} - -function loopfunc() { - overlayRefresh(); - setTimeout('loopfunc()',overlayDelay); -} - -function overlaySetup(corner) { - overlayCorner = corner; - - if (overlayIE || overlayNS4 || overlayNS6) { - onad(); - } -} diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-default.css b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-default.css deleted file mode 100644 index 1022d6bc0e8507d93cf55b3a8b50760cedd0ddec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-default.css +++ /dev/null @@ -1,9 +0,0 @@ -@import url('slides.css'); - -.toclink { font-size: 10pt; - font-weight: normal; - } - -.toclink a { color: blue; } -.toclink a:link { color: blue; } -.toclink a:visited { color: blue; } diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-frames.css b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-frames.css deleted file mode 100644 index 698b6a3e256b0a51b6ca2b644a76869b54b27f50..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-frames.css +++ /dev/null @@ -1,73 +0,0 @@ -@import url('slides.css'); - -.toc-body { margin-left: 2px; - margin-right: 2px; - } - -.foil-body { margin-left: 2px; - margin-right: 2px; - } - -h1.title { margin-top: 0px; - padding-top: 0px; - } - -.navhead { visibility: visible; - } - -.navfoot { visibility: visible; - } - -/* ====================================================================== */ - -.navfoot { border-top: 1px solid black; - margin-top: 10px; - padding-top: 4px; - } -/* ====================================================================== */ - -.toc { font-weight: bold; - font-size: 10pt; - } - -.toc a { text-decoration: none; } -.toc a:link { color: blue; } -.toc a:visited { color: blue; } - -.toc .toc-foilgroup a { color: red; } -.toc .toc-foilgroup a:link { color: red; } -.toc .toc-foilgroup a:visited { color: red; } - -.toc .toc-titlefoil a { color: black; } -.toc .toc-titlefoil a:link { color: black; } -.toc .toc-titlefoil a:visited { color: black; } - -.toc .toc-foil a { color: blue; } -.toc .toc-foil a:link { color: blue; } -.toc .toc-foil a:visited { color: blue; } - -.toc-slidesinfo { font-family: sans-serif; - font-weight: bold; - text-align: center; - } - -.toc-titlefoil { font-family: sans-serif; - font-weight: bold; - text-align: center; - } - -.toc-foilgroup { font-family: sans-serif; - margin-left: 0.25in; - text-indent: -0.25in; - font-weight: bold; - color: red; - } - -.toc-foil { font-family: sans-serif; - font-size: 10pt; - margin-left: 0.25in; - text-indent: -0.4in; - font-weight: bold; - color: blue; - } - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-plain.css b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-plain.css deleted file mode 100644 index c22f2891ca523c53906b5c557e5719fdac1e6d2e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-plain.css +++ /dev/null @@ -1 +0,0 @@ -@import url('slides.css'); diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-table.css b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-table.css deleted file mode 100644 index 1c195c9e58e29188451b0f04dbc38cfb8334e02b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-table.css +++ /dev/null @@ -1,41 +0,0 @@ -@import url('slides.css'); - -.toc-body { margin-left: 2px; - margin-right: 2px; - } - -.foil-body { margin-left: 2px; - margin-right: 2px; - } - -.foilgroup-body { margin-left: 2px; - margin-right: 2px; - } - -h1.title { - margin-top: 0px; - padding-top: 0px; - } - -/* ToC Stuff */ - -.ttoc { - font-size: 10pt; - color: white; - } - -.ttoc a { text-decoration: none; } -.ttoc a:link { color: white } -.ttoc a:visited { color: white } - -.ttoc-title { - font-size: 10pt; - } - -.ttoc-foilset { - font-size: 10pt; - } - -.ttoc-foil { - font-size: 10pt; - } diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-w3c.css b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-w3c.css deleted file mode 100644 index c22f2891ca523c53906b5c557e5719fdac1e6d2e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides-w3c.css +++ /dev/null @@ -1 +0,0 @@ -@import url('slides.css'); diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides.css b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides.css deleted file mode 100644 index 1007478e8564cdc67d8b84cc0eff3efa0bcab456..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides.css +++ /dev/null @@ -1,119 +0,0 @@ -/* General formatting */ - -body { font-family: sans-serif; - font-weight: bold; - } - -.copyright { color: #7F7F7F; - } - -/* Title page formatting */ - - -.slidesinfo { text-align: center; - font-size: 16pt; - } - -.slidesinfo h1.title { color: blue; - } -.slidesinfo h2.subtitle { color: blue; - } -.slidesinfo h1.author { color: green; - } - -.slidesinfo .copyright { color: black; - } - - -/* ToC page formatting */ - -.tocpage h1.title { color: blue; - text-align: center; - } - -.tocpage a { text-decoration: none; } -.tocpage a:link { color: blue; } -.tocpage a:visited { color: blue; } - -.toc-body { margin-left: 0.5in; - margin-right: 0.5in; - } - -/* Foil page formatting */ - -.foil { font-size: 16pt; - } -.foil h1.title { text-align: center; - color: blue; - padding-top: 0pt; - margin-top: 0pt; - } -.foil h2.subtitle { text-align: center; - color: blue; - padding-top: 0pt; - margin-top: 0pt; - } - -.foil pre { font-size: 16pt; - } - -.foil-body { margin-left: 0.5in; - margin-right: 0.5in; - } - -/* Foilgroup page formatting */ - -.foilgroup { font-size: 16pt; - } -.foilgroup h1.title { text-align: center; - color: red; - padding-top: 0pt; - margin-top: 0pt; - } -.foilgroup h2.subtitle { text-align: center; - color: blue; - padding-top: 0pt; - margin-top: 0pt; - } - -.foilgroup-body { margin-left: 0.5in; - margin-right: 0.5in; - } - -/* Navigation header formatting */ - -.navhead { border-bottom: 1px solid black; - margin-bottom: 10px; - padding-bottom: 4px; - } - -.navhead hr.top-nav-sep { display: none; } - -.navhead .slidestitle { font-weight: normal; - font-size: 10pt; - font-style: italic; - } - -/* Navigation footer formatting */ - -.navfoot { border-top: 1px solid black; - margin-top: 10px; - padding-top: 4px; - } - -.navfoot hr.bottom-nav-sep { display: none; } - -/* General navigation formatting */ - -.link-text { font-weight: bold; - font-size: 10pt; - } - - -.link-text a { text-decoration: none; } -.link-text a:link { color: blue; } -.link-text a:visited { color: blue; } - -.no-link-text { color: #7F7F7F; } - -/* EOF */ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides.js b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides.js deleted file mode 100644 index 2e48a7ca3c24a41bbb8fe5987571df4edf06b92e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/slides.js +++ /dev/null @@ -1,120 +0,0 @@ -// -*- Java -*- -// -// $Id: slides.js 4931 2005-06-21 15:45:53Z kosek $ -// -// Copyright (C) 2002 Norman Walsh -// -// You are free to use, modify and distribute this software without limitation. -// This software is provided "AS IS," without a warranty of any kind. -// -// This script assumes that the Netscape 'ua.js' module has also been loaded. - -function newPage(filename, overlay) { - divs = document.getElementsByTagName("div"); - - if (divs) { - var xdiv = divs[0]; - - if (xdiv) { - var xid = xdiv.getAttribute("id"); - - var mytoc = window.top.frames[0]; - if (mytoc.lastUnderlined) { - mytoc.lastUnderlined.style.textDecoration = "none"; - } - - var tdiv = xbGetElementById(xid, mytoc); - - if (tdiv) { - var ta = tdiv.getElementsByTagName("a").item(0); - ta.style.textDecoration = "underline"; - mytoc.lastUnderlined = ta; - } - } - } - - if (overlay != 0) { - overlaySetup('lc'); - } -} - - -function navigate (evt) { - var kc = -1; - - if (navigator.org == 'microsoft' || navigator.family == 'opera') { - kc = window.event.keyCode; - } else if (navigator.family == 'gecko') { - kc = evt.keyCode; - if(!kc) { - kc = evt.which; - } - } else { - kc = evt.which; - } - - var forward = (kc == 110) || (kc == 78) || (kc == 32) - || (kc == 10) || (kc == 13) || (kc == 34) - || (kc == 39); - /* n, N, SPACE, ENTER, RETURN, PAGE UP, RIGHT ARROW */ - var backward = (kc == 112) || (kc == 80) || (kc == 8) - || (kc == 33) || (kc == 37); - /* p, P, BACKSPACE, PAGE DOWN, LEFT ARROW */ - var up = (kc == 117) || (kc == 85) || (kc == 38); - /* u, U, UP ARROW */ - var home = (kc == 104) || (kc == 72) || (kc == 36); - /* h, H, HOME */ - var toc = (kc == 116) || (kc == 84); - /* t, T */ - /* previously included META (kc == 244) */ - - var links = document.getElementsByTagName("link"); - - var count = 0; - var target = ""; - - for (count = 0; count < links.length; count++) { - if (home && (links[count].getAttribute("rel") == 'top')) { - target = links[count].getAttribute("href"); - } - if (toc && (links[count].getAttribute("rel") == 'contents')) { - target = links[count].getAttribute("href"); - } - if (up && (links[count].getAttribute("rel") == 'up')) { - target = links[count].getAttribute("href"); - } - if (forward && (links[count].getAttribute("rel") == 'next')) { - target = links[count].getAttribute("href"); - } - if (backward && (links[count].getAttribute("rel") == 'previous')) { - target = links[count].getAttribute("href"); - } - } - - if (target != "") { - if (window.top.frames[1]) { - window.top.frames[1].location = target; - } else { - window.location = target; - } - } - - return false; -} - -function toggletoc (img, width, hidegraphic, showgraphic) { - var fsc = top.GetElementsByTagName('frameset'); - if (fsc) { - var fs = fsc[0]; - if (fs) { - if (fs.cols == "0,*") { - fs.cols = width + ",*"; - img.src = hidegraphic; - } else { - fs.cols = "0,*"; - img.src = showgraphic; - } - } - } -} - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/ua.js b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/ua.js deleted file mode 100644 index 89876598082ab7244ae20359694df4daf3feace5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/ua.js +++ /dev/null @@ -1,135 +0,0 @@ -/* - * ua.js - * $Revision: 1.2 $ $Date: 2003/02/07 16:04:17 $ - */ - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Netscape code. - * - * The Initial Developer of the Original Code is - * Netscape Corporation. - * Portions created by the Initial Developer are Copyright (C) 2001 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): Bob Clary - * - * ***** END LICENSE BLOCK ***** */ - -function xbDetectBrowser() -{ - var oldOnError = window.onerror; - var element = null; - - window.onerror = null; - - // work around bug in xpcdom Mozilla 0.9.1 - window.saveNavigator = window.navigator; - - navigator.OS = ''; - navigator.version = parseFloat(navigator.appVersion); - navigator.org = ''; - navigator.family = ''; - - var platform; - if (typeof(window.navigator.platform) != 'undefined') - { - platform = window.navigator.platform.toLowerCase(); - if (platform.indexOf('win') != -1) - navigator.OS = 'win'; - else if (platform.indexOf('mac') != -1) - navigator.OS = 'mac'; - else if (platform.indexOf('unix') != -1 || platform.indexOf('linux') != -1 || platform.indexOf('sun') != -1) - navigator.OS = 'nix'; - } - - var i = 0; - var ua = window.navigator.userAgent.toLowerCase(); - - if (ua.indexOf('opera') != -1) - { - i = ua.indexOf('opera'); - navigator.family = 'opera'; - navigator.org = 'opera'; - navigator.version = parseFloat('0' + ua.substr(i+6), 10); - } - else if ((i = ua.indexOf('msie')) != -1) - { - navigator.org = 'microsoft'; - navigator.version = parseFloat('0' + ua.substr(i+5), 10); - - if (navigator.version < 4) - navigator.family = 'ie3'; - else - navigator.family = 'ie4' - } - else if (ua.indexOf('gecko') != -1) - { - navigator.family = 'gecko'; - var rvStart = ua.indexOf('rv:'); - var rvEnd = ua.indexOf(')', rvStart); - var rv = ua.substring(rvStart+3, rvEnd); - var rvParts = rv.split('.'); - var rvValue = 0; - var exp = 1; - - for (var i = 0; i < rvParts.length; i++) - { - var val = parseInt(rvParts[i]); - rvValue += val / exp; - exp *= 100; - } - navigator.version = rvValue; - - if (ua.indexOf('netscape') != -1) - navigator.org = 'netscape'; - else if (ua.indexOf('compuserve') != -1) - navigator.org = 'compuserve'; - else - navigator.org = 'mozilla'; - } - else if ((ua.indexOf('mozilla') !=-1) && (ua.indexOf('spoofer')==-1) && (ua.indexOf('compatible') == -1) && (ua.indexOf('opera')==-1)&& (ua.indexOf('webtv')==-1) && (ua.indexOf('hotjava')==-1)) - { - var is_major = parseFloat(navigator.appVersion); - - if (is_major < 4) - navigator.version = is_major; - else - { - i = ua.lastIndexOf('/') - navigator.version = parseFloat('0' + ua.substr(i+1), 10); - } - navigator.org = 'netscape'; - navigator.family = 'nn' + parseInt(navigator.appVersion); - } - else if ((i = ua.indexOf('aol')) != -1 ) - { - // aol - navigator.family = 'aol'; - navigator.org = 'aol'; - navigator.version = parseFloat('0' + ua.substr(i+4), 10); - } - else if ((i = ua.indexOf('hotjava')) != -1 ) - { - // hotjava - navigator.family = 'hotjava'; - navigator.org = 'sun'; - navigator.version = parseFloat(navigator.appVersion); - } - - window.onerror = oldOnError; -} - -xbDetectBrowser(); - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbCollapsibleLists.js b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbCollapsibleLists.js deleted file mode 100644 index 6a4f93c17455f037fb9ea781ddc3c6b75a873835..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbCollapsibleLists.js +++ /dev/null @@ -1,537 +0,0 @@ -/* -xbCollapsibleLists.js 2001-02-26 - -Contributor(s): Michael Bostock, Netscape Communications, Copyright 1997 - Bob Clary, Netscape Communications, Copyright 2001 - Seth Dillingham, Macrobyte Resources, Copyright 2001 - Mark Filanowicz, Amdahl IT Services, Copyright 2002 - -Netscape grants you a royalty free license to use, modify or -distribute this software provided that this copyright notice -appears on all copies. This software is provided "AS IS," -without a warranty of any kind. - -See xbCollapsibleLists.js.changelog.html for details of changes. -*/ - - -var xbcl__id = 0; -var xbcl_item_id = 0; -var xbcl_mLists = new Array(); -var xbcl_parentElement = null; - -document.lists = xbcl_mLists; - -function List(visible, width, height, bgColor, collapsedImageURL, expandedImageURL) -{ - this.lists = new Array(); // sublists - this.items = new Array(); // layers - this.types = new Array(); // type - this.strs = new Array(); // content - this.visible = visible; - this.id = xbcl__id; - this.width = width || 350; - this.height = height || 22; - - this.collapsedImageURL = collapsedImageURL || 'false.gif'; - this.expandedImageURL = expandedImageURL || 'true.gif'; - - if (bgColor) - this.bgColor = bgColor; - - xbcl_mLists[xbcl__id++] = this; -} - -function xbcl_SetFont(i,j) -{ - this.fontIntro = i; - this.fontOutro = j; -} - -function xbcl_GetFont() -{ - return [this.fontIntro, this.fontOutro]; -} - -function xbcl_setIndent(indent) -{ - this.i = indent; - if (this.i < 0) - { - this.i = 0; - this.space = false; - } - else - this.space = true; -} - -function xbcl_getIndent(indent) -{ - return this.i; -} - -function xbcl_writeItemDOMHTML( obj, s, flList, listObj ) -{ - var styleObj; - var outerDiv, innerLeft, innerRight; - var str; - var leftEdge = 0; - - styleObj = new xbStyle(obj); - styleObj.setVisibility('hidden'); - outerDiv = document.createElement( "DIV" ); - outerDiv.id = "DIV_" + obj.id; - styleObj = new xbStyle( outerDiv ); - styleObj.setWidth( this.width ); - - if ( flList ) - { - innerLeft = document.createElement( "DIV" ); - innerLeft.style.position = "absolute"; - innerLeft.style.valign = "middle"; - leftEdge = 15; - - styleObj = new xbStyle( innerLeft ); - styleObj.setWidth( 15 ); - styleObj.setBackgroundColor( "transparent" ); - - if ( listObj.visible ) - str = ''; - else - str = ''; - - innerLeft.innerHTML = str; - outerDiv.appendChild( innerLeft ); - } - else if ( this.space ) - leftEdge = 15; - - innerRight = document.createElement( "DIV" ); - innerRight.noWrap = true; - innerRight.style.position = "absolute"; - - styleObj = new xbStyle( innerRight ); - styleObj.setLeft( leftEdge + ( this.l * this.i ) ); - styleObj.setWidth( this.width - 15 - this.l * this.i ); - styleObj.setBackgroundColor( "transparent" ); - - // start of change by Mark Filanowicz 02-22-2002 - if ( flList ) - { - s = this.fontIntro + '' + s + this.fontOutro; - } - else - { - s = this.fontIntro + s + this.fontOutro; - } - // end of change by Mark Filanowicz 02-22-2002 - - - innerRight.innerHTML = s; - outerDiv.appendChild( innerRight ); - - obj.appendChild( outerDiv ); - - return; -} - -function xbcl_writeItem( obj, s, flList, listObj ) -{ - var cellStyle = ''; - var str = ''; - var styleObj = new xbStyle( obj ); - - styleObj.setVisibility( 'hidden' ); - - if ( document.body && document.body.style ) - cellStyle = ' style="background-color: transparent;"'; - - str += ''; - - if ( flList ) - { - str += ''; - } - else if (this.space) - str += ''; - - if (this.l>0 && this.i>0) - str += ''; - - str += '
    '; - str += ''; - - if ( listObj.visible ) - str += ''; - else - str += ''; - - str += '  '; - - // start of change by Mark Filanowicz 02-22-2002 - if ( flList ) - { - str += this.fontIntro + '' + s + this.fontOutro; - } - else - { - str += this.fontIntro + s + this.fontOutro; - } - // end of change by Mark Filanowicz 02-22-2002 - - str += '
    '; - - styleObj.setInnerHTML( str ); - - return; -} - -function xbcl_writeList() -{ - var item; - var i; - var flList; - - for ( i = 0; i < this.types.length; i++ ) - { - item = this.items[ i ]; - flList = ( this.types[ i ] == 'list' ); - - this._writeItem( item, this.strs[ i ], flList, this.lists[ i ] ); - - if ( flList && this.lists[ i ].visible ) - this.lists[ i ]._writeList(); - } - - this.built = true; - this.needsRewrite = false; - self.status = ''; -} - -function xbcl_showList() -{ - var item; - var styleObj; - var i; - - for (i = 0; i < this.types.length; i++) - { - item = this.items[i]; - styleObj = new xbStyle(item); - styleObj.setClipLeft(0); - styleObj.setClipRight(this.width); - styleObj.setClipTop(0); - if (item.height) - { - styleObj.setClipBottom(item.height); - styleObj.setHeight(item.height); - } - else - { - styleObj.setClipBottom(this.height); - styleObj.setHeight(this.height); - } - - if ( this.visible ) - styleObj.setVisibility( 'visible' ); - - var bg = item.oBgColor || this.bgColor; - if ((bg == null) || (bg == 'null')) - bg = ''; - - styleObj.setBackgroundColor(bg); - - if (this.types[i] == 'list' && this.lists[i].visible) - this.lists[i]._showList(); - } - this.shown = true; - this.needsUpdate = false; -} - -function xbcl_setImage(list, item, file) -{ - var id = '_img' + list.id; - var img = null; - - // for DOMHTML or IE4 use cross browser getElementById from xbStyle - // can't use it for NN4 since it only works for layers in NN4 - if (document.layers) - img = item.document.images[0]; - else - img = xbGetElementById(id); - - if (img) - img.src = file; -} - -function xbcl_getHeight() -{ - var totalHeight = 0; - var i; - - if (!this.visible) - return 0; - - for (i = 0; i < this.types.length; i++) - { - if (this.items[i].height) - totalHeight += this.items[i].height; - else - totalHeight += this.height; - - if ((this.types[i] == 'list') && this.lists[i].visible) - { - totalHeight += this.lists[i].getHeight(); - } - } - - return totalHeight; -} - -function xbcl_updateList(pVis, x, y) -{ - var currTop = y; - var item; - var styleObj; - var i; - - for (i = 0; i < this.types.length; i++) - { - item = this.items[i]; - styleObj = new xbStyle(item); - - if (this.visible && pVis) - { - styleObj.moveTo(x, currTop); - if (item.height) // allow custom heights for each item - currTop += item.height; - else - currTop += this.height; - - styleObj.setVisibility('visible'); - } - else - { - styleObj.setVisibility('hidden'); - } - - if (this.types[i] == 'list') - { - if (this.lists[i].visible) - { - if (!this.lists[i].built || this.lists[i].needsRewrite) - this.lists[i]._writeList(); - - if (!this.lists[i].shown || this.lists[i].needsUpdate) - this.lists[i]._showList(); - - xbcl_setImage(this.lists[i], item, this.expandedImageURL ); - } - else - xbcl_setImage(this.lists[i], item, this.collapsedImageURL ); - - if (this.lists[i].built) - currTop = this.lists[i]._updateList(this.visible && pVis, x, currTop); - } - } - return currTop; -} - -function xbcl_updateParent( pid, l ) -{ - var i; - - if ( !l ) - l = 0; - - this.pid = pid; - this.l = l; - - for ( i = 0; i < this.types.length; i++ ) - { - if ( this.types[ i ] == 'list' ) - { - this.lists[ i ]._updateParent( pid, l + 1 ); - } - } -} - -function xbcl_expand(i) -{ - xbcl_mLists[i].visible = !xbcl_mLists[i].visible; - - if (xbcl_mLists[i].onexpand != null) - xbcl_mLists[i].onexpand(xbcl_mLists[i].id); - - xbcl_mLists[xbcl_mLists[i].pid].rebuild(); - - if (xbcl_mLists[i].postexpand != null) - xbcl_mLists[i].postexpand(xbcl_mLists[i].id); -} - -function xbcl_build(x, y) -{ - this._updateParent(this.id); - this._writeList(); - this._showList(); - this._updateList(true, x, y); - this.x = x; - this.y = y; -} - -function xbcl_rebuild() -{ - this._updateList(true, this.x, this.y); -} - -function xbcl_getNewItem() -{ - var newItem = null; - - newItem = xbGetElementById('lItem' + xbcl_item_id); - - if (!newItem) - { - if (document.all && !document.getElementById) - { - var parentElement = this.parentElement; - if (!parentElement) - parentElement = document.body; - - parentElement.insertAdjacentHTML('beforeEnd', '
    '); - newItem = xbGetElementById('lItem' + xbcl_item_id); - } - else if (document.layers) - { - if (this.parentElement) - newItem = new Layer(this.width, this.parentElement); - else - newItem = new Layer(this.width); - } - else if (document.createElement) - { - newItem = document.createElement('div'); - newItem.id= 'lItem' + xbcl_item_id; - newItem.style.position = 'absolute'; - - if (this.parentElement) - this.parentElement.appendChild(newItem); - else - document.body.appendChild(newItem); - } - } - - return newItem; -} - -function xbcl_addItem(str, bgColor, item) -{ - if (!item) - item = this._getNewItem(); - - if (!item) - return; - - if (bgColor) - item.oBgColor = bgColor; - - this.items[this.items.length] = item; - this.types[this.types.length] = 'item'; - this.strs[this.strs.length] = str; - ++xbcl_item_id; - - if ( this.built ) - { - this._writeItem( item, str, false ); - xbcl_mLists[this.pid].rebuild(); - if ( this.visible ) - this._showList(); - else - this.needsUpdate = true; - } - - return item; -} - -function xbcl_addList(list, str, bgColor, item) -{ - if (!item) - item = this._getNewItem(); - - if (!item) - return; - - if (bgColor) - item.oBgColor = bgColor; - - this.lists[this.items.length] = list; - this.items[this.items.length] = item; - this.types[this.types.length] = 'list'; - this.strs[this.strs.length] = str; - ++xbcl_item_id; - - list.parentList = this; - - list.pid = this.pid; - list.l = this.l + 1; - - if ( this.built ) - { - this._writeItem( item, str, true, list ); - xbcl_mLists[ this.pid ].rebuild(); - if ( this.visible ) - this._showList(); - else - this.needsUpdate = true; - } - - return item; -} - -List.prototype.setIndent = xbcl_setIndent; -List.prototype.getIndent = xbcl_getIndent; -List.prototype.addItem = xbcl_addItem; -List.prototype.addList = xbcl_addList; -List.prototype.build = xbcl_build; -List.prototype.rebuild = xbcl_rebuild; -List.prototype.setFont = xbcl_SetFont; -List.prototype.getFont = xbcl_GetFont; -List.prototype.getHeight = xbcl_getHeight; - -List.prototype._writeList = xbcl_writeList; -List.prototype._getNewItem = xbcl_getNewItem; - -if ( document.getElementById && document.createElement ) - List.prototype._writeItem = xbcl_writeItemDOMHTML; -else - List.prototype._writeItem = xbcl_writeItem; - -List.prototype._showList = xbcl_showList; -List.prototype._updateList = xbcl_updateList; -List.prototype._updateParent = xbcl_updateParent; - -List.prototype.onexpand = null; -List.prototype.postexpand = null; -List.prototype.lists = null; // sublists -List.prototype.items = null; // layers -List.prototype.types = null; // type -List.prototype.strs = null; // content -List.prototype.x = 0; -List.prototype.y = 0; -List.prototype.visible = false; -List.prototype.id = -1; -List.prototype.i = 18; -List.prototype.space = true; -List.prototype.pid = 0; -List.prototype.fontIntro = ''; -List.prototype.fontOutro = ''; -List.prototype.width = 350; -List.prototype.height = 22; -List.prototype.built = false; -List.prototype.shown = false; -List.prototype.needsUpdate = false; -List.prototype.needsRewrite = false; -List.prototype.l = 0; -List.prototype.bgColor = null; -List.prototype.parentList = null; -List.prototype.parentElement = null; diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbDOM.js b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbDOM.js deleted file mode 100644 index 39cc8bf01295084bcefcc8684f56610ca9118488..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbDOM.js +++ /dev/null @@ -1,374 +0,0 @@ -/* - * xbDOM.js - * $Revision: 1.2 $ $Date: 2003/02/07 16:04:18 $ - */ - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Netscape code. - * - * The Initial Developer of the Original Code is - * Netscape Corporation. - * Portions created by the Initial Developer are Copyright (C) 2001 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): Bob Clary - * - * ***** END LICENSE BLOCK ***** */ - -function xbToInt(s) -{ - var i = parseInt(s, 10); - if (isNaN(i)) - i = 0; - - return i; -} - -function xbGetWindowWidth(windowRef) -{ - var width = 0; - - if (!windowRef) - { - windowRef = window; - } - - if (typeof(windowRef.innerWidth) == 'number') - { - width = windowRef.innerWidth; - } - else if (windowRef.document.body && typeof(windowRef.document.body.clientWidth) == 'number') - { - width = windowRef.document.body.clientWidth; - } - - return width; -} - -function xbGetWindowHeight(windowRef) -{ - var height = 0; - - if (!windowRef) - { - windowRef = window; - } - - if (typeof(windowRef.innerWidth) == 'number') - { - height = windowRef.innerHeight; - } - else if (windowRef.document.body && typeof(windowRef.document.body.clientWidth) == 'number') - { - height = windowRef.document.body.clientHeight; - } - return height; -} - -function xbGetElementsByNameAndType(name, type, windowRef) -{ - if (!windowRef) - windowRef = window; - - var elmlist = new Array(); - - xbFindElementsByNameAndType(windowRef.document, name, type, elmlist); - - return elmlist; -} - -function xbFindElementsByNameAndType(doc, name, type, elmlist) -{ - var i; - var subdoc; - - for (i = 0; i < doc[type].length; ++i) - { - if (doc[type][i].name && name == doc[type][i].name) - { - elmlist[elmlist.length] = doc[type][i]; - } - } - - if (doc.layers) - { - for (i = 0; i < doc.layers.length; ++i) - { - subdoc = doc.layers[i].document; - xbFindElementsByNameAndType(subdoc, name, type, elmlist); - } - } -} - -if (document.layers) -{ - nav4FindLayer = - function (doc, id) - { - var i; - var subdoc; - var obj; - - for (i = 0; i < doc.layers.length; ++i) - { - if (doc.layers[i].id && id == doc.layers[i].id) - return doc.layers[i]; - - subdoc = doc.layers[i].document; - obj = nav4FindLayer(subdoc, id); - if (obj != null) - return obj; - } - return null; - } - - nav4FindElementsByName = - function (doc, name, elmlist) - { - var i; - var j; - var subdoc; - - for (i = 0; i < doc.images.length; ++i) - { - if (doc.images[i].name && name == doc.images[i].name) - { - elmlist[elmlist.length] = doc.images[i]; - } - } - - for (i = 0; i < doc.forms.length; ++i) - { - for (j = 0; j < doc.forms[i].elements.length; j++) - { - if (doc.forms[i].elements[j].name && name == doc.forms[i].elements[j].name) - { - elmlist[elmlist.length] = doc.forms[i].elements[j]; - } - } - - if (doc.forms[i].name && name == doc.forms[i].name) - { - elmlist[elmlist.length] = doc.forms[i]; - } - } - - for (i = 0; i < doc.anchors.length; ++i) - { - if (doc.anchors[i].name && name == doc.anchors[i].name) - { - elmlist[elmlist.length] = doc.anchors[i]; - } - } - - for (i = 0; i < doc.links.length; ++i) - { - if (doc.links[i].name && name == doc.links[i].name) - { - elmlist[elmlist.length] = doc.links[i]; - } - } - - for (i = 0; i < doc.applets.length; ++i) - { - if (doc.applets[i].name && name == doc.applets[i].name) - { - elmlist[elmlist.length] = doc.applets[i]; - } - } - - for (i = 0; i < doc.embeds.length; ++i) - { - if (doc.embeds[i].name && name == doc.embeds[i].name) - { - elmlist[elmlist.length] = doc.embeds[i]; - } - } - - for (i = 0; i < doc.layers.length; ++i) - { - if (doc.layers[i].name && name == doc.layers[i].name) - { - elmlist[elmlist.length] = doc.layers[i]; - } - - subdoc = doc.layers[i].document; - nav4FindElementsByName(subdoc, name, elmlist); - } - } - - xbGetElementById = function (id, windowRef) - { - if (!windowRef) - windowRef = window; - - return nav4FindLayer(windowRef.document, id); - }; - - xbGetElementsByName = function (name, windowRef) - { - if (!windowRef) - windowRef = window; - - var elmlist = new Array(); - - nav4FindElementsByName(windowRef.document, name, elmlist); - - return elmlist; - }; - -} -else if (document.all) -{ - xbGetElementById = - function (id, windowRef) - { - if (!windowRef) - { - windowRef = window; - } - var elm = windowRef.document.all[id]; - if (!elm) - { - elm = null; - } - return elm; - }; - - xbGetElementsByName = function (name, windowRef) - { - if (!windowRef) - windowRef = window; - - var i; - var idnamelist = windowRef.document.all[name]; - var elmlist = new Array(); - - if (!idnamelist.length || idnamelist.name == name) - { - if (idnamelist) - elmlist[elmlist.length] = idnamelist; - } - else - { - for (i = 0; i < idnamelist.length; i++) - { - if (idnamelist[i].name == name) - elmlist[elmlist.length] = idnamelist[i]; - } - } - - return elmlist; - } - -} -else if (document.getElementById) -{ - xbGetElementById = - function (id, windowRef) - { - if (!windowRef) - { - windowRef = window; - } - return windowRef.document.getElementById(id); - }; - - xbGetElementsByName = - function (name, windowRef) - { - if (!windowRef) - { - windowRef = window; - } - return windowRef.document.getElementsByName(name); - }; -} -else -{ - xbGetElementById = - function (id, windowRef) - { - return null; - }; - - xbGetElementsByName = - function (name, windowRef) - { - return new Array(); - }; -} - -function xbGetPageScrollX(windowRef) -{ - if (!windowRef) - { - windowRef = window; - } - - if (typeof(windowRef.pageXOffset) == 'number') - { - return windowRef.pageXOffset; - } - - if (typeof(windowRef.document.body && windowRef.document.body.scrollLeft) == 'number') - { - return windowRef.document.body.scrollLeft; - } - - return 0; -} - -function xbGetPageScrollY(windowRef) -{ - if (!windowRef) - { - windowRef = window; - } - - if (typeof(windowRef.pageYOffset) == 'number') - { - return windowRef.pageYOffset; - } - - if (typeof(windowRef.document.body && windowRef.document.body.scrollTop) == 'number') - { - return windowRef.document.body.scrollTop; - } - - return 0; -} - -if (document.layers) -{ - xbSetInnerHTML = - function (element, str) - { - element.document.write(str); - element.document.close(); - }; -} -else -{ - xbSetInnerHTML = function (element, str) - { - if (typeof(element.innerHTML) != 'undefined') - { - element.innerHTML = str; - } - }; -} - -// eof: xbDOM.js diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbDebug.js b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbDebug.js deleted file mode 100644 index 48fd010cbf02eaf08b93481491453e6fd0ba41f6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbDebug.js +++ /dev/null @@ -1,311 +0,0 @@ -/* - * xbDebug.js - * $Revision: 1.2 $ $Date: 2003/02/07 16:04:19 $ - */ - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Netscape code. - * - * The Initial Developer of the Original Code is - * Netscape Corporation. - * Portions created by the Initial Developer are Copyright (C) 2001 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): Bob Clary - * - * ***** END LICENSE BLOCK ***** */ - -/* -ChangeLog: - -2002-02-25: bclary - modified xbDebugTraceOject to make sure - that original versions of wrapped functions were not - rewrapped. This had caused an infinite loop in IE. - -2002-02-07: bclary - modified xbDebug.prototype.close to not null - the debug window reference. This can cause problems with - Internet Explorer if the page is refreshed. These issues will - be addressed at a later date. -*/ - -function xbDebug() -{ - this.on = false; - this.stack = new Array(); - this.debugwindow = null; - this.execprofile = new Object(); -} - -xbDebug.prototype.push = function () -{ - this.stack[this.stack.length] = this.on; - this.on = true; -} - -xbDebug.prototype.pop = function () -{ - this.on = this.stack[this.stack.length - 1]; - --this.stack.length; -} - -xbDebug.prototype.open = function () -{ - if (this.debugwindow && !this.debugwindow.closed) - this.close(); - - this.debugwindow = window.open('about:blank', 'DEBUGWINDOW', 'height=400,width=600,resizable=yes,scrollbars=yes'); - this.debugwindow.moveTo(0,0); - window.focus(); - - this.debugwindow.document.write('xbDebug Window

    Javascript Debug Window

    '); -} - -xbDebug.prototype.close = function () -{ - if (!this.debugwindow) - return; - - if (!this.debugwindow.closed) - this.debugwindow.close(); - - // bc 2002-02-07, other windows may still hold a reference to this: this.debugwindow = null; -} - -xbDebug.prototype.dump = function (msg) -{ - if (!this.on) - return; - - if (!this.debugwindow || this.debugwindow.closed) - this.open(); - - this.debugwindow.document.write(msg + '
    '); - - return; -} - -var xbDEBUG = new xbDebug(); - -window.onunload = function () { xbDEBUG.close(); } - -function xbDebugGetFunctionName(funcref) -{ - - if (!funcref) - { - return ''; - } - - if (funcref.name) - return funcref.name; - - var name = funcref + ''; - name = name.substring(name.indexOf(' ') + 1, name.indexOf('(')); - funcref.name = name; - - if (!name) alert('name not defined'); - return name; -} - - -// emulate functionref.apply for IE mac and IE win < 5.5 -function xbDebugApplyFunction(funcname, funcref, thisref, argumentsref) -{ - var rv; - - if (!funcref) - { - alert('xbDebugApplyFunction: funcref is null'); - } - - if (typeof(funcref.apply) != 'undefined') - return funcref.apply(thisref, argumentsref); - - var applyexpr = 'thisref.xbDebug_orig_' + funcname + '('; - var i; - - for (i = 0; i < argumentsref.length; i++) - { - applyexpr += 'argumentsref[' + i + '],'; - } - - if (argumentsref.length > 0) - { - applyexpr = applyexpr.substring(0, applyexpr.length - 1); - } - - applyexpr += ')'; - - return eval(applyexpr); -} - -function xbDebugCreateFunctionWrapper(scopename, funcname, precall, postcall) -{ - var wrappedfunc; - var scopeobject = eval(scopename); - var funcref = scopeobject[funcname]; - - scopeobject['xbDebug_orig_' + funcname] = funcref; - - wrappedfunc = function () - { - var rv; - - precall(scopename, funcname, arguments); - rv = xbDebugApplyFunction(funcname, funcref, scopeobject, arguments); - postcall(scopename, funcname, arguments, rv); - return rv; - }; - - if (typeof(funcref.constructor) != 'undefined') - wrappedfunc.constructor = funcref.constuctor; - - if (typeof(funcref.prototype) != 'undefined') - wrappedfunc.prototype = funcref.prototype; - - scopeobject[funcname] = wrappedfunc; -} - -function xbDebugCreateMethodWrapper(contextname, classname, methodname, precall, postcall) -{ - var context = eval(contextname); - var methodref = context[classname].prototype[methodname]; - - context[classname].prototype['xbDebug_orig_' + methodname] = methodref; - - var wrappedmethod = function () - { - var rv; - // eval 'this' at method run time to pick up reference to the object's instance - var thisref = eval('this'); - // eval 'arguments' at method run time to pick up method's arguments - var argsref = arguments; - - precall(contextname + '.' + classname, methodname, argsref); - rv = xbDebugApplyFunction(methodname, methodref, thisref, argsref); - postcall(contextname + '.' + classname, methodname, argsref, rv); - return rv; - }; - - return wrappedmethod; -} - -function xbDebugPersistToString(obj) -{ - var s = ''; - - if (obj == null) - return 'null'; - - switch(typeof(obj)) - { - case 'number': - return obj; - case 'string': - return '"' + obj + '"'; - case 'undefined': - return 'undefined'; - case 'boolean': - return obj + ''; - } - - if (obj.constructor) - return '[' + xbDebugGetFunctionName(obj.constructor) + ']'; - - return null; -} - -function xbDebugTraceBefore(scopename, funcname, funcarguments) -{ - var i; - var s = ''; - var execprofile = xbDEBUG.execprofile[scopename + '.' + funcname]; - if (!execprofile) - execprofile = xbDEBUG.execprofile[scopename + '.' + funcname] = { started: 0, time: 0, count: 0 }; - - for (i = 0; i < funcarguments.length; i++) - { - s += xbDebugPersistToString(funcarguments[i]); - if (i < funcarguments.length - 1) - s += ', '; - } - - xbDEBUG.dump('enter ' + scopename + '.' + funcname + '(' + s + ')'); - execprofile.started = (new Date()).getTime(); -} - -function xbDebugTraceAfter(scopename, funcname, funcarguments, rv) -{ - var i; - var s = ''; - var execprofile = xbDEBUG.execprofile[scopename + '.' + funcname]; - if (!execprofile) - xbDEBUG.dump('xbDebugTraceAfter: execprofile not created for ' + scopename + '.' + funcname); - else if (execprofile.started == 0) - xbDEBUG.dump('xbDebugTraceAfter: execprofile.started == 0 for ' + scopename + '.' + funcname); - else - { - execprofile.time += (new Date()).getTime() - execprofile.started; - execprofile.count++; - execprofile.started = 0; - } - - for (i = 0; i < funcarguments.length; i++) - { - s += xbDebugPersistToString(funcarguments[i]); - if (i < funcarguments.length - 1) - s += ', '; - } - - xbDEBUG.dump('exit ' + scopename + '.' + funcname + '(' + s + ')==' + xbDebugPersistToString(rv)); -} - -function xbDebugTraceFunction(scopename, funcname) -{ - xbDebugCreateFunctionWrapper(scopename, funcname, xbDebugTraceBefore, xbDebugTraceAfter); -} - -function xbDebugTraceObject(contextname, classname) -{ - var classref = eval(contextname + '.' + classname); - var p; - var sp; - - if (!classref || !classref.prototype) - return; - - for (p in classref.prototype) - { - sp = p + ''; - if (typeof(classref.prototype[sp]) == 'function' && (sp).indexOf('xbDebug_orig') == -1) - { - classref.prototype[sp] = xbDebugCreateMethodWrapper(contextname, classname, sp, xbDebugTraceBefore, xbDebugTraceAfter); - } - } -} - -function xbDebugDumpProfile() -{ - var p; - var execprofile; - var avg; - - for (p in xbDEBUG.execprofile) - { - execprofile = xbDEBUG.execprofile[p]; - avg = Math.round ( 100 * execprofile.time/execprofile.count) /100; - xbDEBUG.dump('Execution profile ' + p + ' called ' + execprofile.count + ' times. Total time=' + execprofile.time + 'ms. Avg Time=' + avg + 'ms.'); - } -} diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbLibrary.js b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbLibrary.js deleted file mode 100644 index 9bbfd6b1419f342c93ff06cedfab37b6864a0b8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/browser/xbLibrary.js +++ /dev/null @@ -1,80 +0,0 @@ -/* - * xbLibrary.js - * $Revision: 1.3 $ $Date: 2003/03/17 03:44:20 $ - */ - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Bob Clary code. - * - * The Initial Developer of the Original Code is - * Bob Clary. - * Portions created by the Initial Developer are Copyright (C) 2000 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): Bob Clary - * - * ***** END LICENSE BLOCK ***** */ - -if (!document.getElementById || navigator.userAgent.indexOf('Opera') != -1) -{ - // assign error handler for downlevel browsers - // Note until Opera improves it's overall support - // for JavaScript and the DOM, it must be considered downlevel - - window.onerror = defaultOnError; - - function defaultOnError(msg, url, line) - { - // handle bug in NS6.1, N6.2 - // where an Event is passed to error handlers - if (typeof(msg) != 'string') - { - msg = 'unknown error'; - } - if (typeof(url) != 'string') - { - url = document.location; - } - - alert('An error has occurred at ' + url + ', line ' + line + ': ' + msg); - } -} - -function xbLibrary(path) -{ - if (path.charAt(path.length-1) == '/') - { - path = path.substr(0, path.length-1) - } - this.path = path; -} - -// dynamically loaded scripts -// -// it is an error to reference anything from the dynamically loaded file inside the -// same script block. This means that a file can not check its dependencies and -// load the files for it's own use. someone else must do this. - -xbLibrary.prototype.loadScript = -function (scriptName) -{ - document.write(' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - overlaySetup('ll'); - - - - - - init( - - ); - - overlaySetup('ll'); - - - - - - -
    - -
    -
    - -
    - - - - -
    - logo -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - javascript:body.focus() - - - - - - - - - <body class="frameset"> - <xsl:call-template name="body.attributes"/> - <p> - <xsl:text>Your browser doesn't support frames.</xsl:text> - </p> - </body> - - - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Body - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - newPage(' - - ', - - ); - - - - - overlaySetup('lc'); - - - - - - - this.focus() - - - navigate(event) - - - -
    - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - foilgroup - - - - - - - javascript:body.focus() - - - - - - <body class="frameset"> - <xsl:call-template name="body.attributes"/> - <p> - <xsl:text>Your browser doesn't support frames.</xsl:text> - </p> - </body> - - - - - - - foilgroup - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - foilgroup - - - - - - - - - - - Body - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - foilgroup - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - newPage(' - - ', - - ); - - - - - overlaySetup('lc'); - - - - - - - - navigate(event) - - - -
    - - - - - - - - - -
    - - - - - - -
    - - -
    - - - position:absolute;visibility:visible; - - - - - - - - -
    -
    -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - javascript:body.focus() - - - - - - - - - <body class="frameset"> - <xsl:call-template name="body.attributes"/> - <p> - <xsl:text>Your browser doesn't support frames.</xsl:text> - </p> - </body> - - - - - - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Body - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - newPage(' - - ', - - ); - - - - - overlaySetup('lc'); - - - - - - - navigate(event) - - - -
    - - - - - - - - - -
    - -
    - - -
    - - - position:absolute;visibility:visible; - - - - - - - - -
    -
    -
    - - - -
    - - - - - - - -
    - - - - - - - foilgroup - - - - -
    - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - -
    - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - myList.addItem(' - - <div id=" - - " class="toc-slidesinfo"> - - <a href=" - - " target="foil"> - - - - - - - - - - - - - ' - \' - - - <\/a><\/div> - '); - - - - - - - - subList = new List(false, width, height, " - -"); - subList.setIndent(12); - - - myList.addList(subList, ' - - <div id=" - - " class="toc-foilgroup"> - - <a href=" - - " target="foil"> - - - - - - - - - - - - - ' - \' - - - <\/a><\/div> - '); - - - - - - - - subList.addItem(' - - - myList.addItem(' - - - - <div id=" - - " class="toc-foil"> - - <img alt="-" src=" - - "><\/img> - - <a href=" - - " target="foil"> - - - - - - - - - - - - - ' - \' - - - <\/a><\/div> - '); - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/graphics.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/graphics.xsl deleted file mode 100644 index b682acdfb1b8cff875c52def7c0ef590d7cd7592..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/graphics.xsl +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - / - - - - / - - - http://docbook.sourceforge.net/release/slides/graphics/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html deleted file mode 100644 index 1aea457a72e6b3fe88d65c579b39303f44d61de9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/html - - -

    Index of /release/xsl-ns/1.76.1/slides/html

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] css.xsl 01-Nov-2010 20:31 1.5K -[TXT] flat.xsl 01-Nov-2010 20:31 1.7K -[TXT] param.xsl 01-Nov-2010 20:31 3.3K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.1K -[TXT] graphics.xsl 01-Nov-2010 20:31 4.9K -[TXT] default.xsl 01-Nov-2010 20:31 7.7K -[TXT] tables.xsl 01-Nov-2010 20:31 10K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] param.xml 01-Nov-2010 20:31 40K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] frames.xsl 01-Nov-2010 20:31 72K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=D;O=A deleted file mode 100644 index af37d05dc689ca938701bace88591a9ba9197605..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=D;O=A +++ /dev/null @@ -1,24 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/html - - -

    Index of /release/xsl-ns/1.76.1/slides/html

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] css.xsl 01-Nov-2010 20:31 1.5K -[TXT] default.xsl 01-Nov-2010 20:31 7.7K -[TXT] flat.xsl 01-Nov-2010 20:31 1.7K -[TXT] frames.xsl 01-Nov-2010 20:31 72K -[TXT] graphics.xsl 01-Nov-2010 20:31 4.9K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.1K -[TXT] param.xml 01-Nov-2010 20:31 40K -[TXT] param.xsl 01-Nov-2010 20:31 3.3K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] tables.xsl 01-Nov-2010 20:31 10K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=M;O=A deleted file mode 100644 index 8bc5b4778740fed47bab4be8ec820f2b6e764c29..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=M;O=A +++ /dev/null @@ -1,24 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/html - - -

    Index of /release/xsl-ns/1.76.1/slides/html

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] param.xml 01-Nov-2010 20:31 40K -[TXT] css.xsl 01-Nov-2010 20:31 1.5K -[TXT] default.xsl 01-Nov-2010 20:31 7.7K -[TXT] flat.xsl 01-Nov-2010 20:31 1.7K -[TXT] frames.xsl 01-Nov-2010 20:31 72K -[TXT] graphics.xsl 01-Nov-2010 20:31 4.9K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.1K -[TXT] param.xsl 01-Nov-2010 20:31 3.3K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] tables.xsl 01-Nov-2010 20:31 10K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=N;O=A deleted file mode 100644 index b726810786ff9cdfaaa40cbf7f26ae1160fcd8a5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=N;O=A +++ /dev/null @@ -1,24 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/html - - -

    Index of /release/xsl-ns/1.76.1/slides/html

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] css.xsl 01-Nov-2010 20:31 1.5K -[TXT] default.xsl 01-Nov-2010 20:31 7.7K -[TXT] flat.xsl 01-Nov-2010 20:31 1.7K -[TXT] frames.xsl 01-Nov-2010 20:31 72K -[TXT] graphics.xsl 01-Nov-2010 20:31 4.9K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.1K -[TXT] param.xml 01-Nov-2010 20:31 40K -[TXT] param.xsl 01-Nov-2010 20:31 3.3K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] tables.xsl 01-Nov-2010 20:31 10K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=S;O=D deleted file mode 100644 index c9fa260cc8ce3e0ccd75c21f7aa93bbd89c74901..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/index.html?C=S;O=D +++ /dev/null @@ -1,24 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/html - - -

    Index of /release/xsl-ns/1.76.1/slides/html

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] frames.xsl 01-Nov-2010 20:31 72K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] param.xml 01-Nov-2010 20:31 40K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -[TXT] tables.xsl 01-Nov-2010 20:31 10K -[TXT] default.xsl 01-Nov-2010 20:31 7.7K -[TXT] graphics.xsl 01-Nov-2010 20:31 4.9K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.1K -[TXT] param.xsl 01-Nov-2010 20:31 3.3K -[TXT] flat.xsl 01-Nov-2010 20:31 1.7K -[TXT] css.xsl 01-Nov-2010 20:31 1.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/jscript.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/jscript.xsl deleted file mode 100644 index ae4ef9fdf2a7ccab1c40b5f6955df35062a3314e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/jscript.xsl +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - / - - - - / - - - http://docbook.sourceforge.net/release/slides/browser/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/param.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/param.xml deleted file mode 100644 index 84cf1969330cbc440cc680fc6e4cd21273d2ea2f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/param.xml +++ /dev/null @@ -1,1376 +0,0 @@ - - - -Slides HTML Parameter Reference - -$Id: param.xweb 6633 2007-02-21 18:33:33Z xmldoc $ - - - - Walsh - Norman - - - - 2002 - Norman Walsh - - - This is reference documentation for all user-configurable - parameters in the DocBook XSL Slides HTML stylesheet (for - generating HTML slide presentations). Note that the Slides - stylesheet for HTML output is a customization layer of the - DocBook XSL HTML stylesheet. Therefore, in addition to the - slides-specific parameters listed in this section, you can - also use a number of HTML - stylesheet parameters to control Slides HTML - output. - - - -HTML: General Parameters - - -keyboard.nav -boolean - - -keyboard.nav -Enable keyboard navigation? - - - - -<xsl:param name="keyboard.nav" select="1"></xsl:param> - - - -Description - -If non-zero, JavaScript is added to the slides to enable keyboard -navigation. Pressing 'n', space, or return moves forward; pressing 'p' moves -backward. - - - - - - -css.stylesheet -uri - - -css.stylesheet -CSS stylesheet for slides - - - - -<xsl:param name="css.stylesheet">slides.css</xsl:param> - - - -Description - -Identifies the CSS stylesheet used by all the slides. This parameter -can be set in the source document with the <?dbhtml?> pseudo-attribute -css-stylesheet. - - - - - - -css.stylesheet.dir -uri - - -css.stylesheet.dir -Default directory for CSS stylesheets - - - - -<xsl:param name="css.stylesheet.dir"></xsl:param> - - - -Description - -Identifies the default directory for the CSS stylesheet -generated on all the slides. This parameter can be set in the source -document with the <?dbhtml?> pseudo-attribute -css-stylesheet-dir. - -If non-empty, this value is prepended to each of the stylesheets. - - - - - - - -titlefoil.html -filename - - -titlefoil.html -Name of title foil HTML file - - - - -<xsl:param name="titlefoil.html" select="concat('index', $html.ext)"></xsl:param> - - - -Description - -Sets the filename used for the slides titlepage. - - - - - - -toc.html -filename - - -toc.html -Name of ToC HTML file - - - - -<xsl:param name="toc.html" select="concat('toc', $html.ext)"></xsl:param> - - - -Description - -Sets the filename used for the table of contents page. - - - - - - -foilgroup.toc -boolean - - -foilgroup.toc -Put ToC on foilgroup pages? - - - - -<xsl:param name="foilgroup.toc" select="1"></xsl:param> - - - -Description - -If non-zero, a ToC will be placed on foilgroup pages (after any -other content). - - - - - - - -output.indent -list -no -yes - - -output.indent -Indent output? - - - - -<xsl:param name="output.indent">no</xsl:param> - - - -Description - -Specifies the setting of the indent -parameter on the HTML slides. For more information, see the discussion -of the xsl:output element in the XSLT specification. -Select from yes or no. - - - - - - -overlay -boolean - - -overlay -Overlay footer navigation? - - - - -<xsl:param name="overlay" select="0"></xsl:param> - - - -Description - -If non-zero, JavaScript is added to the slides to make the -bottom navigation appear at the bottom of each page. This option and -multiframe are mutually exclusive. - -If this parameter is zero, the bottom navigation simply appears -below the content of each slide. - - - - - - -show.foil.number -boolean - - -show.foil.number -Show foil number on each foil? - - - - -<xsl:param name="show.foil.number" select="0"></xsl:param> - - - -Description - -If non-zero, on each slide there will be its number. Currently -not supported in all output formats. - - - - - - -HTML: Frames Parameters - - -nav.separator -boolean - - -nav.separator -Output separator between navigation and body? - - - - -<xsl:param name="nav.separator" select="1"></xsl:param> - - - -Description - -If non-zero, a separator (<HR>) is -added between the navigation links and the content of each slide. - - - - - - -toc.row.height -length - - -toc.row.height -Height of ToC rows in dynamic ToCs - - - - -<xsl:param name="toc.row.height">22</xsl:param> - - - -Description - -This parameter specifies the height of each row in the table of -contents. This is only applicable if a dynamic ToC is used. You may want to -adjust this parameter for optimal appearance with the font and image -sizes selected by your CSS -stylesheet. - - - - - - - -toc.bg.color -color - - -toc.bg.color -Background color for ToC frame - - - - -<xsl:param name="toc.bg.color">#FFFFFF</xsl:param> - - - -Description - -Specifies the background color used in the ToC frame. - - - - - - -body.bg.color -color - - -body.bg.color -Background color for body frame - - - - -<xsl:param name="body.bg.color">#FFFFFF</xsl:param> - - - -Description - -Specifies the background color used in the body column of -tabular slides. - - - - - - -toc.width -length - - -toc.width -Width of ToC frame - - - - -<xsl:param name="toc.width">250</xsl:param> -<!-- Presumably in pixels? --> - - - -Description - -Specifies the width of the ToC frame in pixels. - - - - - - -toc.hide.show -boolean - - -toc.hide.show -Enable hide/show button for ToC frame - - - - -<xsl:param name="toc.hide.show" select="0"></xsl:param> - - - -Description - -If non-zero, JavaScript (and an additional icon, see -hidetoc.image and -showtoc.image) is added to each slide -to allow the ToC panel to be toggled on each panel. - -There is a bug in Mozilla 1.0 (at least as of CR3) that causes -the browser to reload the titlepage when this feature is used. - - - - - - -dynamic.toc -boolean - - -dynamic.toc -Dynamic ToCs? - - - - -<xsl:param name="dynamic.toc" select="0"></xsl:param> - - - -Description - -If non-zero, JavaScript is used to make the ToC panel dynamic. -In a dynamic ToC, each section in the ToC can be expanded and collapsed by -clicking on the appropriate image. - - - - - - -active.toc -boolean - - -active.toc -Active ToCs? - - - - -<xsl:param name="active.toc" select="0"></xsl:param> - - - -Description - -If non-zero, JavaScript is used to keep the ToC and the current slide -in sync. That is, each time the slide changes, the corresponding -ToC entry will be underlined. - - - - - - -overlay.logo -uri - - -overlay.logo -Logo to overlay on ToC frame - - - - -<xsl:param name="overlay.logo">http://docbook.sourceforge.net/release/buttons/slides-1.png</xsl:param> - - - -Description - -If this URI is non-empty, JavaScript is used to overlay the -specified image on the ToC frame. - - - - - - -multiframe -boolean - - -multiframe -Use multiple frames for slide bodies? - - - - -<xsl:param name="multiframe" select="0"></xsl:param> - - - -Description - -If non-zero, multiple frames are used for the body of each -slide. This is one way of forcing the slide navigation elements to -appear in constant locations. The other way is with overlays. The overlay and -multiframe parameters are mutually -exclusive. - - - - - - -multiframe.top.bgcolor -color - - -multiframe.top.bgcolor -Background color for top navigation frame - - - - -<xsl:param name="multiframe.top.bgcolor">white</xsl:param> - - - -Description - -Specifies the background color of the top navigation frame when -multiframe is enabled. - - - - - - -multiframe.bottom.bgcolor -color - - -multiframe.bottom.bgcolor -Background color for bottom navigation frame - - - - -<xsl:param name="multiframe.bottom.bgcolor">white</xsl:param> - - - -Description - -Specifies the background color of the bottom navigation frame when -multiframe is enabled. - - - - - - -multiframe.navigation.height -length - - -multiframe.navigation.height -Height of navigation frames - - - - -<xsl:param name="multiframe.navigation.height">40</xsl:param> - - - -Description - -Specifies the height of the navigation frames in pixels when -multiframe is enabled. - - - - - - -HTML: Graphics Parameters - - -graphics.dir -uri - - -graphics.dir -Graphics directory - - - - -<xsl:param name="graphics.dir"></xsl:param> - - - -Description - -Identifies the graphics directory for the navigation components -generated on all the slides. This parameter can be set in the source -document with the <?dbhtml?> pseudo-attribute -graphics-dir. - -If non-empty, this value is prepended to each of the graphic -image paths. - - - - - - -bullet.image -filename - - -bullet.image -Bullet image - - - - -<xsl:param name="bullet.image">toc/bullet.png</xsl:param> - - - -Description - -Specifies the filename of the bullet image used for foils in the -framed ToC. - - - - - - -next.image -filename - - -next.image -Right-arrow image - - - - -<xsl:param name="next.image">active/nav-next.png</xsl:param> - - - -Description - -Specifies the filename of the right-pointing navigation arrow. - - - - - - -prev.image -filename - - -prev.image -Left-arrow image - - - - -<xsl:param name="prev.image">active/nav-prev.png</xsl:param> - - - -Description - -Specifies the filename of the left-pointing navigation arrow. - - - - - - -up.image -filename - - -up.image -Up-arrow image - - - - -<xsl:param name="up.image">active/nav-up.png</xsl:param> - - - -Description - -Specifies the filename of the upward-pointing navigation arrow. - - - - - - -home.image -filename - - -home.image -Home image - - - - -<xsl:param name="home.image">active/nav-home.png</xsl:param> - - - -Description - -Specifies the filename of the home navigation icon. - - - - - - -toc.image -filename - - -toc.image -ToC image - - - - -<xsl:param name="toc.image">active/nav-toc.png</xsl:param> - - - -Description - -Specifies the filename of the ToC navigation icon. - - - - - - - -no.next.image -filename - - -no.next.image -Inactive right-arrow image - - - - -<xsl:param name="no.next.image">inactive/nav-next.png</xsl:param> - - - -Description - -Specifies the filename of the inactive right-pointing navigation arrow. - - - - - - -no.prev.image -filename - - -no.prev.image -Inactive left-arrow image - - - - -<xsl:param name="no.prev.image">inactive/nav-prev.png</xsl:param> - - - -Description - -Specifies the filename of the inactive left-pointing navigation arrow. - - - - - - -no.up.image -filename - - -no.up.image -Inactive up-arrow image - - - - -<xsl:param name="no.up.image">inactive/nav-up.png</xsl:param> - - - -Description - -Specifies the filename of the inactive upward-pointing navigation arrow. - - - - - - -no.home.image -filename - - -no.home.image -Inactive home image - - - - -<xsl:param name="no.home.image">inactive/nav-home.png</xsl:param> - - - -Description - -Specifies the filename of the inactive home navigation icon. - - - - - - -no.toc.image -filename - - -no.toc.image -Inactive ToC image - - - - -<xsl:param name="no.toc.image">inactive/nav-toc.png</xsl:param> - - - -Description - -Specifies the filename of the inactive ToC navigation icon. - - - - - - - -plus.image -filename - - -plus.image -Plus image - - - - -<xsl:param name="plus.image">toc/closed.png</xsl:param> - - - -Description - -Specifies the filename of the plus image; the image used in a -dynamic ToC to indicate that a section -can be expanded. - - - - - - -minus.image -filename - - -minus.image -Minus image - - - - -<xsl:param name="minus.image">toc/open.png</xsl:param> - - - -Description - -Specifies the filename of the minus image; the image used in a -dynamic ToC to indicate that a section -can be collapsed. - - - - - - -hidetoc.image -filename - - -hidetoc.image -Hide ToC image - - - - -<xsl:param name="hidetoc.image">hidetoc.gif</xsl:param> - - - -Description - -Specifies the filename of the hide ToC image. This is used -when the ToC hide/show parameter is -enabled. - - - - - - -showtoc.image -filename - - -showtoc.image -Show ToC image - - - - -<xsl:param name="showtoc.image">showtoc.gif</xsl:param> - - - -Description - -Specifies the filename of the show ToC image. This is used -when the ToC hide/show parameter is -enabled. - - - - - - -HTML: JavaScript Parameters - - -script.dir -uri - - -script.dir -Script directory - - - - -<xsl:param name="script.dir"></xsl:param> - - - -Description - -Identifies the JavaScript source directory for the slides. -This parameter can be set in the source -document with the <?dbhtml?> pseudo-attribute -script-dir. - -If non-empty, this value is prepended to each of the JavaScript files. - - - - - - - -ua.js -filename - - -ua.js -UA JavaScript file - - - - -<xsl:param name="ua.js">ua.js</xsl:param> - - - -Description - -Specifies the filename of the UA JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -xbDOM.js -filename - - -xbDOM.js -xbDOM JavaScript file - - - - -<xsl:param name="xbDOM.js">xbDOM.js</xsl:param> - - - -Description - -Specifies the filename of the xbDOM JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -xbStyle.js -filename - - -xbStyle.js -xbStyle JavaScript file - - - - -<xsl:param name="xbStyle.js">xbStyle.js</xsl:param> - - - -Description - -Specifies the filename of the xbStyle JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -xbLibrary.js -filename - - -xbLibrary.js -xbLibrary JavaScript file - - - - -<xsl:param name="xbLibrary.js">xbLibrary.js</xsl:param> - - - -Description - -Specifies the filename of the xbLibrary JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -xbCollapsibleLists.js -filename - - -xbCollapsibleLists.js -xbCollapsibleLists JavaScript file - - - - -<xsl:param name="xbCollapsibleLists.js">xbCollapsibleLists.js</xsl:param> - - - -Description - -Specifies the filename of the xbCollapsibleLists JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -overlay.js -filename - - -overlay.js -Overlay JavaScript file - - - - -<xsl:param name="overlay.js">overlay.js</xsl:param> - - - -Description - -Specifies the filename of the overlay JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -slides.js -filename - - -slides.js -Slides overlay file - - - - -<xsl:param name="slides.js">slides.js</xsl:param> - - - -Description - -Specifies the filename of the slides JavaScript file. It's unlikely -that you will ever need to change this parameter. - - - - - - -HTML: Localization Parameters - - -text.home -string - - -text.home -Home - - - - -<xsl:param name="text.home">Home</xsl:param> - - - -Description - -FIXME: - - - - - - -text.toc -string - - -text.toc -FIXME: - - - - -<xsl:param name="text.toc">ToC</xsl:param> - - - -Description - -FIXME: - - - - - - -text.prev -string - - -text.prev -FIXME: - - - - -<xsl:param name="text.prev">Prev</xsl:param> - - - -Description - -FIXME: - - - - - - -text.up -string - - -text.up -FIXME: - - - - -<xsl:param name="text.up">Up</xsl:param> - - - -Description - -FIXME: - - - - - - -text.next -string - - -text.next -FIXME: - - - - -<xsl:param name="text.next">Next</xsl:param> - - - -Description - -FIXME: - - - - - - - -The Stylesheet - -The param.xsl stylesheet is just a wrapper -around all these parameters. - - - -<!-- This file is generated from param.xweb --> - -<xsl:stylesheet exclude-result-prefixes="src" version="1.0"> - -<!-- ******************************************************************** - $Id: param.xweb 6633 2007-02-21 18:33:33Z xmldoc $ - ******************************************************************** - - This file is part of the DocBook Slides Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - -<src:fragref linkend="active.toc.frag"></src:fragref> -<src:fragref linkend="body.bg.color.frag"></src:fragref> -<src:fragref linkend="bullet.image.frag"></src:fragref> -<src:fragref linkend="css.stylesheet.frag"></src:fragref> -<src:fragref linkend="css.stylesheet.dir.frag"></src:fragref> -<src:fragref linkend="dynamic.toc.frag"></src:fragref> -<src:fragref linkend="foilgroup.toc.frag"></src:fragref> -<src:fragref linkend="graphics.dir.frag"></src:fragref> -<src:fragref linkend="hidetoc.image.frag"></src:fragref> -<src:fragref linkend="home.image.frag"></src:fragref> -<src:fragref linkend="keyboard.nav.frag"></src:fragref> -<src:fragref linkend="minus.image.frag"></src:fragref> -<src:fragref linkend="multiframe.bottom.bgcolor.frag"></src:fragref> -<src:fragref linkend="multiframe.frag"></src:fragref> -<src:fragref linkend="multiframe.navigation.height.frag"></src:fragref> -<src:fragref linkend="multiframe.top.bgcolor.frag"></src:fragref> -<src:fragref linkend="nav.separator.frag"></src:fragref> -<src:fragref linkend="next.image.frag"></src:fragref> -<src:fragref linkend="no.home.image.frag"></src:fragref> -<src:fragref linkend="no.next.image.frag"></src:fragref> -<src:fragref linkend="no.prev.image.frag"></src:fragref> -<src:fragref linkend="no.toc.image.frag"></src:fragref> -<src:fragref linkend="no.up.image.frag"></src:fragref> -<src:fragref linkend="output.indent.frag"></src:fragref> -<src:fragref linkend="overlay.frag"></src:fragref> -<src:fragref linkend="overlay.js.frag"></src:fragref> -<src:fragref linkend="overlay.logo.frag"></src:fragref> -<src:fragref linkend="plus.image.frag"></src:fragref> -<src:fragref linkend="prev.image.frag"></src:fragref> -<src:fragref linkend="script.dir.frag"></src:fragref> -<src:fragref linkend="show.foil.number.frag"></src:fragref> -<src:fragref linkend="showtoc.image.frag"></src:fragref> -<src:fragref linkend="slides.js.frag"></src:fragref> -<src:fragref linkend="text.home.frag"></src:fragref> -<src:fragref linkend="text.next.frag"></src:fragref> -<src:fragref linkend="text.prev.frag"></src:fragref> -<src:fragref linkend="text.toc.frag"></src:fragref> -<src:fragref linkend="text.up.frag"></src:fragref> -<src:fragref linkend="titlefoil.html.frag"></src:fragref> -<src:fragref linkend="toc.bg.color.frag"></src:fragref> -<src:fragref linkend="toc.hide.show.frag"></src:fragref> -<src:fragref linkend="toc.html.frag"></src:fragref> -<src:fragref linkend="toc.image.frag"></src:fragref> -<src:fragref linkend="toc.row.height.frag"></src:fragref> -<src:fragref linkend="toc.width.frag"></src:fragref> -<src:fragref linkend="ua.js.frag"></src:fragref> -<src:fragref linkend="up.image.frag"></src:fragref> -<src:fragref linkend="xbCollapsibleLists.js.frag"></src:fragref> -<src:fragref linkend="xbDOM.js.frag"></src:fragref> -<src:fragref linkend="xbStyle.js.frag"></src:fragref> -<src:fragref linkend="xbLibrary.js.frag"></src:fragref> - -</xsl:stylesheet> - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/param.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/param.xsl deleted file mode 100644 index 7dad0bc33f25c41a1feaf8473591655df79c5b3f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/param.xsl +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - -#FFFFFF -toc/bullet.png -slides.css - - - - -hidetoc.gif -active/nav-home.png - -toc/open.png -white - -40 -white - -active/nav-next.png -inactive/nav-home.png -inactive/nav-next.png -inactive/nav-prev.png -inactive/nav-toc.png -inactive/nav-up.png -no - -overlay.js -http://docbook.sourceforge.net/release/buttons/slides-1.png -toc/closed.png -active/nav-prev.png - - -showtoc.gif -slides.js -Home -Next -Prev -ToC -Up - -#FFFFFF - - -active/nav-toc.png -22 -250 - -ua.js -active/nav-up.png -xbCollapsibleLists.js -xbDOM.js -xbStyle.js -xbLibrary.js - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/plain.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/plain.xsl deleted file mode 100644 index 47224da36547579f88f7ef973f29f19fceeb6cc5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/plain.xsl +++ /dev/null @@ -1,472 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/slides-common.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/slides-common.xsl deleted file mode 100644 index 985416406e122ebfa4be145fe1d186114b2f23b6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/slides-common.xsl +++ /dev/null @@ -1,1541 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - titlepage - - - - - - - - - - - overlaySetup('lc') - - - - - navigate(event) - - - -
    - - - - - -
    - -
    - -
    - - - - - -
    -
    - - -
    -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    -
    - - - - - - -

    -
    - - -

    -
    - - -

    -
    - - - - - - - - - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="slidesinfo/title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - overlaySetup('lc') - - - - - navigate(event) - - - -
    - - - - - - - -
    - -
    - -
    - - - - - - - -
    -
    - - -
    -
    -
    - - -

    - - - -

    - -

    - - - TableofContents - - -

    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - . - - - - - - -
    - -
    -
    - -
    -
    -
    -
    - - -
    - - . - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - overlaySetup('lc') - - - - - navigate(event) - - - -
    - - - - - - - -
    - - - - - - -
    - -
    - - - - - - - -
    -
    - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - overlaySetup('lc') - - - - - navigate(event) - - - -
    - - - - - - - - - -
    - - - - - - -
    - -
    - - - - - - - -
    -
    - - - - -
    -
    - - -
    - - -

    -
    - - - - - - - - - - - -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - position: absolute; visibility: visible; - - - - padding-top: 2in; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - foil - - - - - - foilgroup - - - - - - - - - - - - </span> - - - <span - - class="green" - class="blue" - class="orange" - class="red" - class="brown" - class="violet" - class="black" - class="bold" - - > - - - - - - - - -
    - -
    -
    -
    - - - - - - - - - copyright - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - -
    - - -
    -
    - - - - - - - - - - - - - - - - 1 - 1 - 1 - 0 - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - - - - - - - - - foil - - - - - - - - - - - foilgroup - - - - - - chunk-filename-error- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - -   - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/tables.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/tables.xsl deleted file mode 100644 index 046252854779b3a1eca89468cd7a14877c08b699..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/tables.xsl +++ /dev/null @@ -1,336 +0,0 @@ - - - - - - - - -#6A719C -220 - - - - - - - - - - - - -
    - - - - - -
    - -
    -
      - - - - - -
    - -
    - - -
    - -
    -
    -
    -
    - - - - - - - - -
    - - - - - -
    - -
    -
      - - - - - -
    - -
    -
    -
    - - - - - - - - - - - - + - - - - - - - - -  - - - - - - - - - - - - - - - - - -
    - - - -  - - - - - - -  - - - - - - - - - - - - - - - -
    -
    -
    -
    - -  - - - - - - - - - - - - - - -
    -
    -
    -
    -
    - - - - - - - -  - - - - - - - - - - - - - - -
    - - - -  - - - - - - - - - - + - - - - - - - - -  - - - - - - - - - - - - - - - - - -
    -
    -
    -
    - - - - - - + - - - - - - - - -  - - - - - - - - - - - -
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/vslides.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/vslides.xsl deleted file mode 100644 index f4900995ee768b0ce352f7c4abad969a47a87571..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/vslides.xsl +++ /dev/null @@ -1,667 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="slidesinfo/title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - navigate(event) - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
     
    - - -
    -
    - - -
    - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - navigate(event) - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - - - - - - - - - -
    - -
    -
     
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - navigate(event) - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - - - - - - - - - - -
    - -
    -
     
    - - -
    -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - navigate(event) - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - - - - - - - - - - -
    - -
    -
     
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - First - - - - - - - - - - First - - - - - - - - -
    - - - - - - - Previous - - - - - - - - - - Previous - - - - - - - - -
    - - - - - - - Last - - - - - - - - - - Last - - - - - - - - -
    - - - - - - - Next - - - - - - - - - - Next - - - - - - - - - -
    -
    - - - - - ToC - - - - - - - - - - ToC - - - - - - - - -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/w3c.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/w3c.xsl deleted file mode 100644 index 5a5b420250220586698735aa195edc21009f88e6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/html/w3c.xsl +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {$logo.title} - - - - - - - - - - position: absolute; visibility: visible; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/htmlhelp.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/htmlhelp.xsl deleted file mode 100644 index 4a6b370df08a5042d53a1ea4104d851315db18f7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/htmlhelp.xsl +++ /dev/null @@ -1,89 +0,0 @@ - - '> -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • &lf; - &lf; - - - - - -
  • &lf; -
    - -
      &lf; - -
    &lf; -
    -
    - - - - - - - - - - - - - - - -
  • &lf; - &lf; - - - - - -
  • &lf; -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html deleted file mode 100644 index b6c490c121fcf3f3698bb0501f3e4d07b5915b0c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/slides/htmlhelp

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 3.1K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=D;O=A deleted file mode 100644 index 1c25fb56f782e39270cc2998c0d262a551ad5871..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=D;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/slides/htmlhelp

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 3.1K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=M;O=A deleted file mode 100644 index f49394420602985daf1507f2250f0b81292f3bc2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=M;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/slides/htmlhelp

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 3.1K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=N;O=A deleted file mode 100644 index ae0449d71572425a43ce1988d189d850ef72b6fe..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=N;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/slides/htmlhelp

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 3.1K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=S;O=D deleted file mode 100644 index c69a5c34b007ca34bdb5a5b3b5d249d20d89e61c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/htmlhelp/index.html?C=S;O=D +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/htmlhelp - - -

    Index of /release/xsl-ns/1.76.1/slides/htmlhelp

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] htmlhelp.xsl 01-Nov-2010 20:31 3.1K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html deleted file mode 100644 index 01977942682ac85db6222c5c8a6128fcca5645d6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides - - -

    Index of /release/xsl-ns/1.76.1/slides

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] browser/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] graphics/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] keynote/ 01-Nov-2010 22:36 - -[DIR] svg/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=D;O=A deleted file mode 100644 index d4459f95843f2379602e2175090c3374de5b5ef2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=D;O=A +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides - - -

    Index of /release/xsl-ns/1.76.1/slides

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] browser/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] graphics/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] keynote/ 01-Nov-2010 22:36 - -[DIR] svg/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=D;O=D deleted file mode 100644 index ad901572ff9174452cbf451b0d97b3bfbbe7be22..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=D;O=D +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides - - -

    Index of /release/xsl-ns/1.76.1/slides

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[DIR] svg/ 01-Nov-2010 22:36 - -[DIR] keynote/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] graphics/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] browser/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=M;O=A deleted file mode 100644 index 522b6883c58dc3ff9dc9fbe7370aea63f756da79..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=M;O=A +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides - - -

    Index of /release/xsl-ns/1.76.1/slides

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] browser/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] graphics/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] keynote/ 01-Nov-2010 22:36 - -[DIR] svg/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=M;O=D deleted file mode 100644 index ad901572ff9174452cbf451b0d97b3bfbbe7be22..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=M;O=D +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides - - -

    Index of /release/xsl-ns/1.76.1/slides

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[DIR] svg/ 01-Nov-2010 22:36 - -[DIR] keynote/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] graphics/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] browser/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=N;O=A deleted file mode 100644 index d032d11a1e91e0ff593cab3e2486c3ec2d6ab061..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=N;O=A +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides - - -

    Index of /release/xsl-ns/1.76.1/slides

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] browser/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] graphics/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] keynote/ 01-Nov-2010 22:36 - -[DIR] svg/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=N;O=D deleted file mode 100644 index ad901572ff9174452cbf451b0d97b3bfbbe7be22..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=N;O=D +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides - - -

    Index of /release/xsl-ns/1.76.1/slides

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[DIR] svg/ 01-Nov-2010 22:36 - -[DIR] keynote/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] graphics/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] browser/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=S;O=A deleted file mode 100644 index 01977942682ac85db6222c5c8a6128fcca5645d6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=S;O=A +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides - - -

    Index of /release/xsl-ns/1.76.1/slides

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] browser/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] graphics/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] keynote/ 01-Nov-2010 22:36 - -[DIR] svg/ 01-Nov-2010 22:36 - -[DIR] xhtml/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=S;O=D deleted file mode 100644 index ad901572ff9174452cbf451b0d97b3bfbbe7be22..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/index.html?C=S;O=D +++ /dev/null @@ -1,19 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides - - -

    Index of /release/xsl-ns/1.76.1/slides

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xhtml/ 01-Nov-2010 22:36 - -[DIR] svg/ 01-Nov-2010 22:36 - -[DIR] keynote/ 01-Nov-2010 22:36 - -[DIR] htmlhelp/ 01-Nov-2010 22:36 - -[DIR] html/ 01-Nov-2010 22:36 - -[DIR] graphics/ 01-Nov-2010 22:36 - -[DIR] fo/ 01-Nov-2010 22:36 - -[DIR] browser/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/default.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/default.xsl deleted file mode 100644 index 7ff90b11f8ae7bf07a2bf550b0c72e8e7341e9f2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/default.xsl +++ /dev/null @@ -1,600 +0,0 @@ - - - - - - - - - Keynote Slides - - - Steve - Ball - - Zveno -
    - - zveno.com - -
    -
    -
    - - $Id: default.xsl 3991 2004-11-10 06:51:55Z balls $ - - - 2004 - 2003 - Steve Ball, Zveno Pty Ltd - - - - Zveno Pty Ltd makes this software and associated documentation available free of charge for any purpose. You may make copies of the software but you must include all of this notice on any copy. - Zveno Pty Ltd does not warrant that this software is error free or fit for any purpose. Zveno Pty Ltd disclaims any liability for all claims, expenses, losses, damages and costs any user may incur as a result of using, copying or modifying the software. - -
    -
    - - - - - - - - - - - - - - - - You must specify your slides document using the "slides" parameter - - - - - - - - - - - - - - - - - - - </drawables> - <transition-style type='inherited'/> - <thumbnails> - <thumbnail file='thumbs/st0.tiff' byte-size='6520' size='60 45'/> - </thumbnails> - <bullets> - <bullet marker-type='inherited' level='0'> - <content tab-stops='L 96' font-size='84' font-color='g1' font-name='GillSans' paragraph-alignment='center'> - <xsl:apply-templates select='slidesinfo/title/node()'/> - </content> - </bullet> - <xsl:choose> - <xsl:when test='slidesinfo/subtitle'> - <bullet marker-type='inherited' level='1'> - <content tab-stops='L 96' font-size='36' font-color='g1' font-name='GillSans' paragraph-alignment='center'> - <xsl:apply-templates select='slidesinfo/subtitle/node()' mode='slides'/> - </content> - </bullet> - </xsl:when> - <xsl:when test='slidesinfo/corpauthor'> - <bullet marker-type='inherited' level='1'> - <content tab-stops='L 96' font-size='36' font-color='g1' font-name='GillSans' paragraph-alignment='center'> - <xsl:apply-templates select='slidesinfo/corpauthor/node()' mode='slides'/> - </content> - </bullet> - </xsl:when> - <xsl:when test='slidesinfo/author'> - <bullet marker-type='inherited' level='1'> - <content tab-stops='L 96' font-size='36' font-color='g1' font-name='GillSans' paragraph-alignment='center'> - <xsl:apply-templates select='slidesinfo/author' mode='slides'/> - </content> - </bullet> - </xsl:when> - </xsl:choose> - </bullets> - <notes font-size='18' font-name='LucidaGrande'> - <xsl:apply-templates select='slidesinfo/*[not(self::title|self::subtitle|self::corpauthor|self::author)]' mode='slides'/> - </notes> - </slide> - - <xsl:if test='foilgroup'> - <xsl:call-template name='overview'/> - </xsl:if> - - <xsl:apply-templates select='foilgroup|foil' mode='slides'/> - </xsl:template> - - <xsl:template name='overview'> - <xsl:param name='current' select='/'/> - - <slide id='overview-{generate-id()}' master-slide-id="{$masters/apxl:master-slide[@name=$overview-master]/@id}"> - <drawables> - <body visibility='tracks-master' vertical-alignment='tracks-master'/> - <title visibility='tracks-master' vertical-alignment='tracks-master'/> - - <xsl:for-each select='ancestor-or-self::slides/foilgroup'> - <textbox id='textbox-{position()}' grow-horizontally='true' transformation='1 0 0 1 {100 + floor((position() - 1) div 10) * 400} {200 + floor((position() - 1) mod 10) * 50}' size='200 50'> - <content tab-stops='L 84' font-size='36' paragraph-alignment='left'> - <xsl:attribute name='font-color'> - <xsl:choose> - <xsl:when test='generate-id() = generate-id($current)'> - <xsl:text>1 0.5 0</xsl:text> - </xsl:when> - <xsl:otherwise>g1</xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <xsl:apply-templates select='title' mode='slides'/> - </content> - </textbox> - </xsl:for-each> - - </drawables> - <transition-style type='inherited'/> - <thumbnails> - <thumbnail file='thumbs/st0.tiff' byte-size='6520' size='60 45'/> - </thumbnails> - <bullets> - <bullet marker-type='inherited' level='0'> - <content tab-stops='L 96' font-size='84' font-color='g1' font-name='GillSans' paragraph-alignment='center'>Overview</content> - </bullet> - </bullets> - </slide> - </xsl:template> - - <xsl:template match='author' mode='slides'> - <xsl:apply-templates select='firstname/node()' mode='slides'/> - <xsl:text> </xsl:text> - <xsl:apply-templates select='surname/node()' mode='slides'/> - </xsl:template> - <xsl:template match='copyright' mode='slides'> - <xsl:text>Copyright (c) </xsl:text> - <xsl:value-of select='year'/> - <xsl:text> </xsl:text> - <xsl:apply-templates select='holder' mode='slides'/> - <xsl:text>. </xsl:text> - </xsl:template> - - <xsl:template match='foilgroup' mode='slides'> - <xsl:variable name='number' select='count(preceding-sibling::foilgroup) + count(preceding::foil) + 1'/> - - <xsl:call-template name='overview'> - <xsl:with-param name='current' select='.'/> - </xsl:call-template> - - <slide id='foilgroup-{generate-id()}'> - <xsl:attribute name='master-slide-id'> - <xsl:choose> - <xsl:when test='*[not(self::foil|self::foilgroupinfo|self::speakernotes)]'> - <xsl:value-of select='$masters/apxl:master-slide[@name=$title-only-master]/@id'/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select='$masters/apxl:master-slide[@name=$foilgroup-master]/@id'/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - - <drawables> - <title visibility='tracks-master' vertical-alignment='tracks-master'/> - <body visibility='hidden' vertical-alignment='tracks-master'/> - <xsl:call-template name='drawables'/> - </drawables> - <transition-style type='inherited'/> - <thumbnails> - <thumbnail file='thumbs/st0.tiff' byte-size='6520' size='60 45'/> - </thumbnails> - <bullets> - <bullet marker-type='inherited' level='0'> - <content tab-stops='L 96' font-size='84' font-color='g1' font-name='GillSans' paragraph-alignment='center'> - <xsl:apply-templates select='title' mode='slides'/> - </content> - </bullet> - - <xsl:apply-templates select='itemizedlist/listitem' mode='slides'/> - </bullets> - <xsl:if test='speakernotes'> - <notes font-size='18' font-name='LucidaGrande'> - <xsl:apply-templates select='speakernotes/para[1]/node()' mode='slides'/> - <xsl:for-each select='speakernotes/para[position() != 1]'> - <xsl:text>; </xsl:text> - <xsl:apply-templates select='node()' mode='slides'/> - </xsl:for-each> - </notes> - </xsl:if> - </slide> - - <xsl:apply-templates select='foil' mode='slides'/> - - </xsl:template> - - <xsl:template match='foil' mode='slides'> - <xsl:variable name='number' select='count(preceding::foilgroup) + count(preceding::foil) + count(preceding-sibling::foil) + 1'/> - - <slide id='foil-{generate-id()}'> - <xsl:attribute name='master-slide-id'> - <xsl:choose> - <xsl:when test='imageobject'> - <xsl:value-of select='$masters/apxl:master-slide[@name=$title-only-master]/@id'/> - </xsl:when> - <xsl:when test='itemizedlist[.//imageobject]'> - <xsl:value-of select='$masters/apxl:master-slide[@name=$bullet-and-image-master]/@id'/> - </xsl:when> - <xsl:when test='itemizedlist'> - <xsl:value-of select='$masters/apxl:master-slide[@name=$bullet-master]/@id'/> - </xsl:when> - <xsl:when test='example|informalexample'> - <xsl:value-of select='$masters/apxl:master-slide[@name=$title-only-master]/@id'/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select='$masters/apxl:master-slide[@name=$bullet-master]/@id'/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute> - <drawables> - <body visibility='tracks-master' vertical-alignment='tracks-master'/> - <title visibility='tracks-master' vertical-alignment='tracks-master'/> - <xsl:call-template name='drawables'/> - </drawables> - <transition-style type='inherited'/> - <thumbnails> - <thumbnail file='thumbs/st0.tiff' byte-size='6520' size='60 45'/> - </thumbnails> - <bullets> - <bullet marker-type='inherited' level='0'> - <content tab-stops='L 96' font-size='64' font-color='g1' font-name='GillSans' paragraph-alignment='inherited'> - <!-- - <xsl:apply-templates select='../title' mode='slides'/> - <xsl:text>: </xsl:text> ---> - <xsl:apply-templates select='title' mode='slides'/> - </content> - </bullet> - <xsl:apply-templates select='itemizedlist/listitem' mode='slides'/> - </bullets> - <xsl:if test='speakernotes'> - <notes font-size='18' font-name='LucidaGrande'> - <xsl:apply-templates select='speakernotes/para[1]/node()' mode='slides'/> - <xsl:for-each select='speakernotes/para[position() != 1]'> - <xsl:text>; </xsl:text> - <xsl:apply-templates select='node()' mode='slides'/> - </xsl:for-each> - </notes> - </xsl:if> - </slide> - </xsl:template> - - <doc:template xmlns=''> - <title>drawables Template - - This template adds objects to the drawables section of a foil. These include images, as well as unadorned (non-bullet) text. - - A single image is placed centered on the foil. An image on a foil that contains other text is placed on the right-hand-side. - - - - - - - - - 1.0 - video/quicktime - - - - - - - - - - - - - - - - - - {800, 400} - - - - - - - - - - - - - - - - - - - - {0, 300} - - - - - {150, 300} - - - - - {0, 200} - - - - - {150, 200} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - ]]> - - - - - - - - - - - - - - - - - - - - <![CDATA[ - - - - - - - - - - - - - - - GillSans-Italic - GillSans - - - - - - - - - - - - - " - “ - - - - - - ]]> - ]] > - - - - - - - - - - - - - - - - < - < - - - - - - - ]]> - ]] > - - - - - - - - - - - - - - - - - - - 20 - 0 - - - - - - - - - - - - - - - - - - - - - - - - AmericanTypewriter-CondensedBoldItalic - - - GillSans-BoldItalic - - - AmericanTypewriter-CondensedItalic - - - GillSans-Italic - - - AmericanTypewriter-CondensedBold - - - GillSans-Bold - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html deleted file mode 100644 index a16c5bf094feb8e3d47bbfa9ac389491c4ebf017..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/keynote - - -

    Index of /release/xsl-ns/1.76.1/slides/keynote

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xsltsl/ 01-Nov-2010 22:36 - -[TXT] default.xsl 01-Nov-2010 20:31 25K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=D;O=A deleted file mode 100644 index 2d2d0d7230c4f707c813f93951d56fd51d5b52b3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=D;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/keynote - - -

    Index of /release/xsl-ns/1.76.1/slides/keynote

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] default.xsl 01-Nov-2010 20:31 25K -[DIR] xsltsl/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=M;O=A deleted file mode 100644 index 45b8122807bb22bb7c1ef4396c673eee0d37c0db..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=M;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/keynote - - -

    Index of /release/xsl-ns/1.76.1/slides/keynote

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] default.xsl 01-Nov-2010 20:31 25K -[DIR] xsltsl/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=N;O=A deleted file mode 100644 index 26e6c17335db1ebb5c04b961b0427444b8e6a6e6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=N;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/keynote - - -

    Index of /release/xsl-ns/1.76.1/slides/keynote

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] default.xsl 01-Nov-2010 20:31 25K -[DIR] xsltsl/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=S;O=D deleted file mode 100644 index 99a1a45edb31c68683bf710e8b2b530dc1443efd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/index.html?C=S;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/keynote - - -

    Index of /release/xsl-ns/1.76.1/slides/keynote

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] default.xsl 01-Nov-2010 20:31 25K -[DIR] xsltsl/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/xsltsl/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/xsltsl/index.html deleted file mode 100644 index d09bd8c0f8f7bd106629f4606c215843ffc4c282..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/keynote/xsltsl/index.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/keynote/xsltsl - - -

    Index of /release/xsl-ns/1.76.1/slides/keynote/xsltsl

    -
    Icon  Name                                   Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] example.xsl 01-Nov-2010 20:31 2.6K -[TXT] node.xsl 01-Nov-2010 20:31 6.3K -[TXT] svg.xsl 01-Nov-2010 20:31 7.0K -[TXT] cmp.xsl 01-Nov-2010 20:31 11K -[TXT] stdlib.xsl 01-Nov-2010 20:31 13K -[TXT] uri.xsl 01-Nov-2010 20:31 18K -[TXT] markup.xsl 01-Nov-2010 20:31 24K -[TXT] math.xsl 01-Nov-2010 20:31 25K -[TXT] date-time.xsl 01-Nov-2010 20:31 48K -[TXT] string.xsl 01-Nov-2010 20:31 49K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/default.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/default.xsl deleted file mode 100644 index 86ea1338c2a85ad76a9304068c2612aca072f595..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/default.xsl +++ /dev/null @@ -1,686 +0,0 @@ - - - - - - - SVG Slides - - - Steve - Ball - - Zveno -
    - - zveno.com - -
    -
    -
    - - $Id: default.xsl 6567 2007-01-30 06:43:18Z xmldoc $ - - - 2002 - Steve Ball, Zveno Pty Ltd - - - - Zveno Pty Ltd makes this software and associated documentation available free of charge for any purpose. You may make copies of the software but you must include all of this notice on any copy. - Zveno Pty Ltd does not warrant that this software is error free or fit for any purpose. Zveno Pty Ltd disclaims any liability for all claims, expenses, losses, damages and costs any user may incur as a result of using, copying or modifying the software. - -
    -
    - - - - - - - - - slides.css - graphics - - white - - Arial - white - black - - - - - - - - preserve - 100% - - font-family: ; font-size: 18pt; fill: ; stroke: ; background-color: - - - - font-size: 24pt; font-weight: bold - - - font-size: 18pt - - - font-size: 18pt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - href=" - - " type="text/css" - - - - - - - - - - - - - - - - title - - - - - - - - - - - - - title.click - - - foil1-previous-button.click; - - - - - - - - - - - - - - toc - - - - - - - - - - title.click - - - - - - toc.click; toc-content.click - - - - - - - - - - - - - - 50 - - 75 - - - - - - title.click - - - - - - toc.click; toc-content.click - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - index-foilgroup- - - - - - - #ff8000 - #ff8000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - toc - - - - - - - - - - - - index-foilgroup-1.click; toc.click; toc-content.click - - - index-foilgroup- - - .click; foil - - .click - - - - - - - - - - - - - - - 50 - - 75 - - - - - - - - index-foilgroup-1.click; toc.click; toc-content.click - - - index-foilgroup- - - .click; foil - - .click - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - TOC - - - - - - - - - - - - - Previous - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - title.click - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - font-weight: bold - - - font-style: italic - - - font-style: italic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html deleted file mode 100644 index de4207c11c02129fe4aad07384ed80147b85f029..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/svg - - -

    Index of /release/xsl-ns/1.76.1/slides/svg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] default.xsl 01-Nov-2010 20:31 25K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=D;O=A deleted file mode 100644 index ea4e891647f5f3894f0aec415be208a656990f93..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=D;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/svg - - -

    Index of /release/xsl-ns/1.76.1/slides/svg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] default.xsl 01-Nov-2010 20:31 25K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=M;O=A deleted file mode 100644 index 6209e4d15c3764aa0b6c292698d937e7dfb09f6a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=M;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/svg - - -

    Index of /release/xsl-ns/1.76.1/slides/svg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] default.xsl 01-Nov-2010 20:31 25K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=N;O=A deleted file mode 100644 index b53946ecd35d8d71f392ebe673bf6ee87ea4244b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=N;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/svg - - -

    Index of /release/xsl-ns/1.76.1/slides/svg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] default.xsl 01-Nov-2010 20:31 25K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=S;O=D deleted file mode 100644 index 6fc6c28cf98b055764f406287fd825989face2af..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/svg/index.html?C=S;O=D +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/svg - - -

    Index of /release/xsl-ns/1.76.1/slides/svg

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] default.xsl 01-Nov-2010 20:31 25K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/css.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/css.xsl deleted file mode 100644 index d0b47c6fbd1b83b21bd5170821b21cf355b28169..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/css.xsl +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - / - - - - / - - - http://docbook.sourceforge.net/release/slides/browser/ - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/default.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/default.xsl deleted file mode 100644 index 86f2cb39f40ef8834bf6838a778be70d42724595..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/default.xsl +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Hide/Show TOC - - - - - toggletoc(this, - - ,' - - ',' - - '); - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/flat.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/flat.xsl deleted file mode 100644 index e0c57e92f84e02f2a4d6fab468d5823e95868c58..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/flat.xsl +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - <xsl:value-of select="/slides/slidesinfo/title"/> - - - - - - - - - - - - -
    -
    - -
    -
    -
    - - - - - - - - - - -
    -
    - -
    - -
    -
    - - - - - - -
    -
    - -
    - -
    - - -
    - - -
    -

    - - -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/frames.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/frames.xsl deleted file mode 100644 index aea4172e6c729bbf01626a9f234a6899d666bc24..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/frames.xsl +++ /dev/null @@ -1,1982 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -//W3C//DTD HTML 4.01 Frameset//EN - - - - - - - - - - -//W3C//DTD XHTML 1.0 Frameset//EN - - - -//W3C//DTD XHTML 1.0 Transitional//EN - - - - - - - - - - - - - - http://www.w3.org/TR/html4/loose.dtd - - - - - - - - - - http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd - - - http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd - - - - - - - - - - - - - - - - - - - - - - - - - Multiframe and overlay are mutually exclusive. - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="$title"/> - - - - - - <body class="frameset"> - <xsl:call-template name="body.attributes"/> - <a href="{concat('titleframe', $html.ext)}"> - <xsl:text>Your browser doesn't support frames.</xsl:text> - </a> - </body> - - - - - - - - - - - - - TOC - <xsl:value-of select="$title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - overlaySetup('ll'); - - - - - - init( - - ); - - overlaySetup('ll'); - - - - - - -
    - -
    -
    - -
    - - - - -
    - logo -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - javascript:body.focus() - - - - - - - - - <body class="frameset"> - <xsl:call-template name="body.attributes"/> - <p> - <xsl:text>Your browser doesn't support frames.</xsl:text> - </p> - </body> - - - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Body - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - newPage(' - - ', - - ); - - - - - overlaySetup('lc'); - - - - - - - this.focus() - - - navigate(event) - - - -
    - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - foilgroup - - - - - - - javascript:body.focus() - - - - - - <body class="frameset"> - <xsl:call-template name="body.attributes"/> - <p> - <xsl:text>Your browser doesn't support frames.</xsl:text> - </p> - </body> - - - - - - - foilgroup - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - foilgroup - - - - - - - - - - - Body - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - foilgroup - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - newPage(' - - ', - - ); - - - - - overlaySetup('lc'); - - - - - - - - navigate(event) - - - -
    - - - - - - - - - -
    - - - - - - -
    - - -
    - - - position:absolute;visibility:visible; - - - - - - - - -
    -
    -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - javascript:body.focus() - - - - - - - - - <body class="frameset"> - <xsl:call-template name="body.attributes"/> - <p> - <xsl:text>Your browser doesn't support frames.</xsl:text> - </p> - </body> - - - - - - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Body - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Navigation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - newPage(' - - ', - - ); - - - - - overlaySetup('lc'); - - - - - - - navigate(event) - - - -
    - - - - - - - - - -
    - -
    - - -
    - - - position:absolute;visibility:visible; - - - - - - - - -
    -
    -
    - - - -
    - - - - - - - - - - - - - - - foilgroup - - - - -
    - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - -
    - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - myList.addItem(' - - <div id=" - - " class="toc-slidesinfo"> - - <a href=" - - " target="foil"> - - - - - - - - - - - - - ' - \' - - - <\/a><\/div> - '); - - - - - - - - - subList = new List(false, width, height, " - -"); - - subList.setIndent(12); - - - - myList.addList(subList, ' - - <div id=" - - " class="toc-foilgroup"> - - <a href=" - - " target="foil"> - - - - - - - - - - - - - ' - \' - - - <\/a><\/div> - '); - - - - - - - - - subList.addItem(' - - - myList.addItem(' - - - - <div id=" - - " class="toc-foil"> - - <img alt="-" src=" - - "><\/img> - - <a href=" - - " target="foil"> - - - - - - - - - - - - - ' - \' - - - <\/a><\/div> - '); - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/graphics.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/graphics.xsl deleted file mode 100644 index 6317a4bc93ac58b82395cc90b7439718c7424a61..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/graphics.xsl +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - / - - - - / - - - http://docbook.sourceforge.net/release/slides/graphics/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html deleted file mode 100644 index dc60e6f4ecfaf6852e5c862c0640b4e646f08552..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/xhtml - - -

    Index of /release/xsl-ns/1.76.1/slides/xhtml

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] css.xsl 01-Nov-2010 20:31 1.6K -[TXT] flat.xsl 01-Nov-2010 20:31 1.8K -[TXT] param.xsl 01-Nov-2010 20:31 3.4K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.3K -[TXT] graphics.xsl 01-Nov-2010 20:31 5.0K -[TXT] default.xsl 01-Nov-2010 20:31 7.8K -[TXT] tables.xsl 01-Nov-2010 20:31 11K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] frames.xsl 01-Nov-2010 20:31 72K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=D;O=A deleted file mode 100644 index b38fe5859c0e192ca00ea81eaaa13e751573dd4e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=D;O=A +++ /dev/null @@ -1,23 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/xhtml - - -

    Index of /release/xsl-ns/1.76.1/slides/xhtml

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] css.xsl 01-Nov-2010 20:31 1.6K -[TXT] default.xsl 01-Nov-2010 20:31 7.8K -[TXT] flat.xsl 01-Nov-2010 20:31 1.8K -[TXT] frames.xsl 01-Nov-2010 20:31 72K -[TXT] graphics.xsl 01-Nov-2010 20:31 5.0K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.3K -[TXT] param.xsl 01-Nov-2010 20:31 3.4K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] tables.xsl 01-Nov-2010 20:31 11K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=M;O=A deleted file mode 100644 index 257a9b1adadfb5904db21191b01951c3773e80ab..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=M;O=A +++ /dev/null @@ -1,23 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/xhtml - - -

    Index of /release/xsl-ns/1.76.1/slides/xhtml

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] css.xsl 01-Nov-2010 20:31 1.6K -[TXT] default.xsl 01-Nov-2010 20:31 7.8K -[TXT] flat.xsl 01-Nov-2010 20:31 1.8K -[TXT] frames.xsl 01-Nov-2010 20:31 72K -[TXT] graphics.xsl 01-Nov-2010 20:31 5.0K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.3K -[TXT] param.xsl 01-Nov-2010 20:31 3.4K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] tables.xsl 01-Nov-2010 20:31 11K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=N;O=A deleted file mode 100644 index 81172fa0163a0f9682e4fa085f873e2d7994c2c0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=N;O=A +++ /dev/null @@ -1,23 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/xhtml - - -

    Index of /release/xsl-ns/1.76.1/slides/xhtml

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] css.xsl 01-Nov-2010 20:31 1.6K -[TXT] default.xsl 01-Nov-2010 20:31 7.8K -[TXT] flat.xsl 01-Nov-2010 20:31 1.8K -[TXT] frames.xsl 01-Nov-2010 20:31 72K -[TXT] graphics.xsl 01-Nov-2010 20:31 5.0K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.3K -[TXT] param.xsl 01-Nov-2010 20:31 3.4K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] tables.xsl 01-Nov-2010 20:31 11K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=S;O=D deleted file mode 100644 index 4ec93245b17b88c811957c35358501e33e25143a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/index.html?C=S;O=D +++ /dev/null @@ -1,23 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/slides/xhtml - - -

    Index of /release/xsl-ns/1.76.1/slides/xhtml

    -
    Icon  Name                           Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] frames.xsl 01-Nov-2010 20:31 72K -[TXT] slides-common.xsl 01-Nov-2010 20:31 50K -[TXT] vslides.xsl 01-Nov-2010 20:31 21K -[TXT] plain.xsl 01-Nov-2010 20:31 16K -[TXT] w3c.xsl 01-Nov-2010 20:31 13K -[TXT] tables.xsl 01-Nov-2010 20:31 11K -[TXT] default.xsl 01-Nov-2010 20:31 7.8K -[TXT] graphics.xsl 01-Nov-2010 20:31 5.0K -[TXT] jscript.xsl 01-Nov-2010 20:31 4.3K -[TXT] param.xsl 01-Nov-2010 20:31 3.4K -[TXT] flat.xsl 01-Nov-2010 20:31 1.8K -[TXT] css.xsl 01-Nov-2010 20:31 1.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/jscript.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/jscript.xsl deleted file mode 100644 index b3047ee231d3c56efcf82b4728c086467724fbec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/jscript.xsl +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - / - - - - / - - - http://docbook.sourceforge.net/release/slides/browser/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/param.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/param.xsl deleted file mode 100644 index c3ec806cd5c1c43900eb5b5fc0a435240568401b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/param.xsl +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - -#FFFFFF -toc/bullet.png -slides.css - - - - -hidetoc.gif -active/nav-home.png - -toc/open.png -white - -40 -white - -active/nav-next.png -inactive/nav-home.png -inactive/nav-next.png -inactive/nav-prev.png -inactive/nav-toc.png -inactive/nav-up.png -no - -overlay.js -http://docbook.sourceforge.net/release/buttons/slides-1.png -toc/closed.png -active/nav-prev.png - - -showtoc.gif -slides.js -Home -Next -Prev -ToC -Up - -#FFFFFF - - -active/nav-toc.png -22 -250 - -ua.js -active/nav-up.png -xbCollapsibleLists.js -xbDOM.js -xbStyle.js -xbLibrary.js - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/plain.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/plain.xsl deleted file mode 100644 index 29d43fc0de6cea56835314759fb813a2065c10cf..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/plain.xsl +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/slides-common.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/slides-common.xsl deleted file mode 100644 index 65d3b7a9125843e77bee895069e084a6d195de10..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/slides-common.xsl +++ /dev/null @@ -1,1534 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - titlepage - - - - - - - - - - - overlaySetup('lc') - - - - - navigate(event) - - - -
    - - - - - -
    - -
    - -
    - - - - - -
    -
    - - -
    -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    -
    - - - - - - -

    -
    - - -

    -
    - - -

    -
    - - - - - - - - - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="slidesinfo/title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - overlaySetup('lc') - - - - - navigate(event) - - - -
    - - - - - - - -
    - -
    - -
    - - - - - - - -
    -
    - - -
    -
    -
    - - -

    - - - -

    - -

    - - - TableofContents - - -

    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - . - - - - - - -
    - -
    -
    - -
    -
    -
    -
    - - -
    - - . - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - overlaySetup('lc') - - - - - navigate(event) - - - -
    - - - - - - - -
    - - - - - - -
    - -
    - - - - - - - -
    -
    - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - overlaySetup('lc') - - - - - navigate(event) - - - -
    - - - - - - - - - -
    - - - - - - -
    - -
    - - - - - - - -
    -
    - - - - -
    -
    - - -
    - - -

    -
    - - - - - - - - - - - -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - position: absolute; visibility: visible; - - - - padding-top: 2in; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - foil - - - - - - foilgroup - - - - - - - - - - - - </span> - - - <span - - class="green" - class="blue" - class="orange" - class="red" - class="brown" - class="violet" - class="black" - class="bold" - - > - - - - - - - - -
    - -
    -
    -
    - - - - - - - - - copyright - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - -
    - - -
    -
    - - - - - - - - - - - - - - - - 1 - 1 - 1 - 0 - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - - - - - - - - - foil - - - - - - - - - - - foilgroup - - - - - - chunk-filename-error- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - -   - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/tables.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/tables.xsl deleted file mode 100644 index 7d5ec6b091aa6084ef1ac355496fa09b94b82aa3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/tables.xsl +++ /dev/null @@ -1,334 +0,0 @@ - - - - - - - - - - -#6A719C -220 - - - - - - - - - - - - -
    - - - - - -
    - -
    -
      - - - - - -
    - -
    - - -
    - -
    -
    -
    -
    - - - - - - - - -
    - - - - - -
    - -
    -
      - - - - - -
    - -
    -
    -
    - - - - - - - - - - - - + - - - - - - - - -  - - - - - - - - - - - - - - - - - -
    - - - -  - - - - - - -  - - - - - - - - - - - - - - - -
    -
    -
    -
    - -  - - - - - - - - - - - - - - -
    -
    -
    -
    -
    - - - - - - - -  - - - - - - - - - - - - - - -
    - - - -  - - - - - - - - - - + - - - - - - - - -  - - - - - - - - - - - - - - - - - -
    -
    -
    -
    - - - - - - + - - - - - - - - -  - - - - - - - - - - - -
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/vslides.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/vslides.xsl deleted file mode 100644 index 26e996104f4f30e44277d95c597cc070dd38a5ab..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/vslides.xsl +++ /dev/null @@ -1,652 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="slidesinfo/title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - navigate(event) - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
     
    - - -
    -
    - - -
    - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - navigate(event) - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - - - - - - - - - -
    - -
    -
     
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - navigate(event) - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - - - - - - - - - - -
    - -
    -
     
    - - -
    -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - navigate(event) - - - - - - - - - - - - - - - - - - -
     
    - - - - - - - - - - - - - - - - - - - -
    - -
    -
     
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - First - - - - - - - - - - First - - - - - - - - -
    - - - - - - - Previous - - - - - - - - - - Previous - - - - - - - - -
    - - - - - - - Last - - - - - - - - - - Last - - - - - - - - -
    - - - - - - - Next - - - - - - - - - - Next - - - - - - - - - -
    -
    - - - - - ToC - - - - - - - - - - ToC - - - - - - - - -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/w3c.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/w3c.xsl deleted file mode 100644 index d361a33580ee06530d237a0fe0cf20dd7d80918b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/slides/xhtml/w3c.xsl +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {$logo.title} - - - - - - - - - - position: absolute; visibility: visible; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html deleted file mode 100644 index 01a261bba1b887e6c5eba5fb8bbce3245e262e83..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/template - - -

    Index of /release/xsl-ns/1.76.1/template

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.xml 01-Nov-2010 20:31 15K -[TXT] titlepage.xsl 01-Nov-2010 20:31 49K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=D;O=A deleted file mode 100644 index 8e0f944422a0f072483e30110b045303eb8e41b3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=D;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/template - - -

    Index of /release/xsl-ns/1.76.1/template

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.xml 01-Nov-2010 20:31 15K -[TXT] titlepage.xsl 01-Nov-2010 20:31 49K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=D;O=D deleted file mode 100644 index 81f8b713b4c3bb975d15ab7e81f807143d13bb8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=D;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/template - - -

    Index of /release/xsl-ns/1.76.1/template

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.xsl 01-Nov-2010 20:31 49K -[TXT] titlepage.xml 01-Nov-2010 20:31 15K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=M;O=A deleted file mode 100644 index d4fdafccf9b58ede2b3fd7489da2d227d267de2b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=M;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/template - - -

    Index of /release/xsl-ns/1.76.1/template

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.xml 01-Nov-2010 20:31 15K -[TXT] titlepage.xsl 01-Nov-2010 20:31 49K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=M;O=D deleted file mode 100644 index 81f8b713b4c3bb975d15ab7e81f807143d13bb8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=M;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/template - - -

    Index of /release/xsl-ns/1.76.1/template

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.xsl 01-Nov-2010 20:31 49K -[TXT] titlepage.xml 01-Nov-2010 20:31 15K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=N;O=A deleted file mode 100644 index 2bfeedd7ec52fdb1ad6c0e0af5fd188f4c15f5a9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=N;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/template - - -

    Index of /release/xsl-ns/1.76.1/template

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.xml 01-Nov-2010 20:31 15K -[TXT] titlepage.xsl 01-Nov-2010 20:31 49K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=N;O=D deleted file mode 100644 index 81f8b713b4c3bb975d15ab7e81f807143d13bb8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=N;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/template - - -

    Index of /release/xsl-ns/1.76.1/template

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.xsl 01-Nov-2010 20:31 49K -[TXT] titlepage.xml 01-Nov-2010 20:31 15K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=S;O=A deleted file mode 100644 index 01a261bba1b887e6c5eba5fb8bbce3245e262e83..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=S;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/template - - -

    Index of /release/xsl-ns/1.76.1/template

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.xml 01-Nov-2010 20:31 15K -[TXT] titlepage.xsl 01-Nov-2010 20:31 49K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=S;O=D deleted file mode 100644 index 81f8b713b4c3bb975d15ab7e81f807143d13bb8a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/index.html?C=S;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/template - - -

    Index of /release/xsl-ns/1.76.1/template

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.xsl 01-Nov-2010 20:31 49K -[TXT] titlepage.xml 01-Nov-2010 20:31 15K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/titlepage.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/titlepage.xml deleted file mode 100644 index f1e1e3cdec2b1e7252ab92c0983799f28a16be70..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/titlepage.xml +++ /dev/null @@ -1,478 +0,0 @@ - - - - - - - Titlepage Template Stylesheet Reference - - $Id: titlepage.xsl 7058 2007-07-17 13:59:29Z xmldoc $ - - - - Introduction - -This is technical reference documentation for the - “titlepage†templates in the DocBook XSL Stylesheets. - - -This is not intended to be user documentation. It is - provided for developers writing customization layers for the - stylesheets. - - - - - -t:templates -Construct a stylesheet for the templates provided - - -<xsl:template match="t:templates"/> - -Description - -The t:templates element is the root of a -set of templates. This template creates an appropriate -xsl:stylesheet for the templates. - - - -If the t:templates element has a -base-stylesheet attribute, an -xsl:import statement is constructed for it. - - - - - -xsl:* -Copy xsl: elements straight through - - -<xsl:template match="xsl:*"/> - -Description - -This template simply copies the xsl: elements -straight through into the result tree. - - - - - -t:titlepage -Create the templates necessary to construct a title page - - -<xsl:template match="t:titlepage"/> - -Description - -The t:titlepage element creates a set of -templates for processing the titlepage for an element. The -root of this template set is the template named -wrapper.titlepage. That is the -template that should be called to generate the title page. - - - - -The t:titlepage element has three attributes: - - - -element - -The name of the source document element for which -these templates apply. In other words, to make a title page for the -article element, set the -element attribute to -article. This attribute is required. - - - -wrapper - -The entire title page can be wrapped with an element. -This attribute identifies that element. - - - -class - -If the class attribute -is set, a class attribute with this -value will be added to the wrapper element that surrounds the entire -title page. - - - - - - - - - -Any other attributes are copied through literally to the -wrapper element. - - - -The content of a t:titlepage is one or -more t:titlepage-content, -t:titlepage-separator, and -t:titlepage-before elements. - - - -Each of these elements may be provided for the recto -and verso sides of the title page. - - - - - - -@* (in copy.literal.atts mode) -Copy t:titlepage attributes - - -<xsl:template match="@*" mode="copy.literal.atts"/> - -Description - -This template copies all of the other attributes -from a t:titlepage element onto the specified -wrapper. - - - - - -t:titlepage-content -Create templates for the content of one side of a title page - - -<xsl:template match="t:titlepage-content"/> - -Description - -The title page content, that is, the elements from the source -document that are rendered on the title page, can be controlled independently -for the recto and verso sides of the title page. - - - -The t:titlepage-content element has two attributes: - - - -side - -Identifies the side of the page to which this title -page content applies. The -side attribute is required and -must be set to either -recto or -verso. In addition, you must specify -exactly one t:titlepage-content for each side -within each t:titlepage. - - - -order - -Indicates how the order of the elements presented on -the title page is determined. If the -order is -document, the elements are presented -in document order. Otherwise (if the -order is -stylesheet), the elements are presented -in the order that they appear in the template (and consequently in -the stylesheet). - - - - - - - - - -The content of a t:titlepage-content element is -a list of element names. These names should be unqualified. They identify -the elements in the source document that should appear on the title page. - - - - -Each element may have a single attribute: -predicate. The value of this -attribute is used as a predicate for the expression that matches -the element on which it occurs. - - - -In other words, to put only the first three authors on the -recto-side of a title -page, you could specify: - - - <t:titlepage-contents side="recto"> - <!-- other titlepage elements --> - <author predicate="[count(previous-sibling::author)<2]"/> - <!-- other titlepage elements --> - </t:titlepage-contents> - - - - - -Usually, the elements so named are empty. But it is possible to -make one level of selection within them. Suppose that you want to -process authorgroup elements on the title page, but -you want to select only proper authors, editors, or corporate authors, -not collaborators or other credited authors. - - - -In that case, you can put a t:or group inside -the authorgroup element: - - - <t:titlepage-contents side="recto"> - <!-- other titlepage elements --> - <authorgroup> - <t:or> - <author/> - <editor/> - <corpauthor/> - </t:or> - </authorgroup> - <!-- other titlepage elements --> - </t:titlepage-contents> - - - - - -This will have the effect of automatically generating a template -for processing authorgroups in the title page mode, -selecting only the specified children. If you need more complex processing, -you'll have to construct the templates by hand. - - - - - - -t:titlepage-separator -Create templates for the separator - - -<xsl:template match="t:titlepage-separator"/> - -Description - -The title page is separated from the content which follows it by -the markup specified in the t:titlepage-separator -element. - - - - - -t:titlepage-before -Create templates for what precedes a title page - - -<xsl:template match="t:titlepage-before"/> - -Description - -Each side of the title page is preceded by the markup specified -in the t:titlepage-before element for that -side. - - - - - -* (in copy mode) -Copy elements - - -<xsl:template match="*" mode="copy"/> - -Description - -This template simply copies the elements that it applies to -straight through into the result tree. - - - - - -@* (in copy mode) -Copy attributes - - -<xsl:template match="@*" mode="copy"/> - -Description - -This template simply copies the attributes that it applies to -straight through into the result tree. - - - - - -* (in document.order mode) -Create rules to process titlepage elements in document order - - -<xsl:template match="*" mode="document.order"/> - -Description - -This template is called to process all of the children of the -t:titlepage-content element. It creates the hairy -select expression necessary to process each of those elements in -the title page. - - - -Note that this template automatically handles the case where -some DocBook elements, like title and subtitle, can occur both inside -the *info elements where metadata is usually stored and outside. - - - - -It also automatically calculates the name for the *info container -and handles elements that have historically had containers with different -names. - - - - - - -* (in document.order mode) -Create rules to process titlepage elements in stylesheet order - - -<xsl:template match="*" mode="document.order"/> - -Description - -This template is called to process all of the children of the -t:titlepage-content element. It creates the set -of xsl:apply-templates elements necessary -process each of those elements in the title page. - - - -Note that this template automatically handles the case where -some DocBook elements, like title and subtitle, can occur both inside -the *info elements where metadata is usually stored and outside. - - - - -It also automatically calculates the name for the *info container -and handles elements that have historically had containers with different -names. - - - - - - -* (in titlepage.specialrules mode) -Create templates for special rules - - -<xsl:template match="*" mode="titlepage.specialrules"/> - -Description - -This template is called to process all of the descendants of the -t:titlepage-content element that require special -processing. At present, that's just t:or elements. - - - - - - -* (in titlepage.subrules mode) -Create template for individual special rules - - -<xsl:template match="*" mode="titlepage.subrules"/> - -Description - -This template is called to process the children of special -template elements. - - - - - - -t:or -Process the t:or special rule - - -<xsl:template match="t:or"/><xsl:template match="t:or" mode="titlepage.subrules"/> - -Description - -This template processes t:or. - - - - - -t:or (in titlepage.subrules mode) -Process the t:or special rule in -titlepage.subrules mode - - -<xsl:template match="t:or" mode="titlepage.subrules"/> - -Description - -The titlepage.subrules mode doesn't apply to t:or, so just -reprocess this node in the normal mode. - - - - - -element-or-list -Construct the "or-list" used in the select attribute for -special rules. - - -<xsl:template name="element-or-list"> -<xsl:param name="elements" select="*"/> -<xsl:param name="element.count" select="count($elements)"/> -<xsl:param name="count" select="1"/> -<xsl:param name="orlist"/> - ... -</xsl:template> - -Description - -Walk through each of the children of t:or, producing the -text of the select attribute. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/titlepage.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/titlepage.xsl deleted file mode 100644 index a99c4e6e7740eec46a178006b2fc5dadd1159df0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/template/titlepage.xsl +++ /dev/null @@ -1,1355 +0,0 @@ - - - - - - - - - - - - - - - - -$Id: titlepage.xsl 8898 2010-08-29 19:32:59Z dleidert $ - -Walsh -Norman -19992000 -Norman Walsh - - -Template Stylesheet Reference - - -Introduction - -This is technical reference documentation for the DocBook XSL -Stylesheets; it documents (some of) the parameters, templates, and -other elements of the stylesheets. - -This is not intended to be user documentation. -It is provided for developers writing customization layers for the -stylesheets, and for anyone who's interested in how it -works. - -Although I am trying to be thorough, this documentation is known -to be incomplete. Don't forget to read the source, too :-) - - - - - - - - - - - - -Construct a stylesheet for the templates provided - - -The t:templates element is the root of a -set of templates. This template creates an appropriate -xsl:stylesheet for the templates. - -If the t:templates element has a -base-stylesheet attribute, an -xsl:import statement is constructed for it. - - - - - - - - - - - - - - - 1.0 - exsl d - - - - This stylesheet was created by - template/titlepage.xsl; - do not edit it by hand. - - - - - - - - - - - - - - - - - - - - -Copy xsl: elements straight through - - -This template simply copies the xsl: elements -straight through into the result tree. - - - - - - - - - - -Create the templates necessary to construct a title page - - -The t:titlepage element creates a set of -templates for processing the titlepage for an element. The -root of this template set is the template named -wrapper.titlepage. That is the -template that should be called to generate the title page. - - -The t:titlepage element has three attributes: - - -element -The name of the source document element for which -these templates apply. In other words, to make a title page for the -article element, set the -element attribute to -article. This attribute is required. - - -wrapper -The entire title page can be wrapped with an element. -This attribute identifies that element. - - -class -If the class attribute -is set, a class attribute with this -value will be added to the wrapper element that surrounds the entire -title page. - - - - - -Any other attributes are copied through literally to the -wrapper element. - -The content of a t:titlepage is one or -more t:titlepage-content, -t:titlepage-separator, and -t:titlepage-before elements. - -Each of these elements may be provided for the recto -and verso sides of the title page. - - - - - - - - - - - - - - .titlepage - - - - - - - recto.content - - - - - .titlepage.before.recto - - - - - - - .titlepage.recto - - - - - - - recto.elements.count - - - - - function-available('exsl:node-set') - - count(exsl:node-set($recto.content)/*) - - - - - contains(system-property('xsl:vendor'), 'Apache Software Foundation') - - Xalan quirk - - count(exsl:node-set($recto.content)/*) - - - - - 1 - - - - - - - - (normalize-space($recto.content) != '') or ($recto.elements.count > 0) - - - - - $recto.content - - - - - - - verso.content - - - - - .titlepage.before.verso - - - - - - - .titlepage.verso - - - - - - - verso.elements.count - - - - - function-available('exsl:node-set') - - count(exsl:node-set($verso.content)/*) - - - - - contains(system-property('xsl:vendor'), 'Apache Software Foundation') - - Xalan quirk - - count(exsl:node-set($verso.content)/*) - - - - - 1 - - - - - - - - (normalize-space($verso.content) != '') or ($verso.elements.count > 0) - - - - - $verso.content - - - - - - - - - .titlepage.separator - - - - - - - - - - - - - - * - - - .titlepage.recto.mode - - - if an element isn't found in this mode, - - try the generic titlepage.mode - - - . - titlepage.mode - - - - - - - - * - - - .titlepage.verso.mode - - - if an element isn't found in this mode, - - try the generic titlepage.mode - - - . - titlepage.mode - - - - - - - - - - - - - - - - - - - .titlepage. - - .auto.mode - - - - - - .titlepage. - - .style - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - .titlepage. - - .mode - - - - - - - - - - - - - - -Copy t:titlepage attributes - - -This template copies all of the other attributes -from a t:titlepage element onto the specified -wrapper. - - - - - - - - - - - - - - -Create templates for the content of one side of a title page - - -The title page content, that is, the elements from the source -document that are rendered on the title page, can be controlled independently -for the recto and verso sides of the title page. - -The t:titlepage-content element has two attributes: - - -side -Identifies the side of the page to which this title -page content applies. The -side attribute is required and -must be set to either -recto or -verso. In addition, you must specify -exactly one t:titlepage-content for each side -within each t:titlepage. - - -order -Indicates how the order of the elements presented on -the title page is determined. If the -order is -document, the elements are presented -in document order. Otherwise (if the -order is -stylesheet), the elements are presented -in the order that they appear in the template (and consequently in -the stylesheet). - - - - - -The content of a t:titlepage-content element is -a list of element names. These names should be unqualified. They identify -the elements in the source document that should appear on the title page. - - -Each element may have a single attribute: -predicate. The value of this -attribute is used as a predicate for the expression that matches -the element on which it occurs. - -In other words, to put only the first three authors on the -recto-side of a title -page, you could specify: - - - - - - -]]> - - -Usually, the elements so named are empty. But it is possible to -make one level of selection within them. Suppose that you want to -process authorgroup elements on the title page, but -you want to select only proper authors, editors, or corporate authors, -not collaborators or other credited authors. - -In that case, you can put a t:or group inside -the authorgroup element: - - - - - - - - - - - - -]]> - - -This will have the effect of automatically generating a template -for processing authorgroups in the title page mode, -selecting only the specified children. If you need more complex processing, -you'll have to construct the templates by hand. - - - - - - - - - - - - - Illegal value specified for @t:side - on t:titlepage-content: - - - - - - The @t:side attribute is required on - t:titlepage-content. - - - - - - - - .titlepage. - - .auto.mode - - - - - - - .titlepage. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Create templates for the separator - - -The title page is separated from the content which follows it by -the markup specified in the t:titlepage-separator -element. - - - - - - - - - .titlepage.separator - - - - - - - - - - -Create templates for what precedes a title page - - -Each side of the title page is preceded by the markup specified -in the t:titlepage-before element for that -side. - - - - - - - - - .titlepage.before. - - - - - - - - - - - -Copy elements - - -This template simply copies the elements that it applies to -straight through into the result tree. - - - - - - - - - - - - - -Copy attributes - - -This template simply copies the attributes that it applies to -straight through into the result tree. - - - - - - - - - - - - -Create rules to process titlepage elements in document order - - -This template is called to process all of the children of the -t:titlepage-content element. It creates the hairy -select expression necessary to process each of those elements in -the title page. - -Note that this template automatically handles the case where -some DocBook elements, like title and subtitle, can occur both inside -the *info elements where metadata is usually stored and outside. - - -It also automatically calculates the name for the *info container -and handles elements that have historically had containers with different -names. - - - - - - - d: - - info - - - - - - d: - artheader - - - d: - blockinfo - - - - - - - - - - d:docinfo - - - - - - - - - - recto - - - - - - - .titlepage. - - .auto.mode - - - - | - - - - / - d: - - - - - - - | - - / - d: - - - - - - - - |d:info - / - d: - - - - - - - | - d: - - - - - - - - - - -Create rules to process titlepage elements in stylesheet order - - -This template is called to process all of the children of the -t:titlepage-content element. It creates the set -of xsl:apply-templates elements necessary -process each of those elements in the title page. - -Note that this template automatically handles the case where -some DocBook elements, like title and subtitle, can occur both inside -the *info elements where metadata is usually stored and outside. - - -It also automatically calculates the name for the *info container -and handles elements that have historically had containers with different -names. - - - - - - - d: - - info - - - - - - d: - artheader - - - d: - blockinfo - - - - - - - - - - d:docinfo - - - - - - - - - recto - - - - - - .titlepage. - - .auto.mode - - - - - - - - - - - - .titlepage. - - .style - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Force can only be used with named-templates. - - - - - - - - - - - - - - - / - d: - - - - - - - - - - / - d: - - - - - - - - - - - - - - - / - d: - - - - - - - - - - / - d: - - - - - - - - - - - - - - - - / - d: - - - - - - - - - - / - d: - - - - - - - - - - - - - d: - - - - - - - - - d: - - - - - - - - - - - - - - - - - - - - - - / - d: - - - - - - - - - - - - - - - - - / - d: - - - - - - - - - - - - - - - - - / - d: - - - - - - - - - - - - - - - -Create templates for special rules - - -This template is called to process all of the descendants of the -t:titlepage-content element that require special -processing. At present, that's just t:or elements. - - - - - - - - - - - recto - - - - - - .titlepage. - - .auto.mode - - - - - - - - - - - - d: - - - - - - - - - - - - - - - - -Create template for individual special rules - - -This template is called to process the children of special -template elements. - - - - - - - - - - - recto - - - - - - .titlepage. - - .auto.mode - - - - - d: - - - - - - - - - - - -Process the t:or special rule - - -This template processes t:or. - - - - - - - - - - recto - - - - - - .titlepage. - - .auto.mode - - - - - - - - - - - - - - - - -Process the t:or special rule in -titlepage.subrules mode - - -The titlepage.subrules mode doesn't apply to t:or, so just -reprocess this node in the normal mode. - - - - - - - - - - -Construct the "or-list" used in the select attribute for -special rules. - - -Walk through each of the children of t:or, producing the -text of the select attribute. - - - - - - - - - - - - - - - - - - - - - | - - - - - - - - - - - - - - - d:title - - - - - - - - - - - ancestor-or-self::d: - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html deleted file mode 100644 index ae71753bdf59bd5a321c9fe7775ff1385bbf4670..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tests - - -

    Index of /release/xsl-ns/1.76.1/tests

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] refentry.007.xml 01-Nov-2010 20:31 10K -[TXT] refentry.007.ns.xml 01-Nov-2010 20:31 10K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=D;O=A deleted file mode 100644 index 08e61bc7151c46a01ab1887eeeb59e413cc71a3b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=D;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tests - - -

    Index of /release/xsl-ns/1.76.1/tests

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] refentry.007.ns.xml 01-Nov-2010 20:31 10K -[TXT] refentry.007.xml 01-Nov-2010 20:31 10K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=D;O=D deleted file mode 100644 index 2834b8bdefba67138b310bafdcefd01db1e90b9a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=D;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tests - - -

    Index of /release/xsl-ns/1.76.1/tests

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] refentry.007.xml 01-Nov-2010 20:31 10K -[TXT] refentry.007.ns.xml 01-Nov-2010 20:31 10K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=M;O=A deleted file mode 100644 index 06ac6455802a0a1dc6444f737329d2ed4fce2e79..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=M;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tests - - -

    Index of /release/xsl-ns/1.76.1/tests

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] refentry.007.ns.xml 01-Nov-2010 20:31 10K -[TXT] refentry.007.xml 01-Nov-2010 20:31 10K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=M;O=D deleted file mode 100644 index 2834b8bdefba67138b310bafdcefd01db1e90b9a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=M;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tests - - -

    Index of /release/xsl-ns/1.76.1/tests

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] refentry.007.xml 01-Nov-2010 20:31 10K -[TXT] refentry.007.ns.xml 01-Nov-2010 20:31 10K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=N;O=A deleted file mode 100644 index cc6138a55f6d0493293a1b282ace6117f21f0ad6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=N;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tests - - -

    Index of /release/xsl-ns/1.76.1/tests

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] refentry.007.ns.xml 01-Nov-2010 20:31 10K -[TXT] refentry.007.xml 01-Nov-2010 20:31 10K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=N;O=D deleted file mode 100644 index 2834b8bdefba67138b310bafdcefd01db1e90b9a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=N;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tests - - -

    Index of /release/xsl-ns/1.76.1/tests

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] refentry.007.xml 01-Nov-2010 20:31 10K -[TXT] refentry.007.ns.xml 01-Nov-2010 20:31 10K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=S;O=A deleted file mode 100644 index ae71753bdf59bd5a321c9fe7775ff1385bbf4670..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=S;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tests - - -

    Index of /release/xsl-ns/1.76.1/tests

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] refentry.007.xml 01-Nov-2010 20:31 10K -[TXT] refentry.007.ns.xml 01-Nov-2010 20:31 10K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=S;O=D deleted file mode 100644 index 855e50dea2d36974d4d62be2abb7bba9b745e5ab..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/index.html?C=S;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tests - - -

    Index of /release/xsl-ns/1.76.1/tests

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] refentry.007.ns.xml 01-Nov-2010 20:31 10K -[TXT] refentry.007.xml 01-Nov-2010 20:31 10K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/refentry.007.ns.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/refentry.007.ns.xml deleted file mode 100644 index f66d6e0d3cf21dad6974af7c26b774eaf4418f08..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/refentry.007.ns.xml +++ /dev/null @@ -1,325 +0,0 @@ - -Unit Test: refentry.007 - -$Id: refentry.007.xml 7282 2007-08-23 09:27:01Z xmldoc $ -NormanWalsh
    ndw@nwalsh.com
    -
    -Reference - - - - - NormanWalshndw@nwalsh.com - Wrote the original version of this document. - - Michael(tm)SmithAdded a bunch of test cases.smith@sideshowbarker.net - - - 2003 - Norman Walsh - - - 2006 - Michael(tm) Smith - - - This file is a product of the DocBook Project. - - - Share and share alike. - - - -FirstName -SecondName -Purpose for FirstName - - - -ThirdName -Purpose for ThirdName - - - - - - - #include <varargs.h> -#include <mouteyh.h> -#include <qlmppzj.h> - - float rand - - - - - int max - - - - - int idiv - int n - int m - - - - Another. - - - - void qsort - void *dataptr[] - int left - int right - int (*comp) - void *, void * - - - - - - int foo_frob_something - foo_sometype1 foo_frob_parm1 - foo_sometype1 foo_frob_parm2 - foo_sometype1 foo_frob_parm3 - int (* parm4 ) - int a, int b, int c - - foo_sometype1 foo_frob_parm5 - - - - int foo_frob_something - foo_sometype1 foo_frob_parm1 - foo_sometype1 foo_frob_parm2 - foo_sometype1 foo_frob_parm3 - int (* parm4 ) - int a, int b, int c - - foo_sometype1 foo_frob_parm5 - - - - -Description - -This is a minimal RefEntry. - -The following is a Variablelist with a title. -My variablelist - - - varlistentry term 1 - some listitem text - - - varlistentry term 2 - some more listitem text - - - -Subsection - -This is a minimal RefEntry. - -The following is a Variablelist with a title and a nested variablelist - - - - glossentry term 1 - some glossdef text - - - glossentry term 2 - - - - nested variablelist term 1 - some variablelist text - - - nested variablelist term 2 - some more variablelist text - - - - - - - -Sub-subsection - -This is a minimal RefEntry. - - - - -More Description - -This is a not-so minimal RefEntry. - -This is a screen [break here] -that starts with a line of space. [break here] -And it ends with a line of space. - - -normal paragraph here - -This is a screen [break here] -that does not start with a line of space. [break here] -And does not end with a line of space. - -This is a normal paragraph that contains a screen. -This is a screen within a normal paragraph [break here] -that does not start with a line of space. [break here] -And does not end with a line of space but is followed -by a line of space. - - -This is another normal paragraph that contains a screen. -This is a screen within a normal paragraph [break here] -that does not start with a line of space. [break here] -And does not end with a line of space and is not followed -by a line of space. - -This is another normal paragraph that contains a screen. - -This is a screen within a normal paragraph [break here] -that starts with a line of space. [break here] -And ends with a line of space but is not followed by a line of space. - - -This is another normal paragraph that contains a screen. - -This is a screen within a normal paragraph [break here] -that starts with a line of space. [break here] -And ends with a line of space and is followed by a line of space. - - - -This is another normal paragraph that contains a screen. - - -This is a screen within a normal paragraph [break here] -that starts with a 2 lines of space. [break here] -And ends with 3 lines of space and is followed by a line of space. - - - - - -This paragraph contains an itemizedlist with a title. The title -is “Mrignkwolmcngâ€. -Mrignkwolmcng - - - itemizedlist listitem 1 - - - itemizedlist listitem 2 - - - -This is some useless text that follows the “Mrignkwolmcng†orderedlist -in the same para. - -The following is a Variablelist with a title and with a nested itemizedlist. -My variablelist - - - varlistentry term 1 - - nested itemizedlist - - - itemizedlist listitem 1 - - - itemizedlist listitem 2 - - - - - - varlistentry term 2 - some more listitem text - - - - -The following is a Variablelist with a title and with a -nested Varlistentry that contains multiple Terms -My nested-multi-term-per-varlistentry variablelist - - - Varlistentry term 1 - - - - varlistentry term 1.1 - varlistentry term 1.2 - varlistentry term 1.3 - All 'bout terms 1.1, 1.2, and 1.3 - - - - - - - varlistentry term 2 - some more listitem text - - - - -Subsection - -This is a minimal RefEntry. - - - -Even More Description - -This is an even less minimal RefEntry. - -This is a paragraph. It contains the following segmentedlist, -titled “Gibbererishâ€, with several segtitle elements. - - - Floober - Buugler - Sstangooo - Borobinda - - Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda - Mondorotoluafu - Ganafutralinga - Patagularamakundra - - - Cadraracondar - Hentirotomaambu - BdomentriolaiaBdomentriolaiaBdomentriolaia - Candamalaturuanio - - -This is some text that follows the segementedlist within the same -paragraph. The next part of this same paragraph is an -important admonition. - - It is very important that you read this. That’s why it stands - out the way that it does. - - - -This is a para with a footnote - Stuff here This is a program listing -that's two lines long. - and stuff after the -footnote - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/refentry.007.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/refentry.007.xml deleted file mode 100644 index 452137631d4d71a2cb13ed681533c852025c8518..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tests/refentry.007.xml +++ /dev/null @@ -1,340 +0,0 @@ - - - - -Unit Test: refentry.007 -$Id: refentry.007.xml 7282 2007-08-23 09:27:01Z xmldoc $ -NormanWalsh -
    ndw@nwalsh.com
    -
    -
    - -Reference - - - - - NormanWalsh - ndw@nwalsh.com - - Wrote the original version of this document. - - - - Added a bunch of test cases. - Michael(tm)Smith - smith@sideshowbarker.net - - - - 2003 - Norman Walsh - - - 2006 - Michael(tm) Smith - - - This file is a product of the DocBook Project. - - - Share and share alike. - - - -FirstName -SecondName -Purpose for FirstName - - - -ThirdName -Purpose for ThirdName - - - - - - - #include <varargs.h> -#include <mouteyh.h> -#include <qlmppzj.h> - - float rand - - - - - int max - - - - - int idiv - int n - int m - - - - Another. - - - - void qsort - void *dataptr[] - int left - int right - int (*comp) - void *, void * - - - - - - int foo_frob_something - foo_sometype1 foo_frob_parm1 - foo_sometype1 foo_frob_parm2 - foo_sometype1 foo_frob_parm3 - int (* parm4 ) - int a, int b, int c - - foo_sometype1 foo_frob_parm5 - - - - int foo_frob_something - foo_sometype1 foo_frob_parm1 - foo_sometype1 foo_frob_parm2 - foo_sometype1 foo_frob_parm3 - int (* parm4 ) - int a, int b, int c - - foo_sometype1 foo_frob_parm5 - - - - - -Description -This is a minimal RefEntry. - -The following is a Variablelist with a title. - - My variablelist - - varlistentry term 1 - some listitem text - - - varlistentry term 2 - some more listitem text - - - - -Subsection -This is a minimal RefEntry. - -The following is a Variablelist with a title and a nested variablelist - - My glosslist - - glossentry term 1 - some glossdef text - - - glossentry term 2 - - - - nested variablelist term 1 - some variablelist text - - - nested variablelist term 2 - some more variablelist text - - - - - - - - -Sub-subsection -This is a minimal RefEntry. - - - - - -More Description -This is a not-so minimal RefEntry. - -This is a screen [break here] -that starts with a line of space. [break here] -And it ends with a line of space. - - -normal paragraph here - -This is a screen [break here] -that does not start with a line of space. [break here] -And does not end with a line of space. - -This is a normal paragraph that contains a screen. -This is a screen within a normal paragraph [break here] -that does not start with a line of space. [break here] -And does not end with a line of space but is followed -by a line of space. - - -This is another normal paragraph that contains a screen. -This is a screen within a normal paragraph [break here] -that does not start with a line of space. [break here] -And does not end with a line of space and is not followed -by a line of space. - -This is another normal paragraph that contains a screen. - -This is a screen within a normal paragraph [break here] -that starts with a line of space. [break here] -And ends with a line of space but is not followed by a line of space. - - -This is another normal paragraph that contains a screen. - -This is a screen within a normal paragraph [break here] -that starts with a line of space. [break here] -And ends with a line of space and is followed by a line of space. - - - -This is another normal paragraph that contains a screen. - - -This is a screen within a normal paragraph [break here] -that starts with a 2 lines of space. [break here] -And ends with 3 lines of space and is followed by a line of space. - - - - - -This paragraph contains an itemizedlist with a title. The title -is “Mrignkwolmcngâ€. - - Mrignkwolmcng - - itemizedlist listitem 1 - - - itemizedlist listitem 2 - - - -This is some useless text that follows the “Mrignkwolmcng†orderedlist -in the same para. - -The following is a Variablelist with a title and with a nested itemizedlist. - - My variablelist - - varlistentry term 1 - - - nested itemizedlist - - itemizedlist listitem 1 - - - itemizedlist listitem 2 - - - - - - varlistentry term 2 - some more listitem text - - - - -The following is a Variablelist with a title and with a -nested Varlistentry that contains multiple Terms - - My nested-multi-term-per-varlistentry variablelist - - Varlistentry term 1 - - - - varlistentry term 1.1 - varlistentry term 1.2 - varlistentry term 1.3 - All 'bout terms 1.1, 1.2, and 1.3 - - - - - - - varlistentry term 2 - some more listitem text - - - - - -Subsection -This is a minimal RefEntry. - - - - -Even More Description -This is an even less minimal RefEntry. - -This is a paragraph. It contains the following segmentedlist, -titled “Gibbererishâ€, with several segtitle elements. - - Gibbererish - Floober - Buugler - Sstangooo - Borobinda - - Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda Bamalalaboonda - Mondorotoluafu - Ganafutralinga - Patagularamakundra - - - Cadraracondar - Hentirotomaambu - BdomentriolaiaBdomentriolaiaBdomentriolaia - Candamalaturuanio - - -This is some text that follows the segementedlist within the same -paragraph. The next part of this same paragraph is an -important admonition. - - It is very important that you read this. That’s why it stands - out the way that it does. - - - -This is a para with a footnote - Stuff here This is a program listing -that's two lines long. - and stuff after the -footnote - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html deleted file mode 100644 index f2821dbfedac5c060121ddddc71bdce1e9f637ac..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools - - -

    Index of /release/xsl-ns/1.76.1/tools

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[DIR] make/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=D;O=A deleted file mode 100644 index 2d522be20bd1957bc69702e8a6bcf640a0cda478..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=D;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools - - -

    Index of /release/xsl-ns/1.76.1/tools

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[DIR] make/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=D;O=D deleted file mode 100644 index dfc268e7798a0dbac2be13d34edcb78fc0558445..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=D;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools - - -

    Index of /release/xsl-ns/1.76.1/tools

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] make/ 01-Nov-2010 22:36 - -[DIR] bin/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=M;O=A deleted file mode 100644 index e2eb0b814c7d171c7eaeac32d14ec0101685e693..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=M;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools - - -

    Index of /release/xsl-ns/1.76.1/tools

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[DIR] make/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=M;O=D deleted file mode 100644 index dfc268e7798a0dbac2be13d34edcb78fc0558445..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=M;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools - - -

    Index of /release/xsl-ns/1.76.1/tools

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] make/ 01-Nov-2010 22:36 - -[DIR] bin/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=N;O=A deleted file mode 100644 index 099daed59a156cace94e8b60d7f29a67e68957fa..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=N;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools - - -

    Index of /release/xsl-ns/1.76.1/tools

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[DIR] make/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=N;O=D deleted file mode 100644 index dfc268e7798a0dbac2be13d34edcb78fc0558445..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=N;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools - - -

    Index of /release/xsl-ns/1.76.1/tools

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] make/ 01-Nov-2010 22:36 - -[DIR] bin/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=S;O=A deleted file mode 100644 index f2821dbfedac5c060121ddddc71bdce1e9f637ac..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=S;O=A +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools - - -

    Index of /release/xsl-ns/1.76.1/tools

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] bin/ 01-Nov-2010 22:36 - -[DIR] make/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=S;O=D deleted file mode 100644 index dfc268e7798a0dbac2be13d34edcb78fc0558445..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/index.html?C=S;O=D +++ /dev/null @@ -1,13 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools - - -

    Index of /release/xsl-ns/1.76.1/tools

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] make/ 01-Nov-2010 22:36 - -[DIR] bin/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/Makefile.DocBook b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/Makefile.DocBook deleted file mode 100644 index 242066ec6a8794959c7557a8fc40ffcb171b1f6e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/Makefile.DocBook +++ /dev/null @@ -1,698 +0,0 @@ -# $Source$ -# $Author: xmldoc $ -# $Date: 2008-03-03 01:20:29 -0800 (Mon, 03 Mar 2008) $ -# $Revision: 7787 $ -# vim: number -# -# ----------------------------------------------------------------- -# ** Makefile.DocBook -- generate output from DocBook sources ** -# ----------------------------------------------------------------- -# -# This file is part of the DocBook Project XSL Stylesheet -# distribution. -# -# See http://docbook.sourceforge.net/release/xsl/current/ -# for copyright and other information. - -# DOCBOOK_OUTPUT_FORMATS is the default set of targets (output -# formats) that get built when you type "make" without any targets -# explicitly specified. To generate a different set of output -# formats, change the value of DOCBOOK_OUTPUT_FORMATS here or set -# it in your environment; for example: -# -# set DOCBOOK_OUTPUT_FORMATS="html pdf"; export DOCBOOK_OUTPUT_FORMATS -# -# Of course by explicitly specifying particular targets when you -# invoke "make", you can always override generation of the default -# set of targets; for example: -# -# make html txt -# -# That would generate just HTML (unchunked) and plain-text output. -# -DOCBOOK_OUTPUT_FORMATS ?= xml man man-pdf chunk txt pdf - -# If you want XHTML output instead of HTML, set HTML_OR_XHTML to -# 'xhtml' or just specify 'xhtml" in DOCBOOK_OUTPUT_FORMATS. -ifeq ($(findstring xhtml,$(DOCBOOK_OUTPUT_FORMATS)),) -HTML_OR_XHTML ?= html -else -HTML_OR_XHTML ?= xhtml -endif - -# if your source is in asciidoc instead of DocBook, set -# ASCII_OR_DOCBOOK to "ascii" -ASCII_OR_DOCBOOK ?= docbook - -# ----------------------------------------------------------------- -# *** TOOLS and other DEPENDENCIES *** -# ----------------------------------------------------------------- -# we use rmdir(1) to remove dirs we create for chunked HTML output -RMDIR = rmdir -# "-p" causes empty parent dirs to be deleted as well -RMDIR_FLAGS = --ignore-fail-on-non-empty -p - -# possible values for PDF_MAKER are: -# dblatex|fop|xep|xmlroff|passivetex -PDF_MAKER = dblatex - -# possible values for TXT_MAKER are: -# links|lynx|w3m|w3mmee -TXT_MAKER = links -TXT_MAKER_FLAGS = -dump - -# xsl -XSLT = xsltproc -XSLT_FLAGS = --xinclude - -# http://dblatex.sourceforge.net/ -DBLATEX = dblatex -DBLATEX_FLAGS = -b pdftex - -FOP = fop -FOP_FLAGS = - -XEP = xep -XEP_FLAGS = - -# http://xmlroff.sourceforge.net/ -XMLROFF = xmlroff -XMLROFF_FLAGS = - -PDFTEX = pdftex -PDFTEX_FLAGS = - -# used by PassiveTeX -PDFXMLTEX = pdfxmltex - -# http://docbook2x.sourceforge.net/ -DB2X_XSLTPROC = db2x_xsltproc -DB2X_XSLTPROC_FLAGS = -DB2X_TEXIXML = db2x_texixml -DB2X_TEXIXML_FLAGS = - -# we call the man(1) command to generate "foo.N.pdf" and -# "foo.N.txt" output (see "man-pdf" & "man-txt" targets) -MAN = man -MAN_FLAGS = - -# The "ps2pdf" command is part of GhostSript (gs) distro. -# It is just a wrapper script around gs that does this: -# -# gs -dCompatibilityLevel=1.2 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite \ -# "-sOutputFile=$outfile" -dCompatibilityLevel=1.2 -c .setpdfwrite -f "$infile" -# -# Where, for example: $outfile = foo.pdf and $infile = foo.1 -PS2PDF = ps2pdf -PS2PDF_FLAGS = - -# asciidoc is used to generate DocBook XML from asciidoc source -ASCIIDOC=asciidoc -ASCIIDOCFLAGS= - -# asciidoc source seems to have DOS line endings, so we use -# DOS2UNIX to be able to grep them correctly -DOS2UNIX=dos2unix -DOS2UNIXFLAGS= - -# The "col" command is needed for stripping backspaces and -# underscores from man(1) output to get pure plain-text -COL = col -COL_FLAGS = - -# The "expand" command is needed for expanding tabs from files -# generated from "man foo.1 | col -b" output -# output to get pure plain-text -EXPAND = expand -EXPAND_FLAGS = - -# value of DOCBOOK_XSL should either be the canonical -# (docbook.sourceforge.net) URL for the DocBook Project XSL -# stylesheets OR it can be a local system path -DOCBOOK_XSL = http://docbook.sourceforge.net/release/xsl/current - -# ----------------------------------------------------------------- -# names of some DIRECTORIES and FILES we need -# ----------------------------------------------------------------- -# We create a tmp directory once per make invocation; it's needed -# for holding a temporary copy of the custom DBLaTeX stylesheet -# (because dblatex currently can't read a stylesheet from stdin) -TMP ?= /tmp -TMPNUM := $(shell echo $$$$) -DOCBOOK_TMP := $(TMP)/docbook-make-$(TMPNUM) - -# MAN_MANIFEST_EXT is file extension added to individual manifest -# files -MAN_MANIFEST_EXT = manifest_man - -# HTML_MANIFEST_EXT is file extension added to HTML manifest files -HTML_MANIFEST_EXT = manifest_html - -# BASEDIR_SUFFIX is a what you need to set if you want a suffix -# added to the end of each "base.dir" we create while generating -# chunked HTML output -#BASEDIR_SUFFIX = -html -#BASEDIR_SUFFIX = _html -BASEDIR_SUFFIX = - -# ----------------------------------------------------------------- -# assorted OPTIONS -# ----------------------------------------------------------------- -# HTML_STYLESHEET -> $html.stylesheet stylesheet param -# http://docbook.sourceforge.net/snapshots/xsl/doc/html/html.stylesheet.html -HTML_STYLESHEET = style.css -# HTML_IMAGES -> $admon.graphics.path -# http://docbook.sourceforge.net/snapshots/xsl/doc/html/admon.graphics.path.html -HTML_IMAGES = images/ -# HTML_IMAGES_EXT -> $admon.graphics.extension -# http://docbook.sourceforge.net/snapshots/xsl/doc/html/admon.graphics.extension.html -HTML_IMAGES_EXT = .png - -# use these to set params on the command-line -# format is, e.g., HTML_PARAMS="--stringparam variablelist.as.table 1..." -FO_PARAMS = -HTML_PARAMS = -MAN_PARAMS = - -# DBX_PARAMS is for dblatex(1); format uses "-p": -# DBX_PARAMS="-p doc.publisher.show 1 -p term.breakline 1... -DBX_PARAMS= - -# What file extension do you use for DocBook source files? -DOCBOOK_FILE_EXTENSION = .xml - -# ----------------------------------------------------------------- -# make(1) functions for building file lists -# ----------------------------------------------------------------- -# -# the values of the following are used for determing what needs -# to be built and/or cleaned up - -ifeq ($(ASCII_OR_DOCBOOK),docbook) -SOURCE_FILES_DBK = $(wildcard *$(DOCBOOK_FILE_EXTENSION)) -else -SOURCE_FILES_DBK = $(foreach base,$(basename $(wildcard *.txt)),$(base)$(DOCBOOK_FILE_EXTENSION)) -endif - -FILES_FO = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).fo) -FILES_TXT = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).out.txt) -FILES_PDF = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).pdf) -FILES_LOG = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).log) -FILES_OUT = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).out) -FILES_AUX = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).aux) -FILES_HTML = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).html) -FILES_INFO = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).info) -DIRS_CHUNK = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base)$(BASEDIR_SUFFIX)) -LISTS_HTML = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).$(HTML_MANIFEST_EXT)) -LISTS_MAN = $(foreach base,$(basename $(SOURCE_FILES_DBK)),$(base).$(MAN_MANIFEST_EXT)) -FILES_CHNK = $(shell for manifest in $(LISTS_HTML); do if [ -f "$$manifest" ]; then cat $$manifest; fi done) -FILES_MAN = $(shell for manifest in $(LISTS_MAN); do if [ -f "$$manifest" ]; then cat $$manifest; fi done) -FILES_MANP = $(foreach base,$(FILES_MAN),$(base).man.pdf) -FILES_MANT = $(foreach base,$(FILES_MAN),$(base).out.txt) -DIRS_MAN = $(shell for file in $(FILES_MAN); do dirname $$file; done | uniq) - -# ----------------------------------------------------------------- -# ** stylesheet for testing whether a file has a refentry -# ----------------------------------------------------------------- -REFENTRY_CHECK := \ - \ - \ - \ - true \ - \ - \ - - -# ----------------------------------------------------------------- -# ** Stylesheet Customization Layers ** -# ----------------------------------------------------------------- -# -# for DBLaTeX -DBX_CUSTOM := \ - 0 \ - 1 \ - 0 \ - 1 \ - 1 \ - left \ - 1 \ - \ - docbook \ - all \ - "" \ - WIDELABEL \ - 0 \ - [htbp] \ - 0 \ - 1 \ - \ - twoside \ - , \ - 1 \ - Synopsis \ - \ - ansi \ - 1 \ - 0 \ - java \ - 0 \ - - -# for FO output -FO_CUSTOM := \ - \ - 1 \ - A4 \ - \ - false \ - 1 \ - left \ - 1 \ - 0 \ - 1 \ - 1 \ - 1 \ - 1 \ - 1 \ - 1 \ - \ - blue \ - \ - \ - \#E0E0E0 \ - 4pt \ - 4pt \ - 4pt \ - 4pt \ - \ - \ - \ - \ - pt \ - \ - \ - \ - \ - \ - pt \ - \ - \ - \ - \ - \ - pt \ - \ - \ - \ - \ - \ - pt \ - \ - \ - \ - \ - \ - pt \ - \ - \ - \ - wrap \ - \ \ - \ - \ - pt \ - \ - \ - - -# for single-file (X)HTML outpout -HTML_CUSTOM := \ - \ - local.l10n.xml \ - \ - 1 \ - 0 \ - \ - 0 \ - $(HTML_STYLESHEET) \ - 0 \ - 1 \ - - -# for chunked (X)HTML output -CHNK_CUSTOM := \ - \ - 0 \ - 1 \ - 0 \ - $(HTML_STYLESHEET) \ - 1 \ - $(HTML_IMAGES) \ - $(HTML_IMAGES_EXT) \ - \ - 1 \ - 1 \ - yes \ - 1 \ - - -# for man-page output -MAN_CUSTOM := \ - \ - \ - \ - man/ \ - \ - - -# ----------------------------------------------------------------- -# ** TARGETS START HERE ** -# ----------------------------------------------------------------- -# prevents make from deleting, e.g. foo.1, after making foo.1.pdf -# and foo.1.txt from it. -.PRECIOUS: %.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9 - -docbook: $(DOCBOOK_OUTPUT_FORMATS) - -xml: $(SOURCE_FILES_DBK) - -man: $(LISTS_MAN) - -# we can generate PDFs from man pages -man-pdf: man - $(MAKE) $(FILES_MANP) - -# we can generate plain text from man pages -man-txt: man - $(MAKE) $(FILES_MANT) - -html: $(FILES_HTML) - -chunk: $(LISTS_HTML) - -txt: $(FILES_TXT) - -pdf: $(FILES_PDF) - -info: $(FILES_INFO) - -# use the "debug" target to echo variables, etc., to -# test/troubleshoot changes you make to this makefile -debug: - echo $(wildcard *$(DOCBOOK_FILE_EXTENSION)) - echo $(ASCII_OR_DOCBOOK) - echo $(SOURCE_FILES_DBK) - -# ----------------------------------------------------------------- -# pattern rule to make DocBook refentry from asciidoc source -# ----------------------------------------------------------------- -%.1$(DOCBOOK_FILE_EXTENSION): %.1.txt - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b docbook $< - -%.2$(DOCBOOK_FILE_EXTENSION): %.2.txt - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b docbook $< - -%.3$(DOCBOOK_FILE_EXTENSION): %.3.txt - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b docbook $< - -%.4$(DOCBOOK_FILE_EXTENSION): %.4.txt - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b docbook $< - -%.5$(DOCBOOK_FILE_EXTENSION): %.5.txt - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b docbook $< - -%.6$(DOCBOOK_FILE_EXTENSION): %.6.txt - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b docbook $< - -%.7$(DOCBOOK_FILE_EXTENSION): %.7.txt - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b docbook $< - -%.8$(DOCBOOK_FILE_EXTENSION): %.8.txt - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b docbook $< - -%.9$(DOCBOOK_FILE_EXTENSION): %.9.txt - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d manpage -b docbook $< - -# ----------------------------------------------------------------- -# pattern rule to make DocBook article from asciidoc source -# ----------------------------------------------------------------- -%$(DOCBOOK_FILE_EXTENSION): %.txt - export LINECOUNT1=$$(cat $< | $(DOS2UNIX) $(DOS2UNIXFLAGS) | egrep "^=+$$" | wc -l); \ - export LINECOUNT2=$$(cat $< | $(DOS2UNIX) $(DOS2UNIXFLAGS) | egrep "^= $$" | wc -l); \ - if [[ $$LINECOUNT1 > 1 || $$LINECOUNT2 > 1 ]]; then \ - $(ASCIIDOC) $(ASCIIDOCFLAGS) -d book -b docbook $<; \ - else \ - $(ASCIIDOC) $(ASCIIDOCFLAGS) -b docbook $<; \ - fi - -# ----------------------------------------------------------------- -# pattern rule for making (X)HTML and plain-text output -# ----------------------------------------------------------------- -%.html: %$(DOCBOOK_FILE_EXTENSION) - @echo '$(HTML_CUSTOM)' | $(XSLT) $(XSLT_FLAGS) $(HTML_PARAMS) - $< > $@ - -%.out.txt: %.html - $(TXT_MAKER) $(TXT_MAKER_FLAGS) ./$< \ - | sed "s/^\(\s\+[0-9]\+\. \)file:\/\/.\+$$/\\1(local)/g" \ - | egrep -v '^ file:///.+$$' \ - > $@ -# if DOCBOOK_OUTPUT_FORMATS does not contain "html", then we need -# to remove the "intermediate" HTML files we used for generating -# plain-text output -ifeq ($(findstring html,$(DOCBOOK_OUTPUT_FORMATS)),) - $(RM) $< -endif - -# ----------------------------------------------------------------- -# pattern rule for making chunked (X)HTML pages -# ----------------------------------------------------------------- -%.$(HTML_MANIFEST_EXT): %$(DOCBOOK_FILE_EXTENSION) - @echo '$(CHNK_CUSTOM)' | $(XSLT) $(XSLT_FLAGS) $(HTML_PARAMS) \ - --stringparam manifest $@ \ - --stringparam base.dir $(basename $@)$(BASEDIR_SUFFIX)/ \ - - $< - -# ----------------------------------------------------------------- -# pattern rules for making FO and PDF stuff -# ----------------------------------------------------------------- -%.fo: %$(DOCBOOK_FILE_EXTENSION) - @echo '$(FO_CUSTOM)' \ - | $(XSLT) $(XSLT_FLAGS) $(FO_PARAMS) - $< > $@ - -ifeq ($(PDF_MAKER),dblatex) -%.pdf: %$(DOCBOOK_FILE_EXTENSION) - mkdir -p $(DOCBOOK_TMP) - echo '$(DBX_CUSTOM)' > $(DOCBOOK_TMP)/dblatex.xsl - -$(DBLATEX) $(DBLATEX_FLAGS)\ - -p $(DOCBOOK_TMP)/dblatex.xsl \ - -o $@ \ - $< - $(RM) -r $(DOCBOOK_TMP) -endif - -%.pdf: %.fo -ifeq ($(PDF_MAKER),) - $(error No PDF_MAKER specified. Cannot make pdf) -else -ifeq ($(PDF_MAKER),xep) - $(XEP) $(XEP_FLAGS) $< $@ -else -ifeq ($(PDF_MAKER),fop) - $(FOP) $(FOP_FLAGS) $< $@ -else -ifeq ($(PDF_MAKER),xmlroff) - $(XMLROFF) $(XMLROFF_FLAGS) $< -o $@ -else -ifeq ($(PDF_MAKER),passivetex) - $(PDFTEX) $(PDFTEX_FLAGS) &$(PDFXMLTEX) $< - @if [ `egrep Rerun $(basename $@).log | wc -l` -gt 0 ]; then \ - $(PDFTEX) $(PDFTEX_FLAGS) &$(PDFXMLTEX) $< ; \ - fi - @if [ `egrep Rerun $(basename $@).log | wc -l` -gt 0 ]; then \ - $(PDFTEX) $(PDFTEX_FLAGS) &$(PDFXMLTEX) $< ; \ - fi - $(RM) $(basename $@).log - $(RM) $(basename $@).aux - $(RM) $(basename $@).out -else - $(error I do not know how to make a PDF using "$(PDF_MAKER)") -endif -endif -endif -endif -endif - -# ----------------------------------------------------------------- -# pattern rules for making TeXinfo stuff -# ----------------------------------------------------------------- -%.txml: %$(DOCBOOK_FILE_EXTENSION) - $(DB2X_XSLTPROC) $(DB2X_XSLTPROC_FLAGS) -s texi -o $@ $< - -%.texi: %.txml - $(DB2X_TEXIXML) $(DB2X_TEXIXML_FLAGS) $< - -# the following is actually a built-in rule, but it's redefined -# here just for the sake of clarity -%.info: %.texi - $(MAKEINFO) $(MAKEINFO_FLAGS) $< -o $@ - -# ----------------------------------------------------------------- -# pattern rule for making man pages -# ----------------------------------------------------------------- -%.$(MAN_MANIFEST_EXT): %$(DOCBOOK_FILE_EXTENSION) - @if [ "$(strip $(shell echo '$(REFENTRY_CHECK)' | $(XSLT) $(XSLT_FLAGS) - $<))" != "true" ]; then \ - touch $@; \ - else \ - echo '$(MAN_CUSTOM)' \ - | $(XSLT) $(XSLT_FLAGS) $(MAN_PARAMS) \ - --stringparam man.output.manifest.filename $@ \ - - $<; \ - fi - -# ----------------------------------------------------------------- -# pattern rule for enabling direct "make foo.1" to work -# ----------------------------------------------------------------- - -%.1 %.2 %.3 %.4 %.5 %.6 %.7: %.xml - $(MAKE) $(basename $<).$(MAN_MANIFEST_EXT) - -# ----------------------------------------------------------------- -# pattern rules for making Postscript/PDF output from man pages -# ----------------------------------------------------------------- -%.1.man.ps: %.1 - $(MAN) -l $(MAN_FLAGS) -Tps $< > $@ - -%.2.man.ps: %.2 - $(MAN) -l $(MAN_FLAGS) -Tps $< > $@ - -%.3.man.ps: %.3 - $(MAN) -l $(MAN_FLAGS) -Tps $< > $@ - -%.4.man.ps: %.4 - $(MAN) -l $(MAN_FLAGS) -Tps $< > $@ - -%.5.man.ps: %.5 - $(MAN) -l $(MAN_FLAGS) -Tps $< > $@ - -%.6.man.ps: %.6 - $(MAN) -l $(MAN_FLAGS) -Tps $< > $@ - -%.7.man.ps: %.7 - $(MAN) -l $(MAN_FLAGS) -Tps $< > $@ - -%.8.man.ps: %.8 - $(MAN) -l $(MAN_FLAGS) -Tps $< > $@ - -%.9.man.ps: %.9 - $(MAN) -l $(MAN_FLAGS) -Tps $< > $@ - -# ----------------------------------------------------------------- -# pattern rule for converting Postscript to PDF -# ----------------------------------------------------------------- -%.pdf: %.ps - $(PS2PDF) $(PS2PDF_FLAGS) $< - -# ----------------------------------------------------------------- -# pattern rules for making plain-text output from man pages -# ----------------------------------------------------------------- -%.1.out.txt: %.1 - $(MAN) -l $(MAN_FLAGS) -Tascii $< | $(COL) -b $(COL_FLAGS) | $(EXPAND) $(EXPAND_FLAGS) > $@ - -%.2.out.txt: %.2 - $(MAN) -l $(MAN_FLAGS) -Tascii $< | $(COL) -b $(COL_FLAGS) | $(EXPAND) $(EXPAND_FLAGS) > $@ - -%.3.out.txt: %.3 - $(MAN) -l $(MAN_FLAGS) -Tascii $< | $(COL) -b $(COL_FLAGS) | $(EXPAND) $(EXPAND_FLAGS) > $@ - -%.4.out.txt: %.4 - $(MAN) -l $(MAN_FLAGS) -Tascii $< | $(COL) -b $(COL_FLAGS) | $(EXPAND) $(EXPAND_FLAGS) > $@ - -%.5.out.txt: %.5 - $(MAN) -l $(MAN_FLAGS) -Tascii $< | $(COL) -b $(COL_FLAGS) | $(EXPAND) $(EXPAND_FLAGS) > $@ - -%.6.out.txt: %.6 - $(MAN) -l $(MAN_FLAGS) -Tascii $< | $(COL) -b $(COL_FLAGS) | $(EXPAND) $(EXPAND_FLAGS) > $@ - -%.7.out.txt: %.7 - $(MAN) -l $(MAN_FLAGS) -Tascii $< | $(COL) -b $(COL_FLAGS) | $(EXPAND) $(EXPAND_FLAGS) > $@ - -%.8.out.txt: %.8 - $(MAN) -l $(MAN_FLAGS) -Tascii $< | $(COL) -b $(COL_FLAGS) | $(EXPAND) $(EXPAND_FLAGS) > $@ - -%.9.out.txt: %.9 - $(MAN) -l $(MAN_FLAGS) -Tascii $< | $(COL) -b $(COL_FLAGS) | $(EXPAND) $(EXPAND_FLAGS) > $@ - -# ----------------------------------------------------------------- -# target(s) for cleaning up the mess -# ----------------------------------------------------------------- -clean: -ifneq ($(FILES_TXT),) - $(RM) $(FILES_TXT) -endif -ifneq ($(FILES_PDF),) - $(RM) $(FILES_PDF) -endif -ifneq ($(FILES_FO),) - $(RM) $(FILES_FO) -endif -ifneq ($(FILES_LOG),) - $(RM) $(FILES_LOG) -endif -ifneq ($(FILES_OUT),) - $(RM) $(FILES_OUT) -endif -ifneq ($(FILES_AUX),) - $(RM) $(FILES_AUX) -endif -ifneq ($(FILES_HTML),) - $(RM) $(FILES_HTML) -endif -ifneq ($(FILES_CHNK),) - $(RM) $(FILES_CHNK) -endif -ifneq ($(FILES_MAN),) - $(RM) $(FILES_MAN) -endif -ifneq ($(FILES_MANT),) - $(RM) $(FILES_MANT) -endif -ifneq ($(FILES_MANP),) - $(RM) $(FILES_MANP) -endif -ifneq ($(FILES_INFO),) - $(RM) $(FILES_INFO) -endif -ifneq ($(DIRS_CHUNK),) - for dir in $(DIRS_CHUNK); do \ - if [ -d "$$dir" ]; then \ - $(RMDIR) $(RMDIR_FLAGS) $$dir; \ - fi \ - done -endif -ifneq ($(DIRS_MAN),) -ifneq ($(DIRS_MAN),.) - for dir in $(DIRS_MAN); do \ - if [ -d "$$dir" ]; then \ - $(RMDIR) $(RMDIR_FLAGS) $$dir; \ - fi \ - done -endif -endif -ifneq ($(LISTS_MAN),) - $(RM) $(LISTS_MAN) -endif -ifneq ($(LISTS_HTML),) - $(RM) $(LISTS_HTML) -endif -ifneq ($(ASCII_OR_DOCBOOK),docbook) - $(RM) -i $(SOURCE_FILES_DBK) -endif diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/Makefile.combine b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/Makefile.combine deleted file mode 100644 index 28a5e18466983c10ffd4e9d59be7f765a56bcd11..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/Makefile.combine +++ /dev/null @@ -1,182 +0,0 @@ -# $Source$ -# $Author: xmldoc $ -# $Date: 2007-03-04 22:28:18 -0800 (Sun, 04 Mar 2007) $ -# $Revision: 6666 $ -# vim: number -# -# ----------------------------------------------------------------- -# ** Makefile.combine -- combine source files ** -# ----------------------------------------------------------------- -# -# This file is part of the DocBook Project XSL Stylesheet -# distribution. -# -# See http://docbook.sourceforge.net/release/xsl/current/ -# for copyright and other information. -# -# This makefile creates "wrapper" files that combine sets of -# individual DocBook source files. The purpose of combining the -# files is to speed up processing time. By default it puts 20 -# files into each wrapper. Use CHUNKSIZE to configure the number -# of files per wrapper. -# -# Currently, this makefile has only a "man" target and is mainly -# intended to speed up processing of large numbers of individual -# refentry instances. - -# What file extension do you use for DocBook source files? -DOCBOOK_FILE_EXTENSION = .xml -SOURCE_FILES_DBK = $(wildcard *$(DOCBOOK_FILE_EXTENSION)) - -MAKEFILE_DOCBOOK = Makefile.DocBook - -XSLTPROC=xsltproc -XSLTPROC_FLAGS= - -SED=sed -SED_FLAGS=-i - -CHUNKSIZE ?= 20 - -WRAPPER_ELEMENT = reference -WRAPPER_TITLE=Combined contents - -COMBINE_XSL = \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - <$(WRAPPER_ELEMENT)> \ - $(WRAPPER_TITLE) \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - - -all: man - -man: build/man - -build/Makefile: - if [ ! -d build ]; then mkdir build; fi - cp $(MAKEFILE_DOCBOOK) $@ - -combine.xsl: Makefile - @echo '$(COMBINE_XSL)' > $@ - $(SED) $(SED_FLAGS) "s/\^\^/'/g" $@ - -build/1.xml: combine.xsl - $(XSLTPROC) $(XSLTPROC_FLAGS) \ - --stringparam files "$(SOURCE_FILES_DBK)" \ - --stringparam chunk.size $(CHUNKSIZE) \ - $< $< - -build/man: build/Makefile build/1.xml - time $(MAKE) -C build man \ - MAN_PARAMS="--stringparam man.output.quietly 1 \ - --stringparam refentry.meta.get.quietly 1 \ - --stringparam man.charmap.enabled 0" - -debug: - -clean: - $(RM) -r build diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/Makefile.docParam b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/Makefile.docParam deleted file mode 100644 index 36d12cafc115bd4fdb2c8f7986af872e017a37f7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/Makefile.docParam +++ /dev/null @@ -1,59 +0,0 @@ -# $Source$ -# $Author: xmldoc $ -# $Date: 2007-03-23 14:57:22 -0700 (Fri, 23 Mar 2007) $ -# $Revision: 6759 $ -# vim: number -# -# ------------------------------------------------------------------ -# ** Makefile.paramDoc - create param.xsl files w/ embedded doc ** -# ------------------------------------------------------------------ - -PARAMFILES = $(wildcard ../../*/param.xsl) -PARAMFILESDOCD = $(foreach base,$(basename $(PARAMFILES)),$(base).docd.xsl) - -XSLT=xsltproc -XSLTFLAGS= - -COPYDOC := \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - &\#x0a; \ - \ - \ - \ - &\#x0a; \ - \ - \ - - -all: $(PARAMFILESDOCD) - -%.docd.xsl: %.xsl - @echo '$(COPYDOC)' | $(XSLT) $(XSLTFLAGS) - $< > $@ - -debug: - @echo $(PARAMFILESDOCD) - -clean: - $(RM) $(PARAMFILESDOCD) diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html deleted file mode 100644 index f9aeae905e8d078faaf94d6332b9b120deb2794a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools/make - - -

    Index of /release/xsl-ns/1.76.1/tools/make

    -
    Icon  Name                          Last modified      Size  Description
    [DIR] Parent Directory - -[   ] Makefile.docParam 01-Nov-2010 20:31 1.9K -[TXT] Makefile.combine 01-Nov-2010 20:31 6.5K -[TXT] Makefile.DocBook 01-Nov-2010 20:31 24K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=D;O=A deleted file mode 100644 index 08d2677eee41f5030c7c2285a0ede8aae1cf6026..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=D;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools/make - - -

    Index of /release/xsl-ns/1.76.1/tools/make

    -
    Icon  Name                          Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] Makefile.DocBook 01-Nov-2010 20:31 24K -[TXT] Makefile.combine 01-Nov-2010 20:31 6.5K -[   ] Makefile.docParam 01-Nov-2010 20:31 1.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=M;O=A deleted file mode 100644 index bc58ffbab970d9c82c4006a4ae40dc267054c2b1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=M;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools/make - - -

    Index of /release/xsl-ns/1.76.1/tools/make

    -
    Icon  Name                          Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] Makefile.DocBook 01-Nov-2010 20:31 24K -[TXT] Makefile.combine 01-Nov-2010 20:31 6.5K -[   ] Makefile.docParam 01-Nov-2010 20:31 1.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=N;O=A deleted file mode 100644 index 40fb65f327b0e540eab2bbe76707117cdfdaa8fb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=N;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools/make - - -

    Index of /release/xsl-ns/1.76.1/tools/make

    -
    Icon  Name                          Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] Makefile.DocBook 01-Nov-2010 20:31 24K -[TXT] Makefile.combine 01-Nov-2010 20:31 6.5K -[   ] Makefile.docParam 01-Nov-2010 20:31 1.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=S;O=D deleted file mode 100644 index 37eabd75e92f7537f9768bb10426389ec8b24869..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/tools/make/index.html?C=S;O=D +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/tools/make - - -

    Index of /release/xsl-ns/1.76.1/tools/make

    -
    Icon  Name                          Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] Makefile.DocBook 01-Nov-2010 20:31 24K -[TXT] Makefile.combine 01-Nov-2010 20:31 6.5K -[   ] Makefile.docParam 01-Nov-2010 20:31 1.9K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/LICENSE b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/LICENSE deleted file mode 100644 index 63c2931f32a4eaff860a91cf41f837be3306efc0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/LICENSE +++ /dev/null @@ -1 +0,0 @@ -See doc/content/index.html. \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/build.properties b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/build.properties deleted file mode 100644 index a31549fb450e0321cc2580c68559e28a9b60ae43..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/build.properties +++ /dev/null @@ -1,43 +0,0 @@ - -# The path (relative to the build.xml file) to your input document. -# To use your own input document, create a build.xml file of your own -# and import this build.xml. -input-xml=docsrc/readme.xml - -# The directory in which to put the output files. -# This directory is created if it does not exist. -output-dir=docs - -# If you are using a customization layer that imports webhelp.xsl, use -# this property to point to it. -stylesheet-path=${ant.file.dir}/xsl/webhelp.xsl - -# If your document has image directories that need to be copied -# to the output directory, you can list patterns here. -# See the Ant documentation for fileset for documentation -# on patterns. -#input-images-dirs=images/**,figures/**,graphics/** - -# By default, the ant script assumes your images are stored -# in the same directory as the input-xml. If you store your -# image directories in another directory, specify it here. -# and uncomment this line. -#input-images-basedir=/path/to/image/location - -# Modify this so that it points to your copy of the Saxon 6.5 jar. -xslt-processor-classpath=/usr/share/java/saxon-6.5.5.jar - -# For non-ns version only, this validates the document -# against a dtd. -validate-against-dtd=false - -# Set this to false if you don't need a search tab. -webhelp.include.search.tab=true - -# indexer-language is used to tell the search indexer which language -# the docbook is written. This will be used to identify the correct -# stemmer, and punctuations that differs from language to language. -# see the documentation for details. en=English, fr=French, de=German, -# zh=Chinese, ja=Japanese etc. -webhelp.indexer.language=en - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/build.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/build.xml deleted file mode 100644 index c9358b1f2beec00858a952c2c3e62b7d4b1f9a55..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/build.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Indexing html files in ${output-dir}/content - - - - - - - - - - - - - - - - - - -Usage: -webhelp: Generates the document in webhelp format and indexes the content. -clean: Deletes webhelp output directory. -index: Indexes the content. - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docs/content/ch01.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docs/content/ch01.html deleted file mode 100644 index 7edbb5340f9a861819748a9642a765be19c209fd..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docs/content/ch01.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - -Chapter 1. Introduction

    Chapter 1. Introduction

    Abstract

    Overview of the package.

    A common requirement for technical publications groups is to produce a Web-based help - format that includes a table of contents pane, a search feature, and an index similar to what - you get from the Microsoft HTML Help (.chm) format or Eclipse help. If the content is help for - a Web application that is not exposed to the Internet or requires that the user be logged in, - then it is impossible to use services like Google to add search. -

    Features

    • Full text search.

      • Stemming support for English, French, and German. Stemming support can be added - for other languages by implementing a stemmer.

      • Support for Chinese, Japanese, and Korean using code from the Lucene search - engine.

      • Search highlighting shows where the searched for term appears in the results. - Use the H button to toggle the highlighting off and on. -

      • Search results can include brief descriptions of the target.

    • Table of contents pane with collapsible toc tree.

    • Auto-synchronization of content pane and TOC.

    • TOC and search pane implemented without the use of a frameset.

    • An Ant build.xml file to generate output. You can use this - build file by importing it into your own or use it as a model for integrating this - output format into your own build system.

    -

    Possible future enhancements

    • Move webhelp-specific parameters and gentext strings into base DocBook stylesheets. -

    • Use tabindex attributes to control the tab - order in the output. The Contents and Search tabs should be first and second, then the - search box and button, then the table of contents items, and so on.

    • Add "Expand all" and "Collapse all" buttons to the table of contents.

    • Add other search options:

      • Add an option to use Lucene for server-side searches with table of contents - state persisted on the server.

      • Add a simple form that uses a Google site:my.domain.com based search.

    • Sort search results based on relevance

    • Support wild card characters in the search query.

    • Parameterize width of the TOC pane OR make the TOC pane resizeable by the - user.

    • Automate search results summary text:

      • Automatically use the first non-heading content as the summary in the search - results.

      • Automatically limit the size of the search description to something 140 - characters.

    • Support boolean operators in search.

    • Parameterize list of files to exclude from indexing. Currently it's hard coded that - we don't index index.html and ix01.html (the - legal notice and index topics). It should be smarter and automatically not index the - index file even if it's not named ix01.html.

    • Improve performance by moving the table of contents div out of each page and into a - separate JavaScript file which then adds it to the page.

    • Add to the indexer the ability to specify a list of files or file patterns not to - index. Currently it does not index index.html or - ix01.html, which is generally appropriate, but it should be up to - the user to decide.

    • Add an index tab populated by a separate JavaScript file. Include a param/property - that allows the content creator to disable the index.

    • Add functionality to the build.xml file so that when a property - is set, the build generates a pdf version of the document and includes a link to it from - the header.

    • Add breadcrumbs so the user will know what topics he's been to.

    • Consider using more advanced Lucene indexers for Chinese and Japanese than the - CJKAnalyzer

    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docs/favicon.ico b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docs/favicon.ico deleted file mode 100644 index 76ece8f1aa4eb8ff5bae504412a214a1e7c67cbe..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docs/favicon.ico and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docs/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docs/index.html deleted file mode 100644 index a0271445c6515758fa9e464f594dff00d48b8bba..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docs/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - README: Web-based Help from DocBook XML  - - - - If not automatically redirected, click here: content/ch01.html - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html deleted file mode 100644 index 00a1887f7fd55bae041a1825f9a43b43830a532d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/docsrc - - -

    Index of /release/xsl-ns/1.76.1/webhelp/docsrc

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] readme.xml 01-Nov-2010 20:31 41K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=D;O=A deleted file mode 100644 index 8d054646a96021110be0df3952d05aaded1d83b0..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=D;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/docsrc - - -

    Index of /release/xsl-ns/1.76.1/webhelp/docsrc

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] readme.xml 01-Nov-2010 20:31 41K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=M;O=A deleted file mode 100644 index 629e971784ae72811c4394681eb0b4d3484e41d1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=M;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/docsrc - - -

    Index of /release/xsl-ns/1.76.1/webhelp/docsrc

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] readme.xml 01-Nov-2010 20:31 41K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=N;O=A deleted file mode 100644 index 7e33aaff5a3e5cff964c3fb3cde62507c53a6c00..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=N;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/docsrc - - -

    Index of /release/xsl-ns/1.76.1/webhelp/docsrc

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] readme.xml 01-Nov-2010 20:31 41K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=S;O=D deleted file mode 100644 index 55f67c65f0748e8f0bf84404cf24fec3e4d74be7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/index.html?C=S;O=D +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/docsrc - - -

    Index of /release/xsl-ns/1.76.1/webhelp/docsrc

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] readme.xml 01-Nov-2010 20:31 41K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/readme.xml b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/readme.xml deleted file mode 100644 index 089a6b9dd4bd933017995467b625d6f241e61d4c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/docsrc/readme.xml +++ /dev/null @@ -1,891 +0,0 @@ - - - - - - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation files - (the Software), to deal in the Software without - restriction, including without limitation the rights to use, copy, - modify, merge, publish, distribute, sublicense, and/or sell copies of - the Software, and to permit persons to whom the Software is furnished to - do so, subject to the following conditions: - - The above copyright notice and this permission notice shall - be included in all copies or substantial portions of the - Software. - - - - Except as contained in this notice, the names of individuals - credited with contribution to this software shall not be used in - advertising or otherwise to promote the sale, use or other - dealings in this Software without prior written authorization from - the individuals in question. - - - - Any stylesheet derived from this Software that is publicly - distributed will be identified with a different name and the - version strings in any derived Software will be changed so that no - possibility of confusion between the derived package and this - Software will exist. - - - - Warranty: - - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL DAVID CRAMER, KASUN GAJASINGHE, OR ANY OTHER CONTRIBUTOR BE LIABLE FOR - ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF - CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - - This package is maintained by Kasun Gajasinghe, kasunbg AT - gmail DOT com and David Cramer, david AT thingbag DOT - net. - - This package also includes the following software written and - copyrighted by others: - - Files in template/common/jquery are - copyrighted by JQuery - under the MIT License. The file - jquery.cookie.js Copyright (c) 2006 Klaus - Hartl under the MIT license. - - - jquery - - - - - Some files in the template/content/search and indexer directories were originally - part of N. Quaine's htmlsearch DITA plugin. The htmlsearch DITA - plugin is available from the files - page of the DITA-users yahoogroup. The htmlsearch plugin - was released under a BSD-style license. See - indexer/license.txt for details. - htmlsearch - - DITA - - htmlsearch plugin - - - - - Stemmers from the Snowball - project released under a BSD license. - - - - Code from the Apache - Lucene search engine provides support for tokenizing - Chinese, Japanese, and Korean content released under the Apache - 2.0 license. - - - Webhelp for DocBook was developed as a Google Summer of Code project. - - - - - 2008-2010 - - Kasun Gajasinghe - - David Cramer - - - DavidCramerdcramer AT motive DOT comdavid AT thingbag DOT net - - KasunGajasinghekasunbg AT gmail DOT com - - August 2010 - - - - Introduction - - - - Overview of the package. - - - - - - A common requirement for technical publications groups is to produce a Web-based help - format that includes a table of contents pane, a search feature, and an index similar to what - you get from the Microsoft HTML Help (.chm) format or Eclipse help. If the content is help for - a Web application that is not exposed to the Internet or requires that the user be logged in, - then it is impossible to use services like Google to add search. - features - - Features - - - Full text search. - search - features - - - - Stemming support for English, French, and German. Stemming support can be added - for other languages by implementing a stemmer. - search - stemming - - - - Support for Chinese, Japanese, and Korean using code from the Lucene search - engine. - - - Search highlighting shows where the searched for term appears in the results. - Use the H button to toggle the highlighting off and on. - - search - highlighting - - - - Search results can include brief descriptions of the target. - search - descriptions - - - - - - Table of contents pane with collapsible toc tree. - - - Auto-synchronization of content pane and TOC. - - - TOC and search pane implemented without the use of a frameset. - - - An Ant build.xml file to generate output. You can use this - build file by importing it into your own or use it as a model for integrating this - output format into your own build system. - - - Possible future enhancements - - - Move webhelp-specific parameters and gentext strings into base DocBook stylesheets. - - - - Use tabindex attributes to control the tab - order in the output. The Contents and Search tabs should be first and second, then the - search box and button, then the table of contents items, and so on. - - - Add "Expand all" and "Collapse all" buttons to the table of contents. - - - Add other search options: - - - Add an option to use Lucene for server-side searches with table of contents - state persisted on the server. - - - Add a simple form that uses a Google site:my.domain.com based search. - - - - - Sort search results based on relevance - - - Support wild card characters in the search query. - - - Parameterize width of the TOC pane OR make the TOC pane resizeable by the - user. - - - Automate search results summary text: - - - Automatically use the first non-heading content as the summary in the search - results. - - - Automatically limit the size of the search description to something 140 - characters. - - - - - Support boolean operators in search. - - - Parameterize list of files to exclude from indexing. Currently it's hard coded that - we don't index index.html and ix01.html (the - legal notice and index topics). It should be smarter and automatically not index the - index file even if it's not named ix01.html. - - - Improve performance by moving the table of contents div out of each page and into a - separate JavaScript file which then adds it to the page. - - - Add to the indexer the ability to specify a list of files or file patterns not to - index. Currently it does not index index.html or - ix01.html, which is generally appropriate, but it should be up to - the user to decide. - - - Add an index tab populated by a separate JavaScript file. Include a param/property - that allows the content creator to disable the index. - - - Add functionality to the build.xml file so that when a property - is set, the build generates a pdf version of the document and includes a link to it from - the header. - - - Add breadcrumbs so the user will know what topics he's been to. - - - Consider using more advanced Lucene indexers for Chinese and Japanese than the - CJKAnalyzer - - - - - Using the package - - - The following sections describe how to install and - use the package on Windows. - -
    - Generating webhelp output - - Installation instructions - - - - - - To install the package on Windows - - - - The examples in this procedure assume a Windows installation, - but the process is the same in other environments, - mutatis mutandis. - - - - If necessary, install Java 1.6 or - higher. - - - - Confirm that Java is installed and in your - PATH by typing the following at a command prompt: - java -version - - To build the indexer, you must have the JDK. - - - - - - - If necessary, install Apache Ant 1.6.5 - or higher. - - - - Unzip the Ant binary distribution to a convenient location - on your system. For example: c:\Program - Files. - - - - Set the environment variable ANT_HOME to - the top-level Ant directory. For example: c:\Program - Files\apache-ant-1.7.1. - See How To Manage - Environment Variables in Windows XP for information - on setting environment variables. - - - - - Add the Ant bin directory to your - PATH. For example: c:\Program - Files\apache-ant-1.7.1\bin - - - - Confirm that Ant is installed by typing the following at a - command prompt: ant -version - - - If you see a message about the file - tools.jar being missing, you can safely - ignore it. - - - - - - - Download Saxon - 6.5.x and unzip the distribution to a convenient location on your file system. - You will use the path to saxon.jar in below. - The build.xml has only been tested with Saxon 6.5, though - it could be adapted to work with other XSLT processors. However, when you generate - output, the Saxon jar must not be in your - CLASSPATH. - - - - - In a text editor, edit the - build.properties file in the webhelp directory - and make the changes indicated by the comments:# The path (relative to the build.xml file) to your input document. -# To use your own input document, create a build.xml file of your own -# and import this build.xml. -input-xml=docsrc/readme.xml - -# The directory in which to put the output files. -# This directory is created if it does not exist. -output-dir=docs - -# If you are using a customization layer that imports webhelp.xsl, use -# this property to point to it. -stylesheet-path=${ant.file.dir}/xsl/webhelp.xsl - -# If your document has image directories that need to be copied -# to the output directory, you can list patterns here. -# See the Ant documentation for fileset for documentation -# on patterns. -#input-images-dirs=images/**,figures/**,graphics/** - -# By default, the ant script assumes your images are stored -# in the same directory as the input-xml. If you store your -# image directories in another directory, specify it here. -# and uncomment this line. -#input-images-basedir=/path/to/image/location - -# Modify this so that it points to your copy of the Saxon 6.5 jar. -xslt-processor-classpath=/usr/share/java/saxon-6.5.5.jar - -# For non-ns version only, this validates the document -# against a dtd. -validate-against-dtd=true - -# Set this to false if you don't need a search tab. -webhelp.include.search.tab=true - -# indexer-language is used to tell the search indexer which language -# the docbook is written. This will be used to identify the correct -# stemmer, and punctuations that differs from language to language. -# see the documentation for details. en=English, fr=French, de=German, -# zh=Chinese, ja=Japanese etc. -webhelp.indexer.language=en - - - - Test the package by running the command ant webhelp - -Doutput-dir=test-ouput at the command line in the webhelp directory. It should - generate a copy of this documentation in the doc - directory. Type start test-output\index.html to open the output in a - browser. Once you have confirmed that the process worked, you can delete the test-output directory. - The Saxon 6.5 jar should not be in your - CLASSPATH when you generate the webhelp output. If you have any - problems, try running ant with an empty CLASSPATH. - - - - - To process your own document, simply refer to this package - from another build.xml in arbitrary location on - your system: - - - - Create a new build.xml file that - defines the name of your source file, the desired output - directory, and imports the build.xml from - this package. For example: <project> - <property name="input-xml" value="path-to/yourfile.xml"/> - <property name="input-images-dirs" value="images/** figures/** graphics/**"/> - <property name="output-dir" value="path-to/desired-output-dir"/> - <import file="path-to/docbook-webhelp/build.xml"/> -</project> - - - - From the directory containing your newly created - build.xml file, type ant - webhelp to build your document. - - The Saxon 6.5 jar should not be in your - CLASSPATH when you generate the webhelp output. If you have any - problems, try running ant with an empty CLASSPATH. - - - - - -
    - -
    Using and customizing the output - - - To deep link to a topic inside the help set, simply link directly - to the page. This help system uses no frameset, so nothing further is - necessary. - See Chunking into - multiple HTML files in Bob Stayton's DocBook XSL: The - Complete Guide for information on controlling output file - names and which files are chunked in DocBook. - - - When you perform a search, the results can include brief - summaries. These are populated in one of two ways: - - By adding role="summary" to a - para or phrase in the - chapter or section. - - - - By adding an abstract to the - chapterinfo or sectioninfo - element. - - - - To customize the look and feel of the help, study the following - css files: - - docs/common/css/positioning.css: This - handles the Positioning of DIVs in appropriate positions. For - example, it causes the leftnavigation div to appear - on the left, the header on top, and so on. Use this if you need to - change the relative positions or need to change the width/height - etc. - - - - docs/common/jquery/theme-redmond/jquery-ui-1.8.2.custom.css: - This is the theming part which adds colors and stuff. This is a - default theme comes with jqueryui unchanged. You - can get any theme based your interest from this. (Themes are on - right navigation bar.) Then replace the css theme folder - (theme-redmond) with it, and change the xsl to point to the new - css. - - - - docs/common/jquery/treeview/jquery.treeview.css: - This styles the toc Tree. Generally, you don't have to edit this - file. - - - -
    Recommended Apache configurations - - - If you are serving a long document from an Apache web server, we - recommend you make the following additions or changes to your - httpd.conf or .htaccess - file. TODO: Explain what each thing - does.AddDefaultCharSet UTF-8 # - - # 480 weeks - <FilesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|js|css|swf)$"> # - Header set Cache-Control "max-age=290304000, public" - </FilesMatch> - - # 2 DAYS - <FilesMatch "\.(xml|txt)$"> - Header set Cache-Control "max-age=172800, public, must-revalidate" - </FilesMatch> - - # 2 HOURS - <FilesMatch "\.(html|htm)$"> - Header set Cache-Control "max-age=7200, must-revalidate" - </FilesMatch> - - # compress text, html, javascript, css, xml: - AddOutputFilterByType DEFLATE text/plain # - AddOutputFilterByType DEFLATE text/html - AddOutputFilterByType DEFLATE text/xml - AddOutputFilterByType DEFLATE text/css - AddOutputFilterByType DEFLATE application/xml - AddOutputFilterByType DEFLATE application/xhtml+xml - AddOutputFilterByType DEFLATE application/rss+xml - AddOutputFilterByType DEFLATE application/javascript - AddOutputFilterByType DEFLATE application/x-javascript - - # Or, compress certain file types by extension: - <Files *.html> - SetOutputFilter DEFLATE - </Files> - - - See Odd - characters in HTML output in Bob Stayton's book - DocBook XSL: The Complete Guide for more - information about this setting. - - - - These lines and those that follow cause the browser to - cache various resources such as bitmaps and JavaScript files. - Note that caching JavaScript files could cause your users to - have stale search indexes if you update your document since the - search index is stored in JavaScript files. - - - - These lines cause the the server to compress html, css, - and JavaScript files and the brower to uncompress them to - improve download performance. - - -
    -
    - -
    Building the indexer - - - To build the indexer, you must have installed the - JDK version 1.5 or higher and set the ANT_HOME - environment variable. Run ant build-indexer to recompile - nw-cms.jar - - - ANT_HOME - - - - indexer - - building - -
    - -
    Adding support for other (non-CJKV) languages - - - To support stemming for a language, the search mechanism requires - a stemmer implemented in both Java and JavaScript. The Java version is - used by the indexer and the JavaScript verison is used to stem the - user's input on the search form. Currently the search mechanism supports - stemming for English and German. In addition, Java stemmers are included - for the following languages. Therefore, to support these languages, you - only need to implement the stemmer in JavaScript and add it to the - template. If you do undertake this task, please consider contributing - the JavaScript version back to this project and to Martin - Porter's project. - - Danish - - - - Dutch - - - - Finnish - - - - Hungarian - - - - Italian - - - - Norwegian - - - - Portuguese - - - - Romanian - - - - Russian - - - - Spanish - - - - Swedish - - - - Turkish - - -
    -
    - - Developer Docs - - - This chapter provides an overview of how webhelp is implemented. - - The table of contents and search panes are implemented as divs and - rendered as if they were the left pane in a frameset. As a result, the - page must save the state of the table of contents and the search in - cookies when you navigate away from a page. When you load a new page, the - page reads these cookies and restores the state of the table of contents - tree and search. The result is that the help system behaves exactly as if - it were a frameset. - -
    Design - - An overview of webhelp page structure. - DocBook WebHelp page structure is fully built on css-based design - abandoning frameset structure. Overall page structure can be divided in to three main sections - - - Header: Header is a separate Div which include company logo, - navigation button(prev, next etc.), page title and heading of parent topic. - - - - Content: This includes the content of the documentation. The processing of this part is - done by - DocBook XSL Chunking customization. Few further css-styling applied from - positioning.css. - - - - - Left Navigation: This includes the table of contents and search tab. This - is customized using jquery-ui styling. - - - Tabbed Navigation: The navigation pane is organized in to two tabs. - Contents tab, and Search tab. Tabbed output is achieved using - JQuery Tabs plugin. - - - - - Table of Contents (TOC) tree: When building the chunked html from the - docbook file, Table of Contents is generated as an Unordered List (a list - made from <ul> <li> tags). When page loads in the browser, - we apply styling to it to achieve the nice look that you see. Styling for TOC - tree is done by a JQuery UI plugin called - - TreeView. We can generate the tree easily by following javascript code: - - -//Generate the tree -$("#tree").treeview({ -collapsed: true, -animated: "medium", -control: "#sidetreecontrol", -persist: "cookie" -}); - - - - - - Search Tab: This includes the search feature. - - - - - - -
    - -
    Search - - Overview design of Search mechanism. - - The searching is a fully client-side implementation of querying texts for - content searching, and no server is involved. That means when a user enters a query, - it is processed by JavaScript inside the browser, and displays the matching results by - comparing the query with a generated 'index', which too reside in the client-side web browser. - - Mainly the search mechanism has two parts. - - - Indexing: First we need to traverse the content in the docs/content folder and index - the words in it. This is done by nw-cms.jar. You can invoke it by - ant index command from the root of webhelp of directory. You can recompile it - again and build the jar file by ant build-indexer. Indexer has some extensive - support for such as stemming of words. Indexer has extensive support for English, German, - French languages. By extensive support, what I meant is that those texts are stemmed - first, to get the root word and then indexes them. For CJK (Chinese, Japanese, Korean) - languages, it uses bi-gram tokenizing to break up the words. (CJK languages does not have - spaces between words.) - - - When we run ant index, it generates five output files: - - - htmlFileList.js - This contains an array named fl which stores details - all the files indexed by the indexer. - - - - htmlFileInfoList.js - This includes some meta data about the indexed files in an array - named fil. It includes details about file name, file (html) title, a summary - of the content.Format would look like, - fil["4"]= "ch03.html@@@Developer Docs@@@This chapter provides an overview of how webhelp is implemented."; - - - - - index-*.js (Three index files) - These three files actually stores the index of the content. - Index is added to an array named w. - - - - - - - - - Querying: Query processing happens totally in client side. Following JavaScript files handles them. - - - nwSearchFnt.js - This handles the user query and returns the search results. It does query - word tokenizing, drop unnecessary punctuations and common words, do stemming if docbook language - supports it, etc. - - - {$indexer-language-code}_stemmer.js - This includes the stemming library. - nwSearchFnt.js file calls stemmer method in this file for stemming. - ex: var stem = stemmer(foobar); - - - - - - - - -
    New Stemmers - - Adding new Stemmers is very simple. - Currently, only English, French, and German stemmers are integrated in to WebHelp. But the code is - extensible such that you can add new stemmers easily by few steps. - What you need: - - - You'll need two versions of the stemmer; One written in JavaScript, and another in Java. But fortunately, - Snowball contains Java stemmers for number of popular languages, and are already included with the package. - You can see the full list in Adding support for other (non-CJKV) languages. - If your language is listed there, - Then you have to find javascript version of the stemmer. Generally, new stemmers are getting added in to - Snowball Stemmers in other languages location. - If javascript stemmer for your language is available, then download it. Else, you can write a new stemmer in - JavaScript using SnowBall algorithm fairly easily. Algorithms are at - Snowball. - - - - Then, name the JS stemmer exactly like this: {$language-code}_stemmer.js. For example, - for Italian(it), name it as, it_stemmer.js. Then, copy it to the - docbook-webhelp/template/content/search/stemmers/ folder. (I assumed - docbook-webhelp is the root folder for webhelp.) - - Make sure you changed the webhelp.indexer.language property in build.properties - to your language. - - - - - - - - Now two easy changes needed for the indexer. - - - Open docbook-webhelp/indexer/src/com/nexwave/nquindexer/IndexerTask.java in - a text editor and add your language code to the supportedLanguages String Array. - Add new language to supportedLanguages array - - - change the Array from, - -private String[] supportedLanguages= {"en", "de", "fr", "cn", "ja", "ko"}; - //currently extended support available for - // English, German, French and CJK (Chinese, Japanese, Korean) languages only. - - To, - -private String[] supportedLanguages= {"en", "de", "fr", "cn", "ja", "ko", "it"}; - //currently extended support available for - // English, German, French, CJK (Chinese, Japanese, Korean), and Italian languages only. - - - - - - - Now, open docbook-webhelp/indexer/src/com/nexwave/nquindexer/SaxHTMLIndex.java and - add the following line to the code where it initializes the Stemmer (Search for - SnowballStemmer stemmer;). Then add code to initialize the stemmer Object in your language. - It's self understandable. See the example. The class names are at: - docbook-webhelp/indexer/src/com/nexwave/stemmer/snowball/ext/. - - initialize correct stemmer based on the <code>webhelp.indexer.language</code> specified - - - SnowballStemmer stemmer; - if(indexerLanguage.equalsIgnoreCase("en")){ - stemmer = new EnglishStemmer(); - } else if (indexerLanguage.equalsIgnoreCase("de")){ - stemmer= new GermanStemmer(); - } else if (indexerLanguage.equalsIgnoreCase("fr")){ - stemmer= new FrenchStemmer(); - } -else if (indexerLanguage.equalsIgnoreCase("it")){ //If language code is "it" (Italian) - stemmer= new italianStemmer(); //Initialize the stemmer to italianStemmer object. - } - else { - stemmer = null; - } - - - - - - - - That's all. Now run ant build-indexer to compile and build the java code. - Then, run ant webhelp to generate the output from your docbook file. - For any questions, contact us or email to the docbook mailing list - docbook-apps@lists.oasis-open.org. - -
    -
    -
    -
    \ No newline at end of file diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html deleted file mode 100644 index 3ff589bf231e3ae603cfa202fdc8915de46ff67b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp - - -

    Index of /release/xsl-ns/1.76.1/webhelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] docs/ 01-Nov-2010 20:31 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] xsl/ 01-Nov-2010 22:36 - -[   ] LICENSE 01-Nov-2010 20:31 27 -[TXT] build.properties 01-Nov-2010 20:31 1.6K -[TXT] build.xml 01-Nov-2010 20:31 3.8K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=D;O=A deleted file mode 100644 index 5470c4116153f6d983cecb75196470c96bd4f86a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=D;O=A +++ /dev/null @@ -1,18 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp - - -

    Index of /release/xsl-ns/1.76.1/webhelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[   ] LICENSE 01-Nov-2010 20:31 27 -[TXT] build.properties 01-Nov-2010 20:31 1.6K -[TXT] build.xml 01-Nov-2010 20:31 3.8K -[DIR] docs/ 01-Nov-2010 20:31 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] xsl/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=D;O=D deleted file mode 100644 index 6181fd454803db3cd251044ed0e5c09d5162d895..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=D;O=D +++ /dev/null @@ -1,18 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp - - -

    Index of /release/xsl-ns/1.76.1/webhelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xsl/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] docs/ 01-Nov-2010 20:31 - -[TXT] build.xml 01-Nov-2010 20:31 3.8K -[TXT] build.properties 01-Nov-2010 20:31 1.6K -[   ] LICENSE 01-Nov-2010 20:31 27 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=M;O=A deleted file mode 100644 index 33b09590c2fd0e907769ba58a615609f4623034f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=M;O=A +++ /dev/null @@ -1,18 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp - - -

    Index of /release/xsl-ns/1.76.1/webhelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[   ] LICENSE 01-Nov-2010 20:31 27 -[TXT] build.xml 01-Nov-2010 20:31 3.8K -[DIR] docs/ 01-Nov-2010 20:31 - -[TXT] build.properties 01-Nov-2010 20:31 1.6K -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] xsl/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=M;O=D deleted file mode 100644 index 2b99ce613eb623a26cd892c627d479b8db57e40c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=M;O=D +++ /dev/null @@ -1,18 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp - - -

    Index of /release/xsl-ns/1.76.1/webhelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xsl/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[TXT] build.properties 01-Nov-2010 20:31 1.6K -[DIR] docs/ 01-Nov-2010 20:31 - -[TXT] build.xml 01-Nov-2010 20:31 3.8K -[   ] LICENSE 01-Nov-2010 20:31 27 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=N;O=A deleted file mode 100644 index 137e3a301ab43021fb3bc30441975cbf786a53b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=N;O=A +++ /dev/null @@ -1,18 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp - - -

    Index of /release/xsl-ns/1.76.1/webhelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[   ] LICENSE 01-Nov-2010 20:31 27 -[TXT] build.properties 01-Nov-2010 20:31 1.6K -[TXT] build.xml 01-Nov-2010 20:31 3.8K -[DIR] docs/ 01-Nov-2010 20:31 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] xsl/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=N;O=D deleted file mode 100644 index 6181fd454803db3cd251044ed0e5c09d5162d895..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=N;O=D +++ /dev/null @@ -1,18 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp - - -

    Index of /release/xsl-ns/1.76.1/webhelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] xsl/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] docs/ 01-Nov-2010 20:31 - -[TXT] build.xml 01-Nov-2010 20:31 3.8K -[TXT] build.properties 01-Nov-2010 20:31 1.6K -[   ] LICENSE 01-Nov-2010 20:31 27 -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=S;O=A deleted file mode 100644 index 3ff589bf231e3ae603cfa202fdc8915de46ff67b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=S;O=A +++ /dev/null @@ -1,18 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp - - -

    Index of /release/xsl-ns/1.76.1/webhelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] docs/ 01-Nov-2010 20:31 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] xsl/ 01-Nov-2010 22:36 - -[   ] LICENSE 01-Nov-2010 20:31 27 -[TXT] build.properties 01-Nov-2010 20:31 1.6K -[TXT] build.xml 01-Nov-2010 20:31 3.8K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=S;O=D deleted file mode 100644 index 41d6f1c38a33dfdd4682004cb09b04948fe283cb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/index.html?C=S;O=D +++ /dev/null @@ -1,18 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp - - -

    Index of /release/xsl-ns/1.76.1/webhelp

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] build.xml 01-Nov-2010 20:31 3.8K -[TXT] build.properties 01-Nov-2010 20:31 1.6K -[   ] LICENSE 01-Nov-2010 20:31 27 -[DIR] xsl/ 01-Nov-2010 22:36 - -[DIR] template/ 01-Nov-2010 22:36 - -[DIR] docsrc/ 01-Nov-2010 22:36 - -[DIR] docs/ 01-Nov-2010 20:31 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/common/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/common/index.html deleted file mode 100644 index 9860b12cc84aaf6acac6c425fd1ae63924ef6ed9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/common/index.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/template/common - - -

    Index of /release/xsl-ns/1.76.1/webhelp/template/common

    -
    Icon  Name                                     Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] css/ 01-Nov-2010 22:36 - -[DIR] images/ 01-Nov-2010 22:36 - -[DIR] jquery/ 01-Nov-2010 22:36 - -[   ] main.js 01-Nov-2010 20:31 5.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/content/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/content/index.html deleted file mode 100644 index a6783902076c48373138ee315a5b5db209229e95..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/content/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/template/content - - -

    Index of /release/xsl-ns/1.76.1/webhelp/template/content

    -
    Icon  Name                                     Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] search/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/favicon.ico b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/favicon.ico deleted file mode 100644 index 76ece8f1aa4eb8ff5bae504412a214a1e7c67cbe..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/favicon.ico and /dev/null differ diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html deleted file mode 100644 index e449a87a3e6fe18519c8374e45f5f4df61bd10b2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/template - - -

    Index of /release/xsl-ns/1.76.1/webhelp/template

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] common/ 01-Nov-2010 22:36 - -[DIR] content/ 01-Nov-2010 22:36 - -[   ] favicon.ico 01-Nov-2010 20:31 5.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=D;O=A deleted file mode 100644 index 6b9e173b37ff4801c117f9f251f951c7ff61a3d8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=D;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/template - - -

    Index of /release/xsl-ns/1.76.1/webhelp/template

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] common/ 01-Nov-2010 22:36 - -[DIR] content/ 01-Nov-2010 22:36 - -[   ] favicon.ico 01-Nov-2010 20:31 5.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=M;O=A deleted file mode 100644 index 74e12e359651a88f49c6795646d9730916b750fc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=M;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/template - - -

    Index of /release/xsl-ns/1.76.1/webhelp/template

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[   ] favicon.ico 01-Nov-2010 20:31 5.6K -[DIR] common/ 01-Nov-2010 22:36 - -[DIR] content/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=N;O=A deleted file mode 100644 index 451c1c7cb2a5235cfc8c1dfaaf3f0653474679e5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=N;O=A +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/template - - -

    Index of /release/xsl-ns/1.76.1/webhelp/template

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[DIR] common/ 01-Nov-2010 22:36 - -[DIR] content/ 01-Nov-2010 22:36 - -[   ] favicon.ico 01-Nov-2010 20:31 5.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=S;O=D deleted file mode 100644 index 7425218cd00b4cacf9a83b6d379873d75888cd76..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/template/index.html?C=S;O=D +++ /dev/null @@ -1,14 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/template - - -

    Index of /release/xsl-ns/1.76.1/webhelp/template

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[   ] favicon.ico 01-Nov-2010 20:31 5.6K -[DIR] content/ 01-Nov-2010 22:36 - -[DIR] common/ 01-Nov-2010 22:36 - -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html deleted file mode 100644 index f82a32e819d4d07e038ad12ae754a91396754a09..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/xsl - - -

    Index of /release/xsl-ns/1.76.1/webhelp/xsl

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] webhelp.xsl 01-Nov-2010 20:31 37K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=D;O=A deleted file mode 100644 index 5b208831d1058d5f299b4ef6547797c3f0c686c2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=D;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/xsl - - -

    Index of /release/xsl-ns/1.76.1/webhelp/xsl

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] webhelp.xsl 01-Nov-2010 20:31 37K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=M;O=A deleted file mode 100644 index d8f0257cb71a9fe543b079b3512e6a7325038914..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=M;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/xsl - - -

    Index of /release/xsl-ns/1.76.1/webhelp/xsl

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] webhelp.xsl 01-Nov-2010 20:31 37K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=N;O=A deleted file mode 100644 index 82a35ad052d79fd4fd40957ab135996c076dccd4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=N;O=A +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/xsl - - -

    Index of /release/xsl-ns/1.76.1/webhelp/xsl

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] webhelp.xsl 01-Nov-2010 20:31 37K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=S;O=D deleted file mode 100644 index 9ac601c69f725aee4a21ea2bcd49c8e01fcd0722..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/index.html?C=S;O=D +++ /dev/null @@ -1,12 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/webhelp/xsl - - -

    Index of /release/xsl-ns/1.76.1/webhelp/xsl

    -
    Icon  Name                            Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] webhelp.xsl 01-Nov-2010 20:31 37K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/webhelp.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/webhelp.xsl deleted file mode 100644 index 8b941e9a12ea3681112f13e5ca24231219ea9813..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/webhelp/xsl/webhelp.xsl +++ /dev/null @@ -1,772 +0,0 @@ - - - - - - - - - true - index.html - docs - - en - - 0 - - - - no - 0 - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - language: - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - -
    - loading table of contents... - - -
    - -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  • - - webhelp-currentid - - - - - - - -
      - - - -
    -
    -
  • -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="//d:title[1]"/>  - - - - If not automatically redirected, click here: content/ch01.html - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/autolayout.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/autolayout.xsl deleted file mode 100644 index 461bfcea8f8cfcde4e585f7a9fa08468bbf1fb1c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/autolayout.xsl +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - All toc entries must have a page attribute. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - All toc entries must have an href attribute. - - - - - - All href toc entries must have an id attribute. - - - - - off site: - - - - - - - - - - - - - - - - - - Off-site links must provide a title. - - - - - - - - - - - - - All toc entries must have a page attribute. - - - - - - - - - : missing ID. - - - - - - - - - - - - - - index.html - - - - - - - - - - - : missing filename. - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:apply-templates select="$page/*[1]/head/title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - - - - - - / - - - - - - - / - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/chunk-common.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/chunk-common.xsl deleted file mode 100644 index d750c058dd5724778c396610e9e112496f73117b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/chunk-common.xsl +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Fail: tocentry has both page and href attributes. - - - - - - - - - index.html - - - - - - - - - - - - - - - - - - - - - does not exist. - - - - - - - - does not exist. - - - - - - - - - - - - - - - - - - / - - - - - - - - 0 - - - - 1 - - 0 - - - - - - 1 - - 0 - - - 1 - - - - - - - Update: - - : - - - - - - - - - - - - - - - - - - Up-to-date: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Must specify a $website.database.document parameter when - $collect.xref.targets is set to 'yes' or 'only'. - The xref targets were not collected. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/chunk-tabular.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/chunk-tabular.xsl deleted file mode 100644 index cdf97cfd4c6984186b74c64899284f27db014bd2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/chunk-tabular.xsl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/chunk-website.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/chunk-website.xsl deleted file mode 100644 index a9179a08d40fbb4f27e41bd9474d05232628aba5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/chunk-website.xsl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/head.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/head.xsl deleted file mode 100644 index e3ac3080495dc0487e2b1dce3c3d647b135904f3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/website/head.xsl +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="."/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JavaScript - - - - - - - - - text/javascript - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/ebnf.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/ebnf.xsl deleted file mode 100644 index 98f64ad1e92f061f12411fdf25a857a41fdef9a4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/ebnf.xsl +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - - - -$Id: ebnf.xsl 8178 2008-12-15 22:26:38Z bobstayton $ - -Walsh -Norman -19992000 -Norman Walsh - - -HTML EBNF Reference - - -
    Introduction - -This is technical reference documentation for the DocBook XSL -Stylesheets; it documents (some of) the parameters, templates, and -other elements of the stylesheets. - -This reference describes the templates and parameters relevant -to formatting EBNF markup. - -This is not intended to be user documentation. -It is provided for developers writing customization layers for the -stylesheets, and for anyone who's interested in how it -works. - -Although I am trying to be thorough, this documentation is known -to be incomplete. Don't forget to read the source, too :-) -
    -
    -
    - - - - - - - background-color: - - - - - 1 - - - - - - EBNF - - for - - - - - - - - - - - - -
    - - -
    - - - background-color: - - - - - - - EBNF productions - -
    -
    -
    - - - - - - - - - - [ - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - Error: no ID for productionrecap linkend: - - . - - - - - - Warning: multiple "IDs" for productionrecap linkend: - - . - - - - - - - - - - - - - - - - | -
    -
    -
    - - - - - - - - - - - - - - - production - - - - - - - - - Non-terminals with no content must point to - production elements in the current document. - - - Invalid xpointer for empty nt: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - - - - - /*  - -  */ -
    -
    - - - - - - - - - constraintdef - - - - - - - - - - - - - - - - : - - - - - - - : - - - - - - - - - -  ] - -
    -
    -
    - - -
    - - - -
    -
    - - -

    -
    - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/footnote.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/footnote.xsl deleted file mode 100644 index f56af33e7437f2ab1d414136b122dafc8b1aa459..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/footnote.xsl +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - #ftn. - - - - - - - [ - - - - - ] - - - - - [ - - - - - ] - - - - - - - - - - - -ERROR: A footnoteref element has a linkend that points to an element that is not a footnote. -Typically this happens when an id attribute is accidentally applied to the child of a footnote element. -target element: -linkend/id: - - - - - - - - - - - - #ftn. - - - - - [ - - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ftn. - - - - - - # - - - - - - - - - - - - - - [ - - - - - ] - - - - - - - - - - - - ftn. - - - - - - # - - - - - - - [ - - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - -
    -
    - - -
    -
    -

    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.

    -
    - - -
    -
    -
    - - - - - - - - -
    - - -
    -
    - - -
    - - - -
    -
    - - - - Warning: footnote number may not be generated - correctly; - - unexpected as first child of footnote. - -
    - - -
    -
    -
    -
    - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/formal.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/formal.xsl deleted file mode 100644 index f5f677d49c3bd7064f9a5c9162dc47b0ff6fddf7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/formal.xsl +++ /dev/null @@ -1,413 +0,0 @@ - - - - - - - -1 - - - - - - - - - - -
    - - - - - - - -
    - -
    - - - - - -

    - - -

    -

    - - - - - - - -
    -
    - -
    -
    -
    - - - - - - - - - -float - - - - - - - - - -
    - - - - - - - - - - - - - -
    - -
    -
    - -

    - - - -

    -
    -
    -
    - - - - - -
    -

    - - - - - - - - -

    -

    -
    - - - - - - - - - -float - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Broken table: tr descendent of CALS Table. - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - Broken table: row descendent of HTML table. - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - float: - - ; - - - -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/glossary.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/glossary.xsl deleted file mode 100644 index 9ba8fa344f262c88937056ed57a524cc13285bca..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/glossary.xsl +++ /dev/null @@ -1,565 +0,0 @@ - - - - - - - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    -
    - - - -
    - - - - -
    -
    - - - - - - - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - -
    - - - - - -
    - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - - - -
    - - - -
    - - - - - - - - - - -
    -
    -
    - - -

    - - -

    -
    - - - - - - - - -
    - - - - 0 - 1 - - - - - - - - ( - - ) - - - - - -
    -
    - -
    - - - - 0 - 1 - - - - - - - - ( - - ) - -
    -
    - -
    - - - - 0 - 1 - - - - - -
    -
    -
    - - -
    - - - - , - - - - - , - - - - - , - - - - - - - - - - - -
    -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glosssee @otherterm reference not found: - - - - - - - - - - - - - - -

    -
    -
    - - -
    - - -

    - - - - - - - - - - - - - -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glossseealso @otherterm reference not found: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - - - - - - - - - Warning: processing automatic glossary - without a glossary.collection file. - - - - - - Warning: processing automatic glossary but unable to - open glossary.collection file ' - - ' - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - -
    -
    - - - - - - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - - -
    - - - -
    - - - - ! - - - - - - - - - - - - - - - -
    -
    -
    - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/graphics.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/graphics.xsl deleted file mode 100644 index f6228a57383dc360737bc9247c07679782b125de..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/graphics.xsl +++ /dev/null @@ -1,1437 +0,0 @@ - - - - - - - - - - - - - - - - 1 - - - - - - 1 - - - - - -
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - - 1 - 0 - - - - - - 1.0 - 1.0 - - - - 1.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - px - - - - - - - - - - - px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - px - - - - - - - - - - - px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text-align: - - middle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: imagemaps not supported - on scaled images - - - - 0 - - - - - - - - - - - - - - - - - - text-align: - - middle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - height: - - px - - - - - - - - - - - -
    - - - - - background-color: - - - - - background-color: - - - - - - - text-align: - - - - - - - - - -
    -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - calspair - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - , - - , - - - - - - - - - - - - Warning: only calspair or - otherunits='imagemap' supported - in imageobjectco - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text-align: - - middle - - - - - - - - - - - - - - - - - -
    - - text-align: - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - Cannot insert - . Check use.extensions and textinsert.extension parameters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - text-align: - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - Cannot insert - . Check use.extensions and textinsert.extension parameters. - - - - - - - - -
    - - - text-align: - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/highlight.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/highlight.xsl deleted file mode 100644 index eabb63ec904d81e286e1959670230980ecafd70d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/highlight.xsl +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/html-rtf.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/html-rtf.xsl deleted file mode 100644 index e079a738a03a7e3e2f5c4085193ed406e1566adb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/html-rtf.xsl +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    - - - - - - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - -
    - -
    - - - - - - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/html.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/html.xsl deleted file mode 100644 index b4159a57f8756e205123bab6b85fd95bdddf4611..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/html.xsl +++ /dev/null @@ -1,600 +0,0 @@ - - - - - - - - - - - - left - right - left - - - - - - right - left - right - - - - - - ltr - rtl - ltr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - # - - - - - - - - - - - - - - - - - - - bullet - - - - - - - - - bullet - - - © - - - ® - (SM) -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID recommended on - - - : - - - - ... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: no root element for CSS source file' - - '. - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: missing CSS input filename. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/htmltbl.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/htmltbl.xsl deleted file mode 100644 index e24d3d2caf173ec74917b34798c04f8cc211670e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/htmltbl.xsl +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - float: - - left - right - - - - - - - - - - - - - none - none - - ; - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html deleted file mode 100644 index 2e1b2f1ffd138dad7232a9921735064ac558a7c1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml-1_1 - - -

    Index of /release/xsl-ns/1.76.1/xhtml-1_1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.9K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.5K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=D;O=A deleted file mode 100644 index f429d869881570c5eac3f1e72a60ebd9f5521e39..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=D;O=A +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml-1_1 - - -

    Index of /release/xsl-ns/1.76.1/xhtml-1_1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.5K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.9K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=D;O=D deleted file mode 100644 index 18ec1195427b60420d876f3bbec441f10e3696c5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=D;O=D +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml-1_1 - - -

    Index of /release/xsl-ns/1.76.1/xhtml-1_1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.9K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.5K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=M;O=A deleted file mode 100644 index 00ec202b9ab0aea79e94a53d92c1b6cba8d1a4b3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=M;O=A +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml-1_1 - - -

    Index of /release/xsl-ns/1.76.1/xhtml-1_1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.5K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.9K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=M;O=D deleted file mode 100644 index 1e4cb42a18c6e54910c5fa83951c8ee1d4666e51..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=M;O=D +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml-1_1 - - -

    Index of /release/xsl-ns/1.76.1/xhtml-1_1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.9K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.5K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=N;O=A deleted file mode 100644 index 2982be770eb6b99a5d7a597790705fa2b8548a3e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=N;O=A +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml-1_1 - - -

    Index of /release/xsl-ns/1.76.1/xhtml-1_1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.5K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.9K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=N;O=D deleted file mode 100644 index 18ec1195427b60420d876f3bbec441f10e3696c5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=N;O=D +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml-1_1 - - -

    Index of /release/xsl-ns/1.76.1/xhtml-1_1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.9K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.5K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=S;O=A deleted file mode 100644 index 2e1b2f1ffd138dad7232a9921735064ac558a7c1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=S;O=A +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml-1_1 - - -

    Index of /release/xsl-ns/1.76.1/xhtml-1_1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.9K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.5K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=S;O=D deleted file mode 100644 index b116c77a22129547a4ea1d3d0ece08b87cd91b5a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.html?C=S;O=D +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml-1_1 - - -

    Index of /release/xsl-ns/1.76.1/xhtml-1_1

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] graphics.xsl 01-Nov-2010 20:31 56K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.5K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] admon.xsl 01-Nov-2010 20:31 4.5K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] maketoc.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.xsl deleted file mode 100644 index 98f096251a1bfc597635a83e3ed811333b475d98..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/index.xsl +++ /dev/null @@ -1,266 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    -
    -
    - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - -
    - - - - - - - - - -
    - -
    -
    -
    - - -

    - - -

    -
    - - - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    - - - -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    -
    -
    - - -
    - ( - - - - - - ) -
    -
    - - -
    - ( - - - - - - ) -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/info.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/info.xsl deleted file mode 100644 index 64cbe806423e95e03349e89fbf8ed4beaf99d700..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/info.xsl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/inline.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/inline.xsl deleted file mode 100644 index e8b59b9dddcff71eaef92e117322bfad588dac5e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/inline.xsl +++ /dev/null @@ -1,1452 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - _blank - _top - - - - - - - - - - - - - - 1 - 0 - - - - - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XLink to nonexistent id: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - span - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - , - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - abbr - - - - - - acronym - - - - - - - - - - - - - - - - - - - - - - - - - - http://example.com/cgi-bin/man.cgi? - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glossary.collection specified, but there are - - automatic glossaries - - - - - - - - - - - - - - - - - - - - - - - - There's no entry for - - in - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Error: no glossentry for glossterm: - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element - - - - - - - - - - - - - - - - </ - - > - - - & - - ; - - - &# - - ; - - - % - - ; - - - <? - - > - - - <? - - ?> - - - < - - > - - - < - - /> - - - <!-- - - --> - - - - - - - - - - - - - - - - - - - - - - < - - - - - mailto: - - - - - - > - - - - - - - - - - - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - - - - - - - - - - - - - - - - - - ] - - - [ - - ] - - - - - - - - - - - - - [ - - - - - - - - - - - - ] - - - [ - - ] - - - - - - - - - - - - -

    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/keywords.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/keywords.xsl deleted file mode 100644 index c79e1a85e297ce81b411aee17e8e28fae1f00e98..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/keywords.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - , - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/lists.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/lists.xsl deleted file mode 100644 index 9816d4a8b417c48097860afb43d4ec66cd4b8cd1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/lists.xsl +++ /dev/null @@ -1,1090 +0,0 @@ - - - - - - - - - - -
    - - - - - - - - - -
      - - - - - - Compact spacing via @spacing attribute cannot be set in strict XHTML output for listitem: - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - circle - disc - square - - - - - - -
  • - - - - list-style-type: - - - - - - - - - - - -
    - -
    -
    - - - -
    -
  • -
    - - - - - - - - - - - - - 1 - a - i - A - I - - - - Unexpected numeration: - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    -
    - -
      - - Strict XHTML does not allow setting @start attribute for lists! - - - - Compact spacing via @spacing attribute cannot be set in strict XHTML output for listitem: - -
    -
    -
    -
    -
    - - - - - - -
  • - - @override attribute cannot be set in strict XHTML output for listitem: - - - - - - - - -
    - -
    -
    - - - -
    -
  • -
    - - - - - - - - - - - - - -
    - -
    -
    - - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - - - - - - - - - - - - -

    -
    -
    -
    - - -
    - - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - - - - -
    - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    -
    -
    - - - - - - - - - -
    - -
    -
    - - - -
    -
    - - - - - - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - - - 1 - - - -
    -
    - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - 1 - - - - - - - - -   - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 1 - - 1 - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - -
    - - - - - 0 - 1 - - - - - - - - - - - - -
      - - -
    -
    - -
      - - - -
    -
    -
    - - - - -
    -
    - - - - - -decimallower-alphalower-romanupper-alphaupper-romanWarning: unknown procedure.step.numeration value:
      list-style-type:
    - - -
  • - - - -
  • -
    - - - -
      - - -
    -
    - - -

    - - - - -

    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    -
    - - -
    - - - - - - - -
    -
    - - - - - - - - - -
    - - - -
    -
    - - - - - - - - -
    - - - - - : - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    -
    - -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - -

    - - - - -

    - - - - - -
    - -
    - - - - -
    -
    -
    -
    -
    - - - - - - - - - -

    - - - - - - - - - - - - - - - -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/maketoc.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/maketoc.xsl deleted file mode 100644 index 92a86efd89e94e142f26ad332163ed00ead407da..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/maketoc.xsl +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - filename=" - - " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/manifest.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/manifest.xsl deleted file mode 100644 index 5d87691d4196d5883a51205beb3969a237e8a69f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/manifest.xsl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/math.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/math.xsl deleted file mode 100644 index 2f7ec335739de82f3032acd77fae7f451adf7e6d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/math.xsl +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unsupported TeX math notation: - - - - - - - - - - - - - \nopagenumbers - - - - - \bye - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - - $ - - - - $ - - - \vfill\eject - - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - - $$ - - - - $$ - - - \vfill\eject - - - - - - - - - - \documentclass{article} - - \pagestyle{empty} - - \begin{document} - - - - - \end{document} - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - - $ - - - - $ - - - \newpage - - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - - $$ - - - - $$ - - - \newpage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 1 - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/oldchunker.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/oldchunker.xsl deleted file mode 100644 index 36c7d72bc70cea8b5db9d43caacafb3d7f984c77..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/oldchunker.xsl +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - -Encoding used in generated HTML pages - -This encoding is used in files generated by chunking stylesheet. Currently -only Saxon is able to change output encoding. - - - - - - - - - -Saxon character representation used in generated HTML pages - -This character representation is used in files generated by chunking stylesheet. If -you want to suppress entity references for characters with direct representation -in default.encoding, set this parameter to value native. - - - - - - - - - - - - - - - - - - - - - - - - Chunking isn't supported with - - - - - - - - - - - - - - - Writing - - - for - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Can't make chunks with - - 's processor. - - - - - - - - - - - - - - - - Writing - - - for - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Can't make chunks with - - 's processor. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/onechunk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/onechunk.xsl deleted file mode 100644 index c036af5f284457d7b1df4a1029e1e781df47beee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/onechunk.xsl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - -1 - - - - # - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/param.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/param.xsl deleted file mode 100644 index db1efc54e80eb518ac7cf7bd838a92940206a7a3..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/param.xsl +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - - - - -.png - -images/ - - - - - - -/* ====================================================================== - Annotations -*/ - -div.annotation-list { visibility: hidden; - } - -div.annotation-nocss { position: absolute; - visibility: hidden; - } - -div.annotation-popup { position: absolute; - z-index: 4; - visibility: hidden; - padding: 0px; - margin: 2px; - border-style: solid; - border-width: 1px; - width: 200px; - background-color: white; - } - -div.annotation-title { padding: 1px; - font-weight: bold; - border-bottom-style: solid; - border-bottom-width: 1px; - color: white; - background-color: black; - } - -div.annotation-body { padding: 2px; - } - -div.annotation-body p { margin-top: 0px; - padding-top: 0px; - } - -div.annotation-close { position: absolute; - top: 2px; - right: 2px; - } - - -http://docbook.sourceforge.net/release/images/annot-close.png -http://docbook.sourceforge.net/release/images/annot-open.png - - -http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js - - -A - - -. - -. -http://docbook.sourceforge.net/release/bibliography/bibliography.xml - - -normal - - -60 -.png - - -15 - -images/callouts/ - - -10 -10102 - - - - - - - - - - - -no - -1 - - - - - - left - before - - - -all - - -docbook.css.xml -no -images/draft.png - -::= - - - - -#F5DCB3 - - -com.example.help -DocBook Online Help Sample -Example provider -1 - - - - - - 1 - 0 - - - - -1 - - - -figure before -example before -equation before -table before -procedure before -task before - - -kr - - - - - - - - - - -appendix toc,title -article/appendix nop -article toc,title -book toc,title,figure,table,example,equation -chapter toc,title -part toc,title -preface toc,title -qandadiv toc -qandaset toc -reference toc,title -sect1 toc -sect2 toc -sect3 toc -sect4 toc -sect5 toc -section toc -set toc,title - - - - -no - - - - - - - - - - - - - -.html - - -copyright - - - -text/css -alias.h - - - - - - - -User1 - - -User2 - - - - - - - - - -htmlhelp.chm - - -iso-8859-1 - - - - - -toc.hhc -5 - - -index.hhk -htmlhelp.hhp - -Main - -context.h - - - - - - - - - - - - - -basic - - - - - - - -no - -no -iso-8859-1 - - -en - - - - -5 - - -3 - - - - - - - HTML.manifest - - - - -+ -.gif - -images/ -1 - - -6in - - -no -fragid= - -.olink - - replace - -pubid - /cgi-bin/olink -sysid -0 - -I - -90 -10 - - - - - - - - - - - - - - - - -; - - - - - -. -number - - - - - - - - - - I -index - -. -.!?: - -8 - - - - - 0 - background-color: #E0E0E0 - - - - - - -0 - - - - - -solid -0.5pt -a - - - -solid -0.5pt - - olinkdb.xml -target.db - -tex-math-equations.tex - - - -dl -8 -2 - - - - - - - - - -0 -, - - - writing-mode - - - - - - - - -: - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/pi.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/pi.xsl deleted file mode 100644 index 318ac2e78db382518be831085e6e9e25470a6b8e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/pi.xsl +++ /dev/null @@ -1,1204 +0,0 @@ - - - - - - - -HTML Processing Instruction Reference - - $Id: pi.xsl 8394 2009-04-02 20:31:30Z mzjn $ - - - - Introduction - This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for HTML output. - - You add these PIs at particular points in a document to - cause specific “exceptions” to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - - Sets background color for an image - - Use the dbhtml background-color PI before or - after an image (graphic, inlinegraphic, - imagedata, or videodata element) as a - sibling to the element, to set a background color for the - image. - - - dbhtml background-color="color" - - - - background-color="color" - - An HTML color value - - - - - - Background color - - - - - - - - - - - - Sets background color on a CALS table row or table cell - - Use the dbhtml bgcolor PI as child of a CALS table row - or cell to set a background color for that table row or cell. - - - dbhtml bgcolor="color" - - - - bgcolor="color" - - An HTML color value - - - - - - Cell background color - - - - - - - - - - - - Specifies cellpadding in CALS table or qandaset output - - Use the dbhtml cellpadding PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellpadding attribute in the - output HTML table. - - - dbhtml cellpadding="number" - - - - cellpadding="number" - - Specifies the cellpadding - - - - - - html.cellpadding - - - Cell spacing and cell padding, - Q and A formatting - - - - - - - - - - - - Specifies cellspacing in CALS table or qandaset output - - Use the dbhtml cellspacing PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellspacing attribute in the - output HTML table. - - - dbhtml cellspacing="number" - - - - cellspacing="number" - - Specifies the cellspacing - - - - - - html.cellspacing - - - Cell spacing and cell padding, - Q and A formatting - - - - - - - - - - - - Set value of the class attribute for a CALS table row - - Use the dbhtml class PI as a child of a - row to specify a class - attribute and value in the HTML output for that row. - - - dbhtml class="name" - - - - class="name" - - Specifies the class name - - - - - - Table styles in HTML output - - - - - - - - - - - - Specifies a directory name in which to write files - - When chunking output, use the dbhtml dir PI - as a child of a chunk source to cause the output of that - chunk to be written to the specified directory; also, use it - as a child of a mediaobject to specify a - directory into which any long-description files for that - mediaobject will be written. - - - dbhtml dir="path" - - - - dir="path" - - Specifies the pathname for the directory - - - - - - base.dir - - - dbhtml dir processing instruction - - - - - - - - - - - - Specifies a filename for a chunk - - When chunking output, use the dbhtml filename - PI as a child of a chunk source to specify a filename for - the output file for that chunk. - - - dbhtml filename="filename" - - - - filename="path" - - Specifies the filename for the file - - - - - - use.id.as.filename - - - dbhtml filenames - - - - - - - - - - - - Specifies presentation style for a funcsynopsis - - Use the dbhtml funcsynopsis-style PI as a child of - a funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - - dbhtml funcsynopsis-style="kr"|"ansi" - - - - funcsynopsis-style="kr" - - Displays funcprototype output in K&R style - - - funcsynopsis-style="ansi" - - Displays funcprototype output in ANSI style - - - - - - funcsynopsis.style - - - - - - - - - - - - Specifies a path to the location of an image file - - Use the dbhtml img.src.path PI before or - after an image (graphic, - inlinegraphic, imagedata, or - videodata element) as a sibling to the element, - to specify a path to the location of the image; in HTML - output, the value specified for the - img.src.path attribute is prepended to the - filename. - - - dbhtml img.src.path="path" - - - - img.src.path="path" - - Specifies the pathname to prepend to the name of the image file - - - - - - img.src.path - - - Using fileref - - - - - - - - - - - - Specifies the label width for a qandaset - - Use the dbhtml label-width PI as a child of a - qandaset to specify the width of labels. - - - dbhtml label-width="width" - - - - label-width="width" - - Specifies the label width (including units) - - - - - - Q and A formatting - - - - - - - - - - - - Specifies interval for line numbers in verbatims - - Use the dbhtml linenumbering.everyNth PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the interval at which lines are numbered. - - - dbhtml linenumbering.everyNth="N" - - - - linenumbering.everyNth="N" - - Specifies numbering interval; a number is output - before every Nth line - - - - - - linenumbering.everyNth - - - Line numbering - - - - - - - - - - - - Specifies separator text for line numbers in verbatims - - Use the dbhtml linenumbering.separator PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the separator text output between the line numbers and content. - - - dbhtml linenumbering.separator="text" - - - - linenumbering.separator="text" - - Specifies the text (zero or more characters) - - - - - - linenumbering.separator - - - Line numbering - - - - - - - - - - - - Specifies width for line numbers in verbatims - - Use the dbhtml linenumbering.width PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the width set aside for line numbers. - - - dbhtml linenumbering.width="width" - - - - linenumbering.width="width" - - Specifies the width (inluding units) - - - - - - linenumbering.width - - - Line numbering - - - - - - - - - - - - Specifies presentation style for a variablelist or - segmentedlist - - Use the dbhtml list-presentation PI as a child of - a variablelist or segmentedlist to - control the presentation style for the list (to cause it, for - example, to be displayed as a table). - - - dbhtml list-presentation="list"|"table" - - - - list-presentation="list" - - Displays the list as a list - - - list-presentation="table" - - Displays the list as a table - - - - - - - - variablelist.as.table - - - segmentedlist.as.table - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies the width of a variablelist or simplelist - - Use the dbhtml list-width PI as a child of a - variablelist or a simplelist presented - as a table, to specify the output width. - - - dbhtml list-width="width" - - - - list-width="width" - - Specifies the output width (including units) - - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies the height for a CALS table row - - Use the dbhtml row-height PI as a child of a - row to specify the height of the row. - - - dbhtml row-height="height" - - - - row-height="height" - - Specifies the row height (including units) - - - - - - Row height - - - - - - - - - - - - (obsolete) Sets the starting number on an ordered list - - This PI is obsolete. The intent of - this PI was to provide a means for setting a specific starting - number for an ordered list. Instead of this PI, set a value - for the override attribute on the first - listitem in the list; that will have the same - effect as what this PI was intended for. - - - dbhtml start="character" - - - - start="character" - - Specifies the character to use as the starting - number; use 0-9, a-z, A-Z, or lowercase or uppercase - Roman numerals - - - - - - List starting number - - - - - - - - - - - - Do not chunk any descendants of this element. - - When generating chunked HTML output, adding this PI as the child of an element that contains elements that would normally be generated on separate pages if generating chunked output causes chunking to stop at this point. No descendants of the current element will be split into new HTML pages: -<section> -<title>Configuring pencil</title> -<?dbhtml stop-chunking?> - -... - -</section> - - - - dbhtml stop-chunking - - - Chunking into multiple HTML files - - - - - - Specifies summary for CALS table, variablelist, segmentedlist, or qandaset output - - Use the dbhtml table-summary PI as a child of - a CALS table, variablelist, - segmentedlist, or qandaset to specify - the text for the HTML summary attribute - in the output HTML table. - - - dbhtml table-summary="text" - - - - table-summary="text" - - Specifies the summary text (zero or more characters) - - - - - - Variable list formatting in HTML, - Table summary text - - - - - - - - - - - - Specifies the width for a CALS table - - Use the dbhtml table-width PI as a child of a - CALS table to specify the width of the table in - output. - - - dbhtml table-width="width" - - - - table-width="width" - - Specifies the table width (including units or as a percentage) - - - - - - default.table.width - - - Table width - - - - - - - - - - - - Sets character formatting for terms in a variablelist - - Use the dbhtml term-presentation PI as a child - of a variablelist to set character formatting for - the term output of the list. - - - dbhtml term-presentation="bold"|"italic"|"bold-italic" - - - - term-presentation="bold" - - Specifies that terms are displayed in bold - - - term-presentation="italic" - - Specifies that terms are displayed in italic - - - term-presentation="bold-italic" - - Specifies that terms are displayed in bold-italic - - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies separator text among terms in a varlistentry - - Use the dbhtml term-separator PI as a child - of a variablelist to specify the separator text - among term instances. - - - dbhtml term-separator="text" - - - - term-separator="text" - - Specifies the text (zero or more characters) - - - - - - variablelist.term.separator - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies the term width for a variablelist - - Use the dbhtml term-width PI as a child of a - variablelist to specify the width for - term output. - - - dbhtml term-width="width" - - - - term-width="width" - - Specifies the term width (including units) - - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies whether a TOC should be generated for a qandaset - - Use the dbhtml toc PI as a child of a - qandaset to specify whether a table of contents - (TOC) is generated for the qandaset. - - - dbhtml toc="0"|"1" - - - - toc="0" - - If zero, no TOC is generated - - - toc="1" - - If 1 (or any non-zero value), - a TOC is generated - - - - - - Q and A list of questions, - Q and A formatting - - - - - - - - - - - - Generates a hyperlinked list of commands - - Use the dbcmdlist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - cmdsynopsis instances; a hyperlinked navigational - “command list” will be generated at the top of output for that - element, enabling users to quickly jump - to each command synopsis. - - - dbcmdlist - - - [No parameters] - - - - - - No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep? - - -
    - - - -
    -
    - - - Generates a hyperlinked list of functions - - Use the dbfunclist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - funcsynopsis instances; a hyperlinked - navigational “function list” will be generated at the top of - output for that element, enabling users to quickly - jump to to each function synopsis. - - - dbfunclist - - - [No parameters] - - - - - - No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep? - - -
    - - - -
    -
    - - - Copies an external well-formed HTML/XML file into current doc - - Use the dbhtml-include href PI anywhere in a - document to cause the contents of the file referenced by the - href pseudo-attribute to be copied/inserted “as - is” into your HTML output at the point in document order - where the PI occurs in the source. - - The referenced file may contain plain text (as long as - it is “wrapped” in an html element — see the - note below) or markup in any arbitrary vocabulary, - including HTML — but it must conform to XML - well-formedness constraints (because the feature in XSLT - 1.0 for opening external files, the - document() function, can only handle - files that meet XML well-formedness constraints). - Among other things, XML well-formedness constraints - require a document to have a single root - element. So if the content you want to - include is plain text or is markup that does - not have a single root element, - wrap the content in an - html element. The stylesheets will - strip out that surrounding html “wrapper” when - they find it, leaving just the content you want to - insert. - - - - dbhtml-include href="URI" - - - - href="URI" - - Specifies the URI for the file to include; the URI - can be, for example, a remote http: - URI, or a local filesystem file: - URI - - - - - - textinsert.extension - - - Inserting external HTML code, - External code files - - - - - - - href - - - - - - - - - - - - - - - - - - - - ERROR: dbhtml-include processing instruction - href has no content. - - - - - - - ERROR: dbhtml-include processing instruction has - missing or empty href value. - - - - - - - - Sets topic name and topic id for context-sensitive HTML Help - - Use the dbhh PI as a child of components - that should be used as targets for context-sensitive help requests. - - - dbhh topicname="name" topicid="id" - - - - topicname="name" - - Specifies a unique string constant that identifies a help topic - - - topicid="id" - - Specifies a unique integer value for the topicname string - - - - - - Context-sensitive help - - - - - - - - - - filename - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - # - - - - - - - - - - - - - - - - - - -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - -
    - - - # - - - - - - - - - - - - - - - - - - -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - - / - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-chunk-code.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-chunk-code.xsl deleted file mode 100644 index b9fcbca85450fa2e0b1d88085a0daa3789a5e21e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-chunk-code.xsl +++ /dev/null @@ -1,616 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bk - - - - - - - - - - - - - - - ar - - - - - - - - - - - - - - - pr - - - - - - - - - - - - - - - ch - - - - - - - - - - - - - - - ap - - - - - - - - - - - - - - - - - - - pt - - - - - - - - - - - - - - - - - - - rn - - - - - - - - - - - - - - - - - - - - - - - - re - - - - - - - - - - - - - - - - - - - co - - - - - - - - - - - s - - - - - - - - - - - - - - - - - - - bi - - - - - - - - - - - - - - - - - - - go - - - - - - - - - - - - - - - - - - - ix - - - - - - - - si - - - - - - - - chunk-filename-error- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-chunk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-chunk.xsl deleted file mode 100644 index 59d0c4fbe2f529ad0fb281e7a07a732896b046e1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-chunk.xsl +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-docbook.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-docbook.xsl deleted file mode 100644 index 55a965e6d4c12839eba852410fc1d0a08809fba4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-docbook.xsl +++ /dev/null @@ -1,407 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Element - - in namespace ' - - ' encountered - - in - - - , but no template matches. - - - - < - - > - - </ - - > - - - - - - - - - - - - - - - - - - - <xsl:copy-of select="$title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-onechunk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-onechunk.xsl deleted file mode 100644 index 31e7510edeb520343bd96d04cb58c8dbb4e4bc5a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/profile-onechunk.xsl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - -1 - - - - # - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/qandaset.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/qandaset.xsl deleted file mode 100644 index 01062b5beb23cef38a7a71f2612268e5bd20ad37..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/qandaset.xsl +++ /dev/null @@ -1,421 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - -
    -
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - -
    - - - -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1% - - - - - - - - -
    -
    - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/refentry.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/refentry.xsl deleted file mode 100644 index bc652b19c8b5739393476303727c1bc67b93a6b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/refentry.xsl +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - -
    - - - - -
    -
    -
    -
    - - - - - - -
    -
    - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - -
    - - - - - - - - - - -

    - - - -

    -
    - -

    - - - - - - - - -

    -
    -
    - -

    - -

    -
    -
    - - - - - - , - - - - - - - - - em-dash - - - - - - - - - - - - - - - - : - - - - - - - -
    - - - - -

    - - - - - - - - - - -

    - -
    -
    - - - - - - - - - - - -
    - - - - - - - - - -
    -
    - - - - - - 0 - 1 - - - - 6 - - - - - - - - - - - - -

    - -

    -
    - - - -

    - -

    -
    - - - -

    - -

    -
    - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/sections.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/sections.xsl deleted file mode 100644 index 6947d91ab77c5efaffc2e6b0b839a24c0e7c6220..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/sections.xsl +++ /dev/null @@ -1,543 +0,0 @@ - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - 1 - 2 - 3 - 4 - 5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - - - - - - - - - - clear: both - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - 1 - - - - - - - 2 - 3 - 4 - 5 - 6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/synop.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/synop.xsl deleted file mode 100644 index 85dbc5f204b394d02955ef6b7c35c898e8f4f73b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/synop.xsl +++ /dev/null @@ -1,1515 +0,0 @@ - - - - - - - - - - - - - - -
    - -

    - - - - - - - - - - - - -

    -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - ( - - ) - -   - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - -
    -    
    -    
    -  
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - -
    - -
    -

    -
    - - - - - - ( - - - - - - - fsfunc - - - - - - - - - ) - ; - - - - ... - ) - ; - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - -
    - - - - ; -
    - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - -
    - -
     
    - -
    - -
    -
    -
     
    -
    - - - - - - ( - - - - - - - fsfunc - - - - - - - - - - ) - ; - -   - - - - - ... - ) - ; - -   - - - - - - - - , - - - ) - ; - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - ; - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - ; - - - - - - -

    - -

    -
    - - - - - - ( - - - - - - - fsfunc - - - - - - - - - void) - ; - - - - ... - ) - ; - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - -
    - -
     
    -
     
    -
    - - - - - - ( - - - - - - - fsfunc - - - - - - - - - - void) - ; - -   - - - - - ... - ) - ; - -   - - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - -java - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unrecognized language on - - : - - - - - - - - - - - -
    -
    -
    - - - - - -
    -    
    -    
    -    
    -       extends
    -      
    -      
    -        
    -      -
    -
    - - implements - - -
    -      -
    -
    - - throws - - -  { -
    - - } -
    -
    - - - - - - - - - , - - - - - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - 0 - - , -
    - - -   - - - -
    - - - - -
    - - - - - - - - - - - - - - -    - - - - - - - - - - - - - - - ( - - - - ) - -
    -     throws  - -
    - - - - - ; -
    - -
    - - - - -
    -    
    -    
    -    
    -      : 
    -      
    -      
    -        
    -      -
    -
    - - implements - - -
    -      -
    -
    - - throws - - -  { -
    - - } -
    -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - -    - - - - - - - - - - ( - - ) - -
    -     throws  - -
    - - - - - ; -
    - -
    - - - - -
    -    
    -    interface 
    -    
    -    
    -      : 
    -      
    -      
    -        
    -      -
    -
    - - implements - - -
    -      -
    -
    - - throws - - -  { -
    - - } -
    -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - -    - - - - - - - - - - ( - - ) - -
    -     raises( - - ) -
    - - - - - ; -
    - -
    - - - - -
    -    
    -    package 
    -    
    -    ;
    -    
    - - - @ISA = ( - - ); -
    -
    - - -
    -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - sub - - - { ... }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/table.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/table.xsl deleted file mode 100644 index 108309d4f436a8544ba93d8fd549c5ca5f7e4bc4..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/table.xsl +++ /dev/null @@ -1,1169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - border- - - : - - - - - - ; - - - - - border- - - -width: - - ; - - - - border- - - -style: - - ; - - - - border- - - -color: - - ; - - - - - - - - - - - Error: CALS tables must specify the number of columns. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100% - - - - - - - - border-collapse: collapse; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - - - - - - - border: none; - - - - - border-collapse: collapse; - - - - - - - 0 - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - 100% - - - - - - - - - - - - - - - - - - - - - - - - No convertLength function available. - - - - - - - - - - - - - - - - - - - - - - - - - - No adjustColumnWidths function available. - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - text-align: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text-align: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: overlapped row contains content! - - - This row intentionally left blank - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - background-color: - - - - - - - - - - - - - - - - - - - - - - text-align: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - th - th - - th - - td - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - background-color: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text-align: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - : - - - - - - - - 0: - - - - - - - - - - - - - - - 0 - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text-align: - - - - - - text-align: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/task.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/task.xsl deleted file mode 100644 index bb5318325df570ac3bef2ae632e8a96c48a798b2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/task.xsl +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - before - - - - - - - - -
    - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/titlepage.templates.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/titlepage.templates.xsl deleted file mode 100644 index 106895c4eb987397c9a6532648dad35e9ecb4aec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/titlepage.templates.xsl +++ /dev/null @@ -1,3818 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - - - -
    -
    - - -
    - -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/titlepage.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/titlepage.xsl deleted file mode 100644 index e8e44102d087593aa8d2f784e51cea089ca81fbb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/titlepage.xsl +++ /dev/null @@ -1,1032 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - -
    - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - -
    - - - - - - - - -
    -
    - - -
    - - - - - - - - -
    -
    -
    -
    - - -
    - - -
    -
    - - - - - -
    -
    -
    - - - - - - -
    - - -

    -
    -

    - - - - - - - - - -

    - - - - - - - - - - - - - - - -
    -
    - - -
    - - -
    -
    - - -
    - - -

    Authors

    -
    - - - -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - -
    -
    -
    - - - - - - - - - -
    - - -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - -   - - -
    - -

    -
    -
    -
    -
    - - - - -

    Copyright

    -
    - -

    - - - - - - - copyright - - - - - - - - - -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - -

    - - -

    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - -

    - - - - - - -

    -
    - - - - - - - - - - -
    -
    -
    - - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - -
    - - - -
    -
    -
    - -
    - - - -
    -
    -
    -
    - - -

    -
    - - - - - -
    -
    -
    - - - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - -
    - - -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - 3 - 2 - - - - - - - - RevHistory - - - - -
    - - - - - - - - -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -

    - - -

    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - -

    - - - - - - - - - - - - - - -

    -
    - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/toc.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/toc.xsl deleted file mode 100644 index 6ed7a10e1c70befcb7ffb3bc75cdbca864d882b9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/toc.xsl +++ /dev/null @@ -1,332 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - -
    - - -
    -
    - -
    - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - -
    - - -
    - - -
    -
    - -
    - - - - - - - - - -
    -
    -
    - - - - - - - - -
    - - - - - -
    -
    - - - - - - -
    -
    -
    - - - - - -
    - - -
    - -
    - -
  • - - - -
  • -
    -
    -
    - - - - -
    - - -
    -
    - -
  • - - -
  • -
    -
    -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - -
    -
    - - -
    - - -
    -
    - - - - - - - - - - - - -
    - - -
    -
    - - - -
    -
    - - - - -
    - - - - -
    - - -
    - -
    - - - -
    -
    - - - - -
    - - -
    - -
    - - - -
    -
    - - - - - Warning: don't know what to generate for - lot that has no children. - - - - -
    - - -
    -
    - - -
    - - -
    -
    - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/verbatim.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/verbatim.xsl deleted file mode 100644 index a846e3d7f8d4d31ac0dfa99cb1882668e51b915c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/verbatim.xsl +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - div - pre - - - - - - The shade.verbatim parameter is deprecated. - Use CSS instead, - - - for example: pre. - - { background-color: #E0E0E0; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The shade.verbatim parameter is deprecated. - Use CSS instead, - - - for example: pre. - - { background-color: #E0E0E0; } - - - - - - - -
    -            
    -            
    -              
    -            
    -          
    -
    - -
    - -

    - - - -

    -
    -
    -
    -
    - - - -
    -            
    -            
    -          
    -
    - -
    - -

    - - - -

    -
    -
    -
    -
    -
    -
    - - - - - - - - - - -
    - -

    - - - -

    -
    -
    - - -
    - -

    - - - -

    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unexpected verbatim environment: - - - - - - - - - - 1 - - - - - - - - - - - - - No numberLines function available. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/xref.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/xref.xsl deleted file mode 100644 index 897fecb34cc5fdbd4fcd2ca802add866e9f2ee62..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml-1_1/xref.xsl +++ /dev/null @@ -1,1317 +0,0 @@ - - - - - - - - -http://docbook.org/xlink/role/olink - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Endterm points to nonexistent ID: - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: xref linking to - - has no generated link text. - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XRef to nonexistent id: - - - ??? - - - - - - - - - - - - - - - - Endterm points to nonexistent ID: - - - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - suppress anchor - - - - - - - - - - - removing - - - - - - - - - - - - - - - - - removing - - - - - - - - - - - - - - - - - - - - - - Don't know what gentext to create for xref to: " - - ", (" - - ") - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No bibliography entry: - - found in - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - - - - - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Endterm points to nonexistent ID: - - - ??? - - - - - - - - - - - - - Link element has no content and no Endterm. - Nothing to show in the link to - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olink debug: root element of target.database ' - - ' is ' - - '. - - - - - - - - - - - - - - - Error: unresolved olink: - targetdoc/targetptr = ' - - / - - '. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: olink linkmode pointer is wrong. - - - - # - - - - - - - - - - - - - ? - - - - - & - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/admon.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/admon.xsl deleted file mode 100644 index accc505e44e93fec1c9e6ea829edb98caa7b5497..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/admon.xsl +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - 25 - - - - - - - - - - - - - - - - - - note - warning - caution - tip - important - note - - - - - - - - Note - Warning - Caution - Tip - Important - Note - - - - - - - - - -
    - - - - - - - - - - - - : - - - - - - - - - - -
    - - - - [{$alt}] - - - - - - - - - -
    - -
    -
    -
    - - -
    - - - - - - - - - - -

    - - -

    -
    - - -
    -
    - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/annotations.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/annotations.xsl deleted file mode 100644 index 6567ff281b53f6b8276de98bf993e34b5ac1ecbe..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/annotations.xsl +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - Note - - - namesp. add - - - added namespace before processing - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/ebnf.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/ebnf.xsl deleted file mode 100644 index f46833f3ad6ad0eb8010e5fd7ec2ada19a85b43d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/ebnf.xsl +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - - - -$Id: ebnf.xsl 8178 2008-12-15 22:26:38Z bobstayton $ - -Walsh -Norman -19992000 -Norman Walsh - - -HTML EBNF Reference - - -
    Introduction - -This is technical reference documentation for the DocBook XSL -Stylesheets; it documents (some of) the parameters, templates, and -other elements of the stylesheets. - -This reference describes the templates and parameters relevant -to formatting EBNF markup. - -This is not intended to be user documentation. -It is provided for developers writing customization layers for the -stylesheets, and for anyone who's interested in how it -works. - -Although I am trying to be thorough, this documentation is known -to be incomplete. Don't forget to read the source, too :-) -
    -
    -
    - - - - - - - - - - - - 1 - - - - - - EBNF - - for - - - - - - - - - - - - -
    - - -
    - - - - - - - - - - EBNF productions - -
    -
    -
    - - - - - - - - - - [ - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - Error: no ID for productionrecap linkend: - - . - - - - - - Warning: multiple "IDs" for productionrecap linkend: - - . - - - - - - - - - - - - - - - - | -
    -
    -
    - - - - - - - - - - - - - - - production - - - - - - - - - Non-terminals with no content must point to - production elements in the current document. - - - Invalid xpointer for empty nt: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - - - - - /*  - -  */ -
    -
    - - - - - - - - - constraintdef - - - - - - - - - - - - - - - - : - - - - - - - : - - - - - - - - - -  ] - -
    -
    -
    - - -
    - - - -
    -
    - - -

    -
    - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/footnote.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/footnote.xsl deleted file mode 100644 index 031a31e06d4c2f89a5fc74bee3651c2a5573cf05..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/footnote.xsl +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - #ftn. - - - - - - - [ - - - - - ] - - - - - [ - - - - - ] - - - - - - - - - - - -ERROR: A footnoteref element has a linkend that points to an element that is not a footnote. -Typically this happens when an id attribute is accidentally applied to the child of a footnote element. -target element: -linkend/id: - - - - - - - - - - - - #ftn. - - - - - [ - - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ftn. - - - - - - # - - - - - - - - - - - - - - [ - - - - - ] - - - - - - - - - - - - ftn. - - - - - - # - - - - - - - [ - - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - -
    -
    - - -
    -
    -

    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.

    -
    - - -
    -
    -
    - - - - - - - - -
    - - -
    -
    - - -
    - - - -
    -
    - - - - Warning: footnote number may not be generated - correctly; - - unexpected as first child of footnote. - -
    - - -
    -
    -
    -
    - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/formal.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/formal.xsl deleted file mode 100644 index f5f677d49c3bd7064f9a5c9162dc47b0ff6fddf7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/formal.xsl +++ /dev/null @@ -1,413 +0,0 @@ - - - - - - - -1 - - - - - - - - - - -
    - - - - - - - -
    - -
    - - - - - -

    - - -

    -

    - - - - - - - -
    -
    - -
    -
    -
    - - - - - - - - - -float - - - - - - - - - -
    - - - - - - - - - - - - - -
    - -
    -
    - -

    - - - -

    -
    -
    -
    - - - - - -
    -

    - - - - - - - - -

    -

    -
    - - - - - - - - - -float - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Broken table: tr descendent of CALS Table. - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - Broken table: row descendent of HTML table. - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - float: - - ; - - - -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/glossary.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/glossary.xsl deleted file mode 100644 index 9ba8fa344f262c88937056ed57a524cc13285bca..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/glossary.xsl +++ /dev/null @@ -1,565 +0,0 @@ - - - - - - - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    -
    - - - -
    - - - - -
    -
    - - - - - - - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - -
    - - - - - -
    - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - - - -
    - - - -
    - - - - - - - - - - -
    -
    -
    - - -

    - - -

    -
    - - - - - - - - -
    - - - - 0 - 1 - - - - - - - - ( - - ) - - - - - -
    -
    - -
    - - - - 0 - 1 - - - - - - - - ( - - ) - -
    -
    - -
    - - - - 0 - 1 - - - - - -
    -
    -
    - - -
    - - - - , - - - - - , - - - - - , - - - - - - - - - - - -
    -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glosssee @otherterm reference not found: - - - - - - - - - - - - - - -

    -
    -
    - - -
    - - -

    - - - - - - - - - - - - - -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glossseealso @otherterm reference not found: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - - - - - - - - - Warning: processing automatic glossary - without a glossary.collection file. - - - - - - Warning: processing automatic glossary but unable to - open glossary.collection file ' - - ' - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - -
    -
    - - - - - - - - - - - - - - - - - normalize.sort.input - - - - - - normalize.sort.output - - - - -
    - - - -
    - - - - ! - - - - - - - - - - - - - - - -
    -
    -
    - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/graphics.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/graphics.xsl deleted file mode 100644 index 436e3d6f50dd0e0c26e2fef6bb1136d748f7e808..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/graphics.xsl +++ /dev/null @@ -1,1437 +0,0 @@ - - - - - - - - - - - - - - - - 1 - - - - - - 1 - - - - - -
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - - 1 - 0 - - - - - - 1.0 - 1.0 - - - - 1.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - px - - - - - - - - - - - px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - px - - - - - - - - - - - px - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - middle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: imagemaps not supported - on scaled images - - - - 0 - - - - - - - - - - - - - - - - - - - - middle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - height: - - px - - - - - - - - - - - -
    - - - - - background-color: - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - calspair - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - , - - , - - - - - - - - - - - - Warning: only calspair or - otherunits='imagemap' supported - in imageobjectco - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - middle - - - - - - - - - - - - - - - - - -
    - - - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - Cannot insert - . Check use.extensions and textinsert.extension parameters. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No insertfile extension available. - - - - - - - Cannot insert - . Check use.extensions and textinsert.extension parameters. - - - - - - - - -
    - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/highlight.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/highlight.xsl deleted file mode 100644 index eabb63ec904d81e286e1959670230980ecafd70d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/highlight.xsl +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/html-rtf.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/html-rtf.xsl deleted file mode 100644 index e079a738a03a7e3e2f5c4085193ed406e1566adb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/html-rtf.xsl +++ /dev/null @@ -1,321 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    - - - - - - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - -
    - -
    - - - - - - - - - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/html.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/html.xsl deleted file mode 100644 index b4159a57f8756e205123bab6b85fd95bdddf4611..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/html.xsl +++ /dev/null @@ -1,600 +0,0 @@ - - - - - - - - - - - - left - right - left - - - - - - right - left - right - - - - - - ltr - rtl - ltr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - # - - - - - - - - - - - - - - - - - - - bullet - - - - - - - - - bullet - - - © - - - ® - (SM) -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID recommended on - - - : - - - - ... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: no root element for CSS source file' - - '. - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: missing CSS input filename. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/htmltbl.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/htmltbl.xsl deleted file mode 100644 index e24d3d2caf173ec74917b34798c04f8cc211670e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/htmltbl.xsl +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - float: - - left - right - - - - - - - - - - - - - none - none - - ; - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html deleted file mode 100644 index 54c5a70f2122656c478675b5c7d7dd09ecd12231..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml - - -

    Index of /release/xsl-ns/1.76.1/xhtml

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] maketoc.xsl 01-Nov-2010 20:31 3.0K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] admon.xsl 01-Nov-2010 20:31 4.6K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] graphics.xsl 01-Nov-2010 20:31 55K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=D;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=D;O=A deleted file mode 100644 index aa40a3c03afe199a64477c120b36c10245c08782..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=D;O=A +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml - - -

    Index of /release/xsl-ns/1.76.1/xhtml

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] admon.xsl 01-Nov-2010 20:31 4.6K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] graphics.xsl 01-Nov-2010 20:31 55K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] maketoc.xsl 01-Nov-2010 20:31 3.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=D;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=D;O=D deleted file mode 100644 index 7bd3d8811d7ef5be42f6089accb06d82e0ddf703..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=D;O=D +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml - - -

    Index of /release/xsl-ns/1.76.1/xhtml

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] maketoc.xsl 01-Nov-2010 20:31 3.0K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] graphics.xsl 01-Nov-2010 20:31 55K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] admon.xsl 01-Nov-2010 20:31 4.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=M;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=M;O=A deleted file mode 100644 index fc1b39f34af82a608b651fe1079b2f8537a0f63d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=M;O=A +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml - - -

    Index of /release/xsl-ns/1.76.1/xhtml

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] admon.xsl 01-Nov-2010 20:31 4.6K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] graphics.xsl 01-Nov-2010 20:31 55K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] maketoc.xsl 01-Nov-2010 20:31 3.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=M;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=M;O=D deleted file mode 100644 index 1a219d42cf7c1302e426a0cb67ef556522528d8c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=M;O=D +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml - - -

    Index of /release/xsl-ns/1.76.1/xhtml

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] maketoc.xsl 01-Nov-2010 20:31 3.0K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] graphics.xsl 01-Nov-2010 20:31 55K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] admon.xsl 01-Nov-2010 20:31 4.6K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=N;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=N;O=A deleted file mode 100644 index ca72e149e0f5b095ecf8777d0f31334b12980c6f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=N;O=A +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml - - -

    Index of /release/xsl-ns/1.76.1/xhtml

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] admon.xsl 01-Nov-2010 20:31 4.6K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] graphics.xsl 01-Nov-2010 20:31 55K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] maketoc.xsl 01-Nov-2010 20:31 3.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=N;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=N;O=D deleted file mode 100644 index 7bd3d8811d7ef5be42f6089accb06d82e0ddf703..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=N;O=D +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml - - -

    Index of /release/xsl-ns/1.76.1/xhtml

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] maketoc.xsl 01-Nov-2010 20:31 3.0K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] graphics.xsl 01-Nov-2010 20:31 55K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] admon.xsl 01-Nov-2010 20:31 4.6K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=S;O=A b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=S;O=A deleted file mode 100644 index 54c5a70f2122656c478675b5c7d7dd09ecd12231..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=S;O=A +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml - - -

    Index of /release/xsl-ns/1.76.1/xhtml

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] maketoc.xsl 01-Nov-2010 20:31 3.0K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] admon.xsl 01-Nov-2010 20:31 4.6K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] graphics.xsl 01-Nov-2010 20:31 55K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=S;O=D b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=S;O=D deleted file mode 100644 index 4da6a4792652211437cf45a3648773740080dd55..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.html?C=S;O=D +++ /dev/null @@ -1,70 +0,0 @@ - - - - Index of /release/xsl-ns/1.76.1/xhtml - - -

    Index of /release/xsl-ns/1.76.1/xhtml

    -
    Icon  Name                    Last modified      Size  Description
    [DIR] Parent Directory - -[TXT] titlepage.templates.xsl 01-Nov-2010 20:31 175K -[TXT] autoidx.xsl 01-Nov-2010 20:31 141K -[TXT] chunk-common.xsl 01-Nov-2010 20:31 80K -[TXT] biblio-iso690.xsl 01-Nov-2010 20:31 56K -[TXT] graphics.xsl 01-Nov-2010 20:31 55K -[TXT] pi.xsl 01-Nov-2010 20:31 52K -[TXT] inline.xsl 01-Nov-2010 20:31 48K -[TXT] xref.xsl 01-Nov-2010 20:31 47K -[TXT] synop.xsl 01-Nov-2010 20:31 47K -[TXT] table.xsl 01-Nov-2010 20:31 43K -[TXT] biblio.xsl 01-Nov-2010 20:31 39K -[TXT] lists.xsl 01-Nov-2010 20:31 37K -[TXT] glossary.xsl 01-Nov-2010 20:31 35K -[TXT] titlepage.xsl 01-Nov-2010 20:31 34K -[TXT] autotoc.xsl 01-Nov-2010 20:31 26K -[TXT] chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] profile-chunk-code.xsl 01-Nov-2010 20:31 23K -[TXT] sections.xsl 01-Nov-2010 20:31 22K -[TXT] html.xsl 01-Nov-2010 20:31 21K -[TXT] param.xsl 01-Nov-2010 20:31 19K -[TXT] chunktoc.xsl 01-Nov-2010 20:31 19K -[TXT] chunker.xsl 01-Nov-2010 20:31 17K -[TXT] docbook.xsl 01-Nov-2010 20:31 17K -[TXT] profile-docbook.xsl 01-Nov-2010 20:31 17K -[TXT] block.xsl 01-Nov-2010 20:31 16K -[TXT] qandaset.xsl 01-Nov-2010 20:31 15K -[TXT] component.xsl 01-Nov-2010 20:31 15K -[TXT] formal.xsl 01-Nov-2010 20:31 14K -[TXT] verbatim.xsl 01-Nov-2010 20:31 14K -[TXT] toc.xsl 01-Nov-2010 20:31 13K -[TXT] html-rtf.xsl 01-Nov-2010 20:31 11K -[TXT] footnote.xsl 01-Nov-2010 20:31 11K -[TXT] ebnf.xsl 01-Nov-2010 20:31 10K -[TXT] index.xsl 01-Nov-2010 20:31 10K -[TXT] refentry.xsl 01-Nov-2010 20:31 9.3K -[TXT] math.xsl 01-Nov-2010 20:31 9.0K -[TXT] autoidx-kimber.xsl 01-Nov-2010 20:31 7.2K -[TXT] oldchunker.xsl 01-Nov-2010 20:31 7.2K -[TXT] callout.xsl 01-Nov-2010 20:31 7.1K -[TXT] division.xsl 01-Nov-2010 20:31 7.1K -[TXT] annotations.xsl 01-Nov-2010 20:31 5.6K -[TXT] autoidx-kosek.xsl 01-Nov-2010 20:31 5.4K -[TXT] htmltbl.xsl 01-Nov-2010 20:31 4.8K -[TXT] admon.xsl 01-Nov-2010 20:31 4.6K -[TXT] changebars.xsl 01-Nov-2010 20:31 4.2K -[TXT] chunk-changebars.xsl 01-Nov-2010 20:31 4.0K -[TXT] highlight.xsl 01-Nov-2010 20:31 3.2K -[TXT] maketoc.xsl 01-Nov-2010 20:31 3.0K -[TXT] chunkfast.xsl 01-Nov-2010 20:31 2.9K -[TXT] task.xsl 01-Nov-2010 20:31 2.5K -[TXT] profile-chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] chunk.xsl 01-Nov-2010 20:31 2.5K -[TXT] info.xsl 01-Nov-2010 20:31 1.7K -[TXT] docbook.css.xml 01-Nov-2010 20:31 1.6K -[TXT] profile-onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] onechunk.xsl 01-Nov-2010 20:31 1.6K -[TXT] keywords.xsl 01-Nov-2010 20:31 1.4K -[TXT] manifest.xsl 01-Nov-2010 20:31 1.1K -[TXT] autoidx-ng.xsl 01-Nov-2010 20:31 1.0K -
    -
    Apache/2.2.3 (CentOS) Server at docbook.sourceforge.net Port 80
    - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.xsl deleted file mode 100644 index 98f096251a1bfc597635a83e3ed811333b475d98..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/index.xsl +++ /dev/null @@ -1,266 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    -
    -
    - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - -
    - - - - - - - - - -
    - -
    -
    -
    - - -

    - - -

    -
    - - - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    - - - -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    -
    -
    - - -
    - ( - - - - - - ) -
    -
    - - -
    - ( - - - - - - ) -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/info.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/info.xsl deleted file mode 100644 index 64cbe806423e95e03349e89fbf8ed4beaf99d700..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/info.xsl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/inline.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/inline.xsl deleted file mode 100644 index e8b59b9dddcff71eaef92e117322bfad588dac5e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/inline.xsl +++ /dev/null @@ -1,1452 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - _blank - _top - - - - - - - - - - - - - - 1 - 0 - - - - - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XLink to nonexistent id: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - span - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - , - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - abbr - - - - - - acronym - - - - - - - - - - - - - - - - - - - - - - - - - - http://example.com/cgi-bin/man.cgi? - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SM - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: glossary.collection specified, but there are - - automatic glossaries - - - - - - - - - - - - - - - - - - - - - - - - There's no entry for - - in - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Error: no glossentry for glossterm: - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element - - - - - - - - - - - - - - - - </ - - > - - - & - - ; - - - &# - - ; - - - % - - ; - - - <? - - > - - - <? - - ?> - - - < - - > - - - < - - /> - - - <!-- - - --> - - - - - - - - - - - - - - - - - - - - - - < - - - - - mailto: - - - - - - > - - - - - - - - - - - + - - - - - - - - + - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - - - - - - - - - - - - - - - - - - ] - - - [ - - ] - - - - - - - - - - - - - [ - - - - - - - - - - - - ] - - - [ - - ] - - - - - - - - - - - - -

    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/keywords.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/keywords.xsl deleted file mode 100644 index c79e1a85e297ce81b411aee17e8e28fae1f00e98..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/keywords.xsl +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - , - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/lists.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/lists.xsl deleted file mode 100644 index e55735ceb5ef3f5d32885f9856b7ae5221c51b0f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/lists.xsl +++ /dev/null @@ -1,1123 +0,0 @@ - - - - - - - - - - -
    - - - - - - - - - -
      - - - - - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - circle - disc - square - - - - - - -
  • - - - - list-style-type: - - - - - - - - - - - -
    - -
    -
    - - - -
    -
  • -
    - - - - - - - - - - - - - 1 - a - i - A - I - - - - Unexpected numeration: - - - - - - - -
    - - - - - - - - - - - - - - - - - - -
    -
    - -
      - - - - - - - - - - - - - - - - - -
    -
    -
    -
    -
    - - - - - - -
  • - - - - - - - - - - - - - - -
    - -
    -
    - - - -
    -
  • -
    - - - - - - - - - - - - - -
    - -
    -
    - - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - - - - - - - - - - - - -

    -
    -
    -
    - - -
    - - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - - - - -
    - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    -
    -
    - - - - - - - - - -
    - -
    -
    - - - -
    -
    - - - - - - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - - - 1 - - - -
    -
    - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - - 1 - - - - - - - - -   - - - - - - - - - - - - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 1 - 1 - - 1 - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - before - - - - - - - - - -
    - - - - - 0 - 1 - - - - - - - - - - - - -
      - - -
    -
    - -
      - - - - - -
    -
    -
    - - - - -
    -
    - - - - - - - - - - - - -
      - - -
    -
    - - -
  • - - - -
  • -
    - - - -
      - - -
    -
    - - -

    - - - - -

    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    -
    - - -
    - - - - - - - -
    -
    - - - - - - - - - -
    - - - -
    -
    - - - - - - - - -
    - - - - - : - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    -
    - -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - -

    - - - - -

    - - - - - -
    - -
    - - - - -
    -
    -
    -
    -
    - - - - - - - - - -

    - - - - - - - - - - - - - - - -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ??? - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/maketoc.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/maketoc.xsl deleted file mode 100644 index f4a41d475f680aea18478d2bfb845ec069ef0731..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/maketoc.xsl +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - filename=" - - " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/manifest.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/manifest.xsl deleted file mode 100644 index 5d87691d4196d5883a51205beb3969a237e8a69f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/manifest.xsl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/math.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/math.xsl deleted file mode 100644 index 2f7ec335739de82f3032acd77fae7f451adf7e6d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/math.xsl +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unsupported TeX math notation: - - - - - - - - - - - - - \nopagenumbers - - - - - \bye - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - - $ - - - - $ - - - \vfill\eject - - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - - $$ - - - - $$ - - - \vfill\eject - - - - - - - - - - \documentclass{article} - - \pagestyle{empty} - - \begin{document} - - - - - \end{document} - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - - $ - - - - $ - - - \newpage - - - - - - - - - - - - - - - - - - - - - - - - - \special{dvi2bitmap outputfile - - } - - - $$ - - - - $$ - - - \newpage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 1 - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/oldchunker.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/oldchunker.xsl deleted file mode 100644 index 36c7d72bc70cea8b5db9d43caacafb3d7f984c77..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/oldchunker.xsl +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - -Encoding used in generated HTML pages - -This encoding is used in files generated by chunking stylesheet. Currently -only Saxon is able to change output encoding. - - - - - - - - - -Saxon character representation used in generated HTML pages - -This character representation is used in files generated by chunking stylesheet. If -you want to suppress entity references for characters with direct representation -in default.encoding, set this parameter to value native. - - - - - - - - - - - - - - - - - - - - - - - - Chunking isn't supported with - - - - - - - - - - - - - - - Writing - - - for - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Can't make chunks with - - 's processor. - - - - - - - - - - - - - - - - Writing - - - for - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Can't make chunks with - - 's processor. - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/onechunk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/onechunk.xsl deleted file mode 100644 index c036af5f284457d7b1df4a1029e1e781df47beee..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/onechunk.xsl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - -1 - - - - # - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/param.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/param.xsl deleted file mode 100644 index cfa9d3ee83ea944cd475f7e9deeb61e76b3f4193..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/param.xsl +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - - - - -.png - -images/ - - - - - - -/* ====================================================================== - Annotations -*/ - -div.annotation-list { visibility: hidden; - } - -div.annotation-nocss { position: absolute; - visibility: hidden; - } - -div.annotation-popup { position: absolute; - z-index: 4; - visibility: hidden; - padding: 0px; - margin: 2px; - border-style: solid; - border-width: 1px; - width: 200px; - background-color: white; - } - -div.annotation-title { padding: 1px; - font-weight: bold; - border-bottom-style: solid; - border-bottom-width: 1px; - color: white; - background-color: black; - } - -div.annotation-body { padding: 2px; - } - -div.annotation-body p { margin-top: 0px; - padding-top: 0px; - } - -div.annotation-close { position: absolute; - top: 2px; - right: 2px; - } - - -http://docbook.sourceforge.net/release/images/annot-close.png -http://docbook.sourceforge.net/release/images/annot-open.png - - -http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js - - -A - - -. - -. -http://docbook.sourceforge.net/release/bibliography/bibliography.xml - - -normal - - -60 -.png - - -15 - -images/callouts/ - - -10 -10102 - - - - - - - - - - - -no - -1 - - - - - - left - before - - - -all - - -docbook.css.xml -no -images/draft.png - -::= - - - - -#F5DCB3 - - -com.example.help -DocBook Online Help Sample -Example provider -1 - - - - - - 1 - 0 - - - - -1 - - - -figure before -example before -equation before -table before -procedure before -task before - - -kr - - - - - - - - - - -appendix toc,title -article/appendix nop -article toc,title -book toc,title,figure,table,example,equation -chapter toc,title -part toc,title -preface toc,title -qandadiv toc -qandaset toc -reference toc,title -sect1 toc -sect2 toc -sect3 toc -sect4 toc -sect5 toc -section toc -set toc,title - - - - -no - - - - - - - - - - - - - -.html - - -copyright - - - -text/css -alias.h - - - - - - - -User1 - - -User2 - - - - - - - - - -htmlhelp.chm - - -iso-8859-1 - - - - - -toc.hhc -5 - - -index.hhk -htmlhelp.hhp - -Main - -context.h - - - - - - - - - - - - - -basic - - - - - - - -no - -no -iso-8859-1 - - -en - - - - -5 - - -3 - - - - - - - HTML.manifest - - - - -+ -.gif - -images/ -1 - - -6in - - -no -fragid= - -.olink - - replace - -pubid - /cgi-bin/olink -sysid -0 - -I - -90 -10 - - - - - - - - - - - - - - - - -; - - - - - -. -number - - - - - - - - - - I -index - -. -.!?: - -8 - - - - - 0 - #E0E0E0 - - - - - - -0 - - - - - -solid -0.5pt -a - - - -solid -0.5pt - - olinkdb.xml -target.db - -tex-math-equations.tex - - - -dl -8 -2 -_top - - - - - - - - -0 -, - - - writing-mode - - - - - - - - -: - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/pi.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/pi.xsl deleted file mode 100644 index 318ac2e78db382518be831085e6e9e25470a6b8e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/pi.xsl +++ /dev/null @@ -1,1204 +0,0 @@ - - - - - - - -HTML Processing Instruction Reference - - $Id: pi.xsl 8394 2009-04-02 20:31:30Z mzjn $ - - - - Introduction - This is generated reference documentation for all - user-specifiable processing instructions (PIs) in the DocBook - XSL stylesheets for HTML output. - - You add these PIs at particular points in a document to - cause specific “exceptions” to formatting/output behavior. To - make global changes in formatting/output behavior across an - entire document, it’s better to do it by setting an - appropriate stylesheet parameter (if there is one). - - - - - - - - - Sets background color for an image - - Use the dbhtml background-color PI before or - after an image (graphic, inlinegraphic, - imagedata, or videodata element) as a - sibling to the element, to set a background color for the - image. - - - dbhtml background-color="color" - - - - background-color="color" - - An HTML color value - - - - - - Background color - - - - - - - - - - - - Sets background color on a CALS table row or table cell - - Use the dbhtml bgcolor PI as child of a CALS table row - or cell to set a background color for that table row or cell. - - - dbhtml bgcolor="color" - - - - bgcolor="color" - - An HTML color value - - - - - - Cell background color - - - - - - - - - - - - Specifies cellpadding in CALS table or qandaset output - - Use the dbhtml cellpadding PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellpadding attribute in the - output HTML table. - - - dbhtml cellpadding="number" - - - - cellpadding="number" - - Specifies the cellpadding - - - - - - html.cellpadding - - - Cell spacing and cell padding, - Q and A formatting - - - - - - - - - - - - Specifies cellspacing in CALS table or qandaset output - - Use the dbhtml cellspacing PI as a child of a - CALS table or qandaset to specify the value - for the HTML cellspacing attribute in the - output HTML table. - - - dbhtml cellspacing="number" - - - - cellspacing="number" - - Specifies the cellspacing - - - - - - html.cellspacing - - - Cell spacing and cell padding, - Q and A formatting - - - - - - - - - - - - Set value of the class attribute for a CALS table row - - Use the dbhtml class PI as a child of a - row to specify a class - attribute and value in the HTML output for that row. - - - dbhtml class="name" - - - - class="name" - - Specifies the class name - - - - - - Table styles in HTML output - - - - - - - - - - - - Specifies a directory name in which to write files - - When chunking output, use the dbhtml dir PI - as a child of a chunk source to cause the output of that - chunk to be written to the specified directory; also, use it - as a child of a mediaobject to specify a - directory into which any long-description files for that - mediaobject will be written. - - - dbhtml dir="path" - - - - dir="path" - - Specifies the pathname for the directory - - - - - - base.dir - - - dbhtml dir processing instruction - - - - - - - - - - - - Specifies a filename for a chunk - - When chunking output, use the dbhtml filename - PI as a child of a chunk source to specify a filename for - the output file for that chunk. - - - dbhtml filename="filename" - - - - filename="path" - - Specifies the filename for the file - - - - - - use.id.as.filename - - - dbhtml filenames - - - - - - - - - - - - Specifies presentation style for a funcsynopsis - - Use the dbhtml funcsynopsis-style PI as a child of - a funcsynopsis or anywhere within a funcsynopsis - to control the presentation style for output of all - funcprototype instances within that funcsynopsis. - - - dbhtml funcsynopsis-style="kr"|"ansi" - - - - funcsynopsis-style="kr" - - Displays funcprototype output in K&R style - - - funcsynopsis-style="ansi" - - Displays funcprototype output in ANSI style - - - - - - funcsynopsis.style - - - - - - - - - - - - Specifies a path to the location of an image file - - Use the dbhtml img.src.path PI before or - after an image (graphic, - inlinegraphic, imagedata, or - videodata element) as a sibling to the element, - to specify a path to the location of the image; in HTML - output, the value specified for the - img.src.path attribute is prepended to the - filename. - - - dbhtml img.src.path="path" - - - - img.src.path="path" - - Specifies the pathname to prepend to the name of the image file - - - - - - img.src.path - - - Using fileref - - - - - - - - - - - - Specifies the label width for a qandaset - - Use the dbhtml label-width PI as a child of a - qandaset to specify the width of labels. - - - dbhtml label-width="width" - - - - label-width="width" - - Specifies the label width (including units) - - - - - - Q and A formatting - - - - - - - - - - - - Specifies interval for line numbers in verbatims - - Use the dbhtml linenumbering.everyNth PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the interval at which lines are numbered. - - - dbhtml linenumbering.everyNth="N" - - - - linenumbering.everyNth="N" - - Specifies numbering interval; a number is output - before every Nth line - - - - - - linenumbering.everyNth - - - Line numbering - - - - - - - - - - - - Specifies separator text for line numbers in verbatims - - Use the dbhtml linenumbering.separator PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the separator text output between the line numbers and content. - - - dbhtml linenumbering.separator="text" - - - - linenumbering.separator="text" - - Specifies the text (zero or more characters) - - - - - - linenumbering.separator - - - Line numbering - - - - - - - - - - - - Specifies width for line numbers in verbatims - - Use the dbhtml linenumbering.width PI as a child - of a “verbatim” element – programlisting, - screen, synopsis — to specify - the width set aside for line numbers. - - - dbhtml linenumbering.width="width" - - - - linenumbering.width="width" - - Specifies the width (inluding units) - - - - - - linenumbering.width - - - Line numbering - - - - - - - - - - - - Specifies presentation style for a variablelist or - segmentedlist - - Use the dbhtml list-presentation PI as a child of - a variablelist or segmentedlist to - control the presentation style for the list (to cause it, for - example, to be displayed as a table). - - - dbhtml list-presentation="list"|"table" - - - - list-presentation="list" - - Displays the list as a list - - - list-presentation="table" - - Displays the list as a table - - - - - - - - variablelist.as.table - - - segmentedlist.as.table - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies the width of a variablelist or simplelist - - Use the dbhtml list-width PI as a child of a - variablelist or a simplelist presented - as a table, to specify the output width. - - - dbhtml list-width="width" - - - - list-width="width" - - Specifies the output width (including units) - - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies the height for a CALS table row - - Use the dbhtml row-height PI as a child of a - row to specify the height of the row. - - - dbhtml row-height="height" - - - - row-height="height" - - Specifies the row height (including units) - - - - - - Row height - - - - - - - - - - - - (obsolete) Sets the starting number on an ordered list - - This PI is obsolete. The intent of - this PI was to provide a means for setting a specific starting - number for an ordered list. Instead of this PI, set a value - for the override attribute on the first - listitem in the list; that will have the same - effect as what this PI was intended for. - - - dbhtml start="character" - - - - start="character" - - Specifies the character to use as the starting - number; use 0-9, a-z, A-Z, or lowercase or uppercase - Roman numerals - - - - - - List starting number - - - - - - - - - - - - Do not chunk any descendants of this element. - - When generating chunked HTML output, adding this PI as the child of an element that contains elements that would normally be generated on separate pages if generating chunked output causes chunking to stop at this point. No descendants of the current element will be split into new HTML pages: -<section> -<title>Configuring pencil</title> -<?dbhtml stop-chunking?> - -... - -</section> - - - - dbhtml stop-chunking - - - Chunking into multiple HTML files - - - - - - Specifies summary for CALS table, variablelist, segmentedlist, or qandaset output - - Use the dbhtml table-summary PI as a child of - a CALS table, variablelist, - segmentedlist, or qandaset to specify - the text for the HTML summary attribute - in the output HTML table. - - - dbhtml table-summary="text" - - - - table-summary="text" - - Specifies the summary text (zero or more characters) - - - - - - Variable list formatting in HTML, - Table summary text - - - - - - - - - - - - Specifies the width for a CALS table - - Use the dbhtml table-width PI as a child of a - CALS table to specify the width of the table in - output. - - - dbhtml table-width="width" - - - - table-width="width" - - Specifies the table width (including units or as a percentage) - - - - - - default.table.width - - - Table width - - - - - - - - - - - - Sets character formatting for terms in a variablelist - - Use the dbhtml term-presentation PI as a child - of a variablelist to set character formatting for - the term output of the list. - - - dbhtml term-presentation="bold"|"italic"|"bold-italic" - - - - term-presentation="bold" - - Specifies that terms are displayed in bold - - - term-presentation="italic" - - Specifies that terms are displayed in italic - - - term-presentation="bold-italic" - - Specifies that terms are displayed in bold-italic - - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies separator text among terms in a varlistentry - - Use the dbhtml term-separator PI as a child - of a variablelist to specify the separator text - among term instances. - - - dbhtml term-separator="text" - - - - term-separator="text" - - Specifies the text (zero or more characters) - - - - - - variablelist.term.separator - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies the term width for a variablelist - - Use the dbhtml term-width PI as a child of a - variablelist to specify the width for - term output. - - - dbhtml term-width="width" - - - - term-width="width" - - Specifies the term width (including units) - - - - - - Variable list formatting in HTML - - - - - - - - - - - - Specifies whether a TOC should be generated for a qandaset - - Use the dbhtml toc PI as a child of a - qandaset to specify whether a table of contents - (TOC) is generated for the qandaset. - - - dbhtml toc="0"|"1" - - - - toc="0" - - If zero, no TOC is generated - - - toc="1" - - If 1 (or any non-zero value), - a TOC is generated - - - - - - Q and A list of questions, - Q and A formatting - - - - - - - - - - - - Generates a hyperlinked list of commands - - Use the dbcmdlist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - cmdsynopsis instances; a hyperlinked navigational - “command list” will be generated at the top of output for that - element, enabling users to quickly jump - to each command synopsis. - - - dbcmdlist - - - [No parameters] - - - - - - No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep? - - -
    - - - -
    -
    - - - Generates a hyperlinked list of functions - - Use the dbfunclist PI as the child of any - element (for example, refsynopsisdiv) containing multiple - funcsynopsis instances; a hyperlinked - navigational “function list” will be generated at the top of - output for that element, enabling users to quickly - jump to to each function synopsis. - - - dbfunclist - - - [No parameters] - - - - - - No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep? - - -
    - - - -
    -
    - - - Copies an external well-formed HTML/XML file into current doc - - Use the dbhtml-include href PI anywhere in a - document to cause the contents of the file referenced by the - href pseudo-attribute to be copied/inserted “as - is” into your HTML output at the point in document order - where the PI occurs in the source. - - The referenced file may contain plain text (as long as - it is “wrapped” in an html element — see the - note below) or markup in any arbitrary vocabulary, - including HTML — but it must conform to XML - well-formedness constraints (because the feature in XSLT - 1.0 for opening external files, the - document() function, can only handle - files that meet XML well-formedness constraints). - Among other things, XML well-formedness constraints - require a document to have a single root - element. So if the content you want to - include is plain text or is markup that does - not have a single root element, - wrap the content in an - html element. The stylesheets will - strip out that surrounding html “wrapper” when - they find it, leaving just the content you want to - insert. - - - - dbhtml-include href="URI" - - - - href="URI" - - Specifies the URI for the file to include; the URI - can be, for example, a remote http: - URI, or a local filesystem file: - URI - - - - - - textinsert.extension - - - Inserting external HTML code, - External code files - - - - - - - href - - - - - - - - - - - - - - - - - - - - ERROR: dbhtml-include processing instruction - href has no content. - - - - - - - ERROR: dbhtml-include processing instruction has - missing or empty href value. - - - - - - - - Sets topic name and topic id for context-sensitive HTML Help - - Use the dbhh PI as a child of components - that should be used as targets for context-sensitive help requests. - - - dbhh topicname="name" topicid="id" - - - - topicname="name" - - Specifies a unique string constant that identifies a help topic - - - topicid="id" - - Specifies a unique integer value for the topicname string - - - - - - Context-sensitive help - - - - - - - - - - filename - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - # - - - - - - - - - - - - - - - - - - -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - -
    - - - # - - - - - - - - - - - - - - - - - - -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - / - - - - / - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-chunk-code.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-chunk-code.xsl deleted file mode 100644 index b9fcbca85450fa2e0b1d88085a0daa3789a5e21e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-chunk-code.xsl +++ /dev/null @@ -1,616 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bk - - - - - - - - - - - - - - - ar - - - - - - - - - - - - - - - pr - - - - - - - - - - - - - - - ch - - - - - - - - - - - - - - - ap - - - - - - - - - - - - - - - - - - - pt - - - - - - - - - - - - - - - - - - - rn - - - - - - - - - - - - - - - - - - - - - - - - re - - - - - - - - - - - - - - - - - - - co - - - - - - - - - - - s - - - - - - - - - - - - - - - - - - - bi - - - - - - - - - - - - - - - - - - - go - - - - - - - - - - - - - - - - - - - ix - - - - - - - - si - - - - - - - - chunk-filename-error- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-chunk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-chunk.xsl deleted file mode 100644 index 59d0c4fbe2f529ad0fb281e7a07a732896b046e1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-chunk.xsl +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-docbook.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-docbook.xsl deleted file mode 100644 index ffea03a1df433cdb9444be1834e8f6873444ccb8..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-docbook.xsl +++ /dev/null @@ -1,407 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Element - - in namespace ' - - ' encountered - - in - - - , but no template matches. - - - - < - - > - - </ - - > - - - - - - - -rtl - - - - - - - - - - - <xsl:copy-of select="$title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adding DocBook namespace to version 4 DocBook document - - - - - - - - - - - - - - - - - - ID ' - - ' not found in document. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-onechunk.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-onechunk.xsl deleted file mode 100644 index 31e7510edeb520343bd96d04cb58c8dbb4e4bc5a..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/profile-onechunk.xsl +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - -1 - - - - # - - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/qandaset.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/qandaset.xsl deleted file mode 100644 index 01062b5beb23cef38a7a71f2612268e5bd20ad37..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/qandaset.xsl +++ /dev/null @@ -1,421 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - -
    -
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - - -
    - - - -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1% - - - - - - - - -
    -
    - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/refentry.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/refentry.xsl deleted file mode 100644 index bc652b19c8b5739393476303727c1bc67b93a6b5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/refentry.xsl +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -
    - - - - -
    - - - - -
    -
    -
    -
    - - - - - - -
    -
    - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - -
    - - - - - - - - - - -

    - - - -

    -
    - -

    - - - - - - - - -

    -
    -
    - -

    - -

    -
    -
    - - - - - - , - - - - - - - - - em-dash - - - - - - - - - - - - - - - - : - - - - - - - -
    - - - - -

    - - - - - - - - - - -

    - -
    -
    - - - - - - - - - - - -
    - - - - - - - - - -
    -
    - - - - - - 0 - 1 - - - - 6 - - - - - - - - - - - - -

    - -

    -
    - - - -

    - -

    -
    - - - -

    - -

    -
    - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/sections.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/sections.xsl deleted file mode 100644 index 6947d91ab77c5efaffc2e6b0b839a24c0e7c6220..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/sections.xsl +++ /dev/null @@ -1,543 +0,0 @@ - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - 1 - 2 - 3 - 4 - 5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - - - - - - - - - - clear: both - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - 1 - - - - - - - 2 - 3 - 4 - 5 - 6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/synop.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/synop.xsl deleted file mode 100644 index 85dbc5f204b394d02955ef6b7c35c898e8f4f73b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/synop.xsl +++ /dev/null @@ -1,1515 +0,0 @@ - - - - - - - - - - - - - - -
    - -

    - - - - - - - - - - - - -

    -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - - - - ( - - ) - -   - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - -
    -    
    -    
    -  
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - - -
    - -
    -

    -
    - - - - - - ( - - - - - - - fsfunc - - - - - - - - - ) - ; - - - - ... - ) - ; - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - -
    - - - - ; -
    - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - -
    - -
     
    - -
    - -
    -
    -
     
    -
    - - - - - - ( - - - - - - - fsfunc - - - - - - - - - - ) - ; - -   - - - - - ... - ) - ; - -   - - - - - - - - , - - - ) - ; - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - ; - - - - - - - - - - - - - - - - - - - - - - - - ( - - ) - ; - - - - - - -

    - -

    -
    - - - - - - ( - - - - - - - fsfunc - - - - - - - - - void) - ; - - - - ... - ) - ; - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - -
    - -
     
    -
     
    -
    - - - - - - ( - - - - - - - fsfunc - - - - - - - - - - void) - ; - -   - - - - - ... - ) - ; - -   - - - - - - - - , - - - ) - ; - - - - - - - - - - - - - - - - - - - - - - ( - - ) - - - - -java - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unrecognized language on - - : - - - - - - - - - - - -
    -
    -
    - - - - - -
    -    
    -    
    -    
    -       extends
    -      
    -      
    -        
    -      -
    -
    - - implements - - -
    -      -
    -
    - - throws - - -  { -
    - - } -
    -
    - - - - - - - - - , - - - - - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - 0 - - , -
    - - -   - - - -
    - - - - -
    - - - - - - - - - - - - - - -    - - - - - - - - - - - - - - - ( - - - - ) - -
    -     throws  - -
    - - - - - ; -
    - -
    - - - - -
    -    
    -    
    -    
    -      : 
    -      
    -      
    -        
    -      -
    -
    - - implements - - -
    -      -
    -
    - - throws - - -  { -
    - - } -
    -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - -    - - - - - - - - - - ( - - ) - -
    -     throws  - -
    - - - - - ; -
    - -
    - - - - -
    -    
    -    interface 
    -    
    -    
    -      : 
    -      
    -      
    -        
    -      -
    -
    - - implements - - -
    -      -
    -
    - - throws - - -  { -
    - - } -
    -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - -    - - - - - - - - - - ( - - ) - -
    -     raises( - - ) -
    - - - - - ; -
    - -
    - - - - -
    -    
    -    package 
    -    
    -    ;
    -    
    - - - @ISA = ( - - ); -
    -
    - - -
    -
    - - - - - - - - , - - - - - - - - - - - - -   - - - - - - - , - - - - - - - - - - , - - - - - - - - - - , - - - - - - - - - - - -    - - - ; - - - - - - - - -   - - - - - - - -   - - - - - - - - - - - - - - - void  - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - sub - - - { ... }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/table.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/table.xsl deleted file mode 100644 index 0300678a4f1f763be97e6dcb6af536b7e11f62b6..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/table.xsl +++ /dev/null @@ -1,1169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - border- - - : - - - - - - ; - - - - - border- - - -width: - - ; - - - - border- - - -style: - - ; - - - - border- - - -color: - - ; - - - - - - - - - - - Error: CALS tables must specify the number of columns. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 100% - - - - - - - - border-collapse: collapse; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - border-collapse: collapse; - - - - - - - - - - - - - - - - - border: none; - - - - - border-collapse: collapse; - - - - - - - 0 - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - 100% - - - - - - - - - - - - - - - - - - - - - - - - No convertLength function available. - - - - - - - - - - - - - - - - - - - - - - - - - - No adjustColumnWidths function available. - - - - - - - - - - - - - - - - - - - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: overlapped row contains content! - - - This row intentionally left blank - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - th - th - - th - - td - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - : - - - - - - - - 0: - - - - - - - - - - - - - - - 0 - - : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/task.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/task.xsl deleted file mode 100644 index bb5318325df570ac3bef2ae632e8a96c48a798b2..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/task.xsl +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - before - - - - - - - - -
    - - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/titlepage.templates.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/titlepage.templates.xsl deleted file mode 100644 index 106895c4eb987397c9a6532648dad35e9ecb4aec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/titlepage.templates.xsl +++ /dev/null @@ -1,3818 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - -
    - - -
    - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - 1 - - - -
    -
    - - - - - - - - - - 1 - - - -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    - - - -
    -
    - - -
    - -
    -
    - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/titlepage.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/titlepage.xsl deleted file mode 100644 index e8e44102d087593aa8d2f784e51cea089ca81fbb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/titlepage.xsl +++ /dev/null @@ -1,1032 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - -
    - - - - - - - - - - - -
    -
    - - - - - - - - - - - - - -
    - - - - - - - - -
    -
    - - -
    - - - - - - - - -
    -
    -
    -
    - - -
    - - -
    -
    - - - - - -
    -
    -
    - - - - - - -
    - - -

    -
    -

    - - - - - - - - - -

    - - - - - - - - - - - - - - - -
    -
    - - -
    - - -
    -
    - - -
    - - -

    Authors

    -
    - - - -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - -
    -
    -
    - - - - - - - - - -
    - - -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - -   - - -
    - -

    -
    -
    -
    -
    - - - - -

    Copyright

    -
    - -

    - - - - - - - copyright - - - - - - - - - -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - -

    - - -

    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - -

    - - - - - - -

    -
    - - - - - - - - - - -
    -
    -
    - - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - -
    - - - -
    -
    -
    - -
    - - - -
    -
    -
    -
    - - -

    -
    - - - - - -
    -
    -
    - - - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - : - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - -
    - - -
    -
    - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - 3 - 2 - - - - - - - - RevHistory - - - - -
    - - - - - - - - -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - - - - - -
    -
    -
    - - - - - -

    - - -

    -
    - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - -

    - - - - - - - - - - - - - - -

    -
    - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/toc.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/toc.xsl deleted file mode 100644 index 6ed7a10e1c70befcb7ffb3bc75cdbca864d882b9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/toc.xsl +++ /dev/null @@ -1,332 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - -
    - - -
    -
    - -
    - - - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - -
    - - -
    - - -
    -
    - -
    - - - - - - - - - -
    -
    -
    - - - - - - - - -
    - - - - - -
    -
    - - - - - - -
    -
    -
    - - - - - -
    - - -
    - -
    - -
  • - - - -
  • -
    -
    -
    - - - - -
    - - -
    -
    - -
  • - - -
  • -
    -
    -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - -
    - - -
    -
    - - -
    - - -
    -
    - - - - - - - - - - - - -
    - - -
    -
    - - - -
    -
    - - - - -
    - - - - -
    - - -
    - -
    - - - -
    -
    - - - - -
    - - -
    - -
    - - - -
    -
    - - - - - Warning: don't know what to generate for - lot that has no children. - - - - -
    - - -
    -
    - - -
    - - -
    -
    - - - - - diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/verbatim.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/verbatim.xsl deleted file mode 100644 index a846e3d7f8d4d31ac0dfa99cb1882668e51b915c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/verbatim.xsl +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - div - pre - - - - - - The shade.verbatim parameter is deprecated. - Use CSS instead, - - - for example: pre. - - { background-color: #E0E0E0; } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The shade.verbatim parameter is deprecated. - Use CSS instead, - - - for example: pre. - - { background-color: #E0E0E0; } - - - - - - - -
    -            
    -            
    -              
    -            
    -          
    -
    - -
    - -

    - - - -

    -
    -
    -
    -
    - - - -
    -            
    -            
    -          
    -
    - -
    - -

    - - - -

    -
    -
    -
    -
    -
    -
    - - - - - - - - - - -
    - -

    - - - -

    -
    -
    - - -
    - -

    - - - -

    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unexpected verbatim environment: - - - - - - - - - - 1 - - - - - - - - - - - - - No numberLines function available. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    diff --git a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/xref.xsl b/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/xref.xsl deleted file mode 100644 index 897fecb34cc5fdbd4fcd2ca802add866e9f2ee62..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/docbook-xsl-ns-1.76.1/xhtml/xref.xsl +++ /dev/null @@ -1,1317 +0,0 @@ - - - - - - - - -http://docbook.org/xlink/role/olink - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Endterm points to nonexistent ID: - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ERROR: xref linking to - - has no generated link text. - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XRef to nonexistent id: - - - ??? - - - - - - - - - - - - - - - - Endterm points to nonexistent ID: - - - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - suppress anchor - - - - - - - - - - - removing - - - - - - - - - - - - - - - - - removing - - - - - - - - - - - - - - - - - - - - - - Don't know what gentext to create for xref to: " - - ", (" - - ") - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No bibliography entry: - - found in - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [ - - - - - - - - - ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Endterm points to nonexistent ID: - - - ??? - - - - - - - - - - - - - Link element has no content and no Endterm. - Nothing to show in the link to - - - ??? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Olink debug: root element of target.database ' - - ' is ' - - '. - - - - - - - - - - - - - - - Error: unresolved olink: - targetdoc/targetptr = ' - - / - - '. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Warning: olink linkmode pointer is wrong. - - - - # - - - - - - - - - - - - - ? - - - - - & - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/fop-0.95/KEYS b/jonas_doc/core/tools/fop-0.95/KEYS deleted file mode 100644 index c11ca63c310106f8e502de61c129a450b44edb5f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/KEYS +++ /dev/null @@ -1,191 +0,0 @@ -This file contains the PGP keys of various developers. -Please don't use them for email unless you have to. Their main -purpose is code signing. - -Users: - pgp < KEYS - (gpg --import < KEYS) -Developers: - pgp -kxa and append it to this file. - (pgpk -ll && pgpk -xa ) >> this file. - (gpg --list-sigs - && gpg --armor --export ) >> this file. - -pub 1024D/8408F755 2003-01-20 Christian Geisert -sub 1024g/41D98B12 2003-01-20 -pub 1024D/7C611584 2005-07-19 Jeremias Märki -sub 2048g/C0F1AD34 2005-07-19 -pub 1024D/5F298824 2006-09-30 Simon Pepping -sub 2048g/40F32100 2006-09-30 -pub 1024D/4358C584 2006-12-08 Vincent Hennebert -sub 2048g/0BD6AC9B 2006-12-08 -pub 1024D/CC31AE97 2008-03-27 [expires: 2011-01-01] -uid Maximilian Berger - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.6 (GNU/Linux) -Comment: Weitere Infos: siehe http://www.gnupg.org - -mQGiBD4rT6kRBADPozVPJAOKLqcgtnGFHj0Qav5OBPqjTprJji0BgxPrcZLZQFUO -0AmeJpzwgE0vDISx+DgGOKPcqeCLnSqtoR3rYc5Tf57FPlZ/E2/fzMwC0soYzJ6e -E9uSsXBIPeeRHcrxyCYJx69g2D/zS2vGnAIr0LYLXhadvChK1zngU0pFswCg5z0a -TjCH+9VWzerOLaEQYqVyGgMD/i456FFD2lWes8amcN+wpBLSpxysyrbu1FOZ3sVi -MjYsODDeLKRB1Cxn6UMx7WE+Av+UhtoJkoTsvcGBtkj+rFfEav2WmCsYDvLwbqpE -P5Pun7qgXbznbzCqdNUavXM0goBQtyFhtGkJSoOVXM6H5raO3THEPXU971gkOC9+ -agZDA/0WdV3VumDwi9DvII58Fv8K5HKxkZrLeUWAYJzgzeroYgfvuNKr/SrAFuyR -W8XxDMPMAMvO1qKUU1Zjffx6RUjeiptmF4ozLvU3I/Pr6atWJL8SPH6rrk6xDpZ5 -Ev/we0MmRU5kk9Y8KGavAsOjbMbTv77DL2AZ8qapUQYqfuuiR7QlQ2hyaXN0aWFu -IEdlaXNlcnQgPGNocmlzZ0BhcGFjaGUub3JnPohXBBMRAgAXBQI+K0+pBQsHCgME -AxUDAgMWAgECF4AACgkQc84u+4QI91W/OwCffMPR+FpADYlte9AabXRuzomhdh4A -oNvl89kJdg43/nMw5CErpMvMFNjVuQENBD4rT6sQBACr7d7g+yOPuYaFeS9+wXlO -vz3gVWZNUOPalrJwWPQ2yXxCzEd4chpBDUsq7TusEe/RCSUuSQYe0FAET2der4Uj -6TJPB7SuJos3hrqsUQOluoEHS8bCPD7mpXIjd1+tQu57jxgcW4/VnEn3/c57blgY -V2/rpAUE8nDRPB1Z8oveJwAECwQAp0zOTs1ehN4MFzy/3T1xO8HVN7LiaZSc4mEs -oyIcEcD3iwxJqsVPmJLOfP8fhuqyv4QfG+7gdNBZqji5WTUK2o1vYgnEbvsnGDst -Lx9kwaWCalGMXdbuEzXoheX2JJCeP8YkPQw/r9rCeP0jLXExU3B6RJkDXBrZB7L3 -Jdj2mxKIRgQYEQIABgUCPitPqwAKCRBzzi77hAj3VeUxAKCJXCs0vrCcfMSO/2M/ -Eq/rMruVPwCg34SJtFP5wtlgHa7kdhBLKoenD7g= -=+cef ------END PGP PUBLIC KEY BLOCK----- - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.2 (MingW32) - -mQGiBELdQqsRBACPvRuWTsO4Sv95wSFzaMJcSJs81b9lpAT4BKsi3K/1y7pcxTJW -IKP5Khc6cOom3nnRDofEh1KcLnvx+X+A+WF5YF7c1qd4EG3tWgjzqnkT9NUsw6t/ -3yAHL9iHr5nB7aZuiDdXgsLL5F2wNjuiSrTEDVM1wSm+QLuqqJ2lSJOcCwCg97BA -yyX59XauxdQNfF00pfYIW3UD/R2TzMD5YxHbCO2Ib3j5O2cJU+G56q1krLwFKSzq -XsiKOh2+8Bvwj2bBlQ6uYMwZc08WOgtiG3uRMDsdPE3JIoDogIguuADzO1LFFoi5 -mAEizqCN+8OSZ6luVeznUKCObF+yJvqJyG9RoDgv+v8KdqVz5NZ2BdtcY7LxHGKI -6k/LA/9WH1p8N10GETyagzNtU1tDMZGk8zB5C1qE9hgMDr5iRKrFuGnwBzMseKOj -nQ4tPW47hWYeXLaou6JPTRhGP0wITnOoYmcP5ymgOPZJZwARfC3qXznrdOAmL8D2 -x+W7DP7ZtKPCYDa0norSEq3VPSUWjAjAPvskgiN6u6Y5/0J487QlSmVyZW1pYXMg -TcOkcmtpIDxqZXJlbWlhc0BtYWVya2kub3JnPoheBBMRAgAeBQJC3VVHAhsjBgsJ -CAcDAgMVAgMDFgIBAh4BAheAAAoJEPcwlXB8YRWECjoAnA90rdo+Ob3k1BOMz5cK -PaQZtuuiAKCHOPtp1foBDjGPBA0FR9MtSCmMLYhGBBIRAgAGBQJC31YgAAoJEKIR -WuFfa4tyKSsAnj6YCONElnEDA5vaa1lJES4UcVAeAJ9JG4bXlEPUqyBPhOtvetVS -OWtNGIhGBBMRAgAGBQJC7u6uAAoJEME58VMjy3oqElwAnijYebpmsWIw86ilU2Zf -epTWKSt1AJ0cMQZmjm/WrGI68rCRcEL7X2wTOYhGBBMRAgAGBQJDK/iDAAoJEDf2 -j/UBWvyKp3YAniyZxx/ee9g7asY2AR87yAVWPRjQAJ0U4l3dC/8ugLmyE7RbkFqL -iALoRLQpSmVyZW1pYXMgTcOkcmtpIDxpbmZvQGplcmVtaWFzLW1hZXJraS5jaD6I -XgQTEQIAHgUCQt1VXQIbIwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRD3MJVwfGEV -hNNHAKDkYf0faxpqpmnwtFNeFETmTqd7HACeK0jaTfp7b/VhTlFmF+cSkrO4lK2I -RgQSEQIABgUCQt9WIAAKCRCiEVrhX2uLcpUWAKClQPvTzFXFlDk/nDBa0wxesi4n -qwCfWiXArQAoIm/hG9zpK+h2zHwlYg6IRgQTEQIABgUCQu7urgAKCRDBOfFTI8t6 -KpDiAKCCPK5ixmDxrKvvIKnx7hofZ0LiAQCfV6vfRmuVmfWo2LMMaa9xw5WBtUKI -RgQTEQIABgUCQyv4gwAKCRA39o/1AVr8iqV2AJ9sBMWQ6YjZHIfBp+aoo84EI/Kg -6wCfRDkrpQhjpeSM4DPaRiKgL1LQrVm0JUplcmVtaWFzIE3DpHJraSA8amVyZW1p -YXNAYXBhY2hlLm9yZz6IXgQTEQIAHgUCQt1VgwIbIwYLCQgHAwIDFQIDAxYCAQIe -AQIXgAAKCRD3MJVwfGEVhAjAAKDme5j7fzFk365pOZm1lJyEHMJuPACgspAO3iPV -7G659xb8l8IQQIZn18CIRgQSEQIABgUCQt9WGAAKCRCiEVrhX2uLcirOAKCwgb9x -2zr8Q3j7KnD9XSgqrwv33ACgzcUOgabzbXlJWEOiW4d2LIK4zjyIRgQTEQIABgUC -Qu7uqQAKCRDBOfFTI8t6KuNXAJ40TlT/Goa/tV/5zL+ZH6OdWjTImACghZxdWnD+ -CLZORMpBFYUlUKffSlWIRgQTEQIABgUCQyv4bAAKCRA39o/1AVr8iv1/AKCX8NY8 -nffFDHsck7SMPWdb8toSvwCfd0Yf8OOYq3/O8JidWNpnNTAZabqIYQQTEQIAIQIb -IwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUCQt1VmwIZAQAKCRD3MJVwfGEVhOZyAJ9G -J6pU0t9yrsVkuHcAkhF1YG6RDgCdFOb6NohfGeBbOraUGdQvKwJ3J0W5Ag0EQt1C -vhAIAIhBOvTiliy95oxWLplZzCiXq6Dm3lYUOhDxmioKavI6KH2FzdnrHHvz91ES -f7tGUNizHQyv4+zSAv8B8JmKiQ7Tk6DL5yJjZ6otwyOuR0ZIviXZwYirT8lOO4wP -m3oV1V6Uf1oIwZQ2Y1fTFO4+8UPlTT0IUNMxuIIbvkRSMup6FIFGDoJQ/IYtBB4G -4mo6DMilyNzDiaqJ5k+iSY/GcCIzdWUd7ryr7344DffnJHg0CDynR/gpISWWj0sf -YCnjZJANrVGV7O5WnKsVKqzTIRfJKSGBoB1ekvQ8AtGq1X8DfGgKubjlzGjCNbeW -YiKNEa/M4DOAwhFzvftGueuzujMAAwUH/1+A8nfA3YgoG8wGPifhXBrB5aUx5I12 -1akJvK4KQaIFE3dDRRYtwQHp0EyKB85z3lTlmdOupE5oKHd3ZYeeaQSUnt5i+dtz -Xxz3RLBB6NYlcYJJyqSb31rTAMoq1iultLYbH+ugK/kUPTIOslvUJ/q4J22NJ/wS -aIEqBlz/RczCAniNooQ/2ie733MpJ6NfROGIiOrNsRlQw+7P9TOmB3FxKLtzIunD -F/Oo/4vznSoaVSUtVFMCKM2tLLbVV2LWBm9ztakfOXwmV0aoveAZ6a0J5+9RbC82 -HJW5Sez4fLZxK7tENCQoscjkjM/xfsDz5mz/8JF4T0tLehUjKrLBlsaIRgQYEQIA -BgUCQt1CvgAKCRD3MJVwfGEVhD0+AJwLiZ/2jUDCKVngO+lqNscX8TQ0LQCeM4DI -UKHCLjnj2UtX8OfockTGIic= -=1nMU ------END PGP PUBLIC KEY BLOCK----- - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.5 (GNU/Linux) - -mQGiBEUeNZ4RBADSETFxXTVUP98ydSQKh6gEkS59JPaCAkeNbMeM5VBK6RcVvjtK -zxadtIfcaFx++OCkABCdWnlIIVhjYMMYVV9h3DRFVwYEp1LZb9ktU+PxIw9kI75+ -eNMsxCpvYBvw9nFyHFPAdtnQPNpMSG7SeCNOHtSuErACuxOuo9JpwIWNwwCg469m -S/sca2kkmYuKqrWXD2cfZdED/3awMvn3cThlTsT0zqtQjuGBJjH9bJwiRdvNpU0M -cxw7xC1HGtfBYVQd9XastVj1xToDq7gCY5+qoHXLgv5BqLwecadtjuKEF4FXAmtN -1qmz9sAVlYsnA4azCADyLv0A440Azbzg9ruEBAf1U6JL6BtpKuLQ3RSCrYicO3Vu -fHJWA/0crJgn3GTDtFegMTDtlLvBcRXbsKBVAddbew9WOVfcTo1x7r71iziJZtgj -o88pNLHy6IXWvZr+VvB4c0V5U0K7eB9B956G3/t+1G8lDfuzVBqkSqAQXv7XmIWB -r4FIBMW20uNl8LO3461u+lDpIIXHZrucPmpHxrcFrzVTxknWqLQmU2ltb24gUGVw -cGluZyA8c3BlcHBpbmdAbGV2ZXJrcnVpZC5ldT6IaQQTEQIAKQIbAwUJCWYBgAYL -CQgHAwIEFQIIAwQWAgMBAh4BAheABQJFHkuQAhkBAAoJED4qb8JfKYgkvcAAnjXG -Sg3CFkDVdHQNA8pURERLc0dkAKCx583xMH1Mj6Bicvu2Y6YBKBl03ohMBBMRAgAM -BQJFIm1bBYMJYcnDAAoJEPcwlXB8YRWE5ykAoJHj4TgPp7PrHQBmvcU+6iUN9Iba -AJ9yP6eQoewU5K6z3fgH533MeNJZn4hmBBMRAgAmBQJFHjWeAhsDBQkJZgGABgsJ -CAcDAgQVAggDBBYCAwECHgECF4AACgkQPipvwl8piCSi+wCfbyubA0KeYeq81I21 -8k8EZBeh8hAAn0jfjHGnPRjLkTMntXKn5ecBMHl+uQINBEUeNakQCACIXvG/0SxJ -yuE/XGy+EKGwAVdjbJ0zz9gyRTrOWChsc/uzI6bVUrxlQGwaEqsbCI70qL5Wk7Cn -F1xlCutfMa28YXSJtlPzjvcAAPDJO0kmXWJ0MYYD3rod7fqjbipW2T5XQ4UZ+/n3 -KDnV2PohsBnmnGOXa30nC8+gC4mobzboIh8mBXqmZOcGW22L/5iSWW+QUxHjnClO -Cc1NFWwqLouyhphAUjPh+M+LssdMwoJk8+LXD8IuridHzlMbU4Wkf+u2KWJk7BL3 -/XXl9y1ISfDAZJ9vzfs6ilGmKmaUvmMySoxquujZrdta+x42GZ14zdwrIGULRLZ0 -Cv/sVcsG83aTAAMFB/4moH/XSyPQO+aWzIHcPrfeZzQzo0QL30MKSKZJqoJAJara -1dZ7LlLIvCCd1vWR+UCJPy6FmeICAyeGbTph84n7q79Bbb76ezHqDOfzKJrutMGX -yHmZaMsvUX8phwsq/wPFRP2shGUJ6aO+h4soY7JnCECL5IivIMxpy6UD3IXMDUzN -womdlnPXtsJSbadf6+tLsy5r95uYjJrNuNRTn5sZ9AZ7FXxcxDhtLkeX0FF7mpxQ -Gu2hj8RrYnBottpiZGIVjkS6yqA2J53HKafHDd7ITSmVS2KxgIiz7TNqfNyPN9AV -ea0xE+aAjPePGbTcZF51j2QIiGEmhVPmGqc3r0qQiE8EGBECAA8FAkUeNakCGwwF -CQlmAYAACgkQPipvwl8piCQmlgCgmxawADNcQDnWuFpJ/jaHRdhDKLAAnjhAoZ/D -nruGzxj+A7iyYEB9I6Uk -=NbVl ------END PGP PUBLIC KEY BLOCK----- - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -mQGiBEV5mbgRBACBd9xGOGzs8ah/N11zlDi8woJUh02EgztXdMfij4F3u12DkneC -OIwGH14fWHdkhKjwYMi5LQfvBsnd3P5v5PTBxYati7ZQDDjvYsAJiMXbyUdszdyQ -ig/UuNMwdB5YBrdtklzZcOuiNt/yeoocURQRwkwklsVBIYWwovcdXLTRWwCglPVQ -0NrC7VPRPTgK0Y1wxOgwzj0D/RpwFEAcl1SJHoOwhwKykNzA05YABaxXhksKi2qQ -C8M4mUofqweU3ocU0tBqQAR351n7hQWAaIs6ScOQtcKPJj9SV8SQgqxwj7WfHscj -9X3lkP6cxstW+W8SblTgrKwl7JLLkja1u1cNUeD0QzWImuRBpOjh4s97ZFwSHRoH -hCLgA/4/GDXbOhC4Wi9i8HHQNhEA6l86ZBteGq5u4SW57cK69mnOGj8iBxenIWeU -+NuB/LqVcG/75JnDvVGImvoykCBEl9xASNOj1C4HvBwNrU7iIpvRig1wwHK8/wqU -Dhq5433rh40YbOfN0PLZDhQNhf3MysP3ipTZkVdwIKhsvl/vibQ2VmluY2VudCBI -ZW5uZWJlcnQgPHZpbmNlbnQuaGVubmViZXJ0QGFueXdhcmUtdGVjaC5jb20+iGAE -ExECACAFAkV5mgcCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCgctTQQ1jF -hH7uAJ9BFRNMuSpvSq//lEWLc6WOTMW70ACghjA0jtaMQUVjDU3RUOdGMRkqRZu0 -KVZpbmNlbnQgSGVubmViZXJ0IDx2aGVubmViZXJ0QGFwYWNoZS5vcmc+iGMEExEC -ACMCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCRXmahgIZAQAKCRCgctTQQ1jF -hLRSAJ9KgHLa9V4Q2k0NFiMpPuhfnsK9bQCeJbGjFdIgrzyIvYIUZUPQGww597+5 -Ag0ERXmZwhAIAJhskbWZaLuwdZ3aLqVimVu65bR2ve1U28dfsSVCKx0uYCl3YJkj -lF9P3BfMMPVdNRqDz4Agz/Vrn13j+p4ZQQhVhv6IGhE4p4T4RebMaZ/d30/6REls -DP3Luc9IrnJbA72jSeXt+vI3WysB/wuJJ/kb+3KtFa1NowwVVypHCiSmme0VCUaR -K6jlN0245IpR0IA4Q1VziRO7v1VufZAef64/2U2T/IthwPqDoThNj++9Zg5Tctrt -TL02Z++n2Nj9bQf9R+FhA3YhvHuf6OLAPE2emcM/0As+JwBHqcMrmybnrxEJg0Aq -4Q1k1Ka7beb35QJ7158rzL1PU1V2totLeW8AAwUH/1NJVnMD/p4op2kbJYMgKSqz -zZfypt60aWeImeJ2qZD7FAtsz6KQu2a5ZkcVmyCeuAo9Sj0IqxXyn8Z6bHuHXNe+ -aidjS+n5kc2Y+5RQ1oMGV+BzXQMPGOgh0ertbLaairT7mCljTEd4kUGxOIcfAh/q -Ie+p7Guvw6+T4K7hgfY8bAiVgzhZLWIFTQXpjU+91q6kTt4eIWjdCGdNQ/OBezGY -f5SCy0phzTmRqcu68nKaLznwUpI7SuSFSIeVemGz602KdFsLEHHbZE0KJgd6aHYu -ynK3sugKIpz/NXpT2vBsVkK6EP5xzWYOpqMGb8uQD8CT7loY81SK+rHBm7dicgiI -SQQYEQIACQUCRXmZwgIbDAAKCRCgctTQQ1jFhBc3AKCQ1X7oIVR8g7GvSGEUw6DE -HgEaUgCgkl30lcl9gGa9hqk4cuGYn1OTyks= -=XphF ------END PGP PUBLIC KEY BLOCK----- - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (OpenBSD) - -mQGiBEfrX/ARBADulGs9V7StbfK8CFfClihdh4lRpw2tktMuYiQJ/rIsNq4zghkT -UGxFU0eUC2ZVPYvwG6sXgZ5SSm6i8Ii79YdIIxUG7oNwXaY/e9rK+xX193xqmDgl -Vh5vm4LUtncHi9TZDSF+g1YU1DVHbSjTd2oQEHxbBppL0CLfaLv3U1qr2wCgxeGw -ZIwb6KD6yesRLx6vGDkDzAMEAL99p0m4sNnjZdKC25Rrt6NZ7CROXWs89/+dkewg -JCZiVEoAcdSa0z5d8+XaSzmqR8BJWM1PBPjG48eEdqOevwypd0F/U1mwZ42MvQEw -oBayUY+7/pptW7C5L3Fjk18drE0a8lIzt9VBGX5fe3GoXtZKuOzDv0hEuHyzR9q9 -JLXsA/sELFfrHf0tBfXAdE7pj/Mahalu17/GAyb0RHSvuOfoUvXSXZA91cFg8ycB -4x265NtYZk52M32wi5ePrYeSJIZ6vWRvPuWVAXDg5S6HCMjcXc6ElkgLcUt1NoPI -DmRXe4FIDZkGSYSXdLTUByu7+8fCuWQHCFG2sALdOyVlucij2LQoTWF4aW1pbGlh -biBCZXJnZXIgPG1heGJlcmdlckBhcGFjaGUub3JnPohmBBMRAgAmBQJH61/wAhsD -BQkFM4sABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ4+RAT8wxrpcs1wCeIAoI -B0MwZfWLV+wD3pt1wDkPXbsAnjuOsyZ7EeNOcpoqSteB17aPRGeLiEYEEBECAAYF -Akfrb00ACgkQByq3OugVkrx76ACgqJ8W64IhBYgBvp3dTDLS825gCQQAnjB6X5+4 -eW/0pQUpJcvolxbT9xvF -=bbQO ------END PGP PUBLIC KEY BLOCK----- - diff --git a/jonas_doc/core/tools/fop-0.95/LICENSE b/jonas_doc/core/tools/fop-0.95/LICENSE deleted file mode 100644 index d645695673349e3947e8e5ae42332d0ac3164cd7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/jonas_doc/core/tools/fop-0.95/NOTICE b/jonas_doc/core/tools/fop-0.95/NOTICE deleted file mode 100644 index 880e36f18b5cc8489841b35b1525d461ecf66605..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/NOTICE +++ /dev/null @@ -1,10 +0,0 @@ -Apache FOP -Copyright 1999-2008 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This software consists of voluntary contributions made by many individuals -on behalf of The Apache Software Foundation and was originally created by -James Tauber . - diff --git a/jonas_doc/core/tools/fop-0.95/README b/jonas_doc/core/tools/fop-0.95/README deleted file mode 100644 index 37ede8930a277e3cdb93afe9b40af9a31bdc058b..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/README +++ /dev/null @@ -1,235 +0,0 @@ -$Id$ - -============================================================================== - APACHE FOP - README -============================================================================== - -Contents of this file: - - What is FOP? - - Legal Information - - Where to get help? - - How do I build FOP? - - How do I run FOP? - - Release Notes - -============================================================================== - - -What is FOP? ---------------- - -Apache FOP is the world's first print formatter driven by XSL formatting -objects. It is a Java application that reads a formatting object tree -conforming to the XSL 1.1 Recommendation (05 December 2006) and then turns it -into a PDF document, certain other output formats or allows you to preview it -directly on screen. Some parts of the XSL 1.1 specification (work in progress!) -have also been implemented. - -Apache FOP is part of Apache's XML Graphics project. The homepage of Apache -FOP is http://xmlgraphics.apache.org/fop/. - - -Legal Information ---------------------- - -Apache FOP is published under the Apache License version 2.0. For the license -text, please see the following files: -- LICENSE -- NOTICE - -Legal information on libraries used by Apache FOP can be found in the -"lib/README.txt" file. - -Here is a list of files included in Apache FOP but not published under Apache -License version 2.0: -- sRGB IEC61966-2.1 color profile - File: src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm - Info: src/java/org/apache/fop/pdf/sRGB Color Space Profile.icm.LICENSE.txt -- K3 3 of 9 barcode font (TrueType) - File: examples/fo/advanced/K3.TTF - Info: example/fo/advanced/K3.README - - -Where to get help? ---------------------- - -http://xmlgraphics.apache.org/fop/gethelp.html - -A mailing list where you can get all your questions about FOP answered is at -fop-users@xmlgraphics.apache.org. You can subscribe by sending an empty mail -to fop-users-subscribe@xmlgraphics.apache.org. - -Before you post any questions, please have a look at the FAQ at -http://xmlgraphics.apache.org/fop/faq.html and FO help page at -http://xmlgraphics.apache.org/fop/fo.html. - -Please report bugs to bugzilla at http://issues.apache.org/bugzilla/ - - -How do I build FOP? ----------------------- - -If you've downloaded a binary distribution, you don't need to build -FOP. - -Otherwise, please follow the instructions found here: -http://xmlgraphics.apache.org/fop/stable/compiling.html - - -How do I run FOP? --------------------- - -Simply by typing "fop" on the command-line. Without any parameters you -will receive a screen with instruction on how to call FOP from the -command-line. - -For more details, see: -http://xmlgraphics.apache.org/fop/stable/running.html - -============================================================================== - RELEASE NOTES -============================================================================== - -Version 0.95 -============ - -This is a production grade release of Apache FOP. -It contains many bug fixes and new features. See below for details. - -Compliance ----------- - -This release implements the XSL 1.0 and 1.1 recommendations to a high -degree of compliance. See the compliance page -http://xmlgraphics.apache.org/fop/compliance.html for a detailed -overview. - -Known issues ------------- - -The known issues of this release are listed at -http://xmlgraphics.apache.org/fop/0.95/knownissues_overview.html. - -Major Changes in Version 0.95 ------------------------------ - -* Add new fox:external-document extension element that allows to insert whole - documents into a page-sequence (JM) -* Add support for background on fo:table-column and fo:table-header/footer/body - elements (VH) -* Add support for conditional borders in tables (VH) -* Add support for scale-down-to-fit and scale-up-to-fit (JM) -* Fix various bugs and performance problems with external graphics by - introducing a new image loading framework (JM) - -The long list of changes in this release is available at -http://xmlgraphics.apache.org/fop/0.95/changes_0.95.html. - -The long list of changes in this and earlier releases is available at -http://xmlgraphics.apache.org/fop/changes.html. - -Changes since Version 0.95beta ------------------------------- -Please refer to the list of changes on the web: -http://xmlgraphics.apache.org/fop/changes.html - - -Version 0.94 -============ - -This is the second production grade release of the new FOP codebase. -It contains many bug fixes and new features. See below for details. - -Compliance ----------- - -This release implements the XSL 1.0 and 1.1 recommendations to a high -degree of compliance. See the compliance page -http://xmlgraphics.apache.org/fop/compliance.html for a detailed -overview. - -Known issues ------------- - -The known issues of this release are listed at -http://xmlgraphics.apache.org/fop/0.94/knownissues_overview.html. - -Major Changes in Version 0.94 ------------------------------ - -* Add support for font auto-detection (JM) Thanks to Adrian Cumiskey -* Add support for the border-collapsing model in tables (VH, JM) -* Add support for named destinations in PDF (JB) -* Add support for UAX#14 type line breaking (MM) - -The long list of changes in this release is available at -http://xmlgraphics.apache.org/fop/0.94/changes_0.94.html. - -The long list of changes in this and earlier releases is available at -http://xmlgraphics.apache.org/fop/changes.html. - - -Version 0.93 -============ - -This is the first production grade release of the new FOP codebase. - -* It contains the new API first introduced in release 0.92 - beta. The preceding API has been removed. -* This release again contains many bug fixes and new features. See - below for details. - -Compliance ----------- - -This release implements the XSL 1.0 and 1.1 recommendations to a high -degree of compliance. See the compliance page -http://xmlgraphics.apache.org/fop/compliance.html for a detailed -overview. - -Known issues ------------- - -The known issues of this release are listed at -http://xmlgraphics.apache.org/fop/knownissues.html. - -Upgrading ---------- - -You may experience different behaviour compared to version -0.20.5. Please consult the "Upgrading" page -(http://xmlgraphics.apache.org/fop/stable/upgrading.html) for -details. - -Major Changes in Version 0.93 ------------------------------ - -* Added support for the use of Open Type fonts (BD) -* Support for the rgb-icc() function and for a proprietary cmyk() - function (for device CMYK colors only through the PDF renderer so - far). (JM) Thanks to Peter Coppens. Fixes 40729. -* Enabled Copy/Paste from PDF content in Acrobat Reader for - text using embedded TrueType fonts. (BD) Thanks to Adam Strzelecki, - Victor Mote. Fixes 5535. -* Added support for PDF/A-1b and PDF/X-3:2003. (Note: this may still - be a bit incomplete. Feedback is welcome!) -* The Java2DRenderer (and therefore the print and bitmap renderers) is - now offering the same quality as the PDF and PS renderers. Note: - There can still be little differences between PDF and Print/PNG/TIFF - because the latter uses a different font metrics source. -* Automatic support for all fonts available to the Java2D subsystem - for all Java2D-descendant renderers (TIFF, PNG, print, AWT). - -The long list of changes in this release is available at -http://xmlgraphics.apache.org/fop/0.93/changes_0.93.html. - -The long list of changes in this and earlier releases is available at -http://xmlgraphics.apache.org/fop/changes.html. - -The Apache FOP team asks you for your continued feedback on the -software. We're also interested in success stories with the new -release. So if the latest version works fine for you, please tell us! -And if it doesn't, you may tell us as well, of course. ;-) - -Release notes for older FOP versions can be found on: -http://xmlgraphics.apache.org/fop/relnotes.html diff --git a/jonas_doc/core/tools/fop-0.95/build/fop.jar b/jonas_doc/core/tools/fop-0.95/build/fop.jar deleted file mode 100644 index 24419bcf03f1a38b15fee78ef63ee6a06a7b7e81..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/build/fop.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/conf/fop.xconf b/jonas_doc/core/tools/fop-0.95/conf/fop.xconf deleted file mode 100644 index 39b2e99fc3e0ea977acf4fdba39e0f23be9bef2d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/conf/fop.xconf +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - . - - - 72 - - 72 - - - - - - - - - - - flate - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_doc/core/tools/fop-0.95/fop b/jonas_doc/core/tools/fop-0.95/fop deleted file mode 100755 index 3f2ac6f7deee3b722ada98285bf6bf3e604f1e43..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/fop +++ /dev/null @@ -1,254 +0,0 @@ -#! /bin/sh -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Shell script to run FOP, adapted from the Jakarta-Ant project. - -rpm_mode=true -fop_exec_args= -no_config=false -fop_exec_debug=false -show_help=false -for arg in "$@" ; do - if [ "$arg" = "--noconfig" ] ; then - no_config=true - elif [ "$arg" = "--execdebug" ] ; then - fop_exec_debug=true - elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then - show_help=true - fop_exec_args="$fop_exec_args -h" - else - if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then - show_help=true - fi - fop_exec_args="$fop_exec_args \"$arg\"" - fi -done - -# Source/default fop configuration -if $no_config ; then - rpm_mode=false -else - # load system-wide fop configuration - if [ -f "/etc/fop.conf" ] ; then - . /etc/fop.conf - fi - - # load user fop configuration - if [ -f "$HOME/.fop/fop.conf" ] ; then - . $HOME/.fop/fop.conf - fi - if [ -f "$HOME/.foprc" ] ; then - . "$HOME/.foprc" - fi - - # provide default configuration values - if [ -z "$rpm_mode" ] ; then - rpm_mode=false - fi - if [ -z "$usejikes" ] ; then - usejikes=$use_jikes_default - fi -fi - -# Setup Java environment in rpm mode -if $rpm_mode ; then - if [ -f /usr/share/java-utils/java-functions ] ; then - . /usr/share/java-utils/java-functions - set_jvm - set_javacmd - fi -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -case "`uname`" in - CYGWIN*) cygwin=true ;; - Darwin*) darwin=true - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home - fi - ;; -esac - -if [ -z "$FOP_HOME" -o ! -d "$FOP_HOME" ] ; then - ## resolve links - $0 may be a link to fop's home - PRG="$0" - progname=`basename "$0"` - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi - done - - FOP_HOME=`dirname "$PRG"` - - # make it fully qualified - FOP_HOME=`cd "$FOP_HOME" && pwd` -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$FOP_HOME" ] && - FOP_HOME=`cygpath --unix "$FOP_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -if [ "$OS" = "Windows_NT" ] ; then - pathSepChar=";" -else - pathSepChar=":" -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD=`which java 2> /dev/null ` - if [ -z "$JAVACMD" ] ; then - JAVACMD=java - fi - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." - echo " We cannot execute $JAVACMD" - exit 1 -fi - -if [ -n "$CLASSPATH" ] ; then - LOCALCLASSPATH=$CLASSPATH -fi - -# add fop.jar, fop-sandbox and fop-hyph.jar, which reside in $FOP_HOME/build -LOCALCLASSPATH=${FOP_HOME}/build/fop.jar${pathSepChar}${FOP_HOME}/build/fop-sandbox.jar${pathSepChar}${FOP_HOME}/build/fop-hyph.jar${pathSepChar}$LOCALCLASSPATH - -# add in the dependency .jar files, which reside in $FOP_HOME/lib -OLD_IFS=$IFS -IFS=" -" -DIRLIBS=${FOP_HOME}/lib/*.jar -for i in ${DIRLIBS} -do - # if the directory is empty, then it will return the input string - # this is stupid, so case for it - if [ "$i" != "${DIRLIBS}" ] ; then - if [ -z "$LOCALCLASSPATH" ] ; then - LOCALCLASSPATH=$i - else - LOCALCLASSPATH="$i"${pathSepChar}$LOCALCLASSPATH - fi - fi -done -IFS=$OLD_IFS - -# add in user-defined hyphenation JARs -if [ -n "$FOP_HYPHENATION_PATH" ] ; then - LOCALCLASSPATH=$LOCALCLASSPATH${pathSepChar}$FOP_HYPHENATION_PATH -fi - -# For Cygwin, switch paths to appropriate format before running java -# For PATHs convert to unix format first, then to windows format to ensure -# both formats are supported. Probably this will fail on directories with ; -# in the name in the path. Let's assume that paths containing ; are more -# rare than windows style paths on cygwin. -if $cygwin; then - if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then - format=mixed - else - format=windows - fi - FOP_HOME=`cygpath --$format "$FOP_HOME"` - LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"` - LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"` - if [ -n "$CLASSPATH" ] ; then - CP_TEMP=`cygpath --path --unix "$CLASSPATH"` - CLASSPATH=`cygpath --path --$format "$CP_TEMP"` - fi - CYGHOME=`cygpath --$format "$HOME"` -fi - -# Show script help if requested -if $show_help ; then - fop_exec_args="" - echo $0 '[script options] [FOP options]' - echo 'Script Options:' - echo ' --help, -h print this message and FOP help' - echo ' --noconfig suppress sourcing of /etc/fop.conf,' - echo ' $HOME/.fop/fop.conf, and $HOME/.foprc' - echo ' configuration files' - echo ' --execdebug print FOP exec line generated by this' - echo ' launch script' -fi - -# add a second backslash to variables terminated by a backslash under cygwin -if $cygwin; then - case "$FOP_HOME" in - *\\ ) - FOP_HOME="$FOP_HOME\\" - ;; - esac - case "$CYGHOME" in - *\\ ) - CYGHOME="$CYGHOME\\" - ;; - esac - case "$LOCALCLASSPATH" in - *\\ ) - LOCALCLASSPATH="$LOCALCLASSPATH\\" - ;; - esac - case "$CLASSPATH" in - *\\ ) - CLASSPATH="$CLASSPATH\\" - ;; - esac -fi - -# The default commons logger for JDK1.4 is JDK1.4Logger. -# To use a different logger, uncomment the one desired below -# LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog -# LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog -# LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger - -# Logging levels -# Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger. -# To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%/JRE/LIB/logging.properties -# file instead. -# Possible SimpleLog values: "trace", "debug", "info" (default), "warn", "error", or "fatal". -# LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO - -# Execute FOP using eval/exec to preserve spaces in paths, -# java options, and FOP args -fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args" -if $fop_exec_debug ; then - echo $fop_exec_command -fi -eval $fop_exec_command diff --git a/jonas_doc/core/tools/fop-0.95/fop.bat b/jonas_doc/core/tools/fop-0.95/fop.bat deleted file mode 100644 index 65c2aa10f0d6cbfe988426e2b9f4f9ea84e73dbb..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/fop.bat +++ /dev/null @@ -1,84 +0,0 @@ -@ECHO OFF -REM Licensed to the Apache Software Foundation (ASF) under one or more -REM contributor license agreements. See the NOTICE file distributed with -REM this work for additional information regarding copyright ownership. -REM The ASF licenses this file to You under the Apache License, Version 2.0 -REM (the "License"); you may not use this file except in compliance with -REM the License. You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. - -rem %~dp0 is the expanded pathname of the current script under NT -set LOCAL_FOP_HOME= -if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME=%~dp0 - -rem Code from Apache Ant project -rem Slurp the command line arguments. This loop allows for an unlimited number -rem of arguments (up to the command line limit, anyway). -rem Could also do a "shift" and "%*" for all params, but apparently doesn't work -rem with Win9x. -set FOP_CMD_LINE_ARGS=%1 -if ""%1""=="""" goto doneStart -shift -:setupArgs -if ""%1""=="""" goto doneStart -set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1 -shift -goto setupArgs -rem This label provides a place for the argument list loop to break out -rem and for NT handling to skip to. -:doneStart - -set LOGCHOICE= -rem The default commons logger for JDK1.4 is JDK1.4Logger. -rem To use a different logger, uncomment the one desired below -rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog -rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog -rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger - -set LOGLEVEL= -rem Logging levels -rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger. -rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties -rem file instead. -rem Possible SimpleLog values: "trace", "debug", "info" (default), "warn", "error", or "fatal". -rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO - -set LIBDIR=%LOCAL_FOP_HOME%lib - -set LOCALCLASSPATH=%LOCAL_FOP_HOME%build\fop.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LOCAL_FOP_HOME%build\fop-sandbox.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LOCAL_FOP_HOME%build\fop-hyph.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis-1.3.04.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis-ext-1.3.04.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.7.1.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.7.0.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\serializer-2.7.0.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik-all-1.7.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xmlgraphics-commons-1.3.1.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-4.2.0.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-io-1.3.1.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-logging-1.0.4.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_imageio.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\fop-hyph.jar -set LOCALCLASSPATH=%LOCALCLASSPATH%;%FOP_HYPHENATION_PATH% - -set JAVAOPTS=-Denv.windir=%WINDIR% - -if "%JAVA_HOME%" == "" goto noJavaHome -if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome -if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java -goto runFop - -:noJavaHome -if "%JAVACMD%" == "" set JAVACMD=java - -:runFop -rem ECHO "%JAVACMD%" -"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS% diff --git a/jonas_doc/core/tools/fop-0.95/lib/README.txt b/jonas_doc/core/tools/fop-0.95/lib/README.txt deleted file mode 100644 index 2f307b2cf461c9fa391eef0332ea8a075a22704e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/README.txt +++ /dev/null @@ -1,193 +0,0 @@ - -Information on Apache FOP dependencies -========================================= - -$Id$ - -The Apache Licenses can also be found here: -http://www.apache.org/licenses/ - - -Normal Dependencies ----------------------- - -- Apache Jakarta Commons IO - - commons-io-*.jar - http://jakarta.apache.org/commons/io/ - (I/O routines) - - Apache License v2.0 - -- Apache Jakarta Commons Logging - - commons-logging-*.jar - http://jakarta.apache.org/commons/logging/ - (Logging adapter for various logging backends like JDK 1.4 logging or Log4J) - - Apache License v2.0 - -- Apache Avalon Framework - - avalon-framework-*.jar - http://excalibur.apache.org/framework/ - (Avalon Framework, maintained by the Apache Excalibur project) - - Apache License v2.0 - -- Apache XML Graphics Commons - - xmlgraphics-commons-*.jar - http://xmlgraphics.apache.org/ - (Common Library for Apache Batik and Apache FOP) - - Apache License v2.0 - -- Apache Batik - - batik-*.jar - http://xmlgraphics.apache.org/batik/ - (SVG Implementation) - - Apache License v2.0 - -- Apache XML Commons Externals (JAXP API) - - xml-apis.jar - http://xml.apache.org/commons/components/external/ - (the JAXP API, plus SAX and various W3C DOM Java bindings, - maintained in XML Commons Externals) - - Apache License v2.0 (applies to the distribution) - SAX is in the public domain - http://www.saxproject.org/copying.html - W3C Software Notice and License (applies to the various DOM Java bindings) - W3C Document License (applies to the DOM documentation) - http://www.w3.org/Consortium/Legal/copyright-software - http://www.w3.org/Consortium/Legal/copyright-documents - http://www.w3.org/Consortium/Legal/ - - xml-apis-ext-*.jar - http://xml.apache.org/commons/components/external/ - (additional DOM APIs from W3C, like SVG, SMIL and Simple API for CSS) - - Apache License v2.0 (applies to the distribution) - W3C Software Notice and License (applies to the various DOM Java bindings) - W3C Document License (applies to the DOM documentation) - http://www.w3.org/Consortium/Legal/copyright-software - http://www.w3.org/Consortium/Legal/copyright-documents - http://www.w3.org/Consortium/Legal/ - -- Apache Xalan-J - - xalan-*.jar and serializer-*.jar - http://xalan.apache.org - (JAXP-compliant XSLT and XPath implementation) - - Apache License v2.0 (applies to Xalan-J) - Apache License v1.1 (applies to Apache BCEL and Apache REGEXP bundled in the JAR) - Historical Permission Notice and Disclaimer (applies to CUP Parser Generator) - http://www.opensource.org/licenses/historical.php - (see xalan.runtime.LICENSE.txt) - - -Special Dependencies ------------------------ - -- Apache Xerces-J - - xercesImpl-*.jar - http://xerces.apache.org - (JAXP-compliant XML parser and DOM Level 3 implementation) - - Apache License v2.0 - - Xerces-J is not directly referenced by FOP or any of its dependencies. - - -A note on JAXP ------------------------ - -Since Java 1.4, JAXP (Java API for XML Processing) is part of the -JRE/JDK. Every JVM includes the APIs and an implementation. However, -older JREs often contain implementations with bugs that are triggered -by code in Apache FOP and therefore need to be overridden. Now, since -JAXP is part of the class library, special precautions are necessary -to replace the original implementations. This is not done by simply -adding new JARs to the classpath as these classes would never be -loaded (due to Java's class loader hierarchy). - -Replacing the default implementations involves understanding the -"Endorsed Standards Override Mechanism". -More information can be found here: -http://java.sun.com/j2se/1.4.2/docs/guide/standards/index.html - -See also: -http://xml.apache.org/xalan-j/faq.html#faq-N100EF - -Essentially, you have two different possibilities: -- add the replacement JARs in the jre/lib/endorsed directory of your JRE. -- Use the -Xbootclasspath/p: option when starting the JVM (may not be - available for every JVM). - - -Optional Dependencies ------------------------- - -The following libraries are not bundled with FOP and must be installed manually. -Please make sure you've read the license of each package. - -- JAI Image I/O Tools - - https://jai-imageio.dev.java.net/ - BSD license - - Note: This is not the same as JAI! Only the ImageIO-compatible codecs - are packaged as "Image I/O Tools". The name may be misleading. - - - JAI (Java Advanced Imaging API) - - http://java.sun.com/products/java-media/jai - Java Research License and Java Distribution License (Check which one applies to you!) - - Currently used for: - - Grayscale error diffusion dithering in the PCL Renderer - -- JEuclid (MathML implementation, for the MathML extension) - - http://jeuclid.sourceforge.net/ - http://sourceforge.net/projects/jeuclid - Apache License v1.1 - - - -Additional development-time dependencies -------------------------------------------- - -- Servlet API - - servlet-*.jar - http://jakarta.apache.org/tomcat/ - (Servlet API, javax.servlet) - - Apache License v1.1 - -- Apache Ant - - (not bundled, requires pre-installation) - http://ant.apache.org - (XML-based build system - - Apache License V2.0 - -- JUnit - - (not bundled, provided by Apache Ant or your IDE) - http://www.junit.org - Common Public License V1.0 - -- XMLUnit (optional) - - (not bundled, to be added to your Apache Ant installation) - http://xmlunit.sourceforge.net/ - BSD style license \ No newline at end of file diff --git a/jonas_doc/core/tools/fop-0.95/lib/avalon-framework-4.2.0.jar b/jonas_doc/core/tools/fop-0.95/lib/avalon-framework-4.2.0.jar deleted file mode 100644 index 22a7ab341694297f3fe2acf4379662af954e7bad..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/avalon-framework-4.2.0.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/avalon-framework.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/avalon-framework.LICENSE.txt deleted file mode 100644 index 67db8588217f266eb561f75fae738656325deac9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/avalon-framework.LICENSE.txt +++ /dev/null @@ -1,175 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. diff --git a/jonas_doc/core/tools/fop-0.95/lib/avalon-framework.NOTICE.TXT b/jonas_doc/core/tools/fop-0.95/lib/avalon-framework.NOTICE.TXT deleted file mode 100644 index 416f7ba9b609a5d0fb1947bffdb964444da33c19..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/avalon-framework.NOTICE.TXT +++ /dev/null @@ -1,11 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to the section 4 d of == - == the Apache License, Version 2.0, == - ========================================================================= - - This product is developed by the Apache Avalon Project. - http://avalon.apache.org - - The names "Avalon" and "Merlin" must not be used to endorse or promote - products derived from this software without prior written permission. - For written permission, please contact pmc@avalon.apache.org. diff --git a/jonas_doc/core/tools/fop-0.95/lib/batik-all-1.7.jar b/jonas_doc/core/tools/fop-0.95/lib/batik-all-1.7.jar deleted file mode 100644 index 5893285819635b41819ddaa3ee2b1fc1d0752d46..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/batik-all-1.7.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/batik.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/batik.LICENSE.txt deleted file mode 100644 index 3e4e3d004084793138c1383213a0bb1b07f424a5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/batik.LICENSE.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/jonas_doc/core/tools/fop-0.95/lib/batik.NOTICE.txt b/jonas_doc/core/tools/fop-0.95/lib/batik.NOTICE.txt deleted file mode 100644 index 662188f3570b9c2a594c97e3e2408e84ddda1f81..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/batik.NOTICE.txt +++ /dev/null @@ -1,18 +0,0 @@ -Apache Batik -Copyright 1999-2007 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This software contains code from the World Wide Web Consortium (W3C) for the -Document Object Model API (DOM API) and SVG Document Type Definition (DTD). - -This software contains code from the International Organisation for -Standardization for the definition of character entities used in the software's -documentation. - -This product includes images from the Tango Desktop Project -(http://tango.freedesktop.org/). - -This product includes images from the Pasodoble Icon Theme -(http://www.jesusda.com/projects/pasodoble). diff --git a/jonas_doc/core/tools/fop-0.95/lib/commons-io-1.3.1.jar b/jonas_doc/core/tools/fop-0.95/lib/commons-io-1.3.1.jar deleted file mode 100644 index 7affdefcd2747f924d078dbe5e85bb1503532a4f..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/commons-io-1.3.1.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/commons-io.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/commons-io.LICENSE.txt deleted file mode 100644 index 6b0b1270ff0ca8f03867efcd09ba6ddb6392b1e1..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/commons-io.LICENSE.txt +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/jonas_doc/core/tools/fop-0.95/lib/commons-io.NOTICE.txt b/jonas_doc/core/tools/fop-0.95/lib/commons-io.NOTICE.txt deleted file mode 100644 index ce3b94a0fd273fab5c4813ea1bab9879de107473..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/commons-io.NOTICE.txt +++ /dev/null @@ -1,6 +0,0 @@ -Apache Jakarta Commons IO -Copyright 2001-2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/jonas_doc/core/tools/fop-0.95/lib/commons-logging-1.0.4.jar b/jonas_doc/core/tools/fop-0.95/lib/commons-logging-1.0.4.jar deleted file mode 100644 index b73a80fab641131e6fbe3ae833549efb3c540d17..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/commons-logging-1.0.4.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/commons-logging.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/commons-logging.LICENSE.txt deleted file mode 100644 index d645695673349e3947e8e5ae42332d0ac3164cd7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/commons-logging.LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/jonas_doc/core/tools/fop-0.95/lib/commons-logging.NOTICE.txt b/jonas_doc/core/tools/fop-0.95/lib/commons-logging.NOTICE.txt deleted file mode 100644 index 439eb83b2f4dc494445cc3f7eec190c760b77f4f..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/commons-logging.NOTICE.txt +++ /dev/null @@ -1,3 +0,0 @@ -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/jonas_doc/core/tools/fop-0.95/lib/serializer-2.7.0.jar b/jonas_doc/core/tools/fop-0.95/lib/serializer-2.7.0.jar deleted file mode 100644 index 7cd80696427f9a95030d79076aa73386a82aea23..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/serializer-2.7.0.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/serializer.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/serializer.LICENSE.txt deleted file mode 100644 index 261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/serializer.LICENSE.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/jonas_doc/core/tools/fop-0.95/lib/serializer.NOTICE.txt b/jonas_doc/core/tools/fop-0.95/lib/serializer.NOTICE.txt deleted file mode 100644 index f4cea12064c6402674b61011b85470a0f1b97798..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/serializer.NOTICE.txt +++ /dev/null @@ -1,15 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to section 4(d) of the Apache License, == - == Version 2.0, in this case for the Apache Xalan serializer == - == distribution. == - ========================================================================= - - This product includes software developed by IBM Corporation (http://www.ibm.com) - and The Apache Software Foundation (http://www.apache.org/). - - Portions of this software was originally based on the following: - - software copyright (c) 1999-2002, Lotus Development Corporation., - http://www.lotus.com. - - software copyright (c) 2001-2002, Sun Microsystems., - http://www.sun.com. - - software copyright (c) 2003, IBM Corporation., http://www.ibm.com. diff --git a/jonas_doc/core/tools/fop-0.95/lib/xalan-2.7.0.jar b/jonas_doc/core/tools/fop-0.95/lib/xalan-2.7.0.jar deleted file mode 100644 index 979ee761ccfe8866d4b24b58b8b925726a10279b..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/xalan-2.7.0.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xalan.BCEL.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/xalan.BCEL.LICENSE.txt deleted file mode 100644 index 58940a049732771f1d7feb498190623296742e9e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xalan.BCEL.LICENSE.txt +++ /dev/null @@ -1,52 +0,0 @@ -Apache Software License, Version 1.1 -* -* Copyright (c) 2001 The Apache Software Foundation. All rights -* reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in -* the documentation and/or other materials provided with the -* distribution. -* -* 3. The end-user documentation included with the redistribution, -* if any, must include the following acknowledgment: -* "This product includes software developed by the -* Apache Software Foundation (http://www.apache.org/)." -* Alternately, this acknowledgment may appear in the software itself, -* if and wherever such third-party acknowledgments normally appear. -* -* 4. The names "Apache" and "Apache Software Foundation" and -* "Apache BCEL" must not be used to endorse or promote products -* derived from this software without prior written permission. For -* written permission, please contact apache@apache.org. -* -* 5. Products derived from this software may not be called "Apache", -* "Apache BCEL", nor may "Apache" appear in their name, without -* prior written permission of the Apache Software Foundation. -* -* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -* SUCH DAMAGE. -* ==================================================================== -* -* This software consists of voluntary contributions made by many -* individuals on behalf of the Apache Software Foundation. For more -* information on the Apache Software Foundation, please see -* . -*/ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xalan.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/xalan.LICENSE.txt deleted file mode 100644 index 57bc88a15a0ee8266c259b2667e64608d3f7e292..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xalan.LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/jonas_doc/core/tools/fop-0.95/lib/xalan.NOTICE.txt b/jonas_doc/core/tools/fop-0.95/lib/xalan.NOTICE.txt deleted file mode 100644 index 81ce7751ff41a488f5d9fd579d98c2b0045f245d..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xalan.NOTICE.txt +++ /dev/null @@ -1,44 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to section 4(d) of the Apache License, == - == Version 2.0, in this case for the Apache Xalan distribution. == - ========================================================================= - - This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). - - Portions of this software was originally based on the following: - - software copyright (c) 1999-2002, Lotus Development Corporation., - http://www.lotus.com. - - software copyright (c) 2001-2002, Sun Microsystems., - http://www.sun.com. - - software copyright (c) 2003, IBM Corporation., http://www.ibm.com. - - voluntary contributions made by Ovidiu Predescu on - behalf of the Apache Software Foundation that was originally developed - at Hewlett Packard Company. - - The binary distribution package (ie. jars, samples and documentation) of - this product includes software developed by the following: - - - The Apache Software Foundation - - Xerces Java - see xercesImpl.README.txt - - JAXP 1.3 APIs - see xml-apis.README.txt - - Bytecode Engineering Library - see BCEL.README.txt - - Regular Expression - see regexp.README.txt - - - Scott Hudson, Frank Flannery, C. Scott Ananian - - CUP Parser Generator runtime (javacup\runtime) - see runtime.README.txt - - - The source distribution package (ie. all source and tools required to build - Xalan Java) of this product includes software developed by the following: - - - The Apache Software Foundation - - Xerces Java - see xercesImpl.README.txt - - JAXP 1.3 APIs - see xml-apis.README.txt - - Bytecode Engineering Library - see BCEL.README.txt - - Regular Expression - see regexp.README.txt - - Ant - see ant.README.txt - - Stylebook doc tool - see stylebook-1.0-b3_xalan-2.README.txt - - - Elliot Joel Berk and C. Scott Ananian - - Lexical Analyzer Generator (JLex) - see JLex.README.txt diff --git a/jonas_doc/core/tools/fop-0.95/lib/xalan.regexp.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/xalan.regexp.LICENSE.txt deleted file mode 100644 index 58940a049732771f1d7feb498190623296742e9e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xalan.regexp.LICENSE.txt +++ /dev/null @@ -1,52 +0,0 @@ -Apache Software License, Version 1.1 -* -* Copyright (c) 2001 The Apache Software Foundation. All rights -* reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* 1. Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in -* the documentation and/or other materials provided with the -* distribution. -* -* 3. The end-user documentation included with the redistribution, -* if any, must include the following acknowledgment: -* "This product includes software developed by the -* Apache Software Foundation (http://www.apache.org/)." -* Alternately, this acknowledgment may appear in the software itself, -* if and wherever such third-party acknowledgments normally appear. -* -* 4. The names "Apache" and "Apache Software Foundation" and -* "Apache BCEL" must not be used to endorse or promote products -* derived from this software without prior written permission. For -* written permission, please contact apache@apache.org. -* -* 5. Products derived from this software may not be called "Apache", -* "Apache BCEL", nor may "Apache" appear in their name, without -* prior written permission of the Apache Software Foundation. -* -* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -* SUCH DAMAGE. -* ==================================================================== -* -* This software consists of voluntary contributions made by many -* individuals on behalf of the Apache Software Foundation. For more -* information on the Apache Software Foundation, please see -* . -*/ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xalan.runtime.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/xalan.runtime.LICENSE.txt deleted file mode 100644 index 374d49849b18fd538802910d71a6d15c49dff474..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xalan.runtime.LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -CUP Parser Generator Copyright Notice, License, and Disclaimer -(runtime.jar component) - -Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, provided -that the above copyright notice appear in all copies and that both -the copyright notice and this permission notice and warranty disclaimer -appear in supporting documentation, and that the names of the authors -or their employers not be used in advertising or publicity pertaining -to distribution of the software without specific, written prior permission. - -The authors and their employers disclaim all warranties with regard to -this software, including all implied warranties of merchantability -and fitness. In no event shall the authors or their employers be liable -for any special, indirect or consequential damages or any damages -whatsoever resulting from loss of use, data or profits, whether in an action -of contract, negligence or other tortious action, arising out of or -in connection with the use or performance of this software. diff --git a/jonas_doc/core/tools/fop-0.95/lib/xerces.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/xerces.LICENSE.txt deleted file mode 100644 index b37087c569871a8425823d2e92ec20f37f4accec..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xerces.LICENSE.txt +++ /dev/null @@ -1,56 +0,0 @@ -/* - * The Apache Software License, Version 1.1 - * - * - * Copyright (c) 1999 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Xerces" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 1999, International - * Business Machines, Inc., http://www.ibm.com. For more - * information on the Apache Software Foundation, please see - * . - */ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xercesImpl-2.7.1.jar b/jonas_doc/core/tools/fop-0.95/lib/xercesImpl-2.7.1.jar deleted file mode 100644 index eac75ae8ef63d94dfd435c7d05dc26d14115399f..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/xercesImpl-2.7.1.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xercesImpl.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/xercesImpl.LICENSE.txt deleted file mode 100644 index 261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xercesImpl.LICENSE.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/jonas_doc/core/tools/fop-0.95/lib/xercesImpl.NOTICE.txt b/jonas_doc/core/tools/fop-0.95/lib/xercesImpl.NOTICE.txt deleted file mode 100644 index 77dc14c65dece61546c9e175d8a54aab85fa4505..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xercesImpl.NOTICE.txt +++ /dev/null @@ -1,14 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to section 4(d) of the Apache License, == - == Version 2.0, in this case for the Apache Xerces distribution. == - ========================================================================= - - This product includes software developed by - The Apache Software Foundation (http://www.apache.org/). - - Portions of this software were originally based on the following: - - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. - - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. - - voluntary contributions made by Paul Eng on behalf of the - Apache Software Foundation that were originally developed at iClick, Inc., - software copyright (c) 1999. \ No newline at end of file diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-1.3.04.jar b/jonas_doc/core/tools/fop-0.95/lib/xml-apis-1.3.04.jar deleted file mode 100644 index d42c0ea6cfd17ed6b444b8337febbc0bdb55ed83..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-1.3.04.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext-1.3.04.jar b/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext-1.3.04.jar deleted file mode 100644 index a7869d68aacd655c782bb373c7334e5ff667ca58..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext-1.3.04.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.dom-documentation.txt b/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.dom-documentation.txt deleted file mode 100644 index 03305aad082e45823c98e6281398196e285cf96e..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.dom-documentation.txt +++ /dev/null @@ -1,73 +0,0 @@ -xml-commons/java/external/LICENSE.dom-documentation.txt $Id$ - - -This license came from: http://www.w3.org/Consortium/Legal/copyright-documents-20021231 - - -W3C® DOCUMENT LICENSE -http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231 - -Public documents on the W3C site are provided by the copyright holders under -the following license. By using and/or copying this document, or the W3C -document from which this statement is linked, you (the licensee) agree that -you have read, understood, and will comply with the following terms and -conditions: - -Permission to copy, and distribute the contents of this document, or the W3C -document from which this statement is linked, in any medium for any purpose -and without fee or royalty is hereby granted, provided that you include the -following on ALL copies of the document, or portions thereof, that you use: - - 1. A link or URL to the original W3C document. - 2. The pre-existing copyright notice of the original author, or if it - doesn't exist, a notice (hypertext is preferred, but a textual - representation is permitted) of the form: "Copyright © [$date-of-document] - World Wide Web Consortium, (Massachusetts Institute of Technology, - European Research Consortium for Informatics and Mathematics, Keio - University). All Rights Reserved. - http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231" - 3. If it exists, the STATUS of the W3C document. - -When space permits, inclusion of the full text of this NOTICE should be -provided. We request that authorship attribution be provided in any software, -documents, or other items or products that you create pursuant to the -implementation of the contents of this document, or any portion thereof. - -No right to create modifications or derivatives of W3C documents is granted -pursuant to this license. However, if additional requirements (documented in -the Copyright FAQ) are satisfied, the right to create modifications or -derivatives is sometimes granted by the W3C to individuals complying with -those requirements. - -THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO -REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT -LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, -NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE -FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT -INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE -PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF. - -The name and trademarks of copyright holders may NOT be used in advertising -or publicity pertaining to this document or its contents without specific, -written prior permission. Title to copyright in this document will at all -times remain with copyright holders. - ----------------------------------------------------------------------------- - -This formulation of W3C's notice and license became active on December 31 2002. -This version removes the copyright ownership notice such that this license can -be used with materials other than those owned by the W3C, moves information on -style sheets, DTDs, and schemas to the Copyright FAQ, reflects that ERCIM is -now a host of the W3C, includes references to this specific dated version of -the license, and removes the ambiguous grant of "use". See the older -formulation for the policy prior to this date. Please see our Copyright FAQ for -common questions about using materials from our site, such as the translating -or annotating specifications. Other questions about this notice can be directed -to site-policy@w3.org. - -Joseph Reagle - -Last revised by Reagle $Date: 2005-06-03 18:49:13 -0400 (Fri, 03 Jun 2005) $ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.dom-software.txt b/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.dom-software.txt deleted file mode 100644 index 8f2f394b736643e10432c53a56cb31781ff45d30..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.dom-software.txt +++ /dev/null @@ -1,61 +0,0 @@ -xml-commons/java/external/LICENSE.dom-software.txt $Id$ - - -This license came from: http://www.w3.org/Consortium/Legal/copyright-software-20021231 - - -W3C® SOFTWARE NOTICE AND LICENSE -http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 - -This work (and included software, documentation such as READMEs, or other -related items) is being provided by the copyright holders under the following -license. By obtaining, using and/or copying this work, you (the licensee) agree -that you have read, understood, and will comply with the following terms and -conditions. - -Permission to copy, modify, and distribute this software and its documentation, -with or without modification, for any purpose and without fee or royalty is -hereby granted, provided that you include the following on ALL copies of the -software and documentation or portions thereof, including modifications: - - 1. The full text of this NOTICE in a location viewable to users of the - redistributed or derivative work. - 2. Any pre-existing intellectual property disclaimers, notices, or terms - and conditions. If none exist, the W3C Software Short Notice should be - included (hypertext is preferred, text is permitted) within the body - of any redistributed or derivative code. - 3. Notice of any changes or modifications to the files, including the date - changes were made. (We recommend you provide URIs to the location from - which the code is derived.) - -THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE -NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT -THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY -PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - -COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION. - -The name and trademarks of copyright holders may NOT be used in advertising or -publicity pertaining to the software without specific, written prior permission. -Title to copyright in this software and any associated documentation will at -all times remain with copyright holders. - -____________________________________ - -This formulation of W3C's notice and license became active on December 31 2002. -This version removes the copyright ownership notice such that this license can -be used with materials other than those owned by the W3C, reflects that ERCIM -is now a host of the W3C, includes references to this specific dated version of -the license, and removes the ambiguous grant of "use". Otherwise, this version -is the same as the previous version and is written so as to preserve the Free -Software Foundation's assessment of GPL compatibility and OSI's certification -under the Open Source Definition. Please see our Copyright FAQ for common -questions about using materials from our site, including specific terms and -conditions for packages like libwww, Amaya, and Jigsaw. Other questions about -this notice can be directed to site-policy@w3.org. - -Joseph Reagle - -Last revised by Reagle $Date: 2005-06-03 18:49:13 -0400 (Fri, 03 Jun 2005) $ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.sac.html b/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.sac.html deleted file mode 100644 index 0c0607001507028242eea27517ddebf0f4d9c4bc..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.sac.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - W3C IPR SOFTWARE NOTICE - - - - - -

    W3C IPR SOFTWARE NOTICE

    - -

    Copyright © 2002 World Wide Web Consortium, (Massachusetts Institute of -Technology, Institut National de Recherche en Informatique et en Automatique, -Keio University). All Rights Reserved.

    - -

    Note: The original version of the W3C Software Copyright Notice and -License could be found at http://www.w3.org/Consortium/Legal/copyright-software-19980720

    - -

    Copyright © 1994-2002 World Wide Web -Consortium, (Massachusetts Institute of -Technology, Institut National de Recherche -en Informatique et en Automatique, Keio -University). All Rights Reserved. http://www.w3.org/Consortium/Legal/

    - -

    This W3C work (including software, documents, or other related items) is -being provided by the copyright holders under the following license. By -obtaining, using and/or copying this work, you (the licensee) agree that you -have read, understood, and will comply with the following terms and -conditions:

    - -

    Permission to use, copy, and modify this software and its documentation, -with or without modification,  for any purpose and without fee or royalty is -hereby granted, provided that you include the following on ALL copies of the -software and documentation or portions thereof, including modifications, that -you make:

    -
      -
    1. The full text of this NOTICE in a location viewable to users of the - redistributed or derivative work.
    2. -
    3. Any pre-existing intellectual property disclaimers, notices, or terms - and conditions. If none exist, a short notice of the following form - (hypertext is preferred, text is permitted) should be used within the body - of any redistributed or derivative code: "Copyright © 2002 - World Wide Web Consortium, (Massachusetts Institute of Technology, - Institut National de Recherche en - Informatique et en Automatique, Keio - University). All Rights Reserved. - http://www.w3.org/Consortium/Legal/"
    4. -
    5. Notice of any changes or modifications to the W3C files, including the - date changes were made. (We recommend you provide URIs to the location - from which the code is derived.)
    6. -
    - -

    THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS -MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR -PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY -THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.

    - -

    COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR -DOCUMENTATION.

    - -

    The name and trademarks of copyright holders may NOT be used in advertising -or publicity pertaining to the software without specific, written prior -permission. Title to copyright in this software and any associated -documentation will at all times remain with copyright holders.

    - - diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.txt deleted file mode 100644 index d645695673349e3947e8e5ae42332d0ac3164cd7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.NOTICE.txt b/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.NOTICE.txt deleted file mode 100644 index f6d34b5eec909ad06f23f89f54036f781df0bef7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.NOTICE.txt +++ /dev/null @@ -1,16 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to section 4(d) of the Apache License, == - == Version 2.0, in this case for the Apache xml-commons xml-apis == - == distribution. == - ========================================================================= - - Apache XML Commons XML APIs - Copyright 2006 The Apache Software Foundation. - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). - - Portions of this software were originally based on the following: - - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. - - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. - - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.README.dom.txt b/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.README.dom.txt deleted file mode 100644 index 32b5d26ff41c3bf836c65e7db550674c64786e22..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis-ext.README.dom.txt +++ /dev/null @@ -1,56 +0,0 @@ -xml-commons/java/external/README.dom.txt $Id$ - - -HEAR YE, HEAR YE! - - -All of the .java software and associated documentation about -the DOM in this repository are distributed under the license -from the W3C, which is provided herein. - - -LICENSE.dom-software.txt covers all software from the W3C -including the following items in the xml-commons project: - - xml-commons/java/external/src/org/w3c - and all subdirectories - -(Note: SAC (The Simple API for CSS) has been published under an older -version of the W3C license. The original license file is LICENSE.sac.html.) - -LICENSE.dom-documentation.txt covers all documentation from the W3C -including the following items in the xml-commons project: - - xml-commons/java/external/xdocs/dom - and all subdirectories - -The actual DOM Java Language Binding classes in xml-commons came from: - http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/java-binding.html - -The specification of DOM Level 3's various parts is at: - http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/ - http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/ - http://www.w3.org/TR/2004/NOTE-DOM-Level-3-XPath-20040226/ - -The specification of DOM Level 2's various parts is at: - http://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/ - http://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/ - http://www.w3.org/TR/2000/REC-DOM-Level-2-Traversal-Range-20001113/ - http://www.w3.org/TR/2000/REC-DOM-Level-2-Views-20001113/ - -The specification of DOM Level 1's various parts is at: - http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html.html - -Links to all available W3C DOM Java Bindings can be found at: - http://www.w3.org/DOM/DOMTR - -The actual classes of The Simple API for CSS (SAC) came from: - http://www.w3.org/Style/CSS/SAC/ - http://www.w3.org/2002/06/sacjava-1.3.zip - -The actual DOM Java Language Binding classes for SMIL came from: - http://dev.w3.org/cvsweb/java/classes/org/w3c/dom/smil/ - (both ElementTimeControl.java and TimeEvent.java were taken at revision 1.1) - -The actual DOM Java Language Binding classes for SVG 1.1 came from: - http://www.w3.org/TR/SVG11/java.html \ No newline at end of file diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE-SAX.html b/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE-SAX.html deleted file mode 100644 index 2b653f315e4f62966fb7ba3e4552c6c07ae8c597..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE-SAX.html +++ /dev/null @@ -1,17 +0,0 @@ - - SAX LICENSE - -

    This license applies to all interfaces and classes in the - org/xml/sax hierarchy. -

    -

    -

    - This module, both source code and documentation, is in the - Public Domain, and comes with NO WARRANTY. - See http://www.saxproject.org - for further information. -
    -

    - - - diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE.DOM-documentation.html b/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE.DOM-documentation.html deleted file mode 100644 index 4a11084985870f1cac0bd46d1ab5d454a286c0a9..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE.DOM-documentation.html +++ /dev/null @@ -1,74 +0,0 @@ - -W3C Document License - - - - -

    W3C® DOCUMENT LICENSE

    -

    http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231

    -

    Public documents on the W3C site are provided by the copyright holders under -the following license. By using and/or copying this document, or the W3C -document from which this statement is linked, you (the licensee) agree that you -have read, understood, and will comply with the following terms and -conditions:

    -

    Permission to copy, and distribute the contents of this document, or the W3C -document from which this statement is linked, in any medium for any purpose and -without fee or royalty is hereby granted, provided that you include the -following on ALL copies of the document, or portions thereof, that you -use:

    -
      -
    1. A link or URL to the original W3C document. -
    2. The pre-existing copyright notice of the original author, or if it doesn't - exist, a notice (hypertext is preferred, but a textual representation is - permitted) of the form: "Copyright © [$date-of-document] World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and - Mathematics, Keio University). All - Rights Reserved. http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231" - -
    3. If it exists, the STATUS of the W3C document.
    -

    When space permits, inclusion of the full text of this NOTICE should -be provided. We request that authorship attribution be provided in any software, -documents, or other items or products that you create pursuant to the -implementation of the contents of this document, or any portion thereof.

    -

    No right to create modifications or derivatives of W3C documents is granted -pursuant to this license. However, if additional requirements (documented in the -Copyright FAQ) are -satisfied, the right to create modifications or derivatives is sometimes -granted by the W3C to individuals complying with those requirements.

    -

    THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO -REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED -TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, -NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR -ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY -THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.

    -

    COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE -OR IMPLEMENTATION OF THE CONTENTS THEREOF.

    -

    The name and trademarks of copyright holders may NOT be used in advertising -or publicity pertaining to this document or its contents without specific, -written prior permission. Title to copyright in this document will at all times -remain with copyright holders.

    -

    -

    ----------------------------------------------------------------------------

    -

    This formulation of W3C's notice and license became active on December 31 -2002. This version removes the copyright ownership notice such that this license -can be used with materials other than those owned by the W3C, moves information -on style sheets, DTDs, and schemas to the Copyright FAQ, reflects -that ERCIM is now a host of the W3C, includes references to this specific dated -version of the license, and removes the ambiguous grant of "use". See the older -formulation for the policy prior to this date. Please see our Copyright FAQ for common -questions about using materials from our site, such as the translating or -annotating specifications. Other questions about this notice can be directed to -site-policy@w3.org.

    -

    -
    Joseph Reagle <mailto:site-policy@w3.org
    -

    Last revised by Reagle $Date: 2005/07/19 16:33:09 $

    diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE.DOM-software.html b/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE.DOM-software.html deleted file mode 100644 index 6e2c97a590afc3ba685d118dd05d2e35cbbc559c..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE.DOM-software.html +++ /dev/null @@ -1,66 +0,0 @@ - -W3C Software License - - - - -

    W3C® SOFTWARE NOTICE AND LICENSE

    -

    http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231

    -

    This work (and included software, documentation such as READMEs, or other -related items) is being provided by the copyright holders under the following -license. By obtaining, using and/or copying this work, you (the licensee) agree -that you have read, understood, and will comply with the following terms and -conditions.

    -

    Permission to copy, modify, and distribute this software and its -documentation, with or without modification, for any purpose and without -fee or royalty is hereby granted, provided that you include the following on ALL -copies of the software and documentation or portions thereof, including -modifications:

    -
      -
    1. The full text of this NOTICE in a location viewable to users of the - redistributed or derivative work. -
    2. Any pre-existing intellectual property disclaimers, notices, or terms and - conditions. If none exist, the W3C - Software Short Notice should be included (hypertext is preferred, text is - permitted) within the body of any redistributed or derivative code. -
    3. Notice of any changes or modifications to the files, including the date - changes were made. (We recommend you provide URIs to the location from which - the code is derived.)
    -

    THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS -MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT -LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE -OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD -PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.

    -

    COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR -DOCUMENTATION.

    -

    The name and trademarks of copyright holders may NOT be used in advertising -or publicity pertaining to the software without specific, written prior -permission. Title to copyright in this software and any associated documentation -will at all times remain with copyright holders.

    -

    -

    ____________________________________

    -

    This formulation of W3C's notice and license became active on December 31 -2002. This version removes the copyright ownership notice such that this license -can be used with materials other than those owned by the W3C, reflects that -ERCIM is now a host of the W3C, includes references to this specific dated -version of the license, and removes the ambiguous grant of "use". Otherwise, -this version is the same as the previous -version and is written so as to preserve the Free -Software Foundation's assessment of GPL compatibility and OSI's certification under -the Open Source -Definition. Please see our Copyright FAQ for common -questions about using materials from our site, including specific terms and -conditions for packages like libwww, Amaya, and Jigsaw. Other questions about -this notice can be directed to site-policy@w3.org.
     

    -
    Joseph Reagle <mailto:site-policy@w3.org
    -

    Last revised by Reagle $Date: 2005/07/19 16:33:09 $

    diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE.txt deleted file mode 100644 index 261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.LICENSE.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.NOTICE.txt b/jonas_doc/core/tools/fop-0.95/lib/xml-apis.NOTICE.txt deleted file mode 100644 index 50694e5ee59ed233ff6bcd70518a2bfa00459a46..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xml-apis.NOTICE.txt +++ /dev/null @@ -1,13 +0,0 @@ - ========================================================================= - == NOTICE file corresponding to section 4(d) of the Apache License, == - == Version 2.0, in this case for the Apache xml-commons xml-apis == - == distribution. == - ========================================================================= - - This product includes software developed by The Apache Software Foundation - (http://www.apache.org/). - - Portions of this software were originally based on the following: - - software copyright (c) 1999, IBM Corporation., http://www.ibm.com. - - software copyright (c) 1999, Sun Microsystems., http://www.sun.com. - - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org diff --git a/jonas_doc/core/tools/fop-0.95/lib/xmlgraphics-commons-1.3.1.jar b/jonas_doc/core/tools/fop-0.95/lib/xmlgraphics-commons-1.3.1.jar deleted file mode 100644 index 81a485dc4e6fdcea589dace73dfd67ea45972316..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/fop-0.95/lib/xmlgraphics-commons-1.3.1.jar and /dev/null differ diff --git a/jonas_doc/core/tools/fop-0.95/lib/xmlgraphics-commons.LICENSE.txt b/jonas_doc/core/tools/fop-0.95/lib/xmlgraphics-commons.LICENSE.txt deleted file mode 100644 index d645695673349e3947e8e5ae42332d0ac3164cd7..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xmlgraphics-commons.LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/jonas_doc/core/tools/fop-0.95/lib/xmlgraphics-commons.NOTICE.txt b/jonas_doc/core/tools/fop-0.95/lib/xmlgraphics-commons.NOTICE.txt deleted file mode 100644 index 76171ea850599d149cb9931758243a69d34c1159..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/lib/xmlgraphics-commons.NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache XML Graphics Commons -Copyright 2006-2007 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). diff --git a/jonas_doc/core/tools/fop-0.95/status.xml b/jonas_doc/core/tools/fop-0.95/status.xml deleted file mode 100644 index 495f0a545fc14ee4e22c8367b307d54f11834fd5..0000000000000000000000000000000000000000 --- a/jonas_doc/core/tools/fop-0.95/status.xml +++ /dev/null @@ -1,1317 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Notes -

    - Besides the important changes listed below, the most important areas with - improvements in this release are: -

    -
      -
    • - Many bugfixes in tables, plus some new features (full support for keeps and - breaks, border conditionality, background on columns and header/footer/body) -
    • -
    • - Improvements and bugfixes for font handling and font - auto-detection/-registration. -
    • -
    • - Performance improvements and memory optimizations for the property handling - in the FO tree. -
    • -
    -

    - Please note that with this release, we've dropped support for Java 1.3. - FOP will, from now on, require at least Java 1.4. -

    -

    - There have been a few changes in tables that make FOP both more strict and more - compliant to the Recommendation: -

      -
    • XSL-FO 1.1 explicitly states that a row-spanning fo:table-cell element is not - allowed to span further than its enclosing fo:table-header/footer/body element - (see bottom of section - 6.7.3). From now on FOP will give a validation error if a document - contains such an erroneous cell. -
    • -
    • -

      If an fo:table element contains explicit fo:table-column children, then those - elements set the total number of columns in the table. This means that a - validation error will now occur if a row contains more cells than available - columns. This change allows to improve performance, since the rendering of the - table may start as soon as the table-column elements have been parsed.

      -

      If more flexibility is needed, then the fo:table-column elements may be just - omitted. The final number of columns will then be set by the row that has the - most cells.

      -
    • -
    -

    -

    - The image libraries Jimi and JAI are no longer needed (and used) for image loading. - Instead we rely completely on the Image I/O API that has been introduced with - Java 1.4. If you still need support for bitmap image formats that do not work - out-of-the-box, we recommend adding - JAI Image I/O Tools - (an Image I/O compatible image codec package) to the classpath. JAI is still required - for building the FOP distribution but it is optional for normal builds and at run-time. -

    - - This final 0.95 release also includes all of the - changes made for Apache FOP 0.95beta. - -
    -
    - - Fixed a color selection problem which occurred after an image has been painted - through the Graphics2DAdapter in PDF output. - - - Fixed page ordering problem with AWTRenderer. - - - Fixed image scaling for RTF output. - - - Fixed the -imagein command-line option. - - - Added support for fo:leader for RTF output (no full support!). Fixes problems with empty leaders - being used to force empty lines among other issues. - - - Added support for page-number-citation for RTF output. - - - Fixed handling of proportional-column-width() and percentages for table column in RTF - output. - - - Fixed NullPointerException when page-number-citations are used inside a marker. - - - Fixed two bugs concerning resolution handling with SVG images and their - conversion to bitmaps for RTF output. - - - Fixed potential multi-threading problem concerning the use of DecimalFormat. - - - Regression bugfix: Multiple collapsible breaks don't cause empty pages anymore. - - - Fixed resolution handling inside AWT preview dialog. - - - Fixed positioning of absolutely positioned block-containers in multi-column documents. - - - Fixed rendering of fixed block-containers in AFP output. - - - Various bugfixes for table layout. - - - Fixed regression causing bad positioning of block-containers if used as descendant - of a table-cell. - - - Fixed text extraction problem with ZapfDingbats and Symbol font in PDF output. - - - Fixed a performance problem concerning image serialization. - - - Fixed NullPointerException when loading a TrueType font using XML font metric files. - -
    - - -
    - Notes -

    - Besides the important changes listed below, the most important areas with - improvements in this release are: -

    -
      -
    • - Many bugfixes in tables, plus some new features (full support for keeps and - breaks, border conditionality, background on columns and header/footer/body) -
    • -
    • - Improvements and bugfixes for font handling and font - auto-detection/-registration. -
    • -
    • - Performance improvements and memory optimizations for the property handling - in the FO tree. -
    • -
    -

    - Please note that with this release, we've dropped support for Java 1.3. - FOP will, from now on, require at least Java 1.4. -

    -

    - There have been a few changes in tables that make FOP both more strict and more - compliant to the Recommendation: -

      -
    • XSL-FO 1.1 explicitly states that a row-spanning fo:table-cell element is not - allowed to span further than its enclosing fo:table-header/footer/body element - (see bottom of section - 6.7.3). From now on FOP will give a validation error if a document - contains such an erroneous cell. -
    • -
    • -

      If an fo:table element contains explicit fo:table-column children, then those - elements set the total number of columns in the table. This means that a - validation error will now occur if a row contains more cells than available - columns. This change allows to improve performance, since the rendering of the - table may start as soon as the table-column elements have been parsed.

      -

      If more flexibility is needed, then the fo:table-column elements may be just - omitted. The final number of columns will then be set by the row that has the - most cells.

      -
    • -
    -

    -

    - The image libraries Jimi and JAI are no longer needed (and used) for image loading. - Instead we rely completely on the Image I/O API that has been introduced with - Java 1.4. If you still need support for bitmap image formats that do not work - out-of-the-box, we recommend adding - JAI Image I/O Tools - (an Image I/O compatible image codec package) to the classpath. JAI is still required - for building the FOP distribution but it is optional for normal builds and at run-time. -

    -
    -
    - - Bugfix: The before border of a block is no longer swallowed if its first child issues - a break-before. - - - Bugfix: When there was a forced break after a block with (conditional) borders the - border-after wasn't painted. - - - Bugfix: a forced break inside a cell was ignored when occurring before the minimum height - set on the enclosing row was set. - - - Fixed exceptions when lists, tables or block-container are children of an inline-level - FO. - - - Added support for background on fo:table-column and fo:table-header/footer/body elements. - - - Fixed the rendering of the area of a table corresponding to border-separation, which must - be filled with the background of the table, and not the rows. - - - Improved conformance: even if a table-cell spans several rows its background must - correspond to the first row spanned. - - - Slight improvement for thin lines in Java2D/AWT output. - - - Added full support for keep-with-previous on fo:table-row and in fo:table-cell elements. - - - Turned on XInclude processing for the main source given on the command line. - - - Improved the font auto-detection so fonts accessed using the font-family name are - selected with higher accuracy. - - - Removed deprecated methods in the "apps" package that were left-overs from the API - discussions. - - - Added support for unusual font encodings (like for Symbol or Cyrillic fonts) of Type 1 - fonts in PDF and PostScript output. - - - Moved to the FO tree stage the check for break-before/after on table-row while spanning in - progress. - - - Added full support for breaks before and after table cells (that is, break-before/after set - on the first/last child of a cell). - - - Added full support for breaks inside the cells of a table. - - - Added correct percentage resolution for arguments to the proportional-column-width() function. - - - Bugfix for date formatting with negative time zones in the PDF's Info object. - This affected PDF/A compliance. - - - Added an option to disable the default sRGB profile in PDF output for those who - don't care about color fidelity, but care about PDF file size. - - - Fixed a bug when the rgb-icc() function was used either before the fo:declarations, - or in documents without a fo:declarations node. In such cases, the sRGB fallback - is now used to avoid an ugly NullPointerException. - - - Added very basic parsing for the xml:lang shorthand. - - - Fixed a bug when using relative font-size (smaller/larger) in combination - with percentages. - - - Bugfix for handling of optional tables in subset TrueType fonts. This bug caused errors - in various PDF viewers. - - - Added support for the natural language indentifier ("Lang" in the document catalog) - for PDF documents based on the language/country values on fo:page-sequence. - - - Fixed a memory-leak in XMLWhiteSpaceHandler. - - - Fixed the resolution of borders when header/footer is omitted at page breaks. - - - Added support for conditional borders in tables, for both the separate and the collapsing - border model. - - - Fixed a possible IndexOutOfBoundsException that could happen with certain constellations - when footnotes are used. - - - Compliance fix: for absolutely positioned block-containers, "top" wasn't - interpreted correctly. - - - New extension attribute fox:transform on fo:block-container allows free-form transformation - (rotation, scaling etc.) of absolute and fixed block-containers. Supported only - for PDF, PS and Java2D-based renderers. - - - Fixed logic error setting the transformation matrix for block-container viewports - (applies to absolute and fixed block-containers only). - Important: External renderer implementations need to adjust for the change and implement - the new method concatenateTransformationMatrix(AffineTransform) if the renderer is - derived from AbstractPathOrientedRenderer. - - - A new image loading framework has been introduced to fix various problems with external - graphics and improve performance. - - - Fixed generation of named destinations so it works when the PDF document is encrypted. - - - PostScript output now generates the bounding box DSC comments for the whole document. - - - Added support for PDF page labels. - - - Added support for custom fonts in Java2DRenderer and derived renderers. - - - Added new extension element: fox:external-document. It allows to add whole documents - such as multi-page TIFF images to be inserted as peers to a page-sequence. Each image - will make up an entire page. See the documentation for details. - - - Added minimal support for the .minimum/.maximum components of block/inline-progression-dimension - on fo:external-graphic and fo:instream-foreign-object. - - - Added support for scale-down-to-fit and scale-up-to-fit (introduced in XSL 1.1). - - - Bugfix: content of a row with zero height overriding the previous row - - - Bugfix: allow multiple bookmarks to point at the same destination. - - - Bugfix for border-after painting and element list generation when a - forced break is involved. - - - Bugfix: no empty page is generated anymore if there's no content - after a break-after. - - - Restored proper handling of fo:table-cell having no children, which is allowed in relaxed - validation mode. - - - Memory Leak fixed in the Property Cache. Fixed by Jeremias Maerki. Reported and Tested By - Chris Bowditch. - - - Bugfix in tables: wrong element generation by the merging algorithm when glues must be - produced to cope with conditional spaces. The corresponding length was added twice: one in - the glue itself and one in the following box. - - - Bugfix for URI resolution: Make StreamSources without system identifier work again. - - - Avoid a NullPointerException in AreaTreeHandler.endDocument(). - - - Bugfix: breaks generated by the merging algorithm for a table-row containing empty cells - had always a penalty of 900. - - - Added methods for fo:page-number-citation(-last) in FOEventHandler. - - - Step towards performance: the collapsing-border resolution algorithm no longer triggers the - retrieving of the whole table, when possible. - - - In case of missing cells the border-end of the table was applied to an inner cell, instead - of the (empty) cell in the last column. - - - Fixed the resolution of borders with table-columns (border-before/after was wrongly applied - to every cell of the column). - - - Fixed the resolution of border-end on cells spanning several rows. - - - Bugfix: Use Font.getName() (logical font name) instead of Font.getFontName() - (localized) when registering fonts from AWT. - - - Made the way TrueType fonts are embedded in PDF compliant to the - specification so viewers correctly identify subset fonts. - - - Fixed font-autodetection so fonts with uppercase extensions are - detected, too. - - - Improved font auto-detection and handling of AWT-supplied fonts in order - to achieve better results when using multiple output formats. Whenever - possible, the font names appearing in the operating system can also - be used in XSL-FO. - - - Fixed regression: transparent-page-background was not recognized for PNG output. - - - Added check for table-cells which span more rows than available in their parent element - (table-header/footer/body). - - - Added support for fo:markers in fo:inline and fo:basic-link. - - - PDF Transcoder (SVG) text painting has been completely rewritten. - Except for some special cases (with filters for example), all text - (including flow text) is now painted using PDF text operators. - - - Added support for ids on empty fo:inlines. - - - Add Font support in jar files. - - - Postscript extension cleanup. - - - Fix to avoid ClassCastException where multiple ps:ps-comments are declared within fo:declarations. - - - Fix to avoid NullPointerException when parsing ExpertEncoded and ExpertSubsetEncoded Type 1 fonts. - - - Fixes missing TLE value attribute when using AreaTree input with the AFP renderer. - - - Added generic structures to the PDF library in order to support PDF - file in fo:external-graphic later. - - - Added support for SVGZ. - - - Bugfix for NPE with empty table-row (regression from 0.93). - - - Added a configuration setting to the PCL renderer to disable PJL commands. - - - Fix to avoid a ClassCastException in renderer configuration. - - - Fixed the restoration of the TLE values from the intermediate format - for the AFP extension elements. - - - Added a configuration setting for the renderer/device resolution to the AFP renderer. - - - Facilitate the implementation for font-selection-strategy:
    - • Changed FontInfo.fontLookup to always return an array of FontTriplet.
    - • Changed CommonFont.getFontState to return an array of FontTriplet.
    - • Initial modifications to the related LMs: initialized with - the font corresponding to the first of the triplets.
    -
    - - PropertyCache phase 2:
    - • improvement of the PropertyCache itself should now guarantee acceptable - performance of the static caches in multi-session environments, which is - a possible problem with synchronizedMap.
    - • changed CommonFont to use the cache: - added CachedCommonFont to contain the properties that are always cacheable - CommonFont itself is only cached if the remaining properties are absolutes.
    - • changed CommonHyphenation, KeepProperty, ColorProperty and FontFamilyProperty to use the cache.
    -
    - - Fixed swallowing PCDATA in text-node children of - retrieved markers. - - - Fixed erroneous white-space removal in retrieved markers. - - - Fixed erroneous usage of inherited color-values in SVG. - -
    - - - AFP Renderer: Bugfix for 1 bit images where the width is not a multiple of 8. - - - Support for keep-together.within-line="always". - - - Fixed incomplete support for Unicode Word Joiner characters (U+2060 and U+FEFF). - - - Add support for conditional spaces in table-cells. - - - Support alignment-adjust for images. - - - Partial application of the patch in Bugzilla 41044: - * addition of a generic PropertyCache to be used by all Property - types that can be safely canonicalized - * modified EnumProperty, StringProperty, NumberProperty, EnumNumber - and FixedLength to make use of the cache infrastructure - - - Refactoring in the fo package: - -> removal of the childNodes instance member in fop.fo.FObj - -> addition of a firstChild instance member in fop.fo.FObj - -> addition of a siblings instance member in fop.fo.FONode - -> addition of a FONodeIterator interface in FONode + corresponding implementation in FObj - -> changed implementations of FObj.addChildNode(), .removeChild() and .getChildNodes() - - - Code cleanup and restructuring: - Refactoring of PageSequenceLayoutManager and provide common FObj id property use - - - Slight improvement of relative font-weight handling in the properties - package. - - - Updated PDF/A-1b support according to ISO-19005-1:2005/Cor.1:2007. - - - Add support for font auto-detection (easier font configuration). - - - Use source resolution setting for bitmap images which don't provide their own - resolution. - - - Fixed the rendering of zero-width spaces for certain fonts by not generating them into - the area tree. - - - Fixed a problem with disappearing footnotes inside hyphenated inlines (and footnotes with hyphenated inline child). - - - Add support for exact positioning of internal PDF links. - - - Fix PDF Genaration for non-ASCII compatible locales. - - - Fix several exceptions when break-before/after is set on the first/last row of a table. - - - Fix extra page break when break-before is set on both a table and its first row. - - - Make keep-with-next and keep-with-previous work on fo:table. - - - Add support for the collapsing-border model in tables. - - - Add support for named destinations in PDF. - - - Fixed a problem with keep-with-next on table-rows. Once a keep-with-next was set - inside a table, the FO following the table would always be glued to the previous table. - - - Fixed a problem with the auto-rotate-landscape setting in the PostScript renderer. - It didn't generate the right setpagedevice command. - - - Fixed an IllegalArgumentException for absolutely positioned block-containers with a - border and no height/bpd set. - - - Add support for a two-pass production for PostScript output to minimize file size. This - adds images only once and adds only the fonts that are really used. - - - If a line contained nothing but a linefeed, this didn't produce empty lines. - Replaced the auxiliary zero-width box with a glue the width of a line, - and shrinkable to zero-width. - - - Stricter FOP user configuration checking - - - Fix parsing 'url(...)' when the URL itself contains a bracketed part. - - - Support for GIF images in RTF output (RTF handler, only. Does not affect the RTF library.) - - - Fix for NPE with PNG images for RTF output. - - - Fix for properly parsing font-family names containing spaces. - - - Support for soft masks (transparency) with ImageIO image adapter. - - - Fix incorrect behaviour of the BreakingAlgorithm when some inline content is wider than - the available ipd, causing a restart. - - - Fix for PDF corruption when a TrueType font with spaces in its name is embedded and no - XML font metrics file for that font is used. - - - Fix for ClassCastException when fo:wrapper was used as direct child of fo:flow. - Note: "id" attributes are still not handled properly on fo:wrapper! - - - Added support for the soft hyphen (SHY) character. - - - Added support for line-height-shift-adjustment property. - - - Added support for the system property fop.home to - cli.Main.getJARList(). - - - Added support for display-align for table-cell in RTF output. - - - Added support for UAX#14 type line breaking. Support does not extend across nested fo:inline elements. - - - - -
    - Notes -

    This is the first production grade release of the new FOP - codebase.

    -
      -
    • It contains the new API first introduced in release 0.92 - beta. The preceding API has been removed. -
    • -
    • - See the compliance page for an - overview of the compliance of this release with the XSL 1.0 and - 1.1 recommendations. -
    • -
    • - This release again contains many bug fixes and new features. See - below for details. -
    • -
    • - See the known issues page - for an overview of the known issues with this release. -
    • -
    -

    Caveats:

    -
      -
    • - You may experience different behaviour compared to version 0.20.5. - Please consult the "Upgrading" page for details. -
    • -
    -
    -
    - - Added support for the use of Open Type fonts - - - Enabled Copy/Paste from PDF content in Acrobat Reader for text using embedded TrueType fonts. - - - Commented out unused properties, in order to minimize memory usage. - - - Removed unused attributes from TableCell. - - - Added initial support for loading fonts without a pre-created XML font metric - file. - - - Support for the rgb-icc() function and for a proprietary cmyk() function (for device CMYK - colors only through the PDF renderer so far). - - - Minor fixes and improvements for the AWT Preview (keyboard shortcuts, scrolling, windows - setup). - - - Added support for SVG in fo:instream-foreign objects for RTF output. - - - Bugfix: Fixed bug when the sum of column widths of a table is larger than the - specified widths. The table width was not adjusted. - - - Bugfix: Nested tables with headers and footers were not handled correctly and could - overlap with the region-after. - - - Added support for CCITT compression in the TIFFRenderer by switching to the ImageWriter - abstraction from XML Graphics Commons. - - - Extension properties fox:orphan-content-limit and fox:widow-content-limit which - help with list-block and table layout. See the documentation for details. - - - Configuration option in the Java2D-based renderers that allows to disable the default - white background in order to produce bitmap output with transparency. - - - Split up FOText instances larger than 32K characters to avoid - integer overflow during layout. - - - Bugfix: Corrected painting of shading patterns and position of links for SVG images - inside FO documents. - - - Minor fix: correctly set negative values for ipd/bpd to zero. - - - Rework of default column-creation / column-width setting from - cells in the first row. - - - Added relaxed validation for empty list-item-*, as suggested by Gary Reed. - - - Modified proportional-column-width() function to log an error if used - with table-layout=auto - - - Deferred property resolution for markers until they are actually retrieved, - which leads to percentages and relative font-sizes now getting the correct - values. Also deferred white-space-handling for markers. - - - Changed the way overflowing pages are handled. The overflow property on region-body - is now used to define the behaviour. - - - Fixed a memory-leak: The FO tree part of a page-sequence was not released when a - page-sequence was finished. - - - Bugfix: Table headers and footers were swallowed when a table was nested in a list-block. - - - Fixed a bug with indent handling when margins are used on a surrounding block and - not start/end-indent. - - - Compatibility fix for GCJ (GNU Classpath): Using "UTF-16BE" instead of "UnicodeBigUnmarked" - encoding. - - - Fixed handling for CCITT Group 4 TIFF images with fill order 2. - - - Fixed setting of page margins in AWT Renderer like it was done in the print renderer. - - - Fixed two memory-leaks in image handling. The image cache is finally working - properly. - - - Let numeric property values without a unit be treated as pixels like in HTML. - This fixes certain NullPointerException when no units are specified. - (Note: the use of pixels in XSL-FO is discouraged!) - - - Bugfix: Potential multi-threading issue (ConcurrentModificationException) - eliminated for ElementMapping classes. - - - No more System.exit() and look & feel setting calls inside the reusable - parts of the AWT viewer. - - - Proper escaping of characters in list-items labels for RTF output. - - - Bugfix: FOUserAgent specific configuration parameters specified in config file - were not set when FOP was invoked from command line. - - - Added support for PDF/A-1b and PDF/X-3:2003. (Note: this may still be a bit - incomplete. Feedback is welcome!) - - - The CIDSet object is now generated for CID fonts which are embedded in PDFs. - (Required by PDF/A). - - - The Java2DRenderer (and therefore the print and bitmap renderers) is now - offering the same quality as the PDF and PS renderers. Note: There can still - be little differences between PDF and Print/PNG/TIFF because the latter uses - a different font metrics source. - - - Bugfix: components of the border-separation property weren't set when - in shorthand-mode, leading to a NPE being thrown. - - - Bugfix: Table headers were omitted when a table is a child of a block-container. - - - Bugfix: Bookmarks in PDF will be generated even if some bookmarks cannot be - resolved. - - - Bugfix: the interaction between the table FOs and properties package in - determining initial values for column-number should be a one-time process, - not repeated when the table is in a marker that is retrieved. - - - Bugfix: All fonts names were converted unnecessarily to lower case in RTF output. - - - Bugfix: The combination of hyphenation and kerning resulted in slightly ragged - right ends for right-aligned and justified text. - - - Bugfix: NullPointerException in AreaAdditionUtil in a table-cell spanning - multiple pages and with a marker. - - - Bugfix: NullPointerException in RTF output when a table does not contain - table-columns. - - - Bugfix: NullPointerException in RTF library when there are no borders on - the parent table. - - - Automatic support for all fonts available to the Java2D subsystem for all - Java2D-descendant renderers (TIFF, PNG, print, AWT). - - - Bugfix: Improved baseline detection in TTFReader for TrueType fonts. - - - Bugfix: tables nested in inline elements caused a NullPointerException. - - - The default sRGB color profile provided by the Java class library is no longer - embedded if it is encountered. This should reduce the PDF size considerably. - - - Bugfix: Sections with span="all" lead to overlapping text if spanning multiple pages. - - - Bugfix: Percentages in vertical-align property values were not correctly handled. - - - Bugfix: Gaps in table-columns cause a NullPointerException. - - - Changed the internal representation of colors to use Java's own color infrastructure - instead of FOP's home-grown classes. - - - Bugfix: TABs were not correctly replaced by spaces in some circumstances. - - - Content in block-containers makes better use of shrink to fit content vertically - into the available area. This can be used indirectly to justify content vertically - in a block-container. - - - Bugfix: basic-links with internal destinations in documents with multiple - page-sequences sometimes pointed at the wrong page. - - - Bugfix: Fixed ClassCastException when retrieve-marker is used as a direct child - if static-content in which case leading and trailing white space is not properly - removed. - - - Bugfix: Fixed OutOfMemoryException with long data URLs (RFC 2397). - - - Initial support for page-number-citation-last (XSL 1.1). Works without problems - only for page-sequence so far. - -
    - - - Bugfix: The generation of the PDF "d" (setdash) command was assuming that - only integer values can be used but that isn't the case. Dash patterns - PDFGraphics2D would be wrong in the process. - - - Bugfix: Fixed a division by zero problem in TTFReader and improved the detection - of the capHeight and xHeight font metric values for TrueType fonts. - - - Bugfix: Allow URLs in basic-link's external-destination to be wrapped in "url()". - - - Bugfix: Corrected enumerated property value for white-space property - from "no-wrap" to "nowrap". - - - Bugfix: Added support for white-space-treatment="preserve" in particular to - support the white-space="pre" short hand property. - - - Corrected expectation and behaviour for the text-indent property to only apply - to the first line area generated by a block. - - - Bugfix for invalid handling of ICC color profiles in JPEG images and for - dealing with CMYK JPEG images with the Adobe APPE marker. - - - Initial support for page-position="last" added. - - - Reenabled loading of user-supplied hyphenation patterns that was available in - FOP 0.20.5. (See "hyphenation-base" option in the user configuration) - - - Bugfix: Certain filter combinations in PDF could lead to invalid PDFs. - DecodeParams were not properly handled. - - - Bugfix: CCITT Group 4 encoded TIFF images with multiple strips are now properly - embedded in PDF files. - - - Added support for fixed-width spaces. - - - Added support for kerning. - - - Bugfix: Fixed a copy/paste error in the table layout code that caused wrong page - break decisions when table-headers and/or table-footers are used. - - - Bugfix: Fixed an NPE that was thrown when a table was used inside a footnote-body. - - - Bugfix: Fixed a problem with certain TrueType fonts which are missing the "PCLT" - table, where a baseline-shift="sub" had no effect due to a missing x-height value. - (Note: This only affects TTFReader, so the font metric file has to be regenerated.) - - - Bugfix: When the base URL was specified as a file system path, the constructed - URL was wrong. - - - Support for "userconfig" attribute in FOP Ant Task. - - - Initial support for XMP metadata (PDF 1.4) under fo:declarations. - - - Added support for the background-position shorthand property. - - - Added support for the font shorthand property. - - - Added support for system-color() function. - - - Bugfix: Fixed two causes for ClassCastExceptions in BlockContainerLayoutManager. - - - Bugfix: padding-top and padding-bottom on list-items could lead to wrong page - break decisions and thus to overlapping text. - - - Bugfix: break-before and break-after were ignored on list-items. - - - Bugfix: The elements representing a non-breaking space weren't always correct. - - - Bugfix: Text-decoration was not promoted if no text-decoration attribute was - specified on a nested element. - - - Added support for the from-table-column() function. - - - Bugfix: Spanned cells could lead to an false error message about overlapping - cells and ultimately a NullPointerException. - - - Bugfix: Regions with non-standard names got ignored in RTF output leading to - missing headers and footers. - - - The RTF output now properly generates the "\landscape" flag for documents in - landscape orientation. - - - Following a clarification by the XSL FO SG, space traits are only set on the - first and last area generated by an FO, and not on every area anymore. - - - New feature: "Intermediate format" (IF). The IF is basically the XML dialect - written by the area tree renderer (XMLRenderer). A new parser for this format - allows reparsing a serialized and possibly modified area tree and rendering it - to the final target format. - - - Bugfix: Floating point numbers were not properly formatted in the PDF renderer - which could lead to error messages while opening a PDF in Acrobat Reader. - - - Implement property name as default argument on some xsl-function calls. - - - Implement force-page-count property of page-sequence. - - - Bugfix: Spans that end up with a negative height don't get swallowed anymore. - - - Relative URLs for the font configuration attributes metrics-url and embed-url - are now supported. A new configuration property font-base has been added. It - sets the base URL against which relative font URLs are resolved. If font-base is - not set base is used. - - - Added support for RFC2397 "data" URLs. - - - Bugfix: Certain border styles could lead to a NullPointerException. - - - Bugfix: Space was not adjusted if the space was on a nested block. This could - lead to content overflowing the bottom of a page. - - - Bugfix: TableCell did not properly report that it generates reference-areas - which could lead to wrong inherited values for start-indent and end-indent. - - - The font loading code now reads the encoding value from the XML font metrics file - so that fonts like Symbol and ZapfDingbats can be embedded explicitely (Required by PDF/A). - - - Improvements to the code for inline block content. - - - Bugfix: Image height for BMP images was incorrectly calculated - - - Revision of refinement white-space handling. - - - Added feature: support for white-space shorthand - - - Added feature: support for page-break-* shorthands - - - Bugfix: NullPointerException on certain fo:inline within lists. - - - Bugfix: ClassCastException on certain fo:inline with border combinations. - - - Changed a method name in LineArea from finalize to finalise because it was - never intended for the method to be an override of the Java Object finalize - method. If invoked by the Java garbage collector it may cause a NPE. - - - - - Deprecated Fop constructors that use integer constants to select the - output format have been removed in favor or the constructors that use - MIME types. - - - Fixed a bug where the linefeed-treatment property value "preserve" was not - honoured when used in conjunction with text-align="center". - - - Bugfix: hard breaks with even-page or odd-page were not handled correctly - when spaces were surrounding the break. - - - Changed the XMLHandler interface so it doesn't report the MIME type it - supports but instead can report whether it supports a particular Renderer - implementation. XMLHandlers are now configurable. - - - Fixed a bug where SVG content could be clipped when rendered to PostScript. - - - Changed the way resolutions are handled. The single resolution in the user - agent got split up into source and target resolutions. For more info, see - the updated documentation. Note: backwards-incompatible change! - - - Bugfix: Some content inside a table-header may not have been renderered on - pages n > 1 in certain conditions. - - - Fixed a bug where an empty line, i.e. a block containing only a &nbsp;, - was not rendered at all. - - - Fixed a bug where the area for a finished cell that is broken over pages was - created once for each row it was spanned over instead of only once. - - - Added checks that warn about tables and block-containers that are wider than - the available content area. - - - Bugfix: Footnotes were lost if the footnote appeared in centered text. - - - Improved log and error messages in a number of places by adding additional - context information that should make it easier to find the location in the - source files. - - - Fix to correct image sizes in RTF output. - - - First attempt at SVG support in RTF output. SVG images are converted to 300dpi JPEG - images internally. - - - Additional checks to detect text overflows. The overflow property is now properly - handled where applicable. - - - Source location information improved. If location information is not available, - the context information is provided based on text content. - - - The command-line now automatically sets two parameters for any XSLT transformation: - "fop-output-format" contains the MIME type of the currently selected output format, - "fop-version" contains FOP's version number. - - - The output file is now deleted when an exception occurs when calling FOP from - the command-line. - - - Bugfix: Areas for table-cells that are broken over more than one page are now - generated even if all its content is already painted on a previous page. This - fixes strange effects like a table grid that is not completely painted. - - - Bugfix: Column balancing produced strange break decisions in certain multi-column - documents with large amounts of text. - - - Added an alternative set of rules for calculating text indents which tries to mimic - the behaviour of many commercial FO implementations that chose to break the rules - in the FO specification in order to better meet the natural expectations of - inexperienced FO users. - - - Bugfix: The combination of content-width="scale-to-fit" and content-height="100%" - did not work as expected due to a datatype conversion bug. - - - Bugfix: A span="all" on the first block cause a subsequent page break and the first block - didn't span all columns. - - - Bugfix: Self-created OutputStreams in PNG Renderer were not properly closed. - - - The border-collapse property on fo:table is now forced to the value "separate" until the collapsing - border has been implemented. - - - font-family list still not fully supported but a comma-separated list is now properly tokenized. - FOP will now go through all fonts in the list to find one that is available, but it doesn't - do so per character, yet. - - - Implemented "Overconstrained Geometry" rules (5.3.4, XSL 1.0) for the most important cases. - - - Bugfix: Relatively positioned BlockViewports (from block-containers) caused the paint - cursor not be be properly advanced when space-before or space-after were present. - - - Bugfix: Space resolution was incomplete for content in table-cells. Conditional elements - didn't get removed. - - - The validation check for non-zero borders and padding on a region-* and for empty static-content - elements is now turned off when relaxed validation is active to improve compatibility with - FO documents written for other FO implementations. - - - Bugfix for "/ by zero" ArithmeticExceptions when an URL to a non-existing image is used - and content-width and/or content-height is used. - - - Bugfix for a multi-threading problem: - propertyListTable initialization moved from the constructor to a static block in FONode. - This fixes NullPointerExceptions in PropertyList. - - - Bugfix for placement of text inside a text area when borders are present in PostScript output. - - - Improvements on leader painting in PDF output. - - - Support for leader painting in PostScript output. - - - Support for hyphenation-ladder-count. - - - - - Complete redesign of the FOP codebase in the period between Dec 2001 and Nov 2005. - There are just too many changes to list here. If you like to know details, run - "svn log --verbose http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/". - - - - - For the change log for the maintenance branch - (where FOP 0.20.5 came from), please see the "CHANGES" file in the distribution, or - the CHANGES file in the SVN repository. - - -
    - - - - - - Improve the documentation. - - - - -
    diff --git a/jonas_doc/core/tools/maven-ant-tasks-2.1.3.jar b/jonas_doc/core/tools/maven-ant-tasks-2.1.3.jar deleted file mode 100644 index bec446fff5f05d21bee64a25d037c46604d510e0..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/maven-ant-tasks-2.1.3.jar and /dev/null differ diff --git a/jonas_doc/core/tools/win32/iconv.dll b/jonas_doc/core/tools/win32/iconv.dll deleted file mode 100644 index df718829fc0141a05d8a2b2dee34b24a0f61bb2c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/win32/iconv.dll and /dev/null differ diff --git a/jonas_doc/core/tools/win32/libexslt.dll b/jonas_doc/core/tools/win32/libexslt.dll deleted file mode 100644 index 601b84ac8f748b3b71f494412d882aac829be232..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/win32/libexslt.dll and /dev/null differ diff --git a/jonas_doc/core/tools/win32/libxml2.dll b/jonas_doc/core/tools/win32/libxml2.dll deleted file mode 100644 index cf2f92d0eb1de132f8bb4fe4e3e1176c6a5718ff..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/win32/libxml2.dll and /dev/null differ diff --git a/jonas_doc/core/tools/win32/libxslt.dll b/jonas_doc/core/tools/win32/libxslt.dll deleted file mode 100644 index 8e8c9b44d3019cc711e168281b87578dc35a99ed..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/win32/libxslt.dll and /dev/null differ diff --git a/jonas_doc/core/tools/win32/xsltproc.exe b/jonas_doc/core/tools/win32/xsltproc.exe deleted file mode 100644 index f5f4cc8383c88ccb7564cec3ab660dc20cc7a65c..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/win32/xsltproc.exe and /dev/null differ diff --git a/jonas_doc/core/tools/win32/zlib1.dll b/jonas_doc/core/tools/win32/zlib1.dll deleted file mode 100644 index 0b42656c9ab24470d2060e196818a42b4cea9aa7..0000000000000000000000000000000000000000 Binary files a/jonas_doc/core/tools/win32/zlib1.dll and /dev/null differ diff --git a/jonas_doc/plans/pom.xml b/jonas_doc/plans/pom.xml deleted file mode 100644 index 4cc3cafb9f59e687c29029f2c3ea9777a2107658..0000000000000000000000000000000000000000 --- a/jonas_doc/plans/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - jonas-doc-src - org.ow2.jonas.documentation - 5.3.0-M8-SNAPSHOT - - 4.0.0 - org.ow2.jonas.documentation - jonas-doc-en-plan - JOnAS Documentation Source :: Deployment plan - deployment-plan - - - - org.ow2.jonas.documentation - jonas-doc-en - ${project.version} - war - - - - - - - org.ow2.util.maven - maven-deploymentplan-plugin - ${ow2-util-plugin.version} - true - true - - - org.ow2.jonas.documentation:jonas-doc-en:war - - - org.ow2.jonas.documentation:jonas-doc-en:war - - - org.ow2.jonas.documentation:jonas-doc-en:war - - - - - - \ No newline at end of file diff --git a/jonas_doc/pom.xml b/jonas_doc/pom.xml deleted file mode 100644 index f67c5832b6a056e1d0642f45b05c96209bc6baf4..0000000000000000000000000000000000000000 --- a/jonas_doc/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - org.ow2 - ow2 - 1.3 - - 4.0.0 - org.ow2.jonas.documentation - jonas-doc-src - 5.3.0-M8-SNAPSHOT - pom - JOnAS : Java Open Application Server - JOnAS Documentation Source - http://jonas.ow2.org - - - core - plans - - - - - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 - http://www.gnu.org/copyleft/lesser.html - - - - - 1.0.36 - - - - install - - - org.apache.maven.plugins - maven-release-plugin - - - svn+ssh://svn.forge.objectweb.org/svnroot/jonas/jonas/tags - - true - false - - - - - - - - - - - - scm:svn:svn://svn.forge.objectweb.org/svnroot/jonas/jonas/trunk/jonas_doc - scm:svn:svn+ssh://svn.forge.objectweb.org/svnroot/jonas/jonas/trunk/jonas_doc - http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/jonas/trunk/jonas_doc - - - diff --git a/jonas_tests/.classpath b/jonas_tests/.classpath deleted file mode 100644 index 1168799c8a0222f9e472bd244e3ef6da27a016d5..0000000000000000000000000000000000000000 --- a/jonas_tests/.classpath +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/.settings/org.eclipse.jdt.core.prefs b/jonas_tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bf6964c86f221e33877f02f7bd1b6e1d7aa71ffe..0000000000000000000000000000000000000000 --- a/jonas_tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Wed Dec 12 00:55:22 CET 2007 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/jonas_tests/applications/build.xml b/jonas_tests/applications/build.xml deleted file mode 100644 index 44c19d460ddb8c6ca5708dbe6ea38584ebe046ce..0000000000000000000000000000000000000000 --- a/jonas_tests/applications/build.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/applications/src/org/objectweb/jonas/applications/util/JApplicationsTestCase.java b/jonas_tests/applications/src/org/objectweb/jonas/applications/util/JApplicationsTestCase.java deleted file mode 100644 index 91e4c6dbb4cd1d0cbb687470b273e041e4737280..0000000000000000000000000000000000000000 --- a/jonas_tests/applications/src/org/objectweb/jonas/applications/util/JApplicationsTestCase.java +++ /dev/null @@ -1,312 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Matt Wringe - * -------------------------------------------------------------------------- - * $Id: - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.applications.util; - -import java.io.File; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.TestCase; - -import org.ow2.jonas.adm.AdmInterface; - -import com.meterware.httpunit.WebConversation; - -/** - * Define a class to add useful methods for test the examples - * - Deploy ear, war and beans - * - Retrieve initial context - * @author Florent Benoit - */ -public class JApplicationsTestCase extends TestCase { - - /** - * Name of the JOnAS server used for tests - */ - private static String jonasName = "jonas"; - - /** - * Initial context used for lookup - */ - private static Context ictx = null; - - /** - * JOnAS admin used for communicate via JMX to JOnAS - */ - private static AdmInterface admI = null; - - /** - * Conversation used for HttpUnit - */ - protected WebConversation wc = null; - - /** - * URL used for the constructor - */ - protected String url = null; - - /** - * Prefix for build URLs - */ - private String prefixUrl = null; - - /** - * Add to the specified url the prefix - * @param url relative URL - * @return absolute path of URL - */ - protected String getAbsoluteUrl (String url) { - return (this.prefixUrl + url); - } - - /** - * Initialize the port used by tests and the prefix - */ - private void init() { - String port = System.getProperty("http.port"); - if (port == null) { - port = "9000"; - } - - prefixUrl = "http://localhost:" + port; - } - - /** - * Constructor with a specified name - * @param s the name - */ - public JApplicationsTestCase(String s) { - super(s); - init(); - } - /** - * Constructor with a specified name and url - * @param s the name - * @param url the url which can be used - */ - public JApplicationsTestCase(String s, String url) { - super(s); - wc = new WebConversation(); - init(); - this.url = getAbsoluteUrl(url); - } - - /** - * Constructor with a specific name and url - * This constructor is to be used when Basic Authentication - * is required. - * - * @param s the name - * @param url the url which can be used - * @param username the username - * @param password the password - */ - public JApplicationsTestCase(String s, String url, String username, String password) { - super(s); - wc = new WebConversation(); - wc.setAuthorization(username, password); - init(); - this.url = getAbsoluteUrl(url); - } - - /** - * Get initialContext - * @return the initialContext - * @throws NamingException if the initial context can't be retrieved - */ - private Context getInitialContext() throws NamingException { - return new InitialContext(); - } - - /** - * Common setUp routine, used for every test. - * @throws Exception if an error occurs - */ - protected void setUp() throws Exception { - try { - // get InitialContext - if (ictx == null) { - ictx = getInitialContext(); - } - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - - - } catch (NamingException e) { - System.err.println("Cannot setup test: " + e); - e.printStackTrace(); - } - } - - - /** - * Load an ear file in the jonas server - * @param filename ear file, without ".ear" extension - * @throws Exception if an error occurs - */ - public void useEar(String filename) throws Exception { - - try { - // Load ear in JOnAS if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - - if (admI == null) { - admI = (AdmInterface) ictx.lookup(jonasName + "_Adm"); - } - - //Test in both directories (apps/ and apps/autoload) - String appsFileName = filename + ".ear"; - String autoloadAppsFileName = "autoload" + File.separator + filename + ".ear"; - if (!admI.isEarLoaded(appsFileName) && !admI.isEarLoaded(autoloadAppsFileName)) { - //if the file was in autoload, it was loaded - admI.addEar(appsFileName); - } - - } catch (Exception e) { - throw new Exception("Cannot load Ear : " + e.getMessage()); - } - } - - /** - * Load a war file in the jonas server - * @param filename war file, without ".war" extension - * @throws Exception if an error occurs - */ - public void useWar(String filename) throws Exception { - - try { - // Load war in JOnAS if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - - if (admI == null) { - admI = (AdmInterface) ictx.lookup(jonasName + "_Adm"); - } - - //Test in both directories (apps/ and apps/autoload) - String webappsFileName = filename + ".war"; - String autoloadWebappsFileName = "autoload" + File.separator + filename + ".war"; - if (!admI.isWarLoaded(webappsFileName) && !admI.isWarLoaded(autoloadWebappsFileName)) { - //if the file was in autoload, it was loaded - admI.addWar(webappsFileName); - } - - } catch (Exception e) { - throw new Exception("Cannot load War : " + e.getMessage()); - } - } - - /** - * Load a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void useBeans(String filename) throws Exception { - try { - // Load bean in EJBServer if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - if (admI == null) { - admI = (AdmInterface) ictx.lookup(jonasName + "_Adm"); - } - if (!admI.isLoaded(filename + ".jar")) { - admI.addBeans(filename + ".jar"); - } - } catch (Exception e) { - throw new Exception("Cannot load Bean : " + e.getMessage()); - } - } - - - /** - * Unload a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void unUseBeans(String filename) throws Exception { - try { - // Load bean in EJBServer if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - if (admI == null) { - admI = (AdmInterface) ictx.lookup(jonasName + "_Adm"); - } - if (admI.isLoaded(filename + ".jar")) { - admI.removeBeans(filename + ".jar"); - } - } catch (Exception e) { - throw new Exception("Cannot unload Bean : " + e.getMessage()); - } - } - - - /** - * Call the main method of a specific class with empty args - * @param classToLoad name of class which contains the main method - * @throws Exception if it fails - */ - protected void callMainMethod(String classToLoad) throws Exception { - callMainMethod(classToLoad, new String[]{}); - } - - - /** - * Call the main method of a specific class and the specific args - * @param classToLoad name of class which contains the main method - * @param args args to give to the main method - * @throws Exception if it fails - */ - protected void callMainMethod(String classToLoad, String[] args) throws Exception { - //Build classloader - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - URL[] urls = new URL[1]; - urls[0] = new File(System.getProperty("jonas.root") + File.separator + "examples" + File.separator + "classes").toURL(); - URLClassLoader loader = new URLClassLoader(urls); - Thread.currentThread().setContextClassLoader(loader); - Class clazz = loader.loadClass(classToLoad); - Class[] argList = new Class[] {args.getClass()}; - Method meth = clazz.getMethod("main", argList); - Object appli = meth.invoke(null, new Object[]{args}); - } - - - - - -} diff --git a/jonas_tests/build.properties b/jonas_tests/build.properties deleted file mode 100644 index 129b986a2bb487b009b644a0cef245ab027d6a37..0000000000000000000000000000000000000000 --- a/jonas_tests/build.properties +++ /dev/null @@ -1,52 +0,0 @@ -# --------------------------------------------------------------------------- -# JOnAS: Java(TM) Open Application Server -# Copyright (C) 1999 Bull S.A. -# Contact: jonas-team@objectweb.org -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Initial developer(s): Philippe Durieux -# Contributor(s): ______________________________________. -# -# --------------------------------------------------------------------------- -# $Id$ -# --------------------------------------------------------------------------- - -# Properties defined in this file could be customized - -# To use the jike compiler -#build.compiler jikes -build.compiler.emacs true - -# options for java compiler -opt.javac.debug on -opt.javac.optimize off - -# To use the jike compiler -#build.compiler jikes - -# -# genic args -#verbose=true - -# protocols for Carol (jrmp,iiop) -protocols.names=iiop,jrmp -# JOnAS version to be tested -jonas.version 5.3.0-M7-SNAPSHOT -# Webcontainer used -webcontainer.name=Tomcat6 -# examples base dir. -examples.base.dir=examples/base/examples diff --git a/jonas_tests/build.xml b/jonas_tests/build.xml deleted file mode 100755 index 8dbb1e5d85970d5361af7e383307f073bf55e7c1..0000000000000000000000000000000000000000 --- a/jonas_tests/build.xml +++ /dev/null @@ -1,517 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JOnAS Tests Java Documentation

    ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${environment.html} - - ${suiteslist.html} - <a name="conformance"></a><h2>JOnAS Junit Test Suite - conformance</h2> - ${conformance.html} - <a name="examples"></a><h2>JOnAS Junit Test Suite - examples</h2> - - ${examples.html} -<a name="webservices"></a><h2>JOnAS Junit Test Suite - webservices</h2> - - ${ws.html} - - - ${footer.html} - - - - - - - - - - - - - - - - - - - - - Proxy properties : ${proxy.properties.set} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Starting JOnAS - - - - - - - Waiting for JOnAS to activate - - - - - - Setup db environment for JOnAS example eb - - - - Starting JOnAS/Testsuite - - - - Stopping JOnAS - - - - - - - - - - - - - Run newjb for JOnAS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Run newjb for JOnAS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/cluster/build-client.xml b/jonas_tests/cluster/build-client.xml deleted file mode 100644 index f80f1f80066a4e99ee8235509985c3bc573743e4..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/build-client.xml +++ /dev/null @@ -1,607 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JONAS_BASE structure is not initialized properly. - Run ANT create_jonasbase before attempting to create a Win32 Service. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/cluster/build.properties b/jonas_tests/cluster/build.properties deleted file mode 100644 index e55eccf5465eea27bdf222521182da3aa9ed4029..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/build.properties +++ /dev/null @@ -1,44 +0,0 @@ -#jonas start timeout. -jonas.start.timeout=40 -#jonas stop timeout. -jonas.stop.timeout=10 - -#time to wait for deployment of samplecluster2,3 on all the servers. -jonas.deploy.timeout=120 - -#The domain name. -cluster.domain.name=sampleClusterDomain - -# To use the jike compiler -#build.compiler jikes -build.compiler.emacs true - -# options for java compiler -opt.javac.debug on -opt.javac.optimize off - -# To use the jike compiler -#build.compiler jikes - -# -# genic args -#verbose=true - -# protocols for Carol (jrmp,iiop) -protocols.names=iiop,jrmp -# JOnAS version to be tested -jonas.version 5.2.0-M1-SNAPSHOT -# Webcontainer used -webcontainer.name=Tomcat6 - -myjonas.bases.path=test-cluster-bases -#repository.path=c:/home/jemuser/m2-repository -myjonas.root.path=test-cluster-root -# examples base dir. -#examples.base.dir=examples/base/examples - -jonas.version=5.2.0-M1-SNAPSHOT -#jonas.version=5.1.1-SNAPSHOT -junit.version=4.7 -xmlunit.version=1.3 -httpunit.version=1.5.4 diff --git a/jonas_tests/cluster/build.xml b/jonas_tests/cluster/build.xml deleted file mode 100644 index 2a096b799408216146cf47ae8996f5142fc40452..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/build.xml +++ /dev/null @@ -1,1180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/AbsTestClient.java b/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/AbsTestClient.java deleted file mode 100644 index ae52e8836213066327be3a24158d9c063c05015f..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/AbsTestClient.java +++ /dev/null @@ -1,165 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.common; -import java.io.File; -import java.io.InputStream; -import java.util.Properties; - -import junit.framework.TestCase; - -import org.ow2.util.log.Log; -import org.ow2.util.log.LogFactory; - -/** - * @author eyindanga - * - */ -public abstract class AbsTestClient extends TestCase { - /** - * Logger. - */ - protected static final Log LOGGER = LogFactory.getLog(AbsTestClient.class); - - /** - * Number of simultaneous clients to be executed. - */ - protected int clientsNumber = 0; - /** - * The worker - */ - protected Worker worker = null; - - /** - * Check if invocation are terminated. - */ - protected Checker checker = null; - /** - * test properties. - */ - protected Properties testConfig = null; - - /** - * Name of the EJB version - */ - protected String ejbVersion = "ejb2"; - - /** - * Name of the EJB version - */ - protected long checkerSleepTime = 0; - - /** - * Name of the EJB version - */ - protected long workerSleepTime = 0; - /** - * Directory where the test outputs will be printed. - */ - protected String outputDir = null; - /** - * Domain name. - */ - protected String domainName; - /** - * Cluster root stringifiedurl. - */ - protected String clusterRoot; - - /** - * JOnAS root stringifiedurl. - */ - protected String jonasRoot; - /** - * Cluster configuration stringifiedurl. - */ - protected String clusterConfig; - - public AbsTestClient() { - super(); - } - - public AbsTestClient(String s) { - super(s); - } - protected void setUp() throws Exception { - - String propertiesFile = TestEnum.DEF_PROPERTIES_FILE.getPropertyName(); - String usrPropertiesFile = System.getProperty(TestEnum.PROPERTIES_FILE_KEY.getPropertyName()); - ejbVersion = System.getProperty(TestEnum.EJB_VERSION_KEY.getPropertyName()); - outputDir = System.getProperty(TestEnum.OUTPUT_FOLDER_KEY.getPropertyName()); - domainName = System.getProperty(TestEnum.DOMAIN_NAME_KEY.getPropertyName()); - clusterRoot = System.getProperty(TestEnum.CLUSTER_ROOT_KEY.getPropertyName()); - jonasRoot = System.getProperty(TestEnum.CLUSTER_JOnASROOT_KEY.getPropertyName()); - clusterConfig = System.getProperty(TestEnum.CLUSTER_CONFIG_KEY.getPropertyName()); - try { - testConfig = new Properties(); - if(usrPropertiesFile != null) { - //initializes default properties - propertiesFile = usrPropertiesFile; - } - //load the properties. - InputStream in = null; - File f = new File(propertiesFile); - if (f.exists()) { - try { - in = f.getCanonicalFile().toURL().openStream(); - } catch (Exception e) { - // TODO: handle exception - } - } - if (in == null) { - in = Thread.currentThread().getContextClassLoader().getResourceAsStream(f.toString()); - } - if (in == null) { - in = getClass().getClassLoader().getResourceAsStream(f.toString()); - } - if (in == null) { - in = getClass().getClassLoader().getResourceAsStream( - TestEnum.DEF_PROPERTIES_FILE.getPropertyName()); - } - //FileInputStream in = new FileInputStream(propertiesFile); - testConfig.load(in); - in.close(); - String value = testConfig.getProperty(TestEnum.CLIENT_NUMBER_KEY.getPropertyName()); - clientsNumber = Integer.parseInt(value); - LOGGER.debug("Number of clients to be launched : " + clientsNumber); - //get sleep time for checkers and workers. - - value = testConfig.getProperty(TestEnum.CKECKER_SLEEP_TIME_KEY.getPropertyName()); - checkerSleepTime = Long.parseLong(value); - value = testConfig.getProperty(TestEnum.WORKER_SLEEP_TIME_KEY.getPropertyName()); - workerSleepTime = Long.parseLong(value); - worker = new Worker(); - checker = new Checker(checkerSleepTime); - checker.setWorker(worker); - } catch (Exception e) { - LOGGER.error("Exception on setup of {0}, {1}", ejbVersion, e); - // TODO: handle exception - } - LOGGER.debug("Successfully set up client tests for {0}", ejbVersion); - } - -} - diff --git a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/Checker.java b/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/Checker.java deleted file mode 100644 index ad80ff80e03f1a6d618cfb9f490f695644392550..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/Checker.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.common; - -import java.util.Iterator; -import org.ow2.util.log.Log; -import org.ow2.util.log.LogFactory; -public class Checker extends Thread { - /** - * Logger. - */ - protected static final Log LOGGER = LogFactory.getLog(Checker.class); - /** - * Sleep for 10 seconds - */ - private long time2sleep = 10000; - /** - * the worker. - */ - private Worker worker = null; - /** - * Stop this thread if true - */ - private boolean stop = false; - - public Checker() { - super(); - // TODO Auto-generated constructor stub - } - /** - * Contructor using fields. - * @param time2sleep - * @param worker - */ - public Checker(long time2sleep) { - super(); - this.time2sleep = time2sleep; - } - - @Override - public void run() { - LOGGER.info("Running the checker"); - while(!stop) { - try { - LOGGER.debug("Do not stop the checker ....."); - boolean breakLoop = true; - for (Iterator iterator = worker.getTasks().iterator(); iterator - .hasNext();) { - RunnableTask task = (RunnableTask) iterator.next(); - LOGGER.debug("Is the task :{0} terminated ? {1}", task.getName(), task.isTerminated()); - breakLoop = (breakLoop && task.isTerminated()); - } - stop = breakLoop; - LOGGER.debug("Stop the checker ? {0}", stop); - if(!stop) { - LOGGER.debug("Sleeping for :{0} ", time2sleep); - Thread.currentThread().sleep(time2sleep); - } - } catch (InterruptedException e) { - stop = true; - } - } - } - /** - * Set the worker. - * @param worker - */ - public void setWorker(final Worker worker) { - this.worker = worker; - } - /** - * Set the time to sleep. - * @param time2sleep - */ - public void setTime2Sleep(long time2sleep) { - this.time2sleep = time2sleep; - } - /** - * True if the worker is stopped. - * @return true if the worker is stopped. - */ - public boolean stopped() { - return stop; - } - -} diff --git a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/ClientTask.java b/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/ClientTask.java deleted file mode 100644 index ff2f7bae2251e42d15c7a26f40864879e5be3467..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/ClientTask.java +++ /dev/null @@ -1,139 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.common; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; - -import org.ow2.util.log.Log; -import org.ow2.util.log.LogFactory; - -public class ClientTask implements RunnableTask { - /** - * Logger. - */ - protected static final Log LOGGER = LogFactory.getLog(ClientTask.class); - /** - * Any exception thrown on task execution. - */ - protected Exception exception = null; - /** - * Name of the task. - */ - protected String name = null; - /** - * The class to run - */ - private String class2Run = null; - /** - * True if the task is terminated - */ - protected boolean terminated = false; - - /** - * Arguments. - */ - ArrayList args = new ArrayList(); - /** - * return exception thrown on execution. - */ - public Exception getException() { - return exception; - } - /** - * default constructor. - */ - public ClientTask () { - - } - - /** - * Constructor using fields. - */ - public ClientTask(final String name, final String class2run, final String[] vargs) { - this.name = name; - if (vargs != null) { - args.addAll(Arrays.asList(vargs)); - } - this.class2Run = class2run; - } - /** - * Get the name. - */ - public String getName() { - return name; - } - /** - * Return true if the task has ended. - */ - public boolean isTerminated() { - return terminated; - } - - public void setName(final String name) { - this.name = name; - - } - - public void stop() { - Thread.currentThread().interrupt(); - } - /** - * Executes this task. - */ - public void run() { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Class clazz; - try { - //create the output. - clazz = loader.loadClass(class2Run); - LOGGER.info("Invoking {0} with args: {1}", class2Run, args); - String[] ar = {}; - Class[] argList = new Class[] {ar.getClass()}; - Method meth = clazz.getMethod("main", argList); - meth.invoke(null, new Object[] {args.toArray(new String[args.size()])}); - } catch (Exception e) { - //Consider the task is terminated. - terminated = true; - exception = e; - LOGGER.info("Running {0}, {1} terminated with Exception {2} ", name, class2Run, e); - return; - } - LOGGER.info("Running {0}, {1} terminated.", name, class2Run); - terminated = true; - } - /** - * Additional arguments. - * @param args the arguments. - */ - public void addArguments(final String[] vargs) { - if (vargs != null) { - args.addAll(Arrays.asList(vargs)); - } - - } - -} diff --git a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/JOnASTask.java b/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/JOnASTask.java deleted file mode 100644 index b68a942df67c1c6a4725ba7755ab32164696e712..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/JOnASTask.java +++ /dev/null @@ -1,252 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.common; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import javax.management.InstanceNotFoundException; -import javax.management.MBeanException; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.ReflectionException; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; - -public class JOnASTask { - /** - * Output to be used. - */ - protected PrintStream out = null; - /** - * the name of the client. - */ - protected String clientName = "JOnAS Client for cluster-javaee5"; - - /** - * Time to sleep each 10 iterations. - */ - protected long time2sleep = TIME2SLEEP; - - /** - * The configuration file - */ - String clusterConfigFile; - - /** - * The cluster root. - */ - String clusterRoot = null; - - /** - * The JOnAS root. - */ - String jonasRoot = null; - - /** - * Cluster foncfiguration. - */ - private Properties clusterConfig; - /** - * Domain name. - */ - private String domainName = "sampleClusterDomain"; - - List jmxPorts = null; - - /** - * Default time to sleep. - */ - private static final long TIME2SLEEP = 10000; - - public JOnASTask() { - - } - - public JOnASTask(final String[] args) throws Exception { - out = System.out; - clusterConfig = new Properties(); - String url = null; - if(args != null && args.length != 0) { - for (int argn = 0; argn < args.length; argn++) { - String arg = args[argn]; - if("-out".equals(arg)) { - url = args[++argn]; - if (url != null) { - initOut(url); - } - continue; - }else if ("-clientName".equals(arg)) { - clientName = args[++argn]; - out.println("Client name set to : " + clientName); - continue; - }else if ("-time2sleep".equals(arg)) { - String time = args[++argn]; - try { - time2sleep = Long.parseLong(time); - } catch (NumberFormatException e) { - time2sleep = TIME2SLEEP; - } - out.println("Time to sleep set to : " + time2sleep); - continue; - }else if ("-clusterConfig".equals(arg)) { - clusterConfigFile = args[++argn]; - out.println("Cluster configuration file set to : " + clusterConfigFile); - continue; - }else if ("-clusterRoot".equals(arg)) { - clusterRoot = args[++argn]; - out.println("Cluster root set to : " + clusterRoot); - continue; - }else if ("-jonasRoot".equals(arg)) { - jonasRoot = args[++argn]; - out.println("JOnAS root set to : " + jonasRoot); - continue; - }else if ("-domainName".equals(arg)) { - domainName = args[++argn]; - out.println("Domain name root set to : " + clusterRoot); - continue; - } - } - } - if (clusterConfigFile != null) { - initClusterConfig(clusterConfigFile); - } - } - - private void initClusterConfig(final String clusterConfigFile) throws Exception { - InputStream in = null; - File f = new File(clusterConfigFile); - if (f.exists()) { - try { - in = f.getCanonicalFile().toURL().openStream(); - } catch (Exception e) { - // TODO: handle exception - } - } - if (in == null) { - in = Thread.currentThread().getContextClassLoader().getResourceAsStream(f.toString()); - } - if (in == null) { - in = getClass().getClassLoader().getResourceAsStream(f.toString()); - } - if (in == null) { - in = getClass().getClassLoader().getResourceAsStream( - TestEnum.DEF_PROPERTIES_FILE.getPropertyName()); - } - //load the properties. - clusterConfig.load(in); - getJmxPorts(); - in.close(); - - } - private void getJmxPorts() { - // TODO Auto-generated method stub - String ports = clusterConfig.getProperty(TestEnum.JMX_PORTRANGE_KEY.getPropertyName()); - jmxPorts = new ArrayList(); - while(ports != null) { - String port = ports.substring(0, ports.indexOf(",")); - jmxPorts.add(port); - ports = ports.substring(ports.indexOf(",") + 1); - } - - } - - /** - * Runs the client. - * @return 0 if ok, -1 otherwise. - * @throws Exception any. - */ - private int run() throws Exception { - Thread.currentThread().sleep(time2sleep); - execute("stop", 3, null, null); - Thread.currentThread().sleep(time2sleep); - execute("start", 3, null, null); - return 0; - } - private void execute(String operation, int i, Object[] params, String[] signature) - throws IOException, InstanceNotFoundException, MBeanException, ReflectionException { - String jbPrefix = clusterConfig.getProperty(TestEnum.CLUSTER_DEFPREFIX_KEY.getPropertyName()); - String nodeName = jbPrefix + i; - String serviceURL = "service:jmx:rmi://localhost/jndi/rmi://localhost:" - + jmxPorts.get(i - 1) + "/jrmpconnector_" + nodeName; - JMXServiceURL url = new JMXServiceURL(serviceURL); - JMXConnector connector = JMXConnectorFactory.connect(url); - MBeanServerConnection mbeanSrv = connector.getMBeanServerConnection(); - mbeanSrv.invoke(J2EEServer(domainName, nodeName), operation, params, signature); - } - - /** - * Initializes client output. - * @param url Stringified url of the client output file. - */ - private void initOut(final String url) throws Exception { - try { - FileOutputStream file = new FileOutputStream(url, true); - out.println("Initializing output '" + url + "' for " + clientName); - out = new PrintStream(file, true); - } catch (Exception e) { - out.println("Unable to initialize output for " + clientName + " because : " + e); - throw new Exception("Unable to initialize output for " + clientName, e); - } - } - /** - * Main method. - * @param args the arguments - * @return 0 if ok, -1 otherwise. - * @throws Exception - */ - public static int main(String[] args) throws Exception { - JOnASTask jtask = new JOnASTask(args); - return jtask.run(); - } - - /** - * Create ObjectName for a J2EEServer MBean. - * @param pDomain domain name - * @param pServer server name - * @return the created ObjectName - */ - public static ObjectName J2EEServer(final String pDomain, final String pServer) { - try { - StringBuffer sb = new StringBuffer(pDomain); - sb.append(":j2eeType=J2EEServer"); - sb.append(",name="); - sb.append(pServer); - return new ObjectName(sb.toString()); - } catch (javax.management.MalformedObjectNameException e) { - // this should never occur - return null; - } - } - - -} diff --git a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/RunnableTask.java b/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/RunnableTask.java deleted file mode 100644 index 10693f422e93831efa2187123e26ead43c6ac513..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/RunnableTask.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.common; - -public interface RunnableTask extends Runnable { - /** - * Stops the task. - * @throws Exception - */ - public void stop(); - /** - * Set the name of the task. - * @param name the name to set. - */ - public void setName(String name); - /** - * Get the name of the task - * @return - */ - public String getName(); - /** - * True if the task has ended. - * @return true if the task has ended. - */ - public boolean isTerminated(); - - /** - * Returns any exception thrown on task execution. - * @return any exception thrown on task execution. - */ - public Exception getException(); -} diff --git a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/TestEnum.java b/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/TestEnum.java deleted file mode 100644 index 67788e9ed1037a8854d16115c2c8a0afd29c1e7c..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/TestEnum.java +++ /dev/null @@ -1,134 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.common; - -public enum TestEnum { - /** - * Key for sleeping time of a checker - */ - CKECKER_SLEEP_TIME_KEY("checker.sleep.time"), - /** - * Key for sleeping time of a worker - */ - WORKER_SLEEP_TIME_KEY("worker.sleep.time"), - /** - * Key for properties file. - */ - PROPERTIES_FILE_KEY("test.properties.file"), - /** - * Key for cluster properties file. - */ - CLUSTER_PROPERTIES_FILE_KEY("cluster.properties.file"), - /** - * Default properties file. - */ - DEF_PROPERTIES_FILE("defConf.properties"), - - /** - * Key for sleeping time of a worker - */ - EJB_VERSION_KEY("ejb.version"), - - /** - * Key for sleeping time of a worker - */ - PROVIDER_URL_KEY("cmiclient.provider.url"), - - /** - * Key for sleeping time of a worker - */ - TEST_CMIURL_KEY("cmi.config.url"), - - /** - * Key for sleeping time of a worker - */ - CMI_URL_KEY("cmi.conf.url"), - - /** - * Key for output folder. - */ - OUTPUT_FOLDER_KEY("testejb.output.dir"), - /** - * key for sleeping time of a worker - */ - CLIENT_NUMBER_KEY("clients.number"), - - /** - * key for cluster root. - */ - CLUSTER_ROOT_KEY("cluster.root"), - - /** - * key for cluster root. - */ - CLUSTER_JOnASROOT_KEY("cluster.jonas.root"), - - /** - * key for cluster configuration. - */ - CLUSTER_CONFIG_KEY("cluster.config"), - - /** - * key for domain name. - */ - DOMAIN_NAME_KEY("domain.name"), - - /** - * Default properties file. - */ - DEF_NEWJC_FILE("build-jc.properties"), - /** - * key for default prefix of cluster instances. - */ - JMX_PORTRANGE_KEY("carol.portrange"), - /** - * key for default prefix of cluster instances. - */ - CLUSTER_DEFPREFIX_KEY("jonas.base.defaultprefix"); - - /** - * A name of property. - */ - private final String propertyName; - - private TestEnum(final String propertyName) { - this.propertyName = propertyName; - } - - /** - * @return the name of property - */ - @Override - public String toString() { - return propertyName; - } - - /** - * @return the name of property - */ - public String getPropertyName() { - return propertyName; - } -} diff --git a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/Worker.java b/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/Worker.java deleted file mode 100644 index 4028fe001278fdfd200cf6b7fe05556374679b1e..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/Worker.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.common; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -public class Worker implements Runnable { - /** - * Tasks. - */ - List tasks = new ArrayList(); - /** - * Tasks failures - */ - Map tasksFailures = new HashMap(); - public void run() { - // TODO Auto-generated method stub - for (Iterator iterator = tasks.iterator(); iterator.hasNext();) { - RunnableTask task = iterator.next(); - Thread thr = new Thread(null, task, task.getName()); - thr.start(); - } - } - /** - * Add a task. - * @param task - */ - public void addTask(final RunnableTask task) { - tasks.add(task); - } - /** - * Get the tasks. - * @return - */ - public List getTasks() { - return tasks; - } - /** - * Retunr tru if any task failed. - * @return - */ - public boolean hasFailure() { - Exception e = null; - for (Iterator iterator = tasks.iterator(); iterator.hasNext();) { - RunnableTask task = iterator.next(); - e = task.getException(); - if(e != null) { - tasksFailures.put(task.getName(), e); - } - } - return !tasksFailures.isEmpty(); - } - /** - * Clear the worker - */ - public void clear() { - tasks.clear(); - tasksFailures.clear(); - } - - /** - * Gets failure per tasks - */ - public Map getTasksFailures() { - return tasksFailures; - } - -} diff --git a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/build-jc.properties b/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/build-jc.properties deleted file mode 100644 index e318642a28297af27b8e2125b2f70756c98ece38..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/build-jc.properties +++ /dev/null @@ -1,161 +0,0 @@ -# Prefix for JONAS_BASE directories -jonas.base.defaultprefix=jb - -#Drivers directory -drivers.dir=jc.config/lib - -#Cluster architecture : -# bothWebEjb : both web and ejb services and each instance -# diffWebEjb : dedicates instances to web level and separated instances to ejb level -cluster.architecture.default=diffWebEjb - -#Cluster architecture : -# nodes name : prefix of the node names -cluster.nodesName=node - -#Cluster daemon configuration -cluster.daemon.name=cd -cluster.daemon.protocol=jrmp -cluster.daemon.port=1806 -cluster.daemon.dir=cd -#enable this to set JAVA_HOME of the cluster daemon -#cluster.daemon.jdk=/usr/java/jdk/sun/current-1.5 -cluster.daemon.interactionMode=loosely-coupled -cluster.daemon.autoBoot=false -cluster.daemon.xprm=-Djava.net.preferIPv4Stack=true - -#Services -jonas.web.services=registry,jmx,jtm,security,cmi,jaxrpc,web,ear,depmonitor,discovery -jonas.ejb.services=registry,jmx,jtm,db,security,resource,cmi,ha,ejb2,ejb3,ear,depmonitor,discovery -jonas.full.services=registry,jmx,jtm,db,security,resource,cmi,ha,ejb2,ejb3,jaxrpc,jaxws,web,ear,depmonitor,discovery - -#Jms -jms.portrange=16010,16020,16030,16040 -jms.topics=sampleTopic,InvoiceTopic -jms.queues=sampleQueue,OrderApprovalQueue,OrdersQueue,MailCompletedOrderQueue,SupPurchaseOrderQueue,MailOrderApprovalQueue,MailQueue - -#Carol -carol.portrange=2002,2022,2032,2043 -carol.defaultprotocol=jrmp -carol.jrmpopt=false - -# Cmi service -cmi.mcastaddr=224.0.0.35 -cmi.mcastport=35467 - -# Ha service -ha.mcastaddr=224.0.0.36 -ha.mcastport=35468 - -#Web -webcontainer.httpportrange=9000,9200,9300,9400 -webcontainer.ajpportrange=9010,9011,9012,9013 -webcontainer.stickysession=false -webcontainer.mod_jkenabled=true -webcontainer.mod_jk.dir=conf/jk -webcontainer.mod_jk.lbfactorrange=1,1,1,1 -webcontainer.directorenabled=false -webcontainer.directorportrange=9996,9997,9998,9999 -webcontainer.director.lbfactorrange=1,1,1,1 -webcontainer.director.dir=director -webcontainer.cluster.name=myTomcatCluster -webcontainer.cluster.mcastaddr=228.0.0.4 -webcontainer.cluster.mcastport=45564 -webcontainer.cluster.listenportrange=4003,4004,4005,4006 -# Enable ondemand on web instances -webinstances.ondemandenabled=true -webinstances.ondemand.redirectport=0 - -#disable development mode on web instances. -webinstances.devmodeenabled=false -#enable development mode for depmonitor on ejb instances. -webinstances.depmonitor.devmodeenabled=true - -#Tomcat -webcontainer.service.defaultname=tomcat - -#disable ondemand on ejb instances -ejbinstances.ondemandenabled=false -#disable development mode on ejb instances. -ejbinstances.devmodeenabled=false -#enable development mode for depmonitor on ejb instances. -ejbinstances.depmonitor.devmodeenabled=true - -#Director -director.lib.jarfile=tomcat5.5-director.jar - -#Discovery service -discovery.sourceportrange=-1,-1,-1,-1 -discovery.greetingportrange=9899,9900,9901,9902 -discovery.mcastaddr=224.224.224.224 -discovery.mcastport=9080 -discovery.domainName=sampleClusterDomain -discovery.domainDesc=A domain for management of cluster examples. -discovery.clusterName=mycluster -discovery.clusterDesc=A cluster sample. -# specify here the node number that will be the master. By default, the feature -# is supported by a dedicated node but the file is generated in the first cluster -# member. Then it will copy to the master conf dir -discovery.masternode=1 - -#Master node when the feature is shipped by a dedicated node (default) -master.dir=master -master.nodeName=master - -#Db -db.portrange=9001,9002,9003,9004 -db.dir=db -db.nodeName=db - - -#Database -rajdbc.defaultname=hsql - -#DB connections - -rajdbc.hsql.user=jonas -rajdbc.hsql.password=jonas -rajdbc.hsql.url=jdbc:hsqldb:hsql://localhost:9005/db_jonas -rajdbc.hsql.drivername=org.hsqldb.jdbcDriver -rajdbc.hsql.jndiname=jdbc_1 -rajdbc.hsql.jdbcdriverjarfile=none -rajdbc.hsql.mappername=rdb.hsql - -rajdbc.postgresql.user=jonas -rajdbc.postgresql.password=jonas -rajdbc.postgresql.url=jdbc:postgresql://localhost:5433/db_jonas -rajdbc.postgresql.drivername=org.postgresql.Driver -rajdbc.postgresql.jndiname=jdbc_1 -rajdbc.postgresql.jdbcdriverjarfile=postgresql.jar -rajdbc.postgresql.mappername=rdb.postgresql - -rajdbc.oracle.user=jonas -rajdbc.oracle.password=jonas -rajdbc.oracle.url=jdbc:oracle:thin:@localhost:1521:db_jonas -rajdbc.oracle.drivername=oracle.jdbc.driver.OracleDriver -rajdbc.oracle.jndiname=jdbc_1 -rajdbc.oracle.jdbcdriverjarfile=ojdbc5.jar -rajdbc.oracle.mappername=rdb.oracle - -rajdbc.mysql.user=root -rajdbc.mysql.password= -rajdbc.mysql.url=jdbc:mysql:http://localhost:3306/db_jonas -rajdbc.mysql.drivername=org.gjt.mm.mysql.Driver -rajdbc.mysql.jndiname=jdbc_1 -rajdbc.mysql.jdbcdriverjarfile=mysql-connector-java.jar -rajdbc.mysql.mappername=rdb.mysql - - -#Mail -mail.session.name=mailSession_1 -mail.mimepartds.name=mailMimePartDS_1 -mail.to=jean.dupont@ow2.org -mail.subject=test mail -mail.host=localhost - -#Wsdl -wsdl.file.name=wsdlPublishFile -wsdl.file.dir=/tmp/ - -# script -script.node.basename=node diff --git a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/defConf.properties b/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/defConf.properties deleted file mode 100644 index c0165582a9c3b8a8a3065e7f3ad8a814419bc15f..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/commons/src/org/ow2/jonas/cluster/test/common/defConf.properties +++ /dev/null @@ -1,6 +0,0 @@ -#The checker sleeps for 15 seconds. -checker.sleep.time=15000 -#The checker sleeps for 15 seconds. -worker.sleep.time=15000 -# number of clients to be launched simultaneously -clients.number=5 \ No newline at end of file diff --git a/jonas_tests/cluster/etc/footer.html b/jonas_tests/cluster/etc/footer.html deleted file mode 100644 index b605728ee26a9b0a7be60e81d23f660a87893ebb..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/etc/footer.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/jonas_tests/cluster/etc/header.html b/jonas_tests/cluster/etc/header.html deleted file mode 100644 index 0331814e2bf2ef9a48c967a9a51a547bc74c3ac0..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/etc/header.html +++ /dev/null @@ -1,154 +0,0 @@ - - - - - @title@ - - - - -

    JOnAS Junit Test Report : @subtitle@

    diff --git a/jonas_tests/cluster/etc/style/environment/junit-noframes.xsl b/jonas_tests/cluster/etc/style/environment/junit-noframes.xsl deleted file mode 100644 index 9601aad1fbbec77140e7f5cbd12bf29d80871f34..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/etc/style/environment/junit-noframes.xsl +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - -

    Environment

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    JOnAS Version
    Packaging
    JONAS_ROOT
    JONAS_BASE
    Version JDK
    Version ANT
    Protocol
    DataSource
    System
    Host
    Author
    Date
    - -
    - - - -
    - diff --git a/jonas_tests/cluster/etc/style/include/junit-noframes.xsl b/jonas_tests/cluster/etc/style/include/junit-noframes.xsl deleted file mode 100644 index 3b5448781b56286a6672e0764e57f75127eaaf28..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/etc/style/include/junit-noframes.xsl +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - - - - - - -
    - - -
    - - - -
    - - - - -
    - - - - - - - -

    Packages

    - Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. - - - - - - - - - - - - - - - - - Failure - Error - - - - - - - - - -
    - - - -
    -
    - - - - - - - - - - - - -

    Package

    - - - - - - -
    - Back to top -

    -

    - - - - - - - - -

    TestCase

    - - - - - - - - - - -
    -

    - - Back to top - - - - -

    Summary

    - - - - - - - - - - - - - - - - - Failure - Error - - - - - - - - - -
    TestsFailuresErrorsSuccess rateTime
    - - - - - - - -
    - - - - -
    - Note: failures are anticipated and checked for with assertions while errors are unanticipated. -
    -
    - - - - - - Name - Tests - Errors - Failures - Time(s) - - - - - - - Name - Tests - Errors - Failures - Time(s) - - - - - - - Testcase - Test - Status - Type - Time(s) - - - - - - - - - - - Failure - Error - - - - - - - - - - - - - - - - - - - - - Error - - - - - - - - - Failure - - - - Error - - - - Success - - - - - - - - - - - - - - - - - - - - - - - - N/A - - - - - - - - - - - - - - - - -
    - diff --git a/jonas_tests/cluster/etc/style/standalone/junit-noframes.xsl b/jonas_tests/cluster/etc/style/standalone/junit-noframes.xsl deleted file mode 100644 index 652120da25664f0e15220643e3f26fb564505933..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/etc/style/standalone/junit-noframes.xsl +++ /dev/null @@ -1,591 +0,0 @@ - - - - - - - - - - Test Results - - - - - - - - - - - -
    - - -
    - - - -
    - - - - - - -
    - - - - - - - - - -

    Environment

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    JOnAS Version
    Packaging
    JONAS_ROOT
    JONAS_BASE
    Version JDK
    Version ANT
    Protocol
    DataSource
    System
    Host
    Author
    Date
    - -
    - - - - - - - - - -

    Packages

    - Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. - - - - - - - - - - - - - - - - - Failure - Error - - - - - - - - - -
    - - - -
    -
    - - - - - - - - - - - - -

    Package

    - - - - - - -
    - Back to top -

    -

    - - - - - - - - -

    TestCase

    - - - - - - - - - - -
    -

    - - Back to top - - - - -

    Summary

    - - - - - - - - - - - - - - - - - - Failure - Error - - - - - - - - - -
    TestsFailuresErrorsSuccess rateTime
    - - - - - - - -
    - - - - -
    - Note: failures are anticipated and checked for with assertions while errors are unanticipated. -
    -
    - - - - -

    -
    - - - - Name - Tests - Errors - Failures - Time(s) - - - - - - - Name - Tests - Errors - Failures - Time(s) - - - - - - - Testcase - Test - Status - Type - Time(s) - - - - - - - - - - - Failure - Error - - - - - - - - - - - - - - - - - - - - Error - - - - - - - - - Failure - - - - Error - - - - Success - - - - - - - - - - - - - - - - - - - - - - - - N/A - - - - - - - - - - - - - - - - -
    - diff --git a/jonas_tests/cluster/etc/style/standalone_perfs/compare.xsl b/jonas_tests/cluster/etc/style/standalone_perfs/compare.xsl deleted file mode 100644 index 539b67712bd1e923617ae5d0c0b8a0ebb4614aa5..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/etc/style/standalone_perfs/compare.xsl +++ /dev/null @@ -1,559 +0,0 @@ - - - - - - - - - - Test Results - - - - - - - - - - - -
    - - -
    - - - -
    - - - - - - -
    - - - - - - - - - -

    Environment

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    JOnAS Version
    Packaging
    Version JDK
    Version ANT
    DataSource
    System
    Arch
    Version
    Host
    Author
    Date
    - -
    - - - - - - - - - -

    Packages

    - Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - -
    -
    - - - - - - - - - - - - -

    Package

    - - - - - - -
    - Back to top -

    -

    - - - - - - - - -

    TestCase

    - - - - - - - - - - -
    -

    - - Back to top - - - - -

    Summary

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    TestsSuccess rateTime jrmpTime iiop
    - - - - - - - - - - - - - -
    -
    - - - - -

    -
    - - - - Name - Tests - Time(s) jrmp - Time(s) iiop - Time(s) jeremie - - - - - - - Name - Tests - Time(s) jrmp - Time(s) iiop - Time(s) jeremie - - - - - - - Name - - Time(s) jrmp - Time(s) iiop - Time(s) jeremie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - diff --git a/jonas_tests/cluster/etc/style/standalone_perfs/junit-noframes.xsl b/jonas_tests/cluster/etc/style/standalone_perfs/junit-noframes.xsl deleted file mode 100644 index da817e033c62017909bf6c867daf767549644d77..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/etc/style/standalone_perfs/junit-noframes.xsl +++ /dev/null @@ -1,588 +0,0 @@ - - - - - - - - - - Test Results - - - - - - - - - - - -
    - - -
    - - - -
    - - - - - - -
    - - - - - - - - - -

    Environment

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    JOnAS Version
    Packaging
    JONAS_ROOT
    JONAS_BASE
    Version JDK
    Version ANT
    Protocol
    DataSource
    System
    Host
    Author
    Date
    - -
    - - - - - - - - - -

    Packages

    - Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. - - - - - - - - - - - - - - - - - Failure - Error - - - - - - - - - -
    - - - -
    -
    - - - - - - - - - - - - -

    Package

    - - - - - - -
    - Back to top -

    -

    - - - - - - - - -

    TestCase

    - - - - - - - - - - -
    -

    - - Back to top - - - - -

    Summary

    - - - - - - - - - - - - - - - - - - Failure - Error - - - - - - - - - -
    TestsFailuresErrorsSuccess rateTime
    - - - - - - - -
    - - - - -
    - Note: failures are anticipated and checked for with assertions while errors are unanticipated. -
    -
    - - - - -

    -
    - - - - Name - Tests - Errors - Failures - Time(s) - - - - - - - Name - Tests - Errors - Failures - Time(s) - - - - - - - Testcase - Test - Status - Type - Time(s) - - - - - - - - - - - Failure - Error - - - - - - - - - - - - - - - - - - - - Error - - - - - - - - Failure - - - - Error - - - - Success - - - - - - - - - - - - - - - - - - - - - - - - N/A - - - - - - - - - - - - - - - - -
    - diff --git a/jonas_tests/cluster/etc/suiteslist.html b/jonas_tests/cluster/etc/suiteslist.html deleted file mode 100644 index 9bf624aea555a0c4c94e362b8ea4b8da8d4430d6..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/etc/suiteslist.html +++ /dev/null @@ -1,18 +0,0 @@ -

    All Suites

    - - - - - - - - - - - - - - - - -
    Name
    JOnAS Junit Test Suite - conformance
    JOnAS Junit Test Suite - examples
    JOnAS Junit Test Suite - webservices
    diff --git a/jonas_tests/cluster/logging/logging.properties b/jonas_tests/cluster/logging/logging.properties deleted file mode 100644 index 24b08f8eb94b319cda660042ba71a7ad13605e22..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/logging/logging.properties +++ /dev/null @@ -1,80 +0,0 @@ -# --------------------------------------------------------------------------- -# JOnAS: Java(TM) Open Application Server -# Copyright (C) 2010 Bull S.A.S. -# Contact: jonas-team@ow2.org -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# -# --------------------------------------------------------------------------- -# $Id$ -# --------------------------------------------------------------------------- - - -############################################################ -# Default Logging Configuration File -# -# You can use a different file by specifying a filename -# with the java.util.logging.config.file system property. -# For example java -Djava.util.logging.config.file=myfile -############################################################ - -############################################################ -# Global properties -############################################################ - -# "handlers" specifies a comma separated list of log Handler -# classes. These handlers will be installed during VM startup. -# Note that these classes must be on the system classpath. -# By default we only configure a ConsoleHandler, which will only -# show messages at the INFO and above levels. -handlers= java.util.logging.ConsoleHandler - -# To also add the FileHandler, use the following line instead. -#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler - -# Default global logging level. -# This specifies which kinds of events are logged across -# all loggers. For any given facility this global level -# can be overriden by a facility specific level -# Note that the ConsoleHandler also has a separate level -# setting to limit messages printed to the console. -.level= INFO - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -# default file output is in user's home directory. -java.util.logging.FileHandler.pattern = %h/java%u.log -java.util.logging.FileHandler.limit = 50000 -java.util.logging.FileHandler.count = 1 -java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter - -# Limit the message that are printed on the console to INFO and above. -java.util.logging.ConsoleHandler.level = INFO -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -# For example, set the com.xyz.foo logger to only log SEVERE -# messages: -org.ow2.cmi.controller.client.level=FINEST diff --git a/jonas_tests/cluster/resources/cmi-client.xml b/jonas_tests/cluster/resources/cmi-client.xml deleted file mode 100644 index 6a538fcea44f8011adeb56bc3c2a1ff91bc207ff..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/resources/cmi-client.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - rmi://localhost:2032 - rmi://localhost:2043 - - - - - - \ No newline at end of file diff --git a/jonas_tests/cluster/resources/test-config.properties b/jonas_tests/cluster/resources/test-config.properties deleted file mode 100644 index 8bfd99f77e46c79982563c3c1359d228aacc29de..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/resources/test-config.properties +++ /dev/null @@ -1,6 +0,0 @@ -#The checker sleeps for 10 seconds. -checker.sleep.time=10000 -#The checker sleeps for 10 seconds. -worker.sleep.time=10000 -# number of clients to be launched simultaneously -clients.number=1 \ No newline at end of file diff --git a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/j2ee14/ClientTest.java b/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/j2ee14/ClientTest.java deleted file mode 100644 index 47351d94f0e541b914d14739e8aea774962b3856..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/j2ee14/ClientTest.java +++ /dev/null @@ -1,193 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.cluster.test.j2ee14; - -import java.io.File; -import java.util.ArrayList; - -import junit.framework.TestSuite; - -import org.ow2.jonas.cluster.test.common.AbsTestClient; -import org.ow2.jonas.cluster.test.common.ClientTask; -import org.ow2.jonas.cluster.test.common.RunnableTask; -import org.ow2.jonas.cluster.test.common.Worker; -/** - * - * @author Nicolas Duvauchel - * - */ -public class ClientTest extends AbsTestClient { - - /** - * The worker - */ - protected static Worker jworker = null; - - public static void main(String args[]) { - junit.textui.TestRunner.run(suite()); - } - - public static TestSuite suite() { - return new TestSuite(ClientTest.class); - } - - public ClientTest(String s) { - super(s); - } - - protected void setUp() throws Exception { - super.setUp(); -// if (jworker == null) { -// jworker = new Worker(); -// ArrayList arg = new ArrayList(); -// arg.add("-out"); -// arg.add(outputDir + File.separator + "cluster-j2ee14.jonasTask.txt"); -// arg.add("-clientName"); -// arg.add("cluster-j2ee14.jonasTask"); -// arg.add("-clusterConfig"); -// arg.add(clusterConfig); -// arg.add("-clusterRoot"); -// arg.add(clusterRoot); -// arg.add("-jonasRoot"); -// arg.add(jonasRoot); -// arg.add("-domainName"); -// arg.add(domainName); -// RunnableTask task = new ClientTask("cluster-j2ee14.jonasTask", "org.ow2.jonas.cluster.test.common.JOnASTask", arg.toArray(new String[arg.size()])); -// jworker.addTask(task); -// jworker.run(); -// } - } - - public void testLBHome() throws Exception { - LOGGER.info("cluster-j2ee14.testLBHome "); - RunnableTask task = null; - - ArrayList arg = new ArrayList(); - for(int i = 0; i < clientsNumber; i++) { - arg.add("-clientName"); - arg.add("cluster-j2ee14.testLBHome_" + i); - arg.add("-out"); - arg.add(outputDir + File.separator + "cluster-j2ee14.testLBHome_" + i + ".txt"); - task = new ClientTask("cluster-j2ee14.testLBHome_" + i, - "org.ow2.jonas.examples.cluster.j2ee14.client.ClientLBHome", arg.toArray(new String[arg.size()])); - worker.addTask(task); - } - worker.run(); - /**start the ckecker **/ - checker.start(); - while(!checker.stopped()) { - // sleep. - Thread.currentThread().sleep(checkerSleepTime); - } - if(worker.hasFailure()) { - fail("on testLBHome" + worker.getTasksFailures()); - } - worker.clear(); - LOGGER.info("cluster-j2ee14.testLBHome is ok"); - } - - public void testFOSFSB() throws Exception { - LOGGER.info("cluster-j2ee14.testFOSFSB"); - RunnableTask task = null; - ArrayList arg = new ArrayList(); - for(int i = 0; i < clientsNumber; i++) { - arg.add("-clientName"); - arg.add("cluster-j2ee14.testFOSFSB_" + i); - arg.add("-out"); - arg.add(outputDir + File.separator + "cluster-j2ee14.testFOSFSB_" + i + ".txt"); - task = new ClientTask("cluster-j2ee14.testFOSFSB_" + i, - "org.ow2.jonas.examples.cluster.j2ee14.client.ClientFOSFSB", arg.toArray(new String[arg.size()])); - worker.addTask(task); - } - worker.run(); - /**start the ckecker **/ - checker.start(); - while(!checker.stopped()) { - // sleep. - Thread.currentThread().sleep(checkerSleepTime); - } - if(worker.hasFailure()) { - fail("on cluster-j2ee14.testFOSFSB" + worker.getTasksFailures()); - } - worker.clear(); - LOGGER.info("cluster-j2ee14.testFOSFSB is ok"); - } - - public void testLBLookup() throws Exception { - LOGGER.info("cluster-j2ee14.testLBLookup"); - RunnableTask task = null; - ArrayList arg = new ArrayList(); - for(int i = 0; i < clientsNumber; i++) { - arg.add("-clientName"); - arg.add("cluster-j2ee14.testLBLookup_" + i); - arg.add("-out"); - arg.add(outputDir + File.separator + "cluster-j2ee14.testLBLookup_" + i + ".txt"); - task = new ClientTask("cluster-j2ee14.testLBLookup_" + i, - "org.ow2.jonas.examples.cluster.j2ee14.client.ClientLBLookup", arg.toArray(new String[arg.size()])); - worker.addTask(task); - } - worker.run(); - /**start the ckecker **/ - checker.start(); - while(!checker.stopped()) { - // sleep. - Thread.currentThread().sleep(checkerSleepTime); - } - if(worker.hasFailure()) { - fail("on cluster-j2ee14.testLBLookup" + worker.getTasksFailures()); - } - worker.clear(); - LOGGER.info("cluster-j2ee14.testLBLookup is ok"); - } - - public void testLBRemote() throws Exception { - LOGGER.info("cluster-j2ee14.testLBRemote"); - RunnableTask task = null; - ArrayList arg = new ArrayList(); - for(int i = 0; i < clientsNumber; i++) { - arg.add("-clientName"); - arg.add("cluster-j2ee14.testLBRemote_" + i); - arg.add("-out"); - arg.add(outputDir + File.separator + "cluster-j2ee14.testLBRemote_" + i + ".txt"); - task = new ClientTask("cluster-j2ee14.testLBRemote_" + i, - "org.ow2.jonas.examples.cluster.j2ee14.client.ClientLBRemote", arg.toArray(new String[arg.size()])); - worker.addTask(task); - } - worker.run(); - /**start the ckecker **/ - checker.start(); - while(!checker.stopped()) { - // sleep. - Thread.currentThread().sleep(checkerSleepTime); - } - if(worker.hasFailure()) { - fail("on cluster-j2ee14.testLBRemote" + worker.getTasksFailures()); - } - worker.clear(); - LOGGER.info("cluster-j2ee14.testLBRemote is ok"); - } - -} diff --git a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/j2ee14/SampleCluster2Test.java b/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/j2ee14/SampleCluster2Test.java deleted file mode 100644 index 9f8659da7fb3836ab3f86a93b09087999adc95e7..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/j2ee14/SampleCluster2Test.java +++ /dev/null @@ -1,181 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.cluster.test.j2ee14; - -import java.io.IOException; -import java.net.MalformedURLException; - -import org.xml.sax.SAXException; - -import com.meterware.httpunit.GetMethodWebRequest; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebRequest; -import com.meterware.httpunit.WebResponse; - -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * the aim of this class is to check the different calls made in sampleCluster2 - * example. - * @author Nicolas Duvauchel - */ -public class SampleCluster2Test extends TestCase { - - /** - * the link with the web page - */ - private static WebConversation conversation = null; - /** - * default HTTP ports. - */ - private static final String[] default_http_ports = {"9000", "9200"}; - /** - * @param args - */ - public static void main(String args[]) { - junit.textui.TestRunner.run(suite()); - } - - /** - * @return the test suite - */ - public static TestSuite suite() { - return new TestSuite(SampleCluster2Test.class); - } - - /** - * @param s - */ - public SampleCluster2Test(String s) { - super(s); - } - - /** - * set up parameters for the tests - */ - protected void setUp() throws Exception { - try { - if (conversation == null) { - System.out.println("setting up conversation."); - conversation = new WebConversation(); - } - } catch (Exception e) { - fail("Unable to set up web tests " + e); - } - - } - - /** - * test if the page is accessible - * @throws Exception - */ - public void testReachable() throws Exception { - - try { - for (String port: default_http_ports) { - WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster2"); - WebResponse response = conversation.getResponse(request); - System.out.println(response.getText()); - } - - } catch (Exception e) { - fail("on test Reachable: " + e); - } - - } - - /** - * test and create a session - * @throws Exception - */ - public void testSession() throws Exception { - try { - for (String port: default_http_ports) { - WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster2/servlet/session"); - - WebResponse response = conversation.getResponse(request); - System.out.println(response.getText()); - } - - } catch (Exception e) { - fail("on test Session: " + e); - } - } - - /** - * test and check the session - * @throws Exception - */ - public void testCheck() throws Exception { - try { - for (String port: default_http_ports) { - WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster2/servlet/check"); - - WebResponse response = conversation.getResponse(request); - System.out.println(response.getText()); - } - - } catch (Exception e) { - fail("on test Check: " + e); - } - } - - /** - * test and release the session - * @throws Exception - */ - public void testRelease() throws Exception { - try { - for (String port: default_http_ports) { - WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster2/servlet/release"); - WebResponse response = conversation.getResponse(request); - System.out.println(response.getText()); - } - - } catch (Exception e) { - fail("on test Release: " + e); - } - } - - /** - * test the exception - * @throws Exception - */ -// public void testException() throws Exception { -// try { -// for (String port: default_http_ports) { -// WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster2/servlet/exception"); -// WebResponse response = conversation.getResponse(request); -// System.out.println(response.getText()); -// } -// -// } catch (Exception e) { -// fail("on test Exception: " + e); -// } -// } - -} diff --git a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/ClientTest.java b/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/ClientTest.java deleted file mode 100644 index e02bfd52eaf63853970609b64e29cb646d397072..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/ClientTest.java +++ /dev/null @@ -1,175 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.cluster.test.javaee5; - -import java.io.File; -import java.util.ArrayList; - -import junit.framework.TestSuite; - -import org.ow2.jonas.cluster.test.common.AbsTestClient; -import org.ow2.jonas.cluster.test.common.ClientTask; -import org.ow2.jonas.cluster.test.common.RunnableTask; -import org.ow2.jonas.cluster.test.common.Worker; -/** - * - * @author eyindanga - * - */ -public class ClientTest extends AbsTestClient { - /** - * The worker - */ - protected static Worker jworker = null; - - public static void main(String args[]) { - junit.textui.TestRunner.run(suite()); - } - - public static TestSuite suite() { - return new TestSuite(ClientTest.class); - } - - public ClientTest(String s) { - super(s); - } - - protected void setUp() throws Exception { - super.setUp(); -// if (jworker == null) { -// jworker = new Worker(); -// ArrayList arg = new ArrayList(); -// arg.add("-out"); -// arg.add(outputDir + File.separator + "cluster-javaee5.jonasTask.txt"); -// arg.add("-clientName"); -// arg.add("cluster-javaee5.jonasTask"); -// arg.add("-clusterConfig"); -// arg.add(clusterConfig); -// arg.add("-clusterRoot"); -// arg.add(clusterRoot); -// arg.add("-domainName"); -// arg.add(domainName); -// RunnableTask task = new ClientTask("cluster-javaee5.jonasTask", "org.ow2.jonas.cluster.test.common.JOnASTask", arg.toArray(new String[arg.size()])); -// jworker.addTask(task); -// jworker.run(); -// } - } - - /** - * Test Exception. - * @throws Exception any. - */ - public void testException() throws Exception { - LOGGER.info("cluster-javaee5.testException"); - RunnableTask task = null; - ArrayList arg = new ArrayList(); - for(int i = 0; i < clientsNumber; i++) { - arg.add("-clientName"); - arg.add("cluster-javaee5.testException_" + i); - arg.add("-out"); - arg.add(outputDir + File.separator + "cluster-javaee5.testException_" + i + ".txt"); - task = new ClientTask("cluster-javaee5.testException_" + i, - "org.ow2.jonas.cluster.test.javaee5.client.ClientException", arg.toArray(new String[arg.size()])); - worker.addTask(task); - } - System.out.println("running the worker"); - worker.run(); - /**start the checker **/ - checker.start(); - while(!checker.stopped()) { - // sleep. - Thread.currentThread().sleep(checkerSleepTime); - } - System.out.println("Worker has terminated"); - if(worker.hasFailure()) { - fail("on cluster-javaee5.testException" + worker.getTasksFailures()); - } - worker.clear(); - LOGGER.info("cluster-javaee5.testException is ok"); - } - /** - * Test Fail over of Stateful session Bean. - * @throws Exception any. - */ - public void testFOSFSB() throws Exception { - LOGGER.info("cluster-javaee5.testFOSFSB"); - RunnableTask task = null; - ArrayList arg = new ArrayList(); - for(int i = 0; i < clientsNumber; i++) { - arg.add("-clientName"); - arg.add("cluster-javaee5.testFOSFSB_" + i); - arg.add("-out"); - arg.add(outputDir + File.separator + "cluster-javaee5.testFOSFSB_" + i + ".txt"); - task = new ClientTask("cluster-javaee5.testFOSFSB_" + i, - "org.ow2.jonas.cluster.test.javaee5.client.ClientFOSFSB", arg.toArray(new String[arg.size()])); - worker.addTask(task); - } - worker.run(); - /**start the ckecker **/ - checker.start(); - while(!checker.stopped()) { - // sleep. - Thread.currentThread().sleep(checkerSleepTime); - } - if(worker.hasFailure()) { - fail("on cluster-javaee5.testFOSFSB" + worker.getTasksFailures()); - } - worker.clear(); - LOGGER.info("cluster-javaee5.testFOSFSB is ok"); - } - - /** - * Test Load Balancing - * @throws Exception any. - */ - public void testLBRemote() throws Exception { - LOGGER.info("cluster-javaee5.testLBRemote"); - RunnableTask task = null; - ArrayList arg = new ArrayList(); - for(int i = 0; i < clientsNumber; i++) { - arg.add("-clientName"); - arg.add("cluster-javaee5.testLBRemote_" + i); - arg.add("-out"); - arg.add(outputDir + File.separator + "cluster-javaee5.testLBRemote_" + i + ".txt"); - task = new ClientTask("cluster-javaee5.testLBRemote_" + i, - "org.ow2.jonas.cluster.test.javaee5.client.ClientLBRemote", arg.toArray(new String[arg.size()])); - worker.addTask(task); - } - worker.run(); - /**start the ckecker **/ - checker.start(); - while(!checker.stopped()) { - // sleep. - Thread.currentThread().sleep(checkerSleepTime); - } - if(worker.hasFailure()) { - fail("on cluster-javaee5.testLBRemote" + worker.getTasksFailures()); - } - worker.clear(); - LOGGER.info("cluster-javaee5.testLBRemote is ok."); - } - -} diff --git a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/SampleCluster3Test.java b/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/SampleCluster3Test.java deleted file mode 100644 index 23f60b6daada07cb90df09649f224ffbc1beba35..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/SampleCluster3Test.java +++ /dev/null @@ -1,177 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): eyindanga - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.cluster.test.javaee5; - -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import com.meterware.httpunit.GetMethodWebRequest; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebRequest; -import com.meterware.httpunit.WebResponse; - -/** - * the aim of this class is to check the different calls made in sampleCluster3 - * example. - * @author Nicolas Duvauchel - */ -public class SampleCluster3Test extends TestCase { - - /** - * the link with the web page - */ - private static WebConversation conversation = null; - /** - * default HTTP ports. - */ - private static final String[] default_http_ports = {"9000", "9200"}; - /** - * @param args - */ - public static void main(String args[]) { - junit.textui.TestRunner.run(suite()); - } - - /** - * @return the test suite - */ - public static TestSuite suite() { - return new TestSuite(SampleCluster3Test.class); - } - - /** - * @param s - */ - public SampleCluster3Test(String s) { - super(s); - } - - /** - * set up parameters for the tests - */ - protected void setUp() throws Exception { - try { - if (conversation == null) { - System.out.println("setting up conversation."); - conversation = new WebConversation(); - } - } catch (Exception e) { - fail("Unable to set up web tests " + e); - } - - } - - /** - * test if the page is accessible - * @throws Exception - */ - public void testReachable() throws Exception { - - try { - for (String port: default_http_ports) { - WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster3"); - WebResponse response = conversation.getResponse(request); - System.out.println(response.getText()); - } - - } catch (Exception e) { - fail("on test Reachable: " + e); - } - - } - - /** - * test and create a session - * @throws Exception - */ - public void testSession() throws Exception { - try { - for (String port: default_http_ports) { - WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster3/servlet/session"); - - WebResponse response = conversation.getResponse(request); - System.out.println(response.getText()); - } - - } catch (Exception e) { - fail("on test Session: " + e); - } - } - - /** - * test and check the session - * @throws Exception - */ - public void testCheck() throws Exception { - try { - for (String port: default_http_ports) { - WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster3/servlet/check"); - - WebResponse response = conversation.getResponse(request); - System.out.println(response.getText()); - } - - } catch (Exception e) { - fail("on test Check: " + e); - } - } - - /** - * test and release the session - * @throws Exception - */ - public void testRelease() throws Exception { - try { - for (String port: default_http_ports) { - WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster3/servlet/release"); - WebResponse response = conversation.getResponse(request); - System.out.println(response.getText()); - } - - } catch (Exception e) { - fail("on test Release: " + e); - } - } - - /** - * test the exception - * @throws Exception - */ - public void testException() throws Exception { - try { - for (String port: default_http_ports) { - WebRequest request = new GetMethodWebRequest("http://localhost:" + port + "/sampleCluster3/servlet/exception"); - WebResponse response = conversation.getResponse(request); - System.out.println(response.getText()); - } - - } catch (Exception e) { - fail("on test Exception: " + e); - } - } - -} diff --git a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/client/ClientException.java b/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/client/ClientException.java deleted file mode 100644 index 025baf5b2621a9109d9ed057aeb346db3aade66e..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/client/ClientException.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.javaee5.client; - -import javax.naming.Context; -import javax.naming.InitialContext; - -import org.ow2.jonas.examples.cluster.javaee5.client.ClientBase; -import org.ow2.jonas.examples.cluster.javaee5.beans.samplecluster3.MyException; -import org.ow2.jonas.examples.cluster.javaee5.beans.samplecluster3.MyStateless; - -public class ClientException extends ClientBase { - /** - * Private constructor for utility class - * - */ - private ClientException() { - } - /** - * Constructor. - * @param args the arguments - */ - private ClientException(final String[] args) { - super(args); - } - - private int start() { - try { - out.println(clientName + ": starting..."); - Context ctx = new InitialContext(); - MyStateless myStateless = (MyStateless) ctx.lookup("org.ow2.jonas.examples.cluster.javaee5.beans.samplecluster3.MyStatelessBean" - + "_" + MyStateless.class.getName() +"@Remote"); - out.println("Bean created -> " + myStateless); - out.println("Throw an exception at the server side"); - myStateless.throwMyException(); - //Close the context - ctx.close(); - } catch (MyException e) { - out.println("Exception caught : invocation successful"); - }catch (Exception e) { - out.println(clientName + " KO. " + e); - out.close(); - return -1; - } - out.println(clientName + ": OK. Exiting."); - out.close(); - return 0; - } - /** - * Main method - * @param args arguments of the client - */ - public static int main(final String[] args) { - ClientException client = new ClientException(args); - return client.start(); - - } - -} diff --git a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/client/ClientFOSFSB.java b/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/client/ClientFOSFSB.java deleted file mode 100644 index d3c8d42399e77e6d80b6c335f13d028567e22bf7..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/client/ClientFOSFSB.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.javaee5.client; - -import javax.naming.Context; -import javax.naming.InitialContext; - -import org.ow2.jonas.examples.cluster.javaee5.client.ClientBase; -import org.ow2.jonas.examples.cluster.javaee5.beans.samplecluster3.MyStateful; - -/** - * Fat client : - * - test Fail Over of the SFSB - */ -public class ClientFOSFSB extends ClientBase { - - - /** - * Iteration number - */ - private static final int ITERATION_NB = 50; - - /** - * Default constructor. - */ - private ClientFOSFSB() { - - } - /** - * Constructor. - * @param args the arguments. - */ - private ClientFOSFSB(final String[] args) { - super(args); - } - - private int start() { - try { - out.println(clientName + ": starting..."); - Context ctx = new InitialContext(); - MyStateful myStateful = (MyStateful) ctx.lookup("org.ow2.jonas.examples.cluster.javaee5.beans.samplecluster3.MyStatefulBean" - + "_" + MyStateful.class.getName() +"@Remote"); - out.println("Bean created -> " + myStateful); - for (int i = 1; i < ITERATION_NB + 1; i++) { - - - String l = "log entry " + i; - // add in the bean state - myStateful.logWithJOnASInstance(l); - - out.println("Add " + l); - - if (0 == i % 10) { - StringBuffer sb = myStateful.getLogTextDump(); - out.println("Get the log entries from the bean state " + sb); - out.println("Sleep 10s"); - try { - Thread.sleep(10000); - } catch (Exception e) { - out.println(clientName + " KO. " + e); - out.close(); - return -1; - } - } - - - } - myStateful.cleanup(); - //Close the context. - ctx.close(); - } catch (Exception e) { - out.println(clientName + ": KO. " + e); - out.close(); - return -1; - } - out.println(clientName + ": OK. Exiting."); - out.close(); - return 0; - } - - /** - * Main method - * @param args arguments of the client - */ - public static int main(final String[] args) { - ClientFOSFSB client = new ClientFOSFSB(args); - return client.start(); - } -} diff --git a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/client/ClientLBRemote.java b/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/client/ClientLBRemote.java deleted file mode 100644 index 3dcebdd2ca8115bca79ad7183dfef2ade706c183..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/samples/src/org/ow2/jonas/cluster/test/javaee5/client/ClientLBRemote.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.javaee5.client; - -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; - -import org.ow2.jonas.examples.cluster.javaee5.client.ClientBase; -import org.ow2.jonas.examples.cluster.javaee5.beans.samplecluster3.MyStateless; - -/** - * Fat client : - * - access to a SSB - * - LB at the remote - */ -public class ClientLBRemote extends ClientBase { - - /** - * Iteration number - */ - private static final int ITERATION_NB = 50; - - private ClientLBRemote() { - } - public ClientLBRemote(String[] args) { - super(args); - } - private int start() { - try { - out.println(clientName + ": starting..."); - String jonasEJBServer = null; - String ejbTotalCallsCount = null; - Properties prop = null; - /** - * Link to the SSB. - */ - MyStateless myStateless = null; - - Context ctx = new InitialContext(); - myStateless = (MyStateless) ctx.lookup("org.ow2.jonas.examples.cluster.javaee5.beans.samplecluster3.MyStatelessBean" - + "_" + MyStateless.class.getName() + "@Remote"); - - out.println("Bean created -> " + myStateless); - for (int i = 1; i < ITERATION_NB + 1; i++) { - out.println("Bean invoked"); - prop = myStateless.getInfoProps(); - jonasEJBServer = prop.getProperty("EJB server"); - ejbTotalCallsCount = prop.getProperty("EJB total calls"); - out.println("Calls=" + i + " - EJB served by jonas=" + jonasEJBServer + "- EJB total calls=" + ejbTotalCallsCount); - if (0 == i % 10) { - out.println("Sleep 10s"); - try { - Thread.sleep(10000); - } catch (Exception e) { - out.println(clientName + ": KO. " + e); - out.close(); - return -1; - } - } - //Close the context. - ctx.close(); - } - } catch (Exception e) { - out.println(clientName + ": KO. " + e); - out.close(); - return -1; - } - out.println( clientName + ": OK. Exiting."); - out.close(); - return 0; - } - /** - * Main method - * @param args arguments of the client - */ - public static int main(final String[] args) { - ClientLBRemote client = new ClientLBRemote(args); - return client.start(); - - } -} diff --git a/jonas_tests/cluster/testing-applications/build.xml b/jonas_tests/cluster/testing-applications/build.xml deleted file mode 100644 index b72b2c697786936cf23702170af668338b16da9b..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/build.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/cluster/testing-applications/jmx/build.xml b/jonas_tests/cluster/testing-applications/jmx/build.xml deleted file mode 100644 index 1f68fbd59162037b89412d61fdea180b3766c48f..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/build.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/cluster/testing-applications/jmx/etc/META-INF/MANIFEST.MF b/jonas_tests/cluster/testing-applications/jmx/etc/META-INF/MANIFEST.MF deleted file mode 100644 index b8bcfdaa31169000f7cc9e1d389dcf638e62b542..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/etc/META-INF/MANIFEST.MF +++ /dev/null @@ -1 +0,0 @@ -Require-JOnAS-Services: cmi,ha diff --git a/jonas_tests/cluster/testing-applications/jmx/etc/application.xml b/jonas_tests/cluster/testing-applications/jmx/etc/application.xml deleted file mode 100644 index c32e8e076c7757143236bf3913f4271278f966ae..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/etc/application.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - Application for testing remote management on CMI - CMI remote management testing - - - - ejb3.jar - - - - - - cmi-jmx-client.jar - - diff --git a/jonas_tests/cluster/testing-applications/jmx/etc/cmi-jmx-client-application.xml b/jonas_tests/cluster/testing-applications/jmx/etc/cmi-jmx-client-application.xml deleted file mode 100644 index 203f21d8f688785d8cbd869e11c02dd37efcd96c..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/etc/cmi-jmx-client-application.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - OW2 JOnAS :: Cluster Examples :: JMX client for CMI - - diff --git a/jonas_tests/cluster/testing-applications/jmx/etc/cmi-jmx-client-jonas.xml b/jonas_tests/cluster/testing-applications/jmx/etc/cmi-jmx-client-jonas.xml deleted file mode 100644 index 2c80ddcc653b83d5f8cdd630d229eaf98bfc45e0..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/etc/cmi-jmx-client-jonas.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/client/ClientJMXTester.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/client/ClientJMXTester.java deleted file mode 100644 index ef2c8c15b19304ea1e2567cbf2569421c537176f..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/client/ClientJMXTester.java +++ /dev/null @@ -1,217 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.jmx.client; - - -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.Map.Entry; - -import org.ow2.jonas.cluster.test.jmx.common.ClientBase; -import org.ow2.jonas.cluster.test.jmx.common.ClientUtility; -import org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester; -import org.ow2.jonas.cluster.test.jmx.ejb.RemoteClusterFangBean; - -public class ClientJMXTester extends ClientBase{ - - /** - * Link to the tester bean. - */ - private ClusterJMXTester testerBean; - /** - * Link to the fang bean. - */ - RemoteClusterFangBean fangBean = null; - /** - * @param args - * @param args Command line arguments - * @throws Exception - * @throws Exception InitialContext creation failure / JMS Exception - */ - - public ClientJMXTester(String[] args) throws Exception { - super(args); - // Print Header - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("OW2 JOnAS :: Cluster Examples :: JMX client for CMI "); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - testerBean = ClientUtility.getJMXTesterBean(); - fangBean = ClientUtility.getFangBean(); - out.println("Init successful for " + clientName + "."); - - } - - private void run() throws Exception { - out.println(clientName + ", initiliazing JMX connection to CMI"); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - testerBean.init(); - out.println("CMI objectName: " + testerBean.getObjectName()); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - Set names = testerBean.getObjectNames(); - out.println("Registered objects: " + names); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - Set clusters = testerBean.getClusterNames(); - out.println("Cluster names: " + clusters); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("Is " + clusterName + " present in cluster names ?: " - + clusters.contains(clusterName)); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("Delay to refresh: " + testerBean.getDelayToRefresh()); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("Connected clients: " + - testerBean.getNbClientsConnectedToProvider()); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("policies and strategies: " + - testerBean.retrieveAvailablePoliciesAndStrategies()); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("Is " + fangBeanName + " replicated ?: " + - testerBean.isReplicated(fangBeanName)); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("Fang description: " + fangBean.getFangDescription()); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - out.println("Fang web sites: " + fangBean.getFangWebsites()); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - setPolicyStrategy(); - addPoolToEmpty(); - //blacklistServers(); - getBusinessName(); - setDelay2Refresh(); - - } - /** - * Set delay for refreshing clients view. - * @return - * @throws Exception - */ - private void setDelay2Refresh() throws Exception { - testerBean.setDelayToRefresh(delayToRefresh); - } - - private void changePolicy(String clusteredObject, String policyClass) - throws Exception { - testerBean.setPolicyClassName(clusteredObject, policyClass); - out.println(clientName + - ". Clustered object: " - + clusteredObject + ". Policy:" - + testerBean.getPolicyClassName(clusteredObject)); - } - - private void changeStrategy(String clusteredObject, String strategyClass) - throws Exception { - testerBean.setStrategyClassName(clusteredObject, strategyClass); - out.println(clientName +". Clustered object: " - + clusteredObject + ". Strategy:" - + testerBean.getStrategyClassName(clusteredObject)); - out.println("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"); - } - - - /** - * Clears the pool. - * @throws Exception, any. - */ - private void addPoolToEmpty() throws Exception { - out.println(clientName +". Clustered object: " - + fangBeanName + ". Clear pool:"); - testerBean.addPooltoEmpty(fangBeanName); - if (!testerBean.isPoolToEmpty(fangBeanName)) { - throw new Exception(clientName + ". Unable clear pool for object " - + fangBeanName); - } - } - - - /** - * Try to blacklist/unblacklist each server. - * @throws Exception, any. - */ - private void blacklistServers() throws Exception{ - out.println(clientName + ". blacklist servers."); - Set protos = testerBean.getProtocols(); - for (String proto : protos) { - Set srvRefs = testerBean.getServerRefsForProtocol(proto); - for (String ref : srvRefs) { - out.println(clientName + ". blacklisting server " - + ref + " on protocol " + proto); - testerBean.addServerToBlackList(ref); - Thread.currentThread().sleep(time2sleep); - if (!testerBean.isServerBlackListed(ref)) { - throw new Exception(clientName + ". unable to blacklist server " - + ref + " on protocol " + proto); - } - out.println(clientName + ". unblacklisting server " - + ref + " on protocol " + proto); - testerBean.removeServerFromBlackList(ref); - Thread.currentThread().sleep(time2sleep); - if (testerBean.isServerBlackListed(ref)) { - throw new Exception(clientName + ". unable to blacklist server " - + ref + " on protocol " + proto); - } - - } - } - } - - private void getBusinessName() throws Exception { - out.println(clientName +". Clustered object: " - + fangBeanName + ". Business name:" + - testerBean.getBusinessName(fangBeanName)); - } - - /** - * Try to set each strategy/policy, available in CMI - * to the clustered object beanName. - * @throws Exception, any. - */ - @SuppressWarnings("unchecked") - private void setPolicyStrategy() throws Exception { - Map> lb = testerBean.retrieveAvailablePoliciesAndStrategies(); - Set policies = null; - Set strategies = null; - Set>> set = lb.entrySet(); - for (Iterator iterator = set.iterator(); iterator.hasNext();) { - Entry> entry = (Entry>) iterator - .next(); - if (entry.getKey().contains("poli")) { - policies = entry.getValue(); - }else { - strategies = entry.getValue(); - } - } - - for(String policy: policies) { - changePolicy(fangBeanName, policy); - for(String strategy: strategies) { - changeStrategy(fangBeanName, strategy); - } - } - } - - public static void main(final String[] args) throws Exception { - ClientJMXTester jmxTester = new ClientJMXTester(args); - jmxTester.run(); - } -} diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/client/JMXTest.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/client/JMXTest.java deleted file mode 100644 index 2adb9d0420fe905eda87c354d113149f91980a28..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/client/JMXTest.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.jmx.client; - -import java.io.File; -import java.util.ArrayList; - -import junit.framework.TestSuite; - -import org.ow2.jonas.cluster.test.common.AbsTestClient; -import org.ow2.jonas.cluster.test.common.ClientTask; -import org.ow2.jonas.cluster.test.common.RunnableTask; -import org.ow2.jonas.cluster.test.common.Worker; - -public class JMXTest extends AbsTestClient { - /** - * The worker - */ - protected static Worker jworker = null; - - public static void main(String args[]) { - junit.textui.TestRunner.run(suite()); - } - - public static TestSuite suite() { - return new TestSuite(JMXTest.class); - } - - public JMXTest(String s) { - super(s); - } - - protected void setUp() throws Exception { - super.setUp(); - } - - /** - * Test Exception. - * @throws Exception any. - */ - public void testJMXCmi() throws Exception { - LOGGER.info("cluster-jmx-cmi.testJMX"); - RunnableTask task = null; - ArrayList arg = new ArrayList(); - for(int i = 0; i < clientsNumber; i++) { - arg.add("-clientName"); - arg.add("cluster-jmx-cmi.testJMX_" + i); - arg.add("-out"); - arg.add(outputDir + File.separator + "cluster-jmx-cmi.testJMX_" + i + ".txt"); - arg.add("-time2sleep"); - arg.add("20000"); - task = new ClientTask("cluster-jmx-cmi.testJMX_" + i, - "org.ow2.jonas.cluster.test.jmx.client.ClientJMXTester", arg.toArray(new String[arg.size()])); - worker.addTask(task); - } - System.out.println("running the worker"); - worker.run(); - /**start the checker **/ - checker.start(); - while(!checker.stopped()) { - // sleep. - Thread.currentThread().sleep(checkerSleepTime); - } - LOGGER.info("Worker has terminated"); - if(worker.hasFailure()) { - fail("on cluster-jmx-cmi.testJMX" + worker.getTasksFailures()); - } - worker.clear(); - LOGGER.info("cluster-jmx-cmi.testJMX is ok"); - } -} diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/common/ClientBase.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/common/ClientBase.java deleted file mode 100644 index 635a697f4796a691f1a2738f73cfe51fa417a50d..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/common/ClientBase.java +++ /dev/null @@ -1,150 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.jmx.common; - -import java.io.FileOutputStream; -import java.io.PrintStream; - -public class ClientBase { - - /** - * Iteration number - */ - private static final int ITERATION_NB = 50; - - /** - * Default time to sleep. - */ - private static final long TIME2SLEEP = 3000; - - /** - * Output to be used. - */ - protected PrintStream out = null; - /** - * the name of the client. - */ - protected String clientName = "JOnAS Client for cluster-javaee5"; - - /** - * Time to sleep each 10 iterations. - */ - protected long time2sleep = 5000; - - /** - * Iterations number. - */ - protected int iterations = ITERATION_NB; - - /** - * Delay to refresh clients views. - */ - protected int delayToRefresh = 3000; - - /** - * Cluster name. - */ - protected String clusterName = "fangcluster"; - - /** - * Cluster name. - */ - protected String fangBeanName = "fangbean"; - - public ClientBase() { - } - - public ClientBase(final String[] args) { - initArgs(args); - } - - private void initArgs(final String[] args) { - out = System.out; - String url = null; - if(args != null && args.length != 0) { - for (int argn = 0; argn < args.length; argn++) { - String arg = args[argn]; - if("-out".equals(arg)) { - url = args[++argn]; - continue; - }else if ("-clientName".equals(arg)) { - clientName = args[++argn]; - out.println("Client name set to : " + clientName); - continue; - }else if ("-time2sleep".equals(arg)) { - String time = args[++argn]; - try { - time2sleep = Long.parseLong(time); - } catch (NumberFormatException e) { - time2sleep = TIME2SLEEP; - } - out.println("Time to sleep set to : " + time2sleep); - continue; - }else if ("-iterations".equals(arg)) { - String it = args[++argn]; - try { - iterations = Integer.parseInt(it); - } catch (Exception e) { - // TODO: handle exception - iterations = ITERATION_NB; - } - out.println("Number of iterations set to : " + iterations); - continue; - }else if ("-delay2refresh".equals(arg)) { - String str = args[++argn]; - try { - delayToRefresh = Integer.parseInt(str); - } catch (Exception e) { - ; - } - out.println("Delay for refreshing clients view : " + delayToRefresh); - continue; - }else if ("-clusterName".equals(arg)) { - clusterName = args[++argn]; - }else if ("-beanName".equals(arg)) { - fangBeanName = args[++argn]; - } - } - } - if (url != null) { - initOut(url); - } - } - /** - * Initializes client output. - * @param url Stringified url of the client output file. - */ - private void initOut(final String url) { - try { - FileOutputStream file = new FileOutputStream(url, true); - out.println("Initializing output '" + url + "' for " + clientName); - out = new PrintStream(file, true); - } catch (Exception e) { - out.println("Unable to initialize output for " + clientName + " because : " + e); - } - } - -} - diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/common/ClientUtility.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/common/ClientUtility.java deleted file mode 100644 index dcc6aeb6337220118385c5b92f44875a94800037..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/common/ClientUtility.java +++ /dev/null @@ -1,100 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.jmx.common; - - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester; -import org.ow2.jonas.cluster.test.jmx.ejb.RemoteClusterFangBean; - -/** - * Fat client : generic methods - */ -public class ClientUtility { - - /** - * Constructor. Hide constructor as it is an utility class - */ - private ClientUtility() { - } - - /** - * @return MyEjb1 home object - * @throws Exception any. - */ - public static ClusterJMXTester getJMXTesterBean() throws Exception { - - Context ctx = null; - ClusterJMXTester bean = null; - try { - ctx = new InitialContext(); - } catch (NamingException e) { - throw new Exception("Exception in getJMXTesterBean. Unable to create context ", e); - } - - // Lookup bean. - try { - bean = (ClusterJMXTester) ctx.lookup("org.ow2.jonas.cluster.test.jmx.ejb." + - "ClusterJMXTesterBean_org.ow2.jonas.cluster." + - "test.jmx.ejb.RemoteClusterJMXTester@Remote"); - ctx.close(); - } catch (Exception e) { - //e.printStackTrace(); - //System.exit(2); - throw new Exception("Exception in getJMXTesterBean. Unable to get bean reference ", e); - } - - return bean; - } - - /** - * @return MyEjb1 home object - * @throws Exception any. - */ - public static RemoteClusterFangBean getFangBean() throws Exception { - - Context ctx = null; - RemoteClusterFangBean bean = null; - try { - ctx = new InitialContext(); - } catch (NamingException e) { - throw new Exception("Exception in getFangBean. Unable to create context ", e); - } - - // Lookup bean. - try { - bean = (RemoteClusterFangBean) ctx.lookup("fangbean"); - ctx.close(); - } catch (Exception e) { - throw new Exception("Exception in getFangBean. Unable to get bean reference ", e); - } - - return bean; - } -} - diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/ClusterFangBean.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/ClusterFangBean.java deleted file mode 100644 index c2da297ade89434d9c9e51cecbf7c4aedae075cd..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/ClusterFangBean.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.jmx.ejb; - -import java.rmi.RemoteException; -import java.util.ArrayList; -import java.util.List; - -import javax.ejb.Remote; -import javax.ejb.Stateful; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionAttributeType; - -import org.ow2.cmi.annotation.Cluster; -import org.ow2.cmi.annotation.Policy; -import org.ow2.cmi.annotation.Strategy; -import org.ow2.cmi.lb.policy.FirstAvailable; -import org.ow2.cmi.lb.strategy.NoStrategy; - -/** - * @author eyindanga - * - */ -@Cluster(name="fangcluster") -@Policy(FirstAvailable.class) -@Strategy(NoStrategy.class) -@Remote(RemoteClusterFangBean.class) -@Stateful(mappedName="fangbean") -@TransactionAttribute(TransactionAttributeType.NEVER) -public class ClusterFangBean implements RemoteClusterFangBean{ - - /** - * Web sites. - */ - List webSites = new ArrayList(); - /** - * Description. - */ - String description = "Fang is an ethnic group of central africa"; - - public void addFangWebsite(String wSite) throws RemoteException { - webSites.add(wSite); - } - - public List getFangWebsites() throws RemoteException { - return webSites; - } - - public String getFangDescription() throws RemoteException { - return description; - } - - public void removeFangWebsite(String wSite) throws RemoteException { - webSites.remove(wSite); - } - - public void setDescription(String desc) throws RemoteException { - description = desc; - } - -} diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/ClusterJMXTester.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/ClusterJMXTester.java deleted file mode 100644 index f09a0a31e7261c5e7ba0f09f3a951e288bf750c1..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/ClusterJMXTester.java +++ /dev/null @@ -1,879 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.cluster.test.jmx.ejb; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.UnknownHostException; -import java.rmi.RemoteException; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.management.AttributeNotFoundException; -import javax.management.InstanceNotFoundException; -import javax.management.InvalidAttributeValueException; -import javax.management.MBeanException; -import javax.management.ObjectName; -import javax.management.ReflectionException; -import javax.management.remote.JMXServiceURL; - -/** - * Remote interface for the bean Writer. - * - * @author JOnAS team - */ -public interface ClusterJMXTester { - - void init() throws Exception; - - /** - * Returns the ObjectName binded in the MBean Server. - * - * @return the ObjectName binded in the MBean Server - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - * @throws AttributeNotFoundException - */ - ObjectName getObjectName() throws InstanceNotFoundException, - MBeanException, ReflectionException, IOException, AttributeNotFoundException; - - /** - * @param protocolName - * a name of protocol - * @return the JMX service URL to access to this MBean - * @throws IllegalArgumentException - * if no object is bound with the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - JMXServiceURL getJMXServiceURL(String protocolName) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException; - - /** - * @return the protocols registered in the manager - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - * @throws AttributeNotFoundException - */ - Set getProtocols() throws InstanceNotFoundException, - MBeanException, ReflectionException, IOException, AttributeNotFoundException; - - /** - * @param protocolName - * a name of protocol - * @return the reference on the local registry for the given protocol - * @throws IllegalArgumentException - * if the given protocol name doesn't exist - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - String getRefOnLocalRegistry(String protocolName) - throws IllegalArgumentException, UnsupportedOperationException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Returns a name of interface of this object. - * - * @param objectName - * a name of object - * @return a name of interface of this object - * @throws IllegalArgumentException - * if no object is bound with the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - String getItfName(String objectName) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Returns the business interface name of an object bound with the given - * name (for ejb2 only). If the object is not an ejb2, null is returned. - * - * @param objectName - * a name of object - * @return the business interface name of an object bound with the given - * name - * @throws IllegalArgumentException - * if none object has the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - String getBusinessName(String objectName) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * @param objectName - * a name of object - * @return true if the object with the given name is replicated - * @throws IllegalArgumentException - * if none object has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - boolean isReplicated(String objectName) throws IllegalArgumentException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * @param protocolName - * a name of protocol - * @return the set of references on server connected to this server - * @throws IllegalArgumentException - * if the given protocol name doesn't exist - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - Set getServerRefsForProtocol(String protocolName) - throws IllegalArgumentException, UnsupportedOperationException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * @return the set of clustered object names - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - * @throws AttributeNotFoundException - */ - Set getObjectNames() throws InstanceNotFoundException, - MBeanException, ReflectionException, IOException, AttributeNotFoundException; - - /** - * Returns the name of class of policy for the object with the given name. - * - * @param objectName - * name of the object - * @return the name of class of policy for the object with the given name - * @throws IllegalArgumentException - * if none object has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - String getPolicyClassName(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Sets a new policy for a given object. - * - * @param objectName - * a name of object - * @param policyClassName - * a name of class of policy - * @throws IllegalArgumentException - * if none object has the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws ClassNotFoundException - * if the class is missing - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void setPolicyClassName(String objectName, String policyClassName) - throws IllegalArgumentException, UnsupportedOperationException, - ClassNotFoundException, InstanceNotFoundException, MBeanException, - ReflectionException, IOException; - - /** - * Returns the name of class of strategy for the object with the given name. - * - * @param objectName - * name of the object - * @return the name of class of strategy for the object with the given name - * @throws IllegalArgumentException - * if none object has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - String getStrategyClassName(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Sets a new strategy for a given object. - * - * @param objectName - * a name of object - * @param strategyClassName - * a name of class of strategy - * @throws IllegalArgumentException - * if none object has the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws ClassNotFoundException - * if the class is missing - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void setStrategyClassName(String objectName, String strategyClassName) - throws IllegalArgumentException, UnsupportedOperationException, - ClassNotFoundException, InstanceNotFoundException, MBeanException, - ReflectionException, IOException; - - /** - * Returns the set of property names for the object with the given name. - * - * @param objectName - * a name of object - * @return the set of property names for the object with the given name - * @throws IllegalArgumentException - * if none object has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - Set getPropertiesNamesForPolicy(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Returns the set of property names (for which value is a list) for the - * object with the given name. - * - * @param objectName - * a name of object - * @return the set of property names for the object with the given name - * @throws IllegalArgumentException - * if none object has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - Set getListPropertiesNamesForPolicy(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Returns the value of the property with the given name. - * - * @param objectName - * a name of object - * @param propertyName - * a name of property - * @return the value of the property with the given name, or null if there - * is not property for this name - * @throws IllegalArgumentException - * if none object has the given name, or if the value is a list - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - String getPropertyForPolicy(String objectName, String propertyName) - throws IllegalArgumentException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Returns the list of value of the property with the given name. - * - * @param objectName - * a name of object - * @param propertyName - * a name of property - * @return the list of value of the property with the given name, or null if - * there is not property for this name - * @throws IllegalArgumentException - * if none object has the given name, or if the value is not a - * list - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - List getListPropertyForPolicy(String objectName, String propertyName) - throws IllegalArgumentException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Sets a property for a given object. A property is either a String or a - * list of String. - * - * @param objectName - * a name of object - * @param propertyName - * a name of property - * @param propertyValue - * a value for the given name of property - * @throws IllegalArgumentException - * if none object has the given name, or if the property doesn't - * exist or has an invalid type - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void setPropertyForPolicy(String objectName, String propertyName, - String propertyValue) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Sets a property for a given object. A property is either a String or a - * list of String. - * - * @param objectName - * a name of object - * @param propertyName - * a name of property - * @param propertyValues - * a list of value for the given name of property - * @throws IllegalArgumentException - * if none object has the given name, or if the property doesn't - * exist or has an invalid type - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void setListPropertyForPolicy(String objectName, String propertyName, - List propertyValues) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Sets the properties for a given object. A property is either a String or - * a list of String. - * - * @param objectName - * a name of object - * @param properties - * properties a set of properties - * @throws IllegalArgumentException - * if none object has the given name, or if a property doesn't - * exist or has an invalid type - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void setPropertiesForPolicy(String objectName, - Map properties) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Sets the algorithm of load-balancing for the object with the given name. - * - * @param objectName - * a name of object - * @param policyClassName - * a name of class of policy - * @param strategyClassName - * a name of class of strategy - * @param properties - * a set of properties - * @throws IllegalArgumentException - * if none object has the given name, or if a property doesn't - * exist or has an invalid type - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws ClassNotFoundException - * if the class is missing - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void setAlgorithmForPolicy(String objectName, String policyClassName, - String strategyClassName, Map properties) - throws IllegalArgumentException, UnsupportedOperationException, - ClassNotFoundException, InstanceNotFoundException, MBeanException, - ReflectionException, IOException; - - /** - * Returns a list of String representing a ServerRef for an object with the - * given name and protocol. - * - * @param objectName - * a name of object - * @param protocolName - * a name of protocol - * @return a list of String representing a ServerRef for an object with the - * given name and protocol - * @throws IllegalArgumentException - * if none object has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - List getServerRefs(String objectName, String protocolName) - throws IllegalArgumentException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Returns a list of String representing a ServerRef for an object with the - * given name. - * - * @param objectName - * a name of object - * @return a list of String representing a ServerRef for an object with the - * given name - * @throws IllegalArgumentException - * if none object has the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - List getServerRefs(String objectName) - throws IllegalArgumentException, UnsupportedOperationException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Returns the set of name of cluster. - * - * @return the set of name of cluster - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - * @throws AttributeNotFoundException - */ - Set getClusterNames() throws UnsupportedOperationException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException, AttributeNotFoundException; - - /** - * Returns the set of object names included in the given cluster. - * - * @param clusterName - * The cluster name - * @return a set of object names included in the given cluster - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IllegalArgumentException - * if none cluster has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - Set getObjectNames(String clusterName) - throws UnsupportedOperationException, IllegalArgumentException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Returns the time between each update of the cluster view by clients. - * - * @return the time between each update of the cluster view by clients - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - * @throws AttributeNotFoundException - */ - Integer getDelayToRefresh() throws InstanceNotFoundException, - MBeanException, ReflectionException, IOException, AttributeNotFoundException; - - /** - * Sets the time between each update of the cluster view by clients. - * - * @param delay - * the time between each update of the cluster view by clients - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - * @throws InvalidAttributeValueException - * @throws AttributeNotFoundException - */ - void setDelayToRefresh(Integer delay) throws UnsupportedOperationException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException, AttributeNotFoundException, InvalidAttributeValueException; - - /** - * Returns the name of cluster for the object with the given name. - * - * @param objectName - * a name of object - * @return the name of cluster for a object with the given name - * @throws IllegalArgumentException - * if none object has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - String getClusterName(String objectName) throws IllegalArgumentException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Returns the minimal size of pool of CMIReferenceable for a object with - * the given name. - * - * @param objectName - * a name of object - * @return the minimal size of pool of CMIReferenceable for a object with - * the given name - * @throws IllegalArgumentException - * if none object has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - Integer getMinPoolSize(String objectName) throws IllegalArgumentException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Returns the maximal size of pool of CMIReferenceable for a object with - * the given name. - * - * @param objectName - * a name of object - * @return the maximal size of pool of CMIReferenceable for a object with - * the given name - * @throws IllegalArgumentException - * if none object has the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - Integer getMaxPoolSize(String objectName) throws IllegalArgumentException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Sets the minimal size of pool of CMIReferenceable for a object with the - * given name. - * - * @param objectName - * a name of object - * @param minPoolSize - * the minimal size of pool of CMIReferenceable for a object with - * the given name - * @throws IllegalArgumentException - * if no object is bound with the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void setMinPoolSize(String objectName, Integer minPoolSize) - throws IllegalArgumentException, UnsupportedOperationException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Sets the maximal size of pool of CMIReferenceable for a object with the - * given name. - * - * @param objectName - * a name of object - * @param maxPoolSize - * the maximal size of pool of CMIReferenceable for a object with - * the given name - * @throws IllegalArgumentException - * if no object is bound with the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void setMaxPoolSize(String objectName, Integer maxPoolSize) - throws IllegalArgumentException, UnsupportedOperationException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Adds a server to the blacklist. - * - * @param serverName - * a reference on a server - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws MalformedURLException - * if the URL is malformed - * @throws UnknownHostException - * if the given host cannot be resolved - * @throws RemoteException - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void addServerToBlackList(String serverName) - throws UnsupportedOperationException, MalformedURLException, - UnknownHostException, RemoteException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Removes a server from the blacklist. - * - * @param serverName - * a reference on a server - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws MalformedURLException - * if the URL is malformed - * @throws UnknownHostException - * if the given host cannot be resolved - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void removeServerFromBlackList(String serverName) - throws UnsupportedOperationException, MalformedURLException, - UnknownHostException, InstanceNotFoundException, MBeanException, - ReflectionException, IOException; - - /** - * Returns true the server with the given reference if blacklisted. - * - * @param serverName - * a reference on a server - * @return true the server with the given reference if blacklisted - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws MalformedURLException - * if the URL is malformed - * @throws UnknownHostException - * if the given host cannot be resolved - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - boolean isServerBlackListed(String serverName) - throws UnsupportedOperationException, MalformedURLException, - UnknownHostException, InstanceNotFoundException, MBeanException, - ReflectionException, IOException; - - /** - * Adds the pool of the object with the given name of the list of pool that - * should be empty. - * - * @param objectName - * a name of object - * @throws IllegalArgumentException - * if no object is bound with the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void addPooltoEmpty(String objectName) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Removes the pool of the object with the given name of the list of pool - * that should be empty. - * - * @param objectName - * a name of object - * @throws IllegalArgumentException - * if no object is bound with the given name - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void removePoolToEmpty(String objectName) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Returns true if the pool for object with the given name should be empty. - * - * @param objectName - * a name of object - * @return true if the pool for object with the given name should be empty - * @throws IllegalArgumentException - * if no object is bound with the given name - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - boolean isPoolToEmpty(String objectName) throws IllegalArgumentException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Returns the load-factor for the server with the given address. - * - * @param serverRef - * a reference on a server - * @return the load-factor for the server with the given address - * @throws IllegalArgumentException - * if none server has the given address - * @throws MalformedURLException - * if the URL is malformed - * @throws UnknownHostException - * if the given host cannot be resolved - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - Integer getLoadFactor(String serverRef) throws IllegalArgumentException, - MalformedURLException, UnknownHostException, - InstanceNotFoundException, MBeanException, ReflectionException, - IOException; - - /** - * Sets the load-factor for the server with the given address. - * - * @param serverRef - * a reference on a server - * @param loadFactor - * the load-factor for the server with the given address - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws MalformedURLException - * if the URL is malformed - * @throws UnknownHostException - * if the given host cannot be resolved - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - void setLoadFactor(String serverRef, String loadFactor) - throws UnsupportedOperationException, MalformedURLException, - UnknownHostException, InstanceNotFoundException, MBeanException, - ReflectionException, IOException; - - /** - * @return the numbers of clients connected to a provider of the cluster - * view - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - * @throws AttributeNotFoundException - */ - Integer getNbClientsConnectedToProvider() throws InstanceNotFoundException, - MBeanException, ReflectionException, IOException, AttributeNotFoundException; - - /** - * Gets objects hosted on a given server started with a given protocol. - * - * @param serverUrl - * a server reference - * @param protocolName - * a name of protocol - * @return set of objects hosted on the server - * @throws IllegalArgumentException - * if the given protocol name doesn't exist or the server is not - * registered for the given protocol - * @throws UnsupportedOperationException - * if the used manager is at client-side - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - public Set getServerObjectsForProtocol(final String serverUrl, - final String protocolName) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - - /** - * Gets available load balancing policies and strategies. - * - * @return available policies and strategies - * @throws UnsupportedOperationException - * if the operation is not supported - * @throws IOException - * @throws ReflectionException - * @throws MBeanException - * @throws InstanceNotFoundException - */ - public Map> retrieveAvailablePoliciesAndStrategies() - throws UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException; - -} diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/ClusterJMXTesterBean.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/ClusterJMXTesterBean.java deleted file mode 100644 index 45117d74e922800fee74204bb4606d710f756334..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/ClusterJMXTesterBean.java +++ /dev/null @@ -1,552 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.cluster.test.jmx.ejb; - -import java.io.IOException; -import java.rmi.RemoteException; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.ejb.Local; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionAttributeType; -import javax.management.Attribute; -import javax.management.AttributeNotFoundException; -import javax.management.InstanceNotFoundException; -import javax.management.InvalidAttributeValueException; -import javax.management.MBeanException; -import javax.management.MBeanServerConnection; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import javax.management.ReflectionException; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; - -import org.ow2.jonas.lib.management.extensions.manager.ManagementEntryPoint; -import org.ow2.jonas.lib.util.JonasObjectName; - -/** - * This is an example of Session Bean, stateless, secured, available - * with a Local and a Remote interface (with the same methods). - * @author JOnAS team - */ -@Stateless(name="clusterJMXTester") -@Remote(RemoteClusterJMXTester.class) -@Local(LocalClusterJMXTester.class) -@TransactionAttribute(TransactionAttributeType.NEVER) -public class ClusterJMXTesterBean implements LocalClusterJMXTester, RemoteClusterJMXTester { - - private String domainName; - private String serverName; - private String url; - private JMXServiceURL jmxService; - private JMXConnector connector; - private MBeanServerConnection mbeanserver; - private ObjectName objectName = null; - - /** - * Checks if CMI MBean is registered. - * @throws IOException - * @throws MalformedObjectNameException - * @throws RemoteException. - */ - public void checkCMIMBean() throws MalformedObjectNameException, IOException { - System.out.println("checkCMIMBean"); - boolean registered = mbeanserver.isRegistered(JonasObjectName.cmiServer(domainName, serverName)); - if (!registered) { - throw new RemoteException(" CMI ObjectName not registered" - + " for domain: "+ domainName - + "server: " + serverName); - } - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#addPooltoEmpty(java.lang.String) - */ - public void addPooltoEmpty(String objectName) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, "addPooltoEmpty", - new String[]{objectName}, new String[]{"java.lang.String"}); - if (!isPoolToEmpty(objectName)) { - throw new RemoteException("Unable to reset pool for " + objectName); - } - - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#addServerToBlackList(java.lang.String) - */ - public void addServerToBlackList(String serverName) - throws UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, "addPooltoEmpty", - new String[]{serverName}, new String[]{"java.lang.String"}); - if (!isServerBlackListed(serverName)) { - throw new RemoteException("Unable blacklist server " + serverName); - } - - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getBusinessName(java.lang.String) - */ - public String getBusinessName(String objectName) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (String)mbeanserver.invoke(this.objectName, "getBusinessName", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getClusterName(java.lang.String) - */ - public String getClusterName(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (String)mbeanserver.invoke(this.objectName, "getClusterName", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getClusterNames() - */ - public Set getClusterNames() throws UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException, AttributeNotFoundException { - return(Set) mbeanserver.getAttribute(this.objectName, "ClusterNames"); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getDelayToRefresh() - */ - public Integer getDelayToRefresh() throws InstanceNotFoundException, MBeanException, - ReflectionException, IOException, AttributeNotFoundException { - return (Integer) mbeanserver.getAttribute(this.objectName, "DelayToRefresh"); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getItfName(java.lang.String) - */ - public String getItfName(String objectName) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException { - return (String)mbeanserver.invoke(this.objectName, "getItfName", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getJMXServiceURL(java.lang.String) - */ - public JMXServiceURL getJMXServiceURL(String protocolName) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException { - // TODO Auto-generated method stub - return (JMXServiceURL)mbeanserver.invoke(this.objectName, "getJMXServiceURL", - new String[]{protocolName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getListPropertiesNamesForPolicy(java.lang.String) - */ - public Set getListPropertiesNamesForPolicy(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (Set)mbeanserver.invoke(this.objectName, - "getListPropertiesNamesForPolicy", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getListPropertyForPolicy(java.lang.String, - * java.lang.String) - */ - public List getListPropertyForPolicy(String objectName, - String propertyName) throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (List)mbeanserver.invoke(this.objectName, - "getListPropertyForPolicy", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getLoadFactor(java.lang.String) - */ - public Integer getLoadFactor(String serverRef) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (Integer)mbeanserver.invoke(this.objectName, - "getLoadFactor", - new String[]{serverRef}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getMaxPoolSize(java.lang.String) - */ - public Integer getMaxPoolSize(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (Integer)mbeanserver.invoke(this.objectName, - "getMaxPoolSize", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getMinPoolSize(java.lang.String) - */ - public Integer getMinPoolSize(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (Integer)mbeanserver.invoke(this.objectName, - "getMinPoolSize", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getNbClientsConnectedToProvider() - */ - public Integer getNbClientsConnectedToProvider() throws InstanceNotFoundException, - MBeanException, ReflectionException, IOException, AttributeNotFoundException { - return (Integer)mbeanserver.getAttribute(this.objectName, "NbClientsConnectedToProvider"); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getObjectName() - */ - public ObjectName getObjectName() throws InstanceNotFoundException, MBeanException, - ReflectionException, IOException, AttributeNotFoundException { - return (ObjectName)mbeanserver.getAttribute(this.objectName, "ObjectName"); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getObjectNames() - */ - public Set getObjectNames() throws InstanceNotFoundException, MBeanException, - ReflectionException, IOException, AttributeNotFoundException { - return (Set)mbeanserver.getAttribute(this.objectName, "ObjectNames"); - } - - public Set getObjectNames(String clusterName) - throws UnsupportedOperationException, IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (Set)mbeanserver.invoke(this.objectName, - "getObjectNames", - new String[]{clusterName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getPolicyClassName(java.lang.String) - */ - public String getPolicyClassName(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - System.out.println("getPolicyClassName ObjectName" + this.objectName); - return (String)mbeanserver.invoke(this.objectName, - "getPolicyClassName", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - public Set getPropertiesNamesForPolicy(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (Set)mbeanserver.invoke(this.objectName, - "getPropertiesNamesForPolicy", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getPropertyForPolicy(java.lang.String, - * java.lang.String) - */ - public String getPropertyForPolicy(String objectName, String propertyName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (String)mbeanserver.invoke(this.objectName, - "getPropertyForPolicy", - new String[]{objectName, propertyName}, - new String[]{"java.lang.String", "java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getProtocols() - */ - public Set getProtocols() throws InstanceNotFoundException, - MBeanException, ReflectionException, IOException, AttributeNotFoundException { - return (Set)mbeanserver.getAttribute(this.objectName, "Protocols"); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getRefOnLocalRegistry(java.lang.String) - */ - public String getRefOnLocalRegistry(String protocolName) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException { - return (String)mbeanserver.invoke(this.objectName, - "getRefOnLocalRegistry", - new String[]{protocolName}, new String[]{"java.lang.String"}); - } - - public Set getServerObjectsForProtocol(String serverUrl, - String protocolName) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException { - return (Set)mbeanserver.invoke(this.objectName, - "getServerObjectsForProtocol", - new String[]{serverUrl, protocolName}, - new String[]{"java.lang.String", "java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getServerRefs(java.lang.String, - * java.lang.String) - */ - public List getServerRefs(String objectName, String protocolName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, - ReflectionException, IOException { - return (List)mbeanserver.invoke(this.objectName, - "getServerRefs", - new String[]{objectName, protocolName}, - new String[]{"java.lang.String", "java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getServerRefs(java.lang.String) - */ - public List getServerRefs(String objectName) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (List)mbeanserver.invoke(this.objectName, - "getServerRefs", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getServerRefsForProtocol(java.lang.String) - */ - public Set getServerRefsForProtocol(String protocolName) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (Set)mbeanserver.invoke(this.objectName, - "getServerRefsForProtocol", - new String[]{protocolName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#getStrategyClassName(java.lang.String) - */ - public String getStrategyClassName(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (String)mbeanserver.invoke(this.objectName, - "getStrategyClassName", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#isPoolToEmpty(java.lang.String) - */ - public boolean isPoolToEmpty(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (Boolean)mbeanserver.invoke(this.objectName, - "isPoolToEmpty", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#isReplicated(java.lang.String) - */ - public boolean isReplicated(String objectName) - throws IllegalArgumentException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - return (Boolean)mbeanserver.invoke(this.objectName, - "isReplicated", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - public boolean isServerBlackListed(String serverName) - throws UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - // TODO Auto-generated method stub - return (Boolean)mbeanserver.invoke(this.objectName, - "isServerBlackListed", - new String[]{serverName}, new String[]{"java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#removePoolToEmpty(java.lang.String) - */ - public void removePoolToEmpty(String objectName) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "removePoolToEmpty", - new String[]{objectName}, new String[]{"java.lang.String"}); - } - - public void removeServerFromBlackList(String serverName) - throws UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "removeServerFromBlackList", - new String[]{serverName}, new String[]{"java.lang.String"}); - - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#retrieveAvailablePoliciesAndStrategies() - */ - public Map> retrieveAvailablePoliciesAndStrategies() - throws UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - System.out.println("retrieveAvailablePoliciesAndStrategies ObjectName " + this.objectName); - return (Map>)mbeanserver.invoke(this.objectName, - "retrieveAvailablePoliciesAndStrategies", - null, null); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#setAlgorithmForPolicy(java.lang.String, - * java.lang.String, java.lang.String, java.util.Map) - */ - public void setAlgorithmForPolicy(String objectName, - String policyClassName, String strategyClassName, - Map properties) throws IllegalArgumentException, - UnsupportedOperationException, ClassNotFoundException, InstanceNotFoundException, - MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "setAlgorithmForPolicy", - new String[]{objectName, policyClassName, strategyClassName}, - new String[]{"java.lang.String", "java.lang.String", "java.lang.String"}); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#setDelayToRefresh(java.lang.Integer) - */ - public void setDelayToRefresh(Integer delay) - throws UnsupportedOperationException, InstanceNotFoundException, MBeanException, - ReflectionException, IOException, AttributeNotFoundException, InvalidAttributeValueException { - mbeanserver.setAttribute(this.objectName, new Attribute("DelayToRefresh", delay)); - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#setListPropertyForPolicy(java.lang.String, - * java.lang.String, java.util.List) - */ - public void setListPropertyForPolicy(String objectName, - String propertyName, List propertyValues) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "setListPropertyForPolicy", - new Object[]{objectName, propertyName, propertyValues}, - new String[]{"java.lang.String", "java.lang.String", "java.util.List"}); - - } - - public void setLoadFactor(String serverRef, String loadFactor) - throws UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "setLoadFactor", - new String[]{serverRef, loadFactor}, - new String[]{"java.lang.String", "java.lang.String"}); - - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#setMaxPoolSize(java.lang.String, java.lang.Integer) - */ - public void setMaxPoolSize(String objectName, Integer maxPoolSize) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "setMaxPoolSize", - new Object[]{objectName, maxPoolSize}, - new String[]{"java.lang.String", "java.lang.Integer"}); - - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#setMinPoolSize(java.lang.String, java.lang.Integer) - */ - public void setMinPoolSize(String objectName, Integer minPoolSize) - throws IllegalArgumentException, UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "setMinPoolSize", - new Object[]{objectName, minPoolSize}, - new String[]{"java.lang.String", "java.lang.Integer"}); - - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#setPolicyClassName(java.lang.String, java.lang.String) - */ - public void setPolicyClassName(String objectName, String policyClassName) - throws IllegalArgumentException, UnsupportedOperationException, - ClassNotFoundException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "setPolicyClassName", - new String[]{objectName, policyClassName}, - new String[]{"java.lang.String", "java.lang.String"}); - - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#setPropertiesForPolicy(java.lang.String, java.util.Map) - */ - public void setPropertiesForPolicy(String objectName, - Map properties) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "setPropertiesForPolicy", - new Object[]{objectName, properties}, - new String[]{"java.lang.String", "java.util.Map"}); - - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#setPropertyForPolicy(java.lang.String, java.lang.String, java.lang.String) - */ - public void setPropertyForPolicy(String objectName, String propertyName, - String propertyValue) throws IllegalArgumentException, - UnsupportedOperationException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "setPropertyForPolicy", - new Object[]{objectName, propertyName, propertyValue}, - new String[]{"java.lang.String", "java.lang.String", "java.lang.String"}); - - } - - /* (non-Javadoc) - * @see org.ow2.jonas.cluster.test.jmx.ejb.ClusterJMXTester#setStrategyClassName(java.lang.String, java.lang.String) - */ - public void setStrategyClassName(String objectName, String strategyClassName) - throws IllegalArgumentException, UnsupportedOperationException, - ClassNotFoundException, InstanceNotFoundException, MBeanException, ReflectionException, IOException { - mbeanserver.invoke(this.objectName, - "setStrategyClassName", - new Object[]{objectName, strategyClassName}, - new String[]{"java.lang.String", "java.lang.String"}); - - - } - /** - * Initializes the JMX connection. - */ - public void init() throws Exception { - System.out.println("initializing testerBean"); - domainName = ManagementEntryPoint.getInstance().getDomainName(); - serverName = ManagementEntryPoint.getInstance().getServerName(); - url = ManagementEntryPoint.getInstance().getConnectionUrl(null); - jmxService = new JMXServiceURL(url); - connector = JMXConnectorFactory.connect(jmxService); - mbeanserver = connector.getMBeanServerConnection(); - objectName = JonasObjectName.cmiServer(domainName, serverName); - checkCMIMBean(); - } - - - -} diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/LocalClusterJMXTester.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/LocalClusterJMXTester.java deleted file mode 100644 index 7957b0b29a151176e5e26a724dfe828a38f4a19a..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/LocalClusterJMXTester.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.cluster.test.jmx.ejb; - -import java.io.IOException; -import java.rmi.RemoteException; - -import javax.management.MalformedObjectNameException; - -/** - * {@link javax.ejb.Local} interface. - * @author Guillaume Sauthier - */ -public interface LocalClusterJMXTester extends ClusterJMXTester { - /** - * Checks if CMI MBean is registered. - * @throws IOException - * @throws MalformedObjectNameException - * @throws RemoteException. - */ - public void checkCMIMBean() throws RemoteException, MalformedObjectNameException, IOException; - -} diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/RemoteClusterFangBean.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/RemoteClusterFangBean.java deleted file mode 100644 index 888b9032220ef8b487810a2fc2eb67b5d4bfffb5..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/RemoteClusterFangBean.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.cluster.test.jmx.ejb; - -import java.rmi.RemoteException; -import java.util.List; - -/** - * @author zeng-ls - * - */ -public interface RemoteClusterFangBean { - /** - * Gets description of fang group. - * @return Description of fang group - * @throws RemoteException, any. - */ - String getFangDescription() throws RemoteException; - - /** - * Sets description. - * @param desc, the description to set. - * @throws RemoteException, any. - */ - void setDescription(String desc) throws RemoteException; - - /** - * Gets fang web sites. - * @return fang web sites. - * @throws RemoteException, any. - */ - List getFangWebsites() throws RemoteException; - - /** - * Adds fang web site. - * @param wSite the web site to add - * @throws RemoteException, any. - */ - void addFangWebsite(String wSite) throws RemoteException; - - /** - * Removes fang web site. - * @param wSite the web site to remove - * @throws RemoteException, any. - */ - void removeFangWebsite(String wSite) throws RemoteException; -} diff --git a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/RemoteClusterJMXTester.java b/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/RemoteClusterJMXTester.java deleted file mode 100644 index 6b7fe643580afb58da3d0d503cdaf533d39a46dc..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jmx/src/main/java/org/ow2/jonas/cluster/test/jmx/ejb/RemoteClusterJMXTester.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2010 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.cluster.test.jmx.ejb; - -/** - * {@link javax.ejb.Remote} interface. - * @author Guillaume Sauthier - */ -public interface RemoteClusterJMXTester extends ClusterJMXTester { - -} diff --git a/jonas_tests/cluster/testing-applications/jonas-common.xml b/jonas_tests/cluster/testing-applications/jonas-common.xml deleted file mode 100644 index 17f81d9f51e68224d45ffe8a9e02f3c74a5e6a99..0000000000000000000000000000000000000000 --- a/jonas_tests/cluster/testing-applications/jonas-common.xml +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/cluster/tools/maven-ant-tasks-2.0.9.jar b/jonas_tests/cluster/tools/maven-ant-tasks-2.0.9.jar deleted file mode 100644 index 82a30e5872b9d7fdd6e614d0edc05a9688254c01..0000000000000000000000000000000000000000 Binary files a/jonas_tests/cluster/tools/maven-ant-tasks-2.0.9.jar and /dev/null differ diff --git a/jonas_tests/conformance/.gitignore b/jonas_tests/conformance/.gitignore deleted file mode 100644 index 6c2ead5955c12d28571e228640cefaef302efee2..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -classes/ - diff --git a/jonas_tests/conformance/build.xml b/jonas_tests/conformance/build.xml deleted file mode 100644 index 0f2d22ddb272ca17941621ed11850c3baea326ab..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/build.xml +++ /dev/null @@ -1,504 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/conformance/build_hotdeploy.xml b/jonas_tests/conformance/build_hotdeploy.xml deleted file mode 100644 index ca7a8e6187f6fc7e4a60c45266faed5483e326c3..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/build_hotdeploy.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/conformance/src/hotdeploy1/HotDeploySLR.java b/jonas_tests/conformance/src/hotdeploy1/HotDeploySLR.java deleted file mode 100644 index 401e04e55f75a871b6ed95d6fdd36780f02c9c27..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/hotdeploy1/HotDeploySLR.java +++ /dev/null @@ -1,97 +0,0 @@ -// HotDeploySLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.hotdeploy; - -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.RemoveException; -import javax.ejb.EJBObject; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.sql.DataSource; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - - -/** - * - */ -public class HotDeploySLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - private static final int VERSION_NUMBER = 1; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // HotDeploy implementation - // ------------------------------------------------------------------ - /** - * method1 - */ - public String getEnvString() { - logger.log(BasicLevel.DEBUG, "getEnvString"); - String value = ""; - try { - InitialContext ictx = new InitialContext(); - value = (String) ictx.lookup("java:comp/env/name"); - // value should be the one defined in ejb-jar.xml - } catch (NamingException e) { - throw new EJBException(e); - } - - return value; - } - - public int getVersionNumber() { - logger.log(BasicLevel.DEBUG, "getVersionNumber = " + VERSION_NUMBER); - return VERSION_NUMBER; - } - - public int getHelperClassVersionNumber() { - logger.log(BasicLevel.DEBUG, "getHelperClassVersionNumber = " + Helper.VERSION_NUMBER); - return Helper.VERSION_NUMBER; - } - -} - diff --git a/jonas_tests/conformance/src/hotdeploy2/HotDeploySLR.java b/jonas_tests/conformance/src/hotdeploy2/HotDeploySLR.java deleted file mode 100644 index 8e4a30e03f7eba0d4d0b3a8279a12c0374a92378..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/hotdeploy2/HotDeploySLR.java +++ /dev/null @@ -1,97 +0,0 @@ -// HotDeploySLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.hotdeploy; - -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.RemoveException; -import javax.ejb.EJBObject; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.sql.DataSource; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - - -/** - * - */ -public class HotDeploySLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - private static final int VERSION_NUMBER = 2; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // HotDeploy implementation - // ------------------------------------------------------------------ - /** - * method1 - */ - public String getEnvString() { - logger.log(BasicLevel.DEBUG, "getEnvString"); - String value = ""; - try { - InitialContext ictx = new InitialContext(); - value = (String) ictx.lookup("java:comp/env/name"); - // value should be the one defined in ejb-jar.xml - } catch (NamingException e) { - throw new EJBException(e); - } - - return value; - } - - public int getVersionNumber() { - logger.log(BasicLevel.DEBUG, "getVersionNumber = " + VERSION_NUMBER); - return VERSION_NUMBER; - } - - public int getHelperClassVersionNumber() { - logger.log(BasicLevel.DEBUG, "getHelperClassVersionNumber = " + Helper.VERSION_NUMBER); - return Helper.VERSION_NUMBER; - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/annuaire/PersonneEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/annuaire/PersonneEC2.java deleted file mode 100644 index 0ae6a2d027c5a78a2075e8830001de762249ed12..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/annuaire/PersonneEC2.java +++ /dev/null @@ -1,314 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// PersonneEC2.java - -package org.objectweb.jonas.jtests.beans.annuaire; - -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.TimedObject; -import javax.ejb.Timer; -import javax.ejb.TimerService; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * This is an entity bean with "container managed persistence version 2.x". - * @author Philippe Durieux, Helene Joanin (jonas team) - */ -public abstract class PersonneEC2 implements EntityBean, TimedObject { - - static protected Logger logger = null; - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getNom(); - public abstract void setNom(String n); - - public abstract String getNumero(); // Tx Attribute = Required - public abstract void setNumero(String n); // Tx Attribute = Required - - public abstract int getTimerIdent(); - public abstract void setTimerIdent(int id); - - public abstract int getTimerCount(); - public abstract void setTimerCount(int cnt); - - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String nom, String numero) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - public void ejbPostCreate(String nom, String numero, boolean t) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - - public java.lang.String ejbCreate(String nom, String numero) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, "ejbCreate(" + nom + ", " + numero + ")"); - - // Init here the bean fields - setNom(nom); - setNumero(numero); - setTimerIdent(0); - setTimerCount(0); - - // In CMP, should return null. - return null; - } - - public java.lang.String ejbCreate(String nom, String numero, boolean t) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, "ejbCreate nom numero boolean"); - - // Init here the bean fields - setNom(nom); - setNumero(numero); - setTimerIdent(0); - setTimerCount(0); - - // In CMP, should return null. - return null; - } - - /** - * This method is called before the instance enters the "passive" state. - * The instance should release any resources that it can re-acquire later in the - * ejbActivate() method. - * After the passivate method completes, the instance must be in a state that - * allows the container to use the Java Serialization protocol to externalize - * and store away the instance's state. - * This method is called with no transaction context. - * - * @exception EJBException - Thrown if the instance could not perform the - * function requested by the container - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * This method is called when the instance is activated from its "passive" state. - * The instance should acquire any resource that it has released earlier in the - * ejbPassivate() method. - * This method is called with no transaction context. - * - * @exception EJBException - Thrown if the instance could not perform the - * function requested by the container - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Personne implementation - // ------------------------------------------------------------------ - - /** - * getNumeroNTX / Tx Attribute = Supports - */ - public String getNumeroNTX() { - logger.log(BasicLevel.DEBUG, ""); - return getNumero(); - } - - /** - * setNumeroNTX / Tx Attribute = Supports - */ - public void setNumeroNTX(String s) { - logger.log(BasicLevel.DEBUG, ""); - setNumero(s); - } - - // - // Methods only implemented in the entity bean with "CMP version 1.x" - // used to test the isModified extension for CMP version 1 Entity Bean. - // (defined here to have a common interface) - // - - public boolean isModified() { - throw new UnsupportedOperationException(); - } - - public void reset() { - throw new UnsupportedOperationException(); - } - - public boolean isModifiedCalled() { - throw new UnsupportedOperationException(); - } - - public boolean ejbStoreCalled() { - throw new UnsupportedOperationException(); - } - - public boolean isDirty() { - throw new UnsupportedOperationException(); - } - - public int setTimer(int dur, int period) { - TimerService timerservice = ejbContext.getTimerService(); - Timer mt = null; - int ret = getTimerIdent() + 1; - setTimerIdent(ret); - if (period > 0) { - mt = timerservice.createTimer(1000 * dur, 1000 * period, new Integer(ret)); - } else { - mt = timerservice.createTimer(1000 * dur, new Integer(ret)); - } - return ret; - } - - public void cancelTimer(int ident) throws RemoteException { - TimerService timerservice = ejbContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - Integer id = (Integer) t.getInfo(); - if (id.intValue() == ident) { - t.cancel(); - } - } - } - - public long getTimeRemaining(int ident) throws RemoteException { - TimerService timerservice = ejbContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - long ret = -1; - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - Integer id = (Integer) t.getInfo(); - if (id.intValue() == ident) { - ret = t.getTimeRemaining(); - } - } - return ret; - } - - - // ----------------------------------------------------------- - // TimedObject implementation - // ----------------------------------------------------------- - - /** - * A timer is expired. - */ - public void ejbTimeout(Timer timer) { - setTimerCount(getTimerCount() + 1); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/applimet/AppliSession.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/applimet/AppliSession.java deleted file mode 100644 index 31f0b93813cba8bc487f705472579448b738f548..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/applimet/AppliSession.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.applimet; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - */ -public class AppliSession implements SessionBean { - - static protected Logger logger = null; - private MetHome th; - private Met tr; - - SessionContext ejbContext; - - public void ejbRemove() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - tr.remove(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Cannot remove Met:" + e); - throw new RemoteException("Cannot remove Met:" + e); - } - } - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - try{ - Context ctx = new InitialContext(); - Object objref = ctx.lookup(MetHome.JNDI_NAME); - th = (MetHome) PortableRemoteObject.narrow(objref, MetHome.class); - tr = th.create(); - } catch(Exception e) { - logger.log(BasicLevel.ERROR, "Cannot create Met:" + e); - throw new CreateException("Cannot create Met:" + e); - } - } - - public void methodeApplicative() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - tr.methode1(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Cannot call Met:" + e); - throw new RemoteException("Cannot call Met:" + e); - } - } - - public void noTxMethod() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - ejbContext.getRollbackOnly(); - throw new RemoteException("Should get IllegalStateException"); - } catch (IllegalStateException e) { - } - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setSessionContext(javax.ejb.SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - public void unsetSessionContext() { - logger.log(BasicLevel.DEBUG, ""); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/applimet/MetSession.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/applimet/MetSession.java deleted file mode 100644 index cbf7853bde168321d0add12656df684f160dd0f3..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/applimet/MetSession.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.applimet; - -import java.rmi.RemoteException; -import java.sql.SQLException; -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - */ -public class MetSession implements SessionBean { - - SessionContext ejbContext; - static protected Logger logger = null; - private Dao dao; - private Dao dao2; - - public void ejbRemove() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - dao.removeConnexion(); - } catch (SQLException e) { - throw new RemoteException("cannot remove Connexion: " + e); - } - } - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - try { - dao = new Dao(); - } catch (Exception e) { - throw new CreateException("Cannot create Dao: " + e); - } - } - - public void methode1() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - String liste = dao.rechercherTousLesMarches(); - logger.log(BasicLevel.DEBUG, liste); - } catch (Exception e) { - throw new RemoteException("Error calling Dao: " + e); - } - } - - /** - * Method with RequiresNew Tx Attribute. - * Uses the connection allocated in another transaction - * @throws RemoteException - */ - public void testTxNew() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - String liste = dao2.rechercherTousLesMarches(); - logger.log(BasicLevel.DEBUG, liste); - } catch (Exception e) { - throw new RemoteException("Error calling Dao: " + e); - } - } - - public void methode2() throws java.rmi.RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - dao2 = new Dao(); - testTxNew(); - dao2.removeConnexion(); - } catch (Exception e) { - throw new RemoteException("Cannot create Dao: " + e); - } - } - - public void moscone1() throws java.rmi.RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - dao2 = new Dao(); - dao2.rechercherTousLesMarches(); - dao2.removeConnexion(); - } catch (Exception e) { - throw new RemoteException("Error on Dao2: " + e); - } - } - - public void getconn() throws java.rmi.RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - dao2 = new Dao(); - } catch (Exception e) { - throw new RemoteException("Cannot create Dao: " + e); - } - } - - public void getconntx() throws java.rmi.RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - dao2 = new Dao(); - } catch (Exception e) { - throw new RemoteException("Cannot create Dao: " + e); - } - } - - public void useconn() throws java.rmi.RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - String liste = dao2.rechercherTousLesMarches(); - logger.log(BasicLevel.DEBUG, liste); - } catch (Exception e) { - throw new RemoteException("Error calling Dao: " + e); - } - } - - public void closeconn() throws java.rmi.RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - dao2.removeConnexion(); - } catch (SQLException e) { - throw new RemoteException("cannot remove Connexion: " + e); - } - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setSessionContext(javax.ejb.SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - public void unsetSessionContext() { - logger.log(BasicLevel.DEBUG, ""); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/applimet/applimet.xml b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/applimet/applimet.xml deleted file mode 100644 index 6e47ca9fb7ba8616f6ea041b7b3c1f5ae899adda..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/applimet/applimet.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - applimet - - - - - - Met - - org.objectweb.jonas.jtests.beans.applimet.MetHome - org.objectweb.jonas.jtests.beans.applimet.Met - org.objectweb.jonas.jtests.beans.applimet.MetLocalHome - org.objectweb.jonas.jtests.beans.applimet.MetLocal - org.objectweb.jonas.jtests.beans.applimet.MetSession - Stateful - Container - - - - - - Appli - - org.objectweb.jonas.jtests.beans.applimet.AppliHome - org.objectweb.jonas.jtests.beans.applimet.Appli - org.objectweb.jonas.jtests.beans.applimet.AppliLocalHome - org.objectweb.jonas.jtests.beans.applimet.AppliLocal - org.objectweb.jonas.jtests.beans.applimet.AppliSession - Stateful - Container - - - - - - - - - Appli - noTxMethod - - - - Appli - remove - - NotSupported - - - - Met - * - - - Appli - * - - Required - - - - Met - moscone1 - - - Met - getconn - - Supports - - - - Met - testTxNew - - RequiresNew - - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bank/AccountEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bank/AccountEC2.java deleted file mode 100644 index 87bcf47acf2c39f60d7d5fdc4205c45818fad016..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bank/AccountEC2.java +++ /dev/null @@ -1,245 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.bank; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * Account Implementation (with container-managed persistence version 2) - * @author Philippe Durieux - */ -public abstract class AccountEC2 implements EntityBean { - - protected static Logger history = null; - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getName(); - public abstract void setName(String n); - public abstract int getNum(); - public abstract void setNum(int n); - public abstract int getBalance(); - public abstract void setBalance(int b); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (history == null) { - history = Log.getLogger("org.objectweb.jonas_tests.history"); - } - history.log(BasicLevel.DEBUG, getName()); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - history.log(BasicLevel.DEBUG, getName()); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - history.log(BasicLevel.DEBUG, getName()); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - String name = getName(); - int balance = getBalance(); - history.log(BasicLevel.DEBUG, name + "\tLOAD= " + balance); - if (balance < 0) { - history.log(BasicLevel.WARN, name + " : Bad balance loaded"); - throw new EJBException("ejbLoad: Balance "+name+" was negative ="+balance); - } - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - String name = getName(); - int balance = getBalance(); - history.log(BasicLevel.DEBUG, name + "\tSTORE= " + balance); - if (balance < 0) { - history.log(BasicLevel.WARN, name + " : Bad balance stored"); - throw new EJBException("ejbStore: Balance "+name+" was negative ="+balance); - } - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(int num, int ib) throws CreateException { - history.log(BasicLevel.DEBUG, getName()); - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public java.lang.String ejbCreate(int num, int ib) throws CreateException, DuplicateKeyException { - - // Init here the bean fields - setNum(num); - setName("a_"+(new Integer(num)).toString()); - setBalance(ib); - - history.log(BasicLevel.DEBUG, getName()); - - // In CMP, should return null. - return null; - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - // balance may be wrong in case of rollback. Anyway, this instance is being - // released now, so no problem! - // This causes problems (in case of DB policy at least) - //setBalance(-80000); - history.log(BasicLevel.DEBUG, getName()); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - history.log(BasicLevel.DEBUG, getName() + " balance=" + getBalance()); - } - - // ------------------------------------------------------------------ - // Bank implementation - // ------------------------------------------------------------------ - - /** - * credit - */ - public void credit(int v) { - String name = getName(); - if (getBalance() < 0) { - if (ejbContext.getRollbackOnly() == true) { - history.log(BasicLevel.WARN, name + " : tx already rollbackonly"); - setBalance(-99000); - return; - } - history.log(BasicLevel.WARN, name + " : Bad balance to credit ="+getBalance()); - throw new EJBException("credit: Balance "+name+" was negative ="+getBalance()); - } - int oldval = getBalance(); - setBalance(oldval + v); - history.log(BasicLevel.DEBUG, name + "\told= " + oldval + "\tnew= " + getBalance()); - } - - /** - * debit - */ - public void debit(int v) { - String name = getName(); - int oldval = getBalance(); - if (oldval < 0) { - if (ejbContext.getRollbackOnly() == true) { - history.log(BasicLevel.WARN, name + " : tx already rollbackonly"); - setBalance(-99000); - return; - } - history.log(BasicLevel.WARN, name + " : Bad balance to debit="+oldval); - throw new EJBException("debit: Balance "+name+" was negative ="+oldval); - } - setBalance(oldval - v); - if (getBalance() < 0) { - history.log(BasicLevel.WARN, name + " : set rollback only. NEW BAL = -90000"); - ejbContext.setRollbackOnly(); - setBalance(-90000); // put it a very bad balance to check rollback is OK - } - history.log(BasicLevel.DEBUG, name + "\tOLD= " + oldval + "\tNEW= " + getBalance()); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bank/ManagerSF.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bank/ManagerSF.java deleted file mode 100644 index c071e963e76915f507ac87c3c8e373e92db0929b..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bank/ManagerSF.java +++ /dev/null @@ -1,438 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.bank; - -import java.rmi.NoSuchObjectException; -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.NoSuchObjectLocalException; -import javax.ejb.RemoveException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.ejb.SessionSynchronization; -import javax.ejb.TransactionRolledbackLocalException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Manager Implementation - * @author Philippe Durieux - */ -public class ManagerSF implements SessionBean, SessionSynchronization { - - protected static Logger history = null; - SessionContext ejbContext; - AccountLocalHome accountLocalHome = null; - AccountLocal last = null; - int initialValue; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param ctx A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - if (history == null) { - history = Log.getLogger("org.objectweb.jonas_tests.history"); - } - history.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the session object. - * This happens as a result of a client's invoking a remove operation, or when a - * container decides to terminate the session object after a timeout. - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - history.log(BasicLevel.DEBUG, ""); - } - - /** - * Create a session. - * @param ival initial balance value for new accounts. - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate(int ival) throws CreateException { - history.log(BasicLevel.DEBUG, ""); - - // lookup AccountLocalHome - try { - Context ictx = new InitialContext(); - accountLocalHome = (AccountLocalHome) ictx.lookup("java:comp/env/ejb/bank"); - } catch (NamingException e) { - history.log(BasicLevel.ERROR, "Cannot get AccountLocalHome:" + e); - throw new CreateException("Cannot get AccountLocalHome"); - } - - initialValue = ival; - } - - /** - * Create a session. - * @param ival initial balance value for new accounts. - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate(int ival, boolean prefetch) throws CreateException { - history.log(BasicLevel.DEBUG, ""); - - // lookup AccountLocalHome - try { - Context ictx = new InitialContext(); - String ejblink = prefetch ? "java:comp/env/ejb/bankpf" : "java:comp/env/ejb/bank"; - accountLocalHome = (AccountLocalHome) ictx.lookup(ejblink); - } catch (NamingException e) { - history.log(BasicLevel.ERROR, "Cannot get AccountLocalHome:" + e); - throw new CreateException("Cannot get AccountLocalHome"); - } - - initialValue = ival; - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - history.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - history.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // SessionSynchronization implementation - // ------------------------------------------------------------------ - - public void afterBegin() { - history.log(BasicLevel.DEBUG, ""); - } - - public void beforeCompletion() { - history.log(BasicLevel.DEBUG, ""); - } - - public void afterCompletion(boolean committed) { - if (committed) { - history.log(BasicLevel.DEBUG, "TX committed"); - } else { - history.log(BasicLevel.DEBUG, "TX rolled back"); - } - } - - // ------------------------------------------------------------------ - // Manager implementation - // ------------------------------------------------------------------ - - /** - * create a set of Accounts - * @param nb nb of Accounts created. - */ - public void createAll(int nb) throws RemoteException, CreateException { - // Check if accounts are already created. - history.log(BasicLevel.DEBUG, " nb= "+nb); - try { - accountLocalHome.findByNum(nb - 1); - } catch (Exception e) { - // create accounts - for (int i = 0; i < nb; i++) { - newAccount(i); - } - } - } - - /** - * reinit all created accounts to their initial value. - */ - public void reinitAll() throws RemoteException { - try { - Collection coll = accountLocalHome.findAll(); - for (Iterator it = coll.iterator(); it.hasNext();) { - AccountLocal a = (AccountLocal) it.next(); - a.setBalance(initialValue); - } - } catch (Exception e) { - history.log(BasicLevel.ERROR, "reinitAll:" + e); - } - } - - - /** - * Remove an Account - * @param d1 num of the Account. - */ - public void delAccount(int d1) throws RemoteException, RemoveException { - try { - AccountLocal deb1 = accountLocalHome.findByNum(d1); - deb1.remove(); - history.log(BasicLevel.DEBUG, d1 + "\tREMOVED"); - } catch (FinderException e) { - history.log(BasicLevel.INFO, d1 + "\tNot Found for remove"); - } - } - - /** - * Check all existing Accounts - * @return true if all are OK. - */ - public boolean checkAll() throws RemoteException { - int count = 0; - int total = 0; - boolean ret = true; - try { - Collection coll = accountLocalHome.findAll(); - for (Iterator it = coll.iterator(); it.hasNext();) { - count++; - AccountLocal a = (AccountLocal) it.next(); - int balance = a.getBalance(); - String name = a.getName(); - if (balance < 0) { - history.log(BasicLevel.ERROR, name + " bad balance: " + balance); - ret = false; - } else { - history.log(BasicLevel.DEBUG, name + " : FINAL BALANCE=" + balance); - total += balance; - } - } - } catch (Exception e) { - history.log(BasicLevel.ERROR, "checkAllAccounts:" + e); - return false; - } - int exp = initialValue * count; - if (total != exp) { - history.log(BasicLevel.ERROR, "checkAllAccounts: bad total: " + total + " (expected: " + exp + ")"); - return false; - } - history.log(BasicLevel.DEBUG, "CheckAll OK"); - return ret; - } - - /** - * Check an existing Account - * @param a num of the Account. - * @return true if OK. - */ - public boolean checkAccount(int a) throws RemoteException { - boolean ret = false; - AccountLocal m = null; - - // retry several times, because this operation may be rolledback - // in case of deadlock. - Exception exc = null; - int retry; - for (retry = 0; retry < 20; retry++) { - try { - history.log(BasicLevel.DEBUG, "\ta_" + a + "\tCHECKED try #" + retry); - m = accountLocalHome.findByNum(a); - int b = m.getBalance(); - if (b >= 0) { - ret = true; - } else { - history.log(BasicLevel.WARN, "bad balance=" + b); - } - return ret; - } catch (javax.ejb.ObjectNotFoundException e1) { - try { - newAccount(a); - ret = true; - break; - }catch (Exception ex) { - ret= false; - break; - } - } catch (Exception e) { - exc = e; - history.log(BasicLevel.DEBUG, "retrying " + retry); - sleep(retry + 1); - } - } - history.log(BasicLevel.WARN, "cannot check account: " + exc); - return ret; - } - - /* - * read balance for this Account, in a transaction. - * @param a num of the Account. - * @return balance - */ - public int readBalanceTx(int a) throws RemoteException { - //checkAccount(a); - return readBalance(a); - } - - /** - * read balance for this Account - * @param a num of the Account. - * @return balance - */ - public int readBalance(int a) throws RemoteException { - int ret; - try { - AccountLocal acc = getAccount(a); - if (acc == null) { - history.log(BasicLevel.ERROR, "Cannot get account"); - throw new RemoteException("Cannot get account " + a); - } - ret = acc.getBalance(); - } catch (Exception e) { - history.log(BasicLevel.ERROR, "Cannot read balance for " + a + ": " + e); - throw new RemoteException("Cannot read balance for " + a); - } - history.log(BasicLevel.DEBUG, "READ " + a + " = " + ret); - return ret; - } - - /** - * move form an Account to another one. - * @param d num of the debit Account. - * @param c num of the credit Account. - * @param v value to be moved - * @param d delay in second for the operation. - */ - public void move(int d, int c, int v, int delay) throws RemoteException { - history.log(BasicLevel.DEBUG, "MOVE " + v + " from " + d + " to " + c); - try { - AccountLocal cred = getAccount(c); - AccountLocal deb = getAccount(d); - cred.credit(v); - sleep(delay); - deb.debit(v); - } catch (TransactionRolledbackLocalException e) { - history.log(BasicLevel.WARN, "move: Rollback transaction"); - return; - } catch (EJBException e) { - history.log(BasicLevel.ERROR, "Cannot move:" + e); - return; - } - } - - /** - * Read balance on last accessed account - */ - public int readBalance() throws RemoteException { - int ret; - try { - ret = last.getBalance(); - } catch (NoSuchObjectLocalException e) { - throw new NoSuchObjectException("Account destroyed"); - } catch (Exception e) { - throw new RemoteException("Cannot read last balance"); - } - return ret; - } - - /** - * Create an Account, but set rollback only the transaction - * @return - * @throws RemoteException - */ - public void createRollbackOnly(int i) throws RemoteException { - try { - last = newAccount(i); - } catch (CreateException c) { - throw new RemoteException("Cannot create account"); - } - ejbContext.setRollbackOnly(); - } - - // ------------------------------------------------------------------ - // private methods - // ------------------------------------------------------------------ - - /** - * Create a new Account. The account may exist (for example, when running - * tests twice without restarting the Container, or if created by another - * session meanwhile) - * @param i account number (its PK) - */ - private AccountLocal newAccount(int i) throws RemoteException, CreateException { - AccountLocal ml = null; - ml = accountLocalHome.create(i, initialValue); - history.log(BasicLevel.DEBUG, "New Account has been created\t" + i); - return ml; - } - - /** - * Create an Account if it does not exist yet. - * @param c1 num of the Account. - */ - private AccountLocal getAccount(int c1) throws RemoteException { - history.log(BasicLevel.DEBUG, "Get Account\t" + c1); - try { - last = accountLocalHome.findByNum(c1); - } catch (FinderException e) { - try { - last = newAccount(c1); - } catch (CreateException c) { - throw new RemoteException("Cannot create account"); - } - } - return last; - } - - /** - * sleep n seconds - * @param n seconds - */ - private void sleep(int n) { - try { - Thread.sleep(1000 * n); - } catch (InterruptedException e) { - } - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/beanexc/AccountEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/beanexc/AccountEC2.java deleted file mode 100644 index 631d51a39598efbcf7764cc41379e17810d37c3d..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/beanexc/AccountEC2.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.beanexc; - -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.EJBContext; -import javax.ejb.RemoveException; -import javax.ejb.CreateException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * This is an entity bean with "container managed persistence version 2". - * The state of an instance is stored into a relational database. - * @author Philippe Durieux, Philippe Coq, Helene Joanin - */ -public abstract class AccountEC2 extends AccountCommon implements EntityBean { - - boolean forceToFailEjbStore; - protected EntityContext entityContext; - - - // Get and Set accessor methods of the bean's abstract schema - public abstract int getNumber(); - public abstract void setNumber(int n); - public abstract long getBalance(); - public abstract void setBalance(long d); - public abstract String getCustomer(); - public abstract void setCustomer(String c); - - - - public EJBContext getContext() { - return entityContext; - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - if (forceToFailEjbStore) { - forceToFailEjbStore = false; - throw new RuntimeException("RunTimeExceptionInEjbStore"); - } - } - - /** - * This method is common for impl and expl bean - * it is used to test exception raised in ejbRemove() - * with unspecified transactional context (Required attribute). - * This method throws a RemoveException when the value of the PK is between 999990 and 999999 - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - AccountPK pk = (AccountPK) entityContext.getPrimaryKey(); - if ((pk.number >= 999990) && (pk.number <= 999999)) { - logger.log(BasicLevel.DEBUG, - "RemoveException throwned by bean provider in ejbRemove"); - throw new RemoveException("RemoveException throwned by bean provider in ejbRemove"); - } - } - - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - entityContext = null; - } - - public AccountPK ejbCreate(int val_number, String val_customer, long val_balance) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setNumber(val_number); - setCustomer(val_customer); - setBalance(val_balance); - return (null); - } - - /** - * this method is common for impl and expl bean - * it is used to test exception raised in ejbCreate - * with unspecified transactional context (Required attribute) - * CAUTION: Do not call ejbCreate inside another ejbCreate (known bug) - */ - public AccountPK ejbCreate(int flag) throws CreateException, AppException { - logger.log(BasicLevel.DEBUG, ""); - setNumber(1951); - setCustomer("Myself"); - setBalance(10000); - if (flag == 0) { - entityContext.setRollbackOnly(); - throw new AppException("AppException in ejbCreate(boolean)"); - } else { - int zero = 0; - float f = 10 / zero; - } - return (null); - } - - /** - * this method is common for impl and expl bean - * NotSupported attr. - * CAUTION: Do not call ejbCreate inside another ejbCreate (known bug) - */ - public AccountPK ejbCreate(boolean flag) throws CreateException, AppException { - logger.log(BasicLevel.DEBUG, ""); - setNumber(1951); - setCustomer("Myself"); - setBalance(10000); - if (flag) { - throw new AppException("AppException in ejbCreate(boolean)"); - } else { - int zero = 0; - float f = 10 / zero; - } - return (null); - } - - public void ejbPostCreate(int val_number, String val_customer, long val_balance) { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPostCreate(int flag) { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPostCreate(boolean flag) { - logger.log(BasicLevel.DEBUG, ""); - } - - public void doFailedEjbStore_1() { - logger.log(BasicLevel.DEBUG, ""); - setBalance(1000); - forceToFailEjbStore = true; - } - public void doFailedEjbStore_2() { - logger.log(BasicLevel.DEBUG, ""); - setBalance(2000); - forceToFailEjbStore = true; - } - public void doFailedEjbStore_3() { - logger.log(BasicLevel.DEBUG, ""); - setBalance(3000); - forceToFailEjbStore = true; - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/beanexc/AccountSL.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/beanexc/AccountSL.java deleted file mode 100644 index d93b90fb9ca25e88dd9409d798e597e5120ce2d5..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/beanexc/AccountSL.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.beanexc; - -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.ejb.EJBContext; -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * Stateless Session Bean - * @author Philippe Coq - */ -public class AccountSL extends AccountCommon implements SessionBean { - protected SessionContext sessionContext = null; - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setSessionContext(SessionContext t) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - sessionContext = t; - } - - public void ejbCreate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setBalance(long val) { - logger.log(BasicLevel.DEBUG, ""); - } - - public EJBContext getContext() { - logger.log(BasicLevel.DEBUG, ""); - return sessionContext; - } - - public void doFailedEjbStore_1() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void doFailedEjbStore_2() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void doFailedEjbStore_3() { - logger.log(BasicLevel.DEBUG, ""); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bmt/Moscone.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bmt/Moscone.java deleted file mode 100644 index 4ff31de44e7b1f604789b35657e6b1c159911cff..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bmt/Moscone.java +++ /dev/null @@ -1,17 +0,0 @@ -// Moscone.java - -package org.objectweb.jonas.jtests.beans.bmt; - -import java.rmi.RemoteException; -import javax.ejb.EJBObject; - -/** - * Moscone remote interface - */ -public interface Moscone extends EJBObject { - public void tx_start() throws RemoteException; - public void tx_commit() throws RemoteException; - public void tx_rollback() throws RemoteException; - public void moscone1() throws RemoteException; - public void moscone2() throws RemoteException; -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bmt/MosconeST.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bmt/MosconeST.java deleted file mode 100644 index 47479784873d1bc789bd98f7cd209d3f60462f16..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/bmt/MosconeST.java +++ /dev/null @@ -1,324 +0,0 @@ -// MosconeST.java -// Stateful Session Bean - -package org.objectweb.jonas.jtests.beans.bmt; - -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.SQLException; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import javax.sql.DataSource; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * Stateful Session bean that manages transactions inside the bean. - * This type of bean must NOT implement SessionSynchronization. - */ -public class MosconeST implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - - // state of the sessionbean - Context ictx = null; - UserTransaction ut = null; - Connection cnx = null; - ResultSet rs = null; - Statement st = null; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - if( logger == null) - logger = Log.getLogger("org.objectweb.jonas_tests"); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the session object. - * This happens as a result of a client's invoking a remove operation, or when a - * container decides to terminate the session object after a timeout. - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - private void getConnection() throws RemoteException { - try { - ictx = new InitialContext(); - DataSource ds = (DataSource) PortableRemoteObject.narrow(ictx.lookup("jdbc_1"), DataSource.class); - cnx = ds.getConnection(); - } catch (Exception e) { - throw new RemoteException("cannot get connection: " + e); - } - } - - private void closeConnection() throws RemoteException { - try { - if (cnx != null) { - cnx.close(); - } - } catch (Exception e) { - throw new RemoteException("cannot close connection: " + e); - } - } - - /** - * The Session bean must define 1 or more ejbCreate methods. - * - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Moscone implementation - // ------------------------------------------------------------------ - - /** - * The following method start a transaction that will be continued - * in other methods of this bean. - */ - public void tx_start() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - - // Obtain the UserTransaction interface - try { - ut = ejbContext.getUserTransaction(); - } catch (IllegalStateException e) { - logger.log(BasicLevel.ERROR, "Can't get UserTransaction"); - throw new RemoteException("Can't get UserTransaction:", e); - } - - // Start a global transaction - try { - ut.begin(); - } catch (NotSupportedException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } catch (SystemException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } - } - - /** - * This method commits the current transaction, started previously by tx_start(). - */ - public void tx_commit() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - - // Commit this GLOBAL transaction - try { - ut.commit(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Can't commit Transaction"); - throw new RemoteException("Can't commit Transaction:", e); - } - } - - /** - * This method rolls back the current transaction, started previously by tx_start(). - */ - public void tx_rollback() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - - // Roll back this GLOBAL transaction - try { - ut.rollback(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Can't rollback Transaction"); - throw new RemoteException("Can't rollback Transaction:", e); - } - } - - /** - * This method open a connection before starting transactions. - */ - public void moscone1() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - - getConnection(); - - // Obtain the UserTransaction interface - try { - ut = ejbContext.getUserTransaction(); - } catch (IllegalStateException e) { - logger.log(BasicLevel.ERROR, "Can't get UserTransaction"); - throw new RemoteException("Can't get UserTransaction:", e); - } - - // Start a global transaction - try { - ut.begin(); - } catch (NotSupportedException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } catch (SystemException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } - - // work with connection. - try { - String ret = null; - st = cnx.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); - rs = st.executeQuery("SELECT * FROM JT2_MARCHE"); - if (rs.first()) { - do { - ret += rs.getInt("IDMAR") + ":" + rs.getString("NOM") + "\n"; - } while(rs.next()); - } - st.close(); - } catch (SQLException e) { - throw new RemoteException("Error working on database: " + e); - } - - // Commit this GLOBAL transaction - try { - ut.commit(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Can't commit Transaction"); - throw new RemoteException("Can't commit Transaction:", e); - } - - closeConnection(); - } - - /** - * This method open a connection before starting transactions. - */ - public void moscone2() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - - int count = 0; - - getConnection(); - - // Obtain the UserTransaction interface - try { - ut = ejbContext.getUserTransaction(); - } catch (IllegalStateException e) { - logger.log(BasicLevel.ERROR, "Can't get UserTransaction"); - throw new RemoteException("Can't get UserTransaction:", e); - } - - // Start a global transaction - try { - ut.begin(); - } catch (NotSupportedException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } catch (SystemException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } - - try { - // Count the number of lines - st = cnx.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); - rs = st.executeQuery("SELECT * FROM JT2_MARCHE"); - - if (rs.first()) { - do { - count++; - } while(rs.next()); - } - - // try to add a line - st.execute("insert into JT2_MARCHE values(5, 'Philippe Morris')"); - - st.close(); - } catch (SQLException e) { - throw new RemoteException("Error working on database: " + e); - } - - // Rollback this GLOBAL transaction: The line should not be added! - try { - ut.rollback(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Can't commit Transaction"); - throw new RemoteException("Can't commit Transaction:", e); - } - - try { - // Count the number of lines again - int count2 = 0; - st = cnx.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY); - rs = st.executeQuery("SELECT * FROM JT2_MARCHE"); - - if (rs.first()) { - do { - count2++; - } while(rs.next()); - } - - st.close(); - - // Check that we did not change the database - if (count2 > count) { - throw new RemoteException("Bad result on this test:" + count2); - } - } catch (SQLException e) { - throw new RemoteException("Error working on database: " + e); - } - - closeConnection(); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/cluster/IdentityEC.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/cluster/IdentityEC.java deleted file mode 100644 index f61f315101bc65f2782c4afad48126a461017782..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/cluster/IdentityEC.java +++ /dev/null @@ -1,174 +0,0 @@ -package org.objectweb.jonas.jtests.beans.cluster; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -public class IdentityEC implements EntityBean { - - static private Logger logger = null; - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // State of the bean. - // They must be public for Container Managed Persistence. - // ------------------------------------------------------------------ - public String name; - public int number; - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, "="+number); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, "="+number); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, "="+number); - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String s, int i) throws CreateException, DuplicateKeyException { - - // Init here the bean fields - name = s; - number = i; - logger.log(BasicLevel.DEBUG, "="+number); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String s, int i) throws CreateException { - logger.log(BasicLevel.DEBUG, "="+number); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, "="+number); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, "="+number); - } - - // ------------------------------------------------------------------ - // Identity implementation - // ------------------------------------------------------------------ - - /** - * getName - */ - public String getName() { - logger.log(BasicLevel.DEBUG, "="+number); - return name; - } - - /** - * getNumber - */ - public int getNumber() { - logger.log(BasicLevel.DEBUG, "="+number); - return number; - } - - /** - * setNumber - */ - public void setNumber(int val) { - number = val; - logger.log(BasicLevel.DEBUG, "="+number); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/AccountEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/AccountEC2.java deleted file mode 100644 index fd4c48f5adc9911cd280db3d702b4aa9c44cb711..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/AccountEC2.java +++ /dev/null @@ -1,191 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.ebasic; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * This is an entity bean with "container managed persistence version 2.x". - * This bean is used to test an entity with a primary key that maps a java.lang.Integer - * single field. - * @author Helene Joanin - */ -public abstract class AccountEC2 implements EntityBean { - - static protected Logger logger = null; - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract Integer getNumber(); - public abstract void setNumber(Integer numtest); - - public abstract String getCustomer(); - public abstract void setCustomer(String customer); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public java.lang.Integer ejbCreate(int num, String s) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setNumber(new Integer(num)); - setCustomer(new String(s)); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(int num, String s) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Account implementation - // ------------------------------------------------------------------ - - /** - * getNumberPrimitive() - */ - public int getNumberPrimitive() { - logger.log(BasicLevel.DEBUG, ""); - return getNumber().intValue(); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/BDateEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/BDateEC2.java deleted file mode 100644 index 0081b2c3250d6b64b385e2a93dc8598fe9734f25..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/BDateEC2.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.ebasic; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * - */ -public abstract class BDateEC2 implements javax.ejb.EntityBean { - - static private Logger logger = null; - javax.ejb.EntityContext ejbContext; - - - public java.util.Date ejbCreate(int f1, - int f2, - java.util.Date f3) throws javax.ejb.CreateException{ - - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setField1(f1); - setField2(f2); - setField3(f3); - return null; - } - - public void ejbPostCreate(int f1, int f2, java.util.Date f3) { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Persistent fields - // - // ------------------------------------------------------------------ - public abstract int getField1(); - public abstract void setField1(int f1); - - public abstract int getField2(); - public abstract void setField2(int f2); - - public abstract java.util.Date getField3(); - public abstract void setField3(java.util.Date f3); - - // ------------------------------------------------------------------ - // Standard call back methods - // ------------------------------------------------------------------ - - - public void setEntityContext(javax.ejb.EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/E4QueryEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/E4QueryEC2.java deleted file mode 100644 index 0b4a2f51f52614f083d1ea0e827bbf19344be1ca..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/E4QueryEC2.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.ebasic; - -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * This is an entity bean with "container managed persistence version 2.x". - * The state of an instance is stored into a relational database. - * @author Helene Joanin - */ - -public abstract class E4QueryEC2 implements EntityBean { - - static protected Logger logger = null; - - protected EntityContext entityContext; - - - // Get and Set accessor methods of the bean's abstract schema - public abstract String getId(); - public abstract void setId(String s); - public abstract String getFstring(); - public abstract void setFstring(String s); - public abstract int getFint(); - public abstract void setFint(int i); - public abstract double getFdouble(); - public abstract void setFdouble(double i); - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - } - - public String ejbCreate(String id, String s, int i, double d) throws CreateException { - logger.log(BasicLevel.DEBUG, "create "+id+","+s+","+i+","+d); - setId(id); - setFstring(s); - setFint(i); - setFdouble(d); - return(null); - } - - public void ejbPostCreate(String id, String s, int i, double d){ - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/PersonEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/PersonEC2.java deleted file mode 100644 index 4e6e0ba6f603ee077ecf69e1dfdf72d102150b28..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/PersonEC2.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -/** - * This is an entity bean with "container managed persistence version 2.x". - * This bean is used to test an entity with an unknown primary key class at the development phase. - * @author Helene Joanin - */ - -package org.objectweb.jonas.jtests.beans.ebasic; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * - */ -public abstract class PersonEC2 implements EntityBean { - - static protected Logger logger = null; - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract Integer getNumber(); - public abstract void setNumber(Integer num); - - public abstract String getName(); - public abstract void setName(String name); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public java.lang.Object ejbCreate(int i, String s) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setNumber(new Integer(i)); - setName(new String(s)); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(int i, String s) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Person implementation - // ------------------------------------------------------------------ - - /** - * getNumberPrimitive - */ - public int getNumberPrimitive() { - logger.log(BasicLevel.DEBUG, ""); - return getNumber().intValue(); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/SimpleEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/SimpleEC2.java deleted file mode 100644 index 2e9042dd30b642d98e59e09f0210ab52fe8df951..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/SimpleEC2.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.ebasic; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * This is an entity bean with "container managed persistence version 2.x". - * The state of an instance is stored into a relational database. - * The following table should exist : - * ebasicSimpleEC2 - * c_testname varchar(30) primarey key - * c_info integer - * c_numtest integer - * @author Philippe Coq, Philippe Durieux, Helene Joanin - */ - -public abstract class SimpleEC2 implements EntityBean { - - static protected Logger logger = null; - - protected EntityContext entityContext; - - - // Get and Set accessor methods of the bean's abstract schema - public abstract int getInfo(); - public abstract void setInfo(int info); - - public abstract int getNumTest(); - public abstract void setNumTest(int numtest); - - public abstract String getTestName(); - public abstract void setTestName(String testname); - - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - } - - public String ejbCreate(String name, int info, int num) throws CreateException { - logger.log(BasicLevel.DEBUG, "create"+info+","+name+","+num); - setInfo(info); - setNumTest(num); - setTestName(name); - return(null); - } - - public void ejbPostCreate(String name, int info, int num) { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * loop back on the same bean instance. - * This is forbidden when bean is non reentrant. - * @return true if test passed. - * @throws RemoteException - */ - public boolean loopBack() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - boolean pass = false; - Simple myref = (Simple) entityContext.getEJBObject(); - try { - myref.getNumTest(); - } catch (RemoteException e) { - logger.log(BasicLevel.DEBUG, "expected exception:" + e); - pass = true; - } - return pass; - } - - /** - * loop back on the same bean instance. - * This is forbidden when bean is non reentrant. - * @return true if test passed. - * @throws RemoteException - */ - public boolean loopBackTx() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - boolean pass = false; - Simple myref = (Simple) entityContext.getEJBObject(); - try { - myref.getNumTest(); - } catch (RemoteException e) { - logger.log(BasicLevel.DEBUG, "expected exception:" + e); - pass = true; - } - return pass; - } - - public void nullPointerException() throws RemoteException { - Account acc = null; - acc.hashCode(); - } - - /** - * Check the set of allowed operations - * See EJB 2.1 spec - 12.1.6 - */ - public void ejbHomeGlobalOpe() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - if (entityContext == null) { - throw new RemoteException("null entityContext"); - } - entityContext.getEJBHome(); - // This bean has no local interface - try { - entityContext.getEJBLocalHome(); - } catch (IllegalStateException e) { - } - entityContext.getCallerPrincipal(); - entityContext.getRollbackOnly(); - entityContext.isCallerInRole("role"); - entityContext.getTimerService(); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/pkautoObjectEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/pkautoObjectEC2.java deleted file mode 100644 index 04e96c202b0f433eaf2f7e1271fb1dabffed39d0..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ebasic/pkautoObjectEC2.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * --------------------------------------------------------------------------$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.ebasic; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * This is an entity bean with "container managed persistence version 2". - * This bean is used to test an entity with auto generated primary key - * @author Jerome Camilleri - */ -public abstract class pkautoObjectEC2 implements javax.ejb.EntityBean { - - static protected Logger logger = null; - javax.ejb.EntityContext ejbContext; - - - public java.lang.Object ejbCreate(int f1, int f2) throws javax.ejb.CreateException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setField1(f1); - setField2(f2); - return null; - } - - public void ejbPostCreate(int f1, int f2) { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Abstract Accessor methods for Persistent fields - // ------------------------------------------------------------------ - public abstract int getField1(); - public abstract void setField1(int f1); - - public abstract int getField2(); - public abstract void setField2(int f2); - - // ------------------------------------------------------------------ - // Standard call back methods - // ------------------------------------------------------------------ - - public void setEntityContext(javax.ejb.EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ejbql/SessionTestBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ejbql/SessionTestBean.java deleted file mode 100644 index 56c130d809d7efe2b90c8a0b449154cbcd16f5cd..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/ejbql/SessionTestBean.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.ejbql; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * Stateless Session useful to do some specifics tests which local interfaces are needed. - * @author Helene Joanin - */ -public class SessionTestBean implements SessionBean { - - static protected Logger logger = null; - protected SessionContext ctx = null; - protected CustomerHomeLocal hCustomer = null; - protected PhoneHomeLocal hPhone = null; - - // SessionBean methods implementation - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - this.ctx = ctx; - try { - InitialContext inctx = new InitialContext(); - hCustomer = (CustomerHomeLocal) inctx.lookup("java:comp/env/ejb/CustomerHomeLocal"); - hPhone = (PhoneHomeLocal) inctx.lookup("java:comp/env/ejb/PhoneHomeLocal"); - } catch (Exception e) { - throw new javax.ejb.EJBException(e); - } - } - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // SessionTestRemote implementation - public Integer getCustomerWithPhone(String phoneNumber) throws EJBException { - try { - PhoneLocal phone = hPhone.findByNumber(phoneNumber); - CustomerLocal customer = hCustomer.findCustomerWithPhone(phone); - return customer.getId(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Cannot get the customer with phone " + phoneNumber, e); - throw new EJBException("Cannot get the customer with phone " + phoneNumber, e); - } - } -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/etype/EtypeBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/etype/EtypeBean.java deleted file mode 100644 index be086ff09bf606e8933be9d4800030d64a3d2cf8..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/etype/EtypeBean.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.etype; - -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * This class implements the common code of all the entities beans classes of the etype/* tests. - * @author Helene Joanin - * Contributor(s): - */ - -public abstract class EtypeBean implements EntityBean { - - static protected Logger logger = null; - - protected EntityContext entityContext; - - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/FileEC.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/FileEC.java deleted file mode 100644 index 8a7283a4c6cf752a1f5b9c2b6c0309d49a0b8d1b..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/FileEC.java +++ /dev/null @@ -1,305 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.folder; - -import java.io.Serializable; -import java.rmi.RemoteException; -import javax.ejb.EJBException; -import javax.ejb.EJBHome; -import javax.ejb.EJBLocalHome; -import javax.ejb.EJBMetaData; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.ejb.CreateException; -import javax.ejb.TimedObject; -import javax.ejb.Timer; -import javax.ejb.TimerHandle; -import javax.ejb.TimerService; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * Implementation for the bean FileEC. - * @author Philippe Durieux - */ -public class FileEC implements EntityBean, TimedObject { - - protected static Logger logger = null; - EntityContext ejbContext; - InitialContext ictx; - Context myEnv; - PaperLocalHome phome; - PaperLocal p1; - PaperLocal p2; - - // ------------------------------------------------------------------ - // State of the bean. - // They must be public for Container Managed Persistance. - // ------------------------------------------------------------------ - public String name; - public String p1pk; - public String p2pk; - public int count; - - /** - * Check environment variables - */ - void checkEnv(String method) { - - // Check directly in my context - logger.log(BasicLevel.DEBUG, "Check directly in my context"); - try { - String value = (String) myEnv.lookup("myname"); - if (!value.equals("myentity")) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup failed: myname=" + value); - throw new EJBException("FileEC 1: " + method); - } - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup raised exception:\n" + e); - throw new EJBException("FileEC 2: " + method); - } - // Check from initial Context - logger.log(BasicLevel.DEBUG, "Check from initial Context"); - try { - String value = (String) ictx.lookup("java:comp/env/myname"); - if (!value.equals("myentity")) { - logger.log(BasicLevel.ERROR, ": ictx.lookup failed: myname=" + value); - throw new EJBException("FileEC 6: " + method); - } - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, ": ictx.lookup raised exception:\n" + e); - throw new EJBException("FileEC 7: " + method); - } - logger.log(BasicLevel.DEBUG, ": checkEnv OK"); - } - - // ------------------------------------------------------------------ - // TimedObject implementation - // ------------------------------------------------------------------ - - /* - * @param timer the Timer object - * @see javax.ejb.TimedObject#ejbTimeout(javax.ejb.Timer) - */ - public void ejbTimeout(Timer timer) { - logger.log(BasicLevel.DEBUG, ""); - Serializable sz = timer.getInfo(); - if (!(sz instanceof Integer)) { - logger.log(BasicLevel.ERROR, "Bad Info"); - return; - } - int action = ((Integer)sz).intValue(); - boolean ok = true; - } - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Called by the container after the instance has been created. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - // Get initial Context - ictx = new InitialContext(); - myEnv = (Context) ictx.lookup("java:comp/env"); - } catch (NamingException e) { - throw new EJBException("FileEC: Cannot get filehome:" + e); - } - checkEnv("setEntityContext"); - - // Check that we can do "getEJBHome" - EJBHome home = ctx.getEJBHome(); - if (home == null) { - throw new EJBException("FileEC: setEntityContext cannot get EJBHome"); - } - // Check that we can do "getEJBLocalHome" - EJBLocalHome homel = ctx.getEJBLocalHome(); - if (homel == null) { - throw new EJBException("FileEC: setEntityContext cannot get EJBLocalHome"); - } - // Check that we can do "getEJBMetaData" - try { - EJBMetaData md = home.getEJBMetaData(); - } catch (RemoteException e) { - throw new EJBException("FileEC: setEntityContext cannot get EJBMetaData"); - } - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - try { - stateUpdate(); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "FileEC ejbActivate raised exception " + e); - throw new EJBException("Error in ejbActivate:" + e); - } - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - // raz values to verify that activation is ok. - phome = null; - p1 = null; - p2 = null; - } - - /** - * Persistent state has been loaded just before this method is invoked - * by the container. - * Must reinit here non persistent data. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - p1 = null; - if (p1pk.length() > 0) { - try { - p1 = phome.findByPrimaryKey(p1pk); - } catch (FinderException e) { - } - } - p2 = null; - if (p2pk.length() > 0) { - try { - p2 = phome.findByPrimaryKey(p2pk); - } catch (FinderException e) { - } - } - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // ejbCreate methods - // ------------------------------------------------------------------ - - public String ejbCreate(String name) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - this.name = name; - return null; // In CMP, should return null. - } - - public String ejbPostCreate(String name) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - try { - stateUpdate(); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "FileEC ejbPostCreate raised exception " + e); - throw new CreateException("Error in ejbPostCreate:" + e); - } - return null; // In CMP, should return null. - } - - // ------------------------------------------------------------------ - // File / FileLocal implementation - // ------------------------------------------------------------------ - - public TimerHandle getTimerHandle() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = ejbContext.getTimerService(); - Timer mt = timerservice.createTimer(300 * 1000, new Integer(1)); - TimerHandle th = mt.getHandle(); - return th; - } - - public void cancelTimer(TimerHandle th) throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - Timer mt = th.getTimer(); - mt.cancel(); - } - - public int getP1Value() { - logger.log(BasicLevel.DEBUG, ""); - int ret = p1.getValue(); - return ret; - } - - public int getP2Value() { - logger.log(BasicLevel.DEBUG, ""); - int ret = p2.getValue(); - return ret; - } - - public String getName() { - logger.log(BasicLevel.DEBUG, ""); - return this.name; - } - - public int getCount() { - logger.log(BasicLevel.DEBUG, ""); - return this.count; - } - - public PaperLocal getP1() { - logger.log(BasicLevel.DEBUG, ""); - return p1; - } - - public PaperLocal getP2() { - logger.log(BasicLevel.DEBUG, ""); - return p2; - } - - // ------------------------------------------------------------------ - // private methods - // ------------------------------------------------------------------ - - /** - * init non persistent bean data. - * This should be called when instance is created or activated. - */ - private void stateUpdate() throws NamingException { - // lookup paperhome in JNDI - phome = (PaperLocalHome) ictx.lookup("java:comp/env/ejb/paper"); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/FolderSY.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/FolderSY.java deleted file mode 100644 index 0142e7c127de4e7db424c99041f3c0e4cdc33f9a..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/FolderSY.java +++ /dev/null @@ -1,527 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.folder; - -import java.io.Serializable; -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Enumeration; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.NoSuchObjectLocalException; -import javax.ejb.RemoveException; -import javax.ejb.SessionBean; -import javax.ejb.SessionSynchronization; -import javax.ejb.SessionContext; -import javax.ejb.Timer; -import javax.ejb.TimerHandle; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import javax.sql.DataSource; -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * FolderSY implementation - * This bean is a stateful session bean that implements SessionSynchronization - * @author Philippe Durieux, Philippe Coq - */ -public class FolderSY implements SessionBean, SessionSynchronization { - - protected static Logger logger = null; - SessionContext ejbContext; - transient InitialContext ictx; - Context myEnv; - FileHome filehome; - PaperLocalHome paperhome; - Paper2LocalHome paper2home; - Paper3LocalHome paper3home; - boolean rollbackOnly; - - /** - * Check environment variables - */ - void checkEnv(String method) { - - // Check directly in my context - logger.log(BasicLevel.DEBUG, "Check directly in my context"); - try { - String value = (String) myEnv.lookup("myname"); - if (!value.equals("mysession")) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup failed: myname=" + value); - throw new EJBException("FolderSY 1: " + method); - } - } catch (Exception e) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup raised exception:\n" + e); - throw new EJBException("FolderSY 2: " + method); - } - // Idem with compound name - logger.log(BasicLevel.DEBUG, "Idem with compound name"); - try { - String value = (String) myEnv.lookup("dir1/dir2/name"); - if (!value.equals("sessionvalue")) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup failed: dir1/dir2/name=" + value); - throw new EJBException("FolderSY 3: " + method); - } - } catch (Exception e) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup raised exception:\n" + e); - throw new EJBException("FolderSY 4: " + method); - } - // Check from initial Context - logger.log(BasicLevel.DEBUG, "Check from initial Context"); - try { - String value = (String) ictx.lookup("java:comp/env/myname"); - if (!value.equals("mysession")) { - logger.log(BasicLevel.ERROR, ": ictx.lookup failed: myname=" + value); - throw new EJBException("FolderSY 6: " + method); - } - } catch (Exception e) { - logger.log(BasicLevel.ERROR, ": ictx.lookup raised exception:\n" + e); - throw new EJBException("FolderSY 7: " + method); - } - - // Check datasource directly - logger.log(BasicLevel.DEBUG, "Check datasource directly"); - DataSource ds1 = null; - try { - ds1 = (DataSource) ictx.lookup("jdbc_1"); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, ": ictx.lookup raised exception:\n" + e); - throw new EJBException("FolderSY 8: " + method); - } - Connection con = null; - if (!method.equals("afterCompletion")) { - try { - con = (Connection) ds1.getConnection(); - if (con.isClosed()) { - logger.log(BasicLevel.ERROR, ": connection is closed"); - throw new EJBException("FolderSY 8a: " + method); - } - con.close(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, ": getConnection:\n" + e); - throw new EJBException("FolderSY 8b: " + method); - } - } - - // Check DataSource from resource ref in bean environment - logger.log(BasicLevel.DEBUG, "Check DataSource from resource ref"); - DataSource ds2 = null; - try { - // The name is the one defined in FolderSY.xml - ds2 = (DataSource) myEnv.lookup("jdbc/mydb"); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, ": ictx.lookup raised exception:\n" + e); - throw new EJBException("FolderSY 9: " + method); - } - if (!method.equals("afterCompletion")) { - try { - con = (Connection) ds2.getConnection(); - if (con.isClosed()) { - logger.log(BasicLevel.ERROR, ": connection is closed"); - throw new EJBException("FolderSY 9a: " + method); - } - con.close(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, ": getConnection:\n" + e); - throw new EJBException("FolderSY 9b: " + method); - } - } - - // Check boolean values - logger.log(BasicLevel.DEBUG, "Check boolean values"); - try { - Boolean value = (Boolean) ictx.lookup("java:comp/env/bVrai"); - if (!value.booleanValue()) { - logger.log(BasicLevel.ERROR, ": ictx.lookup failed: bVrai=" + value); - throw new EJBException("FolderSY 10a: " + method); - } - } catch (Exception e) { - logger.log(BasicLevel.ERROR, ": ictx.lookup raised exception:\n" + e); - throw new EJBException("FolderSY10a: " + method); - } - try { - Boolean value = (Boolean) ictx.lookup("java:comp/env/bFaux"); - if (value.booleanValue()) { - logger.log(BasicLevel.ERROR, ": ictx.lookup failed: bFaux=" + value); - throw new EJBException("FolderSY 10b: " + method); - } - // lookup char in env-entry - Character c = (Character) ictx.lookup("java:comp/env/testChar"); - - - } catch (Exception e) { - logger.log(BasicLevel.ERROR, ": ictx.lookup raised exception:\n" + e); - throw new EJBException("FolderSY10b: " + method); - } - - logger.log(BasicLevel.DEBUG, ": checkEnv OK"); - } - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - // Get initial Context - ictx = new InitialContext(); - myEnv = (Context) ictx.lookup("java:comp/env"); - // lookup filehome in JNDI - filehome = (FileHome) PortableRemoteObject.narrow(ictx.lookup("java:comp/env/ejb/file"), FileHome.class); - paperhome = (PaperLocalHome) PortableRemoteObject.narrow(ictx.lookup("java:comp/env/ejb/paperec2"), PaperLocalHome.class); - paper2home = (Paper2LocalHome) PortableRemoteObject.narrow(ictx.lookup("java:comp/env/ejb/paper2"), Paper2LocalHome.class); - paper3home = (Paper3LocalHome) PortableRemoteObject.narrow(ictx.lookup("java:comp/env/ejb/paper3"), Paper3LocalHome.class); - } catch (NamingException e) { - throw new EJBException("FolderSY: Cannot get filehome:" + e); - } - checkEnv("setSessionContext"); - } - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - checkEnv("ejbRemove"); - } - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - checkEnv("ejbCreate"); - rollbackOnly = false; - } - - public void ejbCreateForRollback() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - checkEnv("ejbCreate"); - rollbackOnly = true; - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - checkEnv("ejbPassivate"); - ictx = null; - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - try { - // Get initial Context - ictx = new InitialContext(); - } catch (NamingException e) { - throw new EJBException("FolderSY: Cannot get Initial Context:" + e); - } - checkEnv("ejbActivate"); - } - - // ------------------------------------------------------------------ - // SessionSynchronization implementation - // ------------------------------------------------------------------ - - public void afterBegin() { - logger.log(BasicLevel.DEBUG, ""); - checkEnv("afterBegin"); - try { - ejbContext.getRollbackOnly(); - } catch (IllegalStateException e) { - throw new EJBException("Cannot call getRollbackOnly in afterBegin"); - } - if (rollbackOnly) { - try { - ejbContext.setRollbackOnly(); - } catch (IllegalStateException e) { - throw new EJBException("Cannot call setRollbackOnly in afterBegin"); - } - } - } - - public void beforeCompletion() { - logger.log(BasicLevel.DEBUG, ""); - checkEnv("beforeCompletion"); - try { - ejbContext.getRollbackOnly(); - } catch (IllegalStateException e) { - throw new EJBException("Cannot call getRollbackOnly in beforeCompletion"); - } - if (rollbackOnly) { - try { - ejbContext.setRollbackOnly(); - } catch (IllegalStateException e) { - throw new EJBException("Cannot call setRollbackOnly in afterBegin"); - } - } - } - - public void afterCompletion(boolean committed) { - logger.log(BasicLevel.DEBUG, ""); - checkEnv("afterCompletion"); - // Should not be able to call set or get RollbackOnly here. - try { - ejbContext.getRollbackOnly(); - throw new EJBException("getRollbackOnly forbidden in afterCompletion"); - } catch (IllegalStateException e) { - } - if (rollbackOnly) { - try { - ejbContext.setRollbackOnly(); - throw new EJBException("setRollbackOnly forbidden in afterCompletion"); - } catch (IllegalStateException e) { - } - } - } - - // ------------------------------------------------------------------ - // Folder implementation - // ------------------------------------------------------------------ - - public File newFile(String fname) throws RemoteException, CreateException { - logger.log(BasicLevel.DEBUG, ""); - checkEnv("newFile"); - File ret = filehome.create(fname); - return ret; - } - - public File getFile(String fname) throws RemoteException, FinderException { - logger.log(BasicLevel.DEBUG, ""); - checkEnv("getFile"); - File ret = filehome.findByPrimaryKey(fname); - return ret; - } - - public boolean testTimerCancel(String fname) throws RemoteException, CreateException { - logger.log(BasicLevel.DEBUG, ""); - boolean ret = true; - - // Create a bean implementing TimedObject - File file = filehome.create(fname); - - // Create a Timer on this bean and get its Handle - TimerHandle th = file.getTimerHandle(); - if (th == null) { - logger.log(BasicLevel.WARN, "Null Handle returned"); - return false; - } - - // Check that Timer Info can be read and is correct. - Timer t = th.getTimer(); - Serializable sz = t.getInfo(); - if (!(sz instanceof Integer)) { - logger.log(BasicLevel.WARN, "Non-integer info value returned"); - return false; - } - - // Cancel the timer - file.cancelTimer(th); - - // Check that the TimerHandle cannot be used any longer - try { - th.getTimer(); - logger.log(BasicLevel.WARN, "Timer still accessible after bean remove"); - ret = false; - } catch (NoSuchObjectLocalException e) { - } - - // Remove the bean - try { - file.remove(); - } catch (Exception e) { - logger.log(BasicLevel.WARN, "Cannot remove the bean after use."); - return false; - } - return ret; - } - - public boolean testTimerRemoved(String fname) throws RemoteException, CreateException, RemoveException { - logger.log(BasicLevel.DEBUG, ""); - boolean ret = true; - - // Create a bean implementing TimedObject - File file = filehome.create(fname); - - // Create a Timer on this bean and get its Handle - TimerHandle th = file.getTimerHandle(); - if (th == null) { - logger.log(BasicLevel.WARN, "Null Handle returned"); - return false; - } - - // Check that Timer Info can be read and is correct. - Serializable sz = th.getTimer().getInfo(); - if (!(sz instanceof Integer)) { - logger.log(BasicLevel.WARN, "Non-integer info value returned"); - return false; - } - - // Remove the bean (and the timer!) - file.remove(); - - // Check that the TimerHandle cannot be used any longer - try { - th.getTimer(); - logger.log(BasicLevel.WARN, "Timer still accessible after bean remove"); - ret = false; - } catch (NoSuchObjectLocalException e) { - } - return ret; - } - - public void sendRef(Folder f) throws RemoteException { - } - - public void sendInt(int i) throws RemoteException { - } - - public void sendRefTS(Folder f) throws RemoteException { - } - - public void sendIntTS(int i) throws RemoteException { - } - - public Folder getRef(Folder f) throws RemoteException { - return f; - } - - public int getInt(int i) throws RemoteException { - return i; - } - - public Folder getRefTS(Folder f) throws RemoteException { - return f; - } - - public int getIntTS(int i) throws RemoteException { - return i; - } - - public void sendArray(long[] x) throws RemoteException { - } - - public long[] getArray() throws RemoteException { - long[] anArray; - anArray = new long [100]; - for (int i = 0; i < anArray.length; i++) { - anArray[i] = i; - } - return anArray; - } - public int modify(String pname, int val) throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - int sum=0; - try { - PaperLocal plocal = paperhome.findByPrimaryKey(pname); - logger.log(BasicLevel.DEBUG, "findByPrimaryKey OK "); - int valb = plocal.getValue(); - logger.log(BasicLevel.DEBUG, "valb= "+valb); - plocal.setValue(val); - sum = paperhome.getTotalValeur(); - logger.log(BasicLevel.DEBUG, "sum= "+sum); - - } catch (FinderException fe) { - - } finally { - // to clean up the changes - ejbContext.setRollbackOnly(); - } - return sum; - } - - public int modifypaper2And3(String pid, int val) throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - int sum=0; - try { - Paper2Local plocal2 = paper2home.findByPrimaryKey(pid); - logger.log(BasicLevel.DEBUG, "findByPrimaryKey OK "); - int valb = plocal2.getValeur(); - logger.log(BasicLevel.DEBUG, "valb= "+valb); - plocal2.setValeur(val); - - Paper3Local plocal3 = paper3home.findByPrimaryKey("2"); - String v1 = plocal3.getValide(); - if ( v1 == "1") { - plocal3.setValide("0"); - } else { - plocal3.setValide("1"); - - } - - sum = paper2home.getSumOfValeurs(); - logger.log(BasicLevel.DEBUG, "sum= "+sum); - - } catch (FinderException fe) { - - }finally { - // to clean up the changes - ejbContext.setRollbackOnly(); - } - return sum; - } - - - public int modifypaper2And3WithFinder(String pid, int val) throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - int nb=0; - Enumeration eList = null; - try { - Paper2Local plocal2 = paper2home.findByPrimaryKey(pid); - logger.log(BasicLevel.DEBUG, "findByPrimaryKey OK "); - int valb = plocal2.getValeur(); - logger.log(BasicLevel.DEBUG, "valb= "+valb); - plocal2.setValeur(val); - - Paper3Local plocal3 = paper3home.findByPrimaryKey("2"); - String v1 = plocal3.getValide(); - if ( v1 == "1") { - plocal3.setValide("0"); - } else { - plocal3.setValide("1"); - - } - Paper2Local paper2local = null; - eList = paper2home.findAllValide(); - while (eList.hasMoreElements()) { - paper2local =(Paper2Local)javax.rmi.PortableRemoteObject.narrow(eList.nextElement(), Paper2Local.class); - nb++; - } - logger.log(BasicLevel.DEBUG, "nb= "+nb); - - } catch (FinderException fe) { - - }finally { - // to clean up the changes - ejbContext.setRollbackOnly(); - } - return nb; - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/Paper2EC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/Paper2EC2.java deleted file mode 100644 index a226817e06c3008a874a18aa34f141461208ac6d..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/Paper2EC2.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.folder; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * This is an entity bean with "container managed persistence version 2.x". - * The state of an instance is stored into a relational database. - * The following table should exist : - * jt2_paper2 - * c_id varchar(30) primarey key - * c_valeur integer - * c_statut integer - * - * @author Philippe Coq - */ - -public abstract class Paper2EC2 implements EntityBean { - - static protected Logger logger = null; - - protected EntityContext entityContext; - - - // Get and Set accessor methods of the bean's abstract schema - // cmp-field - public abstract String getId(); - public abstract void setId(String id); - - public abstract int getValeur(); - public abstract void setValeur(int val); - - public abstract String getStatut(); - public abstract void setStatut(String val); - - // cmr-field - public abstract Paper3Local getPaper3(); - public abstract void setPaper3(Paper3Local p); - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - } - - public String ejbCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setId(id); - setValeur(0); - setStatut("0"); - return null; // In CMP, should return null. - } - - public void ejbPostCreate(String id) { - logger.log(BasicLevel.DEBUG, ""); - } - public abstract int ejbSelectGetSumOfValeurs() throws javax.ejb.FinderException; - - public int ejbHomeGetSumOfValeurs() throws javax.ejb.FinderException { - int sum = this.ejbSelectGetSumOfValeurs(); - return sum; - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/Paper3EC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/Paper3EC2.java deleted file mode 100644 index 261b36361468f1fb465ac382fe94a82e18bbde57..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/Paper3EC2.java +++ /dev/null @@ -1,113 +0,0 @@ - /* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.folder; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * This is an entity bean with "container managed persistence version 2.x". - * The state of an instance is stored into a relational database. - * The following table should exist : - * jt2_paper3 - * c_statut3 varchar primarey key - * c_valide integer - * - * @author Philippe Coq - */ - -public abstract class Paper3EC2 implements EntityBean { - - static protected Logger logger = null; - - protected EntityContext entityContext; - - - // Get and Set accessor methods of the bean's abstract schema - // cmp-field - public abstract String getStatut3(); - public abstract void setStatut3(String statut); - - public abstract String getValide(); - public abstract void setValide(String val); - - - // cmr-field - public abstract java.util.Collection getPaper2s(); - public abstract void setPaper2s(java.util.Collection p); - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - } - - public String ejbCreate(String statut) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setStatut3(statut); - setValide("0"); - return null; // In CMP, should return null. - } - - public void ejbPostCreate(String id) { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/PaperEC.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/PaperEC.java deleted file mode 100644 index 743efc94e2d32f7d13c817abf0998d6f502e8696..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/PaperEC.java +++ /dev/null @@ -1,183 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.folder; - -import javax.ejb.EJBException; -import javax.ejb.EJBLocalHome; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * Implementation for the bean PaperEC. - * @author Philippe Durieux, Philippe Coq - */ -public class PaperEC implements EntityBean { - - static protected Logger logger = null; - EntityContext ejbContext; - InitialContext ictx; - Context myEnv; - - // ------------------------------------------------------------------ - // State of the bean. - // They must be public for Container Managed Persistance. - // ------------------------------------------------------------------ - public String name; - public int value; - - /** - * Check environment variables - */ - void checkEnv(String method) { - - // Check directly in my context - logger.log(BasicLevel.DEBUG, "Check directly in my context"); - try { - String value = (String) myEnv.lookup("myname"); - if (!value.equals("myentity")) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup failed: myname=" + value); - throw new EJBException("FileEC 1: " + method); - } - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup raised exception:\n" + e); - throw new EJBException("FileEC 2: " + method); - } - // Check from initial Context - logger.log(BasicLevel.DEBUG, "Check from initial Context"); - try { - String value = (String) ictx.lookup("java:comp/env/myname"); - if (!value.equals("myentity")) { - logger.log(BasicLevel.ERROR, ": ictx.lookup failed: myname=" + value); - throw new EJBException("FileEC 6: " + method); - } - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, ": ictx.lookup raised exception:\n" + e); - throw new EJBException("FileEC 7: " + method); - } - logger.log(BasicLevel.DEBUG, ": checkEnv OK"); - } - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - // Get initial Context - ictx = new InitialContext(); - myEnv = (Context) ictx.lookup("java:comp/env"); - } catch (NamingException e) { - throw new EJBException("PaperEC: Cannot get filehome:" + e); - } - checkEnv("setEntityContext"); - - // Check that we can do "getEJBLocalHome" - EJBLocalHome homel = ctx.getEJBLocalHome(); - if (homel == null) { - throw new EJBException("PaperEC: setEntityContext cannot get EJBLocalHome"); - } - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // ejbCreate methods - // ------------------------------------------------------------------ - - public String ejbCreate(String name) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - this.name = name; - this.value = 0; - return null; // In CMP, should return null. - } - - public String ejbPostCreate(String name) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - return null; // In CMP, should return null. - } - - // Not used for PaperEC only for PaperEC2 - public int ejbHomeGetTotalValeur() throws javax.ejb.FinderException { - return 0; - } - // ------------------------------------------------------------------ - // PaperLocal implementation - // ------------------------------------------------------------------ - - public String getName() { - logger.log(BasicLevel.DEBUG, ""); - return this.name; - } - - public int getValue() { - logger.log(BasicLevel.DEBUG, ""); - return this.value; - } - - public void setValue(int v) { - logger.log(BasicLevel.DEBUG, ""); - this.value = v; - } -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/PaperEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/PaperEC2.java deleted file mode 100644 index 0a4181a3c1a81943118876c3716034b44e46894b..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/folder/PaperEC2.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.folder; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * This is an entity bean with "container managed persistence version 2.x". - * The state of an instance is stored into a relational database. - * The following table should exist : - * jt2_paper - * c_name varchar(30) primarey key - * c_value integer - * - * @author Philippe Coq, Philippe Durieux, Helene Joanin - */ - -public abstract class PaperEC2 implements EntityBean { - - static protected Logger logger = null; - - protected EntityContext entityContext; - - - // Get and Set accessor methods of the bean's abstract schema - public abstract String getName(); - public abstract void setName(String name); - - public abstract int getValue(); - public abstract void setValue(int val); - - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - } - - public String ejbCreate(String name) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setName(name); - setValue(0); - return null; // In CMP, should return null. - } - - public void ejbPostCreate(String name) { - logger.log(BasicLevel.DEBUG, ""); - } - public abstract int ejbSelectGetTotalValeur() throws javax.ejb.FinderException; - - public int ejbHomeGetTotalValeur() throws javax.ejb.FinderException { - int sum = this.ejbSelectGetTotalValeur(); - return sum; - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/inherit/PersonEC.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/inherit/PersonEC.java deleted file mode 100644 index 0b688ee661f4153c817794486d3cb57cdf3f7230..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/inherit/PersonEC.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// PersonEC.java - -package org.objectweb.jonas.jtests.beans.inherit; - -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - - -public class PersonEC extends PersonImpl implements EntityBean { - - static protected Logger logger = null; - protected EntityContext entityContext; - - public IdPK ejbCreate(int val_id, String val_name) throws CreateException { - - logger.log(BasicLevel.DEBUG, - "PersonEC.ejbCreate(int " + val_id + " ,String " + val_name + ")"); - // what should be done in a container managed bean is only the following lines ... - id = val_id; - name = val_name; - age = 1; - - return(null); - } - - public void ejbPostCreate(int val_id, String val_name) { - } - - public void ejbActivate() { - } - - public void ejbPassivate() { - } - - public void ejbLoad() { - } - - public void ejbStore() { - } - - // Test with no RemoveException exception - public void ejbRemove() { - } - - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - } - - public void unsetEntityContext() { - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/inherit/UserEC.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/inherit/UserEC.java deleted file mode 100644 index 9e5d5995808094d89a6840dacefa1a774f97950b..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/inherit/UserEC.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// UserEC.java -package org.objectweb.jonas.jtests.beans.inherit; - -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -public class UserEC extends UserImpl implements EntityBean { - - static protected Logger logger = null; - - protected EntityContext entityContext; - - public IdPK ejbCreate(int val_id, String val_name) throws CreateException { - - logger.log(BasicLevel.DEBUG, "UserEC.ejbCreate(int " + val_id + " ,String " + val_name + ")"); - - // what should be done in a container managed bean is only the following - // lines ... - id = val_id; - name = val_name; - age = 0; - password = "bidon"; - - return (null); - } - - public void ejbPostCreate(int val_id, String val_name) { - } - - public void ejbActivate() { - } - - public void ejbPassivate() { - } - - public void ejbLoad() { - - } - - public void ejbStore() { - } - - public void ejbRemove() throws RemoveException { - } - - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - } - - public void unsetEntityContext() { - } - - // This method is useful to test the overloaded methods in bean - public String getData() { - return "UserEC.getData"; - } - - // This method is useful to test the bug #301113 - public int methBug301113(int p) { - return p; - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/connectorCASLR.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/connectorCASLR.java deleted file mode 100644 index 38fa08e28419c7dd35c1dbe7865c15160ec89113..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/connectorCASLR.java +++ /dev/null @@ -1,292 +0,0 @@ -// connectorCASLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.j2eeca; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; -import javax.resource.cci.ConnectionMetaData; -import javax.resource.spi.ConnectionEvent; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import fictional.resourceadapter.CommonClient; -import fictional.resourceadapter.ConnectionImpl; -import fictional.resourceadapter.JtestInteraction; -import fictional.resourceadapter.JtestResourceAdapter; - -/** - * - - */ -public class connectorCASLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - private CommonClient cccf = null; //Common Client Connection Factory - private JtestResourceAdapter mcf = null; //Managed Connection Factory - private CommonClient csp = null; //ConnectionSpec - private ConnectionImpl conn = null; - InitialContext ic=null; - JtestInteraction i = null; - ConnectionMetaData cMetaData = null; - String cName = "connectorCASLR"; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas.jtests.j2eeca"); - } - logger.log(BasicLevel.DEBUG, cName+".setSessionContext"); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, cName+".ejbRemove"); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, cName+".ejbCreate"); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, cName+".ejbPassivate"); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, cName+".ejbActivate"); - } - - // ------------------------------------------------------------------ - // connectorCA implementation - // ------------------------------------------------------------------ - /** - * method1 - */ - public void method1(String rar_jndi_name, String testName) - throws Exception - { - logger.log(BasicLevel.DEBUG, "============================ "+testName); - try { - ic = new InitialContext(); - } catch (Exception e1) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: InitialContext failed"); - throw e1; - } - try { - cccf = (CommonClient)ic.lookup(rar_jndi_name); - logger.log(BasicLevel.DEBUG, cName+".method1 : found "+rar_jndi_name); - } catch (Exception e2) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: lookup failed for "+rar_jndi_name); - throw e2; - } - - try { - csp = new CommonClient(); // get a new ConnectionSpec - logger.log(BasicLevel.DEBUG, cName - +".method1 : ConnectionSpec o.k."); - - } catch (Exception e3) { - logger.log(BasicLevel.DEBUG, cName+".method1 : new connection spec failed"); - throw e3; - } - try { - conn = (ConnectionImpl)cccf.getConnection(); - logger.log(BasicLevel.DEBUG, cName+".method1 : getConnection conn="+conn); - if (conn==null) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: getConnection returned null connection."); - throw new Exception(""); - } - } catch (Exception e4) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: getConnection failed " - +e4.toString()); - throw e4; - } - try { - i = (JtestInteraction)conn.createInteraction(); - } catch (Exception e5) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: create interaction failed"); - throw e5; - } - try { - cMetaData = (ConnectionMetaData)conn.getMetaData(); - } catch (Exception e6) { - logger.log(BasicLevel.DEBUG, cName+".method1 : get ConnectionMetaData failed"); - throw e6; - } - - } - - /** - * closeUp - */ - public void closeUp(int w) { - try { - if (w>0) { - // The CONNECTION_ERROR_OCCURRED indicates that the associated - // ManagedConnection instance is now invalid and unusable. - conn.close(ConnectionEvent.CONNECTION_ERROR_OCCURRED); - logger.log(BasicLevel.DEBUG, cName+".closeUp : closed physical connection"); - } else { - // The CONNECTION_CLOSED indicates that connection handle - // is closed, but physical connection still exists - conn.close(); - logger.log(BasicLevel.DEBUG, cName+".closeUp : closed connection"); - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".closeUp error: close handle/physical connection failed"); - } - } - /** - * JUnit tests - */ - public boolean isConnectionSpec() { - if (csp==null) return false; - else return true; - } - public boolean isConnection() { - if (conn==null) return false; - else return true; - } - public boolean isInteraction() { - if (i==null) return false; - else return true; - } - public String getConnectionProduct() - throws Exception - { - String s; - try { - s = cMetaData.getEISProductName(); - logger.log(BasicLevel.DEBUG, cName+".getConnectionProduct : ConnectionMetaData.product="+s); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".getConnectionProduct error: ConnectionMetaData.getEISProductName() failed"); - throw e; - } - return s; - } - /** - * The application server calls setter methods on the ManagedConnectionFactory instance - * to set various configuration properties on this instance. These properties provide - * information required by the ManagedConnectionFactory instance to create physical - * connections to the underlying EIS. The application server uses an existing property set - * (configured during the deployment of a resource adapter) to set the required properties on - * the ManagedConnectionFactory instance. - * - */ - public String getServerName() - throws Exception - { - logger.log(BasicLevel.DEBUG, cName+".getServerName"); - mcf = (JtestResourceAdapter) cccf.getMcf(); // ManagedConnectionFactory - String cp1 = "null"; - if (mcf==null) return cp1; - try { - cp1 = mcf.getServerName(); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".getConfigurationProperty error: failed"); - throw e; - } - return cp1; - } - public String getProtocolProperty() - throws Exception - { - logger.log(BasicLevel.DEBUG, cName+".getProtocolProperty"); - mcf = (JtestResourceAdapter) cccf.getMcf(); // ManagedConnectionFactory - String p = "null"; - if (mcf==null) return p; - try { - p = mcf.getProtocol(); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".getProtocolProperty error: failed"); - throw e; - } - return p; - } - /** - * After the newly created ManagedConnectionFactory instance has been configured with - * its property set, the application server creates a new ConnectionManager instance. - * true returned if ConnectionManager is valid - */ - public boolean getCMInstance() - { - mcf = (JtestResourceAdapter) cccf.getMcf(); // ManagedConnectionFactory - if (mcf.getCM()==null) { // ConnectionManager not null - logger.log(BasicLevel.DEBUG, cName+".getCMInstance error: ConnectionManager is null"); - return false; - } - else { - logger.log(BasicLevel.DEBUG, cName+".getCMInstance ConnectionManager is o.k."); - return true; - } - } - public int getMCF_Pwriter() - { - int here=2; - mcf = (JtestResourceAdapter) cccf.getMcf(); // ManagedConnectionFactory - try { - if (mcf.getLogWriter()==null) { // PrintWriter not null - logger.log(BasicLevel.DEBUG, cName+".getMCF_Pwriter No PrintWriter registered"); - here=0; - } - else { - logger.log(BasicLevel.DEBUG, cName+".getMCF_Pwriter PrintWriter is o.k."); - here=1; - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+ - ".getMCF_Pwriter error: "+e.toString()); - } - return here; - } - public int getMC_Pwriter() - { - int here=2; - ConnectionImpl conni = (ConnectionImpl)conn; - try { - JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - if (mc.getLogWriter()==null) { // PrintWriter not null - logger.log(BasicLevel.DEBUG, cName+ - ".getMC_Pwriter No PrintWriter registered in ManagedConnection"); - here=0; - } - else { - logger.log(BasicLevel.DEBUG, cName+ - ".getMC_Pwriter PrintWriter in ManagedConnection is o.k."); - here=1; - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+ - ".getMC_Pwriter error: "+e.toString()); - } - return here; - } - public void setMatchNull(boolean b) { - mcf = (JtestResourceAdapter) cccf.getMcf(); // ManagedConnectionFactory - mcf.setMatchNull(b); - } - public int cntListeners() - { - int i = 0; - ConnectionImpl conni = (ConnectionImpl)conn; - try { - JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - i = mc.cntListeners(); - logger.log(BasicLevel.DEBUG, cName+".cntListeners cnt="+i); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".cntListeners error: failed to count Listeners"); - } - return i; - } -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/runtimeCASLR.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/runtimeCASLR.java deleted file mode 100644 index 77675cc31b089660fe68e8445b8b52844c09e452..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/runtimeCASLR.java +++ /dev/null @@ -1,237 +0,0 @@ -// runtimeCASLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.j2eeca; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; -import javax.resource.spi.ConnectionEvent; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import fictional.resourceadapter.CommonClient; -import fictional.resourceadapter.ConnectionImpl; -import fictional.resourceadapter.JtestResourceAdapter; - - -/* - */ -public class runtimeCASLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - private JtestResourceAdapter mcf = null; //Managed Connection Factory - private CommonClient cccf = null; //Common Client Connection Factory - private ConnectionImpl conn = null; - private CommonClient csp = null; //ConnectionSpec - InitialContext ic=null; - private String res_auth = ""; - String cName = "runtimeCASLR"; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas.jtests.j2eeca"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // runtime implementation - // ------------------------------------------------------------------ - public void setResAuth(String ra) { - res_auth=ra; // set to Application or Container - } - - /** - * method1 - */ - public void method1(String rar_jndi_name, String testName) - throws Exception - { - logger.log(BasicLevel.DEBUG, "============================ "+testName); - logger.log(BasicLevel.DEBUG, cName+".method1 : lookup "+rar_jndi_name); - try { - ic = new InitialContext(); - } catch (Exception e1) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: InitialContext failed"); - throw e1; - } - try { - cccf = (CommonClient)ic.lookup(rar_jndi_name); - logger.log(BasicLevel.DEBUG, cName+".method1 : found "+rar_jndi_name); - } catch (Exception e2) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: lookup failed for "+rar_jndi_name); - throw e2; - } - - // - // Component-managed sign-on when file "runtime.xml" contains line below - // - // Application - // - try { - csp = new CommonClient(); // get a new ConnectionSpec - csp.setUserName("Fictional_User_Name"); - csp.setPassword("__Jtest_Pass_word__"); - logger.log(BasicLevel.DEBUG, cName - +".method1 : ConnectionSpec + Fictional_User_Name,__Jtest_Pass_word__"); - } catch (Exception e3) { - logger.log(BasicLevel.DEBUG, cName+".method1 : new connection spec failed"); - throw e3; - } - try { - conn = (ConnectionImpl)cccf.getConnection(); - if (conn==null) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: getConnection returned null connection."); - throw new Exception(""); - } - } catch (Exception e4) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: getConnection failed " - +e4.toString()); - throw e4; - } - } - - /** - * closeUp - */ - public void closeUp(int w) { - try { - if (w>0) { - // The CONNECTION_ERROR_OCCURRED indicates that the associated - // ManagedConnection instance is now invalid and unusable. - conn.close(ConnectionEvent.CONNECTION_ERROR_OCCURRED); - logger.log(BasicLevel.DEBUG, cName+".closeUp : closed physical connection"); - } else { - // The CONNECTION_CLOSED indicates that connection handle - // is closed, but physical connection still exists - conn.close(); - logger.log(BasicLevel.DEBUG, cName+".closeUp : closed connection"); - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".closeUp error: close handle/physical connection failed"); - } - } - /** - * JUnit tests - */ - public int getMCF_Pwriter() - { - int here=2; - JtestResourceAdapter mcf = (JtestResourceAdapter) cccf.getMcf(); // ManagedConnectionFactory - try { - if (mcf.getLogWriter()==null) { // PrintWriter not null - logger.log(BasicLevel.DEBUG, cName+".getMCF_Pwriter No PrintWriter registered"); - here=0; - } - else { - logger.log(BasicLevel.DEBUG, cName+".getMCF_Pwriter PrintWriter is o.k."); - here=1; - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+ - ".getMCF_Pwriter error: "+e.toString()); - } - return here; - } - public int getMC_Pwriter() - { - int here=2; - ConnectionImpl conni = (ConnectionImpl)conn; - try { - JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - if (mc.getLogWriter()==null) { // PrintWriter not null - logger.log(BasicLevel.DEBUG, cName+ - ".getMC_Pwriter No PrintWriter registered in ManagedConnection"); - here=0; - } - else { - logger.log(BasicLevel.DEBUG, cName+ - ".getMC_Pwriter PrintWriter in ManagedConnection is o.k."); - here=1; - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+ - ".getMC_Pwriter error: "+e.toString()); - } - return here; - } - public String getResAuth() { - mcf = (JtestResourceAdapter) cccf.getMcf(); // get ManagedConnectionFactory - try { - //JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - String ra = mcf.getRes_Auth(); // get real "Application" or "Container" - logger.log(BasicLevel.DEBUG, cName+".getResAuth " - +""+ra+""); - return ra; - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName - +".getResAuth error: failed to find " - +"in ManagedConnectionFactory"); - return ""; - } - } - public String getSecurityPassword() { - mcf = (JtestResourceAdapter) cccf.getMcf(); // get ManagedConnectionFactory - //ConnectionImpl conni = (ConnectionImpl)conn; - try { - //JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - String pw = mcf.getPassword(); - logger.log(BasicLevel.DEBUG, cName+".getSecurityPassword (" - +mcf.getRes_Auth()+")password="+pw); - return pw; - } catch (Exception e) { - String pw = mcf.getPassword(); // find default - logger.log(BasicLevel.DEBUG, cName - +".getSecurityPassword error: failed to find ManagedConnectionFactory " - +"instance containing password. Using pw="+pw); - return pw; - } - } - public String getSecurityUserName() { - mcf = (JtestResourceAdapter) cccf.getMcf(); // get ManagedConnectionFactory - //ConnectionImpl conni = (ConnectionImpl)conn; // get ConnectionImpl - try { - //JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - String u = mcf.getUserName(); - logger.log(BasicLevel.DEBUG, cName+".getSecurityUserName (" - +mcf.getRes_Auth()+")userName="+u); - return u; - } catch (Exception e) { - String u = mcf.getUserName(); // find default - logger.log(BasicLevel.DEBUG, cName - +".getSecurityUserName error: failed to find ManagedConnectionFactory " - +"instance containing userName. Using="+u); - return u; - } - } -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/securedCASLR.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/securedCASLR.java deleted file mode 100644 index 4b6e65582a397b5a05d3db87bafb84498b8aeba3..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/securedCASLR.java +++ /dev/null @@ -1,189 +0,0 @@ -// securedCASLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.j2eeca; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; -import javax.resource.spi.ConnectionEvent; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import fictional.resourceadapter.CommonClient; -import fictional.resourceadapter.ConnectionImpl; -import fictional.resourceadapter.JtestResourceAdapter; - - -/** - * - */ -public class securedCASLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - private JtestResourceAdapter mcf = null; //Managed Connection Factory - private CommonClient cccf = null; //Common Client Connection Factory - private ConnectionImpl conn = null; - InitialContext ic=null; - private String res_auth = ""; - String cName = "securedCASLR"; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas.jtests.j2eeca"); - } - logger.log(BasicLevel.DEBUG, cName+".setSessionContext"); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * closeUp - */ - public void closeUp(int w) { - try { - if (w>0) { - // The CONNECTION_ERROR_OCCURRED indicates that the associated - // ManagedConnection instance is now invalid and unusable. - conn.close(ConnectionEvent.CONNECTION_ERROR_OCCURRED); - logger.log(BasicLevel.DEBUG, cName+".closeUp : closed physical connection"); - } else { - // The CONNECTION_CLOSED indicates that connection handle - // is closed, but physical connection still exists - conn.close(); - logger.log(BasicLevel.DEBUG, cName+".closeUp : closed connection"); - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".closeUp error: close handle/physical connection failed"); - } - } - public void setResAuth(String ra) { - res_auth=ra; // set to Application or Container - } - public void setMatchNull(boolean b) { - mcf = (JtestResourceAdapter) cccf.getMcf(); // ManagedConnectionFactory - mcf.setMatchNull(b); - } - // ------------------------------------------------------------------ - // secured implementation - // ------------------------------------------------------------------ - - /** - * method1 - */ - public void method1(String rar_jndi_name, String testName) - throws Exception - { - logger.log(BasicLevel.DEBUG, "============================ "+testName); - try { - ic = new InitialContext(); - } catch (Exception e1) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: InitialContext failed"); - throw e1; - } - try { - cccf = (CommonClient)ic.lookup(rar_jndi_name); - logger.log(BasicLevel.DEBUG, cName+".method1 : found "+rar_jndi_name); - } catch (Exception e2) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: lookup failed for "+rar_jndi_name); - throw e2; - } - - // - // Container-managed sign-on when file "secured.xml" contains line below - // - // Container - // - try { - conn = (ConnectionImpl)cccf.getConnection(); - logger.log(BasicLevel.DEBUG, cName+".method1 : getConnection() 'Container' conn="+conn); - - if (conn==null) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: getConnection returned null connection."); - throw new Exception(""); - } - } catch (Exception e4) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: getConnection failed " - +e4.toString()); - throw e4; - } - } - - public String getResAuth() { - mcf = (JtestResourceAdapter) cccf.getMcf(); // get ManagedConnectionFactory - try { - //JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - String ra = mcf.getRes_Auth(); // get real "Application" or "Container" - logger.log(BasicLevel.DEBUG, cName+".getResAuth " - +""+ra+""); - return ra; - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName - +".getResAuth error: failed to find " - +"in ManagedConnectionFactory"); - return ""; - } - } - public String getSecurityPassword() { - mcf = (JtestResourceAdapter) cccf.getMcf(); // get ManagedConnectionFactory - //ConnectionImpl conni = (ConnectionImpl)conn; - try { - //JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - String pw = mcf.getPassword(); - logger.log(BasicLevel.DEBUG, cName+".getSecurityPassword (" - +mcf.getRes_Auth()+")password="+pw); - return pw; - } catch (Exception e) { - String pw = mcf.getPassword(); // find default - logger.log(BasicLevel.DEBUG, cName - +".getSecurityPassword error: failed to find ManagedConnectionFactory " - +"instance containing password. Using pw="+pw); - return pw; - } - } - public String getSecurityUserName() { - mcf = (JtestResourceAdapter) cccf.getMcf(); // get ManagedConnectionFactory - //ConnectionImpl conni = (ConnectionImpl)conn; // get ConnectionImpl - try { - //JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - String u = mcf.getUserName(); - logger.log(BasicLevel.DEBUG, cName+".getSecurityUserName (" - +mcf.getRes_Auth()+")userName="+u); - return u; - } catch (Exception e) { - String u = mcf.getUserName(); // find default - logger.log(BasicLevel.DEBUG, cName - +".getSecurityUserName error: failed to find ManagedConnectionFactory " - +"instance containing userName. Using="+u); - return u; - } - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/transactedCASLR.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/transactedCASLR.java deleted file mode 100644 index 0a04b917b0188d46b93e874c5593ab4a8f0fc943..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/j2eeca/transactedCASLR.java +++ /dev/null @@ -1,242 +0,0 @@ -// transactedCASLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.j2eeca; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; -import javax.resource.cci.LocalTransaction; -import javax.resource.spi.ConnectionEvent; -import javax.transaction.xa.Xid; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import fictional.resourceadapter.CommonClient; -import fictional.resourceadapter.ConnectionImpl; -import fictional.resourceadapter.JtestResourceAdapter; -import fictional.resourceadapter.LocalTransactionImpl; -import fictional.resourceadapter.XAResourceImpl; - - -/** - * - */ -public class transactedCASLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - private JtestResourceAdapter mcf = null; //Managed Connection Factory - private CommonClient csp = null; //ConnectionSpec - private CommonClient cccf = null; //Common Client Connection Factory - private ConnectionImpl conn = null; - InitialContext ic=null; - String cName = "transactedCASLR"; - final public int NoTransaction = 0; - final public int LoTransaction = 1; - final public int XATransaction = 2; - final public int CLOSE_HANDLE = 0; - final public int CLOSE_PHYSICAL = 1; - public int TransactionType = 0; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas.jtests.j2eeca"); - } - logger.log(BasicLevel.DEBUG, cName+".setSessionContext"); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - /** - * closeUp - */ - public void closeUp(int closeType) { - logger.log(BasicLevel.DEBUG, cName+ - ".closeUp (enter) closeType="+closeType); - try { - if (closeType==CLOSE_PHYSICAL) { - // The CONNECTION_ERROR_OCCURRED indicates that the associated - // ManagedConnection instance is now invalid and unusable. - conn.close(ConnectionEvent.CONNECTION_ERROR_OCCURRED); - logger.log(BasicLevel.DEBUG, cName+ - ".closeUp (exit) : closed physical connection closeType="+closeType+ - " ConnectionEvent.CONNECTION_ERROR_OCCURRED="+ - ConnectionEvent.CONNECTION_ERROR_OCCURRED); - } else { - // The CONNECTION_CLOSED indicates that connection handle - // is closed, but physical connection still exists - conn.close(); - logger.log(BasicLevel.DEBUG, cName+ - ".closeUp (exit) : closed connection closeType="+closeType); - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".closeUp (exit) error: close "+ - "handle/physical connection failed closeType="+closeType); - } - } - - // ------------------------------------------------------------------ - // transacted implementation - // ------------------------------------------------------------------ - - /** - * method1 - */ - public void method1(String rar_jndi_name, String testName) - throws Exception - { - logger.log(BasicLevel.DEBUG, "============================ "+testName); - - if ("FictionalXATransaction".equals(rar_jndi_name)) - TransactionType = XATransaction; - else if ("FictionalLoTransaction".equals(rar_jndi_name)) - TransactionType = LoTransaction; - else - TransactionType = NoTransaction; - - try { - ic = new InitialContext(); - } catch (Exception e1) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: InitialContext failed"); - throw e1; - } - try { - cccf = (CommonClient)ic.lookup(rar_jndi_name); - logger.log(BasicLevel.DEBUG, cName+".method1 : found "+rar_jndi_name); - } catch (Exception e2) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: lookup failed for "+rar_jndi_name); - throw e2; - } - - try { - csp = new CommonClient(); // get a new ConnectionSpec - - } catch (Exception e3) { - logger.log(BasicLevel.DEBUG, cName+".method1 : new connection spec failed"); - throw e3; - } - try { - conn = (ConnectionImpl)cccf.getConnection(); - logger.log(BasicLevel.DEBUG, cName+".method1 : getConnection conn="+conn); - if (conn==null) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: getConnection returned null connection."); - throw new Exception(""); - } - } catch (Exception e4) { - logger.log(BasicLevel.DEBUG, cName+".method1 error: getConnection failed " - +e4.toString()); - throw e4; - } - } - public String getXid() { - ConnectionImpl conni = (ConnectionImpl)conn; - try { - JtestResourceAdapter mc = (JtestResourceAdapter)conni.getMC(); //get ManagedConnection - XAResourceImpl xar = mc.getCurrentXar(); - if (xar==null) { - logger.log(BasicLevel.DEBUG, cName+".getXid error: failed xar==null"); - return "FAIL"; - } else { - Xid xid = xar.getCurrentXid(); - logger.log(BasicLevel.DEBUG, cName+".getXid "); - return "OK"; - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".getXid error: failed"); - return "FAIL"; - } - } - /** - * After the newly created ManagedConnectionFactory instance has been configured with - * its property set, the application server creates a new ConnectionManager instance. - * true returned if ConnectionManager is valid - */ - public boolean getCMInstance() - { - mcf = (JtestResourceAdapter) cccf.getMcf(); // ManagedConnectionFactory - if (mcf.getCM()==null) { // ConnectionManager not null - logger.log(BasicLevel.DEBUG, cName+".getCMInstance error: ConnectionManager is null"); - return false; - } - else { - logger.log(BasicLevel.DEBUG, cName+".getCMInstance ConnectionManager is o.k."); - return true; - } - } - LocalTransactionImpl lt=null; - public void beginLoTransaction() { - logger.log(BasicLevel.DEBUG, cName+".beginLoTransaction (enter)"); - try { - LocalTransaction l = conn.getLocalTransaction(); - lt = (LocalTransactionImpl) l; - lt.begin(); - int s=lt.getTxState(); - logger.log(BasicLevel.DEBUG, cName+".beginLoTransaction (exit) State="+s); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".beginLoTransaction (exit) error:" - +" "+e.toString()); - - } - } - public void commitLoTransaction() throws Exception - { - logger.log(BasicLevel.DEBUG, cName+".commitLoTransaction (enter)"); - try { - if (lt==null) { - Exception e = new Exception("Undefined LocalTransaction"); - throw e; - } - lt.commit(); - int s=lt.getTxState(); - logger.log(BasicLevel.DEBUG, cName+".commitLoTransaction (exit) ="+s); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".commitLoTransaction (exit) error: State error." - +" "+e.getMessage()); - throw e; - } - lt=null; - } - public void rollbackLoTransaction() { - logger.log(BasicLevel.DEBUG, cName+".rollbackLoTransaction (enter)"); - try { - if (lt==null) { - Exception e = new Exception("Undefined LocalTransaction"); - throw e; - } - lt.rollback(); - int s=lt.getTxState(); - logger.log(BasicLevel.DEBUG, cName+".rollbackLoTransaction (exit) State="+s); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".rollbackLoTransaction (exit) error: State error" - +" "+e.getMessage()); - - } - lt=null; - } -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jca15/Utility.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jca15/Utility.java deleted file mode 100644 index e21b33007606a30865198d3c4690f14e95c35e0a..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jca15/Utility.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Created on January 20, 2004 - * - * Utility.java is part of a JUnit test suit to test - * J2EE Connector 1.5 as implemented by JOnAS. - */ - -package org.objectweb.jonas.jtests.beans.jca15; - -import java.util.*; -import java.text.SimpleDateFormat; - -import javax.resource.ResourceException; -import javax.resource.spi.*; -import javax.resource.spi.SecurityException; -import javax.resource.spi.security.*; -import javax.security.auth.Subject; -import javax.transaction.xa.*; -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - - -/**

    This class contains the support methods for the - * JOnAS JCA1.5 test suite - * -**/ -public class Utility -{ - - private static Logger logger = null; - public static final String USER_TRANSACTION = "javax.transaction.UserTransaction"; - - /** - * Write a JOnAS log record - * - * @param msg display this message in log - * - */ - public static synchronized void log(String msg) { - if (logger == null) { - logger = Log.getLogger("ersatz.resourceadapter"); - } - logger.log(BasicLevel.DEBUG, msg); - } - - -} \ No newline at end of file diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbc/Manager.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbc/Manager.java deleted file mode 100644 index 90905ff693cf2a0face091597e5e0221408a55e1..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbc/Manager.java +++ /dev/null @@ -1,26 +0,0 @@ -// Manager.java - -package org.objectweb.jonas.jtests.beans.jdbc; - -import java.rmi.RemoteException; -import javax.ejb.EJBObject; - -/** - * Manager remote interface - */ -public interface Manager extends EJBObject { - public int openConnection() throws RemoteException; - public boolean closeConnection(int nb) throws RemoteException; - public boolean openCloseConnection() throws RemoteException; - public boolean accessCloseConnection() throws RemoteException; - - /** - * Store the value for the pk entry - */ - public void storeValue(String pk, int val) throws RemoteException; - - /** - * return the value stored for this pk entry - */ - public int getValue(String pk) throws RemoteException; -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbc/ManagerSY.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbc/ManagerSY.java deleted file mode 100644 index 0ad2ab115c547e99e931a01a4a368b4b5b088b30..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbc/ManagerSY.java +++ /dev/null @@ -1,328 +0,0 @@ -package org.objectweb.jonas.jtests.beans.jdbc; - -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.Statement; -import java.sql.SQLException; -import java.sql.ResultSet; -import java.util.Hashtable; -import java.util.Iterator; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.ejb.SessionSynchronization; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import javax.sql.DataSource; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * Stateful Session Bean that manages directly jdbc connections - */ -public class ManagerSY implements SessionBean, SessionSynchronization { - - static private Logger logger = null; - SessionContext ejbContext; - String tableName = "jdbcSF"; - - // ------------------------------------------------------------------ - // The state of this Stateful Session Bean - // ------------------------------------------------------------------ - int conb = 100; - InitialContext ictx = null; - DataSource ds = null; - - /** - * List of Connections - */ - Hashtable clist = new Hashtable(); - - // ------------------------------------------------------------------ - // SessionSynchronization implementation - // ------------------------------------------------------------------ - - public void afterBegin() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void beforeCompletion() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void afterCompletion(boolean committed) { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Make here all initialisations needed in this stateful session bean - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - ds = getDataSource("java:comp/env/jdbc/mydb"); - // Get a Connection now - try { - Connection c = ds.getConnection(); - clist.put(new Integer(0), c); - } catch (SQLException e) { - throw new EJBException("Cannot get first Connection:"+e); - } - } - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - // Close all opened connections - for (Iterator it = clist.values().iterator(); it.hasNext();) { - Connection c = (Connection) it.next(); - try { - c.close(); - } catch (SQLException e) { - logger.log(BasicLevel.ERROR, "Cannot close Connection:" + e); - } - } - } - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Manager implementation - // ------------------------------------------------------------------ - - /** - * Access a closed connection - * @return true if all was OK - */ - public boolean accessCloseConnection() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - Connection c; - try { - c = ds.getConnection(); - } catch (SQLException e) { - logger.log(BasicLevel.ERROR, "Cannot get a Connection:"+e); - return false; - } - try { - c.close(); - } catch (SQLException e) { - logger.log(BasicLevel.ERROR, "Cannot close Connection:"+e); - return false; - } - PreparedStatement stmt = null; - try { - stmt = c.prepareStatement("update "+tableName+" set c_value=? where c_pk=?"); - stmt.setString(2, "pk3"); - stmt.setInt(1, 122); - stmt.executeUpdate(); - } catch (SQLException e) { - return true; - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "SQLException should be raised, not :" + e); - e.printStackTrace(); - return false; - } finally { - try { - if (stmt != null) { - stmt.close(); - } - } catch (SQLException ignore) { - } - } - logger.log(BasicLevel.ERROR, "Should not access a close Connection:"); - return false; - } - - /** - * open and close a Connection - * @return true if all was OK - * @throws RemoteException fail on SQL command. - */ - public boolean openCloseConnection() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - Connection c; - try { - c = ds.getConnection(); - } catch (SQLException e) { - logger.log(BasicLevel.ERROR, "Cannot get a Connection:"+e); - return false; - } - try { - c.close(); - } catch (SQLException e) { - logger.log(BasicLevel.ERROR, "Cannot close Connection:"+e); - return false; - } - return true; - } - - /** - * return the number associated to the connection opened, - * or 0 if it failed. - * @return connection ident (int) - * @throws RemoteException fail on SQL command. - */ - public int openConnection() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - Connection c; - try { - c = ds.getConnection(); - } catch (SQLException e) { - logger.log(BasicLevel.ERROR, "Cannot get a Connection:"+e); - return 0; - } - // choose a connection number - conb++; - clist.put(new Integer(conb), c); - logger.log(BasicLevel.DEBUG, "connection number="+conb); - return conb; - } - - /** - * Close a Connection previously opened. - * @param nb ident of the Connection - * @return true if close Connection worked - * @throws RemoteException fail on SQL command. - */ - public boolean closeConnection(int nb) throws RemoteException { - logger.log(BasicLevel.DEBUG, "connection number="+conb); - Connection c = (Connection) clist.remove(new Integer(nb)); - if (c == null) { - logger.log(BasicLevel.ERROR, "Unknown Connection"); - return false; - } - try { - c.close(); - } catch (SQLException e) { - logger.log(BasicLevel.ERROR, "Cannot close Connection:"+e); - return false; - } - boolean isclosed = false; - try { - isclosed = c.isClosed(); - } catch (SQLException e) { - logger.log(BasicLevel.ERROR, "Cannot check if closed:"+e); - return false; - } - return isclosed; - } - - /** - * Store the value for the pk entry - * @param pk primary key - * @param val value associated to this pk. - * @throws RemoteException fail on SQL command. - */ - public void storeValue(String pk, int val) throws RemoteException { - Connection conn; - try { - conn = ds.getConnection(); - } catch(Exception e) { - throw new RemoteException("Cannot get Connection"); - } - PreparedStatement stmt = null; - try { - stmt = conn.prepareStatement("update "+tableName+" set c_value=? where c_pk=?"); - stmt.setString(2, pk); - stmt.setInt(1, val); - stmt.executeUpdate(); - } catch (SQLException e) { - throw new RemoteException("Cannot set value to pk: " + pk); - } finally { - try { - if (stmt != null) { - stmt.close(); - } - conn.close(); - } catch (SQLException ignore) { - } - } - } - - /** - * return the value stored for this pk entry - * @param pk primary key - * @return value associated to this pk. - * @throws RemoteException fail on SQL command. - */ - public int getValue(String pk) throws RemoteException { - int value = 0; - Connection conn; - try { - conn = ds.getConnection(); - } catch(Exception e) { - throw new RemoteException("Cannot get Connection"); - } - PreparedStatement stmt = null; - try { - stmt = conn.prepareStatement("select c_value from "+tableName+" where c_pk=?"); - stmt.setString(1, pk); - ResultSet rs = stmt.executeQuery(); - if (! rs.next()) { - throw new RemoteException("No such value"); - } - value = rs.getInt(1); - } catch (SQLException e) { - throw new RemoteException("Cannot get value from pk: " + pk); - } finally { - try { - if (stmt != null) { - stmt.close(); - } - conn.close(); - } catch (SQLException ignore) { - } - } - return value; - } - - // ------------------------------------------------------------------ - // private methods - // ------------------------------------------------------------------ - - /* - * get the DataSource given its name in JNDI - */ - private DataSource getDataSource(String db) { - - // lookup the DataSource in the initial context - DataSource ds = null; - try { - // get initial context - if (ictx == null) { - ictx = new InitialContext(); - } - ds = (DataSource) PortableRemoteObject.narrow(ictx.lookup(db), DataSource.class); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "Cannot lookup datasource "+db+": "+e); - throw new EJBException("Cannot access DataSource"); - } - - // return it - return ds; - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbc/jdbc.xml b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbc/jdbc.xml deleted file mode 100644 index 81bec308b28d52b3de8a11d0f4c495f0013fb000..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbc/jdbc.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - jdbc - - - - Describe here the session bean Manager - jdbc/ManagerSY - ManagerSY - org.objectweb.jonas.jtests.beans.jdbc.ManagerHome - org.objectweb.jonas.jtests.beans.jdbc.Manager - org.objectweb.jonas.jtests.beans.jdbc.ManagerSY - Stateful - Container - - name1 - java.lang.String - value1 - - - jdbc/mydb - javax.sql.DataSource - Application - - - - - - - - - ManagerSY - * - - Required - - - - ManagerSY - getValue - - - ManagerSY - storeValue - - Supports - - - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbcra/JdbcRA1EBRBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbcra/JdbcRA1EBRBean.java deleted file mode 100644 index 038edfcf95618f9da46aa2cb13176660b9f3144b..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbcra/JdbcRA1EBRBean.java +++ /dev/null @@ -1,508 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.jdbcra; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Enumeration; -import java.util.Vector; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.ObjectNotFoundException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.sql.DataSource; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * - */ -public class JdbcRA1EBRBean implements EntityBean { - - private DataSource dataSource1 = null; - - static private Logger logger = null; - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // State of the bean. - // - // ------------------------------------------------------------------ - - public Integer accno; - public String customer; - public double balance; - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - - // Access database to remove bean in table - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // delete Object in DB - - stmt = conn.prepareStatement("delete from jdbc_xa1 where xa_accno=?"); - Integer pk = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(1, pk.intValue()); - stmt.executeUpdate(); - - } catch (SQLException e) { - throw new RemoveException ("Failed to delete bean from database " +e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - - // Access database to load bean state from table - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // find account in DB - - stmt = conn.prepareStatement("select xa_customer,xa_balance from jdbc_xa1 where xa_accno=?"); - Integer pk = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(1, pk.intValue()); - ResultSet rs = stmt.executeQuery(); - - if (rs.next() == false) { - throw new EJBException("Failed to load bean from database"); - } - - // update object state - - accno = pk; - customer = rs.getString("xa_customer"); - balance = rs.getDouble("xa_balance"); - - } catch (SQLException e) { - throw new EJBException("Failed to load bean from database " +e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - - // Access database to store bean state in table - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // store Object state in DB - - stmt = conn.prepareStatement("update jdbc_xa1 set xa_customer=?,xa_balance=? where xa_accno=?"); - stmt.setString(1, customer); - stmt.setDouble(2, balance); - Integer pk = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(3, pk.intValue()); - stmt.executeUpdate(); - - } catch (SQLException e) { - throw new EJBException("Failed to store bean to database " +e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPostCreate(int val_accno, String val_customer, double val_balance){ - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPostCreate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public java.lang.Integer ejbCreate(int val_accno, String val_customer, double val_balance) - throws CreateException{ - - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - // Init object state - - accno = new Integer(val_accno); - customer = val_customer; - balance = val_balance; - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // create object in DB - - stmt = conn.prepareStatement("insert into jdbc_xa1 (xa_accno, xa_customer, xa_balance) values (?, ?, ?)"); - stmt.setInt(1, accno.intValue()); - stmt.setString(2, customer); - stmt.setDouble(3, balance); - stmt.executeUpdate(); - - } catch (SQLException e) { - throw new CreateException("Failed to create bean in database: "+e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - // Return the primary key - return accno; - - } - - public java.lang.Integer ejbFindByPrimaryKey(Integer pk) - throws ObjectNotFoundException, FinderException { - logger.log(BasicLevel.DEBUG, ""); - - // Access database to find entry in table - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // lookup for this primary key in DB - stmt = conn.prepareStatement("select xa_accno from jdbc_xa1 where xa_accno=?"); - stmt.setInt(1, pk.intValue()); - ResultSet rs = stmt.executeQuery(); - - if (rs.next() == false) { - throw new javax.ejb.ObjectNotFoundException(); - } - - } catch (SQLException e) { - throw new javax.ejb.FinderException("Failed to executeQuery " +e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - return pk; - } - - - /** - * Find Account by its account number - * - * @return pk The primary key - * - * @exception FinderException - Failed to execute the query. - * @exception ObjectNotFoundException - Object not found for this account number - */ - - public Integer ejbFindByNumber(int accno) - throws ObjectNotFoundException, FinderException { - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // lookup for this primary key in DB - - stmt = conn.prepareStatement("select xa_accno from jdbc_xa1 where xa_accno=?"); - stmt.setInt(1, accno); - ResultSet rs = stmt.executeQuery(); - - if (rs.next() == false) { - throw new javax.ejb.ObjectNotFoundException(); - } - - } catch (SQLException e) { - throw new javax.ejb.FinderException("Failed to executeQuery " +e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - // return a primary key for this account - return new Integer(accno); - } - - /** - * Creates an enumeration of primary keys for all accounts - * - * @return pkv The primary keys - * - * @exception FinderException - Failed to execute the query. - */ - - public Enumeration ejbFindAllAccounts() throws FinderException { - - Connection conn = null; - PreparedStatement stmt = null; - - Vector pkv = new Vector(); - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // Lookup for all accounts in DB - - stmt = conn.prepareStatement("select xa_accno from jdbc_xa1"); - ResultSet rs = stmt.executeQuery(); - - // Build the vector of primary keys - - while (rs.next()) { - Integer pk = new Integer(rs.getInt("xa_accno")); - pkv.addElement((Object)pk); - }; - - } catch (SQLException e) { - e.printStackTrace(); - throw new javax.ejb.FinderException("Failed to executeQuery " +e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - // return primary keys - return pkv.elements(); - } - - public java.lang.Integer ejbCreate() - throws CreateException{ - - logger.log(BasicLevel.DEBUG, ""); - - // Init object state - Integer tempint = new Integer(0); - Connection conn = null; - Statement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // create object in DB - - stmt = conn.createStatement(); - stmt.addBatch("insert into jdbc_xa1 (xa_accno, xa_customer, xa_balance) values (201, 'Albert Smith', 500)"); - stmt.addBatch("insert into jdbc_xa1 (xa_accno, xa_customer, xa_balance) values (202, 'Bob Smith', 500)"); - stmt.addBatch("insert into jdbc_xa1 (xa_accno, xa_customer, xa_balance) values (203, 'Carl Smith', 500)"); - stmt.addBatch("insert into jdbc_xa1 (xa_accno, xa_customer, xa_balance) values (204, 'David Smith', 500)"); - stmt.addBatch("insert into jdbc_xa1 (xa_accno, xa_customer, xa_balance) values (205, 'Edward Smith', 500)"); - int[] upCounts = stmt.executeBatch(); - - } catch (SQLException e) { - throw new CreateException("Failed to create bean in database: "+e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - return tempint; - } - - /** - * @return the connection from the dataSource - * @exception EJBException Thrown by the method if the dataSource is not found - * in the naming. - * @exception SQLException may be thrown by dataSource.getConnection() - */ - - private Connection getConnection() throws EJBException, SQLException { - - Connection myconn1 = null; - - if (dataSource1 == null) { - - // Finds DataSource from JNDI - - Context initialContext = null; - - try { - initialContext = new InitialContext(); - dataSource1 = (DataSource)initialContext.lookup("java:comp/env/jdbc/JdbcRA1Ds"); - } catch (Exception e) { - throw new javax.ejb.EJBException("Cannot lookup dataSource1 "+e); - } - } - - try { - myconn1 = dataSource1.getConnection(); - } catch (Exception e) { - throw new javax.ejb.EJBException("Cannot getConnection dataSource1 "+e); - } - - return myconn1; - } - - /*========================= Account implementation ============================*/ - - /** - * Business method for returning the balance. - * - * @return balance - * - */ - - public double getBalance(){ - return balance; - } - - /** - * Business method for updating the balance. - * - * @param d balance to update - * - */ - - public void setBalance(double d){ - balance = balance + d; - } - - /** - * Business method for returning the customer. - * - * @return customer - * - */ - - public String getCustomer(){ - return customer; - } - - /** - * Business method for changing the customer name. - * - * @param c customer to update - * - */ - - public void setCustomer(String c) { - customer = c; - } - - /** - * Business method to get the Account number - */ - - public int getNumber() { - return accno.intValue(); - } - -} - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbcra/JdbcRA2EBRBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbcra/JdbcRA2EBRBean.java deleted file mode 100644 index d3f38f350f9b23f10f22f65659e8ecc9fc75b472..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/jdbcra/JdbcRA2EBRBean.java +++ /dev/null @@ -1,512 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.jdbcra; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Enumeration; -import java.util.Vector; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.ObjectNotFoundException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.sql.DataSource; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * - */ - -public class JdbcRA2EBRBean implements EntityBean { - - private DataSource dataSource2 = null; - - static private Logger logger = null; - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // State of the bean. - // - // ------------------------------------------------------------------ - - public Integer accno; - public String customer; - public double balance; - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - public void setEntityContext(EntityContext ctx) { - - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - - // Access database to remove bean in table - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // delete Object in DB - - stmt = conn.prepareStatement("delete from jdbc_xa2 where xa_accno=?"); - Integer pk = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(1, pk.intValue()); - stmt.executeUpdate(); - } catch (SQLException e) { - throw new RemoveException ("Failed to delete bean from database"+e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - - // Access database to load bean state from table - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // find account in DB - - stmt = conn.prepareStatement("select xa_customer,xa_balance from jdbc_xa2 where xa_accno=?"); - Integer pk = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(1, pk.intValue()); - ResultSet rs = stmt.executeQuery(); - - if (rs.next() == false) { - throw new EJBException("Failed to load bean from database"); - } - - // update object state - - accno = pk; - customer = rs.getString("xa_customer"); - balance = rs.getDouble("xa_balance"); - - } catch (SQLException e) { - throw new EJBException("Failed to load bean from database "+e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - - // Access database to store bean state in table - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // store Object state in DB - - stmt = conn.prepareStatement("update jdbc_xa2 set xa_customer=?,xa_balance=? where xa_accno=?"); - stmt.setString(1, customer); - stmt.setDouble(2, balance); - Integer pk = (Integer) ejbContext.getPrimaryKey(); - stmt.setInt(3, pk.intValue()); - stmt.executeUpdate(); - - } catch (SQLException e) { - throw new EJBException("Failed to store bean to database "+e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPostCreate(int val_accno, String val_customer, double val_balance){ - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPostCreate(){ - logger.log(BasicLevel.DEBUG, ""); - } - - public java.lang.Integer ejbCreate(int val_accno, String val_customer, double val_balance) - throws CreateException { - - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - // Init object state - accno = new Integer(val_accno); - customer = val_customer; - balance = val_balance; - - Connection conn = null; - - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // create object in DB - - stmt = conn.prepareStatement("insert into jdbc_xa2 (xa_accno, xa_customer, xa_balance) values (?, ?, ?)"); - stmt.setInt(1, accno.intValue()); - stmt.setString(2, customer); - stmt.setDouble(3, balance); - stmt.executeUpdate(); - } catch (SQLException e) { - throw new CreateException("Failed to create bean in database: "+e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - // Return the primary key - - return accno; - - } - - public java.lang.Integer ejbFindByPrimaryKey(Integer pk) - throws ObjectNotFoundException, FinderException { - logger.log(BasicLevel.DEBUG, ""); - - // Access database to find entry in table - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // lookup for this primary key in DB - - stmt = conn.prepareStatement("select xa_accno from jdbc_xa2 where xa_accno=?"); - stmt.setInt(1, pk.intValue()); - ResultSet rs = stmt.executeQuery(); - - if (rs.next() == false) { - throw new javax.ejb.ObjectNotFoundException(); - } - - } catch (SQLException e) { - throw new javax.ejb.FinderException("Failed to executeQuery " +e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - return pk; - } - - - /** - * Find Account by its account number - * - * @return pk The primary key - * - * @exception FinderException - Failed to execute the query. - * @exception ObjectNotFoundException - Object not found for this account number - */ - - public Integer ejbFindByNumber(int accno) - throws ObjectNotFoundException, FinderException { - - Connection conn = null; - PreparedStatement stmt = null; - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // lookup for this primary key in DB - - stmt = conn.prepareStatement("select xa_accno from jdbc_xa2 where xa_accno=?"); - stmt.setInt(1, accno); - ResultSet rs = stmt.executeQuery(); - - if (rs.next() == false) { - throw new javax.ejb.ObjectNotFoundException(); - } - - } catch (SQLException e) { - throw new javax.ejb.FinderException("Failed to executeQuery " +e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - // return a primary key for this account - - return new Integer(accno); - } - - /** - * Creates an enumeration of primary keys for all accounts - * - * @return pkv The primary keys - * - * @exception FinderException - Failed to execute the query. - */ - - public Enumeration ejbFindAllAccounts() throws FinderException { - - Connection conn = null; - PreparedStatement stmt = null; - - Vector pkv = new Vector(); - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // Lookup for all accounts in DB - - stmt = conn.prepareStatement("select xa_accno from jdbc_xa2"); - ResultSet rs = stmt.executeQuery(); - - // Build the vector of primary keys - - while (rs.next()) { - Integer pk = new Integer(rs.getInt("xa_accno")); - pkv.addElement((Object)pk); - }; - - } catch (SQLException e) { - throw new javax.ejb.FinderException("Failed to executeQuery " +e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - - // return primary keys - return pkv.elements(); - } - - public java.lang.Integer ejbCreate() - throws CreateException{ - - logger.log(BasicLevel.DEBUG, ""); - - // Init object state - - Connection conn = null; - Statement stmt = null; - Integer tempint = new Integer(0); - - try { - // get a connection for this transaction context - - conn = getConnection(); - - // create object in DB - - stmt = conn.createStatement(); - stmt.addBatch("insert into jdbc_xa2 (xa_accno, xa_customer, xa_balance) values (201, 'Albert Smith', 500)"); - stmt.addBatch("insert into jdbc_xa2 (xa_accno, xa_customer, xa_balance) values (202, 'Bob Smith', 500)"); - stmt.addBatch("insert into jdbc_xa2 (xa_accno, xa_customer, xa_balance) values (203, 'Carl Smith', 500)"); - stmt.addBatch("insert into jdbc_xa2 (xa_accno, xa_customer, xa_balance) values (204, 'David Smith', 500)"); - stmt.addBatch("insert into jdbc_xa2 (xa_accno, xa_customer, xa_balance) values (205, 'Edward Smith', 500)"); - int[] upCounts = stmt.executeBatch(); - - } catch (SQLException e) { - throw new CreateException("Failed to create bean in database: "+e); - } finally { - try { - if (stmt != null) stmt.close(); // close statement - if (conn != null) conn.close(); // release connection - } catch (Exception ignore) { - } - } - return tempint; - } - - /** - * @return the connection from the dataSource - * @exception EJBException Thrown by the method if the dataSource is not found - * in the naming. - * @exception SQLException may be thrown by dataSource.getConnection() - */ - - private Connection getConnection() throws EJBException, SQLException { - - Connection myconn2 = null; - - if (dataSource2 == null) { - - // Finds DataSource from JNDI - - Context initialContext = null; - - try { - initialContext = new InitialContext(); - dataSource2 = (DataSource)initialContext.lookup("java:comp/env/jdbc/JdbcRA2Ds"); - } catch (Exception e) { - throw new javax.ejb.EJBException("Cannot lookup dataSource2 "+e); - } - } - - try { - myconn2 = dataSource2.getConnection(); - } catch (Exception e) { - throw new javax.ejb.EJBException("Cannot getConnection dataSource2 "+e); - } - - return myconn2; - } - - /*========================= Account implementation ============================*/ - - /** - * Business method for returning the balance. - * - * @return balance - * - */ - - public double getBalance(){ - return balance; - } - - /** - * Business method for updating the balance. - * - * @param d balance to update - * - */ - - public void setBalance(double d){ - balance = balance + d; - } - - /** - * Business method for returning the customer. - * - * @return customer - * - */ - - public String getCustomer(){ - return customer; - } - - /** - * Business method for changing the customer name. - * - * @param c customer to update - * - */ - - public void setCustomer(String c) { - customer = c; - } - - /** - * Business method to get the Account number - */ - - public int getNumber() { - return accno.intValue(); - } - -} - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/local/SimpleSessionSL.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/local/SimpleSessionSL.java deleted file mode 100644 index 034e390c07de0d927c9107e71bd5e586b6187297..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/local/SimpleSessionSL.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.local; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * Stateless Session - * @author Philippe Durieux - */ -public class SimpleSessionSL implements SessionBean { - - static protected Logger logger = null; - SessionContext ejbContext; - - public String string; - public int number; - public boolean createdViaCreateXX; - public boolean createdViaCreateYY; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the session object. - * This happens as a result of a client's invoking a remove operation, or when a - * container decides to terminate the session object after a timeout. - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * The Session bean must define 1 or more ejbCreate methods. - * - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Target implementation - // ------------------------------------------------------------------ - - /** - * getTen - */ - public int getTen() { - logger.log(BasicLevel.DEBUG, ""); - return 10; - } - - /** - * method2 - */ - public void method2(java.lang.String s) { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * getNumber - * Not called - */ - public int getNumber() { - logger.log(BasicLevel.DEBUG, ""); - return 0; - } - - /** - * getString - * Not called - */ - public String getString() { - logger.log(BasicLevel.DEBUG, ""); - return null; - } - - /** - * isCreatedViaCreateXX - * Not called - */ - public boolean isCreatedViaCreateXX() { - logger.log(BasicLevel.DEBUG, ""); - return false; - } - - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/local/TargetSL.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/local/TargetSL.java deleted file mode 100644 index 533ad8ce4339126211330234e2c7bc94a3e1d5df..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/local/TargetSL.java +++ /dev/null @@ -1,211 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.local; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; -import javax.transaction.UserTransaction; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * Stateless Session - * @author Philippe Durieux, Philippe Coq - */ -public class TargetSL implements SessionBean { - - static protected Logger logger = null; - SessionContext ejbContext; - - public String string; - public int number; - public boolean createdViaCreateXX; - public boolean createdViaCreateYY; - private int [] inttable = new int[30]; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the session object. - * This happens as a result of a client's invoking a remove operation, or when a - * container decides to terminate the session object after a timeout. - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * Check allowed and disallowed methods (See spec EJB 2.1 p 100) - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - - // These operations are allowed - ejbContext.getEJBHome(); - ejbContext.getEJBLocalHome(); - ejbContext.getEJBObject(); - ejbContext.getEJBLocalObject(); - ejbContext.getTimerService(); - - try { - // Must access java:comp/env - InitialContext ictx = new InitialContext(); - ictx.lookup("java:comp/env/myname"); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Cannot lookup java:comp/env/myname: " + e); - throw new CreateException("Cannot lookup java:comp/env/myname: " + e); - } - - // These operations are disallowed - try { - ejbContext.getCallerPrincipal(); - throw new CreateException("getCallerPrincipal disallowed"); - } catch (IllegalStateException e) { - logger.log(BasicLevel.DEBUG, "getCallerPrincipal disallowed"); - } - try { - ejbContext.isCallerInRole(""); - throw new CreateException("isCallerInRole disallowed"); - } catch (IllegalStateException e) { - logger.log(BasicLevel.DEBUG, "isCallerInRole disallowed"); - } - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // LocalInterface implementation - // ------------------------------------------------------------------ - - /** - * getTwenty - */ - public int getTwenty() { - logger.log(BasicLevel.DEBUG, ""); - return 20; - } - - /** - * lmethod2 - */ - public void lmethod2(java.lang.String s) { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Target implementation - // ------------------------------------------------------------------ - - /** - * getTen - */ - public int getTen() { - logger.log(BasicLevel.DEBUG, ""); - return 10; - } - - /** - * method2 - */ - public void method2(java.lang.String s) { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * getNumber - * Not called - */ - public int getNumber() { - logger.log(BasicLevel.DEBUG, ""); - return 0; - } - - /** - * getString - * Not called - */ - public String getString() { - logger.log(BasicLevel.DEBUG, ""); - return null; - } - - /** - * isCreatedViaCreateXX - * Not called - */ - public boolean isCreatedViaCreateXX() { - logger.log(BasicLevel.DEBUG, ""); - return false; - } - - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/Listener.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/Listener.java deleted file mode 100644 index 45caa331b66e1c82cd81358bcc421dbed13954eb..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/Listener.java +++ /dev/null @@ -1,246 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.message; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.FinderException; -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; -import javax.ejb.TimedObject; -import javax.ejb.Timer; -import javax.ejb.TimerService; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.JMSException; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import javax.transaction.Transaction; -import javax.transaction.UserTransaction; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.jonas.jtests.util.JBean; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * Common code for all Message Driven Beans - * @author Philippe Durieux, Philippe Coq - */ -public abstract class Listener extends JBean implements MessageDrivenBean, MessageListener, TimedObject { - protected static Logger logger = null; - protected transient MessageDrivenContext mdbContext; - protected transient MRecordHome arh = null; - protected String myname; - - abstract protected String getMyDest(); - - public static final int CREATE_TIMER_MIN = 1500; - public static final int CREATE_TIMER_MAX = 1600; - public static final int CREATE_P_TIMER_MIN = 25000; - public static final int CREATE_P_TIMER_MAX = 26000; - - /** - * Default constructor - */ - public Listener() { - } - - // ------------------------------------------------------------------ - // MessageDrivenBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated context. The container call this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param ctx A MessageDrivenContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - - public void setMessageDrivenContext(MessageDrivenContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - mdbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the message-driven object. - * This happens when a container decides to terminate the message-driven object. - * - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * The Message driven bean must define an ejbCreate methods with no args. - */ - public void ejbCreate() { - logger.log(BasicLevel.DEBUG, ""); - - // Get a ref on MRecordHome - InitialContext ictx = null; - try { - ictx = new InitialContext(); - arh = (MRecordHome) PortableRemoteObject.narrow(ictx.lookup("messageMRecordECHome"), MRecordHome.class); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "Listener : Cannot get messageMRecordHome:" + e); - } - - // Accesses the bean env to get the bean name - // This test also that we can access java:comp/env from here. - try { - myname = (String) ictx.lookup("java:comp/env/mdbname"); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "Listener : Cannot access java:comp/env/mdbname from ejbCreate:" + e); - } - } - - /** - * @return current Transaction - */ - public int getCurrentTransactionStatus() { - int ret = -1; - try { - UserTransaction ut = getUserTransaction(); - ret = ut.getStatus(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Cannot get the current transaction"); - } - return ret; - } - - /** - * onMessage method - */ - public void onMessage(Message message) { - logger.log(BasicLevel.DEBUG, ""); - - sleep(20); - - // Decode the message (MapMessage) - String uuid = null; - String dest = null; - int value = 0; - MapMessage msg = (MapMessage) message; - try { - uuid = msg.getString("Id"); - dest = msg.getString("Text"); - value = msg.getInt("Value"); - } catch (JMSException e) { - logger.log(BasicLevel.ERROR, "Listener exception:" + e); - return; - } - - // Check destination - if (! dest.equals(getMyDest())) { - logger.log(BasicLevel.ERROR, "Bad destination: " + dest + ". Expected is " + getMyDest()); - return; - } - - // Create a timer if required - if (value >= CREATE_TIMER_MIN && value <= CREATE_TIMER_MAX) { - TimerService timerservice = mdbContext.getTimerService(); - int dur = value - CREATE_TIMER_MIN; - Info info = new Info(uuid, dest, value, myname); - Timer mt = timerservice.createTimer(dur * 1000, dur * 1000, info); - return; - } - - // Create a persistent timer (time in minuts) - if (value >= CREATE_P_TIMER_MIN && value <= CREATE_P_TIMER_MAX) { - TimerService timerservice = mdbContext.getTimerService(); - int dur = value - CREATE_P_TIMER_MIN; - Info info = new Info(uuid, dest, value, myname); - Timer mt = timerservice.createTimer(dur * 1000 * 60, 0, info); - return; - } - - // Create a new Entity bean for this message - // Check that transaction association did not change after create. - // This should be better checked, but need to access the Transaction directly. - try { - int t1 = getCurrentTransactionStatus(); - arh.create(uuid, dest, value, myname); - if (t1 != getCurrentTransactionStatus()) { - logger.log(BasicLevel.ERROR, "Error in transaction association"); - } - } catch (CreateException e) { - logger.log(BasicLevel.ERROR, "Listener exception:" + e); - } catch (RemoteException e) { - logger.log(BasicLevel.ERROR, "Listener exception:" + e); - } - - - } - - // ----------------------------------------------------------- - // TimedObject implementation - // ----------------------------------------------------------- - - /** - * A timer is expired. - */ - public void ejbTimeout(Timer timer) { - logger.log(BasicLevel.DEBUG, ""); - Info info = (Info) timer.getInfo(); - // Create a new Entity bean for this message - try { - MRecord mr = arh.findByPrimaryKey(new MRecordPK(info.uuid, info.ejbname)); - int cnt = mr.getCount(); - if (cnt <= 3) { - mr.updateCount(); - } else { - timer.cancel(); - } - } catch (RemoteException e) { - logger.log(BasicLevel.ERROR, "Listener exception :" + e); - } catch (FinderException e) { - try { - arh.create(info.uuid, info.dest, info.value, info.ejbname); - } catch (CreateException ee) { - logger.log(BasicLevel.ERROR, "Listener exception:" + ee); - } catch (RemoteException ee) { - logger.log(BasicLevel.ERROR, "Listener exception on create:" + ee); - } - } - - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/MRecordEC.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/MRecordEC.java deleted file mode 100644 index 45947b9e115dca5ed1e55faac8f0a3733cf40e16..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/MRecordEC.java +++ /dev/null @@ -1,229 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MRecordEC.java - -package org.objectweb.jonas.jtests.beans.message; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * - */ -public class MRecordEC implements EntityBean { - - protected static Logger logger = null; - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // State of the bean. - // They must be public for Container Managed Persistance. - // ------------------------------------------------------------------ - public String uuid; - public String dest; - public int value; - public int count; - public String mdb; - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String uuid, String dest, int value, String mdb) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public MRecordPK ejbCreate(String uuid, String dest, int value, String mdb) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - // Init here the bean fields - this.uuid = uuid; - this.dest = dest; - this.value = value; - this.mdb = mdb; - this.count = 1; - - // In CMP, should return null. - return null; - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // MRecord implementation - // ------------------------------------------------------------------ - - /** - * returns UUID - */ - public String getUUID() throws RemoteException { - return uuid; - } - - /** - * returns dest - */ - public String getDest() throws RemoteException { - return dest; - } - - /** - * returns value - */ - public int getValue() throws RemoteException { - return value; - } - - /** - * returns count - */ - public int getCount() throws RemoteException { - return count; - } - - /** - * Add 1 to the count - */ - public void updateCount() throws RemoteException { - count++; - } - - /** - * returns MDB - */ - public String getMDB() throws RemoteException { - return mdb; - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/Sender1_1SF.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/Sender1_1SF.java deleted file mode 100644 index 3521ed8a1e3b273d847f3215313d79f5c9234099..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/Sender1_1SF.java +++ /dev/null @@ -1,316 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// SenderSF1_1.java -// Stateful Session Bean - -package org.objectweb.jonas.jtests.beans.message; - -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.jonas.jtests.util.Env; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * This Session Bean is equivalent to the SenderF bean - * the only difference is it is written in JMS1.1 - * it is using ConnectionFactory, Connection, Session and MessageProducer - */ -public class Sender1_1SF implements SessionBean { - - static protected Logger logger = null; - SessionContext ejbContext; - private transient InitialContext ictx = null; - private transient ConnectionFactory cf = null; - private transient javax.jms.Connection c = null; - private transient MRecordHome ehome = null; - private static int count = 1; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the session object. - * This happens as a result of a client's invoking a remove operation, or when a - * container decides to terminate the session object after a timeout. - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - try { - c.close(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Exception on close:" + e); - } - } - - /** - * The Session bean must define 1 or more ejbCreate methods. - * - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - // Lookup Connection Factories - try { - ictx = new InitialContext(); - cf = (ConnectionFactory) ictx.lookup("CF"); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "SenderSF : Cannot lookup Connection Factories: "+e); - throw new CreateException("SenderSF: Cannot lookup Connection Factories"); - } - - // Create Connections - try { - - c = cf.createConnection(); - } catch (JMSException e) { - logger.log(BasicLevel.ERROR, "SenderSF : Cannot create connections: "+e); - throw new CreateException("SenderSF: Cannot create connections"); - } - - // Lookup Entity Home for checking - String BEAN_HOME = "messageMRecordECHome"; - try { - ehome = (MRecordHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), MRecordHome.class); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "SenderSF ejbCreate: Cannot get entity home: "+e); - throw new CreateException("SenderSF: Cannot get entity home"); - } - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // private methods - // ------------------------------------------------------------------ - - /** - * return a unique identifier - */ - private String getUUID() { - long uuid; - synchronized(getClass()) { - uuid = System.currentTimeMillis() * 256 + count; - count++; - } - return String.valueOf(uuid); - } - - // ------------------------------------------------------------------ - // Sender implementation - // ------------------------------------------------------------------ - - /** - * send a message on destination (topic or queue) - * @param String destination - * @param int value set in message - * @param int nb of messages sent - */ - public void sendOnDestination(String dst, int val, int nb) { - logger.log(BasicLevel.DEBUG, ""); - // Lookup destinations - Destination dest = null; - try { - dest = (Destination) ictx.lookup(dst); - } catch (NamingException e) { - throw new EJBException("sendOnDestination: Cannot lookup "+dest); - } - - // Create Session - // Create Session at each request : Avoids the bug in JMS - // about Session not enlisted in transactions if open first. - Session ss = null; - try { - // (true, 0) are the recommanded args, although they are not taken - // in account by the container. - ss = c.createSession(true, 0); - } catch (JMSException e) { - throw new EJBException("Cannot create Session: "+e); - } - - // Create the MessageProducer for topic - MessageProducer producer = null; - try { - producer = ss.createProducer(dest); - } catch (JMSException e) { - throw new EJBException("Cannot create MessageProducer: "+e); - } - - // Send messages on the destination - try { - for (int i = 0; i < nb; i++) { - MapMessage mess = ss.createMapMessage(); - mess.setString("Id", getUUID()); - mess.setString("Text",dst); - mess.setInt("Value", val); - producer.send(mess); - } - } catch (JMSException e) { - throw new EJBException("Cannot send message: "+e); - } - - // Close Session: This is mandatory for the correct behaviour of - // XA protocol. An XA END must be sent before commit or rollback. - try { - ss.close(); - } catch (JMSException e) { - throw new EJBException("Cannot close session: "+e); - } - } - - /** - * send messages on destination (topic or queue) (transacted) - * @param String destination - * @param int value set in message - * @param int nb of messages sent - */ - public void sendOnDestinationTx(String dest, int val, int nb) { - sendOnDestination(dest, val, nb); - } - - - - /** - * Checking send methods - * @param int value looked in messages received - * @param int nb of messages that could be received - * @param int nb of seconds max to wait for all messages - * @return actual nb of messages received - */ - public int check(int val, int nb, int sec) { - Collection elist = null; - int retval = 0; - for (int i = 0; i <= sec; i++) { - logger.log(BasicLevel.DEBUG, "sec : " + i + "/" + sec); - try { - elist = ehome.findByValue(val); - retval = elist.size(); - if (retval >= nb) { - // clean database before returning - Iterator it = elist.iterator(); - while (it.hasNext()) { - MRecord ent = (MRecord) PortableRemoteObject.narrow(it.next(), MRecord.class); - try { - ent.remove(); - } catch (Exception e) { - throw new EJBException("Error on remove"); - } - } - return retval; - } - } catch (FinderException e) { - } catch (RemoteException e) { - return retval; - } - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - } - } - return retval; - } - - /** - * Clean all entity beans for this value - */ - public void clean(int val) { - logger.log(BasicLevel.DEBUG, ""); - Collection elist = null; - try { - elist = ehome.findByValue(val); - } catch (FinderException e) { - return; - } catch (Exception e) { - throw new EJBException("Error on find"); - } - Iterator it = elist.iterator(); - while (it.hasNext()) { - MRecord ent = (MRecord) PortableRemoteObject.narrow(it.next(), MRecord.class); - try { - ent.remove(); - } catch (Exception e) { - throw new EJBException("Error on remove"); - } - } - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/Sender1_2SF.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/Sender1_2SF.java deleted file mode 100644 index db4930b9d5d47bbc187274375c6655d566cb6c44..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/Sender1_2SF.java +++ /dev/null @@ -1,423 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// SenderSF1_1.java -// Stateful Session Bean - -package org.objectweb.jonas.jtests.beans.message; - -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.jonas.jtests.util.Env; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * This Session Bean is equivalent to the Sender1_1SF bean - * the only difference is it is bean managed transaction - * it is using ConnectionFactory, Connection, Session and MessageProducer - */ -public class Sender1_2SF implements SessionBean { - - static protected Logger logger = null; - SessionContext ejbContext; - private transient InitialContext ictx = null; - private transient ConnectionFactory cf = null; - private transient javax.jms.Connection c = null; - private transient MRecordHome ehome = null; - private static int count = 1; - private static UserTransaction utx = null; - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the session object. - * This happens as a result of a client's invoking a remove operation, or when a - * container decides to terminate the session object after a timeout. - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - try { - c.close(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Exception on close:" + e); - } - } - - /** - * The Session bean must define 1 or more ejbCreate methods. - * - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - // Lookup Connection Factories - try { - ictx = new InitialContext(); - cf = (ConnectionFactory) ictx.lookup("CF"); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "SenderSF : Cannot lookup Connection Factories: "+e); - throw new CreateException("SenderSF: Cannot lookup Connection Factories"); - } - - - // Create Connections - try { - - c = cf.createConnection(); - } catch (JMSException e) { - logger.log(BasicLevel.ERROR, "SenderSF : Cannot create connections: "+e); - throw new CreateException("SenderSF: Cannot create connections"); - } - - // Lookup Entity Home for checking - String BEAN_HOME = "messageMRecordECHome"; - try { - ehome = (MRecordHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), MRecordHome.class); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "SenderSF ejbCreate: Cannot get entity home: "+e); - throw new CreateException("SenderSF: Cannot get entity home"); - } - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // private methods - // ------------------------------------------------------------------ - - /** - * return a unique identifier - */ - private String getUUID() { - long uuid; - synchronized(getClass()) { - uuid = System.currentTimeMillis() * 256 + count; - count++; - } - return String.valueOf(uuid); - } - - // ------------------------------------------------------------------ - // Sender implementation - // ------------------------------------------------------------------ - - /** - * send a message on destination (topic or queue) - * @param Session session - * @param String destination - * @param int value set in message - * @param int nb of messages sent - * @param boolean commit transaction if true - */ - public void sendOnDestination(Session ss, String dst, int val, int nb) { - - // Lookup destinations - Destination dest = null; - try { - dest = (Destination) ictx.lookup(dst); - } catch (NamingException e) { - throw new EJBException("sendOnDestination: Cannot lookup "+dest); - } - - // Create the MessageProducer for destination - MessageProducer producer = null; - try { - producer = ss.createProducer(dest); - } catch (JMSException e) { - throw new EJBException("Cannot create MessageProducer: "+e); - } - - // Send messages on the destination - try { - for (int i = 0; i < nb; i++) { - MapMessage mess = ss.createMapMessage(); - mess.setString("Id", getUUID()); - mess.setString("Text",dst); - mess.setInt("Value", val); - producer.send(mess); - } - } catch (JMSException e) { - throw new EJBException("Cannot send message: "+e); - } - - } - - /** - * send a message on destination (topic or queue) - * the transaction is demarcated before the session creation - * @param String destination - * @param int value set in message - * @param int nb of messages sent - * @param boolean commit transaction if true - */ - public void sendOnDestinationWithTxBeforeSession(String dst, int val, int nb, boolean commit) - throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - - // Obtain the UserTransaction interface - try { - utx = ejbContext.getUserTransaction(); - } catch (IllegalStateException e) { - logger.log(BasicLevel.ERROR, "Can't get UserTransaction"); - throw new RemoteException("Can't get UserTransaction:", e); - } - - - - // Start a global transaction - try { - utx.begin(); - } catch (NotSupportedException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } catch (SystemException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } - - - // Create Session - // Create Session at each request : Avoids the bug in JMS - // about Session not enlisted in transactions if open first. - Session ss = null; - try { - // (true, 0) are the recommanded args, although they are not taken - // in account by the container. - ss = c.createSession(true, 0); - } catch (JMSException e) { - throw new EJBException("Cannot create Session: "+e); - } - sendOnDestination(ss, dst, val, nb); - - - // Close Session: This is mandatory for the correct behaviour of - // XA protocol. An XA END must be sent before commit or rollback. - try { - ss.close(); - } catch (JMSException e) { - throw new EJBException("Cannot close session: "+e); - } - - try { - // commit or rollback the transaction depending on commit parameter - if(commit) { - utx.commit(); - } else { - utx.rollback(); - } - - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Can't rollback Transaction"); - throw new RemoteException("Can't rollback Transaction:", e); - } - } - - /** - * send messages on destination (topic or queue) - * the transaction is demarcated after the session creation - * @param String destination - * @param int value set in message - * @param int nb of messages sent - * @param boolean commit transaction if true - */ - public void sendOnDestinationWithTxAfterSession(String dst, int val, int nb, boolean commit) - throws RemoteException { - - // Obtain the UserTransaction interface - try { - utx = ejbContext.getUserTransaction(); - } catch (IllegalStateException e) { - logger.log(BasicLevel.ERROR, "Can't get UserTransaction"); - throw new RemoteException("Can't get UserTransaction:", e); - } - - Session ss = null; - try { - - ss = c.createSession(false, 0); - } catch (JMSException e) { - throw new EJBException("Cannot create Session: "+e); - } - - // Start a global transaction - try { - utx.begin(); - } catch (NotSupportedException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } catch (SystemException e) { - logger.log(BasicLevel.ERROR, "Can't start Transaction"); - throw new RemoteException("Can't start Transaction:", e); - } - sendOnDestination(ss, dst, val, nb); - // Close Session: This is mandatory for the correct behaviour of - // XA protocol. An XA END must be sent before commit or rollback. - try { - ss.close(); - } catch (JMSException e) { - throw new EJBException("Cannot close session: "+e); - } - - try { - // commit or rollback the transaction depending on commit parameter - if(commit) { - utx.commit(); - } else { - utx.rollback(); - } - - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Can't rollback Transaction"); - throw new RemoteException("Can't rollback Transaction:", e); - } - } - - - - /** - * Checking send methods - * @param int value looked in messages received - * @param int nb of messages that could be received - * @param int nb of seconds max to wait for all messages - * @return actual nb of messages received - */ - public int check(int val, int nb, int sec) { - Collection elist = null; - int retval = 0; - for (int i = 0; i <= sec; i++) { - logger.log(BasicLevel.DEBUG, "sec : " + i + "/" + sec); - try { - elist = ehome.findByValue(val); - retval = elist.size(); - if (retval >= nb) { - // clean database before returning - Iterator it = elist.iterator(); - while (it.hasNext()) { - MRecord ent = (MRecord) PortableRemoteObject.narrow(it.next(), MRecord.class); - try { - ent.remove(); - } catch (Exception e) { - throw new EJBException("Error on remove"); - } - } - return retval; - } - } catch (FinderException e) { - } catch (RemoteException e) { - return retval; - } - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - } - } - return retval; - } - - /** - * Clean all entity beans for this value - */ - public void clean(int val) { - logger.log(BasicLevel.DEBUG, ""); - Collection elist = null; - try { - elist = ehome.findByValue(val); - } catch (FinderException e) { - return; - } catch (Exception e) { - throw new EJBException("Error on find"); - } - Iterator it = elist.iterator(); - while (it.hasNext()) { - MRecord ent = (MRecord) PortableRemoteObject.narrow(it.next(), MRecord.class); - try { - ent.remove(); - } catch (Exception e) { - throw new EJBException("Error on remove"); - } - } - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/SenderSF.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/SenderSF.java deleted file mode 100644 index 0e8faa66455d6ab17112e1940dd003ba710ba7dc..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/message/SenderSF.java +++ /dev/null @@ -1,390 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// SenderSF.java -// Stateful Session Bean - -package org.objectweb.jonas.jtests.beans.message; - -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.jms.Topic; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.jonas.jtests.util.Env; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * - */ -public class SenderSF implements SessionBean { - - static protected Logger logger = null; - SessionContext ejbContext; - private transient InitialContext ictx = null; - private transient TopicConnectionFactory tcf = null; - private transient TopicConnection tc = null; - private transient QueueConnectionFactory qcf = null; - private transient QueueConnection qc = null; - private transient MRecordHome ehome = null; - private static int count = 1; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the session object. - * This happens as a result of a client's invoking a remove operation, or when a - * container decides to terminate the session object after a timeout. - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - try { - tc.close(); - qc.close(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Exception on close:" + e); - } - } - - /** - * The Session bean must define 1 or more ejbCreate methods. - * - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - // Lookup Connection Factories - try { - ictx = new InitialContext(); - tcf = (TopicConnectionFactory) ictx.lookup("TCF"); - qcf = (QueueConnectionFactory) ictx.lookup("QCF"); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "SenderSF : Cannot lookup Connection Factories: "+e); - throw new CreateException("SenderSF: Cannot lookup Connection Factories"); - } - - // Create Connections - try { - qc = qcf.createQueueConnection(); - tc = tcf.createTopicConnection(); - } catch (JMSException e) { - logger.log(BasicLevel.ERROR, "SenderSF : Cannot create connections: "+e); - throw new CreateException("SenderSF: Cannot create connections"); - } - - // Lookup Entity Home for checking - String BEAN_HOME = "messageMRecordECHome"; - try { - ehome = (MRecordHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), MRecordHome.class); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "SenderSF ejbCreate: Cannot get entity home: "+e); - throw new CreateException("SenderSF: Cannot get entity home"); - } - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // private methods - // ------------------------------------------------------------------ - - /** - * return a unique identifier - */ - private String getUUID() { - long uuid; - synchronized(getClass()) { - uuid = System.currentTimeMillis() * 256 + count; - count++; - } - return String.valueOf(uuid); - } - - // ------------------------------------------------------------------ - // Sender implementation - // ------------------------------------------------------------------ - - /** - * send a message on topic - * @param String destination - * @param int value set in message - * @param int nb of messages sent - */ - public void sendOnTopic(String dest, int val, int nb) { - logger.log(BasicLevel.DEBUG, ""); - // Lookup destinations - Topic topic = null; - try { - topic = (Topic) ictx.lookup(dest); - } catch (NamingException e) { - throw new EJBException("sendOnTopic: Cannot lookup "+dest); - } - - // Create TopicSession - // Create Session at each request : Avoids the bug in JMS - // about Session not enlisted in transactions if open first. - TopicSession ss = null; - try { - // (true, 0) are the recommanded args, although they are not taken - // in account by the container. - ss = tc.createTopicSession(true, 0); - } catch (JMSException e) { - throw new EJBException("Cannot create Session: "+e); - } - - // Create the TopicPublisher - TopicPublisher publisher = null; - try { - publisher = ss.createPublisher(topic); - } catch (JMSException e) { - throw new EJBException("Cannot create TopicPublisher: "+e); - } - - // Publish messages on the topic - try { - for (int i = 0; i < nb; i++) { - MapMessage mess = ss.createMapMessage(); - mess.setString("Id", getUUID()); - mess.setString("Text", dest); - mess.setInt("Value", val); - publisher.publish(mess); - } - } catch (JMSException e) { - throw new EJBException("Cannot send message: "+e); - } - - // Close Session: This is mandatory for the correct behaviour of - // XA protocol. An XA END must be sent before commit or rollback. - try { - ss.close(); - } catch (JMSException e) { - throw new EJBException("Cannot close session: "+e); - } - } - - /** - * send messages on topic (transacted) - * @param String destination - * @param int value set in message - * @param int nb of messages sent - */ - public void sendOnTopicTx(String dest, int val, int nb) { - sendOnTopic(dest, val, nb); - } - - /** - * send a message on queue - * @param String destination - * @param int value set in message - * @param int nb of messages sent - */ - public void sendOnQueue(String dest, int val, int nb) { - logger.log(BasicLevel.DEBUG, ""); - // Lookup destination - Queue queue = null; - try { - queue = (Queue) ictx.lookup(dest); - } catch (NamingException e) { - throw new EJBException("sendOnQueue: Cannot lookup "+dest); - } - - // Create QueueSession - // Must create Session at each request because of the bug in JMS - // about Session not enlisted in transactions if open first. - QueueSession ss = null; - try { - // (true, 0) are the recommanded args, although they are not taken - // in account by the container. - ss = qc.createQueueSession(true, 0); - } catch (JMSException e) { - throw new EJBException("Cannot create Session: "+e); - } - - // Create the QueueSender - QueueSender sender = null; - try { - sender = ss.createSender(queue); - } catch (JMSException e) { - throw new EJBException("Cannot create QueueSender: "+e); - } - - // Publish messages on the queue - try { - for (int i = 0; i < nb; i++) { - MapMessage mess = ss.createMapMessage(); - mess.setString("Id", getUUID()); - mess.setString("Text", dest); - mess.setInt("Value", val); - sender.send(mess); - } - } catch (JMSException e) { - throw new EJBException("Cannot send message: "+e); - } - - // Close Session: This is mandatory for the correct behaviour of - // XA protocol. An XA END must be sent before commit or rollback. - try { - ss.close(); - } catch (JMSException e) { - throw new EJBException("Cannot close session: "+e); - } - } - - /** - * send messages on queue (transacted) - * @param String destination - * @param int value set in message - * @param int nb of messages sent - */ - public void sendOnQueueTx(String dest, int val, int nb) { - sendOnQueue(dest, val, nb); - } - - /** - * Checking send methods - * @param int value looked in messages received - * @param int nb of messages that could be received - * @param int nb of seconds max to wait for all messages - * @return actual nb of messages received - */ - public int check(int val, int nb, int sec) { - Collection elist = null; - int retval = 0; - for (int i = 0; i <= sec; i++) { - logger.log(BasicLevel.DEBUG, "sec : " + i + "/" + sec); - try { - elist = ehome.findByValue(val); - retval = elist.size(); - if (retval >= nb) { - // clean database before returning - Iterator it = elist.iterator(); - while (it.hasNext()) { - MRecord ent = (MRecord) PortableRemoteObject.narrow(it.next(), MRecord.class); - try { - ent.remove(); - } catch (Exception e) { - throw new EJBException("Error on remove"); - } - } - return retval; - } - } catch (FinderException e) { - } catch (RemoteException e) { - return retval; - } - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - } - } - return retval; - } - - /** - * Clean all entity beans for this value - */ - public void clean(int val) { - logger.log(BasicLevel.DEBUG, ""); - Collection elist = null; - try { - elist = ehome.findByValue(val); - } catch (FinderException e) { - return; - } catch (Exception e) { - throw new EJBException("Error on find"); - } - Iterator it = elist.iterator(); - while (it.hasNext()) { - MRecord ent = (MRecord) PortableRemoteObject.narrow(it.next(), MRecord.class); - try { - ent.remove(); - } catch (Exception e) { - throw new EJBException("Error on remove"); - } - } - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/AddressBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/AddressBean.java deleted file mode 100644 index 5bfeefd90a31c4822d1b507e87961018b39aeb02..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/AddressBean.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.cascade; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EntityContext; -import javax.ejb.EntityBean; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Implementation for bean Address - * @author Ph Durieux - */ -public abstract class AddressBean implements EntityBean { - - static protected Logger logger = null; - protected EntityContext ejbContext = null; - - public Integer ejbCreate(String street, String city, String state, String zip) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setStreet(street); - setCity(city); - setState(state); - setZip(zip); - return null; - } - - public void ejbPostCreate(String street, String city, String state, String zip) { - logger.log(BasicLevel.DEBUG, ""); - } - - public Integer ejbCreate(AddressDO addr, CustomerL customer) throws CreateException { - setStreet(addr.getStreet()); - setCity(addr.getCity()); - setState(addr.getState()); - setZip(addr.getZip()); - return null; - } - - public void ejbPostCreate(AddressDO addr, CustomerL customer) throws CreateException { - // Sould we do this ? Actually, it doesn't work. - // SInce this is a 1-1 relation, when setting the cmr in customer it should set - // this also, by coherence ? (to be confirmed) - //setCustomer(customer); - } - - public Integer getCustomerId() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - CustomerL c = getCustomer(); - Integer ret = null; - if (c != null) { - ret = c.getId(); - } - return ret; - } - - - // relationship fields (if defined in ejb-relationship-role only) - public abstract CustomerL getCustomer(); - public abstract void setCustomer(CustomerL cust); - - // persistent fields - public abstract Integer getId(); - public abstract void setId(Integer id); - public abstract String getStreet(); - public abstract void setStreet(String street); - public abstract String getCity(); - public abstract void setCity(String city); - public abstract String getState(); - public abstract void setState(String state); - public abstract String getZip(); - public abstract void setZip(String zip); - - // standard call back methods - - public void setEntityContext(EntityContext ec) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ec; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/CarBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/CarBean.java deleted file mode 100644 index 71cdfd2855589462aef0d7d74bac2787c01e7b24..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/CarBean.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.cascade; - -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Vector; -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Implementation for bean Car - * @author Ph Durieux - */ -public abstract class CarBean implements EntityBean { - - static protected Logger logger = null; - protected EntityContext ejbContext = null; - protected InsuranceHL insuranceHL = null; - protected InvoiceHL invoiceHL = null; - - public Object ejbCreate(String number, byte type, String name) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setNumber(number); - setType(type); - setName(name); - return null; - } - - public void ejbPostCreate(String number, byte type, String name) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - InsuranceL ins = insuranceHL.create("000" + number); - setInsurance(ins); - } - - // persistent fields - public abstract Integer getId(); - public abstract void setId(Integer id); - public abstract String getNumber(); - public abstract void setNumber(String number); - public abstract byte getType(); - public abstract void setType(byte type); - public abstract String getName(); - public abstract void setName(String name); - - // persistent relationships - public abstract InsuranceL getInsurance(); - public abstract void setInsurance(InsuranceL i); - public abstract CustomerL getCustomer(); - public abstract void setCustomer(CustomerL c); - public abstract java.util.Collection getInvoices(); - public abstract void setInvoices(java.util.Collection invoices); - - - public void addInvoice(String number) throws NamingException, CreateException { - logger.log(BasicLevel.DEBUG, ""); - InvoiceL invoice = invoiceHL.create(number); - Collection invoices = getInvoices(); - invoices.add(invoice); - } - - public void setEntityContext(EntityContext ec) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ec; - try { - InitialContext cntx = new InitialContext(); - insuranceHL = (InsuranceHL) cntx.lookup("java:comp/env/ejb/InsuranceHomeLocal"); - invoiceHL = (InvoiceHL) cntx.lookup("java:comp/env/ejb/InvoiceHomeLocal"); - } catch (Exception e) { - throw new javax.ejb.EJBException(e); - } - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - checkCustomerAccess(); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - checkCustomerAccess(); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - // This cannot be done: See EJB specs - // A bean must not attempt to access its state here. - //checkCustomerAccess(); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - // This cannot be done: See EJB specs - // A bean must not attempt to access its state here. - //checkCustomerAccess(); - } - - /** - * this instance is being removed. - * we must be able to access bean fields here, including the CMRs - */ - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, ""); - InsuranceL myins = getInsurance(); - if (myins == null) { - logger.log(BasicLevel.ERROR, "CMR field Insurance is null"); - throw new RemoveException("Cannot access CMR field Insurance inside ejbRemove"); - } - String insnumber = myins.getNumber(); - String expect = "000" + getNumber(); - if (! expect.equals(insnumber)) { - throw new RemoveException("Bad insurance number:" + insnumber); - } - checkCustomerAccess(); - } - - protected void checkCustomerAccess() { - logger.log(BasicLevel.DEBUG, ""); - CustomerL mycust = getCustomer(); - if (mycust == null) { - logger.log(BasicLevel.ERROR, "CMR field Customer is null"); - throw new EJBException("CMR field Customer is null"); - } - Name n = mycust.getName(); - if (n == null || n.getLastName().length() == 0) { - logger.log(BasicLevel.ERROR, "Cannot get customer name"); - throw new EJBException("Cannot get customer name"); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/CreditCardBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/CreditCardBean.java deleted file mode 100644 index 39f16ae6db206347293fb9d0f968e66c0cd8a85a..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/CreditCardBean.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.cascade; - -import java.util.Date; -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Implementation for bean CreditCard - * @author Ph Durieux - */ -public abstract class CreditCardBean implements EntityBean { - - static protected Logger logger = null; - protected EntityContext ejbContext = null; - - public Object ejbCreate(Date exp, String numb, String name) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setExpirationDate(exp); - setNumber(numb); - setNameOnCard(name); - return null; - } - - public void ejbPostCreate(Date exp, String numb, String name) { - logger.log(BasicLevel.DEBUG, ""); - } - - // persistent fields - public abstract Integer getId(); - public abstract void setId(Integer id); - public abstract Date getExpirationDate(); - public abstract void setExpirationDate(Date date); - public abstract String getNumber(); - public abstract void setNumber(String number); - public abstract String getNameOnCard(); - public abstract void setNameOnCard(String name); - - // standard call back methods - public void setEntityContext(EntityContext ec) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ec; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/CustomerBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/CustomerBean.java deleted file mode 100644 index 3762400e5b8587ddc6583dab19f56be87d751a08..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/CustomerBean.java +++ /dev/null @@ -1,339 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.cascade; - -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Date; -import java.util.Iterator; -import java.util.Vector; - -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Implementation for bean Customer - * @author Ph Durieux - */ -public abstract class CustomerBean implements EntityBean { - - static protected Logger logger = null; - private CreditCardHL creditCardHL = null; - private AddressHL addressHL = null; - private PhoneHL phoneHL = null; - private CarHL carHL = null; - private EntityContext ejbContext = null; - - public Integer ejbCreate(Integer id) throws javax.ejb.CreateException { - logger.log(BasicLevel.DEBUG, ""); - this.setId(id); - return null; - } - - public void ejbPostCreate(Integer id) { - logger.log(BasicLevel.DEBUG, ""); - } - - public Integer ejbCreateWithAddress(Integer id, AddressDO addr) throws javax.ejb.CreateException { - logger.log(BasicLevel.DEBUG, ""); - this.setId(id); - return null; - } - - public void ejbPostCreateWithAddress(Integer id, AddressDO addr) throws javax.ejb.CreateException { - logger.log(BasicLevel.DEBUG, ""); - CustomerL myLocalInterface = (CustomerL) ejbContext.getEJBLocalObject(); - AddressL addrl = addressHL.create(addr, myLocalInterface); - setHomeAddress(addrl); - } - - - // business methods - - public Name getName() { - logger.log(BasicLevel.DEBUG, ""); - Name name = new Name(getLastName(), getFirstName()); - return name; - } - - public void setName(Name name) { - logger.log(BasicLevel.DEBUG, ""); - setLastName(name.getLastName()); - setFirstName(name.getFirstName()); - } - - public void setAddress(String street, String city, String state, String zip) throws CreateException, NamingException { - logger.log(BasicLevel.DEBUG, ""); - - AddressL addr = this.getHomeAddress(); - - if (addr == null) { - addr = addressHL.create(street, city, state, zip); - setHomeAddress(addr); - } else { - // Customer already has an address. Change its fields - addr.setStreet(street); - addr.setCity(city); - addr.setState(state); - addr.setZip(zip); - } - } - - public void setAddress(AddressDO addrValue) throws CreateException, NamingException { - logger.log(BasicLevel.DEBUG, ""); - String street = addrValue.getStreet(); - String city = addrValue.getCity(); - String state = addrValue.getState(); - String zip = addrValue.getZip(); - - setAddress(street, city, state, zip); - } - - public AddressDO getAddress() { - logger.log(BasicLevel.DEBUG, ""); - AddressL addrL = this.getHomeAddress(); - if (addrL == null) { - return null; - } - String street = addrL.getStreet(); - String city = addrL.getCity(); - String state = addrL.getState(); - String zip = addrL.getZip(); - AddressDO addrValue = new AddressDO(street, city, state, zip); - return addrValue; - } - - public void addPhoneNumber(String number, byte type) throws NamingException, CreateException, RemoteException { - logger.log(BasicLevel.DEBUG, ""); - PhoneL phone = phoneHL.create(number, type, getName().getLastName()); - Collection phoneNumbers = this.getPhoneNumbers(); - phoneNumbers.add(phone); - } - - public void addCar(String number, byte type) throws NamingException, CreateException, RemoteException { - logger.log(BasicLevel.DEBUG, ""); - CarL car = carHL.create(number, type, getName().getLastName()); - Collection cars = this.getCars(); - cars.add(car); - } - - public void setCreditCard(Date date, String num, String name) throws NamingException, CreateException, RemoteException { - logger.log(BasicLevel.DEBUG, ""); - CreditCardL cc = creditCardHL.create(date, num, name); - setCreditCard(cc); - } - - public void removePhoneNumber(byte typeToRemove) { - logger.log(BasicLevel.DEBUG, "typeToRemove=" + typeToRemove); - - Collection phoneNumbers = this.getPhoneNumbers(); - Iterator iterator = phoneNumbers.iterator(); - - while (iterator.hasNext()) { - PhoneL phone = (PhoneL) iterator.next(); - if (phone.getType() == typeToRemove) { - phoneNumbers.remove(phone); - break; - } - } - } - - public void removeCar(byte typeToRemove) { - logger.log(BasicLevel.DEBUG, "typeToRemove=" + typeToRemove); - - Collection cars = this.getCars(); - Iterator iterator = cars.iterator(); - - while (iterator.hasNext()) { - CarL car = (CarL) iterator.next(); - if (car.getType() == typeToRemove) { - cars.remove(car); - break; - } - } - } - - public void updatePhoneNumber(String number, byte typeToUpdate) { - logger.log(BasicLevel.DEBUG, "typeToUpdate=" + typeToUpdate); - - Collection phoneNumbers = this.getPhoneNumbers(); - Iterator iterator = phoneNumbers.iterator(); - while (iterator.hasNext()) { - PhoneL phone = (PhoneL) iterator.next(); - if (phone.getType() == typeToUpdate) { - phone.setNumber(number); - break; - } - } - } - - public void accident(String carnumber, String invoicenumber) throws RemoteException, CreateException, NamingException { - logger.log(BasicLevel.DEBUG, "invoicenumber=" + invoicenumber); - - // retrieve car in the list - CarL car = null; - boolean found = false; - for (Iterator i = getCars().iterator(); i.hasNext();) { - car = (CarL) i.next(); - if (car.getNumber().equals(carnumber)) { - found = true; - break; - } - } - if (! found) { - throw new RemoteException("Car not found:" + carnumber); - } - - // Create new invoice - car.addInvoice(invoicenumber); - } - - public void updateCar(String number, byte typeToUpdate) { - logger.log(BasicLevel.DEBUG, "typeToUpdate=" + typeToUpdate); - - Collection cars = this.getCars(); - Iterator iterator = cars.iterator(); - while (iterator.hasNext()) { - CarL car = (CarL) iterator.next(); - if (car.getType() == typeToUpdate) { - car.setNumber(number); - break; - } - } - } - - public Vector getPhoneList() { - logger.log(BasicLevel.DEBUG, ""); - - Vector vv = new Vector(); - Collection phoneNumbers = this.getPhoneNumbers(); - - Iterator iterator = phoneNumbers.iterator(); - while (iterator.hasNext()) { - PhoneL phone = (PhoneL) iterator.next(); - String ss = "Type=" + phone.getType() + " Number=" + phone.getNumber(); - vv.add(ss); - } - return vv; - } - - public Vector getCarList() { - logger.log(BasicLevel.DEBUG, ""); - - Vector vv = new Vector(); - Collection cars = this.getCars(); - - Iterator iterator = cars.iterator(); - while (iterator.hasNext()) { - CarL car = (CarL) iterator.next(); - String ss = "Type=" + car.getType() + " Number=" + car.getNumber(); - vv.add(ss); - } - return vv; - } - - // persistent relationships - - public abstract AddressL getHomeAddress(); - public abstract void setHomeAddress(AddressL address); - - public abstract CreditCardL getCreditCard(); - public abstract void setCreditCard(CreditCardL card); - - public abstract java.util.Collection getPhoneNumbers(); - public abstract void setPhoneNumbers(java.util.Collection phones); - - public abstract java.util.Collection getCars(); - public abstract void setCars(java.util.Collection cars); - - // abstract accessor methods - public abstract Integer getId(); - public abstract void setId(Integer id); - - public abstract String getLastName( ); - public abstract void setLastName(String lname); - - public abstract String getFirstName( ); - public abstract void setFirstName(String fname); - - // standard call back methods - - public void setEntityContext(EntityContext ec) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - try { - ejbContext = ec; - InitialContext cntx = new InitialContext(); - creditCardHL = (CreditCardHL) cntx.lookup("java:comp/env/ejb/CreditCardHomeLocal"); - addressHL = (AddressHL) cntx.lookup("java:comp/env/ejb/AddressHomeLocal"); - phoneHL = (PhoneHL) cntx.lookup("java:comp/env/ejb/PhoneHomeLocal"); - carHL = (CarHL) cntx.lookup("java:comp/env/ejb/CarHomeLocal"); - } catch (Exception e) { - throw new javax.ejb.EJBException(e); - } - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - checkCMRAccess(); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - checkCMRAccess(); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, ""); - checkCMRAccess(); - } - - protected void checkCMRAccess() { - logger.log(BasicLevel.DEBUG, ""); - Collection col = getCars(); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/InsuranceBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/InsuranceBean.java deleted file mode 100644 index 3108e931b1bcfb886da1f1bbb48ea1ade3fb61d5..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/InsuranceBean.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.cascade; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EntityContext; -import javax.ejb.EntityBean; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Implementation for bean Insurance - * @author Ph Durieux - */ -public abstract class InsuranceBean implements EntityBean { - - static protected Logger logger = null; - protected EntityContext ejbContext = null; - - public Integer ejbCreate(String number) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setNumber(number); - return null; - } - - public void ejbPostCreate(String number) { - logger.log(BasicLevel.DEBUG, ""); - } - - // persistent fields - public abstract Integer getId(); - public abstract void setId(Integer id); - public abstract String getNumber(); - public abstract void setNumber(String number); - - // persistent relationships - public abstract CarL getCar(); - public abstract void setCar(CarL car); - - - public void setEntityContext(EntityContext ec) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ec; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * this instance is being removed. - * we must be able to access bean fields here, including the CMRs - */ - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, ""); - CarL mycar = getCar(); - if (mycar == null) { - logger.log(BasicLevel.ERROR, "CMR field is null"); - throw new RemoveException("Cannot access CMR field inside ejbRemove"); - } - String carnumber = mycar.getNumber(); - if (! getNumber().equals("000" + carnumber)) { - throw new RemoveException("Bad car number while removing Insurance:" + carnumber); - } - CustomerL cust = mycar.getCustomer(); - if (cust == null) { - logger.log(BasicLevel.ERROR, "Cannot get customer from insurance"); - throw new RemoveException("Cannot get customer from insurance"); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/InvoiceBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/InvoiceBean.java deleted file mode 100644 index d93562187b6769d7e22a2d10802c59676d2a97c3..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/InvoiceBean.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.cascade; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EntityContext; -import javax.ejb.EntityBean; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Implementation for bean Invoice - * @author Ph Durieux - */ -public abstract class InvoiceBean implements EntityBean { - - static protected Logger logger = null; - protected EntityContext ejbContext = null; - - public Integer ejbCreate(String number) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setNumber(number); - return null; - } - - public void ejbPostCreate(String number) { - logger.log(BasicLevel.DEBUG, ""); - } - - // persistent fields - public abstract Integer getId(); - public abstract void setId(Integer id); - public abstract String getNumber(); - public abstract void setNumber(String number); - - // persistent relationships - public abstract CarL getCar(); - public abstract void setCar(CarL car); - - - public void setEntityContext(EntityContext ec) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ec; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * this instance is being removed. - * we must be able to access bean fields here, including the CMRs - */ - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, "number=" + getNumber()); - CarL mycar = getCar(); - if (mycar == null) { - logger.log(BasicLevel.ERROR, "CMR field is null"); - throw new RemoveException("Cannot access CMR field inside Invoice.ejbRemove"); - } - String carnumber = mycar.getNumber(); - if (! getNumber().startsWith(carnumber)) { - throw new RemoveException("Bad car number while removing Invoice:" + carnumber); - } - CustomerL cust = mycar.getCustomer(); - if (cust == null) { - logger.log(BasicLevel.ERROR, "Cannot get customer from invoice"); - throw new RemoveException("Cannot get customer from invoice"); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/PhoneBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/PhoneBean.java deleted file mode 100644 index 0027657a66fda5d81343bc79e6eded152f5de118..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/cascade/PhoneBean.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.cascade; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Implementation for bean Phone - * @author Ph Durieux - */ -public abstract class PhoneBean implements EntityBean { - - static protected Logger logger = null; - protected EntityContext ejbContext = null; - - public Object ejbCreate(String number, byte type, String name) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - setNumber(number); - setType(type); - setName(name); - return null; - } - - public void ejbPostCreate(String number, byte type, String name) { - logger.log(BasicLevel.DEBUG, ""); - } - - // persistent fields - public abstract Integer getId(); - public abstract void setId(Integer id); - public abstract String getNumber(); - public abstract void setNumber(String number); - public abstract byte getType(); - public abstract void setType(byte type); - public abstract String getName(); - public abstract void setName(String name); - - // standard call back methods - public void setEntityContext(EntityContext ec) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ec; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/AEC2.java deleted file mode 100644 index 60bbdbcb6da6c6a414e46ad69f2029f478292cd7..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/AEC2.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.dass; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author Ph Durieux - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - - public void assignB(String c) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - if (c != null) { - BLocal bl = null; - bl = bhl.findByPrimaryKey(c); - setB(bl); - } else - setB(null); - } - - public String retrieveB() { - logger.log(BasicLevel.DEBUG, ""); - BLocal lejbB = getB(); - if (lejbB == null) { - return null; - } else { - return lejbB.getId(); - } - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - - public abstract String getBcmrvalue(); - public abstract void setBcmrvalue(String id); - - public abstract BLocal getB(); - public abstract void setB(BLocal bl); - - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/BEC2.java deleted file mode 100644 index 5563c8cd474340bc8f751e4234f868f82c8a35a7..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/BEC2.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.dass; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.RemoveException; - -/** - * @author Ph Durieux - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P1EC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P1EC2.java deleted file mode 100644 index b6dabe3d5ed8cf95fc7866be44392945e6a9034e..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P1EC2.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.dass; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author Ph Durieux - */ -public abstract class P1EC2 implements javax.ejb.EntityBean { - - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - public abstract String getPf1(); - public abstract void setPf1(String pf1); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id, String pf1) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - setPf1(pf1); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id, String pf1) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P2EC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P2EC2.java deleted file mode 100644 index bd8eb1bd8f39cbff2a685f91771492cf05912d9a..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P2EC2.java +++ /dev/null @@ -1,204 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.dass; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author Ph Durieux - */ -public abstract class P2EC2 implements javax.ejb.EntityBean { - - private P1HomeLocal p1home = null; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - - public abstract P1Local getP1(); - public abstract void setP1(P1Local p1); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - try { - P1Local p1l = p1home.findByPrimaryKey(id); - setP1(p1l); - } catch (FinderException e) { - throw new CreateException("P2 cannot exist without matching P1"); - } - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - p1home = (P1HomeLocal) ictx.lookup("java:comp/env/ejb/p1"); - } catch (NamingException e) { - throw new EJBException("Impossible to get HomeLocal:", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // --------------------------------------------------------------------- - // P1Remote Implementation - // --------------------------------------------------------------------- - - /** - * - */ - public String getP1Value() { - P1Local p1l = getP1(); - return p1l.getPf1(); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P3EC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P3EC2.java deleted file mode 100644 index 5906b9b559d8e5224a40be5244fdb0ecb705ebe2..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P3EC2.java +++ /dev/null @@ -1,224 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.dass; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author Ph Durieux - */ -public abstract class P3EC2 implements javax.ejb.EntityBean { - - private P1HomeLocal p1home = null; - private P4HomeLocal p4home = null; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId3(); - public abstract void setId3(String id3); - - public abstract String getId(); - public abstract void setId(String id); - - public abstract P1Local getP1(); - public abstract void setP1(P1Local p1); - public abstract P4Local getP4(); - public abstract void setP4(P4Local p4); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id3, String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId3(id3); - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id3, String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id3=" + id3 + " id=" + id); - try { - P1Local p1l = p1home.findByPrimaryKey(id); - setP1(p1l); - } catch (FinderException e) { - throw new CreateException("P3 cannot exist without matching P1"); - } - try { - P4PK pk4 = new P4PK(id); - P4Local p4l = p4home.findByPrimaryKey(pk4); - setP4(p4l); - } catch (FinderException e) { - throw new CreateException("P3 cannot exist without matching P4"); - } - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - p1home = (P1HomeLocal) ictx.lookup("java:comp/env/ejb/p1"); - p4home = (P4HomeLocal) ictx.lookup("java:comp/env/ejb/p4"); - } catch (NamingException e) { - throw new EJBException("Impossible to get HomeLocal:", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // --------------------------------------------------------------------- - // P3Remote Implementation - // --------------------------------------------------------------------- - - /** - * - */ - public String getP1Value() { - P1Local p1l = getP1(); - return p1l.getPf1(); - } - - public String getP4Value() { - P4Local p4l = getP4(); - return p4l.getPf4(); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P4EC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P4EC2.java deleted file mode 100644 index 8d9b2528e93b9f7e94027f8009b99f837c2c7170..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/dass/P4EC2.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.dass; - -import java.util.Collection; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author Ph Durieux - */ -public abstract class P4EC2 implements javax.ejb.EntityBean { - - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - public abstract String getPf4(); - public abstract void setPf4(String pf4); - - public abstract Collection getP3(); - public abstract void setP3(Collection p3); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id, String pf4) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - setPf4(pf4); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id, String pf4) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/family/PeopleEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/family/PeopleEC2.java deleted file mode 100644 index b86675fbacc3228d66f8649590025477e42ddf56..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/family/PeopleEC2.java +++ /dev/null @@ -1,377 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.family; - -import java.rmi.RemoteException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Bean implementation. This is an example of bean with relation between - * instances of the same bean. Each instance represents a people, the PK - * is the name, and he may have a mother, a father, and a spouse. - * @author Philippe Durieux - */ -public abstract class PeopleEC2 implements javax.ejb.EntityBean { - - private static Logger logger = null; - private EntityContext ejbContext; - private InitialContext ictx; - private Context myEnv; - private PeopleHomeLocal homeLocal = null; - private PeopleHome home = null; - - // --------------------------------------------------------------------- - // CMP fields - // --------------------------------------------------------------------- - public abstract String getName(); - public abstract void setName(String name); - - // --------------------------------------------------------------------- - // CMR fields - // --------------------------------------------------------------------- - public abstract Collection getChildren(); - public abstract void setChildren(Collection c); - - public abstract PeopleLocal getFather(); - public abstract void setFather(PeopleLocal p); - - public abstract PeopleLocal getMother(); - public abstract void setMother(PeopleLocal p); - - public abstract PeopleLocal getUnion(); - public abstract void setUnion(PeopleLocal p); - - // --------------------------------------------------------------------- - // Home operations - // --------------------------------------------------------------------- - - public java.lang.String ejbCreate(String name, String papa, String maman) throws javax.ejb.CreateException { - logger.log(BasicLevel.DEBUG, getName()); - setName(name); - return null; - } - - public void ejbPostCreate(String name, String papa, String maman) throws javax.ejb.CreateException { - logger.log(BasicLevel.DEBUG, getName()); - if (papa != null) { - try { - PeopleLocal father = homeLocal.findByPrimaryKey(papa); - setFather(father); - } catch (FinderException e) { - throw new CreateException("Father unknown"); - } - } - if (maman != null) { - try { - PeopleLocal mother = homeLocal.findByPrimaryKey(maman); - setMother(mother); - } catch (FinderException e) { - throw new CreateException("Mother unknown"); - } - } - } - - /** - * Home method. - */ - public void ejbHomeUnion(String name1, String name2) throws FinderException, RemoteException { - logger.log(BasicLevel.DEBUG, name1 + " with " + name2); - try { - PeopleLocal p1 = homeLocal.findByPrimaryKey(name1); - PeopleLocal p2 = homeLocal.findByPrimaryKey(name2); - p1.setUnion(p2); - } catch (FinderException e) { - logger.log(BasicLevel.ERROR, "Cannot find people"); - throw e; - } - } - - /** - * Home method. - */ - public void ejbHomeDivorce(String name1, String name2) throws FinderException, RemoteException { - logger.log(BasicLevel.DEBUG, name1 + " with " + name2); - try { - PeopleLocal p1 = homeLocal.findByPrimaryKey(name1); - PeopleLocal p2 = homeLocal.findByPrimaryKey(name2); - if (p1.getUnion() != p2) { - logger.log(BasicLevel.ERROR, name1 + " and " + name2 + " were not united yet"); - throw new RemoteException(name1 + " and " + name2 + " were not united yet"); - } - p1.setUnion(null); - } catch (FinderException e) { - logger.log(BasicLevel.ERROR, "Cannot find people"); - throw e; - } - } - - - // --------------------------------------------------------------------- - // EJB standard callbacks - // --------------------------------------------------------------------- - - public void setEntityContext(javax.ejb.EntityContext ctx) { - // init the logger - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, getName()); - ejbContext = ctx; - try { - // Get initial Context - ictx = new InitialContext(); - myEnv = (Context) ictx.lookup("java:comp/env"); - } catch (NamingException e) { - throw new EJBException("PeopleEC2: Cannot get filehome:" + e); - } - checkEnv("setEntityContext"); - home = (PeopleHome) ejbContext.getEJBHome(); - homeLocal = (PeopleHomeLocal) ejbContext.getEJBLocalHome(); - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, getName()); - ejbContext = null; - } - - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, getName()); - } - - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, getName()); - checkEnv("ejbLoad"); - } - - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, getName()); - checkEnv("ejbStore"); - } - - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, getName()); - checkEnv("ejbPassivate"); - } - - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, getName()); - checkEnv("ejbActivate"); - } - - // --------------------------------------------------------------------- - // Implementation of the Remote interface - // --------------------------------------------------------------------- - - /** - * Retrieve my Father, as a Remote Object. - * Mainly convert Local object to Remote Object. - */ - public People myFather() throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - People father = null; - PeopleLocal f = getFather(); - if (f == null) { - return null; - } - try { - father = home.findByPrimaryKey(f.getName()); - } catch (FinderException e) { - throw new RemoteException("Lost father"); - } - return father; - } - - /** - * Retrieve my Mother, as a Remote Object. - * Mainly convert Local object to Remote Object. - */ - public People myMother() throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - People mother = null; - PeopleLocal f = getMother(); - if (f == null) { - return null; - } - try { - mother = home.findByPrimaryKey(f.getName()); - } catch (FinderException e) { - throw new RemoteException("Lost mother"); - } - return mother; - } - - /** - * Retrieve my children, as a Collection of Remote Objects. - * Mainly convert Local objects to Remote Objects. - */ - public Collection myChildren() throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - Collection ret = new ArrayList(); - Collection c = getChildren(); - if (c.size() == 0) { - // If no children, maybe it's because I'm the father. - // In this case, must use a finder method (uni-directional relation) - try { - c = homeLocal.findChildren(getName()); - } catch (FinderException e) { - throw new RemoteException("Cannot get children"); - } - } - for (Iterator i = c.iterator(); i.hasNext(); ) { - PeopleLocal p = (PeopleLocal) i.next(); - try { - People pr = home.findByPrimaryKey(p.getName()); - ret.add(pr); - } catch (FinderException e) { - throw new RemoteException("Lost child"); - } - } - return ret; - } - - /** - * Return true if not married - */ - public boolean isSingle() throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - return (getUnion() == null); - } - - /** - * Return true if no father - */ - public boolean hasNoFather() throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - return (getFather() == null); - } - - /** - * Return true if no mother - */ - public boolean hasNoMother() throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - return (getMother() == null); - } - - /** - * @return the People we are married with - */ - public People mySpouse() throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - People ret = null; - PeopleLocal f = getUnion(); - if (f == null) { - return null; - } - try { - ret = home.findByPrimaryKey(f.getName()); - } catch (FinderException e) { - throw new RemoteException("Lost spouse"); - } - return ret; - } - - public int kidNumber() throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - int ret = getChildren().size(); - if (ret == 0) { - // maybe I'm the father... - try { - ret = homeLocal.findChildren(getName()).size(); - } catch (FinderException e) { - throw new RemoteException("Cannot get my children"); - } - } - return ret; - } - - /** - * @return true if orphan - */ - public boolean isOrphan() throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - return (getMother() == null && getFather() == null); - } - - /** - * @return true if is brother or sister with other People - * @param c name of the other people. - */ - public boolean brotherSisterOf(String c) throws RemoteException { - logger.log(BasicLevel.DEBUG, getName()); - try { - PeopleLocal p = homeLocal.findByPrimaryKey(c); - if (getMother() != null && p.getMother() == getMother()) { - return true; - } - if (getFather() != null && p.getFather() == getFather()) { - return true; - } - } catch (FinderException e) { - } - return false; - } - - // --------------------------------------------------------------------- - // private methods - // --------------------------------------------------------------------- - - /** - * Check environment variables - */ - void checkEnv(String method) { - try { - String value = (String) myEnv.lookup("myname"); - if (!value.equals("myentity")) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup failed: myname=" + value); - throw new EJBException("PeopleEC2 1: " + method); - } - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, ": myEnv.lookup raised exception:\n" + e); - throw new EJBException("PeopleEC2 2: " + method); - } - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnb/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnb/AEC2.java deleted file mode 100644 index 832674d8a05b94ad008cafaa7311b906c5ffc8f7..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnb/AEC2.java +++ /dev/null @@ -1,281 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.mnb; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - - public void assignB(Collection c) throws FinderException { - ArrayList al; - if (c==null) - al = new ArrayList(); - else { - if (c.size()==-1) - al = new ArrayList(); - else { - al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - } - } - setB(al); - } - public void assignBInNewTx(Collection c) throws FinderException { - assignB(c); - } - - public Collection retrieveB() { - Collection bs = getB(); - ArrayList result ; - if (bs.size()==-1) - result = new ArrayList(); - else result = new ArrayList(bs.size()); - - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((BLocal) it.next()).getPrimaryKey()); - return result; - } - - public Collection retrieveBInNewTx() { - return retrieveB(); - } - - public void addInB(String pkb) throws FinderException { - getB().add(bhl.findByPrimaryKey(pkb)); - } - public void addInBInNewTx(String pkb) throws FinderException { - addInB(pkb); - } - - public void addAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - getB().addAll(al); - } - public void addAllInBInNewTx(Collection pkbs) throws FinderException { - addAllInB(pkbs); - } - - public void removeFromB(String pkb) throws FinderException { - getB().remove(bhl.findByPrimaryKey(pkb)); - } - public void removeFromBInNewTx(String pkb) throws FinderException { - removeFromB(pkb); - } - - public void clearB() { - getB().clear(); - } - - public void clearBInNewTx() { - clearB(); - } - - public boolean containAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - return getB().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean B defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInB(String pkb) throws FinderException { - return (getB().contains(bhl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - public abstract Collection getB(); - - public abstract void setB(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnb/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnb/BEC2.java deleted file mode 100644 index db8c0da147ac3d8362f1eb6b644de1c3c24e5c7a..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnb/BEC2.java +++ /dev/null @@ -1,283 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.mnb; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; -/** - * @author S.Chassande-Barrioz - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - - private AHomeLocal ahl = null; - - public void m1(){ - } - - public void assignA(Collection c) throws FinderException { - ArrayList al; - if (c==null) - al = new ArrayList(); - else { - if (c.size()==-1) - al = new ArrayList(); - else { - al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) { - al.add(ahl.findByPrimaryKey((String) it.next())); - } - } - } - setA(al); - } - - public void assignAInNewTx(Collection c) throws FinderException { - assignA(c); - } - - public Collection retrieveA() { - Collection bs = getA(); - ArrayList result ; - if (bs.size()==-1) - result = new ArrayList(); - else result = new ArrayList(bs.size()); - - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((ALocal) it.next()).getPrimaryKey()); - return result; - } - - public Collection retrieveAInNewTx() { - return retrieveA(); - } - - public void addInA(String pkb) throws FinderException { - getA().add(ahl.findByPrimaryKey(pkb)); - } - public void addInAInNewTx(String pkb) throws FinderException { - addInA(pkb); - } - - public void addAllInA(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(ahl.findByPrimaryKey((String) it.next())); - getA().addAll(al); - } - public void addAllInAInNewTx(Collection pkbs) throws FinderException { - addAllInA(pkbs); - } - - public void removeFromA(String pkb) throws FinderException { - getA().remove(ahl.findByPrimaryKey(pkb)); - } - public void removeFromAInNewTx(String pkb) throws FinderException { - removeFromA(pkb); - } - - public void clearA() { - getA().clear(); - } - - public void clearAInNewTx() { - clearA(); - } - - public boolean containAllInA(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(ahl.findByPrimaryKey((String) it.next())); - return getA().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean A defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInA(String pkb) throws FinderException { - return (getA().contains(ahl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - public abstract Collection getA(); - - public abstract void setA(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - ahl = (AHomeLocal) ictx.lookup("java:comp/env/ejb/a"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnu/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnu/AEC2.java deleted file mode 100644 index 22a404b3bdd20680f7823508720c52a968fd50bc..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnu/AEC2.java +++ /dev/null @@ -1,292 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.mnu; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1() { - } - - public void assignB(Collection c) throws FinderException { - ArrayList al; - if (c == null) { - al = new ArrayList(); - } else { - if (c.size() == -1) { - al = new ArrayList(); - } else { - al = new ArrayList(c.size()); - for (Iterator it = c.iterator(); it.hasNext();) { - al.add(bhl.findByPrimaryKey((String) it.next())); - } - } - } - setB(al); - } - - public void assignBInNewTx(Collection c) throws FinderException { - assignB(c); - } - - public Collection retrieveB() { - Collection bs = getB(); - ArrayList result; - if (bs.size() == -1) { - result = new ArrayList(); - } else { - result = new ArrayList(bs.size()); - } - - for (Iterator it = bs.iterator(); it.hasNext();) { - result.add(((BLocal) it.next()).getPrimaryKey()); - } - return result; - } - - public Collection retrieveBInNewTx() { - return retrieveB(); - } - - public void addInB(String pkb) throws FinderException { - getB().add(bhl.findByPrimaryKey(pkb)); - } - - public void addInBInNewTx(String pkb) throws FinderException { - addInB(pkb); - } - - public void addAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) { - al.add(bhl.findByPrimaryKey((String) it.next())); - } - getB().addAll(al); - } - - public void addAllInBInNewTx(Collection pkbs) throws FinderException { - addAllInB(pkbs); - } - - public void removeFromB(String pkb) throws FinderException { - getB().remove(bhl.findByPrimaryKey(pkb)); - } - - public void removeFromBInNewTx(String pkb) throws FinderException { - removeFromB(pkb); - } - - public void clearB() { - getB().clear(); - } - - public void clearBInNewTx() { - clearB(); - } - - public boolean containAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for (Iterator it = pkbs.iterator(); it.hasNext();) { - al.add(bhl.findByPrimaryKey((String) it.next())); - } - return getB().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean B defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throws FinderException if the primary key does not match to a bean. - */ - public boolean containInB(String pkb) throws FinderException { - return (getB().contains(bhl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - public abstract Collection getB(); - - public abstract void setB(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - protected static Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnu/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnu/BEC2.java deleted file mode 100644 index 8be2cbfb71a07336ee0cd8fc3c260d13a96b1317..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mnu/BEC2.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.mnu; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.RemoveException; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - public void m1(){ - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mou/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mou/AEC2.java deleted file mode 100644 index 0beda505b6f68c2d88d79e20010d787972f11395..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mou/AEC2.java +++ /dev/null @@ -1,281 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.mou; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - - public void assignB(String c) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - if (c != null) { - BLocal bl = null; - bl = bhl.findByPrimaryKey(c); - setB(bl); - } else - setB(null); - } - - public void assignBInNewTx(String c) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - assignB(c); - } - - public String retrieveB() { - BLocal lejbB = getB(); - if (lejbB == null) { - logger.log(BasicLevel.DEBUG, "return null"); - return null; - } else { - logger.log(BasicLevel.DEBUG, "return " + lejbB.getId()); - return lejbB.getId(); - } - } - - public String retrieveBInNewTx() { - logger.log(BasicLevel.DEBUG, ""); - return retrieveB(); - } - - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - public abstract BLocal getB(); - - public abstract void setB(BLocal bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id, String idb) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id, String idb) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - try { - assignB(idb); - } catch (FinderException e) { - throw new CreateException("Bad arg: " + idb); - } - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id, BLocal b) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id, BLocal b) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - setB(b); - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mou/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mou/BEC2.java deleted file mode 100644 index 004558bce0760943f4c2f2ce55c66b285e16a76d..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mou/BEC2.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.mou; - - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.RemoveException; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - public void m1(){ - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mou/jonas-mou.xml b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mou/jonas-mou.xml deleted file mode 100644 index 18c5fcd2097193bd317c865bd726a1e9035cf92c..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/mou/jonas-mou.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - AEjb - relation_mou_AHome - removeall - container-serialized - - jdbc_1 - JT2_MOU_A - - id - c_ida - - - - - - BEjb - relation_mou_BHome - removeall - container-serialized - - jdbc_1 - JT2_MOU_B - - id - c_idb - - - - - - AtxEjb - relation_mou_AtxHome - removeall - container-read-write - - jdbc_1 - JT2_MOU_Atx - - id - c_ida - - - - - - BtxEjb - relation_mou_BtxHome - removeall - container-read-write - - jdbc_1 - JT2_MOU_Btx - - id - c_idb - - - - - - A1Ejb - relation_mou_A1Home - removeall - container-serialized - - jdbc_1 - JT2_MOU_A1 - - id - c_ida - - - - - - B1Ejb - relation_mou_B1Home - removeall - container-serialized - - jdbc_1 - JT2_MOU_B1 - - id - c_idb - - - - - - a2b - - a_2_b - - cfk_idb - - - - - - a12b1 - - a1_2_b1 - - cfk_idb - - - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omb/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omb/AEC2.java deleted file mode 100644 index 25c7ba82075e631b173fed397d64f0aa6ee08909..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omb/AEC2.java +++ /dev/null @@ -1,321 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.omb; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * @author S.Chassande-Barrioz, Helene Joanin - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - - public void assignB(Collection c) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - ArrayList al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - setB(al); - } - public void assignBInNewTx(Collection c) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - assignB(c); - } - - public Collection retrieveB() { - logger.log(BasicLevel.DEBUG, ""); - Collection bs = getB(); - ArrayList result = new ArrayList(bs.size()); - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((BLocal) it.next()).getPrimaryKey()); - return result; - } - public Collection retrieveBInNewTx() { - logger.log(BasicLevel.DEBUG, ""); - return retrieveB(); - } - public Collection retrieveBisB() { - logger.log(BasicLevel.DEBUG, ""); - // To reproduce the bug #300156: Error on creating Array from cmr-collection - // same as retrieveB(), except the bs initialization - List bs = new ArrayList(getB()); - ArrayList result = new ArrayList(bs.size()); - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((BLocal) it.next()).getPrimaryKey()); - return result; - } - - public void addInB(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - getB().add(bhl.findByPrimaryKey(pkb)); - } - public void addInBInNewTx(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - addInB(pkb); - } - - public void addNewB(String pkb) throws CreateException, FinderException { - logger.log(BasicLevel.DEBUG, ""); - BLocal bl = bhl.create(pkb); - getB().add(bl); - bhl.findByName(pkb, getId()); - } - - public void addAllInB(Collection pkbs) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - getB().addAll(al); - } - public void addAllInBInNewTx(Collection pkbs) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - addAllInB(pkbs); - } - - public void removeFromB(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - getB().remove(bhl.findByPrimaryKey(pkb)); - } - public void removeFromBInNewTx(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - removeFromB(pkb); - } - - public void clearB() { - logger.log(BasicLevel.DEBUG, ""); - getB().clear(); - } - - public void clearBInNewTx() { - logger.log(BasicLevel.DEBUG, ""); - clearB(); - } - - public boolean containAllInB(Collection pkbs) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - return getB().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean B defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInB(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - return (getB().contains(bhl.findByPrimaryKey(pkb))); - } - - /** - * This method check it isn't allowed to reset the pk - * and that the container throw the java.lang.IllegalStateException. - * It returns true if ok. - * See spec 2.0, chapter 10.3.5, page 134 - */ - public boolean testResetPkForbidden(String pka) { - logger.log(BasicLevel.DEBUG, ""); - boolean ret = false; - try { - setId(pka); - } catch (IllegalStateException e) { - ret = true; - } - return ret; - } - - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - - // This cmp field with an utility class type Product - // to test that this Product class can be resolved in the JORM adapter - public abstract Product getProduct(); - public abstract void setProduct(Product p); - - public abstract Collection getB(); - public abstract void setB(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - setProduct(new Product()); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omb/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omb/BEC2.java deleted file mode 100644 index b7117127d69684a389d7bb273494a52983b2ee46..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omb/BEC2.java +++ /dev/null @@ -1,243 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.omb; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -/** - * @author S.Chassande-Barrioz, Helene Joanin - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - - private AHomeLocal ahl = null; - - public void m1() { - } - - public void testSetCmrWithDeleted() throws EJBException { - logger.log(BasicLevel.DEBUG, ""); - ALocal ax9; - try { - ax9 = ahl.create("ax9"); - ax9.remove(); - } catch (Exception e) { - throw new EJBException("Initial state creation problem: " + e); - } - try { - this.setA(ax9); - throw new EJBException("entity was not deleted, expected IllegalArgumentException"); - } catch (IllegalArgumentException e) { - // Pass - } catch (Exception e) { - throw new EJBException("Caugth unexpected exception: " + e); - } - } - - public void assignA(String pkA) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + pkA); - ALocal a = null; - if (pkA != null) { - a = ahl.findByPrimaryKey(pkA); - } - logger.log(BasicLevel.DEBUG, "assign:" + a); - setA(a); - } - - public void assignAInNewTx(String pkA) throws FinderException { - assignA(pkA); - } - - public String retrieveA() { - if (getA() == null) { - logger.log(BasicLevel.DEBUG, "return null"); - return null; - } - logger.log(BasicLevel.DEBUG, "return : " + getA().getPrimaryKey()); - return (String) (getA().getPrimaryKey()); - } - - public String retrieveAInNewTx() { - return retrieveA(); - } - - public boolean equalsRelA(String pka) throws FinderException { - return (pka == retrieveA()); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - - // This cmp field with an utility class type Product - // to test that this Product class can be resolved in the JORM adapter - public abstract Product getProduct(); - public abstract void setProduct(Product p); - - - public abstract ALocal getA(); - public abstract void setA(ALocal a); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - setProduct(new Product()); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method on - * an instance after the instance has been created. This method is called in - * an unspecified transaction context. - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - ahl = (AHomeLocal) ictx.lookup("java:comp/env/ejb/a"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. This is the last method that the container - * invokes on the instance. The Java garbage collector will eventually - * invoke the finalize() method on the instance. This method is called in an - * unspecified transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object that is - * currently associated with the instance. This method is invoked when a - * client invokes a remove operation on the enterprise Bean's home interface - * or the EJB object's remote interface. This method transitions the - * instance from the ready state to the pool of available instances. This - * method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of - * the object. - * @throws EJBException - Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. This method - * always executes in the proper transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. This method always - * executes in the proper transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - setA(null); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of the - * pool of available instances to become associated with a specific EJB - * object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omb/FrontSFR.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omb/FrontSFR.java deleted file mode 100644 index 2d71449dbfb560a3287650b7371545a067e27732..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omb/FrontSFR.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.omb; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * Frontal Session bean. - */ -public class FrontSFR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - private AHomeLocal ahl = null; - private BHomeLocal bhl = null; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - ahl = (AHomeLocal) ictx.lookup("java:comp/env/ejb/a"); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbCreate(String pka, String pkb) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - try { - ALocal al = ahl.create(pka); - BLocal bl = bhl.create(pkb); - al.getB().add(bl); - bhl.findByName(pkb, al.getId()); - } catch (Exception e) { - throw new CreateException("ejbCreate failed " + e); - } - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Front implementation - // ------------------------------------------------------------------ - - /** - * method1 - */ - public void method1() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * method2 - */ - public void method2(java.lang.String s) { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * Ensure the javax.ejb.EJBException is thrown when trying - * to invoke an accessor method on a deleted entitybean object - */ - public void testRemove1() { - logger.log(BasicLevel.DEBUG, ""); - ALocal ax9; - try { - ax9 = ahl.create("ax9"); - ax9.remove(); - } catch (Exception e) { - throw new EJBException("Initial state creation problem: " + e); - } - try { - ax9.getId(); - throw new EJBException("entity was not deleted, expected EJBException"); - } catch (EJBException e) { - // Pass - } catch (Exception e) { - throw new EJBException("Caught unexpected exception: " + e); - } - } - - /** - * Ensure the IllegalArgumentException is thrown when trying - * to set a collection cmr-field to a wrong relationship type - */ - public void testSetCmrWithDeleted() { - logger.log(BasicLevel.DEBUG, ""); - BLocal b0; - try { - b0 = bhl.findByPrimaryKey("b0"); - } catch (Exception e) { - throw new EJBException("Initial state creation problem: " + e); - } - try { - b0.testSetCmrWithDeleted(); - } catch (Exception e) { - throw new EJBException("Caugth unexpected exception: " + e); - } - } - - /** - * Ensure the IllegalArgumentException is thrown when trying - * to set a collection cmr-field to a wrong relationship type - */ - public void testSetCmrWithWrongType() { - logger.log(BasicLevel.DEBUG, ""); - ALocal a0; - try { - a0 = ahl.findByPrimaryKey("a0"); - } catch (FinderException e) { - throw new EJBException("Initial state creation problem: " + e); - } - try { - a0.getB().add(a0); - } catch (IllegalArgumentException e) { - // Pass - return; - } catch (Exception e) { - throw new EJBException("Caugth unexpected exception: " + e); - } - throw new EJBException("Expected IllegalArgumentException"); - } -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omu/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omu/AEC2.java deleted file mode 100644 index 526735418f4d1e94e311c56537c47eb92f44096d..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omu/AEC2.java +++ /dev/null @@ -1,281 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.omu; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - - public void assignB(Collection c) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - ArrayList al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - setB(al); - } - public void assignBInNewTx(Collection c) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - assignB(c); - } - - public Collection retrieveB() { - logger.log(BasicLevel.DEBUG, ""); - Collection bs = getB(); - ArrayList result = new ArrayList(bs.size()); - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((BLocal) it.next()).getPrimaryKey()); - return result; - } - public Collection retrieveBInNewTx() { - logger.log(BasicLevel.DEBUG, ""); - return retrieveB(); - } - - public void addInB(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - getB().add(bhl.findByPrimaryKey(pkb)); - } - public void addInBInNewTx(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - addInB(pkb); - } - - public void addAllInB(Collection pkbs) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - getB().addAll(al); - } - public void addAllInBInNewTx(Collection pkbs) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - addAllInB(pkbs); - } - - public void removeFromB(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - getB().remove(bhl.findByPrimaryKey(pkb)); - } - public void removeFromBInNewTx(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - removeFromB(pkb); - } - - public void clearB() { - logger.log(BasicLevel.DEBUG, ""); - getB().clear(); - } - - public void clearBInNewTx() { - logger.log(BasicLevel.DEBUG, ""); - clearB(); - } - - public boolean containAllInB(Collection pkbs) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - return getB().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean B defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInB(String pkb) throws FinderException { - logger.log(BasicLevel.DEBUG, ""); - return (getB().contains(bhl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - public abstract Collection getB(); - - public abstract void setB(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omu/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omu/BEC2.java deleted file mode 100644 index ea85cabc72d4b829d06768e82e32ae3f4e9569e2..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/omu/BEC2.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.omu; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.RemoveException; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - public void m1(){ - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/AEC2.java deleted file mode 100644 index ff629f419a8c46a8f3e605e135272e5bc9f8f3c6..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/AEC2.java +++ /dev/null @@ -1,222 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.oob; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - - public void assignB(String c) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + c); - if (c != null) { - BLocal bl = null; - bl = bhl.findByPrimaryKey(c); - setB(bl); - } else - setB(null); - } - public void assignBInNewTx(String c) throws FinderException { - assignB(c); - } - - public String retrieveB() { - BLocal lejbB = getB(); - if (lejbB == null) { - logger.log(BasicLevel.DEBUG, "return null"); - return null; - } else { - logger.log(BasicLevel.DEBUG, "return " + lejbB.getId()); - return lejbB.getId(); - } - } - - public String retrieveBInNewTx() { - return retrieveB(); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - - public abstract BLocal getB(); - public abstract void setB(BLocal bl); - - public abstract BLocal getBBis(); - public abstract void setBBis(BLocal bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/BEC2.java deleted file mode 100644 index 6e448ec21f7c096cbace6b1099273ab2d1b68470..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/BEC2.java +++ /dev/null @@ -1,234 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.oob; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.RemoveException; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - - private AHomeLocal ahl = null; - - public void m1() { - } - - public void testSetCmrWithDeleted() throws EJBException { - logger.log(BasicLevel.DEBUG, ""); - ALocal ax9; - try { - ax9 = ahl.create("ax9"); - ax9.remove(); - } catch (Exception e) { - throw new EJBException("Initial state creation problem: " + e); - } - try { - this.setA(ax9); - throw new EJBException("entity was not deleted, expected IllegalArgumentException"); - } catch (IllegalArgumentException e) { - // Pass - } catch (Exception e) { - throw new EJBException("Unexpected exception at 1st access: " + e); - } - try { - this.setA(ax9); - throw new EJBException("entity was not deleted, expected IllegalArgumentException"); - } catch (IllegalArgumentException e) { - // Pass - } catch (Exception e) { - throw new EJBException("Unexpected exception at 2nd access: " + e); - } - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - ahl = (AHomeLocal) ictx.lookup("java:comp/env/ejb/a"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public abstract ALocal getA(); - public abstract void setA(ALocal al); - - public abstract ALocal getABis(); - public abstract void setABis(ALocal al); - - public String retrieveA() { - ALocal lejbA = getA(); - if (lejbA==null) - return null; - else - return lejbA.getId(); - } - - public String retrieveAInNewTx() { - return retrieveA(); - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/BHomeLocal.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/BHomeLocal.java deleted file mode 100644 index 3e7b800231386a5391855531f3f98899dfc30ec1..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/BHomeLocal.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.oob; - -import javax.ejb.EJBLocalHome; -import javax.ejb.CreateException; -import javax.ejb.FinderException; -import java.util.Collection; - -/** - * @author S.Chassande-Barrioz - */ -public interface BHomeLocal extends EJBLocalHome { - - BLocal create(String id) throws CreateException; - - BLocal findByPrimaryKey(String pk) throws FinderException; - BLocal findByName(String name, String project) throws FinderException; - Collection findAll() throws FinderException; -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/BLocal.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/BLocal.java deleted file mode 100644 index 1b96d81648b1c0258c8b32fd48c5ed194053c720..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/BLocal.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.oob; - -import javax.ejb.EJBLocalObject; - -/** - * @author S.Chassande-Barrioz - */ -public interface BLocal extends EJBLocalObject { - - String getId(); - void m1(); - void testSetCmrWithDeleted(); - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/Front.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/Front.java deleted file mode 100644 index 5570e652db52a76bfb3e3c7a58f901e4a52bf03e..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/Front.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.oob; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -/** - * Frontal2 remote interface - */ -public interface Front extends EJBObject { - public void testRemove1() throws RemoteException; - public void testSetCmrWithDeleted() throws RemoteException; -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/FrontHome.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/FrontHome.java deleted file mode 100644 index 97e416081032eb9648726803bbc3daa89ccca1ad..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/FrontHome.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.oob; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * Home interface for the bean Front - */ -public interface FrontHome extends EJBHome { - Front create() throws CreateException, RemoteException; - Front create(String p, String r) throws CreateException, RemoteException; -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/FrontSFR.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/FrontSFR.java deleted file mode 100644 index 1197b5b102d78f3f34f5a39ab4f43f1fdf9bbee7..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/FrontSFR.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.oob; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; -import org.ow2.jonas.lib.util.Log; - - -/** - * Frontal Session bean. - */ -public class FrontSFR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - private AHomeLocal ahl = null; - private BHomeLocal bhl = null; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - ahl = (AHomeLocal) ictx.lookup("java:comp/env/ejb/a"); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbCreate(String pka, String pkb) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - try { - ALocal al = ahl.create(pka); - BLocal bl = bhl.create(pkb); - al.setB(bl); - bhl.findByName(pkb, al.getId()); - } catch (Exception e) { - throw new CreateException("ejbCreate failed " + e); - } - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Front implementation - // ------------------------------------------------------------------ - - /** - * Ensure the javax.ejb.EJBException is thrown when trying - * to invoke an accessor method on a deleted entitybean object - */ - public void testRemove1() { - logger.log(BasicLevel.DEBUG, ""); - ALocal ax9; - try { - ax9 = ahl.create("ax9"); - ax9.remove(); - } catch (Exception e) { - throw new EJBException("Initial state creation problem: " + e); - } - try { - ax9.getId(); - throw new EJBException("entity was not deleted, expected EJBException"); - } catch (EJBException e) { - // Pass - } catch (Exception e) { - throw new EJBException("Caught unexpected exception: " + e); - } - } - - /** - * Ensure the IllegalArgumentException is thrown when trying - * to set a collection cmr-field to a wrong relationship type - */ - public void testSetCmrWithDeleted() { - logger.log(BasicLevel.DEBUG, ""); - BLocal b0; - try { - b0 = bhl.findByPrimaryKey("b0"); - } catch (Exception e) { - throw new EJBException("Initial state creation problem: " + e); - } - try { - b0.testSetCmrWithDeleted(); - } catch (Exception e) { - throw new EJBException("Caugth bad exception: " + e); - } - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/jonas-oob.xml b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/jonas-oob.xml deleted file mode 100644 index b3792a105e0f7d74649e86205072140d7908c07c..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/jonas-oob.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - FrontSFR - relation_oob_FrontHome - 2 - - - - AEjb - relation_oob_AHome - removeall - container-serialized - false - - jdbc_1 - JT2_OOB_A - - id - c_ida - - - - - - BEjb - relation_oob_BHome - removeall - container-serialized - false - - jdbc_1 - JT2_OOB_B - - id - c_idb - - - - - - AtxEjb - relation_oob_AtxHome - removeall - container-read-write - - jdbc_1 - JT2_OOB_Atx - - id - c_ida - - - - - - BtxEjb - relation_oob_BtxHome - removeall - container-read-write - - jdbc_1 - JT2_OOB_Btx - - id - c_idb - - - - - - a2b - - b_2_a - - cfk_ida - - - - - - atx2btx - - btx_2_atx - - cfk_ida - - - - - - bis_a2b - - bis_b_2_a - - cfk_ida_bis - - - - - - bis_a2btx - - bis_b_2_atx - - cfk_ida_bis - - - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/oob.xml b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/oob.xml deleted file mode 100644 index 91e0e8221467ee1d21fcb1ee77e5b4ddb99e4f04..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oob/oob.xml +++ /dev/null @@ -1,339 +0,0 @@ - - - - - - Beans used to test a relation One-One bidirectional - - - - oob/FrontSFR - FrontSFR - org.objectweb.jonas.jtests.beans.relation.oob.FrontHome - org.objectweb.jonas.jtests.beans.relation.oob.Front - org.objectweb.jonas.jtests.beans.relation.oob.FrontSFR - Stateful - Container - - ejb/a - Entity - org.objectweb.jonas.jtests.beans.relation.oob.AHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.ALocal - AEjb - - - ejb/b - Entity - org.objectweb.jonas.jtests.beans.relation.oob.BHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.BLocal - BEjb - - - - - oob/A - AEjb - org.objectweb.jonas.jtests.beans.relation.oob.AHomeRemote - org.objectweb.jonas.jtests.beans.relation.oob.ARemote - org.objectweb.jonas.jtests.beans.relation.oob.AHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.ALocal - org.objectweb.jonas.jtests.beans.relation.oob.AEC2 - Container - java.lang.String - true - 2.x - jt2_oob_A - - id - - id - - ejb/b - Entity - org.objectweb.jonas.jtests.beans.relation.oob.BHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.BLocal - BEjb - - - - findAll - - - SELECT OBJECT(a) FROM jt2_oob_A a - - - - - oob/B - BEjb - org.objectweb.jonas.jtests.beans.relation.oob.BHomeRemote - org.objectweb.jonas.jtests.beans.relation.oob.BRemote - org.objectweb.jonas.jtests.beans.relation.oob.BHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.BLocal - org.objectweb.jonas.jtests.beans.relation.oob.BEC2 - Container - java.lang.String - true - 2.x - jt2_oob_B - - id - - id - - ejb/a - Entity - org.objectweb.jonas.jtests.beans.relation.oob.AHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.ALocal - AEjb - - - - findByName - - java.lang.String - java.lang.String - - - SELECT OBJECT(b) FROM jt2_oob_B b WHERE b.id = ?1 AND b.a.id = ?2 - - - - findAll - - - SELECT OBJECT(b) FROM jt2_oob_B b - - - - - oob/Atx - AtxEjb - org.objectweb.jonas.jtests.beans.relation.oob.AHomeRemote - org.objectweb.jonas.jtests.beans.relation.oob.ARemote - org.objectweb.jonas.jtests.beans.relation.oob.AHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.ALocal - org.objectweb.jonas.jtests.beans.relation.oob.AEC2 - Container - java.lang.String - true - 2.x - jt2_oob_Atx - - id - - id - - ejb/b - Entity - org.objectweb.jonas.jtests.beans.relation.oob.BHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.BLocal - BtxEjb - - - - findAll - - - SELECT OBJECT(a) FROM jt2_oob_Atx a - - - - - oob/Btx - BtxEjb - org.objectweb.jonas.jtests.beans.relation.oob.BHomeRemote - org.objectweb.jonas.jtests.beans.relation.oob.BRemote - org.objectweb.jonas.jtests.beans.relation.oob.BHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.BLocal - org.objectweb.jonas.jtests.beans.relation.oob.BEC2 - Container - java.lang.String - true - 2.x - jt2_oob_Btx - - id - - id - - ejb/a - Entity - org.objectweb.jonas.jtests.beans.relation.oob.AHomeLocal - org.objectweb.jonas.jtests.beans.relation.oob.ALocal - AtxEjb - - - - findByName - - java.lang.String - java.lang.String - - - SELECT OBJECT(b) FROM jt2_oob_Btx b WHERE b.id = ?1 AND b.a.id = ?2 - - - - findAll - - - SELECT OBJECT(b) FROM jt2_oob_Btx b - - - - - - - a2b - - a_2_b - - One - - AEjb - - - b - - - - - - b_2_a - One - - BEjb - - - a - - - - - - atx2btx - - atx_2_btx - - One - - AtxEjb - - - b - - - - - - btx_2_atx - One - - BtxEjb - - - a - - - - - - bis_a2b - - bis_a_2_b - One - - AEjb - - - bBis - - - - - bis_b_2_a - One - - BEjb - - - aBis - - - - - - bis_a2btx - - bis_a_2_btx - One - - AtxEjb - - - bBis - - - - - bis_b_2_atx - One - - BtxEjb - - - aBis - - - - - - - - AEjb* - BEjb* - Supports - - - - FrontSFR - * - - AtxEjb* - BtxEjb* - Required - - - AEjbassignBInNewTx - AEjbretrieveBInNewTx - BEjbretrieveAInNewTx - RequiresNew - - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oou/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oou/AEC2.java deleted file mode 100644 index 2807ef3637b90307649630e41ae724386029e031..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oou/AEC2.java +++ /dev/null @@ -1,226 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.oou; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - - public void assignB(String c) throws FinderException { - if (c != null) { - BLocal bl = null; - bl = bhl.findByPrimaryKey(c); - setB(bl); - } else - setB(null); - } - public void assignBInNewTx(String c) throws FinderException { - assignB(c); - } - - public String retrieveB() { - BLocal lejbB = getB(); - if (lejbB==null) - return null; - else - return lejbB.getId(); - } - - public String retrieveBInNewTx() { - return retrieveB(); - } - - public void setValueInB(int val) { - getB().setValue(val); - } - - public int getValueInB() { - return getB().getValue(); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - public abstract BLocal getB(); - - public abstract void setB(BLocal bl); - - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oou/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oou/BEC2.java deleted file mode 100644 index 5bb97c0e8a054f29af15949e5b56e0256fbc9365..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/oou/BEC2.java +++ /dev/null @@ -1,178 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.oou; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.RemoveException; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - public void m1(){ - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - public abstract int getValue(); - public abstract void setValue(int v); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - setValue(10); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkcomp/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkcomp/AEC2.java deleted file mode 100644 index 70e0727d6787204a7aba2ab525ccd97cc526265e..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkcomp/AEC2.java +++ /dev/null @@ -1,288 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.pkcomp; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; - -/** - * @author J.Camilleri - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - public APK getId() { - return (APK) ejbContext.getPrimaryKey(); - } - - public void assignB(Collection c) throws FinderException { - ArrayList al; - if (c==null) - al = new ArrayList(); - else { - if (c.size()==-1) - al = new ArrayList(); - else { - al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((BPK) it.next())); - } - } - setB(al); - } - public void assignBInNewTx(Collection c) throws FinderException { - assignB(c); - } - - public Collection retrieveB() { - Collection bs = getB(); - ArrayList result ; - if (bs.size()==-1) - result = new ArrayList(); - else result = new ArrayList(bs.size()); - - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((BLocal) it.next()).getPrimaryKey()); - return result; - } - - public Collection retrieveBInNewTx() { - return retrieveB(); - } - - public void addInB(BPK pkb) throws FinderException { - getB().add(bhl.findByPrimaryKey(pkb)); - } - public void addInBInNewTx(BPK pkb) throws FinderException { - addInB(pkb); - } - - public void addAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((BPK) it.next())); - getB().addAll(al); - } - public void addAllInBInNewTx(Collection pkbs) throws FinderException { - addAllInB(pkbs); - } - - public void removeFromB(BPK pkb) throws FinderException { - getB().remove(bhl.findByPrimaryKey(pkb)); - } - public void removeFromBInNewTx(BPK pkb) throws FinderException { - removeFromB(pkb); - } - - public void clearB() { - getB().clear(); - } - - public void clearBInNewTx() { - clearB(); - } - - public boolean containAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((BPK) it.next())); - return getB().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean B defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInB(BPK pkb) throws FinderException { - return (getB().contains(bhl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getIda1(); - - public abstract int getIda2(); - - public abstract void setIda1(String id); - - public abstract void setIda2(int id); - - public abstract Collection getB(); - - public abstract void setB(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String ida1, int ida2) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setIda1(ida1); - setIda2(ida2); - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String ida1, int ida2) throws CreateException { - logger.log(BasicLevel.DEBUG, "ida1=" + ida1 + " / ida2=" + ida2); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkcomp/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkcomp/BEC2.java deleted file mode 100644 index 6ab569c0e5902e1c33d7b03cf4e95b5875fcf809..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkcomp/BEC2.java +++ /dev/null @@ -1,291 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.pkcomp; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; -/** - * @author J.Camilleri - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - - private AHomeLocal ahl = null; - - public void m1(){ - } - - public BPK getId() { - return (BPK) ejbContext.getPrimaryKey(); - } - - public void assignA(Collection c) throws FinderException { - ArrayList al; - if (c==null) - al = new ArrayList(); - else { - if (c.size()==-1) - al = new ArrayList(); - else { - al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) { - al.add(ahl.findByPrimaryKey((APK) it.next())); - } - } - } - setA(al); - } - - public void assignAInNewTx(Collection c) throws FinderException { - assignA(c); - } - - public Collection retrieveA() { - Collection bs = getA(); - ArrayList result ; - if (bs.size()==-1) - result = new ArrayList(); - else result = new ArrayList(bs.size()); - - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((ALocal) it.next()).getPrimaryKey()); - return result; - } - - public Collection retrieveAInNewTx() { - return retrieveA(); - } - - public void addInA(APK pkb) throws FinderException { - getA().add(ahl.findByPrimaryKey(pkb)); - } - public void addInAInNewTx(APK pkb) throws FinderException { - addInA(pkb); - } - - public void addAllInA(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(ahl.findByPrimaryKey((APK) it.next())); - getA().addAll(al); - } - public void addAllInAInNewTx(Collection pkbs) throws FinderException { - addAllInA(pkbs); - } - - public void removeFromA(APK pkb) throws FinderException { - getA().remove(ahl.findByPrimaryKey(pkb)); - } - public void removeFromAInNewTx(APK pkb) throws FinderException { - removeFromA(pkb); - } - - public void clearA() { - getA().clear(); - } - - public void clearAInNewTx() { - clearA(); - } - - public boolean containAllInA(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(ahl.findByPrimaryKey((APK) it.next())); - return getA().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean A defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInA(APK pkb) throws FinderException { - return (getA().contains(ahl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getIdb1(); - - public abstract int getIdb2(); - - public abstract void setIdb1(String id); - - public abstract void setIdb2(int id); - - public abstract Collection getA(); - - public abstract void setA(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String idb1, int idb2) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setIdb1(idb1); - setIdb2(idb2); - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - ahl = (AHomeLocal) ictx.lookup("java:comp/env/ejb/a"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String idb1, int idb2) throws CreateException { - logger.log(BasicLevel.DEBUG, "idb1=" + idb1 + " / idb2=" + idb2); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkg/beans/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkg/beans/AEC2.java deleted file mode 100644 index db3104254bb16ca34a06acd5eb84da84d8ecec8e..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkg/beans/AEC2.java +++ /dev/null @@ -1,285 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.pkg.beans; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; - -import org.objectweb.jonas.jtests.beans.relation.pkg.itf.BHomeLocal; -import org.objectweb.jonas.jtests.beans.relation.pkg.itf.BLocal; - - -/** - * @author S.Chassande-Barrioz - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - - public void assignB(Collection c) throws FinderException { - ArrayList al; - if (c==null) - al = new ArrayList(); - else { - if (c.size()==-1) - al = new ArrayList(); - else { - al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - } - } - setB(al); - } - public void assignBInNewTx(Collection c) throws FinderException { - assignB(c); - } - - public Collection retrieveB() { - Collection bs = getB(); - ArrayList result ; - if (bs.size()==-1) - result = new ArrayList(); - else result = new ArrayList(bs.size()); - - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((BLocal) it.next()).getPrimaryKey()); - return result; - } - - public Collection retrieveBInNewTx() { - return retrieveB(); - } - - public void addInB(String pkb) throws FinderException { - getB().add(bhl.findByPrimaryKey(pkb)); - } - public void addInBInNewTx(String pkb) throws FinderException { - addInB(pkb); - } - - public void addAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - getB().addAll(al); - } - public void addAllInBInNewTx(Collection pkbs) throws FinderException { - addAllInB(pkbs); - } - - public void removeFromB(String pkb) throws FinderException { - getB().remove(bhl.findByPrimaryKey(pkb)); - } - public void removeFromBInNewTx(String pkb) throws FinderException { - removeFromB(pkb); - } - - public void clearB() { - getB().clear(); - } - - public void clearBInNewTx() { - clearB(); - } - - public boolean containAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((String) it.next())); - return getB().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean B defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInB(String pkb) throws FinderException { - return (getB().contains(bhl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - public abstract Collection getB(); - - public abstract void setB(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkg/beans/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkg/beans/BEC2.java deleted file mode 100644 index 2d2ebadf26d0e36d8448c0018276cad6f90b94a6..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/pkg/beans/BEC2.java +++ /dev/null @@ -1,287 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.pkg.beans; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; - -import org.objectweb.jonas.jtests.beans.relation.pkg.itf.AHomeLocal; -import org.objectweb.jonas.jtests.beans.relation.pkg.itf.ALocal; - -/** - * @author S.Chassande-Barrioz - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - - private AHomeLocal ahl = null; - - public void m1(){ - } - - public void assignA(Collection c) throws FinderException { - ArrayList al; - if (c==null) - al = new ArrayList(); - else { - if (c.size()==-1) - al = new ArrayList(); - else { - al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) { - al.add(ahl.findByPrimaryKey((String) it.next())); - } - } - } - setA(al); - } - - public void assignAInNewTx(Collection c) throws FinderException { - assignA(c); - } - - public Collection retrieveA() { - Collection bs = getA(); - ArrayList result ; - if (bs.size()==-1) - result = new ArrayList(); - else result = new ArrayList(bs.size()); - - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((ALocal) it.next()).getPrimaryKey()); - return result; - } - - public Collection retrieveAInNewTx() { - return retrieveA(); - } - - public void addInA(String pkb) throws FinderException { - getA().add(ahl.findByPrimaryKey(pkb)); - } - public void addInAInNewTx(String pkb) throws FinderException { - addInA(pkb); - } - - public void addAllInA(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(ahl.findByPrimaryKey((String) it.next())); - getA().addAll(al); - } - public void addAllInAInNewTx(Collection pkbs) throws FinderException { - addAllInA(pkbs); - } - - public void removeFromA(String pkb) throws FinderException { - getA().remove(ahl.findByPrimaryKey(pkb)); - } - public void removeFromAInNewTx(String pkb) throws FinderException { - removeFromA(pkb); - } - - public void clearA() { - getA().clear(); - } - - public void clearAInNewTx() { - clearA(); - } - - public boolean containAllInA(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(ahl.findByPrimaryKey((String) it.next())); - return getA().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean A defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInA(String pkb) throws FinderException { - return (getA().contains(ahl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - - public abstract void setId(String id); - - public abstract Collection getA(); - - public abstract void setA(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - ahl = (AHomeLocal) ictx.lookup("java:comp/env/ejb/a"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/rcycle/PersonEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/rcycle/PersonEC2.java deleted file mode 100644 index 14043173c652b7c4a35c61f4aaf7cc6eb2b77f57..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/rcycle/PersonEC2.java +++ /dev/null @@ -1,314 +0,0 @@ -// PersonEC2.java - -package org.objectweb.jonas.jtests.beans.relation.rcycle; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.FinderException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * Class implementation of bean Person which is a CMP2 entity.
    - * This bean Person have several bidirectional relation-ships with itself.
    - * The CMP fields are:
    - * - id
    - * - name
    - * - sex (male or female).
    - * The CMR fields are:
    - * - spouse, (One-One-bi relation),
    - * - parents and children, (Many-Many-bi relation),
    - * - guardian and is-guardian-of, (One-Many-bi relation).
    - * - * @author Helene Joanin - */ -public abstract class PersonEC2 implements javax.ejb.EntityBean { - - private static Logger logger = null; - private javax.ejb.EntityContext ejbContext; - private PersonHomeLocal plHome = null; - - - // --------------------------------------------------------------------- - // Get and Set accessor methods of cmp and cmr fields - // --------------------------------------------------------------------- - - public abstract Integer getId(); - public abstract void setId(Integer id); - - public abstract String getName(); - public abstract void setName(String name); - - public abstract int getSex(); - public abstract void setSex(int sex); - - public abstract PersonLocal getSpouse(); - public abstract void setSpouse(PersonLocal spouse); - - public abstract Collection getParents(); - public abstract void setParents(Collection parents); - - public abstract Collection getChildren(); - public abstract void setChildren(Collection parents); - - public abstract PersonLocal getGuardian(); - public abstract void setGuardian(PersonLocal guardian); - - public abstract Collection getGuardianOf(); - public abstract void setGuardianOf(Collection guardianOf); - - - // --------------------------------------------------------------------- - // Call back methods for those defined in the bean interfaces. - // --------------------------------------------------------------------- - - public java.lang.String ejbCreate(Integer id, String name, int sex) - throws javax.ejb.CreateException { - logger.log(BasicLevel.DEBUG, "id = " + id + ", name = " + name + ", sex = " + sex); - // Init here the bean fields - setId(id); - setName(name); - setSex(sex); - return null; - } - - public void ejbPostCreate(Integer id, String name, int sex) { - logger.log(BasicLevel.DEBUG, ""); - } - - public Integer retrieveSpouse() { - PersonLocal spouse = getSpouse(); - if (spouse == null) { - logger.log(BasicLevel.DEBUG, "return null"); - return null; - } else { - logger.log(BasicLevel.DEBUG, "return " + spouse.getId()); - return spouse.getId(); - } - } - - public void assignSpouse(Integer id) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + id); - if (id != null) { - PersonLocal spouse = plHome.findByPrimaryKey(id); - setSpouse(spouse); - } else { - setSpouse(null); - } - } - - public Collection retrieveParents() { - Collection ps = getParents(); - ArrayList result; - if (ps.size() <= 0) { - result = new ArrayList(); - } else { - result = new ArrayList(ps.size()); - } - for (Iterator it = ps.iterator(); it.hasNext();) { - result.add(((PersonLocal) it.next()).getPrimaryKey()); - } - logger.log(BasicLevel.DEBUG, "return=" + result); - return result; - } - - public void assignParents(Collection c) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + c); - ArrayList al; - if (c == null) { - al = new ArrayList(); - } else { - if (c.size() <= 0) { - al = new ArrayList(); - } else { - al = new ArrayList(c.size()); - for (Iterator it = c.iterator(); it.hasNext();) { - al.add(plHome.findByPrimaryKey((Integer) it.next())); - } - } - } - setParents(al); - } - - public void addInParents(Integer id) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + id); - getParents().add(plHome.findByPrimaryKey(id)); - } - - public Collection retrieveChildren() { - Collection ps = getChildren(); - ArrayList result; - if (ps.size() <= 0) { - result = new ArrayList(); - } else { - result = new ArrayList(ps.size()); - } - for (Iterator it = ps.iterator(); it.hasNext();) { - result.add(((PersonLocal) it.next()).getPrimaryKey()); - } - logger.log(BasicLevel.DEBUG, "return=" + result); - return result; - } - - public Collection retrieveChildrenNames() { - Collection ps = getChildren(); - ArrayList result; - if (ps.size() <= 0) { - result = new ArrayList(); - } else { - result = new ArrayList(ps.size()); - } - for (Iterator it = ps.iterator(); it.hasNext();) { - result.add(((PersonLocal) it.next()).getName()); - } - logger.log(BasicLevel.DEBUG, "return=" + result); - return result; - } - - public void assignChildren(Collection c) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + c); - ArrayList al; - if (c == null) { - al = new ArrayList(); - } else { - if (c.size() <= 0) { - al = new ArrayList(); - } else { - al = new ArrayList(c.size()); - for (Iterator it = c.iterator(); it.hasNext();) { - al.add(plHome.findByPrimaryKey((Integer) it.next())); - } - } - } - setChildren(al); - } - - public void addInChildren(Integer id) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + id); - getChildren().add(plHome.findByPrimaryKey(id)); - } - - - public Integer retrieveGuardian() { - PersonLocal guardian = getGuardian(); - if (guardian == null) { - logger.log(BasicLevel.DEBUG, "return null"); - return null; - } else { - logger.log(BasicLevel.DEBUG, "return " + guardian.getId()); - return guardian.getId(); - } - } - - public void assignGuardian(Integer id) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + id); - if (id != null) { - PersonLocal guardian = plHome.findByPrimaryKey(id); - setGuardian(guardian); - } else { - setGuardian(null); - } - } - - public Collection retrieveGuardianOf() { - Collection ps = getGuardianOf(); - ArrayList result; - if (ps.size() <= 0) { - result = new ArrayList(); - } else { - result = new ArrayList(ps.size()); - } - for (Iterator it = ps.iterator(); it.hasNext();) { - result.add(((PersonLocal) it.next()).getPrimaryKey()); - } - logger.log(BasicLevel.DEBUG, "return=" + result); - return result; - } - - public void assignInGuardianOf(Collection c) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + c); - ArrayList al; - if (c == null) { - al = new ArrayList(); - } else { - if (c.size() <= 0) { - al = new ArrayList(); - } else { - al = new ArrayList(c.size()); - for (Iterator it = c.iterator(); it.hasNext();) { - al.add(plHome.findByPrimaryKey((Integer) it.next())); - } - } - } - setGuardianOf(al); - } - - public void addInGuardianOf(Integer id) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + id); - getGuardianOf().add(plHome.findByPrimaryKey(id)); - } - - public boolean testCmrNull() throws FinderException { - PersonLocal g = plHome.findByPrimaryKey(new Integer(3)); - PersonLocal sg = g.getSpouse(); - if (sg == null) { - return true; - } else { - return false; - } - } - - // --------------------------------------------------------------------- - // Standard call back methods of those defined in javax.ejb.EntityBean - // --------------------------------------------------------------------- - - public void setEntityContext(javax.ejb.EntityContext ctx) { - // init the logger - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - // save the given EntityContext - ejbContext = ctx; - // get the PersonHomeLocal (local home of the current bean - plHome = (PersonHomeLocal) ejbContext.getEJBLocalHome(); - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public void ejbRemove() throws javax.ejb.RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/remon/AttributeEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/remon/AttributeEC2.java deleted file mode 100644 index 74dc601a91220c99117dadce61940f1b0e39cade..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/remon/AttributeEC2.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.remon; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author Ph Durieux - */ -public abstract class AttributeEC2 implements javax.ejb.EntityBean { - - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/remon/MainEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/remon/MainEC2.java deleted file mode 100644 index 374fa67d0169c81b77e95b24d2f877032cf5492c..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/remon/MainEC2.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.remon; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author Ph Durieux - */ -public abstract class MainEC2 implements javax.ejb.EntityBean { - - private AttributeHome attrhome = null; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId(); - public abstract void setId(String id); - public abstract String getPf1(); - public abstract void setPf1(String pf1); - - public abstract Attribute getAttr(); - public abstract void setAttr(Attribute a); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * Create a new instance with: - * @param id the primary key - * @param pf1 value cmp field - * @param att foreign key attribute - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String id, String pf1, String att) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(id); - setPf1(pf1); - - // In CMP, should return null. - return null; - } - - /** - * Make here the relations between ejbs - * @throws CreateException Failure to create the attribute - */ - public void ejbPostCreate(String id, String pf1, String aname) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - Attribute attr = attrhome.create(aname); - setAttr(attr); - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - attrhome = (AttributeHome) PortableRemoteObject.narrow(ictx.lookup("java:comp/env/ejb/attribute"), AttributeHome.class); - } catch (NamingException e) { - throw new EJBException("Impossible to get AttributeHome:", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - getAttr().remove(); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s1pkcomp/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s1pkcomp/AEC2.java deleted file mode 100644 index 3a3494b4f94bcddcb780ab8bfb6cd903c400847f..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s1pkcomp/AEC2.java +++ /dev/null @@ -1,288 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.s1pkcomp; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; - -/** - * @author J.Camilleri - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - public PK getId() { - return (PK) ejbContext.getPrimaryKey(); - } - - public void assignB(Collection c) throws FinderException { - ArrayList al; - if (c==null) - al = new ArrayList(); - else { - if (c.size()==-1) - al = new ArrayList(); - else { - al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((PK) it.next())); - } - } - setB(al); - } - public void assignBInNewTx(Collection c) throws FinderException { - assignB(c); - } - - public Collection retrieveB() { - Collection bs = getB(); - ArrayList result ; - if (bs.size()==-1) - result = new ArrayList(); - else result = new ArrayList(bs.size()); - - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((BLocal) it.next()).getPrimaryKey()); - return result; - } - - public Collection retrieveBInNewTx() { - return retrieveB(); - } - - public void addInB(PK pkb) throws FinderException { - getB().add(bhl.findByPrimaryKey(pkb)); - } - public void addInBInNewTx(PK pkb) throws FinderException { - addInB(pkb); - } - - public void addAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((PK) it.next())); - getB().addAll(al); - } - public void addAllInBInNewTx(Collection pkbs) throws FinderException { - addAllInB(pkbs); - } - - public void removeFromB(PK pkb) throws FinderException { - getB().remove(bhl.findByPrimaryKey(pkb)); - } - public void removeFromBInNewTx(PK pkb) throws FinderException { - removeFromB(pkb); - } - - public void clearB() { - getB().clear(); - } - - public void clearBInNewTx() { - clearB(); - } - - public boolean containAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((PK) it.next())); - return getB().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean B defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInB(PK pkb) throws FinderException { - return (getB().contains(bhl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId1(); - - public abstract int getId2(); - - public abstract void setId1(String id); - - public abstract void setId2(int id); - - public abstract Collection getB(); - - public abstract void setB(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String ida1, int ida2) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId1(ida1); - setId2(ida2); - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String ida1, int ida2) throws CreateException { - logger.log(BasicLevel.DEBUG, "ida1=" + ida1 + " / ida2=" + ida2); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s1pkcomp/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s1pkcomp/BEC2.java deleted file mode 100644 index 3be73306e7641e5c41b9fd16a548335769d80faa..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s1pkcomp/BEC2.java +++ /dev/null @@ -1,291 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.s1pkcomp; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; -/** - * @author J.Camilleri - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - - private AHomeLocal ahl = null; - - public void m1(){ - } - - public PK getId() { - return (PK) ejbContext.getPrimaryKey(); - } - - public void assignA(Collection c) throws FinderException { - ArrayList al; - if (c==null) - al = new ArrayList(); - else { - if (c.size()==-1) - al = new ArrayList(); - else { - al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) { - al.add(ahl.findByPrimaryKey((PK) it.next())); - } - } - } - setA(al); - } - - public void assignAInNewTx(Collection c) throws FinderException { - assignA(c); - } - - public Collection retrieveA() { - Collection bs = getA(); - ArrayList result ; - if (bs.size()==-1) - result = new ArrayList(); - else result = new ArrayList(bs.size()); - - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((ALocal) it.next()).getPrimaryKey()); - return result; - } - - public Collection retrieveAInNewTx() { - return retrieveA(); - } - - public void addInA(PK pkb) throws FinderException { - getA().add(ahl.findByPrimaryKey(pkb)); - } - public void addInAInNewTx(PK pkb) throws FinderException { - addInA(pkb); - } - - public void addAllInA(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(ahl.findByPrimaryKey((PK) it.next())); - getA().addAll(al); - } - public void addAllInAInNewTx(Collection pkbs) throws FinderException { - addAllInA(pkbs); - } - - public void removeFromA(PK pkb) throws FinderException { - getA().remove(ahl.findByPrimaryKey(pkb)); - } - public void removeFromAInNewTx(PK pkb) throws FinderException { - removeFromA(pkb); - } - - public void clearA() { - getA().clear(); - } - - public void clearAInNewTx() { - clearA(); - } - - public boolean containAllInA(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(ahl.findByPrimaryKey((PK) it.next())); - return getA().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean A defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInA(PK pkb) throws FinderException { - return (getA().contains(ahl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId1(); - - public abstract int getId2(); - - public abstract void setId1(String id); - - public abstract void setId2(int id); - - public abstract Collection getA(); - - public abstract void setA(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(String idb1, int idb2) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId1(idb1); - setId2(idb2); - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - ahl = (AHomeLocal) ictx.lookup("java:comp/env/ejb/a"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String idb1, int idb2) throws CreateException { - logger.log(BasicLevel.DEBUG, "idb1=" + idb1 + " / idb2=" + idb2); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s2pkcomp/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s2pkcomp/AEC2.java deleted file mode 100644 index ac3b1c86f5936474f2b8537be2690adc4705a947..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s2pkcomp/AEC2.java +++ /dev/null @@ -1,226 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.s2pkcomp; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author Helene Joanin - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - - public Pk getId(){ - return (Pk)ejbContext.getPrimaryKey(); - } - - public void assignB(Pk c) throws FinderException { - logger.log(BasicLevel.DEBUG, "param=" + c.toString()); - if (c != null) { - BLocal bl = null; - bl = bhl.findByPrimaryKey(c); - setB(bl); - } else { - setB(null); - } - } - public void assignBInNewTx(Pk c) throws FinderException { - assignB(c); - } - - public Pk retrieveB() { - BLocal lejbB = getB(); - if (lejbB == null) { - logger.log(BasicLevel.DEBUG, "return null"); - return null; - } else { - logger.log(BasicLevel.DEBUG, "return " + lejbB.getId()); - return lejbB.getId(); - } - } - - public Pk retrieveBInNewTx() { - return retrieveB(); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId1(); - public abstract void setId1(String id1); - public abstract int getId2(); - public abstract void setId2(int id2); - public abstract BLocal getB(); - public abstract void setB(BLocal bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public Pk ejbCreate(String id1, int id2) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId1(id1); - setId2(id2); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id1, int id2) throws CreateException { - logger.log(BasicLevel.DEBUG, "id1="+id1+", id2="+id2); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s2pkcomp/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s2pkcomp/BEC2.java deleted file mode 100644 index dc5e5ae97707f42b4cc51a312a3112995c986ad3..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s2pkcomp/BEC2.java +++ /dev/null @@ -1,196 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.s2pkcomp; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.RemoveException; - -/** - * @author Helene Joanin - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getId1(); - public abstract void setId1(String id1); - public abstract int getId2(); - public abstract void setId2(int id2); - public abstract ALocal getA(); - public abstract void setA(ALocal al); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - public void m1(){ - } - - public Pk getId(){ - return (Pk) ejbContext.getPrimaryKey(); - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public Pk ejbCreate(String id1, int id2) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId1(id1); - setId2(id2); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - public Pk retrieveA() { - ALocal lejbA = getA(); - if (lejbA==null) - return null; - else - return lejbA.getId(); - } - - public Pk retrieveAInNewTx() { - return retrieveA(); - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id1, int id2) throws CreateException { - logger.log(BasicLevel.DEBUG, "id1="+id1+", id2="+id2); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s3pkcomp/AEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s3pkcomp/AEC2.java deleted file mode 100644 index a158a5578def9fa820bbdf7942ce197933adb163..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s3pkcomp/AEC2.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.s3pkcomp; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.FinderException; -import javax.ejb.EJBException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; - -/** - * @author H. Joanin - */ -public abstract class AEC2 implements javax.ejb.EntityBean { - - private BHomeLocal bhl = null; - - public void m1(){ - } - - public void assignB(Collection c) throws FinderException { - ArrayList al = new ArrayList(c.size()); - for(Iterator it = c.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((Pk) it.next())); - setB(al); - } - public void assignBInNewTx(Collection c) throws FinderException { - assignB(c); - } - - public Collection retrieveB() { - Collection bs = getB(); - ArrayList result = new ArrayList(bs.size()); - for(Iterator it = bs.iterator(); it.hasNext();) - result.add(((BLocal) it.next()).getPrimaryKey()); - return result; - } - public Collection retrieveBInNewTx() { - return retrieveB(); - } - - public void addInB(Pk pkb) throws FinderException { - getB().add(bhl.findByPrimaryKey(pkb)); - } - public void addInBInNewTx(Pk pkb) throws FinderException { - addInB(pkb); - } - - public void addAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(); - for (Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((Pk) it.next())); - getB().addAll(al); - } - public void addAllInBInNewTx(Collection pkbs) throws FinderException { - addAllInB(pkbs); - } - - public void removeFromB(Pk pkb) throws FinderException { - getB().remove(bhl.findByPrimaryKey(pkb)); - } - public void removeFromBInNewTx(Pk pkb) throws FinderException { - removeFromB(pkb); - } - - public void clearB() { - getB().clear(); - } - - public void clearBInNewTx() { - clearB(); - } - - public boolean containAllInB(Collection pkbs) throws FinderException { - ArrayList al = new ArrayList(pkbs.size()); - for(Iterator it = pkbs.iterator(); it.hasNext();) - al.add(bhl.findByPrimaryKey((Pk) it.next())); - return getB().containsAll(al); - } - - /** - * It returns true the multivalued relation contains the bean B defined - * by the primary key specified by the parameter. - * This method has the transactional attribut TX_SUPPORTS. - * @throw a FinderException if the primary key does not match to a bean. - */ - public boolean containInB(Pk pkb) throws FinderException { - return (getB().contains(bhl.findByPrimaryKey(pkb))); - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract Integer getId(); - - public abstract void setId(Integer id); - - public abstract Collection getB(); - - public abstract void setB(Collection bl); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(int id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(new Integer(id)); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - try { - Context ictx = new InitialContext(); - bhl = (BHomeLocal) ictx.lookup("java:comp/env/ejb/b"); - } catch (NamingException e) { - throw new EJBException("Impossible to fetch the ", e); - } - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(int id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s3pkcomp/BEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s3pkcomp/BEC2.java deleted file mode 100644 index 5c1a44bebab786ed9f1ac70ec385c2f448b5ec0c..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relation/s3pkcomp/BEC2.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.relation.s3pkcomp; - -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.RemoveException; - -/** - * @author H.Joanin - */ -public abstract class BEC2 implements javax.ejb.EntityBean { - public void m1(){ - } - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract Integer getId(); - - public abstract void setId(Integer id); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - static protected Logger logger = null; - EntityContext ejbContext; - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(int id) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - // Init here the bean fields - setId(new Integer(id)); - - // In CMP, should return null. - return null; - } - - /** - * Set the associated entity context. The container invokes this method - * on an instance after the instance has been created. - * This method is called in an unspecified transaction context. - * - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. - * This is the last method that the container invokes on the instance. - * The Java garbage collector will eventually invoke the finalize() method - * on the instance. - * This method is called in an unspecified transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by a - * system-level error. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. This method is - * invoked when a client invokes a remove operation on the enterprise Bean's - * home interface or the EJB object's remote interface. This method - * transitions the instance from the ready state to the pool of available - * instances. - * - * This method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of the object. - * @throws EJBException - Thrown by the method to indicate a failure caused by a system-level - * error. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - * This method always executes in the proper transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(int id) throws CreateException { - logger.log(BasicLevel.DEBUG, "id=" + id); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relatives/RelativeEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relatives/RelativeEC2.java deleted file mode 100644 index e17f5cddb2989aee004123cbd58090c8e5d0f43b..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/relatives/RelativeEC2.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// PersonneEC2.java - -package org.objectweb.jonas.jtests.beans.relatives; - -import java.util.Date; -import java.util.Set; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * This is an entity bean with "container managed persistence version 2.x". - * @author Christophe Ney - cney@batisseurs.com - */ -public abstract class RelativeEC2 implements EntityBean { - - static protected Logger logger = null; - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getFullName(); - - public abstract void setFullName(String name); - - public abstract int getLuckyNumber(); - - public abstract void setLuckyNumber(int age); - - public abstract Date getBirthdate(); - - public abstract void setBirthdate(Date birthdate); - - public abstract RelativeLocal getSpouse(); - - public abstract void setSpouse(RelativeLocal spouse); - - public abstract Set getSibblings(); - - public abstract void setSibblings(Set sibblings); - - public abstract Set getVisitedRelatives(); - - public abstract void setVisitedRelatives(Set sibblings); - - public abstract boolean getIsMale(); - - public abstract void setIsMale(boolean isMale); - - public abstract double getAverageAnnualVisits(); - - public abstract void setAverageAnnualVisits(double averageAnnualVisits); - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. - */ - public void setEntityContext(EntityContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * Unset the associated entity context. - */ - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object - * that is currently associated with the instance. - */ - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. - */ - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. - */ - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this instance before creating the EJBObject - */ - public String ejbCreate(String fullName, Date birthdate, int luckyNumber) throws CreateException, DuplicateKeyException { - logger.log(BasicLevel.DEBUG, ""); - - setFullName(fullName); - setBirthdate(birthdate); - setLuckyNumber(luckyNumber); - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String fullName, Date birthdate, int luckyNumber) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - - /** - * This method is called before the instance enters the "passive" state. - * The instance should release any resources that it can re-acquire later in the - * ejbActivate() method. - * After the passivate method completes, the instance must be in a state that - * allows the container to use the Java Serialization protocol to externalize - * and store away the instance's state. - * This method is called with no transaction context. - * - * @exception EJBException - Thrown if the instance could not perform the - * function requested by the container - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * This method is called when the instance is activated from its "passive" state. - * The instance should acquire any resource that it has released earlier in the - * ejbPassivate() method. - * This method is called with no transaction context. - * - * @exception EJBException - Thrown if the instance could not perform the - * function requested by the container - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/remoterunner/RemoteRunnerSL.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/remoterunner/RemoteRunnerSL.java deleted file mode 100644 index 4666287e39372624b0335bfeb51c06bf2bd848b2..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/remoterunner/RemoteRunnerSL.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// RemoteRunnerSL.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.remoterunner; - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -import junit.framework.Test; -import junit.textui.TestRunner; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * - */ - -public class RemoteRunnerSL implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, "RemoteRunnerSL setSessionContext"); - ejbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the session object. - * This happens as a result of a client's invoking a remove operation, or when a - * container decides to terminate the session object after a timeout. - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, "RemoteRunnerSL ejbRemove"); - } - - /** - * The Session bean must define 1 or more ejbCreate methods. - * - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, "RemoteRunnerSL ejbCreate"); - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, "RemoteRunnerSL ejbPassivate"); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, "RemoteRunnerSL ejbActivate"); - } - - // ------------------------------------------------------------------ - // RemoteRunner implementation - // ------------------------------------------------------------------ - - /** - * Run a JUnit TestSuite - * - * @param jtcc the class of the JUnit TestSuite to be run - * - * The code run here is equivalent to : - * TestRunner.run( jtcc.suite()) - */ - - public String run(Class jtcc) throws RemoteException { - logger.log(BasicLevel.DEBUG, "RemoteRunnerSL run"); - try{ - Test ts = null; - Method method = jtcc.getMethod("suite", (Class []) null); - ts = (Test)method.invoke(null, (Object []) null); - ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream(); - PrintStream ps = new java.io.PrintStream(baos); - TestRunner tr = new TestRunner(ps); - tr.doRun(ts , false); - return baos.toString(); - }catch( Exception e){ - throw new RemoteException(e.toString()); - } - - } - - /** - * Run a TestCase in the JUnit TestSuite - * - * @param jtcc the class of the JUnit TestSuite to be run - * @param name name of the testcase to run - * - * This code run here is equivalent to do - * TestRunner.run(new jtcc(testtorun)) - */ - public String run(Class jtcc, String testtorun) throws RemoteException { - logger.log(BasicLevel.DEBUG, "RemoteRunnerSL run: "+testtorun); - try{ - Object suiteInstance = null; - int nbParams = 1; - Class paramTypes[] = new Class[nbParams]; // constructor argument types - Object paramObjects[] = new Object[nbParams]; // constructor argument values - paramTypes[0] = java.lang.String.class; - paramObjects[0] = (Object)testtorun; - Constructor constructor = jtcc.getConstructor(paramTypes); - suiteInstance = constructor.newInstance(paramObjects); - ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream(); - PrintStream ps = new java.io.PrintStream(baos); - TestRunner tr = new TestRunner(ps); - tr.doRun((Test)suiteInstance , false); - return baos.toString(); - }catch( Exception e){ - throw new RemoteException(e.toString()); - } - - } - - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/BaseEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/BaseEC2.java deleted file mode 100644 index 6063346f1d10806fb9d5fbff776b949e844a4785..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/BaseEC2.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.secured; - -import javax.ejb.CreateException; -import javax.ejb.EJBContext; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * This is an entity bean with "container managed persistence 2". - * The state of an instance is stored into a relational database. - * @author Helene Joanin (jonas team) - */ -public abstract class BaseEC2 extends BaseCommon implements EntityBean { - - protected EntityContext entityContext; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getInfo(); - public abstract void setInfo(String n); - public abstract String getName(); - public abstract void setName(String n); - - public EJBContext getEJBContext() { - return entityContext; - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setEntityContext(EntityContext ctx) { - if( logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - entityContext = ctx; - - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - } - - public String ejbCreate(String name, String info) throws CreateException { - logger.log(BasicLevel.DEBUG,""); - setInfo(info); - setName(name); - return(null); - } - - public void ejbPostCreate(String name, String info){ - logger.log(BasicLevel.DEBUG, ""); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/BaseSL.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/BaseSL.java deleted file mode 100644 index 70af5a7a07205251a5b5f3efa67338e4d988ed7a..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/BaseSL.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// BaseSL.java - -package org.objectweb.jonas.jtests.beans.secured; - -import javax.ejb.EJBContext; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; - -public class BaseSL extends BaseCommon implements SessionBean { - - protected SessionContext ejbContext; - - - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - public void setSessionContext(SessionContext ctx) { - if( logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbCreate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Base implementation - // ------------------------------------------------------------------ - - public EJBContext getEJBContext(){ - return ejbContext; - } - - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/DerivedSF.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/DerivedSF.java deleted file mode 100644 index 60b739f5adc7fb8c50f11ec714eda4d4f4e6f53e..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/DerivedSF.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// DerivedSF.java - -package org.objectweb.jonas.jtests.beans.secured; - -import javax.ejb.EJBContext; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; - -public class DerivedSF extends BaseCommon implements SessionBean { - - protected SessionContext ejbContext; - - - public EJBContext getEJBContext(){ - return ejbContext; - } - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - public void setSessionContext(SessionContext ctx) { - if( logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbCreate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Derived Interface Remote implementation - // ------------------------------------------------------------------ - - public void otherMethod() { - logger.log(BasicLevel.DEBUG, ""); - } - - - // ------------------------------------------------------------------ - // Derived Interface Local implementation - // ------------------------------------------------------------------ - - public void anotherMethod(){ - logger.log(BasicLevel.DEBUG, ""); - } - - - public void noRunAsWithRole1() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void noRunAsWithRole2() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void runAsRole2() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void runAsWithRole2() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void runAsWithRole1() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void runAsRole3() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void runAsRole2AndCallAnotherBean() { - logger.log(BasicLevel.DEBUG, ""); - } - - - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/Listener.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/Listener.java deleted file mode 100644 index 1d29960ea08945b5e4dc83a8ca0b024460d16f37..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/secured/Listener.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.secured; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.QueueConnectionFactory; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueSession; -import javax.jms.QueueSender; -import javax.jms.Session; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * Come from the mdb tests - * @author Philippe Coq & Philippe Durieux - * @author Florent Benoit (run-as test) - */ -public class Listener implements MessageDrivenBean, MessageListener { - - /** - * Logger - */ - private static Logger logger = null; - - /** - * Context - */ - private transient MessageDrivenContext mdbContext; - - /** - * Class of the other bean - */ - private transient DerivedLocalHome dh = null; - - - /** - * Default constructor - */ - public Listener() { - } - - // ------------------------------------------------------------------ - // MessageDrivenBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated context. The container call this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param ctx MessageDrivenContext A MessageDrivenContext interface for the instance. - */ - - public void setMessageDrivenContext(MessageDrivenContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - mdbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the message-driven object. - * This happens when a container decides to terminate the message-driven object. - * - * This method is called with no transaction context. - * - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * The Message driven bean must define an ejbCreate methods with no args. - */ - public void ejbCreate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * onMessage method - * @param message receive message - */ - public void onMessage(Message message) { - logger.log(BasicLevel.DEBUG, ""); - - String messageTest = "ok"; - - try { - // Don't test message but test run-as bean by calling another bean - try { - InitialContext ictx = new InitialContext(); - dh = (DerivedLocalHome) ictx.lookup("java:comp/env/ejb/derivednorunaslocal"); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "Listener : Cannot get DerivedHome:" + e); - messageTest = "fail : Cannot get DerivedHome: " + e; - } - - // Create a new bean for this message (with right run-as) - try { - dh.create(); - } catch (EJBException ejbe) { - messageTest = "fail : EJBException : " + ejbe.getMessage(); - logger.log(BasicLevel.ERROR, "EJBException: " + ejbe.getMessage()); - } catch (CreateException e) { - messageTest = "fail : Can not create the bean"; - logger.log(BasicLevel.ERROR, "Listener exception: " + e); - } - } catch (Exception ee) { - logger.log(BasicLevel.ERROR, "exception: " + ee); - messageTest = "fail :" + ee.getMessage(); - } - - QueueConnectionFactory qcf = null; - Queue queue = null; - try { - // Send the message (ok or fail) - try { - InitialContext ictx = new InitialContext(); - qcf = (QueueConnectionFactory) ictx.lookup("java:comp/env/jms/RunAsFactory"); - queue = (Queue) ictx.lookup("java:comp/env/jms/testRunAs"); - } catch (NamingException e) { - logger.log(BasicLevel.ERROR, "Listener : Cannot get DerivedHome:" + e); - } - - - QueueConnection qc = qcf.createQueueConnection(); - QueueSession qs = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); - Message m = qs.createMessage(); - m.setStringProperty("testRunAsJms", messageTest); - QueueSender qsender = qs.createSender(queue); - qsender.send(m); - - // close - qsender.close(); - qs.close(); - qc.close(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "exception:" + e); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleCommon.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleCommon.java deleted file mode 100644 index db0fb39b9670e8a69a745f6441b6b9efdf7455e4..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleCommon.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// SimpleCommon.java - -package org.objectweb.jonas.jtests.beans.transacted; - -import java.rmi.RemoteException; - -import javax.ejb.EJBContext; -import javax.transaction.Status; -import javax.transaction.UserTransaction; - - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.jonas.jtests.util.JBean; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Common part to different implementations of Simple - */ -public class SimpleCommon extends JBean { - - static protected Logger logger = null; - private EJBContext ejbContext = null; - - protected void setEjbContext(EJBContext ctx) { - ejbContext = ctx; - } - - /** - * Utility method that returns true if the thread is associated to a - * transaction - */ - protected boolean isAssociated() { - int ret; - try { - UserTransaction ut = getUserTransaction(); - ret = ut.getStatus(); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "isAssociated: " + e); - return false; - } - if (ret == Status.STATUS_UNKNOWN) { - logger.log(BasicLevel.DEBUG, "STATUS_UNKNOWN"); - return false; - } else if (ret == Status.STATUS_NO_TRANSACTION) { - logger.log(BasicLevel.DEBUG, "STATUS_NO_TRANSACTION"); - return false; - } else { - logger.log(BasicLevel.DEBUG, "Status=" + ret); - return true; - } - } - - /** - * Utility method that init the logger - */ - protected void initLogger() { - if (logger == null) - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - - /** - * This method return true if there is an association of a transaction with - * this thread - */ - public boolean opwith_notsupported() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with - * this thread - */ - public boolean opwith_supports() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with - * this thread - */ - public boolean opwith_required() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with - * this thread - */ - public boolean opwith_requires_new() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with - * this thread - */ - public boolean opwith_mandatory() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with - * this thread - */ - public boolean opwith_never() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * REQUIRED -> should return true. - */ - public boolean required_call_requires_new() { - logger.log(BasicLevel.DEBUG, ""); - boolean tx = opwith_requires_new(); - if (!tx) { - logger.log(BasicLevel.ERROR, "opwith_requires_new was outside tx"); - return false; // error - } - return isAssociated(); - } - - /** - * REQUIRED -> should return true. - */ - public boolean call_requires_new_on(Simple other) throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - boolean tx = other.opwith_requires_new(); - if (!tx) { - logger.log(BasicLevel.ERROR, "opwith_requires_new was outside tx"); - return false; // error - } - return isAssociated(); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleEC2.java deleted file mode 100644 index 84612ee5d77f2e507514ddb0311ad350209b8d53..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleEC2.java +++ /dev/null @@ -1,555 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.transacted; - -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.ejb.TimedObject; -import javax.ejb.Timer; -import javax.ejb.TimerHandle; -import javax.ejb.TimerService; - -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * Entity bean with container managed persistence version 2. - * @author Helene Joanin - */ -public abstract class SimpleEC2 extends SimpleCommon implements EntityBean, TimedObject { - - private final int TOCANCEL = 10000; - - protected EntityContext entityContext; - - // ------------------------------------------------------------------ - // Get and Set accessor methods of the bean's abstract schema - // ------------------------------------------------------------------ - public abstract String getAccno(); - public abstract void setAccno(String accno); - public abstract String getCustomer(); - public abstract void setCustomer(String customer); - public abstract long getBalance(); - public abstract void setBalance(long balance); - public abstract int getTimerIdent(); - public abstract void setTimerIdent(int id); - public abstract int getTimerCount(); - public abstract void setTimerCount(int cnt); - - /** - * Create without arg - * transaction attribute = supports (by default in xml file) - */ - public String ejbCreate() throws CreateException { - - logger.log(BasicLevel.DEBUG, ""); - - // Must init fields in any case. - setAccno("000"); - setCustomer("Initial"); - setBalance(0); - setTimerIdent(0); - setTimerCount(0); - // In BMP, return PK. - return getAccno(); - } - - /** - * transaction attribute = default (= supports) - */ - public void ejbPostCreate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * transaction attribute = notsupported - */ - public String ejbCreate(int i) throws CreateException { - - logger.log(BasicLevel.DEBUG, ""); - - if (isAssociated()) { - throw new EJBException("ejbCreate(int i): should not be in a transaction"); - } - Integer v = new Integer((int)i); - setAccno(v.toString()); - setCustomer("by int"); - setBalance(1000 + i); - setTimerIdent(0); - setTimerCount(0); - - // In BMP, return PK. - return getAccno(); - } - - /** - * transaction attribute = notsupported - */ - public void ejbPostCreate(int i) { - logger.log(BasicLevel.DEBUG, ""); - if (isAssociated()) { - throw new EJBException("ejbPostCreate(int i): should not be in a transaction"); - } - } - - /** - * transaction attribute = required - */ - public String ejbCreateForRequired(long i) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - if (!isAssociated()) { - throw new EJBException("ejbCreate(long i): should be in a transaction"); - } - Integer v = new Integer((int)i); - setAccno(v.toString()); - setCustomer("Required"); - setBalance(1000 + i); - setTimerIdent(0); - setTimerCount(0); - - // In BMP, return PK. - return getAccno(); - } - - /** - * transaction attribute = required - */ - public void ejbPostCreateForRequired(long i) { - logger.log(BasicLevel.DEBUG, ""); - if (!isAssociated()) { - throw new EJBException("ejbPostCreateForRequired(long i): should be in a transaction"); - } - } - - /** - * transaction attribute = never - */ - public String ejbCreateForNever(short i) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - - if (isAssociated()) { - throw new EJBException("ejbCreateForNever(short i): should not be in a transaction"); - } - Integer v = new Integer((int)i); - setAccno(v.toString()); - setCustomer("by short"); - setBalance(1000 + i); - setTimerIdent(0); - setTimerCount(0); - - // In BMP, return PK. - return getAccno(); - } - - /** - * transaction attribute = requiresnew - */ - public String ejbCreateForRequiresNew(String i) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - - if (!isAssociated()) { - throw new EJBException("ejbCreate(String i): should be in a transaction"); - } - setAccno(i); - setCustomer("by string"); - setBalance(100); - setTimerIdent(0); - setTimerCount(0); - - // In BMP, return PK. - return getAccno(); - } - - /** - * transaction attribute = requiresnew - */ - public void ejbPostCreateForRequiresNew(String i) { - logger.log(BasicLevel.DEBUG, ""); - - if (!isAssociated()) { - throw new EJBException("ejbPostCreateForRequiresNew(String i): should be in a transaction"); - } - } - - /** - * transaction attribute = mandatory - */ - public String ejbCreateForMandatory(char i) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - - if (!isAssociated()) { - throw new EJBException("ejbCreateForMandatory(char i): should be in a transaction"); - } - Integer v = new Integer((int)i); - setAccno(v.toString()); - setCustomer("by char"); - setBalance(200); - setTimerIdent(0); - setTimerCount(0); - - // In BMP, return PK. - return getAccno(); - } - - /** - * transaction attribute = mandatory - */ - public void ejbPostCreateForMandatory(char i) { - logger.log(BasicLevel.DEBUG, ""); - - if (!isAssociated()) { - throw new EJBException("ejbPostCreateForMandatory(char i): should be in a transaction"); - } - } - - /** - * transaction attribute = supports - */ - public String ejbCreateForSupports(boolean intx) throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - - if (intx) { - setAccno("TRUE"); - setBalance(101); - if (!isAssociated()) { - throw new EJBException("ejbCreateForSupports(true): should be in a transaction"); - } - } else { - setAccno("FALSE"); - setBalance(102); - if (isAssociated()) { - throw new EJBException("ejbCreate(false): should not be in a transaction"); - } - } - setCustomer("by boolean"); - setTimerIdent(0); - setTimerCount(0); - - // In BMP, return PK. - return getAccno(); - } - - /** - * transaction attribute = supports - */ - public void ejbPostCreateForSupports(boolean intx) { - logger.log(BasicLevel.DEBUG, ""); - - if (intx) { - if (!isAssociated()) { - throw new EJBException("ejbPostCreateForSupports: should be in a transaction"); - } - } else { - if (isAssociated()) { - throw new EJBException("ejbPostCreateForSupports: should not be in a transaction"); - } - } - } - - public String ejbCreateWithTimer(int i, long dur) throws RemoteException, CreateException { - logger.log(BasicLevel.DEBUG, ""); - // Must init fields in any case. - setAccno("001"); - setCustomer("Timer"); - setBalance(0); - setTimerIdent(0); - setTimerCount(0); - // In BMP, return PK. - return getAccno(); - } - - public void ejbPostCreateWithTimer(int i, long dur) throws RemoteException, CreateException { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - int ret = getTimerIdent() + 1; - Timer mt = timerservice.createTimer(dur, new Integer(ret)); - } - - /** - * transaction attribute = never - */ - public void ejbPostCreateForNever(short i) { - logger.log(BasicLevel.DEBUG, ""); - - if (isAssociated()) { - throw new EJBException("ejbPostCreateForNever(short i): should not be in a transaction"); - } - } - - - /** - * This method return true if there is an association of a transaction with this thread - */ - public boolean ejbHomeOpwith_notsupported() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with this thread - */ - public boolean ejbHomeOpwith_supports() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with this thread - */ - public boolean ejbHomeOpwith_required() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with this thread - */ - public boolean ejbHomeOpwith_requires_new() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with this thread - */ - public boolean ejbHomeOpwith_mandatory() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - /** - * This method return true if there is an association of a transaction with this thread - */ - public boolean ejbHomeOpwith_never() { - logger.log(BasicLevel.DEBUG, ""); - return isAssociated(); - } - - public void ejbRemove() throws RemoveException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbLoad() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbStore() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void setEntityContext(EntityContext ctx) { - setEjbContext(ctx); - initLogger(); - logger.log(BasicLevel.DEBUG, ""); - this.entityContext = ctx; - } - - public void unsetEntityContext() { - logger.log(BasicLevel.DEBUG, ""); - this.entityContext = null; - } - - public int setTimer(int dur, int period) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - Timer mt = null; - int ret = getTimerIdent() + 1; - setTimerIdent(ret); - if (period > 0) { - mt = timerservice.createTimer(dur * 1000, period * 1000, new Integer(ret)); - } else if (period < 0) { - // special test for cancel inside ejbTimeout - mt = timerservice.createTimer(dur * 1000, -period * 1000, new Integer(TOCANCEL)); - } else { - mt = timerservice.createTimer(dur * 1000, new Integer(ret)); - } - return ret; - } - - public int setTimer(java.util.Date date, int period) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - Timer mt = null; - int ret = getTimerIdent() + 1; - setTimerIdent(ret); - if (period > 0) { - mt = timerservice.createTimer(date, period * 1000, new Integer(ret)); - } else if (period < 0) { - // special test for cancel inside ejbTimeout - mt = timerservice.createTimer(date, -period * 1000, new Integer(TOCANCEL)); - } else { - mt = timerservice.createTimer(date, new Integer(ret)); - } - return ret; - } - - public int setTimerGetHandle(int dur, int period) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - int ret = dur * 10 + period; - Timer t = null; - if (period > 0) { - t = timerservice.createTimer(dur * 1000, period * 1000, new Integer(ret)); - } else { - t = timerservice.createTimer(dur * 1000, new Integer(ret)); - } - TimerHandle hdl = t.getHandle(); - Timer t2 = hdl.getTimer(); - if (t != t2) { - logger.log(BasicLevel.ERROR, "Bad timer handle"); - logger.log(BasicLevel.ERROR, "Original=" + t); - logger.log(BasicLevel.ERROR, "Recomputed=" + t2); - throw new EJBException("Bad timer handle"); - } - return ret; - } - - public TimerHandle getTimerHandle(int ident) { - logger.log(BasicLevel.DEBUG, ""); - TimerHandle hdl = null; - TimerService timerservice = entityContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - Integer id = (Integer) t.getInfo(); - if (id.intValue() == ident) { - hdl = t.getHandle(); - break; - } - } - return hdl; - } - - public void cancelTimer(int ident) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - Integer id = (Integer) t.getInfo(); - if (id.intValue() == ident) { - t.cancel(); - } - } - } - - public void cancelTimers() { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - t.cancel(); - } - } - - public long getTimeRemaining(int ident) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - long ret = -1; - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - Integer id = (Integer) t.getInfo(); - if (id.intValue() == ident) { - ret = t.getTimeRemaining(); - } - } - return ret; - } - - public int getTimerNumber() { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - return timerList.size(); - } - - /** - * This support method calls a required method - */ - public boolean supports_call_required() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - Simple myentity = (Simple) entityContext.getEJBLocalObject(); - return myentity.opwith_required(); - } - - /** - * Cancels all timers, that are associated with this entity, and starts a - * new timer. - */ - public void startInfoTimer(int dur, String inform) throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - // Remove all timers with this Info first - for (Iterator timers = timerservice.getTimers().iterator(); timers.hasNext();) { - Timer timer = (Timer) timers.next(); - if (inform.equals(timer.getInfo())) { - timer.cancel(); - } - } - // Now, create the Timer - timerservice.createTimer(dur * 1000, inform); - } - - // ----------------------------------------------------------- - // TimedObject implementation - // ----------------------------------------------------------- - - /** - * A timer is expired. - */ - public void ejbTimeout(Timer timer) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = entityContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - Integer id = (Integer) timer.getInfo(); - if (id.intValue() == TOCANCEL) { - timer.cancel(); - } - setTimerCount(getTimerCount() + 1); - TimerHandle hdl = timer.getHandle(); - TimerHandle hdl2 = getDeserializedHandle(hdl); - if (! timersAreIdentical(hdl, hdl2)) { - logger.log(BasicLevel.ERROR, "Bad timer handle"); - throw new EJBException("Bad timer handle"); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleSF.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleSF.java deleted file mode 100644 index b2e0a21ec6298a2096a2b9542a0faa8f4a03ed52..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleSF.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// SimpleSF.java - -package org.objectweb.jonas.jtests.beans.transacted; - - -import java.rmi.RemoteException; - -import javax.ejb.SessionContext; - -import org.objectweb.util.monolog.api.BasicLevel; - -/* - * Stateful session bean - */ - -public class SimpleSF extends SimpleCommon { - - protected SessionContext sessionContext; - public int i = 0; - - public void setSessionContext(SessionContext sessionContext) { - setEjbContext(sessionContext); - initLogger(); - logger.log(BasicLevel.DEBUG, ""); - this.sessionContext = sessionContext; - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbCreate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbCreate(int i) { - this.i = i; - } - - /** - * This support method calls a required method - */ - public boolean supports_call_required() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - Simple mysession = (Simple) sessionContext.getEJBObject(); - return mysession.opwith_required(); - } - - public void startInfoTimer(int dur, String info) throws RemoteException { - logger.log(BasicLevel.ERROR, "not implemented"); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleSL.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleSL.java deleted file mode 100644 index e31ef87a68b8ad8ef60e6c579c729a369fe40c26..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/SimpleSL.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.transacted; - -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.ejb.TimedObject; -import javax.ejb.Timer; -import javax.ejb.TimerHandle; -import javax.ejb.TimerService; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.objectweb.util.monolog.api.BasicLevel; - -public class SimpleSL extends SimpleCommon implements SessionBean, TimedObject { - - protected SessionContext sessionContext; - static protected int timercount = 0; - - public void setSessionContext(SessionContext sessionContext) { - setEjbContext(sessionContext); - initLogger(); - logger.log(BasicLevel.DEBUG, ""); - this.sessionContext = sessionContext; - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbCreate() { - logger.log(BasicLevel.DEBUG, ""); - try { - InitialContext ictx = new InitialContext(); - } catch(NamingException e) { - throw new EJBException(e); - } - } - - public int setTimer(int dur, int period) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = sessionContext.getTimerService(); - int ret = dur * 10 + period; - if (period > 0) { - timerservice.createTimer(dur * 1000, period * 1000, new Integer(ret)); - } else { - timerservice.createTimer(dur * 1000, new Integer(ret)); - } - return ret; - } - - public int setTimer(java.util.Date date, int period) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = sessionContext.getTimerService(); - int ret = 200 + period; - if (period > 0) { - timerservice.createTimer(date, period * 1000, new Integer(ret)); - } else { - timerservice.createTimer(date, new Integer(ret)); - } - return ret; - } - - public int setTimerGetHandle(int dur, int period) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = sessionContext.getTimerService(); - int ret = dur * 10 + period; - Timer t = null; - if (period > 0) { - t = timerservice.createTimer(dur * 1000, period * 1000, new Integer(ret)); - } else { - t = timerservice.createTimer(dur * 1000, new Integer(ret)); - } - TimerHandle hdl = t.getHandle(); - TimerHandle hdl2 = getDeserializedHandle(hdl); - if (! timersAreIdentical(hdl, hdl2)) { - logger.log(BasicLevel.ERROR, "Bad timer handle"); - throw new EJBException("Bad timer handle"); - } - return ret; - } - - public TimerHandle getTimerHandle(int ident) { - logger.log(BasicLevel.DEBUG, ""); - TimerHandle hdl = null; - TimerService timerservice = sessionContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - Integer id = (Integer) t.getInfo(); - if (id.intValue() == ident) { - hdl = t.getHandle(); - TimerHandle hdl2 = getDeserializedHandle(hdl); - if (! timersAreIdentical(hdl, hdl2)) { - logger.log(BasicLevel.ERROR, "Bad timer handle"); - throw new EJBException("Bad timer handle"); - } - break; - } - } - return hdl; - } - - public void cancelTimer(int ident) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = sessionContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - Integer id = (Integer) t.getInfo(); - if (id.intValue() == ident) { - t.cancel(); - } - } - } - - public void cancelTimers() { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = sessionContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - t.cancel(); - } - } - - public long getTimeRemaining(int ident) { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = sessionContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - long ret = -1; - for (Iterator i = timerList.iterator(); i.hasNext(); ) { - Timer t = (Timer) i.next(); - Integer id = (Integer) t.getInfo(); - if (id.intValue() == ident) { - ret = t.getTimeRemaining(); - } - } - return ret; - } - - public int getTimerNumber() { - logger.log(BasicLevel.DEBUG, ""); - TimerService timerservice = sessionContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - return timerList.size(); - } - - public int getTimerCount() { - logger.log(BasicLevel.DEBUG, ""); - return timercount; - } - - /** - * This support method calls a required method - */ - public boolean supports_call_required() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - Simple mysession = (Simple) sessionContext.getEJBObject(); - return mysession.opwith_required(); - } - - public void startInfoTimer(int dur, String info) throws RemoteException { - logger.log(BasicLevel.ERROR, "not implemented"); - } - - // ----------------------------------------------------------- - // TimedObject implementation - // ----------------------------------------------------------- - - /** - * A timer is expired. - */ - public void ejbTimeout(Timer timer) { - logger.log(BasicLevel.DEBUG, ""); - timercount++; - TimerService timerservice = sessionContext.getTimerService(); - Collection timerList = timerservice.getTimers(); - TimerHandle hdl = timer.getHandle(); - TimerHandle hdl2 = getDeserializedHandle(hdl); - if (! timersAreIdentical(hdl, hdl2)) { - logger.log(BasicLevel.ERROR, "Bad timer handle"); - throw new EJBException("Bad timer handle"); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/jonas-transacted.xml b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/jonas-transacted.xml deleted file mode 100644 index f3c6006d54972055ca60de7955b3cc6952ed8208..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/transacted/jonas-transacted.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - SimpleSL - transactedSimpleSLHome - 4 - false - - - - SimpleSF - transactedSimpleSFHome - - - - SimpleSY - transactedSimpleSYHome - - - - SimpleEB - transactedSimpleEBHome - - jdbc/BMP - jdbc_1 - - - - - SimpleEC - transactedSimpleECHome - - jdbc_1 - transactedSimpleEC - - accno - c_accno - - - customer - c_customer - - - balance - c_balance - - - timerIdent - c_ident - - - timerCount - c_count - - - - finder_notsupported - - where c_customer = 'NotSupported' - - - - finder_required - - where c_customer = 'Required' - - - - finder_supports - - where c_customer = 'Supports' - - - - finder_requiresnew - - where c_customer = 'RequiresNew' - - - - finder_mandatory - - where c_customer = 'Mandatory' - - - - finder_never - - where c_customer = 'Never' - - - - - - SimpleEC2 - transactedSimpleEC2Home - removeall - - jdbc_1 - - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/worker/WorkerSF.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/worker/WorkerSF.java deleted file mode 100644 index f401da2ba3dfa4d0ddb8438401c8aa88fc2eae4b..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/beans/worker/WorkerSF.java +++ /dev/null @@ -1,314 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.beans.worker; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.resource.spi.work.Work; -import javax.resource.spi.work.WorkEvent; -import javax.resource.spi.work.WorkException; -import javax.resource.spi.work.WorkListener; -import javax.resource.spi.work.WorkManager; - -import org.ow2.jonas.lib.util.Log; -import org.ow2.jonas.lib.ejb21.JSessionContext; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Worker Implementation. - * This bean is JONAS specific because it uses the JSessionContext - * to retrieve the WorkManager. - * @author Philippe Durieux - */ -public class WorkerSF implements SessionBean, Work, WorkListener { - - private static final long serialVersionUID = 1L; - private static Logger logger = null; - private JSessionContext ejbContext; - private WorkManager workManager; - private int wcount; - private int notifyAccepted = 0; - private int notifyStarted = 0; - private int notifyRejected = 0; - private int notifyCompleted = 0; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param ctx A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = (JSessionContext) ctx; - } - - /** - * A container invokes this method before it ends the life of the session object. - * This happens as a result of a client's invoking a remove operation, or when a - * container decides to terminate the session object after a timeout. - * This method is called with no transaction context. - * - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * Create a session. - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - wcount = 0; - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * A container invokes this method when the instance is taken out of - * the pool of available instances to become associated with a specific - * EJB object. - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // Work implementation - // ------------------------------------------------------------------ - - public void release() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void run() { - logger.log(BasicLevel.DEBUG, ""); - wcount++; - } - - // ------------------------------------------------------------------ - // Worker implementation - // ------------------------------------------------------------------ - - /** - * set the count - */ - public void setwcount(int c) throws RemoteException { - wcount = c; - } - - /** - * get the count - */ - public int getwcount() throws RemoteException { - return wcount; - } - - /** - * @return the notify-accepted count - */ - public int getNotifyAccepted() { - return notifyAccepted; - } - - /** - * @return the notify-rejected count - */ - public int getNotifyRejected() { - return notifyRejected; - } - - /** - * @return the notify-completed count - */ - public int getNotifyCompleted() { - return notifyCompleted; - } - - /** - * @return the notify-started count - */ - public int getNotifyStarted() { - return notifyStarted; - } - - /** - * Run n works, synchronously. - */ - public void doWorks(int n) throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - for (int i = 0; i < n; i++) { - try { - getWM().doWork(this); - } catch (WorkException e) { - throw new RemoteException("doWork failed:" + e); - } - } - } - - /** - * Start n works - */ - public void startWorks(int n) throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - for (int i = 0; i < n; i++) { - try { - getWM().startWork(this); - } catch (WorkException e) { - throw new RemoteException("doWork failed:" + e); - } - } - } - - /** - * Schedule n works - */ - public void scheduleWorks(int n, long timeout) throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - for (int i = 0; i < n; i++) { - try { - getWM().scheduleWork(this, timeout, null, this); - } catch (WorkException e) { - throw new RemoteException("doWork failed:" + e); - } - } - } - - /** - * Run 1 work synchronously in a TX - * The tx attribute is set as "Required" - */ - public void doWorkInTx() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - getWM().doWork(this); - } catch (WorkException e) { - throw new RemoteException("doWork failed:" + e); - } - } - - /** - * Start 1 work in a TX - * The tx attribute is set as "Required" - */ - public void startWorkInTx() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - getWM().startWork(this); - } catch (WorkException e) { - throw new RemoteException("doWork failed:" + e); - } - } - - /** - * Schedule 1 work in a TX - * The tx attribute is set as "Required" - */ - public void scheduleWorkInTx() throws RemoteException { - logger.log(BasicLevel.DEBUG, ""); - try { - getWM().scheduleWork(this); - } catch (WorkException e) { - throw new RemoteException("doWork failed:" + e); - } - } - - // ------------------------------------------------------------------ - // Private Methods - // ------------------------------------------------------------------ - - /** - * Get the WorkManager - */ - private WorkManager getWM() { - if (workManager == null) { - workManager = ejbContext.getWorkManager(); - } - return workManager; - } - - /** - * sleep n seconds - * @param n seconds - */ - private void sleep(int n) { - try { - Thread.sleep(1000 * n); - } catch (InterruptedException e) { - } - } - - // ------------------------------------------------------------------------ - // WorkListener implementation - // ------------------------------------------------------------------------ - - public void workAccepted(WorkEvent we) { - logger.log(BasicLevel.DEBUG, ""); - notifyAccepted++; - } - - public void workRejected(WorkEvent we) { - logger.log(BasicLevel.DEBUG, ""); - notifyRejected++; - } - - public void workStarted(WorkEvent we) { - logger.log(BasicLevel.DEBUG, ""); - notifyStarted++; - } - - public void workCompleted(WorkEvent we) { - logger.log(BasicLevel.DEBUG, ""); - notifyCompleted++; - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_bank.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_bank.java deleted file mode 100644 index 3d81f758df76a07a76319f45adc179f2d7d245d6..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_bank.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - - -package org.objectweb.jonas.jtests.clients.distribution; - -import javax.rmi.PortableRemoteObject; -import org.objectweb.jonas.jtests.beans.bank.Manager; -import org.objectweb.jonas.jtests.beans.bank.ManagerHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -public abstract class A_bank extends A_bankRead { - - public A_bank(String name) { - super(name); - } - - /** - * Operation= Move - * min range for account nb = 2 - * max range for account nb = 2 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 1 - * no verification - * @throws Exception - */ - public void testSameAccount() throws Exception { - ope(OP_MOVETO, 2, 2, 10, 1, 10); - } - - /** - * Operation= Move - * min range for account nb = 6 - * max range for account nb = 6 - * nb of loop in each thread = 1 - * nb of threads running the same operations = 1 - * amount = 12 - * no verification - * @throws Exception - * No more multheaded see S_bank.java - */ - public void testMultiSameAccount() throws Exception { - createOpe(OP_MOVETO, 6, 6, 1, 1, 12); - } -} - - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_bankRead.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_bankRead.java deleted file mode 100644 index aa8c1cf91c3c736f10aaead1827d88c8f190853c..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_bankRead.java +++ /dev/null @@ -1,340 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import javax.rmi.PortableRemoteObject; -import org.objectweb.jonas.jtests.beans.bank.Manager; -import org.objectweb.jonas.jtests.beans.bank.ManagerHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -public abstract class A_bankRead extends JTestCase { - - protected static final int OP_READ = 1; - protected static final int OP_MOVE = 2; - protected static final int OP_CREATE = 3; - protected static final int OP_REMOVE = 4; - protected static final int OP_ONEMOVE = 5; - protected static final int OP_READTX = 6; - protected static final int OP_ONEMOVETX = 7; - protected static final int OP_MOVETO = 8; - - static final int initialValue = 1000; - static final int accountNb = 100; - - protected static ManagerHome home = null; - protected static Manager manager = null; - public static boolean threadfail; - public static Throwable threadex = null; - - public A_bankRead(String name) { - super(name); - } - - public abstract String getManagerHomeName(); - public abstract boolean getPrefetch(); - - protected void setUp() { - super.setUp(); - try { - if (home == null) { - useBeans("bank", false); - home = (ManagerHome) PortableRemoteObject.narrow(ictx.lookup(getManagerHomeName()), ManagerHome.class); - } - if (manager == null) { - manager = home.create(initialValue, getPrefetch()); - } - // Initializes the test by creating accounts - manager.createAll(accountNb); - threadfail = false; - threadex = null; - } catch (Exception e) { - fail("Exception raised in setup: " + e); - } - } - - protected void tearDown() throws Exception { - super.tearDown(); - if (manager != null) { - try { - try { - manager.reinitAll(); - } finally { - manager.remove(); - } - } finally { - manager = null; - } - } - } - - /** - * Create test accounts and run test ope - */ - public void createOpe(int action, int accmin, int accmax, int loops, int threads) throws Exception { - createOpe(action, accmin, accmax, loops, threads, 10); - } - - /** - * Create test accounts and run test ope - */ - public void createOpe(int action, int accmin, int accmax, int loops, int threads, int amount) throws Exception { - ope(OP_CREATE, accmin, accmax, (accmax - accmin + 1)*threads, 1, amount, true); - ope(action, accmin, accmax, loops, threads, amount, true); - } - - public void ope(int action, int accmin, int accmax, int loops, int threads) throws Exception { - ope(action, accmin, accmax, loops, threads, 10, true); - } - - public void ope(int action, int accmin, int accmax, int loops, int threads, int amount) throws Exception { - ope(action, accmin, accmax, loops, threads, amount, true); - } - - /** - * generic operation. - * @param accmin min range for account nb - * @param accmax max range for account nb - * @param loops nb of loop in each thread - * @param threads nb of threads running the same operations - */ - public void ope(int action, int accmin, int accmax, int loops, int threads, int amount, boolean verify) throws Exception { - - // Set transaction timeout in the server (global value!) - if (amount > 10) { - stopTxAt(20); - } - - // Create and start all threads - A_thread[] t_thr = new A_thread[threads]; - for (int i = 0; i < threads; i++) { - t_thr[i] = new A_thread(getManagerHomeName(), i, ictx, action, accmin, accmax, loops, amount, getPrefetch()); - t_thr[i].start(); - } - - // Wait end of all threads - for (int p = 0; p < threads; p++) { - t_thr[p].join(); - } - - // Check if all threads run ok - if (threadfail) { - throw new RuntimeException("Error in a thread", threadex); - } - if (verify) { - stopTxAt(60); - if (!manager.checkAll()) { - threadfail = true; // to reinit the database - fail("Bad global state"); - } - } - } - - - public void testCheckAll() throws Exception { - if (!manager.checkAll()) { - fail("Bad state in database"); - } - } - - /** - * Operation= read - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 1 - * nb of threads running the same operations = 1 - * no verification - * @throws Exception - */ - public void testBasicRead() throws Exception { - ope(OP_READ, 0, 9, 1, 1, 10, false); - } - - /** - * Operation= read in transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 1 - * nb of threads running the same operations = 1 - * no verification - * @throws Exception - */ - public void testBasicReadTx() throws Exception { - ope(OP_READTX, 0, 9, 1, 1, 10, false); - } - /** - * Operation= read - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 1 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - public void test3Readers() throws Exception { - createOpe(OP_READ, 0, 9, 10, 1); - } - - /** - * Operation= read - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 1 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - public void test4Readers() throws Exception { - createOpe(OP_READ, 0, 9, 10, 1); - } - /** - * Operation= read - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 1 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - public void test5Readers() throws Exception { - createOpe(OP_READ, 0, 9, 10, 1); - } - /** - * Operation= read - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 1 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - public void test8Readers() throws Exception { - createOpe(OP_READ, 0, 9, 10, 1); - } - - /** - * Operation= read in transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 1 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - public void test3ReadersTx() throws Exception { - createOpe(OP_READTX, 0, 9, 10, 1); - } - /** - * Operation= read in transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 1 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - public void test4ReadersTx() throws Exception { - createOpe(OP_READTX, 0, 9, 10, 1); - } - - /** - * Operation= read in transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 1 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - public void test5ReadersTx() throws Exception { - createOpe(OP_READTX, 0, 9, 10, 1); - } - - /** - * Operation= read in transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 8 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - public void test8ReadersTx() throws Exception { - createOpe(OP_READTX, 0, 9, 100, 1); - } - - /** - * Operation= read outside transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 1 - * nb of threads running the same operations = 1 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - - public void testMultiRead() throws Exception { - ope(OP_READ, 0, 9, 1, 1); - } - /** - * Operation= read inside transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 1 - * nb of threads running the same operations = 1 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - - public void testMultiReadTx() throws Exception { - ope(OP_READTX, 0, 9, 1, 1); - } - - /** - * Operation= read inside transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 1 - * nb of threads running the same operations = 10 - * verification of base's state - * @throws Exception - * No more multithreadedsee S_bank.java - */ - - public void testMultiShortReadTx() throws Exception { - createOpe(OP_READTX, 0, 9, 10, 1); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_bankWrite.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_bankWrite.java deleted file mode 100644 index 17b2d9d0edb6cf687c8ccbbfd0a11d6c45f1e76d..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_bankWrite.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import java.rmi.NoSuchObjectException; -import java.rmi.ServerException; - -public abstract class A_bankWrite extends A_bank { - - public A_bankWrite(String name) { - super(name); - } - - public void testBasicMove() throws Exception { - ope(OP_MOVE, 0, 9, 1, 1); - } - - public void testBasicMoveNC() throws Exception { - ope(OP_MOVE, 0, 9, 1, 1, 5, false); - } - - public void testBasicRemove() throws Exception { - createOpe(OP_REMOVE, 3000, 3001, 1, 1); - } - - public void testMultiRemove() throws Exception { - createOpe(OP_REMOVE, 3010, 3040, 1, 1); - } - - public void testManyRemove() throws Exception { - createOpe(OP_REMOVE, 3000, 3200, 200, 1); - } - - /** - * Test the rollback - */ - public void testBasicRB() throws Exception { - ope(OP_MOVE, 0, 2, 4, 1, 700); - } - - public void testMultiRB() throws Exception { - createOpe(OP_MOVE, 0, 4, 4, 1, 600); - } - - - public void testBasicCreate() throws Exception { - ope(OP_CREATE, 100, 150, 1, 1); - } - - public void testShortCreate() throws Exception { - ope(OP_CREATE, 6000, 8000, 100, 1); - } - - public void testMultiCreate() throws Exception { - ope(OP_CREATE, 1000, 1900, 1, 1); - } - - - public void testMultiMove() throws Exception { - ope(OP_MOVE, 0, 5, 1, 1); - } - - /** - * test access on removed account - * spec EJB 2.1 page 406 (18.3.6/18.3.7) says that the container - * must throw a NoSuchObjectException to the client. - */ - public void testAccessRemoved() throws Exception { - int num = 700; - // create the account if it doesn't exist yet - manager.readBalance(num); - manager.delAccount(num); - try { - // read balance for last accessed account - manager.readBalance(); - fail("must throw NoSuchObjectException"); - } catch (NoSuchObjectException e) { - manager = null; // avoids that all other tests fail - } catch (ServerException e) { - manager = null; // avoids that all other tests fail - if (! (e.getCause() instanceof NoSuchObjectException)) { - fail("Should receive NoSuchObjectException instead of :" + e); - } - } - } - - /** - * Test that an entity created inside a transaction rollback only is not accessible - * Emulate a problem raised by safir project - */ - public void testCreateRollbackOnly() throws Exception { - int num = 800; - manager.createRollbackOnly(num); - try { - // read balance for last accessed account - manager.readBalance(); - fail("must throw NoSuchObjectException"); - } catch (NoSuchObjectException e) { - manager = null; // avoids that all other tests fail - } catch (ServerException e) { - manager = null; // avoids that all other tests fail - if (! (e.getCause() instanceof NoSuchObjectException)) { - fail("Should receive NoSuchObjectException instead of :" + e); - } - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_thread.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_thread.java deleted file mode 100644 index eebb2a6cb1e867ed89595b10afc151b3747c1dce..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/A_thread.java +++ /dev/null @@ -1,230 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import java.rmi.RemoteException; -import java.rmi.ServerException; - -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.rmi.PortableRemoteObject; -import javax.transaction.TransactionRolledbackException; -import org.objectweb.jonas.jtests.beans.bank.Manager; -import org.objectweb.jonas.jtests.beans.bank.ManagerHome; - -public class A_thread extends Thread { - String managerName; - String name; - int ope; - int accmin; - int accmax; - int amount; - int loops; - int num; - boolean pf; - Context ictx; - Manager mgr = null; - ManagerHome mgrHome = null; - - public A_thread(String mname, int num, Context ictx, int ope, int accmin, int accmax, int loops, int amount, boolean pf) { - this.managerName = mname; - name = managerName + "." + ope + "." + num; - setName(name); - this.num = num; - this.ope = ope; - this.ictx = ictx; - this.accmin = accmin; - this.accmax = accmax; - this.loops = loops; - this.amount = amount; - this.pf = pf; - } - - public void run() { - - // Create a session bean - try { - mgrHome = (ManagerHome) PortableRemoteObject.narrow(ictx.lookup(managerName), ManagerHome.class); - mgr = mgrHome.create(A_bank.initialValue, pf); - } catch (Exception e) { - System.out.println("Cannot Create Session:" + e); - return; - } - - try { - switch (ope) { - case A_bank.OP_READ: - opRead(false); - break; - case A_bank.OP_READTX: - opRead(true); - break; - case A_bank.OP_MOVE: - opMove(); - break; - case A_bank.OP_MOVETO: - opMoveFromTo(amount/10 + num); - break; - case A_bank.OP_ONEMOVE: - if (num == 1) { - opMove(); - } else { - opRead(false); - } - break; - case A_bank.OP_ONEMOVETX: - if (num == 1) { - opMove(); - } else { - opRead(true); - } - break; - case A_bank.OP_CREATE: - opCreate(); - break; - case A_bank.OP_REMOVE: - opRemove(); - break; - default: - System.out.println("Bad OP: " + ope); - return; - } - } catch (RemoteException e) { - System.out.println("Thread " + name + " : " + e); - A_bank.threadfail = true; - A_bank.threadex = e; - } catch (RemoveException e) { - System.out.println("Thread " + name + " : " + e); - A_bank.threadfail = true; - A_bank.threadex = e; - } catch (RuntimeException e) { - System.out.println("Thread " + name + " : " + e); - A_bank.threadfail = true; - A_bank.threadex = e; - } finally { - try { - mgr.remove(); - } catch (javax.ejb.RemoveException e) { - throw new RuntimeException("remove failed", e); - } catch (RemoteException e) { - throw new RuntimeException("remove failed", e); - } - } - } - - private void opRead(boolean tx) throws RemoteException { - int acc = accmin + 10 * num; - for (int i = 0; i < loops; i++) { - acc++; - if (acc > accmax) { - acc = accmin; - } - int bal = tx ? mgr.readBalanceTx(acc) : mgr.readBalance(acc); - if (bal < 0) { - System.out.println("Thread " + name + " : account " + acc + ", negative balance = " + bal); - } - } - } - - private void opMoveFromTo(int delay) throws RemoteException { - int cre = (num % 2) == 0 ? accmin : accmax; - int deb = (num % 2) == 0 ? accmax : accmin; - try { - mgr.move(deb, cre, amount, delay); - } catch (TransactionRolledbackException e) { - // a possible rollback must not be considered as an error. - System.out.println("Thread " + name + " : " + e); - } catch (ServerException e) { - if (e.detail instanceof TransactionRolledbackException) { - System.out.println("Thread " + name + " : " + e.detail); - } else { - throw e; - } - } - } - - private void opMove() throws RemoteException { - int incr = num % (accmax - accmin); - int cre = accmin + incr; - int deb = accmin + incr + 1; - for (int i = 0; i < loops; i++) { - cre++; - if (cre > accmax) { - cre = accmin; - } - deb += 2; - if (deb > accmax) { - deb = accmin + 1; - } - // Add this to avoids deb = cre - if (deb == cre) { - if (deb > accmin) { - deb--; - } else { - deb++; - } - } - try { - mgr.move(deb, cre, amount, 0); - } catch (TransactionRolledbackException e) { - // a possible rollback must not be considered as an error. - System.out.println("Thread " + name + " : " + e); - } catch (ServerException e) { - if (e.detail instanceof TransactionRolledbackException) { - System.out.println("Thread " + name + " : " + e.detail); - } else { - throw e; - } - } - } - } - - private void opCreate() throws RemoteException { - int acc = accmin; - int errcount = 0; - for (int i = 0; i < loops; i++) { - acc++; - int bal = mgr.readBalanceTx(acc); - if (bal < 0) { - System.out.println("Thread " + name + " : account " + acc + ", negative balance = " + bal); - } - } - } - - private void opRemove() throws RemoteException, RemoveException { - int acc = accmin + 20 * num; - for (int i = 0; i < loops; i++) { - acc++; - if (acc > accmax) { - acc = accmin; - } - mgr.delAccount(acc); - } - } - -} - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/C_distribution.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/C_distribution.java deleted file mode 100644 index 6f8e2a5881b04750f2e02f5156bc1aab8d1423ad..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/C_distribution.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * This test suites test distribution pbs and involve generally - * several beans, with different types of interfaces. - * Beans used: folder - * @author Philippe Coq, Philippe Durieux (jonas team) - */ -public class C_distribution extends JTestCase { - - public C_distribution(String name) { - super(name); - } - - public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTest(F_FrontalCMP2.suite()); - suite.addTest(F_Frontal.suite()); - suite.addTest(F_Jdbc.suite()); - suite.addTest(F_Cluster.suite()); - suite.addTest(F_bankCRC.suite()); - suite.addTest(F_bankDB.suite()); - suite.addTest(F_bankRO.suite()); - suite.addTest(F_bankCST.suite()); - suite.addTest(F_bankCRW.suite()); - - return suite; - } - - public static void main (String args[]) { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/F_Frontal.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/F_Frontal.java deleted file mode 100644 index 00755699e933e3298090dbd212971222af53b013..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/F_Frontal.java +++ /dev/null @@ -1,234 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import java.rmi.NoSuchObjectException; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.ow2.carol.util.perfs.CarolJRMPPerformanceHelper; -import org.objectweb.jonas.jtests.beans.folder.File; -import org.objectweb.jonas.jtests.beans.folder.Folder; -import org.objectweb.jonas.jtests.beans.folder.FolderHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * Test a session bean remote accessing entities local. - * Beans used: folder - * @author Philippe Durieux - */ -public class F_Frontal extends JTestCase { - - protected static FolderHome fhome = null; - protected Folder folder = null; - - public F_Frontal(String name) { - super(name); - } - - protected void setUp() { - super.setUp(); - if (fhome == null) { - useBeans("folder", true); - try { - fhome = (FolderHome) PortableRemoteObject.narrow(ictx.lookup("FolderSYHome"), FolderHome.class); - assertNotNull(fhome); - } catch (NamingException e) { - fail("Cannot get bean home"); - } - } - if (folder == null) { - try { - folder = fhome.create(); - assertNotNull(folder); - } catch (Exception e) { - fail("Cannot create folder session " + e); - } - } - } - - public void testSetRollbackOnly() throws Exception { - Folder f1 = fhome.createForRollback(); - f1.getIntTS(2); - f1.remove(); - } - - /** - * create 1 entity and remove it by its remote reference. - */ - public void testCreate1F() throws Exception { - File f = folder.newFile("file1"); - assertNotNull(f); - f.remove(); - } - - public void testAccessOnRemovedEntity() throws Exception { - File f = folder.newFile("file1"); - File f2 = folder.getFile("file1"); - f2.remove(); - try { - f.getName(); - fail("Should not access deleted object"); - } catch (NoSuchObjectException e) { - } catch (Exception e) { - fail("Bab Exception:" + e); - } - } - - /** - * print serialized form of the reference - */ - public void testSerializedReference() throws Exception { - String mfolder = CarolJRMPPerformanceHelper.getMarshalBytes(folder); - //System.out.println("Marshalled Ref = " + mfolder); - } - - /** - * send a reference as argument - */ - public void testSendRef() throws Exception { - for (int i = 0; i < 20; i++) { - folder.sendRef(folder); - } - } - - /** - * send an int as argument - */ - public void testSendInt() throws Exception { - for (int i = 0; i < 20; i++) { - folder.sendInt(1); - } - } - - /** - * send and get a reference as argument - */ - public void testGetRef() throws Exception { - for (int i = 0; i < 20; i++) { - folder.getRef(folder); - } - } - - /** - * send and get an int as argument - */ - public void testGetInt() throws Exception { - for (int i = 0; i < 20; i++) { - folder.getInt(1); - } - } - - /** - * send a reference as argument - */ - public void testSendRefTS() throws Exception { - for (int i = 0; i < 20; i++) { - folder.sendRefTS(folder); - } - } - - /** - * send an int as argument - */ - public void testSendIntTS() throws Exception { - for (int i = 0; i < 20; i++) { - folder.sendIntTS(1); - } - } - - /** - * send and get a reference as argument - */ - public void testGetRefTS() throws Exception { - for (int i = 0; i < 20; i++) { - folder.getRefTS(folder); - } - } - - /** - * send and get an int as argument - */ - public void testGetIntTS() throws Exception { - for (int i = 0; i < 20; i++) { - folder.getIntTS(1); - } - } - - /** - * to reproduce bug 305498 - * use ejbql query SELECT SUM (p.value) FROM jt2_paper AS p] - */ - public void testModify() throws Exception { - int result = folder.modify("aaaa", 100); - Assert.assertEquals("bad result", 120, result); - } - - /** - * try to reproduce bug on ejbSelect #305711 - * use ejbql query SELECT SUM (p.valeur) FROM jt2_paper2 AS p WHERE p.paper3.valide = '1' - */ - public void testModifyPaper2And3() throws Exception { - int result = folder.modifypaper2And3("1", 55); - Assert.assertEquals("bad result", 85, result); - } - - /** - * to see if the previous pb on ejbSelect exists on finder - * Here we use a finder method with - * SELECT OBJECT(o) FROM jt2_paper2 AS p WHERE p.paper3.valide = '1' - */ - public void testModifyPaper2And3WithFinder() throws Exception { - int result = folder.modifypaper2And3WithFinder("1", 55); - Assert.assertEquals("bad result", 3, result); - } - - - public static Test suite() { - return new TestSuite(F_Frontal.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_Frontal(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/F_Jdbc.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/F_Jdbc.java deleted file mode 100644 index 244a77ef26904e0f2f8794222d91517fd57117cd..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/F_Jdbc.java +++ /dev/null @@ -1,200 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.beans.jdbc.Manager; -import org.objectweb.jonas.jtests.beans.jdbc.ManagerHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * Test Jdbc accesses from a session bean - * Beans used: jdbc - * @author Philippe Durieux - */ -public class F_Jdbc extends JTestCase { - - protected static ManagerHome mhome = null; - protected Manager manager = null; - - public F_Jdbc(String name) { - super(name); - } - - protected void tearDown() throws Exception { - if (manager != null) { - manager.remove(); - } - } - - protected void setUp() { - super.setUp(); - if (mhome == null) { - useBeans("jdbc", true); - try { - mhome = (ManagerHome) PortableRemoteObject.narrow(ictx.lookup("jdbcManagerSYHome"), ManagerHome.class); - assertNotNull(mhome); - } catch (NamingException e) { - fail("Cannot get bean home"); - } - } - if (manager == null) { - try { - manager = mhome.create(); - assertNotNull(manager); - } catch (Exception e) { - fail("Cannot create manager session"); - } - } - } - - /** - * Test we can open a Connection - */ - public void testOpenConnection() throws Exception { - int cnb = manager.openConnection(); - assertTrue("Cannot open Connection", cnb > 0); - } - - /** - * Test we can close a Connection previously opened - */ - public void testCloseConnection() throws Exception { - int cnb = manager.openConnection(); - assertTrue("open connection failed", cnb > 0); - assertTrue("isClosed() should return true after close()", manager.closeConnection(cnb)); - } - - /** - * test we can create and close a Connection in the same method. - */ - public void testOpenCloseConnection() throws Exception { - assertTrue("basic open+close failed", manager.openCloseConnection()); - } - - /** - * test that we cannot use a connection after close. - * an SQLException should be raised (spec JDBC 2.0 p.21) - */ - public void testAccessConnectionAfterClose() throws Exception { - assertTrue("using conn after close must raise SQLException", manager.accessCloseConnection()); - } - - /** - * Test simple jdbc access (write value) - */ - public void testJdbcStoreNoTx() throws Exception { - manager.storeValue("pk1", 1); - } - - /** - * Test simple jdbc access (write value) in committed tx - */ - public void testJdbcStoreCommit() throws Exception { - int val = manager.getValue("pk1"); - utx.begin(); - try { - manager.storeValue("pk1", val + 1); - } finally { - utx.commit(); - } - assertEquals("Commit did not work", val + 1, manager.getValue("pk1")); - } - - /** - * Test simple jdbc access (write value) in committed tx - */ - public void testJdbcStore2Commit() throws Exception { - int val = manager.getValue("pk1"); - int val2 = manager.getValue("pk2"); - utx.begin(); - try { - manager.storeValue("pk1", val + 1); - manager.storeValue("pk2", val2 + 1); - } finally { - utx.commit(); - } - assertEquals("Commit did not work", val + 1, manager.getValue("pk1")); - assertEquals("Commit did not work", val2 + 1, manager.getValue("pk2")); - } - - /** - * Test simple jdbc access (write value) in rollback tx - */ - public void testJdbcStoreRollback() throws Exception { - int val = manager.getValue("pk1"); - utx.begin(); - try { - manager.storeValue("pk1", val + 1); - } finally { - utx.rollback(); - } - assertEquals("Rollback did not work", val, manager.getValue("pk1")); - } - - /** - * Test with 2 resources - */ - public void testJdbcStore2Rollback() throws Exception { - int val1 = manager.getValue("pk1"); - int val2 = manager.getValue("pk2"); - utx.begin(); - try { - manager.storeValue("pk1", val1 + 1); - manager.storeValue("pk2", val2 + 1); - } finally { - utx.rollback(); - } - assertEquals("Rollback did not work", val1, manager.getValue("pk1")); - assertEquals("Rollback did not work", val2, manager.getValue("pk2")); - } - - public static Test suite() { - return new TestSuite(F_Jdbc.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_Jdbc(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/F_bankRO.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/F_bankRO.java deleted file mode 100644 index b23776d0709bc56b68d36e70bc0c94021aef4b0e..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/F_bankRO.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import javax.rmi.PortableRemoteObject; - -import org.objectweb.jonas.jtests.beans.bank.Manager; -import org.objectweb.jonas.jtests.beans.bank.ManagerHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class F_bankRO extends A_bankRead { - - protected static ManagerHome homecs = null; - protected static Manager managercs = null; - public static boolean threadfail; - static final int accountNb = 150; - public F_bankRO(String name) { - super(name); - } - - public String getManagerHomeName() { - return "bankManagerROHome"; - } - - public boolean getPrefetch() { - return false; - } - - protected void setUp() { - - try { - if (home == null) { - useBeans("bank", false); - home = (ManagerHome) PortableRemoteObject.narrow(ictx.lookup(getManagerHomeName()), ManagerHome.class); - } - if (manager == null) { - manager = home.create(initialValue, getPrefetch()); - } - } catch (Exception e) { - fail("Exception raised in setup: " + e); - } - try { - // Create all accounts with another manager (not the read-only one) - if (homecs == null) { - homecs = (ManagerHome) PortableRemoteObject.narrow(ictx.lookup("bankManagerCSHome"), ManagerHome.class); - } - if (managercs == null) { - managercs = homecs.create(initialValue, false); - } - // Initializes the test by creating accounts - - managercs.createAll(accountNb); - threadfail = false; - } catch (Exception e) { - fail("Exception raised in setup: " + e); - } - } - - - public static Test suite() { - return new TestSuite(F_bankRO.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_bankRO(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bank.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bank.java deleted file mode 100644 index dd2d4d3e381bff2931765d5d559aa0eefb2fbaeb..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bank.java +++ /dev/null @@ -1,222 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - - -package org.objectweb.jonas.jtests.clients.distribution; - -import javax.rmi.PortableRemoteObject; -import org.objectweb.jonas.jtests.beans.bank.Manager; -import org.objectweb.jonas.jtests.beans.bank.ManagerHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -public abstract class S_bank extends A_bankRead { - - public S_bank(String name) { - super(name); - } - - /** - * Here is kept testcases that fails from time to times - * do to the multithreading? - * It comes from A_bank.java - */ - - /** - * Operation= Move - * min range for account nb = 6 - * max range for account nb = 6 - * nb of loop in each thread = 1 - * nb of threads running the same operations = 4 - * amount = 12 - * no verification - * @throws Exception - */ - public void testMultiSameAccount() throws Exception { - createOpe(OP_MOVETO, 6, 6, 1, 4, 12); - } - - /** - * Operation= read - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 3 - * verification of base's state - * @throws Exception - */ - public void test3Readers() throws Exception { - createOpe(OP_READ, 0, 9, 10, 3); - } - - /** - * Operation= read - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 4 - * verification of base's state - * @throws Exception - */ - public void test4Readers() throws Exception { - createOpe(OP_READ, 0, 9, 10, 4); - } - /** - * Operation= read - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 5 - * verification of base's state - * @throws Exception - */ - public void test5Readers() throws Exception { - createOpe(OP_READ, 0, 9, 10, 5); - } - /** - * Operation= read - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 8 - * verification of base's state - * @throws Exception - */ - public void test8Readers() throws Exception { - createOpe(OP_READ, 0, 9, 10, 8); - } - - /** - * Operation= read in transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 3 - * verification of base's state - * @throws Exception - */ - public void test3ReadersTx() throws Exception { - createOpe(OP_READTX, 0, 9, 10, 3); - } - /** - * Operation= read in transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 4 - * verification of base's state - * @throws Exception - */ - public void test4ReadersTx() throws Exception { - createOpe(OP_READTX, 0, 9, 10, 4); - } - - /** - * Operation= read in transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 5 - * verification of base's state - * @throws Exception - */ - public void test5ReadersTx() throws Exception { - createOpe(OP_READTX, 0, 9, 10, 5); - } - - /** - * Operation= read in transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 8 - * verification of base's state - * @throws Exception - */ - public void test8ReadersTx() throws Exception { - createOpe(OP_READTX, 0, 9, 100, 8); - } - - /** - * Operation= read outside transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 1 - * nb of threads running the same operations = 10 - * verification of base's state - * @throws Exception - */ - - public void testMultiRead() throws Exception { - ope(OP_READ, 0, 9, 1, 10); - } - /** - * Operation= read inside transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 1 - * nb of threads running the same operations = 10 - * verification of base's state - * @throws Exception - */ - - public void testMultiReadTx() throws Exception { - ope(OP_READTX, 0, 9, 1, 10); - } - - /** - * Operation= read inside transaction - * min range for account nb = 0 - * max range for account nb = 9 - * nb of loop in each thread = 10 - * nb of threads running the same operations = 10 - * verification of base's state - * @throws Exception - */ - - /* these tests come from A_bankWrite */ - - public void testMultiShortReadTx() throws Exception { - createOpe(OP_READTX, 0, 9, 10, 10); - } - - public void testMultiRemove() throws Exception { - createOpe(OP_REMOVE, 3010, 3040, 1, 4); - } - - public void testManyRemove() throws Exception { - createOpe(OP_REMOVE, 3000, 3200, 200, 1); - } - public void testMultiRB() throws Exception { - createOpe(OP_MOVE, 0, 4, 4, 5, 600); - } - public void testMultiCreate() throws Exception { - ope(OP_CREATE, 1000, 1900, 1, 12); - } - - public void testMultiMove() throws Exception { - ope(OP_MOVE, 0, 5, 1, 5); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCRC.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCRC.java deleted file mode 100644 index 45fac8768d787285a48c38f57c5187a797b734ae..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCRC.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class S_bankCRC extends A_bankWrite { - - public S_bankCRC(String name) { - super(name); - } - - public String getManagerHomeName() { - return "bankManagerCRCHome"; - } - - public boolean getPrefetch() { - return false; - } - - public static Test suite() { - return new TestSuite(S_bankCRC.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new S_bankCRC(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCRW.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCRW.java deleted file mode 100644 index c229a55ad5b4912b9739d6c27adbcb8bbf7dc28c..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCRW.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class S_bankCRW extends A_bankWrite { - - public S_bankCRW(String name) { - super(name); - } - - public String getManagerHomeName() { - return "bankManagerCRWHome"; - } - - public boolean getPrefetch() { - return false; - } - - public static Test suite() { - return new TestSuite(S_bankCRW.class); - } - - public static void main(String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new S_bankCRW(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCS.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCS.java deleted file mode 100644 index 423f5b869142c128cc2fdab31ed40668c9fc35b1..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCS.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class S_bankCS extends A_bankWrite { - - public S_bankCS(String name) { - super(name); - } - - public String getManagerHomeName() { - return "bankManagerCSHome"; - } - - public boolean getPrefetch() { - return false; - } - - public static Test suite() { - return new TestSuite(S_bankCS.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new S_bankCS(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCST.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCST.java deleted file mode 100644 index 5136ab5d745b67696f12da454872826b78f66ea0..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCST.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class S_bankCST extends S_bank { - - public S_bankCST(String name) { - super(name); - } - - public String getManagerHomeName() { - return "bankManagerCSTHome"; - } - - public boolean getPrefetch() { - return false; - } - - public static Test suite() { - return new TestSuite(S_bankCST.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new S_bankCST(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCSpf.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCSpf.java deleted file mode 100644 index f8980bb77449d1dc1dfe356b1dc92985dea4bbc4..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_bankCSpf.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class S_bankCSpf extends A_bankWrite { - - public S_bankCSpf(String name) { - super(name); - } - - public String getManagerHomeName() { - return "bankManagerCSHome"; - } - - public boolean getPrefetch() { - return true; - } - - public static Test suite() { - return new TestSuite(S_bankCSpf.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new S_bankCSpf(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_distribution.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_distribution.java deleted file mode 100644 index d5e3cf6436a0c34eb34373896357df8966651dd5..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/distribution/S_distribution.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.distribution; - -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * This test suites collects all the suites that have testcases that may fail in distribution directory - * failing is not systematic and may depend of the speed of the computer - * Beans used:bank, cluster, folder - * @author Philippe Coq, Philippe Durieux (jonas team) - */ -public class S_distribution extends JTestCase { - - public S_distribution(String name) { - super(name); - } - - public static Test suite() { - TestSuite suite = new TestSuite(); - - suite.addTest(S_bankCS.suite()); - suite.addTest(S_bankCSpf.suite()); - suite.addTest(S_bankCRW.suite()); - suite.addTest(S_bankCRC.suite()); - return suite; - } - - public static void main (String args[]) { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_AdvancedHomeEC.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_AdvancedHomeEC.java deleted file mode 100644 index 47a59351e80605b951798ec5eb9556a522e9c71c..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_AdvancedHomeEC.java +++ /dev/null @@ -1,808 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import java.rmi.RemoteException; -import java.util.Enumeration; - -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.Handle; -import javax.ejb.RemoveException; -import javax.rmi.PortableRemoteObject; -import javax.transaction.RollbackException; - -import org.objectweb.jonas.jtests.beans.annuaire.Personne; -import org.objectweb.jonas.jtests.beans.annuaire.PersonneHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * This is an advanced test suite for home interface on entity bean CMP. - * Beans used: annuaire - * @author Philippe Coq, Philippe Durieux, Helene Joanin (jonas team) - */ -public abstract class A_AdvancedHomeEC extends JTestCase { - - String mynum = "638"; - String myname = "Philippe Durieux"; - - public A_AdvancedHomeEC(String name) { - super(name); - } - - protected void setUp() { - super.setUp(); - } - - /** - * return PersonneHome, that can be either CMP v1 or CMP v2 bean. - */ - abstract public PersonneHome getHome(); - - /** - * Test findByPK in transaction - * Check in jonas admin that transaction count is OK. - * Possible pb is that since there are no resource associated, - * the distributed commit will not go to the server. - */ - public void testFindByPkTx() throws Exception { - Personne p = null; - - utx.begin(); - try { - p = getHome().findByPrimaryKey(myname); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - } - - /** - * test du findAll, returning an Enumeration. - * Some of the beans are already in the database, some other are created. - */ - public void testFindAllEnum() throws Exception { - Enumeration e = null; - e = getHome().findAll(); - int count = 0; - while (e.hasMoreElements()) { - count++; - Personne p = (Personne) - PortableRemoteObject.narrow(e.nextElement(), Personne.class); - } - assertEquals("Wrong number of bean (case 1)", 10, count); - Personne p1 = getHome().create("Paul Morgan", "1234256"); - Personne p2 = getHome().create("Jean Richard", "1234356"); - Personne p3 = getHome().create("Jean-Paul Landry", "1234556"); - e = getHome().findAll(); - count = 0; - while (e.hasMoreElements()) { - count++; - Personne p = (Personne) - PortableRemoteObject.narrow(e.nextElement(), Personne.class); - } - assertEquals("Wrong number of bean (case 2)", 13, count); - // cleaning - p1.remove(); - p2.remove(); - p3.remove(); - e = getHome().findAll(); - count = 0; - while (e.hasMoreElements()) { - count++; - Personne p = (Personne) PortableRemoteObject.narrow(e.nextElement(), Personne.class); - } - assertEquals("Wrong number of bean (case 3)", 10, count); - } - - /** - * test Create inside a Transaction. - */ - public void testCreateInTx() throws Exception { - utx.begin(); - try { - getHome().create("Duke Ellington", "12235446"); - utx.commit(); - Personne p = getHome().findByNom("Duke Ellington"); - p.remove(); - utx.begin(); - getHome().create("Louis Armstrong", "12035446"); - } catch (Exception e) { - fail(e.getMessage()); - } finally { - utx.rollback(); - } - try { - getHome().findByNom("Louis Armstrong"); - fail("Should not find it"); - } catch (FinderException e) { - } - } - - /** - * test a simple Create inside a Transaction. - */ - public void testSimpleCreateInTx() throws Exception { - utx.begin(); - try { - getHome().create("Mike", "12235846"); - } catch (Exception e) { - fail(e.getMessage()); - } finally { - utx.commit(); - } - Personne p = getHome().findByNom("Mike"); - p.remove(); - } - - /** - * test a simple Remove - * Find an instance already in database and remove it. - */ - public void testSimpleRemove() throws Exception { - Personne p = getHome().findByNom("Adriana Danes"); - p.remove(); - getHome().create("Adriana Danes", "777"); // cleaning - } - - /** - * test remove twice - */ - public void testRemoveTwice() throws Exception { - Personne p = getHome().create("Andre", "77710"); // first create a new element - p.remove(); - try { - p.remove(); - fail("Should not be able to remove this object twice"); - } catch (RemoteException e) { - // OK - } catch (Exception e) { - fail("Bad exception raised: " + e); - } - } - - /** - * test remove twice in same transaction - */ - public void testRemoveTwiceTx() throws Exception { - Personne p = getHome().create("Andre", "77710"); // first create a new element - utx.begin(); - try { - p.remove(); - p.remove(); - fail("Should not be able to remove this object twice"); - } catch (RemoteException e) { - // OK: normal case because 2nd remove must fail - } catch (Exception e) { - fail("Bad exception raised: " + e); - } finally { - try { - utx.commit(); - } catch (RollbackException e) { - // Possibly go here, since 2nd remove failed. - // clean object (1st remove has been rolled back!) - // Don't use p because instance should have been discarded. - getHome().remove("Andre"); - } - } - } - - /** - * Test Create + Business Method inside the same Tx - */ - public void testCreateAndBusiness() throws Exception { - String num = "00000001"; - Personne p = null; - utx.begin(); - try { - p = getHome().create("Lionel Hampton", "92235446"); - p.setNumero(num); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - assertTrue(num.equals(p.getNumero())); - p.remove(); // cleaning - } - - /** - * Test remove(pk): create / find / remove(pk) / find - */ - public void testRemovePk() throws Exception { - Personne p = null; - String newman = "Xavier Spengler"; - p = getHome().create(newman, "6"); - getHome().findByPrimaryKey(newman); - getHome().remove(newman); - try { - getHome().findByPrimaryKey(newman); - fail("Should not exist anymore"); - } - catch (FinderException e) { - } - } - - /** - * Test remove(handle): create / find / remove(handle) / find - * CMP2: bug #300419 - */ - public void testRemoveHandle() throws Exception { - Personne p = null; - String newman = "Xavier Spengler"; - p = getHome().create(newman, "6"); - Handle h = p.getHandle(); - getHome().remove(h); - try { - getHome().findByPrimaryKey(newman); - fail("Should not exist anymore"); - } catch (FinderException e) { - } - } - - /** - * Test remove(pk) inside transaction: - * create / find / remove(pk) / find - */ - public void testRemovePkInTx() throws Exception { - Personne p = null; - String newman = "Xavier Spengler"; - p = getHome().create(newman, "6"); - getHome().findByPrimaryKey(newman); - utx.begin(); - try { - getHome().remove(newman); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - try { - getHome().findByPrimaryKey(newman); - fail("Should not exist anymore"); - } - catch (FinderException e) { - } - } - - /** - * Test remove(pk) of a non-existent pk. - */ - public void testRemovePkNonExistent() throws Exception { - String man = "NonExistent"; - try { - getHome().remove(man); - fail("No RemoteException"); - } - catch (RemoteException e) { - } - } - - /** - * Test remove(pk) of a non-existent pk inside transaction. - * See ejb2.1 18.3.1 - */ - public void testRemovePkNonExistentInTx() throws Exception { - String man = "NonExistent"; - utx.begin(); - try { - getHome().remove(man); - fail("No RemoteException"); - } - catch (RemoteException e) { - } finally { - try { - utx.commit(); - fail("transaction should be marked as rollback"); - } catch (RollbackException e) { - } - } - } - - /** - * Test bean.remove : - * create / find / remove / find - */ - public void testRemove() throws Exception { - Personne p = null; - String newman = "Jeannot"; - p = getHome().create(newman, "5"); - getHome().findByPrimaryKey(newman); - p.remove(); - try { - getHome().findByPrimaryKey(newman); - fail("Should not exist anymore"); - } - catch (FinderException e) { - } - } - - /** - * Test bean.remove : - * create / find / remove / bussiness method - * Ensure the javax.ejb.EJBException is thrown when trying - * to invoke an accessor method on a deleted entitybean object - */ - public void testRemove2() throws Exception { - Personne p = null; - String newman = "Jeannot2"; - p = getHome().create(newman, "5"); - getHome().findByPrimaryKey(newman); - p.remove(); - try { - p.getNumero(); - fail("Should not exist anymore"); - } - catch (Exception e) { - } - } - - /** - * Test remove by PK in a tx rolled back - * we modify the bean instance outside tx, then we check that - * the bean state has not been changed by the rolled back remove - */ - public void testRemovePKRB() throws Exception { - String newnum = "344"; - String name = "remove-by-pk"; - Personne p = getHome().create(name, "420"); - p.setNumero(newnum); - utx.begin(); - getHome().remove(name); - utx.rollback(); - try { - assertEquals("Lost modified value", newnum, p.getNumero()); - } finally { - // cleaning - getHome().remove(name); - } - } - - /** - * Test remove in a tx rolled back - * we modify the bean instance outside tx, then we check that - * the bean state has not been changed by the rolled back remove - */ - public void testRemoveRB() throws Exception { - String newnum = "345"; - String name = "remove-instance"; - Personne p = getHome().create(name, "421"); - p.setNumero(newnum); - utx.begin(); - p.remove(); - utx.rollback(); - try { - assertEquals("Lost modified value", newnum, p.getNumero()); - } finally { - // cleaning - //p.remove(); - getHome().remove(name); - } - } - - /** - * Test bean.remove inside a tx: - * create / find / remove / find - */ - public void testRemoveInTx() throws Exception { - Personne p = null; - String newman = "Jeannot"; - p = getHome().create(newman, "5"); - getHome().findByPrimaryKey(newman); - utx.begin(); - try { - p.remove(); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - try { - getHome().findByPrimaryKey(newman); - fail("Should not exist anymore"); - } - catch (FinderException e) { - } - } - - /** - * Test finder in transactions - */ - public void testFinderInTx() throws Exception { - Personne p = null; - - // FindByPrimaryKey - for (int i = 0; i < 3; i++) { - utx.begin(); - try { - p = getHome().findByPrimaryKey(myname); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - } - assertTrue(p.getNumero().equals(mynum)); - - // FindByNum - for (int i = 0; i < 7; i++) { - utx.begin(); - try { - p = getHome().findByNom(myname); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - } - assertTrue(p.getNumero().equals(mynum)); - - // FindAll - for (int i = 0; i < 11; i++) { - utx.begin(); - try { - getHome().findAll(); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - } - } - - /** - * Test create + remove in transactions - */ - public void testCreateRemoveInTx() throws Exception { - for (int i = 0; i < 20; i++) { - utx.begin(); - try { - getHome().create("Eric Paire", "500"); - getHome().remove("Eric Paire"); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - } - } - - /** - * test 2 findByPrimaryKey in the same tx, with an update - * between the 2 calls. We shall see the modifications, even before - * the commit occurs. - */ - public void testFindTwice() throws Exception { - String num = "0032"; - String oldnum = ""; - utx.begin(); - Personne p = null; - try { - p = getHome().findByPrimaryKey(myname); - oldnum = p.getNumero(); - p.setNumero(num); - Personne p2 = getHome().findByPrimaryKey(myname); - assertTrue(p2.getNumero().equals(num)); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.rollback(); - } - p = getHome().findByPrimaryKey(myname); - assertTrue(p.getNumero().equals(oldnum)); - } - - /** - * Test DuplicateKeyException. - * Create in an implicit tx - * known bug #300836: remove it from the list - */ - public void _testDuplicateKeyTx() throws Exception { - getHome().findByPrimaryKey(myname); - try { - getHome().create(myname, "700"); - fail("DuplicateKeyException not raised"); - } catch (DuplicateKeyException e) { - } catch (Exception e) { - fail("Bad Exception raised:" + e); - } - } - - /** - * Test DuplicateKeyException. - * Create outside tx - * known bug #300836: remove it from the list - */ - public void _testDuplicateKey() throws Exception { - try { - getHome().create(myname, "700", true); - fail("DuplicateKeyException not raised"); - } catch (DuplicateKeyException e) { - } catch (Exception e) { - fail("Bad exception raised: " + e); - } - } - - public void testDuplicateKey2() throws Exception { - getHome().findByPrimaryKey(myname); - try { - getHome().create(myname, "700", true); - fail("DuplicateKeyException not raised"); - } catch (DuplicateKeyException e) { - // should go here - } catch (Exception e) { - // go here in jonas-3-3-6 - } - utx.begin(); - Personne p0 = getHome().findByPrimaryKey(myname); - utx.commit(); - String num = p0.getNumero(); - assertTrue("bad value: " + num + ", should be: " + mynum, num.equals(mynum)); - } - - public void testRemoveCreateTx() throws Exception { - utx.begin(); - try { - getHome().remove(myname); - getHome().create(myname, mynum, true); - } finally { - utx.commit(); - } - getHome().findByPrimaryKey(myname); - } - - /** - * Verify that we can create an entity with a null name - * - */ - public void testCreateNull() throws Exception { - getHome().create("nullv", null); - getHome().remove("nullv"); // cleaning - } - - /** - * Test many Create calls - */ - public void testManyCreate() throws Exception { - int nbCreate = 20; - for (int i = 1; i <= nbCreate; i++) { - Personne p = getHome().create("manycreate" + i, "num" + i, true); - } - for (int i = 1; i <= nbCreate; i++) { - getHome().remove("manycreate" + i); - } - } - - public void testRemoveCreate() throws Exception { - Personne p1 = null; - String man1 = "Count"; - utx.begin(); - getHome().create(man1, "1"); - utx.commit(); - p1 = getHome().findByNom(man1); - p1.remove(); - getHome().create(man1, "1"); - p1 = getHome().findByNom(man1); - p1.remove(); - } - - public void testRemoveCreate2() throws Exception { - Personne p1 = null; - String man1 = "Duke"; - p1 = getHome().create(man1, "1"); - p1.remove(); - p1 = getHome().create(man1, "1"); - p1.remove(); - } - - public void testRemoveCreate3() throws Exception { - Personne p4 = null; - String man4 = "Dexter"; - p4 = getHome().create(man4, "4"); - getHome().findByPrimaryKey(man4); - getHome().remove(man4); - p4 = getHome().create(man4, "44"); - getHome().remove(man4); - } - - /** - * Combination of other tests - * This test the transaction isolation in entity bean container - * this test must never hang - */ - public void testIsolation() throws Exception { - Personne p0 = null; - Personne p1 = null; - Personne p2 = null; - Personne p3 = null; - Personne p4 = null; - Personne p5 = null; - String n = null; - String man1 = "Duke Ellington"; - String man2 = "Louis Armstrong"; - String man3 = "Lionel Hampton"; - String man4 = "Dexter Gordon"; - String man5 = "Bill Evans"; - - // man1 - utx.begin(); - try { - getHome().create(man1, "1"); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - p1 = getHome().findByNom(man1); - - // man2 - utx.begin(); - try { - getHome().create(man2, "2"); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.rollback(); - } - - // man3 - utx.begin(); - try { - p3 = getHome().create(man3, "3"); - p3.setNumero("33"); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - assertTrue(p3.getNumero().equals("33")); - - // cleaning - p1.remove(); - p3.remove(); - - // man4 - p4 = getHome().create(man4, "4"); - getHome().findByPrimaryKey(man4); - getHome().remove(man4); - p4 = getHome().create(man4, "44"); - getHome().findByPrimaryKey(man4); - utx.begin(); - try { - getHome().remove(man4); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - - // man5 - p5 = getHome().create(man5, "5"); - getHome().findByPrimaryKey(man5); - p5.remove(); - p5 = getHome().create(man5, "5"); - getHome().findByPrimaryKey(man5); - utx.begin(); - try { - p5.remove(); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - - // existing person - for (int i = 0; i < 5; i++) { - utx.begin(); - try { - p0 = getHome().findByPrimaryKey(myname); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - } - assertTrue(p0.getNumero().equals(mynum)); - - // findall - for (int i = 0; i < 5; i++) { - utx.begin(); - try { - getHome().findAll(); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - } - - // create + remove - for (int i = 0; i < 20; i++) { - utx.begin(); - try { - getHome().create(man2, "500"); - getHome().remove(man2); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - } - - // findByPrimaryKey twice - utx.begin(); - try { - p0 = getHome().findByPrimaryKey(myname); - p0.setNumero("0"); - p2 = getHome().findByPrimaryKey(myname); - assertTrue(p2.getNumero().equals("0")); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.rollback(); - } - - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_BasicHomeInterface.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_BasicHomeInterface.java deleted file mode 100644 index d541644e591afe4070198f7543c598404917cd4b..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_BasicHomeInterface.java +++ /dev/null @@ -1,548 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import java.util.Collection; -import java.util.Enumeration; -import java.util.Iterator; -import java.rmi.RemoteException; -import java.rmi.ServerException; - -import javax.ejb.FinderException; - - -import org.objectweb.jonas.jtests.beans.ebasic.Simple; -import org.objectweb.jonas.jtests.beans.ebasic.SimpleHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * test cases common to both suites CMP and BMP. - */ -public abstract class A_BasicHomeInterface extends JTestCase { - - protected static SimpleHome home = null; - - public A_BasicHomeInterface(String name) { - super(name); - } - - /** - * init environment: - * - load beans - * - create/init database for entities. - */ - protected void setUp() { - super.setUp(); - useBeans("ebasic", true); - } - - /** - * return SimpleHome, that can be either BMP or CMP bean. - */ - abstract public SimpleHome getHome(); - - /** - * testFindByPK verify that findByPrimaryKey find an existing entityBean - * pre condition: an element with "pk1" as primary key must exist in the database - * - * findByPrimaryKey("testFindByPK") must pass. - */ - public void testFindByPK() throws Exception { - getHome().findByPrimaryKey("pk1"); - } - - - - /** - * testFindUnexistingPK verify that findByPrimaryKey throw Finder Exception - * when the specified entity beab doesn't exist. - * pre condition there is no element with "pk999" in the table - * - * findByPrimaryKey("testFindUnexistingPK") must throw Finder Exception - */ - public void testFindUnexistingPK() throws Exception { - try { - getHome().findByPrimaryKey("pk999"); - fail("findByPrimaryKey must throw ObjectNotFound Exception"); - } catch(FinderException e) { - } - } - - /** - * testOtherFinder verify that we can use finder method other than findByPrimaryKey - * pre condition an element with "pk2" as primary key must exist in the database - * findByTestName("testOtherFinder") must pass - * - */ - public void testOtherFinder() throws Exception { - getHome().findByTestName("pk2"); - } - - /** - * testFinderEnumObjNotFound verify that a finder method that can return a Enumeration - * return an empty enumeration where there is no matching bean - * pre condition there is no elements with NumTest = 999 - * - */ - public void testFinderEnumObjNotFound() throws Exception { - Simple entity = null; - Enumeration listOfEntity = null; - - listOfEntity = getHome().findInfoForNum(999); - if (listOfEntity.hasMoreElements()) - fail("findInfoForNum must return an empty enumeration"); - - } - - /** - * testCreateNewEntity verify that we can create a new entityBean - * We create a new entity testCreateNewEntity, 20, 6 - * the findByTestName("testCreateNewEntity") must pass and the resulting must be equals to 20 - * pre condition the testCreateNewEntity element must not exist - * - */ - public void testCreateNewEntity() throws Exception { - getHome().create("pk100", 20, 6); - Simple entity2 = getHome().findByTestName("pk100"); - assertEquals(20, entity2.getInfo()); - // cleaning - entity2.remove(); - } - - /* - * Simpler tests, for debugging only : - * - cannot be passed twice - * - are not independant each others - * Use Jadmin to check instance counts are OK ! - */ - public void essaiC1() throws Exception { - getHome().create("pke1", 20, 6); - } - public void essaiA1() throws Exception { - getHome().findByPrimaryKey("pke1").getInfo(); - } - public void essaiA1C() throws Exception { - utx.begin(); - getHome().findByPrimaryKey("pke1").getInfo(); - utx.commit(); - } - public void essaiF1() throws Exception { - getHome().findByPrimaryKey("pke1"); - } - public void essaiR1() throws Exception { - getHome().remove("pke1"); - } - public void essaiR1C() throws Exception { - utx.begin(); - getHome().remove("pke1"); - utx.commit(); - } - public void essaiC2() throws Exception { - getHome().create("pke2", 20, 6); - } - public void essaiA2() throws Exception { - getHome().findByPrimaryKey("pke2").getInfo(); - } - public void essaiA2C() throws Exception { - utx.begin(); - getHome().findByPrimaryKey("pke2").getInfo(); - utx.commit(); - } - public void essaiF2() throws Exception { - getHome().findByTestName("pke2"); - } - public void essaiR2() throws Exception { - getHome().findByTestName("pke2").remove(); - } - public void essaiR2C() throws Exception { - utx.begin(); - getHome().findByTestName("pke2").remove(); - utx.commit(); - } - - /* - * testCreateRolledBack verify that we cannot access to a bean whose - * creation has been rolledback by a finder method. - * pre condition the pk110 element must not exist - */ - public void testCreateRolledBack() throws Exception { - utx.begin(); - try { - Simple entity1 = getHome().create("pk110", 30, 7); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.rollback(); - } - - try { - getHome().findByTestName("pk110"); - fail("element should not be found"); - } catch(FinderException e) { - } - } - - /* - * testCreateRolledBack verify that we cannot access to a bean whose - * creation has been rolledback by findByPrimaryKey. - * pre condition the pk110 element must not exist - */ - public void testCreateRolledBackPK() throws Exception { - utx.begin(); - try { - Simple entity1 = getHome().create("pk110", 30, 7); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.rollback(); - } - - try { - getHome().findByPrimaryKey("pk110"); - fail("element should not be found"); - } catch(FinderException e) { - } - } - - /* - * testRemoveViaEJBHome verify it is possible to remove an entity bean via the home object - * pre condition the testRemoveViaEJBHome element must exist - * - */ - public void testRemoveViaEJBHome() throws Exception { - getHome().remove("pk4"); - try { - getHome().findByTestName("pk4"); - fail("not removed"); - } catch (FinderException e) { - } - // cleaning - getHome().create("pk4", 40, 8); - } - - /** - * test remove by PK twice. - * test that a removeByPrimaryKey can be followed by a create of the same entity. - */ - public void testRemoveByPKTwice() throws Exception { - getHome().create("pkn4", 40, 8); - getHome().remove("pkn4"); - getHome().create("pkn4", 40, 8); - getHome().remove("pkn4"); - } - - /** - * test remove by EJBObject twice. - * test that a remove can be followed by a create of the same entity. - */ - public void testRemoveTwice() throws Exception { - Simple entity = getHome().create("pkn5", 50, 8); - entity.remove(); - entity = getHome().create("pkn5", 50, 8); - entity.remove(); - } - - /* - * testRemoveViaEJBObject verify it is possible to remove an entity bean via the EJBObject - * pre condition the testRemoveViaEJBObject element must exist - */ - public void testRemoveViaEJBObject() throws Exception { - Simple entity = getHome().findByPrimaryKey("pk5"); - entity.remove(); - try { - getHome().findByPrimaryKey("pk5"); - fail("not removed"); - } catch (FinderException e) { - } - // cleaning - getHome().create("pk5", 50, 8); - } - - /** - * testRemoveInsideTransaction Verify that after a remove inside a transaction, - * the bean cannot be found anymore - * pre condition the pk4 instance must exist. - */ - public void testRemoveInsideTransaction() throws Exception { - Simple entity1 = getHome().findByPrimaryKey("pk4"); - utx.begin(); - try { - entity1.remove(); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - utx.begin(); - try { - getHome().findByPrimaryKey("pk4"); - fail("should not exist anymore"); - } catch(FinderException e) { - } finally { - utx.rollback(); - } - // cleaning - getHome().create("pk4", 40, 8); - } - - /** - * same test without second tx. - */ - public void testRemoveInTransaction() throws Exception { - Simple entity1 = getHome().findByPrimaryKey("pk4"); - utx.begin(); - try { - entity1.remove(); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - try { - getHome().findByPrimaryKey("pk4"); - fail("should not exist anymore"); - } catch(FinderException e) { - } - // cleaning - getHome().create("pk4", 40, 8); - } - - /** - * test remove by PK in transaction - */ - public void testHomeRemoveCommitted() throws Exception { - utx.begin(); - try { - getHome().remove("pk4"); - } - catch (Exception e) { - fail(e.getMessage()); - } - finally { - utx.commit(); - } - try { - getHome().findByPrimaryKey("pk4"); - fail("should not exist anymore"); - } catch(FinderException e) { - } - // cleaning - getHome().create("pk4", 40, 8); - } - - /** - * testRemoveRolledBack verify that we can access to a bean after remove has been rolledback - * pre condition the testRemoveRolledBack must exist - */ - public void testRemoveRolledBack() throws Exception { - Simple entity1 = getHome().findByPrimaryKey("pk6"); - utx.begin(); - try { - entity1.remove(); - } - catch (Exception e) { - utx.rollback(); - fail(e.getMessage()); - } - try { - // Here we verify we cannot acces to the removed bean - // (the transaction is not yet rolled back") - getHome().findByPrimaryKey("pk6"); - fail("should not exist anymore at this point"); - } catch(FinderException e) { - } finally { - utx.rollback(); - } - Simple entity3 = getHome().findByTestName("pk6"); - assertEquals(60, entity3.getInfo()); - } - - /** - * testHomeRemoveRolledBack verify that we can access to a bean after remove has been rolledback - * it is the same that testRemoveRolledBack but with home.remove(pk); - * pre condition the testHomeRemoveRolledBack must exist - */ - public void testHomeRemoveRolledBack() throws Exception { - Simple entity1 = getHome().findByPrimaryKey("pk7"); - utx.begin(); - try { - getHome().remove("pk7"); - } - catch (Exception e) { - utx.rollback(); - fail(e.getMessage()); - } - try { - // Here we verify we cannot acces to the removed bean - // (the transaction is not yet rolled back") - getHome().findByPrimaryKey("pk7"); - fail("should not exist anymore at this point"); - } catch(FinderException e) { - } finally { - utx.rollback(); - } - Simple entity3 = getHome().findByTestName("pk7"); - assertEquals(70, entity3.getInfo()); - } - - /** - * testFinderEnum verify a finder method that return a Enumeration - * pre condition there are 3 elements with num =4 - * all of them have a field info equals to 10 - */ - public void testFinderEnum() throws Exception { - Simple entity = null; - Enumeration listOfEntity = getHome().findInfoForNum(4); - int nb = 0; - while (listOfEntity.hasMoreElements()) { - entity = (Simple)javax.rmi.PortableRemoteObject.narrow(listOfEntity.nextElement(), Simple.class); - assertEquals(10, entity.getInfo()); - nb++; - } - assertEquals(3, nb); - } - - /** - * Verify that we can create an entity and retrieve it by - * a finder method inside the same transaction - */ - public void testCreateFindUserTx() throws Exception { - utx.begin(); - try { - Simple e1 = getHome().create("pk120", 32, 7); - Simple e2 = getHome().findByTestName("pk120"); - assertTrue(e2.isIdentical(e1)); - } - catch (Exception e) { - fail(e.getMessage()); - } finally { - utx.rollback(); - } - } - - - /** - * testFinderCollection verify a finder method that return a Collection - * pre condition there are 4 elements with c_numtest =4 (pk4,...,pk7) - * findInCollection returns all the beans where c_numtest = 4 - * this test is equivalent to testcase2 in SimpleTest in finder_col - */ - public void testFinderCollection() throws Exception { - Simple entity = null; - Collection cListEntity = getHome().findInCollection(); - int nb = 0; - Iterator icListEntity = cListEntity.iterator(); - while(icListEntity.hasNext()) { - entity = (Simple) javax.rmi.PortableRemoteObject.narrow(icListEntity.next(), Simple.class); - nb++; - } - assertEquals(4, nb); - } - - /** - * Test that the removed is no more seen after the rollback - */ - public void testFindAfterRBR() throws Exception { - getHome().findByPrimaryKey("pk8"); - utx.begin(); - getHome().remove("pk8"); - utx.rollback(); - getHome().findByTestName("pk8"); - } - - /** - * test loop on finder method (findByPrimaryKey) - */ - public void testLoopFindByPK() throws Exception { - for (int i = 0; i < 20; i++) { - getHome().findByPrimaryKey("pk9"); - } - } - - /** - * test loop on other finder method - */ - public void testLoopFinder() throws Exception { - for (int i = 0; i < 20; i++) { - getHome().findByTestName("pk10"); - } - } - - /** - * test loopback on non reentrant bean in same tx - */ - public void testLoopBackTx() throws Exception { - Simple s = getHome().findByPrimaryKey("pk9"); - assertTrue(s.loopBackTx()); - } - - /** - * test that we can access the instance twice in the same transaction, - * even if the bean is non reentrant. - */ - public void testAccessTwiceTx() throws Exception { - Simple s = getHome().findByPrimaryKey("pk9"); - utx.begin(); - try { - s.getNumTest(); - s.getNumTest(); - } finally { - utx.commit(); - } - } - - /** - * test that we can access the instance twice in the same transaction, - * even if the bean is non reentrant. - */ - public void testFindAccessTx() throws Exception { - utx.begin(); - try { - Simple s = getHome().findByPrimaryKey("pk9"); - s.getNumTest(); - } finally { - utx.commit(); - } - } - - /** - * test loopback on non reentrant bean outside tx - * Invalid this test because loopback with no transaction context - * is not clearly specified in EJB spec. - */ - public void _testLoopBack() throws Exception { - Simple s = getHome().findByPrimaryKey("pk10"); - assertTrue(s.loopBack()); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_omb.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_omb.java deleted file mode 100644 index 88cfd09d7eac85be3f4c915e2a0fc6f7d339c2ed..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_omb.java +++ /dev/null @@ -1,1281 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Iterator; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.beans.relation.omb.AHomeRemote; -import org.objectweb.jonas.jtests.beans.relation.omb.ARemote; -import org.objectweb.jonas.jtests.beans.relation.omb.BHomeRemote; -import org.objectweb.jonas.jtests.beans.relation.omb.BRemote; -import org.objectweb.jonas.jtests.beans.relation.omb.Front; -import org.objectweb.jonas.jtests.beans.relation.omb.FrontHome; - -/** - * For testing one-to-many bidirectional relationships - * @author Ph. Durieux - */ -public abstract class A_omb extends A_Cmp2Util { - - public abstract AHomeRemote getAHome(); - public abstract BHomeRemote getBHome(); - protected static String BEAN_HOME_FRONT = "relation_omb_FrontHome"; - protected static FrontHome fhome = null; - - - static Hashtable a2b = new Hashtable(); - static String[][] b2a = { - {"bs0", null}, - {"bs1_1", "as1"}, - {"bs2_1", "as2"}, - {"bs2_2", "as2"}, - {"bs2_3", "as2"}, - {"bs3", null}, - {"b0", null}, - {"b1_1", "a1"}, - {"b1_2", "a1"}, - {"b1_3", "a1"}, - {"b2_1", "a2"}, - {"b2_2", "a2"}, - {"b2_3", "a2"}, - {"b3_1", "a3"}}; - - static { - a2b.put("as0", new String[]{}); - a2b.put("as1", new String[]{"bs1_1"}); - a2b.put("as2", new String[]{"bs2_1", "bs2_2", "bs2_3"}); - a2b.put("a0", new String[]{}); - a2b.put("a1", new String[]{"b1_1", "b1_2", "b1_3"}); - a2b.put("a2", new String[]{"b2_1", "b2_2", "b2_3"}); - a2b.put("a3", new String[]{"b3_1"}); - a2b.put("ax0", new String[]{}); - - // Translate the String[] to a Collection of String - for (Iterator it = a2b.keySet().iterator(); it.hasNext();) { - String aname = (String) (it.next()); - String[] tb = (String[]) a2b.get(aname); - ArrayList col = new ArrayList(tb.length); - for (int i = 0; i < tb.length; i++) { - col.add(tb[i]); - } - a2b.put(aname, col); - } - } - - - public A_omb(String name) { - super(name); - } - - protected boolean isInit = false; - - protected void setUp() { - super.setUp(); - boolean ok = false; - int nbtry = 0; - while (!ok && nbtry < 3) { - if (!isInit) { - // load bean if not loaded yet - useBeans("omb", false); - try { - fhome = (FrontHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_FRONT), - FrontHome.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - // check if tables have been initialized - try { - getAHome().findByPrimaryKey("a0"); - } catch (Exception e) { - try { - utx.begin(); - getBHome().create("bs0"); - getBHome().create("bs1_1"); - getBHome().create("bs2_1"); - getBHome().create("bs2_2"); - getBHome().create("bs2_3"); - getBHome().create("bs3"); - getBHome().create("b0"); - getBHome().create("b1_1"); - getBHome().create("b1_2"); - getBHome().create("b1_3"); - getBHome().create("b2_1"); - getBHome().create("b2_2"); - getBHome().create("b2_3"); - getBHome().create("b3_1"); - getAHome().create("as0"); - getAHome().create("as1").assignB((Collection) a2b.get("as1")); - getAHome().create("as2").assignB((Collection) a2b.get("as2")); - getAHome().create("a0"); - getAHome().create("a1").assignB((Collection) a2b.get("a1")); - getAHome().create("a2").assignB((Collection) a2b.get("a2")); - getAHome().create("a3").assignB((Collection) a2b.get("a3")); - getAHome().create("ax0"); - } catch (Exception i) { - fail("InitialState creation problem: " + i); - } finally { - try { - utx.commit(); - } catch (Exception ii) { - } - } - } - isInit = true; - } - // Check that all is OK. Sometimes, a test has failed and has corrupted - // the bean state in the database. We must unload and reload the bean then. - nbtry++; - try { - if (initStateOK()) { - ok = true; - } - } catch (Exception e) { - } - if (!ok) { - isInit = false; - unloadBeans("omb"); - } - } - } - - /** - * Check that we are in the same state as after the tables creation for thoses beans A and B - * (ie if it is the initial state) - */ - boolean initStateOK() throws Exception { - boolean isOk = true; - msgerror = new StringBuffer(); - // Check the relations A => B - for (Enumeration ea = a2b.keys(); ea.hasMoreElements();) { - String aname = (String) (ea.nextElement()); - ARemote a = getAHome().findByPrimaryKey(aname); - Collection colActual = a.retrieveB(); - Collection colExpected = (Collection) (a2b.get(aname)); - if (!isCollectionEqual(colExpected, colActual)) { - isOk = false; - msgerror = msgerror.append("\nWrong relation for " + aname - + " (expected:" + colExpected - + ", found:" + colActual + ")"); - } - } - // Check the relation B => A - for (int i = 0; i < b2a.length; i++) { - BRemote b = getBHome().findByPrimaryKey(b2a[i][0]); - String pkb = b.getId(); - String pka = b.retrieveA(); - if (b2a[i][1] == null && pka != null - || b2a[i][1] != null && !b2a[i][1].equals(pka)) { - isOk = false; - msgerror = msgerror.append("\nWrong relation for " + pkb - + " (expected:" + b2a[i][1] - + ", found:" + pka + ")"); - } - - } - return isOk; - } - - - /** - * Check that the bean 'as0' has no relation. - */ - public void tBasicGetEmptyA2B(int tx) throws Exception { - Collection c = null; - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("as0"); - if (tx == TX_CONT) { - c = a.retrieveBInNewTx(); - } else { - c = a.retrieveB(); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - // checking - checkIsInitialState(); - } - - public void testBasicGetEmptyA2BTxNo() throws Exception { - tBasicGetEmptyA2B(TX_NO); - } - public void testBasicGetEmptyA2BTxCall() throws Exception { - tBasicGetEmptyA2B(TX_CALL); - } - public void testBasicGetEmptyA2BTxCont() throws Exception { - tBasicGetEmptyA2B(TX_CONT); - } - public void testBasicGetEmptyA2BTxRb() throws Exception { - tBasicGetEmptyA2B(TX_RB); - } - - /** - * Check that the bean 'bs0' has no relation. - */ - public void tBasicGetEmptyB2A(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - String pka = null; - BRemote b = getBHome().findByPrimaryKey("bs0"); - if (tx == TX_CONT) { - pka = b.retrieveAInNewTx(); - } else { - pka = b.retrieveA(); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - // checking - checkIsInitialState(); - } - public void testBasicGetEmptyB2ANoTx() throws Exception { - tBasicGetEmptyB2A(TX_NO); - } - public void testBasicGetEmptyB2ATxCall() throws Exception { - tBasicGetEmptyB2A(TX_CALL); - } - public void testBasicGetEmptyB2ATxCont() throws Exception { - tBasicGetEmptyB2A(TX_CONT); - } - public void testBasicGetEmptyB2ATxRb() throws Exception { - tBasicGetEmptyB2A(TX_RB); - } - - - /** - * Check that the bean 'as1' has only one relation with 'bs1_1'. - */ - public void tBasicGetOneA2B(int tx) throws Exception { - - Collection c = null; - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("as1"); - if (tx == TX_CONT) { - c = a.retrieveBInNewTx(); - } else { - c = a.retrieveB(); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - // checking - assertEquals("Relations size of: ", 1, c.size()); - String s = "bs1_1"; - assertTrue("Relation missing " + s + ": ", c.contains(s)); - checkIsInitialState(); - } - - public void testBasicGetOneA2BTxNo() throws Exception { - tBasicGetOneA2B(TX_NO); - } - - public void testBasicGetOneA2BTxCall() throws Exception { - tBasicGetOneA2B(TX_CALL); - } - - public void testBasicGetOneA2BTxCont() throws Exception { - tBasicGetOneA2B(TX_CONT); - } - - public void testBasicGetOneA2BTxRb() throws Exception { - tBasicGetOneA2B(TX_RB); - } - - - /** - * Check that the bean 'as2' has many relations with 'bs2_1', 'bs2_2', 'bs2_3'. - */ - public void tBasicGetManyA2B(int tx) throws Exception { - - Collection c = null; - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("as2"); - if (tx == TX_CONT) { - c = a.retrieveBInNewTx(); - } else { - c = a.retrieveB(); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - // checking - assertEquals("Relations size of: ", 3, c.size()); - String s = "bs2_1"; - assertTrue("Relation missing " + s + ": ", c.contains(s)); - s = "bs2_2"; - assertTrue("Relation missing " + s + ": ", c.contains(s)); - s = "bs2_3"; - assertTrue("Relation missing " + s + ": ", c.contains(s)); - checkIsInitialState(); - } - - public void testBasicGetManyA2BTxNo() throws Exception { - tBasicGetManyA2B(TX_NO); - } - - public void testBasicGetManyA2BTxCall() throws Exception { - tBasicGetManyA2B(TX_CALL); - } - - public void testBasicGetManyA2BTxCont() throws Exception { - tBasicGetManyA2B(TX_CONT); - } - - public void testBasicGetManyA2BTxRb() throws Exception { - tBasicGetManyA2B(TX_RB); - } - - - /** - * Set a A2B relation to empty. - * Before: as1 <-> bs1_1 - * After: as1 bs1_1 - * Check also the assignement rules for relationships. - */ - public void tCohSetEmptyA2B(int tx) throws Exception { - ArrayList ce = new ArrayList(); - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("as1"); - if (tx == TX_CONT) { - a.assignBInNewTx(ce); - } else { - a.assignB(ce); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - Collection ca = a.retrieveB(); - assertEquals("Relations size for as1 ", 0, ca.size()); - BRemote b = getBHome().findByPrimaryKey("bs1_1"); - assertNull("Bad relation for bs1_1", b.retrieveA()); - // undo - a.addInB("bs1_1"); - } - checkIsInitialState(); - } - - public void testCohSetEmptyA2BTxNo() throws Exception { - tCohSetEmptyA2B(TX_NO); - } - - public void testCohSetEmptyA2BTxCall() throws Exception { - tCohSetEmptyA2B(TX_CALL); - } - - public void testCohSetEmptyA2BTxCont() throws Exception { - tCohSetEmptyA2B(TX_CONT); - } - - public void testCohSetEmptyA2BTxRb() throws Exception { - tCohSetEmptyA2B(TX_RB); - } - - - /** - * Set a A2B relation to empty by clearing the collection. - * Before: as1 <-> bs1_1 - * After: as1 bs1_1 - * Check also the assignement rules for relationships. - */ - public void tCohClearA2B(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("as1"); - if (tx == TX_CONT) { - a.clearBInNewTx(); - } else { - a.clearB(); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - Collection c = a.retrieveB(); - BRemote b = getBHome().findByPrimaryKey("bs1_1"); - String r = b.retrieveA(); - assertEquals("Expected empty collection for as1 relation: ", 0, c.size()); - assertNull("Expected no relation for bs1_1", r); - // undo - b.assignA("as1"); - } - checkIsInitialState(); - } - - public void testCohClearA2BTxNo() throws Exception { - tCohClearA2B(TX_NO); - } - - public void testCohClearA2BTxCall() throws Exception { - tCohClearA2B(TX_CALL); - } - - public void testCohClearA2BTxCont() throws Exception { - tCohClearA2B(TX_CONT); - } - - public void testCohClearA2BTxRb() throws Exception { - tCohClearA2B(TX_RB); - } - - - /** - * Set an empty A2B relation with 1 element. - * This added element was'nt already in an other relation. - * Before: as0 b0 - * After: as0 <-> b0 - * Check also the assignement rules for relationships. - */ - public void tCohSetOneA2B(int tx) throws Exception { - ArrayList ce = new ArrayList(); - ce.add("b0"); - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("as0"); - if (tx == TX_CONT) { - a.assignBInNewTx(ce); - } else { - a.assignB(ce); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - Collection ca = a.retrieveB(); - BRemote b = getBHome().findByPrimaryKey("b0"); - String r = b.retrieveA(); - assertTrue("Bad relations for as0 (required:" + ce + ", found:" + ca - + ")", isCollectionEqual(ce, ca)); - assertEquals("Bad relation for b0: ", "as0", r); - // undo - a.assignB(new ArrayList()); - } - checkIsInitialState(); - } - - public void testCohSetOneA2BTxNo() throws Exception { - tCohSetOneA2B(TX_NO); - } - - public void testCohSetOneA2BTxCall() throws Exception { - tCohSetOneA2B(TX_CALL); - } - - public void testCohSetOneA2BTxCont() throws Exception { - tCohSetOneA2B(TX_CONT); - } - - public void testCohSetOneA2BTxRb() throws Exception { - tCohSetOneA2B(TX_RB); - } - - - /** - * Set a null B2A relation with 1 element. - * This element was'nt already in an other relation. - * Before: b0 as0 - * After: b0 <-> as0 - * Check also the assignement rules for relationships. - */ - public void tCohSet1B2A(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - BRemote b = getBHome().findByPrimaryKey("b0"); - if (tx == TX_CONT) { - b.assignAInNewTx("as0"); - } else { - b.assignA("as0"); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - // checking - String r = b.retrieveA(); - ARemote a = getAHome().findByPrimaryKey("as0"); - Collection ca = a.retrieveB(); - ArrayList ce = new ArrayList(); - ce.add("b0"); - if (tx != TX_RB) { - assertEquals("Bad relation for b0: ", "as0", r); - assertTrue("Bad relations for as0 (required:" + ce + ", found:" + ca - + ")", isCollectionEqual(ce, ca)); - // undo - b.assignA(null); - } - checkIsInitialState(); - } - - public void testCohSet1B2ATxNo() throws Exception { - tCohSet1B2A(TX_NO); - } - - public void testCohSet1B2ATxCall() throws Exception { - tCohSet1B2A(TX_CALL); - } - - public void testCohSet1B2ATxCont() throws Exception { - tCohSet1B2A(TX_CONT); - } - - public void testCohSet1B2ATxRb() throws Exception { - tCohSet1B2A(TX_RB); - } - - - - /** - * Add an element to a empty relation. - * Same as tCohSetOneA2B except that we add the element in the collection - * instead of we set directly the collection. - * Before: as0 bs0 - * After: as0 <-> bs0 - * Check also the assignement rules for relationships. - */ - public void tCohAddOneA2B(int tx) throws Exception { - ArrayList ce = new ArrayList(); - ce.add("bs0"); - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("as0"); - if (tx == TX_CONT) { - a.addInBInNewTx("bs0"); - } else { - a.addInB("bs0"); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - Collection ca = a.retrieveB(); - BRemote b = getBHome().findByPrimaryKey("bs0"); - String r = b.retrieveA(); - assertTrue("Bad relations for as0 (required:" + ce + ", found:" + ca - + ")", isCollectionEqual(ce, ca)); - assertEquals("Bad relation for bs0", "as0", r); - // undo - a.assignB(new ArrayList()); - } - checkIsInitialState(); - } - - public void testCohAddOneA2BTxNo() throws Exception { - tCohAddOneA2B(TX_NO); - } - - public void testCohAddOneA2BTxCall() throws Exception { - tCohAddOneA2B(TX_CALL); - } - - public void testCohAddOneA2BTxCont() throws Exception { - tCohAddOneA2B(TX_CONT); - } - - public void testCohAddOneA2BTxRb() throws Exception { - tCohAddOneA2B(TX_RB); - } - - - /** - * Re-Set a relation with N element. - * Before: as1 <-> bs1_1 - * bs0 - * bs3 - * After: bs1_1 - * as1 <-> bs0 - * as1 <-> bs3 - */ - public void tCohSetMultiA2B(int tx) throws Exception { - ArrayList ce = new ArrayList(2); - ce.add("bs0"); - ce.add("bs3"); - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("as1"); - Collection co = a.retrieveB(); - if (tx == TX_CONT) { - a.assignBInNewTx(ce); - } else { - a.assignB(ce); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - Collection ca = a.retrieveB(); - BRemote bs1_1 = getBHome().findByPrimaryKey("bs1_1"); - BRemote bs0 = getBHome().findByPrimaryKey("bs0"); - BRemote bs3 = getBHome().findByPrimaryKey("bs3"); - assertTrue("Bad relations for as1 (required:" + ce + ", found:" + ca - + ")", isCollectionEqual(ce, ca)); - assertNull("Not null relation for bs1_1", bs1_1.retrieveA()); - assertEquals("Bad relation for bs0: ", "as1", bs0.retrieveA()); - assertEquals("Bad relation for bs3: ", "as1", bs3.retrieveA()); - // undo - a.assignB(co); - } - checkIsInitialState(); - } - - public void testCohSetMultiA2BTxNo() throws Exception { - tCohSetMultiA2B(TX_NO); - } - - public void testCohSetMultiA2BTxCall() throws Exception { - tCohSetMultiA2B(TX_CALL); - } - - public void testCohSetMultiA2BTxCont() throws Exception { - tCohSetMultiA2B(TX_CONT); - } - - public void testCohSetMultiA2BTxRb() throws Exception { - tCohSetMultiA2B(TX_RB); - } - - - /** - * Set a B2A relation with 1 element. - * This element wasn't already in an other relation. - * Before: bs1_1 <-> as1 - * as0 - * Change: bs1_1.assignA(as0); - * After: bs1_1 <-> as0 - * as1 - * Check also the assignement rules for relationships. - * - */ - public void tCohSet2B2A(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - BRemote b = getBHome().findByPrimaryKey("bs1_1"); - if (tx == TX_CONT) { - b.assignAInNewTx("as0"); - } else { - b.assignA("as0"); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - String r = b.retrieveA(); - assertEquals("Bad relation for bs1_1: ", "as0", r); - ARemote as0 = getAHome().findByPrimaryKey("as0"); - Collection cas0 = as0.retrieveB(); - ARemote as1 = getAHome().findByPrimaryKey("as1"); - Collection cas1 = as1.retrieveB(); - ArrayList ce = new ArrayList(); - ce.add("bs1_1"); - assertTrue("Bad relations for as0 (required:" + ce + ", found:" + cas0 - + ")", isCollectionEqual(ce, cas0)); - ce = new ArrayList(); - assertTrue("Bad relations for as1 (required:" + ce + ", found:" + cas1 - + ")", isCollectionEqual(ce, cas1)); - // undo - b.assignA("as1"); - } - checkIsInitialState(); - } - - public void testCohSet2B2ATxNo() throws Exception { - tCohSet2B2A(TX_NO); - } - - public void testCohSet2B2ATxCall() throws Exception { - tCohSet2B2A(TX_CALL); - } - - public void testCohSet2B2ATxCont() throws Exception { - tCohSet2B2A(TX_CONT); - } - - public void testCohSet2B2ATxRb() throws Exception { - tCohSet2B2A(TX_RB); - } - - - /** - * Set a B2A relation with 1 element. - * This element was already in an other relation. - * Before: bs1_1 <-> as1 - * b3_1 <-> a3 - * Change: bs1_1.assignA(b3_1.retrieveA()) - * After: bs1_1 <-> a3 - * b3_1 <-> - * as1 - * Check also the assignement rules for relationships. - * - * See Spec chapter 10.3.7.3, change example: b2m.setA(b1n.getA()) - */ - public void tCohSet3B2A(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - BRemote bs1_1 = getBHome().findByPrimaryKey("bs1_1"); - if (tx == TX_CONT) { - bs1_1.assignAInNewTx("a3"); - } else { - bs1_1.assignA("a3"); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - String rbs1_1 = bs1_1.retrieveA(); - ARemote as1 = getAHome().findByPrimaryKey("as1"); - Collection cas1 = as1.retrieveB(); - ARemote a3 = getAHome().findByPrimaryKey("a3"); - Collection ca3 = a3.retrieveB(); - assertEquals("Bad relation for bs1_1: ", "a3", rbs1_1); - ArrayList ce = new ArrayList(); - ce.add("bs1_1"); - ce.add("b3_1"); - assertTrue("Bad relations for a3 (required:" + ce + ", found:" + ca3 - + ")", isCollectionEqual(ce, ca3)); - ce = new ArrayList(); - assertTrue("Bad relations for as1 (required:" + ce + ", found:" + cas1 - + ")", isCollectionEqual(ce, cas1)); - // undo - bs1_1.assignA("as1"); - } - checkIsInitialState(); - } - - public void testCohSet3B2ATxNo() throws Exception { - tCohSet3B2A(TX_NO); - } - - public void testCohSet3B2ATxCall() throws Exception { - tCohSet3B2A(TX_CALL); - } - - public void testCohSet3B2ATxCont() throws Exception { - tCohSet3B2A(TX_CONT); - } - - public void testCohSet3B2ATxRb() throws Exception { - tCohSet3B2A(TX_RB); - } - - - /** - * Remove an element in a relation. - * Before: a3 <-> b3_1 - * Change: a3.retrieveB().remove(b3_1) - * After: a3 b3_1 - * See Spec chapter 10.3.7.3, change example: a1.getB().remove(b1n) - */ - public void tCohRemoveInRelA2B(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("a3"); - if (tx == TX_CONT) { - a.removeFromBInNewTx("b3_1"); - } else { - a.removeFromB("b3_1"); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - Collection ca = a.retrieveB(); - BRemote b = getBHome().findByPrimaryKey("b3_1"); - String r = b.retrieveA(); - ArrayList ce = new ArrayList(); - assertTrue("Bad relations for a3: (required:" + ce + ", found:" + ca - + ")", isCollectionEqual(ce, ca)); - assertNull("Bad not null relation for b3_1", r); - // undo - a.addInB("b3_1"); - } - // check to initial state - checkIsInitialState(); - - } - - public void testCohRemoveInRelA2BTxNo() throws Exception { - tCohRemoveInRelA2B(TX_NO); - } - - public void testCohRemoveInRelA2BTxCall() throws Exception { - tCohRemoveInRelA2B(TX_CALL); - } - - public void testCohRemoveInRelA2BTxCont() throws Exception { - tCohRemoveInRelA2B(TX_CONT); - } - - public void testCohRemoveInRelA2BTxRb() throws Exception { - tCohRemoveInRelA2B(TX_RB); - } - - - /** - * Remove a bean B which is in a relation. - * Before: a3 <-> b3_1 - * change: B.remove(b3_1) - * After: a3 - * - */ - public void tCohRemoveB(int tx) throws Exception { - if (tx == TX_CONT) { - // The transaction attribute of the remove method is TX_SUPPORT, - // so the transaction cannot be initiate by the container - fail("Transaction cannot be initiate by the container for this test"); - } - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - getBHome().remove("b3_1"); - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - ARemote a = getAHome().findByPrimaryKey("a3"); - Collection ca = a.retrieveB(); - assertEquals("Wrong relations size for a3: (expected: 0 found:" - + ca.size(), 0, ca.size()); - // undo - getBHome().create("b3_1"); - a.addInBInNewTx("b3_1"); - } - checkIsInitialState(); - } - - public void testCohRemoveBTxNo() throws Exception { - tCohRemoveB(TX_NO); - } - - public void testCohRemoveBTxCall() throws Exception { - tCohRemoveB(TX_CALL); - } - - public void testCohRemoveBTxRb() throws Exception { - tCohRemoveB(TX_RB); - } - - - /** - * Remove a bean B which is in a relation. - * Same as tCohRemoveB except that the called remove method is on the bean - * instead of the home. - * Before: a3 <-> b3_1 - * change: B.remove(b3_1) - * After: a3 - * - */ - public void tCohBeanRemoveB(int tx) throws Exception { - if (tx == TX_CONT) { - // The transaction attribute of the remove method is TX_SUPPORT, - // so the transaction cannot be initiate by the container - fail("Transaction cannot be initiate by the container for this test"); - } - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - BRemote b = getBHome().findByPrimaryKey("b3_1"); - b.remove(); - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - ARemote a = getAHome().findByPrimaryKey("a3"); - Collection ca = a.retrieveB(); - assertEquals("Wrong relations size for a3: (expected: 0 found:" - + ca.size(), 0, ca.size()); - // undo - getBHome().create("b3_1"); - a.addInBInNewTx("b3_1"); - } - checkIsInitialState(); - } - - public void testCohBeanRemoveBTxNo() throws Exception { - tCohBeanRemoveB(TX_NO); - } - - public void testCohBeanRemoveBTxCall() throws Exception { - tCohBeanRemoveB(TX_CALL); - } - - public void testCohBeanRemoveBTxRb() throws Exception { - tCohBeanRemoveB(TX_RB); - } - - - - /** - * Set a empty relation A2B with 1 element. - * This added element was already in a other relation. - * Before: a0 - * a3 <-> b3_1 - * Change: a0.assignB({b3_1}) - * After: a0 <-> b3_1 - * a3 - */ - public void tCohSetOne2A2B(int tx) throws Exception { - ArrayList ce = new ArrayList(); - ce.add("b3_1"); - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("a0"); - if (tx == TX_CONT) { - a.assignBInNewTx(ce); - } else { - a.assignB(ce); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - Collection ca = a.retrieveB(); - ARemote a3 = getAHome().findByPrimaryKey("a3"); - Collection ca3 = a3.retrieveB(); - BRemote b = getBHome().findByPrimaryKey("b3_1"); - String r = b.retrieveA(); - assertTrue("Wrong relations a0 (required:" + ce + ", found:" + ca - + ")", isCollectionEqual(ce, ca)); - assertTrue("Wrong relations for b3_1" + ": found:" + ca3 , - !ca3.contains("b3_1")); - assertEquals("Bad relation for b3_1: ", "a0", r); - // undo - a.assignB(new ArrayList()); - a3.addInB("b3_1"); - } - checkIsInitialState(); - } - - public void testCohSetOne2A2BTxNo() throws Exception { - tCohSetOne2A2B(TX_NO); - } - - public void testCohSetOne2A2BTxCall() throws Exception { - tCohSetOne2A2B(TX_CALL); - } - - public void testCohSetOne2A2BTxCont() throws Exception { - tCohSetOne2A2B(TX_CONT); - } - - public void testCohSetOne2A2BTxRb() throws Exception { - tCohSetOne2A2B(TX_RB); - } - - - /** - * Add an element to a relation A2B already multiple. - * The element was already in a relation. - * Check also the assignement rules for relationships. - * Before: a1 <-> b1_1 - * <-> b1_2 - * <-> b1_3 - * a3 <-> b3_1 - * Change: a1.addInB(b3_1) - * After: a1 <-> b1_1 - * <-> b1_2 - * <-> b1_3 - * <-> b3_1 - * a3 - * - * See Spec chapter 10.3.7.3, change example: a1.getB().add(b2m) - * - */ - public void tCohAddOneInMultiA2B(int tx) throws Exception { - - ArrayList ce = new ArrayList(); - ce.add("b1_1"); - ce.add("b1_2"); - ce.add("b1_3"); - String bAdded = "b3_1"; - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("a1"); - if (tx == TX_CONT) { - a.addInBInNewTx(bAdded); - } else { - a.addInB(bAdded); - } - ce.add(bAdded); - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - Collection ca1 = a.retrieveB(); - ARemote a3 = getAHome().findByPrimaryKey("a3"); - Collection ca3 = a3.retrieveB(); - assertTrue("Bad relations for a1 (required:" + ce + ", found:" + ca1 + ")", - isCollectionEqual(ce, ca1)); - ce = new ArrayList(); - assertTrue("Bad relations for a3 (required:" + ce + ", found:" + ca3 + ")", - isCollectionEqual(ce, ca3)); - BRemote b = getBHome().findByPrimaryKey(bAdded); - assertEquals("Bad relation for b3_1: ", "a1", b.retrieveA()); - // undo - a3.addInB(bAdded); - } - - checkIsInitialState(); - } - - public void testCohAddOneInMultiA2BTxNo() throws Exception { - tCohAddOneInMultiA2B(TX_NO); - } - - public void testCohAddOneInMultiA2BTxCall() throws Exception { - tCohAddOneInMultiA2B(TX_CALL); - } - - public void testCohAddOneInMultiA2BTxCont() throws Exception { - tCohAddOneInMultiA2B(TX_CONT); - } - - public void testCohAddOneInMultiA2BTxRb() throws Exception { - tCohAddOneInMultiA2B(TX_RB); - } - - - /* - * Set a relation to multiple. - * All of element was already in an other relation. - * Check also the assignement rules for relationships. - * Before: a1 <-> b1_1 - * <-> b1_2 - * <-> b1_3 - * a2 <-> b2_1 - * <-> b2_2 - * <-> b2_3 - * Change: a1.assignB(a2.retrieveB()) - * After: a1 <-> b2_1 - * <-> b2_2 - * <-> b2_3 - * a2 - * b1_1 - * b1_2 - * b1_3 - * - * Spec chapter 10.3.7.3, change example: a1.setB(a2.getB()) - * - */ - public void tCohSetMultiBisA2B(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a1 = getAHome().findByPrimaryKey("a1"); - Collection co1 = a1.retrieveB(); - ARemote a2 = getAHome().findByPrimaryKey("a2"); - Collection co2 = a2.retrieveB(); - if (tx == TX_CONT) { - a1.assignBInNewTx(co2); - } else { - a1.assignB(co2); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // checking - Collection ca1 = a1.retrieveB(); - assertTrue("Wrong relations for a1 (required:" + co2 + ", found:" + ca1 + ")", isCollectionEqual(co2, ca1)); - Collection ca2 = a2.retrieveB(); - assertEquals("Wrong relations size for a2: ", 0, ca2.size()); - BRemote b; - b = getBHome().findByPrimaryKey("b1_1"); - assertNull("Wrong not null relation for b1_1: ", b.retrieveA()); - b = getBHome().findByPrimaryKey("b1_2"); - assertNull("Wrong not null relation for b1_2: ", b.retrieveA()); - b = getBHome().findByPrimaryKey("b1_3"); - assertNull("Wrong not null relation for b1_3: ", b.retrieveA()); - b = getBHome().findByPrimaryKey("b2_1"); - assertEquals("Wrong relation for b2_1: ", "a1", b.retrieveA()); - b = getBHome().findByPrimaryKey("b2_2"); - assertEquals("Wrong relation for b2_2: ", "a1", b.retrieveA()); - b = getBHome().findByPrimaryKey("b2_3"); - assertEquals("Wrong relation for b2_3: ", "a1", b.retrieveA()); - // Undo - a1.assignB(co1); - a2.assignB(co2); - } - checkIsInitialState(); - } - - public void testCohSetMultiBisA2BTxNo() throws Exception { - tCohSetMultiBisA2B(TX_NO); - } - - public void testCohSetMultiBisA2BTxCall() throws Exception { - tCohSetMultiBisA2B(TX_CALL); - } - - public void testCohSetMultiBisA2BTxCont() throws Exception { - tCohSetMultiBisA2B(TX_CONT); - } - - public void testCohSetMultiBisA2BTxRb() throws Exception { - tCohSetMultiBisA2B(TX_RB); - } - - /** - * This test check it isn't allowed to reset the pk - * and that the container throw the java.lang.IllegalStateException. - * See spec 2.0, chapter 10.3.5, page 134. - */ - public void testResetPkForbidden() throws Exception { - ARemote a = getAHome().findByPrimaryKey("ax0"); - assertTrue("IllegalStateException not thrown when a pk value is reset", - a.testResetPkForbidden("aY0")); - } - - /** - * Test that we can create a bean and find it in the same transaction. - */ - public void testCreateFindTx() throws Exception { - utx.begin(); - ARemote project = getAHome().create("project"); - BRemote role = getBHome().create("role"); - project.addInB("role"); - getBHome().findByName("role", "project"); - utx.rollback(); - checkIsInitialState(); - } - - /** - * Test that we can create a bean and find it in the same transaction, - * using a method in A bean. - */ - public void testCreateFindTx2() throws Exception { - utx.begin(); - ARemote project = getAHome().create("project"); - project.addNewB("role"); - getBHome().findByName("role", "project"); - utx.rollback(); - checkIsInitialState(); - } - - /** - * Reproduce the bug #300156: Error on creating Array from cmr-collection - */ - public void testNewArrayListOnCmr() throws Exception { - ArrayList ce = new ArrayList(); - ce.add("bs2_1"); - ce.add("bs2_2"); - ce.add("bs2_3"); - Collection ca = null; - ARemote as2 = getAHome().findByPrimaryKey("as2"); - // Test of retrieveB() - ca = as2.retrieveB(); - assertTrue("Bad relations for as2.retrieveB() (required:" + ce + ", found:" + ca - + ")", isCollectionEqual(ce, ca)); - // Test of retrieveBisB() - ca = as2.retrieveBisB(); - assertTrue("Bad relations for as2.retrieveBisB() (required:" + ce + ", found:" + ca - + ")", isCollectionEqual(ce, ca)); - } - - /** - * Ensure the javax.ejb.EJBException is thrown when trying - * to invoke an accessor method on a deleted entitybean object - */ - public void testRemove1() throws Exception { - Front fb = fhome.create(); - fb.testRemove1(); - - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_oob.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_oob.java deleted file mode 100644 index 5c19283d06b80ce73b83e2c99f56ea507384e7e4..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/A_oob.java +++ /dev/null @@ -1,830 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import javax.ejb.ObjectNotFoundException; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.objectweb.jonas.jtests.beans.relation.oob.AHomeRemote; -import org.objectweb.jonas.jtests.beans.relation.oob.ARemote; -import org.objectweb.jonas.jtests.beans.relation.oob.BHomeRemote; -import org.objectweb.jonas.jtests.beans.relation.oob.BRemote; -import org.objectweb.jonas.jtests.beans.relation.oob.Front; -import org.objectweb.jonas.jtests.beans.relation.oob.FrontHome; - -/** - * This is an advanced test suite for home interface on entity bean CMP2. - * Beans used: oob - * @author Ph. Durieux - */ -public abstract class A_oob extends A_Cmp2Util { - - public abstract AHomeRemote getAHome(); - public abstract BHomeRemote getBHome(); - protected static String BEAN_HOME_FRONT = "relation_oob_FrontHome"; - protected static FrontHome fhome = null; - - - public A_oob(String name) { - super(name); - } - - protected boolean isInit = false; - - protected void setUp() { - super.setUp(); - boolean ok = false; - int nbtry = 0; - while (!ok && nbtry < 3) { - if (!isInit) { - // load bean if not loaded yet - useBeans("oob", false); - try { - fhome = (FrontHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_FRONT), - FrontHome.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - // check if tables have been initialized - try { - debug("find a2"); - getAHome().findByPrimaryKey("a2"); - } catch (Exception e) { - // Make the initialization needed for the tests - try { - utx.begin(); - debug("Make initialization"); - ARemote a1 = getAHome().create("a1"); - ARemote a2 = getAHome().create("a2"); - getAHome().create("a3"); - getBHome().create("b0"); - getBHome().create("b1"); - getBHome().create("b2"); - getBHome().create("b3"); - a1.assignB("b1"); - a2.assignB("b2"); - } catch (Exception i) { - fail("InitialState creation problem: " + i); - } finally { - try { - utx.commit(); - } catch (Exception ii) { - } - } - } - isInit = true; - } - // Check that all is OK. Sometimes, a test has failed and has corrupted - // the bean state in the database. We must unload and reload the bean then. - nbtry++; - try { - if (initStateOK()) { - ok = true; - } - } catch (Exception e) { - } - if (!ok) { - debug("Unload oob"); - isInit = false; - unloadBeans("oob"); - } - } - } - - /* - * Check that we are in the same state as after the tables creation for thoses beans A and B - * (ie if it is the initial state) - */ - boolean initStateOK() throws Exception { - boolean isOk = true; - - msgerror = new StringBuffer(); - - debug("Checking init state"); - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - ARemote a2 = getAHome().findByPrimaryKey("a2"); - BRemote b2 = getBHome().findByPrimaryKey("b2"); - ARemote a3 = getAHome().findByPrimaryKey("a3"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - String idB1 = a1.retrieveB(); - String idB2 = a2.retrieveB(); - String idB3 = a3.retrieveB(); - String idA1 = b1.retrieveA(); - String idA2 = b2.retrieveA(); - String idA3 = b3.retrieveA(); - - if (idB1 != null && !idB1.equals("b1")) { - isOk = false; - msgerror.append("\nWrong relation for a1->b1" - + "(expected: A1.retrieveB()='b1'" - + ", found:" + idB1 + ")"); - } - if (idB2 != null && !idB2.equals("b2")) { - isOk = false; - msgerror.append("\nWrong relation for a2->b2" - + "(expected: A2.retrieveB()='b2'" - + ", found:" + idB2 + ")"); - } - if (idA1 != null && !idA1.equals("a1")) { - isOk = false; - msgerror.append("\nWrong relation for b1->a1" - + "(expected: B1.retrieveA()='a1'" - + ", found:" + idA1 + ")"); - } - if (idA2 != null && !idA2.equals("a2")) { - isOk = false; - msgerror.append("\nWrong relation for b2->a2" - + "(expected: B2.retrieveA()='a2'" - + ", found:" + idA2 + ")"); - } - if (idA3 != null) { - isOk = false; - msgerror.append("\nWrong relation for a3->b3" - + "(expected: A3.retrieveB()=null" - + ", found:" + idA3 + ")"); - } - if (idB3 != null) { - isOk = false; - msgerror.append("\nWrong relation for b3->a3" - + "(expected: B3.retrieveA()=null" - + ", found:" + idB3 + ")"); - } - if (!isOk) { - debug(msgerror.toString()); - } - return isOk; - } - - - /** - * Check that the bean 'a3' has no relation. - */ - public void _testBasicGetEmpty(int tx) throws Exception { - String idB = null; - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("a3"); - if (tx == TX_CONT) { - idB = a.retrieveBInNewTx(); - } else { - idB = a.retrieveB(); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - // checking - if (idB != null) { - fail("a3->b not empty"); - } - } - - public void testBasicGetEmptyTxNo() throws Exception { - _testBasicGetEmpty(TX_NO); - } - public void testBasicGetEmptyTxCall() throws Exception { - _testBasicGetEmpty(TX_CALL); - } - public void testBasicGetEmptyTxCont() throws Exception { - _testBasicGetEmpty(TX_CONT); - } - - /** - * Set a relation : a3.assignB("b3") - */ - public void _testBasicSetEmpty(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("a3"); - if (tx == TX_CONT) { - a.assignBInNewTx("b3"); - } else { - a.assignB("b3"); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - // checking - String idB = a.retrieveBInNewTx(); - if (tx != TX_RB) { - assertEquals("Wrong assign for relation a3->b3 : ", "b3", idB); - // undo - a.assignBInNewTx(null); - } else { - assertNull("Rollback did not occur", idB); - } - checkIsInitialState(); - } - - public void testBasicSetEmptyTxNo() throws Exception { - _testBasicSetEmpty(TX_NO); - } - public void testBasicSetEmptyTxCall() throws Exception { - _testBasicSetEmpty(TX_CALL); - } - public void testBasicSetEmptyTxCont() throws Exception { - _testBasicSetEmpty(TX_CONT); - } - public void testBasicSetEmptyTxRb() throws Exception { - _testBasicSetEmpty(TX_RB); - } - - /** - * Set a relation to empty : a3.assignB(null) - */ - public void _testBasicSetEmptyNull(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a = getAHome().findByPrimaryKey("a1"); - if (tx == TX_CONT) { - a.assignBInNewTx(null); - } else { - a.assignB(null); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - // checking - String idB = a.retrieveBInNewTx(); - if (tx == TX_RB) { - assertEquals("Wrong assign null for relation a1->b1: ", "b1", idB); - } else { - assertNull("Wrong assign null for relation a1->b1: " + idB, idB); - // undo - a.assignBInNewTx("b1"); - } - checkIsInitialState(); - } - - public void testBasicSetEmptyNullTxNo() throws Exception { - _testBasicSetEmptyNull(TX_NO); - } - public void testBasicSetEmptyNullTxCall() throws Exception { - _testBasicSetEmptyNull(TX_CALL); - } - public void testBasicSetEmptyNullTxCont() throws Exception { - _testBasicSetEmptyNull(TX_CONT); - } - public void testBasicSetEmptyNullTxRb() throws Exception { - _testBasicSetEmptyNull(TX_RB); - } - - - - /** - * test coherence relation one to one bidirectionnel, - * A1.assignB(B2) => A1.retreiveB()=B2 && B2.retreiveA()=A1 && B1.retreiveA()=null && A2.retreiveB()=null - */ - public void _testCohSetOne(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - ARemote a2 = getAHome().findByPrimaryKey("a2"); - BRemote b2 = getBHome().findByPrimaryKey("b2"); - ARemote a3 = getAHome().findByPrimaryKey("a3"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - // change the relation - if (tx == TX_CONT) { - a1.assignBInNewTx("b2"); - } else { - a1.assignB("b2"); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // Verify expected result - utx.begin(); - try { - assertNull("Bad coherence of relation null : expected for a2.retreiveB() found :" + a2.retrieveB(), a2.retrieveB()); - assertNull("Bad coherence of relation null : expected for b1.retreiveA() found :" + b1.retrieveA(), b1.retrieveA()); - assertEquals("Bad coherence of relation a1 : expected for b2.retreiveA() found :" + b2.retrieveA(), "a1", b2.retrieveA()); - assertEquals("Bad coherence of relation b2 : expected for a1.retreiveB() found :" + a1.retrieveB(), "b2", a1.retrieveB()); - - // undo - a1.assignB("b1"); - a2.assignB("b2"); - } finally { - utx.commit(); - } - } - checkIsInitialState(); - } - - public void testCohSetOneTxNo() throws Exception { - _testCohSetOne(TX_NO); - } - public void testCohSetOneTxCall() throws Exception { - _testCohSetOne(TX_CALL); - } - - /** - * test coherence relation one to one bidirectionnel, - * A3.assignB(B3)=>A3.retreiveB()==B3 && B3.retreiveB()==A3 - */ - public void _testCohWithoutRelation(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a3 = getAHome().findByPrimaryKey("a3"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - // change the relation - if (tx == TX_CONT) { - a3.assignBInNewTx("b3"); - } else { - a3.assignB("b3"); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // Verify expected result - utx.begin(); - try { - assertEquals("Bad coherence of relation : b3 expected:" + a3.retrieveB(), "b3", a3.retrieveB()); - assertEquals("Bad coherence of relation : a3 expected:" + b3.retrieveA(), "a3", b3.retrieveA()); - - // undo - a3.assignB(null); - } finally { - utx.commit(); - } - } - checkIsInitialState(); - } - - public void testBasicCohWithoutRelation() throws Exception { - _testCohWithoutRelation(TX_NO); - } - public void testBasicCohWithoutRelationTxCall() throws Exception { - _testCohWithoutRelation(TX_CALL); - } - - /** - * test coherence relation one to one bidirectionnel, - * A1.assignB(B3)=>A1.retreiveB()==B3 && B1.retreiveB()==null && B2.retreiveB()=null - */ - public void _testCohAlreadyAssign(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - // change the relation - if (tx == TX_CONT) { - a1.assignBInNewTx("b3"); - } else { - a1.assignB("b3"); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // Verify expected result - utx.begin(); - try { - assertEquals("Bad coherence of relation : b3 expected:" + a1.retrieveB(), "b3", a1.retrieveB()); - assertNull("Bad coherence of relation : null expected:" + b1.retrieveA(), b1.retrieveA()); - assertEquals("Bad coherence of relation : a1 expected:" + b3.retrieveA(), "a1", b3.retrieveA()); - - // undo - a1.assignB("b1"); - } finally { - utx.commit(); - } - } - checkIsInitialState(); - } - - public void testCohAlreadyAssign() throws Exception { - _testCohAlreadyAssign(TX_NO); - } - public void testCohAlreadyAssignTxCall() throws Exception { - _testCohAlreadyAssign(TX_CALL); - } - - /** - * test coherence relation one to one bidirectionnel, - * A1.assignB(null)=>A1.retreiveB()==null && B1.retreiveB()==null - */ - public void _testCohSetNull(int tx) throws Exception { - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - ARemote a2 = getAHome().findByPrimaryKey("a2"); - BRemote b2 = getBHome().findByPrimaryKey("b2"); - ARemote a3 = getAHome().findByPrimaryKey("a3"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - // change the relation - if (tx == TX_CONT) { - a1.assignBInNewTx(null); - } else { - a1.assignB(null); - } - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - try { - utx.begin(); - // Verify expected result - assertNull("Bad coherence of relation : null expected for a1.retreiveB() found :" + a1.retrieveB(), a1.retrieveB()); - assertNull("Bad coherence of relation : null expected for b1.retreiveA() found :" + b1.retrieveA(), b1.retrieveA()); - - // undo - a1.assignB("b1"); - } finally { - utx.commit(); - } - } - checkIsInitialState(); - } - - public void testCohSetNull() throws Exception { - _testCohSetNull(TX_NO); - } - public void testCohSetNullTxCall() throws Exception { - _testCohSetNull(TX_CALL); - } - - /** - * test coherence relation one to one bidirectionnel, - * A1.remove=>A1removed && B1.retreiveA()==null - */ - public void _testCohRemoveA(int tx) throws Exception { - if (tx == TX_CONT) { - // The transaction attribute of the remove method is TX_SUPPORT, - // so the transaction cannot be initiate by the container - fail("Transaction cannot be initiate by the container for this test"); - } - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - BRemote b1 = getBHome().findByPrimaryKey("b1"); - // remove the bean - getAHome().remove("a1"); - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // Verify expected result - assertNull("Bad coherence of relation : null expected for b1.retreiveB() found :" + b1.retrieveAInNewTx(), b1.retrieveAInNewTx()); - boolean not_found = false; - try { - ARemote a1 = getAHome().findByPrimaryKey("a1"); - } catch (ObjectNotFoundException e) { - not_found = true; - } - assertTrue("a1 is not removed", not_found); - // undo - getAHome().create("a1"); - ARemote a1 = getAHome().findByPrimaryKey("a1"); - a1.assignBInNewTx("b1"); - } - checkIsInitialState(); - } - - public void testCohRemoveATxNo() throws Exception { - _testCohRemoveA(TX_NO); - } - public void testCohRemoveATxCall() throws Exception { - _testCohRemoveA(TX_CALL); - } - public void testCohRemoveATxRb() throws Exception { - _testCohRemoveA(TX_RB); - } - - /** - * test coherence relation one to one bidirectionnel, - * getAHome().remove(a1)=>A1removed && B1.retreiveA()==null - * Same as _testCohRemoveA except that the called remove method is on the bean - * instead of the home. - */ - public void _testCohBeanRemoveA(int tx) throws Exception { - if (tx == TX_CONT) { - // The transaction attribute of the remove method is TX_SUPPORT, - // so the transaction cannot be initiate by the container - fail("Transaction cannot be initiate by the container for this test"); - } - - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - a1.remove(); - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // Verify expected result - assertNull("Bad coherence of relation : null expected for b1.retreiveB() found :" + b1.retrieveAInNewTx(), b1.retrieveAInNewTx()); - boolean not_found=false; - try { - a1 = getAHome().findByPrimaryKey("a1"); - } catch (ObjectNotFoundException e) { - not_found=true; - } - assertTrue("a1 is not removed",not_found); - // undo - getAHome().create("a1"); - a1 = getAHome().findByPrimaryKey("a1"); - a1.assignBInNewTx("b1"); - } - checkIsInitialState(); - } - - public void testCohBeanRemoveATxNo() throws Exception { - _testCohBeanRemoveA(TX_NO); - } - public void testCohBeanRemoveATxCall() throws Exception { - _testCohBeanRemoveA(TX_CALL); - } - public void testCohBeanRemoveATxRb() throws Exception { - _testCohBeanRemoveA(TX_RB); - } - - /** - * test coherence relation one to one bidirectionnel, - * getBHome().remove(b1)=>B1 removed && A1.retreiveB()==null - */ - public void _testCohRemoveB(int tx) throws Exception { - if (tx == TX_CONT) { - // The transaction attribute of the remove method is TX_SUPPORT, - // so the transaction cannot be initiate by the container - fail("Transaction cannot be initiate by the container for this test"); - } - - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - ARemote a2 = getAHome().findByPrimaryKey("a2"); - BRemote b2 = getBHome().findByPrimaryKey("b2"); - ARemote a3 = getAHome().findByPrimaryKey("a3"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - // remove the bean - getBHome().remove("b1"); - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // Verify expected result - assertNull("Bad coherence of relation : null expected for a1.retreiveB() found :"+a1.retrieveBInNewTx(), a1.retrieveBInNewTx()); - boolean not_found=false; - try { - b1 = getBHome().findByPrimaryKey("b1"); - } catch (ObjectNotFoundException e) { - not_found=true; - } - assertTrue("B is not removed",not_found); - // undo - getBHome().create("b1"); - a1.assignBInNewTx("b1"); - } - checkIsInitialState(); - } - - public void testCohRemoveBTxNo() throws Exception { - _testCohRemoveB(TX_NO); - } - public void testCohRemoveBTxCall() throws Exception { - _testCohRemoveB(TX_CALL); - } - public void testCohRemoveBTxRb() throws Exception { - _testCohRemoveB(TX_RB); - } - - /** - * test coherence relation one to one bidirectionnel, - * B1.remove=>B1 removed && A1.retreiveB()==null - * Same as _testCohRemoveB except that the called remove method is on the bean - * instead of the home. - */ - public void _testCohBeanRemoveB(int tx) throws Exception { - if (tx == TX_CONT) { - // The transaction attribute of the remove method is TX_SUPPORT, - // so the transaction cannot be initiate by the container - fail("Transaction cannot be initiate by the container for this test"); - } - - if ((tx == TX_CALL) || (tx == TX_RB)) { - utx.begin(); - } - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - ARemote a2 = getAHome().findByPrimaryKey("a2"); - BRemote b2 = getBHome().findByPrimaryKey("b2"); - ARemote a3 = getAHome().findByPrimaryKey("a3"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - // change the relation - b1.remove(); - if (tx == TX_CALL) { - utx.commit(); - } else if (tx == TX_RB) { - utx.rollback(); - } - if (tx != TX_RB) { - // Verify expected result - assertNull("Bad coherence of relation : null expected for a1.retreiveB() found :"+a1.retrieveBInNewTx(), a1.retrieveBInNewTx()); - boolean not_found=false; - try { - b1 = getBHome().findByPrimaryKey("b1"); - } catch (ObjectNotFoundException e) { - not_found=true; - } - assertTrue("B is not removed",not_found); - // undo - getBHome().create("b1"); - a1.assignBInNewTx("b1"); - } - checkIsInitialState(); - } - - public void testCohBeanRemoveBTxNo() throws Exception { - _testCohBeanRemoveB(TX_NO); - } - public void testCohBeanRemoveBTxCall() throws Exception { - _testCohBeanRemoveB(TX_CALL); - } - public void testCohBeanRemoveBTxRb() throws Exception { - _testCohBeanRemoveB(TX_RB); - } - - /** - * Combination of 2 tests that fails : - * _testCohAlreadyAssign(TX_CALL) + _testCohRemoveA(TX_RB) - */ - public void testMultiA1() throws Exception { - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - utx.begin(); - a1.assignB("b3"); - utx.commit(); - a1.assignB("b1"); - utx.begin(); - getAHome().remove("a1"); - utx.rollback(); - String idB1 = a1.retrieveB(); - assertEquals("a1.b", "b1", idB1); - checkIsInitialState(); - } - - public void testMultiA2() throws Exception { - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - utx.begin(); - a1.assignB("b3"); - utx.commit(); - a1.assignB("b1"); - utx.begin(); - String idB1 = a1.retrieveB(); - utx.commit(); - assertEquals("a1.b", "b1", idB1); - checkIsInitialState(); - } - - public void testMultiA3() throws Exception { - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - utx.begin(); - a1.assignB("b3"); - utx.commit(); - a1.assignB("b1"); - utx.begin(); - String idA1 = b1.retrieveA(); - utx.commit(); - assertEquals("b1.a", "a1", idA1); - checkIsInitialState(); - } - - public void testMultiA4() throws Exception { - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - utx.begin(); - a1.assignB("b3"); - utx.commit(); - a1.assignB("b1"); - utx.begin(); - getBHome().remove("b1"); - utx.rollback(); - String idB1 = a1.retrieveB(); - assertEquals("a1.b", "b1", idB1); - checkIsInitialState(); - } - - public void testMultiA5() throws Exception { - ARemote a1 = getAHome().findByPrimaryKey("a1"); - BRemote b1 = getBHome().findByPrimaryKey("b1"); - BRemote b3 = getBHome().findByPrimaryKey("b3"); - utx.begin(); - a1.assignB("b3"); - utx.commit(); - a1.assignB("b1"); - utx.begin(); - getBHome().remove("b3"); - utx.rollback(); - String idB1 = a1.retrieveB(); - assertEquals("a1.b", "b1", idB1); - checkIsInitialState(); - } - - public void testRollback() throws Exception { - ARemote a = getAHome().findByPrimaryKey("a1"); - BRemote b = getBHome().findByPrimaryKey("b1"); - String orig = a.retrieveB(); - - // disassociate and commit - utx.begin(); - a.assignB(null); - utx.commit(); - assertEquals(null, a.retrieveB()); - - // revert to original state outside of a user transaction - a.assignB(orig); - - // retrieveB inside a transaction - utx.begin(); - assertEquals(orig, a.retrieveB()); - utx.rollback(); - - // verify that retrieveB returns correct value after rollback - try { - assertEquals("a1", b.retrieveA()); - assertEquals(orig, a.retrieveB()); - } finally { - // force sync to cleanup - sync(true); - } - checkIsInitialState(); - } - - /** - * Ensure the javax.ejb.EJBException is thrown when trying - * to invoke an accessor method on a deleted entitybean object - */ - public void testRemove1() throws Exception { - Front fb = fhome.create(); - fb.testRemove1(); - - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/C_Relation.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/C_Relation.java deleted file mode 100644 index 66c3496297bc11ba80f33c9019af8a15a4bcd5d1..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/C_Relation.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * This is a test suite about the different cases of the relationships bean's CMP2. - * Beans used: relation/* - * @author Jerome Camilleri - */ - -public class C_Relation extends JTestCase { - - public C_Relation(String name) { - super(name); - } - - /* - * tests on CS policy are deprecated in JONAS 5. - * Some of them may fail with JDK 6 (reason is not clear) - */ - public static Test suite() { - TestSuite suite = new TestSuite(); - // relation oou - //suite.addTest(F_oou_CS_EC2.suite()); - suite.addTest(F_oou_CRW_EC2.suite()); - // relation oob - //suite.addTest(F_oob_CS_EC2.suite()); - suite.addTest(F_oob_CRW_EC2.suite()); - // relation omu - //suite.addTest(F_omu_CS_EC2.suite()); - suite.addTest(F_omu_CRW_EC2.suite()); - // relation omb - //suite.addTest(F_omb_CS_EC2.suite()); - suite.addTest(F_omb_CRW_EC2.suite()); - // relation mou - //suite.addTest(F_mou_CS_EC2.suite()); - suite.addTest(F_mou_CRW_EC2.suite()); - // relation mnu - //suite.addTest(F_mnu_CS_EC2.suite()); - suite.addTest(F_mnu_CRW_EC2.suite()); - // relation mnb - //suite.addTest(F_mnb_CS_EC2.suite()); - suite.addTest(F_mnb_CRW_EC2.suite()); - // composite PK suites - suite.addTest(F_Relation_pkcompEC2.suite()); - suite.addTest(F_Relation_s1pkcompEC2.suite()); - suite.addTest(F_Relation_s2pkcompEC2.suite()); - suite.addTest(F_Relation_s3pkcompEC2.suite()); - - // Tables created with not null foreign-key - suite.addTest(F_Relation2_mouEC2.suite()); - - return suite; - } - - public static void main (String args[]) { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_BasicEjbqlEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_BasicEjbqlEC2.java deleted file mode 100644 index a5faecad59153bf8a2c2e39f1b2808f0d9eb48af..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_BasicEjbqlEC2.java +++ /dev/null @@ -1,402 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import java.util.Collection; -import java.util.Iterator; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.beans.ebasic.E4Query; -import org.objectweb.jonas.jtests.beans.ebasic.E4QueryHome; -import org.objectweb.jonas.jtests.util.JTestCase; - - -/** - * For testing basic EJB QL queries. - * @author Helene Joanin - */ - -public class F_BasicEjbqlEC2 extends JTestCase { - - private static String BEAN_HOME_E4QUERY = "ebasicE4QueryEC2Home"; - protected static E4QueryHome home = null; - - - public F_BasicEjbqlEC2(String name) { - super(name); - } - - protected void setUp() { - super.setUp(); - if (home == null) { - // load bean if not loaded yet - useBeans("ebasic", true); - try { - home = (E4QueryHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_E4QUERY), - E4QueryHome.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - // check if tables have been initialized - try { - home.findByPrimaryKey("id1"); - } catch (Exception e) { - try { - home.create("idnull", null, 0, 0.0); - home.create("id1","helene", 1959, 1959.0); - home.create("id2","ahelene", -1959, 1959.0); - home.create("id3","helene-bis", 1959*1959, 1959.0*1959.0); - home.create("id4","eric", 1957, 1957.0); - home.create("id4e","ric", 1957, 1957.0); - } catch (Exception i) { - fail("InitialState creation problem:: "+i); - } - } - } - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE LENGTH(o.fstring) = ?1 - */ - public void testLength() throws Exception { - int l = "helene".length(); - Collection cBeans = home.findByLengthString(l); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - assertEquals("Id="+bean.getId(), l, bean.getFstring().length()); - nb++; - } - assertEquals("Beans number: ", 1, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE LOCATE(?1, o.fstring) > 0 - */ - public void testLocate() throws Exception { - String l = "helene"; - Collection cBeans = home.findByLocateString(l); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - String f = bean.getFstring(); - assertTrue("Id="+bean.getId(), f.indexOf(l)>-1); - nb++; - } - assertEquals("Beans number: ", 3, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE LOCATE(?1, o.fstring, ?2) > 0 - * FAIL in postgresql. Spec 2.1 says that this implementation is optional. - */ - public void testLocateAt() throws Exception { - String l = "helene"; - Collection cBeans = home.findByLocateStringAt(l, 2); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - String f = bean.getFstring(); - assertTrue("Id=" + bean.getId() + ",f=" + f, f.indexOf(l, 1)>-1); - nb++; - } - assertEquals("Beans number: ", 1, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE SUBSTRING(o.fstring, ?2, ?3) = ?1 - */ - public void testSubstring() throws Exception { - String s = "el"; - int is = 2; - int il = "el".length(); - Collection cBeans = home.findBySubstring(s, is, il); - Iterator iBeans = cBeans.iterator(); - int nb=0; - int ib = is - 1; - int ie = is - 1 + il; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - String f = bean.getFstring(); - assertTrue("id="+bean.getId(), s.equals(f.substring(ib, ie))); - nb++; - } - assertEquals("Beans number: ", 2, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE CONCAT(o.id, o.fstring) = ?1 - */ - public void testConcat() throws Exception { - String s = "id4"+"eric"; - Collection cBeans = home.findByConcatString(s); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - String f = bean.getFstring(); - assertTrue("Id="+bean.getId(), s.equals(bean.getId().concat(bean.getFstring()))); - nb++; - } - assertEquals("Beans number: ", 2, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE ABS(o.fint) = ?1 - */ - public void testAbsInt() throws Exception { - int i = 1959; - Collection cBeans = home.findByAbsInt(i); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - int f = bean.getFint(); - assertTrue("Id="+bean.getId(), (f==-i) || (f==i)); - nb++; - } - assertEquals("Beans number: ", 2, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE SQRT(o.fdouble) BETWEEN ?1 - 0.1 AND ?1 + 0.1 - */ - public void testSqrt() throws Exception { - int i = 1959; - Collection cBeans = home.findBySqrtDouble(1959.0); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - int f = bean.getFint(); - assertTrue("Id="+bean.getId(), f==i*i); - nb++; - } - assertEquals("Beans number: ", 1, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE o.fstring IS NULL - */ - public void testIsNull() throws Exception { - Collection cBeans = home.findByIsNull(); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - assertNull("Id="+bean.getId(), bean.getFstring()); - nb++; - } - assertEquals("Beans number: ", 1, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE ?1 IS NULL - */ - public void testIsNull1Param() throws Exception { - Collection cBeans = home.findByIsNullParam(null); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - nb++; - } - assertEquals("Beans number: ", 6, nb); - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE ?1 IS NULL - */ - public void testIsNull2Param() throws Exception { - Collection cBeans = home.findByIsNullParam("hello"); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - nb++; - } - assertEquals("Beans number: ", 0, nb); - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE o.fstring IN ('helene', 'eric') - */ - public void testInStrings() throws Exception { - Collection cBeans = home.findByInStrings(); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - boolean ok = "helene".equals(bean.getFstring()) || "eric".equals(bean.getFstring()); - assertTrue("Id="+bean.getId(), ok); - nb++; - } - assertEquals("Beans number: ", 2, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE ABS(o.fint) = -100 - */ - public void testLessThanMinus100() throws Exception { - Collection cBeans = home.findByLessThanMinus100(); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - int f = bean.getFint(); - assertTrue("Id="+bean.getId(), f < -100); - nb++; - } - assertEquals("Beans number: ", 1, nb); - - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE o.fint = ?1 - ?2 - ?3 - * to reproduce bug 303587 - * This bug is pending: Remove this test from the list for now. - */ - public void _testIntEqualExpr2() throws Exception { - Collection cBeans = home.findByIntEqualExpr2(1962, 2, 1); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - int f = bean.getFint(); - assertEquals("Id="+bean.getId(), 1959, f); - nb++; - } - assertEquals("Beans number: ", 1, nb); - - } - - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE o.fstring > ?1 - */ - public void testStringGreaterThenExpr() throws Exception { - Collection cBeans = home.findByStringGreaterThenExpr("helene"); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - String f = bean.getFstring(); - assertTrue("Id="+bean.getId()+",fString="+f, f.compareTo("helene") > 0); - nb++; - } - assertEquals("Beans number: ", 2, nb); - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE o.fstring >= ?1 - */ - public void testStringGreaterOrEqualThenExpr() throws Exception { - Collection cBeans = home.findByStringGreaterOrEqualThenExpr("helene"); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - String f = bean.getFstring(); - assertTrue("Id="+bean.getId()+",fString="+f, f.compareTo("helene") >= 0); - nb++; - } - assertEquals("Beans number: ", 3, nb); - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE MOD(o.fint, ?1) = 0 - */ - public void testMod() throws Exception { - int op2 = 1959; - Collection cBeans = home.findByIntModXIsZero(op2); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - int f = bean.getFint(); - //System.out.println("Id="+bean.getId()+",fInt="+f); - assertTrue("Id="+bean.getId()+",fInt="+f, (f % op2) == 0); - nb++; - } - assertEquals("Beans number: ", 4, nb); - } - - - public static Test suite() { - return new TestSuite(F_BasicEjbqlEC2.class); - } - - public static void main(String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_BasicEjbqlEC2(testtorun)); - } - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_EjbqlEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_EjbqlEC2.java deleted file mode 100644 index 58a46a91b96aaec69090bc430776df61738236dd..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_EjbqlEC2.java +++ /dev/null @@ -1,1897 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty offind - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.beans.ejbql.*; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -/** - * This is an advanced test suite for home interface on entity bean EJBQL. - */ -public class F_EjbqlEC2 extends A_Cmp2Util { - - private static String BEAN_HOME_SESSION_TEST = "EjbqlSessionTestHomeRemote"; - private static String BEAN_HOME_CUSTOMER = "CustomerHomeRemote"; - private static String BEAN_HOME_RESERVATION = "ReservationHomeRemote"; - private static String BEAN_HOME_CRUISE = "CruiseHomeRemote"; - private static String BEAN_HOME_SHIP = "ShipHomeRemote"; - private static String BEAN_HOME_CABIN = "CabinHomeRemote"; - private static String BEAN_HOME_ADDRESS = "AddressHomeRemote"; - - protected static SessionTestHomeRemote sessiontesthome = null; - protected static CustomerHomeRemote customerhome = null; - protected static ReservationHomeRemote reservationhome = null; - protected static CruiseHomeRemote cruisehome = null; - protected static ShipHomeRemote shiphome = null; - protected static CabinHomeRemote cabinhome = null; - protected static AddressHomeRemote addresshome = null; - protected static CreditCardHomeRemote creditcardhome = null; - - public F_EjbqlEC2(String name) { - super(name); - } - - protected boolean isInit = false; - - protected void setUp() { - super.setUp(); - boolean ok = false; - int nbtry = 0; - while (!ok && nbtry < 3) { - logger.log(BasicLevel.DEBUG, "Starting " + getName() + " try " + nbtry); - if (!isInit) { - // load bean if not loaded yet - useBeans("ejbql", false); - // lookup home used in the tests - - try { - sessiontesthome = (SessionTestHomeRemote) - PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_SESSION_TEST), - SessionTestHomeRemote.class); - customerhome = (CustomerHomeRemote) - PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_CUSTOMER), - CustomerHomeRemote.class); - shiphome = (ShipHomeRemote) - PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_SHIP), - ShipHomeRemote.class); - cruisehome = (CruiseHomeRemote) - PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_CRUISE), - CruiseHomeRemote.class); - reservationhome = (ReservationHomeRemote) - PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_RESERVATION), - ReservationHomeRemote.class); - cabinhome = (CabinHomeRemote) - PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_CABIN), - CabinHomeRemote.class); - addresshome = (AddressHomeRemote) - PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_ADDRESS), - AddressHomeRemote.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - // check if tables have been initialized - try { - customerhome.findByPrimaryKey(new Integer(80)); - } catch (Exception e) { - // Make the initialization needed for the tests - try { - logger.log(BasicLevel.DEBUG, getName() + ": init tables"); - - utx.begin(); - String cities[] = new String[6]; - cities[0] = "Minneapolis"; cities[1] = "St. Paul"; cities[2] = "Rochester"; - cities[3] = "Winona"; cities[4] = "Wayzata"; cities[5] = "Eagan"; - ShipRemote shipA = null; - CruiseRemote cruiseA = null; - shipA = shiphome.create(new Integer(10772), "Ship A", 30000.0); - cruiseA = cruisehome.create("Cruise A", new Integer(10772)); - for (int jj = 1; jj <= 10; jj++) { - ShipRemote ship = shiphome.create(new Integer(jj), "Ship " + jj, 30000.0 + (10000.0 * jj)); - } - cruiseA = null; - CruiseRemote cruiseB = null; - ShipRemote ship1 = shiphome.findByPrimaryKey(new Integer(1)); - cruiseA = cruisehome.create("Alaska Cruise", new Integer(1)); - cruiseB = cruisehome.create("Bohemian Cruise", new Integer(1)); - for (int kk = 80; kk <= 99; kk++) { - CustomerRemote customer = null; - - customer = customerhome.create(new Integer(kk)); - customer.setName(new Name("Smith"+kk,"John") ); - customer.addPhoneNumber("612-555-12"+kk,(byte) 1); - - customer.setAddress("10"+kk+" Elm Street", - cities[(kk-80)%6], - (kk%2==0?"MN":"CA"), - "5540"+(kk%5+1)); - customer.setHasGoodCredit((kk%4 == 0)); - if (kk%4 == 0) - customer.setCreditCard(new Date(System.currentTimeMillis()+100000), "100001"+kk, "MasterCard", "CA" ,"CETELEM", "rue de jeunet", cities[0], "France", "3888" ); - } - utx.commit(); - - // Creating Customers 1-6, each with 2 reservations for 2 cabins - utx.begin(); - Calendar date = Calendar.getInstance(); - date.set(2002,10,1); - - for (int kk=201; kk<207; kk++) { - Collection customers = new ArrayList(); - CustomerRemote cust = customerhome.create(new Integer(kk)); - cust.setName(new Name("Customer "+kk,"Mike")); - cust.setHasGoodCredit( (kk%2==0) ); // odds are bums - cust.setAddress("50"+kk+" Main Street","Minneapolis","MN","5510"+kk); - customers.add(new Integer(kk)); // put this single customer in the collection - - Collection reservations = new ArrayList(); - - for (int jj=0; jj<2; jj++) { - - ReservationRemote reservation = reservationhome.create(cruiseA.getId(), customers); - reservation.setDate(date.getTime()); - reservation.setAmountPaid(1000*kk+100*jj+2000); - - date.add(Calendar.DAY_OF_MONTH, 7); - - Set cabins = new HashSet(); - CabinRemote cabin = cabinhome.create(new Integer(1000+kk*100+jj)); - cabin.setDeckLevel(kk-200); - cabin.setName("Cabin "+kk+"0"+jj+"1"); - - cabins.add(cabin.getId()); - cabin = cabinhome.create(new Integer(1000+kk*100+10+jj)); - cabin.setDeckLevel(kk-200); - cabin.setName("Cabin "+kk+"0"+jj+"2"); - - cabins.add(cabin.getId()); - - reservation.setAllCabins(cabins); // this reservation has 2 cabins - - } - } - utx.commit(); - utx.begin(); - String fnames[] = new String[5]; - fnames[0]="John"; fnames[1]="Paul"; fnames[2]="Ringo"; - fnames[3]="Joe"; fnames[4]="Roger"; - - String lnames[] = new String[3]; - lnames[0]="Smith"; lnames[1]="Johnson"; lnames[2]="Star"; - // Creating Customers 50-69 - for (int kk=50; kk<=69; kk++) { - CustomerRemote customer = customerhome.create(new Integer(kk)); - customer.setName( new Name(lnames[(kk-50)%3], fnames[(kk-50)%5]) ); - customer.addPhoneNumber("612-555-12"+kk,(byte)1); - customer.setAddress("10"+kk+" Elm Street", - cities[(kk-50)%6], - (kk%2==0?"MN":"CA"), - "5540"+(kk%5+1)); - customer.setHasGoodCredit((kk%4==0)); - - // Some customers will have reservations already on one of the two cruises.. - if (kk%3!=0) { - Collection customers = new ArrayList(); - customers.add(customer.getId()); // put this single customer in the collection - ReservationRemote reservation = reservationhome.create((kk%3==1?cruiseA.getId():cruiseB.getId()), customers); - reservation.setDate(date.getTime()); - reservation.setAmountPaid(10*kk+2000); - date.add(Calendar.DAY_OF_MONTH, 7); - } - } - utx.commit(); - - // Creating Customers 100-109 - utx.begin(); - for (int kk=100; kk<=109; kk++) { - CustomerRemote customer = customerhome.create(new Integer(kk)); - customer.setName( new Name("Lennon"+kk, "Paul") ); - customer.addPhoneNumber("666-543-12"+kk,(byte)1); - - customer.setAddress("10"+kk+" Abbey Road", - cities[(kk-100)%6], - (kk%2==0?"FL":"WA"), - "5540"+(kk%5+1)); - customer.setHasGoodCredit((kk%4==0)); - } - - logger.log(BasicLevel.DEBUG, getName() + ": init done"); - } catch (Exception i) { - i.printStackTrace(System.out); - fail("InitialState creation problem: "+i); - } finally { - try { - utx.commit(); - } catch (Exception ii) { - } - } - } - isInit = true; - } - // Check that all is OK. Sometimes, a test has failed and has corrupted - // the bean state in the database. We must unload and reload the bean then. - nbtry++; - try { - if (initStateOK()) { - ok = true; - } - } catch (Exception e) { - e.printStackTrace(System.out); - } - if (!ok) { - isInit = false; - unloadBeans("ejbql"); - } - } - } - - - /* - * Check that we are in the same state as after the tables creation for thoses beans A and B - * (ie if it is the initial state) - */ - boolean initStateOK() throws Exception { - // just verify that all ejb are correcly created. Nothing about relation here because we testing only ejbql - boolean isOk = true; - - msgerror = new StringBuffer(); - - ShipRemote ship10772 = shiphome.findByPrimaryKey(new Integer(10772)); - for (int i=1; i<=10; i++) { - ShipRemote ship = shiphome.findByPrimaryKey(new Integer(i)); - } - - CruiseRemote cruiseA = cruisehome.findByName("Cruise A"); - CruiseRemote cruiseB = cruisehome.findByName("Alaska Cruise"); - CruiseRemote cruiseC = cruisehome.findByName("Bohemian Cruise"); - for (int j=10; j<=12; j++) { - CruiseRemote cruise = cruisehome.findByPrimaryKey(new Integer(j)); - } - - for (int k=80; k<=109; k++) { - CustomerRemote customer = customerhome.findByPrimaryKey(new Integer(k)); - } - - for (int l=201; l<=206; l++) { - CustomerRemote customer1 = customerhome.findByPrimaryKey(new Integer(l)); - } - - for (int p=50; p<=69; p++) { - CustomerRemote customer2 = customerhome.findByPrimaryKey(new Integer(p)); - } - for (int kk=201;kk<207;kk++) { - for (int jj=0;jj<2;jj++) { - CabinRemote cabin = cabinhome.findByPrimaryKey(new Integer(1000+kk*100+jj)); - CabinRemote cabin1 = cabinhome.findByPrimaryKey(new Integer(1000+kk*100+10+jj)); - } - } - - for (int kkh=10;kkh<=34;kkh++) { - ReservationRemote reservation = reservationhome.findByPrimaryKey(new Integer(kkh)); - } - - return isOk; - } - - /** - * The execution of those two tests failed. - */ - public void testSeries1() throws Exception { - testWildcards(); - testWildcards(); - } - - /** - * Finding Customer having name 'John Smith85' - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.lastName = ?1 AND c.firstName = ?2 - */ - public void testAnd1() throws Exception { - CustomerRemote customer85 = customerhome.findByExactName("Smith85","John"); - assertEquals("Wrong Customer : ",new Integer(85), customer85.getId()); - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customer 'Smith90' - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.lastName = 'Smith90' - */ - public void testEgalString() throws Exception { - CustomerRemote customer90 = customerhome.findSmith90(); - assertEquals("Wrong Customer : ",new Integer(90), customer90.getId()); - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers having GoodCredit - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.hasGoodCredit = TRUE - */ - public void testEgalBoolean() throws Exception { - Collection mplscustomers = customerhome.findByGoodCredit(); - ArrayList customers_id = new ArrayList(); - Iterator customer = mplscustomers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - - for (int ii=80;ii<=96;ii=ii+4) { - result.add(new Integer(ii)); - } - - for (int ii=100;ii<=108;ii=ii+4) { - result.add(new Integer(ii)); - } - for (int jj=202;jj<=206;jj=jj+2) { - result.add(new Integer(jj)); - } - - for (int kk=52;kk<=68;kk=kk+4) { - result.add(new Integer(kk)); - } - - assertTrue("Wrong result EJBQL Customer.findByGoogCredit() (required:" + result + ", found:" +customers_id - + ")", isCollectionEqual(result, customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers having City = Minneapolis and STATE= MN - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.homeAddress.city = ?1 AND c.homeAddress.state = ?2 - */ - public void testAnd2() throws Exception { - Collection mplscustomers = customerhome.findByCity("Minneapolis","MN"); - - ArrayList customers_id = new ArrayList(); - Iterator customer = mplscustomers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(206)); - result.add(new Integer(50)); - result.add(new Integer(56)); - result.add(new Integer(62)); - result.add(new Integer(68)); - result.add(new Integer(80)); - result.add(new Integer(86)); - result.add(new Integer(92)); - result.add(new Integer(98)); - result.add(new Integer(201)); - result.add(new Integer(202)); - result.add(new Integer(203)); - result.add(new Integer(204)); - result.add(new Integer(205)); - - assertTrue("Wrong result EJBQL Customer.findByCity(Minneapolis,MN) (required:" + result + ", found:" +customers_id - + ")", isCollectionEqual(result, customers_id)); - - //checkIsInitialState();not necessary in this test - } - /** - * Finding Customer having a name exactly matching 'Joe Star' & - * Finding Customers having a name like 'Jo S' (no wildcards) & - * Finding Customers having a name like 'Jo% S%' (with wildcards) - * Finding Customers having a name like 'Jo% S%' and living in MN - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.lastName = ?1 AND c.firstName = ?2 & - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2 & - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2 - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2 AND c.homeAddress.state = ?3 - */ - public void testWildcards() throws Exception { - // first test : exactly matching - CustomerRemote customer = customerhome.findByExactName("Star","Joe"); - assertEquals("Wrong Customer for customerhome.findByExactName(Star,Joe);: ",new Integer(58), customer.getId()); - - // second test : find with no wildcards - Collection customers = customerhome.findByName("S","Jo"); - ArrayList customers_id = new ArrayList(); - Iterator customerit1 = customers.iterator(); - while (customerit1.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customerit1.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - assertTrue("Wrong result EJBQL customerhome.findByName(S,Jo) (required:" + result + ", found:" +customers_id - + ")", isCollectionEqual(result, customers_id)); - - // thirdth test : find with no wildcards - customers = customerhome.findByName("S%","Jo%"); - customers_id = new ArrayList(); - Iterator customerit2 = customers.iterator(); - while (customerit2.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customerit2.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - result = new ArrayList(); - result.add(new Integer(50)); - result.add(new Integer(53)); - result.add(new Integer(55)); - result.add(new Integer(58)); - result.add(new Integer(65)); - result.add(new Integer(68)); - for (int i=80;i<=99;i++) { - result.add(new Integer(i)); - } - assertTrue("Wrong result EJBQL customerhome.findByName(S%,Jo%) (required:" + result + ", found:" +customers_id - + ")", isCollectionEqual(result, customers_id)); - - customers = customerhome.findByNameAndState("S%","Jo%","MN"); - customers_id = new ArrayList(); - Iterator customerit3 = customers.iterator(); - while (customerit3.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customerit3.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - result = new ArrayList(); - result.add(new Integer(50)); - result.add(new Integer(68)); - result.add(new Integer(58)); - for (int i=80;i<=99;i=i+2) { - result.add(new Integer(i)); - } - assertTrue("Wrong result EJBQL customerhome.findByNameAndState(S%,Jo%,MN) (required:" + result + ", found:" +customers_id - + ")", isCollectionEqual(result, customers_id)); - - - // checkIsInitialState(); not necessary in this test - } - - /** - * (Bug #300634) - * Finding Customers having a name not like 'Jo%' OR not like 'S%' - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.lastName NOT LIKE ?1 OR c.firstName NOT LIKE ?2 - */ - public void testNotLike() throws Exception { - Collection customers = customerhome.findByNotName("S%","Jo%"); - ArrayList customers_id = new ArrayList(); - Iterator customerit1 = customers.iterator(); - while (customerit1.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customerit1.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(51)); - result.add(new Integer(52)); - result.add(new Integer(54)); - result.add(new Integer(56)); - result.add(new Integer(57)); - result.add(new Integer(59)); - for (int i=60;i<=64;i++) { - result.add(new Integer(i)); - } - result.add(new Integer(66)); - result.add(new Integer(67)); - result.add(new Integer(69)); - for (int i=100;i<=109;i++) { - result.add(new Integer(i)); - } - for (int i=201;i<=206;i++) { - result.add(new Integer(i)); - } - assertTrue("Wrong result EJBQL customerhome.findByNotName(S%,Jo%) (required:" + result + ", found:" +customers_id - + ")", isCollectionEqual(result, customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Retrieve a collection of all cabins on deck 3 - * SELECT OBJECT(c) FROM Cabin as c WHERE c.deckLevel = ?1 - */ - public void testEgalInteger() throws Exception { - Collection cabins = cabinhome.findAllOnDeckLevel(new Integer(3)); - - ArrayList cabins_id = new ArrayList(); - Iterator cabin = cabins.iterator(); - while (cabin.hasNext()) { - CabinRemote cabin_remote = (CabinRemote) PortableRemoteObject.narrow(cabin.next(), CabinRemote.class); - cabins_id.add(cabin_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(21300)); - result.add(new Integer(21310)); - result.add(new Integer(21301)); - result.add(new Integer(21311)); - - assertTrue("Wrong result EJBQL cabinhome.findAllOnDeckLevel(new Integer(3))(required:" + result + ", found:" +cabins_id+ - ")", isCollectionEqual(result,cabins_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Findng Customers Living in Warm Climates - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.homeAddress.state IN ('FL','TX','AZ','CA') - */ - public void testInWhere() throws Exception { - Collection customers = customerhome.findInHotStates(); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - for (int i=51;i<=69;i=i+2) { - result.add(new Integer(i)); - } - for (int j=100;j<=109;j=j+2) { - result.add(new Integer(j)); - } - for (int k=81;k<=99;k=k+2) { - result.add(new Integer(k)); - } - - assertTrue("Wrong result EJBQL customerhome.findInHotStates() (required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Test an IN expression with literals integer - * SELECT OBJECT(c) FROM jt2_Cabin as c WHERE c.deckLevel IN ( 1 , 3 , 5 ) - */ - public void test2InWhere() throws Exception { - Collection cabins = cabinhome.findAllOnDeckLevel1_3_5(); - - ArrayList customers_id = new ArrayList(); - Iterator icabins = cabins.iterator(); - int nb = 0; - while (icabins.hasNext()) { - CabinRemote cabin_remote = (CabinRemote) PortableRemoteObject.narrow(icabins.next(), CabinRemote.class); - nb++; - int level = cabin_remote.getDeckLevel(); - if ((level != 1) && (level != 3) && (level != 5)) { - fail("Wrong result EJBQL cabinhome.findAllOnDeckLevel1_3_5(5) (level=" - + level + ")"); - } - } - assertEquals("Wrong result EJBQL cabinhome.findAllOnDeckLevel1_3_5(5)", 12, nb); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Test an IN expression with literals integer and an input parameter - * SELECT OBJECT(c) FROM jt2_Cabin as c WHERE c.deckLevel IN ( 1 , 3 , ?1 ) - */ - public void test3InWhere() throws Exception { - Collection cabins = cabinhome.findAllOnDeckLevel1_3_X(5); - - ArrayList customers_id = new ArrayList(); - Iterator icabins = cabins.iterator(); - int nb = 0; - while (icabins.hasNext()) { - CabinRemote cabin_remote = (CabinRemote) PortableRemoteObject.narrow(icabins.next(), CabinRemote.class); - nb++; - int level = cabin_remote.getDeckLevel(); - if ((level != 1) && (level != 3) && (level != 5)) { - fail("Wrong result EJBQL cabinhome.findAllOnDeckLevel1_3_X(5) (level=" - + level + ")"); - } - } - assertEquals("Wrong result EJBQL cabinhome.findAllOnDeckLevel1_3_X(5)", 12, nb); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers Without Reservations - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.reservations IS EMPTY - */ - public void testIsEmpty() throws Exception { - Collection customers = customerhome.findWithoutReservations(); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - for (int i=51;i<=69;i=i+3) { - result.add(new Integer(i)); - } - for (int i=80;i<=109;i++) { - result.add(new Integer(i)); - } - - assertTrue("Wrong result EJBQL customerhome.findWithoutReservations() (required:" - + result + ", found:" + customers_id + ")", - isCollectionEqual(result,customers_id)); - - //checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers With Reservations - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.reservations IS NOT EMPTY - */ - public void testIsNotEmpty() throws Exception { - Collection customers = customerhome.findWithReservations(); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - for (int i=201;i<=206;i++) { - result.add(new Integer(i)); - } - result.add(new Integer(50)); - result.add(new Integer(52)); - result.add(new Integer(53)); - result.add(new Integer(55)); - result.add(new Integer(56)); - result.add(new Integer(58)); - result.add(new Integer(59)); - result.add(new Integer(61)); - result.add(new Integer(62)); - result.add(new Integer(64)); - result.add(new Integer(65)); - result.add(new Integer(67)); - result.add(new Integer(68)); - - assertTrue("Wrong result EJBQL customerhome.findWithReservations() (required:" - + result + ", found:" + customers_id + ")", - isCollectionEqual(result,customers_id)); - - //checkIsInitialState(); not necessary in this test - } - - /** - * Test to reproduce bug #300525 - * Finding Customers Without or With Reservations (equivalent to finding all customers) - * SELECT OBJECT(c) FROM jt2_Customer c - * WHERE c.reservations IS EMPTY OR c.reservations IS NOT EMPTY - */ - public void testIsEmptyIsNotEmpty() throws Exception { - Collection customers = customerhome.findWithOrWithoutReservations(); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - for (int i=50;i<=69;i++) { - result.add(new Integer(i)); - } - for (int i=80;i<=109;i++) { - result.add(new Integer(i)); - } - for (int i=201;i<=206;i++) { - result.add(new Integer(i)); - } - - assertTrue("Wrong result EJBQL customerhome.findWithOrWithoutReservations() (required:" - + result + ", found:" + customers_id + ")", - isCollectionEqual(result,customers_id)); - - //checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers Without Reservations and with good credit - * SELECT OBJECT(c) FROM jt2_Customer c - * WHERE c.reservations IS EMPTY AND c.hasGoodCredit = true - */ - public void testIsEmptyInExp1() throws Exception { - Collection customers = customerhome.findWithoutReservationsAndWithGoodCredit(true); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(80)); - result.add(new Integer(84)); - result.add(new Integer(88)); - result.add(new Integer(92)); - result.add(new Integer(96)); - result.add(new Integer(60)); - result.add(new Integer(100)); - result.add(new Integer(104)); - result.add(new Integer(108)); - - assertTrue("Wrong result EJBQL customerhome.findWithoutReservationsAndWithGoodCredit() (required:" - + result + ", found:" + customers_id + ")", - isCollectionEqual(result,customers_id)); - - //checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers Without Reservations and with good credit - * Test equivalent to testIsEmptyInExp1 - * SELECT OBJECT(c) FROM jt2_Customer c - * WHERE NOT (c.reservations IS NOT EMPTY OR c.hasGoodCredit <> true) - */ - public void testIsEmptyInExp1Bis() throws Exception { - Collection customers = customerhome.findBisWithoutReservationsAndWithGoodCredit(true); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(80)); - result.add(new Integer(84)); - result.add(new Integer(88)); - result.add(new Integer(92)); - result.add(new Integer(96)); - result.add(new Integer(60)); - result.add(new Integer(100)); - result.add(new Integer(104)); - result.add(new Integer(108)); - - assertTrue("Wrong result EJBQL customerhome.findBisWithoutReservationsAndWithGoodCredit() (required:" - + result + ", found:" + customers_id + ")", - isCollectionEqual(result,customers_id)); - - //checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers Without Reservations and with good credit - * Test equivalent to testIsEmptyInExp1 - * SELECT OBJECT(c) FROM jt2_Customer c - * WHERE NOT ( NOT (c.reservations IS EMPTY AND c.hasGoodCredit = true) ) - */ - public void testIsEmptyInExp1Ter() throws Exception { - Collection customers = customerhome.findTerWithoutReservationsAndWithGoodCredit(true); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(80)); - result.add(new Integer(84)); - result.add(new Integer(88)); - result.add(new Integer(92)); - result.add(new Integer(96)); - result.add(new Integer(60)); - result.add(new Integer(100)); - result.add(new Integer(104)); - result.add(new Integer(108)); - - assertTrue("Wrong result EJBQL customerhome.findTerWithoutReservationsAndWithGoodCredit() (required:" - + result + ", found:" + customers_id + ")", - isCollectionEqual(result,customers_id)); - - //checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers Without Reservations and with good credit - * Test equivalent to testIsEmptyInExp1 - * SELECT OBJECT(c) FROM jt2_Customer c - * WHERE NOT (c.hasGoodCredit <> true) AND c.reservations IS EMPTY - */ - public void testIsEmptyInExp1Quad() throws Exception { - Collection customers = customerhome.findQuadWithoutReservationsAndWithGoodCredit(true); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(80)); - result.add(new Integer(84)); - result.add(new Integer(88)); - result.add(new Integer(92)); - result.add(new Integer(96)); - result.add(new Integer(60)); - result.add(new Integer(100)); - result.add(new Integer(104)); - result.add(new Integer(108)); - - assertTrue("Wrong result EJBQL customerhome.findQuadWithoutReservationsAndWithGoodCredit() (required:" - + result + ", found:" + customers_id + ")", - isCollectionEqual(result,customers_id)); - - //checkIsInitialState(); not necessary in this test - } - - /** - * Test to reproduce bug #300525 - * Finding Customers Without Reservations OR with good credit - * SELECT OBJECT(c) FROM jt2_Customer c - * WHERE c.reservations IS EMPTY OR c.hasGoodCredit == true - */ - public void testIsEmptyInExp2() throws Exception { - Collection customers = customerhome.findWithoutReservationsOrWithGoodCredit(true); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - for (int i=51;i<=69;i=i+3) { - result.add(new Integer(i)); - } - for (int i=80;i<=109;i++) { - result.add(new Integer(i)); - } - result.add(new Integer(202)); - result.add(new Integer(204)); - result.add(new Integer(206)); - result.add(new Integer(52)); - result.add(new Integer(56)); - result.add(new Integer(64)); - result.add(new Integer(68)); - - assertTrue("Wrong result EJBQL customerhome.findWithoutReservationsOrWithGoodCredit() (required:" - + result + ", found:" + customers_id + ")", - isCollectionEqual(result,customers_id)); - - //checkIsInitialState(); not necessary in this test - } - - /** - * Finding the customer with a specific phone number - * SELECT OBJECT(c) FROM jt2_Customer cust WHERE ?1 IS MEMBER OF cust.phoneNumbers - * This test is done via a session bean because it need to use Local interfaces. - */ - public void testSimpleMemberOf() throws Exception { - SessionTestRemote sTest = sessiontesthome.create(); - int custId = sTest.getCustomerWithPhone("612-555-1280").intValue();; - assertEquals("Wrong result EJBQL session.getCustomerWithPhone(612-555-1280): ", - 80, custId); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers On Alaska Cruise - * SELECT OBJECT(c) FROM jt2_Customer cust, Cruise cr, IN(cr.reservations) res - * WHERE cr = ?1 AND cust MEMBER OF res.customers - */ - public void testMemberOfNavigate() throws Exception { - CruiseRemote crA = cruisehome.findByName("Alaska Cruise"); - Collection customers_id = customerhome.callFindOnCruise(crA.getId()); - - ArrayList result = new ArrayList(); - result.add(new Integer(201)); - result.add(new Integer(202)); - result.add(new Integer(203)); - result.add(new Integer(204)); - result.add(new Integer(205)); - result.add(new Integer(206)); - result.add(new Integer(52)); - result.add(new Integer(55)); - result.add(new Integer(58)); - result.add(new Integer(61)); - result.add(new Integer(64)); - result.add(new Integer(67)); - - assertTrue("Wrong result EJBQL customerhome.findOnCruise(crA) (required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding ship by tonnage - * SELECT OBJECT(c) FROM jt2_Ship s - * WHERE s.tonnage = ?1 - */ - public void testEgalDouble() throws Exception { - Collection ships = shiphome.findByTonnage(new Double(100000)); - - ArrayList ships_id = new ArrayList(); - Iterator ship = ships.iterator(); - while (ship.hasNext()) { - ShipRemote ship_remote = (ShipRemote) PortableRemoteObject.narrow(ship.next(), ShipRemote.class); - ships_id.add(ship_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(7)); - - - assertTrue("Wrong result EJBQL shiphome.findByTonnage(new Double(100000)) (required:" + result + ", found:" +ships_id+ ")", isCollectionEqual(result,ships_id)); - - // checkIsInitialState(); not necessary in this test - } - - - /** - * Finding ship by tonnage - * SELECT OBJECT(c) FROM jt2_Ship s - * WHERE s.tonnage BETWEEN ?1 AND ?2 - */ - public void testBetweenDouble() throws Exception { - Collection ships = shiphome.findByTonnage(new Double(100000),new Double(130000)); - - ArrayList ships_id = new ArrayList(); - Iterator ship = ships.iterator(); - while (ship.hasNext()) { - ShipRemote ship_remote = (ShipRemote) PortableRemoteObject.narrow(ship.next(), ShipRemote.class); - ships_id.add(ship_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(7)); - result.add(new Integer(8)); - result.add(new Integer(9)); - result.add(new Integer(10)); - - assertTrue("Wrong result EJBQL shiphome.findByTonnage(new Double(100000),new Double(130000)) (required:" + result + ", found:" +ships_id+ ")", isCollectionEqual(result,ships_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * A complex navigation test - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.creditCard.creditCompany.address.city = ?1 - */ - public void testNavigate() throws Exception { - - - Collection customers = customerhome.findAllCreditCardAddress("Minneapolis"); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(80)); - result.add(new Integer(84)); - result.add(new Integer(88)); - result.add(new Integer(92)); - result.add(new Integer(96)); - - assertTrue("Wrong result EJBQL customerhome.findAllCreditCardAddress() (required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - checkIsInitialState(); - - } - - /** - * An other complex navigation test and the OR operator - * SELECT OBJECT(c) FROM jt2_Customer AS c WHERE c.creditCard.number = ?1 OR c.homeAddress.zip = ?2 - */ - public void testNavigateOr() throws Exception { - - - Collection customers = customerhome.findCustWithCCNumOrAddrZip("10000184", "55404"); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(84)); - result.add(new Integer(88)); - - assertTrue("Wrong result EJBQL customerhome.findCustWithCCNumOrAddrZip() (required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - checkIsInitialState(); - - } - - /** - * Finding all Customer with reservations (there will be duplication in result if customer has more than one reservation - * - * SELECT OBJECT(c) FROM jt2_Reservation res, IN(res.customers) c - */ - public void testInFrom() throws Exception { - - Collection customers = customerhome.findAllCustomersWithReservation(); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - - result.add(new Integer(201)); - result.add(new Integer(201)); - result.add(new Integer(202)); - result.add(new Integer(202)); - result.add(new Integer(203)); - result.add(new Integer(203)); - result.add(new Integer(204)); - result.add(new Integer(204)); - result.add(new Integer(205)); - result.add(new Integer(205)); - result.add(new Integer(206)); - result.add(new Integer(206)); - result.add(new Integer(50)); - result.add(new Integer(52)); - result.add(new Integer(53)); - result.add(new Integer(55)); - result.add(new Integer(56)); - result.add(new Integer(58)); - result.add(new Integer(59)); - result.add(new Integer(61)); - result.add(new Integer(62)); - result.add(new Integer(64)); - result.add(new Integer(65)); - result.add(new Integer(67)); - result.add(new Integer(68)); - - assertTrue("Wrong result EJBQL customerhome.findAllCustomersWithReservation (required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding all Customer with reservations (there will not be duplication in result) - * - * SELECT DISTINCT OBJECT(c) FROM jt2_Reservation res, IN(res.customers) c - */ - public void testDistinctInFrom() throws Exception { - - Collection customers = customerhome.findAllCustomersWithReservationDistinct(); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - - result.add(new Integer(201)); - result.add(new Integer(202)); - result.add(new Integer(203)); - result.add(new Integer(204)); - result.add(new Integer(205)); - result.add(new Integer(206)); - result.add(new Integer(50)); - result.add(new Integer(52)); - result.add(new Integer(53)); - result.add(new Integer(55)); - result.add(new Integer(56)); - result.add(new Integer(58)); - result.add(new Integer(59)); - result.add(new Integer(61)); - result.add(new Integer(62)); - result.add(new Integer(64)); - result.add(new Integer(65)); - result.add(new Integer(67)); - result.add(new Integer(68)); - - assertTrue("Wrong result EJBQL customerhome.findAllCustomersWithReservationDistinct (required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Test for feature #300040 - * Finding Customer by address - * - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.homeAddress = ?1 - */ - public void _testBeanAsParameter() throws Exception { - - AddressRemote add = addresshome.findByPrimaryKey(new Integer(10)); - - Collection customers = customerhome.findByAddress(add); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - - result.add(new Integer(80)); - - assertTrue("Wrong result EJBQL customerhome.findByAddress(add)(required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Test for feature #300040 - * Finding Customer by address - * - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.homeAddress = ?1 - */ - public void _testBeanNullAsParameter() throws Exception { - - Collection customers = customerhome.findByAddress(null); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - - assertTrue("Wrong result EJBQL customerhome.findByAddress(add)(required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding All Customer - * - * SELECT OBJECT(c) FROM jt2_Customer AS c - */ - public void testFindCustomerAll() throws Exception { - - Collection customers = customerhome.findCustomersAll(); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - - for (int i=80;i<=99;i++) { - result.add(new Integer(i)); - } - for (int j=201;j<=206;j++) { - result.add(new Integer(j)); - } - for (int k=50;k<=69;k++) { - result.add(new Integer(k)); - } - for (int l=100;l<=109;l++) { - result.add(new Integer(l)); - } - - assertTrue("Wrong result EJBQL customerhome.findCustomersAll()(required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers by AddressId - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.homeAddress.id = ?1 - */ - public void testFindCustByAddrId() throws Exception { - Collection customers = customerhome.findByAddressId(new Integer(10)); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(80)); - - assertTrue("Wrong result EJBQL customerhome.findByAddressId(10) (required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Bug #300626 - * SELECT OBJECT(a) FROM jt2_Address AS a - * WHERE a.homecustomer.lastName = 'Smith80' - * AND a.homecustomer.creditCard.id = 10 - * AND a.homecustomer.creditCard.creditCompany.name = 'CETELEM' - * AND a.homecustomer.creditCard.creditCompany.id = 10 - */ - public void testAddrQuery300626() throws Exception { - AddressRemote a = addresshome.findQuery300626(); - assertEquals("Wrong result EJBQL : addresshome.findQuery300626()", 10, a.getId().intValue()); - } - - /** - * Finding Customers by AddressLocal - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.homeAddress = ?1 - */ - public void testBeanLocalAsParameter() throws Exception { - Collection customers = customerhome.callFindByAddressLocal(new Integer(10)); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - customers_id.add((Integer)customer.next()); - } - ArrayList result = new ArrayList(); - result.add(new Integer(80)); - - assertTrue("Wrong result EJBQL customerhome.callFindByAddressLocal(10) (required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding Customers by AddressLocal - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.homeAddress = ?1 - */ - public void testBeanLocalNullAsParameter() throws Exception { - Collection customers = customerhome.callFindByAddressLocal(null); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - customers_id.add((Integer)customer.next()); - } - ArrayList result = new ArrayList(); - - assertTrue("Wrong result EJBQL customerhome.callFindByAddressLocal(null) (required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Test a finder method - * - which have no parameter and which have its name starts with 'findAll', - * - but which not means "findAll". - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.firstName LIKE 'Mike' - */ - public void testFindAllMike() throws Exception { - Collection customers = customerhome.findAllMike(); - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - assertEquals("findAllMike() wrong result: ", - "Mike", customer_remote.getName().getFirstName()); - } - } - - /** - * Test a finder method with the IS NOT NULL operator on a cmr field. - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.creditCard IS NOT NULL - */ - public void testIsNull1() throws Exception { - Collection customers = customerhome.findCustomersWithCreditCard(); - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList resExpected = new ArrayList(); - resExpected.add(new Integer(80)); - resExpected.add(new Integer(84)); - resExpected.add(new Integer(88)); - resExpected.add(new Integer(92)); - resExpected.add(new Integer(96)); - assertTrue("Wrong result EJBQL customerhome.findCustomersWithCreditCard (required:" - + resExpected + ", found:" + customers_id + ")", - isCollectionEqual(resExpected,customers_id)); - } - - /** - * Test a finder method with the IS NULL operator on a cmr field. - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.creditCard IS NULL - */ - public void testIsNull1bis() throws Exception { - Collection customers = customerhome.findCustomersWithOutCreditCard(); - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList resExpected = new ArrayList(); - for (int i = 50; i <= 69; i++) { - resExpected.add(new Integer(i)); - } - for (int i = 81; i <= 83; i++) { - resExpected.add(new Integer(i)); - } - for (int i = 85; i <= 87; i++) { - resExpected.add(new Integer(i)); - } - for (int i = 89; i <= 91; i++) { - resExpected.add(new Integer(i)); - } - for (int i = 93; i <= 95; i++) { - resExpected.add(new Integer(i)); - } - for (int i = 97; i <= 109; i++) { - resExpected.add(new Integer(i)); - } - for (int i = 201; i <= 206; i++) { - resExpected.add(new Integer(i)); - } - assertTrue("Wrong result EJBQL customerhome.findCustomersWithOutCreditCard (required:" - + resExpected + ", found:" + customers_id + ")", - isCollectionEqual(resExpected,customers_id)); - } - - /** - * Test a finder method with the IS NULL operator on a cmr field in an expression. - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.firstName = ?1 AND c.creditCard IS NULL - */ - public void testIsNull1ter() throws Exception { - Collection customers = customerhome.findCustomersXWithOutCreditCard("John"); - assertEquals("Wrong result EJBQL customerhome.findCustomersXWithOutCreditCard: ", 19, customers.size()); - - } - - /** - * Test a finder method with the IS NOT NULL operator on a cmr field with a complex navigation. - * SELECT OBJECT(c) FROM jt2_Customer c WHERE c.creditCard.creditCompany IS NOT NULL - */ - public void testIsNull2() throws Exception { - Collection customers = customerhome.findCustomersWithCreditCompany(); - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList resExpected = new ArrayList(); - resExpected.add(new Integer(80)); - resExpected.add(new Integer(84)); - resExpected.add(new Integer(88)); - resExpected.add(new Integer(92)); - resExpected.add(new Integer(96)); - assertTrue("Wrong result EJBQL customerhome.findCustomersWithCreditCompany (required:" - + resExpected + ", found:" + customers_id + ")", - isCollectionEqual(resExpected,customers_id)); - } - - /** - * Test a finder method with the IS NULL operator on a parameter which is a bean null. - * SELECT OBJECT(c) FROM jt2_Customer c WHERE ?1 IS NULL - */ - public void testIsNull3() throws Exception { - Collection customers = customerhome.callFindByParameterIsNull(null); - assertEquals("Wrong result EJBQL customerhome.callFindByParameterIsNull(null): ", - 56, customers.size()); - } - - /** - * Test a finder method with the IS NULL operator on a parameter which is a bean not null. - * SELECT OBJECT(c) FROM jt2_Customer c WHERE ?1 IS NULL - */ - public void testIsNull3bis() throws Exception { - Collection customers = customerhome.callFindByParameterIsNull(new Integer(10)); - assertEquals("Wrong result EJBQL customerhome.callFindByParameterIsNull(): ", - 0, customers.size()); - } - - /** - * Select the lastName of a customer - * SELECT c.lastName FROM jt2_Customer AS c WHERE c.id = ?1 - */ - public void testCustEjbSelectLastName() throws Exception { - assertEquals("Wrong ejbSelectLastName for c.id=80: ", - "Smith80", customerhome.selectLastName(new Integer(80))); - } - - /** - * Select the city of the address of a customer - * SELECT c.homeAddress.city FROM jt2_Customer AS c WHERE c.id = ?1 - */ - public void testCustEjbSelectAddrCity() throws Exception { - assertEquals("Wrong ejbSelectAddrCity for c.id=80: ", - "Minneapolis", customerhome.selectAddrCity(new Integer(80))); - } - - /** - * Select the deckLevel of a cabin - * SELECT c.deckLevel FROM jt2_Cabin AS c WHERE c.id = ?1 - */ - public void testCabinEjbSelectDeckLevel() throws Exception { - assertEquals("Wrong ejbSelectDeckLevel for c.id=21100: ", - 1, cabinhome.selectDeckLevel(new Integer(21100))); - } - - /** - * Select the firstName of all the customers. - * SELECT c.firstName FROM jt2_Customer AS c - */ - public void testCustEjbSelectFirstName() throws Exception { - Set lfn = customerhome.selectFirstName(); - Iterator ilfn = lfn.iterator(); - StringBuffer slfn = new StringBuffer(); - while (ilfn.hasNext()) { - slfn = slfn.append((String) ilfn.next() + ","); - } - assertEquals("Wrong ejbSelectFirstName() number results (" + slfn.toString() + "): ", - 6, lfn.size()); - if (!lfn.contains("John") - || !lfn.contains("Mike") - || !lfn.contains("Paul") - || !lfn.contains("Ringo") - || !lfn.contains("Roger") - || !lfn.contains("Joe")) { - fail("Wrong ejbSelectFirstName() result (" + slfn.toString() - + "): does not contain 'John', 'Mike' or 'Paul' or 'Ringo' or 'Roger' or 'Joe'"); - } - } - - /** - * Select the DISTINCT firstName of all the customers. - * SELECT DISTINCT c.firstName FROM jt2_Customer AS c - */ - public void testCustEjbSelectDistinctFirstName() throws Exception { - Collection lfn = customerhome.selectDistinctFirstName(); - assertEquals("Wrong ejbSelectDistinctFirstName() number results (" + lfn.toString() + "): ", - 6, lfn.size()); - if (!lfn.contains("John") - || !lfn.contains("Mike") - || !lfn.contains("Paul") - || !lfn.contains("Ringo") - || !lfn.contains("Roger") - || !lfn.contains("Joe")) { - fail("Wrong ejbSelectDistinctDistinctFirstName() result (" + lfn.toString() - + "): does not contain 'John', 'Mike' or 'Paul' or 'Ringo' or 'Roger' or 'Joe'"); - } - } - - /** - * Select the address of a customer - * An ejbSelect with a local bean as result - * SELECT c.homeAddress FROM jt2_Customer AS c WHERE c.id = ?1 - */ - public void testCustEjbSelectAddr() throws Exception { - assertEquals("Wrong ejbSelectAddr for c.id=80: ", - new Integer(10), customerhome.selectAddr(new Integer(80))); - } - - /** - * Select the addresses of the company of the credit card of all the customers. - * An ejbSelect with a collection of local bean as result - * SELECT c.creditCard.creditCompany.address FROM jt2_Customer c - */ - public void testCustEjbSelectAllCreditCartAddr() throws Exception { - Collection addr = customerhome.selectAllCreditCardAddr(); - StringBuffer sAddr = new StringBuffer(); - Iterator iAddr = addr.iterator(); - while (iAddr.hasNext()) { - sAddr = sAddr.append(((Integer) iAddr.next()).toString() + ","); - } - ArrayList eAddr = new ArrayList(); - eAddr.add(new Integer(11)); - eAddr.add(new Integer(16)); - eAddr.add(new Integer(21)); - eAddr.add(new Integer(26)); - eAddr.add(new Integer(31)); - assertTrue("Wrong ejbSelectCreditCardAddr: (" + sAddr + "): ", - isCollectionEqual(eAddr, addr)); - } - - /** - * Select the adresses of all 'roger' customers. - * An ejbSelect with a collection of local bean as result - * SELECT c.homeAddress FROM jt2_Customer c WHERE c.firstName = 'Roger' - */ - public void testCustEjbSelectRogerAddr() throws Exception { - Collection addr = customerhome.selectRogerAddr(); - StringBuffer sAddr = new StringBuffer(); - Iterator iAddr = addr.iterator(); - while (iAddr.hasNext()) { - sAddr = sAddr.append(((Integer) iAddr.next()).toString() + ","); - } - ArrayList eAddr = new ArrayList(); - eAddr.add(new Integer(45)); - eAddr.add(new Integer(50)); - eAddr.add(new Integer(55)); - eAddr.add(new Integer(60)); - assertTrue("Wrong ejbCustSelectRogerAddr: (" + sAddr + "): ", - isCollectionEqual(eAddr, addr)); - } - - /** - * Find all the customers ordered by their lastname. - * SELECT OBJECT(c) FROM jt2_Customer c ORDER BY c.lastName - */ - public void testSimpleOrderBy() throws Exception { - Collection customers = customerhome.findAllOrderByLastname(); - assertEquals("Wrong customers number for customerhome.findAllOrderByLastname(): ", - 56, customers.size()); - Iterator ci = customers.iterator(); - String previous = ((CustomerRemote) PortableRemoteObject.narrow(ci.next(), CustomerRemote.class)).getName().getLastName(); - while (ci.hasNext()) { - String lname = ((CustomerRemote) PortableRemoteObject.narrow(ci.next(), CustomerRemote.class)).getName().getLastName(); - assertTrue("Wrong ordered (previous=" + previous + ",current=" + lname + ")", - previous.compareTo(lname)<=0); - previous = lname; - } - } - - /** - * Find all the customers ordered by their lastname (desc) and firstname (asc). - * SELECT OBJECT(c) FROM jt2_Customer c ORDER BY c.lastName DESC, c.firstName ASC - */ - public void testOrderByDescAsc() throws Exception { - Collection customers = customerhome.findAllOrderByDescLastnameAscFirstname(); - assertEquals("Wrong customers number for customerhome.findAllOrderByLastname(): ", - 56, customers.size()); - Iterator ci = customers.iterator(); - Name previous = ((CustomerRemote) PortableRemoteObject.narrow(ci.next(), CustomerRemote.class)).getName(); - while (ci.hasNext()) { - Name current = ((CustomerRemote) PortableRemoteObject.narrow(ci.next(), CustomerRemote.class)).getName(); - assertTrue("Wrong ordered (previous=" + previous + ",current=" + current + ")", - previous.getLastName().compareTo(current.getLastName())>=0); - if (previous.getLastName().equals(current.getLastName())) { - assertTrue("Wrong ordered (previous=" + previous + ",current=" + current + ")", - previous.getFirstName().compareTo(current.getFirstName())<=0); - } - previous = current; - } - - } - - /** - * Find the reservations ordered by their amountPaid. - * The DISTINCT aggregate is used to reproduce the bug #300527 - * SELECT DISTINCT OBJECT(r) FROM jt2_Reservation AS r ORDER BY r.amountPaid - * (bug #300527) - */ - public void testOrderBy2() throws Exception { - Collection reservations = reservationhome.findOrderedRsrv(); - assertEquals("Wrong reservations number for reservationhome.findOrderedRsrv(): ", - 25, reservations.size()); - } - - /** - * Get the average of the tonnage of all the ships. - * SELECT AVG(s.tonnage) FROM jt2_Ship AS s - */ - public void testAverageofTonnage() throws Exception { - assertEquals("AverageofTonnage: ", 80000.0D, shiphome.getAverageOfTonnage(), 0.1); - } - - /** - * Get the count of reservations. - * SELECT COUNT(r) FROM jt2_Reservations AS r - */ - public void testCountOfReservations() throws Exception { - assertEquals("CountOfReservations: ", 25L, reservationhome.getCountOfReservations()); - } - - /** - * bug #300723 - * Get the count of customers with a given id - * SELECT COUNT(c) FROM jt2_Customer AS c WHERE c.id = ?1 - */ - public void testCountOfCustomersWithId1() throws Exception { - assertEquals("CountOfCustomersWithId1: ", 1L, customerhome.getCountCustomersWithId1(new Integer(82))); - } - - /** - * bug #300723 - * Get the count of customers with a given id - * SELECT COUNT(c) FROM jt2_Customer AS c WHERE c.id = ?1 - */ - public void testCountOfCustomersWithId2() throws Exception { - assertEquals("CountOfCustomersWithId2: ", 1L, customerhome.getCountCustomersWithId2(82)); - } - - /** - * Get the count of customers with a firstname 'Ringo' - * SELECT COUNT(c) FROM jt2_Customer AS c WHERE c.firstName = 'Ringo' - */ - public void testCountOfCustomersRingo() throws Exception { - assertEquals("CountOfCustomersRingo: ", 4L, customerhome.getCountCustomersRingo()); - } - - /** - * Get the customer with a given id - * SELECT c FROM jt2_Customer AS c WHERE c.id = ?1 - */ - public void testCustFindById() throws Exception { - assertEquals("CustFindById: ", new Integer(82), customerhome.findById(new Integer(82)).getId()); - } - - /** - * Get the min value of the amount of the reservations. - * SELECT MIN(r.amountPaid) FROM jt2_Reservations AS r - */ - public void testMinAmountOfReservations() throws Exception { - assertEquals("testMinAmountOfReservations: ", - 2500.0, reservationhome.getMinAmountOfReservations(), 0.1); - } - - /** - * (Bug #300635) - * Get the min value of the amount of the reservations for the cruise name. - * SELECT MIN(r.amountPaid) FROM jt2_Reservations AS r WHERE r.cruise.name = ?1 - */ - public void testMinAmountForCruise() throws Exception { - assertEquals("testMinAmountForCruise(Alaska Cruise): ", - 2520.0, reservationhome.getMinAmountForCruise("Alaska Cruise"), 0.1); - } - - /** - * Get the values of the amounts of the reservations for the cruise name. - * SELECT r.amountPaid FROM jt2_Reservations AS r WHERE r.cruise.name = ?1 - */ - public void testAmountsForCruise() throws Exception { - assertEquals("testAmountsForCruise(Alaska Cruise): ", - 18, reservationhome.getAmountsForCruise("Alaska Cruise").size()); - } - - /** - * Get the max value of the amount of the reservations. - * SELECT MAX(r.amountPaid) FROM jt2_Reservations AS r - */ - public void testMaxAmountOfReservations() throws Exception { - assertEquals("testMaxAmountOfReservations: ", - 208100.0, reservationhome.getMaxAmountOfReservations(), 0.1); - } - - /** - * Get the count of all the reservations for a specific customer. - * SELECT COUNT(r) FROM jt2_Reservation AS r WHERE ?1 MEMBER OF r.customers - * (bug #300280) - */ - public void testCountOfReservationsForCustomer() throws Exception { - assertEquals("CountOfReservationsForCustomer: ", - 2L, reservationhome.getCountOfReservationsForCustomer(new Integer(202))); - } - - /** - * Get the amount paid of all the reservations for a specific customer. - * SELECT SUM(r.amountPaid) FROM jt2_Reservation AS r WHERE ?1 MEMBER OF r.customers - * (bug #300280) - */ - public void testAmountOfReservationsForCustomer() throws Exception { - assertEquals("AmountOfReservationsForCustomer: ", - 408100.0, reservationhome.getAmountOfReservationsForCustomer(new Integer(202)), 0.1); - } - - /** - * Get the count of credit card for customers - * SELECT COUNT(c.creditCard) FROM jt2_Customer AS c - * The result must be equivalent to - * SELECT COUNT(c.creditCard) FROM jt2_Customer AS c WHERE c.creditCard IS NOT NULL - */ - public void testCustomersCountCreditCard() throws Exception { - assertEquals("CustomersCountCreditCard: ", 5, customerhome.getCountCreditCard()); - } - - /** - * Get the list of the number of the credit card for customers - * SELECT DISTINCT c.creditCard.number FROM jt2_Customer AS c ORDER BY c.creditCard.number - */ - public void testCustomersCreditCardNumbers() throws Exception { - assertEquals("CustomersCreditCardNumbers: ", 5, customerhome.getCreditCardNumbers().size()); - } - - - /** - * Find all the addresses - * SELECT OBJECT(a) FROM jt2_Address AS a - */ - public void testFindAllAddresses() throws Exception { - Collection addresses = addresshome.findAllAddress(); - Iterator iAddr = addresses.iterator(); - int nbAddr = 0; - while (iAddr.hasNext()) { - nbAddr++; - iAddr.next(); - } - assertEquals("testFindAllAddresses: ", 61, nbAddr); - } - - /** - * Get all the cities of addresses - * SELECT a.city FROM jt2_Address AS a - */ - public void testAddrGetAllCities() throws Exception { - assertEquals("testAddrGetAllCities: ", 61, addresshome.getAllCities().size()); - } - - /** - * Get all the creditCompanies of addresses - * SELECT a.creditCompany FROM jt2_Address AS a - */ - public void testAddrGetAllCreditCompanies() throws Exception { - assertEquals("testAddrGetAllCreditCompanies: ", 5, addresshome.getAllCreditCompanies().size()); - } - - /** - * Get all the creditCompany names of addresses. - * This is a test about Null Values in the Query Result. - * If the result of the query corresponds to a cmr-field or cmp-field not defined in term of java primitive type, - * the container must include null value in the result. - * See the EJB Specification version 2.1, chapter 11.2.7.1 - * SELECT a.creditCompany.name FROM jt2_Address AS a - * (bug #3001174) - */ - public void testAddrGetAllCreditCompanyNames() throws Exception { - assertEquals("testAddrGetAllCreditCompanyNames: ", 61, addresshome.getAllCreditCompanyNames().size()); - } - - /** - * Get all the creditCompany id of addresses. - * This is a test about Null Values in the Query Result. - * If the result of the query corresponds to a cmp-field not defined in term of java primitive type, - * the container must include null value in the result. - * See the EJB Specification version 2.1, chapter 11.2.7.1 - * SELECT a.creditCompany.id FROM jt2_Address AS a - * (bug #301174) - */ - public void testAddrGetAllCreditCompanyIds() throws Exception { - assertEquals("testAddrGetAllCreditCompanyIds: ", 61, addresshome.getAllCreditCompanyIds().size()); - } - - /** - * Get all the creditCompany id of addresses. - * This is a test about Null Values in the Query Result. - * If the result of the query corresponds to a cmp-field defined in term of java primitive type, - * the container must not include null value in the result. - * See the EJB Specification version 2.1, chapter 11.2.7.1 - * SELECT a.creditCompany.num FROM jt2_Address AS a - * (bug #301174) - */ - public void testAddrGetAllCreditCompanyNums() throws Exception { - assertEquals("testAddrGetAllCreditCompanyNums: ", 5, addresshome.getAllCreditCompanyNums().size()); - } - - - /** - * Get the count of cities for addresses - * SELECT COUNT(a.city) FROM jt2_Address AS a - */ - public void testAddrCountOfCities() throws Exception { - assertEquals("testAddrCountOfCities: ", 61L, addresshome.getCountOfCities()); - } - - /** - * Get the count of DISTINCT cities for addresses - * SELECT COUNT(DISTINCT a.city) FROM jt2_Address AS a - */ - public void testAddrCountOfDistinctCities() throws Exception { - assertEquals("testAddrCountOfDistinctCities: ", 6L, addresshome.getCountOfDistinctCities()); - } - - /** - * Find the reservations with lesser amount. - * SELECT DISTINCT OBJECT(r1) FROM jt2_Reservation AS r1, jt2_Reservation AS r2 - * WHERE r1.amountPaid < r2.amountPaid AND r2.id = 26 - */ - public void testFindResWithLesserAmount() throws Exception { - Collection reservations = reservationhome.findReservationsWithLesserAmount(); - assertEquals("Wrong reservations number for reservationhome.findReservationsWithLesserAmount(): ", - 4, reservations.size()); - } - - /** - * Finding All Customer with a limiter startAt range - * - * SELECT OBJECT(c) FROM jt2_Customer AS c WHERE c.id > 0 ORDER BY c.id LIMIT ?1 - */ - public void testFindCustAllLimit_1() throws Exception { - - Collection customers = customerhome.findAllWithLimit_1(40); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - for (int l=100;l<=109;l++) { - result.add(new Integer(l)); - } - for (int j=201;j<=206;j++) { - result.add(new Integer(j)); - } - - assertTrue("Wrong result EJBQL customerhome.findAllWithLimit_1()(required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - /** - * Finding All Customer with a limiter startAt range and a size range - * - * SELECT OBJECT(c) FROM jt2_Customer AS c ORDER BY c.id LIMIT ?1, 5 - */ - public void testFindCustAllLimit_2() throws Exception { - - Collection customers = customerhome.findAllWithLimit_2(40); - - ArrayList customers_id = new ArrayList(); - Iterator customer = customers.iterator(); - while (customer.hasNext()) { - CustomerRemote customer_remote = (CustomerRemote) PortableRemoteObject.narrow(customer.next(), CustomerRemote.class); - customers_id.add(customer_remote.getId()); - } - ArrayList result = new ArrayList(); - for (int l=100;l<=104;l++) { - result.add(new Integer(l)); - } - - assertTrue("Wrong result EJBQL customerhome.findAllWithLimit_2()(required:" + result + ", found:" +customers_id+ - ")", isCollectionEqual(result,customers_id)); - - // checkIsInitialState(); not necessary in this test - } - - - - public static Test suite() { - return new TestSuite(F_EjbqlEC2.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_EjbqlEC2(testtorun)); - } - } -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_RcycleEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_RcycleEC2.java deleted file mode 100644 index cd19dbaf105755a7b583e1e13de406a3c4f8b081..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_RcycleEC2.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import java.util.Collection; -import java.util.Iterator; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.beans.relation.rcycle.PersonRemote; -import org.objectweb.jonas.jtests.beans.relation.rcycle.PersonHomeRemote; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * This is a test suite on CMP 2 : legacy, cycle in relations, relations between - * the same bean. - * @author Helene Joanin - */ -public class F_RcycleEC2 extends JTestCase { - - private static final int ID_L_ERIC = 1; - - private static final int ID_JL_HELENE = 2; - - private static final int ID_L_GUILHEM = 3; - - private static final int ID_L_MALVA = 4; - - private static PersonHomeRemote personhome = null; - - public F_RcycleEC2(String name) { - super(name); - } - - protected boolean isInit = false; - - protected void setUp() { - super.setUp(); - if (!isInit) { - useBeans("rcycle", true); - try { - personhome = (PersonHomeRemote) PortableRemoteObject.narrow(ictx.lookup("RcyclePersonHome"), - PersonHomeRemote.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - isInit = true; - } - } - - /** - * Test the findAll method. - * @throws Exception - */ - public void testFindAll() throws Exception { - Collection cp = personhome.findAll(); - assertEquals("Number of Persons: ", 4, cp.size()); - } - - /** - * (Bug #300533) Test the findQuery1 method. - * @throws Exception - */ - public void testFindQuery1() throws Exception { - Collection cp = personhome.findQuery1(); - assertEquals("Number of Persons: ", 0, cp.size()); - } - - /** - * Test the findQuery2 method. - * @throws Exception - */ - public void testFindQuery2() throws Exception { - Collection cp = personhome.findQuery2(); - assertEquals("Number of Persons: ", 0, cp.size()); - } - - /** - * (Bug #300526) Test the findSpouse3 method. - * @throws Exception - */ - public void testFindSpouse3() throws Exception { - PersonRemote p = personhome.findSpouse3(); - assertNull("Laurent Guilhem spouse: ", p); - } - - - - protected boolean initStateOK() throws Exception { - return true; - } - - public static Test suite() { - return new TestSuite(F_RcycleEC2.class); - } - - public static void main(String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_RcycleEC2(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_omb_CS_EC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_omb_CS_EC2.java deleted file mode 100644 index d2efe08e11a56789f22d3068609e1a384f1cfba8..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_omb_CS_EC2.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Iterator; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.beans.relation.omb.AHomeRemote; -import org.objectweb.jonas.jtests.beans.relation.omb.ARemote; -import org.objectweb.jonas.jtests.beans.relation.omb.BHomeRemote; -import org.objectweb.jonas.jtests.beans.relation.omb.BRemote; -import org.objectweb.jonas.jtests.beans.relation.omb.Front; -import org.objectweb.jonas.jtests.beans.relation.omb.FrontHome; - -/** - * For testing one-to-many bidirectional relationships - * @author Ph Durieux - */ -public class F_omb_CS_EC2 extends A_omb { - - - private static String BEAN_HOME_A = "relation_omb_AHome"; - protected static AHomeRemote ahome = null; - private static String BEAN_HOME_B = "relation_omb_BHome"; - protected static BHomeRemote bhome = null; - - public F_omb_CS_EC2(String name) { - super(name); - } - - public AHomeRemote getAHome() { - if (ahome == null) { - try { - ahome = (AHomeRemote) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_A), - AHomeRemote.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - } - return ahome; - } - - public BHomeRemote getBHome() { - if (bhome == null) { - try { - bhome = (BHomeRemote) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_B), - BHomeRemote.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - } - return bhome; - } - - /** - * Ensure the IllegalArgumentException is thrown when trying - * to assign a deleted object as the value of a cmr-field - * (Bug #300519) - * A TransactionRolledbackLocalException (an EJBException) should - * occur when calling the business method of another bean with the - * client's tx context. - * We expect an EJBException here. - */ - public void testSetCmrWithDeleted() throws Exception { - Front fb = fhome.create(); - fb.testSetCmrWithDeleted(); - } - - /** - * Ensure the IllegalArgumentException is thrown when trying - * to set a collection cmr-field to a wrong relationship type - */ - public void testSetCmrWithWrongType() throws Exception { - Front fb = fhome.create(); - fb.testSetCmrWithWrongType(); - - } - - public static Test suite() { - return new TestSuite(F_omb_CS_EC2.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_omb_CS_EC2(testtorun)); - } - } -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_oob_CS_EC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_oob_CS_EC2.java deleted file mode 100644 index 031f2183c93116db04285c0888dcfc28bd71f3a2..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/F_oob_CS_EC2.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import javax.ejb.ObjectNotFoundException; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.beans.relation.oob.ARemote; -import org.objectweb.jonas.jtests.beans.relation.oob.AHomeRemote; -import org.objectweb.jonas.jtests.beans.relation.oob.BRemote; -import org.objectweb.jonas.jtests.beans.relation.oob.BHomeRemote; -import org.objectweb.jonas.jtests.beans.relation.oob.Front; -import org.objectweb.jonas.jtests.beans.relation.oob.FrontHome; - -/** - * This is an advanced test suite for home interface on entity bean CMP2. - * Beans used: oob - * @author Ph. Durieux - */ -public class F_oob_CS_EC2 extends A_oob { - - private static String BEAN_HOME_A = "relation_oob_AHome"; - private static String BEAN_HOME_B = "relation_oob_BHome"; - protected static AHomeRemote ahome = null; - protected static BHomeRemote bhome = null; - - public F_oob_CS_EC2(String name) { - super(name); - } - - public AHomeRemote getAHome() { - if (ahome == null) { - try { - ahome = (AHomeRemote) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_A), - AHomeRemote.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - } - return ahome; - } - - public BHomeRemote getBHome() { - if (bhome == null) { - try { - bhome = (BHomeRemote) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_B), - BHomeRemote.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - } - return bhome; - } - - /* - * Ensure the IllegalArgumentException is thrown when trying - * to assign a deleted object as the value of a cmr-field - * (Bug #300519) - */ - public void testSetCmrWithDeleted() throws Exception { - Front fb = fhome.create(); - fb.testSetCmrWithDeleted(); - } - - public static Test suite() { - return new TestSuite(F_oob_CS_EC2.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_oob_CS_EC2(testtorun)); - } - } -} - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/S_BasicEjbqlEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/S_BasicEjbqlEC2.java deleted file mode 100644 index 4189a59eb4707e6090f45866e65b3109d9f858be..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/S_BasicEjbqlEC2.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import java.util.Collection; -import java.util.Iterator; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.beans.ebasic.E4Query; -import org.objectweb.jonas.jtests.beans.ebasic.E4QueryHome; -import org.objectweb.jonas.jtests.util.JTestCase; - - -/** - * For testing basic EJB QL queries. - * @author Helene Joanin - */ - -public class S_BasicEjbqlEC2 extends JTestCase { - - private static String BEAN_HOME_E4QUERY = "ebasicE4QueryEC2Home"; - protected static E4QueryHome home = null; - - - public S_BasicEjbqlEC2(String name) { - super(name); - } - - protected void setUp() { - if (home == null) { - // load bean if not loaded yet - useBeans("ebasic", true); - try { - home = (E4QueryHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_E4QUERY), - E4QueryHome.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - // check if tables have been initialized - try { - home.findByPrimaryKey("id1"); - } catch (Exception e) { - try { - home.create("idnull", null, 0, 0.0); - home.create("id1","helene", 1959, 1959.0); - home.create("id2","ahelene", -1959, 1959.0); - home.create("id3","helene-bis", 1959*1959, 1959.0*1959.0); - home.create("id4","eric", 1957, 1957.0); - home.create("id4e","ric", 1957, 1957.0); - } catch (Exception i) { - fail("InitialState creation problem:: "+i); - } - } - } - } - - /** - * Test the EJB-QL: SELECT OBJECT(o) FROM jt2_e4query o WHERE o.fint = ?1 + ?2 - ?3 - */ - public void testIntEqualExpr() throws Exception { - Collection cBeans = home.findByIntEqualExpr(1959, 255, 255); - Iterator iBeans = cBeans.iterator(); - int nb=0; - while(iBeans.hasNext()) { - E4Query bean = (E4Query) javax.rmi.PortableRemoteObject.narrow(iBeans.next(), - E4Query.class); - int f = bean.getFint(); - assertEquals("Id="+bean.getId(), 1959, f); - nb++; - } - assertEquals("Beans number: ", 1, nb); - - } - - - - public static Test suite() { - return new TestSuite(S_BasicEjbqlEC2.class); - } - - public static void main(String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new S_BasicEjbqlEC2(testtorun)); - } - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/S_RcycleEC2.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/S_RcycleEC2.java deleted file mode 100644 index 2c7b1d3cea41370bc03608958a8bfbd2c62b836c..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/S_RcycleEC2.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import java.util.Collection; -import java.util.Iterator; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.beans.relation.rcycle.PersonRemote; -import org.objectweb.jonas.jtests.beans.relation.rcycle.PersonHomeRemote; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * This test suite collects some test cases of F_RcycleEC2 that are failing - * with HSQLDB - * - * @author Helene Joanin Philippe Coq - */ -public class S_RcycleEC2 extends JTestCase { - - private static final int ID_L_ERIC = 1; - - private static final int ID_JL_HELENE = 2; - - private static final int ID_L_GUILHEM = 3; - - private static final int ID_L_MALVA = 4; - - private static PersonHomeRemote personhome = null; - - public S_RcycleEC2(String name) { - super(name); - } - - protected boolean isInit = false; - - protected void setUp() { - super.setUp(); - if (!isInit) { - useBeans("rcycle", true); - try { - personhome = (PersonHomeRemote) PortableRemoteObject.narrow(ictx.lookup("RcyclePersonHome"), - PersonHomeRemote.class); - } catch (NamingException e) { - fail("Cannot get bean home: " + e.getMessage()); - } - isInit = true; - } - } - - - - /** - * Test the spouse relation. - * @throws Exception - */ - public void testSpouseRelation() throws Exception { - PersonRemote ph = personhome.findByPrimaryKey(new Integer(ID_L_ERIC)); - Integer iw = ph.retrieveSpouse(); - assertEquals("Wife of Laurent Eric: ", ID_JL_HELENE, iw.intValue()); - PersonRemote pw = personhome.findByPrimaryKey(iw); - Integer ih = pw.retrieveSpouse(); - assertEquals("Husband of Joanin-Laurent Helene: ", ID_L_ERIC, ih.intValue()); - PersonRemote pc = personhome.findByPrimaryKey(new Integer(ID_L_GUILHEM)); - Integer in = pc.retrieveSpouse(); - assertNull("Laurent Guilhem spouse: ", in); - } - - /** - * Test the guardian/is-guardian-of relation. - * @throws Exception - */ - public void testGuardianRelation() throws Exception { - Integer iLEric = new Integer(ID_L_ERIC); - PersonRemote ph = personhome.findByPrimaryKey(iLEric); - Collection c = ph.retrieveGuardianOf(); - assertEquals("Laurent Eric guardian of: ", 2, c.size()); - for (Iterator i = c.iterator(); i.hasNext();) { - Integer ip = (Integer) i.next(); - PersonRemote p = personhome.findByPrimaryKey(ip); - assertEquals("Guardian of " + p.getName() + ": ", iLEric, p.retrieveGuardian()); - } - } - - /** - * Test the parents/children relation. - * @throws Exception - */ - public void testParentsChildrenRelation() throws Exception { - Integer iLEric = new Integer(ID_L_ERIC); - PersonRemote ph = personhome.findByPrimaryKey(iLEric); - Collection cc = ph.retrieveChildren(); - assertEquals("Laurent Eric father of: ", 2, cc.size()); - for (Iterator i = cc.iterator(); i.hasNext();) { - Integer ip = (Integer) i.next(); - PersonRemote p = personhome.findByPrimaryKey(ip); - Collection cp = p.retrieveParents(); - assertTrue("Father of " + p.getName() + ": ", cp.contains(iLEric)); - } - } - - /** - * Test if a cmr null is 'null' - * @throws Exception - */ - public void testCmrNull() throws Exception { - PersonRemote ph = personhome.findByPrimaryKey(new Integer(ID_L_ERIC)); - assertTrue("CMR null is NOT null", ph.testCmrNull()); - } - - /** - * Verify the spy trace to check less database access are done - * @throws Exception - */ - public void testPrefetch() throws Exception { - //sleep(15000); - try { - utx.begin(); - Integer iLEric = new Integer(ID_L_ERIC); - PersonRemote ph = personhome.findByPrimaryKey(iLEric); - // If there is CMR prefetching, this may imply less database access - Collection cc = ph.retrieveChildrenNames(); - assertEquals("Laurent Eric father of: ", 2, cc.size()); - } finally { - utx.commit(); - } - } - - protected boolean initStateOK() throws Exception { - return true; - } - - public static Test suite() { - return new TestSuite(S_RcycleEC2.class); - } - - public static void main(String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new S_RcycleEC2(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/S_entity.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/S_entity.java deleted file mode 100644 index 97dd7fd8b464e3fd929c93cf528f46c88a69dd7d..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/entity/S_entity.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.entity; - -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * This test suites collects all the suites that have testcases that fail with HSQLDB - * Beans used: annuaire, ebasic - * @author Philippe Coq, Philippe Durieux (jonas team) - */ -public class S_entity extends JTestCase { - - public S_entity(String name) { - super(name); - } - - public static Test suite() { - TestSuite suite = new TestSuite(); - - suite.addTest(S_BasicEjbqlEC2.suite()); - suite.addTest(S_RcycleEC2.suite()); - suite.addTest(F_Relation_lcpEC2.suite()); - return suite; - } - - public static void main (String args[]) { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/hotdeploy/F_EjbJarHotDeploy.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/hotdeploy/F_EjbJarHotDeploy.java deleted file mode 100644 index 4cf9e7d8caaf9308ea01d081f98f79e955c656e9..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/hotdeploy/F_EjbJarHotDeploy.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.objectweb.jonas.jtests.clients.hotdeploy; - -import junit.framework.*; - -import org.objectweb.jonas.jtests.util.JTestCase; -import org.objectweb.jonas.jtests.beans.hotdeploy.HotDeploy; -import org.objectweb.jonas.jtests.beans.hotdeploy.HotDeployHome; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; - -import javax.rmi.PortableRemoteObject; -import javax.naming.NamingException; - - - -public class F_EjbJarHotDeploy extends JTestCase { - - private static String BEAN_HOME = "HotDeployHome"; - private HotDeployHome bhome1 = null; - private HotDeployHome bhome2 = null; - private String jonasbase = null; - private String sep = File.separator; - - public F_EjbJarHotDeploy(String name) { - super(name); - } - - public static Test suite() { - return new TestSuite(F_EjbJarHotDeploy.class); - } - - public void setUp() { - super.setUp(); - jonasbase = System.getProperty("jonas.base"); - } - - private void copy(String source, String dest) throws IOException { - File src = new File(jonasbase + sep + "ejbjars" + sep + source); - File dst = new File(jonasbase + sep + "ejbjars" + sep + dest); - - FileInputStream is = new FileInputStream(src); - FileOutputStream os = new FileOutputStream(dst); - - byte[] b = new byte[1024]; - int t; - while ((t = is.read(b, 0, b.length - 1)) != -1) { - os.write(b, 0, t); - } - - } - - public void testBeanHotDeployTwice() throws Exception { - // copy $JONAS_BASE/ejbjars/hotdeploy1.jar -> $JONAS_BASE/ejbjars/hotdeploy.jar - System.err.println("Start Test"); - copy("hotdeploy1.jar", "hotdeploy.jar"); - System.err.println("Copy executed"); - useBeans("hotdeploy", false); - System.err.println("First Deployment OK"); - try { - bhome1 = (HotDeployHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), HotDeployHome.class); - } catch (NamingException e) { - fail("Cannot get HotDeployHome:" + e); - } - System.err.println("Home retrieved"); - - HotDeploy bean1 = bhome1.create(); - String envVal1 = bean1.getEnvString(); - int beanVal1 = bean1.getVersionNumber(); - int helperVal1 = bean1.getHelperClassVersionNumber(); - - System.err.println("getValues OK"); - unloadBeans("hotdeploy"); - System.err.println("Unload first"); - - // copy $JONAS_BASE/ejbjars/hotdeploy2.jar -> $JONAS_BASE/ejbjars/hotdeploy.jar - copy("hotdeploy2.jar", "hotdeploy.jar"); - - System.err.println("Copy Second jar"); - useBeans("hotdeploy", false); - System.err.println("Seconf Load OK"); - try { - bhome2 = (HotDeployHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), HotDeployHome.class); - } catch (NamingException e) { - fail("Cannot get HotDeployHome:" + e); - } - - HotDeploy bean2 = bhome2.create(); - String envVal2 = bean2.getEnvString(); - int beanVal2 = bean2.getVersionNumber(); - int helperVal2 = bean2.getHelperClassVersionNumber(); - unloadBeans("hotdeploy"); - - assertEquals("1.XML env String", "value1", envVal1); - assertEquals("1.Static bean attr", 1, beanVal1); - assertEquals("1.Static helper attr", 1, helperVal1); - - assertEquals("2.XML env String", "value2", envVal2); - assertEquals("2.Static bean attr", 2, beanVal2); - assertEquals("2.Static helper attr", 2, helperVal2); - - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_EjbJarHotDeploy(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/jms/F_BasicMDB.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/jms/F_BasicMDB.java deleted file mode 100644 index 7d85f95db9b22a8c72b68d6273ee3d586f994186..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/jms/F_BasicMDB.java +++ /dev/null @@ -1,610 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.jms; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.util.JTestCase; -import org.objectweb.jonas.jtests.beans.message.Sender; -import org.objectweb.jonas.jtests.beans.message.SenderHome; -import org.objectweb.jonas.jtests.beans.message.Sender1_1; -import org.objectweb.jonas.jtests.beans.message.Sender1_1Home; - -public class F_BasicMDB extends JTestCase { - - private static String BEAN_HOME = "messageSenderSFHome"; - private static String BEAN1_1_HOME = "messageSender1_1SFHome"; - protected static SenderHome home = null; - protected static Sender1_1Home home1 = null; - - public F_BasicMDB(String name) { - super(name); - } - - public SenderHome getHome() { - if (home == null) { - try { - home = (SenderHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), SenderHome.class); - } catch (NamingException e) { - fail("Cannot get bean home"); - } - } - return home; - } - - public Sender1_1Home getHome1() { - if (home1 == null) { - try { - home1 = (Sender1_1Home) PortableRemoteObject.narrow(ictx.lookup(BEAN1_1_HOME), Sender1_1Home.class); - } catch (NamingException e) { - fail("Cannot get bean home1"); - } - } - return home1; - } - - /** - * init environment: - * - load beans - * - create/init database for entities. - */ - protected void setUp() { - super.setUp(); - useBeans("message", true); - } - - // -------------------------------------------------------- - // Basic Tests on Topics - // -------------------------------------------------------- - - /** - * Basic test: Send 1 message on a topic - * 2 MDB are reading the topic. - * No tx. - */ - public void testBasicSendOnTopic1() throws Exception { - Sender s = getHome().create(); - int val = 200; - s.sendOnTopic("JunitTopic1", val, 1); - assertEquals(2, s.check(val, 2, 4)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a topic Durable - * 2 MDB are reading the topic. - * No tx. - */ - public void testBasicSendOnTopic2() throws Exception { - Sender s = getHome().create(); - int val = 200; - s.sendOnTopic("JunitTopic2", val, 1); - assertEquals(2, s.check(val, 2, 4)); - s.remove(); - } - - /** - * Basic test: Send nb messages on a topic - * 2 MDB are reading the topic. - * No tx. - */ - public void testMultipleSendOnTopic1() throws Exception { - Sender s = getHome().create(); - int val = 210; - int nb = 10; - s.sendOnTopic("JunitTopic1", val, nb); - assertEquals(nb * 2, s.check(val, nb * 2, 4)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a topic - * 2 MDB are reading the topic. - * tx. - */ - public void testBasicSendOnTopic1Tx() throws Exception { - Sender s = getHome().create(); - int val = 201; - s.sendOnTopicTx("JunitTopic1", val, 1); - assertEquals(2, s.check(val, 2, 4)); - s.remove(); - } - - /** - * Basic test: Send n messages on a topic - * 2 MDB are reading the topic. - * tx. - */ - public void testMutipleSendOnTopic1Tx() throws Exception { - Sender s = getHome().create(); - int val = 211; - int nb = 10; - s.sendOnTopicTx("JunitTopic1", val, nb); - assertEquals(2 * nb, s.check(val, 2 * nb, 4)); - s.remove(); - } - - /** - * Basic test: send a message on a topic in a transaction committed - */ - public void testCommitSendOnTopic1() throws Exception { - - Sender s = getHome().create(); - int val = 206; - utx.begin(); - s.sendOnTopic("JunitTopic1", val, 1); - utx.commit(); - assertEquals(2, s.check(val, 2, 4)); - s.remove(); - } - - /** - * Basic test: send n message on a topic in a transaction committed - */ - public void testNCommitSendOnTopic1() throws Exception { - - Sender s = getHome().create(); - int val = 206; - int nb = 12; - utx.begin(); - s.sendOnTopic("JunitTopic1", val, nb); - utx.commit(); - assertEquals(2*nb, s.check(val, 2*nb, 4)); - s.remove(); - } - - /** - * Basic test: send more messages on a topic in a transaction committed - */ - public void testManySendOnTopic() throws Exception { - - Sender s = getHome().create(); - int val = 2060; - int nb = 120; - s.sendOnTopic("JunitTopic1", val, nb); - assertEquals(2*nb, s.check(val, 2*nb, 6)); - s.remove(); - } - - /** - * Basic test: Send more messages on a topic - * 2 MDB are reading the topic. - * tx. - */ - public void testManySendOnTopicTx() throws Exception { - Sender s = getHome().create(); - int val = 2110; - int nb = 100; - s.sendOnTopicTx("JunitTopic1", val, nb); - assertEquals(2 * nb, s.check(val, 2 * nb, 8)); - s.remove(); - } - - // -------------------------------------------------------- - // Basic Tests on Queues - // -------------------------------------------------------- - - /** - * Basic test: Send 1 message on a queue - * No tx, MDB transacted. - */ - public void testBasicSendOnQueue1() throws Exception { - - Sender s = getHome().create(); - int val = 100; - s.sendOnQueue("JunitQueue1", val, 1); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - /** - * Basic test: Send n messages on a queue - * No tx, MDB transacted. - */ - public void testMultipleSendOnQueue1() throws Exception { - Sender s = getHome().create(); - int val = 100; - int nb = 5; - s.sendOnQueue("JunitQueue1", val, nb); - assertEquals(nb, s.check(val, nb, 8)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a queue - * tx, MDB transacted. - */ - public void testBasicSendOnQueue1Tx() throws Exception { - Sender s = getHome().create(); - int val = 101; - s.sendOnQueueTx("JunitQueue1", val, 1); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - /** - * Basic test: Send nb messages on a queue - * tx, MDB transacted. - */ - public void testMultipleSendOnQueue1Tx() throws Exception { - Sender s = getHome().create(); - int val = 121; - int nb = 20; - s.sendOnQueueTx("JunitQueue1", val, nb); - assertEquals(nb, s.check(val, nb, 8)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a queue - * No tx, MDB not transacted. - */ - public void testBasicSendOnQueue2() throws Exception { - Sender s = getHome().create(); - int val = 102; - s.sendOnQueue("JunitQueue2", val, 1); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a queue - * tx, MDB not transacted. - */ - public void testBasicSendOnQueue2Tx() throws Exception { - Sender s = getHome().create(); - int val = 103; - s.sendOnQueueTx("JunitQueue2", val, 1); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - - /** - * Basic test: send a message on a queue in a transaction rolled back - * MDB not transacted. - */ - public void testRollbackSendOnQueue2() throws Exception { - Sender s = getHome().create(); - int val = 105; - utx.begin(); - s.sendOnQueue("JunitQueue2", val, 1); - utx.rollback(); - assertEquals(0, s.check(val, 1, 4)); - s.remove(); - } - - - /** - * Basic test: send a message on a queue in a transaction committed - * MDB transacted. - */ - public void testCommitSendOnQueue1() throws Exception { - Sender s = getHome().create(); - int val = 106; - utx.begin(); - s.sendOnQueue("JunitQueue1", val, 1); - utx.commit(); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - - /** - * Basic test: send a message on a queue in a transaction committed - * MDB not transacted. - */ - public void testCommitSendOnQueue2() throws Exception { - Sender s = getHome().create(); - int val = 107; - utx.begin(); - s.sendOnQueue("JunitQueue2", val, 1); - utx.commit(); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - - - // -------------------------------------------------------- - // Basic Tests on Topics (JMS1.1) - // -------------------------------------------------------- - - /** - * Basic test: Send 1 message on a topic - * 2 MDB are reading the topic. - * No tx. - */ - public void testBasicSendOnDestTopic1() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 200; - s.sendOnDestination("JunitTopic1", val, 1); - assertEquals(2, s.check(val, 2, 4)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a topic Durable - * 2 MDB are reading the topic. - * No tx. - */ - public void testBasicSendOnDestTopic2() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 200; - s.sendOnDestination("JunitTopic2", val, 1); - assertEquals(2, s.check(val, 2, 4)); - s.remove(); - } - - /** - * Basic test: Send nb messages on a topic - * 2 MDB are reading the topic. - * No tx. - */ - public void testMultipleSendOnDestTopic1() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 210; - int nb = 10; - s.sendOnDestination("JunitTopic1", val, nb); - assertEquals(nb * 2, s.check(val, nb * 2, 8)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a topic - * 2 MDB are reading the topic. - * tx. - */ - public void testBasicSendOnDestTopic1Tx() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 201; - s.sendOnDestinationTx("JunitTopic1", val, 1); - assertEquals(2, s.check(val, 2, 4)); - s.remove(); - } - - /** - * Basic test: Send n messages on a topic - * 2 MDB are reading the topic. - * tx. - */ - public void testMutipleSendOnDestTopic1Tx() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 211; - int nb = 10; - s.sendOnDestinationTx("JunitTopic1", val, nb); - assertEquals(2*nb, s.check(val, 2*nb, 4)); - s.remove(); - } - - /** - * Basic test: send a message on a topic in a transaction committed - */ - public void testCommitSendOnDestTopic1() throws Exception { - - Sender1_1 s = getHome1().create(); - int val = 206; - utx.begin(); - s.sendOnDestination("JunitTopic1", val, 1); - utx.commit(); - assertEquals(2, s.check(val, 2, 4)); - s.remove(); - } - - /** - * Basic test: send n message on a topic in a transaction committed - */ - public void testNCommitSendOnDestTopic1() throws Exception { - - Sender1_1 s = getHome1().create(); - int val = 206; - int nb = 12; - utx.begin(); - s.sendOnDestination("JunitTopic1", val, nb); - utx.commit(); - assertEquals(2 * nb, s.check(val, 2 * nb, 4)); - s.remove(); - } - - /** - * Basic test: send more messages on a topic in a transaction committed - */ - public void testManySendOnDestTopic() throws Exception { - - Sender1_1 s = getHome1().create(); - int val = 2061; - int nb = 100; - s.sendOnDestination("JunitTopic1", val, nb); - assertEquals(2*nb, s.check(val, 2*nb, 8)); - s.remove(); - } - - /** - * Basic test: Send more messages on a topic - * 2 MDB are reading the topic. - * tx. - */ - public void testManySendOnDestTopicTx() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 2111; - int nb = 100; - s.sendOnDestinationTx("JunitTopic1", val, nb); - assertEquals(2 * nb, s.check(val, 2 * nb, 8)); - s.remove(); - } - - // -------------------------------------------------------- - // Basic Tests on Queues (JMS1.1) - // -------------------------------------------------------- - - /** - * Basic test: Send 1 message on a queue - * No tx, MDB transacted. - */ - public void testBasicSendOnDestQueue1() throws Exception { - - Sender1_1 s = getHome1().create(); - int val = 100; - s.sendOnDestination("JunitQueue1", val, 1); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - /** - * Basic test: Send n messages on a queue - * No tx, MDB transacted. - */ - public void testMultipleSendOnDestQueue1() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 100; - int nb = 20; - s.sendOnDestination("JunitQueue1", val, nb); - assertEquals(nb, s.check(val, nb, 8)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a queue - * tx, MDB transacted. - */ - public void testBasicSendOnDestQueue1Tx() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 101; - s.sendOnDestinationTx("JunitQueue1", val, 1); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - /** - * Basic test: Send nb messages on a queue - * tx, MDB transacted. - */ - public void testMultipleSendOnDestQueue1Tx() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 121; - int nb = 20; - s.sendOnDestinationTx("JunitQueue1", val, nb); - assertEquals(nb, s.check(val, nb, 8)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a queue - * No tx, MDB not transacted. - */ - public void testBasicSendOnDestQueue2() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 102; - s.sendOnDestination("JunitQueue2", val, 1); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - /** - * Basic test: Send 1 message on a queue - * tx, MDB not transacted. - */ - public void testBasicSendOnDestQueue2Tx() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 103; - s.sendOnDestinationTx("JunitQueue2", val, 1); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - - /** - * Basic test: send a message on a queue in a transaction rolled back - * MDB not transacted. - */ - public void testRollbackSendOnDestQueue2() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 105; - utx.begin(); - s.sendOnDestination("JunitQueue2", val, 1); - utx.rollback(); - assertEquals(0, s.check(val, 1, 4)); - s.remove(); - } - - - /** - * Basic test: send a message on a queue in a transaction committed - * MDB transacted. - */ - public void testCommitSendOnDestQueue1() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 106; - utx.begin(); - s.sendOnDestination("JunitQueue1", val, 1); - utx.commit(); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - - /** - * Basic test: send a message on a queue in a transaction committed - * MDB not transacted. - */ - public void testCommitSendOnDestQueue2() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 107; - utx.begin(); - s.sendOnDestination("JunitQueue2", val, 1); - utx.commit(); - assertEquals(1, s.check(val, 1, 4)); - s.remove(); - } - - - - /** - * Run all the tests - */ - public static Test suite() { - return new TestSuite(F_BasicMDB.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_BasicMDB(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/jms/F_RollbackMDB.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/jms/F_RollbackMDB.java deleted file mode 100644 index e54dabc19a48bf30520f04cd2363fcb3038fe337..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/jms/F_RollbackMDB.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.jms; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.util.JTestCase; -import org.objectweb.jonas.jtests.beans.message.Sender; -import org.objectweb.jonas.jtests.beans.message.SenderHome; -import org.objectweb.jonas.jtests.beans.message.Sender1_1; -import org.objectweb.jonas.jtests.beans.message.Sender1_1Home; - -public class F_RollbackMDB extends JTestCase { - - private static String BEAN_HOME = "messageSenderSFHome"; - - private static String BEAN1_1_HOME = "messageSender1_1SFHome"; - - protected static SenderHome home = null; - - protected static Sender1_1Home home1 = null; - - public F_RollbackMDB(String name) { - super(name); - } - - public SenderHome getHome() { - if (home == null) { - try { - home = (SenderHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), SenderHome.class); - } catch (NamingException e) { - fail("Cannot get bean home"); - } - } - return home; - } - - public Sender1_1Home getHome1() { - if (home1 == null) { - try { - home1 = (Sender1_1Home) PortableRemoteObject.narrow(ictx.lookup(BEAN1_1_HOME), Sender1_1Home.class); - } catch (NamingException e) { - fail("Cannot get bean home1"); - } - } - return home1; - } - - /** - * init environment: - load beans - create/init database for entities. - */ - protected void setUp() { - super.setUp(); - useBeans("message", true); - } - - // -------------------------------------------------------- - // Tests Rollback - // -------------------------------------------------------- - - /** - * send a message on a topic in a transaction rolled back - */ - public void testRollbackSendOnTopic1() throws Exception { - Sender s = getHome().create(); - int val = 204; - utx.begin(); - s.sendOnTopic("JunitTopic1", val, 1); - utx.rollback(); - assertEquals(0, s.check(val, 2, 4)); - s.remove(); - } - - /** - * send a message on a topic in a transaction rolled back via Sender1_1SF - * and JMS1.1 interfaces - */ - public void testRollbackSendOnDestTopic1() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 204; - utx.begin(); - s.sendOnDestination("JunitTopic1", val, 1); - utx.rollback(); - assertEquals(0, s.check(val, 2, 4)); - s.remove(); - } - - /** - * send a message on a queue in a transaction rolled back MDB transacted. - */ - public void testRollbackSendOnQueue1() throws Exception { - Sender s = getHome().create(); - int val = 104; - utx.begin(); - s.sendOnQueue("JunitQueue1", val, 1); - utx.rollback(); - assertEquals(0, s.check(val, 1, 4)); - s.remove(); - } - - /** - * send a message on a queue in a transaction rolled back MDB transacted. - * via Sender1_1SF and JMS1.1 interfaces - */ - public void testRollbackSendOnDestQueue1() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 104; - utx.begin(); - s.sendOnDestination("JunitQueue1", val, 1); - utx.rollback(); - assertEquals(0, s.check(val, 1, 4)); - s.remove(); - } - - /** - * Test that it's possible to set rollback only in a message driven 2 MDB - * are listening queue3, but 1 of them rollback all messages. So, we should - * receive all messages by the commiting MDB. - */ - public void testRollbackOnlyOnQueue3() throws Exception { - Sender s = getHome().create(); - int val = 114; - int nb = 25; - s.sendOnQueue("JunitQueue3", val, nb); - assertEquals(nb, s.check(val, nb, 10)); - s.remove(); - } - - /** - * Test that it's possible to set rollback only in a message driven 2 MDB - * are listening queue3, but 1 of them rollback all messages. So, we should - * receive all messages by the commiting MDB. via Sender1_1SF and JMS1.1 - * interfaces - */ - public void testRollbackOnlyOnDestQueue3() throws Exception { - Sender1_1 s = getHome1().create(); - int val = 114; - int nb = 25; - s.sendOnDestination("JunitQueue3", val, nb); - assertEquals(nb, s.check(val, nb, 10)); - s.remove(); - } - - /** - * Run all the tests - */ - public static Test suite() { - return new TestSuite(F_RollbackMDB.class); - } - - public static void main(String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_RollbackMDB(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/management/F_Connectors.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/management/F_Connectors.java deleted file mode 100644 index 5c5c9986eab1b13a3562a00a9da6b925dbb3f806..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/management/F_Connectors.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.management; - -import java.net.MalformedURLException; -import java.net.URI; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; - -import javax.management.MBeanServerConnection; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; -import javax.naming.InitialContext; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.ow2.carol.util.configuration.ConfigurationRepository; -import org.ow2.carol.util.configuration.ProtocolConfiguration; - -import org.objectweb.jonas.jtests.util.JTestCase; - -/** -* JMX Service test suite -* -* @author Adriana Danes -* -*/ - -public class F_Connectors extends JTestCase { - - /** - * Constructor - */ - public F_Connectors(String name) { - super(name); - } - - /** - * init environment - */ - protected void setUp() { - super.setUp(); - } - - /** - * This suite is all test cases - */ - public static Test suite() { - return new TestSuite(F_Connectors.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_Connectors(testtorun)); - } - } - - public void testConnectJmxRemote() throws Exception { - // Prepare ObjectName for J2EEServer MBean - // This is a well known MBeans which should be registered in the MBean Server - String sOn = jonasName + ":j2eeType=J2EEServer,name=" + jonasName; - ObjectName on = null; - try { - on = ObjectName.getInstance(sOn); - } catch (MalformedObjectNameException e) { - // Can't test the connection if no ObjectName - fail("Can't create ObjectName for J2EEServer MBean using String: " + sOn); - } - - // Determine protocols used by Carol and their configuration - ProtocolConfiguration[] protocolConfigurations = ConfigurationRepository.getConfigurations(); - Properties myCarolConfig = new Properties(); - for (int c = 0; c < protocolConfigurations.length; c++) { - String protocol = protocolConfigurations[c].getName(); - //if (!protocol.equals("cmi")) { - myCarolConfig.setProperty(protocol, protocolConfigurations[c].getProviderURL()); - //} - } - - int nbProtocols = myCarolConfig.size(); - if (nbProtocols == 0) { - fail("Can't find any protocol in Carol configuration"); - } - boolean foundJ2EEServerMBean = true; - for (Iterator it = myCarolConfig.keySet().iterator(); it.hasNext();) { - String carolProtocol = (String) it.next(); - String sCarolURL = (String) myCarolConfig.get(carolProtocol); - URI carolURL = new URI(sCarolURL); - int portNb = carolURL.getPort(); - String port = String.valueOf(portNb); - String url = null; - Map env = null; - if (carolProtocol.equals("jrmp")) { - // Treat JRMP case - url = "service:jmx:rmi:///jndi/rmi://localhost:" + port + "/jrmpconnector_" + jonasName; - } else if (carolProtocol.equals("iiop")) { - // Treat IIOP case - url = "service:jmx:iiop:///jndi/iiop://localhost:" + port + "/iiopconnector_" + jonasName; - env = new HashMap(); - env.put("java.naming.corba.orb", new InitialContext().lookup("java:comp/ORB")); - } else if (carolProtocol.equals("cmi")) { - // Treat CMI - url = "service:jmx:rmi:///jndi/cmi://localhost:" + port + "/cmiconnector_" + jonasName; - } else { - continue; - } - //System.out.println("===Use URL=== " + url); - // Try to connect to the MBeanServer - JMXServiceURL connURL = null; - try { - connURL = new JMXServiceURL(url); - } catch (MalformedURLException e) { - fail("Can't create JMXServiceURL with string: " + url); - } - JMXConnector connector = null; - try { - connector = JMXConnectorFactory.newJMXConnector(connURL, env); - } catch (MalformedURLException e1) { - fail("there is no provider for the protocol in " + url); - } catch (java.io.IOException e) { - fail("Connector client cannot be made because of a communication problem (used URL: " + url + ")"); - } - MBeanServerConnection currentServerConnection = null; - try { - connector.connect(env); - currentServerConnection = connector.getMBeanServerConnection(); - } catch (java.io.IOException ioe) { - fail("connection could not be made because of a communication problem"); - } - // Look up J2EEServer MBean in the MBeanServer - try { - foundJ2EEServerMBean = currentServerConnection.isRegistered(on); - } catch (java.io.IOException ioe) { - fail("Connected, via " + carolProtocol + ", but can't find MBean " + on.toString() + " in the MBeanServer"); - } - - } - assertTrue(foundJ2EEServerMBean); - } -} \ No newline at end of file diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/management/README b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/management/README deleted file mode 100644 index be26c54ab7905aa3861236b3cabbabf9cebdcf70..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/management/README +++ /dev/null @@ -1,14 +0,0 @@ -This directory contains test suite for jmx service. -It tests JSR 160 connectors. -C_management -> F_Connectors -F_Connectors tests connection via jrmp and/or iiop corresponding to Carol configuration - It uses contracted URLs. -F_JeremieConnectors tests connection for jeremie protocol if this protocol is in Carol Config - It uses classic jmx service URL definition and uses a non null environment - variable to establish connection. - -JOnAS implementation dependencies (considered hypothesis) -- management domain name used in J2EEServer MBean's ObjectName creation is supposed -to be equal to the server's name (jonasName). -- JEREMIE test only: port number used in the service URL is obtained by adding 5 to - the port number used by the naming service \ No newline at end of file diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/security/A_AccessControl.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/security/A_AccessControl.java deleted file mode 100644 index 00e5703546625776a5c757bc70d84ce7c1a45bd9..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/security/A_AccessControl.java +++ /dev/null @@ -1,395 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.security; - - -import java.rmi.RemoteException; -import java.util.Hashtable; -import java.util.Vector; - -import org.ow2.jonas.lib.security.context.SecurityContext; -import org.ow2.jonas.lib.security.context.SecurityCurrent; - -import org.objectweb.jonas.jtests.beans.secured.BaseS; -import org.objectweb.jonas.jtests.util.JTestCase; - - -/** - * Security Management common tests for all type of beans (Entity/Session) - * - * @author Ph.Coq, Ph.Durieux - * - */ - -public abstract class A_AccessControl extends JTestCase { - - protected static String PRINCIPAL1_NAME = "principal1"; - protected static String PRINCIPAL3_NAME = "principal3"; - protected static String ROLE1_NAME = "baserole1"; - protected static String ROLE2_NAME = "baserole2"; - - protected static SecurityCurrent current = null; - protected static SecurityContext principal1 = null; - protected static SecurityContext principal2 = null; - protected static SecurityContext principal3 = null; - protected static SecurityContext principal4 = null; - - - public A_AccessControl(String name) { - super(name); - } - - /** - * init environment: - * - load beans - */ - protected void setUp() { - super.setUp(); - if (current == null) { - current = SecurityCurrent.getCurrent(); - principal1 = new SecurityContext("principal1", new String[] {"role1"}); - principal2 = new SecurityContext("principal2", new String[] {"role2"}); - String[] roles3 = new String[]{"role1", "role3"}; - principal3 = new SecurityContext(PRINCIPAL3_NAME, roles3); - String[] roles4 = new String[]{"role2"}; - principal4 = new SecurityContext("principal4", roles4); - } - } - - public abstract BaseS getBaseS(String name) throws Exception; - public abstract void removeBaseS(String name) throws Exception; - - /** - * test getCallerPrincipal. - * The Principal must be propagated. - */ - public void testGetCallerPrincipal() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("un"); - assertEquals(PRINCIPAL1_NAME, sl.getPrincipalName()); - sl.remove(); - } - - /** - * test isCallerInRole. - * principal1 = role1 - * principal2 = role2 - */ - public void testIsCallerInRole() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("deux"); - assertTrue(sl.isCallerInRole(ROLE1_NAME) == true); - assertTrue(sl.isCallerInRole(ROLE2_NAME) == false); - sl.remove(); - } - - /** - * test testIsCallerInRoleRolesInContext. - * principal1 = role1 (jonas-users.properties) - * principal2 = role2 (jonas-users.properties) - * principal3 = role1, role3 (role with security context) - * principal4 = role2 (role with security context) - */ - public void testIsCallerInRoleRolesInContext() throws Exception { - current.setSecurityContext(principal3); - BaseS sl = getBaseS("deuxbis"); - assertTrue(sl.isCallerInRole(ROLE1_NAME) == true); - assertTrue(sl.isCallerInRole(ROLE2_NAME) == false); - sl.remove(); - } - - /** - * test basic method reject - */ - public void testBasicMethodReject() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("trois"); - try { - sl.simpleMethod(); - fail("should be rejected: not in the role"); - } catch (RemoteException e) { - } - sl.remove(); - } - - /** - * test basic method reject - */ - public void testBasicMethodRejectRolesInContext() throws Exception { - current.setSecurityContext(principal3); - BaseS sl = getBaseS("troisbis"); - try { - sl.simpleMethod(); - fail("should be rejected: not in the role"); - } catch (RemoteException e) { - } - sl.remove(); - } - - - /** - * test basic method accept - */ - public void testBasicMethodAccept() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = getBaseS("quatre"); - sl.simpleMethod(); - sl.remove(); - } - - /** - * test basic method accept - */ - public void testBasicMethodAcceptRolesInContext() throws Exception { - current.setSecurityContext(principal4); - BaseS sl = getBaseS("quatrebis"); - sl.simpleMethod(); - sl.remove(); - } - - /** - * test complex method reject - */ - public void testComplexMethodReject() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("cinq"); - try { - Hashtable ht = new Hashtable(); - ht.put("foo", new Vector(10)); - ht.put("bar", new Hashtable()); - Object[] o = {"bar", new Hashtable(), new Vector()}; - sl.complexMethod(ht, o); - fail("should be rejected: not in the role"); - } catch (RemoteException e) { - } - sl.remove(); - } - - /** - * test complex method reject - */ - public void testComplexMethodRejectRolesInContext() throws Exception { - current.setSecurityContext(principal3); - BaseS sl = getBaseS("cinqbis"); - try { - Hashtable ht = new Hashtable(); - ht.put("foo", new Vector(10)); - ht.put("bar", new Hashtable()); - Object[] o = {"bar", new Hashtable(), new Vector()}; - sl.complexMethod(ht, o); - fail("should be rejected: not in the role"); - } catch (RemoteException e) { - } - sl.remove(); - } - - /** - * test complex method accept - */ - public void testComplexMethodAccept() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = getBaseS("six"); - Hashtable ht = new Hashtable(); - ht.put("foo", new Vector(10)); - ht.put("bar", new Hashtable()); - Object[] o = {"bar", new Hashtable(), new Vector()}; - sl.complexMethod(ht, o); - sl.remove(); - } - - /** - * test complex method accept - */ - public void testComplexMethodAcceptRolesInContext() throws Exception { - current.setSecurityContext(principal4); - BaseS sl = getBaseS("sixbis"); - Hashtable ht = new Hashtable(); - ht.put("foo", new Vector(10)); - ht.put("bar", new Hashtable()); - Object[] o = {"bar", new Hashtable(), new Vector()}; - sl.complexMethod(ht, o); - sl.remove(); - } - - /** - * test security-role-ref in DD - * baserole -> role1 - */ - public void testSecurityRoleRef() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("sept"); - assertTrue(sl.isCallerInRole(ROLE1_NAME) == true); - sl.remove(); - } - - /** - * test security-role-ref in DD - * baserole -> role1 - */ - public void testSecurityRoleRefRolesInContext() throws Exception { - current.setSecurityContext(principal3); - BaseS sl = getBaseS("septbis"); - assertTrue(sl.isCallerInRole(ROLE1_NAME) == true); - sl.remove(); - } - - /** - * test principal propagation from bean to bean - */ - public void testBeanToBeanPropagation() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("sept"); - assertEquals(PRINCIPAL1_NAME, sl.getPrincipalNameOfAnotherBean()); - sl.remove(); - } - - /** - * test principal propagation from bean to bean - */ - public void testBeanToBeanPropagationRolesInContext() throws Exception { - current.setSecurityContext(principal3); - BaseS sl = getBaseS("sept"); - assertEquals(PRINCIPAL3_NAME, sl.getPrincipalNameOfAnotherBean()); - sl.remove(); - } - - /** - * test principal propagation from bean to bean and access is denied - */ - public void testRejectBeanToBeanAccess() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = getBaseS("huit"); - try { - sl.getPrincipalNameOfAnotherBean(); - fail("should be rejected: not in the role"); - } catch (RemoteException e) { - } finally { - // sl should have been discarded. - removeBaseS("huit"); - } - } - - /** - * test principal propagation from bean to bean and access is denied - */ - public void testRejectBeanToBeanAccessRolesInContext() throws Exception { - current.setSecurityContext(principal4); - BaseS sl = getBaseS("huitbis"); - try { - sl.getPrincipalNameOfAnotherBean(); - fail("should be rejected: not in the role"); - } catch (RemoteException e) { - } finally { - // sl should have been discarded. - removeBaseS("huitbis"); - } - } - - /** - * test accept access to a local method - * callAnotherMethod is called with role1 and call DerivedSF.anotheMethod with this role - * return false if access to anotheMethod was denied - * expected return is true - */ - public void testLocalMethodAccept() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("neuf"); - assertTrue(sl.callAnotherMethod() == true); - sl.remove(); - } - - /** - * test accept access to a local method - * callAnotherMethod is called with role1 and call DerivedSF.anotheMethod with this role - * return false if access to anotheMethod was denied - * expected return is true - */ - public void testLocalMethodAcceptRolesInContext() throws Exception { - current.setSecurityContext(principal3); - BaseS sl = getBaseS("neufbis"); - assertTrue(sl.callAnotherMethod() == true); - sl.remove(); - } - - /** - * test reject access to a local method - * callAnotherMethod is called with role1 and call DerivedSF.anotheMethod with this role - * return false if access to anotheMethod was denied - * expected return is true - */ - public void testLocalMethodReject() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = getBaseS("dix"); - assertTrue(sl.callAnotherMethod() == false); - sl.remove(); - } - - /** - * test reject access to a local method - * callAnotherMethod is called with role1 and call DerivedSF.anotheMethod with this role - * return false if access to anotheMethod was denied - * expected return is true - */ - public void testLocalMethodRejectRolesInContext() throws Exception { - current.setSecurityContext(principal4); - BaseS sl = getBaseS("dixbis"); - assertTrue(sl.callAnotherMethod() == false); - sl.remove(); - } - - /** - * test on an exluded method (excluded list) - */ - public void testExcludedMethod() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = getBaseS("excluded"); - try { - sl.excludedMethod(); - fail("should be excluded"); - } catch (RemoteException e) { - } - sl.remove(); - } - - /** - * test timeout - */ - public void testTimeout() throws Exception { - current.setSecurityContext(principal2); - int duration = 5; - BaseS sl = getBaseS("timed"); - try { - int oldval = sl.getTimerCount(); - sl.setTimer(duration, 0, 0); - sleep(2000); - assertEquals("timer expired too quickly", oldval, sl.getTimerCount()); - sleep(4000); - assertEquals("timer did not expired", oldval + 1, sl.getTimerCount()); - } finally { - sl.remove(); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/security/B_AccessControl.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/security/B_AccessControl.java deleted file mode 100644 index e7bf4d66e6f42b95c6ca0aac94dfe84fe254988e..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/security/B_AccessControl.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id: - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.security; - - -import org.ow2.jonas.lib.security.context.SecurityContext; -import org.ow2.jonas.lib.security.context.SecurityCurrent; - -import org.objectweb.jonas.jtests.beans.secured.BaseS; -import org.objectweb.jonas.jtests.util.JTestCase; - - -/** - * Security Management common tests for all type of beans (Entity/Session) - * - * @author Ph.Coq, Ph.Durieux - * - */ - -public abstract class B_AccessControl extends JTestCase { - - protected static String PRINCIPAL1_NAME = "principal1"; - protected static String PRINCIPAL3_NAME = "principal3"; - protected static String ROLE1_NAME = "baserole1"; - protected static String ROLE2_NAME = "baserole2"; - - protected static SecurityCurrent current = null; - protected static SecurityContext principal1 = null; - protected static SecurityContext principal2 = null; - protected static SecurityContext principal3 = null; - protected static SecurityContext principal4 = null; - - - public B_AccessControl(String name) { - super(name); - } - - /** - * init environment: - * - load beans - */ - protected void setUp() { - super.setUp(); - if (current == null) { - current = SecurityCurrent.getCurrent(); - principal1 = new SecurityContext("principal1"); - principal2 = new SecurityContext("principal2"); - String[] roles3 = new String[]{"role1", "role3"}; - principal3 = new SecurityContext(PRINCIPAL3_NAME, roles3); - String[] roles4 = new String[]{"role2"}; - principal4 = new SecurityContext("principal4", roles4); - } - } - - public abstract BaseS getBaseS(String name) throws Exception; - - /** - * test getCallerPrincipal. - * The Principal must be propagated. - */ - public void testGetCallerPrincipal() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("un"); - assertEquals(PRINCIPAL1_NAME, sl.getPrincipalName()); - sl.remove(); - } - - /** - * test isCallerInRole. - * principal1 = role1 - * principal2 = role2 - */ - public void testIsCallerInRole() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("deux"); - assertTrue(sl.isCallerInRole(ROLE1_NAME) == true); - assertTrue(sl.isCallerInRole(ROLE2_NAME) == false); - sl.remove(); - } - - - - - /** - * test basic method accept - */ - public void testBasicMethodAccept() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = getBaseS("quatre"); - sl.simpleMethod(); - sl.remove(); - } - - - - - /** - * test principal propagation from bean to bean - */ - public void testBeanToBeanPropagation() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseS("sept"); - assertEquals(PRINCIPAL1_NAME, sl.getPrincipalNameOfAnotherBean()); - sl.remove(); - } - - - - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/security/F_RunAs.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/security/F_RunAs.java deleted file mode 100644 index 3faccabd2f423f013ae6ddf4483ed458b8e0f8d5..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/security/F_RunAs.java +++ /dev/null @@ -1,458 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.security; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.Topic; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.lib.security.context.SecurityContext; -import org.ow2.jonas.lib.security.context.SecurityCurrent; - -import org.objectweb.jonas.jtests.beans.secured.BaseS; -import org.objectweb.jonas.jtests.beans.secured.BaseSHome; -import org.objectweb.jonas.jtests.beans.secured.Session1; -import org.objectweb.jonas.jtests.beans.secured.Session1Home; -import org.objectweb.jonas.jtests.util.JTestCase; -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * Security Management Suite with a stateless session as first bean - * Test the run-as element - * - * @author Florent Benoit - * - */ - -public class F_RunAs extends JTestCase { - - - /** - * Bean RunAs - */ - private static String BEAN_HOME_RUNAS = "securedBaseRunAsSLHome"; - - /** - * Bean without RunAs - */ - private static String BEAN_HOME_NO_RUNAS = "securedBaseNoRunAsSLHome"; - - - /** - * Name of the principal 1 - */ - protected static String PRINCIPAL1_NAME = "principal1"; - - /** - * Name of the principal 2 - */ - protected static String PRINCIPAL2_NAME = "principal2"; - - /** - * Name of the role 1 - */ - protected static String ROLE1_NAME = "role1"; - - /** - * Name of the role 2 - */ - protected static String ROLE2_NAME = "role2"; - - /** - * Home runAs - */ - protected static BaseSHome runAsHome = null; - - /** - * Home no runAs - */ - protected static BaseSHome noRunAsHome = null; - - /** - * Current - */ - protected static SecurityCurrent current = null; - - /** - * principal 1 - */ - protected static SecurityContext principal1 = null; - - /** - * principal 2 - */ - protected static SecurityContext principal2 = null; - - - /** - * Constructor - */ - public F_RunAs(String name) { - super(name); - } - - /** - * Return the Home runAs - */ - public BaseSHome getRunAsHome() { - if (runAsHome == null) { - try { - runAsHome = (BaseSHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_RUNAS), BaseSHome.class); - } catch (NamingException e) { - fail("Cannot get bean home " + BEAN_HOME_RUNAS); - } - } - return runAsHome; - } - - /** - * Return the Home no runAs - */ - public BaseSHome getNoRunAsHome() { - if (noRunAsHome == null) { - try { - noRunAsHome = (BaseSHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME_NO_RUNAS), BaseSHome.class); - } catch (NamingException e) { - fail("Cannot get bean home " + BEAN_HOME_NO_RUNAS); - } - } - return noRunAsHome; - } - - public BaseS getBaseRunAs() throws Exception { - return getRunAsHome().create(); - } - - public BaseS getBaseNoRunAs() throws Exception{ - return getNoRunAsHome().create(); - } - - /** - * init environment: - * - load beans - */ - protected void setUp() { - super.setUp(); - if (current == null) { - current = SecurityCurrent.getCurrent(); - String[] roles1 = new String[]{ROLE1_NAME}; - principal1 = new SecurityContext(PRINCIPAL1_NAME, roles1); - String[] roles2 = new String[]{ROLE2_NAME}; - principal2 = new SecurityContext(PRINCIPAL2_NAME, roles2); - } - useBeans("secured", true); - } - - - /** - * This suite is all BMP test cases - */ - public static Test suite() { - return new TestSuite(F_RunAs.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_RunAs(testtorun)); - } - } - - - - /** - * Test the call on a bean which call another bean without any runAs - * The principal must be propagated - */ - public void testNoRunAsAtAll() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = getBaseNoRunAs(); - assertEquals(PRINCIPAL1_NAME, sl.getPrincipalName()); - assertTrue(sl.isCallerInRole(ROLE1_NAME)); - sl.callBeanNoRunAsWithRole1(); - sl.remove(); - } - - - - /** - * Test the call on a bean which call another bean. - * First bean need to have a run-as access, but not the second - * The principal must be propagated - */ - public void testRunAsAndNoRunAs() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = null; - try { - sl = getBaseRunAs(); - } catch (Exception e) { - fail("Create failed. Role used to access this bean must be role2"); - } - assertEquals(PRINCIPAL2_NAME, sl.getPrincipalName()); - assertTrue(sl.isCallerInRole(ROLE2_NAME)); - boolean b = sl.callBeanNoRunAsWithRole2(); - if (!b) { - fail("Cannot call another bean as role for calling the method must be role1 (run-as on the current bean) and not role2 (principal role)"); - } - sl.remove(); - } - - /** - * Test the run-as with a Timer - * First bean implements TimedObject and has the run-as set. - * Timeout method calls another bean method protected - * @throws Exception Unexpected Test error - */ - public void testRunAsOnTimer() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = getBaseRunAs(); - int duration = 5; - try { - int oldval = sl.getTimerCount(); - sl.setTimer(duration, 0, 2); - sleep(2000); - assertEquals("timer expired too quickly", oldval, sl.getTimerCount()); - sleep(4000); - assertEquals("timer did not expired", oldval + 1, sl.getTimerCount()); - } finally { - sl.remove(); - } - } - - /** - * Test the call on a bean which call another bean. - * First bean don't need to have a run-as access, but the second does - * The principal must be propagated - */ - public void testnoRunAsAndRunAs() throws Exception { - current.setSecurityContext(principal1); - BaseS sl = null; - sl = getBaseNoRunAs(); - assertEquals(PRINCIPAL1_NAME, sl.getPrincipalName()); - assertTrue(sl.isCallerInRole(ROLE1_NAME)); - boolean b = sl.callBeanRunAsWithRole1(); - if (!b) { - fail("Current role is role1 and the bean which is called need to have role2"); - } - sl.remove(); - } - - - - /** - * Test the call on a bean which call another bean. - * First bean need to have a run-as access and the second too - * First run-as is role1 ,second run-as is role3 - * so the test works if there is an access denied in second bean - * The principal must be propagated - */ - public void testRunAsChain() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = null; - try { - sl = getBaseRunAs(); - } catch (Exception e) { - fail("Create failed. Maybe role used is role1 but it must be role2 as this bean has got a run-as attribute with role2"); - } - assertEquals(PRINCIPAL2_NAME, sl.getPrincipalName()); - assertTrue(sl.isCallerInRole(ROLE2_NAME)); - boolean b = sl.callBeanRunAsWithRole2(); - if (!b) { - fail("Current role is role2 and the bean which is called has got a run as with role1. The next bean need role 2."); - } - sl.remove(); - } - - - /** - * Test the call on a bean which call another bean, etc - * First bean need role2 and has a run-as - * After calling a runas bean, it call a no-run as bean - * First run-as is role2 ,second run-as is role3 and last call is done on a without runas - * The principal must be propagated - */ - public void testRunAsMultipleChain() throws Exception { - current.setSecurityContext(principal2); - BaseS sl = null; - try { - sl = getBaseRunAs(); - } catch (Exception e) { - fail("Create failed. Maybe role used is role1 but it must be role2 as this bean has got a run-as attribute with role2"); - } - assertEquals(PRINCIPAL2_NAME, sl.getPrincipalName()); - assertTrue(sl.isCallerInRole(ROLE2_NAME)); - boolean b = sl.callBeanRunAsWithRole2(); - if (!b) { - fail("Current role is role2 and the bean which is called has got a run as with role1. The next bean require role1 so it must work"); - } - - b = sl.callBeanNoRunAsWithRole2(); - if (!b) { - fail("Current role is role2 and the bean which is called has got a run as with role1. The next bean require role1 so it must work"); - } - - sl.remove(); - } - - /** - * Test call on protected beans, some beans have run-as roles - * It also use LoginContext to authenticate - * This test come from user Alexander Daryin - * This testcase test the problem of the order in ejb-jar.xml of the permissions - */ - public void testRunAsAndSecurityOrderDeclaration() throws Exception { - current.setSecurityContext(principal1); - final Session1Home home = (Session1Home) PortableRemoteObject.narrow(ictx.lookup("securedSession1EJB"), Session1Home.class); - final Session1 bean = home.create(); - String resultTest = bean.test(); - if (!("value".equals(resultTest))) { - fail("The return value must be 'value' instead of '" + resultTest + "'"); - } - - - } - - - /** - * Send a message to a MDB which create another bean with its run-as role - * MDB send to a queue the answer to see if the test is ok or fail - */ - public void testRunAsJms() throws Exception { - current.setSecurityContext(principal2); - - TopicConnectionFactory tcf = null; - TopicConnection tc = null; - // Lookup Connection Factories - try { - tcf = (TopicConnectionFactory) ictx.lookup("JTCF"); - } catch (NamingException e) { - fail("Cannot lookup Connection Factories"); - } - - // Create Connections - try { - tc = tcf.createTopicConnection(); - } catch (JMSException e) { - fail("Cannot create connections"); - } - - TopicSession ss = null; - try { - ss = tc.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); - } catch (JMSException e) { - fail("Cannot create Session: " + e); - } - - Topic topic = null; - try { - topic = (Topic) ictx.lookup("runAsTopic"); - } catch (Exception e) { - fail("Cannot lookup Topic: " + e); - } - - - // Create the TopicPublisher - TopicPublisher publisher = null; - try { - publisher = ss.createPublisher(topic); - } catch (JMSException e) { - fail("Cannot create TopicPublisher: " + e); - } - - // Publish messages on the queue - try { - MapMessage mess = ss.createMapMessage(); - mess.setString("Id", "test"); - publisher.publish(mess); - } catch (JMSException e) { - fail("Cannot send message: " + e); - } - - // No close else it fails with JDK 1.3 - try { - ss.close(); - tc.close(); - } catch (JMSException e) { - fail("Cannot close session: "+e); - } - - - // Now receive the message to test if the test is ok or not - String msgtxt = null; - try { - ConnectionFactory cf = (ConnectionFactory) ictx.lookup("JCF"); - Queue queue = (Queue) ictx.lookup("sampleQueue"); - Connection conn = cf.createConnection(); - Session sess = conn.createSession(true, Session.AUTO_ACKNOWLEDGE); - MessageConsumer mc = sess.createConsumer((Destination) queue); - conn.start(); - Message message = (Message) mc.receive(10000); - if (message == null) { - fail("Can not receive message"); - } - msgtxt = message.getStringProperty("testRunAsJms"); - sess.close(); - conn.close(); - } catch (Exception e) { - fail("Can not get answer of the jms " + e); - } - - if (msgtxt == null) { - fail("No message received from the bean"); - } - - if (!msgtxt.equals("ok")) { - fail("The test is not ok : " + msgtxt); - } - - - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/session/F_Smt.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/session/F_Smt.java deleted file mode 100644 index 4860d9493edc41e0e990f180a94a5fd79bc0d490..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/session/F_Smt.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.session; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.beans.bmt.Moscone; -import org.objectweb.jonas.jtests.beans.bmt.MosconeHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -public class F_Smt extends JTestCase { - - protected static MosconeHome home = null; - - public F_Smt(String name) { - super(name); - } - - protected void setUp() { - super.setUp(); - useBeans("bmt", true); // must create tables (no entity bean) - useBeans("applimet", true); // must create tables (no entity bean) - } - - public MosconeHome getHome() throws Exception { - if (home == null) { - home = (MosconeHome) PortableRemoteObject.narrow(ictx.lookup("MosconeSTHome"), MosconeHome.class); - } - assertTrue(home != null); - return home; - } - - public void testSpanTx() throws Exception { - Moscone m = getHome().create(); - m.tx_start(); - m.tx_commit(); - m.remove(); - } - - public void testEnlistConn1() throws Exception { - Moscone m = getHome().create(); - m.moscone1(); - m.remove(); - } - - public void testEnlistConn2() throws Exception { - Moscone m = getHome().create(); - m.moscone2(); - m.remove(); - } - - public static Test suite() { - return new TestSuite(F_Smt.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_Smt(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/timer/A_Timer.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/timer/A_Timer.java deleted file mode 100644 index eb29d360d15779cefb1b1fe641f448701534bc7f..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/timer/A_Timer.java +++ /dev/null @@ -1,319 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.timer; - -import java.util.Date; - -import javax.ejb.TimerHandle; -import org.objectweb.jonas.jtests.beans.transacted.Simple; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * This is test of the TimerService. - * tests here are common to entity and session beans. - * beans used : transacted - * @author Philippe Durieux (jonas team) - */ -public abstract class A_Timer extends JTestCase { - - /** - * constructor - * @param name name of the test suite. - */ - public A_Timer(String name) { - super(name); - } - - /** - * Sets up the fixture, here load the beans if not loaded yet. - * This method is called before a test is executed. - */ - protected void setUp() { - super.setUp(); - useBeans("transacted", true); - } - - /** - * Get an instance of the bean. - * This method depends on the home used to get it. - * For entity bean, the arg is used to get a particular instance. - * For session beans, we get any session bean from the pool. - */ - public abstract Simple getSimple(int i) throws Exception; - - // -------------------------------------------------------------------- - // test cases - // -------------------------------------------------------------------- - - /** - * Test single-event timer - */ - public void testTimer1() throws Exception { - int duration = 5; - Simple s = getSimple(random(500000)); - try { - int oldval = s.getTimerCount(); - int id = s.setTimer(duration, 0); - sleep(2000); - assertEquals("timer expired too quickly", oldval, s.getTimerCount()); - sleep(4000); - assertEquals("timer did not expired", oldval + 1, s.getTimerCount()); - } finally { - s.remove(); - } - } - - /** - * Test with absolute time - */ - public void testTimerA1() throws Exception { - Date d = new Date(System.currentTimeMillis() + 1000); - Simple s = getSimple(random(500000)); - try { - int oldval = s.getTimerCount(); - int id = s.setTimer(d, 0); - sleep(2000); - assertEquals("timer did not expired", oldval + 1, s.getTimerCount()); - } finally { - s.remove(); - } - } - - /** - * Test with absolute time (for persistent timer test) - */ - public void testTimerAin4mn() throws Exception { - Date d = new Date(System.currentTimeMillis() + 4000 * 60); - Simple s = getSimple(random(500000)); - try { - int oldval = s.getTimerCount(); - int id = s.setTimer(d, 0); - } finally { - // Remove this line for persistent timers tests - s.remove(); - } - } - - /** - * Test periodic timer - * Can be used also to test persistent timers. - */ - public void testTimer2() throws Exception { - int duration = 5; - int period = 7; - Simple s = getSimple(random(500000)); - try { - int oldval = s.getTimerCount(); - int id = s.setTimer(duration, period); - sleep(2000); - assertEquals("timer expired too quickly", oldval, s.getTimerCount()); - sleep(4000); - assertEquals("timer did not expired", oldval + 1, s.getTimerCount()); - sleep(period * 1000); - assertEquals("timer did not expired twice", oldval + 2, s.getTimerCount()); - } finally { - s.remove(); - } - } - - /** - * Test single-event timer Handle - */ - public void testTimerHandle1() throws Exception { - int duration = 5; - Simple s = getSimple(random(500000)); - try { - int oldval = s.getTimerCount(); - int id = s.setTimerGetHandle(duration, 0); - sleep(2000); - assertEquals("timer expired too quickly", oldval, s.getTimerCount()); - sleep(4000); - assertEquals("timer did not expired", oldval + 1, s.getTimerCount()); - } finally { - s.remove(); - } - } - - /** - * Test periodic timer Handle - */ - public void testPeriodicTimerHandle1() throws Exception { - int duration = 5; - int period = 200; - Simple s = getSimple(random(500000)); - try { - int oldval = s.getTimerCount(); - int id = s.setTimerGetHandle(duration, period); - sleep(2000); - assertEquals("timer expired too quickly", oldval, s.getTimerCount()); - sleep(4000); - assertEquals("timer did not expired", oldval + 1, s.getTimerCount()); - } finally { - s.remove(); - } - } - - /** - * test getTimeRemaining on a Timer - */ - public void testTimeRemaining() throws Exception { - int duration1 = 5000; - int duration2 = 2000; - Simple s = getSimple(random(500000)); - try { - int id1 = s.setTimer(duration1, 0); - int id2 = s.setTimer(duration2, 0); - long t1 = s.getTimeRemaining(id1) / 1000; - long t2 = s.getTimeRemaining(id2) / 1000; - sleep(1200); - assertTrue(t1 < duration1); - assertTrue(t2 < duration2); - assertTrue(t1 > duration1 - 2); - assertTrue(t2 > duration2 - 2); - } finally { - s.remove(); - } - } - - /** - * Test du cancel Timer - */ - public void testCancel1() throws Exception { - int duration = 2; - Simple s = getSimple(random(500000)); - try { - int oldval = s.getTimerCount(); - int id = s.setTimer(duration, 0); - assertEquals("timer expired too quickly", oldval, s.getTimerCount()); - s.cancelTimer(id); - sleep(1000 * (duration + 1)); - assertEquals("timer did expired", oldval, s.getTimerCount()); - } finally { - s.remove(); - } - } - - /** - * Test of getTimers - */ - public void testGetTimers() throws Exception { - Simple s = getSimple(random(500000)); - int [] ids = new int[10]; - int before = s.getTimerNumber(); - try { - for (int i = 0; i < 10; i++) { - ids[i] = s.setTimer(i + 1, 100); - } - sleep(1000); - assertEquals("Bad number of timers", 10, s.getTimerNumber() - before); - for (int i = 0; i < 10; i++) { - s.cancelTimer(ids[i]); - } - } finally { - s.remove(); - } - } - - /** - * Test getTimers with cancel outside tx - * The cancelled timer should not be returned - */ - public void testGetTimerCancelled() throws Exception { - Simple s = getSimple(random(500000)); - int [] ids = new int[10]; - int before = s.getTimerNumber(); - try { - for (int i = 0; i < 10; i++) { - ids[i] = s.setTimer(i + 1, 100); - } - sleep(1000); - s.cancelTimer(ids[0]); - assertEquals("Bad number of timers", 9, s.getTimerNumber() - before); - for (int i = 1; i < 10; i++) { - s.cancelTimer(ids[i]); - } - } finally { - s.remove(); - } - } - - /** - * Test getTimers with cancel in the transaction. - * The cancelled timer should not be returned - */ - public void testGetTimerCancelledInTx() throws Exception { - Simple s = getSimple(random(500000)); - int [] ids = new int[10]; - int before = s.getTimerNumber(); - // start transaction - utx.begin(); - try { - for (int i = 0; i < 10; i++) { - ids[i] = s.setTimer(i + 1, 100); - } - sleep(1000); - s.cancelTimer(ids[0]); - assertEquals("Bad number of timers", 9, s.getTimerNumber() - before); - for (int i = 1; i < 10; i++) { - s.cancelTimer(ids[i]); - } - } finally { - utx.commit(); - s.remove(); - } - } - - /** - * Test getHandle on one-shot timer - */ - public void testGetHandle1() throws Exception { - int duration = 2; - Simple s = getSimple(random(500000)); - try { - int id = s.setTimer(duration, 0); - TimerHandle th = s.getTimerHandle(id); - assertTrue(th != null); - } finally { - s.remove(); - } - } - - /** - * Test getHandle on one-shot timer that has expired - */ - public void testGetExpiredHandle1() throws Exception { - int duration = 1; - Simple s = getSimple(random(500000)); - try { - int id = s.setTimer(duration, 0); - sleep(3000); - TimerHandle th = s.getTimerHandle(id); - assertTrue(th == null); - } finally { - s.remove(); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/timer/A_TimerEntity.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/timer/A_TimerEntity.java deleted file mode 100644 index 12c2d39cc8b03900823d751d3cbbe9beee41cced..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/timer/A_TimerEntity.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.timer; - -import org.objectweb.jonas.jtests.beans.transacted.Simple; -import org.objectweb.jonas.jtests.beans.transacted.SimpleEHome; - -/** - * Tests of the TimerService, specific to entity beans. - * @author Philippe Durieux (jonas team) - */ -public abstract class A_TimerEntity extends A_Timer { - - /** - * constructor - * @param name name of the test suite. - */ - public A_TimerEntity(String name) { - super(name); - } - - /** - * return SimpleHome, that can be either BMP, CMP1, or CMP2 bean. - */ - protected abstract SimpleEHome getHome(); - - /** - * Test interval timer - */ - public void testTimer2() throws Exception { - int duration = 4; - int intervalduration = 3; - Simple s = getSimple(random(500000)); - int expected = s.getTimerCount(); - int id = s.setTimer(duration, intervalduration); - try { - assertEquals("timer expired too quickly", expected, s.getTimerCount()); - sleep(1000 * duration + 1500); - expected++; - assertEquals("timer did not expire first", expected, s.getTimerCount()); - for (int i = 0; i < 3; i++) { - sleep(1000 * intervalduration); - expected++; - assertEquals("timer did not expired at " + i, expected, s.getTimerCount()); - } - } finally { - s.remove(); // should remove the timer too. - } - } - - /** - * Test for bug #305384 - * Create a timer for an entity bean - * Remove this bean instance before timer expire - * Check that the timer is removed. - */ - public void test305384() throws Exception { - int duration = 7; - Simple s = getSimple(random(500000)); - for (int i = 0; i < 10; i++) { - sleep(100); - s.startInfoTimer(duration, "Lock"); - } - sleep(1000); - s.remove(); // should remove the timers too. - System.out.println("Check that no exception is raised on server within 5 sec"); - } - - - /** - * Test this with a jonas restart to see if the timer - * is correctly restarted. - * @throws Exception - */ - public void testPersistentTimer() throws Exception { - int duration = 4; - int intervalduration = 3; - Simple s = getSimple(random(500000)); - try { - int expected = s.getTimerCount(); - s.setTimer(duration, intervalduration); - assertEquals("timer expired too quickly", expected, s.getTimerCount()); - sleep(1000 * duration + 1500); - expected++; - assertEquals("timer did not expire first", expected, s.getTimerCount()); - for (int i = 0; i < 3; i++) { - sleep(1000 * intervalduration); - expected++; - assertEquals("timer did not expired at " + i, expected, s.getTimerCount()); - } - } finally { - // Remove this line for persistent timers tests - s.remove(); - } - } - - /** - * test timer in ejbPostCreate - */ - public void testTimerInEjbPostCreate() throws Exception { - Simple s = getHome().createWithTimer(10, 2000); - sleep(4000); - s.remove(); - } - - /** - * test immediate timer in ejbPostCreate (bug #300502) - */ - public void testTimerInEjbPostCreate2() throws Exception { - Simple s = getHome().createWithTimer(10, 2); - sleep(1000); - s.remove(); - } - - /** - * test cancel in ejbTimeout (bug #300306) - */ - public void testCancelInTimeout() throws Exception { - int duration = 2; - int intervalduration = -1; - Simple s = getSimple(random(500000)); - int id = s.setTimer(duration, intervalduration); - // timer should be cancelled at first expiration. - // TODO: test this. - sleep(6000); - s.remove(); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/A_TxAttribute.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/A_TxAttribute.java deleted file mode 100644 index 1692b1440730913b740a20bb3e9b4c8f32a5642c..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/A_TxAttribute.java +++ /dev/null @@ -1,345 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.transaction; - -import java.rmi.RemoteException; - -import javax.transaction.TransactionRequiredException; - -import org.objectweb.jonas.jtests.beans.transacted.Simple; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * Transactional attribute test cases - * tests here are common to entity and session beans. - * beans used : transacted - * @author Ph.Coq, Ph.Durieux (jonas team) - */ -public abstract class A_TxAttribute extends JTestCase { - - /** - * constructor - * @param name name of the test suite. - */ - public A_TxAttribute(String name) { - super(name); - } - - /** - * Sets up the fixture, here load the beans if not loaded yet. - * This method is called before a test is executed. - */ - protected void setUp() { - super.setUp(); - useBeans("transacted", true); - } - - /** - * Get an instance of the bean. - * This method depends on the home used to get it. - * For entity bean, the arg is used to get a particular instance. - * For session beans, we get any session bean from the pool. - */ - public abstract Simple getSimple(int i) throws Exception; - - - // -------------------------------------------------------------------- - // test cases - // -------------------------------------------------------------------- - - /** - * Test of NotSupported attribute - * A business method with NotSupported is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is false - */ - public void testNotSupported() throws Exception { - - Simple s = getSimple(210); - try { - assertEquals(false, s.opwith_notsupported()); - } finally { - s.remove(); - } - } - - /** - * Test of RequiresNew attribute - * A business method with RequiresNew is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testRequiresNew() throws Exception { - - Simple s = getSimple(211); - try { - assertEquals(true, s.opwith_requires_new()); - } finally { - s.remove(); - } - } - - /** - * Test of Required attribute - * A business method with Required is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testRequired() throws Exception { - - Simple s = getSimple(212); - try { - assertEquals(true, s.opwith_required()); - } finally { - s.remove(); - } - } - - /** - * Test a "Required" method calling a "Requires_new" method. - * the expected value is true - */ - public void testRequiredRequiresNew() throws Exception { - - Simple s = getSimple(312); - try { - assertEquals(true, s.required_call_requires_new()); - } finally { - s.remove(); - } - } - - /** - * Test a "Required" method calling a "Requires_new" method on - * another bean instance. - * the expected value is true - */ - public void testRequiredRequiresNew2() throws Exception { - - Simple s = getSimple(220); - Simple s2 = getSimple(221); - try { - assertEquals(true, s.call_requires_new_on(s2)); - } finally { - s2.remove(); - s.remove(); - } - } - - /** - * Test of Mandatory attribute - * A business method with Mandatory is called outside TX - * this method returns if the thread is associated to a transaction - * - * A javax.transaction.TransactionRequiredException must be received - */ - - public void testMandatory() throws Exception { - - Simple s = getSimple(213); - try { - s.opwith_mandatory(); - fail("mandatory: should raise exception"); - } catch (javax.transaction.TransactionRequiredException e) { - } catch (RemoteException e) { - assertTrue(e.detail instanceof TransactionRequiredException); - } finally { - s.remove(); - } - } - - /** - * Test of Never attribute - * A business method with Never is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is false - */ - public void testNever() throws Exception { - - Simple s = getSimple(214); - try { - assertEquals(false, s.opwith_never()); - } finally { - s.remove(); - } - } - - /** - * Test of Supports attribute - * A business method with Supports is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is false - */ - public void testSupports() throws Exception { - - Simple s = getSimple(215); - try { - assertEquals(false, s.opwith_supports()); - } finally { - s.remove(); - } - } - - /** - * Test of NotSupported attribute - * A business method with NotSupported is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is false - */ - public void testNotSupportedTx() throws Exception { - - Simple s = getSimple(220); - utx.begin(); - try { - assertEquals(false, s.opwith_notsupported()); - } finally { - utx.rollback(); - s.remove(); - } - } - - /** - * Test of RequiresNew attribute - * A business method with RequiresNew is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testRequiresNewTx() throws Exception { - Simple s = getSimple(221); - utx.begin(); - try { - assertEquals(true, s.opwith_requires_new()); - } finally { - utx.rollback(); - s.remove(); - } - } - - /** - * Test of Required attribute - * A business method with Required is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testRequiredTx() throws Exception { - - Simple s = getSimple(222); - utx.begin(); - try { - assertEquals(true, s.opwith_required()); - } finally { - utx.rollback(); - s.remove(); - } - - } - - /** - * Test of Mandatory attribute - * A business method with Mandatory is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testMandatoryTx() throws Exception { - - Simple s = getSimple(223); - utx.begin(); - try { - assertEquals(true, s.opwith_mandatory()); - } finally { - utx.rollback(); - s.remove(); - } - } - - /** - * Test of Never attribute - * A business method with Mandatory is called inside TX - * this method returns if the thread is associated to a transaction - * - * A java.rmi.RemoteException must be received - */ - public void testNeverTx() throws Exception { - - Simple s = getSimple(24); - utx.begin(); - try { - s.opwith_never(); - fail("never: should raise exception"); - } catch (RemoteException e) { - } finally { - utx.rollback(); - s.remove(); - } - } - - /** - * Test of Supports attribute - * A business method with Supports is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testSupportsTx() throws Exception { - - Simple s = getSimple(25); - utx.begin(); - try { - assertEquals(true, s.opwith_supports()); - } finally { - utx.rollback(); - s.remove(); - } - - } - - /** - * Test the sequence of several calls to methods - * with different transactional contexts - */ - public void testNoTx() throws Exception { - Simple s = getSimple(90); - try { - assertEquals(false, s.opwith_notsupported()); - assertEquals(true, s.opwith_requires_new()); - assertEquals(true, s.opwith_required()); - assertEquals(false, s.opwith_never()); - assertEquals(false, s.opwith_supports()); - } finally { - s.remove(); - } - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/A_TxAttributeEntity.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/A_TxAttributeEntity.java deleted file mode 100644 index 342368e2a357e4fed7848035045dea5ff9acf9fc..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/A_TxAttributeEntity.java +++ /dev/null @@ -1,432 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - - -package org.objectweb.jonas.jtests.clients.transaction; - -import java.rmi.RemoteException; -import javax.transaction.TransactionRequiredException; -import org.objectweb.jonas.jtests.beans.transacted.Simple; -import org.objectweb.jonas.jtests.beans.transacted.SimpleEHome; - - -/** - * Here are found transactional attribute tests - * common but specific for all type of entity beans (BMP, CMP1.1, CMP2.0) - * Tests on finder and create methods - * @author Philippe Durieux (jonas team) - */ -public abstract class A_TxAttributeEntity extends A_TxAttribute { - - /** - * constructor - * @param name name of the test suite. - */ - public A_TxAttributeEntity(String name) { - super(name); - } - - /** - * return SimpleHome, that can be either BMP, CMP1, or CMP2 bean. - */ - protected abstract SimpleEHome getHome(); - - // ----------------------------------------------------------------- - // tests on Create methods - // ----------------------------------------------------------------- - - /** - * Test Required transactional attributes on create method - * the create method xith required is called outside TX - * - */ - public void testCreateRequired() throws Exception { - long i = 100; - Simple entity = getHome().createForRequired(i); - entity.remove(); - } - - /** - * Test Required transactional attributes on create method - * the create method xith required is called inside TX - * - */ - public void testCreateRequiredTx() throws Exception { - utx.begin(); - long i = 110; - Simple entity = null; - try { - entity = getHome().createForRequired(i); - } finally { - utx.rollback(); - } - - } - /** - * Test NotSupported transactional attributes on create method - * the create method xith required is called outside TX - * - */ - public void testCreateNotSupported() throws Exception { - int i = 120; - Simple entity = getHome().create(i); - entity.remove(); - } - - /** - * Test NotSupported transactional attributes on create method - * the create method xith required is called inside TX - * - */ - public void testCreateNotSupportedTx() throws Exception { - utx.begin(); - int i = 130; - Simple entity = null; - try { - entity = getHome().create(i); - } finally { - utx.rollback(); - entity.remove(); - } - } - - /** - * Test Never transactional attributes on create method - * the create method xith required is called outside TX - * - */ - public void testCreateNever() throws Exception { - short i = 140; - Simple entity = getHome().createForNever(i); - entity.remove(); - } - - /** - * Test Never transactional attributes on create method - * the create method xith required is called inside TX - * - */ - public void testCreateNeverTx() throws Exception { - utx.begin(); - short i = 150; - Simple entity = null; - try { - entity = getHome().createForNever(i); - entity.remove(); - fail("never: should raise exception"); - } catch (java.rmi.RemoteException e) { - } finally { - utx.rollback(); - - } - - } - - /** - * Test RequiresNew transactional attributes on create method - * the create method xith required is called outside TX - * - */ - public void testCreateRequiresNew() throws Exception { - String s = "160"; - Simple entity = getHome().createForRequiresNew(s); - entity.remove(); - } - - /** - * Test RequiresNew transactional attributes on create method - * the create method xith required is called inside TX - * - */ - public void testCreateRequiresNewTx() throws Exception { - utx.begin(); - String s = "170"; - Simple entity = null; - try { - entity = getHome().createForRequiresNew(s); - } finally { - utx.rollback(); - entity.remove(); - } - } - - - /** - * Test Mandatory transactional attributes on create method - * the create method xith required is called outside TX - * - */ - public void testCreateMandatory() throws Exception { - char c = 'a'; - try { - Simple entity = getHome().createForMandatory(c); - entity.remove(); - fail("mandatory: should raise exception"); - } catch (javax.transaction.TransactionRequiredException e) { - } catch (java.rmi.RemoteException e) { - assertTrue(e.detail instanceof javax.transaction.TransactionRequiredException); - } - } - - /** - * Test Mandatory transactional attributes on create method - * the create method xith required is called inside TX - * - */ - public void testCreateMandatoryTx() throws Exception { - utx.begin(); - char c = 'b'; - Simple entity = null; - try { - entity = getHome().createForMandatory(c); - } finally { - utx.rollback(); - - } - } - - - /** - * Test Supports transactional attributes on create method - * the create method xith required is called outside TX - * - */ - public void testCreateSupports() throws Exception { - - Simple entity = getHome().createForSupports(false); - entity.remove(); - } - - /** - * Test Supports transactional attributes on create method - * the create method xith required is called inside TX - * - */ - public void testCreateSupportsTx() throws Exception { - utx.begin(); - Simple entity = null; - try { - entity = getHome().createForSupports(true); - } finally { - utx.rollback(); - - } - } - - // ----------------------------------------------------------------- - // tests on Home methods - // ----------------------------------------------------------------- - - /** - * Test of NotSupported attribute - * A home method with NotSupported is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is false - */ - public void testHomeNotSupported() throws Exception { - assertEquals(false, getHome().opwith_notsupported()); - } - - /** - * Test of RequiresNew attribute - * A home method with RequiresNew is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testHomeRequiresNew() throws Exception { - assertEquals(true, getHome().opwith_requires_new()); - } - - /** - * Test of Required attribute - * A home method with Required is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testHomeRequired() throws Exception { - assertEquals(true, getHome().opwith_required()); - } - - /** - * Test of Mandatory attribute - * A home method with Mandatory is called outside TX - * this method returns if the thread is associated to a transaction - * - * A javax.transaction.TransactionRequiredException must be received - */ - - public void testHomeMandatory() throws Exception { - try { - getHome().opwith_mandatory(); - fail("mandatory: should raise exception"); - } catch (javax.transaction.TransactionRequiredException e) { - } catch (RemoteException e) { - assertTrue(e.detail instanceof TransactionRequiredException); - } - } - - /** - * Test of Never attribute - * A home method with Never is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is false - */ - public void testHomeNever() throws Exception { - assertEquals(false, getHome().opwith_never()); - } - - - /** - * Test of Supports attribute - * A home method with Supports is called outside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is false - */ - public void testHomeSupports() throws Exception { - assertEquals(false, getHome().opwith_supports()); - } - - /** - * Test of NotSupported attribute - * A home method with NotSupported is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is false - */ - public void testHomeNotSupportedTx() throws Exception { - utx.begin(); - try { - assertEquals(false, getHome().opwith_notsupported()); - } finally { - utx.rollback(); - } - } - - /** - * Test of RequiresNew attribute - * A home method with RequiresNew is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testHomeRequiresNewTx() throws Exception { - utx.begin(); - try { - assertEquals(true, getHome().opwith_requires_new()); - } finally { - utx.rollback(); - } - } - - /** - * Test of Required attribute - * A home method with Required is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testHomeRequiredTx() throws Exception { - utx.begin(); - try { - assertEquals(true, getHome().opwith_required()); - } finally { - utx.rollback(); - } - - } - - /** - * Test of Mandatory attribute - * A home method with Mandatory is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testHomeMandatoryTx() throws Exception { - utx.begin(); - try { - assertEquals(true, getHome().opwith_mandatory()); - } finally { - utx.rollback(); - } - } - - - - - /** - * Test of Never attribute - * A home method with Mandatory is called inside TX - * this method returns if the thread is associated to a transaction - * - * A java.rmi.RemoteException must be received - */ - public void testHomeNeverTx() throws Exception { - utx.begin(); - try { - getHome().opwith_never(); - fail("never: should raise exception"); - } catch (RemoteException e) { - } finally { - utx.rollback(); - } - } - - /** - * Test of Supports attribute - * A home method with Supports is called inside TX - * this method returns if the thread is associated to a transaction - * - * the expected value is true - */ - public void testHomeSupportsTx() throws Exception { - utx.begin(); - try { - assertEquals(true, getHome().opwith_supports()); - } finally { - utx.rollback(); - } - - } - - /** - * Test the sequence of several calls to home methods - * with different transactional contexts - */ - public void testHomeNoTx() throws Exception { - assertEquals(false, getHome().opwith_notsupported()); - assertEquals(true, getHome().opwith_requires_new()); - assertEquals(true, getHome().opwith_required()); - assertEquals(false, getHome().opwith_never()); - assertEquals(false, getHome().opwith_supports()); - } - - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/C_transaction.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/C_transaction.java deleted file mode 100644 index 54beb544603813405f6d2b87e5ab41d7654cf5d7..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/C_transaction.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.transaction; - -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * link all the suites from this directory - */ -public class C_transaction extends JTestCase { - - public C_transaction(String name) { - super(name); - } - - public static Test suite() { - TestSuite suite = new TestSuite(); - - // put here the list of suites to run - suite.addTest(F_BeanManagedTx.suite()); - suite.addTest(F_ContManagedTx.suite()); - suite.addTest(C_TxAttribute.suite()); - suite.addTest(F_BeanToBeanTx.suite()); - suite.addTest(F_BeanToLocalTx.suite()); - suite.addTest(F_EntityCMT.suite()); - suite.addTest(F_Jotm.suite()); - suite.addTest(F_State.suite()); - - return suite; - } - - public static void main (String args[]) { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/F_BeanToBeanTx.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/F_BeanToBeanTx.java deleted file mode 100644 index 8469ec52b8ed6d5112d26063820fab382763159a..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/F_BeanToBeanTx.java +++ /dev/null @@ -1,360 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.transaction; - -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.beans.transacted.Simple; -import org.objectweb.jonas.jtests.beans.transacted.SimpleEHome; -import org.objectweb.jonas.jtests.beans.transacted.SimpleSHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * Test for Bean to Bean transactions - * @author Ph.Durieux - */ -public class F_BeanToBeanTx extends JTestCase { - - protected static SimpleSHome syhome = null; - protected static SimpleSHome sfhome = null; - protected static SimpleSHome slhome = null; - protected static SimpleEHome echome = null; - protected static SimpleEHome ec2home = null; - protected static SimpleEHome ebhome = null; - - public F_BeanToBeanTx(String name) { - super(name); - } - - protected void setUp() { - super.setUp(); - useBeans("transacted", true); - if (syhome == null) { - String BEAN_HOME = "transactedSimpleSYHome"; - try { - syhome = (SimpleSHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), SimpleSHome.class); - } catch (NamingException e) { - fail("Cannot get " + BEAN_HOME + ":" + e); - } - } - if (sfhome == null) { - String BEAN_HOME = "transactedSimpleSFHome"; - try { - sfhome = (SimpleSHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), SimpleSHome.class); - } catch (NamingException e) { - fail("Cannot get " + BEAN_HOME + ":" + e); - } - } - if (slhome == null) { - String BEAN_HOME = "transactedSimpleSLHome"; - try { - slhome = (SimpleSHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), SimpleSHome.class); - } catch (NamingException e) { - fail("Cannot get " + BEAN_HOME + ":" + e); - } - } - if (echome == null) { - String BEAN_HOME = "transactedSimpleECHome"; - try { - echome = (SimpleEHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), SimpleEHome.class); - } catch (NamingException e) { - fail("Cannot get " + BEAN_HOME + ":" + e); - } - } - if (ec2home == null) { - String BEAN_HOME = "transactedSimpleEC2Home"; - try { - ec2home = (SimpleEHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), SimpleEHome.class); - } catch (NamingException e) { - fail("Cannot get " + BEAN_HOME + ":" + e); - } - } - if (ebhome == null) { - String BEAN_HOME = "transactedSimpleEBHome"; - try { - ebhome = (SimpleEHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), SimpleEHome.class); - } catch (NamingException e) { - fail("Cannot get " + BEAN_HOME + ":" + e); - } - } - } - - /** - * SL/Required -> EC/RequiresNew - */ - public void testSLToEC() throws Exception { - Simple s1 = slhome.create(); - Simple s2 = echome.create(30); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * SL/Required -> EC2/RequiresNew - */ - public void testSLToEC2() throws Exception { - Simple s1 = slhome.create(); - Simple s2 = ec2home.create(310); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * SF/Required -> EC/RequiresNew - */ - public void testSFToEC() throws Exception { - Simple s1 = sfhome.create(); - Simple s2 = echome.create(32); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * SF/Required -> EC2/RequiresNew - */ - public void testSFToEC2() throws Exception { - Simple s1 = sfhome.create(); - Simple s2 = ec2home.create(33); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * SY/Required -> EC/RequiresNew - */ - public void testSYToEC() throws Exception { - Simple s1 = syhome.create(); - Simple s2 = echome.create(34); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * SY/Required -> EC2/RequiresNew - */ - public void testSYToEC2() throws Exception { - Simple s1 = syhome.create(); - Simple s2 = ec2home.create(35); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * EC/Required -> EC/RequiresNew - */ - public void testECToEC() throws Exception { - Simple s1 = echome.create(36); - Simple s2 = echome.create(37); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * EC2/Required -> EC2/RequiresNew - */ - public void testEC2ToEC2() throws Exception { - Simple s1 = ec2home.create(38); - Simple s2 = ec2home.create(39); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * EB/Required -> EC/RequiresNew - */ - public void testEBToEC() throws Exception { - Simple s1 = ebhome.create(40); - Simple s2 = echome.create(41); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * EB/Required -> EC2/RequiresNew - */ - public void testEBToEC2() throws Exception { - Simple s1 = ebhome.create(42); - Simple s2 = ec2home.create(43); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * SL/Required -> SY/RequiresNew - */ - public void testSLToSY() throws Exception { - Simple s1 = slhome.create(); - Simple s2 = syhome.create(); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * SF/Required -> SY/RequiresNew - */ - public void testSFToSY() throws Exception { - Simple s1 = sfhome.create(); - Simple s2 = syhome.create(); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * SY/Required -> SY/RequiresNew - */ - public void testSYToSY() throws Exception { - Simple s1 = syhome.create(); - Simple s2 = syhome.create(); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * EC/Required -> SY/RequiresNew - */ - public void testECToSY() throws Exception { - Simple s1 = echome.create(44); - Simple s2 = syhome.create(); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * EC2/Required -> SY/RequiresNew - */ - public void testEC2ToSY() throws Exception { - Simple s1 = ec2home.create(45); - Simple s2 = syhome.create(); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - public void testSupports2Required() throws Exception { - Simple s2 = sfhome.create(); - try { - assertEquals(true, s2.supports_call_required()); - } finally { - s2.remove(); - } - } - - /** - * EB/Required -> SY/RequiresNew - */ - public void testEBToSY() throws Exception { - Simple s1 = ebhome.create(46); - Simple s2 = syhome.create(); - try { - assertEquals(true, s1.call_requires_new_on(s2)); - } finally { - s1.remove(); - s2.remove(); - } - } - - public static Test suite() { - return new TestSuite(F_BeanToBeanTx.class); - } - - public static void main(String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_BeanToBeanTx(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/F_Jotm.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/F_Jotm.java deleted file mode 100644 index 35de819df78179963d45e92f13acf689c6878843..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/F_Jotm.java +++ /dev/null @@ -1,252 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.transaction; - -import java.rmi.RemoteException; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import javax.transaction.RollbackException; -import javax.transaction.TransactionRolledbackException; -import javax.transaction.Status; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.beans.transacted.Simple; -import org.objectweb.jonas.jtests.beans.transacted.SimpleEHome; -import org.objectweb.jonas.jtests.beans.transacted.SimpleSHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * Basic tests of Jotm included in Jonas - */ -public class F_Jotm extends JTestCase { - - private static String BEAN_HOME = "transactedSimpleEC2Home"; - private static String SL_BEAN_HOME = "transactedSimpleSLHome"; - protected static SimpleEHome home = null; - protected static SimpleSHome homesl = null; - - /** - * constructor - * @param name name of the test suite. - */ - public F_Jotm(String name) { - super(name); - } - - /** - * init environment: - */ - protected void setUp() { - super.setUp(); - useBeans("transacted", true); - } - - /** - * return SimpleHome for CMP2 bean. - */ - protected SimpleEHome getHome() { - if (home == null) { - try { - home = (SimpleEHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), SimpleEHome.class); - } catch (NamingException e) { - fail("Cannot get bean home"); - } - } - return home; - } - - /** - * return SimpleHome for Session bean. - */ - protected SimpleSHome getHomeSL() { - if (homesl == null) { - try { - homesl = (SimpleSHome) PortableRemoteObject.narrow(ictx.lookup(SL_BEAN_HOME), SimpleSHome.class); - } catch (NamingException e) { - fail("Cannot get bean home"); - } - } - return homesl; - } - - /** - * Create a bean and return it. - */ - public Simple getSimple(int i) throws Exception { - Simple ret = null; - try { - ret = getHome().create(i); - } catch (Exception e) { - error("Cannot create entity bean: " + e); - } - return ret; - } - - /** - * Create a Session bean and return it. - */ - public Simple getSimpleSL() throws Exception { - Simple ret = null; - try { - ret = getHomeSL().create(); - } catch (Exception e) { - error("Cannot create session bean: " + e); - } - return ret; - } - - /** - * Test du transaction timeout - */ - public void testBasicTimeout() throws Exception { - int nbsec = 5; - utx.setTransactionTimeout(nbsec); - utx.begin(); - try { - utx.commit(); - // test OK. - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } catch (RollbackException e) { - fail("timeout rolled back transaction"); - } finally { - } - } - - /** - * Test du transaction timeout - */ - public void testBasicTimeoutRollback() throws Exception { - int nbsec = 5; - utx.setTransactionTimeout(nbsec); - utx.begin(); - try { - sleep((nbsec + 3)*1000); - utx.commit(); - fail("timeout should rollback transaction"); - } catch (RollbackException e) { - // test OK. - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } finally { - } - } - - public void test2PC() throws Exception { - Simple s1 = getSimple(131); - Simple s2 = getSimple(141); - try { - utx.begin(); - s1.opwith_mandatory(); - s2.opwith_mandatory(); - utx.commit(); - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } finally { - s1.remove(); - s2.remove(); - } - } - - public void test2PCSL() throws Exception { - Simple s1 = getSimpleSL(); - Simple s2 = getSimpleSL(); - try { - utx.begin(); - s1.opwith_mandatory(); - s2.opwith_mandatory(); - utx.commit(); - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } finally { - s1.remove(); - s2.remove(); - } - } - - /** - * This test the jonas bug 312334 - * To be sure this test is OK, we should also - * check the stats on transactions with jonasAdmin. - */ - public void test2PCtimeout() throws Exception { - int nbsec = 5; - utx.setTransactionTimeout(nbsec); - Simple s1 = getSimple(732); - Simple s2 = getSimple(742); - utx.begin(); - debug("access s1"); - s1.opwith_mandatory(); - sleep((nbsec + 3)*1000); - debug("access s2 after the timeout"); - try { - s2.opwith_supports(); - } catch (TransactionRolledbackException e) { - // ideal case. - } catch (RemoteException e) { - if (e.detail instanceof TransactionRolledbackException) { - // normal case - } else { - fail("Unexpected exception: " + e); - } - } finally { - debug("try to commit"); - try { - utx.commit(); - fail("timeout should rollback transaction"); - } catch (RollbackException e) { - // test OK. - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } catch (IllegalStateException e) { - // Transaction may not exist any longer, because of the timeout - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } finally { - debug("removing s1"); - s1.remove(); - debug("removing s2"); - s2.remove(); - } - } - } - - /** - */ - public static Test suite() { - return new TestSuite(F_Jotm.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_Jotm(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/F_State.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/F_State.java deleted file mode 100644 index 21e412a34f2427b28818ec34aa4734f9f074fba8..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/clients/transaction/F_State.java +++ /dev/null @@ -1,351 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.transaction; - - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import javax.transaction.RollbackException; -import javax.transaction.TransactionRolledbackException; -import javax.transaction.Status; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.objectweb.jonas.jtests.beans.annuaire.Personne; -import org.objectweb.jonas.jtests.beans.annuaire.PersonneHome; -import org.objectweb.jonas.jtests.util.JTestCase; - -/** - * these tests check state validity with transactions. - * Uses bean Personne (nom:pk, numero) - */ -public class F_State extends JTestCase { - - private static String BEAN_HOME = "annuairePersonneECHome"; - protected static PersonneHome ehome = null; - - public F_State(String name) { - super(name); - } - - protected void setUp() { - super.setUp(); - if (ehome == null) { - useBeans("annuaire", true); - try { - ehome = (PersonneHome) PortableRemoteObject.narrow(ictx.lookup(BEAN_HOME), PersonneHome.class); - } catch (NamingException e) { - fail("Cannot get bean home"); - } - } - } - - protected void tearDown() throws Exception { - super.tearDown(); - } - - /** - * Test with commit. Both beans should be modified - */ - public void testCommit() throws Exception { - // create beans - // Sometimes, the beans may exist. Delete them first. - Personne bob = null; - Personne jack = null; - try { - bob = ehome.create("Bob", "1"); - } catch (CreateException e) { - ehome.remove("Bob"); - bob = ehome.create("Bob", "1"); - } - try { - jack = ehome.create("Jack", "2"); - } catch (CreateException e) { - ehome.remove("Jack"); - jack = ehome.create("Jack", "2"); - } - - // transaction qui va etre committee - utx.setTransactionTimeout(6); - utx.begin(); - String newval = "4"; - try { - bob.setNumero(newval); - jack.setNumero(newval); - utx.commit(); - // Check beans have bean modified - assertTrue("first bean not modified", bob.getNumero().equals(newval)); - assertTrue("second bean not modified", jack.getNumero().equals(newval)); - } finally { - // remove created beans - bob.remove(); - jack.remove(); - } - } - - /** - * Test if modifications are cancelled after timeout. - */ - public void testTimeout() throws Exception { - // create beans - // Sometimes, the beans may exist. Delete them first. - Personne bob = null; - String bobnum = "1"; - try { - bob = ehome.create("Bob", bobnum); - } catch (CreateException e) { - ehome.remove("Bob"); - bob = ehome.create("Bob", bobnum); - } - Personne jack = null; - String jacknum = "2"; - try { - jack = ehome.create("Jack", jacknum); - } catch (CreateException e) { - ehome.remove("Jack"); - jack = ehome.create("Jack", jacknum); - } - - // tx that will be timed out. - int nbsec = 5; - utx.setTransactionTimeout(nbsec); - utx.begin(); - // first bean access, before timeout - bob.setNumero("3"); - sleep((nbsec + 3)*1000); - try { - // second bean access, after timeout - jack.setNumero("4"); - // fail("should not access bean inside a rolled back transaction"); - // possible case. But transaction will be rolled back later. - } catch (TransactionRolledbackException e) { - // ideal case. - debug("TransactionRolledbackException"); - } catch (RemoteException e) { - // normal case. - debug("RemoteException:" + e); - } finally { - try { - utx.commit(); - fail("should not commit transaction"); - } catch (RollbackException e) { - // Normal case. - } finally { - // Check that beans have not bean modified - // This is the most important checking of the test! - assertTrue("first bean modified", bob.getNumero().equals(bobnum)); - assertTrue("second bean modified", jack.getNumero().equals(jacknum)); - // remove created beans - bob.remove(); - jack.remove(); - } - } - } - - /** - * Test si les modifications apres le timeout sont effectivement - * annulees par le rollback. - * Implique que ces modifications soient bien enrolees dans la transaction - * ou bien carrement pas faite du tout. - */ - public void testTimeout1() throws Exception { - // create the bean - // Sometimes, the bean may exist. - Personne jack = null; - String jacknum = "2"; - try { - jack = ehome.create("Jack", jacknum); - } catch (CreateException e) { - ehome.remove("Jack"); - jack = ehome.create("Jack", jacknum); - } - - // transaction qui va etre rollbackee sur timeout - int nbsec = 5; - utx.setTransactionTimeout(nbsec); - utx.begin(); - try { - sleep((nbsec + 3)*1000); - // bean accede apres le timeout - jack.setNumero("4"); - utx.commit(); - // remove created beans - jack.remove(); - fail("timeout should rollback transaction"); - } catch (RollbackException e) { - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } - // Check beans have not been modified - // This is the most important checking of the test! - try { - assertTrue("bean modified", jack.getNumero().equals(jacknum)); - } finally { - // remove created beans - jack.remove(); - } - } - - public void testRollbackOnlyBasic() throws Exception { - utx.setTransactionTimeout(6); - utx.begin(); - utx.setRollbackOnly(); - try { - utx.commit(); - fail("Should rollback transaction"); - } catch (RollbackException e) { - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } - } - - /** - * Test si les modifications apres le rollbackonly sont effectivement - * annulees par le rollback. - * Implique que ces modifications soient bien enrolees dans la transaction - * ou bien carrement pas faite du tout. - */ - public void testRollbackOnly1() throws Exception { - // create beans - // Sometimes, the beans may exist. Delete them first. - Personne jack = null; - String jacknum = "2"; - try { - jack = ehome.create("Jack", jacknum); - } catch (CreateException e) { - ehome.remove("Jack"); - jack = ehome.create("Jack", jacknum); - } - - // transaction qui va etre rollbackee AVANT l'acces au bean - utx.setTransactionTimeout(6); - utx.begin(); - try { - // rollback only de la transaction - utx.setRollbackOnly(); - // bean accessed after rollbackOnly - jack.setNumero("4"); - // Actually, we could get an exception here. - // maybe should write this test differently - utx.commit(); - // remove created beans - jack.remove(); - fail("Should rollback transaction"); - } catch (RollbackException e) { - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } - // Check beans have not been modified - // This is the most important checking of the test! - try { - assertTrue("bean modified", jack.getNumero().equals(jacknum)); - } finally { - // remove created beans - jack.remove(); - } - } - - /** - * Test si les modifications apres le rollbackonly sont effectivement - * annulees par le rollback. - * Implique que ces modifications soient bien enrolees dans la transaction - * ou bien carrement pas faite du tout. - */ - public void testRollbackOnly() throws Exception { - // create beans - // Sometimes, the beans may exist. Delete them first. - Personne bob = null; - String bobnum = "1"; - try { - bob = ehome.create("Bob", bobnum); - } catch (CreateException e) { - ehome.remove("Bob"); - bob = ehome.create("Bob", bobnum); - } - Personne jack = null; - String jacknum = "2"; - try { - jack = ehome.create("Jack", jacknum); - } catch (CreateException e) { - ehome.remove("Jack"); - jack = ehome.create("Jack", jacknum); - } - - // transaction qui va etre rollbackee entre les - // 2 acces aux beans - utx.setTransactionTimeout(6); - utx.begin(); - // premier bean accede avant le rollbackOnly - bob.setNumero("3"); - // rollback only de la transaction - utx.setRollbackOnly(); - try { - // deuxieme bean accede apres le rollbackOnly - jack.setNumero("4"); - //fail("should not access bean inside a rolled back transaction"); - // possible case. But transaction will be rolled back later. - } catch (TransactionRolledbackException e) { - // ideal case. - } catch (RemoteException e) { - assertTrue((e.detail instanceof TransactionRolledbackException) - || (e instanceof TransactionRolledbackException)); - // normal case. - } finally { - try { - utx.commit(); - fail("should not commit transaction"); - } catch (RollbackException e) { - // Normal case. - assertEquals(utx.getStatus(), Status.STATUS_NO_TRANSACTION); - } finally { - // Controle que les 2 beans n'ont pas ete modifies - assertTrue("first bean modified", bob.getNumero().equals(bobnum)); - assertTrue("second bean modified", jack.getNumero().equals(jacknum)); - // remove created beans - bob.remove(); - jack.remove(); - } - } - } - - public static Test suite() { - return new TestSuite(F_State.class); - } - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sarg = args[argn]; - if (sarg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_State(testtorun)); - } - } -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/tables/Tjdbc.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/tables/Tjdbc.java deleted file mode 100644 index e35378f16a8f1944964618f45998144958cf4263..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/tables/Tjdbc.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.tables; - -import org.objectweb.util.monolog.api.BasicLevel; - -import javax.naming.NamingException; -import java.sql.Statement; -import java.sql.Connection; -import java.rmi.RemoteException; - -/** - * Class to create tables for the 'jdbc' bean. - * @author durieuxp - */ - -public class Tjdbc extends Tmanager { - /** - * Entry point - */ - public static void init() throws NamingException, RemoteException { - mgrInit(); - createTable("jdbcSF"); - } - - /** - * create a table for the pdouble bean of etype - */ - private static void createTable(String name) throws RemoteException { - - // get connection - Connection conn = null; - try { - conn = dataSource.getConnection(); - } catch (Exception e) { - throw new RemoteException("Cannot get Connection"); - } - - Statement stmt; - try { - stmt = conn.createStatement(); - stmt.execute("DROP TABLE " + name); - stmt.close(); - logger.log(BasicLevel.INFO, "Table " + name + " dropped"); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, "Exception in dropTable : \n" + e); - } - try { - stmt = conn.createStatement(); - stmt.execute("create table " + name + - "(c_pk varchar(30) not null primary key,"+ - "c_value integer)"); - stmt.execute("insert into " + name + " values('pk1', 0)"); - stmt.execute("insert into " + name + " values('pk2', 0)"); - stmt.execute("insert into " + name + " values('pk3', 0)"); - stmt.execute("insert into " + name + " values('pk4', 0)"); - - stmt.close(); - conn.close(); // release connection - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Exception in create/init Table : " + e); - throw new RemoteException("Exception in create/init Table : " + e); - } - logger.log(BasicLevel.INFO, "Table " + name + " created"); - } - -} diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/tables/Tmanager.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/tables/Tmanager.java deleted file mode 100644 index 3221c5acdff2529318cbe228c76b308c124647db..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/tables/Tmanager.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.tables; - -import java.rmi.RemoteException; -import javax.naming.NamingException; -import javax.sql.DataSource; -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; - -public class Tmanager { - - static protected Logger logger = null; - static DataSource dataSource = null; - - /** - * Entry point - */ - public static void mgrInit() throws NamingException, RemoteException { - logger = Log.getLogger(Log.JONAS_TESTS_PREFIX); - dataSource = DBEnvSL.getDataSource("jdbc_1"); - } -} - - diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/util/JBean.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/util/JBean.java deleted file mode 100644 index 8f5ea0f4ba1f07158beb22b69ccb8211561d1d09..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/util/JBean.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.util; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -import javax.ejb.EJBException; -import javax.ejb.Timer; -import javax.ejb.TimerHandle; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.transaction.UserTransaction; - - -/** - * This class can be extended in every bean of the jonas test suite. It provide - * some utilities to look transaction status, ... Most of them are not a clean - * and standard way to do this, but it is OK for jonas tests. - */ -public class JBean { - - public UserTransaction getUserTransaction() { - InitialContext ctx; - UserTransaction ut = null; - try { - ctx = new InitialContext(); - ut = (UserTransaction) ctx.lookup("javax.transaction.UserTransaction"); - } catch (NamingException e) { - throw new EJBException("Cannot get UserTransaction from the bean"); - } - return ut; - } - - public TimerHandle getDeserializedHandle(TimerHandle handle) { - TimerHandle newhandle = null; - try { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ObjectOutputStream os = new ObjectOutputStream(baos); - os.writeObject(handle); - byte[] b = baos.toByteArray(); - ByteArrayInputStream bais = new ByteArrayInputStream(b); - ObjectInputStream is = new ObjectInputStream(bais); - newhandle = (TimerHandle) is.readObject(); - } catch (Exception e) { - throw new EJBException("Bad deserialized timer handle:" + e); - } - return newhandle; - } - - public static boolean timersAreIdentical(TimerHandle th1, TimerHandle th2) { - Timer timer1, timer2; - - try { - timer1 = th1.getTimer(); - if (timer1 == null) { - return false; - } - timer2 = th2.getTimer(); - if (timer2 == null) { - return false; - } - return timer1.equals(timer2); - } catch (Exception e) { - throw new EJBException("Cannot compare 2 timers:" + e); - } - } - - /** - * sleep n millisec. - */ - public void sleep(int msec) { - try { - Thread.sleep(msec); - } catch (InterruptedException e) { - System.err.println("sleep interrupted"); - } - } - -} \ No newline at end of file diff --git a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/util/JTestCase.java b/jonas_tests/conformance/src/org/objectweb/jonas/jtests/util/JTestCase.java deleted file mode 100644 index e4ffa8c3b1cfdde3366431cfb4c76c7195ba629d..0000000000000000000000000000000000000000 --- a/jonas_tests/conformance/src/org/objectweb/jonas/jtests/util/JTestCase.java +++ /dev/null @@ -1,432 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.util; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.rmi.RemoteException; -import java.util.Set; - -import javax.management.Attribute; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; - -import junit.extensions.RepeatedTest; -import junit.framework.TestCase; - -import org.objectweb.jonas.jtests.tables.DBEnv; -import org.objectweb.jonas.jtests.tables.DBEnvHome; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -import org.ow2.jonas.lib.util.Log; - -/** - * JTestCase extends TestCase to provide a set of standard routines - * used in jonas tests. - */ -public abstract class JTestCase extends TestCase { - protected static String jonasName = "jonas"; // change this XXX - protected static String testtorun = null; - protected static Context ictx = null; - public static UserTransaction utx = null; - protected static String jb = null; - - protected static MBeanServerConnection cnx = null; - - private static DBEnv dbEnv = null; - private static boolean tableSessionLoaded = false; - - /** - * logger for tests: jonas_tests - * See $JONAS_BASE/conf/traceclient.properties - */ - static protected Logger logger = null; - - protected StringBuffer msgerror = null; - - public static final String PACKAGE = "org.objectweb.jonas.jtests.clients."; - - public JTestCase(String name) { - super(name); - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - } - - /** - * deprecated. use logger instead. - */ - protected void debug(String txt) { - logger.log(BasicLevel.DEBUG, getName() + ": " + txt); - } - - /** - * deprecated. use logger instead. - */ - protected void error(String txt) { - logger.log(BasicLevel.ERROR, getName() + ": " + txt); - } - - protected static void callTest(String classname, String testname) throws Exception { - Class clazz = Class.forName(PACKAGE + classname); - Class[] paramTypes = {String.class}; - Object[] arguments = {testname}; - Constructor constructor = clazz.getDeclaredConstructor(paramTypes); - JTestCase mytestcase = (JTestCase) constructor.newInstance(arguments); - System.out.print("Running " + classname + " (" + testname + ")\t"); - junit.textui.TestRunner.run(mytestcase); - } - - protected static void callrepeatedTest(String classname, String testname, int n) throws Exception { - Class clazz = Class.forName(PACKAGE + classname); - Class[] paramTypes = {String.class}; - Object[] arguments = {testname}; - Constructor constructor = clazz.getDeclaredConstructor(paramTypes); - JTestCase mytestcase = (JTestCase) constructor.newInstance(arguments); - RepeatedTest myrepeatedtest = new RepeatedTest(mytestcase,n); - System.out.print("Running repeated " + n + "times " + classname + " (" + testname + ")\t"); - junit.textui.TestRunner.run(myrepeatedtest); - } - - /** - * random returns an integer between 0 and max - 1 - */ - public int random(int max) throws RemoteException { - double d = Math.random(); - int ret = (int) (max * d); - return ret; - } - - /* - ** Make an absolute path with the filename. - */ - public String absPath(String name) { - String ret = jb + "/ejbjars/" + name + ".jar"; - return ret; - } - - - - private static JMXServiceURL jmxServerUrl = null; - private static String urlSuffix = "service:jmx:"; - private static String registry = null; - private static String defaultRegistry = "rmi://localhost:1099"; - private static String protocol = null; - private static String defaultProtocol = "jrmp"; - - - private void getJmxCnx() { - if (cnx == null) { - try { - if (registry == null) { - registry = defaultRegistry; - } - registry = registry + "/"; - int indx = registry.lastIndexOf(":"); - String st = registry.substring(0, indx); - String serverUrl = urlSuffix + st +"/jndi/"+registry; - if (protocol == null) { - protocol = defaultProtocol; - } - String connectorName = protocol.concat("connector_"); - connectorName = connectorName.concat(jonasName); - serverUrl = serverUrl.concat(connectorName); - jmxServerUrl = new JMXServiceURL(serverUrl); - System.out.println("JMX connector: "+serverUrl); - JMXConnector cntor = JMXConnectorFactory.connect(jmxServerUrl, null); - cnx = cntor.getMBeanServerConnection(null); - - } catch (IOException e) { - System.err.println("Can't reach server " + jonasName - + " as couldn't create JMXConnector (" + e.getMessage() - + ")"); - System.err.println("Check name, registry and protocol options."); - System.exit(2); - } - } - } - - - private static ObjectName j2eeserver = null; - - private ObjectName getJ2eeServer() { - if (j2eeserver == null) { - try { - ObjectName on = ObjectName.getInstance("*:j2eeType=J2EEServer,name=" + jonasName); - Set j2eeservers = cnx.queryNames(on, null); - if (j2eeservers.isEmpty()) { - System.err.println("Can't admin server " + jonasName + ": didn't found J2EEServer MBean"); - System.exit(2); - } - j2eeserver = (ObjectName) j2eeservers.iterator().next(); - } catch (Exception e) { - System.err.println("Can't invoke mbeanServer: " + e); - } - } - return j2eeserver; - } - - private void getInitialContext() { - try { - ictx = new InitialContext(); - } catch (NamingException e) { - System.err.println("Can't get InitialContext: " +e); - System.exit(2); - } - } - - private void getUserTransaction() { - try { - utx = (UserTransaction) PortableRemoteObject.narrow(ictx.lookup("java:comp/UserTransaction"), UserTransaction.class); - } catch (NamingException e) { - System.err.println("Can't get UserTransaction: " +e); - System.exit(2); - } - } - - - /** - * common setUp routine, used for every test. - */ - protected void setUp() { - getInitialContext(); - getUserTransaction(); - jb = System.getProperty("jonas.base"); - registry = System.getProperty("registry"); - protocol = System.getProperty("protocol"); - getJmxCnx(); - - - try { - // rollback transaction if previous test failed to do so - if (utx.getStatus() != Status.STATUS_NO_TRANSACTION) { - utx.rollback(); - } - } catch (SystemException e) { - throw new RuntimeException("Cannot use UserTransaction", e); - } - - // Load Session bean tables.jar - if (!tableSessionLoaded) { - String filename = "tables"; - if (!isLoaded(filename)) { - addBeans(filename); - } - tableSessionLoaded = true; - } - logger.log(BasicLevel.INFO, "Junit Running " + getName()); - } - - protected void tearDown() throws Exception { - logger.log(BasicLevel.DEBUG, "Junit Stopping " + getName()); - } - - /** - * isLoaded remote operation - */ - private boolean isLoaded(String filename) { - String an = absPath(filename); - boolean ret = false; - try { - String[] params = {an}; - String[] signature = {"java.lang.String"}; - try { - Boolean r = (Boolean) cnx.invoke(getJ2eeServer(), "isDeployed", params, signature); - ret = r.booleanValue(); - } catch (Exception e) { - System.err.println("Cannot deploy " + an + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - return ret; - } - - /** - * addBean remote operation - */ - public void addBeans(String filename) { - String an = absPath(filename); - try { - String[] params = {an}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + an + ": " + e); - } - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - - /** - * unloadBean remote operation - */ - public void unloadBeans(String filename) { - logger.log(BasicLevel.DEBUG, "unloadBeans " + filename); - String an = absPath(filename); - try { - String[] params = {an}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "undeploy", params, signature); - } catch (Exception e) { - System.err.println("Can't invoke mbeanServer: " + e); - } - - } catch (Exception e) { - System.err.println("Cannot unload bean: " + e); - } - } - - /** - * load a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @param create creates tables at loading (CMP1 only) - * Note that in CMP2, the decision to create the tables is in - * the jonas specific deployment descriptor. - * @return true if bean has just been loaded. - */ - public boolean useBeans(String filename, boolean create) { - debug("useBeans " + filename); - boolean added = false; - try { - // Load bean in EJBServer if not already loaded. - if (!isLoaded(filename)) { - addBeans(filename); - - // Create table if the bean was not loaded - if (create) { - getDBEnv().initTable(filename); - } - added = true; - } - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Cannot load bean :" + e); - } - return added; - } - - /** - * synchronize all entity beans - * @param passivate passivate all instances after synchronization. - */ - public void sync(boolean passivate) { - logger.log(BasicLevel.DEBUG, "sync"); - try { - if (passivate) { - sleep(2500); - } - String domainName = j2eeserver.getDomain(); - ObjectName on = ObjectName.getInstance(domainName + ":type=service,name=ejbContainers"); - Boolean[] params = {passivate}; - String[] signature = {"boolean"}; - try { - cnx.invoke(on, "syncAllEntities", params, signature); - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Can't invoke mbeanServer: " + e); - } - - } catch (Exception e) { - logger.log(BasicLevel.ERROR, "Cannot sync entities :" + e); - } - } - - /** - * Set the Default Transaction Timeout value on the server. - * @param tt timeout in seconds - */ - public static void stopTxAt(int tt) { - try { - String domainName = j2eeserver.getDomain(); - ObjectName on = ObjectName.getInstance(domainName + ":j2eeType=JTAResource,name=JTAResource,J2EEServer=" + jonasName); - try { - Attribute att = new Attribute("timeOut", tt); - cnx.setAttribute(on, att); - //Integer val = (Integer) cnx.getAttribute(on, "timeOut"); - } catch (Exception e) { - System.err.println("Can't invoke mbeanServer: " + e); - } - - } catch (Exception e) { - System.err.println("Cannot set transaction timeout: " + e); - } - } - - /** - * Get the session bean to manage database tables. - */ - public DBEnv getDBEnv() { - if (dbEnv == null) { - - useBeans("tables", false); - - // Connect to the DBEnvHome object - DBEnvHome dbhome = null; - try { - dbhome = (DBEnvHome) PortableRemoteObject.narrow(ictx.lookup("tablesDBEnvHome"), DBEnvHome.class); - } catch (NamingException e) { - System.err.println(">>> " + e); - fail("Cannot bind to DBEnvHome"); - } - - // Create the table using a session bean - try { - dbEnv = dbhome.create(); - } catch (Exception e) { - fail(e.toString()); - } - } - return dbEnv; - } - - /** - * sleep n millisec. - */ - public void sleep(int msec) { - try { - Thread.sleep(msec); - } catch (InterruptedException e) { - fail(e.toString()); - } - } - - public void testEmpty() throws Exception { - } - -} diff --git a/jonas_tests/deployment/build.xml b/jonas_tests/deployment/build.xml deleted file mode 100644 index c9f78b463ecebbf10ca0e3b90726fc48bf9e69fb..0000000000000000000000000000000000000000 --- a/jonas_tests/deployment/build.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/deployment/src/DDTest.java b/jonas_tests/deployment/src/DDTest.java deleted file mode 100644 index a62ba1262355ee2991454b5d5d12823672673a65..0000000000000000000000000000000000000000 --- a/jonas_tests/deployment/src/DDTest.java +++ /dev/null @@ -1,487 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -import java.io.BufferedReader; -import java.io.InputStreamReader; - -import org.ow2.jonas.deployment.client.tests.ClientDeploymentTest; -import org.ow2.jonas.deployment.client.tests.JonasClientDeploymentTest; -import org.ow2.jonas.deployment.client.xml.ApplicationClient; -import org.ow2.jonas.deployment.client.xml.JonasClient; -import org.ow2.jonas.deployment.common.xml.Element; -import org.ow2.jonas.deployment.ear.tests.EarDeploymentTest; -import org.ow2.jonas.deployment.ear.xml.Application; -import org.ow2.jonas.deployment.ejb.tests.EJBDeploymentTest; -import org.ow2.jonas.deployment.ejb.tests.JonasEJBDeploymentTest; -import org.ow2.jonas.deployment.ejb.xml.EjbJar; -import org.ow2.jonas.deployment.ejb.xml.JonasEjbJar; -import org.ow2.jonas.deployment.rar.tests.JonasRarDeploymentTest; -import org.ow2.jonas.deployment.rar.tests.RarDeploymentTest; -import org.ow2.jonas.deployment.rar.xml.Connector; -import org.ow2.jonas.deployment.rar.xml.JonasConnector; -import org.ow2.jonas.deployment.tests.AbsDeploymentTest; -import org.ow2.jonas.deployment.web.tests.JonasWebDeploymentTest; -import org.ow2.jonas.deployment.web.tests.WebDeploymentTest; -import org.ow2.jonas.deployment.web.xml.JonasWebApp; -import org.ow2.jonas.deployment.web.xml.WebApp; -import org.ow2.jonas.deployment.ws.tests.JonasWsDeploymentTest; -import org.ow2.jonas.deployment.ws.tests.WsDeploymentTest; -import org.ow2.jonas.deployment.ws.xml.JavaWsdlMapping; -import org.ow2.jonas.deployment.ws.xml.JonasWebservices; -import org.ow2.jonas.deployment.ws.xml.Webservices; - - -/** - * Defines a class for testing - * @author Florent Benoit - * @author Philippe Coq - * @author Helene Joanin - */ - -public class DDTest { - - /** - * WebApp tests - */ - private static WebDeploymentTest webDeploymentTest = null; - private static JonasWebDeploymentTest jonasWebDeploymentTest = null; - - /** - * Connector tests - */ - private static RarDeploymentTest rarDeploymentTest = null; - private static JonasRarDeploymentTest jonasRarDeploymentTest = null; - /** - * Application Client tests - */ - private static ClientDeploymentTest clientDeploymentTest = null; - private static JonasClientDeploymentTest jonasClientDeploymentTest = null; - /** - * EJB tests - */ - private static EJBDeploymentTest ejbDeploymentTest = null; - private static JonasEJBDeploymentTest jonasEjbDeploymentTest = null; - /** - * Application tests - */ - private static EarDeploymentTest earDeploymentTest = null; - - /** - * Web Services tests - */ - private static WsDeploymentTest wsDeploymentTest = null; - private static JonasWsDeploymentTest jonasWsDeploymentTest = null; - - private DDTest() { - webDeploymentTest = new WebDeploymentTest(); - jonasWebDeploymentTest = new JonasWebDeploymentTest(); - rarDeploymentTest = new RarDeploymentTest(); - jonasRarDeploymentTest = new JonasRarDeploymentTest(); - clientDeploymentTest = new ClientDeploymentTest(); - jonasClientDeploymentTest = new JonasClientDeploymentTest(); - ejbDeploymentTest = new EJBDeploymentTest(); - jonasEjbDeploymentTest = new JonasEJBDeploymentTest(); - earDeploymentTest = new EarDeploymentTest(); - wsDeploymentTest = new WsDeploymentTest(); - jonasWsDeploymentTest = new JonasWsDeploymentTest(); - - } - - public static void main(String[] args) throws Exception { - DDTest ddTest = new DDTest(); - try { - ddTest.interactUser(); - }catch (Exception e) { - System.out.println("Error : '" + e.getMessage() + "'"); - e.printStackTrace(); - System.exit(2); - } - } - - private void choice() { - System.out.println("d for Displaying an XML element"); - System.out.println("t for Testing an XML element"); - System.out.println("s for Stressing an XML element"); - System.out.println("p for Parsing check"); - System.out.println("f for Parsing from an XML file"); - System.out.println("q for Quit"); - } - - private void help() { - System.out.println("+--------------------------------+"); - System.out.println("| |"); - System.out.println("+--------------------------------+"); - - } - - private void interactUser() throws Exception { - // User interface - BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); - while (true) { - choice(); - System.out.print("> "); - String readLine = in.readLine(); - if (readLine.length() == 0) { - continue; - } - char c = readLine.charAt(0); - - switch (c) { - case 'd': - System.out.println("1 - WebApp element"); - System.out.println("2 - JonasWebApp element"); - System.out.println("3 - Connector element"); - System.out.println("4 - JonasConnector element"); - System.out.println("5 - ClientApp element"); - System.out.println("6 - JonasClient element"); - System.out.println("7 - Application element"); - System.out.println("8 - EjbJar element"); - System.out.println("9 - JonasEjbJar element"); - System.out.println("a - WebServices element"); - System.out.println("b - JonasWebServices element"); - System.out.println("c - JavaWsdlMapping element"); - - System.out.println("0 - Customize element"); - - System.out.print("> "); - readLine = in.readLine(); - if (readLine.length() == 0) { - continue; - } - c = readLine.charAt(0); - Element element = null; - switch (c) { - case '1' : - element = new WebApp(); - break; - case '2' : - element = new JonasWebApp(); - break; - case '3' : - element = new Connector(); - break; - case '4' : - element = new JonasConnector(); - break; - case '5' : - element = new ApplicationClient(); - break; - case '6' : - element = new JonasClient(); - break; - case '7' : - element = new Application(); - break; - case '8' : - element = new EjbJar(); - break; - case '9' : - element = new JonasEjbJar(); - break; - case 'a' : - element = new Webservices(); - break; - case 'b' : - element = new JonasWebservices(); - break; - case 'c' : - element = new JavaWsdlMapping(); - break; - - case '0' : - System.out.print("Enter the name of the Element > "); - String className = in.readLine(); - try { - Class cl = Class.forName(className); - element = (Element) cl.newInstance(); - } catch (Exception e) { - System.out.println("className is not a good element " + e); - continue; - } - break; - - default : - continue; - } - - wsDeploymentTest.fill(element, false); - System.out.println(""); - System.out.println(element); - break; - - case 't': - System.out.println("1 - WebApp element"); - System.out.println("2 - JonasWebApp element"); - System.out.println("3 - Connector element"); - System.out.println("4 - JonasConnector element"); - System.out.println("5 - ClientApp element"); - System.out.println("6 - JonasClient element"); - System.out.println("7 - Application element"); - System.out.println("8 - EjbJar element"); - System.out.println("9 - JonasEjbJar element"); - System.out.println("a - WebServices element"); - System.out.println("b - JonasWebServices element"); - System.out.println("c - JaxrcpMapping element"); - - System.out.print("> "); - readLine = in.readLine(); - if (readLine.length() == 0) { - continue; - } - c = readLine.charAt(0); - AbsDeploymentTest testElememt = null; - switch (c) { - case '1' : - webDeploymentTest.startTest(true); - break; - case '2' : - jonasWebDeploymentTest.startTest(true); - break; - case '3' : - rarDeploymentTest.startTest(true); - break; - case '4' : - jonasRarDeploymentTest.startTest(true); - break; - case '5' : - clientDeploymentTest.startTest(true); - break; - case '6' : - jonasClientDeploymentTest.startTest(true); - break; - case '7' : - earDeploymentTest.startTest(true); - break; - case '8' : - ejbDeploymentTest.startTest(true); - break; - case '9' : - jonasEjbDeploymentTest.startTest(true); - break; - case 'a' : - wsDeploymentTest.startTest(true); - break; - case 'b' : - wsDeploymentTest.startTest(true); - break; - case 'c' : - wsDeploymentTest.startJaxrpcMappingTest(true); - break; - - default : - continue; - } - break; - - case 's': - System.out.println("1 - WebApp element"); - System.out.println("2 - JonasWebApp element"); - System.out.println("3 - Connector element"); - System.out.println("4 - JonasConnector element"); - System.out.println("5 - ClientApp element"); - System.out.println("6 - JonasClient element"); - System.out.println("7 - Application element"); - System.out.println("8 - EjbJar element"); - System.out.println("9 - JonasEjbJar element"); - System.out.println("a - WebServices element"); - System.out.println("b - JonasWebServices element"); - System.out.println("c - JaxrcpMapping element"); - - System.out.print("> "); - readLine = in.readLine(); - if (readLine.length() == 0) { - continue; - } - c = readLine.charAt(0); - - switch (c) { - case '1' : - webDeploymentTest.stress(); - break; - case '2' : - jonasWebDeploymentTest.stress(); - break; - case '3' : - rarDeploymentTest.stress(); - break; - case '4' : - jonasRarDeploymentTest.stress(); - break; - case '5' : - clientDeploymentTest.stress(); - break; - case '6' : - jonasClientDeploymentTest.stress(); - break; - case '7' : - earDeploymentTest.stress(); - break; - case '8' : - ejbDeploymentTest.stress(); - break; - case '9' : - jonasEjbDeploymentTest.stress(); - break; - case 'a' : - wsDeploymentTest.stress(); - break; - case 'b' : - jonasWsDeploymentTest.stress(); - break; - case 'c' : - wsDeploymentTest.startJaxrpcMappingTest(true); - break; - - default : - continue; - } - break; - - case 'p': - System.out.println("1 - WebApp element"); - System.out.println("2 - JonasWebApp element"); - System.out.println("3 - Connector element"); - System.out.println("4 - JonasConnector element"); - System.out.println("5 - ClientApp element"); - System.out.println("6 - JonasClient element"); - System.out.println("7 - Application element"); - System.out.println("8 - EjbJar element"); - System.out.println("9 - JonasEjbJar element"); - System.out.println("a - WebServices element"); - System.out.println("b - JonasWebServices element"); - System.out.println("c - JaxrcpMapping element"); - - System.out.print("> "); - readLine = in.readLine(); - if (readLine.length() == 0) { - continue; - } - c = readLine.charAt(0); - switch (c) { - case '1' : - webDeploymentTest.parseElement(); - break; - case '2' : - jonasWebDeploymentTest.parseElement(); - break; - case '3' : - rarDeploymentTest.parseElement(); - break; - case '4' : - jonasRarDeploymentTest.parseElement(); - break; - case '5' : - clientDeploymentTest.parseElement(); - break; - case '6' : - jonasClientDeploymentTest.parseElement(); - break; - case '7' : - earDeploymentTest.parseElement(); - break; - case '8' : - ejbDeploymentTest.parseElement(); - break; - case '9' : - jonasEjbDeploymentTest.parseElement(); - break; - - } - - break; - case 'f': - System.out.println("1 - web.xml file"); - System.out.println("2 - jonas-web.xml file"); - System.out.println("3 - ra.xml file"); - System.out.println("4 - jonas-ra.xml file"); - System.out.println("5 - client.xml file"); - System.out.println("6 - jonas-client.xml file"); - System.out.println("7 - application.xml file"); - System.out.println("8 - ejb-jar.xml file"); - System.out.println("9 - jonas-ejbjar.xml file"); - - System.out.print("> "); - readLine = in.readLine(); - if (readLine.length() == 0) { - continue; - } - c = readLine.charAt(0); - System.out.print("Enter the name of the xml file > "); - String fileName = in.readLine(); - - switch (c) { - case '1' : - webDeploymentTest.parseXmlfromFile(fileName); - break; - case '2' : - jonasWebDeploymentTest.parseXmlfromFile(fileName); - break; - case '3' : - rarDeploymentTest.parseXmlfromFile(fileName); - break; - case '4' : - jonasRarDeploymentTest.parseXmlfromFile(fileName); - break; - case '5' : - clientDeploymentTest.parseXmlfromFile(fileName); - break; - case '6' : - jonasClientDeploymentTest.parseXmlfromFile(fileName); - break; - case '7' : - earDeploymentTest.parseXmlfromFile(fileName); - break; - case '8' : - ejbDeploymentTest.parseXmlfromFile(fileName); - break; - case '9' : - jonasEjbDeploymentTest.parseXmlfromFile(fileName); - break; - case 'a' : - wsDeploymentTest.parseXmlfromFile(fileName); - break; - case 'b' : - jonasWsDeploymentTest.parseXmlfromFile(fileName); - break; - case 'c' : - wsDeploymentTest.parseJaxrcpMappingElement(); - break; - - } - break; - - case 'q': - System.exit(0); - break; - - default : - break; - } - } - } - - -} diff --git a/jonas_tests/doc/index.html b/jonas_tests/doc/index.html deleted file mode 100644 index 3648e8af7e36795bc30a295340edd5dd09f2fc0c..0000000000000000000000000000000000000000 --- a/jonas_tests/doc/index.html +++ /dev/null @@ -1,617 +0,0 @@ - - - - - Jonas Tests - - - - - - -

    JOnAS Test Suite

    - -

    Table of contents

    - - -

    Aim of the suite

    - -

    The aim of this suite is to provide tests that verify that JOnAS conforms -to the EJB specifications. This suite is used to identify regressions in -contributions made in the JOnAS code. This suite is far from complete and -will be expanded in the future. Anyone is welcome to write or add new test -cases to this suite according to the guidelines explained below.

    - -

    Note that this test suite has been done to test JOnAS, and its use to test -other application servers is not straightforward.

    - -

    Getting the suite from CVS repository

    - -

    Anyone can checkout source code from our anonymous CVS server. To do so, -simply use the following commands (if you are using a GUI CVS client, -configure it appropriatly):

    -
    -cvs -d :pserver:anonymous@cvs.forge.objectweb.org:/cvsroot/jonas login
    -cvs -d :pserver:anonymous@cvs.forge.objectweb.org:/cvsroot/jonas co jonas_tests
    -
    - -

    When prompted for a password for anonymous, simply press the Enter key.

    - -

    Description of the source tree

    - -

    Under jonas_tests you will find different test suites -:

    - - - - - - - - - - - - - - - - -
    conformancetest of EJB spec conformance
    stresstest of robustness and scalibility
    j2eecatest Application Server conformance to J2EE Connector Architecture
    - -

    Other suites are likely to be added in the future.

    - -

    conformance and stress are made of the -following files and directories:

    - - - - - - - - - - - - - - - - -
    build.xmlant file to build and run all the tests
    srcsource files
    junit.shscript to run 1 or more tests
    - -

    The source code is organized according to the package name. So, for the -conformance test suite, the source is located in -src/org/objectweb/jonas/jtests :

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    beansEach directory contains code for a set of beans (a ejb-jar file) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    annuairesession bean accessing entity beans
    beanexcbeans used for exception testing
    clusterentity beans with shared attribute
    ebasic
    foldermainly to test local interfaces
    j2eecabeans used for jca 1.0 Connector Architecture testing
    jca15beans used for JCA 1.5 Connector Architecture testing
    jdbcrabeans used for jdbc resource adapter testing
    localbeans used for local interfaces testing
    messagebeans used for jms testing
    securedbeans used for security testing
    transactedbeans used for transaction testing
    remoterunnerbeans used for running junit test suites on the server - side.
    -
    clientsEach directory contains code for a set of test suites. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    distributiontests related to the chapter 19 of the Specs EJB2.0
    entitytests related to the chapter 9,10,11,12,14 of the Specs - EJB2.0
    exceptiontests related to the chapter 18 of the Specs EJB2.0
    j2eecatests related to JCA 1.0 Connector Architecture testing
    jca15tests related to JCA 1.5 Connector Architecture testing
    jdbcratests related to JDBC RA testing
    jms
    localtest suites that must be run on the server side
    securitytests related to the chapter 21 of the Specs EJB2.0
    sessiontests related to the chapter 6,7 of the Specs EJB2.0
    suitesuite that run all the suites
    transactiontests related to the chapter 17 of the Specs EJB2.0
    -
    dtdsA local copy of the dtds used in the deployment descriptors. - (Useful to be able to edit the DDs with emacs).
    tablesThe definition of a session bean used for creating and initializing - the database tables used by tests.
    templatesTemplates of a test suite.
    utilUtility classes.
    - -

    The stress test suite structure is slightly different, in fact simplified. -This documentation focuses on the conformance test suite, however, all tests -can be applied to the stress test suite.

    - -

    Building the suite

    - -

    Using ant

    - -

    This test has been designed to be compiled and run using Ant.
    -Ant must be installed (with the optional tasks package) and the environment -variables %ANT_HOME% or $ANT_HOME must be set.
    -$ANT_HOME/bin must have been added to the PATH -environment variable.
    -The xalan product must be installed, and the xalan.jar -must be present in $ANT_HOME/lib. (xalan is necessary for the -JUnitReport ant task).

    - -


    -The JUnit product must also be installed and the -junit.jar must be present in $ANT_HOME/lib.
    -For xalan and JUnit, you may also choose to update the file -$JONAS_ROOT/bin/unix/config_env (on Unix) or -%JONAS_ROOT%\bin\nt\config_env.bat (on Windows) by adding the path to -xalan.jar and junit.jar in the predefined classpath -used by JOnAS which is defined in this file.

    - -

    The main ant targets are the following :

    - - - - - - - - - - - - - - - - -
    cleanfor deleting all generated classes
    installfor installing ejbjars under $JONAS_ROOT/ejbjars This target should - be used to rebuild all the test suites.
    reportto run the all set and produce a report
    - -

    To build the jonas tests :

    -
      -
    1. Customize jonas-tests/build.properties according to your - environment.

      -
    2. -
    3. Go to the jonas-tests/ directory and type
      - ant install

      -
    4. -
    - -

    Running the suite

    - -

    Using Ant

    - -

    You can launch the complete JOnAS test suite via ant and -obtain a test suite report.

    - -

    You should use the CLASSPATH environment variable or modify the predefined -classpath used by JOnAS in the $JONAS_ROOT/bin/unix/config_env (on Unix) or -%JONAS_ROOT%\bin\nt\config_env.bat (on Windows) file, by adding the path to -jonas_tests/conformance/classes/$OBJECTWEB_ORB.

    -
      -
    1. Update the jonas.properties file according to your environment. -
      - Actually, the JOnAS suite needs only one datasource with jdbc_1 as - datasource.name.
      - The jms service must be set in jonas.services - property.
    2. -
    3. Run the JOnAS Server : jonas start
    4. -
    5. Once it is running you can launch the complete JOnAS test suite via the - report ant target.
    6. -
    7. A test suite report is generated under - jonas_tests/conformance/reports/html.
    8. -
    - -

    Using JDBC Resource Adapter

    - -

    To execute the JDBC Resouce Adapter tests, two datasources jdbc_xa1 -and jdbc_xa2 are required.

    -
      -
    1. Update the jonas.properties file according to your environment. -
      - Replace the dbm service with resource in - jonas.services property.
    2. -
    3. There are four JDBC Resource Adapters available:
      - Data Manager
      - Data Service
      - Connection Pool
      - XA Support
    4. -
    5. Configure the deployment descriptors to access the JDBC driver.
    6. -
    7. Reference the JOnAS documentation for configuration details.
    8. -
    -

    Running J2EE Connector Architecture 1.5 (JCA 1.5) tests

    - -

    To execute the jca 1.5 tests, a fictional Resource Adapter - is created when the jonas_test suite is built. Verify the following to assure proper setup of the test.

    -
      -
    1. Update the jonas.properties file according to your environment. - Include resource in the - jonas.services property. For example,
      jonas.services - registry,jmx,jtm,dbm,security,jms,resource,ejb2,web,ear
    2. -
    3. The deployed Ersatz (fictional) Resource Adapters are deployed - in the JONAS_BASE rar autoload area. -
      - eis/ErsatxEIS.rar
      - eis/ErsatzNolog.rar
      - eis/ErsatzSecurity.rar
      - eis/ErsatzLoTransaction.rar
      - eis/ErsatzXATransaction.rar
    4. -
    5. Add entries to the trace.properties files if traces are desired. The - entries should look like the following.
      - - # ------------------------------------------------
      - # logger definitions
      - # ------------------------------------------------
      - #logger.org.objectweb.jonas_tests.level DEBUG
      - logger.org.objectweb.jonas.jtests.j2eeca.level DEBUG
      - logger.ersatz.resourceadapter.level DEBUG
      - logger.fictional.resourceadapter.level DEBUG (for JCA 1.0 only) -
    6. -
    - -

    Using scripts

    - -

    It may be interesting to launch only one of the suites or only one -testcase of a test suite, particularly to debug a testcase that fails.

    - -

    To do this a script jonas_tests/junit.bat can be run. -Depending on the number of arguments, you will run:

    -
      -
    1. all the junit tests
    2. -
    3. all suites in a client directory
    4. -
    5. 1 named suite in a directory
    6. -
    7. 1 testcase in 1 particular suite in a directory
    8. -
    - -

    Windows Example:

    -
    junit conformance jca15
    -junit conformance jca15 F_connectorTest testConnectionBasics
    -    
    - -

    Update the junit.bat file according to your environment. Note the location - of TEST_CLASSES, PROJ_BASE and ANT_HOME. -

    -

    Naming conventions

    - -

    In order to have a homogeneous suite we have defined strict naming -conventions that should be followed. This makes it easier to understand a -test suite.

    - -

    The coding conventions are related to :

    -
      -
    • file names for the suite classes
    • -
    • interfaces, beans, deployment descriptor, ejb-jar names
    • -
    • ejb-name, jndi names, table names in DB, field names
    • -
    • etc.
    • -
    - -

    Rules for bean names in the tests

    -Beans must be put in a directory under -src/org/objectweb/jonas/jtests/beans. Each directory will produce a -jar file holding a set of beans that work together. Assuming we choose: - - - - - - - - - - - - -
    bdirdirectory for this bean
    bnamename of this bean
    -To avoid name conflicts in JNDI, the bdir/bname combination -must be unique in the junit suite . Other names can be deduced from these: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    optional remote interfacebname
    optional home interfacebnameHome
    optional local interfacebnameLocal
    optional local home interfacebnameLocalHome
    bean class implementationbnameXX
    optional primary key classbnamePK
    jar file namebname.jar
    ejb-name in ddbnameXX
    display-name in ddbdir/bnameXX
    JNDI name for homebdirbnameXXHome
    table name in DB (entity)bdirbnameXX
    field names (entity CMP)c_field
    - -

    XX must be one of the following values :

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    EBentity bean with bean managed persistence
    ECentity bean with container managed persistence(cmp version 1.x)
    EC2entity bean with container managed persistence(cmp version 2.x)
    SLsession bean stateless
    SFsession bean stateful
    SYsession bean stateful implementing Synchronization interface
    STsession bean stateful with bean managed transactions
    MDmessage driven bean
    - -

    Note : that these rules are inforced when using the Newbean -tool.

    - -

    Rules for files names for the client suites

    - -

    Each directory in src/org/objectweb/jonas/jtests/clients holds a -set of test suites relative to a common topic (entity, session, transaction, -etc...). To improve the readability of these files and to know which suite -can be run with which testcase, we have enforced the following naming -conventions :

    - - - - - - - - - - - - - - - - -
    A_name.javaAbstract class holding test cases shared by several suites. These - files cannot be run as a test suite since they do not have a - main.
    C_name.javaComposite suites that link several Suites together. They can be run - separately, but not with only 1 testcase. Their main routine should - be very simple, only 1 line.
    F_name.javaFinal suites that can be run separately or with only 1 testcase. - They must have a main routine with a -n arg to be able to be - run with a specified test case.
    - -

    How to contribute?

    - -

    Coding conventions

    - -

    Coding conventions are the same for jonas or for jonas_tests. They must -follow -Code Conventions for the JavaTM Programming Language

    - -

    Methodology for writing new tests

    -
      -
    • Each testcase must be independent of the others. It is possible to run - each testcase more than once without problems. This implies that - everything is clean after the test, for example, a testcase creating an - instance should remove it before returning.
    • -
    • Beans and clients are in different packages. All beans should be under - beans directory, all clients (tests) should be in clients - directory. A useBean() method must be used in the client to ask - the EJBServer to load a bean, if it is not already loaded.
    • -
    • When loading entity beans the first time in the server, tables in - database are dropped and created. This is to avoid problems due to - previous run of tests. This is done by setting a boolean in - useBean.
    • -
    • Each testcase name must begin by the String test. Inside the - tests method, there is no need to try/catch unexpected exceptions. Only - catch exceptions that are expected.
    • -
    - -

    Creating a new suite

    -
      -
    • You must first decide which directory your Suite should be in. A - limited number of directories has been defined in clients. See Structure of source code. You should not need to - add new directories since all needed directories have already been - defined.
    • -
    • An example of Suites can be found in - src/org/objectweb/jonas/jtests/templates
    • -
    • Examples of more sophisticated suites can be found in - src/org/objectweb/jonas/jtests/clients/entity
    • -
    - -

    Adding test cases to an existing suite

    - -

    Adding a new test case is pretty straightforward. Have a look at the tests -already written then mimic them. In most cases you will not have to catch -exceptions. So the tests look very simple. You can refer to the junit primer -for more details.

    - -

    Submitting a contribution to jonas team

    - -

    Follow the same rules as for contributing to jonas.

    - -

    Current conformance test results

    -You can find conformance test results for the most recent JOnAS builds on the -Objectweb website at http://jonas.objectweb.org/tests.html. -The suite results are organized by configuration. Each configuration is -identified as follows: - -

    ORB/Operating System/DataSource/JDK version/JOnAS build

    - -

    e.g. RMI / Solaris / Oracle / JDK1.3/JOnAS-Tomcat

    - - diff --git a/jonas_tests/etc/style/standalone_perfs/compare.xsl b/jonas_tests/etc/style/standalone_perfs/compare.xsl deleted file mode 100644 index 539b67712bd1e923617ae5d0c0b8a0ebb4614aa5..0000000000000000000000000000000000000000 --- a/jonas_tests/etc/style/standalone_perfs/compare.xsl +++ /dev/null @@ -1,559 +0,0 @@ - - - - - - - - - - Test Results - - - - - - - - - - - -
    - - -
    - - - -
    - - - - - - -
    - - - - - - - - - -

    Environment

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    JOnAS Version
    Packaging
    Version JDK
    Version ANT
    DataSource
    System
    Arch
    Version
    Host
    Author
    Date
    - -
    - - - - - - - - - -

    Packages

    - Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - -
    -
    - - - - - - - - - - - - -

    Package

    - - - - - - -
    - Back to top -

    -

    - - - - - - - - -

    TestCase

    - - - - - - - - - - -
    -

    - - Back to top - - - - -

    Summary

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    TestsSuccess rateTime jrmpTime iiop
    - - - - - - - - - - - - - -
    -
    - - - - -

    -
    - - - - Name - Tests - Time(s) jrmp - Time(s) iiop - Time(s) jeremie - - - - - - - Name - Tests - Time(s) jrmp - Time(s) iiop - Time(s) jeremie - - - - - - - Name - - Time(s) jrmp - Time(s) iiop - Time(s) jeremie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - diff --git a/jonas_tests/etc/suiteslist.html b/jonas_tests/etc/suiteslist.html deleted file mode 100644 index 9bf624aea555a0c4c94e362b8ea4b8da8d4430d6..0000000000000000000000000000000000000000 --- a/jonas_tests/etc/suiteslist.html +++ /dev/null @@ -1,18 +0,0 @@ -

    All Suites

    - - - - - - - - - - - - - - - - -
    Name
    JOnAS Junit Test Suite - conformance
    JOnAS Junit Test Suite - examples
    JOnAS Junit Test Suite - webservices
    diff --git a/jonas_tests/examples/base/.gitignore b/jonas_tests/examples/base/.gitignore deleted file mode 100644 index 4262a4664d69d75f46b8085201219dca666dfbdb..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -output/ -build/ - diff --git a/jonas_tests/examples/base/examples/README b/jonas_tests/examples/base/examples/README deleted file mode 100644 index c0a33394c1db9ad5daeb8a98244a71d503768f94..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/README +++ /dev/null @@ -1,48 +0,0 @@ -Copyright (C) BULL S.A. 1998-2002. - - -There are 4 kind of examples: - - - examples with enterprise java beans accessed from a simple client which - is a java program, (these examples are all on examples/src); - - - examples with enterprise java beans accessed from a servlet - or JSP and packaged in .ear file: - examples/earsample, examples/cmp2, examples/alarm. - - - examples of AXIS use in JOnAS : examples/webservices - - - 1 example of JOnAS application generation via xdoclet. - -There is also the well-known Java Pet Store application. (petstore1.3) - -Before compiling and running these examples, the installation and configuration -of JOnAS have to be done: - - - initialization of the JONAS_ROOT environment variable, - - optionally, initialization of the JONAS_BASE environment variable, - - update of your PATH, - - update of the JOnAS config_env script, - - configuration of JNDI environment via the carol.properties file - - configuration of the database access: - - update of the JOnAS config_env script, - - configuration of JOnAS environment via the jonas.properties file, - - update of the .properties file. - - configuration of Tomcat for JOnAS. - -Refer to install documentation for more information. - - - -Compiling these examples: ------------------------- - Use the Ant 1.5 build tool in one of the directories where there is a build.xml file. - - You may have to modify $JONAS_ROOT/examples/build.properties - - The default "install" target allows to build the examples and copy the built ejb-jar - file in your JOnAS_BASE/ejbjars directory. - - Example: - export JONAS_ROOT= - cd $JONAS_ROOT/examples; ant install diff --git a/jonas_tests/examples/base/examples/alarm/README b/jonas_tests/examples/base/examples/alarm/README deleted file mode 100644 index c526e47a8a378c826574615417132020d320cfef..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/README +++ /dev/null @@ -1,78 +0,0 @@ -Application Overview: --------------------- -This application watch alarm messages generated asynchronously via -JMS. It involves the different technics used in JOnAS: -- Entity Bean for AlarmRecord, persistent in a DataBase -- Session Bean to allow clients to visualize alarm received -- Message Driven Bean to catch Alarms -- JMS to use a topic where Alarms are sent and received -- a service included in EJBServer (AlarmManager) -- tomcat or jetty (for JSP pages and servlets) -- security -Alarm messages are formed of (severity 1-3, from, reason). - -Directory structure: --------------------- -etc/web.xml application description -web/ JSPs, images, html files. -beans/ beans and service, to be loaded in JOnAS. -client/ client java program generating alarms and using JMS. - this alarm generator is obsolete. - -Compiling this test: -------------------- - -Use the Ant 1.5 build tool: - ant install - - -Running this test: ------------------ -Prerequisite: - - You must have installed Tomcat4.1.x or Jetty 4.2.x - - You must have configured a Database. - The jndi name used in the bean is jdbc_1. - See $JONAS_ROOT/doc/GettingStarted.html for more information. - - -1) run JOnAS server - The jonas.properties file must specify the following services : - - web service, jms service, ear service - You also have to add the alarm.ear component in the list of jonas.service.ear.descriptors. - - Note that the AlarmTopic that will be used by this test will be automatically created - when the message driven bean will be loaded in the container. - jonas start - -2) Load the alarm.ear if you have not added it in the ear service descriptors list - jonas admin -a alarm.ear - -3) Generate alarms - The easiest way is to use the link on the first html page that will run - a servlet that will generate customized alarms. - -4) Look at http://$HOSTNAME:/alarm/index.html - to start using the web application. - -5) Stop the jonas server - jonas stop - -Known bugs or Limitations: --------------------------- -1. -Sending many alarm messages concurrently with InstantDB as database will -not work (deadlock leading to transaction timeout, and delay on servlet -display) This can occur with every database that cannot handle multithreading -properly. - -2. -The display pages are not automatically refreshed when a new alarm is -arrived. To be done in a future version. - -3. -Filter names cannot contain "space" characters. - -4. -The first time you run this application, the table will be created in the -database. An error message will be printed by JOnAS because it tries -to drop the table, but it does not exist. Ignore it. diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmData.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmData.java deleted file mode 100644 index aa6570b2890ac2c77b879c00003e46589d62a4b2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmData.java +++ /dev/null @@ -1,157 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import java.io.Serializable; - -/** - * - * @author Florent Benoit - */ -/** - * Data associated with an AlarmRecord. This is what will be passed to servlets - * to be displayed. - */ -public class AlarmData implements Serializable { - - /** - * AlarmRecord number (=pk) - */ - private int num; - - /** - * Severity Level - */ - private int sev; - - /** - * Device that generated Alarm - */ - private String device; - - /** - * Alarm Message - */ - private String message; - - /** - * Count of received messages - */ - private int count; - - /** - * State (1=received, 2=processed, 3=deleted) - */ - private int state; - - /** - * Date of first message - */ - private java.sql.Date date; - - /** - * @param n AlarmRecord number - * @param s Severity Level - * @param dev Device that generated Alarm - * @param m Alarm Message - * @param d Date of first message - */ - public AlarmData(int n, int s, String dev, String m, java.sql.Date d) { - num = n; - sev = s; - device = dev; - message = m; - count = 1; - state = 1; - date = d; - } - - /** - * @return the alarm record number - */ - public int getNum() { - return num; - } - - /** - * @return Severity Level - */ - public int getSev() { - return sev; - } - - /** - * @return the device - */ - public String getDevice() { - return device; - } - - /** - * @return the alarm message - */ - public String getMessage() { - return message; - } - - /** - * @return nb of messages received - */ - public int getCount() { - return count; - } - - /** - * Set the nb of messages received - * @param c Count of received messages - */ - public void setCount(int c) { - count = c; - } - - /** - * @return the state - */ - public int getState() { - return state; - } - - /** - * Set the current state - * @param s State (1=received, 2=processed, 3=deleted) - */ - public void setState(int s) { - state = s; - } - - /** - * @return Date of first message - */ - public java.util.Date getDate() { - return date; - } -} diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmListenerBean.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmListenerBean.java deleted file mode 100644 index 0d7739ba76089d6a8a0bbc2bd4e914d13a58a4ea..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmListenerBean.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import javax.ejb.EJBException; -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageListener; - -/** - * - */ -public class AlarmListenerBean implements MessageDrivenBean, MessageListener { - - /** - * Reference to the alarm manager - */ - private static transient AlarmManager alarmManager = null; - - /** - * Default constructor - */ - public AlarmListenerBean() { - } - - /** - * Set the associated context. The container call this method after the - * instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param ctx A MessageDrivenContext interface for the - * instance. - */ - - public void setMessageDrivenContext(MessageDrivenContext ctx) { - } - - /** - * A container invokes this method before it ends the life of the - * message-driven object. This happens when a container decides to terminate - * the message-driven object. This method is called with no transaction - * context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() throws EJBException { - } - - /** - * The Message driven bean must define an ejbCreate methods with no args. We - * can do here all operations that will be common to all messages, i.e. - * asking JNDI for bean homes, ... - */ - public void ejbCreate() { - // Get a reference on the AlarmManager. - alarmManager = AlarmManager.getInstance(); - - } - - /** - * Called when there is a messgae - * @param message the message - * @see javax.jms.MessageListener#onMessage(javax.jms.Message) - */ - public void onMessage(Message message) { - - int sev = 0; - String from = null; - String reason = null; - - // Decode the message (MapMessage) - MapMessage msg = (MapMessage) message; - try { - sev = msg.getInt("Severity"); - from = msg.getString("From"); - reason = msg.getString("Reason"); - } catch (JMSException e) { - Debug.logError("AlarmListenerBean exception:" + e); - } - // Give all messages to the AlarmServiceHelper. - alarmManager.alarm(sev, from, reason); - - } -} diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmManager.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmManager.java deleted file mode 100644 index 7a896345f402530928658a950f4629ca1240f0cb..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmManager.java +++ /dev/null @@ -1,281 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import java.rmi.RemoteException; -import java.util.Iterator; -import java.util.LinkedList; - -import javax.ejb.CreateException; -import javax.ejb.FinderException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -/** - * AlarmManager implementation. - */ -public class AlarmManager { - - /** - * Unique instance of this class - */ - private static AlarmManager unique = null; - - /** - * Initial context - */ - private Context ictx = null; - - /** - * Home the bean AlarmRecord - */ - private AlarmRecordHome arh = null; - - /** - * Bean alarm Record - */ - private AlarmRecord arcount = null; - - /** - * List of profiles - */ - private LinkedList profilList = new LinkedList(); - - /** - * Default constructor - */ - private AlarmManager() { - Debug.log("AlarmManager - creating"); - - // Get a ref on AlarmRecordHome - try { - ictx = new InitialContext(); - arh = (AlarmRecordHome) PortableRemoteObject.narrow(ictx.lookup("alarmrecord"), AlarmRecordHome.class); - } catch (NamingException e) { - Debug.logError("AlarmManager : Cannot get AlarmRecordHome:" + e); - } - - // Get number of alarms still in database - // Create AlarmTable if does not exist - int trycount = 0; - while (arcount == null) { - try { - arcount = arh.findByPrimaryKey("0"); - int alarmid = arcount.getAlarmCount(); - Debug.log("AlarmManager: " + alarmid + " alarm records"); - } catch (Exception e) { - if (trycount > 0) { - Debug.logError("AlarmManager - bad start"); - return; - } - Debug.log("AlarmTable does not exist: create it"); - try { - arh.create(); - } catch (Exception f) { - Debug.logError("AlarmManager: Cannot init database:" + e); - } - trycount++; - } - } - - // Create a set of default profils - newProfil("all", "A"); - - Debug.log("AlarmManager - created"); - } - - /** - * @return unique instance of this class - */ - public static AlarmManager getInstance() { - if (unique == null) { - unique = new AlarmManager(); - } - return unique; - } - - /** - * * a new Alarm is arrived must be synchronized to make sure we do not - * create several AlarmRecord for the same Alarm (in case of many identical - * Alarm arriving at the same time) - * @param severity the level of severity - * @param from the device name - * @param reason the reason of the alarm - */ - public synchronized void alarm(int severity, String from, String reason) { - Debug.log("AlarmManager new Alarm from " + from + ": " + reason); - - // Search if alarm already known - // Key information is made of "from"+"reason" - AlarmRecord arec = null; - try { - arec = arh.findAlarm(from, reason); - } catch (FinderException e) { - Debug.logError("AlarmManager: " + e); - } catch (RemoteException e) { - Debug.logError("AlarmManager: " + e); - } - - if (arec == null) { - // If New Alarm: Create the AlarmRecord - Debug.log("new AlarmRecord"); - AlarmData ad = null; - try { - // Allocate a unique ident - int alarmid = arcount.getNewIdent(); - java.util.Date now = new java.util.Date(); - ad = new AlarmData(alarmid, severity, from, reason, new java.sql.Date(now.getTime())); - arec = arh.create(ad); - } catch (CreateException e) { - Debug.logError("AlarmManager: " + e); - } catch (RemoteException e) { - Debug.logError("AlarmManager: " + e); - } - // Notice profiles interested - Iterator i = profilList.iterator(); - while (i.hasNext()) { - Profil prof = (Profil) i.next(); - if (prof.interestedBy(ad)) { - prof.noticeAlarm(arec); - } - } - } else { - // Old Alarm -> just increment count. - Debug.log("AlarmRecord already known"); - try { - arec.update(severity); - } catch (RemoteException e) { - Debug.logError("AlarmManager: " + e); - } - } - - } - - /** - * Mark an AlarmRecord as processed. We don't remove it now to keep it in - * history. - * @param pk the primary key - * @throws RemoteException as it is remote it can fails - */ - public void forgetAlarm(String pk) throws RemoteException { - Debug.log("entering for " + pk); - - // Find this Alarm by its PK - AlarmRecord arec = null; - try { - arec = arh.findByPrimaryKey(pk); - } catch (FinderException e) { - Debug.logError("AlarmManager Alarm not found"); - throw new RemoteException("Alarm not found"); - } catch (RemoteException e) { - Debug.logError("AlarmManager: " + e); - throw e; - } - - // Change Alarm state - try { - arec.setProcessed(); - } catch (RemoteException e) { - Debug.logError("AlarmManager: " + e); - throw e; - } - } - - /** - * Makes a new Profil - * @param from the device name - * @param maxsev the maximum level of severity - * @return the new profile created - */ - public Profil newProfil(String from, String maxsev) { - Debug.log("entering for " + from + "/" + maxsev); - - // Check if already exist - Iterator i = profilList.iterator(); - while (i.hasNext()) { - Profil prof = (Profil) i.next(); - if (prof.getDevice().equals(from) && prof.getSeverity().equals(maxsev)) { - return null; - } - } - - Profil p = new Profil(from, maxsev, arh); - profilList.add(p); - return p; - } - - /** - * @return the list of available profils - */ - public String[] getProfilNames() { - Debug.log("entering"); - LinkedList nlist = new LinkedList(); - Iterator i = profilList.iterator(); - while (i.hasNext()) { - Profil prof = (Profil) i.next(); - nlist.add(prof.getName()); - } - return (String[]) nlist.toArray(new String[0]); - } - - /** - * @param name of the profile to remove - * @return a reference on Profil object, given its name. - */ - public Profil getProfil(String name) { - Debug.log("entering for " + name); - Profil ret = null; - Iterator i = profilList.iterator(); - while (i.hasNext()) { - Profil prof = (Profil) i.next(); - if (prof.getName().equals(name)) { - ret = prof; - } - } - return ret; - } - - /** - * remove a Profil - * @param name the name of the profile to remove - * @return true if the profile was removed - */ - public boolean delProfil(String name) { - Debug.log("entering for " + name); - Iterator i = profilList.iterator(); - while (i.hasNext()) { - Profil prof = (Profil) i.next(); - if (prof.getName().equals(name)) { - i.remove(); - return true; - } - } - return false; - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecord.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecord.java deleted file mode 100644 index de07d67808e91f0bf6de48fac4424da5adceb6d3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecord.java +++ /dev/null @@ -1,90 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -/** - * AlarmRecord remote interface - */ -public interface AlarmRecord extends EJBObject { - - /** - * Update the record - * @param s severity level - * @throws RemoteException if remote call failed - */ - void update(int s) throws RemoteException; - - /** - * @throws RemoteException if remote call failed - */ - void forget() throws RemoteException; - - /** - * @throws RemoteException if remote call failed - */ - void setProcessed() throws RemoteException; - - /** - * @return the sender - * @throws RemoteException if remote call failed - */ - String getFrom() throws RemoteException; - - /** - * @return the severity level - * @throws RemoteException if remote call failed - */ - int getSeverity() throws RemoteException; - - /** - * @return the number of messages - * @throws RemoteException if remote call failed - */ - int getCount() throws RemoteException; - - /** - * @return number of alarms - * @throws RemoteException if remote call failed - */ - int getAlarmCount() throws RemoteException; - - /** - * @return the new ident - * @throws RemoteException if remote call failed - */ - int getNewIdent() throws RemoteException; - - /** - * @return the data - * @throws RemoteException if remote call failed - */ - AlarmData getAlarmData() throws RemoteException; -} diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordBean.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordBean.java deleted file mode 100644 index 50b5913690f8a62a0089e632e6c63a69896945d7..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordBean.java +++ /dev/null @@ -1,316 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.Date; -import java.sql.SQLException; -import java.sql.Statement; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; -import javax.naming.InitialContext; -import javax.sql.DataSource; - -/** - * - */ -public class AlarmRecordBean implements EntityBean { - - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // State of the bean. - // They must be public for Container Managed Persistance. - // ------------------------------------------------------------------ - public String pk; - - public int sev; - - public String from; - - public String reason; - - public int count; - - public int state; - - public Date date; - - // ------------------------------------------------------------------ - // init DataBase - // ------------------------------------------------------------------ - private void initDB() { - - // Get my DataSource from JNDI - DataSource ds = null; - InitialContext ictx = null; - try { - ictx = new InitialContext(); - } catch (Exception e) { - throw new EJBException("Cannot get JNDI InitialContext"); - } - try { - ds = (DataSource) ictx.lookup("java:comp/env/jdbc/myDS"); - } catch (Exception e) { - throw new EJBException("cannot lookup datasource"); - } - - // Drop table - Connection conn = null; - Statement stmt = null; - String myTable = "AlarmTable"; - try { - conn = ds.getConnection(); - stmt = conn.createStatement(); - stmt.execute("drop table " + myTable); - stmt.close(); - } catch (SQLException e) { - // The first time, table will not exist. - } - - // Create table. - try { - stmt = conn.createStatement(); - stmt - .execute("create table " - + myTable - + "(dbpk varchar(12) not null primary key, dbsev integer, dbfrom varchar(12), dbreason varchar(30), dbcount integer, dbstate integer, dbdate date)"); - stmt.close(); - conn.close(); - } catch (SQLException e) { - throw new EJBException("Exception in createTable"); - } - } - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. The container invokes this method on - * an instance after the instance has been created. This method is called in - * an unspecified transaction context. - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setEntityContext(EntityContext ctx) { - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. This is the last method that the container - * invokes on the instance. The Java garbage collector will eventually - * invoke the finalize() method on the instance. This method is called in an - * unspecified transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void unsetEntityContext() { - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object that is - * currently associated with the instance. This method is invoked when a - * client invokes a remove operation on the enterprise Bean's home interface - * or the EJB object's remote interface. This method transitions the - * instance from the ready state to the pool of available instances. This - * method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of - * the object. - * @throws EJBException - Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbRemove() throws RemoveException { - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. This method - * always executes in the proper transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. This method always - * executes in the proper transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(AlarmData ad) throws CreateException { - } - - public void ejbPostCreate() throws CreateException { - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public String ejbCreate(AlarmData ad) throws CreateException, DuplicateKeyException { - - // Init here the bean fields - Integer i = new Integer(ad.getNum()); - pk = i.toString(); - sev = ad.getSev(); - from = ad.getDevice(); - reason = ad.getMessage(); - count = 1; - state = 1; - date = (java.sql.Date) ad.getDate(); - - // In CMP, should return null. - return null; - } - - public String ejbCreate() throws CreateException, DuplicateKeyException { - - // init database - initDB(); - - // init bean fields - pk = "0"; - sev = 99; // avoids taking this as a true AlarmRecord. - from = "init"; - reason = "init"; - count = 0; - state = 0; - date = null; - - // In CMP, should return null. - return null; - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - } - - /** - * A container invokes this method when the instance is taken out of the - * pool of available instances to become associated with a specific EJB - * object. - */ - public void ejbActivate() { - } - - // ------------------------------------------------------------------ - // AlarmRecord implementation - // ------------------------------------------------------------------ - - /** - * - */ - public void update(int s) { - count++; - if (s < sev) { - sev = s; - } - java.util.Date now = new java.util.Date(); - date = new java.sql.Date(now.getTime()); - } - - /** - * forget - */ - public void forget() { - state = 3; - } - - /** - * setProcessed - */ - public void setProcessed() { - state = 2; - } - - public String getFrom() { - return from; - } - - public int getSeverity() { - return sev; - } - - public int getCount() { - return count; - } - - /** - * Get the number of alarms in database only valid for special "0" element. - */ - public int getAlarmCount() throws RemoteException { - if (!pk.equals("0")) { - throw new RemoteException("pk should be 0"); - } - return count; - } - - /** - * Get a new Ident only valid for special "0" element. - */ - public int getNewIdent() throws RemoteException { - if (!pk.equals("0")) { - throw new RemoteException("pk should be 0"); - } - return ++count; - } - - /** - * Returns the AlarmData for that instance - */ - public AlarmData getAlarmData() throws RemoteException { - Integer id = new Integer(pk); - AlarmData ret = new AlarmData(id.intValue(), sev, from, reason, date); - ret.setCount(count); - ret.setState(state); - return ret; - } -} diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordHome.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordHome.java deleted file mode 100644 index 67c3373464ed7d12b0a7fdf01655d6f6fa7a68eb..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/AlarmRecordHome.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import java.rmi.RemoteException; -import java.util.Collection; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; -import javax.ejb.FinderException; - -/** - * Home interface for the bean AlarmRecord - */ -public interface AlarmRecordHome extends EJBHome { - - /** - * @return - * @throws CreateException - * @throws RemoteException - */ - AlarmRecord create() throws CreateException, RemoteException; - - /** - * @param ad - * @return - * @throws CreateException - * @throws RemoteException - */ - AlarmRecord create(AlarmData ad) throws CreateException, RemoteException; - - /** - * @param pk - * @return - * @throws FinderException - * @throws RemoteException - */ - AlarmRecord findByPrimaryKey(String pk) throws FinderException, RemoteException; - - /** - * @param from - * @param mess - * @return - * @throws FinderException - * @throws RemoteException - */ - AlarmRecord findAlarm(String from, String mess) throws FinderException, RemoteException; - - /** - * @return - * @throws FinderException - * @throws RemoteException - */ - Collection findAll() throws FinderException, RemoteException; - - /** - * @param from - * @param sev - * @return - * @throws FinderException - * @throws RemoteException - */ - Collection findByInterest(String from, int sev) throws FinderException, RemoteException; - - /** - * @param sev - * @return - * @throws FinderException - * @throws RemoteException - */ - Collection findBySeverity(int sev) throws FinderException, RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/Debug.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/Debug.java deleted file mode 100644 index fe00843cfbb7ce10492bc5f43df23066c15d2a0a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/Debug.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -/** - * Provide a ligth Debug. - */ -public class Debug { - - /** - * No public constructor (Utility class) - */ - private Debug() { - - } - - /** - * True if only if use the debug. - */ - private static boolean debug = false; - - /** - * Log some debugging info, if debug is true. - * @param msg the message to log. - */ - public static void log(String msg) { - if (debug) { - System.out.println(msg); - } - } - - /** - * Log some errors. - * @param msg the error message to log. - */ - public static void logError(String msg) { - System.err.println(msg); - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/Profil.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/Profil.java deleted file mode 100644 index fcad1e137df3f377d4e2c147886d5cc38eeee837..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/Profil.java +++ /dev/null @@ -1,206 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedList; - -import javax.ejb.FinderException; -import javax.rmi.PortableRemoteObject; - - -/** - * Helper class Profil Profils are managed by AlarmManager and used by View - * session beans We do not use an Entity because we need neither persistence nor - * remote accesses. We cannot use a Session bean because it's accessed from - * several clients, and from the AlarmManager. - */ -public class Profil { - - /** - * Device name or "all" - */ - private String device; - - /** - * max severity level - */ - private int maxsev; // - - /** - * Name - */ - private String name; - - /** - * Is the device is all ? - */ - private boolean fromAll; - - /** - * Home of the bean AlarmRecord - */ - private AlarmRecordHome arh; - - /** - * A list of AlarmRecord objects - */ - private LinkedList alarmList = new LinkedList(); - - /** - * constructor - * @param device the device name - * @param sev the severity level - * @param arh the home of the eban - */ - - public Profil(String device, String sev, AlarmRecordHome arh) { - - // init object - this.device = device; - this.arh = arh; - fromAll = device.equals("all"); - if (sev.startsWith("S")) { - maxsev = 1; - sev = "S"; - } else if (sev.startsWith("W")) { - maxsev = 2; - sev = "W"; - } else { - maxsev = 3; - sev = "I"; - } - name = device + "-" + sev; - - // find alarms already arrived and matching this Profil - Collection knal = null; - try { - if (fromAll) { - knal = arh.findBySeverity(maxsev); - } else { - knal = arh.findByInterest(device, maxsev); - } - alarmList.addAll(knal); - } catch (FinderException e) { - System.out.println("Profil constructor: No Alarm found"); - } catch (RemoteException e) { - System.out.println("Error getting AlarmRecords:" + e); - } - } - - /** - * @return the device - */ - public String getDevice() { - return device; - } - - /** - * @return the severity watched - */ - public String getSeverity() { - switch (maxsev) { - case 1: - return "S"; - case 2: - return "W"; - case 3: - return "I"; - default: - return "A"; - } - } - - /** - * @return the profil name - */ - public String getName() { - return name; - } - - /** - * get Alarms for this Profil. - * @param all true if get all alarms, false if get only new alarms - * @return Alarms for this Profil. - */ - public synchronized Collection getAlarms(boolean all) { - LinkedList ret = new LinkedList(); - Iterator it = alarmList.iterator(); - while (it.hasNext()) { - AlarmRecord arec = (AlarmRecord) PortableRemoteObject.narrow(it.next(), AlarmRecord.class); - AlarmData ad = null; - try { - ad = arec.getAlarmData(); - if (all || (ad.getState() == 1)) { - ret.add(ad); - } - } catch (RemoteException e) { - System.out.println("Error getting AlarmRecord:" + e); - } - } - return ret; - } - - /** - * Gets current Alarm level - * @return current Alarm level - */ - public synchronized int getCurrentLevel() { - int ret = 1000; - Iterator it = alarmList.iterator(); - while (it.hasNext()) { - AlarmRecord arec = (AlarmRecord) PortableRemoteObject.narrow(it.next(), AlarmRecord.class); - try { - AlarmData ad = arec.getAlarmData(); - if (ad.getState() == 1 && ad.getSev() <= ret) { - ret = ad.getSev(); - } - } catch (RemoteException e) { - System.out.println("Error getting AlarmRecord:" + e); - } - } - return ret; - } - - /** - * @param ad alarm data object - * @return true if this Profil is interested by this AlarmRecord. - */ - public boolean interestedBy(AlarmData ad) { - return ((fromAll || ad.getDevice().equals(device)) && ad.getSev() <= maxsev); - } - - /** - * add an Alarm Record to this Profil. - * @param arec the record - */ - public synchronized void noticeAlarm(AlarmRecord arec) { - alarmList.add(arec); - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/View.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/View.java deleted file mode 100644 index bb718dadbd2d774d12b00f1b9c87cfdba28ea6e3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/View.java +++ /dev/null @@ -1,88 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -/** - * View remote interface - */ -public interface View extends EJBObject { - - /** - * @return - * @throws RemoteException - */ - AlarmData[] getAllAlarms() throws RemoteException; - - /** - * @return - * @throws RemoteException - */ - AlarmData[] getNewAlarms() throws RemoteException; - - /** - * @return - * @throws RemoteException - */ - String[] getProfils() throws RemoteException; - - /** - * @param name - * @throws RemoteException - */ - void setProfil(String name) throws RemoteException; - - /** - * @param name - * @return - * @throws RemoteException - */ - int alarmLevel(String name) throws RemoteException; - - /** - * @param pk - * @throws RemoteException - */ - void forgetAlarm(String pk) throws RemoteException; - - /** - * @param device - * @param level - * @return - * @throws RemoteException - */ - String newProfil(String device, String level) throws RemoteException; - - /** - * @param name - * @throws RemoteException - */ - void removeProfil(String name) throws RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/ViewBean.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/ViewBean.java deleted file mode 100644 index b0af3635b524c1d7d478bad051b947c0bf871dcd..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/ViewBean.java +++ /dev/null @@ -1,198 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import java.rmi.RemoteException; -import java.util.Collection; - -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -/** - * Session bean View. Does not implement SessionSynchronization. We assume that - * this bean and AlarmManager run in the same JVM. Each Session bean is - * dedicated to 1 client: Here, the ViewProxy class. Each Session may be - * connected to 1 Profil or not. - */ -public class ViewBean implements SessionBean { - - /** - * Reference to the alarm manager - */ - private static transient AlarmManager alarmManager = null; - - /** - * Profil reference - */ - private Profil prof = null; - - /** - * Set the context for this bean - * @param ctx the context - * @see javax.ejb.SessionBean#setSessionContext(javax.ejb.SessionContext) - */ - public void setSessionContext(SessionContext ctx) { - - } - - /** - * Remove - * @see javax.ejb.SessionBean#ejbRemove() - */ - public void ejbRemove() { - } - - /** - * The Session bean must define 1 or more ejbCreate methods. - */ - public void ejbCreate() { - // Get a reference on the AlarmManager. - alarmManager = AlarmManager.getInstance(); - } - - /** - * Passivate - * @see javax.ejb.SessionBean#ejbPassivate() - */ - public void ejbPassivate() { - } - - /** - * Activate - * @see javax.ejb.SessionBean#ejbActivate() - */ - public void ejbActivate() { - } - - /** - * @return all messages for the current profil - * @throws RemoteException if remote call failed - */ - public AlarmData[] getAllAlarms() throws RemoteException { - if (prof == null) { - throw new RemoteException("No Profil defined for this session"); - } - Collection alist = prof.getAlarms(true); - return (AlarmData[]) alist.toArray(new AlarmData[0]); - } - - /** - * @return new messages for the current profil - * @throws RemoteException if remote call failed - */ - public AlarmData[] getNewAlarms() throws RemoteException { - if (prof == null) { - throw new RemoteException("No Profil defined for this session"); - } - Collection alist = prof.getAlarms(false); - return (AlarmData[]) alist.toArray(new AlarmData[0]); - } - - /** - * @return an enumeration of all available profils - */ - public String[] getProfils() { - return alarmManager.getProfilNames(); - } - - /** - * Chooses to work on a particular profil. - * @param name of the profil - * @throws RemoteException if remote call failed - */ - public void setProfil(String name) throws RemoteException { - if (name == null) { - prof = null; - return; - } - prof = alarmManager.getProfil(name); - if (prof == null) { - throw new RemoteException("This Profil does not exist yet: " + name); - } - } - - /** - * @return the Alarm Level for Profil specified - * @param name of the profil - * @throws RemoteException if remote call failed - */ - public int alarmLevel(String name) throws RemoteException { - Profil prof = alarmManager.getProfil(name); - if (prof == null) { - throw new RemoteException("This Profil does not exist yet: " + name); - } - return prof.getCurrentLevel(); - } - - /** - * Forget this message because problem has been taken into account. - * @param pk primary key - * @throws RemoteException if remote call failed - */ - public void forgetAlarm(String pk) throws RemoteException { - alarmManager.forgetAlarm(pk); - } - - /** - * creates a new Profil - * @param device the name of the device - * @param level the severity level - * @return the newly created profil - * @throws RemoteException if remote call failed - */ - public String newProfil(String device, String level) throws RemoteException { - - // Check arg validity - if (device.length() == 0) { - throw new RemoteException("null device string"); - } - if (!level.startsWith("S") && !level.startsWith("W") && !level.startsWith("I")) { - throw new RemoteException("severity must be one of S|W|I"); - } - - prof = alarmManager.newProfil(device, level); - if (prof == null) { - return null; - } - return prof.getName(); - } - - /** - * remove a Profil - * @param name the name of the profil - * @throws RemoteException if remote call failed - */ - public void removeProfil(String name) throws RemoteException { - if (name == null) { - return; - } - boolean ok = alarmManager.delProfil(name); - if (!ok) { - throw new RemoteException("This Profil does not exist yet: " + name); - } - } -} diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/ViewHome.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/ViewHome.java deleted file mode 100644 index cc9084256f9e4a8dd7fcf4cd27b0ac72b738c8a7..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/ViewHome.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - - -package org.objectweb.alarm.beans; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * Home interface for the bean View - */ -public interface ViewHome extends EJBHome { - - /** - * @return the bean created - * @throws CreateException if the bean can't be created - * @throws RemoteException if remote call failed - */ - View create() throws CreateException, RemoteException; -} diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/ViewProxy.java b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/ViewProxy.java deleted file mode 100644 index 1970921af4dc6cbb6011619a7e7a07eadeca5452..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/ViewProxy.java +++ /dev/null @@ -1,240 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: JOnAS Team - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.alarm.beans; - -import java.rmi.RemoteException; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -/** - * proxy used to access the "View" session bean. must be instantiated by JSP's - * with a tag like this: - */ -public class ViewProxy { - -/** - * Initial context - */ - private Context ictx = null; - - /** - * Home of the bean View - */ - private ViewHome vh = null; - - /** - * Bean View - */ - private View ejbview = null; - - /** - * Name of my profil - */ - private String myprofil = null; - - /** - * Error message - */ - private String errorMessage = null; - - private View getEjbView() { - if (ejbview == null) { - // Create the Session Bean - try { - ejbview = vh.create(); - } catch (Exception e) { - errorMessage = "ViewProxy : Cannot create EJB:" + e.toString(); - } - } - return ejbview; - } - - /** - * Init procedure - * Gets the bean and create one - */ - private void init() { - // Get the ViewHome - try { - ictx = new InitialContext(); - vh = (ViewHome) PortableRemoteObject.narrow(ictx.lookup("viewhome"), ViewHome.class); - } catch (NamingException e) { - errorMessage = "ViewProxy : Cannot get ViewHome:" + e.toString(); - return; - } - getEjbView(); - } - - /** - * constructor: Create here the EJB session. - */ - public ViewProxy() { - init(); - } - - /** - * @return RO attribute: Get all Profils already created by Alarm Manager. - */ - public String[] getProfils() { - String[] ret = new String[0]; - try { - ret = getEjbView().getProfils(); - errorMessage = null; - } catch (RemoteException e) { - errorMessage = "ViewProxy : Cannot get Profil list:" + e.toString(); - ejbview = null; - } - return ret; - } - - /** - * @return RW attribute: Profil used. - */ - public String getProfil() { - errorMessage = null; - return myprofil; - } - - /** - * Set the current profil - * @param p the name of the profil - */ - public void setProfil(String p) { - try { - getEjbView().setProfil(p); - errorMessage = null; - // keep it on local for efficiency - myprofil = p; - } catch (RemoteException e) { - errorMessage = "ViewProxy : Cannot set Profil:" + e.toString(); - ejbview = null; - } - } - - /** - * @return RO attribute: list of new alarms on the current Profil - */ - public AlarmData[] getNewAlarms() { - AlarmData[] ret = null; - try { - ret = getEjbView().getNewAlarms(); - errorMessage = null; - } catch (RemoteException e) { - errorMessage = "ViewProxy : Cannot get new alarms:" + e.toString(); - ejbview = null; - } - return ret; - } - - /** - * @return RO attribute: list of all alarms on the current Profil - */ - public AlarmData[] getAllAlarms() { - AlarmData[] ret = null; - try { - ret = getEjbView().getAllAlarms(); - errorMessage = null; - } catch (RemoteException e) { - errorMessage = "ViewProxy : Cannot get all alarms:" + e.toString(); - ejbview = null; - } - return ret; - } - - /** - * @param profilName the name of the profil - * @return the maximum level of alarm for this Profil. - */ - public int alarmLevel(String profilName) { - int level = 0; - try { - level = getEjbView().alarmLevel(profilName); - errorMessage = null; - } catch (RemoteException e) { - errorMessage = "ViewProxy : Cannot get AlarmLevel:" + e.toString(); - ejbview = null; - } - return level; - } - - /** - * @return error message if any - */ - public String getErrorMessage() { - return errorMessage; - } - - /** - * Forget this Alarm because it has been treated. - * @param pk primary key - */ - public void forgetAlarm(String pk) { - try { - getEjbView().forgetAlarm(pk); - errorMessage = null; - } catch (RemoteException e) { - errorMessage = "ViewProxy : Cannot forget Alarm:" + e.toString(); - ejbview = null; - } - } - - /** - * Creates a new Profil - * @param device the name of the device - * @param level the severity level - * @return the newly created profil - */ - public String newProfil(String device, String level) { - String ret = null; - try { - ret = getEjbView().newProfil(device, level); - errorMessage = null; - } catch (RemoteException e) { - errorMessage = "ViewProxy : Cannot create Profil:" + e.toString(); - ejbview = null; - } - return ret; - } - - /** - * remove a Profil - * @param profil name of the profil to remove - */ - public void removeProfil(String profil) { - try { - getEjbView().removeProfil(profil); - errorMessage = null; - } catch (RemoteException e) { - errorMessage = "ViewProxy : Cannot remove Profil:" + e.toString(); - ejbview = null; - } - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/alarm.xml b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/alarm.xml deleted file mode 100644 index a39659b9ce2947525e5115d10c5dbabe3f46ffd4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/alarm.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - Demo Appli: Alarm Manager - Alarm - - - - - session bean View - View - View - org.objectweb.alarm.beans.ViewHome - org.objectweb.alarm.beans.View - org.objectweb.alarm.beans.ViewBean - Stateful - Container - - - - AlarmRecord - AlarmRecord - AlarmRecord - org.objectweb.alarm.beans.AlarmRecordHome - org.objectweb.alarm.beans.AlarmRecord - org.objectweb.alarm.beans.AlarmRecordBean - Container - java.lang.String - True - 1.x - - pk - - - sev - - - from - - - reason - - - count - - - state - - - date - - pk - - jdbc/myDS - javax.sql.DataSource - Application - - - - - Message Driven Bean AlarmListener - AlarmListener - AlarmListener - org.objectweb.alarm.beans.AlarmListenerBean - Container - Auto-acknowledge - - javax.jms.Topic - Durable - - - - - - - - - AlarmRecord - create - - Supports - - - - View - * - - - AlarmRecord - * - - - AlarmListener - * - - Required - - - - diff --git a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/jonas-alarm.xml b/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/jonas-alarm.xml deleted file mode 100644 index 8e0507bbb47b660456a4f1f8ac0b349c0972e179..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/beans/org/objectweb/alarm/beans/jonas-alarm.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - View - viewhome - - - - AlarmRecord - alarmrecord - - jdbc/myDS - - jdbc_1 - - false - 20 - - jdbc_1 - AlarmTable - - pk - dbpk - - - sev - dbsev - - - from - dbfrom - - - reason - dbreason - - - count - dbcount - - - state - dbstate - - - date - dbdate - - - - findAlarm - - where dbfrom = ? and dbreason = ? and dbstate = 1 - - - - findAll - - - - - - findByInterest - - where dbfrom = ? and dbsev <= ? - - - - findBySeverity - - where dbsev <= ? - - - - - - AlarmListener - - AlarmTopic - - - - diff --git a/jonas_tests/examples/base/examples/alarm/build.xml b/jonas_tests/examples/base/examples/alarm/build.xml deleted file mode 100644 index 8f319f81b63d1f85c62b1f0e401954f069b35997..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/build.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/alarm/client/org/objectweb/alarm/AlarmGenerator.java b/jonas_tests/examples/base/examples/alarm/client/org/objectweb/alarm/AlarmGenerator.java deleted file mode 100644 index 4eddfa9dcca2084a958407fc2830b4679cc54ed7..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/client/org/objectweb/alarm/AlarmGenerator.java +++ /dev/null @@ -1,214 +0,0 @@ -// AlarmGenerator.java - -package org.objectweb.alarm; - -import java.rmi.RemoteException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.jms.*; - -class ClientThread extends Thread { - String name; - - public ClientThread(int num) { - name = AlarmGenerator.m_device; - if (name == null) { - name = "device"+num; - } - setName(name); - } - - /** - * random returns an integer between 0 and max - 1 - */ - private int random(int max) { - - double d = Math.random(); - int ret = (int) (max * d); - return ret; - } - - private String getReason(int sev) { - String reason; - int num = AlarmGenerator.m_mess; - if (num == 0) { - num = random(10) + 1; - } - switch (sev) { - case 1: - reason = "Severe Error "+num; - break; - case 2: - reason = "Warning "+num; - break; - case 3: - reason = "Running OK"; - break; - default: - reason = "Unknown Alarm"; - break; - } - return reason; - } - - public void run() { - - // Create Session + Publisher - TopicSession session = null; - TopicPublisher tp = null; - try { - session = AlarmGenerator.mytc.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); - tp = session.createPublisher(AlarmGenerator.mytopic); - } catch (Exception e) { - System.err.println("Cannot create JMS Publisher:"+ e); - } - - // main loop - int severity = AlarmGenerator.m_severity; - try { - for (int i = 0; i < AlarmGenerator.m_loops; i++) { - // publish messages to the topic - try { - MapMessage message = session.createMapMessage(); - // randomize the severity level if not specified - if (severity == 0) - severity = random(2)+1; - message.setInt("Severity", severity); - message.setString("From", name); - message.setString("Reason", getReason(severity)); - tp.publish(message); - } catch (JMSException e) { - System.err.println("Exception occurred: "+ e); - } - } - } catch (Exception e) { - System.err.println("Exception in main loop"+ e); - } - } -} - - -public class AlarmGenerator { - - static Context ictx = null; - static Topic mytopic = null; - static TopicConnection mytc = null; - - - static boolean m_reinit = false; - static int m_threads = 1; - static int m_loops = 1; - static int m_severity = 0; - static int m_mess = 0; - static String m_device = null; - - private static void usage() { - System.out.println("AlarmGenerator [-d device] [-l loops] [-t threads] [-s severity] [-m num]"); - } - - public static void main(String[] args) { - - TopicConnectionFactory tcf = null; - - // Get Args - // Get command args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-l")) { - s_arg = args[++argn]; - i_arg = java.lang.Integer.valueOf(s_arg); - m_loops = i_arg.intValue(); - } else if (s_arg.equals("-d")) { - m_device = args[++argn]; - } else if (s_arg.equals("-t")) { - s_arg = args[++argn]; - i_arg = java.lang.Integer.valueOf(s_arg); - m_threads = i_arg.intValue(); - } else if (s_arg.equals("-s")) { - s_arg = args[++argn]; - i_arg = java.lang.Integer.valueOf(s_arg); - m_severity = i_arg.intValue();; - } else if (s_arg.equals("-m")) { - s_arg = args[++argn]; - i_arg = java.lang.Integer.valueOf(s_arg); - m_mess = i_arg.intValue(); - } else { - usage(); - System.exit(2); - } - } - - // Get InitialContext - try { - ictx = new InitialContext(); - } catch (NamingException e) { - System.err.println("Cannot get InitialContext:"+ e); - } - - // Lookup JMS resources - try { - // lookup the TopicConnectionFactory through its JNDI name - tcf = (TopicConnectionFactory) ictx.lookup("JTCF"); - // lookup the Topic through its JNDI name - mytopic = (Topic) ictx.lookup("AlarmTopic"); - } catch (NamingException e) { - System.err.println("Cannot lookup JMS Resources:"+ e); - } - - // Create Connection - try { - mytc = tcf.createTopicConnection(); - } catch (Exception e) { - System.err.println("Cannot create JMS Connection:"+ e); - } - - // If reinit: send a special message to reinit AlarmTable first. - // This doesn't work (DuplicateKey exception) - // Code to remove! - if (m_reinit) { - TopicSession session = null; - TopicPublisher tp = null; - MapMessage message; - try { - session = AlarmGenerator.mytc.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); - tp = session.createPublisher(AlarmGenerator.mytopic); - message = session.createMapMessage(); - message.setInt("Severity", 1); - message.setString("From", "reinit"); - message.setString("Reason", "reinit"); - tp.publish(message); - } catch (JMSException e) { - System.err.println("Exception occurred: "+ e); - } finally { - try { - session.close(); - } catch (Exception i) {} - } - } - - // Create and start threads - ClientThread[] t_thr = new ClientThread[m_threads]; - for (int i = 0; i < m_threads; i++) { - t_thr[i] = new ClientThread(i+1); - t_thr[i].start(); - } - - // Wait end of all threads - for (int p = 0; p < m_threads; p++) { - try { - t_thr[p].join(); - } catch (InterruptedException e) { - System.err.println("ERROR: Problem in ClientThread.join"+ e); - } - } - - // close connection - try { - mytc.close(); - } catch (Exception e) { - e.printStackTrace(); - } - } -} diff --git a/jonas_tests/examples/base/examples/alarm/db1.prp b/jonas_tests/examples/base/examples/alarm/db1.prp deleted file mode 100644 index 5dae3df2a4888aa0a91da824b86e03b6d4e2303c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/db1.prp +++ /dev/null @@ -1,325 +0,0 @@ -!--------------------------------------------------------------------- -! -! PROPERTIES for the InstantDB database used in the JOnAS alarm example -! (builded from InstantDB/3.25/Examples/sample.prp) -! -!--------------------------------------------------------------------- - -!--------------------------------------------------------------------- -! -! BASIC PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Path where index tables are held. Can be absolute or relative -! to the properties file. Defaults to tablePath. -! -indexPath=./tmp/indexes -! -! Path where system tables are held. Can be absolute or relative to -! the properties file. Defaults to tablePath. -! -systemPath=./tmp/system -! -! Path where database tables are held. Can be absolute or relative -! to the properties file. Defaults to "current" directory. -! -tablePath=./tmp/tables -! -! Path where results set tables are held. Can be absolute or relative -! to the properties file. Defaults to tablePath. -! -tmpPath=./tmp/tmp -! -! Non-zero means paths are relative to the properties file. -! Default is absolute paths for files. -! -relativeToProperties=1 -! -! Alternative partitions can be defined so that tables can be placed -! in multiple locations. Each partition is numbered: 1, 2, 3,... Tables -! can be created on partitions using the syntax -! -! CREATE TABLE ON PARTITION ... -! -! The partition count has to be supplied. -! -!partitionCount=2 -! -! The locations of each partition must be supplied. These are always -! absolute path names. -! -!partition1=d:/petes -!partition2=c:/temp - - -!--------------------------------------------------------------------- -! -! TUNING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! The amount of each column to cache, expressed either as an absolute -! number of rows or as a percentage figure. Defaults to 256 or 10 respectively. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -cacheAmount=512 -! -! CACHE_ROWS Must be one of CACHE_ROWS or CACHE_PERCENT. Determines whether -! to cache columns in tables based on an absolute number of rows, or the -! percentage number of rows in the table. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -cacheCondition=CACHE_ROWS -! -! The amount of the system tables to be cached. Defaults to 100. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!systemCacheSize=10 -! -! Similar to cacheCondition, but applies only to the system tables. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!systemCacheCondition=CACHE_ROWS -! -! The percentage cache hit improvement required in order to move the -! cache to a new location in a column. -! -! (Currently not implemented). -! -cacheResetPercent=10 -! -! Non-zero means that database changes do not get written to the -! database immediately. See tuning.html. -! -fastUpdate=0 -! -! Percentage of free space in an index that must be present before -! the index reorganises itself. High values means frequent index -! reorganisation. Low values means slow index inserts. -! -indexLoad=5 -! -! The number of cache misses to include in calculations of the next -! base for the cache. -! -! (Currently not implemented). -! -missesInCacheStats=100 -! -! Non-zero means that results sets get instantiated on disk. By default -! InstantDB holds results sets emtirely in memory (apart from Binary -! columns). For large results sets this can be a problem. This property -! forces all results sets to be held on disk. -! -resultsOnDisk=0 -! -! Similar to cacheCondition but applies only to disk based -! results sets. Default is CACHE_ROWS. -! -resultsSetCache=CACHE_ROWS -! -! Similar to cacheAmount but applies only to disk based -! results sets. Default is 100. -! -resultsSetCacheAmount=100 -! -! Number of rows to read into the disk read ahead buffer. -! Recommended to be set somewhere around 128 to 256. -! Default is 20. -! -rowCacheSize=128 -! -! The read ahead buffer is effective at speeding up full -! table scans. However for indexed lookups or multiple -! simultaneous scans it is better to read a single row at -! a time. Each table holds a small number of single row -! buffers to improve such operations. Default is 8. -! -!singleRowCount=4 -! -! Sometimes the look ahead buffer can be held by a single -! thread even though it is not retrieveing many values from it. -! If too many lookups retrieve data from the single row -! buffers then it is better to flush the look ahead buffer and -! make it available for re-use. Default is 128. -! -!flushAfterCacheMisses=64 -! -! Number of rows to read ahead for system tables. By default -! system tables cache everything, so it is wasteful to have large -! read ahead buffers since they will very rarely be used. This -! allows the size of the system read ahead buffers to be reduced -! if necessary. Defaults to rowCacheSize. -! -!systemRows=20 -! -! The control column in all tables normally has a large cache -! since this speeds up all operation on that table. This can be -! varied to either improve performance or to reduce space. -! default is 8192. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!controlColCacheSize=512 -! -! By default, InstantDB only does a cursory search for deleted rows during -! UPDATE statements. Setting searchDeletes=1 causes more detailed searches -! for deleted rows. This slows down UPDATE executions, but reults in more -! compact tables. Default is 0. -! -searchDeletes=0 -! -! The interval, in milliseconds, between checks for statement execution -! timeouts. Default is 5000. -! -!timerCheck=5000 - -!--------------------------------------------------------------------- -! -! LOGGING AND DEBUGGING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Non-zero means include SQL statements in the export file. -! -exportSQL=0 -! -! Non-zero means trace output also directed to console. -! Defaults to 0. -! -!traceConsole=1 -traceConsole=0 -! -! Relative or absolute path where exporting and tracing goes. -! -traceFile=./tmp/trace.log -! -! Bitmap of various items that can be traced. See debug.html. -! Defaults to 0. -! -traceLevel=2 - - -!--------------------------------------------------------------------- -! -! TRANSACTION AND RECOVERY PROPERTIES -! -!--------------------------------------------------------------------- - -! -! 0 means do not perform recovery on startup. -! 1 means perform automatic recovery -! 2 (default) means prompt the user using standard in -! -recoveryPolicy=2 -! -! Sets the level of transaction journalling. See trans.html. -! Defaults to 1. -! -! 0 - No journalling takes place. -! 1 - Normal journalling (default). -! 2 - Full journalling. -! -transLevel=1 -! -! When doing an import, defines the number of rows imported -! before the transaction is committed. Recommended value 8192. -! defaults to 100. -! -transImports=100 - -!--------------------------------------------------------------------- -! -! DATE, TIME AND CURRENCY PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Number of digits after decimal point in currency outputs. Defaults to 2. -! -currencyDecimal=2 -! -! Currency symbol used in currency outputs. Defaults to $. -! -currencySymbol=$ -! -! Default format for date columns. Defaults to "yyyy-mm-dd". -! -dateFormat=yyyy-mm-dd -! -! Default format for timestamp columns. Defaults to "yyyy-mm-dd hh:mm:ss.lll". -! -dateTimeFormat=yyyy-mm-dd hh:mm:ss.lll -! -! If set, then all two digit dates less than its value are interpreted -! as 21st century dates. -! -!milleniumBoundary=50 -! -! Set to 1 causes the date string "now" to store a full timestamp. -! Default is to store only the date for fields with now hour in the -! format string. -! -nowMeansTime=0 - -!--------------------------------------------------------------------- -! -! STRING HANDLING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! If set to 1 then String hashes use the JDK Object.hashCode() function. -! By default, uses InstantDB's String hashing. -! -altStringHashing=0 -! -! Set to 1 to cause LIKE clauses to always perform case insensitive -! comparisons. -! -likeIgnoreCase=0 -! -! Same as SET LITERAL STRICT_ON. Prevents string literals being interpreted -! as column names or numbers. Default is 0. -! -strictLiterals=0 -! -! Set this value to 1 (one) if you would like PreparedStatement.setString() -! to ignore "\" (backslash) characters when proceesing string constants. -! When set, InstantDB will not attempt to interpret \ as the start of an -! escape sequence. Default is 0. -! -!prepareIgnoresEscapes=1 - -!--------------------------------------------------------------------- -! -! MISCELLANEOUS PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Allows selected InstantDB keywords to be un-reserved. -! e.g. ignoreKeywords=url,quote would allow the keywords -! url and quote to be used as table or column names. -! -! This faciliy is provided for compatatbility reasons only. -! It's use is not recommended AND IS NOT SUPPORTED. -! -!ignoreKeywords -! -! Non-zero means database is opened in read only mode. -! -readOnly=0 diff --git a/jonas_tests/examples/base/examples/alarm/etc/alarm.xml b/jonas_tests/examples/base/examples/alarm/etc/alarm.xml deleted file mode 100644 index a39659b9ce2947525e5115d10c5dbabe3f46ffd4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/etc/alarm.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - Demo Appli: Alarm Manager - Alarm - - - - - session bean View - View - View - org.objectweb.alarm.beans.ViewHome - org.objectweb.alarm.beans.View - org.objectweb.alarm.beans.ViewBean - Stateful - Container - - - - AlarmRecord - AlarmRecord - AlarmRecord - org.objectweb.alarm.beans.AlarmRecordHome - org.objectweb.alarm.beans.AlarmRecord - org.objectweb.alarm.beans.AlarmRecordBean - Container - java.lang.String - True - 1.x - - pk - - - sev - - - from - - - reason - - - count - - - state - - - date - - pk - - jdbc/myDS - javax.sql.DataSource - Application - - - - - Message Driven Bean AlarmListener - AlarmListener - AlarmListener - org.objectweb.alarm.beans.AlarmListenerBean - Container - Auto-acknowledge - - javax.jms.Topic - Durable - - - - - - - - - AlarmRecord - create - - Supports - - - - View - * - - - AlarmRecord - * - - - AlarmListener - * - - Required - - - - diff --git a/jonas_tests/examples/base/examples/alarm/etc/application.xml b/jonas_tests/examples/base/examples/alarm/etc/application.xml deleted file mode 100644 index f48944b614f4dacf37f97fa55e8c2600714287d3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/etc/application.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - alarm - alarm demo - - - alarm.jar - - - - - alarm.war - alarm - - - diff --git a/jonas_tests/examples/base/examples/alarm/etc/jonas-alarm.xml b/jonas_tests/examples/base/examples/alarm/etc/jonas-alarm.xml deleted file mode 100644 index 8e0507bbb47b660456a4f1f8ac0b349c0972e179..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/etc/jonas-alarm.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - View - viewhome - - - - AlarmRecord - alarmrecord - - jdbc/myDS - - jdbc_1 - - false - 20 - - jdbc_1 - AlarmTable - - pk - dbpk - - - sev - dbsev - - - from - dbfrom - - - reason - dbreason - - - count - dbcount - - - state - dbstate - - - date - dbdate - - - - findAlarm - - where dbfrom = ? and dbreason = ? and dbstate = 1 - - - - findAll - - - - - - findByInterest - - where dbfrom = ? and dbsev <= ? - - - - findBySeverity - - where dbsev <= ? - - - - - - AlarmListener - - AlarmTopic - - - - diff --git a/jonas_tests/examples/base/examples/alarm/etc/jonas-web.xml b/jonas_tests/examples/base/examples/alarm/etc/jonas-web.xml deleted file mode 100644 index f05f484aff5cd9454bf143266003e645b7949b90..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/etc/jonas-web.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - jms/AlarmTopic - AlarmTopic - - - - jms/TopicFactory - JTCF - - - diff --git a/jonas_tests/examples/base/examples/alarm/etc/web.xml b/jonas_tests/examples/base/examples/alarm/etc/web.xml deleted file mode 100644 index 4af5be53cfc2d271a0c33f229e79924d330ba75a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/etc/web.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - alarmsender - org.objectweb.alarm.Sender - - - - alarmsender - /secured/alarmsender - - - - jms/AlarmTopic - javax.jms.Topic - - - - jms/TopicFactory - javax.jms.TopicConnectionFactory - Container - - - - - Protected Area - - /secured/* - - - - tomcat - jetty - - - - - - BASIC - JOnAS Realm - - - - - tomcat - - - - jetty - - - diff --git a/jonas_tests/examples/base/examples/alarm/src/org/objectweb/alarm/Sender.java b/jonas_tests/examples/base/examples/alarm/src/org/objectweb/alarm/Sender.java deleted file mode 100644 index 141b9f36e4ac9f2f45a77ba5adc6fe72248729ad..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/src/org/objectweb/alarm/Sender.java +++ /dev/null @@ -1,115 +0,0 @@ -// "plain/text" -package org.objectweb.alarm; - -import java.io.*; -import javax.jms.*; -import javax.servlet.*; -import javax.servlet.http.*; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -/** - * This servlet is used to send Alarms on a JMS topic - */ -public class Sender extends HttpServlet { - - public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException { - - res.setContentType("text/html"); - PrintWriter out = res.getWriter(); - String device = req.getParameter("device"); - String level = req.getParameter("level"); - String message = req.getParameter("message"); - String sloop = req.getParameter("number"); - String stimeout = req.getParameter("timeout"); - int severity; - String error = ""; - - out.write("Alarm Sender Servlet"); - if (level.startsWith("S")) { - severity = 1; - } else if (level.startsWith("W")) { - severity = 2; - } else { - severity = 3; - } - int loop = (new Integer(sloop)).intValue(); - int timeout = (new Integer(stimeout)).intValue(); - - Context ictx = null; - try { - ictx = new InitialContext(); - } catch (Exception e) { - error += "Cannot get initial context:"+e; - } - - // Lookup JMS resources - TopicConnectionFactory tcf = null; - Topic mytopic = null; - TopicConnection mytc = null; - try { - // lookup the TopicConnectionFactory through its JNDI name - tcf = (TopicConnectionFactory) ictx.lookup("java:comp/env/jms/TopicFactory"); - // lookup the Topic through its JNDI name - mytopic = (Topic) ictx.lookup("java:comp/env/jms/AlarmTopic"); - } catch (NamingException e) { - error += "Cannot lookup JMS Resources:"+ e; - } - - // Create Connection - try { - mytc = tcf.createTopicConnection(); - } catch (Exception e) { - error += "Cannot create JMS Connection:"+ e; - } - - // Create Session + Publisher - TopicSession session = null; - TopicPublisher tp = null; - try { - session = mytc.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); - tp = session.createPublisher(mytopic); - } catch (Exception e) { - error += "Cannot create JMS Publisher:"+ e; - } - - // publish messages to the topic - try { - for (int i = 0 ; i < loop; i++) { - if (timeout > 0) { - Thread.currentThread().sleep(1000*timeout); - } - MapMessage mess = session.createMapMessage(); - mess.setInt("Severity", severity); - mess.setString("From", device); - mess.setString("Reason", message); - tp.publish(mess); - } - } catch (JMSException e) { - String l = e.getLinkedException().toString(); - error += " Exception while creating or sending message: "+ e; - error += " Linked Exception: "+l; - } catch (java.lang.InterruptedException e) { - out.println("Alarm Generator Interrupted"); - } - - if (error.equals("")) { - out.println("Message sent"); - } else { - out.println(error); - } - out.println("

    return to Alarm Generator"); - out.println("

    go to Alarm List"); - - // close connection - try { - mytc.close(); - } catch (Exception e) { - } - - out.println(""); - out.println(""); - } -} diff --git a/jonas_tests/examples/base/examples/alarm/web/generator.html b/jonas_tests/examples/base/examples/alarm/web/generator.html deleted file mode 100644 index 10a01e1ee4fca1d7bd358e1f02cdcf90221d4778..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/generator.html +++ /dev/null @@ -1,37 +0,0 @@ - -generator - - - - - - - - -
    JOnAS LogoThe Alarm GeneratorTomcat LogoJetty Logo
    - -You can select which alarms will be sent, and how many of them. -It is also possible to periodically resend the same alarms by -setting a timer. - -

    -

    -text of the message itself: -

    -device where the alarm comes from: -

    -severity level of the Alarm Message: -

    - Severe Alarm
    - Warning
    - Informative Message
    -
    -

    -number of messages that will be sent: -

    -timeout in seconds: -

    - -

    - - diff --git a/jonas_tests/examples/base/examples/alarm/web/images/alarmArchi.gif b/jonas_tests/examples/base/examples/alarm/web/images/alarmArchi.gif deleted file mode 100644 index 18e45cc9bd6e73fc5dab1c7735856c5017cf19b1..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/alarm/web/images/alarmArchi.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/alarm/web/images/jetty.png b/jonas_tests/examples/base/examples/alarm/web/images/jetty.png deleted file mode 100644 index 21b5e63874b322808625b6ead0ef20cf56fa1c6f..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/alarm/web/images/jetty.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/alarm/web/images/logo_jonas.jpg b/jonas_tests/examples/base/examples/alarm/web/images/logo_jonas.jpg deleted file mode 100644 index 3fe9b43072176d2275d8725eb977b781a9730306..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/alarm/web/images/logo_jonas.jpg and /dev/null differ diff --git a/jonas_tests/examples/base/examples/alarm/web/images/return.gif b/jonas_tests/examples/base/examples/alarm/web/images/return.gif deleted file mode 100644 index af4f68f4a3a13e0ef1dc0045b04c2c93354cdf40..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/alarm/web/images/return.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/alarm/web/images/tomcat.gif b/jonas_tests/examples/base/examples/alarm/web/images/tomcat.gif deleted file mode 100644 index 32f7d809fbf745e814598cae44329394515c4879..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/alarm/web/images/tomcat.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/alarm/web/index.html b/jonas_tests/examples/base/examples/alarm/web/index.html deleted file mode 100644 index 1e833ab6d97a6d0ed146a89e3e689666601cff1e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/index.html +++ /dev/null @@ -1,68 +0,0 @@ - - - The JOnAS Alarm Demo - - - - - - - - - - -
    JOnAS LogoThe JOnAS Alarm DemoTomcat LogoJetty Logo
    - -

    Goal of this demo

    - This little demo intends to show how you can use JOnAS, Tomcat or Jetty, and Joram - together to get a complete application using EJBs, servlets, html, JSPs, and - message driven beans. - -

    Running this demo

    -When you click to access this demo, your web browser should open a dialog box -asking you a user ID and a password. -Enter as login/password jonas/jonas. -

    -Click Here to Start the Demo -

    -Notice that the first time, Tomcat or Jetty has to compile each JSP and this may take several seconds. - -

    Description of the different parts

    - - - - - - - - - - - - - - - - - - -
    AlarmGeneratorAlarmGenerator is a servlet that generates alarms by -publishing messages on a topic. Once the JOnAS Server is running, this -servlet may be used to feed the Message Driven Bean listening -on the topic. -Click Here to Generate new Alarms -
    Session bean ViewA Session bean is used to provide a remote access to the Alarm Service. Each user -will create its own session that will be reached from JSP pages or servlets.
    Entity Bean AlarmRecordWhen a new alarm type is received, an entity bean is created. If the Alarm is already -known, its count is incremented only.
    Message Driven BeanJMS is used to access asynchronously to the service. A Message Driven Bean is used -to collect Alarm sent by AlarmGenerator. It will then inform the AlarmManager -that will process it.
    -

    Architecture

    -Alarm Demo Architecture - - diff --git a/jonas_tests/examples/base/examples/alarm/web/secured/createfilter.jsp b/jonas_tests/examples/base/examples/alarm/web/secured/createfilter.jsp deleted file mode 100644 index 52750066d9af6f684c1dcd42705395451b2874ce..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/secured/createfilter.jsp +++ /dev/null @@ -1,12 +0,0 @@ - -create filter - - -<% - String device = request.getParameter("device"); - String level = request.getParameter("level"); - String profil = myview.newProfil(device, level); -%> - - - diff --git a/jonas_tests/examples/base/examples/alarm/web/secured/current.jsp b/jonas_tests/examples/base/examples/alarm/web/secured/current.jsp deleted file mode 100644 index 70a68e686c0b1c26ef4ff0904eeca97985eeef33..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/secured/current.jsp +++ /dev/null @@ -1,115 +0,0 @@ - -current page -<%@ include file="top.html" %> -<%@ page import="org.objectweb.alarm.beans.AlarmData" %> - -<% - String error = myview.getErrorMessage(); - if (error != null) { -%> -

    -An error occured in the JOnAS Server: -<%=error%> -<% - } -%> -<% - AlarmData[] adlist = null; - boolean history = request.getParameter("listType").equals("History"); -%> - -<% - if (history) { - adlist = myview.getAllAlarms(); -%> - Log of all -<% - } else { - adlist = myview.getNewAlarms(); -%> - Current list of -<% - } -%> - alarms received on <%=myview.getProfil()%> - - - - - - - - - - - -<% - for (int i = 0; i < adlist.length; i++) { - AlarmData ad = adlist[i]; - int sev = ad.getSev(); - int state = ad.getState(); -%> - -<% switch (sev) { - case 1: -%> - - - - - - - -<% - } -%> -
    identdatefrommessagecountstate
    -<% - break; - case 2: -%> - -<% - break; - case 3: -%> - -<% - break; - default: -%> - -<% - break; - } -%> -<%=ad.getNum()%><%=ad.getDate()%><%=ad.getDevice()%><%=ad.getMessage()%><%=ad.getCount()%> -<% switch (state) { - case 1: -%> -received -<% - break; - case 2: -%> -processed -<% - break; - default: -%> -removed -<% - break; - } -%>
    -
    -

    -<% if (history) { %> -View only the current list of Alarms for this filter. -<% } else { %> -View the full log of Alarms received for this filter. -<% } %> -

    -Return to the list of filters - - diff --git a/jonas_tests/examples/base/examples/alarm/web/secured/list.jsp b/jonas_tests/examples/base/examples/alarm/web/secured/list.jsp deleted file mode 100644 index 37879e8ec5fac22f4b9aca18514ee2e85252db80..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/secured/list.jsp +++ /dev/null @@ -1,107 +0,0 @@ - -list page -<%@ include file="top.html" %> - -<% - String error = myview.getErrorMessage(); - if (error != null) { -%> -

    -An error occured in the JOnAS Server: -

    -<%=error%> -

    -<% - } -%> -<% - String[] plist = myview.getProfils(); -%> -You have been authenticated by web container and you can access now the list of -alarms received for each filter. -The color used shows the current level of alarm: - - - - - - - - - - - - - - -
    SEVERE ERROR
    WARNING
    INFO
    NO ALARM
    -
    -

    - - - - - -
    -You can see the list of alarm received for a special filter by -choosing in the list here after. -

    - - <% - for (int i = 0; i < plist.length; i++) { - String profil = plist[i]; - %> -<% - switch (myview.alarmLevel(profil)) { - case 1: -%> - -<% - break; - case 2: -%> - -<% - break; - case 3: -%> - -<% - break; - default: -%> - -<% - } -%> - - - - - <% - } - %> -
    -<%=profil%> - ->See details - ->Remove filter -
    -

    -You can create a new filter by using -the following form. -
    -

    -device name: -

    - Only Severe Alarms
    - Warnings and Severe Alarms
    - All Alarm Messages
    -

    - -

    -
    -Return to index page - - diff --git a/jonas_tests/examples/base/examples/alarm/web/secured/remove.jsp b/jonas_tests/examples/base/examples/alarm/web/secured/remove.jsp deleted file mode 100644 index ef063c475159b88d59bcf7230a1959b827ea0615..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/secured/remove.jsp +++ /dev/null @@ -1,13 +0,0 @@ - -remove page - - -<% - String alarmPK = request.getParameter("alarm"); - myview.forgetAlarm(alarmPK); -%> - - - - - diff --git a/jonas_tests/examples/base/examples/alarm/web/secured/removefilter.jsp b/jonas_tests/examples/base/examples/alarm/web/secured/removefilter.jsp deleted file mode 100644 index a66d56d0e3c435914d7318535f2113edb16a1e24..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/secured/removefilter.jsp +++ /dev/null @@ -1,11 +0,0 @@ - -remove filter - - -<% - String profil = request.getParameter("profil"); - myview.removeProfil(profil); -%> - - - diff --git a/jonas_tests/examples/base/examples/alarm/web/secured/setfilter.jsp b/jonas_tests/examples/base/examples/alarm/web/secured/setfilter.jsp deleted file mode 100644 index e22ebc4d45181ed57efe2a6d2d49a623a0579fda..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/secured/setfilter.jsp +++ /dev/null @@ -1,13 +0,0 @@ - -set filter - - -<% - String profil = request.getParameter("profil"); - myview.setProfil(profil); -%> - - - - - diff --git a/jonas_tests/examples/base/examples/alarm/web/secured/top.html b/jonas_tests/examples/base/examples/alarm/web/secured/top.html deleted file mode 100644 index ece8a76459e1fa1491cd47fbfe35fd614352422a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/secured/top.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - -
    JOnAS LogoThe JOnAS Alarm DemoTomcat LogoJetty Logo
    diff --git a/jonas_tests/examples/base/examples/alarm/web/secured/unsetfilter.jsp b/jonas_tests/examples/base/examples/alarm/web/secured/unsetfilter.jsp deleted file mode 100644 index 4b53e8f3556c44d72b2189c5689a4349e1720cfd..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/alarm/web/secured/unsetfilter.jsp +++ /dev/null @@ -1,10 +0,0 @@ - -unset filter - - -<% - myview.setProfil(null); -%> - - - diff --git a/jonas_tests/examples/base/examples/build.properties b/jonas_tests/examples/base/examples/build.properties deleted file mode 100644 index 80ebd7c47f913cf39431578e6f4b4368523217f8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/build.properties +++ /dev/null @@ -1,42 +0,0 @@ -# --------------------------------------------------------------------------- -# JOnAS: Java(TM) Open Application Server -# Copyright (C) 1999 Bull S.A. -# Contact: jonas-team@objectweb.org -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Initial developer(s): ____________________________________. -# Contributor(s): ______________________________________. -# -# --------------------------------------------------------------------------- -# $Id$ -# --------------------------------------------------------------------------- - -# Properties defined in this file could be customized - -# options for java compiler -opt.javac.debug on -opt.javac.optimize off - -# To use the jike compiler -#build.compiler jikes - -# genic args -#verbose=true - -# protocols for Carol (jrmp,iiop) -protocols.names=jrmp,iiop -genicargs=-verbose diff --git a/jonas_tests/examples/base/examples/build.xml b/jonas_tests/examples/base/examples/build.xml deleted file mode 100644 index 4240b897ce242840d7d172faf3c78491741a3b28..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/build.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/cmp2/README b/jonas_tests/examples/base/examples/cmp2/README deleted file mode 100644 index aaf9dfe63baef97d8ce6ca02667b152b764a6a7d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/README +++ /dev/null @@ -1,109 +0,0 @@ - - -Example Overview -================ - -This example shows how to use new features of container managed persistence -in EJB 2.0, like Entity Relationships and EJB-QL. - -The code of the EJBs used in this example comes from the book: - "Enterprise JavaBeans(TM)" Third Edition - by Richard Monson-Haefel - [O'REILLY edition ISBN 0-596-00226-2] - -We have packaged this example as an ear since the client is implemented -as three servlets. - - -Directories structure -===================== - -The "src" directory contains: - -- eight Entity beans: - CustomerEJB, - AddressEJB, - PhoneEJB, - CreditCardEJB, - CruiseEJB, - ShipEJB, - ReservationEJB, - CabinEJB, - Sequence. - The seven first beans shows the seven relationship types, - the last is used for an automatic generation of primary keys. - -- three Session beans: - TravelAgentEJB, - RTravelAgentEJB, - SequenceSession. - -- three servlets: - ServletTest - shows one to one relationship unidirectional or bidirectional, - ServletTest2 - shows one to many, many to one, many to many - uni and bidirectional relationships - ServletTest3 - shows example of finder methods using many EJB-QL examples - -The "etc" directory contains: - -- the "xml" directory which contains all the deployment descriptors - used for this example : - application.xml (ear file), - ejb-jar.xml and jonas-ejb-jar.xml (jar file), - web.xml and jonas-web.xml (war file). - -- the "resources" directory which contains all the resources for this - application - "web" directory contains all resources used by the servlets - - -Compiling this example creates an .ear file that represents the application -including : -- all the beans used by the web application, -- a web application that will be used by Tomcat or Jetty to run the servlets. - - -Prerequisites -============= -First, you must have installed a web container (ie : Catalina or Jetty) -as the web container service - -You have to set the environment variables - CATALINA_HOME and CATALINA_BASE as indicated in the Tomcat 4.1.x documentation. -or JETTY_HOME for Jetty 4.2.x - -(See the howto on ObjectWeb : http://www.objectweb.org/jonas/doc/index.html) - -As for the other JOnAS examples, you have to configure a datasource. -It's JNDI name must be 'jdbc_1'. -The 'datasource.mappername' property value must be up-to-date. - - -Building this example -===================== -Under $JONAS_ROOT/examples/cmp2, do - $ ant install - - -Running this example -==================== -Commands are given for an Unix system, similar commands can be done on -Windows. - -1) Run a JOnAS server: - $ jonas start - -2) Load cmp2.ear (if you have not added it in the ear service descriptors list) using jonasAdmin -management application (http://:/jonasAdmin) or the 'jonas admin' command. - -3) Lookup at http://:/cmp2 to start this example - - is the name of your machine (localhost by default), and - - the port number (9000 by default). - -4) Stop the jonas server - $jonas stop - - diff --git a/jonas_tests/examples/base/examples/cmp2/build.xml b/jonas_tests/examples/base/examples/cmp2/build.xml deleted file mode 100644 index c1a80645a1f7da110f880ca8136a1ff4ba94e2c2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/build.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/cmp2/etc/resources/web/index.html b/jonas_tests/examples/base/examples/cmp2/etc/resources/web/index.html deleted file mode 100644 index 28695422eb009cd8e48506c96fc58256182fc110..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/etc/resources/web/index.html +++ /dev/null @@ -1,111 +0,0 @@ - - - - - JOnAS example cmp2 - - - - -

    cmp2 : EJB 2.0 Container Managed Persistence

    - -

    This example shows how to use new features of container managed persistence - in EJB 2.0, like Entity Relationships and EJB-QL.

    - -

    The code of the EJBs used in this example comes from the book - "Enterprise JavaBeans(TM)" Third Edition by Richard Monson-Haefel -
    [O'REILLY edition ISBN 0-596-00226-2] -

    - -

    Examples Showing One to One Relationships:

    -
      -
    • One to One Unidirectional Relationship: -
      Customer --> Address

    • -
    • One to One Bidirectional Relationship: -
      Customer <--> CreditCard

    • -
    • One to Many Unidirectional Relationship: -
      Customer --> Phone

    • -
    - - - - - - -
    - Run the tests? - -
    - -
    -
    - - -

    Examples Showing Many to One, One to Many, and Many to Many Relationships:

    -
      -
    • Many to One Unidirectional Relationship: -
      Cruise --> Ship

    • -
    • One to Many Bidirectional Relationship: -
      Cruise <--> Reservation

    • -
    • Many to Many Bidirectional Relationship: -
      Customer <--> Reservation

    • -
    • Many to Many Unidirectional Relationship: -
      Reservation --> Cabin

    • -
    - - - - - - -
    - Run the tests? - -
    - -
    -
    - -

    Examples Showing EJB-QL:

    -
      -
    • SELECT OBJECT(s) FROM JE2_Ship AS s WHERE s.tonnage = ?1
    • -
    • SELECT OBJECT(s) FROM JE2_Ship AS s WHERE s.tonnage BETWEEN ?1 AND ?2
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c
    • -
    • SELECT OBJECT(c) FROM JE2_Cruise AS c WHERE c.name = ?1
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c -
      WHERE c.lastName = ?1 AND c.firstName = ?2
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.lastName = 'Smith90'
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c -
      WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.hasGoodCredit = TRUE
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c -
      WHERE c.homeAddress.city = ?1 AND c.homeAddress.state = ?2
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c -
      WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2 AND c.homeAddress.state = ?3
    • -
    • SELECT OBJECT(c) FROM JE2_Cabin AS c WHERE c.deckLevel = ?1
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c -
      WHERE c.homeAddress.state IN ('FL','TX','AZ','CA')
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.reservations IS EMPTY
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS cust, Cruise AS cr, IN (cr.reservations) AS res -
      WHERE cr = ?1 AND cust MEMBER OF res.customers
    • -
    • SELECT a.zip FROM JE2_Address AS a WHERE a.state = ?1
    • -
    • SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.homeAddress = ?1
    • -
    • .....
    • -
    - - - - - - -
    - Run the tests? - -
    - -
    -
    - - - - diff --git a/jonas_tests/examples/base/examples/cmp2/etc/resources/web/style.css b/jonas_tests/examples/base/examples/cmp2/etc/resources/web/style.css deleted file mode 100644 index 4f852c2a87c8be61ad1e242e706f92197a35396c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/etc/resources/web/style.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - background : white; - color : black; -} -h1, h2, h3 {font-family : sans-serif; } -h1 {font-size : 175%; color : DarkCyan; text-align : center;} -h2 {font-size : 150%; color : DarkCyan; - border-bottom : solid; - border-bottom-width : 1; -} -h3 {font-size : 125%; } -strong { font-weight : bold; } -hr { size : 1; width : 100%; } diff --git a/jonas_tests/examples/base/examples/cmp2/etc/xml/application.xml b/jonas_tests/examples/base/examples/cmp2/etc/xml/application.xml deleted file mode 100644 index 945d7cc97dd4fb377c4e5b8897ba848c73748683..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/etc/xml/application.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - cmp2 example EJB2.0 container managed persistence - cmp2 servlet - - - - cmp2.jar - - - - - cmp2.war - cmp2 - - - diff --git a/jonas_tests/examples/base/examples/cmp2/etc/xml/cmp2.xml b/jonas_tests/examples/base/examples/cmp2/etc/xml/cmp2.xml deleted file mode 100644 index c24df0a211c5fe1801034be17ea8ecb160d1827c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/etc/xml/cmp2.xml +++ /dev/null @@ -1,715 +0,0 @@ - - - - - Deployment descriptor for the cmp2 JOnAS example - cmp2 example - - - - CustomerEJB - com.titan.customer.CustomerHomeRemote - com.titan.customer.CustomerRemote - com.titan.customer.CustomerHomeLocal - com.titan.customer.CustomerLocal - com.titan.customer.CustomerBean - Container - java.lang.Integer - false - 2.x - JE2_Customer - id - lastName - firstName - hasGoodCredit - id - - ejb/AddressHomeLocal - Entity - com.titan.address.AddressHomeLocal - com.titan.address.AddressLocal - AddressEJB - - - ejb/CreditCardHome - Entity - com.titan.customer.CreditCardHomeLocal - com.titan.customer.CreditCardLocal - CreditCardEJB - - - ejb/PhoneHomeLocal - Entity - com.titan.phone.PhoneHomeLocal - com.titan.phone.PhoneLocal - PhoneEJB - - - - - findAllCustomers - - - SELECT OBJECT(c) FROM JE2_Customer AS c - - - - findByName - - java.lang.String - java.lang.String - - - - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2 - - - - - findSmith90 - - - - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.lastName = 'Smith90' - - - - - findByExactName - - java.lang.String - java.lang.String - - - - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.lastName = ?1 AND c.firstName = ?2 - - - - - findByNameAndState - - java.lang.String - java.lang.String - java.lang.String - - - - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2 AND c.homeAddress.state = ?3 - - - - - findByGoodCredit - - - - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.hasGoodCredit = TRUE - - - - - findByCity - - java.lang.String - java.lang.String - - - - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.homeAddress.city = ?1 AND c.homeAddress.state = ?2 - - - - - findInHotStates - - - - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.homeAddress.state IN ('FL','TX','AZ','CA') - - - - - findWithNoReservations - - - - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.reservations IS EMPTY - - - - - findOnCruise - - com.titan.cruise.CruiseLocal - - - - SELECT OBJECT(cust) FROM JE2_Customer cust, JE2_Cruise cr, IN (cr.reservations) AS res - WHERE cr = ?1 AND cust MEMBER OF res.customers - - - - - findByState - - java.lang.String - - - - SELECT OBJECT(c) FROM JE2_Customer c - WHERE c.homeAddress.state = ?1 - ORDER BY c.lastName,c.firstName - - - - - - AddressEJB - com.titan.address.AddressHomeLocal - com.titan.address.AddressLocal - com.titan.address.AddressBean - Container - java.lang.Object - false - 2.x - JE2_Address - street - city - state - zip - - - - findAllAddress - - - SELECT OBJECT(c) FROM JE2_Address c - - - - ejbSelectZipCodes - - java.lang.String - - - SELECT a.zip FROM JE2_Address AS a WHERE a.state = ?1 - - - - ejbSelectAll - - - SELECT OBJECT(a) FROM JE2_Address AS a - - - - ejbSelectCustomer - - com.titan.address.AddressLocal - - - SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.homeAddress = ?1 - - - - - PhoneEJB - com.titan.phone.PhoneHomeLocal - com.titan.phone.PhoneLocal - com.titan.phone.PhoneBean - Container - java.lang.Object - false - 2.x - JE2_Phone - number - type - - - - findAllPhones - - - SELECT OBJECT(c) FROM JE2_Phone c - - - - - CreditCardEJB - com.titan.customer.CreditCardHomeLocal - com.titan.customer.CreditCardLocal - com.titan.customer.CreditCardBean - Container - java.lang.Object - false - 2.x - JE2_CreditCard - expirationDate - number - nameOnCard - creditOrganization - - - - findAllCreditCards - - - SELECT OBJECT(cc) FROM JE2_CreditCard cc - - - - - CruiseEJB - com.titan.cruise.CruiseHomeLocal - com.titan.cruise.CruiseLocal - com.titan.cruise.CruiseBean - Container - java.lang.Object - false - 2.x - JE2_Cruise - name - - - - findAllCruises - - - SELECT OBJECT(cc) FROM JE2_Cruise cc - - - - findByName - - java.lang.String - - - SELECT OBJECT(c) FROM JE2_Cruise c WHERE c.name = ?1 - - - - - ShipEJB - com.titan.ship.ShipHomeLocal - com.titan.ship.ShipLocal - com.titan.ship.ShipBean - Container - java.lang.Integer - false - 2.x - JE2_Ship - id - name - tonnage - id - - - - findAllShips - - - SELECT OBJECT(cc) FROM JE2_Ship cc - - - - findByTonnage - - java.lang.Double - - - - SELECT OBJECT(s) FROM JE2_Ship s - WHERE s.tonnage = ?1 - - - - - findByTonnage - - java.lang.Double - java.lang.Double - - - - SELECT OBJECT(s) FROM JE2_Ship s - WHERE s.tonnage BETWEEN ?1 AND ?2 - - - - - - ReservationEJB - com.titan.reservation.ReservationHomeLocal - com.titan.reservation.ReservationLocal - com.titan.reservation.ReservationBean - Container - java.lang.Object - false - 2.x - JE2_Reservation - amountPaid - date - - - - findAllReservations - - - SELECT OBJECT(cc) FROM JE2_Reservation cc - - - - - CabinEJB - com.titan.cabin.CabinHomeRemote - com.titan.cabin.CabinRemote - com.titan.cabin.CabinHomeLocal - com.titan.cabin.CabinLocal - com.titan.cabin.CabinBean - Container - java.lang.Integer - false - 2.x - JE2_Cabin - id - name - deckLevel - bedCount - id - - - - findAllOnDeckLevel - - java.lang.Integer - - - - SELECT OBJECT(c) FROM JE2_Cabin as c WHERE c.deckLevel = ?1 - - - - - findAllCabins - - - SELECT OBJECT(cc) FROM JE2_Cabin cc - - - - ejbSelectAllForCustomer - - com.titan.customer.CustomerLocal - - - SELECT OBJECT(cab) FROM JE2_Customer AS cust, - IN (cust.reservations) AS res, IN (res.cabins) AS cab - WHERE cust = ?1 - - - - - - TravelAgentEJB - com.titan.travelagent.TravelAgentHomeRemote - com.titan.travelagent.TravelAgentRemote - com.titan.travelagent.TravelAgentBean - Stateless - Container - - ejb/CabinHomeLocal - Entity - com.titan.cabin.CabinHomeLocal - com.titan.cabin.CabinLocal - CabinEJB - - - - - - RTravelAgentEJB - com.titan.travelagent.RTravelAgentHomeRemote - com.titan.travelagent.RTravelAgentRemote - com.titan.travelagent.RTravelAgentBean - Stateless - Container - - ejb/CabinHomeRemote - Entity - com.titan.cabin.CabinHomeRemote - com.titan.cabin.CabinRemote - - - - - - - - - Customer-Address - - Customer-has-a-Address - One - - CustomerEJB - - - homeAddress - - - - Address-belongs-to-Customer - One - - - AddressEJB - - - - - - Customer-CreditCard - - Customer-has-a-CreditCard - One - - CustomerEJB - - creditCard - - - CreditCard-belongs-to-Customer - One - - - CreditCardEJB - - customer - - - - - Customer-Phones - - Customer-has-many-Phone-numbers - One - - CustomerEJB - - - phoneNumbers - java.util.Collection - - - - Phone-belongs-to-Customer - Many - - - PhoneEJB - - - - - - Customer-Reservation - - Customer-has-many-Reservations - Many - - CustomerEJB - - - reservations - java.util.Collection - - - - Reservation-has-many-Customers - Many - ReservationEJB - - - customers - java.util.Set - - - - - - Cruise-Ship - - Cruise-has-a-Ship - Many - - CruiseEJB - - ship - - - Ship-has-many-Cruises - One - - ShipEJB - - - - - - Cruise-Reservation - - Cruise-has-many-Reservations - One - - CruiseEJB - - - reservations - java.util.Collection - - - - Reservation-has-a-Cruise - Many - - ReservationEJB - - cruise - - - - - Cabin-Ship - - Cabin-has-a-Ship - Many - - CabinEJB - - ship - - - Ship-has-many-Cabins - One - - ShipEJB - - - - - - Cabin-Reservation - - Cabin-has-many-Reservations - Many - - CabinEJB - - - - Reservation-has-many-Cabins - Many - - ReservationEJB - - - cabins - java.util.Set - - - - - - - - - - - - CabinEJB - * - - - RTravelAgentEJB - * - - - TravelAgentEJB - * - - - CustomerEJB - * - - - AddressEJB - * - - - CreditCardEJB - * - - - PhoneEJB - * - - - CruiseEJB - * - - - ShipEJB - * - - - ReservationEJB - * - - Required - - - - - SequenceSession - * - - - Sequence - * - - Required - - - - - - diff --git a/jonas_tests/examples/base/examples/cmp2/etc/xml/jonas-cmp2.xml b/jonas_tests/examples/base/examples/cmp2/etc/xml/jonas-cmp2.xml deleted file mode 100644 index 147cfb33b75db6b558f526905abcd87c3c0b3a6e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/etc/xml/jonas-cmp2.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - CustomerEJB - CustomerHomeRemote - jdbc_1 - - - - AddressEJB - - jdbc_1 - - - - - CabinEJB - jdbc_1 - - - - PhoneEJB - - jdbc_1 - - - - - CreditCardEJB - - jdbc_1 - - - - - CruiseEJB - - jdbc_1 - - - - - ShipEJB - jdbc_1 - - - - ReservationEJB - - jdbc_1 - - - - - - RTravelAgentEJB - RTravelAgentHomeRemote - - ejb/CabinHomeRemote - CabinHomeRemote - - - - diff --git a/jonas_tests/examples/base/examples/cmp2/etc/xml/web.xml b/jonas_tests/examples/base/examples/cmp2/etc/xml/web.xml deleted file mode 100644 index 7d1526774735b7640f814704193520b80ae841eb..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/etc/xml/web.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - ServletTest - servlets.ServletTest - - - - ServletTest2 - servlets.ServletTest2 - - - - ServletTest3 - servlets.ServletTest3 - - - - ServletTest - /test1 - - - - ServletTest2 - /test2 - - - - ServletTest3 - /test3 - - - - ejb/CreditCardHomeLocal - Entity - com.titan.customer.CreditCardHomeLocal - com.titan.customer.CreditCardLocal - cmp2.jar#CreditCardEJB - - - - ejb/CustomerHomeLocal - Entity - com.titan.customer.CustomerHomeLocal - com.titan.customer.CustomerLocal - cmp2.jar#CustomerEJB - - - - ejb/AddressHomeLocal - Entity - com.titan.address.AddressHomeLocal - com.titan.address.AddressLocal - cmp2.jar#AddressEJB - - - - ejb/ShipHomeLocal - Entity - com.titan.address.ShipHomeLocal - com.titan.address.ShipLocal - cmp2.jar#ShipEJB - - - - ejb/CruiseHomeLocal - Entity - com.titan.address.CruiseHomeLocal - com.titan.address.CruiseLocal - cmp2.jar#CruiseEJB - - - - ejb/ReservationHomeLocal - Entity - com.titan.address.ReservationHomeLocal - com.titan.address.ReservationLocal - cmp2.jar#ReservationEJB - - - - ejb/CabinHomeLocal - Entity - com.titan.address.CabinHomeLocal - com.titan.address.CabinLocal - cmp2.jar#CabinEJB - - - - ejb/PhoneHomeLocal - Entity - com.titan.adress.PhoneHomeLocal - com.titan.address.PhoneLocal - cmp2.jar#PhoneEJB - - - diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/address/AddressBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/address/AddressBean.java deleted file mode 100644 index 1c59356ade661cb03523dac05a3a494d81ba1437..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/address/AddressBean.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.titan.address; - -import java.util.Collection; -import java.util.Set; - -import javax.ejb.EntityContext; -import javax.ejb.FinderException; - -import com.titan.customer.CustomerLocal; - -public abstract class AddressBean implements javax.ejb.EntityBean { - - public Integer ejbCreateAddress(String street, String city, String state, String zip) - throws javax.ejb.CreateException { - setStreet(street); - setCity(city); - setState(state); - setZip(zip); - return null; - } - - public void ejbPostCreateAddress(String street, String city, String state, String zip) { - - } - - // select methods - public abstract Set ejbSelectZipCodes(String state) throws FinderException; - - public abstract Collection ejbSelectAll() throws FinderException; - - public abstract CustomerLocal ejbSelectCustomer(AddressLocal addr) throws FinderException; - - // Public Home method required to test the private ejbSelectZipCodes method - public Collection ejbHomeSelectZipCodes(String state) throws FinderException { - return this.ejbSelectZipCodes(state); - } - - // Public Home method required to test the private ejbSelectCustomer method - public CustomerLocal ejbHomeSelectCustomer(AddressLocal addr) throws FinderException { - return (CustomerLocal) (this.ejbSelectCustomer(addr)); - } - - // persistent fields - public abstract String getStreet(); - - public abstract void setStreet(String street); - - public abstract String getCity(); - - public abstract void setCity(String city); - - public abstract String getState(); - - public abstract void setState(String state); - - public abstract String getZip(); - - public abstract void setZip(String zip); - - // standard call back methods - - public void setEntityContext(EntityContext ec) { - } - - public void unsetEntityContext() { - } - - public void ejbLoad() { - } - - public void ejbStore() { - } - - public void ejbActivate() { - } - - public void ejbPassivate() { - } - - public void ejbRemove() throws javax.ejb.RemoveException { - } - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/address/AddressHomeLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/address/AddressHomeLocal.java deleted file mode 100644 index 7bac2363c4cf50f65f53f3f34657b5c1ca462ed7..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/address/AddressHomeLocal.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.titan.address; - -import java.util.Collection; - -import com.titan.customer.CustomerLocal; - -// Address EJB's local home interface -public interface AddressHomeLocal extends javax.ejb.EJBLocalHome { - - public AddressLocal createAddress(String street, String city, String state, String zip ) - throws javax.ejb.CreateException; - - public AddressLocal findByPrimaryKey(Integer primaryKey) - throws javax.ejb.FinderException; - - public Collection findAllAddress() - throws javax.ejb.FinderException; - - // Home method, requires ejbHomeSelectZipCodes method in bean class - public Collection selectZipCodes(String state) - throws javax.ejb.FinderException; - - // Home method, requires ejbHomeSelectCustomer method in bean class - public CustomerLocal selectCustomer(AddressLocal addr) - throws javax.ejb.FinderException; -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/address/AddressLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/address/AddressLocal.java deleted file mode 100644 index 360a00bbe96a93f690804ad3abcb3d45f4ea16e0..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/address/AddressLocal.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.titan.address; - -// Address EJB's local interface -public interface AddressLocal extends javax.ejb.EJBLocalObject { - - public String getStreet(); - - public void setStreet(String street); - - public String getCity(); - - public void setCity(String city); - - public String getState(); - - public void setState(String state); - - public String getZip(); - - public void setZip(String zip); -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinBean.java deleted file mode 100644 index 5919fe467eb13c6397826a4b8f195709f586ce62..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinBean.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.titan.cabin; - -import java.util.Set; - -import javax.ejb.EntityContext; -import javax.ejb.FinderException; - -import com.titan.customer.CustomerLocal; -import com.titan.ship.ShipLocal; - -public abstract class CabinBean implements javax.ejb.EntityBean { - - public Integer ejbCreate(Integer id) throws javax.ejb.CreateException { - this.setId(id); - return null; - } - - public void ejbPostCreate(Integer id) { - - } - - public abstract Set ejbSelectAllForCustomer(CustomerLocal cust) throws FinderException; - - // Public Home method required to test the private ejbSelectAllForCustomer - // method - public Set ejbHomeSelectAllForCustomer(CustomerLocal cust) throws FinderException { - return this.ejbSelectAllForCustomer(cust); - } - - public abstract void setId(Integer id); - - public abstract Integer getId(); - - public abstract void setShip(ShipLocal ship); - - public abstract ShipLocal getShip(); - - public abstract void setName(String name); - - public abstract String getName(); - - public abstract void setBedCount(int count); - - public abstract int getBedCount(); - - public abstract void setDeckLevel(int level); - - public abstract int getDeckLevel(); - - public int getShipId() { - return getShip().getId().intValue(); - } - - public void setShipId(int sp) { - ShipLocal sl = getShip(); - sl.setId(new Integer(sp)); - setShip(sl); - } - - public void setEntityContext(EntityContext ctx) { - // Not implemented. - } - - public void unsetEntityContext() { - // Not implemented. - } - - public void ejbActivate() { - // Not implemented. - } - - public void ejbPassivate() { - // Not implemented. - } - - public void ejbLoad() { - // Not implemented. - } - - public void ejbStore() { - // Not implemented. - } - - public void ejbRemove() throws javax.ejb.RemoveException { - // Not implemented. - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinHomeLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinHomeLocal.java deleted file mode 100644 index 32a6bc30fbf1347361e66ab2c78d5edc16247872..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinHomeLocal.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.titan.cabin; - -import com.titan.customer.CustomerLocal; - -import java.util.Collection; -import java.util.Set; -import javax.ejb.EJBException; -import javax.ejb.CreateException; -import javax.ejb.FinderException; - -public interface CabinHomeLocal extends javax.ejb.EJBLocalHome { - - public CabinLocal create(Integer id) - throws CreateException, EJBException; - - public CabinLocal findByPrimaryKey(Integer pk) - throws FinderException, EJBException; - - public Collection findAllOnDeckLevel(Integer level) - throws FinderException; - - public Collection findAllCabins() - throws FinderException; - - // Home method, requires ejbHomeSelectAllForCustomer method in bean class - public Set selectAllForCustomer(CustomerLocal cust) - throws FinderException; -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinHomeRemote.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinHomeRemote.java deleted file mode 100644 index d5c2dea860b271d2fbc49e800a21918d18763402..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinHomeRemote.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.titan.cabin; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.FinderException; - -public interface CabinHomeRemote extends javax.ejb.EJBHome { - - public CabinRemote create(Integer id) - throws CreateException, RemoteException; - - public CabinRemote findByPrimaryKey(Integer pk) - throws FinderException, RemoteException; -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinLocal.java deleted file mode 100644 index 40a187219223173e9076fdf258178d959b078097..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinLocal.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.titan.cabin; - -import javax.ejb.EJBException; -import com.titan.ship.ShipLocal; - -public interface CabinLocal extends javax.ejb.EJBLocalObject { - - public String getName() throws EJBException; - public void setName(String str) throws EJBException; - public int getDeckLevel() throws EJBException; - public void setDeckLevel(int level) throws EJBException; - public ShipLocal getShip(); - public void setShip(ShipLocal ship); - public int getBedCount() throws EJBException; - public void setBedCount(int bc) throws EJBException; - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinRemote.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinRemote.java deleted file mode 100644 index 29faff6fdcb3391bc2123e513506c1b416775a92..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cabin/CabinRemote.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.titan.cabin; - -import java.rmi.RemoteException; - -public interface CabinRemote extends javax.ejb.EJBObject { - public String getName() throws RemoteException; - public void setName(String str) throws RemoteException; - public int getDeckLevel() throws RemoteException; - public void setDeckLevel(int level) throws RemoteException; - public int getShipId() throws RemoteException; - public void setShipId(int sp) throws RemoteException; - public int getBedCount() throws RemoteException; - public void setBedCount(int bc) throws RemoteException; -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cruise/CruiseBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/cruise/CruiseBean.java deleted file mode 100644 index 3373f90cec2db317dac946d4db813f9b5eb63a6b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cruise/CruiseBean.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.titan.cruise; - -import javax.ejb.CreateException; -import javax.ejb.RemoveException; -import javax.ejb.EntityContext; -import com.titan.ship.*; -import java.util.Collection; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -public abstract class CruiseBean implements javax.ejb.EntityBean { - - public Integer ejbCreate(String name, ShipLocal ship) throws CreateException { - setName(name); - return null; - } - - public void ejbPostCreate(String name, ShipLocal ship) { - setShip(ship); - } - - // persistent fields - public abstract void setName(String name); - public abstract String getName( ); - - public abstract void setShip(ShipLocal ship); - public abstract ShipLocal getShip( ); - - // relationship fields - - public abstract void setReservations(Collection res); - public abstract Collection getReservations( ); - - // standard call back methods - - public void setEntityContext(EntityContext ec){} - - public void unsetEntityContext(){} - public void ejbLoad(){} - public void ejbStore(){} - public void ejbActivate(){} - public void ejbPassivate(){} - public void ejbRemove() throws RemoveException {} - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cruise/CruiseHomeLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/cruise/CruiseHomeLocal.java deleted file mode 100644 index 6b6e30d8a5663d5b3763ed499987bbb069f51900..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cruise/CruiseHomeLocal.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.titan.cruise; - -import com.titan.ship.*; -import javax.ejb.CreateException; -import javax.ejb.FinderException; -import java.util.Collection; - - -// Cruise EJB's local home interface -public interface CruiseHomeLocal extends javax.ejb.EJBLocalHome { - - public CruiseLocal create(String name, ShipLocal ship) - throws javax.ejb.CreateException; - - public CruiseLocal findByPrimaryKey(Object primaryKey) - throws javax.ejb.FinderException; - - public Collection findAllCruises() - throws FinderException; - - public CruiseLocal findByName(String name) - throws FinderException; -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cruise/CruiseLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/cruise/CruiseLocal.java deleted file mode 100644 index e632bedf373356f28f5ce3a8612e51b5e72d179c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/cruise/CruiseLocal.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.titan.cruise; - -import com.titan.ship.*; -import java.util.Collection; - -// Cruise EJB's local interface -public interface CruiseLocal extends javax.ejb.EJBLocalObject { - - public String getName(); - public void setName(String name); - - public ShipLocal getShip(); - public void setShip(ShipLocal ship); - - public void setReservations(Collection res); - public Collection getReservations( ); - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/AddressDO.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/AddressDO.java deleted file mode 100644 index cae7e22182b85eac5d1d746b972114459dd61f99..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/AddressDO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.titan.customer; - -public class AddressDO implements java.io.Serializable { - - private String street; - private String city; - private String state; - private String zip; - - public AddressDO(String street, String city, String state, String zip ) { - this.street = street; - this.city = city; - this.state = state; - this.zip = zip; - } - public String getStreet(){ - return street; - } - public String getCity(){ - return city; - } - public String getState(){ - return state; - } - public String getZip(){ - return zip; - } -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CreditCardBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CreditCardBean.java deleted file mode 100644 index 5855282576d19f83eeec5a15d19f3f68c01cf1a0..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CreditCardBean.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.titan.customer; - -import javax.ejb.EntityContext; -import java.util.Date; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -public abstract class CreditCardBean implements javax.ejb.EntityBean { - - public Object ejbCreate(Date exp, String numb, String name, String org) - throws javax.ejb.CreateException { - - setExpirationDate(exp); - setNumber(numb); - setNameOnCard(name); - setCreditOrganization(org); - return null; - } - - public void ejbPostCreate(Date exp, String numb, String name, String org) { - } - - // relationship fields - - public abstract CustomerLocal getCustomer( ); - public abstract void setCustomer(CustomerLocal cust); - - // persistent fields - public abstract Date getExpirationDate(); - public abstract void setExpirationDate(Date date); - public abstract String getNumber(); - public abstract void setNumber(String number); - public abstract String getNameOnCard(); - public abstract void setNameOnCard(String name); - public abstract String getCreditOrganization(); - public abstract void setCreditOrganization(String org); - - // standard call back methods - - public void setEntityContext(EntityContext ec){} - public void unsetEntityContext(){} - public void ejbLoad(){} - public void ejbStore(){} - public void ejbActivate(){} - public void ejbPassivate(){} - public void ejbRemove() throws javax.ejb.RemoveException{} - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CreditCardHomeLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CreditCardHomeLocal.java deleted file mode 100644 index 1e20caf8185a5e45ca878f033e172d0357258c61..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CreditCardHomeLocal.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.titan.customer; - -import javax.ejb.CreateException; -import javax.ejb.FinderException; -import java.util.Collection; -import java.util.Date; - -// CreditCard EJB's local home interface -public interface CreditCardHomeLocal extends javax.ejb.EJBLocalHome { - - public CreditCardLocal create(Date exp, String numb, String name, String org) - throws javax.ejb.CreateException; - - public CreditCardLocal findByPrimaryKey(Object primaryKey) - throws javax.ejb.FinderException; - - public Collection findAllCreditCards() throws FinderException; -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CreditCardLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CreditCardLocal.java deleted file mode 100644 index 0311d0b6a6d95c7c02f78e265d5733ed3b24793c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CreditCardLocal.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.titan.customer; - -import java.util.Date; - -// Credit Card EJB's local interface -public interface CreditCardLocal extends javax.ejb.EJBLocalObject { - - public Date getExpirationDate(); - public void setExpirationDate(Date date); - public String getNumber(); - public void setNumber(String number); - public String getNameOnCard(); - public void setNameOnCard(String name); - public String getCreditOrganization(); - public void setCreditOrganization(String org); - - public CustomerLocal getCustomer(); - public void setCustomer(CustomerLocal cust); - -} - diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerBean.java deleted file mode 100644 index df280a52077f0409e535bab8aad538aabf084c98..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerBean.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.titan.customer; - -import com.titan.phone.*; -import com.titan.address.AddressLocal; -import com.titan.address.AddressHomeLocal; - -import javax.naming.InitialContext; -import javax.ejb.EJBException; -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.naming.NamingException; -import java.util.Date; -import java.util.Collection; -import java.util.Iterator; -import java.util.Vector; - -public abstract class CustomerBean implements javax.ejb.EntityBean { - - public Integer ejbCreate(Integer id) throws javax.ejb.CreateException{ - this.setId(id); - return null; - } - - public void ejbPostCreate(Integer id){ - } - - - // business methods - - public Name getName() { - Name name = new Name(getLastName(),getFirstName()); - return name; - } - public void setName(Name name) { - setLastName(name.getLastName()); - setFirstName(name.getFirstName()); - } - - public void setAddress(String street, String city, String state, String zip) - throws EJBException { - - AddressLocal addr = this.getHomeAddress( ); - - try { - - if (addr == null) { - // Customer doesn't have an address yet. Create a new one. - InitialContext cntx = new InitialContext( ); - AddressHomeLocal addrHome = - (AddressHomeLocal)cntx.lookup("java:comp/env/ejb/AddressHomeLocal"); - addr = addrHome.createAddress(street, city, state, zip); - this.setHomeAddress(addr); - } else { - // Customer already has an address. Change its fields - addr.setStreet(street); - addr.setCity(city); - addr.setState(state); - addr.setZip(zip); - } - } catch (NamingException ne) { - throw new EJBException(ne); - } catch (CreateException ce) { - throw new EJBException(ce); - } - } - - public void setAddress(AddressDO addrValue) throws CreateException, NamingException { - String street = addrValue.getStreet(); - String city = addrValue.getCity(); - String state = addrValue.getState(); - String zip = addrValue.getZip(); - - setAddress(street,city,state,zip); - } - - - public AddressDO getAddress() { - - AddressLocal addrLocal = this.getHomeAddress(); - if (addrLocal == null) return null; - String street = addrLocal.getStreet(); - String city = addrLocal.getCity(); - String state = addrLocal.getState(); - String zip = addrLocal.getZip(); - AddressDO addrValue = new AddressDO(street,city,state,zip); - return addrValue; - } - - public void addPhoneNumber(String number, byte type) - throws NamingException, CreateException { - InitialContext jndiEnc = new InitialContext( ); - PhoneHomeLocal phoneHome = (PhoneHomeLocal)(jndiEnc.lookup("java:comp/env/ejb/PhoneHomeLocal")); - - PhoneLocal phone = phoneHome.create(number,type); - Collection phoneNumbers = this.getPhoneNumbers( ); - phoneNumbers.add(phone); - } - - public void removePhoneNumber(byte typeToRemove) { - - Collection phoneNumbers = this.getPhoneNumbers( ); - Iterator iterator = phoneNumbers.iterator(); - - while(iterator.hasNext()){ - PhoneLocal phone = (PhoneLocal)iterator.next(); - if (phone.getType() == typeToRemove) { - phoneNumbers.remove(phone); - break; - } - - } - } - - public void updatePhoneNumber(String number, byte typeToUpdate) { - - - Collection phoneNumbers = this.getPhoneNumbers( ); - Iterator iterator = phoneNumbers.iterator(); - while(iterator.hasNext()){ - PhoneLocal phone = (PhoneLocal)iterator.next(); - if (phone.getType() == typeToUpdate) { - phone.setNumber(number); - break; - } - } - } - - public Vector getPhoneList() { - - Vector vv = new Vector(); - Collection phoneNumbers = this.getPhoneNumbers(); - - Iterator iterator = phoneNumbers.iterator(); - while(iterator.hasNext()) { - PhoneLocal phone = (PhoneLocal)iterator.next(); - String ss = "type = '" + phone.getType() + "', number = '" + phone.getNumber() + "'"; - vv.add(ss); - } - - return vv; - } - - - // persistent relationships - - public abstract AddressLocal getHomeAddress(); - public abstract void setHomeAddress(AddressLocal address); - - public abstract CreditCardLocal getCreditCard(); - public abstract void setCreditCard(CreditCardLocal card); - - public abstract java.util.Collection getPhoneNumbers( ); - public abstract void setPhoneNumbers(java.util.Collection phones); - - public abstract java.util.Collection getReservations(); - public abstract void setReservations(java.util.Collection reservations); - - - // abstract accessor methods - public abstract Integer getId(); - public abstract void setId(Integer id); - - public abstract String getLastName( ); - public abstract void setLastName(String lname); - - public abstract String getFirstName( ); - public abstract void setFirstName(String fname); - - public abstract boolean getHasGoodCredit(); - public abstract void setHasGoodCredit(boolean flag); - - // standard call back methods - - public void setEntityContext(EntityContext ec){} - public void unsetEntityContext(){} - public void ejbLoad(){} - public void ejbStore(){} - public void ejbActivate(){} - public void ejbPassivate(){} - public void ejbRemove() throws javax.ejb.RemoveException {} - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerHomeLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerHomeLocal.java deleted file mode 100644 index ec021688a65fd0750e71b03f0d5c88ba4a876da6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerHomeLocal.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.titan.customer; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.FinderException; -import java.util.Collection; -import com.titan.cruise.CruiseLocal; - -public interface CustomerHomeLocal extends javax.ejb.EJBLocalHome { - - public CustomerLocal create(Integer id) - throws CreateException; - public CustomerLocal findByPrimaryKey(Integer id) - throws FinderException; - - public Collection findAllCustomers() - throws FinderException; - - public Collection findByName(String lastName, String firstName) - throws FinderException; - - public CustomerLocal findByExactName(String lastName, String firstName) - throws FinderException; - - public Collection findByNameAndState(String lastName, String firstName, String state) - throws FinderException; - - public CustomerLocal findSmith90() - throws FinderException; - - public Collection findByGoodCredit() - throws FinderException; - - public Collection findByCity(String city, String state) - throws FinderException; - - public Collection findInHotStates() - throws FinderException; - - public Collection findWithNoReservations() - throws FinderException; - - public Collection findOnCruise(CruiseLocal cruise) - throws FinderException; - - public Collection findByState(String state) - throws FinderException; -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerHomeRemote.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerHomeRemote.java deleted file mode 100644 index d240be88ab6484a9cab3b98b5c8ba0a041c972d6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerHomeRemote.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.titan.customer; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.FinderException; - -public interface CustomerHomeRemote extends javax.ejb.EJBHome { - - public CustomerRemote create(Integer id) throws CreateException, RemoteException; - public CustomerRemote findByPrimaryKey(Integer id) throws FinderException, RemoteException; - -} - diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerLocal.java deleted file mode 100644 index 8238a42dd77a4ea3a0c1275e56d539e73b5db0f8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerLocal.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.titan.customer; - -import com.titan.address.*; - -import javax.ejb.CreateException; -import javax.naming.NamingException; -import java.util.Date; -import java.util.Vector; -import java.util.Collection; - -public interface CustomerLocal extends javax.ejb.EJBLocalObject { - - public Name getName(); - public void setName(Name name); - - public boolean getHasGoodCredit(); - public void setHasGoodCredit(boolean flag); - - public void addPhoneNumber(String number, byte type) - throws NamingException, CreateException; - public void removePhoneNumber(byte typeToRemove); - public void updatePhoneNumber(String number, byte typeToUpdate); - - public Vector getPhoneList(); - - public AddressLocal getHomeAddress(); - public void setHomeAddress(AddressLocal address); - - public CreditCardLocal getCreditCard(); - public void setCreditCard(CreditCardLocal card); - - public Collection getPhoneNumbers( ); - public void setPhoneNumbers(Collection phones); - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerRemote.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerRemote.java deleted file mode 100644 index c35c1193a7eb392f48980330432a35e44be7b01c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/CustomerRemote.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.titan.customer; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.naming.NamingException; - -public interface CustomerRemote extends javax.ejb.EJBObject { - - public void setAddress(String street, String city, String state, String zip) - throws RemoteException, CreateException, NamingException; - - public void setAddress(AddressDO address) - throws RemoteException, CreateException, NamingException; - - public AddressDO getAddress() throws RemoteException; - - public Name getName() throws RemoteException; - public void setName(Name name) throws RemoteException; - - public boolean getHasGoodCredit() throws RemoteException; - public void setHasGoodCredit(boolean flag) throws RemoteException; - // public String getHasGoodCredit() throws RemoteException; - // public void setHasGoodCredit(String flag) throws RemoteException; - // public double getHasGoodCredit() throws RemoteException; - //public void setHasGoodCredit(double flag) throws RemoteException; -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/Name.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/Name.java deleted file mode 100644 index 33e856a46106e4e2555e5fab753581d7c4dde0c6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/customer/Name.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.titan.customer; - -public class Name implements java.io.Serializable { - - private String lastName; - private String firstName; - - public Name(String lname, String fname){ - lastName = lname; - firstName = fname; - } - public String getLastName() { - return lastName; - } - public String getFirstName() { - return firstName; - } -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/phone/PhoneBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/phone/PhoneBean.java deleted file mode 100644 index 7b40bead9250900b659c33207904d3661c4ad5ad..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/phone/PhoneBean.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.titan.phone; - -import javax.ejb.EntityContext; -import java.util.Date; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -public abstract class PhoneBean implements javax.ejb.EntityBean { - - public Object ejbCreate(String number, byte type) throws javax.ejb.CreateException { - setNumber(number); - setType(type); - - return null; - } - - public void ejbPostCreate(String number, byte type) { - } - - // persistent fields - public abstract String getNumber(); - public abstract void setNumber(String number); - public abstract byte getType(); - public abstract void setType(byte type); - - // standard call back methods - - public void setEntityContext(EntityContext ec){} - public void unsetEntityContext(){} - public void ejbLoad(){} - public void ejbStore(){} - public void ejbActivate(){} - public void ejbPassivate(){} - public void ejbRemove() throws javax.ejb.RemoveException{} - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/phone/PhoneHomeLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/phone/PhoneHomeLocal.java deleted file mode 100644 index 1bbae830ef4b6016dcb9619aeba824bc3f6e8049..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/phone/PhoneHomeLocal.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.titan.phone; - -import javax.ejb.CreateException; -import javax.ejb.FinderException; -import java.util.Collection; - -// Phone EJB's local home interface -public interface PhoneHomeLocal extends javax.ejb.EJBLocalHome { - - public PhoneLocal create(String number, byte type) - throws javax.ejb.CreateException; - - public PhoneLocal findByPrimaryKey(Object primaryKey) - throws javax.ejb.FinderException; - - public Collection findAllPhones() - throws javax.ejb.FinderException; - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/phone/PhoneLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/phone/PhoneLocal.java deleted file mode 100644 index 59f03b92d043bbe6d313d260d3b778dac034fed1..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/phone/PhoneLocal.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.titan.phone; - -// Phone EJB's local interface -public interface PhoneLocal extends javax.ejb.EJBLocalObject { - - public String getNumber(); - public void setNumber(String number); - public byte getType(); - public void setType(byte type); - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/reservation/ReservationBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/reservation/ReservationBean.java deleted file mode 100644 index 46b011bbd09d40af8dbca0362b8b3a0b753ca69e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/reservation/ReservationBean.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.titan.reservation; - -import com.titan.cruise.*; - -import javax.ejb.CreateException; -import javax.ejb.RemoveException; -import javax.ejb.EntityContext; -import java.util.Date; -import java.util.Set; -import java.util.Collection; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -public abstract class ReservationBean implements javax.ejb.EntityBean { - public Object ejbCreate(CruiseLocal cruise, Collection customers) throws CreateException { - return null; - } - - public void ejbPostCreate(CruiseLocal cruise, Collection customers) { - setCruise(cruise); - Collection myCustomers = this.getCustomers(); - myCustomers.addAll(customers); - } - - // relationship fields - - public abstract CruiseLocal getCruise(); - public abstract void setCruise(CruiseLocal cruise); - - public abstract Set getCabins( ); - public abstract void setCabins(Set cabins); - - public abstract Set getCustomers( ); - public abstract void setCustomers(Set customers); - - // persistent fields - public abstract Date getDate(); - public abstract void setDate(Date date); - public abstract double getAmountPaid(); - public abstract void setAmountPaid(double amount); - - // standard call back methods - - public void setEntityContext(EntityContext ec){} - public void unsetEntityContext(){} - public void ejbLoad(){} - public void ejbStore(){} - public void ejbActivate(){} - public void ejbPassivate(){} - public void ejbRemove() throws RemoveException {} - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/reservation/ReservationHomeLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/reservation/ReservationHomeLocal.java deleted file mode 100644 index 9c649f0081c9b58108e26715c3bc90574c762ba0..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/reservation/ReservationHomeLocal.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.titan.reservation; - -import com.titan.cruise.*; - -import java.util.Collection; -import javax.ejb.CreateException; -import javax.ejb.FinderException; - -// Reservation EJB's local home interface -public interface ReservationHomeLocal extends javax.ejb.EJBLocalHome { - - public ReservationLocal create(CruiseLocal cruise, Collection customers) - throws javax.ejb.CreateException; - - public ReservationLocal findByPrimaryKey(Object primaryKey) - throws javax.ejb.FinderException; - - public Collection findAllReservations() throws FinderException; - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/reservation/ReservationLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/reservation/ReservationLocal.java deleted file mode 100644 index 9a4442856c33b7be0f5b72448dd77b33152ed22c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/reservation/ReservationLocal.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.titan.reservation; - -import com.titan.cruise.*; - -import java.util.Date; -import java.util.Set; - -// Reservation EJB's local interface -public interface ReservationLocal extends javax.ejb.EJBLocalObject { - - public Date getDate(); - public void setDate(Date date); - public double getAmountPaid(); - public void setAmountPaid(double amount); - - public CruiseLocal getCruise(); - public void setCruise(CruiseLocal cruise); - - public Set getCabins( ); - public void setCabins(Set customers); - - public Set getCustomers( ); - public void setCustomers(Set customers); - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/ship/ShipBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/ship/ShipBean.java deleted file mode 100644 index b3923d703ce0c52c0c24c727a3f17e4ceb459757..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/ship/ShipBean.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.titan.ship; - -import javax.ejb.EntityContext; -import javax.ejb.CreateException; -import javax.ejb.RemoveException; - -public abstract class ShipBean implements javax.ejb.EntityBean { - - public Integer ejbCreate(Integer primaryKey, String name, double tonnage) throws CreateException { - setId(primaryKey); - setName(name); - setTonnage(tonnage); - return null; - } - - public void ejbPostCreate(Integer primaryKey, String name, double tonnage) { - } - - // persistent fields - - public abstract void setId(Integer id); - public abstract Integer getId(); - public abstract void setName(String name); - public abstract String getName( ); - public abstract void setTonnage(double tonnage); - public abstract double getTonnage( ); - - // standard call back methods - - public void setEntityContext(EntityContext ec){} - public void unsetEntityContext(){} - public void ejbLoad(){} - public void ejbStore(){} - public void ejbActivate(){} - public void ejbPassivate(){} - public void ejbRemove() throws RemoveException {} - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/ship/ShipHomeLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/ship/ShipHomeLocal.java deleted file mode 100644 index 80028c831fba8dfd456a2acb076f09515e6100d2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/ship/ShipHomeLocal.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.titan.ship; - -import javax.ejb.CreateException; -import javax.ejb.FinderException; -import java.util.Collection; - -// Ship EJB's local home interface -public interface ShipHomeLocal extends javax.ejb.EJBLocalHome { - - public ShipLocal create(Integer primaryKey, String name, double tonnage) - throws javax.ejb.CreateException; - - public ShipLocal findByPrimaryKey(Object primaryKey) - throws javax.ejb.FinderException; - - public Collection findAllShips() - throws FinderException; - - public Collection findByTonnage(Double tonnage) - throws javax.ejb.FinderException; - - public Collection findByTonnage(Double tonnage1, Double tonnage2) - throws javax.ejb.FinderException; - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/ship/ShipLocal.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/ship/ShipLocal.java deleted file mode 100644 index 539b05b1d3feb1081c92825f1485b2922c569630..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/ship/ShipLocal.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.titan.ship; - -// Ship EJB's local interface -public interface ShipLocal extends javax.ejb.EJBLocalObject { - - public Integer getId(); - public void setId(Integer id); - public String getName(); - public void setName(String name); - public double getTonnage(); - public void setTonnage(double tonnage); - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/RTravelAgentBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/RTravelAgentBean.java deleted file mode 100644 index e33e41900f70073af3914d75612f93022c87407a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/RTravelAgentBean.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.titan.travelagent; - -import com.titan.cabin.CabinRemote; -import com.titan.cabin.CabinHomeRemote; -import java.rmi.RemoteException; -import javax.naming.InitialContext; -import javax.naming.Context; -import javax.ejb.EJBException; -import java.util.Properties; -import java.util.Vector; - -public class RTravelAgentBean implements javax.ejb.SessionBean { - - public void ejbCreate() throws javax.ejb.CreateException { - // Do nothing. - } - - public String [] listCabins(int shipID, int bedCount) { - - try { - - javax.naming.Context jndiContext = new InitialContext(); - Object obj = - jndiContext.lookup("java:comp/env/ejb/CabinHomeRemote"); - - - CabinHomeRemote home = (CabinHomeRemote) - javax.rmi.PortableRemoteObject.narrow(obj,CabinHomeRemote.class); - - Vector vect = new Vector(); - for (int i = 1; ; i++) { - Integer pk = new Integer(i); - CabinRemote cabin = null; - try { - cabin = home.findByPrimaryKey(pk); - } catch(javax.ejb.FinderException fe) { - System.out.println(">>>> Caught exception: "+fe.getMessage()+" for pk="+i); - break; - } - - // Check to see if the bed count and ship ID match - if (cabin != null && - cabin.getShipId() == shipID && - cabin.getBedCount() == bedCount) { - String details = i+","+cabin.getName()+","+cabin.getDeckLevel(); - vect.addElement(details); - } - } - - String [] list = new String[vect.size()]; - vect.copyInto(list); - return list; - - } catch(Exception e) { - throw new EJBException(e); - } - } - - public void ejbRemove() {} - public void ejbActivate(){} - public void ejbPassivate(){} - public void setSessionContext(javax.ejb.SessionContext cntx){} -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/RTravelAgentHomeRemote.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/RTravelAgentHomeRemote.java deleted file mode 100644 index 398027d8bfbb84c85a73955016297fc5548685e1..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/RTravelAgentHomeRemote.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.titan.travelagent; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; - -public interface RTravelAgentHomeRemote extends javax.ejb.EJBHome { - - public RTravelAgentRemote create() - throws RemoteException, CreateException; - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/RTravelAgentRemote.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/RTravelAgentRemote.java deleted file mode 100644 index d374852dcecc2b3248c624907fc265aa340365d8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/RTravelAgentRemote.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.titan.travelagent; - -import java.rmi.RemoteException; -import javax.ejb.FinderException; - -public interface RTravelAgentRemote extends javax.ejb.EJBObject { - - // String elements follow the format "id, name, deck level" - public String [] listCabins(int shipID, int bedCount) - throws RemoteException; - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/TravelAgentBean.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/TravelAgentBean.java deleted file mode 100644 index 429d50148b500e37a481359db63514c9c7b7db97..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/TravelAgentBean.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.titan.travelagent; - -import com.titan.cabin.CabinLocal; -import com.titan.cabin.CabinHomeLocal; -import java.rmi.RemoteException; -import javax.naming.InitialContext; -import javax.naming.Context; -import javax.ejb.EJBException; -import java.util.Properties; -import java.util.Vector; - -public class TravelAgentBean implements javax.ejb.SessionBean { - - public void ejbCreate() throws javax.ejb.CreateException { - // Do nothing. - } - - public String [] listCabins(int shipID, int bedCount) { - - try { - - javax.naming.Context jndiContext = new InitialContext(); - Object obj = - jndiContext.lookup("java:comp/env/ejb/CabinHomeLocal"); - - - CabinHomeLocal home = (CabinHomeLocal) - javax.rmi.PortableRemoteObject.narrow(obj,CabinHomeLocal.class); - - Vector vect = new Vector(); - for (int i = 1; ; i++) { - Integer pk = new Integer(i); - CabinLocal cabin = null; - try { - cabin = home.findByPrimaryKey(pk); - } catch(javax.ejb.FinderException fe) { - System.out.println(">>>> Caught exception: "+fe.getMessage()+" for pk="+i); - break; - } - - // Check to see if the bed count and ship ID match - if (cabin != null && - // cabin.getShipId() == shipID && //getShipId only exist in Remote interface - cabin.getBedCount() == bedCount) { - String details = i+","+cabin.getName()+","+cabin.getDeckLevel(); - vect.addElement(details); - } - } - - String [] list = new String[vect.size()]; - vect.copyInto(list); - return list; - - } catch(Exception e) { - throw new EJBException(e); - } - } - - public void ejbRemove() {} - public void ejbActivate(){} - public void ejbPassivate(){} - public void setSessionContext(javax.ejb.SessionContext cntx){} -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/TravelAgentHomeRemote.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/TravelAgentHomeRemote.java deleted file mode 100644 index 9ff3a8a764bf17b09e6852935270d46c5ecbbfe4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/TravelAgentHomeRemote.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.titan.travelagent; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; - -public interface TravelAgentHomeRemote extends javax.ejb.EJBHome { - - public TravelAgentRemote create() - throws RemoteException, CreateException; - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/TravelAgentRemote.java b/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/TravelAgentRemote.java deleted file mode 100644 index 4b41e145c3d6143188a5e6ad66081a292e844a50..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/com/titan/travelagent/TravelAgentRemote.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.titan.travelagent; - -import java.rmi.RemoteException; -import javax.ejb.FinderException; - -public interface TravelAgentRemote extends javax.ejb.EJBObject { - - // String elements follow the format "id, name, deck level" - public String [] listCabins(int shipID, int bedCount) - throws RemoteException; - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/servlets/ServletTest.java b/jonas_tests/examples/base/examples/cmp2/src/servlets/ServletTest.java deleted file mode 100644 index 0efa9b1d8cbf76c277e539a4f9cd07053469eace..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/servlets/ServletTest.java +++ /dev/null @@ -1,410 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package servlets; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Calendar; -import java.util.Vector; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.titan.address.AddressHomeLocal; -import com.titan.address.AddressLocal; -import com.titan.customer.CreditCardHomeLocal; -import com.titan.customer.CreditCardLocal; -import com.titan.customer.CustomerHomeLocal; -import com.titan.customer.CustomerLocal; -import com.titan.customer.Name; -import com.titan.phone.PhoneLocal; - - - -/** - * This servlet is used to test O'Reilly examples - * @author JOnAS team - */ -public class ServletTest extends HttpServlet { - - /** - * Called by the server (via the service method) to allow a servlet to - * handle a GET request. - * @param request an HttpServletRequest object that contains the request - * the client has made of the servlet - * @param response an HttpServletResponse object that contains the - * response the servlet sends to the client - * @throws IOException if an input or output error is detected when the - * servlet handles the GET request - * @throws ServletException if the request for the GET could not be handled - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { - - boolean ok = true; - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - - out.println(""); - out.println(""); - out.println(""); - out.println("O'Reilly Examples"); - out.println(""); - out.println(""); - out.println(""); - out.println("

    Examples 1:1 Relationships

    "); - - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - out.println("

    ERROR: Cannot get initial context for JNDI: " + e + "

    "); - return; - } - - out.println("Back to Menu"); - - - out.println("

    Example showing CreditCard/Customer relationship

    "); - - out.println("

    (ie Setting reference in a one-to-one bidirectional relationship)

    "); - - // Connecting to CustomerHomeLocal and CreditCardHomeLocal thru JNDI - CustomerHomeLocal customerhome = null; - CreditCardHomeLocal cardhome = null; - AddressHomeLocal addresshome = null; - - try { - customerhome = (CustomerHomeLocal) - initialContext.lookup("java:comp/env/ejb/CustomerHomeLocal"); - cardhome = (CreditCardHomeLocal) - initialContext.lookup("java:comp/env/ejb/CreditCardHomeLocal"); - addresshome = (AddressHomeLocal) - initialContext.lookup("java:comp/env/ejb/AddressHomeLocal"); - } catch (Exception e) { - out.println("

    ERROR: Cannot lookup java:comp/env/ejb/XXHomeLocal: " - + e + "

    "); - return; - } - - out.println("

    Creating Customer 'Smith'.

    "); - Integer primaryKey = new Integer(71); - CustomerLocal customer = null; - try { - customer = customerhome.create(primaryKey); - } catch (javax.ejb.CreateException ex) { - out.println("

    Cannot create customer: " - + ex + "

    "); - return; - } - customer.setName(new Name("Smith", "John")); - - out.println("

    Creating CreditCard.

    "); - // set Credit Card info - Calendar now = Calendar.getInstance(); - CreditCardLocal card = null; - try { - card = cardhome.create(now.getTime(), "370000000000001", "John Smith", "O'Reilly"); - } catch (javax.ejb.CreateException ex) { - out.println("

    ERROR: Cannot create creditcard : " + ex + "

    "); - return; - } - - out.println("

    Linking CreditCard and Customer.

    "); - customer.setCreditCard(card); - - out.println("

    Testing both directions on relationship:

    "); - String cardname = customer.getCreditCard().getNameOnCard(); - out.println("customer.getCreditCard().getNameOnCard() = '" + cardname + "'
    "); - Name name = card.getCustomer().getName(); - String custfullname = name.getFirstName() + " " + name.getLastName(); - out.println("card.getCustomer().getName() = '" + custfullname + "'
    "); - if (!cardname.equals(custfullname)) { - out.println("

    ERROR: The name must be the same

    "); - ok = false; - } - out.println("

    Content of Tables:

    "); - try { - listCustomers(out, customerhome); - listCreditcards(out, cardhome); - } catch (Exception e) { - out.println("

    ERROR: exception caught = " + e + "

    "); - } - - out.println("

    Unlink the beans using CreditCard, test Customer side:

    "); - card.setCustomer(null); - CreditCardLocal newcardref = customer.getCreditCard(); - if (newcardref == null) { - out.print("

    Card is properly unlinked from customer bean

    "); - } else { - out.print("

    ERROR: Whoops, customer still thinks it has a card !

    "); - ok = false; - } - // relink to avoid side effect on further test - card.setCustomer(customer); - - - out.println("

    Example Showing Customer/Address Relationship

    "); - out.println("

    (ie Setting reference in a one-to-one unidirectional relationship)

    "); - - // Find Customer 71 - primaryKey = new Integer(71); - try { - customer = customerhome.findByPrimaryKey(primaryKey); - } catch (Exception e) { - out.println("

    ERROR: Exception : " + e + "

    "); - return; - } - - AddressLocal addr = customer.getHomeAddress(); - if (addr == null) { - out.println("

    Address reference is NULL, Creating one and setting in Customer:

    "); - try { - addr = addresshome.createAddress("333 North Washington", "Minneapolis", "MN", "55401"); - } catch (Exception e) { - out.println("

    ERROR: Exception : " + e + "

    "); - return; - } - customer.setHomeAddress(addr); - } - out.println("

    Address Info: " - + addr.getStreet() + ", " - + addr.getCity() + ", " - + addr.getState() + ", " - + addr.getZip() + "

    "); - // Modifying Address - - out.println("

    Modifying Address through address reference:

    "); - addr.setStreet("445 East Lake Street"); - addr.setCity("Wayzata"); - addr.setState("MN"); - addr.setZip("55432"); - out.println("

    Address Info: " - + addr.getStreet() + ", " - + addr.getCity() + ", " - + addr.getState() + ", " - + addr.getZip() + "

    "); - - out.print("

    Creating New Address and calling setHomeAddress():

    "); - AddressLocal addrold = addr; - try { - addr = addresshome.createAddress("700 Main Street", "St. Paul", "MN", "55302"); - } catch (Exception e) { - out.println("

    ERROR: Exception : " + e + "

    "); - return; - } - out.println("

    Address Info: " - + addr.getStreet() + ", " - + addr.getCity() + ", " - + addr.getState() + ", " - + addr.getZip() + "

    "); - customer.setHomeAddress(addr); - - // Note: Original Address remains in database, orphaned by setHomeAddress call.. - - - out.print("

    Retrieving Address reference from Customer via getHomeAddress():

    "); - addr = customer.getHomeAddress(); - out.print("

    Address Info: " - + addr.getStreet() + ", " - + addr.getCity() + ", " - + addr.getState() + ", " - + addr.getZip() + "

    "); - - out.print("

    Content of Tables:

    "); - try { - listCustomers(out, customerhome); - listAddress(out, addresshome); - } catch (Exception e) { - out.println("

    ERROR: exception caught = " + e + "

    "); - return; - } - - - out.println("

    Example Showing Customer/Phone Relationship

    "); - - // Display current phone numbers and types - out.println("

    Starting content of phone list:

    "); - - Vector vv = customer.getPhoneList(); - listPhones(out, vv); - - // add a new phone number - out.println("

    Adding a new type '1' phone number to Customer 'John Smith'.

    "); - try { - customer.addPhoneNumber("612-555-1212", (byte) 1); - } catch (Exception e) { - out.println("

    ERROR: Exception : " + e + "

    "); - return; - } - - out.println("

    New content of phone list for customer 'John Smith':

    "); - vv = customer.getPhoneList(); - listPhones(out, vv); - - // add a new phone number - out.println("

    Adding a new type '2' phone number to Customer 'John Smith'.

    "); - try { - customer.addPhoneNumber("800-333-3333", (byte) 2); - } catch (Exception e) { - out.println("

    ERROR: Exception : " + e + "

    "); - return; - } - out.println("

    New content of phone list for customer 'John Smith':

    "); - vv = customer.getPhoneList(); - listPhones(out, vv); - - // update a phone number - out.println("

    Updating type '1' phone numbers.

    "); - try { - customer.updatePhoneNumber("763-555-1212", (byte) 1); - } catch (Exception e) { - out.println("

    ERROR: Exception : " + e + "

    "); - return; - } - - out.println("

    New content of phone list for customer 'John Smith':

    "); - vv = customer.getPhoneList(); - listPhones(out, vv); - - // delete a phone number - out.print("

    Removing type '1' phone numbers from this Customer.

    "); - customer.removePhoneNumber((byte) 1); - - out.println("

    Final content of phone list:

    "); - vv = customer.getPhoneList(); - listPhones(out, vv); - // Note that the phone is still in the database, - // but it is no longer related to this customer bean - - // Remove newly created beans for clean - out.println("

    Remove newly created beans for cleaning.

    "); - try { - customer.remove(); - addrold.remove(); - } catch (Exception e) { - out.println("

    Exception : " + e + "

    "); - return; - } - - if (ok) { - out.println("

    Servlet is OK.

    "); - } - - out.println("Back to Menu"); - out.println(""); - out.println(""); - } - - private void listCustomers (PrintWriter out, CustomerHomeLocal chl) throws Exception { - out.println("

    Customers Table Content:

    "); - out.println("
      "); - java.util.Collection clc = chl.findAllCustomers(); - if (clc == null) { - out.println("
    • Customers table is empty
    • "); - } else { - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - CustomerLocal cl = (CustomerLocal) iterator.next(); - String name = cl.getName().getLastName(); - String number = cl.getCreditCard().getNumber(); - out.print("
    • customerLastName = '" + name + "', creditCardNumber = '" + number); - if (cl.getHomeAddress() != null) { - String city = cl.getHomeAddress().getCity(); - out.print("', city = '" + city); - } - out.println("'
    • "); - java.util.Collection phoneNumbers = cl.getPhoneNumbers(); - java.util.Iterator phiterator = phoneNumbers.iterator(); - out.println("
        "); - while (phiterator.hasNext()) { - PhoneLocal phone = (PhoneLocal) phiterator.next(); - out.println("
      • phoneType = '" + phone.getType() - + "', phoneNumber = '" + phone.getNumber() + "'
      • "); - } - out.println("
      "); - - } - } - out.println("
    "); - } - - private void listCreditcards (PrintWriter out, CreditCardHomeLocal cchl) throws Exception { - out.println("

    Creditcards Table Content:

    "); - out.println("
      "); - java.util.Collection clc = cchl.findAllCreditCards(); - if (clc == null) { - out.println("
    • CreditCards table is empty
    • "); - } else { - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - CreditCardLocal ccl = (CreditCardLocal) iterator.next(); - String number = ccl.getNumber(); - String name = ccl.getNameOnCard(); - out.println("
    • creditCardNumber = '" + number - + "', nameOnCard = '" + name + "'
    • "); - } - } - out.println("
    "); - } - - private void listAddress (PrintWriter out, AddressHomeLocal cchl) throws Exception { - out.println("

    Addresses Table Content:

    "); - out.println("
      "); - java.util.Collection clc = cchl.findAllAddress(); - if (clc == null) { - out.println("
    • Addresses table is empty
    • "); - } else { - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - AddressLocal al = (AddressLocal) iterator.next(); - String city = al.getCity(); - String street = al.getStreet(); - out.println("
    • city = '" + city + "', street = '" + street + "'
    • "); - } - } - out.println("
    "); - } - - private void listPhones(PrintWriter out, Vector vv) { - out.println("
      "); - if (vv.size() == 0) { - out.println("
    • phones list is empty
    • "); - } else { - for (int jj = 0; jj < vv.size(); jj++) { - String ss = (String) (vv.get(jj)); - out.println("
    • " + ss + "
    • "); - } - } - out.println("
    "); - } - -} diff --git a/jonas_tests/examples/base/examples/cmp2/src/servlets/ServletTest2.java b/jonas_tests/examples/base/examples/cmp2/src/servlets/ServletTest2.java deleted file mode 100644 index c6d8f96452f31a4154d4a3bc1f8125120efda243..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/servlets/ServletTest2.java +++ /dev/null @@ -1,857 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package servlets; - -import java.io.IOException; -import java.io.PrintWriter; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; - -import com.titan.cabin.CabinHomeLocal; -import com.titan.cabin.CabinLocal; -import com.titan.cruise.CruiseHomeLocal; -import com.titan.cruise.CruiseLocal; -import com.titan.customer.CustomerHomeLocal; -import com.titan.customer.CustomerLocal; -import com.titan.customer.Name; -import com.titan.reservation.ReservationHomeLocal; -import com.titan.reservation.ReservationLocal; -import com.titan.ship.ShipHomeLocal; -import com.titan.ship.ShipLocal; - -/** - * This servlet is used to test O'Reilly examples - * @author JOnAS team - */ -public class ServletTest2 extends HttpServlet { - - /** - * Called by the server (via the service method) to allow a servlet to - * handle a GET request. - * @param request an HttpServletRequest object that contains the request the - * client has made of the servlet - * @param response an HttpServletResponse object that contains the response - * the servlet sends to the client - * @throws IOException if an input or output error is detected when the - * servlet handles the GET request - * @throws ServletException if the request for the GET could not be handled - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - - boolean ok = true; - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - out.println(""); - out.println(""); - out.println(""); - out.println("O'Reilly Examples (Suite)"); - out.println(""); - out.println(""); - out.println(""); - out.println("

    Example Showing Cruise/Ship and Cruise/Reservation Relationships

    "); - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - out.println("

    ERROR: Cannot get initial context for JNDI: " + e + "

    "); - return; - } - - // Connecting to ShipHomeLocal thru JNDI - ShipHomeLocal shiphome = null; - CruiseHomeLocal cruisehome = null; - ReservationHomeLocal reservationhome = null; - CustomerHomeLocal customerhome = null; - CabinHomeLocal cabinhome = null; - UserTransaction tran = null; - try { - shiphome = (ShipHomeLocal) initialContext.lookup("java:comp/env/ejb/ShipHomeLocal"); - cruisehome = (CruiseHomeLocal) initialContext.lookup("java:comp/env/ejb/CruiseHomeLocal"); - reservationhome = (ReservationHomeLocal) initialContext.lookup("java:comp/env/ejb/ReservationHomeLocal"); - customerhome = (CustomerHomeLocal) initialContext.lookup("java:comp/env/ejb/CustomerHomeLocal"); - cabinhome = (CabinHomeLocal) initialContext.lookup("java:comp/env/ejb/CabinHomeLocal"); - tran = (UserTransaction) initialContext.lookup("java:comp/UserTransaction"); - } catch (Exception e) { - out.println("

    ERROR: Cannot lookup java:comp/env/ejb/XXHomeLocal: " + e + "

    "); - return; - - } - - out.println("Back to Menu"); - - out.println("

    Example Showing Cruise/Ship Relationship (Fig 7-12)

    "); - out.println("

    (ie Sharing a bean reference in a Many-to-One Relationship)

    "); - - out.println("

    Creating Ships

    "); - // Create some Ship beans - manually set key - ShipLocal shipA = null; - ShipLocal shipB = null; - try { - shipA = shiphome.create(new Integer(1001), "Ship A", 30000.0); - shipB = shiphome.create(new Integer(1002), "Ship B", 40000.0); - } catch (Exception e) { - out.println("

    ERROR: Exception caught " + e + "

    "); - return; - } - out.println("
      "); - out.println("
    • id = '" + shipA.getId() + "', name = '" + shipA.getName() + "', tonnage = '" - + shipA.getTonnage() + "'
    • "); - out.println("
    • id = '" + shipB.getId() + "', name=" + shipB.getName() + "', tonnage = '" + shipB.getTonnage() - + "
    • "); - out.println("
    "); - - out.println("

    Creating Cruises

    "); - // Create some Cruise beans - automatic key generation by CMP engine - // Link 1-3 to Ship A, 4-6 to Ship B - CruiseLocal[] cruises = new CruiseLocal[7]; - try { - cruises[1] = cruisehome.create("Cruise 1", shipA); - cruises[2] = cruisehome.create("Cruise 2", shipA); - cruises[3] = cruisehome.create("Cruise 3", shipA); - cruises[4] = cruisehome.create("Cruise 4", shipB); - cruises[5] = cruisehome.create("Cruise 5", shipB); - cruises[6] = cruisehome.create("Cruise 6", shipB); - } catch (Exception e) { - out.println("

    ERROR: Exception caught " + e + "

    "); - return; - } - out.println("
      "); - for (int jj = 1; jj < 7; jj++) { - CruiseLocal cc = cruises[jj]; - out.println("
    • '" + cc.getName() + "' is using '" + cc.getShip().getName() + "'
    • "); - } - out.println("
    "); - - out.print("

    Changing 'Cruise 1' to use same ship as 'Cruise 4'

    "); - ShipLocal newship = cruises[4].getShip(); - cruises[1].setShip(newship); - out.println("
      "); - for (int jj = 1; jj < 7; jj++) { - CruiseLocal cc = cruises[jj]; - out.println("
    • '" + cc.getName() + "' is using '" + cc.getShip().getName() + "'
    • "); - } - out.println("
    "); - - out.println("

    Content of Tables

    "); - try { - listCruises(out, cruisehome); - listShips(out, shiphome); - } catch (Exception e) { - out.println("

    ERROR: exception caught = " + e + "

    "); - } - - out.println("

    Example Showing Cruise/Reservation Relationship Using set() (Fig 7-14)

    "); - out - .println("

    (ie Sharing an entire collection in a One-to-Many bidirectional Relationship Using set() )

    "); - out.println("

    Creating some Cruise beans

    "); - // Create some Cruise beans - leave ship reference empty since we don't - // care - CruiseLocal cruiseA = null; - CruiseLocal cruiseB = null; - try { - cruiseA = cruisehome.create("Cruise A", null); - cruiseB = cruisehome.create("Cruise B", null); - } catch (Exception e) { - out.println("

    ERROR: exception caught = " + e + "

    "); - } - out.println("
      "); - out.print("
    • name = '" + cruiseA.getName() + "'
    • "); - out.print("
    • name = '" + cruiseB.getName() + "'
    • "); - out.println("
    "); - - out.print("

    Creating Reservations

    "); - // Create some Reservation beans - automatic key generation by CMP - // engine - // Link 1-3 to Cruise A, 4-6 to Cruise B - ReservationLocal reservations[] = new ReservationLocal[7]; - Calendar date = Calendar.getInstance(); - date.set(2002, 10, 1); - // Leave the Customers collection null in the create() call, - // we don't care about it right now - try { - reservations[1] = reservationhome.create(cruiseA, null); - reservations[1].setDate(date.getTime()); - reservations[1].setAmountPaid(4000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[2] = reservationhome.create(cruiseA, null); - reservations[2].setDate(date.getTime()); - reservations[2].setAmountPaid(5000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[3] = reservationhome.create(cruiseA, null); - reservations[3].setDate(date.getTime()); - reservations[3].setAmountPaid(6000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[4] = reservationhome.create(cruiseB, null); - reservations[4].setDate(date.getTime()); - reservations[4].setAmountPaid(7000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[5] = reservationhome.create(cruiseB, null); - reservations[5].setDate(date.getTime()); - reservations[5].setAmountPaid(8000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[6] = reservationhome.create(cruiseB, null); - reservations[6].setDate(date.getTime()); - reservations[6].setAmountPaid(9000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - } catch (Exception e) { - out.println("

    ERROR: Exception caught " + e + "

    "); - return; - } - out.println("
      "); - DateFormat df = new SimpleDateFormat("MM/dd/yyyy"); - for (int jj = 1; jj < 7; jj++) { - ReservationLocal rr = reservations[jj]; - CruiseLocal thiscruise = rr.getCruise(); - String cruisename = (thiscruise != null ? thiscruise.getName() : "No Cruise!"); - out.println("
    • reservationDate = '" + df.format(rr.getDate()) + "', amountPaid = '" + rr.getAmountPaid() - + "', for '" + cruisename + "'
    • "); - } - out.println("
    "); - - out.println("

    Testing CruiseB.setReservations(CruiseA.getReservations())

    "); - // show the effect of a simple "setReservations" on a cruise - Collection areservations = cruiseA.getReservations(); - cruiseB.setReservations(areservations); - // Report information on the 6 reservations - String[] cruisename = new String[7]; - out.println("
      "); - for (int jj = 1; jj < 7; jj++) { - ReservationLocal rr = reservations[jj]; - CruiseLocal thiscruise = rr.getCruise(); - cruisename[jj] = (thiscruise != null ? thiscruise.getName() : "No Cruise!"); - out.print("
    • reservationDate = '" + df.format(rr.getDate()) + "', amount paid = '" + rr.getAmountPaid() - + "', for '" + cruisename[jj] + "'
    • "); - } - out.println("
    "); - if (!cruisename[4].equals("No Cruise!") || !cruisename[5].equals("No Cruise!") - || !cruisename[6].equals("No Cruise!")) { - ok = false; - } - - out.print("

    Content of Tables

    "); - try { - listCruises(out, cruisehome); - listReservations(out, reservationhome); - } catch (Exception e) { - out.println("

    ERROR: exception caught = " + e + "

    "); - return; - } - - out.println("

    Example Showing Cruise/Reservation Relationship Using addAll(..) (Fig 7-15)

    "); - out.print("

    (ie Using Collection.addAll() in a One-to-Many bidirectional relationship)

    "); - // Show how to combine reservations using Collection methods - // Operations such as this must be done in a transaction, usually done - // within a - // stateless session EJB using declarative transactions rather than - // manually like this - - date.set(2002, 10, 1); - // Remove previous reservation - for (int jj = 1; jj < 7; jj++) { - try { - reservations[jj].remove(); - } catch (Exception ex) { - out.println("

    ERROR: exception caught = " + ex + "

    "); - } - } - // Reinit the reservation as before the previous test - try { - reservations[1] = reservationhome.create(cruiseA, null); - reservations[1].setDate(date.getTime()); - reservations[1].setAmountPaid(4000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[2] = reservationhome.create(cruiseA, null); - reservations[2].setDate(date.getTime()); - reservations[2].setAmountPaid(5000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[3] = reservationhome.create(cruiseA, null); - reservations[3].setDate(date.getTime()); - reservations[3].setAmountPaid(6000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[4] = reservationhome.create(cruiseB, null); - reservations[4].setDate(date.getTime()); - reservations[4].setAmountPaid(7000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[5] = reservationhome.create(cruiseB, null); - reservations[5].setDate(date.getTime()); - reservations[5].setAmountPaid(8000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[6] = reservationhome.create(cruiseB, null); - reservations[6].setDate(date.getTime()); - reservations[6].setAmountPaid(9000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - } catch (Exception e) { - out.println("

    ERROR: Exception caught " + e + "

    "); - return; - } - - Collection breservations = null; - try { - tran.begin(); - areservations = cruiseA.getReservations(); - breservations = cruiseB.getReservations(); - breservations.addAll(areservations); - tran.commit(); - } catch (Exception e) { - e.printStackTrace(); - try { - tran.rollback(); - } catch (Exception ex) { - ex.printStackTrace(); - return; - } - return; - } - // Report information on the 6 reservations - out.println("

      "); - for (int jj = 1; jj < 7; jj++) { - ReservationLocal rr = reservations[jj]; - CruiseLocal thiscruise = rr.getCruise(); - cruisename[jj] = (thiscruise != null ? thiscruise.getName() : "No Cruise!"); - out.print("
    • reservationDate = '" + df.format(rr.getDate()) + "', amount paid = '" + rr.getAmountPaid() - + "', for '" + cruisename[jj] + "'
    • "); - } - out.println("
    "); - - out.print("

    Contents of Tables

    "); - try { - listCruises(out, cruisehome); - listReservations(out, reservationhome); - } catch (Exception e) { - out.println("

    ERROR: exception caught = " + e + "

    "); - return; - } - - out.println("

    Example Showing Reservation/Customer Relationships (Fig 7-17)

    "); - out.print("

    (ie Using Collection.addAll() in a Many-to-Many bidirectional relationship)

    "); - - out.println("

    Using 'ShipA' and 'CruiseA'

    "); - cruiseA.setShip(shipA); - out.println("
      "); - out.println("
    • cruise.getName() = '" + cruiseA.getName() + "'
    • "); - out.println("
    • ship.getName() = '" + shipA.getName() + "'
    • "); - out.println("
    • cruise.getShip().getName() = '" + cruiseA.getShip().getName() + "'
    • "); - out.println("
    "); - - out.println("

    Creating two sets of customers, one with 1-3, and one with 4-6

    "); - // create two sets of customers, one with customers 1-3 and one with 4-6 - Set lowcustomers = new HashSet(); - Set highcustomers = new HashSet(); - CustomerLocal cust = null; - out.println("
      "); - for (int kk = 1; kk < 7; kk++) { - try { - cust = customerhome.create(new Integer(kk)); - } catch (Exception e) { - out.println("

      ERROR: exception caught = " + e + "

      "); - } - cust.setName(new Name("Customer " + kk, "mike")); - if (kk <= 3) { - lowcustomers.add(cust); - } else { - highcustomers.add(cust); - } - out.print("
    • customer '" + cust.getName().getLastName() + "' created
    • "); - } - out.println("
    "); - // Remove previous reservation - for (int jj = 1; jj < 7; jj++) { - try { - reservations[jj].remove(); - } catch (Exception ex) { - out.println("

    ERROR: exception caught = " + ex + "

    "); - } - } - - out.print("

    Creating Reservations '1' and '2', each with 3 customers

    "); - try { - reservations[1] = reservationhome.create(cruiseA, lowcustomers); - reservations[1].setDate(date.getTime()); - reservations[1].setAmountPaid(4000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations[2] = reservationhome.create(cruiseA, highcustomers); - reservations[2].setDate(date.getTime()); - reservations[2].setAmountPaid(5000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - } catch (Exception e) { - out.println("

    ERROR: Exception caught " + e + "

    "); - return; - } - // report information on the reservations - reportReservations(out, reservations, 2, tran); - - out.print("

    Performing customers_a.addAll(customers_b) test

    "); - // Finally we can perform the test shown in Figure 7-17 - // Operations such as this must be done in a transaction, usually done - // within a - // stateless session EJB using declarative transactions rather than - // manually like this - try { - tran.begin(); - Set customers_a = reservations[1].getCustomers(); - Set customers_b = reservations[2].getCustomers(); - customers_a.addAll(customers_b); - tran.commit(); - } catch (Exception e) { - e.printStackTrace(); - try { - tran.rollback(); - } catch (Exception ex) { - out.println("

    ERROR: Exception caught " + ex + "

    "); - return; - } - } - // report information on the reservations - reportReservations(out, reservations, 2, tran); - - out.print("

    Sharing an entire collection in a Many-to-Many bidirectional relationship (Fig 7-18)

    "); - out.println("

    Creating four sets of customers 1-3, 2-4, 3-5, 4-6

    "); - // create four sets of customers, 1-3, 2-4, 3-5, 4-6 - Set customers13 = new HashSet(); - Set customers24 = new HashSet(); - Set customers35 = new HashSet(); - Set customers46 = new HashSet(); - out.println("
      "); - for (int kk = 1; kk < 7; kk++) { - try { - cust = customerhome.create(new Integer(kk + 500)); - cust.setName(new Name("Customer_1 " + kk, "bill")); - } catch (Exception e) { - out.println("

      ERROR: exception caught = " + e + "

    "); - return; - } - if (kk <= 3) { - customers13.add(cust); - } - if (kk >= 2 && kk <= 4) { - customers24.add(cust); - } - if (kk >= 3 && kk <= 5) { - customers35.add(cust); - } - if (kk >= 4) { - customers46.add(cust); - } - out.print("
  • customer '" + cust.getName().getLastName() + "' created
  • "); - } - out.println(""); - - out.print("

    Creating Reservations 1-4 using three customers each

    "); - ReservationLocal reservations1[] = new ReservationLocal[5]; - try { - reservations1[1] = reservationhome.create(cruiseA, customers13); - reservations1[1].setDate(date.getTime()); - reservations1[1].setAmountPaid(4000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations1[2] = reservationhome.create(cruiseA, customers24); - reservations1[2].setDate(date.getTime()); - reservations1[2].setAmountPaid(5000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations1[3] = reservationhome.create(cruiseA, customers35); - reservations1[3].setDate(date.getTime()); - reservations1[3].setAmountPaid(6000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations1[4] = reservationhome.create(cruiseA, customers46); - reservations1[4].setDate(date.getTime()); - reservations1[4].setAmountPaid(7000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - } catch (Exception e) { - out.println("

    ERROR: Exception caught " + e + "

    "); - return; - } - reportReservations(out, reservations1, 4, tran); - - out.print("

    Performing reservationD.setCustomers(customersA) (Fig 7-18)

    "); - try { - tran.begin(); - Set customers_a = reservations1[1].getCustomers(); - reservations1[4].setCustomers(customers_a); - tran.commit(); - } catch (Exception e) { - e.printStackTrace(); - try { - tran.rollback(); - } catch (Exception ex) { - out.println("

    ERROR: Exception caught " + ex + "

    "); - return; - } - } - reportReservations(out, reservations1, 4, tran); - - out.print("

    Example Showing Reservation/Cabin Relationships (Fig 7-20)

    "); - out.print("

    (ie Removing beans in a Many-to-Many unidirectional relationship)

    "); - out.print("

    Creating Cabins four sets of cabins, 1-3, 2-4, 3-5, 4-6

    "); - // create four sets of cabins, 1-3, 2-4, 3-5, 4-6 - Set cabins13 = new HashSet(); - Set cabins24 = new HashSet(); - Set cabins35 = new HashSet(); - Set cabins46 = new HashSet(); - CabinLocal cabin = null; - out.println("
      "); - for (int kk = 1; kk < 7; kk++) { - try { - cabin = cabinhome.create(new Integer(kk)); - } catch (Exception e) { - out.println("

      ERROR: exception caught = " + e + "

    "); - } - cabin.setName("Cabin " + kk); - if (kk <= 3) { - cabins13.add(cabin); - } - if (kk >= 2 && kk <= 4) { - cabins24.add(cabin); - } - if (kk >= 3 && kk <= 5) { - cabins35.add(cabin); - } - if (kk >= 4) { - cabins46.add(cabin); - } - out.print("
  • cabin '" + cabin.getName() + "' created
  • "); - } - out.println(""); - - out.print("

    Creating Reservations 1-4 using three cabins each

    "); - ReservationLocal reservations2[] = new ReservationLocal[5]; - // leave Customers collection null, we dont care about it for this - // example - try { - reservations2[1] = reservationhome.create(cruiseA, null); - reservations2[1].setCabins(cabins13); - reservations2[1].setDate(date.getTime()); - reservations2[1].setAmountPaid(4000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations2[2] = reservationhome.create(cruiseA, null); - reservations2[2].setCabins(cabins24); - reservations2[2].setDate(date.getTime()); - reservations2[2].setAmountPaid(5000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations2[3] = reservationhome.create(cruiseA, null); - reservations2[3].setCabins(cabins35); - reservations2[3].setDate(date.getTime()); - reservations2[3].setAmountPaid(6000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations2[4] = reservationhome.create(cruiseA, null); - reservations2[4].setCabins(cabins46); - reservations2[4].setDate(date.getTime()); - reservations2[4].setAmountPaid(7000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - } catch (Exception e) { - out.println("

    ERROR: Exception caught " + e + "

    "); - return; - } - reportReservations(out, reservations2, 4, tran); - - out.print("

    Performing cabins_a collection iterator.remove() test

    "); - // Finally we can perform the test shown in Figure 7-20 - try { - tran.begin(); - Set cabins_a = reservations2[1].getCabins(); - Iterator iterator = cabins_a.iterator(); - out.print("
      "); - while (iterator.hasNext()) { - CabinLocal cc = (CabinLocal) iterator.next(); - out.print("
    • Removing '" + cc.getName() + "' from 'cabins_a'" + "
    • "); - iterator.remove(); - } - out.print("
    "); - tran.commit(); - } catch (Exception e) { - try { - tran.rollback(); - } catch (Exception ex) { - out.println("

    ERROR: Exception caught " + ex + "

    "); - return; - } - } - reportReservations(out, reservations2, 4, tran); - - out.print("

    Example Showing Reservation/Cabin Relationships

    "); - - out.print("

    Creating Cabins in ShipA

    "); - CabinLocal cabins[] = new CabinLocal[4]; - try { - cabins[1] = cabinhome.create(new Integer(10)); - cabins[1].setShip(shipA); - cabins[1].setDeckLevel(1); - cabins[1].setName("Minnesota Suite"); - cabins[1].setBedCount(2); - - cabins[2] = cabinhome.create(new Integer(11)); - cabins[2].setShip(shipA); - cabins[2].setDeckLevel(2); - cabins[2].setName("California Suite"); - cabins[2].setBedCount(2); - - cabins[3] = cabinhome.create(new Integer(12)); - cabins[3].setShip(shipA); - cabins[3].setDeckLevel(3); - cabins[3].setName("Missouri Suite"); - cabins[3].setBedCount(2); - } catch (Exception e) { - out.println("

    ERROR: Exception caught " + e + "

    "); - return; - } - out.println("
      "); - for (int jj = 1; jj < 4; jj++) { - CabinLocal cc = cabins[jj]; - out.print("
    • cabin '" + cc.getName() + "' is on ship '" + cc.getShip().getName() + "'
    • "); - } - out.println("
    "); - - out.print("

    Creating Reservations

    "); - ReservationLocal reservations3[] = new ReservationLocal[3]; - try { - reservations3[1] = reservationhome.create(cruiseA, null); - reservations3[1].setDate(date.getTime()); - reservations3[1].setAmountPaid(4000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - - reservations3[2] = reservationhome.create(cruiseA, null); - reservations3[2].setDate(date.getTime()); - reservations3[2].setAmountPaid(5000.0); - date.add(Calendar.DAY_OF_MONTH, 7); - } catch (Exception e) { - out.println("

    ERROR: Exception caught " + e + "

    "); - return; - } - reportReservations(out, reservations3, 2, tran); - - out.print("

    Creating Links from Reservations to Cabins

    "); - Set cabins1 = new HashSet(2); - cabins1.add(cabins[1]); - cabins1.add(cabins[2]); - Set cabins2 = new HashSet(2); - cabins2.add(cabins[2]); - cabins2.add(cabins[3]); - reservations3[1].setCabins(cabins1); - reservations3[2].setCabins(cabins2); - reportReservations(out, reservations3, 2, tran); - - out.print("

    Testing reservation_b.setCabins(reservation_a.getCabins())

    "); - try { - tran.begin(); - Set cabins_a = reservations3[1].getCabins(); - reservations3[2].setCabins(cabins_a); - tran.commit(); - } catch (Exception e) { - try { - tran.rollback(); - } catch (Exception ex) { - out.println("

    ERROR: Exception caught " + ex + "

    "); - return; - } - } - reportReservations(out, reservations3, 2, tran); - - out.print("

    Cleaning all tables

    "); - try { - Collection clc = customerhome.findAllCustomers(); - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - CustomerLocal cl = (CustomerLocal) iterator.next(); - cl.remove(); - } - clc = shiphome.findAllShips(); - iterator = clc.iterator(); - while (iterator.hasNext()) { - ShipLocal sl = (ShipLocal) iterator.next(); - sl.remove(); - } - clc = cruisehome.findAllCruises(); - iterator = clc.iterator(); - while (iterator.hasNext()) { - CruiseLocal cl = (CruiseLocal) iterator.next(); - cl.remove(); - } - - clc = reservationhome.findAllReservations(); - iterator = clc.iterator(); - while (iterator.hasNext()) { - ReservationLocal rl = (ReservationLocal) iterator.next(); - rl.remove(); - } - clc = cabinhome.findAllCabins(); - iterator = clc.iterator(); - while (iterator.hasNext()) { - CabinLocal cl = (CabinLocal) iterator.next(); - cl.remove(); - } - - } catch (Exception ex) { - out.println("

    ERROR: during cleaning exception caught = " + ex + "

    "); - } - if (ok) { - out.println("

    Servlet is OK.

    "); - } - out.println("Back to Menu"); - out.println(""); - out.println(""); - } - - private void listCruises(PrintWriter out, CruiseHomeLocal chl) throws Exception { - out.println("

    Cruises Table Content:

    "); - out.println("
      "); - java.util.Collection clc = chl.findAllCruises(); - if (clc == null) { - out.println("
    • Cruises table is empty
    • "); - } else { - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - CruiseLocal cl = (CruiseLocal) iterator.next(); - String cname = cl.getName(); - String sname = (cl.getShip() != null ? cl.getShip().getName() : "No Ship!"); - out.println("
    • cruiseName = '" + cname + "', shipName = '" + sname + "'
    • "); - - } - } - out.println("
    "); - } - - private void listShips(PrintWriter out, ShipHomeLocal cchl) throws Exception { - out.println("

    Ships Table Content:

    "); - out.println("
      "); - java.util.Collection clc = cchl.findAllShips(); - if (clc == null) { - out.println("
    • Ships table is empty
    • "); - } else { - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - ShipLocal ccl = (ShipLocal) iterator.next(); - double tonnage = ccl.getTonnage(); - String name = ccl.getName(); - out.println("
    • shipName = '" + name + "', tonnage = '" + tonnage + "'
    • "); - } - } - out.println("
    "); - } - - private void listReservations(PrintWriter out, ReservationHomeLocal cchl) throws Exception { - out.println("

    Reservations Table Content:

    "); - out.println("
      "); - java.util.Collection clc = cchl.findAllReservations(); - if (clc == null) { - out.println("
    • Reservations table is empty
    • "); - out.println("
    "); - } else { - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - ReservationLocal ccl = (ReservationLocal) iterator.next(); - Date date = ccl.getDate(); - out.println("
  • reservation date = '" + date + "'
  • "); - } - out.println(""); - } - } - - private void reportReservations(PrintWriter out, ReservationLocal reservations[], int nb, UserTransaction tran) { - DateFormat df = new SimpleDateFormat("MM/dd/yyyy"); - // report information on the reservations - out.println("
      "); - for (int jj = 1; jj < nb + 1; jj++) { - ReservationLocal rr = reservations[jj]; - CruiseLocal thiscruise = rr.getCruise(); - String cruisename = (thiscruise != null ? thiscruise.getName() : "No Cruise!"); - // Operations such as this must be done in a transaction, usually - // done within a - // stateless session EJB using declarative transactions rather than - // manually like this - String customerinfo = ""; - CustomerLocal cust = null; - String cabininfo = ""; - try { - tran.begin(); - Set customerset = rr.getCustomers(); - Iterator iterator = customerset.iterator(); - while (iterator.hasNext()) { - cust = (CustomerLocal) iterator.next(); - customerinfo += cust.getName().getLastName() + " "; - } - Set cabinset = rr.getCabins(); - iterator = cabinset.iterator(); - while (iterator.hasNext()) { - CabinLocal cabin = (CabinLocal) iterator.next(); - cabininfo += cabin.getName() + " "; - } - tran.commit(); - } catch (Exception e) { - e.printStackTrace(); - try { - tran.rollback(); - } catch (Exception ex) { - out.println("

      ERROR: Exception caught " + ex + "

      "); - return; - } - } - out.print("
    • reservationDate = '" + df.format(rr.getDate()) + "', amountPaid = '" + rr.getAmountPaid() - + "', for '" + cruisename + "' with :
    • "); - out.print("
        "); - if (!customerinfo.equals("")) { - out.print("
      • customers: " + customerinfo); - } - if (!cabininfo.equals("")) { - out.print("
      • cabins: " + cabininfo + "
      • "); - } - out.print("
      "); - } - out.println("
    "); - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/cmp2/src/servlets/ServletTest3.java b/jonas_tests/examples/base/examples/cmp2/src/servlets/ServletTest3.java deleted file mode 100644 index 661cf4eae430ca2e29004057a17373efec0d2b62..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/cmp2/src/servlets/ServletTest3.java +++ /dev/null @@ -1,777 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package servlets; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import java.util.Vector; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.titan.address.AddressHomeLocal; -import com.titan.address.AddressLocal; -import com.titan.cabin.CabinHomeLocal; -import com.titan.cabin.CabinLocal; -import com.titan.cruise.CruiseHomeLocal; -import com.titan.cruise.CruiseLocal; -import com.titan.customer.CreditCardHomeLocal; -import com.titan.customer.CreditCardLocal; -import com.titan.customer.CustomerHomeLocal; -import com.titan.customer.CustomerLocal; -import com.titan.customer.Name; -import com.titan.phone.PhoneHomeLocal; -import com.titan.reservation.ReservationHomeLocal; -import com.titan.reservation.ReservationLocal; -import com.titan.ship.ShipHomeLocal; -import com.titan.ship.ShipLocal; - -/** - * This servlet is used to test O'Reilly examples - * @author JOnAS team - */ -public class ServletTest3 extends HttpServlet { - - /** - * Called by the server (via the service method) to allow a servlet to - * handle a GET request. - * @param request an HttpServletRequest object that contains the request the - * client has made of the servlet - * @param response an HttpServletResponse object that contains the response - * the servlet sends to the client - * @throws IOException if an input or output error is detected when the - * servlet handles the GET request - * @throws ServletException if the request for the GET could not be handled - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - - boolean ok = true; - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - - out.println(""); - out.println(""); - out.println(""); - out.println("O'Reilly Examples"); - out.println(""); - out.println(""); - out.println(""); - out.println("

    EJB QL Examples from Chapter 8

    "); - - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - out.print("

    ERROR: Cannot get initial context for JNDI: " + e + "

    "); - return; - } - - out.println("Back to Menu"); - - // Connecting to CustomerHomeLocal and CreditCardHomeLocal thru JNDI - CustomerHomeLocal customerhome = null; - CreditCardHomeLocal cardhome = null; - AddressHomeLocal addresshome = null; - ShipHomeLocal shiphome = null; - CruiseHomeLocal cruisehome = null; - ReservationHomeLocal reservationhome = null; - CabinHomeLocal cabinhome = null; - PhoneHomeLocal phonehome = null; - try { - customerhome = (CustomerHomeLocal) initialContext.lookup("java:comp/env/ejb/CustomerHomeLocal"); - cardhome = (CreditCardHomeLocal) initialContext.lookup("java:comp/env/ejb/CreditCardHomeLocal"); - addresshome = (AddressHomeLocal) initialContext.lookup("java:comp/env/ejb/AddressHomeLocal"); - shiphome = (ShipHomeLocal) initialContext.lookup("java:comp/env/ejb/ShipHomeLocal"); - cruisehome = (CruiseHomeLocal) initialContext.lookup("java:comp/env/ejb/CruiseHomeLocal"); - reservationhome = (ReservationHomeLocal) initialContext.lookup("java:comp/env/ejb/ReservationHomeLocal"); - cabinhome = (CabinHomeLocal) initialContext.lookup("java:comp/env/ejb/CabinHomeLocal"); - phonehome = (PhoneHomeLocal) initialContext.lookup("java:comp/env/ejb/PhoneHomeLocal"); - } catch (Exception e) { - out.println("

    ERROR: Cannot lookup java:comp/env/ejb/XXHomeLocal: " + e + "

    "); - return; - } - - String cities[] = new String[6]; - cities[0] = "Minneapolis"; - cities[1] = "St. Paul"; - cities[2] = "Rochester"; - cities[3] = "Winona"; - cities[4] = "Wayzata"; - cities[5] = "Eagan"; - - out.println("

    Example showing Sample EJB-QL

    "); - - out.print("

    Creating a Ship and Cruise

    "); - ShipLocal shipA = null; - CruiseLocal cruiseA = null; - try { - shipA = shiphome.create(new Integer(10772), "Ship A", 30000.0); - cruiseA = cruisehome.create("Cruise A", shipA); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - out.println("
      "); - out.println("
    • cruise.getName() = '" + cruiseA.getName() + "'
    • "); - out.println("
    • ship.getName() = '" + shipA.getName() + "'
    • "); - out.println("
    • cruise.getShip().getName() = '" + cruiseA.getShip().getName() + "'
    • "); - out.println("
    "); - - out.print("

    Creating Ship Beans with Various Tonnage Values

    "); - out.print("
      "); - for (int jj = 1; jj <= 10; jj++) { - try { - ShipLocal ship = shiphome.create(new Integer(jj), "Ship " + jj, 30000.0 + (10000.0 * jj)); - printShip(out, ship); - } catch (Exception ex) { - ok = false; - out.print("

      ERROR: Exception caught : " + ex + "

      "); - } - - } - out.print("
    "); - - out.print("

    Finding Ships with Exactly 100K Tonnage

    "); - out.print("

    SELECT OBJECT(s) FROM JE2_Ship AS s WHERE s.tonnage = ?1

    "); - Collection ships100k = null; - try { - ships100k = shiphome.findByTonnage(new Double(100000.0)); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - out.print("

    Number of ships = " + ships100k.size() + "
    Expected = 1 ships

    "); - if (ships100k.size() != 1) { - ok = false; - } - Iterator iterator = ships100k.iterator(); - out.print("
      "); - while (iterator.hasNext()) { - ShipLocal ship = (ShipLocal) (iterator.next()); - printShip(out, ship); - } - out.print("
    "); - - out.print("

    Finding Ships with Tonnage between 50K and 110K

    "); - out.print("

    SELECT OBJECT(s) FROM JE2_Ship AS s WHERE s.tonnage BETWEEN ?1 AND ?2

    "); - Collection ships50110k = null; - try { - ships50110k = shiphome.findByTonnage(new Double(50000.0), new Double(110000.0)); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - out.print("

    Number of ships = " + ships50110k.size() + "
    Expected = 7 ships

    "); - if (ships50110k.size() != 7) { - ok = false; - } - iterator = ships50110k.iterator(); - out.print("
      "); - while (iterator.hasNext()) { - ShipLocal ship = (ShipLocal) (iterator.next()); - printShip(out, ship); - } - out.print("
    "); - - // creating cruise for future use - cruiseA = null; - CruiseLocal cruiseB = null; - try { - ShipLocal ship1 = shiphome.findByPrimaryKey(new Integer(1)); - cruiseA = cruisehome.create("Alaska Cruise", ship1); - cruiseB = cruisehome.create("Bohemian Cruise", ship1); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - - out.println("

    Creating Customers

    "); - for (int kk = 80; kk <= 99; kk++) { - CustomerLocal customer = null; - AddressLocal addr = null; - try { - customer = customerhome.create(new Integer(kk)); - customer.setName(new Name("Smith" + kk, "John")); - customer.addPhoneNumber("612-555-12" + kk, (byte) 1); - addr = addresshome.createAddress("10" + kk + " Elm Street", cities[(kk - 80) % 6], (kk % 2 == 0 ? "MN" - : "CA"), "5540" + (kk % 5 + 1)); - } catch (Exception e) { - ok = false; - out.println("

    ERROR: exception caught = " + e + "

    "); - } - customer.setHomeAddress(addr); - customer.setHasGoodCredit((kk % 4 == 0)); - //printCustomer(out, customer, addr); - } - - // Creating Customers 1-6, each with 2 reservations for 2 cabins - Calendar date = Calendar.getInstance(); - date.set(2002, 10, 1); - try { - - for (int kk = 201; kk < 207; kk++) { - Collection customers = new ArrayList(); - CustomerLocal cust = customerhome.create(new Integer(kk)); - cust.setName(new Name("Customer " + kk, "Mike")); - cust.setHasGoodCredit((kk % 2 == 0)); // odds are bums - AddressLocal addr = addresshome.createAddress("50" + kk + " Main Street", "Minneapolis", "MN", "5510" - + kk); - cust.setHomeAddress(addr); - //out.print("

  • Customer name= - // "+cust.getName().getLastName()+"
  • "); - customers.add(cust); // put this single customer in the - // collection - - //printCustomer(out, cust,addr); - - Collection reservations = new ArrayList(); - - for (int jj = 0; jj < 2; jj++) { - - ReservationLocal reservation = reservationhome.create(cruiseA, customers); - reservation.setDate(date.getTime()); - reservation.setAmountPaid(1000 * kk + 100 * jj + 2000); - date.add(Calendar.DAY_OF_MONTH, 7); - - Set cabins = new HashSet(); - CabinLocal cabin = cabinhome.create(new Integer(1000 + kk * 100 + jj)); - cabin.setDeckLevel(kk - 200); - cabin.setName("Cabin " + kk + "0" + jj + "1"); - - cabins.add(cabin); - cabin = cabinhome.create(new Integer(1000 + kk * 100 + 10 + jj)); - cabin.setDeckLevel(kk - 200); - cabin.setName("Cabin " + kk + "0" + jj + "2"); - - cabins.add(cabin); - - reservation.setCabins(cabins); // this reservation has 2 - // cabins - //out.print("
      "); - //printReservation(out, reservation); - //out.print("
    "); - } - } - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - - String fnames[] = new String[5]; - fnames[0] = "John"; - fnames[1] = "Paul"; - fnames[2] = "Ringo"; - fnames[3] = "Joe"; - fnames[4] = "Roger"; - - String[] lnames = new String[3]; - lnames[0] = "Smith"; - lnames[1] = "Johnson"; - lnames[2] = "Star"; - - // Creating Customers 50-69 - try { - for (int kk = 50; kk <= 69; kk++) { - CustomerLocal customer = customerhome.create(new Integer(kk)); - customer.setName(new Name(lnames[(kk - 50) % 3], fnames[(kk - 50) % 5])); - customer.addPhoneNumber("612-555-12" + kk, (byte) 1); - AddressLocal addr = addresshome.createAddress("10" + kk + " Elm Street", cities[(kk - 50) % 6], - (kk % 2 == 0 ? "MN" : "CA"), "5540" + (kk % 5 + 1)); - customer.setHomeAddress(addr); - customer.setHasGoodCredit((kk % 4 == 0)); - - //printCustomer(out, customer, addr); - - // Some customers will have reservations already on one of the - // two cruises.. - if (kk % 3 != 0) { - Collection customers = new ArrayList(); - customers.add(customer); // put this single customer in the - // collection - ReservationLocal reservation = reservationhome.create((kk % 3 == 1 ? cruiseA : cruiseB), customers); - reservation.setDate(date.getTime()); - reservation.setAmountPaid(10 * kk + 2000); - //out.print("
      "); - //printReservation(out, reservation); - //out.print("
    "); - - date.add(Calendar.DAY_OF_MONTH, 7); - } - } - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - - // Creating Customers 100-109 - try { - for (int kk = 100; kk <= 109; kk++) { - CustomerLocal customer = customerhome.create(new Integer(kk)); - customer.setName(new Name("Lennon" + kk, "Paul")); - customer.addPhoneNumber("666-543-12" + kk, (byte) 1); - AddressLocal addr = addresshome.createAddress("10" + kk + " Abbey Road", cities[(kk - 100) % 6], - (kk % 2 == 0 ? "FL" : "WA"), "5540" + (kk % 5 + 1)); - - customer.setHomeAddress(addr); - customer.setHasGoodCredit((kk % 4 == 0)); - - //printCustomer(out, customer, addr); - } - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - - try { - listCustomers(out, customerhome); - } catch (Exception e) { - ok = false; - out.println("

    ERROR: exception caught = " + e + "

    "); - } - - out.print("

    Finding Customer having name 'John Smith85'

    "); - out - .print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.lastName = ?1 AND c.firstName = ?2

    "); - CustomerLocal customer85 = null; - try { - customer85 = customerhome.findByExactName("Smith85", "John"); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - AddressLocal addr85 = customer85.getHomeAddress(); - printCustomer(out, customer85, addr85); - - out.print("

    Finding Customer 'Smith90'

    "); - out.print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.lastName = 'Smith90'

    "); - CustomerLocal customer90 = null; - try { - customer90 = customerhome.findSmith90(); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - - AddressLocal addr90 = customer90.getHomeAddress(); - printCustomer(out, customer90, addr90); - - out.print("

    Finding Customers having GoodCredit

    "); - out.print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.hasGoodCredit = TRUE

    "); - Collection mplscustomers = null; - try { - mplscustomers = customerhome.findByGoodCredit(); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - - iterator = mplscustomers.iterator(); - out.print("

    Number of customers = " + mplscustomers.size() + "
    Expected = 16 customers

    "); - if (mplscustomers.size() != 16) { - ok = false; - } - while (iterator.hasNext()) { - CustomerLocal customer = (CustomerLocal) (iterator.next()); - AddressLocal addr = customer.getHomeAddress(); - printCustomer(out, customer, addr); - } - - out.print("

    Finding Customers having City = 'Minneapolis' and State = 'MN'

    "); - out - .print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.homeAddress.city = ?1 AND c.homeAddress.state = ?2

    "); - try { - mplscustomers = customerhome.findByCity("Minneapolis", "MN"); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - out.print("

    Number of customers = " + mplscustomers.size() + "
    Expected = 14 customers

    "); - if (mplscustomers.size() != 14) { - ok = false; - } - iterator = mplscustomers.iterator(); - while (iterator.hasNext()) { - CustomerLocal customer = (CustomerLocal) (iterator.next()); - AddressLocal addr = customer.getHomeAddress(); - printCustomer(out, customer, addr); - } - - out.print("

    Cabins Table Content

    "); - try { - listCabins(out, cabinhome); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - - out.print("

    Retrieve a collection of all cabins on deck '3'

    "); - out.print("

    SELECT OBJECT(c) FROM Cabin AS c WHERE c.deckLevel = ?1

    "); - Collection cabins = null; - try { - cabins = cabinhome.findAllOnDeckLevel(new Integer(3)); - out.print("

    Number of cabins = " + cabins.size() + "
    Expected = 4 cabins

    "); - Iterator iter = cabins.iterator(); - out.print("
      "); - while (iter.hasNext()) { - CabinLocal cabin = (CabinLocal) (iter.next()); - out.print("
    • cabin '" + cabin.getName() + "' on deck '" + cabin.getDeckLevel() + "'
    • "); - } - out.print("
    "); - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - - try { - out.print("

    Finding Customer having a name exactly matching 'Joe Star'

    "); - out - .print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.lastName = ?1 AND c.firstName = ?2

    "); - CustomerLocal customer = customerhome.findByExactName("Star", "Joe"); - AddressLocal addr = customer.getHomeAddress(); - printCustomer(out, customer, addr); - Collection customers = null; - - out.print("

    Finding Customers having a name like 'Jo S' (no wildcards)

    "); - out - .print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2

    "); - - customers = customerhome.findByName("S", "Jo"); - iterator = customers.iterator(); - while (iterator.hasNext()) { - customer = (CustomerLocal) (iterator.next()); - addr = customer.getHomeAddress(); - printCustomer(out, customer, addr); - } - out.print("

    Number of customers = " + customers.size() + "
    Expected = 0 customers

    "); - if (customers.size() != 0) { - ok = false; - } - - out.print("

    Finding Customers having a name like 'Jo% S%' (with wildcards)

    "); - out - .print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2

    "); - customers = customerhome.findByName("S%", "Jo%"); - iterator = customers.iterator(); - out.print("

    Number of customers = " + customers.size() + "
    Expected = 26 customers

    "); - if (customers.size() != 26) { - ok = false; - } - while (iterator.hasNext()) { - customer = (CustomerLocal) (iterator.next()); - addr = customer.getHomeAddress(); - printCustomer(out, customer, addr); - } - - out.print("

    Finding Customers having a name like 'Jo% S%' and living in 'MN'

    "); - out - .print("

    SELECT OBJECT(c) FROM JE2_Customer AS c
    WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2 AND c.homeAddress.state = ?3

    "); - customers = customerhome.findByNameAndState("S%", "Jo%", "MN"); - iterator = customers.iterator(); - out.print("

    Number of customers = " + customers.size() + "
    Expected = 13 customers

    "); - if (customers.size() != 13) { - ok = false; - } - while (iterator.hasNext()) { - customer = (CustomerLocal) (iterator.next()); - addr = customer.getHomeAddress(); - printCustomer(out, customer, addr); - } - - out.print("

    Finding Customers Living in Warm Climates

    "); - out - .print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.homeAddress.state IN ('FL','TX','AZ','CA')

    "); - customers = customerhome.findInHotStates(); - out.print("

    Number of customers = " + customers.size() + "
    Expected = 25 customers

    "); - if (customers.size() != 25) { - ok = false; - } - iterator = customers.iterator(); - while (iterator.hasNext()) { - customer = (CustomerLocal) (iterator.next()); - addr = customer.getHomeAddress(); - printCustomer(out, customer, addr); - } - - out.print("

    Finding Customers With No Reservation

    "); - out.print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.reservations IS EMPTY

    "); - customers = customerhome.findWithNoReservations(); - out.print("

    Number of customers = " + customers.size() + "
    Expected = 37 customers

    "); - if (customers.size() != 37) { - ok = false; - } - iterator = customers.iterator(); - while (iterator.hasNext()) { - customer = (CustomerLocal) (iterator.next()); - addr = customer.getHomeAddress(); - printCustomer(out, customer, addr); - } - - out.print("

    Finding Customers On Alaska Cruise

    "); - out - .print("

    SELECT OBJECT(c) FROM JE2_Customer AS cust, Cruise AS cr, IN (cr.reservations) AS res
    WHERE cr = ?1 AND cust MEMBER OF res.customers

    "); - CruiseLocal crA = cruisehome.findByName("Alaska Cruise"); - customers = customerhome.findOnCruise(cruiseA); - out.print("

    Number of customers = " + customers.size() + "
    Expected = 12 customers

    "); - if (customers.size() != 12) { - ok = false; - } - iterator = customers.iterator(); - while (iterator.hasNext()) { - customer = (CustomerLocal) (iterator.next()); - addr = customer.getHomeAddress(); - printCustomer(out, customer, addr); - } - - out.print("

    Select the zip codes of the state 'FL'

    "); - out.print("

    SELECT a.zip FROM JE2_Address AS a WHERE a.state = ?1

    "); - Collection zipCodes = null; - zipCodes = addresshome.selectZipCodes("FL"); - out.print("

    Number of zip codes = " + zipCodes.size() - + "
    Expected = 5 zip codes (from 55401 to 55405)

    "); - if (zipCodes.size() != 5) { - ok = false; - } - Iterator iZipCodes = zipCodes.iterator(); - out.println("
      "); - while (iZipCodes.hasNext()) { - out.print("
    • zip code = '" + iZipCodes.next() + "'
    • "); - } - out.println("
    "); - - out.print("

    Select the customer which have the address 'addr85'

    "); - out.print("

    SELECT OBJECT(c) FROM JE2_Customer AS c WHERE c.homeAddress = ?1

    "); - CustomerLocal cust = null; - cust = addresshome.selectCustomer(addr85); - addr = cust.getHomeAddress(); - printCustomer(out, cust, addr); - - } catch (Exception ex) { - ok = false; - out.print("

    ERROR: Exception caught : " + ex + "

    "); - } - out.print("

    Cleaning all tables

    "); - - try { - Collection clc = customerhome.findAllCustomers(); - iterator = clc.iterator(); - while (iterator.hasNext()) { - CustomerLocal cl = (CustomerLocal) iterator.next(); - cl.remove(); - } - clc = shiphome.findAllShips(); - iterator = clc.iterator(); - while (iterator.hasNext()) { - ShipLocal sl = (ShipLocal) iterator.next(); - sl.remove(); - } - clc = cruisehome.findAllCruises(); - iterator = clc.iterator(); - while (iterator.hasNext()) { - CruiseLocal cl = (CruiseLocal) iterator.next(); - cl.remove(); - } - clc = reservationhome.findAllReservations(); - iterator = clc.iterator(); - while (iterator.hasNext()) { - ReservationLocal rl = (ReservationLocal) iterator.next(); - rl.remove(); - } - clc = cabinhome.findAllCabins(); - iterator = clc.iterator(); - while (iterator.hasNext()) { - CabinLocal cl = (CabinLocal) iterator.next(); - cl.remove(); - } - } catch (Exception ex) { - ok = false; - out.println("

    ERROR: during cleaning exception caught = " + ex + "

    "); - } - - if (ok) { - out.println("

    Servlet is OK.

    "); - } - out.println("Back to Menu"); - out.println(""); - out.println(""); - - } - - private void listCabins(PrintWriter out, CabinHomeLocal chl) throws Exception { - out.println("

    Cabins Table Content:

    "); - out.println("
      "); - Collection clc = chl.findAllCabins(); - if (clc == null) { - out.println("
    • Cabins table is empty
    • "); - } else { - Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - CabinLocal cl = (CabinLocal) iterator.next(); - String name = cl.getName(); - int deck = cl.getDeckLevel(); - int bd = cl.getBedCount(); - out.println("
    • cabinName = '" + name + "', deckLevel = '" + deck + "', bedCount = '" + bd + "'
    • "); - } - } - out.println("
    "); - } - - private void listCustomers(PrintWriter out, CustomerHomeLocal chl) throws Exception { - out.println("

    Customers Table Content:

    "); - out.println("
      "); - java.util.Collection clc = chl.findAllCustomers(); - if (clc == null) { - out.println("
    • Customers table is empty
    • "); - } else { - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - CustomerLocal cl = (CustomerLocal) iterator.next(); - String name = cl.getName().getLastName(); - String fname = cl.getName().getFirstName(); - String number = " No Card! "; - boolean gc = cl.getHasGoodCredit(); - if (cl.getCreditCard() != null) { - number = cl.getCreditCard().getNumber(); - } - out.print("
    • firstName = '" + fname + "', lastName = '" + name + "'"); - out.println("
        "); - out.print("
      • creditCardNumber = '" + number + "', goodCredit = '" + gc + "'
      • "); - if (cl.getHomeAddress() != null) { - String city = cl.getHomeAddress().getCity(); - String state = cl.getHomeAddress().getState(); - out.print("
      • city> = '" + city + "', state = '" + state + "'
      • "); - } - out.println(""); - out.println("
      "); - } - } - out.println("
    "); - } - - private void listCreditcards(PrintWriter out, CreditCardHomeLocal cchl) throws Exception { - out.println("

    CreditCards Table Content:

    "); - out.println("
      "); - java.util.Collection clc = cchl.findAllCreditCards(); - if (clc == null) { - out.println("
    • CreditCards table is empty
    • "); - } else { - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - CreditCardLocal ccl = (CreditCardLocal) iterator.next(); - String number = ccl.getNumber(); - String name = ccl.getNameOnCard(); - out.println("
    • creditCardNumber = '" + number + "', nameOnCard '= '" + name + "'
    • "); - } - } - out.println("
    "); - } - - private void listAddress(PrintWriter out, AddressHomeLocal cchl) throws Exception { - out.println("

    Addresses Table Content:

    "); - out.println("
      "); - java.util.Collection clc = cchl.findAllAddress(); - if (clc == null) { - out.println("
    • Addresses table is empty
    • "); - } else { - java.util.Iterator iterator = clc.iterator(); - while (iterator.hasNext()) { - AddressLocal al = (AddressLocal) iterator.next(); - String city = al.getCity(); - String street = al.getStreet(); - out.println("
    • adressCity = '" + city + "', street = '" + street + "'
    • "); - } - } - out.println("
    "); - } - - private void listPhones(PrintWriter out, Vector vv) { - out.println("
      "); - for (int jj = 0; jj < vv.size(); jj++) { - String ss = (String) (vv.get(jj)); - out.println("
    • " + ss + "
    • "); - } - out.println("
    "); - } - - private void printShip(PrintWriter out, ShipLocal ship) { - out.print("
  • shipId = '" + ship.getId() + "', name = '" + ship.getName() + "', tonnage = '" - + ship.getTonnage() + "'
  • "); - } - - private void printCustomer(PrintWriter out, CustomerLocal customer, AddressLocal addr) { - out.print("
      "); - out.print("
    • firstName = '" + customer.getName().getFirstName() + "', lastName = '" - + customer.getName().getLastName() + "', goodCredit = '" + customer.getHasGoodCredit() + "'
    • "); - out.print("
    • street = '" + addr.getStreet() + "', city = '" + addr.getCity() + "', state = '" - + addr.getState() + "', zip = '" + addr.getZip() + "'
    • "); - out.print("
    "); - } - - private void printReservation(PrintWriter out, ReservationLocal reservation) { - out.print("
      "); - String cru = "no Cruise!"; - if (reservation.getCruise() != null) { - cru = reservation.getCruise().getName(); - } - out.print("
    • reservationDate: '" + reservation.getDate() + "' on '" + cru + "' amountPaid: '" - + reservation.getAmountPaid() + "'
    • "); - Set cabinset = reservation.getCabins(); - String customerinfo = ""; - CustomerLocal cust = null; - String cabininfo = ""; - Set customerset = reservation.getCustomers(); - Iterator iterator = customerset.iterator(); - while (iterator.hasNext()) { - cust = (CustomerLocal) iterator.next(); - customerinfo += cust.getName().getLastName() + " "; - } - iterator = cabinset.iterator(); - while (iterator.hasNext()) { - CabinLocal cabin = (CabinLocal) iterator.next(); - cabininfo += cabin.getName() + " "; - } - out.print("
        "); - if (!customerinfo.equals("")) { - out.print("
      • customers: " + customerinfo); - } - if (!cabininfo.equals("")) { - out.print("
      • cabins: " + cabininfo + "
      • "); - } - out.print("
      "); - out.print("
    "); - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/earsample/README b/jonas_tests/examples/base/examples/earsample/README deleted file mode 100644 index 022235e6bbf91d29025e8c00e62c40ac9893cf76..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/README +++ /dev/null @@ -1,94 +0,0 @@ - -Example Overview: ------------------ - -This example shows how to access an EJB deployed in a JOnAS EJB container, from - - a servlet deployed in a Tomcat/Jetty container (thin client) - - a client running inside the client container (heavy client) - -It also shows how to use security in Tomcat or Jetty to authentificate the user and in JOnAS -to authorize the user to access the EJB methods. This aspect is described in details -in the "Use Security in JOnAS with TOMCAT" howto of the JOnAS documentation. - -Besides, this example shows the uniform naming resource access supported in JOnAS. -The servlet gets a javax.transaction.UserTransaction object reference from the JNDI -using the "java:comp/UserTransaction" name. Moreover, it gets a reference on the -bean's home using an environment entry: "java:comp/env/ejb/". - -This sample contains an example of using ejb-link which allows to link the EJB to the -servlet. It is used in the web.xml file for both the ejb-ref and -ejb-local-ref tags. It implies that when the servlet performs a lookup on the bean, -the web classloader has got the visibility of the ejb class. -This is due to the classloader hierarchy between the ear classloader, ejb -classloader and the web classloader. - -Finally, this example shows how to add a resource adapter in an ear. - -The "src" directory contains - - An EJB that mimics $JONAS_ROOT/examples/src/sb with the addition of - security access to the bean methods. - - The servlet source of ServletOp. - - The source of a client which run inside the client container with uniform naming available - - The resource adapter source. - -The "etc" directory contains - - the "xml" directory which contains all the deployment descriptors used for this example : - * application.xml (ear file) - * ejb-jar.xml and jonas-ejb-jar.xml (jar file) - * web.xml, jonas-web.xml (war file) - * ra.xml (rar file) - * application-client.xml, jonas-client1.xml and jonas-client2.xml (two clients jar file) - - the "resources" directory which contains all the resources for this application - * "web" directory contains all resources used by the servlet - - -Compiling this example creates an .ear file that represents an application including : - - a session bean used by the web application - - a web application that will be used by Tomcat or Jetty to run the servlet. - - a resource adapter. - -Prerequisites -------------- -First, you must have installed a web container (ie : Catalina or Jetty) -as the web container service or you will use the heavy client - -You have to set the environment variables - CATALINA_HOME and CATALINA_BASE as indicated in the Tomcat 5.x documentation. -or JETTY_HOME for Jetty 5.x - -Compiling and installing this example: --------------------------------------- - ant install - -Running this example: --------------------- -Commands are given for an Unix system. -(Similar commands can be done on Windows) - -1) Run a jonas server: - jonas start - -2) Load earsample.ear (if you have not added it in the ear service descriptors list) using the jonasAadmin -management application (http://:/jonasAdmin) or the 'jonas admin' command. - -3a) Run your web browser (e.g., netscape): - netscape http://:/earsample - where is the name of your machine (localhost by default) - and the port number (9000 by default) - -3b) You can also lookup the Bean by using one of the client of the ear - - Use the default client (first found) - java -jar $JONAS_ROOT/lib/client.jar $JONAS_BASE/apps/earsample.ear -carolFile $JONAS_BASE/conf/carol.properties - - Use a specific client - java -jar $JONAS_ROOT/lib/client.jar $JONAS_BASE/apps/earsample.ear -jarClient client2.jar -carolFile $JONAS_BASE/conf/carol.properties - - -Notes : - a) that when you use the packages JOnAS-Tomcat and JOnAS-Jetty the earsample.ear is found $JONAS_BASE/apps/autoload directory. - b) the argument -carolFile is useless if you have rebuilt this example because in this - case the carol.properties of your environment is inserted in earsample.ear - -4) Stop the jonas server - jonas stop diff --git a/jonas_tests/examples/base/examples/earsample/build.xml b/jonas_tests/examples/base/examples/earsample/build.xml deleted file mode 100644 index 14a3222c223d6b3c54fbc54014754bc488092f14..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/build.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/earsample/etc/resources/jaas/jaas.config b/jonas_tests/examples/base/examples/earsample/etc/resources/jaas/jaas.config deleted file mode 100644 index 30ac6faa184071f9cb6aa2ab158260389b0f9edb..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/resources/jaas/jaas.config +++ /dev/null @@ -1,13 +0,0 @@ -earsample { - // Login Module to use for the example earsample. - - //First, use a LoginModule for the authentication - // Use the resource memrlm_1 - org.ow2.jonas.security.auth.spi.JResourceLoginModule required - resourceName="memrlm_1" - ; - - // Use the login module to propagate security to the JOnAS server - org.ow2.jonas.security.auth.spi.ClientLoginModule required - ; -}; \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/jetty.gif b/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/jetty.gif deleted file mode 100644 index 01f44a87f6801b200f142513d0d02b12cea0fb46..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/jetty.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/ow_jonas_logo.gif b/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/ow_jonas_logo.gif deleted file mode 100644 index 1b56943a721f82a8cb81776030567772265433f2..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/ow_jonas_logo.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/ow_logo.png b/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/ow_logo.png deleted file mode 100644 index 60617270bf0c0d21c9f40e4f7c85ef5bfdbda548..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/ow_logo.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/tomcat.gif b/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/tomcat.gif deleted file mode 100644 index 61756736b82350f64b5ea1b2bfc31ac57e30a3d3..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/tomcat.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/valid-xhtml11.png b/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/valid-xhtml11.png deleted file mode 100644 index 2c63d93f8868d574b9e69eda2727b7e7bf7fc8ec..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/valid-xhtml11.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/vcss.png b/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/vcss.png deleted file mode 100644 index 9b2f596e016533327216d98a0a927738fe17384f..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/earsample/etc/resources/web/img/vcss.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/earsample/etc/resources/web/index.html b/jonas_tests/examples/base/examples/earsample/etc/resources/web/index.html deleted file mode 100644 index 51fea3aaac4364c60e369361b173f3a9428e6f31..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/resources/web/index.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - EarSample Example - - - - -
    - Jakarta Tomcat - Mortbay Jetty - JOnAS WebSite -
    - -
    - Earsample : Example of servlet accessing a protected EJB -
    - - - - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/earsample/etc/resources/web/ow_jonas.css b/jonas_tests/examples/base/examples/earsample/etc/resources/web/ow_jonas.css deleted file mode 100644 index 3c5d6ab29f0827060a77172f37688b01704a7fd3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/resources/web/ow_jonas.css +++ /dev/null @@ -1,222 +0,0 @@ -/* - Context Root css. based on css from http://jonas.objectweb.org - XHTML by Florent BENOIT -*/ - -.bodywelcome -{ - background-color: #FFFFFF; - color: #000000; - background-image: url(img/ow_logo.png); - background-repeat: no-repeat; - margin: 0; -} - - -img { - margin: 5px; - border:0; -} - -body -{ - background-color: #FFFFFF; - margin: 10px; - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; - -} - -div.logos { - top: 5px; - width: 99%; - text-align: right; -} - - -div.links { - font-size: 14px; - margin-top : 40px; - margin-left : 100px; -} - - -div.titlepage { - margin-left: 200px; - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 22px; - line-height: 27px; - font-weight: bold; - border-color: #99C; - border-width: 0 0 4px 0; - border-style: none none solid none; -} - - -div.footer { - margin-top : 50px; - color: #FFFFFF; - font-size: 8pt; - text-align: center; -} - - -/*HTML elements */ - - - -ul, ol, dl -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; -} - -li -{ - color: black; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight: normal; - margin: 10px 0px 5px 0px; - -} -a -{ - color: #3F3975; - background-color: transparent; - text-decoration: underline; -} - -a:visited -{ - color: #9898CB; - background-color: transparent; - text-decoration: underline; -} - -a:hover -{ - color: #E06611; - background-color: transparent; - text-decoration: underline; -} - - -a:active -{ - color: #FFFFFF; - background-color: #E06611; - text-decoration: underline; -} - - -h1 -{ - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 22px; - line-height: 27px; - font-weight: bold; - border-color: #99C; - border-width: 0 0 4px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; -} - -h2 -{ - color: #99C; - font-family: Arial, Helvetica, sans-serif; - font-size: 20px; - line-height: 27px; - font-weight: normal; - border-color: #E06611; - border-width: 0 0 4px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} - -h3 -{ - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 27px; - font-weight: bold; - border-color: #E8EAF0; - border-width: 0 0 2px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} -h4 -{ - color: #99C; - font-family: Arial, Helvetica, sans-serif; - font-size: 16px; - line-height: 24px; - font-weight: normal; - border-color: #E8EAF0; - border-width: 0 0 2px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} -h5 -{ - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 24px; - font-weight: normal; - border-color: #E8EAF0; - border-width: 0 0 2px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} -h6 -{ - color: #99C; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - line-height: 22px; - font-weight: normal; - border-color: #E8EAF0; - border-width: 0 0 2px 0; - border-style: none none solid none; - margin: 10px 0px 5px 0px; - -} - -td -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - font-weight: normal; -} - -p -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; - margin: 10px 10px 5px 0px; -} - -p.error -{ - color: red; -} - diff --git a/jonas_tests/examples/base/examples/earsample/etc/xml/application-client.xml b/jonas_tests/examples/base/examples/earsample/etc/xml/application-client.xml deleted file mode 100644 index 44291ed6283258725e022cc741a62b5a8c6780f3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/xml/application-client.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - Client of the earsample - - - envEntryString - java.lang.String - - Test of envEntry of application-client.xml file - - - - - - ejb/Op - Session - org.objectweb.earsample.beans.secusb.OpHome - org.objectweb.earsample.beans.secusb.Op - secusb.jar#EarOp - - - - - ejb/OpLink - Session - org.objectweb.earsample.beans.secusb.OpHome - org.objectweb.earsample.beans.secusb.Op - EarOp - - - - url/jonas - java.net.URL - Container - - - - org.ow2.jonas.security.auth.callback.LoginCallbackHandler - - - diff --git a/jonas_tests/examples/base/examples/earsample/etc/xml/application.xml b/jonas_tests/examples/base/examples/earsample/etc/xml/application.xml deleted file mode 100644 index 7d984a8a16bec8a0aaef0a6c96f4035d56ac1d41..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/xml/application.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - ear example secusb/servlet - earsample secusb/servlet - - - secusb.jar - - - - - earsample.war - earsample - - - - - client1.jar - - - client2.jar - - - - ra-sample.rar - - - diff --git a/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-client1.xml b/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-client1.xml deleted file mode 100644 index b7b0d3fdd13c014c9c8c4007d5d15a71cc6e97f8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-client1.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - url/jonas - http://jonas.objectweb.org - - - - jaas.config - earsample - jonas - jonas - - - diff --git a/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-client2.xml b/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-client2.xml deleted file mode 100644 index 1cf3ead28217b38d9d294e14fe42339981790f47..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-client2.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - url/jonas - http://jonas.objectweb.org - - - - jaas.config - earsample - - - diff --git a/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-secusb.xml b/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-secusb.xml deleted file mode 100644 index ca04b169dbabb1e2aa96fb0c0cab7e7d16639f07..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-secusb.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - EarOp - EarOpHome - - diff --git a/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-web.xml b/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-web.xml deleted file mode 100644 index 069066e888db6286da168edf096d60786379f63e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/xml/jonas-web.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - url/URL - http://jonas.objectweb.org - - - diff --git a/jonas_tests/examples/base/examples/earsample/etc/xml/ra.xml b/jonas_tests/examples/base/examples/earsample/etc/xml/ra.xml deleted file mode 100755 index 73edde1b462012273682391d0c085db6c9d60bc5..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/xml/ra.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - rar sample - rar sample - ObjectWeb - - 1.0 - - false - - - - - org.objectweb.earsample.resourceadapters.ResourceAdapterImpl - - - - JNDI name - jndiName - - java.lang.String - - - eisName - - - - URL for EIS instance - EisURL - - java.lang.String - - - EIS_URL - - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/earsample/etc/xml/secusb.xml b/jonas_tests/examples/base/examples/earsample/etc/xml/secusb.xml deleted file mode 100644 index 531d055c2d0855cc4b401414651493bb6859d2f4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/xml/secusb.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - secured session bean JOnAS example - - secusb (earsample) - - - - EarOp - org.objectweb.earsample.beans.secusb.OpHome - org.objectweb.earsample.beans.secusb.Op - org.objectweb.earsample.beans.secusb.OpLocalHome - org.objectweb.earsample.beans.secusb.OpLocal - org.objectweb.earsample.beans.secusb.OpBean - Stateful - Container - - - - - - tomcat - - - jetty - - - - tomcat - - EarOp - * - - - - - jetty - - EarOp - * - - - - - - EarOp - * - - Supports - - - - - diff --git a/jonas_tests/examples/base/examples/earsample/etc/xml/web.xml b/jonas_tests/examples/base/examples/earsample/etc/xml/web.xml deleted file mode 100644 index 3366a4d289c9e8f12653ed4f4553af38c2f9a59c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/etc/xml/web.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - Op - - org.objectweb.earsample.servlets.ServletOp - - - - - Op - /secured/Op - - - - url/URL - java.net.URL - Application - - - - - Protected Area - - /secured/* - - DELETE - GET - POST - PUT - - - - tomcat - jetty - - - - - - BASIC - JOnAS Realm - - - - - tomcat - - - - jetty - - - - - envEntryString - java.lang.String - - This is a string from the env-entry - - - - - ejb/Op - Session - org.objectweb.earsample.beans.secusb.OpHome - org.objectweb.earsample.beans.secusb.Op - EarOp - - - - ejb/OpLocal - Session - - org.objectweb.earsample.beans.secusb.OpLocalHome - - org.objectweb.earsample.beans.secusb.OpLocal - secusb.jar#EarOp - - - diff --git a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/Op.java b/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/Op.java deleted file mode 100644 index f4c31355da190939db1e8ed0d68a4bcde03aebc2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/Op.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.earsample.beans.secusb; - -import javax.ejb.EJBObject; -import java.rmi.RemoteException; - -/** - * Remote interface for the bean Op - * @author JOnAS team - */ -public interface Op extends EJBObject { - - /** - * Business method implementation. - * @param shares nb of shares to be bought - * @throws RemoteException if RMI failed. - */ - void buy (int shares) throws RemoteException; - - /** - * Business method implementation. - * @return the nb of shares bought - * @throws RemoteException if RMI failed. - */ - int read () throws RemoteException; - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpBean.java b/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpBean.java deleted file mode 100644 index 65afb2722cda36514c984ac4afc906ad7343e3a3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpBean.java +++ /dev/null @@ -1,247 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.earsample.beans.secusb; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.ejb.SessionSynchronization; - -/** - * This is an example of Session Bean, statefull, and synchronized. - * @author JOnAS team - */ -public class OpBean implements SessionBean, SessionSynchronization { - - /** - * Actual state of the bean - */ - private int total = 0; - - /** - * value inside Tx, not yet committed. - */ - private int newtotal = 0; - - /** - * User client - */ - private String clientUser = null; - - /** - * Session context that the container provides for a session enterprise Bean - * instance. - */ - private SessionContext sessionContext = null; - - /* ========================= ejbCreate methods ============================ */ - - /** - * There must be one ejbCreate() method per create() method on the Home - * interface, and with the same signature. - * @param user the user name - */ - public void ejbCreate(String user) { - total = 0; - // in case we are outside transactions - newtotal = total; - clientUser = user; - } - - /* =============== javax.ejb.SessionBean 2.0 implementation ============== */ - - /** - * The activate method is called when the instance is activated from its - * "passive" state. The instance should acquire any resource that it has - * released earlier in the ejbPassivate() method. This method is called with - * no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbActivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - } - - /** - * The passivate method is called before the instance enters the "passive" - * state. The instance should release any resources that it can re-acquire - * later in the ejbActivate() method. After the passivate method completes, - * the instance must be in a state that allows the container to use the Java - * Serialization protocol to externalize and store away the instance's - * state. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbPassivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - } - - /** - * A container invokes this method before it ends the life of the session - * object. This happens as a result of a client's invoking a remove - * operation, or when a container decides to terminate the session object - * after a timeout. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbRemove() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - } - - /** - * Set the associated session context. The container calls this method after - * the instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for applications - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void setSessionContext(SessionContext sessionContext) throws EJBException, java.rmi.RemoteException { - this.sessionContext = sessionContext; - } - - /* - * ============== javax.ejb.SessionSynchronization implementation - * ============= - */ - - /** - * The afterBegin method notifies a session Bean instance that a new - * transaction has started, and that the subsequent business methods on the - * instance will be invoked in the context of the transaction. The instance - * can use this method, for example, to read data from a database and cache - * the data in the instance fields. This method executes in the proper - * transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException - This exception is defined in the - * method signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specifications should throw - * the javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB 2.0 and higher specifications must not - * throw the java.rmi.RemoteException. - */ - public void afterBegin() throws EJBException, java.rmi.RemoteException { - newtotal = total; - } - - /** - * The beforeCompletion method notifies a session Bean instance that a - * transaction is about to be committed. The instance can use this method, - * for example, to write any cached data to a database. This method executes - * in the proper transaction context. Note: The instance may still - * cause the container to rollback the transaction by invoking the - * setRollbackOnly() method on the instance context, or by throwing an - * exception. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException - This exception is defined in the - * method signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specifications should throw - * the javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB 2.0 and higher specifications must not - * throw the java.rmi.RemoteException. - */ - public void beforeCompletion() throws EJBException, java.rmi.RemoteException { - } - - /** - * The afterCompletion method notifies a session Bean instance that a - * transaction commit protocol has completed, and tells the instance whether - * the transaction has been committed or rolled back. This method executes - * with no transaction context. - * @param committed - True if the transaction has been committed, false if - * is has been rolled back. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException - This exception is defined in the - * method signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specifications should throw - * the javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB 2.0 and higher specifications must not - * throw the java.rmi.RemoteException. - */ - public void afterCompletion(boolean committed) throws EJBException, java.rmi.RemoteException { - - if (committed) { - total = newtotal; - } else { - newtotal = total; - } - } - - /* ========================= Op implementation ============================ */ - - /** - * Business method implementation. - * @param s nb of shares to be bought - */ - public void buy(int s) { - newtotal = newtotal + s; - return; - } - - /** - * Business method implementation. - * @return the nb of shares bought - */ - public int read() { - return newtotal; - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpHome.java b/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpHome.java deleted file mode 100644 index c27269138dc8324e83f469aa2c43f14e96c48a67..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpHome.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.earsample.beans.secusb; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * Home interface for the bean Op - * @author JOnAS team - */ -public interface OpHome extends EJBHome { - - /** - * Create an instance of the Op bean. - * @param user the user name. - * @return the Remote interface of the bean Op. - * @throws CreateException if the creation failed. - * @throws RemoteException if the RMI call failed. - */ - Op create(String user) throws CreateException, RemoteException; -} diff --git a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocal.java b/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocal.java deleted file mode 100644 index f65b4b5543bae448569205b9d69987da2ffbec01..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocal.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.earsample.beans.secusb; - -import javax.ejb.EJBLocalObject; - -/** - * Local interface for the bean Op - * @author JOnAS team - */ -public interface OpLocal extends EJBLocalObject { - - /** - * Business method implementation. - * @param shares nb of shares to be bought - */ - void buy(int shares); - - /** - * Business method implementation. - * @return the nb of shares bought - */ - int read(); -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocalHome.java b/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocalHome.java deleted file mode 100644 index 730e9966246da30e8a5241a6098d55fef3521cf9..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/beans/secusb/OpLocalHome.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.earsample.beans.secusb; - -import javax.ejb.CreateException; -import javax.ejb.EJBLocalHome; - -/** - * Local home interface for the bean Op - * @author JOnAS team - */ -public interface OpLocalHome extends EJBLocalHome { - - /** - * Create an instance of the Op bean. - * @param user the user name. - * @return the Remote interface of the bean Op. - * @throws CreateException if the creation failed. - */ - OpLocal create(String user) throws CreateException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/clients/Client.java b/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/clients/Client.java deleted file mode 100644 index 87aa7e493a303d3ff2cfd9686f2db3982feb75ff..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/clients/Client.java +++ /dev/null @@ -1,189 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent Benoit - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.earsample.clients; - -import java.net.URL; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.transaction.UserTransaction; -import javax.rmi.PortableRemoteObject; - -import org.objectweb.earsample.beans.secusb.Op; -import org.objectweb.earsample.beans.secusb.OpHome; - -/** - * Heavy client doing some operations on a bean - * @author jonas team - */ -public class Client { - - /** - * First amount to buy - */ - private static final int FIRST_BUY_AMOUNT = 10; - - /** - * Second amount to buy - */ - private static final int SECOND_BUY_AMOUNT = 20; - - /** - * Third amount to buy (will be rollback) - */ - private static final int THIRD_BUY_AMOUNT = 50; - - /** - * Constructor. Hide constructor as it is an utility class - */ - private Client() { - - } - - /** - * Main method - * @param args arguments of the client - */ - public static void main(String[] args) { - - Context initialContext = null; - System.out.print("Building a new InitialContext..."); - try { - initialContext = new InitialContext(); - } catch (Exception e) { - System.err.println("Cannot get initial context for JNDI: " + e); - System.exit(2); - } - System.out.println("done !"); - - System.out.print("Looking up java:comp/UserTransaction ..."); - // We want to start transactions from client: get UserTransaction - UserTransaction utx = null; - try { - utx = (UserTransaction) initialContext.lookup("java:comp/UserTransaction"); - } catch (Exception e) { - System.err.println("Cannot lookup UserTransaction: " + e); - System.exit(2); - } - System.out.println("done !"); - - String envEntry = null; - System.out.print("Looking up java:comp/env/envEntryString ..."); - try { - envEntry = (String) initialContext.lookup("java:comp/env/envEntryString"); - } catch (Exception e) { - System.err.println("Cannot get env-entry on JNDI " + e); - System.exit(2); - } - System.out.println("done !"); - System.out.println("Env entry is : " + envEntry); - - URL url = null; - System.out.print("Looking up java:comp/env/url/jonas ..."); - try { - url = (URL) initialContext.lookup("java:comp/env/url/jonas"); - } catch (Exception e) { - System.err.println("Cannot get URL on JNDI " + e); - System.exit(2); - } - System.out.println("done !"); - System.out.println("Web site of jonas is at :" + url); - - System.out.print("Looking up java:comp/env/ejb/Op ..."); - // Connecting to OpHome thru JNDI - OpHome home = null; - try { - home = (OpHome) PortableRemoteObject.narrow(initialContext.lookup("java:comp/env/ejb/Op"), OpHome.class); - System.out.println("done !"); - } catch (Exception e) { - e.printStackTrace(); - System.err.println("Cannot lookup OpHome: " + e); - System.exit(2); - } - - // OpBean creation - Op t1 = null; - try { - System.out.println("Create a bean"); - t1 = home.create("User1"); - } catch (Exception e) { - System.err.println("Cannot create OpBean: " + e); - System.exit(2); - } - - // First transaction (committed) - try { - System.out.println("Start a first transaction"); - utx.begin(); - System.out.println("First request on the new bean"); - t1.buy(FIRST_BUY_AMOUNT); - System.out.println("Second request on the bean"); - t1.buy(SECOND_BUY_AMOUNT); - System.out.println("Commit the transaction"); - utx.commit(); - } catch (Exception e) { - System.err.println("exception during 1st Tx: " + e); - System.exit(2); - } - // Start another transaction (rolled back) - try { - System.out.println("Start a second transaction"); - utx.begin(); - t1.buy(THIRD_BUY_AMOUNT); - System.out.println("Rollback the transaction"); - utx.rollback(); - } catch (Exception e) { - System.err.println("exception during 2nd Tx: " + e); - System.exit(2); - } - - // Get the total bought, outside the transaction - int val = 0; - try { - System.out.println("Request outside any transaction"); - val = t1.read(); - } catch (Exception e) { - System.err.println("Cannot read value on t1 : " + e); - System.exit(2); - } - if (val != FIRST_BUY_AMOUNT + SECOND_BUY_AMOUNT) { - System.err.println("Bad value read: " + val); - System.exit(2); - } - - // Remove Session bean - try { - t1.remove(); - } catch (Exception e) { - System.out.println("Exception on buy: " + e); - System.exit(2); - } - System.out.println("ClientOp OK. Exiting."); - } -} - diff --git a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/resourceadapters/ResourceAdapterImpl.java b/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/resourceadapters/ResourceAdapterImpl.java deleted file mode 100755 index 001553566814a33cfcc0e3cf1da5d2c26b87ac75..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/resourceadapters/ResourceAdapterImpl.java +++ /dev/null @@ -1,191 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.earsample.resourceadapters; - - -import java.net.MalformedURLException; -import java.util.HashMap; - -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.resource.NotSupportedException; -import javax.resource.ResourceException; -import javax.resource.spi.ActivationSpec; -import javax.resource.spi.BootstrapContext; -import javax.resource.spi.ResourceAdapterInternalException; -import javax.resource.spi.endpoint.MessageEndpointFactory; -import javax.transaction.xa.XAResource; - -/** - * A Resource adapter - * @author kemlerp - * - */ -public class ResourceAdapterImpl implements javax.resource.spi.ResourceAdapter, java.io.Serializable { - - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3834312812943456568L; - - /** - * String should be the RA name when set, ie, EIS - */ - private String eisurl; - - /** - * The JNDI name - */ - private String jndiName; - - /** - * Initial context - */ - private InitialContext ictx; - - /** - * BootstrapContext - */ - private BootstrapContext bootstrapCtx = null; // set in start() - - /** - * EndpointFactories - */ - private transient HashMap endpointFactories = new HashMap(); - - - /** - * Start - * @param bootstrapCtx bootstrapCtx - * @throws ResourceAdapterInternalException if an error occurs - */ - public void start(BootstrapContext bootstrapCtx) throws ResourceAdapterInternalException { - this.bootstrapCtx = bootstrapCtx; - - try { - ictx = new InitialContext(); - ictx.bind(jndiName, eisurl); - } catch (NamingException e) { - e.printStackTrace(); - } - - } - - /** - * Stop - */ - public void stop() { - try { - ictx.unbind(jndiName); - } catch (NamingException e) { - e.printStackTrace(); - } - } - - - /** - * Called by the application server when a message-driven bean - * (MessageEndpoint) is deployed. - * @param factory MessageEndpointFactory - * @param spec activation spec - * @throws NotSupportedException if an error occurs - * @throws ResourceAdapterInternalException if an error occurs - */ - public void endpointActivation(MessageEndpointFactory factory, ActivationSpec spec) throws NotSupportedException, - ResourceAdapterInternalException { - endpointFactories.put(spec, factory); - } - - /** - * Endpoint Deactivation - * @param factory MessageEndpointFactory - * @param spec activation spec - */ - public void endpointDeactivation(MessageEndpointFactory factory, ActivationSpec spec) { - endpointFactories.remove(spec); - } - - /** - * Get XAResources - * @param specs A tab of specs - * @throws ResourceException if an error occurs - * @return Tab of XAResources - */ - public XAResource[] getXAResources(ActivationSpec[] specs) throws ResourceException { - return null; - } - - /** - * Get Eis URL - * @return Eis URL - */ - public String getEisURL() { - return eisurl.toString(); - } - - /** - * Set Eis URL - * @param eisURL Eis URL - * @throws MalformedURLException if 'eisURL' is not a URL - */ - public void setEisURL(String eisURL) throws MalformedURLException { - // ra.xml deployment supplies value - this.eisurl = eisURL; - } - - /** - * Get BootstrapContext - * @return bootstrapCtx - */ - public BootstrapContext getBootstrapCtx() { - return bootstrapCtx; - } - - /** - * Set BootstrapContext - * @param bootstrapCtx bootstrapContext - */ - public void setBootstrapCtx(BootstrapContext bootstrapCtx) { - this.bootstrapCtx = bootstrapCtx; - } - - /** - * Get used JNDI name - * @return A string - */ - public String getJndiName() { - return jndiName; - } - - /** - * Set JNDI name - * @param jndiName a string - */ - public void setJndiName(String jndiName) { - this.jndiName = jndiName; - } -} diff --git a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/servlets/ServletOp.java b/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/servlets/ServletOp.java deleted file mode 100644 index c72f0c9d2b347daad6e334041e59774379c363e8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/earsample/src/org/objectweb/earsample/servlets/ServletOp.java +++ /dev/null @@ -1,304 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.earsample.servlets; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URL; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.transaction.UserTransaction; - -import org.objectweb.earsample.beans.secusb.Op; -import org.objectweb.earsample.beans.secusb.OpHome; -import org.objectweb.earsample.beans.secusb.OpLocal; -import org.objectweb.earsample.beans.secusb.OpLocalHome; - -/** - * This servlet is an example to show how to access a EJB from a servlet - * @author JOnAS team - */ -public class ServletOp extends HttpServlet { - - /** - * First amount to buy - */ - private static final int FIRST_BUY_AMOUNT = 10; - - /** - * Second amount to buy - */ - private static final int SECOND_BUY_AMOUNT = 20; - - /** - * Third amount to buy (will be rollback) - */ - private static final int THIRD_BUY_AMOUNT = 50; - - - /** - * Called by the server (via the service method) to allow a servlet to - * handle a GET request. - * @param request an HttpServletRequest object that contains the request - * the client has made of the servlet - * @param response an HttpServletResponse object that contains the - * response the servlet sends to the client - * @throws IOException if an input or output error is detected when the - * servlet handles the GET request - * @throws ServletException if the request for the GET could not be handled - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { - - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - out.println(""); - out.println(""); - out.println(""); - out.println(""); - out.println("Ear Sample of Servlet accessing a protected EJB"); - out.println(""); - out.println(""); - out.println("

    Ear sample of Servlet accessing a protected EJB"); - out.println("

    \"Tomcat"); - out.println("\"Jetty"); - out.println("\"JOnAS"); - out.println("

    Initial context / UserTransaction

    "); - out.println("
      "); - Context initialContext = null; - try { - initialContext = new InitialContext(); - out.println("
    • Initial context OK
    • "); - } catch (Exception e) { - out.print("
    • Cannot get initial context for JNDI: "); - out.println(e + "
    • "); - return; - } - - // We want to start transactions from client: get UserTransaction - UserTransaction utx = null; - try { - utx = (UserTransaction) initialContext.lookup("java:comp/UserTransaction"); - out.println("
    • Get java:comp/UserTransaction OK
    • "); - } catch (Exception e) { - out.println("
    • Cannot lookup java:comp/UserTransaction: " + e + "
    • "); - return; - } - out.println("

    "); - - out.println("

    "); - out.println("Lookup on env-entry with java:comp/env/envEntryString"); - out.println("

    "); - out.println("
      "); - String envEntry = null; - try { - envEntry = (String) initialContext.lookup("java:comp/env/envEntryString"); - out.println("
    • Env entry is : " + envEntry + "
    • "); - } catch (Exception e) { - out.println("
    • Cannot get env-entry on JNDI " + e + "
    • "); - return; - } - out.println("

    "); - - - out.println("
    "); - - out.println("

    "); - out.println("Lookup on URL with java:comp/env/url/URL"); - out.println("

    "); - out.println("
      "); - URL jonasURL = null; - try { - jonasURL = (URL) initialContext.lookup("java:comp/env/url/URL"); - out.println("
    • URL is : " + jonasURL.toString() + "
    • "); - } catch (Exception e) { - out.println("
    • Cannot get url on JNDI " + e + "
    • "); - return; - } - out.println("

    "); - - out.println("

    Actions realized by the servlet and the EJB

    "); - out.println("

    With local interface

    "); - out.println("
      "); - // Connecting to OpLocalHome thru JNDI - OpLocalHome opLocalHome = null; - try { - opLocalHome = (OpLocalHome) - initialContext.lookup("java:comp/env/ejb/OpLocal"); - } catch (Exception e) { - out.println("
    • Cannot lookup java:comp/env/ejb/OpLocal: " + e + "
    • "); - return; - } - // OpBean creation - OpLocal opLocal = null; - try { - opLocal = opLocalHome.create("User1"); - out.println("
    • Create a bean
    • "); - } catch (Exception e) { - out.println("
    • Cannot create OpBean: " + e + "
    • "); - return; - } - // First transaction (committed) - try { - out.println("
    • Start a first transaction
    • "); - utx.begin(); - opLocal.buy(FIRST_BUY_AMOUNT); - out.println("
    • First request on the new bean
    • "); - opLocal.buy(SECOND_BUY_AMOUNT); - out.println("
    • Second request on the bean
    • "); - utx.commit(); - out.println("
    • Commit the transaction
    • "); - } catch (Exception e) { - out.println("
    • exception during 1st Tx: " + e + "
    • "); - return; - } - // Start another transaction (rolled back) - try { - out.println("
    • Start a second transaction
    • "); - utx.begin(); - opLocal.buy(THIRD_BUY_AMOUNT); - utx.rollback(); - out.println("
    • Rollback the transaction
    • "); - } catch (Exception e) { - out.println("
    • exception during 2nd Tx: " + e + "
    • "); - return; - } - // Get the total bought, outside the transaction - int val = 0; - try { - val = opLocal.read(); - out.println("
    • Request outside any transaction
    • "); - } catch (Exception e) { - out.println("
    • Cannot read value on t1 : " + e + "
    • "); - return; - } - if (val != FIRST_BUY_AMOUNT + SECOND_BUY_AMOUNT) { - out.println("
    • Bad value read: " + val + "
    • "); - return; - } - // Remove Session bean - try { - opLocal.remove(); - } catch (Exception e) { - out.println("
    • Exception on buy: " + e + "
    • "); - return; - } - out.println("

    "); - - out.println("

    With remote interface

    "); - out.println("
      "); - // Connecting to OpHome thru JNDI - OpHome opHome = null; - try { - opHome = (OpHome) PortableRemoteObject.narrow(initialContext.lookup("java:comp/env/ejb/Op"), OpHome.class); - } catch (Exception e) { - out.println("
    • Cannot lookup java:comp/env/ejb/Op: " + e + "
    • "); - return; - } - // OpBean creation - Op op = null; - try { - op = opHome.create("User1"); - out.println("
    • Create a bean
    • "); - } catch (Exception e) { - out.println("
    • Cannot create OpBean: " + e + "
    • "); - return; - } - // First transaction (committed) - try { - out.println("
    • Start a first transaction
    • "); - utx.begin(); - op.buy(FIRST_BUY_AMOUNT); - out.println("
    • First request on the new bean
    • "); - op.buy(SECOND_BUY_AMOUNT); - out.println("
    • Second request on the bean
    • "); - utx.commit(); - out.println("
    • Commit the transaction
    • "); - } catch (Exception e) { - out.println("
    • exception during 1st Tx: " + e + "
    • "); - return; - } - // Start another transaction (rolled back) - try { - out.println("
    • Start a second transaction
    • "); - utx.begin(); - op.buy(THIRD_BUY_AMOUNT); - utx.rollback(); - out.println("
    • Rollback the transaction
    • "); - } catch (Exception e) { - out.println("
    • exception during 2nd Tx: " + e + "
    • "); - return; - } - // Get the total bought, outside the transaction - val = 0; - try { - val = op.read(); - out.println("
    • Request outside any transaction
    • "); - } catch (Exception e) { - out.println("
    • Cannot read value on t1 : " + e + "
    • "); - return; - } - if (val != FIRST_BUY_AMOUNT + SECOND_BUY_AMOUNT) { - out.println("
    • Bad value read: " + val + "
    • "); - return; - } - // Remove Session bean - try { - op.remove(); - } catch (Exception e) { - out.println("
    • Exception on buy: " + e + "
    • "); - return; - } - out.println("

    "); - - - - out.println("

    "); - out.println("Resource Adapter Properties"); - out.println("

    "); - out.println("
      "); - String eisName = null; - try { - eisName = (String) initialContext.lookup("eisName"); - out.println("
    • EIS Name is : " + eisName + "
    • "); - } catch (Exception e) { - out.println("
    • Cannot get eis name on JNDI " + e + "
    • "); - return; - } - out.println("

    "); - - - out.println("Sample is OK.
    "); - out.println(""); - out.println(""); - } -} diff --git a/jonas_tests/examples/base/examples/emb-sample/.cvsignore b/jonas_tests/examples/base/examples/emb-sample/.cvsignore deleted file mode 100644 index 378eac25d311703f3f2cd456d8036da525cd0366..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/jonas_tests/examples/base/examples/emb-sample/README b/jonas_tests/examples/base/examples/emb-sample/README deleted file mode 100644 index e4a673003b5d18261c6625a9c530871f673a5ade..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/README +++ /dev/null @@ -1,70 +0,0 @@ -$Id: README,v 1.3 2005/07/08 14:02:52 pasmith Exp $ - -============================================================================== -ENTERPRISE MEDIA BEANS SAMPE README -============================================================================== - -As a pre-requisite, please deploy the emb-sample application. - -To visit the emb-sample Application visit: - - http://localhost:9000/emb-sample - -First you have to had some media to the database : - - to add default samples select Load - - to add your own samples by uploading it - -All your sample will be remove after session timeout - - -====================================== -DIRECTORY STRUCTURE: -====================================== - -emb-core/ customizes preset core application of EMB -etc/ all deployment descriptor -lib/ upload lib -resources/ JSPs, samples, images, html files. -src/ java files - - -====================================== -KNOWN ISSUES: -====================================== - -Here are some known issues about the emb-sample demo: - -1) By default the application is set to work only on localhost - -2) Cookies have to be accepted in order to use this sample - -3) If the user's session times out or if the user removes their - cookies, all generated media will be removed - -4) This sample needs some memory under quite heavy load, I advice you to start - JOnAS more memory than default (64MB). (if you got OutOfMemoryError) - To do this set JAVA_OPTS environment variable to -Xmx128m, in order to - set the maximum memory of the JVM to 128MB. - - -====================================== -HOW TO CUSTOMIZE EMB-SAMPLE SETTING: -====================================== - -Customize application : - emb sample have some few setting in order to limit the load of the server - in case of an on line demo. - - - in etc/web.xml : set the session timeout (in minutes - - in etc/embSampleSession.xml : - - set the env entry ejb/embSample/isCopyAllowed in order to copy or - to modify the media when using some conversion (limit numbers of ejb - entity). - - set the env entry ejb/embSample/maxMediaPerSession to set the - maximum of media that can be created (upload, convert if copy is - allowed) - - Some features are only avaiable by using some plugins such has streaming - capabilities, video conversion or more image format support. - For using this sample through a network (not localhost) see the - Enterprise Media Beans documentation. diff --git a/jonas_tests/examples/base/examples/emb-sample/build.xml b/jonas_tests/examples/base/examples/emb-sample/build.xml deleted file mode 100644 index 636d26ea7527f2e42cc1695e84eb34518592aa07..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/build.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/emb-sample/emb-core/README b/jonas_tests/examples/base/examples/emb-sample/emb-core/README deleted file mode 100644 index e057cf6e18ba6777e0b7f187969a8a11254a9054..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/emb-core/README +++ /dev/null @@ -1,9 +0,0 @@ -$Id: README,v 1.3 2005/07/08 14:02:52 pasmith Exp $ - -============================================================================== - EMB CORE -============================================================================== - -In this directory put your customized emb-core.ear -(orginal is in $JONAS_ROOT/lib/commons/jonas/emb/emb-core) - diff --git a/jonas_tests/examples/base/examples/emb-sample/etc/application.xml b/jonas_tests/examples/base/examples/emb-sample/etc/application.xml deleted file mode 100644 index 5d6f36240c24dac150a999e1bb02df49bb846864..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/etc/application.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - JOnAS EMB sample - JOnAS EMB sample - - - - - emb-core-ejb.jar - - - - - emb-plugin-publisher-servlet-jonas.rar - - - - emb-plugin-publisher-servlet-jonas.war - - emb-plugin-publisher-servlet-jonas - - - - - - - - - emb-sample-ejb.jar - - - - - - emb-sample.war - emb-sample - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/emb-sample/etc/embSampleSession.xml b/jonas_tests/examples/base/examples/emb-sample/etc/embSampleSession.xml deleted file mode 100644 index ae2c91129c7b35d588c9357d985473e702ba032e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/etc/embSampleSession.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - EMB Sample Session Bean - - - MediaSampleSession - - emb.sample.session.MediaSampleSessionLocalHome - - emb.sample.session.MediaSampleSessionLocal - - emb.sample.session.MediaSampleSessionBean - - Stateful - Container - - This permit to copy media content instead of mdified it. It create more mediaEntityBean - - ejb/embSample/isCopyAllowed - - java.lang.Boolean - true - - - Maximum media per session, to avoid server over load. The demo has at least 10 media by default. 0 is no limit - - ejb/embSample/maxMediaPerSession - - java.lang.Integer - 0 - - - ejb/emb/MediaEntity - Entity - javax.emb.MediaEntityLocalHome - javax.emb.MediaEntityLocal - emb-core-ejb.jar#MediaEntity - - - - - - - MediaSampleSession - * - - Supports - - - - diff --git a/jonas_tests/examples/base/examples/emb-sample/etc/jonas-embSampleSession.xml b/jonas_tests/examples/base/examples/emb-sample/etc/jonas-embSampleSession.xml deleted file mode 100644 index 23c3e122cce53ebaaecc15e6528ac7f54b4c74d3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/etc/jonas-embSampleSession.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/jonas_tests/examples/base/examples/emb-sample/etc/web.xml b/jonas_tests/examples/base/examples/emb-sample/etc/web.xml deleted file mode 100644 index ee709397325322a762bea1decfb198fcfe661c32..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/etc/web.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - 10 - - - - - ActionDispatcher - - emb.sample.servlet.ActionDispatcher - - - - LoadSampleMedia - - emb.sample.servlet.LoadSampleMedia - - - - UploadSampleMedia - - emb.sample.servlet.UploadSampleMedia - - - - HomeSample - emb.sample.servlet.HomeSample - - - ListSampleMedia - - emb.sample.servlet.ListSampleMedia - - - - ExtractHeaderData - - emb.sample.servlet.ExtractHeaderData - - - - RetrieveSampleMedia - - emb.sample.servlet.RetrieveSampleMedia - - - - ConvertSampleImageBW - - emb.sample.servlet.ConvertSampleImageBW - - - - ConvertSampleImageHalfSize - - emb.sample.servlet.ConvertSampleImageHalfSize - - - - JAIConvertSampleImageBW - - emb.sample.servlet.ConvertSampleImageBW - - - - JAIConvertSampleImageHalfSize - - emb.sample.servlet.ConvertSampleImageHalfSize - - - - ConvertSampleImageFormat - - emb.sample.servlet.ConvertSampleImageFormat - - - - ConvertSampleImageChained - - emb.sample.servlet.ConvertSampleImageChained - - - - ConvertSampleImageSvgToPng - - emb.sample.servlet.ConvertSampleImageSvgToPng - - - - ConvertSampleVideoTo3GPP - - emb.sample.servlet.ConvertSampleVideoTo3GPP - - - - - ConvertSampleVideoToMpegTs - - emb.sample.servlet.ConvertSampleVideoToMpegTs - - - - ConvertSampleVideoToMpeg - - emb.sample.servlet.ConvertSampleVideoToMpeg - - - - ConvertSampleImageOverlayed - - emb.sample.servlet.ConvertSampleImageOverlayed - - - - ConvertSampleImageFrame - - emb.sample.servlet.ConvertSampleImageFrame - - - - - - ActionDispatcher - /index.jsp - - - HomeSample - /HomeSample - - - ActionDispatcher - /ActionDispatcher - - - UploadSampleMedia - /UploadSampleMedia - - - LoadSampleMedia - /LoadSampleMedia - - - ListSampleMedia - /ListSampleMedia - - - ExtractHeaderData - /ExtractHeaderData - - - RetrieveSampleMedia - /RetrieveSampleMedia - - - ConvertSampleImageBW - /ConvertSampleImageBW - - - ConvertSampleImageHalfSize - /ConvertSampleImageHalfSize - - - ConvertSampleImageFormat - /ConvertSampleImageFormat - - - ConvertSampleImageChained - /ConvertSampleImageChained - - - ConvertSampleImageSvgToPng - /ConvertSampleImageSvgToPng - - - ConvertSampleVideoTo3GPP - /ConvertSampleVideoTo3GPP - - - ConvertSampleVideoToMpegTs - /ConvertSampleVideoToMpegTs - - - ConvertSampleVideoToMpeg - /ConvertSampleVideoToMpeg - - - ConvertSampleImageOverlayed - /ConvertSampleImageOverlayed - - - ConvertSampleImageFrame - /ConvertSampleImageFrame - - - 404 - /ActionDispatcher - - - ejb/emb/MediaEntity - Entity - javax.emb.MediaEntityLocalHome - javax.emb.MediaEntityLocal - emb-core-ejb.jar#MediaEntity - - - ejb/embSample/MediaSampleSession - Session - - emb.sample.session.MediaSampleSessionLocalHome - - emb.sample.session.MediaSampleSessionLocal - emb-sample-ejb.jar#MediaSampleSession - - - - - - emb.sample.servlet.HttpSessionMgr - - - - diff --git a/jonas_tests/examples/base/examples/emb-sample/lib/README b/jonas_tests/examples/base/examples/emb-sample/lib/README deleted file mode 100644 index 6ab933bf418c4f0445b183d68e3d6ffc34f47326..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/lib/README +++ /dev/null @@ -1,2 +0,0 @@ -Version of jars file is located in versions.properties file. -Sources are located under JONAS_CVS/emb-jonas. \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/emb-sample/lib/commons-fileupload-1.1.1.jar b/jonas_tests/examples/base/examples/emb-sample/lib/commons-fileupload-1.1.1.jar deleted file mode 100644 index fc5763d0d33108308493ac19cbc0e4c2eadfca26..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/lib/commons-fileupload-1.1.1.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/lib/emb-core.ear b/jonas_tests/examples/base/examples/emb-sample/lib/emb-core.ear deleted file mode 100644 index 93b8f9c5e2142c1f9acea6b008e2f60813545c1f..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/lib/emb-core.ear and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/lib/emb-jsr86-api.jar b/jonas_tests/examples/base/examples/emb-sample/lib/emb-jsr86-api.jar deleted file mode 100644 index f5da3b0d27ed2af9c36aa0c134c66ecd31939aba..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/lib/emb-jsr86-api.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/lib/emb-ow-mfb-core.jar b/jonas_tests/examples/base/examples/emb-sample/lib/emb-ow-mfb-core.jar deleted file mode 100644 index 586848d65eea78262a170c6f71554a9991ecd763..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/lib/emb-ow-mfb-core.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/lib/emb-ow-plugins-api.jar b/jonas_tests/examples/base/examples/emb-sample/lib/emb-ow-plugins-api.jar deleted file mode 100644 index b7b7bae4725f6d88e739cf3039d69ef203fbbde7..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/lib/emb-ow-plugins-api.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/plugins/README b/jonas_tests/examples/base/examples/emb-sample/plugins/README deleted file mode 100644 index 88ee43011fed783c17e246d42d44652703c47dba..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/plugins/README +++ /dev/null @@ -1,8 +0,0 @@ -$Id$ - -============================================================================== - Plugins -============================================================================== - -In this directory put the plugins you want to use (*.rar) - diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/icons/valid-xhtml11.png b/jonas_tests/examples/base/examples/emb-sample/resources/icons/valid-xhtml11.png deleted file mode 100644 index 2c63d93f8868d574b9e69eda2727b7e7bf7fc8ec..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/icons/valid-xhtml11.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/icons/vcss.png b/jonas_tests/examples/base/examples/emb-sample/resources/icons/vcss.png deleted file mode 100644 index 9b2f596e016533327216d98a0a927738fe17384f..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/icons/vcss.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/footer.jsp b/jonas_tests/examples/base/examples/emb-sample/resources/jsps/footer.jsp deleted file mode 100644 index 6abe0bfbf5b7b873b1cb929180d6535190115817..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/footer.jsp +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/header.jsp b/jonas_tests/examples/base/examples/emb-sample/resources/jsps/header.jsp deleted file mode 100644 index fa91d53b214aec135b8ecfb8b962fb6f9b0a6a45..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/header.jsp +++ /dev/null @@ -1,31 +0,0 @@ - - -<%@ page errorPage="templatePage.jsp" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %> - - - -JOnAS Enterprise Media Beans (JSR 86) - Sample - - - -
    - - -

    JOnAS Enterprise Media Beans (JSR 86) - Sample

    - - - - -
    - diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/mediaList.jsp b/jonas_tests/examples/base/examples/emb-sample/resources/jsps/mediaList.jsp deleted file mode 100644 index 31920bbc7e8321cc1205a457404ddd28010d132b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/mediaList.jsp +++ /dev/null @@ -1,109 +0,0 @@ - - -<%@ page import="emb.sample.servlet.BaseSampleServlet"%> -<%@ page errorPage="templatePage.jsp"%> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - -JOnAS Enterprise Media Beans (JSR 86) - Sample - - - -
    -
    -

    JOnAS Enterprise Media Beans (JSR 86) - Sample

    - - - - -
    - - - - - - - - <% - boolean lineParity = true; - - // get medias - javax.emb.MediaEntityLocal[] medias = (javax.emb.MediaEntityLocal[]) request.getAttribute("samplesMedia"); - String[] proxiesUrl = (String[]) request.getAttribute("proxiesUrl"); - - for (int i = 0; i < medias.length; i++) { - - String lineKind = "even"; - if (lineParity) { - lineKind = "odd"; - } - lineParity = !lineParity; - - %> - - - - - - - - - - - <%}%> - -
    Usable Media List
    - - - - <%= medias[i].getName() %> - - <%=medias[i].getName()%><%=medias[i].getMimeType()%><%= BaseSampleServlet.SIZE_FORMAT.format(medias[i].getSize() / BaseSampleServlet.BYTE_IN_KB) %> kB
    <%=(medias[i].getDescription() == null ? "" : medias[i].getDescription())%>
    -
    - - -
    -
    - - diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/navigation.jsp b/jonas_tests/examples/base/examples/emb-sample/resources/jsps/navigation.jsp deleted file mode 100644 index d560f25e71284c68696a0334505831f791b369dd..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/navigation.jsp +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/templatePage.jsp b/jonas_tests/examples/base/examples/emb-sample/resources/jsps/templatePage.jsp deleted file mode 100644 index 6a397249a5c988df4e6390b6b059446358290993..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/templatePage.jsp +++ /dev/null @@ -1,67 +0,0 @@ - - -<%@ page isErrorPage="true"%> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %> - - - -JOnAS Enterprise Media Beans (JSR 86) - Sample - - - -
    - - -

    JOnAS Enterprise Media Beans (JSR 86) - Sample

    - - - - - -
    -<% -if (exception != null) { - out.println("

    There was an Error

    "); - out.println("
    ");
    -    java.io.ByteArrayOutputStream ostr = new java.io.ByteArrayOutputStream();
    -    exception.printStackTrace(new java.io.PrintStream(ostr));
    -    out.print(ostr);
    -    out.println("
    "); -} - -Object workspaceContent = request.getAttribute("workspaceContent"); -if (workspaceContent != null) { - out.println(workspaceContent.toString()); -} - -Object errorMessage = request.getAttribute("errorMessage"); -if (errorMessage != null) { - out.println("

    There was an Error

    "); - out.println("
    ");
    -    out.println(errorMessage.toString());
    -    out.println("
    "); -} -%> -
    - -
    - - - diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/uploadForm.jsp b/jonas_tests/examples/base/examples/emb-sample/resources/jsps/uploadForm.jsp deleted file mode 100644 index eb98a700d394f6cb6dff688ded4e9502593034f3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/resources/jsps/uploadForm.jsp +++ /dev/null @@ -1,85 +0,0 @@ - - -<%@ page errorPage="templatePage.jsp" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %> - - - -JOnAS Enterprise Media Beans (JSR 86) - Sample - - - -
    - - -

    JOnAS Enterprise Media Beans (JSR 86) - Sample

    - - - - - -
    - - -

    Upload a new Media

    -

    -Choose a media to import, the media can be either a file or an URL location.
    -You can had a description if want to.
    -The file extension must supported (see below) -

    -
    - - -
    - -
    -
    - ("file://" or "http://" only) -
    -
    - -
    -
    - -
    -
    - -
    -

    Supported formats

    -<% -Object workspaceContent = request.getAttribute("fromatSupported"); -if (workspaceContent != null) { - out.println(workspaceContent.toString()); -} -%> -
    - - -
    - -
    - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/Java_CompatEE.gif b/jonas_tests/examples/base/examples/emb-sample/resources/samples/Java_CompatEE.gif deleted file mode 100644 index 10997dfc3cb998e1d78c13183ea1f7fc26752bd2..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/Java_CompatEE.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/apache.svg b/jonas_tests/examples/base/examples/emb-sample/resources/samples/apache.svg deleted file mode 100644 index f12b00a67c596c87908c3a48687264a14e635690..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/resources/samples/apache.svg +++ /dev/null @@ -1,759 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/frame.png b/jonas_tests/examples/base/examples/emb-sample/resources/samples/frame.png deleted file mode 100644 index af8a33d61e3fb90dc8ad7b6366d3cb4563af8844..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/frame.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/iss-fireworks.mp3 b/jonas_tests/examples/base/examples/emb-sample/resources/samples/iss-fireworks.mp3 deleted file mode 100644 index 8a54177ea5cb6dd71cf20528e0fd4fe33ac25982..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/iss-fireworks.mp3 and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/jonas.mp4 b/jonas_tests/examples/base/examples/emb-sample/resources/samples/jonas.mp4 deleted file mode 100644 index b8e0d71d9f9eb23aa959394d20b51ca967e785bc..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/jonas.mp4 and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/jonas.png b/jonas_tests/examples/base/examples/emb-sample/resources/samples/jonas.png deleted file mode 100644 index a19da9ca20bbc9a242ae198a0c2f6b4dcd37c11a..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/jonas.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/mask.png b/jonas_tests/examples/base/examples/emb-sample/resources/samples/mask.png deleted file mode 100644 index 882e474f477a9e56cb22aa5e7af41b65d422d661..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/mask.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/objectweb.png b/jonas_tests/examples/base/examples/emb-sample/resources/samples/objectweb.png deleted file mode 100644 index f3334f55091a554a7708a65c5aae9369384f4850..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/objectweb.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/samples.properties b/jonas_tests/examples/base/examples/emb-sample/resources/samples/samples.properties deleted file mode 100644 index 46d62a0d285b3f6a948250c5080d17381355977d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/resources/samples/samples.properties +++ /dev/null @@ -1,83 +0,0 @@ -# --------------------------------------------------------------------------- -# JOnAS: Java(TM) Open Application Server -# Copyright (C) 2005 Bull S.A. -# Contact: jonas-team@objectweb.org -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Initial developer: Brice Ruzand -# --------------------------------------------------------------------------- -# $Id$ -# --------------------------------------------------------------------------- -# -# This contains the Initial information for the sample media database -# - -# sample MP3 audio file -sampleAudio1.file iss-fireworks.mp3 -sampleAudio1.desc International Space Station crew responding to fireworks question. -sampleAudio1.show true - -# sample PNG file -sampleLogo1.file jonas.png -sampleLogo1.desc JOnAS logo -sampleLogo1.show true - -# sample PNG file -sampleLogo2.file objectweb.png -sampleLogo2.desc ObjectWeb logo -sampleLogo2.show true - -# sample GIF file -sampleLogo3.file Java_CompatEE.gif -sampleLogo3.desc Java EE Compatible logo -sampleLogo3.show true - -# sample SVG file -sampleDraw1.file apache.svg -sampleDraw1.desc Apache Logo -sampleDraw1.show true - -# sample JPG file -samplePhoto1.file snow.jpg -samplePhoto1.desc Going back home by skiing, in winter 2005 -samplePhoto1.show true - -# sample JPG file -samplePhoto2.file white-valley.jpg -samplePhoto2.desc White Valley (Chamonix, France) -samplePhoto2.show true - -# sample JPG file -samplePhoto3.file starfish.jpg -samplePhoto3.desc A starfish while scuba diving in Mediterranean See -samplePhoto3.show true - -# sample MPEG4 file -sampleVideo1.file jonas.mp4 -sampleVideo1.desc EMB with JOnAS promotion Trailer -sampleVideo1.show true - - -# sample for frame converter (frame) -sampleFrame1.file frame.png -sampleFrame1.desc Image used in frame generation (frame) -sampleFrame1.show false - -# sample for frame converter -sampleMask1.file mask.png -sampleMask1.desc Image used in frame generation (mask) -sampleMask1.show false diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/snow.jpg b/jonas_tests/examples/base/examples/emb-sample/resources/samples/snow.jpg deleted file mode 100644 index 6b39d0c2adf4165cd62b4ca9f796350e9e108b25..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/snow.jpg and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/starfish.jpg b/jonas_tests/examples/base/examples/emb-sample/resources/samples/starfish.jpg deleted file mode 100644 index c8786ca88ca3c483ad9c2903cbec2a699d1f1022..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/starfish.jpg and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/samples/white-valley.jpg b/jonas_tests/examples/base/examples/emb-sample/resources/samples/white-valley.jpg deleted file mode 100644 index ab51bb49107438d866804d4eaf239da0aabc4734..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/emb-sample/resources/samples/white-valley.jpg and /dev/null differ diff --git a/jonas_tests/examples/base/examples/emb-sample/resources/theme/style.css b/jonas_tests/examples/base/examples/emb-sample/resources/theme/style.css deleted file mode 100644 index 0b73165bd5efa440184fd4847d7901e33e28643a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/resources/theme/style.css +++ /dev/null @@ -1,132 +0,0 @@ -body { - background: #eef7fd; - font-family: arial, helvetica, sans-serif; - font-size: 11pt; -} - -h1,h2,h3,h4,th { - color: #9f3e19; - font-weight: bold; - margin: 5pt; -} - -h1 { - font-size: 18pt; - padding-bottom: 10pt; -} - -h2 { - font-size: 13pt; -} - -h3,th { - text-align: center; - font-size: 12pt; - color: #42648e; - padding-top: 3pt; - padding-bottom: 3pt; -} - -h4 { - font-size: 12pt; -} - -#workspace { - overflow: auto; - margin-right: 10px; - margin-left: 0.5ex; - padding: 10px; - border-style: dotted; - border-width: 1px; - border-color: #42648e; - background-color: white; -} - -#workspace table { - width: 100%; - border-spacing: 0; -} - -.media-proxy { - height: 60px; - vertical-align: middle; - padding-top: 5px; -} - -img { - border-style: none; -} - -.media { - text-align: center; -} - -#menu { - float: left; - margin-right: 0.5ex; - width: 30ex; - height: 100%; - font-size: 11pt; -} - -#menu p { - text-align: center; -} - -.menu-box { - border-style: dashed; - border-width: 1px; - border-color: #42648e; - background-color: white; - margin-bottom: 1ex; - padding-left: 1ex; - padding-right: 1ex; - padding-bottom: 1ex; -} - -.menu-box .submit { - padding: 10px; - text-align: center; -} - -.media-size { - vertical-align: middle; -} - -.media-mimetype { - vertical-align: bottom; -} - -.media-desc { - font-size: medium; - vertical-align: top; -} - -.url { - font-size: 11pt; - font-stretch: ultra-condensed; -} - -label { - display: block; - float: left; - width: 8em; - padding-right: 1em; - text-align: right; -} - -.even { - background-color: #FFFFFF; -} - -.odd { - background-color: #F6F6F6; -} - -.error { - color: red; -} - -pre.error { - font-size: 10pt; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/MediaSampleException.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/MediaSampleException.java deleted file mode 100644 index fb5eef0271c63da0c71055ab2265dc167b70e13f..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/MediaSampleException.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample; - -/** - * This exception extends {@link Exception} and is thrown whenever sample app - * got a trouble - */ -public class MediaSampleException extends Exception { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 493847692100239586L; - - /** - * This is the default constructor taking no arguments. - */ - public MediaSampleException() { - super(); - } - - /** - * This is the default exception constructor taking a String argument. - * - * @param message the message. - */ - public MediaSampleException(String message) { - super(message); - } - - /** - * This is the default exception constructor taking a Throwable argument. - * - * @param cause the throwable. - */ - public MediaSampleException(Throwable cause) { - super(cause); - } - - /** - * This is the default exception constructor taking both a Throwable and a - * String argument. - * - * @param message the message. - * @param cause the throwable. - */ - public MediaSampleException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ActionDispatcher.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ActionDispatcher.java deleted file mode 100644 index e91b6fca6ce878dbb4bd3a1a686ed7d5822f49b1..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ActionDispatcher.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * Query dispatcher to implement an MVC model - * - * @author Brice Ruzand - */ -public class ActionDispatcher extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3257285816379389239L; - - /** - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - try { - // get the task to perform - String action = request.getParameter("action"); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - - if (action == null) { - getServletContext().getRequestDispatcher("/HomeSample").forward(request, response); - } else if (action.equals("home")) { - getServletContext().getRequestDispatcher("/HomeSample").forward(request, response); - } else if (action.equals("load")) { - getServletContext().getRequestDispatcher("/LoadSampleMedia").forward(request, response); - } else if (action.equals("list")) { - getServletContext().getRequestDispatcher("/ListSampleMedia").forward(request, response); - } else if (action.equals("upload")) { - getServletContext().getRequestDispatcher("/UploadSampleMedia").forward(request, response); - } else { - - if (identity == null) { - - StringPrinter workspaceContent = new StringPrinter(); - - // message - workspaceContent.println("

    No media selected

    "); - workspaceContent.println("Please return to the list and select a media to process..."); - - request.setAttribute("workspaceContent", workspaceContent); - getServletConfig().getServletContext().getRequestDispatcher(TEMPLATE_JSP) - .forward(request, response); - - } else if (action.equals("retrieve")) { - getServletContext().getRequestDispatcher("/RetrieveSampleMedia").forward(request, response); - } else if (action.equals("extractHeader")) { - getServletContext().getRequestDispatcher("/ExtractHeaderData").forward(request, response); - } else if (action.equals("convertBW")) { - getServletContext().getRequestDispatcher("/ConvertSampleImageBW").forward(request, response); - } else if (action.equals("convertHalfSize")) { - getServletContext().getRequestDispatcher("/ConvertSampleImageHalfSize").forward(request, response); - } else if (action.equals("convertFormat")) { - getServletContext().getRequestDispatcher("/ConvertSampleImageFormat").forward(request, response); - } else if (action.equals("convertChained")) { - getServletContext().getRequestDispatcher("/ConvertSampleImageChained").forward(request, response); - } else if (action.equals("convertSvgToPng")) { - getServletContext().getRequestDispatcher("/ConvertSampleImageSvgToPng").forward(request, response); - } else if (action.equals("convertVideoTo3GPP")) { - getServletContext().getRequestDispatcher("/ConvertSampleVideoTo3GPP").forward(request, response); - } else if (action.equals("convertVideoToMpegTs")) { - getServletContext().getRequestDispatcher("/ConvertSampleVideoToMpegTs").forward(request, response); - } else if (action.equals("convertVideoToMpeg")) { - getServletContext().getRequestDispatcher("/ConvertSampleVideoToMpeg").forward(request, response); - } else if (action.equals("convertOverlayed")) { - getServletContext().getRequestDispatcher("/ConvertSampleImageOverlayed").forward(request, response); - } else if (action.equals("convertFrame")) { - getServletContext().getRequestDispatcher("/ConvertSampleImageFrame").forward(request, response); - } else { - throw new Exception("Invalid Action dispatecher param."); - } - } - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/BaseSampleServlet.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/BaseSampleServlet.java deleted file mode 100644 index b6f1f4c784f15dd9ed7dde15e26d950283939d13..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/BaseSampleServlet.java +++ /dev/null @@ -1,335 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import java.io.Serializable; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Random; - -import javax.emb.MediaEntityLocal; -import javax.emb.MediaEntityLocalHome; -import javax.emb.MediaException; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; -import emb.sample.session.MediaSampleSessionLocalHome; - -/** - * Base classes for all sample - * - * @author Brice Ruzand - */ -public class BaseSampleServlet extends HttpServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 428471464384262530L; - - /* - * ======================================================================= - * Sample apps - * ======================================================================= - */ - - /** - * Retrive servlet URI - */ - protected static final String RETRIEVE_SERVLET = "/RetrieveSampleMedia"; - - /** - * Retrive servlet URI - */ - protected static final String ACTION_DISPATCHER_SERVLET = "/ActionDispatcher"; - - /** - * template jsp URI - */ - protected static final String TEMPLATE_JSP = "/jsps/templatePage.jsp"; - - /** - * tranforme Byte in KB - */ - public static final double BYTE_IN_KB = 1024D; - - /** - * Random seed - */ - protected static final Random RANDOM = new Random(); - - /** - * Default format for time stamp - */ - public static final SimpleDateFormat TIME_STAMP_FORMAT = new SimpleDateFormat("yy-MM-dd HH:mm:ss.SSS"); - - /** - * Default format for size - */ - public static final DecimalFormat SIZE_FORMAT = new DecimalFormat("0.0"); - - /** - * Display medi info in XHTML - * - * @param sp StringPrinter - * @param meb The media entity - */ - protected void displayInfo(StringPrinter sp, MediaEntityLocal meb) { - - try { - sp.println("Name : " + meb.getName() + "
    "); - sp.println("MimeType : " + meb.getMimeType() + "
    "); - sp.println("Size : " + SIZE_FORMAT.format(meb.getSize() / BYTE_IN_KB) + " KB
    "); - String desc = meb.getDescription(); - if (desc == null) { - desc = ""; - } - sp.println("Description :
    " + meb.getDescription() + "

    "); - sp.println("LastModified :
    " + TIME_STAMP_FORMAT.format(new Date(meb.getLastModified())) - + "

    "); - } catch (MediaException e) { - sp.println("Error while retriving medi info"); - } - } - - /** - * Get a session bean to manage Media creation - * - * @param request the HttpServlet request - * @return the MediaSampleSessionLocal - * @throws MediaSampleException if session cannot be created - */ - protected static MediaSampleSessionLocal getSession(HttpServletRequest request) throws MediaSampleException { - try { - MediaSampleSessionLocal sessionBean = (MediaSampleSessionLocal) request.getSession().getAttribute( - "sessionBean"); - - if (sessionBean == null) { - sessionBean = getSessionHome().create(); - request.getSession().setAttribute("sessionBean", sessionBean); - throw new MediaSampleException("Your session has exprired, please reload some medias"); - } - return sessionBean; - } catch (MediaSampleException e) { - throw e; - } catch (Exception e) { - // e.printStackTrace(); - throw new MediaSampleException("Unable to create a new session", e); - - } - } - - /* - * ======================================================================= - * Errors - * ======================================================================= - */ - - /** - * Method to handle all exceptions of all Music Application Servlets in a - * uniform way using the specified error JSP (/jps/templatePage.jsp). - *

    - * In case of error a ServletException will be thrown. - * - * @param exception java.lang.Exception - * @param errorClass class where the error locate - * @param request com.sun.server.http.HttpServletRequest - * @param response com.sun.server.http.HttpServletResponse - * @throws ServletException This exception will be thrown if the - * errorhandling fails - */ - protected void exceptionHandler(Throwable exception, Class errorClass, HttpServletRequest request, - HttpServletResponse response) throws ServletException { - - StringPrinter errorMessage = new StringPrinter(); - - try { - - if (exception instanceof MediaSampleException) { - - errorMessage.println("

    There was an error

    "); - errorMessage.println(exception.getLocalizedMessage()); - request.setAttribute("workspaceContent", errorMessage); - getServletConfig().getServletContext().getRequestDispatcher(TEMPLATE_JSP).forward(request, response); - - } else { - - errorMessage.println(errorClass.getName() + ":"); - errorMessage.println(""); - errorMessage.println(exception.toString()); - errorMessage.println(""); - errorLog(errorClass.getName() + ": " + exception); - - StackTraceElement[] ste; - if (exception.getCause() != null) { - ste = exception.getCause().getStackTrace(); - } else { - ste = exception.getStackTrace(); - } - - for (int i = 0; i < ste.length; i++) { - - errorMessage.println(ste[i].toString()); - // when the source cause is found stop stack - if (ste[i].getClassName().startsWith("emb.sample")) { - break; - } - } - - request.setAttribute("errorMessage", errorMessage); - getServletConfig().getServletContext().getRequestDispatcher(TEMPLATE_JSP).forward(request, response); - - } - - } catch (Exception e) { - // if standard error reporter fails throw exception - throw new ServletException(errorMessage.toString(), e); - } - } - - /** - * Method to print error messages to stderr and for syschronisation purpose - * to stdout too. - * - * @param msg java.lang.String - */ - protected static void errorLog(String msg) { - final int defBuffer = 1024; - StringBuffer bfr = new StringBuffer(defBuffer); - - bfr.append("["); - bfr.append(TIME_STAMP_FORMAT.format(new Date(System.currentTimeMillis()))); - bfr.append("] EMB SAMPLE ERROR "); - bfr.append(msg); - - System.err.println(bfr.toString()); - } - - /** - * Class to use printer - * - * @author Brice Ruzand - */ - protected class StringPrinter implements Serializable { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = -2865716341020911272L; - - /** - * The String Buffer - */ - private StringBuffer buffer; - - /** - * Default Constructor - */ - public StringPrinter() { - - final int newbuffsize = 128; - buffer = new StringBuffer(newbuffsize); - } - - /** - * Print a line in the printer - * - * @param str the string to print - */ - public void println(String str) { - buffer.append(str); - buffer.append("\r\n"); - } - - /** - * @see java.lang.Object#toString() - */ - public String toString() { - return buffer.toString(); - } - } - - /* - * ======================================================================= - * EJB TOOLS - * ======================================================================= - */ - - /** - * Media Enotity Bean Home reference - */ - private static final String SESSION_HOME_REF = "java:comp/env/ejb/embSample/MediaSampleSession"; - - /** - * Media Entity Bean Home reference - */ - private static final String MEB_HOME_REF = "java:comp/env/ejb/emb/MediaEntity"; - - /** - * cached Home - */ - private static MediaSampleSessionLocalHome mebSessionHome = null; - - /** - * cached Home - */ - private static MediaEntityLocalHome mebHome = null; - - /** - * Provide a cached Home access - * - * @return MediaEntityLocalHome - * @throws NamingException in case MediaEntityLocalHome is not found - */ - protected static MediaSampleSessionLocalHome getSessionHome() throws NamingException { - if (mebSessionHome == null) { - mebSessionHome = (MediaSampleSessionLocalHome) new InitialContext().lookup(SESSION_HOME_REF); - } - return mebSessionHome; - } - - /** - * Provide a cached Home access - * - * @return MediaEntityLocalHome - * @throws NamingException in case MediaEntityLocalHome is not found - */ - protected static MediaEntityLocalHome getMebHome() throws NamingException { - if (mebHome == null) { - mebHome = (MediaEntityLocalHome) new InitialContext().lookup(MEB_HOME_REF); - } - return mebHome; - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageBW.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageBW.java deleted file mode 100644 index 7bc2da0b560be36a80be51f6e3e69855a85ede10..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageBW.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.converter.image.ImageRGBtoGrayscaleConverterSpec; -import org.objectweb.jonas.emb.mfb.formats.image.ImageMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ConvertSampleImageBW extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3687815080511141944L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - if (!(mediaEntity.getFormat() instanceof ImageMediaFormat)) { - throw new MediaSampleException("The selected media must be an image."); - } - - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - media.setDescription("Black and White conversion of: " + mediaEntity.getName()); - - // Convert the MediaEntityToBlack&White - MediaConverterSpec[] specs = new MediaConverterSpec[] {new ImageRGBtoGrayscaleConverterSpec()}; - media.convert(specs); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageChained.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageChained.java deleted file mode 100644 index 17c14a2dc33a9aa9267e6da773247d558583e215..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageChained.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.converter.image.ImageFormatConverterSpec; -import org.objectweb.jonas.emb.mfb.converter.image.ImageRGBtoGrayscaleConverterSpec; -import org.objectweb.jonas.emb.mfb.converter.image.ImageResizeConverterSpec; -import org.objectweb.jonas.emb.mfb.formats.image.ImageMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ConvertSampleImageChained extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3761970445343076657L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - if (!(mediaEntity.getFormat() instanceof ImageMediaFormat)) { - throw new MediaSampleException("The selected media must be an image."); - } - - // Create a copy - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - media.setDescription("Chained convertion of: " + mediaEntity.getName()); - - // Convert the media to PNG then to Grayscale then to Halfsize - final double resizeFactor = 0.5; - MediaConverterSpec[] specs = new MediaConverterSpec[] {new ImageFormatConverterSpec("png"), - new ImageRGBtoGrayscaleConverterSpec(), new ImageResizeConverterSpec(resizeFactor)}; - media.convert(specs); - identity = (String) media.getPrimaryKey(); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFormat.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFormat.java deleted file mode 100644 index 05e89c3270879911fa8390c1973bfc53a4bbb84b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFormat.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.converter.image.ImageFormatConverterSpec; -import org.objectweb.jonas.emb.mfb.formats.image.ImageMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ConvertSampleImageFormat extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3687815080511141944L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - if (!(mediaEntity.getFormat() instanceof ImageMediaFormat)) { - throw new MediaSampleException("The selected media must be an image."); - } - - // Create a copy - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - String targetFormat = "png"; - media.setDescription(targetFormat + " conversion of: " + mediaEntity.getName()); - - // Convert the media to an other format - MediaConverterSpec[] specs = new MediaConverterSpec[] {new ImageFormatConverterSpec(targetFormat)}; - media.convert(specs); - - identity = (String) media.getPrimaryKey(); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFrame.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFrame.java deleted file mode 100644 index e2661a3f2f2365104e423a5f427cf3926cb4b3b6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageFrame.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.converter.image.ImageFrameConverterSpec; -import org.objectweb.jonas.emb.mfb.formats.image.ImageMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ConvertSampleImageFrame extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = -3697654416111319491L; - - /** - * The quick acces to the frame, name in the property file - */ - private static final String FRAME_ACCESS = "sampleFrame1"; - - /** - * The quick acces to the mask, name in the property file - */ - private static final String MASK_ACCESS = "sampleMask1"; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - // name in th property file - MediaEntityLocal frame = null; - MediaEntityLocal mask = null; - - try { - frame = session.getMediaFromRegistredName(FRAME_ACCESS); - mask = session.getMediaFromRegistredName(MASK_ACCESS); - } catch (MediaSampleException e) { - throw new MediaSampleException("(no mask and frame in the dataBase). Please init the database."); - - } - - if (!(mediaEntity.getFormat() instanceof ImageMediaFormat)) { - throw new MediaSampleException("The selected media must be an image."); - } - - // Create a copy - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - media.setDescription("Added frame to: " + mediaEntity.getName()); - - // Convert the add specifed frame to the other image - - // well know position offset - final int posX = 50; - final int posY = 58; - - MediaConverterSpec[] specs = new MediaConverterSpec[] {new ImageFrameConverterSpec(frame, mask, posX, posY)}; - media.convert(specs); - identity = (String) media.getPrimaryKey(); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageHalfSize.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageHalfSize.java deleted file mode 100644 index e33d037ff5105c2382c959b3e2e2723517366b49..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageHalfSize.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.converter.image.ImageResizeConverterSpec; -import org.objectweb.jonas.emb.mfb.formats.image.ImageMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ConvertSampleImageHalfSize extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 36899150987141944L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - if (!(mediaEntity.getFormat() instanceof ImageMediaFormat)) { - throw new MediaSampleException("The selected media must be an image."); - } - - // Create a copy - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - media.setDescription("Half-size conversion of: " + mediaEntity.getName()); - - // Convert the MediaEntityToHalfsize - final double resizeFactor = 0.5; - MediaConverterSpec[] specs = new MediaConverterSpec[] {new ImageResizeConverterSpec(resizeFactor)}; - media.convert(specs); - identity = (String) media.getPrimaryKey(); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageOverlayed.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageOverlayed.java deleted file mode 100644 index ffe2a67786c0ae14a2f1a26c3873c991ff415b83..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageOverlayed.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.converter.image.ImageOverlayConverterSpec; -import org.objectweb.jonas.emb.mfb.formats.image.ImageMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @version 1.0 - * @author - */ -public class ConvertSampleImageOverlayed extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = -3697654416111319491L; - - /** - * The quick acces to the logo, name in the property file - */ - private static final String LOGO_ACCESS = "sampleLogo1"; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - // name in th property file - MediaEntityLocal logo = null; - - try { - logo = session.getMediaFromRegistredName(LOGO_ACCESS); - } catch (MediaSampleException e) { - throw new MediaSampleException("(no logo in the dataBase). Please init the database."); - - } - - if (!(mediaEntity.getFormat() instanceof ImageMediaFormat)) { - throw new MediaSampleException("The selected media must be an image."); - } - - // Create a copy - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - media.setDescription("Added Logo to: " + mediaEntity.getName()); - - // Convert the add specifed logo to the other image - MediaConverterSpec[] specs = new MediaConverterSpec[] {new ImageOverlayConverterSpec(logo)}; - media.convert(specs); - identity = (String) media.getPrimaryKey(); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageSvgToPng.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageSvgToPng.java deleted file mode 100644 index 18e004722d40c85c910854b6f280ca96be835501..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleImageSvgToPng.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.formats.draw.DrawMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ConvertSampleImageSvgToPng extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3688503298940548148L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - if (!(mediaEntity.getFormat() instanceof DrawMediaFormat)) { - throw new MediaSampleException("The selected media must be a drawing."); - } - - // Create a copy - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - media.setDescription("PNG conversion using batik of: " + mediaEntity.getName()); - - // Convert the convert SVG to PNG - Class converterSpecClass = getClass().getClassLoader().loadClass( - "org.objectweb.jonas.emb.mfb.plugins.svg.batik.Svg2PngConverterSpec"); - MediaConverterSpec converterSpec = (MediaConverterSpec) converterSpecClass.newInstance(); - MediaConverterSpec[] specs = new MediaConverterSpec[] {converterSpec}; - media.convert(specs); - - identity = (String) media.getPrimaryKey(); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoTo3GPP.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoTo3GPP.java deleted file mode 100644 index b7393e05acad3df433ecb2ca98b251bb2caf8faa..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoTo3GPP.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.formats.video.VideoMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ConvertSampleVideoTo3GPP extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3687815080511141944L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - if (!(mediaEntity.getFormat() instanceof VideoMediaFormat)) { - throw new MediaSampleException("The selected media must be an Video format."); - } - - // Create a copy - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - media.setDescription("Video to 3GPP conversion using ffmpeg of : " + mediaEntity.getName()); - - // Convert the Video to 3GPP with FFMPEG - Class converterSpecClass = getClass().getClassLoader().loadClass( - "org.objectweb.jonas.emb.mfb.plugins.video.ffmpeg.converter.VideoTo3GPPConverterSpec"); - MediaConverterSpec converterSpec = (MediaConverterSpec) converterSpecClass.newInstance(); - MediaConverterSpec[] specs = new MediaConverterSpec[] {converterSpec}; - media.convert(specs); - - identity = (String) media.getPrimaryKey(); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpeg.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpeg.java deleted file mode 100644 index edf01ecd945486fdd22c76aef72307c46f50a4cb..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpeg.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.formats.video.VideoMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ConvertSampleVideoToMpeg extends BaseSampleServlet { - - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 1823390929291730344L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - if (!(mediaEntity.getFormat() instanceof VideoMediaFormat)) { - throw new MediaSampleException("The selected media must be an Video format."); - } - - // Create a copy - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - media.setDescription("Mpeg conversion using ffmpeg of : " + mediaEntity.getName()); - - // Convert the Video to MPEG with FFMPEG - Class converterSpecClass = getClass().getClassLoader().loadClass( - "org.objectweb.jonas.emb.mfb.plugins.video.ffmpeg.converter.VideoToMpegConverterSpec"); - MediaConverterSpec converterSpec = (MediaConverterSpec) converterSpecClass.newInstance(); - MediaConverterSpec[] specs = new MediaConverterSpec[] {converterSpec}; - media.convert(specs); - - identity = (String) media.getPrimaryKey(); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpegTs.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpegTs.java deleted file mode 100644 index 0102c4512e2f68cf8e94e7adc82bf01f8e37d24a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ConvertSampleVideoToMpegTs.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.emb.MediaConverterSpec; -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.formats.video.VideoMediaFormat; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ConvertSampleVideoToMpegTs extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3687815080511141944L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - if (!(mediaEntity.getFormat() instanceof VideoMediaFormat)) { - throw new MediaSampleException("The selected media must be an Video format."); - } - - // Create a copy - MediaEntityLocal media = session.copyMediaEntity(mediaEntity); - media.setDescription("Mpeg TS conversion using ffmpeg of : " + mediaEntity.getName()); - - // Convert the Video to MPEG TS with FFMPEG - Class converterSpecClass = getClass().getClassLoader().loadClass( - "org.objectweb.jonas.emb.mfb.plugins.video.ffmpeg.converter.VideoToMpegTSConverterSpec"); - MediaConverterSpec converterSpec = (MediaConverterSpec) converterSpecClass.newInstance(); - MediaConverterSpec[] specs = new MediaConverterSpec[] {converterSpec}; - media.convert(specs); - - identity = (String) media.getPrimaryKey(); - - // forward onto the retrieve servlet - request.setAttribute("identity", media.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ExtractHeaderData.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ExtractHeaderData.java deleted file mode 100644 index abb1d7b272a112ca9f14b0a6d1ce6dbc37b24040..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ExtractHeaderData.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import java.io.IOException; - -import javax.emb.MediaEntityLocal; -import javax.emb.MediaHeader; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @author Brice Ruzand - */ -public class ExtractHeaderData extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3544675070548261174L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - try { - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - String identity = request.getParameter("identity"); - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - MediaHeader header = mediaEntity.getHeader(); - String[] fieldNames = header.getFieldNames(); - - StringPrinter newMenuBox = new StringPrinter(); - StringPrinter workspaceContent = new StringPrinter(); - - newMenuBox.println("
    \r\n" + "

    Media

    \r\n"); - // add info - displayInfo(newMenuBox, mediaEntity); - - workspaceContent.println("

    Header information for Media: " + mediaEntity.getName() + "

    \n"); - workspaceContent.println(""); - workspaceContent.println(""); - workspaceContent.println(""); - - if (fieldNames.length == 0) { - workspaceContent - .println("\n"); - } else { - - for (int index = 0; index < fieldNames.length; index++) { - String fieldName = fieldNames[index]; - String fieldContent = "null"; - if (header.getField(fieldNames[index]) != null) { - header.getField(fieldNames[index]).toString(); - } - workspaceContent.println("\n"); - } - } - workspaceContent.println(""); - workspaceContent.println("
    Header tag nameValue
    There is no specific header for this media
    "); - workspaceContent.println(fieldName); - workspaceContent.println(""); - workspaceContent.println(fieldContent); - workspaceContent.println("
    \n"); - - newMenuBox.println("
    "); - - request.setAttribute("newMenuBox", newMenuBox); - request.setAttribute("workspaceContent", workspaceContent); - getServletConfig().getServletContext().getRequestDispatcher(TEMPLATE_JSP).forward(request, - response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/HomeSample.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/HomeSample.java deleted file mode 100644 index 872386088751aad07c4270bf08cbbd6231536691..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/HomeSample.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import emb.sample.MediaSampleException; - -/** - * The Home of emb Sample - * - * @author Brice Ruzand - */ -public class HomeSample extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = -4450606249375127461L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - try { - - try { - // init session - getSession(request); - } catch (MediaSampleException e) { - getSession(request); - } - - StringPrinter workspaceContent = new StringPrinter(); - - workspaceContent.println("

    Welcome to JOnAS Enterprise Media Beans Sample application

    "); - workspaceContent - .println("

    This application provide a small sample of Enterprise Media Beans use with JOnAS.

    "); - workspaceContent - .println("

    First you have to load media sample : Load

    "); - workspaceContent - .println("

    Then view the media list and work with it : Media list

    "); - workspaceContent - .println("

    Add your own media : Upload

    "); - - request.setAttribute("workspaceContent", workspaceContent); - getServletConfig().getServletContext().getRequestDispatcher(TEMPLATE_JSP).forward(request, - response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/HttpSessionMgr.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/HttpSessionMgr.java deleted file mode 100644 index 999ccf454d7a2bed8d08ac51ab2e415afde9eb16..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/HttpSessionMgr.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import javax.ejb.RemoveException; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; - -import emb.sample.session.MediaSampleSessionLocal; - -/** - * The session manager to destroy used media - */ -public class HttpSessionMgr implements HttpSessionListener { - - /** - * @see javax.servlet.http.HttpSessionListener#sessionCreated(javax.servlet.http.HttpSessionEvent) - * @inheritDoc - */ - public void sessionCreated(HttpSessionEvent se) { - // do nothing - } - - /** - * Remove all media created during this session - * - * @see javax.servlet.http.HttpSessionListener#sessionDestroyed(javax.servlet.http.HttpSessionEvent) - * @inheritDoc - */ - public void sessionDestroyed(HttpSessionEvent se) { - - // get session bean - MediaSampleSessionLocal sessionBean = (MediaSampleSessionLocal) se.getSession().getAttribute("sessionBean"); - - if (sessionBean != null) { - try { - - // the session bean - sessionBean.remove(); - - } catch (RemoveException e) { - // do nothing - } - se.getSession().setAttribute("sessionBean", null); - } - - } -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ListSampleMedia.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ListSampleMedia.java deleted file mode 100644 index 6109a75160e14c655fa472a40972d6819016c296..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/ListSampleMedia.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import java.io.IOException; -import java.net.URL; - -import javax.emb.FormatNotFoundException; -import javax.emb.MediaEntityLocal; -import javax.emb.MediaEntityLocalHome; -import javax.emb.MediaFormatRegistry; -import javax.emb.ProtocolConstraints; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import emb.sample.session.MediaSampleSessionLocal; - -/** - * @version 1.0 - * @author - */ -public class ListSampleMedia extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3257289140767830576L; - - /** - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - try { - - MediaSampleSessionLocal session = getSession(request); - - MediaEntityLocal[] medias = session.getMediaList(); - - if (medias.length > 0) { - try { - MediaFormatRegistry.SINGLETON.lookup("svg"); - request.setAttribute("drawConversion", Boolean.TRUE); - } catch (FormatNotFoundException e) { - request.setAttribute("drawConversion", Boolean.FALSE); - } - - try { - MediaFormatRegistry.SINGLETON.lookup("ts"); - request.setAttribute("videoConversion", Boolean.TRUE); - } catch (FormatNotFoundException e) { - request.setAttribute("videoConversion", Boolean.FALSE); - } - - String[] proxiesUrl = new String[medias.length]; - for (int i = 0; i < medias.length; i++) { - URL url = null; - try { - url = getMebHome().publishContent(medias[i].getProxy(), - MediaEntityLocalHome.TRANSFER_TYPE_STREAM, new ProtocolConstraints()); - } catch (Throwable e) { - // do nothing - } - - proxiesUrl[i] = ""; - if (url != null) { - proxiesUrl[i] = url.toExternalForm(); - } - } - - request.setAttribute("samplesMedia", medias); - request.setAttribute("proxiesUrl", proxiesUrl); - this.getServletContext().getRequestDispatcher("/jsps/mediaList.jsp").forward(request, response); - - } else { - - StringPrinter workspaceContent = new StringPrinter(); - - // message - workspaceContent.println("

    No Sample Media has been initialized.

    "); - - request.setAttribute("workspaceContent", workspaceContent); - getServletConfig().getServletContext().getRequestDispatcher(TEMPLATE_JSP).forward(request, response); - - } - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - - } -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/LoadSampleMedia.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/LoadSampleMedia.java deleted file mode 100644 index 280840f851091cde4ee0ca5e34b55899d2cab44d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/LoadSampleMedia.java +++ /dev/null @@ -1,220 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Properties; - -import javax.emb.MediaEntityLocal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import emb.sample.MediaSampleException; -import emb.sample.session.MediaSampleSessionLocal; - -/** - * This servlet is intent to control requests to loading the sample media to the - * database. - */ -public class LoadSampleMedia extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3256441391566698802L; - - /** - * default dir where sample are stored - */ - private static final String SAMPLES_DIR = "/samples/"; - - /** - * The sample info file - */ - private static final String SAMPLES_PROPERTIES = "samples.properties"; - - /** - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - - response.setContentType("text/html;charset=ISO-8859-1"); - - getServletConfig().getServletContext().getRequestDispatcher("/jsps/header.jsp").include(request, response); - - PrintWriter out = response.getWriter(); - out.println("

    Initializing Sample DataBase

    "); - - // Create Samples in DB - try { - - MediaSampleSessionLocal session = getSession(request); - - // get all MEB stored with the same Partial Desc - if (session.getMediaList().length > 0) { - out.println("

    Samples already loaded... -> removing default Media

    "); - session.removeDefaultMedia(); - out.flush(); - } - - out.println("

    Adding new Samples to the DataBase...

    "); - out.println("
      "); - out.flush(); - - // get the properties stream - InputStream propStream = getServletContext().getResourceAsStream(SAMPLES_DIR + SAMPLES_PROPERTIES); - - if (propStream != null) { - try { - - // new properties - Properties prop = new Properties(); - - // load properties from stream - prop.load(propStream); - - List sortList = new LinkedList(prop.keySet()); - - Collections.sort(sortList); - - for (Iterator i = sortList.iterator(); i.hasNext();) { - - // Get class name and file extension - String sampleNameWSuffix = (String) i.next(); - - if (sampleNameWSuffix.endsWith(".file")) { - String sampleName = getPrefixFileName(sampleNameWSuffix); - - String sampleFile = prop.getProperty(sampleName + ".file"); - String sampleDesc = prop.getProperty(sampleName + ".desc"); - String sampleShowS = prop.getProperty(sampleName + ".show"); - boolean sampleShow = Boolean.valueOf(sampleShowS).booleanValue(); - - byte status = MediaSampleSessionLocal.DONT_SHOW; - if (sampleShow) { - status = MediaSampleSessionLocal.SHOW_IN_LIST; - } - - createNewSample(session, out, sampleFile, sampleDesc, getServletContext() - .getResourceAsStream(SAMPLES_DIR + sampleFile), sampleName, status); - - } - } - - } catch (IOException e) { - // error while loading properties - new MediaSampleException("Unable to load sample properties due to : " + e.getLocalizedMessage(), e); - } - } else { - // error while open properties stream - new MediaSampleException("Unable to load sample properties due to : " + SAMPLES_PROPERTIES - + " has no been found"); - } - - out.println("
    "); - out.println("

    Media loaded.

    "); - - getServletConfig().getServletContext().getRequestDispatcher("/jsps/footer.jsp").include(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - - } - - /** - * Create a MEB sample with given param - * - * @param session the session which control medi creation - * @param out out writer - * @param name name of the MEB - * @param description description desc of the MEB - * @param contentStream contentStream content of the EMB - * @param registeredName the name to access to it - * @param status status is ones of {@link MediaSampleSessionLocal#DONT_SHOW}, - * {@link MediaSampleSessionLocal#SHOW_IN_LIST}, - * {@link MediaSampleSessionLocal#USER_ADDED} - * @return the media entity - */ - private MediaEntityLocal createNewSample(MediaSampleSessionLocal session, PrintWriter out, String name, - String description, InputStream contentStream, String registeredName, byte status) { - // Create MEB sample - out.println("
  • "); - MediaEntityLocal meb = null; - try { - - meb = session.createMediaEntity(contentStream, name, description, status, registeredName); - - out.println(name); - - } catch (Throwable e) { - - try { - if (meb != null) { - meb.remove(); - } - } catch (Throwable e1) { - // do nothing - } - - meb = null; - - String err = "Error while creating sample \"" + name + "\" : " + e.getLocalizedMessage(); - out.println("" + err + ""); - // System.err.println("LoadSampleMedia : " + err); - // e.printStackTrace(); - } - out.println("
  • "); - out.flush(); - return meb; - } - - /** - * Get name of a file name without extension - * - * @param name name of the file - * @return file name without extension - */ - public static String getPrefixFileName(String name) { - int lastDotPosition = name.lastIndexOf('.'); - - if (lastDotPosition == -1) { - return name; - } - return name.substring(0, lastDotPosition); - - } -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/RetrieveSampleMedia.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/RetrieveSampleMedia.java deleted file mode 100644 index 8b3b4c6a6d1b88463e72960f270592cd7569e6ba..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/RetrieveSampleMedia.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import java.net.URL; - -import javax.emb.MediaEntityLocal; -import javax.emb.MediaEntityLocalHome; -import javax.emb.MediaFormatRegistry; -import javax.emb.ProtocolConstraints; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.objectweb.jonas.emb.mfb.formats.image.ImageMediaFormat; - -import emb.sample.session.MediaSampleSessionLocal; - -/** - * Generate an HTML web page to present the media - * - * @author Brice Ruzand - */ -public class RetrieveSampleMedia extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3762250859580634161L; - - /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - - // Query the media entity EJB instance. - String identity = (String) request.getAttribute("identity"); - if (identity == null) { - identity = request.getParameter("identity"); - } - - MediaSampleSessionLocal session = getSession(request); - - // Query the media entity EJB instance. - MediaEntityLocal mediaEntity = session.getMediaFromPrimaryKey(identity); - - // publish it - URL url = null; - - if (mediaEntity.getFormat().equals(MediaFormatRegistry.SINGLETON.lookup("mp4"))) { - url = getMebHome().publishContent(mediaEntity, MediaEntityLocalHome.TRANSFER_TYPE_STREAM, - new ProtocolConstraints()); - } else { - url = getMebHome().publishContent(mediaEntity, MediaEntityLocalHome.TRANSFER_TYPE_BURST, - new ProtocolConstraints()); - } - - StringPrinter newMenuBox = new StringPrinter(); - StringPrinter workspaceContent = new StringPrinter(); - - newMenuBox.println("
    \r\n" + "

    Media

    \r\n"); - - workspaceContent.println("

    Media content : " + mediaEntity.getName() + "

    "); - - workspaceContent.println(" URL : " + url + "
    "); - - if (mediaEntity.getFormat() instanceof ImageMediaFormat) { - newMenuBox.println("

    Image

    "); - workspaceContent.println("
    \""
    "); - } else { - newMenuBox.println("

    Standard Object

    "); - workspaceContent.println("
    " - + "Unfortunately your browser cannot display this media !!
    "); - } - - // add info in menu - displayInfo(newMenuBox, mediaEntity); - - newMenuBox - .println("If your browser can not display this media, please select the link below for accessing the media.... "); - newMenuBox.println("" + mediaEntity.getName() + ""); - - newMenuBox.println("
    "); - - request.setAttribute("newMenuBox", newMenuBox); - request.setAttribute("workspaceContent", workspaceContent); - getServletConfig().getServletContext().getRequestDispatcher(TEMPLATE_JSP).forward(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/UploadSampleMedia.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/UploadSampleMedia.java deleted file mode 100644 index 9cdc4ea731230e5667c1f36e2478092c1a8d7e2d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/servlet/UploadSampleMedia.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.servlet; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Iterator; -import java.util.List; - -import javax.emb.GenericMediaFormat; -import javax.emb.MediaEntityLocal; -import javax.emb.MediaFormat; -import javax.emb.MediaFormatRegistry; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.fileupload.DiskFileUpload; -import org.apache.commons.fileupload.FileItem; - -import emb.sample.session.MediaSampleSessionLocal; - -/** - * Generate an HTML web page to present the media - * - * @author Brice Ruzand - */ -public class UploadSampleMedia extends BaseSampleServlet { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 3762250859580634161L; - - /** - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - try { - - response.setContentType("text/html;charset=ISO-8859-1"); - - StringPrinter fromatSupported = new StringPrinter(); - fromatSupported.println("
      "); - for (Iterator i = MediaFormatRegistry.SINGLETON.getFileExtensions(); i.hasNext();) { - String fileExt = (String) i.next(); - MediaFormat format = MediaFormatRegistry.SINGLETON.lookup(fileExt); - if (!(format == null || format instanceof GenericMediaFormat)) { - fromatSupported.println("
    • " + fileExt + " : " + MediaFormatRegistry.SINGLETON.lookup(fileExt) - + "
    • "); - } - } - fromatSupported.println("
    "); - - request.setAttribute("fromatSupported", fromatSupported); - getServletConfig().getServletContext().getRequestDispatcher("/jsps/uploadForm.jsp").include(request, response); - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - - /** - * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - * @inheritDoc - */ - public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - try { - - String mediaDesc = ""; - String mediaName = ""; - String mediaUrl = ""; - InputStream mediaInputStream = null; - - // Create a new file upload handler - DiskFileUpload upload = new DiskFileUpload(); - - // Parse the request - List /* FileItem */items = upload.parseRequest(request); - - // Process the uploaded items - Iterator iter = items.iterator(); - while (iter.hasNext()) { - FileItem item = (FileItem) iter.next(); - if (item.isFormField()) { - if (item.getFieldName().equals("desc")) { - mediaDesc = item.getString(); - } - if (item.getFieldName().equals("url")) { - mediaUrl = item.getString(); - } - } else { - if (item.getFieldName().equals("file")) { - mediaInputStream = item.getInputStream(); - mediaName = item.getName(); - } - } - } - - MediaSampleSessionLocal session = getSession(request); - - MediaEntityLocal meb = null; - if (mediaUrl != null && mediaUrl.length() > 0) { - // meb = createNewSample(mediaUrl, mediaDesc); - meb = session.createMediaEntity(new URL(mediaUrl), mediaDesc, MediaSampleSessionLocal.USER_ADDED); - } else if (mediaInputStream != null && mediaName != null && mediaName.length() > 0) { - meb = session.createMediaEntity(mediaInputStream, mediaName, mediaDesc, - MediaSampleSessionLocal.USER_ADDED, null); - } - - if (meb != null) { - - // forward onto the retrieve servlet - request.setAttribute("identity", meb.getPrimaryKey()); - this.getServletContext().getRequestDispatcher(RETRIEVE_SERVLET).forward(request, response); - - } else { - - StringPrinter workspaceContent = new StringPrinter(); - workspaceContent.println("

    Missing information to add media

    "); - workspaceContent.println("There were some missing information to add media, please retry."); - request.setAttribute("workspaceContent", workspaceContent); - this.getServletContext().getRequestDispatcher(TEMPLATE_JSP).forward(request, response); - - } - - } catch (Throwable e) { - exceptionHandler(e, getClass(), request, response); - } - } - -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/HttpSessionMgr.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/HttpSessionMgr.java deleted file mode 100644 index 34e4bb0f90c7068f8b6baf5e574a8abd309df68f..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/HttpSessionMgr.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package emb.sample.session; - -import javax.ejb.RemoveException; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; - -/** - * The session manager to destroy used media - */ -public class HttpSessionMgr implements HttpSessionListener { - - /** - * @see javax.servlet.http.HttpSessionListener#sessionCreated(javax.servlet.http.HttpSessionEvent) - * @inheritDoc - */ - public void sessionCreated(HttpSessionEvent se) { - // do nothing - } - - /** - * Remove all media created during this session - * - * @see javax.servlet.http.HttpSessionListener#sessionDestroyed(javax.servlet.http.HttpSessionEvent) - * @inheritDoc - */ - public void sessionDestroyed(HttpSessionEvent se) { - - // get session bean - MediaSampleSessionLocal sessionBean = (MediaSampleSessionLocal) se.getSession().getAttribute("sessionBean"); - - if (sessionBean != null) { - try { - - // the session bean - sessionBean.remove(); - - } catch (RemoveException e) { - // do nothing - } - se.getSession().setAttribute("sessionBean", null); - } - - } -} diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/MediaSampleSessionBean.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/MediaSampleSessionBean.java deleted file mode 100644 index 5e924b6993e87cfb1798a2c6cc873ebd7ca896ad..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/MediaSampleSessionBean.java +++ /dev/null @@ -1,586 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package emb.sample.session; - -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.emb.Media; -import javax.emb.MediaEntityLocal; -import javax.emb.MediaEntityLocalHome; -import javax.emb.MediaException; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import emb.sample.MediaSampleException; - -/** - * This is an example of Session Bean, statefull, and synchronized. - * - * @author JOnAS team - */ -public class MediaSampleSessionBean implements SessionBean { - - /** - * serialVersionUID - */ - private static final long serialVersionUID = 2549701184925498878L; - - // ======================================================================= - // Refs - // ======================================================================= - - /** - * Media Enotity Bean Home reference - */ - private static final String MEB_HOME_REF = "java:comp/env/ejb/emb/MediaEntity"; - - /** - * Reference on the env entry isCopyAllowed - */ - public static final String IS_COPY_ALLOWED_REF = "java:comp/env/ejb/embSample/isCopyAllowed"; - - /** - * Reference on the env entry maxMediaPerSession - */ - public static final String MAX_MEDIA_PER_SESSION_REF = "java:comp/env/ejb/embSample/maxMediaPerSession"; - - // ======================================================================= - // Fields - // ======================================================================= - - /** - * cache of the env value - */ - private Boolean isCopyAllowed = null; - - /** - * cache of the env value - */ - private Integer maxMediaPerSession = null; - - /** - * list containing primary key of all generated media, use to remove them - */ - private final List mediaListAllCreated = new LinkedList(); - - /** - * list containing primary key of all media standart media that are beeing - * showed - */ - private final List mediaListStdShow = new LinkedList(); - - /** - * list containing primary key of all that have been upload by user - */ - private final List mediaListUpload = new LinkedList(); - - /** - * Map containing name and primary key of some media - */ - private final Map mediaRegistredName = new HashMap(); - - // ======================================================================= - // Medthods - // ======================================================================= - - /** - * There must be one ejbCreate() method per create() method on the Home - * interface, and with the same signature. - */ - public void ejbCreate() { - - // in case we are outside transactions - } - - /** - * Create a new MediaEntity from a stream - * - * @param contentStream content of the MediaEntity - * @param name name of the MediaEntity - * @param description description of the MediaEntity - * @param status is ones of {@link MediaSampleSessionLocal#DONT_SHOW}, - * {@link MediaSampleSessionLocal#SHOW_IN_LIST}, - * {@link MediaSampleSessionLocal#USER_ADDED} - * @param registeredName name to acces it with - * {@link #getMediaFromRegistredName(String)} - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be create - */ -public MediaEntityLocal createMediaEntity(InputStream contentStream, String name, String description, byte status, - String registeredName) throws MediaSampleException { - - // check maxmedia - checkMaxMedia(); - - MediaEntityLocal meb = null; - try { - - meb = getMebHome().create(); - meb.setName(name); - - if (!meb.getFormat().isEmbedded()) { - throw new MediaSampleException("A not embedded media have to be imported and not upload in order to import its children too."); - } - - meb.setContent(contentStream); - meb.setDescription(description); - - - - try { - // publish proxy - Media proxy = meb.getProxy(); - getMebHome().publishContent(proxy, MediaEntityLocalHome.TRANSFER_TYPE_BURST, null); - } catch (MediaException e) { - // do nothing - } - - // store the key - addMedia(meb, status); - - if (registeredName != null) { - mediaRegistredName.put(registeredName, meb.getPrimaryKey()); - } - - return meb; - - } catch (Exception e) { - if (meb != null) { - try { - meb.remove(); - } catch (Throwable e1) { - // do nothing - } - } - throw new MediaSampleException("Unable to create Media : " + name + " : " + e, e); - } - } - /** - * Create a new MediaEntity from an URL - * - * @param urlToImport of the media to import - * @param description description of the MediaEntity - * @param status is ones of {@link MediaSampleSessionLocal#DONT_SHOW}, - * {@link MediaSampleSessionLocal#SHOW_IN_LIST}, - * {@link MediaSampleSessionLocal#USER_ADDED} - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be create - */ - public MediaEntityLocal createMediaEntity(URL urlToImport, String description, byte status) - throws MediaSampleException { - - // check maxmedia - checkMaxMedia(); - - MediaEntityLocal meb = null; - try { - - MediaEntityLocal[] mebs = getMebHome().importMedia(new URL[] {urlToImport}, null); - - if (mebs.length > 0 && mebs[0] != null) { - - meb = mebs[0]; - meb.setDescription(description); - - try { - // publish proxy - Media proxy = meb.getProxy(); - getMebHome().publishContent(proxy, MediaEntityLocalHome.TRANSFER_TYPE_BURST, null); - } catch (MediaException e) { - // do nothing - } - - // store the key - addMedia(meb, status); - - return meb; - } - throw new MediaSampleException("Unable to import the media"); - } catch (Exception e) { - if (meb != null) { - // totdo use super remover - try { - meb.remove(); - } catch (Throwable e1) { - // do nothing - } - } - throw new MediaSampleException("Unable to import Media : " + urlToImport + " : " + e, e); - } - } - - /** - * Create a new MediaEntity from a Media - * - * @param media to copy - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be create - */ - public MediaEntityLocal copyMediaEntity(Media media) throws MediaSampleException { - - if (!getCopyAllowed() && media instanceof MediaEntityLocal) { - return (MediaEntityLocal) media; - } - - // check maxmedia - checkMaxMedia(); - - try { - - MediaEntityLocal meb = getMebHome().create(); - - // store the key - addMedia(meb, MediaSampleSessionLocal.DONT_SHOW); - - meb.setName(media.getName()); - meb.setContent(media.getContent()); - meb.setMimeType(media.getMimeType()); - meb.setChildren(meb.getChildren()); - - return meb; - - } catch (Exception e) { - throw new MediaSampleException("Unable to copy Media", e); - } - } - - /** - * Get media list (only status {@link MediaSampleSessionLocal#SHOW_IN_LIST}, - * {@link MediaSampleSessionLocal#USER_ADDED} - * - * @return MediaEntity array - * @throws MediaSampleException if media cannot be retrive - */ - - public MediaEntityLocal[] getMediaList() throws MediaSampleException { - - try { - List mebs = new ArrayList(mediaListUpload.size() + mediaListStdShow.size()); - for (Iterator i = mediaListUpload.iterator(); i.hasNext();) { - String primaryKey = (String) i.next(); - try { - MediaEntityLocal meb = getMebHome().findByPrimaryKey(primaryKey); - mebs.add(meb); - } catch (FinderException e) { - // do nothing - } - } - for (Iterator i = mediaListStdShow.iterator(); i.hasNext();) { - String primaryKey = (String) i.next(); - try { - MediaEntityLocal meb = getMebHome().findByPrimaryKey(primaryKey); - mebs.add(meb); - } catch (FinderException e) { - // do nothing - } - } - - return (MediaEntityLocal[]) mebs.toArray(new MediaEntityLocal[mebs.size()]); - - } catch (NamingException e) { - throw new MediaSampleException("Unable to get MediaList due to " + e, e); - } - - } - - /** - * Get media from its premary key - * - * @param primaryKey the primary key of the wanted media - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be retrive - */ - public MediaEntityLocal getMediaFromPrimaryKey(String primaryKey) throws MediaSampleException { - try { - MediaEntityLocal meb = getMebHome().findByPrimaryKey(primaryKey); - return meb; - } catch (FinderException e) { - throw new MediaSampleException("Media with this primary key does not exist : " + primaryKey, e); - } catch (NamingException e) { - throw new MediaSampleException("Unable to get Media due to " + e, e); - } - } - - /** - * Get media from registered name - * - * @param registeredName the registeredName of the wanted media - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be retrive - */ - public MediaEntityLocal getMediaFromRegistredName(String registeredName) throws MediaSampleException { - - String primaryKey = (String) mediaRegistredName.get(registeredName); - if (primaryKey != null) { - return getMediaFromPrimaryKey(primaryKey); - } - throw new MediaSampleException("unable to find Media with registered name : " + registeredName); - - } - - /** - * Remove default media to reinit the database, except uploaded media - */ - public void removeDefaultMedia() { - - // copy the primary list - String[] primaryKeyToRemove = (String[]) mediaListAllCreated.toArray(new String[mediaListAllCreated.size()]); - - // remove al creating media during this session - for (int i = 0; i < primaryKeyToRemove.length; i++) { - - if (!mediaListUpload.contains(primaryKeyToRemove[i])) { - - try { - MediaEntityLocal meb = getMediaFromPrimaryKey(primaryKeyToRemove[i]); - removeMedia(meb); - } catch (MediaSampleException e) { - // do nothing - } - } - } - } - - // ======================================================================= - // Internals - // ======================================================================= - - /** - * Add meb to the right list - * - * @param meb the media to add - * @param status where the medi is added, is ones of {@link #DONT_SHOW}, - * {@link #SHOW_IN_LIST}, {@link #USER_ADDED} - */ - private synchronized void addMedia(MediaEntityLocal meb, byte status) { - - mediaListAllCreated.add(meb.getPrimaryKey()); - if (status == MediaSampleSessionLocal.SHOW_IN_LIST) { - mediaListStdShow.add(meb.getPrimaryKey()); - } else if (status == MediaSampleSessionLocal.USER_ADDED) { - mediaListUpload.add(meb.getPrimaryKey()); - } - - } - - /** - * Remove media from all media list - * - * @param meb the media to add - */ - private synchronized void removeMedia(MediaEntityLocal meb) { - - recusiveRemoveMedia(meb); - - mediaListAllCreated.remove(meb.getPrimaryKey()); - mediaListStdShow.remove(meb.getPrimaryKey()); - mediaListUpload.remove(meb.getPrimaryKey()); - - } - - /** - * Remove recurcively all preview version and children - * - * @param meb the media entity bean - */ - private void recusiveRemoveMedia(MediaEntityLocal meb) { - if (meb != null) { - - // recurcive call for children - - MediaEntityLocal[] children = meb.getChildren(); - for (int i = 0; i < children.length; i++) { - recusiveRemoveMedia(children[i]); - } - - // recurcive call for preview version - recusiveRemoveMedia(meb.getPreviousVersion()); - - try { - meb.remove(); - } catch (RemoveException e) { - // do nothing - } - } - } - - /** - * Get the iscopy allow - * - * @return if copy is allow - */ - private boolean getCopyAllowed() { - - Boolean cache = isCopyAllowed; - - if (cache == null) { - try { - cache = (Boolean) (new InitialContext()).lookup(IS_COPY_ALLOWED_REF); - isCopyAllowed = cache; - - } catch (NamingException e) { - return true; - } - } - return cache.booleanValue(); - } - - /** - * Get MaxMediaPerSession - * - * @return maxmedia per session - */ - private int getMaxMediaPerSession() { - - Integer cache = maxMediaPerSession; - - if (cache == null) { - try { - cache = (Integer) (new InitialContext()).lookup(MAX_MEDIA_PER_SESSION_REF); - maxMediaPerSession = cache; - - } catch (NamingException e) { - return 0; - } - } - return cache.intValue(); - } - - /** - * test if MaxMediaPerSession has been reach - * - * @throws MediaSampleException if MaxMediaPerSession has been reach - */ - private void checkMaxMedia() throws MediaSampleException { - - if (!(getMaxMediaPerSession() == 0)) { - if (mediaListAllCreated.size() >= getMaxMediaPerSession() - 1) { - throw new MediaSampleException( - "You have reach the maximum number per session. You cannot create more media."); - } - } - - } - - // ======================================================================= - // TOOLS - // ======================================================================= - - /** - * cached Home - */ - private MediaEntityLocalHome mebHome = null; - - /** - * Provide a cached Home access - * - * @return MediaEntityLocalHome - * @throws NamingException in case MediaEntityLocalHome is not found - */ - private MediaEntityLocalHome getMebHome() throws NamingException { - if (mebHome == null) { - mebHome = (MediaEntityLocalHome) new InitialContext().lookup(MEB_HOME_REF); - } - return mebHome; - } - - // ======================================================================= - // EJB contract - // ======================================================================= - - /** - * Session Context - */ - private SessionContext mySessionCtx; - - /** - * getSessionContext - * - * @return SessionContext - */ - public SessionContext getSessionContext() { - return mySessionCtx; - } - - /** - * @see javax.ejb.SessionBean#setSessionContext(javax.ejb.SessionContext) - * @inheritDoc - */ - public void setSessionContext(SessionContext ctx) { - mySessionCtx = ctx; - } - - /** - * @see javax.ejb.SessionBean#ejbActivate() - * @inheritDoc - */ - public void ejbActivate() { - // do nothing - } - - /** - * @see javax.ejb.SessionBean#ejbPassivate() - * @inheritDoc - */ - public void ejbPassivate() { - // do nothing - } - - /** - * @see javax.ejb.SessionBean#ejbRemove() - * @inheritDoc - */ - public void ejbRemove() { - - // copy the primary list - String[] primaryKeyToRemove = (String[]) mediaListAllCreated.toArray(new String[mediaListAllCreated.size()]); - - // remove al creating media during this session - for (int i = 0; i < primaryKeyToRemove.length; i++) { - try { - MediaEntityLocal meb = getMediaFromPrimaryKey(primaryKeyToRemove[i]); - removeMedia(meb); - } catch (MediaSampleException e) { - // do nothing - } - } - - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocal.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocal.java deleted file mode 100644 index 3c6b96ee08f0479b891022fcfea6ed6ee5c0c2a3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocal.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package emb.sample.session; - -import java.io.InputStream; -import java.net.URL; - -import javax.ejb.EJBLocalObject; -import javax.emb.Media; -import javax.emb.MediaEntityLocal; - -import emb.sample.MediaSampleException; - -/** - * Local interface for the bean MediaSampleSessionLocal - */ -public interface MediaSampleSessionLocal extends EJBLocalObject { - - /** - * Set if the media has to be show in media list - */ - byte SHOW_IN_LIST = 0; - - /** - * Set if the media has to be show in media list and if the media has been - * upload - */ - byte USER_ADDED = 1; - - /** - * Set if the media is not showed is media list - */ - byte DONT_SHOW = -1; - - /** - * Create a new MediaEntity from a stream - * - * @param contentStream content of the MediaEntity - * @param name name of the MediaEntity - * @param description description of the MediaEntity - * @param status is ones of {@link MediaSampleSessionLocal#DONT_SHOW}, - * {@link MediaSampleSessionLocal#SHOW_IN_LIST}, - * {@link MediaSampleSessionLocal#USER_ADDED} - * @param registeredName name to acces it with - * {@link #getMediaFromRegistredName(String)} - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be create - */ - MediaEntityLocal createMediaEntity(InputStream contentStream, String name, String description, byte status, - String registeredName) throws MediaSampleException; - - /** - * Create a new MediaEntity from an URL - * - * @param urlToImport of the media to import - * @param description description of the MediaEntity - * @param status is ones of {@link MediaSampleSessionLocal#DONT_SHOW}, - * {@link MediaSampleSessionLocal#SHOW_IN_LIST}, - * {@link MediaSampleSessionLocal#USER_ADDED} - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be create - */ - MediaEntityLocal createMediaEntity(URL urlToImport, String description, byte status) throws MediaSampleException; - - /** - * Create a new MediaEntity from a Media - * - * @param media to copy - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be create - */ - MediaEntityLocal copyMediaEntity(Media media) throws MediaSampleException; - - /** - * Get media list (only status {@link MediaSampleSessionLocal#SHOW_IN_LIST}, - * {@link MediaSampleSessionLocal#USER_ADDED} - * - * @return MediaEntity array - * @throws MediaSampleException if media cannot be retrive - */ - - MediaEntityLocal[] getMediaList() throws MediaSampleException; - - /** - * Get media from its premary key - * - * @param primaryKey the primary key of the wanted media - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be retrive - */ - MediaEntityLocal getMediaFromPrimaryKey(String primaryKey) throws MediaSampleException; - - /** - * Get media from registered name - * - * @param registeredName the registeredName of the wanted media - * @return MediaEntity - * @throws MediaSampleException if the mediaEntity cannot be retrive - */ - MediaEntityLocal getMediaFromRegistredName(String registeredName) throws MediaSampleException; - - /** - * Remove default media to reinit the database, except uploaded media - */ - void removeDefaultMedia(); -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocalHome.java b/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocalHome.java deleted file mode 100644 index 009ccd0369f12864448248b7a8919ff1a2d696af..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/emb-sample/src/emb/sample/session/MediaSampleSessionLocalHome.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Brice Ruzand - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package emb.sample.session; - -import javax.ejb.CreateException; -import javax.ejb.EJBLocalHome; - -/** - * Home interface for the bean MediaSampleSessionLocal - * - * @author Brice Ruzand - */ -public interface MediaSampleSessionLocalHome extends EJBLocalHome { - - /** - * Create an instance of the MediaSampleSessionLocal bean. - * - * @return the Remote interface of the bean MediaSampleSessionLocal. - * @throws CreateException if the creation failed. - */ - MediaSampleSessionLocal create() throws CreateException; - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/fdf/MyJOnASCluster.fdf b/jonas_tests/examples/base/examples/fdf/MyJOnASCluster.fdf deleted file mode 100644 index 4f53276828256d9bdc2b4e70c5469dc77dd6b38f..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/fdf/MyJOnASCluster.fdf +++ /dev/null @@ -1,103 +0,0 @@ -/* ==================================================================== - * - * ObjectWeb Fractal Deployment Framework - * Copyright (C) 2006-2007 INRIA - ADAM/Jacquard Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Contact: fdf-users@lists.gforge.inria.fr - * - * Author: Nicolas Dolet - * - * Contributors: - * - * ==================================================================== - * $Id$ - * ==================================================================== - */ - - - /** - * This is a FDF description with 1 machine (host-1) - * and several JOnAS instances : - * - * - 1 Jonas Root - * - 2 Jonas Base - * - 1 Cluster Daemon - * - * This description is loadable with FDF explorer - * - * If you want to deploy a software (e.g. base-2) in text mode, - * replace - * - * MyJOnASCluster { - * - * by - * - * MyJOnASCluster = FDF.RUNNABLE(jonas-instances/base-2) { - * - */ - -MyJOnASCluster { - - Hosts = INTERNET.NETWORK { - - host-1 = INTERNET.HOST { - hostname = INTERNET.HOSTNAME(localhost); - user = INTERNET.USER(dolet,,/home/dolet/.ssh/id_rsa); - transfer = TRANSFER.SCP; - protocol = PROTOCOL.OpenSSH; - shell = SHELL.SH; - software { - java = JAVA.JRE { - archive = JAVA.ARCHIVE(Archive_File_URI); - home = JAVA.HOME(Java_Home_Directory_URI); - } - } - } - - } - - - jonas-instances { - - # In this example, the JOnAS Root software is already installed - root = JOnAS.JONAS_ROOT, software.AlreadyInstalled(jonasroot,JOnAS_ROOT) { - root = JOnAS.ROOT(Path_to_JONAS_ROOT_directory); - host = Hosts/host-1; - } - - cd = JOnAS.CLUSTER_DAEMON { - archive = JOnAS.ARCHIVE(Archive_File_URI); - jonasroot = /jonas-instances/root; - base = JOnAS.BASE(Path_to_JONAS_BASE_directory); - } - - base-1 = JOnAS.JONAS_BASE { - archive = JOnAS.ARCHIVE(Archive_File_URI); - jonasroot = /jonas-instances/root; - base = JOnAS.BASE(Path_to_JONAS_BASE_directory); - } - - base-2 = JOnAS.JONAS_BASE { - archive = JOnAS.ARCHIVE(Archive_File_URI); - jonasroot = /jonas-instances/root; - base = JOnAS.BASE(Path_to_JONAS_BASE_directory); - } - - } - -} diff --git a/jonas_tests/examples/base/examples/hibernate/README b/jonas_tests/examples/base/examples/hibernate/README deleted file mode 100644 index fcff212dab8b76a1ed17c9cb2c5302cb1e4f7f5d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/README +++ /dev/null @@ -1,93 +0,0 @@ -# --------------------------------------------------------------------------- -# JOnAS: Java(TM) Open Application Server -# Copyright (C) 2005 Bull S.A. -# Contact: jonas-team@objectweb.org -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# --------------------------------------------------------------------------- -# $Id$ -# --------------------------------------------------------------------------- - -Example Overview -================ -This example is the one provided with Hibernate documentation : -http://www.hibernate.org/hib_docs/reference/en/html_single/ - -The JOnAS hibernate war has been made by Stéphane TRAUMAT -for the Sourcebeat book : JOnAS Live -( http://www.sourcebeat.com/TitleAction.do?id=9 ) - -The ant script provided will create the needed table, package -the application in a .war file and deploy it to $JONAS_BASE/webapps. - -Directories structure -===================== -There is three directories : - -- src : Contains the servlet and the Cat class. - -- etc : Contains all non-java resources -- etc/resources : Hibernate configuration files -- etc/sql : HSQL init/reset scripts -- etc/xml : Deployment descriptors - -- lib : Contains all the needed librairies for Hibernate. - They will be added in the war. - -Building and running this example -===================== -Take care to change the hsql.port properties (in build.properties) -if you do not use default one (9001) - -To make the CAT example works, the first thing is to create -a table CAT to store the data in the HSQLDB engine included -with JOnAS. - -note : The SQL to create the needed table will be executed -by the ant script. - -1) To start the database, we need to run JOnAS using the -"jonas start" command. - -2) Init the HSQL Database, type "ant initdb". - -3) Then, under the hibernate sample directory, type: "ant". - That will compile, package the webapp and place it - under $JONAS_BASE/webapps. - -4) And, to deploy the war on JOnAS, just type: -"jonas admin -a hibernate-sample.war" -You should see a message looking like : -2004-11-19 12:29:37,405 : AbsJWebContainerServiceImpl.registerWar : -War /C:/java/plateforme/JONAS/webapps/hibernate-sample.war available -at the context /hibernate-sample on the host . - -5) Connect to http://localhost:9000/hibernate-sample/testHibernate/ - -Connecting to HSQLdb -===================== -1) type "ant dbmanager" -Press enter and you should be able to see the CAT table. - -Notes -===================== -To develop this sample, we used -- JOnAS 4.4.2 -- Hibernate 3.0.5 -Because of some conflicts, we had to replace cglib-2.1.jar -with cglib-nodep-2.1_2.jar which is the same library without -the dependencies on ASM. \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/hibernate/build.properties b/jonas_tests/examples/base/examples/hibernate/build.properties deleted file mode 100644 index 7774106d5c29eccea04159bd50863c4a83a4ee3b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/build.properties +++ /dev/null @@ -1,28 +0,0 @@ -# --------------------------------------------------------------------------- -# JOnAS: Java(TM) Open Application Server -# Copyright (C) 2005 Bull S.A. -# Contact: jonas-team@objectweb.org -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# --------------------------------------------------------------------------- -# $Id$ -# --------------------------------------------------------------------------- - -# default HSQL port is 9001 -hsql.port 9001 -# Default Server name -jonas.server.name jonas \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/hibernate/build.xml b/jonas_tests/examples/base/examples/hibernate/build.xml deleted file mode 100644 index b0f4e42ec6cfac5e7f0cf1132ba8f6fd9b872d59..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/build.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +---------------------------------------------------------------------+ - | init | - +---------------------------------------------------------------------+ - - - - - - - - - - - - - - - - - +---------------------------------------------------------------------+ - | clean | - +---------------------------------------------------------------------+ - - - - - - +---------------------------------------------------------------------+ - | compile - compile the servlet | - +---------------------------------------------------------------------+ - - - - - - - - +---------------------------------------------------------------------+ - | war - package the servlet and the .xml files | - +---------------------------------------------------------------------+ - - - - - - - - - - - - - - - - - - - - +---------------------------------------------------------------------+ - | install - copy the war to JOnAS | - +---------------------------------------------------------------------+ - - - - - - ${hib.webapp.name} has been copied to ${jonas.base}/webapps. - - - - - +---------------------------------------------------------------------+ - | deploy - Deploy the war into a running JOnAS instance | - +---------------------------------------------------------------------+ - - - - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/hibernate/etc/resources/Cat.hbm.xml b/jonas_tests/examples/base/examples/hibernate/etc/resources/Cat.hbm.xml deleted file mode 100644 index 5fad20831ab0d17ccfd19636701266be56f6b985..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/etc/resources/Cat.hbm.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/hibernate/etc/resources/hibernate.cfg.xml b/jonas_tests/examples/base/examples/hibernate/etc/resources/hibernate.cfg.xml deleted file mode 100644 index 4fe40a4c1b57296092c2bd2d8d9aeeed98de08ed..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/etc/resources/hibernate.cfg.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - java:comp/env/jdbc/jdbc_1 - false - org.hibernate.dialect.HSQLDialect - create - - - - - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/hibernate/etc/sql/initdb.sql b/jonas_tests/examples/base/examples/hibernate/etc/sql/initdb.sql deleted file mode 100644 index e8766fea1f98e0c677e1b46fdb796ccc3592237b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/etc/sql/initdb.sql +++ /dev/null @@ -1,8 +0,0 @@ -create table CAT ( - - cat_id VARCHAR(32) NOT NULL, - name VARCHAR(255), - sex VARCHAR(1), - weight REAL, - PRIMARY KEY(cat_id) -); diff --git a/jonas_tests/examples/base/examples/hibernate/etc/sql/resetdb.sql b/jonas_tests/examples/base/examples/hibernate/etc/sql/resetdb.sql deleted file mode 100644 index 19c86a77f599c90400682c1f123ee40bf3e85c71..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/etc/sql/resetdb.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TABLE CAT IF EXISTS; \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/hibernate/etc/xml/jonas-web.xml b/jonas_tests/examples/base/examples/hibernate/etc/xml/jonas-web.xml deleted file mode 100644 index f7274e1cd0122fbbf9f8d0767852ad7a0581b5b9..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/etc/xml/jonas-web.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - jdbc/jdbc_1 - jdbc_1 - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/hibernate/etc/xml/web.xml b/jonas_tests/examples/base/examples/hibernate/etc/xml/web.xml deleted file mode 100644 index c0483a48163f8f48b338ebeb98898b661ae3fc08..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/etc/xml/web.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - HibernateServlet - Hibernate test servlet - - org.hibernate.examples.quickstart.TestServlet - - 1 - - - - HibernateServlet - /testHibernate/* - - - - - jdbc/jdbc_1 - javax.sql.DataSource - Container - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/hibernate/lib/antlr-2.7.6rc1.jar b/jonas_tests/examples/base/examples/hibernate/lib/antlr-2.7.6rc1.jar deleted file mode 100644 index f83e3107fe3e0aec002a088553f7d00e81455939..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/antlr-2.7.6rc1.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/c3p0-0.9.0.jar b/jonas_tests/examples/base/examples/hibernate/lib/c3p0-0.9.0.jar deleted file mode 100644 index a99c36d65f585e21a40e04f73b21db5179c87f68..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/c3p0-0.9.0.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/cglib-2.1.3.jar b/jonas_tests/examples/base/examples/hibernate/lib/cglib-2.1.3.jar deleted file mode 100644 index ddfbdb05a46b9fdaaebe4e691d49891706ab8043..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/cglib-2.1.3.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/cglib-nodep-2.1_3.jar b/jonas_tests/examples/base/examples/hibernate/lib/cglib-nodep-2.1_3.jar deleted file mode 100644 index e9b17ebf129b316be9dd5aba4e5dfeb23e96b2ad..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/cglib-nodep-2.1_3.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/dom4j-1.6.1.jar b/jonas_tests/examples/base/examples/hibernate/lib/dom4j-1.6.1.jar deleted file mode 100644 index c8c4dbb92d6c23a7fbb2813eb721eb4cce91750c..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/dom4j-1.6.1.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/ehcache-1.1.jar b/jonas_tests/examples/base/examples/hibernate/lib/ehcache-1.1.jar deleted file mode 100644 index 2bda9162a36f0f244132dcb878cc4d0b38c42c95..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/ehcache-1.1.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/hibernate-3.1.2.jar b/jonas_tests/examples/base/examples/hibernate/lib/hibernate-3.1.2.jar deleted file mode 100644 index c0d963f9d2060d3b1433df670bfec6fb79055571..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/hibernate-3.1.2.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/jaxen-1.1-beta-7.jar b/jonas_tests/examples/base/examples/hibernate/lib/jaxen-1.1-beta-7.jar deleted file mode 100644 index c773f8566a4d76a39a4ba6c36caefb7a59842d8a..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/jaxen-1.1-beta-7.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/oscache-2.1.jar b/jonas_tests/examples/base/examples/hibernate/lib/oscache-2.1.jar deleted file mode 100644 index 4496a88a66062555d870161035365421d7432e5e..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/oscache-2.1.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/proxool-0.8.3.jar b/jonas_tests/examples/base/examples/hibernate/lib/proxool-0.8.3.jar deleted file mode 100644 index c4f700cf7c5080695dd824fe63226d9e4e854635..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/proxool-0.8.3.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/swarmcache-1.0rc2.jar b/jonas_tests/examples/base/examples/hibernate/lib/swarmcache-1.0rc2.jar deleted file mode 100644 index f0cb0d0569fbd273b2d00c6adb24725b24847921..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/swarmcache-1.0rc2.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/lib/versioncheck.jar b/jonas_tests/examples/base/examples/hibernate/lib/versioncheck.jar deleted file mode 100644 index bf9e33e0eb2239dce189a2b7846642b802e9f4f2..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/hibernate/lib/versioncheck.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/hibernate/src/org/hibernate/examples/quickstart/Cat.java b/jonas_tests/examples/base/examples/hibernate/src/org/hibernate/examples/quickstart/Cat.java deleted file mode 100644 index ff82ce98c3d166ce96652bff56bd6371f5b3b745..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/src/org/hibernate/examples/quickstart/Cat.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.hibernate.examples.quickstart; - -public class Cat { - private String id; - private String name; - private char sex; - private float weight; - - public Cat() { - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public char getSex() { - return sex; - } - - public void setSex(char sex) { - this.sex = sex; - } - - public float getWeight() { - return weight; - } - - public void setWeight(float weight) { - this.weight = weight; - } -} diff --git a/jonas_tests/examples/base/examples/hibernate/src/org/hibernate/examples/quickstart/TestServlet.java b/jonas_tests/examples/base/examples/hibernate/src/org/hibernate/examples/quickstart/TestServlet.java deleted file mode 100644 index 8e612858c9e62ae9adeb3b59140428f1e439dd36..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/hibernate/src/org/hibernate/examples/quickstart/TestServlet.java +++ /dev/null @@ -1,165 +0,0 @@ -package org.hibernate.examples.quickstart; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Iterator; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.hibernate.HibernateException; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.Transaction; -import org.hibernate.cfg.Configuration; - -/** - * Simple Servlet used to show how using Hibernate from a Servlet - */ -public class TestServlet extends HttpServlet { - - /** - * Hibernate SessionFactory instance - */ - private SessionFactory sessionFactory; - - /** - * Hibernate Session instance - */ - private Session session; - - /** - * Hibernate Transaction - */ - private Transaction transaction; - - /** - * execute GET action - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - try { - // Initialize Hibernate (Configuration and SessionFactory) - initHibernate(); - - // Prepare out - response.setContentType("text/html"); - - PrintWriter out = response.getWriter(); - - // Create some Cats - beginTransaction(); - createCats(out); - endTransaction(true); - - // Select all Cats - beginTransaction(); - selectAllCats(out); - endTransaction(false); - - // Select female Cats - beginTransaction(); - selectFemaleCats(out); - endTransaction(false); - - // print "Servlet OK" at the end (everything went OK) - out.println("Servlet is OK"); - } catch (HibernateException e) { - throw new ServletException(e); - } - } - - /** - * Creates and Persists Cats in DB - * @param out PrintWriter - * @throws HibernateException if - */ - public void createCats(PrintWriter out) throws HibernateException { - out.print("

    Creating Cats:

    "); - out.println("CREATING 'Princess'...
    "); - - Cat princess = new Cat(); - princess.setName("Princess"); - princess.setSex('F'); - princess.setWeight(7.4f); - session.save(princess); - - out.println("CREATING 'Max'...
    "); - - Cat max = new Cat(); - max.setName("Max"); - max.setSex('M'); - max.setWeight(8.1f); - session.save(max); - - out.println("CREATING 'Sophie'...
    "); - - Cat sophie = new Cat(); - sophie.setName("Sophie"); - sophie.setSex('F'); - sophie.setWeight(4.1f); - session.save(sophie); - } - - /** - * Select All the Cats - * @param out PrintWriter - * @throws HibernateException - */ - public void selectAllCats(PrintWriter out) throws HibernateException { - out.print("

    Retrieving all Cats:

    "); - - String queryString = "select cat from Cat as cat"; - Query query = session.createQuery(queryString); - - for (Iterator it = query.iterate(); it.hasNext();) { - Cat cat = (Cat) it.next(); - out.println("CAT: " + cat.getName() + " (" + cat.getSex() + ", " + - cat.getWeight() + ")
    "); - } - } - - /** - * Select all Female Cats - * @param out PrintWriter - * @throws HibernateException - */ - public void selectFemaleCats(PrintWriter out) throws HibernateException { - out.print("

    Retrieving female Cats:

    "); - - String queryString = "select cat from Cat as cat where cat.sex = :sex"; - Query query = session.createQuery(queryString); - query.setCharacter("sex", 'F'); - - for (Iterator it = query.iterate(); it.hasNext();) { - Cat cat = (Cat) it.next(); - out.println("CAT: " + cat.getName() + " (" + cat.getSex() + ", " + - cat.getWeight() + ")
    "); - } - } - - // Helper Methods - private void initHibernate() throws HibernateException { - // Load Configuration and build SessionFactory - sessionFactory = new Configuration().configure().buildSessionFactory(); - } - - private void beginTransaction() throws HibernateException { - session = sessionFactory.openSession(); - transaction = session.beginTransaction(); - } - - private void endTransaction(boolean commit) throws HibernateException { - if (commit) { - transaction.commit(); - } else { - // Don't commit the transaction, can be faster for read-only operations - transaction.rollback(); - } - - session.close(); - } -} diff --git a/jonas_tests/examples/base/examples/j2eemanagement/README b/jonas_tests/examples/base/examples/j2eemanagement/README deleted file mode 100644 index 6bdb7226a2ac0f972771ac54e6c56a62ca33b267..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/README +++ /dev/null @@ -1,147 +0,0 @@ - -Example Overview: ------------------ - -This is a sample management application which is using the -Management EJB (MEJB) accordingly to the J2EE Management -Specification (JSR77), to implement some management operations -described below. -The MEJB is an Enterprise Session bean implementing the -javax.management.j2ee.Management interface and provides access -to the platform's manageable objects through the EJB -interoperability protocol. - -The MEJB is automatically deployed in a JOnAS EJB container -at start-up because the ejb-jar file (mejb.jar) -is installed in (JONAS_ROOT | JONAS_BASE)/ejbjars/autoload directory. -(Note you can use "ant update_jonasbase" for updating JONAS_BASE -directory). - -The application's main component is a servlet which creates -a MEJB and calls the management methods defined in its remote interface. - -In order to create the MEJB, the servlet gets a reference on the -bean's home using a JNDI lookup with the "java:comp/env/ejb/mgmt/MEJB" name. - -Management operations ---------------------- -The management operations implemented in this example are: -1/ Find the servers which run in the current management domain. -2/ Register an event listener in order to receive notifications -emitted by a J2EE server. - -Example structure and packaging -------------------------------- - -This example is a J2EE application, so it is packaged in a EAR. -Compiling the example creates the j2eemanagement.ear file -that includes a web application (WAR). - -The servlet source code is contained in -.../jonas_tests/examples/base/examples/j2eemanagement/src/.. directory. - -The "etc" directory contains - - the "xml" directory containing the application's deployment descriptors: - * application.xml (ear file) - * web.xml, jonas-web.xml (war file) - - the "resources" directory which contains the resources for this application - * "web" directory contains all resources used by the servlet - - -Prerequisites -------------- -First, you must have installed a web container (i.e.: Catalina or Jetty) -as the web container service. - - -Compiling and installing this example: --------------------------------------- - ant install - -in JONAS_ROOT/examples/j2eemanagement. - -Running this example: --------------------- -You will run a JOnAS server having at least a default configuration -(the ejb service, to deploy mejb.jar, and the web service, to -deploy jonasAdmin.war and j2eemanagement.ear). - -Commands are given for an Unix system. -(Similar commands can be done on Windows) - -0) Server configuration: -- Currently, if you wish to test the event notifications, you have to -be sure the mail service is in the services list in jonas.properties. -Otherwise, default configuration is sufficient. -- You may add j2eemanagement.ear in the ear descriptors list in jonas.properties; -this avoids executing step 2) - -1) Run a jonas server: - jonas start [-n name] [-Ddomain.name=domainName] - -2) Load j2eemanagement.ear if you haven't added j2eemanagement.ear to the ear -descriptors list: - jonas admin -a j2eemanagement.ear - - or via the jonasAdmin management application - (http://:/jonasAdmin) - -3) Run your web browser (e.g., netscape) with url: - http://:/j2eemanagement - where is the name of your machine (localhost by default) - and the port number (9000 by default) - -4) Run the servlet after providing the domain name. - - The displayed information traces out the executed management operations: - - initial naming context creation - - MEJB creation - - access to J2EEDomain MBean and listing the J2EEServer MBeans - (we have one server in the present case) - - the next operation is creation of a client notification listener and - its registration as listener on notifications emitted by the - J2EEServer MBean via the usage of a ListenerRegistration object - provided by the MEJB. - - As specified at step 0) the mail service has to be started in order -to test the event listener. - Make the following operations: - Run the JOnAS management application to add or remove a mail resource: - - open http://:/jonasAdmin url - - go in the Resources->Mail sub-tree - - deploy, or undeploy, a Mail Factory - - As a side effect of this action, the J2EEServer MBean sends a notification -to the registered notification listeners. The notification's type is - AttributeAddNotification or AttributeRemoveNotification. -It contains information about the added/removed resource. - The implementation of the MEJB's event listener requirement allow -the notification to be delivered to the client notification listener. -This can be verified by a click on one of the links allowing to list the -received notifications. - -5) Test the new domain management features: -5.1) Cluster creation - - Go back to the previous page (to /j2eemanagement) - - Provide the cluster name to create and run the cluster creation (2nd run button) - -5.2) Add additional server to the domain. -You may test one of the following scenarios: - -5.2.1) In the first scenario, you add an additional slave server which -is not running when the "addServer" operation is invoked. The server is added to the 'servers' -list in 'created' state. - - Go back to the previous page (to /j2eemanagement) - - Provide the server name, the connector server URL, and run by clicking on the last run button. -Later on, when starting the server, it passes in 'running' state. - - Start the server having the provided name and connector server URL - - Check the new server passed in the 'running' state by re-executing the servlet (first run button) - -5.2.2) In the second scenario, you add an additional server which doesn't has the discovery service -enabled. The server is added in the 'servers' list in 'running' state. - - Start the server to add - - Go back to the previous page (to /j2eemanagement) - - Provide the server name, the connector server URL, and run by clicking on the last run button. - -6) Stop the jonas server: - jonas stop [-n name] diff --git a/jonas_tests/examples/base/examples/j2eemanagement/build.xml b/jonas_tests/examples/base/examples/j2eemanagement/build.xml deleted file mode 100644 index ce2f7678b63855af21059c324330744c65371276..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/build.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/j2eemanagement/etc/resources/web/img/logo_jonas.jpg b/jonas_tests/examples/base/examples/j2eemanagement/etc/resources/web/img/logo_jonas.jpg deleted file mode 100644 index 3fe9b43072176d2275d8725eb977b781a9730306..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/j2eemanagement/etc/resources/web/img/logo_jonas.jpg and /dev/null differ diff --git a/jonas_tests/examples/base/examples/j2eemanagement/etc/resources/web/index.html b/jonas_tests/examples/base/examples/j2eemanagement/etc/resources/web/index.html deleted file mode 100644 index 7bdb1e3e425ccb0f7ed3c3033b38022cd9590cc8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/etc/resources/web/index.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - - j2eemanagement - - - - -

    j2eemanagement : example of Servlet accessing the MEJB (Management EJB)

    -JOnAS Logo - -

    -This new version of the application allows testing management of several JOnAS servers running in a domain,
    -via JSR 160 MBeanServerConnections.
    -It also tests new domain management features and even Joram management. -

    -

    -To test domain management, you may start before running the servlet, at least a second server in the domain.
    -For example, if the current server's name is jonas, to start a second server named jonas1 in the current server's domain use:
    -jonas start -n jonas1 -Ddomain.name=jonas -

    -

    -Please give the domain name to be managed and then click to run the servlet.
    -(the default name for the domain is the current server's name)

    -

    -

    Check the domain topology

    -

    -

    -

    - Domain name: -

    -

    - -

    -
    -

    -

    -

    Test cluster creation

    -

    -

    -

    - Domain name: -

    -

    - Cluster name: -

    -

    - -

    -
    -

    -

    Add a new server to the domain (a server which is not running or which is running without the discovery service)

    -

    -

    -

    - Domain name: -

    -

    - Cluster name: -

    -

    - Server name: -

    -

    - Connector server url: -

    -

    - -

    -
    -

    -

    -

    Test server start

    -

    -

    -

    - Domain name: -

    -

    - Daemon name: -

    -

    - Server name: -

    -

    - -

    -
    -

    -

    -

    Test joram management features

    -

    Create a topic on a Joram server

    -

    -

    -

    - Topic name: -

    -

    - Joram server id: -

    -

    - -

    -
    -

    - - - diff --git a/jonas_tests/examples/base/examples/j2eemanagement/etc/resources/web/style.css b/jonas_tests/examples/base/examples/j2eemanagement/etc/resources/web/style.css deleted file mode 100644 index 4f852c2a87c8be61ad1e242e706f92197a35396c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/etc/resources/web/style.css +++ /dev/null @@ -1,13 +0,0 @@ -body { - background : white; - color : black; -} -h1, h2, h3 {font-family : sans-serif; } -h1 {font-size : 175%; color : DarkCyan; text-align : center;} -h2 {font-size : 150%; color : DarkCyan; - border-bottom : solid; - border-bottom-width : 1; -} -h3 {font-size : 125%; } -strong { font-weight : bold; } -hr { size : 1; width : 100%; } diff --git a/jonas_tests/examples/base/examples/j2eemanagement/etc/xml/application.xml b/jonas_tests/examples/base/examples/j2eemanagement/etc/xml/application.xml deleted file mode 100644 index ca34ba01b007d0b67284e9531e8943f1bc14401e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/etc/xml/application.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - ear example for MEJB usage - j2eemanagement servlet - - - - j2eemanagement.war - j2eemanagement - - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/j2eemanagement/etc/xml/jonas-web.xml b/jonas_tests/examples/base/examples/j2eemanagement/etc/xml/jonas-web.xml deleted file mode 100644 index da508379cc1b7f2f5e68129f4cb855f20e51a523..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/etc/xml/jonas-web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - ejb/mgmt/MEJB - ejb/mgmt/MEJB - - diff --git a/jonas_tests/examples/base/examples/j2eemanagement/etc/xml/web.xml b/jonas_tests/examples/base/examples/j2eemanagement/etc/xml/web.xml deleted file mode 100644 index 717c8bd1fdaac06f7c1870e1c43d7504de428fea..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/etc/xml/web.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - mgmt - org.objectweb.j2eemanagement.servlets.MgmtServlet - - - - mgmt - /mgmt - - - - cmgmt - org.objectweb.j2eemanagement.servlets.ClustMgmtServlet - - - - cmgmt - /cmgmt - - - - dmgmt - org.objectweb.j2eemanagement.servlets.ClusterDaemonServlet - - - - dmgmt - /dmgmt - - - - smgmt - org.objectweb.j2eemanagement.servlets.NewServerMgmtServlet - - - - smgmt - /smgmt - - - - jmsmgmt - org.objectweb.j2eemanagement.servlets.JmsAdminServlet - - mbeanName - joramClient:type=JoramAdmin - - - - - jmsmgmt - /jmsmgmt - - - - ejb/mgmt/MEJB - Session - javax.management.j2ee.ManagementHome - javax.management.j2ee.Management - - - - - Protected Area - - /* - - DELETE - GET - POST - PUT - - - - mejb-admin - - - - - - BASIC - JOnAS Realm - - - - - mejb-admin - - - diff --git a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClustMgmtServlet.java b/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClustMgmtServlet.java deleted file mode 100644 index bdba36c83104451c67a308215260e12570fc5259..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClustMgmtServlet.java +++ /dev/null @@ -1,253 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2006 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.j2eemanagement.servlets; - -//import java -import java.io.IOException; -import java.io.PrintWriter; - -import javax.management.ObjectName; -import javax.management.j2ee.Management; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * This servlet is an example which shows how to access the MEJB from a servlet. - * @author JOnAS team - * @author Adriana Danes - */ -public class ClustMgmtServlet extends J2eemanagementBaseServlet { - - // ---------------------------------------------------------- Constants - /** Parameter */ - static final String PARAM_DOMAIN = "domainName"; - /** Parameter */ - static final String PARAM_CLUSTER = "clusterName"; - /** Parameter */ - static final String PARAM_VIEW = "view"; - /** Parameter */ - static final String VIEW_INIT = "init"; - - // ---------------------------------------------------------- Public methods - - /** - * Initialize the servlet. - * @param pConfig See HttpServlet - * @throws ServletException Could not execute request - */ - public void init(ServletConfig pConfig) throws ServletException { - super.init(pConfig); - } - - // ---------------------------------------------------------- Protected - // methods - - /** - * Response to the GET request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException An input or output error is detected when the servlet handles the request - * @throws ServletException Could not execute request - */ - protected void doGet(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException, - ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Response to the POST request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException An input or output error is detected when the servlet handles the request - * @throws ServletException Could not execute request - */ - protected void doPost(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException, - ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Dispatch the response. - * @param pRequest Request - * @param pResponse Response - * @throws IOException An input or output error is detected when the servlet handles the request - */ - protected void dispatch(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException { - - pResponse.setContentType("text/html"); - PrintWriter out = pResponse.getWriter(); - - // Get parameters - String sParamDomain = pRequest.getParameter(PARAM_DOMAIN); - String sParamCluster = pRequest.getParameter(PARAM_CLUSTER); - String sParamView = pRequest.getParameter(PARAM_VIEW); - - // Dispatching - if ((sParamDomain == null) || (sParamDomain.length() == 0)) { - doViewError("Parameter Domain name not found", pRequest, out); - } else if ((sParamCluster == null) || (sParamCluster.length() == 0)) { - doViewError("Parameter Cluster name not found", pRequest, out); - } else if ((sParamView == null) || (sParamView.length() == 0) || VIEW_INIT.equals(sParamView)) { - doViewInit(pRequest, out); - doViewManagement(sParamDomain, sParamCluster, pRequest, out); - } else { - doViewError("Unknown View", pRequest, out); - } - - } - - /** - * Do management opeartions in this view. - * @param pDomainName Name of domain to access - * @param pClusterName Name of the cluster to manage in the domain - * @param pRequest Http request - * @param pOut Printer - */ - protected void doViewManagement(String pDomainName, String pClusterName, HttpServletRequest pRequest, PrintWriter pOut) { - Management mgmt = getMgmt(); - - // ------------------------------ - // Access to the J2EEDomain MBean - // ------------------------------ - ObjectName onDomain = accessJ2EEDomain(pDomainName, mgmt, pOut); - if (onDomain == null) { - return; - } - - if (!isMaster(onDomain, mgmt, pOut)) { - // End application - pOut.println("

    Application is OK

    "); - // Footer - printNavigationFooter(pRequest, pOut); - return; - } - - // Create a cluster in the domain - // ------------------------------- - ObjectName onCluster = createCluster(onDomain, pClusterName, mgmt, pOut); - if (onCluster == null) { - return; - } - - // ----------------------------------------------------- - // Using the domain management EJB to list servers and clusters - // ----------------------------------------------------- - String[] serverNames = null; - String[] serverNamesDom = null; - String[] servers = null; - String[] clusters = null; - try { - - pOut.println("

    Getting the list of cluster MBeans

    "); - clusters = (String[]) mgmt.getAttribute(onDomain, "clusters"); - pOut.println("
      "); - for (int i = 0; i < clusters.length; i++) { - pOut.println("
    • " + clusters[i] + "
    • "); - } - pOut.println("
    "); - } catch (Exception e) { - pOut.println("
  • Could not make MEJB list servers or clusters.
  • " + e); - e.printStackTrace(pOut); - return; - } - - pOut.println("

    Application is OK

    "); - - // Footer - printNavigationFooter(pRequest, pOut); - } - - /** - * Create J2EEDomain MBean's ObjectName and test if MBean registered - * @param pDomainName the name provided by the user - * @param mgmt MEJB - * @param pOut output stream - * @return true if management operation succeeded - */ - private ObjectName accessJ2EEDomain(String pDomainName, Management mgmt, PrintWriter pOut) { - ObjectName onDomain = null; - pOut.println("

    Access the J2EEDomain MBean

    "); - pOut.println("
      "); - - // Get the J2EEDomain MBean's ObjectName - try { - String name = pDomainName + ":j2eeType=J2EEDomain,name=" + pDomainName; - onDomain = ObjectName.getInstance(name); - pOut.println("
    • J2EEDomain object name \"" + name.toString() + "\" created.
    • "); - } catch (Exception e) { - pOut.println("
    • Cannot create object name for J2EEDomain managed object: " + e + "
    • "); - pOut.println("
    "); - return null; - } - // Check that the J2EEDomain MBean registered - try { - boolean exists = mgmt.isRegistered(onDomain); - if (exists) { - pOut.println("
  • Found this J2EEDomain MBean in the current MBean server
  • "); - pOut.println("
    "); - } else { - pOut.println("
  • Can't find this J2EEDomain MBean in the current MBean server
  • "); - pOut.println(""); - return null; - } - } catch (Exception e) { - pOut.println("
  • Error when using this J2EEDomain MBean: " + e + "
  • "); - pOut.println(""); - return null; - } - return onDomain; - } - - /** - * Create a cluster. - * @param pOnDomain - * @param pClusterName - * @param mgmt - * @param pOut - * @return The ObjectName of the cluster's MBean. - */ - private ObjectName createCluster(ObjectName pOnDomain, String pClusterName, Management mgmt, PrintWriter pOut) { - ObjectName on = null; - pOut.println("

    Create the MBean corresponding to the cluster " + pClusterName + "

    "); - pOut.println("
      "); - try { - String[] signature = new String[1]; - signature[0] = "java.lang.String"; - Object[] params = new Object[1]; - params[0] = pClusterName; - String clusterOn = (String) mgmt.invoke(pOnDomain, "createCluster", params, signature); - on = ObjectName.getInstance(clusterOn); - pOut.println("
    • Cluster " + pClusterName + " created.
    • "); - pOut.println("

    "); - } catch (Exception e) { - pOut.println("
  • Cannot create cluster " + pClusterName + ": " + e + "
  • "); - pOut.println(""); - } - return on; - } -} diff --git a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClusterDaemonServlet.java b/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClusterDaemonServlet.java deleted file mode 100644 index c0c635d6fdcc02fed7e8eaa2432947cb6be98b36..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/ClusterDaemonServlet.java +++ /dev/null @@ -1,220 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2006 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id: $ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.j2eemanagement.servlets; - -//import java -import java.io.IOException; -import java.io.PrintWriter; - -import javax.management.ObjectName; -import javax.management.j2ee.Management; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * This servlet is an example which shows how to access the MEJB from a servlet. - * @author JOnAS team - * @author Adriana Danes - */ -public class ClusterDaemonServlet extends J2eemanagementBaseServlet { - - // ---------------------------------------------------------- Constants - /** Parameter */ - static final String PARAM_DOMAIN = "domainName"; - /** Parameter */ - static final String PARAM_DAEMON = "daemonName"; - /** Parameter which gives the name of the server to be started by the daemon */ - static final String PARAM_SERVER = "serverName"; - /** Parameter */ - static final String PARAM_VIEW = "view"; - /** Parameter */ - static final String VIEW_INIT = "init"; - - // ---------------------------------------------------------- Public methods - - /** - * Initialize the servlet. - * @param pConfig See HttpServlet - * @throws ServletException Could not execute request - */ - public void init(ServletConfig pConfig) throws ServletException { - super.init(pConfig); - } - - // ---------------------------------------------------------- Protected - // methods - - /** - * Response to the GET request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException An input or output error is detected when the servlet handles the request - * @throws ServletException Could not execute request - */ - protected void doGet(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException, - ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Response to the POST request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException An input or output error is detected when the servlet handles the request - * @throws ServletException Could not execute request - */ - protected void doPost(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException, - ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Dispatch the response. - * @param pRequest Request - * @param pResponse Response - * @throws IOException An input or output error is detected when the servlet handles the request - */ - protected void dispatch(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException { - - pResponse.setContentType("text/html"); - PrintWriter out = pResponse.getWriter(); - - // Get parameters - String sParamDomain = pRequest.getParameter(PARAM_DOMAIN); - String sParamDaemon = pRequest.getParameter(PARAM_DAEMON); - String sParamServer = pRequest.getParameter(PARAM_SERVER); - String sParamView = pRequest.getParameter(PARAM_VIEW); - - // Dispatching - if ((sParamDomain == null) || (sParamDomain.length() == 0)) { - doViewError("Parameter Domain name not found", pRequest, out); - } else if ((sParamDaemon == null) || (sParamDaemon.length() == 0)) { - doViewError("Parameter Daemon name not found", pRequest, out); - } else if ((sParamServer == null) || (sParamServer.length() == 0)) { - doViewError("Parameter Server name not found", pRequest, out); - } else if ((sParamView == null) || (sParamView.length() == 0) || VIEW_INIT.equals(sParamView)) { - doViewInit(pRequest, out); - doViewManagement(sParamDomain, sParamDaemon, sParamServer, pRequest, out); - } else { - doViewError("Unknown View", pRequest, out); - } - - } - - /** - * Do management opeartions in this view. - * @param pDomainName Name of domain to access - * @param pDaemonName Name of the deamon - * @param pServerName Name of the server to be started by the daemon - * @param pRequest Http request - * @param pOut Printer - */ - protected void doViewManagement(String pDomainName, String pDaemonName, String pServerName, HttpServletRequest pRequest, PrintWriter pOut) { - Management mgmt = getMgmt(); - - // ------------------------------ - // Access to the J2EEDomain MBean - // ------------------------------ - ObjectName onDomain = accessJ2EEDomain(pDomainName, mgmt, pOut); - if (onDomain == null) { - return; - } - - if (isMaster(onDomain, mgmt, pOut)) { - startServer(onDomain, pDaemonName, pServerName, mgmt, pOut); - } - - pOut.println("

    Application is OK

    "); - - // Footer - printNavigationFooter(pRequest, pOut); - } - - /** - * Create J2EEDomain MBean's ObjectName and test if MBean registered - * @param pDomainName the name provided by the user - * @param mgmt MEJB - * @param pOut output stream - * @return true if management operation succeeded - */ - private ObjectName accessJ2EEDomain(String pDomainName, Management mgmt, PrintWriter pOut) { - ObjectName onDomain = null; - pOut.println("

    Access the J2EEDomain MBean

    "); - pOut.println("
      "); - - // Get the J2EEDomain MBean's ObjectName - try { - String name = pDomainName + ":j2eeType=J2EEDomain,name=" + pDomainName; - onDomain = ObjectName.getInstance(name); - pOut.println("
    • J2EEDomain object name \"" + name.toString() + "\" created.
    • "); - } catch (Exception e) { - pOut.println("
    • Cannot create object name for J2EEDomain managed object: " + e + "
    • "); - pOut.println("
    "); - return null; - } - // Check that the J2EEDomain MBean registered - try { - boolean exists = mgmt.isRegistered(onDomain); - if (exists) { - pOut.println("
  • Found this J2EEDomain MBean in the current MBean server
  • "); - pOut.println("
    "); - } else { - pOut.println("
  • Can't find this J2EEDomain MBean in the current MBean server
  • "); - pOut.println(""); - return null; - } - } catch (Exception e) { - pOut.println("
  • Error when using this J2EEDomain MBean: " + e + "
  • "); - pOut.println(""); - return null; - } - return onDomain; - } - /** - * Start a server in domain - * @param pOnDomain J2EEDomain MBean ObjectName - * @param pDaemonName daemon name - currently not used - * @param pServerName server name - * @param mgmt MEJB - * @param pOut output stream - */ - private void startServer(ObjectName pOnDomain, String pDaemonName, String pServerName, Management mgmt, PrintWriter pOut) { - pOut.println("

    Start the server " + pServerName + "

    "); - pOut.println("
      "); - try { - String[] signature = {"java.lang.String"}; - String[] params = {pServerName}; - mgmt.invoke(pOnDomain, "startServer", params, signature); - pOut.println("
    • Server " + pServerName + " started.
    • "); - pOut.println("

    "); - } catch (Exception e) { - pOut.println("
  • Cannot create cluster start the server
  • "); - pOut.println(""); - } - } -} diff --git a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/J2eemanagementBaseServlet.java b/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/J2eemanagementBaseServlet.java deleted file mode 100644 index 74639d83fae4b942e2e9f6dffc895238ce987a13..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/J2eemanagementBaseServlet.java +++ /dev/null @@ -1,232 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2006-2008 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.j2eemanagement.servlets; - -import java.io.PrintWriter; - -import javax.management.ObjectName; -import javax.management.j2ee.Management; -import javax.management.j2ee.ManagementHome; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; - -/** - * - * @author Adriana Danes - * - * Base classe containing common code for the j2eeManagement servlets - */ -public class J2eemanagementBaseServlet extends HttpServlet { - /** Printing constant*/ - static final String APP_TITLE = "J2EE Management sample"; - /** - * Standard J2EEManagement Bean - */ - private Management mgmt = null; - /** - * Naming context - */ - private Context initialContext = null; - - /** - * Header. - * @param pOut Printer - * @param pTitle Title to display - * @param pSubTitle Subtitle to display or null if not - */ - protected void printHeader(PrintWriter pOut, String pTitle, String pSubTitle) { - - pOut.println(""); - pOut.println(""); - pOut.println("" + pTitle); - if (pSubTitle != null) { - pOut.println(" - " + pSubTitle); - } - pOut.println(""); - pOut.println(""); - pOut.println(""); - printHeaderTitle(pOut, pTitle, pSubTitle); - } - /** - * Header title. - * @param pOut Printer - * @param pTitle Title to display - * @param pSubTitle Subtitle to display or null if not - */ - protected void printHeaderTitle(PrintWriter pOut, String pTitle, String pSubTitle) { - - pOut.println(""); - pOut.println(""); - pOut.println(""); - pOut.println(""); - pOut.println(""); - pOut.println(""); - if (pSubTitle != null) { - pOut.println(""); - } - pOut.println(""); - pOut.println("
    \"JOnAS

    " + pTitle + "

    " + pSubTitle + "

    "); - } - - /** - * Footer navigation. - * @param pRequest Http request - * @param pOut Printer - */ - protected void printNavigationFooter(HttpServletRequest pRequest, PrintWriter pOut) { - - // index - String sViewIndex = pRequest.getContextPath(); - - // Display - pOut.print(""); - pOut.print(""); - pOut.print(""); - pOut.println("
    Index
    "); - // Footer - printFooter(pOut); - } - /** - * Footer. - * @param pOut Printer - */ - protected void printFooter(PrintWriter pOut) { - pOut.println(""); - pOut.println(""); - } - - /** - * @param pRequest Client request - * @param pOut Writer for output - */ - protected void doViewInit(HttpServletRequest pRequest, PrintWriter pOut) { - // ----------------------------- - // Get initial context - // ----------------------------- - pOut.println("

    Create Initial naming context

    "); - pOut.println("
      "); - try { - initialContext = new InitialContext(); - pOut.println("
    • Initial context OK
    • "); - } catch (Exception e) { - pOut.print("
    • Cannot get initial context for JNDI: "); - pOut.println(e + "
    • "); - pOut.println("
    "); - printNavigationFooter(pRequest, pOut); - return; - } - pOut.println("
    "); - - // ----------------------------- - // Access to the MEJB - // ----------------------------- - pOut.println("

    Create MEJB

    "); - pOut.println("
      "); - - // Connecting to the MEJB home through JNDI - ManagementHome mgmtHome = null; - try { - mgmtHome = (ManagementHome) PortableRemoteObject.narrow(initialContext.lookup("java:comp/env/ejb/mgmt/MEJB"), - ManagementHome.class); - } catch (Exception e) { - pOut.println("
    • Cannot lookup java:comp/env/ejb/mgmt/MEJB: " + e + "
    • "); - pOut.println("
    "); - printNavigationFooter(pRequest, pOut); - return; - } - - // Management bean creation - try { - mgmt = mgmtHome.create(); - pOut.println("
  • MEJB created
  • "); - } catch (Exception e) { - pOut.println("
  • Cannot create MEJB: " + e + "
  • "); - pOut.println(""); - printNavigationFooter(pRequest, pOut); - return; - } - - pOut.println("
    "); - } - - /** - * Simply View error. - * @param pError Message error - * @param pRequest Http request - * @param pOut Printer - */ - protected void doViewError(String pError, HttpServletRequest pRequest, PrintWriter pOut) { - - // Header - printHeader(pOut, APP_TITLE, "Error"); - // Error message - pOut.println("

    " + pError + "

    "); - // Return - pOut.println("Return"); - // Footer - printFooter(pOut); - } - /** - * @return The management bean - */ - public Management getMgmt() { - return mgmt; - } - /** - * @return The initial naming context - */ - public Context getInitialContext() { - return initialContext; - } - - /** - * Check if the current server is a master - * @param pOnDomain J2EEDomain MBean's ObjectName - * @return true if the server is a master, false otherwise - */ - protected boolean isMaster(ObjectName pOnDomain, Management mgmt, PrintWriter pOut) { - pOut.println("

    Use the J2EEDomain MBean to check if the current server is a master

    "); - pOut.println("
      "); - boolean result = false; - try { - result = ((Boolean) mgmt.getAttribute(pOnDomain, "master")).booleanValue(); - } catch (Exception e) { - pOut.println("
    • Error when using this J2EEDomain MBean: " + e + "
    • "); - pOut.println("
    "); - return false; - } - if (result) { - pOut.println("
  • This is a Master server.
  • "); - } else { - pOut.println("
  • This server is not a Master !
  • "); - } - pOut.println(""); - return result; - } -} diff --git a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/JmsAdminServlet.java b/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/JmsAdminServlet.java deleted file mode 100644 index 024986fd5bfca09d41c99661c9bc855ee3209f09..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/JmsAdminServlet.java +++ /dev/null @@ -1,188 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2006 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.j2eemanagement.servlets; - -//import java -import java.io.IOException; -import java.io.PrintWriter; - -import javax.jms.Topic; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import javax.management.j2ee.Management; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * This servlet is an example which shows how to access the MEJB from a servlet. - * The MEJB is used to invoke JoramAdmin Bean operations. - * @author JOnAS team - * @author Adriana Danes - */ -public class JmsAdminServlet extends J2eemanagementBaseServlet { - /** Parameter */ - static final String PARAM_TOPIC = "topicName"; - /** Parameter */ - static final String PARAM_SERVER_ID = "serverId"; - /** Parameter */ - static final String PARAM_VIEW = "view"; - /** Parameter */ - static final String VIEW_INIT = "init"; - - // ---------------------------------------------------------- Public methods - - /** - * Initialize the servlet. - * @param pConfig See HttpServlet - * @throws ServletException Could not initialize servlet - */ - public void init(ServletConfig pConfig) throws ServletException { - super.init(pConfig); - } - - // ---------------------------------------------------------- Protected - // methods - - /** - * Response to the GET request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException Could not execute request - * @throws ServletException An input or output error is detected when the servlet handles the request - */ - protected void doGet(HttpServletRequest pRequest, HttpServletResponse pResponse) - throws IOException, ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Response to the POST request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException An input or output error is detected when the servlet handles the request - * @throws ServletException Could not execute request - */ - protected void doPost(HttpServletRequest pRequest, HttpServletResponse pResponse) - throws IOException, ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Dispatch the response. - * @param pRequest Request - * @param pResponse Response - * @throws IOException An input or output error is detected when the servlet handles the request - */ - protected void dispatch(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException { - - pResponse.setContentType("text/html"); - PrintWriter out = pResponse.getWriter(); - - // Get parameters - String sParamTopic = pRequest.getParameter(PARAM_TOPIC); - String sParamServerId = pRequest.getParameter(PARAM_SERVER_ID); - String sParamView = pRequest.getParameter(PARAM_VIEW); - - // Dispatching - if ((sParamTopic == null) || (sParamTopic.length() == 0)) { - doViewError("Parameter Topic name not found", pRequest, out); - } else if ((sParamServerId == null) || (sParamServerId.length() == 0)) { - doViewError("Parameter Joram server id not found", pRequest, out); - } else if ((sParamView == null) || (sParamView.length() == 0) || VIEW_INIT.equals(sParamView)) { - doViewInit(pRequest, out); - doViewManagement(sParamTopic, sParamServerId, pRequest, out); - } else { - doViewError("Unknown View", pRequest, out); - } - - } - - - - /** - * View init MEJB and access to MBEans J2EEDomain and J2EEServer. - * @param pTopicName Name of topic to create - * @param pServerId Joram server Id - * @param pRequest Http request - * @param pOut Printer - */ - protected void doViewManagement(String pTopicName, String pServerId, HttpServletRequest pRequest, PrintWriter pOut) { - - // ------------------------------------------------------------- - // Use the Joram MBean via the MEJB to make jms admin operations - // ------------------------------------------------------------- - pOut.println("

    Get Joram admin MBean

    "); - pOut.println("
      "); - Management mgmt = getMgmt(); - - String joramON = getInitParameter("mbeanName"); - if (joramON == null) { - joramON = "joramClient:type=JoramAdmin"; - } else { - pOut.println("
    • Use servlet init param 'mbeanName': " + joramON + "
    • "); - } - ObjectName joramOn = null; - try { - joramOn = ObjectName.getInstance(joramON); - } catch (MalformedObjectNameException e1) { - pOut.println("
    • Couldn't get Joram MBean
    • " + e1); - pOut.println("
    "); - printNavigationFooter(pRequest, pOut); - return; - } - pOut.println("
    "); - pOut.println("

    Use Joram admin MBean

    "); - pOut.println("
      "); - - try { - if (mgmt.isRegistered(joramOn)) { - Object[] asParam = {new Integer(pServerId), pTopicName }; - String[] asSignature = { - "int", "java.lang.String" - }; - String op = "createTopic"; - Topic topic = (Topic) mgmt.invoke(joramOn, op, asParam, asSignature); - getInitialContext().rebind(pTopicName, topic); - pOut.println("
    • Topic " + pTopicName + " created on server " + pServerId + "
    • "); - } - } catch (Exception e) { - pOut.println("
    • Could not use use Joram MBean to administer jms
    • " + e); - pOut.println("
    "); - printNavigationFooter(pRequest, pOut); - return; - } - - pOut.println("
    "); - - pOut.println("

    Application is OK

    "); - - // Footer - printNavigationFooter(pRequest, pOut); - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MgmtServlet.java b/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MgmtServlet.java deleted file mode 100644 index 601918b7107a1a93b3491bf567adabf759629d5f..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MgmtServlet.java +++ /dev/null @@ -1,849 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.j2eemanagement.servlets; - -//import java -import java.io.IOException; -import java.io.PrintWriter; -import java.net.MalformedURLException; -import java.rmi.RemoteException; -import java.util.List; - -import javax.management.MBeanException; -import javax.management.MBeanServerConnection; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import javax.management.j2ee.ListenerRegistration; -import javax.management.j2ee.Management; -import javax.management.j2ee.ManagementHome; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * This servlet is an example which shows how to access the MEJB from a servlet. - * @author JOnAS team - * @author Adriana Danes - * @author Michel-Ange Anton - */ -public class MgmtServlet extends J2eemanagementBaseServlet { - - // ---------------------------------------------------------- Constants - /** Printing constant*/ - static final String APP_TITLE_LARGE = "J2EE Management sample with Servlet accessing the MEJB"; - /** Printing constant*/ - static final String APP_TITLE = "J2EE Management sample"; - /** Parameter */ - static final String PARAM_DOMAIN = "domainName"; - /** Parameter */ - static final String PARAM_VIEW = "view"; - /** Parameter */ - static final String VIEW_INIT = "init"; - /** Parameter */ - static final String VIEW_NOTIFICATIONS = "notifications"; - /** Parameter */ - static final String VIEW_OTHER = "other"; - /** Deploable module types */ - static final String JAR = "jar"; - /** Deploable module types */ - static final String WAR = "war"; - /** Deploable module types */ - static final String RAR = "rar"; - /** Deploable module types */ - static final String EAR = "ear"; - /** - * Listener object - */ - private MyListener mListener = null; - - // ---------------------------------------------------------- Public methods - - /** - * Initialize the servlet. - * @param pConfig See HttpServlet - * @throws ServletException - */ - public void init(ServletConfig pConfig) throws ServletException { - super.init(pConfig); - // Initialize variables - mListener = null; - } - - // ---------------------------------------------------------- Protected - // methods - - /** - * Response to the GET request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException - * @throws ServletException - */ - protected void doGet(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException, - ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Response to the POST request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException - * @throws ServletException - */ - protected void doPost(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException, - ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Dispatch the response. - * @param pRequest Request - * @param pResponse Response - * @throws IOException - */ - protected void dispatch(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException { - - pResponse.setContentType("text/html"); - PrintWriter out = pResponse.getWriter(); - - // Get parameters - String sParamDomain = pRequest.getParameter(PARAM_DOMAIN); - String sParamView = pRequest.getParameter(PARAM_VIEW); - - // Dispatching - if ((sParamDomain == null) || (sParamDomain.length() == 0)) { - doViewError("Parameter domain not found", pRequest, out); - } else if ((sParamView == null) || (sParamView.length() == 0) || VIEW_INIT.equals(sParamView)) { - doViewInit(sParamDomain, pRequest, out); - } else if (VIEW_NOTIFICATIONS.equals(sParamView)) { - doViewNotifications(out); - } else if (VIEW_OTHER.equals(sParamView)) { - doViewOther(sParamDomain, pRequest, out); - } else { - doViewError("Unknown View", pRequest, out); - } - - } - - - /** - * Footer navigation. - * @param pDomainName Name of domain - * @param pRequest Http request - * @param pOut Printer - * @param pPrevious Previous view - * @param pNext Next view - */ - protected void printNavigationFooter(String pDomainName, HttpServletRequest pRequest, PrintWriter pOut, - String pPrevious, String pNext) { - - // index - String sViewIndex = pRequest.getContextPath(); - // Notifications - String sViewNotifications = pRequest.getRequestURI() + "?" + PARAM_DOMAIN + "=" + pDomainName + "&" - + PARAM_VIEW + "=" + VIEW_NOTIFICATIONS; - // Previous View - String sPrevView = null; - if (pPrevious != null) { - sPrevView = pRequest.getRequestURI() + "?" + PARAM_DOMAIN + "=" + pDomainName + "&" + PARAM_VIEW + "=" - + pPrevious; - } - // Next View - String sNextView = null; - if (pNext != null) { - sNextView = pRequest.getRequestURI() + "?" + PARAM_DOMAIN + "=" + pDomainName + "&" + PARAM_VIEW + "=" - + pNext; - } - - // Display - pOut.print(""); - pOut.print(""); - pOut.print(""); - pOut.print(""); - if (sPrevView != null) { - pOut.println(""); - } - if (sNextView != null) { - pOut.println(""); - } - pOut.println("
    Index Notifications Previous Next
    "); - // Footer - printFooter(pOut); - } - - /** - * View init MEJB and access to MBeans J2EEDomain and J2EEServer. - * @param pDomainName Name of domain to access - * @param pRequest Http request - * @param pOut Printer - */ - protected void doViewInit(String pDomainName, HttpServletRequest pRequest, PrintWriter pOut) { - - // Header - //printHeader(pOut, APP_TITLE_LARGE, "Init"); - - // ----------------------------- - // Get initial context - // ----------------------------- - pOut.println("

    Initial context

    "); - pOut.println("
      "); - Context initialContext = null; - try { - initialContext = new InitialContext(); - pOut.println("
    • Initial context OK
    • "); - } catch (Exception e) { - pOut.print("
    • Cannot get initial context for JNDI: "); - pOut.println(e + "
    • "); - pOut.println("
    "); - return; - } - pOut.println("
    "); - - // ----------------------------- - // Access to the MEJB - // ----------------------------- - pOut.println("

    Create MEJB

    "); - pOut.println("
      "); - - // Connecting to the MEJB home through JNDI - ManagementHome mgmtHome = null; - try { - mgmtHome = (ManagementHome) PortableRemoteObject.narrow(initialContext.lookup("java:comp/env/ejb/mgmt/MEJB"), - ManagementHome.class); - } catch (Exception e) { - pOut.println("
    • Cannot lookup java:comp/env/ejb/mgmt/MEJB: " + e + "
    • "); - pOut.println("
    "); - return; - } - - // Management bean creation - Management mgmt = null; - - try { - mgmt = mgmtHome.create(); - pOut.println("
  • MEJB created
  • "); - } catch (Exception e) { - pOut.println("
  • Cannot create MEJB: " + e + "
  • "); - return; - } - pOut.println("
    "); - // ------------------------------ - // Access to the J2EEDomain MBean - // ------------------------------ - - ObjectName onDomain = accessJ2EEDomain(pDomainName, mgmt, pOut); - if (onDomain == null) { - return; - } - - boolean master = checkIfMaster(onDomain, mgmt, pOut); - - // ----------------------------------------------------- - // Check for J2EEServer MBeans in the current J2EEDomain - // ----------------------------------------------------- - ObjectName onServer = accessJ2EEServer(onDomain, mgmt, pOut); - if (onServer == null) { - return; - } - - // ------------------------------ - // Test domain deployment - // ------------------------------ - if (master) { - pOut.println("

    Try to manage the current domain: deploy/undeploy on all servers in the domain

    "); - pOut.println("
      "); - pOut.println("
    • Use the J2EEDomain object name: \"" + onDomain.toString() + "\"
    • "); - String[] serverNames = null; - try { - serverNames = (String[]) mgmt.getAttribute(onDomain, "serverNames"); - } catch (Exception e) { - pOut.println("
    • Can't get serverNames attribute: " + e + "
    • "); - } - if (serverNames.length > 1) { - String fileName = null; - // Use deploy, undeploy - // (suppose sb.jar was installed under JONAS_BASE/ejbjars directory) - fileName = "sb.jar"; - deployModuleWithTarget(JAR, onDomain, serverNames, mgmt, fileName, pOut); - - // Use deploy, undeploy - // (suppose earsample.ear was installed under JONAS_BASE/apps directory) - fileName = "earsample.ear"; - deployModuleWithTarget(EAR, onDomain, serverNames, mgmt, fileName, pOut); - } else { - pOut.println("
    • Can't find server names in this domain
    • "); - } - pOut.println("

    "); - } else { - // ------------------------------ - // Test current server management - // ------------------------------ - pOut.println("

    Try to manage the current server

    "); - pOut.println("
      "); - pOut.println("
    • Using the J2EEServer object name: \"" + onServer.toString() + "\"
    • "); - - // Use deployJar, unDeployJar, isJarDeployed management opearations - // (suppose sb.jar was installed under JONAS_BASE/ejbjars directory) - String jarFileName = System.getProperty("jonas.base")+"/ejbjars/"+"sb.jar"; - deployJarModule(onServer, mgmt, jarFileName, pOut); - - // Use deployEar, unDeployEar, isEarDeployed management opearations - // (suppose earsample.ear was installed under JONAS_BASE/apps directory) - String earFileName = System.getProperty("jonas.base")+"/apps/"+"earsample.ear"; - deployEarModule(onServer, mgmt, earFileName, pOut); - - // (suppose autoload/earsample.ear was installed under JONAS_BASE/apps directory) - earFileName = "autoload/earsample.ear"; - deployEarModule(onServer, mgmt, earFileName, pOut); - - // Use deployRar, unDeployRar, isRarDeployed - // (suppose JDBC connection rar files installed under JONAS_BASE/rars directory) - /* - String rarFileName = "autoload/JOnAS_jdbcCP.rar"; - deployRarModule(onServer, mgmt, rarFileName, pOut); - */ - pOut.println("

    "); - } - // ----------------------------- - // Test Event Listener support - // ----------------------------- - - pOut.println("

    Register an event listener

    "); - pOut.println("
      "); - - // Test Monolog JMXHandler notifications - // ------------------------------------- - // Set this to true if you test the JMXHandler notifications ! - boolean testLogNotifs = true; - - String logServName = new String(pDomainName + ":type=service,name=log"); - ObjectName logServOn = null; - try { - logServOn = ObjectName.getInstance(logServName); - } catch (MalformedObjectNameException e1) { - pOut.println("
    • Can't create ObjectName for log service MBean: " + e1 + "
    • "); - testLogNotifs = false; - pOut.println("
    "); - } - if (testLogNotifs) { - boolean existsLog; - try { - existsLog = mgmt.isRegistered(logServOn); - if (existsLog) { - pOut.println("
  • Found log service MBean
  • "); - } else { - pOut.println("
  • Can't find log service MBean
  • "); - testLogNotifs = existsLog; - } - } catch (RemoteException e) { - pOut.println("
  • Failed to find the log service MBean
  • "); - } - } - - if (mListener == null) { - if (!testLogNotifs) { - mListener = new MyListener(); - pOut.println("
  • MyListener created
  • "); - } else { - mListener = new MonologListener(); - pOut.println("
  • MonologListener created
  • "); - } - } - - String sHandler = "MEJBTester"; - // Get the ListenerRegistration object - try { - pOut.println("
  • Create ListenerRegistration
  • "); - ListenerRegistration lr = mgmt.getListenerRegistry(); - pOut.println("
  • ListenerRegistration created
  • "); - if (lr != null) { - if (testLogNotifs) { - pOut.println("
  • Add listener for Monolog notifications (" + logServOn.toString() + ")
  • "); - lr.addNotificationListener(logServOn, mListener, null, sHandler); - } else { - pOut.println("
  • Add listener on J2EEServer (" + onServer.toString() + ")
  • "); - lr.addNotificationListener(onServer, mListener, null, sHandler); - } - pOut.println("
  • Notification Listener added
  • "); - String sViewNotifications = pRequest.getRequestURI() + "?" + PARAM_DOMAIN + "=" + pDomainName + "&" - + PARAM_VIEW + "=" + VIEW_NOTIFICATIONS; - pOut.println("See list of notifications"); - pOut.println(""); - } else { - pOut.println("
  • Can't add remote listener for the moment
  • "); - pOut.println(""); - } - } catch (Exception e) { - pOut.println("
  • Can't add notification listener on " + onServer.toString() + " : " + e + "
  • "); - } - - pOut.println("

    Application is OK

    "); - - // Footer - printNavigationFooter(pDomainName, pRequest, pOut, null, VIEW_OTHER); - } - - /** - * Header. - * @param pOut Printer - * @param pTitle Title to display - * @param pSubTitle Subtitle to display or null if not - */ - protected void printHeaderAutoRefresh(PrintWriter pOut, String pTitle, String pSubTitle) { - - pOut.println(""); - pOut.println(""); - pOut.println("" + pTitle + ""); - pOut.println(""); - pOut.println(""); - pOut.println(""); - printHeaderTitle(pOut, pTitle, pSubTitle); - } - /** - * View notifications. - * @param pOut Printer - */ - protected void doViewNotifications(PrintWriter pOut) { - - // Header - printHeaderAutoRefresh(pOut, APP_TITLE, "Notifications"); - pOut.println("

    List of notifications

    "); - - // Verify listener - if (mListener == null) { - pOut.println("Listener not found !"); - } else { - // Display notifications - List list = mListener.getListNotifications(); - if (list.size() > 0) { - pOut.println("
      "); - for (int i = 0; i < list.size(); i++) { - pOut.println("
    1. " + list.get(i) + "
    2. "); - } - pOut.println("
    "); - } else { - pOut.println("No notifications, the list is empty"); - } - } - - // Footer - printFooter(pOut); - } - - /** - * View example. - * @param pDomainName Name of domain to access - * @param pRequest Http request - * @param pOut Printer - */ - protected void doViewOther(String pDomainName, HttpServletRequest pRequest, PrintWriter pOut) { - - // Header - printHeader(pOut, APP_TITLE, "Other"); - - pOut.println("

    Other

    "); - - // Footer - printNavigationFooter(pDomainName, pRequest, pOut, VIEW_INIT, null); - } - - /** - * Create J2EEDomain MBean's ObjectName and test if MBean registered - * @param pDomainName the name provided by the user - * @param mgmt MEJB - * @param pOut output stream - * @return true if management operation succeeded - */ - private ObjectName accessJ2EEDomain(String pDomainName, Management mgmt, PrintWriter pOut) { - ObjectName onDomain = null; - pOut.println("

    Access the J2EEDomain MBean

    "); - pOut.println("
      "); - - // Get the J2EEDomain MBean's ObjectName - try { - String name = pDomainName + ":j2eeType=J2EEDomain,name=" + pDomainName; - onDomain = ObjectName.getInstance(name); - pOut.println("
    • J2EEDomain object name created: \"" + name.toString() + "\"
    • "); - } catch (Exception e) { - pOut.println("
    • Cannot create object name for J2EEDomain managed object: " + e + "
    • "); - pOut.println("
    "); - return null; - } - // Check that the J2EEDomain MBean registered - try { - boolean exists = mgmt.isRegistered(onDomain); - if (exists) { - pOut.println("
  • Found this J2EEDomain MBean in the current MBean server
  • "); - } else { - pOut.println("
  • Can't find this J2EEDomain MBean in the current MBean server
  • "); - pOut.println(""); - return null; - } - } catch (Exception e) { - pOut.println("
  • Error when using this J2EEDomain MBean: " + e + "
  • "); - pOut.println(""); - return null; - } - return onDomain; - } - - /** - * - * @param onDomain J2EEDomain MBean ObjectName - * @param mgmt Management EJB - * @param pOut output stream - * @return true if the current server is a master - */ - private boolean checkIfMaster(ObjectName onDomain, Management mgmt, PrintWriter pOut) { - try { - Boolean master = (Boolean) mgmt.getAttribute(onDomain, "master"); - if (master.booleanValue()) { - pOut.println("
  • The current server is a management master
  • "); - } - pOut.println(""); - return master.booleanValue(); - } catch (Exception e) { - pOut.println("
  • Error when using this J2EEDomain MBean: " + e + "
  • "); - } - pOut.println(""); - return false; - } - - /** - * Get a registered J2EEServer MBean - * @param onDomain J2EEDomain MBean's ObjectName - * @param mgmt MEJB - * @param pOut output stream - * @return true if management operation succeeded - */ - private ObjectName accessJ2EEServer(ObjectName onDomain, Management mgmt, PrintWriter pOut) { - pOut.println("

    Access the J2EEServer MBeans

    "); - pOut.println("
      "); - ObjectName onServer = null; - String[] listServers = null; - try { - listServers = (String[]) mgmt.getAttribute(onDomain, "servers"); - } catch (Exception e) { - pOut.println("
    • Cant' access the " + onDomain + " MBean's servers attribute
    • "); - pOut.println("

    "); - return null; - } - int nbServers = listServers.length; - if (nbServers == 0) { - pOut.println("
  • No J2EEServer MBeans in the " + onDomain + " MBean's servers list (problem with domain management !!)
  • "); - pOut.println("
    "); - return null; - } else { - if (nbServers == 1) { - String serverOn = (String) listServers[0]; - try { - onServer = ObjectName.getInstance(serverOn); - if (mgmt.isRegistered(onServer)) { - pOut.println("
  • Found one J2EEServer MBean registered in the current MBean server. Its OBJECT_NAME is: \"" + serverOn + "\"
  • "); - pOut.println("
    "); - return onServer; - } else { - pOut.println("
  • Can't find the J2EEServer MBean having OBJECT_NAME: " + serverOn + " in the current MBean server
  • "); - pOut.println("
    "); - return null; - } - } catch (Exception e) { - pOut.println("
  • Error witht OBJECT_NAME " + serverOn + ": " + e + "
  • "); - pOut.println("
    "); - return null; - } - } else { - pOut.println("
  • List of J2EEServer MBeans in the \"" + onDomain + "\" MBean's servers list:
  • "); - pOut.println("
      "); - for (int i = 0; i < nbServers; i++) { - String serverOn = listServers[i]; - ObjectName on = null; - try { - on = ObjectName.getInstance(serverOn); - } catch (MalformedObjectNameException e) { - pOut.print("
    1. Error witht OBJECT_NAME " + serverOn + ": " + e + "
    2. "); - continue; - } - pOut.print("
    3. \"" + serverOn + "\". "); - boolean isRegisterdServer = false; - try { - isRegisterdServer = mgmt.isRegistered(on); - } catch (RemoteException e) { - pOut.println("
        "); - pOut.println("
      • Error witht OBJECT_NAME " + serverOn + ": " + e + "
      • "); - pOut.println("
      "); - pOut.println("
    4. "); - continue; - } - if (isRegisterdServer) { - pOut.print("This MBean is registered in the current MBean server. It should correspond to the current server."); - pOut.println(""); - onServer = on; - } else { - pOut.println("This MBean is not registered in the current MBean server. It could correspond to a remote server."); - pOut.println(""); - pOut.println("
        "); - String name = on.getKeyProperty("name"); - String[] signature = {"java.lang.String"}; - String[] params = new String[1]; - params[0] = name; - String[] urls = null; - try { - urls = (String[]) mgmt.invoke(onDomain, "getConnectorServerURLs", params, signature); - } catch (Exception e) { - pOut.println("
      • Could not found a connector server URL for server " + name + ".
      • "); - pOut.println("
      "); - pOut.println(""); - continue; - } - if (urls == null) { - pOut.println("
    5. Could not found a connector server URL for server " + name + "
    6. "); - pOut.println(""); - pOut.println(""); - continue; - } - for (int j = 0; j < urls.length; j++) { - String url = urls[j]; - pOut.print("
    7. Try to connect to server " + name + " using connector server URL: " + url + "
    8. "); - MBeanServerConnection connection = createConnection(url); - if (connection != null) { - // Use connection directly instead of using MEJB - try { - if (connection.isRegistered(on)) { - pOut.print("
    9. Found MBean having OBJECT_NAME \"" + serverOn + "\" registered in the connected MBean server."); - } else { - pOut.print("
    10. The MBean having OBJECT_NAME \"" + serverOn + "\" is not registered in the connected MBean server."); - } - } catch (IOException ioe) { - pOut.print("
    11. Exception when trying to use connection: " + ioe.toString()); - } - } else { - pOut.print("
    12. Could not establish connection with server " + name + ". Server may be stopped or URL not valid.
    13. "); - } - } - pOut.println(""); - pOut.println(""); - } - } - pOut.println("
    "); - pOut.println("
    "); - return onServer; - } - } - } - - private MBeanServerConnection createConnection(String connectorServerURL) { - MBeanServerConnection connection; - // create a connector client for the connector server at the given url - JMXConnector connector = null; - try { - JMXServiceURL url = new JMXServiceURL(connectorServerURL); - connector = JMXConnectorFactory.newJMXConnector(url, null); - connector.connect(null); - connection = connector.getMBeanServerConnection(); - } catch (MalformedURLException e) { - // there is no provider for the protocol in url - connection = null; - } catch (IOException e) { - // connector client or connection cannot be made because of a communication problem. - connection = null; - } catch (java.lang.SecurityException e) { - // connection cannot be made for security reasons - connection = null; - } - return connection; - } - - /** - * Deploy if not already deployed, undeploy otherwise, a given jar file. - * @param onServer ObjectName of the J2EEServer MBean on which the mananagement operation has to be applied - * @param mgmt MEJB - * @param jarFileName name of the file to be deployed/undeployed - * @param pOut output stream - */ - private void deployJarModule(ObjectName onServer, Management mgmt, String jarFileName, PrintWriter pOut) { - String[] signature = {"java.lang.String"}; - String[] params = new String[1]; - params[0] = jarFileName; - pOut.println("
  • Test if " + jarFileName + " deployed
  • "); - boolean isDeployed = false; - try { - isDeployed = ((Boolean) mgmt.invoke(onServer, "isDeployed", params, signature)).booleanValue(); - } catch (Exception e) { - pOut.println("
  • Problem when invoking isDeployed management operation: " + e.toString()); - } - if (!isDeployed) { - pOut.println("
  • Try to deploy " + jarFileName + " !
  • "); - try { - String deployedObjectName = (String) mgmt.invoke(onServer, "deploy", params, signature); - pOut.println("
  • The Object Name of the deployed J2EEModule is: \"" + deployedObjectName + "\".
  • "); - } catch (MBeanException mbe) { - pOut.println("
  • Could not deploy " + jarFileName + " because of exception: " - + mbe.getTargetException().toString()); - } catch (Exception e) { - pOut.println("
  • Could not deploy " + jarFileName + " because of exception: " + e.toString() + "
  • "); - } - } else { - pOut.println("
  • Try to un-deploy " + jarFileName + " !
  • "); - try { - mgmt.invoke(onServer, "undeploy", params, signature); - pOut.println("
  • Done undeploy.>"); - } catch (MBeanException mbe) { - pOut.println("
  • Could not undeploy " + jarFileName + " because of exception: " - + mbe.getTargetException().toString()); - } catch (Exception e) { - pOut.println("
  • Could not undeploy " + jarFileName + " because of exception: " + e.toString() + "
  • "); - } - } - } - /** - * Deploy if not already deployed, undeploy otherwise, a given ear file. - * @param onServer ObjectName of the J2EEServer MBean on which the mananagement operation has to be applied - * @param mgmt MEJB - * @param earFileName name of the file to be deployed/undeployed - * @param pOut output stream - */ - private void deployEarModule(ObjectName onServer, Management mgmt, String earFileName, PrintWriter pOut) { - String[] signature = {"java.lang.String"}; - String[] params = new String[1]; - params[0] = earFileName; - pOut.println("
  • Test if " + earFileName + " deployed
  • "); - boolean isDeployed = false; - try { - isDeployed = ((Boolean) mgmt.invoke(onServer, "isDeployed", params, signature)).booleanValue(); - } catch (Exception e) { - pOut.println("
  • Problem when invoking isEarDeployed management operation: " + e.toString()); - } - if (!isDeployed) { - pOut.println("
  • Try to deploy " + earFileName + " !
  • "); - try { - String deployedObjectName = (String) mgmt.invoke(onServer, "deploy", params, signature); - pOut.println("
  • The Object Name of the deployed J2EEModule is: \"" + deployedObjectName + "\".
  • "); - } catch (MBeanException mbe) { - pOut.println("
  • Could not deploy " + earFileName + " because of exception: " - + mbe.getTargetException().toString()); - } catch (Exception e) { - pOut.println("
  • Could not deploy " + earFileName + " because of exception: " + e.toString() + "
  • "); - } - } else { - pOut.println("
  • Try to un-deploy " + earFileName + " !
  • "); - try { - mgmt.invoke(onServer, "undeploy", params, signature); - pOut.println("
  • Done undeploy.>"); - } catch (MBeanException mbe) { - pOut.println("
  • Could not undeploy " + earFileName + " because of exception: " - + mbe.getTargetException().toString()); - } catch (Exception e) { - pOut.println("
  • Could not undeploy " + earFileName + " because of exception: " + e.toString() + "
  • "); - } - } - } - - /** - * Deploy if not already deployed, undeploy otherwise, a given rar file. - * @param onServer ObjectName of the J2EEServer MBean on which the mananagement operation has to be applied - * @param mgmt MEJB - * @param rarFileName name of the file to be deployed/undeployed - * @param pOut output stream - */ - private void deployRarModule(ObjectName onServer, Management mgmt, String rarFileName, PrintWriter pOut) { - String[] signature = {"java.lang.String"}; - String[] params = new String[1]; - params[0] = rarFileName; - pOut.println("
  • Test if " + rarFileName + " deployed
  • "); - boolean isDeployed = false; - try { - isDeployed = ((Boolean) mgmt.invoke(onServer, "isDeployed", params, signature)).booleanValue(); - } catch (Exception e) { - pOut.println("
  • Problem when invoking isRarDeployed management operation: " + e.toString()); - } - if (!isDeployed) { - pOut.println("
  • Try to deploy " + rarFileName + " !
  • "); - try { - String deployedObjectName = (String) mgmt.invoke(onServer, "deploy", params, signature); - pOut.println("
  • The Object Name of the deployed J2EEModule is: \"" + deployedObjectName + "\".
  • "); - } catch (MBeanException mbe) { - pOut.println("
  • Could not deploy " + rarFileName + " because of exception: " - + mbe.getTargetException().toString()); - } catch (Exception e) { - pOut.println("
  • Could not deploy " + rarFileName + " because of exception: " + e.toString() + "
  • "); - } - } else { - pOut.println("
  • Try to un-deploy " + rarFileName + " !
  • "); - try { - mgmt.invoke(onServer, "undeploy", params, signature); - pOut.println("
  • Done undeploy.>"); - } catch (MBeanException mbe) { - pOut.println("
  • Could not undeploy " + rarFileName + " because of exception: " - + mbe.getTargetException().toString()); - } catch (Exception e) { - pOut.println("
  • Could not undeploy " + rarFileName + " because of exception: " + e.toString() + "
  • "); - } - } - } - - /** - * Deploy if not already deployed, undeploy otherwise, a given jar file. - * @param moduleType can be JAR, WAR, RAR or EAR - * @param onDomain J2EEDomain MBean ObjectName - * @param target names of the servers on which the mananagement operation has to be applied - * @param mgmt MEJB - * @param fileName name of the file to be deployed/undeployed - * @param pOut output stream - */ - private void deployModuleWithTarget(String moduleType, ObjectName onDomain, String[] target, Management mgmt, String fileName, PrintWriter pOut) { - String[] signature = {"[Ljava.lang.String;", "java.lang.String"}; - Object[] params = new Object[2]; - params[0] = target; - params[1] = fileName; - try { - String operationName = "deploy"; - pOut.println("
  • Try to " + operationName + " " + fileName + " on multiple target !
  • "); - mgmt.invoke(onDomain, operationName, params, signature); - operationName = "undeploy"; - pOut.println("
  • Try to " + operationName + " " + fileName + " on multiple target !
  • "); - mgmt.invoke(onDomain, operationName, params, signature); - } catch (MBeanException mbe) { - pOut.println("
  • Could not deploy/undeploy " + fileName + " because of exception: " - + mbe.getTargetException().toString()); - } catch (Exception e) { - pOut.println("
  • Could not deploy " + fileName + " because of exception: " + e.toString() + "
  • "); - } - } -} diff --git a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MonologListener.java b/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MonologListener.java deleted file mode 100644 index 946111a74dd81e82db3531a1293057fd147530d6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MonologListener.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id: $ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.j2eemanagement.servlets; - -import java.util.ArrayList; -import java.util.Date; -import java.util.logging.LogRecord; - -import javax.management.Notification; - -/** - * @author Adriana Danes - */ -public class MonologListener extends MyListener { - - private final static String monologNotifType = "Monolog.JMXHandler.Log"; - -// ---------------------------------------------------------- Public methods - /** - * Create a new element and add it to the list. - * @param notification received notification - * @param handback received handback - */ - public void handleNotification(Notification notification, Object handback) { - String type = notification.getType(); - if (type.equals(monologNotifType)) { - String message = notification.getMessage(); - LogRecord record = (LogRecord) notification.getUserData(); - String timestamp = new Date(record.getMillis()).toString(); - String loggerName = record.getLoggerName(); - String level = record.getLevel().toString(); - String sourceClass = record.getSourceClassName(); - String sourceMethod = record.getSourceMethodName(); - String resourceBundle = record.getResourceBundleName(); - StringBuffer buf = new StringBuffer(); - buf.append("Notification message = "); - buf.append(message); - buf.append('\n'); - - buf.append("Timestamp = "); - buf.append(timestamp); - buf.append('\n'); - - buf.append("LoggerName = "); - buf.append(loggerName); - buf.append('\n'); - - buf.append("Level = "); - buf.append(level); - buf.append('\n'); - - buf.append("SourceClass = "); - buf.append(sourceClass); - buf.append('\n'); - String s = new String(buf); - getListNotifications().add(s); - } else { - super.handleNotification(notification, handback); - } - } - - -} diff --git a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MyListener.java b/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MyListener.java deleted file mode 100644 index 3774c529e7cbdc5fc8731299203a57c314759ec4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/MyListener.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.j2eemanagement.servlets; - -import java.util.ArrayList; - -import javax.management.NotificationListener; -import javax.management.Notification; - -/** - * @author Adriana Danes - * @author Michel-Ange Anton - */ -public class MyListener implements NotificationListener { - -// ---------------------------------------------------------- Properties variables - /** - * Each element in this list contains a received notification + infos about it - */ - private ArrayList listNotifications = null; - -// ---------------------------------------------------------- Constructor - /** - * Create list. - */ - public MyListener() { - listNotifications = new ArrayList(); - } - -// ---------------------------------------------------------- Public methods - /** - * Create a new element and add it to the list. - * @param notification received notification - * @param handback received handback - */ - public void handleNotification(Notification notification, Object handback) { - String s = "Notification = " + notification.toString() - + ", Handback = " + handback.toString(); - listNotifications.add(s); - } - -// ---------------------------------------------------------- Properties methods - /** - * @return notifications list - */ - public ArrayList getListNotifications() { - return listNotifications; - } - -} diff --git a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/NewServerMgmtServlet.java b/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/NewServerMgmtServlet.java deleted file mode 100644 index 10b688d08c9b4458ac98fec07690c943375ff7e3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j2eemanagement/src/org/objectweb/j2eemanagement/servlets/NewServerMgmtServlet.java +++ /dev/null @@ -1,323 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2006 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.j2eemanagement.servlets; - -//import java -import java.io.IOException; -import java.io.PrintWriter; -import java.net.MalformedURLException; - -import javax.management.MBeanServerConnection; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import javax.management.j2ee.Management; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * This servlet is an example which shows how to access the MEJB from a servlet. - * @author JOnAS team - * @author Adriana Danes - */ -public class NewServerMgmtServlet extends J2eemanagementBaseServlet { - - // ---------------------------------------------------------- Constants - /** Parameter */ - static final String PARAM_DOMAIN = "domainName"; - /** Parameter */ - static final String PARAM_CLUSTER = "clusterName"; - /** Parameter */ - static final String PARAM_SERVER = "serverName"; - /** Parameter */ - static final String PARAM_SERVER_URL = "serverURL"; - /** Parameter */ - static final String PARAM_VIEW = "view"; - /** Parameter */ - static final String VIEW_INIT = "init"; - // ---------------------------------------------------------- Public methods - - /** - * Initialize the servlet. - * @param pConfig See HttpServlet - * @throws ServletException - */ - public void init(ServletConfig pConfig) throws ServletException { - super.init(pConfig); - } - - // ---------------------------------------------------------- Protected - // methods - - /** - * Response to the GET request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException - * @throws ServletException - */ - protected void doGet(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException, - ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Response to the POST request. - * @param pRequest See HttpServlet - * @param pResponse See HttpServlet - * @throws IOException - * @throws ServletException - */ - protected void doPost(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException, - ServletException { - dispatch(pRequest, pResponse); - } - - /** - * Dispatch the response. - * @param pRequest Request - * @param pResponse Response - * @throws IOException - */ - protected void dispatch(HttpServletRequest pRequest, HttpServletResponse pResponse) throws IOException { - - pResponse.setContentType("text/html"); - PrintWriter out = pResponse.getWriter(); - - // Get parameters - String sParamDomain = pRequest.getParameter(PARAM_DOMAIN); - String sParamCluster = pRequest.getParameter(PARAM_CLUSTER); - String sParamView = pRequest.getParameter(PARAM_VIEW); - String sParamServer = pRequest.getParameter(PARAM_SERVER); - String sParamServerURL = pRequest.getParameter(PARAM_SERVER_URL); - - // Dispatching - if ((sParamDomain == null) || (sParamDomain.length() == 0)) { - doViewError("Parameter Domain name not found", pRequest, out); - } else if ((sParamCluster == null) || (sParamCluster.length() == 0)) { - doViewError("Parameter Cluster name not found", pRequest, out); - } else if ((sParamServer == null) || (sParamServer.length() == 0)) { - doViewError("Parameter Server name not found", pRequest, out); - } else if ((sParamServerURL == null) || (sParamServerURL.length() == 0)) { - doViewError("Parameter Connector server url not found", pRequest, out); - } else if ((sParamView == null) || (sParamView.length() == 0) || VIEW_INIT.equals(sParamView)) { - doViewInit(pRequest, out); - doViewManagement(sParamDomain, sParamCluster, sParamServer, sParamServerURL, pRequest, out); - } else { - doViewError("Unknown View", pRequest, out); - } - - } - - - /** - * Do management operations in this view. - * @param pDomainName Name of domain to access - * @param pClusterName Name of the cluster to manage in the domain - * @param pServerName Name of the server to add in the domain - * @param pServerURL Address of the server's remote JMX connector - * @param pRequest Http request - * @param pOut Printer - */ - protected void doViewManagement(String pDomainName, String pClusterName, String pServerName, String pServerURL, HttpServletRequest pRequest, PrintWriter pOut) { - Management mgmt = getMgmt(); - - // ------------------------------ - // Access to the J2EEDomain MBean - // ------------------------------ - ObjectName onDomain = accessJ2EEDomain(pDomainName, mgmt, pOut); - if (onDomain == null) { - return; - } - - if (!isMaster(onDomain, mgmt, pOut)) { - // End application - pOut.println("

    Application is OK

    "); - // Footer - printNavigationFooter(pRequest, pOut); - return; - } - - // TO DO extend interface in order to read cluster daemon name - String clusterDaemonName = "cd"; - // Create the new server - createServer(onDomain, pClusterName, clusterDaemonName, pServerName, pServerURL, mgmt, pOut); - - // ------------------------------------------------------------- - // Using the domain management EJB to list servers in the domain - // ------------------------------------------------------------- - String[] serverNames = null; - String[] serverNamesDom = null; - String[] servers = null; - String domainName = onDomain.getKeyProperty("name"); - try { - pOut.println("

    Getting list of servers in the domain " + domainName + "

    "); - serverNames = (String[]) mgmt.getAttribute(onDomain, "serverNames"); - servers = (String[]) mgmt.getAttribute(onDomain, "servers"); - pOut.println("
      "); - for (int i = 0; i < serverNames.length; i++) { - String name = serverNames[i]; - /* - String[] signature = {"java.lang.String"}; - String[] params = {name}; - String state = (String) mgmt.invoke(onDomain, "getServerState", params, signature); - pOut.println("
    • " + name + " - " + state + "
    • ");*/ - pOut.println("
    • " + name + "
    • "); - } - pOut.println("
    "); - - } catch (Exception e) { - pOut.println("
  • Could not get list of servers in " + domainName + "
  • " + e); - e.printStackTrace(pOut); - return; - } - // ------------------------------------------------------------- - // Using the cluster management EJBs to list servers in clusters - // ------------------------------------------------------------- - String[] clusters = null; - String clusterName = null; - try { - clusters = (String[]) mgmt.getAttribute(onDomain, "clusters"); - for (int i = 0; i < clusters.length; i++) { - ObjectName onCluster = ObjectName.getInstance(clusters[i]); - clusterName = onCluster.getKeyProperty("name"); - if (!domainName.equals(clusterName)) { - // this is a cluster created by the administrator - // or a physical cluster created transparently - pOut.println("

    Getting list of servers in cluster " + clusterName + "

    "); - String[] signature = {"java.lang.String"}; - String[] params = new String[1]; - params[0] = clusterName; - String[] urls = null; - serverNames = (String[]) mgmt.invoke(onDomain, "getServerNames", params, signature); - pOut.println("
      "); - if (serverNames.length == 0) { - pOut.println("
    • There are no servers.
    • "); - } - for (int j = 0; j < serverNames.length; j++) { - String name = serverNames[j]; - /* - String[] signature = {"java.lang.String"}; - String[] params = {name}; - String state = (String) mgmt.invoke(onCluster, "getServerState", params, signature); - pOut.println("
    • " + name + " - " + state + "
    • "); - */ - pOut.println("
    • " + name + "
    • "); - } - pOut.println("
    "); - } - } - } catch (Exception e) { - pOut.println("
  • Could not get list of servers in clusters with the MEJB.
  • " + e); - e.printStackTrace(pOut); - return; - } - - pOut.println("

    Application is OK

    "); - - // Footer - printNavigationFooter(pRequest, pOut); - } - - /** - * Create J2EEDomain MBean's ObjectName and test if MBean registered - * @param pDomainName the name provided by the user - * @param mgmt MEJB - * @param pOut output stream - * @return true if management operation succeeded - */ - private ObjectName accessJ2EEDomain(String pDomainName, Management mgmt, PrintWriter pOut) { - ObjectName onDomain = null; - pOut.println("

    Access the J2EEDomain MBean

    "); - pOut.println("
      "); - - // Get the J2EEDomain MBean's ObjectName - try { - String name = pDomainName + ":j2eeType=J2EEDomain,name=" + pDomainName; - onDomain = ObjectName.getInstance(name); - pOut.println("
    • J2EEDomain object name created: \"" + name.toString() + "\"
    • "); - } catch (Exception e) { - pOut.println("
    • Cannot create object name for J2EEDomain managed object: " + e + "
    • "); - pOut.println("
    "); - return null; - } - // Check that the J2EEDomain MBean registered - try { - boolean exists = mgmt.isRegistered(onDomain); - if (exists) { - pOut.println("
  • Found this J2EEDomain MBean in the current MBean server
  • "); - pOut.println(""); - } else { - pOut.println("
  • Can't find this J2EEDomain MBean in the current MBean server
  • "); - pOut.println(""); - return null; - } - } catch (Exception e) { - pOut.println("
  • Error when using this J2EEDomain MBean: " + e + "
  • "); - pOut.println(""); - return null; - } - return onDomain; - } - /** - * Add a new server to the domain and possibly attach it to a cluster - * @param pOnDomain J2EDomain ObjectName - * @param pClusterName cluster name - * @param pServerName server name - * @param pServerURL server's JMX remote connection urls - * @param mgmt MEJB - * @param pOut output stream - */ - private void createServer(ObjectName pOnDomain, String pClusterName, String pClusterDaemonName, String pServerName, String pServerURL, Management mgmt, PrintWriter pOut) { - String domainName = pOnDomain.getDomain(); - try { - pOut.println("

    Add a server named " + pServerName + " to the domain " + domainName + "

    "); - pOut.println("
      "); - - String[] signature = new String[4]; - Object[] params = new Object[4]; - signature[0] = "java.lang.String"; - signature[1] = "java.lang.String"; - signature[2] = "java.lang.String"; - signature[3] = "[Ljava.lang.String;"; - params[0] = pServerName; - params[1] = pClusterName; - params[2] = pClusterDaemonName; - String[] urls = new String[1]; - urls[0] = pServerURL; - params[3] = urls; - mgmt.invoke(pOnDomain, "addServer", params, signature); - pOut.println("
    "); - } catch (Exception e) { - pOut.println("
  • Cannot add server " + pServerName + ": " + e + "
  • "); - pOut.println(""); - } - } -} diff --git a/jonas_tests/examples/base/examples/j_common.xml b/jonas_tests/examples/base/examples/j_common.xml deleted file mode 100644 index acec2a97c6fa0b54856dbf852fe6c063b0944f3c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/j_common.xml +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/jaasclient/README b/jonas_tests/examples/base/examples/jaasclient/README deleted file mode 100644 index f23dbe46e8c35e3993f9b2661c43e7c24e0491fa..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/README +++ /dev/null @@ -1,90 +0,0 @@ -$Id$ -@author Florent Benoit - -Example Overview: -================= - -This example shows how to use JAAS login modules for the authentication. - -There are two kind of clients. - - Without the use of the client container - - With the use of the client container - -First kind of client (without client container) ------------------------------------------------ -This example includes several ways of entering login and password (CallBack) - - The first way is a command line prompt - - The second way is a swing dialog (a window) - - The first way works without asking the user a login/password. - The login and password are given to the callbackhandler by the client - -You can configure the login module and the resource to use by configuring -the file in the JONAS_ROOT/conf/jaas.config file. - -There are two login modules : - - One for performing the authentication - - One for propagating to the JOnAS server the security context - - -Second kind of client (with client container): -------------------------------------------------- -The choice of the callback handler is done in the application-xml file. - -Two examples of clients are provided. - - jaasopclient1.jar uses the NoInputCallbackHandler as a login/password is - specified in the jonas-client.xml file - - - jaasopclient2.jar uses the CallbackHandler specified in the file - application-client.xml - - - jaasopclient3.jar uses Swing CallbackHandler specified in - application-client.xml file and launch a Swing client - -Both of them use the jaas configuration which is in the client.jar under the -name "jaas.config" - -The JAAS initialization and authentication is perfomed by the client container. - - -Compiling and installing this example: --------------------------------------- - do : ant install - -Running this example: --------------------- - -1) Run a jonas server: - jonas start - -2) Load the jaasop.jar if you have not added it in the ejb service descriptors list : - jonas admin -a jaasop.jar - -You should see something like this when the bean is loaded : - - JAASOp available - -3) Run the client program: - -a/ The client without client container : - ------------------------------------- -on UNIX: - jclient -cp $JONAS_BASE/ejbjars/jaasop.jar jaasclient.ClientJAASOp - -On Windows: - jclient -cp %JONAS_BASE%\ejbjars\jaasop.jar jaasclient.ClientJAASOp - -In fact, the "-cp" option is not useful here, because classes are found in the CLASSPATH. - -b/ A client with client container : - -------------------------------- -first client : -java -jar $JONAS_ROOT/lib/client.jar $JONAS_BASE/clients/jaasopclient1.jar - -second client : -java -jar $JONAS_ROOT/lib/client.jar $JONAS_BASE/clients/jaasopclient2.jar - -third client : -java -jar $JONAS_ROOT/lib/client.jar $JONAS_BASE/clients/jaasopclient3.jar - -4) Stop the jonas server - jonas stop diff --git a/jonas_tests/examples/base/examples/jaasclient/build.xml b/jonas_tests/examples/base/examples/jaasclient/build.xml deleted file mode 100644 index 0773463e1c9e78b18ad3a3740bbc4dcf8a6bb2de..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/build.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/jaasclient/etc/xml/application-client-swing.xml b/jonas_tests/examples/base/examples/jaasclient/etc/xml/application-client-swing.xml deleted file mode 100644 index 19ece057bcb786097d11b1433f48be1073fd87e7..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/etc/xml/application-client-swing.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Client of the JAASOp sample - - - ejb/JAASOp - Session - jaasclient.beans.secusb.JAASOpHome - jaasclient.beans.secusb.JAASOp - - - org.ow2.jonas.security.auth.callback.DialogCallbackHandler - - diff --git a/jonas_tests/examples/base/examples/jaasclient/etc/xml/application-client.xml b/jonas_tests/examples/base/examples/jaasclient/etc/xml/application-client.xml deleted file mode 100644 index 3430cd1d0f8ed7c528ca776e53503c3334be7847..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/etc/xml/application-client.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Client of the JAASOp sample - - - ejb/JAASOp - Session - jaasclient.beans.secusb.JAASOpHome - jaasclient.beans.secusb.JAASOp - - - org.ow2.jonas.security.auth.callback.LoginCallbackHandler - - diff --git a/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-client1.xml b/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-client1.xml deleted file mode 100644 index bd0bc64b632def322be4db43ea9bb4cc8609572a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-client1.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - ejb/JAASOp - JAASOpHome - - - - jaas.config - jaasclient - jonas - jonas - - - diff --git a/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-client2.xml b/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-client2.xml deleted file mode 100644 index a4331e8ff9d7605582a070cef6a4c6b78fac82e3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-client2.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - ejb/JAASOp - JAASOpHome - - - - jaas.config - jaasclient - - - diff --git a/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-client3.xml b/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-client3.xml deleted file mode 100644 index a4331e8ff9d7605582a070cef6a4c6b78fac82e3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-client3.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - ejb/JAASOp - JAASOpHome - - - - jaas.config - jaasclient - - - diff --git a/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-secusb.xml b/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-secusb.xml deleted file mode 100644 index 81fb51bb8df8e03ddc84eb74d7e8ae54c1eb098e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/etc/xml/jonas-secusb.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - JAASOp - JAASOpHome - - diff --git a/jonas_tests/examples/base/examples/jaasclient/etc/xml/secusb.xml b/jonas_tests/examples/base/examples/jaasclient/etc/xml/secusb.xml deleted file mode 100644 index 763ce558de21d6a80bb8a9464c526a77c00b96ae..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/etc/xml/secusb.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - secured session bean JOnAS example - - secusb (jaasclient) - - - - JAASOp - jaasclient.beans.secusb.JAASOpHome - jaasclient.beans.secusb.JAASOp - jaasclient.beans.secusb.JAASOpBean - Stateful - Container - - - - - - jaas - - - - jaas - - JAASOp - * - - - - - - JAASOp - * - - Supports - - - - - diff --git a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/ClientJAASOp.java b/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/ClientJAASOp.java deleted file mode 100644 index 31a4d084ccef0d7da13fb0a2b9c4e372fe1508c6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/ClientJAASOp.java +++ /dev/null @@ -1,221 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): jonas team - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package jaasclient; - -import jaasclient.beans.secusb.JAASOp; -import jaasclient.beans.secusb.JAASOpHome; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; -import javax.transaction.UserTransaction; - -import org.ow2.jonas.security.auth.callback.DialogCallbackHandler; -import org.ow2.jonas.security.auth.callback.LoginCallbackHandler; -import org.ow2.jonas.security.auth.callback.NoInputCallbackHandler; - -/** - * Sample for Session Bean. Usage: jclient jaasclient.ClientJAASOp - * @author jonas team - * @author Florent Benoit : use a JAAS login module configuration for the - * authentication - */ -public class ClientJAASOp { - - /** - * First amount to buy - */ - private static final int FIRST_BUY_AMOUNT = 10; - - /** - * Second amount to buy - */ - private static final int SECOND_BUY_AMOUNT = 20; - - /** - * Third amount to buy (will be rollback) - */ - private static final int THIRD_BUY_AMOUNT = 50; - - /** - * Constructor. Hide constructor as it is an utility class - */ - private ClientJAASOp() { - - } - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - //Check if there are valid args - if (args.length != 1) { - System.err.println("Syntax is : jclient jaasclient.ClientJAASOp "); - System.err.println(" - text : Prompt the user to enter login/password by command line"); - System.err.println(" - dialog : Prompt the user to enter login/password by a window dialog"); - System.err.println(" - noprompt : No prompt is asked to the user. A default login/password is used"); - System.exit(2); - } - - // Which handler use ? - CallbackHandler handler = null; - - if (args[0].equalsIgnoreCase("text")) { - handler = new LoginCallbackHandler(); - } else if (args[0].equalsIgnoreCase("dialog")) { - handler = new DialogCallbackHandler(); - } else if (args[0].equalsIgnoreCase("noprompt")) { - handler = new NoInputCallbackHandler("jonas", "jonas"); - } else { - System.err.println("Invalid type '" + args[0] - + "', valid syntax is : jclient jaasclient.ClientJAASOp "); - System.exit(2); - } - - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - System.err.println("Cannot get initial context for JNDI: " + e); - System.exit(2); - } - - // Obtain a LoginContext - LoginContext lc = null; - try { - lc = new LoginContext("jaasclient", handler); - } catch (LoginException le) { - System.err.println("Cannot create LoginContext: " + le.getMessage()); - System.exit(2); - } catch (SecurityException se) { - System.err.println("Cannot create LoginContext: " + se.getMessage()); - System.exit(2); - } - - System.out - .println("Use the l/p jonas/jonas to authenticate with the right role.\nYou can change this by editing the file JONAS_ROOT/conf/jonas-realm.xml."); - - // Login - try { - lc.login(); - } catch (LoginException le) { - System.err.println("Authentication failed : " + le.getMessage()); - System.exit(2); - } - - // Authentication is ok - System.out.println("Authentication succeeded"); - - // We want to start transactions from client: get UserTransaction - UserTransaction utx = null; - try { - - // Comment the following lines if you want to use a David Client: - utx = (UserTransaction) initialContext.lookup("javax.transaction.UserTransaction"); - } catch (Exception e) { - System.err.println("Cannot lookup UserTransaction: " + e); - System.exit(2); - } - - // Connecting to JAASOpHome thru JNDI - JAASOpHome home = null; - try { - home = (JAASOpHome) PortableRemoteObject.narrow(initialContext.lookup("JAASOpHome"), JAASOpHome.class); - } catch (Exception e) { - System.err.println("Cannot lookup JAASOpHome: " + e - + ". Maybe you haven't do the 'jonas admin -a jaasop.jar'"); - System.exit(2); - } - - // JAASOpBean creation - JAASOp t1 = null; - try { - System.out.println("Create a bean"); - t1 = home.create("User1"); - } catch (Exception e) { - System.err.println("Cannot create JAASOpBean: " + e); - System.exit(2); - } - - // First transaction (committed) - try { - System.out.println("Start a first transaction"); - utx.begin(); - System.out.println("First request on the new bean"); - t1.buy(FIRST_BUY_AMOUNT); - System.out.println("Second request on the bean"); - t1.buy(SECOND_BUY_AMOUNT); - System.out.println("Commit the transaction"); - utx.commit(); - } catch (Exception e) { - System.err.println("exception during 1st Tx: " + e); - System.exit(2); - } - // Start another transaction (rolled back) - try { - System.out.println("Start a second transaction"); - utx.begin(); - t1.buy(THIRD_BUY_AMOUNT); - System.out.println("Rollback the transaction"); - utx.rollback(); - } catch (Exception e) { - System.err.println("exception during 2nd Tx: " + e); - System.exit(2); - } - - // Get the total bought, outside the transaction - int val = 0; - try { - System.out.println("Request outside any transaction"); - val = t1.read(); - } catch (Exception e) { - System.err.println("Cannot read value on t1 : " + e); - System.exit(2); - } - if (val != FIRST_BUY_AMOUNT + SECOND_BUY_AMOUNT) { - System.err.println("Bad value read: " + val); - System.exit(2); - } - - // Remove Session bean - try { - t1.remove(); - } catch (Exception e) { - System.out.println("Exception on buy: " + e); - System.exit(2); - } - System.out.println("ClientJAASOp OK. Exiting."); - System.exit(0); - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/ClientJAASOpContClient.java b/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/ClientJAASOpContClient.java deleted file mode 100644 index 638d7b840c91f0c359419043e25b84aafd9110db..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/ClientJAASOpContClient.java +++ /dev/null @@ -1,162 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): jonas team - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package jaasclient; - -// import javax -import jaasclient.beans.secusb.JAASOp; -import jaasclient.beans.secusb.JAASOpHome; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; - -/** - * Sample for Session Bean. - * Usage: - * jclient jaasclient.ClientJAASOpContClient - * @author jonas team - * @author Florent Benoit - */ -public class ClientJAASOpContClient { - - /** - * First amount to buy - */ - private static final int FIRST_BUY_AMOUNT = 10; - - /** - * Second amount to buy - */ - private static final int SECOND_BUY_AMOUNT = 20; - - /** - * Third amount to buy (will be rollback) - */ - private static final int THIRD_BUY_AMOUNT = 50; - - /** - * Constructor. Hide constructor as it is an utility class - */ - private ClientJAASOpContClient() { - - } - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - System.err.println("Cannot get initial context for JNDI: " + e); - System.exit(2); - } - - // We want to start transactions from client: get UserTransaction - UserTransaction utx = null; - try { - utx = (UserTransaction) initialContext.lookup("java:comp/UserTransaction"); - } catch (Exception e) { - System.err.println("Cannot lookup java:comp/UserTransaction: " + e); - System.exit(2); - } - - // Connecting to JAASOpHome thru JNDI - JAASOpHome home = null; - try { - home = (JAASOpHome) PortableRemoteObject.narrow(initialContext.lookup("java:comp/env/ejb/JAASOp"), JAASOpHome.class); - } catch (Exception e) { - System.err.println("Cannot lookup java:comp/env/ejb/JAASOp: " + e + ". Maybe you haven't do the 'jonas admin -a jaasop.jar'"); - System.exit(2); - } - - // JAASOpBean creation - JAASOp t1 = null; - try { - System.out.println("Create a bean"); - t1 = home.create("User1"); - } catch (Exception e) { - System.err.println("Cannot create JAASOpBean: " + e); - System.exit(2); - } - - // First transaction (committed) - try { - System.out.println("Start a first transaction"); - utx.begin(); - System.out.println("First request on the new bean"); - t1.buy(FIRST_BUY_AMOUNT); - System.out.println("Second request on the bean"); - t1.buy(SECOND_BUY_AMOUNT); - System.out.println("Commit the transaction"); - utx.commit(); - } catch (Exception e) { - System.err.println("exception during 1st Tx: " + e); - System.exit(2); - } - // Start another transaction (rolled back) - try { - System.out.println("Start a second transaction"); - utx.begin(); - t1.buy(THIRD_BUY_AMOUNT); - System.out.println("Rollback the transaction"); - utx.rollback(); - } catch (Exception e) { - System.err.println("exception during 2nd Tx: " + e); - System.exit(2); - } - - // Get the total bought, outside the transaction - int val = 0; - try { - System.out.println("Request outside any transaction"); - val = t1.read(); - } catch (Exception e) { - System.err.println("Cannot read value on t1 : " + e); - System.exit(2); - } - if (val != FIRST_BUY_AMOUNT + SECOND_BUY_AMOUNT) { - System.err.println("Bad value read: " + val); - System.exit(2); - } - - // Remove Session bean - try { - t1.remove(); - } catch (Exception e) { - System.out.println("Exception on buy: " + e); - System.exit(2); - } - System.out.println("ClientJAASOpContClient OK. Exiting."); - System.exit(0); - } -} diff --git a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/ClientJAASOpContClientSwing.java b/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/ClientJAASOpContClientSwing.java deleted file mode 100644 index 85e3725cf04bec5926abac5153d2db700e5b4b1c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/ClientJAASOpContClientSwing.java +++ /dev/null @@ -1,184 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): jonas team - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package jaasclient; - -import jaasclient.beans.secusb.JAASOp; -import jaasclient.beans.secusb.JAASOpHome; - -import java.awt.event.ActionEvent; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.WindowConstants; -import javax.transaction.UserTransaction; - -/** - * Sample for Session Bean. - * @author jonas team - * @author Florent Benoit - * @author Markus Karg : Add Swing interface - */ -public class ClientJAASOpContClientSwing { - - /** - * First amount to buy - */ - private static final int FIRST_BUY_AMOUNT = 10; - - /** - * Second amount to buy - */ - private static final int SECOND_BUY_AMOUNT = 20; - - /** - * Third amount to buy (will be rollback) - */ - private static final int THIRD_BUY_AMOUNT = 50; - - /** - * Constructor. Hide constructor as it is an utility class - */ - private ClientJAASOpContClientSwing() { - - } - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - - final JFrame jf = new JFrame("Test Application"); - jf.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - final JButton jb = new JButton(); - final Action a = new AbstractAction("Click here to test!") { - public final void actionPerformed(final ActionEvent v) { - - - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - System.err.println("Cannot get initial context for JNDI: " + e); - System.exit(2); - } - - // We want to start transactions from client: get UserTransaction - UserTransaction utx = null; - try { - utx = (UserTransaction) initialContext.lookup("java:comp/UserTransaction"); - } catch (Exception e) { - System.err.println("Cannot lookup java:comp/UserTransaction: " + e); - System.exit(2); - } - - // Connecting to JAASOpHome thru JNDI - JAASOpHome home = null; - try { - home = (JAASOpHome) PortableRemoteObject.narrow(initialContext.lookup("java:comp/env/ejb/JAASOp"), JAASOpHome.class); - } catch (Exception e) { - System.err.println("Cannot lookup java:comp/env/ejb/JAASOp: " + e + ". Maybe you haven't do the 'jonas admin -a jaasop.jar'"); - System.exit(2); - } - - // JAASOpBean creation - JAASOp t1 = null; - try { - System.out.println("Create a bean"); - t1 = home.create("User1"); - } catch (Exception e) { - System.err.println("Cannot create JAASOpBean: " + e); - System.exit(2); - } - - // First transaction (committed) - try { - System.out.println("Start a first transaction"); - utx.begin(); - System.out.println("First request on the new bean"); - t1.buy(FIRST_BUY_AMOUNT); - System.out.println("Second request on the bean"); - t1.buy(SECOND_BUY_AMOUNT); - System.out.println("Commit the transaction"); - utx.commit(); - } catch (Exception e) { - System.err.println("exception during 1st Tx: " + e); - System.exit(2); - } - // Start another transaction (rolled back) - try { - System.out.println("Start a second transaction"); - utx.begin(); - t1.buy(THIRD_BUY_AMOUNT); - System.out.println("Rollback the transaction"); - utx.rollback(); - } catch (Exception e) { - System.err.println("exception during 2nd Tx: " + e); - System.exit(2); - } - - // Get the total bought, outside the transaction - int val = 0; - try { - System.out.println("Request outside any transaction"); - val = t1.read(); - } catch (Exception e) { - System.err.println("Cannot read value on t1 : " + e); - System.exit(2); - } - if (val != FIRST_BUY_AMOUNT + SECOND_BUY_AMOUNT) { - System.err.println("Bad value read: " + val); - System.exit(2); - } - - // Remove Session bean - try { - t1.remove(); - } catch (Exception e) { - System.out.println("Exception on buy: " + e); - System.exit(2); - } - System.out.println("ClientJAASOpContClientSwing OK. Exiting."); - System.exit(0); - - - - } - }; - jb.setAction(a); - jf.getContentPane().add(jb); - jf.pack(); - jf.setVisible(true); - } -} diff --git a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/beans/secusb/JAASOp.java b/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/beans/secusb/JAASOp.java deleted file mode 100644 index a0ad103433e5792e70602a38416c67f3e5a71015..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/beans/secusb/JAASOp.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package jaasclient.beans.secusb; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -/** - * Remote interface for the bean JAASOp - * @author JOnAS team - */ -public interface JAASOp extends EJBObject { - - /** - * Business method implementation. - * @param shares nb of shares to be bought - * @throws RemoteException if RMI failed. - */ - void buy (int shares) throws RemoteException; - - /** - * Business method implementation. - * @return the nb of shares bought - * @throws RemoteException if RMI failed. - */ - int read () throws RemoteException; - -} diff --git a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpBean.java b/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpBean.java deleted file mode 100644 index 85b4aaf468150df03ff442a4c5de85d6f51c8235..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpBean.java +++ /dev/null @@ -1,240 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package jaasclient.beans.secusb; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.ejb.SessionSynchronization; - -/** - * This is an example of Session Bean, statefull, and synchronized. - * @author JOnAS team - */ -public class JAASOpBean implements SessionBean, SessionSynchronization { - - /** - * Actual state of the bean - */ - private int total = 0; - - /** - * value inside Tx, not yet committed. - */ - private int newtotal = 0; - - /** - * User client - */ - private String clientUser = null; - - /* ========================= ejbCreate methods ============================ */ - - /** - * There must be one ejbCreate() method per create() method on the Home - * interface, and with the same signature. - * @param user the user name - */ - public void ejbCreate(String user) { - total = 0; - // in case we are outside transactions - newtotal = total; - clientUser = user; - } - - /* =============== javax.ejb.SessionBean 2.0 implementation ============== */ - - /** - * The activate method is called when the instance is activated from its - * "passive" state. The instance should acquire any resource that it has - * released earlier in the ejbPassivate() method. This method is called with - * no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbActivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - } - - /** - * The passivate method is called before the instance enters the "passive" - * state. The instance should release any resources that it can re-acquire - * later in the ejbActivate() method. After the passivate method completes, - * the instance must be in a state that allows the container to use the Java - * Serialization protocol to externalize and store away the instance's - * state. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbPassivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - } - - /** - * A container invokes this method before it ends the life of the session - * object. This happens as a result of a client's invoking a remove - * operation, or when a container decides to terminate the session object - * after a timeout. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbRemove() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - } - - /** - * Set the associated session context. The container calls this method after - * the instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for applications - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void setSessionContext(SessionContext sessionContext) throws EJBException, java.rmi.RemoteException { - } - - /* - * ============== javax.ejb.SessionSynchronization implementation - * ============= - */ - - /** - * The afterBegin method notifies a session Bean instance that a new - * transaction has started, and that the subsequent business methods on the - * instance will be invoked in the context of the transaction. The instance - * can use this method, for example, to read data from a database and cache - * the data in the instance fields. This method executes in the proper - * transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException - This exception is defined in the - * method signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specifications should throw - * the javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB 2.0 and higher specifications must not - * throw the java.rmi.RemoteException. - */ - public void afterBegin() throws EJBException, java.rmi.RemoteException { - newtotal = total; - } - - /** - * The beforeCompletion method notifies a session Bean instance that a - * transaction is about to be committed. The instance can use this method, - * for example, to write any cached data to a database. This method executes - * in the proper transaction context. Note: The instance may still - * cause the container to rollback the transaction by invoking the - * setRollbackOnly() method on the instance context, or by throwing an - * exception. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException - This exception is defined in the - * method signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specifications should throw - * the javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB 2.0 and higher specifications must not - * throw the java.rmi.RemoteException. - */ - public void beforeCompletion() throws EJBException, java.rmi.RemoteException { - } - - /** - * The afterCompletion method notifies a session Bean instance that a - * transaction commit protocol has completed, and tells the instance whether - * the transaction has been committed or rolled back. This method executes - * with no transaction context. - * @param committed - True if the transaction has been committed, false if - * is has been rolled back. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException - This exception is defined in the - * method signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specifications should throw - * the javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB 2.0 and higher specifications must not - * throw the java.rmi.RemoteException. - */ - public void afterCompletion(boolean committed) throws EJBException, java.rmi.RemoteException { - - if (committed) { - total = newtotal; - } else { - newtotal = total; - } - } - - /* ========================= Op implementation ============================ */ - - /** - * Business method implementation. - * @param s nb of shares to be bought - */ - public void buy(int s) { - newtotal = newtotal + s; - return; - } - - /** - * Business method implementation. - * @return the nb of shares bought - */ - public int read() { - return newtotal; - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpHome.java b/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpHome.java deleted file mode 100644 index aef5a80e2380c1a98a23d68b38d0dd14c0ff7e74..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jaasclient/src/jaasclient/beans/secusb/JAASOpHome.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package jaasclient.beans.secusb; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * Home interface for the bean JAASOp - * @author JOnAS team - */ -public interface JAASOpHome extends EJBHome { - - /** - * Create an instance of the Op bean. - * @param user the user name. - * @return the Remote interface of the bean Op. - * @throws CreateException if the creation failed. - * @throws RemoteException if the RMI call failed. - */ - JAASOp create(String user) throws CreateException, RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/jdo/Bank_src.zip b/jonas_tests/examples/base/examples/jdo/Bank_src.zip deleted file mode 100644 index daf554b007c0a03a721b63816e0f16adc20718e7..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/jdo/Bank_src.zip and /dev/null differ diff --git a/jonas_tests/examples/base/examples/jdo/README b/jonas_tests/examples/base/examples/jdo/README deleted file mode 100644 index 81e23ed261e101087845ccbd7f1ce6acfc92213a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jdo/README +++ /dev/null @@ -1,65 +0,0 @@ - -Example Overview -================ - -This example shows how to use Speedo, an open source implementation of JDO, via a Resource Adapter. -It's the 'bank' Speedo example and it was copied as it is from the Speedo project. -See - http://speedo.objectweb.org/ -for more information. - - -Prerequisites -============= - -1) Speedo Resource Adapter configuration in JOnAS: -- Check that the 'resource' service is present in the list of the JOnAS services - (see the jonas.services property in the jonas.properties) -- If JONAS_BASE is using, check that the speedo_for_jonas_ra.rar is present - cp $JONAS_ROOT/rars/speedo-jdo_for_jonas_ra.rar $JONAS_BASE/rars - - -2) Speedo configuration: -Update the Speedo configuration - cp $JONAS_ROOT/conf/speedo-jdo.properties $JONAS_BASE/conf - - -Building this example -===================== - -Under $JONAS_ROOT/examples/jdo, do - $ ant install - - -Creating the data structure -=========================== - -The first time, you must create the tables in the data base used in this example. -For that, you can use a special ant target with some properties setted with correct values: - $ ant -Dspeedo.dbconf=(${JONAS_BASE}|${JONAS_ROOT})/conf/.properties - -Djdbc.driver=.jar - createDataStruct - -For example: - $ ant -Dspeedo.dbconf=$JONAS_BASE/conf/PostgreSQL1.properties -Djdbc.driver=/usr/share/postgresql/pg74.215.jdbc3.jar createDataStruct - - -Running this example -==================== -Commands are given for an Unix system, similar commands can be done on Windows. - -1) Run a JOnAS server with speedo: - $ jonas start - $ jonas admin -a speedo-jdo_for_jonas_ra.rar - -2) Load the ejb-jar file of this example - $ jonas admin -a bank.jar - -3) Run the client - $ jclient -cp $JONAS_BASE/ejbjars/bank.jar:$JONAS_ROOT/lib/commons/jonas/speedo/speedo-jdo_client.jar Client - -4) Stop the JOnAS server - $ jonas stop - - - diff --git a/jonas_tests/examples/base/examples/jdo/build.xml b/jonas_tests/examples/base/examples/jdo/build.xml deleted file mode 100644 index 6c276d9aecc636629060a36524fb1f36648ab820..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jdo/build.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/jonas-common.xml b/jonas_tests/examples/base/examples/jonas-common.xml deleted file mode 100644 index 5cbe72064f34c0968e454ff68b6f2a9673ee9664..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/jonas-common.xml +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/build.xml b/jonas_tests/examples/base/examples/src/build.xml deleted file mode 100644 index 8fc33165cf79240882f54a9cfc8faaeec742637e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/build.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/eb/Account.idb b/jonas_tests/examples/base/examples/src/eb/Account.idb deleted file mode 100644 index 7c6ade33e9cc62182a3a0efb3ea9dd7701712f48..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/Account.idb +++ /dev/null @@ -1,23 +0,0 @@ -; First load the JDBC driver and open a database. -d org.enhydra.instantdb.jdbc.idbDriver; -; for Instantdb version older than v3.14, put the following line instead: -; d jdbc.idbDriver; -o jdbc:idb=db1.prp; - -; Create the table -e DROP TABLE accountsample_; -e CREATE TABLE accountsample_ ( - accno_ int PRIMARY KEY, - customer_ VARCHAR(30), - balance_ double); - -; put some initial data in the table -p INSERT INTO accountsample_ VALUES (?,?,?); -s 101,'Antoine de St Exupery', 200.00; -s 102,'Alexandre Dumas fils', 400.00; -s 103,'Conan Doyle', 500.00; -s 104,'Alfred de Musset', 100.00; -s 105,'Phileas Lebegue', 350.00; -s 106,'Alphonse de Lamartine', 650.00; -q SELECT * FROM accountsample_; -c close; diff --git a/jonas_tests/examples/base/examples/src/eb/Account.java b/jonas_tests/examples/base/examples/src/eb/Account.java deleted file mode 100644 index 8dd7aa56fb85031e6905c2a59eb3f92292b7b8b2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/Account.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package eb; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -/** - * Remote interface for the bean Account - * @author JOnAS team - */ -public interface Account extends EJBObject { - - double getBalance() throws RemoteException; - - void setBalance(double d) throws RemoteException; - - String getCustomer() throws RemoteException; - - void setCustomer(String c) throws RemoteException; - - int getNumber() throws RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/eb/Account.pgsql b/jonas_tests/examples/base/examples/src/eb/Account.pgsql deleted file mode 100644 index 2cdde8888893bf4a6f6dd8966b6dfe6dd3b67db4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/Account.pgsql +++ /dev/null @@ -1,12 +0,0 @@ -drop table accountsample_; -create table accountsample_ ( - accno_ integer primary key, - customer_ varchar(30), - balance_ float8 -); -insert into accountsample_ values(101, 'Antoine de St Exupery', 200.00); -insert into accountsample_ values(102, 'alexandre dumas fils', 400.00); -insert into accountsample_ values(103, 'conan doyle', 500.00); -insert into accountsample_ values(104, 'alfred de musset', 100.00); -insert into accountsample_ values(105, 'phileas lebegue', 350.00); -insert into accountsample_ values(106, 'alphonse de lamartine', 650.00); diff --git a/jonas_tests/examples/base/examples/src/eb/Account.sql b/jonas_tests/examples/base/examples/src/eb/Account.sql deleted file mode 100644 index d46b009b4577789b05a5fb1d3608359e8a495a54..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/Account.sql +++ /dev/null @@ -1,13 +0,0 @@ -drop table accountsample_; -set autocommit true; -create table accountsample_ ( - accno_ integer primary key, - customer_ varchar(30), - balance_ number(15, 4) -); -insert into accountsample_ values(101, 'Antoine de St Exupery', 200.00); -insert into accountsample_ values(102, 'alexandre dumas fils', 400.00); -insert into accountsample_ values(103, 'conan doyle', 500.00); -insert into accountsample_ values(104, 'alfred de musset', 100.00); -insert into accountsample_ values(105, 'phileas lebegue', 350.00); -insert into accountsample_ values(106, 'alphonse de lamartine', 650.00); diff --git a/jonas_tests/examples/base/examples/src/eb/AccountExplBean.java b/jonas_tests/examples/base/examples/src/eb/AccountExplBean.java deleted file mode 100644 index 1d759eb781a8eeeb37500bb8e939716a099321fa..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/AccountExplBean.java +++ /dev/null @@ -1,541 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package eb; - -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Enumeration; -import java.util.Vector; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.ObjectNotFoundException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.sql.DataSource; - -/** - * AccountExplBean is an entity bean with "bean managed persistence". The state - * of an instance is stored into a relational database. The following table - * should exist: create table ACCOUNT (ACCNO integer primary key, CUSTOMER - * varchar(30), BALANCE number(15,4)); Note : In order to keep the code - * readable, not all database errors have been handled. In particular the - * closing of the statement and of the connexion would have being put in a - * "finally" block. - * @author JOnAS team - */ - -public class AccountExplBean implements EntityBean { - - private DataSource dataSource = null; - - // Keep the reference on the EntityContext - protected EntityContext entityContext; - - // Object state - must de public (EJB spec.) - public Integer accno; - - public String customer; - - public double balance; - - /* ========================= ejbCreate methods ============================ */ - - /** - * There must be one ejbCreate() method per create() method on the Home - * interface, and with the same signature. - * @param accno account number - * @param customer customer name - * @param balance initial balance - * @return pk primary key - * @exception CreateException If the instance could not perform the function - * requested by the container - */ - public Integer ejbCreate(int val_accno, String val_customer, double val_balance) throws CreateException { - - // Init object state - accno = new Integer(val_accno); - customer = val_customer; - balance = val_balance; - - Connection conn = null; - PreparedStatement stmt = null; - try { - // get a connection for this transaction context - conn = getConnection(); - - // create object in DB - stmt = conn.prepareStatement("insert into accountsample_ (accno_, customer_, balance_) values (?, ?, ?)"); - stmt.setInt(1, accno.intValue()); - stmt.setString(2, customer); - stmt.setDouble(3, balance); - stmt.executeUpdate(); - - } catch (SQLException e) { - throw new CreateException("Failed to create bean in database: " + e); - } finally { - try { - if (stmt != null) { - //close statement - stmt.close(); - } - if (conn != null) { - //release connection - conn.close(); - } - } catch (Exception ignore) { - } - } - // Return the primary key - return accno; - } - - /** - * Each ejbCreate method should have a matching ejbPostCreate method - */ - public void ejbPostCreate(int val_accno, String val_customer, double val_balance) { - // Nothing to be done for this simple example. - } - - /* - * ====================== javax.ejb.EntityBean implementation - * ================= - */ - - /** - * A container invokes this method when the instance is taken out of the - * pool of available instances to become associated with a specific EJB - * object. This method transitions the instance to the ready state. This - * method executes in an unspecified transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbActivate() { - // Nothing to be done for this simple example. - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. This method - * always executes in the proper transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbLoad() { - Connection conn = null; - PreparedStatement stmt = null; - try { - // get a connection for this transaction context - conn = getConnection(); - - // find account in DB - stmt = conn.prepareStatement("select customer_,balance_ from accountsample_ where accno_=?"); - Integer pk = (Integer) entityContext.getPrimaryKey(); - stmt.setInt(1, pk.intValue()); - ResultSet rs = stmt.executeQuery(); - if (!rs.next()) { - throw new EJBException("Failed to load bean from database"); - } - - // update object state - accno = pk; - customer = rs.getString("customer_"); - balance = rs.getDouble("balance_"); - - } catch (SQLException e) { - throw new EJBException("Failed to load bean from database " + e); - } finally { - try { - if (stmt != null) { - //close statement - stmt.close(); - } - if (conn != null) { - //release connection - conn.close(); - } - } catch (Exception ignore) { - } - } - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. After this method - * completes, the container will place the instance into the pool of - * available instances. This method executes in an unspecified transaction - * context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbPassivate() { - // Nothing to be done for this simple example. - } - - /** - * A container invokes this method before it removes the EJB object that is - * currently associated with the instance. This method is invoked when a - * client invokes a remove operation on the enterprise Bean's home interface - * or the EJB object's remote interface. This method transitions the - * instance from the ready state to the pool of available instances. This - * method is called in the transaction context of the remove operation. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - * @exception RemoveException The enterprise Bean does not allow destruction - * of the object. - */ - public void ejbRemove() throws RemoveException { - Connection conn = null; - PreparedStatement stmt = null; - try { - // get a connection for this transaction context - conn = getConnection(); - - // delete Object in DB - stmt = conn.prepareStatement("delete from accountsample_ where accno_=?"); - Integer pk = (Integer) entityContext.getPrimaryKey(); - stmt.setInt(1, pk.intValue()); - stmt.executeUpdate(); - - } catch (SQLException e) { - throw new RemoveException("Failed to delete bean from database" + e); - } finally { - try { - if (stmt != null) { - //close statement - stmt.close(); - } - if (conn != null) { - //release connection - conn.close(); - } - } catch (Exception ignore) { - } - } - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. This method always - * executes in the proper transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbStore() { - Connection conn = null; - PreparedStatement stmt = null; - try { - // get a connection for this transaction context - conn = getConnection(); - - // store Object state in DB - stmt = conn.prepareStatement("update accountsample_ set customer_=?,balance_=? where accno_=?"); - stmt.setString(1, customer); - stmt.setDouble(2, balance); - Integer pk = (Integer) entityContext.getPrimaryKey(); - stmt.setInt(3, pk.intValue()); - stmt.executeUpdate(); - - } catch (SQLException e) { - throw new EJBException("Failed to store bean to database " + e); - } finally { - try { - if (stmt != null) { - //close statement - stmt.close(); - } - if (conn != null) { - //release connection - conn.close(); - } - } catch (Exception ignore) { - } - } - } - - /** - * Sets the associated entity context. The container invokes this method on - * an instance after the instance has been created. This method is called in - * an unspecified transaction context. - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void setEntityContext(EntityContext ctx) { - - // Keep the entity context in object - entityContext = ctx; - - } - - /** - * Unsets the associated entity context. The container calls this method - * before removing the instance. This is the last method that the container - * invokes on the instance. The Java garbage collector will eventually - * invoke the finalize() method on the instance. This method is called in an - * unspecified transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void unsetEntityContext() { - entityContext = null; - } - - /* ============================ ejbFind methods =========================== */ - - /** - * There must be one ejbFind method per find method on the Home interface, - * and with the same signature. ejbFindByPrimaryKey is the only mandatory - * ejbFind method. - * @param pk The primary key - * @return pk The primary key - * @exception FinderException - Failed to execute the query. - * @exception ObjectNotFoundException - Object not found for this primary - * key. - */ - public Integer ejbFindByPrimaryKey(Integer pk) throws ObjectNotFoundException, FinderException { - - Connection conn = null; - PreparedStatement stmt = null; - try { - // get a connection for this transaction context - conn = getConnection(); - - // lookup for this primary key in DB - stmt = conn.prepareStatement("select accno_ from accountsample_ where accno_=?"); - stmt.setInt(1, pk.intValue()); - ResultSet rs = stmt.executeQuery(); - if (!rs.next()) { - throw new javax.ejb.ObjectNotFoundException(); - } - - } catch (SQLException e) { - throw new javax.ejb.FinderException("Failed to executeQuery " + e); - } finally { - try { - if (stmt != null) { - //close statement - stmt.close(); - } - if (conn != null) { - //release connection - conn.close(); - } - } catch (Exception ignore) { - } - } - - // return primary key - return pk; - } - - /** - * Find Account by its account number - * @return pk The primary key - * @exception FinderException - Failed to execute the query. - * @exception ObjectNotFoundException - Object not found for this account - * number - */ - public Integer ejbFindByNumber(int accno) throws ObjectNotFoundException, FinderException { - - Connection conn = null; - PreparedStatement stmt = null; - try { - // get a connection for this transaction context - conn = getConnection(); - // lookup for this primary key in DB - stmt = conn.prepareStatement("select accno_ from accountsample_ where accno_=?"); - stmt.setInt(1, accno); - ResultSet rs = stmt.executeQuery(); - if (!rs.next()) { - throw new javax.ejb.ObjectNotFoundException(); - } - - } catch (SQLException e) { - throw new javax.ejb.FinderException("Failed to executeQuery " + e); - } finally { - try { - if (stmt != null) { - //close statement - stmt.close(); - } - if (conn != null) { - //release connection - conn.close(); - } - } catch (Exception ignore) { - } - } - - // return a primary key for this account - return new Integer(accno); - } - - /** - * Creates an enumeration of primary keys for all accounts - * @return pkv The primary keys - * @exception FinderException - Failed to execute the query. - */ - public Enumeration ejbFindAllAccounts() throws FinderException { - Connection conn = null; - PreparedStatement stmt = null; - Vector pkv = new Vector(); - try { - // get a connection for this transaction context - conn = getConnection(); - - // Lookup for all accounts in DB - stmt = conn.prepareStatement("select accno_ from accountsample_"); - ResultSet rs = stmt.executeQuery(); - - // Build the vector of primary keys - while (rs.next()) { - Integer pk = new Integer(rs.getInt("accno_")); - pkv.addElement((Object) pk); - } - - } catch (SQLException e) { - throw new javax.ejb.FinderException("Failed to executeQuery " + e); - } finally { - try { - if (stmt != null) { - //close statement - stmt.close(); - } - if (conn != null) { - //release connection - conn.close(); - } - } catch (Exception ignore) { - } - } - - // return primary keys - return pkv.elements(); - } - - /** - * @return the connection from the dataSource - * @exception EJBException Thrown by the method if the dataSource is not - * found in the naming. - * @exception SQLException may be thrown by dataSource.getConnection() - */ - private Connection getConnection() throws EJBException, SQLException { - if (dataSource == null) { - // Finds DataSource from JNDI - Context initialContext = null; - try { - initialContext = new InitialContext(); - dataSource = (DataSource) initialContext.lookup("java:comp/env/jdbc/AccountExplDs"); - } catch (Exception e) { - System.out.println("Cannot lookup dataSource" + e); - throw new javax.ejb.EJBException("Cannot lookup dataSource "); - } - } - return dataSource.getConnection(); - } - - /* - * ========================= Account implementation - * ============================ - */ - - /** - * Business method for returning the balance. - * @return balance - */ - public double getBalance() { - - return balance; - } - - /** - * Business method for updating the balance. - * @param d balance to update - */ - public void setBalance(double d) { - - balance = balance + d; - } - - /** - * Business method for returning the customer. - * @return customer - */ - public String getCustomer() { - - return customer; - } - - /** - * Business method for changing the customer name. - * @param c customer to update - */ - public void setCustomer(String c) { - - customer = c; - } - - /** - * Business method to get the Account number - */ - public int getNumber() { - return accno.intValue(); - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/eb/AccountHome.java b/jonas_tests/examples/base/examples/src/eb/AccountHome.java deleted file mode 100644 index 694c45a94918fed36281863732e2b4e20955ce01..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/AccountHome.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package eb; - -import java.rmi.RemoteException; -import java.util.Enumeration; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; -import javax.ejb.FinderException; - -/** - * Home interface for the bean Account - * @author JOnAS team - */ -public interface AccountHome extends EJBHome { - - Account create(int accno, String customer, double balance) throws RemoteException, CreateException; - - Account findByPrimaryKey(Integer pk) throws RemoteException, FinderException; - - Account findByNumber(int accno) throws RemoteException, FinderException; - - Enumeration findAllAccounts() throws RemoteException, FinderException; - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/eb/AccountImpl2Bean.java b/jonas_tests/examples/base/examples/src/eb/AccountImpl2Bean.java deleted file mode 100644 index df9b888ade5706f212fd1c763e82de851d60ea37..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/AccountImpl2Bean.java +++ /dev/null @@ -1,218 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package eb; - -/** - * Accountbean is an entity bean with "container managed persistence version 2". - * The state of an instance is stored into a relational database. The following - * table should exist: create table ACCOUNT (ACCNO integer primary key, CUSTOMER - * varchar(30), BALANCE number(15,4)); - * @author Christophe Ney cney@batisseurs.com - */ - - -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -public abstract class AccountImpl2Bean implements EntityBean { - - // Keep the reference on the EntityContext - protected EntityContext entityContext; - - /* ========================= ejbCreate methods ============================ */ - - /** - * There must be one ejbCreate() method per create() method on the Home - * interface, and with the same signature. - * @param accno account number - * @param customer customer name - * @param balance initial balance - * @return pk primary key set to null - */ - public Integer ejbCreate(int val_accno, String val_customer, double val_balance) throws CreateException { - - // Init object state - setAccno(val_accno); - setCustomer(val_customer); - setBalance(val_balance); - return null; - } - - /** - * Each ejbCreate method should have a matching ejbPostCreate method - */ - public void ejbPostCreate(int val_accno, String val_customer, double val_balance) { - // Nothing to be done for this simple example. - } - - /* - * ====================== javax.ejb.EntityBean implementation - * ================= - */ - - /** - * A container invokes this method when the instance is taken out of the - * pool of available instances to become associated with a specific EJB - * object. This method transitions the instance to the ready state. This - * method executes in an unspecified transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbActivate() { - // Nothing to be done for this simple example. - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. This method - * always executes in the proper transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbLoad() { - // Nothing to be done for this simple example, in implicit persistance. - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. After this method - * completes, the container will place the instance into the pool of - * available instances. This method executes in an unspecified transaction - * context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbPassivate() { - // Nothing to be done for this simple example. - } - - /** - * A container invokes this method before it removes the EJB object that is - * currently associated with the instance. This method is invoked when a - * client invokes a remove operation on the enterprise Bean's home interface - * or the EJB object's remote interface. This method transitions the - * instance from the ready state to the pool of available instances. This - * method is called in the transaction context of the remove operation. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - * @exception RemoveException The enterprise Bean does not allow destruction - * of the object. - */ - public void ejbRemove() throws RemoveException { - // Nothing to be done for this simple example, in implicit persistance. - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. This method always - * executes in the proper transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbStore() { - // Nothing to be done for this simple example, in implicit persistance. - } - - /** - * Sets the associated entity context. The container invokes this method on - * an instance after the instance has been created. This method is called in - * an unspecified transaction context. - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void setEntityContext(EntityContext ctx) { - - // Keep the entity context in object - entityContext = ctx; - } - - /** - * Unsets the associated entity context. The container calls this method - * before removing the instance. This is the last method that the container - * invokes on the instance. The Java garbage collector will eventually - * invoke the finalize() method on the instance. This method is called in an - * unspecified transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void unsetEntityContext() { - entityContext = null; - } - - /** - * Business method to get the Account number - */ - public int getNumber() { - return getAccno(); - } - - /* - * ========================= Account implementation - * ============================ - */ - - public abstract String getCustomer(); - - public abstract void setCustomer(String customer); - - public abstract double getBalance(); - - public abstract void setBalance(double balance); - - public abstract int getAccno(); - - public abstract void setAccno(int accno); - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/eb/AccountImplBean.java b/jonas_tests/examples/base/examples/src/eb/AccountImplBean.java deleted file mode 100644 index bc6a5e5d95d7a939cce0664fd333d96ddc7216d0..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/AccountImplBean.java +++ /dev/null @@ -1,248 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package eb; - -/** - * Accountbean is an entity bean with "container managed persistence". The state - * of an instance is stored into a relational database. The following table - * should exist: create table ACCOUNT (ACCNO integer primary key, CUSTOMER - * varchar(30), BALANCE number(15,4)); - * @author JOnAS team - */ - - -import javax.ejb.CreateException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -public class AccountImplBean implements EntityBean { - - // Keep the reference on the EntityContext - protected EntityContext entityContext; - - // Object state - public Integer accno; - - public String customer; - - public double balance; - - /* ========================= ejbCreate methods ============================ */ - - /** - * There must be one ejbCreate() method per create() method on the Home - * interface, and with the same signature. - * @param accno account number - * @param customer customer name - * @param balance initial balance - * @return pk primary key set to null - */ - public Integer ejbCreate(int val_accno, String val_customer, double val_balance) throws CreateException { - - // Init object state - accno = new Integer(val_accno); - customer = val_customer; - balance = val_balance; - return null; - } - - /** - * Each ejbCreate method should have a matching ejbPostCreate method - */ - public void ejbPostCreate(int val_accno, String val_customer, double val_balance) { - // Nothing to be done for this simple example. - } - - /* - * ====================== javax.ejb.EntityBean implementation - * ================= - */ - - /** - * A container invokes this method when the instance is taken out of the - * pool of available instances to become associated with a specific EJB - * object. This method transitions the instance to the ready state. This - * method executes in an unspecified transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbActivate() { - // Nothing to be done for this simple example. - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. This method - * always executes in the proper transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbLoad() { - // Nothing to be done for this simple example, in implicit persistance. - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. After this method - * completes, the container will place the instance into the pool of - * available instances. This method executes in an unspecified transaction - * context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbPassivate() { - // Nothing to be done for this simple example. - } - - /** - * A container invokes this method before it removes the EJB object that is - * currently associated with the instance. This method is invoked when a - * client invokes a remove operation on the enterprise Bean's home interface - * or the EJB object's remote interface. This method transitions the - * instance from the ready state to the pool of available instances. This - * method is called in the transaction context of the remove operation. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - * @exception RemoveException The enterprise Bean does not allow destruction - * of the object. - */ - public void ejbRemove() throws RemoveException { - // Nothing to be done for this simple example, in implicit persistance. - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. This method always - * executes in the proper transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbStore() { - // Nothing to be done for this simple example, in implicit persistance. - } - - /** - * Sets the associated entity context. The container invokes this method on - * an instance after the instance has been created. This method is called in - * an unspecified transaction context. - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void setEntityContext(EntityContext ctx) { - - // Keep the entity context in object - entityContext = ctx; - } - - /** - * Unsets the associated entity context. The container calls this method - * before removing the instance. This is the last method that the container - * invokes on the instance. The Java garbage collector will eventually - * invoke the finalize() method on the instance. This method is called in an - * unspecified transaction context. - * @exception EJBException Thrown by the method to indicate a failure caused - * by a system-level error. - * @exception RemoteException - This exception is defined in the method - * signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specification should throw - * the javax.ejb.EJBException instead of this exception. - */ - public void unsetEntityContext() { - entityContext = null; - } - - /* - * ========================= Account implementation - * ============================ - */ - - /** - * Business method for returning the balance. - * @return balance - */ - public double getBalance() { - - return balance; - } - - /** - * Business method for updating the balance. - * @param d balance to update - */ - public void setBalance(double d) { - - balance = balance + d; - } - - /** - * Business method for returning the customer. - * @return customer - */ - public String getCustomer() { - - return customer; - } - - /** - * Business method for changing the customer name. - * @param c customer to update - */ - public void setCustomer(String c) { - - customer = c; - } - - /** - * Business method to get the Account number - */ - public int getNumber() { - return accno.intValue(); - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/eb/Accounthsqldb.sql b/jonas_tests/examples/base/examples/src/eb/Accounthsqldb.sql deleted file mode 100644 index 4885f418eeef0d17c0f704843e720c037f839552..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/Accounthsqldb.sql +++ /dev/null @@ -1,12 +0,0 @@ -drop table accountsample_; -create table accountsample_ ( - accno_ integer primary key, - customer_ varchar(30), - balance_ float -); -insert into accountsample_ values(101, 'Antoine de St Exupery', 200.00); -insert into accountsample_ values(102, 'alexandre dumas fils', 400.00); -insert into accountsample_ values(103, 'conan doyle', 500.00); -insert into accountsample_ values(104, 'alfred de musset', 100.00); -insert into accountsample_ values(105, 'phileas lebegue', 350.00); -insert into accountsample_ values(106, 'alphonse de lamartine', 650.00); diff --git a/jonas_tests/examples/base/examples/src/eb/ClientAccount.java b/jonas_tests/examples/base/examples/src/eb/ClientAccount.java deleted file mode 100644 index efb4a15f0a3f73170063a16e63bd524f27655ff3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/ClientAccount.java +++ /dev/null @@ -1,170 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package eb; - -import java.util.Enumeration; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; - -/** - * Sample for entity beans. Usage: implicit persistance: java eb.ClientAccount - * AccountImplHome explicit persistance: java eb.ClientAccount AccountExplHome - * @author JOnAS team - */ -public class ClientAccount { - - /** - * UserTransaction object - */ - private static UserTransaction utx = null; - - private static void accountList(AccountHome h) { - Enumeration alist; - Account acc; - try { - utx.begin(); // faster if made inside a Tx - alist = h.findAllAccounts(); - while (alist.hasMoreElements()) { - acc = (Account) PortableRemoteObject.narrow(alist.nextElement(), Account.class); - System.out.println(acc.getNumber() + " " + acc.getCustomer() + " " + acc.getBalance()); - } - utx.commit(); - } catch (Exception e) { - System.err.println("Exception getting account list: " + e); - System.exit(2); - } - } - - public static void main(String[] args) { - - // 1st arg. is the bean home (AccountImplHome or AccountExplHome) - String beanName = args[0]; - - // get JNDI initial context - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - System.err.println("Cannot get initial context for JNDI: " + e); - System.exit(2); - } - - // We want to start transactions from client: get UserTransaction - System.out.println("Getting a UserTransaction object from JNDI"); - try { - - // Comment the following lines if you want to use a David Client: - utx = (UserTransaction) initialContext.lookup("javax.transaction.UserTransaction"); - - } catch (Exception e) { - System.err.println("Cannot lookup UserTransaction: " + e); - System.exit(2); - } - - // Connecting to Home thru JNDI - System.out.println("Connecting to the AccountHome"); - AccountHome home = null; - try { - home = (AccountHome) PortableRemoteObject.narrow(initialContext.lookup(beanName), AccountHome.class); - } catch (Exception e) { - System.err.println("Cannot lookup " + beanName + ": " + e); - System.exit(2); - } - - // List existing Accounts - System.out.println("Getting the list of existing accounts in database"); - accountList(home); - - // Create a first Account - System.out.println("Creating a new Account in database"); - Account a1 = null; - try { - a1 = home.create(109, "John Smith", 0); - } catch (Exception e) { - System.err.println("Cannot create Account: " + e); - System.exit(2); - } - - // Find a second Account - System.out.println("Finding an Account by its number in database"); - Account a2 = null; - try { - a2 = home.findByNumber(102); - } catch (Exception e) { - System.err.println("Cannot find Account: " + e); - System.exit(2); - } - - // First transaction (committed): - // transfert 100 from a2 to a1 - System.out.println("Starting a first transaction, that will be committed"); - try { - double value = 100.00; - utx.begin(); - a1.setBalance(value); - a2.setBalance(-value); - utx.commit(); - } catch (Exception e) { - System.err.println("exception during 1st Tx: " + e); - System.exit(2); - } - - // Start another transaction (rolled back): - // transfert 20 from a1 to a2 - System.out.println("Starting a second transaction, that will be rolled back"); - try { - double value = 20.00; - utx.begin(); - a1.setBalance(-value); - a2.setBalance(value); - utx.rollback(); - } catch (Exception e) { - System.err.println("exception during 2nd Tx: " + e); - System.exit(2); - } - - // List existing Accounts - System.out.println("Getting the new list of accounts in database"); - accountList(home); - - // Delete account - System.out.println("Removing Account previously created in database"); - try { - a1.remove(); - } catch (Exception e) { - System.err.println("exception during remove: " + e); - System.exit(2); - } - - // Exit program - System.out.println("ClientAccount terminated"); - } - -} - diff --git a/jonas_tests/examples/base/examples/src/eb/README b/jonas_tests/examples/base/examples/src/eb/README deleted file mode 100644 index 008d5088f95a1d053933be929ec879e2d2c0eaf9..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/README +++ /dev/null @@ -1,42 +0,0 @@ -Copyright (C) BULL S.A. 1998-2002 - -This example illustrate the use of entity beans - -Entity beans "Account" ----------------------- -AccountImp2 entity bean with "container managed" persistance EJB2.x -AccountImpl entity bean with "container managed" persistance EJB1.x -AccountExpl entity bean with "bean managed" persistance - - -Compiling this example: ------------------------ -ant -find build.xml install - - -Running this example: ---------------------- -Your database access should be configured: a properties file defining a - Datasource object should be defined in $JONAS_BASE/conf (e.g. HSQL1.properties), - and the property jonas.service.dbm.datasources of the jonas.properties file should - be set to the name of this datasource description file (e.g. HSQL1). See JOnAS - documentation for more details. - You must also, the first time you run the test, create the table in the database. - If you use the default database embedded in JOnAS (hsqldb) you only have to do - ant init_db (in this directory) after having started JOnAS. - For Other databases scripts SQL are provided Account.sql for Oracle - Account.pgsql for Postgres. - - -1) Run an JOnAS Server to make beans available to clients: - - jonas start - -2) Run the client via the Ant task runclient - ant runclient - -4) Stop the jonas server - jonas stop - - - diff --git a/jonas_tests/examples/base/examples/src/eb/application-client.xml b/jonas_tests/examples/base/examples/src/eb/application-client.xml deleted file mode 100644 index 13436c357a7d391a38bfe7ac340abd00749605df..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/application-client.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Client of the sb sample - - diff --git a/jonas_tests/examples/base/examples/src/eb/build.xml b/jonas_tests/examples/base/examples/src/eb/build.xml deleted file mode 100644 index 3bb6e603af3686d8744986058e16132fc7fdead4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/build.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/eb/db1.prp b/jonas_tests/examples/base/examples/src/eb/db1.prp deleted file mode 100644 index 9d87d68d0e919828f6375a515f40b54d58268544..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/db1.prp +++ /dev/null @@ -1,325 +0,0 @@ -!--------------------------------------------------------------------- -! -! PROPERTIES for the InstantDB database used in the JOnAS eb example -! (builded from InstantDB/3.25/Examples/sample.prp) -! -!--------------------------------------------------------------------- - -!--------------------------------------------------------------------- -! -! BASIC PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Path where index tables are held. Can be absolute or relative -! to the properties file. Defaults to tablePath. -! -indexPath=./tmp/indexes -! -! Path where system tables are held. Can be absolute or relative to -! the properties file. Defaults to tablePath. -! -systemPath=./tmp/system -! -! Path where database tables are held. Can be absolute or relative -! to the properties file. Defaults to "current" directory. -! -tablePath=./tmp/tables -! -! Path where results set tables are held. Can be absolute or relative -! to the properties file. Defaults to tablePath. -! -tmpPath=./tmp/tmp -! -! Non-zero means paths are relative to the properties file. -! Default is absolute paths for files. -! -relativeToProperties=1 -! -! Alternative partitions can be defined so that tables can be placed -! in multiple locations. Each partition is numbered: 1, 2, 3,... Tables -! can be created on partitions using the syntax -! -! CREATE TABLE ON PARTITION ... -! -! The partition count has to be supplied. -! -!partitionCount=2 -! -! The locations of each partition must be supplied. These are always -! absolute path names. -! -!partition1=d:/petes -!partition2=c:/temp - - -!--------------------------------------------------------------------- -! -! TUNING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! The amount of each column to cache, expressed either as an absolute -! number of rows or as a percentage figure. Defaults to 256 or 10 respectively. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -cacheAmount=512 -! -! CACHE_ROWS Must be one of CACHE_ROWS or CACHE_PERCENT. Determines whether -! to cache columns in tables based on an absolute number of rows, or the -! percentage number of rows in the table. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -cacheCondition=CACHE_ROWS -! -! The amount of the system tables to be cached. Defaults to 100. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!systemCacheSize=10 -! -! Similar to cacheCondition, but applies only to the system tables. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!systemCacheCondition=CACHE_ROWS -! -! The percentage cache hit improvement required in order to move the -! cache to a new location in a column. -! -! (Currently not implemented). -! -cacheResetPercent=10 -! -! Non-zero means that database changes do not get written to the -! database immediately. See tuning.html. -! -fastUpdate=0 -! -! Percentage of free space in an index that must be present before -! the index reorganises itself. High values means frequent index -! reorganisation. Low values means slow index inserts. -! -indexLoad=5 -! -! The number of cache misses to include in calculations of the next -! base for the cache. -! -! (Currently not implemented). -! -missesInCacheStats=100 -! -! Non-zero means that results sets get instantiated on disk. By default -! InstantDB holds results sets emtirely in memory (apart from Binary -! columns). For large results sets this can be a problem. This property -! forces all results sets to be held on disk. -! -resultsOnDisk=0 -! -! Similar to cacheCondition but applies only to disk based -! results sets. Default is CACHE_ROWS. -! -resultsSetCache=CACHE_ROWS -! -! Similar to cacheAmount but applies only to disk based -! results sets. Default is 100. -! -resultsSetCacheAmount=100 -! -! Number of rows to read into the disk read ahead buffer. -! Recommended to be set somewhere around 128 to 256. -! Default is 20. -! -rowCacheSize=128 -! -! The read ahead buffer is effective at speeding up full -! table scans. However for indexed lookups or multiple -! simultaneous scans it is better to read a single row at -! a time. Each table holds a small number of single row -! buffers to improve such operations. Default is 8. -! -!singleRowCount=4 -! -! Sometimes the look ahead buffer can be held by a single -! thread even though it is not retrieveing many values from it. -! If too many lookups retrieve data from the single row -! buffers then it is better to flush the look ahead buffer and -! make it available for re-use. Default is 128. -! -!flushAfterCacheMisses=64 -! -! Number of rows to read ahead for system tables. By default -! system tables cache everything, so it is wasteful to have large -! read ahead buffers since they will very rarely be used. This -! allows the size of the system read ahead buffers to be reduced -! if necessary. Defaults to rowCacheSize. -! -!systemRows=20 -! -! The control column in all tables normally has a large cache -! since this speeds up all operation on that table. This can be -! varied to either improve performance or to reduce space. -! default is 8192. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!controlColCacheSize=512 -! -! By default, InstantDB only does a cursory search for deleted rows during -! UPDATE statements. Setting searchDeletes=1 causes more detailed searches -! for deleted rows. This slows down UPDATE executions, but reults in more -! compact tables. Default is 0. -! -searchDeletes=0 -! -! The interval, in milliseconds, between checks for statement execution -! timeouts. Default is 5000. -! -!timerCheck=5000 - -!--------------------------------------------------------------------- -! -! LOGGING AND DEBUGGING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Non-zero means include SQL statements in the export file. -! -exportSQL=0 -! -! Non-zero means trace output also directed to console. -! Defaults to 0. -! -!traceConsole=1 -traceConsole=0 -! -! Relative or absolute path where exporting and tracing goes. -! -traceFile=./tmp/trace.log -! -! Bitmap of various items that can be traced. See debug.html. -! Defaults to 0. -! -traceLevel=2 - - -!--------------------------------------------------------------------- -! -! TRANSACTION AND RECOVERY PROPERTIES -! -!--------------------------------------------------------------------- - -! -! 0 means do not perform recovery on startup. -! 1 means perform automatic recovery -! 2 (default) means prompt the user using standard in -! -recoveryPolicy=2 -! -! Sets the level of transaction journalling. See trans.html. -! Defaults to 1. -! -! 0 - No journalling takes place. -! 1 - Normal journalling (default). -! 2 - Full journalling. -! -transLevel=1 -! -! When doing an import, defines the number of rows imported -! before the transaction is committed. Recommended value 8192. -! defaults to 100. -! -transImports=100 - -!--------------------------------------------------------------------- -! -! DATE, TIME AND CURRENCY PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Number of digits after decimal point in currency outputs. Defaults to 2. -! -currencyDecimal=2 -! -! Currency symbol used in currency outputs. Defaults to $. -! -currencySymbol=$ -! -! Default format for date columns. Defaults to "yyyy-mm-dd". -! -dateFormat=yyyy-mm-dd -! -! Default format for timestamp columns. Defaults to "yyyy-mm-dd hh:mm:ss.lll". -! -dateTimeFormat=yyyy-mm-dd hh:mm:ss.lll -! -! If set, then all two digit dates less than its value are interpreted -! as 21st century dates. -! -!milleniumBoundary=50 -! -! Set to 1 causes the date string "now" to store a full timestamp. -! Default is to store only the date for fields with now hour in the -! format string. -! -nowMeansTime=0 - -!--------------------------------------------------------------------- -! -! STRING HANDLING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! If set to 1 then String hashes use the JDK Object.hashCode() function. -! By default, uses InstantDB's String hashing. -! -altStringHashing=0 -! -! Set to 1 to cause LIKE clauses to always perform case insensitive -! comparisons. -! -likeIgnoreCase=0 -! -! Same as SET LITERAL STRICT_ON. Prevents string literals being interpreted -! as column names or numbers. Default is 0. -! -strictLiterals=0 -! -! Set this value to 1 (one) if you would like PreparedStatement.setString() -! to ignore "\" (backslash) characters when proceesing string constants. -! When set, InstantDB will not attempt to interpret \ as the start of an -! escape sequence. Default is 0. -! -!prepareIgnoresEscapes=1 - -!--------------------------------------------------------------------- -! -! MISCELLANEOUS PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Allows selected InstantDB keywords to be un-reserved. -! e.g. ignoreKeywords=url,quote would allow the keywords -! url and quote to be used as table or column names. -! -! This faciliy is provided for compatatbility reasons only. -! It's use is not recommended AND IS NOT SUPPORTED. -! -!ignoreKeywords -! -! Non-zero means database is opened in read only mode. -! -readOnly=0 diff --git a/jonas_tests/examples/base/examples/src/eb/eb.xml b/jonas_tests/examples/base/examples/src/eb/eb.xml deleted file mode 100644 index f8f7d7d5f06e33de8c8a31f2a2985b04a7af79b4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/eb.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - Deployment descriptor for the eb JOnAS example - eb example - - - Deployment descriptor for the AccountExpl bean JOnAS example - AccountExpl - eb.AccountHome - eb.Account - eb.AccountExplBean - Bean - java.lang.Integer - false - - jdbc/AccountExplDs - javax.sql.DataSource - Container - - - - Deployment descriptor for the AccountImpl bean JOnAS example - AccountImpl - eb.AccountHome - eb.Account - eb.AccountImplBean - Container - java.lang.Integer - false - 1.x - - accno - - - customer - - - balance - - accno - - - - Deployment descriptor for the AccountImpl2 bean with CMP2 JOnAS example - AccountImpl2 - eb.AccountHome - eb.Account - eb.AccountImpl2Bean - Container - java.lang.Integer - false - 2.x - accountsample - - accno - - - customer - - - balance - - accno - - - findByNumber - - int - - - SELECT OBJECT(o) FROM accountsample o WHERE o.accno = ?1 - - - - findAllAccounts - - - SELECT OBJECT(o) FROM accountsample o - - - - - - - - AccountExpl - * - - Required - - - - AccountImpl - * - - Required - - - - - AccountImpl2 - * - - Required - - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/eb/jonas-eb.xml b/jonas_tests/examples/base/examples/src/eb/jonas-eb.xml deleted file mode 100644 index 1527da5e52847c1244186faa37dffd00c0a9fcbc..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/eb/jonas-eb.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - AccountExpl - AccountExplHome - - jdbc/AccountExplDs - jdbc_1 - - - - - AccountImpl - AccountImplHome - - jdbc_1 - accountsample_ - - accno - accno_ - - - customer - customer_ - - - balance - balance_ - - - - findByNumber - - where accno_ = ? - - - - findAllAccounts - - - - - - - - AccountImpl2 - AccountImpl2Home - - jdbc_1 - - - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/lb/Client.java b/jonas_tests/examples/base/examples/src/lb/Client.java deleted file mode 100644 index 0546c28fa15695e6cce388f41dbe50bd825d9ba9..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/Client.java +++ /dev/null @@ -1,202 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package lb; - -import java.rmi.RemoteException; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -/** - * Client of the lb JOnAS example - * @author Helene Joanin - */ -public class Client { - - static Context initialContext = null; - - static ManagerHome home = null; - - static Manager manager = null; - - static boolean m_noinit = false; - - static int m_accounts = 4; - - static int m_valmove = 100; - - static int m_loops = 10; - - static int inival = 1000; - - public static void main(String[] args) { - // Get command args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - Integer i_arg; - if (s_arg.equals("-ni")) { - m_noinit = true; - } else if (s_arg.equals("-a")) { - s_arg = args[++argn]; - i_arg = java.lang.Integer.valueOf(s_arg); - m_accounts = i_arg.intValue(); - } else if (s_arg.equals("-m")) { - s_arg = args[++argn]; - i_arg = java.lang.Integer.valueOf(s_arg); - m_valmove = i_arg.intValue(); - } else if (s_arg.equals("-l")) { - s_arg = args[++argn]; - i_arg = java.lang.Integer.valueOf(s_arg); - m_loops = i_arg.intValue(); - } else { - usage(); - fatalError("wrong usage"); - } - } - - info("Calling lb.Client with : -a " + m_accounts + " -m " + m_valmove + " -l " + m_loops); - - // Get InitialContext - try { - initialContext = new InitialContext(); - } catch (NamingException e) { - fatalError("Cannot get InitialContext: " + e); - } - - // Create manager session bean - try { - home = (ManagerHome) javax.rmi.PortableRemoteObject.narrow(initialContext.lookup("ManagerHome"), - ManagerHome.class); - manager = home.create(inival); - } catch (Exception e) { - fatalError("Cannot create manager: " + e); - } - - // Create all accounts if noinit==false - if (!m_noinit) { - info("Re-initialization of the accounts database table"); - try { - manager.createAll(m_accounts); - } catch (Exception e) { - fatalError("Cannot create initial accounts: " + e); - } - } - - // Set move value - try { - manager.setValue(m_valmove); - } catch (Exception e) { - fatalError("Cannot init Session: " + e); - } - - // main loop - try { - for (int i = 0; i < m_loops; i++) { - // Choose the 2 accounts randomly - int d1 = random(m_accounts); - int c1 = random(m_accounts); - info(" Movement " + d1 + " -> " + c1 + ""); - // Set these accounts in session bean - manager.setAccounts(d1, c1); - // make the transfert - try { - manager.movement(); - } catch (RemoteException r) { - error("movement raised exception. ignoring..."); - } - // Check account that was debited - if (manager.checkAccount(d1) == false) { - error("Bad Account after move on account " + d1); - error("Stopping this session because some accounts are not ok"); - break; - } - } - } catch (Exception e) { - fatalError("Exception in main loop :" + e); - } - - // Check all accounts - try { - if (manager.checkAll() == false) { - error("FAIL when checking all accounts"); - } else { - info("PASS when checking all accounts"); - } - } catch (RemoteException e) { - error("checkAll() :" + e); - } - - // remove session bean - try { - manager.remove(); - } catch (Exception e) { - error("Cannot remove manager session: " + e); - } - - } - - /** - * Returns an integer between 0 and max-1 - */ - static int random(int max) { - - double d = Math.random(); - int ret = (int) (max * d); - return ret; - } - - /** - * Display the usage - */ - static void usage() { - info("lb.Client [-ni] [-a accounts] [-m value] [-l loops]"); - } - - /** - * Display the given information message - */ - static void info(String infoMsg) { - System.out.println(infoMsg); - } - - /** - * Display the given error message - */ - static void error(String errMsg) { - System.out.println("lb.Client error: " + errMsg); - } - - /** - * Display the given error message and exits - */ - static void fatalError(String errMsg) { - System.out.println("lb.Client fatal error: " + errMsg); - System.exit(2); - } - -} - diff --git a/jonas_tests/examples/base/examples/src/lb/ManacEC.java b/jonas_tests/examples/base/examples/src/lb/ManacEC.java deleted file mode 100644 index 22cbd95fa4c2112969e6a6b8ca812aadc35a21c8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/ManacEC.java +++ /dev/null @@ -1,225 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package lb; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.RemoveException; - -/** - * Manac Implementation - * @author Philippe Durieux - */ -public class ManacEC implements EntityBean { - - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // State of the bean. - // They must be public for Container Managed Persistance. - // ------------------------------------------------------------------ - public String name; - - public int num; - - public int balance; - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. The container invokes this method on - * an instance after the instance has been created. This method is called in - * an unspecified transaction context. - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setEntityContext(EntityContext ctx) { - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. This is the last method that the container - * invokes on the instance. The Java garbage collector will eventually - * invoke the finalize() method on the instance. This method is called in an - * unspecified transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void unsetEntityContext() { - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object that is - * currently associated with the instance. This method is invoked when a - * client invokes a remove operation on the enterprise Bean's home interface - * or the EJB object's remote interface. This method transitions the - * instance from the ready state to the pool of available instances. This - * method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of - * the object. - * @throws EJBException - Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbRemove() throws RemoveException { - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. This method - * always executes in the proper transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - if (balance < 0) { - System.out.println(name + " : Bad balance loaded"); - throw new EJBException("ejbLoad: Balance " + name + " was negative =" + balance); - } - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. This method always - * executes in the proper transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - if (balance < 0) { - System.out.println(name + " : Bad balance stored"); - throw new EJBException("ejbStore: Balance " + name + " was negative =" + balance); - } - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public java.lang.String ejbCreate(int num, String name, int ib) throws CreateException, DuplicateKeyException { - - // Init here the bean fields - this.num = num; - this.name = new String(name); - this.balance = ib; - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate per ejbCreate method - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(int num, String name, int ib) throws CreateException { - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public java.lang.String ejbCreateWithDefaultName(int num, int ib) throws CreateException, DuplicateKeyException { - - // Init here the bean fields - this.num = num; - this.name = "M" + (new Integer(num)).toString(); - this.balance = ib; - - // In CMP, should return null. - return null; - } - - /** - * There must be an ejbPostCreate per ejbCreate method - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreateWithDefaultName(int num, int ib) throws CreateException { - - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - // balance may be wrong in case of rollback. - // Anyway, this instance is being released now, so no problem! - balance = -80000; - } - - /** - * A container invokes this method when the instance is taken out of the - * pool of available instances to become associated with a specific EJB - * object. - */ - public void ejbActivate() { - } - - // ------------------------------------------------------------------ - // Manac implementation - // ------------------------------------------------------------------ - - /** - * getBalance - */ - public int getBalance() { - return balance; - } - - /** - * credit - */ - public void credit(int v) { - balance += v; - } - - /** - * debit - */ - public void debit(int v) { - balance -= v; - if (balance < 0) { - System.out.println(name + " : set rollback only."); - ejbContext.setRollbackOnly(); - balance = -90000; // put it a very bad balance to check rollback is - // OK - } - } - - public String getName() { - return name; - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/lb/ManacLocal.java b/jonas_tests/examples/base/examples/src/lb/ManacLocal.java deleted file mode 100644 index 103a01b3592c14912bc8321b87153be9b08d706e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/ManacLocal.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package lb; - -import javax.ejb.EJBLocalObject; - -/** - * Manac local interface - * @author Philippe Durieux - */ -public interface ManacLocal extends EJBLocalObject { - - int getBalance(); - - void credit(int value); - - void debit(int value); - - String getName(); -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/lb/ManacLocalHome.java b/jonas_tests/examples/base/examples/src/lb/ManacLocalHome.java deleted file mode 100644 index 16e22f47303dea7bc12d71ce87d8a732e8dcfd8c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/ManacLocalHome.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package lb; - -import java.util.Collection; - -import javax.ejb.CreateException; -import javax.ejb.EJBLocalHome; -import javax.ejb.FinderException; - -/** - * Local Home interface for the bean Manac - * @author Philippe Durieux, Helene Joanin - */ -public interface ManacLocalHome extends EJBLocalHome { - - ManacLocal create(int num, String name, int initbal) throws CreateException; - - ManacLocal createWithDefaultName(int num, int initbal) throws CreateException; - - ManacLocal findByPrimaryKey(java.lang.String pk) throws FinderException; - - ManacLocal findByNum(int num) throws FinderException; - - Collection findAll() throws FinderException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/lb/Manager.java b/jonas_tests/examples/base/examples/src/lb/Manager.java deleted file mode 100644 index 5470630b1e2cbe452203e9c6fb0956c29a4f7756..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/Manager.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package lb; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -/** - * Manager remote interface - * @author Philippe Durieux - */ -public interface Manager extends EJBObject { - - void createAll(int nb) throws RemoteException; - - void setAccounts(int d1, int c1) throws RemoteException; - - void setValue(int v) throws RemoteException; - - void movement() throws RemoteException; - - boolean checkAll() throws RemoteException; - - boolean checkAccount(int a) throws RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/lb/ManagerHome.java b/jonas_tests/examples/base/examples/src/lb/ManagerHome.java deleted file mode 100644 index a94b076e50e8852390815a710db7cde2ceda9da3..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/ManagerHome.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package lb; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * Home interface for the bean Manager - * @author Philippe Durieux - */ -public interface ManagerHome extends EJBHome { - - Manager create(int ival) throws CreateException, RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/lb/ManagerSF.java b/jonas_tests/examples/base/examples/src/lb/ManagerSF.java deleted file mode 100644 index b58c4e964866f830b473874d8d2206bbe7f32961..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/ManagerSF.java +++ /dev/null @@ -1,281 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package lb; - -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Collection; -import java.util.Iterator; - -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.FinderException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.ejb.TransactionRolledbackLocalException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.sql.DataSource; - -/** - * Manager Implementation - * @author Philippe Durieux - */ -public class ManagerSF implements SessionBean { - - SessionContext ejbContext; - - ManacLocalHome manacLocalHome = null; - - int c1 = 0; - - int d1 = 0; - - ManacLocal cred1, deb1; - - int initialValue = 1000; - - int value = 10; - - // ------------------------------------------------------------------ - // init DataBase for Manac beans - // ------------------------------------------------------------------ - private void initDB() { - - // Get my DataSource from JNDI - DataSource ds = null; - InitialContext ictx = null; - try { - ictx = new InitialContext(); - } catch (Exception e) { - System.out.println("new InitialContext() : " + e); - throw new EJBException("Cannot get JNDI InitialContext"); - } - try { - ds = (DataSource) ictx.lookup("java:comp/env/jdbc/mydb"); - } catch (Exception e) { - System.out.println("cannot lookup datasource " + e); - throw new EJBException("cannot lookup datasource"); - } - - // Drop table - Connection conn = null; - Statement stmt = null; - // myTable must be from jonas-xml file (Manac bean) - String myTable = "manacsample"; - try { - conn = ds.getConnection(); - stmt = conn.createStatement(); - stmt.execute("drop table " + myTable); - stmt.close(); - } catch (SQLException e) { - // The first time, table will not exist. - } - - // Create table. - try { - stmt = conn.createStatement(); - stmt.execute("create table " + myTable - + "(c_name varchar(30) not null primary key, c_num integer, c_balance integer)"); - stmt.close(); - conn.close(); - } catch (SQLException e) { - System.out.println("Exception in createTable : " + e); - throw new EJBException("Exception in createTable"); - } - } - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method after - * the instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - ejbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the session - * object. This happens as a result of a client's invoking a remove - * operation, or when a container decides to terminate the session object - * after a timeout. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - } - - /** - * The Session bean must define 1 or more ejbCreate methods. - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate(int ival) throws CreateException { - - // lookup ManacLocalHome - try { - Context ictx = new InitialContext(); - manacLocalHome = (ManacLocalHome) ictx.lookup("java:comp/env/ejb/manac"); - } catch (NamingException e) { - System.out.println("ManagerSF : Cannot get ManacLocalHome:" + e); - throw new CreateException("Cannot get ManacLocalHome"); - } - - initialValue = ival; - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - } - - /** - * A container invokes this method when the instance is taken out of the - * pool of available instances to become associated with a specific EJB - * object. - */ - public void ejbActivate() { - } - - // ------------------------------------------------------------------ - // Manager implementation - // ------------------------------------------------------------------ - - public void createAll(int nb) throws RemoteException { - - // init database for Manac bean - initDB(); - - // create accounts - for (int i = 0; i < nb; i++) { - try { - manacLocalHome.createWithDefaultName(i, initialValue); - } catch (CreateException e) { - System.out.println("createAll:\n" + e); - throw new RemoteException("Cannot create Manac"); - } - } - } - - public void setAccounts(int d1, int c1) throws RemoteException { - this.d1 = d1; - this.c1 = c1; - try { - deb1 = manacLocalHome.findByNum(d1); - cred1 = manacLocalHome.findByNum(c1); - } catch (FinderException e) { - System.out.println("Cannot find manac bean:" + e); - throw new RemoteException("Cannot find manac bean"); - } - } - - public void setValue(int v) throws RemoteException { - this.value = v; - } - - public void movement() throws RemoteException { - - // credit accounts first because we don't want a rollback if - // same account is debited and credited in the same operation. - try { - cred1.credit(value); - } catch (EJBException e) { - System.out.println("ManagerSF: Cannot credit account:" + e); - throw new RemoteException("ManagerSF: Cannot credit account"); - } - - // debit accounts - try { - deb1.debit(value); - } catch (TransactionRolledbackLocalException e) { - System.out.println("ManagerSF: Rollback transaction"); - } catch (EJBException e) { - System.out.println("ManagerSF debit:" + e); - } - } - - public boolean checkAccount(int a) throws RemoteException { - - boolean ret = false; - ManacLocal m = null; - - try { - m = manacLocalHome.findByNum(a); - int b = m.getBalance(); - if (b >= 0) { - ret = true; - } else { - System.out.println("ManagerSF checkAccount: bad balance=" + b); - } - return ret; - } catch (Exception e) { - System.out.println("ManagerSF checkAccount: cannot check account: " + e); - return false; - } - } - - public boolean checkAll() throws RemoteException { - - int count = 0; - int total = 0; - try { - Collection accCol = manacLocalHome.findAll(); - for (Iterator accIter = accCol.iterator(); accIter.hasNext();) { - count++; - ManacLocal a = (ManacLocal) accIter.next(); - int balance = a.getBalance(); - if (balance < 0) { - System.out.println("checkAllAccounts: bad balance: " + balance); - return false; - } - String name = a.getName(); - total += balance; - } - } catch (Exception e) { - System.out.println("checkAllAccounts:" + e); - return false; - } - int exp = initialValue * count; - if (total != exp) { - System.out.println("checkAllAccounts: bad total: " + total + " (expected: " + exp + ")"); - return false; - } - return true; - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/lb/README b/jonas_tests/examples/base/examples/src/lb/README deleted file mode 100644 index 3af0ddfd4f2207f7f356d85a57feb2e1b81233d2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/README +++ /dev/null @@ -1,55 +0,0 @@ -The lb JOnAS example: ---------------------- - -This example illustrates the use of local interfaces. -This is a good example for understanding what must be done when a local client -(typically a session bean) is collocated with an entity bean providing local interfaces. - -This JOnAS example is inspired by the 'manac' JOnAS stress test: - jonas_tests/stress/src/org/objectweb/jonas/stests/manac - -It uses two enterprise beans "Manac" and "Manager". -The "Manac" bean is an entity bean with container-managed persistence. -Its Component and Home interfaces are local interfaces. -This bean represents an account. Its balance cannot be negative (rollback is set -in this case). - -The "Manager" bean is a stateful session bean and allows to manage the "Manac" bean, -i.e. to move amounts from an account to an other. - - -"Client" is the client of the "Manager" session bean. -It performs the following steps: -- initialization of the database table of accounts if no -ni argument. - (A specified number of accounts are created with a default balance 1000). -- transfer of a specified 'value' from an account to an other account, - 'loops' times; (accounts are choosen randomly). -- last, check the total of the balance of all the accounts. -Its usage is: - Client [-ni] [-a accounts] [-m value] [-l loops] -(Client -a 4 -m 100 -l 10 is the default usage) - - -Compiling this example: ------------------------ -This example is compiled with the others by "ant install" in $JONAS_ROOT/examples. - -Running this example: ---------------------- -Your database access should be configured: a properties files defining a - Datasource object should be defined in $JONAS_BASE/conf (e.g. InstantDB1.properties), - and the property jonas.service.dbm.datasources of the jonas.properties file should - be set to the name of this datasource description file (e.g. InstantDB1). See JOnAS - documentation for more details. - -1) Run an EJB Server to make beans available to clients: - - jonas start - -2) Run the client via the Ant task runclient - jclient -cp $JONAS_BASE/ejbjars/lb.jar lb.Client - or - ant runclient - -3) Stop the jonas server - jonas stop diff --git a/jonas_tests/examples/base/examples/src/lb/application-client.xml b/jonas_tests/examples/base/examples/src/lb/application-client.xml deleted file mode 100644 index 13436c357a7d391a38bfe7ac340abd00749605df..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/application-client.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Client of the sb sample - - diff --git a/jonas_tests/examples/base/examples/src/lb/build.xml b/jonas_tests/examples/base/examples/src/lb/build.xml deleted file mode 100644 index 978ced5399bb08c2bbef3c691bc9985602b91e1e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/build.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/lb/db1.prp b/jonas_tests/examples/base/examples/src/lb/db1.prp deleted file mode 100644 index 9d87d68d0e919828f6375a515f40b54d58268544..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/db1.prp +++ /dev/null @@ -1,325 +0,0 @@ -!--------------------------------------------------------------------- -! -! PROPERTIES for the InstantDB database used in the JOnAS eb example -! (builded from InstantDB/3.25/Examples/sample.prp) -! -!--------------------------------------------------------------------- - -!--------------------------------------------------------------------- -! -! BASIC PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Path where index tables are held. Can be absolute or relative -! to the properties file. Defaults to tablePath. -! -indexPath=./tmp/indexes -! -! Path where system tables are held. Can be absolute or relative to -! the properties file. Defaults to tablePath. -! -systemPath=./tmp/system -! -! Path where database tables are held. Can be absolute or relative -! to the properties file. Defaults to "current" directory. -! -tablePath=./tmp/tables -! -! Path where results set tables are held. Can be absolute or relative -! to the properties file. Defaults to tablePath. -! -tmpPath=./tmp/tmp -! -! Non-zero means paths are relative to the properties file. -! Default is absolute paths for files. -! -relativeToProperties=1 -! -! Alternative partitions can be defined so that tables can be placed -! in multiple locations. Each partition is numbered: 1, 2, 3,... Tables -! can be created on partitions using the syntax -! -! CREATE TABLE ON PARTITION ... -! -! The partition count has to be supplied. -! -!partitionCount=2 -! -! The locations of each partition must be supplied. These are always -! absolute path names. -! -!partition1=d:/petes -!partition2=c:/temp - - -!--------------------------------------------------------------------- -! -! TUNING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! The amount of each column to cache, expressed either as an absolute -! number of rows or as a percentage figure. Defaults to 256 or 10 respectively. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -cacheAmount=512 -! -! CACHE_ROWS Must be one of CACHE_ROWS or CACHE_PERCENT. Determines whether -! to cache columns in tables based on an absolute number of rows, or the -! percentage number of rows in the table. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -cacheCondition=CACHE_ROWS -! -! The amount of the system tables to be cached. Defaults to 100. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!systemCacheSize=10 -! -! Similar to cacheCondition, but applies only to the system tables. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!systemCacheCondition=CACHE_ROWS -! -! The percentage cache hit improvement required in order to move the -! cache to a new location in a column. -! -! (Currently not implemented). -! -cacheResetPercent=10 -! -! Non-zero means that database changes do not get written to the -! database immediately. See tuning.html. -! -fastUpdate=0 -! -! Percentage of free space in an index that must be present before -! the index reorganises itself. High values means frequent index -! reorganisation. Low values means slow index inserts. -! -indexLoad=5 -! -! The number of cache misses to include in calculations of the next -! base for the cache. -! -! (Currently not implemented). -! -missesInCacheStats=100 -! -! Non-zero means that results sets get instantiated on disk. By default -! InstantDB holds results sets emtirely in memory (apart from Binary -! columns). For large results sets this can be a problem. This property -! forces all results sets to be held on disk. -! -resultsOnDisk=0 -! -! Similar to cacheCondition but applies only to disk based -! results sets. Default is CACHE_ROWS. -! -resultsSetCache=CACHE_ROWS -! -! Similar to cacheAmount but applies only to disk based -! results sets. Default is 100. -! -resultsSetCacheAmount=100 -! -! Number of rows to read into the disk read ahead buffer. -! Recommended to be set somewhere around 128 to 256. -! Default is 20. -! -rowCacheSize=128 -! -! The read ahead buffer is effective at speeding up full -! table scans. However for indexed lookups or multiple -! simultaneous scans it is better to read a single row at -! a time. Each table holds a small number of single row -! buffers to improve such operations. Default is 8. -! -!singleRowCount=4 -! -! Sometimes the look ahead buffer can be held by a single -! thread even though it is not retrieveing many values from it. -! If too many lookups retrieve data from the single row -! buffers then it is better to flush the look ahead buffer and -! make it available for re-use. Default is 128. -! -!flushAfterCacheMisses=64 -! -! Number of rows to read ahead for system tables. By default -! system tables cache everything, so it is wasteful to have large -! read ahead buffers since they will very rarely be used. This -! allows the size of the system read ahead buffers to be reduced -! if necessary. Defaults to rowCacheSize. -! -!systemRows=20 -! -! The control column in all tables normally has a large cache -! since this speeds up all operation on that table. This can be -! varied to either improve performance or to reduce space. -! default is 8192. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!controlColCacheSize=512 -! -! By default, InstantDB only does a cursory search for deleted rows during -! UPDATE statements. Setting searchDeletes=1 causes more detailed searches -! for deleted rows. This slows down UPDATE executions, but reults in more -! compact tables. Default is 0. -! -searchDeletes=0 -! -! The interval, in milliseconds, between checks for statement execution -! timeouts. Default is 5000. -! -!timerCheck=5000 - -!--------------------------------------------------------------------- -! -! LOGGING AND DEBUGGING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Non-zero means include SQL statements in the export file. -! -exportSQL=0 -! -! Non-zero means trace output also directed to console. -! Defaults to 0. -! -!traceConsole=1 -traceConsole=0 -! -! Relative or absolute path where exporting and tracing goes. -! -traceFile=./tmp/trace.log -! -! Bitmap of various items that can be traced. See debug.html. -! Defaults to 0. -! -traceLevel=2 - - -!--------------------------------------------------------------------- -! -! TRANSACTION AND RECOVERY PROPERTIES -! -!--------------------------------------------------------------------- - -! -! 0 means do not perform recovery on startup. -! 1 means perform automatic recovery -! 2 (default) means prompt the user using standard in -! -recoveryPolicy=2 -! -! Sets the level of transaction journalling. See trans.html. -! Defaults to 1. -! -! 0 - No journalling takes place. -! 1 - Normal journalling (default). -! 2 - Full journalling. -! -transLevel=1 -! -! When doing an import, defines the number of rows imported -! before the transaction is committed. Recommended value 8192. -! defaults to 100. -! -transImports=100 - -!--------------------------------------------------------------------- -! -! DATE, TIME AND CURRENCY PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Number of digits after decimal point in currency outputs. Defaults to 2. -! -currencyDecimal=2 -! -! Currency symbol used in currency outputs. Defaults to $. -! -currencySymbol=$ -! -! Default format for date columns. Defaults to "yyyy-mm-dd". -! -dateFormat=yyyy-mm-dd -! -! Default format for timestamp columns. Defaults to "yyyy-mm-dd hh:mm:ss.lll". -! -dateTimeFormat=yyyy-mm-dd hh:mm:ss.lll -! -! If set, then all two digit dates less than its value are interpreted -! as 21st century dates. -! -!milleniumBoundary=50 -! -! Set to 1 causes the date string "now" to store a full timestamp. -! Default is to store only the date for fields with now hour in the -! format string. -! -nowMeansTime=0 - -!--------------------------------------------------------------------- -! -! STRING HANDLING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! If set to 1 then String hashes use the JDK Object.hashCode() function. -! By default, uses InstantDB's String hashing. -! -altStringHashing=0 -! -! Set to 1 to cause LIKE clauses to always perform case insensitive -! comparisons. -! -likeIgnoreCase=0 -! -! Same as SET LITERAL STRICT_ON. Prevents string literals being interpreted -! as column names or numbers. Default is 0. -! -strictLiterals=0 -! -! Set this value to 1 (one) if you would like PreparedStatement.setString() -! to ignore "\" (backslash) characters when proceesing string constants. -! When set, InstantDB will not attempt to interpret \ as the start of an -! escape sequence. Default is 0. -! -!prepareIgnoresEscapes=1 - -!--------------------------------------------------------------------- -! -! MISCELLANEOUS PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Allows selected InstantDB keywords to be un-reserved. -! e.g. ignoreKeywords=url,quote would allow the keywords -! url and quote to be used as table or column names. -! -! This faciliy is provided for compatatbility reasons only. -! It's use is not recommended AND IS NOT SUPPORTED. -! -!ignoreKeywords -! -! Non-zero means database is opened in read only mode. -! -readOnly=0 diff --git a/jonas_tests/examples/base/examples/src/lb/jonas-lb.xml b/jonas_tests/examples/base/examples/src/lb/jonas-lb.xml deleted file mode 100644 index ec4779578858b2cfe69ab5a5b15a31ae4839eceb..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/jonas-lb.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - Manager - ManagerHome - - jdbc/mydb - jdbc_1 - - - - - Manac - ManacLocalHome - - jdbc_1 - manacsample - - name - c_name - - - num - c_num - - - balance - c_balance - - - - findByNum - - where c_num = ? - - - - findAll - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/lb/lb.xml b/jonas_tests/examples/base/examples/src/lb/lb.xml deleted file mode 100644 index cd3838373204a0cdbedece89c6f7b179e44c8cc7..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/lb/lb.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - Deployment descriptor for the lb JOnAS example - lb example - - - - - Manager Session Bean with Remote interface - Manager - Manager - lb.ManagerHome - lb.Manager - lb.ManagerSF - Stateful - Container - - ejb/manac - Entity - lb.ManacLocalHome - lb.ManacLocal - Manac - - - jdbc/mydb - javax.sql.DataSource - Application - - - - - Managed Account Entity Bean, with local interface - Manac - Manac - lb.ManacLocalHome - lb.ManacLocal - lb.ManacEC - Container - java.lang.String - true - 1.x - - name - - - num - - - balance - - name - - - - - - - - Manac - * - - - Manager - * - - Supports - - - - - Manager - createAll - - NotSupported - - - - Manac - credit - - - Manac - debit - - - Manager - movement - - - Manager - checkAll - - - Manager - checkAccount - - Required - - - diff --git a/jonas_tests/examples/base/examples/src/mailsb/ClientMailer.java b/jonas_tests/examples/base/examples/src/mailsb/ClientMailer.java deleted file mode 100644 index 18dbed93adc913a6dc5a674c0a3413349b3dec45..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/ClientMailer.java +++ /dev/null @@ -1,282 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Florent BENOIT & Ludovic BERT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package mailsb; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.io.IOException; -import javax.naming.InitialContext; -import javax.naming.Context; -import javax.rmi.PortableRemoteObject; - -/** - * Sample for Mailer Session Bean. Usage: java mailsb.ClientMailer - * @author Florent Benoit - * @author Ludovic Bert - */ -public class ClientMailer { - - /** - * Session case - */ - private static final int SESSION_CASE = 1; - - /** - * MimePartDatasource case - */ - private static final int MIMEPARTDS_CASE = 2; - - /** - * Content of the mail - */ - private static String content = null; - - /** - * Constructor. Hide constructor as it is an utility class - */ - private ClientMailer() { - - } - - /** - * Read from bufferedReader the text which is given by the user after the - * given prompt. - * @param bufferedReader the buffer to read input. - * @param prompt the prompt asking the user. - * @return the text given by the user. - * @throws IOException if it can't the bufferedReader. - */ - private static String getTextFromUser(BufferedReader bufferedReader, String prompt) throws IOException { - - boolean isSet = false; - String txt = null; - while (!isSet) { - System.out.print(prompt + " :"); - txt = bufferedReader.readLine(); - if (!txt.equals("")) { - isSet = true; - } else { - System.out.println("'" + prompt + "' can't be empty."); - } - } - return txt; - } - - /** - * Main method of the class - * @param args the arguments of the program - */ -public static void main(String[] args) { - - //Check if there are valid args - if (args.length < 1) { - System.err.println("Syntax is : java mailsb.ClientMailer "); - System.exit(2); - } - - - int argType = 0; - if (args[0].equalsIgnoreCase("SessionMailer")) { - argType = SESSION_CASE; - } else if (args[0].equalsIgnoreCase("MimePartDSMailer")) { - argType = MIMEPARTDS_CASE; - } else { - System.err.println("Invalid type '" + args[0] + "', valid syntax is : java mailsb.ClientMailer "); - System.exit(2); - } - - //Get the initial context - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - System.err.println("Cannot get initial context for JNDI: " + e.getMessage()); - System.exit(2); - } - - switch (argType) { - case SESSION_CASE : - sessionMailer(initialContext); - break; - case MIMEPARTDS_CASE : - if (args.length > 1) { - content = "Content of mail :"; - for (int i = 1; i < args.length; i++) { - content += args[i]; - } - } - mimePartDSMailer(initialContext); - break; - default : - - } - - - } - /** - * Deal with the MimePartDSMailer bean - * @param initialContext the initial context - */ - private static void mimePartDSMailer(Context initialContext) { - - // Connecting to the mailer bean MailerHome thru JNDI - MimePartDSMailerHome mimePartDSMailerHome = null; - try { - System.out.print("Looking up the Session mailer home..."); - mimePartDSMailerHome = (MimePartDSMailerHome) PortableRemoteObject.narrow(initialContext - .lookup("MimePartDSMailerHome"), MimePartDSMailerHome.class); - System.out.println("OK !"); - } catch (Exception e) { - System.out.println("failed !"); - System.err.println("Cannot lookup MimePartDSMailerHome: " + e.getMessage()); - System.exit(2); - } - - // MimePartDSMailerBean creation - MimePartDSMailer mimePartDSMailer = null; - try { - System.out.print("Creating a MimePartDS mailer bean ..."); - mimePartDSMailer = mimePartDSMailerHome.create("MimePartDS mailer"); - System.out.println("OK !"); - } catch (Exception e) { - System.out.println("failed !"); - System.err.println("Cannot create MimePartDSMailerBean: " + e.getMessage()); - System.exit(2); - } - - if (content == null) { - //Read the value from the user - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in)); - - try { - System.out.println("Content of the mail (Only one line)"); - content = getTextFromUser(bufferedReader, "Content"); - } catch (IOException e) { - System.err.println("Cannot read line from the bufferedReader : " + e.getMessage()); - System.exit(2); - } - } - - //Set the message with a recipient, a subject and a content - try { - System.out.print("Setting the message with given content '" + content + "'..."); - mimePartDSMailer.setMessage(content); - System.out.println("OK !"); - } catch (Exception e) { - System.out.println("failed !"); - System.err.println("Cannot set args of the message : " + e); - System.exit(2); - } - - //And send the message - try { - System.out.print("Sending the message..."); - mimePartDSMailer.send(); - System.out.println("OK !"); - } catch (Exception e) { - System.out.println("Failed !"); - System.err.println("Cannot send the message with MailerBean:" + e); - System.exit(2); - } - } - - /** - * Deal with the SessionMailer bean - * @param initialContext the initial context - */ - private static void sessionMailer(Context initialContext) { - // Connecting to the mailer bean MailerHome thru JNDI - SessionMailerHome sessionMailerHome = null; - try { - System.out.print("Looking up the Session mailer home..."); - sessionMailerHome = (SessionMailerHome) PortableRemoteObject.narrow(initialContext - .lookup("SessionMailerHome"), SessionMailerHome.class); - System.out.println("OK !"); - } catch (Exception e) { - System.out.println("failed !"); - System.err.println("Cannot lookup MailerHome: " + e.getMessage()); - System.exit(2); - } - - // MailerBean creation - SessionMailer sessionMailer = null; - try { - System.out.print("Creating a session mailer bean..."); - sessionMailer = sessionMailerHome.create("mailer"); - System.out.println("OK !"); - } catch (Exception e) { - System.out.println("failed !"); - System.err.println("Cannot create MailerBean: " + e.getMessage()); - System.exit(2); - } - - String toRecipient = null; - String subject = null; - String content = null; - - //Read the value from the user - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(System.in)); - - try { - System.out.println("Recipient is the 'to' field of a mail"); - toRecipient = getTextFromUser(bufferedReader, "TO"); - - System.out.println("Subject of the mail"); - subject = getTextFromUser(bufferedReader, "Subject"); - - System.out.println("Content of the mail (Only one line)"); - content = getTextFromUser(bufferedReader, "Content"); - - } catch (IOException e) { - System.err.println("Cannot read line from the bufferedReader : " + e.getMessage()); - System.exit(2); - } - - //Set the message with a recipient, a subject and a content - try { - System.out.print("Setting the message with given args..."); - sessionMailer.setMessage(toRecipient, subject, content); - System.out.println("OK !"); - } catch (Exception e) { - System.out.println("failed !"); - System.err.println("Cannot set args of the message : " + e); - System.exit(2); - } - - //And send the message - try { - System.out.print("Sending the message..."); - sessionMailer.send(); - System.out.println("OK !"); - } catch (Exception e) { - System.out.println("Failed !"); - System.err.println("Cannot send the message with MailerBean:" + e); - System.exit(2); - } - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mailsb/MimePartDSMailer.java b/jonas_tests/examples/base/examples/src/mailsb/MimePartDSMailer.java deleted file mode 100644 index 19bc38a082fd7703e7e256fe0168d12a83b81a97..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/MimePartDSMailer.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Florent BENOIT & Ludovic BERT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package mailsb; - -import java.rmi.RemoteException; -import javax.ejb.EJBObject; - -/** - * Remote interface for the bean Mailer Work with - * javax.mail.internet.MimePartDataSource - * @author Florent Benoit - * @author Ludovic Bert - */ -public interface MimePartDSMailer extends EJBObject { - - /** - * Set the message with a specific recipient, subject and content. - * @param content the content of the message. - * @throws Exception if a problem occurs. - * @throws RemoteException if the call failed. - */ - void setMessage(String content) throws Exception, RemoteException; - - /** - * Send the message by creating it with the mail factory properties. - * @throws Exception if a problem occurs. - * @throws RemoteException if the call failed. - */ - void send() throws Exception, RemoteException; - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mailsb/MimePartDSMailerBean.java b/jonas_tests/examples/base/examples/src/mailsb/MimePartDSMailerBean.java deleted file mode 100644 index 98a232c9c3a6c7dffbcc32eb507a9b66ebe5fbc9..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/MimePartDSMailerBean.java +++ /dev/null @@ -1,228 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Florent BENOIT & Ludovic BERT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package mailsb; - -//import java -import java.rmi.RemoteException; - -//import javax -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -import javax.mail.Message; -import javax.mail.MessageContext; -import javax.mail.MessagingException; -import javax.mail.Transport; -import javax.mail.internet.MimePartDataSource; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -/** - * Implementation of the mailer Session Bean. It uses - * javax.mail.internet.MimePartDataSource This bean is a statefull, and - * synchronized bean. The container uses the SessionBean methods to notify the - * enterprise Bean instances of the instance's life cycle events. - * @author Florent Benoit - * @author Ludovic Bert - */ -public class MimePartDSMailerBean implements SessionBean { - - /** - * Name of the bean - */ - private String name = null; - - /** - * Session context that the container provides for a session enterprise Bean - * instance. - */ - private SessionContext sessionContext = null; - - /** - * Reference to the javax.mail.Message object which is the message to send - * with javamail - */ - private Message message = null; - - /* ========================= ejbCreate methods =========================== */ - - /** - * There must be one ejbCreate() method per create() method on the Home - * interface, and with the same signature. - * @param name the name of the bean - */ - public void ejbCreate(String name) { - this.name = name; - } - - /* =============== javax.ejb.SessionBean 2.0 implementation ============== */ - - /** - * Set the associated session context. The container calls this method after - * the instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for applications - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void setSessionContext(SessionContext sessionContext) throws EJBException, java.rmi.RemoteException { - this.sessionContext = sessionContext; - } - - /** - * A container invokes this method before it ends the life of the session - * object. This happens as a result of a client's invoking a remove - * operation, or when a container decides to terminate the session object - * after a timeout. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbRemove() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple mailer example - } - - /** - * The activate method is called when the instance is activated from its - * "passive" state. The instance should acquire any resource that it has - * released earlier in the ejbPassivate() method. This method is called with - * no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbActivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple mailer example - } - - /** - * The passivate method is called before the instance enters the "passive" - * state. The instance should release any resources that it can re-acquire - * later in the ejbActivate() method. After the passivate method completes, - * the instance must be in a state that allows the container to use the Java - * Serialization protocol to externalize and store away the instance's - * state. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbPassivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple mailer example - } - - /* ======================== Mailer implementation ======================== */ - - /** - * Set the message with a specific recipient, subject and content. - * @param content the content of the message. - * @throws Exception if a problem occurs. - * @throws RemoteException if the call failed. - */ - public void setMessage(String content) throws Exception, RemoteException { - - //Get the initial context - InitialContext ictx = null; - try { - ictx = new InitialContext(); - } catch (NamingException e) { - throw new Exception("Can not get an inital context : " + e.getMessage()); - } - - //get a new MimePartDataSource from our ENC envirnoment java:comp/env - MimePartDataSource mimePartDataSource = null; - try { - mimePartDataSource = (MimePartDataSource) ictx.lookup("java:comp/env/mail/MailMimePartDataSource"); - } catch (NamingException e) { - throw new Exception("You have not configure the mail factory with the name specified" - + " in the jonas-ejb-jar.xml file for java:comp/env/mail/MailMimePartDataSource ." - + " By default, the factory's name is mailMimePartDS_1 :" + e.getMessage()); - } - - //Get the message context - MessageContext messageContext = mimePartDataSource.getMessageContext(); - - if (messageContext == null) { - throw new Exception("Can not get the message Context of the mimepartDatasource"); - } - - //Get the message from the context - message = messageContext.getMessage(); - - try { - message.setContent(content, "text/plain"); - } catch (MessagingException e) { - throw new Exception("A failure occurs when setting content of the message :" + e.getMessage()); - } - } - - /** - * Send the message which was previously configured. - * @throws Exception if a problem occurs. - * @throws RemoteException if the send failed. - */ - public void send() throws Exception, RemoteException { - - if (message == null) { - throw new Exception("The message can not be send because the method setMessage() " - + " was not called before the send() method."); - } - - try { - Transport.send(message); - } catch (MessagingException e) { - throw new Exception("The message can not be send : " + e.getMessage()); - } - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mailsb/MimePartDSMailerHome.java b/jonas_tests/examples/base/examples/src/mailsb/MimePartDSMailerHome.java deleted file mode 100644 index c790753f9d53da98db9891f135c51ac29f3bf0ea..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/MimePartDSMailerHome.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Florent BENOIT & Ludovic BERT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package mailsb; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * Home interface for the bean Mailer - * Work with javax.mail.internet.MimePartDataSource - * @author Florent Benoit - * @author Ludovic Bert - */ -public interface MimePartDSMailerHome extends EJBHome { - - /** - * Create a bean with a specific name - * @param name the name of the bean - * @throws CreateException if the bean creation failed. - * @throws RemoteException if the call failed. - * @return the "mailer" bean created - */ - MimePartDSMailer create(String name) throws CreateException, RemoteException; -} diff --git a/jonas_tests/examples/base/examples/src/mailsb/README b/jonas_tests/examples/base/examples/src/mailsb/README deleted file mode 100644 index dd47d3e2897f0693c20d0b20abdd1004b1dbf0ef..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/README +++ /dev/null @@ -1,37 +0,0 @@ -Session beans "Mailer" ----------------------- -SessionMailer : session bean using javax.mail.Session mail factory -MimePartDSMailer : session bean using javax.mail.internet.MimePartDataSource mail factory - -Compiling this example: ------------------------ -ant -find build.xml install - -Running this example: ---------------------- -In order to run this example, you must configure two types of mail factory : -You can use the provided templates : - $JONAS_ROOT/conf/MailSession1 - $JONAS_ROOT/conf/MailMimePartDS1 - -MailSession1 is a javax.mail.Session mail factory. --> Only the property mail.host need to be defined. - -MailMimePartDS1 is a javax.mail.internet.MimePartDataSource mail factory. --> The properties mail.host, mail.to and mail.subject must be defined. - -Assuming that jonas.service.mail.factories property is already set in -the jonas.properties file, start JOnAS, with the mail service. - jonas start -Djonas.services=registry,jmx,security,jtm,dbm,ejb2,mail -(You can instead change the service list in jonas.properties) - - -Run the client : -jclient -cp $JONAS_BASE/ejbjars/mailsb.jar mailsb.ClientMailer SessionMailer -or -Run the client via the Ant task runclient - ant runclient - -Stop the jonas server - jonas stop - diff --git a/jonas_tests/examples/base/examples/src/mailsb/SessionMailer.java b/jonas_tests/examples/base/examples/src/mailsb/SessionMailer.java deleted file mode 100644 index c0ed14fe20f20e29afbd85f61454178803e3e770..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/SessionMailer.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Florent BENOIT & Ludovic BERT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package mailsb; - -import java.rmi.RemoteException; -import javax.ejb.EJBObject; - -/** - * Remote interface for the bean Mailer Work with javax.mail.Session - * @author Florent Benoit - * @author Ludovic Bert - */ -public interface SessionMailer extends EJBObject { - - /** - * Set the message with a specific recipient, subject and content. - * @param recipient the 'TO' field of the message. - * @param subject the subject of the message. - * @param content the content of the message. - * @throws Exception if a problem occurs. - * @throws RemoteException if the call failed. - */ - void setMessage(String recipient, String subject, String content) throws Exception, RemoteException; - - /** - * Send the message which was previously configured. - * @throws Exception if a problem occurs. - * @throws RemoteException if the call failed. - */ - void send() throws Exception, RemoteException; - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mailsb/SessionMailerBean.java b/jonas_tests/examples/base/examples/src/mailsb/SessionMailerBean.java deleted file mode 100644 index 82b2073459d78c4b96d863ce56db5f9582e3e31a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/SessionMailerBean.java +++ /dev/null @@ -1,234 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Florent BENOIT & Ludovic BERT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package mailsb; - -//import java -import java.rmi.RemoteException; - -//import javax -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.Transport; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; - -import javax.naming.InitialContext; -import javax.naming.NamingException; - -/** - * Implementation of the mailer Session Bean. It uses javax.mail.Session This - * bean is a statefull, and synchronized bean. The container uses the - * SessionBean methods to notify the enterprise Bean instances of the instance's - * life cycle events. - * @author Florent Benoit - * @author Ludovic Bert - */ -public class SessionMailerBean implements SessionBean { - - /** - * Name of the bean - */ - private String name = null; - - /** - * Session context that the container provides for a session enterprise Bean - * instance. - */ - private SessionContext sessionContext = null; - - /** - * Reference to the javax.mail.Message object which is the message to send - * with javamail - */ - private Message message = null; - - /* ========================= ejbCreate methods =========================== */ - - /** - * There must be one ejbCreate() method per create() method on the Home - * interface, and with the same signature. - * @param name the name of the bean - */ - public void ejbCreate(String name) { - this.name = name; - } - - /* =============== javax.ejb.SessionBean 2.0 implementation ============== */ - - /** - * Set the associated session context. The container calls this method after - * the instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for applications - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void setSessionContext(SessionContext sessionContext) throws EJBException, java.rmi.RemoteException { - this.sessionContext = sessionContext; - } - - /** - * A container invokes this method before it ends the life of the session - * object. This happens as a result of a client's invoking a remove - * operation, or when a container decides to terminate the session object - * after a timeout. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbRemove() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple mailer example - } - - /** - * The activate method is called when the instance is activated from its - * "passive" state. The instance should acquire any resource that it has - * released earlier in the ejbPassivate() method. This method is called with - * no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbActivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple mailer example - } - - /** - * The passivate method is called before the instance enters the "passive" - * state. The instance should release any resources that it can re-acquire - * later in the ejbActivate() method. After the passivate method completes, - * the instance must be in a state that allows the container to use the Java - * Serialization protocol to externalize and store away the instance's - * state. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbPassivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple mailer example - } - - /* ======================== Mailer implementation ======================== */ - - /** - * Set the message with a specific recipient, subject and content. - * @param recipient the 'TO' field of the message. - * @param subject the subject of the message. - * @param content the content of the message. - * @throws Exception if a problem occurs. - * @throws RemoteException if the call failed. - */ - public void setMessage(String recipient, String subject, String content) throws Exception, RemoteException { - - //Get the initial context - InitialContext ictx = null; - try { - ictx = new InitialContext(); - } catch (NamingException e) { - throw new Exception("Can not get an inital context : " + e.getMessage()); - } - - //get a new Session from our ENC envirnoment java:comp/env - Session session = null; - try { - session = (Session) ictx.lookup("java:comp/env/mail/MailSession"); - } catch (NamingException e) { - throw new Exception("You have not configure the mail factory with the name specified" - + " in the jonas-ejb-jar.xml file for java:comp/env/mail/MailSession ." - + " By default, the factory's name is mailSession_1 :" + e.getMessage()); - } - - try { - //Create the message - message = new MimeMessage(session); - InternetAddress[] toRecipients = new InternetAddress[] {new InternetAddress(recipient)}; - /* - * try { toRecipients[0].validate(); } catch (AddressException e) { - * throw new Exception("A failure occurs when validating the email - * address '" + recipient + "' :" + e.getMessage()); } - */ - message.setRecipients(Message.RecipientType.TO, toRecipients); - message.setSubject(subject); - message.setContent(content, "text/plain"); - } catch (MessagingException e) { - throw new Exception("A failure occurs when getting a message from the session and setting " - + "the different parameters :" + e.getMessage()); - } - - } - - /** - * Send the message which was previously configured. - * @throws Exception if a problem occurs. - * @throws RemoteException if the send failed. - */ - public void send() throws Exception, RemoteException { - - if (message == null) { - throw new Exception("The message can not be send because the method setMessage() " - + " was not called before the send() method."); - } - - try { - Transport.send(message); - } catch (MessagingException e) { - throw new Exception("The message can not be send : " + e.getMessage()); - } - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mailsb/SessionMailerHome.java b/jonas_tests/examples/base/examples/src/mailsb/SessionMailerHome.java deleted file mode 100644 index eeb40ea16983a5659897bd1576abd23bdec09820..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/SessionMailerHome.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Florent BENOIT & Ludovic BERT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package mailsb; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * Home interface for the bean Mailer - * Work with javax.mail.Session - * @author Florent Benoit - * @author Ludovic Bert - */ -public interface SessionMailerHome extends EJBHome { - - /** - * Create a bean with a specific name - * @param name the name of the bean - * @throws CreateException if the bean creation failed. - * @throws RemoteException if the call failed. - * @return the "mailer" bean created - */ - SessionMailer create(String name) throws CreateException, RemoteException; -} diff --git a/jonas_tests/examples/base/examples/src/mailsb/application-client.xml b/jonas_tests/examples/base/examples/src/mailsb/application-client.xml deleted file mode 100644 index 13436c357a7d391a38bfe7ac340abd00749605df..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/application-client.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Client of the sb sample - - diff --git a/jonas_tests/examples/base/examples/src/mailsb/build.xml b/jonas_tests/examples/base/examples/src/mailsb/build.xml deleted file mode 100644 index f304f220cdd56b24d97a587c7d1a6a31f591878f..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/build.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/mailsb/jonas-mailsb.xml b/jonas_tests/examples/base/examples/src/mailsb/jonas-mailsb.xml deleted file mode 100644 index 0d54d38a2ff00aab820e7391b64a3e137971e063..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/jonas-mailsb.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - SessionMailer - SessionMailerHome - - mail/MailSession - mailSession_1 - - - - MimePartDSMailer - MimePartDSMailerHome - - mail/MailMimePartDataSource - mailMimePartDS_1 - - - diff --git a/jonas_tests/examples/base/examples/src/mailsb/mailsb.xml b/jonas_tests/examples/base/examples/src/mailsb/mailsb.xml deleted file mode 100644 index 861d926941ea2b8d6ed1b2f0ed975356209ea4e6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mailsb/mailsb.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - Deployment descriptor for the mailsb JOnAS example - mailsb example - - - SessionMailer - mailsb.SessionMailerHome - mailsb.SessionMailer - mailsb.SessionMailerBean - Stateful - Container - - mail/MailSession - javax.mail.Session - Container - - - - MimePartDSMailer - mailsb.MimePartDSMailerHome - mailsb.MimePartDSMailer - mailsb.MimePartDSMailerBean - Stateful - Container - - mail/MailMimePartDataSource - javax.mail.internet.MimePartDataSource - Container - - - - - - - SessionMailer - * - - - MimePartDSMailer - * - - Required - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbBean.java b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbBean.java deleted file mode 100644 index 6ca0a5beb0084d8fa3d4994018227df197f954a1..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbBean.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbBean.java -// Message Driven bean - -package newsamplemdb; - - -import javax.jms.Message; -import javax.jms.TextMessage; -import javax.jms.JMSException; - - - -/** - * Example of MessageDrivenBean on a Topic. The transactions are container managed (Required) - * this class have superclasses in which are defined ejbCreate() and onMessage() - * this strange structure is only for reproducing bug 300387 - * for a more normal structure see the samplemdb sample - */ -public class MdbBean extends MdbBean_b { - - - /** - * Default constructor - * - */ - public MdbBean() { - } - - - - /** - * onMessage1 method - */ - public void onMessage1(Message message) { - System.out.println( "MdbBean onMessage1"); - try{ - TextMessage mess = (TextMessage)message; - System.out.println( "Message received: "+mess.getText()); - }catch(JMSException ex){ - System.err.println("Exception caught: "+ex); - } - } -} diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbBean_a.java b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbBean_a.java deleted file mode 100644 index dad6d748c5f72c559f850627a107033661e90584..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbBean_a.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbBean_a.java -// Message Driven bean - -package newsamplemdb; - -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; - - - -/** - * Superclass of the MessageDrivenBean class MdbBean - * Note that this class is not public but ejbCreate is public - * (it's only for reproducing the 300387 bug!) - */ - class MdbBean_a implements MessageDrivenBean { - - private transient MessageDrivenContext mdbContext; - - - - // ------------------------------------------------------------------ - // MessageDrivenBean implementation - // ------------------------------------------------------------------ - - /** - * Default constructor - * - */ - public MdbBean_a() { - } - - /** - * Set the associated context. The container call this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param ctx A MessageDrivenContext interface for the instance. - */ - - public void setMessageDrivenContext(MessageDrivenContext ctx) { - System.out.println("MdbBean_a setMessageDrivenContext"); - mdbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the message-driven object. - * This happens when a container decides to terminate the message-driven object. - * - * This method is called with no transaction context. - * - */ - public void ejbRemove() { - System.out.println("MdbBean_a ejbRemove"); - } - - /** - * The Message driven bean must define an ejbCreate methods with no args. - * - */ - public void ejbCreate() { - System.out.println("MdbBean_a ejbCreate"); - } - - -} diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbBean_b.java b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbBean_b.java deleted file mode 100644 index 675f1d8fc0e0793c277c0d33aaa2742460a2b57d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbBean_b.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbBean_b.java -// Message Driven bean - -package newsamplemdb; - -import javax.ejb.MessageDrivenContext; -import javax.jms.MessageListener; -import javax.jms.Message; -import javax.jms.TextMessage; -import javax.jms.JMSException; - -/** - * Superclass of the MessageDrivenBean class MdbBean - * Note that this public class is implementing onMessage method - * (it's only for reproducing the 300387 bug!) - */ -public class MdbBean_b extends MdbBean_a implements MessageListener { - - - - - /** - * Default constructor - * - */ - public MdbBean_b() { - } - - /** - * onMessage method - */ - public void onMessage(Message message) { - System.out.println( "MdbBean onMessage"); - try{ - TextMessage mess = (TextMessage)message; - System.out.println( "Message received: "+mess.getText()); - }catch(JMSException ex){ - System.err.println("Exception caught: "+ex); - } - } - - - -} diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbClient.java b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbClient.java deleted file mode 100644 index b387194fbdc444c2481f46cfdd154960e94ff950..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/MdbClient.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbClient.java -// mini Client for accessing bean Mdb - -package newsamplemdb; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.*; -import javax.jms.*; - -/** - * - */ -public class MdbClient { - - static Context ictx = null; - static TopicConnectionFactory tcf = null; - static TopicPublisher tp = null; - static Topic topic = null; - // JNDI name of the Topic - static String topicName = "mdbTopic"; - // JNDI name of the default connection factory - static String conFactName = "JTCF"; - - public static void main(String[] arg) { - // Get InitialContext - try { - ictx = new InitialContext(); - // lookup the TopicConnectionFactory through its JNDI name - tcf = (TopicConnectionFactory) ictx.lookup(conFactName ); - System.out.println("JMS client: tcf = " + tcf); - // lookup the Topic through its JNDI name - topic = (Topic) ictx.lookup(topicName); - System.out.println("JMS client: topic = " + topic); - } catch (NamingException e) { - e.printStackTrace(); - System.exit(2); - } - - TopicConnection tc = null; - TopicSession session = null; - try { - tc = tcf.createTopicConnection(); - System.out.println("JMS client: tc = " + tc.toString()); - session = tc.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); - tp = session.createPublisher(topic); - }catch (Exception e) { - e.printStackTrace(); - System.exit(2); - } - - // publish 10 messages to the topic - int nbmess = 100; - try { - TextMessage message; - for (int i=0;i - - - - Client of the sb sample - - diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/build.xml b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/build.xml deleted file mode 100644 index 31eb79c0f57eb0dffceeb998fca31be290f0327a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/jonas-newsamplemdb.xml b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/jonas-newsamplemdb.xml deleted file mode 100644 index 6dc54be4fbc46e8c4bc5e926ab447d60d804cbc2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/jonas-newsamplemdb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Mdb - - joramActivationSpec - - 20 - 10 - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/newsamplemdb.xml b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/newsamplemdb.xml deleted file mode 100644 index e27a89ae09a58b7bb224ac9eda5213e915dc3e68..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb/newsamplemdb.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - Deployment descriptor for the newsamplemdb JOnAS example - newsamplemdb example - - - Describe here the message driven bean Mdb - Message Driven Bean Mdb - Mdb - newsamplemdb.MdbBean - javax.jms.MessageListener - Container - javax.jms.Topic - - - destination - mdbTopic - - - destinationType - javax.jms.Topic - - - subscriptionDurability - NonDurable - - - - - - - - - - Mdb - * - - Required - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbBean.java b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbBean.java deleted file mode 100644 index 3021f4b62fe695a4ae11904b6c5ee185a5ece017..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbBean.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbBean.java -// Message Driven bean - -package newsamplemdb2; - - -import javax.jms.Message; -import javax.jms.TextMessage; -import javax.jms.JMSException; - - - -/** - * Example of MessageDrivenBean on a Queue. The transactions are container managed (Required) - * this class have superclasses in which are defined ejbCreate() and onMessage() - * this strange structure is only for reproducing bug 300387 - * for a more normal structure see the samplemdb sample - */ -public class MdbBean extends MdbBean_b { - - - /** - * Default constructor - * - */ - public MdbBean() { - } - - - - /** - * onMessage1 method - */ - public void onMessage1(Message message) { - System.out.println( "MdbBean onMessage1"); - try{ - TextMessage mess = (TextMessage)message; - System.out.println( "Message received: "+mess.getText()); - }catch(JMSException ex){ - System.err.println("Exception caught: "+ex); - } - } -} diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbBean_a.java b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbBean_a.java deleted file mode 100644 index 16b7866da157351a25070af1cf9fedf6767fcfed..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbBean_a.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbBean_a.java -// Message Driven bean - -package newsamplemdb2; - -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; - - - -/** - * Superclass of the MessageDrivenBean class MdbBean - * Note that this class is not public but ejbCreate is public - * (it's only for reproducing the 300387 bug!) - */ - class MdbBean_a implements MessageDrivenBean { - - private transient MessageDrivenContext mdbContext; - - - - // ------------------------------------------------------------------ - // MessageDrivenBean implementation - // ------------------------------------------------------------------ - - /** - * Default constructor - * - */ - public MdbBean_a() { - } - - /** - * Set the associated context. The container call this method - * after the instance creation. - * The enterprise Bean instance should store the reference to the context - * object in an instance variable. - * This method is called with no transaction context. - * - * @param ctx A MessageDrivenContext interface for the instance. - */ - - public void setMessageDrivenContext(MessageDrivenContext ctx) { - System.out.println("MdbBean_a setMessageDrivenContext"); - mdbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the message-driven object. - * This happens when a container decides to terminate the message-driven object. - * - * This method is called with no transaction context. - * - */ - public void ejbRemove() { - System.out.println("MdbBean_a ejbRemove"); - } - - /** - * The Message driven bean must define an ejbCreate methods with no args. - * - */ - public void ejbCreate() { - System.out.println("MdbBean_a ejbCreate"); - } - - -} diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbBean_b.java b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbBean_b.java deleted file mode 100644 index f3be938781db3e24a00905e42f8eabf0b4a14710..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbBean_b.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbBean_b.java -// Message Driven bean - -package newsamplemdb2; - -import javax.ejb.MessageDrivenContext; -import javax.jms.MessageListener; -import javax.jms.Message; -import javax.jms.TextMessage; -import javax.jms.JMSException; - -/** - * Superclass of the MessageDrivenBean class MdbBean - * Note that this public class is implementing onMessage method - * (it's only for reproducing the 300387 bug!) - */ -public class MdbBean_b extends MdbBean_a implements MessageListener { - - - - - /** - * Default constructor - * - */ - public MdbBean_b() { - } - - /** - * onMessage method - */ - public void onMessage(Message message) { - System.out.println( "MdbBean onMessage"); - try{ - TextMessage mess = (TextMessage)message; - System.out.println( "Message received: "+mess.getText()); - }catch(JMSException ex){ - System.err.println("Exception caught: "+ex); - } - } - - - -} diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbClient.java b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbClient.java deleted file mode 100644 index 95822753d0745928dadb2f7be25e9c1ab9620483..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/MdbClient.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbClient.java -// mini Client for accessing bean Mdb - -package newsamplemdb2; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.*; -import javax.jms.*; - -/** - * - */ -public class MdbClient { - - static Context ictx = null; - static QueueConnectionFactory qcf = null; - static QueueSender qp = null; - static Queue queue = null; - // JNDI name of the Queue - static String queueName = "mdbQueue"; - // JNDI name of the default connection factory - static String conFactName = "JQCF"; - - public static void main(String[] arg) { - // Get InitialContext - try { - ictx = new InitialContext(); - // lookup the QueueConnectionFactory through its JNDI name - qcf = (QueueConnectionFactory) ictx.lookup(conFactName ); - System.out.println("JMS client: qcf = " + qcf); - // lookup the Queue through its JNDI name - queue = (Queue) ictx.lookup(queueName); - System.out.println("JMS client: queue = " + queue); - } catch (NamingException e) { - e.printStackTrace(); - System.exit(2); - } - - QueueConnection qc = null; - QueueSession session = null; - try { - qc = qcf.createQueueConnection(); - System.out.println("JMS client: qc = " + qc.toString()); - session = qc.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); - qp = session.createSender(queue); - }catch (Exception e) { - e.printStackTrace(); - System.exit(2); - } - - // publish 10 messages to the queue - int nbmess = 10; - try { - TextMessage message; - for (int i=0;i - - - - Client of the sb sample - - diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/build.xml b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/build.xml deleted file mode 100644 index 469640ddb5346d9e5ada11e2680d8d1115e60ffe..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/jonas-newsamplemdb2.xml b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/jonas-newsamplemdb2.xml deleted file mode 100644 index 6dc54be4fbc46e8c4bc5e926ab447d60d804cbc2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/jonas-newsamplemdb2.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Mdb - - joramActivationSpec - - 20 - 10 - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/newsamplemdb2.xml b/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/newsamplemdb2.xml deleted file mode 100644 index c5b2f6daff7fa5c1018c4b6ab1f690dfc33aa4ef..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/newsamplemdb2/newsamplemdb2.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - Deployment descriptor for the newsamplemdb2 JOnAS example - newsamplemdb2 example - - - Describe here the message driven bean Mdb - Message Driven Bean Mdb - Mdb - newsamplemdb2.MdbBean - javax.jms.MessageListener - Container - javax.jms.Queue - - - destination - mdbQueue - - - destinationType - javax.jms.Queue - - - subscriptionDurability - NonDurable - - - - - - - - - - Mdb - * - - Required - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/Env.java b/jonas_tests/examples/base/examples/src/mdb/sampleappli/Env.java deleted file mode 100644 index 427385f77f203685dfc70cb7fb11a9548bbb089b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/Env.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// Env.java -package sampleappli; - -import java.rmi.RemoteException; -import javax.ejb.EJBObject; - -/** - * Env remote interface - * @author JOnAS team - */ -public interface Env extends EJBObject { - - void init() throws RemoteException; - - void clean() throws RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/EnvBean.java b/jonas_tests/examples/base/examples/src/mdb/sampleappli/EnvBean.java deleted file mode 100644 index 99fe71650c81231f0794f93887d941811eb9d645..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/EnvBean.java +++ /dev/null @@ -1,238 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// EnvBean.java -// Stateless Session bean - -package sampleappli; - -import java.rmi.RemoteException; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.io.File; -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import javax.ejb.RemoveException; -import javax.ejb.EJBObject; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.sql.DataSource; - -/** - * EnvBean is a stateless session bean use to create and clean a correct - * environement for the running of the StockClient it creates/remove the - * StockTable and the order file - * @author JOnAS team - */ -public class EnvBean implements SessionBean { - - SessionContext ejbContext; - - DataSource dataSource = null; - - Connection conn = null; - - Statement stmt; - - String stocktablename = null; - - String orderfilename = null; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated session context. The container calls this method after - * the instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setSessionContext(SessionContext ctx) { - ejbContext = ctx; - if (dataSource == null) { - // Finds DataSource from JNDI - Context initialContext = null; - try { - initialContext = new InitialContext(); - dataSource = (DataSource) initialContext.lookup("java:comp/env/jdbc/myDS"); - } catch (Exception e) { - System.err.println(" new InitialContext() : " + e); - throw new EJBException("Cannot get JNDI InitialContext"); - } - // Find the stocktablename - try { - stocktablename = (String) initialContext.lookup("java:comp/env/stocktablename"); - } catch (Exception e) { - System.err.println("cannot lookup environment " + e); - throw new EJBException("cannot lookup environment"); - } - // Find the orderfilename - try { - orderfilename = (String) initialContext.lookup("java:comp/env/orderfilename"); - } catch (Exception e) { - System.err.println("cannot lookup environment " + e); - throw new EJBException("cannot lookup environment"); - } - } - } - - /** - * A container invokes this method before it ends the life of the session - * object. This happens as a result of a client's invoking a remove - * operation, or when a container decides to terminate the session object - * after a timeout. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - } - - /** - * The Session bean must define 1 or more ejbCreate methods. - * @throws CreateException Failure to create a session EJB object. - */ - public void ejbCreate() throws CreateException { - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - } - - /** - * A container invokes this method when the instance is taken out of the - * pool of available instances to become associated with a specific EJB - * object. - */ - public void ejbActivate() { - } - - // ------------------------------------------------------------------ - // Env implementation - // ------------------------------------------------------------------ - - /** - * init - */ - public void init() { - createTableStock(); - createOrderFile(); - } - - /** - * clean - */ - public void clean() { - dropTableStock(); - removeOrderFile(); - } - - // ------------------------------------------------------------------ - // Env internal methods - // ------------------------------------------------------------------ - public void dropTableStock() { - // drop table - try { - conn = dataSource.getConnection(); - stmt = conn.createStatement(); - stmt.execute("DROP TABLE " + stocktablename); - stmt.close(); - conn.close(); - } catch (Exception e) { - System.err.println("Exception in dropTable : \n" + stocktablename + " " + e); - } - } - - public void createTableStock() { - // get connection - try { - conn = dataSource.getConnection(); - - } catch (Exception e) { - System.err.println("Cannot get Connection: \n" + e); - throw new EJBException("Cannot get Connection"); - } - try { - stmt = conn.createStatement(); - stmt.execute("DROP TABLE " + stocktablename); - stmt.close(); - } catch (Exception e) { - } - // create table - try { - stmt = conn.createStatement(); - stmt.execute("create table " + stocktablename + "(ID varchar(5) not null primary key, QUANTITY integer)"); - stmt.execute("insert into " + stocktablename + " values ('00000', 10)"); - stmt.execute("insert into " + stocktablename + " values ('00001', 20)"); - stmt.execute("insert into " + stocktablename + " values ('00002', 10)"); - stmt.execute("insert into " + stocktablename + " values ('00003', 20)"); - stmt.execute("insert into " + stocktablename + " values ('00004', 10)"); - stmt.close(); - conn.close(); - } catch (SQLException e) { - System.err.println("Exception in createTable : " + e); - throw new EJBException("Exception in createTable"); - } - } - - public void createOrderFile() { - try { - File f = new File(System.getProperty("java.io.tmpdir") + File.separator + System.getProperty("user.name") - + "_" + orderfilename); - if (!f.createNewFile()) { - f.delete(); - f.createNewFile(); - } - } catch (Exception ex) { - System.err.println("Exception on createOrderFile: " + ex); - throw new EJBException("Exception in createOrderFile"); - } - - } - - public void removeOrderFile() { - try { - File f = new File(System.getProperty("java.io.tmpdir") + File.separator + System.getProperty("user.name") - + "_" + orderfilename); - f.delete(); - } catch (Exception ex) { - System.err.println("Exception on removeOrderFile: " + ex); - throw new EJBException("Exception in removeOrderFile"); - } - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/EnvHome.java b/jonas_tests/examples/base/examples/src/mdb/sampleappli/EnvHome.java deleted file mode 100644 index 093ed2fb844578de174d6b0ad53b36d4a46f854b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/EnvHome.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package sampleappli; - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - - -/** - * Home interface for the bean Env - * @author JOnAS team - */ -public interface EnvHome extends EJBHome { - - Env create() throws CreateException, RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/OrderBean.java b/jonas_tests/examples/base/examples/src/mdb/sampleappli/OrderBean.java deleted file mode 100644 index b9ea5d35e75d90dcd82b584c894211c6e02d4351..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/OrderBean.java +++ /dev/null @@ -1,124 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// OrderBean.java -// Message Driven bean -package sampleappli; - -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.TextMessage; - -import javax.naming.Context; -import javax.naming.InitialContext; - -import java.io.DataOutputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; - -/** - * - */ -public class OrderBean implements MessageDrivenBean, MessageListener { - - private transient MessageDrivenContext mdbContext; - - String filename = null; - - // ------------------------------------------------------------------ - // MessageDrivenBean implementation - // ------------------------------------------------------------------ - - /** - * Default constructor - */ - public OrderBean() { - } - - /** - * Set the associated context. The container call this method after the - * instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param MessageDrivenContext A MessageDrivenContext interface for the - * instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - - public void setMessageDrivenContext(MessageDrivenContext ctx) { - mdbContext = ctx; - Context initialContext = null; - if (filename == null) { - try { - initialContext = new InitialContext(); - // Check that the SessionContext is the good one. - filename = (String) initialContext.lookup("java:comp/env/orderfilename"); - } catch (Exception e) { - System.err.println("cannot lookup environment"); - } - } - } - - /** - * A container invokes this method before it ends the life of the - * message-driven object. This happens when a container decides to terminate - * the message-driven object. This method is called with no transaction - * context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - } - - /** - * The Message driven bean must define an ejbCreate methods with no args. - */ - public void ejbCreate() { - } - - /** - * onMessage method - */ - public void onMessage(Message message) { - TextMessage msg = (TextMessage) message; - try { - File f = new File(System.getProperty("java.io.tmpdir") + File.separator + System.getProperty("user.name") - + "_" + filename); - DataOutputStream fileout = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(f - .getCanonicalPath(), true))); - fileout.writeBytes(msg.getText() + System.getProperty("line.separator")); - fileout.close(); - } catch (Exception e) { - System.err.println("OrderBean onMessage Exception caught: " + e); - } - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/README b/jonas_tests/examples/base/examples/src/mdb/sampleappli/README deleted file mode 100644 index a5b40b5e5656aaa64562aab5e5b30405c4ca478e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/README +++ /dev/null @@ -1,69 +0,0 @@ -Example description -------------------- - -The object of this example is to show how Message driven beans may -be involved in global transactions as well as Entity beans - -In this sample appli: - - - StockBean is an entity bean CMP that handles a stock table - a Stock item is composed with a Stockid (String) which is the primary key - and a Quantity (int) - the method decreaseQuantity(int qty) decrease the quantity for the - corresponding stockid but may throw a RemoteException "Negative stock" - - - StockHandlerBean is a Message Driven Bean that receives Map messages: - "CustomerId", String - "ProductId", String - "Quantity", int - - the onMessage method will run in the scope of a transaction started - by the the container in the receipt of a message on the - topic (StockHandlerTopic) - it will send a Text message on a Queue (OrderQueue) and decrease - the stock quantity for the Stock element identified by the "ProductId". - If it catches a RemoteException on the decreaseQuantity method it will call - the setRollbackOnly method of the MessageDrivenContext linked to the - instance in this case the container transaction will be rolled back. - - - OrderBean is another Message Driven Bean listening on the OrderQueue Queue - on receipt of a Text message on this queue it will write the corresponding - String as a new line in a file (order.txt) - - - EnvBean is a stateless session bean used for creating the stock table - in the database and for deleting this table - - - SampleAppliClient is a java application that sends n messages to the - topic StockHandlerTopic for decreasing several Stock items these - n messages doesn't cause the raise of Remote Exception negative stock - and sends one message on the Stock id "00000" that must cause - a rollback of the transaction. - At the end it verifies the number of messages received by the - Order message driven bean by counting the nb of lines in the - order.txt file (it must be equal to n) and verifies that the - stock quantity for "00000" has not changed and all the other must - be equal to 1. - - -Compiling the example : ---------------------- - -ant -find build.xml install - -Running this example : ---------------------- -You can use the provided run.sh (Unix) or run.bat (Windows) scripts to execute the -whole example or run it step by step. - - jonas start - ant runclient - jonas stop - -Note : -Running this example will lead to a normal exception in the JOnAS server : - - System Exception in business method: -java.rmi.RemoteException: Negative stock - at sampleappli.StockBean.decreaseQuantity(StockBean.java:199) - ... - diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/SampleAppliClient.java b/jonas_tests/examples/base/examples/src/mdb/sampleappli/SampleAppliClient.java deleted file mode 100644 index bb05f221c7244cbe0dac65fa5151858fd4fe8e45..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/SampleAppliClient.java +++ /dev/null @@ -1,309 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// SampleAppliClient.java -// - -package sampleappli; - -import java.rmi.RemoteException; -import java.util.Enumeration; -import java.io.DataInputStream; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import javax.jms.*; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -/** - * - */ -public class SampleAppliClient { - - static Context initialContext = null; - - static EnvHome home = null; - - // Number of second to wait before the checking process - static int sleepSecond = 10; - - public static void main(String[] args) { - - // Initialize the number of second to wait before the checking process - if (args.length > 0) { - sleepSecond = (new Integer(args[0])).intValue(); - } - - // Get InitialContext - try { - initialContext = new InitialContext(); - } catch (NamingException e) { - e.printStackTrace(); - System.exit(2); - } - - // Lookup bean home - String beanName = "EnvHome"; - try { - home = (EnvHome) PortableRemoteObject.narrow(initialContext.lookup(beanName), EnvHome.class); - } catch (Exception e) { - e.printStackTrace(); - System.exit(2); - } - - // Init the environment for the application - Env env = null; - try { - env = home.create(); - env.init(); - } catch (Exception ex) { - System.err.println("Cannot init Environment: " + ex); - System.exit(2); - } - - TopicConnectionFactory tcf = null; - TopicPublisher tp = null; - Topic topic = null; - // JNDI name of the Topics - String topicName = "StockHandlerTopic"; - // JNDI name of the connection factory - String conFactName = "JTCF"; - - try { - // lookup the TopicConnectionFactory through its JNDI name - tcf = (TopicConnectionFactory) initialContext.lookup(conFactName); - // lookup the Topic through its JNDI name - topic = (Topic) initialContext.lookup(topicName); - } catch (NamingException e) { - e.printStackTrace(); - System.exit(2); - } - - TopicConnection tc = null; - TopicSession session = null; - try { - tc = tcf.createTopicConnection(); - session = tc.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); - tp = session.createPublisher(topic); - } catch (Exception e) { - e.printStackTrace(); - System.exit(2); - } - - MapMessage mess = null; - int nbmess = 0; - // We send several messages that will update the database and the file - // order - try { - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer10"); - mess.setString("ProductId", "00003"); - mess.setInt("Quantity", 3); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer1"); - mess.setString("ProductId", "00001"); - mess.setInt("Quantity", 5); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer3"); - mess.setString("ProductId", "00002"); - mess.setInt("Quantity", 2); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer2"); - mess.setString("ProductId", "00004"); - mess.setInt("Quantity", 6); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer2"); - mess.setString("ProductId", "00003"); - mess.setInt("Quantity", 10); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer3"); - mess.setString("ProductId", "00001"); - mess.setInt("Quantity", 10); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer1"); - mess.setString("ProductId", "00002"); - mess.setInt("Quantity", 5); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer10"); - mess.setString("ProductId", "00004"); - mess.setInt("Quantity", 3); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer122"); - mess.setString("ProductId", "00003"); - mess.setInt("Quantity", 6); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer45"); - mess.setString("ProductId", "00001"); - mess.setInt("Quantity", 4); - tp.publish(mess); - nbmess++; - - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer7"); - mess.setString("ProductId", "00002"); - mess.setInt("Quantity", 2); - tp.publish(mess); - nbmess++; - - // Here we send a message that will force the rollback of the - // transaction - // in the onMessage of StockHandler MessageDrivenBean - mess = session.createMapMessage(); - mess.setString("CustomerId", "customer00"); - mess.setString("ProductId", "00000"); - mess.setInt("Quantity", 1000); - tp.publish(mess); - session.close(); - tc.close(); - - } catch (Exception ex) { - System.err.println("Exception caught when sending messages: " + ex); - System.exit(2); - } - - // Before the checking process we wait a little .... - try { - Thread.currentThread().sleep(1000 * sleepSecond); - } catch (InterruptedException e) { - System.err.println("InterruptedException"); - System.exit(2); - } - - // We have to check that nbmess have actually sent to the Message driven - // bean Order - // this is done by reading the order file (order.txt), it must have - // nbmess lines - BufferedReader inorderbr = null; - try { - File f = new File(System.getProperty("java.io.tmpdir") + File.separator + System.getProperty("user.name") - + "_order.txt"); - DataInputStream inorder = new DataInputStream(new BufferedInputStream(new FileInputStream(f))); - inorderbr = new BufferedReader(new InputStreamReader(inorder)); - } catch (Exception ex) { - System.err.println("Cannot open the order file: " + ex); - System.exit(2); - } - - String s = null; - int n = 0; - try { - while ((s = inorderbr.readLine()) != null) { - n++; - System.out.println(s); - } - inorderbr.close(); - } catch (java.io.IOException ex) { - System.err.println("cannot read the order file: " + ex); - } - if (n == nbmess) { - System.out.println("Nb messages sent and received OK"); - } else { - System.out.println("Problem: nb messages sent = " + nbmess + ", nb messages received = " + n); - System.out.println(" (re-run SampleAppliClent with an argument greater than " + sleepSecond + ")"); - } - - // Lookup bean home - String stockbeanName = "StockHome"; - StockHome shome = null; - Enumeration listOfStocks = null; - try { - shome = (StockHome) PortableRemoteObject.narrow(initialContext.lookup(stockbeanName), StockHome.class); - } catch (Exception e) { - e.printStackTrace(); - System.exit(2); - } - - try { - listOfStocks = shome.findAllStocks(); - } catch (Exception e) { - System.err.println("Cannot findAllStocks: " + e); - } - Stock stock = null; - try { - while (listOfStocks.hasMoreElements()) { - stock = (Stock) listOfStocks.nextElement(); - String id = stock.getId(); - int qty = stock.getQuantity(); - System.out.println("StockId = " + id + " Quantity = " + qty); - if (id.equals("00000")) { - if (qty != 10) { - System.err.println("Problem: Stock id 00000 must be set to 10"); - System.out.println(" (re-run SampleAppliClent with an argument greater than " - + sleepSecond + ")"); - System.exit(2); - } - } else { - // for the other id the stock quantity must be equals to 1 - if (qty != 1) { - System.err.println("Problem: Stock id " + id + " must be set to 1"); - System.out.println(" (re-run SampleAppliClent with an argument greater than " - + sleepSecond + ")"); - System.exit(2); - } - } - } - } catch (Exception ex) { - System.err.println("Exception caught while reading stocks: " + ex); - } - - System.out.println("SampleApplicationClient OK"); - - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/Stock.java b/jonas_tests/examples/base/examples/src/mdb/sampleappli/Stock.java deleted file mode 100644 index 27c55b6c4bbb58e3ce87cb91b03d78d84ff7ee3e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/Stock.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// Stock.java -package sampleappli; - -import java.rmi.RemoteException; -import javax.ejb.EJBObject; - -/** - * Stock remote interface - */ -public interface Stock extends EJBObject { - - public void increaseQuantity(int qty) throws RemoteException; - - public void decreaseQuantity(int qty) throws RemoteException; - - public int getQuantity() throws RemoteException; - - public void setQuantity(int qty) throws RemoteException; - - public String getId() throws RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/StockBean.java b/jonas_tests/examples/base/examples/src/mdb/sampleappli/StockBean.java deleted file mode 100644 index 1502f57c4f38e892d6f53f63c7292760a0813937..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/StockBean.java +++ /dev/null @@ -1,207 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// StockBean.java -// Entity Bean -package sampleappli; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.DuplicateKeyException; -import javax.ejb.EJBException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.FinderException; -import javax.ejb.ObjectNotFoundException; -import javax.ejb.RemoveException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.sql.DataSource; -import javax.transaction.NotSupportedException; - -/** - * - */ -public class StockBean implements EntityBean { - - EntityContext ejbContext; - - // ------------------------------------------------------------------ - // State of the bean. - // They must be public for Container Managed Persistance. - // ------------------------------------------------------------------ - public String stockid; - - public int stockqty; - - // ------------------------------------------------------------------ - // EntityBean implementation - // ------------------------------------------------------------------ - - /** - * Set the associated entity context. The container invokes this method on - * an instance after the instance has been created. This method is called in - * an unspecified transaction context. - * @param ctx - An EntityContext interface for the instance. The instance - * should store the reference to the context in an instance variable. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void setEntityContext(EntityContext ctx) { - ejbContext = ctx; - } - - /** - * Unset the associated entity context. The container calls this method - * before removing the instance. This is the last method that the container - * invokes on the instance. The Java garbage collector will eventually - * invoke the finalize() method on the instance. This method is called in an - * unspecified transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void unsetEntityContext() { - ejbContext = null; - } - - /** - * A container invokes this method before it removes the EJB object that is - * currently associated with the instance. This method is invoked when a - * client invokes a remove operation on the enterprise Bean's home interface - * or the EJB object's remote interface. This method transitions the - * instance from the ready state to the pool of available instances. This - * method is called in the transaction context of the remove operation. - * @throws RemoveException The enterprise Bean does not allow destruction of - * the object. - * @throws EJBException - Thrown by the method to indicate a failure caused - * by a system-level error. - */ - public void ejbRemove() throws RemoveException { - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by loading it state from the underlying database. This method - * always executes in the proper transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbLoad() { - } - - /** - * A container invokes this method to instruct the instance to synchronize - * its state by storing it to the underlying database. This method always - * executes in the proper transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbStore() { - } - - /** - * There must be an ejbPostCreate par ejbCreate method - * @throws CreateException Failure to create an entity EJB object. - */ - public void ejbPostCreate(String id, int qty) throws CreateException { - } - - /** - * The Entity bean can define 0 or more ejbCreate methods. - * @throws CreateException Failure to create an entity EJB object. - * @throws DuplicateKeyException An object with the same key already exists. - */ - public java.lang.String ejbCreate(String id, int qty) throws CreateException, DuplicateKeyException { - - // Init here the bean fields - stockid = id; - stockqty = qty; - - // In CMP, should return null. - return null; - } - - /** - * A container invokes this method on an instance before the instance - * becomes disassociated with a specific EJB object. - */ - public void ejbPassivate() { - } - - /** - * A container invokes this method when the instance is taken out of the - * pool of available instances to become associated with a specific EJB - * object. - */ - public void ejbActivate() { - } - - // ------------------------------------------------------------------ - // Stock implementation - // ------------------------------------------------------------------ - - /** - * increaseQuantity - */ - public void increaseQuantity(int qty) { - stockqty += qty; - } - - /** - * decreaseStockQuantity - */ - public void decreaseQuantity(int qty) throws RemoteException { - stockqty = stockqty - qty; - if (stockqty < 0) { - throw new RemoteException("Negative stock"); - } - } - - /** - * getStockQuantity - */ - public int getQuantity() throws RemoteException { - return stockqty; - } - - /** - * setStockQuantity - */ - public void setQuantity(int qty) throws RemoteException { - stockqty = qty; - } - - /** - * getStockQuantity - */ - public String getId() throws RemoteException { - return stockid; - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/StockHandlerBean.java b/jonas_tests/examples/base/examples/src/mdb/sampleappli/StockHandlerBean.java deleted file mode 100644 index 90b5146e29b76c9463c53d7ec0686a4fda4e7570..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/StockHandlerBean.java +++ /dev/null @@ -1,180 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// StockHandlerBean.java -// Message Driven bean - -package sampleappli; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; -import javax.ejb.EJBException; -import javax.jms.*; -import javax.rmi.PortableRemoteObject; - -/** - * StockHandlerBean is a Message driven bean which is listening to a topic It - * receives MapMessages that contains a customer identification, a product - * identification and a quantity for the product When the StockHandlerBean - * receives a message it builds a message corresponding to an Order and sends it - * to a Queue destination then it updates the Stock database. - */ -public class StockHandlerBean implements MessageDrivenBean, MessageListener { - - private transient MessageDrivenContext mdbContext; - - StockHome sh = null; - - QueueConnectionFactory queueConnectionFactory = null; - - QueueConnection queueConnection = null; - - Queue queue = null; - - Context initialContext = null; - - // ------------------------------------------------------------------ - // MessageDrivenBean implementation - // ------------------------------------------------------------------ - - /** - * Default constructor - */ - public StockHandlerBean() { - } - - /** - * Set the associated context. The container call this method after the - * instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param MessageDrivenContext A MessageDrivenContext interface for the - * instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - - public void setMessageDrivenContext(MessageDrivenContext ctx) { - mdbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the - * message-driven object. This happens when a container decides to terminate - * the message-driven object. This method is called with no transaction - * context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - } - - /** - * The Message driven bean must define an ejbCreate methods with no args. - */ - public void ejbCreate() { - try { - initialContext = new InitialContext(); - sh = (StockHome) PortableRemoteObject.narrow(initialContext.lookup("java:comp/env/ejb/Stock"), - StockHome.class); - queue = (Queue) initialContext.lookup("java:comp/env/jms/Orders"); - queueConnectionFactory = (QueueConnectionFactory) initialContext - .lookup("java:comp/env/jms/QueueConnectionFactory"); - queueConnection = queueConnectionFactory.createQueueConnection(); - } catch (Exception e) { - System.err.println("StockHandlerBean ejbCreate : " + e); - } - } - - /** - * onMessage method Map Messages are receive with the following format: - * "CustomerId" String "ProductId" String "Quantity" int the Message driven - * bean will construct a string for an Order that will be sent to the Queue - * Orders and decrease the stock quantity for the product identified by - * ProductId this method run in the scope of a transaction that the - * container started immediately before dispatching the onMessage method the - * sending message to the Order queue and the updating of the Stock table is - * made in the same global transaction this transaction may be rolled back - * if the stock quantity became negative - */ - - public void onMessage(Message message) { - QueueSession session = null; - QueueSender qs = null; - int code; - String pid = null; - ; - int qty = 0; - String cid = null; - ; - MapMessage msg = (MapMessage) message; - Stock stock = null; - try { - if (message.getJMSRedelivered()) { - System.out.println("Ok, that's it!"); - return; - } - } catch (Exception ex) { - System.err.println(ex.toString()); - } - try { - pid = msg.getString("ProductId"); - qty = msg.getInt("Quantity"); - cid = msg.getString("CustomerId"); - session = queueConnection.createQueueSession(true, Session.AUTO_ACKNOWLEDGE); - qs = session.createSender(queue); - stock = sh.findByPrimaryKey(pid); - System.out.println("StockHandlerBean findByPrimaryKey(" + pid + ")"); - } catch (Exception ex) { - System.err.println(ex.toString()); - } - try { - TextMessage tm = session.createTextMessage(); - String m = "For CustomerId = " + cid + " ProductId= " + pid + " Quantity= " + qty; - tm.setText(m); - qs.send(tm); - System.out.println("StockHandlerBean message sent: " + m); - stock.decreaseQuantity(qty); - } catch (Exception ex) { - // on negative Stock -> rollback the transaction - mdbContext.setRollbackOnly(); - } finally { - if (session != null) { - try { - session.close(); - System.out.println("StockHandlerBean session closed"); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/StockHome.java b/jonas_tests/examples/base/examples/src/mdb/sampleappli/StockHome.java deleted file mode 100644 index 0de16e31db5d12638b37290f37188e758c356aa4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/StockHome.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// StockHome.java -package sampleappli; - -import java.rmi.RemoteException; -import java.util.Enumeration; -import javax.ejb.CreateException; -import javax.ejb.EJBHome; -import javax.ejb.FinderException; - -/** - * Home interface for the bean Stock - */ -public interface StockHome extends EJBHome { - - Stock create(String id, int qty) throws CreateException, RemoteException; - - Stock findByPrimaryKey(java.lang.String pk) throws FinderException, RemoteException; - - public Enumeration findAllStocks() throws RemoteException, FinderException; - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/application-client.xml b/jonas_tests/examples/base/examples/src/mdb/sampleappli/application-client.xml deleted file mode 100644 index 13436c357a7d391a38bfe7ac340abd00749605df..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/application-client.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Client of the sb sample - - diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/build.xml b/jonas_tests/examples/base/examples/src/mdb/sampleappli/build.xml deleted file mode 100644 index a5102a1a10c7d62e57d8c8636e45a121429de322..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/build.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/db1.prp b/jonas_tests/examples/base/examples/src/mdb/sampleappli/db1.prp deleted file mode 100644 index 9d87d68d0e919828f6375a515f40b54d58268544..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/db1.prp +++ /dev/null @@ -1,325 +0,0 @@ -!--------------------------------------------------------------------- -! -! PROPERTIES for the InstantDB database used in the JOnAS eb example -! (builded from InstantDB/3.25/Examples/sample.prp) -! -!--------------------------------------------------------------------- - -!--------------------------------------------------------------------- -! -! BASIC PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Path where index tables are held. Can be absolute or relative -! to the properties file. Defaults to tablePath. -! -indexPath=./tmp/indexes -! -! Path where system tables are held. Can be absolute or relative to -! the properties file. Defaults to tablePath. -! -systemPath=./tmp/system -! -! Path where database tables are held. Can be absolute or relative -! to the properties file. Defaults to "current" directory. -! -tablePath=./tmp/tables -! -! Path where results set tables are held. Can be absolute or relative -! to the properties file. Defaults to tablePath. -! -tmpPath=./tmp/tmp -! -! Non-zero means paths are relative to the properties file. -! Default is absolute paths for files. -! -relativeToProperties=1 -! -! Alternative partitions can be defined so that tables can be placed -! in multiple locations. Each partition is numbered: 1, 2, 3,... Tables -! can be created on partitions using the syntax -! -! CREATE TABLE ON PARTITION ... -! -! The partition count has to be supplied. -! -!partitionCount=2 -! -! The locations of each partition must be supplied. These are always -! absolute path names. -! -!partition1=d:/petes -!partition2=c:/temp - - -!--------------------------------------------------------------------- -! -! TUNING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! The amount of each column to cache, expressed either as an absolute -! number of rows or as a percentage figure. Defaults to 256 or 10 respectively. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -cacheAmount=512 -! -! CACHE_ROWS Must be one of CACHE_ROWS or CACHE_PERCENT. Determines whether -! to cache columns in tables based on an absolute number of rows, or the -! percentage number of rows in the table. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -cacheCondition=CACHE_ROWS -! -! The amount of the system tables to be cached. Defaults to 100. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!systemCacheSize=10 -! -! Similar to cacheCondition, but applies only to the system tables. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!systemCacheCondition=CACHE_ROWS -! -! The percentage cache hit improvement required in order to move the -! cache to a new location in a column. -! -! (Currently not implemented). -! -cacheResetPercent=10 -! -! Non-zero means that database changes do not get written to the -! database immediately. See tuning.html. -! -fastUpdate=0 -! -! Percentage of free space in an index that must be present before -! the index reorganises itself. High values means frequent index -! reorganisation. Low values means slow index inserts. -! -indexLoad=5 -! -! The number of cache misses to include in calculations of the next -! base for the cache. -! -! (Currently not implemented). -! -missesInCacheStats=100 -! -! Non-zero means that results sets get instantiated on disk. By default -! InstantDB holds results sets emtirely in memory (apart from Binary -! columns). For large results sets this can be a problem. This property -! forces all results sets to be held on disk. -! -resultsOnDisk=0 -! -! Similar to cacheCondition but applies only to disk based -! results sets. Default is CACHE_ROWS. -! -resultsSetCache=CACHE_ROWS -! -! Similar to cacheAmount but applies only to disk based -! results sets. Default is 100. -! -resultsSetCacheAmount=100 -! -! Number of rows to read into the disk read ahead buffer. -! Recommended to be set somewhere around 128 to 256. -! Default is 20. -! -rowCacheSize=128 -! -! The read ahead buffer is effective at speeding up full -! table scans. However for indexed lookups or multiple -! simultaneous scans it is better to read a single row at -! a time. Each table holds a small number of single row -! buffers to improve such operations. Default is 8. -! -!singleRowCount=4 -! -! Sometimes the look ahead buffer can be held by a single -! thread even though it is not retrieveing many values from it. -! If too many lookups retrieve data from the single row -! buffers then it is better to flush the look ahead buffer and -! make it available for re-use. Default is 128. -! -!flushAfterCacheMisses=64 -! -! Number of rows to read ahead for system tables. By default -! system tables cache everything, so it is wasteful to have large -! read ahead buffers since they will very rarely be used. This -! allows the size of the system read ahead buffers to be reduced -! if necessary. Defaults to rowCacheSize. -! -!systemRows=20 -! -! The control column in all tables normally has a large cache -! since this speeds up all operation on that table. This can be -! varied to either improve performance or to reduce space. -! default is 8192. -! -! This value applies only when tables are first created. It has no effect -! when a table is being re-opened. -! -!controlColCacheSize=512 -! -! By default, InstantDB only does a cursory search for deleted rows during -! UPDATE statements. Setting searchDeletes=1 causes more detailed searches -! for deleted rows. This slows down UPDATE executions, but reults in more -! compact tables. Default is 0. -! -searchDeletes=0 -! -! The interval, in milliseconds, between checks for statement execution -! timeouts. Default is 5000. -! -!timerCheck=5000 - -!--------------------------------------------------------------------- -! -! LOGGING AND DEBUGGING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Non-zero means include SQL statements in the export file. -! -exportSQL=0 -! -! Non-zero means trace output also directed to console. -! Defaults to 0. -! -!traceConsole=1 -traceConsole=0 -! -! Relative or absolute path where exporting and tracing goes. -! -traceFile=./tmp/trace.log -! -! Bitmap of various items that can be traced. See debug.html. -! Defaults to 0. -! -traceLevel=2 - - -!--------------------------------------------------------------------- -! -! TRANSACTION AND RECOVERY PROPERTIES -! -!--------------------------------------------------------------------- - -! -! 0 means do not perform recovery on startup. -! 1 means perform automatic recovery -! 2 (default) means prompt the user using standard in -! -recoveryPolicy=2 -! -! Sets the level of transaction journalling. See trans.html. -! Defaults to 1. -! -! 0 - No journalling takes place. -! 1 - Normal journalling (default). -! 2 - Full journalling. -! -transLevel=1 -! -! When doing an import, defines the number of rows imported -! before the transaction is committed. Recommended value 8192. -! defaults to 100. -! -transImports=100 - -!--------------------------------------------------------------------- -! -! DATE, TIME AND CURRENCY PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Number of digits after decimal point in currency outputs. Defaults to 2. -! -currencyDecimal=2 -! -! Currency symbol used in currency outputs. Defaults to $. -! -currencySymbol=$ -! -! Default format for date columns. Defaults to "yyyy-mm-dd". -! -dateFormat=yyyy-mm-dd -! -! Default format for timestamp columns. Defaults to "yyyy-mm-dd hh:mm:ss.lll". -! -dateTimeFormat=yyyy-mm-dd hh:mm:ss.lll -! -! If set, then all two digit dates less than its value are interpreted -! as 21st century dates. -! -!milleniumBoundary=50 -! -! Set to 1 causes the date string "now" to store a full timestamp. -! Default is to store only the date for fields with now hour in the -! format string. -! -nowMeansTime=0 - -!--------------------------------------------------------------------- -! -! STRING HANDLING PROPERTIES -! -!--------------------------------------------------------------------- - -! -! If set to 1 then String hashes use the JDK Object.hashCode() function. -! By default, uses InstantDB's String hashing. -! -altStringHashing=0 -! -! Set to 1 to cause LIKE clauses to always perform case insensitive -! comparisons. -! -likeIgnoreCase=0 -! -! Same as SET LITERAL STRICT_ON. Prevents string literals being interpreted -! as column names or numbers. Default is 0. -! -strictLiterals=0 -! -! Set this value to 1 (one) if you would like PreparedStatement.setString() -! to ignore "\" (backslash) characters when proceesing string constants. -! When set, InstantDB will not attempt to interpret \ as the start of an -! escape sequence. Default is 0. -! -!prepareIgnoresEscapes=1 - -!--------------------------------------------------------------------- -! -! MISCELLANEOUS PROPERTIES -! -!--------------------------------------------------------------------- - -! -! Allows selected InstantDB keywords to be un-reserved. -! e.g. ignoreKeywords=url,quote would allow the keywords -! url and quote to be used as table or column names. -! -! This faciliy is provided for compatatbility reasons only. -! It's use is not recommended AND IS NOT SUPPORTED. -! -!ignoreKeywords -! -! Non-zero means database is opened in read only mode. -! -readOnly=0 diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/jonas-sampleappli.xml b/jonas_tests/examples/base/examples/src/mdb/sampleappli/jonas-sampleappli.xml deleted file mode 100644 index 052aec3f73823c7e76509a747529bd416c52c9c5..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/jonas-sampleappli.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - Env - EnvHome - - jdbc/myDS - jdbc_1 - - - - - Stock - StockHome - - jdbc_1 - sampleappliStockTable - - stockid - ID - - - stockqty - QUANTITY - - - - findAllStocks - - - - - - - - StockHandler - - StockHandlerTopic - - - ejb/Stock - StockHome - - - jms/QueueConnectionFactory - QCF - - - jms/Orders - OrderQueue - - - - - - Order - - OrderQueue - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/sampleappli/sampleappli.xml b/jonas_tests/examples/base/examples/src/mdb/sampleappli/sampleappli.xml deleted file mode 100644 index 22940e08fce93576ebe01a2a3d061a1d5dfe4e47..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/sampleappli/sampleappli.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - Deployment descriptor for the mdb sampleappli JOnAS example - sampleappli example - - - - Describe here the session bean Env - Env - Env - sampleappli.EnvHome - sampleappli.Env - sampleappli.EnvBean - Stateless - Container - - stocktablename - java.lang.String - sampleappliStockTable - - - orderfilename - java.lang.String - order.txt - - - jdbc/myDS - javax.sql.DataSource - Application - - - - - Describe here the entity bean Stock - Stock - Stock - sampleappli.StockHome - sampleappli.Stock - sampleappli.StockBean - Container - java.lang.String - false - 1.x - - stockid - - - stockqty - - stockid - - - - Describe here the message driven bean StockHandler - Message Driven Bean StockHandler - StockHandler - sampleappli.StockHandlerBean - Container - - - - destinationType - javax.jms.Topic - - - acknowledgeMode - Auto-acknowledge - - - - subscriptionDurability - NonDurable - - - - ejb/Stock - Entity - sampleappli.StockHome - sampleappli.Stock - - - jms/QueueConnectionFactory - javax.jms.QueueConnectionFactory - Container - - - jms/Orders - javax.jms.Queue - - - - - Describe here the message driven bean Order - Message Driven Bean Order - Order - sampleappli.OrderBean - Container - - - destinationType - javax.jms.Queue - - - acknowledgeMode - Auto-acknowledge - - - - orderfilename - java.lang.String - order.txt - - - - - - - - - Stock - * - - Required - - - - - Env - * - - NotSupported - - - - - StockHandler - * - - Required - - - - - Order - * - - NotSupported - - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/samplemdb/MdbBean.java b/jonas_tests/examples/base/examples/src/mdb/samplemdb/MdbBean.java deleted file mode 100644 index 2f653e2905e14610068e70cf227e4bb8083feb30..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/samplemdb/MdbBean.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbBean.java -// Message Driven bean -package samplemdb; - -import javax.ejb.MessageDrivenBean; -import javax.ejb.MessageDrivenContext; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.TextMessage; -import javax.jms.JMSException; - -/** - * Example of MessageDrivenBean on a Topic. The transactions are container - * managed (Required) - */ -public class MdbBean implements MessageDrivenBean, MessageListener { - - private transient MessageDrivenContext mdbContext; - - // ------------------------------------------------------------------ - // MessageDrivenBean implementation - // ------------------------------------------------------------------ - - /** - * Default constructor - */ - public MdbBean() { - } - - /** - * Set the associated context. The container call this method after the - * instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param MessageDrivenContext A MessageDrivenContext interface for the - * instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - - public void setMessageDrivenContext(MessageDrivenContext ctx) { - System.out.println("MdbBean setMessageDrivenContext"); - mdbContext = ctx; - } - - /** - * A container invokes this method before it ends the life of the - * message-driven object. This happens when a container decides to terminate - * the message-driven object. This method is called with no transaction - * context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - */ - public void ejbRemove() { - System.out.println("MdbBean ejbRemove"); - } - - /** - * The Message driven bean must define an ejbCreate methods with no args. - */ - public void ejbCreate() { - System.out.println("MdbBean ejbCreate"); - } - - /** - * onMessage method - */ - public void onMessage(Message message) { - System.out.println("MdbBean onMessage"); - try { - TextMessage mess = (TextMessage) message; - System.out.println("Message received: " + mess.getText()); - } catch (JMSException ex) { - System.err.println("Exception caught: " + ex); - } - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/samplemdb/MdbClient.java b/jonas_tests/examples/base/examples/src/mdb/samplemdb/MdbClient.java deleted file mode 100644 index 1a859a48dced838250e107b3254c435b672d8f20..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/samplemdb/MdbClient.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -// MdbClient.java -// mini Client for accessing bean Mdb -package samplemdb; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.*; -import javax.jms.*; - -/** - * - */ -public class MdbClient { - - static Context ictx = null; - - static TopicConnectionFactory tcf = null; - - static TopicPublisher tp = null; - - static Topic topic = null; - - // JNDI name of the Topic - static String topicName = "mdbTopic"; - - // JNDI name of the default connection factory - static String conFactName = "JTCF"; - - public static void main(String[] arg) { - // Get InitialContext - try { - ictx = new InitialContext(); - // lookup the TopicConnectionFactory through its JNDI name - tcf = (TopicConnectionFactory) ictx.lookup(conFactName); - System.out.println("JMS client: tcf = " + tcf.toString()); - // lookup the Topic through its JNDI name - topic = (Topic) ictx.lookup(topicName); - } catch (NamingException e) { - e.printStackTrace(); - System.exit(2); - } - - TopicConnection tc = null; - TopicSession session = null; - try { - tc = tcf.createTopicConnection(); - System.out.println("JMS client: tc = " + tc.toString()); - session = tc.createTopicSession(false, Session.AUTO_ACKNOWLEDGE); - tp = session.createPublisher(topic); - } catch (Exception e) { - e.printStackTrace(); - System.exit(2); - } - - // publish 10 messages to the topic - int nbmess = 10; - try { - TextMessage message; - for (int i = 0; i < nbmess; i++) { - message = session.createTextMessage(); - message.setText("Message" + i); - tp.publish(message); - - } - session.close(); - tc.close(); - } catch (Exception e) { - e.printStackTrace(); - System.exit(2); - } - System.out.println("MDBsample is Ok"); - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/mdb/samplemdb/README b/jonas_tests/examples/base/examples/src/mdb/samplemdb/README deleted file mode 100644 index 563c3806bd303285283126baf7c132225e70b25d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/samplemdb/README +++ /dev/null @@ -1,43 +0,0 @@ -Copyright (C) Bull, 2001-2002 - - -Example description -------------------- -This unrealistic example is very sample for illustrating the use of -Message Driven Beans in JOnAS. - -The EJBClient (MdbClient) is a pure JMS Client that sends 10 messages -on a Topic named "mdbTopic". -In the JOnAS Server is deployed a Message Driven Bean Mdb that asynchrounsly -receives and prints the messages. - - -Compiling this example: ----------------------- -ant -find build.xml install - -Running this example: ---------------------- - -Toy can use the provided scripts (run.sh on Unix or run.bat on Windows) to execute the -whole example. - -or, steb by step: - jonas start - ant runclient - jonas stop - -You may want to execute this example with the MOM JMS that is running in a -separate JVM. For this, you must first : --> in case of the jms service - - a] Set the property jonas.service.jms.collocated to false - in jonas.properties then run the JmsServer first. - b] Run the standalone Jms Server : JmsServer & - --> in case of the rar joram - - set the config-property 'CollocatedServer' to false - in ra.xml of the joram's rar - - diff --git a/jonas_tests/examples/base/examples/src/mdb/samplemdb/application-client.xml b/jonas_tests/examples/base/examples/src/mdb/samplemdb/application-client.xml deleted file mode 100644 index 13436c357a7d391a38bfe7ac340abd00749605df..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/samplemdb/application-client.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Client of the sb sample - - diff --git a/jonas_tests/examples/base/examples/src/mdb/samplemdb/build.xml b/jonas_tests/examples/base/examples/src/mdb/samplemdb/build.xml deleted file mode 100644 index 55b9e41cea647cbbda1ede6c8e6d7f794ed29aab..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/samplemdb/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/samplemdb/jonas-samplemdb.xml b/jonas_tests/examples/base/examples/src/mdb/samplemdb/jonas-samplemdb.xml deleted file mode 100644 index 160d775d8be4033f04e247d0546f8d4339d875b1..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/samplemdb/jonas-samplemdb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Mdb - - mdbTopic - - 20 - 10 - - - - diff --git a/jonas_tests/examples/base/examples/src/mdb/samplemdb/samplemdb.xml b/jonas_tests/examples/base/examples/src/mdb/samplemdb/samplemdb.xml deleted file mode 100644 index afed6233eb8a04d04a43771360eb08a5832a0dbf..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/mdb/samplemdb/samplemdb.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - Deployment descriptor for the samplemdb JOnAS example - samplemdb example - - - Describe here the message driven bean Mdb - Message Driven Bean Mdb - Mdb - samplemdb.MdbBean - javax.jms.MessageListener - Container - javax.jms.Topic - - - destinationType - javax.jms.Topic - - - acknowledgeMode - Auto-acknowledge - - - - subscriptionDurability - NonDurable - - - - - - - - - - Mdb - * - - Required - - - - diff --git a/jonas_tests/examples/base/examples/src/sb/ClientOp.java b/jonas_tests/examples/base/examples/src/sb/ClientOp.java deleted file mode 100644 index 2a0995b11a2c7a865a4a13f233254a91d38b8f2d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/sb/ClientOp.java +++ /dev/null @@ -1,170 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package sb; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.transaction.UserTransaction; - -/** - * Sample for Session Bean. Usage: java sb.ClientOp - * Heavy client doing some operations on a bean - * @author jonas team - */ -public class ClientOp { - /** - * First amount to buy - */ - private static final int FIRST_BUY_AMOUNT = 10; - - /** - * Second amount to buy - */ - private static final int SECOND_BUY_AMOUNT = 20; - - /** - * Third amount to buy (will be rollback) - */ - private static final int THIRD_BUY_AMOUNT = 50; - - /** - * Constructor. Hide constructor as it is an utility class - */ - private ClientOp() { - - } - - /** - * Main method - * @param args arguments of the client - */ - public static void main(String[] args) { - - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - System.err.println("Cannot get initial context for JNDI: " + e); - System.exit(2); - } - - // We want to start transactions from client: get UserTransaction - UserTransaction utx = null; - try { - - // Comment the following lines if you want to use a David Client: - utx = (UserTransaction) initialContext.lookup("javax.transaction.UserTransaction"); - - // Uncomment the following lines if you want to use a David Client: - /* - * Properties prop = new Properties(); - * prop.put("java.naming.factory.initial", - * "com.sun.jndi.rmi.registry.RegistryContextFactory"); - * prop.put("java.naming.provider.url", "rmi://localhost:1099"); // - * update the port if necessary InitialContext ictx = new - * InitialContext(prop); utx = (UserTransaction) - * ictx.lookup("javax.transaction.UserTransaction"); - */ - - } catch (Exception e) { - System.err.println("Cannot lookup UserTransaction: " + e); - System.exit(2); - } - - // Connecting to OpHome thru JNDI - OpHome home = null; - try { - home = (OpHome) PortableRemoteObject.narrow(initialContext.lookup("OpHome"), OpHome.class); - } catch (Exception e) { - System.err.println("Cannot lookup OpHome: " + e); - System.exit(2); - } - - // OpBean creation - Op t1 = null; - try { - System.out.println("Create a bean"); - t1 = home.create("User1"); - } catch (Exception e) { - System.err.println("Cannot create OpBean: " + e); - System.exit(2); - } - - // First transaction (committed) - try { - System.out.println("Start a first transaction"); - utx.begin(); - System.out.println("First request on the new bean"); - t1.buy(FIRST_BUY_AMOUNT); - System.out.println("Second request on the bean"); - t1.buy(SECOND_BUY_AMOUNT); - System.out.println("Commit the transaction"); - utx.commit(); - } catch (Exception e) { - System.err.println("exception during 1st Tx: " + e); - System.exit(2); - } - // Start another transaction (rolled back) - try { - System.out.println("Start a second transaction"); - utx.begin(); - t1.buy(THIRD_BUY_AMOUNT); - System.out.println("Rollback the transaction"); - utx.rollback(); - } catch (Exception e) { - System.err.println("exception during 2nd Tx: " + e); - System.exit(2); - } - - // Get the total bought, outside the transaction - int val = 0; - try { - System.out.println("Request outside any transaction"); - val = t1.read(); - } catch (Exception e) { - System.err.println("Cannot read value on t1 : " + e); - System.exit(2); - } - if (val != FIRST_BUY_AMOUNT + SECOND_BUY_AMOUNT) { - System.err.println("Bad value read: " + val); - System.exit(2); - } - - // Remove Session bean - try { - t1.remove(); - } catch (Exception e) { - System.out.println("Exception on buy: " + e); - System.exit(2); - } - System.out.println("ClientOp OK. Exiting."); - } -} - diff --git a/jonas_tests/examples/base/examples/src/sb/Op.java b/jonas_tests/examples/base/examples/src/sb/Op.java deleted file mode 100644 index a9068f61999bc25d47a1ce9a56b88632b867a1d9..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/sb/Op.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package sb; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -/** - * Remote interface for the bean Op - * @author JOnAS team - */ -public interface Op extends EJBObject { - - /** - * Business method implementation. - * @param shares nb of shares to be bought - * @throws RemoteException if RMI failed. - */ - void buy (int shares) throws RemoteException; - - /** - * Business method implementation. - * @return the nb of shares bought - * @throws RemoteException if RMI failed. - */ - int read () throws RemoteException; - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/sb/OpBean.java b/jonas_tests/examples/base/examples/src/sb/OpBean.java deleted file mode 100644 index c786974d6cc90f9ee68e9ed2f55f37c71f437cdf..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/sb/OpBean.java +++ /dev/null @@ -1,259 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package sb; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.ejb.SessionSynchronization; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -/** - * This is an example of Session Bean, statefull, and synchronized. - * @author JOnAS team - */ -public class OpBean implements SessionBean, SessionSynchronization { - - /** - * Actual state of the bean - */ - private int total = 0; - - /** - * value inside Tx, not yet committed. - */ - private int newtotal = 0; - - /** - * User client - */ - private String clientUser = null; - - - /* ========================= ejbCreate methods ============================ */ - - /** - * There must be one ejbCreate() method per create() method on the Home - * interface, and with the same signature. - * @param user the user name - */ - public void ejbCreate(String user) { - - total = 0; - newtotal = total; // in case we are outside transactions - clientUser = user; - } - - /* - * ====================== javax.ejb.SessionBean implementation - * ================= - */ - - /** - * The activate method is called when the instance is activated from its - * "passive" state. The instance should acquire any resource that it has - * released earlier in the ejbPassivate() method. This method is called with - * no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbActivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - } - - /** - * The passivate method is called before the instance enters the "passive" - * state. The instance should release any resources that it can re-acquire - * later in the ejbActivate() method. After the passivate method completes, - * the instance must be in a state that allows the container to use the Java - * Serialization protocol to externalize and store away the instance's - * state. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbPassivate() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - } - - /** - * A container invokes this method before it ends the life of the session - * object. This happens as a result of a client's invoking a remove - * operation, or when a container decides to terminate the session object - * after a timeout. This method is called with no transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for enterprise beans - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void ejbRemove() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - } - - /** - * Set the associated session context. The container calls this method after - * the instance creation. The enterprise Bean instance should store the - * reference to the context object in an instance variable. This method is - * called with no transaction context. - * @param sessionContext A SessionContext interface for the instance. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException This exception is defined in the method - * signature to provide backward compatibility for applications - * written for the EJB 1.0 specification. Enterprise beans written - * for the EJB 1.1 specification should throw the - * javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB2.0 and higher specifications must throw - * the javax.ejb.EJBException instead of this exception. - */ - public void setSessionContext(SessionContext sessionContext) throws EJBException, java.rmi.RemoteException { - - } - - /* - * ============== javax.ejb.SessionSynchronization implementation - * ============= - */ - - /** - * The afterBegin method notifies a session Bean instance that a new - * transaction has started, and that the subsequent business methods on the - * instance will be invoked in the context of the transaction. The instance - * can use this method, for example, to read data from a database and cache - * the data in the instance fields. This method executes in the proper - * transaction context. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException - This exception is defined in the - * method signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specifications should throw - * the javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB 2.0 and higher specifications must not - * throw the java.rmi.RemoteException. - */ - public void afterBegin() throws EJBException, java.rmi.RemoteException { - newtotal = total; - } - - /** - * The beforeCompletion method notifies a session Bean instance that a - * transaction is about to be committed. The instance can use this method, - * for example, to write any cached data to a database. This method executes - * in the proper transaction context. Note: The instance may still - * cause the container to rollback the transaction by invoking the - * setRollbackOnly() method on the instance context, or by throwing an - * exception. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException - This exception is defined in the - * method signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specifications should throw - * the javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB 2.0 and higher specifications must not - * throw the java.rmi.RemoteException. - */ - public void beforeCompletion() throws EJBException, java.rmi.RemoteException { - // Nothing to do for this simple example - - // We can access the bean environment everywhere in the bean, - // for example here! - try { - InitialContext ictx = new InitialContext(); - String value = (String) ictx.lookup("java:comp/env/prop1"); - // value should be the one defined in ejb-jar.xml - } catch (NamingException e) { - throw new EJBException(e); - } - } - - /** - * The afterCompletion method notifies a session Bean instance that a - * transaction commit protocol has completed, and tells the instance whether - * the transaction has been committed or rolled back. This method executes - * with no transaction context. - * @param committed - True if the transaction has been committed, false if - * is has been rolled back. - * @throws EJBException Thrown by the method to indicate a failure caused by - * a system-level error. - * @throws java.rmi.RemoteException - This exception is defined in the - * method signature to provide backward compatibility for enterprise - * beans written for the EJB 1.0 specification. Enterprise beans - * written for the EJB 1.1 and higher specifications should throw - * the javax.ejb.EJBException instead of this exception. Enterprise - * beans written for the EJB 2.0 and higher specifications must not - * throw the java.rmi.RemoteException. - */ - public void afterCompletion(boolean committed) throws EJBException, java.rmi.RemoteException { - if (committed) { - total = newtotal; - } else { - newtotal = total; - } - } - - /* ========================= Op implementation ============================ */ - - /** - * Business method implementation. - * @param s nb of shares to be bought - */ - public void buy(int s) { - newtotal = newtotal + s; - return; - } - - /** - * Business method implementation. - * @return the nb of shares bought - */ - public int read() { - return newtotal; - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/sb/OpHome.java b/jonas_tests/examples/base/examples/src/sb/OpHome.java deleted file mode 100644 index b3cf09571c335035d74d8e34638b374350ad2160..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/sb/OpHome.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): ____________________________________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package sb; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * Home interface for the bean Op - * @author JOnAS team - */ -public interface OpHome extends EJBHome { - - /** - * Create an instance of the Op bean. - * @param user the user name. - * @return the Remote interface of the bean Op. - * @throws CreateException if the creation failed. - * @throws RemoteException if the RMI call failed. - */ - Op create(String user) throws CreateException, RemoteException; -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/src/sb/README b/jonas_tests/examples/base/examples/src/sb/README deleted file mode 100644 index a02b46bfdad434eb55efbf1485cd8df416441e10..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/sb/README +++ /dev/null @@ -1,36 +0,0 @@ -Copyright (C) BULL S.A. 1998-2002. - - -Compiling this example: ------------------------ -This example is compiled with the others by "ant install" in $JONAS_ROOT/examples. - -Running this example: ---------------------- -1) Run the JOnAS EJB Server to make beans available to clients: - - jonas start - -2) Load the sb.jar if you have not added it in the ejb service descriptors list : - -on UNIX: - jonas admin -a $JONAS_BASE/ejbjars/sb.jar - -On Windows: - jonas admin -a $JONAS_BASE/ejbjars/sb.jar - -You should see something like this when the bean is loaded : - - Op available - -3) Run the client program: - -on UNIX: - jclient -cp $JONAS_BASE/ejbjars/sb.jar sb.ClientOp - -On Windows: - jclient -cp "%JONAS_BASE%\ejbjars\sb.jar sb.ClientOp - - -4) Stop the jonas server - jonas stop diff --git a/jonas_tests/examples/base/examples/src/sb/application-client.xml b/jonas_tests/examples/base/examples/src/sb/application-client.xml deleted file mode 100644 index 13436c357a7d391a38bfe7ac340abd00749605df..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/sb/application-client.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Client of the sb sample - - diff --git a/jonas_tests/examples/base/examples/src/sb/build.xml b/jonas_tests/examples/base/examples/src/sb/build.xml deleted file mode 100644 index d45e5981aea386c8e99e767b895be6609b57db0b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/sb/build.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/src/sb/jonas-sb.xml b/jonas_tests/examples/base/examples/src/sb/jonas-sb.xml deleted file mode 100644 index 4fa36f99ab6394e9e1fd48d3f70c2450bc1c5784..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/sb/jonas-sb.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - Op - OpHome - - - diff --git a/jonas_tests/examples/base/examples/src/sb/sb.xml b/jonas_tests/examples/base/examples/src/sb/sb.xml deleted file mode 100644 index 968f28f488f8b91df96746b8a74ffcc9b3ca9d3c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/sb/sb.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - Deployment descriptor for the sb JOnAS example - sb example - - - Op - sb.OpHome - sb.Op - sb.OpBean - Stateful - Container - - prop1 - java.lang.String - prop1 value - - - - - - - Op - * - - Required - - - diff --git a/jonas_tests/examples/base/examples/src/src_common.xml b/jonas_tests/examples/base/examples/src/src_common.xml deleted file mode 100644 index b753eb52696360366b592347dd5fdb91be83b874..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/src/src_common.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/statelessbean/build.xml b/jonas_tests/examples/base/examples/statelessbean/build.xml deleted file mode 100644 index 429177e4abc88520701d82640958def1c10d0cd5..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/statelessbean/etc/web.xml b/jonas_tests/examples/base/examples/statelessbean/etc/web.xml deleted file mode 100644 index ed9b4b352cb20a9696eed0e58e21e1a59c13bd51..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/etc/web.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - StatelessClient - - org.ow2.easybeans.examples.statelessbean.ClientServletStateless - - - - - StatelessClient - / - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/ClientServletStateless.java b/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/ClientServletStateless.java deleted file mode 100644 index 798d50a92194047ea0e5276adbac91d4edea1cfd..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/ClientServletStateless.java +++ /dev/null @@ -1,179 +0,0 @@ -/** - * EasyBeans - * Copyright (C) 2006 Bull S.A.S. - * Contact: easybeans@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.easybeans.examples.statelessbean; - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * Servlet's client for the stateless session bean. - * @author Florent Benoit - */ -public class ClientServletStateless extends HttpServlet { - - /** - * Serializable class uid. - */ - private static final long serialVersionUID = 6893863749912962928L; - - /** - * Called by the server (via the service method) to allow a servlet to - * handle a GET request. - * @param request an HttpServletRequest object that contains the request the - * client has made of the servlet - * @param response an HttpServletResponse object that contains the response - * the servlet sends to the client - * @throws IOException if an input or output error is detected when the - * servlet handles the GET request - * @throws ServletException if the request for the GET could not be handled - */ - @Override - public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException { - - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - out.println(""); - out.println(""); - out.println(""); - out.println("Client of stateless session bean"); - out.println(""); - out.println(""); - - // no operation ? displays button for hello world and calculator - String operation = request.getParameter("operation"); - if (operation != null) { - if (operation.equals("helloWorld")) { - displayHelloWorld(out); - } else if (operation.equals("add")) { - // get two parameters - String param1 = request.getParameter("p1"); - String param2 = request.getParameter("p2"); - if (param1 != null && param2 != null) { - int v1 = Integer.parseInt(param1); - int v2 = Integer.parseInt(param2); - displayResult(out, v1, v2); - } else { - out.println("Missing values for operation add"); - } - } - } - out.println("
    "); - displayDefault(out); - - - out.println(""); - out.println(""); - out.close(); - } - - /** - * Call HelloWorld method. - * @param out the given writer - */ - private void displayHelloWorld(final PrintWriter out) { - out.println("Calling helloWorld() method"); - out.println("
    "); - try { - getBean().helloWorld(); - out.println("helloWorld() method called OK."); - } catch (Exception e) { - displayException(out, "Cannot call helloworld on the bean", e); - } - } - - /** - * By default, call helloWorld method. - * @param out the given writer - */ - private void displayDefault(final PrintWriter out) { - out.println("
    "); - out.println("sum of a + b :"); - out.println("

    "); - out.println("

    "); - out.println("

    "); - out.println("

    "); - out.println("
    "); - out.println("
    "); - out.println("

    "); - out.println("

    "); - out.println("
    "); - } - - /** - * Prints he result of the sum of val1 and val2. - * @param out the given writer - * @param val1 first arg for add method - * @param val2 second arg for add method - */ - private void displayResult(final PrintWriter out, final int val1, final int val2) { - out.println("
    Sum of '" + val1 + "' and '" + val2 + "' = "); - try { - int sum = getBean().add(val1, val2); - out.println(sum); - } catch (Exception e) { - displayException(out, "
    Cannot call add() method on the bean", e); - } - } - - /** - * If there is an exception, print the exception. - * @param out the given writer - * @param errMsg the error message - * @param e the content of the exception - */ - private void displayException(final PrintWriter out, final String errMsg, final Exception e) { - out.println("

    Exception : " + errMsg); - out.println("

    ");
    -        e.printStackTrace(out);
    -        out.println("

    "); - } - - /** - * Lookup the stateless bean and gets a reference on it. - * @return the stateless bean business interface. - * @throws Exception if the bean cannot be retrieved. - */ - private StatelessRemote getBean() throws Exception { - Context initialContext = new InitialContext(); - Object o = initialContext.lookup("org.ow2.easybeans.examples.statelessbean.StatelessBean" + "_" - + StatelessRemote.class.getName() + "@Remote"); - - if (o instanceof StatelessRemote) { - StatelessRemote statelessBean = (StatelessRemote) o; - return statelessBean; - } - throw new Exception("Cannot cast object into StatelessRemote"); - - } - -} diff --git a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/ClientStateless.java b/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/ClientStateless.java deleted file mode 100644 index 63ebf198b5c868a8464cb42e2bd9bbbb4daf8352..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/ClientStateless.java +++ /dev/null @@ -1,119 +0,0 @@ -/** - * EasyBeans - * Copyright (C) 2006 Bull S.A.S. - * Contact: easybeans@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.easybeans.examples.statelessbean; - -import java.util.Hashtable; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -/** - * Simple client of the stateless. - * @author Florent Benoit - */ -public final class ClientStateless { - - /** - * Default InitialContextFactory to use. - */ - private static final String DEFAULT_INITIAL_CONTEXT_FACTORY = "org.ow2.carol.jndi.spi.MultiOrbInitialContextFactory"; - - /** - * Utility class. - */ - private ClientStateless() { - - } - - /** - * Main method. - * @param args the arguments (not required) - * @throws Exception if exception is found. - */ - public static void main(final String[] args) throws Exception { - - Context initialContext = getInitialContext(); - - // Thread.currentThread().sleep(5000); - - StatelessRemote statelessBean = (StatelessRemote) initialContext - .lookup("org.ow2.easybeans.examples.statelessbean.StatelessBean" - + "_" + StatelessRemote.class.getName() + "@Remote"); - - System.out.println("Calling the first method..."); - System.out.println("Calling helloWorld method..."); - statelessBean.helloWorld(); - - System.out.println("-----------------------------"); - System.out.println("-----------------------------"); - System.out.println("Calling the secode method..."); - System.out.println("Add 1 + 2..."); - int resultAdd = statelessBean.add(1, 2); - System.out.println("Sum = '" + resultAdd + "'."); - - System.out.println("-----------------------------"); - System.out.println("-----------------------------"); - System.out.println("Calling the third method..."); - System.out.println("Div 6 / 3 (expect exception)..."); - int resultDiv = statelessBean.div(6, 3); - System.out.println("Div = '" + resultDiv + "'."); - } - - /** - * @return Returns the InitialContext. - * @throws NamingException If the Context cannot be created. - */ - private static Context getInitialContext() throws NamingException { - - // if user don't use jclient/client container - // we can specify the InitialContextFactory to use - // But this is *not recommended*. - Hashtable env = new Hashtable(); - env.put(Context.INITIAL_CONTEXT_FACTORY, getInitialContextFactory()); - - // Usually a simple new InitialContext() without any parameters is sufficent. - // return new InitialContext(); - - return new InitialContext(env); - } - - /** - * Returns a configurable InitialContextFactory classname.
    - * Can be configured with the easybeans.client.initial-context-factory System property. - * @return Returns a configurable InitialContextFactory classname. - */ - private static String getInitialContextFactory() { - String prop = System.getProperty("easybeans.client.initial-context-factory"); - // If not found, use the default - if (prop == null) { - prop = DEFAULT_INITIAL_CONTEXT_FACTORY; - } - return prop; - } - - -} diff --git a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessBean.java b/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessBean.java deleted file mode 100644 index 7103a4deba73f59e9ee3e9065fdb964ec849a278..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessBean.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * EasyBeans - * Copyright (C) 2006 Bull S.A.S. - * Contact: easybeans@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.easybeans.examples.statelessbean; - -import javax.ejb.Local; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.interceptor.AroundInvoke; -import javax.interceptor.ExcludeClassInterceptors; -import javax.interceptor.Interceptors; -import javax.interceptor.InvocationContext; - - -import org.ow2.cmi.annotation.Cluster; -import org.ow2.cmi.annotation.Policy; -import org.ow2.cmi.lb.policy.RoundRobin; - -/** - * Simple stateless bean. - * @author Florent Benoit - */ -@Stateless -@Local(StatelessLocal.class) -@Remote(StatelessRemote.class) -@Interceptors({StatelessInterceptor.class}) -@Cluster(name="test_cluster") -@Policy(RoundRobin.class) -public class StatelessBean implements StatelessRemote { - - /** - * Hello world. - */ - public void helloWorld() { - System.out.println("Hello world !"); - } - - /** - * Compute a + b. - * @param a first int - * @param b second int - * @return a + b - */ - @Interceptors({StatelessOnlyAddMethodInterceptor.class}) - public int add(final int a, final int b) { - return a + b; - } - - /** - * Divide a by b. - * @param a first int - * @param b second int - * @return a / b - */ - public int div(final int a, final int b) { - if (b == 0) { - throw new IllegalArgumentException("cannot divide by 0"); - } - return a / b; - } - - /** - * Methods without interceptors. - */ - @ExcludeClassInterceptors - public void notInterceptedMethod() { - - } - - - /** - * Trace method's time. - * @param invocationContext contains attributes of invocation - * @return method's invocation result - * @throws Exception if invocation fails - */ - @AroundInvoke - public Object trace(final InvocationContext invocationContext) throws Exception { - System.out.println("TraceInterceptor : method '" + invocationContext.getMethod().getName() - + "'."); - long startPeriod = System.nanoTime(); - try { - return invocationContext.proceed(); - } finally { - long elapsed = System.nanoTime() - startPeriod; - System.out.println("TraceInterceptor : Elapsed time = " + elapsed + " ns"); - } - } -} diff --git a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessInterceptor.java b/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessInterceptor.java deleted file mode 100644 index 72e55cc7f5bfff71ac40d6bd818ef33be0ef7b08..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessInterceptor.java +++ /dev/null @@ -1,79 +0,0 @@ -/** - * EasyBeans - * Copyright (C) 2006 Bull S.A.S. - * Contact: easybeans@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.easybeans.examples.statelessbean; - -import java.lang.reflect.Method; - -import javax.annotation.PostConstruct; -import javax.interceptor.AroundInvoke; -import javax.interceptor.InvocationContext; - -/** - * Simple interceptor class. Mix of business interceptors and lifecycle interceptors. - * @author Florent Benoit - */ -public class StatelessInterceptor { - - /** - * Another class interceptor. - * @param invocationContext contains attributes of invocation - * @return method's invocation result - * @throws Exception if invocation fails - */ - @SuppressWarnings("finally") - @AroundInvoke - public Object toto(final InvocationContext invocationContext) throws Exception { - System.out.println("Another class interceptor"); - Method m = invocationContext.getMethod(); - // Change the returned value for add method - Object returnedValue = null; - try { - returnedValue = invocationContext.proceed(); - } finally { - if (m.getName().equals("add")) { - // Uncomment the following line to change the returned value - //return Integer.valueOf(-1); - return returnedValue; - } - return returnedValue; - } - } - - /** - * Callback in an external class. - * @param invocationContext the invocationcontext. - */ - @PostConstruct - public void myPostConst(final InvocationContext invocationContext) { - System.out.println("postConstruct in class Statelesslistener of bean " + invocationContext.getTarget()); - try { - invocationContext.proceed(); - } catch (Exception e) { - throw new RuntimeException("Cannot proceed invocationContext", e); - } - } - -} diff --git a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessLocal.java b/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessLocal.java deleted file mode 100644 index 542b89a1fe1fefae7f8284318c9ed5681647bfb8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessLocal.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * EasyBeans - * Copyright (C) 2006 Bull S.A.S. - * Contact: easybeans@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.easybeans.examples.statelessbean; - -/** - * Simple interface for a stateless bean. - * It acts as a local interface. - * @author Florent Benoit - */ -public interface StatelessLocal { - - /** - * Hello world. - */ - void helloWorld(); - - /** - * Compute a + b. - * @param a first int - * @param b second int - * @return a + b - */ - int add(final int a, final int b); - - /** - * Divide a by b. - * @param a first int - * @param b second int - * @return a / b - */ - int div(final int a, final int b); - - - /** - * Methods without interceptors. - */ - void notInterceptedMethod(); -} diff --git a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessOnlyAddMethodInterceptor.java b/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessOnlyAddMethodInterceptor.java deleted file mode 100644 index c6948710cfebd06cd80d80add839ab02fdd67d1e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessOnlyAddMethodInterceptor.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * EasyBeans - * Copyright (C) 2006 Bull S.A.S. - * Contact: easybeans@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.easybeans.examples.statelessbean; - -import java.lang.reflect.Method; - -import javax.interceptor.AroundInvoke; -import javax.interceptor.InvocationContext; - - -/** - * Simple interceptor class which should be launched only on add method. - * @author Florent Benoit - */ -public class StatelessOnlyAddMethodInterceptor { - - /** - * Another class interceptor. - * @param invocationContext contains attributes of invocation - * @return method's invocation result - * @throws Exception if invocation fails - */ - @AroundInvoke - public Object onlyAdd(final InvocationContext invocationContext) throws Exception { - System.out.println("Add interceptor"); - Method m = invocationContext.getMethod(); - // Checks the method name - if (m.getName().equals("add")) { - System.out.println("Applied on the correct method"); - } else { - throw new Exception("Error, should be only on add method while it is applied on '" + m.getName() + "' method."); - } - return invocationContext.proceed(); - } - -} diff --git a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessRemote.java b/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessRemote.java deleted file mode 100644 index 34be426ffb76668fda6b2d7596c124e4346db8dc..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/StatelessRemote.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * EasyBeans - * Copyright (C) 2006 Bull S.A.S. - * Contact: easybeans@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.easybeans.examples.statelessbean; - - -/** - * Simple interface for a stateless bean. - * It acts as a remote interface. - * @author Florent Benoit - */ -public interface StatelessRemote extends StatelessLocal { - -} diff --git a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/package.html b/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/package.html deleted file mode 100644 index 42fce5fae51659c3a24cb91e131836bf88484595..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/statelessbean/src/java/org/ow2/easybeans/examples/statelessbean/package.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - EJB 3.0 - - -

    Example of EJB 3.0 container

    - - diff --git a/jonas_tests/examples/base/examples/webservices/README b/jonas_tests/examples/base/examples/webservices/README deleted file mode 100644 index 5233e72593a625d934100572d1a2d88b6775aa13..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/README +++ /dev/null @@ -1,64 +0,0 @@ - -JOnAS WebServices Sample -------------------------- - -This example is composed of 4 sub examples : - - a Standalone Web Application exposing a JaxRpc Endpoint as WebService and a simple client (wswarsample.war) - - a Standalone WebApplication which is client of a WebServices (Google) (wsaccess.war) - - an Application with 1 EJB : a Stateless Session bean exposed as web service (ws.ear). This example also shows - how to add security to a Stateless Session bean using WsGen. The security parameters are specified in jonas-webservices.xml - and the username and password required is jonas:jonas - - an Application composed by a Session Bean acting as web service client accessed through a JSP (wsclient.ear). - -What it show ? ---------------- - -In this sample, we will show the usage of a new tag in Web and Ejb Deployment Desc. - - service-ref tag is used to declare a dependancy of the component on a WebServices. - In other word, the component is client of an external WebService. - This tag can be used in the web.xml Deployment desc and in ejb-jar deployment desc. - -> This tag MAY be used jointly with jonas-service-ref tag in JOnAS specific Deployment Descriptor (jonas-web.xml and - jonas-ejb-jar.xml) : It's optionnal. - -For declaring a WebService endpoint, a new Deployment Descriptor has been introduced : webservices.xml. It can be used in an ejbjar or webapp file. - -You can notice that the beans/wsclient/build.xml do not use anymore the genic and wsgen tasks. They are automatically -applied on the server side. -Just make sure that the property jonas.service.ws.auto-wsgen.engaged (in jonas.properties) is set to 'true' (or commented). -Otherwise, needed ws artifacts will not be generated. - -Report to the documentation for more information. - -How to : ---------- - -1. Install the example - ant install - -2. start JOnAS - jonas start - -3. install the archives in JOnAS - jonas admin -a wsaccess.war - jonas admin -a wswarsample.war - jonas admin -a ws.ear - jonas admin -a wsclient.ear - -4. View the results in your browser - http://:/wsaccess/ - http://:/wswarsample/ - http://:/axis-ws/ssbEndpoint/WSBeanEndpointLocal?JWSDL (username:jonas password: jonas) - http://:/wsclient/ - - -Notes : --------- -If you have a proxy to access the internet, you have to add some properties in your JAVA_OPTS environment variable before you launch JOnAS. -export JAVA_OPTS=$JAVA_OPTS"-Dhttp.proxyHost= \ - -Dhttp.proxyPort= \ - -Dhttp.proxyUser= \ - -Dhttp.proxyPassword= \ - -Dhttp.nonProxyHosts= \ - -Dhttp.proxySet=true" - -You should see some Exceptions when using WsGen (Class not found with digester), don't be afraid, this is normal. \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/webservices/beans/ws/build.xml b/jonas_tests/examples/base/examples/webservices/beans/ws/build.xml deleted file mode 100644 index 24ff942f9332c7846d04c49ce5637e88b5227d3c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/ws/build.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/jonas-webservices.xml b/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/jonas-webservices.xml deleted file mode 100644 index a5d1d4dbc21e1bafebd6e922300348b033838f31..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/jonas-webservices.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - gen-axis-webapp.war - axis-ws - - - - My Web Services - - - ssbEndpoint - - /services1/webservice - - - - - - - - Stateless Session Bean Endpoint - - /services1/webservice - - - jonas-admin - - - - - - BASIC - - WS Example Authentication Area - - - - - - jonas-admin - - - - memrlm_1 - - - - WS Example Authentication Area - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/ssbEndpointMapping.xml b/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/ssbEndpointMapping.xml deleted file mode 100644 index 9414385f85be92749c4e820674de6f8e1b589fab..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/ssbEndpointMapping.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - org.objectweb.wssample.beans.ws - http://ws.beans.wssample.objectweb.org - - - org.objectweb.wssample.beans.ws.WSBeanEndpoint - ns:WSBeanEndpointLocal - ns:WSBeanEndpointLocalSoapBinding - - getCotes - getCotes - - int - ns:getCotesResponse - getCotesReturn - - - - sayHello - sayHello - - 0 - java.lang.String - - ns:sayHelloRequest - in0 - IN - - - - java.lang.String - ns:sayHelloResponse - sayHelloReturn - - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/webservices.xml b/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/webservices.xml deleted file mode 100644 index d7a709de7cb083845415598b0c0884543b0e6e37..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/webservices.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - My Web Services - - My Web Services - META-INF/wsdl/ssbEndpoint.wsdl - META-INF/ssbEndpointMapping.xml - - ssbEndpoint - beanswssample:WSBeanEndpointLocal - org.objectweb.wssample.beans.ws.WSBeanEndpoint - - WSBeanEndpointSLL - - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/wsdl/ssbEndpoint.wsdl b/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/wsdl/ssbEndpoint.wsdl deleted file mode 100644 index 6e9f48e67c8bd5382e90b390165122f3f20f7b78..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/ws/etc/xml/wsdl/ssbEndpoint.wsdl +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpoint.java b/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpoint.java deleted file mode 100644 index 5de3cd68ea88106bad24ef36cb79f957ae39eb95..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpoint.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.wssample.beans.ws; - -import java.rmi.Remote; -import java.rmi.RemoteException; - - -/** - * ServiceEndpoint interface - * - * @author Guillaume Sauthier - */ -public interface WSBeanEndpoint extends Remote { - - /** - * @param name name - * @return Returns "Hello " + name - * @throws RemoteException RemoteException - */ - String sayHello(String name) throws RemoteException; - - /** - * @return Returns integer - * @throws RemoteException RemoteException - */ - int getCotes() throws RemoteException; -} diff --git a/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpointSLL.java b/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpointSLL.java deleted file mode 100644 index e8f525f78b8660129c4aef0e1ca990e307e672f9..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/WSBeanEndpointSLL.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.wssample.beans.ws; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * - */ -public class WSBeanEndpointSLL implements SessionBean { - - /** - * logger - */ - private static Logger logger = null; - - /** - * EJB SessionContext - */ - private SessionContext ejbContext; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the SessionContext - * @param ctx SessionContext - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * ejbRemove - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * ejbRemove - * @throws CreateException CreateException - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * ejbPassivate - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * ejbActivate - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // WSBeanEndpoint implementation - // ------------------------------------------------------------------ - - /** - * @param name name - * @return Returns "Hello " + name - */ - public String sayHello(String name) { - logger.log(BasicLevel.INFO, "sayHello(" + name + ") invokation."); - return "Hello " + name; - } - - /** - * @return Returns integer - */ - public int getCotes() { - logger.log(BasicLevel.INFO, "getCotes invokation"); - return 12; - } -} - diff --git a/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/jonas-wsearsample.xml b/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/jonas-wsearsample.xml deleted file mode 100644 index d2cd8045ea33c798a8cd489eb141ab15d72b66c7..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/jonas-wsearsample.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - WSBeanEndpointSLL - ejbs/WSBeanEndpointHome - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/wsearsample.xml b/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/wsearsample.xml deleted file mode 100644 index 2da15f2e97666f33fd56968558058733516c449b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/ws/src/org/objectweb/wssample/beans/ws/wsearsample.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - Describe here the content of this file - wsearsample - - - - Describe here the session bean WSBeanEndpoint - wsearsample/WSBeanEndpointSLL - WSBeanEndpointSLL - - org.objectweb.wssample.beans.ws.WSBeanEndpoint - org.objectweb.wssample.beans.ws.WSBeanEndpointSLL - Stateless - Container - - - - - - - jonas-admin - - - jonas-admin - - WSBeanEndpointSLL - * - - - - - WSBeanEndpointSLL - * - - Supports - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/build.xml b/jonas_tests/examples/base/examples/webservices/beans/wsclient/build.xml deleted file mode 100644 index 0654e50aafcabd2648e1ad91dc9246794eedfbf4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/build.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/jetty.gif b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/jetty.gif deleted file mode 100644 index 01f44a87f6801b200f142513d0d02b12cea0fb46..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/jetty.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/jonas.ico b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/jonas.ico deleted file mode 100644 index 108c5c21ede334f3b80d9a373f618c52efee7877..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/jonas.ico and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/ow_jonas_logo.gif b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/ow_jonas_logo.gif deleted file mode 100644 index 1b56943a721f82a8cb81776030567772265433f2..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/ow_jonas_logo.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/ow_logo.png b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/ow_logo.png deleted file mode 100644 index 60617270bf0c0d21c9f40e4f7c85ef5bfdbda548..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/ow_logo.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/tomcat.gif b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/tomcat.gif deleted file mode 100644 index 61756736b82350f64b5ea1b2bfc31ac57e30a3d3..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/images/tomcat.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/index.html b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/index.html deleted file mode 100644 index 70df9fb7e8d545cff26c8de80a0b69f1e6867a45..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/index.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - EJB accessing Google WS API - - - - - - -
    - Jakarta Tomcat - Mortbay Jetty - JOnAS WebSite -
    - -
    - EJB accessing Google WebService API -
    - -
    -
    - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/search-google.jsp b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/search-google.jsp deleted file mode 100644 index 430c6ed9df4003016f83d95db997e9ffd412f0e4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/search-google.jsp +++ /dev/null @@ -1,84 +0,0 @@ -<%@page contentType="text/html"%> - -<%@page import="org.objectweb.wssample.beans.wsclient.*"%> -<%@page import="org.objectweb.wssample.genbean.google.*"%> - -<%@page import="javax.naming.*"%> - - - Using Google WebServices - - - - - -
    - Jakarta Tomcat - Mortbay Jetty - JOnAS WebSite -
    -<% - if (request.getParameter("search") == null) { -%> -
    - Google Search -
    - - -<% - } else { -%> -
    - Results -
    - -<% - } -%> - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/style/ow_jonas.css b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/style/ow_jonas.css deleted file mode 100644 index c3f068d9a5aa850d59a4f126168fab80b34a023b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/web/style/ow_jonas.css +++ /dev/null @@ -1,119 +0,0 @@ -/* - Context Root css. based on css from http://jonas.objectweb.org - XHTML by Florent BENOIT -*/ - -.bodywelcome -{ - background-color: #FFFFFF; - color: #000000; - background-image: url(../images/ow_logo.png); - background-repeat: no-repeat; - margin: 0; -} - - -img { - margin: 5px; - border:0; -} - -body -{ - background-color: #FFFFFF; - margin: 10px; - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; - -} - -div.logos { - top: 5px; - width: 99%; - text-align: right; -} - - -div.links { - margin-top : 40px; - margin-left : 200px; -} - - -div.titlepage { - margin-left: 200px; - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 22px; - line-height: 27px; - font-weight: bold; - border-color: #99C; - border-width: 0 0 4px 0; - border-style: none none solid none; -} - - -div.footer { - margin-top : 50px; - color: #FFFFFF; - font-size: 8pt; - text-align: center; -} - - -/*HTML elements */ - - - -ul, ol, dl -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; -} - -li -{ - color: black; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight: normal; - margin: 10px 0px 5px 0px; - -} -a -{ - color: #3F3975; - background-color: transparent; - text-decoration: underline; -} - -a:visited -{ - color: #9898CB; - background-color: transparent; - text-decoration: underline; -} - -a:hover -{ - color: #E06611; - background-color: transparent; - text-decoration: underline; -} - - -a:active -{ - color: #FFFFFF; - background-color: #E06611; - text-decoration: underline; -} - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/application-wsclient.xml b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/application-wsclient.xml deleted file mode 100644 index 90057b129e249e08513b6d2299a99062b57176b8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/application-wsclient.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - ear example secusb/servlet - earsample secusb/servlet - - - wsclient.jar - - - - - wsclient-front.war - wsclient - - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/ejb-jar.xml b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/ejb-jar.xml deleted file mode 100644 index f5f7045b38621bf8d3f11624d6a433def88927a0..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/ejb-jar.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - Describe here the content of this file - wsearsample - - - Describe here the session bean GoogleClientBean - googleClient/GoogleClientBeanSLL - GoogleClientBeanSLR - org.objectweb.wssample.beans.wsclient.GoogleClientBeanHome - org.objectweb.wssample.beans.wsclient.GoogleClientBean - - org.objectweb.wssample.beans.wsclient.GoogleClientBeanSLR - Stateless - Container - - googleKey - java.lang.String - j1LnsP9QFHLsT76x8dXU5HYjG1wxlgU3 - - - service/google - - org.objectweb.wssample.genbean.google.GoogleSearchService - META-INF/wsdl/GoogleSearch.wsdl - META-INF/googleMapping.xml - - google:GoogleSearchService - - - - - - - - GoogleClientBeanSLR - * - - Supports - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/googleMapping.xml b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/googleMapping.xml deleted file mode 100644 index 8d075e6d81b3c8b9c93898eeffa489df37e7269d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/googleMapping.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - org.objectweb.wssample.genbean.google - urn:GoogleSearch - - - org.objectweb.wssample.genbean.google.GoogleSearchResult - ns:GoogleSearchResult - complexType - - - org.objectweb.wssample.genbean.google.ResultElement - ns:ResultElement - complexType - - - org.objectweb.wssample.genbean.google.ResultElement[] - ns:ResultElementArray - complexType - - - org.objectweb.wssample.genbean.google.DirectoryCategory[] - ns:DirectoryCategoryArray - complexType - - - org.objectweb.wssample.genbean.google.DirectoryCategory - ns:DirectoryCategory - complexType - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/jonas-ejb-jar.xml b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/jonas-ejb-jar.xml deleted file mode 100644 index bdc3f59bb8f30ee8caace739ddcaebd481b47875..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/jonas-ejb-jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - GoogleClientBeanSLR - ejbs/GoogleClientBeanHome - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/web-wsclient-front.xml b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/web-wsclient-front.xml deleted file mode 100644 index 91226811bbc7ed9b1e38d1cf298955626680669b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/web-wsclient-front.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - ejb/GoogleClient - Session - org.objectweb.wssample.beans.wsclient.GoogleClientBeanHome - org.objectweb.wssample.beans.wsclient.GoogleClientBean - wsclient.jar#GoogleClientBeanSLR - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/wsdl/GoogleSearch.wsdl b/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/wsdl/GoogleSearch.wsdl deleted file mode 100644 index 746ad2298cb28e33f2b59b3aa564a70c042617b7..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/etc/xml/wsdl/GoogleSearch.wsdl +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBean.java b/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBean.java deleted file mode 100644 index 69147d766ff3d305d9d3472d80b9826ce26e8a54..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBean.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Guillaume Sauthier______________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.wssample.beans.wsclient; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -import org.objectweb.wssample.genbean.google.GoogleSearchResult; - -/** - * GoogleClientBean local interface - */ -public interface GoogleClientBean extends EJBObject { - /** - * Execute a Query via Google WS api. - * - * @param query Query String - * @return Result of the Search - * - * @throws RemoteException When query went wrong - */ - GoogleSearchResult executeQuery(java.lang.String query) throws RemoteException; -} diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanHome.java b/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanHome.java deleted file mode 100644 index beb77bc543d5d81d782967dd9bfb761c58100e21..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanHome.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Guillaume Sauthier______________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.wssample.beans.wsclient; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * Local Home interface for the bean GoogleClientBean - */ -public interface GoogleClientBeanHome extends EJBHome { - - /** - * Create a new GoogleCLientBean local instance. - * - * @return a new GoogleCLientBean local instance. - * @throws CreateException When server cannot create the instance. - * @throws RemoteException When creation went wrong - */ - GoogleClientBean create() throws CreateException, RemoteException; -} diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanSLR.java b/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanSLR.java deleted file mode 100644 index af36799001fc5b8ef803cfdd3f8c69f7ff4ffb6e..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/beans/wsclient/GoogleClientBeanSLR.java +++ /dev/null @@ -1,162 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer(s): Guillaume Sauthier______________. - * Contributor(s): ______________________________________. - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.wssample.beans.wsclient; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -import org.objectweb.wssample.genbean.google.GoogleSearchResult; -import org.objectweb.wssample.genbean.google.GoogleSearchService; -import org.objectweb.wssample.genbean.google.GoogleSearchPort; - -import javax.xml.rpc.ServiceException; - -/** - * GoogleClientBean implementation. This bean use Google WebServices API - * to execute a given Query. - * - * @author Guillaume Sauthier - */ -public class GoogleClientBeanSLR implements SessionBean { - - /** - * logger - */ - private static Logger logger = null; - - /** - * Session Context - */ - private SessionContext ejbContext; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - /** - * Set the SessionContext - * @param ctx the SessionContext - */ - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - /** - * ejbRemove - */ - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * ejbCreate - * @throws CreateException CreateException - */ - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * ejbPassivate - */ - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * ejbActivate - */ - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // GoogleClientBean implementation - // ------------------------------------------------------------------ - - /** - * Execute a Query via Google WS api. - * - * @param query Query String - * @return query results - */ - public GoogleSearchResult executeQuery(java.lang.String query) { - - logger.log(BasicLevel.INFO, "Executing Google Query '" + query + "'"); - - try { - - // Get the InitialContext where retrieve Service - Context ctx = new InitialContext(); - - // Lookup the service - GoogleSearchService google = - (GoogleSearchService) ctx.lookup("java:comp/env/service/google"); - - // get Google Port - GoogleSearchPort search = google.getGoogleSearchPort(); - - // get Google Key - String key = (String) ctx.lookup("java:comp/env/googleKey"); - - // Execute the query - return search.doGoogleSearch(key, - query, - 0, // first index - 10, // maxresult - false, //filter - null, //restrict - false, // safesearch - null, //lr - null, //ie - null //oe - ); - } catch (NamingException ne) { - return null; - } catch (RemoteException re) { - return null; - } catch (ServiceException se) { - return null; - } - } -} - diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/DirectoryCategory.java b/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/DirectoryCategory.java deleted file mode 100644 index 4509e3edfb84cd820b1db3feeb2c270363097a10..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/DirectoryCategory.java +++ /dev/null @@ -1,152 +0,0 @@ -/** - * DirectoryCategory.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2RC1 Sep 29, 2004 (08:29:40 EDT) WSDL2Java emitter. - */ - -package org.objectweb.wssample.genbean.google; - -public class DirectoryCategory implements java.io.Serializable { - private java.lang.String fullViewableName; - private java.lang.String specialEncoding; - - public DirectoryCategory() { - } - - public DirectoryCategory( - java.lang.String fullViewableName, - java.lang.String specialEncoding) { - this.fullViewableName = fullViewableName; - this.specialEncoding = specialEncoding; - } - - - /** - * Gets the fullViewableName value for this DirectoryCategory. - * - * @return fullViewableName - */ - public java.lang.String getFullViewableName() { - return fullViewableName; - } - - - /** - * Sets the fullViewableName value for this DirectoryCategory. - * - * @param fullViewableName - */ - public void setFullViewableName(java.lang.String fullViewableName) { - this.fullViewableName = fullViewableName; - } - - - /** - * Gets the specialEncoding value for this DirectoryCategory. - * - * @return specialEncoding - */ - public java.lang.String getSpecialEncoding() { - return specialEncoding; - } - - - /** - * Sets the specialEncoding value for this DirectoryCategory. - * - * @param specialEncoding - */ - public void setSpecialEncoding(java.lang.String specialEncoding) { - this.specialEncoding = specialEncoding; - } - - private java.lang.Object __equalsCalc = null; - public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof DirectoryCategory)) return false; - DirectoryCategory other = (DirectoryCategory) obj; - if (obj == null) return false; - if (this == obj) return true; - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.fullViewableName==null && other.getFullViewableName()==null) || - (this.fullViewableName!=null && - this.fullViewableName.equals(other.getFullViewableName()))) && - ((this.specialEncoding==null && other.getSpecialEncoding()==null) || - (this.specialEncoding!=null && - this.specialEncoding.equals(other.getSpecialEncoding()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getFullViewableName() != null) { - _hashCode += getFullViewableName().hashCode(); - } - if (getSpecialEncoding() != null) { - _hashCode += getSpecialEncoding().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(DirectoryCategory.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("urn:GoogleSearch", "DirectoryCategory")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("fullViewableName"); - elemField.setXmlName(new javax.xml.namespace.QName("", "fullViewableName")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("specialEncoding"); - elemField.setXmlName(new javax.xml.namespace.QName("", "specialEncoding")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchPort.java b/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchPort.java deleted file mode 100644 index 669b9e07ab97c4fc64f043894a284cdea8bc69e6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchPort.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * GoogleSearchPort.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2RC1 Sep 29, 2004 (08:29:40 EDT) WSDL2Java emitter. - */ - -package org.objectweb.wssample.genbean.google; - -public interface GoogleSearchPort extends java.rmi.Remote { - public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws java.rmi.RemoteException; - public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws java.rmi.RemoteException; - public org.objectweb.wssample.genbean.google.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws java.rmi.RemoteException; -} diff --git a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchResult.java b/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchResult.java deleted file mode 100644 index b6f843845f6e1019db3fa21482a0eed867b55e51..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/beans/wsclient/src/org/objectweb/wssample/genbean/google/GoogleSearchResult.java +++ /dev/null @@ -1,450 +0,0 @@ -/** - * GoogleSearchResult.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2RC1 Sep 29, 2004 (08:29:40 EDT) WSDL2Java emitter. - */ - -package org.objectweb.wssample.genbean.google; - -public class GoogleSearchResult implements java.io.Serializable { - private boolean documentFiltering; - private java.lang.String searchComments; - private int estimatedTotalResultsCount; - private boolean estimateIsExact; - private org.objectweb.wssample.genbean.google.ResultElement[] resultElements; - private java.lang.String searchQuery; - private int startIndex; - private int endIndex; - private java.lang.String searchTips; - private org.objectweb.wssample.genbean.google.DirectoryCategory[] directoryCategories; - private double searchTime; - - public GoogleSearchResult() { - } - - public GoogleSearchResult( - boolean documentFiltering, - java.lang.String searchComments, - int estimatedTotalResultsCount, - boolean estimateIsExact, - org.objectweb.wssample.genbean.google.ResultElement[] resultElements, - java.lang.String searchQuery, - int startIndex, - int endIndex, - java.lang.String searchTips, - org.objectweb.wssample.genbean.google.DirectoryCategory[] directoryCategories, - double searchTime) { - this.documentFiltering = documentFiltering; - this.searchComments = searchComments; - this.estimatedTotalResultsCount = estimatedTotalResultsCount; - this.estimateIsExact = estimateIsExact; - this.resultElements = resultElements; - this.searchQuery = searchQuery; - this.startIndex = startIndex; - this.endIndex = endIndex; - this.searchTips = searchTips; - this.directoryCategories = directoryCategories; - this.searchTime = searchTime; - } - - - /** - * Gets the documentFiltering value for this GoogleSearchResult. - * - * @return documentFiltering - */ - public boolean isDocumentFiltering() { - return documentFiltering; - } - - - /** - * Sets the documentFiltering value for this GoogleSearchResult. - * - * @param documentFiltering - */ - public void setDocumentFiltering(boolean documentFiltering) { - this.documentFiltering = documentFiltering; - } - - - /** - * Gets the searchComments value for this GoogleSearchResult. - * - * @return searchComments - */ - public java.lang.String getSearchComments() { - return searchComments; - } - - - /** - * Sets the searchComments value for this GoogleSearchResult. - * - * @param searchComments - */ - public void setSearchComments(java.lang.String searchComments) { - this.searchComments = searchComments; - } - - - /** - * Gets the estimatedTotalResultsCount value for this GoogleSearchResult. - * - * @return estimatedTotalResultsCount - */ - public int getEstimatedTotalResultsCount() { - return estimatedTotalResultsCount; - } - - - /** - * Sets the estimatedTotalResultsCount value for this GoogleSearchResult. - * - * @param estimatedTotalResultsCount - */ - public void setEstimatedTotalResultsCount(int estimatedTotalResultsCount) { - this.estimatedTotalResultsCount = estimatedTotalResultsCount; - } - - - /** - * Gets the estimateIsExact value for this GoogleSearchResult. - * - * @return estimateIsExact - */ - public boolean isEstimateIsExact() { - return estimateIsExact; - } - - - /** - * Sets the estimateIsExact value for this GoogleSearchResult. - * - * @param estimateIsExact - */ - public void setEstimateIsExact(boolean estimateIsExact) { - this.estimateIsExact = estimateIsExact; - } - - - /** - * Gets the resultElements value for this GoogleSearchResult. - * - * @return resultElements - */ - public org.objectweb.wssample.genbean.google.ResultElement[] getResultElements() { - return resultElements; - } - - - /** - * Sets the resultElements value for this GoogleSearchResult. - * - * @param resultElements - */ - public void setResultElements(org.objectweb.wssample.genbean.google.ResultElement[] resultElements) { - this.resultElements = resultElements; - } - - - /** - * Gets the searchQuery value for this GoogleSearchResult. - * - * @return searchQuery - */ - public java.lang.String getSearchQuery() { - return searchQuery; - } - - - /** - * Sets the searchQuery value for this GoogleSearchResult. - * - * @param searchQuery - */ - public void setSearchQuery(java.lang.String searchQuery) { - this.searchQuery = searchQuery; - } - - - /** - * Gets the startIndex value for this GoogleSearchResult. - * - * @return startIndex - */ - public int getStartIndex() { - return startIndex; - } - - - /** - * Sets the startIndex value for this GoogleSearchResult. - * - * @param startIndex - */ - public void setStartIndex(int startIndex) { - this.startIndex = startIndex; - } - - - /** - * Gets the endIndex value for this GoogleSearchResult. - * - * @return endIndex - */ - public int getEndIndex() { - return endIndex; - } - - - /** - * Sets the endIndex value for this GoogleSearchResult. - * - * @param endIndex - */ - public void setEndIndex(int endIndex) { - this.endIndex = endIndex; - } - - - /** - * Gets the searchTips value for this GoogleSearchResult. - * - * @return searchTips - */ - public java.lang.String getSearchTips() { - return searchTips; - } - - - /** - * Sets the searchTips value for this GoogleSearchResult. - * - * @param searchTips - */ - public void setSearchTips(java.lang.String searchTips) { - this.searchTips = searchTips; - } - - - /** - * Gets the directoryCategories value for this GoogleSearchResult. - * - * @return directoryCategories - */ - public org.objectweb.wssample.genbean.google.DirectoryCategory[] getDirectoryCategories() { - return directoryCategories; - } - - - /** - * Sets the directoryCategories value for this GoogleSearchResult. - * - * @param directoryCategories - */ - public void setDirectoryCategories(org.objectweb.wssample.genbean.google.DirectoryCategory[] directoryCategories) { - this.directoryCategories = directoryCategories; - } - - - /** - * Gets the searchTime value for this GoogleSearchResult. - * - * @return searchTime - */ - public double getSearchTime() { - return searchTime; - } - - - /** - * Sets the searchTime value for this GoogleSearchResult. - * - * @param searchTime - */ - public void setSearchTime(double searchTime) { - this.searchTime = searchTime; - } - - private java.lang.Object __equalsCalc = null; - public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof GoogleSearchResult)) return false; - GoogleSearchResult other = (GoogleSearchResult) obj; - if (obj == null) return false; - if (this == obj) return true; - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - this.documentFiltering == other.isDocumentFiltering() && - ((this.searchComments==null && other.getSearchComments()==null) || - (this.searchComments!=null && - this.searchComments.equals(other.getSearchComments()))) && - this.estimatedTotalResultsCount == other.getEstimatedTotalResultsCount() && - this.estimateIsExact == other.isEstimateIsExact() && - ((this.resultElements==null && other.getResultElements()==null) || - (this.resultElements!=null && - java.util.Arrays.equals(this.resultElements, other.getResultElements()))) && - ((this.searchQuery==null && other.getSearchQuery()==null) || - (this.searchQuery!=null && - this.searchQuery.equals(other.getSearchQuery()))) && - this.startIndex == other.getStartIndex() && - this.endIndex == other.getEndIndex() && - ((this.searchTips==null && other.getSearchTips()==null) || - (this.searchTips!=null && - this.searchTips.equals(other.getSearchTips()))) && - ((this.directoryCategories==null && other.getDirectoryCategories()==null) || - (this.directoryCategories!=null && - java.util.Arrays.equals(this.directoryCategories, other.getDirectoryCategories()))) && - this.searchTime == other.getSearchTime(); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - _hashCode += (isDocumentFiltering() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - if (getSearchComments() != null) { - _hashCode += getSearchComments().hashCode(); - } - _hashCode += getEstimatedTotalResultsCount(); - _hashCode += (isEstimateIsExact() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - if (getResultElements() != null) { - for (int i=0; - i - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/etc/xml/application.xml b/jonas_tests/examples/base/examples/webservices/etc/xml/application.xml deleted file mode 100644 index 37339099c28baf624e5f029ffc2dd51740c2e437..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/etc/xml/application.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - WebServices Sample application - WebServices Sample application - - - ws.jar - - - - - wsEarSample.war - wsEarSample - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/build.xml b/jonas_tests/examples/base/examples/webservices/webs/webclient/build.xml deleted file mode 100644 index 71920cb415bf8c99aa3f15edc4dc2318f4fb92a4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/build.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/googleByJSP.jsp b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/googleByJSP.jsp deleted file mode 100644 index 0909c82a8cd5005bf40324d43d4d56f40e16e471..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/googleByJSP.jsp +++ /dev/null @@ -1,90 +0,0 @@ -<%@page contentType="text/html"%> - -<%@page import="org.objectweb.wssample.gen.google.*"%> -<%@page import="javax.naming.*"%> - - - Using Google WebServices - - - -
    - - Jakarta Tomcat - - Mortbay Jetty - JOnAS WebSite -
    - - -<% - if (request.getParameter("search") == null) { -%> -
    Google WebServices Access via JSP
    - - - -<% - } else { -%> -
    Results
    - -<% - } -%> - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/googleByServlet.html b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/googleByServlet.html deleted file mode 100644 index 49eb724189f900f98e7c3c33cc42ab73ce23099d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/googleByServlet.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - Google WebServices Access via Servlet - - - - -
    - - Jakarta Tomcat - - Mortbay Jetty - JOnAS WebSite -
    - -
    Google WebServices Access via Servlet
    - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/jetty.gif b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/jetty.gif deleted file mode 100644 index 01f44a87f6801b200f142513d0d02b12cea0fb46..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/jetty.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/jonas.ico b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/jonas.ico deleted file mode 100644 index 108c5c21ede334f3b80d9a373f618c52efee7877..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/jonas.ico and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/ow_jonas_logo.gif b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/ow_jonas_logo.gif deleted file mode 100644 index 1b56943a721f82a8cb81776030567772265433f2..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/ow_jonas_logo.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/ow_logo.png b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/ow_logo.png deleted file mode 100644 index 60617270bf0c0d21c9f40e4f7c85ef5bfdbda548..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/ow_logo.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/tomcat.gif b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/tomcat.gif deleted file mode 100644 index 61756736b82350f64b5ea1b2bfc31ac57e30a3d3..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/images/tomcat.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/index.html b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/index.html deleted file mode 100644 index 8f962e2717eedde30646f9f50eb064d7af248a14..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - WebServices Client from a WebApp - - - - -
    - - Jakarta Tomcat - - Mortbay Jetty - JOnAS WebSite -
    - -
    WebServices Client from a WebApp
    - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/style/ow_jonas.css b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/style/ow_jonas.css deleted file mode 100644 index c3f068d9a5aa850d59a4f126168fab80b34a023b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/resources/style/ow_jonas.css +++ /dev/null @@ -1,119 +0,0 @@ -/* - Context Root css. based on css from http://jonas.objectweb.org - XHTML by Florent BENOIT -*/ - -.bodywelcome -{ - background-color: #FFFFFF; - color: #000000; - background-image: url(../images/ow_logo.png); - background-repeat: no-repeat; - margin: 0; -} - - -img { - margin: 5px; - border:0; -} - -body -{ - background-color: #FFFFFF; - margin: 10px; - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; - -} - -div.logos { - top: 5px; - width: 99%; - text-align: right; -} - - -div.links { - margin-top : 40px; - margin-left : 200px; -} - - -div.titlepage { - margin-left: 200px; - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 22px; - line-height: 27px; - font-weight: bold; - border-color: #99C; - border-width: 0 0 4px 0; - border-style: none none solid none; -} - - -div.footer { - margin-top : 50px; - color: #FFFFFF; - font-size: 8pt; - text-align: center; -} - - -/*HTML elements */ - - - -ul, ol, dl -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; -} - -li -{ - color: black; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight: normal; - margin: 10px 0px 5px 0px; - -} -a -{ - color: #3F3975; - background-color: transparent; - text-decoration: underline; -} - -a:visited -{ - color: #9898CB; - background-color: transparent; - text-decoration: underline; -} - -a:hover -{ - color: #E06611; - background-color: transparent; - text-decoration: underline; -} - - -a:active -{ - color: #FFFFFF; - background-color: #E06611; - text-decoration: underline; -} - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/googleMapping.xml b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/googleMapping.xml deleted file mode 100644 index 2cba3939eef1498ad57ce6d51a4601cc8d404871..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/googleMapping.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - org.objectweb.wssample.gen.google - urn:GoogleSearch - - - org.objectweb.wssample.gen.google.GoogleSearchResult - ns:GoogleSearchResult - complexType - - - org.objectweb.wssample.gen.google.ResultElement - ns:ResultElement - complexType - - - org.objectweb.wssample.gen.google.ResultElement[] - ns:ResultElementArray - complexType - - - org.objectweb.wssample.gen.google.DirectoryCategory[] - ns:DirectoryCategoryArray - complexType - - - org.objectweb.wssample.gen.google.DirectoryCategory - ns:DirectoryCategory - complexType - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/jonas-web.xml b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/jonas-web.xml deleted file mode 100644 index c6d0fef833253c5f1839a334f1d760fbcbf9e48b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/jonas-web.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - service/google - - - org.objectweb.wssample.gen.google.GoogleSearchPort - ns:GoogleSearchPort - - javax.xml.rpc.session.maintain - true - - - javax.xml.rpc.session.maintain - true - - - - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/web.xml b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/web.xml deleted file mode 100644 index 5ea6ffa00aa200e4dac56959cb38d377ed06794c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/web.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - WebApplication using Distant WebServices - - - GoogleClientServlet - org.objectweb.wssample.servlets.wsclient.WsClientServlet - - - - GoogleClientServlet - /googleByServlet.action - - - - index.html - index.jsp - - - - service/google - org.objectweb.wssample.gen.google.GoogleSearchService - WEB-INF/wsdl/GoogleSearch.wsdl - WEB-INF/googleMapping.xml - google:GoogleSearchService - - org.objectweb.wssample.gen.google.GoogleSearchPort - - - - - key - java.lang.String - j1LnsP9QFHLsT76x8dXU5HYjG1wxlgU3 - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/wsdl/GoogleSearch.wsdl b/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/wsdl/GoogleSearch.wsdl deleted file mode 100644 index c99d55a69da86c083ecd861f5c2b66ea75525b71..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/etc/xml/wsdl/GoogleSearch.wsdl +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/DirectoryCategory.java b/jonas_tests/examples/base/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/DirectoryCategory.java deleted file mode 100644 index 6f877268641f50711d2161dde76b60a4974b9dbd..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/DirectoryCategory.java +++ /dev/null @@ -1,152 +0,0 @@ -/** - * DirectoryCategory.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2RC2 Dec 15, 2004 (10:53:17 CET) WSDL2Java emitter. - */ - -package org.objectweb.wssample.gen.google; - -public class DirectoryCategory implements java.io.Serializable { - private java.lang.String fullViewableName; - private java.lang.String specialEncoding; - - public DirectoryCategory() { - } - - public DirectoryCategory( - java.lang.String fullViewableName, - java.lang.String specialEncoding) { - this.fullViewableName = fullViewableName; - this.specialEncoding = specialEncoding; - } - - - /** - * Gets the fullViewableName value for this DirectoryCategory. - * - * @return fullViewableName - */ - public java.lang.String getFullViewableName() { - return fullViewableName; - } - - - /** - * Sets the fullViewableName value for this DirectoryCategory. - * - * @param fullViewableName - */ - public void setFullViewableName(java.lang.String fullViewableName) { - this.fullViewableName = fullViewableName; - } - - - /** - * Gets the specialEncoding value for this DirectoryCategory. - * - * @return specialEncoding - */ - public java.lang.String getSpecialEncoding() { - return specialEncoding; - } - - - /** - * Sets the specialEncoding value for this DirectoryCategory. - * - * @param specialEncoding - */ - public void setSpecialEncoding(java.lang.String specialEncoding) { - this.specialEncoding = specialEncoding; - } - - private java.lang.Object __equalsCalc = null; - public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof DirectoryCategory)) return false; - DirectoryCategory other = (DirectoryCategory) obj; - if (obj == null) return false; - if (this == obj) return true; - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - ((this.fullViewableName==null && other.getFullViewableName()==null) || - (this.fullViewableName!=null && - this.fullViewableName.equals(other.getFullViewableName()))) && - ((this.specialEncoding==null && other.getSpecialEncoding()==null) || - (this.specialEncoding!=null && - this.specialEncoding.equals(other.getSpecialEncoding()))); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - if (getFullViewableName() != null) { - _hashCode += getFullViewableName().hashCode(); - } - if (getSpecialEncoding() != null) { - _hashCode += getSpecialEncoding().hashCode(); - } - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(DirectoryCategory.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("urn:GoogleSearch", "DirectoryCategory")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("fullViewableName"); - elemField.setXmlName(new javax.xml.namespace.QName("", "fullViewableName")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("specialEncoding"); - elemField.setXmlName(new javax.xml.namespace.QName("", "specialEncoding")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string")); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchPort.java b/jonas_tests/examples/base/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchPort.java deleted file mode 100644 index 44c06c879c721d32f560531ec5293beefeae2bb6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchPort.java +++ /dev/null @@ -1,14 +0,0 @@ -/** - * GoogleSearchPort.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2RC2 Dec 15, 2004 (10:53:17 CET) WSDL2Java emitter. - */ - -package org.objectweb.wssample.gen.google; - -public interface GoogleSearchPort extends java.rmi.Remote { - public byte[] doGetCachedPage(java.lang.String key, java.lang.String url) throws java.rmi.RemoteException; - public java.lang.String doSpellingSuggestion(java.lang.String key, java.lang.String phrase) throws java.rmi.RemoteException; - public org.objectweb.wssample.gen.google.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) throws java.rmi.RemoteException; -} diff --git a/jonas_tests/examples/base/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchResult.java b/jonas_tests/examples/base/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchResult.java deleted file mode 100644 index 92d54ba1009f59add9b52ad54bc41ebd4d18a64b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webclient/src/org/objectweb/wssample/gen/google/GoogleSearchResult.java +++ /dev/null @@ -1,450 +0,0 @@ -/** - * GoogleSearchResult.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2RC2 Dec 15, 2004 (10:53:17 CET) WSDL2Java emitter. - */ - -package org.objectweb.wssample.gen.google; - -public class GoogleSearchResult implements java.io.Serializable { - private boolean documentFiltering; - private java.lang.String searchComments; - private int estimatedTotalResultsCount; - private boolean estimateIsExact; - private org.objectweb.wssample.gen.google.ResultElement[] resultElements; - private java.lang.String searchQuery; - private int startIndex; - private int endIndex; - private java.lang.String searchTips; - private org.objectweb.wssample.gen.google.DirectoryCategory[] directoryCategories; - private double searchTime; - - public GoogleSearchResult() { - } - - public GoogleSearchResult( - boolean documentFiltering, - java.lang.String searchComments, - int estimatedTotalResultsCount, - boolean estimateIsExact, - org.objectweb.wssample.gen.google.ResultElement[] resultElements, - java.lang.String searchQuery, - int startIndex, - int endIndex, - java.lang.String searchTips, - org.objectweb.wssample.gen.google.DirectoryCategory[] directoryCategories, - double searchTime) { - this.documentFiltering = documentFiltering; - this.searchComments = searchComments; - this.estimatedTotalResultsCount = estimatedTotalResultsCount; - this.estimateIsExact = estimateIsExact; - this.resultElements = resultElements; - this.searchQuery = searchQuery; - this.startIndex = startIndex; - this.endIndex = endIndex; - this.searchTips = searchTips; - this.directoryCategories = directoryCategories; - this.searchTime = searchTime; - } - - - /** - * Gets the documentFiltering value for this GoogleSearchResult. - * - * @return documentFiltering - */ - public boolean isDocumentFiltering() { - return documentFiltering; - } - - - /** - * Sets the documentFiltering value for this GoogleSearchResult. - * - * @param documentFiltering - */ - public void setDocumentFiltering(boolean documentFiltering) { - this.documentFiltering = documentFiltering; - } - - - /** - * Gets the searchComments value for this GoogleSearchResult. - * - * @return searchComments - */ - public java.lang.String getSearchComments() { - return searchComments; - } - - - /** - * Sets the searchComments value for this GoogleSearchResult. - * - * @param searchComments - */ - public void setSearchComments(java.lang.String searchComments) { - this.searchComments = searchComments; - } - - - /** - * Gets the estimatedTotalResultsCount value for this GoogleSearchResult. - * - * @return estimatedTotalResultsCount - */ - public int getEstimatedTotalResultsCount() { - return estimatedTotalResultsCount; - } - - - /** - * Sets the estimatedTotalResultsCount value for this GoogleSearchResult. - * - * @param estimatedTotalResultsCount - */ - public void setEstimatedTotalResultsCount(int estimatedTotalResultsCount) { - this.estimatedTotalResultsCount = estimatedTotalResultsCount; - } - - - /** - * Gets the estimateIsExact value for this GoogleSearchResult. - * - * @return estimateIsExact - */ - public boolean isEstimateIsExact() { - return estimateIsExact; - } - - - /** - * Sets the estimateIsExact value for this GoogleSearchResult. - * - * @param estimateIsExact - */ - public void setEstimateIsExact(boolean estimateIsExact) { - this.estimateIsExact = estimateIsExact; - } - - - /** - * Gets the resultElements value for this GoogleSearchResult. - * - * @return resultElements - */ - public org.objectweb.wssample.gen.google.ResultElement[] getResultElements() { - return resultElements; - } - - - /** - * Sets the resultElements value for this GoogleSearchResult. - * - * @param resultElements - */ - public void setResultElements(org.objectweb.wssample.gen.google.ResultElement[] resultElements) { - this.resultElements = resultElements; - } - - - /** - * Gets the searchQuery value for this GoogleSearchResult. - * - * @return searchQuery - */ - public java.lang.String getSearchQuery() { - return searchQuery; - } - - - /** - * Sets the searchQuery value for this GoogleSearchResult. - * - * @param searchQuery - */ - public void setSearchQuery(java.lang.String searchQuery) { - this.searchQuery = searchQuery; - } - - - /** - * Gets the startIndex value for this GoogleSearchResult. - * - * @return startIndex - */ - public int getStartIndex() { - return startIndex; - } - - - /** - * Sets the startIndex value for this GoogleSearchResult. - * - * @param startIndex - */ - public void setStartIndex(int startIndex) { - this.startIndex = startIndex; - } - - - /** - * Gets the endIndex value for this GoogleSearchResult. - * - * @return endIndex - */ - public int getEndIndex() { - return endIndex; - } - - - /** - * Sets the endIndex value for this GoogleSearchResult. - * - * @param endIndex - */ - public void setEndIndex(int endIndex) { - this.endIndex = endIndex; - } - - - /** - * Gets the searchTips value for this GoogleSearchResult. - * - * @return searchTips - */ - public java.lang.String getSearchTips() { - return searchTips; - } - - - /** - * Sets the searchTips value for this GoogleSearchResult. - * - * @param searchTips - */ - public void setSearchTips(java.lang.String searchTips) { - this.searchTips = searchTips; - } - - - /** - * Gets the directoryCategories value for this GoogleSearchResult. - * - * @return directoryCategories - */ - public org.objectweb.wssample.gen.google.DirectoryCategory[] getDirectoryCategories() { - return directoryCategories; - } - - - /** - * Sets the directoryCategories value for this GoogleSearchResult. - * - * @param directoryCategories - */ - public void setDirectoryCategories(org.objectweb.wssample.gen.google.DirectoryCategory[] directoryCategories) { - this.directoryCategories = directoryCategories; - } - - - /** - * Gets the searchTime value for this GoogleSearchResult. - * - * @return searchTime - */ - public double getSearchTime() { - return searchTime; - } - - - /** - * Sets the searchTime value for this GoogleSearchResult. - * - * @param searchTime - */ - public void setSearchTime(double searchTime) { - this.searchTime = searchTime; - } - - private java.lang.Object __equalsCalc = null; - public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof GoogleSearchResult)) return false; - GoogleSearchResult other = (GoogleSearchResult) obj; - if (obj == null) return false; - if (this == obj) return true; - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - this.documentFiltering == other.isDocumentFiltering() && - ((this.searchComments==null && other.getSearchComments()==null) || - (this.searchComments!=null && - this.searchComments.equals(other.getSearchComments()))) && - this.estimatedTotalResultsCount == other.getEstimatedTotalResultsCount() && - this.estimateIsExact == other.isEstimateIsExact() && - ((this.resultElements==null && other.getResultElements()==null) || - (this.resultElements!=null && - java.util.Arrays.equals(this.resultElements, other.getResultElements()))) && - ((this.searchQuery==null && other.getSearchQuery()==null) || - (this.searchQuery!=null && - this.searchQuery.equals(other.getSearchQuery()))) && - this.startIndex == other.getStartIndex() && - this.endIndex == other.getEndIndex() && - ((this.searchTips==null && other.getSearchTips()==null) || - (this.searchTips!=null && - this.searchTips.equals(other.getSearchTips()))) && - ((this.directoryCategories==null && other.getDirectoryCategories()==null) || - (this.directoryCategories!=null && - java.util.Arrays.equals(this.directoryCategories, other.getDirectoryCategories()))) && - this.searchTime == other.getSearchTime(); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - _hashCode += (isDocumentFiltering() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - if (getSearchComments() != null) { - _hashCode += getSearchComments().hashCode(); - } - _hashCode += getEstimatedTotalResultsCount(); - _hashCode += (isEstimateIsExact() ? Boolean.TRUE : Boolean.FALSE).hashCode(); - if (getResultElements() != null) { - for (int i=0; - iGET and POST - * methods. - * - * @param request servlet request - * @param response servlet response - * - * @throws ServletException default servlet exception thrown - * @throws IOException default servlet exception thrown - */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, - IOException { - - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - // output your page here - out.println(""); - out.println(""); - out.println("Google WebService Response"); - out.println(""); - out.println(""); - out.println(""); - - out.println("
    "); - out.println("\"Jakarta"); - out.println("\"Mortbay"); - out.println("\"JOnAS"); - out.println("
    "); - - // Get and Display results - try { - // Get the Context - Context ctx = new InitialContext(); - - String key = (String) ctx.lookup("java:comp/env/key"); - - // Lookup the binded service - Object s = ctx.lookup("java:comp/env/service/google"); - GoogleSearchService google = (GoogleSearchService) s; - - // get the Port object - GoogleSearchPort search = google.getGoogleSearchPort(); - - // execute the query - GoogleSearchResult result = search.doGoogleSearch(key, request.getParameter("search"), 0, // first - // index - 10, // maxresult - false, //filter - null, //restrict - false, // safesearch - null, //lr - null, //ie - null //oe - ); - - out.println("
    Results
    "); - out.println("
    "); - - // Display the results - ResultElement[] elements = result.getResultElements(); - for (int i = 0; i < elements.length; i++) { - out.println("" + elements[i].getTitle() + "
    "); - out.println(elements[i].getSummary() + "

    "); - } - out.println("
    "); - - } catch (NamingException ne) { - out.println("
    Error when looking for service-ref
    "); - ne.printStackTrace(out); - } catch (ServiceException se) { - out.println("
    Error when performign service-ref
    "); - se.printStackTrace(out); - } - - out.println(""); - out.println(""); - out.close(); - } - - /** - * Handles the HTTP GET method. - * - * @param request servlet request - * @param response servlet response - * - * @throws ServletException default servlet exception thrown - * @throws IOException default servlet exception thrown - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Handles the HTTP POST method. - * - * @param request servlet request - * @param response servlet response - * - * @throws ServletException default servlet exception thrown - * @throws IOException default servlet exception thrown - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, - IOException { - processRequest(request, response); - } - - /** - * @return Returns a short description of the servlet. - */ - public String getServletInfo() { - return "Servlet which is client of the WebServices API of Google"; - } - -} diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/README b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/README deleted file mode 100644 index 91034c89bc722832df4a46e2e92a117dca232996..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/README +++ /dev/null @@ -1,40 +0,0 @@ -webendpoint sample README ----------------------------- - -This sample show you how to use secured endpoint : -* how to configure the endpoint for Authentication -* how to configure your endpoint for Encryption - -You can directly use the authentication endpoint, but -some preliminary steps are required for the Encryption, -as it use a keystore and because Encryption needs BouncyCastle -JCE provider that is not packaged inside JOnAS (please -read the following). - -IMPORTANT : ------------ -If you want to use advanced capabilities of WSS4J, in particular Encryption, ... -You have to download BouncyCastle JCE Provider. -You can download latest version here : -http://www.bouncycastle.org/latest_releases.html -Choose the bcprov-jdk**-XXX.jar according to the JDK version you're running JOnAS on. -Place that downloaded jar in JONAS_ROOT/lib/commons/jonas/ws-security. -BouncyCastle provider will be available for the next JOnAS reboot. - -Please take the time to read the following web page : -http://www.bouncycastle.org/specifications.html -Especially the patent statement. - -How to create a keystore ? ---------------------------- - -Here are the steps : -1. create the keystore with an single certificate : -$> $JAVA_HOME/bin/keytool -genkey -alias jonas-ws -keyalg RSA -keystore $JONAS_BASE/conf/my-wssample-keystore - -2. You will be prompted for the keystore password, type "security" (without the quote) -3. Enter the certificate information (Name, Company, ...) -4. Reuse the SAME password ("security") for the certificate (just press enter) - -This will create a keystore in JONAS_BASE/conf with 1 certificate for the user 'jonas-ws'. -This keystore is used by WSS4Jhandler. diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/build.xml b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/build.xml deleted file mode 100644 index 7057c6c29c438fc867beb037856c70914d1a134a..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/build.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/resources/credentials.properties b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/resources/credentials.properties deleted file mode 100644 index e438706e375c49fbc9c0a778d51f4fddbb8a1caa..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/resources/credentials.properties +++ /dev/null @@ -1,2 +0,0 @@ -# Couple user/password -jonas SHA:NaLG+uYfgHeqth+qQBlyKr8FCTw= \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/resources/sample-crypto.properties b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/resources/sample-crypto.properties deleted file mode 100644 index ce0c0908e93581965a84a94867956ad6b543e767..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/resources/sample-crypto.properties +++ /dev/null @@ -1,8 +0,0 @@ -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=pkcs12 -org.apache.ws.security.crypto.merlin.keystore.password=security -org.apache.ws.security.crypto.merlin.keystore.alias=jonas-ws -org.apache.ws.security.crypto.merlin.alias.password=security -# keystore filname -# Must be available from ClassLoader -org.apache.ws.security.crypto.merlin.file=my-wssample-keystore diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/jetty.gif b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/jetty.gif deleted file mode 100644 index 01f44a87f6801b200f142513d0d02b12cea0fb46..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/jetty.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/jonas.ico b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/jonas.ico deleted file mode 100644 index 108c5c21ede334f3b80d9a373f618c52efee7877..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/jonas.ico and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/ow_jonas_logo.gif b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/ow_jonas_logo.gif deleted file mode 100644 index 1b56943a721f82a8cb81776030567772265433f2..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/ow_jonas_logo.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/ow_logo.png b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/ow_logo.png deleted file mode 100644 index 60617270bf0c0d21c9f40e4f7c85ef5bfdbda548..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/ow_logo.png and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/tomcat.gif b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/tomcat.gif deleted file mode 100644 index 61756736b82350f64b5ea1b2bfc31ac57e30a3d3..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/images/tomcat.gif and /dev/null differ diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/index.html b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/index.html deleted file mode 100644 index d06b5fa26c45be93bebdbccc4159d8ea5bc8aff8..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - WebServices Endpoint Deployment in WebApp - - - - -
    - - Jakarta Tomcat - - Mortbay Jetty - JOnAS WebSite -
    - -
    WebServices Endpoint Deployment in WebApp
    - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/jaxrpcTest.jsp b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/jaxrpcTest.jsp deleted file mode 100644 index c816922d9f9db4974707a6040e30e7abeed47a31..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/jaxrpcTest.jsp +++ /dev/null @@ -1,49 +0,0 @@ -<%@page contentType="text/html"%> - - - - Prepare Local JaxRpc WebService Call - - - - -
    - - Jakarta Tomcat - - Mortbay Jetty - JOnAS WebSite -
    - -
    Prepare Local JaxRpc WebService Call
    - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/style/ow_jonas.css b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/style/ow_jonas.css deleted file mode 100644 index c3f068d9a5aa850d59a4f126168fab80b34a023b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/web/style/ow_jonas.css +++ /dev/null @@ -1,119 +0,0 @@ -/* - Context Root css. based on css from http://jonas.objectweb.org - XHTML by Florent BENOIT -*/ - -.bodywelcome -{ - background-color: #FFFFFF; - color: #000000; - background-image: url(../images/ow_logo.png); - background-repeat: no-repeat; - margin: 0; -} - - -img { - margin: 5px; - border:0; -} - -body -{ - background-color: #FFFFFF; - margin: 10px; - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; - -} - -div.logos { - top: 5px; - width: 99%; - text-align: right; -} - - -div.links { - margin-top : 40px; - margin-left : 200px; -} - - -div.titlepage { - margin-left: 200px; - color: #E06611; - font-family: Arial, Helvetica, sans-serif; - font-size: 22px; - line-height: 27px; - font-weight: bold; - border-color: #99C; - border-width: 0 0 4px 0; - border-style: none none solid none; -} - - -div.footer { - margin-top : 50px; - color: #FFFFFF; - font-size: 8pt; - text-align: center; -} - - -/*HTML elements */ - - - -ul, ol, dl -{ - color: black; - font-family: Arial,Helvetica, sans-serif; - font-size: 12px; - line-height: 16px; - font-weight: normal; -} - -li -{ - color: black; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; - font-weight: normal; - margin: 10px 0px 5px 0px; - -} -a -{ - color: #3F3975; - background-color: transparent; - text-decoration: underline; -} - -a:visited -{ - color: #9898CB; - background-color: transparent; - text-decoration: underline; -} - -a:hover -{ - color: #E06611; - background-color: transparent; - text-decoration: underline; -} - - -a:active -{ - color: #FFFFFF; - background-color: #E06611; - text-decoration: underline; -} - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/clientMapping.xml b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/clientMapping.xml deleted file mode 100644 index 6ad4979e7afb35887fb6a41d18ebf808fad75567..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/clientMapping.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - org.objectweb.wssample.gen.jaxrpc - http://ws.servlets.wssample.objectweb.org - - \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/jaxrpcEndpointMapping.xml b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/jaxrpcEndpointMapping.xml deleted file mode 100644 index 143af0b1db6a00978c2a24cacc955f55887d8ed5..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/jaxrpcEndpointMapping.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - org.objectweb.wssample.servlets.ws - http://ws.servlets.wssample.objectweb.org - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/jonas-webservices.xml b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/jonas-webservices.xml deleted file mode 100644 index c69b1dda8bbb99cdf3ac780238416cac5698fd4d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/jonas-webservices.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - MyWebService - - - jaxrpcEndpoint1 - /endpoints/jaxrpc - - - encryptedEndpoint - /endpoints/encrypted - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/web.xml b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/web.xml deleted file mode 100644 index fb7140f49ba138ad49f0362ec6a627df7c3517e9..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/web.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - WebServices packaged in WebApp Sample - - JaxRpcEndpoint1 Servlet - JaxRpcEndpoint1 - org.objectweb.wssample.servlets.ws.JaxRpcEndpoint - - - EncryptedJaxRpcEndpoint Servlet - EncryptedJaxRpcEndpoint - org.objectweb.wssample.servlets.ws.JaxRpcEndpoint - - - - JaxRpcEndpoint Test Servlet - JaxRpcEndpointTest - org.objectweb.wssample.servlets.wsclient.JOnASJaxRpcClientServlet - - - - JaxRpcEndpointTest - /jaxrpcTest.do - - - - service/jaxrpc - org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterfaceService - WEB-INF/wsdl/jaxrpcEndpoint.wsdl - WEB-INF/clientMapping.xml - - org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterface - wswarsample.war#jaxrpcEndpoint1 - - - - WSS4JHandler-UsernameToken - org.apache.ws.security.handler.WSS4JHandler - - - - - - - - action - UsernameToken - - - - - flow - request-only - - - - - - passwordCallbackClass - org.objectweb.wssample.security.ServerSideCallbackHandler - - - - - passwordType - PasswordDigest - - - - - - deployment - client - - - - - - JaxRpcEndpoint1 - - - - - service/crypted-jaxrpc - org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterfaceService - WEB-INF/wsdl/jaxrpcEndpoint.wsdl - WEB-INF/clientMapping.xml - - org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterface - wswarsample.war#encryptedEndpoint - - - - WSS4JHandler-Encryption - org.apache.ws.security.handler.WSS4JHandler - - - - - - - - - action - UsernameToken Encrypt - - - - - flow - request-only - - - - - - passwordCallbackClass - org.objectweb.wssample.security.ServerSideCallbackHandler - - - - - passwordType - PasswordDigest - - - - - - deployment - client - - - - - - mustUnderstand - true - - - - addUTElement - Nonce Created - - - - - - - encryptionPropFile - sample-crypto.properties - - - - encryptionKeyIdentifier - X509KeyIdentifier - - - - encryptionUser - jonas-ws - - - - encryptionParts - {Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken - - - - - - EncryptedJaxRpcEndpoint - - - - - - - Protected Area - - /jaxrpcTest.do - - DELETE - GET - POST - PUT - - - - ws-security - - - - - - BASIC - Example Basic Authentication Area - - - - - ws-security - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/webservices.xml b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/webservices.xml deleted file mode 100644 index c3bf0b44b46c159f78beb88f20047ed587702b98..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/webservices.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - MyWebServices - - MyWebService - WEB-INF/wsdl/jaxrpcEndpoint.wsdl - WEB-INF/jaxrpcEndpointMapping.xml - - jaxrpcEndpoint1 - servletswssample:JaxRpcEndpoint1 - org.objectweb.wssample.servlets.ws.JaxRpcEndpointInterface - - JaxRpcEndpoint1 - - - - WSS4JHandler - - org.apache.ws.security.handler.WSS4JHandler - - - - - - - action - UsernameToken - - - - flow - request-only - - - - - passwordCallbackClass - org.objectweb.wssample.security.ServerSideCallbackHandler - - - - deployment - server - - - - - - encryptedEndpoint - ws:EncryptedJaxRpcEndpoint - org.objectweb.wssample.servlets.ws.JaxRpcEndpointInterface - - EncryptedJaxRpcEndpoint - - - - WSS4JHandler - - org.apache.ws.security.handler.WSS4JHandler - - - - - - - action - UsernameToken Encrypt - - - - flow - request-only - - - - - passwordCallbackClass - org.objectweb.wssample.security.ServerSideCallbackHandler - - - - deployment - server - - - - - decryptionPropFile - sample-crypto.properties - - - - mustUnderstand - true - - - - encryptionUser - jonas-ws - - - - encryptionParts - {Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd}UsernameToken - - - - encryptionKeyIdentifier - DirectReference - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/wsdl/jaxrpcEndpoint.wsdl b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/wsdl/jaxrpcEndpoint.wsdl deleted file mode 100644 index 68966684a7fec54664c1ea7979b8b80881b01117..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/etc/xml/wsdl/jaxrpcEndpoint.wsdl +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterface.java b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterface.java deleted file mode 100644 index 4f4ea1a6bfba5d69840a5c42838481bef036c02b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterface.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * JaxRpcEndpointInterface.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2RC2 Dec 15, 2004 (10:53:17 CET) WSDL2Java emitter. - */ - -package org.objectweb.wssample.gen.jaxrpc; - -public interface JaxRpcEndpointInterface extends java.rmi.Remote { - public java.lang.String sayHello(java.lang.String in0) throws java.rmi.RemoteException; - public int getCotes() throws java.rmi.RemoteException; -} diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterfaceService.java b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterfaceService.java deleted file mode 100644 index 2c077c7234a0750b19e3594ab0da9642cacc9e65..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/gen/jaxrpc/JaxRpcEndpointInterfaceService.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * JaxRpcEndpointInterfaceService.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2RC2 Dec 15, 2004 (10:53:17 CET) WSDL2Java emitter. - */ - -package org.objectweb.wssample.gen.jaxrpc; - -public interface JaxRpcEndpointInterfaceService extends javax.xml.rpc.Service { - public java.lang.String getJaxRpcEndpoint1Address(); - - public org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterface getJaxRpcEndpoint1() throws javax.xml.rpc.ServiceException; - - public org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterface getJaxRpcEndpoint1(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; - - public org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterface getEncryptedJaxRpcEndpoint() throws javax.xml.rpc.ServiceException; - - public org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterface getEncryptedJaxRpcEndpoint(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; -} diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/security/ServerSideCallbackHandler.java b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/security/ServerSideCallbackHandler.java deleted file mode 100644 index c093be311493be60228120bb4105bd6447281398..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/security/ServerSideCallbackHandler.java +++ /dev/null @@ -1,90 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.wssample.security; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.UnsupportedCallbackException; - -import org.apache.ws.security.WSPasswordCallback; - -/** - * WSS4J Sample CallbackHandler. It is intended to be used from a JOnAS server (servlet/ejb client & JAX-RPC/SSB endpoint). - * It will get the 'memrlm_1' instance and try to get the needed password from that JResource. - * - * @author Guillaume Sauthier - */ -public class ServerSideCallbackHandler implements CallbackHandler { - - /** - * encryptionUser value (used to access keystore - look in crypto.properties) - */ - private static final String ENCRYPTION_USER = "jonas-ws"; - - /** - * encryptionUser password : password used to access keystore - */ - private static final String ENCRYPTION_PASSWORD = "security"; - - /** - * File name which contains credentials - */ - private static final String CREDENTIALS_FILE_NAME = "credentials.properties"; - - /** - * @see javax.security.auth.callback.CallbackHandler#handle(javax.security.auth.callback.Callback[]) - */ - public void handle(Callback[] callbacks) throws IOException, - UnsupportedCallbackException { - for (int i = 0; i < callbacks.length; i++) { - if (callbacks[i] instanceof WSPasswordCallback) { - WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; - // set the password given a username - - if (!ENCRYPTION_USER.equals(pc.getIdentifer())) { - // Get hash password for this identifier - InputStream is = getClass().getResourceAsStream("/" + CREDENTIALS_FILE_NAME); - Properties props = new Properties(); - props.load(is); - String password = props.getProperty(pc.getIdentifer()); - // Set the password - pc.setPassword(password); - } else { - // this is the ecryption username - // we must return the correct password (stored in crypto.properties) - pc.setPassword(ENCRYPTION_PASSWORD); - } - - } else { - throw new UnsupportedCallbackException(callbacks[i], "Unrecognized Callback"); - } - } - } - -} diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpoint.java b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpoint.java deleted file mode 100644 index 6477f880471caf44ce7829900af510bc8f01fae6..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpoint.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.wssample.servlets.ws; - -import org.ow2.jonas.lib.util.Log; - -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * Service implementation of JaxRpcEndpointInterface. This class is a JaxRpc - * endpoint. It is declared in the web.xml. And it will run inside the web - * container. - * - * Notice that a default class constructor is REQUIRED. - * Notice that JaxRpcEndpoint does not implements JaxRpcEndpointInterface - * This is not a requirement. - * - * This JAXRPC service endpoint class may implements javax.xml.rpc.server.ServiceLifecycle - * interface. - * - * @see org.objectweb.wssample.servlets.ws.JaxRpcEndpointInterface - * - * @author Guillaume Sauthier - */ -public class JaxRpcEndpoint { - - /** - * return value of getCotes() - */ - private static final int GET_COTES_VALUE = 12; - - /** - * logger - */ - private static Logger logger = Log.getLogger("org.ow2.jonas.ws"); - - /** - * default constructor needed for JaxRpc Service Endpoint. - */ - public JaxRpcEndpoint() { - } - - /** - * @param name String to append to "Hello " - * @return Returns "Hello " + name - */ - public String sayHello(String name) { - logger.log(BasicLevel.INFO, "sayHello(" + name + ") invoked."); - return "Hello " + name; - } - - /** - * @return Returns an arbitrary integer - */ - public int getCotes() { - logger.log(BasicLevel.INFO, "getCotes() invoked."); - return GET_COTES_VALUE; - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpointInterface.java b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpointInterface.java deleted file mode 100644 index 44bca25b389a047bcbf1205bc7b528273eb148a2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/ws/JaxRpcEndpointInterface.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.wssample.servlets.ws; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * The Service interface. - * Notice that it extends Remote and all methods are throwing RemoteException - * @see org.objectweb.wssample.servlets.ws.JaxRpcEndpoint - * @author Guillaume Sauthier - */ -public interface JaxRpcEndpointInterface extends Remote { - - /** - * @param name String to append to "Hello " - * @return Returns "Hello " + name - * @throws RemoteException required because of the Remote interface - */ - String sayHello(String name) throws RemoteException; - - /** - * @return Returns an arbitrary integer - * @throws RemoteException required because of the Remote interface - */ - int getCotes() throws RemoteException; -} diff --git a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/wsclient/JOnASJaxRpcClientServlet.java b/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/wsclient/JOnASJaxRpcClientServlet.java deleted file mode 100644 index 7ffc78f225c6dcd53318f52e8b2867d9bf7b8699..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/webservices/webs/webendpoint/src/org/objectweb/wssample/servlets/wsclient/JOnASJaxRpcClientServlet.java +++ /dev/null @@ -1,191 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.wssample.servlets.wsclient; - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.rpc.ServiceException; -import javax.xml.rpc.Stub; - -import org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterface; -import org.objectweb.wssample.gen.jaxrpc.JaxRpcEndpointInterfaceService; - -/** - * @author Guillaume Sauthier - */ -public class JOnASJaxRpcClientServlet extends HttpServlet { - - /** - * Initializes the servlet. - * @param config ServletConfig - * @throws ServletException thrown by super.init(config); - */ - public void init(ServletConfig config) throws ServletException { - super.init(config); - } - - /** - * Destroys the servlet. - */ - public void destroy() { - - } - - /** - * Processes requests for both HTTP GET and POST - * methods. - * - * @param request servlet request - * @param response servlet response - * - * @throws ServletException default servlet exception thrown - * @throws IOException servlet exception thrown - */ - protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, - IOException { - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - - out.println(""); - out.println(""); - out.println("JOnAS JaxRpc WebService Test Page"); - out.println(""); - out.println(""); - out.println(""); - - out.println("
    "); - out.println("\"Jakarta"); - out.println("\"Mortbay"); - out.println("\"JOnAS"); - out.println("
    "); - - // do we need to use the encrypted endpoint or not ? - boolean encrypt = false; - if ("true".equalsIgnoreCase(request.getParameter("encrypt"))) { - encrypt = true; - } - - try { - - // Get the service instance - //--------------------------------------------- - Context ctx = new InitialContext(); - JaxRpcEndpointInterfaceService service = null; - JaxRpcEndpointInterface port = null; - - // We can use the same service because the 2 ws use the same interface - // Get the port where execute methods - - if (encrypt) { - service = (JaxRpcEndpointInterfaceService) ctx.lookup("java:comp/env/service/crypted-jaxrpc"); - //--------------------------------------------- - port = service.getEncryptedJaxRpcEndpoint(); - } else { - service = (JaxRpcEndpointInterfaceService) ctx.lookup("java:comp/env/service/jaxrpc"); - //--------------------------------------------- - port = service.getJaxRpcEndpoint1(); - } - - // Use the context username for WSS4JHandler - ((Stub) port)._setProperty("user", request.getUserPrincipal().getName()); - - // Execute Methods : - String hello = port.sayHello(request.getParameter("name")); - int cotes = port.getCotes(); - - if (encrypt) { - out.println("
    Results With Encryption
    "); - } else { - out.println("
    Results
    "); - } - out.println("
    "); - - // Display results : - out.println("Working with URL : " + ((Stub) port)._getProperty(Stub.ENDPOINT_ADDRESS_PROPERTY) - + "
    "); - out.println("result of sayHello(name) method :" + hello + "
    "); - out.println("result of getCotes() method :" + cotes + "
    "); - - out.println("
    "); - } catch (ServiceException se) { - out.println("
    Something goes wrong when calling the WebService
    "); - se.printStackTrace(out); - out.println("
    "); - } catch (NamingException ne) { - out.println("
    Exception while retrieving InitialContext
    "); - ne.printStackTrace(out); - out.println("
    "); - } - - out.println(""); - out.println(""); - - out.close(); - } - - /** - * Handles the HTTP GET method. - * - * @param request servlet request - * @param response servlet response - * - * @throws ServletException default servlet exception thrown - * @throws IOException default servlet exception thrown - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - processRequest(request, response); - } - - /** - * Handles the HTTP POST method. - * - * @param request servlet request - * @param response servlet response - * - * @throws ServletException default servlet exception thrown - * @throws IOException default servlet exception thrown - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, - IOException { - processRequest(request, response); - } - - /** - * @return Returns a short description of the servlet. - */ - public String getServletInfo() { - return "Short description"; - } - -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/xdoclet/ClientCustomer.java b/jonas_tests/examples/base/examples/xdoclet/ClientCustomer.java deleted file mode 100644 index f930ff7b21295cefaf976d671aa8ba1978aa80b7..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/xdoclet/ClientCustomer.java +++ /dev/null @@ -1,154 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package xdoclet; - -import java.io.BufferedReader; -import java.io.FileInputStream; -import java.io.InputStreamReader; -import java.io.IOException; -import java.rmi.RemoteException; -import java.util.Collection; -import java.util.Iterator; -import java.util.Hashtable; -import java.util.Properties; -import javax.ejb.FinderException; -import javax.ejb.RemoveException; -import javax.transaction.UserTransaction; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import xdoclet.CustomerHomeRemote; -import xdoclet.CustomerRemote; - -/** - * Sample for entity beans CMP2 xdoclet - */ - -public class ClientCustomer { - - private static UserTransaction utx = null; - - private static void PrintAllCustomerAndPhones(CustomerHomeRemote h) { - Iterator alist; - CustomerRemote customer; - String phone; - try { - utx.begin(); // faster if made inside a Tx - alist = h.findAllCustomers().iterator(); - while (alist.hasNext()) { - customer = (CustomerRemote) alist.next(); - System.out.println("Customer name is :" + customer.getLastName() + " " + customer.getFirstName()); - Iterator phonelist = customer.getPhoneList().iterator(); - while (phonelist.hasNext()) { - phone = (String) phonelist.next(); - System.out.println("Phone number is: " + phone); - } - } - utx.commit(); - } catch (Exception e) { - System.err.println("Exception getting all Customer phone list: " + e); - System.exit(2); - } - } - - public static void main(String[] args) { - - String beanName = "CustomerBeanHome"; - - // get JNDI initial context - Context initialContext = null; - try { - initialContext = new InitialContext(); - } catch (Exception e) { - System.err.println("Cannot get initial context for JNDI: " + e); - System.exit(2); - } - - // We want to start transactions from client: get UserTransaction - System.out.println("Getting a UserTransaction object from JNDI"); - try { - - // Comment the following lines if you want to use a David Client: - utx = (UserTransaction) initialContext.lookup("javax.transaction.UserTransaction"); - - } catch (Exception e) { - System.err.println("Cannot lookup UserTransaction: " + e); - System.exit(2); - } - - // Connecting to Home thru JNDI - System.out.println("Connecting to the CustomerHome"); - CustomerHomeRemote home = null; - try { - home = (CustomerHomeRemote) PortableRemoteObject.narrow(initialContext.lookup(beanName), - CustomerHomeRemote.class); - } catch (Exception e) { - System.err.println("Cannot lookup " + beanName + ": " + e); - System.exit(2); - } - - // List existing customer - System.out.println("Getting the list of existing Customer in database"); - PrintAllCustomerAndPhones(home); - - // Create a first customer - System.out.println("Creating a new customer in database"); - CustomerRemote c1 = null; - try { - c1 = home.create(new Integer(1), new Name("jerome", "camilleri")); - } catch (Exception e) { - System.err.println("Cannot create Customer: " + e); - System.exit(2); - } - - // Add phone number - try { - c1.addPhoneNumber("0476254717", (byte) 0); - c1.addPhoneNumber("0625785511", (byte) 0); - } catch (Exception e) { - System.out.println("Problem during add phone number"); - e.printStackTrace(System.out); - } - // List existing customer - System.out.println("Getting the list of customer with Phone number in database"); - PrintAllCustomerAndPhones(home); - - // Delete Account2 - System.out.println("Removing Customer and phone previously created in database"); - try { - c1.removePhoneNumber((byte) 0); - c1.remove(); - } catch (Exception e) { - System.err.println("exception during remove: " + e); - System.exit(2); - } - - // Exit program - System.out.println("ClientCustomer terminated"); - } - -} - diff --git a/jonas_tests/examples/base/examples/xdoclet/CustomerBean.java b/jonas_tests/examples/base/examples/xdoclet/CustomerBean.java deleted file mode 100644 index 91756f811b66f084e83c6a0f47129f1472661efa..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/xdoclet/CustomerBean.java +++ /dev/null @@ -1,262 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package xdoclet; - -import java.rmi.RemoteException; -import javax.ejb.EntityBean; -import javax.ejb.EntityContext; -import javax.ejb.ObjectNotFoundException; -import javax.ejb.RemoveException; -import javax.ejb.CreateException; -import javax.ejb.EJBException; -import java.util.Date; -import java.util.Collection; -import java.util.Iterator; -import java.util.Vector; -import javax.naming.InitialContext; -import javax.naming.NamingException; -/** - * CustomerBean is an entity bean with "container managed persistence version 2". - * The state of an instance is stored into a relational database. - * - * @ejb.bean - * name="CustomerBean" - * description="Deployment descriptor for the CustomerBean bean with CMP2 JOnAS example" - * type="CMP" - * view-type="both" - * primkey-field="id" - * jndi-name="CustomerBeanHome" - * cmp-version="2.x" - * reentrant="false" - * @ejb.home - * remote-class="xdoclet.CustomerHomeRemote" - * local-class="xdoclet.CustomerHomeLocal" - * @ejb.interface - * remote-class="xdoclet.CustomerRemote" - * local-class="xdoclet.CustomerLocal" - * @ejb:pk - * class="java.lang.Integer" - * @ejb.ejb-ref - * ejb-name="PhoneBean" - * view-type="local" - * ref-name="ejb/PhoneHomeLocal" - * - * @jonas.jdbc-mapping - * jdbc-table-name = "MyCustomer" - * - * @ejb:finder - * signature= "java.util.Collection findByName(java.lang.String lastName, java.lang.String firstName)" - * query ="SELECT OBJECT(c) FROM CustomerBean c WHERE c.lastName LIKE ?1 AND c.firstName LIKE ?2" - * @ejb:finder - * signature= "java.util.Collection findAllCustomers()" - * query ="SELECT OBJECT(c) FROM CustomerBean AS c" - * - * @jonas.session-timeout - * session-timeout="60" - * @ejb:transaction - * type="Required" - */ -public abstract class CustomerBean implements EntityBean { - - // Keep the reference on the EntityContext - protected EntityContext entityContext; - - /** - * EJBCREATE - * @return pk primary key set to null - * - * @ejb.create-method - */ - public Integer ejbCreate(Integer id, Name name) - throws CreateException { - setLastName(name.getLastName()); - setFirstName(name.getFirstName()); - - // Init object state - this.setId(id); - return null; - } - - public void ejbPostCreate(Integer id, Name name) {} - - // business methods - /** - * @ejb.interface-method - * - **/ - public Name getName() { - Name name = new Name(getLastName(),getFirstName()); - return name; - } - /** - * @ejb.interface-method - **/ - public void setName(Name name) { - setLastName(name.getLastName()); - setFirstName(name.getFirstName()); - } - - - /** - * @ejb.interface-method - **/ - public void addPhoneNumber(String number, byte type) throws NamingException, CreateException { - InitialContext jndiEnc = new InitialContext(); - PhoneHomeLocal phoneHomeL = (PhoneHomeLocal) (jndiEnc.lookup("java:comp/env/ejb/PhoneHomeLocal")); - - PhoneLocal phone = phoneHomeL.create(number, type); - Collection phoneNumbers = this.getPhoneNumber(); - phoneNumbers.add(phone); - } - - /** - * @ejb.interface-method - **/ - public void removePhoneNumber(byte typeToRemove) { - Collection phoneNumbers = this.getPhoneNumber(); - Iterator iterator = phoneNumbers.iterator(); - - while (iterator.hasNext()) { - PhoneLocal phone = (PhoneLocal) iterator.next(); - if (phone.getType() == typeToRemove) { - phoneNumbers.remove(phone); - try { - phone.remove(); - } catch (Exception e) { - System.out.println("Problem during removing phone"); - } - } - - } - } - - /** - * @ejb.interface-method - **/ - public void updatePhoneNumber(String number, byte typeToUpdate) { - Collection phoneNumbers = this.getPhoneNumber(); - Iterator iterator = phoneNumbers.iterator(); - while (iterator.hasNext()) { - PhoneLocal phone = (PhoneLocal) iterator.next(); - if (phone.getType() == typeToUpdate) { - phone.setNumber(number); - break; - } - } - } - - /** - * @ejb.interface-method - **/ - public Vector getPhoneList() { - - Vector vv = new Vector(); - Collection phoneNumbers = this.getPhoneNumber(); - - Iterator iterator = phoneNumbers.iterator(); - while (iterator.hasNext()) { - PhoneLocal phone = (PhoneLocal) iterator.next(); - String ss = "Type=" + phone.getType() + " Number=" + phone.getNumber(); - vv.add(ss); - } - return vv; - } - - // persistent relationships - /** - * @ejb.relation - * name="CUSTOMER-PHONE" - * role-name="PHONE-has-CUSTOMER" - * target-ejb="PhoneBean" - * target-role-name="CUSTOMER-has-PHONE" - * - * @jonas.field-mapping - * foreign-key-jdbc-name="CUSTOMER_FK_PHONE" - * key-jdbc-name="CustomerId" - **/ - public abstract Collection getPhoneNumber( ); - public abstract void setPhoneNumber(Collection phones); - - // abstract accessor methods - /** - * @ejb.persistent-field - * @ejb.interface-method - * @jonas.cmp-field-jdbc-mapping - * field-name="id" - * jdbc-field-name="CustomerId" - */ - public abstract Integer getId(); - - /** - * @ejb.persistent-field - * @ejb.interface-method - */ - public abstract void setId(Integer id); - /** - * @ejb.persistent-field - * @ejb.interface-method - */ - public abstract String getLastName( ); - /** - * @ejb.persistent-field - * @ejb.interface-method - */ - public abstract void setLastName(String lname); - - /** - * @ejb.persistence - * column-name="CustomerFirstName" - * jdbc-type="VARCHAR" - * @ejb.persistent-field - * @ejb.interface-method - */ - public abstract String getFirstName( ); - /** - * @ejb.persistent-field - * @ejb.interface-method - */ - public abstract void setFirstName(String fname); - - // standard call back methods - - public void ejbActivate() {} - public void ejbLoad() {} - public void ejbPassivate() {} - public void ejbRemove() throws RemoveException {} - - public void ejbStore() {} - - - public void setEntityContext(EntityContext ctx) { - - // Keep the entity context in object - entityContext = ctx; - } - - public void unsetEntityContext() { - entityContext = null; - } - -} diff --git a/jonas_tests/examples/base/examples/xdoclet/Name.java b/jonas_tests/examples/base/examples/xdoclet/Name.java deleted file mode 100644 index 4faa7469ca32eec470eaa9db99798acb08d7efca..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/xdoclet/Name.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package xdoclet; - -public class Name implements java.io.Serializable { - - private String lastName; - - private String firstName; - - public Name(String lname, String fname) { - lastName = lname; - firstName = fname; - } - - public String getLastName() { - return lastName; - } - - public String getFirstName() { - return firstName; - } -} \ No newline at end of file diff --git a/jonas_tests/examples/base/examples/xdoclet/PhoneBean.java b/jonas_tests/examples/base/examples/xdoclet/PhoneBean.java deleted file mode 100644 index 66c64b9aed6b7ea8fa27ba28060b9679a8a54448..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/xdoclet/PhoneBean.java +++ /dev/null @@ -1,114 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2004 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package xdoclet; - -import javax.ejb.EntityContext; -import java.util.Date; -import javax.naming.InitialContext; -import javax.naming.NamingException; -/** - * PhoneBean is an entity bean with "container managed persistence version 2". - * The state of an instance is stored into a relational database. - * - * @ejb.bean - * name="PhoneBean" - * description="Deployment descriptor for the PhoneBean bean with CMP2 JOnAS example" - * type="CMP" - * view-type="local" - * jndi-name="PhoneBeanHome" - * cmp-version="2.x" - * reentrant="false" - * @ejb.home - * local-class="xdoclet.PhoneHomeLocal" - * @ejb.interface - * local-class="xdoclet.PhoneLocal" - * @ejb:pk - * class="java.lang.Object" - * @jonas.jdbc-mapping - * automatic-pk-field-name="pkphone" - * @ejb:finder - * signature= "java.util.Collection findAllPhones()" - * query ="SELECT OBJECT(o) FROM PhoneBean o" - * @jonas.session-timeout - * session-timeout="60" - * @ejb:transaction type="Required" - */ - -public abstract class PhoneBean implements javax.ejb.EntityBean { - - /** - * EJBCREATE - * @return pk primary key set to null - * - * @ejb.create-method - */ - public Object ejbCreate( String number, byte type) throws javax.ejb.CreateException { - setNumber(number); - setType(type); - return null; - } - - public void ejbPostCreate(String number, byte type) { - System.out.println("PhoneBean ejbPostCreate number= "+number); - } - - - - /** - * @ejb.persistent-field - * @ejb.interface-method - * @jonas.cmp-field-jdbc-mapping - * field-name="number" - * jdbc-field-name="PhoneNumber" - */ - public abstract String getNumber(); - /** - * @ejb.persistent-field - * @ejb.interface-method - */ - public abstract void setNumber(String number); - /** - * @ejb.persistent-field - * @ejb.interface-method - */ - public abstract byte getType(); - /** - * @ejb.persistent-field - * @ejb.interface-method - */ - public abstract void setType(byte type); - - // standard call back methods - - public void setEntityContext(EntityContext ec){} - public void unsetEntityContext(){} - public void ejbLoad(){} - public void ejbStore(){} - public void ejbActivate(){} - public void ejbPassivate(){} - public void ejbRemove() throws javax.ejb.RemoveException{} - -} diff --git a/jonas_tests/examples/base/examples/xdoclet/README b/jonas_tests/examples/base/examples/xdoclet/README deleted file mode 100644 index ece9448495dd9ac634ec85838722b1994cf3adcb..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/xdoclet/README +++ /dev/null @@ -1,131 +0,0 @@ -Copyright (C) BULL S.A. 1998-2002 - -Please read How to configure and use xdoclet for JOnAS at : -http://jonas.objectweb.org/current/doc/howto/howtoXdoclet.html - -Entity beans "Customer-Phone" for xdoclet ------------------------------------------ -CustomerBean entity bean with CMP2 persistance and relationship (CustomerBean--1------------n-->PhoneBean) -PhoneBean entity bean with CMP2 persitance - -this directory contains initially only this files : -build.xml : the build which contain target for xdoclet and jonas compilation -build.properties : properties for jonas target -CustomerBean.java : Bean class with xdoclet tag -PhoneBean.java : Bean class with xdoclet tag -Name.java : Utilities class -ClientCustomer.java : Client -README : - -Generated this example with xdoclet: ------------------------------------ -Using default target (install) ; - -You should have this return : -ejbdoclet: -[ejbdoclet] Dec 15, 2004 2:39:04 PM xdoclet.XDocletMain start -[ejbdoclet] INFO: Running -[ejbdoclet] Generating Remote interface for 'xdoclet.CustomerBean'. -[ejbdoclet] Dec 15, 2004 2:39:04 PM xdoclet.XDocletMain start -[ejbdoclet] INFO: Running -[ejbdoclet] Generating Local interface for 'xdoclet.CustomerBean'. -[ejbdoclet] Generating Local interface for 'xdoclet.PhoneBean'. -[ejbdoclet] Dec 15, 2004 2:39:04 PM xdoclet.XDocletMain start -[ejbdoclet] INFO: Running -[ejbdoclet] Generating Home interface for 'xdoclet.CustomerBean'. -[ejbdoclet] Dec 15, 2004 2:39:04 PM xdoclet.XDocletMain start -[ejbdoclet] INFO: Running -[ejbdoclet] Generating Local Home interface for 'xdoclet.CustomerBean'. -[ejbdoclet] Generating Local Home interface for 'xdoclet.PhoneBean'. -[ejbdoclet] Dec 15, 2004 2:39:05 PM xdoclet.XDocletMain start -[ejbdoclet] INFO: Running -[ejbdoclet] Generating EJB deployment descriptor (ejb-jar.xml). -[ejbdoclet] Dec 15, 2004 2:39:05 PM xdoclet.XDocletMain start -[ejbdoclet] INFO: Running -[ejbdoclet] Dec 15, 2004 2:39:05 PM xdoclet.TemplateSubTask engineStarted -[ejbdoclet] INFO: Generating output 'jonas-ejb-jar.xml' using template file 'jar:file:/home/camillej/MyJonas/JONAS_4_2/lib/examples/xdoclet-objectweb-module-1.2.2.jar!/xdoclet/modules/objectweb/jonas/ejb/resources/jonas.xdt'. - -compile: - [javac] Compiling 10 source files to /home/camillej/MyJonas/JONAS_4_2/examples/classes - -jonasejbjar: - [ejbjar] building xdoclet.jar with 11 files - [genic] GenIC for JOnAS 4.2.2: 'CustomerBean', 'PhoneBean' generation ... - [genic] Stubs and Skels successfully generated for rmi/jrmp - -install: - [copy] Copying 1 file to /home/camillej/MyJonas/JONAS_4_2/ejbjars - - -9 files must be generated into the current directory : - CustomerRemote.java - CustomerLocal.java - CustomerHomeRemote.java - PhoneLocal.java - PhoneHomeLocal.java - PhoneBean.java - CustomerHomeLocal.java - jonas-ejb-jar.xml - ej-jar.xml - -Compiling this example: ------------------------ -ant install - - -Running this example: ---------------------- -Your database access should be configured: a properties files defining a - Datasource object should be defined in $JONAS_BASE/conf (e.g. InstantDB1.properties), - and the property jonas.service.dbm.datasources of the jonas.properties file should - be set to the name of this datasource description file (e.g. InstantDB1). See JOnAS - documentation for more details. - -1) Run an EJB Server to make beans available to clients: - -on UNIX or Windows - - jonas start - -2) Load xdoclet.jar if you have not added it in the ejb vice descriptors list: - - jonas admin -a $JONAS_BASE/ejbjars/xdoclet.jar - -You should see something like this when the bean is loaded : - ... -2003-03-07 13:50:24,112 : JContainer.addBean : CustomerBean is loaded and using rdb.mysql -2003-03-07 13:50:24,112 : JContainer.addBean : CustomerBean available -2003-03-07 13:50:24,622 : JContainer.addBean : PhoneBean is loaded and using rdb.mysql -2003-03-07 13:50:24,622 : JContainer.addBean : PhoneBean available -2003-03-07 13:50:24,662 : ServiceManager.startServices : ejb service started - -3) Run the client program: - -on UNIX: - jclient -cp $JONAS_BASE/ejbjars/xdoclet.jar xdoclet.ClientCustomer - -On Windows: - jclient -cp "%JONAS_BASE%\ejbjars\xdoclet.jar" xdoclet.ClientCustomer - -In fact, the "-cp" option is not useful here, because classes are found in the CLASSPATH. - -You should see something like this when the client is run : - -Getting a UserTransaction object from JNDI -Connecting to the CustomerHome -Getting the list of existing Customer in database -Creating a new customer in database -PhoneBean ejbPostCreate number= 0476254717ID = 0 -PhoneBean ejbPostCreate number= 0625785511ID = 1 -Getting the list of customer with Phone number in database -Customer name is :jerome camilleri -Phone number is:Type=0 Number=0476254717 -Phone number is:Type=0 Number=0625785511 -Removing Customer and phone previously created in database -ClientCustomer terminated - -At the end of the test all bean are removed. - -4) Stop the jonas server - jonas stop - diff --git a/jonas_tests/examples/base/examples/xdoclet/build.xml b/jonas_tests/examples/base/examples/xdoclet/build.xml deleted file mode 100644 index ce8157ca2a142ea45902a28748cbe17f88da38cf..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/base/examples/xdoclet/build.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-1.2.2.jar b/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-1.2.2.jar deleted file mode 100644 index a5a2764441976e2e0d8a26bdb3ece84e87ac4146..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-1.2.2.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-apache-module-1.2.2.jar b/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-apache-module-1.2.2.jar deleted file mode 100644 index 784cfb1d5a453b2d3ea67c9e6aa27aea754a4441..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-apache-module-1.2.2.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-ejb-module-1.2.2.jar b/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-ejb-module-1.2.2.jar deleted file mode 100644 index 8692fd538eaa435e43d9bc6fdb70beff1f3ccbaf..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-ejb-module-1.2.2.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-exolab-module-1.2.2.jar b/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-exolab-module-1.2.2.jar deleted file mode 100644 index 4dcaea39a13bd9211dec2e77005a181109c0e81f..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-exolab-module-1.2.2.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-objectweb-module-1.2.2.jar b/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-objectweb-module-1.2.2.jar deleted file mode 100644 index ce9f35e76b7e774fe888420c2629996e7d85fbcb..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-objectweb-module-1.2.2.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-web-module-1.2.2.jar b/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-web-module-1.2.2.jar deleted file mode 100644 index 47e6cd4d871fc102620caa0332e0690e54342082..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/xdoclet/lib/xdoclet-web-module-1.2.2.jar and /dev/null differ diff --git a/jonas_tests/examples/base/examples/xdoclet/lib/xjavadoc-1.1.jar b/jonas_tests/examples/base/examples/xdoclet/lib/xjavadoc-1.1.jar deleted file mode 100644 index ee0520535ffcae5e5167d57b2090e3652892a64d..0000000000000000000000000000000000000000 Binary files a/jonas_tests/examples/base/examples/xdoclet/lib/xjavadoc-1.1.jar and /dev/null differ diff --git a/jonas_tests/examples/build.xml b/jonas_tests/examples/build.xml deleted file mode 100644 index 55e50e9f1f9c12d905e35395e174706b1e784477..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/build.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/alarm/C_alarm.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/alarm/C_alarm.java deleted file mode 100644 index eb193ecdf7ae3b94c882f2edb934aa474352d025..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/alarm/C_alarm.java +++ /dev/null @@ -1,239 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.alarm; - -import junit.framework.TestSuite; - -import org.objectweb.jonas.examples.util.JExampleTestCase; - -import com.meterware.httpunit.AuthorizationRequiredException; -import com.meterware.httpunit.TableCell; -import com.meterware.httpunit.WebForm; -import com.meterware.httpunit.WebLink; -import com.meterware.httpunit.WebResponse; -import com.meterware.httpunit.WebTable; - -/** - * Define a class to test the Alarm example - * Test authentication, generate alarm and process alarms - * @author Florent Benoit - */ -public class C_alarm extends JExampleTestCase { - - - /** - * URL of the alarm index - */ - private static final String URL_ALARM = "/alarm/secured/list.jsp"; - - /** - * URL of the list of alarms - */ - private static final String URL_ALARM_LIST = "/alarm/secured/setfilter.jsp?profil=all-I"; - - /** - * URL of the alarm generator - */ - private static final String URL_ALARM_GENERATE = "/alarm/generator.html"; - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_alarm(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_alarm.class); - } - - /** - * Setup need for these tests - * alarm is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useEar("alarm"); - } - - /** - * Constructor with a specified name - * @param s name - */ - public C_alarm(String s) { - super(s, URL_ALARM); - } - - - /** - * Try to log in without authentication - * @throws Exception if an error occurs - */ - public void testTryWithoutAuth() throws Exception { - try { - WebResponse wr = wc.getResponse(url); - fail("Alarm is not protected"); - } catch (AuthorizationRequiredException e) { - ; - } - } - - /** - * Try to authenticate with a bad login/password - * @throws Exception if an error occurs - */ - public void testTryWithBadAuth() throws Exception { - try { - wc.setAuthorization("bad", "bad"); - WebResponse wr = wc.getResponse(url); - fail("Alarm is not protected"); - } catch (AuthorizationRequiredException e) { - ; - } - } - - /** - * Try to authenticate with a right login/password (jetty) - * @throws Exception if an error occurs - */ - public void testTryWithJettyAuth() throws Exception { - try { - wc.setAuthorization("jetty", "jetty"); - WebResponse wr = wc.getResponse(url); - } catch (AuthorizationRequiredException e) { - fail("Alarm don't accept l/p jetty/jetty"); - } - } - - /** - * Try to authenticate with a right login/password (tomcat) - * @throws Exception if an error occurs - */ - public void testTryWithTomcatAuth() throws Exception { - try { - wc.setAuthorization("tomcat", "tomcat"); - WebResponse wr = wc.getResponse(url); - } catch (AuthorizationRequiredException e) { - fail("Alarm don't accept l/p tomcat/tomcat"); - } - } - /** - * Try to generate alarms. One of each kind of alarm (severe, informative, warning) - * @throws Exception if an error occurs - */ - public void testGenerateAlarms() throws Exception { - try { - wc.setAuthorization("tomcat", "tomcat"); - WebResponse wr = wc.getResponse(getAbsoluteUrl(URL_ALARM_GENERATE)); - - WebForm[] webForms = wr.getForms(); - - WebForm webForm = webForms[0]; - assertNotNull("There must be a form in the html page", webForm); - - String[] levels = new String[] {"S", "W", "I"}; - - for (int i = 0; i < 3; i++) { - webForm.setParameter("message", "Automatic test" + i); - webForm.setParameter("device", "aut" + i); - webForm.setParameter("level", levels[i]); - WebResponse wFormRes = webForm.submit(); - String txt = wFormRes.getText(); - if (txt.indexOf("Message sent") == -1) { - fail("The alarm was not generated : " + txt); - } - } - - } catch (AuthorizationRequiredException e) { - fail("Alarm don't accept l/p tomcat/tomcat"); - } - } - - /** - * Try to process all alarms which were generated - * @throws Exception if an error occurs - */ - public void testProcessAlarms() throws Exception { - try { - // Wait a little if the previous alarms were not generated - Thread.sleep(1000); - - wc.setAuthorization("tomcat", "tomcat"); - WebResponse wr = wc.getResponse(getAbsoluteUrl(URL_ALARM_LIST)); - WebTable[] webTables = wr.getTables(); - - WebTable wTable = webTables[1]; - assertNotNull("There must be a table in the html page", wTable); - - int rows = wTable.getRowCount(); - int cols = wTable.getColumnCount(); - - assertEquals("The tables must have 6 columns", 6, cols); - - // For each alarm - for (int i = 1; i < rows; i++) { - TableCell tableCell = wTable.getTableCell(i, cols - 1); - assertNotNull("There must be a cell in this row", tableCell); - WebLink[] links = tableCell.getLinks(); - assertNotNull("There must have links in this cell", links); - for (int l = 0; l < links.length; l++) { - links[l].click(); - } - } - - //Now check alarms are empty (rows = 1) - wr = wc.getResponse(getAbsoluteUrl(URL_ALARM_LIST)); - webTables = wr.getTables(); - wTable = webTables[1]; - rows = wTable.getRowCount(); - assertEquals(1, rows); - - } catch (AuthorizationRequiredException e) { - fail("Authentication failed"); - } - } -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/cmp2/C_cmp2.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/cmp2/C_cmp2.java deleted file mode 100644 index 92d3d813fe3b73fd604cb1fe52aef97ecdc8526b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/cmp2/C_cmp2.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.cmp2; - -import junit.framework.TestSuite; - -import org.objectweb.jonas.examples.util.JExampleTestCase; - -import com.meterware.httpunit.WebForm; -import com.meterware.httpunit.WebResponse; - -/** - * Define a class to test the cmp2 example - * Test the three servlet are ok - * @author Philippe Coq - */ -public class C_cmp2 extends JExampleTestCase { - - /** - * URL of the cmp2 page - */ - private static final String URL_EARCMP2 = "/cmp2"; - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_cmp2(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_cmp2.class); - } - - /** - * Setup need for these tests - * cmp2 is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useEar("cmp2"); - } - - /** - * Constructor with a specified name - * @param s name - */ - public C_cmp2(String s) { - super(s, URL_EARCMP2); - } - - /** - * Test the examples showing 1-to-1 relationship - * @throws Exception if an error occurs - */ - public void testFirstServlet() throws Exception { - - WebResponse wr = wc.getResponse(url); - - WebForm[] webForms = wr.getForms(); - WebForm webForm = webForms[0]; - assertNotNull("There must be a form in the html page", webForm); - WebResponse wFormRes = webForm.submit(); - String txt = wFormRes.getText(); - if (txt.indexOf("Servlet is OK.") == -1) { - fail("The example was not ok : " + txt); - } - } - - - /** - * Test the examples showing n-to-1 1-to-n relationship - * @throws Exception if an error occurs - */ - public void testSecondServlet() throws Exception { - - WebResponse wr = wc.getResponse(url); - - WebForm[] webForms = wr.getForms(); - WebForm webForm = webForms[1]; - assertNotNull("There must be a form in the html page", webForm); - WebResponse wFormRes = webForm.submit(); - String txt = wFormRes.getText(); - if (txt.indexOf("Servlet is OK.") == -1) { - fail("The example was not ok : " + txt); - } - } - - /** - * Test the examples using EJB-QL - * @throws Exception if an error occurs - */ - public void testThirdServlet() throws Exception { - - WebResponse wr = wc.getResponse(url); - - WebForm[] webForms = wr.getForms(); - WebForm webForm = webForms[2]; - assertNotNull("There must be a form in the html page", webForm); - WebResponse wFormRes = webForm.submit(); - String txt = wFormRes.getText(); - if (txt.indexOf("Servlet is OK.") == -1) { - fail("The example was not ok : " + txt); - } - } - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/earsample/C_earsample.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/earsample/C_earsample.java deleted file mode 100644 index 2f11320a9de1ba55da968ed2d809c03d99fd48af..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/earsample/C_earsample.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.earsample; - -import junit.framework.TestSuite; - -import org.objectweb.jonas.examples.util.JExampleTestCase; - -import com.meterware.httpunit.AuthorizationRequiredException; -import com.meterware.httpunit.WebResponse; - -/** - * Define a class to test the Alarm example - * Test authentication, and check the sample is ok - * @author Florent Benoit - */ -public class C_earsample extends JExampleTestCase { - - /** - * URL of the earsample page - */ - private static final String URL_EARSAMPLE = "/earsample/secured/Op"; - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_earsample(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_earsample.class); - } - - /** - * Setup need for these tests - * earsample is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useEar("earsample"); - } - - /** - * Constructor with a specified name - * @param s name - */ - public C_earsample(String s) { - super(s, URL_EARSAMPLE); - } - - /** - * Try to log in without authentication - * @throws Exception if an error occurs - */ - public void testTryWithoutAuth() throws Exception { - try { - WebResponse wr = wc.getResponse(url); - fail("earsample is not protected"); - } catch (AuthorizationRequiredException e) { - ; - } - } - - /** - * Try to authenticate with a bad login/password - * @throws Exception if an error occurs - */ - public void testTryWithBadAuth() throws Exception { - try { - wc.setAuthorization("bad", "bad"); - WebResponse wr = wc.getResponse(url); - fail("earsample is not protected"); - } catch (AuthorizationRequiredException e) { - ; - } - } - - /** - * Try to authenticate with a right login/password (jetty) - * @throws Exception if an error occurs - */ - public void testTryWithJettyAuth() throws Exception { - try { - wc.setAuthorization("jetty", "jetty"); - WebResponse wr = wc.getResponse(url); - } catch (AuthorizationRequiredException e) { - fail("earsample don't accept l/p jetty/jetty"); - } - } - - /** - * Try to authenticate with a right login/password (tomcat) - * @throws Exception if an error occurs - */ - public void testTryWithTomcatAuth() throws Exception { - try { - wc.setAuthorization("tomcat", "tomcat"); - WebResponse wr = wc.getResponse(url); - } catch (AuthorizationRequiredException e) { - fail("earsample don't accept l/p tomcat/tomcat"); - } - } - - /** - * Check if the sample is OK. Analyze response - * @throws Exception if an error occurs - */ - public void testIsSampleOk() throws Exception { - try { - wc.setAuthorization("tomcat", "tomcat"); - WebResponse wr = wc.getResponse(url); - String txt = wr.getText(); - - if (txt.indexOf("Sample is OK.") == -1) { - fail("The example was not ok : " + txt); - } - - } catch (AuthorizationRequiredException e) { - fail("Authentication failed"); - } - } - - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/eb/C_eb.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/eb/C_eb.java deleted file mode 100644 index 54fcd48d72b89721ffedc421b248ebab51c412a2..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/eb/C_eb.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.eb; - -import java.lang.reflect.InvocationTargetException; -import junit.framework.*; - -import org.objectweb.jonas.examples.util.JExampleTestCase; -import org.objectweb.jonas.examples.util.JPrintStream; -import org.objectweb.jonas.examples.util.NoExitSecurityManager; - -/** - * Define a class to test the eb example - * Test the client of eb example (Check if the text is "ClientAccount terminated") - * - test case of AccountImplHome - * - test case of AccountExplHome - * @author Florent Benoit - */ -public class C_eb extends JExampleTestCase { - - - /** - * Class of the eb.client - */ - private static final String CLIENT_CLASS = "eb.ClientAccount"; - - /** - * Text to check - */ - private static final String CLIENT_OK_TXT = "ClientAccount terminated" ; - - /** - * Impl EJB1.x - */ - private static final String ACC_IMPL = "AccountImplHome"; - - /** - * Impl EJB2.x - */ - private static final String ACC_IMPL2 = "AccountImpl2Home"; - /** - * Expl - */ - private static final String ACC_EXPL = "AccountExplHome"; - - - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_eb(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_eb.class); - } - - /** - * Setup need for these tests - * eb is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useBeans("eb"); - } - - /** - * Step to do at the end - * unload eb - * @throws Exception if it fails - */ - protected void tearDown() throws Exception { - super.tearDown(); - unUseBeans("eb"); - } - - /** - * Constructor with a specified name - * @param s name - */ - public C_eb(String s) { - super(s); - } - - /** - * Test the return text of the example eb - * by using a specific mode (Impl or Expl) - * @param mode Can be AccountImplHome or AccountExplHome - */ - private void doTestEb(String mode) { - JPrintStream jPrintStream = new JPrintStream(System.out); - System.setOut(jPrintStream); - String txt = null; - try { - // Define a SecurityManager to handle System.exit() case - System.setSecurityManager(new NoExitSecurityManager()); - - // Call Method - callMainMethod(CLIENT_CLASS, "eb" , new String[] {mode}); - - txt = jPrintStream.getStringBuffer().toString(); - } catch (InvocationTargetException ite) { - fail("Fail when invoking the client. It can be due to a System.exit()"); - } catch (Exception e) { - fail("Client was not ok" + e); - } finally { - System.setSecurityManager(new SecurityManager()); - jPrintStream.remove(); - } - - // Check the text - if (txt.indexOf(CLIENT_OK_TXT) == -1) { - fail("The text that the client sent was not " + CLIENT_OK_TXT); - } - } - - - /** - * Try to launch the client of the example eb - * with the case AccountImpl2 - * @throws Exception if an error occurs - */ - public void testClientAccountImpl2() throws Exception { - doTestEb(ACC_IMPL2); - } - /** - * Try to launch the client of the example eb - * with the case AccountImpl - * @throws Exception if an error occurs - */ - public void testClientAccountImpl() throws Exception { - doTestEb(ACC_IMPL); - } - - /** - * Try to launch the client of the example eb - * with the case AccountExpl - * @throws Exception if an error occurs - */ - public void testClientAccountExpl() throws Exception { - doTestEb(ACC_EXPL); - } - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/hibernate/C_hibernate.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/hibernate/C_hibernate.java deleted file mode 100644 index 6999edaca2f010391545e761e15d6cc7908d761b..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/hibernate/C_hibernate.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Guillaume Sauthier - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.hibernate; - -import junit.framework.TestSuite; - -import org.objectweb.jonas.examples.util.JExampleTestCase; - -import com.meterware.httpunit.WebResponse; - -/** - * Define a class to test the Alarm example - * Test authentication, and check the sample is ok - * @author Florent Benoit - */ -public class C_hibernate extends JExampleTestCase { - - /** - * URL of the hibernate page - */ - private static final String URL_HIBERNATE = "/hibernate-sample/testHibernate"; - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_hibernate(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_hibernate.class); - } - - /** - * Setup need for these tests - * earsample is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useWar("hibernate-sample"); - } - - /** - * Constructor with a specified name - * @param s name - */ - public C_hibernate(String s) { - super(s, URL_HIBERNATE); - } - - /** - * Try to log in without authentication - * @throws Exception if an error occurs - */ - public void testAccessHibernatePage() throws Exception { - WebResponse wr = wc.getResponse(url); - String page = wr.getText(); - - // check "Servlet is OK" - if (page.indexOf("Servlet is OK") == -1) { - fail("Missing 'Servlet is OK' ending text. Check on " + this.url); - } - - } - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/j2eemanagement/C_j2eemanagement.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/j2eemanagement/C_j2eemanagement.java deleted file mode 100644 index 3cd2fbfcee88d8db09fd1d4a854d408ec7b82b25..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/j2eemanagement/C_j2eemanagement.java +++ /dev/null @@ -1,109 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2006 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.j2eemanagement; - -import junit.framework.TestSuite; - -import org.objectweb.jonas.examples.util.JExampleTestCase; - -import com.meterware.httpunit.WebResponse; - -/** - * Define a class to test the j2eemanagement example - * Test authentication, and check the sample is ok - * @author Adriana Danes - */ -public class C_j2eemanagement extends JExampleTestCase { - - /** - * URL of the earsample page - */ - private static final String URL_J2EEMANAGEMENT_DOMAIN = "/j2eemanagement/mgmt?domainName=jonas"; - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_j2eemanagement(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_j2eemanagement.class); - } - - /** - * Setup need for these tests - * earsample is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useEar("j2eemanagement"); - } - - /** - * Constructor with a specified name - * @param s name - */ - public C_j2eemanagement(String s) { - // Need to use login/password because the web pages we want to access are secured - super(s, URL_J2EEMANAGEMENT_DOMAIN, "jonas", "jonas"); - } - - /** - * Check if the sample is OK. Analyze response - * @throws Exception if an error occurs - */ - public void testIsSampleOk() throws Exception { - WebResponse wr = wc.getResponse(url); - String txt = wr.getText(); - - if (txt.indexOf("Application is OK") == -1) { - fail("The example was not ok : " + txt); - } - } - - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/lb/C_lb.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/lb/C_lb.java deleted file mode 100644 index 1c850f0ce470819d02ff02fdbcda74de01da88ac..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/lb/C_lb.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.lb; - -import java.lang.reflect.InvocationTargetException; -import junit.framework.*; - -import org.objectweb.jonas.examples.util.JExampleTestCase; -import org.objectweb.jonas.examples.util.JPrintStream; -import org.objectweb.jonas.examples.util.NoExitSecurityManager; - -/** - * Define a class to test the lb example - * Test the client of lb example (Check if the text is "PASS when checking all accounts") - * @author Florent Benoit - */ -public class C_lb extends JExampleTestCase { - - - /** - * Class of the lb.client - */ - private static final String CLIENT_CLASS = "lb.Client"; - - /** - * Text to check - */ - private static final String CLIENTOP_OK_TXT = "PASS when checking all accounts" ; - - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_lb(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_lb.class); - } - - /** - * Setup need for these tests - * lb is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useBeans("lb"); - } - - /** - * Step to do at the end - * unload lb - * @throws Exception if it fails - */ - protected void tearDown() throws Exception { - super.tearDown(); - unUseBeans("lb"); - } - - - /** - * Constructor with a specified name - * @param s name - */ - public C_lb(String s) { - super(s); - } - - - /** - * Try to launch the client of the example lb - * @throws Exception if an error occurs - */ - public void testClient() throws Exception { - JPrintStream jPrintStream = new JPrintStream(System.out); - System.setOut(jPrintStream); - String txt = null; - try { - //Define a SecurityManager to handle System.exit() case - System.setSecurityManager(new NoExitSecurityManager()); - - //Call Method - callMainMethod(CLIENT_CLASS, "lb"); - - txt = jPrintStream.getStringBuffer().toString(); - } catch (InvocationTargetException ite) { - System.out.println("Error = " + ite); - ite.printStackTrace(); - fail("Fail when invoking the client. It can be due to a System.exit()"); - } catch (Exception e) { - fail("Client was not ok" + e); - } finally { - System.setSecurityManager(new SecurityManager()); - jPrintStream.remove(); - } - - // Check the text - if (txt.indexOf(CLIENTOP_OK_TXT) == -1) { - fail("The text that the client sent was not " + CLIENTOP_OK_TXT); - } - - } - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mailsb/C_mailsb.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mailsb/C_mailsb.java deleted file mode 100644 index 130a1c5275ad85c06bc804f426cc77da5abd7b0d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mailsb/C_mailsb.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.mailsb; - -import java.lang.reflect.InvocationTargetException; -import junit.framework.*; - -import org.objectweb.jonas.examples.util.JExampleTestCase; -import org.objectweb.jonas.examples.util.JPrintStream; -import org.objectweb.jonas.examples.util.NoExitSecurityManager; - -/** - * Define a class to test the mailsb example - * Test the client of mailsb example - * Test only MimePartDS as MailSession do some prompts - * (Check if the text is "OK !OK !OK !OK !") - * @author Florent Benoit - */ -public class C_mailsb extends JExampleTestCase { - - - /** - * Class of the mailsb.client - */ - private static final String CLIENT_CLASS = "mailsb.ClientMailer"; - - /** - * Text to check - */ - private static final String CLIENTOP_OK_TXT = "OK !OK !OK !OK !" ; - - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_mailsb(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_mailsb.class); - } - - /** - * Setup need for these tests - * mailsb is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useBeans("mailsb"); - } - - /** - * Step to do at the end - * unload mailsb - * @throws Exception if it fails - */ - protected void tearDown() throws Exception { - super.tearDown(); - unUseBeans("mailsb"); - } - - - /** - * Constructor with a specified name - * @param s name - */ - public C_mailsb(String s) { - super(s); - } - - - /** - * Try to launch the client of the example mailsb - * @throws Exception if an error occurs - */ - public void testClientMimePartDS() throws Exception { - JPrintStream jPrintStream = new JPrintStream(System.out); - System.setOut(jPrintStream); - String txt = null; - try { - //Define a SecurityManager to handle System.exit() case - System.setSecurityManager(new NoExitSecurityManager()); - - //Call Method - callMainMethod(CLIENT_CLASS, "mailsb", new String[] {"MimePartDSMailer", "content of junit test"}); - - txt = jPrintStream.getStringBuffer().toString(); - } catch (InvocationTargetException ite) { - fail("Fail when invoking the client. It can be due to a System.exit()"); - } catch (Exception e) { - fail("Client was not ok" + e); - } finally { - System.setSecurityManager(new SecurityManager()); - jPrintStream.remove(); - } - - // Check the text - if (txt.indexOf(CLIENTOP_OK_TXT) == -1) { - fail("The text that the client sent was not " + CLIENTOP_OK_TXT); - } - - } - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mdb/C_mdb.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mdb/C_mdb.java deleted file mode 100644 index 4d6d9a92a2875b9c508cfef0c29914f87beb1585..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mdb/C_mdb.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id:C_mdb.java 10573 2007-06-08 10:12:46Z coqp $ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.mdb; - -import junit.framework.Test; -import junit.framework.TestSuite; - - -import org.objectweb.jonas.examples.util.JExampleTestCase; - -/** - * Define a class to test all the mdb examples - * Test : - sampleappli - * - samplemdb - * @author Philippe Coq - */ -public class C_mdb extends JExampleTestCase { - - /** - * Constructor with a specified name - * @param name the name - */ - public C_mdb(String name) { - super(name); - } - - /** - * Get a new TestSuite for this class - * It includes earsample, alarm and jonasAdmin - * @return a new TestSuite for this class - */ - public static Test suite() { - TestSuite suite = new TestSuite(); - /**suite.addTest(F_sampleappli.suite());**/ - suite.addTest(F_samplemdb.suite()); - return suite; - } - - /** - * Main method - * @param args the arguments - */ - public static void main (String[] args) { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mdb/F_sampleappli.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mdb/F_sampleappli.java deleted file mode 100644 index 364f2adb88155ea98d6fdac7e8447f655c001a1c..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mdb/F_sampleappli.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.mdb; - -import java.lang.reflect.InvocationTargetException; -import junit.framework.*; - -import org.objectweb.jonas.examples.util.JExampleTestCase; -import org.objectweb.jonas.examples.util.JPrintStream; -import org.objectweb.jonas.examples.util.NoExitSecurityManager; - -/** - * Define a class to test the mdb example - * Test the client of mdb/sampleAppli example - * (Check if the text is "SampleApplicationClient OK" - * @author Florent Benoit - */ -public class F_sampleappli extends JExampleTestCase { - - - /** - * Class of the mdb.client - */ - private static final String CLIENT_CLASS = "sampleappli.SampleAppliClient"; - - /** - * Text to check - */ - private static final String CLIENTOP_OK_TXT1 = "Nb messages sent and received OK"; - - /** - * Second text to check - */ - private static final String CLIENTOP_OK_TXT2 = "SampleApplicationClient OK" ; - - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_sampleappli(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(F_sampleappli.class); - } - - /** - * Setup need for these tests - * sampleappli is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useBeans("sampleappli"); - } - - /** - * Step to do at the end - * unload sampleappli - * @throws Exception if it fails - */ - protected void tearDown() throws Exception { - super.tearDown(); - unUseBeans("sampleappli"); - } - - - /** - * Constructor with a specified name - * @param s name - */ - public F_sampleappli(String s) { - super(s); - } - - - /** - * Try to launch the client of the example mdb.sampleappli - * @throws Exception if an error occurs - */ - public void testClient() throws Exception { - JPrintStream jPrintStream = new JPrintStream(System.out); - System.setOut(jPrintStream); - String txt = null; - try { - //Define a SecurityManager to handle System.exit() case - System.setSecurityManager(new NoExitSecurityManager()); - - //Call Method - callMainMethod(CLIENT_CLASS, "mdb"); - - txt = jPrintStream.getStringBuffer().toString(); - } catch (InvocationTargetException ite) { - System.out.println("Error = " + ite); - ite.printStackTrace(); - fail("Fail when invoking the client. It can be due to a System.exit()"); - } catch (Exception e) { - fail("Client was not ok" + e); - } finally { - System.setSecurityManager(new SecurityManager()); - jPrintStream.remove(); - } - - System.out.println("Sample appli txt = " + txt); - - // Check the text - if (txt.indexOf(CLIENTOP_OK_TXT1) == -1) { - fail("The text that the client sent was not " + CLIENTOP_OK_TXT1); - } - - // Check the second text - if (txt.indexOf(CLIENTOP_OK_TXT2) == -1) { - fail("The text that the client sent was not " + CLIENTOP_OK_TXT2); - } - - - } - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mdb/F_samplemdb.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mdb/F_samplemdb.java deleted file mode 100644 index 5a011057ab176209be8bdfdd559b965ed226be8f..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/mdb/F_samplemdb.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.mdb; - -import java.lang.reflect.InvocationTargetException; -import junit.framework.*; - -import org.objectweb.jonas.examples.util.JExampleTestCase; -import org.objectweb.jonas.examples.util.JPrintStream; -import org.objectweb.jonas.examples.util.NoExitSecurityManager; - -/** - * Define a class to test the mdb example - * Test the client of mdb/sampleAppli example - * (Check if the text is "SampleApplicationClient OK" - * @author Florent Benoit - */ -public class F_samplemdb extends JExampleTestCase { - - - /** - * Class of the mdb.client - */ - private static final String CLIENT_CLASS = "samplemdb.MdbClient"; - - /** - * Text to check - */ - private static final String CLIENTOP_OK_TXT = "MDBsample is Ok"; - - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_samplemdb(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(F_samplemdb.class); - } - - /** - * Setup need for these tests - * samplemdb is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useBeans("samplemdb"); - } - - /** - * Step to do at the end - * unload samplemdb - * @throws Exception if it fails - */ - protected void tearDown() throws Exception { - super.tearDown(); - unUseBeans("samplemdb"); - } - - - /** - * Constructor with a specified name - * @param s name - */ - public F_samplemdb(String s) { - super(s); - } - - - /** - * Try to launch the client of the example mdb - * @throws Exception if an error occurs - */ - public void testClient() throws Exception { - JPrintStream jPrintStream = new JPrintStream(System.out); - System.setOut(jPrintStream); - String txt = null; - try { - //Define a SecurityManager to handle System.exit() case - System.setSecurityManager(new NoExitSecurityManager()); - - //Call Method - callMainMethod(CLIENT_CLASS, "mdb"); - - txt = jPrintStream.getStringBuffer().toString(); - } catch (InvocationTargetException ite) { - System.out.println("Error = " + ite); - ite.printStackTrace(); - fail("Fail when invoking the client. It can be due to a System.exit()"); - } catch (Exception e) { - fail("Client was not ok" + e); - } finally { - System.setSecurityManager(new SecurityManager()); - jPrintStream.remove(); - } - - System.out.println("Sample mdb txt = " + txt); - - // Check the text - if (txt.indexOf(CLIENTOP_OK_TXT) == -1) { - fail("The text that the client sent was not " + CLIENTOP_OK_TXT); - } - - } - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/sampleCluster2/C_sampleCluster2.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/sampleCluster2/C_sampleCluster2.java deleted file mode 100644 index 85b57326cfbbaf6220fb9392dde4bc2c950c9033..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/sampleCluster2/C_sampleCluster2.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - */ - -package org.objectweb.jonas.examples.clients.sampleCluster2; - -import junit.framework.TestSuite; - -import org.objectweb.jonas.examples.util.JExampleTestCase; - -import com.meterware.httpunit.WebResponse; - -/** - * Define a class to test the sampleCluster2 example - * @author Georges Goebel - */ -public class C_sampleCluster2 extends JExampleTestCase { - - /** - * URL of the earsample page - */ - private static final String URL_EARSAMPLE = "/sampleCluster2"; - - /** - * Constructor with a specified name - * @param s name - */ - public C_sampleCluster2(String s) { - super(s, URL_EARSAMPLE); - } - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_sampleCluster2(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_sampleCluster2.class); - } - - /** - * Setup need for these tests sampleCluster2 is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useEar("sampleCluster2"); - } - - /** - * Check if the First Page is OK. Analyze response - * @throws Exception if an error occurs - */ - public void testIsFirstPageOk() throws Exception { - WebResponse wr = wc.getResponse(url); - String txt = wr.getText(); - - if (txt.indexOf("Sample is OK.") == -1) { - fail("The example was not ok : " + txt); - } - } - - /** - * Check if the sessionServlet is OK. Analyze response - * @throws Exception if an error occurs - */ - public void testIsSessionOk() throws Exception { - WebResponse wr = wc.getResponse(url + "/servlet/session"); - String txt = wr.getText(); - - if (txt.indexOf("Sample is OK.") == -1) { - fail("The example was not ok : " + txt); - } - } - - /** - * Check if the checkServlet is OK. Analyze response - * @throws Exception if an error occurs - */ - public void testIsCheckOk() throws Exception { - WebResponse wr = wc.getResponse(url + "/servlet/check"); - String txt = wr.getText(); - - if (txt.indexOf("Sample is OK.") == -1) { - fail("The example was not ok : " + txt); - } - } - - /** - * Check if the releaseServlet is OK. Analyze response - * @throws Exception if an error occurs - */ - public void testIsReleaseOk() throws Exception { - WebResponse wr = wc.getResponse(url + "/servlet/release"); - String txt = wr.getText(); - - if (txt.indexOf("Sample is OK.") == -1) { - fail("The example was not ok : " + txt); - } - } - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/sb/C_sb.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/sb/C_sb.java deleted file mode 100644 index 1c1fa9a4f6c86eab8c767721657b30c82c626426..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/sb/C_sb.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.sb; - -import java.lang.reflect.InvocationTargetException; -import junit.framework.*; - -import org.objectweb.jonas.examples.util.JExampleTestCase; -import org.objectweb.jonas.examples.util.JPrintStream; -import org.objectweb.jonas.examples.util.NoExitSecurityManager; - -/** - * Define a class to test the sb example - * Test the client of sb example (Check if the text is "ClientOp OK. Exiting.") - * @author Florent Benoit - */ -public class C_sb extends JExampleTestCase { - - - /** - * Class of the sb.client - */ - private static final String CLIENT_CLASS = "sb.ClientOp"; - - /** - * Text to check - */ - private static final String CLIENTOP_OK_TXT = "ClientOp OK. Exiting." ; - - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new C_sb(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(C_sb.class); - } - - /** - * Setup need for these tests - * sb is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - useBeans("sb"); - } - - /** - * Step to do at the end - * unload sb - * @throws Exception if it fails - */ - protected void tearDown() throws Exception { - super.tearDown(); - unUseBeans("sb"); - } - - - /** - * Constructor with a specified name - * @param s name - */ - public C_sb(String s) { - super(s); - } - - - /** - * Try to launch the client of the example sb - * @throws Exception if an error occurs - */ - public void testClient() throws Exception { - JPrintStream jPrintStream = new JPrintStream(System.out); - System.setOut(jPrintStream); - String txt = null; - try { - //Define a SecurityManager to handle System.exit() case - System.setSecurityManager(new NoExitSecurityManager()); - - //Call Method - callMainMethod(CLIENT_CLASS, "sb"); - - txt = jPrintStream.getStringBuffer().toString(); - } catch (InvocationTargetException ite) { - fail("Fail when invoking the client. It can be due to a System.exit()"); - } catch (Exception e) { - fail("Client was not ok" + e); - } finally { - System.setSecurityManager(new SecurityManager()); - jPrintStream.remove(); - } - - // Check the text - if (txt.indexOf(CLIENTOP_OK_TXT) == -1) { - fail("The text that the client sent was not " + CLIENTOP_OK_TXT); - } - - } - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/suite/C_WebExamples.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/suite/C_WebExamples.java deleted file mode 100644 index fce70b24d68febfda60800b1d4fab8d5c1f0c0e4..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/suite/C_WebExamples.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.suite; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.examples.clients.alarm.C_alarm; -import org.objectweb.jonas.examples.clients.earsample.C_earsample; -import org.objectweb.jonas.examples.util.JExampleTestCase; - -/** - * Define a class to test all the examples - * Test : - alarm - * - earsample - * @author Florent Benoit - */ -public class C_WebExamples extends JExampleTestCase { - - /** - * Constructor with a specified name - * @param name the name - */ - public C_WebExamples(String name) { - super(name); - } - - /** - * Get a new TestSuite for this class - * It includes earsample, alarm and jonasAdmin - * @return a new TestSuite for this class - */ - public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTest(C_earsample.suite()); - suite.addTest(C_alarm.suite()); - return suite; - } - - /** - * Main method - * @param args the arguments - */ - public static void main (String[] args) { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/suite/C_suite.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/suite/C_suite.java deleted file mode 100644 index 700740966e9f29425688c981d8b325b94a06da98..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/suite/C_suite.java +++ /dev/null @@ -1,89 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id:C_suite.java 10573 2007-06-08 10:12:46Z coqp $ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.suite; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.examples.clients.alarm.C_alarm; -import org.objectweb.jonas.examples.clients.cmp2.C_cmp2; -import org.objectweb.jonas.examples.clients.earsample.C_earsample; -import org.objectweb.jonas.examples.clients.eb.C_eb; -import org.objectweb.jonas.examples.clients.hibernate.C_hibernate; -import org.objectweb.jonas.examples.clients.j2eemanagement.C_j2eemanagement; -import org.objectweb.jonas.examples.clients.lb.C_lb; -import org.objectweb.jonas.examples.clients.mailsb.C_mailsb; -import org.objectweb.jonas.examples.clients.mdb.C_mdb; -import org.objectweb.jonas.examples.clients.sb.C_sb; -import org.objectweb.jonas.examples.clients.webservices.C_webservices; -import org.objectweb.jonas.examples.util.JExampleTestCase; - -/** - * Define a class to test all the examples - * - * @author Florent Benoit - */ -public class C_suite extends JExampleTestCase { - - /** - * Constructor with a specified name - * @param name the name - */ - public C_suite(String name) { - super(name); - } - - /** - * Get a new TestSuite for this class - * It includes earsample, alarm and jonasAdmin - * @return a new TestSuite for this class - */ - public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTest(C_earsample.suite()); - suite.addTest(C_alarm.suite()); - suite.addTest(C_cmp2.suite()); - suite.addTest(C_eb.suite()); - suite.addTest(C_hibernate.suite()); - suite.addTest(C_j2eemanagement.suite()); - suite.addTest(C_lb.suite()); - suite.addTest(C_mailsb.suite()); - suite.addTest(C_sb.suite()); - suite.addTest(C_webservices.suite()); - suite.addTest(C_mdb.suite()); - - - return suite; - } - - /** - * Main method - * @param args the arguments - */ - public static void main (String[] args) { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/webservices/A_WebServicesEndpoint.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/webservices/A_WebServicesEndpoint.java deleted file mode 100644 index d3823ebced8524fb29a13720a017ea352a55a5cb..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/webservices/A_WebServicesEndpoint.java +++ /dev/null @@ -1,182 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.webservices; - -import java.io.File; -import java.io.FileInputStream; -import java.util.Properties; - -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.xml.namespace.QName; - -import com.meterware.httpunit.WebForm; -import com.meterware.httpunit.WebLink; -import com.meterware.httpunit.WebResponse; - -/** - * Define a class to test the webServices examples wsWarExample - * Test WebServices deployment OK and test Call on deployed WebService - * @author Guillaume Sauthier - */ -public abstract class A_WebServicesEndpoint extends A_WebServices { - - /** - * property name => file1 WSDLHandler is mandatory for this test ! - */ - private static final String JPROP_WSDL_LOCATION = "jonas.service.publish.file.directory"; - - public A_WebServicesEndpoint(String s, String urlPrefix) { - super(s, urlPrefix); - } - - public A_WebServicesEndpoint(String s, String urlPrefix, String username, String password) { - super(s, urlPrefix, username, password); - } - - /** - * Check if Axis is Running - * @param idServicesLink indicate where is the link to /services in the homepage - * @param portName the name of the port we want to check - * @throws Exception if an error occurs - */ - public void checkAxisServicesAccessible(int idServicesLink, String context, String portName) throws Exception { - - WebResponse wr = wc.getResponse(url + "index.html"); - WebLink services = wr.getLinks()[idServicesLink]; - - // click the link - WebResponse swr = services.click(); - - // traverse the links and find the interresting one. - boolean found = false; - for (int i = 0; i < swr.getLinks().length; i++) { - String ws_url = swr.getLinks()[i].getURLString(); - if (ws_url.equalsIgnoreCase(url + context + "/" + portName + "?jwsdl")) - found = true; - } - if (!found) - fail("endpoint '" + portName + "' not found in /" + context); - - } - - /** - * Check if WSDL is generated - * @param idWSDLServiceLink indicate where we can find the link - * to WSDL of the port we want to test. (first, second, ...) - * @throws Exception if an error occurs - */ - public void checkAxisWSDL(String path) throws Exception { - - WebResponse wr = wc.getResponse(url + path); - assertEquals("Must be an XML mime type", "text/xml", wr.getContentType()); - - } - - /** - * Check if deployed WebService is running - * @param formPage the filename of the webpage containing the form - * @param endpoint the URL where local service can be found - * @param name the name to set as parameter - * @param pageTitle title of the returned page - * @throws Exception if an error occurs - */ - public void checkDeployedWebService(String formPage, - String endpoint, - String name, - String pageTitle) throws Exception { - - // Get the page containing the form - WebResponse wr = wc.getResponse(url + formPage); - - // get the form named "prepare" - WebForm form = wr.getFormWithName("prepare"); - // set all parameters - form.setParameter("name", name); - // submit - WebResponse wr2 = form.submit(); - - String text = wr2.getText(); - - String valTitle = "" + pageTitle + ""; - String valURL = "Working with URL : " + endpoint + "
    "; - String valHello = "result of sayHello(name) method :Hello " + name + "
    "; - String valQuotes = "result of getCotes() method :12
    "; - - assertTrue("incorrect title", (text.indexOf(valTitle) != -1)); - assertTrue("incorrect URL", (text.indexOf(valURL) != -1)); - assertTrue("incorrect Name", (text.indexOf(valHello) != -1)); - assertTrue("incorrect Cotes", (text.indexOf(valQuotes) != -1)); - - } - - - /** - * Check if WSDL has been published. - * @param wsdlFilename the filename of the WSDL file - * @param tns targetNameSpace of the Definition - * @param serviceName the localpart of the Service QName - * @param portName the name of the WSDL' Port - * @param endpoint the expected URL - * @throws Exception if an error occurs - */ - public void checkWSDLPublication(String wsdlFilename, - String tns, - String serviceName, - String portName, - String endpoint) throws Exception { - - String jonasbase = System.getProperty("jonas.base"); - Properties props = new Properties(); - props.load(new FileInputStream(new File(jonasbase, "conf" + File.separator + "file1.properties"))); - String wsdlLoc = props.getProperty(JPROP_WSDL_LOCATION); - - File wsdl = new File(wsdlLoc, wsdlFilename); - - assertTrue("WSDL is not created", wsdl.exists()); - assertTrue("WSDL is not a file", wsdl.isFile()); - - WSDLFactory f = WSDLFactory.newInstance(); - WSDLReader r = f.newWSDLReader(); - - r.setFeature("javax.wsdl.verbose", true); - r.setFeature("javax.wsdl.importDocuments", false); - - Definition def = r.readWSDL(wsdl.getPath()); - Service s = def.getService(new QName(tns, serviceName)); - Port p = s.getPort(portName); - SOAPAddress sa = (SOAPAddress) p.getExtensibilityElements().get(0); - - assertEquals("URL has not been updated", endpoint, sa.getLocationURI()); - - } - - -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/webservices/C_webservices.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/webservices/C_webservices.java deleted file mode 100644 index c2a0cf7a35ef212f5ec0db838d66215f007e4d8d..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/clients/webservices/C_webservices.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id:C_webservices.java 10573 2007-06-08 10:12:46Z coqp $ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.clients.webservices; - -import junit.framework.Test; -import junit.framework.TestSuite; - - -import org.objectweb.jonas.examples.util.JExampleTestCase; - -/** - * Define a class to test all the webservices examples - * Test : - F_WsAccessTest - * - F_WsEarSample - * - F_WsWarSample - * @author Philippe Coq - */ -public class C_webservices extends JExampleTestCase { - - /** - * Constructor with a specified name - * @param name the name - */ - public C_webservices(String name) { - super(name); - } - - /** - * Get a new TestSuite for this class - * It includes earsample, alarm and jonasAdmin - * @return a new TestSuite for this class - */ - public static Test suite() { - TestSuite suite = new TestSuite(); - // The WsAccessTest is using a SOAP Search WS from Google that have been retired on 07/09/2009 - // http://googlecode.blogspot.com/2009/08/well-earned-retirement-for-soap-search.html - // Commented until a replacement WS has been found - //suite.addTest(F_WsAccessTest.suite()); - suite.addTest(F_WsEarSample.suite()); - /**suite.addTest(F_WsWarSample.suite()); **/ - return suite; - } - - /** - * Main method - * @param args the arguments - */ - public static void main (String[] args) { - junit.textui.TestRunner.run(suite()); - } -} diff --git a/jonas_tests/examples/src/org/objectweb/jonas/examples/util/JExampleTestCase.java b/jonas_tests/examples/src/org/objectweb/jonas/examples/util/JExampleTestCase.java deleted file mode 100644 index c133c9d7e415a04371d9da2608d6e5399a91c479..0000000000000000000000000000000000000000 --- a/jonas_tests/examples/src/org/objectweb/jonas/examples/util/JExampleTestCase.java +++ /dev/null @@ -1,500 +0,0 @@ -/* - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.examples.util; - -import java.io.File; -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Set; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import junit.framework.TestCase; - -import com.meterware.httpunit.WebConversation; - -/** - * Define a class to add useful methods for test the examples - * - Deploy ear, war and beans - * - Retrieve initial context - * @author Florent Benoit - */ -public class JExampleTestCase extends TestCase { - - /** - * Name of the JOnAS server used for tests - */ - private static String jonasName = "jonas"; - - /** - * Initial context used for lookup - */ - private static Context ictx = null; - - /* - * JONAS_BASE - */ - protected static String jb = null; - - /** - * Connection to the MBeanServer - */ - private static MBeanServerConnection cnx = null; - - - /** - * Conversation used for HttpUnit - */ - protected WebConversation wc = null; - - /** - * URL used for the constructor - */ - protected String url = null; - - /** - * Prefix for build URLs - */ - private String prefixUrl = null; - - /** - * Add to the specified url the prefix - * @param url relative URL - * @return absolute path of URL - */ - protected String getAbsoluteUrl (String url) { - return (this.prefixUrl + url); - } - - /** - * Make an absolute path with the filename. - */ - public String absPath(String name, String extension) { - - String ret = ""; - if ( extension.equals(".jar")) { - ret = jb + "/ejbjars/" + name + ".jar"; - } else if ( extension.equals(".war")) { - ret = jb + "/webapps/" + name + ".war"; - } else if (extension.equals(".ear")) { - ret = jb + "/apps/" + name + ".ear"; - } - return ret; - } - private static JMXServiceURL jmxServerUrl = null; - private static String urlSuffix = "service:jmx:"; - private static String registry = null; - private static String defaultRegistry = "rmi://localhost:1099"; - private static String protocol = null; - private static String defaultProtocol = "jrmp"; - - /* - * Get Connection to the MBean server - * Set the static cnx variable - */ - private void getJmxCnx() { - if (cnx == null) { - try { - if (registry == null) { - registry = defaultRegistry; - } - registry = registry + "/"; - int indx = registry.lastIndexOf(":"); - String st = registry.substring(0, indx); - String serverUrl = urlSuffix + st +"/jndi/"+registry; - if (protocol == null) { - protocol = defaultProtocol; - } - String connectorName = protocol.concat("connector_"); - connectorName = connectorName.concat(jonasName); - serverUrl = serverUrl.concat(connectorName); - jmxServerUrl = new JMXServiceURL(serverUrl); - System.out.println("JMX connector: "+serverUrl); - JMXConnector cntor = JMXConnectorFactory.connect(jmxServerUrl, null); - cnx = cntor.getMBeanServerConnection(null); - } catch (IOException e) { - System.err.println("Can't reach server " + jonasName - + " as couldn't create JMXConnector (" + e.getMessage() - + ")"); - System.err.println("Check name, registry and protocol options."); - System.exit(2); - } - } - } - - /* - * ObjectName of y=the J2eeServerMBean - */ - private static ObjectName j2eeserver = null; - - /* - * Get the ObjectName of the J2eeServerMBean - * @return the ObjectName - */ - private ObjectName getJ2eeServer() { - if (j2eeserver == null) { - try { - ObjectName on = ObjectName.getInstance("*:j2eeType=J2EEServer,name=" + jonasName); - Set j2eeservers = cnx.queryNames(on, null); - if (j2eeservers.isEmpty()) { - System.err.println("Can't admin server " + jonasName + ": didn't found J2EEServer MBean"); - System.exit(2); - } - j2eeserver = (ObjectName) j2eeservers.iterator().next(); - } catch (Exception e) { - System.err.println("Can't invoke mbeanServer: " + e); - } - } - return j2eeserver; - } - - /** - * Initialize the port used by tests and the prefix - */ - private void init() { - String port = System.getProperty("http.port"); - if (port == null) { - port = "9000"; - } - - prefixUrl = "http://localhost:" + port; - } - - /** - * Constructor with a specified name - * @param s the name - */ - public JExampleTestCase(String s) { - super(s); - init(); - } - /** - * Constructor with a specified name and url - * @param s the name - * @param url the url which can be used - */ - public JExampleTestCase(String s, String url) { - super(s); - wc = new WebConversation(); - init(); - this.url = getAbsoluteUrl(url); - } - - public JExampleTestCase(String s, String url, String username, String password) { - super(s); - wc = new WebConversation(); - wc.setAuthorization(username, password); - init(); - this.url = getAbsoluteUrl(url); - } - - /** - * Get initialContext - * @return the initialContext - * @throws NamingException if the initial context can't be retrieved - */ - private Context getInitialContext() throws NamingException { - return new InitialContext(); - } - - /** - * Common setUp routine, used for every test. - * @throws Exception if an error occurs - */ - protected void setUp() throws Exception { - try { - // get InitialContext - if (ictx == null) { - ictx = getInitialContext(); - } - jb = System.getProperty("jonas.base"); - registry = System.getProperty("registry"); - protocol = System.getProperty("protocol"); - getJmxCnx(); - - } catch (NamingException e) { - System.err.println("Cannot setup test: " + e); - e.printStackTrace(); - } - } - - - /** - * Load an ear file in the jonas server - * @param fname ear file, without ".ear" extension - * @throws Exception if an error occurs - */ - public void useEar(String fname) throws Exception { - String filename = absPath(fname, ".ear"); - try { - // Load ear in JOnAS if not already loaded. - if (!isEarLoaded(filename)) { - loadEar(filename); - } - - } catch (Exception e) { - throw new Exception("Cannot load Ear : " + e.getMessage()); - } - } - - /** - * Load a war file in the jonas server - * @param filename war file, without ".war" extension - * @throws Exception if an error occurs - */ - public void useWar(String fname) throws Exception { - String filename = absPath(fname, ".war"); - try { - // Load war in JOnAS if not already loaded. - if (!isWarLoaded(filename)) { - loadWar(filename); - } - } catch (Exception e) { - throw new Exception("Cannot load War : " + e.getMessage()); - } - } - - /** - * Load a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void useBeans(String fname) throws Exception { - try { - String filename = absPath(fname, ".jar"); - // Load bean in EJBServer if not already loaded. - if (!isJarLoaded(filename)) { - addBeans(filename); - } - } catch (Exception e) { - throw new Exception("Cannot load Bean : " + e.getMessage()); - } - } - - /* - * isLoaded remote operation - */ - private boolean isLoaded(String filename) { - boolean ret = false; - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - Boolean r = (Boolean) cnx.invoke(getJ2eeServer(), "isDeployed", params, signature); - ret = r.booleanValue(); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - return ret; - } - /** - * isJarLoaded remote operation - * @param filename jar file, with ".jar" extension - */ - private boolean isJarLoaded(String filename) { - boolean ret = false; - try { - return isLoaded(filename); - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - - return ret; - } - - /** - * addBean remote operation - * @param filename jar file, with ".jar" extension - */ - public void addBeans(String filename) { - - try { - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - - - - /** - * unloadBean remote operation - * @param filename jar file, with ".jar" extension - */ - public void unloadBeans(String filename) { - try { - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "undeploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot undeploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot unload bean: " + e); - } - } - - - /** - * isEarLoaded remote operation - * @param filename ear file, with ".ear" extension - */ - private boolean isEarLoaded(String filename) { - boolean ret = false; - try { - return isLoaded(filename); - - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - - return ret; - } - /** - * loadEar remote operation - * @param filename ear file, with ".ear" extension - */ - public void loadEar(String filename) { - try { - - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - - /** - * isWarLoaded remote operation - * @param filename war file, with ".war" extension - */ - private boolean isWarLoaded(String filename) { - boolean ret = false; - try { - return isLoaded(filename); - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - - return ret; - } - - /** - * loadEar remote operation - * @param filename war file, with ".war" extension - */ - public void loadWar(String filename) { - try { - - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - - /** - * Unload a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void unUseBeans(String filename) throws Exception { - try { - - if (isJarLoaded(filename + ".jar")) { - unloadBeans(filename + ".jar"); - } - } catch (Exception e) { - throw new Exception("Cannot unload Bean : " + e.getMessage()); - } - } - - - /** - * Call the main method of a specific class with empty args - * @param classToLoad name of class which contains the main method - * @throws Exception if it fails - */ - protected void callMainMethod(String classToLoad, String ejbname) throws Exception { - callMainMethod(classToLoad, ejbname, new String[]{}); - } - - - /** - * Call the main method of a specific class and the specific args - * @param classToLoad name of class which contains the main method - * @param args args to give to the main method - * @throws Exception if it fails - */ - protected void callMainMethod(String classToLoad, String ejbname , String[] args) throws Exception { - //Build classloader - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - URL[] urls = new URL[4]; - urls[0] = new File(System.getProperty("jonas.root") + File.separator + "examples" + File.separator + "classes").toURL(); - urls[1] = new File("base" + File.separator + "examples" + File.separator + "classes").toURL(); - urls[2] = new File("examples" + File.separator + "base" + File.separator + "examples" + File.separator + "classes").toURL(); - urls[3] = new File(System.getProperty("jonas.base") + File.separator + "ejbjars" + File.separator + ejbname + ".jar").toURL(); - URLClassLoader loader = new URLClassLoader(urls); - Thread.currentThread().setContextClassLoader(loader); - Class clazz = loader.loadClass(classToLoad); - Class[] argList = new Class[] {args.getClass()}; - Method meth = clazz.getMethod("main", argList); - Object appli = meth.invoke(null, new Object[]{args}); - } - - - - - -} diff --git a/jonas_tests/j2eeca/build.xml b/jonas_tests/j2eeca/build.xml deleted file mode 100644 index ee3325ce9355a42fb7f02039791c610798b9c7ec..0000000000000000000000000000000000000000 --- a/jonas_tests/j2eeca/build.xml +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/j2eeca/src/ersatz/resourceadapter/Utility.java b/jonas_tests/j2eeca/src/ersatz/resourceadapter/Utility.java deleted file mode 100644 index adf19af5d3d765273b7d4d042bdb7d2d4114e748..0000000000000000000000000000000000000000 --- a/jonas_tests/j2eeca/src/ersatz/resourceadapter/Utility.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Created on February 12, 2004 - * - * Utility.java uses Sun logging - * - */ - -package ersatz.resourceadapter; - - -import javax.resource.ResourceException; -import javax.resource.spi.ConnectionRequestInfo; -import javax.resource.spi.SecurityException; -import javax.resource.spi.security.PasswordCredential; -import javax.security.auth.Subject; -import java.util.Set; -import java.util.Iterator; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * - * -**/ -public class Utility -{ - private static Logger logger = null; - /** - * Write a JOnAS log record - * - * @param msg display this message in log - * - */ - public static synchronized void log(String msg) { - if (logger == null) { - logger = Log.getLogger("ersatz.resourceadapter"); - } - logger.log(BasicLevel.DEBUG, msg); - } - - - /** Returns the Password credential - * - * @param mcf ManagedConnectionFactory currently being used - * @param subject Subject associated with this call - * @param info ConnectionRequestInfo - * - * @return PasswordCredential for this user - */ - static synchronized PasswordCredential getPasswordCredential - (ManagedConnectionFactoryImpl mcf, Subject subject, - ConnectionRequestInfo info) - throws ResourceException - { - String mName = "Utility.getPasswordCredential"; - if (subject == null) - { - if (info == null) return null; - ConnectionRequestInfoImpl crii = (ConnectionRequestInfoImpl) info; - PasswordCredential pc = - new PasswordCredential(crii.getUserName(), - crii.getPassword().toCharArray()); - pc.setManagedConnectionFactory(mcf); - return pc; - } - Set cred = subject.getPrivateCredentials(PasswordCredential.class); - PasswordCredential pc = null; - for (Iterator iter = cred.iterator(); iter.hasNext();) - { - PasswordCredential tmpPc = (PasswordCredential) iter.next(); - if (mcf.equals(tmpPc.getManagedConnectionFactory())) - { - log(mName+" PasswordCredential found mcf="+mcf); - pc = tmpPc; - break; - } - } - if (pc == null) - { - SecurityException se = new SecurityException("No PasswordCredential found"); - log(mName+" No PasswordCredential found."); - throw se; - } - return pc; - } - - -} diff --git a/jonas_tests/j2eeca/src/fictional/resourceadapter/CommonClient.java b/jonas_tests/j2eeca/src/fictional/resourceadapter/CommonClient.java deleted file mode 100644 index ba9d0f2e7fbf6981b684f1755a9c038feee15363..0000000000000000000000000000000000000000 --- a/jonas_tests/j2eeca/src/fictional/resourceadapter/CommonClient.java +++ /dev/null @@ -1,262 +0,0 @@ -/* - * Created on Jun 12, 2003 - * - * CommonClient.java is used to test the J2EE Connector - * as implemented by JOnAS. This class implements some the Common Client Interface - * (cci) classes. Each cci method simulates actual functionality and returns test - * results to the caller which is a JUnit test program. - * - */ -package fictional.resourceadapter; - -import javax.naming.Reference; -import javax.naming.NamingException; -import javax.resource.ResourceException; -import javax.resource.NotSupportedException; -import javax.resource.spi.ConnectionManager; -import javax.resource.spi.ManagedConnectionFactory; -import javax.resource.spi.ConnectionRequestInfo; -// interfaces implemented in this class -import javax.resource.cci.ConnectionFactory; -import javax.resource.cci.Connection; -import javax.resource.cci.ConnectionSpec; // j2ee 1.5 -import javax.resource.cci.RecordFactory; -import javax.resource.cci.ResourceAdapterMetaData; -import java.io.Serializable; -import javax.resource.Referenceable; -// logger imports -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; -/** - * @author Bob Kruse - * - * used to test the J2EE Connector as implemented by JOnAS. - * - */ -public class CommonClient - implements - ConnectionFactory, - ConnectionSpec, // j2ee 1.5 - ResourceAdapterMetaData, - Referenceable, - Serializable - -{ - Reference reference; - private ConnectionManager cm; - private ManagedConnectionFactory mcf; // used in cm.allocateConnection - private CommonClient cs; // ConnectionSpec - protected boolean managed = true; - private Logger logger = null; - private String userName = ""; - private String passWord = ""; - String cName = ""; - - public CommonClient() { - if (logger == null) { - logger = Log.getLogger("fictional.resourceadapter"); - } - } - // - // ***************** - // ConnectionSpec methods - // ***************** - // - public void setUserName(String u) { - userName=u; - cName = "ConnectionSpec"; - logger.log(BasicLevel.DEBUG, cName+".setUserName="+u); - } - public void setPassword(String p) { - passWord=p; - cName = "ConnectionSpec"; - logger.log(BasicLevel.DEBUG, cName+".setPassword="+p); - } - public String getUserName() { - cName = "ConnectionSpec"; - logger.log(BasicLevel.DEBUG, cName+".getUserName="+userName); - return userName; - } - public String getPassword() { - cName = "ConnectionSpec"; - logger.log(BasicLevel.DEBUG, cName+".getPassword="+passWord); - return passWord; - } - // - // ***************** - // ConnectionFactory methods - // ***************** - // - // Referenced classes of package javax.resource.cci: - // Connection, ConnectionSpec, RecordFactory, ResourceAdapterMetaData - // (below is constructor for ConnectionFactory - // - // ConnectionFactory instance created during lookup() by Application Server - // - public CommonClient(ManagedConnectionFactory mcf, ConnectionManager cm) { - if (logger == null) { - logger = Log.getLogger("fictional.resourceadapter"); - } - this.mcf=mcf; - this.cm=cm; - - } - private String impl(Object obj) { - if (obj instanceof ConnectionFactory) { - return "ConnectionFactory"; - } else if (obj instanceof ConnectionSpec) { - return "ConnectionSpec"; - } else if (obj instanceof ResourceAdapterMetaData) { - return "ResourceAdapterMetaData"; - } else - return "CommonClient. Is this an error"; - - } - // - // Container Managed Sign-on calls getConnection() from the Application Component - // - // Container-managed sign-on when file "connector.xml / secured.jar" contains line below - // - // Container - // - public Connection getConnection() - throws ResourceException - { - cName = "ConnectionFactory"; - logger.log(BasicLevel.DEBUG, cName+".getConnection"+" (Container Managed Sign-on)"); - Connection conn = null; - try { - conn = (Connection)getConnection(null); - return conn; - } catch (ResourceException ex) { - throw ex; - } - } - // - // Component Managed Sign-on calls getConnection(cs) directly from the Application Component - // - // Component-managed sign-on when file "connector.xml / secured.jar" contains line below - // - // Application - // - public Connection getConnection(ConnectionSpec connectionspec) - throws ResourceException - { - cName = "ConnectionFactory"; - JtestResourceAdapter jmcf = (JtestResourceAdapter)mcf; // ManagedConnectionFactory - Connection conn = null; - CommonClient cs; // ConnectionSpec - JtestResourceAdapter jcri=null; // ConnectionRequestInfo - - if (connectionspec==null) { - jmcf.setRes_Auth("Container"); - logger.log(BasicLevel.DEBUG, cName+".getConnection detected res-auth='"+jmcf.getRes_Auth()+"'"); - // TODO what now? anything? - // now pass null to cm.allocateConnection(mcf, null); - } else { - jmcf.setRes_Auth("Application"); - logger.log(BasicLevel.DEBUG, cName+".getConnection detected res-auth='"+jmcf.getRes_Auth()+"'"); - cs = (CommonClient)connectionspec; - // load user and password into ConnectionRequestInfo instance - jcri = new JtestResourceAdapter(); // ConnectionRequestInfo - jcri.setUserName(cs.getUserName()); - jcri.setPassword(cs.getPassword()); - - } - logger.log(BasicLevel.DEBUG, cName+".getConnection calling cm.allocateConnection"); - try { - ConnectionRequestInfo cri = (ConnectionRequestInfo) jcri; - conn = (Connection)cm.allocateConnection(mcf, cri); - if (conn==null) { - logger.log(BasicLevel.DEBUG, cName+". getConnection, cm.allocateConnection" - +" error: Null connection object returned"); - throw new ResourceException("Null connection object returned by allocateConnection"); - } - return conn; - } catch (IllegalStateException is) { - logger.log(BasicLevel.DEBUG, cName+".getConnection IllegalStateException"+is); - throw is; - } catch (ResourceException re) { - logger.log(BasicLevel.DEBUG, cName+".getConnection ResourceException="+re); - throw re; - } - } - - public RecordFactory getRecordFactory() - throws ResourceException - { - cName = "ConnectionFactory"; - logger.log(BasicLevel.DEBUG, cName+".getRecordFactory"); - NotSupportedException nse = new NotSupportedException( - "RecordFactory is not currently supported"); - throw nse; - } - - public ResourceAdapterMetaData getMetaData() - throws ResourceException - { - cName = "ConnectionFactory"; - logger.log(BasicLevel.DEBUG, cName+".getMetaData"); - ResourceAdapterMetaData rd = null; // TODO do something - return rd; - } - public ManagedConnectionFactory getMcf() { - ManagedConnectionFactory MCF = (ManagedConnectionFactory)mcf; - return MCF; - } - // - // ***************** - // Reference - // ***************** - // - /** Required by the referencable attribute - * @param ref Reference object - **/ - public void setReference(javax.naming.Reference ref) - { - this.reference = ref; - } - - /** Required by the referencable attribute - * @return Reference object - **/ - public Reference getReference() - throws NamingException - { - return reference; - } - // - // *********************** - // ResourceAdapterMetaData methods - // *********************** - // - public String getAdapterVersion() { - return "1.0"; - } - public String getAdapterVendorName() { - return "Bull"; - } - public String getAdapterName() { - return "JOnAS Test Resource Adapter"; - } - public String getAdapterShortDescription() { - return "Test JOnAS Application Server compliance to J2EE Java Community Process (JSR112)"; - } - public String getSpecVersion() { - return "J2EE Java Community Process (JSR112)"; - } - public String[] getInteractionSpecsSupported() { - String[]s = {"JSR016","JSR112"}; - return s; - } - public boolean supportsExecuteWithInputAndOutputRecord() { - return true; - } - public boolean supportsExecuteWithInputRecordOnly() { - return true; - } - public boolean supportsLocalTransactionDemarcation() { - return false; - } -} diff --git a/jonas_tests/j2eeca/src/fictional/resourceadapter/ConnectionImpl.java b/jonas_tests/j2eeca/src/fictional/resourceadapter/ConnectionImpl.java deleted file mode 100644 index e08553b54b096033624a6460fbccab5db1a60cb8..0000000000000000000000000000000000000000 --- a/jonas_tests/j2eeca/src/fictional/resourceadapter/ConnectionImpl.java +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Created on Jul 10, 2003 - * - * ConnectionImpl.java is used to test the J2EE Connector - * as implemented by JOnAS. This class implements the Connection Interface - * and ConnectionMetaData Interface (cci) classes. - * - */ -package fictional.resourceadapter; - -import javax.resource.ResourceException; -import javax.resource.NotSupportedException; -import javax.resource.cci.*; -import javax.resource.spi.ManagedConnection; -import javax.resource.spi.ConnectionEvent; -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * @author Bob Kruse - * - * Jtest Resource Adapter - * - * used to test the J2EE Connector as implemented by JOnAS. - * - */ -public class ConnectionImpl - implements Connection, - ConnectionMetaData, - java.io.Serializable -{ - public String product="Fictional EIS"; // see J2eeConnectorTestBeanClient - String version="1.1"; - String UserName="Fictional_User_Name"; // - private ManagedConnection mc; - public LocalTransactionImpl lt; - boolean closed = false; // connection is closed - private Logger logger = null; - String cName = ""; - private boolean autoCommitMode = false; - - // - // ***************** - // Connection methods - // ***************** - // - public ConnectionImpl(Object mc) { // constructor for Connection - if (logger == null) { - logger = Log.getLogger("fictional.resourceadapter"); - } - logger.log(BasicLevel.DEBUG, impl(this)+".constructor"); - this.mc=(ManagedConnection)mc; - } - private String impl(Object obj) { - if (obj instanceof Connection) { - return "ConnectionImpl"; - } else if (obj instanceof ConnectionImpl) { - return "Connection"; - } else if (obj instanceof ConnectionMetaData) { - return "ConnectionMetaData"; - } else - return "ConnectionImpl. Is this an error"; - } - // - // close connection handle - // - public void close() throws ResourceException - { - logger.log(BasicLevel.DEBUG, impl(this) - +".close with ConnectionEvent.CONNECTION_CLOSED=" - +ConnectionEvent.CONNECTION_CLOSED); - closed = true; - - if (mc != null) { - try { - JtestResourceAdapter omc = (JtestResourceAdapter) mc; - omc.sendEvent(ConnectionEvent.CONNECTION_CLOSED, null, this); - mc=null; - logger.log(BasicLevel.DEBUG, impl(this) - +".close sendevent 'CONNECTION_CLOSED'"); - } catch (ResourceException e) { - logger.log(BasicLevel.DEBUG, impl(this)+".close error: unable to close"); - throw e; - } - } else { - logger.log(BasicLevel.DEBUG, impl(this)+".close error: mc=null"); - } - return; - } - // - // close physical connection - // - // The connectionErrorOccurred method indicates that the associated - // ManagedConnection instance is now invalid and unusable. - // mc.sendEvent method makes the call to connectionErrorOccurred - // - public void close(int eType) throws ResourceException - { - logger.log(BasicLevel.DEBUG, impl(this)+".close("+eType+")"); - closed = true; - - if (mc != null) { - try { - JtestResourceAdapter omc = (JtestResourceAdapter) mc; - omc.sendEvent(eType, null, this); - mc=null; - logger.log(BasicLevel.DEBUG, impl(this) - +".close(CONNECTION_ERROR_OCCURRED=" - +ConnectionEvent.CONNECTION_ERROR_OCCURRED+") to " - +"close physical connection"); - } catch (ResourceException e) { - logger.log(BasicLevel.DEBUG, impl(this) - +".close error: unable to close physical connection" - +" with 'CONNECTION_ERROR_OCCURRED'"); - throw e; - } - } else { - logger.log(BasicLevel.DEBUG, impl(this)+".close error: mc=null already"); - } - return; - } - public Interaction createInteraction() throws ResourceException - { - logger.log(BasicLevel.DEBUG, impl(this)+".createInteraction"); - Interaction gi=new JtestInteraction(this, mc); - // TODO Interaction gi = new Interaction(this, this.mc, lw); - return gi; - } - public ConnectionMetaData getMetaData() throws ResourceException - { - logger.log(BasicLevel.DEBUG, impl(this)+".getMetaData"); - ConnectionMetaData eisInfo = (ConnectionMetaData)new ConnectionImpl(mc); - return eisInfo; - } - public LocalTransaction getLocalTransaction() - throws ResourceException - { - try { - JtestResourceAdapter jmc = (JtestResourceAdapter)mc; - lt = (LocalTransactionImpl) jmc.getLocalTransaction(true); - logger.log(BasicLevel.DEBUG, impl(this)+".getLocalTransaction lt="+lt); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, impl(this)+".getLocalTransaction error: " - +e.getMessage()+" <<<<<<<<<<<<"); - } - return (lt); - } - public ResultSetInfo getResultSetInfo() throws ResourceException - { - logger.log(BasicLevel.DEBUG, impl(this)+".getResultSetInfo"); - NotSupportedException nse = new NotSupportedException("getResultSetInfo is not supported"); - throw nse; - } - public void associateConnection(ManagedConnection mc) throws IllegalStateException - { - logger.log(BasicLevel.DEBUG, impl(this)+".associateConnection"); - this.mc=mc; - } - public ManagedConnection getMC() throws ResourceException - { - logger.log(BasicLevel.DEBUG, impl(this)+".getMC mc="+this.mc); - return this.mc; - } - public void setAutoCommit(boolean a) { - autoCommitMode=a; - } - public boolean getAutoCommit() { - return autoCommitMode; - } - // - // ********************** - // ConnectionMetaData methods - // ********************** - // - // The method getUserName returns the user name for an active connection as - // known to the underlying EIS instance. The name corresponds the resource - // principal under whose security context a connection to the EIS - // instance has been established. (page 109 CA 1.0) - // - public String getEISProductName() - throws ResourceException - { - return (product); - } - public String getEISProductVersion() - throws ResourceException - { - return (version); - } - public String getUserName() - throws ResourceException - { - return (UserName); - } -} diff --git a/jonas_tests/j2eeca/src/fictional/resourceadapter/JtestInteraction.java b/jonas_tests/j2eeca/src/fictional/resourceadapter/JtestInteraction.java deleted file mode 100644 index ff3205998a9aa27f074c151683d31059966e8150..0000000000000000000000000000000000000000 --- a/jonas_tests/j2eeca/src/fictional/resourceadapter/JtestInteraction.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Created on Jul 10, 2003 - * - * JtestInteraction.java is used to test the J2EE Connector - * as implemented by JOnAS. This class implements the Interaction and InteractionSpec - * (cci) classes. - * - */ -package fictional.resourceadapter; - -import javax.resource.ResourceException; -import javax.resource.NotSupportedException; -import javax.resource.cci.*; -import javax.resource.spi.*; -// logger imports -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.Logger; -import org.objectweb.util.monolog.api.BasicLevel; - -/** - * @author Bob Kruse - * - * Jtest Resource Adapter - * - * used to test the J2EE Connector as implemented by JOnAS. - * - */ -public class JtestInteraction - implements Interaction, - InteractionSpec, - java.io.Serializable -{ - - private Record output; - private boolean closed = false; - private Connection con; - private ManagedConnection mcon; - private Logger logger = null; - String cName = ""; - - public JtestInteraction(Connection c) { - cName = "Interaction"; - if (logger == null) { - logger = Log.getLogger("fictional.resourceadapter"); - } - logger.log(BasicLevel.DEBUG, cName+".constructor"); - con=c; - } - public JtestInteraction(Connection c, ManagedConnection mc) { - cName = "Interaction"; - if (logger == null) { - logger = Log.getLogger("fictional.resourceadapter"); - } - logger.log(BasicLevel.DEBUG, cName+".constructor"); - con=c; - mcon=mc; - } - private String impl(Object obj) { - if (obj instanceof Interaction) { - return "Interaction"; - } else if (obj instanceof InteractionSpec) { - return "InteractionSpec"; - } else - return "InteractionSpec. Is this an error"; - } - /**************************** - * Interaction methods - ****************************/ - public boolean execute(InteractionSpec ispec, - Record input, - Record output) throws ResourceException - { - cName = "Interaction"; - logger.log(BasicLevel.DEBUG, cName+".execute"); - this.output = input; - return(true); - } - public Record execute(InteractionSpec ispec, - Record input) throws ResourceException - { - cName = "Interaction"; - logger.log(BasicLevel.DEBUG, cName+".execute"); - return (output); - } - public void close() - throws ResourceException - { - cName = "Interaction"; - logger.log(BasicLevel.DEBUG, cName+".close"); - closed=true; - } - public Connection getConnection() - { - cName = "Interaction"; - logger.log(BasicLevel.DEBUG, cName+".getConnection"); - return con; - } - public ResourceWarning getWarnings() - throws ResourceException - { - cName = "Interaction"; - logger.log(BasicLevel.DEBUG, cName+".getWarnings"); - NotSupportedException nse = new NotSupportedException( - "Interaction.getWarnings is not currently supported"); - throw nse; - } - public void clearWarnings() - throws ResourceException - { - cName = "Interaction"; - logger.log(BasicLevel.DEBUG, cName+".clearWarnings"); - NotSupportedException nse = new NotSupportedException( - "Interaction.clearWarnings is not currently supported"); - throw nse; - } - - - /**************************** - * InteractionSpec methods - ****************************/ - // standard properties - private int interactionVerb; - // SYNC_SEND =0 These interactionVerb values are from - // SYNC_SEND_RECEIVE =1 Constant Field Values of J2EE API - // SYNC_RECEIVE =2 - - private String FunctionName; - private int ExecutionTimeout; - private int FetchSize; - private int FetchDirection; - private int MaxFieldSize; - private int ResultSetType; - private int ResultSetConcurrency; - - public JtestInteraction() { - cName = "InteractionSpec"; - if (logger == null) { - logger = Log.getLogger("fictional.resourceadapter"); - } - logger.log(BasicLevel.DEBUG, cName+".constructor"); - interactionVerb = SYNC_SEND_RECEIVE; - FunctionName = ""; - FetchDirection = 0; - ExecutionTimeout = 2000; - FetchSize = 30; - MaxFieldSize = 444; - ResultSetType = 5; - ResultSetConcurrency = 6; - } - public void setFunctionName(String n) { - FunctionName = n; - } - public String getFunctionName() { - return (FunctionName); - } - public void setInteractionVerb(int verb) { - interactionVerb = verb; - } - public int getInteractionVerb() { - return (interactionVerb); - } - public void setExecutionTimeout(int verb) { - ExecutionTimeout = verb; - } - public int getExecutionTimeout() { - return (ExecutionTimeout); - } - - public void setFetchSize (int x) { - FetchSize = x;; - } - public int getFetchSize () { - return (FetchSize); - } - - public void setFetchDirection(int x) { - FetchDirection = x;; - } - public int getFetchDirection() { - return (FetchDirection); - } - - public void setMaxFieldSize(int x) { - MaxFieldSize = x;; - } - public int getMaxFieldSize() { - return (MaxFieldSize); - } - - public void setResultSetType(int x) { - ResultSetType = x; - } - public int getResultSetType() { - return (ResultSetType); - } - - public void setResultSetConcurrency(int x) { - ResultSetConcurrency = x;; - } - public int getResultSetConcurrency() { - return (ResultSetConcurrency); - } -} diff --git a/jonas_tests/j2eeca/src/fictional/resourceadapter/JtestResourceAdapter.java b/jonas_tests/j2eeca/src/fictional/resourceadapter/JtestResourceAdapter.java deleted file mode 100644 index 745ecabe180a1784d2415f682746f2bd4548abd8..0000000000000000000000000000000000000000 --- a/jonas_tests/j2eeca/src/fictional/resourceadapter/JtestResourceAdapter.java +++ /dev/null @@ -1,851 +0,0 @@ -/* - * Created on Jun 11, 2003 - * - * JtestResourceAdapter.java is a Resource Adapter to test the J2EE Connector - * as implemented by JOnAS. This class implements all the connector classes. Each - * connector method simulates actual functionality and returns test results to the - * caller which is a JUnit test program. - */ -package fictional.resourceadapter; - -import java.io.PrintWriter; -import java.io.Serializable; -import java.util.Date; -import java.util.Iterator; -import java.util.Set; -import java.util.Vector; - -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.resource.NotSupportedException; -import javax.resource.Referenceable; -import javax.resource.ResourceException; -import javax.resource.spi.ConnectionEvent; -import javax.resource.spi.ConnectionEventListener; -import javax.resource.spi.ConnectionManager; -import javax.resource.spi.ConnectionRequestInfo; -import javax.resource.spi.LocalTransaction; -import javax.resource.spi.ManagedConnection; -import javax.resource.spi.ManagedConnectionFactory; -import javax.resource.spi.ManagedConnectionMetaData; -import javax.resource.spi.ResourceAllocationException; -import javax.resource.spi.security.GenericCredential; -import javax.resource.spi.security.PasswordCredential; -import javax.security.auth.Subject; -import javax.transaction.xa.XAResource; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * @author Bob Kruse - * - * used to test the J2EE Connector as implemented by JOnAS. - * - */ -public class JtestResourceAdapter - implements ManagedConnectionFactory, - ConnectionRequestInfo, - //LocalTransaction, - ManagedConnection, - ManagedConnectionMetaData, - GenericCredential, - Serializable, Referenceable -{ - Reference reference; - String timeStamp = ""; - private String defaultUserName=""; // used in ManagedConnection, ConnectionRequestInfo - private String defaultPassword=""; // set by "getter" method - private String userName=""; - private String password=""; - private ManagedConnectionFactory mcf; // loaded by ManagedConnectionFactory - public ConnectionManager cm; // loaded by ManagedConnectionFactory - public LocalTransactionImpl loTx=null; - PrintWriter pw; // App Server sets to null by default - private Vector listeners; - private Logger logger = null; - //Managed environment - public boolean managed; // see ConnectionRequestInfo - public String res_auth; // set by ConnectionFactory.getConnection() - // then put into ManagedConnection when created - public String re_authentication_UserName; // see by ConnectionFactory.getConnection() - public String re_authentication_Password; - public XAResource xar = null; - public XAResourceImpl xari = null; - String cName = ""; - // - // constructor for all "implements" in this class - public JtestResourceAdapter() - { - if (logger == null) { - logger = Log.getLogger("fictional.resourceadapter"); - } - timeStamp = Long.toString(System.currentTimeMillis()); // unique for this obj - forceMatchNull=false; - managed = true; - closed = true; // Managed Connection - connDate = null; // Managed Connection - listeners = new Vector(); // used in ManagedConnection - pw = null; - xar = null; // used in ManagedConnection - xari = null; - loTx = null; // used in ManagedConnection - } - - private String impl(Object obj) { - if (obj instanceof ManagedConnectionFactory) { - return "ManagedConnectionFactory"; - } else if (obj instanceof ConnectionRequestInfo) { - return "ConnectionRequestInfo"; - } else if (obj instanceof ManagedConnection) { - return "ManagedConnection"; - } else if (obj instanceof ManagedConnectionMetaData) { - return "ManagedConnectionMetaData"; - } else if (obj instanceof GenericCredential) { - return "GenericCredential"; - } else - return "JtestResourceAdapter. Is this an error"; - - } - // ************************ - // ManagedConnectionFactory methods see 5.5.3 - // ************************ - // Referenced classes of package javax.resource.spi: - // ConnectionManager, ConnectionRequestInfo, ManagedConnection - public Object createConnectionFactory(ConnectionManager connectionmanager) - throws ResourceException - { - cm = connectionmanager; - cName="ManagedConnectionFactory"; - logger.log(BasicLevel.DEBUG, cName+".createConnectionFactory cm="+cm); - Object obj; - obj = new CommonClient(this, connectionmanager); // creates ConnectionFactory - return obj; - } - /** - * - * When the createConnectionFactory method takes no arguments, the resource adapter - * provides a default ConnectionManager instance. This case is used in a non-managed - * application scenario. - * see 5.5.3 - */ - public Object createConnectionFactory() - throws ResourceException - { - cName="ManagedConnectionFactory"; - logger.log(BasicLevel.DEBUG, cName+": error - non-managed detected"); - throw new NotSupportedException( - "A non-managed two-tier application environment is not supported in J2EE testing."); - } - public ManagedConnection createManagedConnection(Subject subject, - ConnectionRequestInfo connectionrequestinfo) - throws ResourceException - { - cName="ManagedConnectionFactory"; - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection subject="+subject - +", cri="+connectionrequestinfo); - mcf = (ManagedConnectionFactory) this; - if (subject!=null) { - // - // The application server user's password to the EIS is carried in Subject - // - try { - PasswordCredential pc = getPasswordCredential(mcf, subject, connectionrequestinfo); - if (pc==null) { - logger.log(BasicLevel.DEBUG, cName - +".createManagedConnection PasswordCredential = null, Subject not null."); - } else { - if (pc.getUserName()==null || pc.getUserName().length()==0) { - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection userName=empty"); - } else { - userName = new String(pc.getUserName()); - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection" - +" PasswordCredential userName="+userName); - password = new String(pc.getPassword()); // pc.password is char[] - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection" - +" PasswordCredential password="+password); - } - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection getPasswordCredential " - +"error: e="+e.toString()); - } - } - - if (connectionrequestinfo != null) { - // - // The client application component user's password is carried in ConnectionRequestInfo - // Use defaults if userName or password is empty - // - JtestResourceAdapter jinfo = (JtestResourceAdapter) connectionrequestinfo; - String s = jinfo.getUserName(); - if (s.length()>0) userName = s; - else - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection" - +" ConnectionRequestInfo userName="+s+". Use default="+userName); - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection" - +" ConnectionRequestInfo userName="+userName); - s = jinfo.getPassword(); - if (s.length()>0) password = s; - else - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection" - +" ConnectionRequestInfo password="+s+". Use default="+password); - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection" - +" ConnectionRequestInfo password="+password); - } - - if (subject==null && connectionrequestinfo==null) { - // - // The default user's password is carried in the ManagedConnectionFactory instance - // - userName=defaultUserName; - password=defaultPassword; - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection default userName="+userName); - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection default password="+password); - } - - Date cDate = new Date(); - try { - // - // Create the ManagedConnection Instance - // - ManagedConnection mc = (ManagedConnection) new JtestResourceAdapter(); - JtestResourceAdapter obj = (JtestResourceAdapter)mc; - obj.setConnDate(cDate); - obj.setMcf(mcf); - obj.setPassword(password); - obj.setUserName(userName); - obj.setRes_Auth(res_auth); - obj.setLogWriter(pw); - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection mc="+mc - +" with connDate="+cDate); - return mc; - } catch (Exception ex) { - logger.log(BasicLevel.DEBUG, cName+".createManagedConnection : error - Exception ex=" - +ex.getMessage()); - throw new ResourceAllocationException(ex.getMessage()); - } - } - boolean forceMatchNull; - public void setMatchNull(boolean truefalse) { - forceMatchNull=truefalse; - } - public ManagedConnection matchManagedConnections(Set connectionSet, - Subject subject, - ConnectionRequestInfo connectionrequestinfo) - throws ResourceException - { - cName="ManagedConnectionFactory"; - logger.log(BasicLevel.DEBUG, cName+".matchManagedConnections"); - ManagedConnection mc = null; - if (forceMatchNull) { - logger.log(BasicLevel.DEBUG, cName+".matchManagedConnections force new connection"); - return mc; // forces new connection - } - JtestResourceAdapter wmc = null; - Iterator it = connectionSet.iterator(); - int cnt=0; - while (it.hasNext()) { - Object obj = it.next(); - logger.log(BasicLevel.DEBUG, cName+".matchManagedConnections " - +"find next ManagedConnection in Set. connectionSet cnt="+ (++cnt)); - if (obj instanceof ManagedConnection) { - // see if ManagedConnection is available - // i.e., no connection handle exists for mc instance - // i.e., the connection is closed - // TODO choose one of the above - wmc = (JtestResourceAdapter) obj; - if (wmc.getCHandle()==null || wmc.isClosed()) { - mc=(ManagedConnection)wmc; - logger.log(BasicLevel.DEBUG, cName+".matchManagedConnections " - +"connection handle == null. connectionSet cnt="+cnt); - } else { - // error: connection should not exist J2ee 1.0 pg. 32 - String s = "connection handle should not exist"; - logger.log(BasicLevel.DEBUG, cName+".matchManagedConnections " - +"error: "+s+". connectionSet cnt="+cnt); - } - } - } - if (mc==null) - logger.log(BasicLevel.DEBUG, cName+".matchManagedConnections mc=null connectionSet cnt="+cnt); - else - logger.log(BasicLevel.DEBUG, cName+".matchManagedConnections with connDate=" - +wmc.getConnDate()); - return mc; - } - // - // The setLogWriter and getLogWriter are used in ManagedConnectionFactory - // and ManagedConnection - // the Application Server calls ManagedConnection.setLogWriter(pw) - // - public void setLogWriter(PrintWriter printwriter) - throws ResourceException - { - if (printwriter!=null) pw = printwriter; - } - - public PrintWriter getLogWriter() - throws ResourceException - { - return pw; - } - // - // config-property processing "setter" properties - // - String ServerName=""; - String PortNumber=""; - String protocol=""; - /** Set the JOnAS config-property.. Default value is "". - * - * @param c1 String of config-property. - * for testng RA. - **/ - public void setServerName(String c1) - { - ServerName = c1; - //logger.log(BasicLevel.DEBUG, cName+".setServerName="+ServerName); - } - public String getServerName() { - return ServerName; - } - public void setPortNumber(String s) - { - PortNumber=s; - //logger.log(BasicLevel.DEBUG, cName+".setPortNumber="+PortNumber); - } - public void setDUserName(String s) - { - defaultUserName=s; - //logger.log(BasicLevel.DEBUG, cName+".setDUserName="+defaultUserName); - } - public void setDPassword(String s) - { - defaultPassword=s; - //logger.log(BasicLevel.DEBUG, cName+".setDPassword="+defaultPassword); - } - public void setProtocol(String s) - { - protocol=s; - //logger.log(BasicLevel.DEBUG, cName+".setProtocol="+protocol); - } - public String getProtocol() - { - return protocol; - } - public ConnectionManager getCM() - { - return cm; - } - public String getRes_Auth() { - return res_auth; - } - public void setRes_Auth(String r) { - res_auth=r; - } - //************************ - // ConnectionRequestInfo - //************************ - // module to add additional connection properties than - // the ones configured for the ConnectionFactory. This - // class is passed to the App Server and will be used - // on matchManagedConnections or createConnection - // methods by the App Server. - // - String Id=""; // used in hashcode() for ConnectionRequestInfo - // - public void setUserName(String u) { - userName=u; - if (cName.length() == 0) cName=impl(this); - logger.log(BasicLevel.DEBUG, cName+".setUserName="+u); - } - public void setPassword(String p) { - password=p; - if (cName.length() == 0) cName=impl(this); - logger.log(BasicLevel.DEBUG, cName+".setPassword="+p); - } - public String getUserName() { - if (cName.length() == 0) cName=impl(this); - logger.log(BasicLevel.DEBUG, cName+".getUserName="+userName); - return userName; - } - public String getPassword() { - if (cName.length() == 0) cName=impl(this); - logger.log(BasicLevel.DEBUG, cName+".getPassword="+password); - return password; - } - private void setId() - { - if (Id == null || Id.length() == 0) - Id=timeStamp; - - } - // - // hashCode and equals method used in ConnectionRequestInfo, - // ManagedConnectionFactory - // and GenericCredential - public int hashCode() - { - int hash = 1; - setId(); - hash = Id.hashCode(); - return hash; - } - public boolean equals(Object obj) - { - boolean match = false; - if (obj==null) { - return match; - } - JtestResourceAdapter other = (JtestResourceAdapter)obj; - if (this.timeStamp.equals(other.getTimeStamp())) match = true; - return match; - } - - // ***************** - // GenericCredential methods - // ***************** - // - String gcID =""; // used in hashcode() for GenericCredential - public String getName() - { - cName="GenericCredential"; - logger.log(BasicLevel.DEBUG, cName+".getName"); - return ""; - } - - public String getMechType() - { - cName="GenericCredential"; - logger.log(BasicLevel.DEBUG, cName+".getMechType"); - return ""; - } - - public byte[] getCredentialData() - throws SecurityException - { - cName="GenericCredential"; - logger.log(BasicLevel.DEBUG, cName+".getCredentialData"); - byte[] x = {0,0}; - return x; - } - - // ***************** - // ManagedConnection methods - // ***************** - // - // Referenced classes of package javax.resource.spi: - // ConnectionRequestInfo, ConnectionEventListener, LocalTransaction, - // ManagedConnectionMetaData - // - // NOTE: Subject is instantiated by Application Server - // - boolean closed; - public ConnectionImpl cHandle; // ManagedConnection mapped 1:1 to a physical connection - private boolean destroyed; //set when destroyed - private Date connDate; //save connection date/time for a ManagedConnection - public boolean inXATrans; - public boolean inLocalTrans; - public boolean sendEvent; - - public int cntListeners() { - cName="ManagedConnection"; - Vector lst = (Vector) listeners.clone(); - int len = lst.size(); - logger.log(BasicLevel.DEBUG, cName+".cntListeners counted="+len); - return len; - } - public ConnectionImpl getCHandle() { - return cHandle; - } - public boolean isClosed() { - return closed; - } - - public Object getConnection(Subject subject, ConnectionRequestInfo connectionrequestinfo) - throws ResourceException - { - cName="ManagedConnection"; - logger.log(BasicLevel.DEBUG, cName+".getConnection *******************"); - if (subject!=null) { - // - // for this code to execute, the following will be present in ra.xml - // true - // - logger.log(BasicLevel.DEBUG, cName+".getConnection via PasswordCredential"); - logger.log(BasicLevel.DEBUG, "true"); - try { - PasswordCredential pc = getPasswordCredential(mcf, subject, connectionrequestinfo); - if (pc==null) { - logger.log(BasicLevel.DEBUG, cName+".getConnection PasswordCredential = null"); - } else { - if (pc.getUserName()==null || pc.getUserName().length()==0) { - logger.log(BasicLevel.DEBUG, cName+".getConnection userName=empty"); - } else { - String re_authentication_UserName = new String(pc.getUserName()); - String re_authentication_Password = new String(pc.getPassword()); - logger.log(BasicLevel.DEBUG, cName+".getConnection" - +" re-authentication userName="+re_authentication_UserName); - logger.log(BasicLevel.DEBUG, cName+".getConnection" - +" compare to existing userName="+userName); - logger.log(BasicLevel.DEBUG, cName+".getConnection" - +" re-authentication password="+re_authentication_Password); - logger.log(BasicLevel.DEBUG, cName+".getConnection" - +" compare to existing password="+password); - } - } - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".getConnection getPasswordCredential error: e=" - +e.toString()); - } - } - // Code for reauthentication-support when Subject==null and ConnectionRequestInfo - // contains different password and username - // - if (connectionrequestinfo!=null) { - logger.log(BasicLevel.DEBUG, impl(this)+".getConnection via ConnectionRequestInfo"); - logger.log(BasicLevel.DEBUG, "true"); - JtestResourceAdapter jcri = (JtestResourceAdapter) connectionrequestinfo; - String re_authentication_UserName = new String(jcri.getUserName()); - String re_authentication_Password = new String(jcri.getPassword()); - logger.log(BasicLevel.DEBUG, - " re-authentication userName="+re_authentication_UserName+ - " compare to existing userName="+userName); - logger.log(BasicLevel.DEBUG, - " re-authentication password="+re_authentication_Password+ - " compare to existing password="+password); - } - Object obj = new ConnectionImpl(this); - cHandle = (ConnectionImpl)obj; - closed=false; - destroyed=false; - return obj; - } - public void destroy() - throws ResourceException - { - cName="ManagedConnection"; - logger.log(BasicLevel.DEBUG, cName+".destroy"); - // the physical connection is closed - destroyed = true; - closed = true; - cHandle=null; - } - - public void cleanup() - throws ResourceException - { - cName="ManagedConnection"; - // the physical connection stays open - // but all connection handles invalidated - logger.log(BasicLevel.DEBUG, cName+".cleanup"); - cHandle=null; - closed=true; - - } - - public void associateConnection(Object obj) - throws ResourceException - { - cName="ManagedConnection"; - logger.log(BasicLevel.DEBUG, cName+".associateConnection"); - if (obj instanceof ConnectionImpl) { - ConnectionImpl conn = (ConnectionImpl) obj; - conn.associateConnection(this); // TODO may need more arg to associate - } else { - logger.log(BasicLevel.DEBUG, cName+".associateConnection "+ - "error: obj not instanceof ConnectionImpl"); - } - } - - public void addConnectionEventListener(ConnectionEventListener listener) - { - cName="ManagedConnection"; - listeners.addElement(listener); - logger.log(BasicLevel.DEBUG, cName+".addConnectionEventListener listener=" - +listener); - } - - public void removeConnectionEventListener(ConnectionEventListener listener) - { - cName="ManagedConnection"; - Vector lst = (Vector) listeners.clone(); - int len = lst.size(); - logger.log(BasicLevel.DEBUG, cName+".removeConnectionEventListener " - +"Number of listeners="+len); - try { - listeners.removeElement(listener); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".removeConnectionEventListener error: " - +"unable to remove listener"); - } - lst = (Vector) listeners.clone(); - len = lst.size(); - logger.log(BasicLevel.DEBUG, cName+".removeConnectionEventListener listener=" - +listener+" was removed. Number listeners left="+len); - } - - public XAResource getXAResource() - throws ResourceException - { - cName="ManagedConnection"; - if (xar==null) - xar = (XAResource)new XAResourceImpl(this); - logger.log(BasicLevel.DEBUG, cName+".getXAResource xar="+xar); - return xar; - } - public void resetXar() { - // dissociate XAResource Xid from this ManagedConnection - xar=null; - xari=null; - } - public XAResourceImpl getCurrentXar() - throws ResourceException - { - xari=(XAResourceImpl)xar; - return xari; - } - - public javax.resource.cci.LocalTransaction getLocalTransaction(boolean sendEvent) - throws ResourceException - { - cName="ManagedConnection"; - LocalTransactionImpl lt = null; - logger.log(BasicLevel.DEBUG, cName+".getLocalTransaction(sendEvent)"); - this.sendEvent=sendEvent; - try { - lt = (LocalTransactionImpl) getLocalTransaction(); - logger.log(BasicLevel.DEBUG, cName+".getLocalTransaction(sendEvent) lt="+lt); - } catch (Exception e) { - logger.log(BasicLevel.DEBUG, cName+".getLocalTransaction(sendEvent) " - +"error: "+e.getMessage()); - } - return (lt); - } - - public LocalTransaction getLocalTransaction() - throws ResourceException - { - cName="ManagedConnection"; - logger.log(BasicLevel.DEBUG, cName+".getLocalTransaction"); - if (loTx==null) { - loTx = new LocalTransactionImpl(this, sendEvent); - logger.log(BasicLevel.DEBUG, cName+".getLocalTransaction new loTx="+loTx); - return loTx; - } else { - logger.log(BasicLevel.DEBUG, cName+".getLocalTransaction old loTx="+loTx); - loTx.setSendEvent(sendEvent); - return loTx; - } - } - - public ManagedConnectionMetaData getMetaData() - throws ResourceException - { - cName="ManagedConnection"; - logger.log(BasicLevel.DEBUG, cName+".getMetaData"); - return (ManagedConnectionMetaData) new JtestResourceAdapter(); - } - /** Send the specified event to all the EventListeners that have - * registered with this ManagedConnection instance. - * - * @param int Event type to send - * @param Exception if one is associated with this event - * @param ch Connection handle associated with this event - * @throws ResourceException generic exception if operation fails - * @throws IllegalArgumentException if an invalid event is specified - **/ - public void sendEvent(int eType, Exception ex, Object ch) throws ResourceException - { - cName="ManagedConnection"; - Vector lst = (Vector) listeners.clone(); - ConnectionEvent ce = null; - if (ex==null) { - ce = new ConnectionEvent(this, eType); - } - else - ce = new ConnectionEvent(this, eType, ex); - - if (ch != null) - ce.setConnectionHandle(ch); - else - logger.log(BasicLevel.DEBUG, cName+".sendEvent ch==null"); - - int len = lst.size(); - for (int i=0; iRESET) { - xidState=COMMITTED; - logger.log(BasicLevel.DEBUG, impl(this)+".commit From State="+curState+ - " to State="+xidState+" xid="+xid+" onePhase="+onePhase); - } - else { - logger.log(BasicLevel.DEBUG, impl(this)+".commit error: State="+xidState - +" should be="+STARTED+"or more. xid="+xid+" onePhase="+onePhase); - } - } - public void end(Xid xid, int flags) throws XAException - { - int curState=xidState; - xidState=ENDED; - JtestResourceAdapter jmc = (JtestResourceAdapter) mc; - jmc.resetXar(); - logger.log(BasicLevel.DEBUG, impl(this)+".end From State="+curState+ - " to State="+xidState+" for xid="+xid+" flags="+flags); - } - public void forget(Xid xid) throws XAException - { - logger.log(BasicLevel.DEBUG, impl(this)+".forget State="+xidState); - xidState=FORGOT; - } - public int prepare(Xid xid) throws XAException - { - logger.log(BasicLevel.DEBUG, impl(this)+".prepare State="+xidState); - xidState=PREPARED; - //return 1; - return XA_OK; - } - /** - * Obtain a list of prepared transaction branches from a resource manager. - */ - public Xid[] recover(int flag) throws XAException - { - recoverFlag=flag; - logger.log(BasicLevel.DEBUG, impl(this)+".recover State="+xidState); - return xidArray; - } - public void rollback(Xid xid) throws XAException - { - int curState=xidState; - if (xidState >= STARTED) { - xidState=ROLLEDBACK; - logger.log(BasicLevel.DEBUG, impl(this)+".rollback From State="+curState+ - " to State="+xidState+" xid="+xid); - } - else { - logger.log(BasicLevel.DEBUG, impl(this)+".rollback error: State="+xidState - +" should be="+STARTED+"or more. xid="+xid); - } - } - public void start(Xid xid, int flags) throws XAException - { - currentXid=xid; - xFlags=flags; - int curState=xidState; - if (xidState==RESET) { - xidState=STARTED; - logger.log(BasicLevel.DEBUG, impl(this)+".start From State="+curState+ - " to State="+xidState+" xid="+xid+" flags="+flags); - } - else { - logger.log(BasicLevel.DEBUG, impl(this)+".start error: State="+xidState - +" should be="+RESET+" xid="+xid+" flags="+flags); - } - } - public int getTransactionTimeout() throws XAException - { - logger.log(BasicLevel.DEBUG, impl(this)+".getTransactionTimeout timeout="+timeout); - return timeout; - } - public boolean setTransactionTimeout(int seconds) throws XAException - { - timeout=seconds; - logger.log(BasicLevel.DEBUG, impl(this)+".setTransactionTimeout seconds="+seconds); - return true; - } - /** - * Determine if the resource manager instance represented by the target object is the - * same as the resource manager instance represented by the parameter xares - */ - public boolean isSameRM(XAResource xares) throws XAException - { - boolean a = true; - logger.log(BasicLevel.DEBUG, impl(this)+".isSameRM xares="+xares+" return="+a); - return a; - } -} diff --git a/jonas_tests/jaxws/jaxws-felix/pom.xml b/jonas_tests/jaxws/jaxws-felix/pom.xml deleted file mode 100644 index 0f3095754ea1dd571bb10d0c0056cb1ed76b4f49..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-felix/pom.xml +++ /dev/null @@ -1,519 +0,0 @@ - - - - - org.ow2.jonas - jonas-modules - 5.1.0-RC3-SNAPSHOT - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests - felix - pom - JOnAS :: Tests :: JAXWS :: Felix - Tests of JOnAS JAXWS - - - - - 1.0.2 - - - 5.1.0-RC1 - 0.0.4 - 1.1.0-RC2-SNAPSHOT - 2.1.12 - 3.0.5 - 1.0.1 - 2.1.3 - 2.1.3 - 1.1.2 - 2.9.3-patch - 3.2.2 - 1.7.1 - 1.6.3 - 1.5.4 - 1.6.1 - 1.6 - 5.2.1 - 2.1.4 - - - 2.2.3-jonas-patch-20071018 - 1.3 - - - 1.0.15 - - - 1.0.16 - - - 6.1.5 - 6.0.18 - - - 1.2.0 - 1.2.0 - - 1.4.1 - 1.0.2 - 0.9.0-incubator-2007.12.14 - 1.2.1 - 1.0.10 - 1.1.0-2008.07.10 - - 1.2.0 - - 2.0.9 - - 1.3 - 1.3 - - - 2.0-alpha-1 - - - 1.2_08 - - - 2.0.9 - - - 1.0rc1 - 2.0rc5 - - - - - - org.ow2.easybeans.osgi - easybeans-osgi-itests-base - ${easybeans.version} - tests - test - - - - org.testng - testng - 5.8 - jdk15 - - - - org.ow2.easybeans.osgi - easybeans-client-fix - ${easybeans.version} - test - - - org.ow2.easybeans.osgi - easybeans-client-fix - ${easybeans.version} - test - - - org.ow2.jonas.ws.jaxws.itests - tests - ${project.version} - test - - - com.sun.xml.messaging.saaj - saaj-impl - 1.3.2 - - - - - - - ow2 - OW2 repository - http://maven.ow2.org/maven2 - - true - - - false - - - - ow2-snapshot - OW2 repository - http://maven.ow2.org/maven2-snapshot - - true - - - false - - - - - - - elca-services - http://el4.elca-services.ch/el4j/maven2repository - - true - - - false - - - - - - - - install - - - - - - maven-dependency-plugin - - - unpack-assembly - package - - unpack - - - - - - org.ow2.jonas.assemblies.profiles - jonas-full - ${project.version} - bin - zip - - - - ${project.build.directory} - - true - true - - - - - - - - maven-antrun-plugin - - - package - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - - - - - org.ow2.util.maven - maven-osgi-plugin-launcher-core - - felix - - - ${basedir}/src/main/config/config.properties - - - ${basedir}/src/main/config/jonas-autodeploy-bundles.properties - - - - jonas.base - ${basedir}/target/jonas_base - - - jonas.root - ${basedir}/target/jonas-full-${project.version} - - - java.security.auth.login.config - ${basedir}/target/jonas-full-${project.version}/conf/jaas.config - - - m2.repository - ${settings.localRepository} - - - java.naming.factory.initial - - org.ow2.carol.jndi.spi.MultiOrbInitialContextFactory - - - - java.security.policy - ${basedir}/target/jonas-full-${project.version}/conf/java.policy - - - java.security.auth.login.config - ${basedir}/target/jonas-full-${project.version}/conf/jaas.config - - - - java.endorsed.dirs - ${basedir}/target/jonas-full-${project.version}/lib/endorsed/ - - - ConfigHome - ${basedir}/target/jonas_base/conf/ - - - - - - javax.security.jacc.PolicyConfigurationFactory.provider - - - org.ow2.jonas.lib.security.jacc.JPolicyConfigurationFactory - - - - monolog.wrappers - - mx4j.log.CommonsLogger,mx4j.log.Logger,java.util.logging.Logger,org.ow2.util.log.JDKLogger, - org.apache.juli.logging.DirectJDKLog,org.ow2.carol.util.configuration.TraceCarol - - - - java.awt.headless - true - - - ipojo.log.level - ERROR - - - - - bootstrap.kill.timeout - 420 - - - - - true - - - - ${itestsdebug} - 8000 - - - - 30 - - - 10 - - - - - - ${basedir}/target/jonas_base/conf/ - - - - - - - - start-framework - pre-integration-test - - start - - - - - stop-framework - post-integration-test - - stop - - - - - - org.ow2.util.maven - maven-osgi-plugin-launcher-framework-felix - ${ow2-util-plugin.version} - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${basedir}/target - - - ${basedir}/src/main/config/testng.xml - - - - - rmi.port - 19099 - - - jonas.root - ${basedir}/target/jonas-full-${project.version}/ - - - jonas.base - ${basedir}/target/jonas_base/ - - - - - ${basedir}/target/jonas-full-${project.version}/lib/client.jar - - - - - - testing-JOnAS-Full - integration-test - - test - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-felix/src/main/config/config.properties b/jonas_tests/jaxws/jaxws-felix/src/main/config/config.properties deleted file mode 100644 index 66ce492366252e3af1bb421a913e1adae44988e9..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-felix/src/main/config/config.properties +++ /dev/null @@ -1,183 +0,0 @@ -# =================================================================== # -# Felix Configuration file (for easybeans only) # -# =================================================================== # - -# -# Framework config properties. -# -org.osgi.framework.bootdelegation=com.sun.corba.*,\ - com.sun.org.apache.xalan.internal.*,\ - com.sun.org.apache.xerces.internal.*,\ - com.sun.org.apache.xml.internal.*,\ - com.sun.org.apache.xpath.internal.* - -# Packages exported by the underlying JVM (and System bundle) -org.osgi.framework.system.packages org.osgi.framework; version=1.4.0, \ - org.osgi.service.packageadmin; version=1.2.0, \ - org.osgi.service.startlevel; version=1.1.0, \ - org.osgi.service.url; version=1.0.0, \ - org.osgi.util.tracker; version=1.3.3, \ - javax.accessibility; \ - javax.activity; \ - javax.imageio; \ - javax.crypto;\ - javax.crypto.spec;\ - javax.crypto.interfaces;\ - javax.imageio.event; \ - javax.imageio.metadata; \ - javax.imageio.plugins.bmp; \ - javax.imageio.plugins.jpeg; \ - javax.imageio.spi; \ - javax.imageio.stream; \ - javax.management; \ - javax.management.loading; \ - javax.management.modelmbean; \ - javax.management.monitor; \ - javax.management.openmbean; \ - javax.management.relation; \ - javax.management.remote; \ - javax.management.remote.rmi; \ - javax.management.timer; \ - javax.naming; \ - javax.naming.directory; \ - javax.naming.event; \ - javax.naming.ldap; \ - javax.naming.spi; \ - javax.net; \ - javax.net.ssl; \ - javax.print; \ - javax.print.attribute; \ - javax.print.attribute.standard; \ - javax.print.event; \ - javax.rmi; \ - javax.rmi.CORBA; \ - javax.rmi.ssl; \ - javax.security.auth; \ - javax.security.auth.callback; \ - javax.security.auth.kerberos; \ - javax.security.auth.login; \ - javax.security.auth.spi; \ - javax.security.auth.x500; \ - javax.security.cert; \ - javax.security.sasl; \ - javax.sound.midi; \ - javax.sound.midi.spi; \ - javax.sound.sampled; \ - javax.sound.sampled.spi; \ - javax.sql; \ - javax.sql.rowset; \ - javax.sql.rowset.serial; \ - javax.sql.rowset.spi; \ - javax.swing; \ - javax.swing.border; \ - javax.swing.colorchooser; \ - javax.swing.event; \ - javax.swing.filechooser; \ - javax.swing.plaf; \ - javax.swing.plaf.basic; \ - javax.swing.plaf.metal; \ - javax.swing.plaf.multi; \ - javax.swing.plaf.synth; \ - javax.swing.table; \ - javax.swing.text; \ - javax.swing.text.html; \ - javax.swing.text.html.parser; \ - javax.swing.text.rtf; \ - javax.swing.tree; \ - javax.swing.undo; \ - javax.xml; \ - javax.xml.datatype; \ - javax.xml.namespace; \ - javax.xml.parsers; \ - javax.xml.transform; \ - javax.xml.transform.dom; \ - javax.xml.transform.sax; \ - javax.xml.transform.stream; \ - javax.xml.validation; \ - javax.xml.xpath; \ - org.ietf.jgss; \ - org.apache.xpath; \ - org.apache.xpath.compiler; \ - org.apache.xpath.functions; \ - org.apache.xpath.objects; \ - org.apache.xml.utils; \ - org.jacorb.orb.etf; \ - org.jacorb.orb.iiop; \ - org.jacorb.orb.portableInterceptor; \ - org.jacorb.orb.rmi; \ - org.jacorb.poa; \ - org.omg.CORBA; \ - org.omg.CORBA_2_3; \ - org.omg.CORBA_2_3.portable; \ - org.omg.CORBA.DynAnyPackage; \ - org.omg.CORBA.ORBPackage; \ - org.omg.CORBA.portable; \ - org.omg.CORBA.TypeCodePackage; \ - org.omg.CosNaming; \ - org.omg.CosNaming.NamingContextExtPackage; \ - org.omg.CosNaming.NamingContextPackage; \ - org.omg.CosTransactions; \ - org.omg.CSI; \ - org.omg.CSIIOP; \ - org.omg.Dynamic; \ - org.omg.DynamicAny; \ - org.omg.DynamicAny.DynAnyFactoryPackage; \ - org.omg.DynamicAny.DynAnyPackage; \ - org.omg.ETF; \ - org.omg.GSSUP; \ - org.omg.IOP; \ - org.omg.IOP.CodecFactoryPackage; \ - org.omg.IOP.CodecPackage; \ - org.omg.Messaging; \ - org.omg.PortableInterceptor; \ - org.omg.PortableInterceptor.ORBInitInfoPackage; \ - org.omg.PortableServer; \ - org.omg.PortableServer.CurrentPackage; \ - org.omg.PortableServer.POAManagerPackage; \ - org.omg.PortableServer.POAPackage; \ - org.omg.PortableServer.portable; \ - org.omg.PortableServer.ServantLocatorPackage; \ - org.omg.SendingContext; \ - org.omg.SSLIOP; \ - org.omg.stub.java.rmi; \ - org.omg.stub.javax.management.remote.rmi; \ - org.w3c.dom; \ - org.w3c.dom.bootstrap; \ - org.w3c.dom.css; \ - org.w3c.dom.events; \ - org.w3c.dom.html; \ - org.w3c.dom.ls; \ - org.w3c.dom.ranges; \ - org.w3c.dom.stylesheets; \ - org.w3c.dom.traversal; \ - org.w3c.dom.views; \ - org.w3c.dom.xpath; \ - org.xml.sax; \ - org.xml.sax.ext; \ - org.xml.sax.helpers; \ - sun.rmi.registry; \ - sun.rmi.server; \ - sun.rmi.transport; \ - sun.security.util; \ - sun.security.provider; \ - sun.util.calendar; \ - version="1.5.0" - -#felix.auto.start.1= \ -# file:bundle/org.apache.felix.shell-1.0.0.jar \ -# file:bundle/org.apache.felix.shell.tui-1.0.0.jar \ -# file:bundle/org.apache.felix.bundlerepository-1.0.0.jar - -org.osgi.framework.startlevel=1 -felix.startlevel.bundle=1 - -# Invalid fragment bundles throw an 'exception' by default, but -# uncomment the follow line to have them log a 'warning' instead. -felix.fragment.validation=warning - -# -# Bundle config properties. -# -#org.osgi.service.http.port=8080 -obr.shell.telnet=on - diff --git a/jonas_tests/jaxws/jaxws-felix/src/main/config/jonas-autodeploy-bundles.properties b/jonas_tests/jaxws/jaxws-felix/src/main/config/jonas-autodeploy-bundles.properties deleted file mode 100644 index 936ec545a30b8f63655b036c9e9a518a3468730b..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-felix/src/main/config/jonas-autodeploy-bundles.properties +++ /dev/null @@ -1,73 +0,0 @@ -# Generated Mon May 18 20:03:53 CST 2009 by JOnAS. - -install.level.1 org.apache.felix:org.apache.felix.shell.tui:1.0.2 - -start.level.1 org.apache.felix:org.apache.felix.shell:1.0.2, \ - org.apache.felix:org.apache.felix.bundlerepository:1.2.1, \ - org.apache.felix:org.apache.felix.ipojo:1.2.0, \ - org.apache.felix:org.apache.felix.ipojo.arch:1.2.0, \ - org.ow2.bundles:ow2-bundles-externals-commons-collections:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-bundles-externals-commons-logging:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-archive-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-archive-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-deploy-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-deploy-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-scan-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-scan-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-metadata-common-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-metadata-common-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-metadata-car-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-metadata-car-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-metadata-ws-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-metadata-ws-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-metadata-war-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-ee-metadata-war-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-event-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-file:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-i18n:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-jmx-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-log:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-pool-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-url:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-xml:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-schemas:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-fetcher-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-fetcher-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-fetcher-impl-url:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-fetcher-impl-maven2:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-fetcher-impl-obr:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-deploy-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-deploy-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-repository-api:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-repository-impl:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-monitor:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-reader:1.0.16-SNAPSHOT, \ - org.ow2.bundles:util-plan-deployer:1.0.16-SNAPSHOT, \ - org.ow2.jonas.osgi:javaee-api:5.1.0-RC3-SNAPSHOT, \ - org.ow2.bundles:ow2-bundles-externals-jaxb2:1.0.16-SNAPSHOT, \ - org.ow2.bundles:ow2-util-xmlconfig:1.0.16-SNAPSHOT, \ - org.ow2.jonas:jonas-extension-loader:5.1.0-RC3-SNAPSHOT:{ipojo}, \ - org.ow2.easybeans.osgi:easybeans-api:1.1.0-RC2-SNAPSHOT, \ - org.ow2.jonas:jonas-services-api:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas.osgi:monolog:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-version:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-commons:5.1.0-RC3-SNAPSHOT, \ - org.apache.felix:org.apache.felix.configadmin:1.0.10, \ - org.ow2.jonas:bootstrap:5.1.0-RC3-SNAPSHOT:{ipojo}, \ - org.ow2.carol:carol-interceptors:1.0.1, \ - org.ow2.jonas:jonas-naming:5.1.0-RC3-SNAPSHOT:{ipojo}, \ - org.ow2.jonas:jonas-carol-registry:5.1.0-RC3-SNAPSHOT:{ipojo}, \ - org.ow2.jonas:jonas-management-javaee:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-jmx:5.1.0-RC3-SNAPSHOT:{ipojo}, \ - org.ow2.jonas:jonas-deployment:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-domain:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-management-reconfig:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-security-auth:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-security-jacc:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-security-jacc-handlers:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-timer:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-ejb-container-svc:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-ejb-container:5.1.0-RC3-SNAPSHOT, \ - org.ow2.jonas:jonas-service-manager:5.1.0-RC3-SNAPSHOT:{ipojo}, \ - org.ow2.jonas:jonas-mbeans:5.1.0-RC3-SNAPSHOT:{ipojo}, \ - org.ow2.jonas:jndi-interceptors:5.1.0-RC3-SNAPSHOT:{ipojo} diff --git a/jonas_tests/jaxws/jaxws-felix/src/main/config/testng.xml b/jonas_tests/jaxws/jaxws-felix/src/main/config/testng.xml deleted file mode 100644 index 49ba8e8bf5ef41c99192a4fbe29a2b12ca18f149..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-felix/src/main/config/testng.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/ejb3/pom.xml b/jonas_tests/jaxws/jaxws-test-base/ejb3/pom.xml deleted file mode 100644 index 3e9d55ee8467ccaf9cb94b74d6d293cfd9885e53..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/ejb3/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.ejb - ejb3 - jar - JOnAS :: Tests :: JAXWS :: Tests :: Base :: EJB3 - http://maven.apache.org - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - ejb3 - - diff --git a/jonas_tests/jaxws/jaxws-test-base/ejb3/src/main/java/org/ow2/jonas/ejb3/Hello.java b/jonas_tests/jaxws/jaxws-test-base/ejb3/src/main/java/org/ow2/jonas/ejb3/Hello.java deleted file mode 100644 index 56d95e567e4fd5bbd197661361099b493a0c8aeb..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/ejb3/src/main/java/org/ow2/jonas/ejb3/Hello.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ejb3; - - -public interface Hello -{ - public abstract String sayHello(String s); -} - diff --git a/jonas_tests/jaxws/jaxws-test-base/ejb3/src/main/java/org/ow2/jonas/ejb3/HelloBean.java b/jonas_tests/jaxws/jaxws-test-base/ejb3/src/main/java/org/ow2/jonas/ejb3/HelloBean.java deleted file mode 100644 index 7aacc3ca479cabeb929e12f0be6673749605a051..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/ejb3/src/main/java/org/ow2/jonas/ejb3/HelloBean.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ejb3; - -import javax.ejb.Remote; -import javax.ejb.Stateless; - -// Referenced classes of package org.ow2.jonas.ws.axis2.test.ejb3: -// Hello - -@Remote(Hello.class) -@Stateless -public class HelloBean - implements Hello -{ - - public HelloBean() - { - } - - public String sayHello(String str) - { - System.out.println((new StringBuilder("HelloWorldEJB3: ")).append(str).toString()); - return "HelloWorld EJB3!"; - } -} \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/pom.xml deleted file mode 100644 index 6747e9e4deb85f378b20d24820026021b6b93e78..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.ejb - jaxws-ejb-descriptor - jar - JOnAS :: Tests :: JAXWS :: Tests :: Base :: EJB :: Descriptor - http://maven.apache.org - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-ejb-descriptor - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBean_descriptor.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBean_descriptor.java deleted file mode 100644 index dd6c8a8262880f9b33ca29a7b5f2beced7e7a635..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBean_descriptor.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: xiaoda - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.jws.WebService; -import javax.jws.WebMethod; -import javax.jws.soap.SOAPBinding; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - -/** - * This is an EJB based JAXWS web service with @WebMethod annotation. - * @author xiaoda - * - */ -@WebService(name="JAXWSBean_descriptor", - serviceName="JAXWSBean_descriptor", - wsdlLocation="META-INF/wsdl/JAXWSBean_descriptor.wsdl") - -@Stateless(mappedName="JAXWSBean_With_WebMethod") -@Remote(JAXWSGreeter.class) -@SOAPBinding(style=SOAPBinding.Style.DOCUMENT, - use=SOAPBinding.Use.LITERAL, - parameterStyle=SOAPBinding.ParameterStyle.WRAPPED -) -public class JAXWSBean_descriptor implements JAXWSGreeter { - - @WebMethod(exclude=false) - public String greetMe(final String me) { - System.out.println("i'm a ejb ws: " + me); - if (!"foo bar".equals(me)) { - throw new RuntimeException("Wrong parameter"); - } - return "Hello " + me; - } - - - public void greetMeFault(final String me) { - System.out.println("generate SOAP fault"); - SOAPFault fault = null; - try { - fault = SOAPFactory.newInstance().createFault(); - fault.setFaultCode(new QName("http://foo", "MyFaultCode")); - fault.setFaultString("my error"); - fault.setFaultActor("my actor"); - } catch (SOAPException ex) { - throw new RuntimeException(ex); - } - - throw new SOAPFaultException(fault); - } - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java deleted file mode 100644 index a77053df35c2c9e272e5108ed65538d63763544e..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: xiaoda - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - - -public interface JAXWSGreeter { - - public String greetMe(String me); - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/resources/META-INF/easybeans.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/resources/META-INF/easybeans.xml deleted file mode 100644 index b1118d6229230a71551080ef7d5a310f0a6b3205..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/resources/META-INF/easybeans.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - JAXWSBean_descriptor - - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/resources/META-INF/webservices.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/resources/META-INF/webservices.xml deleted file mode 100644 index 05c4da6a48a0ca36e0cad2960016c125add081cc..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/resources/META-INF/webservices.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - ejb-descriptor - META-INF/wsdl/JAXWSBean_descriptor.wsdl - - JAXWSBean_descriptor - ejb:JAXWSBean_descriptor - ejb:JAXWSBean_descriptorPort - false - org.ow2.jonas.ws.jaxws.test.ejb.JAXWSGreeter - - JAXWSBean_descriptor - - - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/resources/META-INF/wsdl/JAXWSBean_descriptor.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/resources/META-INF/wsdl/JAXWSBean_descriptor.wsdl deleted file mode 100644 index 7e6c62ef3813e242ab74cb580cbc9953362b63f5..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-descriptor/src/main/resources/META-INF/wsdl/JAXWSBean_descriptor.wsdl +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/pom.xml deleted file mode 100644 index 58617328da3c77e381833425258e4321dd6500e9..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.ejb - jaxws-ejb-injection - jar - JOnAS :: Tests :: JAXWS :: Tests :: Base :: EJB :: Injection - http://maven.apache.org - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-ejb-injection - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/java/org/ow2/jonas/ejb3/Hello.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/java/org/ow2/jonas/ejb3/Hello.java deleted file mode 100644 index 56d95e567e4fd5bbd197661361099b493a0c8aeb..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/java/org/ow2/jonas/ejb3/Hello.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ejb3; - - -public interface Hello -{ - public abstract String sayHello(String s); -} - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBeanInjection.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBeanInjection.java deleted file mode 100644 index e536e3f0be39e46d0bbc3b0992a437076d22c18b..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBeanInjection.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - -import javax.annotation.Resource; -import javax.ejb.EJB; -import javax.ejb.Remote; -import javax.ejb.SessionContext; -import javax.ejb.Stateless; -import javax.jws.WebService; -import javax.jws.WebMethod; -import javax.jws.soap.SOAPBinding; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.soap.SOAPFaultException; - -import org.ow2.jonas.ejb3.Hello; - -/** - * This is an EJB based JAXWS web service with @WebMethod annotation. - * - * @author xiaoda - * - */ -@WebService(name = "JAXWSBeanInjection", serviceName = "JAXWSBeanInjection", wsdlLocation = "META-INF/wsdl/JAXWSBeanInjection.wsdl") -@Stateless(mappedName = "JAXWSBeanInjection") -@Remote(JAXWSGreeter.class) -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) -public class JAXWSBeanInjection implements JAXWSGreeter { - - @Resource - private SessionContext sessionContext; - - @Resource - WebServiceContext wsContext; - - @EJB(name = "Hello", beanInterface=Hello.class,beanName="org.ow2.jonas.ejb3.HelloBean") - Hello hello; - - @WebMethod(exclude = false) - public String greetMe(final String me) { - String res = new String(); - res = me; - - if (wsContext != null) { - System.out.println("wsContext is not null"); - res = res + "wsContext"; - } - if (hello != null) { - System.out.println("hello is not null"); - res = res + "hello"; - } - - if (sessionContext != null) { - System.out.println("sessionContext is not null"); - res = res + "sessionContext"; - } - return res; - } - - public void greetMeFault(final String me) { - System.out.println("generate SOAP fault"); - SOAPFault fault = null; - try { - fault = SOAPFactory.newInstance().createFault(); - fault.setFaultCode(new QName("http://foo", "MyFaultCode")); - fault.setFaultString("my error"); - fault.setFaultActor("my actor"); - } catch (SOAPException ex) { - throw new RuntimeException(ex); - } - throw new SOAPFaultException(fault); - } - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java deleted file mode 100644 index 6f646d0ec3b78873cf97925c97cfc626d5960e69..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - - -public interface JAXWSGreeter { - - public String greetMe(String me); - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/resources/META-INF/wsdl/JAXWSBeanInjection.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/resources/META-INF/wsdl/JAXWSBeanInjection.wsdl deleted file mode 100644 index 7ca02a3b1ecc592c091ed63560e50b0e8ac2b606..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-injection/src/main/resources/META-INF/wsdl/JAXWSBeanInjection.wsdl +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/pom.xml deleted file mode 100644 index 7f1e75eeb7786356323f0a703ee85d8d416a9da5..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.ejb - jaxws-ejb-interceptor - jar - JOnAS :: Tests :: JAXWS :: Tests :: Base :: EJB :: Interceptor - http://maven.apache.org - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-ejb-interceptor - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/EJBWSwihtInterceptors.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/EJBWSwihtInterceptors.java deleted file mode 100644 index 445b925060ed079e8e5f72b46133dd0a009cda67..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/EJBWSwihtInterceptors.java +++ /dev/null @@ -1,103 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptors; -import javax.interceptor.InvocationContext; -import javax.jws.WebService; -import javax.jws.WebMethod; -import javax.jws.soap.SOAPBinding; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - -/** - * This is an EJB based JAXWS web service with @WebMethod annotation. - * @author xiaoda - * - */ -@WebService(name="EJBWSwihtInterceptors", - serviceName="EJBWSwihtInterceptors", - wsdlLocation="META-INF/wsdl/EJBWSwihtInterceptors.wsdl", - endpointInterface="org.ow2.jonas.ws.jaxws.test.ejb.JAXWSGreeterForWithWM") - -@Stateless(mappedName="JAXWSBeanWithWebMethod") -@Remote(JAXWSGreeterForWithWM.class) -@SOAPBinding(style=SOAPBinding.Style.DOCUMENT, - use=SOAPBinding.Use.LITERAL, - parameterStyle=SOAPBinding.ParameterStyle.WRAPPED -) -@Interceptors(GreeterInterceptor.class) -public class EJBWSwihtInterceptors implements JAXWSGreeter { - - private String response = "Hello"; - - @WebMethod - public String greetMe(final String me) { - System.out.println("i'm a ejb ws: " + me); - return response + me; - } - - @WebMethod - public void greetMeFault(final String me) { - System.out.println("generate SOAP fault"); - SOAPFault fault = null; - try { - fault = SOAPFactory.newInstance().createFault(); - fault.setFaultCode(new QName("http://foo", "MyFaultCode")); - fault.setFaultString("my error"); - fault.setFaultActor("my actor"); - } catch (SOAPException ex) { - throw new RuntimeException(ex); - } - - throw new SOAPFaultException(fault); - } - - public String greetYou(final String you) { - System.out.println("i'm a ejb ws: " + you); - System.out.println("greet you"); - return "Hi " + you; - } - - public String sayHello(String name) { - return "Hello World! " + name; - } - - - @AroundInvoke - public Object trace(InvocationContext ic) throws Exception { - //ic.getParameters()[0] = "inceptor"; - response = response + " intercepted"; - System.out.println("Intercepted method : " + ic.getMethod().getName()); - return ic.proceed(); - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/EJBWSwithAroundInvoke.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/EJBWSwithAroundInvoke.java deleted file mode 100644 index 166aacb3adb9116506c8c9547f4e0f2517a195d6..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/EJBWSwithAroundInvoke.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.interceptor.AroundInvoke; -import javax.interceptor.InvocationContext; -import javax.jws.WebService; -import javax.jws.WebMethod; -import javax.jws.soap.SOAPBinding; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - -/** - * This is an EJB based JAXWS web service with @WebMethod annotation. - * @author xiaoda - * - */ -@WebService(name="EJBWSwithAroundInvoke", - serviceName="EJBWSwithAroundInvoke", - wsdlLocation="META-INF/wsdl/EJBWSwithAroundInvoke.wsdl", - endpointInterface="org.ow2.jonas.ws.jaxws.test.ejb.JAXWSGreeterForWithWM") - -@Stateless(mappedName="JAXWSBeanWithWebMethod") -@Remote(JAXWSGreeterForWithWM.class) -@SOAPBinding(style=SOAPBinding.Style.DOCUMENT, - use=SOAPBinding.Use.LITERAL, - parameterStyle=SOAPBinding.ParameterStyle.WRAPPED -) -public class EJBWSwithAroundInvoke implements JAXWSGreeter { - - private String response = "Hello"; - - @WebMethod - public String greetMe(final String me) { - System.out.println("i'm a ejb ws: " + me); - return response + me; - } - - @WebMethod - public void greetMeFault(final String me) { - System.out.println("generate SOAP fault"); - SOAPFault fault = null; - try { - fault = SOAPFactory.newInstance().createFault(); - fault.setFaultCode(new QName("http://foo", "MyFaultCode")); - fault.setFaultString("my error"); - fault.setFaultActor("my actor"); - } catch (SOAPException ex) { - throw new RuntimeException(ex); - } - - throw new SOAPFaultException(fault); - } - - public String greetYou(final String you) { - System.out.println("i'm a ejb ws: " + you); - System.out.println("greet you"); - return "Hi " + you; - } - - public String sayHello(String name) { - return "Hello World! " + name; - } - - - @AroundInvoke - public Object trace(InvocationContext ic) throws Exception { - //ic.getParameters()[0] = "inceptor"; - response = response + " intercepted"; - System.out.println("Intercepted method : " + ic.getMethod().getName()); - return ic.proceed(); - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/GreeterInterceptor.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/GreeterInterceptor.java deleted file mode 100644 index 9056dc9a04f48c01a0c314111f00be42122ef634..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/GreeterInterceptor.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - -import javax.interceptor.AroundInvoke; -import javax.interceptor.InvocationContext;/** - * This class intercepts Business interfaces methods - */ -public class GreeterInterceptor { /** - * Invocation counter - */ - private int counter = 0; /** - * Count the invocations of a bean. - * @param ic InvocationContext - * @return proceeded method - * @throws Exception if something wrong occurs. - */ - @AroundInvoke - public Object count(InvocationContext ic) throws Exception { synchronized(this) { - counter++; - System.out.println("Method '" + ic.getMethod().getName() - + "' invoked " + counter + " times."); - return ic.proceed(); - } - } -} \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java deleted file mode 100644 index bec8bb79a5407fb230505bde42b55c5a082f331b..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - - -public interface JAXWSGreeter { - - public String sayHello(String name); - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeterForWithWM.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeterForWithWM.java deleted file mode 100644 index cff98020c5993870d937f80071d71a9e4d792c8c..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeterForWithWM.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - -import javax.jws.WebService; - -@WebService -public interface JAXWSGreeterForWithWM { - - public String greetMe(final String me); - public void greetMeFault(final String me); -} \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/resources/META-INF/wsdl/EJBWSwihtInterceptors.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/resources/META-INF/wsdl/EJBWSwihtInterceptors.wsdl deleted file mode 100644 index 2bebc399346a3bd1228913dcb953cdca3a3620ec..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/resources/META-INF/wsdl/EJBWSwihtInterceptors.wsdl +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/resources/META-INF/wsdl/EJBWSwithAroundInvoke.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/resources/META-INF/wsdl/EJBWSwithAroundInvoke.wsdl deleted file mode 100644 index d3d2bb6e40ec5229ba354248400811b8a8dec3df..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-interceptor/src/main/resources/META-INF/wsdl/EJBWSwithAroundInvoke.wsdl +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/pom.xml deleted file mode 100644 index ea622aee8f40fe1d200c8061d0019f984ea2b998..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.ejb - jaxws-ejb - jar - JOnAS :: Tests :: JAXWS :: Tests :: Base :: EJB :: Webmethod - http://maven.apache.org - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-ejb-webmethod - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBeanWithWebMethod.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBeanWithWebMethod.java deleted file mode 100644 index 801fe966f25eb0fe66bd06603589299b4acfc1a2..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBeanWithWebMethod.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - -import javax.annotation.Resource; -import javax.ejb.EJB; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.jws.WebService; -import javax.jws.WebMethod; -import javax.jws.soap.SOAPBinding; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - -/** - * This is an EJB based JAXWS web service with @WebMethod annotation. - * @author xiaoda - * - */ -@WebService(name="JAXWSBeanWithWebMethod", - serviceName="JAXWSBeanWithWebMethod", - wsdlLocation="META-INF/wsdl/JAXWSBeanWithWebMethod.wsdl", - endpointInterface="org.ow2.jonas.ws.jaxws.test.ejb.JAXWSGreeterForWithWM") - -@Stateless(mappedName="JAXWSBeanWithWebMethod") -@Remote(JAXWSGreeterForWithWM.class) -@SOAPBinding(style=SOAPBinding.Style.DOCUMENT, - use=SOAPBinding.Use.LITERAL, - parameterStyle=SOAPBinding.ParameterStyle.WRAPPED -) -public class JAXWSBeanWithWebMethod implements JAXWSGreeter { - - - @WebMethod - public String greetMe(final String me) { - System.out.println("i'm a ejb ws: " + me); - return "Hello " + me; - } - - @WebMethod - public void greetMeFault(final String me) { - System.out.println("generate SOAP fault"); - SOAPFault fault = null; - try { - fault = SOAPFactory.newInstance().createFault(); - fault.setFaultCode(new QName("http://foo", "MyFaultCode")); - fault.setFaultString("my error"); - fault.setFaultActor("my actor"); - } catch (SOAPException ex) { - throw new RuntimeException(ex); - } - - throw new SOAPFaultException(fault); - } - - public String greetYou(final String you) { - System.out.println("i'm a ejb ws: " + you); - System.out.println("greet you"); - return "Hi " + you; - } - - public String sayHello(String name) { - return "Hello World! " + name; - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBeanWithoutWebMethod.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBeanWithoutWebMethod.java deleted file mode 100644 index 14a4f01b7577a262c983e395d4278f43bb2e8f8e..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSBeanWithoutWebMethod.java +++ /dev/null @@ -1,92 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - -import javax.ejb.Remote; -import javax.ejb.Stateless; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFactory; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; - -/** - * This is an EJB based JAXWS web service with @WebMethod annotation. - * @author xiaoda - * - */ - -// Here we do not specify the SEI, web service container will generate a default SEI -// this SEI will contain all @WebMethod annotated methods and public methods -// see specs Web Services for Java EE, Version 1.2 # chapter 3.3 -@WebService(name="JAXWSBeanWithoutWebMethod", - serviceName="JAXWSBeanWithoutWebMethod", - wsdlLocation="META-INF/wsdl/JAXWSBeanWithoutWebMethod.wsdl") - -@Stateless(mappedName="JAXWSBeanWithoutWebMethod") -@Remote(JAXWSGreeter.class) -@SOAPBinding(style=SOAPBinding.Style.DOCUMENT, - use=SOAPBinding.Use.LITERAL, - parameterStyle=SOAPBinding.ParameterStyle.WRAPPED -) -public class JAXWSBeanWithoutWebMethod implements JAXWSGreeter { - - - public String greetMe(final String me) { - System.out.println("i'm a ejb ws : " + me); - System.out.println("greet me"); - return "Hello " + me; - } - - - public void greetMeFault(final String me) { - System.out.println("generate SOAP fault"); - SOAPFault fault = null; - try { - fault = SOAPFactory.newInstance().createFault(); - fault.setFaultCode(new QName("http://foo", "MyFaultCode")); - fault.setFaultString("my error"); - fault.setFaultActor("my actor"); - } catch (SOAPException ex) { - throw new RuntimeException(ex); - } - - throw new SOAPFaultException(fault); - } - - public String greetYou(final String you) { - System.out.println("i'm a ejb ws: " + you); - System.out.println("greet you"); - return "Hi " + you; - } - - public String sayHello(String name) { - return "Hello World!" + name; - } - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java deleted file mode 100644 index 20275f480a9c8d2e7095d26b3d18b72099be0c6b..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeter.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.ejb; - - -public interface JAXWSGreeter { - - public String sayHello(String name); -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeterForWithWM.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeterForWithWM.java deleted file mode 100644 index b10888a5ec108c11fdffe1e26af8b6ab338f680f..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/java/org/ow2/jonas/ws/jaxws/test/ejb/JAXWSGreeterForWithWM.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.ow2.jonas.ws.jaxws.test.ejb; - -import javax.jws.WebService; - -@WebService -public interface JAXWSGreeterForWithWM { - - public String greetMe(final String me); - public void greetMeFault(final String me); -} \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/resources/META-INF/wsdl/JAXWSBeanWithWebMethod.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/resources/META-INF/wsdl/JAXWSBeanWithWebMethod.wsdl deleted file mode 100644 index a7ffbe337f22e7c573a388685dde27f7a320e810..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/resources/META-INF/wsdl/JAXWSBeanWithWebMethod.wsdl +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/resources/META-INF/wsdl/JAXWSBeanWithoutWebMethod.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/resources/META-INF/wsdl/JAXWSBeanWithoutWebMethod.wsdl deleted file mode 100644 index decd5d35796835e13fdec3f4a4a8dda46e9b8303..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-ejb-webmethod/src/main/resources/META-INF/wsdl/JAXWSBeanWithoutWebMethod.wsdl +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/pom.xml deleted file mode 100644 index 364777af11b6f63972afdeb14795ca65ede890c0..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-complex - war - JOnAS :: Tests :: JAXWS :: Tests :: Base :: POJO :: Complex - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-pojo-complex - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/JAXWSBean3.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/JAXWSBean3.java deleted file mode 100644 index 8ba61102c062460a5b67fbbe969d3482da3d4b6e..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/JAXWSBean3.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: xiaoda - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - - -package org.ow2.jonas.ws.jaxws.test.pojo; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.ws.WebServiceContext; -import javax.jws.WebService; -import javax.annotation.Resource; - -@WebService(name = "Person", - targetNamespace = "http://org.ow2.jonas.ws.jaxws.test.person",wsdlLocation="WEB-INF/wsdl/JAXWSBean3Service.wsdl") -public class JAXWSBean3 { - -@Resource WebServiceContext wsContext; - - private static List PERSONS = new ArrayList(); - - static { - PERSONS.add(new Person("eric", "cartman")); - PERSONS.add(new Person("homer", "simpson")); - } - - public Person[] getPersons1() { - System.out.println(wsContext); - return PERSONS.toArray(new Person [] {}); - } - - public List getPersons2() { - return PERSONS; - } - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/Person.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/Person.java deleted file mode 100644 index 2a238f0733a458b1539b6bbdc389952a9fec128f..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/Person.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - -public class Person { - - private String firstName; - private String lastName; - - public Person() { - } - - public Person(String firstName, String lastName) { - this.firstName = firstName; - this.lastName = lastName; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons1.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons1.java deleted file mode 100644 index 6956a14862f1c7bc72ef3cf67158c4203503bdfd..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons1.java +++ /dev/null @@ -1,24 +0,0 @@ - -package org.ow2.jonas.ws.jaxws.test.pojo.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * This class was generated by the CXF 2.0.9 - * Mon Jun 22 21:09:13 CST 2009 - * Generated source version: 2.0.9 - * - */ - -@XmlRootElement(name = "getPersons1", namespace = "http://org.ow2.jonas.ws.jaxws.test.person") -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "getPersons1", namespace = "http://org.ow2.jonas.ws.jaxws.test.person") - -public class GetPersons1 { - - -} - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons1Response.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons1Response.java deleted file mode 100644 index 30e0a44da1a048c78dfdf45888643225953df867..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons1Response.java +++ /dev/null @@ -1,35 +0,0 @@ - -package org.ow2.jonas.ws.jaxws.test.pojo.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * This class was generated by the CXF 2.0.9 - * Mon Jun 22 21:09:13 CST 2009 - * Generated source version: 2.0.9 - * - */ - -@XmlRootElement(name = "getPersons1Response", namespace = "http://org.ow2.jonas.ws.jaxws.test.person") -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "getPersons1Response", namespace = "http://org.ow2.jonas.ws.jaxws.test.person") - -public class GetPersons1Response { - - @XmlElement(name = "return") - private org.ow2.jonas.ws.jaxws.test.pojo.Person[] _return; - - public org.ow2.jonas.ws.jaxws.test.pojo.Person[] get_return() { - return this._return; - } - - public void set_return( org.ow2.jonas.ws.jaxws.test.pojo.Person[] new_return ) { - this._return = new_return; - } - -} - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons2.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons2.java deleted file mode 100644 index b8b6eb17d8a1b8d80f12a326d93f2054a6e888e6..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons2.java +++ /dev/null @@ -1,24 +0,0 @@ - -package org.ow2.jonas.ws.jaxws.test.pojo.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * This class was generated by the CXF 2.0.9 - * Mon Jun 22 21:09:13 CST 2009 - * Generated source version: 2.0.9 - * - */ - -@XmlRootElement(name = "getPersons2", namespace = "http://org.ow2.jonas.ws.jaxws.test.person") -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "getPersons2", namespace = "http://org.ow2.jonas.ws.jaxws.test.person") - -public class GetPersons2 { - - -} - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons2Response.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons2Response.java deleted file mode 100644 index fd08ad7d69b64f71118fb973a46a54a9925cbf09..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/jaxws/GetPersons2Response.java +++ /dev/null @@ -1,35 +0,0 @@ - -package org.ow2.jonas.ws.jaxws.test.pojo.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * This class was generated by the CXF 2.0.9 - * Mon Jun 22 21:09:13 CST 2009 - * Generated source version: 2.0.9 - * - */ - -@XmlRootElement(name = "getPersons2Response", namespace = "http://org.ow2.jonas.ws.jaxws.test.person") -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "getPersons2Response", namespace = "http://org.ow2.jonas.ws.jaxws.test.person") - -public class GetPersons2Response { - - @XmlElement(name = "return") - private java.util.List _return; - - public java.util.List get_return() { - return this._return; - } - - public void set_return( java.util.List new_return ) { - this._return = new_return; - } - -} - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/webapp/WEB-INF/jonas-web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/webapp/WEB-INF/jonas-web.xml deleted file mode 100644 index 27eb0b90c90d8a9967030ace1cb215ab7c17cb1d..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/webapp/WEB-INF/jonas-web.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - pojo - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/webapp/WEB-INF/web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 08957617887d5bfe7df6ab840ba41666a8b8731c..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - JOnAS Package index - - Display the context which are preconfigured. - - - - SimpleService - org.ow2.jonas.ws.jaxws.test.JAXWSBean3 - - - - SimpleService - /SimpleService - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/webapp/WEB-INF/wsdl/JAXWSBean3Service.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/webapp/WEB-INF/wsdl/JAXWSBean3Service.wsdl deleted file mode 100644 index 5b8988c86d83769f23c63900c4db44cb2d5ae023..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-complex/src/main/webapp/WEB-INF/wsdl/JAXWSBean3Service.wsdl +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/pom.xml deleted file mode 100644 index 41ec8a9b66ee1fe699d74320cd261ca4a85f5629..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-descriptor - war - JOnAS :: Tests :: JAXWS :: Tests :: Base :: POJO :: Descriptor - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-pojo-descriptor - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ejb3/Hello.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ejb3/Hello.java deleted file mode 100644 index 384133d381184cad74db97a4db8e65b04eccd782..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ejb3/Hello.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.ow2.jonas.ejb3; - - -public interface Hello -{ - public abstract String sayHello(String s); -} - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ejb3/HelloBean.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ejb3/HelloBean.java deleted file mode 100644 index 3ffb9c9a3e21ee6aed9107d37905fd88f41ef6d2..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ejb3/HelloBean.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.ow2.jonas.ejb3; - -import javax.ejb.Remote; -import javax.ejb.Stateless; - -// Referenced classes of package org.ow2.jonas.ws.axis2.test.ejb3: -// Hello - -@Remote(Hello.class) -@Stateless -public class HelloBean - implements Hello -{ - - public HelloBean() - { - } - - public String sayHello(String str) - { - System.out.println((new StringBuilder("HelloWorldEJB3: ")).append(str).toString()); - return "HelloWorld EJB3!"; - } -} \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/GreeterLogicalHandler.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/GreeterLogicalHandler.java deleted file mode 100644 index 6b890ff2097f3eb99efcabd17b3e5fecbbeeda54..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/GreeterLogicalHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - - -import javax.ejb.EJB; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; -//import org.ow2.jonas.ws.axis2.ejb3.Hello; - -public class GreeterLogicalHandler implements javax.xml.ws.handler.LogicalHandler { - - //@Resource(name = "greeting") - //private String greeting; - - //@EJB(name="org.ow2.jonas.ws.axis2.ejb3.Hello") - //Hello hello; - - public void close(final MessageContext arg0) { - // TODO Auto-generated method stub - System.out.println("CLOSE in LogicalHandler"); - } - - public boolean handleFault(final LogicalMessageContext arg0) { - // TODO Auto-generated method stub - return true; - } - - public boolean handleMessage(final LogicalMessageContext context) { - - // TODO Auto-generated method stub - System.out.println("GREATERLogicalHandler HandleMessage"); - //System.out.println(greeting); - //hello.sayHello("hello world"); - - return true; - } -} - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/GreeterSOAPHandler.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/GreeterSOAPHandler.java deleted file mode 100644 index c593b55918bbb25bebdaf16f7aa071b3ffeda025..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/GreeterSOAPHandler.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - - -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; -import javax.xml.namespace.QName; -import javax.xml.soap.Node; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPException; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -public class GreeterSOAPHandler implements SOAPHandler { - - @Resource - WebServiceContext WSContext = null; - - //@Resource(name = "greeting") - //private String greeting; - - @PostConstruct - public void init() { - System.out.println(this + " init: " + WSContext); - } - - @PreDestroy - public void destroy() { - System.out.println(this + " destroy"); - } - - public void init(final Map config) { - } - - public boolean handleFault(final SOAPMessageContext context) { - System.out.println(this + " handleFault"); - return true; - } - - public void close(final MessageContext context) { - System.out.println("CLOSE in SOAPHandler"); - } - - public boolean handleMessage(final SOAPMessageContext context) { - System.out.println("GREATERSOAPHandler HandleMessage"); - System.out.println(context == null); - System.out.println(WSContext == null); - System.out.println(context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY)); - - try { - if("false".equalsIgnoreCase(context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY).toString())) { - String content = context.getMessage().getSOAPPart().getEnvelope().getBody().getFirstChild().getFirstChild().getFirstChild().getTextContent(); - context.getMessage().getSOAPPart().getEnvelope().getBody().getFirstChild().getFirstChild().getFirstChild().setTextContent(content + "SOAPHandler"); - } - } catch (SOAPException e) { - e.printStackTrace(); - } - return true; - } - - public Set getHeaders() { - System.out.println(this + " getHeaders"); - return new TreeSet(); - } - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java deleted file mode 100644 index 5efc23f641d65e5e2b39a844dffcdc4d12884fb8..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.ow2.jonas.ws.jaxws.test.pojo; - -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: xiaoda - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -import javax.annotation.Resource; -import javax.jws.WebService; - -import org.ow2.jonas.ejb3.Hello; - -/** - * This is a basic JAXWS pojo web service. - * @author xiaoda - * - */ -@WebService(name="SimpleService",serviceName="SimpleService",wsdlLocation="WEB-INF/wsdl/SimpleService.wsdl") -public class SimpleService implements SimpleServiceInterface { - - private static final long serialVersionUID = 1L; - - public String greetMe(String str) { - return "hello" + str; - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java deleted file mode 100644 index 073685bc6ed1927f8b8b72d7a4f490a12f84c7f4..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - -import javax.jws.WebMethod; - -public interface SimpleServiceInterface { - - @WebMethod(exclude=false) - public String greetMe(String str); -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/jonas-web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/jonas-web.xml deleted file mode 100644 index b1fe7890ef7fc37b1d59951b0ebbd567c4b07b3f..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/jonas-web.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - pojo - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 63b069a6dedf869d8b9eadfb68f23a51280e4f5e..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - JOnAS Package index - - Display the context which are preconfigured. - - - - SimpleService - org.ow2.jonas.ws.jaxws.test.pojo.SimpleService - - - - SimpleService - /SimpleService - - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/webservices.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/webservices.xml deleted file mode 100644 index 5be46740a1160a10325facbc316179ce1e74dd8f..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/webservices.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - POJO WS (with wsdl) - WEB-INF/wsdl/SService.wsdl - - SimpleService - pojo:SimpleService - pojo:SimpleServicePort - false - org.ow2.jonas.ws.jaxws.test.pojo.SimpleServiceInterface - - SimpleService - - - - - GreeterHandlerA - org.ow2.jonas.ws.jaxws.test.pojo.GreeterSOAPHandler - - - GreeterHandlerB - org.ow2.jonas.ws.jaxws.test.pojo.GreeterSOAPHandler - - - - - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/wsdl/SService.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/wsdl/SService.wsdl deleted file mode 100644 index c17a2fe443dcfac310bb0ebfef285ef4ae0eb16a..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/wsdl/SService.wsdl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-descriptor/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/pom.xml deleted file mode 100644 index 7e4dd8599697ee32c073a250321b853307203de8..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-handler - war - JOnAS :: Tests :: JAXWS :: Tests :: Base :: POJO :: Handlers - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-pojo-handlers - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/GreeterLogicalHandler.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/GreeterLogicalHandler.java deleted file mode 100644 index d3a5c06cd8b08fdd7e8f1fec9c7f7025dd9fa155..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/GreeterLogicalHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.handlers; - - -import javax.ejb.EJB; -import javax.xml.ws.handler.LogicalMessageContext; -import javax.xml.ws.handler.MessageContext; -//import org.ow2.jonas.ws.axis2.ejb3.Hello; - -public class GreeterLogicalHandler implements javax.xml.ws.handler.LogicalHandler { - - //@Resource(name = "greeting") - //private String greeting; - - //@EJB(name="org.ow2.jonas.ws.axis2.ejb3.Hello") - //Hello hello; - - public void close(final MessageContext arg0) { - // TODO Auto-generated method stub - System.out.println("CLOSE in LogicalHandler"); - } - - public boolean handleFault(final LogicalMessageContext arg0) { - // TODO Auto-generated method stub - return true; - } - - public boolean handleMessage(final LogicalMessageContext context) { - - // TODO Auto-generated method stub - System.out.println("GREATERLogicalHandler HandleMessage"); - //System.out.println(greeting); - //hello.sayHello("hello world"); - - return true; - } -} - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/GreeterSOAPHandler.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/GreeterSOAPHandler.java deleted file mode 100644 index c1ea7f3c5b3fed426094216d2ced952af564e1e4..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/GreeterSOAPHandler.java +++ /dev/null @@ -1,100 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.handlers; - - -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.annotation.Resource; -import javax.xml.namespace.QName; -import javax.xml.soap.Node; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPException; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -public class GreeterSOAPHandler implements SOAPHandler { - - @Resource - WebServiceContext wsContext; - - //@Resource(name = "greeting") - //private String greeting; - - @PostConstruct - public void init() { - System.out.println(this + " init: " + wsContext); - } - - @PreDestroy - public void destroy() { - System.out.println(this + " destroy"); - } - - public void init(final Map config) { - } - - public boolean handleFault(final SOAPMessageContext context) { - System.out.println(this + " handleFault"); - return true; - } - - public void close(final MessageContext context) { - System.out.println("CLOSE in SOAPHandler"); - } - - public boolean handleMessage(final SOAPMessageContext context) { - System.out.println("GREATERSOAPHandler HandleMessage"); - System.out.println(context == null); - System.out.println(wsContext == null); - System.out.println(context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY)); - - try { - if("false".equalsIgnoreCase(context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY).toString())) { - String content = context.getMessage().getSOAPPart().getEnvelope().getBody().getFirstChild().getFirstChild().getFirstChild().getTextContent(); - content = content + "SOAPHandler"; - if(wsContext!=null) { - content = content + "wsContext"; - } - context.getMessage().getSOAPPart().getEnvelope().getBody().getFirstChild().getFirstChild().getFirstChild().setTextContent(content); - } - } catch (SOAPException e) { - e.printStackTrace(); - } - return true; - } - - public Set getHeaders() { - System.out.println(this + " getHeaders"); - return new TreeSet(); - } - -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/SimpleService.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/SimpleService.java deleted file mode 100644 index d21fc9de31626c75f41660ce378ea52f17e92749..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/SimpleService.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.handlers; - - -import javax.annotation.Resource; -import javax.jws.HandlerChain; -import javax.jws.WebService; -import javax.xml.ws.WebServiceContext; - - -/** - * This is a basic JAXWS pojo web service. - * @author xiaoda - * - */ -@WebService(name="SimpleService",serviceName="SimpleService",wsdlLocation="WEB-INF/wsdl/SimpleService.wsdl") -@HandlerChain(file="/WEB-INF/handlers.xml") -public class SimpleService implements SimpleServiceInterface { - - @Resource - WebServiceContext WSContext = null; - - private static final long serialVersionUID = 1L; - - public String greetMe(String str) { - return "hello" + str; - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/SimpleServiceInterface.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/SimpleServiceInterface.java deleted file mode 100644 index 0d0a4252e3e3b40da7bc216e113a7ef12e7b2e5d..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/java/org/ow2/jonas/ws/jaxws/test/handlers/SimpleServiceInterface.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.handlers; - -import javax.jws.WebMethod; - -public interface SimpleServiceInterface { - - @WebMethod(exclude=false) - public String greetMe(String str); -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/handlers.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/handlers.xml deleted file mode 100644 index f783cff4d25b6eaf3be97b243b2e04d7abef4588..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/handlers.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - GreeterSOAPHandler - org.ow2.jonas.ws.jaxws.test.handlers.GreeterSOAPHandler - - - - GreeterLogicalHandler - org.ow2.jonas.ws.jaxws.test.handlers.GreeterLogicalHandler - - - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/jonas-web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/jonas-web.xml deleted file mode 100644 index 27eb0b90c90d8a9967030ace1cb215ab7c17cb1d..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/jonas-web.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - pojo - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 307ef9dbd73f32460c6b48cbcb8f460eca25b943..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - JOnAS Package index - - Display the context which are preconfigured. - - - - SimpleService - org.ow2.jonas.ws.jaxws.test.pojo.SimpleService - - - - SimpleService - /SimpleService - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl deleted file mode 100644 index 0b4b1fbb528c2e739fc83c16095284a4ed91fe7b..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-handlers/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/pom.xml deleted file mode 100644 index 5d1f529c3d1b5d82d4811e029dd98e5285b03198..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-injection - war - JOnAS :: Tests :: JAXWS :: Tests :: Base :: POJO :: Injection - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-pojo-injection - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/java/org/ow2/jonas/ejb3/Hello.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/java/org/ow2/jonas/ejb3/Hello.java deleted file mode 100644 index 56d95e567e4fd5bbd197661361099b493a0c8aeb..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/java/org/ow2/jonas/ejb3/Hello.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ejb3; - - -public interface Hello -{ - public abstract String sayHello(String s); -} - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/injection/SimpleService.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/injection/SimpleService.java deleted file mode 100644 index af76102879d7ba160cee77901d5153ab4a9bbe24..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/injection/SimpleService.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.injection; - -import javax.annotation.Resource; -import javax.ejb.EJB; -import javax.jws.WebService; -import javax.xml.ws.WebServiceContext; -import org.ow2.jonas.ejb3.Hello; - -/** - * This is a basic JAXWS pojo web service. - * - * @author xiaoda - * - */ -@WebService(name = "SimpleService", serviceName = "SimpleService", wsdlLocation = "WEB-INF/wsdl/SimpleService.wsdl") -public class SimpleService implements SimpleServiceInterface { - - @Resource - WebServiceContext context = null; - - @EJB(name = "org.ow2.jonas.ejb3.Hello") - Hello hello; - - private static final long serialVersionUID = 1L; - - public String greetMe(String str) { - System.out.println(hello==null); - if (context != null) { - return "hello" + str; - } else { - return str; - } - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/injection/SimpleServiceInterface.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/injection/SimpleServiceInterface.java deleted file mode 100644 index 0438629d0594d572c034978802e41cb19faef965..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/java/org/ow2/jonas/ws/jaxws/test/injection/SimpleServiceInterface.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.injection; - -import javax.jws.WebMethod; - -public interface SimpleServiceInterface { - - @WebMethod(exclude=false) - public String greetMe(String str); -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/handlers.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/handlers.xml deleted file mode 100644 index f783cff4d25b6eaf3be97b243b2e04d7abef4588..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/handlers.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - GreeterSOAPHandler - org.ow2.jonas.ws.jaxws.test.handlers.GreeterSOAPHandler - - - - GreeterLogicalHandler - org.ow2.jonas.ws.jaxws.test.handlers.GreeterLogicalHandler - - - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/jonas-web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/jonas-web.xml deleted file mode 100644 index 27eb0b90c90d8a9967030ace1cb215ab7c17cb1d..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/jonas-web.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - pojo - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 307ef9dbd73f32460c6b48cbcb8f460eca25b943..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - JOnAS Package index - - Display the context which are preconfigured. - - - - SimpleService - org.ow2.jonas.ws.jaxws.test.pojo.SimpleService - - - - SimpleService - /SimpleService - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl deleted file mode 100644 index 779d407a03e3d3d58d25663b1e06824a5e0b348d..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-injection/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/pom.xml deleted file mode 100644 index 7b6b3e71ce6b873f0ed89351e8c7a2c858762cc7..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-simple-with-wsdl - war - JOnAS :: Tests :: JAXWS :: Tests :: Base :: POJO :: Simple :: With :: WSDL - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-pojo-simple-with-wsdl - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java deleted file mode 100644 index 965df4918b89dcd9e6e6dd18766aa1f9ab1c39b9..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - -import javax.jws.WebMethod; -import javax.jws.WebService; - -/** - * This is a basic JAXWS pojo web service. - * @author xiaoda - * - */ -@WebService(name="SimpleService",serviceName="SimpleService",wsdlLocation="WEB-INF/wsdl/SimpleService.wsdl") -public class SimpleService implements SimpleServiceInterface { - - private static final long serialVersionUID = 1L; - - @WebMethod(exclude=false) - public String greetMe(String str) { - return "hello" + str; - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java deleted file mode 100644 index 073685bc6ed1927f8b8b72d7a4f490a12f84c7f4..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - -import javax.jws.WebMethod; - -public interface SimpleServiceInterface { - - @WebMethod(exclude=false) - public String greetMe(String str); -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/webapp/WEB-INF/jonas-web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/webapp/WEB-INF/jonas-web.xml deleted file mode 100644 index 27eb0b90c90d8a9967030ace1cb215ab7c17cb1d..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/webapp/WEB-INF/jonas-web.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - pojo - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/webapp/WEB-INF/web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 307ef9dbd73f32460c6b48cbcb8f460eca25b943..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - JOnAS Package index - - Display the context which are preconfigured. - - - - SimpleService - org.ow2.jonas.ws.jaxws.test.pojo.SimpleService - - - - SimpleService - /SimpleService - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl deleted file mode 100644 index c17a2fe443dcfac310bb0ebfef285ef4ae0eb16a..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-with-wsdl/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/pom.xml deleted file mode 100644 index 4df798bc70eaed9c3d7d6b28636ec00891c3c45e..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-simple-without-wsdl - war - JOnAS :: Tests :: JAXWS :: Tests :: Base :: POJO :: Simple :: Without :: WSDL - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-pojo-simple-without-wsdl - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java deleted file mode 100644 index 1c3d14e7f06cdeba39eaaa78271e0b0d418db044..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - -import javax.jws.WebMethod; -import javax.jws.WebService; - -/** - * This is a basic JAXWS pojo web service. - * @author xiaoda - * - */ -@WebService(name="SimpleService",serviceName="SimpleService") -public class SimpleService implements SimpleServiceInterface { - - private static final long serialVersionUID = 1L; - - @WebMethod(exclude=false) - public String greetMe(String str) { - return "hello" + str; - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java deleted file mode 100644 index 073685bc6ed1927f8b8b72d7a4f490a12f84c7f4..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - -import javax.jws.WebMethod; - -public interface SimpleServiceInterface { - - @WebMethod(exclude=false) - public String greetMe(String str); -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/webapp/WEB-INF/jonas-web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/webapp/WEB-INF/jonas-web.xml deleted file mode 100644 index 27eb0b90c90d8a9967030ace1cb215ab7c17cb1d..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/webapp/WEB-INF/jonas-web.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - pojo - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/webapp/WEB-INF/web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 307ef9dbd73f32460c6b48cbcb8f460eca25b943..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-simple-without-wsdl/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - JOnAS Package index - - Display the context which are preconfigured. - - - - SimpleService - org.ow2.jonas.ws.jaxws.test.pojo.SimpleService - - - - SimpleService - /SimpleService - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/pom.xml deleted file mode 100644 index 28a9d769bbcb0a1d802d0556af04d9c8859914fe..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-soapBinding - war - JOnAS :: Tests :: JAXWS :: Tests :: Base :: POJO :: SOAPBinding - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-pojo-SOAPBinding - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java deleted file mode 100644 index ca4619fcb1f5a8cecda9a7d6bfc018ce3b199a6e..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleService.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * This is a basic JAXWS pojo web service. - * @author xiaoda - * - */ -@WebService(name="SimpleService",serviceName="SimpleService",wsdlLocation="WEB-INF/wsdl/SimpleService.wsdl") -@SOAPBinding( - style = SOAPBinding.Style.RPC, - use = SOAPBinding.Use.LITERAL) -public class SimpleService implements SimpleServiceInterface { - - private static final long serialVersionUID = 1L; - - @WebMethod(exclude=false) - public String greetMe(String str) { - return "hello" + str; - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java deleted file mode 100644 index 073685bc6ed1927f8b8b72d7a4f490a12f84c7f4..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/java/org/ow2/jonas/ws/jaxws/test/pojo/SimpleServiceInterface.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.pojo; - -import javax.jws.WebMethod; - -public interface SimpleServiceInterface { - - @WebMethod(exclude=false) - public String greetMe(String str); -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/webapp/WEB-INF/jonas-web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/webapp/WEB-INF/jonas-web.xml deleted file mode 100644 index 27eb0b90c90d8a9967030ace1cb215ab7c17cb1d..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/webapp/WEB-INF/jonas-web.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - pojo - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/webapp/WEB-INF/web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 307ef9dbd73f32460c6b48cbcb8f460eca25b943..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - JOnAS Package index - - Display the context which are preconfigured. - - - - SimpleService - org.ow2.jonas.ws.jaxws.test.pojo.SimpleService - - - - SimpleService - /SimpleService - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl deleted file mode 100644 index f299828cd7f4c171bfe22e87da8242e98f4e7145..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-soap-binding/src/main/webapp/WEB-INF/wsdl/SimpleService.wsdl +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/pom.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/pom.xml deleted file mode 100644 index 31749208d8b7db0a714099f6d2cbae64631f8aa5..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - org.ow2.jonas - jonas-itests - 5.1.0-RC3-SNAPSHOT - ../pom.xml - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-wsProvider - war - JOnAS :: Tests :: JAXWS :: Tests :: Base :: POJO :: WSProvider - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - provided - - - - jaxws-pojo-wsProvider - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/src/main/java/org/ow2/jonas/ws/jaxws/test/CalculatorImpl.java b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/src/main/java/org/ow2/jonas/ws/jaxws/test/CalculatorImpl.java deleted file mode 100644 index b7bf40d3d1219a7bfa2858736efb6dd02932ab4a..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/src/main/java/org/ow2/jonas/ws/jaxws/test/CalculatorImpl.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2009 Bull S.A.S - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: xiaoda - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.ow2.jonas.ws.jaxws.test; - -import java.io.ByteArrayInputStream; - -import javax.annotation.Resource; -import javax.servlet.ServletRequest; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamSource; -import javax.xml.ws.BindingType; -import javax.xml.ws.Provider; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.WebServiceProvider; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.http.HTTPBinding; -import javax.xml.ws.http.HTTPException; - -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; - -@WebServiceProvider -@BindingType(value=HTTPBinding.HTTP_BINDING) -public class CalculatorImpl implements Provider { - - @Resource - protected WebServiceContext wsContext; - - public Source invoke(Source source) { - try { - String num1 = null; - String num2 = null; - - if (source == null) { - System.out.println("Getting input from query string"); - MessageContext mc = wsContext.getMessageContext(); - String query = (String)mc.get(MessageContext.QUERY_STRING); - System.out.println("Query String = " + query); - ServletRequest req = (ServletRequest)mc.get(MessageContext.SERVLET_REQUEST); - num1 = req.getParameter("num1"); - num2 = req.getParameter("num2"); - } else { - System.out.println("Getting input from input message"); - Node n = null; - if (source instanceof DOMSource) { - n = ((DOMSource)source).getNode(); - } else if (source instanceof StreamSource) { - StreamSource streamSource = (StreamSource)source; - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db = dbf.newDocumentBuilder(); - InputSource inputSource = null; - if (streamSource.getInputStream() != null) { - inputSource = new InputSource(streamSource.getInputStream()); - } else if (streamSource.getReader() != null) { - inputSource = new InputSource(streamSource.getReader()); - } - n = db.parse(inputSource); - } else { - throw new RuntimeException("Unsupported source: " + source); - } - NodeList children = n.getChildNodes(); - for (int i = 0; i < children.getLength(); i++) { - Node child = children.item(i); - if (child.getNodeName().equals("add")) { - num1 = child.getAttributes().getNamedItem("num1").getNodeValue(); - num2 = child.getAttributes().getNamedItem("num2").getNodeValue(); - break; - } - } - } - - int n1 = Integer.parseInt(num1); - int n2 = Integer.parseInt(num2); - return createResultSource(n1 + n2); - } catch(Exception e) { - e.printStackTrace(); - throw new HTTPException(500); - } - } - - private Source createResultSource(int sum) { - String body = - "" - + sum - + ""; - Source source = new StreamSource(new ByteArrayInputStream(body.getBytes())); - return source; - } -} diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/src/main/webapp/WEB-INF/jonas-web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/src/main/webapp/WEB-INF/jonas-web.xml deleted file mode 100644 index 27eb0b90c90d8a9967030ace1cb215ab7c17cb1d..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/src/main/webapp/WEB-INF/jonas-web.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - pojo - diff --git a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/src/main/webapp/WEB-INF/web.xml b/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index da9338dd11f6f03cee2930e630d9ebd93230aeb1..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/jaxws-pojo-wsProvider/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - JOnAS Package index - - Display the context which are preconfigured. - - - - SimpleService - org.ow2.jonas.ws.jaxws.test.CalculatorImpl - - - - SimpleService - /SimpleService - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-base/pom.xml b/jonas_tests/jaxws/jaxws-test-base/pom.xml deleted file mode 100644 index f4b2bcff156abe4a5cef2c3f4d322e34d2f673ef..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-base/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - org.ow2.jonas - jonas-modules - 5.1.0-RC3-SNAPSHOT - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests - base - pom - JOnAS :: Tests :: JAXWS :: Tests :: Base - Tests base for JAXWS - - - jaxws-pojo-simple-with-wsdl - jaxws-pojo-simple-without-wsdl - jaxws-pojo-complex - jaxws-pojo-handlers - jaxws-pojo-descriptor - jaxws-pojo-injection - jaxws-pojo-wsProvider - jaxws-pojo-soap-binding - ejb3 - jaxws-ejb-webmethod - jaxws-ejb-injection - jaxws-ejb-descriptor - jaxws-ejb-interceptor - - - - - diff --git a/jonas_tests/jaxws/jaxws-test-clients/pom.xml b/jonas_tests/jaxws/jaxws-test-clients/pom.xml deleted file mode 100644 index 11bcfeb405dc9b5f5257f65e18dba06570d92579..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-clients/pom.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - org.ow2.jonas - jonas-modules - 5.1.0-RC3-SNAPSHOT - - 4.0.0 - org.ow2.jonas.ws.jaxws.itests - tests - jar - JOnAS :: Tests :: JAXWS :: Tests :: Clients - http://maven.apache.org - - - - org.testng - testng - 5.8 - jdk15 - - - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-simple-without-wsdl - ${project.version} - war - - - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-simple-with-wsdl - ${project.version} - war - - - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-complex - ${project.version} - war - - - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-injection - ${project.version} - war - - - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-handler - ${project.version} - war - - - org.ow2.jonas.ws.jaxws.itests.base.pojo - jaxws-pojo-descriptor - ${project.version} - war - - - org.ow2.jonas.ws.jaxws.itests.base.ejb - jaxws-ejb - ${project.version} - - - org.ow2.jonas.ws.jaxws.itests.base.ejb - jaxws-ejb-descriptor - ${project.version} - - - - httpunit - httpunit - 1.6 - - - org.ow2.jonas.osgi - javaee-api - ${project.version} - - - com.sun.xml.messaging.saaj - saaj-impl - 1.3.2 - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - - \ No newline at end of file diff --git a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ejb3/Hello.java b/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ejb3/Hello.java deleted file mode 100644 index 56d95e567e4fd5bbd197661361099b493a0c8aeb..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ejb3/Hello.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ejb3; - - -public interface Hello -{ - public abstract String sayHello(String s); -} - diff --git a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/DispatchAPIWebserviceClientTestCase.java b/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/DispatchAPIWebserviceClientTestCase.java deleted file mode 100644 index 07e26e68b5a68466a92227f98b8b030439b61df8..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/DispatchAPIWebserviceClientTestCase.java +++ /dev/null @@ -1,135 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test; - -import java.io.ByteArrayOutputStream; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPConstants; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; -import javax.xml.ws.Dispatch; -import javax.xml.ws.Service; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; -import org.ow2.jonas.ws.jaxws.test.util.JWebServicesTestCase; - - -/** - * This is a client of SimpleService web service and it tests the - * JAXWS Dispatch API by using Dispatch API to invoke the web service. - * - * @author xiaoda - * - */ -public class DispatchAPIWebserviceClientTestCase extends JWebServicesTestCase { - - public DispatchAPIWebserviceClientTestCase(String s) throws Exception { - super(s); - } - private static final String PORT_URL = "/pojo/SimpleService"; - - - @BeforeClass - public void setUp() throws Exception { - useWar("jaxws-pojo-simple-with-wsdl"); - } - - @AfterClass - public void tearDown() throws Exception { - unUseWar("jaxws-pojo-simple-with-wsdl"); - } - - @Test(groups = { "DispatchAPI" }) - public void testInvokeWithDispatchAPI() { - - try{ - - String port = System.getProperty("http.port"); - - if(port == null) { - port = "9000"; - } - //String endpointUrl = "http://localhost" + port + PORT_URL; - - URL wsdlLocation = new URL("http://localhost:" + port + PORT_URL + "?wsdl"); - - QName serviceName = new QName("http://pojo.test.jaxws.ws.jonas.ow2.org/", - "SimpleService"); - - - QName portName = new QName("http://pojo.test.jaxws.ws.jonas.ow2.org/", - "SimpleServicePort"); - Service service = Service.create(wsdlLocation, serviceName); - - //service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, endpointUrl); - Assert.assertNotNull(service); - - /** Create a Dispatch instance from a service.**/ - Dispatch dispatch = service.createDispatch(portName, - SOAPMessage.class, Service.Mode.MESSAGE); - - Assert.assertNotNull(dispatch); - - /** Create SOAPMessage request. **/ - // compose a request message - MessageFactory mf = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); - - // Create a message. This example works with the SOAPPART. - SOAPMessage request = mf.createMessage(); - SOAPPart part = request.getSOAPPart(); - - // Obtain the SOAPEnvelope and header and body elements. - SOAPEnvelope env = part.getEnvelope(); - SOAPBody body = env.getBody(); - - // Construct the message payload. - SOAPElement operation = body.addChildElement(env.createName("greetMe")); - SOAPElement value = operation.addChildElement("arg0"); - value.addTextNode("JOnAS"); - request.saveChanges(); - - /** Invoke the service endpoint. **/ - SOAPMessage response = dispatch.invoke(request); - - Assert.assertNotNull(response); - - ByteArrayOutputStream os = new ByteArrayOutputStream(); - response.writeTo(os); - String str = new String(os.toByteArray()); - System.out.println(str); - Assert.assertTrue(str.contains("helloJOnAS")); - } catch(Exception e) { - e.printStackTrace(); - } - } -} diff --git a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/DynamicProxyWebserviceClientTestCase.java b/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/DynamicProxyWebserviceClientTestCase.java deleted file mode 100644 index d2fdc7576a628a9f9f5f38e4c40c9330d0e05e22..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/DynamicProxyWebserviceClientTestCase.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test; - - -import java.net.MalformedURLException; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import org.ow2.jonas.ws.jaxws.test.util.JWebServicesTestCase; -import org.ow2.jonas.ws.jaxws.test.util.SimpleServiceInterface; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -public class DynamicProxyWebserviceClientTestCase extends JWebServicesTestCase { - - public DynamicProxyWebserviceClientTestCase(String s) throws Exception { - super(s); - } - private static final String PORT_URL = "/pojo/SimpleService"; - - - @BeforeClass - public void setUp() throws Exception { - useWar("jaxws-pojo-simple-with-wsdl"); - } - - @AfterClass - public void tearDown() throws Exception { - unUseWar("jaxws-pojo-simple-with-wsdl"); - } - - - @Test(groups = { "DynamicProxy" }) - public void testInvokeWithDispatchAPI() throws MalformedURLException { - - String port = System.getProperty("http.port"); - - if(port == null) { - port = "9000"; - } - String UrlString = "http://localhost:"+ port + PORT_URL +"?wsdl"; - - QName serviceName = new QName("http://pojo.test.jaxws.ws.jonas.ow2.org/","SimpleService"); - - QName portName = new QName("http://pojo.test.jaxws.ws.jonas.ow2.org/","SimpleServicePort"); - - System.out.println("UrlString = " + UrlString); - URL helloWsdlUrl = new URL(UrlString); - - //ServiceFactory serviceFactory = ServiceFactory.newInstance(); - - Service simpleService = Service.create(helloWsdlUrl, serviceName); - SimpleServiceInterface ssi =(SimpleServiceInterface)simpleService.getPort( portName, SimpleServiceInterface.class); - - //javax.xml.ws.BindingProvider bp = (javax.xml.ws.BindingProvider)ssi; - //Map context = bp.getRequestContext(); - //context.put("javax.xml.ws.session.maintain", Boolean.TRUE); - - Assert.assertEquals( ssi.greetMe("JOnAS"), "helloJOnAS"); - } -} diff --git a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/EJBClientTestCases.java b/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/EJBClientTestCases.java deleted file mode 100644 index 9ef18cecae18c2c1b7210fd0e0f4d73bb3c0d4dc..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/EJBClientTestCases.java +++ /dev/null @@ -1,247 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test; - -import java.io.ByteArrayOutputStream; -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.xml.messaging.URLEndpoint; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; -import org.ow2.jonas.ws.jaxws.test.util.JWebServicesTestCase; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - - -public class EJBClientTestCases extends JWebServicesTestCase { - private static final String PORT_URL_WITH_WEBMETHOD = "/jaxws-ejb-webmethod/JAXWSBeanWithWebMethod"; - private static final String PORT_URL_WITHOUT_WEBMETHOD = "/jaxws-ejb-webmethod/JAXWSBeanWithoutWebMethod"; - private static final String PORT_URL_DESCRIPTOR = "/jaxws-ejb-descriptor/JAXWSBean_descriptor"; - private static final String PORT_URL_INJECTION = "/jaxws-ejb-injection/JAXWSBeanInjection"; - private static final String PORT_URL_INTERCEPTOR = "/jaxws-ejb-interceptor/EJBWSwihtInterceptors"; - public EJBClientTestCases(String s) throws Exception { - super(s); - } - - @BeforeClass - public void setUp() throws Exception { - } - - @AfterClass - public void tearDown() throws Exception { - } - - @Test(groups = { "EJB_with_webmethod" }) - public void testWithWebmethodWSDL() throws Exception { - useBeans("jaxws-ejb-webmethod"); - try { - Assert.assertNotNull(getWSDLForService(PORT_URL_WITH_WEBMETHOD),"Can not get wsdl for EJB_with_webmethod!"); - } finally { - unUseBeans("jaxws-ejb-webmethod"); - } - } - - @Test(groups = { "EJB_with_webmethod" }) - public void testWithWebmethodInvoke() throws Exception { - useBeans("jaxws-ejb-webmethod"); - String response = null; - try { - response = invokeEJBWebService(PORT_URL_WITH_WEBMETHOD,"greetMe","arg0"); - Assert.assertTrue(response.contains("Hello foo bar"),"greetMe() should be exposed as web method!"); - - response = invokeEJBWebService(PORT_URL_WITH_WEBMETHOD,"greetMeFault","arg0"); - Assert.assertTrue(response.contains("my error"),"greetMeFault() should be exposed as web method!"); - - response = invokeEJBWebService(PORT_URL_WITH_WEBMETHOD,"greetYou","arg0"); - Assert.assertTrue(!response.contains("Hi foo bar"),"greetYou() should not be exposed as web method!"); - - response = invokeEJBWebService(PORT_URL_WITH_WEBMETHOD,"sayHello","arg0"); - Assert.assertTrue(!response.contains("Hello World! foo bar"),"sayHello() should not be exposed as web method!"); - - } finally { - unUseBeans("jaxws-ejb-webmethod"); - } - } - - @Test(groups = { "EJB_without_webmethod" }) - public void testWithoutWebmethodWSDL() throws Exception { - useBeans("jaxws-ejb-webmethod"); - try { - Assert.assertNotNull(getWSDLForService(PORT_URL_WITHOUT_WEBMETHOD),"Can not get wsdl for EJB_without_webmethod!"); - } finally { - unUseBeans("jaxws-ejb-webmethod"); - } - } - - @Test(groups = { "EJB_without_webmethod" }) - public void testWithoutWebmethodInvoke() throws Exception { - useBeans("jaxws-ejb-webmethod"); - String response = null; - try { - response = invokeEJBWebService(PORT_URL_WITHOUT_WEBMETHOD,"greetMe","arg0"); - Assert.assertTrue(response.contains("Hello foo bar"),"greetMe() should be exposed as web method!"); - - response = invokeEJBWebService(PORT_URL_WITHOUT_WEBMETHOD,"greetYou","arg0"); - //System.out.println("******************greetYou : " + response); - Assert.assertTrue(response.contains("Hi foo bar"),"greetYou() should be exposed as web method!"); - - response = invokeEJBWebService(PORT_URL_WITHOUT_WEBMETHOD,"greetMeFault","arg0"); - Assert.assertTrue(response.contains("my error"),"greetMeFault() should be exposed as web method!"); - - response = invokeEJBWebService(PORT_URL_WITHOUT_WEBMETHOD,"sayHello","arg0"); - Assert.assertTrue(!response.contains("Hello World! foo bar"),"sayHello() should not be exposed as web method!"); - - } finally { - unUseBeans("jaxws-ejb-webmethod"); - } - } - - @Test(groups = { "EJB_descriptor" }) - public void testDescriptorWSDL() throws Exception { - useBeans("jaxws-ejb-descriptor"); - try { - Assert.assertNotNull(getWSDLForService(PORT_URL_DESCRIPTOR),"Can not get wsdl for EJB_descriptor!"); - } finally { - unUseBeans("jaxws-ejb-descriptor"); - } - } - - @Test(groups = { "EJB_descriptor" }) - public void testDescriptorInvoke() throws Exception { - useBeans("jaxws-ejb-descriptor"); - String response = null; - try { - response = invokeEJBWebService(PORT_URL_DESCRIPTOR,"greetMe","arg0"); - Assert.assertTrue(response.contains("Hello foo bar"),"Reply of greetMe() is not right!"); - } finally { - unUseBeans("jaxws-ejb-descriptor"); - } - } - - @Test(groups = { "EJB_injection" }) - public void testWSContextInjectionInvoke() throws Exception { - useBeans("jaxws-ejb-injection"); - String response = null; - try { - response = invokeEJBWebService(PORT_URL_INJECTION,"greetMe","arg0"); - Assert.assertTrue(response.contains("foo barwsContext"),"wsContext is not injected correctly!"); - } finally { - unUseBeans("jaxws-ejb-injection"); - } - } - - @Test(groups = { "EJB_injection" }) - public void testEJBResourceInjectionInvoke() throws Exception { - useBeans("jaxws-ejb-injection"); - useBeans("ejb3"); - String response = null; - try { - response = invokeEJBWebService(PORT_URL_INJECTION,"greetMe","arg0"); - Assert.assertTrue(response.contains("foo barwsContexthello"),"EJB resource is not injected correctly!"); - } finally { - unUseBeans("jaxws-ejb-injection"); - unUseBeans("ejb3"); - } - } - - @Test(groups = { "EJB_interceptor" }) - public void testEJBInterceptorInvoke() throws Exception { - useBeans("jaxws-ejb-interceptor"); - String response = null; - try { - response = invokeEJBWebService(PORT_URL_INTERCEPTOR,"greetMe","arg0"); - Assert.assertTrue(response.contains("intercepted"),"EJB resource is not injected correctly!"); - } finally { - unUseBeans("jaxws-ejb-interceptor"); - } - } - - private Definition getWSDLForService(String servicePort) throws WSDLException { - String port = System.getProperty("http.port"); - if(port == null) - port = "9000"; - - String url = "http://localhost:" + port + servicePort + "?WSDL"; - WSDLFactory factory = WSDLFactory.newInstance(); - WSDLReader reader = factory.newWSDLReader(); - reader.setFeature("javax.wsdl.importDocuments", true); - return reader.readWSDL(url); - } - - private String invokeEJBWebService(String servicePort, String opName, String paraName) throws UnsupportedOperationException, SOAPException { - - String port = System.getProperty("http.port"); - - if(port == null) { - port = "9000"; - } - SOAPConnectionFactory soapConnFactory = - SOAPConnectionFactory.newInstance(); - SOAPConnection connection = soapConnFactory.createConnection(); - - MessageFactory messageFactory = MessageFactory.newInstance(); - SOAPMessage message = messageFactory.createMessage(); - - SOAPPart soapPart = message.getSOAPPart(); - SOAPEnvelope envelope = (SOAPEnvelope) soapPart.getEnvelope(); - SOAPBody body = envelope.getBody(); - - SOAPElement bodyElement = body.addChildElement(envelope.createName(opName)); - SOAPElement strElement = bodyElement.addChildElement(paraName); - strElement.setValue("foo bar"); - - message.saveChanges(); - //message.writeTo(System.out); - //System.out.println(); - - URLEndpoint destination = new URLEndpoint("http://localhost:"+ port + servicePort); - SOAPMessage reply = connection.call(message, destination); - - Assert.assertNotNull(reply,"Reply of " + servicePort + " is Null!"); - String response = null; - try{ - ByteArrayOutputStream os = new ByteArrayOutputStream(); - reply.writeTo(os); - response = new String(os.toByteArray()); - } catch(Exception e) { - e.printStackTrace(); - } - connection.close(); - return response; - } - -} diff --git a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/PojoClientTestCases.java b/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/PojoClientTestCases.java deleted file mode 100644 index 1558e59afe167e0f58de7ebec5388772ac2c0470..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/PojoClientTestCases.java +++ /dev/null @@ -1,453 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test; - -import java.io.ByteArrayOutputStream; -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.xml.messaging.URLEndpoint; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPConnection; -import javax.xml.soap.SOAPConnectionFactory; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; -import javax.xml.soap.SOAPPart; -import java.net.HttpURLConnection; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import org.xml.sax.InputSource; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Text; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import java.io.InputStream; -import java.net.URL; -import java.io.StringReader; -import java.io.OutputStream; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import org.ow2.jonas.ws.jaxws.test.util.JWebServicesTestCase; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -public class PojoClientTestCases extends JWebServicesTestCase { - - private static final String SIMPLE_PORT = "/pojo/SimpleService"; - private static final String COMPLEX_PORT = "/pojo/JAXWSBean3Service"; - - public PojoClientTestCases(String s) throws Exception { - super(s); - } - - @BeforeClass - public void setUp() throws Exception { - } - - @AfterClass - public void tearDown() throws Exception { - } - - @Test(groups = { "Pojo_WebserviceContext_Injection" }) - public void testWsContextInjectionWSDL() throws Exception { - useWar("jaxws-pojo-injection"); - try { - Assert.assertNotNull(getWSDLForService(SIMPLE_PORT),"Can not get wsdl for Pojo_WebserviceContext_Injection!"); - } finally { - unUseWar("jaxws-pojo-injection"); - } - } - - @Test(groups = { "Pojo_WebserviceContext_Injection" }) - public void testWsContextInjectionInvoke() throws Exception { - useWar("jaxws-pojo-injection"); - try { - Assert.assertTrue(invokePojoService(SIMPLE_PORT).contains("helloJOnAS"),"Reply of greetMe() is not right!"); - } finally { - unUseWar("jaxws-pojo-injection"); - } - } - - @Test(groups = { "Pojo_Simple_with_WSDL" }) - public void testSimpleWithWSDLWSDL() throws Exception { - useWar("jaxws-pojo-simple-with-wsdl"); - try { - Assert.assertNotNull(getWSDLForService(SIMPLE_PORT),"Can not get wsdl for Pojo_Simple_with_WSDL!"); - } finally { - unUseWar("jaxws-pojo-simple-with-wsdl"); - } - } - - @Test(groups = { "Pojo_Simple_with_WSDL" }) - public void testSimpleWithWSDLInvoke() throws Exception { - useWar("jaxws-pojo-simple-with-wsdl"); - try { - Assert.assertTrue(invokePojoService(SIMPLE_PORT).contains("helloJOnAS"),"Reply of greetMe() is not right!"); - } finally { - unUseWar("jaxws-pojo-simple-with-wsdl"); - } - } - - - @Test(groups = { "Pojo_Simple_without_WSDL" }) - public void testSimpleWithoutWSDLWSDL() throws Exception { - useWar("jaxws-pojo-simple-without-wsdl"); - try { - Assert.assertNotNull(getWSDLForService(SIMPLE_PORT),"Can not get wsdl for Pojo_Simple_without_WSDL!"); - } finally { - unUseWar("jaxws-pojo-simple-without-wsdl"); - } - } - - @Test(groups = { "Pojo_Simple_with_WSDL" }) - public void testSimpleWithoutWSDLInvoke() throws Exception { - useWar("jaxws-pojo-simple-without-wsdl"); - try { - Assert.assertTrue(invokePojoService(SIMPLE_PORT).contains("helloJOnAS"),"Reply of SimpleService is not right!"); - } finally { - unUseWar("jaxws-pojo-simple-without-wsdl"); - } - } - - @Test(groups = { "Pojo_Descriptor" }) - public void testDescriptorWSDL() throws Exception { - useWar("jaxws-pojo-descriptor"); - try { - Assert.assertNotNull(getWSDLForService(SIMPLE_PORT),"Can not get wsdl for SimpleService!"); - } finally { - unUseWar("jaxws-pojo-descriptor"); - } - } - - @Test(groups = { "Pojo_Descriptor" }) - public void testDescriptorInvoke() throws Exception { - useWar("jaxws-pojo-descriptor"); - try { - Assert.assertTrue(invokePojoService(SIMPLE_PORT).contains("helloJOnASSOAPHandlerSOAPHandler"),"Reply of SimpleService is not right!"); - } finally { - unUseWar("jaxws-pojo-descriptor"); - } - } - - @Test(groups = { "Pojo_Handler" }) - public void testHandlerWSDL() throws Exception { - useWar("jaxws-pojo-handlers"); - Assert.assertNotNull(getWSDLForService(SIMPLE_PORT),"Can not get wsdl for SimpleService!"); - unUseWar("jaxws-pojo-handlers"); - } - - @Test(groups = { "Pojo_Handler" }) - public void testHandlerInvoke() throws Exception { - useWar("jaxws-pojo-handlers"); - try { - Assert.assertTrue(invokePojoService(SIMPLE_PORT).contains("helloJOnASSOAPHandler"),"Handler is not called correctly!"); - - } finally { - unUseWar("jaxws-pojo-handlers"); - } - } - - - @Test(groups = { "Pojo_Handler_Injection" }) - public void testHandlerInjectionInvoke() throws Exception { - useWar("jaxws-pojo-handlers"); - try { - Assert.assertTrue(invokePojoService(SIMPLE_PORT).contains("helloJOnASSOAPHandlerwsContext"),"WS Context injection in Handler is not correct!"); - } finally { - unUseWar("jaxws-pojo-handlers"); - } - } - - - @Test(groups = { "Pojo_Complex" }) - public void testComplexWithWSDLWSDL() throws Exception { - useWar("jaxws-pojo-complex"); - try { - Assert.assertNotNull(getWSDLForService(COMPLEX_PORT),"Can not get wsdl for SimpleService!"); - } finally { - unUseWar("jaxws-pojo-complex"); - } - } - - @Test(groups = { "Pojo_Complex" }) - public void testComplexWithWSDLInvoke() throws Exception { - useWar("jaxws-pojo-complex"); - try { - String port = System.getProperty("http.port"); - if(port == null) - port = "9000"; - - SOAPConnectionFactory soapConnFactory = - SOAPConnectionFactory.newInstance(); - SOAPConnection connection = soapConnFactory.createConnection(); - - MessageFactory messageFactory = MessageFactory.newInstance(); - SOAPMessage message = messageFactory.createMessage(); - - SOAPPart soapPart = message.getSOAPPart(); - SOAPEnvelope envelope = (SOAPEnvelope) soapPart.getEnvelope(); - SOAPBody body = envelope.getBody(); - - - SOAPElement bodyElement = body.addChildElement(envelope.createName("getPersons1")); - - message.saveChanges(); - - URLEndpoint destination = new URLEndpoint("http://localhost:"+ port + "/pojo/JAXWSBean3Service"); - SOAPMessage reply = connection.call(message, destination); - String response = null; - try{ - ByteArrayOutputStream os = new ByteArrayOutputStream(); - reply.writeTo(os); - response = new String(os.toByteArray()); - } catch(Exception e) { - e.printStackTrace(); - } - - Assert.assertTrue(response.contains("ericcartmanhomersimpson"),"Reply of SimpleService is not right!"); - - - soapConnFactory = SOAPConnectionFactory.newInstance(); - - connection = soapConnFactory.createConnection(); - - messageFactory = MessageFactory.newInstance(); - message = messageFactory.createMessage(); - - soapPart = message.getSOAPPart(); - envelope = (SOAPEnvelope) soapPart.getEnvelope(); - body = envelope.getBody(); - - - bodyElement = body.addChildElement(envelope.createName("getPersons2")); - - message.saveChanges(); - - destination = new URLEndpoint("http://localhost:"+ port + "/pojo/JAXWSBean3Service"); - reply = connection.call(message, destination); - response = null; - try{ - ByteArrayOutputStream os = new ByteArrayOutputStream(); - reply.writeTo(os); - response = new String(os.toByteArray()); - } catch(Exception e) { - e.printStackTrace(); - } - - - Assert.assertTrue(response.contains("ericcartmanhomersimpson"),"Reply of SimpleService is not right!"); - - } finally { - unUseWar("jaxws-pojo-complex"); - } - } - @Test(groups = { "Pojo_SOAPBinding" }) - public void testSOAPBindingInvoke() throws Exception { - //useWar("jaxws-pojo-SOAPBinding"); - try { - //Assert.assertTrue(invokePojoService(SIMPLE_PORT).contains("helloJOnAS"),"Reply of greetMe() is not right!"); - } finally { - //unUseWar("jaxws-pojo-SOAPBinding"); - } - } - - @Test(groups = { "Pojo_wsProvider" }) - public void testWSProviderInvoke() throws Exception { - useWar("jaxws-pojo-wsProvider"); - try { - InputStream requestInput = this.getClass().getResourceAsStream("/request1.xml"); - - URL url = new URL("http://localhost:9000/pojo/SimpleService"); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); - try { - String reply = call(requestInput, conn); - //System.out.println("********************************"+reply); - - InputSource is = new InputSource(new StringReader(reply)); - Document doc = parseMessage(is); - - Text replyMsg = findText(doc.getDocumentElement(), "120"); - Assert.assertEquals(replyMsg.getData(), "120"); - - - } finally { - conn.disconnect(); - } - } finally { - unUseWar("jaxws-pojo-wsProvider"); - } - } - - - - private Definition getWSDLForService(String servicePort) throws WSDLException { - String port = System.getProperty("http.port"); - if(port == null) - port = "9000"; - - String url = "http://localhost:" + port + servicePort + "?WSDL"; - WSDLFactory factory = WSDLFactory.newInstance(); - WSDLReader reader = factory.newWSDLReader(); - reader.setFeature("javax.wsdl.importDocuments", true); - return reader.readWSDL(url); - } - - private String invokePojoService(String servicePort) throws UnsupportedOperationException, SOAPException { - String port = System.getProperty("http.port"); - if(port == null) - port = "9000"; - - SOAPConnectionFactory soapConnFactory = - SOAPConnectionFactory.newInstance(); - SOAPConnection connection = soapConnFactory.createConnection(); - - MessageFactory messageFactory = MessageFactory.newInstance(); - SOAPMessage message = messageFactory.createMessage(); - - SOAPPart soapPart = message.getSOAPPart(); - SOAPEnvelope envelope = (SOAPEnvelope) soapPart.getEnvelope(); - SOAPBody body = envelope.getBody(); - - - SOAPElement bodyElement = body.addChildElement(envelope.createName("greetMe")); - SOAPElement strElement = bodyElement.addChildElement("arg0"); - strElement.setValue("JOnAS"); - - message.saveChanges(); - //message.writeTo(System.out); - //System.out.println(); - - URLEndpoint destination = new URLEndpoint("http://localhost:"+ port + servicePort); - SOAPMessage reply = connection.call(message, destination); - - Assert.assertNotNull(reply,"Reply of SimpleService is Null!"); - - String response = null; - try{ - ByteArrayOutputStream os = new ByteArrayOutputStream(); - reply.writeTo(os); - response = new String(os.toByteArray()); - } catch(Exception e) { - e.printStackTrace(); - } - connection.close(); - - return response; - } - - private static String call(InputStream requestInput, HttpURLConnection conn) throws IOException { - conn.setConnectTimeout(30 * 1000); - conn.setReadTimeout(30 * 1000); - conn.setDoInput(true); - conn.setUseCaches(false); - - if (requestInput == null) { - conn.setRequestMethod("GET"); - conn.setRequestProperty("Content-Type", "application/xml"); - - conn.connect(); - } else { - conn.setRequestMethod("POST"); - conn.setDoOutput(true); - conn.setRequestProperty("Content-Type", "application/xml"); - - conn.connect(); - - OutputStream out = conn.getOutputStream(); - - byte[] data = new byte[1024]; - int read = 0; - while ((read = requestInput.read(data, 0, data.length)) != -1) { - out.write(data, 0, read); - } - - requestInput.close(); - - out.flush(); - out.close(); - } - - InputStream is = null; - - try { - is = conn.getInputStream(); - } catch (IOException e) { - is = conn.getErrorStream(); - } - - StringBuffer buf = new StringBuffer(); - BufferedReader in = new BufferedReader(new InputStreamReader(is)); - String inputLine; - while ((inputLine = in.readLine()) != null) { - //System.out.println(inputLine); - buf.append(inputLine); - } - in.close(); - - return buf.toString(); - } - - - private static Document parseMessage(InputSource is) throws Exception { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - dbf.setNamespaceAware(true); - DocumentBuilder db = dbf.newDocumentBuilder(); - - Document doc = db.parse(is); - return doc; - } - - private static Text findText(Element element, String value) { - NodeList list = element.getChildNodes(); - for (int i = 0; i < list.getLength(); i++) { - Node child = (Node)list.item(i); - if (child instanceof Text) { - Text text = (Text)child; - if (text.getData().indexOf(value) != -1) { - return text; - } - } else if (child instanceof Element) { - Element childEl = (Element)child; - Text text = findText(childEl, value); - if (text != null) { - return text; - } - } - } - return null; - } -} diff --git a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/util/JWebServicesTestCase.java b/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/util/JWebServicesTestCase.java deleted file mode 100644 index 9930758deb0fbffc86d272fb1757a79a06b083eb..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/util/JWebServicesTestCase.java +++ /dev/null @@ -1,510 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999~2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.util; - -import java.io.IOException; -import java.util.Set; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import com.meterware.httpunit.WebConversation; - -/** - * Define a class to add useful methods for test the webservices - * - Deploy ear, war and beans - * - Retrieve initial context - * @author Florent Benoit - */ -public class JWebServicesTestCase { - - /** - * Name of the JOnAS server used for tests - */ - private static String jonasName = "jonas"; - - /** - * JONAS_BASE - */ - protected static String jb = null; - - /** - * Initial context used for lookup - */ - protected static Context ictx = null; - - /** - * Connection to the MBeanServer - */ - private static MBeanServerConnection cnx = null; - - /** - * Conversation used for HttpUnit - */ - protected WebConversation wc = null; - - /** - * URL used for the constructor - */ - protected String url = null; - - /** - * Prefix for build URLs - */ - private String prefixUrl = null; - - /** - * Add to the specified url the prefix - * @param url relative URL - * @return absolute path of URL - */ - protected String getAbsoluteUrl (String url) { - return (this.prefixUrl + url); - } - - - /** - * Make an absolute path with the filename. - */ - public String absPath(String name, String extension) { - - String ret = ""; - if ( extension.equals(".jar")) { - ret = jb + "/ejbjars/" + name + ".jar"; - } else if ( extension.equals(".war")) { - ret = jb + "/webapps/" + name + ".war"; - } else if (extension.equals(".ear")) { - ret = jb + "/apps/" + name + ".ear"; - } - return ret; - } - private static JMXServiceURL jmxServerUrl = null; - private static String urlSuffix = "service:jmx:"; - private static String registry = null; - private static String defaultRegistry = "rmi://localhost:19099"; - private static String protocol = null; - private static String defaultProtocol = "jrmp"; - - /* - * Get Connection to the MBean server - * Set the static cnx variable - */ - private void getJmxCnx() { - if (cnx == null) { - try { - if (registry == null) { - registry = defaultRegistry; - } - registry = registry + "/"; - int indx = registry.lastIndexOf(":"); - String st = registry.substring(0, indx); - String serverUrl = urlSuffix + st +"/jndi/"+registry; - - if (protocol == null) { - protocol = defaultProtocol; - } - - String connectorName = protocol.concat("connector_"); - - connectorName = connectorName.concat(jonasName); - serverUrl = serverUrl.concat(connectorName); - - jmxServerUrl = new JMXServiceURL(serverUrl); - JMXConnector cntor = JMXConnectorFactory.connect(jmxServerUrl, null); - cnx = cntor.getMBeanServerConnection(null); - System.out.println("server reached via: "+serverUrl); - } catch (IOException e) { - System.err.println("Can't reach server " + jonasName - + " as couldn't create JMXConnector (" + e.getMessage() - + ")"); - System.err.println("Check name, registry and protocol options."); - System.exit(2); - } - } - } - - /* - * ObjectName of y=the J2eeServerMBean - */ - private static ObjectName j2eeserver = null; - - /* - * Get the ObjectName of the J2eeServerMBean - * @return the ObjectName - */ - private ObjectName getJ2eeServer() { - if (j2eeserver == null) { - try { - ObjectName on = ObjectName.getInstance("*:j2eeType=J2EEServer,name=" + jonasName); - Set j2eeservers = cnx.queryNames(on, null); - if (j2eeservers.isEmpty()) { - System.err.println("Can't admin server " + jonasName + ": didn't found J2EEServer MBean"); - System.exit(2); - } - j2eeserver = (ObjectName) j2eeservers.iterator().next(); - } catch (Exception e) { - System.err.println("Can't invoke mbeanServer: " + e); - } - } - return j2eeserver; - } - - /** - * Initialize the port used by tests and the prefix - * @throws Exception - */ - private void init() throws Exception { - String port = System.getProperty("http.port"); - if (port == null) { - port = "9000"; - } - prefixUrl = "http://localhost:" + port; - setUpProperties(); - } - - /** - * Constructor with a specified name - * @param s the name - * @throws Exception - */ - public JWebServicesTestCase(String s) throws Exception { - init(); - } - /** - * Constructor with a specified name and url - * @param s the name - * @param url the url which can be used - * @throws Exception - */ - public JWebServicesTestCase(String s, String url) throws Exception { - wc = new WebConversation(); - init(); - this.url = getAbsoluteUrl(url); - } - - /** - * Get initialContext - * @return the initialContext - * @throws NamingException if the initial context can't be retrieved - */ - private Context getInitialContext() throws NamingException { - return new InitialContext(); - } - - /** - * Common setUp routine, used for every test. - * @throws Exception if an error occurs - */ - - protected void setUpProperties() throws Exception { - try { - // get InitialContext - if (ictx == null) { - ictx = getInitialContext(); - } - jb = System.getProperty("jonas.base"); - - registry = System.getProperty("registry"); - protocol = System.getProperty("protocol"); - getJmxCnx(); - - } catch (NamingException e) { - System.err.println("Cannot setup test: " + e); - e.printStackTrace(); - } - } - - - /** - * Load an ear file in the jonas server - * @param filename ear file, without ".ear" extension - * @throws Exception if an error occurs - */ - public void useEar(String fname) throws Exception { - String filename = absPath(fname, ".ear"); - try { - // Load ear in JOnAS if not already loaded. - if (!isEarLoaded(filename)) { - loadEar(filename); - } - - } catch (Exception e) { - throw new Exception("Cannot load Ear : " + e.getMessage()); - } - - } - - /** - * Unload an ear file in the jonas server - * @param filename ear file, without ".ear" extension - * @throws Exception if an error occurs - */ - public void unUseEar(String fname) throws Exception { - String filename = absPath(fname, ".ear"); - try { - - if (isEarLoaded(filename)) { - unloadEar(filename); - } - } catch (Exception e) { - throw new Exception("Cannot unload Ear : " + e.getMessage()); - } - } - - /** - * Load a war file in the jonas server - * @param filename war file, without ".war" extension - * @throws Exception if an error occurs - */ - - public void useWar(String fname) throws Exception { - String filename = absPath(fname, ".war"); - try { - // Load war in JOnAS if not already loaded. - if (!isWarLoaded(filename)) { - loadWar(filename); - } - } catch (Exception e) { - throw new Exception("Cannot load War : " + e.getMessage()); - } - } - - /** - * Unload an ear file in the jonas server - * @param filename ear file, without ".ear" extension - * @throws Exception if an error occurs - */ - public void unUseWar(String fname) throws Exception { - String filename = absPath(fname, ".war"); - try { - - if (isWarLoaded(filename)) { - unloadEar(filename); - } - } catch (Exception e) { - throw new Exception("Cannot unload war : " + e.getMessage()); - } - } - - - /** - * Load a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void useBeans(String fname) throws Exception { - try { - String filename = absPath(fname, ".jar"); - // Load bean in EJBServer if not already loaded. - - if (!isJarLoaded(filename)) { - addBeans(filename); - } - } catch (Exception e) { - throw new Exception("Cannot load Bean : " + e.getMessage()); - } - } - - - - /** - * Unload a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void unUseBeans(String filename) throws Exception { - String fname = absPath(filename, ".jar"); - - try { - - //if (isJarLoaded(fname)) { - unloadBeans(fname); - //} - } catch (Exception e) { - throw new Exception("Cannot unload Bean : " + e.getMessage()); - } - } - - - - /* - * isLoaded remote operation - */ - private boolean isLoaded(String filename) { - boolean ret = false; - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - Boolean r = (Boolean) cnx.invoke(getJ2eeServer(), "isDeployed", params, signature); - ret = r.booleanValue(); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - return ret; - } - - /** - * isJarLoaded remote operation - * @param filename jar file, with ".jar" extension - */ - private boolean isJarLoaded(String filename) { - boolean ret = false; - try { - return isLoaded(filename); - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - - return ret; - } - public void addBeans(String filename) { - - try { - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - - /** - * loadEar remote operation - * @param filename war file, with ".war" extension - */ - public void loadWar(String filename) { - try { - - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - - /** - * isWarLoaded remote operation - * @param filename war file, with ".war" extension - */ - private boolean isWarLoaded(String filename) { - boolean ret = false; - try { - return isLoaded(filename); - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - - return ret; - } - /** - * isEarLoaded remote operation - * @param filename ear file, with ".ear" extension - */ - private boolean isEarLoaded(String filename) { - boolean ret = false; - try { - return isLoaded(filename); - - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - - return ret; - } - /** - * loadEar remote operation - * @param filename ear file, with ".ear" extension - */ - public void loadEar(String filename) { - try { - - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - - /** - * unloadBean remote operation - * @param filename ear file, with ".ear" extension - */ - public void unloadEar(String filename) { - try { - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "undeploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot undeploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot unload ear: " + e); - } - } - - /** - * unloadBean remote operation - * @param filename jar file, with ".jar" extension - */ - public void unloadBeans(String filename) { - try { - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "undeploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot undeploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot unload bean: " + e); - } - } -} diff --git a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/util/SimpleServiceInterface.java b/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/util/SimpleServiceInterface.java deleted file mode 100644 index 4b0d078fb513c08bc0a6221ae36651457373fefe..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-clients/src/main/java/org/ow2/jonas/ws/jaxws/test/util/SimpleServiceInterface.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2009 Bull S.A.S. - * Contact: jonas-team@ow2.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.ow2.jonas.ws.jaxws.test.util; - - -import javax.jws.WebMethod; - -public interface SimpleServiceInterface { - - @WebMethod(exclude=false) - public String greetMe(String str); -} diff --git a/jonas_tests/jaxws/jaxws-test-clients/src/main/resources/request1.xml b/jonas_tests/jaxws/jaxws-test-clients/src/main/resources/request1.xml deleted file mode 100644 index ea9019fe059abaceb68b3b945161586e87e4196a..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/jaxws-test-clients/src/main/resources/request1.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - \ No newline at end of file diff --git a/jonas_tests/jaxws/pom.xml b/jonas_tests/jaxws/pom.xml deleted file mode 100644 index 86b86ed43d69b709a81e5f367f5c8027298683fc..0000000000000000000000000000000000000000 --- a/jonas_tests/jaxws/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - org.ow2.jonas - jonas-modules - 5.1.0-RC3-SNAPSHOT - - 4.0.0 - org.ow2.jonas.ws.jaxws - itests - pom - JOnAS :: Tests :: JAXWS - Tests for JAXWS - - - jaxws-test-base - jaxws-test-clients - jaxws-felix - - - - - \ No newline at end of file diff --git a/jonas_tests/jonas5_tests.ipr b/jonas_tests/jonas5_tests.ipr deleted file mode 100644 index d6b6640553a7c996544f3053251f06aa0fa44538..0000000000000000000000000000000000000000 --- a/jonas_tests/jonas5_tests.ipr +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jonasadmin/build.xml b/jonas_tests/jonasadmin/build.xml deleted file mode 100644 index 5e115b2262a1938131cf06e36b1bfc29c0e072fe..0000000000000000000000000000000000000000 --- a/jonas_tests/jonasadmin/build.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/jonasserver/F_JonasAdminInfoServer.java b/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/jonasserver/F_JonasAdminInfoServer.java deleted file mode 100755 index 8ca4bc5a597389a06f993b8f345000b68dafbedf..0000000000000000000000000000000000000000 --- a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/jonasserver/F_JonasAdminInfoServer.java +++ /dev/null @@ -1,483 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jonasadmin.test.jonasserver; - -import java.io.IOException; -import java.net.MalformedURLException; - -import junit.framework.TestSuite; - -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminAuth; -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminTestCase; -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminUtils; -import org.ow2.jonas.Version; -import org.xml.sax.SAXException; - -import com.meterware.httpunit.HttpUnitOptions; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebLink; -import com.meterware.httpunit.WebResponse; -import com.meterware.httpunit.WebTable; - -/** - * Class for testing server infos in jonasAdmin - * @author kemlerp - * - */ -public class F_JonasAdminInfoServer extends JonasAdminTestCase { - - /** - * URL of the Server Management - */ - private static final String URL_JONASADMIN_SERVER = "EditJonasServer.do"; - - /** - * URL of the JMX SERVER - */ - private static final String URL_JONASADMIN_JMX_SERVER = "EditJmxServer.do"; - - /** - * URL of the server registry - */ - private static final String URL_JONASADMIN_SERVER_REGISTRY = "ListRegistry.do"; - - /** - * URL of the SERVLET SERVER - */ - private static final String URL_JONASADMIN_SERVLET_SERVER = "EditServletServer.do"; - - /** - * URL of the JVM - */ - private static final String URL_JONASADMIN_JVM = "EditJvm.do"; - - /** - * URL of owner mbeans - */ - private static final String URL_JONASADMIN_OWNER = "/jonasAdmin/ListOwnerMBeans.do"; - - /** - * RMI PROTOCOL - */ - private static final String RMI_PROTOCOL = "rmi/"; - - /** - * Value of select parameter for JVM - */ - private static final String SELECT_JVM_MBEAN = "jonas%3Aj2eeType%3DJVM%2Cname%3Djonas%2CJ2EEServer%3Djonas"; - - /** - * Value of select parameter for MBEAN Server - */ - private static final String SELECT_MBEAN_SERVER_MBEAN = "JMImplementation%3Atype%3DMBeanServerDelegate"; - - /** - * Value of select parameter for Servlet Server - */ - private static final String SELECT_SERVLET_SERVER_MBEAN = "jonas%3Atype%3Dservice%2Cname%3DwebContainers"; - - /** - * Value of select parameter for Catalina Server - */ - private static final String SELECT_CATALINA_SERVER = "Catalina%3Atype%3DServer"; - - /** - * URL of the MBean attributs - */ - private static final String URL_MBEAN_ATTRIBUTS = "/jonasAdmin/ListMBeanAttributes.do?select="; - - /** - * Balise HTML - */ - private static final String END_OF_COLUMN = ""; - - /** - * A 2nd connection to jonasAdmin - */ - private static WebConversation wc2 = new WebConversation(); - - /** - * Constructor with a specified name - * @param s name - */ - public F_JonasAdminInfoServer(String s) { - super(s, URL_JONASADMIN); - } - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_JonasAdminInfoServer(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(F_JonasAdminInfoServer.class); - } - - /** - * Setup need for these tests - * jonasAdmin is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - - unUseEar("earsample"); - - if (wc.getCurrentPage().getURL() == null) { - useWar("jonasAdmin"); - // login to jonas admin - try { - JonasAdminAuth.doValidAuth(wc, url); - } catch (Exception e) { - fail("authentification failed : " + e); - } - } else { - // if there was an error, the connection must be restablished - try { - wc.getFrameContents(FRAME_TREE); - } catch (Exception e) { - wc.getResponse(urlLogOut); - // login to jonas admin - try { - JonasAdminAuth.doValidAuth(wc, url); - } catch (Exception auth) { - fail("authentification failed : " + auth); - } - } - } - } - - /** - * Test JOnAS server infos - * @throws Exception if error occurs - * - */ - public void testInfos() throws Exception { - - WebResponse wr; - WebLink link; - WebTable table; - JonasAdminUtils utils = new JonasAdminUtils(); - - // Disable errors of javascript - HttpUnitOptions.setExceptionsThrownOnScriptError(false); - // Disable exception thrown on error status - HttpUnitOptions.setExceptionsThrownOnErrorStatus(false); - - String jonasName = null; - String jonasVersion = Version.getNumber(); - String jonasProtocol = RMI_PROTOCOL + jProp.getRegistryProtocol(); - - String mbeanId = null; - String mbeanSpecification = null; - String mbeanSpecVersion = null; - String mbeanSpecVendor = null; - String mbeanImplementation = null; - String mbeanImplVersion = null; - String mbeanImplVendor = null; - - String registryProtocol = jProp.getRegistryProtocol(); - String registryUrl = jProp.getRegistryUrl(); - int jndiNb = 0; - - String servletName = null; - String servletVersion = null; - String servletService = null; - String servletEngine = null; - String servletHost = null; - - String jvmVersion = jProp.getJvmVersion(); - String jvmVendor = jProp.getJvmVendor(); - String jvmNode = null; - - - // OPEN A SECOND CONNECTION - // login to jonas admin - try { - JonasAdminAuth.doValidAuth(wc2, url); - } catch (Exception e) { - fail("authentification failed : " + e); - } - - // TEST JONAS SERVER - // Go to jonas server management - wr = wc.getFrameContents(FRAME_TREE); - link = wr.getFirstMatchingLink( WebLink.MATCH_URL_STRING, URL_JONASADMIN_SERVER); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - - // Get jonas server name - String text; - text = wr.getText(); - int beginIndex = text.indexOf("Server JOnAS ( "); - int endIndex = text.indexOf(" )", beginIndex); - jonasName = text.substring(beginIndex + "Server JOnAS ( ".length(), endIndex); - - try { - // Get table - table = utils.getTable(wr, 0); - - // Verify - assertEquals("It is not the jonas name. ", jonasName, table.getTableCell(0, 2).getText()); - assertEquals("It is not the jonas version. ", jonasVersion, table.getTableCell(1, 2).getText()); - assertEquals("It is not the jonas protocol. ", jonasProtocol, table.getTableCell(2, 2).getText()); - } catch (SAXException e) { - fail("The jonas table is incorrect."); - } - - - // TEST JMX SERVER - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_JMX_SERVER); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - - mbeanId = getMBeanAttribut(SELECT_MBEAN_SERVER_MBEAN, "MBeanServerId"); - mbeanSpecification = getMBeanAttribut(SELECT_MBEAN_SERVER_MBEAN, "SpecificationName"); - mbeanSpecVersion = getMBeanAttribut(SELECT_MBEAN_SERVER_MBEAN, "SpecificationVersion"); - mbeanSpecVendor = getMBeanAttribut(SELECT_MBEAN_SERVER_MBEAN, "SpecificationVendor"); - mbeanImplementation = getMBeanAttribut(SELECT_MBEAN_SERVER_MBEAN, "ImplementationName"); - mbeanImplVersion = getMBeanAttribut(SELECT_MBEAN_SERVER_MBEAN, "ImplementationVersion"); - mbeanImplVendor = getMBeanAttribut(SELECT_MBEAN_SERVER_MBEAN, "ImplementationVendor"); - - try { - // Get table - table = utils.getTable(wr, 0); - - // Verify - assertEquals("It is not the mbean server id. ", mbeanId, table.getTableCell(0, 2).getText()); - assertEquals("It is not the mbean server specification name. ", mbeanSpecification, table.getTableCell(1, 2).getText()); - assertEquals("It is not the mbean server specification version. ", mbeanSpecVersion, table.getTableCell(2, 2).getText()); - assertEquals("It is not the mbean server specification vendor. ", mbeanSpecVendor, table.getTableCell(3, 2).getText()); - assertEquals("It is not the mbean server implementation name. ", mbeanImplementation, table.getTableCell(4, 2).getText()); - assertEquals("It is not the mbean server implementation version. ", mbeanImplVersion, table.getTableCell(5, 2).getText()); - assertEquals("It is not the mbean server implementation vendor. ", mbeanImplVendor, table.getTableCell(6, 2).getText()); - } catch (SAXException e) { - fail("The jmx server table is incorrect."); - } - - - // TEST REGISTRY INFOS - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_SERVER_REGISTRY); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - - try { - // Get table - table = utils.getTable(wr, 0); - - // Verify - assertEquals("It is not the registry protocol. ", registryProtocol, table.getTableCell(1, 0).getText()); - assertEquals("It is not the registry url. ", registryUrl, table.getTableCell(1, 1).getText()); - } catch (SAXException e) { - fail("The registry table is incorrect."); - } - - try { - //Get table - table = utils.getTable(wr, 3); - int rowNb = table.getRowCount(); - jndiNb = getJndiNb(wr); - text = table.getText(); - - // Verify - if (jndiNb > 0) { - assertEquals("The number of jndi names is not " + jndiNb, rowNb, jndiNb); - } - assertFalse("'EarOpHome' is found. ", text.indexOf("EarOpHome") > -1); - assertFalse("'EarOpHome_L' is found. ", text.indexOf("EarOpHome_L") > -1); - assertFalse("'eisName' is found. ", text.indexOf("eisName") > -1); - } catch (SAXException e) { - fail("The jndi name table is incorrect."); - } - - // Deploy earsample.ear - useEar("earsample"); - - // Refresh - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_JVM); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_SERVER_REGISTRY); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - - try { - //Get table - table = utils.getTable(wr, 3); - int jndiNb2 = getJndiNb(wr); - text = table.getText(); - - // Verify - if (jProp.isResource()) { - // 3 JNDI NAMES are added: EarOpHome, EarOpHome_L, eisName - assertEquals("The number of JNDI names has not been updated: ", jndiNb + 3, jndiNb2); - assertTrue("'eisName' is not found. ", text.indexOf("eisName") > -1); - } else { - // 2 JNDI NAMES are added: EarOpHome, EarOpHome_L - assertEquals("The number of JNDI names has not been updated: ", jndiNb + 2, jndiNb2); - } - assertTrue("'EarOpHome' is not found. ", text.indexOf("EarOpHome") > -1); - assertTrue("'EarOpHome_L' is not found. ", text.indexOf("EarOpHome_L") > -1); - } catch (SAXException e) { - fail("The jndi name table is incorrect."); - } - - - // TEST SERVLET SERVER - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_SERVLET_SERVER); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - - servletName = getMBeanAttribut(SELECT_SERVLET_SERVER_MBEAN, "ServerName"); - servletVersion = getMBeanAttribut(SELECT_SERVLET_SERVER_MBEAN, "ServerVersion"); - // if CATALINA - if (jProp.isCatalina()) { - String selectService = getMBeanAttribut(SELECT_CATALINA_SERVER, "serviceNames"); - if (selectService.indexOf("[ ") == 0) { - if (selectService.indexOf(" ]") == selectService.length()-2) { - selectService = selectService.substring(2, selectService.length()-2); - } else { - selectService = selectService.substring(2); - } - } - servletService = getMBeanAttribut(selectService, "name"); - String selectContainer = getMBeanAttribut(selectService, "containerName"); - servletEngine = getMBeanAttribut(selectContainer, "name"); - servletHost = getMBeanAttribut(selectContainer, "defaultHost"); - } - - try { - // Get table - table = utils.getTable(wr, 0); - - // Verify - assertEquals("It is not the servlet server name. ", servletName, table.getTableCell(0, 2).getText()); - assertEquals("It is not the servlet server version. ", servletVersion, table.getTableCell(1, 2).getText()); - if (jProp.isCatalina()) { - assertEquals("It is not the servlet server service. ", servletService, table.getTableCell(2, 2).getText()); - assertEquals("It is not the servlet server engine. ", servletEngine, table.getTableCell(3, 2).getText()); - assertEquals("It is not the servlet server host. ", servletHost, table.getTableCell(4, 2).getText()); - } - } catch (SAXException e) { - fail("The jmx server table is incorrect."); - } - - - // TEST JVM INFOS - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_JVM); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - - jvmNode = getMBeanAttribut(SELECT_JVM_MBEAN, "node"); - try { - // Get table - table = utils.getTable(wr, 0); - - // Verify - assertEquals("It is not the jvm version. ", jvmVersion, table.getTableCell(0, 2).getText()); - assertEquals("It is not the jvm vendor. ", jvmVendor, table.getTableCell(1, 2).getText()); - assertEquals("It is not the jvm node. ", jvmNode, table.getTableCell(2, 2).getText()); - } catch (SAXException e) { - fail("The jvm table is incorrect."); - } - - } - - /** - * Get the number of JNDI object - * @param contentFrame the content frame - * @return number of JNDI objects - * @throws SAXException if a table or cell doesn't match. - */ - private int getJndiNb(WebResponse contentFrame) throws SAXException { - JonasAdminUtils utils = new JonasAdminUtils(); - WebTable table = utils.getTable(contentFrame, 2); - - String text = table.getTableCell(0, 0).getText(); - int beginIndex = text.indexOf("("); - int endIndex = text.indexOf(")", beginIndex); - String nb = text.substring(beginIndex + "(".length(), endIndex); - - return Integer.parseInt(nb); - } - - /** - * Get MBean attribut - * @param select value of select param to indicate the chosen MBean - * @param attribut name of attribut - * @return value of the attribut - * @throws MalformedURLException if url is invalid - * @throws IOException if url is not correct - * @throws SAXException if an error is found - */ - private String getMBeanAttribut(String select, String attribut) { - WebResponse wr; - String urlAttributs = prefixUrl + URL_MBEAN_ATTRIBUTS + select; - - try { - wr = wc2.getResponse(urlAttributs); - String attributs = wr.getText(); - int position = attributs.indexOf("" + attribut + ""); - int beginIndex = attributs.indexOf("== ", position); - int endIndex = attributs.indexOf(END_OF_COLUMN, beginIndex); - return attributs.substring(beginIndex + "== ".length(), endIndex); - } catch (MalformedURLException e) { - throw new IllegalStateException("Invalid URL: " + url + ". " + e); - } catch (IOException e) { - throw new IllegalStateException("No response from: " + url + ". " + e); - } catch (SAXException e) { - throw new IllegalStateException("No text found. " + e); - } - } - - /** - * Tear Down cleanUp action - * @throws Exception if an error occurs - */ - public void tearDown() throws Exception { - super.tearDown(); - } -} diff --git a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/resource/F_JonasAdminResourceDatasource.java b/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/resource/F_JonasAdminResourceDatasource.java deleted file mode 100755 index d0db88ad53fbbd146f1bd89eca8ebf7c16fe13d7..0000000000000000000000000000000000000000 --- a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/resource/F_JonasAdminResourceDatasource.java +++ /dev/null @@ -1,592 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jonasadmin.test.resource; - -import java.util.Properties; - -import junit.framework.TestSuite; - -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminAuth; -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminFiles; -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminTestCase; -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminUtils; - -import com.meterware.httpunit.HttpUnitOptions; -import com.meterware.httpunit.SubmitButton; -import com.meterware.httpunit.TableCell; -import com.meterware.httpunit.WebForm; -import com.meterware.httpunit.WebLink; -import com.meterware.httpunit.WebResponse; -import com.meterware.httpunit.WebTable; - -/** - * Class for testing datasource Resource - * @author Paul Kemler - */ -public class F_JonasAdminResourceDatasource extends JonasAdminTestCase { - - /** - * URL of datasource resource - */ - private static final String URL_JONASADMIN_DATASOURCE = "EditDeploy.do?type=datasource"; - - /** - * URL of datasource resource - */ - private static final String URL_JONASADMIN_LIST_DATASOURCES = "ListDatasources.do"; - - /** - * URL of deploy - */ - private static final String URL_JONASADMIN_DEPLOY = "EditDeploy.do"; - - /** - * URL of create datasource - */ - private static final String URL_JONASADMIN_CREATE_DATASOURCE = "EditDatasourceProperties.do?action=create"; - - /** - * URL of Datasource resource viewTree - */ - private static final String URL_JONASADMIN_VIEW_DATASOURCE = "viewTree.do?tree=domain*jonas*resources"; - - /** - * number of tabs when you are in the datasource tabs - */ - private static final int NUMBER_OF_TABS_FOR_DATASOURCE = 2; - - /** - * number of tabs when you are in the CONFIRM tabs - */ - private static final int NUMBER_OF_TABS_FOR_CONFIRM = 3; - - /** - * number of tabs when you are in the 'new datasource' tabs - */ - private static final int NUMBER_OF_TABS_FOR_NEW_DATASOURCE = 3; - - /** - * name of the datasource - */ - private String name = ""; - - /** - * Constructor with a specified name - * @param s name - */ - public F_JonasAdminResourceDatasource(String s) { - super(s, URL_JONASADMIN); - } - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_JonasAdminResourceDatasource(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(F_JonasAdminResourceDatasource.class); - } - - /** - * Setup need for these tests jonasAdmin is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - - if (wc.getCurrentPage().getURL() == null) { - useWar("jonasAdmin"); - // login to jonas admin - try { - JonasAdminAuth.doValidAuth(wc, url); - } catch (Exception e) { - fail("authentification failed : " + e); - } - } else { - // if there was an error, the connection must be restablished - try { - wc.getFrameContents(FRAME_TREE); - } catch (Exception e) { - wc.getResponse(urlLogOut); - // login to jonas admin - try { - JonasAdminAuth.doValidAuth(wc, url); - } catch (Exception auth) { - fail("authentification failed : " + auth); - } - } - } - } - - /** - * Test to deploy and undeploy a datasource - * @throws Exception if error occurs - */ - public void testUndeployDeployDatasource() throws Exception { - - WebResponse wr; - WebLink link; - WebTable table; - WebTable tabTable; - int selectedTab; - /* - * To get some utils for WebTable - */ - JonasAdminUtils utils = new JonasAdminUtils(); - - // Disable errors of javascript - HttpUnitOptions.setExceptionsThrownOnScriptError(false); - // Disable exception thrown on error status - HttpUnitOptions.setExceptionsThrownOnErrorStatus(false); - - if (jProp.isDbm()) { - // Add datasource - name = "new_datasource"; - Properties properties = new Properties(); - properties.put("datasource.name", name); - properties.put("datasource.url", "jdbc:h2:tcp://localhost:9001/db_jonas"); - properties.put("datasource.classname", "org.h2.Driver"); - properties.put("datasource.username", "jonas"); - properties.put("datasource.password", "jonas"); - properties.put("datasource.mapper", "rdb.hsql"); - properties.put("jdbc.connchecklevel", "0"); - properties.put("jdbc.connmaxage", "1440"); - properties.put("jdbc.maxopentime", "60"); - properties.put("jdbc.connteststmt", "select 1"); - properties.put("jdbc.minconpool", "10"); - properties.put("jdbc.maxconpool", "30"); - properties.put("jdbc.samplingperiod", "30"); - properties.put("jdbc.maxwaittime", "5"); - properties.put("jdbc.maxwaiters", "100"); - - useDatasource(name, properties); - - // Go to database - wr = wc.getFrameContents(FRAME_TREE); - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_DATASOURCE); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 1; - - // Verify tabs - tabTable = utils.getTabTable(wr); - testTabs(tabTable, NUMBER_OF_TABS_FOR_DATASOURCE, selectedTab, "Problem in 'Deployment' tab."); - // - links - assertTrue("The link " + URL_JONASADMIN_LIST_DATASOURCES + " is not found in the second tab. ", tabTable - .getTableCell(0, 2).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_LIST_DATASOURCES)); - - String txt = getDeployTable(wr, true); - - if (txt.indexOf(name) == -1) { - fail("The file" + name + " was not found as deployed."); - } - - // Undeploy datasource - WebForm[] webForms = wr.getForms(); - WebForm webForm = webForms[0]; - - String params = webForm.getParameterValue("undeploy"); - WebForm.Scriptable script = webForm.getScriptableObject(); - if (params.length() == 0) { - params += name; - } else { - params += "," + name; - } - script.setParameterValue("undeploy", params); - - SubmitButton button = webForm.getSubmitButtons()[0]; - button.click(); - - // Confirm - WebResponse submitUndeploy = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 2; - - // Verify tabs - tabTable = utils.getTabTable(submitUndeploy); - testTabs(tabTable, NUMBER_OF_TABS_FOR_CONFIRM, selectedTab, "Problem in 'Confirm' tab."); - // - links - assertTrue("The link " + URL_JONASADMIN_DEPLOY + " is not found in the first tab. ", tabTable.getTableCell( - 0, 0).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_DEPLOY)); - assertTrue("The link " + URL_JONASADMIN_LIST_DATASOURCES + " is not found in the third tab. ", tabTable - .getTableCell(0, 4).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_LIST_DATASOURCES)); - - webForms = submitUndeploy.getForms(); - webForm = webForms[0]; - - button = webForm.getSubmitButtons()[0]; - button.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - - // Verify tabs - tabTable = utils.getTabTable(wr); - testTabs(tabTable, NUMBER_OF_TABS_FOR_CONFIRM, selectedTab, "Problem in 'Result' tab."); - // - links - assertTrue("The link " + URL_JONASADMIN_DEPLOY + " is not found in the first tab. ", tabTable.getTableCell( - 0, 0).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_DEPLOY)); - assertTrue("The link " + URL_JONASADMIN_LIST_DATASOURCES + " is not found in the third tab. ", tabTable - .getTableCell(0, 4).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_LIST_DATASOURCES)); - - // Go back to Deployment - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_DEPLOY); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 1; - - // Verify tabs - tabTable = utils.getTabTable(wr); - testTabs(tabTable, NUMBER_OF_TABS_FOR_DATASOURCE, selectedTab, "Problem in 'Deployment' tab."); - // - links - assertTrue("The link " + URL_JONASADMIN_LIST_DATASOURCES + " is not found in the second tab. ", tabTable - .getTableCell(0, 2).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_LIST_DATASOURCES)); - - txt = getDeployTable(wr, true); - - if (txt.indexOf(name) != -1) { - fail("The jonasAdmin webApp has not removed. " + name); - } - - // now deploy - webForms = wr.getForms(); - webForm = webForms[0]; - - params = webForm.getParameterValue("deploy"); - script = webForm.getScriptableObject(); - - if (params.length() == 0) { - params += name; - } else { - params += "," + name; - } - - script.setParameterValue("deploy", params); - button = webForm.getSubmitButtons()[0]; - button.click(); - - // Confirm - submitUndeploy = wc.getFrameContents(FRAME_CONTENT); - // war is in the table - webForms = submitUndeploy.getForms(); - webForm = webForms[0]; - - button = webForm.getSubmitButtons()[0]; - button.click(); - - // Go back to Deployment - wr = wc.getFrameContents(FRAME_CONTENT); - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_DEPLOY); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - - txt = getDeployTable(wr, true); - - if (txt.indexOf(name) == -1) { - fail("The file " + name + " was not found as deployed."); - } - } - } - - /** - * Test to create a new datasource - * @throws Exception if error occurs - */ - public void testCreateNewDatasource() throws Exception { - - WebResponse wr; - WebLink link; - WebTable table; - WebTable tabTable; - int selectedTab; - // Name of the datasource - name = "new_datasource_"; - // JNDI name The JNDI name to use the datasource - String jndiName = ""; - // Description Description of the datasource - String descr = ""; - // URL URL to access to the database - String urlDatasource = "jdbc:h2:tcp://localhost:9001/db_jonas"; - // JDBC Driver JDBC driver class name to access to the database - String driver = "org.h2.Driver"; - // User name User name or login to log in the database - String user = "jonas"; - // User password User password to log in the database - String password = "jonas"; - // Mapper Mapper used for the datasource - String mapper = "rdb.hsql"; - - /* - * To get some utils for WebTable - */ - JonasAdminUtils utils = new JonasAdminUtils(); - - // Disable errors of javascript - HttpUnitOptions.setExceptionsThrownOnScriptError(false); - // Disable exception thrown on error status - HttpUnitOptions.setExceptionsThrownOnErrorStatus(false); - - if (jProp.isDbm()) { - // Go to database - wr = wc.getFrameContents(FRAME_TREE); - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_DATASOURCE); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 1; - - // Go to datasources - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_LIST_DATASOURCES); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 2; - - // Verify tabs - tabTable = utils.getTabTable(wr); - testTabs(tabTable, NUMBER_OF_TABS_FOR_DATASOURCE, selectedTab, "Problem in 'Datasources' tab."); - // - links - assertTrue("The link " + URL_JONASADMIN_DEPLOY + " is not found in the first tab. ", tabTable.getTableCell( - 0, 0).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_DEPLOY)); - - // Find a new name - boolean found = false; - int i = 0; - while (!found) { - if ((wr.getText().indexOf(name + i) == -1)) { - name = name + i; - jndiName = name; - found = true; - } - i++; - } - - // Create a new datasource - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_CREATE_DATASOURCE); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 3; - - // Verify tabs - tabTable = utils.getTabTable(wr); - testTabs(tabTable, NUMBER_OF_TABS_FOR_NEW_DATASOURCE, selectedTab, "Problem in 'New Datasource' tab."); - // - links - assertTrue("The link " + URL_JONASADMIN_DEPLOY + " is not found in the first tab. ", tabTable.getTableCell( - 0, 0).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_DEPLOY)); - assertTrue("The link " + URL_JONASADMIN_LIST_DATASOURCES + " is not found in the third tab. ", tabTable - .getTableCell(0, 2).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_LIST_DATASOURCES)); - - WebForm form = wr.getForms()[0]; - createNewDatasource(form, name, jndiName, descr, urlDatasource, driver, user, password, mapper); - wr = wc.getFrameContents(FRAME_CONTENT); - - // Verify if the datasource is deployed - assertTrue("The created datasource ('" + name + "') is not deployed. ", isLoadedDatasource(name)); - table = utils.getTable(wr, 3); - int datasourceRow = utils.getRow(name, table, 1).intValue(); - if (datasourceRow == -1) { - fail("The datasource '" + name + "' is not found in datasource table. Restart jonas and try again. "); - } else { - // Verify if there is an image to indicate that the datasource is deployed - TableCell cell = table.getTableCell(datasourceRow, 0); - assertEquals("There is no a image to indicate that '" + name + "' datasource is deployed. ", 1, cell.getImages().length); - } - } - - } - - /** - * Test to view empty value error message - * @throws Exception if error occurs - */ - public void testCreateDatasourceWithEmptyValue() throws Exception { - - WebResponse wr; - WebLink link; - WebTable table; - WebTable tabTable; - int selectedTab; - // Name Name of the datasource - name = ""; - // JNDI name The JNDI name to use the datasource - String jndiName = ""; - // Description Description of the datasource - String descr = ""; - // URL URL to access to the database - String urlDatasource = ""; - // JDBC Driver JDBC driver class name to access to the database - String driver = ""; - // User name User name or login to log in the database - String user = ""; - // User password User password to log in the database - String password = ""; - // Mapper Mapper used for the datasource - String mapper = ""; - - /* - * To get some utils for WebTable - */ - JonasAdminUtils utils = new JonasAdminUtils(); - - // Disable errors of javascript - HttpUnitOptions.setExceptionsThrownOnScriptError(false); - // Disable exception thrown on error status - HttpUnitOptions.setExceptionsThrownOnErrorStatus(false); - - if (jProp.isDbm()) { - // Go to database - wr = wc.getFrameContents(FRAME_TREE); - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_DATASOURCE); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 1; - - // Go to datasources - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_LIST_DATASOURCES); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 2; - - // Create a new datasource - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_CREATE_DATASOURCE); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 3; - - WebForm form = wr.getForms()[0]; - createNewDatasource(form, name, jndiName, descr, urlDatasource, driver, user, password, mapper); - wr = wc.getFrameContents(FRAME_CONTENT); - - // Verify error messages - table = utils.getTable(wr, 0); - TableCell cell = table.getTableCell(0, 0); - - // class errors - assertEquals("The value of the class attribut of the cell is not 'errors'. ", "errors", cell.getAttribute("class")); - // Name cannot be empty - String emptyName = "Name cannot be empty"; - assertTrue("The message '" + emptyName + "' is not found. ", cell.getText().indexOf(emptyName) != -1); - // JNDI name cannot be empty - String emptyJndiName = "JNDI name cannot be empty"; - assertTrue("The message '" + emptyJndiName + "' is not found. ", cell.getText().indexOf(emptyJndiName) != -1); - // JDBC Driver cannot be empty - String emptyJdbcDriver = "JDBC Driver cannot be empty"; - assertTrue("The message '" + emptyJdbcDriver + "' is not found. ", cell.getText().indexOf(emptyJdbcDriver) != -1); - } - - } - - /** - * Tear Down - * cleanUp action - */ - public void tearDown() throws Exception { - - if (jProp.isDbm()) { - // remove created datasource file - if (!name.equals("")) { - // Undeploy datasource - unUseDatasource(name); - // Delete file - JonasAdminFiles.deleteConfigFile(name + ".properties"); - name = ""; - } - } - - super.tearDown(); - } - - - /** - * Return the text of the deployed table or the deployable table - * @param wr the WebResponse to use - * @param deployed if true return the text deployed table, if false text of - * deployable - * @return the text of the deployed table or the deployable table - * @throws Exception if an error occurs - */ - private String getDeployTable(WebResponse wr, boolean deployed) throws Exception { - - // Extract right table - JonasAdminUtils utils = new JonasAdminUtils(); - WebTable table = utils.getTable(wr, 0); - - TableCell deployableCell = table.getTableCell(1, 0); - TableCell deployedCell = table.getTableCell(1, 2); - - if (deployed) { - return deployedCell.getText(); - } else { - return deployableCell.getText(); - } - } - - /** - * Create a new datasource in jonasAdmin - * @param form datasource form - * @param name the name of the datasource - * @param datasourceName JNDI name - * @param datasourceDescription the description of the datasource - * @param datasourceUrl url to access to the databse - * @param datasourceClassname JDBC driver class name to access to the - * database - * @param datasourceUsername User name or login to log in the database - * @param datasourcePassword User password to log in the database - * @param datasourceMapper Mapper used for the datasource - * @throws Exception if an error occurs when button is clicked. - */ - private void createNewDatasource(WebForm form, String name, String datasourceName, String datasourceDescription, - String datasourceUrl, String datasourceClassname, String datasourceUsername, String datasourcePassword, - String datasourceMapper) throws Exception { - SubmitButton button = form.getSubmitButtons()[0]; - - form.setParameter("name", name); - form.setParameter("datasourceName", datasourceName); - form.setParameter("datasourceDescription", datasourceDescription); - form.setParameter("datasourceUrl", datasourceUrl); - form.setParameter("datasourceClassname", datasourceClassname); - form.setParameter("datasourceUsername", datasourceUsername); - form.setParameter("datasourcePassword", datasourcePassword); - form.setParameter("datasourceMapper", datasourceMapper); - - button.click(); - } -} \ No newline at end of file diff --git a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/service/database/F_JonasAdminDatabase.java b/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/service/database/F_JonasAdminDatabase.java deleted file mode 100755 index f43c411ae38648298b4ce87a2e2fe2727abff195..0000000000000000000000000000000000000000 --- a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/service/database/F_JonasAdminDatabase.java +++ /dev/null @@ -1,500 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jonasadmin.test.service.database; - -import java.util.Properties; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.Query; -import javax.management.QueryExp; - -import junit.framework.TestSuite; - -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminAuth; -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminFiles; -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminTestCase; -import org.objectweb.jonas.jonasadmin.test.util.JonasAdminUtils; - -import com.meterware.httpunit.HttpUnitOptions; -import com.meterware.httpunit.WebForm; -import com.meterware.httpunit.WebLink; -import com.meterware.httpunit.WebResponse; -import com.meterware.httpunit.WebTable; - -/** - * Class for testing database service - * @author Paul Kemler - * - */ -public class F_JonasAdminDatabase extends JonasAdminTestCase { - - /** - * URL of database service - */ - private static final String URL_JONASADMIN_SERVICE_DATABASE = "ListDatabases.do"; - - /** - * URL of datasource statistics - */ - private static final String URL_JONASADMIN_EDIT = "EditDatasource.do"; - - /** - * URL of datasource statistics - */ - private static final String URL_JONASADMIN_STATISTICS = "EditDatasourceStat.do"; - - /** - * URL of database service - */ - private static final String URL_JONASADMIN_USED_BY = "datasourceUsedBy.jsp"; - - /** - * number of tabs when you are in the datasource tab - */ - private static final int NUMBER_OF_TABS_FOR_DATASOURCE = 1; - - /** - * number of tabs when the datasource is not used - */ - private static final int NUMBER_OF_TABS_FOR_DATASOURCE_NOT_USED = 3; - - /** - * number of tabs when the datasource is used - */ - private static final int NUMBER_OF_TABS_FOR_DATASOURCE_USED = 4; - - /** - * name of the datasource - */ - private String name = ""; - - /** - * Constructor with a specified name - * @param s name - */ - public F_JonasAdminDatabase(String s) { - super(s, URL_JONASADMIN); - } - - /** - * Main method - * @param args the arguments - */ - public static void main(String[] args) { - - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String sArg = args[argn]; - if (sArg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_JonasAdminDatabase(testtorun)); - } - } - - /** - * Get a new TestSuite for this class - * @return a new TestSuite for this class - */ - public static TestSuite suite() { - return new TestSuite(F_JonasAdminDatabase.class); - } - - /** - * Setup need for these tests - * jonasAdmin is required - * @throws Exception if it fails - */ - protected void setUp() throws Exception { - super.setUp(); - - if (wc.getCurrentPage().getURL() == null) { - useWar("jonasAdmin"); - // login to jonas admin - try { - JonasAdminAuth.doValidAuth(wc, url); - } catch (Exception e) { - fail("authentification failed : " + e); - } - } else { - // if there was an error, the connection must be restablished - try { - wc.getFrameContents(FRAME_TREE); - } catch (Exception e) { - wc.getResponse(urlLogOut); - // login to jonas admin - try { - JonasAdminAuth.doValidAuth(wc, url); - } catch (Exception auth) { - fail("authentification failed : " + auth); - } - } - } - } - - /** - * Test information of a JDBC - * @throws Exception if error occurs - * - */ - public void testJDBCInfo() throws Exception { - - WebResponse wr; - WebLink link; - WebTable table; - WebTable tabTable; - int selectedTab; - JonasAdminUtils utils = new JonasAdminUtils(); - - // Disable errors of javascript - HttpUnitOptions.setExceptionsThrownOnScriptError(false); - // Disable exception thrown on error status - HttpUnitOptions.setExceptionsThrownOnErrorStatus(false); - if (jProp.isDbm()) { - // Add datasource - name = "new_datasource_info"; - String datasourceName = name; - String datasourceUrl = "jdbc:h2:tcp://localhost:9001/db_jonas"; - String datasourceClassname = "org.h2.Driver"; - String datasourceUsername = "jonas"; - String datasourcePassword = "jonas"; - String datasourceMapper = "rdb.hsql"; - String jdbcConnchecklevel = "0"; - String jdbcConnmaxage = "1440"; - String jdbcMaxopentime = "60"; - String jdbcConnteststmt = "select 1"; - String jdbcMinconpool = "10"; - String jdbcMaxconpool = "30"; - String jdbcSamplingperiod = "30"; - String jdbcMaxwaittime = "5"; - String jdbcMaxwaiters = "100"; - - Properties properties = new Properties(); - properties.put("datasource.name", datasourceName); - properties.put("datasource.url", datasourceUrl); - properties.put("datasource.classname", datasourceClassname); - properties.put("datasource.username", datasourceUsername); - properties.put("datasource.password", datasourcePassword); - properties.put("datasource.mapper", datasourceMapper); - properties.put("jdbc.connchecklevel", jdbcConnchecklevel); - properties.put("jdbc.connmaxage", jdbcConnmaxage); - properties.put("jdbc.maxopentime", jdbcMaxopentime); - properties.put("jdbc.connteststmt", jdbcConnteststmt); - properties.put("jdbc.minconpool", jdbcMinconpool); - properties.put("jdbc.maxconpool", jdbcMaxconpool); - properties.put("jdbc.samplingperiod", jdbcSamplingperiod); - properties.put("jdbc.maxwaittime", jdbcMaxwaittime); - properties.put("jdbc.maxwaiters", jdbcMaxwaiters); - - useDatasource(name, properties); - - // Use alarm.ear for adding opened connections - useEar("alarm"); - - // Go to service database - wr = wc.getFrameContents(FRAME_TREE); - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_SERVICE_DATABASE); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 1; - - // Verify tabs - tabTable = utils.getTabTable(wr); - testTabs(tabTable, NUMBER_OF_TABS_FOR_DATASOURCE, selectedTab, "Problem in 'Datasources' tab."); - - // Verify JNDI Name - table = utils.getTable(wr, 0); - int rowNewDatasource = utils.getRow(name, table).intValue(); - if (rowNewDatasource == -1) { - fail("'" + name + "' was not found in the table. "); - } - int columnJNDI = 1; - assertEquals("It is not the JNDI name of '" + name + "'. ", datasourceName, table.getTableCell(rowNewDatasource, columnJNDI).getText()); - - // Verify JDBC Connection - int columnJDBCConnection = 2; - int currentOpenedConnection = getCurrentOpenedConnection(datasourceName); - assertEquals("It is not the number of opened connection for '" + name + "'. ", currentOpenedConnection, Integer.parseInt(table.getTableCell(rowNewDatasource, columnJDBCConnection).getText())); - - // Go to "new_datasource_info" database - link = wr.getLinkWith(name); - if (link == null) { - fail("No link was found for '" + name + "'in the page. "); - } - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 2; - - // Verify tabs - tabTable = utils.getTabTable(wr); - testTabs(tabTable, NUMBER_OF_TABS_FOR_DATASOURCE_NOT_USED, selectedTab, "Problem in the datasource tab."); - // - links - assertTrue("The link " + URL_JONASADMIN_SERVICE_DATABASE + " is not found in the first tab. ", tabTable - .getTableCell(0, 0).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_SERVICE_DATABASE)); - assertTrue("The link " + URL_JONASADMIN_STATISTICS + " is not found in the third tab. ", tabTable - .getTableCell(0, 4).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_STATISTICS)); - - // Verify information - // JDBC Datasource configuration - table = utils.getTable(wr, 1); - // JNDI name - assertEquals("It is not the JNDI name of '" + name + "'. ", datasourceName, table.getTableCell(0, 2).getText()); - // Description no desc - assertEquals("It is not the description of '" + name + "'. ", "no desc", table.getTableCell(1, 2).getText()); - // URL jdbc:h2:tcp://localhost:9001/db_jonas - assertEquals("It is not the URL of '" + name + "'. ", datasourceUrl, table.getTableCell(2, 2).getText()); - // User name jonas - assertEquals("It is not the user name of '" + name + "'. ", datasourceUsername, table.getTableCell(3, 2).getText()); - // User password jonas - assertEquals("It is not the user password of '" + name + "'. ", datasourcePassword, table.getTableCell(4, 2).getText()); - // Mapper rdb.hsql - assertEquals("It is not the mapper of '" + name + "'. ", datasourceMapper, table.getTableCell(5, 2).getText()); - - // JDBC Driver configuration - table = utils.getTable(wr, 4); - // Driver class name org.h2.Driver - assertEquals("It is not the driver class name of '" + name + "'. ", datasourceClassname, table.getTableCell(0, 2).getText()); - - // JDBC connection configuration - WebForm form = wr.getForms()[0]; - // Maximum age - assertEquals("It is not the maximum age of '" + name + "'. ", jdbcConnmaxage, form.getParameterValue("jdbcConnMaxAge")); - // Maximum open time - assertEquals("It is not the maximum open time of '" + name + "'. ", jdbcMaxopentime, form.getParameterValue("jdbcMaxOpenTime")); - // Checking level - assertEquals("It is not the checking level of '" + name + "'. ", jdbcConnchecklevel, form.getParameterValue("jdbcConnCheckLevel")); - // Test - assertEquals("It is not the test of '" + name + "'. ", jdbcConnteststmt, form.getParameterValue("jdbcTestStatement")); - // Pool minimum - assertEquals("It is not the pool minimum of '" + name + "'. ", jdbcMinconpool, form.getParameterValue("jdbcMinConnPool")); - // Pool maximum - assertEquals("It is not the pool maximum time of '" + name + "'. ", jdbcMaxconpool, form.getParameterValue("jdbcMaxConnPool")); - // Max Wait Time - assertEquals("It is not the maximum wait time of '" + name + "'. ", jdbcMaxwaittime, form.getParameterValue("jdbcMaxWaitTime")); - // Max Waiters - assertEquals("It is not the maximum waiters of '" + name + "'. ", jdbcMaxwaiters, form.getParameterValue("jdbcMaxWaiters")); - // Sampling Period - assertEquals("It is not the sampling Period of '" + name + "'. ", jdbcSamplingperiod, form.getParameterValue("jdbcSamplingPeriod")); - - } - } - - /** - * Test Used By Tab of database service - * @throws Exception if error occurs - * - */ - public void testJDBCUsedBy() throws Exception { - - WebResponse wr; - WebLink link; - WebTable table; - WebTable tabTable; - int selectedTab; - String jdbc1Datasource = ""; - JonasAdminUtils utils = new JonasAdminUtils(); - - // Disable errors of javascript - HttpUnitOptions.setExceptionsThrownOnScriptError(false); - // Disable exception thrown on error status - HttpUnitOptions.setExceptionsThrownOnErrorStatus(false); - if (jProp.isDbm()) { - - // Go to service database - wr = wc.getFrameContents(FRAME_TREE); - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_SERVICE_DATABASE); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 1; - - // Search if there is a datasource with 'jdbc_1' as JNDI name - table = utils.getTable(wr, 0); - int columnJNDI = 1; - int rowJDBC1 = utils.getRow("jdbc_1", table, columnJNDI).intValue(); - if (rowJDBC1 == -1) { - // Add datasource - name = "new_datasource_used_by"; - String datasourceName = "jdbc_1"; - String datasourceUrl = "jdbc:h2:tcp://localhost:9001/db_jonas"; - String datasourceClassname = "org.h2.Driver"; - String datasourceUsername = "jonas"; - String datasourcePassword = "jonas"; - String datasourceMapper = "rdb.hsql"; - String jdbcConnchecklevel = "0"; - String jdbcConnmaxage = "1440"; - String jdbcMaxopentime = "60"; - String jdbcConnteststmt = "select 1"; - String jdbcMinconpool = "10"; - String jdbcMaxconpool = "30"; - String jdbcSamplingperiod = "30"; - String jdbcMaxwaittime = "5"; - String jdbcMaxwaiters = "100"; - - Properties properties = new Properties(); - properties.put("datasource.name", datasourceName); - properties.put("datasource.url", datasourceUrl); - properties.put("datasource.classname", datasourceClassname); - properties.put("datasource.username", datasourceUsername); - properties.put("datasource.password", datasourcePassword); - properties.put("datasource.mapper", datasourceMapper); - properties.put("jdbc.connchecklevel", jdbcConnchecklevel); - properties.put("jdbc.connmaxage", jdbcConnmaxage); - properties.put("jdbc.maxopentime", jdbcMaxopentime); - properties.put("jdbc.connteststmt", jdbcConnteststmt); - properties.put("jdbc.minconpool", jdbcMinconpool); - properties.put("jdbc.maxconpool", jdbcMaxconpool); - properties.put("jdbc.samplingperiod", jdbcSamplingperiod); - properties.put("jdbc.maxwaittime", jdbcMaxwaittime); - properties.put("jdbc.maxwaiters", jdbcMaxwaiters); - - useDatasource(name, properties); - - jdbc1Datasource = name; - } else { - jdbc1Datasource = table.getTableCell(rowJDBC1, 0).getText(); - } - - // Use alarm.ear - useEar("alarm"); - - // Reload service database page - wr = wc.getFrameContents(FRAME_TREE); - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_SERVICE_DATABASE); - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 1; - - // Verify JDBC Connection is positif - rowJDBC1 = utils.getRow("jdbc_1", table, columnJNDI).intValue(); - int columnJDBCConnection = 2; - int currentOpenedConnection = getCurrentOpenedConnection("jdbc_1"); - assertEquals("It is not the number of opened connection for 'jdbc_1'. ", currentOpenedConnection, Integer.parseInt(table.getTableCell(rowJDBC1, columnJDBCConnection).getText())); - assertTrue("There is no opened connection for 'jdbc_1' JNDI name. ", currentOpenedConnection > 0); - - // Go to database - link = wr.getLinkWith(jdbc1Datasource); - if (link == null) { - fail("No link was found for '" + name + "'in the page. "); - } - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 2; - - // Verify tabs - tabTable = utils.getTabTable(wr); - testTabs(tabTable, NUMBER_OF_TABS_FOR_DATASOURCE_USED, selectedTab, "Problem in the datasource tab."); - // - links - assertTrue("The link " + URL_JONASADMIN_SERVICE_DATABASE + " is not found in the first tab. ", tabTable - .getTableCell(0, 0).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_SERVICE_DATABASE)); - assertTrue("The link " + URL_JONASADMIN_STATISTICS + " is not found in the third tab. ", tabTable - .getTableCell(0, 4).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_STATISTICS)); - assertTrue("The link " + URL_JONASADMIN_USED_BY + " is not found in the third tab. ", tabTable - .getTableCell(0, 6).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_USED_BY)); - - // Go to "Used by" tab - link = wr.getFirstMatchingLink(WebLink.MATCH_URL_STRING, URL_JONASADMIN_USED_BY); - if (link == null) { - fail("No link was found for '" + name + "'in the page. "); - } - link.click(); - wr = wc.getFrameContents(FRAME_CONTENT); - selectedTab = 4; - - // Verify tabs - tabTable = utils.getTabTable(wr); - testTabs(tabTable, NUMBER_OF_TABS_FOR_DATASOURCE_USED, selectedTab, "Problem in the datasource tab."); - // - links - assertTrue("The link " + URL_JONASADMIN_SERVICE_DATABASE + " is not found in the first tab. ", tabTable - .getTableCell(0, 0).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_SERVICE_DATABASE)); - assertTrue("The link " + URL_JONASADMIN_EDIT + " is not found in the third tab. ", tabTable - .getTableCell(0, 2).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_EDIT)); - assertTrue("The link " + URL_JONASADMIN_STATISTICS + " is not found in the third tab. ", tabTable - .getTableCell(0, 4).getLinks()[0].getURLString().endsWith(URL_JONASADMIN_STATISTICS)); - - // Verify there is Alarm Record EJB - table = utils.getTable(wr, 0); - int rowEJB = utils.getRow("AlarmRecord", table).intValue(); - if (rowEJB == -1) { - fail("There is not 'Alarm Record' in the 'Used By' table. " + table.getText()); - } - - // Verify type - assertEquals("The EJB type is not EntityBean. ", "EntityBean", table.getTableCell(rowEJB, 1).getText()); - - // Verify link - link = table.getTableCell(rowEJB, 0).getLinks()[0]; - if (link == null) { - fail("No link was found for '" + name + "'in the page. "); - } - int code = wc.sendRequest(link.getRequest()).getResponseCode(); - assertEquals("Fail to go to '" + link.getURLString() + "'. ", 200, code); - - } - } - - /** - * Tear Down - * cleanUp action - */ - public void tearDown() throws Exception { - - if (jProp.isDbm()) { - // remove created datasource file - if (!name.equals("")) { - // Undeploy datasource - unUseDatasource(name); - // Delete file - JonasAdminFiles.deleteConfigFile(name + ".properties"); - name = ""; - } - } - super.tearDown(); - } - - /** - * Get current opened connection - * @return number of current opened connection - * @throws Exception if an error occurs - */ - private int getCurrentOpenedConnection(String jndiName) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("*:j2eeType=JDBCDataSource,*"); - - QueryExp exp = Query.match(Query.attr("jndiName"), Query.value(jndiName)); - - ObjectName dataSourceON = (ObjectName) server.queryNames(on, exp).iterator().next(); - Integer currentOpenedConnection = (Integer) server.getAttribute(dataSourceON, "currentOpened"); - - return currentOpenedConnection.intValue(); - } - -} diff --git a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/util/JProperties.java b/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/util/JProperties.java deleted file mode 100644 index a8b4fe9b6277f36c43155dea613717416b6917ec..0000000000000000000000000000000000000000 --- a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/util/JProperties.java +++ /dev/null @@ -1,533 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jonasadmin.test.util; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import org.ow2.jonas.adm.AdmInterface; - -/** - * JOnAS property accessor - * @author kemlerp - */ -public class JProperties { - - /** - * Name of the JOnAS server used for tests - */ - private static String jonasName = "jonas"; - - /** - * Initial context used for lookup - */ - private static Context ictx = null; - - /** - * JOnAS admin used for communicate via JMX to JOnAS - */ - private static AdmInterface admI = null; - - /** - * System properties - */ - private static Properties systEnv = System.getProperties(); - - /** - * Separator of file - */ - private static String fileSeparator = systEnv.getProperty("file.separator"); - - /** - * -Djonas.test property - */ - private static final String JONAS_TEST = "jonas.test"; - - /** - * JONAS_TEST - */ - private static String jonasTest = systEnv.getProperty(JONAS_TEST); - - /** - * -Djonas.base property - */ - private static final String JONAS_BASE = "jonas.base"; - - /** - * JONAS_BASE - */ - private static String jonasBase = systEnv.getProperty(JONAS_BASE); - - /** - * resource directory name - */ - private static final String RESOURCE_DIR = "resources"; - - /** - * conf directory name - */ - private static final String CONF_DIR = "conf"; - - /** - * Get initialContext - * @return the initialContext - * @throws NamingException if the initial context can't be retrieved - */ - private Context getInitialContext() throws NamingException { - return new InitialContext(); - } - - /** - * Get list environnement - * @return JOnAS protperties - * @throws Exception if list environnement cannot be got - */ - public Properties getPropertiesEnv() throws Exception { - Properties prop = null; - - try { - if (ictx == null) { - ictx = getInitialContext(); - } - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - prop = admI.listEnv(); - } catch (Exception e) { - throw new Exception("Cannot get list environnement : " + e.getMessage()); - } - - return prop; - } - - /** - * Get services in jonas properties - * @return A table of string with services in jonas properties - * @throws Exception if properties cannot be got - */ - public String[] getServices() throws Exception { - Properties propertiesEnv = getPropertiesEnv(); - String services = propertiesEnv.getProperty("jonas.services"); - return services.split(","); - } - - /** - * Search a service in services - * @param service The string that is searched - * @return true if there is the service in services else false - * @throws Exception if services cannot be got - */ - public boolean searchService(String service) throws Exception { - String[] services = getServices(); - boolean found = false; - int i = 0; - - while (!found && i < services.length) { - if (services[i].equals(service)) { - found = true; - } - i++; - } - - return found; - } - - /** - * Db in service property - * @return True if db is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isDb() throws Exception { - boolean exist = false; - try { - if (searchService("db")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Dbm in service property - * @return True if dbm is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isDbm() throws Exception { - boolean exist = false; - try { - if (searchService("dbm")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Discovery in service property - * @return True if discovery is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isDiscovery() throws Exception { - boolean exist = false; - try { - if (searchService("discovery")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Ear in service property - * @return True if ear is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isEar() throws Exception { - boolean exist = false; - try { - if (searchService("ear")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Ejb in service property - * @return True if ejb is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isEjb() throws Exception { - boolean exist = false; - try { - if (searchService("ejb")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Jms in service property - * @return True if jms is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isJms() throws Exception { - boolean exist = false; - try { - if (searchService("jms")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Jmx in service property - * @return True if Jmx is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isJmx() throws Exception { - boolean exist = false; - try { - if (searchService("jmx")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Jtm in service property - * @return True if jtm is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isJtm() throws Exception { - boolean exist = false; - try { - if (searchService("jtm")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Mail in service property - * @return True if db is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isMail() throws Exception { - boolean exist = false; - try { - if (searchService("mail")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Registry in service property - * @return True if registry is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isRegistry() throws Exception { - boolean exist = false; - try { - if (searchService("registry")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Resource in service property - * @return True if resource is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isResource() throws Exception { - boolean exist = false; - try { - if (searchService("resource")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Security in service property - * @return True if security is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isSecurity() throws Exception { - boolean exist = false; - try { - if (searchService("security")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Web in service property - * @return True if web is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isWeb() throws Exception { - boolean exist = false; - try { - if (searchService("web")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * Ws in service property - * @return True if ws is a value of service property - * @throws Exception if service property cannot be got - */ - public boolean isWs() throws Exception { - boolean exist = false; - try { - if (searchService("ws")) { - exist = true; - } - } catch (Exception e) { - throw new Exception("Cannot get services : " + e.getMessage()); - } - return exist; - } - - /** - * JMS service location - * @return True if it is collocated, else False - * @throws Exception if property cannot be got - */ - public boolean isJMSCollocated() throws Exception { - Properties propertiesEnv = getPropertiesEnv(); - boolean collocated = Boolean.valueOf(propertiesEnv.getProperty("jonas.service.jms.collocated")).booleanValue(); - return collocated; - } - - /** - * Catalina in jonas properties - * @return True if Catalina is the web service, else false - * @throws Exception if property cannot be got - */ - public boolean isCatalina() throws Exception { - Properties propertiesEnv = getPropertiesEnv(); - String webClass = propertiesEnv.getProperty("jonas.service.web.class"); - return webClass.endsWith("CatalinaJWebContainerServiceWrapper"); - } - - /** - * Jtm location - * @return True if jtm is remote, False if it is collocated - * @throws Exception if property cannot be got - */ - public boolean isJtmRemote() throws Exception { - Properties propertiesEnv = getPropertiesEnv(); - boolean remote = Boolean.valueOf(propertiesEnv.getProperty("jonas.service.jtm.remote")).booleanValue(); - return remote; - } - - /** - * Get properties from a file in resources directory. - * @param fileName name of the property file with ".properties". - * @return Properties. - * @throws Exception if the file is not found. - */ - public Properties getProperties(String fileName) throws Exception { - // Get ClassLoader - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - URL url = cl.getResource(fileName); - InputStream is = cl.getResourceAsStream(fileName); - Properties configFile = new Properties(); - configFile.load(is); - return configFile; - } - - /** - * Get properties from a file in $JONAS_TEST/jonasadmin directory. - * @param fileName name of the property file without ".properties". - * @return Properties. - * @throws FileNotFoundException if the file is not found. - */ - private Properties getCarolProperties() throws FileNotFoundException { - // ${jonas.base}/conf/carol.properties - if (jonasBase.equalsIgnoreCase("${myenv.JONAS_BASE}")) { - throw new FileNotFoundException("You must add JONAS_BASE in your environnement variables. "); - } else { - String propFileName = jonasBase + fileSeparator + CONF_DIR + fileSeparator + "carol" + ".properties"; - - File f = null; - Properties configFile = new Properties(); - try { - f = new File(propFileName); - FileInputStream is = new FileInputStream(f); - configFile.load(is); - } catch (FileNotFoundException e) { - throw new FileNotFoundException("Cannot find properties for " + propFileName); - } catch (IOException e) { - System.err.println(e); - } - return configFile; - } - } - - /** - * Get registry protocol - * @return protocol name (jrmp, iiop, cmi) - */ - public String getRegistryProtocol() { - String protocol = null; - try { - protocol = getCarolProperties().getProperty("carol.protocols"); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - return protocol; - } - - /** - * Get registry url - * @return url of the registry - */ - public String getRegistryUrl() { - String protocol = null; - String url = null; - try { - protocol = getCarolProperties().getProperty("carol.protocols"); - - try { - url = getCarolProperties().getProperty("carol." + protocol + ".url"); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - return url; - } - - /** - * Get Jvm Version - * @return the java version - */ - public String getJvmVersion() { - return systEnv.getProperty("java.version"); - } - - /** - * Get Jvm vendor - * @return value of the property java.vm.specification.vendor - */ - public String getJvmVendor() { - return systEnv.getProperty("java.vm.specification.vendor"); - } -} \ No newline at end of file diff --git a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/util/JonasAdminTestCase.java b/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/util/JonasAdminTestCase.java deleted file mode 100644 index bece60e2883385acb1b1fd3727b4613b29e3a971..0000000000000000000000000000000000000000 --- a/jonas_tests/jonasadmin/src/org/objectweb/jonas/jonasadmin/test/util/JonasAdminTestCase.java +++ /dev/null @@ -1,909 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999-2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jonasadmin.test.util; - -import java.io.File; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.net.URLClassLoader; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.TestCase; - -import org.ow2.jonas.adm.AdmInterface; -import org.ow2.jonas.lib.management.javaee.J2eeObjectName; -import org.omg.CORBA.ORB; - -import com.meterware.httpunit.HttpUnitOptions; -import com.meterware.httpunit.TableCell; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebForm; -import com.meterware.httpunit.WebResponse; -import com.meterware.httpunit.WebTable; - -/** - * Define a class to add useful methods for test the examples - * - Deploy ear, war and beans - * - Retrieve initial context - * @author Florent Benoit - */ -public class JonasAdminTestCase extends TestCase { - - /** - * URL of the login page - * - */ - protected static final String URL_JONASADMIN = "/jonasAdmin/"; - - /** - * NAME of FRAME content - */ - protected static final String FRAME_CONTENT = "content"; - - /** - * NAME of FRAME tree - */ - protected static final String FRAME_TREE = "tree"; - - /** - * NAME of FRAME top - */ - protected static final String FRAME_TOP = "top"; - - /** - * URL of the deployment of EARs - */ - protected static final String URL_JONASADMIN_DEPLOYEAR = "/jonasAdmin/EditDeploy.do?type=ear"; - - /** - * URL of the deployment of JARs - */ - protected static final String URL_JONASADMIN_DEPLOYJAR = "/jonasAdmin/EditDeploy.do?type=jar"; - - /** - * Name of the property file of jonasAdmin tests - */ - private static final String JONASADMINTEST_PROPERTY_NAME = "jonasAdminTests.properties"; - /** - * JoramAdmin MBean's OBJECT_NAME - */ - private static final String JORAM_ADMIN_ON = "joramClient:type=JoramAdmin"; - /** - * Name of the JOnAS server used for tests - */ - private static String jonasName = "jonas"; - /** - * Name of the domain - */ - private static String domainName = "jonas"; - /** - * Initial context used for lookup - */ - private static Context ictx = null; - - /** - * JOnAS admin used for communicate via JMX to JOnAS - */ - private static AdmInterface admI = null; - - /** - * JMX connector - */ - private static JMXConnector connector = null; - - /** - * MBean Server Connection - */ - private static MBeanServerConnection currentServerConnection = null; - - /** - * Client ORB - */ - private static ORB orb =null; - - /** - * Conversation used for HttpUnit - */ - protected static WebConversation wc = null; - - /** - * URL used for the constructor - */ - protected String url = null; - - /** - * URL used to return to Welcome.jsp - */ - protected String urlWelcome = null; - - /** - * URL used to log out - */ - protected String urlLogOut = null; - - - /** - * Prefix for build URLs - */ - protected String prefixUrl = null; - - /** - * JOnAS and jonasAdmin properties - */ - protected JProperties jProp = null; - - /** - * jonasAdmin test properties - */ - protected Properties configFile; - - /** - * jonasAdmin port - */ - protected String port; - - /** - * Add to the specified url the prefix - * @param url relative URL - * @return absolute path of URL - */ - protected String getAbsoluteUrl (String url) { - return (this.prefixUrl + url); - } - - /** - * Initialize the port used by tests and the prefix - */ - private void init() { - // Port - port = System.getProperty("http.port"); - if (port == null) { - port = "9000"; - } - - // urls - prefixUrl = "http://localhost:" + port; - urlWelcome = prefixUrl + "/jonasAdmin/Welcome.do"; - urlLogOut = prefixUrl + "/jonasAdmin/logOut.do"; - - // Properties - jProp = new JProperties(); - - try { - configFile = jProp.getProperties(JONASADMINTEST_PROPERTY_NAME); - } catch (Exception e) { - System.err.println("Cannot find file : " + JONASADMINTEST_PROPERTY_NAME + ". " + e); - e.printStackTrace(); - } - - } - - /** - * Constructor with a specified name - * @param s the name - */ - public JonasAdminTestCase(String s) { - super(s); - init(); - } - - /** - * Constructor with a specified name and url - * @param s the name - * @param url the url which can be used - */ - public JonasAdminTestCase(String s, String url) { - super(s); - init(); - this.url = getAbsoluteUrl(url); - } - - /** - * Get initialContext - * @return the initialContext - * @throws NamingException if the initial context can't be retrieved - */ - private Context getInitialContext() throws NamingException { - return new InitialContext(); - } - - /** - * Common setUp routine, used for every test. - * @throws Exception if an error occurs - */ - protected void setUp() throws Exception { - - // WebConversation to jonasAdmin - wc = JonasAdminConnexion.getWc(); - if (wc == null) { - wc = JonasAdminConnexion.createWc(); - } - - try { - // get InitialContext - if (ictx == null) { - ictx = getInitialContext(); - } - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - - } catch (NamingException e) { - System.err.println("Cannot setup test: " + e); - e.printStackTrace(); - } - - // Get a MBean Server connection and set currentServerConnection variable - initMBeanServer(); - } - - - /** - * Load an ear file in the jonas server - * @param filename ear file, without ".ear" extension - * @throws Exception if an error occurs - */ - public void useEar(String filename) throws Exception { - - try { - // Load ear in JOnAS if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - - //Test in both directories (apps/ and apps/autoload) - String appsFileName = filename + ".ear"; - String autoloadAppsFileName = "autoload" + File.separator + filename + ".ear"; - if (!admI.isEarLoaded(appsFileName) && !admI.isEarLoaded(autoloadAppsFileName)) { - //if the file was in autoload, it was loaded - admI.addEar(appsFileName); - } - - } catch (Exception e) { - throw new Exception("Cannot load Ear : " + e.getMessage()); - } - } - - - /** - * Unload a ear file in the jonas server - * @param filename ear file, without ".ear" extension - * @throws Exception if an error occurs - */ - public void unUseEar(String filename) throws Exception { - try { - // Unload ear in EARServer if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - if (admI.isEarLoaded(filename + ".ear")) { - admI.removeEar(filename + ".ear"); - } - } catch (Exception e) { - throw new Exception("Cannot unload Bean : " + e.getMessage()); - } - } - - /** - * Load a war file in the jonas server - * @param filename war file, without ".war" extension - * @throws Exception if an error occurs - */ - public void useWar(String filename) throws Exception { - - try { - // Load war in JOnAS if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - - //Test in both directories (apps/ and apps/autoload) - String webappsFileName = filename + ".war"; - String autoloadWebappsFileName = "autoload" + File.separator + filename + ".war"; - if (!admI.isWarLoaded(webappsFileName) && !admI.isWarLoaded(autoloadWebappsFileName)) { - //if the file was in autoload, it was loaded - admI.addWar(webappsFileName); - } - - } catch (Exception e) { - throw new Exception("Cannot load War : " + e.getMessage()); - } - } - - /** - * Load a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void useBeans(String filename) throws Exception { - try { - // Load bean in EJBServer if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - if (!admI.isLoaded(filename + ".jar")) { - admI.addBeans(filename + ".jar"); - } - } catch (Exception e) { - throw new Exception("Cannot load Bean : " + e.getMessage()); - } - } - - - /** - * Unload a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void unUseBeans(String filename) throws Exception { - try { - // Load bean in EJBServer if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - if (admI.isLoaded(filename + ".jar")) { - admI.removeBeans(filename + ".jar"); - } - } catch (Exception e) { - throw new Exception("Cannot unload Bean : " + e.getMessage()); - } - } - - - /** - * Load a rar file in the jonas server - * @param filename rar file, without ".rar" extension - * @throws Exception if an error occurs - */ - public void useRar(String filename) throws Exception { - - try { - // Load rar in JOnAS if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - - //Test in both directories (rars/ and rars/autoload) - String raFileName = filename + ".rar"; - String autoloadRaFileName = "autoload" + File.separator + filename + ".rar"; - if (!admI.isRarLoaded(raFileName) && !admI.isRarLoaded(autoloadRaFileName)) { - //if the file was in autoload, it was loaded - admI.addRar(raFileName); - } - - } catch (Exception e) { - throw new Exception("Cannot load Rar : " + e.getMessage()); - } - } - - - /** - * Rar is loaded in the jonas server - * @param filename rar file, without ".rar" extension - * @return true if the rar is loaded, else false - * @throws Exception if an error occurs - */ - public boolean isRarLoaded(String filename) throws Exception { - - boolean found = false; - - try { - // Load rar in JOnAS if not already loaded. - if (ictx == null) { - ictx = getInitialContext(); - } - - if (admI == null) { - admI = (AdmInterface) PortableRemoteObject.narrow(ictx.lookup(jonasName + "_Adm"), AdmInterface.class); - } - - //Test in both directories (rars/ and rars/autoload) - String raFileName = filename + ".rar"; - String autoloadRaFileName = "autoload" + File.separator + filename + ".rar"; - if (admI.isRarLoaded(raFileName) || admI.isRarLoaded(autoloadRaFileName)) { - //if the file was in autoload, it was loaded - found = true; - } - - } catch (Exception e) { - throw new Exception("Cannot load Rar : " + e.getMessage()); - } - - return found; - } - - /** - * Create a mail factory in jonas server - * @param mail factory name of the datasource - * @param properties properties of the mail factory - * @throws Exception if an error occurs - */ - protected void createMailFactory(String mailFactory, Properties properties) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("jonas:type=service,name=mail"); - - // add properties in 'datasource'.properties - JonasAdminFiles.writeConfigFile(mailFactory + ".properties", properties); - - Object[] params = new Object[] {mailFactory, properties, new Boolean(true)}; - server.invoke(on, "createMailFactoryMBean", params, new String[] {String.class.getName(), Properties.class.getName(), Boolean.class.getName()}); - - } - - /** - * Unbind a mail factory in jonas server - * @param mailFactory name of the mail factory - * @throws Exception if an error occurs - */ - protected void unBindMailFactory(String mailFactory) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("jonas:type=service,name=mail"); - - Object[] params = new Object[] {mailFactory}; - server.invoke(on, "unbindMailFactoryMBean", params, new String[] {String.class.getName()}); - } - - /** - * Return if the mail factory is in mail factory list - * @param mailFactory the name of the mail factory - * @return true if the mail factory is in list, false else. - * @throws Exception if an error occurs. - */ - protected boolean isInMailFactoryList(String mailFactory) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("jonas:type=service,name=mail"); - - List list = (List) server.getAttribute(on, "MailFactoryPropertiesFiles"); - - return list.contains(mailFactory); - } - - /** - * Load a datasource in jonas server - * @param datasource name of the datasource - * @param properties properties of the datasource - * @throws Exception if an error occurs - */ - protected void useDatasource(String datasource, Properties properties) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("jonas:type=service,name=database"); - - if (!((Boolean) server.invoke(on, "isLoadedDataSource", new Object[] {datasource}, new String[] {String.class.getName()})).booleanValue()) { - // add properties in 'datasource'.properties - JonasAdminFiles.writeConfigFile(datasource + ".properties", properties); - - Object[] params = new Object[] {datasource, properties, new Boolean(true)}; - server.invoke(on, "loadDataSource", params, new String[] {String.class.getName(), Properties.class.getName(), Boolean.class.getName()}); - } - } - - /** - * Check if database service is started (dbm) - * @return true if dbm started - * @throws Exception if an error occurs - */ - protected boolean isDatabaseService() throws Exception { - boolean result = false; - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("jonas:type=service,name=database"); - if (server.isRegistered(on)) { - result = true; - } - return result; - } - - /** - * Check if the Joram RAR is deplyed - * @return true if dbm started - * @throws Exception if an error occurs - */ - protected boolean isJoramRar() throws Exception { - boolean result = false; - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance(JORAM_ADMIN_ON); - if (server.isRegistered(on)) { - result = true; - } - return result; - } - - /** - * Unload a datasource in jonas server - * @param datasource name of the datasource - * @throws Exception if an error occurs - */ - protected void unUseDatasource(String datasource) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("jonas:type=service,name=database"); - - if (((Boolean) server.invoke(on, "isLoadedDataSource", new Object[] {datasource}, new String[] {String.class.getName()})).booleanValue()) { - - Object[] params = new Object[] {datasource}; - server.invoke(on, "unloadDataSource", params, new String[] {String.class.getName()}); - } - } - - /** - * Load a datasource in jonas server - * @param datasource name of the datasource - * @return boolean true if the datasource is loaded, false else - * @throws Exception if an error occurs - */ - protected boolean isLoadedDatasource(String datasource) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("jonas:type=service,name=database"); - - return ((Boolean) server.invoke(on, "isLoadedDataSource", new Object[] {datasource}, new String[] {String.class.getName()})).booleanValue(); - } - - /** - * Create a topic in a joram server - * @param name name of the topic - * @param idString id of the current joram server - * @throws Exception if an error occurs - */ - protected void createTopic(String name, int idString) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("joramClient:type=JoramAdapter,*"); - ObjectName joramAdapterON = (ObjectName) server.queryNames(on, null).iterator().next(); - - Object[] params = new Object[] {new Integer(idString), name}; - server.invoke(joramAdapterON, "createTopic", params, new String[] {"int", String.class.getName()}); - } - - /** - * Create a queue in a joram server - * @param name name of the queue - * @param idString id of the current joram server - * @throws Exception if an error occurs - */ - protected void createQueue(String name, int idString) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("joramClient:type=JoramAdapter,*"); - ObjectName joramAdapterON = (ObjectName) server.queryNames(on, null).iterator().next(); - - Object[] params = new Object[] {new Integer(idString), name}; - server.invoke(joramAdapterON, "createQueue", params, new String[] {"int", String.class.getName()}); - } - - /** - * Create a user in a joram server - * @param name name of the user - * @param password password of the user - * @throws Exception if an error occurs - */ - protected void createLocalJmsUser(String name, String password) throws Exception { - MBeanServerConnection server = getMBeanServer(); - ObjectName on = ObjectName.getInstance("joramClient:type=JoramAdapter,*"); - ObjectName joramAdapterON = (ObjectName) server.queryNames(on, null).iterator().next(); - - Object[] params = new Object[] {name, password}; - server.invoke(joramAdapterON, "createUser", params, new String[] {"java.lang.String", "java.lang.String"}); - } - - - /** - * Call the main method of a specific class with empty args - * @param classToLoad name of class which contains the main method - * @throws Exception if it fails - */ - protected void callMainMethod(String classToLoad) throws Exception { - callMainMethod(classToLoad, new String[]{}); - } - - - /** - * Call the main method of a specific class and the specific args - * @param classToLoad name of class which contains the main method - * @param args args to give to the main method - * @throws Exception if it fails - */ - protected void callMainMethod(String classToLoad, String[] args) throws Exception { - //Build classloader - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - URL[] urls = new URL[1]; - urls[0] = new File(System.getProperty("jonas.root") + File.separator + "examples" + File.separator + "classes").toURL(); - URLClassLoader loader = new URLClassLoader(urls); - Thread.currentThread().setContextClassLoader(loader); - Class clazz = loader.loadClass(classToLoad); - Class[] argList = new Class[] {args.getClass()}; - Method meth = clazz.getMethod("main", argList); - Object appli = meth.invoke(null, new Object[]{args}); - } - - /** - * Get current time - * @return A String Time with the format yyyy-MM-dd.HH-mm-ss - */ - protected String getTime() { - Calendar cal = Calendar.getInstance(); - Date date = cal.getTime(); - SimpleDateFormat formatter; - formatter = new SimpleDateFormat("yyyy-MM-dd.HH-mm-ss"); - return formatter.format(date); - } - - /** - * Undeploy an EAR - * @param name String of EAR Name - * @throws Exception if error occurs - */ - protected void undeployEar(String name) throws Exception { - String fileName = name + ".ear"; - - // Disable errors of javascript - HttpUnitOptions.setExceptionsThrownOnScriptError(false); - // Disable exception thrown on error status - HttpUnitOptions.setExceptionsThrownOnErrorStatus(false); - - WebResponse wr = wc.getResponse(getAbsoluteUrl(URL_JONASADMIN_DEPLOYEAR)); - WebForm[] webForms = wr.getForms(); - WebForm webForm = webForms[0]; - - String params = webForm.getParameterValue("undeploy"); - WebForm.Scriptable script = webForm.getScriptableObject(); - - // Disable errors of javascript - HttpUnitOptions.setExceptionsThrownOnScriptError(false); - - if (params.length() == 0) { - params += fileName; - } else { - params += "," + fileName; - } - - script.setParameterValue("undeploy", params); - - WebResponse submitUndeploy = webForm.submit(); - - webForms = submitUndeploy.getForms(); - webForm = webForms[0]; - - WebResponse endResp = webForm.submit(); - } - - /** - * Undeploy all EAR - * @throws Exception if error occurs - */ - protected void undeployAllEar() throws Exception { - WebResponse wr = wc.getResponse(getAbsoluteUrl(URL_JONASADMIN_DEPLOYEAR)); - undeployAll(wr); - } - - /** - * Undeploy all Jars - * @throws Exception if error occurs - */ - protected void undeployAllJar() throws Exception { - WebResponse wr = wc.getResponse(getAbsoluteUrl(URL_JONASADMIN_DEPLOYJAR)); - undeployAll(wr); - } - - /** - * Undeploy all - * @throws Exception if error occurs - */ - protected void undeployAll(WebResponse wr) throws Exception { - - WebForm[] webForms = wr.getForms(); - WebForm webForm = webForms[0]; - - // Disable errors of javascript - HttpUnitOptions.setExceptionsThrownOnScriptError(false); - // Disable exception thrown on error status - HttpUnitOptions.setExceptionsThrownOnErrorStatus(false); - - String params = webForm.getParameterValue("deploy"); - WebForm.Scriptable script = webForm.getScriptableObject(); - - if (params.length() == 0) { - params += webForm.getParameterValue("undeploy"); - } else { - params += "," + webForm.getParameterValue("undeploy"); - } - - script.setParameterValue("undeploy", params); - - WebResponse submitUndeploy = webForm.submit(); - - webForms = submitUndeploy.getForms(); - webForm = webForms[0]; - - WebResponse endResp = webForm.submit(); - - wc.getResponse(getAbsoluteUrl(URL_JONASADMIN)); - } - - /** - * Verify number of tabs and the selected tab - * @param tabTable the tab table - * @param nbTabs number of tabs - * @param selectedTab the numero of the selected tab - */ - protected void testTabs(WebTable tabTable, int nbTabs, int selectedTab, String msg) { - TableCell selectedCell; - // - number of tabs - assertEquals("There are not " + nbTabs + " tabs. " + msg, - nbTabs, (tabTable.getColumnCount() + 1) / 2); - // - selected tab - selectedCell = tabTable.getTableCell(1, (selectedTab * 2) - 2); - assertEquals("It is not the selected tab. ", 1, selectedCell.getElementsWithAttribute("src", "/jonasAdmin/images/dot.gif").length); - } - - /** - * Get MBean Server connection - * @throws Exception if an error occurs - */ - private void initMBeanServer() throws Exception { - String sCarolURL = jProp.getRegistryUrl(); - String carolProtocol = jProp.getRegistryProtocol(); - URI carolURL = new URI(sCarolURL); - int portNb = carolURL.getPort(); - String port = String.valueOf(portNb); - String url = null; - Map env = null; - if (carolProtocol.equals("jrmp")) { - // Treat JRMP case - url = "service:jmx:rmi:///jndi/rmi://localhost:" + port + "/jrmpconnector_" + jonasName; - } else if (carolProtocol.equals("iiop")) { - // Treat IIOP case - url = "service:jmx:iiop:///jndi/iiop://localhost:" + port + "/iiopconnector_" + jonasName; - env = new HashMap(); - if (orb == null) { - initORB(); - } - env.put("java.naming.corba.orb", orb); - } else if (carolProtocol.equals("cmi")) { - // Treat CMI - url = "service:jmx:rmi:///jndi/cmi://localhost:" + port + "/cmiconnector_" + jonasName; - } - - JMXServiceURL connURL = null; - try { - connURL = new JMXServiceURL(url); - } catch (MalformedURLException e) { - throw new Exception("Can't create JMXServiceURL with string: " + url); - } - - try { - connector = JMXConnectorFactory.newJMXConnector(connURL, env); - } catch (MalformedURLException e1) { - throw new Exception("there is no provider for the protocol in " + url); - } catch (java.io.IOException e) { - throw new Exception("Connector client cannot be made because of a communication problem (used URL: " + url + ")"); - } - try { - connector.connect(env); - currentServerConnection = connector.getMBeanServerConnection(); - } catch (java.io.IOException ioe) { - throw new Exception("connection could not be made because of a communication problem"); - } - } - - /** - * Get MBean Server connection - * @return a MBeanServer Connection - * @throws Exception if an error occurs - */ - protected MBeanServerConnection getMBeanServer() throws Exception { - return currentServerConnection; - } - - /** - * Close MBean Server connection - * @throws Exception if an error occurs - */ - protected void closeMBeanServer() throws Exception { - - try { - if (connector != null) { - connector.close(); - } - } catch (Exception e) { - throw new Exception("connection could not be close because of a communication problem."); - } - } - - /** - * Create an orb for the client - * - */ - private static void initORB() { - orb = ORB.init(new String[0], null); - } - - /** - * Tear Down cleanUp action - * @throws Exception - */ - public void tearDown() throws Exception { - // Close MBean Server Connection - closeMBeanServer(); - } - - /** - * Print a debug message - * @param msg The message - */ - public void debug(String msg) { - System.out.println("DEBUG: " + msg); - } - - protected ObjectName getJCAConnectionFactory(String name, String jcaResourceName) { - ObjectName on = J2eeObjectName.getJCAConnectionFactory(domainName, jcaResourceName, jonasName, name); - return on; - } - - protected String getStringMBeanAttribute(ObjectName on, String attName) throws Exception { - MBeanServerConnection server = getMBeanServer(); - return (String) server.getAttribute(on, attName); - } - - protected Integer getIntegerMBeanAttribute(ObjectName on, String attName) throws Exception { - MBeanServerConnection server = getMBeanServer(); - return (Integer) server.getAttribute(on, attName); - } -} diff --git a/jonas_tests/junit.bat b/jonas_tests/junit.bat deleted file mode 100644 index c1afc6f1ee818de01ae4e51d01c53ab04eaa950d..0000000000000000000000000000000000000000 --- a/jonas_tests/junit.bat +++ /dev/null @@ -1,142 +0,0 @@ -@Echo off -Rem --------------------------------------------------------------------------- -Rem JOnAS: Java(TM) Open Application Server -Rem Copyright (C) 1999 Bull S.A. -Rem Contact: jonas-team@objectweb.org -Rem -Rem This library is free software; you can redistribute it and/or -Rem modify it under the terms of the GNU Lesser General Public -Rem License as published by the Free Software Foundation; either -Rem version 2.1 of the License, or any later version. -Rem -Rem This library is distributed in the hope that it will be useful, -Rem -Rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Rem Lesser General Public License for more details. -Rem -Rem You should have received a copy of the GNU Lesser General Public -Rem License along with this library; if not, write to the Free Software -Rem Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -Rem USA -Rem -Rem Initial developer(s): Philippe Durieux -Rem Contributor(s): -Rem --------------------------------------------------------------------------- -Rem $Id$ -Rem --------------------------------------------------------------------------- - -Rem Usage: junit [ test-type [ dir-name [ suite-name [ test-name ] ] ] ] -Rem -Rem This script allows to run the jonas-test all the tests or a sub-set of the tests: -Rem - the tests of the given directory -Rem - the tests of the given suite of the given directory -Rem - only the given test of the given suite of the given directory -Rem for each type test (conformance, stress or ws) -Rem -setlocal ENABLEDELAYEDEXPANSION - -set TYPE=conf -set PACK=org.objectweb.jonas.jtests.clients -set DIR=suite -set SUITE=C_suite -set TEST= -set CLIENT_OPTS= -set TEST_CLASSES=%TEST_BASE%\conformance\classes;%TEST_BASE%\examples\classes - -if ["%JONAS_BASE%"]==[""] goto set_jonas_base -set CLIENT_OPTS=%CLIENT_OPTS% -Djonas.base="%JONAS_BASE%" - -:set_jonas_base -set CLIENT_OPTS=%CLIENT_OPTS% -Djonas.base="%JONAS_ROOT%" -if ["%REGISTRY%"]==[] goto set_registry -set CLIENT_OPTS=%CLIENT_OPTS% -Dregistry="%REGISTRY%" -:set_registry -set CLIENT_OPTS=%CLIENT_OPTS% -Dregistry="rmi://localhost:1099" -if ["%PROTOCOL%"]==[] goto set_protocol -set CLIENT_OPTS=%CLIENT_OPTS% -Dprotocol="%PROTOCOL%" -:set_protocol -set CLIENT_OPTS=%CLIENT_OPTS% -Dprotocol=jrmp - -if [%HTTP_PORT%]==[] set HTTP_PORT=9000 -if not [%1]==[] goto loop_on_args -:loop_on_args - - -if [%1]==[] goto endargs -if ["%1"]==["-debug"] goto debug_arg -set TYPE=%1 -shift -if [%1]==[] goto endargs -set DIR=%1 -set SUITE=C_%DIR% -shift -if [%1]==[] goto endargs -set SUITE=%1 -shift -if [%1%]==[] goto varinit -set TEST=-n %1 -goto varinit - - - -:debug_arg -set DEBUG_OPTS=%DEBUG_OPTS% %1 -shift -if not ["%1"]==["-p"] goto debug_usage -set DEBUG_OPTS=%DEBUG_OPTS% %1 -shift -set DEBUG_OPTS=%DEBUG_OPTS% %1 -shift -if ["%1"]==["-s"] goto set_debug_opts -goto loop_on_args - -:set_debug_opts -set DEBUG_OPTS=%DEBUG_OPTS% %1 -shift -set DEBUG_OPTS=%DEBUG_OPTS% %1 -shift -goto loop_on_args - -:debug_usage -echo -debug option parameters are : "-debug -p [-s ]" -goto :EOF - -:endargs -echo %TYPE% -echo %DIR% -echo %SUITE% -echo %DEBUG_OPTS% - -:varinit -if [%TYPE%]==[stress] goto varstress -if [%TYPE%]==[ws] goto varws -if [%TYPE%]==[examples] goto varexa -:varconf -set PACK=org.objectweb.jonas.jtests.clients -set TEST_CLASSES=%TEST_BASE%\conformance\classes -goto calllabel -:varstress -set PACK=org.objectweb.jonas.stests -set TEST_CLASSES=%TEST_BASE%\stress\classes -goto calllabel -:varws -set PACK=org.objectweb.ws.clients -set TEST_CLASSES=%TEST_BASE%\ws\classes -set JAVA_OPTS=%JAVA_OPTS% -Dhttp.port=%HTTP_PORT% -Daddressbook.dir=%TEST_BASE%\ws\src\org\objectweb\ws\ab_web -Dordering.dir=%TEST_BASE%\ws\src\org\objectweb\ws\ordering_app -goto calllabel -:varexa -set PACK=org.objectweb.jonas.examples.clients -set TEST_CLASSES=%TEST_BASE%\examples\classes -goto calllabel - -:calllabel - -Set JONAS_CLASSPATH=%TEST_CLASSES%;%ANT_HOME%\lib\junit.jar;%HTTPUNIT_HOME%\lib\httpunit.jar;%HTTPUNIT_HOME%\jars\nekohtml.jar;%HTTPUNIT_HOME%\jars\js.jar;%JONAS_ROOT%\examples\classes - -echo on -call jclient %PROPS% %PACK%.%DIR%.%SUITE% %TEST% -security %CLIENT_OPTS% %DEBUG_OPTS% - - - - - diff --git a/jonas_tests/junit.sh b/jonas_tests/junit.sh deleted file mode 100755 index f34c90161792e7305718051740daf21fead8a64e..0000000000000000000000000000000000000000 --- a/jonas_tests/junit.sh +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/sh -# --------------------------------------------------------------------------- -# JOnAS: Java(TM) Open Application Server -# Copyright (C) 1999 Bull S.A. -# Contact: jonas-team@objectweb.org -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# --------------------------------------------------------------------------- -# $Id$ -# --------------------------------------------------------------------------- - -# -# Usage: junit [ test-type [ dir-name [ suite-name [ test-name ] ] ] ] -# -# This script allows to run the jonas-test all the tests or a sub-set of the tests: -# - the tests of the given directory -# - the tests of the given suite of the given directory -# - only the given test of the given suite of the given directory -# for each type test (conformance, examples or ws) -#set -x -TYPE=conf -PACK=org.objectweb.jonas.jtests.clients -DIR=suite -SUITE=C_suite -TEST= - -# Try to find the directory where the jonas tests are -[ -d $PROJ_BASE/jonas_tests ] && TEST_BASE=$PROJ_BASE/jonas_tests -[ -d $JPROJ_BASE/jonas_tests ] && TEST_BASE=$JPROJ_BASE/jonas_tests - -TEST_CLASSES=$TEST_BASE/conformance/classes - -PROPS= - -# variable needed for ws tests -if [ -z "$HTTP_PORT" ] -then - HTTP_PORT=9000 -fi - -# registry url for JMX access -if [ -z "$REGISTRY" ] -then - REGISTRY=rmi://localhost:1099 -fi -# protocol used -if [ -z "$PROTOCOL" ] -then - PROTOCOL=jrmp -fi -if [ $# -gt 0 ] -then - TYPE=$1 - shift -fi - -case "$TYPE" in -"conf") - ;; -"stress") - TEST_CLASSES=$TEST_BASE/stress/classes - PACK=org.objectweb.jonas.stests - ;; -"ws") - TEST_CLASSES=$TEST_BASE/ws/classes - PROPS="-Dhttp.port=$HTTP_PORT" - PROPS="$PROPS -Daddressbook.dir=$TEST_BASE/ws/src/org/objectweb/ws/ab_web" - PROPS="$PROPS -Dordering.dir=$TEST_BASE/ws/src/org/objectweb/ws/ordering_app" - PROPS="$PROPS -Djonas.base.client=$JONAS_BASE -Djonas.root=$JONAS_ROOT" - - ;; -"examples") - TEST_CLASSES=$TEST_BASE/examples/classes:$TEST_BASE/examples/base/examples/classes - PACK=org.objectweb.jonas.examples.clients - PROPS="-Dhttp.port=$HTTP_PORT" - PROPS="$PROPS -Daddressbook.dir=$TEST_BASE/ws/src/org/objectweb/ws/ab_web" - PROPS="$PROPS -Dordering.dir=$TEST_BASE/ws/src/org/objectweb/ws/ordering_app" - - - ;; -*) - echo "USAGE : $0 [ test-type [ dir-name [ suite-name [ test-name ] ] ] ]" - exit - ;; -esac - -if [ $# -gt 0 ] -then - DIR=$1 - SUITE=C_$DIR - shift -fi - -if [ $# -gt 0 ] -then - SUITE=$1 - shift -fi - -if [ $# -gt 0 ] -then - PREFIX=`echo "$SUITE" | cut -b 1-2` - if [ "$PREFIX" != "F_" ] && [ "$PREFIX" != "G_" ] - then - echo "ERROR: a test-name may be specified only for a final suite (F_xxx)or (G_xxx)" - exit 2 - fi - case $1 in - -*) - TEST=$1 - ;; - *) - TEST="-n $1" - ;; - esac - shift -fi - - -# update classpath for junit tests and httpunit -# update the following lines depending on your own environment -for CLS in \ -$ANT_HOME/lib/junit.jar \ -$HTTPUNIT_HOME/lib/httpunit.jar \ -$HTTPUNIT_HOME/jars/nekohtml.jar \ -$HTTPUNIT_HOME/jars/js.jar \ -$TEST_CLASSES -do - echo $JONAS_CLASSPATH | grep $CLS >/dev/null || JONAS_CLASSPATH=$JONAS_CLASSPATH:$CLS -done - -# important to be seen in jclient script -export JONAS_CLASSPATH - - -echo $CLASSPATH -echo "Running junit test : $TYPE $DIR/$SUITE $TEST" - -jclient $PROPS $PACK.$DIR.$SUITE $TEST -security -Djonas.base=$JONAS_BASE -Dregistry=$REGISTRY -Dprotocol=$PROTOCOL -#jclient -debug -p 4142 -s y $PROPS $PACK.$DIR.$SUITE $TEST -security -Djonas.base=$JONAS_BASE -Dregistry=$REGISTRY -Dprotocol=$PROTOCOL diff --git a/jonas_tests/pom.xml b/jonas_tests/pom.xml deleted file mode 100644 index 112a7424a654c1ed26dbc14db5eee1f7f862a92f..0000000000000000000000000000000000000000 --- a/jonas_tests/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - 4.0.0 - - ow2 - org.ow2 - 1.3 - - - org.ow2.jonas - assembly-downloader-for-jonas-tests - 1.0.0-SNAPSHOT - - JOnAS assembly downloader for JOnAS tests - pom - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - initialize - - read-project-properties - - - - ${basedir}/build.properties - - - - - - - maven-dependency-plugin - - - initialize - - copy - - - - - org.ow2.jonas.assemblies.profiles.legacy - jonas-full - ${jonas.version} - bin - zip - - - - - - - - - - diff --git a/jonas_tests/protocols/clientconf/carol.properties b/jonas_tests/protocols/clientconf/carol.properties deleted file mode 100644 index 1f023e8ec60f16e8e10c353e4f230b5e7b32f2bd..0000000000000000000000000000000000000000 --- a/jonas_tests/protocols/clientconf/carol.properties +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright (C) 2002-2005 ObjectWeb -# -# CAROL: Common Architecture for RMI ObjectWeb Layer -# -# This library is developed inside the ObjectWeb Consortium, -# http://www.objectweb.org -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# -------------------------------------------------------------------------- -# $Id$ -# -------------------------------------------------------------------------- - -# jonas rmi activation (iiop, irmi, jrmp, cmi) -carol.protocols=cmi - -# RMI IRMI URL -carol.irmi.url=rmi://localhost:1098 - -# RMI JRMP URL -carol.jrmp.url=rmi://localhost:2043 - -# RMI IIOP URL -carol.iiop.url=iiop://localhost:2001 - - -###################################################################### -# Configuration for CMI (clustering) -###################################################################### - -# java.naming.provider.url property -# For a server : the URL on which the registry will be started -# For clients : lists the registries available -#carol.cmi.url=cmi://129.183.148.75:2002,129.183.148.75:2202 -#carol.cmi.url=cmi://frecb000650:2002,frecb000650:2202 -carol.cmi.url=cmi://localhost:1951 - -# JGroups configuration file -carol.cmi.jgroups.conf=jgroups-cmi-tcp.xml -#carol.cmi.jgroups.conf=jgroups-cmi.xml - -# Multicast address used by the registries in the cluster -# !!! Deprecated - Not used if carol.cmi.jgroups.conf is set -#carol.cmi.multicast.address=224.0.0.35:35467 - -# IP address or network mask of the local network interface to use to send -# multicast messages -# Needed only when the server has several network interfaces and the multicast -# messages do not go through to interface you want them to use -# Works only on JDK 1.4 -# !!! Deprecated - Not used if carol.cmi.jgroups.conf is set -#carol.cmi.multicast.itf 192.168.25.0/24 - -# Groupname for Javagroups. No need to change if don't know. -carol.cmi.multicast.groupname=G1 - -# Factor used for this server in wheighted round robin algorithms -carol.cmi.rr.factor=100 - -# If enabled, cluster stubs will print messages on some error cases -carol.cmi.stub.debug=false - - -###################################################################### -# Advanced Configuration for IRMI -###################################################################### -# Exported objects will listen on this port for remote method -# invocations. -#A value of 0 will cause a random port to be selected. -# This is the default value. -# Warning : if the port is set (not 0) with the value 'n', be aware that -# the port 'n + 1' will be used by the JMX server. -# So, for the firewall configuration, you have to open the port numbers 'n' -# and 'n+1'. -carol.irmi.server.port=0 - -# Use only a single interface when creating the registry -# (specified in carol.irmi.url property) -# Use all interfaces available [default configuration = false] -carol.irmi.interfaces.bind.single=false - -###################################################################### -# Advanced Configuration for JRMP -###################################################################### -# If true, local call with jrmp are optimized. If you get "ClassCastException -# with 2 beans in different jars, you should set it at "false". -carol.jvm.rmi.local.call=false - -# If true a local Naming context is used (to be used only with a collocated registry) -carol.jvm.rmi.local.registry=false - -# The value of this port is used to set the port of the objects listener. -# This allow to use this port for a firewall configuration. -# If registry and server are on same host, the two ports to open are the following and the registry port. -# 0 means random port [default configuration = 0] -carol.jrmp.server.port=0 - -# Use only a single interface when creating the registry -# (specified in carol.jrmp.url property) -# Use all interfaces available [default configuration = false] -carol.jrmp.interfaces.bind.single=false - - -###################################################################### -# Advanced Configuration for IIOP -###################################################################### -# The value of this port is used to set the port of the objects listener. -# This allow to use this port for a firewall configuration. -# If registry and server are on same host, the two ports to open are the following and the registry port. -# 0 means random port [default configuration = 0] -carol.iiop.server.port=0 - -# The value of this port is used to set the SSL port of the objects listener. -# Note that this port musn't not be set to 0 as it is used for CsiV2. -# but this port is used only if SSL mode is enable. -# So by default, there is no listener on this port -# [default configuration = not used] -carol.iiop.server.sslport=2003 - -# Delegate used by JOnAS for rmi-iiop protocol -carol.iiop.PortableRemoteObjectClass=org.ow2.jonas.lib.naming.JacORBPRODelegate - - -###################################################################### -# Advanced JNDI Configuration -###################################################################### -carol.jndi.java.naming.factory.url.pkgs=org.ow2.jonas.lib.naming diff --git a/jonas_tests/protocols/clientconf/traceclient.properties b/jonas_tests/protocols/clientconf/traceclient.properties deleted file mode 100644 index e924727b757b5f11b4a8d09f9eca9adfa11e74fa..0000000000000000000000000000000000000000 --- a/jonas_tests/protocols/clientconf/traceclient.properties +++ /dev/null @@ -1,46 +0,0 @@ -# ----------------------------------------------------------------------- -# This is a default configuration file for monolog. -# -# Patterns for each handler may include these possible values : -# %h the thread name -# %O{1} the Class name (basename only) -# %M the method name -# %L the line number -# %d the date -# %l the level -# %m the message itself -# %n a new line -# -# Each logger inherits from its parent for properties not defined. -# The root logger is "root". It must always be defined. -# -# Each logger is associated with a level that can be one of : -# ERROR | WARN | INFO | DEBUG -# -# -> More info on http://www.objectweb.org/monolog/doc.html -# ----------------------------------------------------------------------- -# -# Define which wrapper to use (= javaLog) -# ----------------------------------------------------------------------- -# For Log4j you need to add log4j.jar -# log.config.classname org.objectweb.util.monolog.wrapper.log4j.MonologLoggerFactory -log.config.classname org.objectweb.util.monolog.wrapper.javaLog.LoggerFactory - -# ----------------------------------------------------------------------- -# tty : console handler -# ----------------------------------------------------------------------- -handler.tty.type Console -handler.tty.output System.out -#handler.tty.pattern %O{1}.%M : %m%n -handler.tty.pattern %d : %l : %h : %O{1}.%M : %m%n - -# ----------------------------------------------------------------------- -# logger definitions -# ----------------------------------------------------------------------- -logger.root.handler.0 tty - -logger.root.level ERROR -logger.org.ow2.jonas.client.level ERROR -#logger.org.ow2.carol.cmi.level DEBUG - - diff --git a/jonas_tests/protocols/modules/client/META-INF/application-client.xml b/jonas_tests/protocols/modules/client/META-INF/application-client.xml deleted file mode 100644 index 86703e03d19fba853710d449372b429480784a06..0000000000000000000000000000000000000000 --- a/jonas_tests/protocols/modules/client/META-INF/application-client.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - Protocols test client - - - - - ejb/MyService - Session - org.ow2.jonas.protocols.test.ejbs.MyServiceHome - org.ow2.jonas.protocols.test.ejbs.MyService - ejbs.jar#MyService - - - - - diff --git a/jonas_tests/protocols/modules/client/resources/jaas.config b/jonas_tests/protocols/modules/client/resources/jaas.config deleted file mode 100644 index 37efc0391705d1fa2b954249682ab0156f00a631..0000000000000000000000000000000000000000 --- a/jonas_tests/protocols/modules/client/resources/jaas.config +++ /dev/null @@ -1,16 +0,0 @@ -JMSLoader { - // Login Module to use for AppliGeneve. - - //First, use a LoginModule for the authentication - // Use the resource memrlm_1 - org.ow2.jonas.security.auth.spi.JResourceLoginModule required - resourceName="memrlm_1" - serverName="mqjca" - ; - - // Use the login module to propagate security to the JOnAS server - org.ow2.jonas.security.auth.spi.ClientLoginModule required - globalCtx="true" - - ; -}; \ No newline at end of file diff --git a/jonas_tests/protocols/modules/ejbs/build/build.xml b/jonas_tests/protocols/modules/ejbs/build/build.xml deleted file mode 100644 index 3a0575a47e9d4c3a1e62db9c1aec5a95b00ab986..0000000000000000000000000000000000000000 --- a/jonas_tests/protocols/modules/ejbs/build/build.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/protocols/scripts/client.sh b/jonas_tests/protocols/scripts/client.sh deleted file mode 100755 index edb5201d5d4aa7de681c31bac99e13d5394d0641..0000000000000000000000000000000000000000 --- a/jonas_tests/protocols/scripts/client.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# --------------------------------------------------------------------------- -# Protocols test -# Copyright (C) 2007 Bull S.A.S. -# Contact: jonas-team@objectweb.org -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -# -# --------------------------------------------------------------------------- -# $Id: $ -# --------------------------------------------------------------------------- - -# Launches a simple test -# Usage : client.sh multi 0 with -# clientnb : the threads nb -# iterationNb : the loop nb -# type : the sort of test among Remote CreateRemote LookupCreateRemote MetaData -# Ex : client.sh multi 5 200 0 Remote - -java -version -export JAVA_OPTS="-Dmonolog.wrappers=org.ow2.carol.cmi.configuration.TraceCmi $JAVA_OPTS" -export APPLI=$JONAS_BASE/apps/autoload/applicall.ear -java $JAVA_OPTS -jar $JONAS_ROOT/lib/client.jar -carolFile ./clientconf/carol.properties -traceFile ./clientconf/traceclient.properties $APPLI $* diff --git a/jonas_tests/samplehttp/build.xml b/jonas_tests/samplehttp/build.xml deleted file mode 100644 index a264deb4d172524138752c0039728c07d51158db..0000000000000000000000000000000000000000 --- a/jonas_tests/samplehttp/build.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/ws/build.xml b/jonas_tests/ws/build.xml deleted file mode 100644 index 1440937671ea084e004567d37d19f5b943da02fa..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/build.xml +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Running JUnit Client: 'jonas.base=${jonas.base}' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jonas_tests/ws/etc/apps/time-test.xml b/jonas_tests/ws/etc/apps/time-test.xml deleted file mode 100644 index f494d3dd24631e56fdfe737493ba1a925cd29d7e..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/etc/apps/time-test.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - time endpoint tests - - - time-client.jar - - - - time.jar - - - diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/mcontext/BeanAccessorSLR.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/mcontext/BeanAccessorSLR.java deleted file mode 100644 index 66c33eabd1a1e050d047d42721369f51ca7be40b..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/mcontext/BeanAccessorSLR.java +++ /dev/null @@ -1,77 +0,0 @@ -// BeanAccessorSLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.mcontext; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.Context; -import javax.naming.InitialContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * - */ -public class BeanAccessorSLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // BeanAccessor implementation - // ------------------------------------------------------------------ - - /** - * method1 - */ - public boolean localBeanHasMessageContext() { - logger.log(BasicLevel.DEBUG, ""); - try { - Context ctx = new InitialContext(); - TestMC1LocalHome home = (TestMC1LocalHome) ctx.lookup("TestMC1Home_L"); - TestMC1Local mc1 = home.create(); - return mc1.localMethodHasMessageContext(); - } catch (Exception e) { - logger.log(BasicLevel.WARN, "Something goes wrong"); - } - return true; - } - -} - diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/mcontext/TestMC1SLL.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/mcontext/TestMC1SLL.java deleted file mode 100644 index e39aceb27a44b431e974dcf5d557a877aebb719a..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/mcontext/TestMC1SLL.java +++ /dev/null @@ -1,83 +0,0 @@ -// TestMC1SLL.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.mcontext; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.xml.rpc.handler.MessageContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * - */ -public class TestMC1SLL implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // TestMC1 implementation - // ------------------------------------------------------------------ - - public boolean serviceEndpointMethodHasMessageContext() { - logger.log(BasicLevel.DEBUG, ""); - return hasMessageContext(); - } - - public boolean localMethodHasMessageContext() { - logger.log(BasicLevel.DEBUG, ""); - return hasMessageContext(); - } - - private boolean hasMessageContext() { - try { - MessageContext mc = ejbContext.getMessageContext(); - if (mc != null) { - return true; - } else { - return false; - } - } catch(IllegalStateException ise) { - return false; - } - } - -} - diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/mcontext/TestMC2SLR.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/mcontext/TestMC2SLR.java deleted file mode 100644 index 89685eeb374198cb35610cb3f8f1822a4f9a636d..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/mcontext/TestMC2SLR.java +++ /dev/null @@ -1,83 +0,0 @@ -// TestMC2SLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.mcontext; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.xml.rpc.handler.MessageContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * - */ -public class TestMC2SLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // TestMC2 implementation - // ------------------------------------------------------------------ - - public boolean serviceEndpointMethodHasMessageContext() { - logger.log(BasicLevel.DEBUG, ""); - return hasMessageContext(); - } - - public boolean remoteMethodHasMessageContext() { - logger.log(BasicLevel.DEBUG, ""); - return hasMessageContext(); - } - - private boolean hasMessageContext() { - try { - MessageContext mc = ejbContext.getMessageContext(); - if (mc != null) { - return true; - } else { - return false; - } - } catch(IllegalStateException ise) { - return false; - } - } - -} - diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/time/TimeBeanHandler.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/time/TimeBeanHandler.java deleted file mode 100644 index 7aa749d2e6e37451da2241f17b9ea0dfdd1ba051..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/time/TimeBeanHandler.java +++ /dev/null @@ -1,122 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.jonas.jtests.beans.time; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * - * - * @author Guillaume Sauthier - */ -public class TimeBeanHandler extends GenericHandler { - - private Logger logger = null; - - /** - * The init method to enable the Handler instance to - * initialize itself. - * @param config handler configuration - */ - public void init(HandlerInfo hinfo) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - String val = (String) hinfo.getHandlerConfig().get("jonas.test.server.handler"); - StaticPassValue spv = StaticPassValue.getInstance(); - spv.setInitValue(val); - } - - /** - * The destroy method indicates the end of lifecycle - * for a Handler instance. - */ - public void destroy() { - logger.log(BasicLevel.DEBUG, ""); - } - - /** - * The handleRequest method processes the request - * SOAP message. The default implementation of this method returns - * true. This indicates that the handler chain - * should continue processing of the request SOAP message. - * @param context the message context - * @return true/false - */ - public boolean handleRequest(MessageContext mc) { - logger.log(BasicLevel.DEBUG, ""); - StaticPassValue spv = StaticPassValue.getInstance(); - spv.setRequestValue("handlerRequest-Invoked"); - return true; - } - - /** - * The handleResponse method processes the response - * message. The default implementation of this method returns - * true. This indicates that the handler chain - * should continue processing of the response SOAP message. - * @param context the message context - * @return true/false - */ - public boolean handleResponse(MessageContext context) { - logger.log(BasicLevel.DEBUG, ""); - return true; - } - - /** - * The handleFault method processes the SOAP faults - * based on the SOAP message processing model. The default - * implementation of this method returns true. This - * indicates that the handler chain should continue processing - * of the SOAP fault. - * @param context the message context - * @return true/false - */ - public boolean handleFault(MessageContext context) { - logger.log(BasicLevel.DEBUG, ""); - return true; - } - - /** - * Gets the header blocks processed by this Handler instance. - * - * @return Array of QNames of header blocks processed by this handler instance. - * QName is the qualified name of the outermost element of the Header block. - */ - public QName[] getHeaders() { - logger.log(BasicLevel.DEBUG, ""); - return new QName[0]; - } - -} diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/time/TimeBeanSLR.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/time/TimeBeanSLR.java deleted file mode 100644 index d3f41a201eef12803618573333c9bbeaf0852689..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/time/TimeBeanSLR.java +++ /dev/null @@ -1,77 +0,0 @@ -// TimeBeanSLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.time; - -import java.util.Date; - -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - -/** - * - */ -public class TimeBeanSLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // TimeBean implementation - // ------------------------------------------------------------------ - - public long getDateAsLong() { - logger.log(BasicLevel.DEBUG, ""); - return new Date().getTime(); - } - - public Date getDate() { - logger.log(BasicLevel.DEBUG, ""); - return new Date(); - } - - public boolean isHandlerInitRequestInvoked() { - logger.log(BasicLevel.DEBUG, ""); - StaticPassValue spv = StaticPassValue.getInstance(); - String init = spv.getInit(); - String req = spv.getRequest(); - return (init != null && req != null); - } -} - diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/wsclient/WsClient1SLR.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/wsclient/WsClient1SLR.java deleted file mode 100644 index 5684d7d7bd7fe0d7601e4d97562864eaed98d79c..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/beans/wsclient/WsClient1SLR.java +++ /dev/null @@ -1,105 +0,0 @@ -// WsClient1SLR.java -// Stateless Session bean - -package org.objectweb.jonas.jtests.beans.wsclient; - - - -import java.rmi.RemoteException; -import javax.ejb.CreateException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceException; -import org.ow2.jonas.lib.util.Log; -import org.objectweb.util.monolog.api.BasicLevel; -import org.objectweb.util.monolog.api.Logger; - - -/** - * - */ -public class WsClient1SLR implements SessionBean { - - static private Logger logger = null; - SessionContext ejbContext; - - Service service; - - // ------------------------------------------------------------------ - // SessionBean implementation - // ------------------------------------------------------------------ - - - public void setSessionContext(SessionContext ctx) { - if (logger == null) { - logger = Log.getLogger("org.objectweb.jonas_tests"); - } - logger.log(BasicLevel.DEBUG, ""); - ejbContext = ctx; - } - - - public void ejbRemove() { - logger.log(BasicLevel.DEBUG, ""); - } - - - public void ejbCreate() throws CreateException { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbPassivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - public void ejbActivate() { - logger.log(BasicLevel.DEBUG, ""); - } - - // ------------------------------------------------------------------ - // WsClient1 implementation - // ------------------------------------------------------------------ - - public boolean lookupServiceJNDI() { - logger.log(BasicLevel.DEBUG, "lookupServiceJNDI"); - service = null; - try { - InitialContext ic = new InitialContext(); - service = (Service) ic.lookup("ws/XMethodsService"); - } catch (NamingException ne) { - logger.log(BasicLevel.ERROR, "looking ws/XMethodsService : " + ne.getMessage()); - return false; - } - return (service != null); - } - - public boolean lookupServiceName() { - logger.log(BasicLevel.DEBUG, "lookupServiceName"); - service = null; - try { - InitialContext ic = new InitialContext(); - service = (Service) ic.lookup("java:comp/env/service/XMethods"); - } catch (NamingException ne) { - logger.log(BasicLevel.ERROR, "looking java:comp/env/service/XMethods : " + ne.getMessage()); - return false; - } - return (service != null); - } - - public void getAllServiceNames() throws ServiceException, RemoteException { - logger.log(BasicLevel.DEBUG, "getAllServiceNames"); - - lookupServiceName(); - Call call = service.createCall(new QName("XMethodsQuerySoap"), - new QName("getAllServiceNames")); - call.invoke(new Object[] {}); - - logger.log(BasicLevel.DEBUG, "Call is OK"); - } -} - diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/endpoint/F_TimeEndpoint.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/endpoint/F_TimeEndpoint.java deleted file mode 100644 index 7e1ad637347abba435b2864a265d5e32913c5de4..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/endpoint/F_TimeEndpoint.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.jonas.jtests.clients.endpoint; - -import java.io.File; -import java.util.Calendar; - -import javax.wsdl.Definition; -import javax.wsdl.Import; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import javax.xml.rpc.Service; -import javax.xml.rpc.ServiceFactory; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.ow2.jonas.lib.util.Cmd; - -import org.objectweb.jonas.jtests.util.JWebServicesTestCase; - -/** - * @author Guillaume Sauthier - */ -public class F_TimeEndpoint extends JWebServicesTestCase { - - private static final String TIMEPORT_URL = "/time/TimePort/TimePort"; - - /** - * @param s - */ - public F_TimeEndpoint(String s) { - super(s); - } - - public static Test suite() { - return new TestSuite(F_TimeEndpoint.class); - } - - public void setUp() throws Exception { - super.setUp(); - - useEar("time-test"); - } - - public void tearDown() throws Exception { - super.tearDown(); - } - - public void testTimeEndpoint() throws Exception { - String port = System.getProperty("http.port"); - - Service service = ServiceFactory.newInstance().createService(new QName("jonas:Time", "TimeBeanService")); - Call call = service.createCall(new QName("TimePort"), new QName("getDate")); - call.setTargetEndpointAddress("http://localhost:" + port + TIMEPORT_URL); - Calendar cal = (Calendar) call.invoke(new Object[] {}); - - assertNotNull("ServiceEndpoint performed succesfully", cal); - } - - public void testTimeEndpointServerHandler() throws Exception { - String port = System.getProperty("http.port"); - - Service service = ServiceFactory.newInstance().createService(new QName("jonas:Time", "TimeBeanService")); - Call call = service.createCall(new QName("TimePort"), new QName("isHandlerInitRequestInvoked")); - call.setTargetEndpointAddress("http://localhost:" + port + TIMEPORT_URL); - Boolean b = (Boolean) call.invoke(new Object[] {}); - - assertTrue("Handler were not invoked successfully", b.booleanValue()); - } - - public void testTimeEndpointFromAppClient() throws Exception { - - String javaHomeBin = System.getProperty("java.home") + File.separator + "bin" + File.separator; - String jonasRoot = System.getProperty("jonas.root"); - String jonasBase = System.getProperty("jonas.base.client"); - - Cmd cmd = new Cmd(javaHomeBin + "java"); - - cmd.addArgument("-Djava.endorsed.dirs=" + jonasRoot + File.separator + "lib" + File.separator + "endorsed"); - - // classpath - cmd.addArgument("-classpath"); - - String jonasBaseConf = jonasBase + File.separator + "conf"; - String clientJarPath = jonasBase + File.separator + "conf" + File.pathSeparator + jonasRoot + File.separator + "lib" - + File.separator + "client.jar"; - String jonasClientJarPath = jonasRoot + File.separator + "lib" + File.separator + "jonas-client.jar"; - cmd.addArgument(jonasBaseConf + File.pathSeparator + clientJarPath + File.pathSeparator + jonasClientJarPath); - cmd.addArgument("org.ow2.jonas.client.ClientContainer"); - // ear - cmd.addArgument(jonasBase + File.separator + "apps" + File.separator + "time-test.ear"); - - if (!cmd.run()) { - fail("Client fail see output for informations"); - } - } - - - public void testTimeEndpointURLPublication() throws Exception { - String port = System.getProperty("http.port"); - - String url = "http://localhost:" + port + TIMEPORT_URL + "?JWSDL"; - WSDLFactory factory = WSDLFactory.newInstance(); - WSDLReader reader = factory.newWSDLReader(); - reader.setFeature("javax.wsdl.importDocuments", true); - Definition def = reader.readWSDL(url); - - Import imp = (Import) def.getImports("jonas:Time").get(0); - assertEquals("wsdl:import[@location] not updated !", url + "&filename=Time.wsdl&context=.", imp.getLocationURI()); - } - -} \ No newline at end of file diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/mbeans/F_WebServicesMBeans.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/mbeans/F_WebServicesMBeans.java deleted file mode 100644 index caf67b6b1fa3a5d9a0bb70bf6d0ee5debcc4c983..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/mbeans/F_WebServicesMBeans.java +++ /dev/null @@ -1,296 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 2005 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.jonas.jtests.clients.mbeans; - -import java.util.Properties; - -import javax.management.ObjectName; -import javax.management.j2ee.Management; -import javax.management.j2ee.ManagementHome; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; -import javax.security.auth.login.LoginContext; -import javax.security.auth.callback.CallbackHandler; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.objectweb.jonas.jtests.util.JWebServicesTestCase; -import org.ow2.jonas.security.auth.callback.NoInputCallbackHandler; - -/** - * Test WebServices MBeans (WebServices, Service, PortComponent and Handler). - * - * @author Guillaume Sauthier - */ -public class F_WebServicesMBeans extends JWebServicesTestCase { - - /** - * MEJB instance - */ - private Management mejb = null; - - /** - * Service of Time Sample's ObjectName - */ - private static final String SERVICE_MBEAN_ON = "jonas:type=WebService,name=TimeWebService,J2EEServer=jonas,J2EEApplication=time-test,EJBModule=time"; - - /** - * PortComponent of Time Sample's ObjectName - */ - private static final String PC_MBEAN_ON = "jonas:type=WebServicePortComponent,name=TimePort,WebService=TimeWebService,J2EEServer=jonas,EJBModule=time,J2EEApplication=time-test"; - - /** - * Handler of Time Sample's ObjectName - */ - private static final String HANDLER_MBEAN_ON = "jonas:type=WebServiceHandler,name=TimeBeanHandler,WebServicePortComponent=TimePort,EJBModule=time,J2EEServer=jonas,J2EEApplication=time-test,WebService=TimeWebService"; - - /** - * SessionBean realizing the Time Service - */ - private static final String SSB_MBEAN_ON = "jonas:j2eeType=StatelessSessionBean,name=TimeBeanSLR,EJBModule=time,J2EEApplication=time-test,J2EEServer=jonas"; - - // =================== Attributes pre-filling ====================================== - - /** - * Service.portComponents - */ - private static final String[] SERVICE_PCS_ATT = new String[] { PC_MBEAN_ON }; - - /** - * PortComponent.handlers - */ - private static final String[] PC_HANDLERS_ATT = new String[] { HANDLER_MBEAN_ON }; - - /** - * Handler.soapHeaders - */ - private static final String[] SOAP_HEADERS = new String[] { }; - - /** - * Handler.soapRoles - */ - private static final String[] SOAP_ROLES = new String[] { }; - - /** - * Handler.initParams - */ - private static Properties INIT_PARAMS = null; - - /** - * Inner static class used to store tests expected results - * - * @author Guillaume Sauthier - */ - private static class WsTest { - /** - * MBean attribute name - */ - public String name; - - /** - * MBean attribute type - */ - public Class type; - - /** - * Expected result - */ - public Object expected; - - /** - * does the String represents an ObjectName ? - */ - public boolean isObjectName; - - /** - * WsTest Constructor - * @param name att name - * @param type att type - * @param expected att value - */ - public WsTest(String name, Class type, Object expected) { - this(name, type, expected, false); - } - - /** - * WsTest Constructor - * @param name att name - * @param type att type - * @param expected att value - */ - public WsTest(String name, Class type, Object expected, boolean on) { - super(); - this.name = name; - this.type = type; - this.expected = expected; - this.isObjectName = on; - } - } - - /** - * Tests values for Service MBean - */ - private WsTest[] SERVICE_TEST = null; - - /** - * Tests values for PortComponent MBean - */ - private WsTest[] PORT_TEST = null; - - /** - * Tests values for Handler MBean - */ - private WsTest[] HANDLER_TEST = null; - - /** - * Are the tables init ? - */ - private boolean initialized = false; - - /** - * The LoginContext to be used for security. - */ - private LoginContext context; - - public F_WebServicesMBeans(String s) { - super(s); - } - - public static Test suite() { - return new TestSuite(F_WebServicesMBeans.class); - } - - public void setUp() throws Exception { - super.setUp(); - useEar("time-test"); - CallbackHandler handler = new NoInputCallbackHandler("jonas", "jonas"); - context = new LoginContext("test", handler); - context.login(); - - mejb = getMEJB(); - if (!initialized) { - initTestsTables(); - initialized = true; - } - } - - /** - * init tables - */ - private void initTestsTables() { - - INIT_PARAMS = new Properties(); - INIT_PARAMS.put("jonas.test.server.handler", "JOnAS"); - - SERVICE_TEST = new WsTest[] { - new WsTest("name", java.lang.String.class, "TimeWebService"), - new WsTest("portComponents", java.lang.String[].class, SERVICE_PCS_ATT, true), - new WsTest("wsdlURL", java.lang.String.class, getAbsoluteUrl("/time/TimePort/TimePort?JWSDL")), - new WsTest("mappingFilename", java.lang.String.class, "META-INF/mapping.xml"), - new WsTest("wsdlFilename", java.lang.String.class, "META-INF/wsdl/TimePort.wsdl") }; - - PORT_TEST = new WsTest[] { - new WsTest("name", java.lang.String.class, "TimePort"), - new WsTest("handlers", java.lang.String[].class, PC_HANDLERS_ATT, true), - new WsTest("wsdlPort", java.lang.String.class, "{jonas:Time}TimePort"), - new WsTest("serviceEndpointInterface", java.lang.String.class, "org.objectweb.jonas.jtests.beans.time.TimeEndpoint"), - new WsTest("endpoint", java.lang.String.class, getAbsoluteUrl("/time/TimePort/TimePort")), - new WsTest("implementationBean", java.lang.String.class, SSB_MBEAN_ON, true) }; - - HANDLER_TEST = new WsTest[] { - new WsTest("name", java.lang.String.class, "TimeBeanHandler"), - new WsTest("classname", java.lang.String.class, "org.objectweb.jonas.jtests.beans.time.TimeBeanHandler"), - new WsTest("soapHeaders", java.lang.String[].class, SOAP_HEADERS), - new WsTest("soapRoles", java.lang.String[].class, SOAP_ROLES), - new WsTest("initParams", java.util.Properties.class, INIT_PARAMS) }; - - } - - - private Management getMEJB() throws Exception { - InitialContext ic = new InitialContext(); - Object o = ic.lookup("ejb/mgmt/MEJB"); - ManagementHome home = (ManagementHome) PortableRemoteObject.narrow(o, ManagementHome.class); - return home.create(); - } - - public void tearDown() throws Exception { - mejb = null; - context.logout(); - super.tearDown(); - } - - public void testWebServiceMBean() throws Exception { - checkMBean(SERVICE_MBEAN_ON, SERVICE_TEST); - } - - public void testPortComponentMBean() throws Exception { - checkMBean(PC_MBEAN_ON, PORT_TEST); - // check that the implementationBean is live - String se = (String) mejb.getAttribute(new ObjectName(PC_MBEAN_ON), "implementationBean"); - assertTrue("implementationBean MBean must be registered", mejb.isRegistered(new ObjectName(se))); - } - - public void testHandlerMBean() throws Exception { - checkMBean(HANDLER_MBEAN_ON, HANDLER_TEST); - } - - private void checkMBean(String onStr, WsTest[] tests) throws Exception { - ObjectName on = ObjectName.getInstance(onStr); - assertTrue("ObjectName not registered " + on, mejb.isRegistered(on)); - - for (int i = 0; i < tests.length; i++) { - - boolean isObjectName = tests[i].isObjectName; - - Object o = mejb.getAttribute(on, tests[i].name); - assertNotNull("Cannot retrieve attribute '" + tests[i].name - + "' from " + on, o); - assertEquals("Expecting type " + tests[i].type + " for attribute " - + tests[i].name, tests[i].type, o.getClass()); - if (tests[i].type.isArray()) { - Object[] a1 = (Object[]) o; - Object[] a2 = (Object[]) tests[i].expected; - assertEquals("'" + tests[i].name + "' Array size error", a2.length, a1.length); - - for (int j = 0; j < a1.length; j++) { - if (isObjectName) { - assertEquals("'" + tests[i].name + "[" + j + "]' mismatch", new ObjectName((String) a2[j]), new ObjectName((String) a1[j])); - } else { - assertEquals("'" + tests[i].name + "[" + j + "]' mismatch", a2[j], a1[j]); - } - } - } else { - if (isObjectName) { - assertEquals("'" + tests[i].name + "' mismatch", new ObjectName((String) tests[i].expected), new ObjectName((String) o)); - } else { - assertEquals("'" + tests[i].name + "' mismatch", tests[i].expected, o); - } - } - } - } - -} diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/service/F_AxisService.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/service/F_AxisService.java deleted file mode 100644 index f50844a982f18474c81db17f8515adb518a3cb3d..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/service/F_AxisService.java +++ /dev/null @@ -1,408 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ -package org.objectweb.jonas.jtests.clients.service; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import javax.naming.RefAddr; -import javax.naming.Reference; -import javax.naming.StringRefAddr; -import javax.xml.namespace.QName; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.custommonkey.xmlunit.Diff; -import org.custommonkey.xmlunit.XMLAssert; -import org.custommonkey.xmlunit.XMLUnit; -import org.objectweb.jonas.jtests.util.JWebServicesTestCase; -import org.ow2.jonas.deployment.common.digester.JDigester; -import org.ow2.jonas.deployment.common.rules.JonasServiceRefRuleSet; -import org.ow2.jonas.deployment.common.rules.ServiceRefRuleSet; -import org.ow2.jonas.deployment.ws.ServiceRefDesc; -import org.ow2.jonas.lib.util.JNDIUtils; -import org.ow2.jonas.ws.axis.JAxisServiceFactory; -import org.ow2.jonas.ws.jaxrpc.factory.JServiceFactory; - -/** - * test case for axis service instanciation - */ -public class F_AxisService extends JWebServicesTestCase { - private String resources = null; - - private JServiceFactory jfactory = null; - - public F_AxisService(String name) { - super(name); - } - - public static Test suite() { - return new TestSuite(F_AxisService.class); - } - - public void setUp() throws Exception { - super.setUp(); - resources = System.getProperty("ws.resources"); - jfactory = new JAxisServiceFactory(); - } - - public void tearDown() throws Exception { - jfactory = null; - super.tearDown(); - } - - public void testClientWSDDDefaultWhenWSDDNotSpecified() throws Exception { - String expected = "\n" - + "\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + "\n"; - Reference ref = createServiceReference("no-wsdd-specified-j2ee.xml", - "no-wsdd-specified-jonas.xml"); - assertNotNull("Shouldn't have a wsdd", ref.get(JAxisServiceFactory.REF_CLIENT_CONFIG)); - - String returned = (String) ref.get(JAxisServiceFactory.REF_CLIENT_CONFIG).getContent(); - XMLUnit.setIgnoreWhitespace(true); - Diff diff = XMLUnit.compareXML(expected, returned); - XMLAssert.assertXMLEqual("WSDD are not equivalent", diff, true); - } - - public void testClientWSDDMergingWhenWSDDSpecified() throws Exception { - String expected = "\n" - + "\n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" - + " \n" + "\n"; - Reference ref = createServiceReference("wsdd-specified-j2ee.xml", - "wsdd-specified-jonas.xml"); - - String returned = (String) ref.get(JAxisServiceFactory.REF_CLIENT_CONFIG).getContent(); - XMLUnit.setIgnoreWhitespace(true); - Diff diff = XMLUnit.compareXML(expected, returned); - XMLAssert.assertXMLEqual("WSDD are not equivalent", diff, true); - } - - public void testWSDLUrlWithNoWSDLOverride() throws Exception { - Reference ref = createServiceReference("wsdl-url-default-j2ee.xml", - "wsdl-url-default-jonas.xml"); - URL urlMatching = new File(new File(resources, "wsdl"), "oneService.wsdl").toURL(); - assertEquals("WSDL URL is not set appropriately", - urlMatching.toString(), - ref.get(JAxisServiceFactory.REF_SERVICE_WSDL).getContent()); - } - - public void testWSDLUrlWithWSDLOverride() throws Exception { - Reference ref = createServiceReference("wsdl-url-override-j2ee.xml", - "wsdl-url-override-jonas.xml"); - // create matching URL - URL urlMatching = new File(new File(resources, "wsdl"), "twoService.wsdl").toURL(); - assertEquals( - "WSDL URL is not set appropriately", - urlMatching.toString(), - ref.get(JAxisServiceFactory.REF_SERVICE_WSDL).getContent()); - } - - public void testServiceQNameWhenNotSpecified() throws Exception { - Reference ref = createServiceReference("service-qname-auto-j2ee.xml", - "service-qname-auto-jonas.xml"); - QName exp = new QName("http://hello.simple", "HelloWsService"); - QName auto = (QName) JNDIUtils.getObjectFromBytes((byte[]) ref.get( - JAxisServiceFactory.REF_SERVICE_QNAME).getContent()); - assertEquals("Service QName is incorrect", exp, auto); - } - - public void testServiceQNameWhenExplicitelySet() throws Exception { - Reference ref = createServiceReference( - "service-qname-explicit-j2ee.xml", - "service-qname-explicit-jonas.xml"); - QName exp = new QName("http://hello.simple", "HelloWsService2"); - QName auto = (QName) JNDIUtils.getObjectFromBytes((byte[]) ref.get( - JAxisServiceFactory.REF_SERVICE_QNAME).getContent()); - assertEquals("Service QName is incorrect", exp, auto); - } - - public void testPort2WSDLMapWhenNoPortComponentRefSpecified() - throws Exception { - Reference ref = createServiceReference("no-port2wsdl-map-j2ee.xml", - "no-port2wsdl-map-jonas.xml"); - assertNull("Shouldn't have a Port2WSDL Map", ref - .get(JAxisServiceFactory.REF_SERVICE_PORT2WSDL)); - } - - public void testPort2WSDLMapWithMultiplePortComponent() throws Exception { - Reference ref = createServiceReference("port2wsdl-map-j2ee.xml", - "port2wsdl-map-jonas.xml"); - Map exp = new HashMap(); - exp.put("org.objectweb.jonas.jtests.hello.HelloWs", new QName( - "http://hello.simple", "HelloPortComponent")); - exp.put("org.objectweb.jonas.jtests.hello.HelloWs2", new QName( - "http://hello.simple", "HelloPortComponent2")); - Map returned = (Map) JNDIUtils.getObjectFromBytes((byte[]) ref.get( - JAxisServiceFactory.REF_SERVICE_PORT2WSDL).getContent()); - assertEquals("Map are not identical", exp, returned); - } - - public void testStubPropertiesNull() throws Exception { - Reference ref = createServiceReference("stub-props-null-j2ee.xml", - "stub-props-null-jonas.xml"); - assertNull("Stub properties should be null", ref - .get(JAxisServiceFactory.REF_SERVICE_STUB_PROPS - + "_HelloPortComponent")); - } - - public void testStubPropertiesEmpty() throws Exception { - Reference ref = createServiceReference("stub-props-empty-j2ee.xml", - "stub-props-empty-jonas.xml"); - RefAddr ra = ref.get(JAxisServiceFactory.REF_SERVICE_STUB_PROPS - + "_HelloPortComponent"); - assertNull("RefAddr " + JAxisServiceFactory.REF_SERVICE_STUB_PROPS - + "_HelloPortComponent" + " must be null", ra); - RefAddr ra2 = ref.get(JAxisServiceFactory.REF_SERVICE_STUB_PROPS - + "_HelloPortComponent2"); - assertNull("RefAddr " + JAxisServiceFactory.REF_SERVICE_STUB_PROPS - + "_HelloPortComponent2" + " must be null", ra2); - } - - public void testStubPropertiesForGivenPortName() throws Exception { - Reference ref = createServiceReference("stub-props-j2ee.xml", - "stub-props-jonas.xml"); - // port #1 - RefAddr ra = ref.get(JAxisServiceFactory.REF_SERVICE_STUB_PROPS - + "_HelloPortComponent"); - assertNotNull("RefAddr " + JAxisServiceFactory.REF_SERVICE_STUB_PROPS - + "_HelloPortComponent" + " must be not null", ra); - Map returned = (Map) JNDIUtils.getObjectFromBytes((byte[]) ra - .getContent()); - assertFalse("Stub properties shouldn't be empty", returned.isEmpty()); - Properties exp = new Properties(); - exp.setProperty("my.test.property", "test.value"); - exp.setProperty("my.test.property.2", "test.value.2"); - assertEquals( - "Stub Properties for port 'HelloPortComponent' not identical", - exp, returned); - // port #2 - RefAddr ra2 = ref.get(JAxisServiceFactory.REF_SERVICE_STUB_PROPS - + "_HelloPortComponent2"); - assertNotNull("RefAddr " + JAxisServiceFactory.REF_SERVICE_STUB_PROPS - + "_HelloPortComponent2" + " must be not null", ra2); - Map returned2 = (Map) JNDIUtils.getObjectFromBytes((byte[]) ra2 - .getContent()); - assertFalse("Stub properties shouldn't be empty", returned2.isEmpty()); - Properties exp2 = new Properties(); - exp2.setProperty("other.test.property", "test.value"); - exp2.setProperty("other.test.property.2", "test.value.2"); - assertEquals( - "Stub Properties for port 'HelloPortComponent' not identical", - exp2, returned2); - } - - public void testCallPropertiesNull() throws Exception { - Reference ref = createServiceReference("call-props-null-j2ee.xml", - "call-props-null-jonas.xml"); - assertNull("Call properties should be null", ref - .get(JAxisServiceFactory.REF_SERVICE_CALL_PROPS - + "_HelloPortComponent")); - } - - public void testCallPropertiesEmpty() throws Exception { - Reference ref = createServiceReference("call-props-empty-j2ee.xml", - "call-props-empty-jonas.xml"); - RefAddr ra = ref.get(JAxisServiceFactory.REF_SERVICE_CALL_PROPS - + "_HelloPortComponent"); - assertNull("RefAddr " + JAxisServiceFactory.REF_SERVICE_CALL_PROPS - + "_HelloPortComponent" + " must be null", ra); - RefAddr ra2 = ref.get(JAxisServiceFactory.REF_SERVICE_CALL_PROPS - + "_HelloPortComponent2"); - assertNull("RefAddr " + JAxisServiceFactory.REF_SERVICE_CALL_PROPS - + "_HelloPortComponent2" + " must be null", ra2); - } - - public void testCallPropertiesForGivenPortName() throws Exception { - Reference ref = createServiceReference("call-props-j2ee.xml", - "call-props-jonas.xml"); - // port #1 - RefAddr ra = ref.get(JAxisServiceFactory.REF_SERVICE_CALL_PROPS - + "_HelloPortComponent"); - assertNotNull("RefAddr " + JAxisServiceFactory.REF_SERVICE_CALL_PROPS - + "_HelloPortComponent" + " must be not null", ra); - Map returned = (Map) JNDIUtils.getObjectFromBytes((byte[]) ra - .getContent()); - assertFalse("Stub properties shouldn't be empty", returned.isEmpty()); - Properties exp = new Properties(); - exp.setProperty("my.test.property", "test.value"); - exp.setProperty("my.test.property.2", "test.value.2"); - assertEquals( - "Stub Properties for port 'HelloPortComponent' not identical", - exp, returned); - // port #2 - RefAddr ra2 = ref.get(JAxisServiceFactory.REF_SERVICE_CALL_PROPS - + "_HelloPortComponent2"); - assertNotNull("RefAddr " + JAxisServiceFactory.REF_SERVICE_CALL_PROPS - + "_HelloPortComponent2" + " must be not null", ra2); - Map returned2 = (Map) JNDIUtils.getObjectFromBytes((byte[]) ra2 - .getContent()); - assertFalse("Call properties shouldn't be empty", returned2.isEmpty()); - Properties exp2 = new Properties(); - exp2.setProperty("other.test.property", "test.value"); - exp2.setProperty("other.test.property.2", "test.value.2"); - assertEquals( - "Call Properties for port 'HelloPortComponent' not identical", - exp2, returned2); - } - - public void testPortNameListEmpty() throws Exception { - Reference ref = createServiceReference("port-name-list-empty-j2ee.xml", - "port-name-list-empty-jonas.xml"); - assertNull(JAxisServiceFactory.REF_SERVICE_WSDL_PORT_LIST - + " should be null", ref - .get(JAxisServiceFactory.REF_SERVICE_WSDL_PORT_LIST)); - } - - public void testPortNameListWithMultiplePortComponent() throws Exception { - Reference ref = createServiceReference("port-name-list-j2ee.xml", - "port-name-list-jonas.xml"); - RefAddr ra = ref.get(JAxisServiceFactory.REF_SERVICE_WSDL_PORT_LIST); - assertNotNull(JAxisServiceFactory.REF_SERVICE_WSDL_PORT_LIST - + " shouldn't be null", ra); - assertEquals("portname list incorrect", - "HelloPortComponent,HelloPortComponent2", ra.getContent()); - } - - private Reference createServiceReference(String standard, String specific) - throws Exception { - // Get a ServiceRef for the test - ServiceRefDesc sr = createServiceRefDesc(standard, specific); - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - return jfactory.getServiceReference(sr, cl); - } - - public void testGetObjectInstance() throws Exception { - String cfg = "" - + "" - + "" - + "" - + "" - + ""; - Reference ref = new Reference( - "org.objectweb.jonas.jtests.hello.HelloWsServiceLocator", - jfactory.getClass().getName(), null); - ref.add(new StringRefAddr(JAxisServiceFactory.REF_CLIENT_CONFIG, cfg)); - try { - jfactory.getObjectInstance(ref, null, null, null); - } catch (Exception e) { - fail("JAxisServiceFactory.getObjectInstance has failed " + e); - } - // cannot success when using Proxies - } - - private ServiceRefDesc createServiceRefDesc(String srFilename, - String jsrFilename) throws Exception { - // Get Context ClassLoader - ClassLoader cl = Thread.currentThread().getContextClassLoader(); - ServiceRefTLE srTopLevel = new ServiceRefTLE(); - // Load ServiceRef Object - //----------------------------- - // Create Digester - JDigester serviceRefDigester = new JDigester(new ServiceRefRuleSet(""), - false, true, null, null); - // Get Reader - Reader r = new InputStreamReader(cl.getResourceAsStream(srFilename)); - // Parse - serviceRefDigester.parse(r, srFilename, srTopLevel); - // Load JonasServiceRef Object - //----------------------------- - // Create Digester - JDigester jonasServiceRefDigester = new JDigester( - new JonasServiceRefRuleSet(""), false, true, null, null); - - // Read xml file and modify path containing RESOURCES_DIR - InputStream contentIs = cl.getResourceAsStream(jsrFilename); - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(contentIs)); - StringWriter stringWriter = new StringWriter(); - String line = null; - while (((line = bufferedReader.readLine()) != null)) { - if (line.indexOf("@@RESOURCES_DIR@@") != -1) { - line = line.replaceAll("@@RESOURCES_DIR@@", "file://" + resources); - } - stringWriter.write(line); - } - - - - // Get Reader - r = new StringReader(stringWriter.toString()); - bufferedReader.close(); - stringWriter.close(); - // Parse - jonasServiceRefDigester.parse(r, jsrFilename, srTopLevel); - ServiceRefDesc sr = new ServiceRefDesc(cl, srTopLevel.getServiceRef(), - srTopLevel.getJonasServiceRef(), resources); - - return sr; - } - - public static void main(String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_AxisService(testtorun)); - } - } -} diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/service/ServiceRefTLE.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/service/ServiceRefTLE.java deleted file mode 100644 index 400f4b755effae178fc3a355b877b2a6006ca939..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/service/ServiceRefTLE.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.objectweb.jonas.jtests.clients.service; - -import org.ow2.jonas.deployment.common.xml.TopLevelElement; -import org.ow2.jonas.deployment.common.xml.ServiceRef; -import org.ow2.jonas.deployment.common.xml.JonasServiceRef; - -public class ServiceRefTLE implements TopLevelElement { - - private ServiceRef sr = null; - private JonasServiceRef jsr = null; - - public void addServiceRef(ServiceRef sr) { - this.sr = sr; - } - - public void addJonasServiceRef(JonasServiceRef jsr) { - this.jsr = jsr; - } - - public ServiceRef getServiceRef() { - return sr; - } - - public JonasServiceRef getJonasServiceRef() { - return jsr; - } - -} diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/wsgen/A_WsGen.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/wsgen/A_WsGen.java deleted file mode 100644 index 35937ae83826513a5388f2d0e4108992df6c01c8..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/wsgen/A_WsGen.java +++ /dev/null @@ -1,123 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.wsgen; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Enumeration; -import java.util.jar.JarFile; -import java.util.zip.ZipEntry; - -import org.objectweb.jonas.jtests.util.JWebServicesTestCase; - -public abstract class A_WsGen extends JWebServicesTestCase { - private String jonasbase = null; - private String resources = null; - private String basedir = null; - - public A_WsGen(String name) { - super(name); - } - - public void setUp() throws Exception { - super.setUp(); - - jonasbase = System.getProperty("jonas.base.client"); - resources = System.getProperty("ws.resources"); - basedir = System.getProperty("basedir"); - - } - - public void tearDown() throws Exception { - super.tearDown(); - } - - protected String getJonasBaseFile(String path) { - return jonasbase + File.separator + path; - } - - protected String getResourceFile(String path) { - return resources + File.separator + path; - } - - protected String getTestFile(String path) { - return basedir + File.separator + path; - } - - protected static boolean deleteDirectory(String dir) throws IOException { - File file = new File(dir); - boolean isDestroy = true; - if (file.isDirectory()) { - // destroy all childs - File[] childs = file.listFiles(); - for (int i = 0; i < childs.length; i++) { - isDestroy &= deleteDirectory(childs[i].getAbsolutePath()); - } - } - return isDestroy && file.delete(); - - } - - protected static String unpackJar(JarFile file) throws IOException { - String tmp = createTempDir(); - - for (Enumeration e = file.entries(); e.hasMoreElements();) { - ZipEntry ze = (ZipEntry) e.nextElement(); - - // If is not a directory - if (!ze.getName().endsWith("/")) { - String newFilename = tmp + File.separator + ze.getName(); - File entryFile = new File(newFilename); - - entryFile.getParentFile().mkdirs(); - FileOutputStream fos = new FileOutputStream(entryFile); - InputStream is = file.getInputStream(ze); - - int n = 0; - byte[] buffer = new byte[1024]; - - while ((n = is.read(buffer)) > 0) { - fos.write(buffer, 0, n); - } - - fos.close(); - is.close(); - } - } - - return tmp; - } - - protected static String createTempDir() throws IOException { - File tmpDir = File.createTempFile("wsgen-tests", null, null); - tmpDir.delete(); - tmpDir.mkdir(); - return tmpDir.getAbsolutePath(); - } - -} diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/wsgen/F_WsGen.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/wsgen/F_WsGen.java deleted file mode 100644 index 31bb364f1792e55bdbfa42eed83c84cea8fa8bcf..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/clients/wsgen/F_WsGen.java +++ /dev/null @@ -1,177 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.clients.wsgen; - -import java.io.File; -import java.util.Enumeration; -import java.util.jar.JarFile; -import java.util.zip.ZipEntry; - -import junit.framework.Test; -import junit.framework.TestSuite; - - -/** - * test case for WsGen - */ -public class F_WsGen extends A_WsGen { - - public F_WsGen(String name) { - super(name); - } - - public static Test suite() { - return new TestSuite(F_WsGen.class); - } - - public void setUp() throws Exception { - super.setUp(); - } - - public void tearDown() throws Exception { - super.tearDown(); - } - - /* - * Tests : - * - webapps (endpoint, clients, both, none) (various Schemas, DTD) - * - ejbjars (endpoint, clients, both, none) (various Schemas, DTD) - * - apps (combine above examples) + () - */ - - public void testWebappEndpointAlone() throws Exception { - - // Check entries in JarFile - String [] entries = new String[] { "META-INF/MANIFEST.MF", - "WEB-INF/wsdl/AddressBookPort.wsdl", - "WEB-INF/wsdl/AddressBook.xsd", - "WEB-INF/web.xml", - "WEB-INF/webservices.xml", - "WEB-INF/jonas-webservices.xml", - "WEB-INF/mapping.xml", - "WEB-INF/classes/org/objectweb/jonas/jtests/servlets/endpoint/Address.class", - "WEB-INF/classes/org/objectweb/jonas/jtests/servlets/endpoint/AddressBook.class", - "WEB-INF/classes/org/objectweb/jonas/jtests/servlets/endpoint/AddressBookImpl.class", - "WEB-INF/classes/org/objectweb/jonas/jtests/servlets/endpoint/AddressBookException.class"}; - - JarFile alone = new JarFile(getJonasBaseFile("webapps" + File.separator + "webendpoint.war")); - - checkEntries(entries, alone); - - assertEquals("entries number doesn't match", entries.length, countEntries(alone)); - - } - - public void testWsClientEjb() throws Exception { - - // Check entries in JarFile - String path = "org/objectweb/jonas/jtests/beans/wsclient/"; - String [] entries = new String[] { "META-INF/MANIFEST.MF", - "META-INF/jonas-ejb-jar.xml", - "META-INF/ejb-jar.xml", - "META-INF/wsdl/query.wsdl"}; - - JarFile wsclient = new JarFile(getJonasBaseFile("ejbjars" + File.separator + "wsclient.jar")); - - checkEntries(entries, wsclient); - - } - - public void testTimeEndpoint() throws Exception { - // Check entries in JarFile (Wrapping Application) - String [] entries = new String[] { "META-INF/application.xml", - "META-INF/MANIFEST.MF", - "time.war", - "time.jar", - "time-client.jar"}; - - JarFile time = new JarFile(getJonasBaseFile("apps" + File.separator + "time-test.ear")); - - checkEntries(entries, time); - - assertEquals("entries number doesn't match", 5, countEntries(time)); - - // Check entries in JarFile (Wrapped WebApp) - String tmp = unpackJar(time); - - // Check war correctly created - JarFile web = new JarFile(tmp + File.separator - + "time.war"); - String [] webEntries = new String[] { "META-INF/MANIFEST.MF", - "WEB-INF/web.xml", - "WEB-INF/web-jetty.xml", - "META-INF/context.xml", - "WEB-INF/sources/deploy-server-0.wsdd", - "WEB-INF/deploy-server-0.wsdd"}; - - // TODO should improve entries check : deploy-server-0 may be deploy-server-25 !! - //checkEntries(webEntries, web); - assertEquals("web entries number doesn't match", webEntries.length, countEntries(web)); - - deleteDirectory(tmp); - - } - - public void checkEntries(String [] entries, JarFile file) { - - for (int i = 0; i < entries.length; i++) { - ZipEntry ze = file.getEntry(entries[i]); - assertNotNull("missing entry '" + entries[i] + "' in '" + file.getName() + "'", ze); - } - } - - public int countEntries(JarFile file) { - Enumeration e = file.entries(); - int count = 0; - while (e.hasMoreElements()) { - ZipEntry ze = (ZipEntry) e.nextElement(); - // not a directory - if (!ze.getName().endsWith("/")) { - count++; - } - - } - return count; - } - - - public static void main (String args[]) { - String testtorun = null; - // Get args - for (int argn = 0; argn < args.length; argn++) { - String s_arg = args[argn]; - if (s_arg.equals("-n")) { - testtorun = args[++argn]; - } - } - if (testtorun == null) { - junit.textui.TestRunner.run(suite()); - } else { - junit.textui.TestRunner.run(new F_WsGen(testtorun)); - } - } - -} diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/hello/HelloWsServiceLocator.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/hello/HelloWsServiceLocator.java deleted file mode 100644 index 93a4a2236f04ab7b00b072cc2acd601aeac62436..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/hello/HelloWsServiceLocator.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * HelloWsServiceLocator.java - * - * This file was auto-generated from WSDL - * by the Apache Axis WSDL2Java emitter. - */ - -package org.objectweb.jonas.jtests.hello; - -import javax.xml.namespace.QName; - -public class HelloWsServiceLocator extends org.ow2.jonas.ws.axis.JService implements org.objectweb.jonas.jtests.hello.HelloWsService { - - public HelloWsServiceLocator(String name, QName qname) { - - } - - // Use to get a proxy class for HelloPortComponent - private final java.lang.String HelloPortComponent_address = "http://dummy_location/HelloPortComponent"; - - public java.lang.String getHelloPortComponentAddress() { - return HelloPortComponent_address; - } - - // The WSDD service name defaults to the port name. - private java.lang.String HelloPortComponentWSDDServiceName = "HelloPortComponent"; - - public java.lang.String getHelloPortComponentWSDDServiceName() { - return HelloPortComponentWSDDServiceName; - } - - public void setHelloPortComponentWSDDServiceName(java.lang.String name) { - HelloPortComponentWSDDServiceName = name; - } - - public org.objectweb.jonas.jtests.hello.HelloWs getHelloPortComponent() throws javax.xml.rpc.ServiceException { - java.net.URL endpoint; - try { - endpoint = new java.net.URL(HelloPortComponent_address); - } - catch (java.net.MalformedURLException e) { - throw new javax.xml.rpc.ServiceException(e); - } - return getHelloPortComponent(endpoint); - } - - public org.objectweb.jonas.jtests.hello.HelloWs getHelloPortComponent(java.net.URL portAddress) throws javax.xml.rpc.ServiceException { - try { - org.objectweb.jonas.jtests.hello.HelloPortComponentSoapBindingStub _stub = new org.objectweb.jonas.jtests.hello.HelloPortComponentSoapBindingStub(portAddress, this); - _stub.setPortName(getHelloPortComponentWSDDServiceName()); - return _stub; - } - catch (org.apache.axis.AxisFault e) { - return null; - } - } - - /** - * For the given interface, get the stub implementation. - * If this service has no port for the given interface, - * then ServiceException is thrown. - */ - public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { - try { - if (org.objectweb.jonas.jtests.hello.HelloWs.class.isAssignableFrom(serviceEndpointInterface)) { - org.objectweb.jonas.jtests.hello.HelloPortComponentSoapBindingStub _stub = new org.objectweb.jonas.jtests.hello.HelloPortComponentSoapBindingStub(new java.net.URL(HelloPortComponent_address), this); - _stub.setPortName(getHelloPortComponentWSDDServiceName()); - return _stub; - } - } - catch (java.lang.Throwable t) { - throw new javax.xml.rpc.ServiceException(t); - } - throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName())); - } - - /** - * For the given interface, get the stub implementation. - * If this service has no port for the given interface, - * then ServiceException is thrown. - */ - public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { - if (portName == null) { - return getPort(serviceEndpointInterface); - } - String inputPortName = portName.getLocalPart(); - if ("HelloPortComponent".equals(inputPortName)) { - return getHelloPortComponent(); - } - else { - java.rmi.Remote _stub = getPort(serviceEndpointInterface); - ((org.apache.axis.client.Stub) _stub).setPortName(portName); - return _stub; - } - } - - public javax.xml.namespace.QName getServiceName() { - return new javax.xml.namespace.QName("http://hello.simple", "HelloWsService"); - } - - private java.util.HashSet ports = null; - - public java.util.Iterator getPorts() { - if (ports == null) { - ports = new java.util.HashSet(); - ports.add(new javax.xml.namespace.QName("HelloPortComponent")); - } - return ports.iterator(); - } - -} diff --git a/jonas_tests/ws/src/org/objectweb/jonas/jtests/util/JWebServicesTestCase.java b/jonas_tests/ws/src/org/objectweb/jonas/jtests/util/JWebServicesTestCase.java deleted file mode 100644 index c9d203c1a2ead46c0556b04019b197a78bf680e5..0000000000000000000000000000000000000000 --- a/jonas_tests/ws/src/org/objectweb/jonas/jtests/util/JWebServicesTestCase.java +++ /dev/null @@ -1,454 +0,0 @@ -/** - * JOnAS: Java(TM) Open Application Server - * Copyright (C) 1999 Bull S.A. - * Contact: jonas-team@objectweb.org - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or 1any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - * - * Initial developer: Florent BENOIT - * -------------------------------------------------------------------------- - * $Id$ - * -------------------------------------------------------------------------- - */ - -package org.objectweb.jonas.jtests.util; - -import java.io.File; -import java.io.IOException; -import java.util.Set; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXConnectorFactory; -import javax.management.remote.JMXServiceURL; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.rmi.PortableRemoteObject; - -import junit.framework.TestCase; - -import com.meterware.httpunit.WebConversation; - -/** - * Define a class to add useful methods for test the webservices - * - Deploy ear, war and beans - * - Retrieve initial context - * @author Florent Benoit - */ -public class JWebServicesTestCase extends TestCase { - - /** - * Name of the JOnAS server used for tests - */ - private static String jonasName = "jonas"; - - /* - * JONAS_BASE - */ - protected static String jb = null; - - /** - * Initial context used for lookup - */ - protected static Context ictx = null; - - /** - * Connection to the MBeanServer - */ - private static MBeanServerConnection cnx = null; - - /** - * Conversation used for HttpUnit - */ - protected WebConversation wc = null; - - /** - * URL used for the constructor - */ - protected String url = null; - - /** - * Prefix for build URLs - */ - private String prefixUrl = null; - - /** - * Add to the specified url the prefix - * @param url relative URL - * @return absolute path of URL - */ - protected String getAbsoluteUrl (String url) { - return (this.prefixUrl + url); - } - - - /** - * Make an absolute path with the filename. - */ - public String absPath(String name, String extension) { - - String ret = ""; - if ( extension.equals(".jar")) { - ret = jb + "/ejbjars/" + name + ".jar"; - } else if ( extension.equals(".war")) { - ret = jb + "/webapps/" + name + ".war"; - } else if (extension.equals(".ear")) { - ret = jb + "/apps/" + name + ".ear"; - } - return ret; - } - private static JMXServiceURL jmxServerUrl = null; - private static String urlSuffix = "service:jmx:"; - private static String registry = null; - private static String defaultRegistry = "rmi://localhost:1099"; - private static String protocol = null; - private static String defaultProtocol = "jrmp"; - - /* - * Get Connection to the MBean server - * Set the static cnx variable - */ - private void getJmxCnx() { - if (cnx == null) { - try { - if (registry == null) { - registry = defaultRegistry; - } - registry = registry + "/"; - int indx = registry.lastIndexOf(":"); - String st = registry.substring(0, indx); - String serverUrl = urlSuffix + st +"/jndi/"+registry; - if (protocol == null) { - protocol = defaultProtocol; - } - String connectorName = protocol.concat("connector_"); - connectorName = connectorName.concat(jonasName); - serverUrl = serverUrl.concat(connectorName); - jmxServerUrl = new JMXServiceURL(serverUrl); - JMXConnector cntor = JMXConnectorFactory.connect(jmxServerUrl, null); - cnx = cntor.getMBeanServerConnection(null); - System.out.println("server reached via: "+serverUrl); - } catch (IOException e) { - System.err.println("Can't reach server " + jonasName - + " as couldn't create JMXConnector (" + e.getMessage() - + ")"); - System.err.println("Check name, registry and protocol options."); - System.exit(2); - } - } - } - - /* - * ObjectName of y=the J2eeServerMBean - */ - private static ObjectName j2eeserver = null; - - /* - * Get the ObjectName of the J2eeServerMBean - * @return the ObjectName - */ - private ObjectName getJ2eeServer() { - if (j2eeserver == null) { - try { - ObjectName on = ObjectName.getInstance("*:j2eeType=J2EEServer,name=" + jonasName); - Set j2eeservers = cnx.queryNames(on, null); - if (j2eeservers.isEmpty()) { - System.err.println("Can't admin server " + jonasName + ": didn't found J2EEServer MBean"); - System.exit(2); - } - j2eeserver = (ObjectName) j2eeservers.iterator().next(); - } catch (Exception e) { - System.err.println("Can't invoke mbeanServer: " + e); - } - } - return j2eeserver; - } - - /** - * Initialize the port used by tests and the prefix - */ - private void init() { - String port = System.getProperty("http.port"); - if (port == null) { - port = "9000"; - } - - prefixUrl = "http://localhost:" + port; - } - - /** - * Constructor with a specified name - * @param s the name - */ - public JWebServicesTestCase(String s) { - super(s); - init(); - } - /** - * Constructor with a specified name and url - * @param s the name - * @param url the url which can be used - */ - public JWebServicesTestCase(String s, String url) { - super(s); - wc = new WebConversation(); - init(); - this.url = getAbsoluteUrl(url); - } - - /** - * Get initialContext - * @return the initialContext - * @throws NamingException if the initial context can't be retrieved - */ - private Context getInitialContext() throws NamingException { - return new InitialContext(); - } - - /** - * Common setUp routine, used for every test. - * @throws Exception if an error occurs - */ - - protected void setUp() throws Exception { - try { - // get InitialContext - if (ictx == null) { - ictx = getInitialContext(); - } - jb = System.getProperty("jonas.base"); - registry = System.getProperty("registry"); - protocol = System.getProperty("protocol"); - getJmxCnx(); - - } catch (NamingException e) { - System.err.println("Cannot setup test: " + e); - e.printStackTrace(); - } - } - - - /** - * Load an ear file in the jonas server - * @param filename ear file, without ".ear" extension - * @throws Exception if an error occurs - */ - public void useEar(String fname) throws Exception { - String filename = absPath(fname, ".ear"); - try { - // Load ear in JOnAS if not already loaded. - if (!isEarLoaded(filename)) { - loadEar(filename); - } - - } catch (Exception e) { - throw new Exception("Cannot load Ear : " + e.getMessage()); - } - - } - - /** - * Load a war file in the jonas server - * @param filename war file, without ".war" extension - * @throws Exception if an error occurs - */ - - public void useWar(String fname) throws Exception { - String filename = absPath(fname, ".war"); - try { - // Load war in JOnAS if not already loaded. - if (!isWarLoaded(filename)) { - loadWar(filename); - } - } catch (Exception e) { - throw new Exception("Cannot load War : " + e.getMessage()); - } - } - - - - /** - * Load a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void useBeans(String fname) throws Exception { - try { - String filename = absPath(fname, ".jar"); - // Load bean in EJBServer if not already loaded. - if (!isJarLoaded(filename)) { - addBeans(filename); - } - } catch (Exception e) { - throw new Exception("Cannot load Bean : " + e.getMessage()); - } - } - - - - /** - * Unload a bean jar file in the jonas server - * @param filename jar file, without ".jar" extension - * @throws Exception if an error occurs - */ - public void unUseBeans(String filename) throws Exception { - try { - - if (isJarLoaded(filename + ".jar")) { - unloadBeans(filename + ".jar"); - } - } catch (Exception e) { - throw new Exception("Cannot unload Bean : " + e.getMessage()); - } - } - - - - /* - * isLoaded remote operation - */ - private boolean isLoaded(String filename) { - boolean ret = false; - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - Boolean r = (Boolean) cnx.invoke(getJ2eeServer(), "isDeployed", params, signature); - ret = r.booleanValue(); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - return ret; - } - - /** - * isJarLoaded remote operation - * @param filename jar file, with ".jar" extension - */ - private boolean isJarLoaded(String filename) { - boolean ret = false; - try { - return isLoaded(filename); - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - - return ret; - } - public void addBeans(String filename) { - - try { - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - - /** - * loadEar remote operation - * @param filename war file, with ".war" extension - */ - public void loadWar(String filename) { - try { - - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - - /** - * isWarLoaded remote operation - * @param filename war file, with ".war" extension - */ - private boolean isWarLoaded(String filename) { - boolean ret = false; - try { - return isLoaded(filename); - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - - return ret; - } - /** - * isEarLoaded remote operation - * @param filename ear file, with ".ear" extension - */ - private boolean isEarLoaded(String filename) { - boolean ret = false; - try { - return isLoaded(filename); - - } catch (Exception e) { - System.err.println("Cannot test bean: " + e); - } - - return ret; - } - /** - * loadEar remote operation - * @param filename ear file, with ".ear" extension - */ - public void loadEar(String filename) { - try { - - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "deploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot deploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot load bean: " + e); - } - } - /** - * unloadBean remote operation - * @param filename jar file, with ".jar" extension - */ - public void unloadBeans(String filename) { - try { - String[] params = {filename}; - String[] signature = {"java.lang.String"}; - try { - cnx.invoke(getJ2eeServer(), "undeploy", params, signature); - } catch (Exception e) { - System.err.println("Cannot undeploy " + filename + ": " + e); - } - - } catch (Exception e) { - System.err.println("Cannot unload bean: " + e); - } - } -} diff --git a/jonas/modules/apis/jonas-deployment-api/pom.xml b/modules/apis/jonas-deployment-api/pom.xml similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/pom.xml rename to modules/apis/jonas-deployment-api/pom.xml diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/DTDs.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/DTDs.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/DTDs.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/DTDs.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IDeploymentDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IDeploymentDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IDeploymentDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IDeploymentDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IDescriptionGroupDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IDescriptionGroupDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IDescriptionGroupDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IDescriptionGroupDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEJBLocalRefDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEJBLocalRefDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEJBLocalRefDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEJBLocalRefDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEJBRefDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEJBRefDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEJBRefDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEJBRefDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEnvEntryDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEnvEntryDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEnvEntryDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IEnvEntryDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IJNDIEnvRefsGroupDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IJNDIEnvRefsGroupDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IJNDIEnvRefsGroupDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IJNDIEnvRefsGroupDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IMessageDestinationRefDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IMessageDestinationRefDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IMessageDestinationRefDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IMessageDestinationRefDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IPersistenceUnitRefDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IPersistenceUnitRefDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IPersistenceUnitRefDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IPersistenceUnitRefDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IResourceEnvRefDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IResourceEnvRefDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IResourceEnvRefDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IResourceEnvRefDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IResourceRefDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IResourceRefDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IResourceRefDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IResourceRefDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IServiceRefDesc.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IServiceRefDesc.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IServiceRefDesc.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/IServiceRefDesc.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/Schemas.java b/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/Schemas.java similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/Schemas.java rename to modules/apis/jonas-deployment-api/src/main/java/org/ow2/jonas/deployment/api/Schemas.java diff --git a/jonas/modules/apis/jonas-deployment-api/src/main/resources/META-INF/jonas-deployment-api.bnd b/modules/apis/jonas-deployment-api/src/main/resources/META-INF/jonas-deployment-api.bnd similarity index 100% rename from jonas/modules/apis/jonas-deployment-api/src/main/resources/META-INF/jonas-deployment-api.bnd rename to modules/apis/jonas-deployment-api/src/main/resources/META-INF/jonas-deployment-api.bnd diff --git a/jonas/modules/apis/jonas-management-api/pom.xml b/modules/apis/jonas-management-api/pom.xml similarity index 100% rename from jonas/modules/apis/jonas-management-api/pom.xml rename to modules/apis/jonas-management-api/pom.xml diff --git a/jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/IBaseManagement.java b/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/IBaseManagement.java similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/IBaseManagement.java rename to modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/IBaseManagement.java diff --git a/jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/J2EEMBeanAttributeInfo.java b/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/J2EEMBeanAttributeInfo.java similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/J2EEMBeanAttributeInfo.java rename to modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/J2EEMBeanAttributeInfo.java diff --git a/jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/ManagementException.java b/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/ManagementException.java similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/ManagementException.java rename to modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/base/api/ManagementException.java diff --git a/jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/cluster/api/ICluster.java b/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/cluster/api/ICluster.java similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/cluster/api/ICluster.java rename to modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/cluster/api/ICluster.java diff --git a/jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/clusterdaemon/api/IClusterdaemon.java b/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/clusterdaemon/api/IClusterdaemon.java similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/clusterdaemon/api/IClusterdaemon.java rename to modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/clusterdaemon/api/IClusterdaemon.java diff --git a/jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/container/api/IContainerManagement.java b/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/container/api/IContainerManagement.java similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/container/api/IContainerManagement.java rename to modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/container/api/IContainerManagement.java diff --git a/jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/domain/api/IDomain.java b/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/domain/api/IDomain.java similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/domain/api/IDomain.java rename to modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/domain/api/IDomain.java diff --git a/jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/server/api/IServer.java b/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/server/api/IServer.java similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/server/api/IServer.java rename to modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/server/api/IServer.java diff --git a/jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/server/api/IServerManagement.java b/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/server/api/IServerManagement.java similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/server/api/IServerManagement.java rename to modules/apis/jonas-management-api/src/main/java/org/ow2/jonas/management/extensions/server/api/IServerManagement.java diff --git a/jonas/modules/apis/jonas-management-api/src/main/resources/META-INF/jonas-management-api.bnd b/modules/apis/jonas-management-api/src/main/resources/META-INF/jonas-management-api.bnd similarity index 100% rename from jonas/modules/apis/jonas-management-api/src/main/resources/META-INF/jonas-management-api.bnd rename to modules/apis/jonas-management-api/src/main/resources/META-INF/jonas-management-api.bnd diff --git a/jonas/modules/apis/jonas-services-api/pom.xml b/modules/apis/jonas-services-api/pom.xml similarity index 100% rename from jonas/modules/apis/jonas-services-api/pom.xml rename to modules/apis/jonas-services-api/pom.xml diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/config/IAddonConfig.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/config/IAddonConfig.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/config/IAddonConfig.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/config/IAddonConfig.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployable/IAddonDeployable.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployable/IAddonDeployable.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployable/IAddonDeployable.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployable/IAddonDeployable.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployable/ISortableDeployable.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployable/ISortableDeployable.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployable/ISortableDeployable.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployable/ISortableDeployable.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployer/IAddonDeployer.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployer/IAddonDeployer.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployer/IAddonDeployer.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployer/IAddonDeployer.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployer/IAddonDeployerLog.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployer/IAddonDeployerLog.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployer/IAddonDeployerLog.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/deployer/IAddonDeployerLog.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/util/IAddonLogEntry.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/util/IAddonLogEntry.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/util/IAddonLogEntry.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/util/IAddonLogEntry.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/util/IAddonStructure.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/util/IAddonStructure.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/util/IAddonStructure.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/addon/deploy/api/util/IAddonStructure.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/adm/AdmException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/adm/AdmException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/adm/AdmException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/adm/AdmException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/adm/AdmInterface.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/adm/AdmInterface.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/adm/AdmInterface.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/adm/AdmInterface.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/audit/AuditService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/audit/AuditService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/audit/AuditService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/audit/AuditService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/cmi/CmiService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/cmi/CmiService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/cmi/CmiService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/cmi/CmiService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/configuration/ConfigurationManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/configuration/ConfigurationManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/configuration/ConfigurationManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/configuration/ConfigurationManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/configuration/DeploymentPlanDeployer.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/configuration/DeploymentPlanDeployer.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/configuration/DeploymentPlanDeployer.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/configuration/DeploymentPlanDeployer.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/datasource/DataSourceService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/datasource/DataSourceService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/datasource/DataSourceService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/datasource/DataSourceService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/db/DBService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/db/DBService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/db/DBService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/db/DBService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/dbm/DataBaseService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/dbm/DataBaseService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/dbm/DataBaseService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/dbm/DataBaseService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/depmonitor/MonitoringService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/depmonitor/MonitoringService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/depmonitor/MonitoringService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/depmonitor/MonitoringService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryEvent.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryEvent.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryEvent.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryEvent.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryState.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryState.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryState.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/discovery/DiscoveryState.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ear/EarService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ear/EarService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ear/EarService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ear/EarService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ear/EarServiceException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ear/EarServiceException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ear/EarServiceException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ear/EarServiceException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/EJBService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/EJBService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/EJBService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/EJBService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/JTimerHandleInfo.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/JTimerHandleInfo.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/JTimerHandleInfo.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/JTimerHandleInfo.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/TimerHandleDelegate.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/TimerHandleDelegate.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/TimerHandleDelegate.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb2/TimerHandleDelegate.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb3/IEasyBeansService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb3/IEasyBeansService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb3/IEasyBeansService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ejb3/IEasyBeansService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ha/HaService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ha/HaService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ha/HaService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ha/HaService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsAdministration.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsAdministration.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsAdministration.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsAdministration.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jms/JmsService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/Interceptor.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/Interceptor.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/Interceptor.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/Interceptor.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/JManagementIdentifier.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/JManagementIdentifier.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/JManagementIdentifier.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/JManagementIdentifier.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/JmxService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/JmxService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/JmxService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jmx/JmxService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceChecker.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceChecker.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceChecker.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceChecker.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceCheckerInfo.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceCheckerInfo.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceCheckerInfo.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceCheckerInfo.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceCheckerManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceCheckerManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceCheckerManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/IResourceCheckerManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/ResourceCheckpoints.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/ResourceCheckpoints.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/ResourceCheckpoints.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jndi/checker/api/ResourceCheckpoints.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jsf/JSFService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jsf/JSFService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jsf/JSFService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/jsf/JSFService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/MailService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/MailService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/MailService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/MailService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/MailServiceException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/MailServiceException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/MailServiceException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/MailServiceException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/factory/JavaMail.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/factory/JavaMail.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/factory/JavaMail.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/mail/factory/JavaMail.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/DeployableState.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/DeployableState.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/DeployableState.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/DeployableState.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/J2EEServerService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/J2EEServerService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/J2EEServerService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/J2EEServerService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/ServiceManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/ServiceManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/ServiceManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/management/ServiceManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/multitenant/MultitenantService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/multitenant/MultitenantService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/multitenant/MultitenantService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/multitenant/MultitenantService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JComponentContextFactory.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JComponentContextFactory.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JComponentContextFactory.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JComponentContextFactory.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JComponentContextFactoryDelegate.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JComponentContextFactoryDelegate.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JComponentContextFactoryDelegate.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JComponentContextFactoryDelegate.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JNamingManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JNamingManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JNamingManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/naming/JNamingManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/packaging/IPackagingManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/packaging/IPackagingManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/packaging/IPackagingManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/packaging/IPackagingManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/packaging/IPackagingStructure.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/packaging/IPackagingStructure.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/packaging/IPackagingStructure.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/packaging/IPackagingStructure.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/properties/ServerProperties.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/properties/ServerProperties.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/properties/ServerProperties.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/properties/ServerProperties.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/properties/ServiceProperties.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/properties/ServiceProperties.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/properties/ServiceProperties.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/properties/ServiceProperties.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/registry/RegistryService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/registry/RegistryService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/registry/RegistryService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/registry/RegistryService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/Rar.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/Rar.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/Rar.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/Rar.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/ResourceService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/ResourceService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/ResourceService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/ResourceService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/ResourceServiceException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/ResourceServiceException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/ResourceServiceException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resource/ResourceServiceException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resourcemonitor/ResourceMonitorService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resourcemonitor/ResourceMonitorService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resourcemonitor/ResourceMonitorService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/resourcemonitor/ResourceMonitorService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/SecurityService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/SecurityService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/SecurityService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/SecurityService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/factory/JResource.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/factory/JResource.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/factory/JResource.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/factory/JResource.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/factory/JResourceException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/factory/JResourceException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/factory/JResourceException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/factory/JResourceException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/lib/HashPassword.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/lib/HashPassword.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/lib/HashPassword.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/lib/HashPassword.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/principal/JUser.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/principal/JUser.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/principal/JUser.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/security/realm/principal/JUser.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/ConfigService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/ConfigService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/ConfigService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/ConfigService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/JonasAlreadyStartedException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/JonasAlreadyStartedException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/JonasAlreadyStartedException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/JonasAlreadyStartedException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/Service.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/Service.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/Service.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/Service.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/ServiceException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/ServiceException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/ServiceException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/service/ServiceException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/smartclient/SmartclientService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/smartclient/SmartclientService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/smartclient/SmartclientService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/smartclient/SmartclientService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/smartclient/SmartclientServiceBase.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/smartclient/SmartclientServiceBase.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/smartclient/SmartclientServiceBase.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/smartclient/SmartclientServiceBase.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/Enlistable.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/Enlistable.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/Enlistable.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/Enlistable.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TransactionManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TransactionManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TransactionManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TransactionManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TransactionService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TransactionService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TransactionService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TransactionService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TxResourceManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TxResourceManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TxResourceManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/tm/TxResourceManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VersioningService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VersioningService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VersioningService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VersioningService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VersioningServiceBase.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VersioningServiceBase.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VersioningServiceBase.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VersioningServiceBase.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VirtualContextJMXInterface.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VirtualContextJMXInterface.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VirtualContextJMXInterface.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/versioning/VirtualContextJMXInterface.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/IOnDemandHttpService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/IOnDemandHttpService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/IOnDemandHttpService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/IOnDemandHttpService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/JWebContainerService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/JWebContainerService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/JWebContainerService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/JWebContainerService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/JWebContainerServiceException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/JWebContainerServiceException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/JWebContainerServiceException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/web/JWebContainerServiceException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/CleanTask.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/CleanTask.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/CleanTask.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/CleanTask.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/DeployerLogException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/DeployerLogException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/DeployerLogException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/DeployerLogException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/IDeployerLog.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/IDeployerLog.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/IDeployerLog.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/IDeployerLog.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/LogEntry.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/LogEntry.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/LogEntry.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/LogEntry.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/WorkCleanerException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/WorkCleanerException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/WorkCleanerException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/WorkCleanerException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/WorkCleanerService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/WorkCleanerService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/WorkCleanerService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workcleaner/WorkCleanerService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workmanager/WorkManagerService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workmanager/WorkManagerService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workmanager/WorkManagerService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/workmanager/WorkManagerService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxrpc/IJAXRPCService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxrpc/IJAXRPCService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxrpc/IJAXRPCService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxrpc/IJAXRPCService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxrpc/WSException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxrpc/WSException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxrpc/WSException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxrpc/WSException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/EndpointType.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/EndpointType.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/EndpointType.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/EndpointType.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IJAXWSService.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IJAXWSService.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IJAXWSService.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IJAXWSService.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWSRequest.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWSRequest.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWSRequest.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWSRequest.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWSResponse.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWSResponse.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWSResponse.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWSResponse.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebServiceDeploymentManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebServiceDeploymentManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebServiceDeploymentManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebServiceDeploymentManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebServiceEndpoint.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebServiceEndpoint.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebServiceEndpoint.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebServiceEndpoint.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebservicesContainer.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebservicesContainer.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebservicesContainer.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebservicesContainer.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebservicesModule.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebservicesModule.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebservicesModule.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/IWebservicesModule.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/PortIdentifier.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/PortIdentifier.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/PortIdentifier.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/PortIdentifier.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/PortMetaData.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/PortMetaData.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/PortMetaData.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/PortMetaData.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/WSException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/WSException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/WSException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/WSException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/IEJBWebserviceEndpoint.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/IEJBWebserviceEndpoint.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/IEJBWebserviceEndpoint.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/IEJBWebserviceEndpoint.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/ISecurityConstraint.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/ISecurityConstraint.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/ISecurityConstraint.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/ISecurityConstraint.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/IWebDeployer.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/IWebDeployer.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/IWebDeployer.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/IWebDeployer.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/ContextNamingStrategyException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/ContextNamingStrategyException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/ContextNamingStrategyException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/ContextNamingStrategyException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/IContextNamingInfo.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/IContextNamingInfo.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/IContextNamingInfo.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/IContextNamingInfo.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/IContextNamingStrategy.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/IContextNamingStrategy.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/IContextNamingStrategy.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/jaxws/ejb/context/IContextNamingStrategy.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/AbsWSDLPublisher.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/AbsWSDLPublisher.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/AbsWSDLPublisher.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/AbsWSDLPublisher.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/PublicationInfo.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/PublicationInfo.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/PublicationInfo.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/PublicationInfo.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/PublishableDefinition.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/PublishableDefinition.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/PublishableDefinition.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/PublishableDefinition.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisher.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisher.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisher.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisher.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisherException.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisherException.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisherException.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisherException.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisherManager.java b/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisherManager.java similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisherManager.java rename to modules/apis/jonas-services-api/src/main/java/org/ow2/jonas/ws/publish/WSDLPublisherManager.java diff --git a/jonas/modules/apis/jonas-services-api/src/main/resources/META-INF/jonas-services-api.bnd b/modules/apis/jonas-services-api/src/main/resources/META-INF/jonas-services-api.bnd similarity index 100% rename from jonas/modules/apis/jonas-services-api/src/main/resources/META-INF/jonas-services-api.bnd rename to modules/apis/jonas-services-api/src/main/resources/META-INF/jonas-services-api.bnd diff --git a/jonas/modules/apis/pom.xml b/modules/apis/pom.xml similarity index 100% rename from jonas/modules/apis/pom.xml rename to modules/apis/pom.xml diff --git a/jonas/modules/client-bootstrap/pom.xml b/modules/client-bootstrap/pom.xml similarity index 100% rename from jonas/modules/client-bootstrap/pom.xml rename to modules/client-bootstrap/pom.xml diff --git a/jonas/modules/client-bootstrap/src/main/java/org/ow2/jonas/client/boot/Bootstrap.java b/modules/client-bootstrap/src/main/java/org/ow2/jonas/client/boot/Bootstrap.java similarity index 100% rename from jonas/modules/client-bootstrap/src/main/java/org/ow2/jonas/client/boot/Bootstrap.java rename to modules/client-bootstrap/src/main/java/org/ow2/jonas/client/boot/Bootstrap.java diff --git a/jonas/modules/client-bootstrap/src/main/resources/META-INF/client-bootstrap.bnd b/modules/client-bootstrap/src/main/resources/META-INF/client-bootstrap.bnd similarity index 100% rename from jonas/modules/client-bootstrap/src/main/resources/META-INF/client-bootstrap.bnd rename to modules/client-bootstrap/src/main/resources/META-INF/client-bootstrap.bnd diff --git a/jonas/modules/client/core/pom.xml b/modules/client/core/pom.xml similarity index 100% rename from jonas/modules/client/core/pom.xml rename to modules/client/core/pom.xml diff --git a/jonas/modules/client/core/src/main/java/org/ow2/jonas/client/ClientContainer.java b/modules/client/core/src/main/java/org/ow2/jonas/client/ClientContainer.java similarity index 100% rename from jonas/modules/client/core/src/main/java/org/ow2/jonas/client/ClientContainer.java rename to modules/client/core/src/main/java/org/ow2/jonas/client/ClientContainer.java diff --git a/jonas/modules/client/core/src/main/java/org/ow2/jonas/client/ClientContainerException.java b/modules/client/core/src/main/java/org/ow2/jonas/client/ClientContainerException.java similarity index 100% rename from jonas/modules/client/core/src/main/java/org/ow2/jonas/client/ClientContainerException.java rename to modules/client/core/src/main/java/org/ow2/jonas/client/ClientContainerException.java diff --git a/jonas/modules/client/core/src/main/java/org/ow2/jonas/client/naming/ClientInitialContextFactory.java b/modules/client/core/src/main/java/org/ow2/jonas/client/naming/ClientInitialContextFactory.java similarity index 100% rename from jonas/modules/client/core/src/main/java/org/ow2/jonas/client/naming/ClientInitialContextFactory.java rename to modules/client/core/src/main/java/org/ow2/jonas/client/naming/ClientInitialContextFactory.java diff --git a/jonas/modules/client/core/src/main/jonas-resources/bin/jclient b/modules/client/core/src/main/jonas-resources/bin/jclient similarity index 100% rename from jonas/modules/client/core/src/main/jonas-resources/bin/jclient rename to modules/client/core/src/main/jonas-resources/bin/jclient diff --git a/jonas/modules/client/core/src/main/jonas-resources/bin/jclient.bat b/modules/client/core/src/main/jonas-resources/bin/jclient.bat similarity index 100% rename from jonas/modules/client/core/src/main/jonas-resources/bin/jclient.bat rename to modules/client/core/src/main/jonas-resources/bin/jclient.bat diff --git a/jonas/modules/client/pom.xml b/modules/client/pom.xml similarity index 100% rename from jonas/modules/client/pom.xml rename to modules/client/pom.xml diff --git a/jonas/modules/ee-components/jca/jdbc/cp/pom.xml b/modules/ee-components/jca/jdbc/cp/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/cp/pom.xml rename to modules/ee-components/jca/jdbc/cp/pom.xml diff --git a/jonas/modules/ee-components/jca/jdbc/cp/src/main/rar/META-INF/jonas-ra.xml b/modules/ee-components/jca/jdbc/cp/src/main/rar/META-INF/jonas-ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/cp/src/main/rar/META-INF/jonas-ra.xml rename to modules/ee-components/jca/jdbc/cp/src/main/rar/META-INF/jonas-ra.xml diff --git a/jonas/modules/ee-components/jca/jdbc/cp/src/main/rar/META-INF/ra.xml b/modules/ee-components/jca/jdbc/cp/src/main/rar/META-INF/ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/cp/src/main/rar/META-INF/ra.xml rename to modules/ee-components/jca/jdbc/cp/src/main/rar/META-INF/ra.xml diff --git a/jonas/modules/ee-components/jca/jdbc/dm/pom.xml b/modules/ee-components/jca/jdbc/dm/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/dm/pom.xml rename to modules/ee-components/jca/jdbc/dm/pom.xml diff --git a/jonas/modules/ee-components/jca/jdbc/dm/src/main/rar/META-INF/jonas-ra.xml b/modules/ee-components/jca/jdbc/dm/src/main/rar/META-INF/jonas-ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/dm/src/main/rar/META-INF/jonas-ra.xml rename to modules/ee-components/jca/jdbc/dm/src/main/rar/META-INF/jonas-ra.xml diff --git a/jonas/modules/ee-components/jca/jdbc/dm/src/main/rar/META-INF/ra.xml b/modules/ee-components/jca/jdbc/dm/src/main/rar/META-INF/ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/dm/src/main/rar/META-INF/ra.xml rename to modules/ee-components/jca/jdbc/dm/src/main/rar/META-INF/ra.xml diff --git a/jonas/modules/ee-components/jca/jdbc/ds/pom.xml b/modules/ee-components/jca/jdbc/ds/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/ds/pom.xml rename to modules/ee-components/jca/jdbc/ds/pom.xml diff --git a/jonas/modules/ee-components/jca/jdbc/ds/src/main/rar/META-INF/jonas-ra.xml b/modules/ee-components/jca/jdbc/ds/src/main/rar/META-INF/jonas-ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/ds/src/main/rar/META-INF/jonas-ra.xml rename to modules/ee-components/jca/jdbc/ds/src/main/rar/META-INF/jonas-ra.xml diff --git a/jonas/modules/ee-components/jca/jdbc/ds/src/main/rar/META-INF/ra.xml b/modules/ee-components/jca/jdbc/ds/src/main/rar/META-INF/ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/ds/src/main/rar/META-INF/ra.xml rename to modules/ee-components/jca/jdbc/ds/src/main/rar/META-INF/ra.xml diff --git a/jonas/modules/ee-components/jca/jdbc/glue/pom.xml b/modules/ee-components/jca/jdbc/glue/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/pom.xml rename to modules/ee-components/jca/jdbc/glue/pom.xml diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionManagerImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionManagerImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionManagerImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionManagerImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionPoolMCFImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionPoolMCFImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionPoolMCFImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionPoolMCFImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionRequestInfoImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionRequestInfoImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionRequestInfoImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ConnectionRequestInfoImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DataSourceImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DataSourceImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DataSourceImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DataSourceImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DataSourceMCFImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DataSourceMCFImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DataSourceMCFImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DataSourceMCFImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DriverManagerMCFImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DriverManagerMCFImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DriverManagerMCFImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DriverManagerMCFImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DriverWrapper.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DriverWrapper.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DriverWrapper.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/DriverWrapper.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/MCFData.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/MCFData.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/MCFData.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/MCFData.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ManagedConnectionFactoryImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ManagedConnectionFactoryImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ManagedConnectionFactoryImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ManagedConnectionFactoryImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ManagedConnectionImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ManagedConnectionImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ManagedConnectionImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/ManagedConnectionImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/MetaDataImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/MetaDataImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/MetaDataImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/MetaDataImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAExceptionUtils.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAExceptionUtils.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAExceptionUtils.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAExceptionUtils.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAMCFImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAMCFImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAMCFImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAMCFImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAResourceImpl.java b/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAResourceImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAResourceImpl.java rename to modules/ee-components/jca/jdbc/glue/src/main/java/org/ow2/jonas/ee/jdbc/XAResourceImpl.java diff --git a/jonas/modules/ee-components/jca/jdbc/pom.xml b/modules/ee-components/jca/jdbc/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/pom.xml rename to modules/ee-components/jca/jdbc/pom.xml diff --git a/jonas/modules/ee-components/jca/jdbc/xa/pom.xml b/modules/ee-components/jca/jdbc/xa/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/xa/pom.xml rename to modules/ee-components/jca/jdbc/xa/pom.xml diff --git a/jonas/modules/ee-components/jca/jdbc/xa/src/main/rar/META-INF/jonas-ra.xml b/modules/ee-components/jca/jdbc/xa/src/main/rar/META-INF/jonas-ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/xa/src/main/rar/META-INF/jonas-ra.xml rename to modules/ee-components/jca/jdbc/xa/src/main/rar/META-INF/jonas-ra.xml diff --git a/jonas/modules/ee-components/jca/jdbc/xa/src/main/rar/META-INF/ra.xml b/modules/ee-components/jca/jdbc/xa/src/main/rar/META-INF/ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/jdbc/xa/src/main/rar/META-INF/ra.xml rename to modules/ee-components/jca/jdbc/xa/src/main/rar/META-INF/ra.xml diff --git a/jonas/modules/ee-components/jca/pom.xml b/modules/ee-components/jca/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/pom.xml rename to modules/ee-components/jca/pom.xml diff --git a/jonas/modules/ee-components/jca/scout/glue/pom.xml b/modules/ee-components/jca/scout/glue/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/scout/glue/pom.xml rename to modules/ee-components/jca/scout/glue/pom.xml diff --git a/jonas/modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/JAXRResourceAdapter.java b/modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/JAXRResourceAdapter.java similarity index 100% rename from jonas/modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/JAXRResourceAdapter.java rename to modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/JAXRResourceAdapter.java diff --git a/jonas/modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/JConnectionFactory.java b/modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/JConnectionFactory.java similarity index 100% rename from jonas/modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/JConnectionFactory.java rename to modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/JConnectionFactory.java diff --git a/jonas/modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/ManagedConnectionFactoryImpl.java b/modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/ManagedConnectionFactoryImpl.java similarity index 100% rename from jonas/modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/ManagedConnectionFactoryImpl.java rename to modules/ee-components/jca/scout/glue/src/main/java/org/ow2/jonas/ee/scout/ManagedConnectionFactoryImpl.java diff --git a/jonas/modules/ee-components/jca/scout/plans/pom.xml b/modules/ee-components/jca/scout/plans/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/scout/plans/pom.xml rename to modules/ee-components/jca/scout/plans/pom.xml diff --git a/jonas/modules/ee-components/jca/scout/pom.xml b/modules/ee-components/jca/scout/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/scout/pom.xml rename to modules/ee-components/jca/scout/pom.xml diff --git a/jonas/modules/ee-components/jca/scout/rar/pom.xml b/modules/ee-components/jca/scout/rar/pom.xml similarity index 100% rename from jonas/modules/ee-components/jca/scout/rar/pom.xml rename to modules/ee-components/jca/scout/rar/pom.xml diff --git a/jonas/modules/ee-components/jca/scout/rar/src/main/rar/META-INF/jonas-ra.xml b/modules/ee-components/jca/scout/rar/src/main/rar/META-INF/jonas-ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/scout/rar/src/main/rar/META-INF/jonas-ra.xml rename to modules/ee-components/jca/scout/rar/src/main/rar/META-INF/jonas-ra.xml diff --git a/jonas/modules/ee-components/jca/scout/rar/src/main/rar/META-INF/ra.xml b/modules/ee-components/jca/scout/rar/src/main/rar/META-INF/ra.xml similarity index 100% rename from jonas/modules/ee-components/jca/scout/rar/src/main/rar/META-INF/ra.xml rename to modules/ee-components/jca/scout/rar/src/main/rar/META-INF/ra.xml diff --git a/jonas/modules/ee-components/jonas-admin/core/pom.xml b/modules/ee-components/jonas-admin/core/pom.xml similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/pom.xml rename to modules/ee-components/jonas-admin/core/pom.xml diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ApplicationLocales.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ApplicationLocales.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ApplicationLocales.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ApplicationLocales.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ApplyTopAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ApplyTopAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ApplyTopAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ApplyTopAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/EditTopAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/EditTopAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/EditTopAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/EditTopAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JettyObjectName.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JettyObjectName.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JettyObjectName.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JettyObjectName.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/Jlists.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/Jlists.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/Jlists.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/Jlists.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JmsConnFact.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JmsConnFact.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JmsConnFact.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JmsConnFact.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasAdminException.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasAdminException.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasAdminException.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasAdminException.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasAdminJmx.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasAdminJmx.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasAdminJmx.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasAdminJmx.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasBaseAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasBaseAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasBaseAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasBaseAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasServerItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasServerItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasServerItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasServerItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasTreeBuilder.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasTreeBuilder.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasTreeBuilder.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/JonasTreeBuilder.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/LogOutAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/LogOutAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/LogOutAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/LogOutAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/MBeanTreeBuilder.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/MBeanTreeBuilder.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/MBeanTreeBuilder.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/MBeanTreeBuilder.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ServiceName.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ServiceName.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ServiceName.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/ServiceName.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/SetUpTreeAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/SetUpTreeAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/SetUpTreeAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/SetUpTreeAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/SetupWhereAreYouAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/SetupWhereAreYouAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/SetupWhereAreYouAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/SetupWhereAreYouAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/TopForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/TopForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/TopForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/TopForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/TreeAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/TreeAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/TreeAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/TreeAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/WhereAreYou.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/WhereAreYou.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/WhereAreYou.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/WhereAreYou.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorsConfirmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorsConfirmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorsConfirmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ApplyConnectorsConfirmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/CatalinaBaseAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/CatalinaBaseAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/CatalinaBaseAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/CatalinaBaseAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorItemByPort.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorItemByPort.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorItemByPort.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ConnectorItemByPort.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/CreateConnectorAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/CreateConnectorAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/CreateConnectorAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/CreateConnectorAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/EditConnectorAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/EditConnectorAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/EditConnectorAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/EditConnectorAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ItemsConnectorsForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ItemsConnectorsForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ItemsConnectorsForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ItemsConnectorsForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ListConnectorsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ListConnectorsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ListConnectorsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/ListConnectorsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/SaveCatalinaAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/SaveCatalinaAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/SaveCatalinaAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/catalina/SaveCatalinaAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ApplyJonasServersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ApplyJonasServersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ApplyJonasServersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ApplyJonasServersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ClusterDaemonItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ClusterDaemonItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ClusterDaemonItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ClusterDaemonItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ClusterdServerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ClusterdServerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ClusterdServerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ClusterdServerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterApplyModifAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterApplyModifAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterApplyModifAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterApplyModifAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterConfigureServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterConfigureServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterConfigureServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterConfigureServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterModifyAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterModifyAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterModifyAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/DaemonProxyClusterModifyAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditAllClusterDaemonsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditAllClusterDaemonsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditAllClusterDaemonsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditAllClusterDaemonsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditClusterDaemonAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditClusterDaemonAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditClusterDaemonAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditClusterDaemonAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditClusterdVmMemoryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditClusterdVmMemoryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditClusterdVmMemoryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/EditClusterdVmMemoryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/HaltJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/HaltJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/HaltJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/HaltJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/MemoryForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/MemoryForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/MemoryForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/MemoryForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ServerConfigModifiedAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ServerConfigModifiedAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ServerConfigModifiedAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/ServerConfigModifiedAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StartJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StartJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StartJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StartJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StartStandbyJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StartStandbyJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StartStandbyJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StartStandbyJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StopJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StopJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StopJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/StopJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/servlet/MemoryGraphRemoteHostServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/servlet/MemoryGraphRemoteHostServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/servlet/MemoryGraphRemoteHostServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/clusterd/servlet/MemoryGraphRemoteHostServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ApplyCmiAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ApplyCmiAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ApplyCmiAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ApplyCmiAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ClusterAttribute.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ClusterAttribute.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ClusterAttribute.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ClusterAttribute.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ClusterPropertyAttribute.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ClusterPropertyAttribute.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ClusterPropertyAttribute.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/ClusterPropertyAttribute.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiClusterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiClusterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiClusterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiClusterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObject.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObject.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObject.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObject.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObjectAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObjectAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObjectAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObjectAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObjectForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObjectForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObjectForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiObjectForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiProtocolAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiProtocolAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiProtocolAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiProtocolAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiProtocolForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiProtocolForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiProtocolForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiProtocolForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiServerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiServerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiServerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/CmiServerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/LBAttribute.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/LBAttribute.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/LBAttribute.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/LBAttribute.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/Protocol.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/Protocol.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/Protocol.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/Protocol.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/Provider.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/Provider.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/Provider.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/cmi/Provider.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/BeanComparator.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/BeanComparator.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/BeanComparator.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/BeanComparator.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ItemsForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ItemsForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ItemsForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ItemsForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/LabelValueByLabelComparator.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/LabelValueByLabelComparator.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/LabelValueByLabelComparator.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/LabelValueByLabelComparator.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ModuleItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ModuleItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ModuleItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ModuleItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ModuleItemByName.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ModuleItemByName.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ModuleItemByName.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ModuleItemByName.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ObjectNameComparator.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ObjectNameComparator.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ObjectNameComparator.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/ObjectNameComparator.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/TargetItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/TargetItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/TargetItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/common/TargetItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDeployAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDeployAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDeployAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDeployAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDeployConfirmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDeployConfirmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDeployConfirmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDeployConfirmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployConfirmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployConfirmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployConfirmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyDomainDeployConfirmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyRemoveAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyRemoveAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyRemoveAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyRemoveAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyRemoveConfirmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyRemoveConfirmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyRemoveConfirmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyRemoveConfirmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyUploadAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyUploadAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyUploadAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/ApplyUploadAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/BaseDeployAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/BaseDeployAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/BaseDeployAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/BaseDeployAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/DeployForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/DeployForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/DeployForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/DeployForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/DomainDeployForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/DomainDeployForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/DomainDeployForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/DomainDeployForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditDeployAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditDeployAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditDeployAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditDeployAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditDomainDeployAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditDomainDeployAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditDomainDeployAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditDomainDeployAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditRemoveAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditRemoveAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditRemoveAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditRemoveAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditUploadAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditUploadAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditUploadAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/EditUploadAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/OperationInProgressException.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/OperationInProgressException.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/OperationInProgressException.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/OperationInProgressException.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/RemoveForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/RemoveForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/RemoveForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/RemoveForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/UploadForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/UploadForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/UploadForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/deploy/UploadForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmMoveAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmMoveAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmMoveAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ApplyJonasServersConfirmMoveAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/CreateClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/CreateClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/CreateClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/CreateClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/CreateJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/CreateJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/CreateJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/CreateJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/DomainForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/DomainForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/DomainForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/DomainForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/EditDomainAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/EditDomainAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/EditDomainAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/EditDomainAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/HaltJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/HaltJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/HaltJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/HaltJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ItemsServersForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ItemsServersForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ItemsServersForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ItemsServersForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/JonasServerItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/JonasServerItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/JonasServerItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/JonasServerItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/JonasServersMoveAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/JonasServersMoveAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/JonasServersMoveAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/JonasServersMoveAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ModuleItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ModuleItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ModuleItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/ModuleItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/NewClusterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/NewClusterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/NewClusterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/NewClusterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/NewServerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/NewServerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/NewServerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/NewServerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartClusterDaemonAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartClusterDaemonAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartClusterDaemonAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartClusterDaemonAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartStandbyJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartStandbyJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartStandbyJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StartStandbyJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopClusterDaemonAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopClusterDaemonAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopClusterDaemonAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopClusterDaemonAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopStandbyJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopStandbyJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopStandbyJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/domain/StopStandbyJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/ConnectionFactoryEditAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/ConnectionFactoryEditAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/ConnectionFactoryEditAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/ConnectionFactoryEditAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/ConnectionFactoryEditForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/ConnectionFactoryEditForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/ConnectionFactoryEditForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/ConnectionFactoryEditForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddConfirmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddConfirmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddConfirmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddConfirmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddConfirmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddConfirmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddConfirmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddConfirmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationAddForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteConfirmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteConfirmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteConfirmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteConfirmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteConfirmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteConfirmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteConfirmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteConfirmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationDeleteForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationEditAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationEditAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationEditAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationEditAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationEditForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationEditForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationEditForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationEditForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationsForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationsForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationsForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/DestinationsForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectPlatformAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectPlatformAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectPlatformAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectPlatformAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectPlatformForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectPlatformForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectPlatformForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/JonasMqConnectPlatformForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbEditAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbEditAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbEditAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbEditAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbEditForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbEditForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbEditForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbEditForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbsForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbsForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbsForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/MdbsForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/ItemDestination.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/ItemDestination.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/ItemDestination.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/ItemDestination.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/ItemMdb.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/ItemMdb.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/ItemMdb.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/ItemMdb.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/LogUtils.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/LogUtils.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/LogUtils.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/LogUtils.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/MqObjectNames.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/MqObjectNames.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/MqObjectNames.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/MqObjectNames.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/PropertiesComparator.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/PropertiesComparator.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/PropertiesComparator.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/PropertiesComparator.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/PropertiesUtil.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/PropertiesUtil.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/PropertiesUtil.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/PropertiesUtil.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/Property.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/Property.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/Property.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasmqconnect/util/Property.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/BasicJonasServerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/BasicJonasServerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/BasicJonasServerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/BasicJonasServerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/CmiRegistryResource.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/CmiRegistryResource.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/CmiRegistryResource.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/CmiRegistryResource.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJmxServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJmxServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJmxServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJmxServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJonasServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJonasServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJonasServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJonasServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJvmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJvmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJvmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditJvmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditRegistryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditRegistryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditRegistryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditRegistryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditServletServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditServletServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditServletServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/EditServletServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JmxServerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JmxServerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JmxServerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JmxServerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourceItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourceItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourceItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourceItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourcesForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourcesForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourcesForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JndiResourcesForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerRunGCAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerRunGCAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerRunGCAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerRunGCAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerStopAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerStopAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerStopAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JonasServerStopAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JvmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JvmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JvmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/JvmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/ListRegistryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/ListRegistryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/ListRegistryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/ListRegistryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/ServletServerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/ServletServerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/ServletServerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/jonasserver/ServletServerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/AddJoramReaderAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/AddJoramReaderAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/AddJoramReaderAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/AddJoramReaderAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/AddJoramWriterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/AddJoramWriterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/AddJoramWriterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/AddJoramWriterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyDestinationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyDestinationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyDestinationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyDestinationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramQueueAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramQueueAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramQueueAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramQueueAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramReaderAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramReaderAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramReaderAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramReaderAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramTopicAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramTopicAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramTopicAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramTopicAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramWriterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramWriterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramWriterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyJoramWriterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyUserAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyUserAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyUserAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ApplyUserAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/CreateJoramDestinationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/CreateJoramDestinationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/CreateJoramDestinationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/CreateJoramDestinationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/CreateJoramUserAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/CreateJoramUserAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/CreateJoramUserAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/CreateJoramUserAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationItemByNameComparator.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationItemByNameComparator.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationItemByNameComparator.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/DestinationItemByNameComparator.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramBaseAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramBaseAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramBaseAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramBaseAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramDestinationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramDestinationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramDestinationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramDestinationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramPlatformAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramPlatformAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramPlatformAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramPlatformAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramQueueAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramQueueAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramQueueAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramQueueAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramRemoteServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramRemoteServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramRemoteServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramRemoteServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramResourceAdapterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramResourceAdapterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramResourceAdapterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramResourceAdapterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramServerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramServerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramServerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramServerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramTopicAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramTopicAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramTopicAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramTopicAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramUserAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramUserAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramUserAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/EditJoramUserAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ExportRepository.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ExportRepository.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ExportRepository.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ExportRepository.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemBase.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemBase.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemBase.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemBase.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemDestination.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemDestination.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemDestination.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemDestination.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemDestinationByName.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemDestinationByName.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemDestinationByName.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemDestinationByName.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemServer.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemServer.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemServer.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemServer.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemUser.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemUser.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemUser.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ItemUser.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramAdapterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramAdapterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramAdapterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramAdapterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramDestinationForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramDestinationForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramDestinationForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramDestinationForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalQueueForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalQueueForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalQueueForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalQueueForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalServerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalServerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalServerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalServerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalTopicForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalTopicForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalTopicForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramLocalTopicForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramPlatformForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramPlatformForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramPlatformForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramPlatformForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramQueueForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramQueueForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramQueueForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramQueueForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramReaderWriterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramReaderWriterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramReaderWriterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramReaderWriterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramRemoteServerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramRemoteServerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramRemoteServerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramRemoteServerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramServersForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramServersForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramServersForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramServersForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramTopicForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramTopicForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramTopicForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramTopicForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramUserForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramUserForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramUserForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/JoramUserForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/MonitoringDestForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/MonitoringDestForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/MonitoringDestForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/MonitoringDestForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ReloadJoramAdmin.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ReloadJoramAdmin.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ReloadJoramAdmin.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/ReloadJoramAdmin.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmDestinationsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmDestinationsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmDestinationsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmDestinationsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmUsersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmUsersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmUsersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveConfirmUsersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveDestinationsForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveDestinationsForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveDestinationsForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveDestinationsForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveJoramDestinationsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveJoramDestinationsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveJoramDestinationsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveJoramDestinationsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveJoramUsersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveJoramUsersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveJoramUsersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveJoramUsersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveUsersForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveUsersForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveUsersForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/joramplatform/RemoveUsersForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyCatalinaAccessLoggerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyCatalinaAccessLoggerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyCatalinaAccessLoggerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyCatalinaAccessLoggerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggersConfirmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggersConfirmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggersConfirmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggersConfirmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggingJonasAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggingJonasAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggingJonasAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ApplyLoggingJonasAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/BaseLoggerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/BaseLoggerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/BaseLoggerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/BaseLoggerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/CatalinaAccessLogValveForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/CatalinaAccessLogValveForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/CatalinaAccessLogValveForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/CatalinaAccessLogValveForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/CatalinaValveForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/CatalinaValveForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/CatalinaValveForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/CatalinaValveForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/EditCatalinaAccessLoggerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/EditCatalinaAccessLoggerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/EditCatalinaAccessLoggerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/EditCatalinaAccessLoggerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/EditLoggingJonasAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/EditLoggingJonasAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/EditLoggingJonasAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/EditLoggingJonasAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ListLoggersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ListLoggersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ListLoggersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ListLoggersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/LoggerItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/LoggerItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/LoggerItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/LoggerItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/LoggingJonasForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/LoggingJonasForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/LoggingJonasForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/LoggingJonasForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/TopicLevel.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/TopicLevel.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/TopicLevel.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/TopicLevel.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ViewLoggingJonasAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ViewLoggingJonasAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ViewLoggingJonasAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ViewLoggingJonasAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ViewLoggingJonasForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ViewLoggingJonasForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ViewLoggingJonasForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/logging/ViewLoggingJonasForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ApplyMbeanFilteringAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ApplyMbeanFilteringAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ApplyMbeanFilteringAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ApplyMbeanFilteringAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListJ2eeMBeansAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListJ2eeMBeansAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListJ2eeMBeansAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListJ2eeMBeansAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanAttributesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanAttributesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanAttributesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanAttributesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanDetailsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanDetailsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanDetailsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanDetailsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanOperationsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanOperationsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanOperationsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanOperationsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanPropertiesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanPropertiesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanPropertiesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeanPropertiesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeansAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeansAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeansAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListMBeansAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListOwnerMBeansAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListOwnerMBeansAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListOwnerMBeansAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListOwnerMBeansAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListUnknownMBeansAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListUnknownMBeansAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListUnknownMBeansAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/ListUnknownMBeansAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/MbeanFilteringForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/MbeanFilteringForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/MbeanFilteringForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/mbean/MbeanFilteringForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyCmiClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyCmiClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyCmiClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyCmiClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyMemoryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyMemoryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyMemoryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyMemoryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyMonitoringAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyMonitoringAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyMonitoringAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyMonitoringAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyStackDumpAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyStackDumpAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyStackDumpAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ApplyStackDumpAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/BaseClusterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/BaseClusterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/BaseClusterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/BaseClusterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ClusterdAttribute.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ClusterdAttribute.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ClusterdAttribute.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/ClusterdAttribute.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiMemberAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiMemberAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiMemberAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiMemberAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiMemberForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiMemberForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiMemberForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/CmiMemberForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyClusterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DaemonProxyMemberForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DisplayNodeInfoAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DisplayNodeInfoAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DisplayNodeInfoAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/DisplayNodeInfoAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditMemoryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditMemoryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditMemoryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditMemoryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditMonitoringAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditMonitoringAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditMonitoringAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditMonitoringAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditStackDumpAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditStackDumpAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditStackDumpAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EditStackDumpAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaClusterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaClusterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaClusterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaClusterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaMemberAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaMemberAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaMemberAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaMemberAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaMemberForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaMemberForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaMemberForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/EjbHaMemberForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkClusterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkClusterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkClusterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkClusterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkMemberAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkMemberAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkMemberAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkMemberAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkMemberForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkMemberForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkMemberForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JkMemberForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramClusterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramClusterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramClusterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramClusterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramMemberAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramMemberAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramMemberAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramMemberAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramMemberForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramMemberForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramMemberForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/JoramMemberForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalClusterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalClusterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalClusterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalClusterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalMemberAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalMemberAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalMemberAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalMemberAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalMemberForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalMemberForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalMemberForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/LogicalMemberForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MemoryForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MemoryForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MemoryForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MemoryForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MemoryGraphServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MonitoringForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MonitoringForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MonitoringForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/MonitoringForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/NodeInfoForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/NodeInfoForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/NodeInfoForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/NodeInfoForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/PingAllJonasServersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/PingAllJonasServersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/PingAllJonasServersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/PingAllJonasServersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StackDumpForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StackDumpForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StackDumpForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StackDumpForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StartAllJonasServersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StartAllJonasServersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StartAllJonasServersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StartAllJonasServersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StopAllJonasServersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StopAllJonasServersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StopAllJonasServersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/StopAllJonasServersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatClusterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatClusterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatClusterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatClusterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatClusterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatClusterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatClusterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatClusterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatMemberAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatMemberAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatMemberAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatMemberAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatMemberForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatMemberForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatMemberForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/TomcatMemberForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerGraphForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerGraphForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerGraphForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerGraphForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerGraphsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerGraphsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerGraphsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerGraphsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerThreadCountAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerThreadCountAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerThreadCountAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerThreadCountAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerTransactionsCountAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerTransactionsCountAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerTransactionsCountAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/ServerTransactionsCountAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/ServerCurrentTxServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/ServerCurrentTxServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/ServerCurrentTxServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/ServerCurrentTxServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/ThreadCountServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/ThreadCountServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/ThreadCountServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/ThreadCountServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BegunTransactionsServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BegunTransactionsServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BegunTransactionsServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BegunTransactionsServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BytesReceivedByConnectorTomcatServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BytesReceivedByConnectorTomcatServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BytesReceivedByConnectorTomcatServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BytesReceivedByConnectorTomcatServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BytesSentByConnectorTomcatServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BytesSentByConnectorTomcatServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BytesSentByConnectorTomcatServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/BytesSentByConnectorTomcatServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionFailuresJCAConnectionServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionFailuresJCAConnectionServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionFailuresJCAConnectionServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionFailuresJCAConnectionServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionLeaksJCAConnectionServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionLeaksJCAConnectionServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionLeaksJCAConnectionServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionLeaksJCAConnectionServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionLeaksJDBCResourceServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionLeaksJDBCResourceServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionLeaksJDBCResourceServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ConnectionLeaksJDBCResourceServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentBusyJCAConnectionServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentBusyJCAConnectionServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentBusyJCAConnectionServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentBusyJCAConnectionServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentBusyJDBCResourceServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentBusyJDBCResourceServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentBusyJDBCResourceServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentBusyJDBCResourceServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfEJBServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfEJBServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfEJBServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfEJBServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfEntityBeanServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfEntityBeanServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfEntityBeanServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfEntityBeanServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfMDBServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfMDBServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfMDBServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfMDBServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfSBFServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfSBFServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfSBFServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfSBFServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfSBLServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfSBLServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfSBLServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentNumberOfSBLServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentUsedMemoryServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentUsedMemoryServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentUsedMemoryServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/CurrentUsedMemoryServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/EditMemoryServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/EditMemoryServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/EditMemoryServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/EditMemoryServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ErrorCountByConnectorTomcatServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ErrorCountByConnectorTomcatServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ErrorCountByConnectorTomcatServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ErrorCountByConnectorTomcatServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsQMsgDeliverServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsQMsgDeliverServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsQMsgDeliverServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsQMsgDeliverServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsQMsgReceiveServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsQMsgReceiveServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsQMsgReceiveServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsQMsgReceiveServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsTopicMsgDeliverServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsTopicMsgDeliverServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsTopicMsgDeliverServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsTopicMsgDeliverServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsTopicMsgReceiveServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsTopicMsgReceiveServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsTopicMsgReceiveServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/JmsTopicMsgReceiveServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/LoadCPUServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/LoadCPUServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/LoadCPUServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/LoadCPUServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ProcessingTimeByConnectorTomcatServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ProcessingTimeByConnectorTomcatServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ProcessingTimeByConnectorTomcatServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ProcessingTimeByConnectorTomcatServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RejectedOpenJCAConnectionServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RejectedOpenJCAConnectionServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RejectedOpenJCAConnectionServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RejectedOpenJCAConnectionServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RejectedOpenJDBCResourceServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RejectedOpenJDBCResourceServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RejectedOpenJDBCResourceServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RejectedOpenJDBCResourceServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RequestCountByConnectorTomcatServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RequestCountByConnectorTomcatServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RequestCountByConnectorTomcatServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/RequestCountByConnectorTomcatServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ServedOpenJCAConnectionServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ServedOpenJCAConnectionServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ServedOpenJCAConnectionServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ServedOpenJCAConnectionServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ServedOpenJDBCResourceServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ServedOpenJDBCResourceServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ServedOpenJDBCResourceServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ServedOpenJDBCResourceServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ThreadBusyConnectorTomcatServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ThreadBusyConnectorTomcatServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ThreadBusyConnectorTomcatServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/ThreadBusyConnectorTomcatServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalCommittedTransactionsServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalCommittedTransactionsServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalCommittedTransactionsServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalCommittedTransactionsServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalExpiredTransactionsServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalExpiredTransactionsServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalExpiredTransactionsServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalExpiredTransactionsServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalRolledbackTransactionsServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalRolledbackTransactionsServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalRolledbackTransactionsServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/TotalRolledbackTransactionsServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WaiterCountJCAConnectionServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WaiterCountJCAConnectionServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WaiterCountJCAConnectionServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WaiterCountJCAConnectionServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WaiterCountJDBCResourceServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WaiterCountJDBCResourceServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WaiterCountJDBCResourceServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WaiterCountJDBCResourceServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WorkersServlet.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WorkersServlet.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WorkersServlet.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/servlets/server/WorkersServlet.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/utils/GraphUtils.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/utils/GraphUtils.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/utils/GraphUtils.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/monitoring/graph/utils/GraphUtils.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyConfirmDestinationsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyConfirmDestinationsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyConfirmDestinationsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyConfirmDestinationsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDatasourcePropertiesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDatasourcePropertiesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDatasourcePropertiesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDatasourcePropertiesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDestinationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDestinationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDestinationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDestinationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDestinationsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDestinationsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDestinationsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyDestinationsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyMailFactoryPropertiesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyMailFactoryPropertiesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyMailFactoryPropertiesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyMailFactoryPropertiesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyMimePartMailFactoryPropertiesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyMimePartMailFactoryPropertiesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyMimePartMailFactoryPropertiesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplyMimePartMailFactoryPropertiesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplySessionMailFactoryPropertiesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplySessionMailFactoryPropertiesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplySessionMailFactoryPropertiesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ApplySessionMailFactoryPropertiesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DatasourcePropertiesForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DatasourcePropertiesForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DatasourcePropertiesForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DatasourcePropertiesForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationItemByNameComparator.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationItemByNameComparator.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationItemByNameComparator.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/DestinationItemByNameComparator.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditDatasourcePropertiesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditDatasourcePropertiesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditDatasourcePropertiesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditDatasourcePropertiesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditDestinationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditDestinationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditDestinationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditDestinationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditMailFactoryPropertiesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditMailFactoryPropertiesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditMailFactoryPropertiesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditMailFactoryPropertiesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditMimePartMailFactoryPropertiesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditMimePartMailFactoryPropertiesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditMimePartMailFactoryPropertiesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditMimePartMailFactoryPropertiesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditSessionMailFactoryPropertiesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditSessionMailFactoryPropertiesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditSessionMailFactoryPropertiesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/EditSessionMailFactoryPropertiesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ItemsDestinationsForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ItemsDestinationsForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ItemsDestinationsForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ItemsDestinationsForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListDatasourcesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListDatasourcesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListDatasourcesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListDatasourcesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListJmsResourcesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListJmsResourcesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListJmsResourcesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListJmsResourcesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListMailFactoriesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListMailFactoriesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListMailFactoriesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/ListMailFactoriesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/MailFactoryItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/MailFactoryItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/MailFactoryItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/MailFactoryItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/MailFactoryPropertiesForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/MailFactoryPropertiesForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/MailFactoryPropertiesForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/MailFactoryPropertiesForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/SaveDestinationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/SaveDestinationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/SaveDestinationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resource/SaveDestinationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ApplyCreateResourceAdapterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ApplyCreateResourceAdapterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ApplyCreateResourceAdapterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ApplyCreateResourceAdapterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ApplyTemplateCreateResourceAdapterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ApplyTemplateCreateResourceAdapterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ApplyTemplateCreateResourceAdapterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ApplyTemplateCreateResourceAdapterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/resourceadapter/CreateResourceAdapterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyConfirmMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyConfirmMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyConfirmMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyConfirmMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyConfirmRealmsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyConfirmRealmsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyConfirmRealmsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyConfirmRealmsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyDatasourceRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyDatasourceRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyDatasourceRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyDatasourceRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyGroupMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyGroupMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyGroupMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyGroupMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyLdapRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyLdapRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyLdapRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyLdapRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyRealmsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyRealmsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyRealmsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyRealmsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyRoleMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyRoleMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyRoleMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyRoleMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyUserMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyUserMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyUserMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ApplyUserMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/BaseMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/BaseMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/BaseMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/BaseMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/BaseSecurityAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/BaseSecurityAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/BaseSecurityAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/BaseSecurityAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ClearCacheAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ClearCacheAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ClearCacheAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ClearCacheAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/DatasourceRealmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/DatasourceRealmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/DatasourceRealmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/DatasourceRealmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditDatasourceRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditDatasourceRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditDatasourceRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditDatasourceRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditGroupMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditGroupMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditGroupMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditGroupMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditLdapRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditLdapRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditLdapRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditLdapRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmGroupsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmGroupsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmGroupsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmGroupsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmRolesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmRolesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmRolesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmRolesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmUsersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmUsersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmUsersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditMemoryRealmUsersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewGroupMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewGroupMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewGroupMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewGroupMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewRoleMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewRoleMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewRoleMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewRoleMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewUserMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewUserMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewUserMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditNewUserMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditRoleMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditRoleMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditRoleMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditRoleMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditSecurityCatalinaRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditSecurityCatalinaRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditSecurityCatalinaRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditSecurityCatalinaRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditUserMemoryRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditUserMemoryRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditUserMemoryRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/EditUserMemoryRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/FactoryRealmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/FactoryRealmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/FactoryRealmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/FactoryRealmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/GroupMemoryRealmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/GroupMemoryRealmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/GroupMemoryRealmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/GroupMemoryRealmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ItemsMemoryRealmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ItemsMemoryRealmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ItemsMemoryRealmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ItemsMemoryRealmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ItemsRealmsForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ItemsRealmsForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ItemsRealmsForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ItemsRealmsForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/LdapRealmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/LdapRealmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/LdapRealmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/LdapRealmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ListRealmsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ListRealmsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ListRealmsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/ListRealmsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/MemoryRealmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/MemoryRealmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/MemoryRealmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/MemoryRealmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/RoleMemoryRealmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/RoleMemoryRealmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/RoleMemoryRealmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/RoleMemoryRealmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/SaveRealmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/SaveRealmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/SaveRealmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/SaveRealmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/UserMemoryRealmForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/UserMemoryRealmForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/UserMemoryRealmForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/security/UserMemoryRealmForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/EditServiceSecurityAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/EditServiceSecurityAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/EditServiceSecurityAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/EditServiceSecurityAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ListServicesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ListServicesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ListServicesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ListServicesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ModuleForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ModuleForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ModuleForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ModuleForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ServiceItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ServiceItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ServiceItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ServiceItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ServiceItemByNameComparator.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ServiceItemByNameComparator.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ServiceItemByNameComparator.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ServiceItemByNameComparator.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/StartJonasServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/StartJonasServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/StartJonasServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/StartJonasServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/StopJonasServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/StopJonasServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/StopJonasServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/StopJonasServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyContainersStatisticAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyContainersStatisticAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyContainersStatisticAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyContainersStatisticAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyEjbContainersStatisticAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyEjbContainersStatisticAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyEjbContainersStatisticAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyEjbContainersStatisticAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppCatalinaAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppCatalinaAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppCatalinaAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppCatalinaAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppJettyAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppJettyAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppJettyAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppJettyAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppVirtualCatalinaAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppVirtualCatalinaAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppVirtualCatalinaAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebAppVirtualCatalinaAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebsConfirmAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebsConfirmAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebsConfirmAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ApplyWebsConfirmAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/BaseWebAppAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/BaseWebAppAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/BaseWebAppAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/BaseWebAppAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerItemByFile.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerItemByFile.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerItemByFile.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ContainerItemByFile.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EarForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EarForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EarForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EarForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditContainerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditContainerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditContainerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditContainerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditContainerStatisticAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditContainerStatisticAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditContainerStatisticAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditContainerStatisticAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditEarAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditEarAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditEarAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditEarAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditEjbCsStatisticAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditEjbCsStatisticAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditEjbCsStatisticAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditEjbCsStatisticAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWarAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWarAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWarAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWarAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppCatalinaAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppCatalinaAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppCatalinaAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppCatalinaAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppJettyAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppJettyAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppJettyAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EditWebAppJettyAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EjbContainersStatisticForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EjbContainersStatisticForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EjbContainersStatisticForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/EjbContainersStatisticForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListAppContainersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListAppContainersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListAppContainersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListAppContainersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListContainersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListContainersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListContainersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListContainersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListWebContainersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListWebContainersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListWebContainersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ListWebContainersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/SelectedItemsForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/SelectedItemsForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/SelectedItemsForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/SelectedItemsForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ViewContainerAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ViewContainerAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ViewContainerAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ViewContainerAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ViewContainerEjbsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ViewContainerEjbsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ViewContainerEjbsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/ViewContainerEjbsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WarForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WarForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WarForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WarForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppCatalinaForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppCatalinaForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppCatalinaForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppCatalinaForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppItemByPathContext.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppItemByPathContext.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppItemByPathContext.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppItemByPathContext.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppJettyForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppJettyForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppJettyForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppJettyForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppVirtualCatalinaForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppVirtualCatalinaForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppVirtualCatalinaForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/container/WebAppVirtualCatalinaForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ApplyDatasourceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ApplyDatasourceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ApplyDatasourceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ApplyDatasourceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ApplyDatasourceStatAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ApplyDatasourceStatAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ApplyDatasourceStatAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ApplyDatasourceStatAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceItemByNameComparator.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceItemByNameComparator.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceItemByNameComparator.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/DatasourceItemByNameComparator.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/EditDatasourceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/EditDatasourceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/EditDatasourceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/EditDatasourceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/EditDatasourceStatAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/EditDatasourceStatAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/EditDatasourceStatAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/EditDatasourceStatAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ListDatabasesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ListDatabasesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ListDatabasesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/db/ListDatabasesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/ApplyDepmonitorConfigurationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/ApplyDepmonitorConfigurationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/ApplyDepmonitorConfigurationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/ApplyDepmonitorConfigurationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/DepMonitorServiceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/DepMonitorServiceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/DepMonitorServiceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/DepMonitorServiceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/EditServiceDepmonitorAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/EditServiceDepmonitorAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/EditServiceDepmonitorAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/depmonitor/EditServiceDepmonitorAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceStartMasterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceStartMasterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceStartMasterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/DiscoveryServiceStartMasterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/EditServiceDiscoveryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/EditServiceDiscoveryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/EditServiceDiscoveryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/discovery/EditServiceDiscoveryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/ApplyEjbSessionConfigurationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/ApplyEjbSessionConfigurationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/ApplyEjbSessionConfigurationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/ApplyEjbSessionConfigurationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbEntityAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbEntityAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbEntityAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbEntityAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbMessageAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbMessageAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbMessageAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbMessageAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionSblAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionSblAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionSblAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EditEjbSessionSblAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbDependency.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbDependency.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbDependency.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbDependency.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbEntityForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbEntityForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbEntityForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbEntityForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbMessageForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbMessageForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbMessageForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbMessageForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbSessionForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbSessionForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbSessionForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/EjbSessionForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/ExecuteEjbAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/ExecuteEjbAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/ExecuteEjbAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/ejb/ExecuteEjbAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/CfForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/CfForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/CfForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/CfForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/EditJmsServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/EditJmsServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/EditJmsServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/EditJmsServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/JmsServiceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/JmsServiceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/JmsServiceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/JmsServiceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListConnectionFactoriesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListConnectionFactoriesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListConnectionFactoriesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListConnectionFactoriesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListQueuesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListQueuesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListQueuesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListQueuesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListTopicsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListTopicsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListTopicsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/ListTopicsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentConnectionFactoryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentConnectionFactoryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentConnectionFactoryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentConnectionFactoryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentQueueAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentQueueAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentQueueAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentQueueAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentTopicAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentTopicAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentTopicAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/PresentTopicAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/QueueForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/QueueForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/QueueForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/QueueForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/TopicForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/TopicForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/TopicForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jms/TopicForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ApplyConfirmXaResourceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ApplyConfirmXaResourceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ApplyConfirmXaResourceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ApplyConfirmXaResourceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ApplyJtmConfigurationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ApplyJtmConfigurationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ApplyJtmConfigurationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ApplyJtmConfigurationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditJtmServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditJtmServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditJtmServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditJtmServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionMonitorAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionMonitorAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionMonitorAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionMonitorAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionRecoveryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionRecoveryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionRecoveryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionRecoveryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionStatisticAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionStatisticAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionStatisticAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/EditTransactionStatisticAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ItemsXaResourceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ItemsXaResourceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ItemsXaResourceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ItemsXaResourceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceMonitorForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceMonitorForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceMonitorForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceMonitorForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceRecoveryForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceRecoveryForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceRecoveryForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceRecoveryForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceStatisticForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceStatisticForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceStatisticForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceStatisticForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceXAResourceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceXAResourceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceXAResourceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/JtmServiceXAResourceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ListXaResourceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ListXaResourceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ListXaResourceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ListXaResourceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetCountersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetCountersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetCountersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetCountersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetRecoveryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetRecoveryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetRecoveryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetRecoveryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetTransactionsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetTransactionsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetTransactionsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/ResetTransactionsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxRecovery.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxRecovery.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxRecovery.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxRecovery.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxXaresource.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxXaresource.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxXaresource.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/jtm/TxXaresource.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ApplyMimePartMailFactoryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ApplyMimePartMailFactoryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ApplyMimePartMailFactoryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ApplyMimePartMailFactoryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ApplySessionMailFactoryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ApplySessionMailFactoryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ApplySessionMailFactoryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ApplySessionMailFactoryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMailFactoryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMailFactoryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMailFactoryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMailFactoryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMailServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMailServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMailServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMailServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMimePartMailFactoryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMimePartMailFactoryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMimePartMailFactoryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditMimePartMailFactoryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditSessionMailFactoryAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditSessionMailFactoryAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditSessionMailFactoryAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/EditSessionMailFactoryAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ListMimePartMailFactoriesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ListMimePartMailFactoriesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ListMimePartMailFactoriesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ListMimePartMailFactoriesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ListSessionMailFactoriesAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ListSessionMailFactoriesAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ListSessionMailFactoriesAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/ListSessionMailFactoriesAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailFactoryForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailFactoryForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailFactoryForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailFactoryForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailFactoryItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailFactoryItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailFactoryItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailFactoryItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailServiceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailServiceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailServiceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/mail/MailServiceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterCFAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterCFAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterCFAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ApplyResourceAdapterCFAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAOAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAOAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAOAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAOAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterASAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterASAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterASAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterASAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFStatAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFStatAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFStatAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterCFStatAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterStatAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterStatAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterStatAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/EditResourceAdapterStatAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ListResourceAdaptersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ListResourceAdaptersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ListResourceAdaptersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ListResourceAdaptersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterAOForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterAOForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterAOForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterAOForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterASForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterASForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterASForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterASForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterCFForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterCFForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterCFForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterCFForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceAdapterForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceItemByFile.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceItemByFile.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceItemByFile.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/resource/ResourceItemByFile.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/smartclient/EditSmartclientServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/smartclient/EditSmartclientServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/smartclient/EditSmartclientServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/smartclient/EditSmartclientServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/smartclient/SmartclientServiceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/smartclient/SmartclientServiceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/smartclient/SmartclientServiceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/smartclient/SmartclientServiceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/ApplyVersioningConfigurationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/ApplyVersioningConfigurationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/ApplyVersioningConfigurationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/ApplyVersioningConfigurationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/EditVersioningServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/EditVersioningServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/EditVersioningServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/EditVersioningServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/VersioningServiceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/VersioningServiceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/VersioningServiceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/versioning/VersioningServiceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/HandlersDetailsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/HandlersDetailsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/HandlersDetailsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/HandlersDetailsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ListWebServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ListWebServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ListWebServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ListWebServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/PortComponentsDetailsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/PortComponentsDetailsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/PortComponentsDetailsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/PortComponentsDetailsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ViewHandlersAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ViewHandlersAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ViewHandlersAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ViewHandlersAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ViewPortComponentsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ViewPortComponentsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ViewPortComponentsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/ViewPortComponentsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/WebServiceDetailsAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/WebServiceDetailsAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/WebServiceDetailsAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/WebServiceDetailsAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/JOnASProvider.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/JOnASProvider.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/JOnASProvider.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/JOnASProvider.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/HandlerItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/HandlerItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/HandlerItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/HandlerItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/InitParamItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/InitParamItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/InitParamItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/InitParamItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/PortComponentItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/PortComponentItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/PortComponentItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/PortComponentItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/ServiceImplBean.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/ServiceImplBean.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/ServiceImplBean.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/ServiceImplBean.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/WebServiceDescriptionItem.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/WebServiceDescriptionItem.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/WebServiceDescriptionItem.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/webservice/provider/element/WebServiceDescriptionItem.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/ApplyWorkcleanerConfigurationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/ApplyWorkcleanerConfigurationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/ApplyWorkcleanerConfigurationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/ApplyWorkcleanerConfigurationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/EditWorkcleanerServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/EditWorkcleanerServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/EditWorkcleanerServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/EditWorkcleanerServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/WorkcleanerServiceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/WorkcleanerServiceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/WorkcleanerServiceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workcleaner/WorkcleanerServiceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/ApplyWorkmanagerConfigurationAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/ApplyWorkmanagerConfigurationAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/ApplyWorkmanagerConfigurationAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/ApplyWorkmanagerConfigurationAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/EditWorkmanagerServiceAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/EditWorkmanagerServiceAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/EditWorkmanagerServiceAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/EditWorkmanagerServiceAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/WorkmanagerServiceForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/WorkmanagerServiceForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/WorkmanagerServiceForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/service/workmanager/WorkmanagerServiceForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ApplyArchiveConfigAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ApplyArchiveConfigAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ApplyArchiveConfigAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ApplyArchiveConfigAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigAdvancedAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigAdvancedAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigAdvancedAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigAdvancedAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigForm.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigForm.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigForm.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigForm.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigSelectAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigSelectAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigSelectAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveConfigSelectAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveUtilAction.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveUtilAction.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveUtilAction.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/ArchiveUtilAction.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/XMLToFormUtil.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/XMLToFormUtil.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/XMLToFormUtil.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/XMLToFormUtil.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/AttributeRestrictions.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/AttributeRestrictions.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/AttributeRestrictions.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/AttributeRestrictions.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/ElementRestrictions.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/ElementRestrictions.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/ElementRestrictions.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/ElementRestrictions.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictions.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictions.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictions.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictions.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictionsFactory.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictionsFactory.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictionsFactory.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/SchemaRestrictionsFactory.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCAttributeRestrictions.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCAttributeRestrictions.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCAttributeRestrictions.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCAttributeRestrictions.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCElementRestrictions.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCElementRestrictions.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCElementRestrictions.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCElementRestrictions.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCSchemaRestrictions.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCSchemaRestrictions.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCSchemaRestrictions.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/jonasadmin/xml/xs/hardcoded/HCSchemaRestrictions.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridBaseTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridBaseTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridBaseTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridBaseTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridColTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridColTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridColTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridColTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridRowTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridRowTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridRowTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridRowTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridTableBaseTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridTableBaseTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridTableBaseTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridTableBaseTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/GridTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasButtonTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasButtonTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasButtonTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasButtonTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridColTitleTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridColTitleTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridColTitleTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridColTitleTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridNameTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridNameTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridNameTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridNameTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridNameTitleTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridNameTitleTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridNameTitleTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridNameTitleTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridRowTitleTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridRowTitleTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridRowTitleTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridRowTitleTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridValueTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridValueTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridValueTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridValueTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridValueTitleTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridValueTitleTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridValueTitleTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasGridValueTitleTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasSubmitTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasSubmitTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasSubmitTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/JonasSubmitTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/LabelValueBean.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/LabelValueBean.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/LabelValueBean.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/LabelValueBean.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/PanelSeparatorTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/PanelSeparatorTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/PanelSeparatorTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/PanelSeparatorTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/PanelTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/PanelTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/PanelTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/PanelTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/RefreshTreeTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/RefreshTreeTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/RefreshTreeTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/RefreshTreeTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TabTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TabTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TabTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TabTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TabsTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TabsTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TabsTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TabsTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TitleContentTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TitleContentTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TitleContentTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TitleContentTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeBuilder.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeBuilder.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeBuilder.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeBuilder.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControl.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControl.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControl.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControl.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlNode.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlNode.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlNode.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlNode.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlRenderTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlRenderTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlRenderTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlRenderTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/TreeControlTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/WhereAreYouTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/WhereAreYouTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/WhereAreYouTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/WhereAreYouTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/XMLEditorTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/XMLEditorTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/XMLEditorTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/XMLEditorTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/XmlFileTag.java b/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/XmlFileTag.java similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/XmlFileTag.java rename to modules/ee-components/jonas-admin/core/src/main/java/org/ow2/jonas/webapp/taglib/XmlFileTag.java diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/ApplicationResources.properties b/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/ApplicationResources.properties similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/ApplicationResources.properties rename to modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/ApplicationResources.properties diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/ApplicationResources_fr.properties b/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/ApplicationResources_fr.properties similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/ApplicationResources_fr.properties rename to modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/ApplicationResources_fr.properties diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/resourceadapter/jonas-ra-xml.vm b/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/resourceadapter/jonas-ra-xml.vm similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/resourceadapter/jonas-ra-xml.vm rename to modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/resourceadapter/jonas-ra-xml.vm diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ra-xml.vm b/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ra-xml.vm similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ra-xml.vm rename to modules/ee-components/jonas-admin/core/src/main/resources/org/ow2/jonas/webapp/jonasadmin/resourceadapter/ra-xml.vm diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/TestFont.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/TestFont.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/TestFont.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/TestFont.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/TestNavigator.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/TestNavigator.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/TestNavigator.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/TestNavigator.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/controls.tld b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/controls.tld similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/controls.tld rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/controls.tld diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/flex/services-config.xml b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/flex/services-config.xml similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/flex/services-config.xml rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/flex/services-config.xml diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/granite/granite-config.xml b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/granite/granite-config.xml similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/granite/granite-config.xml rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/granite/granite-config.xml diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/jonas-web.xml b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/jonas-web.xml rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/jonas-web.xml diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/sj.tld b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/sj.tld similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/sj.tld rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/sj.tld diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-bean.tld b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-bean.tld similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-bean.tld rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-bean.tld diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-config.xml b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-config.xml similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-config.xml rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-config.xml diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-html.tld b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-html.tld similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-html.tld rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-html.tld diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-logic.tld b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-logic.tld similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-logic.tld rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-logic.tld diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-template.tld b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-template.tld similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-template.tld rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/struts-template.tld diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/web.xml b/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/web.xml rename to modules/ee-components/jonas-admin/core/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/begin.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/begin.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/begin.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/begin.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/blank.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/blank.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/blank.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/blank.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connector.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connector.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connector.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connector.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connectors.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connectors.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connectors.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connectors.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connectorsConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connectorsConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connectorsConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/catalina/connectorsConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/DaemonProxyClusterDisplayServerConfig.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/DaemonProxyClusterDisplayServerConfig.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/DaemonProxyClusterDisplayServerConfig.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/DaemonProxyClusterDisplayServerConfig.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/addServerCd.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/addServerCd.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/addServerCd.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/addServerCd.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/daemonProxyClusterModify.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/daemonProxyClusterModify.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/daemonProxyClusterModify.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/daemonProxyClusterModify.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/graph/vmMemory.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/graph/vmMemory.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/graph/vmMemory.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/graph/vmMemory.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/serversConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/serversConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/serversConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/clusterd/serversConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiClusterInfo.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiClusterInfo.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiClusterInfo.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiClusterInfo.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiInfo.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiInfo.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiInfo.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiInfo.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiObjectInfo.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiObjectInfo.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiObjectInfo.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiObjectInfo.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiProtocolInfo.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiProtocolInfo.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiProtocolInfo.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiProtocolInfo.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiServerInfo.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiServerInfo.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiServerInfo.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/cmi/displayCmiServerInfo.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/common/begin.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/common/begin.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/common/begin.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/common/begin.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/common/end.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/common/end.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/common/end.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/common/end.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/deploy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/deploy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/deploy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/deploy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/deployConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/deployConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/deployConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/deployConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeploy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeploy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeploy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeploy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeployConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeployConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeployConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeployConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeployProgress.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeployProgress.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeployProgress.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainDeployProgress.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainUndeployConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainUndeployConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainUndeployConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/domainUndeployConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/remove.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/remove.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/remove.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/remove.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/removeConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/removeConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/removeConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/removeConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/upload.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/upload.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/upload.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/upload.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/uploadResult.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/uploadResult.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/deploy/uploadResult.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/deploy/uploadResult.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/addCluster.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/domain/addCluster.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/addCluster.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/domain/addCluster.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/addServer.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/domain/addServer.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/addServer.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/domain/addServer.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/addServerCluster.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/domain/addServerCluster.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/addServerCluster.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/domain/addServerCluster.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/clustercmi.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/domain/clustercmi.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/clustercmi.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/domain/clustercmi.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/domain.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/domain/domain.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/domain.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/domain/domain.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/serversConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/domain/serversConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/serversConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/domain/serversConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/serversConfirmMove.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/domain/serversConfirmMove.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/domain/serversConfirmMove.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/domain/serversConfirmMove.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/end.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/end.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/end.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/end.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/error.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/error.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/error.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/error.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/framemain.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/framemain.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/framemain.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/framemain.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/frameright.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/frameright.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/frameright.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/frameright.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/globalerror.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/globalerror.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/globalerror.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/globalerror.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/button/GraphButton.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/button/GraphButton.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/button/GraphButton.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/button/GraphButton.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/button/button.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/button/button.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/button/button.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/button/button.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/dot.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/dot.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/dot.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/dot.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/dot1.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/dot1.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/dot1.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/dot1.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/dot5.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/dot5.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/dot5.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/dot5.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/BalJonasGreen.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/BalJonasGreen.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/BalJonasGreen.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/BalJonasGreen.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/BalJonasTree.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/BalJonasTree.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/BalJonasTree.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/BalJonasTree.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/Database.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/Database.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/Database.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/Database.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/Datasource.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/Datasource.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/Datasource.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/Datasource.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/FolderBalJonas.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/FolderBalJonas.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/FolderBalJonas.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/FolderBalJonas.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/JonasQuestion.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/JonasQuestion.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/JonasQuestion.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/JonasQuestion.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/bean.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/bean.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/bean.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/bean.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/bullet.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/bullet.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/bullet.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/bullet.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/caution.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/caution.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/caution.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/caution.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/connector.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/connector.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/connector.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/connector.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/connectors.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/connectors.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/connectors.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/connectors.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomainManage.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomainManage.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomainManage.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomainManage.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_ear.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_ear.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_ear.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_ear.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_jar.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_jar.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_jar.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_jar.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_rar.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_rar.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_rar.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_rar.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_war.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_war.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_war.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployDomain_war.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_datasource.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_datasource.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_datasource.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_datasource.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_ear.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_ear.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_ear.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_ear.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_jar.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_jar.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_jar.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_jar.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_rar.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_rar.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_rar.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_rar.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_war.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_war.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_war.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deploy_war.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployed.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployed.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployed.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployed.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployed_not.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployed_not.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployed_not.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/deployed_not.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/domain_jonas.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/domain_jonas.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/domain_jonas.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/domain_jonas.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/ear.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/ear.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/ear.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/ear.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/help.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/help.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/help.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/help.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/info.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/info.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/info.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/info.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jar.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jar.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jar.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jar.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_connector.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_connector.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_connector.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_connector.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_queue.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_queue.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_queue.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_queue.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_topic.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_topic.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_topic.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/jms_topic.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/logger_http.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/logger_http.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/logger_http.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/logger_http.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/logger_jonas.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/logger_jonas.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/logger_jonas.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/logger_jonas.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/loggers.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/loggers.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/loggers.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/loggers.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail_mime.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail_mime.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail_mime.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail_mime.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail_session.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail_session.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail_session.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mail_session.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbean.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbean.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbean.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbean.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeandomain.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeandomain.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeandomain.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeandomain.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeans.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeans.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeans.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeans.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeantype.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeantype.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeantype.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/mbeantype.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/monitoring.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/monitoring.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/monitoring.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/monitoring.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/protocol.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/protocol.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/protocol.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/protocol.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/resourceAdapter.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/resourceAdapter.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/resourceAdapter.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/resourceAdapter.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/resources.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/resources.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/resources.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/resources.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_database.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_database.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_database.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_database.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_ldap.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_ldap.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_ldap.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_ldap.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_memory.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_memory.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_memory.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/security_memory.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_application.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_application.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_application.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_application.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_database.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_database.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_database.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_database.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_discovery.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_discovery.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_discovery.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_discovery.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_ejb.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_ejb.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_ejb.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_ejb.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_jms.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_jms.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_jms.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_jms.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_mail.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_mail.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_mail.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_mail.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_resource.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_resource.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_resource.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_resource.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_security.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_security.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_security.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_security.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_smartclient.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_smartclient.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_smartclient.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_smartclient.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_transaction.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_transaction.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_transaction.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_transaction.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_versioning.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_versioning.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_versioning.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_versioning.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_web.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_web.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_web.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_web.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_workcleaner.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_workcleaner.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_workcleaner.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_workcleaner.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_workmanager.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_workmanager.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_workmanager.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/service_workmanager.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/services.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/services.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/services.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/services.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/tag_blue.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/tag_blue.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/tag_blue.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/tag_blue.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/tag_green.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/tag_green.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/tag_green.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/tag_green.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/war.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/war.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/war.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/icon/war.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/jonasAdmin.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/jonasAdmin.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/jonasAdmin.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/jonasAdmin.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSadSmall.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSadSmall.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSadSmall.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSadSmall.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSadSmall_Orange.jpg b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSadSmall_Orange.jpg similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSadSmall_Orange.jpg rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSadSmall_Orange.jpg diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSmall.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSmall.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSmall.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSmall.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSmall_White.jpg b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSmall_White.jpg similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSmall_White.jpg rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/JonasSmall_White.jpg diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/balJonasAdmin.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/balJonasAdmin.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/balJonasAdmin.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/balJonasAdmin.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/balJonasAdminLogin.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/balJonasAdminLogin.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/balJonasAdminLogin.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/balJonasAdminLogin.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdmin.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdmin.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdmin.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdmin.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdminModified.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdminModified.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdminModified.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdminModified.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdminWelcomeMessage.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdminWelcomeMessage.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdminWelcomeMessage.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/jonasAdminWelcomeMessage.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/logoOW2.png b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/logoOW2.png similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/logoOW2.png rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/logoOW2.png diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/tableftF.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/tableftF.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/tableftF.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/tableftF.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/tabrightF.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/tabrightF.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/tabrightF.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/logo/tabrightF.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_first.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_first.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_first.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_first.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_last.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_last.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_last.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_last.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_middle.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_middle.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_middle.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/line_middle.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_first.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_first.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_first.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_first.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_last.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_last.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_last.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_last.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_middle.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_middle.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_middle.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_close_middle.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_first.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_first.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_first.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_first.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_last.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_last.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_last.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_last.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_middle.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_middle.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_middle.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/node_open_middle.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/noline.gif b/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/noline.gif similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/noline.gif rename to modules/ee-components/jonas-admin/core/src/main/webapp/images/tree/noline.gif diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/index.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/index.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/index.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/index.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/ConnectionFactoryEdit.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/ConnectionFactoryEdit.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/ConnectionFactoryEdit.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/ConnectionFactoryEdit.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationAdd.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationAdd.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationAdd.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationAdd.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationAddConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationAddConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationAddConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationAddConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationDelete.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationDelete.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationDelete.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationDelete.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationDeleteConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationDeleteConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationDeleteConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationDeleteConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationEdit.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationEdit.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationEdit.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/DestinationEdit.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/Destinations.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/Destinations.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/Destinations.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/Destinations.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/JonasMqConnect.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/JonasMqConnect.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/JonasMqConnect.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/JonasMqConnect.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/JonasMqConnectPlatform.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/JonasMqConnectPlatform.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/JonasMqConnectPlatform.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/JonasMqConnectPlatform.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/MdbEdit.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/MdbEdit.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/MdbEdit.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/MdbEdit.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/Mdbs.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/Mdbs.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/Mdbs.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasmqconnect/Mdbs.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jmxserver.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jmxserver.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jmxserver.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jmxserver.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jonasserver.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jonasserver.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jonasserver.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jonasserver.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jonasversions.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jonasversions.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jonasversions.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jonasversions.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jvm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jvm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jvm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/jvm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/listRegistry.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/listRegistry.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/listRegistry.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/listRegistry.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/registry.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/registry.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/registry.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/registry.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/servletServer.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/servletServer.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/servletServer.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/jonasserver/servletServer.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/addreader.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/addreader.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/addreader.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/addreader.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/addwriter.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/addwriter.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/addwriter.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/addwriter.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/createdestination.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/createdestination.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/createdestination.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/createdestination.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/createuser.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/createuser.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/createuser.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/createuser.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramadapter.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramadapter.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramadapter.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramadapter.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramdestinations.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramdestinations.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramdestinations.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramdestinations.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramdeststatistics.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramdeststatistics.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramdeststatistics.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramdeststatistics.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramplatform.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramplatform.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramplatform.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramplatform.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueue.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueue.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueue.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueue.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueuereaders.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueuereaders.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueuereaders.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueuereaders.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueuewriters.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueuewriters.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueuewriters.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramqueuewriters.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramremotedestinations.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramremotedestinations.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramremotedestinations.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramremotedestinations.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramremoteserver.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramremoteserver.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramremoteserver.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramremoteserver.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramservers.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramservers.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramservers.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramservers.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopic.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopic.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopic.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopic.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopicreaders.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopicreaders.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopicreaders.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopicreaders.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopicwriters.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopicwriters.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopicwriters.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramtopicwriters.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramusers.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramusers.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramusers.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramusers.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramxml.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramxml.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramxml.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/joramxml.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/queueUsedBy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/queueUsedBy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/queueUsedBy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/queueUsedBy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/removeDestinationsConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/removeDestinationsConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/removeDestinationsConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/removeDestinationsConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/removeUsersConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/removeUsersConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/removeUsersConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/removeUsersConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/topicUsedBy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/topicUsedBy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/topicUsedBy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/joramplatform/topicUsedBy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/catalinaAccessLogger.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/logging/catalinaAccessLogger.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/catalinaAccessLogger.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/logging/catalinaAccessLogger.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggers.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggers.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggers.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggers.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggersConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggersConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggersConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggersConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggingJonas.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggingJonas.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggingJonas.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggingJonas.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggingView.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggingView.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggingView.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/logging/loggingView.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/login.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/login.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/login.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/login.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listJ2eeMBeans.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listJ2eeMBeans.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listJ2eeMBeans.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listJ2eeMBeans.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanAttributes.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanAttributes.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanAttributes.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanAttributes.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanOperations.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanOperations.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanOperations.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanOperations.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanProperties.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanProperties.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanProperties.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeanProperties.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeans.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeans.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeans.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listMBeans.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listOwnerMBeans.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listOwnerMBeans.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listOwnerMBeans.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listOwnerMBeans.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listUnknownMBeans.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listUnknownMBeans.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listUnknownMBeans.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/mbean/listUnknownMBeans.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/cmiCluster.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/cmiCluster.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/cmiCluster.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/cmiCluster.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/cmiMember.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/cmiMember.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/cmiMember.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/cmiMember.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/daemonProxyCluster.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/daemonProxyCluster.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/daemonProxyCluster.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/daemonProxyCluster.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/daemonProxyMember.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/daemonProxyMember.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/daemonProxyMember.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/daemonProxyMember.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/displaynode.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/displaynode.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/displaynode.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/displaynode.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/ejbHaCluster.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/ejbHaCluster.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/ejbHaCluster.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/ejbHaCluster.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/ejbHaMember.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/ejbHaMember.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/ejbHaMember.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/ejbHaMember.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/graph/serverGraphs.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/graph/serverGraphs.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/graph/serverGraphs.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/graph/serverGraphs.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/graph/serverTransactionCount.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/graph/serverTransactionCount.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/graph/serverTransactionCount.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/graph/serverTransactionCount.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/jkCluster.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/jkCluster.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/jkCluster.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/jkCluster.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/jkMember.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/jkMember.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/jkMember.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/jkMember.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/joramCluster.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/joramCluster.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/joramCluster.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/joramCluster.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/joramMember.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/joramMember.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/joramMember.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/joramMember.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/logicalCluster.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/logicalCluster.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/logicalCluster.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/logicalCluster.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/logicalMember.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/logicalMember.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/logicalMember.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/logicalMember.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/memory.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/memory.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/memory.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/memory.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/monitoring.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/monitoring.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/monitoring.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/monitoring.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/stackDump.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/stackDump.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/stackDump.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/stackDump.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/tomcatCluster.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/tomcatCluster.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/tomcatCluster.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/tomcatCluster.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/tomcatMember.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/tomcatMember.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/tomcatMember.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/monitoring/tomcatMember.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/createDestination.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/createDestination.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/createDestination.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/createDestination.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/datasourceProperties.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/datasourceProperties.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/datasourceProperties.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/datasourceProperties.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/datasources.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/datasources.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/datasources.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/datasources.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/deployDatasource.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/deployDatasource.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/deployDatasource.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/deployDatasource.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/deployMailFactory.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/deployMailFactory.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/deployMailFactory.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/deployMailFactory.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/destinationsConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/destinationsConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/destinationsConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/destinationsConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/jmsResources.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/jmsResources.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/jmsResources.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/jmsResources.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/mailFactories.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/mailFactories.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/mailFactories.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/mailFactories.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/mailFactoryProperties.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/mailFactoryProperties.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/mailFactoryProperties.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/mailFactoryProperties.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/mimePartFactoryProperties.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/mimePartFactoryProperties.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/mimePartFactoryProperties.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/mimePartFactoryProperties.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/sessionFactoryProperties.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resource/sessionFactoryProperties.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resource/sessionFactoryProperties.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resource/sessionFactoryProperties.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createJDBCResourceAdapter.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createJDBCResourceAdapter.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createJDBCResourceAdapter.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createJDBCResourceAdapter.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createOtherResourceAdapter.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createOtherResourceAdapter.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createOtherResourceAdapter.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createOtherResourceAdapter.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createResourceAdapter.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createResourceAdapter.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createResourceAdapter.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/resourceadapter/createResourceAdapter.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/script/jonasAdmin.js b/modules/ee-components/jonas-admin/core/src/main/webapp/script/jonasAdmin.js similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/script/jonasAdmin.js rename to modules/ee-components/jonas-admin/core/src/main/webapp/script/jonasAdmin.js diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/confirmActionMemoryRealm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/confirmActionMemoryRealm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/confirmActionMemoryRealm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/confirmActionMemoryRealm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/datasourceRealm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/datasourceRealm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/datasourceRealm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/datasourceRealm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/groupMemoryRealm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/groupMemoryRealm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/groupMemoryRealm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/groupMemoryRealm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/ldapRealm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/ldapRealm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/ldapRealm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/ldapRealm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmGroups.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmGroups.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmGroups.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmGroups.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmRoles.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmRoles.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmRoles.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmRoles.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmUsers.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmUsers.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmUsers.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/memoryRealmUsers.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/realms.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/realms.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/realms.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/realms.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/realmsConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/realmsConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/realmsConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/realmsConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/realmsStopped.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/realmsStopped.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/realmsStopped.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/realmsStopped.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/roleMemoryRealm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/roleMemoryRealm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/roleMemoryRealm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/roleMemoryRealm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/securityCatalinaRealm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/securityCatalinaRealm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/securityCatalinaRealm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/securityCatalinaRealm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/userMemoryRealm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/security/userMemoryRealm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/security/userMemoryRealm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/security/userMemoryRealm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/appContainers.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/appContainers.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/appContainers.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/appContainers.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/cfUsedBy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/cfUsedBy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/cfUsedBy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/cfUsedBy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/confirmActionXaResource.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/confirmActionXaResource.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/confirmActionXaResource.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/confirmActionXaResource.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/container.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/container.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/container.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/container.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/containerEjbs.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/containerEjbs.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/containerEjbs.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/containerEjbs.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/containerStatistic.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/containerStatistic.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/containerStatistic.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/containerStatistic.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/containers.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/containers.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/containers.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/containers.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/databases.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/databases.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/databases.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/databases.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/datasource.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/datasource.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/datasource.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/datasource.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/datasourceStatistics.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/datasourceStatistics.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/datasourceStatistics.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/datasourceStatistics.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/datasourceUsedBy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/datasourceUsedBy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/datasourceUsedBy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/datasourceUsedBy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/depmonitorService.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/depmonitorService.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/depmonitorService.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/depmonitorService.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/discovery.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/discovery.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/discovery.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/discovery.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ear.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ear.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ear.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ear.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/earJars.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/earJars.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/earJars.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/earJars.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/earRars.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/earRars.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/earRars.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/earRars.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/earWars.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/earWars.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/earWars.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/earWars.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/earXmlDeployment.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/earXmlDeployment.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/earXmlDeployment.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/earXmlDeployment.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejb.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejb.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejb.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ejb.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbContainerService.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbContainerService.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbContainerService.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbContainerService.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbContainersStatistic.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbContainersStatistic.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbContainersStatistic.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbContainersStatistic.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbDependency.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbDependency.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbDependency.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbDependency.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbEntity.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbEntity.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbEntity.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbEntity.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbMessage.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbMessage.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbMessage.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbMessage.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbSession.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbSession.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbSession.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbSession.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbVirtual.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbVirtual.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbVirtual.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ejbVirtual.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsConnFactories.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsConnFactories.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsConnFactories.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsConnFactories.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsConnFactory.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsConnFactory.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsConnFactory.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsConnFactory.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsDestinations.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsDestinations.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsDestinations.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsDestinations.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsQueue.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsQueue.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsQueue.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsQueue.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsQueues.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsQueues.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsQueues.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsQueues.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsService.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsService.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsService.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsService.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsTopic.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsTopic.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsTopic.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsTopic.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsTopics.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsTopics.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsTopics.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jmsTopics.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jtmService.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jtmService.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jtmService.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jtmService.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jtmServiceStopped.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/jtmServiceStopped.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/jtmServiceStopped.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/jtmServiceStopped.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/mailService.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/mailService.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/mailService.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/mailService.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartFactories.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartFactories.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartFactories.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartFactories.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartFactory.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartFactory.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartFactory.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartFactory.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartMailFactoryUsedBy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartMailFactoryUsedBy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartMailFactoryUsedBy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/mimepartMailFactoryUsedBy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/queueUsedBy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/queueUsedBy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/queueUsedBy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/queueUsedBy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar10.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar10.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar10.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar10.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar10Stats.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar10Stats.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar10Stats.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar10Stats.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AO.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AO.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AO.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AO.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AOs.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AOs.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AOs.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AOs.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AS.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AS.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AS.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15AS.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15ASs.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15ASs.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15ASs.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15ASs.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CF.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CF.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CF.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CF.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CFStats.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CFStats.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CFStats.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CFStats.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CFs.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CFs.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CFs.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rar15CFs.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarPoolStatistics.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarPoolStatistics.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarPoolStatistics.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rarPoolStatistics.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarStatistics.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarStatistics.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarStatistics.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rarStatistics.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarUsedBy10.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarUsedBy10.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarUsedBy10.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rarUsedBy10.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarUsedBy15.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarUsedBy15.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rarUsedBy15.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rarUsedBy15.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rars.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/rars.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/rars.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/rars.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/security.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/security.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/security.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/security.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/securityStopped.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/securityStopped.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/securityStopped.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/securityStopped.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/services.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/services.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/services.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/services.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionFactories.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionFactories.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionFactories.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionFactories.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionFactory.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionFactory.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionFactory.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionFactory.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionMailFactoryUsedBy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionMailFactoryUsedBy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionMailFactoryUsedBy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/sessionMailFactoryUsedBy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/smartclientService.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/smartclientService.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/smartclientService.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/smartclientService.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/topicUsedBy.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/topicUsedBy.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/topicUsedBy.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/topicUsedBy.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionMonitor.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionMonitor.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionMonitor.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionMonitor.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionRecovery.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionRecovery.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionRecovery.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionRecovery.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionStatistic.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionStatistic.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionStatistic.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/transactionStatistic.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/versioningService.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/versioningService.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/versioningService.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/versioningService.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/war.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/war.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/war.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/war.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/warJonasXml.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/warJonasXml.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/warJonasXml.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/warJonasXml.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/warServlets.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/warServlets.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/warServlets.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/warServlets.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/warWebXml.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/warWebXml.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/warWebXml.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/warWebXml.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webApp.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/webApp.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webApp.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/webApp.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppCatalina.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppCatalina.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppCatalina.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppCatalina.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppJetty.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppJetty.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppJetty.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppJetty.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppVirtualCatalina.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppVirtualCatalina.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppVirtualCatalina.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/webAppVirtualCatalina.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webContainers.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/webContainers.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/webContainers.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/webContainers.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/workcleanerService.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/workcleanerService.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/workcleanerService.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/workcleanerService.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/workmanagerService.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/workmanagerService.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/workmanagerService.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/workmanagerService.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/handlersDetails.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/handlersDetails.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/handlersDetails.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/handlersDetails.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/portComponentsDetails.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/portComponentsDetails.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/portComponentsDetails.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/portComponentsDetails.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/viewHandlers.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/viewHandlers.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/viewHandlers.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/viewHandlers.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/viewPortComponents.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/viewPortComponents.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/viewPortComponents.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/viewPortComponents.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/webserviceDescriptions.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/webserviceDescriptions.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/webserviceDescriptions.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/webserviceDescriptions.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/webserviceDetails.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/webserviceDetails.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/webserviceDetails.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/ws/webserviceDetails.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/xaresourceRecovery.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/service/xaresourceRecovery.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/service/xaresourceRecovery.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/service/xaresourceRecovery.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/style/iepngfix.htc b/modules/ee-components/jonas-admin/core/src/main/webapp/style/iepngfix.htc similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/style/iepngfix.htc rename to modules/ee-components/jonas-admin/core/src/main/webapp/style/iepngfix.htc diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/style/jonasAdmin.css b/modules/ee-components/jonas-admin/core/src/main/webapp/style/jonasAdmin.css similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/style/jonasAdmin.css rename to modules/ee-components/jonas-admin/core/src/main/webapp/style/jonasAdmin.css diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/top.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/top.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/top.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/top.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/tree.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/tree.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/tree.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/tree.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/welcomeContent.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/welcomeContent.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/welcomeContent.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/welcomeContent.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfig.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfig.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfig.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfig.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigAdvanced.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigAdvanced.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigAdvanced.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigAdvanced.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigAjax.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigAjax.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigAjax.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigAjax.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigConfirm.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigConfirm.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigConfirm.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigConfirm.jsp diff --git a/jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigSelect.jsp b/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigSelect.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigSelect.jsp rename to modules/ee-components/jonas-admin/core/src/main/webapp/xml/archiveConfigSelect.jsp diff --git a/jonas/modules/ee-components/jonas-admin/plans/pom.xml b/modules/ee-components/jonas-admin/plans/pom.xml similarity index 100% rename from jonas/modules/ee-components/jonas-admin/plans/pom.xml rename to modules/ee-components/jonas-admin/plans/pom.xml diff --git a/jonas/modules/ee-components/jonas-admin/pom.xml b/modules/ee-components/jonas-admin/pom.xml similarity index 100% rename from jonas/modules/ee-components/jonas-admin/pom.xml rename to modules/ee-components/jonas-admin/pom.xml diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/pom.xml b/modules/ee-components/jonas-ctxroot/core/pom.xml similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/pom.xml rename to modules/ee-components/jonas-ctxroot/core/pom.xml diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/WEB-INF/jonas-web.xml b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/WEB-INF/jonas-web.xml similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/WEB-INF/jonas-web.xml rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/WEB-INF/jonas-web.xml diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/WEB-INF/web.xml b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/WEB-INF/web.xml rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/WEB-INF/web.xml diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/index.jsp b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/index.jsp similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/index.jsp rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/index.jsp diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/jetty.gif b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/jetty.gif similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/jetty.gif rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/jetty.gif diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/logoOW2.png b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/logoOW2.png similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/logoOW2.png rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/logoOW2.png diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/ow2_jonas.css b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/ow2_jonas.css similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/ow2_jonas.css rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/ow2_jonas.css diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/ow_jonas_logo.gif b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/ow_jonas_logo.gif similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/ow_jonas_logo.gif rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/ow_jonas_logo.gif diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/style.css b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/style.css similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/style.css rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/style.css diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/tomcat.gif b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/tomcat.gif similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/tomcat.gif rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/tomcat.gif diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/valid-xhtml11.png b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/valid-xhtml11.png similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/valid-xhtml11.png rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/valid-xhtml11.png diff --git a/jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/vcss.png b/modules/ee-components/jonas-ctxroot/core/src/main/webapp/vcss.png similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/core/src/main/webapp/vcss.png rename to modules/ee-components/jonas-ctxroot/core/src/main/webapp/vcss.png diff --git a/jonas/modules/ee-components/jonas-ctxroot/plans/pom.xml b/modules/ee-components/jonas-ctxroot/plans/pom.xml similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/plans/pom.xml rename to modules/ee-components/jonas-ctxroot/plans/pom.xml diff --git a/jonas/modules/ee-components/jonas-ctxroot/pom.xml b/modules/ee-components/jonas-ctxroot/pom.xml similarity index 100% rename from jonas/modules/ee-components/jonas-ctxroot/pom.xml rename to modules/ee-components/jonas-ctxroot/pom.xml diff --git a/jonas/modules/ee-components/mejb/core/pom.xml b/modules/ee-components/mejb/core/pom.xml similarity index 100% rename from jonas/modules/ee-components/mejb/core/pom.xml rename to modules/ee-components/mejb/core/pom.xml diff --git a/jonas/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/ListenerRegistrationImpl.java b/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/ListenerRegistrationImpl.java similarity index 100% rename from jonas/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/ListenerRegistrationImpl.java rename to modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/ListenerRegistrationImpl.java diff --git a/jonas/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/ManagementBean.java b/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/ManagementBean.java similarity index 100% rename from jonas/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/ManagementBean.java rename to modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/ManagementBean.java diff --git a/jonas/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/XManagement.java b/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/XManagement.java similarity index 100% rename from jonas/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/XManagement.java rename to modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/XManagement.java diff --git a/jonas/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/XManagementHome.java b/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/XManagementHome.java similarity index 100% rename from jonas/modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/XManagementHome.java rename to modules/ee-components/mejb/core/src/main/java/org/ow2/jonas/ee/mejb/XManagementHome.java diff --git a/jonas/modules/ee-components/mejb/plans/pom.xml b/modules/ee-components/mejb/plans/pom.xml similarity index 100% rename from jonas/modules/ee-components/mejb/plans/pom.xml rename to modules/ee-components/mejb/plans/pom.xml diff --git a/jonas/modules/ee-components/mejb/pom.xml b/modules/ee-components/mejb/pom.xml similarity index 100% rename from jonas/modules/ee-components/mejb/pom.xml rename to modules/ee-components/mejb/pom.xml diff --git a/jonas/modules/ee-components/pom.xml b/modules/ee-components/pom.xml similarity index 100% rename from jonas/modules/ee-components/pom.xml rename to modules/ee-components/pom.xml diff --git a/jonas/modules/generators/jonas-genbase/pom.xml b/modules/generators/jonas-genbase/pom.xml similarity index 100% rename from jonas/modules/generators/jonas-genbase/pom.xml rename to modules/generators/jonas-genbase/pom.xml diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/GenBaseException.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/GenBaseException.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/GenBaseException.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/GenBaseException.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/NoJ2EEWebservicesException.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/NoJ2EEWebservicesException.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/NoJ2EEWebservicesException.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/NoJ2EEWebservicesException.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/AbsArchive.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/AbsArchive.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/AbsArchive.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/AbsArchive.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Application.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Application.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Application.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Application.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Archive.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Archive.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Archive.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Archive.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Client.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Client.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Client.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Client.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/DummyApplication.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/DummyApplication.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/DummyApplication.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/DummyApplication.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/DummyWebApp.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/DummyWebApp.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/DummyWebApp.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/DummyWebApp.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Ejb.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Ejb.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Ejb.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/Ejb.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/EjbJar.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/EjbJar.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/EjbJar.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/EjbJar.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/EjbRefModule.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/EjbRefModule.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/EjbRefModule.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/EjbRefModule.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/FileArchive.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/FileArchive.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/FileArchive.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/FileArchive.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/J2EEArchive.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/J2EEArchive.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/J2EEArchive.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/J2EEArchive.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/JarArchive.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/JarArchive.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/JarArchive.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/JarArchive.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WebApp.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WebApp.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WebApp.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WebApp.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WsClient.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WsClient.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WsClient.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WsClient.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WsEndpoint.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WsEndpoint.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WsEndpoint.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/archive/WsEndpoint.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/AbsGenerator.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/AbsGenerator.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/AbsGenerator.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/AbsGenerator.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/Config.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/Config.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/Config.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/Config.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/GeneratorFactories.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/GeneratorFactories.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/GeneratorFactories.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/GeneratorFactories.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/GeneratorFactory.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/GeneratorFactory.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/GeneratorFactory.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/generator/GeneratorFactory.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/AbsApplicationModifier.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/AbsApplicationModifier.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/AbsApplicationModifier.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/AbsApplicationModifier.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/AbsModifierFactory.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/AbsModifierFactory.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/AbsModifierFactory.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/AbsModifierFactory.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/ArchiveModifier.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/ArchiveModifier.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/ArchiveModifier.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/modifier/ArchiveModifier.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/ArchiveStorer.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/ArchiveStorer.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/ArchiveStorer.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/ArchiveStorer.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/DirStorer.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/DirStorer.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/DirStorer.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/DirStorer.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/JarStorer.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/JarStorer.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/JarStorer.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/JarStorer.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/TempRepository.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/TempRepository.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/TempRepository.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/TempRepository.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/XMLUtils.java b/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/XMLUtils.java similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/XMLUtils.java rename to modules/generators/jonas-genbase/src/main/java/org/ow2/jonas/generators/genbase/utils/XMLUtils.java diff --git a/jonas/modules/generators/jonas-genbase/src/main/resources/META-INF/jonas-generators-base.bnd b/modules/generators/jonas-genbase/src/main/resources/META-INF/jonas-generators-base.bnd similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/resources/META-INF/jonas-generators-base.bnd rename to modules/generators/jonas-genbase/src/main/resources/META-INF/jonas-generators-base.bnd diff --git a/jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/I18n.properties b/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/I18n.properties similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/I18n.properties rename to modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/I18n.properties diff --git a/jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/application.xml b/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/application.xml similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/application.xml rename to modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/application.xml diff --git a/jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/context.xml b/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/context.xml similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/context.xml rename to modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/context.xml diff --git a/jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/jonas-web.xml b/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/jonas-web.xml similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/jonas-web.xml rename to modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/jonas-web.xml diff --git a/jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/web-jetty.xml b/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/web-jetty.xml similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/web-jetty.xml rename to modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/web-jetty.xml diff --git a/jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/web.xml b/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/web.xml similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/web.xml rename to modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/archive/web.xml diff --git a/jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/generator/I18n.properties b/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/generator/I18n.properties similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/generator/I18n.properties rename to modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/generator/I18n.properties diff --git a/jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/utils/I18n.properties b/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/utils/I18n.properties similarity index 100% rename from jonas/modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/utils/I18n.properties rename to modules/generators/jonas-genbase/src/main/resources/org/ow2/jonas/generators/genbase/utils/I18n.properties diff --git a/jonas/modules/generators/jonas-genclientstub/pom.xml b/modules/generators/jonas-genclientstub/pom.xml similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/pom.xml rename to modules/generators/jonas-genclientstub/pom.xml diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/ClientStubGen.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/ClientStubGen.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/ClientStubGen.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/ClientStubGen.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/ClientStubGenException.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/ClientStubGenException.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/ClientStubGenException.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/ClientStubGenException.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/generator/Generator.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/generator/Generator.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/generator/Generator.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/generator/Generator.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/generator/GeneratorFactory.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/generator/GeneratorFactory.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/generator/GeneratorFactory.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/generator/GeneratorFactory.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/AbsArchiveModifier.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/AbsArchiveModifier.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/AbsArchiveModifier.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/AbsArchiveModifier.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ApplicationModifier.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ApplicationModifier.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ApplicationModifier.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ApplicationModifier.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ClientModifier.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ClientModifier.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ClientModifier.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ClientModifier.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/EjbJarModifier.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/EjbJarModifier.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/EjbJarModifier.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/EjbJarModifier.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ModifierFactory.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ModifierFactory.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ModifierFactory.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/ModifierFactory.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/WebAppModifier.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/WebAppModifier.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/WebAppModifier.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/modifier/WebAppModifier.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/wrapper/ClientGenStubWrapper.java b/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/wrapper/ClientGenStubWrapper.java similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/wrapper/ClientGenStubWrapper.java rename to modules/generators/jonas-genclientstub/src/main/java/org/ow2/jonas/generators/genclientstub/wrapper/ClientGenStubWrapper.java diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/resources/META-INF/jonas-generators-clientstubs.bnd b/modules/generators/jonas-genclientstub/src/main/resources/META-INF/jonas-generators-clientstubs.bnd similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/resources/META-INF/jonas-generators-clientstubs.bnd rename to modules/generators/jonas-genclientstub/src/main/resources/META-INF/jonas-generators-clientstubs.bnd diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/resources/org/ow2/jonas/generators/genclientstub/generator/I18n.properties b/modules/generators/jonas-genclientstub/src/main/resources/org/ow2/jonas/generators/genclientstub/generator/I18n.properties similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/resources/org/ow2/jonas/generators/genclientstub/generator/I18n.properties rename to modules/generators/jonas-genclientstub/src/main/resources/org/ow2/jonas/generators/genclientstub/generator/I18n.properties diff --git a/jonas/modules/generators/jonas-genclientstub/src/main/resources/org/ow2/jonas/generators/genclientstub/modifier/I18n.properties b/modules/generators/jonas-genclientstub/src/main/resources/org/ow2/jonas/generators/genclientstub/modifier/I18n.properties similarity index 100% rename from jonas/modules/generators/jonas-genclientstub/src/main/resources/org/ow2/jonas/generators/genclientstub/modifier/I18n.properties rename to modules/generators/jonas-genclientstub/src/main/resources/org/ow2/jonas/generators/genclientstub/modifier/I18n.properties diff --git a/jonas/modules/generators/jonas-genic/pom.xml b/modules/generators/jonas-genic/pom.xml similarity index 100% rename from jonas/modules/generators/jonas-genic/pom.xml rename to modules/generators/jonas-genic/pom.xml diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/BeanSources.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/BeanSources.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/BeanSources.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/BeanSources.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenIC.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenIC.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenIC.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenIC.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenICException.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenICException.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenICException.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenICException.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenICParameters.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenICParameters.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenICParameters.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/GenICParameters.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/Source.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/Source.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/Source.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/Source.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VContextFactory.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VContextFactory.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VContextFactory.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VContextFactory.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcCMRField.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcCMRField.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcCMRField.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcCMRField.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcField.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcField.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcField.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcField.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcMethod.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcMethod.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcMethod.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcMethod.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcParam.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcParam.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcParam.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcParam.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcParamWhere.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcParamWhere.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcParamWhere.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VcParamWhere.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VelocityMonologLogger.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VelocityMonologLogger.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VelocityMonologLogger.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/VelocityMonologLogger.java diff --git a/jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/wrapper/GenicServiceWrapper.java b/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/wrapper/GenicServiceWrapper.java similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/wrapper/GenicServiceWrapper.java rename to modules/generators/jonas-genic/src/main/java/org/ow2/jonas/generators/genic/wrapper/GenicServiceWrapper.java diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/META-INF/jonas-genic.bnd b/modules/generators/jonas-genic/src/main/resources/META-INF/jonas-genic.bnd similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/META-INF/jonas-genic.bnd rename to modules/generators/jonas-genic/src/main/resources/META-INF/jonas-genic.bnd diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/GenICMacros.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/GenICMacros.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/GenICMacros.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/GenICMacros.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmp2.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmp2.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmp2.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmp2.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmp2CoherenceItf.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmp2CoherenceItf.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmp2CoherenceItf.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmp2CoherenceItf.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmpJdbc.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmpJdbc.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmpJdbc.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityCmpJdbc.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityHandle.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityHandle.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityHandle.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityHandle.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityHome.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityHome.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityHome.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityHome.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityLocal.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityLocal.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityLocal.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityLocal.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityLocalHome.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityLocalHome.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityLocalHome.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityLocalHome.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityRemote.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityRemote.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityRemote.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JEntityRemote.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JServiceEndpoint.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JServiceEndpoint.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JServiceEndpoint.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JServiceEndpoint.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JServiceEndpointHome.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JServiceEndpointHome.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JServiceEndpointHome.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JServiceEndpointHome.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulHome.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulHome.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulHome.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulHome.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulLocal.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulLocal.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulLocal.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulLocal.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulLocalHome.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulLocalHome.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulLocalHome.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulLocalHome.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulRemote.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulRemote.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulRemote.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatefulRemote.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessHome.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessHome.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessHome.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessHome.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessLocal.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessLocal.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessLocal.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessLocal.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessLocalHome.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessLocalHome.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessLocalHome.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessLocalHome.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessRemote.vm b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessRemote.vm similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessRemote.vm rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/JStatelessRemote.vm diff --git a/jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/README b/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/README similarity index 100% rename from jonas/modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/README rename to modules/generators/jonas-genic/src/main/resources/org/ow2/jonas/generators/genic/README diff --git a/jonas/modules/generators/jonas-wsgen/pom.xml b/modules/generators/jonas-wsgen/pom.xml similarity index 100% rename from jonas/modules/generators/jonas-wsgen/pom.xml rename to modules/generators/jonas-wsgen/pom.xml diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/WsGen.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/WsGen.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/WsGen.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/WsGen.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/WsGenException.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/WsGenException.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/WsGenException.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/WsGenException.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/ContextDDModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/ContextDDModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/ContextDDModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/ContextDDModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/DeploymentDescModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/DeploymentDescModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/DeploymentDescModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/DeploymentDescModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WebJettyDDModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WebJettyDDModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WebJettyDDModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WebJettyDDModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WebServicesDDModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WebServicesDDModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WebServicesDDModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WebServicesDDModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WsClientDDModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WsClientDDModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WsClientDDModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WsClientDDModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WsEndpointDDModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WsEndpointDDModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WsEndpointDDModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/ddmodifier/WsEndpointDDModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/GeneralWSFinder.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/GeneralWSFinder.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/GeneralWSFinder.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/GeneralWSFinder.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/GenericWSFinder.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/GenericWSFinder.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/GenericWSFinder.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/GenericWSFinder.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/J2EEWebServicesFinder.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/J2EEWebServicesFinder.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/J2EEWebServicesFinder.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/J2EEWebServicesFinder.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/ServiceRefFinder.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/ServiceRefFinder.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/ServiceRefFinder.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/ServiceRefFinder.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/WebServicesXmlFinder.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/WebServicesXmlFinder.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/WebServicesXmlFinder.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/finder/WebServicesXmlFinder.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/Generator.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/Generator.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/Generator.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/Generator.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/GeneratorFactory.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/GeneratorFactory.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/GeneratorFactory.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/GeneratorFactory.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/SecurityGenerator.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/SecurityGenerator.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/SecurityGenerator.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/SecurityGenerator.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/WsClientGenerator.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/WsClientGenerator.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/WsClientGenerator.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/WsClientGenerator.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/WsEndpointGenerator.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/WsEndpointGenerator.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/WsEndpointGenerator.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/WsEndpointGenerator.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisGeneratorFactory.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisGeneratorFactory.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisGeneratorFactory.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisGeneratorFactory.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisWsClientGenerator.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisWsClientGenerator.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisWsClientGenerator.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisWsClientGenerator.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisWsEndpointGenerator.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisWsEndpointGenerator.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisWsEndpointGenerator.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/AxisWsEndpointGenerator.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/JVelocity.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/JVelocity.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/JVelocity.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/JVelocity.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VContextFactory.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VContextFactory.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VContextFactory.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VContextFactory.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcArrayMapping.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcArrayMapping.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcArrayMapping.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcArrayMapping.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcBean.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcBean.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcBean.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcBean.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcBeanMapping.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcBeanMapping.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcBeanMapping.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcBeanMapping.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcHandler.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcHandler.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcHandler.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcHandler.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcHeader.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcHeader.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcHeader.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcHeader.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcInitParam.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcInitParam.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcInitParam.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcInitParam.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcPortComponent.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcPortComponent.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcPortComponent.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcPortComponent.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcTypeMapping.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcTypeMapping.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcTypeMapping.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/VcTypeMapping.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASEmitter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASEmitter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASEmitter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASEmitter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASGeneratorFactory.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASGeneratorFactory.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASGeneratorFactory.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASGeneratorFactory.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASInterfaceServiceImplWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASInterfaceServiceImplWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASInterfaceServiceImplWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASInterfaceServiceImplWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASServiceImplWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASServiceImplWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASServiceImplWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASServiceImplWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASServiceWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASServiceWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASServiceWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASServiceWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASWSDL2Java.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASWSDL2Java.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASWSDL2Java.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/axis/wsdl2java/JOnASWSDL2Java.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSGeneratorFactory.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSGeneratorFactory.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSGeneratorFactory.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSGeneratorFactory.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSWsClientGenerator.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSWsClientGenerator.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSWsClientGenerator.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSWsClientGenerator.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSWsEndpointGenerator.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSWsEndpointGenerator.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSWsEndpointGenerator.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/EWSWsEndpointGenerator.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/JOnASJ2EEWebServicesContext.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/JOnASJ2EEWebServicesContext.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/JOnASJ2EEWebServicesContext.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/JOnASJ2EEWebServicesContext.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/ServiceReferenceContextImpl.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/ServiceReferenceContextImpl.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/ServiceReferenceContextImpl.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/ServiceReferenceContextImpl.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/emitter/FullEmitter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/emitter/FullEmitter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/emitter/FullEmitter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/emitter/FullEmitter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/emitter/JOnASWSEmitter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/emitter/JOnASWSEmitter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/emitter/JOnASWSEmitter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/emitter/JOnASWSEmitter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/factory/JOnASClientGeneratorFactory.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/factory/JOnASClientGeneratorFactory.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/factory/JOnASClientGeneratorFactory.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/factory/JOnASClientGeneratorFactory.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/factory/JOnASEndpointGeneratorFactory.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/factory/JOnASEndpointGeneratorFactory.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/factory/JOnASEndpointGeneratorFactory.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/factory/JOnASEndpointGeneratorFactory.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/J2EEClientDeployWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/J2EEClientDeployWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/J2EEClientDeployWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/J2EEClientDeployWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/J2EEServerDeployWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/J2EEServerDeployWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/J2EEServerDeployWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/J2EEServerDeployWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASDeployWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASDeployWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASDeployWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASDeployWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSBindingWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSBindingWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSBindingWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSBindingWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceImplWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceImplWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceImplWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceImplWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceIntfWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceIntfWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceIntfWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceIntfWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASEWSServiceWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASTypeWriter.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASTypeWriter.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASTypeWriter.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/writer/JOnASTypeWriter.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFHandler.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFHandler.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFHandler.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFHandler.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFInitParam.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFInitParam.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFInitParam.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFInitParam.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFSOAPHeader.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFSOAPHeader.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFSOAPHeader.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/generator/ews/wsdltoj2ee/wscf/JOnASWSCFSOAPHeader.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ApplicationModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ApplicationModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ApplicationModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ApplicationModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ClientModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ClientModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ClientModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ClientModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/EjbJarModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/EjbJarModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/EjbJarModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/EjbJarModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ModifierFactory.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ModifierFactory.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ModifierFactory.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/ModifierFactory.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/WebAppModifier.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/WebAppModifier.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/WebAppModifier.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/WebAppModifier.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/WsGenModifierConstants.java b/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/WsGenModifierConstants.java similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/WsGenModifierConstants.java rename to modules/generators/jonas-wsgen/src/main/java/org/ow2/jonas/generators/wsgen/modifier/WsGenModifierConstants.java diff --git a/jonas/modules/generators/jonas-wsgen/src/main/resources/META-INF/jonas-generators-wsgen.bnd b/modules/generators/jonas-wsgen/src/main/resources/META-INF/jonas-generators-wsgen.bnd similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/resources/META-INF/jonas-generators-wsgen.bnd rename to modules/generators/jonas-wsgen/src/main/resources/META-INF/jonas-generators-wsgen.bnd diff --git a/jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/I18n.properties b/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/I18n.properties similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/I18n.properties rename to modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/I18n.properties diff --git a/jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/I18n.properties b/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/I18n.properties similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/I18n.properties rename to modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/I18n.properties diff --git a/jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/deploy_client.vm b/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/deploy_client.vm similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/deploy_client.vm rename to modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/deploy_client.vm diff --git a/jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/deploy_endpoint.vm b/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/deploy_endpoint.vm similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/deploy_endpoint.vm rename to modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/axis/deploy_endpoint.vm diff --git a/jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/ews/I18n.properties b/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/ews/I18n.properties similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/ews/I18n.properties rename to modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/generator/ews/I18n.properties diff --git a/jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/modifier/I18n.properties b/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/modifier/I18n.properties similarity index 100% rename from jonas/modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/modifier/I18n.properties rename to modules/generators/jonas-wsgen/src/main/resources/org/ow2/jonas/generators/wsgen/modifier/I18n.properties diff --git a/jonas/modules/generators/pom.xml b/modules/generators/pom.xml similarity index 100% rename from jonas/modules/generators/pom.xml rename to modules/generators/pom.xml diff --git a/jonas/modules/generators/raconfig/pom.xml b/modules/generators/raconfig/pom.xml similarity index 100% rename from jonas/modules/generators/raconfig/pom.xml rename to modules/generators/raconfig/pom.xml diff --git a/jonas/modules/generators/raconfig/src/main/java/org/ow2/jonas/generators/raconfig/RAConfig.java b/modules/generators/raconfig/src/main/java/org/ow2/jonas/generators/raconfig/RAConfig.java similarity index 100% rename from jonas/modules/generators/raconfig/src/main/java/org/ow2/jonas/generators/raconfig/RAConfig.java rename to modules/generators/raconfig/src/main/java/org/ow2/jonas/generators/raconfig/RAConfig.java diff --git a/jonas/modules/generators/raconfig/src/main/java/org/ow2/jonas/generators/raconfig/RAConfigException.java b/modules/generators/raconfig/src/main/java/org/ow2/jonas/generators/raconfig/RAConfigException.java similarity index 100% rename from jonas/modules/generators/raconfig/src/main/java/org/ow2/jonas/generators/raconfig/RAConfigException.java rename to modules/generators/raconfig/src/main/java/org/ow2/jonas/generators/raconfig/RAConfigException.java diff --git a/jonas/modules/generators/raconfig/src/main/resources/META-INF/jonas-generators-raconfig.bnd b/modules/generators/raconfig/src/main/resources/META-INF/jonas-generators-raconfig.bnd similarity index 100% rename from jonas/modules/generators/raconfig/src/main/resources/META-INF/jonas-generators-raconfig.bnd rename to modules/generators/raconfig/src/main/resources/META-INF/jonas-generators-raconfig.bnd diff --git a/jonas/modules/libraries/externals/javaee-api/pom.xml b/modules/libraries/externals/javaee-api/pom.xml similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/pom.xml rename to modules/libraries/externals/javaee-api/pom.xml diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/assembly/assembly.xml b/modules/libraries/externals/javaee-api/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/assembly/assembly.xml rename to modules/libraries/externals/javaee-api/src/main/assembly/assembly.xml diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java b/modules/libraries/externals/javaee-api/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java rename to modules/libraries/externals/javaee-api/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/resources/META-INF/javaee-api.bnd b/modules/libraries/externals/javaee-api/src/main/resources/META-INF/javaee-api.bnd similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/resources/META-INF/javaee-api.bnd rename to modules/libraries/externals/javaee-api/src/main/resources/META-INF/javaee-api.bnd diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd b/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd rename to modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jsp_2_0.xsd diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jsp_2_1.xsd b/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jsp_2_1.xsd similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jsp_2_1.xsd rename to modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jsp_2_1.xsd diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd b/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd rename to modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jspxml.dtd diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd b/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd rename to modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/jspxml.xsd diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd b/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd rename to modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd b/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd rename to modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd b/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd rename to modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd diff --git a/jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd b/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd similarity index 100% rename from jonas/modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd rename to modules/libraries/externals/javaee-api/src/main/resources/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd diff --git a/jonas/modules/libraries/externals/jaxp-ri/pom.xml b/modules/libraries/externals/jaxp-ri/pom.xml similarity index 100% rename from jonas/modules/libraries/externals/jaxp-ri/pom.xml rename to modules/libraries/externals/jaxp-ri/pom.xml diff --git a/jonas/modules/libraries/externals/jaxp-ri/src/main/resources/META-INF/jaxp-ri.bnd b/modules/libraries/externals/jaxp-ri/src/main/resources/META-INF/jaxp-ri.bnd similarity index 100% rename from jonas/modules/libraries/externals/jaxp-ri/src/main/resources/META-INF/jaxp-ri.bnd rename to modules/libraries/externals/jaxp-ri/src/main/resources/META-INF/jaxp-ri.bnd diff --git a/jonas/modules/libraries/externals/monolog/pom.xml b/modules/libraries/externals/monolog/pom.xml similarity index 100% rename from jonas/modules/libraries/externals/monolog/pom.xml rename to modules/libraries/externals/monolog/pom.xml diff --git a/jonas/modules/libraries/externals/monolog/src/main/java/org/ow2/jonas/monolog/MonologExtension.java b/modules/libraries/externals/monolog/src/main/java/org/ow2/jonas/monolog/MonologExtension.java similarity index 100% rename from jonas/modules/libraries/externals/monolog/src/main/java/org/ow2/jonas/monolog/MonologExtension.java rename to modules/libraries/externals/monolog/src/main/java/org/ow2/jonas/monolog/MonologExtension.java diff --git a/jonas/modules/libraries/externals/monolog/src/main/resources/META-INF/monolog.bnd b/modules/libraries/externals/monolog/src/main/resources/META-INF/monolog.bnd similarity index 100% rename from jonas/modules/libraries/externals/monolog/src/main/resources/META-INF/monolog.bnd rename to modules/libraries/externals/monolog/src/main/resources/META-INF/monolog.bnd diff --git a/jonas/modules/libraries/externals/monolog/src/main/resources/metadata.xml b/modules/libraries/externals/monolog/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/libraries/externals/monolog/src/main/resources/metadata.xml rename to modules/libraries/externals/monolog/src/main/resources/metadata.xml diff --git a/jonas/modules/libraries/externals/neethi/pom.xml b/modules/libraries/externals/neethi/pom.xml similarity index 100% rename from jonas/modules/libraries/externals/neethi/pom.xml rename to modules/libraries/externals/neethi/pom.xml diff --git a/jonas/modules/libraries/externals/neethi/src/main/resources/META-INF/neethi.bnd b/modules/libraries/externals/neethi/src/main/resources/META-INF/neethi.bnd similarity index 100% rename from jonas/modules/libraries/externals/neethi/src/main/resources/META-INF/neethi.bnd rename to modules/libraries/externals/neethi/src/main/resources/META-INF/neethi.bnd diff --git a/jonas/modules/libraries/externals/pom.xml b/modules/libraries/externals/pom.xml similarity index 100% rename from jonas/modules/libraries/externals/pom.xml rename to modules/libraries/externals/pom.xml diff --git a/jonas/modules/libraries/externals/saaj-ri/pom.xml b/modules/libraries/externals/saaj-ri/pom.xml similarity index 100% rename from jonas/modules/libraries/externals/saaj-ri/pom.xml rename to modules/libraries/externals/saaj-ri/pom.xml diff --git a/jonas/modules/libraries/externals/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/client/p2p/HttpSOAPConnection.java b/modules/libraries/externals/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/client/p2p/HttpSOAPConnection.java similarity index 100% rename from jonas/modules/libraries/externals/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/client/p2p/HttpSOAPConnection.java rename to modules/libraries/externals/saaj-ri/src/main/java/com/sun/xml/messaging/saaj/client/p2p/HttpSOAPConnection.java diff --git a/jonas/modules/libraries/externals/saaj-ri/src/main/resources/META-INF/saaj-ri.bnd b/modules/libraries/externals/saaj-ri/src/main/resources/META-INF/saaj-ri.bnd similarity index 100% rename from jonas/modules/libraries/externals/saaj-ri/src/main/resources/META-INF/saaj-ri.bnd rename to modules/libraries/externals/saaj-ri/src/main/resources/META-INF/saaj-ri.bnd diff --git a/jonas/modules/libraries/externals/ws-security/pom.xml b/modules/libraries/externals/ws-security/pom.xml similarity index 100% rename from jonas/modules/libraries/externals/ws-security/pom.xml rename to modules/libraries/externals/ws-security/pom.xml diff --git a/jonas/modules/libraries/externals/ws-security/src/main/resources/META-INF/ws-security.bnd b/modules/libraries/externals/ws-security/src/main/resources/META-INF/ws-security.bnd similarity index 100% rename from jonas/modules/libraries/externals/ws-security/src/main/resources/META-INF/ws-security.bnd rename to modules/libraries/externals/ws-security/src/main/resources/META-INF/ws-security.bnd diff --git a/jonas/modules/libraries/externals/xmlbeans/pom.xml b/modules/libraries/externals/xmlbeans/pom.xml similarity index 100% rename from jonas/modules/libraries/externals/xmlbeans/pom.xml rename to modules/libraries/externals/xmlbeans/pom.xml diff --git a/jonas/modules/libraries/externals/xmlbeans/src/main/resources/META-INF/xmlbeans.bnd b/modules/libraries/externals/xmlbeans/src/main/resources/META-INF/xmlbeans.bnd similarity index 100% rename from jonas/modules/libraries/externals/xmlbeans/src/main/resources/META-INF/xmlbeans.bnd rename to modules/libraries/externals/xmlbeans/src/main/resources/META-INF/xmlbeans.bnd diff --git a/jonas/modules/libraries/jonas-audit-jms/pom.xml b/modules/libraries/jonas-audit-jms/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-audit-jms/pom.xml rename to modules/libraries/jonas-audit-jms/pom.xml diff --git a/jonas/modules/libraries/jonas-audit-jms/src/main/java/org/ow2/jonas/audit/jms/interceptor/JMSClientInterceptor.java b/modules/libraries/jonas-audit-jms/src/main/java/org/ow2/jonas/audit/jms/interceptor/JMSClientInterceptor.java similarity index 100% rename from jonas/modules/libraries/jonas-audit-jms/src/main/java/org/ow2/jonas/audit/jms/interceptor/JMSClientInterceptor.java rename to modules/libraries/jonas-audit-jms/src/main/java/org/ow2/jonas/audit/jms/interceptor/JMSClientInterceptor.java diff --git a/jonas/modules/libraries/jonas-audit-jms/src/main/resources/META-INF/jonas-audit-jms.bnd b/modules/libraries/jonas-audit-jms/src/main/resources/META-INF/jonas-audit-jms.bnd similarity index 100% rename from jonas/modules/libraries/jonas-audit-jms/src/main/resources/META-INF/jonas-audit-jms.bnd rename to modules/libraries/jonas-audit-jms/src/main/resources/META-INF/jonas-audit-jms.bnd diff --git a/jonas/modules/libraries/jonas-bootstrap-loader/pom.xml b/modules/libraries/jonas-bootstrap-loader/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-bootstrap-loader/pom.xml rename to modules/libraries/jonas-bootstrap-loader/pom.xml diff --git a/jonas/modules/libraries/jonas-bootstrap-loader/src/main/java/org/ow2/jonas/lib/bootstrap/loader/JClassLoader.java b/modules/libraries/jonas-bootstrap-loader/src/main/java/org/ow2/jonas/lib/bootstrap/loader/JClassLoader.java similarity index 100% rename from jonas/modules/libraries/jonas-bootstrap-loader/src/main/java/org/ow2/jonas/lib/bootstrap/loader/JClassLoader.java rename to modules/libraries/jonas-bootstrap-loader/src/main/java/org/ow2/jonas/lib/bootstrap/loader/JClassLoader.java diff --git a/jonas/modules/libraries/jonas-bootstrap-loader/src/main/resources/META-INF/jonas-bootstrap-loader.bnd b/modules/libraries/jonas-bootstrap-loader/src/main/resources/META-INF/jonas-bootstrap-loader.bnd similarity index 100% rename from jonas/modules/libraries/jonas-bootstrap-loader/src/main/resources/META-INF/jonas-bootstrap-loader.bnd rename to modules/libraries/jonas-bootstrap-loader/src/main/resources/META-INF/jonas-bootstrap-loader.bnd diff --git a/jonas/modules/libraries/jonas-commons/pom.xml b/modules/libraries/jonas-commons/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-commons/pom.xml rename to modules/libraries/jonas-commons/pom.xml diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/Bootstrap.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/Bootstrap.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/Bootstrap.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/Bootstrap.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JFileFilter.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JFileFilter.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JFileFilter.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JFileFilter.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JProp.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JProp.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JProp.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JProp.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JURLs.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JURLs.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JURLs.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/JURLs.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/LoaderManager.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/LoaderManager.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/LoaderManager.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/LoaderManager.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/RemoteClassLoaderSpi.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/RemoteClassLoaderSpi.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/RemoteClassLoaderSpi.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/bootstrap/RemoteClassLoaderSpi.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/EarClassPathManager.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/EarClassPathManager.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/EarClassPathManager.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/EarClassPathManager.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/EarClassPathManagerException.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/EarClassPathManagerException.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/EarClassPathManagerException.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/EarClassPathManagerException.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/JarList.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/JarList.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/JarList.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/JarList.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/JarListException.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/JarListException.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/JarListException.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/cpmanager/JarListException.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/ExecutionResult.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/ExecutionResult.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/ExecutionResult.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/ExecutionResult.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/IExecution.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/IExecution.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/IExecution.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/IExecution.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/RunnableHelper.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/RunnableHelper.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/RunnableHelper.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/execution/RunnableHelper.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/AbsModuleClassLoader.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/AbsModuleClassLoader.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/AbsModuleClassLoader.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/AbsModuleClassLoader.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/ClientClassLoader.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/ClientClassLoader.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/ClientClassLoader.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/ClientClassLoader.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/EjbJarClassLoader.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/EjbJarClassLoader.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/EjbJarClassLoader.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/EjbJarClassLoader.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/FilteringClassLoader.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/FilteringClassLoader.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/FilteringClassLoader.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/FilteringClassLoader.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/IMetaInfLocator.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/IMetaInfLocator.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/IMetaInfLocator.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/IMetaInfLocator.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/MetaInfScanner.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/MetaInfScanner.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/MetaInfScanner.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/MetaInfScanner.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/MetaInfScannerBundleTrackerCustomizer.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/MetaInfScannerBundleTrackerCustomizer.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/MetaInfScannerBundleTrackerCustomizer.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/MetaInfScannerBundleTrackerCustomizer.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/OSGiClassLoader.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/OSGiClassLoader.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/OSGiClassLoader.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/OSGiClassLoader.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/SimpleWebappClassLoader.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/SimpleWebappClassLoader.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/SimpleWebappClassLoader.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/SimpleWebappClassLoader.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/ThreadContextClassLoader.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/ThreadContextClassLoader.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/ThreadContextClassLoader.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/ThreadContextClassLoader.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/WebappClassLoader.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/WebappClassLoader.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/WebappClassLoader.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/WebappClassLoader.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/DirURLFactory.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/DirURLFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/DirURLFactory.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/DirURLFactory.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/JarURLFactory.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/JarURLFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/JarURLFactory.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/JarURLFactory.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/URLFactory.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/URLFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/URLFactory.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/factory/URLFactory.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/DirLocator.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/DirLocator.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/DirLocator.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/DirLocator.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/JarFileLocator.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/JarFileLocator.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/JarFileLocator.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/JarFileLocator.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/Locator.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/Locator.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/Locator.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/locator/Locator.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/xml/FiltersDefinition.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/xml/FiltersDefinition.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/xml/FiltersDefinition.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/loader/xml/FiltersDefinition.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/service/AbsConfigServiceImpl.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/service/AbsConfigServiceImpl.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/service/AbsConfigServiceImpl.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/service/AbsConfigServiceImpl.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/service/AbsServiceImpl.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/service/AbsServiceImpl.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/service/AbsServiceImpl.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/service/AbsServiceImpl.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Base64.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Base64.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Base64.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Base64.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/BeanNaming.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/BeanNaming.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/BeanNaming.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/BeanNaming.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Cmd.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Cmd.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Cmd.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Cmd.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/ConfigurationConstants.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/ConfigurationConstants.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/ConfigurationConstants.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/ConfigurationConstants.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/DirFilter.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/DirFilter.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/DirFilter.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/DirFilter.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Env.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Env.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Env.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Env.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/I18n.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/I18n.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/I18n.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/I18n.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JJarFile.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JJarFile.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JJarFile.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JJarFile.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JModule.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JModule.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JModule.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JModule.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JNDIUtils.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JNDIUtils.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JNDIUtils.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JNDIUtils.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JonasObjectName.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JonasObjectName.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JonasObjectName.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JonasObjectName.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JoramObjectName.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JoramObjectName.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JoramObjectName.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/JoramObjectName.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Log.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Log.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Log.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/Log.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/ModuleNamingUtils.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/ModuleNamingUtils.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/ModuleNamingUtils.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/ModuleNamingUtils.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/NetUtils.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/NetUtils.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/NetUtils.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/NetUtils.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/PropDump.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/PropDump.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/PropDump.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/PropDump.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/XMLSerializer.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/XMLSerializer.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/XMLSerializer.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/util/XMLSerializer.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/windows/WinSysEnv.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/windows/WinSysEnv.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/windows/WinSysEnv.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/windows/WinSysEnv.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/AbsCleanTask.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/AbsCleanTask.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/AbsCleanTask.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/AbsCleanTask.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/AbsDeployerLog.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/AbsDeployerLog.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/AbsDeployerLog.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/AbsDeployerLog.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/DeployerLog.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/DeployerLog.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/DeployerLog.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/DeployerLog.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/LogEntryImpl.java b/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/LogEntryImpl.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/LogEntryImpl.java rename to modules/libraries/jonas-commons/src/main/java/org/ow2/jonas/lib/work/LogEntryImpl.java diff --git a/jonas/modules/libraries/jonas-commons/src/main/resources/META-INF/jonas-commons.bnd b/modules/libraries/jonas-commons/src/main/resources/META-INF/jonas-commons.bnd similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/resources/META-INF/jonas-commons.bnd rename to modules/libraries/jonas-commons/src/main/resources/META-INF/jonas-commons.bnd diff --git a/jonas/modules/libraries/jonas-commons/src/main/resources/metadata.xml b/modules/libraries/jonas-commons/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/resources/metadata.xml rename to modules/libraries/jonas-commons/src/main/resources/metadata.xml diff --git a/jonas/modules/libraries/jonas-commons/src/main/resources/org/ow2/jonas/lib/loader/mapping/classloader-default-filtering-mapping.xml b/modules/libraries/jonas-commons/src/main/resources/org/ow2/jonas/lib/loader/mapping/classloader-default-filtering-mapping.xml similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/main/resources/org/ow2/jonas/lib/loader/mapping/classloader-default-filtering-mapping.xml rename to modules/libraries/jonas-commons/src/main/resources/org/ow2/jonas/lib/loader/mapping/classloader-default-filtering-mapping.xml diff --git a/jonas/modules/libraries/jonas-commons/src/test/java/org/ow2/jonas/lib/cpmanager/JarListTestCase.java b/modules/libraries/jonas-commons/src/test/java/org/ow2/jonas/lib/cpmanager/JarListTestCase.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/test/java/org/ow2/jonas/lib/cpmanager/JarListTestCase.java rename to modules/libraries/jonas-commons/src/test/java/org/ow2/jonas/lib/cpmanager/JarListTestCase.java diff --git a/jonas/modules/libraries/jonas-commons/src/test/java/org/ow2/jonas/lib/loader/FilteringClassLoaderTestCase.java b/modules/libraries/jonas-commons/src/test/java/org/ow2/jonas/lib/loader/FilteringClassLoaderTestCase.java similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/test/java/org/ow2/jonas/lib/loader/FilteringClassLoaderTestCase.java rename to modules/libraries/jonas-commons/src/test/java/org/ow2/jonas/lib/loader/FilteringClassLoaderTestCase.java diff --git a/jonas/modules/libraries/jonas-commons/src/test/resources/test-app-filters-wildcard-forbidden.xml b/modules/libraries/jonas-commons/src/test/resources/test-app-filters-wildcard-forbidden.xml similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/test/resources/test-app-filters-wildcard-forbidden.xml rename to modules/libraries/jonas-commons/src/test/resources/test-app-filters-wildcard-forbidden.xml diff --git a/jonas/modules/libraries/jonas-commons/src/test/resources/test-app-filters.xml b/modules/libraries/jonas-commons/src/test/resources/test-app-filters.xml similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/test/resources/test-app-filters.xml rename to modules/libraries/jonas-commons/src/test/resources/test-app-filters.xml diff --git a/jonas/modules/libraries/jonas-commons/src/test/resources/test-default-filters.xml b/modules/libraries/jonas-commons/src/test/resources/test-default-filters.xml similarity index 100% rename from jonas/modules/libraries/jonas-commons/src/test/resources/test-default-filters.xml rename to modules/libraries/jonas-commons/src/test/resources/test-default-filters.xml diff --git a/jonas/modules/libraries/jonas-deployment/pom.xml b/modules/libraries/jonas-deployment/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-deployment/pom.xml rename to modules/libraries/jonas-deployment/pom.xml diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/AppClientDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/AppClientDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/AppClientDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/AppClientDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/AppClientSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/AppClientSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/AppClientSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/AppClientSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/ClientContainerDeploymentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/ClientContainerDeploymentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/ClientContainerDeploymentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/ClientContainerDeploymentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/ClientContainerDeploymentDescException.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/ClientContainerDeploymentDescException.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/ClientContainerDeploymentDescException.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/ClientContainerDeploymentDescException.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/JonasAppClientDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/JonasAppClientDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/JonasAppClientDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/JonasAppClientDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/JonasAppClientSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/JonasAppClientSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/JonasAppClientSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/JonasAppClientSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/lib/ClientDeploymentDescManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/lib/ClientDeploymentDescManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/lib/ClientDeploymentDescManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/lib/ClientDeploymentDescManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/ApplicationClientRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/ApplicationClientRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/ApplicationClientRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/ApplicationClientRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/JonasClientRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/JonasClientRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/JonasClientRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/JonasClientRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/JonasSecurityRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/JonasSecurityRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/JonasSecurityRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/rules/JonasSecurityRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/wrapper/ClientManagerWrapper.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/wrapper/ClientManagerWrapper.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/wrapper/ClientManagerWrapper.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/wrapper/ClientManagerWrapper.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/ApplicationClient.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/ApplicationClient.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/ApplicationClient.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/ApplicationClient.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/JonasClient.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/JonasClient.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/JonasClient.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/JonasClient.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/JonasSecurity.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/JonasSecurity.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/JonasSecurity.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/client/xml/JonasSecurity.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonConfiguration.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonConfiguration.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonConfiguration.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonConfiguration.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonConfigurationException.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonConfigurationException.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonConfigurationException.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonConfigurationException.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/ClusterDaemonSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/lib/ClusterDaemonConfigurationManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/lib/ClusterDaemonConfigurationManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/lib/ClusterDaemonConfigurationManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/lib/ClusterDaemonConfigurationManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/ClusterDaemonRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/ClusterDaemonRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/ClusterDaemonRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/ClusterDaemonRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/DiscoveryRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/DiscoveryRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/DiscoveryRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/DiscoveryRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/ServerRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/ServerRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/ServerRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/rules/ServerRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/ClusterDaemon.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/ClusterDaemon.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/ClusterDaemon.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/ClusterDaemon.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/Discovery.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/Discovery.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/Discovery.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/Discovery.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/Server.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/Server.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/Server.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/clusterd/xml/Server.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/AbsDeploymentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/AbsDeploymentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/AbsDeploymentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/AbsDeploymentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/CommonsDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/CommonsDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/CommonsDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/CommonsDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/CommonsSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/CommonsSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/CommonsSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/CommonsSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/DeploymentDescException.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/DeploymentDescException.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/DeploymentDescException.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/DeploymentDescException.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/DescriptionGroupDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/DescriptionGroupDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/DescriptionGroupDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/DescriptionGroupDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EjbLocalRefDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EjbLocalRefDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EjbLocalRefDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EjbLocalRefDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EjbRefDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EjbRefDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EjbRefDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EjbRefDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EnvEntryDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EnvEntryDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EnvEntryDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/EnvEntryDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/HandlerDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/HandlerDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/HandlerDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/HandlerDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/JndiEnvRefsGroupDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/JndiEnvRefsGroupDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/JndiEnvRefsGroupDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/JndiEnvRefsGroupDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/MessageDestinationRefDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/MessageDestinationRefDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/MessageDestinationRefDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/MessageDestinationRefDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/PersistenceUnitRefDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/PersistenceUnitRefDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/PersistenceUnitRefDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/PersistenceUnitRefDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/ResourceEnvRefDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/ResourceEnvRefDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/ResourceEnvRefDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/ResourceEnvRefDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/ResourceRefDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/ResourceRefDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/ResourceRefDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/ResourceRefDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/SecurityRoleRefDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/SecurityRoleRefDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/SecurityRoleRefDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/SecurityRoleRefDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JDigester.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JDigester.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JDigester.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JDigester.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JEntityResolverWithDigester.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JEntityResolverWithDigester.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JEntityResolverWithDigester.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JEntityResolverWithDigester.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JErrorHandler.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JErrorHandler.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JErrorHandler.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/JErrorHandler.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/NoTrimCallMethodRule.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/NoTrimCallMethodRule.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/NoTrimCallMethodRule.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/digester/NoTrimCallMethodRule.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/AbsDeploymentDescManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/AbsDeploymentDescManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/AbsDeploymentDescManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/AbsDeploymentDescManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/DeploymentDescManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/DeploymentDescManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/DeploymentDescManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/DeploymentDescManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JEntityResolver.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JEntityResolver.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JEntityResolver.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JEntityResolver.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JLSInput.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JLSInput.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JLSInput.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JLSInput.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JLSResourceResolver.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JLSResourceResolver.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JLSResourceResolver.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JLSResourceResolver.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JavaType.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JavaType.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JavaType.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/lib/JavaType.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/AnonymousQNameRule.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/AnonymousQNameRule.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/AnonymousQNameRule.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/AnonymousQNameRule.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EjbLocalRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EjbLocalRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EjbLocalRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EjbLocalRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EjbRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EjbRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EjbRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EjbRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EnvEntryRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EnvEntryRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EnvEntryRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EnvEntryRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EnvironmentRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EnvironmentRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EnvironmentRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/EnvironmentRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/HandlerRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/HandlerRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/HandlerRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/HandlerRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/IconRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/IconRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/IconRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/IconRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/InitParamRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/InitParamRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/InitParamRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/InitParamRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JRuleSetBase.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JRuleSetBase.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JRuleSetBase.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JRuleSetBase.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasCustomParamRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasCustomParamRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasCustomParamRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasCustomParamRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasEjbRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasEjbRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasEjbRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasEjbRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasEnvironmentRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasEnvironmentRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasEnvironmentRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasEnvironmentRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasInitParamRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasInitParamRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasInitParamRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasInitParamRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasMessageDestinationRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasMessageDestinationRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasMessageDestinationRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasMessageDestinationRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasMessageDestinationRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasMessageDestinationRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasMessageDestinationRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasMessageDestinationRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasPortComponentRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasPortComponentRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasPortComponentRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasPortComponentRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasResourceEnvRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasResourceEnvRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasResourceEnvRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasResourceEnvRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasResourceRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasResourceRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasResourceRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasResourceRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasServiceRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasServiceRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasServiceRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/JonasServiceRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/MessageDestinationRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/MessageDestinationRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/MessageDestinationRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/MessageDestinationRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/MessageDestinationRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/MessageDestinationRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/MessageDestinationRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/MessageDestinationRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/PortComponentRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/PortComponentRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/PortComponentRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/PortComponentRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/QNameRule.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/QNameRule.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/QNameRule.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/QNameRule.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ResourceEnvRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ResourceEnvRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ResourceEnvRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ResourceEnvRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ResourceRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ResourceRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ResourceRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ResourceRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/RunAsRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/RunAsRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/RunAsRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/RunAsRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SecurityRoleRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SecurityRoleRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SecurityRoleRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SecurityRoleRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SecurityRoleRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SecurityRoleRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SecurityRoleRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SecurityRoleRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ServiceQnameRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ServiceQnameRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ServiceQnameRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ServiceQnameRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ServiceRefRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ServiceRefRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ServiceRefRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/ServiceRefRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SoapHeaderRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SoapHeaderRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SoapHeaderRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/SoapHeaderRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/WsdlPortRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/WsdlPortRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/WsdlPortRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/rules/WsdlPortRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/util/ResourceHelper.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/util/ResourceHelper.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/util/ResourceHelper.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/util/ResourceHelper.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsDescriptionElement.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsDescriptionElement.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsDescriptionElement.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsDescriptionElement.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsElement.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsElement.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsElement.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsElement.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsEnvironmentElement.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsEnvironmentElement.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsEnvironmentElement.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsEnvironmentElement.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsJonasEnvironmentElement.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsJonasEnvironmentElement.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsJonasEnvironmentElement.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsJonasEnvironmentElement.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsJonasParam.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsJonasParam.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsJonasParam.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/AbsJonasParam.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/DescriptionGroupXml.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/DescriptionGroupXml.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/DescriptionGroupXml.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/DescriptionGroupXml.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EjbLocalRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EjbLocalRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EjbLocalRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EjbLocalRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EjbRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EjbRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EjbRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EjbRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Element.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Element.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Element.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Element.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EnvEntry.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EnvEntry.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EnvEntry.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/EnvEntry.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Handler.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Handler.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Handler.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Handler.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Icon.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Icon.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Icon.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Icon.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/InitParam.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/InitParam.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/InitParam.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/InitParam.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JLinkedList.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JLinkedList.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JLinkedList.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JLinkedList.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JndiEnvRefsGroupXml.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JndiEnvRefsGroupXml.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JndiEnvRefsGroupXml.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JndiEnvRefsGroupXml.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasCallProperty.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasCallProperty.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasCallProperty.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasCallProperty.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasEjbRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasEjbRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasEjbRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasEjbRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasInitParam.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasInitParam.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasInitParam.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasInitParam.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasJndiEnvRefsGroupXml.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasJndiEnvRefsGroupXml.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasJndiEnvRefsGroupXml.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasJndiEnvRefsGroupXml.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasMessageDestination.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasMessageDestination.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasMessageDestination.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasMessageDestination.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasMessageDestinationRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasMessageDestinationRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasMessageDestinationRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasMessageDestinationRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasParam.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasParam.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasParam.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasParam.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasPortComponentRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasPortComponentRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasPortComponentRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasPortComponentRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasResource.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasResource.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasResource.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasResource.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasResourceEnv.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasResourceEnv.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasResourceEnv.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasResourceEnv.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasServiceRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasServiceRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasServiceRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasServiceRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasStubProperty.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasStubProperty.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasStubProperty.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/JonasStubProperty.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/MessageDestination.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/MessageDestination.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/MessageDestination.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/MessageDestination.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/MessageDestinationRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/MessageDestinationRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/MessageDestinationRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/MessageDestinationRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/PersistenceUnitRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/PersistenceUnitRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/PersistenceUnitRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/PersistenceUnitRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/PortComponentRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/PortComponentRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/PortComponentRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/PortComponentRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Qname.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Qname.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Qname.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/Qname.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ResourceEnvRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ResourceEnvRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ResourceEnvRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ResourceEnvRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ResourceRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ResourceRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ResourceRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ResourceRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/RunAs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/RunAs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/RunAs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/RunAs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/SecurityRole.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/SecurityRole.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/SecurityRole.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/SecurityRole.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/SecurityRoleRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/SecurityRoleRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/SecurityRoleRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/SecurityRoleRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ServiceRef.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ServiceRef.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ServiceRef.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/ServiceRef.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/TopLevelElement.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/TopLevelElement.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/TopLevelElement.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/common/xml/TopLevelElement.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainMap.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainMap.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainMap.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainMap.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainMapException.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainMapException.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainMapException.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainMapException.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/DomainSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/lib/DomainMapManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/lib/DomainMapManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/lib/DomainMapManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/lib/DomainMapManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ClusterDaemonRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ClusterDaemonRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ClusterDaemonRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ClusterDaemonRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ClusterRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ClusterRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ClusterRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ClusterRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/DomainRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/DomainRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/DomainRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/DomainRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/LocationRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/LocationRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/LocationRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/LocationRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ServerRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ServerRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ServerRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/rules/ServerRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/wrapper/DomainManagerWrapper.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/wrapper/DomainManagerWrapper.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/wrapper/DomainManagerWrapper.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/wrapper/DomainManagerWrapper.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Cluster.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Cluster.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Cluster.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Cluster.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/ClusterDaemon.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/ClusterDaemon.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/ClusterDaemon.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/ClusterDaemon.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Domain.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Domain.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Domain.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Domain.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Location.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Location.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Location.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Location.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Server.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Server.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Server.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/domain/xml/Server.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDeploymentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDeploymentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDeploymentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDeploymentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDeploymentDescException.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDeploymentDescException.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDeploymentDescException.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarDeploymentDescException.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/EarSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/JonasEarSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/JonasEarSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/JonasEarSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/JonasEarSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/lib/EarDeploymentDescManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/lib/EarDeploymentDescManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/lib/EarDeploymentDescManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/lib/EarDeploymentDescManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/ApplicationRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/ApplicationRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/ApplicationRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/ApplicationRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasApplicationRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasApplicationRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasApplicationRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasApplicationRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasSecurityRoleMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasSecurityRoleMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasSecurityRoleMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasSecurityRoleMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasSecurityRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasSecurityRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasSecurityRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/JonasSecurityRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/ModuleRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/ModuleRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/ModuleRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/ModuleRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/SecurityRoleRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/SecurityRoleRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/SecurityRoleRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/SecurityRoleRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/WebRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/WebRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/WebRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/rules/WebRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/wrapper/EarManagerWrapper.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/wrapper/EarManagerWrapper.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/wrapper/EarManagerWrapper.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/wrapper/EarManagerWrapper.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Application.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Application.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Application.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Application.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/JonasApplication.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/JonasApplication.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/JonasApplication.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/JonasApplication.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/JonasSecurity.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/JonasSecurity.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/JonasSecurity.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/JonasSecurity.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Module.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Module.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Module.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Module.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/SecurityRole.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/SecurityRole.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/SecurityRole.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/SecurityRole.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/SecurityRoleMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/SecurityRoleMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/SecurityRoleMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/SecurityRoleMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Web.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Web.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Web.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ear/xml/Web.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ActivationConfigDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ActivationConfigDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ActivationConfigDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ActivationConfigDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ActivationConfigPropertyDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ActivationConfigPropertyDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ActivationConfigPropertyDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ActivationConfigPropertyDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/BeanDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/BeanDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/BeanDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/BeanDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/CommonMethodDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/CommonMethodDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/CommonMethodDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/CommonMethodDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDescEjb1_1.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDescEjb1_1.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDescEjb1_1.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDescEjb1_1.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDescEjb2.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDescEjb2.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDescEjb2.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/DeploymentDescEjb2.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbRelationDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbRelationDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbRelationDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbRelationDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbRelationshipRoleDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbRelationshipRoleDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbRelationshipRoleDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbRelationshipRoleDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbjarDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbjarDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbjarDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbjarDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbjarSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbjarSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbjarSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EjbjarSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityBmpDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityBmpDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityBmpDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityBmpDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmp1Desc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmp1Desc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmp1Desc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmp1Desc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmp2Desc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmp2Desc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmp2Desc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmp2Desc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmpDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmpDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmpDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityCmpDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityJdbcCmp1Desc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityJdbcCmp1Desc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityJdbcCmp1Desc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityJdbcCmp1Desc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityJdbcCmp2Desc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityJdbcCmp2Desc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityJdbcCmp2Desc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/EntityJdbcCmp2Desc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ExcludeListDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ExcludeListDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ExcludeListDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ExcludeListDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/FieldDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/FieldDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/FieldDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/FieldDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/FieldJdbcDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/FieldJdbcDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/FieldJdbcDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/FieldJdbcDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/JonasEjbjarDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/JonasEjbjarDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/JonasEjbjarDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/JonasEjbjarDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/JonasEjbjarSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/JonasEjbjarSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/JonasEjbjarSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/JonasEjbjarSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MessageDrivenDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MessageDrivenDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MessageDrivenDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MessageDrivenDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodCmp2Desc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodCmp2Desc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodCmp2Desc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodCmp2Desc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodJdbcCmp1Desc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodJdbcCmp1Desc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodJdbcCmp1Desc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodJdbcCmp1Desc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodPermissionDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodPermissionDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodPermissionDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/MethodPermissionDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionStatefulDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionStatefulDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionStatefulDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionStatefulDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionStatelessDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionStatelessDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionStatelessDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/SessionStatelessDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTAbstractSchemaName.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTAbstractSchemaName.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTAbstractSchemaName.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTAbstractSchemaName.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTAggregateSelectExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTAggregateSelectExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTAggregateSelectExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTAggregateSelectExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticFactor.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticFactor.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticFactor.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticFactor.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticLiteral.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticLiteral.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticLiteral.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticLiteral.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticTerm.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticTerm.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticTerm.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTArithmeticTerm.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBetweenExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBetweenExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBetweenExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBetweenExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBooleanExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBooleanExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBooleanExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBooleanExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBooleanLiteral.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBooleanLiteral.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBooleanLiteral.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTBooleanLiteral.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCmpPathExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCmpPathExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCmpPathExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCmpPathExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionMemberDeclaration.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionMemberDeclaration.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionMemberDeclaration.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionMemberDeclaration.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionMemberExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionMemberExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionMemberExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionMemberExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionValuedPathExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionValuedPathExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionValuedPathExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTCollectionValuedPathExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTComparisonExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTComparisonExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTComparisonExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTComparisonExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalFactor.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalFactor.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalFactor.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalFactor.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalTerm.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalTerm.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalTerm.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTConditionalTerm.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTDatetimeExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTDatetimeExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTDatetimeExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTDatetimeExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEJBQL.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEJBQL.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEJBQL.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEJBQL.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEmptyCollectionComparisonExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEmptyCollectionComparisonExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEmptyCollectionComparisonExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEmptyCollectionComparisonExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEntityBeanExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEntityBeanExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEntityBeanExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTEntityBeanExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFloatingPointLiteral.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFloatingPointLiteral.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFloatingPointLiteral.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFloatingPointLiteral.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFromClause.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFromClause.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFromClause.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFromClause.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFunctionsReturningNumerics.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFunctionsReturningNumerics.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFunctionsReturningNumerics.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFunctionsReturningNumerics.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFunctionsReturningStrings.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFunctionsReturningStrings.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFunctionsReturningStrings.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTFunctionsReturningStrings.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIdentificationVariable.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIdentificationVariable.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIdentificationVariable.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIdentificationVariable.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIdentifier.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIdentifier.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIdentifier.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIdentifier.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTInExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTInExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTInExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTInExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTInputParameter.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTInputParameter.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTInputParameter.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTInputParameter.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIntegerLiteral.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIntegerLiteral.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIntegerLiteral.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTIntegerLiteral.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLikeExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLikeExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLikeExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLikeExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLimitClause.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLimitClause.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLimitClause.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLimitClause.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLimitExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLimitExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLimitExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLimitExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLiteral.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLiteral.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLiteral.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTLiteral.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTNullComparisonExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTNullComparisonExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTNullComparisonExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTNullComparisonExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTOrderByClause.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTOrderByClause.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTOrderByClause.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTOrderByClause.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTOrderByItem.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTOrderByItem.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTOrderByItem.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTOrderByItem.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTPath.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTPath.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTPath.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTPath.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTRangeVariableDeclaration.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTRangeVariableDeclaration.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTRangeVariableDeclaration.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTRangeVariableDeclaration.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSelectClause.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSelectClause.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSelectClause.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSelectClause.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSelectExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSelectExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSelectExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSelectExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSingleValuedCmrPathExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSingleValuedCmrPathExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSingleValuedCmrPathExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSingleValuedCmrPathExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSingleValuedPathExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSingleValuedPathExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSingleValuedPathExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTSingleValuedPathExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTStringExpression.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTStringExpression.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTStringExpression.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTStringExpression.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTStringLiteral.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTStringLiteral.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTStringLiteral.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTStringLiteral.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTWhereClause.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTWhereClause.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTWhereClause.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ASTWhereClause.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQL.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQL.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQL.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQL.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQL.jjt b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQL.jjt similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQL.jjt rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQL.jjt diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLConstants.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLConstants.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLConstants.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLConstants.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLTokenManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLTokenManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLTokenManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLTokenManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLTreeConstants.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLTreeConstants.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLTreeConstants.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLTreeConstants.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLVisitor.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLVisitor.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLVisitor.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/EJBQLVisitor.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/JJTEJBQLState.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/JJTEJBQLState.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/JJTEJBQLState.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/JJTEJBQLState.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/Node.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/Node.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/Node.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/Node.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ParseException.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ParseException.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ParseException.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/ParseException.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/README b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/README similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/README rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/README diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/SimpleCharStream.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/SimpleCharStream.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/SimpleCharStream.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/SimpleCharStream.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/SimpleNode.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/SimpleNode.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/SimpleNode.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/SimpleNode.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/Token.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/Token.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/Token.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/Token.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/TokenMgrError.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/TokenMgrError.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/TokenMgrError.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/TokenMgrError.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/bnf_ejbql_2_0.txt b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/bnf_ejbql_2_0.txt similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/bnf_ejbql_2_0.txt rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/bnf_ejbql_2_0.txt diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/bnf_ejbql_2_1.txt b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/bnf_ejbql_2_1.txt similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/bnf_ejbql_2_1.txt rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/bnf_ejbql_2_1.txt diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/build.sh b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/build.sh similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/build.sh rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/ejbql/build.sh diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/lib/EjbDeploymentDescManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/lib/EjbDeploymentDescManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/lib/EjbDeploymentDescManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/lib/EjbDeploymentDescManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/lib/util/ClusterUtil.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/lib/util/ClusterUtil.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/lib/util/ClusterUtil.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/lib/util/ClusterUtil.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ActivationConfigPropertyRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ActivationConfigPropertyRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ActivationConfigPropertyRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ActivationConfigPropertyRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ActivationConfigRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ActivationConfigRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ActivationConfigRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ActivationConfigRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/AsContextRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/AsContextRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/AsContextRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/AsContextRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/AssemblyDescriptorRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/AssemblyDescriptorRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/AssemblyDescriptorRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/AssemblyDescriptorRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterArrayPropertyRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterArrayPropertyRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterArrayPropertyRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterArrayPropertyRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterPropertiesRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterPropertiesRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterPropertiesRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterPropertiesRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterSimplePropertyRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterSimplePropertyRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterSimplePropertyRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ClusterSimplePropertyRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmpFieldJdbcMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmpFieldJdbcMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmpFieldJdbcMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmpFieldJdbcMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmpFieldRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmpFieldRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmpFieldRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmpFieldRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmrFieldRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmrFieldRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmrFieldRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/CmrFieldRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ContainerTransactionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ContainerTransactionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ContainerTransactionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ContainerTransactionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbJarRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbJarRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbJarRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbJarRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbRelationRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbRelationRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbRelationRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbRelationRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbRelationshipRoleRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbRelationshipRoleRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbRelationshipRoleRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EjbRelationshipRoleRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EnterpriseBeansRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EnterpriseBeansRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EnterpriseBeansRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EnterpriseBeansRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EntityRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EntityRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EntityRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/EntityRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ExcludeListRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ExcludeListRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ExcludeListRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ExcludeListRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/FinderMethodJdbcMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/FinderMethodJdbcMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/FinderMethodJdbcMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/FinderMethodJdbcMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ForeignKeyJdbcMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ForeignKeyJdbcMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ForeignKeyJdbcMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/ForeignKeyJdbcMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/IorSecurityConfigRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/IorSecurityConfigRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/IorSecurityConfigRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/IorSecurityConfigRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JdbcMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JdbcMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JdbcMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JdbcMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbJarRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbJarRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbJarRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbJarRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbRelationRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbRelationRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbRelationRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbRelationRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbRelationshipRoleRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbRelationshipRoleRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbRelationshipRoleRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEjbRelationshipRoleRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEntityRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEntityRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEntityRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasEntityRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasInitParamRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasInitParamRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasInitParamRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasInitParamRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMessageDrivenDestinationRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMessageDrivenDestinationRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMessageDrivenDestinationRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMessageDrivenDestinationRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMessageDrivenRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMessageDrivenRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMessageDrivenRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMessageDrivenRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMethodRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMethodRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMethodRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasMethodRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasRunAsMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasRunAsMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasRunAsMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasRunAsMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasSessionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasSessionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasSessionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/JonasSessionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MessageDrivenDestinationRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MessageDrivenDestinationRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MessageDrivenDestinationRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MessageDrivenDestinationRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MessageDrivenRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MessageDrivenRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MessageDrivenRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MessageDrivenRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodParamsRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodParamsRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodParamsRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodParamsRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodPermissionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodPermissionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodPermissionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodPermissionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/MethodRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/PoolRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/PoolRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/PoolRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/PoolRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/QueryMethodRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/QueryMethodRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/QueryMethodRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/QueryMethodRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/QueryRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/QueryRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/QueryRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/QueryRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/RelationshipRoleSourceRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/RelationshipRoleSourceRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/RelationshipRoleSourceRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/RelationshipRoleSourceRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/RelationshipsRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/RelationshipsRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/RelationshipsRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/RelationshipsRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SasContextRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SasContextRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SasContextRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SasContextRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SecurityIdentityRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SecurityIdentityRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SecurityIdentityRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SecurityIdentityRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SessionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SessionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SessionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/SessionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/TransportConfigRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/TransportConfigRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/TransportConfigRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/TransportConfigRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/UseCallerIdentityRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/UseCallerIdentityRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/UseCallerIdentityRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/rules/UseCallerIdentityRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/wrapper/EjbManagerWrapper.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/wrapper/EjbManagerWrapper.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/wrapper/EjbManagerWrapper.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/wrapper/EjbManagerWrapper.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ActivationConfig.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ActivationConfig.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ActivationConfig.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ActivationConfig.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ActivationConfigProperty.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ActivationConfigProperty.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ActivationConfigProperty.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ActivationConfigProperty.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/AsContextMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/AsContextMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/AsContextMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/AsContextMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/AssemblyDescriptor.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/AssemblyDescriptor.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/AssemblyDescriptor.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/AssemblyDescriptor.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmpField.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmpField.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmpField.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmpField.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmpFieldJdbcMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmpFieldJdbcMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmpFieldJdbcMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmpFieldJdbcMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmrField.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmrField.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmrField.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CmrField.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CommonEjb.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CommonEjb.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CommonEjb.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CommonEjb.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CommonEjbXml.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CommonEjbXml.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CommonEjbXml.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/CommonEjbXml.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ContainerTransaction.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ContainerTransaction.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ContainerTransaction.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ContainerTransaction.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbJar.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbJar.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbJar.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbJar.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbRelation.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbRelation.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbRelation.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbRelation.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbRelationshipRole.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbRelationshipRole.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbRelationshipRole.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EjbRelationshipRole.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EnterpriseBeans.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EnterpriseBeans.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EnterpriseBeans.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/EnterpriseBeans.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Entity.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Entity.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Entity.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Entity.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ExcludeList.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ExcludeList.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ExcludeList.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ExcludeList.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/FinderMethodJdbcMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/FinderMethodJdbcMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/FinderMethodJdbcMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/FinderMethodJdbcMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ForeignKeyJdbcMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ForeignKeyJdbcMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ForeignKeyJdbcMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/ForeignKeyJdbcMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/IorSecurityConfigMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/IorSecurityConfigMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/IorSecurityConfigMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/IorSecurityConfigMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JdbcMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JdbcMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JdbcMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JdbcMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasCommonEjb.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasCommonEjb.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasCommonEjb.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasCommonEjb.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasCommonEjbXml.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasCommonEjbXml.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasCommonEjbXml.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasCommonEjbXml.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbJar.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbJar.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbJar.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbJar.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbRelation.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbRelation.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbRelation.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbRelation.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbRelationshipRole.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbRelationshipRole.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbRelationshipRole.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEjbRelationshipRole.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEntity.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEntity.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEntity.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasEntity.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasInitParam.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasInitParam.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasInitParam.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasInitParam.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMessageDriven.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMessageDriven.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMessageDriven.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMessageDriven.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMessageDrivenDestination.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMessageDrivenDestination.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMessageDrivenDestination.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMessageDrivenDestination.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMethod.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMethod.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMethod.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasMethod.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasRunAsMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasRunAsMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasRunAsMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasRunAsMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasSession.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasSession.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasSession.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/JonasSession.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MessageDriven.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MessageDriven.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MessageDriven.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MessageDriven.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MessageDrivenDestination.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MessageDrivenDestination.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MessageDrivenDestination.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MessageDrivenDestination.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Method.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Method.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Method.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Method.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MethodParams.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MethodParams.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MethodParams.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MethodParams.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MethodPermission.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MethodPermission.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MethodPermission.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/MethodPermission.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Query.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Query.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Query.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Query.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/QueryMethod.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/QueryMethod.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/QueryMethod.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/QueryMethod.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/RelationshipRoleSource.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/RelationshipRoleSource.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/RelationshipRoleSource.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/RelationshipRoleSource.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Relationships.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Relationships.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Relationships.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Relationships.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/SasContextMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/SasContextMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/SasContextMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/SasContextMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/SecurityIdentity.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/SecurityIdentity.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/SecurityIdentity.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/SecurityIdentity.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Session.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Session.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Session.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/Session.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/TransportConfigMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/TransportConfigMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/TransportConfigMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/TransportConfigMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/UseCallerIdentity.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/UseCallerIdentity.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/UseCallerIdentity.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ejb/xml/UseCallerIdentity.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ActivationspecDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ActivationspecDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ActivationspecDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ActivationspecDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/AdminobjectDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/AdminobjectDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/AdminobjectDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/AdminobjectDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/AuthenticationMechanismDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/AuthenticationMechanismDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/AuthenticationMechanismDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/AuthenticationMechanismDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConfigPropertyDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConfigPropertyDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConfigPropertyDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConfigPropertyDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectionDefinitionDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectionDefinitionDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectionDefinitionDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectionDefinitionDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ConnectorSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/IconDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/IconDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/IconDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/IconDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/InboundResourceadapterDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/InboundResourceadapterDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/InboundResourceadapterDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/InboundResourceadapterDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JdbcConnParamsDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JdbcConnParamsDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JdbcConnParamsDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JdbcConnParamsDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasActivationspecDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasActivationspecDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasActivationspecDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasActivationspecDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasAdminobjectDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasAdminobjectDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasAdminobjectDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasAdminobjectDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConfigPropertyDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConfigPropertyDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConfigPropertyDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConfigPropertyDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectionDefinitionDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectionDefinitionDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectionDefinitionDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectionDefinitionDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasConnectorSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasSecurityMappingDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasSecurityMappingDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasSecurityMappingDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/JonasSecurityMappingDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/LicenseDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/LicenseDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/LicenseDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/LicenseDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/MessageadapterDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/MessageadapterDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/MessageadapterDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/MessageadapterDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/MessagelistenerDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/MessagelistenerDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/MessagelistenerDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/MessagelistenerDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/OutboundResourceadapterDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/OutboundResourceadapterDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/OutboundResourceadapterDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/OutboundResourceadapterDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/PoolParamsDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/PoolParamsDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/PoolParamsDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/PoolParamsDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RarDeploymentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RarDeploymentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RarDeploymentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RarDeploymentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RarDeploymentDescException.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RarDeploymentDescException.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RarDeploymentDescException.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RarDeploymentDescException.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RequiredConfigPropertyDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RequiredConfigPropertyDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RequiredConfigPropertyDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/RequiredConfigPropertyDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ResourceadapterDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ResourceadapterDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ResourceadapterDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/ResourceadapterDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/SecurityEntryDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/SecurityEntryDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/SecurityEntryDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/SecurityEntryDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/SecurityPermissionDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/SecurityPermissionDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/SecurityPermissionDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/SecurityPermissionDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/TmConfigPropertyDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/TmConfigPropertyDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/TmConfigPropertyDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/TmConfigPropertyDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/TmParamsDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/TmParamsDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/TmParamsDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/TmParamsDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/Utility.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/Utility.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/Utility.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/Utility.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/lib/RarDeploymentDescManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/lib/RarDeploymentDescManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/lib/RarDeploymentDescManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/lib/RarDeploymentDescManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ActivationspecRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ActivationspecRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ActivationspecRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ActivationspecRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/AdminobjectRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/AdminobjectRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/AdminobjectRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/AdminobjectRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/AuthenticationMechanismRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/AuthenticationMechanismRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/AuthenticationMechanismRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/AuthenticationMechanismRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConfigPropertyRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConfigPropertyRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConfigPropertyRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConfigPropertyRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConnectionDefinitionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConnectionDefinitionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConnectionDefinitionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConnectionDefinitionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConnectorRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConnectorRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConnectorRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ConnectorRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/IconRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/IconRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/IconRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/IconRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/InboundResourceadapterRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/InboundResourceadapterRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/InboundResourceadapterRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/InboundResourceadapterRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JdbcConnParamsRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JdbcConnParamsRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JdbcConnParamsRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JdbcConnParamsRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasActivationspecRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasActivationspecRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasActivationspecRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasActivationspecRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasAdminobjectRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasAdminobjectRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasAdminobjectRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasAdminobjectRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConfigPropertyRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConfigPropertyRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConfigPropertyRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConfigPropertyRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConnectionDefinitionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConnectionDefinitionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConnectionDefinitionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConnectionDefinitionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConnectorRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConnectorRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConnectorRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasConnectorRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasSecurityMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasSecurityMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasSecurityMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/JonasSecurityMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/LicenseRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/LicenseRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/LicenseRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/LicenseRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/MessageadapterRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/MessageadapterRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/MessageadapterRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/MessageadapterRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/MessagelistenerRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/MessagelistenerRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/MessagelistenerRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/MessagelistenerRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/OutboundResourceadapterRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/OutboundResourceadapterRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/OutboundResourceadapterRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/OutboundResourceadapterRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/PoolParamsRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/PoolParamsRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/PoolParamsRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/PoolParamsRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/RequiredConfigPropertyRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/RequiredConfigPropertyRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/RequiredConfigPropertyRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/RequiredConfigPropertyRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ResourceadapterRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ResourceadapterRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ResourceadapterRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/ResourceadapterRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/SecurityEntryRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/SecurityEntryRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/SecurityEntryRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/SecurityEntryRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/SecurityPermissionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/SecurityPermissionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/SecurityPermissionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/SecurityPermissionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/TmConfigPropertyRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/TmConfigPropertyRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/TmConfigPropertyRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/TmConfigPropertyRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/TmParamsRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/TmParamsRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/TmParamsRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/rules/TmParamsRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/wrapper/RarManagerWrapper.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/wrapper/RarManagerWrapper.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/wrapper/RarManagerWrapper.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/wrapper/RarManagerWrapper.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Activationspec.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Activationspec.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Activationspec.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Activationspec.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Adminobject.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Adminobject.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Adminobject.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Adminobject.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/AuthenticationMechanism.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/AuthenticationMechanism.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/AuthenticationMechanism.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/AuthenticationMechanism.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/ConfigProperty.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/ConfigProperty.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/ConfigProperty.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/ConfigProperty.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/ConnectionDefinition.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/ConnectionDefinition.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/ConnectionDefinition.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/ConnectionDefinition.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Connector.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Connector.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Connector.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Connector.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Icon.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Icon.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Icon.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Icon.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/InboundResourceadapter.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/InboundResourceadapter.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/InboundResourceadapter.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/InboundResourceadapter.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JdbcConnParams.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JdbcConnParams.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JdbcConnParams.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JdbcConnParams.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasActivationspec.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasActivationspec.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasActivationspec.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasActivationspec.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasAdminobject.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasAdminobject.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasAdminobject.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasAdminobject.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConfigProperty.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConfigProperty.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConfigProperty.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConfigProperty.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConnectionDefinition.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConnectionDefinition.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConnectionDefinition.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConnectionDefinition.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConnector.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConnector.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConnector.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasConnector.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasSecurityMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasSecurityMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasSecurityMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/JonasSecurityMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/License.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/License.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/License.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/License.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Messageadapter.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Messageadapter.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Messageadapter.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Messageadapter.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Messagelistener.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Messagelistener.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Messagelistener.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Messagelistener.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/OutboundResourceadapter.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/OutboundResourceadapter.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/OutboundResourceadapter.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/OutboundResourceadapter.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/PoolParams.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/PoolParams.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/PoolParams.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/PoolParams.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/RequiredConfigProperty.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/RequiredConfigProperty.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/RequiredConfigProperty.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/RequiredConfigProperty.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Resourceadapter.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Resourceadapter.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Resourceadapter.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/Resourceadapter.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/SecurityEntry.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/SecurityEntry.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/SecurityEntry.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/SecurityEntry.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/SecurityPermission.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/SecurityPermission.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/SecurityPermission.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/SecurityPermission.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/TmConfigProperty.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/TmConfigProperty.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/TmConfigProperty.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/TmConfigProperty.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/TmParams.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/TmParams.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/TmParams.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/rar/xml/TmParams.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/JonasWebAppDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/JonasWebAppDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/JonasWebAppDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/JonasWebAppDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/JonasWebAppSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/JonasWebAppSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/JonasWebAppSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/JonasWebAppSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/MethodDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/MethodDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/MethodDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/MethodDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/MethodsDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/MethodsDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/MethodsDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/MethodsDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/Pattern.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/Pattern.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/Pattern.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/Pattern.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/PatternEntry.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/PatternEntry.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/PatternEntry.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/PatternEntry.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/SecurityConstraintListDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/SecurityConstraintListDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/SecurityConstraintListDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/SecurityConstraintListDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/SecurityRoleDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/SecurityRoleDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/SecurityRoleDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/SecurityRoleDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/ServletDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/ServletDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/ServletDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/ServletDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/TransportGuaranteeDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/TransportGuaranteeDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/TransportGuaranteeDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/TransportGuaranteeDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebAppDTDs.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebAppDTDs.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebAppDTDs.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebAppDTDs.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebAppSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebAppSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebAppSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebAppSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebContainerDeploymentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebContainerDeploymentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebContainerDeploymentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebContainerDeploymentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebContainerDeploymentDescException.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebContainerDeploymentDescException.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebContainerDeploymentDescException.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/WebContainerDeploymentDescException.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/lib/WarDeployableMetadataFactoryHolder.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/lib/WarDeployableMetadataFactoryHolder.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/lib/WarDeployableMetadataFactoryHolder.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/lib/WarDeployableMetadataFactoryHolder.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/lib/WebDeploymentDescManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/lib/WebDeploymentDescManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/lib/WebDeploymentDescManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/lib/WebDeploymentDescManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/AuthConstraintRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/AuthConstraintRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/AuthConstraintRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/AuthConstraintRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/DistributableRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/DistributableRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/DistributableRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/DistributableRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/JonasServletRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/JonasServletRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/JonasServletRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/JonasServletRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/JonasWebAppRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/JonasWebAppRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/JonasWebAppRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/JonasWebAppRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/SecurityConstraintRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/SecurityConstraintRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/SecurityConstraintRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/SecurityConstraintRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/ServletMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/ServletMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/ServletMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/ServletMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/ServletRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/ServletRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/ServletRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/ServletRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/UserDataConstraintRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/UserDataConstraintRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/UserDataConstraintRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/UserDataConstraintRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/WebAppRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/WebAppRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/WebAppRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/WebAppRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/WebResourceCollectionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/WebResourceCollectionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/WebResourceCollectionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/rules/WebResourceCollectionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/wrapper/WebManagerWrapper.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/wrapper/WebManagerWrapper.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/wrapper/WebManagerWrapper.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/wrapper/WebManagerWrapper.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/AuthConstraint.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/AuthConstraint.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/AuthConstraint.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/AuthConstraint.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/JonasServlet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/JonasServlet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/JonasServlet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/JonasServlet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/JonasWebApp.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/JonasWebApp.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/JonasWebApp.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/JonasWebApp.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/SecurityConstraint.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/SecurityConstraint.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/SecurityConstraint.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/SecurityConstraint.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/Servlet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/Servlet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/Servlet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/Servlet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/ServletMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/ServletMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/ServletMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/ServletMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/UserDataConstraint.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/UserDataConstraint.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/UserDataConstraint.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/UserDataConstraint.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/WebApp.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/WebApp.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/WebApp.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/WebApp.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/WebResourceCollection.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/WebResourceCollection.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/WebResourceCollection.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/web/xml/WebResourceCollection.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JaxRpcPortComponentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JaxRpcPortComponentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JaxRpcPortComponentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JaxRpcPortComponentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JaxrpcMappingSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JaxrpcMappingSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JaxrpcMappingSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JaxrpcMappingSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JonasWsSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JonasWsSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JonasWsSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/JonasWsSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/MappingFile.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/MappingFile.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/MappingFile.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/MappingFile.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentDescFactory.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentDescFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentDescFactory.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentDescFactory.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentRefDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentRefDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentRefDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/PortComponentRefDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/SSBPortComponentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/SSBPortComponentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/SSBPortComponentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/SSBPortComponentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/ServiceDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/ServiceDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/ServiceDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/ServiceDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/ServiceRefDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/ServiceRefDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/ServiceRefDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/ServiceRefDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDLFile.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDLFile.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDLFile.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDLFile.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDeploymentDesc.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDeploymentDesc.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDeploymentDesc.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDeploymentDesc.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDeploymentDescException.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDeploymentDescException.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDeploymentDescException.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WSDeploymentDescException.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WsSchemas.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WsSchemas.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WsSchemas.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/WsSchemas.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/lib/MappingFileManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/lib/MappingFileManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/lib/MappingFileManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/lib/MappingFileManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/lib/WSDeploymentDescManager.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/lib/WSDeploymentDescManager.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/lib/WSDeploymentDescManager.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/lib/WSDeploymentDescManager.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/AnonymousTypeQnameRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/AnonymousTypeQnameRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/AnonymousTypeQnameRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/AnonymousTypeQnameRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JavaWsdlMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JavaWsdlMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JavaWsdlMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JavaWsdlMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JavaXmlTypeMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JavaXmlTypeMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JavaXmlTypeMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JavaXmlTypeMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasPortComponentRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasPortComponentRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasPortComponentRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasPortComponentRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasWebserviceDescriptionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasWebserviceDescriptionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasWebserviceDescriptionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasWebserviceDescriptionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasWebservicesRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasWebservicesRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasWebservicesRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/JonasWebservicesRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/PackageMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/PackageMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/PackageMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/PackageMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/PortComponentRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/PortComponentRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/PortComponentRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/PortComponentRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/RootTypeQnameRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/RootTypeQnameRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/RootTypeQnameRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/RootTypeQnameRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/ServiceImplBeanRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/ServiceImplBeanRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/ServiceImplBeanRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/ServiceImplBeanRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/VariableMappingRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/VariableMappingRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/VariableMappingRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/VariableMappingRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/WebserviceDescriptionRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/WebserviceDescriptionRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/WebserviceDescriptionRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/WebserviceDescriptionRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/WebservicesRuleSet.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/WebservicesRuleSet.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/WebservicesRuleSet.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/rules/WebservicesRuleSet.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/wrapper/MappingFileManagerWrapper.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/wrapper/MappingFileManagerWrapper.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/wrapper/MappingFileManagerWrapper.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/wrapper/MappingFileManagerWrapper.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/wrapper/WSManagerWrapper.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/wrapper/WSManagerWrapper.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/wrapper/WSManagerWrapper.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/wrapper/WSManagerWrapper.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JavaWsdlMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JavaWsdlMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JavaWsdlMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JavaWsdlMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JavaXmlTypeMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JavaXmlTypeMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JavaXmlTypeMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JavaXmlTypeMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasPortComponent.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasPortComponent.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasPortComponent.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasPortComponent.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasWebserviceDescription.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasWebserviceDescription.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasWebserviceDescription.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasWebserviceDescription.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasWebservices.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasWebservices.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasWebservices.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/JonasWebservices.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/PackageMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/PackageMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/PackageMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/PackageMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/PortComponent.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/PortComponent.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/PortComponent.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/PortComponent.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/ServiceImplBean.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/ServiceImplBean.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/ServiceImplBean.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/ServiceImplBean.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/VariableMapping.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/VariableMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/VariableMapping.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/VariableMapping.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/WebserviceDescription.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/WebserviceDescription.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/WebserviceDescription.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/WebserviceDescription.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/Webservices.java b/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/Webservices.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/Webservices.java rename to modules/libraries/jonas-deployment/src/main/java/org/ow2/jonas/deployment/ws/xml/Webservices.java diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/META-INF/jonas-deployment.bnd b/modules/libraries/jonas-deployment/src/main/resources/META-INF/jonas-deployment.bnd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/META-INF/jonas-deployment.bnd rename to modules/libraries/jonas-deployment/src/main/resources/META-INF/jonas-deployment.bnd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/XMLSchema.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/XMLSchema.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/XMLSchema.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/XMLSchema.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_2.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_2.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_2.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_2.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_3.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_3.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_3.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_3.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_1_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_5.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_5.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_5.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/application-client_5.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_3_2.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_3_2.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_3_2.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_3_2.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_1_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_4_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_5_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_5_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_5_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/client/jonas-client_5_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_3.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_3.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_3.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/clusterd/jonas-clusterd_5_3.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/datatypes.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/datatypes.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/datatypes.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/datatypes.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_4_7.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_4_7.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_4_7.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_4_7.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_4_9.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_4_9.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_4_9.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_4_9.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_5_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_5_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_5_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_5_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_5_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_5_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_5_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/domain/jonas-domain_5_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_2.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_2.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_2.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_2.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_3.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_3.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_3.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_3.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_1_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_5.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_5.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_5.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/application_5.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_4_1_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_4_1_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_4_1_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_4_1_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_5_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_5_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_5_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_5_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_5_3.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_5_3.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_5_3.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ear/jonas-application_5_3.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_1_1.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_1_1.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_1_1.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_1_1.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_0.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_0.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_0.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_0.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_0_ws.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_0_ws.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_0_ws.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_0_ws.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_2_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_3_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_3_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_3_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_3_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_3_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_3_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_3_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/ejb-jar_3_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_2_4.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_2_4.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_2_4.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_2_4.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_2_5.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_2_5.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_2_5.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_2_5.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_0.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_0.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_0.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_0.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_2.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_2.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_2.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_2.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_2_ws.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_2_ws.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_2_ws.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_2_ws.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3_1.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3_1.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3_1.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3_1.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3_2.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3_2.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3_2.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_3_3_2.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_10.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_10.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_10.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_10.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_1_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_3.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_3.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_3.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_3.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_6.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_6.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_6.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_6.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_7.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_7.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_7.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_7.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_8.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_8.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_8.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_4_8.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ejb/jonas-ejb-jar_5_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/j2ee_1_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/j2ee_1_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/j2ee_1_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/j2ee_1_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/j2ee_web_services_client_1_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/j2ee_web_services_client_1_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/j2ee_web_services_client_1_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/j2ee_web_services_client_1_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_5.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_5.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_5.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_5.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_6.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_6.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_6.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_6.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_web_services_client_1_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_web_services_client_1_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_web_services_client_1_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_web_services_client_1_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_web_services_client_1_3.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_web_services_client_1_3.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_web_services_client_1_3.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/javaee_web_services_client_1_3.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-clusterd_5_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-clusterd_5_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-clusterd_5_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-clusterd_5_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-clusterd_5_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-clusterd_5_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-clusterd_5_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-clusterd_5_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-deployment-plan_0_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-deployment-plan_0_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-deployment-plan_0_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas-deployment-plan_0_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_1_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/jonas_j2ee_4_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/connector_1_0.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/connector_1_0.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/connector_1_0.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/connector_1_0.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/connector_1_5.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/connector_1_5.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/connector_1_5.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/connector_1_5.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_3_0.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_3_0.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_3_0.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_3_0.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_4_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_5_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_5_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_5_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_5_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_5_3.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_5_3.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_5_3.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/rar/jonas-connector_5_3.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/configure_1_1.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/configure_1_1.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/configure_1_1.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/configure_1_1.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/configure_1_2.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/configure_1_2.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/configure_1_2.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/configure_1_2.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_2_6.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_2_6.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_2_6.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_2_6.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_3_1.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_3_1.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_3_1.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_3_1.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_3_3.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_3_3.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_3_3.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_3_3.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_1_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_4_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_5_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_5_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_5_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_5_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_5_3.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_5_3.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_5_3.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jonas-web-app_5_3.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/jsp_2_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_2.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_2.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_2.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_2.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_3.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_3.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_3.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_3.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_5.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_5.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_5.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_2_5.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_3_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_3_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_3_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-app_3_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-common_3_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-common_3_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-common_3_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-common_3_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-facesconfig_1_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-facesconfig_1_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-facesconfig_1_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-facesconfig_1_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-jsptaglibrary_2_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-jsptaglibrary_2_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-jsptaglibrary_2_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/web/web-jsptaglibrary_2_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/I18n.properties b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/I18n.properties similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/I18n.properties rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/I18n.properties diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/I18n_fr.properties b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/I18n_fr.properties similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/I18n_fr.properties rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/I18n_fr.properties diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_jaxrpc_mapping_1_0.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_jaxrpc_mapping_1_0.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_jaxrpc_mapping_1_0.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_jaxrpc_mapping_1_0.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_jaxrpc_mapping_1_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_jaxrpc_mapping_1_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_jaxrpc_mapping_1_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_jaxrpc_mapping_1_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_web_services_1_0.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_web_services_1_0.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_web_services_1_0.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_web_services_1_0.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_web_services_1_1.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_web_services_1_1.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_web_services_1_1.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/j2ee_web_services_1_1.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/javaee_web_services_1_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/javaee_web_services_1_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/javaee_web_services_1_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/javaee_web_services_1_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/javaee_web_services_client_1_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/javaee_web_services_client_1_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/javaee_web_services_client_1_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/javaee_web_services_client_1_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas-webservices_3_3.dtd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas-webservices_3_3.dtd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas-webservices_3_3.dtd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas-webservices_3_3.dtd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_1_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_1_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_1_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_1_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_1_4.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_1_4.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_1_4.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_1_4.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_2.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_2.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_2.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_2.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_5.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_5.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_5.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_4_5.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_5_0.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_5_0.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_5_0.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/ws/jonas_j2ee_web_services_5_0.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/xml.xsd b/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/xml.xsd similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/xml.xsd rename to modules/libraries/jonas-deployment/src/main/resources/org/ow2/jonas/deployment/xml.xsd diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/client/tests/ClientDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/client/tests/ClientDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/client/tests/ClientDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/client/tests/ClientDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/client/tests/JonasClientDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/client/tests/JonasClientDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/client/tests/JonasClientDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/client/tests/JonasClientDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/domain/tests/DomainMapTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/domain/tests/DomainMapTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/domain/tests/DomainMapTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/domain/tests/DomainMapTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ear/tests/EarDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ear/tests/EarDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ear/tests/EarDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ear/tests/EarDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ejb/tests/EJBDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ejb/tests/EJBDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ejb/tests/EJBDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ejb/tests/EJBDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ejb/tests/JonasEJBDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ejb/tests/JonasEJBDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ejb/tests/JonasEJBDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ejb/tests/JonasEJBDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/rar/tests/JonasRarDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/rar/tests/JonasRarDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/rar/tests/JonasRarDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/rar/tests/JonasRarDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/rar/tests/RarDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/rar/tests/RarDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/rar/tests/RarDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/rar/tests/RarDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/tests/AbsDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/tests/AbsDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/tests/AbsDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/tests/AbsDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/web/tests/JonasWebDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/web/tests/JonasWebDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/web/tests/JonasWebDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/web/tests/JonasWebDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/web/tests/WebDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/web/tests/WebDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/web/tests/WebDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/web/tests/WebDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ws/tests/JonasWsDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ws/tests/JonasWsDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ws/tests/JonasWsDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ws/tests/JonasWsDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ws/tests/WsDeploymentTest.java b/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ws/tests/WsDeploymentTest.java similarity index 100% rename from jonas/modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ws/tests/WsDeploymentTest.java rename to modules/libraries/jonas-deployment/src/test/java/org/ow2/jonas/deployment/ws/tests/WsDeploymentTest.java diff --git a/jonas/modules/libraries/jonas-ejb-container-svc/pom.xml b/modules/libraries/jonas-ejb-container-svc/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container-svc/pom.xml rename to modules/libraries/jonas-ejb-container-svc/pom.xml diff --git a/jonas/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JHandleIIOP.java b/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JHandleIIOP.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JHandleIIOP.java rename to modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JHandleIIOP.java diff --git a/jonas/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JHomeHandleIIOP.java b/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JHomeHandleIIOP.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JHomeHandleIIOP.java rename to modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JHomeHandleIIOP.java diff --git a/jonas/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JMetaData.java b/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JMetaData.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JMetaData.java rename to modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/JMetaData.java diff --git a/jonas/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/Utility.java b/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/Utility.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/Utility.java rename to modules/libraries/jonas-ejb-container-svc/src/main/java/org/ow2/jonas/lib/svc/Utility.java diff --git a/jonas/modules/libraries/jonas-ejb-container-svc/src/main/resources/META-INF/jonas-ejb-container-svc.bnd b/modules/libraries/jonas-ejb-container-svc/src/main/resources/META-INF/jonas-ejb-container-svc.bnd similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container-svc/src/main/resources/META-INF/jonas-ejb-container-svc.bnd rename to modules/libraries/jonas-ejb-container-svc/src/main/resources/META-INF/jonas-ejb-container-svc.bnd diff --git a/jonas/modules/libraries/jonas-ejb-container/pom.xml b/modules/libraries/jonas-ejb-container/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/pom.xml rename to modules/libraries/jonas-ejb-container/pom.xml diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/BeanFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/BeanFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/BeanFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/BeanFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/CollectionEnum.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/CollectionEnum.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/CollectionEnum.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/CollectionEnum.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Container.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Container.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Container.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Container.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/EJBInvocation.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/EJBInvocation.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/EJBInvocation.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/EJBInvocation.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/EntityCounters.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/EntityCounters.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/EntityCounters.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/EntityCounters.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/ExceptionHelper.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/ExceptionHelper.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/ExceptionHelper.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/ExceptionHelper.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/HomeFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/HomeFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/HomeFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/HomeFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JContainer.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JContainer.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JContainer.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JContainer.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JContext.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JContext.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JContext.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JContext.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityContext.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityContext.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityContext.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityContext.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityHandle.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityHandle.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityHandle.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityHandle.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityHome.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityHome.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityHome.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityLocal.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityLocal.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityLocal.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityLocal.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityLocalHome.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityLocalHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityLocalHome.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityLocalHome.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityRemote.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityRemote.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityRemote.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntityRemote.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitch.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitch.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitch.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitch.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRC.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRC.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRC.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRC.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRU.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRU.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRU.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRU.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRW.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRW.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRW.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCRW.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCS.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCS.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCS.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCS.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCST.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCST.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCST.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchCST.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchDB.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchDB.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchDB.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchDB.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchRO.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchRO.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchRO.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JEntitySwitchRO.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHandleDelegate.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHandleDelegate.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHandleDelegate.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHandleDelegate.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHome.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHome.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHome.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHomeHandle.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHomeHandle.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHomeHandle.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JHomeHandle.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JLocal.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JLocal.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JLocal.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JLocal.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JLocalHome.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JLocalHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JLocalHome.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JLocalHome.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMdbEndpointFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMdbEndpointFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMdbEndpointFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMdbEndpointFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMdbFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMdbFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMdbFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMdbFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageDrivenBean.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageDrivenBean.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageDrivenBean.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageDrivenBean.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageEndpoint.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageEndpoint.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageEndpoint.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageEndpoint.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageEndpointProxy.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageEndpointProxy.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageEndpointProxy.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JMessageEndpointProxy.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JObjectInputStream.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JObjectInputStream.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JObjectInputStream.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JObjectInputStream.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JRemote.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JRemote.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JRemote.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JRemote.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JServiceEndpoint.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JServiceEndpoint.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JServiceEndpoint.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JServiceEndpoint.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JServiceEndpointHome.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JServiceEndpointHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JServiceEndpointHome.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JServiceEndpointHome.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionContext.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionContext.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionContext.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionContext.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionHandle.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionHandle.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionHandle.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionHandle.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionHome.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionHome.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionHome.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionLocal.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionLocal.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionLocal.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionLocal.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionLocalHome.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionLocalHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionLocalHome.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionLocalHome.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionRemote.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionRemote.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionRemote.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionRemote.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionSwitch.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionSwitch.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionSwitch.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JSessionSwitch.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulContext.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulContext.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulContext.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulContext.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulInputStream.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulInputStream.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulInputStream.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulInputStream.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulOutputStream.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulOutputStream.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulOutputStream.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulOutputStream.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulSwitch.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulSwitch.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulSwitch.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatefulSwitch.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessContext.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessContext.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessContext.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessContext.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessSwitch.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessSwitch.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessSwitch.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JStatelessSwitch.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimer.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimer.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimer.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimer.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimerHandle.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimerHandle.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimerHandle.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimerHandle.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimerService.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimerService.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimerService.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JTimerService.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JWrapper.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JWrapper.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JWrapper.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JWrapper.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JavaType.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JavaType.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JavaType.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/JavaType.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/MarshallTool.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/MarshallTool.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/MarshallTool.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/MarshallTool.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/MonitoringEvent.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/MonitoringEvent.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/MonitoringEvent.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/MonitoringEvent.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/PermissionManager.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/PermissionManager.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/PermissionManager.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/PermissionManager.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/PrincipalFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/PrincipalFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/PrincipalFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/PrincipalFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Protocols.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Protocols.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Protocols.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Protocols.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/RequestCtx.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/RequestCtx.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/RequestCtx.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/RequestCtx.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Swapper.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Swapper.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Swapper.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/Swapper.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/TraceEjb.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/TraceEjb.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/TraceEjb.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/TraceEjb.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/TxListener.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/TxListener.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/TxListener.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/TxListener.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/CMP2Bean.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/CMP2Bean.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/CMP2Bean.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/CMP2Bean.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Coder.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Coder.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Coder.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Coder.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Collection.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Collection.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Collection.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Collection.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/CollectionElement.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/CollectionElement.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/CollectionElement.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/CollectionElement.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/FloatPkFieldMapping.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/FloatPkFieldMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/FloatPkFieldMapping.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/FloatPkFieldMapping.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassElement.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassElement.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassElement.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassElement.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassImpl.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassImpl.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassImpl.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassImpl.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassListener.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassListener.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassListener.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/GenClassListener.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JEntityContext.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JEntityContext.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JEntityContext.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JEntityContext.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JormFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JormFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JormFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JormFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JormType.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JormType.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JormType.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/JormType.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/MapperManager.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/MapperManager.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/MapperManager.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/MapperManager.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/MedorFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/MedorFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/MedorFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/MedorFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/PObject.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/PObject.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/PObject.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/PObject.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/PObjectHome.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/PObjectHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/PObjectHome.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/PObjectHome.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/RdbFactory.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/RdbFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/RdbFactory.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/RdbFactory.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/RdbMappingBuilder.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/RdbMappingBuilder.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/RdbMappingBuilder.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/RdbMappingBuilder.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Set.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Set.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Set.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/jorm/Set.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlAbstractVisitor.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlAbstractVisitor.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlAbstractVisitor.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlAbstractVisitor.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlLimitVisitor.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlLimitVisitor.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlLimitVisitor.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlLimitVisitor.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlLimiterRange.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlLimiterRange.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlLimiterRange.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlLimiterRange.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlOrderByVisitor.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlOrderByVisitor.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlOrderByVisitor.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlOrderByVisitor.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlQueryFilterVisitor.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlQueryFilterVisitor.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlQueryFilterVisitor.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlQueryFilterVisitor.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlQueryTreeHolder.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlQueryTreeHolder.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlQueryTreeHolder.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlQueryTreeHolder.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlSelectVisitor.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlSelectVisitor.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlSelectVisitor.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlSelectVisitor.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlVariableVisitor.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlVariableVisitor.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlVariableVisitor.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/EjbqlVariableVisitor.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlDateFieldMapping.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlDateFieldMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlDateFieldMapping.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlDateFieldMapping.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlTimeFieldMapping.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlTimeFieldMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlTimeFieldMapping.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlTimeFieldMapping.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlTimestampFieldMapping.java b/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlTimestampFieldMapping.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlTimestampFieldMapping.java rename to modules/libraries/jonas-ejb-container/src/main/java/org/ow2/jonas/lib/ejb21/sql/SqlTimestampFieldMapping.java diff --git a/jonas/modules/libraries/jonas-ejb-container/src/main/resources/META-INF/jonas-ejb-container.bnd b/modules/libraries/jonas-ejb-container/src/main/resources/META-INF/jonas-ejb-container.bnd similarity index 100% rename from jonas/modules/libraries/jonas-ejb-container/src/main/resources/META-INF/jonas-ejb-container.bnd rename to modules/libraries/jonas-ejb-container/src/main/resources/META-INF/jonas-ejb-container.bnd diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/pom.xml b/modules/libraries/jonas-ejb2.1-ha/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/pom.xml rename to modules/libraries/jonas-ejb2.1-ha/pom.xml diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/EntityBeanRefImpl.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/EntityBeanRefImpl.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/EntityBeanRefImpl.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/EntityBeanRefImpl.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityHome.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityHome.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityHome.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityLocal.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityLocal.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityLocal.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityLocal.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityLocalHome.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityLocalHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityLocalHome.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityLocalHome.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityRemote.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityRemote.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityRemote.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepEntityRemote.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulInputStream.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulInputStream.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulInputStream.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulInputStream.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulLocal.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulLocal.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulLocal.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulLocal.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulLocalHome.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulLocalHome.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulLocalHome.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulLocalHome.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulObjectId.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulObjectId.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulObjectId.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulObjectId.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulOutputStream.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulOutputStream.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulOutputStream.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulOutputStream.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulRemote.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulRemote.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulRemote.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatefulRemote.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatelessRemote.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatelessRemote.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatelessRemote.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepStatelessRemote.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepUtil.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepUtil.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepUtil.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/JRepUtil.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/StatefulBeanRefImpl.java b/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/StatefulBeanRefImpl.java similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/StatefulBeanRefImpl.java rename to modules/libraries/jonas-ejb2.1-ha/src/main/java/org/ow2/jonas/lib/ejb21/ha/StatefulBeanRefImpl.java diff --git a/jonas/modules/libraries/jonas-ejb2.1-ha/src/main/resources/META-INF/jonas-ejb2.1-ha.bnd b/modules/libraries/jonas-ejb2.1-ha/src/main/resources/META-INF/jonas-ejb2.1-ha.bnd similarity index 100% rename from jonas/modules/libraries/jonas-ejb2.1-ha/src/main/resources/META-INF/jonas-ejb2.1-ha.bnd rename to modules/libraries/jonas-ejb2.1-ha/src/main/resources/META-INF/jonas-ejb2.1-ha.bnd diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/pom.xml b/modules/libraries/jonas-mbeans-for-addons/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/pom.xml rename to modules/libraries/jonas-mbeans-for-addons/pom.xml diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServer.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServer.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServer.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServer.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServerMBean.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServerMBean.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServerMBean.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServerMBean.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/JavaVm.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/JavaVm.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/JavaVm.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/JavaVm.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/LogManager.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/LogManager.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/LogManager.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/LogManager.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/LogManagerMBean.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/LogManagerMBean.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/LogManagerMBean.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/LogManagerMBean.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/MBeansRegistration.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/MBeansRegistration.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/MBeansRegistration.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/MBeansRegistration.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBuffer.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBuffer.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBuffer.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBuffer.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBufferMBean.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBufferMBean.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBufferMBean.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBufferMBean.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagement.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagement.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagement.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagement.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagementMBean.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagementMBean.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagementMBean.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagementMBean.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogNotificationListener.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogNotificationListener.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogNotificationListener.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogNotificationListener.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogRecordComparator.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogRecordComparator.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogRecordComparator.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogRecordComparator.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/RecordFeeder.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/RecordFeeder.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/RecordFeeder.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/log/RecordFeeder.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/monitoring/MemoryMonitoring.java b/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/monitoring/MemoryMonitoring.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/monitoring/MemoryMonitoring.java rename to modules/libraries/jonas-mbeans-for-addons/src/main/java/org/ow2/jonas/lib/jmbeans/monitoring/MemoryMonitoring.java diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/resources/META-INF/jonas-mbeans-for-addons.bnd b/modules/libraries/jonas-mbeans-for-addons/src/main/resources/META-INF/jonas-mbeans-for-addons.bnd similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/resources/META-INF/jonas-mbeans-for-addons.bnd rename to modules/libraries/jonas-mbeans-for-addons/src/main/resources/META-INF/jonas-mbeans-for-addons.bnd diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/resources/metadata.xml b/modules/libraries/jonas-mbeans-for-addons/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/resources/metadata.xml rename to modules/libraries/jonas-mbeans-for-addons/src/main/resources/metadata.xml diff --git a/jonas/modules/libraries/jonas-mbeans-for-addons/src/main/resources/org/ow2/jonas/lib/jmbeans/mbeans-descriptors.xml b/modules/libraries/jonas-mbeans-for-addons/src/main/resources/org/ow2/jonas/lib/jmbeans/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/libraries/jonas-mbeans-for-addons/src/main/resources/org/ow2/jonas/lib/jmbeans/mbeans-descriptors.xml rename to modules/libraries/jonas-mbeans-for-addons/src/main/resources/org/ow2/jonas/lib/jmbeans/mbeans-descriptors.xml diff --git a/jonas/modules/libraries/jonas-mbeans/pom.xml b/modules/libraries/jonas-mbeans/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/pom.xml rename to modules/libraries/jonas-mbeans/pom.xml diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServer.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServer.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServer.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServer.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServerMBean.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServerMBean.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServerMBean.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/J2EEServerMBean.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/JavaVm.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/JavaVm.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/JavaVm.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/JavaVm.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/LogManager.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/LogManager.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/LogManager.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/LogManager.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/LogManagerMBean.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/LogManagerMBean.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/LogManagerMBean.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/LogManagerMBean.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/MBeansRegistration.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/MBeansRegistration.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/MBeansRegistration.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/MBeansRegistration.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBuffer.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBuffer.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBuffer.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBuffer.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBufferMBean.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBufferMBean.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBufferMBean.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogBufferMBean.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagement.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagement.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagement.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagement.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagementMBean.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagementMBean.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagementMBean.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogManagementMBean.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogNotificationListener.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogNotificationListener.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogNotificationListener.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogNotificationListener.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogRecordComparator.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogRecordComparator.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogRecordComparator.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/LogRecordComparator.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/RecordFeeder.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/RecordFeeder.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/RecordFeeder.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/log/RecordFeeder.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/monitoring/MemoryMonitoring.java b/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/monitoring/MemoryMonitoring.java similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/monitoring/MemoryMonitoring.java rename to modules/libraries/jonas-mbeans/src/main/java/org/ow2/jonas/lib/jmbeans/monitoring/MemoryMonitoring.java diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/resources/META-INF/jonas-mbeans.bnd b/modules/libraries/jonas-mbeans/src/main/resources/META-INF/jonas-mbeans.bnd similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/resources/META-INF/jonas-mbeans.bnd rename to modules/libraries/jonas-mbeans/src/main/resources/META-INF/jonas-mbeans.bnd diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/resources/metadata.xml b/modules/libraries/jonas-mbeans/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/resources/metadata.xml rename to modules/libraries/jonas-mbeans/src/main/resources/metadata.xml diff --git a/jonas/modules/libraries/jonas-mbeans/src/main/resources/org/ow2/jonas/lib/jmbeans/mbeans-descriptors.xml b/modules/libraries/jonas-mbeans/src/main/resources/org/ow2/jonas/lib/jmbeans/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/libraries/jonas-mbeans/src/main/resources/org/ow2/jonas/lib/jmbeans/mbeans-descriptors.xml rename to modules/libraries/jonas-mbeans/src/main/resources/org/ow2/jonas/lib/jmbeans/mbeans-descriptors.xml diff --git a/jonas/modules/libraries/jonas-naming/pom.xml b/modules/libraries/jonas-naming/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-naming/pom.xml rename to modules/libraries/jonas-naming/pom.xml diff --git a/jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/ComponentContext.java b/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/ComponentContext.java similarity index 100% rename from jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/ComponentContext.java rename to modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/ComponentContext.java diff --git a/jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/ComponentNameParser.java b/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/ComponentNameParser.java similarity index 100% rename from jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/ComponentNameParser.java rename to modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/ComponentNameParser.java diff --git a/jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/SingletonComponentContextFactory.java b/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/SingletonComponentContextFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/SingletonComponentContextFactory.java rename to modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/SingletonComponentContextFactory.java diff --git a/jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/SingletonNamingManager.java b/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/SingletonNamingManager.java similarity index 100% rename from jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/SingletonNamingManager.java rename to modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/SingletonNamingManager.java diff --git a/jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/URLFactory.java b/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/URLFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/URLFactory.java rename to modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/URLFactory.java diff --git a/jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/java/javaURLContext.java b/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/java/javaURLContext.java similarity index 100% rename from jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/java/javaURLContext.java rename to modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/java/javaURLContext.java diff --git a/jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/java/javaURLContextFactory.java b/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/java/javaURLContextFactory.java similarity index 100% rename from jonas/modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/java/javaURLContextFactory.java rename to modules/libraries/jonas-naming/src/main/java/org/ow2/jonas/lib/naming/java/javaURLContextFactory.java diff --git a/jonas/modules/libraries/jonas-naming/src/main/resources/META-INF/jonas-naming.bnd b/modules/libraries/jonas-naming/src/main/resources/META-INF/jonas-naming.bnd similarity index 100% rename from jonas/modules/libraries/jonas-naming/src/main/resources/META-INF/jonas-naming.bnd rename to modules/libraries/jonas-naming/src/main/resources/META-INF/jonas-naming.bnd diff --git a/jonas/modules/libraries/jonas-naming/src/main/resources/metadata.xml b/modules/libraries/jonas-naming/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/libraries/jonas-naming/src/main/resources/metadata.xml rename to modules/libraries/jonas-naming/src/main/resources/metadata.xml diff --git a/jonas/modules/libraries/jonas-service-manager-for-addons/pom.xml b/modules/libraries/jonas-service-manager-for-addons/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-service-manager-for-addons/pom.xml rename to modules/libraries/jonas-service-manager-for-addons/pom.xml diff --git a/jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/DeployableEnumeration.java b/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/DeployableEnumeration.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/DeployableEnumeration.java rename to modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/DeployableEnumeration.java diff --git a/jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/RequireJOnASServicesHandler.java b/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/RequireJOnASServicesHandler.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/RequireJOnASServicesHandler.java rename to modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/RequireJOnASServicesHandler.java diff --git a/jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceItem.java b/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceItem.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceItem.java rename to modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceItem.java diff --git a/jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceManagerImpl.java b/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceManagerImpl.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceManagerImpl.java rename to modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceManagerImpl.java diff --git a/jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceTracker.java b/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceTracker.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceTracker.java rename to modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceTracker.java diff --git a/jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceUtil.java b/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceUtil.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceUtil.java rename to modules/libraries/jonas-service-manager-for-addons/src/main/java/org/ow2/jonas/lib/service/manager/ServiceUtil.java diff --git a/jonas/modules/libraries/jonas-service-manager-for-addons/src/main/resources/META-INF/jonas-service-manager-for-addons.bnd b/modules/libraries/jonas-service-manager-for-addons/src/main/resources/META-INF/jonas-service-manager-for-addons.bnd similarity index 100% rename from jonas/modules/libraries/jonas-service-manager-for-addons/src/main/resources/META-INF/jonas-service-manager-for-addons.bnd rename to modules/libraries/jonas-service-manager-for-addons/src/main/resources/META-INF/jonas-service-manager-for-addons.bnd diff --git a/jonas/modules/libraries/jonas-service-manager-for-addons/src/main/resources/metadata.xml b/modules/libraries/jonas-service-manager-for-addons/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/libraries/jonas-service-manager-for-addons/src/main/resources/metadata.xml rename to modules/libraries/jonas-service-manager-for-addons/src/main/resources/metadata.xml diff --git a/jonas/modules/libraries/jonas-service-manager/pom.xml b/modules/libraries/jonas-service-manager/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-service-manager/pom.xml rename to modules/libraries/jonas-service-manager/pom.xml diff --git a/jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/DeployableEnumeration.java b/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/DeployableEnumeration.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/DeployableEnumeration.java rename to modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/DeployableEnumeration.java diff --git a/jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/RequireJOnASServicesHandler.java b/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/RequireJOnASServicesHandler.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/RequireJOnASServicesHandler.java rename to modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/RequireJOnASServicesHandler.java diff --git a/jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceItem.java b/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceItem.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceItem.java rename to modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceItem.java diff --git a/jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceManagerImpl.java b/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceManagerImpl.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceManagerImpl.java rename to modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceManagerImpl.java diff --git a/jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceTracker.java b/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceTracker.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceTracker.java rename to modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceTracker.java diff --git a/jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceUtil.java b/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceUtil.java similarity index 100% rename from jonas/modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceUtil.java rename to modules/libraries/jonas-service-manager/src/main/java/org/ow2/jonas/lib/service/manager/ServiceUtil.java diff --git a/jonas/modules/libraries/jonas-service-manager/src/main/resources/META-INF/jonas-service-manager.bnd b/modules/libraries/jonas-service-manager/src/main/resources/META-INF/jonas-service-manager.bnd similarity index 100% rename from jonas/modules/libraries/jonas-service-manager/src/main/resources/META-INF/jonas-service-manager.bnd rename to modules/libraries/jonas-service-manager/src/main/resources/META-INF/jonas-service-manager.bnd diff --git a/jonas/modules/libraries/jonas-service-manager/src/main/resources/metadata.xml b/modules/libraries/jonas-service-manager/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/libraries/jonas-service-manager/src/main/resources/metadata.xml rename to modules/libraries/jonas-service-manager/src/main/resources/metadata.xml diff --git a/jonas/modules/libraries/jonas-shell/pom.xml b/modules/libraries/jonas-shell/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-shell/pom.xml rename to modules/libraries/jonas-shell/pom.xml diff --git a/jonas/modules/libraries/jonas-shell/src/main/java/org/ow2/jonas/shell/internal/JOnASPromptProvider.java b/modules/libraries/jonas-shell/src/main/java/org/ow2/jonas/shell/internal/JOnASPromptProvider.java similarity index 100% rename from jonas/modules/libraries/jonas-shell/src/main/java/org/ow2/jonas/shell/internal/JOnASPromptProvider.java rename to modules/libraries/jonas-shell/src/main/java/org/ow2/jonas/shell/internal/JOnASPromptProvider.java diff --git a/jonas/modules/libraries/jonas-shell/src/main/resources/metadata.xml b/modules/libraries/jonas-shell/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/libraries/jonas-shell/src/main/resources/metadata.xml rename to modules/libraries/jonas-shell/src/main/resources/metadata.xml diff --git a/jonas/modules/libraries/jonas-timer/pom.xml b/modules/libraries/jonas-timer/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-timer/pom.xml rename to modules/libraries/jonas-timer/pom.xml diff --git a/jonas/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerEvent.java b/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerEvent.java similarity index 100% rename from jonas/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerEvent.java rename to modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerEvent.java diff --git a/jonas/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerEventListener.java b/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerEventListener.java similarity index 100% rename from jonas/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerEventListener.java rename to modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerEventListener.java diff --git a/jonas/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerManager.java b/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerManager.java similarity index 100% rename from jonas/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerManager.java rename to modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TimerManager.java diff --git a/jonas/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TraceTimer.java b/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TraceTimer.java similarity index 100% rename from jonas/modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TraceTimer.java rename to modules/libraries/jonas-timer/src/main/java/org/ow2/jonas/lib/timer/TraceTimer.java diff --git a/jonas/modules/libraries/jonas-timer/src/main/resources/META-INF/jonas-timer.bnd b/modules/libraries/jonas-timer/src/main/resources/META-INF/jonas-timer.bnd similarity index 100% rename from jonas/modules/libraries/jonas-timer/src/main/resources/META-INF/jonas-timer.bnd rename to modules/libraries/jonas-timer/src/main/resources/META-INF/jonas-timer.bnd diff --git a/jonas/modules/libraries/jonas-version/pom.xml b/modules/libraries/jonas-version/pom.xml similarity index 100% rename from jonas/modules/libraries/jonas-version/pom.xml rename to modules/libraries/jonas-version/pom.xml diff --git a/jonas/modules/libraries/jonas-version/src/main/java/org/ow2/jonas/Version.java b/modules/libraries/jonas-version/src/main/java/org/ow2/jonas/Version.java similarity index 100% rename from jonas/modules/libraries/jonas-version/src/main/java/org/ow2/jonas/Version.java rename to modules/libraries/jonas-version/src/main/java/org/ow2/jonas/Version.java diff --git a/jonas/modules/libraries/jonas-version/src/main/resources/META-INF/jonas-version.bnd b/modules/libraries/jonas-version/src/main/resources/META-INF/jonas-version.bnd similarity index 100% rename from jonas/modules/libraries/jonas-version/src/main/resources/META-INF/jonas-version.bnd rename to modules/libraries/jonas-version/src/main/resources/META-INF/jonas-version.bnd diff --git a/jonas/modules/libraries/management/domain/pom.xml b/modules/libraries/management/domain/pom.xml similarity index 100% rename from jonas/modules/libraries/management/domain/pom.xml rename to modules/libraries/management/domain/pom.xml diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/AuthenticationInformation.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/AuthenticationInformation.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/AuthenticationInformation.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/AuthenticationInformation.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/DeployAction.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/DeployAction.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/DeployAction.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/DeployAction.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/DomainMonitor.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/DomainMonitor.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/DomainMonitor.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/DomainMonitor.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/J2EEDomain.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/J2EEDomain.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/J2EEDomain.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/J2EEDomain.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/BaseCluster.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/BaseCluster.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/BaseCluster.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/BaseCluster.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/BaseClusterMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/BaseClusterMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/BaseClusterMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/BaseClusterMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterFactory.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterFactory.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterFactory.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterFactory.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterMember.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterMember.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterMember.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterMember.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterMemberMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterMemberMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterMemberMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ClusterMemberMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiCluster.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiCluster.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiCluster.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiCluster.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterFactory.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterFactory.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterFactory.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterFactory.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMember.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMember.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMember.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMember.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMemberMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMemberMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMemberMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/cmi/CmiClusterMemberMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaCluster.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaCluster.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaCluster.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaCluster.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterFactory.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterFactory.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterFactory.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterFactory.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMember.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMember.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMember.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMember.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMemberMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMemberMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMemberMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/ha/EjbHaClusterMemberMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkCluster.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkCluster.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkCluster.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkCluster.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterFactory.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterFactory.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterFactory.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterFactory.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMember.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMember.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMember.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMember.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMemberMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMemberMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMemberMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/jk/JkClusterMemberMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalCluster.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalCluster.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalCluster.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalCluster.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterFactory.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterFactory.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterFactory.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterFactory.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterMember.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterMember.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterMember.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterMember.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterMemberMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterMemberMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterMemberMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/logical/LogicalClusterMemberMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatCluster.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatCluster.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatCluster.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatCluster.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterFactory.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterFactory.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterFactory.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterFactory.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMember.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMember.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMember.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMember.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMemberMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMemberMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMemberMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/cluster/tomcat/TomcatClusterMemberMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/ConnectorUtils.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/ConnectorUtils.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/ConnectorUtils.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/ConnectorUtils.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/JMXProxy.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/JMXProxy.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/JMXProxy.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/JMXProxy.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/clusterd/ClusterDaemonProxy.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/clusterd/ClusterDaemonProxy.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/clusterd/ClusterDaemonProxy.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/clusterd/ClusterDaemonProxy.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/clusterd/ClusterDaemonProxyMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/clusterd/ClusterDaemonProxyMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/clusterd/ClusterDaemonProxyMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/clusterd/ClusterDaemonProxyMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxy.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxy.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxy.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxy.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxyMBean.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxyMBean.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxyMBean.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxyMBean.java diff --git a/jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxyProperties.java b/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxyProperties.java similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxyProperties.java rename to modules/libraries/management/domain/src/main/java/org/ow2/jonas/lib/management/domain/proxy/server/ServerProxyProperties.java diff --git a/jonas/modules/libraries/management/domain/src/main/resources/META-INF/jonas-domain.bnd b/modules/libraries/management/domain/src/main/resources/META-INF/jonas-domain.bnd similarity index 100% rename from jonas/modules/libraries/management/domain/src/main/resources/META-INF/jonas-domain.bnd rename to modules/libraries/management/domain/src/main/resources/META-INF/jonas-domain.bnd diff --git a/jonas/modules/libraries/management/extensions/pom.xml b/modules/libraries/management/extensions/pom.xml similarity index 100% rename from jonas/modules/libraries/management/extensions/pom.xml rename to modules/libraries/management/extensions/pom.xml diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminException.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminException.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminException.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminException.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminHelper.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminHelper.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminHelper.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminHelper.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminJmxHelper.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminJmxHelper.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminJmxHelper.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/AdminJmxHelper.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/BaseManagement.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/BaseManagement.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/BaseManagement.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/BaseManagement.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/BaseObjectName.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/BaseObjectName.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/BaseObjectName.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/BaseObjectName.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/ConnectorItem.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/ConnectorItem.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/ConnectorItem.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/ConnectorItem.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/JonasManagementRepr.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/JonasManagementRepr.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/JonasManagementRepr.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/JonasManagementRepr.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/LocalManagementContext.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/LocalManagementContext.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/LocalManagementContext.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/LocalManagementContext.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/NameItem.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/NameItem.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/NameItem.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/NameItem.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/RealmItem.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/RealmItem.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/RealmItem.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/RealmItem.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/RealmItemByNameComparator.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/RealmItemByNameComparator.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/RealmItemByNameComparator.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/RealmItemByNameComparator.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/CatalinaObjectName.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/CatalinaObjectName.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/CatalinaObjectName.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/CatalinaObjectName.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/J2EEObjectNames.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/J2EEObjectNames.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/J2EEObjectNames.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/J2EEObjectNames.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/J2eeMbeanItem.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/J2eeMbeanItem.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/J2eeMbeanItem.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/J2eeMbeanItem.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/MbeanItem.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/MbeanItem.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/MbeanItem.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/MbeanItem.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/ObjectNameItem.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/ObjectNameItem.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/ObjectNameItem.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/ObjectNameItem.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/OwnerMbeanItem.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/OwnerMbeanItem.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/OwnerMbeanItem.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/base/mbean/OwnerMbeanItem.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/cluster/ClusterManagement.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/cluster/ClusterManagement.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/cluster/ClusterManagement.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/cluster/ClusterManagement.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/clusterdaemon/ClusterdaemonManagement.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/clusterdaemon/ClusterdaemonManagement.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/clusterdaemon/ClusterdaemonManagement.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/clusterdaemon/ClusterdaemonManagement.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ContainerManagement.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ContainerManagement.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ContainerManagement.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ContainerManagement.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ejb/EjbItem.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ejb/EjbItem.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ejb/EjbItem.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ejb/EjbItem.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ejb/EjbItemByNameComparator.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ejb/EjbItemByNameComparator.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ejb/EjbItemByNameComparator.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/container/ejb/EjbItemByNameComparator.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/domain/DomainManagement.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/domain/DomainManagement.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/domain/DomainManagement.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/domain/DomainManagement.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/manager/ManagementEntryPoint.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/manager/ManagementEntryPoint.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/manager/ManagementEntryPoint.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/manager/ManagementEntryPoint.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerItem.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerItem.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerItem.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerItem.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerManagement.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerManagement.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerManagement.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerManagement.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerMonitoring.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerMonitoring.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerMonitoring.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/server/ServerMonitoring.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/util/ConnectorUtils.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/util/ConnectorUtils.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/util/ConnectorUtils.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/util/ConnectorUtils.java diff --git a/jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/util/FileManagementUtils.java b/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/util/FileManagementUtils.java similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/util/FileManagementUtils.java rename to modules/libraries/management/extensions/src/main/java/org/ow2/jonas/lib/management/extensions/util/FileManagementUtils.java diff --git a/jonas/modules/libraries/management/extensions/src/main/resources/META-INF/jonas-management-extensions.bnd b/modules/libraries/management/extensions/src/main/resources/META-INF/jonas-management-extensions.bnd similarity index 100% rename from jonas/modules/libraries/management/extensions/src/main/resources/META-INF/jonas-management-extensions.bnd rename to modules/libraries/management/extensions/src/main/resources/META-INF/jonas-management-extensions.bnd diff --git a/jonas/modules/libraries/management/javaee/pom.xml b/modules/libraries/management/javaee/pom.xml similarity index 100% rename from jonas/modules/libraries/management/javaee/pom.xml rename to modules/libraries/management/javaee/pom.xml diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/apache/commons/modeler/ManagedBean.java b/modules/libraries/management/javaee/src/main/java/org/apache/commons/modeler/ManagedBean.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/apache/commons/modeler/ManagedBean.java rename to modules/libraries/management/javaee/src/main/java/org/apache/commons/modeler/ManagedBean.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEDeployedObject.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEDeployedObject.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEDeployedObject.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEDeployedObject.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEDeployedObjectMBean.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEDeployedObjectMBean.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEDeployedObjectMBean.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEDeployedObjectMBean.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEManagedObject.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEManagedObject.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEManagedObject.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEManagedObject.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEManagedObjectMBean.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEManagedObjectMBean.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEManagedObjectMBean.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEManagedObjectMBean.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEModule.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEModule.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEModule.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEModule.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEModuleMBean.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEModuleMBean.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEModuleMBean.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEModuleMBean.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEResource.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEResource.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEResource.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEResource.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEServerState.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEServerState.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEServerState.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEServerState.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEServiceState.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEServiceState.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEServiceState.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2EEServiceState.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2eeObjectName.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2eeObjectName.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2eeObjectName.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/J2eeObjectName.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/JSR77ManagementIdentifier.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/JSR77ManagementIdentifier.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/JSR77ManagementIdentifier.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/JSR77ManagementIdentifier.java diff --git a/jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/ManagedObject.java b/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/ManagedObject.java similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/ManagedObject.java rename to modules/libraries/management/javaee/src/main/java/org/ow2/jonas/lib/management/javaee/ManagedObject.java diff --git a/jonas/modules/libraries/management/javaee/src/main/resources/META-INF/jonas-management-javaee.bnd b/modules/libraries/management/javaee/src/main/resources/META-INF/jonas-management-javaee.bnd similarity index 100% rename from jonas/modules/libraries/management/javaee/src/main/resources/META-INF/jonas-management-javaee.bnd rename to modules/libraries/management/javaee/src/main/resources/META-INF/jonas-management-javaee.bnd diff --git a/jonas/modules/libraries/management/pom.xml b/modules/libraries/management/pom.xml similarity index 100% rename from jonas/modules/libraries/management/pom.xml rename to modules/libraries/management/pom.xml diff --git a/jonas/modules/libraries/management/reconfig/pom.xml b/modules/libraries/management/reconfig/pom.xml similarity index 100% rename from jonas/modules/libraries/management/reconfig/pom.xml rename to modules/libraries/management/reconfig/pom.xml diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/IConfigurationActuator.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/IConfigurationActuator.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/IConfigurationActuator.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/IConfigurationActuator.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/IConfigurationData.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/IConfigurationData.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/IConfigurationData.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/IConfigurationData.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/PropertiesConfigurationData.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/PropertiesConfigurationData.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/PropertiesConfigurationData.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/PropertiesConfigurationData.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigException.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigException.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigException.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigException.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigManager.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigManager.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigManager.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigManager.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigManagerMBean.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigManagerMBean.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigManagerMBean.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/ReconfigManagerMBean.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/XMLConfigurationData.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/XMLConfigurationData.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/XMLConfigurationData.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/XMLConfigurationData.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/BaseConfigurationActuator.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/BaseConfigurationActuator.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/BaseConfigurationActuator.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/BaseConfigurationActuator.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/PropertiesConfigurationActuator.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/PropertiesConfigurationActuator.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/PropertiesConfigurationActuator.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/PropertiesConfigurationActuator.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/XMLConfigurationActuator.java b/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/XMLConfigurationActuator.java similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/XMLConfigurationActuator.java rename to modules/libraries/management/reconfig/src/main/java/org/ow2/jonas/lib/management/reconfig/actuator/XMLConfigurationActuator.java diff --git a/jonas/modules/libraries/management/reconfig/src/main/resources/META-INF/jonas-management-reconfig.bnd b/modules/libraries/management/reconfig/src/main/resources/META-INF/jonas-management-reconfig.bnd similarity index 100% rename from jonas/modules/libraries/management/reconfig/src/main/resources/META-INF/jonas-management-reconfig.bnd rename to modules/libraries/management/reconfig/src/main/resources/META-INF/jonas-management-reconfig.bnd diff --git a/jonas/modules/libraries/management/services/pom.xml b/modules/libraries/management/services/pom.xml similarity index 100% rename from jonas/modules/libraries/management/services/pom.xml rename to modules/libraries/management/services/pom.xml diff --git a/jonas/modules/libraries/management/services/src/main/java/org/ow2/jonas/lib/management/services/JOnASServiceModelMBean.java b/modules/libraries/management/services/src/main/java/org/ow2/jonas/lib/management/services/JOnASServiceModelMBean.java similarity index 100% rename from jonas/modules/libraries/management/services/src/main/java/org/ow2/jonas/lib/management/services/JOnASServiceModelMBean.java rename to modules/libraries/management/services/src/main/java/org/ow2/jonas/lib/management/services/JOnASServiceModelMBean.java diff --git a/jonas/modules/libraries/management/services/src/main/java/org/ow2/jonas/lib/management/services/ReconfigNotifications.java b/modules/libraries/management/services/src/main/java/org/ow2/jonas/lib/management/services/ReconfigNotifications.java similarity index 100% rename from jonas/modules/libraries/management/services/src/main/java/org/ow2/jonas/lib/management/services/ReconfigNotifications.java rename to modules/libraries/management/services/src/main/java/org/ow2/jonas/lib/management/services/ReconfigNotifications.java diff --git a/jonas/modules/libraries/management/services/src/main/resource/META-INF/jonas-management-services.bnd b/modules/libraries/management/services/src/main/resource/META-INF/jonas-management-services.bnd similarity index 100% rename from jonas/modules/libraries/management/services/src/main/resource/META-INF/jonas-management-services.bnd rename to modules/libraries/management/services/src/main/resource/META-INF/jonas-management-services.bnd diff --git a/jonas/modules/libraries/management/services/src/main/resource/org/ow2/jonas/lib/management/services/mbeans-descriptors.xml b/modules/libraries/management/services/src/main/resource/org/ow2/jonas/lib/management/services/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/libraries/management/services/src/main/resource/org/ow2/jonas/lib/management/services/mbeans-descriptors.xml rename to modules/libraries/management/services/src/main/resource/org/ow2/jonas/lib/management/services/mbeans-descriptors.xml diff --git a/jonas/modules/libraries/pom.xml b/modules/libraries/pom.xml similarity index 100% rename from jonas/modules/libraries/pom.xml rename to modules/libraries/pom.xml diff --git a/jonas/modules/libraries/security/auth/pom.xml b/modules/libraries/security/auth/pom.xml similarity index 100% rename from jonas/modules/libraries/security/auth/pom.xml rename to modules/libraries/security/auth/pom.xml diff --git a/jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JGroup.java b/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JGroup.java similarity index 100% rename from jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JGroup.java rename to modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JGroup.java diff --git a/jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JPrincipal.java b/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JPrincipal.java similarity index 100% rename from jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JPrincipal.java rename to modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JPrincipal.java diff --git a/jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JRole.java b/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JRole.java similarity index 100% rename from jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JRole.java rename to modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JRole.java diff --git a/jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JSigned.java b/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JSigned.java similarity index 100% rename from jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JSigned.java rename to modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JSigned.java diff --git a/jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JSubject.java b/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JSubject.java similarity index 100% rename from jonas/modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JSubject.java rename to modules/libraries/security/auth/src/main/java/org/ow2/jonas/lib/security/auth/JSubject.java diff --git a/jonas/modules/libraries/security/auth/src/main/resources/META-INF/jonas-security-auth.bnd b/modules/libraries/security/auth/src/main/resources/META-INF/jonas-security-auth.bnd similarity index 100% rename from jonas/modules/libraries/security/auth/src/main/resources/META-INF/jonas-security-auth.bnd rename to modules/libraries/security/auth/src/main/resources/META-INF/jonas-security-auth.bnd diff --git a/jonas/modules/libraries/security/interceptors/iiop/pom.xml b/modules/libraries/security/interceptors/iiop/pom.xml similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/pom.xml rename to modules/libraries/security/interceptors/iiop/pom.xml diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2ClientInterceptor.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2ClientInterceptor.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2ClientInterceptor.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2ClientInterceptor.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2Const.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2Const.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2Const.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2Const.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2Initializer.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2Initializer.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2Initializer.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2Initializer.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2InterceptorException.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2InterceptorException.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2InterceptorException.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2InterceptorException.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2IorInterceptor.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2IorInterceptor.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2IorInterceptor.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2IorInterceptor.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2ServerInterceptor.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2ServerInterceptor.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2ServerInterceptor.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/Csiv2ServerInterceptor.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/ORBHelper.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/ORBHelper.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/ORBHelper.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/ORBHelper.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/SecurityContextHelper.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/SecurityContextHelper.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/SecurityContextHelper.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/SecurityContextHelper.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/initializer/SecurityContextInitializer.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/initializer/SecurityContextInitializer.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/initializer/SecurityContextInitializer.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/initializer/SecurityContextInitializer.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/initializer/SecurityContextInitializerException.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/initializer/SecurityContextInitializerException.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/initializer/SecurityContextInitializerException.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/iiop/initializer/SecurityContextInitializerException.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/CorbaClientSecurityInterceptor.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/CorbaClientSecurityInterceptor.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/CorbaClientSecurityInterceptor.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/CorbaClientSecurityInterceptor.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/CorbaServerSecurityInterceptor.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/CorbaServerSecurityInterceptor.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/CorbaServerSecurityInterceptor.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/CorbaServerSecurityInterceptor.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/SecurityInitializer.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/SecurityInitializer.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/SecurityInitializer.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/SecurityInitializer.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/SecurityInterceptor.java b/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/SecurityInterceptor.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/SecurityInterceptor.java rename to modules/libraries/security/interceptors/iiop/src/main/java/org/ow2/jonas/security/interceptors/iiop/SecurityInterceptor.java diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/resources/META-INF/jonas-sec-interceptors-iiop.bnd b/modules/libraries/security/interceptors/iiop/src/main/resources/META-INF/jonas-sec-interceptors-iiop.bnd similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/resources/META-INF/jonas-sec-interceptors-iiop.bnd rename to modules/libraries/security/interceptors/iiop/src/main/resources/META-INF/jonas-sec-interceptors-iiop.bnd diff --git a/jonas/modules/libraries/security/interceptors/iiop/src/main/resources/metadata.xml b/modules/libraries/security/interceptors/iiop/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/libraries/security/interceptors/iiop/src/main/resources/metadata.xml rename to modules/libraries/security/interceptors/iiop/src/main/resources/metadata.xml diff --git a/jonas/modules/libraries/security/interceptors/jrmp/pom.xml b/modules/libraries/security/interceptors/jrmp/pom.xml similarity index 100% rename from jonas/modules/libraries/security/interceptors/jrmp/pom.xml rename to modules/libraries/security/interceptors/jrmp/pom.xml diff --git a/jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ClientSecurityInterceptor.java b/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ClientSecurityInterceptor.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ClientSecurityInterceptor.java rename to modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ClientSecurityInterceptor.java diff --git a/jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/SecurityInitializer.java b/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/SecurityInitializer.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/SecurityInitializer.java rename to modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/SecurityInitializer.java diff --git a/jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/SecurityServiceContext.java b/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/SecurityServiceContext.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/SecurityServiceContext.java rename to modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/SecurityServiceContext.java diff --git a/jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ServerSecurityInterceptor.java b/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ServerSecurityInterceptor.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ServerSecurityInterceptor.java rename to modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ServerSecurityInterceptor.java diff --git a/jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/CtxCheckConfig.java b/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/CtxCheckConfig.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/CtxCheckConfig.java rename to modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/CtxCheckConfig.java diff --git a/jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/Initializer.java b/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/Initializer.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/Initializer.java rename to modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/Initializer.java diff --git a/jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/ServerInterceptor.java b/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/ServerInterceptor.java similarity index 100% rename from jonas/modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/ServerInterceptor.java rename to modules/libraries/security/interceptors/jrmp/src/main/java/org/ow2/jonas/security/interceptors/jrmp/ctxcheck/ServerInterceptor.java diff --git a/jonas/modules/libraries/security/interceptors/jrmp/src/main/resources/META-INF/jonas-sec-interceptors-jrmp.bnd b/modules/libraries/security/interceptors/jrmp/src/main/resources/META-INF/jonas-sec-interceptors-jrmp.bnd similarity index 100% rename from jonas/modules/libraries/security/interceptors/jrmp/src/main/resources/META-INF/jonas-sec-interceptors-jrmp.bnd rename to modules/libraries/security/interceptors/jrmp/src/main/resources/META-INF/jonas-sec-interceptors-jrmp.bnd diff --git a/jonas/modules/libraries/security/interceptors/pom.xml b/modules/libraries/security/interceptors/pom.xml similarity index 100% rename from jonas/modules/libraries/security/interceptors/pom.xml rename to modules/libraries/security/interceptors/pom.xml diff --git a/jonas/modules/libraries/security/jacc-handlers/pom.xml b/modules/libraries/security/jacc-handlers/pom.xml similarity index 100% rename from jonas/modules/libraries/security/jacc-handlers/pom.xml rename to modules/libraries/security/jacc-handlers/pom.xml diff --git a/jonas/modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandler.java b/modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandler.java similarity index 100% rename from jonas/modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandler.java rename to modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandler.java diff --git a/jonas/modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandlerCurrent.java b/modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandlerCurrent.java similarity index 100% rename from jonas/modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandlerCurrent.java rename to modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandlerCurrent.java diff --git a/jonas/modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandlerData.java b/modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandlerData.java similarity index 100% rename from jonas/modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandlerData.java rename to modules/libraries/security/jacc-handlers/src/main/java/org/ow2/jonas/lib/security/jacc/handlers/JPolicyContextHandlerData.java diff --git a/jonas/modules/libraries/security/jacc-handlers/src/main/resources/META-INF/jonas-security-jacc-handlers.bnd b/modules/libraries/security/jacc-handlers/src/main/resources/META-INF/jonas-security-jacc-handlers.bnd similarity index 100% rename from jonas/modules/libraries/security/jacc-handlers/src/main/resources/META-INF/jonas-security-jacc-handlers.bnd rename to modules/libraries/security/jacc-handlers/src/main/resources/META-INF/jonas-security-jacc-handlers.bnd diff --git a/jonas/modules/libraries/security/jacc/pom.xml b/modules/libraries/security/jacc/pom.xml similarity index 100% rename from jonas/modules/libraries/security/jacc/pom.xml rename to modules/libraries/security/jacc/pom.xml diff --git a/jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/AbsPermissionManager.java b/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/AbsPermissionManager.java similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/AbsPermissionManager.java rename to modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/AbsPermissionManager.java diff --git a/jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/PermissionManagerException.java b/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/PermissionManagerException.java similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/PermissionManagerException.java rename to modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/PermissionManagerException.java diff --git a/jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicy.java b/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicy.java similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicy.java rename to modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicy.java diff --git a/jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfiguration.java b/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfiguration.java similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfiguration.java rename to modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfiguration.java diff --git a/jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfigurationFactory.java b/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfigurationFactory.java similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfigurationFactory.java rename to modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfigurationFactory.java diff --git a/jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfigurationKeeper.java b/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfigurationKeeper.java similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfigurationKeeper.java rename to modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyConfigurationKeeper.java diff --git a/jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyException.java b/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyException.java similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyException.java rename to modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyException.java diff --git a/jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyWrapper.java b/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyWrapper.java similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyWrapper.java rename to modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/JPolicyWrapper.java diff --git a/jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/PolicyConfigurationFactoryWrapper.java b/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/PolicyConfigurationFactoryWrapper.java similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/PolicyConfigurationFactoryWrapper.java rename to modules/libraries/security/jacc/src/main/java/org/ow2/jonas/lib/security/jacc/PolicyConfigurationFactoryWrapper.java diff --git a/jonas/modules/libraries/security/jacc/src/main/resources/META-INF/jonas-security-jacc.bnd b/modules/libraries/security/jacc/src/main/resources/META-INF/jonas-security-jacc.bnd similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/resources/META-INF/jonas-security-jacc.bnd rename to modules/libraries/security/jacc/src/main/resources/META-INF/jonas-security-jacc.bnd diff --git a/jonas/modules/libraries/security/jacc/src/main/resources/org/ow2/jonas/lib/security/jacc/I18n.properties b/modules/libraries/security/jacc/src/main/resources/org/ow2/jonas/lib/security/jacc/I18n.properties similarity index 100% rename from jonas/modules/libraries/security/jacc/src/main/resources/org/ow2/jonas/lib/security/jacc/I18n.properties rename to modules/libraries/security/jacc/src/main/resources/org/ow2/jonas/lib/security/jacc/I18n.properties diff --git a/jonas/modules/libraries/security/pom.xml b/modules/libraries/security/pom.xml similarity index 100% rename from jonas/modules/libraries/security/pom.xml rename to modules/libraries/security/pom.xml diff --git a/jonas/modules/libraries/security/propagation/pom.xml b/modules/libraries/security/propagation/pom.xml similarity index 100% rename from jonas/modules/libraries/security/propagation/pom.xml rename to modules/libraries/security/propagation/pom.xml diff --git a/jonas/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/Marshalling.java b/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/Marshalling.java similarity index 100% rename from jonas/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/Marshalling.java rename to modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/Marshalling.java diff --git a/jonas/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/SecurityContext.java b/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/SecurityContext.java similarity index 100% rename from jonas/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/SecurityContext.java rename to modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/SecurityContext.java diff --git a/jonas/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/SecurityCurrent.java b/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/SecurityCurrent.java similarity index 100% rename from jonas/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/SecurityCurrent.java rename to modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/context/SecurityCurrent.java diff --git a/jonas/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/mapping/JPolicyUserRoleMapping.java b/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/mapping/JPolicyUserRoleMapping.java similarity index 100% rename from jonas/modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/mapping/JPolicyUserRoleMapping.java rename to modules/libraries/security/propagation/src/main/java/org/ow2/jonas/lib/security/mapping/JPolicyUserRoleMapping.java diff --git a/jonas/modules/libraries/security/propagation/src/main/resources/META-INF/jonas-security-propagation.bnd b/modules/libraries/security/propagation/src/main/resources/META-INF/jonas-security-propagation.bnd similarity index 100% rename from jonas/modules/libraries/security/propagation/src/main/resources/META-INF/jonas-security-propagation.bnd rename to modules/libraries/security/propagation/src/main/resources/META-INF/jonas-security-propagation.bnd diff --git a/jonas/modules/libraries/tenant/pom.xml b/modules/libraries/tenant/pom.xml similarity index 100% rename from jonas/modules/libraries/tenant/pom.xml rename to modules/libraries/tenant/pom.xml diff --git a/jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/TenantIdInfo.java b/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/TenantIdInfo.java similarity index 100% rename from jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/TenantIdInfo.java rename to modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/TenantIdInfo.java diff --git a/jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/context/TenantContext.java b/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/context/TenantContext.java similarity index 100% rename from jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/context/TenantContext.java rename to modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/context/TenantContext.java diff --git a/jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/context/TenantCurrent.java b/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/context/TenantCurrent.java similarity index 100% rename from jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/context/TenantCurrent.java rename to modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/context/TenantCurrent.java diff --git a/jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/filter/HttpTenantIdFilter.java b/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/filter/HttpTenantIdFilter.java similarity index 100% rename from jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/filter/HttpTenantIdFilter.java rename to modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/filter/HttpTenantIdFilter.java diff --git a/jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/interceptor/jmx/JMXTenantIdInterceptor.java b/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/interceptor/jmx/JMXTenantIdInterceptor.java similarity index 100% rename from jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/interceptor/jmx/JMXTenantIdInterceptor.java rename to modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/interceptor/jmx/JMXTenantIdInterceptor.java diff --git a/jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/interceptor/jndi/JNDITenantIdInterceptor.java b/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/interceptor/jndi/JNDITenantIdInterceptor.java similarity index 100% rename from jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/interceptor/jndi/JNDITenantIdInterceptor.java rename to modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/interceptor/jndi/JNDITenantIdInterceptor.java diff --git a/jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/listener/TenantEventListener.java b/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/listener/TenantEventListener.java similarity index 100% rename from jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/listener/TenantEventListener.java rename to modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/listener/TenantEventListener.java diff --git a/jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/loginmodule/TenantIdLoginModule.java b/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/loginmodule/TenantIdLoginModule.java similarity index 100% rename from jonas/modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/loginmodule/TenantIdLoginModule.java rename to modules/libraries/tenant/src/main/java/org/ow2/jonas/lib/tenant/loginmodule/TenantIdLoginModule.java diff --git a/jonas/modules/libraries/tenant/src/main/resources/META-INF/jonas-libraries-tenant.bnd b/modules/libraries/tenant/src/main/resources/META-INF/jonas-libraries-tenant.bnd similarity index 100% rename from jonas/modules/libraries/tenant/src/main/resources/META-INF/jonas-libraries-tenant.bnd rename to modules/libraries/tenant/src/main/resources/META-INF/jonas-libraries-tenant.bnd diff --git a/jonas/modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/interceptors/tests/JMXTenantIdInterceptorTest.java b/modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/interceptors/tests/JMXTenantIdInterceptorTest.java similarity index 100% rename from jonas/modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/interceptors/tests/JMXTenantIdInterceptorTest.java rename to modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/interceptors/tests/JMXTenantIdInterceptorTest.java diff --git a/jonas/modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/interceptors/tests/JNDITenantIdInterceptorTest.java b/modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/interceptors/tests/JNDITenantIdInterceptorTest.java similarity index 100% rename from jonas/modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/interceptors/tests/JNDITenantIdInterceptorTest.java rename to modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/interceptors/tests/JNDITenantIdInterceptorTest.java diff --git a/jonas/modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/listener/tests/TenantIdListenerTest.java b/modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/listener/tests/TenantIdListenerTest.java similarity index 100% rename from jonas/modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/listener/tests/TenantIdListenerTest.java rename to modules/libraries/tenant/src/test/java/org/ow2/jonas/lib/tenant/listener/tests/TenantIdListenerTest.java diff --git a/jonas/modules/libraries/transaction/interceptors/iiop/pom.xml b/modules/libraries/transaction/interceptors/iiop/pom.xml similarity index 100% rename from jonas/modules/libraries/transaction/interceptors/iiop/pom.xml rename to modules/libraries/transaction/interceptors/iiop/pom.xml diff --git a/jonas/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSClientTransactionInterceptor.java b/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSClientTransactionInterceptor.java similarity index 100% rename from jonas/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSClientTransactionInterceptor.java rename to modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSClientTransactionInterceptor.java diff --git a/jonas/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSInterceptor.java b/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSInterceptor.java similarity index 100% rename from jonas/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSInterceptor.java rename to modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSInterceptor.java diff --git a/jonas/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSORBInitializer.java b/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSORBInitializer.java similarity index 100% rename from jonas/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSORBInitializer.java rename to modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSORBInitializer.java diff --git a/jonas/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSServerTransactionInterceptor.java b/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSServerTransactionInterceptor.java similarity index 100% rename from jonas/modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSServerTransactionInterceptor.java rename to modules/libraries/transaction/interceptors/iiop/src/main/java/org/ow2/jonas/tm/jotm/ots/OTSServerTransactionInterceptor.java diff --git a/jonas/modules/libraries/transaction/interceptors/iiop/src/main/resources/META-INF/jonas-trans-interceptors-iiop.bnd b/modules/libraries/transaction/interceptors/iiop/src/main/resources/META-INF/jonas-trans-interceptors-iiop.bnd similarity index 100% rename from jonas/modules/libraries/transaction/interceptors/iiop/src/main/resources/META-INF/jonas-trans-interceptors-iiop.bnd rename to modules/libraries/transaction/interceptors/iiop/src/main/resources/META-INF/jonas-trans-interceptors-iiop.bnd diff --git a/jonas/modules/libraries/transaction/interceptors/pom.xml b/modules/libraries/transaction/interceptors/pom.xml similarity index 100% rename from jonas/modules/libraries/transaction/interceptors/pom.xml rename to modules/libraries/transaction/interceptors/pom.xml diff --git a/jonas/modules/libraries/transaction/pom.xml b/modules/libraries/transaction/pom.xml similarity index 100% rename from jonas/modules/libraries/transaction/pom.xml rename to modules/libraries/transaction/pom.xml diff --git a/jonas/modules/pom.xml b/modules/pom.xml similarity index 100% rename from jonas/modules/pom.xml rename to modules/pom.xml diff --git a/jonas/modules/services/bootstrap/ant/pom.xml b/modules/services/bootstrap/ant/pom.xml similarity index 100% rename from jonas/modules/services/bootstrap/ant/pom.xml rename to modules/services/bootstrap/ant/pom.xml diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/AbstractAntDeprecated.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/AbstractAntDeprecated.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/AbstractAntDeprecated.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/AbstractAntDeprecated.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/EjbJarDeprecated.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/EjbJarDeprecated.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/EjbJarDeprecated.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/EjbJarDeprecated.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/GenICTaskDeprecated.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/GenICTaskDeprecated.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/GenICTaskDeprecated.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/GenICTaskDeprecated.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASBaseTaskDeprecated.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASBaseTaskDeprecated.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASBaseTaskDeprecated.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASBaseTaskDeprecated.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASClusterConfigTaskDeprecated.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASClusterConfigTaskDeprecated.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASClusterConfigTaskDeprecated.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASClusterConfigTaskDeprecated.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASTaskDeprecated.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASTaskDeprecated.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASTaskDeprecated.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JOnASTaskDeprecated.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JPropertyDeprecated.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JPropertyDeprecated.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JPropertyDeprecated.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/JPropertyDeprecated.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/ServerDeployDeprecated.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/ServerDeployDeprecated.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/ServerDeployDeprecated.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/ServerDeployDeprecated.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/WsGenTaskDeprecated.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/WsGenTaskDeprecated.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/WsGenTaskDeprecated.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/ant/WsGenTaskDeprecated.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/BootstrapTask.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/BootstrapTask.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/BootstrapTask.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/BootstrapTask.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/HotDeploymentTool.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/HotDeploymentTool.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/HotDeploymentTool.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/HotDeploymentTool.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/InnerClassFilenameFilter.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/InnerClassFilenameFilter.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/InnerClassFilenameFilter.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/InnerClassFilenameFilter.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JOnASAntTool.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JOnASAntTool.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JOnASAntTool.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JOnASAntTool.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JOnASTask.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JOnASTask.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JOnASTask.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JOnASTask.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JProperty.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JProperty.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JProperty.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JProperty.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JonasHotDeploymentTool.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JonasHotDeploymentTool.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JonasHotDeploymentTool.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/JonasHotDeploymentTool.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/PropertyStatement.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/PropertyStatement.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/PropertyStatement.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/PropertyStatement.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/ServerDeploy.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/ServerDeploy.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/ServerDeploy.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/bootstrap/ServerDeploy.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/AbstractJOnASBaseAntTask.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/AbstractJOnASBaseAntTask.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/AbstractJOnASBaseAntTask.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/AbstractJOnASBaseAntTask.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Archives.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Archives.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Archives.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Archives.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/BaseTaskItf.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/BaseTaskItf.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/BaseTaskItf.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/BaseTaskItf.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/DeployableSelector.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/DeployableSelector.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/DeployableSelector.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/DeployableSelector.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/DeploymentPlans.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/DeploymentPlans.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/DeploymentPlans.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/DeploymentPlans.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JCopy.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JCopy.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JCopy.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JCopy.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JEcho.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JEcho.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JEcho.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JEcho.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JMkdir.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JMkdir.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JMkdir.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JMkdir.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JOnASBaseTask.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JOnASBaseTask.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JOnASBaseTask.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JOnASBaseTask.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JReplace.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JReplace.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JReplace.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JReplace.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JTask.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JTask.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JTask.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JTask.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JTouch.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JTouch.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JTouch.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JTouch.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JonasProperties.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JonasProperties.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JonasProperties.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/JonasProperties.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Lib.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Lib.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Lib.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Lib.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/PropertyTask.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/PropertyTask.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/PropertyTask.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/PropertyTask.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Replace.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Replace.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Replace.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Replace.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Services.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Services.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Services.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Services.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Tasks.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Tasks.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Tasks.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/Tasks.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/XMLSerializerTask.java b/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/XMLSerializerTask.java similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/XMLSerializerTask.java rename to modules/services/bootstrap/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/bootstrap/XMLSerializerTask.java diff --git a/jonas/modules/services/bootstrap/ant/src/main/resources/META-INF/bootstrap-ant.bnd b/modules/services/bootstrap/ant/src/main/resources/META-INF/bootstrap-ant.bnd similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/resources/META-INF/bootstrap-ant.bnd rename to modules/services/bootstrap/ant/src/main/resources/META-INF/bootstrap-ant.bnd diff --git a/jonas/modules/services/bootstrap/ant/src/main/resources/antlib-master.xml b/modules/services/bootstrap/ant/src/main/resources/antlib-master.xml similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/resources/antlib-master.xml rename to modules/services/bootstrap/ant/src/main/resources/antlib-master.xml diff --git a/jonas/modules/services/bootstrap/ant/src/main/resources/build-master.properties.template b/modules/services/bootstrap/ant/src/main/resources/build-master.properties.template similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/resources/build-master.properties.template rename to modules/services/bootstrap/ant/src/main/resources/build-master.properties.template diff --git a/jonas/modules/services/bootstrap/ant/src/main/resources/build-master.xml b/modules/services/bootstrap/ant/src/main/resources/build-master.xml similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/resources/build-master.xml rename to modules/services/bootstrap/ant/src/main/resources/build-master.xml diff --git a/jonas/modules/services/bootstrap/ant/src/main/resources/org/ow2/jonas/ant/antlib.xml b/modules/services/bootstrap/ant/src/main/resources/org/ow2/jonas/ant/antlib.xml similarity index 100% rename from jonas/modules/services/bootstrap/ant/src/main/resources/org/ow2/jonas/ant/antlib.xml rename to modules/services/bootstrap/ant/src/main/resources/org/ow2/jonas/ant/antlib.xml diff --git a/jonas/modules/services/bootstrap/core-for-addons/pom.xml b/modules/services/bootstrap/core-for-addons/pom.xml similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/pom.xml rename to modules/services/bootstrap/core-for-addons/pom.xml diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/JOnASConfiguration.java b/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/JOnASConfiguration.java similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/JOnASConfiguration.java rename to modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/JOnASConfiguration.java diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/JOnASDeploymentPlanDeployer.java b/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/JOnASDeploymentPlanDeployer.java similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/JOnASDeploymentPlanDeployer.java rename to modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/JOnASDeploymentPlanDeployer.java diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/PlatformMBeanServerDelegate.java b/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/PlatformMBeanServerDelegate.java similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/PlatformMBeanServerDelegate.java rename to modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/PlatformMBeanServerDelegate.java diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlan.java b/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlan.java similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlan.java rename to modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlan.java diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlanMBean.java b/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlanMBean.java similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlanMBean.java rename to modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlanMBean.java diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/mbeanbuilder/JOnASMBeanServerBuilder.java b/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/mbeanbuilder/JOnASMBeanServerBuilder.java similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/mbeanbuilder/JOnASMBeanServerBuilder.java rename to modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/mbeanbuilder/JOnASMBeanServerBuilder.java diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositories.java b/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositories.java similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositories.java rename to modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositories.java diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositoriesMBean.java b/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositoriesMBean.java similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositoriesMBean.java rename to modules/services/bootstrap/core-for-addons/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositoriesMBean.java diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.bash b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.bash similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.bash rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.bash diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.bat b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.bat similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.bat rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.bat diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.ksh b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.ksh similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.ksh rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.ksh diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.sh b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.sh similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.sh rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jcl.sh diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonas b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonas similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonas rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonas diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonas.bat b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonas.bat similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonas.bat rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonas.bat diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonasnt.bat b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonasnt.bat similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonasnt.bat rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/jonasnt.bat diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/setenv b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/setenv similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/setenv rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/setenv diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/setenv.bat b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/setenv.bat similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/setenv.bat rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/bin/setenv.bat diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/banner.txt b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/banner.txt similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/banner.txt rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/banner.txt diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/classloader-default-filtering.xml b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/classloader-default-filtering.xml similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/classloader-default-filtering.xml rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/classloader-default-filtering.xml diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/env.sh.include b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/env.sh.include similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/env.sh.include rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/env.sh.include diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/env.start.sh.include b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/env.start.sh.include similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/env.start.sh.include rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/env.start.sh.include diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/initial-repositories.xml b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/initial-repositories.xml similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/initial-repositories.xml rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/initial-repositories.xml diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/trace.properties b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/trace.properties similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/trace.properties rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/trace.properties diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/traceclient.properties b/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/traceclient.properties similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/traceclient.properties rename to modules/services/bootstrap/core-for-addons/src/main/jonas-resources/conf/traceclient.properties diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/resources/META-INF/bootstrap-core-for-addons.bnd b/modules/services/bootstrap/core-for-addons/src/main/resources/META-INF/bootstrap-core-for-addons.bnd similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/resources/META-INF/bootstrap-core-for-addons.bnd rename to modules/services/bootstrap/core-for-addons/src/main/resources/META-INF/bootstrap-core-for-addons.bnd diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/resources/metadata.xml b/modules/services/bootstrap/core-for-addons/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/resources/metadata.xml rename to modules/services/bootstrap/core-for-addons/src/main/resources/metadata.xml diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/templates/jonas-admin.properties.template b/modules/services/bootstrap/core-for-addons/src/main/templates/jonas-admin.properties.template similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/templates/jonas-admin.properties.template rename to modules/services/bootstrap/core-for-addons/src/main/templates/jonas-admin.properties.template diff --git a/jonas/modules/services/bootstrap/core-for-addons/src/main/templates/jonas-base.properties.template b/modules/services/bootstrap/core-for-addons/src/main/templates/jonas-base.properties.template similarity index 100% rename from jonas/modules/services/bootstrap/core-for-addons/src/main/templates/jonas-base.properties.template rename to modules/services/bootstrap/core-for-addons/src/main/templates/jonas-base.properties.template diff --git a/jonas/modules/services/bootstrap/core/pom.xml b/modules/services/bootstrap/core/pom.xml similarity index 100% rename from jonas/modules/services/bootstrap/core/pom.xml rename to modules/services/bootstrap/core/pom.xml diff --git a/jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/JOnASConfiguration.java b/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/JOnASConfiguration.java similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/JOnASConfiguration.java rename to modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/JOnASConfiguration.java diff --git a/jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/JOnASDeploymentPlanDeployer.java b/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/JOnASDeploymentPlanDeployer.java similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/JOnASDeploymentPlanDeployer.java rename to modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/JOnASDeploymentPlanDeployer.java diff --git a/jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/PlatformMBeanServerDelegate.java b/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/PlatformMBeanServerDelegate.java similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/PlatformMBeanServerDelegate.java rename to modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/PlatformMBeanServerDelegate.java diff --git a/jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlan.java b/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlan.java similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlan.java rename to modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlan.java diff --git a/jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlanMBean.java b/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlanMBean.java similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlanMBean.java rename to modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/deploymentplan/JOnASDeploymentPlanMBean.java diff --git a/jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/mbeanbuilder/JOnASMBeanServerBuilder.java b/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/mbeanbuilder/JOnASMBeanServerBuilder.java similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/mbeanbuilder/JOnASMBeanServerBuilder.java rename to modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/mbeanbuilder/JOnASMBeanServerBuilder.java diff --git a/jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositories.java b/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositories.java similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositories.java rename to modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositories.java diff --git a/jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositoriesMBean.java b/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositoriesMBean.java similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositoriesMBean.java rename to modules/services/bootstrap/core/src/main/java/org/ow2/jonas/services/bootstrap/repository/JOnASRepositoriesMBean.java diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.bash b/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.bash similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.bash rename to modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.bash diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.bat b/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.bat similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.bat rename to modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.bat diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.ksh b/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.ksh similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.ksh rename to modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.ksh diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.sh b/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.sh similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.sh rename to modules/services/bootstrap/core/src/main/jonas-resources/bin/jcl.sh diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jonas b/modules/services/bootstrap/core/src/main/jonas-resources/bin/jonas similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jonas rename to modules/services/bootstrap/core/src/main/jonas-resources/bin/jonas diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jonas.bat b/modules/services/bootstrap/core/src/main/jonas-resources/bin/jonas.bat similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jonas.bat rename to modules/services/bootstrap/core/src/main/jonas-resources/bin/jonas.bat diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jonasnt.bat b/modules/services/bootstrap/core/src/main/jonas-resources/bin/jonasnt.bat similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/jonasnt.bat rename to modules/services/bootstrap/core/src/main/jonas-resources/bin/jonasnt.bat diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/setenv b/modules/services/bootstrap/core/src/main/jonas-resources/bin/setenv similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/setenv rename to modules/services/bootstrap/core/src/main/jonas-resources/bin/setenv diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/setenv.bat b/modules/services/bootstrap/core/src/main/jonas-resources/bin/setenv.bat similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/bin/setenv.bat rename to modules/services/bootstrap/core/src/main/jonas-resources/bin/setenv.bat diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/banner.txt b/modules/services/bootstrap/core/src/main/jonas-resources/conf/banner.txt similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/banner.txt rename to modules/services/bootstrap/core/src/main/jonas-resources/conf/banner.txt diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/classloader-default-filtering.xml b/modules/services/bootstrap/core/src/main/jonas-resources/conf/classloader-default-filtering.xml similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/classloader-default-filtering.xml rename to modules/services/bootstrap/core/src/main/jonas-resources/conf/classloader-default-filtering.xml diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/env.sh.include b/modules/services/bootstrap/core/src/main/jonas-resources/conf/env.sh.include similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/env.sh.include rename to modules/services/bootstrap/core/src/main/jonas-resources/conf/env.sh.include diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/env.start.sh.include b/modules/services/bootstrap/core/src/main/jonas-resources/conf/env.start.sh.include similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/env.start.sh.include rename to modules/services/bootstrap/core/src/main/jonas-resources/conf/env.start.sh.include diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/initial-repositories.xml b/modules/services/bootstrap/core/src/main/jonas-resources/conf/initial-repositories.xml similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/initial-repositories.xml rename to modules/services/bootstrap/core/src/main/jonas-resources/conf/initial-repositories.xml diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/trace.properties b/modules/services/bootstrap/core/src/main/jonas-resources/conf/trace.properties similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/trace.properties rename to modules/services/bootstrap/core/src/main/jonas-resources/conf/trace.properties diff --git a/jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/traceclient.properties b/modules/services/bootstrap/core/src/main/jonas-resources/conf/traceclient.properties similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/jonas-resources/conf/traceclient.properties rename to modules/services/bootstrap/core/src/main/jonas-resources/conf/traceclient.properties diff --git a/jonas/modules/services/bootstrap/core/src/main/resources/META-INF/bootstrap-core.bnd b/modules/services/bootstrap/core/src/main/resources/META-INF/bootstrap-core.bnd similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/resources/META-INF/bootstrap-core.bnd rename to modules/services/bootstrap/core/src/main/resources/META-INF/bootstrap-core.bnd diff --git a/jonas/modules/services/bootstrap/core/src/main/resources/metadata.xml b/modules/services/bootstrap/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/resources/metadata.xml rename to modules/services/bootstrap/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/bootstrap/core/src/main/templates/jonas-admin.properties.template b/modules/services/bootstrap/core/src/main/templates/jonas-admin.properties.template similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/templates/jonas-admin.properties.template rename to modules/services/bootstrap/core/src/main/templates/jonas-admin.properties.template diff --git a/jonas/modules/services/bootstrap/core/src/main/templates/jonas-base.properties.template b/modules/services/bootstrap/core/src/main/templates/jonas-base.properties.template similarity index 100% rename from jonas/modules/services/bootstrap/core/src/main/templates/jonas-base.properties.template rename to modules/services/bootstrap/core/src/main/templates/jonas-base.properties.template diff --git a/jonas/modules/services/bootstrap/pom.xml b/modules/services/bootstrap/pom.xml similarity index 100% rename from jonas/modules/services/bootstrap/pom.xml rename to modules/services/bootstrap/pom.xml diff --git a/jonas/modules/services/cdi-weld/core/pom.xml b/modules/services/cdi-weld/core/pom.xml similarity index 100% rename from jonas/modules/services/cdi-weld/core/pom.xml rename to modules/services/cdi-weld/core/pom.xml diff --git a/jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/IWeldService.java b/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/IWeldService.java similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/IWeldService.java rename to modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/IWeldService.java diff --git a/jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/DefaultWeldService.java b/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/DefaultWeldService.java similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/DefaultWeldService.java rename to modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/DefaultWeldService.java diff --git a/jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/ForwardingJspApplicationContext.java b/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/ForwardingJspApplicationContext.java similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/ForwardingJspApplicationContext.java rename to modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/ForwardingJspApplicationContext.java diff --git a/jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/ForwardingJspFactory.java b/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/ForwardingJspFactory.java similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/ForwardingJspFactory.java rename to modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/ForwardingJspFactory.java diff --git a/jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/WeldJspApplicationContext.java b/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/WeldJspApplicationContext.java similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/WeldJspApplicationContext.java rename to modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/WeldJspApplicationContext.java diff --git a/jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/WeldJspFactory.java b/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/WeldJspFactory.java similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/WeldJspFactory.java rename to modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/jsp/WeldJspFactory.java diff --git a/jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldContextCustomizer.java b/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldContextCustomizer.java similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldContextCustomizer.java rename to modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldContextCustomizer.java diff --git a/jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldLifeCycleListener.java b/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldLifeCycleListener.java similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldLifeCycleListener.java rename to modules/services/cdi-weld/core/src/main/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldLifeCycleListener.java diff --git a/jonas/modules/services/cdi-weld/core/src/main/resources/META-INF/jonas-cdi-weld-core.bnd b/modules/services/cdi-weld/core/src/main/resources/META-INF/jonas-cdi-weld-core.bnd similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/resources/META-INF/jonas-cdi-weld-core.bnd rename to modules/services/cdi-weld/core/src/main/resources/META-INF/jonas-cdi-weld-core.bnd diff --git a/jonas/modules/services/cdi-weld/core/src/main/resources/META-INF/services/javax.faces.application.ApplicationFactory b/modules/services/cdi-weld/core/src/main/resources/META-INF/services/javax.faces.application.ApplicationFactory similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/resources/META-INF/services/javax.faces.application.ApplicationFactory rename to modules/services/cdi-weld/core/src/main/resources/META-INF/services/javax.faces.application.ApplicationFactory diff --git a/jonas/modules/services/cdi-weld/core/src/main/resources/metadata.xml b/modules/services/cdi-weld/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/resources/metadata.xml rename to modules/services/cdi-weld/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/cdi-weld/core/src/main/templates/jonas-cdi.properties.template b/modules/services/cdi-weld/core/src/main/templates/jonas-cdi.properties.template similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/main/templates/jonas-cdi.properties.template rename to modules/services/cdi-weld/core/src/main/templates/jonas-cdi.properties.template diff --git a/jonas/modules/services/cdi-weld/core/src/test/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldContextCustomizerTestCase.java b/modules/services/cdi-weld/core/src/test/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldContextCustomizerTestCase.java similarity index 100% rename from jonas/modules/services/cdi-weld/core/src/test/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldContextCustomizerTestCase.java rename to modules/services/cdi-weld/core/src/test/java/org/ow2/jonas/cdi/weld/internal/tomcat/WeldContextCustomizerTestCase.java diff --git a/jonas/modules/services/cdi-weld/pom.xml b/modules/services/cdi-weld/pom.xml similarity index 100% rename from jonas/modules/services/cdi-weld/pom.xml rename to modules/services/cdi-weld/pom.xml diff --git a/jonas/modules/services/cmi/ant/pom.xml b/modules/services/cmi/ant/pom.xml similarity index 100% rename from jonas/modules/services/cmi/ant/pom.xml rename to modules/services/cmi/ant/pom.xml diff --git a/jonas/modules/services/cmi/ant/src/main/java/org/ow2/jonas/antmodular/cmi/Cmi.java b/modules/services/cmi/ant/src/main/java/org/ow2/jonas/antmodular/cmi/Cmi.java similarity index 100% rename from jonas/modules/services/cmi/ant/src/main/java/org/ow2/jonas/antmodular/cmi/Cmi.java rename to modules/services/cmi/ant/src/main/java/org/ow2/jonas/antmodular/cmi/Cmi.java diff --git a/jonas/modules/services/cmi/ant/src/main/resources/jonas-cmi-ant.bnd b/modules/services/cmi/ant/src/main/resources/jonas-cmi-ant.bnd similarity index 100% rename from jonas/modules/services/cmi/ant/src/main/resources/jonas-cmi-ant.bnd rename to modules/services/cmi/ant/src/main/resources/jonas-cmi-ant.bnd diff --git a/jonas/modules/services/cmi/core/pom.xml b/modules/services/cmi/core/pom.xml similarity index 100% rename from jonas/modules/services/cmi/core/pom.xml rename to modules/services/cmi/core/pom.xml diff --git a/jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/BundleContent.java b/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/BundleContent.java similarity index 100% rename from jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/BundleContent.java rename to modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/BundleContent.java diff --git a/jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceException.java b/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceException.java similarity index 100% rename from jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceException.java rename to modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceException.java diff --git a/jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceHelper.java b/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceHelper.java similarity index 100% rename from jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceHelper.java rename to modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceHelper.java diff --git a/jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceImpl.java b/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceImpl.java similarity index 100% rename from jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceImpl.java rename to modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceImpl.java diff --git a/jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServicePolicyStrategyManager.java b/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServicePolicyStrategyManager.java similarity index 100% rename from jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServicePolicyStrategyManager.java rename to modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServicePolicyStrategyManager.java diff --git a/jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceProperty.java b/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceProperty.java similarity index 100% rename from jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceProperty.java rename to modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/CmiServiceProperty.java diff --git a/jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/LoadBalancingListener.java b/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/LoadBalancingListener.java similarity index 100% rename from jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/LoadBalancingListener.java rename to modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/LoadBalancingListener.java diff --git a/jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/event/BeanEventListener.java b/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/event/BeanEventListener.java similarity index 100% rename from jonas/modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/event/BeanEventListener.java rename to modules/services/cmi/core/src/main/java/org/ow2/jonas/cmi/internal/event/BeanEventListener.java diff --git a/jonas/modules/services/cmi/core/src/main/jonas-resources/bin/probeJgroups b/modules/services/cmi/core/src/main/jonas-resources/bin/probeJgroups similarity index 100% rename from jonas/modules/services/cmi/core/src/main/jonas-resources/bin/probeJgroups rename to modules/services/cmi/core/src/main/jonas-resources/bin/probeJgroups diff --git a/jonas/modules/services/cmi/core/src/main/jonas-resources/bin/probeJgroups.bat b/modules/services/cmi/core/src/main/jonas-resources/bin/probeJgroups.bat similarity index 100% rename from jonas/modules/services/cmi/core/src/main/jonas-resources/bin/probeJgroups.bat rename to modules/services/cmi/core/src/main/jonas-resources/bin/probeJgroups.bat diff --git a/jonas/modules/services/cmi/core/src/main/jonas-resources/conf/cmi-config.xml b/modules/services/cmi/core/src/main/jonas-resources/conf/cmi-config.xml similarity index 100% rename from jonas/modules/services/cmi/core/src/main/jonas-resources/conf/cmi-config.xml rename to modules/services/cmi/core/src/main/jonas-resources/conf/cmi-config.xml diff --git a/jonas/modules/services/cmi/core/src/main/jonas-resources/conf/jgroups-cmi.xml b/modules/services/cmi/core/src/main/jonas-resources/conf/jgroups-cmi.xml similarity index 100% rename from jonas/modules/services/cmi/core/src/main/jonas-resources/conf/jgroups-cmi.xml rename to modules/services/cmi/core/src/main/jonas-resources/conf/jgroups-cmi.xml diff --git a/jonas/modules/services/cmi/core/src/main/resources/META-INF/jonas-cmi-core.bnd b/modules/services/cmi/core/src/main/resources/META-INF/jonas-cmi-core.bnd similarity index 100% rename from jonas/modules/services/cmi/core/src/main/resources/META-INF/jonas-cmi-core.bnd rename to modules/services/cmi/core/src/main/resources/META-INF/jonas-cmi-core.bnd diff --git a/jonas/modules/services/cmi/core/src/main/resources/metadata.xml b/modules/services/cmi/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/cmi/core/src/main/resources/metadata.xml rename to modules/services/cmi/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/cmi/core/src/main/templates/jonas-cmi.properties.template b/modules/services/cmi/core/src/main/templates/jonas-cmi.properties.template similarity index 100% rename from jonas/modules/services/cmi/core/src/main/templates/jonas-cmi.properties.template rename to modules/services/cmi/core/src/main/templates/jonas-cmi.properties.template diff --git a/jonas/modules/services/cmi/pom.xml b/modules/services/cmi/pom.xml similarity index 100% rename from jonas/modules/services/cmi/pom.xml rename to modules/services/cmi/pom.xml diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/pom.xml b/modules/services/deployable-monitor/core-for-addons/pom.xml similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/pom.xml rename to modules/services/deployable-monitor/core-for-addons/pom.xml diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitor.java b/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitor.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitor.java rename to modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitor.java diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorException.java b/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorException.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorException.java rename to modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorException.java diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorService.java b/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorService.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorService.java rename to modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorService.java diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/ExclusionFilenameFilter.java b/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/ExclusionFilenameFilter.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/ExclusionFilenameFilter.java rename to modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/ExclusionFilenameFilter.java diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/LexicographicallyFileComparator.java b/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/LexicographicallyFileComparator.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/LexicographicallyFileComparator.java rename to modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/LexicographicallyFileComparator.java diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployable.java b/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployable.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployable.java rename to modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployable.java diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployableComparator.java b/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployableComparator.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployableComparator.java rename to modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployableComparator.java diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/mbean/DeployableMonitorServiceMBean.java b/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/mbean/DeployableMonitorServiceMBean.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/mbean/DeployableMonitorServiceMBean.java rename to modules/services/deployable-monitor/core-for-addons/src/main/java/org/ow2/jonas/deployablemonitor/mbean/DeployableMonitorServiceMBean.java diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/resources/META-INF/jonas-deployable-monitor-core-for-addons.bnd b/modules/services/deployable-monitor/core-for-addons/src/main/resources/META-INF/jonas-deployable-monitor-core-for-addons.bnd similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/resources/META-INF/jonas-deployable-monitor-core-for-addons.bnd rename to modules/services/deployable-monitor/core-for-addons/src/main/resources/META-INF/jonas-deployable-monitor-core-for-addons.bnd diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/resources/metadata.xml b/modules/services/deployable-monitor/core-for-addons/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/resources/metadata.xml rename to modules/services/deployable-monitor/core-for-addons/src/main/resources/metadata.xml diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/resources/org/ow2/jonas/deployablemonitor/mbeans-descriptors.xml b/modules/services/deployable-monitor/core-for-addons/src/main/resources/org/ow2/jonas/deployablemonitor/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/resources/org/ow2/jonas/deployablemonitor/mbeans-descriptors.xml rename to modules/services/deployable-monitor/core-for-addons/src/main/resources/org/ow2/jonas/deployablemonitor/mbeans-descriptors.xml diff --git a/jonas/modules/services/deployable-monitor/core-for-addons/src/main/templates/jonas-depmonitor.properties.template b/modules/services/deployable-monitor/core-for-addons/src/main/templates/jonas-depmonitor.properties.template similarity index 100% rename from jonas/modules/services/deployable-monitor/core-for-addons/src/main/templates/jonas-depmonitor.properties.template rename to modules/services/deployable-monitor/core-for-addons/src/main/templates/jonas-depmonitor.properties.template diff --git a/jonas/modules/services/deployable-monitor/core/pom.xml b/modules/services/deployable-monitor/core/pom.xml similarity index 100% rename from jonas/modules/services/deployable-monitor/core/pom.xml rename to modules/services/deployable-monitor/core/pom.xml diff --git a/jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitor.java b/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitor.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitor.java rename to modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitor.java diff --git a/jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorException.java b/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorException.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorException.java rename to modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorException.java diff --git a/jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorService.java b/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorService.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorService.java rename to modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/DeployableMonitorService.java diff --git a/jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/ExclusionFilenameFilter.java b/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/ExclusionFilenameFilter.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/ExclusionFilenameFilter.java rename to modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/ExclusionFilenameFilter.java diff --git a/jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/LexicographicallyFileComparator.java b/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/LexicographicallyFileComparator.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/LexicographicallyFileComparator.java rename to modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/LexicographicallyFileComparator.java diff --git a/jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployable.java b/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployable.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployable.java rename to modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployable.java diff --git a/jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployableComparator.java b/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployableComparator.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployableComparator.java rename to modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/SortableFileDeployableComparator.java diff --git a/jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/mbean/DeployableMonitorServiceMBean.java b/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/mbean/DeployableMonitorServiceMBean.java similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/mbean/DeployableMonitorServiceMBean.java rename to modules/services/deployable-monitor/core/src/main/java/org/ow2/jonas/deployablemonitor/mbean/DeployableMonitorServiceMBean.java diff --git a/jonas/modules/services/deployable-monitor/core/src/main/resources/META-INF/jonas-deployable-monitor-core.bnd b/modules/services/deployable-monitor/core/src/main/resources/META-INF/jonas-deployable-monitor-core.bnd similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/resources/META-INF/jonas-deployable-monitor-core.bnd rename to modules/services/deployable-monitor/core/src/main/resources/META-INF/jonas-deployable-monitor-core.bnd diff --git a/jonas/modules/services/deployable-monitor/core/src/main/resources/metadata.xml b/modules/services/deployable-monitor/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/resources/metadata.xml rename to modules/services/deployable-monitor/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/deployable-monitor/core/src/main/resources/org/ow2/jonas/deployablemonitor/mbeans-descriptors.xml b/modules/services/deployable-monitor/core/src/main/resources/org/ow2/jonas/deployablemonitor/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/resources/org/ow2/jonas/deployablemonitor/mbeans-descriptors.xml rename to modules/services/deployable-monitor/core/src/main/resources/org/ow2/jonas/deployablemonitor/mbeans-descriptors.xml diff --git a/jonas/modules/services/deployable-monitor/core/src/main/templates/jonas-depmonitor.properties.template b/modules/services/deployable-monitor/core/src/main/templates/jonas-depmonitor.properties.template similarity index 100% rename from jonas/modules/services/deployable-monitor/core/src/main/templates/jonas-depmonitor.properties.template rename to modules/services/deployable-monitor/core/src/main/templates/jonas-depmonitor.properties.template diff --git a/jonas/modules/services/deployable-monitor/pom.xml b/modules/services/deployable-monitor/pom.xml similarity index 100% rename from jonas/modules/services/deployable-monitor/pom.xml rename to modules/services/deployable-monitor/pom.xml diff --git a/jonas/modules/services/ejb/ejb-2.1/ant/pom.xml b/modules/services/ejb/ejb-2.1/ant/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/ant/pom.xml rename to modules/services/ejb/ejb-2.1/ant/pom.xml diff --git a/jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/DescriptorHandler.java b/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/DescriptorHandler.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/DescriptorHandler.java rename to modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/DescriptorHandler.java diff --git a/jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/EJBDeploymentTool.java b/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/EJBDeploymentTool.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/EJBDeploymentTool.java rename to modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/EJBDeploymentTool.java diff --git a/jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/EjbJar.java b/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/EjbJar.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/EjbJar.java rename to modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/EjbJar.java diff --git a/jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/GenICTask.java b/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/GenICTask.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/GenICTask.java rename to modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/GenICTask.java diff --git a/jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/GenericDeploymentTool.java b/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/GenericDeploymentTool.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/GenericDeploymentTool.java rename to modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/GenericDeploymentTool.java diff --git a/jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/JonasDeploymentTool.java b/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/JonasDeploymentTool.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/JonasDeploymentTool.java rename to modules/services/ejb/ejb-2.1/ant/src/main/java/org/ow2/jonas/antmodular/ejb2/JonasDeploymentTool.java diff --git a/jonas/modules/services/ejb/ejb-2.1/ant/src/main/resources/META-INF/jonas-ejb-2.1-ant.bnd b/modules/services/ejb/ejb-2.1/ant/src/main/resources/META-INF/jonas-ejb-2.1-ant.bnd similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/ant/src/main/resources/META-INF/jonas-ejb-2.1-ant.bnd rename to modules/services/ejb/ejb-2.1/ant/src/main/resources/META-INF/jonas-ejb-2.1-ant.bnd diff --git a/jonas/modules/services/ejb/ejb-2.1/ant/src/main/resources/antlib-ejbjar.xml b/modules/services/ejb/ejb-2.1/ant/src/main/resources/antlib-ejbjar.xml similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/ant/src/main/resources/antlib-ejbjar.xml rename to modules/services/ejb/ejb-2.1/ant/src/main/resources/antlib-ejbjar.xml diff --git a/jonas/modules/services/ejb/ejb-2.1/core/pom.xml b/modules/services/ejb/ejb-2.1/core/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/pom.xml rename to modules/services/ejb/ejb-2.1/core/pom.xml diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/EJB21Deployer.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/EJB21Deployer.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/EJB21Deployer.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/EJB21Deployer.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JOnASEJBService.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JOnASEJBService.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JOnASEJBService.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JOnASEJBService.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JOnASEJBServiceMBean.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JOnASEJBServiceMBean.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JOnASEJBServiceMBean.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JOnASEJBServiceMBean.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JarCleanTask.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JarCleanTask.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JarCleanTask.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/JarCleanTask.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/PrincipalFactoryImpl.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/PrincipalFactoryImpl.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/PrincipalFactoryImpl.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/PrincipalFactoryImpl.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/delegate/HandleDelegateCCFDelegate.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/delegate/HandleDelegateCCFDelegate.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/delegate/HandleDelegateCCFDelegate.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/delegate/HandleDelegateCCFDelegate.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/delegate/JTimerHandleDelegate.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/delegate/JTimerHandleDelegate.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/delegate/JTimerHandleDelegate.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/delegate/JTimerHandleDelegate.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EJB.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EJB.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EJB.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EJB.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EJBModule.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EJBModule.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EJBModule.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EJBModule.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EntityBean.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EntityBean.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EntityBean.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/EntityBean.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/MessageDrivenBean.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/MessageDrivenBean.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/MessageDrivenBean.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/MessageDrivenBean.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/SessionBean.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/SessionBean.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/SessionBean.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/SessionBean.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/StatefulSessionBean.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/StatefulSessionBean.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/StatefulSessionBean.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/StatefulSessionBean.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/StatelessSessionBean.java b/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/StatelessSessionBean.java similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/StatelessSessionBean.java rename to modules/services/ejb/ejb-2.1/core/src/main/java/org/ow2/jonas/ejb2/internal/mbean/StatelessSessionBean.java diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/ClientStubGen b/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/ClientStubGen similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/ClientStubGen rename to modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/ClientStubGen diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/ClientStubGen.bat b/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/ClientStubGen.bat similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/ClientStubGen.bat rename to modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/ClientStubGen.bat diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/GenIC b/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/GenIC similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/GenIC rename to modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/GenIC diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/GenIC.bat b/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/GenIC.bat similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/GenIC.bat rename to modules/services/ejb/ejb-2.1/core/src/main/jonas-resources/bin/GenIC.bat diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/resources/META-INF/jonas-ejb-2.1-core.bnd b/modules/services/ejb/ejb-2.1/core/src/main/resources/META-INF/jonas-ejb-2.1-core.bnd similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/resources/META-INF/jonas-ejb-2.1-core.bnd rename to modules/services/ejb/ejb-2.1/core/src/main/resources/META-INF/jonas-ejb-2.1-core.bnd diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/resources/metadata.xml b/modules/services/ejb/ejb-2.1/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/resources/metadata.xml rename to modules/services/ejb/ejb-2.1/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/resources/org/ow2/jonas/ejb2/internal/mbeans-descriptors.xml b/modules/services/ejb/ejb-2.1/core/src/main/resources/org/ow2/jonas/ejb2/internal/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/resources/org/ow2/jonas/ejb2/internal/mbeans-descriptors.xml rename to modules/services/ejb/ejb-2.1/core/src/main/resources/org/ow2/jonas/ejb2/internal/mbeans-descriptors.xml diff --git a/jonas/modules/services/ejb/ejb-2.1/core/src/main/templates/jonas-ejb2.properties.template b/modules/services/ejb/ejb-2.1/core/src/main/templates/jonas-ejb2.properties.template similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/core/src/main/templates/jonas-ejb2.properties.template rename to modules/services/ejb/ejb-2.1/core/src/main/templates/jonas-ejb2.properties.template diff --git a/jonas/modules/services/ejb/ejb-2.1/pom.xml b/modules/services/ejb/ejb-2.1/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb-2.1/pom.xml rename to modules/services/ejb/ejb-2.1/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/base/pom.xml b/modules/services/ejb/ejb3/ant/base/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/base/pom.xml rename to modules/services/ejb/ejb3/ant/base/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/ejb3/Ejb3.java b/modules/services/ejb/ejb3/ant/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/ejb3/Ejb3.java similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/ejb3/Ejb3.java rename to modules/services/ejb/ejb3/ant/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/ejb3/Ejb3.java diff --git a/jonas/modules/services/ejb/ejb3/ant/base/src/main/resources/antlib-ejb3.xml b/modules/services/ejb/ejb3/ant/base/src/main/resources/antlib-ejb3.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/base/src/main/resources/antlib-ejb3.xml rename to modules/services/ejb/ejb3/ant/base/src/main/resources/antlib-ejb3.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/base/src/main/resources/build-ejb3.properties.template b/modules/services/ejb/ejb3/ant/base/src/main/resources/build-ejb3.properties.template similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/base/src/main/resources/build-ejb3.properties.template rename to modules/services/ejb/ejb3/ant/base/src/main/resources/build-ejb3.properties.template diff --git a/jonas/modules/services/ejb/ejb3/ant/base/src/main/resources/build-ejb3.xml b/modules/services/ejb/ejb3/ant/base/src/main/resources/build-ejb3.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/base/src/main/resources/build-ejb3.xml rename to modules/services/ejb/ejb3/ant/base/src/main/resources/build-ejb3.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/eclipselink-1.1/pom.xml b/modules/services/ejb/ejb3/ant/eclipselink-1.1/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/eclipselink-1.1/pom.xml rename to modules/services/ejb/ejb3/ant/eclipselink-1.1/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/eclipselink-1.1/src/main/resources/build-ejb3-provider-eclipselink1.1.properties b/modules/services/ejb/ejb3/ant/eclipselink-1.1/src/main/resources/build-ejb3-provider-eclipselink1.1.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/eclipselink-1.1/src/main/resources/build-ejb3-provider-eclipselink1.1.properties rename to modules/services/ejb/ejb3/ant/eclipselink-1.1/src/main/resources/build-ejb3-provider-eclipselink1.1.properties diff --git a/jonas/modules/services/ejb/ejb3/ant/eclipselink-2.2/pom.xml b/modules/services/ejb/ejb3/ant/eclipselink-2.2/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/eclipselink-2.2/pom.xml rename to modules/services/ejb/ejb3/ant/eclipselink-2.2/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/eclipselink-2.2/src/main/resources/build-ejb3-provider-eclipselink2.2.properties b/modules/services/ejb/ejb3/ant/eclipselink-2.2/src/main/resources/build-ejb3-provider-eclipselink2.2.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/eclipselink-2.2/src/main/resources/build-ejb3-provider-eclipselink2.2.properties rename to modules/services/ejb/ejb3/ant/eclipselink-2.2/src/main/resources/build-ejb3-provider-eclipselink2.2.properties diff --git a/jonas/modules/services/ejb/ejb3/ant/eclipselink-2.3/pom.xml b/modules/services/ejb/ejb3/ant/eclipselink-2.3/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/eclipselink-2.3/pom.xml rename to modules/services/ejb/ejb3/ant/eclipselink-2.3/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/eclipselink-2.3/src/main/resources/build-ejb3-provider-eclipselink2.3.properties b/modules/services/ejb/ejb3/ant/eclipselink-2.3/src/main/resources/build-ejb3-provider-eclipselink2.3.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/eclipselink-2.3/src/main/resources/build-ejb3-provider-eclipselink2.3.properties rename to modules/services/ejb/ejb3/ant/eclipselink-2.3/src/main/resources/build-ejb3-provider-eclipselink2.3.properties diff --git a/jonas/modules/services/ejb/ejb3/ant/hibernate-3.6/pom.xml b/modules/services/ejb/ejb3/ant/hibernate-3.6/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/hibernate-3.6/pom.xml rename to modules/services/ejb/ejb3/ant/hibernate-3.6/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/hibernate-3.6/src/main/resources/build-ejb3-provider-hibernate3.6.properties b/modules/services/ejb/ejb3/ant/hibernate-3.6/src/main/resources/build-ejb3-provider-hibernate3.6.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/hibernate-3.6/src/main/resources/build-ejb3-provider-hibernate3.6.properties rename to modules/services/ejb/ejb3/ant/hibernate-3.6/src/main/resources/build-ejb3-provider-hibernate3.6.properties diff --git a/jonas/modules/services/ejb/ejb3/ant/hibernate-4.1/pom.xml b/modules/services/ejb/ejb3/ant/hibernate-4.1/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/hibernate-4.1/pom.xml rename to modules/services/ejb/ejb3/ant/hibernate-4.1/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/hibernate-4.1/src/main/resources/build-ejb3-provider-hibernate4.1.properties b/modules/services/ejb/ejb3/ant/hibernate-4.1/src/main/resources/build-ejb3-provider-hibernate4.1.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/hibernate-4.1/src/main/resources/build-ejb3-provider-hibernate4.1.properties rename to modules/services/ejb/ejb3/ant/hibernate-4.1/src/main/resources/build-ejb3-provider-hibernate4.1.properties diff --git a/jonas/modules/services/ejb/ejb3/ant/openjpa/pom.xml b/modules/services/ejb/ejb3/ant/openjpa/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/openjpa/pom.xml rename to modules/services/ejb/ejb3/ant/openjpa/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/openjpa/src/main/resources/build-ejb3-provider-openjpa.properties b/modules/services/ejb/ejb3/ant/openjpa/src/main/resources/build-ejb3-provider-openjpa.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/openjpa/src/main/resources/build-ejb3-provider-openjpa.properties rename to modules/services/ejb/ejb3/ant/openjpa/src/main/resources/build-ejb3-provider-openjpa.properties diff --git a/jonas/modules/services/ejb/ejb3/ant/openjpa2/pom.xml b/modules/services/ejb/ejb3/ant/openjpa2/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/openjpa2/pom.xml rename to modules/services/ejb/ejb3/ant/openjpa2/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/ant/openjpa2/src/main/resources/build-ejb3-provider-openjpa2.properties b/modules/services/ejb/ejb3/ant/openjpa2/src/main/resources/build-ejb3-provider-openjpa2.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/openjpa2/src/main/resources/build-ejb3-provider-openjpa2.properties rename to modules/services/ejb/ejb3/ant/openjpa2/src/main/resources/build-ejb3-provider-openjpa2.properties diff --git a/jonas/modules/services/ejb/ejb3/ant/pom.xml b/modules/services/ejb/ejb3/ant/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/ant/pom.xml rename to modules/services/ejb/ejb3/ant/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/easybeans/addon/pom.xml b/modules/services/ejb/ejb3/easybeans/addon/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/addon/pom.xml rename to modules/services/ejb/ejb3/easybeans/addon/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/easybeans/addon/src/main/assembly/assembly.xml b/modules/services/ejb/ejb3/easybeans/addon/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/addon/src/main/assembly/assembly.xml rename to modules/services/ejb/ejb3/easybeans/addon/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/ejb/ejb3/easybeans/addon/src/main/resources/META-INF/jonas-addon.xml b/modules/services/ejb/ejb3/easybeans/addon/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/addon/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/ejb/ejb3/easybeans/addon/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/pom.xml b/modules/services/ejb/ejb3/easybeans/core/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/pom.xml rename to modules/services/ejb/ejb3/easybeans/core/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EJB3CleanTask.java b/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EJB3CleanTask.java similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EJB3CleanTask.java rename to modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EJB3CleanTask.java diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EasyBeansDeployer.java b/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EasyBeansDeployer.java similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EasyBeansDeployer.java rename to modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EasyBeansDeployer.java diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EasyBeansService.java b/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EasyBeansService.java similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EasyBeansService.java rename to modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/EasyBeansService.java diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASENCInterceptor.java b/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASENCInterceptor.java similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASENCInterceptor.java rename to modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASENCInterceptor.java diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASResourceAdapterFinder.java b/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASResourceAdapterFinder.java similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASResourceAdapterFinder.java rename to modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASResourceAdapterFinder.java diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASSecurityContextWrapper.java b/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASSecurityContextWrapper.java similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASSecurityContextWrapper.java rename to modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASSecurityContextWrapper.java diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASSecurityCurrent.java b/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASSecurityCurrent.java similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASSecurityCurrent.java rename to modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/JOnASSecurityCurrent.java diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/PrefixedNamingStrategy.java b/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/PrefixedNamingStrategy.java similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/PrefixedNamingStrategy.java rename to modules/services/ejb/ejb3/easybeans/core/src/main/java/org/ow2/jonas/ejb/easybeans/PrefixedNamingStrategy.java diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/jonas-resources/conf/easybeans-jonas.xml b/modules/services/ejb/ejb3/easybeans/core/src/main/jonas-resources/conf/easybeans-jonas.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/jonas-resources/conf/easybeans-jonas.xml rename to modules/services/ejb/ejb3/easybeans/core/src/main/jonas-resources/conf/easybeans-jonas.xml diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink1.1.properties b/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink1.1.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink1.1.properties rename to modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink1.1.properties diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink2.2.properties b/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink2.2.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink2.2.properties rename to modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink2.2.properties diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink2.3.properties b/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink2.3.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink2.3.properties rename to modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-eclipselink2.3.properties diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-hibernate3.6.properties b/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-hibernate3.6.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-hibernate3.6.properties rename to modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-hibernate3.6.properties diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-hibernate4.1.properties b/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-hibernate4.1.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-hibernate4.1.properties rename to modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-hibernate4.1.properties diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-openjpa.properties b/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-openjpa.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-openjpa.properties rename to modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-openjpa.properties diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-openjpa2.properties b/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-openjpa2.properties similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-openjpa2.properties rename to modules/services/ejb/ejb3/easybeans/core/src/main/properties/jonas-ejb3-openjpa2.properties diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/resources/META-INF/jonas-ejb-easybeans-core.bnd b/modules/services/ejb/ejb3/easybeans/core/src/main/resources/META-INF/jonas-ejb-easybeans-core.bnd similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/resources/META-INF/jonas-ejb-easybeans-core.bnd rename to modules/services/ejb/ejb3/easybeans/core/src/main/resources/META-INF/jonas-ejb-easybeans-core.bnd diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/resources/easybeans-cluster-jonas.xml b/modules/services/ejb/ejb3/easybeans/core/src/main/resources/easybeans-cluster-jonas.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/resources/easybeans-cluster-jonas.xml rename to modules/services/ejb/ejb3/easybeans/core/src/main/resources/easybeans-cluster-jonas.xml diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/resources/metadata.xml b/modules/services/ejb/ejb3/easybeans/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/resources/metadata.xml rename to modules/services/ejb/ejb3/easybeans/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/resources/org/ow2/jonas/ejb/easybeans/mbeans-descriptors.xml b/modules/services/ejb/ejb3/easybeans/core/src/main/resources/org/ow2/jonas/ejb/easybeans/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/resources/org/ow2/jonas/ejb/easybeans/mbeans-descriptors.xml rename to modules/services/ejb/ejb3/easybeans/core/src/main/resources/org/ow2/jonas/ejb/easybeans/mbeans-descriptors.xml diff --git a/jonas/modules/services/ejb/ejb3/easybeans/core/src/main/templates/jonas-ejb3.properties.template b/modules/services/ejb/ejb3/easybeans/core/src/main/templates/jonas-ejb3.properties.template similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/core/src/main/templates/jonas-ejb3.properties.template rename to modules/services/ejb/ejb3/easybeans/core/src/main/templates/jonas-ejb3.properties.template diff --git a/jonas/modules/services/ejb/ejb3/easybeans/pom.xml b/modules/services/ejb/ejb3/easybeans/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/easybeans/pom.xml rename to modules/services/ejb/ejb3/easybeans/pom.xml diff --git a/jonas/modules/services/ejb/ejb3/pom.xml b/modules/services/ejb/ejb3/pom.xml similarity index 100% rename from jonas/modules/services/ejb/ejb3/pom.xml rename to modules/services/ejb/ejb3/pom.xml diff --git a/jonas/modules/services/ejb/pom.xml b/modules/services/ejb/pom.xml similarity index 100% rename from jonas/modules/services/ejb/pom.xml rename to modules/services/ejb/pom.xml diff --git a/jonas/modules/services/event-provider/api/pom.xml b/modules/services/event-provider/api/pom.xml similarity index 100% rename from jonas/modules/services/event-provider/api/pom.xml rename to modules/services/event-provider/api/pom.xml diff --git a/jonas/modules/services/event-provider/api/src/main/META-INF/event-provider-api.bnd b/modules/services/event-provider/api/src/main/META-INF/event-provider-api.bnd similarity index 100% rename from jonas/modules/services/event-provider/api/src/main/META-INF/event-provider-api.bnd rename to modules/services/event-provider/api/src/main/META-INF/event-provider-api.bnd diff --git a/jonas/modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/Event.java b/modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/Event.java similarity index 100% rename from jonas/modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/Event.java rename to modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/Event.java diff --git a/jonas/modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/EventLevel.java b/modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/EventLevel.java similarity index 100% rename from jonas/modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/EventLevel.java rename to modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/EventLevel.java diff --git a/jonas/modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/IEventProvider.java b/modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/IEventProvider.java similarity index 100% rename from jonas/modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/IEventProvider.java rename to modules/services/event-provider/api/src/main/java/org/ow2/jonas/event/provider/api/IEventProvider.java diff --git a/jonas/modules/services/event-provider/core/pom.xml b/modules/services/event-provider/core/pom.xml similarity index 100% rename from jonas/modules/services/event-provider/core/pom.xml rename to modules/services/event-provider/core/pom.xml diff --git a/jonas/modules/services/event-provider/core/src/main/java/org/ow2/jonas/event/provider/internal/EventProviderComponent.java b/modules/services/event-provider/core/src/main/java/org/ow2/jonas/event/provider/internal/EventProviderComponent.java similarity index 100% rename from jonas/modules/services/event-provider/core/src/main/java/org/ow2/jonas/event/provider/internal/EventProviderComponent.java rename to modules/services/event-provider/core/src/main/java/org/ow2/jonas/event/provider/internal/EventProviderComponent.java diff --git a/jonas/modules/services/event-provider/core/src/main/jonas-resources/conf/event-provider.properties b/modules/services/event-provider/core/src/main/jonas-resources/conf/event-provider.properties similarity index 100% rename from jonas/modules/services/event-provider/core/src/main/jonas-resources/conf/event-provider.properties rename to modules/services/event-provider/core/src/main/jonas-resources/conf/event-provider.properties diff --git a/jonas/modules/services/event-provider/core/src/main/resources/META-INF/event-provider-core.bnd b/modules/services/event-provider/core/src/main/resources/META-INF/event-provider-core.bnd similarity index 100% rename from jonas/modules/services/event-provider/core/src/main/resources/META-INF/event-provider-core.bnd rename to modules/services/event-provider/core/src/main/resources/META-INF/event-provider-core.bnd diff --git a/jonas/modules/services/event-provider/core/src/main/resources/metadata.xml b/modules/services/event-provider/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/event-provider/core/src/main/resources/metadata.xml rename to modules/services/event-provider/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/event-provider/pom.xml b/modules/services/event-provider/pom.xml similarity index 100% rename from jonas/modules/services/event-provider/pom.xml rename to modules/services/event-provider/pom.xml diff --git a/jonas/modules/services/ipojo-handler/pom.xml b/modules/services/ipojo-handler/pom.xml similarity index 100% rename from jonas/modules/services/ipojo-handler/pom.xml rename to modules/services/ipojo-handler/pom.xml diff --git a/jonas/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/ComponentInstanceState.java b/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/ComponentInstanceState.java similarity index 100% rename from jonas/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/ComponentInstanceState.java rename to modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/ComponentInstanceState.java diff --git a/jonas/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/IInstanceProvider.java b/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/IInstanceProvider.java similarity index 100% rename from jonas/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/IInstanceProvider.java rename to modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/IInstanceProvider.java diff --git a/jonas/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/Interceptor.java b/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/Interceptor.java similarity index 100% rename from jonas/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/Interceptor.java rename to modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/Interceptor.java diff --git a/jonas/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/internal/handler/iPOJOInterceptor.java b/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/internal/handler/iPOJOInterceptor.java similarity index 100% rename from jonas/modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/internal/handler/iPOJOInterceptor.java rename to modules/services/ipojo-handler/src/main/java/org/ow2/jonas/ipojo/interceptor/internal/handler/iPOJOInterceptor.java diff --git a/jonas/modules/services/ipojo-handler/src/main/resources/metadata.xml b/modules/services/ipojo-handler/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/ipojo-handler/src/main/resources/metadata.xml rename to modules/services/ipojo-handler/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jaxrs-jersey/core/pom.xml b/modules/services/jaxrs-jersey/core/pom.xml similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/pom.xml rename to modules/services/jaxrs-jersey/core/pom.xml diff --git a/jonas/modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyApplicationPublisher.java b/modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyApplicationPublisher.java similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyApplicationPublisher.java rename to modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyApplicationPublisher.java diff --git a/jonas/modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyService.java b/modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyService.java similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyService.java rename to modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyService.java diff --git a/jonas/modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/PathUtils.java b/modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/PathUtils.java similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/PathUtils.java rename to modules/services/jaxrs-jersey/core/src/main/java/org/ow2/jonas/jaxrs/jersey/internal/PathUtils.java diff --git a/jonas/modules/services/jaxrs-jersey/core/src/main/resources/META-INF/jaxrs-jersey-core.bnd b/modules/services/jaxrs-jersey/core/src/main/resources/META-INF/jaxrs-jersey-core.bnd similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/src/main/resources/META-INF/jaxrs-jersey-core.bnd rename to modules/services/jaxrs-jersey/core/src/main/resources/META-INF/jaxrs-jersey-core.bnd diff --git a/jonas/modules/services/jaxrs-jersey/core/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter b/modules/services/jaxrs-jersey/core/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter rename to modules/services/jaxrs-jersey/core/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter diff --git a/jonas/modules/services/jaxrs-jersey/core/src/main/resources/metadata.xml b/modules/services/jaxrs-jersey/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/src/main/resources/metadata.xml rename to modules/services/jaxrs-jersey/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jaxrs-jersey/core/src/main/templates/jonas-jax-rs.properties.template b/modules/services/jaxrs-jersey/core/src/main/templates/jonas-jax-rs.properties.template similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/src/main/templates/jonas-jax-rs.properties.template rename to modules/services/jaxrs-jersey/core/src/main/templates/jonas-jax-rs.properties.template diff --git a/jonas/modules/services/jaxrs-jersey/core/src/test/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyApplicationPublisherTestCase.java b/modules/services/jaxrs-jersey/core/src/test/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyApplicationPublisherTestCase.java similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/src/test/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyApplicationPublisherTestCase.java rename to modules/services/jaxrs-jersey/core/src/test/java/org/ow2/jonas/jaxrs/jersey/internal/JerseyApplicationPublisherTestCase.java diff --git a/jonas/modules/services/jaxrs-jersey/core/src/test/java/org/ow2/jonas/jaxrs/jersey/internal/PathUtilsTestCase.java b/modules/services/jaxrs-jersey/core/src/test/java/org/ow2/jonas/jaxrs/jersey/internal/PathUtilsTestCase.java similarity index 100% rename from jonas/modules/services/jaxrs-jersey/core/src/test/java/org/ow2/jonas/jaxrs/jersey/internal/PathUtilsTestCase.java rename to modules/services/jaxrs-jersey/core/src/test/java/org/ow2/jonas/jaxrs/jersey/internal/PathUtilsTestCase.java diff --git a/jonas/modules/services/jaxrs-jersey/pom.xml b/modules/services/jaxrs-jersey/pom.xml similarity index 100% rename from jonas/modules/services/jaxrs-jersey/pom.xml rename to modules/services/jaxrs-jersey/pom.xml diff --git a/jonas/modules/services/jms-joram/addon/pom.xml b/modules/services/jms-joram/addon/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/addon/pom.xml rename to modules/services/jms-joram/addon/pom.xml diff --git a/jonas/modules/services/jms-joram/addon/src/main/assembly/assembly.xml b/modules/services/jms-joram/addon/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/jms-joram/addon/src/main/assembly/assembly.xml rename to modules/services/jms-joram/addon/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/jms-joram/addon/src/main/resources/META-INF/jms-joram-addon-plan.xml b/modules/services/jms-joram/addon/src/main/resources/META-INF/jms-joram-addon-plan.xml similarity index 100% rename from jonas/modules/services/jms-joram/addon/src/main/resources/META-INF/jms-joram-addon-plan.xml rename to modules/services/jms-joram/addon/src/main/resources/META-INF/jms-joram-addon-plan.xml diff --git a/jonas/modules/services/jms-joram/addon/src/main/resources/META-INF/jonas-addon.xml b/modules/services/jms-joram/addon/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/jms-joram/addon/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/jms-joram/addon/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/jms-joram/ant/pom.xml b/modules/services/jms-joram/ant/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/ant/pom.xml rename to modules/services/jms-joram/ant/pom.xml diff --git a/jonas/modules/services/jms-joram/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jms/Jms.java b/modules/services/jms-joram/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jms/Jms.java similarity index 100% rename from jonas/modules/services/jms-joram/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jms/Jms.java rename to modules/services/jms-joram/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jms/Jms.java diff --git a/jonas/modules/services/jms-joram/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jms/JmsRa.java b/modules/services/jms-joram/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jms/JmsRa.java similarity index 100% rename from jonas/modules/services/jms-joram/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jms/JmsRa.java rename to modules/services/jms-joram/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jms/JmsRa.java diff --git a/jonas/modules/services/jms-joram/ant/src/main/resources/antlib-jms.xml b/modules/services/jms-joram/ant/src/main/resources/antlib-jms.xml similarity index 100% rename from jonas/modules/services/jms-joram/ant/src/main/resources/antlib-jms.xml rename to modules/services/jms-joram/ant/src/main/resources/antlib-jms.xml diff --git a/jonas/modules/services/jms-joram/ant/src/main/resources/build-jms.properties.template b/modules/services/jms-joram/ant/src/main/resources/build-jms.properties.template similarity index 100% rename from jonas/modules/services/jms-joram/ant/src/main/resources/build-jms.properties.template rename to modules/services/jms-joram/ant/src/main/resources/build-jms.properties.template diff --git a/jonas/modules/services/jms-joram/ant/src/main/resources/build-jms.xml b/modules/services/jms-joram/ant/src/main/resources/build-jms.xml similarity index 100% rename from jonas/modules/services/jms-joram/ant/src/main/resources/build-jms.xml rename to modules/services/jms-joram/ant/src/main/resources/build-jms.xml diff --git a/jonas/modules/services/jms-joram/core/pom.xml b/modules/services/jms-joram/core/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/core/pom.xml rename to modules/services/jms-joram/core/pom.xml diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/bin/JmsServer b/modules/services/jms-joram/core/src/main/jonas-resources/bin/JmsServer similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/bin/JmsServer rename to modules/services/jms-joram/core/src/main/jonas-resources/bin/JmsServer diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/bin/JmsServer.bat b/modules/services/jms-joram/core/src/main/jonas-resources/bin/JmsServer.bat similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/bin/JmsServer.bat rename to modules/services/jms-joram/core/src/main/jonas-resources/bin/JmsServer.bat diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/bin/joram_raconfig b/modules/services/jms-joram/core/src/main/jonas-resources/bin/joram_raconfig similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/bin/joram_raconfig rename to modules/services/jms-joram/core/src/main/jonas-resources/bin/joram_raconfig diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/bin/joram_raconfig.bat b/modules/services/jms-joram/core/src/main/jonas-resources/bin/joram_raconfig.bat similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/bin/joram_raconfig.bat rename to modules/services/jms-joram/core/src/main/jonas-resources/bin/joram_raconfig.bat diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/conf/a3debug.cfg b/modules/services/jms-joram/core/src/main/jonas-resources/conf/a3debug.cfg similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/conf/a3debug.cfg rename to modules/services/jms-joram/core/src/main/jonas-resources/conf/a3debug.cfg diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/conf/a3servers.xml b/modules/services/jms-joram/core/src/main/jonas-resources/conf/a3servers.xml similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/conf/a3servers.xml rename to modules/services/jms-joram/core/src/main/jonas-resources/conf/a3servers.xml diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/conf/joramAdmin.xml b/modules/services/jms-joram/core/src/main/jonas-resources/conf/joramAdmin.xml similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/conf/joramAdmin.xml rename to modules/services/jms-joram/core/src/main/jonas-resources/conf/joramAdmin.xml diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/deploy-addon/joramAdminConfigForAddons.xml b/modules/services/jms-joram/core/src/main/jonas-resources/deploy-addon/joramAdminConfigForAddons.xml similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/deploy-addon/joramAdminConfigForAddons.xml rename to modules/services/jms-joram/core/src/main/jonas-resources/deploy-addon/joramAdminConfigForAddons.xml diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/deploy-example/joramAdminConfigExample.xml b/modules/services/jms-joram/core/src/main/jonas-resources/deploy-example/joramAdminConfigExample.xml similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/deploy-example/joramAdminConfigExample.xml rename to modules/services/jms-joram/core/src/main/jonas-resources/deploy-example/joramAdminConfigExample.xml diff --git a/jonas/modules/services/jms-joram/core/src/main/jonas-resources/deploy/joramAdminConfig.xml b/modules/services/jms-joram/core/src/main/jonas-resources/deploy/joramAdminConfig.xml similarity index 100% rename from jonas/modules/services/jms-joram/core/src/main/jonas-resources/deploy/joramAdminConfig.xml rename to modules/services/jms-joram/core/src/main/jonas-resources/deploy/joramAdminConfig.xml diff --git a/jonas/modules/services/jms-joram/plans/client/pom.xml b/modules/services/jms-joram/plans/client/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/plans/client/pom.xml rename to modules/services/jms-joram/plans/client/pom.xml diff --git a/jonas/modules/services/jms-joram/plans/pom.xml b/modules/services/jms-joram/plans/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/plans/pom.xml rename to modules/services/jms-joram/plans/pom.xml diff --git a/jonas/modules/services/jms-joram/plans/server/pom.xml b/modules/services/jms-joram/plans/server/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/plans/server/pom.xml rename to modules/services/jms-joram/plans/server/pom.xml diff --git a/jonas/modules/services/jms-joram/pom.xml b/modules/services/jms-joram/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/pom.xml rename to modules/services/jms-joram/pom.xml diff --git a/jonas/modules/services/jms-joram/provisionning/directory-provisionning/pom.xml b/modules/services/jms-joram/provisionning/directory-provisionning/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/provisionning/directory-provisionning/pom.xml rename to modules/services/jms-joram/provisionning/directory-provisionning/pom.xml diff --git a/jonas/modules/services/jms-joram/provisionning/legacy-provisionning/pom.xml b/modules/services/jms-joram/provisionning/legacy-provisionning/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/provisionning/legacy-provisionning/pom.xml rename to modules/services/jms-joram/provisionning/legacy-provisionning/pom.xml diff --git a/jonas/modules/services/jms-joram/provisionning/new-provisionning/pom.xml b/modules/services/jms-joram/provisionning/new-provisionning/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/provisionning/new-provisionning/pom.xml rename to modules/services/jms-joram/provisionning/new-provisionning/pom.xml diff --git a/jonas/modules/services/jms-joram/provisionning/pom.xml b/modules/services/jms-joram/provisionning/pom.xml similarity index 100% rename from jonas/modules/services/jms-joram/provisionning/pom.xml rename to modules/services/jms-joram/provisionning/pom.xml diff --git a/jonas/modules/services/jndi-interceptors/core/pom.xml b/modules/services/jndi-interceptors/core/pom.xml similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/pom.xml rename to modules/services/jndi-interceptors/core/pom.xml diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/config/jndi-interceptors.xml b/modules/services/jndi-interceptors/core/src/main/config/jndi-interceptors.xml similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/config/jndi-interceptors.xml rename to modules/services/jndi-interceptors/core/src/main/config/jndi-interceptors.xml diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/checker/impl/ResourceCheckerManager.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/checker/impl/ResourceCheckerManager.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/checker/impl/ResourceCheckerManager.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/checker/impl/ResourceCheckerManager.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/AbsContextInterceptor.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/AbsContextInterceptor.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/AbsContextInterceptor.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/AbsContextInterceptor.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/Interceptors.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/Interceptors.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/Interceptors.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/Interceptors.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/JNDIInterceptorsComponent.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/JNDIInterceptorsComponent.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/JNDIInterceptorsComponent.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/JNDIInterceptorsComponent.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/JNDIInterceptorsComponentException.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/JNDIInterceptorsComponentException.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/JNDIInterceptorsComponentException.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/JNDIInterceptorsComponentException.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/audit/AuditSystemContextInterceptor.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/audit/AuditSystemContextInterceptor.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/audit/AuditSystemContextInterceptor.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/audit/AuditSystemContextInterceptor.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/audit/AuditSystemContextInterceptorAdapter.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/audit/AuditSystemContextInterceptorAdapter.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/audit/AuditSystemContextInterceptorAdapter.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/audit/AuditSystemContextInterceptorAdapter.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/ConnectionProxy.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/ConnectionProxy.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/ConnectionProxy.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/ConnectionProxy.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DataSourceLeakDetectorContextInterceptor.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DataSourceLeakDetectorContextInterceptor.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DataSourceLeakDetectorContextInterceptor.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DataSourceLeakDetectorContextInterceptor.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DatasourceWrapper.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DatasourceWrapper.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DatasourceWrapper.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DatasourceWrapper.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/NonTransactionalConnectionProxy.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/NonTransactionalConnectionProxy.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/NonTransactionalConnectionProxy.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/NonTransactionalConnectionProxy.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/TransactionalConnectionProxy.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/TransactionalConnectionProxy.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/TransactionalConnectionProxy.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/datasource/TransactionalConnectionProxy.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/easybeans/ResourceCheckerConfigurationExtension.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/easybeans/ResourceCheckerConfigurationExtension.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/easybeans/ResourceCheckerConfigurationExtension.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/easybeans/ResourceCheckerConfigurationExtension.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/easybeans/ResourceCheckerInterceptor.java b/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/easybeans/ResourceCheckerInterceptor.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/easybeans/ResourceCheckerInterceptor.java rename to modules/services/jndi-interceptors/core/src/main/java/org/ow2/jonas/jndi/interceptors/impl/easybeans/ResourceCheckerInterceptor.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/resources/META-INF/jndi-interceptors-core.bnd b/modules/services/jndi-interceptors/core/src/main/resources/META-INF/jndi-interceptors-core.bnd similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/resources/META-INF/jndi-interceptors-core.bnd rename to modules/services/jndi-interceptors/core/src/main/resources/META-INF/jndi-interceptors-core.bnd diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/resources/metadata.xml b/modules/services/jndi-interceptors/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/resources/metadata.xml rename to modules/services/jndi-interceptors/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/resources/org/ow2/jonas/jndi/interceptors/impl/mapping/jndi-interceptors-mapping.xml b/modules/services/jndi-interceptors/core/src/main/resources/org/ow2/jonas/jndi/interceptors/impl/mapping/jndi-interceptors-mapping.xml similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/resources/org/ow2/jonas/jndi/interceptors/impl/mapping/jndi-interceptors-mapping.xml rename to modules/services/jndi-interceptors/core/src/main/resources/org/ow2/jonas/jndi/interceptors/impl/mapping/jndi-interceptors-mapping.xml diff --git a/jonas/modules/services/jndi-interceptors/core/src/main/resources/org/ow2/jonas/jndi/interceptors/impl/mbeans-descriptors.xml b/modules/services/jndi-interceptors/core/src/main/resources/org/ow2/jonas/jndi/interceptors/impl/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/main/resources/org/ow2/jonas/jndi/interceptors/impl/mbeans-descriptors.xml rename to modules/services/jndi-interceptors/core/src/main/resources/org/ow2/jonas/jndi/interceptors/impl/mbeans-descriptors.xml diff --git a/jonas/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DataSourceLeakDetectorContextInterceptorTestCase.java b/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DataSourceLeakDetectorContextInterceptorTestCase.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DataSourceLeakDetectorContextInterceptorTestCase.java rename to modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DataSourceLeakDetectorContextInterceptorTestCase.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DatasourceWrapperTestCase.java b/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DatasourceWrapperTestCase.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DatasourceWrapperTestCase.java rename to modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/DatasourceWrapperTestCase.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/NonTransactionalConnectionProxyTestCase.java b/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/NonTransactionalConnectionProxyTestCase.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/NonTransactionalConnectionProxyTestCase.java rename to modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/NonTransactionalConnectionProxyTestCase.java diff --git a/jonas/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/TransactionalConnectionProxyTestCase.java b/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/TransactionalConnectionProxyTestCase.java similarity index 100% rename from jonas/modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/TransactionalConnectionProxyTestCase.java rename to modules/services/jndi-interceptors/core/src/test/java/org/ow2/jonas/jndi/interceptors/impl/datasource/TransactionalConnectionProxyTestCase.java diff --git a/jonas/modules/services/jndi-interceptors/pom.xml b/modules/services/jndi-interceptors/pom.xml similarity index 100% rename from jonas/modules/services/jndi-interceptors/pom.xml rename to modules/services/jndi-interceptors/pom.xml diff --git a/jonas/modules/services/jonas-addon/core/pom.xml b/modules/services/jonas-addon/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-addon/core/pom.xml rename to modules/services/jonas-addon/core/pom.xml diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/cleaner/AddonCleanTask.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/cleaner/AddonCleanTask.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/cleaner/AddonCleanTask.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/cleaner/AddonCleanTask.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/config/AddonConfigImpl.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/config/AddonConfigImpl.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/config/AddonConfigImpl.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/config/AddonConfigImpl.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/AddonDeployableImpl.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/AddonDeployableImpl.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/AddonDeployableImpl.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/AddonDeployableImpl.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/SortableDeployable.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/SortableDeployable.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/SortableDeployable.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/SortableDeployable.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/SortableDeployableComparator.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/SortableDeployableComparator.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/SortableDeployableComparator.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployable/SortableDeployableComparator.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/AddonDeployerImpl.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/AddonDeployerImpl.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/AddonDeployerImpl.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/AddonDeployerImpl.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/AddonMetaData.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/AddonMetaData.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/AddonMetaData.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/AddonMetaData.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/BinDeployerImpl.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/BinDeployerImpl.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/BinDeployerImpl.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/BinDeployerImpl.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/ConfDeployerImpl.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/ConfDeployerImpl.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/ConfDeployerImpl.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/ConfDeployerImpl.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/service/AddonDeployerComponent.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/service/AddonDeployerComponent.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/service/AddonDeployerComponent.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/deployer/service/AddonDeployerComponent.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/helper/service/AddonDeployableAnalyserComponent.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/helper/service/AddonDeployableAnalyserComponent.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/helper/service/AddonDeployableAnalyserComponent.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/helper/service/AddonDeployableAnalyserComponent.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonDeployerLog.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonDeployerLog.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonDeployerLog.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonDeployerLog.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonLogEntry.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonLogEntry.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonLogEntry.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonLogEntry.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonUtil.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonUtil.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonUtil.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/AddonUtil.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/Range.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/Range.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/Range.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/util/Range.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonDesc.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonDesc.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonDesc.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonDesc.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonPropertiesManager.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonPropertiesManager.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonPropertiesManager.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonPropertiesManager.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonVersion.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonVersion.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonVersion.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonVersion.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonXmlLoader.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonXmlLoader.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonXmlLoader.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/deploy/impl/xml/JonasAddonXmlLoader.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/properties/ServicePropertiesImpl.java b/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/properties/ServicePropertiesImpl.java similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/properties/ServicePropertiesImpl.java rename to modules/services/jonas-addon/core/src/main/java/org/ow2/jonas/addon/properties/ServicePropertiesImpl.java diff --git a/jonas/modules/services/jonas-addon/core/src/main/resources/META-INF/jonas-addon-1.0.xsd b/modules/services/jonas-addon/core/src/main/resources/META-INF/jonas-addon-1.0.xsd similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/resources/META-INF/jonas-addon-1.0.xsd rename to modules/services/jonas-addon/core/src/main/resources/META-INF/jonas-addon-1.0.xsd diff --git a/jonas/modules/services/jonas-addon/core/src/main/resources/META-INF/jonas-addon-core.bnd b/modules/services/jonas-addon/core/src/main/resources/META-INF/jonas-addon-core.bnd similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/resources/META-INF/jonas-addon-core.bnd rename to modules/services/jonas-addon/core/src/main/resources/META-INF/jonas-addon-core.bnd diff --git a/jonas/modules/services/jonas-addon/core/src/main/resources/metadata.xml b/modules/services/jonas-addon/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/resources/metadata.xml rename to modules/services/jonas-addon/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-addon/core/src/main/resources/properties/jonas-addon.properties b/modules/services/jonas-addon/core/src/main/resources/properties/jonas-addon.properties similarity index 100% rename from jonas/modules/services/jonas-addon/core/src/main/resources/properties/jonas-addon.properties rename to modules/services/jonas-addon/core/src/main/resources/properties/jonas-addon.properties diff --git a/jonas/modules/services/jonas-addon/pom.xml b/modules/services/jonas-addon/pom.xml similarity index 100% rename from jonas/modules/services/jonas-addon/pom.xml rename to modules/services/jonas-addon/pom.xml diff --git a/jonas/modules/services/jonas-audit/core/pom.xml b/modules/services/jonas-audit/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-audit/core/pom.xml rename to modules/services/jonas-audit/core/pom.xml diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/JOnASAuditServiceImpl.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/JOnASAuditServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/JOnASAuditServiceImpl.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/JOnASAuditServiceImpl.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditComponentListener.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditComponentListener.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditComponentListener.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditComponentListener.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogComponentMBean.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogComponentMBean.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogComponentMBean.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogComponentMBean.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogService.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogService.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogService.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogService.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogServiceAdapter.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogServiceAdapter.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogServiceAdapter.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogServiceAdapter.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogServiceException.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogServiceException.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogServiceException.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/AuditLogServiceException.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/NodeReport.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/NodeReport.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/NodeReport.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/NodeReport.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/NodeReportType.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/NodeReportType.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/NodeReportType.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/NodeReportType.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/api/IAuditComponentListener.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/api/IAuditComponentListener.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/api/IAuditComponentListener.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/api/IAuditComponentListener.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/api/IAuditLogListener.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/api/IAuditLogListener.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/api/IAuditLogListener.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/api/IAuditLogListener.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/pool/DatedFileLogPool.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/pool/DatedFileLogPool.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/pool/DatedFileLogPool.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/pool/DatedFileLogPool.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/pool/FileLogPool.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/pool/FileLogPool.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/pool/FileLogPool.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/pool/FileLogPool.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/util/AuditLogReportHelper.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/util/AuditLogReportHelper.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/util/AuditLogReportHelper.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/util/AuditLogReportHelper.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/util/LogConfigurator.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/util/LogConfigurator.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/util/LogConfigurator.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/logger/util/LogConfigurator.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilter.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilter.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilter.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilter.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilterAdapter.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilterAdapter.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilterAdapter.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilterAdapter.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/report/WebInvocationAuditReportFactory.java b/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/report/WebInvocationAuditReportFactory.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/report/WebInvocationAuditReportFactory.java rename to modules/services/jonas-audit/core/src/main/java/org/ow2/jonas/audit/internal/webauditor/report/WebInvocationAuditReportFactory.java diff --git a/jonas/modules/services/jonas-audit/core/src/main/resources/META-INF/jonas-audit-core.bnd b/modules/services/jonas-audit/core/src/main/resources/META-INF/jonas-audit-core.bnd similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/resources/META-INF/jonas-audit-core.bnd rename to modules/services/jonas-audit/core/src/main/resources/META-INF/jonas-audit-core.bnd diff --git a/jonas/modules/services/jonas-audit/core/src/main/resources/metadata.xml b/modules/services/jonas-audit/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/resources/metadata.xml rename to modules/services/jonas-audit/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-audit/core/src/main/resources/org/ow2/jonas/audit/internal/logger/mbeans-descriptors.xml b/modules/services/jonas-audit/core/src/main/resources/org/ow2/jonas/audit/internal/logger/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/resources/org/ow2/jonas/audit/internal/logger/mbeans-descriptors.xml rename to modules/services/jonas-audit/core/src/main/resources/org/ow2/jonas/audit/internal/logger/mbeans-descriptors.xml diff --git a/jonas/modules/services/jonas-audit/core/src/main/resources/org/ow2/jonas/audit/internal/webauditor/filters/mbeans-descriptors.xml b/modules/services/jonas-audit/core/src/main/resources/org/ow2/jonas/audit/internal/webauditor/filters/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/resources/org/ow2/jonas/audit/internal/webauditor/filters/mbeans-descriptors.xml rename to modules/services/jonas-audit/core/src/main/resources/org/ow2/jonas/audit/internal/webauditor/filters/mbeans-descriptors.xml diff --git a/jonas/modules/services/jonas-audit/core/src/main/templates/jonas-audit.properties.template b/modules/services/jonas-audit/core/src/main/templates/jonas-audit.properties.template similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/main/templates/jonas-audit.properties.template rename to modules/services/jonas-audit/core/src/main/templates/jonas-audit.properties.template diff --git a/jonas/modules/services/jonas-audit/core/src/test/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilterTestCase.java b/modules/services/jonas-audit/core/src/test/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilterTestCase.java similarity index 100% rename from jonas/modules/services/jonas-audit/core/src/test/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilterTestCase.java rename to modules/services/jonas-audit/core/src/test/java/org/ow2/jonas/audit/internal/webauditor/filters/HttpAuditFilterTestCase.java diff --git a/jonas/modules/services/jonas-audit/pom.xml b/modules/services/jonas-audit/pom.xml similarity index 100% rename from jonas/modules/services/jonas-audit/pom.xml rename to modules/services/jonas-audit/pom.xml diff --git a/jonas/modules/services/jonas-carol-registry/ant/pom.xml b/modules/services/jonas-carol-registry/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-carol-registry/ant/pom.xml rename to modules/services/jonas-carol-registry/ant/pom.xml diff --git a/jonas/modules/services/jonas-carol-registry/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/carol/Carol.java b/modules/services/jonas-carol-registry/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/carol/Carol.java similarity index 100% rename from jonas/modules/services/jonas-carol-registry/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/carol/Carol.java rename to modules/services/jonas-carol-registry/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/carol/Carol.java diff --git a/jonas/modules/services/jonas-carol-registry/ant/src/main/resources/META-INF/jonas-carol-registry-ant.bnd b/modules/services/jonas-carol-registry/ant/src/main/resources/META-INF/jonas-carol-registry-ant.bnd similarity index 100% rename from jonas/modules/services/jonas-carol-registry/ant/src/main/resources/META-INF/jonas-carol-registry-ant.bnd rename to modules/services/jonas-carol-registry/ant/src/main/resources/META-INF/jonas-carol-registry-ant.bnd diff --git a/jonas/modules/services/jonas-carol-registry/ant/src/main/resources/antlib-carol.xml b/modules/services/jonas-carol-registry/ant/src/main/resources/antlib-carol.xml similarity index 100% rename from jonas/modules/services/jonas-carol-registry/ant/src/main/resources/antlib-carol.xml rename to modules/services/jonas-carol-registry/ant/src/main/resources/antlib-carol.xml diff --git a/jonas/modules/services/jonas-carol-registry/ant/src/main/resources/build-carol.properties.template b/modules/services/jonas-carol-registry/ant/src/main/resources/build-carol.properties.template similarity index 100% rename from jonas/modules/services/jonas-carol-registry/ant/src/main/resources/build-carol.properties.template rename to modules/services/jonas-carol-registry/ant/src/main/resources/build-carol.properties.template diff --git a/jonas/modules/services/jonas-carol-registry/ant/src/main/resources/build-carol.xml b/modules/services/jonas-carol-registry/ant/src/main/resources/build-carol.xml similarity index 100% rename from jonas/modules/services/jonas-carol-registry/ant/src/main/resources/build-carol.xml rename to modules/services/jonas-carol-registry/ant/src/main/resources/build-carol.xml diff --git a/jonas/modules/services/jonas-carol-registry/core/pom.xml b/modules/services/jonas-carol-registry/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/pom.xml rename to modules/services/jonas-carol-registry/core/pom.xml diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/carol/jndi/spi/VirtualJNDIContextFactory.java b/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/carol/jndi/spi/VirtualJNDIContextFactory.java similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/carol/jndi/spi/VirtualJNDIContextFactory.java rename to modules/services/jonas-carol-registry/core/src/main/java/org/ow2/carol/jndi/spi/VirtualJNDIContextFactory.java diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/carol/jndi/spi/VirtualJNDILookup.java b/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/carol/jndi/spi/VirtualJNDILookup.java similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/carol/jndi/spi/VirtualJNDILookup.java rename to modules/services/jonas-carol-registry/core/src/main/java/org/ow2/carol/jndi/spi/VirtualJNDILookup.java diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/CarolRegistryService.java b/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/CarolRegistryService.java similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/CarolRegistryService.java rename to modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/CarolRegistryService.java diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/delegate/JacORBPRODelegate.java b/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/delegate/JacORBPRODelegate.java similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/delegate/JacORBPRODelegate.java rename to modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/delegate/JacORBPRODelegate.java diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/delegate/ORBCCFDelegate.java b/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/delegate/ORBCCFDelegate.java similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/delegate/ORBCCFDelegate.java rename to modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/delegate/ORBCCFDelegate.java diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/osgi/CarolRegistryConfigurationPlugin.java b/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/osgi/CarolRegistryConfigurationPlugin.java similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/osgi/CarolRegistryConfigurationPlugin.java rename to modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/osgi/CarolRegistryConfigurationPlugin.java diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/osgi/ConfigurationActivator.java b/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/osgi/ConfigurationActivator.java similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/osgi/ConfigurationActivator.java rename to modules/services/jonas-carol-registry/core/src/main/java/org/ow2/jonas/registry/carol/osgi/ConfigurationActivator.java diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/jonas-resources/bin/registry b/modules/services/jonas-carol-registry/core/src/main/jonas-resources/bin/registry similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/jonas-resources/bin/registry rename to modules/services/jonas-carol-registry/core/src/main/jonas-resources/bin/registry diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/jonas-resources/bin/registry.bat b/modules/services/jonas-carol-registry/core/src/main/jonas-resources/bin/registry.bat similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/jonas-resources/bin/registry.bat rename to modules/services/jonas-carol-registry/core/src/main/jonas-resources/bin/registry.bat diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/jonas-resources/conf/carol.properties b/modules/services/jonas-carol-registry/core/src/main/jonas-resources/conf/carol.properties similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/jonas-resources/conf/carol.properties rename to modules/services/jonas-carol-registry/core/src/main/jonas-resources/conf/carol.properties diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/jonas-resources/conf/jacorb.properties b/modules/services/jonas-carol-registry/core/src/main/jonas-resources/conf/jacorb.properties similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/jonas-resources/conf/jacorb.properties rename to modules/services/jonas-carol-registry/core/src/main/jonas-resources/conf/jacorb.properties diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/resources/META-INF/jonas-carol-registry-core.bnd b/modules/services/jonas-carol-registry/core/src/main/resources/META-INF/jonas-carol-registry-core.bnd similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/resources/META-INF/jonas-carol-registry-core.bnd rename to modules/services/jonas-carol-registry/core/src/main/resources/META-INF/jonas-carol-registry-core.bnd diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/resources/metadata.xml b/modules/services/jonas-carol-registry/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/resources/metadata.xml rename to modules/services/jonas-carol-registry/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-carol-registry/core/src/main/templates/jonas-registry.properties.template b/modules/services/jonas-carol-registry/core/src/main/templates/jonas-registry.properties.template similarity index 100% rename from jonas/modules/services/jonas-carol-registry/core/src/main/templates/jonas-registry.properties.template rename to modules/services/jonas-carol-registry/core/src/main/templates/jonas-registry.properties.template diff --git a/jonas/modules/services/jonas-carol-registry/pom.xml b/modules/services/jonas-carol-registry/pom.xml similarity index 100% rename from jonas/modules/services/jonas-carol-registry/pom.xml rename to modules/services/jonas-carol-registry/pom.xml diff --git a/jonas/modules/services/jonas-configadmin/core/pom.xml b/modules/services/jonas-configadmin/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/pom.xml rename to modules/services/jonas-configadmin/core/pom.xml diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/AdapterException.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/AdapterException.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/AdapterException.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/AdapterException.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/ConfigurationInfo.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/ConfigurationInfo.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/ConfigurationInfo.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/ConfigurationInfo.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/XmlConfigurationAdapter.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/XmlConfigurationAdapter.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/XmlConfigurationAdapter.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/XmlConfigurationAdapter.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/XmlConfigurationAdapterRegistry.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/XmlConfigurationAdapterRegistry.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/XmlConfigurationAdapterRegistry.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/XmlConfigurationAdapterRegistry.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/AdapterRegistryEvent.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/AdapterRegistryEvent.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/AdapterRegistryEvent.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/AdapterRegistryEvent.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/AdapterRegistryListener.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/AdapterRegistryListener.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/AdapterRegistryListener.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/AdapterRegistryListener.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployable.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployable.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployable.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployable.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployer.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployer.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployer.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployer.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationAssociationEvent.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationAssociationEvent.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationAssociationEvent.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationAssociationEvent.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationAssociationListener.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationAssociationListener.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationAssociationListener.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationAssociationListener.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationItem.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationItem.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationItem.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/ConfigurationItem.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/Initializer.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/Initializer.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/Initializer.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/Initializer.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/AbstractConfigurationAdapter.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/AbstractConfigurationAdapter.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/AbstractConfigurationAdapter.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/AbstractConfigurationAdapter.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultConfigurationAdapter.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultConfigurationAdapter.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultConfigurationAdapter.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultConfigurationAdapter.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultConfigurationAdapterRegistry.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultConfigurationAdapterRegistry.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultConfigurationAdapterRegistry.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultConfigurationAdapterRegistry.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultFactoryConfigurationAdapter.java b/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultFactoryConfigurationAdapter.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultFactoryConfigurationAdapter.java rename to modules/services/jonas-configadmin/core/src/main/java/org/ow2/jonas/configadmin/internal/generic/DefaultFactoryConfigurationAdapter.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/resources/META-INF/configadmin-1.0.xsd b/modules/services/jonas-configadmin/core/src/main/resources/META-INF/configadmin-1.0.xsd similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/resources/META-INF/configadmin-1.0.xsd rename to modules/services/jonas-configadmin/core/src/main/resources/META-INF/configadmin-1.0.xsd diff --git a/jonas/modules/services/jonas-configadmin/core/src/main/resources/metadata.xml b/modules/services/jonas-configadmin/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/main/resources/metadata.xml rename to modules/services/jonas-configadmin/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployerTestCase.java b/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployerTestCase.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployerTestCase.java rename to modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/ConfigAdminDeployerTestCase.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/ConfigurationItemTestCase.java b/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/ConfigurationItemTestCase.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/ConfigurationItemTestCase.java rename to modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/ConfigurationItemTestCase.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/AbstractConfigurationAdapterTestCase.java b/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/AbstractConfigurationAdapterTestCase.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/AbstractConfigurationAdapterTestCase.java rename to modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/AbstractConfigurationAdapterTestCase.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/ConfigurationAdapterRegistryTestCase.java b/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/ConfigurationAdapterRegistryTestCase.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/ConfigurationAdapterRegistryTestCase.java rename to modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/ConfigurationAdapterRegistryTestCase.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/ConfigurationAdapterTestCase.java b/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/ConfigurationAdapterTestCase.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/ConfigurationAdapterTestCase.java rename to modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/ConfigurationAdapterTestCase.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/FactoryConfigurationAdapterTestCase.java b/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/FactoryConfigurationAdapterTestCase.java similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/FactoryConfigurationAdapterTestCase.java rename to modules/services/jonas-configadmin/core/src/test/java/org/ow2/jonas/configadmin/internal/generic/FactoryConfigurationAdapterTestCase.java diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/resources/deploy-undeploy-configurations.xml b/modules/services/jonas-configadmin/core/src/test/resources/deploy-undeploy-configurations.xml similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/resources/deploy-undeploy-configurations.xml rename to modules/services/jonas-configadmin/core/src/test/resources/deploy-undeploy-configurations.xml diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/resources/invalid-schema-location.xml b/modules/services/jonas-configadmin/core/src/test/resources/invalid-schema-location.xml similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/resources/invalid-schema-location.xml rename to modules/services/jonas-configadmin/core/src/test/resources/invalid-schema-location.xml diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/resources/no-schema-location.xml b/modules/services/jonas-configadmin/core/src/test/resources/no-schema-location.xml similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/resources/no-schema-location.xml rename to modules/services/jonas-configadmin/core/src/test/resources/no-schema-location.xml diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/resources/one-configuration.xml b/modules/services/jonas-configadmin/core/src/test/resources/one-configuration.xml similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/resources/one-configuration.xml rename to modules/services/jonas-configadmin/core/src/test/resources/one-configuration.xml diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/resources/one-factory-configuration.xml b/modules/services/jonas-configadmin/core/src/test/resources/one-factory-configuration.xml similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/resources/one-factory-configuration.xml rename to modules/services/jonas-configadmin/core/src/test/resources/one-factory-configuration.xml diff --git a/jonas/modules/services/jonas-configadmin/core/src/test/resources/unsupported-element.xml b/modules/services/jonas-configadmin/core/src/test/resources/unsupported-element.xml similarity index 100% rename from jonas/modules/services/jonas-configadmin/core/src/test/resources/unsupported-element.xml rename to modules/services/jonas-configadmin/core/src/test/resources/unsupported-element.xml diff --git a/jonas/modules/services/jonas-configadmin/pom.xml b/modules/services/jonas-configadmin/pom.xml similarity index 100% rename from jonas/modules/services/jonas-configadmin/pom.xml rename to modules/services/jonas-configadmin/pom.xml diff --git a/jonas/modules/services/jonas-datasources/core/pom.xml b/modules/services/jonas-datasources/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-datasources/core/pom.xml rename to modules/services/jonas-datasources/core/pom.xml diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployable.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployable.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployable.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployable.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployableRegistration.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployableRegistration.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployableRegistration.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployableRegistration.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployer.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployer.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployer.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/DatasourceDeployer.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/JonasDatasourceCleanTask.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/JonasDatasourceCleanTask.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/JonasDatasourceCleanTask.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/JonasDatasourceCleanTask.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/JonasDatasourceDeployer.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/JonasDatasourceDeployer.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/JonasDatasourceDeployer.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/JonasDatasourceDeployer.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/DatasourceValidator.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/DatasourceValidator.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/DatasourceValidator.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/DatasourceValidator.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/DatasourceXmlReader.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/DatasourceXmlReader.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/DatasourceXmlReader.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/DatasourceXmlReader.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/NamespaceFilter.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/NamespaceFilter.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/NamespaceFilter.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/deployer/reader/NamespaceFilter.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/internal/DSDefinitionExtensionListener.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/internal/DSDefinitionExtensionListener.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/internal/DSDefinitionExtensionListener.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/internal/DSDefinitionExtensionListener.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/internal/DataSourceServiceImpl.java b/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/internal/DataSourceServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/internal/DataSourceServiceImpl.java rename to modules/services/jonas-datasources/core/src/main/java/org/ow2/jonas/datasource/internal/DataSourceServiceImpl.java diff --git a/jonas/modules/services/jonas-datasources/core/src/main/resources/META-INF/jonas-services-datasource-core.bnd b/modules/services/jonas-datasources/core/src/main/resources/META-INF/jonas-services-datasource-core.bnd similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/resources/META-INF/jonas-services-datasource-core.bnd rename to modules/services/jonas-datasources/core/src/main/resources/META-INF/jonas-services-datasource-core.bnd diff --git a/jonas/modules/services/jonas-datasources/core/src/main/resources/metadata.xml b/modules/services/jonas-datasources/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/resources/metadata.xml rename to modules/services/jonas-datasources/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-datasources/core/src/main/resources/org/ow2/jonas/datasource/deployer/reader/jonas-datasources-1.0.xsd b/modules/services/jonas-datasources/core/src/main/resources/org/ow2/jonas/datasource/deployer/reader/jonas-datasources-1.0.xsd similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/resources/org/ow2/jonas/datasource/deployer/reader/jonas-datasources-1.0.xsd rename to modules/services/jonas-datasources/core/src/main/resources/org/ow2/jonas/datasource/deployer/reader/jonas-datasources-1.0.xsd diff --git a/jonas/modules/services/jonas-datasources/core/src/main/resources/org/ow2/jonas/datasource/deployer/reader/jonas-datasources-1.1.xsd b/modules/services/jonas-datasources/core/src/main/resources/org/ow2/jonas/datasource/deployer/reader/jonas-datasources-1.1.xsd similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/main/resources/org/ow2/jonas/datasource/deployer/reader/jonas-datasources-1.1.xsd rename to modules/services/jonas-datasources/core/src/main/resources/org/ow2/jonas/datasource/deployer/reader/jonas-datasources-1.1.xsd diff --git a/jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/DatasourceDeployableTest.java b/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/DatasourceDeployableTest.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/DatasourceDeployableTest.java rename to modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/DatasourceDeployableTest.java diff --git a/jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/FileDeployableFactoryTest.java b/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/FileDeployableFactoryTest.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/FileDeployableFactoryTest.java rename to modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/FileDeployableFactoryTest.java diff --git a/jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/TestDatasourceDeployer.java b/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/TestDatasourceDeployer.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/TestDatasourceDeployer.java rename to modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/TestDatasourceDeployer.java diff --git a/jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/TestRarDeployer.java b/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/TestRarDeployer.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/TestRarDeployer.java rename to modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/TestRarDeployer.java diff --git a/jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/reader/DatasourceReaderTest.java b/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/reader/DatasourceReaderTest.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/reader/DatasourceReaderTest.java rename to modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/reader/DatasourceReaderTest.java diff --git a/jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/reader/DatasourceValidatorTest.java b/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/reader/DatasourceValidatorTest.java similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/reader/DatasourceValidatorTest.java rename to modules/services/jonas-datasources/core/src/test/java/org/ow2/jonas/datasource/deployer/reader/DatasourceValidatorTest.java diff --git a/jonas/modules/services/jonas-datasources/core/src/test/resources/datasources.xml b/modules/services/jonas-datasources/core/src/test/resources/datasources.xml similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/resources/datasources.xml rename to modules/services/jonas-datasources/core/src/test/resources/datasources.xml diff --git a/jonas/modules/services/jonas-datasources/core/src/test/resources/exemple-datasource-bad.xml b/modules/services/jonas-datasources/core/src/test/resources/exemple-datasource-bad.xml similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/resources/exemple-datasource-bad.xml rename to modules/services/jonas-datasources/core/src/test/resources/exemple-datasource-bad.xml diff --git a/jonas/modules/services/jonas-datasources/core/src/test/resources/exemple-datasource-good.xml b/modules/services/jonas-datasources/core/src/test/resources/exemple-datasource-good.xml similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/resources/exemple-datasource-good.xml rename to modules/services/jonas-datasources/core/src/test/resources/exemple-datasource-good.xml diff --git a/jonas/modules/services/jonas-datasources/core/src/test/resources/exemple-datasource.xml b/modules/services/jonas-datasources/core/src/test/resources/exemple-datasource.xml similarity index 100% rename from jonas/modules/services/jonas-datasources/core/src/test/resources/exemple-datasource.xml rename to modules/services/jonas-datasources/core/src/test/resources/exemple-datasource.xml diff --git a/jonas/modules/services/jonas-datasources/pom.xml b/modules/services/jonas-datasources/pom.xml similarity index 100% rename from jonas/modules/services/jonas-datasources/pom.xml rename to modules/services/jonas-datasources/pom.xml diff --git a/jonas/modules/services/jonas-db/base/ant/pom.xml b/modules/services/jonas-db/base/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/base/ant/pom.xml rename to modules/services/jonas-db/base/ant/pom.xml diff --git a/jonas/modules/services/jonas-db/base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/base/Db.java b/modules/services/jonas-db/base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/base/Db.java similarity index 100% rename from jonas/modules/services/jonas-db/base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/base/Db.java rename to modules/services/jonas-db/base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/base/Db.java diff --git a/jonas/modules/services/jonas-db/base/ant/src/main/resources/build-db.properties.template b/modules/services/jonas-db/base/ant/src/main/resources/build-db.properties.template similarity index 100% rename from jonas/modules/services/jonas-db/base/ant/src/main/resources/build-db.properties.template rename to modules/services/jonas-db/base/ant/src/main/resources/build-db.properties.template diff --git a/jonas/modules/services/jonas-db/base/ant/src/main/resources/build-db.xml b/modules/services/jonas-db/base/ant/src/main/resources/build-db.xml similarity index 100% rename from jonas/modules/services/jonas-db/base/ant/src/main/resources/build-db.xml rename to modules/services/jonas-db/base/ant/src/main/resources/build-db.xml diff --git a/jonas/modules/services/jonas-db/base/core/pom.xml b/modules/services/jonas-db/base/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/base/core/pom.xml rename to modules/services/jonas-db/base/core/pom.xml diff --git a/jonas/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/AbsDBServiceImpl.java b/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/AbsDBServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/AbsDBServiceImpl.java rename to modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/AbsDBServiceImpl.java diff --git a/jonas/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/AbsDBServiceImplMBean.java b/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/AbsDBServiceImplMBean.java similarity index 100% rename from jonas/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/AbsDBServiceImplMBean.java rename to modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/AbsDBServiceImplMBean.java diff --git a/jonas/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/DbEndpointBuilder.java b/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/DbEndpointBuilder.java similarity index 100% rename from jonas/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/DbEndpointBuilder.java rename to modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/DbEndpointBuilder.java diff --git a/jonas/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/User.java b/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/User.java similarity index 100% rename from jonas/modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/User.java rename to modules/services/jonas-db/base/core/src/main/java/org/ow2/jonas/db/base/User.java diff --git a/jonas/modules/services/jonas-db/base/core/src/main/resources/META-INF/jonas-db-base-core.bnd b/modules/services/jonas-db/base/core/src/main/resources/META-INF/jonas-db-base-core.bnd similarity index 100% rename from jonas/modules/services/jonas-db/base/core/src/main/resources/META-INF/jonas-db-base-core.bnd rename to modules/services/jonas-db/base/core/src/main/resources/META-INF/jonas-db-base-core.bnd diff --git a/jonas/modules/services/jonas-db/base/core/src/main/resources/metadata.xml b/modules/services/jonas-db/base/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-db/base/core/src/main/resources/metadata.xml rename to modules/services/jonas-db/base/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-db/base/core/src/main/templates/jonas-db.properties.template b/modules/services/jonas-db/base/core/src/main/templates/jonas-db.properties.template similarity index 100% rename from jonas/modules/services/jonas-db/base/core/src/main/templates/jonas-db.properties.template rename to modules/services/jonas-db/base/core/src/main/templates/jonas-db.properties.template diff --git a/jonas/modules/services/jonas-db/base/pom.xml b/modules/services/jonas-db/base/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/base/pom.xml rename to modules/services/jonas-db/base/pom.xml diff --git a/jonas/modules/services/jonas-db/h2/addon/pom.xml b/modules/services/jonas-db/h2/addon/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/h2/addon/pom.xml rename to modules/services/jonas-db/h2/addon/pom.xml diff --git a/jonas/modules/services/jonas-db/h2/addon/src/main/assembly/assembly.xml b/modules/services/jonas-db/h2/addon/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/jonas-db/h2/addon/src/main/assembly/assembly.xml rename to modules/services/jonas-db/h2/addon/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/jonas-db/h2/addon/src/main/resources/META-INF/jonas-addon.xml b/modules/services/jonas-db/h2/addon/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/jonas-db/h2/addon/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/jonas-db/h2/addon/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/jonas-db/h2/ant/pom.xml b/modules/services/jonas-db/h2/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/h2/ant/pom.xml rename to modules/services/jonas-db/h2/ant/pom.xml diff --git a/jonas/modules/services/jonas-db/h2/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/h2/DbH2.java b/modules/services/jonas-db/h2/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/h2/DbH2.java similarity index 100% rename from jonas/modules/services/jonas-db/h2/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/h2/DbH2.java rename to modules/services/jonas-db/h2/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/h2/DbH2.java diff --git a/jonas/modules/services/jonas-db/h2/ant/src/main/resources/antlib-db-h2.xml b/modules/services/jonas-db/h2/ant/src/main/resources/antlib-db-h2.xml similarity index 100% rename from jonas/modules/services/jonas-db/h2/ant/src/main/resources/antlib-db-h2.xml rename to modules/services/jonas-db/h2/ant/src/main/resources/antlib-db-h2.xml diff --git a/jonas/modules/services/jonas-db/h2/ant/src/main/resources/build-db-h2.properties b/modules/services/jonas-db/h2/ant/src/main/resources/build-db-h2.properties similarity index 100% rename from jonas/modules/services/jonas-db/h2/ant/src/main/resources/build-db-h2.properties rename to modules/services/jonas-db/h2/ant/src/main/resources/build-db-h2.properties diff --git a/jonas/modules/services/jonas-db/h2/ant/src/main/resources/build-db-h2.xml b/modules/services/jonas-db/h2/ant/src/main/resources/build-db-h2.xml similarity index 100% rename from jonas/modules/services/jonas-db/h2/ant/src/main/resources/build-db-h2.xml rename to modules/services/jonas-db/h2/ant/src/main/resources/build-db-h2.xml diff --git a/jonas/modules/services/jonas-db/h2/core/pom.xml b/modules/services/jonas-db/h2/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/h2/core/pom.xml rename to modules/services/jonas-db/h2/core/pom.xml diff --git a/jonas/modules/services/jonas-db/h2/core/src/main/java/org/ow2/jonas/db/h2/H2DBServiceImpl.java b/modules/services/jonas-db/h2/core/src/main/java/org/ow2/jonas/db/h2/H2DBServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-db/h2/core/src/main/java/org/ow2/jonas/db/h2/H2DBServiceImpl.java rename to modules/services/jonas-db/h2/core/src/main/java/org/ow2/jonas/db/h2/H2DBServiceImpl.java diff --git a/jonas/modules/services/jonas-db/h2/core/src/main/java/org/ow2/jonas/db/h2/H2DBServiceImplMBean.java b/modules/services/jonas-db/h2/core/src/main/java/org/ow2/jonas/db/h2/H2DBServiceImplMBean.java similarity index 100% rename from jonas/modules/services/jonas-db/h2/core/src/main/java/org/ow2/jonas/db/h2/H2DBServiceImplMBean.java rename to modules/services/jonas-db/h2/core/src/main/java/org/ow2/jonas/db/h2/H2DBServiceImplMBean.java diff --git a/jonas/modules/services/jonas-db/h2/core/src/main/properties/jonas-db-h2.properties b/modules/services/jonas-db/h2/core/src/main/properties/jonas-db-h2.properties similarity index 100% rename from jonas/modules/services/jonas-db/h2/core/src/main/properties/jonas-db-h2.properties rename to modules/services/jonas-db/h2/core/src/main/properties/jonas-db-h2.properties diff --git a/jonas/modules/services/jonas-db/h2/core/src/main/resources/META-INF/jonas-db-h2-core.bnd b/modules/services/jonas-db/h2/core/src/main/resources/META-INF/jonas-db-h2-core.bnd similarity index 100% rename from jonas/modules/services/jonas-db/h2/core/src/main/resources/META-INF/jonas-db-h2-core.bnd rename to modules/services/jonas-db/h2/core/src/main/resources/META-INF/jonas-db-h2-core.bnd diff --git a/jonas/modules/services/jonas-db/h2/core/src/main/resources/metadata.xml b/modules/services/jonas-db/h2/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-db/h2/core/src/main/resources/metadata.xml rename to modules/services/jonas-db/h2/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-db/h2/pom.xml b/modules/services/jonas-db/h2/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/h2/pom.xml rename to modules/services/jonas-db/h2/pom.xml diff --git a/jonas/modules/services/jonas-db/hsql/ant/pom.xml b/modules/services/jonas-db/hsql/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/hsql/ant/pom.xml rename to modules/services/jonas-db/hsql/ant/pom.xml diff --git a/jonas/modules/services/jonas-db/hsql/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/hsql/DbHsql.java b/modules/services/jonas-db/hsql/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/hsql/DbHsql.java similarity index 100% rename from jonas/modules/services/jonas-db/hsql/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/hsql/DbHsql.java rename to modules/services/jonas-db/hsql/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/db/hsql/DbHsql.java diff --git a/jonas/modules/services/jonas-db/hsql/ant/src/main/resources/antlib-db-hsql.xml b/modules/services/jonas-db/hsql/ant/src/main/resources/antlib-db-hsql.xml similarity index 100% rename from jonas/modules/services/jonas-db/hsql/ant/src/main/resources/antlib-db-hsql.xml rename to modules/services/jonas-db/hsql/ant/src/main/resources/antlib-db-hsql.xml diff --git a/jonas/modules/services/jonas-db/hsql/ant/src/main/resources/build-db-hsql.properties b/modules/services/jonas-db/hsql/ant/src/main/resources/build-db-hsql.properties similarity index 100% rename from jonas/modules/services/jonas-db/hsql/ant/src/main/resources/build-db-hsql.properties rename to modules/services/jonas-db/hsql/ant/src/main/resources/build-db-hsql.properties diff --git a/jonas/modules/services/jonas-db/hsql/ant/src/main/resources/build-db-hsql.xml b/modules/services/jonas-db/hsql/ant/src/main/resources/build-db-hsql.xml similarity index 100% rename from jonas/modules/services/jonas-db/hsql/ant/src/main/resources/build-db-hsql.xml rename to modules/services/jonas-db/hsql/ant/src/main/resources/build-db-hsql.xml diff --git a/jonas/modules/services/jonas-db/hsql/core/pom.xml b/modules/services/jonas-db/hsql/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/hsql/core/pom.xml rename to modules/services/jonas-db/hsql/core/pom.xml diff --git a/jonas/modules/services/jonas-db/hsql/core/src/main/java/org/ow2/jonas/db/hsqldb/HsqlDBServiceImpl.java b/modules/services/jonas-db/hsql/core/src/main/java/org/ow2/jonas/db/hsqldb/HsqlDBServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-db/hsql/core/src/main/java/org/ow2/jonas/db/hsqldb/HsqlDBServiceImpl.java rename to modules/services/jonas-db/hsql/core/src/main/java/org/ow2/jonas/db/hsqldb/HsqlDBServiceImpl.java diff --git a/jonas/modules/services/jonas-db/hsql/core/src/main/java/org/ow2/jonas/db/hsqldb/HsqlDBServiceImplMBean.java b/modules/services/jonas-db/hsql/core/src/main/java/org/ow2/jonas/db/hsqldb/HsqlDBServiceImplMBean.java similarity index 100% rename from jonas/modules/services/jonas-db/hsql/core/src/main/java/org/ow2/jonas/db/hsqldb/HsqlDBServiceImplMBean.java rename to modules/services/jonas-db/hsql/core/src/main/java/org/ow2/jonas/db/hsqldb/HsqlDBServiceImplMBean.java diff --git a/jonas/modules/services/jonas-db/hsql/core/src/main/properties/jonas-db-hsql.properties b/modules/services/jonas-db/hsql/core/src/main/properties/jonas-db-hsql.properties similarity index 100% rename from jonas/modules/services/jonas-db/hsql/core/src/main/properties/jonas-db-hsql.properties rename to modules/services/jonas-db/hsql/core/src/main/properties/jonas-db-hsql.properties diff --git a/jonas/modules/services/jonas-db/hsql/core/src/main/resources/META-INF/jonas-db-hsql-core.bnd b/modules/services/jonas-db/hsql/core/src/main/resources/META-INF/jonas-db-hsql-core.bnd similarity index 100% rename from jonas/modules/services/jonas-db/hsql/core/src/main/resources/META-INF/jonas-db-hsql-core.bnd rename to modules/services/jonas-db/hsql/core/src/main/resources/META-INF/jonas-db-hsql-core.bnd diff --git a/jonas/modules/services/jonas-db/hsql/core/src/main/resources/metadata.xml b/modules/services/jonas-db/hsql/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-db/hsql/core/src/main/resources/metadata.xml rename to modules/services/jonas-db/hsql/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-db/hsql/pom.xml b/modules/services/jonas-db/hsql/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/hsql/pom.xml rename to modules/services/jonas-db/hsql/pom.xml diff --git a/jonas/modules/services/jonas-db/pom.xml b/modules/services/jonas-db/pom.xml similarity index 100% rename from jonas/modules/services/jonas-db/pom.xml rename to modules/services/jonas-db/pom.xml diff --git a/jonas/modules/services/jonas-dbm/ant/pom.xml b/modules/services/jonas-dbm/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-dbm/ant/pom.xml rename to modules/services/jonas-dbm/ant/pom.xml diff --git a/jonas/modules/services/jonas-dbm/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/dbm/Dbm.java b/modules/services/jonas-dbm/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/dbm/Dbm.java similarity index 100% rename from jonas/modules/services/jonas-dbm/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/dbm/Dbm.java rename to modules/services/jonas-dbm/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/dbm/Dbm.java diff --git a/jonas/modules/services/jonas-dbm/ant/src/main/resources/antlib-dbm.xml b/modules/services/jonas-dbm/ant/src/main/resources/antlib-dbm.xml similarity index 100% rename from jonas/modules/services/jonas-dbm/ant/src/main/resources/antlib-dbm.xml rename to modules/services/jonas-dbm/ant/src/main/resources/antlib-dbm.xml diff --git a/jonas/modules/services/jonas-dbm/ant/src/main/resources/build-dbm.properties.template b/modules/services/jonas-dbm/ant/src/main/resources/build-dbm.properties.template similarity index 100% rename from jonas/modules/services/jonas-dbm/ant/src/main/resources/build-dbm.properties.template rename to modules/services/jonas-dbm/ant/src/main/resources/build-dbm.properties.template diff --git a/jonas/modules/services/jonas-dbm/ant/src/main/resources/build-dbm.xml b/modules/services/jonas-dbm/ant/src/main/resources/build-dbm.xml similarity index 100% rename from jonas/modules/services/jonas-dbm/ant/src/main/resources/build-dbm.xml rename to modules/services/jonas-dbm/ant/src/main/resources/build-dbm.xml diff --git a/jonas/modules/services/jonas-dbm/core/pom.xml b/modules/services/jonas-dbm/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-dbm/core/pom.xml rename to modules/services/jonas-dbm/core/pom.xml diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/DBMConstants.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/DBMConstants.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/DBMConstants.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/DBMConstants.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/JOnASDataBaseManagerService.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/JOnASDataBaseManagerService.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/JOnASDataBaseManagerService.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/JOnASDataBaseManagerService.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/JOnASDataBaseManagerServiceMBean.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/JOnASDataBaseManagerServiceMBean.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/JOnASDataBaseManagerServiceMBean.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/JOnASDataBaseManagerServiceMBean.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/ConnectionManager.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/ConnectionManager.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/ConnectionManager.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/ConnectionManager.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/IConnection.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/IConnection.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/IConnection.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/IConnection.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JConnection.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JConnection.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JConnection.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JConnection.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JManagedConnection.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JManagedConnection.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JManagedConnection.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JManagedConnection.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JStatement.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JStatement.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JStatement.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/JStatement.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/Pool.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/Pool.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/Pool.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/Pool.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/naming/DataSourceFactory.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/naming/DataSourceFactory.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/naming/DataSourceFactory.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/cm/naming/DataSourceFactory.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDataSource.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDataSource.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDataSource.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDataSource.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDataSourceMBean.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDataSourceMBean.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDataSourceMBean.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDataSourceMBean.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDriver.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDriver.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDriver.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCDriver.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCResource.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCResource.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCResource.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/mbean/JDBCResource.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/osgi/JDBCDriverBundleTrackerCustomizer.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/osgi/JDBCDriverBundleTrackerCustomizer.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/osgi/JDBCDriverBundleTrackerCustomizer.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/osgi/JDBCDriverBundleTrackerCustomizer.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/osgi/JOnASDataSourceFactory.java b/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/osgi/JOnASDataSourceFactory.java similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/osgi/JOnASDataSourceFactory.java rename to modules/services/jonas-dbm/core/src/main/java/org/ow2/jonas/dbm/internal/osgi/JOnASDataSourceFactory.java diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/FirebirdSQL.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/FirebirdSQL.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/FirebirdSQL.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/FirebirdSQL.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/H2.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/H2.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/H2.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/H2.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/HSQL1.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/HSQL1.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/HSQL1.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/HSQL1.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/InstantDB1.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/InstantDB1.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/InstantDB1.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/InstantDB1.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/InterBase1.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/InterBase1.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/InterBase1.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/InterBase1.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/McKoi1.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/McKoi1.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/McKoi1.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/McKoi1.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/MySQL.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/MySQL.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/MySQL.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/MySQL.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/Oracle1.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/Oracle1.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/Oracle1.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/Oracle1.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/PostgreSQL1.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/PostgreSQL1.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/PostgreSQL1.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/PostgreSQL1.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/Sybase1.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/Sybase1.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/Sybase1.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/Sybase1.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/db2.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/db2.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/db2.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/db2.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/spy.properties b/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/spy.properties similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/jonas-resources/conf/spy.properties rename to modules/services/jonas-dbm/core/src/main/jonas-resources/conf/spy.properties diff --git a/jonas/modules/services/jonas-dbm/core/src/main/resources/META-INF/jonas-dbm-core.bnd b/modules/services/jonas-dbm/core/src/main/resources/META-INF/jonas-dbm-core.bnd similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/resources/META-INF/jonas-dbm-core.bnd rename to modules/services/jonas-dbm/core/src/main/resources/META-INF/jonas-dbm-core.bnd diff --git a/jonas/modules/services/jonas-dbm/core/src/main/resources/metadata.xml b/modules/services/jonas-dbm/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/resources/metadata.xml rename to modules/services/jonas-dbm/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-dbm/core/src/main/resources/org/ow2/jonas/dbm/internal/mbeans-descriptors.xml b/modules/services/jonas-dbm/core/src/main/resources/org/ow2/jonas/dbm/internal/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/resources/org/ow2/jonas/dbm/internal/mbeans-descriptors.xml rename to modules/services/jonas-dbm/core/src/main/resources/org/ow2/jonas/dbm/internal/mbeans-descriptors.xml diff --git a/jonas/modules/services/jonas-dbm/core/src/main/templates/jonas-dbm.properties.template b/modules/services/jonas-dbm/core/src/main/templates/jonas-dbm.properties.template similarity index 100% rename from jonas/modules/services/jonas-dbm/core/src/main/templates/jonas-dbm.properties.template rename to modules/services/jonas-dbm/core/src/main/templates/jonas-dbm.properties.template diff --git a/jonas/modules/services/jonas-dbm/pom.xml b/modules/services/jonas-dbm/pom.xml similarity index 100% rename from jonas/modules/services/jonas-dbm/pom.xml rename to modules/services/jonas-dbm/pom.xml diff --git a/jonas/modules/services/jonas-discovery/base/ant/pom.xml b/modules/services/jonas-discovery/base/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/base/ant/pom.xml rename to modules/services/jonas-discovery/base/ant/pom.xml diff --git a/jonas/modules/services/jonas-discovery/base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/base/Discovery.java b/modules/services/jonas-discovery/base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/base/Discovery.java similarity index 100% rename from jonas/modules/services/jonas-discovery/base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/base/Discovery.java rename to modules/services/jonas-discovery/base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/base/Discovery.java diff --git a/jonas/modules/services/jonas-discovery/base/ant/src/main/resources/build-discovery.properties.template b/modules/services/jonas-discovery/base/ant/src/main/resources/build-discovery.properties.template similarity index 100% rename from jonas/modules/services/jonas-discovery/base/ant/src/main/resources/build-discovery.properties.template rename to modules/services/jonas-discovery/base/ant/src/main/resources/build-discovery.properties.template diff --git a/jonas/modules/services/jonas-discovery/base/ant/src/main/resources/build-discovery.xml b/modules/services/jonas-discovery/base/ant/src/main/resources/build-discovery.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/base/ant/src/main/resources/build-discovery.xml rename to modules/services/jonas-discovery/base/ant/src/main/resources/build-discovery.xml diff --git a/jonas/modules/services/jonas-discovery/base/core/pom.xml b/modules/services/jonas-discovery/base/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/pom.xml rename to modules/services/jonas-discovery/base/core/pom.xml diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/BaseDiscovery.java b/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/BaseDiscovery.java similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/BaseDiscovery.java rename to modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/BaseDiscovery.java diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DiscHelper.java b/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DiscHelper.java similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DiscHelper.java rename to modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DiscHelper.java diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DiscoveryServiceImplMBean.java b/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DiscoveryServiceImplMBean.java similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DiscoveryServiceImplMBean.java rename to modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DiscoveryServiceImplMBean.java diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DuplicateServerNameException.java b/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DuplicateServerNameException.java similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DuplicateServerNameException.java rename to modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/DuplicateServerNameException.java diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/ClusterdDiscoveryEvent.java b/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/ClusterdDiscoveryEvent.java similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/ClusterdDiscoveryEvent.java rename to modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/ClusterdDiscoveryEvent.java diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscEvent.java b/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscEvent.java similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscEvent.java rename to modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscEvent.java diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscGreeting.java b/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscGreeting.java similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscGreeting.java rename to modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscGreeting.java diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscMessage.java b/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscMessage.java similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscMessage.java rename to modules/services/jonas-discovery/base/core/src/main/java/org/ow2/jonas/discovery/base/comm/DiscMessage.java diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/resources/META-INF/jonas-discovery-base-core.bnd b/modules/services/jonas-discovery/base/core/src/main/resources/META-INF/jonas-discovery-base-core.bnd similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/resources/META-INF/jonas-discovery-base-core.bnd rename to modules/services/jonas-discovery/base/core/src/main/resources/META-INF/jonas-discovery-base-core.bnd diff --git a/jonas/modules/services/jonas-discovery/base/core/src/main/templates/jonas-discovery.properties.template b/modules/services/jonas-discovery/base/core/src/main/templates/jonas-discovery.properties.template similarity index 100% rename from jonas/modules/services/jonas-discovery/base/core/src/main/templates/jonas-discovery.properties.template rename to modules/services/jonas-discovery/base/core/src/main/templates/jonas-discovery.properties.template diff --git a/jonas/modules/services/jonas-discovery/base/pom.xml b/modules/services/jonas-discovery/base/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/base/pom.xml rename to modules/services/jonas-discovery/base/pom.xml diff --git a/jonas/modules/services/jonas-discovery/jgroups/ant/pom.xml b/modules/services/jonas-discovery/jgroups/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/ant/pom.xml rename to modules/services/jonas-discovery/jgroups/ant/pom.xml diff --git a/jonas/modules/services/jonas-discovery/jgroups/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/jgroups/DiscoveryJGroups.java b/modules/services/jonas-discovery/jgroups/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/jgroups/DiscoveryJGroups.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/jgroups/DiscoveryJGroups.java rename to modules/services/jonas-discovery/jgroups/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/jgroups/DiscoveryJGroups.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/ant/src/main/resources/antlib-discovery-jgroups.xml b/modules/services/jonas-discovery/jgroups/ant/src/main/resources/antlib-discovery-jgroups.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/ant/src/main/resources/antlib-discovery-jgroups.xml rename to modules/services/jonas-discovery/jgroups/ant/src/main/resources/antlib-discovery-jgroups.xml diff --git a/jonas/modules/services/jonas-discovery/jgroups/ant/src/main/resources/build-discovery-jgroups.properties b/modules/services/jonas-discovery/jgroups/ant/src/main/resources/build-discovery-jgroups.properties similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/ant/src/main/resources/build-discovery-jgroups.properties rename to modules/services/jonas-discovery/jgroups/ant/src/main/resources/build-discovery-jgroups.properties diff --git a/jonas/modules/services/jonas-discovery/jgroups/ant/src/main/resources/build-discovery-jgroups.xml b/modules/services/jonas-discovery/jgroups/ant/src/main/resources/build-discovery-jgroups.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/ant/src/main/resources/build-discovery-jgroups.xml rename to modules/services/jonas-discovery/jgroups/ant/src/main/resources/build-discovery-jgroups.xml diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/pom.xml b/modules/services/jonas-discovery/jgroups/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/pom.xml rename to modules/services/jonas-discovery/jgroups/core/pom.xml diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/DiscRunnable.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/DiscRunnable.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/DiscRunnable.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/DiscRunnable.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/JgroupsDiscoveryServiceImpl.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/JgroupsDiscoveryServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/JgroupsDiscoveryServiceImpl.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/JgroupsDiscoveryServiceImpl.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/JgroupsDiscoveryServiceImplMBean.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/JgroupsDiscoveryServiceImplMBean.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/JgroupsDiscoveryServiceImplMBean.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/JgroupsDiscoveryServiceImplMBean.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/CommDiscoveryInfo.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/CommDiscoveryInfo.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/CommDiscoveryInfo.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/CommDiscoveryInfo.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/DiscCommManager.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/DiscCommManager.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/DiscCommManager.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/DiscCommManager.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/api/DiscComm.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/api/DiscComm.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/api/DiscComm.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/api/DiscComm.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/api/DiscCommReceiver.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/api/DiscCommReceiver.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/api/DiscCommReceiver.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/api/DiscCommReceiver.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/exception/StopDiscException.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/exception/StopDiscException.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/exception/StopDiscException.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/exception/StopDiscException.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/handler/DiscCommGreetingHandler.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/handler/DiscCommGreetingHandler.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/handler/DiscCommGreetingHandler.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/handler/DiscCommGreetingHandler.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/handler/DiscCommHandlerImpl.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/handler/DiscCommHandlerImpl.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/handler/DiscCommHandlerImpl.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/comm/handler/DiscCommHandlerImpl.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/manager/DiscoveryManager.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/manager/DiscoveryManager.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/manager/DiscoveryManager.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/manager/DiscoveryManager.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/Data.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/Data.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/Data.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/Data.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/DiscoveryUtils.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/DiscoveryUtils.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/DiscoveryUtils.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/DiscoveryUtils.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/IDiscoveryChannel.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/IDiscoveryChannel.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/IDiscoveryChannel.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/IDiscoveryChannel.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/JGroupsDiscoveryUtils.java b/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/JGroupsDiscoveryUtils.java similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/JGroupsDiscoveryUtils.java rename to modules/services/jonas-discovery/jgroups/core/src/main/java/org/ow2/jonas/discovery/jgroups/utils/JGroupsDiscoveryUtils.java diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/jonas-resources/conf/jgroups-discovery.xml b/modules/services/jonas-discovery/jgroups/core/src/main/jonas-resources/conf/jgroups-discovery.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/jonas-resources/conf/jgroups-discovery.xml rename to modules/services/jonas-discovery/jgroups/core/src/main/jonas-resources/conf/jgroups-discovery.xml diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/properties/jonas-jgroups.properties b/modules/services/jonas-discovery/jgroups/core/src/main/properties/jonas-jgroups.properties similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/properties/jonas-jgroups.properties rename to modules/services/jonas-discovery/jgroups/core/src/main/properties/jonas-jgroups.properties diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/resources/META-INF/jonas-discovery-jgroups-core.bnd b/modules/services/jonas-discovery/jgroups/core/src/main/resources/META-INF/jonas-discovery-jgroups-core.bnd similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/resources/META-INF/jonas-discovery-jgroups-core.bnd rename to modules/services/jonas-discovery/jgroups/core/src/main/resources/META-INF/jonas-discovery-jgroups-core.bnd diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/resources/metadata.xml b/modules/services/jonas-discovery/jgroups/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/resources/metadata.xml rename to modules/services/jonas-discovery/jgroups/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-discovery/jgroups/core/src/main/resources/org/ow2/jonas/discovery/jgroups/utils/jgroups-discovery.xml b/modules/services/jonas-discovery/jgroups/core/src/main/resources/org/ow2/jonas/discovery/jgroups/utils/jgroups-discovery.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/core/src/main/resources/org/ow2/jonas/discovery/jgroups/utils/jgroups-discovery.xml rename to modules/services/jonas-discovery/jgroups/core/src/main/resources/org/ow2/jonas/discovery/jgroups/utils/jgroups-discovery.xml diff --git a/jonas/modules/services/jonas-discovery/jgroups/pom.xml b/modules/services/jonas-discovery/jgroups/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/jgroups/pom.xml rename to modules/services/jonas-discovery/jgroups/pom.xml diff --git a/jonas/modules/services/jonas-discovery/multicast/ant/pom.xml b/modules/services/jonas-discovery/multicast/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/ant/pom.xml rename to modules/services/jonas-discovery/multicast/ant/pom.xml diff --git a/jonas/modules/services/jonas-discovery/multicast/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/multicast/DiscoveryMulticast.java b/modules/services/jonas-discovery/multicast/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/multicast/DiscoveryMulticast.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/multicast/DiscoveryMulticast.java rename to modules/services/jonas-discovery/multicast/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/discovery/multicast/DiscoveryMulticast.java diff --git a/jonas/modules/services/jonas-discovery/multicast/ant/src/main/resources/antlib-discovery-multicast.xml b/modules/services/jonas-discovery/multicast/ant/src/main/resources/antlib-discovery-multicast.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/ant/src/main/resources/antlib-discovery-multicast.xml rename to modules/services/jonas-discovery/multicast/ant/src/main/resources/antlib-discovery-multicast.xml diff --git a/jonas/modules/services/jonas-discovery/multicast/ant/src/main/resources/build-discovery-multicast.properties b/modules/services/jonas-discovery/multicast/ant/src/main/resources/build-discovery-multicast.properties similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/ant/src/main/resources/build-discovery-multicast.properties rename to modules/services/jonas-discovery/multicast/ant/src/main/resources/build-discovery-multicast.properties diff --git a/jonas/modules/services/jonas-discovery/multicast/ant/src/main/resources/build-discovery-multicast.xml b/modules/services/jonas-discovery/multicast/ant/src/main/resources/build-discovery-multicast.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/ant/src/main/resources/build-discovery-multicast.xml rename to modules/services/jonas-discovery/multicast/ant/src/main/resources/build-discovery-multicast.xml diff --git a/jonas/modules/services/jonas-discovery/multicast/core/pom.xml b/modules/services/jonas-discovery/multicast/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/pom.xml rename to modules/services/jonas-discovery/multicast/core/pom.xml diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/MulticastDiscoveryServiceImpl.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/MulticastDiscoveryServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/MulticastDiscoveryServiceImpl.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/MulticastDiscoveryServiceImpl.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/MulticastDiscoveryServiceImplMBean.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/MulticastDiscoveryServiceImplMBean.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/MulticastDiscoveryServiceImplMBean.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/MulticastDiscoveryServiceImplMBean.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClient.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClient.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClient.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClient.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClientListener.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClientListener.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClientListener.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClientListener.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClientMBean.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClientMBean.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClientMBean.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/client/DiscoveryClientMBean.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryComm.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryComm.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryComm.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryComm.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryGreetingListener.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryGreetingListener.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryGreetingListener.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryGreetingListener.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryGreetingResponder.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryGreetingResponder.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryGreetingResponder.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/comm/DiscoveryGreetingResponder.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/DiscoveryListener.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/DiscoveryListener.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/DiscoveryListener.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/DiscoveryListener.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/Enroller.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/Enroller.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/Enroller.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/Enroller.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/EnrollerMBean.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/EnrollerMBean.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/EnrollerMBean.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/enroller/EnrollerMBean.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/manager/DiscoveryManager.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/manager/DiscoveryManager.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/manager/DiscoveryManager.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/manager/DiscoveryManager.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/manager/DiscoveryManagerMBean.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/manager/DiscoveryManagerMBean.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/manager/DiscoveryManagerMBean.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/manager/DiscoveryManagerMBean.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/utils/DiscoveryHelper.java b/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/utils/DiscoveryHelper.java similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/utils/DiscoveryHelper.java rename to modules/services/jonas-discovery/multicast/core/src/main/java/org/ow2/jonas/discovery/multicast/utils/DiscoveryHelper.java diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/properties/jonas-multicast.properties b/modules/services/jonas-discovery/multicast/core/src/main/properties/jonas-multicast.properties similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/properties/jonas-multicast.properties rename to modules/services/jonas-discovery/multicast/core/src/main/properties/jonas-multicast.properties diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/resources/META-INF/jonas-discovery-multicast-core.bnd b/modules/services/jonas-discovery/multicast/core/src/main/resources/META-INF/jonas-discovery-multicast-core.bnd similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/resources/META-INF/jonas-discovery-multicast-core.bnd rename to modules/services/jonas-discovery/multicast/core/src/main/resources/META-INF/jonas-discovery-multicast-core.bnd diff --git a/jonas/modules/services/jonas-discovery/multicast/core/src/main/resources/metadata.xml b/modules/services/jonas-discovery/multicast/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/core/src/main/resources/metadata.xml rename to modules/services/jonas-discovery/multicast/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-discovery/multicast/pom.xml b/modules/services/jonas-discovery/multicast/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/multicast/pom.xml rename to modules/services/jonas-discovery/multicast/pom.xml diff --git a/jonas/modules/services/jonas-discovery/pom.xml b/modules/services/jonas-discovery/pom.xml similarity index 100% rename from jonas/modules/services/jonas-discovery/pom.xml rename to modules/services/jonas-discovery/pom.xml diff --git a/jonas/modules/services/jonas-ear/addon/pom.xml b/modules/services/jonas-ear/addon/pom.xml similarity index 100% rename from jonas/modules/services/jonas-ear/addon/pom.xml rename to modules/services/jonas-ear/addon/pom.xml diff --git a/jonas/modules/services/jonas-ear/addon/src/main/assembly/assembly.xml b/modules/services/jonas-ear/addon/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/jonas-ear/addon/src/main/assembly/assembly.xml rename to modules/services/jonas-ear/addon/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/jonas-ear/addon/src/main/resources/META-INF/jonas-addon.xml b/modules/services/jonas-ear/addon/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/jonas-ear/addon/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/jonas-ear/addon/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/jonas-ear/core/pom.xml b/modules/services/jonas-ear/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-ear/core/pom.xml rename to modules/services/jonas-ear/core/pom.xml diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/AppClientModuleInfo.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/AppClientModuleInfo.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/AppClientModuleInfo.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/AppClientModuleInfo.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EARModule.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EARModule.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EARModule.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EARModule.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EarCleanTask.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EarCleanTask.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EarCleanTask.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EarCleanTask.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EarDeployer.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EarDeployer.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EarDeployer.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/EarDeployer.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/JOnASEARService.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/JOnASEARService.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/JOnASEARService.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/JOnASEARService.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/JOnASEARServiceMBean.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/JOnASEARServiceMBean.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/JOnASEARServiceMBean.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/JOnASEARServiceMBean.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/AppClientModule.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/AppClientModule.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/AppClientModule.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/AppClientModule.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/EARModuleIdentifier.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/EARModuleIdentifier.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/EARModuleIdentifier.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/EARModuleIdentifier.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/EARModuleMBean.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/EARModuleMBean.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/EARModuleMBean.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/EARModuleMBean.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/Ear.java b/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/Ear.java similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/Ear.java rename to modules/services/jonas-ear/core/src/main/java/org/ow2/jonas/ear/internal/mbean/Ear.java diff --git a/jonas/modules/services/jonas-ear/core/src/main/resources/META-INF/jonas-ear-core.bnd b/modules/services/jonas-ear/core/src/main/resources/META-INF/jonas-ear-core.bnd similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/resources/META-INF/jonas-ear-core.bnd rename to modules/services/jonas-ear/core/src/main/resources/META-INF/jonas-ear-core.bnd diff --git a/jonas/modules/services/jonas-ear/core/src/main/resources/metadata.xml b/modules/services/jonas-ear/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/resources/metadata.xml rename to modules/services/jonas-ear/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-ear/core/src/main/resources/org/ow2/jonas/ear/internal/mbeans-descriptors.xml b/modules/services/jonas-ear/core/src/main/resources/org/ow2/jonas/ear/internal/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/resources/org/ow2/jonas/ear/internal/mbeans-descriptors.xml rename to modules/services/jonas-ear/core/src/main/resources/org/ow2/jonas/ear/internal/mbeans-descriptors.xml diff --git a/jonas/modules/services/jonas-ear/core/src/main/templates/jonas-ear.properties.template b/modules/services/jonas-ear/core/src/main/templates/jonas-ear.properties.template similarity index 100% rename from jonas/modules/services/jonas-ear/core/src/main/templates/jonas-ear.properties.template rename to modules/services/jonas-ear/core/src/main/templates/jonas-ear.properties.template diff --git a/jonas/modules/services/jonas-ear/pom.xml b/modules/services/jonas-ear/pom.xml similarity index 100% rename from jonas/modules/services/jonas-ear/pom.xml rename to modules/services/jonas-ear/pom.xml diff --git a/jonas/modules/services/jonas-ejb-ha/ant/pom.xml b/modules/services/jonas-ejb-ha/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-ejb-ha/ant/pom.xml rename to modules/services/jonas-ejb-ha/ant/pom.xml diff --git a/jonas/modules/services/jonas-ejb-ha/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/ha/Ha.java b/modules/services/jonas-ejb-ha/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/ha/Ha.java similarity index 100% rename from jonas/modules/services/jonas-ejb-ha/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/ha/Ha.java rename to modules/services/jonas-ejb-ha/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/ha/Ha.java diff --git a/jonas/modules/services/jonas-ejb-ha/core/pom.xml b/modules/services/jonas-ejb-ha/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-ejb-ha/core/pom.xml rename to modules/services/jonas-ejb-ha/core/pom.xml diff --git a/jonas/modules/services/jonas-ejb-ha/core/src/main/java/org/ow2/jonas/ha/internal/HaServiceImpl.java b/modules/services/jonas-ejb-ha/core/src/main/java/org/ow2/jonas/ha/internal/HaServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-ejb-ha/core/src/main/java/org/ow2/jonas/ha/internal/HaServiceImpl.java rename to modules/services/jonas-ejb-ha/core/src/main/java/org/ow2/jonas/ha/internal/HaServiceImpl.java diff --git a/jonas/modules/services/jonas-ejb-ha/core/src/main/jonas-resources/conf/jgroups-ha.xml b/modules/services/jonas-ejb-ha/core/src/main/jonas-resources/conf/jgroups-ha.xml similarity index 100% rename from jonas/modules/services/jonas-ejb-ha/core/src/main/jonas-resources/conf/jgroups-ha.xml rename to modules/services/jonas-ejb-ha/core/src/main/jonas-resources/conf/jgroups-ha.xml diff --git a/jonas/modules/services/jonas-ejb-ha/core/src/main/resources/META-INF/jonas-ejb-ha-core.bnd b/modules/services/jonas-ejb-ha/core/src/main/resources/META-INF/jonas-ejb-ha-core.bnd similarity index 100% rename from jonas/modules/services/jonas-ejb-ha/core/src/main/resources/META-INF/jonas-ejb-ha-core.bnd rename to modules/services/jonas-ejb-ha/core/src/main/resources/META-INF/jonas-ejb-ha-core.bnd diff --git a/jonas/modules/services/jonas-ejb-ha/core/src/main/resources/metadata.xml b/modules/services/jonas-ejb-ha/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-ejb-ha/core/src/main/resources/metadata.xml rename to modules/services/jonas-ejb-ha/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-ejb-ha/core/src/main/templates/jonas-ha.properties.template b/modules/services/jonas-ejb-ha/core/src/main/templates/jonas-ha.properties.template similarity index 100% rename from jonas/modules/services/jonas-ejb-ha/core/src/main/templates/jonas-ha.properties.template rename to modules/services/jonas-ejb-ha/core/src/main/templates/jonas-ha.properties.template diff --git a/jonas/modules/services/jonas-ejb-ha/pom.xml b/modules/services/jonas-ejb-ha/pom.xml similarity index 100% rename from jonas/modules/services/jonas-ejb-ha/pom.xml rename to modules/services/jonas-ejb-ha/pom.xml diff --git a/jonas/modules/services/jonas-endpoint-collector/core/pom.xml b/modules/services/jonas-endpoint-collector/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-endpoint-collector/core/pom.xml rename to modules/services/jonas-endpoint-collector/core/pom.xml diff --git a/jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/Endpoint.java b/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/Endpoint.java similarity index 100% rename from jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/Endpoint.java rename to modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/Endpoint.java diff --git a/jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/IEndpoint.java b/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/IEndpoint.java similarity index 100% rename from jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/IEndpoint.java rename to modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/IEndpoint.java diff --git a/jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/IEndpointBuilder.java b/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/IEndpointBuilder.java similarity index 100% rename from jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/IEndpointBuilder.java rename to modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/IEndpointBuilder.java diff --git a/jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/internal/EndpointCollector.java b/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/internal/EndpointCollector.java similarity index 100% rename from jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/internal/EndpointCollector.java rename to modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/internal/EndpointCollector.java diff --git a/jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/util/Util.java b/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/util/Util.java similarity index 100% rename from jonas/modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/util/Util.java rename to modules/services/jonas-endpoint-collector/core/src/main/java/org/ow2/jonas/endpoint/collector/util/Util.java diff --git a/jonas/modules/services/jonas-endpoint-collector/core/src/main/resources/META-INF/jonas-endpoint-collector.bnd b/modules/services/jonas-endpoint-collector/core/src/main/resources/META-INF/jonas-endpoint-collector.bnd similarity index 100% rename from jonas/modules/services/jonas-endpoint-collector/core/src/main/resources/META-INF/jonas-endpoint-collector.bnd rename to modules/services/jonas-endpoint-collector/core/src/main/resources/META-INF/jonas-endpoint-collector.bnd diff --git a/jonas/modules/services/jonas-endpoint-collector/core/src/main/resources/metadata.xml b/modules/services/jonas-endpoint-collector/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-endpoint-collector/core/src/main/resources/metadata.xml rename to modules/services/jonas-endpoint-collector/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-endpoint-collector/pom.xml b/modules/services/jonas-endpoint-collector/pom.xml similarity index 100% rename from jonas/modules/services/jonas-endpoint-collector/pom.xml rename to modules/services/jonas-endpoint-collector/pom.xml diff --git a/jonas/modules/services/jonas-extension-loader/core/pom.xml b/modules/services/jonas-extension-loader/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-extension-loader/core/pom.xml rename to modules/services/jonas-extension-loader/core/pom.xml diff --git a/jonas/modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/Bnd.java b/modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/Bnd.java similarity index 100% rename from jonas/modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/Bnd.java rename to modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/Bnd.java diff --git a/jonas/modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/Bundlizable.java b/modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/Bundlizable.java similarity index 100% rename from jonas/modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/Bundlizable.java rename to modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/Bundlizable.java diff --git a/jonas/modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/ExtensionLoaderComponent.java b/modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/ExtensionLoaderComponent.java similarity index 100% rename from jonas/modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/ExtensionLoaderComponent.java rename to modules/services/jonas-extension-loader/core/src/main/java/org/ow2/jonas/extension/loader/ExtensionLoaderComponent.java diff --git a/jonas/modules/services/jonas-extension-loader/core/src/main/resources/META-INF/jonas-extension-loader-core.bnd b/modules/services/jonas-extension-loader/core/src/main/resources/META-INF/jonas-extension-loader-core.bnd similarity index 100% rename from jonas/modules/services/jonas-extension-loader/core/src/main/resources/META-INF/jonas-extension-loader-core.bnd rename to modules/services/jonas-extension-loader/core/src/main/resources/META-INF/jonas-extension-loader-core.bnd diff --git a/jonas/modules/services/jonas-extension-loader/core/src/main/resources/metadata.xml b/modules/services/jonas-extension-loader/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-extension-loader/core/src/main/resources/metadata.xml rename to modules/services/jonas-extension-loader/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-extension-loader/pom.xml b/modules/services/jonas-extension-loader/pom.xml similarity index 100% rename from jonas/modules/services/jonas-extension-loader/pom.xml rename to modules/services/jonas-extension-loader/pom.xml diff --git a/jonas/modules/services/jonas-jmx/core/pom.xml b/modules/services/jonas-jmx/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-jmx/core/pom.xml rename to modules/services/jonas-jmx/core/pom.xml diff --git a/jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/BaseJMXService.java b/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/BaseJMXService.java similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/BaseJMXService.java rename to modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/BaseJMXService.java diff --git a/jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/JOnASJMXService.java b/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/JOnASJMXService.java similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/JOnASJMXService.java rename to modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/JOnASJMXService.java diff --git a/jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/InvocationContextImpl.java b/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/InvocationContextImpl.java similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/InvocationContextImpl.java rename to modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/InvocationContextImpl.java diff --git a/jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/InvocationHandlerImpl.java b/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/InvocationHandlerImpl.java similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/InvocationHandlerImpl.java rename to modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/InvocationHandlerImpl.java diff --git a/jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/MBeanServerDelegateInterceptor.java b/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/MBeanServerDelegateInterceptor.java similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/MBeanServerDelegateInterceptor.java rename to modules/services/jonas-jmx/core/src/main/java/org/ow2/jonas/jmx/internal/interceptor/MBeanServerDelegateInterceptor.java diff --git a/jonas/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/domain.xml b/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/domain.xml similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/domain.xml rename to modules/services/jonas-jmx/core/src/main/jonas-resources/conf/domain.xml diff --git a/jonas/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.access b/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.access similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.access rename to modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.access diff --git a/jonas/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.passwords b/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.passwords similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.passwords rename to modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.passwords diff --git a/jonas/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.rolebased.access b/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.rolebased.access similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.rolebased.access rename to modules/services/jonas-jmx/core/src/main/jonas-resources/conf/jmx.rolebased.access diff --git a/jonas/modules/services/jonas-jmx/core/src/main/resources/META-INF/jonas-jmx-core.bnd b/modules/services/jonas-jmx/core/src/main/resources/META-INF/jonas-jmx-core.bnd similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/resources/META-INF/jonas-jmx-core.bnd rename to modules/services/jonas-jmx/core/src/main/resources/META-INF/jonas-jmx-core.bnd diff --git a/jonas/modules/services/jonas-jmx/core/src/main/resources/metadata.xml b/modules/services/jonas-jmx/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/resources/metadata.xml rename to modules/services/jonas-jmx/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-jmx/core/src/main/templates/jonas-jmx.properties.template b/modules/services/jonas-jmx/core/src/main/templates/jonas-jmx.properties.template similarity index 100% rename from jonas/modules/services/jonas-jmx/core/src/main/templates/jonas-jmx.properties.template rename to modules/services/jonas-jmx/core/src/main/templates/jonas-jmx.properties.template diff --git a/jonas/modules/services/jonas-jmx/pom.xml b/modules/services/jonas-jmx/pom.xml similarity index 100% rename from jonas/modules/services/jonas-jmx/pom.xml rename to modules/services/jonas-jmx/pom.xml diff --git a/jonas/modules/services/jonas-jndi/core/pom.xml b/modules/services/jonas-jndi/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/pom.xml rename to modules/services/jonas-jndi/core/pom.xml diff --git a/jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/JndiService.java b/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/JndiService.java similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/JndiService.java rename to modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/JndiService.java diff --git a/jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiAdapter.java b/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiAdapter.java similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiAdapter.java rename to modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiAdapter.java diff --git a/jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiAdapterRegistry.java b/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiAdapterRegistry.java similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiAdapterRegistry.java rename to modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiAdapterRegistry.java diff --git a/jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiEntriesException.java b/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiEntriesException.java similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiEntriesException.java rename to modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiEntriesException.java diff --git a/jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiEntriesService.java b/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiEntriesService.java similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiEntriesService.java rename to modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiEntriesService.java diff --git a/jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiServiceImpl.java b/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiServiceImpl.java rename to modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/JndiServiceImpl.java diff --git a/jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/Policy.java b/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/Policy.java similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/Policy.java rename to modules/services/jonas-jndi/core/src/main/java/org/ow2/jonas/jndi/internal/Policy.java diff --git a/jonas/modules/services/jonas-jndi/core/src/main/jonas-resources/deploy-example/configadmin-jndi-example.xml b/modules/services/jonas-jndi/core/src/main/jonas-resources/deploy-example/configadmin-jndi-example.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/jonas-resources/deploy-example/configadmin-jndi-example.xml rename to modules/services/jonas-jndi/core/src/main/jonas-resources/deploy-example/configadmin-jndi-example.xml diff --git a/jonas/modules/services/jonas-jndi/core/src/main/resources/META-INF/configadmin-jndi-1.0.xsd b/modules/services/jonas-jndi/core/src/main/resources/META-INF/configadmin-jndi-1.0.xsd similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/resources/META-INF/configadmin-jndi-1.0.xsd rename to modules/services/jonas-jndi/core/src/main/resources/META-INF/configadmin-jndi-1.0.xsd diff --git a/jonas/modules/services/jonas-jndi/core/src/main/resources/META-INF/jonas-jndi-core.bnd b/modules/services/jonas-jndi/core/src/main/resources/META-INF/jonas-jndi-core.bnd similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/resources/META-INF/jonas-jndi-core.bnd rename to modules/services/jonas-jndi/core/src/main/resources/META-INF/jonas-jndi-core.bnd diff --git a/jonas/modules/services/jonas-jndi/core/src/main/resources/metadata.xml b/modules/services/jonas-jndi/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/resources/metadata.xml rename to modules/services/jonas-jndi/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-jndi/core/src/main/templates/jonas-jndi.properties.template b/modules/services/jonas-jndi/core/src/main/templates/jonas-jndi.properties.template similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/main/templates/jonas-jndi.properties.template rename to modules/services/jonas-jndi/core/src/main/templates/jonas-jndi.properties.template diff --git a/jonas/modules/services/jonas-jndi/core/src/test/java/org/ow2/jonas/jndi/test/JndiTest.java b/modules/services/jonas-jndi/core/src/test/java/org/ow2/jonas/jndi/test/JndiTest.java similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/test/java/org/ow2/jonas/jndi/test/JndiTest.java rename to modules/services/jonas-jndi/core/src/test/java/org/ow2/jonas/jndi/test/JndiTest.java diff --git a/jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-empty-value-test.xml b/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-empty-value-test.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-empty-value-test.xml rename to modules/services/jonas-jndi/core/src/test/resources/ca-jndi-empty-value-test.xml diff --git a/jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-null-value-test.xml b/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-null-value-test.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-null-value-test.xml rename to modules/services/jonas-jndi/core/src/test/resources/ca-jndi-null-value-test.xml diff --git a/jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-sample-example.xml b/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-sample-example.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-sample-example.xml rename to modules/services/jonas-jndi/core/src/test/resources/ca-jndi-sample-example.xml diff --git a/jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-unicity-test.xml b/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-unicity-test.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-unicity-test.xml rename to modules/services/jonas-jndi/core/src/test/resources/ca-jndi-unicity-test.xml diff --git a/jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-content.xml b/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-content.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-content.xml rename to modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-content.xml diff --git a/jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-policy.xml b/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-policy.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-policy.xml rename to modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-policy.xml diff --git a/jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-tag-order.xml b/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-tag-order.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-tag-order.xml rename to modules/services/jonas-jndi/core/src/test/resources/ca-jndi-wrong-tag-order.xml diff --git a/jonas/modules/services/jonas-jndi/pom.xml b/modules/services/jonas-jndi/pom.xml similarity index 100% rename from jonas/modules/services/jonas-jndi/pom.xml rename to modules/services/jonas-jndi/pom.xml diff --git a/jonas/modules/services/jonas-mail/ant/pom.xml b/modules/services/jonas-mail/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-mail/ant/pom.xml rename to modules/services/jonas-mail/ant/pom.xml diff --git a/jonas/modules/services/jonas-mail/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/mail/DeployableTask.java b/modules/services/jonas-mail/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/mail/DeployableTask.java similarity index 100% rename from jonas/modules/services/jonas-mail/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/mail/DeployableTask.java rename to modules/services/jonas-mail/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/mail/DeployableTask.java diff --git a/jonas/modules/services/jonas-mail/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/mail/Mail.java b/modules/services/jonas-mail/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/mail/Mail.java similarity index 100% rename from jonas/modules/services/jonas-mail/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/mail/Mail.java rename to modules/services/jonas-mail/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/mail/Mail.java diff --git a/jonas/modules/services/jonas-mail/ant/src/main/resources/antlib-mail.xml b/modules/services/jonas-mail/ant/src/main/resources/antlib-mail.xml similarity index 100% rename from jonas/modules/services/jonas-mail/ant/src/main/resources/antlib-mail.xml rename to modules/services/jonas-mail/ant/src/main/resources/antlib-mail.xml diff --git a/jonas/modules/services/jonas-mail/ant/src/main/resources/build-mail.properties.template b/modules/services/jonas-mail/ant/src/main/resources/build-mail.properties.template similarity index 100% rename from jonas/modules/services/jonas-mail/ant/src/main/resources/build-mail.properties.template rename to modules/services/jonas-mail/ant/src/main/resources/build-mail.properties.template diff --git a/jonas/modules/services/jonas-mail/ant/src/main/resources/build-mail.xml b/modules/services/jonas-mail/ant/src/main/resources/build-mail.xml similarity index 100% rename from jonas/modules/services/jonas-mail/ant/src/main/resources/build-mail.xml rename to modules/services/jonas-mail/ant/src/main/resources/build-mail.xml diff --git a/jonas/modules/services/jonas-mail/core/pom.xml b/modules/services/jonas-mail/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-mail/core/pom.xml rename to modules/services/jonas-mail/core/pom.xml diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/JOnASMailService.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/JOnASMailService.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/JOnASMailService.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/JOnASMailService.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/AbstractJavaMail.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/AbstractJavaMail.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/AbstractJavaMail.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/AbstractJavaMail.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailMimePartDS.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailMimePartDS.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailMimePartDS.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailMimePartDS.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailMimePartDSFactory.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailMimePartDSFactory.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailMimePartDSFactory.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailMimePartDSFactory.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailSession.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailSession.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailSession.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailSession.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailSessionFactory.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailSessionFactory.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailSessionFactory.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/JavaMailSessionFactory.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/lib/JAuthenticator.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/lib/JAuthenticator.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/lib/JAuthenticator.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/lib/JAuthenticator.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailMimePartDSResource.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailMimePartDSResource.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailMimePartDSResource.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailMimePartDSResource.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailResource.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailResource.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailResource.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailResource.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailResourceMBean.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailResourceMBean.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailResourceMBean.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailResourceMBean.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailSessionResource.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailSessionResource.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailSessionResource.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/factory/mbean/JavaMailSessionResource.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/osgi/configadmin/MailMimePartDSFactory.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/osgi/configadmin/MailMimePartDSFactory.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/osgi/configadmin/MailMimePartDSFactory.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/osgi/configadmin/MailMimePartDSFactory.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/osgi/configadmin/MailSessionFactory.java b/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/osgi/configadmin/MailSessionFactory.java similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/osgi/configadmin/MailSessionFactory.java rename to modules/services/jonas-mail/core/src/main/java/org/ow2/jonas/mail/internal/osgi/configadmin/MailSessionFactory.java diff --git a/jonas/modules/services/jonas-mail/core/src/main/jonas-resources/conf/MailMimePartDS1.properties b/modules/services/jonas-mail/core/src/main/jonas-resources/conf/MailMimePartDS1.properties similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/jonas-resources/conf/MailMimePartDS1.properties rename to modules/services/jonas-mail/core/src/main/jonas-resources/conf/MailMimePartDS1.properties diff --git a/jonas/modules/services/jonas-mail/core/src/main/jonas-resources/conf/MailSession1.properties b/modules/services/jonas-mail/core/src/main/jonas-resources/conf/MailSession1.properties similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/jonas-resources/conf/MailSession1.properties rename to modules/services/jonas-mail/core/src/main/jonas-resources/conf/MailSession1.properties diff --git a/jonas/modules/services/jonas-mail/core/src/main/jonas-resources/deploy-example/mail-factories.xml b/modules/services/jonas-mail/core/src/main/jonas-resources/deploy-example/mail-factories.xml similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/jonas-resources/deploy-example/mail-factories.xml rename to modules/services/jonas-mail/core/src/main/jonas-resources/deploy-example/mail-factories.xml diff --git a/jonas/modules/services/jonas-mail/core/src/main/resources/META-INF/jonas-mail-core.bnd b/modules/services/jonas-mail/core/src/main/resources/META-INF/jonas-mail-core.bnd similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/resources/META-INF/jonas-mail-core.bnd rename to modules/services/jonas-mail/core/src/main/resources/META-INF/jonas-mail-core.bnd diff --git a/jonas/modules/services/jonas-mail/core/src/main/resources/metadata.xml b/modules/services/jonas-mail/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/resources/metadata.xml rename to modules/services/jonas-mail/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-mail/core/src/main/resources/org/ow2/jonas/mail/internal/mbeans-descriptors.xml b/modules/services/jonas-mail/core/src/main/resources/org/ow2/jonas/mail/internal/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/resources/org/ow2/jonas/mail/internal/mbeans-descriptors.xml rename to modules/services/jonas-mail/core/src/main/resources/org/ow2/jonas/mail/internal/mbeans-descriptors.xml diff --git a/jonas/modules/services/jonas-mail/core/src/main/templates/jonas-mail.properties.template b/modules/services/jonas-mail/core/src/main/templates/jonas-mail.properties.template similarity index 100% rename from jonas/modules/services/jonas-mail/core/src/main/templates/jonas-mail.properties.template rename to modules/services/jonas-mail/core/src/main/templates/jonas-mail.properties.template diff --git a/jonas/modules/services/jonas-mail/pom.xml b/modules/services/jonas-mail/pom.xml similarity index 100% rename from jonas/modules/services/jonas-mail/pom.xml rename to modules/services/jonas-mail/pom.xml diff --git a/jonas/modules/services/jonas-report/api/pom.xml b/modules/services/jonas-report/api/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/api/pom.xml rename to modules/services/jonas-report/api/pom.xml diff --git a/jonas/modules/services/jonas-report/api/src/main/java/org/ow2/jonas/report/api/IReport.java b/modules/services/jonas-report/api/src/main/java/org/ow2/jonas/report/api/IReport.java similarity index 100% rename from jonas/modules/services/jonas-report/api/src/main/java/org/ow2/jonas/report/api/IReport.java rename to modules/services/jonas-report/api/src/main/java/org/ow2/jonas/report/api/IReport.java diff --git a/jonas/modules/services/jonas-report/api/src/main/java/org/ow2/jonas/report/api/IReportExtension.java b/modules/services/jonas-report/api/src/main/java/org/ow2/jonas/report/api/IReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/api/src/main/java/org/ow2/jonas/report/api/IReportExtension.java rename to modules/services/jonas-report/api/src/main/java/org/ow2/jonas/report/api/IReportExtension.java diff --git a/jonas/modules/services/jonas-report/api/src/main/resources/META-INF/jonas-report-api.bnd b/modules/services/jonas-report/api/src/main/resources/META-INF/jonas-report-api.bnd similarity index 100% rename from jonas/modules/services/jonas-report/api/src/main/resources/META-INF/jonas-report-api.bnd rename to modules/services/jonas-report/api/src/main/resources/META-INF/jonas-report-api.bnd diff --git a/jonas/modules/services/jonas-report/api/src/main/resources/xsd/jonas-report.xsd b/modules/services/jonas-report/api/src/main/resources/xsd/jonas-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/api/src/main/resources/xsd/jonas-report.xsd rename to modules/services/jonas-report/api/src/main/resources/xsd/jonas-report.xsd diff --git a/jonas/modules/services/jonas-report/core/pom.xml b/modules/services/jonas-report/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/core/pom.xml rename to modules/services/jonas-report/core/pom.xml diff --git a/jonas/modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/internal/Report.java b/modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/internal/Report.java similarity index 100% rename from jonas/modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/internal/Report.java rename to modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/internal/Report.java diff --git a/jonas/modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/internal/ReportMBean.java b/modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/internal/ReportMBean.java similarity index 100% rename from jonas/modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/internal/ReportMBean.java rename to modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/internal/ReportMBean.java diff --git a/jonas/modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/util/Utility.java b/modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/util/Utility.java similarity index 100% rename from jonas/modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/util/Utility.java rename to modules/services/jonas-report/core/src/main/java/org/ow2/jonas/service/report/util/Utility.java diff --git a/jonas/modules/services/jonas-report/core/src/main/resources/META-INF/jonas-report-core.bnd b/modules/services/jonas-report/core/src/main/resources/META-INF/jonas-report-core.bnd similarity index 100% rename from jonas/modules/services/jonas-report/core/src/main/resources/META-INF/jonas-report-core.bnd rename to modules/services/jonas-report/core/src/main/resources/META-INF/jonas-report-core.bnd diff --git a/jonas/modules/services/jonas-report/core/src/main/resources/metadata.xml b/modules/services/jonas-report/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/core/src/main/resources/metadata.xml rename to modules/services/jonas-report/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/core/src/main/resources/org/ow2/jonas/service/report/internal/mbeans-descriptors.xml b/modules/services/jonas-report/core/src/main/resources/org/ow2/jonas/service/report/internal/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jonas-report/core/src/main/resources/org/ow2/jonas/service/report/internal/mbeans-descriptors.xml rename to modules/services/jonas-report/core/src/main/resources/org/ow2/jonas/service/report/internal/mbeans-descriptors.xml diff --git a/jonas/modules/services/jonas-report/extensions/bundles/pom.xml b/modules/services/jonas-report/extensions/bundles/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/bundles/pom.xml rename to modules/services/jonas-report/extensions/bundles/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/bundles/src/main/java/org/ow2/jonas/report/extensions/bundles/internal/BundlesReportExtension.java b/modules/services/jonas-report/extensions/bundles/src/main/java/org/ow2/jonas/report/extensions/bundles/internal/BundlesReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/extensions/bundles/src/main/java/org/ow2/jonas/report/extensions/bundles/internal/BundlesReportExtension.java rename to modules/services/jonas-report/extensions/bundles/src/main/java/org/ow2/jonas/report/extensions/bundles/internal/BundlesReportExtension.java diff --git a/jonas/modules/services/jonas-report/extensions/bundles/src/main/resources/META-INF/jonas-report-extension-bundles.bnd b/modules/services/jonas-report/extensions/bundles/src/main/resources/META-INF/jonas-report-extension-bundles.bnd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/bundles/src/main/resources/META-INF/jonas-report-extension-bundles.bnd rename to modules/services/jonas-report/extensions/bundles/src/main/resources/META-INF/jonas-report-extension-bundles.bnd diff --git a/jonas/modules/services/jonas-report/extensions/bundles/src/main/resources/metadata.xml b/modules/services/jonas-report/extensions/bundles/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/bundles/src/main/resources/metadata.xml rename to modules/services/jonas-report/extensions/bundles/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/extensions/bundles/src/main/resources/xsd/bundles-report.xsd b/modules/services/jonas-report/extensions/bundles/src/main/resources/xsd/bundles-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/bundles/src/main/resources/xsd/bundles-report.xsd rename to modules/services/jonas-report/extensions/bundles/src/main/resources/xsd/bundles-report.xsd diff --git a/jonas/modules/services/jonas-report/extensions/deployables/pom.xml b/modules/services/jonas-report/extensions/deployables/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployables/pom.xml rename to modules/services/jonas-report/extensions/deployables/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/deployables/src/main/java/org/ow2/jonas/report/extensions/deployables/internal/DeployablesReportExtension.java b/modules/services/jonas-report/extensions/deployables/src/main/java/org/ow2/jonas/report/extensions/deployables/internal/DeployablesReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployables/src/main/java/org/ow2/jonas/report/extensions/deployables/internal/DeployablesReportExtension.java rename to modules/services/jonas-report/extensions/deployables/src/main/java/org/ow2/jonas/report/extensions/deployables/internal/DeployablesReportExtension.java diff --git a/jonas/modules/services/jonas-report/extensions/deployables/src/main/resources/META-INF/jonas-report-extension-deployables.bnd b/modules/services/jonas-report/extensions/deployables/src/main/resources/META-INF/jonas-report-extension-deployables.bnd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployables/src/main/resources/META-INF/jonas-report-extension-deployables.bnd rename to modules/services/jonas-report/extensions/deployables/src/main/resources/META-INF/jonas-report-extension-deployables.bnd diff --git a/jonas/modules/services/jonas-report/extensions/deployables/src/main/resources/metadata.xml b/modules/services/jonas-report/extensions/deployables/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployables/src/main/resources/metadata.xml rename to modules/services/jonas-report/extensions/deployables/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/extensions/deployables/src/main/resources/xsd/deployable-report.xsd b/modules/services/jonas-report/extensions/deployables/src/main/resources/xsd/deployable-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployables/src/main/resources/xsd/deployable-report.xsd rename to modules/services/jonas-report/extensions/deployables/src/main/resources/xsd/deployable-report.xsd diff --git a/jonas/modules/services/jonas-report/extensions/deployers/pom.xml b/modules/services/jonas-report/extensions/deployers/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployers/pom.xml rename to modules/services/jonas-report/extensions/deployers/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/deployers/src/main/java/org/ow2/jonas/report/extensions/deployers/internal/DeployersReportExtension.java b/modules/services/jonas-report/extensions/deployers/src/main/java/org/ow2/jonas/report/extensions/deployers/internal/DeployersReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployers/src/main/java/org/ow2/jonas/report/extensions/deployers/internal/DeployersReportExtension.java rename to modules/services/jonas-report/extensions/deployers/src/main/java/org/ow2/jonas/report/extensions/deployers/internal/DeployersReportExtension.java diff --git a/jonas/modules/services/jonas-report/extensions/deployers/src/main/resources/META-INF/jonas-report-extension-deployers.bnd b/modules/services/jonas-report/extensions/deployers/src/main/resources/META-INF/jonas-report-extension-deployers.bnd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployers/src/main/resources/META-INF/jonas-report-extension-deployers.bnd rename to modules/services/jonas-report/extensions/deployers/src/main/resources/META-INF/jonas-report-extension-deployers.bnd diff --git a/jonas/modules/services/jonas-report/extensions/deployers/src/main/resources/metadata.xml b/modules/services/jonas-report/extensions/deployers/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployers/src/main/resources/metadata.xml rename to modules/services/jonas-report/extensions/deployers/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/extensions/deployers/src/main/resources/xsd/deployers-report.xsd b/modules/services/jonas-report/extensions/deployers/src/main/resources/xsd/deployers-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/deployers/src/main/resources/xsd/deployers-report.xsd rename to modules/services/jonas-report/extensions/deployers/src/main/resources/xsd/deployers-report.xsd diff --git a/jonas/modules/services/jonas-report/extensions/endpoints/pom.xml b/modules/services/jonas-report/extensions/endpoints/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/endpoints/pom.xml rename to modules/services/jonas-report/extensions/endpoints/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/endpoints/src/main/java/org/ow2/jonas/report/extensions/endpoints/internal/EndpointsReportExtension.java b/modules/services/jonas-report/extensions/endpoints/src/main/java/org/ow2/jonas/report/extensions/endpoints/internal/EndpointsReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/extensions/endpoints/src/main/java/org/ow2/jonas/report/extensions/endpoints/internal/EndpointsReportExtension.java rename to modules/services/jonas-report/extensions/endpoints/src/main/java/org/ow2/jonas/report/extensions/endpoints/internal/EndpointsReportExtension.java diff --git a/jonas/modules/services/jonas-report/extensions/endpoints/src/main/resources/META-INF/jonas-report-extension-endpoints.bnd b/modules/services/jonas-report/extensions/endpoints/src/main/resources/META-INF/jonas-report-extension-endpoints.bnd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/endpoints/src/main/resources/META-INF/jonas-report-extension-endpoints.bnd rename to modules/services/jonas-report/extensions/endpoints/src/main/resources/META-INF/jonas-report-extension-endpoints.bnd diff --git a/jonas/modules/services/jonas-report/extensions/endpoints/src/main/resources/metadata.xml b/modules/services/jonas-report/extensions/endpoints/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/endpoints/src/main/resources/metadata.xml rename to modules/services/jonas-report/extensions/endpoints/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/extensions/endpoints/src/main/resources/xsd/endpoints-report.xsd b/modules/services/jonas-report/extensions/endpoints/src/main/resources/xsd/endpoints-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/endpoints/src/main/resources/xsd/endpoints-report.xsd rename to modules/services/jonas-report/extensions/endpoints/src/main/resources/xsd/endpoints-report.xsd diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-factories/pom.xml b/modules/services/jonas-report/extensions/ipojo-factories/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-factories/pom.xml rename to modules/services/jonas-report/extensions/ipojo-factories/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-factories/src/main/java/org/ow2/jonas/report/extensions/ipojo/factories/internal/IpojoFactoriesReportExtension.java b/modules/services/jonas-report/extensions/ipojo-factories/src/main/java/org/ow2/jonas/report/extensions/ipojo/factories/internal/IpojoFactoriesReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-factories/src/main/java/org/ow2/jonas/report/extensions/ipojo/factories/internal/IpojoFactoriesReportExtension.java rename to modules/services/jonas-report/extensions/ipojo-factories/src/main/java/org/ow2/jonas/report/extensions/ipojo/factories/internal/IpojoFactoriesReportExtension.java diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/META-INF/jonas-report-extension-ipojo-factories.bnd b/modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/META-INF/jonas-report-extension-ipojo-factories.bnd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/META-INF/jonas-report-extension-ipojo-factories.bnd rename to modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/META-INF/jonas-report-extension-ipojo-factories.bnd diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/metadata.xml b/modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/metadata.xml rename to modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/xsd/ipojo-factories-report.xsd b/modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/xsd/ipojo-factories-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/xsd/ipojo-factories-report.xsd rename to modules/services/jonas-report/extensions/ipojo-factories/src/main/resources/xsd/ipojo-factories-report.xsd diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-handlers/pom.xml b/modules/services/jonas-report/extensions/ipojo-handlers/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-handlers/pom.xml rename to modules/services/jonas-report/extensions/ipojo-handlers/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-handlers/src/main/java/org/ow2/jonas/report/extensions/ipojo/handlers/internal/IpojoHandlersReportExtension.java b/modules/services/jonas-report/extensions/ipojo-handlers/src/main/java/org/ow2/jonas/report/extensions/ipojo/handlers/internal/IpojoHandlersReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-handlers/src/main/java/org/ow2/jonas/report/extensions/ipojo/handlers/internal/IpojoHandlersReportExtension.java rename to modules/services/jonas-report/extensions/ipojo-handlers/src/main/java/org/ow2/jonas/report/extensions/ipojo/handlers/internal/IpojoHandlersReportExtension.java diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/META-INF/jonas-report-extension-ipojo-handlers.bnd b/modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/META-INF/jonas-report-extension-ipojo-handlers.bnd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/META-INF/jonas-report-extension-ipojo-handlers.bnd rename to modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/META-INF/jonas-report-extension-ipojo-handlers.bnd diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/metadata.xml b/modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/metadata.xml rename to modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/xsd/ipojo-handlers-report.xsd b/modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/xsd/ipojo-handlers-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/xsd/ipojo-handlers-report.xsd rename to modules/services/jonas-report/extensions/ipojo-handlers/src/main/resources/xsd/ipojo-handlers-report.xsd diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-instances/pom.xml b/modules/services/jonas-report/extensions/ipojo-instances/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-instances/pom.xml rename to modules/services/jonas-report/extensions/ipojo-instances/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-instances/src/main/java/org/ow2/jonas/report/extensions/ipojo/instances/internal/IpojoInstancesReportExtension.java b/modules/services/jonas-report/extensions/ipojo-instances/src/main/java/org/ow2/jonas/report/extensions/ipojo/instances/internal/IpojoInstancesReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-instances/src/main/java/org/ow2/jonas/report/extensions/ipojo/instances/internal/IpojoInstancesReportExtension.java rename to modules/services/jonas-report/extensions/ipojo-instances/src/main/java/org/ow2/jonas/report/extensions/ipojo/instances/internal/IpojoInstancesReportExtension.java diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/META-INF/jonas-report-extension-ipojo-instances.bnd b/modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/META-INF/jonas-report-extension-ipojo-instances.bnd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/META-INF/jonas-report-extension-ipojo-instances.bnd rename to modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/META-INF/jonas-report-extension-ipojo-instances.bnd diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/metadata.xml b/modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/metadata.xml rename to modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/xsd/ipojo-instances-report.xsd b/modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/xsd/ipojo-instances-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/xsd/ipojo-instances-report.xsd rename to modules/services/jonas-report/extensions/ipojo-instances/src/main/resources/xsd/ipojo-instances-report.xsd diff --git a/jonas/modules/services/jonas-report/extensions/jvm/pom.xml b/modules/services/jonas-report/extensions/jvm/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/jvm/pom.xml rename to modules/services/jonas-report/extensions/jvm/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/jvm/src/main/java/org/ow2/jonas/report/extensions/jvm/internal/JvmReportExtension.java b/modules/services/jonas-report/extensions/jvm/src/main/java/org/ow2/jonas/report/extensions/jvm/internal/JvmReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/extensions/jvm/src/main/java/org/ow2/jonas/report/extensions/jvm/internal/JvmReportExtension.java rename to modules/services/jonas-report/extensions/jvm/src/main/java/org/ow2/jonas/report/extensions/jvm/internal/JvmReportExtension.java diff --git a/jonas/modules/services/jonas-report/extensions/jvm/src/main/resources/META-INF/jonas-report-extension-jvm.bnd b/modules/services/jonas-report/extensions/jvm/src/main/resources/META-INF/jonas-report-extension-jvm.bnd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/jvm/src/main/resources/META-INF/jonas-report-extension-jvm.bnd rename to modules/services/jonas-report/extensions/jvm/src/main/resources/META-INF/jonas-report-extension-jvm.bnd diff --git a/jonas/modules/services/jonas-report/extensions/jvm/src/main/resources/metadata.xml b/modules/services/jonas-report/extensions/jvm/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/jvm/src/main/resources/metadata.xml rename to modules/services/jonas-report/extensions/jvm/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/extensions/jvm/src/main/resources/xsd/jvm-report.xsd b/modules/services/jonas-report/extensions/jvm/src/main/resources/xsd/jvm-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/jvm/src/main/resources/xsd/jvm-report.xsd rename to modules/services/jonas-report/extensions/jvm/src/main/resources/xsd/jvm-report.xsd diff --git a/jonas/modules/services/jonas-report/extensions/pom.xml b/modules/services/jonas-report/extensions/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/pom.xml rename to modules/services/jonas-report/extensions/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/server-info/pom.xml b/modules/services/jonas-report/extensions/server-info/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/server-info/pom.xml rename to modules/services/jonas-report/extensions/server-info/pom.xml diff --git a/jonas/modules/services/jonas-report/extensions/server-info/src/main/java/org/ow2/jonas/report/extensions/server/info/internal/ServerInfoReportExtension.java b/modules/services/jonas-report/extensions/server-info/src/main/java/org/ow2/jonas/report/extensions/server/info/internal/ServerInfoReportExtension.java similarity index 100% rename from jonas/modules/services/jonas-report/extensions/server-info/src/main/java/org/ow2/jonas/report/extensions/server/info/internal/ServerInfoReportExtension.java rename to modules/services/jonas-report/extensions/server-info/src/main/java/org/ow2/jonas/report/extensions/server/info/internal/ServerInfoReportExtension.java diff --git a/jonas/modules/services/jonas-report/extensions/server-info/src/main/resources/META-INF/jonas-report-extension-server-info.bnd b/modules/services/jonas-report/extensions/server-info/src/main/resources/META-INF/jonas-report-extension-server-info.bnd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/server-info/src/main/resources/META-INF/jonas-report-extension-server-info.bnd rename to modules/services/jonas-report/extensions/server-info/src/main/resources/META-INF/jonas-report-extension-server-info.bnd diff --git a/jonas/modules/services/jonas-report/extensions/server-info/src/main/resources/metadata.xml b/modules/services/jonas-report/extensions/server-info/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-report/extensions/server-info/src/main/resources/metadata.xml rename to modules/services/jonas-report/extensions/server-info/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-report/extensions/server-info/src/main/resources/xsd/server-report.xsd b/modules/services/jonas-report/extensions/server-info/src/main/resources/xsd/server-report.xsd similarity index 100% rename from jonas/modules/services/jonas-report/extensions/server-info/src/main/resources/xsd/server-report.xsd rename to modules/services/jonas-report/extensions/server-info/src/main/resources/xsd/server-report.xsd diff --git a/jonas/modules/services/jonas-report/pom.xml b/modules/services/jonas-report/pom.xml similarity index 100% rename from jonas/modules/services/jonas-report/pom.xml rename to modules/services/jonas-report/pom.xml diff --git a/jonas/modules/services/jonas-resource-monitor/core/pom.xml b/modules/services/jonas-resource-monitor/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-resource-monitor/core/pom.xml rename to modules/services/jonas-resource-monitor/core/pom.xml diff --git a/jonas/modules/services/jonas-resource-monitor/core/src/main/java/org/ow2/jonas/resourcemonitor/internal/JOnASResourceMonitorService.java b/modules/services/jonas-resource-monitor/core/src/main/java/org/ow2/jonas/resourcemonitor/internal/JOnASResourceMonitorService.java similarity index 100% rename from jonas/modules/services/jonas-resource-monitor/core/src/main/java/org/ow2/jonas/resourcemonitor/internal/JOnASResourceMonitorService.java rename to modules/services/jonas-resource-monitor/core/src/main/java/org/ow2/jonas/resourcemonitor/internal/JOnASResourceMonitorService.java diff --git a/jonas/modules/services/jonas-resource-monitor/core/src/main/java/org/ow2/jonas/resourcemonitor/internal/JOnASResourceMonitorServiceMBean.java b/modules/services/jonas-resource-monitor/core/src/main/java/org/ow2/jonas/resourcemonitor/internal/JOnASResourceMonitorServiceMBean.java similarity index 100% rename from jonas/modules/services/jonas-resource-monitor/core/src/main/java/org/ow2/jonas/resourcemonitor/internal/JOnASResourceMonitorServiceMBean.java rename to modules/services/jonas-resource-monitor/core/src/main/java/org/ow2/jonas/resourcemonitor/internal/JOnASResourceMonitorServiceMBean.java diff --git a/jonas/modules/services/jonas-resource-monitor/core/src/main/resources/META-INF/jonas-resource-monitor-core.bnd b/modules/services/jonas-resource-monitor/core/src/main/resources/META-INF/jonas-resource-monitor-core.bnd similarity index 100% rename from jonas/modules/services/jonas-resource-monitor/core/src/main/resources/META-INF/jonas-resource-monitor-core.bnd rename to modules/services/jonas-resource-monitor/core/src/main/resources/META-INF/jonas-resource-monitor-core.bnd diff --git a/jonas/modules/services/jonas-resource-monitor/core/src/main/resources/metadata.xml b/modules/services/jonas-resource-monitor/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-resource-monitor/core/src/main/resources/metadata.xml rename to modules/services/jonas-resource-monitor/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-resource-monitor/core/src/main/templates/jonas-resourcemonitor.properties.template b/modules/services/jonas-resource-monitor/core/src/main/templates/jonas-resourcemonitor.properties.template similarity index 100% rename from jonas/modules/services/jonas-resource-monitor/core/src/main/templates/jonas-resourcemonitor.properties.template rename to modules/services/jonas-resource-monitor/core/src/main/templates/jonas-resourcemonitor.properties.template diff --git a/jonas/modules/services/jonas-resource-monitor/pom.xml b/modules/services/jonas-resource-monitor/pom.xml similarity index 100% rename from jonas/modules/services/jonas-resource-monitor/pom.xml rename to modules/services/jonas-resource-monitor/pom.xml diff --git a/jonas/modules/services/jonas-resource/addon/pom.xml b/modules/services/jonas-resource/addon/pom.xml similarity index 100% rename from jonas/modules/services/jonas-resource/addon/pom.xml rename to modules/services/jonas-resource/addon/pom.xml diff --git a/jonas/modules/services/jonas-resource/addon/src/main/assembly/assembly.xml b/modules/services/jonas-resource/addon/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/jonas-resource/addon/src/main/assembly/assembly.xml rename to modules/services/jonas-resource/addon/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/jonas-resource/addon/src/main/resources/META-INF/jonas-addon.xml b/modules/services/jonas-resource/addon/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/jonas-resource/addon/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/jonas-resource/addon/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/jonas-resource/ant/pom.xml b/modules/services/jonas-resource/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-resource/ant/pom.xml rename to modules/services/jonas-resource/ant/pom.xml diff --git a/jonas/modules/services/jonas-resource/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/resource/JdbcRa.java b/modules/services/jonas-resource/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/resource/JdbcRa.java similarity index 100% rename from jonas/modules/services/jonas-resource/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/resource/JdbcRa.java rename to modules/services/jonas-resource/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/resource/JdbcRa.java diff --git a/jonas/modules/services/jonas-resource/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/resource/JdbcXml.java b/modules/services/jonas-resource/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/resource/JdbcXml.java similarity index 100% rename from jonas/modules/services/jonas-resource/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/resource/JdbcXml.java rename to modules/services/jonas-resource/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/resource/JdbcXml.java diff --git a/jonas/modules/services/jonas-resource/ant/src/main/resources/META-INF/jonas-resource-ant.bnd b/modules/services/jonas-resource/ant/src/main/resources/META-INF/jonas-resource-ant.bnd similarity index 100% rename from jonas/modules/services/jonas-resource/ant/src/main/resources/META-INF/jonas-resource-ant.bnd rename to modules/services/jonas-resource/ant/src/main/resources/META-INF/jonas-resource-ant.bnd diff --git a/jonas/modules/services/jonas-resource/ant/src/main/resources/antlib-jonas-resource.xml b/modules/services/jonas-resource/ant/src/main/resources/antlib-jonas-resource.xml similarity index 100% rename from jonas/modules/services/jonas-resource/ant/src/main/resources/antlib-jonas-resource.xml rename to modules/services/jonas-resource/ant/src/main/resources/antlib-jonas-resource.xml diff --git a/jonas/modules/services/jonas-resource/ant/src/main/resources/build-jonas-resource.properties.template b/modules/services/jonas-resource/ant/src/main/resources/build-jonas-resource.properties.template similarity index 100% rename from jonas/modules/services/jonas-resource/ant/src/main/resources/build-jonas-resource.properties.template rename to modules/services/jonas-resource/ant/src/main/resources/build-jonas-resource.properties.template diff --git a/jonas/modules/services/jonas-resource/ant/src/main/resources/build-jonas-resource.xml b/modules/services/jonas-resource/ant/src/main/resources/build-jonas-resource.xml similarity index 100% rename from jonas/modules/services/jonas-resource/ant/src/main/resources/build-jonas-resource.xml rename to modules/services/jonas-resource/ant/src/main/resources/build-jonas-resource.xml diff --git a/jonas/modules/services/jonas-resource/core/pom.xml b/modules/services/jonas-resource/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-resource/core/pom.xml rename to modules/services/jonas-resource/core/pom.xml diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/IJDBCConnection.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/IJDBCConnection.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/IJDBCConnection.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/IJDBCConnection.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/JOnASResourceService.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/JOnASResourceService.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/JOnASResourceService.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/JOnASResourceService.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/JOnASResourceServiceMBean.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/JOnASResourceServiceMBean.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/JOnASResourceServiceMBean.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/JOnASResourceServiceMBean.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/RARDeployer.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/RARDeployer.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/RARDeployer.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/RARDeployer.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/Rar.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/Rar.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/Rar.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/Rar.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceBootstrapContext.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceBootstrapContext.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceBootstrapContext.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceBootstrapContext.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceServiceConstants.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceServiceConstants.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceServiceConstants.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceServiceConstants.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceUtility.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceUtility.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceUtility.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/ResourceUtility.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/SQLManager.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/SQLManager.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/SQLManager.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/SQLManager.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionManagerImpl.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionManagerImpl.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionManagerImpl.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionManagerImpl.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionManagerPoolParams.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionManagerPoolParams.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionManagerPoolParams.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionManagerPoolParams.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionResourceHint.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionResourceHint.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionResourceHint.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ConnectionResourceHint.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ManagedConnectionInfo.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ManagedConnectionInfo.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ManagedConnectionInfo.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/ManagedConnectionInfo.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/JResourceManagerEvent.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/JResourceManagerEvent.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/JResourceManagerEvent.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/JResourceManagerEvent.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/JSynchronization.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/JSynchronization.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/JSynchronization.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/JSynchronization.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/LocalXAResource.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/LocalXAResource.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/LocalXAResource.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/jta/LocalXAResource.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/PreparedStatementWrapper.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/PreparedStatementWrapper.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/PreparedStatementWrapper.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/PreparedStatementWrapper.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/SQLConnectionInvocationHandler.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/SQLConnectionInvocationHandler.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/SQLConnectionInvocationHandler.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/SQLConnectionInvocationHandler.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/AbstractPreparedStatementCacheImpl.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/AbstractPreparedStatementCacheImpl.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/AbstractPreparedStatementCacheImpl.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/AbstractPreparedStatementCacheImpl.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/CacheException.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/CacheException.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/CacheException.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/CacheException.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementCache.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementCache.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementCache.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementCache.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementCacheStatistics.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementCacheStatistics.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementCacheStatistics.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementCacheStatistics.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementListCacheImpl.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementListCacheImpl.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementListCacheImpl.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementListCacheImpl.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementMapCacheImpl.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementMapCacheImpl.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementMapCacheImpl.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementMapCacheImpl.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementMapCacheKey.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementMapCacheKey.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementMapCacheKey.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/cm/sql/cache/PreparedStatementMapCacheKey.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ArchiveConfigMBean.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ArchiveConfigMBean.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ArchiveConfigMBean.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ArchiveConfigMBean.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAActivationSpec.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAActivationSpec.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAActivationSpec.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAActivationSpec.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAAdminObject.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAAdminObject.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAAdminObject.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAAdminObject.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAConnectionFactory.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAConnectionFactory.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAConnectionFactory.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAConnectionFactory.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAConnectionFactoryMBean.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAConnectionFactoryMBean.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAConnectionFactoryMBean.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAConnectionFactoryMBean.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAManagedConnectionFactory.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAManagedConnectionFactory.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAManagedConnectionFactory.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAManagedConnectionFactory.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAResource.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAResource.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAResource.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/JCAResource.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/README b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/README similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/README rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/README diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/RarConfigMBean.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/RarConfigMBean.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/RarConfigMBean.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/RarConfigMBean.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ResourceAdapter.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ResourceAdapter.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ResourceAdapter.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ResourceAdapter.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ResourceAdapterModule.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ResourceAdapterModule.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ResourceAdapterModule.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/mbean/ResourceAdapterModule.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/naming/ResourceObjectFactory.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/naming/ResourceObjectFactory.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/naming/ResourceObjectFactory.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/naming/ResourceObjectFactory.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/Pool.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/Pool.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/Pool.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/Pool.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolItemStats.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolItemStats.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolItemStats.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolItemStats.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolMatchFactory.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolMatchFactory.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolMatchFactory.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolMatchFactory.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolProvider.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolProvider.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolProvider.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolProvider.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolResource.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolResource.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolResource.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/PoolResource.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/lib/HArrayPool.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/lib/HArrayPool.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/lib/HArrayPool.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/lib/HArrayPool.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/lib/HArrayPoolMonitor.java b/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/lib/HArrayPoolMonitor.java similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/lib/HArrayPoolMonitor.java rename to modules/services/jonas-resource/core/src/main/java/org/ow2/jonas/resource/internal/pool/lib/HArrayPoolMonitor.java diff --git a/jonas/modules/services/jonas-resource/core/src/main/jonas-resources/bin/RAConfig b/modules/services/jonas-resource/core/src/main/jonas-resources/bin/RAConfig similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/jonas-resources/bin/RAConfig rename to modules/services/jonas-resource/core/src/main/jonas-resources/bin/RAConfig diff --git a/jonas/modules/services/jonas-resource/core/src/main/jonas-resources/bin/RAConfig.bat b/modules/services/jonas-resource/core/src/main/jonas-resources/bin/RAConfig.bat similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/jonas-resources/bin/RAConfig.bat rename to modules/services/jonas-resource/core/src/main/jonas-resources/bin/RAConfig.bat diff --git a/jonas/modules/services/jonas-resource/core/src/main/jonas-resources/deploy/jdbc-ds.xml b/modules/services/jonas-resource/core/src/main/jonas-resources/deploy/jdbc-ds.xml similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/jonas-resources/deploy/jdbc-ds.xml rename to modules/services/jonas-resource/core/src/main/jonas-resources/deploy/jdbc-ds.xml diff --git a/jonas/modules/services/jonas-resource/core/src/main/resources/META-INF/jonas-resource-core.bnd b/modules/services/jonas-resource/core/src/main/resources/META-INF/jonas-resource-core.bnd similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/resources/META-INF/jonas-resource-core.bnd rename to modules/services/jonas-resource/core/src/main/resources/META-INF/jonas-resource-core.bnd diff --git a/jonas/modules/services/jonas-resource/core/src/main/resources/metadata.xml b/modules/services/jonas-resource/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/resources/metadata.xml rename to modules/services/jonas-resource/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-resource/core/src/main/resources/org/ow2/jonas/resource/internal/mbeans-descriptors.xml b/modules/services/jonas-resource/core/src/main/resources/org/ow2/jonas/resource/internal/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/resources/org/ow2/jonas/resource/internal/mbeans-descriptors.xml rename to modules/services/jonas-resource/core/src/main/resources/org/ow2/jonas/resource/internal/mbeans-descriptors.xml diff --git a/jonas/modules/services/jonas-resource/core/src/main/templates/jonas-j2ca-resource.properties.template b/modules/services/jonas-resource/core/src/main/templates/jonas-j2ca-resource.properties.template similarity index 100% rename from jonas/modules/services/jonas-resource/core/src/main/templates/jonas-j2ca-resource.properties.template rename to modules/services/jonas-resource/core/src/main/templates/jonas-j2ca-resource.properties.template diff --git a/jonas/modules/services/jonas-resource/pom.xml b/modules/services/jonas-resource/pom.xml similarity index 100% rename from jonas/modules/services/jonas-resource/pom.xml rename to modules/services/jonas-resource/pom.xml diff --git a/jonas/modules/services/jonas-security/ant/pom.xml b/modules/services/jonas-security/ant/pom.xml similarity index 100% rename from jonas/modules/services/jonas-security/ant/pom.xml rename to modules/services/jonas-security/ant/pom.xml diff --git a/jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/EmptyEntityResolver.java b/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/EmptyEntityResolver.java similarity index 100% rename from jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/EmptyEntityResolver.java rename to modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/EmptyEntityResolver.java diff --git a/jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/JResourceLoginModule.java b/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/JResourceLoginModule.java similarity index 100% rename from jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/JResourceLoginModule.java rename to modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/JResourceLoginModule.java diff --git a/jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/Jaas.java b/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/Jaas.java similarity index 100% rename from jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/Jaas.java rename to modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/Jaas.java diff --git a/jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/JaasEntry.java b/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/JaasEntry.java similarity index 100% rename from jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/JaasEntry.java rename to modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/JaasEntry.java diff --git a/jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/LoginModule.java b/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/LoginModule.java similarity index 100% rename from jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/LoginModule.java rename to modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/LoginModule.java diff --git a/jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/User.java b/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/User.java similarity index 100% rename from jonas/modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/User.java rename to modules/services/jonas-security/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/security/User.java diff --git a/jonas/modules/services/jonas-security/ant/src/main/resources/antlib-security.xml b/modules/services/jonas-security/ant/src/main/resources/antlib-security.xml similarity index 100% rename from jonas/modules/services/jonas-security/ant/src/main/resources/antlib-security.xml rename to modules/services/jonas-security/ant/src/main/resources/antlib-security.xml diff --git a/jonas/modules/services/jonas-security/ant/src/main/resources/build-security.xml b/modules/services/jonas-security/ant/src/main/resources/build-security.xml similarity index 100% rename from jonas/modules/services/jonas-security/ant/src/main/resources/build-security.xml rename to modules/services/jonas-security/ant/src/main/resources/build-security.xml diff --git a/jonas/modules/services/jonas-security/core/pom.xml b/modules/services/jonas-security/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-security/core/pom.xml rename to modules/services/jonas-security/core/pom.xml diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/CertificateCallback.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/CertificateCallback.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/CertificateCallback.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/CertificateCallback.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/DialogCallbackHandler.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/DialogCallbackHandler.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/DialogCallbackHandler.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/DialogCallbackHandler.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/LoginCallbackHandler.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/LoginCallbackHandler.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/LoginCallbackHandler.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/LoginCallbackHandler.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/NoInputCallbackHandler.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/NoInputCallbackHandler.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/NoInputCallbackHandler.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/callback/NoInputCallbackHandler.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/CRLLoginModule.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/CRLLoginModule.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/CRLLoginModule.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/CRLLoginModule.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/ClientLoginModule.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/ClientLoginModule.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/ClientLoginModule.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/ClientLoginModule.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/JDirectResourceLoginModule.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/JDirectResourceLoginModule.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/JDirectResourceLoginModule.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/JDirectResourceLoginModule.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/JResourceLoginModule.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/JResourceLoginModule.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/JResourceLoginModule.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/JResourceLoginModule.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/RemoteLoginModule.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/RemoteLoginModule.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/RemoteLoginModule.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/RemoteLoginModule.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/RoleBasedAuthorizationModule.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/RoleBasedAuthorizationModule.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/RoleBasedAuthorizationModule.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/RoleBasedAuthorizationModule.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/SignLoginModule.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/SignLoginModule.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/SignLoginModule.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/auth/spi/SignLoginModule.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/AbsSecurityContextHelper.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/AbsSecurityContextHelper.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/AbsSecurityContextHelper.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/AbsSecurityContextHelper.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JResources.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JResources.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JResources.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JResources.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JonasSecurityServiceImpl.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JonasSecurityServiceImpl.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JonasSecurityServiceImpl.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JonasSecurityServiceImpl.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JonasSecurityServiceImplMBean.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JonasSecurityServiceImplMBean.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JonasSecurityServiceImplMBean.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/JonasSecurityServiceImplMBean.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/PolicyProvider.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/PolicyProvider.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/PolicyProvider.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/PolicyProvider.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/SecurityServiceException.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/SecurityServiceException.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/SecurityServiceException.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/SecurityServiceException.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/AbstractJResource.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/AbstractJResource.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/AbstractJResource.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/AbstractJResource.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceDS.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceDS.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceDS.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceDS.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceDSMBean.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceDSMBean.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceDSMBean.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceDSMBean.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceLDAP.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceLDAP.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceLDAP.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceLDAP.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceLDAPMBean.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceLDAPMBean.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceLDAPMBean.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceLDAPMBean.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMBean.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMBean.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMBean.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMBean.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMemory.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMemory.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMemory.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMemory.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMemoryMBean.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMemoryMBean.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMemoryMBean.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceMemoryMBean.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceRemote.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceRemote.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceRemote.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceRemote.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceRemoteImpl.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceRemoteImpl.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceRemoteImpl.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/factory/JResourceRemoteImpl.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/lib/HashHelper.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/lib/HashHelper.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/lib/HashHelper.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/lib/HashHelper.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/lib/XML.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/lib/XML.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/lib/XML.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/lib/XML.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/Group.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/Group.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/Group.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/Group.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/GroupMBean.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/GroupMBean.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/GroupMBean.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/GroupMBean.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/LDAPUser.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/LDAPUser.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/LDAPUser.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/LDAPUser.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/Role.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/Role.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/Role.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/Role.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/RoleMBean.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/RoleMBean.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/RoleMBean.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/RoleMBean.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/User.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/User.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/User.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/User.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/UserMBean.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/UserMBean.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/UserMBean.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/internal/realm/principal/UserMBean.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/lib/JErrorHandler.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/lib/JErrorHandler.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/lib/JErrorHandler.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/lib/JErrorHandler.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/lib/JResourceManager.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/lib/JResourceManager.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/lib/JResourceManager.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/lib/JResourceManager.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JDSRuleSet.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JDSRuleSet.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JDSRuleSet.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JDSRuleSet.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JLDAPRuleSet.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JLDAPRuleSet.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JLDAPRuleSet.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JLDAPRuleSet.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JMemoryRuleSet.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JMemoryRuleSet.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JMemoryRuleSet.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/rules/JMemoryRuleSet.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/SecurityContextHelper.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/SecurityContextHelper.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/SecurityContextHelper.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/SecurityContextHelper.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/initializer/SecurityContextInitializer.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/initializer/SecurityContextInitializer.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/initializer/SecurityContextInitializer.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/initializer/SecurityContextInitializer.java diff --git a/jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/initializer/SecurityContextInitializerException.java b/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/initializer/SecurityContextInitializerException.java similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/initializer/SecurityContextInitializerException.java rename to modules/services/jonas-security/core/src/main/java/org/ow2/jonas/security/ws/initializer/SecurityContextInitializerException.java diff --git a/jonas/modules/services/jonas-security/core/src/main/jonas-resources/conf/jaas.config b/modules/services/jonas-security/core/src/main/jonas-resources/conf/jaas.config similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/jonas-resources/conf/jaas.config rename to modules/services/jonas-security/core/src/main/jonas-resources/conf/jaas.config diff --git a/jonas/modules/services/jonas-security/core/src/main/jonas-resources/conf/java.policy b/modules/services/jonas-security/core/src/main/jonas-resources/conf/java.policy similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/jonas-resources/conf/java.policy rename to modules/services/jonas-security/core/src/main/jonas-resources/conf/java.policy diff --git a/jonas/modules/services/jonas-security/core/src/main/jonas-resources/conf/jonas-realm.xml b/modules/services/jonas-security/core/src/main/jonas-resources/conf/jonas-realm.xml similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/jonas-resources/conf/jonas-realm.xml rename to modules/services/jonas-security/core/src/main/jonas-resources/conf/jonas-realm.xml diff --git a/jonas/modules/services/jonas-security/core/src/main/resources/META-INF/jonas-security-core.bnd b/modules/services/jonas-security/core/src/main/resources/META-INF/jonas-security-core.bnd similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/resources/META-INF/jonas-security-core.bnd rename to modules/services/jonas-security/core/src/main/resources/META-INF/jonas-security-core.bnd diff --git a/jonas/modules/services/jonas-security/core/src/main/resources/metadata.xml b/modules/services/jonas-security/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/resources/metadata.xml rename to modules/services/jonas-security/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-security/core/src/main/resources/org/ow2/jonas/security/internal/realm/factory/mbeans-descriptors.xml b/modules/services/jonas-security/core/src/main/resources/org/ow2/jonas/security/internal/realm/factory/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/resources/org/ow2/jonas/security/internal/realm/factory/mbeans-descriptors.xml rename to modules/services/jonas-security/core/src/main/resources/org/ow2/jonas/security/internal/realm/factory/mbeans-descriptors.xml diff --git a/jonas/modules/services/jonas-security/core/src/main/resources/org/ow2/jonas/security/realm/dtd/jonas-realm_1_0.dtd b/modules/services/jonas-security/core/src/main/resources/org/ow2/jonas/security/realm/dtd/jonas-realm_1_0.dtd similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/resources/org/ow2/jonas/security/realm/dtd/jonas-realm_1_0.dtd rename to modules/services/jonas-security/core/src/main/resources/org/ow2/jonas/security/realm/dtd/jonas-realm_1_0.dtd diff --git a/jonas/modules/services/jonas-security/core/src/main/templates/jonas-security.properties.template b/modules/services/jonas-security/core/src/main/templates/jonas-security.properties.template similarity index 100% rename from jonas/modules/services/jonas-security/core/src/main/templates/jonas-security.properties.template rename to modules/services/jonas-security/core/src/main/templates/jonas-security.properties.template diff --git a/jonas/modules/services/jonas-security/pom.xml b/modules/services/jonas-security/pom.xml similarity index 100% rename from jonas/modules/services/jonas-security/pom.xml rename to modules/services/jonas-security/pom.xml diff --git a/jonas/modules/services/jonas-tm-jotm/addon/pom.xml b/modules/services/jonas-tm-jotm/addon/pom.xml similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/addon/pom.xml rename to modules/services/jonas-tm-jotm/addon/pom.xml diff --git a/jonas/modules/services/jonas-tm-jotm/addon/src/main/assembly/assembly.xml b/modules/services/jonas-tm-jotm/addon/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/addon/src/main/assembly/assembly.xml rename to modules/services/jonas-tm-jotm/addon/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/jonas-tm-jotm/addon/src/main/resources/META-INF/jonas-addon.xml b/modules/services/jonas-tm-jotm/addon/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/addon/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/jonas-tm-jotm/addon/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/jonas-tm-jotm/core/pom.xml b/modules/services/jonas-tm-jotm/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/pom.xml rename to modules/services/jonas-tm-jotm/core/pom.xml diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionManager.java b/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionManager.java similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionManager.java rename to modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionManager.java diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionResourceManager.java b/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionResourceManager.java similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionResourceManager.java rename to modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionResourceManager.java diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionService.java b/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionService.java similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionService.java rename to modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/JOTMTransactionService.java diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/UserTransactionFactory.java b/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/UserTransactionFactory.java similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/UserTransactionFactory.java rename to modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/UserTransactionFactory.java diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/ServerTransactionCCFDelegate.java b/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/ServerTransactionCCFDelegate.java similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/ServerTransactionCCFDelegate.java rename to modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/ServerTransactionCCFDelegate.java diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/TransactionCCFDelegate.java b/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/TransactionCCFDelegate.java similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/TransactionCCFDelegate.java rename to modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/TransactionCCFDelegate.java diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/UserTransactionCCFDelegate.java b/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/UserTransactionCCFDelegate.java similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/UserTransactionCCFDelegate.java rename to modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/delegate/UserTransactionCCFDelegate.java diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/mbean/JTAResource.java b/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/mbean/JTAResource.java similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/mbean/JTAResource.java rename to modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/mbean/JTAResource.java diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/mbean/JTAResourceMBean.java b/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/mbean/JTAResourceMBean.java similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/mbean/JTAResourceMBean.java rename to modules/services/jonas-tm-jotm/core/src/main/java/org/ow2/jonas/tm/jotm/mbean/JTAResourceMBean.java diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/jonas-resources/conf/jotm.properties b/modules/services/jonas-tm-jotm/core/src/main/jonas-resources/conf/jotm.properties similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/jonas-resources/conf/jotm.properties rename to modules/services/jonas-tm-jotm/core/src/main/jonas-resources/conf/jotm.properties diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/resources/META-INF/jonas-tm-jotm-core.bnd b/modules/services/jonas-tm-jotm/core/src/main/resources/META-INF/jonas-tm-jotm-core.bnd similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/resources/META-INF/jonas-tm-jotm-core.bnd rename to modules/services/jonas-tm-jotm/core/src/main/resources/META-INF/jonas-tm-jotm-core.bnd diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/resources/metadata.xml b/modules/services/jonas-tm-jotm/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/resources/metadata.xml rename to modules/services/jonas-tm-jotm/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/resources/org/ow2/jonas/tm/jotm/mbeans-descriptors.xml b/modules/services/jonas-tm-jotm/core/src/main/resources/org/ow2/jonas/tm/jotm/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/resources/org/ow2/jonas/tm/jotm/mbeans-descriptors.xml rename to modules/services/jonas-tm-jotm/core/src/main/resources/org/ow2/jonas/tm/jotm/mbeans-descriptors.xml diff --git a/jonas/modules/services/jonas-tm-jotm/core/src/main/templates/jonas-jtm.properties.template b/modules/services/jonas-tm-jotm/core/src/main/templates/jonas-jtm.properties.template similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/core/src/main/templates/jonas-jtm.properties.template rename to modules/services/jonas-tm-jotm/core/src/main/templates/jonas-jtm.properties.template diff --git a/jonas/modules/services/jonas-tm-jotm/pom.xml b/modules/services/jonas-tm-jotm/pom.xml similarity index 100% rename from jonas/modules/services/jonas-tm-jotm/pom.xml rename to modules/services/jonas-tm-jotm/pom.xml diff --git a/jonas/modules/services/jonas-workcleaner/core/pom.xml b/modules/services/jonas-workcleaner/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-workcleaner/core/pom.xml rename to modules/services/jonas-workcleaner/core/pom.xml diff --git a/jonas/modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/JOnASWorkCleanerService.java b/modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/JOnASWorkCleanerService.java similarity index 100% rename from jonas/modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/JOnASWorkCleanerService.java rename to modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/JOnASWorkCleanerService.java diff --git a/jonas/modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/JOnASWorkCleanerServiceMBean.java b/modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/JOnASWorkCleanerServiceMBean.java similarity index 100% rename from jonas/modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/JOnASWorkCleanerServiceMBean.java rename to modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/JOnASWorkCleanerServiceMBean.java diff --git a/jonas/modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/WorkCleanerTimer.java b/modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/WorkCleanerTimer.java similarity index 100% rename from jonas/modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/WorkCleanerTimer.java rename to modules/services/jonas-workcleaner/core/src/main/java/org/ow2/jonas/workcleaner/internal/WorkCleanerTimer.java diff --git a/jonas/modules/services/jonas-workcleaner/core/src/main/resources/META-INF/jonas-workcleaner-core.bnd b/modules/services/jonas-workcleaner/core/src/main/resources/META-INF/jonas-workcleaner-core.bnd similarity index 100% rename from jonas/modules/services/jonas-workcleaner/core/src/main/resources/META-INF/jonas-workcleaner-core.bnd rename to modules/services/jonas-workcleaner/core/src/main/resources/META-INF/jonas-workcleaner-core.bnd diff --git a/jonas/modules/services/jonas-workcleaner/core/src/main/resources/metadata.xml b/modules/services/jonas-workcleaner/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-workcleaner/core/src/main/resources/metadata.xml rename to modules/services/jonas-workcleaner/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-workcleaner/core/src/main/templates/jonas-workcleaner.properties.template b/modules/services/jonas-workcleaner/core/src/main/templates/jonas-workcleaner.properties.template similarity index 100% rename from jonas/modules/services/jonas-workcleaner/core/src/main/templates/jonas-workcleaner.properties.template rename to modules/services/jonas-workcleaner/core/src/main/templates/jonas-workcleaner.properties.template diff --git a/jonas/modules/services/jonas-workcleaner/pom.xml b/modules/services/jonas-workcleaner/pom.xml similarity index 100% rename from jonas/modules/services/jonas-workcleaner/pom.xml rename to modules/services/jonas-workcleaner/pom.xml diff --git a/jonas/modules/services/jonas-workmanager/core/pom.xml b/modules/services/jonas-workmanager/core/pom.xml similarity index 100% rename from jonas/modules/services/jonas-workmanager/core/pom.xml rename to modules/services/jonas-workmanager/core/pom.xml diff --git a/jonas/modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JOnASWorkManagerService.java b/modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JOnASWorkManagerService.java similarity index 100% rename from jonas/modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JOnASWorkManagerService.java rename to modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JOnASWorkManagerService.java diff --git a/jonas/modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JWorkManager.java b/modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JWorkManager.java similarity index 100% rename from jonas/modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JWorkManager.java rename to modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JWorkManager.java diff --git a/jonas/modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JWorkManagerMBean.java b/modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JWorkManagerMBean.java similarity index 100% rename from jonas/modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JWorkManagerMBean.java rename to modules/services/jonas-workmanager/core/src/main/java/org/ow2/jonas/workmanager/internal/JWorkManagerMBean.java diff --git a/jonas/modules/services/jonas-workmanager/core/src/main/resources/META-INF/jonas-workmanager-core.bnd b/modules/services/jonas-workmanager/core/src/main/resources/META-INF/jonas-workmanager-core.bnd similarity index 100% rename from jonas/modules/services/jonas-workmanager/core/src/main/resources/META-INF/jonas-workmanager-core.bnd rename to modules/services/jonas-workmanager/core/src/main/resources/META-INF/jonas-workmanager-core.bnd diff --git a/jonas/modules/services/jonas-workmanager/core/src/main/resources/metadata.xml b/modules/services/jonas-workmanager/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jonas-workmanager/core/src/main/resources/metadata.xml rename to modules/services/jonas-workmanager/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jonas-workmanager/core/src/main/templates/jonas-workmanager.properties.template b/modules/services/jonas-workmanager/core/src/main/templates/jonas-workmanager.properties.template similarity index 100% rename from jonas/modules/services/jonas-workmanager/core/src/main/templates/jonas-workmanager.properties.template rename to modules/services/jonas-workmanager/core/src/main/templates/jonas-workmanager.properties.template diff --git a/jonas/modules/services/jonas-workmanager/pom.xml b/modules/services/jonas-workmanager/pom.xml similarity index 100% rename from jonas/modules/services/jonas-workmanager/pom.xml rename to modules/services/jonas-workmanager/pom.xml diff --git a/jonas/modules/services/joram-admin/pom.xml b/modules/services/joram-admin/pom.xml similarity index 100% rename from jonas/modules/services/joram-admin/pom.xml rename to modules/services/joram-admin/pom.xml diff --git a/jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramQueue.java b/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramQueue.java similarity index 100% rename from jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramQueue.java rename to modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramQueue.java diff --git a/jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramQueueConnectionFactory.java b/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramQueueConnectionFactory.java similarity index 100% rename from jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramQueueConnectionFactory.java rename to modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramQueueConnectionFactory.java diff --git a/jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramTopic.java b/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramTopic.java similarity index 100% rename from jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramTopic.java rename to modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramTopic.java diff --git a/jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramTopicConnectionFactory.java b/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramTopicConnectionFactory.java similarity index 100% rename from jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramTopicConnectionFactory.java rename to modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramTopicConnectionFactory.java diff --git a/jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramUser.java b/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramUser.java similarity index 100% rename from jonas/modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramUser.java rename to modules/services/joram-admin/src/main/java/org/ow2/jonas/joram/admin/JoramUser.java diff --git a/jonas/modules/services/jsf/jsf-base/ant/pom.xml b/modules/services/jsf/jsf-base/ant/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-base/ant/pom.xml rename to modules/services/jsf/jsf-base/ant/pom.xml diff --git a/jonas/modules/services/jsf/jsf-base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/Jsf.java b/modules/services/jsf/jsf-base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/Jsf.java similarity index 100% rename from jonas/modules/services/jsf/jsf-base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/Jsf.java rename to modules/services/jsf/jsf-base/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/Jsf.java diff --git a/jonas/modules/services/jsf/jsf-base/ant/src/main/resources/build-jsf-base.properties.template b/modules/services/jsf/jsf-base/ant/src/main/resources/build-jsf-base.properties.template similarity index 100% rename from jonas/modules/services/jsf/jsf-base/ant/src/main/resources/build-jsf-base.properties.template rename to modules/services/jsf/jsf-base/ant/src/main/resources/build-jsf-base.properties.template diff --git a/jonas/modules/services/jsf/jsf-base/ant/src/main/resources/build-jsf-base.xml b/modules/services/jsf/jsf-base/ant/src/main/resources/build-jsf-base.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-base/ant/src/main/resources/build-jsf-base.xml rename to modules/services/jsf/jsf-base/ant/src/main/resources/build-jsf-base.xml diff --git a/jonas/modules/services/jsf/jsf-base/core/pom.xml b/modules/services/jsf/jsf-base/core/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-base/core/pom.xml rename to modules/services/jsf/jsf-base/core/pom.xml diff --git a/jonas/modules/services/jsf/jsf-base/core/src/main/templates/jonas-jsf.properties.template b/modules/services/jsf/jsf-base/core/src/main/templates/jonas-jsf.properties.template similarity index 100% rename from jonas/modules/services/jsf/jsf-base/core/src/main/templates/jonas-jsf.properties.template rename to modules/services/jsf/jsf-base/core/src/main/templates/jonas-jsf.properties.template diff --git a/jonas/modules/services/jsf/jsf-base/pom.xml b/modules/services/jsf/jsf-base/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-base/pom.xml rename to modules/services/jsf/jsf-base/pom.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/ant/pom.xml b/modules/services/jsf/jsf-mojarra-1.2/ant/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/ant/pom.xml rename to modules/services/jsf/jsf-mojarra-1.2/ant/pom.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/mojarra12/JsfMojarra12.java b/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/mojarra12/JsfMojarra12.java similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/mojarra12/JsfMojarra12.java rename to modules/services/jsf/jsf-mojarra-1.2/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/mojarra12/JsfMojarra12.java diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/antlib-jsf-mojarra-1.2.xml b/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/antlib-jsf-mojarra-1.2.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/antlib-jsf-mojarra-1.2.xml rename to modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/antlib-jsf-mojarra-1.2.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/build-jsf-mojarra-1.2.properties b/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/build-jsf-mojarra-1.2.properties similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/build-jsf-mojarra-1.2.properties rename to modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/build-jsf-mojarra-1.2.properties diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/build-jsf-mojarra-1.2.xml b/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/build-jsf-mojarra-1.2.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/build-jsf-mojarra-1.2.xml rename to modules/services/jsf/jsf-mojarra-1.2/ant/src/main/resources/build-jsf-mojarra-1.2.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/core/pom.xml b/modules/services/jsf/jsf-mojarra-1.2/core/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/core/pom.xml rename to modules/services/jsf/jsf-mojarra-1.2/core/pom.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/core/src/main/java/org/ow2/jonas/jsf/mojarra12/Mojarra12ServiceImpl.java b/modules/services/jsf/jsf-mojarra-1.2/core/src/main/java/org/ow2/jonas/jsf/mojarra12/Mojarra12ServiceImpl.java similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/core/src/main/java/org/ow2/jonas/jsf/mojarra12/Mojarra12ServiceImpl.java rename to modules/services/jsf/jsf-mojarra-1.2/core/src/main/java/org/ow2/jonas/jsf/mojarra12/Mojarra12ServiceImpl.java diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/core/src/main/properties/jonas-jsf-mojarra12.properties b/modules/services/jsf/jsf-mojarra-1.2/core/src/main/properties/jonas-jsf-mojarra12.properties similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/core/src/main/properties/jonas-jsf-mojarra12.properties rename to modules/services/jsf/jsf-mojarra-1.2/core/src/main/properties/jonas-jsf-mojarra12.properties diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/core/src/main/resources/META-INF/jonas-jsf-mojarra-1.2-core.bnd b/modules/services/jsf/jsf-mojarra-1.2/core/src/main/resources/META-INF/jonas-jsf-mojarra-1.2-core.bnd similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/core/src/main/resources/META-INF/jonas-jsf-mojarra-1.2-core.bnd rename to modules/services/jsf/jsf-mojarra-1.2/core/src/main/resources/META-INF/jonas-jsf-mojarra-1.2-core.bnd diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/core/src/main/resources/metadata.xml b/modules/services/jsf/jsf-mojarra-1.2/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/core/src/main/resources/metadata.xml rename to modules/services/jsf/jsf-mojarra-1.2/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-1.2/pom.xml b/modules/services/jsf/jsf-mojarra-1.2/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-1.2/pom.xml rename to modules/services/jsf/jsf-mojarra-1.2/pom.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/ant/pom.xml b/modules/services/jsf/jsf-mojarra-2.0/ant/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/ant/pom.xml rename to modules/services/jsf/jsf-mojarra-2.0/ant/pom.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/mojarra20/JsfMojarra20.java b/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/mojarra20/JsfMojarra20.java similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/mojarra20/JsfMojarra20.java rename to modules/services/jsf/jsf-mojarra-2.0/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/mojarra20/JsfMojarra20.java diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/antlib-jsf-mojarra-2.0.xml b/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/antlib-jsf-mojarra-2.0.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/antlib-jsf-mojarra-2.0.xml rename to modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/antlib-jsf-mojarra-2.0.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/build-jsf-mojarra-2.0.properties b/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/build-jsf-mojarra-2.0.properties similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/build-jsf-mojarra-2.0.properties rename to modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/build-jsf-mojarra-2.0.properties diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/build-jsf-mojarra-2.0.xml b/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/build-jsf-mojarra-2.0.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/build-jsf-mojarra-2.0.xml rename to modules/services/jsf/jsf-mojarra-2.0/ant/src/main/resources/build-jsf-mojarra-2.0.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/core/pom.xml b/modules/services/jsf/jsf-mojarra-2.0/core/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/core/pom.xml rename to modules/services/jsf/jsf-mojarra-2.0/core/pom.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/com/sun/faces/application/resource/ZipDirectoryEntryScanner.java b/modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/com/sun/faces/application/resource/ZipDirectoryEntryScanner.java similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/com/sun/faces/application/resource/ZipDirectoryEntryScanner.java rename to modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/com/sun/faces/application/resource/ZipDirectoryEntryScanner.java diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/org/ow2/jonas/jsf/mojarra20/Mojarra20ServiceImpl.java b/modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/org/ow2/jonas/jsf/mojarra20/Mojarra20ServiceImpl.java similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/org/ow2/jonas/jsf/mojarra20/Mojarra20ServiceImpl.java rename to modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/org/ow2/jonas/jsf/mojarra20/Mojarra20ServiceImpl.java diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/org/ow2/jonas/jsf/mojarra20/vendor/Tomcat7InjectionProvider.java b/modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/org/ow2/jonas/jsf/mojarra20/vendor/Tomcat7InjectionProvider.java similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/org/ow2/jonas/jsf/mojarra20/vendor/Tomcat7InjectionProvider.java rename to modules/services/jsf/jsf-mojarra-2.0/core/src/main/java/org/ow2/jonas/jsf/mojarra20/vendor/Tomcat7InjectionProvider.java diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/properties/jonas-jsf-mojarra20.properties b/modules/services/jsf/jsf-mojarra-2.0/core/src/main/properties/jonas-jsf-mojarra20.properties similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/properties/jonas-jsf-mojarra20.properties rename to modules/services/jsf/jsf-mojarra-2.0/core/src/main/properties/jonas-jsf-mojarra20.properties diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/resources/META-INF/jonas-jsf-mojarra-2.0-core.bnd b/modules/services/jsf/jsf-mojarra-2.0/core/src/main/resources/META-INF/jonas-jsf-mojarra-2.0-core.bnd similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/resources/META-INF/jonas-jsf-mojarra-2.0-core.bnd rename to modules/services/jsf/jsf-mojarra-2.0/core/src/main/resources/META-INF/jonas-jsf-mojarra-2.0-core.bnd diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/resources/metadata.xml b/modules/services/jsf/jsf-mojarra-2.0/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/core/src/main/resources/metadata.xml rename to modules/services/jsf/jsf-mojarra-2.0/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jsf/jsf-mojarra-2.0/pom.xml b/modules/services/jsf/jsf-mojarra-2.0/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-mojarra-2.0/pom.xml rename to modules/services/jsf/jsf-mojarra-2.0/pom.xml diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/ant/pom.xml b/modules/services/jsf/jsf-myfaces-2.0/ant/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/ant/pom.xml rename to modules/services/jsf/jsf-myfaces-2.0/ant/pom.xml diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/myfaces20/JsfMyFaces20.java b/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/myfaces20/JsfMyFaces20.java similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/myfaces20/JsfMyFaces20.java rename to modules/services/jsf/jsf-myfaces-2.0/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/jsf/myfaces20/JsfMyFaces20.java diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/antlib-jsf-myfaces-2.0.xml b/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/antlib-jsf-myfaces-2.0.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/antlib-jsf-myfaces-2.0.xml rename to modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/antlib-jsf-myfaces-2.0.xml diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/build-jsf-myfaces-2.0.properties b/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/build-jsf-myfaces-2.0.properties similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/build-jsf-myfaces-2.0.properties rename to modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/build-jsf-myfaces-2.0.properties diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/build-jsf-myfaces-2.0.xml b/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/build-jsf-myfaces-2.0.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/build-jsf-myfaces-2.0.xml rename to modules/services/jsf/jsf-myfaces-2.0/ant/src/main/resources/build-jsf-myfaces-2.0.xml diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/core/pom.xml b/modules/services/jsf/jsf-myfaces-2.0/core/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/core/pom.xml rename to modules/services/jsf/jsf-myfaces-2.0/core/pom.xml diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/java/org/ow2/jonas/jsf/myfaces20/MyFaces20ServiceImpl.java b/modules/services/jsf/jsf-myfaces-2.0/core/src/main/java/org/ow2/jonas/jsf/myfaces20/MyFaces20ServiceImpl.java similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/java/org/ow2/jonas/jsf/myfaces20/MyFaces20ServiceImpl.java rename to modules/services/jsf/jsf-myfaces-2.0/core/src/main/java/org/ow2/jonas/jsf/myfaces20/MyFaces20ServiceImpl.java diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/properties/jonas-jsf-myfaces20.properties b/modules/services/jsf/jsf-myfaces-2.0/core/src/main/properties/jonas-jsf-myfaces20.properties similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/properties/jonas-jsf-myfaces20.properties rename to modules/services/jsf/jsf-myfaces-2.0/core/src/main/properties/jonas-jsf-myfaces20.properties diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/jonas-jsf-myfaces-2.0-core.bnd b/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/jonas-jsf-myfaces-2.0-core.bnd similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/jonas-jsf-myfaces-2.0-core.bnd rename to modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/jonas-jsf-myfaces-2.0-core.bnd diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/resources/javax.faces/jsf-uncompressed.js b/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/resources/javax.faces/jsf-uncompressed.js similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/resources/javax.faces/jsf-uncompressed.js rename to modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/resources/javax.faces/jsf-uncompressed.js diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/resources/javax.faces/jsf.js b/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/resources/javax.faces/jsf.js similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/resources/javax.faces/jsf.js rename to modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/META-INF/resources/javax.faces/jsf.js diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/metadata.xml b/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/metadata.xml rename to modules/services/jsf/jsf-myfaces-2.0/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/jsf/jsf-myfaces-2.0/pom.xml b/modules/services/jsf/jsf-myfaces-2.0/pom.xml similarity index 100% rename from jonas/modules/services/jsf/jsf-myfaces-2.0/pom.xml rename to modules/services/jsf/jsf-myfaces-2.0/pom.xml diff --git a/jonas/modules/services/jsf/pom.xml b/modules/services/jsf/pom.xml similarity index 100% rename from jonas/modules/services/jsf/pom.xml rename to modules/services/jsf/pom.xml diff --git a/jonas/modules/services/log-provider/core/pom.xml b/modules/services/log-provider/core/pom.xml similarity index 100% rename from jonas/modules/services/log-provider/core/pom.xml rename to modules/services/log-provider/core/pom.xml diff --git a/jonas/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/api/ILogProvider.java b/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/api/ILogProvider.java similarity index 100% rename from jonas/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/api/ILogProvider.java rename to modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/api/ILogProvider.java diff --git a/jonas/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/BundleCurrent.java b/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/BundleCurrent.java similarity index 100% rename from jonas/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/BundleCurrent.java rename to modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/BundleCurrent.java diff --git a/jonas/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/LogProvider.java b/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/LogProvider.java similarity index 100% rename from jonas/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/LogProvider.java rename to modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/LogProvider.java diff --git a/jonas/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/LogProviderComponent.java b/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/LogProviderComponent.java similarity index 100% rename from jonas/modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/LogProviderComponent.java rename to modules/services/log-provider/core/src/main/java/org/ow2/jonas/log/provider/internal/LogProviderComponent.java diff --git a/jonas/modules/services/log-provider/core/src/main/resources/META-INF/log-provider-core.bnd b/modules/services/log-provider/core/src/main/resources/META-INF/log-provider-core.bnd similarity index 100% rename from jonas/modules/services/log-provider/core/src/main/resources/META-INF/log-provider-core.bnd rename to modules/services/log-provider/core/src/main/resources/META-INF/log-provider-core.bnd diff --git a/jonas/modules/services/log-provider/core/src/main/resources/metadata.xml b/modules/services/log-provider/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/log-provider/core/src/main/resources/metadata.xml rename to modules/services/log-provider/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/log-provider/pom.xml b/modules/services/log-provider/pom.xml similarity index 100% rename from jonas/modules/services/log-provider/pom.xml rename to modules/services/log-provider/pom.xml diff --git a/jonas/modules/services/multitenant/addon/pom.xml b/modules/services/multitenant/addon/pom.xml similarity index 100% rename from jonas/modules/services/multitenant/addon/pom.xml rename to modules/services/multitenant/addon/pom.xml diff --git a/jonas/modules/services/multitenant/addon/src/main/assembly/assembly.xml b/modules/services/multitenant/addon/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/multitenant/addon/src/main/assembly/assembly.xml rename to modules/services/multitenant/addon/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/multitenant/addon/src/main/resources/META-INF/jonas-addon.xml b/modules/services/multitenant/addon/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/multitenant/addon/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/multitenant/addon/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/multitenant/core/pom.xml b/modules/services/multitenant/core/pom.xml similarity index 100% rename from jonas/modules/services/multitenant/core/pom.xml rename to modules/services/multitenant/core/pom.xml diff --git a/jonas/modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantServiceImpl.java b/modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantServiceImpl.java similarity index 100% rename from jonas/modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantServiceImpl.java rename to modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantServiceImpl.java diff --git a/jonas/modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantVirtualJNDIBinding.java b/modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantVirtualJNDIBinding.java similarity index 100% rename from jonas/modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantVirtualJNDIBinding.java rename to modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantVirtualJNDIBinding.java diff --git a/jonas/modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantVirtualJNDIBindingMBean.java b/modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantVirtualJNDIBindingMBean.java similarity index 100% rename from jonas/modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantVirtualJNDIBindingMBean.java rename to modules/services/multitenant/core/src/main/java/org/ow2/jonas/multitenant/internal/MultitenantVirtualJNDIBindingMBean.java diff --git a/jonas/modules/services/multitenant/core/src/main/resources/META-INF/jonas-multitenant-core.bnd b/modules/services/multitenant/core/src/main/resources/META-INF/jonas-multitenant-core.bnd similarity index 100% rename from jonas/modules/services/multitenant/core/src/main/resources/META-INF/jonas-multitenant-core.bnd rename to modules/services/multitenant/core/src/main/resources/META-INF/jonas-multitenant-core.bnd diff --git a/jonas/modules/services/multitenant/core/src/main/resources/metadata.xml b/modules/services/multitenant/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/multitenant/core/src/main/resources/metadata.xml rename to modules/services/multitenant/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/multitenant/core/src/main/resources/org/ow2/jonas/multitenant/internal/mbeans-descriptors.xml b/modules/services/multitenant/core/src/main/resources/org/ow2/jonas/multitenant/internal/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/multitenant/core/src/main/resources/org/ow2/jonas/multitenant/internal/mbeans-descriptors.xml rename to modules/services/multitenant/core/src/main/resources/org/ow2/jonas/multitenant/internal/mbeans-descriptors.xml diff --git a/jonas/modules/services/multitenant/core/src/main/templates/jonas-multitenant.properties.template b/modules/services/multitenant/core/src/main/templates/jonas-multitenant.properties.template similarity index 100% rename from jonas/modules/services/multitenant/core/src/main/templates/jonas-multitenant.properties.template rename to modules/services/multitenant/core/src/main/templates/jonas-multitenant.properties.template diff --git a/jonas/modules/services/multitenant/pom.xml b/modules/services/multitenant/pom.xml similarity index 100% rename from jonas/modules/services/multitenant/pom.xml rename to modules/services/multitenant/pom.xml diff --git a/jonas/modules/services/packaging/addon/pom.xml b/modules/services/packaging/addon/pom.xml similarity index 100% rename from jonas/modules/services/packaging/addon/pom.xml rename to modules/services/packaging/addon/pom.xml diff --git a/jonas/modules/services/packaging/addon/src/main/assembly/assembly.xml b/modules/services/packaging/addon/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/packaging/addon/src/main/assembly/assembly.xml rename to modules/services/packaging/addon/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/packaging/addon/src/main/resources/META-INF/jonas-addon.xml b/modules/services/packaging/addon/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/packaging/addon/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/packaging/addon/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/packaging/core/pom.xml b/modules/services/packaging/core/pom.xml similarity index 100% rename from jonas/modules/services/packaging/core/pom.xml rename to modules/services/packaging/core/pom.xml diff --git a/jonas/modules/services/packaging/core/src/main/java/org/ow2/jonas/packaging/internal/PackagingManager.java b/modules/services/packaging/core/src/main/java/org/ow2/jonas/packaging/internal/PackagingManager.java similarity index 100% rename from jonas/modules/services/packaging/core/src/main/java/org/ow2/jonas/packaging/internal/PackagingManager.java rename to modules/services/packaging/core/src/main/java/org/ow2/jonas/packaging/internal/PackagingManager.java diff --git a/jonas/modules/services/packaging/core/src/main/jonas-resources/bin/gen-addon b/modules/services/packaging/core/src/main/jonas-resources/bin/gen-addon similarity index 100% rename from jonas/modules/services/packaging/core/src/main/jonas-resources/bin/gen-addon rename to modules/services/packaging/core/src/main/jonas-resources/bin/gen-addon diff --git a/jonas/modules/services/packaging/core/src/main/resources/META-INF/jonas-packaging-core.bnd b/modules/services/packaging/core/src/main/resources/META-INF/jonas-packaging-core.bnd similarity index 100% rename from jonas/modules/services/packaging/core/src/main/resources/META-INF/jonas-packaging-core.bnd rename to modules/services/packaging/core/src/main/resources/META-INF/jonas-packaging-core.bnd diff --git a/jonas/modules/services/packaging/core/src/main/resources/metadata.xml b/modules/services/packaging/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/packaging/core/src/main/resources/metadata.xml rename to modules/services/packaging/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/packaging/core/src/main/resources/org/ow2/jonas/packaging/internal/mbeans-descriptors.xml b/modules/services/packaging/core/src/main/resources/org/ow2/jonas/packaging/internal/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/packaging/core/src/main/resources/org/ow2/jonas/packaging/internal/mbeans-descriptors.xml rename to modules/services/packaging/core/src/main/resources/org/ow2/jonas/packaging/internal/mbeans-descriptors.xml diff --git a/jonas/modules/services/packaging/core/src/main/templates/jonas-packaging.properties.template b/modules/services/packaging/core/src/main/templates/jonas-packaging.properties.template similarity index 100% rename from jonas/modules/services/packaging/core/src/main/templates/jonas-packaging.properties.template rename to modules/services/packaging/core/src/main/templates/jonas-packaging.properties.template diff --git a/jonas/modules/services/packaging/pom.xml b/modules/services/packaging/pom.xml similarity index 100% rename from jonas/modules/services/packaging/pom.xml rename to modules/services/packaging/pom.xml diff --git a/jonas/modules/services/pom.xml b/modules/services/pom.xml similarity index 100% rename from jonas/modules/services/pom.xml rename to modules/services/pom.xml diff --git a/jonas/modules/services/smartclient/ant/pom.xml b/modules/services/smartclient/ant/pom.xml similarity index 100% rename from jonas/modules/services/smartclient/ant/pom.xml rename to modules/services/smartclient/ant/pom.xml diff --git a/jonas/modules/services/smartclient/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/smartclient/SmartClient.java b/modules/services/smartclient/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/smartclient/SmartClient.java similarity index 100% rename from jonas/modules/services/smartclient/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/smartclient/SmartClient.java rename to modules/services/smartclient/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/smartclient/SmartClient.java diff --git a/jonas/modules/services/smartclient/ant/src/main/resources/META-INF/jonas-smartclient-ant.bnd b/modules/services/smartclient/ant/src/main/resources/META-INF/jonas-smartclient-ant.bnd similarity index 100% rename from jonas/modules/services/smartclient/ant/src/main/resources/META-INF/jonas-smartclient-ant.bnd rename to modules/services/smartclient/ant/src/main/resources/META-INF/jonas-smartclient-ant.bnd diff --git a/jonas/modules/services/smartclient/ant/src/main/resources/antlib-smartclient.xml b/modules/services/smartclient/ant/src/main/resources/antlib-smartclient.xml similarity index 100% rename from jonas/modules/services/smartclient/ant/src/main/resources/antlib-smartclient.xml rename to modules/services/smartclient/ant/src/main/resources/antlib-smartclient.xml diff --git a/jonas/modules/services/smartclient/ant/src/main/resources/build-smartclient.properties.template b/modules/services/smartclient/ant/src/main/resources/build-smartclient.properties.template similarity index 100% rename from jonas/modules/services/smartclient/ant/src/main/resources/build-smartclient.properties.template rename to modules/services/smartclient/ant/src/main/resources/build-smartclient.properties.template diff --git a/jonas/modules/services/smartclient/ant/src/main/resources/build-smartclient.xml b/modules/services/smartclient/ant/src/main/resources/build-smartclient.xml similarity index 100% rename from jonas/modules/services/smartclient/ant/src/main/resources/build-smartclient.xml rename to modules/services/smartclient/ant/src/main/resources/build-smartclient.xml diff --git a/jonas/modules/services/smartclient/core/pom.xml b/modules/services/smartclient/core/pom.xml similarity index 100% rename from jonas/modules/services/smartclient/core/pom.xml rename to modules/services/smartclient/core/pom.xml diff --git a/jonas/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientEndpointBuilder.java b/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientEndpointBuilder.java similarity index 100% rename from jonas/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientEndpointBuilder.java rename to modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientEndpointBuilder.java diff --git a/jonas/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceImpl.java b/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceImpl.java similarity index 100% rename from jonas/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceImpl.java rename to modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceImpl.java diff --git a/jonas/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceImplMBean.java b/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceImplMBean.java similarity index 100% rename from jonas/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceImplMBean.java rename to modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceImplMBean.java diff --git a/jonas/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceRegistryComponent.java b/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceRegistryComponent.java similarity index 100% rename from jonas/modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceRegistryComponent.java rename to modules/services/smartclient/core/src/main/java/org/ow2/jonas/smartclient/internal/SmartclientServiceRegistryComponent.java diff --git a/jonas/modules/services/smartclient/core/src/main/resources/META-INF/jonas-smartclient-core.bnd b/modules/services/smartclient/core/src/main/resources/META-INF/jonas-smartclient-core.bnd similarity index 100% rename from jonas/modules/services/smartclient/core/src/main/resources/META-INF/jonas-smartclient-core.bnd rename to modules/services/smartclient/core/src/main/resources/META-INF/jonas-smartclient-core.bnd diff --git a/jonas/modules/services/smartclient/core/src/main/resources/metadata.xml b/modules/services/smartclient/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/smartclient/core/src/main/resources/metadata.xml rename to modules/services/smartclient/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/smartclient/core/src/main/templates/jonas-smartclient.properties.template b/modules/services/smartclient/core/src/main/templates/jonas-smartclient.properties.template similarity index 100% rename from jonas/modules/services/smartclient/core/src/main/templates/jonas-smartclient.properties.template rename to modules/services/smartclient/core/src/main/templates/jonas-smartclient.properties.template diff --git a/jonas/modules/services/smartclient/pom.xml b/modules/services/smartclient/pom.xml similarity index 100% rename from jonas/modules/services/smartclient/pom.xml rename to modules/services/smartclient/pom.xml diff --git a/jonas/modules/services/ssh/core/pom.xml b/modules/services/ssh/core/pom.xml similarity index 100% rename from jonas/modules/services/ssh/core/pom.xml rename to modules/services/ssh/core/pom.xml diff --git a/jonas/modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/SshService.java b/modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/SshService.java similarity index 100% rename from jonas/modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/SshService.java rename to modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/SshService.java diff --git a/jonas/modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/internal/SshServiceImpl.java b/modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/internal/SshServiceImpl.java similarity index 100% rename from jonas/modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/internal/SshServiceImpl.java rename to modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/internal/SshServiceImpl.java diff --git a/jonas/modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/internal/SshServiceImplMBean.java b/modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/internal/SshServiceImplMBean.java similarity index 100% rename from jonas/modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/internal/SshServiceImplMBean.java rename to modules/services/ssh/core/src/main/java/org/ow2/jonas/ssh/internal/SshServiceImplMBean.java diff --git a/jonas/modules/services/ssh/core/src/main/resources/metadata.xml b/modules/services/ssh/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/ssh/core/src/main/resources/metadata.xml rename to modules/services/ssh/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/ssh/core/src/main/templates/ssh.properties.template b/modules/services/ssh/core/src/main/templates/ssh.properties.template similarity index 100% rename from jonas/modules/services/ssh/core/src/main/templates/ssh.properties.template rename to modules/services/ssh/core/src/main/templates/ssh.properties.template diff --git a/jonas/modules/services/ssh/pom.xml b/modules/services/ssh/pom.xml similarity index 100% rename from jonas/modules/services/ssh/pom.xml rename to modules/services/ssh/pom.xml diff --git a/jonas/modules/services/validation/hibernate-validation/core/pom.xml b/modules/services/validation/hibernate-validation/core/pom.xml similarity index 100% rename from jonas/modules/services/validation/hibernate-validation/core/pom.xml rename to modules/services/validation/hibernate-validation/core/pom.xml diff --git a/jonas/modules/services/validation/hibernate-validation/core/src/main/java/org/ow2/jonas/validation/hibernate/JOnASHibernateValidationServiceImpl.java b/modules/services/validation/hibernate-validation/core/src/main/java/org/ow2/jonas/validation/hibernate/JOnASHibernateValidationServiceImpl.java similarity index 100% rename from jonas/modules/services/validation/hibernate-validation/core/src/main/java/org/ow2/jonas/validation/hibernate/JOnASHibernateValidationServiceImpl.java rename to modules/services/validation/hibernate-validation/core/src/main/java/org/ow2/jonas/validation/hibernate/JOnASHibernateValidationServiceImpl.java diff --git a/jonas/modules/services/validation/hibernate-validation/core/src/main/resources/META-INF/jonas-validation-hibernate-core.bnd b/modules/services/validation/hibernate-validation/core/src/main/resources/META-INF/jonas-validation-hibernate-core.bnd similarity index 100% rename from jonas/modules/services/validation/hibernate-validation/core/src/main/resources/META-INF/jonas-validation-hibernate-core.bnd rename to modules/services/validation/hibernate-validation/core/src/main/resources/META-INF/jonas-validation-hibernate-core.bnd diff --git a/jonas/modules/services/validation/hibernate-validation/core/src/main/resources/metadata.xml b/modules/services/validation/hibernate-validation/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/validation/hibernate-validation/core/src/main/resources/metadata.xml rename to modules/services/validation/hibernate-validation/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/validation/hibernate-validation/core/src/main/templates/jonas-validation.properties.template b/modules/services/validation/hibernate-validation/core/src/main/templates/jonas-validation.properties.template similarity index 100% rename from jonas/modules/services/validation/hibernate-validation/core/src/main/templates/jonas-validation.properties.template rename to modules/services/validation/hibernate-validation/core/src/main/templates/jonas-validation.properties.template diff --git a/jonas/modules/services/validation/hibernate-validation/pom.xml b/modules/services/validation/hibernate-validation/pom.xml similarity index 100% rename from jonas/modules/services/validation/hibernate-validation/pom.xml rename to modules/services/validation/hibernate-validation/pom.xml diff --git a/jonas/modules/services/validation/pom.xml b/modules/services/validation/pom.xml similarity index 100% rename from jonas/modules/services/validation/pom.xml rename to modules/services/validation/pom.xml diff --git a/jonas/modules/services/versioning/core/pom.xml b/modules/services/versioning/core/pom.xml similarity index 100% rename from jonas/modules/services/versioning/core/pom.xml rename to modules/services/versioning/core/pom.xml diff --git a/jonas/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/contexts/VirtualJNDIBinding.java b/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/contexts/VirtualJNDIBinding.java similarity index 100% rename from jonas/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/contexts/VirtualJNDIBinding.java rename to modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/contexts/VirtualJNDIBinding.java diff --git a/jonas/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/contexts/VirtualJNDIBindingMBean.java b/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/contexts/VirtualJNDIBindingMBean.java similarity index 100% rename from jonas/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/contexts/VirtualJNDIBindingMBean.java rename to modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/contexts/VirtualJNDIBindingMBean.java diff --git a/jonas/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/internal/VersioningServiceImpl.java b/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/internal/VersioningServiceImpl.java similarity index 100% rename from jonas/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/internal/VersioningServiceImpl.java rename to modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/internal/VersioningServiceImpl.java diff --git a/jonas/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/internal/VersioningServiceImplMBean.java b/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/internal/VersioningServiceImplMBean.java similarity index 100% rename from jonas/modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/internal/VersioningServiceImplMBean.java rename to modules/services/versioning/core/src/main/java/org/ow2/jonas/versioning/internal/VersioningServiceImplMBean.java diff --git a/jonas/modules/services/versioning/core/src/main/resources/META-INF/jonas-versioning-core.bnd b/modules/services/versioning/core/src/main/resources/META-INF/jonas-versioning-core.bnd similarity index 100% rename from jonas/modules/services/versioning/core/src/main/resources/META-INF/jonas-versioning-core.bnd rename to modules/services/versioning/core/src/main/resources/META-INF/jonas-versioning-core.bnd diff --git a/jonas/modules/services/versioning/core/src/main/resources/metadata.xml b/modules/services/versioning/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/versioning/core/src/main/resources/metadata.xml rename to modules/services/versioning/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/versioning/core/src/main/templates/jonas-versioning.properties.template b/modules/services/versioning/core/src/main/templates/jonas-versioning.properties.template similarity index 100% rename from jonas/modules/services/versioning/core/src/main/templates/jonas-versioning.properties.template rename to modules/services/versioning/core/src/main/templates/jonas-versioning.properties.template diff --git a/jonas/modules/services/versioning/pom.xml b/modules/services/versioning/pom.xml similarity index 100% rename from jonas/modules/services/versioning/pom.xml rename to modules/services/versioning/pom.xml diff --git a/jonas/modules/services/web-container/base/ant/pom.xml b/modules/services/web-container/base/ant/pom.xml similarity index 100% rename from jonas/modules/services/web-container/base/ant/pom.xml rename to modules/services/web-container/base/ant/pom.xml diff --git a/jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Ajp.java b/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Ajp.java similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Ajp.java rename to modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Ajp.java diff --git a/jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Cluster.java b/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Cluster.java similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Cluster.java rename to modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Cluster.java diff --git a/jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Connectors.java b/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Connectors.java similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Connectors.java rename to modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Connectors.java diff --git a/jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Director.java b/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Director.java similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Director.java rename to modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Director.java diff --git a/jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Http.java b/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Http.java similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Http.java rename to modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Http.java diff --git a/jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Https.java b/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Https.java similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Https.java rename to modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/Https.java diff --git a/jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/SessionReplication.java b/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/SessionReplication.java similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/SessionReplication.java rename to modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/SessionReplication.java diff --git a/jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/SessionReplicationAlgorithm.java b/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/SessionReplicationAlgorithm.java similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/SessionReplicationAlgorithm.java rename to modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/SessionReplicationAlgorithm.java diff --git a/jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/WebContainer.java b/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/WebContainer.java similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/WebContainer.java rename to modules/services/web-container/base/ant/src/main/java/org/ow2/jonas/antmodular/web/base/WebContainer.java diff --git a/jonas/modules/services/web-container/base/ant/src/main/resources/build-webcontainer.properties.template b/modules/services/web-container/base/ant/src/main/resources/build-webcontainer.properties.template similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/resources/build-webcontainer.properties.template rename to modules/services/web-container/base/ant/src/main/resources/build-webcontainer.properties.template diff --git a/jonas/modules/services/web-container/base/ant/src/main/resources/build-webcontainer.xml b/modules/services/web-container/base/ant/src/main/resources/build-webcontainer.xml similarity index 100% rename from jonas/modules/services/web-container/base/ant/src/main/resources/build-webcontainer.xml rename to modules/services/web-container/base/ant/src/main/resources/build-webcontainer.xml diff --git a/jonas/modules/services/web-container/base/core/pom.xml b/modules/services/web-container/base/core/pom.xml similarity index 100% rename from jonas/modules/services/web-container/base/core/pom.xml rename to modules/services/web-container/base/core/pom.xml diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/BaseWebContainerService.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/BaseWebContainerService.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/BaseWebContainerService.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/BaseWebContainerService.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/BaseWebContainerServiceMBean.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/BaseWebContainerServiceMBean.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/BaseWebContainerServiceMBean.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/BaseWebContainerServiceMBean.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WARDeployer.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WARDeployer.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WARDeployer.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WARDeployer.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/War.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/War.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/War.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/War.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WarCleanTask.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WarCleanTask.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WarCleanTask.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WarCleanTask.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WarMBean.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WarMBean.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WarMBean.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/WarMBean.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/endpoint/WebEndpointBuilder.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/endpoint/WebEndpointBuilder.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/endpoint/WebEndpointBuilder.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/endpoint/WebEndpointBuilder.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/lib/PermissionManager.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/lib/PermissionManager.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/lib/PermissionManager.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/lib/PermissionManager.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/DefaultHttpContextImpl.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/DefaultHttpContextImpl.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/DefaultHttpContextImpl.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/DefaultHttpContextImpl.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/HttpServiceFactory.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/HttpServiceFactory.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/HttpServiceFactory.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/HttpServiceFactory.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/JOnASHttpService.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/JOnASHttpService.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/JOnASHttpService.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/JOnASHttpService.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/OSGIResourcesServlet.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/OSGIResourcesServlet.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/OSGIResourcesServlet.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/osgi/httpservice/OSGIResourcesServlet.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/ContextInfo.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/ContextInfo.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/ContextInfo.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/ContextInfo.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/CopyingStream.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/CopyingStream.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/CopyingStream.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/CopyingStream.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HTTPResponse.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HTTPResponse.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HTTPResponse.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HTTPResponse.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpOnDemandProxy.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpOnDemandProxy.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpOnDemandProxy.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpOnDemandProxy.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpOnDemandProxyException.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpOnDemandProxyException.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpOnDemandProxyException.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpOnDemandProxyException.java diff --git a/jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpSocketHandler.java b/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpSocketHandler.java similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpSocketHandler.java rename to modules/services/web-container/base/core/src/main/java/org/ow2/jonas/web/base/proxy/HttpSocketHandler.java diff --git a/jonas/modules/services/web-container/base/core/src/main/resources/META-INF/jonas-web-container-base-core.bnd b/modules/services/web-container/base/core/src/main/resources/META-INF/jonas-web-container-base-core.bnd similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/resources/META-INF/jonas-web-container-base-core.bnd rename to modules/services/web-container/base/core/src/main/resources/META-INF/jonas-web-container-base-core.bnd diff --git a/jonas/modules/services/web-container/base/core/src/main/resources/metadata.xml b/modules/services/web-container/base/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/resources/metadata.xml rename to modules/services/web-container/base/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/web-container/base/core/src/main/resources/org/ow2/jonas/web/base/proxy/wait.gif b/modules/services/web-container/base/core/src/main/resources/org/ow2/jonas/web/base/proxy/wait.gif similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/resources/org/ow2/jonas/web/base/proxy/wait.gif rename to modules/services/web-container/base/core/src/main/resources/org/ow2/jonas/web/base/proxy/wait.gif diff --git a/jonas/modules/services/web-container/base/core/src/main/templates/jonas-web.properties.template b/modules/services/web-container/base/core/src/main/templates/jonas-web.properties.template similarity index 100% rename from jonas/modules/services/web-container/base/core/src/main/templates/jonas-web.properties.template rename to modules/services/web-container/base/core/src/main/templates/jonas-web.properties.template diff --git a/jonas/modules/services/web-container/base/pom.xml b/modules/services/web-container/base/pom.xml similarity index 100% rename from jonas/modules/services/web-container/base/pom.xml rename to modules/services/web-container/base/pom.xml diff --git a/jonas/modules/services/web-container/jetty/6.1.x/ant/pom.xml b/modules/services/web-container/jetty/6.1.x/ant/pom.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/ant/pom.xml rename to modules/services/web-container/jetty/6.1.x/ant/pom.xml diff --git a/jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty6/Jetty6.java b/modules/services/web-container/jetty/6.1.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty6/Jetty6.java similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty6/Jetty6.java rename to modules/services/web-container/jetty/6.1.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty6/Jetty6.java diff --git a/jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty6/Jetty6Connectors.java b/modules/services/web-container/jetty/6.1.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty6/Jetty6Connectors.java similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty6/Jetty6Connectors.java rename to modules/services/web-container/jetty/6.1.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty6/Jetty6Connectors.java diff --git a/jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/resources/antlib-jetty6.xml b/modules/services/web-container/jetty/6.1.x/ant/src/main/resources/antlib-jetty6.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/resources/antlib-jetty6.xml rename to modules/services/web-container/jetty/6.1.x/ant/src/main/resources/antlib-jetty6.xml diff --git a/jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/resources/build-jetty6.properties b/modules/services/web-container/jetty/6.1.x/ant/src/main/resources/build-jetty6.properties similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/resources/build-jetty6.properties rename to modules/services/web-container/jetty/6.1.x/ant/src/main/resources/build-jetty6.properties diff --git a/jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/resources/build-jetty6.xml b/modules/services/web-container/jetty/6.1.x/ant/src/main/resources/build-jetty6.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/ant/src/main/resources/build-jetty6.xml rename to modules/services/web-container/jetty/6.1.x/ant/src/main/resources/build-jetty6.xml diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/pom.xml b/modules/services/web-container/jetty/6.1.x/core/pom.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/pom.xml rename to modules/services/web-container/jetty/6.1.x/core/pom.xml diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/AnnotationProcessorServletHandler.java b/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/AnnotationProcessorServletHandler.java similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/AnnotationProcessorServletHandler.java rename to modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/AnnotationProcessorServletHandler.java diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/Jetty6Service.java b/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/Jetty6Service.java similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/Jetty6Service.java rename to modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/Jetty6Service.java diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/security/JettyPrincipal.java b/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/security/JettyPrincipal.java similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/security/JettyPrincipal.java rename to modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/security/JettyPrincipal.java diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/security/Realm.java b/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/security/Realm.java similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/security/Realm.java rename to modules/services/web-container/jetty/6.1.x/core/src/main/java/org/ow2/jonas/web/jetty6/security/Realm.java diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/src/main/jonas-resources/conf/jetty6-web.xml b/modules/services/web-container/jetty/6.1.x/core/src/main/jonas-resources/conf/jetty6-web.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/src/main/jonas-resources/conf/jetty6-web.xml rename to modules/services/web-container/jetty/6.1.x/core/src/main/jonas-resources/conf/jetty6-web.xml diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/src/main/jonas-resources/conf/jetty6.xml b/modules/services/web-container/jetty/6.1.x/core/src/main/jonas-resources/conf/jetty6.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/src/main/jonas-resources/conf/jetty6.xml rename to modules/services/web-container/jetty/6.1.x/core/src/main/jonas-resources/conf/jetty6.xml diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/src/main/properties/jonas-web-jetty6.properties b/modules/services/web-container/jetty/6.1.x/core/src/main/properties/jonas-web-jetty6.properties similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/src/main/properties/jonas-web-jetty6.properties rename to modules/services/web-container/jetty/6.1.x/core/src/main/properties/jonas-web-jetty6.properties diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/src/main/resources/META-INF/jonas-web-container-jetty-6.1-core.bnd b/modules/services/web-container/jetty/6.1.x/core/src/main/resources/META-INF/jonas-web-container-jetty-6.1-core.bnd similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/src/main/resources/META-INF/jonas-web-container-jetty-6.1-core.bnd rename to modules/services/web-container/jetty/6.1.x/core/src/main/resources/META-INF/jonas-web-container-jetty-6.1-core.bnd diff --git a/jonas/modules/services/web-container/jetty/6.1.x/core/src/main/resources/metadata.xml b/modules/services/web-container/jetty/6.1.x/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/core/src/main/resources/metadata.xml rename to modules/services/web-container/jetty/6.1.x/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/web-container/jetty/6.1.x/pom.xml b/modules/services/web-container/jetty/6.1.x/pom.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/6.1.x/pom.xml rename to modules/services/web-container/jetty/6.1.x/pom.xml diff --git a/jonas/modules/services/web-container/jetty/8.0.x/ant/pom.xml b/modules/services/web-container/jetty/8.0.x/ant/pom.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/ant/pom.xml rename to modules/services/web-container/jetty/8.0.x/ant/pom.xml diff --git a/jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty8/Jetty8.java b/modules/services/web-container/jetty/8.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty8/Jetty8.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty8/Jetty8.java rename to modules/services/web-container/jetty/8.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty8/Jetty8.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty8/Jetty8Connectors.java b/modules/services/web-container/jetty/8.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty8/Jetty8Connectors.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty8/Jetty8Connectors.java rename to modules/services/web-container/jetty/8.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty8/Jetty8Connectors.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/resources/antlib-jetty8.xml b/modules/services/web-container/jetty/8.0.x/ant/src/main/resources/antlib-jetty8.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/resources/antlib-jetty8.xml rename to modules/services/web-container/jetty/8.0.x/ant/src/main/resources/antlib-jetty8.xml diff --git a/jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/resources/build-jetty8.properties b/modules/services/web-container/jetty/8.0.x/ant/src/main/resources/build-jetty8.properties similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/resources/build-jetty8.properties rename to modules/services/web-container/jetty/8.0.x/ant/src/main/resources/build-jetty8.properties diff --git a/jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/resources/build-jetty8.xml b/modules/services/web-container/jetty/8.0.x/ant/src/main/resources/build-jetty8.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/ant/src/main/resources/build-jetty8.xml rename to modules/services/web-container/jetty/8.0.x/ant/src/main/resources/build-jetty8.xml diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/pom.xml b/modules/services/web-container/jetty/8.0.x/core/pom.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/pom.xml rename to modules/services/web-container/jetty/8.0.x/core/pom.xml diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/apache/AnnotationProcessor.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/apache/AnnotationProcessor.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/apache/AnnotationProcessor.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/apache/AnnotationProcessor.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASInjectionDecorator.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASInjectionDecorator.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASInjectionDecorator.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASInjectionDecorator.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASTldScanner.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASTldScanner.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASTldScanner.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASTldScanner.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASWebAppContext.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASWebAppContext.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASWebAppContext.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JOnASWebAppContext.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JSPLifecycleListener.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JSPLifecycleListener.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JSPLifecycleListener.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/JSPLifecycleListener.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/Jetty8Service.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/Jetty8Service.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/Jetty8Service.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/Jetty8Service.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/OSGiTagLibConfiguration.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/OSGiTagLibConfiguration.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/OSGiTagLibConfiguration.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/OSGiTagLibConfiguration.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/ServletHolderDecorator.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/ServletHolderDecorator.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/ServletHolderDecorator.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/ServletHolderDecorator.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/security/JOnASLoginService.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/security/JOnASLoginService.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/security/JOnASLoginService.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/security/JOnASLoginService.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/security/JettyPrincipal.java b/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/security/JettyPrincipal.java similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/security/JettyPrincipal.java rename to modules/services/web-container/jetty/8.0.x/core/src/main/java/org/ow2/jonas/web/jetty8/security/JettyPrincipal.java diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/jonas-resources/conf/jetty8-web.xml b/modules/services/web-container/jetty/8.0.x/core/src/main/jonas-resources/conf/jetty8-web.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/jonas-resources/conf/jetty8-web.xml rename to modules/services/web-container/jetty/8.0.x/core/src/main/jonas-resources/conf/jetty8-web.xml diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/jonas-resources/conf/jetty8.xml b/modules/services/web-container/jetty/8.0.x/core/src/main/jonas-resources/conf/jetty8.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/jonas-resources/conf/jetty8.xml rename to modules/services/web-container/jetty/8.0.x/core/src/main/jonas-resources/conf/jetty8.xml diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/patches/Compiler.patch b/modules/services/web-container/jetty/8.0.x/core/src/main/patches/Compiler.patch similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/patches/Compiler.patch rename to modules/services/web-container/jetty/8.0.x/core/src/main/patches/Compiler.patch diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/patches/TagLibraryInfoImpl.patch b/modules/services/web-container/jetty/8.0.x/core/src/main/patches/TagLibraryInfoImpl.patch similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/patches/TagLibraryInfoImpl.patch rename to modules/services/web-container/jetty/8.0.x/core/src/main/patches/TagLibraryInfoImpl.patch diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/properties/jonas-web-jetty8.properties b/modules/services/web-container/jetty/8.0.x/core/src/main/properties/jonas-web-jetty8.properties similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/properties/jonas-web-jetty8.properties rename to modules/services/web-container/jetty/8.0.x/core/src/main/properties/jonas-web-jetty8.properties diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/resources/META-INF/jonas-web-container-jetty-8.0-core.bnd b/modules/services/web-container/jetty/8.0.x/core/src/main/resources/META-INF/jonas-web-container-jetty-8.0-core.bnd similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/resources/META-INF/jonas-web-container-jetty-8.0-core.bnd rename to modules/services/web-container/jetty/8.0.x/core/src/main/resources/META-INF/jonas-web-container-jetty-8.0-core.bnd diff --git a/jonas/modules/services/web-container/jetty/8.0.x/core/src/main/resources/metadata.xml b/modules/services/web-container/jetty/8.0.x/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/core/src/main/resources/metadata.xml rename to modules/services/web-container/jetty/8.0.x/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/web-container/jetty/8.0.x/pom.xml b/modules/services/web-container/jetty/8.0.x/pom.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/8.0.x/pom.xml rename to modules/services/web-container/jetty/8.0.x/pom.xml diff --git a/jonas/modules/services/web-container/jetty/base/pom.xml b/modules/services/web-container/jetty/base/pom.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/base/pom.xml rename to modules/services/web-container/jetty/base/pom.xml diff --git a/jonas/modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/Jetty.java b/modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/Jetty.java similarity index 100% rename from jonas/modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/Jetty.java rename to modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/Jetty.java diff --git a/jonas/modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/JettyConnectors.java b/modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/JettyConnectors.java similarity index 100% rename from jonas/modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/JettyConnectors.java rename to modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/JettyConnectors.java diff --git a/jonas/modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/JettyHttps.java b/modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/JettyHttps.java similarity index 100% rename from jonas/modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/JettyHttps.java rename to modules/services/web-container/jetty/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/jetty/JettyHttps.java diff --git a/jonas/modules/services/web-container/jetty/pom.xml b/modules/services/web-container/jetty/pom.xml similarity index 100% rename from jonas/modules/services/web-container/jetty/pom.xml rename to modules/services/web-container/jetty/pom.xml diff --git a/jonas/modules/services/web-container/pom.xml b/modules/services/web-container/pom.xml similarity index 100% rename from jonas/modules/services/web-container/pom.xml rename to modules/services/web-container/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/addons/addon-with-bundles/pom.xml b/modules/services/web-container/tomcat/6.0.x/addons/addon-with-bundles/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/addons/addon-with-bundles/pom.xml rename to modules/services/web-container/tomcat/6.0.x/addons/addon-with-bundles/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/addons/addon-with-bundles/src/main/assembly/assembly.xml b/modules/services/web-container/tomcat/6.0.x/addons/addon-with-bundles/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/addons/addon-with-bundles/src/main/assembly/assembly.xml rename to modules/services/web-container/tomcat/6.0.x/addons/addon-with-bundles/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/addons/addon-with-deployment-plans/pom.xml b/modules/services/web-container/tomcat/6.0.x/addons/addon-with-deployment-plans/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/addons/addon-with-deployment-plans/pom.xml rename to modules/services/web-container/tomcat/6.0.x/addons/addon-with-deployment-plans/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/addons/addon-with-deployment-plans/src/main/assembly/assembly.xml b/modules/services/web-container/tomcat/6.0.x/addons/addon-with-deployment-plans/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/addons/addon-with-deployment-plans/src/main/assembly/assembly.xml rename to modules/services/web-container/tomcat/6.0.x/addons/addon-with-deployment-plans/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/addons/pom.xml b/modules/services/web-container/tomcat/6.0.x/addons/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/addons/pom.xml rename to modules/services/web-container/tomcat/6.0.x/addons/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/addons/src/main/resources/META-INF/jonas-addon.xml b/modules/services/web-container/tomcat/6.0.x/addons/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/addons/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/web-container/tomcat/6.0.x/addons/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/ant/pom.xml b/modules/services/web-container/tomcat/6.0.x/ant/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/ant/pom.xml rename to modules/services/web-container/tomcat/6.0.x/ant/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat6/Tomcat6.java b/modules/services/web-container/tomcat/6.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat6/Tomcat6.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat6/Tomcat6.java rename to modules/services/web-container/tomcat/6.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat6/Tomcat6.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat6/Tomcat6Connectors.java b/modules/services/web-container/tomcat/6.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat6/Tomcat6Connectors.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat6/Tomcat6Connectors.java rename to modules/services/web-container/tomcat/6.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat6/Tomcat6Connectors.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/antlib-tomcat6.xml b/modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/antlib-tomcat6.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/antlib-tomcat6.xml rename to modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/antlib-tomcat6.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/build-tomcat6.properties b/modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/build-tomcat6.properties similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/build-tomcat6.properties rename to modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/build-tomcat6.properties diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/build-tomcat6.xml b/modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/build-tomcat6.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/build-tomcat6.xml rename to modules/services/web-container/tomcat/6.0.x/ant/src/main/resources/build-tomcat6.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/pom.xml b/modules/services/web-container/tomcat/6.0.x/core/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/pom.xml rename to modules/services/web-container/tomcat/6.0.x/core/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/connector/Response.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/connector/Response.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/connector/Response.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/connector/Response.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/startup/TldConfig.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/startup/TldConfig.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/startup/TldConfig.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/startup/TldConfig.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/util/DefaultAnnotationProcessor.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/util/DefaultAnnotationProcessor.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/util/DefaultAnnotationProcessor.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/catalina/util/DefaultAnnotationProcessor.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/CheckOpenResourcesValve.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/CheckOpenResourcesValve.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/CheckOpenResourcesValve.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/CheckOpenResourcesValve.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/FilterValveWrapper.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/FilterValveWrapper.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/FilterValveWrapper.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/FilterValveWrapper.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JCatalinaRuleSet.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JCatalinaRuleSet.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JCatalinaRuleSet.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JCatalinaRuleSet.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JOnASContextConfig.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JOnASContextConfig.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JOnASContextConfig.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JOnASContextConfig.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JOnASStandardContext.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JOnASStandardContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JOnASStandardContext.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/JOnASStandardContext.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ResetAuthenticationValve.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ResetAuthenticationValve.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ResetAuthenticationValve.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ResetAuthenticationValve.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/Tomcat6Service.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/Tomcat6Service.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/Tomcat6Service.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/Tomcat6Service.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/custom/ContextCustomizer.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/custom/ContextCustomizer.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/custom/ContextCustomizer.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/custom/ContextCustomizer.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/handler/DirContextURLStreamHandlerService.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/handler/DirContextURLStreamHandlerService.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/handler/DirContextURLStreamHandlerService.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/handler/DirContextURLStreamHandlerService.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/loader/NoSystemAccessWebappClassLoader.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/loader/NoSystemAccessWebappClassLoader.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/loader/NoSystemAccessWebappClassLoader.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/loader/NoSystemAccessWebappClassLoader.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/OSGiInstanceTldCacheListener.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/OSGiInstanceTldCacheListener.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/OSGiInstanceTldCacheListener.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/OSGiInstanceTldCacheListener.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/OSGiTldListener.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/OSGiTldListener.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/OSGiTldListener.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/OSGiTldListener.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/HttpServiceFactory.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/HttpServiceFactory.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/HttpServiceFactory.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/HttpServiceFactory.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/HttpServiceImpl.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/HttpServiceImpl.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/HttpServiceImpl.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/HttpServiceImpl.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIContext.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIContext.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIContext.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIServletContext.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIServletContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIServletContext.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIServletContext.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIWrapper.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIWrapper.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIWrapper.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/osgi/httpservice/OSGIWrapper.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/security/Realm.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/security/Realm.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/security/Realm.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/security/Realm.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/tx/TransactionValve.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/tx/TransactionValve.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/tx/TransactionValve.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/tx/TransactionValve.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/AbsVirtualContext.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/AbsVirtualContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/AbsVirtualContext.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/AbsVirtualContext.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/ContextFinder.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/ContextFinder.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/ContextFinder.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/ContextFinder.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/FilteredOutputStream.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/FilteredOutputStream.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/FilteredOutputStream.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/FilteredOutputStream.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VersionedPathBean.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VersionedPathBean.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VersionedPathBean.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VersionedPathBean.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VersioningValve.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VersioningValve.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VersioningValve.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VersioningValve.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VirtualContext.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VirtualContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VirtualContext.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VirtualContext.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VirtualContextMBean.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VirtualContextMBean.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VirtualContextMBean.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/VirtualContextMBean.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/WebModuleContext.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/WebModuleContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/WebModuleContext.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/versioning/WebModuleContext.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/EndpointInstanceListener.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/EndpointInstanceListener.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/EndpointInstanceListener.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/EndpointInstanceListener.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/URLUtils.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/URLUtils.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/URLUtils.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/URLUtils.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WSContextLifecycleListener.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WSContextLifecycleListener.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WSContextLifecycleListener.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WSContextLifecycleListener.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WSDeployment.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WSDeployment.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WSDeployment.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WSDeployment.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WebServiceEndpointStandardWrapper.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WebServiceEndpointStandardWrapper.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WebServiceEndpointStandardWrapper.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WebServiceEndpointStandardWrapper.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WebservicesWebDeployer.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WebservicesWebDeployer.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WebservicesWebDeployer.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/WebservicesWebDeployer.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/security/SecureWebDeploymentDescBuilder.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/security/SecureWebDeploymentDescBuilder.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/security/SecureWebDeploymentDescBuilder.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/security/SecureWebDeploymentDescBuilder.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/EjbJarContextNamingStrategy.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/EjbJarContextNamingStrategy.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/EjbJarContextNamingStrategy.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/EjbJarContextNamingStrategy.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/FixedContextNamingStrategy.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/FixedContextNamingStrategy.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/FixedContextNamingStrategy.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/FixedContextNamingStrategy.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/ServiceContextNamingStrategy.java b/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/ServiceContextNamingStrategy.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/ServiceContextNamingStrategy.java rename to modules/services/web-container/tomcat/6.0.x/core/src/main/java/org/ow2/jonas/web/tomcat6/ws/strategy/ServiceContextNamingStrategy.java diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-context.xml b/modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-context.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-context.xml rename to modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-context.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-server.xml b/modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-server.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-server.xml rename to modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-server.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-web.xml b/modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-web.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-web.xml rename to modules/services/web-container/tomcat/6.0.x/core/src/main/jonas-resources/conf/tomcat6-web.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/patches/Response.patch b/modules/services/web-container/tomcat/6.0.x/core/src/main/patches/Response.patch similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/patches/Response.patch rename to modules/services/web-container/tomcat/6.0.x/core/src/main/patches/Response.patch diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/properties/jonas-web-tomcat6.properties b/modules/services/web-container/tomcat/6.0.x/core/src/main/properties/jonas-web-tomcat6.properties similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/properties/jonas-web-tomcat6.properties rename to modules/services/web-container/tomcat/6.0.x/core/src/main/properties/jonas-web-tomcat6.properties diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/resources/META-INF/jonas-web-container-tomcat-6.0-core.bnd b/modules/services/web-container/tomcat/6.0.x/core/src/main/resources/META-INF/jonas-web-container-tomcat-6.0-core.bnd similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/resources/META-INF/jonas-web-container-tomcat-6.0-core.bnd rename to modules/services/web-container/tomcat/6.0.x/core/src/main/resources/META-INF/jonas-web-container-tomcat-6.0-core.bnd diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/resources/metadata.xml b/modules/services/web-container/tomcat/6.0.x/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/resources/metadata.xml rename to modules/services/web-container/tomcat/6.0.x/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/resources/org/ow2/jonas/web/tomcat6/mbeans-descriptors.xml b/modules/services/web-container/tomcat/6.0.x/core/src/main/resources/org/ow2/jonas/web/tomcat6/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/core/src/main/resources/org/ow2/jonas/web/tomcat6/mbeans-descriptors.xml rename to modules/services/web-container/tomcat/6.0.x/core/src/main/resources/org/ow2/jonas/web/tomcat6/mbeans-descriptors.xml diff --git a/jonas/modules/services/web-container/tomcat/6.0.x/pom.xml b/modules/services/web-container/tomcat/6.0.x/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/6.0.x/pom.xml rename to modules/services/web-container/tomcat/6.0.x/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/addons/addon-with-deployment-plans/pom.xml b/modules/services/web-container/tomcat/7.0.x/addons/addon-with-deployment-plans/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/addons/addon-with-deployment-plans/pom.xml rename to modules/services/web-container/tomcat/7.0.x/addons/addon-with-deployment-plans/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/addons/addon-with-deployment-plans/src/main/assembly/assembly.xml b/modules/services/web-container/tomcat/7.0.x/addons/addon-with-deployment-plans/src/main/assembly/assembly.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/addons/addon-with-deployment-plans/src/main/assembly/assembly.xml rename to modules/services/web-container/tomcat/7.0.x/addons/addon-with-deployment-plans/src/main/assembly/assembly.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/addons/pom.xml b/modules/services/web-container/tomcat/7.0.x/addons/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/addons/pom.xml rename to modules/services/web-container/tomcat/7.0.x/addons/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/addons/src/main/resources/META-INF/jonas-addon.xml b/modules/services/web-container/tomcat/7.0.x/addons/src/main/resources/META-INF/jonas-addon.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/addons/src/main/resources/META-INF/jonas-addon.xml rename to modules/services/web-container/tomcat/7.0.x/addons/src/main/resources/META-INF/jonas-addon.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/ant/pom.xml b/modules/services/web-container/tomcat/7.0.x/ant/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/ant/pom.xml rename to modules/services/web-container/tomcat/7.0.x/ant/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat7/Tomcat7.java b/modules/services/web-container/tomcat/7.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat7/Tomcat7.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat7/Tomcat7.java rename to modules/services/web-container/tomcat/7.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat7/Tomcat7.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat7/Tomcat7Connectors.java b/modules/services/web-container/tomcat/7.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat7/Tomcat7Connectors.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat7/Tomcat7Connectors.java rename to modules/services/web-container/tomcat/7.0.x/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat7/Tomcat7Connectors.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/antlib-tomcat7.xml b/modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/antlib-tomcat7.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/antlib-tomcat7.xml rename to modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/antlib-tomcat7.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/build-tomcat7.properties b/modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/build-tomcat7.properties similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/build-tomcat7.properties rename to modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/build-tomcat7.properties diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/build-tomcat7.xml b/modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/build-tomcat7.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/build-tomcat7.xml rename to modules/services/web-container/tomcat/7.0.x/ant/src/main/resources/build-tomcat7.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/pom.xml b/modules/services/web-container/tomcat/7.0.x/core/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/pom.xml rename to modules/services/web-container/tomcat/7.0.x/core/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/apache/AnnotationProcessor.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/apache/AnnotationProcessor.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/apache/AnnotationProcessor.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/apache/AnnotationProcessor.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/CheckOpenResourcesValve.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/CheckOpenResourcesValve.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/CheckOpenResourcesValve.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/CheckOpenResourcesValve.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/FilterValveWrapper.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/FilterValveWrapper.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/FilterValveWrapper.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/FilterValveWrapper.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JCatalinaRuleSet.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JCatalinaRuleSet.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JCatalinaRuleSet.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JCatalinaRuleSet.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASContextConfig.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASContextConfig.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASContextConfig.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASContextConfig.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASNamingResources.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASNamingResources.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASNamingResources.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASNamingResources.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASStandardContext.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASStandardContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASStandardContext.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/JOnASStandardContext.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ResetAuthenticationValve.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ResetAuthenticationValve.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ResetAuthenticationValve.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ResetAuthenticationValve.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/Tomcat7Service.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/Tomcat7Service.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/Tomcat7Service.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/Tomcat7Service.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/custom/ContextCustomizer.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/custom/ContextCustomizer.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/custom/ContextCustomizer.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/custom/ContextCustomizer.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/handler/DirContextURLStreamHandlerService.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/handler/DirContextURLStreamHandlerService.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/handler/DirContextURLStreamHandlerService.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/handler/DirContextURLStreamHandlerService.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/loader/NoSystemAccessWebappClassLoader.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/loader/NoSystemAccessWebappClassLoader.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/loader/NoSystemAccessWebappClassLoader.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/loader/NoSystemAccessWebappClassLoader.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/OSGiInstanceTldCacheListener.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/OSGiInstanceTldCacheListener.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/OSGiInstanceTldCacheListener.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/OSGiInstanceTldCacheListener.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/OSGiTldListener.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/OSGiTldListener.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/OSGiTldListener.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/OSGiTldListener.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7AjpConnector.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7AjpConnector.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7AjpConnector.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7AjpConnector.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7Connector.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7Connector.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7Connector.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7Connector.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7HttpConnector.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7HttpConnector.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7HttpConnector.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7HttpConnector.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7HttpsConnector.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7HttpsConnector.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7HttpsConnector.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/configadmin/Tomcat7HttpsConnector.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/HttpServiceFactory.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/HttpServiceFactory.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/HttpServiceFactory.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/HttpServiceFactory.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/HttpServiceImpl.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/HttpServiceImpl.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/HttpServiceImpl.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/HttpServiceImpl.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIContext.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIContext.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIContext.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIServletContext.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIServletContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIServletContext.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIServletContext.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIWrapper.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIWrapper.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIWrapper.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/osgi/httpservice/OSGIWrapper.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/security/Realm.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/security/Realm.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/security/Realm.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/security/Realm.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/tx/TransactionValve.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/tx/TransactionValve.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/tx/TransactionValve.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/tx/TransactionValve.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/AbsVirtualContext.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/AbsVirtualContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/AbsVirtualContext.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/AbsVirtualContext.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/ContextFinder.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/ContextFinder.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/ContextFinder.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/ContextFinder.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/EmptyServlet.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/EmptyServlet.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/EmptyServlet.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/EmptyServlet.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/FilteredOutputStream.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/FilteredOutputStream.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/FilteredOutputStream.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/FilteredOutputStream.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VersionedPathBean.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VersionedPathBean.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VersionedPathBean.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VersionedPathBean.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VersioningValve.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VersioningValve.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VersioningValve.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VersioningValve.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VirtualContext.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VirtualContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VirtualContext.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VirtualContext.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VirtualContextMBean.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VirtualContextMBean.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VirtualContextMBean.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/VirtualContextMBean.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/WebModuleContext.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/WebModuleContext.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/WebModuleContext.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/versioning/WebModuleContext.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/EndpointInstanceListener.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/EndpointInstanceListener.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/EndpointInstanceListener.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/EndpointInstanceListener.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/URLUtils.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/URLUtils.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/URLUtils.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/URLUtils.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WSContextLifecycleListener.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WSContextLifecycleListener.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WSContextLifecycleListener.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WSContextLifecycleListener.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WSDeployment.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WSDeployment.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WSDeployment.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WSDeployment.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WebServiceEndpointStandardWrapper.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WebServiceEndpointStandardWrapper.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WebServiceEndpointStandardWrapper.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WebServiceEndpointStandardWrapper.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WebservicesWebDeployer.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WebservicesWebDeployer.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WebservicesWebDeployer.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/WebservicesWebDeployer.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/security/SecureWebDeploymentDescBuilder.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/security/SecureWebDeploymentDescBuilder.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/security/SecureWebDeploymentDescBuilder.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/security/SecureWebDeploymentDescBuilder.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/EjbJarContextNamingStrategy.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/EjbJarContextNamingStrategy.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/EjbJarContextNamingStrategy.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/EjbJarContextNamingStrategy.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/FixedContextNamingStrategy.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/FixedContextNamingStrategy.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/FixedContextNamingStrategy.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/FixedContextNamingStrategy.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/ServiceContextNamingStrategy.java b/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/ServiceContextNamingStrategy.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/ServiceContextNamingStrategy.java rename to modules/services/web-container/tomcat/7.0.x/core/src/main/java/org/ow2/jonas/web/tomcat7/ws/strategy/ServiceContextNamingStrategy.java diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-context.xml b/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-context.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-context.xml rename to modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-context.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-server.xml b/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-server.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-server.xml rename to modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-server.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-web.xml b/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-web.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-web.xml rename to modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/conf/tomcat7-web.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy-example/tomcat7-ajp-connector.xml b/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy-example/tomcat7-ajp-connector.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy-example/tomcat7-ajp-connector.xml rename to modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy-example/tomcat7-ajp-connector.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy-example/tomcat7-https-connector.xml b/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy-example/tomcat7-https-connector.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy-example/tomcat7-https-connector.xml rename to modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy-example/tomcat7-https-connector.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy/tomcat7-http-connector.xml b/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy/tomcat7-http-connector.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy/tomcat7-http-connector.xml rename to modules/services/web-container/tomcat/7.0.x/core/src/main/jonas-resources/deploy/tomcat7-http-connector.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/patches/DefaultInstanceManager.patch b/modules/services/web-container/tomcat/7.0.x/core/src/main/patches/DefaultInstanceManager.patch similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/patches/DefaultInstanceManager.patch rename to modules/services/web-container/tomcat/7.0.x/core/src/main/patches/DefaultInstanceManager.patch diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/patches/Response.patch b/modules/services/web-container/tomcat/7.0.x/core/src/main/patches/Response.patch similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/patches/Response.patch rename to modules/services/web-container/tomcat/7.0.x/core/src/main/patches/Response.patch diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/patches/TagLibraryInfoImpl.patch b/modules/services/web-container/tomcat/7.0.x/core/src/main/patches/TagLibraryInfoImpl.patch similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/patches/TagLibraryInfoImpl.patch rename to modules/services/web-container/tomcat/7.0.x/core/src/main/patches/TagLibraryInfoImpl.patch diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/properties/jonas-web-tomcat7.properties b/modules/services/web-container/tomcat/7.0.x/core/src/main/properties/jonas-web-tomcat7.properties similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/properties/jonas-web-tomcat7.properties rename to modules/services/web-container/tomcat/7.0.x/core/src/main/properties/jonas-web-tomcat7.properties diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/META-INF/jonas-web-container-tomcat-7.0-core.bnd b/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/META-INF/jonas-web-container-tomcat-7.0-core.bnd similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/META-INF/jonas-web-container-tomcat-7.0-core.bnd rename to modules/services/web-container/tomcat/7.0.x/core/src/main/resources/META-INF/jonas-web-container-tomcat-7.0-core.bnd diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/metadata.xml b/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/metadata.xml rename to modules/services/web-container/tomcat/7.0.x/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/org/apache/catalina/startup/catalina.properties b/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/org/apache/catalina/startup/catalina.properties similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/org/apache/catalina/startup/catalina.properties rename to modules/services/web-container/tomcat/7.0.x/core/src/main/resources/org/apache/catalina/startup/catalina.properties diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/org/ow2/jonas/web/tomcat7/mbeans-descriptors.xml b/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/org/ow2/jonas/web/tomcat7/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/core/src/main/resources/org/ow2/jonas/web/tomcat7/mbeans-descriptors.xml rename to modules/services/web-container/tomcat/7.0.x/core/src/main/resources/org/ow2/jonas/web/tomcat7/mbeans-descriptors.xml diff --git a/jonas/modules/services/web-container/tomcat/7.0.x/pom.xml b/modules/services/web-container/tomcat/7.0.x/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/7.0.x/pom.xml rename to modules/services/web-container/tomcat/7.0.x/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/base/pom.xml b/modules/services/web-container/tomcat/base/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/base/pom.xml rename to modules/services/web-container/tomcat/base/pom.xml diff --git a/jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/Tomcat.java b/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/Tomcat.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/Tomcat.java rename to modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/Tomcat.java diff --git a/jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatAjp.java b/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatAjp.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatAjp.java rename to modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatAjp.java diff --git a/jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatConnectors.java b/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatConnectors.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatConnectors.java rename to modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatConnectors.java diff --git a/jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatHttp.java b/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatHttp.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatHttp.java rename to modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatHttp.java diff --git a/jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatHttps.java b/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatHttps.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatHttps.java rename to modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatHttps.java diff --git a/jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatSessionManager.java b/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatSessionManager.java similarity index 100% rename from jonas/modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatSessionManager.java rename to modules/services/web-container/tomcat/base/src/main/java/org/ow2/jonas/antmodular/jonasbase/web/tomcat/TomcatSessionManager.java diff --git a/jonas/modules/services/web-container/tomcat/pom.xml b/modules/services/web-container/tomcat/pom.xml similarity index 100% rename from jonas/modules/services/web-container/tomcat/pom.xml rename to modules/services/web-container/tomcat/pom.xml diff --git a/jonas/modules/services/webservices/axis/core/pom.xml b/modules/services/webservices/axis/core/pom.xml similarity index 100% rename from jonas/modules/services/webservices/axis/core/pom.xml rename to modules/services/webservices/axis/core/pom.xml diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/AxisService.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/AxisService.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/AxisService.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/AxisService.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JAxisServiceFactory.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JAxisServiceFactory.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JAxisServiceFactory.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JAxisServiceFactory.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JAxisServlet.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JAxisServlet.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JAxisServlet.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JAxisServlet.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JCall.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JCall.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JCall.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JCall.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JOnASEJBProvider.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JOnASEJBProvider.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JOnASEJBProvider.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JOnASEJBProvider.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JService.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JService.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JService.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JService.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JServiceProxy.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JServiceProxy.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JServiceProxy.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JServiceProxy.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JServletEngineConfigurationFactory.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JServletEngineConfigurationFactory.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JServletEngineConfigurationFactory.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JServletEngineConfigurationFactory.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JonasHandler.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JonasHandler.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JonasHandler.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/JonasHandler.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/NoopProvider.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/NoopProvider.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/NoopProvider.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/NoopProvider.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/QSUpdateServiceWSDLHandler.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/QSUpdateServiceWSDLHandler.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/QSUpdateServiceWSDLHandler.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/QSUpdateServiceWSDLHandler.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/URLMapper.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/URLMapper.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/URLMapper.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/URLMapper.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/WSDDJOnASEJBProvider.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/WSDDJOnASEJBProvider.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/WSDDJOnASEJBProvider.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/WSDDJOnASEJBProvider.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/WSDDNoopProvider.java b/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/WSDDNoopProvider.java similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/WSDDNoopProvider.java rename to modules/services/webservices/axis/core/src/main/java/org/ow2/jonas/ws/axis/WSDDNoopProvider.java diff --git a/jonas/modules/services/webservices/axis/core/src/main/resources/META-INF/jonas-webservices-axis-core.bnd b/modules/services/webservices/axis/core/src/main/resources/META-INF/jonas-webservices-axis-core.bnd similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/resources/META-INF/jonas-webservices-axis-core.bnd rename to modules/services/webservices/axis/core/src/main/resources/META-INF/jonas-webservices-axis-core.bnd diff --git a/jonas/modules/services/webservices/axis/core/src/main/resources/META-INF/services/org.apache.axis.EngineConfigurationFactory b/modules/services/webservices/axis/core/src/main/resources/META-INF/services/org.apache.axis.EngineConfigurationFactory similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/resources/META-INF/services/org.apache.axis.EngineConfigurationFactory rename to modules/services/webservices/axis/core/src/main/resources/META-INF/services/org.apache.axis.EngineConfigurationFactory diff --git a/jonas/modules/services/webservices/axis/core/src/main/resources/metadata.xml b/modules/services/webservices/axis/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/resources/metadata.xml rename to modules/services/webservices/axis/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/I18n.properties b/modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/I18n.properties similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/I18n.properties rename to modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/I18n.properties diff --git a/jonas/modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/client-config.wsdd b/modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/client-config.wsdd similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/client-config.wsdd rename to modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/client-config.wsdd diff --git a/jonas/modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/server-config.wsdd b/modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/server-config.wsdd similarity index 100% rename from jonas/modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/server-config.wsdd rename to modules/services/webservices/axis/core/src/main/resources/org/ow2/jonas/ws/axis/server-config.wsdd diff --git a/jonas/modules/services/webservices/axis/pom.xml b/modules/services/webservices/axis/pom.xml similarity index 100% rename from jonas/modules/services/webservices/axis/pom.xml rename to modules/services/webservices/axis/pom.xml diff --git a/jonas/modules/services/webservices/axis2/core/pom.xml b/modules/services/webservices/axis2/core/pom.xml similarity index 100% rename from jonas/modules/services/webservices/axis2/core/pom.xml rename to modules/services/webservices/axis2/core/pom.xml diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/Axis2Service.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/Axis2Service.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/Axis2Service.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/Axis2Service.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/JOnASJaxWsImplementorInfo.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/JOnASJaxWsImplementorInfo.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/JOnASJaxWsImplementorInfo.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/JOnASJaxWsImplementorInfo.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/JaxWsImplementorInfo.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/JaxWsImplementorInfo.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/JaxWsImplementorInfo.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/JaxWsImplementorInfo.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EJBWebserviceEndpoint.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EJBWebserviceEndpoint.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EJBWebserviceEndpoint.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EJBWebserviceEndpoint.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EjbMessageReceiver.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EjbMessageReceiver.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EjbMessageReceiver.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EjbMessageReceiver.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointController.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointController.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointController.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointController.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointLifecycleManager.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointLifecycleManager.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointLifecycleManager.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointLifecycleManager.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointLifecycleManagerFactory.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointLifecycleManagerFactory.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointLifecycleManagerFactory.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2EndpointLifecycleManagerFactory.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2ServiceDispatcher.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2ServiceDispatcher.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2ServiceDispatcher.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/Axis2ServiceDispatcher.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/EasybeansAxis2Invoker.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/EasybeansAxis2Invoker.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/EasybeansAxis2Invoker.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/EasybeansAxis2Invoker.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/Axis2ConfigurationExtension.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/Axis2ConfigurationExtension.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/Axis2ConfigurationExtension.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/Axis2ConfigurationExtension.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/JAXWS20ResourceInjector.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/JAXWS20ResourceInjector.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/JAXWS20ResourceInjector.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/JAXWS20ResourceInjector.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/LifeCycleCallback.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/LifeCycleCallback.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/LifeCycleCallback.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/LifeCycleCallback.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/WebServiceContextInjectionHandler.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/WebServiceContextInjectionHandler.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/WebServiceContextInjectionHandler.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/easybeans/ext/WebServiceContextInjectionHandler.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/Axis2RequestResponseTransport.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/Axis2RequestResponseTransport.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/Axis2RequestResponseTransport.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/Axis2RequestResponseTransport.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/Axis2TransportInfo.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/Axis2TransportInfo.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/Axis2TransportInfo.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/Axis2TransportInfo.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/AxisServiceGenerator.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/AxisServiceGenerator.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/AxisServiceGenerator.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/AxisServiceGenerator.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/WSDLQueryHandler.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/WSDLQueryHandler.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/WSDLQueryHandler.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/http/WSDLQueryHandler.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/Axis2WSEndpoint.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/Axis2WSEndpoint.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/Axis2WSEndpoint.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/Axis2WSEndpoint.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/WebservicesContainer.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/WebservicesContainer.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/WebservicesContainer.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/WebservicesContainer.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/AttachmentDescriptionImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/AttachmentDescriptionImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/AttachmentDescriptionImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/AttachmentDescriptionImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/DescriptionFactoryImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/DescriptionFactoryImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/DescriptionFactoryImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/DescriptionFactoryImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/DescriptionUtils.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/DescriptionUtils.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/DescriptionUtils.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/DescriptionUtils.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/EndpointDescriptionImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/EndpointDescriptionImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/EndpointDescriptionImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/EndpointDescriptionImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/FaultDescriptionImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/FaultDescriptionImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/FaultDescriptionImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/FaultDescriptionImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/OperationDescriptionImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/OperationDescriptionImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/OperationDescriptionImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/OperationDescriptionImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/ParameterDescriptionImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/ParameterDescriptionImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/ParameterDescriptionImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/ParameterDescriptionImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/PortInfoImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/PortInfoImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/PortInfoImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/PortInfoImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/ServiceDescriptionImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/ServiceDescriptionImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/ServiceDescriptionImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/ServiceDescriptionImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/URIResolverImpl.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/URIResolverImpl.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/URIResolverImpl.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/jaxws/description/impl/URIResolverImpl.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/Axis2Java2WSDLBuilder.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/Axis2Java2WSDLBuilder.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/Axis2Java2WSDLBuilder.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/Axis2Java2WSDLBuilder.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/AxisService2WSDL11.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/AxisService2WSDL11.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/AxisService2WSDL11.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/AxisService2WSDL11.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/JAXWSTools.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/JAXWSTools.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/JAXWSTools.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/JAXWSTools.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/JAXWSUtils.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/JAXWSUtils.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/JAXWSUtils.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/JAXWSUtils.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/SimpleURIResolver.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/SimpleURIResolver.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/SimpleURIResolver.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/SimpleURIResolver.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/SimpleWSDLLocator.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/SimpleWSDLLocator.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/SimpleWSDLLocator.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/SimpleWSDLLocator.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/WSDLUtils.java b/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/WSDLUtils.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/WSDLUtils.java rename to modules/services/webservices/axis2/core/src/main/java/org/ow2/jonas/ws/axis2/util/WSDLUtils.java diff --git a/jonas/modules/services/webservices/axis2/core/src/main/resources/META-INF/axis2.xml b/modules/services/webservices/axis2/core/src/main/resources/META-INF/axis2.xml similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/resources/META-INF/axis2.xml rename to modules/services/webservices/axis2/core/src/main/resources/META-INF/axis2.xml diff --git a/jonas/modules/services/webservices/axis2/core/src/main/resources/META-INF/jonas-webservices-axis2-core.bnd b/modules/services/webservices/axis2/core/src/main/resources/META-INF/jonas-webservices-axis2-core.bnd similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/resources/META-INF/jonas-webservices-axis2-core.bnd rename to modules/services/webservices/axis2/core/src/main/resources/META-INF/jonas-webservices-axis2-core.bnd diff --git a/jonas/modules/services/webservices/axis2/core/src/main/resources/metadata.xml b/modules/services/webservices/axis2/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/main/resources/metadata.xml rename to modules/services/webservices/axis2/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/ejb3/JAXWSBean.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/ejb3/JAXWSBean.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/ejb3/JAXWSBean.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/ejb3/JAXWSBean.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/ejb3/JAXWSGreeter.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/ejb3/JAXWSGreeter.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/ejb3/JAXWSGreeter.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/ejb3/JAXWSGreeter.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/HelloService.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/HelloService.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/HelloService.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/HelloService.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/word/Word.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/word/Word.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/word/Word.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/word/Word.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/test/Axis2HandlerChainTest.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/test/Axis2HandlerChainTest.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/test/Axis2HandlerChainTest.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/test/Axis2HandlerChainTest.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/test/Axis2WSEndpointTest.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/test/Axis2WSEndpointTest.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/test/Axis2WSEndpointTest.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/axis2/test/Axis2WSEndpointTest.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletInputStreamForTest.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletInputStreamForTest.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletInputStreamForTest.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletInputStreamForTest.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletOutputStreamForTest.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletOutputStreamForTest.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletOutputStreamForTest.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletOutputStreamForTest.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletRequestAdapterForTest.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletRequestAdapterForTest.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletRequestAdapterForTest.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletRequestAdapterForTest.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletResponseAdapterForTest.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletResponseAdapterForTest.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletResponseAdapterForTest.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/ServletResponseAdapterForTest.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/StatelessSessionFactoryForTest.java b/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/StatelessSessionFactoryForTest.java similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/StatelessSessionFactoryForTest.java rename to modules/services/webservices/axis2/core/src/test/java/org/ow2/jonas/ws/jaxws/http/servlet/test/StatelessSessionFactoryForTest.java diff --git a/jonas/modules/services/webservices/axis2/core/src/test/resources/WEB-INF/handlers.xml b/modules/services/webservices/axis2/core/src/test/resources/WEB-INF/handlers.xml similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/resources/WEB-INF/handlers.xml rename to modules/services/webservices/axis2/core/src/test/resources/WEB-INF/handlers.xml diff --git a/jonas/modules/services/webservices/axis2/core/src/test/resources/WEB-INF/test_service_pojo.xml b/modules/services/webservices/axis2/core/src/test/resources/WEB-INF/test_service_pojo.xml similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/resources/WEB-INF/test_service_pojo.xml rename to modules/services/webservices/axis2/core/src/test/resources/WEB-INF/test_service_pojo.xml diff --git a/jonas/modules/services/webservices/axis2/core/src/test/resources/WEB-INF/wsdl/TestPojo.wsdl b/modules/services/webservices/axis2/core/src/test/resources/WEB-INF/wsdl/TestPojo.wsdl similarity index 100% rename from jonas/modules/services/webservices/axis2/core/src/test/resources/WEB-INF/wsdl/TestPojo.wsdl rename to modules/services/webservices/axis2/core/src/test/resources/WEB-INF/wsdl/TestPojo.wsdl diff --git a/jonas/modules/services/webservices/axis2/pom.xml b/modules/services/webservices/axis2/pom.xml similarity index 100% rename from jonas/modules/services/webservices/axis2/pom.xml rename to modules/services/webservices/axis2/pom.xml diff --git a/jonas/modules/services/webservices/cxf/core/pom.xml b/modules/services/webservices/cxf/core/pom.xml similarity index 100% rename from jonas/modules/services/webservices/cxf/core/pom.xml rename to modules/services/webservices/cxf/core/pom.xml diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/BusCreator.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/BusCreator.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/BusCreator.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/BusCreator.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/CXFService.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/CXFService.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/CXFService.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/CXFService.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/JOnASJaxWsImplementorInfo.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/JOnASJaxWsImplementorInfo.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/JOnASJaxWsImplementorInfo.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/JOnASJaxWsImplementorInfo.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/JOnASJaxWsServerFactoryBean.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/JOnASJaxWsServerFactoryBean.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/JOnASJaxWsServerFactoryBean.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/JOnASJaxWsServerFactoryBean.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/CxfWebServiceRefBuilder.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/CxfWebServiceRefBuilder.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/CxfWebServiceRefBuilder.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/CxfWebServiceRefBuilder.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/factory/CxfWebServiceRefObjectFactory.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/factory/CxfWebServiceRefObjectFactory.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/factory/CxfWebServiceRefObjectFactory.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/factory/CxfWebServiceRefObjectFactory.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/factory/HandlerResolverDelegate.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/factory/HandlerResolverDelegate.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/factory/HandlerResolverDelegate.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/client/factory/HandlerResolverDelegate.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/CXFEJBWebserviceEndpoint.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/CXFEJBWebserviceEndpoint.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/CXFEJBWebserviceEndpoint.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/CXFEJBWebserviceEndpoint.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/CXFResourceInjector.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/CXFResourceInjector.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/CXFResourceInjector.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/CXFResourceInjector.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansInvokerFactory.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansInvokerFactory.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansInvokerFactory.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansInvokerFactory.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansJaxWsServerFactoryBean.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansJaxWsServerFactoryBean.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansJaxWsServerFactoryBean.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansJaxWsServerFactoryBean.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansJaxWsServiceFactoryBean.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansJaxWsServiceFactoryBean.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansJaxWsServiceFactoryBean.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansJaxWsServiceFactoryBean.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansMethodInvoker.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansMethodInvoker.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansMethodInvoker.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/EasyBeansMethodInvoker.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/CXFConfigurationExtension.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/CXFConfigurationExtension.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/CXFConfigurationExtension.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/CXFConfigurationExtension.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/JAXWS20ResourceInjector.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/JAXWS20ResourceInjector.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/JAXWS20ResourceInjector.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/JAXWS20ResourceInjector.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/LifeCycleCallback.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/LifeCycleCallback.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/LifeCycleCallback.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/LifeCycleCallback.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/WebServiceContextInjectionHandler.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/WebServiceContextInjectionHandler.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/WebServiceContextInjectionHandler.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/easybeans/ext/WebServiceContextInjectionHandler.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/http/JOnASDestination.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/http/JOnASDestination.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/http/JOnASDestination.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/http/JOnASDestination.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/http/JOnASHTTPTransportFactory.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/http/JOnASHTTPTransportFactory.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/http/JOnASHTTPTransportFactory.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/http/JOnASHTTPTransportFactory.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/jaxws/CXFWSEndpoint.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/jaxws/CXFWSEndpoint.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/jaxws/CXFWSEndpoint.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/jaxws/CXFWSEndpoint.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/jaxws/WebservicesContainer.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/jaxws/WebservicesContainer.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/jaxws/WebservicesContainer.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/jaxws/WebservicesContainer.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/util/WSDLUtils.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/util/WSDLUtils.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/util/WSDLUtils.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/util/WSDLUtils.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/wsdl/ContainerWsdlInterceptor.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/wsdl/ContainerWsdlInterceptor.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/wsdl/ContainerWsdlInterceptor.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/wsdl/ContainerWsdlInterceptor.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/wsdl/WsdlUpdater.java b/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/wsdl/WsdlUpdater.java similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/wsdl/WsdlUpdater.java rename to modules/services/webservices/cxf/core/src/main/java/org/ow2/jonas/ws/cxf/wsdl/WsdlUpdater.java diff --git a/jonas/modules/services/webservices/cxf/core/src/main/resources/META-INF/jonas-webservices-cxf-core.bnd b/modules/services/webservices/cxf/core/src/main/resources/META-INF/jonas-webservices-cxf-core.bnd similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/resources/META-INF/jonas-webservices-cxf-core.bnd rename to modules/services/webservices/cxf/core/src/main/resources/META-INF/jonas-webservices-cxf-core.bnd diff --git a/jonas/modules/services/webservices/cxf/core/src/main/resources/metadata.xml b/modules/services/webservices/cxf/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/webservices/cxf/core/src/main/resources/metadata.xml rename to modules/services/webservices/cxf/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/webservices/cxf/pom.xml b/modules/services/webservices/cxf/pom.xml similarity index 100% rename from jonas/modules/services/webservices/cxf/pom.xml rename to modules/services/webservices/cxf/pom.xml diff --git a/jonas/modules/services/webservices/jaxrpc/ant/pom.xml b/modules/services/webservices/jaxrpc/ant/pom.xml similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/ant/pom.xml rename to modules/services/webservices/jaxrpc/ant/pom.xml diff --git a/jonas/modules/services/webservices/jaxrpc/ant/src/main/java/org/ow2/jonas/antmodular/jaxrpc/WsGenTask.java b/modules/services/webservices/jaxrpc/ant/src/main/java/org/ow2/jonas/antmodular/jaxrpc/WsGenTask.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/ant/src/main/java/org/ow2/jonas/antmodular/jaxrpc/WsGenTask.java rename to modules/services/webservices/jaxrpc/ant/src/main/java/org/ow2/jonas/antmodular/jaxrpc/WsGenTask.java diff --git a/jonas/modules/services/webservices/jaxrpc/ant/src/main/resources/antlib-wsgen.xml b/modules/services/webservices/jaxrpc/ant/src/main/resources/antlib-wsgen.xml similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/ant/src/main/resources/antlib-wsgen.xml rename to modules/services/webservices/jaxrpc/ant/src/main/resources/antlib-wsgen.xml diff --git a/jonas/modules/services/webservices/jaxrpc/core/pom.xml b/modules/services/webservices/jaxrpc/core/pom.xml similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/pom.xml rename to modules/services/webservices/jaxrpc/core/pom.xml diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/ClientJServiceFactoryFinder.java b/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/ClientJServiceFactoryFinder.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/ClientJServiceFactoryFinder.java rename to modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/ClientJServiceFactoryFinder.java diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/JAXRPCService.java b/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/JAXRPCService.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/JAXRPCService.java rename to modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/JAXRPCService.java diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/JAXRPCServiceMBean.java b/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/JAXRPCServiceMBean.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/JAXRPCServiceMBean.java rename to modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/base/JAXRPCServiceMBean.java diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/factory/JServiceFactory.java b/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/factory/JServiceFactory.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/factory/JServiceFactory.java rename to modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/factory/JServiceFactory.java diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/AbstractWebServiceMBean.java b/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/AbstractWebServiceMBean.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/AbstractWebServiceMBean.java rename to modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/AbstractWebServiceMBean.java diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/Handler.java b/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/Handler.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/Handler.java rename to modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/Handler.java diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/PortComponent.java b/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/PortComponent.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/PortComponent.java rename to modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/PortComponent.java diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/Service.java b/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/Service.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/Service.java rename to modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/Service.java diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/WebServicesObjectName.java b/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/WebServicesObjectName.java similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/WebServicesObjectName.java rename to modules/services/webservices/jaxrpc/core/src/main/java/org/ow2/jonas/ws/jaxrpc/mbean/WebServicesObjectName.java diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/jonas-resources/bin/WsGen b/modules/services/webservices/jaxrpc/core/src/main/jonas-resources/bin/WsGen similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/jonas-resources/bin/WsGen rename to modules/services/webservices/jaxrpc/core/src/main/jonas-resources/bin/WsGen diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/jonas-resources/bin/WsGen.bat b/modules/services/webservices/jaxrpc/core/src/main/jonas-resources/bin/WsGen.bat similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/jonas-resources/bin/WsGen.bat rename to modules/services/webservices/jaxrpc/core/src/main/jonas-resources/bin/WsGen.bat diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/jonas-resources/conf/jonas-client.properties b/modules/services/webservices/jaxrpc/core/src/main/jonas-resources/conf/jonas-client.properties similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/jonas-resources/conf/jonas-client.properties rename to modules/services/webservices/jaxrpc/core/src/main/jonas-resources/conf/jonas-client.properties diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/resources/META-INF/jonas-webservices-jaxrpc-core.bnd b/modules/services/webservices/jaxrpc/core/src/main/resources/META-INF/jonas-webservices-jaxrpc-core.bnd similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/resources/META-INF/jonas-webservices-jaxrpc-core.bnd rename to modules/services/webservices/jaxrpc/core/src/main/resources/META-INF/jonas-webservices-jaxrpc-core.bnd diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/resources/org/ow2/jonas/ws/jaxrpc/base/I18n.properties b/modules/services/webservices/jaxrpc/core/src/main/resources/org/ow2/jonas/ws/jaxrpc/base/I18n.properties similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/resources/org/ow2/jonas/ws/jaxrpc/base/I18n.properties rename to modules/services/webservices/jaxrpc/core/src/main/resources/org/ow2/jonas/ws/jaxrpc/base/I18n.properties diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/resources/org/ow2/jonas/ws/jaxrpc/mbean/mbeans-descriptors.xml b/modules/services/webservices/jaxrpc/core/src/main/resources/org/ow2/jonas/ws/jaxrpc/mbean/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/resources/org/ow2/jonas/ws/jaxrpc/mbean/mbeans-descriptors.xml rename to modules/services/webservices/jaxrpc/core/src/main/resources/org/ow2/jonas/ws/jaxrpc/mbean/mbeans-descriptors.xml diff --git a/jonas/modules/services/webservices/jaxrpc/core/src/main/templates/jonas-jax-rpc.properties.template b/modules/services/webservices/jaxrpc/core/src/main/templates/jonas-jax-rpc.properties.template similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/core/src/main/templates/jonas-jax-rpc.properties.template rename to modules/services/webservices/jaxrpc/core/src/main/templates/jonas-jax-rpc.properties.template diff --git a/jonas/modules/services/webservices/jaxrpc/pom.xml b/modules/services/webservices/jaxrpc/pom.xml similarity index 100% rename from jonas/modules/services/webservices/jaxrpc/pom.xml rename to modules/services/webservices/jaxrpc/pom.xml diff --git a/jonas/modules/services/webservices/jaxws/core/pom.xml b/modules/services/webservices/jaxws/core/pom.xml similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/pom.xml rename to modules/services/webservices/jaxws/core/pom.xml diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSService.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSService.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSService.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSService.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSServiceMBean.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSServiceMBean.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSServiceMBean.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSServiceMBean.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSWebservicesContainer.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSWebservicesContainer.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSWebservicesContainer.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSWebservicesContainer.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSWebservicesModule.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSWebservicesModule.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSWebservicesModule.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/JAXWSWebservicesModule.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/AbstractJaxwsAuditHandler.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/AbstractJaxwsAuditHandler.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/AbstractJaxwsAuditHandler.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/AbstractJaxwsAuditHandler.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/JaxwsClientAuditHandler.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/JaxwsClientAuditHandler.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/JaxwsClientAuditHandler.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/JaxwsClientAuditHandler.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/JaxwsEndpointAuditHandler.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/JaxwsEndpointAuditHandler.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/JaxwsEndpointAuditHandler.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/JaxwsEndpointAuditHandler.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/mbean/AuditHandlerAdapter.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/mbean/AuditHandlerAdapter.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/mbean/AuditHandlerAdapter.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/base/audit/mbean/AuditHandlerAdapter.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/client/JAXWSWebServiceRefBuilder.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/client/JAXWSWebServiceRefBuilder.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/client/JAXWSWebServiceRefBuilder.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/client/JAXWSWebServiceRefBuilder.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/client/factory/JAXWSWebServiceRefObjectFactory.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/client/factory/JAXWSWebServiceRefObjectFactory.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/client/factory/JAXWSWebServiceRefObjectFactory.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/client/factory/JAXWSWebServiceRefObjectFactory.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/EasyBeansContextNamingInfo.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/EasyBeansContextNamingInfo.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/EasyBeansContextNamingInfo.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/EasyBeansContextNamingInfo.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/EasyBeansSecurityConstraint.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/EasyBeansSecurityConstraint.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/EasyBeansSecurityConstraint.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/EasyBeansSecurityConstraint.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/naming/WebServiceRefExtensionListener.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/naming/WebServiceRefExtensionListener.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/naming/WebServiceRefExtensionListener.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/easybeans/naming/WebServiceRefExtensionListener.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/HandlerResourceProcessor.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/HandlerResourceProcessor.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/HandlerResourceProcessor.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/HandlerResourceProcessor.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/JOnASHandlerResolver.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/JOnASHandlerResolver.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/JOnASHandlerResolver.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/JOnASHandlerResolver.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/PostConstructProcessor.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/PostConstructProcessor.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/PostConstructProcessor.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/PostConstructProcessor.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/AnnotationHandlerChainBuilder.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/AnnotationHandlerChainBuilder.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/AnnotationHandlerChainBuilder.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/AnnotationHandlerChainBuilder.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/BindingUtils.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/BindingUtils.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/BindingUtils.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/BindingUtils.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/DescriptorHandlerChainBuilder.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/DescriptorHandlerChainBuilder.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/DescriptorHandlerChainBuilder.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/DescriptorHandlerChainBuilder.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/HandlerBuilder.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/HandlerBuilder.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/HandlerBuilder.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/HandlerBuilder.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/HandlerChainBuilder.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/HandlerChainBuilder.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/HandlerChainBuilder.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/handler/builder/HandlerChainBuilder.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/JAXWSServlet.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/JAXWSServlet.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/JAXWSServlet.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/JAXWSServlet.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/ServletRequestAdapter.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/ServletRequestAdapter.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/ServletRequestAdapter.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/ServletRequestAdapter.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/ServletResponseAdapter.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/ServletResponseAdapter.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/ServletResponseAdapter.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/http/servlet/ServletResponseAdapter.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/util/JAXWSClassUtils.java b/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/util/JAXWSClassUtils.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/util/JAXWSClassUtils.java rename to modules/services/webservices/jaxws/core/src/main/java/org/ow2/jonas/ws/jaxws/util/JAXWSClassUtils.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/resources/META-INF/jonas-webservices-jaxws-core.bnd b/modules/services/webservices/jaxws/core/src/main/resources/META-INF/jonas-webservices-jaxws-core.bnd similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/resources/META-INF/jonas-webservices-jaxws-core.bnd rename to modules/services/webservices/jaxws/core/src/main/resources/META-INF/jonas-webservices-jaxws-core.bnd diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/resources/org/ow2/jonas/ws/jaxws/base/audit/mbean/mbeans-descriptors.xml b/modules/services/webservices/jaxws/core/src/main/resources/org/ow2/jonas/ws/jaxws/base/audit/mbean/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/resources/org/ow2/jonas/ws/jaxws/base/audit/mbean/mbeans-descriptors.xml rename to modules/services/webservices/jaxws/core/src/main/resources/org/ow2/jonas/ws/jaxws/base/audit/mbean/mbeans-descriptors.xml diff --git a/jonas/modules/services/webservices/jaxws/core/src/main/templates/jonas-jax-ws.properties.template b/modules/services/webservices/jaxws/core/src/main/templates/jonas-jax-ws.properties.template similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/main/templates/jonas-jax-ws.properties.template rename to modules/services/webservices/jaxws/core/src/main/templates/jonas-jax-ws.properties.template diff --git a/jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/HelloService.java b/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/HelloService.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/HelloService.java rename to modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/HelloService.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/word/Word.java b/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/word/Word.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/word/Word.java rename to modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/pojo/word/Word.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/test/handlers/GreeterLogicalHandler.java b/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/test/handlers/GreeterLogicalHandler.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/test/handlers/GreeterLogicalHandler.java rename to modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/test/handlers/GreeterLogicalHandler.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/test/handlers/GreeterSOAPHandler.java b/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/test/handlers/GreeterSOAPHandler.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/test/handlers/GreeterSOAPHandler.java rename to modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/axis2/test/handlers/GreeterSOAPHandler.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/base/audit/JaxwsClientAuditHandlerTestCase.java b/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/base/audit/JaxwsClientAuditHandlerTestCase.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/base/audit/JaxwsClientAuditHandlerTestCase.java rename to modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/base/audit/JaxwsClientAuditHandlerTestCase.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/base/audit/JaxwsEndpointAuditHandlerTestCase.java b/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/base/audit/JaxwsEndpointAuditHandlerTestCase.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/base/audit/JaxwsEndpointAuditHandlerTestCase.java rename to modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/base/audit/JaxwsEndpointAuditHandlerTestCase.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/jaxws/test/JOnASHandlerResolverTest.java b/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/jaxws/test/JOnASHandlerResolverTest.java similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/jaxws/test/JOnASHandlerResolverTest.java rename to modules/services/webservices/jaxws/core/src/test/java/org/ow2/jonas/ws/jaxws/test/JOnASHandlerResolverTest.java diff --git a/jonas/modules/services/webservices/jaxws/core/src/test/resources/WEB-INF/handlers.xml b/modules/services/webservices/jaxws/core/src/test/resources/WEB-INF/handlers.xml similarity index 100% rename from jonas/modules/services/webservices/jaxws/core/src/test/resources/WEB-INF/handlers.xml rename to modules/services/webservices/jaxws/core/src/test/resources/WEB-INF/handlers.xml diff --git a/jonas/modules/services/webservices/jaxws/pom.xml b/modules/services/webservices/jaxws/pom.xml similarity index 100% rename from jonas/modules/services/webservices/jaxws/pom.xml rename to modules/services/webservices/jaxws/pom.xml diff --git a/jonas/modules/services/webservices/pom.xml b/modules/services/webservices/pom.xml similarity index 100% rename from jonas/modules/services/webservices/pom.xml rename to modules/services/webservices/pom.xml diff --git a/jonas/modules/services/webservices/publish/ant/pom.xml b/modules/services/webservices/publish/ant/pom.xml similarity index 100% rename from jonas/modules/services/webservices/publish/ant/pom.xml rename to modules/services/webservices/publish/ant/pom.xml diff --git a/jonas/modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/File.java b/modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/File.java similarity index 100% rename from jonas/modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/File.java rename to modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/File.java diff --git a/jonas/modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/Uddi.java b/modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/Uddi.java similarity index 100% rename from jonas/modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/Uddi.java rename to modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/Uddi.java diff --git a/jonas/modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/WsdlPublish.java b/modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/WsdlPublish.java similarity index 100% rename from jonas/modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/WsdlPublish.java rename to modules/services/webservices/publish/ant/src/main/java/org/ow2/jonas/antmodular/jonasbase/wsdl/WsdlPublish.java diff --git a/jonas/modules/services/webservices/publish/ant/src/main/resources/antlib-wsdl.xml b/modules/services/webservices/publish/ant/src/main/resources/antlib-wsdl.xml similarity index 100% rename from jonas/modules/services/webservices/publish/ant/src/main/resources/antlib-wsdl.xml rename to modules/services/webservices/publish/ant/src/main/resources/antlib-wsdl.xml diff --git a/jonas/modules/services/webservices/publish/ant/src/main/resources/build-wsdl.properties.template b/modules/services/webservices/publish/ant/src/main/resources/build-wsdl.properties.template similarity index 100% rename from jonas/modules/services/webservices/publish/ant/src/main/resources/build-wsdl.properties.template rename to modules/services/webservices/publish/ant/src/main/resources/build-wsdl.properties.template diff --git a/jonas/modules/services/webservices/publish/ant/src/main/resources/build-wsdl.xml b/modules/services/webservices/publish/ant/src/main/resources/build-wsdl.xml similarity index 100% rename from jonas/modules/services/webservices/publish/ant/src/main/resources/build-wsdl.xml rename to modules/services/webservices/publish/ant/src/main/resources/build-wsdl.xml diff --git a/jonas/modules/services/webservices/publish/core/pom.xml b/modules/services/webservices/publish/core/pom.xml similarity index 100% rename from jonas/modules/services/webservices/publish/core/pom.xml rename to modules/services/webservices/publish/core/pom.xml diff --git a/jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/file/FileWSDLPublisher.java b/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/file/FileWSDLPublisher.java similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/file/FileWSDLPublisher.java rename to modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/file/FileWSDLPublisher.java diff --git a/jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/file/JDefinitionWriter.java b/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/file/JDefinitionWriter.java similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/file/JDefinitionWriter.java rename to modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/file/JDefinitionWriter.java diff --git a/jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/manager/DefaultWSDLPublisherManager.java b/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/manager/DefaultWSDLPublisherManager.java similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/manager/DefaultWSDLPublisherManager.java rename to modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/manager/DefaultWSDLPublisherManager.java diff --git a/jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/manager/WSDLPublisherFactory.java b/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/manager/WSDLPublisherFactory.java similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/manager/WSDLPublisherFactory.java rename to modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/manager/WSDLPublisherFactory.java diff --git a/jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/registry/RegistryWSDLPublisher.java b/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/registry/RegistryWSDLPublisher.java similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/registry/RegistryWSDLPublisher.java rename to modules/services/webservices/publish/core/src/main/java/org/ow2/jonas/ws/publish/internal/registry/RegistryWSDLPublisher.java diff --git a/jonas/modules/services/webservices/publish/core/src/main/jonas-resources/conf/file1.properties b/modules/services/webservices/publish/core/src/main/jonas-resources/conf/file1.properties similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/jonas-resources/conf/file1.properties rename to modules/services/webservices/publish/core/src/main/jonas-resources/conf/file1.properties diff --git a/jonas/modules/services/webservices/publish/core/src/main/jonas-resources/conf/uddi.properties b/modules/services/webservices/publish/core/src/main/jonas-resources/conf/uddi.properties similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/jonas-resources/conf/uddi.properties rename to modules/services/webservices/publish/core/src/main/jonas-resources/conf/uddi.properties diff --git a/jonas/modules/services/webservices/publish/core/src/main/resources/META-INF/jonas-webservices-publish-core.bnd b/modules/services/webservices/publish/core/src/main/resources/META-INF/jonas-webservices-publish-core.bnd similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/resources/META-INF/jonas-webservices-publish-core.bnd rename to modules/services/webservices/publish/core/src/main/resources/META-INF/jonas-webservices-publish-core.bnd diff --git a/jonas/modules/services/webservices/publish/core/src/main/resources/metadata.xml b/modules/services/webservices/publish/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/resources/metadata.xml rename to modules/services/webservices/publish/core/src/main/resources/metadata.xml diff --git a/jonas/modules/services/webservices/publish/core/src/main/resources/org/ow2/jonas/ws/publish/internal/manager/I18n.properties b/modules/services/webservices/publish/core/src/main/resources/org/ow2/jonas/ws/publish/internal/manager/I18n.properties similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/resources/org/ow2/jonas/ws/publish/internal/manager/I18n.properties rename to modules/services/webservices/publish/core/src/main/resources/org/ow2/jonas/ws/publish/internal/manager/I18n.properties diff --git a/jonas/modules/services/webservices/publish/core/src/main/resources/org/ow2/jonas/ws/publish/internal/manager/mbeans-descriptors.xml b/modules/services/webservices/publish/core/src/main/resources/org/ow2/jonas/ws/publish/internal/manager/mbeans-descriptors.xml similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/resources/org/ow2/jonas/ws/publish/internal/manager/mbeans-descriptors.xml rename to modules/services/webservices/publish/core/src/main/resources/org/ow2/jonas/ws/publish/internal/manager/mbeans-descriptors.xml diff --git a/jonas/modules/services/webservices/publish/core/src/main/templates/jonas-wsdl.properties.template b/modules/services/webservices/publish/core/src/main/templates/jonas-wsdl.properties.template similarity index 100% rename from jonas/modules/services/webservices/publish/core/src/main/templates/jonas-wsdl.properties.template rename to modules/services/webservices/publish/core/src/main/templates/jonas-wsdl.properties.template diff --git a/jonas/modules/services/webservices/publish/pom.xml b/modules/services/webservices/publish/pom.xml similarity index 100% rename from jonas/modules/services/webservices/publish/pom.xml rename to modules/services/webservices/publish/pom.xml diff --git a/jonas/modules/services/wrapper/core/pom.xml b/modules/services/wrapper/core/pom.xml similarity index 100% rename from jonas/modules/services/wrapper/core/pom.xml rename to modules/services/wrapper/core/pom.xml diff --git a/jonas/modules/services/wrapper/core/src/main/jonas-resources/conf/wrapper.conf b/modules/services/wrapper/core/src/main/jonas-resources/conf/wrapper.conf similarity index 100% rename from jonas/modules/services/wrapper/core/src/main/jonas-resources/conf/wrapper.conf rename to modules/services/wrapper/core/src/main/jonas-resources/conf/wrapper.conf diff --git a/jonas/modules/services/wrapper/core/src/main/jonas-resources/conf/wrapper_extra.conf b/modules/services/wrapper/core/src/main/jonas-resources/conf/wrapper_extra.conf similarity index 100% rename from jonas/modules/services/wrapper/core/src/main/jonas-resources/conf/wrapper_extra.conf rename to modules/services/wrapper/core/src/main/jonas-resources/conf/wrapper_extra.conf diff --git a/jonas/modules/services/wrapper/core/src/main/jonas-resources/windows_service/build.xml b/modules/services/wrapper/core/src/main/jonas-resources/windows_service/build.xml similarity index 100% rename from jonas/modules/services/wrapper/core/src/main/jonas-resources/windows_service/build.xml rename to modules/services/wrapper/core/src/main/jonas-resources/windows_service/build.xml diff --git a/jonas/modules/services/wrapper/pom.xml b/modules/services/wrapper/pom.xml similarity index 100% rename from jonas/modules/services/wrapper/pom.xml rename to modules/services/wrapper/pom.xml diff --git a/jonas/modules/tools/commands/pom.xml b/modules/tools/commands/pom.xml similarity index 100% rename from jonas/modules/tools/commands/pom.xml rename to modules/tools/commands/pom.xml diff --git a/jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/CLIArgument.java b/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/CLIArgument.java similarity index 100% rename from jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/CLIArgument.java rename to modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/CLIArgument.java diff --git a/jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/CLIConstants.java b/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/CLIConstants.java similarity index 100% rename from jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/CLIConstants.java rename to modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/CLIConstants.java diff --git a/jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/ClientAdmin.java b/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/ClientAdmin.java similarity index 100% rename from jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/ClientAdmin.java rename to modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/ClientAdmin.java diff --git a/jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/UtilAdmin.java b/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/UtilAdmin.java similarity index 100% rename from jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/UtilAdmin.java rename to modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/UtilAdmin.java diff --git a/jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/ExceptionUtils.java b/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/ExceptionUtils.java similarity index 100% rename from jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/ExceptionUtils.java rename to modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/ExceptionUtils.java diff --git a/jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/JMXConnectionHelper.java b/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/JMXConnectionHelper.java similarity index 100% rename from jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/JMXConnectionHelper.java rename to modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/JMXConnectionHelper.java diff --git a/jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/PrintUtils.java b/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/PrintUtils.java similarity index 100% rename from jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/PrintUtils.java rename to modules/tools/commands/src/main/java/org/ow2/jonas/commands/admin/util/PrintUtils.java diff --git a/jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/check/CheckEnv.java b/modules/tools/commands/src/main/java/org/ow2/jonas/commands/check/CheckEnv.java similarity index 100% rename from jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/check/CheckEnv.java rename to modules/tools/commands/src/main/java/org/ow2/jonas/commands/check/CheckEnv.java diff --git a/jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/wrapper/GenerateWrapperConf.java b/modules/tools/commands/src/main/java/org/ow2/jonas/commands/wrapper/GenerateWrapperConf.java similarity index 100% rename from jonas/modules/tools/commands/src/main/java/org/ow2/jonas/commands/wrapper/GenerateWrapperConf.java rename to modules/tools/commands/src/main/java/org/ow2/jonas/commands/wrapper/GenerateWrapperConf.java diff --git a/jonas/modules/tools/eclipse-compiler/pom.xml b/modules/tools/eclipse-compiler/pom.xml similarity index 100% rename from jonas/modules/tools/eclipse-compiler/pom.xml rename to modules/tools/eclipse-compiler/pom.xml diff --git a/jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/CompilationContext.java b/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/CompilationContext.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/CompilationContext.java rename to modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/CompilationContext.java diff --git a/jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/CompilerError.java b/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/CompilerError.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/CompilerError.java rename to modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/CompilerError.java diff --git a/jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompilationUnit.java b/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompilationUnit.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompilationUnit.java rename to modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompilationUnit.java diff --git a/jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompiler.java b/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompiler.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompiler.java rename to modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompiler.java diff --git a/jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompilerRequestor.java b/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompilerRequestor.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompilerRequestor.java rename to modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASCompilerRequestor.java diff --git a/jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASNameEnvironment.java b/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASNameEnvironment.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASNameEnvironment.java rename to modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/JOnASNameEnvironment.java diff --git a/jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/Util.java b/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/Util.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/Util.java rename to modules/tools/eclipse-compiler/src/main/java/org/ow2/jonas/eclipse/compiler/Util.java diff --git a/jonas/modules/tools/eclipse-compiler/src/main/resources/META-INF/eclipse-compiler.bnd b/modules/tools/eclipse-compiler/src/main/resources/META-INF/eclipse-compiler.bnd similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/main/resources/META-INF/eclipse-compiler.bnd rename to modules/tools/eclipse-compiler/src/main/resources/META-INF/eclipse-compiler.bnd diff --git a/jonas/modules/tools/eclipse-compiler/src/test/input/test/UpperCase/UpperCasePackage.java b/modules/tools/eclipse-compiler/src/test/input/test/UpperCase/UpperCasePackage.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/test/input/test/UpperCase/UpperCasePackage.java rename to modules/tools/eclipse-compiler/src/test/input/test/UpperCase/UpperCasePackage.java diff --git a/jonas/modules/tools/eclipse-compiler/src/test/input/test/inheritance/Inheritance.java b/modules/tools/eclipse-compiler/src/test/input/test/inheritance/Inheritance.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/test/input/test/inheritance/Inheritance.java rename to modules/tools/eclipse-compiler/src/test/input/test/inheritance/Inheritance.java diff --git a/jonas/modules/tools/eclipse-compiler/src/test/input/test/multiple/Multiple.java b/modules/tools/eclipse-compiler/src/test/input/test/multiple/Multiple.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/test/input/test/multiple/Multiple.java rename to modules/tools/eclipse-compiler/src/test/input/test/multiple/Multiple.java diff --git a/jonas/modules/tools/eclipse-compiler/src/test/input/test/simple/Simple.java b/modules/tools/eclipse-compiler/src/test/input/test/simple/Simple.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/test/input/test/simple/Simple.java rename to modules/tools/eclipse-compiler/src/test/input/test/simple/Simple.java diff --git a/jonas/modules/tools/eclipse-compiler/src/test/java/org/ow2/jonas/eclipse/compiler/EclipseCompilerTestCase.java b/modules/tools/eclipse-compiler/src/test/java/org/ow2/jonas/eclipse/compiler/EclipseCompilerTestCase.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/test/java/org/ow2/jonas/eclipse/compiler/EclipseCompilerTestCase.java rename to modules/tools/eclipse-compiler/src/test/java/org/ow2/jonas/eclipse/compiler/EclipseCompilerTestCase.java diff --git a/jonas/modules/tools/eclipse-compiler/src/test/java/test/inheritance/Interface.java b/modules/tools/eclipse-compiler/src/test/java/test/inheritance/Interface.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/test/java/test/inheritance/Interface.java rename to modules/tools/eclipse-compiler/src/test/java/test/inheritance/Interface.java diff --git a/jonas/modules/tools/eclipse-compiler/src/test/java/test/inheritance/SuperClass.java b/modules/tools/eclipse-compiler/src/test/java/test/inheritance/SuperClass.java similarity index 100% rename from jonas/modules/tools/eclipse-compiler/src/test/java/test/inheritance/SuperClass.java rename to modules/tools/eclipse-compiler/src/test/java/test/inheritance/SuperClass.java diff --git a/jonas/modules/tools/jonas-ant-tasks/pom.xml b/modules/tools/jonas-ant-tasks/pom.xml similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/pom.xml rename to modules/tools/jonas-ant-tasks/pom.xml diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/EjbJar.java b/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/EjbJar.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/EjbJar.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/EjbJar.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/GenICTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/GenICTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/GenICTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/GenICTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASBaseTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASBaseTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASBaseTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASBaseTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASClusterConfigTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASClusterConfigTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASClusterConfigTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASClusterConfigTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JOnASTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JProperty.java b/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JProperty.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JProperty.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/JProperty.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/ServerDeploy.java b/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/ServerDeploy.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/ServerDeploy.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/ServerDeploy.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/WsGenTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/WsGenTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/WsGenTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/objectweb/jonas/ant/WsGenTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/BootstrapTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/BootstrapTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/BootstrapTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/BootstrapTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/DescriptorHandler.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/DescriptorHandler.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/DescriptorHandler.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/DescriptorHandler.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/EJBDeploymentTool.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/EJBDeploymentTool.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/EJBDeploymentTool.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/EJBDeploymentTool.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/EjbJar.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/EjbJar.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/EjbJar.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/EjbJar.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/GenICTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/GenICTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/GenICTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/GenICTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/GenericDeploymentTool.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/GenericDeploymentTool.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/GenericDeploymentTool.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/GenericDeploymentTool.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/HotDeploymentTool.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/HotDeploymentTool.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/HotDeploymentTool.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/HotDeploymentTool.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/InnerClassFilenameFilter.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/InnerClassFilenameFilter.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/InnerClassFilenameFilter.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/InnerClassFilenameFilter.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASAntTool.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASAntTool.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASAntTool.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASAntTool.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASBaseTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASBaseTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASBaseTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASBaseTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASClusterConfigTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASClusterConfigTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASClusterConfigTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASClusterConfigTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JOnASTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JProperty.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JProperty.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JProperty.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JProperty.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JonasDeploymentTool.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JonasDeploymentTool.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JonasDeploymentTool.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JonasDeploymentTool.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JonasHotDeploymentTool.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JonasHotDeploymentTool.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JonasHotDeploymentTool.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/JonasHotDeploymentTool.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/PropertyStatement.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/PropertyStatement.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/PropertyStatement.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/PropertyStatement.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/ServerDeploy.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/ServerDeploy.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/ServerDeploy.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/ServerDeploy.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/WsGenTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/WsGenTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/WsGenTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/WsGenTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/CarolCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/CarolCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/CarolCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/CarolCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ClusterDaemon.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ClusterDaemon.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ClusterDaemon.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ClusterDaemon.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ClusterTasks.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ClusterTasks.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ClusterTasks.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ClusterTasks.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/CmiCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/CmiCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/CmiCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/CmiCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Common.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Common.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Common.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Common.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DbCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DbCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DbCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DbCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DbmCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DbmCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DbmCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DbmCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DeployableCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DeployableCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DeployableCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DeployableCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DeploymentCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DeploymentCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DeploymentCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DeploymentCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Director.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Director.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Director.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Director.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DiscoveryCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DiscoveryCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DiscoveryCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/DiscoveryCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/EjbLevel.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/EjbLevel.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/EjbLevel.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/EjbLevel.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/HaCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/HaCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/HaCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/HaCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JdbcRaCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JdbcRaCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JdbcRaCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JdbcRaCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JdbcXmlCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JdbcXmlCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JdbcXmlCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JdbcXmlCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JmsCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JmsCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JmsCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/JmsCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/LibCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/LibCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/LibCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/LibCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/MailCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/MailCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/MailCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/MailCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ModJk.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ModJk.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ModJk.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ModJk.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Script.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Script.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Script.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/Script.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ServicesCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ServicesCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ServicesCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/ServicesCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WebContainerCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WebContainerCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WebContainerCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WebContainerCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WebLevel.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WebLevel.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WebLevel.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WebLevel.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WsdlPublishCluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WsdlPublishCluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WsdlPublishCluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/cluster/WsdlPublishCluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Archives.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Archives.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Archives.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Archives.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/BaseTaskItf.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/BaseTaskItf.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/BaseTaskItf.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/BaseTaskItf.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Carol.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Carol.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Carol.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Carol.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Cmi.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Cmi.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Cmi.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Cmi.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Db.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Db.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Db.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Db.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Dbm.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Dbm.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Dbm.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Dbm.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeployableSelector.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeployableSelector.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeployableSelector.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeployableSelector.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeployableTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeployableTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeployableTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeployableTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeploymentPlans.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeploymentPlans.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeploymentPlans.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/DeploymentPlans.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Discovery.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Discovery.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Discovery.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Discovery.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Ha.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Ha.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Ha.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Ha.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JCopy.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JCopy.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JCopy.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JCopy.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JEcho.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JEcho.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JEcho.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JEcho.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JMkdir.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JMkdir.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JMkdir.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JMkdir.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JReplace.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JReplace.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JReplace.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JReplace.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JTouch.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JTouch.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JTouch.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JTouch.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JdbcRa.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JdbcRa.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JdbcRa.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JdbcRa.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JdbcXml.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JdbcXml.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JdbcXml.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JdbcXml.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Jms.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Jms.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Jms.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Jms.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JmsRa.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JmsRa.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JmsRa.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JmsRa.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JonasProperties.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JonasProperties.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JonasProperties.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/JonasProperties.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Lib.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Lib.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Lib.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Lib.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Mail.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Mail.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Mail.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Mail.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/PropertyTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/PropertyTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/PropertyTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/PropertyTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Replace.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Replace.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Replace.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Replace.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Services.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Services.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Services.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Services.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Tasks.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Tasks.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Tasks.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/Tasks.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/WebContainer.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/WebContainer.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/WebContainer.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/WebContainer.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/XMLSerializerTask.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/XMLSerializerTask.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/XMLSerializerTask.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/XMLSerializerTask.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/JResourceLoginModule.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/JResourceLoginModule.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/JResourceLoginModule.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/JResourceLoginModule.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/Jaas.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/Jaas.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/Jaas.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/Jaas.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/JaasEntry.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/JaasEntry.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/JaasEntry.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/JaasEntry.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/LoginModule.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/LoginModule.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/LoginModule.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/jaas/LoginModule.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Ajp.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Ajp.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Ajp.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Ajp.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Cluster.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Cluster.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Cluster.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Cluster.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Director.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Director.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Director.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Director.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Http.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Http.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Http.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Http.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Https.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Https.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Https.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Https.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Jetty.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Jetty.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Jetty.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Jetty.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Tomcat.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Tomcat.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Tomcat.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/web/Tomcat.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/File.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/File.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/File.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/File.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/Uddi.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/Uddi.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/Uddi.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/Uddi.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/WsdlPublish.java b/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/WsdlPublish.java similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/WsdlPublish.java rename to modules/tools/jonas-ant-tasks/src/main/java/org/ow2/jonas/ant/jonasbase/wsdl/WsdlPublish.java diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjb b/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjb similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjb rename to modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjb diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjb.bat b/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjb.bat similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjb.bat rename to modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjb.bat diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjc b/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjc similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjc rename to modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjc diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjc.bat b/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjc.bat similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjc.bat rename to modules/tools/jonas-ant-tasks/src/main/jonas-resources/bin/newjc.bat diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/resources/META-INF/jonas-ant-tasks.bnd b/modules/tools/jonas-ant-tasks/src/main/resources/META-INF/jonas-ant-tasks.bnd similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/resources/META-INF/jonas-ant-tasks.bnd rename to modules/tools/jonas-ant-tasks/src/main/resources/META-INF/jonas-ant-tasks.bnd diff --git a/jonas/modules/tools/jonas-ant-tasks/src/main/resources/org/ow2/jonas/ant/antlib.xml b/modules/tools/jonas-ant-tasks/src/main/resources/org/ow2/jonas/ant/antlib.xml similarity index 100% rename from jonas/modules/tools/jonas-ant-tasks/src/main/resources/org/ow2/jonas/ant/antlib.xml rename to modules/tools/jonas-ant-tasks/src/main/resources/org/ow2/jonas/ant/antlib.xml diff --git a/jonas/modules/tools/jonas-cluster-daemon/ant/pom.xml b/modules/tools/jonas-cluster-daemon/ant/pom.xml similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/ant/pom.xml rename to modules/tools/jonas-cluster-daemon/ant/pom.xml diff --git a/jonas/modules/tools/jonas-cluster-daemon/ant/src/main/java/org/ow2/jonas/antmodular/cluster/clusterdaemon/ClusterDaemon.java b/modules/tools/jonas-cluster-daemon/ant/src/main/java/org/ow2/jonas/antmodular/cluster/clusterdaemon/ClusterDaemon.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/ant/src/main/java/org/ow2/jonas/antmodular/cluster/clusterdaemon/ClusterDaemon.java rename to modules/tools/jonas-cluster-daemon/ant/src/main/java/org/ow2/jonas/antmodular/cluster/clusterdaemon/ClusterDaemon.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/ant/src/main/resources/antlib-clusterdaemon.xml b/modules/tools/jonas-cluster-daemon/ant/src/main/resources/antlib-clusterdaemon.xml similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/ant/src/main/resources/antlib-clusterdaemon.xml rename to modules/tools/jonas-cluster-daemon/ant/src/main/resources/antlib-clusterdaemon.xml diff --git a/jonas/modules/tools/jonas-cluster-daemon/ant/src/main/resources/build-clusterdaemon.properties.template b/modules/tools/jonas-cluster-daemon/ant/src/main/resources/build-clusterdaemon.properties.template similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/ant/src/main/resources/build-clusterdaemon.properties.template rename to modules/tools/jonas-cluster-daemon/ant/src/main/resources/build-clusterdaemon.properties.template diff --git a/jonas/modules/tools/jonas-cluster-daemon/api/pom.xml b/modules/tools/jonas-cluster-daemon/api/pom.xml similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/api/pom.xml rename to modules/tools/jonas-cluster-daemon/api/pom.xml diff --git a/jonas/modules/tools/jonas-cluster-daemon/api/src/main/java/org/ow2/jonas/cluster/daemon/api/ClusterDaemonException.java b/modules/tools/jonas-cluster-daemon/api/src/main/java/org/ow2/jonas/cluster/daemon/api/ClusterDaemonException.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/api/src/main/java/org/ow2/jonas/cluster/daemon/api/ClusterDaemonException.java rename to modules/tools/jonas-cluster-daemon/api/src/main/java/org/ow2/jonas/cluster/daemon/api/ClusterDaemonException.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/api/src/main/java/org/ow2/jonas/cluster/daemon/api/IClusterDaemon.java b/modules/tools/jonas-cluster-daemon/api/src/main/java/org/ow2/jonas/cluster/daemon/api/IClusterDaemon.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/api/src/main/java/org/ow2/jonas/cluster/daemon/api/IClusterDaemon.java rename to modules/tools/jonas-cluster-daemon/api/src/main/java/org/ow2/jonas/cluster/daemon/api/IClusterDaemon.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/api/src/main/resources/META-INF/jonas-cluster-daemon-api.bnd b/modules/tools/jonas-cluster-daemon/api/src/main/resources/META-INF/jonas-cluster-daemon-api.bnd similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/api/src/main/resources/META-INF/jonas-cluster-daemon-api.bnd rename to modules/tools/jonas-cluster-daemon/api/src/main/resources/META-INF/jonas-cluster-daemon-api.bnd diff --git a/jonas/modules/tools/jonas-cluster-daemon/api/src/main/resources/metadata.xml b/modules/tools/jonas-cluster-daemon/api/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/api/src/main/resources/metadata.xml rename to modules/tools/jonas-cluster-daemon/api/src/main/resources/metadata.xml diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/pom.xml b/modules/tools/jonas-cluster-daemon/core/pom.xml similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/pom.xml rename to modules/tools/jonas-cluster-daemon/core/pom.xml diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemon.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemon.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemon.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemon.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonAdmin.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonAdmin.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonAdmin.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonAdmin.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonException.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonException.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonException.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonException.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonMBean.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonMBean.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonMBean.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonMBean.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonTools.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonTools.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonTools.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ClusterDaemonTools.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/CmdReaderThread.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/CmdReaderThread.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/CmdReaderThread.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/CmdReaderThread.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/MonitorThread.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/MonitorThread.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/MonitorThread.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/MonitorThread.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ShutdownHookThread.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ShutdownHookThread.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ShutdownHookThread.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/ShutdownHookThread.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/JMXRemoteException.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/JMXRemoteException.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/JMXRemoteException.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/JMXRemoteException.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/JMXRemoteHelper.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/JMXRemoteHelper.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/JMXRemoteHelper.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/JMXRemoteHelper.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/MBeanServerException.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/MBeanServerException.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/MBeanServerException.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/MBeanServerException.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/MBeanServerHelper.java b/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/MBeanServerHelper.java similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/MBeanServerHelper.java rename to modules/tools/jonas-cluster-daemon/core/src/main/java/org/ow2/jonas/cluster/daemon/mbean/MBeanServerHelper.java diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/bin/jclusterd b/modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/bin/jclusterd similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/bin/jclusterd rename to modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/bin/jclusterd diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/bin/jclusterd.bat b/modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/bin/jclusterd.bat similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/bin/jclusterd.bat rename to modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/bin/jclusterd.bat diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/conf/clusterd.xml b/modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/conf/clusterd.xml similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/conf/clusterd.xml rename to modules/tools/jonas-cluster-daemon/core/src/main/jonas-resources/conf/clusterd.xml diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/resources/META-INF/jonas-cluster-daemon-core.bnd b/modules/tools/jonas-cluster-daemon/core/src/main/resources/META-INF/jonas-cluster-daemon-core.bnd similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/resources/META-INF/jonas-cluster-daemon-core.bnd rename to modules/tools/jonas-cluster-daemon/core/src/main/resources/META-INF/jonas-cluster-daemon-core.bnd diff --git a/jonas/modules/tools/jonas-cluster-daemon/core/src/main/resources/metadata.xml b/modules/tools/jonas-cluster-daemon/core/src/main/resources/metadata.xml similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/core/src/main/resources/metadata.xml rename to modules/tools/jonas-cluster-daemon/core/src/main/resources/metadata.xml diff --git a/jonas/modules/tools/jonas-cluster-daemon/pom.xml b/modules/tools/jonas-cluster-daemon/pom.xml similarity index 100% rename from jonas/modules/tools/jonas-cluster-daemon/pom.xml rename to modules/tools/jonas-cluster-daemon/pom.xml diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/pom.xml b/modules/tools/launchers/jonas-launcher-for-addons/pom.xml similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/pom.xml rename to modules/tools/launchers/jonas-launcher-for-addons/pom.xml diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/DefaultConfigurationProvider.java b/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/DefaultConfigurationProvider.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/DefaultConfigurationProvider.java rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/DefaultConfigurationProvider.java diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/IConfigurationProvider.java b/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/IConfigurationProvider.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/IConfigurationProvider.java rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/IConfigurationProvider.java diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/JOnAS.java b/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/JOnAS.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/JOnAS.java rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/JOnAS.java diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/VersionNumber.java b/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/VersionNumber.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/VersionNumber.java rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/VersionNumber.java diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/IOUtils.java b/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/IOUtils.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/IOUtils.java rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/IOUtils.java diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/JOnASUtils.java b/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/JOnASUtils.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/JOnASUtils.java rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/JOnASUtils.java diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/Maven2Utils.java b/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/Maven2Utils.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/Maven2Utils.java rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/java/org/ow2/jonas/launcher/jonas/util/Maven2Utils.java diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/META-INF/jonas-launcher-for-addons.bnd b/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/META-INF/jonas-launcher-for-addons.bnd similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/META-INF/jonas-launcher-for-addons.bnd rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/META-INF/jonas-launcher-for-addons.bnd diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/defaults.properties b/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/defaults.properties similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/defaults.properties rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/defaults.properties diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/gateway.properties b/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/gateway.properties similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/gateway.properties rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/gateway.properties diff --git a/jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/javase-profiles.properties b/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/javase-profiles.properties similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/javase-profiles.properties rename to modules/tools/launchers/jonas-launcher-for-addons/src/main/resources/org/ow2/jonas/launcher/jonas/javase-profiles.properties diff --git a/jonas/modules/tools/launchers/jonas-launcher/pom.xml b/modules/tools/launchers/jonas-launcher/pom.xml similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/pom.xml rename to modules/tools/launchers/jonas-launcher/pom.xml diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/DefaultConfigurationProvider.java b/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/DefaultConfigurationProvider.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/DefaultConfigurationProvider.java rename to modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/DefaultConfigurationProvider.java diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/IConfigurationProvider.java b/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/IConfigurationProvider.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/IConfigurationProvider.java rename to modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/IConfigurationProvider.java diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/JOnAS.java b/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/JOnAS.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/JOnAS.java rename to modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/JOnAS.java diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/VersionNumber.java b/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/VersionNumber.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/VersionNumber.java rename to modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/VersionNumber.java diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/IOUtils.java b/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/IOUtils.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/IOUtils.java rename to modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/IOUtils.java diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/JOnASUtils.java b/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/JOnASUtils.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/JOnASUtils.java rename to modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/JOnASUtils.java diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/Maven2Utils.java b/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/Maven2Utils.java similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/Maven2Utils.java rename to modules/tools/launchers/jonas-launcher/src/main/java/org/ow2/jonas/launcher/jonas/util/Maven2Utils.java diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/resources/META-INF/jonas-launcher.bnd b/modules/tools/launchers/jonas-launcher/src/main/resources/META-INF/jonas-launcher.bnd similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/resources/META-INF/jonas-launcher.bnd rename to modules/tools/launchers/jonas-launcher/src/main/resources/META-INF/jonas-launcher.bnd diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/defaults.properties b/modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/defaults.properties similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/defaults.properties rename to modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/defaults.properties diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/gateway.properties b/modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/gateway.properties similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/gateway.properties rename to modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/gateway.properties diff --git a/jonas/modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/javase-profiles.properties b/modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/javase-profiles.properties similarity index 100% rename from jonas/modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/javase-profiles.properties rename to modules/tools/launchers/jonas-launcher/src/main/resources/org/ow2/jonas/launcher/jonas/javase-profiles.properties diff --git a/jonas/modules/tools/launchers/pom.xml b/modules/tools/launchers/pom.xml similarity index 100% rename from jonas/modules/tools/launchers/pom.xml rename to modules/tools/launchers/pom.xml diff --git a/jonas/modules/tools/maven/genic-plugin/pom.xml b/modules/tools/maven/genic-plugin/pom.xml similarity index 100% rename from jonas/modules/tools/maven/genic-plugin/pom.xml rename to modules/tools/maven/genic-plugin/pom.xml diff --git a/jonas/modules/tools/maven/genic-plugin/src/main/java/org/ow2/jonas/tool/maven/genic/plugin/GenICMojo.java b/modules/tools/maven/genic-plugin/src/main/java/org/ow2/jonas/tool/maven/genic/plugin/GenICMojo.java similarity index 100% rename from jonas/modules/tools/maven/genic-plugin/src/main/java/org/ow2/jonas/tool/maven/genic/plugin/GenICMojo.java rename to modules/tools/maven/genic-plugin/src/main/java/org/ow2/jonas/tool/maven/genic/plugin/GenICMojo.java diff --git a/jonas/modules/tools/maven/packaging/pom.xml b/modules/tools/maven/packaging/pom.xml similarity index 100% rename from jonas/modules/tools/maven/packaging/pom.xml rename to modules/tools/maven/packaging/pom.xml diff --git a/jonas/modules/tools/maven/packaging/src/main/java/org/ow2/jonas/tool/maven/packaging/ApplicationPackagingMojo.java b/modules/tools/maven/packaging/src/main/java/org/ow2/jonas/tool/maven/packaging/ApplicationPackagingMojo.java similarity index 100% rename from jonas/modules/tools/maven/packaging/src/main/java/org/ow2/jonas/tool/maven/packaging/ApplicationPackagingMojo.java rename to modules/tools/maven/packaging/src/main/java/org/ow2/jonas/tool/maven/packaging/ApplicationPackagingMojo.java diff --git a/jonas/modules/tools/maven/pom.xml b/modules/tools/maven/pom.xml similarity index 100% rename from jonas/modules/tools/maven/pom.xml rename to modules/tools/maven/pom.xml diff --git a/jonas/modules/tools/maven/shade-jonas-transformers/pom.xml b/modules/tools/maven/shade-jonas-transformers/pom.xml similarity index 100% rename from jonas/modules/tools/maven/shade-jonas-transformers/pom.xml rename to modules/tools/maven/shade-jonas-transformers/pom.xml diff --git a/jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/AbstractJOnASResourceTransformer.java b/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/AbstractJOnASResourceTransformer.java similarity index 100% rename from jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/AbstractJOnASResourceTransformer.java rename to modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/AbstractJOnASResourceTransformer.java diff --git a/jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/AntLibResourceTransformer.java b/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/AntLibResourceTransformer.java similarity index 100% rename from jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/AntLibResourceTransformer.java rename to modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/AntLibResourceTransformer.java diff --git a/jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/BuildResourceTransformer.java b/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/BuildResourceTransformer.java similarity index 100% rename from jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/BuildResourceTransformer.java rename to modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/BuildResourceTransformer.java diff --git a/jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/xml/Input.java b/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/xml/Input.java similarity index 100% rename from jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/xml/Input.java rename to modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/xml/Input.java diff --git a/jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/xml/Target.java b/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/xml/Target.java similarity index 100% rename from jonas/modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/xml/Target.java rename to modules/tools/maven/shade-jonas-transformers/src/main/java/org/ow2/jonas/tools/maven/shade/transformers/xml/Target.java diff --git a/jonas/modules/tools/maven/wsgen-plugin/pom.xml b/modules/tools/maven/wsgen-plugin/pom.xml similarity index 100% rename from jonas/modules/tools/maven/wsgen-plugin/pom.xml rename to modules/tools/maven/wsgen-plugin/pom.xml diff --git a/jonas/modules/tools/maven/wsgen-plugin/src/main/java/org/ow2/jonas/tool/maven/wsgen/plugin/WsGenMojo.java b/modules/tools/maven/wsgen-plugin/src/main/java/org/ow2/jonas/tool/maven/wsgen/plugin/WsGenMojo.java similarity index 100% rename from jonas/modules/tools/maven/wsgen-plugin/src/main/java/org/ow2/jonas/tool/maven/wsgen/plugin/WsGenMojo.java rename to modules/tools/maven/wsgen-plugin/src/main/java/org/ow2/jonas/tool/maven/wsgen/plugin/WsGenMojo.java diff --git a/jonas/modules/tools/migration-jboss/pom.xml b/modules/tools/migration-jboss/pom.xml similarity index 100% rename from jonas/modules/tools/migration-jboss/pom.xml rename to modules/tools/migration-jboss/pom.xml diff --git a/jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/Migrate.java b/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/Migrate.java similarity index 100% rename from jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/Migrate.java rename to modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/Migrate.java diff --git a/jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/Transformer.java b/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/Transformer.java similarity index 100% rename from jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/Transformer.java rename to modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/Transformer.java diff --git a/jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jboss.xml b/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jboss.xml similarity index 100% rename from jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jboss.xml rename to modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jboss.xml diff --git a/jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jbosscmp-jdbc.xml b/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jbosscmp-jdbc.xml similarity index 100% rename from jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jbosscmp-jdbc.xml rename to modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jbosscmp-jdbc.xml diff --git a/jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jonas-ejb-jar.xml b/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jonas-ejb-jar.xml similarity index 100% rename from jonas/modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jonas-ejb-jar.xml rename to modules/tools/migration-jboss/src/main/java/org/ow2/jonas/migration/jboss/jonas-ejb-jar.xml diff --git a/jonas/modules/tools/pom.xml b/modules/tools/pom.xml similarity index 100% rename from jonas/modules/tools/pom.xml rename to modules/tools/pom.xml diff --git a/jonas/pom.xml b/pom.xml similarity index 100% rename from jonas/pom.xml rename to pom.xml